From a3ffe6f874cdd7686013202f76962c8c7d8d74af Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 26 Sep 2016 09:30:15 -0700
Subject: [PATCH 001/421] Parse, bind and check spread types and elements

---
 src/compiler/binder.ts               |  12 +-
 src/compiler/checker.ts              | 407 ++++++++++++++++++++++-----
 src/compiler/diagnosticMessages.json |  12 +
 src/compiler/parser.ts               |  29 +-
 src/compiler/types.ts                |  92 +++---
 src/compiler/utilities.ts            |   1 +
 src/harness/harness.ts               |   2 +-
 src/services/findAllReferences.ts    |   6 +-
 8 files changed, 447 insertions(+), 114 deletions(-)

diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index 49434e80aba..d3217fd70a8 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -1825,8 +1825,9 @@ namespace ts {
                 case SyntaxKind.EnumMember:
                     return bindPropertyOrMethodOrAccessor(<Declaration>node, SymbolFlags.EnumMember, SymbolFlags.EnumMemberExcludes);
 
+                case SyntaxKind.SpreadElement:
                 case SyntaxKind.JsxSpreadAttribute:
-                    emitFlags |= NodeFlags.HasJsxSpreadAttributes;
+                    emitFlags |= NodeFlags.HasSpreadAttribute;
                     return;
 
                 case SyntaxKind.CallSignature:
@@ -2956,8 +2957,9 @@ namespace ts {
                 }
                 break;
 
+            case SyntaxKind.SpreadElement:
             case SyntaxKind.SpreadElementExpression:
-                // This node is ES6 syntax, but is handled by a containing node.
+                // This node is ES6 or ES future syntax, but is handled by a containing node.
                 transformFlags |= TransformFlags.ContainsSpreadElementExpression;
                 break;
 
@@ -2996,6 +2998,12 @@ namespace ts {
                     transformFlags |= TransformFlags.ContainsLexicalThis;
                 }
 
+                if (subtreeFlags & TransformFlags.ContainsSpreadElementExpression) {
+                    // If an ObjectLiteralExpression contains a spread element, then it
+                    // is an ES experimental node.
+                    transformFlags |= TransformFlags.AssertExperimental;
+                }
+
                 break;
 
             case SyntaxKind.ArrayLiteralExpression:
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 51550ef873f..3578aeb5e4b 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -112,6 +112,7 @@ namespace ts {
         const tupleTypes: GenericType[] = [];
         const unionTypes = createMap<UnionType>();
         const intersectionTypes = createMap<IntersectionType>();
+        const spreadTypes = createMap<SpreadType>();
         const stringLiteralTypes = createMap<LiteralType>();
         const numericLiteralTypes = createMap<LiteralType>();
 
@@ -2185,7 +2186,10 @@ namespace ts {
                         writeSymbolTypeReference(type.aliasSymbol, typeArguments, 0, typeArguments ? typeArguments.length : 0, nextFlags);
                     }
                     else if (type.flags & TypeFlags.UnionOrIntersection) {
-                        writeUnionOrIntersectionType(<UnionOrIntersectionType>type, nextFlags);
+                        writeUnionOrIntersectionType(<TypeOperatorType>type, nextFlags);
+                    }
+                    else if (type.flags & TypeFlags.Spread) {
+                        writeSpreadType(<SpreadType>type, nextFlags);
                     }
                     else if (type.flags & TypeFlags.Anonymous) {
                         writeAnonymousType(<ObjectType>type, nextFlags);
@@ -2279,7 +2283,7 @@ namespace ts {
                     }
                 }
 
-                function writeUnionOrIntersectionType(type: UnionOrIntersectionType, flags: TypeFormatFlags) {
+                function writeUnionOrIntersectionType(type: TypeOperatorType, flags: TypeFormatFlags) {
                     if (flags & TypeFormatFlags.InElementType) {
                         writePunctuation(writer, SyntaxKind.OpenParenToken);
                     }
@@ -2294,6 +2298,36 @@ namespace ts {
                     }
                 }
 
+                function writeSpreadType(type: SpreadType, flags: TypeFormatFlags) {
+                    writePunctuation(writer, SyntaxKind.OpenBraceToken);
+                    writer.writeLine();
+                    writer.increaseIndent();
+                    let printFollowingPunctuation = false;
+                    for (const t of type.types) {
+                        if (printFollowingPunctuation) {
+                            writePunctuation(writer, SyntaxKind.SemicolonToken);
+                            writer.writeLine();
+                        }
+                        if (t.isDeclaredProperty) {
+                            const saveInObjectTypeLiteral = inObjectTypeLiteral;
+                            inObjectTypeLiteral = true;
+                            writeObjectLiteralType(resolveStructuredTypeMembers(t));
+                            printFollowingPunctuation = false;
+                            inObjectTypeLiteral = saveInObjectTypeLiteral;
+                        }
+                        else {
+                            writePunctuation(writer, SyntaxKind.DotDotDotToken);
+                            writeType(t, TypeFormatFlags.None);
+                            printFollowingPunctuation = true;
+                        }
+                    }
+                    writer.decreaseIndent();
+                    if (printFollowingPunctuation) {
+                        writeSpace(writer);
+                    }
+                    writePunctuation(writer, SyntaxKind.CloseBraceToken);
+                }
+
                 function writeAnonymousType(type: ObjectType, flags: TypeFormatFlags) {
                     const symbol = type.symbol;
                     if (symbol) {
@@ -2436,6 +2470,13 @@ namespace ts {
                     writePunctuation(writer, SyntaxKind.OpenBraceToken);
                     writer.writeLine();
                     writer.increaseIndent();
+                    writeObjectLiteralType(resolved);
+                    writer.decreaseIndent();
+                    writePunctuation(writer, SyntaxKind.CloseBraceToken);
+                    inObjectTypeLiteral = saveInObjectTypeLiteral;
+                }
+
+                function writeObjectLiteralType(resolved: ResolvedType) {
                     for (const signature of resolved.callSignatures) {
                         buildSignatureDisplay(signature, writer, enclosingDeclaration, globalFlagsToPass, /*kind*/ undefined, symbolStack);
                         writePunctuation(writer, SyntaxKind.SemicolonToken);
@@ -2468,11 +2509,8 @@ namespace ts {
                             writer.writeLine();
                         }
                     }
-                    writer.decreaseIndent();
-                    writePunctuation(writer, SyntaxKind.CloseBraceToken);
-                    inObjectTypeLiteral = saveInObjectTypeLiteral;
                 }
-            }
+           }
 
             function buildTypeParameterDisplayFromSymbol(symbol: Symbol, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags) {
                 const targetSymbol = getTargetSymbol(symbol);
@@ -2981,7 +3019,11 @@ namespace ts {
                 // present (aka the tuple element property). This call also checks that the parentType is in
                 // fact an iterable or array (depending on target language).
                 const elementType = checkIteratedTypeOrElementType(parentType, pattern, /*allowStringInput*/ false);
-                if (!declaration.dotDotDotToken) {
+                if (declaration.dotDotDotToken) {
+                    // Rest element has an array type with the same element type as the parent type
+                    type = createArrayType(elementType);
+                }
+                else {
                     // Use specific property type when parent is a tuple or numeric index type when parent is an array
                     const propName = "" + indexOf(pattern.elements, declaration);
                     type = isTupleLikeType(parentType)
@@ -2997,10 +3039,6 @@ namespace ts {
                         return unknownType;
                     }
                 }
-                else {
-                    // Rest element has an array type with the same element type as the parent type
-                    type = createArrayType(elementType);
-                }
             }
             // In strict null checking mode, if a default value of a non-undefined type is specified, remove
             // undefined from the final type.
@@ -4266,6 +4304,22 @@ namespace ts {
             setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
 
+        function resolveSpreadTypeMembers(type: SpreadType) {
+            // The members and properties collections are empty for spread types. To get all properties of an
+            // spread type use getPropertiesOfType (only the language service uses this).
+            let stringIndexInfo: IndexInfo = undefined;
+            let numberIndexInfo: IndexInfo = undefined;
+            for (let i = type.types.length - 1; i > -1; i--) {
+                const t = type.types[i];
+                stringIndexInfo = intersectIndexInfos(stringIndexInfo, getIndexInfoOfType(t, IndexKind.String));
+                numberIndexInfo = intersectIndexInfos(numberIndexInfo, getIndexInfoOfType(t, IndexKind.Number));
+                if (!t.symbol || !(t.symbol.flags & SymbolFlags.Optional)) {
+                    break;
+                }
+            }
+            setObjectTypeMembers(type, emptySymbols, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
+        }
+
         function resolveAnonymousTypeMembers(type: AnonymousType) {
             const symbol = type.symbol;
             if (type.target) {
@@ -4332,6 +4386,9 @@ namespace ts {
                 else if (type.flags & TypeFlags.Intersection) {
                     resolveIntersectionTypeMembers(<IntersectionType>type);
                 }
+                else if (type.flags & TypeFlags.Spread) {
+                    resolveSpreadTypeMembers(<SpreadType>type);
+                }
             }
             return <ResolvedType>type;
         }
@@ -4341,6 +4398,9 @@ namespace ts {
             if (type.flags & TypeFlags.ObjectType) {
                 return resolveStructuredTypeMembers(<ObjectType>type).properties;
             }
+            if (type.flags & TypeFlags.Spread) {
+                return getPropertiesOfType(type);
+            }
             return emptyArray;
         }
 
@@ -4356,10 +4416,11 @@ namespace ts {
             }
         }
 
-        function getPropertiesOfUnionOrIntersectionType(type: UnionOrIntersectionType): Symbol[] {
+        function getPropertiesOfUnionOrIntersectionOrSpreadType(type: TypeOperatorType): Symbol[] {
+            const getProperty = type.flags & TypeFlags.Spread ? getPropertyOfSpreadType : getPropertyOfUnionOrIntersectionType;
             for (const current of type.types) {
                 for (const prop of getPropertiesOfType(current)) {
-                    getPropertyOfUnionOrIntersectionType(type, prop.name);
+                    getProperty(type, prop.name);
                 }
                 // The properties of a union type are those that are present in all constituent types, so
                 // we only need to check the properties of the first type
@@ -4372,7 +4433,8 @@ namespace ts {
 
         function getPropertiesOfType(type: Type): Symbol[] {
             type = getApparentType(type);
-            return type.flags & TypeFlags.UnionOrIntersection ? getPropertiesOfUnionOrIntersectionType(<UnionType>type) : getPropertiesOfObjectType(type);
+            return type.flags & (TypeFlags.UnionOrIntersection | TypeFlags.Spread) ? getPropertiesOfUnionOrIntersectionOrSpreadType(<UnionType>type) :
+                getPropertiesOfObjectType(type);
         }
 
         /**
@@ -4398,7 +4460,7 @@ namespace ts {
         function getApparentType(type: Type): Type {
             if (type.flags & TypeFlags.TypeParameter) {
                 type = getApparentTypeOfTypeParameter(<TypeParameter>type);
-            }
+          }
             if (type.flags & TypeFlags.StringLike) {
                 type = globalStringType;
             }
@@ -4414,34 +4476,43 @@ namespace ts {
             return type;
         }
 
-        function createUnionOrIntersectionProperty(containingType: UnionOrIntersectionType, name: string): Symbol {
+        function createUnionOrIntersectionProperty(containingType: TypeOperatorType, name: string): Symbol {
             const types = containingType.types;
-            let props: Symbol[];
-            // Flags we want to propagate to the result if they exist in all source symbols
-            let commonFlags = (containingType.flags & TypeFlags.Intersection) ? SymbolFlags.Optional : SymbolFlags.None;
-            let isReadonly = false;
-            for (const current of types) {
-                const type = getApparentType(current);
-                if (type !== unknownType) {
-                    const prop = getPropertyOfType(type, name);
-                    if (prop && !(getDeclarationModifierFlagsFromSymbol(prop) & (ModifierFlags.Private | ModifierFlags.Protected))) {
-                        commonFlags &= prop.flags;
-                        if (!props) {
-                            props = [prop];
+            return createUnionOrIntersectionOrSpreadPropertySymbol(containingType, name, () => {
+                let props: Symbol[];
+                // Flags we want to propagate to the result if they exist in all source symbols
+                let commonFlags = (containingType.flags & TypeFlags.Intersection) ? SymbolFlags.Optional : SymbolFlags.None;
+                let isReadonly = false;
+                for (const current of types) {
+                    const type = getApparentType(current);
+                    if (type !== unknownType) {
+                        const prop = getPropertyOfType(type, name);
+                        if (prop && !(getDeclarationModifierFlagsFromSymbol(prop) & (ModifierFlags.Private | ModifierFlags.Protected))) {
+                            commonFlags &= prop.flags;
+                            if (!props) {
+                                props = [prop];
+                            }
+                            else if (!contains(props, prop)) {
+                                props.push(prop);
+                            }
+                            if (isReadonlySymbol(prop)) {
+                                isReadonly = true;
+                            }
                         }
-                        else if (!contains(props, prop)) {
-                            props.push(prop);
+                        else if (containingType.flags & TypeFlags.Union) {
+                            // A union type requires the property to be present in all constituent types
+                            return [undefined, false, 0];
                         }
-                        if (isReadonlySymbol(prop)) {
-                            isReadonly = true;
-                        }
-                    }
-                    else if (containingType.flags & TypeFlags.Union) {
-                        // A union type requires the property to be present in all constituent types
-                        return undefined;
                     }
                 }
-            }
+                return [props, isReadonly, commonFlags];
+            });
+        }
+
+        function createUnionOrIntersectionOrSpreadPropertySymbol(containingType: TypeOperatorType,
+                                                                 name: string,
+                                                                 symbolCreator: () => [Symbol[], boolean, SymbolFlags]) {
+            const [props, isReadonly, flags] = symbolCreator();
             if (!props) {
                 return undefined;
             }
@@ -4469,17 +4540,17 @@ namespace ts {
                 SymbolFlags.Property |
                 SymbolFlags.Transient |
                 SymbolFlags.SyntheticProperty |
-                commonFlags,
+                flags,
                 name);
             result.containingType = containingType;
             result.hasCommonType = hasCommonType;
             result.declarations = declarations;
             result.isReadonly = isReadonly;
-            result.type = containingType.flags & TypeFlags.Union ? getUnionType(propTypes) : getIntersectionType(propTypes);
+            result.type = containingType.flags & TypeFlags.Intersection ? getIntersectionType(propTypes) : getUnionType(propTypes);
             return result;
         }
 
-        function getPropertyOfUnionOrIntersectionType(type: UnionOrIntersectionType, name: string): Symbol {
+        function getPropertyOfUnionOrIntersectionType(type: TypeOperatorType, name: string): Symbol {
             const properties = type.resolvedProperties || (type.resolvedProperties = createMap<Symbol>());
             let property = properties[name];
             if (!property) {
@@ -4491,6 +4562,61 @@ namespace ts {
             return property;
         }
 
+        function createSpreadProperty(containingType: SpreadType, name: string): Symbol {
+            const types = containingType.types;
+            return createUnionOrIntersectionOrSpreadPropertySymbol(containingType, name, () => {
+                let props: Symbol[];
+                // Result is readonly if any source is readonly
+                let isReadonly = false;
+                // Result is optional if all sources are optional
+                let commonFlags = SymbolFlags.Optional;
+                for (let i = types.length - 1; i > -1; i--) {
+                    const type = getApparentType(types[i]);
+                    if (type !== unknownType) {
+                        const prop = getPropertyOfType(type, name);
+                        if (prop) {
+                            if (prop.flags & SymbolFlags.Method && !types[i].isDeclaredProperty ||
+                                prop.flags & SymbolFlags.SetAccessor && !(prop.flags & SymbolFlags.GetAccessor)) {
+                                // skip non-object-literal methods and set-only properties and keep looking
+                                continue;
+                            }
+                            if (!props) {
+                                props = [prop];
+                            }
+                            else if (!contains(props, prop)) {
+                                props.unshift(prop);
+                            }
+                            if (isReadonlySymbol(prop)) {
+                                isReadonly = true;
+                            }
+                            if (getDeclarationModifierFlagsFromSymbol(prop) & (ModifierFlags.Private | ModifierFlags.Protected)) {
+                                // return immediately because even if prop is optional, it would make the unioned spread property private
+                                return [undefined, false, 0];
+                            }
+                            if (!(prop.flags & SymbolFlags.Optional)) {
+                                // Reset extraFlags to None since we found a non-optional property
+                                commonFlags = SymbolFlags.None;
+                                break;
+                            }
+                        }
+                    }
+                }
+                return [props, isReadonly, commonFlags];
+            });
+        }
+
+        function getPropertyOfSpreadType(type: TypeOperatorType, name: string): Symbol {
+            const properties = type.resolvedProperties || (type.resolvedProperties = createMap<Symbol>());
+            let property = properties[name];
+            if (!property) {
+                property = createSpreadProperty(type as SpreadType, name);
+                if (property) {
+                    properties[name] = property;
+                }
+            }
+            return property;
+        }
+
         /**
          * Return the symbol for the property with the given name in the given type. Creates synthetic union properties when
          * necessary, maps primitive types and type parameters are to their apparent types, and augments with properties from
@@ -4516,7 +4642,10 @@ namespace ts {
                 return getPropertyOfObjectType(globalObjectType, name);
             }
             if (type.flags & TypeFlags.UnionOrIntersection) {
-                return getPropertyOfUnionOrIntersectionType(<UnionOrIntersectionType>type, name);
+                return getPropertyOfUnionOrIntersectionType(<TypeOperatorType>type, name);
+            }
+            if (type.flags & TypeFlags.Spread) {
+                return getPropertyOfSpreadType(<SpreadType>type, name);
             }
             return undefined;
         }
@@ -5538,8 +5667,44 @@ namespace ts {
         function getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node: Node, aliasSymbol?: Symbol, aliasTypeArguments?: Type[]): Type {
             const links = getNodeLinks(node);
             if (!links.resolvedType) {
-                // Deferred resolution of members is handled by resolveObjectTypeMembers
-                const type = createObjectType(TypeFlags.Anonymous, node.symbol);
+                const isSpread = (node.kind === SyntaxKind.TypeLiteral &&
+                                  find((node as TypeLiteralNode).members, elt => elt.kind === SyntaxKind.SpreadTypeElement));
+                let type: ObjectType;
+                if (isSpread) {
+                    let members: Map<Symbol>;
+                    const spreads: SpreadElementType[] = [];
+                    for (const member of (node as TypeLiteralNode).members) {
+                        if (member.kind === SyntaxKind.SpreadTypeElement) {
+                            if (members) {
+                                const t = createAnonymousType(undefined, members, emptyArray, emptyArray, undefined, undefined) as SpreadElementType;
+                                t.isDeclaredProperty = true;
+                                spreads.push(t);
+                                members = undefined;
+                            }
+                            spreads.push(getTypeFromTypeNode((member as SpreadTypeElement).type) as SpreadElementType);
+                        }
+                        else if (member.kind !== SyntaxKind.CallSignature && member.kind !== SyntaxKind.ConstructSignature) {
+                            // note that spread types don't include call and construct signatures
+                            const flags = SymbolFlags.Property | SymbolFlags.Transient | (member.questionToken ? SymbolFlags.Optional : 0);
+                            const text = getTextOfPropertyName(member.name);
+                            const symbol = <TransientSymbol>createSymbol(flags, text);
+                            symbol.type = getTypeFromTypeNodeNoAlias((member as IndexSignatureDeclaration | PropertySignature | MethodSignature).type);
+                            if (!members) {
+                                members = createMap<Symbol>();
+                            }
+                            members[symbol.name] = symbol;
+                        }
+                    }
+                    if (members) {
+                        const t = createAnonymousType(undefined, members, emptyArray, emptyArray, undefined, undefined) as SpreadElementType;
+                        t.isDeclaredProperty = true;
+                        spreads.push(t);
+                    }
+                    return getSpreadType(spreads, node.symbol);
+                }
+                else {
+                    type = createObjectType(TypeFlags.Anonymous, node.symbol);
+                }
                 type.aliasSymbol = aliasSymbol;
                 type.aliasTypeArguments = aliasTypeArguments;
                 links.resolvedType = type;
@@ -5547,6 +5712,18 @@ namespace ts {
             return links.resolvedType;
         }
 
+        function getSpreadType(types: SpreadElementType[], symbol: Symbol, aliasSymbol?: Symbol, aliasTypeArguments?: Type[]): Type {
+            const id = getTypeListId(types);
+            if (id in spreadTypes) {
+                return spreadTypes[id];
+            }
+            const spread = spreadTypes[id] = createObjectType(TypeFlags.Spread, symbol) as SpreadType;
+            spread.types = filter(types, t => !(t.flags & (TypeFlags.Null | TypeFlags.Undefined)));
+            spread.aliasSymbol = aliasSymbol;
+            spread.aliasTypeArguments = aliasTypeArguments;
+            return spread;
+        }
+
         function createLiteralType(flags: TypeFlags, text: string) {
             const type = <LiteralType>createType(flags);
             type.text = text;
@@ -5937,6 +6114,9 @@ namespace ts {
                 if (type.flags & TypeFlags.Intersection) {
                     return getIntersectionType(instantiateList((<IntersectionType>type).types, mapper, instantiateType), type.aliasSymbol, mapper.targetTypes);
                 }
+                if (type.flags & TypeFlags.Spread) {
+                    return getSpreadType(instantiateList((type as SpreadType).types, mapper, instantiateType) as SpreadElementType[], type.symbol, type.aliasSymbol, mapper.targetTypes);
+                }
             }
             return type;
         }
@@ -6460,6 +6640,26 @@ namespace ts {
                     }
                 }
 
+                if (source.flags & TypeFlags.Spread && target.flags & TypeFlags.Spread) {
+                    const sourceParameters = filter((source as SpreadType).types, t => !!(t.flags & TypeFlags.TypeParameter));
+                    const targetParameters = filter((target as SpreadType).types, t => !!(t.flags & TypeFlags.TypeParameter));
+                    if (sourceParameters.length !== targetParameters.length) {
+                        reportRelationError(headMessage, source, target);
+                        return Ternary.False;
+                    }
+                    for (let i = 0; i < sourceParameters.length; i++) {
+                        if (sourceParameters[i].symbol !== targetParameters[i].symbol) {
+                            reportRelationError(headMessage, source, target);
+                            return Ternary.False;
+                        }
+                    }
+                    const reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo;
+                    if (result = objectTypeRelatedTo(source, source, target, reportStructuralErrors)) {
+                        errorInfo = saveErrorInfo;
+                        return result;
+                    }
+                }
+
                 if (source.flags & TypeFlags.TypeParameter) {
                     let constraint = getConstraintOfTypeParameter(<TypeParameter>source);
 
@@ -6490,7 +6690,7 @@ namespace ts {
                     // In a check of the form X = A & B, we will have previously checked if A relates to X or B relates
                     // to X. Failing both of those we want to check if the aggregation of A and B's members structurally
                     // relates to X. Thus, we include intersection types on the source side here.
-                    if (apparentSource.flags & (TypeFlags.ObjectType | TypeFlags.Intersection) && target.flags & TypeFlags.ObjectType) {
+                    if (apparentSource.flags & (TypeFlags.ObjectType | TypeFlags.Intersection | TypeFlags.Spread) && target.flags & TypeFlags.ObjectType) {
                         // Report structural errors only if we haven't reported any errors yet
                         const reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo && !(source.flags & TypeFlags.Primitive);
                         if (result = objectTypeRelatedTo(apparentSource, source, target, reportStructuralErrors)) {
@@ -6525,8 +6725,8 @@ namespace ts {
                 }
                 if (source.flags & TypeFlags.Union && target.flags & TypeFlags.Union ||
                     source.flags & TypeFlags.Intersection && target.flags & TypeFlags.Intersection) {
-                    if (result = eachTypeRelatedToSomeType(<UnionOrIntersectionType>source, <UnionOrIntersectionType>target, /*reportErrors*/ false)) {
-                        if (result &= eachTypeRelatedToSomeType(<UnionOrIntersectionType>target, <UnionOrIntersectionType>source, /*reportErrors*/ false)) {
+                    if (result = eachTypeRelatedToSomeType(<TypeOperatorType>source, <TypeOperatorType>target, /*reportErrors*/ false)) {
+                        if (result &= eachTypeRelatedToSomeType(<TypeOperatorType>target, <TypeOperatorType>source, /*reportErrors*/ false)) {
                             return result;
                         }
                     }
@@ -6549,7 +6749,7 @@ namespace ts {
                     }
                 }
                 else if (type.flags & TypeFlags.UnionOrIntersection) {
-                    for (const t of (<UnionOrIntersectionType>type).types) {
+                    for (const t of (<TypeOperatorType>type).types) {
                         if (isKnownProperty(t, name)) {
                             return true;
                         }
@@ -6586,7 +6786,7 @@ namespace ts {
                 return false;
             }
 
-            function eachTypeRelatedToSomeType(source: UnionOrIntersectionType, target: UnionOrIntersectionType, reportErrors: boolean): Ternary {
+            function eachTypeRelatedToSomeType(source: TypeOperatorType, target: TypeOperatorType, reportErrors: boolean): Ternary {
                 let result = Ternary.True;
                 const sourceTypes = source.types;
                 for (const sourceType of sourceTypes) {
@@ -6599,7 +6799,7 @@ namespace ts {
                 return result;
             }
 
-            function typeRelatedToSomeType(source: Type, target: UnionOrIntersectionType, reportErrors: boolean): Ternary {
+            function typeRelatedToSomeType(source: Type, target: TypeOperatorType, reportErrors: boolean): Ternary {
                 const targetTypes = target.types;
                 if (target.flags & TypeFlags.Union && containsType(targetTypes, source)) {
                     return Ternary.True;
@@ -6614,7 +6814,7 @@ namespace ts {
                 return Ternary.False;
             }
 
-            function typeRelatedToEachType(source: Type, target: UnionOrIntersectionType, reportErrors: boolean): Ternary {
+            function typeRelatedToEachType(source: Type, target: TypeOperatorType, reportErrors: boolean): Ternary {
                 let result = Ternary.True;
                 const targetTypes = target.types;
                 for (const targetType of targetTypes) {
@@ -6627,7 +6827,7 @@ namespace ts {
                 return result;
             }
 
-            function someTypeRelatedToType(source: UnionOrIntersectionType, target: Type, reportErrors: boolean): Ternary {
+            function someTypeRelatedToType(source: TypeOperatorType, target: Type, reportErrors: boolean): Ternary {
                 const sourceTypes = source.types;
                 if (source.flags & TypeFlags.Union && containsType(sourceTypes, target)) {
                     return Ternary.True;
@@ -6642,7 +6842,7 @@ namespace ts {
                 return Ternary.False;
             }
 
-            function eachTypeRelatedToType(source: UnionOrIntersectionType, target: Type, reportErrors: boolean): Ternary {
+            function eachTypeRelatedToType(source: TypeOperatorType, target: Type, reportErrors: boolean): Ternary {
                 let result = Ternary.True;
                 const sourceTypes = source.types;
                 for (const sourceType of sourceTypes) {
@@ -7578,10 +7778,10 @@ namespace ts {
             return !!(type.flags & TypeFlags.TypeParameter ||
                 type.flags & TypeFlags.Reference && forEach((<TypeReference>type).typeArguments, couldContainTypeParameters) ||
                 type.flags & TypeFlags.Anonymous && type.symbol && type.symbol.flags & (SymbolFlags.Method | SymbolFlags.TypeLiteral | SymbolFlags.Class) ||
-                type.flags & TypeFlags.UnionOrIntersection && couldUnionOrIntersectionContainTypeParameters(<UnionOrIntersectionType>type));
+                type.flags & TypeFlags.UnionOrIntersection && couldUnionOrIntersectionContainTypeParameters(<TypeOperatorType>type));
         }
 
-        function couldUnionOrIntersectionContainTypeParameters(type: UnionOrIntersectionType): boolean {
+        function couldUnionOrIntersectionContainTypeParameters(type: TypeOperatorType): boolean {
             if (type.couldContainTypeParameters === undefined) {
                 type.couldContainTypeParameters = forEach(type.types, couldContainTypeParameters);
             }
@@ -7589,7 +7789,7 @@ namespace ts {
         }
 
         function isTypeParameterAtTopLevel(type: Type, typeParameter: TypeParameter): boolean {
-            return type === typeParameter || type.flags & TypeFlags.UnionOrIntersection && forEach((<UnionOrIntersectionType>type).types, t => isTypeParameterAtTopLevel(t, typeParameter));
+            return type === typeParameter || type.flags & TypeFlags.UnionOrIntersection && forEach((<TypeOperatorType>type).types, t => isTypeParameterAtTopLevel(t, typeParameter));
         }
 
         function inferTypes(context: InferenceContext, originalSource: Type, originalTarget: Type) {
@@ -7619,7 +7819,7 @@ namespace ts {
                     // 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) {
+                        for (const t of (<TypeOperatorType>source).types) {
                             inferFromTypes(t, t);
                         }
                         return;
@@ -7631,14 +7831,14 @@ namespace ts {
                     // and string literals because the number and string types are not represented as unions
                     // of all their possible values.
                     let matchingTypes: Type[];
-                    for (const t of (<UnionOrIntersectionType>source).types) {
-                        if (typeIdenticalToSomeType(t, (<UnionOrIntersectionType>target).types)) {
+                    for (const t of (<TypeOperatorType>source).types) {
+                        if (typeIdenticalToSomeType(t, (<TypeOperatorType>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)) {
+                            if (typeIdenticalToSomeType(b, (<TypeOperatorType>target).types)) {
                                 (matchingTypes || (matchingTypes = [])).push(t, b);
                             }
                         }
@@ -7647,8 +7847,8 @@ 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);
+                        source = removeTypesFromUnionOrIntersection(<TypeOperatorType>source, matchingTypes);
+                        target = removeTypesFromUnionOrIntersection(<TypeOperatorType>target, matchingTypes);
                     }
                 }
                 if (target.flags & TypeFlags.TypeParameter) {
@@ -7695,7 +7895,7 @@ namespace ts {
                     }
                 }
                 else if (target.flags & TypeFlags.UnionOrIntersection) {
-                    const targetTypes = (<UnionOrIntersectionType>target).types;
+                    const targetTypes = (<TypeOperatorType>target).types;
                     let typeParameterCount = 0;
                     let typeParameter: TypeParameter;
                     // First infer to each type in union or intersection that isn't a type parameter
@@ -7719,7 +7919,7 @@ namespace ts {
                 }
                 else if (source.flags & TypeFlags.UnionOrIntersection) {
                     // Source is a union or intersection type, infer from each constituent type
-                    const sourceTypes = (<UnionOrIntersectionType>source).types;
+                    const sourceTypes = (<TypeOperatorType>source).types;
                     for (const sourceType of sourceTypes) {
                         inferFromTypes(sourceType, target);
                     }
@@ -7824,7 +8024,7 @@ namespace ts {
          * 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[]) {
+        function removeTypesFromUnionOrIntersection(type: TypeOperatorType, typesToRemove: Type[]) {
             const reducedTypes: Type[] = [];
             for (const t of type.types) {
                 if (!typeIdenticalToSomeType(t, typesToRemove)) {
@@ -8148,7 +8348,7 @@ namespace ts {
                 return getTypeFacts(constraint || emptyObjectType);
             }
             if (flags & TypeFlags.UnionOrIntersection) {
-                return getTypeFactsOfTypes((<UnionOrIntersectionType>type).types);
+                return getTypeFactsOfTypes((<TypeOperatorType>type).types);
             }
             return TypeFacts.All;
         }
@@ -10184,8 +10384,9 @@ namespace ts {
             // Grammar checking
             checkGrammarObjectLiteralExpression(node, inDestructuringPattern);
 
-            const propertiesTable = createMap<Symbol>();
-            const propertiesArray: Symbol[] = [];
+            let propertiesTable = createMap<Symbol>();
+            let propertiesArray: Symbol[] = [];
+            const spreads: SpreadElementType[] = [];
             const contextualType = getApparentTypeOfContextualType(node);
             const contextualTypeHasPattern = contextualType && contextualType.pattern &&
                 (contextualType.pattern.kind === SyntaxKind.ObjectBindingPattern || contextualType.pattern.kind === SyntaxKind.ObjectLiteralExpression);
@@ -10210,6 +10411,14 @@ namespace ts {
                         Debug.assert(memberDecl.kind === SyntaxKind.ShorthandPropertyAssignment);
                         type = checkExpressionForMutableLocation((<ShorthandPropertyAssignment>memberDecl).name, contextualMapper);
                     }
+
+                    if (hasProperty(propertiesTable, member.name)) {
+                        const existingPropType = getTypeOfSymbol(propertiesTable[member.name]);
+                        if (!isTypeIdenticalTo(existingPropType, type)) {
+                            error(memberDecl.name, Diagnostics.Cannot_change_type_of_property_0_from_1_to_2, member.name, typeToString(existingPropType), typeToString(type));
+                        }
+                    }
+
                     typeFlags |= type.flags;
                     const prop = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | member.flags, member.name);
                     if (inDestructuringPattern) {
@@ -10247,6 +10456,19 @@ namespace ts {
                     prop.target = member;
                     member = prop;
                 }
+                else if (memberDecl.kind === SyntaxKind.SpreadElement) {
+                    if (propertiesArray.length > 0) {
+                        const t = createObjectLiteralType(node, hasComputedStringProperty, hasComputedNumberProperty, propertiesArray, propertiesTable, typeFlags, patternWithComputedProperties, inDestructuringPattern) as SpreadElementType;
+                        t.isDeclaredProperty = true;
+                        spreads.push(t);
+                        propertiesArray = [];
+                        propertiesTable = createMap<Symbol>();
+                        hasComputedStringProperty = false;
+                        hasComputedNumberProperty = false;
+                    }
+                    spreads.push(checkExpression((memberDecl as SpreadElement).target) as SpreadElementType);
+                    continue;
+                }
                 else {
                     // TypeScript 1.0 spec (April 2014)
                     // A get accessor declaration is processed in the same manner as
@@ -10286,6 +10508,22 @@ namespace ts {
                 }
             }
 
+            if (spreads.length > 0) {
+                if (propertiesArray.length > 0) {
+                    const t = createObjectLiteralType(node, hasComputedStringProperty, hasComputedNumberProperty, propertiesArray, propertiesTable, typeFlags, patternWithComputedProperties, inDestructuringPattern) as SpreadElementType;
+                    t.isDeclaredProperty = true;
+                    spreads.push(t);
+                }
+                const propagatedFlags = getPropagatingFlagsOfTypes(spreads, /*excludeKinds*/ TypeFlags.Nullable);
+                const spread = getSpreadType(spreads, node.symbol);
+                spread.flags |= propagatedFlags;
+                return spread;
+            }
+
+            return createObjectLiteralType(node, hasComputedStringProperty, hasComputedNumberProperty, propertiesArray, propertiesTable, typeFlags, patternWithComputedProperties, inDestructuringPattern);
+        }
+
+        function createObjectLiteralType(node: ObjectLiteralExpression, hasComputedStringProperty: boolean, hasComputedNumberProperty: boolean, propertiesArray: Symbol[], propertiesTable: Map<Symbol>, typeFlags: TypeFlags, patternWithComputedProperties: boolean, inDestructuringPattern: boolean) {
             const stringIndexInfo = hasComputedStringProperty ? getObjectLiteralIndexInfo(node, propertiesArray, IndexKind.String) : undefined;
             const numberIndexInfo = hasComputedNumberProperty ? getObjectLiteralIndexInfo(node, propertiesArray, IndexKind.Number) : undefined;
             const result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
@@ -10534,7 +10772,7 @@ namespace ts {
                 elemType = checkExpression(node.tagName);
             }
             if (elemType.flags & TypeFlags.Union) {
-                const types = (<UnionOrIntersectionType>elemType).types;
+                const types = (<TypeOperatorType>elemType).types;
                 return getUnionType(types.map(type => {
                     return getResolvedJsxType(node, type, elemClassType);
                 }), /*subtypeReduction*/ true);
@@ -13096,7 +13334,7 @@ namespace ts {
                 return true;
             }
             if (type.flags & TypeFlags.UnionOrIntersection) {
-                const types = (<UnionOrIntersectionType>type).types;
+                const types = (<TypeOperatorType>type).types;
                 for (const t of types) {
                     if (maybeTypeOfKind(t, kind)) {
                         return true;
@@ -13114,7 +13352,7 @@ namespace ts {
                 return true;
             }
             if (type.flags & TypeFlags.Union) {
-                const types = (<UnionOrIntersectionType>type).types;
+                const types = (<TypeOperatorType>type).types;
                 for (const t of types) {
                     if (!isTypeOfKind(t, kind)) {
                         return false;
@@ -13123,7 +13361,7 @@ namespace ts {
                 return true;
             }
             if (type.flags & TypeFlags.Intersection) {
-                const types = (<UnionOrIntersectionType>type).types;
+                const types = (<TypeOperatorType>type).types;
                 for (const t of types) {
                     if (isTypeOfKind(t, kind)) {
                         return true;
@@ -19194,7 +19432,7 @@ namespace ts {
                     if (requestedExternalEmitHelpers & NodeFlags.HasClassExtends && languageVersion < ScriptTarget.ES6) {
                         verifyHelperSymbol(exports, "__extends", SymbolFlags.Value);
                     }
-                    if (requestedExternalEmitHelpers & NodeFlags.HasJsxSpreadAttributes && compilerOptions.jsx !== JsxEmit.Preserve) {
+                    if (requestedExternalEmitHelpers & NodeFlags.HasSpreadAttribute && compilerOptions.jsx !== JsxEmit.Preserve) {
                         verifyHelperSymbol(exports, "__assign", SymbolFlags.Value);
                     }
                     if (requestedExternalEmitHelpers & NodeFlags.HasDecorators) {
@@ -19758,6 +19996,11 @@ namespace ts {
                 }
             }
 
+            let result: TypeElement;
+            if (result = find(node.members, e => e.kind === SyntaxKind.SpreadTypeElement)) {
+                return grammarErrorOnNode(result, Diagnostics.Interface_declaration_cannot_contain_a_spread_property);
+            }
+
             return false;
         }
 
@@ -19805,9 +20048,23 @@ namespace ts {
             const GetOrSetAccessor = GetAccessor | SetAccessor;
 
             for (const prop of node.properties) {
+                if (prop.kind === SyntaxKind.SpreadElement) {
+                    const target = (prop as SpreadElement).target;
+                    switch (target.kind) {
+                        case SyntaxKind.Identifier:
+                        case SyntaxKind.PropertyAccessExpression:
+                        case SyntaxKind.ObjectLiteralExpression:
+                        case SyntaxKind.NullKeyword:
+                            break;
+                        default:
+                            grammarErrorOnNode(target, Diagnostics.Spread_properties_must_be_identifiers_property_accesses_or_object_literals);
+                    }
+
+                    continue;
+                }
                 const name = prop.name;
                 if (prop.kind === SyntaxKind.OmittedExpression ||
-                    name.kind === SyntaxKind.ComputedPropertyName) {
+                    name && name.kind === SyntaxKind.ComputedPropertyName) {
                     // If the name is not a ComputedPropertyName, the grammar checking will skip it
                     checkGrammarComputedPropertyName(<ComputedPropertyName>name);
                 }
@@ -20127,7 +20384,7 @@ namespace ts {
                 }
 
                 if (node.initializer) {
-                    // Error on equals token which immediate precedes the initializer
+                    // Error on equals token which immediately precedes the initializer
                     return grammarErrorAtPos(getSourceFileOfNode(node), node.initializer.pos - 1, 1, Diagnostics.A_rest_element_cannot_have_an_initializer);
                 }
             }
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index be4ee2fa07d..69c2a431fc8 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -1963,6 +1963,18 @@
         "category": "Error",
         "code": 2696
     },
+    "Spread properties must be identifiers, property accesses, or object literals.": {
+        "category": "Error",
+        "code": 2697
+    },
+    "Cannot change type of property '{0}' from '{1}' to '{2}'.": {
+        "category": "Error",
+        "code": 2698
+    },
+    "Interface declaration cannot contain a spread property.": {
+        "category": "Error",
+        "code": 2699
+    },
 
     "Import declaration '{0}' is using private name '{1}'.": {
         "category": "Error",
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 1aec63bc588..ae88b6d948b 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -74,6 +74,11 @@ namespace ts {
                     visitNode(cbNode, (<ShorthandPropertyAssignment>node).questionToken) ||
                     visitNode(cbNode, (<ShorthandPropertyAssignment>node).equalsToken) ||
                     visitNode(cbNode, (<ShorthandPropertyAssignment>node).objectAssignmentInitializer);
+            case SyntaxKind.SpreadElement:
+                return visitNode(cbNode, (<SpreadElement>node).dotDotDotToken) ||
+                    visitNode(cbNode, (<SpreadElement>node).target);
+            case SyntaxKind.SpreadTypeElement:
+                return visitNode(cbNode, (node as SpreadTypeElement).type);
             case SyntaxKind.Parameter:
             case SyntaxKind.PropertyDeclaration:
             case SyntaxKind.PropertySignature:
@@ -1262,7 +1267,7 @@ namespace ts {
                     // which would be a candidate for improved error reporting.
                     return token() === SyntaxKind.OpenBracketToken || isLiteralPropertyName();
                 case ParsingContext.ObjectLiteralMembers:
-                    return token() === SyntaxKind.OpenBracketToken || token() === SyntaxKind.AsteriskToken || isLiteralPropertyName();
+                    return token() === SyntaxKind.OpenBracketToken || token() === SyntaxKind.AsteriskToken || token() === SyntaxKind.DotDotDotToken || isLiteralPropertyName();
                 case ParsingContext.ObjectBindingElements:
                     return token() === SyntaxKind.OpenBracketToken || isLiteralPropertyName();
                 case ParsingContext.HeritageClauseElement:
@@ -2328,6 +2333,10 @@ namespace ts {
             if (token() === SyntaxKind.OpenBracketToken) {
                 return true;
             }
+            // spread elements are type members
+            if (token() === SyntaxKind.DotDotDotToken) {
+                return true;
+            }
             // Try to get the first property-like token following all modifiers
             if (isLiteralPropertyName()) {
                 idToken = token();
@@ -2353,6 +2362,9 @@ namespace ts {
             if (token() === SyntaxKind.NewKeyword && lookAhead(isStartOfConstructSignature)) {
                 return parseSignatureMember(SyntaxKind.ConstructSignature);
             }
+            if (token() === SyntaxKind.DotDotDotToken) {
+                return parseSpreadTypeElement();
+            }
             const fullStart = getNodePos();
             const modifiers = parseModifiers();
             if (isIndexSignature()) {
@@ -2361,6 +2373,14 @@ namespace ts {
             return parsePropertyOrMethodSignature(fullStart, modifiers);
         }
 
+        function parseSpreadTypeElement() {
+            const element = createNode(SyntaxKind.SpreadTypeElement, scanner.getStartPos()) as SpreadTypeElement;
+            parseTokenNode<Node>(); // parse `...`
+            element.type = parseType();
+            parseTypeMemberSemicolon();
+            return finishNode(element);
+        }
+
         function isStartOfConstructSignature() {
             nextToken();
             return token() === SyntaxKind.OpenParenToken || token() === SyntaxKind.LessThanToken;
@@ -4123,6 +4143,13 @@ namespace ts {
 
         function parseObjectLiteralElement(): ObjectLiteralElement {
             const fullStart = scanner.getStartPos();
+            const dotDotDotToken = parseOptionalToken(SyntaxKind.DotDotDotToken);
+            if (dotDotDotToken) {
+                const spreadElement = <SpreadElement>createNode(SyntaxKind.SpreadElement, fullStart);
+                spreadElement.dotDotDotToken = dotDotDotToken;
+                spreadElement.target = parseAssignmentExpressionOrHigher();
+                return addJSDocComment(finishNode(spreadElement));
+            }
             const decorators = parseDecorators();
             const modifiers = parseModifiers();
 
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index e4bc9a29d5b..cdf42ebea4f 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -316,6 +316,9 @@ namespace ts {
         // Property assignments
         PropertyAssignment,
         ShorthandPropertyAssignment,
+        SpreadElement, // maybe name it SpreadProperty?
+        SpreadTypeElement, // maybe name it SpreadTypeNode?
+
 
         // Enum
         EnumMember,
@@ -412,7 +415,7 @@ namespace ts {
         HasDecorators =      1 << 11, // If the file has decorators (initialized by binding)
         HasParamDecorators = 1 << 12, // If the file has parameter decorators (initialized by binding)
         HasAsyncFunctions =  1 << 13, // If the file has async functions (initialized by binding)
-        HasJsxSpreadAttributes = 1 << 14, // If the file as JSX spread attributes (initialized by binding)
+        HasSpreadAttribute = 1 << 14, // If the file as JSX spread attributes (initialized by binding)
         DisallowInContext =  1 << 15, // If node was parsed in a context where 'in-expressions' are not allowed
         YieldContext =       1 << 16, // If node was parsed in the 'yield' context created when parsing a generator
         DecoratorContext =   1 << 17, // If node was parsed as part of a decorator
@@ -425,7 +428,7 @@ namespace ts {
         BlockScoped = Let | Const,
 
         ReachabilityCheckFlags = HasImplicitReturn | HasExplicitReturn,
-        EmitHelperFlags = HasClassExtends | HasDecorators | HasParamDecorators | HasAsyncFunctions | HasJsxSpreadAttributes,
+        EmitHelperFlags = HasClassExtends | HasDecorators | HasParamDecorators | HasAsyncFunctions | HasSpreadAttribute,
         ReachabilityAndEmitFlags = ReachabilityCheckFlags | EmitHelperFlags,
 
         // Parsing context flags
@@ -450,7 +453,6 @@ namespace ts {
         Async =              1 << 8,  // Property/Method/Function
         Default =            1 << 9,  // Function/Class (export default declaration)
         Const =              1 << 11, // Variable declaration
-
         HasComputedFlags =   1 << 29, // Modifier flags have been computed
 
         AccessibilityModifier = Public | Private | Protected,
@@ -635,6 +637,11 @@ namespace ts {
         initializer?: Expression;           // Optional initializer
     }
 
+    // @kind(SyntaxKind.SpreadTypeElement)
+    export interface SpreadTypeElement extends TypeElement {
+        type: TypeNode;
+    }
+
     // @kind(SyntaxKind.PropertyDeclaration)
     export interface PropertyDeclaration extends ClassElement {
         questionToken?: Node;               // Present for use with reporting a grammar error
@@ -666,6 +673,12 @@ namespace ts {
         objectAssignmentInitializer?: Expression;
     }
 
+    // @kind(SyntaxKind.SpreadElementExpression)
+    export interface SpreadElement extends ObjectLiteralElement {
+        dotDotDotToken: Node;
+        target: Expression;
+    }
+
     // SyntaxKind.VariableDeclaration
     // SyntaxKind.Parameter
     // SyntaxKind.BindingElement
@@ -2275,7 +2288,7 @@ namespace ts {
         instantiations?: Map<Type>;         // Instantiations of generic type alias (undefined if non-generic)
         mapper?: TypeMapper;                // Type mapper for instantiation alias
         referenced?: boolean;               // True if alias symbol has been referenced as a value
-        containingType?: UnionOrIntersectionType; // Containing union or intersection type for synthetic property
+        containingType?: TypeOperatorType; // Containing union or intersection type for synthetic property
         hasCommonType?: boolean;            // True if constituents of synthetic property all have same type
         isDiscriminantProperty?: boolean;   // True if discriminant synthetic property
         resolvedExports?: SymbolTable;      // Resolved exports of module
@@ -2381,6 +2394,8 @@ namespace ts {
         ContainsAnyFunctionType = 1 << 27,  // Type is or contains object literal type
         ThisType                = 1 << 28,  // This type
         ObjectLiteralPatternWithComputedProperties = 1 << 29,  // Object literal type implied by binding pattern has computed properties
+        Spread                  = 1 << 30,  // Spread types
+        // TODO: Move some types out to make room for Spread.
 
         /* @internal */
         Nullable = Undefined | Null,
@@ -2398,12 +2413,12 @@ namespace ts {
         EnumLike = Enum | EnumLiteral,
         ObjectType = Class | Interface | Reference | Tuple | Anonymous,
         UnionOrIntersection = Union | Intersection,
-        StructuredType = ObjectType | Union | Intersection,
+        StructuredType = ObjectType | Union | Intersection | Spread,
         StructuredOrTypeParameter = StructuredType | TypeParameter,
 
         // 'Narrowable' types are types where narrowing actually narrows.
         // This *should* be every type other than null, undefined, void, and never
-        Narrowable = Any | StructuredType | TypeParameter | StringLike | NumberLike | BooleanLike | ESSymbol,
+        Narrowable = Any | StructuredType | TypeParameter | StringLike | NumberLike | BooleanLike | ESSymbol | Spread,
         NotUnionOrUnit = Any | String | Number | ESSymbol | ObjectType,
         /* @internal */
         RequiresWidening = ContainsWideningType | ContainsObjectLiteral,
@@ -2486,7 +2501,7 @@ namespace ts {
         instantiations: Map<TypeReference>;   // Generic instantiation cache
     }
 
-    export interface UnionOrIntersectionType extends Type {
+    export interface TypeOperatorType extends Type {
         types: Type[];                    // Constituent types
         /* @internal */
         resolvedProperties: SymbolTable;  // Cache of resolved properties
@@ -2494,9 +2509,19 @@ namespace ts {
         couldContainTypeParameters: boolean;
     }
 
-    export interface UnionType extends UnionOrIntersectionType { }
+    export interface UnionType extends TypeOperatorType { }
 
-    export interface IntersectionType extends UnionOrIntersectionType { }
+    export interface IntersectionType extends TypeOperatorType { }
+
+    /* @internal */
+    export interface SpreadType extends TypeOperatorType {
+        types: SpreadElementType[];       // Constituent types
+    }
+
+    /* @internal */
+    export interface SpreadElementType extends ResolvedType {
+        isDeclaredProperty: boolean | undefined;
+    }
 
     /* @internal */
     // An instantiated anonymous type has a target and a mapper
@@ -2506,8 +2531,8 @@ namespace ts {
     }
 
     /* @internal */
-    // Resolved object, union, or intersection type
-    export interface ResolvedType extends ObjectType, UnionOrIntersectionType {
+    // Resolved object, spread, union, or intersection type
+    export interface ResolvedType extends ObjectType, TypeOperatorType {
         members: SymbolTable;              // Properties by name
         properties: Symbol[];              // Properties
         callSignatures: Signature[];       // Call signatures of type
@@ -3096,29 +3121,31 @@ namespace ts {
         ContainsTypeScript = 1 << 1,
         Jsx = 1 << 2,
         ContainsJsx = 1 << 3,
-        ES7 = 1 << 4,
-        ContainsES7 = 1 << 5,
-        ES6 = 1 << 6,
-        ContainsES6 = 1 << 7,
-        DestructuringAssignment = 1 << 8,
-        Generator = 1 << 9,
-        ContainsGenerator = 1 << 10,
+        Experimental = 1 << 4,
+        ContainsExperimental = 1 << 5,
+        ES7 = 1 << 6,
+        ContainsES7 = 1 << 7,
+        ES6 = 1 << 8,
+        ContainsES6 = 1 << 9,
+        DestructuringAssignment = 1 << 10,
+        Generator = 1 << 11,
+        ContainsGenerator = 1 << 12,
 
         // Markers
         // - Flags used to indicate that a subtree contains a specific transformation.
-        ContainsDecorators = 1 << 11,
-        ContainsPropertyInitializer = 1 << 12,
-        ContainsLexicalThis = 1 << 13,
-        ContainsCapturedLexicalThis = 1 << 14,
-        ContainsLexicalThisInComputedPropertyName = 1 << 15,
-        ContainsDefaultValueAssignments = 1 << 16,
-        ContainsParameterPropertyAssignments = 1 << 17,
-        ContainsSpreadElementExpression = 1 << 18,
-        ContainsComputedPropertyName = 1 << 19,
-        ContainsBlockScopedBinding = 1 << 20,
-        ContainsBindingPattern = 1 << 21,
-        ContainsYield = 1 << 22,
-        ContainsHoistedDeclarationOrCompletion = 1 << 23,
+        ContainsDecorators = 1 << 13,
+        ContainsPropertyInitializer = 1 << 14,
+        ContainsLexicalThis = 1 << 15,
+        ContainsCapturedLexicalThis = 1 << 16,
+        ContainsLexicalThisInComputedPropertyName = 1 << 17,
+        ContainsDefaultValueAssignments = 1 << 18,
+        ContainsParameterPropertyAssignments = 1 << 19,
+        ContainsSpreadElementExpression = 1 << 20,
+        ContainsComputedPropertyName = 1 << 21,
+        ContainsBlockScopedBinding = 1 << 22,
+        ContainsBindingPattern = 1 << 23,
+        ContainsYield = 1 << 24,
+        ContainsHoistedDeclarationOrCompletion = 1 << 25,
 
         HasComputedFlags = 1 << 29, // Transform flags have been computed.
 
@@ -3126,6 +3153,7 @@ namespace ts {
         // - Bitmasks that are used to assert facts about the syntax of a node and its subtree.
         AssertTypeScript = TypeScript | ContainsTypeScript,
         AssertJsx = Jsx | ContainsJsx,
+        AssertExperimental = Experimental | ContainsExperimental,
         AssertES7 = ES7 | ContainsES7,
         AssertES6 = ES6 | ContainsES6,
         AssertGenerator = Generator | ContainsGenerator,
@@ -3133,7 +3161,7 @@ namespace ts {
         // Scope Exclusions
         // - Bitmasks that exclude flags from propagating out of a specific context
         //   into the subtree flags of their container.
-        NodeExcludes = TypeScript | Jsx | ES7 | ES6 | DestructuringAssignment | Generator | HasComputedFlags,
+        NodeExcludes = TypeScript | Jsx | Experimental | ES7 | ES6 | DestructuringAssignment | Generator | HasComputedFlags,
         ArrowFunctionExcludes = NodeExcludes | ContainsDecorators | ContainsDefaultValueAssignments | ContainsLexicalThis | ContainsParameterPropertyAssignments | ContainsBlockScopedBinding | ContainsYield | ContainsHoistedDeclarationOrCompletion,
         FunctionExcludes = NodeExcludes | ContainsDecorators | ContainsDefaultValueAssignments | ContainsCapturedLexicalThis | ContainsLexicalThis | ContainsParameterPropertyAssignments | ContainsBlockScopedBinding | ContainsYield | ContainsHoistedDeclarationOrCompletion,
         ConstructorExcludes = NodeExcludes | ContainsDefaultValueAssignments | ContainsLexicalThis | ContainsCapturedLexicalThis | ContainsBlockScopedBinding | ContainsYield | ContainsHoistedDeclarationOrCompletion,
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 7a22c5634d8..67ea182bf98 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -3740,6 +3740,7 @@ namespace ts {
         const kind = node.kind;
         return kind === SyntaxKind.PropertyAssignment
             || kind === SyntaxKind.ShorthandPropertyAssignment
+            || kind === SyntaxKind.SpreadElement
             || kind === SyntaxKind.MethodDeclaration
             || kind === SyntaxKind.GetAccessor
             || kind === SyntaxKind.SetAccessor
diff --git a/src/harness/harness.ts b/src/harness/harness.ts
index b4fd8736b2f..3d050b2cf2c 100644
--- a/src/harness/harness.ts
+++ b/src/harness/harness.ts
@@ -1463,7 +1463,7 @@ namespace Harness {
             }
 
             if (typesError && symbolsError) {
-                throw new Error(typesError.message + ts.sys.newLine + symbolsError.message);
+                throw new Error(typesError.message + Harness.IO.newLine() + symbolsError.message);
             }
 
             if (typesError) {
diff --git a/src/services/findAllReferences.ts b/src/services/findAllReferences.ts
index dcda3e40b1a..8766937c008 100644
--- a/src/services/findAllReferences.ts
+++ b/src/services/findAllReferences.ts
@@ -458,7 +458,7 @@ namespace ts.FindAllReferences {
                                 return [localParentType.symbol];
                             }
                             else if (localParentType.flags & TypeFlags.UnionOrIntersection) {
-                                return getSymbolsForClassAndInterfaceComponents(<UnionOrIntersectionType>localParentType);
+                                return getSymbolsForClassAndInterfaceComponents(<TypeOperatorType>localParentType);
                             }
                         }
                     }
@@ -630,13 +630,13 @@ namespace ts.FindAllReferences {
             }
         }
 
-        function getSymbolsForClassAndInterfaceComponents(type: UnionOrIntersectionType, result: Symbol[] = []): Symbol[] {
+        function getSymbolsForClassAndInterfaceComponents(type: TypeOperatorType, result: Symbol[] = []): Symbol[] {
             for (const componentType of type.types) {
                 if (componentType.symbol && componentType.symbol.getFlags() & (SymbolFlags.Class | SymbolFlags.Interface)) {
                     result.push(componentType.symbol);
                 }
                 if (componentType.getFlags() & TypeFlags.UnionOrIntersection) {
-                    getSymbolsForClassAndInterfaceComponents(<UnionOrIntersectionType>componentType, result);
+                    getSymbolsForClassAndInterfaceComponents(<TypeOperatorType>componentType, result);
                 }
             }
             return result;

From 7004652a0a714364eb627591df5e288220c58226 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 26 Sep 2016 09:31:34 -0700
Subject: [PATCH 002/421] Declaration emit spread types and downlevel spread

---
 src/compiler/declarationEmitter.ts        | 10 +++
 src/compiler/emitter.ts                   |  2 +-
 src/compiler/transformer.ts               |  4 +-
 src/compiler/transformers/es7.ts          |  3 +-
 src/compiler/transformers/experimental.ts | 80 +++++++++++++++++++++++
 5 files changed, 95 insertions(+), 4 deletions(-)
 create mode 100644 src/compiler/transformers/experimental.ts

diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts
index a015ad79b97..58ed2211160 100644
--- a/src/compiler/declarationEmitter.ts
+++ b/src/compiler/declarationEmitter.ts
@@ -1121,6 +1121,14 @@ namespace ts {
             writeLine();
         }
 
+
+        function emitSpreadTypeElement(type: SpreadTypeElement) {
+            write("...");
+            emitType(type.type);
+            write(";");
+            writeLine();
+        }
+
         function emitVariableDeclaration(node: VariableDeclaration) {
             // If we are emitting property it isn't moduleElement and hence we already know it needs to be emitted
             // so there is no check needed to see if declaration is visible
@@ -1702,6 +1710,8 @@ namespace ts {
                 case SyntaxKind.PropertyDeclaration:
                 case SyntaxKind.PropertySignature:
                     return emitPropertyDeclaration(<PropertyDeclaration>node);
+                case SyntaxKind.SpreadTypeElement:
+                    return emitSpreadTypeElement(node as SpreadTypeElement);
                 case SyntaxKind.EnumMember:
                     return emitEnumMemberDeclaration(<EnumMember>node);
                 case SyntaxKind.ExportAssignment:
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 14e743cf59f..cd00f7ad769 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -2195,7 +2195,7 @@ const _super = (function (geti, seti) {
                 helpersEmitted = true;
             }
 
-            if (compilerOptions.jsx !== JsxEmit.Preserve && !assignEmitted && (node.flags & NodeFlags.HasJsxSpreadAttributes)) {
+            if (compilerOptions.jsx !== JsxEmit.Preserve && !assignEmitted && (node.flags & NodeFlags.HasSpreadAttribute)) {
                 writeLines(assignHelper);
                 assignEmitted = true;
             }
diff --git a/src/compiler/transformer.ts b/src/compiler/transformer.ts
index 6242a2f2347..2fa57730bf0 100644
--- a/src/compiler/transformer.ts
+++ b/src/compiler/transformer.ts
@@ -1,6 +1,7 @@
 /// <reference path="visitor.ts" />
 /// <reference path="transformers/ts.ts" />
 /// <reference path="transformers/jsx.ts" />
+/// <reference path="transformers/experimental.ts" />
 /// <reference path="transformers/es7.ts" />
 /// <reference path="transformers/es6.ts" />
 /// <reference path="transformers/generators.ts" />
@@ -176,6 +177,7 @@ namespace ts {
             transformers.push(transformJsx);
         }
 
+        transformers.push(transformExperimental);
         transformers.push(transformES7);
 
         if (languageVersion < ScriptTarget.ES6) {
@@ -629,4 +631,4 @@ namespace ts {
             return t => t;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/compiler/transformers/es7.ts b/src/compiler/transformers/es7.ts
index 5d848bc608b..5aaaacb9ecd 100644
--- a/src/compiler/transformers/es7.ts
+++ b/src/compiler/transformers/es7.ts
@@ -28,7 +28,6 @@ namespace ts {
             switch (node.kind) {
                 case SyntaxKind.BinaryExpression:
                     return visitBinaryExpression(<BinaryExpression>node);
-
                 default:
                     Debug.failBadSyntaxKind(node);
                     return visitEachChild(node, visitor, context);
@@ -94,4 +93,4 @@ namespace ts {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/compiler/transformers/experimental.ts b/src/compiler/transformers/experimental.ts
new file mode 100644
index 00000000000..715cf91afd3
--- /dev/null
+++ b/src/compiler/transformers/experimental.ts
@@ -0,0 +1,80 @@
+/// <reference path="../factory.ts" />
+/// <reference path="../visitor.ts" />
+
+/*@internal*/
+namespace ts {
+    export function transformExperimental(context: TransformationContext) {
+        return transformSourceFile;
+
+        function transformSourceFile(node: SourceFile) {
+            return visitEachChild(node, visitor, context);
+        }
+
+        function visitor(node: Node): VisitResult<Node> {
+            if (node.transformFlags & TransformFlags.Experimental) {
+                return visitorWorker(node);
+            }
+            else if (node.transformFlags & TransformFlags.ContainsExperimental) {
+                return visitEachChild(node, visitor, context);
+            }
+            else {
+                return node;
+            }
+        }
+
+        function visitorWorker(node: Node): VisitResult<Node> {
+            switch (node.kind) {
+                case SyntaxKind.ObjectLiteralExpression:
+                    return visitObjectLiteralExpression(node as ObjectLiteralExpression);
+                default:
+                    Debug.failBadSyntaxKind(node);
+                    return visitEachChild(node, visitor, context);
+            }
+        }
+
+        function chunkObjectLiteralElements(elements: ObjectLiteralElement[]): Expression[] {
+            let chunkObject: (ShorthandPropertyAssignment | PropertyAssignment)[];
+            const objects: Expression[] = [];
+            for (const e of elements) {
+                if (e.kind === SyntaxKind.SpreadElement) {
+                    if (chunkObject) {
+                        objects.push(createObjectLiteral(chunkObject));
+                        chunkObject = undefined;
+                    }
+                    const target = (e as SpreadElement).target;
+                    objects.push(visitNode(target, visitor, isExpression));
+                }
+                else {
+                    if (!chunkObject) {
+                        chunkObject = [];
+                    }
+                    if (e.kind === SyntaxKind.PropertyAssignment) {
+                        const p = e as PropertyAssignment;
+                        chunkObject.push(createPropertyAssignment(p.name, visitNode(p.initializer, visitor, isExpression)));
+                    }
+                    else {
+                        chunkObject.push(e as ShorthandPropertyAssignment);
+                    }
+                }
+            }
+            if (chunkObject) {
+                objects.push(createObjectLiteral(chunkObject));
+            }
+
+            return objects;
+        }
+
+        function visitObjectLiteralExpression(node: ObjectLiteralExpression): Expression {
+            // 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});
+            // If the first element is a spread element, then the first argument to __assign is {}:
+            //     { ...o, a, b, ...o2 } => __assign({}, o, {a, b}, o2)
+            const objects = chunkObjectLiteralElements(node.properties);
+            if (objects.length && objects[0].kind !== SyntaxKind.ObjectLiteralExpression) {
+                objects.unshift(createObjectLiteral());
+            }
+            return createCall(createIdentifier("__assign"), undefined, objects);
+        }
+    }
+}

From bf866cea7b82f8c22d648acbe6815cfa9632d8db Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 26 Sep 2016 09:32:23 -0700
Subject: [PATCH 003/421] Update build files

---
 Jakefile.js                | 2 ++
 src/compiler/tsconfig.json | 1 +
 src/harness/tsconfig.json  | 1 +
 src/services/tsconfig.json | 1 +
 4 files changed, 5 insertions(+)

diff --git a/Jakefile.js b/Jakefile.js
index c62a4ffd6ce..6b749d4a4ef 100644
--- a/Jakefile.js
+++ b/Jakefile.js
@@ -72,6 +72,7 @@ var compilerSources = [
     "transformers/module/system.ts",
     "transformers/module/module.ts",
     "transformers/jsx.ts",
+    "transformers/experimental.ts",
     "transformers/es7.ts",
     "transformers/generators.ts",
     "transformers/es6.ts",
@@ -106,6 +107,7 @@ var servicesSources = [
     "transformers/module/system.ts",
     "transformers/module/module.ts",
     "transformers/jsx.ts",
+    "transformers/experimental.ts",
     "transformers/es7.ts",
     "transformers/generators.ts",
     "transformers/es6.ts",
diff --git a/src/compiler/tsconfig.json b/src/compiler/tsconfig.json
index f128c994af1..9681aba0d8f 100644
--- a/src/compiler/tsconfig.json
+++ b/src/compiler/tsconfig.json
@@ -24,6 +24,7 @@
         "visitor.ts",
         "transformers/ts.ts",
         "transformers/jsx.ts",
+        "transformers/experimental.ts",
         "transformers/es7.ts",
         "transformers/es6.ts",
         "transformers/generators.ts",
diff --git a/src/harness/tsconfig.json b/src/harness/tsconfig.json
index 8444d1d4a75..fda4c68272e 100644
--- a/src/harness/tsconfig.json
+++ b/src/harness/tsconfig.json
@@ -26,6 +26,7 @@
         "../compiler/visitor.ts",
         "../compiler/transformers/ts.ts",
         "../compiler/transformers/jsx.ts",
+        "../compiler/transformers/experimental.ts",
         "../compiler/transformers/es7.ts",
         "../compiler/transformers/es6.ts",
         "../compiler/transformers/generators.ts",
diff --git a/src/services/tsconfig.json b/src/services/tsconfig.json
index 58312c6f38f..8d612fb7a75 100644
--- a/src/services/tsconfig.json
+++ b/src/services/tsconfig.json
@@ -25,6 +25,7 @@
         "../compiler/visitor.ts",
         "../compiler/transformers/ts.ts",
         "../compiler/transformers/jsx.ts",
+        "../compiler/transformers/experimental.ts",
         "../compiler/transformers/es7.ts",
         "../compiler/transformers/es6.ts",
         "../compiler/transformers/generators.ts",

From 0fea59f642604ecd105c424deae982a73b4032c7 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 26 Sep 2016 09:33:08 -0700
Subject: [PATCH 004/421] Add spread tests

---
 ...uringObjectBindingPatternAndAssignment3.ts |  5 +-
 .../es6/destructuring/interfaceSpread.ts      |  8 ++
 .../conformance/types/spread/objectSpread.ts  | 96 +++++++++++++++++++
 .../types/spread/objectSpreadGeneric.ts       | 40 ++++++++
 .../types/spread/objectSpreadNegative.ts      | 49 ++++++++++
 .../types/spread/objectSpreadNegativeParse.ts |  4 +
 .../completionListForObjectSpread.ts          | 35 +++++++
 .../fourslash/findAllRefsForObjectSpread.ts   | 12 +++
 .../fourslash/goToDefinitionObjectSpread.ts   |  7 ++
 tests/cases/fourslash/renameObjectSpread.ts   | 18 ++++
 10 files changed, 270 insertions(+), 4 deletions(-)
 create mode 100644 tests/cases/conformance/es6/destructuring/interfaceSpread.ts
 create mode 100644 tests/cases/conformance/types/spread/objectSpread.ts
 create mode 100644 tests/cases/conformance/types/spread/objectSpreadGeneric.ts
 create mode 100644 tests/cases/conformance/types/spread/objectSpreadNegative.ts
 create mode 100644 tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts
 create mode 100644 tests/cases/fourslash/completionListForObjectSpread.ts
 create mode 100644 tests/cases/fourslash/findAllRefsForObjectSpread.ts
 create mode 100644 tests/cases/fourslash/goToDefinitionObjectSpread.ts
 create mode 100644 tests/cases/fourslash/renameObjectSpread.ts

diff --git a/tests/cases/conformance/es6/destructuring/destructuringObjectBindingPatternAndAssignment3.ts b/tests/cases/conformance/es6/destructuring/destructuringObjectBindingPatternAndAssignment3.ts
index 2b3192bc9a2..1e2bc1e68b4 100644
--- a/tests/cases/conformance/es6/destructuring/destructuringObjectBindingPatternAndAssignment3.ts
+++ b/tests/cases/conformance/es6/destructuring/destructuringObjectBindingPatternAndAssignment3.ts
@@ -3,8 +3,5 @@ var {h?} = { h?: 1 };
 var {i}: string | number = { i: 2 };
 var {i1}: string | number| {} = { i1: 2 };
 var { f2: {f21} = { f212: "string" } }: any = undefined;
-var { ...d1 } = {
-    a: 1, b: 1, d1: 9, e: 10
-}
 var {1} = { 1 };
-var {"prop"} = { "prop": 1 };
\ No newline at end of file
+var {"prop"} = { "prop": 1 };
diff --git a/tests/cases/conformance/es6/destructuring/interfaceSpread.ts b/tests/cases/conformance/es6/destructuring/interfaceSpread.ts
new file mode 100644
index 00000000000..a92a188e1a8
--- /dev/null
+++ b/tests/cases/conformance/es6/destructuring/interfaceSpread.ts
@@ -0,0 +1,8 @@
+interface Congealed<T, U> {
+    ...T
+    ...U
+}
+
+let sandwich: Congealed<{jam: number }, { peanutButter: number }>;
+sandwich.jam;
+sandwich.peanutButter;
diff --git a/tests/cases/conformance/types/spread/objectSpread.ts b/tests/cases/conformance/types/spread/objectSpread.ts
new file mode 100644
index 00000000000..9828e86f0a6
--- /dev/null
+++ b/tests/cases/conformance/types/spread/objectSpread.ts
@@ -0,0 +1,96 @@
+// @target: es5
+let o = { a: 1, b: 'no' }
+let o2 = { b: 'yes', c: true }
+let swap = { a: 'yes', b: -1 };
+
+let addAfter: { a: number, b: string, c: boolean } =
+    { ...o, c: false }
+let addBefore: { a: number, b: string, c: boolean } =
+    { c: false, ...o }
+// Note: ignore still changes the order that properties are printed
+let ignore: { a: number, b: string } =
+    { b: 'ignored', ...o }
+let override: { a: number, b: string } =
+    { ...o, b: 'override' }
+let nested: { a: number, b: boolean, c: string } =
+    { ...{ a: 3, ...{ b: false, c: 'overriden' } }, c: 'whatever' }
+let combined: { a: number, b: string, c: boolean } =
+    { ...o, ...o2 }
+let combinedBefore: { a: number, b: string, c: boolean } =
+    { b: 'ok', ...o, ...o2 }
+let combinedMid: { a: number, b: string, c: boolean } =
+    { ...o, b: 'ok', ...o2 }
+let combinedAfter: { a: number, b: string, c: boolean } =
+    { ...o, ...o2, b: 'ok' }
+let combinedNested: { a: number, b: boolean, c: string, d: string } =
+    { ...{ a: 4, ...{ b: false, c: 'overriden' } }, d: 'actually new', ...{ a: 5, d: 'maybe new' } }
+let combinedNestedChangeType: { a: number, b: boolean, c: number } =
+    { ...{ a: 1, ...{ b: false, c: 'overriden' } }, c: -1 }
+let propertyNested: { a: { a: number, b: string } } =
+    { a: { ... o } }
+// accessors don't copy the descriptor
+// (which means that readonly getters become read/write properties)
+let op = { get a () { return 6 } };
+let getter: { a: number, c: number } =
+    { ...op, c: 7 }
+getter.a = 12;
+
+// null and undefined are just skipped
+let spreadNull: { a: number } =
+    { a: 7, ...null }
+let spreadUndefined: { a: number } =
+    { a: 7, ...undefined }
+
+// methods are not enumerable
+class C { p = 1; m() { } }
+let c: C = new C()
+let spreadC: { p: number } = { ...c }
+
+// own methods are enumerable
+let cplus: { p: number, plus(): void } = { ...c, plus() { return this.p + 1; } };
+cplus.plus();
+
+// new field's type conflicting with existing field is OK
+let changeTypeAfter: { a: string, b: string } =
+    { ...o, a: 'wrong type?' }
+let changeTypeBefore: { a: number, b: string } =
+    { a: 'wrong type?', ...o };
+let changeTypeBoth: { a: string, b: number } =
+    { ...o, ...swap };
+
+// optional
+let definiteBoolean: { sn: boolean };
+let definiteString: { sn: string };
+let optionalString: { sn?: string };
+let optionalNumber: { sn?: number };
+let optionalUnionStops: { sn: string | number | boolean } = { ...definiteBoolean, ...definiteString, ...optionalNumber };
+let optionalUnionDuplicates: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...optionalString, ...optionalNumber };
+let allOptional: { sn?: string | number } = { ...optionalString, ...optionalNumber };
+
+// computed property
+let computedFirst: { a: number, b: string, "before everything": number } =
+    { ['before everything']: 12, ...o, b: 'yes' }
+let computedMiddle: { a: number, b: string, c: boolean, "in the middle": number } =
+    { ...o, ['in the middle']: 13, b: 'maybe?', ...o2 }
+let computedAfter: { a: number, b: string, "at the end": number } =
+    { ...o, b: 'yeah', ['at the end']: 14 }
+// shortcut syntax
+let a = 12;
+let shortCutted: { a: number, b: string } = { ...o, a }
+
+// generics
+function f<T, U>(t: T, u: U): { id: string, ...T, ...U } {
+    return { id: 'id', ...t, ...u };
+}
+let exclusive: { id: string, a: number, b: string, c: string, d: boolean } =
+    f({ a: 1, b: 'yes' }, { c: 'no', d: false })
+let overlap: { id: string, a: number, b: string } =
+    f({ a: 1 }, { a: 2, b: 'extra' })
+let overlapConflict: { id:string, a: string } =
+    f({ a: 1 }, { a: 'mismatch' })
+let overwriteId: { id: boolean, a: number, c: number, d: string } =
+    f({ a: 1, id: true }, { c: 1, d: 'no' })
+
+class D { m() { }; q = 2; }
+let classesAreWrong: { id: string, ...C, ...D } =
+    f(new C(), new D())
diff --git a/tests/cases/conformance/types/spread/objectSpreadGeneric.ts b/tests/cases/conformance/types/spread/objectSpreadGeneric.ts
new file mode 100644
index 00000000000..552142004b7
--- /dev/null
+++ b/tests/cases/conformance/types/spread/objectSpreadGeneric.ts
@@ -0,0 +1,40 @@
+function f<T, U, V>(t: T, u: U, v: V): void {
+    let o: { ...T, ...U, ...V };
+    const same: { ...T, ...U, ...V } = o; // ok
+    const reversed: { ...V, ...U, ...T } = o; // error, reversed
+    const reversed2: { ...U, ...T, ...V } = o; // error, U and T are still reversed
+    const missingT: { ...U, ...V } = o; // error, missing T
+    const missingU: { ...T, ...V } = o; // error, missing U
+    const missingV: { ...T, ...U } = o; // error, missing V
+    const atEnd: { ...T, ...U, second: string } = { ...t, ...u, second: 'foo' }; // ok
+    const atBeginning: { first: string, ...T, ...U, } = { first: 'foo', ...t, ...u }; // ok
+
+    const emptyTarget: { } = { ...t, ...u } // ok
+    const emptySource: { ...T, ...U } = { }; // error, {} is not assignable to U (or T)
+
+    let optionalNumber: { sn?: number };
+    let optionalString: { sn?: string };
+    let optionalBoolean: { sn?: boolean };
+    const unionCutoff: { ...T, sn?: number | string | boolean } =
+        { ...optionalBoolean, ...t, ...optionalString, ...optionalNumber } // ok
+    unionCutoff.sn; // ok
+    const optionalCutoff = { ...t, ...optionalNumber }; // ok
+    optionalCutoff.sn; // ok
+
+    const interspersed: { first: string, ...T, second: string, ...U, third: string } =
+        { first: '1', ...t, second: '2', ...u, third: '3' }; // ok
+    const interspersedMissingU: { first: string, second: string, ...T, third: string } =
+        { first: '1', ...t, second: '2', ...u, third: '3' }; // error, 'U' is missing
+    const interspersedOrder1: { first: string, ...T, second: string, ...U, third: string, secondsecond: string } =
+        { first: '1', ...t, second: '2', ...u, third: '3', secondsecond: 'false' }; // ok
+    const interspersedOrder2: { first: string, second: string, secondsecond: string, third: string, ...T, ...U } =
+        { first: '1', ...t, second: '2', ...u, third: '3', secondsecond: 'false' }; // ok
+
+
+    const mismatchFirst: { first: string, ...T, second: string, ...U, third: string } =
+        { firrrrrrst: '1', ...t, second: '2', ...u, third: '3' }; // error, 'first' not found
+    const mismatchSecond: { first: string, ...T, second: string, ...U, third: string } =
+        { first: '1', ...t, ssssssssecond: '2', ...u, third: '3' }; // error, 'second' not found
+    const mismatchLast: { first: string, ...T, second: string, ...U, third: string } =
+        { first: '1', ...t, second: '2', ...u, thirrrrrrrd: '3' }; // error, 'third' not found
+}
diff --git a/tests/cases/conformance/types/spread/objectSpreadNegative.ts b/tests/cases/conformance/types/spread/objectSpreadNegative.ts
new file mode 100644
index 00000000000..4691e45a17d
--- /dev/null
+++ b/tests/cases/conformance/types/spread/objectSpreadNegative.ts
@@ -0,0 +1,49 @@
+// @target: es5
+let o = { a: 1, b: 'no' }
+
+/// private propagates
+class PrivateOptionalX {
+    private x?: number;
+}
+class PublicX {
+    public x: number;
+}
+let privateOptionalx: PrivateOptionalX;
+let publicx: PublicX;
+let o3 = { ...publicx, ...privateOptionalx };
+let sn: string | number = o3.x; // error, x is private
+let optionalString: { sn?: string };
+let optionalNumber: { sn?: number };
+let allOptional: { sn: string | number } = { ...optionalString, ...optionalNumber };
+// error, 'sn' is optional in source, required in target
+
+// assignability as target
+interface Bool { b: boolean };
+interface Str { s: string };
+let spread: { ...Bool, ...Str } = { s: 'foo' }; // error, missing 'b'
+let b: Bool;
+spread = b; // error, missing 's'
+
+// expressions are not allowed
+let o1 = { ...1 + 1 };
+let o2 = { ...(1 + 1) };
+
+// literal repeats are not allowed, but spread repeats are fine
+let duplicated = { b: 'bad', ...o, b: 'bad', ...o2, b: 'bad' }
+let duplicatedSpread = { ...o, ...o }
+
+// write-only properties get skipped
+let setterOnly = { ...{ set b (bad: number) { } } };
+setterOnly.b = 12; // error, 'b' does not exist
+
+// methods are skipped because they aren't enumerable
+class C { p = 1; m() { } }
+let c: C = new C()
+let spreadC = { ...c }
+spreadC.m(); // error 'm' is not in '{ ... c }'
+
+let callableConstructableSpread: { ...PublicX, (n: number): number, new (p: number) };
+callableConstructableSpread(12); // error, no call signature
+new callableConstructableSpread(12); // error, no construct signature
+
+let callableSpread = { ...publicx, ...(n => n + 1) }; // error, can't spread functions
diff --git a/tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts b/tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts
new file mode 100644
index 00000000000..47fd787ec9a
--- /dev/null
+++ b/tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts
@@ -0,0 +1,4 @@
+let o7 = { ...o? };
+let o8 = { ...*o };
+let o9 = { ...matchMedia() { }};
+let o10 = { ...get x() { return 12; }};
diff --git a/tests/cases/fourslash/completionListForObjectSpread.ts b/tests/cases/fourslash/completionListForObjectSpread.ts
new file mode 100644
index 00000000000..ca96797195c
--- /dev/null
+++ b/tests/cases/fourslash/completionListForObjectSpread.ts
@@ -0,0 +1,35 @@
+/// <reference path='fourslash.ts'/>
+////let o = { a: 1, b: 'no' }
+////let o2 = { b: 'yes', c: true }
+////let swap = { a: 'yes', b: -1 };
+////let addAfter: { a: number, b: string, c: boolean } =
+////    { ...o, c: false }
+////let addBefore: { a: number, b: string, c: boolean } =
+////    { c: false, ...o }
+////let ignore: { a: number, b: string } =
+////    { b: 'ignored', ...o }
+////ignore./*1*/a;
+////let combinedNestedChangeType: { a: number, b: boolean, c: number } =
+////    { ...{ a: 1, ...{ b: false, c: 'overriden' } }, c: -1 }
+////combinedNestedChangeType./*2*/a;
+////let spreadNull: { a: number } =
+////    { a: 7, ...null }
+////let spreadUndefined: { a: number } =
+////    { a: 7, ...undefined }
+////spreadNull./*3*/a;
+////spreadUndefined./*4*/a;
+goTo.marker('1');
+verify.memberListContains('a', '(property) a: number');
+verify.memberListContains('b', '(property) b: string');
+verify.memberListCount(2);
+goTo.marker('2');
+verify.memberListContains('a', '(property) a: number');
+verify.memberListContains('b', '(property) b: boolean');
+verify.memberListContains('c', '(property) c: number');
+verify.memberListCount(3);
+goTo.marker('3');
+verify.memberListContains('a', '(property) a: number');
+verify.memberListCount(1);
+goTo.marker('4');
+verify.memberListContains('a', '(property) a: number');
+verify.memberListCount(1);
diff --git a/tests/cases/fourslash/findAllRefsForObjectSpread.ts b/tests/cases/fourslash/findAllRefsForObjectSpread.ts
new file mode 100644
index 00000000000..fe0a7f9c201
--- /dev/null
+++ b/tests/cases/fourslash/findAllRefsForObjectSpread.ts
@@ -0,0 +1,12 @@
+/// <reference path='fourslash.ts'/>
+
+////interface A1 { [|a|]: number };
+////interface A2 { [|a|]?: number };
+////let a12: { ...A1, ...A2 };
+////a12.[|a|];
+const ranges = test.ranges();
+// members of spread types only refer to themselves and the resulting property
+verify.referencesOf(ranges[0], [ranges[0], ranges[2]]);
+verify.referencesOf(ranges[1], [ranges[1], ranges[2]]);
+// but the resulting property refers to everything
+verify.referencesOf(ranges[2], ranges);
diff --git a/tests/cases/fourslash/goToDefinitionObjectSpread.ts b/tests/cases/fourslash/goToDefinitionObjectSpread.ts
new file mode 100644
index 00000000000..64623c36cb7
--- /dev/null
+++ b/tests/cases/fourslash/goToDefinitionObjectSpread.ts
@@ -0,0 +1,7 @@
+/// <reference path='fourslash.ts'/>
+
+////interface A1 { /*1*/a: number };
+////interface A2 { /*2*/a?: number };
+////let a12: { ...A1, ...A2 };
+////a12.a/*3*/;
+verify.goToDefinition('3', [ '1', '2' ]);
diff --git a/tests/cases/fourslash/renameObjectSpread.ts b/tests/cases/fourslash/renameObjectSpread.ts
new file mode 100644
index 00000000000..a2c640361e5
--- /dev/null
+++ b/tests/cases/fourslash/renameObjectSpread.ts
@@ -0,0 +1,18 @@
+/// <reference path='fourslash.ts'/>
+
+////interface A1 { [|a|]: number };
+////interface A2 { [|a|]?: number };
+////let a12: { ...A1, ...A2 };
+////a12.[|a|];
+const ranges = test.ranges();
+verify.assertHasRanges(ranges);
+
+// A1 unions with A2, so rename A1.a and a12.a
+goTo.position(ranges[0].start);
+verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false, [ranges[0], ranges[2]]);
+// A1 unions with A2, so rename A2.a and a12.a
+goTo.position(ranges[1].start);
+verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false, [ranges[1], ranges[2]]);
+// a12.a unions A1.a and A2.a, so rename A1.a, A2.a and a12.a
+goTo.position(ranges[2].start);
+verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false, [ranges[0], ranges[1], ranges[2]]);

From c8db211d90424abd949805264f724dc4adbbb53e Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 26 Sep 2016 09:33:27 -0700
Subject: [PATCH 005/421] Update baselines

---
 ...ectBindingPatternAndAssignment3.errors.txt |  26 +-
 ...uringObjectBindingPatternAndAssignment3.js |   9 +-
 .../duplicateObjectLiteralProperty.errors.txt |   8 +-
 .../reference/interfaceSpread.errors.txt      |  21 +
 tests/baselines/reference/interfaceSpread.js  |  15 +
 .../lastPropertyInLiteralWins.errors.txt      |   8 +-
 .../reference/memberOverride.errors.txt       |   5 +-
 .../reference/objectLiteralErrors.errors.txt  |   5 +-
 ...tiesErrorFromNotUsingIdentifier.errors.txt |   8 +-
 tests/baselines/reference/objectSpread.js     | 181 ++++++
 .../baselines/reference/objectSpread.symbols  | 369 ++++++++++++
 tests/baselines/reference/objectSpread.types  | 530 ++++++++++++++++++
 .../reference/objectSpreadGeneric.errors.txt  |  80 +++
 .../reference/objectSpreadGeneric.js          |  79 +++
 .../reference/objectSpreadNegative.errors.txt |  93 +++
 .../reference/objectSpreadNegative.js         | 108 ++++
 .../objectSpreadNegativeParse.errors.txt      |  35 ++
 .../reference/objectSpreadNegativeParse.js    |  21 +
 18 files changed, 1569 insertions(+), 32 deletions(-)
 create mode 100644 tests/baselines/reference/interfaceSpread.errors.txt
 create mode 100644 tests/baselines/reference/interfaceSpread.js
 create mode 100644 tests/baselines/reference/objectSpread.js
 create mode 100644 tests/baselines/reference/objectSpread.symbols
 create mode 100644 tests/baselines/reference/objectSpread.types
 create mode 100644 tests/baselines/reference/objectSpreadGeneric.errors.txt
 create mode 100644 tests/baselines/reference/objectSpreadGeneric.js
 create mode 100644 tests/baselines/reference/objectSpreadNegative.errors.txt
 create mode 100644 tests/baselines/reference/objectSpreadNegative.js
 create mode 100644 tests/baselines/reference/objectSpreadNegativeParse.errors.txt
 create mode 100644 tests/baselines/reference/objectSpreadNegativeParse.js

diff --git a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment3.errors.txt b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment3.errors.txt
index bb4b79987e3..33344b9b5eb 100644
--- a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment3.errors.txt
+++ b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment3.errors.txt
@@ -5,16 +5,12 @@ tests/cases/conformance/es6/destructuring/destructuringObjectBindingPatternAndAs
 tests/cases/conformance/es6/destructuring/destructuringObjectBindingPatternAndAssignment3.ts(4,6): error TS2459: Type 'string | number | {}' has no property 'i1' and no string index signature.
 tests/cases/conformance/es6/destructuring/destructuringObjectBindingPatternAndAssignment3.ts(5,12): error TS2525: Initializer provides no value for this binding element and the binding element has no default value.
 tests/cases/conformance/es6/destructuring/destructuringObjectBindingPatternAndAssignment3.ts(5,21): error TS2353: Object literal may only specify known properties, and 'f212' does not exist in type '{ f21: any; }'.
-tests/cases/conformance/es6/destructuring/destructuringObjectBindingPatternAndAssignment3.ts(6,7): error TS1180: Property destructuring pattern expected.
-tests/cases/conformance/es6/destructuring/destructuringObjectBindingPatternAndAssignment3.ts(7,5): error TS2353: Object literal may only specify known properties, and 'a' does not exist in type '{ d1: any; }'.
-tests/cases/conformance/es6/destructuring/destructuringObjectBindingPatternAndAssignment3.ts(7,11): error TS2353: Object literal may only specify known properties, and 'b' does not exist in type '{ d1: any; }'.
-tests/cases/conformance/es6/destructuring/destructuringObjectBindingPatternAndAssignment3.ts(7,24): error TS2353: Object literal may only specify known properties, and 'e' does not exist in type '{ d1: any; }'.
-tests/cases/conformance/es6/destructuring/destructuringObjectBindingPatternAndAssignment3.ts(9,7): error TS1005: ':' expected.
-tests/cases/conformance/es6/destructuring/destructuringObjectBindingPatternAndAssignment3.ts(9,15): error TS1005: ':' expected.
-tests/cases/conformance/es6/destructuring/destructuringObjectBindingPatternAndAssignment3.ts(10,12): error TS1005: ':' expected.
+tests/cases/conformance/es6/destructuring/destructuringObjectBindingPatternAndAssignment3.ts(6,7): error TS1005: ':' expected.
+tests/cases/conformance/es6/destructuring/destructuringObjectBindingPatternAndAssignment3.ts(6,15): error TS1005: ':' expected.
+tests/cases/conformance/es6/destructuring/destructuringObjectBindingPatternAndAssignment3.ts(7,12): error TS1005: ':' expected.
 
 
-==== tests/cases/conformance/es6/destructuring/destructuringObjectBindingPatternAndAssignment3.ts (13 errors) ====
+==== tests/cases/conformance/es6/destructuring/destructuringObjectBindingPatternAndAssignment3.ts (9 errors) ====
     // Error
     var {h?} = { h?: 1 };
           ~
@@ -33,17 +29,6 @@ tests/cases/conformance/es6/destructuring/destructuringObjectBindingPatternAndAs
 !!! error TS2525: Initializer provides no value for this binding element and the binding element has no default value.
                         ~~~~
 !!! error TS2353: Object literal may only specify known properties, and 'f212' does not exist in type '{ f21: any; }'.
-    var { ...d1 } = {
-          ~~~
-!!! error TS1180: Property destructuring pattern expected.
-        a: 1, b: 1, d1: 9, e: 10
-        ~
-!!! error TS2353: Object literal may only specify known properties, and 'a' does not exist in type '{ d1: any; }'.
-              ~
-!!! error TS2353: Object literal may only specify known properties, and 'b' does not exist in type '{ d1: any; }'.
-                           ~
-!!! error TS2353: Object literal may only specify known properties, and 'e' does not exist in type '{ d1: any; }'.
-    }
     var {1} = { 1 };
           ~
 !!! error TS1005: ':' expected.
@@ -51,4 +36,5 @@ tests/cases/conformance/es6/destructuring/destructuringObjectBindingPatternAndAs
 !!! error TS1005: ':' expected.
     var {"prop"} = { "prop": 1 };
                ~
-!!! error TS1005: ':' expected.
\ No newline at end of file
+!!! error TS1005: ':' expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment3.js b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment3.js
index 77288e6a542..0872a71c73b 100644
--- a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment3.js
+++ b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment3.js
@@ -4,11 +4,9 @@ var {h?} = { h?: 1 };
 var {i}: string | number = { i: 2 };
 var {i1}: string | number| {} = { i1: 2 };
 var { f2: {f21} = { f212: "string" } }: any = undefined;
-var { ...d1 } = {
-    a: 1, b: 1, d1: 9, e: 10
-}
 var {1} = { 1 };
-var {"prop"} = { "prop": 1 };
+var {"prop"} = { "prop": 1 };
+
 
 //// [destructuringObjectBindingPatternAndAssignment3.js]
 // Error
@@ -16,8 +14,5 @@ var h = { h: 1 }.h;
 var i = { i: 2 }.i;
 var i1 = { i1: 2 }.i1;
 var _a = undefined.f2, f21 = (_a === void 0 ? { f212: "string" } : _a).f21;
-var d1 = {
-    a: 1, b: 1, d1: 9, e: 10
-}.d1;
 var  = { 1:  }[1];
 var  = { "prop": 1 }["prop"];
diff --git a/tests/baselines/reference/duplicateObjectLiteralProperty.errors.txt b/tests/baselines/reference/duplicateObjectLiteralProperty.errors.txt
index abc56a6f8fc..926a7071222 100644
--- a/tests/baselines/reference/duplicateObjectLiteralProperty.errors.txt
+++ b/tests/baselines/reference/duplicateObjectLiteralProperty.errors.txt
@@ -1,6 +1,8 @@
 tests/cases/compiler/duplicateObjectLiteralProperty.ts(4,5): error TS2300: Duplicate identifier 'a'.
 tests/cases/compiler/duplicateObjectLiteralProperty.ts(5,5): error TS2300: Duplicate identifier '\u0061'.
+tests/cases/compiler/duplicateObjectLiteralProperty.ts(5,5): error TS2698: Cannot change type of property 'a' from 'number' to 'string'.
 tests/cases/compiler/duplicateObjectLiteralProperty.ts(6,5): error TS2300: Duplicate identifier 'a'.
+tests/cases/compiler/duplicateObjectLiteralProperty.ts(6,5): error TS2698: Cannot change type of property 'a' from 'string' to '{ c: number; }'.
 tests/cases/compiler/duplicateObjectLiteralProperty.ts(8,9): error TS2300: Duplicate identifier '"c"'.
 tests/cases/compiler/duplicateObjectLiteralProperty.ts(14,9): error TS2300: Duplicate identifier 'a'.
 tests/cases/compiler/duplicateObjectLiteralProperty.ts(15,9): error TS2300: Duplicate identifier 'a'.
@@ -8,7 +10,7 @@ tests/cases/compiler/duplicateObjectLiteralProperty.ts(16,9): error TS1118: An o
 tests/cases/compiler/duplicateObjectLiteralProperty.ts(16,9): error TS2300: Duplicate identifier 'a'.
 
 
-==== tests/cases/compiler/duplicateObjectLiteralProperty.ts (8 errors) ====
+==== tests/cases/compiler/duplicateObjectLiteralProperty.ts (10 errors) ====
     var x = {
         a: 1,
         b: true, // OK
@@ -18,9 +20,13 @@ tests/cases/compiler/duplicateObjectLiteralProperty.ts(16,9): error TS2300: Dupl
         \u0061: "ss", // Duplicate
         ~~~~~~
 !!! error TS2300: Duplicate identifier '\u0061'.
+        ~~~~~~
+!!! error TS2698: Cannot change type of property 'a' from 'number' to 'string'.
         a: {
         ~
 !!! error TS2300: Duplicate identifier 'a'.
+        ~
+!!! error TS2698: Cannot change type of property 'a' from 'string' to '{ c: number; }'.
             c: 1,
             "c": 56, // Duplicate
             ~~~
diff --git a/tests/baselines/reference/interfaceSpread.errors.txt b/tests/baselines/reference/interfaceSpread.errors.txt
new file mode 100644
index 00000000000..27aab11491c
--- /dev/null
+++ b/tests/baselines/reference/interfaceSpread.errors.txt
@@ -0,0 +1,21 @@
+tests/cases/conformance/es6/destructuring/interfaceSpread.ts(2,5): error TS2699: Interface declaration cannot contain a spread property.
+tests/cases/conformance/es6/destructuring/interfaceSpread.ts(7,10): error TS2339: Property 'jam' does not exist on type 'Congealed<{ jam: number; }, { peanutButter: number; }>'.
+tests/cases/conformance/es6/destructuring/interfaceSpread.ts(8,10): error TS2339: Property 'peanutButter' does not exist on type 'Congealed<{ jam: number; }, { peanutButter: number; }>'.
+
+
+==== tests/cases/conformance/es6/destructuring/interfaceSpread.ts (3 errors) ====
+    interface Congealed<T, U> {
+        ...T
+        ~~~~
+!!! error TS2699: Interface declaration cannot contain a spread property.
+        ...U
+    }
+    
+    let sandwich: Congealed<{jam: number }, { peanutButter: number }>;
+    sandwich.jam;
+             ~~~
+!!! error TS2339: Property 'jam' does not exist on type 'Congealed<{ jam: number; }, { peanutButter: number; }>'.
+    sandwich.peanutButter;
+             ~~~~~~~~~~~~
+!!! error TS2339: Property 'peanutButter' does not exist on type 'Congealed<{ jam: number; }, { peanutButter: number; }>'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/interfaceSpread.js b/tests/baselines/reference/interfaceSpread.js
new file mode 100644
index 00000000000..89f25314366
--- /dev/null
+++ b/tests/baselines/reference/interfaceSpread.js
@@ -0,0 +1,15 @@
+//// [interfaceSpread.ts]
+interface Congealed<T, U> {
+    ...T
+    ...U
+}
+
+let sandwich: Congealed<{jam: number }, { peanutButter: number }>;
+sandwich.jam;
+sandwich.peanutButter;
+
+
+//// [interfaceSpread.js]
+var sandwich;
+sandwich.jam;
+sandwich.peanutButter;
diff --git a/tests/baselines/reference/lastPropertyInLiteralWins.errors.txt b/tests/baselines/reference/lastPropertyInLiteralWins.errors.txt
index 2b4a694975b..c8844f2c572 100644
--- a/tests/baselines/reference/lastPropertyInLiteralWins.errors.txt
+++ b/tests/baselines/reference/lastPropertyInLiteralWins.errors.txt
@@ -4,10 +4,12 @@ tests/cases/compiler/lastPropertyInLiteralWins.ts(7,6): error TS2345: Argument o
       Types of parameters 'num' and 'str' are incompatible.
         Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/lastPropertyInLiteralWins.ts(9,5): error TS2300: Duplicate identifier 'thunk'.
+tests/cases/compiler/lastPropertyInLiteralWins.ts(9,5): error TS2698: Cannot change type of property 'thunk' from '(str: string) => void' to '(num: number) => void'.
 tests/cases/compiler/lastPropertyInLiteralWins.ts(14,5): error TS2300: Duplicate identifier 'thunk'.
+tests/cases/compiler/lastPropertyInLiteralWins.ts(14,5): error TS2698: Cannot change type of property 'thunk' from '(num: number) => void' to '(str: string) => void'.
 
 
-==== tests/cases/compiler/lastPropertyInLiteralWins.ts (3 errors) ====
+==== tests/cases/compiler/lastPropertyInLiteralWins.ts (5 errors) ====
     interface Thing {
         thunk: (str: string) => void;
     }
@@ -22,6 +24,8 @@ tests/cases/compiler/lastPropertyInLiteralWins.ts(14,5): error TS2300: Duplicate
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         ~~~~~
 !!! error TS2300: Duplicate identifier 'thunk'.
+        ~~~~~
+!!! error TS2698: Cannot change type of property 'thunk' from '(str: string) => void' to '(num: number) => void'.
     });
     ~
 !!! error TS2345: Argument of type '{ thunk: (num: number) => void; }' is not assignable to parameter of type 'Thing'.
@@ -35,5 +39,7 @@ tests/cases/compiler/lastPropertyInLiteralWins.ts(14,5): error TS2300: Duplicate
         thunk: (str: string) => {}
         ~~~~~
 !!! error TS2300: Duplicate identifier 'thunk'.
+        ~~~~~
+!!! error TS2698: Cannot change type of property 'thunk' from '(num: number) => void' to '(str: string) => void'.
     });
     
\ No newline at end of file
diff --git a/tests/baselines/reference/memberOverride.errors.txt b/tests/baselines/reference/memberOverride.errors.txt
index 15c4b2ad37b..355db001505 100644
--- a/tests/baselines/reference/memberOverride.errors.txt
+++ b/tests/baselines/reference/memberOverride.errors.txt
@@ -1,7 +1,8 @@
 tests/cases/compiler/memberOverride.ts(5,5): error TS2300: Duplicate identifier 'a'.
+tests/cases/compiler/memberOverride.ts(5,5): error TS2698: Cannot change type of property 'a' from 'string' to 'number'.
 
 
-==== tests/cases/compiler/memberOverride.ts (1 errors) ====
+==== tests/cases/compiler/memberOverride.ts (2 errors) ====
     // An object initialiser accepts the first definition for the same property with a different type signature
     // Should compile, since the second declaration of a overrides the first
     var x = {
@@ -9,6 +10,8 @@ tests/cases/compiler/memberOverride.ts(5,5): error TS2300: Duplicate identifier
         a: 5
         ~
 !!! error TS2300: Duplicate identifier 'a'.
+        ~
+!!! error TS2698: Cannot change type of property 'a' from 'string' to 'number'.
     }
     
     var n: number = x.a;
\ No newline at end of file
diff --git a/tests/baselines/reference/objectLiteralErrors.errors.txt b/tests/baselines/reference/objectLiteralErrors.errors.txt
index 234ac24a8fd..f70f255df05 100644
--- a/tests/baselines/reference/objectLiteralErrors.errors.txt
+++ b/tests/baselines/reference/objectLiteralErrors.errors.txt
@@ -1,6 +1,7 @@
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(3,18): error TS2300: Duplicate identifier 'a'.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(4,19): error TS2300: Duplicate identifier 'a'.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(5,18): error TS2300: Duplicate identifier 'a'.
+tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(5,18): error TS2698: Cannot change type of property 'a' from 'number' to 'string'.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(6,21): error TS2300: Duplicate identifier 'a'.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(7,19): error TS2300: Duplicate identifier 'a'.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(8,18): error TS2300: Duplicate identifier ''a''.
@@ -78,7 +79,7 @@ tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(45,16)
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(45,55): error TS2380: 'get' and 'set' accessor must have the same type.
 
 
-==== tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts (78 errors) ====
+==== tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts (79 errors) ====
     
     // Multiple properties with the same name
     var e1 = { a: 0, a: 0 };
@@ -90,6 +91,8 @@ tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(45,55)
     var e3 = { a: 0, a: '' };
                      ~
 !!! error TS2300: Duplicate identifier 'a'.
+                     ~
+!!! error TS2698: Cannot change type of property 'a' from 'number' to 'string'.
     var e4 = { a: true, a: false };
                         ~
 !!! error TS2300: Duplicate identifier 'a'.
diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.errors.txt b/tests/baselines/reference/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.errors.txt
index 5fa8a12e875..cbe19cab2d2 100644
--- a/tests/baselines/reference/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.errors.txt
+++ b/tests/baselines/reference/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.errors.txt
@@ -8,12 +8,14 @@ tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPr
 tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts(10,10): error TS1005: ':' expected.
 tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts(12,1): error TS1005: ':' expected.
 tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts(15,6): error TS1005: ':' expected.
+tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts(16,5): error TS2698: Cannot change type of property 'a' from 'any' to 'string[]'.
 tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts(16,6): error TS1005: ':' expected.
+tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts(17,5): error TS2698: Cannot change type of property 'a' from 'string[]' to 'number[]'.
 tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts(17,6): error TS1005: ':' expected.
 tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts(20,17): error TS1005: ':' expected.
 
 
-==== tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts (13 errors) ====
+==== tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts (15 errors) ====
     // errors
     var y = {
         "stringLiteral",
@@ -50,9 +52,13 @@ tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPr
          ~
 !!! error TS1005: ':' expected.
         a["ss"],
+        ~
+!!! error TS2698: Cannot change type of property 'a' from 'any' to 'string[]'.
          ~
 !!! error TS1005: ':' expected.
         a[1],
+        ~
+!!! error TS2698: Cannot change type of property 'a' from 'string[]' to 'number[]'.
          ~
 !!! error TS1005: ':' expected.
     };
diff --git a/tests/baselines/reference/objectSpread.js b/tests/baselines/reference/objectSpread.js
new file mode 100644
index 00000000000..a59577fe9de
--- /dev/null
+++ b/tests/baselines/reference/objectSpread.js
@@ -0,0 +1,181 @@
+//// [objectSpread.ts]
+let o = { a: 1, b: 'no' }
+let o2 = { b: 'yes', c: true }
+let swap = { a: 'yes', b: -1 };
+
+let addAfter: { a: number, b: string, c: boolean } =
+    { ...o, c: false }
+let addBefore: { a: number, b: string, c: boolean } =
+    { c: false, ...o }
+// Note: ignore still changes the order that properties are printed
+let ignore: { a: number, b: string } =
+    { b: 'ignored', ...o }
+let override: { a: number, b: string } =
+    { ...o, b: 'override' }
+let nested: { a: number, b: boolean, c: string } =
+    { ...{ a: 3, ...{ b: false, c: 'overriden' } }, c: 'whatever' }
+let combined: { a: number, b: string, c: boolean } =
+    { ...o, ...o2 }
+let combinedBefore: { a: number, b: string, c: boolean } =
+    { b: 'ok', ...o, ...o2 }
+let combinedMid: { a: number, b: string, c: boolean } =
+    { ...o, b: 'ok', ...o2 }
+let combinedAfter: { a: number, b: string, c: boolean } =
+    { ...o, ...o2, b: 'ok' }
+let combinedNested: { a: number, b: boolean, c: string, d: string } =
+    { ...{ a: 4, ...{ b: false, c: 'overriden' } }, d: 'actually new', ...{ a: 5, d: 'maybe new' } }
+let combinedNestedChangeType: { a: number, b: boolean, c: number } =
+    { ...{ a: 1, ...{ b: false, c: 'overriden' } }, c: -1 }
+let propertyNested: { a: { a: number, b: string } } =
+    { a: { ... o } }
+// accessors don't copy the descriptor
+// (which means that readonly getters become read/write properties)
+let op = { get a () { return 6 } };
+let getter: { a: number, c: number } =
+    { ...op, c: 7 }
+getter.a = 12;
+
+// null and undefined are just skipped
+let spreadNull: { a: number } =
+    { a: 7, ...null }
+let spreadUndefined: { a: number } =
+    { a: 7, ...undefined }
+
+// methods are not enumerable
+class C { p = 1; m() { } }
+let c: C = new C()
+let spreadC: { p: number } = { ...c }
+
+// own methods are enumerable
+let cplus: { p: number, plus(): void } = { ...c, plus() { return this.p + 1; } };
+cplus.plus();
+
+// new field's type conflicting with existing field is OK
+let changeTypeAfter: { a: string, b: string } =
+    { ...o, a: 'wrong type?' }
+let changeTypeBefore: { a: number, b: string } =
+    { a: 'wrong type?', ...o };
+let changeTypeBoth: { a: string, b: number } =
+    { ...o, ...swap };
+
+// optional
+let definiteBoolean: { sn: boolean };
+let definiteString: { sn: string };
+let optionalString: { sn?: string };
+let optionalNumber: { sn?: number };
+let optionalUnionStops: { sn: string | number | boolean } = { ...definiteBoolean, ...definiteString, ...optionalNumber };
+let optionalUnionDuplicates: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...optionalString, ...optionalNumber };
+let allOptional: { sn?: string | number } = { ...optionalString, ...optionalNumber };
+
+// computed property
+let computedFirst: { a: number, b: string, "before everything": number } =
+    { ['before everything']: 12, ...o, b: 'yes' }
+let computedMiddle: { a: number, b: string, c: boolean, "in the middle": number } =
+    { ...o, ['in the middle']: 13, b: 'maybe?', ...o2 }
+let computedAfter: { a: number, b: string, "at the end": number } =
+    { ...o, b: 'yeah', ['at the end']: 14 }
+// shortcut syntax
+let a = 12;
+let shortCutted: { a: number, b: string } = { ...o, a }
+
+// generics
+function f<T, U>(t: T, u: U): { id: string, ...T, ...U } {
+    return { id: 'id', ...t, ...u };
+}
+let exclusive: { id: string, a: number, b: string, c: string, d: boolean } =
+    f({ a: 1, b: 'yes' }, { c: 'no', d: false })
+let overlap: { id: string, a: number, b: string } =
+    f({ a: 1 }, { a: 2, b: 'extra' })
+let overlapConflict: { id:string, a: string } =
+    f({ a: 1 }, { a: 'mismatch' })
+let overwriteId: { id: boolean, a: number, c: number, d: string } =
+    f({ a: 1, id: true }, { c: 1, d: 'no' })
+
+class D { m() { }; q = 2; }
+let classesAreWrong: { id: string, ...C, ...D } =
+    f(new C(), new D())
+
+
+//// [objectSpread.js]
+var __assign = (this && this.__assign) || Object.assign || function(t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+        s = arguments[i];
+        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+            t[p] = s[p];
+    }
+    return t;
+};
+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 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 propertyNested = __assign({ 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 });
+getter.a = 12;
+// null and undefined are just skipped
+var spreadNull = __assign({ a: 7 }, null);
+var spreadUndefined = __assign({ a: 7 }, undefined);
+// methods are not enumerable
+var C = (function () {
+    function C() {
+        this.p = 1;
+    }
+    C.prototype.m = function () { };
+    return C;
+}());
+var c = new C();
+var spreadC = __assign({}, c);
+// own methods are enumerable
+var cplus = __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 changeTypeBefore = __assign({ a: 'wrong type?' }, o);
+var changeTypeBoth = __assign({}, o, swap);
+// optional
+var definiteBoolean;
+var definiteString;
+var optionalString;
+var optionalNumber;
+var optionalUnionStops = __assign({}, definiteBoolean, definiteString, optionalNumber);
+var optionalUnionDuplicates = __assign({}, definiteBoolean, definiteString, optionalString, optionalNumber);
+var allOptional = __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));
+// shortcut syntax
+var a = 12;
+var shortCutted = __assign({}, o, { a: a });
+// generics
+function f(t, u) {
+    return __assign({ id: 'id' }, t, u);
+}
+var exclusive = f({ a: 1, b: 'yes' }, { c: 'no', d: false });
+var overlap = f({ a: 1 }, { a: 2, b: 'extra' });
+var overlapConflict = f({ a: 1 }, { a: 'mismatch' });
+var overwriteId = f({ a: 1, id: true }, { c: 1, d: 'no' });
+var D = (function () {
+    function D() {
+        this.q = 2;
+    }
+    D.prototype.m = function () { };
+    ;
+    return D;
+}());
+var classesAreWrong = f(new C(), new D());
+var _a, _b, _c;
diff --git a/tests/baselines/reference/objectSpread.symbols b/tests/baselines/reference/objectSpread.symbols
new file mode 100644
index 00000000000..001c42804d2
--- /dev/null
+++ b/tests/baselines/reference/objectSpread.symbols
@@ -0,0 +1,369 @@
+=== tests/cases/conformance/types/spread/objectSpread.ts ===
+let o = { a: 1, b: 'no' }
+>o : Symbol(o, Decl(objectSpread.ts, 0, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 0, 9))
+>b : Symbol(b, Decl(objectSpread.ts, 0, 15))
+
+let o2 = { b: 'yes', c: true }
+>o2 : Symbol(o2, Decl(objectSpread.ts, 1, 3))
+>b : Symbol(b, Decl(objectSpread.ts, 1, 10))
+>c : Symbol(c, Decl(objectSpread.ts, 1, 20))
+
+let swap = { a: 'yes', b: -1 };
+>swap : Symbol(swap, Decl(objectSpread.ts, 2, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 2, 12))
+>b : Symbol(b, Decl(objectSpread.ts, 2, 22))
+
+let addAfter: { a: number, b: string, c: boolean } =
+>addAfter : Symbol(addAfter, Decl(objectSpread.ts, 4, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 4, 15))
+>b : Symbol(b, Decl(objectSpread.ts, 4, 26))
+>c : Symbol(c, Decl(objectSpread.ts, 4, 37))
+
+    { ...o, c: false }
+>c : Symbol(c, Decl(objectSpread.ts, 5, 11))
+
+let addBefore: { a: number, b: string, c: boolean } =
+>addBefore : Symbol(addBefore, Decl(objectSpread.ts, 6, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 6, 16))
+>b : Symbol(b, Decl(objectSpread.ts, 6, 27))
+>c : Symbol(c, Decl(objectSpread.ts, 6, 38))
+
+    { c: false, ...o }
+>c : Symbol(c, Decl(objectSpread.ts, 7, 5))
+
+// Note: ignore still changes the order that properties are printed
+let ignore: { a: number, b: string } =
+>ignore : Symbol(ignore, Decl(objectSpread.ts, 9, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 9, 13))
+>b : Symbol(b, Decl(objectSpread.ts, 9, 24))
+
+    { b: 'ignored', ...o }
+>b : Symbol(b, Decl(objectSpread.ts, 10, 5))
+
+let override: { a: number, b: string } =
+>override : Symbol(override, Decl(objectSpread.ts, 11, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 11, 15))
+>b : Symbol(b, Decl(objectSpread.ts, 11, 26))
+
+    { ...o, b: 'override' }
+>b : Symbol(b, Decl(objectSpread.ts, 12, 11))
+
+let nested: { a: number, b: boolean, c: string } =
+>nested : Symbol(nested, Decl(objectSpread.ts, 13, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 13, 13))
+>b : Symbol(b, Decl(objectSpread.ts, 13, 24))
+>c : Symbol(c, Decl(objectSpread.ts, 13, 36))
+
+    { ...{ a: 3, ...{ b: false, c: 'overriden' } }, c: 'whatever' }
+>a : Symbol(a, Decl(objectSpread.ts, 14, 10))
+>b : Symbol(b, Decl(objectSpread.ts, 14, 21))
+>c : Symbol(c, Decl(objectSpread.ts, 14, 31))
+>c : Symbol(c, Decl(objectSpread.ts, 14, 51))
+
+let combined: { a: number, b: string, c: boolean } =
+>combined : Symbol(combined, Decl(objectSpread.ts, 15, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 15, 15))
+>b : Symbol(b, Decl(objectSpread.ts, 15, 26))
+>c : Symbol(c, Decl(objectSpread.ts, 15, 37))
+
+    { ...o, ...o2 }
+let combinedBefore: { a: number, b: string, c: boolean } =
+>combinedBefore : Symbol(combinedBefore, Decl(objectSpread.ts, 17, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 17, 21))
+>b : Symbol(b, Decl(objectSpread.ts, 17, 32))
+>c : Symbol(c, Decl(objectSpread.ts, 17, 43))
+
+    { b: 'ok', ...o, ...o2 }
+>b : Symbol(b, Decl(objectSpread.ts, 18, 5))
+
+let combinedMid: { a: number, b: string, c: boolean } =
+>combinedMid : Symbol(combinedMid, Decl(objectSpread.ts, 19, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 19, 18))
+>b : Symbol(b, Decl(objectSpread.ts, 19, 29))
+>c : Symbol(c, Decl(objectSpread.ts, 19, 40))
+
+    { ...o, b: 'ok', ...o2 }
+>b : Symbol(b, Decl(objectSpread.ts, 20, 11))
+
+let combinedAfter: { a: number, b: string, c: boolean } =
+>combinedAfter : Symbol(combinedAfter, Decl(objectSpread.ts, 21, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 21, 20))
+>b : Symbol(b, Decl(objectSpread.ts, 21, 31))
+>c : Symbol(c, Decl(objectSpread.ts, 21, 42))
+
+    { ...o, ...o2, b: 'ok' }
+>b : Symbol(b, Decl(objectSpread.ts, 22, 18))
+
+let combinedNested: { a: number, b: boolean, c: string, d: string } =
+>combinedNested : Symbol(combinedNested, Decl(objectSpread.ts, 23, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 23, 21))
+>b : Symbol(b, Decl(objectSpread.ts, 23, 32))
+>c : Symbol(c, Decl(objectSpread.ts, 23, 44))
+>d : Symbol(d, Decl(objectSpread.ts, 23, 55))
+
+    { ...{ a: 4, ...{ b: false, c: 'overriden' } }, d: 'actually new', ...{ a: 5, d: 'maybe new' } }
+>a : Symbol(a, Decl(objectSpread.ts, 24, 10))
+>b : Symbol(b, Decl(objectSpread.ts, 24, 21))
+>c : Symbol(c, Decl(objectSpread.ts, 24, 31))
+>d : Symbol(d, Decl(objectSpread.ts, 24, 51))
+>a : Symbol(a, Decl(objectSpread.ts, 24, 75))
+>d : Symbol(d, Decl(objectSpread.ts, 24, 81))
+
+let combinedNestedChangeType: { a: number, b: boolean, c: number } =
+>combinedNestedChangeType : Symbol(combinedNestedChangeType, Decl(objectSpread.ts, 25, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 25, 31))
+>b : Symbol(b, Decl(objectSpread.ts, 25, 42))
+>c : Symbol(c, Decl(objectSpread.ts, 25, 54))
+
+    { ...{ a: 1, ...{ b: false, c: 'overriden' } }, c: -1 }
+>a : Symbol(a, Decl(objectSpread.ts, 26, 10))
+>b : Symbol(b, Decl(objectSpread.ts, 26, 21))
+>c : Symbol(c, Decl(objectSpread.ts, 26, 31))
+>c : Symbol(c, Decl(objectSpread.ts, 26, 51))
+
+let propertyNested: { a: { a: number, b: string } } =
+>propertyNested : Symbol(propertyNested, Decl(objectSpread.ts, 27, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 27, 21))
+>a : Symbol(a, Decl(objectSpread.ts, 27, 26))
+>b : Symbol(b, Decl(objectSpread.ts, 27, 37))
+
+    { a: { ... o } }
+>a : Symbol(a, Decl(objectSpread.ts, 28, 5))
+
+// accessors don't copy the descriptor
+// (which means that readonly getters become read/write properties)
+let op = { get a () { return 6 } };
+>op : Symbol(op, Decl(objectSpread.ts, 31, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 31, 10))
+
+let getter: { a: number, c: number } =
+>getter : Symbol(getter, Decl(objectSpread.ts, 32, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 32, 13))
+>c : Symbol(c, Decl(objectSpread.ts, 32, 24))
+
+    { ...op, c: 7 }
+>c : Symbol(c, Decl(objectSpread.ts, 33, 12))
+
+getter.a = 12;
+>getter.a : Symbol(a, Decl(objectSpread.ts, 32, 13))
+>getter : Symbol(getter, Decl(objectSpread.ts, 32, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 32, 13))
+
+// null and undefined are just skipped
+let spreadNull: { a: number } =
+>spreadNull : Symbol(spreadNull, Decl(objectSpread.ts, 37, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 37, 17))
+
+    { a: 7, ...null }
+>a : Symbol(a, Decl(objectSpread.ts, 38, 5))
+
+let spreadUndefined: { a: number } =
+>spreadUndefined : Symbol(spreadUndefined, Decl(objectSpread.ts, 39, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 39, 22))
+
+    { a: 7, ...undefined }
+>a : Symbol(a, Decl(objectSpread.ts, 40, 5))
+
+// methods are not enumerable
+class C { p = 1; m() { } }
+>C : Symbol(C, Decl(objectSpread.ts, 40, 26))
+>p : Symbol(C.p, Decl(objectSpread.ts, 43, 9))
+>m : Symbol(C.m, Decl(objectSpread.ts, 43, 16))
+
+let c: C = new C()
+>c : Symbol(c, Decl(objectSpread.ts, 44, 3))
+>C : Symbol(C, Decl(objectSpread.ts, 40, 26))
+>C : Symbol(C, Decl(objectSpread.ts, 40, 26))
+
+let spreadC: { p: number } = { ...c }
+>spreadC : Symbol(spreadC, Decl(objectSpread.ts, 45, 3))
+>p : Symbol(p, Decl(objectSpread.ts, 45, 14))
+
+// own methods are enumerable
+let cplus: { p: number, plus(): void } = { ...c, plus() { return this.p + 1; } };
+>cplus : Symbol(cplus, Decl(objectSpread.ts, 48, 3))
+>p : Symbol(p, Decl(objectSpread.ts, 48, 12))
+>plus : Symbol(plus, Decl(objectSpread.ts, 48, 23))
+>plus : Symbol(plus, Decl(objectSpread.ts, 48, 48))
+
+cplus.plus();
+>cplus.plus : Symbol(plus, Decl(objectSpread.ts, 48, 23))
+>cplus : Symbol(cplus, Decl(objectSpread.ts, 48, 3))
+>plus : Symbol(plus, Decl(objectSpread.ts, 48, 23))
+
+// new field's type conflicting with existing field is OK
+let changeTypeAfter: { a: string, b: string } =
+>changeTypeAfter : Symbol(changeTypeAfter, Decl(objectSpread.ts, 52, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 52, 22))
+>b : Symbol(b, Decl(objectSpread.ts, 52, 33))
+
+    { ...o, a: 'wrong type?' }
+>a : Symbol(a, Decl(objectSpread.ts, 53, 11))
+
+let changeTypeBefore: { a: number, b: string } =
+>changeTypeBefore : Symbol(changeTypeBefore, Decl(objectSpread.ts, 54, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 54, 23))
+>b : Symbol(b, Decl(objectSpread.ts, 54, 34))
+
+    { a: 'wrong type?', ...o };
+>a : Symbol(a, Decl(objectSpread.ts, 55, 5))
+
+let changeTypeBoth: { a: string, b: number } =
+>changeTypeBoth : Symbol(changeTypeBoth, Decl(objectSpread.ts, 56, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 56, 21))
+>b : Symbol(b, Decl(objectSpread.ts, 56, 32))
+
+    { ...o, ...swap };
+
+// optional
+let definiteBoolean: { sn: boolean };
+>definiteBoolean : Symbol(definiteBoolean, Decl(objectSpread.ts, 60, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 60, 22))
+
+let definiteString: { sn: string };
+>definiteString : Symbol(definiteString, Decl(objectSpread.ts, 61, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 61, 21))
+
+let optionalString: { sn?: string };
+>optionalString : Symbol(optionalString, Decl(objectSpread.ts, 62, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 62, 21))
+
+let optionalNumber: { sn?: number };
+>optionalNumber : Symbol(optionalNumber, Decl(objectSpread.ts, 63, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 63, 21))
+
+let optionalUnionStops: { sn: string | number | boolean } = { ...definiteBoolean, ...definiteString, ...optionalNumber };
+>optionalUnionStops : Symbol(optionalUnionStops, Decl(objectSpread.ts, 64, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 64, 25))
+
+let optionalUnionDuplicates: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...optionalString, ...optionalNumber };
+>optionalUnionDuplicates : Symbol(optionalUnionDuplicates, Decl(objectSpread.ts, 65, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 65, 30))
+
+let allOptional: { sn?: string | number } = { ...optionalString, ...optionalNumber };
+>allOptional : Symbol(allOptional, Decl(objectSpread.ts, 66, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 66, 18))
+
+// computed property
+let computedFirst: { a: number, b: string, "before everything": number } =
+>computedFirst : Symbol(computedFirst, Decl(objectSpread.ts, 69, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 69, 20))
+>b : Symbol(b, Decl(objectSpread.ts, 69, 31))
+
+    { ['before everything']: 12, ...o, b: 'yes' }
+>'before everything' : Symbol(['before everything'], Decl(objectSpread.ts, 70, 5))
+>b : Symbol(b, Decl(objectSpread.ts, 70, 38))
+
+let computedMiddle: { a: number, b: string, c: boolean, "in the middle": number } =
+>computedMiddle : Symbol(computedMiddle, Decl(objectSpread.ts, 71, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 71, 21))
+>b : Symbol(b, Decl(objectSpread.ts, 71, 32))
+>c : Symbol(c, Decl(objectSpread.ts, 71, 43))
+
+    { ...o, ['in the middle']: 13, b: 'maybe?', ...o2 }
+>'in the middle' : Symbol(['in the middle'], Decl(objectSpread.ts, 72, 11))
+>b : Symbol(b, Decl(objectSpread.ts, 72, 34))
+
+let computedAfter: { a: number, b: string, "at the end": number } =
+>computedAfter : Symbol(computedAfter, Decl(objectSpread.ts, 73, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 73, 20))
+>b : Symbol(b, Decl(objectSpread.ts, 73, 31))
+
+    { ...o, b: 'yeah', ['at the end']: 14 }
+>b : Symbol(b, Decl(objectSpread.ts, 74, 11))
+>'at the end' : Symbol(['at the end'], Decl(objectSpread.ts, 74, 22))
+
+// shortcut syntax
+let a = 12;
+>a : Symbol(a, Decl(objectSpread.ts, 76, 3))
+
+let shortCutted: { a: number, b: string } = { ...o, a }
+>shortCutted : Symbol(shortCutted, Decl(objectSpread.ts, 77, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 77, 18))
+>b : Symbol(b, Decl(objectSpread.ts, 77, 29))
+>a : Symbol(a, Decl(objectSpread.ts, 77, 51))
+
+// generics
+function f<T, U>(t: T, u: U): { id: string, ...T, ...U } {
+>f : Symbol(f, Decl(objectSpread.ts, 77, 55))
+>T : Symbol(T, Decl(objectSpread.ts, 80, 11))
+>U : Symbol(U, Decl(objectSpread.ts, 80, 13))
+>t : Symbol(t, Decl(objectSpread.ts, 80, 17))
+>T : Symbol(T, Decl(objectSpread.ts, 80, 11))
+>u : Symbol(u, Decl(objectSpread.ts, 80, 22))
+>U : Symbol(U, Decl(objectSpread.ts, 80, 13))
+>id : Symbol(id, Decl(objectSpread.ts, 80, 31))
+>T : Symbol(T, Decl(objectSpread.ts, 80, 11))
+>U : Symbol(U, Decl(objectSpread.ts, 80, 13))
+
+    return { id: 'id', ...t, ...u };
+>id : Symbol(id, Decl(objectSpread.ts, 81, 12))
+}
+let exclusive: { id: string, a: number, b: string, c: string, d: boolean } =
+>exclusive : Symbol(exclusive, Decl(objectSpread.ts, 83, 3))
+>id : Symbol(id, Decl(objectSpread.ts, 83, 16))
+>a : Symbol(a, Decl(objectSpread.ts, 83, 28))
+>b : Symbol(b, Decl(objectSpread.ts, 83, 39))
+>c : Symbol(c, Decl(objectSpread.ts, 83, 50))
+>d : Symbol(d, Decl(objectSpread.ts, 83, 61))
+
+    f({ a: 1, b: 'yes' }, { c: 'no', d: false })
+>f : Symbol(f, Decl(objectSpread.ts, 77, 55))
+>a : Symbol(a, Decl(objectSpread.ts, 84, 7))
+>b : Symbol(b, Decl(objectSpread.ts, 84, 13))
+>c : Symbol(c, Decl(objectSpread.ts, 84, 27))
+>d : Symbol(d, Decl(objectSpread.ts, 84, 36))
+
+let overlap: { id: string, a: number, b: string } =
+>overlap : Symbol(overlap, Decl(objectSpread.ts, 85, 3))
+>id : Symbol(id, Decl(objectSpread.ts, 85, 14))
+>a : Symbol(a, Decl(objectSpread.ts, 85, 26))
+>b : Symbol(b, Decl(objectSpread.ts, 85, 37))
+
+    f({ a: 1 }, { a: 2, b: 'extra' })
+>f : Symbol(f, Decl(objectSpread.ts, 77, 55))
+>a : Symbol(a, Decl(objectSpread.ts, 86, 7))
+>a : Symbol(a, Decl(objectSpread.ts, 86, 17))
+>b : Symbol(b, Decl(objectSpread.ts, 86, 23))
+
+let overlapConflict: { id:string, a: string } =
+>overlapConflict : Symbol(overlapConflict, Decl(objectSpread.ts, 87, 3))
+>id : Symbol(id, Decl(objectSpread.ts, 87, 22))
+>a : Symbol(a, Decl(objectSpread.ts, 87, 33))
+
+    f({ a: 1 }, { a: 'mismatch' })
+>f : Symbol(f, Decl(objectSpread.ts, 77, 55))
+>a : Symbol(a, Decl(objectSpread.ts, 88, 7))
+>a : Symbol(a, Decl(objectSpread.ts, 88, 17))
+
+let overwriteId: { id: boolean, a: number, c: number, d: string } =
+>overwriteId : Symbol(overwriteId, Decl(objectSpread.ts, 89, 3))
+>id : Symbol(id, Decl(objectSpread.ts, 89, 18))
+>a : Symbol(a, Decl(objectSpread.ts, 89, 31))
+>c : Symbol(c, Decl(objectSpread.ts, 89, 42))
+>d : Symbol(d, Decl(objectSpread.ts, 89, 53))
+
+    f({ a: 1, id: true }, { c: 1, d: 'no' })
+>f : Symbol(f, Decl(objectSpread.ts, 77, 55))
+>a : Symbol(a, Decl(objectSpread.ts, 90, 7))
+>id : Symbol(id, Decl(objectSpread.ts, 90, 13))
+>c : Symbol(c, Decl(objectSpread.ts, 90, 27))
+>d : Symbol(d, Decl(objectSpread.ts, 90, 33))
+
+class D { m() { }; q = 2; }
+>D : Symbol(D, Decl(objectSpread.ts, 90, 44))
+>m : Symbol(D.m, Decl(objectSpread.ts, 92, 9))
+>q : Symbol(D.q, Decl(objectSpread.ts, 92, 18))
+
+let classesAreWrong: { id: string, ...C, ...D } =
+>classesAreWrong : Symbol(classesAreWrong, Decl(objectSpread.ts, 93, 3))
+>id : Symbol(id, Decl(objectSpread.ts, 93, 22))
+>C : Symbol(C, Decl(objectSpread.ts, 40, 26))
+>D : Symbol(D, Decl(objectSpread.ts, 90, 44))
+
+    f(new C(), new D())
+>f : Symbol(f, Decl(objectSpread.ts, 77, 55))
+>C : Symbol(C, Decl(objectSpread.ts, 40, 26))
+>D : Symbol(D, Decl(objectSpread.ts, 90, 44))
+
diff --git a/tests/baselines/reference/objectSpread.types b/tests/baselines/reference/objectSpread.types
new file mode 100644
index 00000000000..1a053a22670
--- /dev/null
+++ b/tests/baselines/reference/objectSpread.types
@@ -0,0 +1,530 @@
+=== tests/cases/conformance/types/spread/objectSpread.ts ===
+let o = { a: 1, b: 'no' }
+>o : { a: number; b: string; }
+>{ a: 1, b: 'no' } : { a: number; b: string; }
+>a : number
+>1 : 1
+>b : string
+>'no' : "no"
+
+let o2 = { b: 'yes', c: true }
+>o2 : { b: string; c: boolean; }
+>{ b: 'yes', c: true } : { b: string; c: boolean; }
+>b : string
+>'yes' : "yes"
+>c : boolean
+>true : true
+
+let swap = { a: 'yes', b: -1 };
+>swap : { a: string; b: number; }
+>{ a: 'yes', b: -1 } : { a: string; b: number; }
+>a : string
+>'yes' : "yes"
+>b : number
+>-1 : -1
+>1 : 1
+
+let addAfter: { a: number, b: string, c: boolean } =
+>addAfter : { a: number; b: string; c: boolean; }
+>a : number
+>b : string
+>c : boolean
+
+    { ...o, c: false }
+>{ ...o, c: false } : { ...{ a: number; b: string; }; c: false; }
+>o : any
+>c : boolean
+>false : false
+
+let addBefore: { a: number, b: string, c: boolean } =
+>addBefore : { a: number; b: string; c: boolean; }
+>a : number
+>b : string
+>c : boolean
+
+    { c: false, ...o }
+>{ c: false, ...o } : { c: false; ...{ a: number; b: string; } }
+>c : boolean
+>false : false
+>o : any
+
+// Note: ignore still changes the order that properties are printed
+let ignore: { a: number, b: string } =
+>ignore : { a: number; b: string; }
+>a : number
+>b : string
+
+    { b: 'ignored', ...o }
+>{ b: 'ignored', ...o } : { b: string; ...{ a: number; b: string; } }
+>b : string
+>'ignored' : "ignored"
+>o : any
+
+let override: { a: number, b: string } =
+>override : { a: number; b: string; }
+>a : number
+>b : string
+
+    { ...o, b: 'override' }
+>{ ...o, b: 'override' } : { ...{ a: number; b: string; }; b: string; }
+>o : any
+>b : string
+>'override' : "override"
+
+let nested: { a: number, b: boolean, c: string } =
+>nested : { a: number; b: boolean; c: string; }
+>a : number
+>b : boolean
+>c : string
+
+    { ...{ a: 3, ...{ b: false, c: 'overriden' } }, c: 'whatever' }
+>{ ...{ a: 3, ...{ b: false, c: 'overriden' } }, c: 'whatever' } : { ...{ a: number; ...{ b: boolean; c: string; } }; c: string; }
+>{ a: 3, ...{ b: false, c: 'overriden' } } : { a: number; ...{ b: boolean; c: string; } }
+>a : number
+>3 : 3
+>{ b: false, c: 'overriden' } : { b: boolean; c: string; }
+>b : boolean
+>false : false
+>c : string
+>'overriden' : "overriden"
+>c : string
+>'whatever' : "whatever"
+
+let combined: { a: number, b: string, c: boolean } =
+>combined : { a: number; b: string; c: boolean; }
+>a : number
+>b : string
+>c : boolean
+
+    { ...o, ...o2 }
+>{ ...o, ...o2 } : { ...{ a: number; b: string; }; ...{ b: string; c: boolean; } }
+>o : any
+>o2 : any
+
+let combinedBefore: { a: number, b: string, c: boolean } =
+>combinedBefore : { a: number; b: string; c: boolean; }
+>a : number
+>b : string
+>c : boolean
+
+    { b: 'ok', ...o, ...o2 }
+>{ b: 'ok', ...o, ...o2 } : { b: string; ...{ a: number; b: string; }; ...{ b: string; c: boolean; } }
+>b : string
+>'ok' : "ok"
+>o : any
+>o2 : any
+
+let combinedMid: { a: number, b: string, c: boolean } =
+>combinedMid : { a: number; b: string; c: boolean; }
+>a : number
+>b : string
+>c : boolean
+
+    { ...o, b: 'ok', ...o2 }
+>{ ...o, b: 'ok', ...o2 } : { ...{ a: number; b: string; }; b: string; ...{ b: string; c: boolean; } }
+>o : any
+>b : string
+>'ok' : "ok"
+>o2 : any
+
+let combinedAfter: { a: number, b: string, c: boolean } =
+>combinedAfter : { a: number; b: string; c: boolean; }
+>a : number
+>b : string
+>c : boolean
+
+    { ...o, ...o2, b: 'ok' }
+>{ ...o, ...o2, b: 'ok' } : { ...{ a: number; b: string; }; ...{ b: string; c: boolean; }; b: string; }
+>o : any
+>o2 : any
+>b : string
+>'ok' : "ok"
+
+let combinedNested: { a: number, b: boolean, c: string, d: string } =
+>combinedNested : { a: number; b: boolean; c: string; d: string; }
+>a : number
+>b : boolean
+>c : string
+>d : string
+
+    { ...{ a: 4, ...{ b: false, c: 'overriden' } }, d: 'actually new', ...{ a: 5, d: 'maybe new' } }
+>{ ...{ a: 4, ...{ b: false, c: 'overriden' } }, d: 'actually new', ...{ a: 5, d: 'maybe new' } } : { ...{ a: number; ...{ b: boolean; c: string; } }; d: string; ...{ a: number; d: string; } }
+>{ a: 4, ...{ b: false, c: 'overriden' } } : { a: number; ...{ b: boolean; c: string; } }
+>a : number
+>4 : 4
+>{ b: false, c: 'overriden' } : { b: boolean; c: string; }
+>b : boolean
+>false : false
+>c : string
+>'overriden' : "overriden"
+>d : string
+>'actually new' : "actually new"
+>{ a: 5, d: 'maybe new' } : { a: number; d: string; }
+>a : number
+>5 : 5
+>d : string
+>'maybe new' : "maybe new"
+
+let combinedNestedChangeType: { a: number, b: boolean, c: number } =
+>combinedNestedChangeType : { a: number; b: boolean; c: number; }
+>a : number
+>b : boolean
+>c : number
+
+    { ...{ a: 1, ...{ b: false, c: 'overriden' } }, c: -1 }
+>{ ...{ a: 1, ...{ b: false, c: 'overriden' } }, c: -1 } : { ...{ a: number; ...{ b: boolean; c: string; } }; c: number; }
+>{ a: 1, ...{ b: false, c: 'overriden' } } : { a: number; ...{ b: boolean; c: string; } }
+>a : number
+>1 : 1
+>{ b: false, c: 'overriden' } : { b: boolean; c: string; }
+>b : boolean
+>false : false
+>c : string
+>'overriden' : "overriden"
+>c : number
+>-1 : -1
+>1 : 1
+
+let propertyNested: { a: { a: number, b: string } } =
+>propertyNested : { a: { a: number; b: string; }; }
+>a : { a: number; b: string; }
+>a : number
+>b : string
+
+    { a: { ... o } }
+>{ a: { ... o } } : { a: { ...{ a: number; b: string; } }; }
+>a : { ...{ a: number; b: string; } }
+>{ ... o } : { ...{ a: number; b: string; } }
+>o : any
+
+// accessors don't copy the descriptor
+// (which means that readonly getters become read/write properties)
+let op = { get a () { return 6 } };
+>op : { readonly a: number; }
+>{ get a () { return 6 } } : { readonly a: number; }
+>a : number
+>6 : 6
+
+let getter: { a: number, c: number } =
+>getter : { a: number; c: number; }
+>a : number
+>c : number
+
+    { ...op, c: 7 }
+>{ ...op, c: 7 } : { ...{ readonly a: number; }; c: number; }
+>op : any
+>c : number
+>7 : 7
+
+getter.a = 12;
+>getter.a = 12 : 12
+>getter.a : number
+>getter : { a: number; c: number; }
+>a : number
+>12 : 12
+
+// null and undefined are just skipped
+let spreadNull: { a: number } =
+>spreadNull : { a: number; }
+>a : number
+
+    { a: 7, ...null }
+>{ a: 7, ...null } : { a: number; }
+>a : number
+>7 : 7
+>null : null
+
+let spreadUndefined: { a: number } =
+>spreadUndefined : { a: number; }
+>a : number
+
+    { a: 7, ...undefined }
+>{ a: 7, ...undefined } : { a: number; }
+>a : number
+>7 : 7
+>undefined : any
+
+// methods are not enumerable
+class C { p = 1; m() { } }
+>C : C
+>p : number
+>1 : 1
+>m : () => void
+
+let c: C = new C()
+>c : C
+>C : C
+>new C() : C
+>C : typeof C
+
+let spreadC: { p: number } = { ...c }
+>spreadC : { p: number; }
+>p : number
+>{ ...c } : { ...C }
+>c : any
+
+// own methods are enumerable
+let cplus: { p: number, plus(): void } = { ...c, plus() { return this.p + 1; } };
+>cplus : { p: number; plus(): void; }
+>p : number
+>plus : () => void
+>{ ...c, plus() { return this.p + 1; } } : { ...C; plus(): any; }
+>c : any
+>plus : () => any
+>this.p + 1 : any
+>this.p : any
+>this : any
+>p : any
+>1 : 1
+
+cplus.plus();
+>cplus.plus() : void
+>cplus.plus : () => void
+>cplus : { p: number; plus(): void; }
+>plus : () => void
+
+// new field's type conflicting with existing field is OK
+let changeTypeAfter: { a: string, b: string } =
+>changeTypeAfter : { a: string; b: string; }
+>a : string
+>b : string
+
+    { ...o, a: 'wrong type?' }
+>{ ...o, a: 'wrong type?' } : { ...{ a: number; b: string; }; a: string; }
+>o : any
+>a : string
+>'wrong type?' : "wrong type?"
+
+let changeTypeBefore: { a: number, b: string } =
+>changeTypeBefore : { a: number; b: string; }
+>a : number
+>b : string
+
+    { a: 'wrong type?', ...o };
+>{ a: 'wrong type?', ...o } : { a: string; ...{ a: number; b: string; } }
+>a : string
+>'wrong type?' : "wrong type?"
+>o : any
+
+let changeTypeBoth: { a: string, b: number } =
+>changeTypeBoth : { a: string; b: number; }
+>a : string
+>b : number
+
+    { ...o, ...swap };
+>{ ...o, ...swap } : { ...{ a: number; b: string; }; ...{ a: string; b: number; } }
+>o : any
+>swap : any
+
+// optional
+let definiteBoolean: { sn: boolean };
+>definiteBoolean : { sn: boolean; }
+>sn : boolean
+
+let definiteString: { sn: string };
+>definiteString : { sn: string; }
+>sn : string
+
+let optionalString: { sn?: string };
+>optionalString : { sn?: string; }
+>sn : string
+
+let optionalNumber: { sn?: number };
+>optionalNumber : { sn?: number; }
+>sn : number
+
+let optionalUnionStops: { sn: string | number | boolean } = { ...definiteBoolean, ...definiteString, ...optionalNumber };
+>optionalUnionStops : { sn: string | number | boolean; }
+>sn : string | number | boolean
+>{ ...definiteBoolean, ...definiteString, ...optionalNumber } : { ...{ sn: boolean; }; ...{ sn: string; }; ...{ sn?: number; } }
+>definiteBoolean : any
+>definiteString : any
+>optionalNumber : any
+
+let optionalUnionDuplicates: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...optionalString, ...optionalNumber };
+>optionalUnionDuplicates : { sn: string | number; }
+>sn : string | number
+>{ ...definiteBoolean, ...definiteString, ...optionalString, ...optionalNumber } : { ...{ sn: boolean; }; ...{ sn: string; }; ...{ sn?: string; }; ...{ sn?: number; } }
+>definiteBoolean : any
+>definiteString : any
+>optionalString : any
+>optionalNumber : any
+
+let allOptional: { sn?: string | number } = { ...optionalString, ...optionalNumber };
+>allOptional : { sn?: string | number; }
+>sn : string | number
+>{ ...optionalString, ...optionalNumber } : { ...{ sn?: string; }; ...{ sn?: number; } }
+>optionalString : any
+>optionalNumber : any
+
+// computed property
+let computedFirst: { a: number, b: string, "before everything": number } =
+>computedFirst : { a: number; b: string; "before everything": number; }
+>a : number
+>b : string
+
+    { ['before everything']: 12, ...o, b: 'yes' }
+>{ ['before everything']: 12, ...o, b: 'yes' } : { ['before everything']: number; ...{ a: number; b: string; }; b: string; }
+>'before everything' : "before everything"
+>12 : 12
+>o : any
+>b : string
+>'yes' : "yes"
+
+let computedMiddle: { a: number, b: string, c: boolean, "in the middle": number } =
+>computedMiddle : { a: number; b: string; c: boolean; "in the middle": number; }
+>a : number
+>b : string
+>c : boolean
+
+    { ...o, ['in the middle']: 13, b: 'maybe?', ...o2 }
+>{ ...o, ['in the middle']: 13, b: 'maybe?', ...o2 } : { ...{ a: number; b: string; }; ['in the middle']: number; b: string; ...{ b: string; c: boolean; } }
+>o : any
+>'in the middle' : "in the middle"
+>13 : 13
+>b : string
+>'maybe?' : "maybe?"
+>o2 : any
+
+let computedAfter: { a: number, b: string, "at the end": number } =
+>computedAfter : { a: number; b: string; "at the end": number; }
+>a : number
+>b : string
+
+    { ...o, b: 'yeah', ['at the end']: 14 }
+>{ ...o, b: 'yeah', ['at the end']: 14 } : { ...{ a: number; b: string; }; b: string; ['at the end']: number; }
+>o : any
+>b : string
+>'yeah' : "yeah"
+>'at the end' : "at the end"
+>14 : 14
+
+// shortcut syntax
+let a = 12;
+>a : number
+>12 : 12
+
+let shortCutted: { a: number, b: string } = { ...o, a }
+>shortCutted : { a: number; b: string; }
+>a : number
+>b : string
+>{ ...o, a } : { ...{ a: number; b: string; }; a: number; }
+>o : any
+>a : number
+
+// generics
+function f<T, U>(t: T, u: U): { id: string, ...T, ...U } {
+>f : <T, U>(t: T, u: U) => { id: string; ...T; ...U }
+>T : T
+>U : U
+>t : T
+>T : T
+>u : U
+>U : U
+>id : string
+>T : T
+>U : U
+
+    return { id: 'id', ...t, ...u };
+>{ id: 'id', ...t, ...u } : { id: string; ...T; ...U }
+>id : string
+>'id' : "id"
+>t : any
+>u : any
+}
+let exclusive: { id: string, a: number, b: string, c: string, d: boolean } =
+>exclusive : { id: string; a: number; b: string; c: string; d: boolean; }
+>id : string
+>a : number
+>b : string
+>c : string
+>d : boolean
+
+    f({ a: 1, b: 'yes' }, { c: 'no', d: false })
+>f({ a: 1, b: 'yes' }, { c: 'no', d: false }) : { id: string; ...{ a: number; b: string; }; ...{ c: string; d: boolean; } }
+>f : <T, U>(t: T, u: U) => { id: string; ...T; ...U }
+>{ a: 1, b: 'yes' } : { a: number; b: string; }
+>a : number
+>1 : 1
+>b : string
+>'yes' : "yes"
+>{ c: 'no', d: false } : { c: string; d: false; }
+>c : string
+>'no' : "no"
+>d : boolean
+>false : false
+
+let overlap: { id: string, a: number, b: string } =
+>overlap : { id: string; a: number; b: string; }
+>id : string
+>a : number
+>b : string
+
+    f({ a: 1 }, { a: 2, b: 'extra' })
+>f({ a: 1 }, { a: 2, b: 'extra' }) : { id: string; ...{ a: number; }; ...{ a: number; b: string; } }
+>f : <T, U>(t: T, u: U) => { id: string; ...T; ...U }
+>{ a: 1 } : { a: number; }
+>a : number
+>1 : 1
+>{ a: 2, b: 'extra' } : { a: number; b: string; }
+>a : number
+>2 : 2
+>b : string
+>'extra' : "extra"
+
+let overlapConflict: { id:string, a: string } =
+>overlapConflict : { id: string; a: string; }
+>id : string
+>a : string
+
+    f({ a: 1 }, { a: 'mismatch' })
+>f({ a: 1 }, { a: 'mismatch' }) : { id: string; ...{ a: number; }; ...{ a: string; } }
+>f : <T, U>(t: T, u: U) => { id: string; ...T; ...U }
+>{ a: 1 } : { a: number; }
+>a : number
+>1 : 1
+>{ a: 'mismatch' } : { a: string; }
+>a : string
+>'mismatch' : "mismatch"
+
+let overwriteId: { id: boolean, a: number, c: number, d: string } =
+>overwriteId : { id: boolean; a: number; c: number; d: string; }
+>id : boolean
+>a : number
+>c : number
+>d : string
+
+    f({ a: 1, id: true }, { c: 1, d: 'no' })
+>f({ a: 1, id: true }, { c: 1, d: 'no' }) : { id: string; ...{ a: number; id: boolean; }; ...{ c: number; d: string; } }
+>f : <T, U>(t: T, u: U) => { id: string; ...T; ...U }
+>{ a: 1, id: true } : { a: number; id: true; }
+>a : number
+>1 : 1
+>id : boolean
+>true : true
+>{ c: 1, d: 'no' } : { c: number; d: string; }
+>c : number
+>1 : 1
+>d : string
+>'no' : "no"
+
+class D { m() { }; q = 2; }
+>D : D
+>m : () => void
+>q : number
+>2 : 2
+
+let classesAreWrong: { id: string, ...C, ...D } =
+>classesAreWrong : { id: string; ...C; ...D }
+>id : string
+>C : C
+>D : D
+
+    f(new C(), new D())
+>f(new C(), new D()) : { id: string; ...C; ...D }
+>f : <T, U>(t: T, u: U) => { id: string; ...T; ...U }
+>new C() : C
+>C : typeof C
+>new D() : D
+>D : typeof D
+
diff --git a/tests/baselines/reference/objectSpreadGeneric.errors.txt b/tests/baselines/reference/objectSpreadGeneric.errors.txt
new file mode 100644
index 00000000000..16dfc835d26
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadGeneric.errors.txt
@@ -0,0 +1,80 @@
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(4,11): error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...V; ...U; ...T }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(5,11): error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...U; ...T; ...V }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(6,11): error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...U; ...V }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(7,11): error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...T; ...V }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(8,11): error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...T; ...U }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(13,11): error TS2322: Type '{}' is not assignable to type '{ ...T; ...U }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(26,11): error TS2322: Type '{ first: string; ...T; second: string; ...U; third: string; }' is not assignable to type '{ first: string; second: string; ...T; third: string; }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(34,11): error TS2322: Type '{ firrrrrrst: string; ...T; second: string; ...U; third: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
+  Property 'first' is missing in type '{ firrrrrrst: string; ...T; second: string; ...U; third: string; }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(36,11): error TS2322: Type '{ first: string; ...T; ssssssssecond: string; ...U; third: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
+  Property 'second' is missing in type '{ first: string; ...T; ssssssssecond: string; ...U; third: string; }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(38,11): error TS2322: Type '{ first: string; ...T; second: string; ...U; thirrrrrrrd: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
+  Property 'third' is missing in type '{ first: string; ...T; second: string; ...U; thirrrrrrrd: string; }'.
+
+
+==== tests/cases/conformance/types/spread/objectSpreadGeneric.ts (10 errors) ====
+    function f<T, U, V>(t: T, u: U, v: V): void {
+        let o: { ...T, ...U, ...V };
+        const same: { ...T, ...U, ...V } = o; // ok
+        const reversed: { ...V, ...U, ...T } = o; // error, reversed
+              ~~~~~~~~
+!!! error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...V; ...U; ...T }'.
+        const reversed2: { ...U, ...T, ...V } = o; // error, U and T are still reversed
+              ~~~~~~~~~
+!!! error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...U; ...T; ...V }'.
+        const missingT: { ...U, ...V } = o; // error, missing T
+              ~~~~~~~~
+!!! error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...U; ...V }'.
+        const missingU: { ...T, ...V } = o; // error, missing U
+              ~~~~~~~~
+!!! error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...T; ...V }'.
+        const missingV: { ...T, ...U } = o; // error, missing V
+              ~~~~~~~~
+!!! error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...T; ...U }'.
+        const atEnd: { ...T, ...U, second: string } = { ...t, ...u, second: 'foo' }; // ok
+        const atBeginning: { first: string, ...T, ...U, } = { first: 'foo', ...t, ...u }; // ok
+    
+        const emptyTarget: { } = { ...t, ...u } // ok
+        const emptySource: { ...T, ...U } = { }; // error, {} is not assignable to U (or T)
+              ~~~~~~~~~~~
+!!! error TS2322: Type '{}' is not assignable to type '{ ...T; ...U }'.
+    
+        let optionalNumber: { sn?: number };
+        let optionalString: { sn?: string };
+        let optionalBoolean: { sn?: boolean };
+        const unionCutoff: { ...T, sn?: number | string | boolean } =
+            { ...optionalBoolean, ...t, ...optionalString, ...optionalNumber } // ok
+        unionCutoff.sn; // ok
+        const optionalCutoff = { ...t, ...optionalNumber }; // ok
+        optionalCutoff.sn; // ok
+    
+        const interspersed: { first: string, ...T, second: string, ...U, third: string } =
+            { first: '1', ...t, second: '2', ...u, third: '3' }; // ok
+        const interspersedMissingU: { first: string, second: string, ...T, third: string } =
+              ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2322: Type '{ first: string; ...T; second: string; ...U; third: string; }' is not assignable to type '{ first: string; second: string; ...T; third: string; }'.
+            { first: '1', ...t, second: '2', ...u, third: '3' }; // error, 'U' is missing
+        const interspersedOrder1: { first: string, ...T, second: string, ...U, third: string, secondsecond: string } =
+            { first: '1', ...t, second: '2', ...u, third: '3', secondsecond: 'false' }; // ok
+        const interspersedOrder2: { first: string, second: string, secondsecond: string, third: string, ...T, ...U } =
+            { first: '1', ...t, second: '2', ...u, third: '3', secondsecond: 'false' }; // ok
+    
+    
+        const mismatchFirst: { first: string, ...T, second: string, ...U, third: string } =
+              ~~~~~~~~~~~~~
+!!! error TS2322: Type '{ firrrrrrst: string; ...T; second: string; ...U; third: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
+!!! error TS2322:   Property 'first' is missing in type '{ firrrrrrst: string; ...T; second: string; ...U; third: string; }'.
+            { firrrrrrst: '1', ...t, second: '2', ...u, third: '3' }; // error, 'first' not found
+        const mismatchSecond: { first: string, ...T, second: string, ...U, third: string } =
+              ~~~~~~~~~~~~~~
+!!! error TS2322: Type '{ first: string; ...T; ssssssssecond: string; ...U; third: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
+!!! error TS2322:   Property 'second' is missing in type '{ first: string; ...T; ssssssssecond: string; ...U; third: string; }'.
+            { first: '1', ...t, ssssssssecond: '2', ...u, third: '3' }; // error, 'second' not found
+        const mismatchLast: { first: string, ...T, second: string, ...U, third: string } =
+              ~~~~~~~~~~~~
+!!! error TS2322: Type '{ first: string; ...T; second: string; ...U; thirrrrrrrd: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
+!!! error TS2322:   Property 'third' is missing in type '{ first: string; ...T; second: string; ...U; thirrrrrrrd: string; }'.
+            { first: '1', ...t, second: '2', ...u, thirrrrrrrd: '3' }; // error, 'third' not found
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/objectSpreadGeneric.js b/tests/baselines/reference/objectSpreadGeneric.js
new file mode 100644
index 00000000000..593ab73f98f
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadGeneric.js
@@ -0,0 +1,79 @@
+//// [objectSpreadGeneric.ts]
+function f<T, U, V>(t: T, u: U, v: V): void {
+    let o: { ...T, ...U, ...V };
+    const same: { ...T, ...U, ...V } = o; // ok
+    const reversed: { ...V, ...U, ...T } = o; // error, reversed
+    const reversed2: { ...U, ...T, ...V } = o; // error, U and T are still reversed
+    const missingT: { ...U, ...V } = o; // error, missing T
+    const missingU: { ...T, ...V } = o; // error, missing U
+    const missingV: { ...T, ...U } = o; // error, missing V
+    const atEnd: { ...T, ...U, second: string } = { ...t, ...u, second: 'foo' }; // ok
+    const atBeginning: { first: string, ...T, ...U, } = { first: 'foo', ...t, ...u }; // ok
+
+    const emptyTarget: { } = { ...t, ...u } // ok
+    const emptySource: { ...T, ...U } = { }; // error, {} is not assignable to U (or T)
+
+    let optionalNumber: { sn?: number };
+    let optionalString: { sn?: string };
+    let optionalBoolean: { sn?: boolean };
+    const unionCutoff: { ...T, sn?: number | string | boolean } =
+        { ...optionalBoolean, ...t, ...optionalString, ...optionalNumber } // ok
+    unionCutoff.sn; // ok
+    const optionalCutoff = { ...t, ...optionalNumber }; // ok
+    optionalCutoff.sn; // ok
+
+    const interspersed: { first: string, ...T, second: string, ...U, third: string } =
+        { first: '1', ...t, second: '2', ...u, third: '3' }; // ok
+    const interspersedMissingU: { first: string, second: string, ...T, third: string } =
+        { first: '1', ...t, second: '2', ...u, third: '3' }; // error, 'U' is missing
+    const interspersedOrder1: { first: string, ...T, second: string, ...U, third: string, secondsecond: string } =
+        { first: '1', ...t, second: '2', ...u, third: '3', secondsecond: 'false' }; // ok
+    const interspersedOrder2: { first: string, second: string, secondsecond: string, third: string, ...T, ...U } =
+        { first: '1', ...t, second: '2', ...u, third: '3', secondsecond: 'false' }; // ok
+
+
+    const mismatchFirst: { first: string, ...T, second: string, ...U, third: string } =
+        { firrrrrrst: '1', ...t, second: '2', ...u, third: '3' }; // error, 'first' not found
+    const mismatchSecond: { first: string, ...T, second: string, ...U, third: string } =
+        { first: '1', ...t, ssssssssecond: '2', ...u, third: '3' }; // error, 'second' not found
+    const mismatchLast: { first: string, ...T, second: string, ...U, third: string } =
+        { first: '1', ...t, second: '2', ...u, thirrrrrrrd: '3' }; // error, 'third' not found
+}
+
+
+//// [objectSpreadGeneric.js]
+var __assign = (this && this.__assign) || Object.assign || function(t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+        s = arguments[i];
+        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+            t[p] = s[p];
+    }
+    return t;
+};
+function f(t, u, v) {
+    var o;
+    var same = o; // ok
+    var reversed = o; // error, reversed
+    var reversed2 = o; // error, U and T are still reversed
+    var missingT = o; // error, missing T
+    var missingU = o; // error, missing U
+    var missingV = o; // error, missing V
+    var atEnd = __assign({}, t, u, { second: 'foo' }); // ok
+    var atBeginning = __assign({ first: 'foo' }, t, u); // ok
+    var emptyTarget = __assign({}, t, u); // ok
+    var emptySource = {}; // error, {} is not assignable to U (or T)
+    var optionalNumber;
+    var optionalString;
+    var optionalBoolean;
+    var unionCutoff = __assign({}, optionalBoolean, t, optionalString, optionalNumber); // ok
+    unionCutoff.sn; // ok
+    var optionalCutoff = __assign({}, t, optionalNumber); // ok
+    optionalCutoff.sn; // ok
+    var interspersed = __assign({ first: '1' }, t, { second: '2' }, u, { third: '3' }); // ok
+    var interspersedMissingU = __assign({ first: '1' }, t, { second: '2' }, u, { third: '3' }); // error, 'U' is missing
+    var interspersedOrder1 = __assign({ first: '1' }, t, { second: '2' }, u, { third: '3', secondsecond: 'false' }); // ok
+    var interspersedOrder2 = __assign({ first: '1' }, t, { second: '2' }, u, { third: '3', secondsecond: 'false' }); // ok
+    var mismatchFirst = __assign({ firrrrrrst: '1' }, t, { second: '2' }, u, { third: '3' }); // error, 'first' not found
+    var mismatchSecond = __assign({ first: '1' }, t, { ssssssssecond: '2' }, u, { third: '3' }); // error, 'second' not found
+    var mismatchLast = __assign({ first: '1' }, t, { second: '2' }, u, { thirrrrrrrd: '3' }); // error, 'third' not found
+}
diff --git a/tests/baselines/reference/objectSpreadNegative.errors.txt b/tests/baselines/reference/objectSpreadNegative.errors.txt
new file mode 100644
index 00000000000..1ee3acb823c
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadNegative.errors.txt
@@ -0,0 +1,93 @@
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(13,30): error TS2339: Property 'x' does not exist on type '{ ...PublicX; ...PrivateOptionalX }'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(16,5): error TS2322: Type '{ ...{ sn?: string; }; ...{ sn?: number; } }' is not assignable to type '{ sn: string | number; }'.
+  Property 'sn' is optional in type '{ ...{ sn?: string; }; ...{ sn?: number; } }' but required in type '{ sn: string | number; }'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(22,5): error TS2322: Type '{ s: string; }' is not assignable to type '{ ...Bool; ...Str }'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(24,1): error TS2322: Type 'Bool' is not assignable to type '{ ...Bool; ...Str }'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(27,15): error TS2697: Spread properties must be identifiers, property accesses, or object literals.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(28,15): error TS2697: Spread properties must be identifiers, property accesses, or object literals.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(31,36): error TS2300: Duplicate identifier 'b'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(31,53): error TS2300: Duplicate identifier 'b'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(36,12): error TS2339: Property 'b' does not exist on type '{ ...{ b: number; } }'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(42,9): error TS2339: Property 'm' does not exist on type '{ ...C }'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(45,1): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type '{ ...PublicX }' has no compatible call signatures.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(46,1): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(48,39): error TS2697: Spread properties must be identifiers, property accesses, or object literals.
+
+
+==== tests/cases/conformance/types/spread/objectSpreadNegative.ts (13 errors) ====
+    let o = { a: 1, b: 'no' }
+    
+    /// private propagates
+    class PrivateOptionalX {
+        private x?: number;
+    }
+    class PublicX {
+        public x: number;
+    }
+    let privateOptionalx: PrivateOptionalX;
+    let publicx: PublicX;
+    let o3 = { ...publicx, ...privateOptionalx };
+    let sn: string | number = o3.x; // error, x is private
+                                 ~
+!!! error TS2339: Property 'x' does not exist on type '{ ...PublicX; ...PrivateOptionalX }'.
+    let optionalString: { sn?: string };
+    let optionalNumber: { sn?: number };
+    let allOptional: { sn: string | number } = { ...optionalString, ...optionalNumber };
+        ~~~~~~~~~~~
+!!! error TS2322: Type '{ ...{ sn?: string; }; ...{ sn?: number; } }' is not assignable to type '{ sn: string | number; }'.
+!!! error TS2322:   Property 'sn' is optional in type '{ ...{ sn?: string; }; ...{ sn?: number; } }' but required in type '{ sn: string | number; }'.
+    // error, 'sn' is optional in source, required in target
+    
+    // assignability as target
+    interface Bool { b: boolean };
+    interface Str { s: string };
+    let spread: { ...Bool, ...Str } = { s: 'foo' }; // error, missing 'b'
+        ~~~~~~
+!!! error TS2322: Type '{ s: string; }' is not assignable to type '{ ...Bool; ...Str }'.
+    let b: Bool;
+    spread = b; // error, missing 's'
+    ~~~~~~
+!!! error TS2322: Type 'Bool' is not assignable to type '{ ...Bool; ...Str }'.
+    
+    // expressions are not allowed
+    let o1 = { ...1 + 1 };
+                  ~~~~~
+!!! error TS2697: Spread properties must be identifiers, property accesses, or object literals.
+    let o2 = { ...(1 + 1) };
+                  ~~~~~~~
+!!! error TS2697: Spread properties must be identifiers, property accesses, or object literals.
+    
+    // literal repeats are not allowed, but spread repeats are fine
+    let duplicated = { b: 'bad', ...o, b: 'bad', ...o2, b: 'bad' }
+                                       ~
+!!! error TS2300: Duplicate identifier 'b'.
+                                                        ~
+!!! error TS2300: Duplicate identifier 'b'.
+    let duplicatedSpread = { ...o, ...o }
+    
+    // write-only properties get skipped
+    let setterOnly = { ...{ set b (bad: number) { } } };
+    setterOnly.b = 12; // error, 'b' does not exist
+               ~
+!!! error TS2339: Property 'b' does not exist on type '{ ...{ b: number; } }'.
+    
+    // methods are skipped because they aren't enumerable
+    class C { p = 1; m() { } }
+    let c: C = new C()
+    let spreadC = { ...c }
+    spreadC.m(); // error 'm' is not in '{ ... c }'
+            ~
+!!! error TS2339: Property 'm' does not exist on type '{ ...C }'.
+    
+    let callableConstructableSpread: { ...PublicX, (n: number): number, new (p: number) };
+    callableConstructableSpread(12); // error, no call signature
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2349: Cannot invoke an expression whose type lacks a call signature. Type '{ ...PublicX }' has no compatible call signatures.
+    new callableConstructableSpread(12); // error, no construct signature
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
+    
+    let callableSpread = { ...publicx, ...(n => n + 1) }; // error, can't spread functions
+                                          ~~~~~~~~~~~~
+!!! error TS2697: Spread properties must be identifiers, property accesses, or object literals.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/objectSpreadNegative.js b/tests/baselines/reference/objectSpreadNegative.js
new file mode 100644
index 00000000000..685760f9444
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadNegative.js
@@ -0,0 +1,108 @@
+//// [objectSpreadNegative.ts]
+let o = { a: 1, b: 'no' }
+
+/// private propagates
+class PrivateOptionalX {
+    private x?: number;
+}
+class PublicX {
+    public x: number;
+}
+let privateOptionalx: PrivateOptionalX;
+let publicx: PublicX;
+let o3 = { ...publicx, ...privateOptionalx };
+let sn: string | number = o3.x; // error, x is private
+let optionalString: { sn?: string };
+let optionalNumber: { sn?: number };
+let allOptional: { sn: string | number } = { ...optionalString, ...optionalNumber };
+// error, 'sn' is optional in source, required in target
+
+// assignability as target
+interface Bool { b: boolean };
+interface Str { s: string };
+let spread: { ...Bool, ...Str } = { s: 'foo' }; // error, missing 'b'
+let b: Bool;
+spread = b; // error, missing 's'
+
+// expressions are not allowed
+let o1 = { ...1 + 1 };
+let o2 = { ...(1 + 1) };
+
+// literal repeats are not allowed, but spread repeats are fine
+let duplicated = { b: 'bad', ...o, b: 'bad', ...o2, b: 'bad' }
+let duplicatedSpread = { ...o, ...o }
+
+// write-only properties get skipped
+let setterOnly = { ...{ set b (bad: number) { } } };
+setterOnly.b = 12; // error, 'b' does not exist
+
+// methods are skipped because they aren't enumerable
+class C { p = 1; m() { } }
+let c: C = new C()
+let spreadC = { ...c }
+spreadC.m(); // error 'm' is not in '{ ... c }'
+
+let callableConstructableSpread: { ...PublicX, (n: number): number, new (p: number) };
+callableConstructableSpread(12); // error, no call signature
+new callableConstructableSpread(12); // error, no construct signature
+
+let callableSpread = { ...publicx, ...(n => n + 1) }; // error, can't spread functions
+
+
+//// [objectSpreadNegative.js]
+var __assign = (this && this.__assign) || Object.assign || function(t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+        s = arguments[i];
+        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+            t[p] = s[p];
+    }
+    return t;
+};
+var o = { a: 1, b: 'no' };
+/// private propagates
+var PrivateOptionalX = (function () {
+    function PrivateOptionalX() {
+    }
+    return PrivateOptionalX;
+}());
+var PublicX = (function () {
+    function PublicX() {
+    }
+    return PublicX;
+}());
+var privateOptionalx;
+var publicx;
+var o3 = __assign({}, publicx, privateOptionalx);
+var sn = o3.x; // error, x is private
+var optionalString;
+var optionalNumber;
+var allOptional = __assign({}, optionalString, optionalNumber);
+;
+;
+var spread = { s: 'foo' }; // error, missing 'b'
+var b;
+spread = b; // error, missing 's'
+// expressions are not allowed
+var o1 = __assign({}, 1 + 1);
+var o2 = __assign({}, (1 + 1));
+// 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);
+// write-only properties get skipped
+var setterOnly = __assign({ set b(bad: number) { } });
+setterOnly.b = 12; // error, 'b' does not exist
+// methods are skipped because they aren't enumerable
+var C = (function () {
+    function C() {
+        this.p = 1;
+    }
+    C.prototype.m = function () { };
+    return C;
+}());
+var c = new C();
+var spreadC = __assign({}, c);
+spreadC.m(); // error 'm' is not in '{ ... c }'
+var callableConstructableSpread;
+callableConstructableSpread(12); // error, no call signature
+new callableConstructableSpread(12); // error, no construct signature
+var callableSpread = __assign({}, publicx, (function (n) { return n + 1; })); // error, can't spread functions
diff --git a/tests/baselines/reference/objectSpreadNegativeParse.errors.txt b/tests/baselines/reference/objectSpreadNegativeParse.errors.txt
new file mode 100644
index 00000000000..41651fb1d1c
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadNegativeParse.errors.txt
@@ -0,0 +1,35 @@
+tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(1,15): error TS2304: Cannot find name 'o'.
+tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(1,18): error TS1109: Expression expected.
+tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(2,15): error TS1109: Expression expected.
+tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(2,16): error TS2304: Cannot find name 'o'.
+tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(3,15): error TS2304: Cannot find name 'matchMedia'.
+tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(3,28): error TS1005: ',' expected.
+tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(3,31): error TS1128: Declaration or statement expected.
+tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(4,16): error TS2304: Cannot find name 'get'.
+tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(4,20): error TS1005: ',' expected.
+
+
+==== tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts (9 errors) ====
+    let o7 = { ...o? };
+                  ~
+!!! error TS2304: Cannot find name 'o'.
+                     ~
+!!! error TS1109: Expression expected.
+    let o8 = { ...*o };
+                  ~
+!!! error TS1109: Expression expected.
+                   ~
+!!! error TS2304: Cannot find name 'o'.
+    let o9 = { ...matchMedia() { }};
+                  ~~~~~~~~~~
+!!! error TS2304: Cannot find name 'matchMedia'.
+                               ~
+!!! error TS1005: ',' expected.
+                                  ~
+!!! error TS1128: Declaration or statement expected.
+    let o10 = { ...get x() { return 12; }};
+                   ~~~
+!!! error TS2304: Cannot find name 'get'.
+                       ~
+!!! error TS1005: ',' expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/objectSpreadNegativeParse.js b/tests/baselines/reference/objectSpreadNegativeParse.js
new file mode 100644
index 00000000000..297c56c3e62
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadNegativeParse.js
@@ -0,0 +1,21 @@
+//// [objectSpreadNegativeParse.ts]
+let o7 = { ...o? };
+let o8 = { ...*o };
+let o9 = { ...matchMedia() { }};
+let o10 = { ...get x() { return 12; }};
+
+
+//// [objectSpreadNegativeParse.js]
+var __assign = (this && this.__assign) || Object.assign || function(t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+        s = arguments[i];
+        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+            t[p] = s[p];
+    }
+    return t;
+};
+var o7 = __assign({}, o ?  : );
+var o8 = __assign({},  * o);
+var o9 = __assign({}, matchMedia()), _a = void 0;
+;
+var o10 = __assign({}, get, { x: function () { return 12; } });

From 39385590b6b9571d85ab74b43faaf7caddd9c388 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 26 Sep 2016 09:43:59 -0700
Subject: [PATCH 006/421] Move interfaceSpread to correct location

---
 tests/baselines/reference/interfaceSpread.errors.txt      | 8 ++++----
 .../destructuring => types/spread}/interfaceSpread.ts     | 0
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename tests/cases/conformance/{es6/destructuring => types/spread}/interfaceSpread.ts (100%)

diff --git a/tests/baselines/reference/interfaceSpread.errors.txt b/tests/baselines/reference/interfaceSpread.errors.txt
index 27aab11491c..2b27c972cc8 100644
--- a/tests/baselines/reference/interfaceSpread.errors.txt
+++ b/tests/baselines/reference/interfaceSpread.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/destructuring/interfaceSpread.ts(2,5): error TS2699: Interface declaration cannot contain a spread property.
-tests/cases/conformance/es6/destructuring/interfaceSpread.ts(7,10): error TS2339: Property 'jam' does not exist on type 'Congealed<{ jam: number; }, { peanutButter: number; }>'.
-tests/cases/conformance/es6/destructuring/interfaceSpread.ts(8,10): error TS2339: Property 'peanutButter' does not exist on type 'Congealed<{ jam: number; }, { peanutButter: number; }>'.
+tests/cases/conformance/types/spread/interfaceSpread.ts(2,5): error TS2699: Interface declaration cannot contain a spread property.
+tests/cases/conformance/types/spread/interfaceSpread.ts(7,10): error TS2339: Property 'jam' does not exist on type 'Congealed<{ jam: number; }, { peanutButter: number; }>'.
+tests/cases/conformance/types/spread/interfaceSpread.ts(8,10): error TS2339: Property 'peanutButter' does not exist on type 'Congealed<{ jam: number; }, { peanutButter: number; }>'.
 
 
-==== tests/cases/conformance/es6/destructuring/interfaceSpread.ts (3 errors) ====
+==== tests/cases/conformance/types/spread/interfaceSpread.ts (3 errors) ====
     interface Congealed<T, U> {
         ...T
         ~~~~
diff --git a/tests/cases/conformance/es6/destructuring/interfaceSpread.ts b/tests/cases/conformance/types/spread/interfaceSpread.ts
similarity index 100%
rename from tests/cases/conformance/es6/destructuring/interfaceSpread.ts
rename to tests/cases/conformance/types/spread/interfaceSpread.ts

From 63f8c991733ec3f4ba5819452281f91e2206b8ed Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 26 Sep 2016 10:24:05 -0700
Subject: [PATCH 007/421] Object.assign uses spread types now

---
 src/lib/es2015.core.d.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/es2015.core.d.ts b/src/lib/es2015.core.d.ts
index 5d570bb0866..2373b828fdd 100644
--- a/src/lib/es2015.core.d.ts
+++ b/src/lib/es2015.core.d.ts
@@ -278,7 +278,7 @@ interface ObjectConstructor {
       * @param target The target object to copy to.
       * @param source The source object from which to copy properties.
       */
-    assign<T, U>(target: T, source: U): T & U;
+    assign<T, U>(target: T, source: U): { ...T, ...U };
 
     /**
       * Copy the values of all of the enumerable own properties from one or more source objects to a
@@ -287,7 +287,7 @@ interface ObjectConstructor {
       * @param source1 The first source object from which to copy properties.
       * @param source2 The second source object from which to copy properties.
       */
-    assign<T, U, V>(target: T, source1: U, source2: V): T & U & V;
+    assign<T, U, V>(target: T, source1: U, source2: V): { ...T, ...U, ...V };
 
     /**
       * Copy the values of all of the enumerable own properties from one or more source objects to a
@@ -297,7 +297,7 @@ interface ObjectConstructor {
       * @param source2 The second source object from which to copy properties.
       * @param source3 The third source object from which to copy properties.
       */
-    assign<T, U, V, W>(target: T, source1: U, source2: V, source3: W): T & U & V & W;
+    assign<T, U, V, W>(target: T, source1: U, source2: V, source3: W): { ...T, ...U, ...V, ...W };
 
     /**
       * Copy the values of all of the enumerable own properties from one or more source objects to a

From a0db19749ab5316254fdfa7d3dfdaa49aee3ed7a Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 26 Sep 2016 11:50:02 -0700
Subject: [PATCH 008/421] Rename Spread[Element]Expression

1. SpreadElementExpression (existing, for arrays) -> SpreadExpression
2. SpreadElement (new for object literals) -> SpreadElementExpression
---
 src/compiler/binder.ts                     | 23 +++++++------
 src/compiler/checker.ts                    | 38 +++++++++++-----------
 src/compiler/emitter.ts                    |  6 ++--
 src/compiler/factory.ts                    |  6 ++--
 src/compiler/parser.ts                     | 20 +++++-------
 src/compiler/transformers/destructuring.ts |  4 +--
 src/compiler/transformers/es6.ts           | 36 ++++++++++----------
 src/compiler/transformers/experimental.ts  |  4 +--
 src/compiler/transformers/module/system.ts |  6 ++--
 src/compiler/types.ts                      | 18 +++++-----
 src/compiler/utilities.ts                  | 14 ++++----
 src/compiler/visitor.ts                    | 12 +++----
 src/services/breakpoints.ts                |  2 +-
 src/services/utilities.ts                  |  4 +--
 14 files changed, 96 insertions(+), 97 deletions(-)

diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index d3217fd70a8..c198b5c01ff 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -1063,8 +1063,8 @@ namespace ts {
             }
             else if (node.kind === SyntaxKind.ArrayLiteralExpression) {
                 for (const e of (<ArrayLiteralExpression>node).elements) {
-                    if (e.kind === SyntaxKind.SpreadElementExpression) {
-                        bindAssignmentTargetFlow((<SpreadElementExpression>e).expression);
+                    if (e.kind === SyntaxKind.SpreadExpression) {
+                        bindAssignmentTargetFlow((<SpreadExpression>e).expression);
                     }
                     else {
                         bindDestructuringTargetFlow(e);
@@ -1079,6 +1079,9 @@ namespace ts {
                     else if (p.kind === SyntaxKind.ShorthandPropertyAssignment) {
                         bindAssignmentTargetFlow((<ShorthandPropertyAssignment>p).name);
                     }
+                    else if (p.kind === SyntaxKind.SpreadElementExpression) {
+                        bindAssignmentTargetFlow((<SpreadElementExpression>p).expression);
+                    }
                 }
             }
         }
@@ -1825,7 +1828,7 @@ namespace ts {
                 case SyntaxKind.EnumMember:
                     return bindPropertyOrMethodOrAccessor(<Declaration>node, SymbolFlags.EnumMember, SymbolFlags.EnumMemberExcludes);
 
-                case SyntaxKind.SpreadElement:
+                case SyntaxKind.SpreadElementExpression:
                 case SyntaxKind.JsxSpreadAttribute:
                     emitFlags |= NodeFlags.HasSpreadAttribute;
                     return;
@@ -2369,9 +2372,9 @@ namespace ts {
         const expression = node.expression;
         const expressionKind = expression.kind;
 
-        if (subtreeFlags & TransformFlags.ContainsSpreadElementExpression
+        if (subtreeFlags & TransformFlags.ContainsSpreadExpression
             || isSuperOrSuperProperty(expression, expressionKind)) {
-            // If the this node contains a SpreadElementExpression, or is a super call, then it is an ES6
+            // If the this node contains a SpreadExpression, or is a super call, then it is an ES6
             // node.
             transformFlags |= TransformFlags.AssertES6;
         }
@@ -2957,10 +2960,10 @@ namespace ts {
                 }
                 break;
 
-            case SyntaxKind.SpreadElement:
+            case SyntaxKind.SpreadExpression:
             case SyntaxKind.SpreadElementExpression:
                 // This node is ES6 or ES future syntax, but is handled by a containing node.
-                transformFlags |= TransformFlags.ContainsSpreadElementExpression;
+                transformFlags |= TransformFlags.ContainsSpreadExpression;
                 break;
 
             case SyntaxKind.SuperKeyword:
@@ -2998,7 +3001,7 @@ namespace ts {
                     transformFlags |= TransformFlags.ContainsLexicalThis;
                 }
 
-                if (subtreeFlags & TransformFlags.ContainsSpreadElementExpression) {
+                if (subtreeFlags & TransformFlags.ContainsSpreadExpression) {
                     // If an ObjectLiteralExpression contains a spread element, then it
                     // is an ES experimental node.
                     transformFlags |= TransformFlags.AssertExperimental;
@@ -3009,8 +3012,8 @@ namespace ts {
             case SyntaxKind.ArrayLiteralExpression:
             case SyntaxKind.NewExpression:
                 excludeFlags = TransformFlags.ArrayLiteralOrCallOrNewExcludes;
-                if (subtreeFlags & TransformFlags.ContainsSpreadElementExpression) {
-                    // If the this node contains a SpreadElementExpression, then it is an ES6
+                if (subtreeFlags & TransformFlags.ContainsSpreadExpression) {
+                    // If the this node contains a SpreadExpression, then it is an ES6
                     // node.
                     transformFlags |= TransformFlags.AssertES6;
                 }
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 3578aeb5e4b..1f31d58b197 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -8379,7 +8379,7 @@ namespace ts {
                 unknownType;
         }
 
-        function getTypeOfDestructuredSpreadElement(type: Type) {
+        function getTypeOfDestructuredSpreadExpression(type: Type) {
             return createArrayType(checkIteratedTypeOrElementType(type, /*errorNode*/ undefined, /*allowStringInput*/ false) || unknownType);
         }
 
@@ -8393,8 +8393,8 @@ namespace ts {
             return getTypeOfDestructuredArrayElement(getAssignedType(node), indexOf(node.elements, element));
         }
 
-        function getAssignedTypeOfSpreadElement(node: SpreadElementExpression): Type {
-            return getTypeOfDestructuredSpreadElement(getAssignedType(<ArrayLiteralExpression>node.parent));
+        function getAssignedTypeOfSpreadExpression(node: SpreadExpression): Type {
+            return getTypeOfDestructuredSpreadExpression(getAssignedType(<ArrayLiteralExpression>node.parent));
         }
 
         function getAssignedTypeOfPropertyAssignment(node: PropertyAssignment | ShorthandPropertyAssignment): Type {
@@ -8418,8 +8418,8 @@ namespace ts {
                     return undefinedType;
                 case SyntaxKind.ArrayLiteralExpression:
                     return getAssignedTypeOfArrayLiteralElement(<ArrayLiteralExpression>parent, node);
-                case SyntaxKind.SpreadElementExpression:
-                    return getAssignedTypeOfSpreadElement(<SpreadElementExpression>parent);
+                case SyntaxKind.SpreadExpression:
+                    return getAssignedTypeOfSpreadExpression(<SpreadExpression>parent);
                 case SyntaxKind.PropertyAssignment:
                     return getAssignedTypeOfPropertyAssignment(<PropertyAssignment>parent);
                 case SyntaxKind.ShorthandPropertyAssignment:
@@ -8435,7 +8435,7 @@ namespace ts {
                 getTypeOfDestructuredProperty(parentType, node.propertyName || <Identifier>node.name) :
                 !node.dotDotDotToken ?
                     getTypeOfDestructuredArrayElement(parentType, indexOf(pattern.elements, node)) :
-                    getTypeOfDestructuredSpreadElement(parentType);
+                    getTypeOfDestructuredSpreadExpression(parentType);
             return getTypeWithDefault(type, node.initializer);
         }
 
@@ -10221,7 +10221,7 @@ namespace ts {
             return mapper && mapper.context;
         }
 
-        function checkSpreadElementExpression(node: SpreadElementExpression, contextualMapper?: TypeMapper): Type {
+        function checkSpreadExpression(node: SpreadExpression, contextualMapper?: TypeMapper): Type {
             // It is usually not safe to call checkExpressionCached if we can be contextually typing.
             // You can tell that we are contextually typing because of the contextualMapper parameter.
             // While it is true that a spread element can have a contextual type, it does not do anything
@@ -10243,7 +10243,7 @@ namespace ts {
             const elementTypes: Type[] = [];
             const inDestructuringPattern = isAssignmentTarget(node);
             for (const e of elements) {
-                if (inDestructuringPattern && e.kind === SyntaxKind.SpreadElementExpression) {
+                if (inDestructuringPattern && e.kind === SyntaxKind.SpreadExpression) {
                     // Given the following situation:
                     //    var c: {};
                     //    [...c] = ["", 0];
@@ -10256,7 +10256,7 @@ namespace ts {
                     // get the contextual element type from it. So we do something similar to
                     // getContextualTypeForElementExpression, which will crucially not error
                     // if there is no index type / iterated type.
-                    const restArrayType = checkExpression((<SpreadElementExpression>e).expression, contextualMapper);
+                    const restArrayType = checkExpression((<SpreadExpression>e).expression, contextualMapper);
                     const restElementType = getIndexTypeOfType(restArrayType, IndexKind.Number) ||
                         (languageVersion >= ScriptTarget.ES6 ? getElementTypeOfIterable(restArrayType, /*errorNode*/ undefined) : undefined);
                     if (restElementType) {
@@ -10267,7 +10267,7 @@ namespace ts {
                     const type = checkExpressionForMutableLocation(e, contextualMapper);
                     elementTypes.push(type);
                 }
-                hasSpreadElement = hasSpreadElement || e.kind === SyntaxKind.SpreadElementExpression;
+                hasSpreadElement = hasSpreadElement || e.kind === SyntaxKind.SpreadExpression;
             }
             if (!hasSpreadElement) {
                 // If array literal is actually a destructuring pattern, mark it as an implied type. We do this such
@@ -10456,7 +10456,7 @@ namespace ts {
                     prop.target = member;
                     member = prop;
                 }
-                else if (memberDecl.kind === SyntaxKind.SpreadElement) {
+                else if (memberDecl.kind === SyntaxKind.SpreadElementExpression) {
                     if (propertiesArray.length > 0) {
                         const t = createObjectLiteralType(node, hasComputedStringProperty, hasComputedNumberProperty, propertiesArray, propertiesTable, typeFlags, patternWithComputedProperties, inDestructuringPattern) as SpreadElementType;
                         t.isDeclaredProperty = true;
@@ -10466,7 +10466,7 @@ namespace ts {
                         hasComputedStringProperty = false;
                         hasComputedNumberProperty = false;
                     }
-                    spreads.push(checkExpression((memberDecl as SpreadElement).target) as SpreadElementType);
+                    spreads.push(checkExpression((memberDecl as SpreadElementExpression).expression) as SpreadElementType);
                     continue;
                 }
                 else {
@@ -11503,7 +11503,7 @@ namespace ts {
         function getSpreadArgumentIndex(args: Expression[]): number {
             for (let i = 0; i < args.length; i++) {
                 const arg = args[i];
-                if (arg && arg.kind === SyntaxKind.SpreadElementExpression) {
+                if (arg && arg.kind === SyntaxKind.SpreadExpression) {
                     return i;
                 }
             }
@@ -13474,7 +13474,7 @@ namespace ts {
             const elements = node.elements;
             const element = elements[elementIndex];
             if (element.kind !== SyntaxKind.OmittedExpression) {
-                if (element.kind !== SyntaxKind.SpreadElementExpression) {
+                if (element.kind !== SyntaxKind.SpreadExpression) {
                     const propName = "" + elementIndex;
                     const type = isTypeAny(sourceType)
                         ? sourceType
@@ -13501,7 +13501,7 @@ namespace ts {
                         error(element, Diagnostics.A_rest_element_must_be_last_in_an_array_destructuring_pattern);
                     }
                     else {
-                        const restExpression = (<SpreadElementExpression>element).expression;
+                        const restExpression = (<SpreadExpression>element).expression;
                         if (restExpression.kind === SyntaxKind.BinaryExpression && (<BinaryExpression>restExpression).operatorToken.kind === SyntaxKind.EqualsToken) {
                             error((<BinaryExpression>restExpression).operatorToken, Diagnostics.A_rest_element_cannot_have_an_initializer);
                         }
@@ -14137,8 +14137,8 @@ namespace ts {
                     return checkBinaryExpression(<BinaryExpression>node, contextualMapper);
                 case SyntaxKind.ConditionalExpression:
                     return checkConditionalExpression(<ConditionalExpression>node, contextualMapper);
-                case SyntaxKind.SpreadElementExpression:
-                    return checkSpreadElementExpression(<SpreadElementExpression>node, contextualMapper);
+                case SyntaxKind.SpreadExpression:
+                    return checkSpreadExpression(<SpreadExpression>node, contextualMapper);
                 case SyntaxKind.OmittedExpression:
                     return undefinedWideningType;
                 case SyntaxKind.YieldExpression:
@@ -20048,8 +20048,8 @@ namespace ts {
             const GetOrSetAccessor = GetAccessor | SetAccessor;
 
             for (const prop of node.properties) {
-                if (prop.kind === SyntaxKind.SpreadElement) {
-                    const target = (prop as SpreadElement).target;
+                if (prop.kind === SyntaxKind.SpreadElementExpression) {
+                    const target = (prop as SpreadElementExpression).expression;
                     switch (target.kind) {
                         case SyntaxKind.Identifier:
                         case SyntaxKind.PropertyAccessExpression:
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index cd00f7ad769..cc574414beb 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -824,8 +824,8 @@ const _super = (function (geti, seti) {
                     return emitTemplateExpression(<TemplateExpression>node);
                 case SyntaxKind.YieldExpression:
                     return emitYieldExpression(<YieldExpression>node);
-                case SyntaxKind.SpreadElementExpression:
-                    return emitSpreadElementExpression(<SpreadElementExpression>node);
+                case SyntaxKind.SpreadExpression:
+                    return emitSpreadExpression(<SpreadExpression>node);
                 case SyntaxKind.ClassExpression:
                     return emitClassExpression(<ClassExpression>node);
                 case SyntaxKind.OmittedExpression:
@@ -1365,7 +1365,7 @@ const _super = (function (geti, seti) {
             emitExpressionWithPrefix(" ", node.expression);
         }
 
-        function emitSpreadElementExpression(node: SpreadElementExpression) {
+        function emitSpreadExpression(node: SpreadExpression) {
             write("...");
             emitExpression(node.expression);
         }
diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index 16eeb86f59a..a8ee15c12c4 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -704,12 +704,12 @@ namespace ts {
     }
 
     export function createSpread(expression: Expression, location?: TextRange) {
-        const node = <SpreadElementExpression>createNode(SyntaxKind.SpreadElementExpression, location);
+        const node = <SpreadExpression>createNode(SyntaxKind.SpreadExpression, location);
         node.expression = parenthesizeExpressionForList(expression);
         return node;
     }
 
-    export function updateSpread(node: SpreadElementExpression, expression: Expression) {
+    export function updateSpread(node: SpreadExpression, expression: Expression) {
         if (node.expression !== expression) {
             return updateNode(createSpread(expression, node), node);
         }
@@ -2745,4 +2745,4 @@ namespace ts {
     function tryGetModuleNameFromDeclaration(declaration: ImportEqualsDeclaration | ImportDeclaration | ExportDeclaration, host: EmitHost, resolver: EmitResolver, compilerOptions: CompilerOptions) {
         return tryGetModuleNameFromFile(resolver.getExternalModuleFileFromDeclaration(declaration), host, compilerOptions);
     }
-}
\ No newline at end of file
+}
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index ae88b6d948b..e0d8790d14c 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -74,9 +74,8 @@ namespace ts {
                     visitNode(cbNode, (<ShorthandPropertyAssignment>node).questionToken) ||
                     visitNode(cbNode, (<ShorthandPropertyAssignment>node).equalsToken) ||
                     visitNode(cbNode, (<ShorthandPropertyAssignment>node).objectAssignmentInitializer);
-            case SyntaxKind.SpreadElement:
-                return visitNode(cbNode, (<SpreadElement>node).dotDotDotToken) ||
-                    visitNode(cbNode, (<SpreadElement>node).target);
+            case SyntaxKind.SpreadElementExpression:
+                return visitNode(cbNode, (<SpreadElementExpression>node).expression);
             case SyntaxKind.SpreadTypeElement:
                 return visitNode(cbNode, (node as SpreadTypeElement).type);
             case SyntaxKind.Parameter:
@@ -198,8 +197,8 @@ namespace ts {
                     visitNode(cbNode, (<ConditionalExpression>node).whenTrue) ||
                     visitNode(cbNode, (<ConditionalExpression>node).colonToken) ||
                     visitNode(cbNode, (<ConditionalExpression>node).whenFalse);
-            case SyntaxKind.SpreadElementExpression:
-                return visitNode(cbNode, (<SpreadElementExpression>node).expression);
+            case SyntaxKind.SpreadExpression:
+                return visitNode(cbNode, (<SpreadExpression>node).expression);
             case SyntaxKind.Block:
             case SyntaxKind.ModuleBlock:
                 return visitNodes(cbNodes, (<Block>node).statements);
@@ -4102,15 +4101,15 @@ namespace ts {
             return finishNode(node);
         }
 
-        function parseSpreadElement(): Expression {
-            const node = <SpreadElementExpression>createNode(SyntaxKind.SpreadElementExpression);
+        function parseSpreadExpression(): Expression {
+            const node = <SpreadExpression>createNode(SyntaxKind.SpreadExpression);
             parseExpected(SyntaxKind.DotDotDotToken);
             node.expression = parseAssignmentExpressionOrHigher();
             return finishNode(node);
         }
 
         function parseArgumentOrArrayLiteralElement(): Expression {
-            return token() === SyntaxKind.DotDotDotToken ? parseSpreadElement() :
+            return token() === SyntaxKind.DotDotDotToken ? parseSpreadExpression() :
                 token() === SyntaxKind.CommaToken ? <Expression>createNode(SyntaxKind.OmittedExpression) :
                     parseAssignmentExpressionOrHigher();
         }
@@ -4145,9 +4144,8 @@ namespace ts {
             const fullStart = scanner.getStartPos();
             const dotDotDotToken = parseOptionalToken(SyntaxKind.DotDotDotToken);
             if (dotDotDotToken) {
-                const spreadElement = <SpreadElement>createNode(SyntaxKind.SpreadElement, fullStart);
-                spreadElement.dotDotDotToken = dotDotDotToken;
-                spreadElement.target = parseAssignmentExpressionOrHigher();
+                const spreadElement = <SpreadElementExpression>createNode(SyntaxKind.SpreadElementExpression, fullStart);
+                spreadElement.expression = parseAssignmentExpressionOrHigher();
                 return addJSDocComment(finishNode(spreadElement));
             }
             const decorators = parseDecorators();
diff --git a/src/compiler/transformers/destructuring.ts b/src/compiler/transformers/destructuring.ts
index a66f5e21d78..7d74e58f204 100644
--- a/src/compiler/transformers/destructuring.ts
+++ b/src/compiler/transformers/destructuring.ts
@@ -310,11 +310,11 @@ namespace ts {
                 const e = elements[i];
                 if (e.kind !== SyntaxKind.OmittedExpression) {
                     // Assignment for target = value.propName should highligh whole property, hence use e as source map node
-                    if (e.kind !== SyntaxKind.SpreadElementExpression) {
+                    if (e.kind !== SyntaxKind.SpreadExpression) {
                         emitDestructuringAssignment(e, createElementAccess(value, createLiteral(i)), e);
                     }
                     else if (i === numElements - 1) {
-                        emitDestructuringAssignment((<SpreadElementExpression>e).expression, createArraySlice(value, i), e);
+                        emitDestructuringAssignment((<SpreadExpression>e).expression, createArraySlice(value, i), e);
                     }
                 }
             }
diff --git a/src/compiler/transformers/es6.ts b/src/compiler/transformers/es6.ts
index 114a3aea546..7582b14e4aa 100644
--- a/src/compiler/transformers/es6.ts
+++ b/src/compiler/transformers/es6.ts
@@ -2556,7 +2556,7 @@ namespace ts {
             // because we contain a SpreadElementExpression.
 
             const { target, thisArg } = createCallBinding(node.expression, hoistVariableDeclaration);
-            if (node.transformFlags & TransformFlags.ContainsSpreadElementExpression) {
+            if (node.transformFlags & TransformFlags.ContainsSpreadExpression) {
                 // [source]
                 //      f(...a, b)
                 //      x.m(...a, b)
@@ -2604,7 +2604,7 @@ namespace ts {
          */
         function visitNewExpression(node: NewExpression): LeftHandSideExpression {
             // We are here because we contain a SpreadElementExpression.
-            Debug.assert((node.transformFlags & TransformFlags.ContainsSpreadElementExpression) !== 0);
+            Debug.assert((node.transformFlags & TransformFlags.ContainsSpreadExpression) !== 0);
 
             // [source]
             //      new C(...a)
@@ -2625,7 +2625,7 @@ namespace ts {
         }
 
         /**
-         * Transforms an array of Expression nodes that contains a SpreadElementExpression.
+         * Transforms an array of Expression nodes that contains a SpreadExpression.
          *
          * @param elements The array of Expression nodes.
          * @param needsUniqueCopy A value indicating whether to ensure that the result is a fresh array.
@@ -2642,14 +2642,14 @@ namespace ts {
             // expressions into an array literal.
             const numElements = elements.length;
             const segments = flatten(
-                spanMap(elements, partitionSpreadElement, (partition, visitPartition, start, end) =>
+                spanMap(elements, partitionSpread, (partition, visitPartition, start, end) =>
                     visitPartition(partition, multiLine, hasTrailingComma && end === numElements)
                 )
             );
 
             if (segments.length === 1) {
                 const firstElement = elements[0];
-                return needsUniqueCopy && isSpreadElementExpression(firstElement) && firstElement.expression.kind !== SyntaxKind.ArrayLiteralExpression
+                return needsUniqueCopy && isSpreadExpression(firstElement) && firstElement.expression.kind !== SyntaxKind.ArrayLiteralExpression
                     ? createArraySlice(segments[0])
                     : segments[0];
             }
@@ -2658,17 +2658,17 @@ namespace ts {
             return createArrayConcat(segments.shift(), segments);
         }
 
-        function partitionSpreadElement(node: Expression) {
-            return isSpreadElementExpression(node)
-                ? visitSpanOfSpreadElements
-                : visitSpanOfNonSpreadElements;
+        function partitionSpread(node: Expression) {
+            return isSpreadExpression(node)
+                ? visitSpanOfSpreads
+                : visitSpanOfNonSpreads;
         }
 
-        function visitSpanOfSpreadElements(chunk: Expression[], multiLine: boolean, hasTrailingComma: boolean): VisitResult<Expression> {
-            return map(chunk, visitExpressionOfSpreadElement);
+        function visitSpanOfSpreads(chunk: Expression[], multiLine: boolean, hasTrailingComma: boolean): VisitResult<Expression> {
+            return map(chunk, visitExpressionOfSpread);
         }
 
-        function visitSpanOfNonSpreadElements(chunk: Expression[], multiLine: boolean, hasTrailingComma: boolean): VisitResult<Expression> {
+        function visitSpanOfNonSpreads(chunk: Expression[], multiLine: boolean, hasTrailingComma: boolean): VisitResult<Expression> {
             return createArrayLiteral(
                 visitNodes(createNodeArray(chunk, /*location*/ undefined, hasTrailingComma), visitor, isExpression),
                 /*location*/ undefined,
@@ -2677,11 +2677,11 @@ namespace ts {
         }
 
         /**
-         * Transforms the expression of a SpreadElementExpression node.
+         * Transforms the expression of a SpreadExpression node.
          *
-         * @param node A SpreadElementExpression node.
+         * @param node A SpreadExpression node.
          */
-        function visitExpressionOfSpreadElement(node: SpreadElementExpression) {
+        function visitExpressionOfSpread(node: SpreadExpression) {
             return visitNode(node.expression, visitor, isExpression);
         }
 
@@ -3096,12 +3096,12 @@ namespace ts {
             }
 
             const callArgument = singleOrUndefined((<CallExpression>statementExpression).arguments);
-            if (!callArgument || !nodeIsSynthesized(callArgument) || callArgument.kind !== SyntaxKind.SpreadElementExpression) {
+            if (!callArgument || !nodeIsSynthesized(callArgument) || callArgument.kind !== SyntaxKind.SpreadExpression) {
                 return false;
             }
 
-            const expression = (<SpreadElementExpression>callArgument).expression;
+            const expression = (<SpreadExpression>callArgument).expression;
             return isIdentifier(expression) && expression === parameter.name;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/compiler/transformers/experimental.ts b/src/compiler/transformers/experimental.ts
index 715cf91afd3..85af37709c7 100644
--- a/src/compiler/transformers/experimental.ts
+++ b/src/compiler/transformers/experimental.ts
@@ -36,12 +36,12 @@ namespace ts {
             let chunkObject: (ShorthandPropertyAssignment | PropertyAssignment)[];
             const objects: Expression[] = [];
             for (const e of elements) {
-                if (e.kind === SyntaxKind.SpreadElement) {
+                if (e.kind === SyntaxKind.SpreadElementExpression) {
                     if (chunkObject) {
                         objects.push(createObjectLiteral(chunkObject));
                         chunkObject = undefined;
                     }
-                    const target = (e as SpreadElement).target;
+                    const target = (e as SpreadElementExpression).expression;
                     objects.push(visitNode(target, visitor, isExpression));
                 }
                 else {
diff --git a/src/compiler/transformers/module/system.ts b/src/compiler/transformers/module/system.ts
index 7b013e18e7d..de1522a0150 100644
--- a/src/compiler/transformers/module/system.ts
+++ b/src/compiler/transformers/module/system.ts
@@ -1120,7 +1120,7 @@ namespace ts {
         }
 
         function hasExportedReferenceInArrayDestructuringElement(node: Expression): boolean {
-            if (isSpreadElementExpression(node)) {
+            if (isSpreadExpression(node)) {
                 const expression = node.expression;
                 return isIdentifier(expression) && isExportedBinding(expression);
             }
@@ -1139,7 +1139,7 @@ namespace ts {
             else if (isIdentifier(node)) {
                 return isExportedBinding(node);
             }
-            else if (isSpreadElementExpression(node)) {
+            else if (isSpreadExpression(node)) {
                 const expression = node.expression;
                 return isIdentifier(expression) && isExportedBinding(expression);
             }
@@ -1400,4 +1400,4 @@ namespace ts {
             return updated;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index cdf42ebea4f..bfadea31794 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -241,7 +241,7 @@ namespace ts {
         ConditionalExpression,
         TemplateExpression,
         YieldExpression,
-        SpreadElementExpression,
+        SpreadExpression,
         ClassExpression,
         OmittedExpression,
         ExpressionWithTypeArguments,
@@ -316,8 +316,8 @@ namespace ts {
         // Property assignments
         PropertyAssignment,
         ShorthandPropertyAssignment,
-        SpreadElement, // maybe name it SpreadProperty?
-        SpreadTypeElement, // maybe name it SpreadTypeNode?
+        SpreadElementExpression,
+        SpreadTypeElement,
 
 
         // Enum
@@ -674,9 +674,7 @@ namespace ts {
     }
 
     // @kind(SyntaxKind.SpreadElementExpression)
-    export interface SpreadElement extends ObjectLiteralElement {
-        dotDotDotToken: Node;
-        target: Expression;
+    export interface SpreadElementExpression extends ObjectLiteralElement, SpreadExpression {
     }
 
     // SyntaxKind.VariableDeclaration
@@ -1056,8 +1054,8 @@ namespace ts {
         multiLine?: boolean;
     }
 
-    // @kind(SyntaxKind.SpreadElementExpression)
-    export interface SpreadElementExpression extends Expression {
+    // @kind(SyntaxKind.SpreadExpression)
+    export interface SpreadExpression extends Expression {
         expression: Expression;
     }
 
@@ -3140,7 +3138,7 @@ namespace ts {
         ContainsLexicalThisInComputedPropertyName = 1 << 17,
         ContainsDefaultValueAssignments = 1 << 18,
         ContainsParameterPropertyAssignments = 1 << 19,
-        ContainsSpreadElementExpression = 1 << 20,
+        ContainsSpreadExpression = 1 << 20,
         ContainsComputedPropertyName = 1 << 21,
         ContainsBlockScopedBinding = 1 << 22,
         ContainsBindingPattern = 1 << 23,
@@ -3170,7 +3168,7 @@ namespace ts {
         ModuleExcludes = NodeExcludes | ContainsDecorators | ContainsLexicalThis | ContainsCapturedLexicalThis | ContainsBlockScopedBinding | ContainsHoistedDeclarationOrCompletion,
         TypeExcludes = ~ContainsTypeScript,
         ObjectLiteralExcludes = NodeExcludes | ContainsDecorators | ContainsComputedPropertyName | ContainsLexicalThisInComputedPropertyName,
-        ArrayLiteralOrCallOrNewExcludes = NodeExcludes | ContainsSpreadElementExpression,
+        ArrayLiteralOrCallOrNewExcludes = NodeExcludes | ContainsSpreadExpression,
         VariableDeclarationListExcludes = NodeExcludes | ContainsBindingPattern,
         ParameterExcludes = NodeExcludes | ContainsBindingPattern,
 
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 67ea182bf98..30a09ade0f5 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -1178,7 +1178,7 @@ namespace ts {
             case SyntaxKind.PostfixUnaryExpression:
             case SyntaxKind.BinaryExpression:
             case SyntaxKind.ConditionalExpression:
-            case SyntaxKind.SpreadElementExpression:
+            case SyntaxKind.SpreadExpression:
             case SyntaxKind.TemplateExpression:
             case SyntaxKind.NoSubstitutionTemplateLiteral:
             case SyntaxKind.OmittedExpression:
@@ -1633,7 +1633,7 @@ namespace ts {
         }
         while (true) {
             const parent = node.parent;
-            if (parent.kind === SyntaxKind.ArrayLiteralExpression || parent.kind === SyntaxKind.SpreadElementExpression) {
+            if (parent.kind === SyntaxKind.ArrayLiteralExpression || parent.kind === SyntaxKind.SpreadExpression) {
                 node = parent;
                 continue;
             }
@@ -2209,7 +2209,7 @@ namespace ts {
             case SyntaxKind.YieldExpression:
                 return 2;
 
-            case SyntaxKind.SpreadElementExpression:
+            case SyntaxKind.SpreadExpression:
                 return 1;
 
             default:
@@ -3740,7 +3740,7 @@ namespace ts {
         const kind = node.kind;
         return kind === SyntaxKind.PropertyAssignment
             || kind === SyntaxKind.ShorthandPropertyAssignment
-            || kind === SyntaxKind.SpreadElement
+            || kind === SyntaxKind.SpreadElementExpression
             || kind === SyntaxKind.MethodDeclaration
             || kind === SyntaxKind.GetAccessor
             || kind === SyntaxKind.SetAccessor
@@ -3820,8 +3820,8 @@ namespace ts {
             || kind === SyntaxKind.NoSubstitutionTemplateLiteral;
     }
 
-    export function isSpreadElementExpression(node: Node): node is SpreadElementExpression {
-        return node.kind === SyntaxKind.SpreadElementExpression;
+    export function isSpreadExpression(node: Node): node is SpreadExpression {
+        return node.kind === SyntaxKind.SpreadExpression;
     }
 
     export function isExpressionWithTypeArguments(node: Node): node is ExpressionWithTypeArguments {
@@ -3879,7 +3879,7 @@ namespace ts {
             || kind === SyntaxKind.YieldExpression
             || kind === SyntaxKind.ArrowFunction
             || kind === SyntaxKind.BinaryExpression
-            || kind === SyntaxKind.SpreadElementExpression
+            || kind === SyntaxKind.SpreadExpression
             || kind === SyntaxKind.AsExpression
             || kind === SyntaxKind.OmittedExpression
             || isUnaryExpressionKind(kind);
diff --git a/src/compiler/visitor.ts b/src/compiler/visitor.ts
index 1e0cadaaa6b..691e13b03d6 100644
--- a/src/compiler/visitor.ts
+++ b/src/compiler/visitor.ts
@@ -267,9 +267,9 @@ namespace ts {
             case SyntaxKind.VoidExpression:
             case SyntaxKind.AwaitExpression:
             case SyntaxKind.YieldExpression:
-            case SyntaxKind.SpreadElementExpression:
+            case SyntaxKind.SpreadExpression:
             case SyntaxKind.NonNullExpression:
-                result = reduceNode((<ParenthesizedExpression | DeleteExpression | TypeOfExpression | VoidExpression | AwaitExpression | YieldExpression | SpreadElementExpression | NonNullExpression>node).expression, f, result);
+                result = reduceNode((<ParenthesizedExpression | DeleteExpression | TypeOfExpression | VoidExpression | AwaitExpression | YieldExpression | SpreadExpression | NonNullExpression>node).expression, f, result);
                 break;
 
             case SyntaxKind.PrefixUnaryExpression:
@@ -869,9 +869,9 @@ namespace ts {
                 return updateYield(<YieldExpression>node,
                     visitNode((<YieldExpression>node).expression, visitor, isExpression));
 
-            case SyntaxKind.SpreadElementExpression:
-                return updateSpread(<SpreadElementExpression>node,
-                    visitNode((<SpreadElementExpression>node).expression, visitor, isExpression));
+            case SyntaxKind.SpreadExpression:
+                return updateSpread(<SpreadExpression>node,
+                    visitNode((<SpreadExpression>node).expression, visitor, isExpression));
 
             case SyntaxKind.ClassExpression:
                 return updateClassExpression(<ClassExpression>node,
@@ -1357,4 +1357,4 @@ namespace ts {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/services/breakpoints.ts b/src/services/breakpoints.ts
index bf7fb981daa..f1cc233e676 100644
--- a/src/services/breakpoints.ts
+++ b/src/services/breakpoints.ts
@@ -264,7 +264,7 @@ namespace ts.BreakpointResolver {
                         // a or ...c  or d: x from
                         // [a, b, ...c] or { a, b } or { d: x } from destructuring pattern
                         if ((node.kind === SyntaxKind.Identifier ||
-                            node.kind == SyntaxKind.SpreadElementExpression ||
+                            node.kind == SyntaxKind.SpreadExpression ||
                             node.kind === SyntaxKind.PropertyAssignment ||
                             node.kind === SyntaxKind.ShorthandPropertyAssignment) &&
                             isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent)) {
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
index d1f3a54563f..e5de4437a5e 100644
--- a/src/services/utilities.ts
+++ b/src/services/utilities.ts
@@ -530,8 +530,8 @@ namespace ts {
             case SyntaxKind.DeleteExpression:
             case SyntaxKind.VoidExpression:
             case SyntaxKind.YieldExpression:
-            case SyntaxKind.SpreadElementExpression:
-                const unaryWordExpression = (<TypeOfExpression | DeleteExpression | VoidExpression | YieldExpression | SpreadElementExpression>n);
+            case SyntaxKind.SpreadExpression:
+                const unaryWordExpression = n as (TypeOfExpression | DeleteExpression | VoidExpression | YieldExpression | SpreadExpression);
                 return isCompletedNode(unaryWordExpression.expression, sourceFile);
 
             case SyntaxKind.TaggedTemplateExpression:

From 9a7ebb0ac5eadf9630577b11eb0064c04ed6cd44 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 26 Sep 2016 11:53:11 -0700
Subject: [PATCH 009/421] Change new file to use CRLF

What's YOUR favourite thing about Mars, Beartato?
---
 src/compiler/transformers/experimental.ts | 160 +++++++++++-----------
 1 file changed, 80 insertions(+), 80 deletions(-)

diff --git a/src/compiler/transformers/experimental.ts b/src/compiler/transformers/experimental.ts
index 85af37709c7..2ee623db43a 100644
--- a/src/compiler/transformers/experimental.ts
+++ b/src/compiler/transformers/experimental.ts
@@ -1,80 +1,80 @@
-/// <reference path="../factory.ts" />
-/// <reference path="../visitor.ts" />
-
-/*@internal*/
-namespace ts {
-    export function transformExperimental(context: TransformationContext) {
-        return transformSourceFile;
-
-        function transformSourceFile(node: SourceFile) {
-            return visitEachChild(node, visitor, context);
-        }
-
-        function visitor(node: Node): VisitResult<Node> {
-            if (node.transformFlags & TransformFlags.Experimental) {
-                return visitorWorker(node);
-            }
-            else if (node.transformFlags & TransformFlags.ContainsExperimental) {
-                return visitEachChild(node, visitor, context);
-            }
-            else {
-                return node;
-            }
-        }
-
-        function visitorWorker(node: Node): VisitResult<Node> {
-            switch (node.kind) {
-                case SyntaxKind.ObjectLiteralExpression:
-                    return visitObjectLiteralExpression(node as ObjectLiteralExpression);
-                default:
-                    Debug.failBadSyntaxKind(node);
-                    return visitEachChild(node, visitor, context);
-            }
-        }
-
-        function chunkObjectLiteralElements(elements: ObjectLiteralElement[]): Expression[] {
-            let chunkObject: (ShorthandPropertyAssignment | PropertyAssignment)[];
-            const objects: Expression[] = [];
-            for (const e of elements) {
-                if (e.kind === SyntaxKind.SpreadElementExpression) {
-                    if (chunkObject) {
-                        objects.push(createObjectLiteral(chunkObject));
-                        chunkObject = undefined;
-                    }
-                    const target = (e as SpreadElementExpression).expression;
-                    objects.push(visitNode(target, visitor, isExpression));
-                }
-                else {
-                    if (!chunkObject) {
-                        chunkObject = [];
-                    }
-                    if (e.kind === SyntaxKind.PropertyAssignment) {
-                        const p = e as PropertyAssignment;
-                        chunkObject.push(createPropertyAssignment(p.name, visitNode(p.initializer, visitor, isExpression)));
-                    }
-                    else {
-                        chunkObject.push(e as ShorthandPropertyAssignment);
-                    }
-                }
-            }
-            if (chunkObject) {
-                objects.push(createObjectLiteral(chunkObject));
-            }
-
-            return objects;
-        }
-
-        function visitObjectLiteralExpression(node: ObjectLiteralExpression): Expression {
-            // 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});
-            // If the first element is a spread element, then the first argument to __assign is {}:
-            //     { ...o, a, b, ...o2 } => __assign({}, o, {a, b}, o2)
-            const objects = chunkObjectLiteralElements(node.properties);
-            if (objects.length && objects[0].kind !== SyntaxKind.ObjectLiteralExpression) {
-                objects.unshift(createObjectLiteral());
-            }
-            return createCall(createIdentifier("__assign"), undefined, objects);
-        }
-    }
-}
+/// <reference path="../factory.ts" />
+/// <reference path="../visitor.ts" />
+
+/*@internal*/
+namespace ts {
+    export function transformExperimental(context: TransformationContext) {
+        return transformSourceFile;
+
+        function transformSourceFile(node: SourceFile) {
+            return visitEachChild(node, visitor, context);
+        }
+
+        function visitor(node: Node): VisitResult<Node> {
+            if (node.transformFlags & TransformFlags.Experimental) {
+                return visitorWorker(node);
+            }
+            else if (node.transformFlags & TransformFlags.ContainsExperimental) {
+                return visitEachChild(node, visitor, context);
+            }
+            else {
+                return node;
+            }
+        }
+
+        function visitorWorker(node: Node): VisitResult<Node> {
+            switch (node.kind) {
+                case SyntaxKind.ObjectLiteralExpression:
+                    return visitObjectLiteralExpression(node as ObjectLiteralExpression);
+                default:
+                    Debug.failBadSyntaxKind(node);
+                    return visitEachChild(node, visitor, context);
+            }
+        }
+
+        function chunkObjectLiteralElements(elements: ObjectLiteralElement[]): Expression[] {
+            let chunkObject: (ShorthandPropertyAssignment | PropertyAssignment)[];
+            const objects: Expression[] = [];
+            for (const e of elements) {
+                if (e.kind === SyntaxKind.SpreadElementExpression) {
+                    if (chunkObject) {
+                        objects.push(createObjectLiteral(chunkObject));
+                        chunkObject = undefined;
+                    }
+                    const target = (e as SpreadElementExpression).expression;
+                    objects.push(visitNode(target, visitor, isExpression));
+                }
+                else {
+                    if (!chunkObject) {
+                        chunkObject = [];
+                    }
+                    if (e.kind === SyntaxKind.PropertyAssignment) {
+                        const p = e as PropertyAssignment;
+                        chunkObject.push(createPropertyAssignment(p.name, visitNode(p.initializer, visitor, isExpression)));
+                    }
+                    else {
+                        chunkObject.push(e as ShorthandPropertyAssignment);
+                    }
+                }
+            }
+            if (chunkObject) {
+                objects.push(createObjectLiteral(chunkObject));
+            }
+
+            return objects;
+        }
+
+        function visitObjectLiteralExpression(node: ObjectLiteralExpression): Expression {
+            // 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});
+            // If the first element is a spread element, then the first argument to __assign is {}:
+            //     { ...o, a, b, ...o2 } => __assign({}, o, {a, b}, o2)
+            const objects = chunkObjectLiteralElements(node.properties);
+            if (objects.length && objects[0].kind !== SyntaxKind.ObjectLiteralExpression) {
+                objects.unshift(createObjectLiteral());
+            }
+            return createCall(createIdentifier("__assign"), undefined, objects);
+        }
+    }
+}

From cfdf75176863a08fd9112649d9c5a34acd7e6505 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 27 Sep 2016 10:30:13 -0700
Subject: [PATCH 010/421] Make index signatures work on spread types

Previously, they worked when they came from a spread type but not when
written in the object literal itself.
---
 src/compiler/checker.ts | 59 ++++++++++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 25 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 1f31d58b197..66a5d9fc415 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -2321,6 +2321,9 @@ namespace ts {
                             printFollowingPunctuation = true;
                         }
                     }
+                    const resolved = resolveStructuredTypeMembers(type);
+                    writeIndexSignature(resolved.stringIndexInfo, SyntaxKind.StringKeyword);
+                    writeIndexSignature(resolved.numberIndexInfo, SyntaxKind.NumberKeyword);
                     writer.decreaseIndent();
                     if (printFollowingPunctuation) {
                         writeSpace(writer);
@@ -4306,15 +4309,14 @@ namespace ts {
 
         function resolveSpreadTypeMembers(type: SpreadType) {
             // The members and properties collections are empty for spread types. To get all properties of an
-            // spread type use getPropertiesOfType (only the language service uses this).
-            let stringIndexInfo: IndexInfo = undefined;
-            let numberIndexInfo: IndexInfo = undefined;
+            // spread type use getPropertiesOfType.
+            let stringIndexInfo: IndexInfo = getIndexInfoOfSymbol(type.symbol, IndexKind.String);
+            let numberIndexInfo: IndexInfo = getIndexInfoOfSymbol(type.symbol, IndexKind.Number);
             for (let i = type.types.length - 1; i > -1; i--) {
                 const t = type.types[i];
-                stringIndexInfo = intersectIndexInfos(stringIndexInfo, getIndexInfoOfType(t, IndexKind.String));
-                numberIndexInfo = intersectIndexInfos(numberIndexInfo, getIndexInfoOfType(t, IndexKind.Number));
-                if (!t.symbol || !(t.symbol.flags & SymbolFlags.Optional)) {
-                    break;
+                if (!t.isDeclaredProperty) {
+                    stringIndexInfo = intersectIndexInfos(stringIndexInfo, getIndexInfoOfType(t, IndexKind.String));
+                    numberIndexInfo = intersectIndexInfos(numberIndexInfo, getIndexInfoOfType(t, IndexKind.Number));
                 }
             }
             setObjectTypeMembers(type, emptySymbols, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
@@ -4545,6 +4547,9 @@ namespace ts {
             result.containingType = containingType;
             result.hasCommonType = hasCommonType;
             result.declarations = declarations;
+            if (declarations.length) {
+                result.valueDeclaration = declarations[0];
+            }
             result.isReadonly = isReadonly;
             result.type = containingType.flags & TypeFlags.Intersection ? getIntersectionType(propTypes) : getUnionType(propTypes);
             return result;
@@ -5059,7 +5064,7 @@ namespace ts {
             const declaration = getIndexDeclarationOfSymbol(symbol, kind);
             if (declaration) {
                 return createIndexInfo(declaration.type ? getTypeFromTypeNode(declaration.type) : anyType,
-                    (getModifierFlags(declaration) & ModifierFlags.Readonly) !== 0, declaration);
+                                       (getModifierFlags(declaration) & ModifierFlags.Readonly) !== 0, declaration);
             }
             return undefined;
         }
@@ -5683,11 +5688,15 @@ namespace ts {
                             }
                             spreads.push(getTypeFromTypeNode((member as SpreadTypeElement).type) as SpreadElementType);
                         }
-                        else if (member.kind !== SyntaxKind.CallSignature && member.kind !== SyntaxKind.ConstructSignature) {
-                            // note that spread types don't include call and construct signatures
+                        else if (member.kind !== SyntaxKind.CallSignature &&
+                                 member.kind !== SyntaxKind.ConstructSignature &&
+                                 member.kind !== SyntaxKind.IndexSignature) {
+                            // note that spread types don't include call and construct signatures, and index signatures are resolved later
                             const flags = SymbolFlags.Property | SymbolFlags.Transient | (member.questionToken ? SymbolFlags.Optional : 0);
                             const text = getTextOfPropertyName(member.name);
                             const symbol = <TransientSymbol>createSymbol(flags, text);
+                            symbol.declarations = [member];
+                            symbol.valueDeclaration = member;
                             symbol.type = getTypeFromTypeNodeNoAlias((member as IndexSignatureDeclaration | PropertySignature | MethodSignature).type);
                             if (!members) {
                                 members = createMap<Symbol>();
@@ -10458,7 +10467,7 @@ namespace ts {
                 }
                 else if (memberDecl.kind === SyntaxKind.SpreadElementExpression) {
                     if (propertiesArray.length > 0) {
-                        const t = createObjectLiteralType(node, hasComputedStringProperty, hasComputedNumberProperty, propertiesArray, propertiesTable, typeFlags, patternWithComputedProperties, inDestructuringPattern) as SpreadElementType;
+                        const t = createObjectLiteralType() as SpreadElementType;
                         t.isDeclaredProperty = true;
                         spreads.push(t);
                         propertiesArray = [];
@@ -10510,7 +10519,7 @@ namespace ts {
 
             if (spreads.length > 0) {
                 if (propertiesArray.length > 0) {
-                    const t = createObjectLiteralType(node, hasComputedStringProperty, hasComputedNumberProperty, propertiesArray, propertiesTable, typeFlags, patternWithComputedProperties, inDestructuringPattern) as SpreadElementType;
+                    const t = createObjectLiteralType() as SpreadElementType;
                     t.isDeclaredProperty = true;
                     spreads.push(t);
                 }
@@ -10520,20 +10529,20 @@ namespace ts {
                 return spread;
             }
 
-            return createObjectLiteralType(node, hasComputedStringProperty, hasComputedNumberProperty, propertiesArray, propertiesTable, typeFlags, patternWithComputedProperties, inDestructuringPattern);
-        }
-
-        function createObjectLiteralType(node: ObjectLiteralExpression, hasComputedStringProperty: boolean, hasComputedNumberProperty: boolean, propertiesArray: Symbol[], propertiesTable: Map<Symbol>, typeFlags: TypeFlags, patternWithComputedProperties: boolean, inDestructuringPattern: boolean) {
-            const stringIndexInfo = hasComputedStringProperty ? getObjectLiteralIndexInfo(node, propertiesArray, IndexKind.String) : undefined;
-            const numberIndexInfo = hasComputedNumberProperty ? getObjectLiteralIndexInfo(node, propertiesArray, IndexKind.Number) : undefined;
-            const result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
-            const freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : TypeFlags.FreshObjectLiteral;
-            result.flags |= TypeFlags.ObjectLiteral | TypeFlags.ContainsObjectLiteral | freshObjectLiteralFlag | (typeFlags & TypeFlags.PropagatingFlags) | (patternWithComputedProperties ? TypeFlags.ObjectLiteralPatternWithComputedProperties : 0);
-            if (inDestructuringPattern) {
-                result.pattern = node;
+            return createObjectLiteralType();
+            function createObjectLiteralType() {
+                const stringIndexInfo = hasComputedStringProperty ? getObjectLiteralIndexInfo(node, propertiesArray, IndexKind.String) : undefined;
+                const numberIndexInfo = hasComputedNumberProperty ? getObjectLiteralIndexInfo(node, propertiesArray, IndexKind.Number) : undefined;
+                const result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
+                const freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : TypeFlags.FreshObjectLiteral;
+                result.flags |= TypeFlags.ObjectLiteral | TypeFlags.ContainsObjectLiteral | freshObjectLiteralFlag | (typeFlags & TypeFlags.PropagatingFlags) | (patternWithComputedProperties ? TypeFlags.ObjectLiteralPatternWithComputedProperties : 0);
+                if (inDestructuringPattern) {
+                    result.pattern = node;
+                }
+                return result;
             }
-            return result;
-        }
+
+       }
 
         function checkJsxSelfClosingElement(node: JsxSelfClosingElement) {
             checkJsxOpeningLikeElement(node);

From d6e414ce5b3e9532dd05651854f1d2f694de6e8c Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 27 Sep 2016 10:33:50 -0700
Subject: [PATCH 011/421] Test spread type index signatures

---
 .../reference/objectSpreadIndexSignature.js   | 29 ++++++++++
 .../objectSpreadIndexSignature.symbols        | 51 +++++++++++++++++
 .../objectSpreadIndexSignature.types          | 57 +++++++++++++++++++
 .../spread/objectSpreadIndexSignature.ts      | 14 +++++
 4 files changed, 151 insertions(+)
 create mode 100644 tests/baselines/reference/objectSpreadIndexSignature.js
 create mode 100644 tests/baselines/reference/objectSpreadIndexSignature.symbols
 create mode 100644 tests/baselines/reference/objectSpreadIndexSignature.types
 create mode 100644 tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts

diff --git a/tests/baselines/reference/objectSpreadIndexSignature.js b/tests/baselines/reference/objectSpreadIndexSignature.js
new file mode 100644
index 00000000000..c4a0d6b90d8
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadIndexSignature.js
@@ -0,0 +1,29 @@
+//// [objectSpreadIndexSignature.ts]
+class C {
+    a: number;
+    c: boolean;
+}
+let c: { ...C, b: string, c?: string, [n: number]: string };
+let n: number = c.a;
+let s: string = c[12];
+interface Indexed {
+    [n: number]: string;
+    a: boolean;
+}
+let i: { ...Indexed, b: string };
+s = i[101];
+s = i.b;
+
+
+//// [objectSpreadIndexSignature.js]
+var C = (function () {
+    function C() {
+    }
+    return C;
+}());
+var c;
+var n = c.a;
+var s = c[12];
+var i;
+s = i[101];
+s = i.b;
diff --git a/tests/baselines/reference/objectSpreadIndexSignature.symbols b/tests/baselines/reference/objectSpreadIndexSignature.symbols
new file mode 100644
index 00000000000..fee1e862ade
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadIndexSignature.symbols
@@ -0,0 +1,51 @@
+=== tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts ===
+class C {
+>C : Symbol(C, Decl(objectSpreadIndexSignature.ts, 0, 0))
+
+    a: number;
+>a : Symbol(C.a, Decl(objectSpreadIndexSignature.ts, 0, 9))
+
+    c: boolean;
+>c : Symbol(C.c, Decl(objectSpreadIndexSignature.ts, 1, 14))
+}
+let c: { ...C, b: string, c?: string, [n: number]: string };
+>c : Symbol(c, Decl(objectSpreadIndexSignature.ts, 4, 3))
+>C : Symbol(C, Decl(objectSpreadIndexSignature.ts, 0, 0))
+>b : Symbol(b, Decl(objectSpreadIndexSignature.ts, 4, 14))
+>c : Symbol(c, Decl(objectSpreadIndexSignature.ts, 4, 25))
+>n : Symbol(n, Decl(objectSpreadIndexSignature.ts, 4, 39))
+
+let n: number = c.a;
+>n : Symbol(n, Decl(objectSpreadIndexSignature.ts, 5, 3))
+>c.a : Symbol(C.a, Decl(objectSpreadIndexSignature.ts, 0, 9))
+>c : Symbol(c, Decl(objectSpreadIndexSignature.ts, 4, 3))
+>a : Symbol(C.a, Decl(objectSpreadIndexSignature.ts, 0, 9))
+
+let s: string = c[12];
+>s : Symbol(s, Decl(objectSpreadIndexSignature.ts, 6, 3))
+>c : Symbol(c, Decl(objectSpreadIndexSignature.ts, 4, 3))
+
+interface Indexed {
+>Indexed : Symbol(Indexed, Decl(objectSpreadIndexSignature.ts, 6, 22))
+
+    [n: number]: string;
+>n : Symbol(n, Decl(objectSpreadIndexSignature.ts, 8, 5))
+
+    a: boolean;
+>a : Symbol(Indexed.a, Decl(objectSpreadIndexSignature.ts, 8, 24))
+}
+let i: { ...Indexed, b: string };
+>i : Symbol(i, Decl(objectSpreadIndexSignature.ts, 11, 3))
+>Indexed : Symbol(Indexed, Decl(objectSpreadIndexSignature.ts, 6, 22))
+>b : Symbol(b, Decl(objectSpreadIndexSignature.ts, 11, 20))
+
+s = i[101];
+>s : Symbol(s, Decl(objectSpreadIndexSignature.ts, 6, 3))
+>i : Symbol(i, Decl(objectSpreadIndexSignature.ts, 11, 3))
+
+s = i.b;
+>s : Symbol(s, Decl(objectSpreadIndexSignature.ts, 6, 3))
+>i.b : Symbol(b, Decl(objectSpreadIndexSignature.ts, 11, 20))
+>i : Symbol(i, Decl(objectSpreadIndexSignature.ts, 11, 3))
+>b : Symbol(b, Decl(objectSpreadIndexSignature.ts, 11, 20))
+
diff --git a/tests/baselines/reference/objectSpreadIndexSignature.types b/tests/baselines/reference/objectSpreadIndexSignature.types
new file mode 100644
index 00000000000..9adbb349da2
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadIndexSignature.types
@@ -0,0 +1,57 @@
+=== tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts ===
+class C {
+>C : C
+
+    a: number;
+>a : number
+
+    c: boolean;
+>c : boolean
+}
+let c: { ...C, b: string, c?: string, [n: number]: string };
+>c : { ...C; b: string; c?: string; [n: number]: string; }
+>C : C
+>b : string
+>c : string
+>n : number
+
+let n: number = c.a;
+>n : number
+>c.a : number
+>c : { ...C; b: string; c?: string; [n: number]: string; }
+>a : number
+
+let s: string = c[12];
+>s : string
+>c[12] : string
+>c : { ...C; b: string; c?: string; [n: number]: string; }
+>12 : 12
+
+interface Indexed {
+>Indexed : Indexed
+
+    [n: number]: string;
+>n : number
+
+    a: boolean;
+>a : boolean
+}
+let i: { ...Indexed, b: string };
+>i : { ...Indexed; b: string; [n: number]: string; }
+>Indexed : Indexed
+>b : string
+
+s = i[101];
+>s = i[101] : string
+>s : string
+>i[101] : string
+>i : { ...Indexed; b: string; [n: number]: string; }
+>101 : 101
+
+s = i.b;
+>s = i.b : string
+>s : string
+>i.b : string
+>i : { ...Indexed; b: string; [n: number]: string; }
+>b : string
+
diff --git a/tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts b/tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts
new file mode 100644
index 00000000000..11ba5450085
--- /dev/null
+++ b/tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts
@@ -0,0 +1,14 @@
+class C {
+    a: number;
+    c: boolean;
+}
+let c: { ...C, b: string, c?: string, [n: number]: string };
+let n: number = c.a;
+let s: string = c[12];
+interface Indexed {
+    [n: number]: string;
+    a: boolean;
+}
+let i: { ...Indexed, b: string };
+s = i[101];
+s = i.b;

From 429b0d95ca54538cabdd09e59eeca71661fe72d9 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 27 Sep 2016 11:05:12 -0700
Subject: [PATCH 012/421] Union multiple spread index signatures

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 66a5d9fc415..e1e7cce4df4 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -2321,6 +2321,8 @@ namespace ts {
                             printFollowingPunctuation = true;
                         }
                     }
+                    // TODO: Only print if this is directly on the type -- not on the subtype somewhere.
+                    // (This is not crucial, though, since the extra info *might* be nice.)
                     const resolved = resolveStructuredTypeMembers(type);
                     writeIndexSignature(resolved.stringIndexInfo, SyntaxKind.StringKeyword);
                     writeIndexSignature(resolved.numberIndexInfo, SyntaxKind.NumberKeyword);
@@ -4291,6 +4293,11 @@ namespace ts {
                 getIntersectionType([info1.type, info2.type]), info1.isReadonly && info2.isReadonly);
         }
 
+        function unionIndexInfos(info1: IndexInfo, info2: IndexInfo): IndexInfo {
+            return !info1 ? info2 : !info2 ? info1 : createIndexInfo(
+                getUnionType([info1.type, info2.type]), info1.isReadonly || info2.isReadonly);
+        }
+
         function resolveIntersectionTypeMembers(type: IntersectionType) {
             // 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).
@@ -4315,8 +4322,8 @@ namespace ts {
             for (let i = type.types.length - 1; i > -1; i--) {
                 const t = type.types[i];
                 if (!t.isDeclaredProperty) {
-                    stringIndexInfo = intersectIndexInfos(stringIndexInfo, getIndexInfoOfType(t, IndexKind.String));
-                    numberIndexInfo = intersectIndexInfos(numberIndexInfo, getIndexInfoOfType(t, IndexKind.Number));
+                    stringIndexInfo = unionIndexInfos(stringIndexInfo, getIndexInfoOfType(t, IndexKind.String));
+                    numberIndexInfo = unionIndexInfos(numberIndexInfo, getIndexInfoOfType(t, IndexKind.Number));
                 }
             }
             setObjectTypeMembers(type, emptySymbols, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
@@ -16839,7 +16846,9 @@ namespace ts {
                 // perform property check if property or indexer is declared in 'type'
                 // this allows to rule out cases when both property and indexer are inherited from the base class
                 let errorNode: Node;
-                if (prop.valueDeclaration.name.kind === SyntaxKind.ComputedPropertyName || prop.parent === containingType.symbol) {
+                    if (prop.valueDeclaration.name.kind === SyntaxKind.ComputedPropertyName ||
+                        prop.parent === containingType.symbol ||
+                        containingType.flags & TypeFlags.Spread) {
                     errorNode = prop.valueDeclaration;
                 }
                 else if (indexDeclaration) {

From 78420adfcdf67a9e79025edee9a33e886c72ba94 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 27 Sep 2016 11:05:58 -0700
Subject: [PATCH 013/421] Test object spread index signatures

---
 .../reference/objectSpreadIndexSignature.js   | 22 ++++---
 .../objectSpreadIndexSignature.symbols        | 34 ++++++++---
 .../objectSpreadIndexSignature.types          | 58 +++++++++++++------
 .../spread/objectSpreadIndexSignature.ts      | 16 +++--
 4 files changed, 93 insertions(+), 37 deletions(-)

diff --git a/tests/baselines/reference/objectSpreadIndexSignature.js b/tests/baselines/reference/objectSpreadIndexSignature.js
index c4a0d6b90d8..b5ec35277e0 100644
--- a/tests/baselines/reference/objectSpreadIndexSignature.js
+++ b/tests/baselines/reference/objectSpreadIndexSignature.js
@@ -7,12 +7,18 @@ let c: { ...C, b: string, c?: string, [n: number]: string };
 let n: number = c.a;
 let s: string = c[12];
 interface Indexed {
-    [n: number]: string;
-    a: boolean;
+    [n: string]: number;
+    a: number;
 }
-let i: { ...Indexed, b: string };
-s = i[101];
-s = i.b;
+let i: { ...Indexed, b: number };
+n = i[101];
+n = i.b;
+interface Indexed2 {
+    [n: string]: boolean;
+    c: boolean;
+}
+let ii: { ...Indexed, ...Indexed2, b: boolean, d: number };
+let nb: number | boolean = ii[1001];
 
 
 //// [objectSpreadIndexSignature.js]
@@ -25,5 +31,7 @@ var c;
 var n = c.a;
 var s = c[12];
 var i;
-s = i[101];
-s = i.b;
+n = i[101];
+n = i.b;
+var ii;
+var nb = ii[1001];
diff --git a/tests/baselines/reference/objectSpreadIndexSignature.symbols b/tests/baselines/reference/objectSpreadIndexSignature.symbols
index fee1e862ade..a3510f98658 100644
--- a/tests/baselines/reference/objectSpreadIndexSignature.symbols
+++ b/tests/baselines/reference/objectSpreadIndexSignature.symbols
@@ -28,24 +28,44 @@ let s: string = c[12];
 interface Indexed {
 >Indexed : Symbol(Indexed, Decl(objectSpreadIndexSignature.ts, 6, 22))
 
-    [n: number]: string;
+    [n: string]: number;
 >n : Symbol(n, Decl(objectSpreadIndexSignature.ts, 8, 5))
 
-    a: boolean;
+    a: number;
 >a : Symbol(Indexed.a, Decl(objectSpreadIndexSignature.ts, 8, 24))
 }
-let i: { ...Indexed, b: string };
+let i: { ...Indexed, b: number };
 >i : Symbol(i, Decl(objectSpreadIndexSignature.ts, 11, 3))
 >Indexed : Symbol(Indexed, Decl(objectSpreadIndexSignature.ts, 6, 22))
 >b : Symbol(b, Decl(objectSpreadIndexSignature.ts, 11, 20))
 
-s = i[101];
->s : Symbol(s, Decl(objectSpreadIndexSignature.ts, 6, 3))
+n = i[101];
+>n : Symbol(n, Decl(objectSpreadIndexSignature.ts, 5, 3))
 >i : Symbol(i, Decl(objectSpreadIndexSignature.ts, 11, 3))
 
-s = i.b;
->s : Symbol(s, Decl(objectSpreadIndexSignature.ts, 6, 3))
+n = i.b;
+>n : Symbol(n, Decl(objectSpreadIndexSignature.ts, 5, 3))
 >i.b : Symbol(b, Decl(objectSpreadIndexSignature.ts, 11, 20))
 >i : Symbol(i, Decl(objectSpreadIndexSignature.ts, 11, 3))
 >b : Symbol(b, Decl(objectSpreadIndexSignature.ts, 11, 20))
 
+interface Indexed2 {
+>Indexed2 : Symbol(Indexed2, Decl(objectSpreadIndexSignature.ts, 13, 8))
+
+    [n: string]: boolean;
+>n : Symbol(n, Decl(objectSpreadIndexSignature.ts, 15, 5))
+
+    c: boolean;
+>c : Symbol(Indexed2.c, Decl(objectSpreadIndexSignature.ts, 15, 25))
+}
+let ii: { ...Indexed, ...Indexed2, b: boolean, d: number };
+>ii : Symbol(ii, Decl(objectSpreadIndexSignature.ts, 18, 3))
+>Indexed : Symbol(Indexed, Decl(objectSpreadIndexSignature.ts, 6, 22))
+>Indexed2 : Symbol(Indexed2, Decl(objectSpreadIndexSignature.ts, 13, 8))
+>b : Symbol(b, Decl(objectSpreadIndexSignature.ts, 18, 34))
+>d : Symbol(d, Decl(objectSpreadIndexSignature.ts, 18, 46))
+
+let nb: number | boolean = ii[1001];
+>nb : Symbol(nb, Decl(objectSpreadIndexSignature.ts, 19, 3))
+>ii : Symbol(ii, Decl(objectSpreadIndexSignature.ts, 18, 3))
+
diff --git a/tests/baselines/reference/objectSpreadIndexSignature.types b/tests/baselines/reference/objectSpreadIndexSignature.types
index 9adbb349da2..9a31b0c4451 100644
--- a/tests/baselines/reference/objectSpreadIndexSignature.types
+++ b/tests/baselines/reference/objectSpreadIndexSignature.types
@@ -30,28 +30,50 @@ let s: string = c[12];
 interface Indexed {
 >Indexed : Indexed
 
-    [n: number]: string;
->n : number
+    [n: string]: number;
+>n : string
 
-    a: boolean;
->a : boolean
+    a: number;
+>a : number
 }
-let i: { ...Indexed, b: string };
->i : { ...Indexed; b: string; [n: number]: string; }
+let i: { ...Indexed, b: number };
+>i : { ...Indexed; b: number; [n: string]: number; }
 >Indexed : Indexed
->b : string
+>b : number
 
-s = i[101];
->s = i[101] : string
->s : string
->i[101] : string
->i : { ...Indexed; b: string; [n: number]: string; }
+n = i[101];
+>n = i[101] : number
+>n : number
+>i[101] : number
+>i : { ...Indexed; b: number; [n: string]: number; }
 >101 : 101
 
-s = i.b;
->s = i.b : string
->s : string
->i.b : string
->i : { ...Indexed; b: string; [n: number]: string; }
->b : string
+n = i.b;
+>n = i.b : number
+>n : number
+>i.b : number
+>i : { ...Indexed; b: number; [n: string]: number; }
+>b : number
+
+interface Indexed2 {
+>Indexed2 : Indexed2
+
+    [n: string]: boolean;
+>n : string
+
+    c: boolean;
+>c : boolean
+}
+let ii: { ...Indexed, ...Indexed2, b: boolean, d: number };
+>ii : { ...Indexed; ...Indexed2; b: boolean; d: number; [x: string]: number | boolean; }
+>Indexed : Indexed
+>Indexed2 : Indexed2
+>b : boolean
+>d : number
+
+let nb: number | boolean = ii[1001];
+>nb : number | boolean
+>ii[1001] : number | boolean
+>ii : { ...Indexed; ...Indexed2; b: boolean; d: number; [x: string]: number | boolean; }
+>1001 : 1001
 
diff --git a/tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts b/tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts
index 11ba5450085..d6f9f511c7b 100644
--- a/tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts
+++ b/tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts
@@ -6,9 +6,15 @@ let c: { ...C, b: string, c?: string, [n: number]: string };
 let n: number = c.a;
 let s: string = c[12];
 interface Indexed {
-    [n: number]: string;
-    a: boolean;
+    [n: string]: number;
+    a: number;
 }
-let i: { ...Indexed, b: string };
-s = i[101];
-s = i.b;
+let i: { ...Indexed, b: number };
+n = i[101];
+n = i.b;
+interface Indexed2 {
+    [n: string]: boolean;
+    c: boolean;
+}
+let ii: { ...Indexed, ...Indexed2, b: boolean, d: number };
+let nb: number | boolean = ii[1001];

From 7e7a26a3581c223f57f161dbc8f71ed4ac856590 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 27 Sep 2016 16:15:52 -0700
Subject: [PATCH 014/421] Spreads w/a single type parameter assignable to that
 type parameter

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index e1e7cce4df4..209598259eb 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -2321,8 +2321,6 @@ namespace ts {
                             printFollowingPunctuation = true;
                         }
                     }
-                    // TODO: Only print if this is directly on the type -- not on the subtype somewhere.
-                    // (This is not crucial, though, since the extra info *might* be nice.)
                     const resolved = resolveStructuredTypeMembers(type);
                     writeIndexSignature(resolved.stringIndexInfo, SyntaxKind.StringKeyword);
                     writeIndexSignature(resolved.numberIndexInfo, SyntaxKind.NumberKeyword);
@@ -6656,23 +6654,42 @@ namespace ts {
                     }
                 }
 
-                if (source.flags & TypeFlags.Spread && target.flags & TypeFlags.Spread) {
-                    const sourceParameters = filter((source as SpreadType).types, t => !!(t.flags & TypeFlags.TypeParameter));
-                    const targetParameters = filter((target as SpreadType).types, t => !!(t.flags & TypeFlags.TypeParameter));
-                    if (sourceParameters.length !== targetParameters.length) {
-                        reportRelationError(headMessage, source, target);
-                        return Ternary.False;
+                if (source.flags & TypeFlags.Spread) {
+                    if (target.flags & TypeFlags.TypeParameter) {
+                        let hasTypeParameter = false;
+                        let typeParametersAreEqual = true;
+                        for (const t of (source as SpreadType).types) {
+                            if (t.flags & TypeFlags.TypeParameter) {
+                                hasTypeParameter = true;
+                                if (t !== target) {
+                                    typeParametersAreEqual = false;
+                                    break;
+                                }
+                            }
+                        }
+                        if (hasTypeParameter && typeParametersAreEqual) {
+                            errorInfo = saveErrorInfo;
+                            return Ternary.True;
+                        }
                     }
-                    for (let i = 0; i < sourceParameters.length; i++) {
-                        if (sourceParameters[i].symbol !== targetParameters[i].symbol) {
+                    else if (target.flags & TypeFlags.Spread) {
+                        const sourceParameters = filter((source as SpreadType).types, t => !!(t.flags & TypeFlags.TypeParameter));
+                        const targetParameters = filter((target as SpreadType).types, t => !!(t.flags & TypeFlags.TypeParameter));
+                        if (sourceParameters.length !== targetParameters.length) {
                             reportRelationError(headMessage, source, target);
                             return Ternary.False;
                         }
-                    }
-                    const reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo;
-                    if (result = objectTypeRelatedTo(source, source, target, reportStructuralErrors)) {
-                        errorInfo = saveErrorInfo;
-                        return result;
+                        for (let i = 0; i < sourceParameters.length; i++) {
+                            if (sourceParameters[i].symbol !== targetParameters[i].symbol) {
+                                reportRelationError(headMessage, source, target);
+                                return Ternary.False;
+                            }
+                        }
+                        const reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo;
+                        if (result = objectTypeRelatedTo(source, source, target, reportStructuralErrors)) {
+                            errorInfo = saveErrorInfo;
+                            return result;
+                        }
                     }
                 }
 

From 0f773c5673d85633d321fb4cb5cbed94739d3c78 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 27 Sep 2016 16:17:14 -0700
Subject: [PATCH 015/421] Add object spread scenario tests

---
 .../reference/objectSpreadScenarios.js        |  45 ++++++++
 .../reference/objectSpreadScenarios.symbols   |  84 ++++++++++++++
 .../reference/objectSpreadScenarios.types     | 106 ++++++++++++++++++
 .../types/spread/objectSpreadScenarios.ts     |  17 +++
 4 files changed, 252 insertions(+)
 create mode 100644 tests/baselines/reference/objectSpreadScenarios.js
 create mode 100644 tests/baselines/reference/objectSpreadScenarios.symbols
 create mode 100644 tests/baselines/reference/objectSpreadScenarios.types
 create mode 100644 tests/cases/conformance/types/spread/objectSpreadScenarios.ts

diff --git a/tests/baselines/reference/objectSpreadScenarios.js b/tests/baselines/reference/objectSpreadScenarios.js
new file mode 100644
index 00000000000..ae0e2f6c425
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadScenarios.js
@@ -0,0 +1,45 @@
+//// [objectSpreadScenarios.ts]
+interface A1 { a: boolean }
+interface B1 { b: number };
+function override<U>(initial: U, override: U): U {
+    return { ...initial, ...override };
+}
+function update<U>(this: { u: U }, override: U): void {
+    this.u = { ...this.u, ...override };
+}
+function mixin<T, U>(one: T, two: U): { ...T, ...U } {
+    return { ...one, ...two };
+}
+let a1: A1 = { a: true };
+let b1: B1 = { b: 101 };
+a1 = override(a1, { a: false });
+let host = { u: a1, update };
+host.update({ a: false });
+let mixed = mixin(a1, b1);
+
+
+//// [objectSpreadScenarios.js]
+var __assign = (this && this.__assign) || Object.assign || function(t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+        s = arguments[i];
+        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+            t[p] = s[p];
+    }
+    return t;
+};
+;
+function override(initial, override) {
+    return __assign({}, initial, override);
+}
+function update(override) {
+    this.u = __assign({}, this.u, override);
+}
+function mixin(one, two) {
+    return __assign({}, one, two);
+}
+var a1 = { a: true };
+var b1 = { b: 101 };
+a1 = override(a1, { a: false });
+var host = { u: a1, update: update };
+host.update({ a: false });
+var mixed = mixin(a1, b1);
diff --git a/tests/baselines/reference/objectSpreadScenarios.symbols b/tests/baselines/reference/objectSpreadScenarios.symbols
new file mode 100644
index 00000000000..c8c18ca1e2f
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadScenarios.symbols
@@ -0,0 +1,84 @@
+=== tests/cases/conformance/types/spread/objectSpreadScenarios.ts ===
+interface A1 { a: boolean }
+>A1 : Symbol(A1, Decl(objectSpreadScenarios.ts, 0, 0))
+>a : Symbol(A1.a, Decl(objectSpreadScenarios.ts, 0, 14))
+
+interface B1 { b: number };
+>B1 : Symbol(B1, Decl(objectSpreadScenarios.ts, 0, 27))
+>b : Symbol(B1.b, Decl(objectSpreadScenarios.ts, 1, 14))
+
+function override<U>(initial: U, override: U): U {
+>override : Symbol(override, Decl(objectSpreadScenarios.ts, 1, 27))
+>U : Symbol(U, Decl(objectSpreadScenarios.ts, 2, 18))
+>initial : Symbol(initial, Decl(objectSpreadScenarios.ts, 2, 21))
+>U : Symbol(U, Decl(objectSpreadScenarios.ts, 2, 18))
+>override : Symbol(override, Decl(objectSpreadScenarios.ts, 2, 32))
+>U : Symbol(U, Decl(objectSpreadScenarios.ts, 2, 18))
+>U : Symbol(U, Decl(objectSpreadScenarios.ts, 2, 18))
+
+    return { ...initial, ...override };
+}
+function update<U>(this: { u: U }, override: U): void {
+>update : Symbol(update, Decl(objectSpreadScenarios.ts, 4, 1))
+>U : Symbol(U, Decl(objectSpreadScenarios.ts, 5, 16))
+>this : Symbol(this, Decl(objectSpreadScenarios.ts, 5, 19))
+>u : Symbol(u, Decl(objectSpreadScenarios.ts, 5, 26))
+>U : Symbol(U, Decl(objectSpreadScenarios.ts, 5, 16))
+>override : Symbol(override, Decl(objectSpreadScenarios.ts, 5, 34))
+>U : Symbol(U, Decl(objectSpreadScenarios.ts, 5, 16))
+
+    this.u = { ...this.u, ...override };
+>this.u : Symbol(u, Decl(objectSpreadScenarios.ts, 5, 26))
+>this : Symbol(this, Decl(objectSpreadScenarios.ts, 5, 19))
+>u : Symbol(u, Decl(objectSpreadScenarios.ts, 5, 26))
+>this.u : Symbol(u, Decl(objectSpreadScenarios.ts, 5, 26))
+>this : Symbol(this, Decl(objectSpreadScenarios.ts, 5, 19))
+>u : Symbol(u, Decl(objectSpreadScenarios.ts, 5, 26))
+}
+function mixin<T, U>(one: T, two: U): { ...T, ...U } {
+>mixin : Symbol(mixin, Decl(objectSpreadScenarios.ts, 7, 1))
+>T : Symbol(T, Decl(objectSpreadScenarios.ts, 8, 15))
+>U : Symbol(U, Decl(objectSpreadScenarios.ts, 8, 17))
+>one : Symbol(one, Decl(objectSpreadScenarios.ts, 8, 21))
+>T : Symbol(T, Decl(objectSpreadScenarios.ts, 8, 15))
+>two : Symbol(two, Decl(objectSpreadScenarios.ts, 8, 28))
+>U : Symbol(U, Decl(objectSpreadScenarios.ts, 8, 17))
+>T : Symbol(T, Decl(objectSpreadScenarios.ts, 8, 15))
+>U : Symbol(U, Decl(objectSpreadScenarios.ts, 8, 17))
+
+    return { ...one, ...two };
+}
+let a1: A1 = { a: true };
+>a1 : Symbol(a1, Decl(objectSpreadScenarios.ts, 11, 3))
+>A1 : Symbol(A1, Decl(objectSpreadScenarios.ts, 0, 0))
+>a : Symbol(a, Decl(objectSpreadScenarios.ts, 11, 14))
+
+let b1: B1 = { b: 101 };
+>b1 : Symbol(b1, Decl(objectSpreadScenarios.ts, 12, 3))
+>B1 : Symbol(B1, Decl(objectSpreadScenarios.ts, 0, 27))
+>b : Symbol(b, Decl(objectSpreadScenarios.ts, 12, 14))
+
+a1 = override(a1, { a: false });
+>a1 : Symbol(a1, Decl(objectSpreadScenarios.ts, 11, 3))
+>override : Symbol(override, Decl(objectSpreadScenarios.ts, 1, 27))
+>a1 : Symbol(a1, Decl(objectSpreadScenarios.ts, 11, 3))
+>a : Symbol(a, Decl(objectSpreadScenarios.ts, 13, 19))
+
+let host = { u: a1, update };
+>host : Symbol(host, Decl(objectSpreadScenarios.ts, 14, 3))
+>u : Symbol(u, Decl(objectSpreadScenarios.ts, 14, 12))
+>a1 : Symbol(a1, Decl(objectSpreadScenarios.ts, 11, 3))
+>update : Symbol(update, Decl(objectSpreadScenarios.ts, 14, 19))
+
+host.update({ a: false });
+>host.update : Symbol(update, Decl(objectSpreadScenarios.ts, 14, 19))
+>host : Symbol(host, Decl(objectSpreadScenarios.ts, 14, 3))
+>update : Symbol(update, Decl(objectSpreadScenarios.ts, 14, 19))
+>a : Symbol(a, Decl(objectSpreadScenarios.ts, 15, 13))
+
+let mixed = mixin(a1, b1);
+>mixed : Symbol(mixed, Decl(objectSpreadScenarios.ts, 16, 3))
+>mixin : Symbol(mixin, Decl(objectSpreadScenarios.ts, 7, 1))
+>a1 : Symbol(a1, Decl(objectSpreadScenarios.ts, 11, 3))
+>b1 : Symbol(b1, Decl(objectSpreadScenarios.ts, 12, 3))
+
diff --git a/tests/baselines/reference/objectSpreadScenarios.types b/tests/baselines/reference/objectSpreadScenarios.types
new file mode 100644
index 00000000000..eebe08a2aaf
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadScenarios.types
@@ -0,0 +1,106 @@
+=== tests/cases/conformance/types/spread/objectSpreadScenarios.ts ===
+interface A1 { a: boolean }
+>A1 : A1
+>a : boolean
+
+interface B1 { b: number };
+>B1 : B1
+>b : number
+
+function override<U>(initial: U, override: U): U {
+>override : <U>(initial: U, override: U) => U
+>U : U
+>initial : U
+>U : U
+>override : U
+>U : U
+>U : U
+
+    return { ...initial, ...override };
+>{ ...initial, ...override } : { ...U; ...U }
+>initial : any
+>override : any
+}
+function update<U>(this: { u: U }, override: U): void {
+>update : <U>(this: { u: U; }, override: U) => void
+>U : U
+>this : { u: U; }
+>u : U
+>U : U
+>override : U
+>U : U
+
+    this.u = { ...this.u, ...override };
+>this.u = { ...this.u, ...override } : { ...U; ...U }
+>this.u : U
+>this : { u: U; }
+>u : U
+>{ ...this.u, ...override } : { ...U; ...U }
+>this.u : U
+>this : { u: U; }
+>u : U
+>override : any
+}
+function mixin<T, U>(one: T, two: U): { ...T, ...U } {
+>mixin : <T, U>(one: T, two: U) => { ...T; ...U }
+>T : T
+>U : U
+>one : T
+>T : T
+>two : U
+>U : U
+>T : T
+>U : U
+
+    return { ...one, ...two };
+>{ ...one, ...two } : { ...T; ...U }
+>one : any
+>two : any
+}
+let a1: A1 = { a: true };
+>a1 : A1
+>A1 : A1
+>{ a: true } : { a: true; }
+>a : boolean
+>true : true
+
+let b1: B1 = { b: 101 };
+>b1 : B1
+>B1 : B1
+>{ b: 101 } : { b: number; }
+>b : number
+>101 : 101
+
+a1 = override(a1, { a: false });
+>a1 = override(a1, { a: false }) : A1
+>a1 : A1
+>override(a1, { a: false }) : A1
+>override : <U>(initial: U, override: U) => U
+>a1 : A1
+>{ a: false } : { a: false; }
+>a : boolean
+>false : false
+
+let host = { u: a1, update };
+>host : { u: A1; update: <U>(this: { u: U; }, override: U) => void; }
+>{ u: a1, update } : { u: A1; update: <U>(this: { u: U; }, override: U) => void; }
+>u : A1
+>a1 : A1
+>update : <U>(this: { u: U; }, override: U) => void
+
+host.update({ a: false });
+>host.update({ a: false }) : void
+>host.update : <U>(this: { u: U; }, override: U) => void
+>host : { u: A1; update: <U>(this: { u: U; }, override: U) => void; }
+>update : <U>(this: { u: U; }, override: U) => void
+>{ a: false } : { a: false; }
+>a : boolean
+>false : false
+
+let mixed = mixin(a1, b1);
+>mixed : { ...A1; ...B1 }
+>mixin(a1, b1) : { ...A1; ...B1 }
+>mixin : <T, U>(one: T, two: U) => { ...T; ...U }
+>a1 : A1
+>b1 : B1
+
diff --git a/tests/cases/conformance/types/spread/objectSpreadScenarios.ts b/tests/cases/conformance/types/spread/objectSpreadScenarios.ts
new file mode 100644
index 00000000000..2f944ddb796
--- /dev/null
+++ b/tests/cases/conformance/types/spread/objectSpreadScenarios.ts
@@ -0,0 +1,17 @@
+interface A1 { a: boolean }
+interface B1 { b: number };
+function override<U>(initial: U, override: U): U {
+    return { ...initial, ...override };
+}
+function update<U>(this: { u: U }, override: U): void {
+    this.u = { ...this.u, ...override };
+}
+function mixin<T, U>(one: T, two: U): { ...T, ...U } {
+    return { ...one, ...two };
+}
+let a1: A1 = { a: true };
+let b1: B1 = { b: 101 };
+a1 = override(a1, { a: false });
+let host = { u: a1, update };
+host.update({ a: false });
+let mixed = mixin(a1, b1);

From 62c5bda3bbc1ee06d6ed0a575274da3159004f52 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 28 Sep 2016 14:14:53 -0700
Subject: [PATCH 016/421] isDeclaredProperty: Use optional-boolean idiom

As elsewhere in the compiler code
---
 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 0e120bd74f0..7a98efd007f 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -2536,7 +2536,7 @@ namespace ts {
 
     /* @internal */
     export interface SpreadElementType extends ResolvedType {
-        isDeclaredProperty: boolean | undefined;
+        isDeclaredProperty?: boolean;
     }
 
     /* @internal */

From b9af986df1d4e277af6464033be98fbc666642d9 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 3 Oct 2016 15:18:04 -0700
Subject: [PATCH 017/421] Update object spread scenarios test

---
 tests/baselines/reference/objectSpreadScenarios.js    |  2 +-
 .../baselines/reference/objectSpreadScenarios.symbols |  3 ++-
 tests/baselines/reference/objectSpreadScenarios.types | 11 ++++++-----
 .../conformance/types/spread/objectSpreadScenarios.ts |  2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/tests/baselines/reference/objectSpreadScenarios.js b/tests/baselines/reference/objectSpreadScenarios.js
index ae0e2f6c425..64739a2b298 100644
--- a/tests/baselines/reference/objectSpreadScenarios.js
+++ b/tests/baselines/reference/objectSpreadScenarios.js
@@ -1,7 +1,7 @@
 //// [objectSpreadScenarios.ts]
 interface A1 { a: boolean }
 interface B1 { b: number };
-function override<U>(initial: U, override: U): U {
+function override<U>(initial: U, override: U): { ...U, ...U } {
     return { ...initial, ...override };
 }
 function update<U>(this: { u: U }, override: U): void {
diff --git a/tests/baselines/reference/objectSpreadScenarios.symbols b/tests/baselines/reference/objectSpreadScenarios.symbols
index c8c18ca1e2f..784e340a10c 100644
--- a/tests/baselines/reference/objectSpreadScenarios.symbols
+++ b/tests/baselines/reference/objectSpreadScenarios.symbols
@@ -7,13 +7,14 @@ interface B1 { b: number };
 >B1 : Symbol(B1, Decl(objectSpreadScenarios.ts, 0, 27))
 >b : Symbol(B1.b, Decl(objectSpreadScenarios.ts, 1, 14))
 
-function override<U>(initial: U, override: U): U {
+function override<U>(initial: U, override: U): { ...U, ...U } {
 >override : Symbol(override, Decl(objectSpreadScenarios.ts, 1, 27))
 >U : Symbol(U, Decl(objectSpreadScenarios.ts, 2, 18))
 >initial : Symbol(initial, Decl(objectSpreadScenarios.ts, 2, 21))
 >U : Symbol(U, Decl(objectSpreadScenarios.ts, 2, 18))
 >override : Symbol(override, Decl(objectSpreadScenarios.ts, 2, 32))
 >U : Symbol(U, Decl(objectSpreadScenarios.ts, 2, 18))
+>U : Symbol(U, Decl(objectSpreadScenarios.ts, 2, 18))
 >U : Symbol(U, Decl(objectSpreadScenarios.ts, 2, 18))
 
     return { ...initial, ...override };
diff --git a/tests/baselines/reference/objectSpreadScenarios.types b/tests/baselines/reference/objectSpreadScenarios.types
index eebe08a2aaf..5330029afe1 100644
--- a/tests/baselines/reference/objectSpreadScenarios.types
+++ b/tests/baselines/reference/objectSpreadScenarios.types
@@ -7,13 +7,14 @@ interface B1 { b: number };
 >B1 : B1
 >b : number
 
-function override<U>(initial: U, override: U): U {
->override : <U>(initial: U, override: U) => U
+function override<U>(initial: U, override: U): { ...U, ...U } {
+>override : <U>(initial: U, override: U) => { ...U; ...U }
 >U : U
 >initial : U
 >U : U
 >override : U
 >U : U
+>U : U
 >U : U
 
     return { ...initial, ...override };
@@ -72,10 +73,10 @@ let b1: B1 = { b: 101 };
 >101 : 101
 
 a1 = override(a1, { a: false });
->a1 = override(a1, { a: false }) : A1
+>a1 = override(a1, { a: false }) : { ...A1; ...A1 }
 >a1 : A1
->override(a1, { a: false }) : A1
->override : <U>(initial: U, override: U) => U
+>override(a1, { a: false }) : { ...A1; ...A1 }
+>override : <U>(initial: U, override: U) => { ...U; ...U }
 >a1 : A1
 >{ a: false } : { a: false; }
 >a : boolean
diff --git a/tests/cases/conformance/types/spread/objectSpreadScenarios.ts b/tests/cases/conformance/types/spread/objectSpreadScenarios.ts
index 2f944ddb796..c80cffa44e7 100644
--- a/tests/cases/conformance/types/spread/objectSpreadScenarios.ts
+++ b/tests/cases/conformance/types/spread/objectSpreadScenarios.ts
@@ -1,6 +1,6 @@
 interface A1 { a: boolean }
 interface B1 { b: number };
-function override<U>(initial: U, override: U): U {
+function override<U>(initial: U, override: U): { ...U, ...U } {
     return { ...initial, ...override };
 }
 function update<U>(this: { u: U }, override: U): void {

From 57850ecf1ae5cad2a81112b4152133a99c8b9837 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 3 Oct 2016 15:49:23 -0700
Subject: [PATCH 018/421] Add more generic assignability cases

---
 .../cases/conformance/types/spread/objectSpreadGeneric.ts  | 7 +++++++
 .../cases/conformance/types/spread/objectSpreadNegative.ts | 5 +++++
 2 files changed, 12 insertions(+)

diff --git a/tests/cases/conformance/types/spread/objectSpreadGeneric.ts b/tests/cases/conformance/types/spread/objectSpreadGeneric.ts
index 552142004b7..a6919ce8149 100644
--- a/tests/cases/conformance/types/spread/objectSpreadGeneric.ts
+++ b/tests/cases/conformance/types/spread/objectSpreadGeneric.ts
@@ -1,5 +1,12 @@
 function f<T, U, V>(t: T, u: U, v: V): void {
     let o: { ...T, ...U, ...V };
+    let uu: { ...U, ...U};
+    let u: { ...U };
+    let u0: U;
+    uu = u; // ok, multiple spreads are equivalent to a single one
+    u = uu; // ok, multiple spreads are equivalent to a single one
+    u0 = u; // error, might be missing a ton of stuff
+    u = u0; // ok, type has at least all the properties of the spread
     const same: { ...T, ...U, ...V } = o; // ok
     const reversed: { ...V, ...U, ...T } = o; // error, reversed
     const reversed2: { ...U, ...T, ...V } = o; // error, U and T are still reversed
diff --git a/tests/cases/conformance/types/spread/objectSpreadNegative.ts b/tests/cases/conformance/types/spread/objectSpreadNegative.ts
index 4691e45a17d..4d1cfbe398c 100644
--- a/tests/cases/conformance/types/spread/objectSpreadNegative.ts
+++ b/tests/cases/conformance/types/spread/objectSpreadNegative.ts
@@ -47,3 +47,8 @@ callableConstructableSpread(12); // error, no call signature
 new callableConstructableSpread(12); // error, no construct signature
 
 let callableSpread = { ...publicx, ...(n => n + 1) }; // error, can't spread functions
+
+// { ...U } is not assignable to U
+function override<U>(initial: U, override: U): U {
+    return { ...initial, ...override };
+}

From d770c568743d6cc7ae6e5c21387ba8d0bb9d419f Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Fri, 7 Oct 2016 08:55:02 -0700
Subject: [PATCH 019/421] Switch spread types to a binary representation.

This allows much easier creation of spread types. Spread type creation
is now much smarter, and creates object types when possible. When
it's not, it produces a spread type that simplifies its input into a
standard structure for containing type parameters.

The spread type is no longer related to union or intersection types.
Spread types containing union and intersection types are not yet
correctly handled.
---
 src/compiler/checker.ts | 387 +++++++++++++++++++++++-----------------
 src/compiler/types.ts   |  21 ++-
 2 files changed, 232 insertions(+), 176 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 44784c4ab23..0e7266b223c 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -2310,33 +2310,40 @@ namespace ts {
                     writePunctuation(writer, SyntaxKind.OpenBraceToken);
                     writer.writeLine();
                     writer.increaseIndent();
-                    let printFollowingPunctuation = false;
-                    for (const t of type.types) {
-                        if (printFollowingPunctuation) {
+
+                    writeSpreadTypeWorker(type, /*atEnd*/true, type.symbol);
+
+                    writer.decreaseIndent();
+                    writePunctuation(writer, SyntaxKind.CloseBraceToken);
+                }
+
+                function writeSpreadTypeWorker(type: SpreadType, atEnd: boolean, container: Symbol): void {
+                    if (type.left.flags & TypeFlags.Spread) {
+                        writeSpreadTypeWorker(type.left as SpreadType, /*atEnd*/false, container);
+                    }
+                    else {
+                        const saveInObjectTypeLiteral = inObjectTypeLiteral;
+                        inObjectTypeLiteral = true;
+                        writeObjectLiteralType(resolveStructuredTypeMembers(type.left));
+                        inObjectTypeLiteral = saveInObjectTypeLiteral;
+                    }
+                    if (type.right.symbol === container) {
+                        const saveInObjectTypeLiteral = inObjectTypeLiteral;
+                        inObjectTypeLiteral = true;
+                        writeObjectLiteralType(resolveStructuredTypeMembers(type.right));
+                        inObjectTypeLiteral = saveInObjectTypeLiteral;
+                    }
+                    else {
+                        writePunctuation(writer, SyntaxKind.DotDotDotToken);
+                        writeType(type.right, TypeFormatFlags.None);
+                        if (atEnd) {
+                            writeSpace(writer);
+                        }
+                        else {
                             writePunctuation(writer, SyntaxKind.SemicolonToken);
                             writer.writeLine();
                         }
-                        if (t.isDeclaredProperty) {
-                            const saveInObjectTypeLiteral = inObjectTypeLiteral;
-                            inObjectTypeLiteral = true;
-                            writeObjectLiteralType(resolveStructuredTypeMembers(t));
-                            printFollowingPunctuation = false;
-                            inObjectTypeLiteral = saveInObjectTypeLiteral;
-                        }
-                        else {
-                            writePunctuation(writer, SyntaxKind.DotDotDotToken);
-                            writeType(t, TypeFormatFlags.None);
-                            printFollowingPunctuation = true;
-                        }
                     }
-                    const resolved = resolveStructuredTypeMembers(type);
-                    writeIndexSignature(resolved.stringIndexInfo, SyntaxKind.StringKeyword);
-                    writeIndexSignature(resolved.numberIndexInfo, SyntaxKind.NumberKeyword);
-                    writer.decreaseIndent();
-                    if (printFollowingPunctuation) {
-                        writeSpace(writer);
-                    }
-                    writePunctuation(writer, SyntaxKind.CloseBraceToken);
                 }
 
                 function writeAnonymousType(type: ObjectType, flags: TypeFormatFlags) {
@@ -3522,6 +3529,9 @@ namespace ts {
             if (symbol.flags & SymbolFlags.Instantiated) {
                 return getTypeOfInstantiatedSymbol(symbol);
             }
+            if (symbol.flags & SymbolFlags.SyntheticProperty && symbol.syntheticKind === SyntheticSymbolKind.Spread) {
+                return getTypeOfSpreadProperty(symbol);
+            }
             if (symbol.flags & (SymbolFlags.Variable | SymbolFlags.Property)) {
                 return getTypeOfVariableOrParameterOrProperty(symbol);
             }
@@ -3540,6 +3550,15 @@ namespace ts {
             return unknownType;
         }
 
+        function getTypeOfSpreadProperty(symbol: Symbol) {
+            const links = getSymbolLinks(symbol);
+            if (!links.type) {
+                links.type = getUnionType([getTypeOfSymbol(links.leftSpread), getTypeOfSymbol(links.rightSpread)]);
+            }
+            return links.type;
+
+        }
+
         function getTargetType(type: ObjectType): Type {
             return type.flags & TypeFlags.Reference ? (<TypeReference>type).target : type;
         }
@@ -4340,21 +4359,6 @@ namespace ts {
             setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
 
-        function resolveSpreadTypeMembers(type: SpreadType) {
-            // The members and properties collections are empty for spread types. To get all properties of an
-            // spread type use getPropertiesOfType.
-            let stringIndexInfo: IndexInfo = getIndexInfoOfSymbol(type.symbol, IndexKind.String);
-            let numberIndexInfo: IndexInfo = getIndexInfoOfSymbol(type.symbol, IndexKind.Number);
-            for (let i = type.types.length - 1; i > -1; i--) {
-                const t = type.types[i];
-                if (!t.isDeclaredProperty) {
-                    stringIndexInfo = unionIndexInfos(stringIndexInfo, getIndexInfoOfType(t, IndexKind.String));
-                    numberIndexInfo = unionIndexInfos(numberIndexInfo, getIndexInfoOfType(t, IndexKind.Number));
-                }
-            }
-            setObjectTypeMembers(type, emptySymbols, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
-        }
-
         function resolveAnonymousTypeMembers(type: AnonymousType) {
             const symbol = type.symbol;
             if (type.target) {
@@ -4421,9 +4425,6 @@ namespace ts {
                 else if (type.flags & TypeFlags.Intersection) {
                     resolveIntersectionTypeMembers(<IntersectionType>type);
                 }
-                else if (type.flags & TypeFlags.Spread) {
-                    resolveSpreadTypeMembers(<SpreadType>type);
-                }
             }
             return <ResolvedType>type;
         }
@@ -4433,9 +4434,6 @@ namespace ts {
             if (type.flags & TypeFlags.ObjectType) {
                 return resolveStructuredTypeMembers(<ObjectType>type).properties;
             }
-            if (type.flags & TypeFlags.Spread) {
-                return getPropertiesOfType(type);
-            }
             return emptyArray;
         }
 
@@ -4451,11 +4449,10 @@ namespace ts {
             }
         }
 
-        function getPropertiesOfUnionOrIntersectionOrSpreadType(type: TypeOperatorType): Symbol[] {
-            const getProperty = type.flags & TypeFlags.Spread ? getPropertyOfSpreadType : getUnionOrIntersectionProperty;
+        function getPropertiesOfUnionOrIntersectionType(type: TypeOperatorType): Symbol[] {
             for (const current of type.types) {
                 for (const prop of getPropertiesOfType(current)) {
-                    getProperty(type, prop.name);
+                    getUnionOrIntersectionProperty(type, prop.name);
                 }
                 // The properties of a union type are those that are present in all constituent types, so
                 // we only need to check the properties of the first type
@@ -4480,8 +4477,10 @@ namespace ts {
 
         function getPropertiesOfType(type: Type): Symbol[] {
             type = getApparentType(type);
-            return type.flags & (TypeFlags.UnionOrIntersection | TypeFlags.Spread) ? getPropertiesOfUnionOrIntersectionOrSpreadType(<UnionType>type) :
-                getPropertiesOfObjectType(type);
+            if (type.flags & TypeFlags.UnionOrIntersection) {
+                return getPropertiesOfUnionOrIntersectionType(<UnionType>type);
+            }
+            return getPropertiesOfObjectType(type);
         }
 
         /**
@@ -4499,6 +4498,10 @@ namespace ts {
             return type.resolvedApparentType;
         }
 
+        function getApparentTypeOfSpread(type: SpreadType) {
+            return getSpreadType([getApparentType(type.left), getApparentType(type.right)], type.symbol, undefined, undefined);
+        }
+
         /**
          * For a type parameter, return the base constraint of the type parameter. For the string, number,
          * boolean, and symbol primitive types, return the corresponding object types. Otherwise return the
@@ -4507,7 +4510,10 @@ namespace ts {
         function getApparentType(type: Type): Type {
             if (type.flags & TypeFlags.TypeParameter) {
                 type = getApparentTypeOfTypeParameter(<TypeParameter>type);
-          }
+            }
+            if (type.flags & TypeFlags.Spread) {
+                type = getApparentTypeOfSpread(type as SpreadType);
+            }
             if (type.flags & TypeFlags.StringLike) {
                 type = globalStringType;
             }
@@ -4585,6 +4591,7 @@ namespace ts {
                 propTypes.push(type);
             }
             const result = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | SymbolFlags.SyntheticProperty | flags, name);
+            result.syntheticKind === SyntheticSymbolKind.UnionOrIntersection;
             result.containingType = containingType;
             result.hasNonUniformType = hasNonUniformType;
             result.isPartial = isPartial;
@@ -4614,61 +4621,6 @@ namespace ts {
             return property;
         }
 
-        function createSpreadProperty(containingType: SpreadType, name: string): Symbol {
-            const types = containingType.types;
-            return createUnionOrIntersectionOrSpreadPropertySymbol(containingType, name, () => {
-                let props: Symbol[];
-                // Result is readonly if any source is readonly
-                let isReadonly = false;
-                // Result is optional if all sources are optional
-                let commonFlags = SymbolFlags.Optional;
-                for (let i = types.length - 1; i > -1; i--) {
-                    const type = getApparentType(types[i]);
-                    if (type !== unknownType) {
-                        const prop = getPropertyOfType(type, name);
-                        if (prop) {
-                            if (prop.flags & SymbolFlags.Method && !types[i].isDeclaredProperty ||
-                                prop.flags & SymbolFlags.SetAccessor && !(prop.flags & SymbolFlags.GetAccessor)) {
-                                // skip non-object-literal methods and set-only properties and keep looking
-                                continue;
-                            }
-                            if (!props) {
-                                props = [prop];
-                            }
-                            else if (!contains(props, prop)) {
-                                props.unshift(prop);
-                            }
-                            if (isReadonlySymbol(prop)) {
-                                isReadonly = true;
-                            }
-                            if (getDeclarationModifierFlagsFromSymbol(prop) & (ModifierFlags.Private | ModifierFlags.Protected)) {
-                                // return immediately because even if prop is optional, it would make the unioned spread property private
-                                return [undefined, false, false, 0];
-                            }
-                            if (!(prop.flags & SymbolFlags.Optional)) {
-                                // Reset extraFlags to None since we found a non-optional property
-                                commonFlags = SymbolFlags.None;
-                                break;
-                            }
-                        }
-                    }
-                }
-                return [props, isReadonly, /*isPartial*/ false, commonFlags];
-            });
-        }
-
-        function getPropertyOfSpreadType(type: TypeOperatorType, name: string): Symbol {
-            const properties = type.resolvedProperties || (type.resolvedProperties = createMap<Symbol>());
-            let property = properties[name];
-            if (!property) {
-                property = createSpreadProperty(type as SpreadType, name);
-                if (property) {
-                    properties[name] = property;
-                }
-            }
-            return property;
-        }
-
         function getPropertyOfUnionOrIntersectionType(type: TypeOperatorType, name: string): Symbol {
             const property = getUnionOrIntersectionProperty(type, name);
             // We need to filter out partial properties in union types
@@ -4702,9 +4654,6 @@ namespace ts {
             if (type.flags & TypeFlags.UnionOrIntersection) {
                 return getPropertyOfUnionOrIntersectionType(<TypeOperatorType>type, name);
             }
-            if (type.flags & TypeFlags.Spread) {
-                return getPropertyOfSpreadType(<SpreadType>type, name);
-            }
             return undefined;
         }
 
@@ -5775,16 +5724,14 @@ namespace ts {
                 let type: ObjectType;
                 if (isSpread) {
                     let members: Map<Symbol>;
-                    const spreads: SpreadElementType[] = [];
+                    const spreads: Type[] = [];
                     for (const member of (node as TypeLiteralNode).members) {
                         if (member.kind === SyntaxKind.SpreadTypeElement) {
                             if (members) {
-                                const t = createAnonymousType(undefined, members, emptyArray, emptyArray, undefined, undefined) as SpreadElementType;
-                                t.isDeclaredProperty = true;
-                                spreads.push(t);
+                                spreads.push(createAnonymousType(node.symbol, members, emptyArray, emptyArray, undefined, undefined));
                                 members = undefined;
                             }
-                            spreads.push(getTypeFromTypeNode((member as SpreadTypeElement).type) as SpreadElementType);
+                            spreads.push(getTypeFromTypeNode((member as SpreadTypeElement).type));
                         }
                         else if (member.kind !== SyntaxKind.CallSignature &&
                                  member.kind !== SyntaxKind.ConstructSignature &&
@@ -5803,11 +5750,9 @@ namespace ts {
                         }
                     }
                     if (members) {
-                        const t = createAnonymousType(undefined, members, emptyArray, emptyArray, undefined, undefined) as SpreadElementType;
-                        t.isDeclaredProperty = true;
-                        spreads.push(t);
+                        spreads.push(createAnonymousType(node.symbol, members, emptyArray, emptyArray, undefined, undefined));
                     }
-                    return getSpreadType(spreads, node.symbol);
+                    return getSpreadType(spreads, node.symbol, aliasSymbol, aliasTypeArguments);
                 }
                 else {
                     type = createObjectType(TypeFlags.Anonymous, node.symbol);
@@ -5819,13 +5764,94 @@ namespace ts {
             return links.resolvedType;
         }
 
-        function getSpreadType(types: SpreadElementType[], symbol: Symbol, aliasSymbol?: Symbol, aliasTypeArguments?: Type[]): Type {
+        function getSpreadType(types: Type[], symbol: Symbol, aliasSymbol?: Symbol, aliasTypeArguments?: Type[]): Type {
+            if (types.length === 0) {
+                return emptyObjectType;
+            }
             const id = getTypeListId(types);
             if (id in spreadTypes) {
                 return spreadTypes[id];
             }
+            const right = types.pop();
+            if (right.flags & TypeFlags.Spread) {
+                // spread is right associative and associativity applies, so transform
+                // (T ... U) ... V to T ... (U ... V)
+                const rspread = right as SpreadType;
+                if (rspread.left !== emptyObjectType) {
+                    types.push(rspread.left);
+                }
+                types.push(rspread.right);
+                return getSpreadType(types, symbol, aliasSymbol, aliasTypeArguments);
+            }
+            const atBeginning = types.length === 0;
+            const left = getSpreadType(types, symbol, aliasSymbol, aliasTypeArguments);
+            if (right.flags & (TypeFlags.Null | TypeFlags.Undefined)) {
+                return left;
+            }
+            if (right.flags & TypeFlags.TypeParameter &&
+                left.flags & TypeFlags.Spread &&
+                (left as SpreadType).right.flags & TypeFlags.TypeParameter &&
+                right.symbol === (left as SpreadType).right.symbol) {
+                // for types like T ... T, just return ... T
+                return left;
+            }
+            if (!(right.flags & (TypeFlags.Union | TypeFlags.Intersection | TypeFlags.TypeParameter | TypeFlags.Spread))
+                && !(left.flags & (TypeFlags.Union | TypeFlags.Intersection | TypeFlags.TypeParameter | TypeFlags.Spread))) {
+                const members = createMap<Symbol | undefined>();
+                const skippedPrivateMembers = createMap<boolean>();
+                let stringIndexInfo = unionIndexInfos(getIndexInfoOfType(left, IndexKind.String), getIndexInfoOfType(right, IndexKind.String));
+                let numberIndexInfo = unionIndexInfos(getIndexInfoOfType(left, IndexKind.Number), getIndexInfoOfType(right, IndexKind.Number));
+                if (atBeginning) {
+                    // only get index info from the entire type once per spread type
+                    stringIndexInfo = unionIndexInfos(stringIndexInfo, getIndexInfoOfSymbol(symbol, IndexKind.String));
+                    numberIndexInfo = unionIndexInfos(numberIndexInfo, getIndexInfoOfSymbol(symbol, IndexKind.Number));
+                }
+                const isFromSpread = right.symbol !== symbol;
+                for (const rightProp of getPropertiesOfType(right)) {
+                    if (getDeclarationModifierFlagsFromSymbol(rightProp) & (ModifierFlags.Private | ModifierFlags.Protected)) {
+                        skippedPrivateMembers[rightProp.name] = true;
+                    }
+                    else if (!(rightProp.flags & SymbolFlags.Method && isFromSpread) &&
+                             !(rightProp.flags & SymbolFlags.SetAccessor && !(rightProp.flags & SymbolFlags.GetAccessor))) {
+                        // skip methods from spreads and accessors with setters but no getters
+                        members[rightProp.name] = rightProp;
+                    }
+                }
+                for (const leftProp of getPropertiesOfType(left)) {
+                    if (leftProp.flags & SymbolFlags.SetAccessor && !(leftProp.flags & SymbolFlags.GetAccessor)
+                       || leftProp.name in skippedPrivateMembers) {
+                        // skip set-only properties (methods have already been skipped by the recursive call to getSpreadType)
+                        continue;
+                    }
+                    if (leftProp.name in members) {
+                        const rightProp = members[leftProp.name];
+                        if (rightProp.flags & SymbolFlags.Optional) {
+                            const declarations: Declaration[] = concatenate(leftProp.declarations, rightProp.declarations);
+                            const flags = SymbolFlags.Property | SymbolFlags.Transient | SymbolFlags.SyntheticProperty | (leftProp.flags & SymbolFlags.Optional);
+                            const result = <TransientSymbol>createSymbol(flags, leftProp.name);
+                            result.syntheticKind = SyntheticSymbolKind.Spread;
+                            result.leftSpread = leftProp;
+                            result.rightSpread = rightProp;
+                            result.declarations = declarations;
+                            if (declarations.length) {
+                                result.valueDeclaration = declarations[0];
+                            }
+                            result.isReadonly = isReadonlySymbol(rightProp) || isReadonlySymbol(leftProp);
+                            members[leftProp.name] = result;
+                        }
+                    }
+                    else {
+                        members[leftProp.name] = leftProp;
+                    }
+                }
+                return createAnonymousType(symbol, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
+            }
+            // one side is a type parameter (TODO: Or union or intersection)
             const spread = spreadTypes[id] = createObjectType(TypeFlags.Spread, symbol) as SpreadType;
-            spread.types = filter(types, t => !(t.flags & (TypeFlags.Null | TypeFlags.Undefined)));
+            Debug.assert(!!(left.flags & (TypeFlags.Spread | TypeFlags.ObjectType)));
+            Debug.assert(!!(right.flags & (TypeFlags.TypeParameter | TypeFlags.ObjectType)));
+            spread.left = left as SpreadType | ResolvedType;
+            spread.right = right as TypeParameter | ResolvedType;
             spread.aliasSymbol = aliasSymbol;
             spread.aliasTypeArguments = aliasTypeArguments;
             return spread;
@@ -6238,7 +6264,8 @@ namespace ts {
                     return getIntersectionType(instantiateList((<IntersectionType>type).types, mapper, instantiateType), type.aliasSymbol, mapper.targetTypes);
                 }
                 if (type.flags & TypeFlags.Spread) {
-                    return getSpreadType(instantiateList((type as SpreadType).types, mapper, instantiateType) as SpreadElementType[], type.symbol, type.aliasSymbol, mapper.targetTypes);
+                    const spread = type as SpreadType;
+                    return getSpreadType([instantiateType(spread.left, mapper), instantiateType(spread.right, mapper)], type.symbol, type.aliasSymbol, mapper.targetTypes);
                 }
             }
             return type;
@@ -6776,38 +6803,15 @@ namespace ts {
                 }
 
                 if (source.flags & TypeFlags.Spread) {
-                    if (target.flags & TypeFlags.TypeParameter) {
-                        let hasTypeParameter = false;
-                        let typeParametersAreEqual = true;
-                        for (const t of (source as SpreadType).types) {
-                            if (t.flags & TypeFlags.TypeParameter) {
-                                hasTypeParameter = true;
-                                if (t !== target) {
-                                    typeParametersAreEqual = false;
-                                    break;
-                                }
-                            }
-                        }
-                        if (hasTypeParameter && typeParametersAreEqual) {
-                            errorInfo = saveErrorInfo;
-                            return Ternary.True;
-                        }
-                    }
-                    else if (target.flags & TypeFlags.Spread) {
-                        const sourceParameters = filter((source as SpreadType).types, t => !!(t.flags & TypeFlags.TypeParameter));
-                        const targetParameters = filter((target as SpreadType).types, t => !!(t.flags & TypeFlags.TypeParameter));
-                        if (sourceParameters.length !== targetParameters.length) {
+                    // you only see this for spreads with type parameters (TODO: and unions/intersections)
+                    if (target.flags & TypeFlags.Spread) {
+                        if (!(spreadTypeRelatedTo(source as SpreadType, target as SpreadType))) {
                             reportRelationError(headMessage, source, target);
                             return Ternary.False;
                         }
-                        for (let i = 0; i < sourceParameters.length; i++) {
-                            if (sourceParameters[i].symbol !== targetParameters[i].symbol) {
-                                reportRelationError(headMessage, source, target);
-                                return Ternary.False;
-                            }
-                        }
                         const reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo;
-                        if (result = objectTypeRelatedTo(source, source, target, reportStructuralErrors)) {
+                        const apparentSource = getApparentType(source);
+                        if (result = objectTypeRelatedTo(apparentSource, source, getApparentType(target), reportStructuralErrors)) {
                             errorInfo = saveErrorInfo;
                             return result;
                         }
@@ -6815,6 +6819,13 @@ namespace ts {
                 }
 
                 if (source.flags & TypeFlags.TypeParameter) {
+                    if (target.flags & TypeFlags.Spread) {
+                        // T is assignable to ...T
+                        if (source.symbol === (target as SpreadType).right.symbol
+                            && (target as SpreadType).left === emptyObjectType) {
+                            return Ternary.True;
+                        }
+                    }
                     let constraint = getConstraintOfTypeParameter(<TypeParameter>source);
 
                     if (!constraint || constraint.flags & TypeFlags.Any) {
@@ -6844,7 +6855,7 @@ namespace ts {
                     // In a check of the form X = A & B, we will have previously checked if A relates to X or B relates
                     // to X. Failing both of those we want to check if the aggregation of A and B's members structurally
                     // relates to X. Thus, we include intersection types on the source side here.
-                    if (apparentSource.flags & (TypeFlags.ObjectType | TypeFlags.Intersection | TypeFlags.Spread) && target.flags & TypeFlags.ObjectType) {
+                    if (apparentSource.flags & (TypeFlags.ObjectType | TypeFlags.Intersection) && target.flags & TypeFlags.ObjectType) {
                         // Report structural errors only if we haven't reported any errors yet
                         const reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo && !(source.flags & TypeFlags.Primitive);
                         if (result = objectTypeRelatedTo(apparentSource, source, target, reportStructuralErrors)) {
@@ -6866,6 +6877,43 @@ namespace ts {
                 return Ternary.False;
             }
 
+            function spreadTypeRelatedTo(source: SpreadType, target: SpreadType): boolean {
+                // (Spread ... Object) | (Spread | Object ... TypeParameter)
+                // in other words, if the right side is Object, then the left side must be a Spread.
+                if (source.right.flags & TypeFlags.ObjectType &&
+                    target.right.flags & TypeFlags.ObjectType) {
+                    return spreadTypeRelatedTo(source.left as SpreadType, target.left as SpreadType);
+                }
+                if (source.right.flags & TypeFlags.ObjectType) {
+                    /// target.right is TypeParameter, skip source.right, but keep looking at target
+                    return spreadTypeRelatedTo(source.left as SpreadType, target);
+                }
+                if (target.right.flags & TypeFlags.ObjectType) {
+                    /// source.right is TypeParameter, skip target.right, but keep looking at source
+                    return spreadTypeRelatedTo(source, target.left as SpreadType);
+                }
+                else {
+                    // both rights are type parameters, so they must be identical
+                    // and both lefts must be the same:
+                    // if one left is object and the other is spread, that means the second has another type parameter. which isn't allowed
+                    if (target.right.symbol !== source.right.symbol) {
+                        return false;
+                    }
+                    if (source.left.flags & TypeFlags.Spread && target.left.flags & TypeFlags.Spread) {
+                        return spreadTypeRelatedTo(source.left as SpreadType, target.left as SpreadType);
+                    }
+                    else if (source.left.flags & TypeFlags.ObjectType && target.left.flags & TypeFlags.ObjectType) {
+                        return true; // let structural compatibility figure it out later
+                    }
+                    else {
+                        // one side is a spread, so it must have more type parameters, which will not be matched by the other side
+                        // return false immediately instead of descending to find this out.
+                        return false;
+                    }
+                }
+
+            }
+
             function isIdenticalTo(source: Type, target: Type): Ternary {
                 let result: Ternary;
                 if (source.flags & TypeFlags.ObjectType && target.flags & TypeFlags.ObjectType) {
@@ -10558,7 +10606,7 @@ namespace ts {
 
             let propertiesTable = createMap<Symbol>();
             let propertiesArray: Symbol[] = [];
-            const spreads: SpreadElementType[] = [];
+            const spreads: Type[] = [];
             const contextualType = getApparentTypeOfContextualType(node);
             const contextualTypeHasPattern = contextualType && contextualType.pattern &&
                 (contextualType.pattern.kind === SyntaxKind.ObjectBindingPattern || contextualType.pattern.kind === SyntaxKind.ObjectLiteralExpression);
@@ -10631,15 +10679,13 @@ namespace ts {
                 }
                 else if (memberDecl.kind === SyntaxKind.SpreadElementExpression) {
                     if (propertiesArray.length > 0) {
-                        const t = createObjectLiteralType() as SpreadElementType;
-                        t.isDeclaredProperty = true;
-                        spreads.push(t);
+                        spreads.push(createObjectLiteralType());
                         propertiesArray = [];
                         propertiesTable = createMap<Symbol>();
                         hasComputedStringProperty = false;
                         hasComputedNumberProperty = false;
                     }
-                    spreads.push(checkExpression((memberDecl as SpreadElementExpression).expression) as SpreadElementType);
+                    spreads.push(checkExpression((memberDecl as SpreadElementExpression).expression));
                     continue;
                 }
                 else {
@@ -10683,17 +10729,16 @@ namespace ts {
 
             if (spreads.length > 0) {
                 if (propertiesArray.length > 0) {
-                    const t = createObjectLiteralType() as SpreadElementType;
-                    t.isDeclaredProperty = true;
-                    spreads.push(t);
+                    spreads.push(createObjectLiteralType());
                 }
                 const propagatedFlags = getPropagatingFlagsOfTypes(spreads, /*excludeKinds*/ TypeFlags.Nullable);
-                const spread = getSpreadType(spreads, node.symbol);
+                const spread = getSpreadType(spreads, node.symbol, undefined, undefined);
                 spread.flags |= propagatedFlags;
                 return spread;
             }
 
             return createObjectLiteralType();
+
             function createObjectLiteralType() {
                 const stringIndexInfo = hasComputedStringProperty ? getObjectLiteralIndexInfo(node, propertiesArray, IndexKind.String) : undefined;
                 const numberIndexInfo = hasComputedNumberProperty ? getObjectLiteralIndexInfo(node, propertiesArray, IndexKind.Number) : undefined;
@@ -10708,7 +10753,6 @@ namespace ts {
                 }
                 return result;
             }
-
        }
 
         function checkJsxSelfClosingElement(node: JsxSelfClosingElement) {
@@ -18943,15 +18987,22 @@ namespace ts {
 
         function getRootSymbols(symbol: Symbol): Symbol[] {
             if (symbol.flags & SymbolFlags.SyntheticProperty) {
-                const symbols: Symbol[] = [];
-                const name = symbol.name;
-                forEach(getSymbolLinks(symbol).containingType.types, t => {
-                    const symbol = getPropertyOfType(t, name);
-                    if (symbol) {
-                        symbols.push(symbol);
-                    }
-                });
-                return symbols;
+                if (symbol.syntheticKind === SyntheticSymbolKind.Spread) {
+                    const name = symbol.name;
+                    const links = getSymbolLinks(symbol);
+                    return [links.leftSpread, links.rightSpread];
+                }
+                else {
+                    const symbols: Symbol[] = [];
+                    const name = symbol.name;
+                    forEach(getSymbolLinks(symbol).containingType.types, t => {
+                        const symbol = getPropertyOfType(t, name);
+                        if (symbol) {
+                            symbols.push(symbol);
+                        }
+                    });
+                    return symbols;
+                }
             }
             else if (symbol.flags & SymbolFlags.Transient) {
                 let target: Symbol;
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 685b94f9d8e..75aaf03f08b 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -2318,6 +2318,12 @@ namespace ts {
         CannotBeNamed
     }
 
+    /* @internal */
+    export const enum SyntheticSymbolKind {
+        UnionOrIntersection,
+        Spread
+    }
+
     export const enum TypePredicateKind {
         This,
         Identifier
@@ -2442,7 +2448,7 @@ namespace ts {
         Merged                  = 0x02000000,  // Merged symbol (created during program binding)
         Transient               = 0x04000000,  // Transient symbol (created during type check)
         Prototype               = 0x08000000,  // Prototype property (no source representation)
-        SyntheticProperty       = 0x10000000,  // Property in union or intersection type
+        SyntheticProperty       = 0x10000000,  // Property in union, intersection or spread type
         Optional                = 0x20000000,  // Optional property
         ExportStar              = 0x40000000,  // Export * declaration
 
@@ -2517,6 +2523,7 @@ namespace ts {
         /* @internal */ isReferenced?: boolean; // True if the symbol is referenced elsewhere
         /* @internal */ isReplaceableByMethod?: boolean; // Can this Javascript class property be replaced by a method symbol?
         /* @internal */ isAssigned?: boolean;   // True if the symbol is a parameter with assignments
+        /* @internal */ syntheticKind?: SyntheticSymbolKind; // Synthetic symbols are either spread or union/intersection
     }
 
     /* @internal */
@@ -2530,6 +2537,8 @@ namespace ts {
         mapper?: TypeMapper;                // Type mapper for instantiation alias
         referenced?: boolean;               // True if alias symbol has been referenced as a value
         containingType?: TypeOperatorType;  // Containing union or intersection type for synthetic property
+        leftSpread?: Symbol;                // Left source for synthetic spread property
+        rightSpread?: Symbol;               // Right source for synthetic spread property
         hasNonUniformType?: boolean;        // True if constituents have non-uniform types
         isPartial?: boolean;                // True if syntheric property of union type occurs in some but not all constituents
         isDiscriminantProperty?: boolean;   // True if discriminant synthetic property
@@ -2759,13 +2768,9 @@ namespace ts {
     export interface IntersectionType extends TypeOperatorType { }
 
     /* @internal */
-    export interface SpreadType extends TypeOperatorType {
-        types: SpreadElementType[];       // Constituent types
-    }
-
-    /* @internal */
-    export interface SpreadElementType extends ResolvedType {
-        isDeclaredProperty?: boolean;
+    export interface SpreadType extends Type {
+        left: SpreadType | ResolvedType;
+        right: TypeParameter | ResolvedType;
     }
 
     /* @internal */

From 98720755bdb0f6858905d32ed149a2a85cafe7b2 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Fri, 7 Oct 2016 08:58:50 -0700
Subject: [PATCH 020/421] Spread type:new assignability+simplification tests

---
 .../conformance/types/spread/objectSpreadGeneric.ts | 13 ++++++-------
 .../types/spread/objectSpreadNegative.ts            |  7 +++----
 .../types/spread/objectSpreadScenarios.ts           |  2 +-
 tests/cases/fourslash/findAllRefsForObjectSpread.ts |  2 +-
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/tests/cases/conformance/types/spread/objectSpreadGeneric.ts b/tests/cases/conformance/types/spread/objectSpreadGeneric.ts
index a6919ce8149..e3bd1ab7bb3 100644
--- a/tests/cases/conformance/types/spread/objectSpreadGeneric.ts
+++ b/tests/cases/conformance/types/spread/objectSpreadGeneric.ts
@@ -1,13 +1,12 @@
 function f<T, U, V>(t: T, u: U, v: V): void {
     let o: { ...T, ...U, ...V };
-    let uu: { ...U, ...U};
-    let u: { ...U };
-    let u0: U;
-    uu = u; // ok, multiple spreads are equivalent to a single one
-    u = uu; // ok, multiple spreads are equivalent to a single one
-    u0 = u; // error, might be missing a ton of stuff
-    u = u0; // ok, type has at least all the properties of the spread
+    let uus: { ...U, ...U};
+    let us: { ...U };
     const same: { ...T, ...U, ...V } = o; // ok
+    uus = us; // ok, multiple spreads are equivalent to a single one
+    us = uus; // ok, multiple spreads are equivalent to a single one
+    us = u;   // ok, type has at least all the properties of the spread
+    u = us;   // error, might be missing a ton of stuff
     const reversed: { ...V, ...U, ...T } = o; // error, reversed
     const reversed2: { ...U, ...T, ...V } = o; // error, U and T are still reversed
     const missingT: { ...U, ...V } = o; // error, missing T
diff --git a/tests/cases/conformance/types/spread/objectSpreadNegative.ts b/tests/cases/conformance/types/spread/objectSpreadNegative.ts
index 4d1cfbe398c..d492db4c638 100644
--- a/tests/cases/conformance/types/spread/objectSpreadNegative.ts
+++ b/tests/cases/conformance/types/spread/objectSpreadNegative.ts
@@ -8,10 +8,8 @@ class PrivateOptionalX {
 class PublicX {
     public x: number;
 }
-let privateOptionalx: PrivateOptionalX;
-let publicx: PublicX;
-let o3 = { ...publicx, ...privateOptionalx };
-let sn: string | number = o3.x; // error, x is private
+let o3: { ...PublicX, ...PrivateOptionalX };
+let sn: number = o3.x; // error, x is private
 let optionalString: { sn?: string };
 let optionalNumber: { sn?: number };
 let allOptional: { sn: string | number } = { ...optionalString, ...optionalNumber };
@@ -46,6 +44,7 @@ let callableConstructableSpread: { ...PublicX, (n: number): number, new (p: numb
 callableConstructableSpread(12); // error, no call signature
 new callableConstructableSpread(12); // error, no construct signature
 
+let publicx: PublicX;
 let callableSpread = { ...publicx, ...(n => n + 1) }; // error, can't spread functions
 
 // { ...U } is not assignable to U
diff --git a/tests/cases/conformance/types/spread/objectSpreadScenarios.ts b/tests/cases/conformance/types/spread/objectSpreadScenarios.ts
index c80cffa44e7..1db930cb71c 100644
--- a/tests/cases/conformance/types/spread/objectSpreadScenarios.ts
+++ b/tests/cases/conformance/types/spread/objectSpreadScenarios.ts
@@ -3,7 +3,7 @@ interface B1 { b: number };
 function override<U>(initial: U, override: U): { ...U, ...U } {
     return { ...initial, ...override };
 }
-function update<U>(this: { u: U }, override: U): void {
+function update<U>(this: { u: { ...U } }, override: U): void {
     this.u = { ...this.u, ...override };
 }
 function mixin<T, U>(one: T, two: U): { ...T, ...U } {
diff --git a/tests/cases/fourslash/findAllRefsForObjectSpread.ts b/tests/cases/fourslash/findAllRefsForObjectSpread.ts
index fe0a7f9c201..650324a5d84 100644
--- a/tests/cases/fourslash/findAllRefsForObjectSpread.ts
+++ b/tests/cases/fourslash/findAllRefsForObjectSpread.ts
@@ -1,6 +1,6 @@
 /// <reference path='fourslash.ts'/>
 
-////interface A1 { [|a|]: number };
+////interface A1 { [|a|]: string };
 ////interface A2 { [|a|]?: number };
 ////let a12: { ...A1, ...A2 };
 ////a12.[|a|];

From df735795e53821575488dcc5d6cf95f1ef96b63a Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Fri, 7 Oct 2016 08:59:46 -0700
Subject: [PATCH 021/421] Update baselines

---
 tests/baselines/reference/objectSpread.types  | 72 +++++++++----------
 .../reference/objectSpreadGeneric.errors.txt  | 43 ++++++-----
 .../reference/objectSpreadGeneric.js          | 12 ++++
 .../objectSpreadIndexSignature.types          | 16 ++---
 .../reference/objectSpreadNegative.errors.txt | 67 +++++++++--------
 .../reference/objectSpreadNegative.js         | 21 ++++--
 .../reference/objectSpreadScenarios.js        |  2 +-
 .../reference/objectSpreadScenarios.symbols   |  4 +-
 .../reference/objectSpreadScenarios.types     | 50 ++++++-------
 ...ariableDeclarationInStrictMode1.errors.txt |  2 +-
 10 files changed, 164 insertions(+), 125 deletions(-)

diff --git a/tests/baselines/reference/objectSpread.types b/tests/baselines/reference/objectSpread.types
index 1a053a22670..86d04eb4588 100644
--- a/tests/baselines/reference/objectSpread.types
+++ b/tests/baselines/reference/objectSpread.types
@@ -31,7 +31,7 @@ let addAfter: { a: number, b: string, c: boolean } =
 >c : boolean
 
     { ...o, c: false }
->{ ...o, c: false } : { ...{ a: number; b: string; }; c: false; }
+>{ ...o, c: false } : { c: false; a: number; b: string; }
 >o : any
 >c : boolean
 >false : false
@@ -43,7 +43,7 @@ let addBefore: { a: number, b: string, c: boolean } =
 >c : boolean
 
     { c: false, ...o }
->{ c: false, ...o } : { c: false; ...{ a: number; b: string; } }
+>{ c: false, ...o } : { a: number; b: string; c: false; }
 >c : boolean
 >false : false
 >o : any
@@ -55,7 +55,7 @@ let ignore: { a: number, b: string } =
 >b : string
 
     { b: 'ignored', ...o }
->{ b: 'ignored', ...o } : { b: string; ...{ a: number; b: string; } }
+>{ b: 'ignored', ...o } : { a: number; b: string; }
 >b : string
 >'ignored' : "ignored"
 >o : any
@@ -66,7 +66,7 @@ let override: { a: number, b: string } =
 >b : string
 
     { ...o, b: 'override' }
->{ ...o, b: 'override' } : { ...{ a: number; b: string; }; b: string; }
+>{ ...o, b: 'override' } : { b: string; a: number; }
 >o : any
 >b : string
 >'override' : "override"
@@ -78,8 +78,8 @@ let nested: { a: number, b: boolean, c: string } =
 >c : string
 
     { ...{ a: 3, ...{ b: false, c: 'overriden' } }, c: 'whatever' }
->{ ...{ a: 3, ...{ b: false, c: 'overriden' } }, c: 'whatever' } : { ...{ a: number; ...{ b: boolean; c: string; } }; c: string; }
->{ a: 3, ...{ b: false, c: 'overriden' } } : { a: number; ...{ b: boolean; c: string; } }
+>{ ...{ a: 3, ...{ b: false, c: 'overriden' } }, c: 'whatever' } : { c: string; b: boolean; a: number; }
+>{ a: 3, ...{ b: false, c: 'overriden' } } : { b: boolean; c: string; a: number; }
 >a : number
 >3 : 3
 >{ b: false, c: 'overriden' } : { b: boolean; c: string; }
@@ -97,7 +97,7 @@ let combined: { a: number, b: string, c: boolean } =
 >c : boolean
 
     { ...o, ...o2 }
->{ ...o, ...o2 } : { ...{ a: number; b: string; }; ...{ b: string; c: boolean; } }
+>{ ...o, ...o2 } : { b: string; c: boolean; a: number; }
 >o : any
 >o2 : any
 
@@ -108,7 +108,7 @@ let combinedBefore: { a: number, b: string, c: boolean } =
 >c : boolean
 
     { b: 'ok', ...o, ...o2 }
->{ b: 'ok', ...o, ...o2 } : { b: string; ...{ a: number; b: string; }; ...{ b: string; c: boolean; } }
+>{ b: 'ok', ...o, ...o2 } : { b: string; c: boolean; a: number; }
 >b : string
 >'ok' : "ok"
 >o : any
@@ -121,7 +121,7 @@ let combinedMid: { a: number, b: string, c: boolean } =
 >c : boolean
 
     { ...o, b: 'ok', ...o2 }
->{ ...o, b: 'ok', ...o2 } : { ...{ a: number; b: string; }; b: string; ...{ b: string; c: boolean; } }
+>{ ...o, b: 'ok', ...o2 } : { b: string; c: boolean; a: number; }
 >o : any
 >b : string
 >'ok' : "ok"
@@ -134,7 +134,7 @@ let combinedAfter: { a: number, b: string, c: boolean } =
 >c : boolean
 
     { ...o, ...o2, b: 'ok' }
->{ ...o, ...o2, b: 'ok' } : { ...{ a: number; b: string; }; ...{ b: string; c: boolean; }; b: string; }
+>{ ...o, ...o2, b: 'ok' } : { b: string; c: boolean; a: number; }
 >o : any
 >o2 : any
 >b : string
@@ -148,8 +148,8 @@ let combinedNested: { a: number, b: boolean, c: string, d: string } =
 >d : string
 
     { ...{ a: 4, ...{ b: false, c: 'overriden' } }, d: 'actually new', ...{ a: 5, d: 'maybe new' } }
->{ ...{ a: 4, ...{ b: false, c: 'overriden' } }, d: 'actually new', ...{ a: 5, d: 'maybe new' } } : { ...{ a: number; ...{ b: boolean; c: string; } }; d: string; ...{ a: number; d: string; } }
->{ a: 4, ...{ b: false, c: 'overriden' } } : { a: number; ...{ b: boolean; c: string; } }
+>{ ...{ a: 4, ...{ b: false, c: 'overriden' } }, d: 'actually new', ...{ a: 5, d: 'maybe new' } } : { a: number; d: string; b: boolean; c: string; }
+>{ a: 4, ...{ b: false, c: 'overriden' } } : { b: boolean; c: string; a: number; }
 >a : number
 >4 : 4
 >{ b: false, c: 'overriden' } : { b: boolean; c: string; }
@@ -172,8 +172,8 @@ let combinedNestedChangeType: { a: number, b: boolean, c: number } =
 >c : number
 
     { ...{ a: 1, ...{ b: false, c: 'overriden' } }, c: -1 }
->{ ...{ a: 1, ...{ b: false, c: 'overriden' } }, c: -1 } : { ...{ a: number; ...{ b: boolean; c: string; } }; c: number; }
->{ a: 1, ...{ b: false, c: 'overriden' } } : { a: number; ...{ b: boolean; c: string; } }
+>{ ...{ a: 1, ...{ b: false, c: 'overriden' } }, c: -1 } : { c: number; b: boolean; a: number; }
+>{ a: 1, ...{ b: false, c: 'overriden' } } : { b: boolean; c: string; a: number; }
 >a : number
 >1 : 1
 >{ b: false, c: 'overriden' } : { b: boolean; c: string; }
@@ -192,9 +192,9 @@ let propertyNested: { a: { a: number, b: string } } =
 >b : string
 
     { a: { ... o } }
->{ a: { ... o } } : { a: { ...{ a: number; b: string; } }; }
->a : { ...{ a: number; b: string; } }
->{ ... o } : { ...{ a: number; b: string; } }
+>{ a: { ... o } } : { a: { a: number; b: string; }; }
+>a : { a: number; b: string; }
+>{ ... o } : { a: number; b: string; }
 >o : any
 
 // accessors don't copy the descriptor
@@ -211,7 +211,7 @@ let getter: { a: number, c: number } =
 >c : number
 
     { ...op, c: 7 }
->{ ...op, c: 7 } : { ...{ readonly a: number; }; c: number; }
+>{ ...op, c: 7 } : { c: number; readonly a: number; }
 >op : any
 >c : number
 >7 : 7
@@ -260,7 +260,7 @@ let c: C = new C()
 let spreadC: { p: number } = { ...c }
 >spreadC : { p: number; }
 >p : number
->{ ...c } : { ...C }
+>{ ...c } : { p: number; }
 >c : any
 
 // own methods are enumerable
@@ -268,7 +268,7 @@ let cplus: { p: number, plus(): void } = { ...c, plus() { return this.p + 1; } }
 >cplus : { p: number; plus(): void; }
 >p : number
 >plus : () => void
->{ ...c, plus() { return this.p + 1; } } : { ...C; plus(): any; }
+>{ ...c, plus() { return this.p + 1; } } : { plus(): any; p: number; }
 >c : any
 >plus : () => any
 >this.p + 1 : any
@@ -290,7 +290,7 @@ let changeTypeAfter: { a: string, b: string } =
 >b : string
 
     { ...o, a: 'wrong type?' }
->{ ...o, a: 'wrong type?' } : { ...{ a: number; b: string; }; a: string; }
+>{ ...o, a: 'wrong type?' } : { a: string; b: string; }
 >o : any
 >a : string
 >'wrong type?' : "wrong type?"
@@ -301,7 +301,7 @@ let changeTypeBefore: { a: number, b: string } =
 >b : string
 
     { a: 'wrong type?', ...o };
->{ a: 'wrong type?', ...o } : { a: string; ...{ a: number; b: string; } }
+>{ a: 'wrong type?', ...o } : { a: number; b: string; }
 >a : string
 >'wrong type?' : "wrong type?"
 >o : any
@@ -312,7 +312,7 @@ let changeTypeBoth: { a: string, b: number } =
 >b : number
 
     { ...o, ...swap };
->{ ...o, ...swap } : { ...{ a: number; b: string; }; ...{ a: string; b: number; } }
+>{ ...o, ...swap } : { a: string; b: number; }
 >o : any
 >swap : any
 
@@ -336,7 +336,7 @@ let optionalNumber: { sn?: number };
 let optionalUnionStops: { sn: string | number | boolean } = { ...definiteBoolean, ...definiteString, ...optionalNumber };
 >optionalUnionStops : { sn: string | number | boolean; }
 >sn : string | number | boolean
->{ ...definiteBoolean, ...definiteString, ...optionalNumber } : { ...{ sn: boolean; }; ...{ sn: string; }; ...{ sn?: number; } }
+>{ ...definiteBoolean, ...definiteString, ...optionalNumber } : { sn: string | number; }
 >definiteBoolean : any
 >definiteString : any
 >optionalNumber : any
@@ -344,7 +344,7 @@ let optionalUnionStops: { sn: string | number | boolean } = { ...definiteBoolean
 let optionalUnionDuplicates: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...optionalString, ...optionalNumber };
 >optionalUnionDuplicates : { sn: string | number; }
 >sn : string | number
->{ ...definiteBoolean, ...definiteString, ...optionalString, ...optionalNumber } : { ...{ sn: boolean; }; ...{ sn: string; }; ...{ sn?: string; }; ...{ sn?: number; } }
+>{ ...definiteBoolean, ...definiteString, ...optionalString, ...optionalNumber } : { sn: string | number; }
 >definiteBoolean : any
 >definiteString : any
 >optionalString : any
@@ -353,7 +353,7 @@ let optionalUnionDuplicates: { sn: string | number } = { ...definiteBoolean, ...
 let allOptional: { sn?: string | number } = { ...optionalString, ...optionalNumber };
 >allOptional : { sn?: string | number; }
 >sn : string | number
->{ ...optionalString, ...optionalNumber } : { ...{ sn?: string; }; ...{ sn?: number; } }
+>{ ...optionalString, ...optionalNumber } : { sn?: string | number; }
 >optionalString : any
 >optionalNumber : any
 
@@ -364,7 +364,7 @@ let computedFirst: { a: number, b: string, "before everything": number } =
 >b : string
 
     { ['before everything']: 12, ...o, b: 'yes' }
->{ ['before everything']: 12, ...o, b: 'yes' } : { ['before everything']: number; ...{ a: number; b: string; }; b: string; }
+>{ ['before everything']: 12, ...o, b: 'yes' } : { b: string; a: number; ['before everything']: number; }
 >'before everything' : "before everything"
 >12 : 12
 >o : any
@@ -378,7 +378,7 @@ let computedMiddle: { a: number, b: string, c: boolean, "in the middle": number
 >c : boolean
 
     { ...o, ['in the middle']: 13, b: 'maybe?', ...o2 }
->{ ...o, ['in the middle']: 13, b: 'maybe?', ...o2 } : { ...{ a: number; b: string; }; ['in the middle']: number; b: string; ...{ b: string; c: boolean; } }
+>{ ...o, ['in the middle']: 13, b: 'maybe?', ...o2 } : { b: string; c: boolean; ['in the middle']: number; a: number; }
 >o : any
 >'in the middle' : "in the middle"
 >13 : 13
@@ -392,7 +392,7 @@ let computedAfter: { a: number, b: string, "at the end": number } =
 >b : string
 
     { ...o, b: 'yeah', ['at the end']: 14 }
->{ ...o, b: 'yeah', ['at the end']: 14 } : { ...{ a: number; b: string; }; b: string; ['at the end']: number; }
+>{ ...o, b: 'yeah', ['at the end']: 14 } : { b: string; ['at the end']: number; a: number; }
 >o : any
 >b : string
 >'yeah' : "yeah"
@@ -408,7 +408,7 @@ let shortCutted: { a: number, b: string } = { ...o, a }
 >shortCutted : { a: number; b: string; }
 >a : number
 >b : string
->{ ...o, a } : { ...{ a: number; b: string; }; a: number; }
+>{ ...o, a } : { a: number; b: string; }
 >o : any
 >a : number
 
@@ -441,7 +441,7 @@ let exclusive: { id: string, a: number, b: string, c: string, d: boolean } =
 >d : boolean
 
     f({ a: 1, b: 'yes' }, { c: 'no', d: false })
->f({ a: 1, b: 'yes' }, { c: 'no', d: false }) : { id: string; ...{ a: number; b: string; }; ...{ c: string; d: boolean; } }
+>f({ a: 1, b: 'yes' }, { c: 'no', d: false }) : { c: string; d: boolean; a: number; b: string; id: string; }
 >f : <T, U>(t: T, u: U) => { id: string; ...T; ...U }
 >{ a: 1, b: 'yes' } : { a: number; b: string; }
 >a : number
@@ -461,7 +461,7 @@ let overlap: { id: string, a: number, b: string } =
 >b : string
 
     f({ a: 1 }, { a: 2, b: 'extra' })
->f({ a: 1 }, { a: 2, b: 'extra' }) : { id: string; ...{ a: number; }; ...{ a: number; b: string; } }
+>f({ a: 1 }, { a: 2, b: 'extra' }) : { a: number; b: string; id: string; }
 >f : <T, U>(t: T, u: U) => { id: string; ...T; ...U }
 >{ a: 1 } : { a: number; }
 >a : number
@@ -478,7 +478,7 @@ let overlapConflict: { id:string, a: string } =
 >a : string
 
     f({ a: 1 }, { a: 'mismatch' })
->f({ a: 1 }, { a: 'mismatch' }) : { id: string; ...{ a: number; }; ...{ a: string; } }
+>f({ a: 1 }, { a: 'mismatch' }) : { a: string; id: string; }
 >f : <T, U>(t: T, u: U) => { id: string; ...T; ...U }
 >{ a: 1 } : { a: number; }
 >a : number
@@ -495,7 +495,7 @@ let overwriteId: { id: boolean, a: number, c: number, d: string } =
 >d : string
 
     f({ a: 1, id: true }, { c: 1, d: 'no' })
->f({ a: 1, id: true }, { c: 1, d: 'no' }) : { id: string; ...{ a: number; id: boolean; }; ...{ c: number; d: string; } }
+>f({ a: 1, id: true }, { c: 1, d: 'no' }) : { c: number; d: string; a: number; id: boolean; }
 >f : <T, U>(t: T, u: U) => { id: string; ...T; ...U }
 >{ a: 1, id: true } : { a: number; id: true; }
 >a : number
@@ -515,13 +515,13 @@ class D { m() { }; q = 2; }
 >2 : 2
 
 let classesAreWrong: { id: string, ...C, ...D } =
->classesAreWrong : { id: string; ...C; ...D }
+>classesAreWrong : { q: number; p: number; id: string; }
 >id : string
 >C : C
 >D : D
 
     f(new C(), new D())
->f(new C(), new D()) : { id: string; ...C; ...D }
+>f(new C(), new D()) : { q: number; p: number; id: string; }
 >f : <T, U>(t: T, u: U) => { id: string; ...T; ...U }
 >new C() : C
 >C : typeof C
diff --git a/tests/baselines/reference/objectSpreadGeneric.errors.txt b/tests/baselines/reference/objectSpreadGeneric.errors.txt
index 16dfc835d26..6e55040f223 100644
--- a/tests/baselines/reference/objectSpreadGeneric.errors.txt
+++ b/tests/baselines/reference/objectSpreadGeneric.errors.txt
@@ -1,22 +1,31 @@
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(4,11): error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...V; ...U; ...T }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(5,11): error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...U; ...T; ...V }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(6,11): error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...U; ...V }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(7,11): error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...T; ...V }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(8,11): error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...T; ...U }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(13,11): error TS2322: Type '{}' is not assignable to type '{ ...T; ...U }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(26,11): error TS2322: Type '{ first: string; ...T; second: string; ...U; third: string; }' is not assignable to type '{ first: string; second: string; ...T; third: string; }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(34,11): error TS2322: Type '{ firrrrrrst: string; ...T; second: string; ...U; third: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
-  Property 'first' is missing in type '{ firrrrrrst: string; ...T; second: string; ...U; third: string; }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(36,11): error TS2322: Type '{ first: string; ...T; ssssssssecond: string; ...U; third: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
-  Property 'second' is missing in type '{ first: string; ...T; ssssssssecond: string; ...U; third: string; }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(38,11): error TS2322: Type '{ first: string; ...T; second: string; ...U; thirrrrrrrd: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
-  Property 'third' is missing in type '{ first: string; ...T; second: string; ...U; thirrrrrrrd: string; }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(9,5): error TS2322: Type '{ ...U }' is not assignable to type 'U'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(10,11): error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...V; ...U; ...T }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(11,11): error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...U; ...T; ...V }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(12,11): error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...U; ...V }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(13,11): error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...T; ...V }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(14,11): error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...T; ...U }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(19,11): error TS2322: Type '{}' is not assignable to type '{ ...T; ...U }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(32,11): error TS2322: Type '{ first: string; ...T; second: string; ...U; third: string; }' is not assignable to type '{ first: string; second: string; ...T; third: string; }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(40,11): error TS2322: Type '{ firrrrrrst: string; ...T; second: string; ...U; third: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
+  Property 'first' is missing in type '{ third: string; second: string; firrrrrrst: string; }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(42,11): error TS2322: Type '{ first: string; ...T; ssssssssecond: string; ...U; third: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
+  Property 'second' is missing in type '{ third: string; ssssssssecond: string; first: string; }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(44,11): error TS2322: Type '{ first: string; ...T; second: string; ...U; thirrrrrrrd: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
+  Property 'third' is missing in type '{ thirrrrrrrd: string; second: string; first: string; }'.
 
 
-==== tests/cases/conformance/types/spread/objectSpreadGeneric.ts (10 errors) ====
+==== tests/cases/conformance/types/spread/objectSpreadGeneric.ts (11 errors) ====
     function f<T, U, V>(t: T, u: U, v: V): void {
         let o: { ...T, ...U, ...V };
+        let uus: { ...U, ...U};
+        let us: { ...U };
         const same: { ...T, ...U, ...V } = o; // ok
+        uus = us; // ok, multiple spreads are equivalent to a single one
+        us = uus; // ok, multiple spreads are equivalent to a single one
+        us = u;   // ok, type has at least all the properties of the spread
+        u = us;   // error, might be missing a ton of stuff
+        ~
+!!! error TS2322: Type '{ ...U }' is not assignable to type 'U'.
         const reversed: { ...V, ...U, ...T } = o; // error, reversed
               ~~~~~~~~
 !!! error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...V; ...U; ...T }'.
@@ -64,17 +73,17 @@ tests/cases/conformance/types/spread/objectSpreadGeneric.ts(38,11): error TS2322
         const mismatchFirst: { first: string, ...T, second: string, ...U, third: string } =
               ~~~~~~~~~~~~~
 !!! error TS2322: Type '{ firrrrrrst: string; ...T; second: string; ...U; third: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
-!!! error TS2322:   Property 'first' is missing in type '{ firrrrrrst: string; ...T; second: string; ...U; third: string; }'.
+!!! error TS2322:   Property 'first' is missing in type '{ third: string; second: string; firrrrrrst: string; }'.
             { firrrrrrst: '1', ...t, second: '2', ...u, third: '3' }; // error, 'first' not found
         const mismatchSecond: { first: string, ...T, second: string, ...U, third: string } =
               ~~~~~~~~~~~~~~
 !!! error TS2322: Type '{ first: string; ...T; ssssssssecond: string; ...U; third: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
-!!! error TS2322:   Property 'second' is missing in type '{ first: string; ...T; ssssssssecond: string; ...U; third: string; }'.
+!!! error TS2322:   Property 'second' is missing in type '{ third: string; ssssssssecond: string; first: string; }'.
             { first: '1', ...t, ssssssssecond: '2', ...u, third: '3' }; // error, 'second' not found
         const mismatchLast: { first: string, ...T, second: string, ...U, third: string } =
               ~~~~~~~~~~~~
 !!! error TS2322: Type '{ first: string; ...T; second: string; ...U; thirrrrrrrd: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
-!!! error TS2322:   Property 'third' is missing in type '{ first: string; ...T; second: string; ...U; thirrrrrrrd: string; }'.
+!!! error TS2322:   Property 'third' is missing in type '{ thirrrrrrrd: string; second: string; first: string; }'.
             { first: '1', ...t, second: '2', ...u, thirrrrrrrd: '3' }; // error, 'third' not found
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/objectSpreadGeneric.js b/tests/baselines/reference/objectSpreadGeneric.js
index 593ab73f98f..9414b9ef76e 100644
--- a/tests/baselines/reference/objectSpreadGeneric.js
+++ b/tests/baselines/reference/objectSpreadGeneric.js
@@ -1,7 +1,13 @@
 //// [objectSpreadGeneric.ts]
 function f<T, U, V>(t: T, u: U, v: V): void {
     let o: { ...T, ...U, ...V };
+    let uus: { ...U, ...U};
+    let us: { ...U };
     const same: { ...T, ...U, ...V } = o; // ok
+    uus = us; // ok, multiple spreads are equivalent to a single one
+    us = uus; // ok, multiple spreads are equivalent to a single one
+    us = u;   // ok, type has at least all the properties of the spread
+    u = us;   // error, might be missing a ton of stuff
     const reversed: { ...V, ...U, ...T } = o; // error, reversed
     const reversed2: { ...U, ...T, ...V } = o; // error, U and T are still reversed
     const missingT: { ...U, ...V } = o; // error, missing T
@@ -52,7 +58,13 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
 };
 function f(t, u, v) {
     var o;
+    var uus;
+    var us;
     var same = o; // ok
+    uus = us; // ok, multiple spreads are equivalent to a single one
+    us = uus; // ok, multiple spreads are equivalent to a single one
+    us = u; // ok, type has at least all the properties of the spread
+    u = us; // error, might be missing a ton of stuff
     var reversed = o; // error, reversed
     var reversed2 = o; // error, U and T are still reversed
     var missingT = o; // error, missing T
diff --git a/tests/baselines/reference/objectSpreadIndexSignature.types b/tests/baselines/reference/objectSpreadIndexSignature.types
index 9a31b0c4451..6e9ba881db1 100644
--- a/tests/baselines/reference/objectSpreadIndexSignature.types
+++ b/tests/baselines/reference/objectSpreadIndexSignature.types
@@ -9,7 +9,7 @@ class C {
 >c : boolean
 }
 let c: { ...C, b: string, c?: string, [n: number]: string };
->c : { ...C; b: string; c?: string; [n: number]: string; }
+>c : { [n: number]: string; b: string; c: string | boolean; a: number; }
 >C : C
 >b : string
 >c : string
@@ -18,13 +18,13 @@ let c: { ...C, b: string, c?: string, [n: number]: string };
 let n: number = c.a;
 >n : number
 >c.a : number
->c : { ...C; b: string; c?: string; [n: number]: string; }
+>c : { [n: number]: string; b: string; c: string | boolean; a: number; }
 >a : number
 
 let s: string = c[12];
 >s : string
 >c[12] : string
->c : { ...C; b: string; c?: string; [n: number]: string; }
+>c : { [n: number]: string; b: string; c: string | boolean; a: number; }
 >12 : 12
 
 interface Indexed {
@@ -37,7 +37,7 @@ interface Indexed {
 >a : number
 }
 let i: { ...Indexed, b: number };
->i : { ...Indexed; b: number; [n: string]: number; }
+>i : { [n: string]: number; b: number; a: number; }
 >Indexed : Indexed
 >b : number
 
@@ -45,14 +45,14 @@ n = i[101];
 >n = i[101] : number
 >n : number
 >i[101] : number
->i : { ...Indexed; b: number; [n: string]: number; }
+>i : { [n: string]: number; b: number; a: number; }
 >101 : 101
 
 n = i.b;
 >n = i.b : number
 >n : number
 >i.b : number
->i : { ...Indexed; b: number; [n: string]: number; }
+>i : { [n: string]: number; b: number; a: number; }
 >b : number
 
 interface Indexed2 {
@@ -65,7 +65,7 @@ interface Indexed2 {
 >c : boolean
 }
 let ii: { ...Indexed, ...Indexed2, b: boolean, d: number };
->ii : { ...Indexed; ...Indexed2; b: boolean; d: number; [x: string]: number | boolean; }
+>ii : { [x: string]: number | boolean; b: boolean; d: number; c: boolean; a: number; }
 >Indexed : Indexed
 >Indexed2 : Indexed2
 >b : boolean
@@ -74,6 +74,6 @@ let ii: { ...Indexed, ...Indexed2, b: boolean, d: number };
 let nb: number | boolean = ii[1001];
 >nb : number | boolean
 >ii[1001] : number | boolean
->ii : { ...Indexed; ...Indexed2; b: boolean; d: number; [x: string]: number | boolean; }
+>ii : { [x: string]: number | boolean; b: boolean; d: number; c: boolean; a: number; }
 >1001 : 1001
 
diff --git a/tests/baselines/reference/objectSpreadNegative.errors.txt b/tests/baselines/reference/objectSpreadNegative.errors.txt
index 1ee3acb823c..38e564c3b5d 100644
--- a/tests/baselines/reference/objectSpreadNegative.errors.txt
+++ b/tests/baselines/reference/objectSpreadNegative.errors.txt
@@ -1,20 +1,23 @@
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(13,30): error TS2339: Property 'x' does not exist on type '{ ...PublicX; ...PrivateOptionalX }'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(16,5): error TS2322: Type '{ ...{ sn?: string; }; ...{ sn?: number; } }' is not assignable to type '{ sn: string | number; }'.
-  Property 'sn' is optional in type '{ ...{ sn?: string; }; ...{ sn?: number; } }' but required in type '{ sn: string | number; }'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(22,5): error TS2322: Type '{ s: string; }' is not assignable to type '{ ...Bool; ...Str }'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(24,1): error TS2322: Type 'Bool' is not assignable to type '{ ...Bool; ...Str }'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(27,15): error TS2697: Spread properties must be identifiers, property accesses, or object literals.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(28,15): error TS2697: Spread properties must be identifiers, property accesses, or object literals.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(31,36): error TS2300: Duplicate identifier 'b'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(31,53): error TS2300: Duplicate identifier 'b'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(36,12): error TS2339: Property 'b' does not exist on type '{ ...{ b: number; } }'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(42,9): error TS2339: Property 'm' does not exist on type '{ ...C }'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(45,1): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type '{ ...PublicX }' has no compatible call signatures.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(46,1): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(48,39): error TS2697: Spread properties must be identifiers, property accesses, or object literals.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(11,21): error TS2339: Property 'x' does not exist on type '{}'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(14,5): error TS2322: Type '{ sn?: string | number; }' is not assignable to type '{ sn: string | number; }'.
+  Property 'sn' is optional in type '{ sn?: string | number; }' but required in type '{ sn: string | number; }'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(20,5): error TS2322: Type '{ s: string; }' is not assignable to type '{ s: string; b: boolean; }'.
+  Property 'b' is missing in type '{ s: string; }'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(22,1): error TS2322: Type 'Bool' is not assignable to type '{ s: string; b: boolean; }'.
+  Property 's' is missing in type 'Bool'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(25,15): error TS2697: Spread properties must be identifiers, property accesses, or object literals.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(26,15): error TS2697: Spread properties must be identifiers, property accesses, or object literals.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(29,36): error TS2300: Duplicate identifier 'b'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(29,53): error TS2300: Duplicate identifier 'b'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(34,12): error TS2339: Property 'b' does not exist on type '{}'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(40,9): error TS2339: Property 'm' does not exist on type '{ p: number; }'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(43,1): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type '{ x: number; }' has no compatible call signatures.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(44,1): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(47,39): error TS2697: Spread properties must be identifiers, property accesses, or object literals.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(51,12): error TS2322: Type '{ ...U }' is not assignable to type 'U'.
 
 
-==== tests/cases/conformance/types/spread/objectSpreadNegative.ts (13 errors) ====
+==== tests/cases/conformance/types/spread/objectSpreadNegative.ts (14 errors) ====
     let o = { a: 1, b: 'no' }
     
     /// private propagates
@@ -24,18 +27,16 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(48,39): error TS269
     class PublicX {
         public x: number;
     }
-    let privateOptionalx: PrivateOptionalX;
-    let publicx: PublicX;
-    let o3 = { ...publicx, ...privateOptionalx };
-    let sn: string | number = o3.x; // error, x is private
-                                 ~
-!!! error TS2339: Property 'x' does not exist on type '{ ...PublicX; ...PrivateOptionalX }'.
+    let o3: { ...PublicX, ...PrivateOptionalX };
+    let sn: number = o3.x; // error, x is private
+                        ~
+!!! error TS2339: Property 'x' does not exist on type '{}'.
     let optionalString: { sn?: string };
     let optionalNumber: { sn?: number };
     let allOptional: { sn: string | number } = { ...optionalString, ...optionalNumber };
         ~~~~~~~~~~~
-!!! error TS2322: Type '{ ...{ sn?: string; }; ...{ sn?: number; } }' is not assignable to type '{ sn: string | number; }'.
-!!! error TS2322:   Property 'sn' is optional in type '{ ...{ sn?: string; }; ...{ sn?: number; } }' but required in type '{ sn: string | number; }'.
+!!! error TS2322: Type '{ sn?: string | number; }' is not assignable to type '{ sn: string | number; }'.
+!!! error TS2322:   Property 'sn' is optional in type '{ sn?: string | number; }' but required in type '{ sn: string | number; }'.
     // error, 'sn' is optional in source, required in target
     
     // assignability as target
@@ -43,11 +44,13 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(48,39): error TS269
     interface Str { s: string };
     let spread: { ...Bool, ...Str } = { s: 'foo' }; // error, missing 'b'
         ~~~~~~
-!!! error TS2322: Type '{ s: string; }' is not assignable to type '{ ...Bool; ...Str }'.
+!!! error TS2322: Type '{ s: string; }' is not assignable to type '{ s: string; b: boolean; }'.
+!!! error TS2322:   Property 'b' is missing in type '{ s: string; }'.
     let b: Bool;
     spread = b; // error, missing 's'
     ~~~~~~
-!!! error TS2322: Type 'Bool' is not assignable to type '{ ...Bool; ...Str }'.
+!!! error TS2322: Type 'Bool' is not assignable to type '{ s: string; b: boolean; }'.
+!!! error TS2322:   Property 's' is missing in type 'Bool'.
     
     // expressions are not allowed
     let o1 = { ...1 + 1 };
@@ -69,7 +72,7 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(48,39): error TS269
     let setterOnly = { ...{ set b (bad: number) { } } };
     setterOnly.b = 12; // error, 'b' does not exist
                ~
-!!! error TS2339: Property 'b' does not exist on type '{ ...{ b: number; } }'.
+!!! error TS2339: Property 'b' does not exist on type '{}'.
     
     // methods are skipped because they aren't enumerable
     class C { p = 1; m() { } }
@@ -77,17 +80,25 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(48,39): error TS269
     let spreadC = { ...c }
     spreadC.m(); // error 'm' is not in '{ ... c }'
             ~
-!!! error TS2339: Property 'm' does not exist on type '{ ...C }'.
+!!! error TS2339: Property 'm' does not exist on type '{ p: number; }'.
     
     let callableConstructableSpread: { ...PublicX, (n: number): number, new (p: number) };
     callableConstructableSpread(12); // error, no call signature
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2349: Cannot invoke an expression whose type lacks a call signature. Type '{ ...PublicX }' has no compatible call signatures.
+!!! error TS2349: Cannot invoke an expression whose type lacks a call signature. Type '{ x: number; }' has no compatible call signatures.
     new callableConstructableSpread(12); // error, no construct signature
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
     
+    let publicx: PublicX;
     let callableSpread = { ...publicx, ...(n => n + 1) }; // error, can't spread functions
                                           ~~~~~~~~~~~~
 !!! error TS2697: Spread properties must be identifiers, property accesses, or object literals.
+    
+    // { ...U } is not assignable to U
+    function override<U>(initial: U, override: U): U {
+        return { ...initial, ...override };
+               ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2322: Type '{ ...U }' is not assignable to type 'U'.
+    }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/objectSpreadNegative.js b/tests/baselines/reference/objectSpreadNegative.js
index 685760f9444..6874380599b 100644
--- a/tests/baselines/reference/objectSpreadNegative.js
+++ b/tests/baselines/reference/objectSpreadNegative.js
@@ -8,10 +8,8 @@ class PrivateOptionalX {
 class PublicX {
     public x: number;
 }
-let privateOptionalx: PrivateOptionalX;
-let publicx: PublicX;
-let o3 = { ...publicx, ...privateOptionalx };
-let sn: string | number = o3.x; // error, x is private
+let o3: { ...PublicX, ...PrivateOptionalX };
+let sn: number = o3.x; // error, x is private
 let optionalString: { sn?: string };
 let optionalNumber: { sn?: number };
 let allOptional: { sn: string | number } = { ...optionalString, ...optionalNumber };
@@ -46,7 +44,13 @@ let callableConstructableSpread: { ...PublicX, (n: number): number, new (p: numb
 callableConstructableSpread(12); // error, no call signature
 new callableConstructableSpread(12); // error, no construct signature
 
+let publicx: PublicX;
 let callableSpread = { ...publicx, ...(n => n + 1) }; // error, can't spread functions
+
+// { ...U } is not assignable to U
+function override<U>(initial: U, override: U): U {
+    return { ...initial, ...override };
+}
 
 
 //// [objectSpreadNegative.js]
@@ -70,9 +74,7 @@ var PublicX = (function () {
     }
     return PublicX;
 }());
-var privateOptionalx;
-var publicx;
-var o3 = __assign({}, publicx, privateOptionalx);
+var o3;
 var sn = o3.x; // error, x is private
 var optionalString;
 var optionalNumber;
@@ -105,4 +107,9 @@ spreadC.m(); // error 'm' is not in '{ ... c }'
 var callableConstructableSpread;
 callableConstructableSpread(12); // error, no call signature
 new callableConstructableSpread(12); // error, no construct signature
+var publicx;
 var callableSpread = __assign({}, publicx, (function (n) { return n + 1; })); // error, can't spread functions
+// { ...U } is not assignable to U
+function override(initial, override) {
+    return __assign({}, initial, override);
+}
diff --git a/tests/baselines/reference/objectSpreadScenarios.js b/tests/baselines/reference/objectSpreadScenarios.js
index 64739a2b298..96ac98d2d35 100644
--- a/tests/baselines/reference/objectSpreadScenarios.js
+++ b/tests/baselines/reference/objectSpreadScenarios.js
@@ -4,7 +4,7 @@ interface B1 { b: number };
 function override<U>(initial: U, override: U): { ...U, ...U } {
     return { ...initial, ...override };
 }
-function update<U>(this: { u: U }, override: U): void {
+function update<U>(this: { u: { ...U } }, override: U): void {
     this.u = { ...this.u, ...override };
 }
 function mixin<T, U>(one: T, two: U): { ...T, ...U } {
diff --git a/tests/baselines/reference/objectSpreadScenarios.symbols b/tests/baselines/reference/objectSpreadScenarios.symbols
index 784e340a10c..cf1e1833ac9 100644
--- a/tests/baselines/reference/objectSpreadScenarios.symbols
+++ b/tests/baselines/reference/objectSpreadScenarios.symbols
@@ -19,13 +19,13 @@ function override<U>(initial: U, override: U): { ...U, ...U } {
 
     return { ...initial, ...override };
 }
-function update<U>(this: { u: U }, override: U): void {
+function update<U>(this: { u: { ...U } }, override: U): void {
 >update : Symbol(update, Decl(objectSpreadScenarios.ts, 4, 1))
 >U : Symbol(U, Decl(objectSpreadScenarios.ts, 5, 16))
 >this : Symbol(this, Decl(objectSpreadScenarios.ts, 5, 19))
 >u : Symbol(u, Decl(objectSpreadScenarios.ts, 5, 26))
 >U : Symbol(U, Decl(objectSpreadScenarios.ts, 5, 16))
->override : Symbol(override, Decl(objectSpreadScenarios.ts, 5, 34))
+>override : Symbol(override, Decl(objectSpreadScenarios.ts, 5, 41))
 >U : Symbol(U, Decl(objectSpreadScenarios.ts, 5, 16))
 
     this.u = { ...this.u, ...override };
diff --git a/tests/baselines/reference/objectSpreadScenarios.types b/tests/baselines/reference/objectSpreadScenarios.types
index 5330029afe1..2d1aa47bd50 100644
--- a/tests/baselines/reference/objectSpreadScenarios.types
+++ b/tests/baselines/reference/objectSpreadScenarios.types
@@ -8,7 +8,7 @@ interface B1 { b: number };
 >b : number
 
 function override<U>(initial: U, override: U): { ...U, ...U } {
->override : <U>(initial: U, override: U) => { ...U; ...U }
+>override : <U>(initial: U, override: U) => { ...U }
 >U : U
 >initial : U
 >U : U
@@ -18,28 +18,28 @@ function override<U>(initial: U, override: U): { ...U, ...U } {
 >U : U
 
     return { ...initial, ...override };
->{ ...initial, ...override } : { ...U; ...U }
+>{ ...initial, ...override } : { ...U }
 >initial : any
 >override : any
 }
-function update<U>(this: { u: U }, override: U): void {
->update : <U>(this: { u: U; }, override: U) => void
+function update<U>(this: { u: { ...U } }, override: U): void {
+>update : <U>(this: { u: { ...U }; }, override: U) => void
 >U : U
->this : { u: U; }
->u : U
+>this : { u: { ...U }; }
+>u : { ...U }
 >U : U
 >override : U
 >U : U
 
     this.u = { ...this.u, ...override };
->this.u = { ...this.u, ...override } : { ...U; ...U }
->this.u : U
->this : { u: U; }
->u : U
->{ ...this.u, ...override } : { ...U; ...U }
->this.u : U
->this : { u: U; }
->u : U
+>this.u = { ...this.u, ...override } : { ...U }
+>this.u : { ...U }
+>this : { u: { ...U }; }
+>u : { ...U }
+>{ ...this.u, ...override } : { ...U }
+>this.u : { ...U }
+>this : { u: { ...U }; }
+>u : { ...U }
 >override : any
 }
 function mixin<T, U>(one: T, two: U): { ...T, ...U } {
@@ -73,34 +73,34 @@ let b1: B1 = { b: 101 };
 >101 : 101
 
 a1 = override(a1, { a: false });
->a1 = override(a1, { a: false }) : { ...A1; ...A1 }
+>a1 = override(a1, { a: false }) : { a: boolean; }
 >a1 : A1
->override(a1, { a: false }) : { ...A1; ...A1 }
->override : <U>(initial: U, override: U) => { ...U; ...U }
+>override(a1, { a: false }) : { a: boolean; }
+>override : <U>(initial: U, override: U) => { ...U }
 >a1 : A1
 >{ a: false } : { a: false; }
 >a : boolean
 >false : false
 
 let host = { u: a1, update };
->host : { u: A1; update: <U>(this: { u: U; }, override: U) => void; }
->{ u: a1, update } : { u: A1; update: <U>(this: { u: U; }, override: U) => void; }
+>host : { u: A1; update: <U>(this: { u: { ...U }; }, override: U) => void; }
+>{ u: a1, update } : { u: A1; update: <U>(this: { u: { ...U }; }, override: U) => void; }
 >u : A1
 >a1 : A1
->update : <U>(this: { u: U; }, override: U) => void
+>update : <U>(this: { u: { ...U }; }, override: U) => void
 
 host.update({ a: false });
 >host.update({ a: false }) : void
->host.update : <U>(this: { u: U; }, override: U) => void
->host : { u: A1; update: <U>(this: { u: U; }, override: U) => void; }
->update : <U>(this: { u: U; }, override: U) => void
+>host.update : <U>(this: { u: { ...U }; }, override: U) => void
+>host : { u: A1; update: <U>(this: { u: { ...U }; }, override: U) => void; }
+>update : <U>(this: { u: { ...U }; }, override: U) => void
 >{ a: false } : { a: false; }
 >a : boolean
 >false : false
 
 let mixed = mixin(a1, b1);
->mixed : { ...A1; ...B1 }
->mixin(a1, b1) : { ...A1; ...B1 }
+>mixed : { b: number; a: boolean; }
+>mixin(a1, b1) : { b: number; a: boolean; }
 >mixin : <T, U>(one: T, two: U) => { ...T; ...U }
 >a1 : A1
 >b1 : B1
diff --git a/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt b/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt
index 9dd9a8d41a1..46782aaa1d6 100644
--- a/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt
+++ b/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt
@@ -1,4 +1,4 @@
-lib.d.ts(28,18): error TS2300: Duplicate identifier 'eval'.
+lib.d.ts(32,18): error TS2300: Duplicate identifier 'eval'.
 tests/cases/compiler/variableDeclarationInStrictMode1.ts(2,5): error TS1100: Invalid use of 'eval' in strict mode.
 tests/cases/compiler/variableDeclarationInStrictMode1.ts(2,5): error TS2300: Duplicate identifier 'eval'.
 

From 4eedfea81f4603d307829268ea934b7ccf725a3e Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 10 Oct 2016 10:05:31 -0700
Subject: [PATCH 022/421] Support unions/intersections in spread types

1. Lift unions and intersections above spread types when creating them
in getSpreadType.
2. Cleanup now-unneeded changes to existing union/intersection code.
3. Cleanup some incorrect errors I added earlier.
---
 src/compiler/checker.ts              | 265 +++++++++++++--------------
 src/compiler/diagnosticMessages.json |  10 +-
 src/compiler/types.ts                |  12 +-
 src/services/findAllReferences.ts    |   6 +-
 4 files changed, 135 insertions(+), 158 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 0e7266b223c..9d8ea29a381 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -2197,7 +2197,7 @@ namespace ts {
                         writeSymbolTypeReference(type.aliasSymbol, typeArguments, 0, typeArguments ? typeArguments.length : 0, nextFlags);
                     }
                     else if (type.flags & TypeFlags.UnionOrIntersection) {
-                        writeUnionOrIntersectionType(<TypeOperatorType>type, nextFlags);
+                        writeUnionOrIntersectionType(<UnionOrIntersectionType>type, nextFlags);
                     }
                     else if (type.flags & TypeFlags.Spread) {
                         writeSpreadType(<SpreadType>type, nextFlags);
@@ -2291,7 +2291,7 @@ namespace ts {
                     }
                 }
 
-                function writeUnionOrIntersectionType(type: TypeOperatorType, flags: TypeFormatFlags) {
+                function writeUnionOrIntersectionType(type: UnionOrIntersectionType, flags: TypeFormatFlags) {
                     if (flags & TypeFormatFlags.InElementType) {
                         writePunctuation(writer, SyntaxKind.OpenParenToken);
                     }
@@ -4449,7 +4449,7 @@ namespace ts {
             }
         }
 
-        function getPropertiesOfUnionOrIntersectionType(type: TypeOperatorType): Symbol[] {
+        function getPropertiesOfUnionOrIntersectionType(type: UnionOrIntersectionType): Symbol[] {
             for (const current of type.types) {
                 for (const prop of getPropertiesOfType(current)) {
                     getUnionOrIntersectionProperty(type, prop.name);
@@ -4499,7 +4499,7 @@ namespace ts {
         }
 
         function getApparentTypeOfSpread(type: SpreadType) {
-            return getSpreadType([getApparentType(type.left), getApparentType(type.right)], type.symbol, undefined, undefined);
+            return getSpreadType([getApparentType(type.left), getApparentType(type.right)], type.symbol);
         }
 
         /**
@@ -4529,44 +4529,35 @@ namespace ts {
             return type;
         }
 
-        function createUnionOrIntersectionProperty(containingType: TypeOperatorType, name: string): Symbol {
+        function createUnionOrIntersectionProperty(containingType: UnionOrIntersectionType, name: string) {
             const types = containingType.types;
-            return createUnionOrIntersectionOrSpreadPropertySymbol(containingType, name, () => {
-                let props: Symbol[];
-                // Flags we want to propagate to the result if they exist in all source symbols
-                let commonFlags = (containingType.flags & TypeFlags.Intersection) ? SymbolFlags.Optional : SymbolFlags.None;
-                let isReadonly = false;
-                let isPartial = false;
-                for (const current of types) {
-                    const type = getApparentType(current);
-                    if (type !== unknownType) {
-                        const prop = getPropertyOfType(type, name);
-                        if (prop && !(getDeclarationModifierFlagsFromSymbol(prop) & (ModifierFlags.Private | ModifierFlags.Protected))) {
-                            commonFlags &= prop.flags;
-                            if (!props) {
-                                props = [prop];
-                            }
-                            else if (!contains(props, prop)) {
-                                props.push(prop);
-                            }
-                            if (isReadonlySymbol(prop)) {
-                                isReadonly = true;
-                            }
+            let props: Symbol[];
+            // Flags we want to propagate to the result if they exist in all source symbols
+            let commonFlags = (containingType.flags & TypeFlags.Intersection) ? SymbolFlags.Optional : SymbolFlags.None;
+            let isReadonly = false;
+            let isPartial = false;
+            for (const current of types) {
+                const type = getApparentType(current);
+                if (type !== unknownType) {
+                    const prop = getPropertyOfType(type, name);
+                    if (prop && !(getDeclarationModifierFlagsFromSymbol(prop) & (ModifierFlags.Private | ModifierFlags.Protected))) {
+                        commonFlags &= prop.flags;
+                        if (!props) {
+                            props = [prop];
+                        }
+                        else if (!contains(props, prop)) {
+                            props.push(prop);
+                        }
+                        if (isReadonlySymbol(prop)) {
+                            isReadonly = true;
+                        }
 
-                        }
-                        else if (containingType.flags & TypeFlags.Union) {
-                            isPartial = true;
-                        }
+                    }
+                    else if (containingType.flags & TypeFlags.Union) {
+                        isPartial = true;
                     }
                 }
-                return [props, isReadonly, isPartial, commonFlags];
-            });
-        }
-
-        function createUnionOrIntersectionOrSpreadPropertySymbol(containingType: TypeOperatorType,
-                                                                 name: string,
-                                                                 symbolCreator: () => [Symbol[], boolean, boolean, SymbolFlags]) {
-            const [props, isReadonly, isPartial, flags] = symbolCreator();
+            }
             if (!props) {
                 return undefined;
             }
@@ -4590,7 +4581,7 @@ namespace ts {
                 }
                 propTypes.push(type);
             }
-            const result = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | SymbolFlags.SyntheticProperty | flags, name);
+            const result = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | SymbolFlags.SyntheticProperty | commonFlags, name);
             result.syntheticKind === SyntheticSymbolKind.UnionOrIntersection;
             result.containingType = containingType;
             result.hasNonUniformType = hasNonUniformType;
@@ -4609,7 +4600,7 @@ namespace ts {
         // constituents, in which case the isPartial flag is set when the containing type is union type. We need
         // these partial properties when identifying discriminant properties, but otherwise they are filtered out
         // and do not appear to be present in the union type.
-        function getUnionOrIntersectionProperty(type: TypeOperatorType, name: string): Symbol {
+        function getUnionOrIntersectionProperty(type: UnionOrIntersectionType, name: string): Symbol {
             const properties = type.resolvedProperties || (type.resolvedProperties = createMap<Symbol>());
             let property = properties[name];
             if (!property) {
@@ -4621,7 +4612,7 @@ namespace ts {
             return property;
         }
 
-        function getPropertyOfUnionOrIntersectionType(type: TypeOperatorType, name: string): Symbol {
+        function getPropertyOfUnionOrIntersectionType(type: UnionOrIntersectionType, name: string): Symbol {
             const property = getUnionOrIntersectionProperty(type, name);
             // We need to filter out partial properties in union types
             return property && !(property.flags & SymbolFlags.SyntheticProperty && (<TransientSymbol>property).isPartial) ? property : undefined;
@@ -4652,7 +4643,7 @@ namespace ts {
                 return getPropertyOfObjectType(globalObjectType, name);
             }
             if (type.flags & TypeFlags.UnionOrIntersection) {
-                return getPropertyOfUnionOrIntersectionType(<TypeOperatorType>type, name);
+                return getPropertyOfUnionOrIntersectionType(<UnionOrIntersectionType>type, name);
             }
             return undefined;
         }
@@ -5773,6 +5764,9 @@ namespace ts {
                 return spreadTypes[id];
             }
             const right = types.pop();
+            if (right.flags & TypeFlags.Any) {
+                return anyType;
+            }
             if (right.flags & TypeFlags.Spread) {
                 // spread is right associative and associativity applies, so transform
                 // (T ... U) ... V to T ... (U ... V)
@@ -5783,9 +5777,22 @@ namespace ts {
                 types.push(rspread.right);
                 return getSpreadType(types, symbol, aliasSymbol, aliasTypeArguments);
             }
+            if (right.flags & TypeFlags.Intersection) {
+                const spreads = map((right as IntersectionType).types,
+                                    t => getSpreadType(types.slice().concat([t]), symbol, aliasSymbol, aliasTypeArguments));
+                return getIntersectionType(spreads, aliasSymbol, aliasTypeArguments);
+            }
+            if (right.flags & TypeFlags.Union) {
+                // TODO: types is mutable, so this block has to happen before the call to `const left = getSpreadType(...)`
+                // because that call consumes the array. It might be worthwhile to use a simple linked list here instead.
+                // It would avoid the slice+concat call that is needed here for multiple calls to getSpreadType.
+                const spreads = map((right as UnionType).types,
+                                    t => getSpreadType(types.slice().concat([t]), symbol, aliasSymbol, aliasTypeArguments));
+                return getUnionType(spreads, /*subtypeReduction*/ false, aliasSymbol, aliasTypeArguments);
+            }
             const atBeginning = types.length === 0;
             const left = getSpreadType(types, symbol, aliasSymbol, aliasTypeArguments);
-            if (right.flags & (TypeFlags.Null | TypeFlags.Undefined)) {
+            if (right.flags & TypeFlags.Primitive || left.flags & TypeFlags.Any) {
                 return left;
             }
             if (right.flags & TypeFlags.TypeParameter &&
@@ -5795,9 +5802,18 @@ namespace ts {
                 // for types like T ... T, just return ... T
                 return left;
             }
-            if (!(right.flags & (TypeFlags.Union | TypeFlags.Intersection | TypeFlags.TypeParameter | TypeFlags.Spread))
-                && !(left.flags & (TypeFlags.Union | TypeFlags.Intersection | TypeFlags.TypeParameter | TypeFlags.Spread))) {
-                const members = createMap<Symbol | undefined>();
+            if (left.flags & TypeFlags.Intersection) {
+                const spreads = map((left as IntersectionType).types,
+                                  t => getSpreadType(types.slice().concat([t, right]), symbol, aliasSymbol, aliasTypeArguments));
+                return getIntersectionType(spreads, aliasSymbol, aliasTypeArguments);
+            }
+            if (left.flags & TypeFlags.Union) {
+                const spreads = map((left as UnionType).types,
+                                  t => getSpreadType(types.slice().concat([t, right]), symbol, aliasSymbol, aliasTypeArguments));
+                return getUnionType(spreads, /*subTypeReduction*/ false, aliasSymbol, aliasTypeArguments);
+            }
+            if (right.flags & TypeFlags.ObjectType && left.flags & TypeFlags.ObjectType) {
+                const members = createMap<Symbol>();
                 const skippedPrivateMembers = createMap<boolean>();
                 let stringIndexInfo = unionIndexInfos(getIndexInfoOfType(left, IndexKind.String), getIndexInfoOfType(right, IndexKind.String));
                 let numberIndexInfo = unionIndexInfos(getIndexInfoOfType(left, IndexKind.Number), getIndexInfoOfType(right, IndexKind.Number));
@@ -5820,7 +5836,6 @@ namespace ts {
                 for (const leftProp of getPropertiesOfType(left)) {
                     if (leftProp.flags & SymbolFlags.SetAccessor && !(leftProp.flags & SymbolFlags.GetAccessor)
                        || leftProp.name in skippedPrivateMembers) {
-                        // skip set-only properties (methods have already been skipped by the recursive call to getSpreadType)
                         continue;
                     }
                     if (leftProp.name in members) {
@@ -5836,7 +5851,7 @@ namespace ts {
                             if (declarations.length) {
                                 result.valueDeclaration = declarations[0];
                             }
-                            result.isReadonly = isReadonlySymbol(rightProp) || isReadonlySymbol(leftProp);
+                            result.isReadonly = isReadonlySymbol(leftProp) || isReadonlySymbol(rightProp);
                             members[leftProp.name] = result;
                         }
                     }
@@ -5846,10 +5861,9 @@ namespace ts {
                 }
                 return createAnonymousType(symbol, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
             }
-            // one side is a type parameter (TODO: Or union or intersection)
             const spread = spreadTypes[id] = createObjectType(TypeFlags.Spread, symbol) as SpreadType;
-            Debug.assert(!!(left.flags & (TypeFlags.Spread | TypeFlags.ObjectType)));
-            Debug.assert(!!(right.flags & (TypeFlags.TypeParameter | TypeFlags.ObjectType)));
+            Debug.assert(!!(left.flags & (TypeFlags.Spread | TypeFlags.ObjectType)), "Left flags: " + left.flags.toString(2));
+            Debug.assert(!!(right.flags & (TypeFlags.TypeParameter | TypeFlags.ObjectType)), "Right flags: " + right.flags.toString(2));
             spread.left = left as SpreadType | ResolvedType;
             spread.right = right as TypeParameter | ResolvedType;
             spread.aliasSymbol = aliasSymbol;
@@ -6802,19 +6816,19 @@ namespace ts {
                     }
                 }
 
-                if (source.flags & TypeFlags.Spread) {
-                    // you only see this for spreads with type parameters (TODO: and unions/intersections)
-                    if (target.flags & TypeFlags.Spread) {
-                        if (!(spreadTypeRelatedTo(source as SpreadType, target as SpreadType))) {
+                if (source.flags & TypeFlags.Spread && target.flags & TypeFlags.Spread) {
+                    // you only see this for spreads with type parameters
+                    if (!(spreadTypeRelatedTo(source as SpreadType, target as SpreadType))) {
+                        if (reportErrors) {
                             reportRelationError(headMessage, source, target);
-                            return Ternary.False;
-                        }
-                        const reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo;
-                        const apparentSource = getApparentType(source);
-                        if (result = objectTypeRelatedTo(apparentSource, source, getApparentType(target), reportStructuralErrors)) {
-                            errorInfo = saveErrorInfo;
-                            return result;
                         }
+                        return Ternary.False;
+                    }
+                    const reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo;
+                    const apparentSource = getApparentType(source);
+                    if (result = objectTypeRelatedTo(apparentSource, source, getApparentType(target), reportStructuralErrors)) {
+                        errorInfo = saveErrorInfo;
+                        return result;
                     }
                 }
 
@@ -6878,40 +6892,27 @@ namespace ts {
             }
 
             function spreadTypeRelatedTo(source: SpreadType, target: SpreadType): boolean {
-                // (Spread ... Object) | (Spread | Object ... TypeParameter)
-                // in other words, if the right side is Object, then the left side must be a Spread.
-                if (source.right.flags & TypeFlags.ObjectType &&
-                    target.right.flags & TypeFlags.ObjectType) {
+                // If the right side of a spread type is ObjectType, then the left side must be a Spread.
+                // Structural compatibility of the spreads' object types are checked separately in isRelatedTo,
+                // so just skip them for now.
+                if (source.right.flags & TypeFlags.ObjectType || target.right.flags & TypeFlags.ObjectType) {
+                    return spreadTypeRelatedTo(source.right.flags & TypeFlags.ObjectType ? source.left as SpreadType : source,
+                                               target.right.flags & TypeFlags.ObjectType ? target.left as SpreadType : target);
+                }
+                // If both right sides are type parameters, then they must be identical for the spread types to be related.
+                // It also means that the left sides are either spread types or object types.
+
+                // if one left is object and the other is spread, that means the second has another type parameter. which isn't allowed
+                if (target.right.symbol !== source.right.symbol) {
+                    return false;
+                }
+                if (source.left.flags & TypeFlags.Spread && target.left.flags & TypeFlags.Spread) {
+                    // If the left sides are both spread types, then recursively check them.
                     return spreadTypeRelatedTo(source.left as SpreadType, target.left as SpreadType);
                 }
-                if (source.right.flags & TypeFlags.ObjectType) {
-                    /// target.right is TypeParameter, skip source.right, but keep looking at target
-                    return spreadTypeRelatedTo(source.left as SpreadType, target);
-                }
-                if (target.right.flags & TypeFlags.ObjectType) {
-                    /// source.right is TypeParameter, skip target.right, but keep looking at source
-                    return spreadTypeRelatedTo(source, target.left as SpreadType);
-                }
-                else {
-                    // both rights are type parameters, so they must be identical
-                    // and both lefts must be the same:
-                    // if one left is object and the other is spread, that means the second has another type parameter. which isn't allowed
-                    if (target.right.symbol !== source.right.symbol) {
-                        return false;
-                    }
-                    if (source.left.flags & TypeFlags.Spread && target.left.flags & TypeFlags.Spread) {
-                        return spreadTypeRelatedTo(source.left as SpreadType, target.left as SpreadType);
-                    }
-                    else if (source.left.flags & TypeFlags.ObjectType && target.left.flags & TypeFlags.ObjectType) {
-                        return true; // let structural compatibility figure it out later
-                    }
-                    else {
-                        // one side is a spread, so it must have more type parameters, which will not be matched by the other side
-                        // return false immediately instead of descending to find this out.
-                        return false;
-                    }
-                }
-
+                // If the left sides are both object types, then isRelatedTo will check the structural compatibility next.
+                // Otherwise, one side has more type parameters than the other and the spread types are not related.
+                return !!(source.left.flags & TypeFlags.ObjectType && target.left.flags & TypeFlags.ObjectType);
             }
 
             function isIdenticalTo(source: Type, target: Type): Ternary {
@@ -6927,8 +6928,8 @@ namespace ts {
                 }
                 if (source.flags & TypeFlags.Union && target.flags & TypeFlags.Union ||
                     source.flags & TypeFlags.Intersection && target.flags & TypeFlags.Intersection) {
-                    if (result = eachTypeRelatedToSomeType(<TypeOperatorType>source, <TypeOperatorType>target, /*reportErrors*/ false)) {
-                        if (result &= eachTypeRelatedToSomeType(<TypeOperatorType>target, <TypeOperatorType>source, /*reportErrors*/ false)) {
+                    if (result = eachTypeRelatedToSomeType(<UnionOrIntersectionType>source, <UnionOrIntersectionType>target, /*reportErrors*/ false)) {
+                        if (result &= eachTypeRelatedToSomeType(<UnionOrIntersectionType>target, <UnionOrIntersectionType>source, /*reportErrors*/ false)) {
                             return result;
                         }
                     }
@@ -6951,7 +6952,7 @@ namespace ts {
                     }
                 }
                 else if (type.flags & TypeFlags.UnionOrIntersection) {
-                    for (const t of (<TypeOperatorType>type).types) {
+                    for (const t of (<UnionOrIntersectionType>type).types) {
                         if (isKnownProperty(t, name)) {
                             return true;
                         }
@@ -6989,7 +6990,7 @@ namespace ts {
                 return false;
             }
 
-            function eachTypeRelatedToSomeType(source: TypeOperatorType, target: TypeOperatorType, reportErrors: boolean): Ternary {
+            function eachTypeRelatedToSomeType(source: UnionOrIntersectionType, target: UnionOrIntersectionType, reportErrors: boolean): Ternary {
                 let result = Ternary.True;
                 const sourceTypes = source.types;
                 for (const sourceType of sourceTypes) {
@@ -7002,7 +7003,7 @@ namespace ts {
                 return result;
             }
 
-            function typeRelatedToSomeType(source: Type, target: TypeOperatorType, reportErrors: boolean): Ternary {
+            function typeRelatedToSomeType(source: Type, target: UnionOrIntersectionType, reportErrors: boolean): Ternary {
                 const targetTypes = target.types;
                 if (target.flags & TypeFlags.Union && containsType(targetTypes, source)) {
                     return Ternary.True;
@@ -7017,7 +7018,7 @@ namespace ts {
                 return Ternary.False;
             }
 
-            function typeRelatedToEachType(source: Type, target: TypeOperatorType, reportErrors: boolean): Ternary {
+            function typeRelatedToEachType(source: Type, target: UnionOrIntersectionType, reportErrors: boolean): Ternary {
                 let result = Ternary.True;
                 const targetTypes = target.types;
                 for (const targetType of targetTypes) {
@@ -7030,7 +7031,7 @@ namespace ts {
                 return result;
             }
 
-            function someTypeRelatedToType(source: TypeOperatorType, target: Type, reportErrors: boolean): Ternary {
+            function someTypeRelatedToType(source: UnionOrIntersectionType, target: Type, reportErrors: boolean): Ternary {
                 const sourceTypes = source.types;
                 if (source.flags & TypeFlags.Union && containsType(sourceTypes, target)) {
                     return Ternary.True;
@@ -7045,7 +7046,7 @@ namespace ts {
                 return Ternary.False;
             }
 
-            function eachTypeRelatedToType(source: TypeOperatorType, target: Type, reportErrors: boolean): Ternary {
+            function eachTypeRelatedToType(source: UnionOrIntersectionType, target: Type, reportErrors: boolean): Ternary {
                 let result = Ternary.True;
                 const sourceTypes = source.types;
                 for (const sourceType of sourceTypes) {
@@ -7990,10 +7991,10 @@ namespace ts {
             return !!(type.flags & TypeFlags.TypeParameter ||
                 type.flags & TypeFlags.Reference && forEach((<TypeReference>type).typeArguments, couldContainTypeParameters) ||
                 type.flags & TypeFlags.Anonymous && type.symbol && type.symbol.flags & (SymbolFlags.Method | SymbolFlags.TypeLiteral | SymbolFlags.Class) ||
-                type.flags & TypeFlags.UnionOrIntersection && couldUnionOrIntersectionContainTypeParameters(<TypeOperatorType>type));
+                type.flags & TypeFlags.UnionOrIntersection && couldUnionOrIntersectionContainTypeParameters(<UnionOrIntersectionType>type));
         }
 
-        function couldUnionOrIntersectionContainTypeParameters(type: TypeOperatorType): boolean {
+        function couldUnionOrIntersectionContainTypeParameters(type: UnionOrIntersectionType): boolean {
             if (type.couldContainTypeParameters === undefined) {
                 type.couldContainTypeParameters = forEach(type.types, couldContainTypeParameters);
             }
@@ -8001,7 +8002,7 @@ namespace ts {
         }
 
         function isTypeParameterAtTopLevel(type: Type, typeParameter: TypeParameter): boolean {
-            return type === typeParameter || type.flags & TypeFlags.UnionOrIntersection && forEach((<TypeOperatorType>type).types, t => isTypeParameterAtTopLevel(t, typeParameter));
+            return type === typeParameter || type.flags & TypeFlags.UnionOrIntersection && forEach((<UnionOrIntersectionType>type).types, t => isTypeParameterAtTopLevel(t, typeParameter));
         }
 
         function inferTypes(context: InferenceContext, originalSource: Type, originalTarget: Type) {
@@ -8031,7 +8032,7 @@ namespace ts {
                     // 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 (<TypeOperatorType>source).types) {
+                        for (const t of (<UnionOrIntersectionType>source).types) {
                             inferFromTypes(t, t);
                         }
                         return;
@@ -8043,14 +8044,14 @@ namespace ts {
                     // and string literals because the number and string types are not represented as unions
                     // of all their possible values.
                     let matchingTypes: Type[];
-                    for (const t of (<TypeOperatorType>source).types) {
-                        if (typeIdenticalToSomeType(t, (<TypeOperatorType>target).types)) {
+                    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, (<TypeOperatorType>target).types)) {
+                            if (typeIdenticalToSomeType(b, (<UnionOrIntersectionType>target).types)) {
                                 (matchingTypes || (matchingTypes = [])).push(t, b);
                             }
                         }
@@ -8059,8 +8060,8 @@ 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(<TypeOperatorType>source, matchingTypes);
-                        target = removeTypesFromUnionOrIntersection(<TypeOperatorType>target, matchingTypes);
+                        source = removeTypesFromUnionOrIntersection(<UnionOrIntersectionType>source, matchingTypes);
+                        target = removeTypesFromUnionOrIntersection(<UnionOrIntersectionType>target, matchingTypes);
                     }
                 }
                 if (target.flags & TypeFlags.TypeParameter) {
@@ -8107,7 +8108,7 @@ namespace ts {
                     }
                 }
                 else if (target.flags & TypeFlags.UnionOrIntersection) {
-                    const targetTypes = (<TypeOperatorType>target).types;
+                    const targetTypes = (<UnionOrIntersectionType>target).types;
                     let typeParameterCount = 0;
                     let typeParameter: TypeParameter;
                     // First infer to each type in union or intersection that isn't a type parameter
@@ -8131,7 +8132,7 @@ namespace ts {
                 }
                 else if (source.flags & TypeFlags.UnionOrIntersection) {
                     // Source is a union or intersection type, infer from each constituent type
-                    const sourceTypes = (<TypeOperatorType>source).types;
+                    const sourceTypes = (<UnionOrIntersectionType>source).types;
                     for (const sourceType of sourceTypes) {
                         inferFromTypes(sourceType, target);
                     }
@@ -8236,7 +8237,7 @@ namespace ts {
          * 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: TypeOperatorType, typesToRemove: Type[]) {
+        function removeTypesFromUnionOrIntersection(type: UnionOrIntersectionType, typesToRemove: Type[]) {
             const reducedTypes: Type[] = [];
             for (const t of type.types) {
                 if (!typeIdenticalToSomeType(t, typesToRemove)) {
@@ -8549,7 +8550,7 @@ namespace ts {
                 return getTypeFacts(constraint || emptyObjectType);
             }
             if (flags & TypeFlags.UnionOrIntersection) {
-                return getTypeFactsOfTypes((<TypeOperatorType>type).types);
+                return getTypeFactsOfTypes((<UnionOrIntersectionType>type).types);
             }
             return TypeFacts.All;
         }
@@ -10632,13 +10633,6 @@ namespace ts {
                         type = checkExpressionForMutableLocation((<ShorthandPropertyAssignment>memberDecl).name, contextualMapper);
                     }
 
-                    if (hasProperty(propertiesTable, member.name)) {
-                        const existingPropType = getTypeOfSymbol(propertiesTable[member.name]);
-                        if (!isTypeIdenticalTo(existingPropType, type)) {
-                            error(memberDecl.name, Diagnostics.Cannot_change_type_of_property_0_from_1_to_2, member.name, typeToString(existingPropType), typeToString(type));
-                        }
-                    }
-
                     typeFlags |= type.flags;
                     const prop = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | member.flags, member.name);
                     if (inDestructuringPattern) {
@@ -10992,7 +10986,7 @@ namespace ts {
                 elemType = checkExpression(node.tagName);
             }
             if (elemType.flags & TypeFlags.Union) {
-                const types = (<TypeOperatorType>elemType).types;
+                const types = (<UnionOrIntersectionType>elemType).types;
                 return getUnionType(types.map(type => {
                     return getResolvedJsxType(node, type, elemClassType);
                 }), /*subtypeReduction*/ true);
@@ -13557,7 +13551,7 @@ namespace ts {
                 return true;
             }
             if (type.flags & TypeFlags.UnionOrIntersection) {
-                const types = (<TypeOperatorType>type).types;
+                const types = (<UnionOrIntersectionType>type).types;
                 for (const t of types) {
                     if (maybeTypeOfKind(t, kind)) {
                         return true;
@@ -13575,7 +13569,7 @@ namespace ts {
                 return true;
             }
             if (type.flags & TypeFlags.Union) {
-                const types = (<TypeOperatorType>type).types;
+                const types = (<UnionOrIntersectionType>type).types;
                 for (const t of types) {
                     if (!isTypeOfKind(t, kind)) {
                         return false;
@@ -13584,7 +13578,7 @@ namespace ts {
                 return true;
             }
             if (type.flags & TypeFlags.Intersection) {
-                const types = (<TypeOperatorType>type).types;
+                const types = (<UnionOrIntersectionType>type).types;
                 for (const t of types) {
                     if (isTypeOfKind(t, kind)) {
                         return true;
@@ -14980,9 +14974,11 @@ namespace ts {
             forEach(node.members, checkSourceElement);
             if (produceDiagnostics) {
                 const type = getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node);
-                checkIndexConstraints(type);
-                checkTypeForDuplicateIndexSignatures(node);
-                checkObjectTypeForDuplicateDeclarations(node);
+                if (type.flags & TypeFlags.ObjectType) {
+                    checkIndexConstraints(type);
+                    checkTypeForDuplicateIndexSignatures(node);
+                    checkObjectTypeForDuplicateDeclarations(node);
+                }
             }
         }
 
@@ -20317,17 +20313,6 @@ namespace ts {
 
             for (const prop of node.properties) {
                 if (prop.kind === SyntaxKind.SpreadElementExpression) {
-                    const target = (prop as SpreadElementExpression).expression;
-                    switch (target.kind) {
-                        case SyntaxKind.Identifier:
-                        case SyntaxKind.PropertyAccessExpression:
-                        case SyntaxKind.ObjectLiteralExpression:
-                        case SyntaxKind.NullKeyword:
-                            break;
-                        default:
-                            grammarErrorOnNode(target, Diagnostics.Spread_properties_must_be_identifiers_property_accesses_or_object_literals);
-                    }
-
                     continue;
                 }
                 const name = prop.name;
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 37a335f67cf..65d67b6bf83 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -1967,17 +1967,9 @@
         "category": "Error",
         "code": 2696
     },
-    "Spread properties must be identifiers, property accesses, or object literals.": {
-        "category": "Error",
-        "code": 2697
-    },
-    "Cannot change type of property '{0}' from '{1}' to '{2}'.": {
-        "category": "Error",
-        "code": 2698
-    },
     "Interface declaration cannot contain a spread property.": {
         "category": "Error",
-        "code": 2699
+        "code": 2697
     },
 
     "Import declaration '{0}' is using private name '{1}'.": {
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 75aaf03f08b..0914f0ba414 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -1802,7 +1802,7 @@ namespace ts {
 
     export interface JSDocRecordType extends JSDocType {
         kind: SyntaxKind.JSDocRecordType;
-        literal: TypeLiteralNode;

+        literal: TypeLiteralNode;
     }
 
     export interface JSDocTypeReference extends JSDocType {
@@ -2536,7 +2536,7 @@ namespace ts {
         instantiations?: Map<Type>;         // Instantiations of generic type alias (undefined if non-generic)
         mapper?: TypeMapper;                // Type mapper for instantiation alias
         referenced?: boolean;               // True if alias symbol has been referenced as a value
-        containingType?: TypeOperatorType;  // Containing union or intersection type for synthetic property
+        containingType?: UnionOrIntersectionType;  // Containing union or intersection type for synthetic property
         leftSpread?: Symbol;                // Left source for synthetic spread property
         rightSpread?: Symbol;               // Right source for synthetic spread property
         hasNonUniformType?: boolean;        // True if constituents have non-uniform types
@@ -2755,7 +2755,7 @@ namespace ts {
         instantiations: Map<TypeReference>;   // Generic instantiation cache
     }
 
-    export interface TypeOperatorType extends Type {
+    export interface UnionOrIntersectionType extends Type {
         types: Type[];                    // Constituent types
         /* @internal */
         resolvedProperties: SymbolTable;  // Cache of resolved properties
@@ -2763,9 +2763,9 @@ namespace ts {
         couldContainTypeParameters: boolean;
     }
 
-    export interface UnionType extends TypeOperatorType { }
+    export interface UnionType extends UnionOrIntersectionType { }
 
-    export interface IntersectionType extends TypeOperatorType { }
+    export interface IntersectionType extends UnionOrIntersectionType { }
 
     /* @internal */
     export interface SpreadType extends Type {
@@ -2782,7 +2782,7 @@ namespace ts {
 
     /* @internal */
     // Resolved object, spread, union, or intersection type
-    export interface ResolvedType extends ObjectType, TypeOperatorType {
+    export interface ResolvedType extends ObjectType, UnionOrIntersectionType {
         members: SymbolTable;              // Properties by name
         properties: Symbol[];              // Properties
         callSignatures: Signature[];       // Call signatures of type
diff --git a/src/services/findAllReferences.ts b/src/services/findAllReferences.ts
index 8766937c008..dcda3e40b1a 100644
--- a/src/services/findAllReferences.ts
+++ b/src/services/findAllReferences.ts
@@ -458,7 +458,7 @@ namespace ts.FindAllReferences {
                                 return [localParentType.symbol];
                             }
                             else if (localParentType.flags & TypeFlags.UnionOrIntersection) {
-                                return getSymbolsForClassAndInterfaceComponents(<TypeOperatorType>localParentType);
+                                return getSymbolsForClassAndInterfaceComponents(<UnionOrIntersectionType>localParentType);
                             }
                         }
                     }
@@ -630,13 +630,13 @@ namespace ts.FindAllReferences {
             }
         }
 
-        function getSymbolsForClassAndInterfaceComponents(type: TypeOperatorType, result: Symbol[] = []): Symbol[] {
+        function getSymbolsForClassAndInterfaceComponents(type: UnionOrIntersectionType, result: Symbol[] = []): Symbol[] {
             for (const componentType of type.types) {
                 if (componentType.symbol && componentType.symbol.getFlags() & (SymbolFlags.Class | SymbolFlags.Interface)) {
                     result.push(componentType.symbol);
                 }
                 if (componentType.getFlags() & TypeFlags.UnionOrIntersection) {
-                    getSymbolsForClassAndInterfaceComponents(<TypeOperatorType>componentType, result);
+                    getSymbolsForClassAndInterfaceComponents(<UnionOrIntersectionType>componentType, result);
                 }
             }
             return result;

From 0dd1f0c00f641b98de531c165d884cfe2728927a Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 10 Oct 2016 10:07:41 -0700
Subject: [PATCH 023/421] Add tests and update baselines.

1. Union/intersection tests.
2. Primitive tests.
3. Update baselines after removing errors.
---
 .../duplicateObjectLiteralProperty.errors.txt |   8 +-
 .../reference/interfaceSpread.errors.txt      |   4 +-
 .../lastPropertyInLiteralWins.errors.txt      |   8 +-
 .../reference/memberOverride.errors.txt       |   5 +-
 .../reference/objectLiteralErrors.errors.txt  |   5 +-
 ...tiesErrorFromNotUsingIdentifier.errors.txt |   8 +-
 tests/baselines/reference/objectSpread.js     |  22 +-
 .../baselines/reference/objectSpread.symbols  | 268 +++++++++---------
 tests/baselines/reference/objectSpread.types  |  43 +--
 .../reference/objectSpreadIntersection.js     |  79 ++++++
 .../objectSpreadIntersection.symbols          | 219 ++++++++++++++
 .../reference/objectSpreadIntersection.types  | 236 +++++++++++++++
 .../reference/objectSpreadNegative.errors.txt |  76 +++--
 .../reference/objectSpreadNegative.js         |  56 ++--
 .../baselines/reference/objectSpreadUnion.js  |  52 ++++
 .../reference/objectSpreadUnion.symbols       | 122 ++++++++
 .../reference/objectSpreadUnion.types         | 131 +++++++++
 .../conformance/types/spread/objectSpread.ts  |  12 +-
 .../types/spread/objectSpreadIntersection.ts  |  36 +++
 .../types/spread/objectSpreadNegative.ts      |  30 +-
 .../types/spread/objectSpreadUnion.ts         |  23 ++
 21 files changed, 1199 insertions(+), 244 deletions(-)
 create mode 100644 tests/baselines/reference/objectSpreadIntersection.js
 create mode 100644 tests/baselines/reference/objectSpreadIntersection.symbols
 create mode 100644 tests/baselines/reference/objectSpreadIntersection.types
 create mode 100644 tests/baselines/reference/objectSpreadUnion.js
 create mode 100644 tests/baselines/reference/objectSpreadUnion.symbols
 create mode 100644 tests/baselines/reference/objectSpreadUnion.types
 create mode 100644 tests/cases/conformance/types/spread/objectSpreadIntersection.ts
 create mode 100644 tests/cases/conformance/types/spread/objectSpreadUnion.ts

diff --git a/tests/baselines/reference/duplicateObjectLiteralProperty.errors.txt b/tests/baselines/reference/duplicateObjectLiteralProperty.errors.txt
index 926a7071222..abc56a6f8fc 100644
--- a/tests/baselines/reference/duplicateObjectLiteralProperty.errors.txt
+++ b/tests/baselines/reference/duplicateObjectLiteralProperty.errors.txt
@@ -1,8 +1,6 @@
 tests/cases/compiler/duplicateObjectLiteralProperty.ts(4,5): error TS2300: Duplicate identifier 'a'.
 tests/cases/compiler/duplicateObjectLiteralProperty.ts(5,5): error TS2300: Duplicate identifier '\u0061'.
-tests/cases/compiler/duplicateObjectLiteralProperty.ts(5,5): error TS2698: Cannot change type of property 'a' from 'number' to 'string'.
 tests/cases/compiler/duplicateObjectLiteralProperty.ts(6,5): error TS2300: Duplicate identifier 'a'.
-tests/cases/compiler/duplicateObjectLiteralProperty.ts(6,5): error TS2698: Cannot change type of property 'a' from 'string' to '{ c: number; }'.
 tests/cases/compiler/duplicateObjectLiteralProperty.ts(8,9): error TS2300: Duplicate identifier '"c"'.
 tests/cases/compiler/duplicateObjectLiteralProperty.ts(14,9): error TS2300: Duplicate identifier 'a'.
 tests/cases/compiler/duplicateObjectLiteralProperty.ts(15,9): error TS2300: Duplicate identifier 'a'.
@@ -10,7 +8,7 @@ tests/cases/compiler/duplicateObjectLiteralProperty.ts(16,9): error TS1118: An o
 tests/cases/compiler/duplicateObjectLiteralProperty.ts(16,9): error TS2300: Duplicate identifier 'a'.
 
 
-==== tests/cases/compiler/duplicateObjectLiteralProperty.ts (10 errors) ====
+==== tests/cases/compiler/duplicateObjectLiteralProperty.ts (8 errors) ====
     var x = {
         a: 1,
         b: true, // OK
@@ -20,13 +18,9 @@ tests/cases/compiler/duplicateObjectLiteralProperty.ts(16,9): error TS2300: Dupl
         \u0061: "ss", // Duplicate
         ~~~~~~
 !!! error TS2300: Duplicate identifier '\u0061'.
-        ~~~~~~
-!!! error TS2698: Cannot change type of property 'a' from 'number' to 'string'.
         a: {
         ~
 !!! error TS2300: Duplicate identifier 'a'.
-        ~
-!!! error TS2698: Cannot change type of property 'a' from 'string' to '{ c: number; }'.
             c: 1,
             "c": 56, // Duplicate
             ~~~
diff --git a/tests/baselines/reference/interfaceSpread.errors.txt b/tests/baselines/reference/interfaceSpread.errors.txt
index 2b27c972cc8..d8556de9f93 100644
--- a/tests/baselines/reference/interfaceSpread.errors.txt
+++ b/tests/baselines/reference/interfaceSpread.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/types/spread/interfaceSpread.ts(2,5): error TS2699: Interface declaration cannot contain a spread property.
+tests/cases/conformance/types/spread/interfaceSpread.ts(2,5): error TS2697: Interface declaration cannot contain a spread property.
 tests/cases/conformance/types/spread/interfaceSpread.ts(7,10): error TS2339: Property 'jam' does not exist on type 'Congealed<{ jam: number; }, { peanutButter: number; }>'.
 tests/cases/conformance/types/spread/interfaceSpread.ts(8,10): error TS2339: Property 'peanutButter' does not exist on type 'Congealed<{ jam: number; }, { peanutButter: number; }>'.
 
@@ -7,7 +7,7 @@ tests/cases/conformance/types/spread/interfaceSpread.ts(8,10): error TS2339: Pro
     interface Congealed<T, U> {
         ...T
         ~~~~
-!!! error TS2699: Interface declaration cannot contain a spread property.
+!!! error TS2697: Interface declaration cannot contain a spread property.
         ...U
     }
     
diff --git a/tests/baselines/reference/lastPropertyInLiteralWins.errors.txt b/tests/baselines/reference/lastPropertyInLiteralWins.errors.txt
index c8844f2c572..2b4a694975b 100644
--- a/tests/baselines/reference/lastPropertyInLiteralWins.errors.txt
+++ b/tests/baselines/reference/lastPropertyInLiteralWins.errors.txt
@@ -4,12 +4,10 @@ tests/cases/compiler/lastPropertyInLiteralWins.ts(7,6): error TS2345: Argument o
       Types of parameters 'num' and 'str' are incompatible.
         Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/lastPropertyInLiteralWins.ts(9,5): error TS2300: Duplicate identifier 'thunk'.
-tests/cases/compiler/lastPropertyInLiteralWins.ts(9,5): error TS2698: Cannot change type of property 'thunk' from '(str: string) => void' to '(num: number) => void'.
 tests/cases/compiler/lastPropertyInLiteralWins.ts(14,5): error TS2300: Duplicate identifier 'thunk'.
-tests/cases/compiler/lastPropertyInLiteralWins.ts(14,5): error TS2698: Cannot change type of property 'thunk' from '(num: number) => void' to '(str: string) => void'.
 
 
-==== tests/cases/compiler/lastPropertyInLiteralWins.ts (5 errors) ====
+==== tests/cases/compiler/lastPropertyInLiteralWins.ts (3 errors) ====
     interface Thing {
         thunk: (str: string) => void;
     }
@@ -24,8 +22,6 @@ tests/cases/compiler/lastPropertyInLiteralWins.ts(14,5): error TS2698: Cannot ch
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         ~~~~~
 !!! error TS2300: Duplicate identifier 'thunk'.
-        ~~~~~
-!!! error TS2698: Cannot change type of property 'thunk' from '(str: string) => void' to '(num: number) => void'.
     });
     ~
 !!! error TS2345: Argument of type '{ thunk: (num: number) => void; }' is not assignable to parameter of type 'Thing'.
@@ -39,7 +35,5 @@ tests/cases/compiler/lastPropertyInLiteralWins.ts(14,5): error TS2698: Cannot ch
         thunk: (str: string) => {}
         ~~~~~
 !!! error TS2300: Duplicate identifier 'thunk'.
-        ~~~~~
-!!! error TS2698: Cannot change type of property 'thunk' from '(num: number) => void' to '(str: string) => void'.
     });
     
\ No newline at end of file
diff --git a/tests/baselines/reference/memberOverride.errors.txt b/tests/baselines/reference/memberOverride.errors.txt
index 355db001505..15c4b2ad37b 100644
--- a/tests/baselines/reference/memberOverride.errors.txt
+++ b/tests/baselines/reference/memberOverride.errors.txt
@@ -1,8 +1,7 @@
 tests/cases/compiler/memberOverride.ts(5,5): error TS2300: Duplicate identifier 'a'.
-tests/cases/compiler/memberOverride.ts(5,5): error TS2698: Cannot change type of property 'a' from 'string' to 'number'.
 
 
-==== tests/cases/compiler/memberOverride.ts (2 errors) ====
+==== tests/cases/compiler/memberOverride.ts (1 errors) ====
     // An object initialiser accepts the first definition for the same property with a different type signature
     // Should compile, since the second declaration of a overrides the first
     var x = {
@@ -10,8 +9,6 @@ tests/cases/compiler/memberOverride.ts(5,5): error TS2698: Cannot change type of
         a: 5
         ~
 !!! error TS2300: Duplicate identifier 'a'.
-        ~
-!!! error TS2698: Cannot change type of property 'a' from 'string' to 'number'.
     }
     
     var n: number = x.a;
\ No newline at end of file
diff --git a/tests/baselines/reference/objectLiteralErrors.errors.txt b/tests/baselines/reference/objectLiteralErrors.errors.txt
index f70f255df05..234ac24a8fd 100644
--- a/tests/baselines/reference/objectLiteralErrors.errors.txt
+++ b/tests/baselines/reference/objectLiteralErrors.errors.txt
@@ -1,7 +1,6 @@
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(3,18): error TS2300: Duplicate identifier 'a'.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(4,19): error TS2300: Duplicate identifier 'a'.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(5,18): error TS2300: Duplicate identifier 'a'.
-tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(5,18): error TS2698: Cannot change type of property 'a' from 'number' to 'string'.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(6,21): error TS2300: Duplicate identifier 'a'.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(7,19): error TS2300: Duplicate identifier 'a'.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(8,18): error TS2300: Duplicate identifier ''a''.
@@ -79,7 +78,7 @@ tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(45,16)
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(45,55): error TS2380: 'get' and 'set' accessor must have the same type.
 
 
-==== tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts (79 errors) ====
+==== tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts (78 errors) ====
     
     // Multiple properties with the same name
     var e1 = { a: 0, a: 0 };
@@ -91,8 +90,6 @@ tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(45,55)
     var e3 = { a: 0, a: '' };
                      ~
 !!! error TS2300: Duplicate identifier 'a'.
-                     ~
-!!! error TS2698: Cannot change type of property 'a' from 'number' to 'string'.
     var e4 = { a: true, a: false };
                         ~
 !!! error TS2300: Duplicate identifier 'a'.
diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.errors.txt b/tests/baselines/reference/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.errors.txt
index cbe19cab2d2..5fa8a12e875 100644
--- a/tests/baselines/reference/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.errors.txt
+++ b/tests/baselines/reference/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.errors.txt
@@ -8,14 +8,12 @@ tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPr
 tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts(10,10): error TS1005: ':' expected.
 tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts(12,1): error TS1005: ':' expected.
 tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts(15,6): error TS1005: ':' expected.
-tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts(16,5): error TS2698: Cannot change type of property 'a' from 'any' to 'string[]'.
 tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts(16,6): error TS1005: ':' expected.
-tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts(17,5): error TS2698: Cannot change type of property 'a' from 'string[]' to 'number[]'.
 tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts(17,6): error TS1005: ':' expected.
 tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts(20,17): error TS1005: ':' expected.
 
 
-==== tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts (15 errors) ====
+==== tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPropertiesErrorFromNotUsingIdentifier.ts (13 errors) ====
     // errors
     var y = {
         "stringLiteral",
@@ -52,13 +50,9 @@ tests/cases/conformance/es6/shorthandPropertyAssignment/objectLiteralShorthandPr
          ~
 !!! error TS1005: ':' expected.
         a["ss"],
-        ~
-!!! error TS2698: Cannot change type of property 'a' from 'any' to 'string[]'.
          ~
 !!! error TS1005: ':' expected.
         a[1],
-        ~
-!!! error TS2698: Cannot change type of property 'a' from 'string[]' to 'number[]'.
          ~
 !!! error TS1005: ':' expected.
     };
diff --git a/tests/baselines/reference/objectSpread.js b/tests/baselines/reference/objectSpread.js
index a59577fe9de..a09f5aa0fbb 100644
--- a/tests/baselines/reference/objectSpread.js
+++ b/tests/baselines/reference/objectSpread.js
@@ -35,11 +35,13 @@ let getter: { a: number, c: number } =
     { ...op, c: 7 }
 getter.a = 12;
 
-// null and undefined are just skipped
-let spreadNull: { a: number } =
-    { a: 7, ...null }
-let spreadUndefined: { a: number } =
-    { a: 7, ...undefined }
+// null, undefined, functions and primitives result in { }
+let spreadNull = { ...null };
+let spreadUndefind = { ...undefined };
+let spreadNum = { ...12 };
+let spreadStr = { ...'foo' };
+let spreadBool = { ...false };
+let spreadFunc = { ...(function () { }) };
 
 // methods are not enumerable
 class C { p = 1; m() { } }
@@ -126,9 +128,13 @@ var propertyNested = __assign({ a: __assign({}, o) });
 var op = { get a() { return 6; } };
 var getter = __assign({}, op, { c: 7 });
 getter.a = 12;
-// null and undefined are just skipped
-var spreadNull = __assign({ a: 7 }, null);
-var spreadUndefined = __assign({ a: 7 }, undefined);
+// null, undefined, functions and primitives result in { }
+var spreadNull = __assign({}, null);
+var spreadUndefind = __assign({}, undefined);
+var spreadNum = __assign({}, 12);
+var spreadStr = __assign({}, 'foo');
+var spreadBool = __assign({}, false);
+var spreadFunc = __assign({}, (function () { }));
 // methods are not enumerable
 var C = (function () {
     function C() {
diff --git a/tests/baselines/reference/objectSpread.symbols b/tests/baselines/reference/objectSpread.symbols
index 001c42804d2..edb0b4c2f08 100644
--- a/tests/baselines/reference/objectSpread.symbols
+++ b/tests/baselines/reference/objectSpread.symbols
@@ -150,220 +150,224 @@ getter.a = 12;
 >getter : Symbol(getter, Decl(objectSpread.ts, 32, 3))
 >a : Symbol(a, Decl(objectSpread.ts, 32, 13))
 
-// null and undefined are just skipped
-let spreadNull: { a: number } =
+// null, undefined, functions and primitives result in { }
+let spreadNull = { ...null };
 >spreadNull : Symbol(spreadNull, Decl(objectSpread.ts, 37, 3))
->a : Symbol(a, Decl(objectSpread.ts, 37, 17))
 
-    { a: 7, ...null }
->a : Symbol(a, Decl(objectSpread.ts, 38, 5))
+let spreadUndefind = { ...undefined };
+>spreadUndefind : Symbol(spreadUndefind, Decl(objectSpread.ts, 38, 3))
 
-let spreadUndefined: { a: number } =
->spreadUndefined : Symbol(spreadUndefined, Decl(objectSpread.ts, 39, 3))
->a : Symbol(a, Decl(objectSpread.ts, 39, 22))
+let spreadNum = { ...12 };
+>spreadNum : Symbol(spreadNum, Decl(objectSpread.ts, 39, 3))
 
-    { a: 7, ...undefined }
->a : Symbol(a, Decl(objectSpread.ts, 40, 5))
+let spreadStr = { ...'foo' };
+>spreadStr : Symbol(spreadStr, Decl(objectSpread.ts, 40, 3))
+
+let spreadBool = { ...false };
+>spreadBool : Symbol(spreadBool, Decl(objectSpread.ts, 41, 3))
+
+let spreadFunc = { ...(function () { }) };
+>spreadFunc : Symbol(spreadFunc, Decl(objectSpread.ts, 42, 3))
 
 // methods are not enumerable
 class C { p = 1; m() { } }
->C : Symbol(C, Decl(objectSpread.ts, 40, 26))
->p : Symbol(C.p, Decl(objectSpread.ts, 43, 9))
->m : Symbol(C.m, Decl(objectSpread.ts, 43, 16))
+>C : Symbol(C, Decl(objectSpread.ts, 42, 42))
+>p : Symbol(C.p, Decl(objectSpread.ts, 45, 9))
+>m : Symbol(C.m, Decl(objectSpread.ts, 45, 16))
 
 let c: C = new C()
->c : Symbol(c, Decl(objectSpread.ts, 44, 3))
->C : Symbol(C, Decl(objectSpread.ts, 40, 26))
->C : Symbol(C, Decl(objectSpread.ts, 40, 26))
+>c : Symbol(c, Decl(objectSpread.ts, 46, 3))
+>C : Symbol(C, Decl(objectSpread.ts, 42, 42))
+>C : Symbol(C, Decl(objectSpread.ts, 42, 42))
 
 let spreadC: { p: number } = { ...c }
->spreadC : Symbol(spreadC, Decl(objectSpread.ts, 45, 3))
->p : Symbol(p, Decl(objectSpread.ts, 45, 14))
+>spreadC : Symbol(spreadC, Decl(objectSpread.ts, 47, 3))
+>p : Symbol(p, Decl(objectSpread.ts, 47, 14))
 
 // own methods are enumerable
 let cplus: { p: number, plus(): void } = { ...c, plus() { return this.p + 1; } };
->cplus : Symbol(cplus, Decl(objectSpread.ts, 48, 3))
->p : Symbol(p, Decl(objectSpread.ts, 48, 12))
->plus : Symbol(plus, Decl(objectSpread.ts, 48, 23))
->plus : Symbol(plus, Decl(objectSpread.ts, 48, 48))
+>cplus : Symbol(cplus, Decl(objectSpread.ts, 50, 3))
+>p : Symbol(p, Decl(objectSpread.ts, 50, 12))
+>plus : Symbol(plus, Decl(objectSpread.ts, 50, 23))
+>plus : Symbol(plus, Decl(objectSpread.ts, 50, 48))
 
 cplus.plus();
->cplus.plus : Symbol(plus, Decl(objectSpread.ts, 48, 23))
->cplus : Symbol(cplus, Decl(objectSpread.ts, 48, 3))
->plus : Symbol(plus, Decl(objectSpread.ts, 48, 23))
+>cplus.plus : Symbol(plus, Decl(objectSpread.ts, 50, 23))
+>cplus : Symbol(cplus, Decl(objectSpread.ts, 50, 3))
+>plus : Symbol(plus, Decl(objectSpread.ts, 50, 23))
 
 // new field's type conflicting with existing field is OK
 let changeTypeAfter: { a: string, b: string } =
->changeTypeAfter : Symbol(changeTypeAfter, Decl(objectSpread.ts, 52, 3))
->a : Symbol(a, Decl(objectSpread.ts, 52, 22))
->b : Symbol(b, Decl(objectSpread.ts, 52, 33))
+>changeTypeAfter : Symbol(changeTypeAfter, Decl(objectSpread.ts, 54, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 54, 22))
+>b : Symbol(b, Decl(objectSpread.ts, 54, 33))
 
     { ...o, a: 'wrong type?' }
->a : Symbol(a, Decl(objectSpread.ts, 53, 11))
+>a : Symbol(a, Decl(objectSpread.ts, 55, 11))
 
 let changeTypeBefore: { a: number, b: string } =
->changeTypeBefore : Symbol(changeTypeBefore, Decl(objectSpread.ts, 54, 3))
->a : Symbol(a, Decl(objectSpread.ts, 54, 23))
->b : Symbol(b, Decl(objectSpread.ts, 54, 34))
+>changeTypeBefore : Symbol(changeTypeBefore, Decl(objectSpread.ts, 56, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 56, 23))
+>b : Symbol(b, Decl(objectSpread.ts, 56, 34))
 
     { a: 'wrong type?', ...o };
->a : Symbol(a, Decl(objectSpread.ts, 55, 5))
+>a : Symbol(a, Decl(objectSpread.ts, 57, 5))
 
 let changeTypeBoth: { a: string, b: number } =
->changeTypeBoth : Symbol(changeTypeBoth, Decl(objectSpread.ts, 56, 3))
->a : Symbol(a, Decl(objectSpread.ts, 56, 21))
->b : Symbol(b, Decl(objectSpread.ts, 56, 32))
+>changeTypeBoth : Symbol(changeTypeBoth, Decl(objectSpread.ts, 58, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 58, 21))
+>b : Symbol(b, Decl(objectSpread.ts, 58, 32))
 
     { ...o, ...swap };
 
 // optional
 let definiteBoolean: { sn: boolean };
->definiteBoolean : Symbol(definiteBoolean, Decl(objectSpread.ts, 60, 3))
->sn : Symbol(sn, Decl(objectSpread.ts, 60, 22))
+>definiteBoolean : Symbol(definiteBoolean, Decl(objectSpread.ts, 62, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 62, 22))
 
 let definiteString: { sn: string };
->definiteString : Symbol(definiteString, Decl(objectSpread.ts, 61, 3))
->sn : Symbol(sn, Decl(objectSpread.ts, 61, 21))
-
-let optionalString: { sn?: string };
->optionalString : Symbol(optionalString, Decl(objectSpread.ts, 62, 3))
->sn : Symbol(sn, Decl(objectSpread.ts, 62, 21))
-
-let optionalNumber: { sn?: number };
->optionalNumber : Symbol(optionalNumber, Decl(objectSpread.ts, 63, 3))
+>definiteString : Symbol(definiteString, Decl(objectSpread.ts, 63, 3))
 >sn : Symbol(sn, Decl(objectSpread.ts, 63, 21))
 
+let optionalString: { sn?: string };
+>optionalString : Symbol(optionalString, Decl(objectSpread.ts, 64, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 64, 21))
+
+let optionalNumber: { sn?: number };
+>optionalNumber : Symbol(optionalNumber, Decl(objectSpread.ts, 65, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 65, 21))
+
 let optionalUnionStops: { sn: string | number | boolean } = { ...definiteBoolean, ...definiteString, ...optionalNumber };
->optionalUnionStops : Symbol(optionalUnionStops, Decl(objectSpread.ts, 64, 3))
->sn : Symbol(sn, Decl(objectSpread.ts, 64, 25))
+>optionalUnionStops : Symbol(optionalUnionStops, Decl(objectSpread.ts, 66, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 66, 25))
 
 let optionalUnionDuplicates: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...optionalString, ...optionalNumber };
->optionalUnionDuplicates : Symbol(optionalUnionDuplicates, Decl(objectSpread.ts, 65, 3))
->sn : Symbol(sn, Decl(objectSpread.ts, 65, 30))
+>optionalUnionDuplicates : Symbol(optionalUnionDuplicates, Decl(objectSpread.ts, 67, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 67, 30))
 
 let allOptional: { sn?: string | number } = { ...optionalString, ...optionalNumber };
->allOptional : Symbol(allOptional, Decl(objectSpread.ts, 66, 3))
->sn : Symbol(sn, Decl(objectSpread.ts, 66, 18))
+>allOptional : Symbol(allOptional, Decl(objectSpread.ts, 68, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 68, 18))
 
 // computed property
 let computedFirst: { a: number, b: string, "before everything": number } =
->computedFirst : Symbol(computedFirst, Decl(objectSpread.ts, 69, 3))
->a : Symbol(a, Decl(objectSpread.ts, 69, 20))
->b : Symbol(b, Decl(objectSpread.ts, 69, 31))
+>computedFirst : Symbol(computedFirst, Decl(objectSpread.ts, 71, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 71, 20))
+>b : Symbol(b, Decl(objectSpread.ts, 71, 31))
 
     { ['before everything']: 12, ...o, b: 'yes' }
->'before everything' : Symbol(['before everything'], Decl(objectSpread.ts, 70, 5))
->b : Symbol(b, Decl(objectSpread.ts, 70, 38))
+>'before everything' : Symbol(['before everything'], Decl(objectSpread.ts, 72, 5))
+>b : Symbol(b, Decl(objectSpread.ts, 72, 38))
 
 let computedMiddle: { a: number, b: string, c: boolean, "in the middle": number } =
->computedMiddle : Symbol(computedMiddle, Decl(objectSpread.ts, 71, 3))
->a : Symbol(a, Decl(objectSpread.ts, 71, 21))
->b : Symbol(b, Decl(objectSpread.ts, 71, 32))
->c : Symbol(c, Decl(objectSpread.ts, 71, 43))
+>computedMiddle : Symbol(computedMiddle, Decl(objectSpread.ts, 73, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 73, 21))
+>b : Symbol(b, Decl(objectSpread.ts, 73, 32))
+>c : Symbol(c, Decl(objectSpread.ts, 73, 43))
 
     { ...o, ['in the middle']: 13, b: 'maybe?', ...o2 }
->'in the middle' : Symbol(['in the middle'], Decl(objectSpread.ts, 72, 11))
->b : Symbol(b, Decl(objectSpread.ts, 72, 34))
+>'in the middle' : Symbol(['in the middle'], Decl(objectSpread.ts, 74, 11))
+>b : Symbol(b, Decl(objectSpread.ts, 74, 34))
 
 let computedAfter: { a: number, b: string, "at the end": number } =
->computedAfter : Symbol(computedAfter, Decl(objectSpread.ts, 73, 3))
->a : Symbol(a, Decl(objectSpread.ts, 73, 20))
->b : Symbol(b, Decl(objectSpread.ts, 73, 31))
+>computedAfter : Symbol(computedAfter, Decl(objectSpread.ts, 75, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 75, 20))
+>b : Symbol(b, Decl(objectSpread.ts, 75, 31))
 
     { ...o, b: 'yeah', ['at the end']: 14 }
->b : Symbol(b, Decl(objectSpread.ts, 74, 11))
->'at the end' : Symbol(['at the end'], Decl(objectSpread.ts, 74, 22))
+>b : Symbol(b, Decl(objectSpread.ts, 76, 11))
+>'at the end' : Symbol(['at the end'], Decl(objectSpread.ts, 76, 22))
 
 // shortcut syntax
 let a = 12;
->a : Symbol(a, Decl(objectSpread.ts, 76, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 78, 3))
 
 let shortCutted: { a: number, b: string } = { ...o, a }
->shortCutted : Symbol(shortCutted, Decl(objectSpread.ts, 77, 3))
->a : Symbol(a, Decl(objectSpread.ts, 77, 18))
->b : Symbol(b, Decl(objectSpread.ts, 77, 29))
->a : Symbol(a, Decl(objectSpread.ts, 77, 51))
+>shortCutted : Symbol(shortCutted, Decl(objectSpread.ts, 79, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 79, 18))
+>b : Symbol(b, Decl(objectSpread.ts, 79, 29))
+>a : Symbol(a, Decl(objectSpread.ts, 79, 51))
 
 // generics
 function f<T, U>(t: T, u: U): { id: string, ...T, ...U } {
->f : Symbol(f, Decl(objectSpread.ts, 77, 55))
->T : Symbol(T, Decl(objectSpread.ts, 80, 11))
->U : Symbol(U, Decl(objectSpread.ts, 80, 13))
->t : Symbol(t, Decl(objectSpread.ts, 80, 17))
->T : Symbol(T, Decl(objectSpread.ts, 80, 11))
->u : Symbol(u, Decl(objectSpread.ts, 80, 22))
->U : Symbol(U, Decl(objectSpread.ts, 80, 13))
->id : Symbol(id, Decl(objectSpread.ts, 80, 31))
->T : Symbol(T, Decl(objectSpread.ts, 80, 11))
->U : Symbol(U, Decl(objectSpread.ts, 80, 13))
+>f : Symbol(f, Decl(objectSpread.ts, 79, 55))
+>T : Symbol(T, Decl(objectSpread.ts, 82, 11))
+>U : Symbol(U, Decl(objectSpread.ts, 82, 13))
+>t : Symbol(t, Decl(objectSpread.ts, 82, 17))
+>T : Symbol(T, Decl(objectSpread.ts, 82, 11))
+>u : Symbol(u, Decl(objectSpread.ts, 82, 22))
+>U : Symbol(U, Decl(objectSpread.ts, 82, 13))
+>id : Symbol(id, Decl(objectSpread.ts, 82, 31))
+>T : Symbol(T, Decl(objectSpread.ts, 82, 11))
+>U : Symbol(U, Decl(objectSpread.ts, 82, 13))
 
     return { id: 'id', ...t, ...u };
->id : Symbol(id, Decl(objectSpread.ts, 81, 12))
+>id : Symbol(id, Decl(objectSpread.ts, 83, 12))
 }
 let exclusive: { id: string, a: number, b: string, c: string, d: boolean } =
->exclusive : Symbol(exclusive, Decl(objectSpread.ts, 83, 3))
->id : Symbol(id, Decl(objectSpread.ts, 83, 16))
->a : Symbol(a, Decl(objectSpread.ts, 83, 28))
->b : Symbol(b, Decl(objectSpread.ts, 83, 39))
->c : Symbol(c, Decl(objectSpread.ts, 83, 50))
->d : Symbol(d, Decl(objectSpread.ts, 83, 61))
+>exclusive : Symbol(exclusive, Decl(objectSpread.ts, 85, 3))
+>id : Symbol(id, Decl(objectSpread.ts, 85, 16))
+>a : Symbol(a, Decl(objectSpread.ts, 85, 28))
+>b : Symbol(b, Decl(objectSpread.ts, 85, 39))
+>c : Symbol(c, Decl(objectSpread.ts, 85, 50))
+>d : Symbol(d, Decl(objectSpread.ts, 85, 61))
 
     f({ a: 1, b: 'yes' }, { c: 'no', d: false })
->f : Symbol(f, Decl(objectSpread.ts, 77, 55))
->a : Symbol(a, Decl(objectSpread.ts, 84, 7))
->b : Symbol(b, Decl(objectSpread.ts, 84, 13))
->c : Symbol(c, Decl(objectSpread.ts, 84, 27))
->d : Symbol(d, Decl(objectSpread.ts, 84, 36))
+>f : Symbol(f, Decl(objectSpread.ts, 79, 55))
+>a : Symbol(a, Decl(objectSpread.ts, 86, 7))
+>b : Symbol(b, Decl(objectSpread.ts, 86, 13))
+>c : Symbol(c, Decl(objectSpread.ts, 86, 27))
+>d : Symbol(d, Decl(objectSpread.ts, 86, 36))
 
 let overlap: { id: string, a: number, b: string } =
->overlap : Symbol(overlap, Decl(objectSpread.ts, 85, 3))
->id : Symbol(id, Decl(objectSpread.ts, 85, 14))
->a : Symbol(a, Decl(objectSpread.ts, 85, 26))
->b : Symbol(b, Decl(objectSpread.ts, 85, 37))
+>overlap : Symbol(overlap, Decl(objectSpread.ts, 87, 3))
+>id : Symbol(id, Decl(objectSpread.ts, 87, 14))
+>a : Symbol(a, Decl(objectSpread.ts, 87, 26))
+>b : Symbol(b, Decl(objectSpread.ts, 87, 37))
 
     f({ a: 1 }, { a: 2, b: 'extra' })
->f : Symbol(f, Decl(objectSpread.ts, 77, 55))
->a : Symbol(a, Decl(objectSpread.ts, 86, 7))
->a : Symbol(a, Decl(objectSpread.ts, 86, 17))
->b : Symbol(b, Decl(objectSpread.ts, 86, 23))
-
-let overlapConflict: { id:string, a: string } =
->overlapConflict : Symbol(overlapConflict, Decl(objectSpread.ts, 87, 3))
->id : Symbol(id, Decl(objectSpread.ts, 87, 22))
->a : Symbol(a, Decl(objectSpread.ts, 87, 33))
-
-    f({ a: 1 }, { a: 'mismatch' })
->f : Symbol(f, Decl(objectSpread.ts, 77, 55))
+>f : Symbol(f, Decl(objectSpread.ts, 79, 55))
 >a : Symbol(a, Decl(objectSpread.ts, 88, 7))
 >a : Symbol(a, Decl(objectSpread.ts, 88, 17))
+>b : Symbol(b, Decl(objectSpread.ts, 88, 23))
+
+let overlapConflict: { id:string, a: string } =
+>overlapConflict : Symbol(overlapConflict, Decl(objectSpread.ts, 89, 3))
+>id : Symbol(id, Decl(objectSpread.ts, 89, 22))
+>a : Symbol(a, Decl(objectSpread.ts, 89, 33))
+
+    f({ a: 1 }, { a: 'mismatch' })
+>f : Symbol(f, Decl(objectSpread.ts, 79, 55))
+>a : Symbol(a, Decl(objectSpread.ts, 90, 7))
+>a : Symbol(a, Decl(objectSpread.ts, 90, 17))
 
 let overwriteId: { id: boolean, a: number, c: number, d: string } =
->overwriteId : Symbol(overwriteId, Decl(objectSpread.ts, 89, 3))
->id : Symbol(id, Decl(objectSpread.ts, 89, 18))
->a : Symbol(a, Decl(objectSpread.ts, 89, 31))
->c : Symbol(c, Decl(objectSpread.ts, 89, 42))
->d : Symbol(d, Decl(objectSpread.ts, 89, 53))
+>overwriteId : Symbol(overwriteId, Decl(objectSpread.ts, 91, 3))
+>id : Symbol(id, Decl(objectSpread.ts, 91, 18))
+>a : Symbol(a, Decl(objectSpread.ts, 91, 31))
+>c : Symbol(c, Decl(objectSpread.ts, 91, 42))
+>d : Symbol(d, Decl(objectSpread.ts, 91, 53))
 
     f({ a: 1, id: true }, { c: 1, d: 'no' })
->f : Symbol(f, Decl(objectSpread.ts, 77, 55))
->a : Symbol(a, Decl(objectSpread.ts, 90, 7))
->id : Symbol(id, Decl(objectSpread.ts, 90, 13))
->c : Symbol(c, Decl(objectSpread.ts, 90, 27))
->d : Symbol(d, Decl(objectSpread.ts, 90, 33))
+>f : Symbol(f, Decl(objectSpread.ts, 79, 55))
+>a : Symbol(a, Decl(objectSpread.ts, 92, 7))
+>id : Symbol(id, Decl(objectSpread.ts, 92, 13))
+>c : Symbol(c, Decl(objectSpread.ts, 92, 27))
+>d : Symbol(d, Decl(objectSpread.ts, 92, 33))
 
 class D { m() { }; q = 2; }
->D : Symbol(D, Decl(objectSpread.ts, 90, 44))
->m : Symbol(D.m, Decl(objectSpread.ts, 92, 9))
->q : Symbol(D.q, Decl(objectSpread.ts, 92, 18))
+>D : Symbol(D, Decl(objectSpread.ts, 92, 44))
+>m : Symbol(D.m, Decl(objectSpread.ts, 94, 9))
+>q : Symbol(D.q, Decl(objectSpread.ts, 94, 18))
 
 let classesAreWrong: { id: string, ...C, ...D } =
->classesAreWrong : Symbol(classesAreWrong, Decl(objectSpread.ts, 93, 3))
->id : Symbol(id, Decl(objectSpread.ts, 93, 22))
->C : Symbol(C, Decl(objectSpread.ts, 40, 26))
->D : Symbol(D, Decl(objectSpread.ts, 90, 44))
+>classesAreWrong : Symbol(classesAreWrong, Decl(objectSpread.ts, 95, 3))
+>id : Symbol(id, Decl(objectSpread.ts, 95, 22))
+>C : Symbol(C, Decl(objectSpread.ts, 42, 42))
+>D : Symbol(D, Decl(objectSpread.ts, 92, 44))
 
     f(new C(), new D())
->f : Symbol(f, Decl(objectSpread.ts, 77, 55))
->C : Symbol(C, Decl(objectSpread.ts, 40, 26))
->D : Symbol(D, Decl(objectSpread.ts, 90, 44))
+>f : Symbol(f, Decl(objectSpread.ts, 79, 55))
+>C : Symbol(C, Decl(objectSpread.ts, 42, 42))
+>D : Symbol(D, Decl(objectSpread.ts, 92, 44))
 
diff --git a/tests/baselines/reference/objectSpread.types b/tests/baselines/reference/objectSpread.types
index 86d04eb4588..2b13af1d3d6 100644
--- a/tests/baselines/reference/objectSpread.types
+++ b/tests/baselines/reference/objectSpread.types
@@ -223,27 +223,36 @@ getter.a = 12;
 >a : number
 >12 : 12
 
-// null and undefined are just skipped
-let spreadNull: { a: number } =
->spreadNull : { a: number; }
->a : number
-
-    { a: 7, ...null }
->{ a: 7, ...null } : { a: number; }
->a : number
->7 : 7
+// null, undefined, functions and primitives result in { }
+let spreadNull = { ...null };
+>spreadNull : {}
+>{ ...null } : {}
 >null : null
 
-let spreadUndefined: { a: number } =
->spreadUndefined : { a: number; }
->a : number
-
-    { a: 7, ...undefined }
->{ a: 7, ...undefined } : { a: number; }
->a : number
->7 : 7
+let spreadUndefind = { ...undefined };
+>spreadUndefind : {}
+>{ ...undefined } : {}
 >undefined : any
 
+let spreadNum = { ...12 };
+>spreadNum : {}
+>{ ...12 } : {}
+
+let spreadStr = { ...'foo' };
+>spreadStr : {}
+>{ ...'foo' } : {}
+
+let spreadBool = { ...false };
+>spreadBool : {}
+>{ ...false } : {}
+>false : false
+
+let spreadFunc = { ...(function () { }) };
+>spreadFunc : {}
+>{ ...(function () { }) } : {}
+>(function () { }) : () => void
+>function () { } : () => void
+
 // methods are not enumerable
 class C { p = 1; m() { } }
 >C : C
diff --git a/tests/baselines/reference/objectSpreadIntersection.js b/tests/baselines/reference/objectSpreadIntersection.js
new file mode 100644
index 00000000000..cb93c547963
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadIntersection.js
@@ -0,0 +1,79 @@
+//// [objectSpreadIntersection.ts]
+function iteratedUnionIntersection<T, U, V>(t: T, u: U, v: V): void {
+    let tu: T | U;
+    let uv: U & V;
+    let result = { id: 'bar', ...tu, ...uv };
+    let expected: ({ id: string, ...T, ...U } & { id: string, ...T, ...V }) | ({ id: string, ...U } & { id: string, ...U, ...V });
+    let assignable: { id: string, ...(T | U), ...(U & V) } = result;
+}
+// concrete types work
+interface A1 { a: number }
+interface A2 { a: string }
+let a12: A1 & A2;
+let result = { ...a12 };
+let sn: number & string = result.a;
+let assignable: { ...(A1 & A2) } = result;
+
+function tripleIntersection<T, U, V>(t: T, u: U, v: V): void {
+    let tuv: T & U & V;
+    let result = { id: 'foo', ...tuv };
+    let expected: { id: string, ...T } & { id: string, ...U } & { id: string, ...V } = result;
+    let assignable: { id: string, ...(T & U & V) } = result;
+}
+function iteratedDoubleIntersection<T, U, V>(t: T, u: U, v: V): void {
+    let tu: T & U;
+    let uv: U & V;
+    let result = { id: 'bar', ...tu, ...uv };
+    let expected: { id: string, ...T, ...U } & { id: string, ...T, ...V } & { id: string, ...U } & { id: string, ...U, ...V };
+    let assignable: { id: string, ...(T & U), ...(U & V) } = result;
+}
+function iteratedIntersectionUnion<T, U, V>(t: T, u: U, v: V): void {
+    let tu: T & U;
+    let uv: U | V;
+    let result = { id: 'bar', ...tu, ...uv };
+    let expected: ({ id: string, ...T, ...U } & { id: string, ...U }) | ({ id: string, ...T, ...V } & { id: string, ...U, ...V });
+    let assignable: { id: string, ...(T & U), ...(U | V) } = result;
+}
+
+
+
+//// [objectSpreadIntersection.js]
+var __assign = (this && this.__assign) || Object.assign || function(t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+        s = arguments[i];
+        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+            t[p] = s[p];
+    }
+    return t;
+};
+function iteratedUnionIntersection(t, u, v) {
+    var tu;
+    var uv;
+    var result = __assign({ id: 'bar' }, tu, uv);
+    var expected;
+    var assignable = result;
+}
+var a12;
+var result = __assign({}, a12);
+var sn = result.a;
+var assignable = result;
+function tripleIntersection(t, u, v) {
+    var tuv;
+    var result = __assign({ id: 'foo' }, tuv);
+    var expected = result;
+    var assignable = result;
+}
+function iteratedDoubleIntersection(t, u, v) {
+    var tu;
+    var uv;
+    var result = __assign({ id: 'bar' }, tu, uv);
+    var expected;
+    var assignable = result;
+}
+function iteratedIntersectionUnion(t, u, v) {
+    var tu;
+    var uv;
+    var result = __assign({ id: 'bar' }, tu, uv);
+    var expected;
+    var assignable = result;
+}
diff --git a/tests/baselines/reference/objectSpreadIntersection.symbols b/tests/baselines/reference/objectSpreadIntersection.symbols
new file mode 100644
index 00000000000..f45b04a20a5
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadIntersection.symbols
@@ -0,0 +1,219 @@
+=== tests/cases/conformance/types/spread/objectSpreadIntersection.ts ===
+function iteratedUnionIntersection<T, U, V>(t: T, u: U, v: V): void {
+>iteratedUnionIntersection : Symbol(iteratedUnionIntersection, Decl(objectSpreadIntersection.ts, 0, 0))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 0, 35))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 0, 37))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 0, 40))
+>t : Symbol(t, Decl(objectSpreadIntersection.ts, 0, 44))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 0, 35))
+>u : Symbol(u, Decl(objectSpreadIntersection.ts, 0, 49))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 0, 37))
+>v : Symbol(v, Decl(objectSpreadIntersection.ts, 0, 55))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 0, 40))
+
+    let tu: T | U;
+>tu : Symbol(tu, Decl(objectSpreadIntersection.ts, 1, 7))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 0, 35))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 0, 37))
+
+    let uv: U & V;
+>uv : Symbol(uv, Decl(objectSpreadIntersection.ts, 2, 7))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 0, 37))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 0, 40))
+
+    let result = { id: 'bar', ...tu, ...uv };
+>result : Symbol(result, Decl(objectSpreadIntersection.ts, 3, 7))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 3, 18))
+
+    let expected: ({ id: string, ...T, ...U } & { id: string, ...T, ...V }) | ({ id: string, ...U } & { id: string, ...U, ...V });
+>expected : Symbol(expected, Decl(objectSpreadIntersection.ts, 4, 7))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 4, 20))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 0, 35))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 0, 37))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 4, 49))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 0, 35))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 0, 40))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 4, 80))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 0, 37))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 4, 103))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 0, 37))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 0, 40))
+
+    let assignable: { id: string, ...(T | U), ...(U & V) } = result;
+>assignable : Symbol(assignable, Decl(objectSpreadIntersection.ts, 5, 7))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 5, 21))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 0, 35))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 0, 37))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 0, 37))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 0, 40))
+>result : Symbol(result, Decl(objectSpreadIntersection.ts, 3, 7))
+}
+// concrete types work
+interface A1 { a: number }
+>A1 : Symbol(A1, Decl(objectSpreadIntersection.ts, 6, 1))
+>a : Symbol(A1.a, Decl(objectSpreadIntersection.ts, 8, 14))
+
+interface A2 { a: string }
+>A2 : Symbol(A2, Decl(objectSpreadIntersection.ts, 8, 26))
+>a : Symbol(A2.a, Decl(objectSpreadIntersection.ts, 9, 14))
+
+let a12: A1 & A2;
+>a12 : Symbol(a12, Decl(objectSpreadIntersection.ts, 10, 3))
+>A1 : Symbol(A1, Decl(objectSpreadIntersection.ts, 6, 1))
+>A2 : Symbol(A2, Decl(objectSpreadIntersection.ts, 8, 26))
+
+let result = { ...a12 };
+>result : Symbol(result, Decl(objectSpreadIntersection.ts, 11, 3))
+
+let sn: number & string = result.a;
+>sn : Symbol(sn, Decl(objectSpreadIntersection.ts, 12, 3))
+>result.a : Symbol(a, Decl(objectSpreadIntersection.ts, 8, 14), Decl(objectSpreadIntersection.ts, 9, 14))
+>result : Symbol(result, Decl(objectSpreadIntersection.ts, 11, 3))
+>a : Symbol(a, Decl(objectSpreadIntersection.ts, 8, 14), Decl(objectSpreadIntersection.ts, 9, 14))
+
+let assignable: { ...(A1 & A2) } = result;
+>assignable : Symbol(assignable, Decl(objectSpreadIntersection.ts, 13, 3))
+>A1 : Symbol(A1, Decl(objectSpreadIntersection.ts, 6, 1))
+>A2 : Symbol(A2, Decl(objectSpreadIntersection.ts, 8, 26))
+>result : Symbol(result, Decl(objectSpreadIntersection.ts, 11, 3))
+
+function tripleIntersection<T, U, V>(t: T, u: U, v: V): void {
+>tripleIntersection : Symbol(tripleIntersection, Decl(objectSpreadIntersection.ts, 13, 42))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 15, 28))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 15, 30))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 15, 33))
+>t : Symbol(t, Decl(objectSpreadIntersection.ts, 15, 37))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 15, 28))
+>u : Symbol(u, Decl(objectSpreadIntersection.ts, 15, 42))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 15, 30))
+>v : Symbol(v, Decl(objectSpreadIntersection.ts, 15, 48))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 15, 33))
+
+    let tuv: T & U & V;
+>tuv : Symbol(tuv, Decl(objectSpreadIntersection.ts, 16, 7))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 15, 28))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 15, 30))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 15, 33))
+
+    let result = { id: 'foo', ...tuv };
+>result : Symbol(result, Decl(objectSpreadIntersection.ts, 17, 7))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 17, 18))
+
+    let expected: { id: string, ...T } & { id: string, ...U } & { id: string, ...V } = result;
+>expected : Symbol(expected, Decl(objectSpreadIntersection.ts, 18, 7))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 18, 19))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 15, 28))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 18, 42))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 15, 30))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 18, 65))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 15, 33))
+>result : Symbol(result, Decl(objectSpreadIntersection.ts, 17, 7))
+
+    let assignable: { id: string, ...(T & U & V) } = result;
+>assignable : Symbol(assignable, Decl(objectSpreadIntersection.ts, 19, 7))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 19, 21))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 15, 28))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 15, 30))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 15, 33))
+>result : Symbol(result, Decl(objectSpreadIntersection.ts, 17, 7))
+}
+function iteratedDoubleIntersection<T, U, V>(t: T, u: U, v: V): void {
+>iteratedDoubleIntersection : Symbol(iteratedDoubleIntersection, Decl(objectSpreadIntersection.ts, 20, 1))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 21, 36))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 21, 38))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 21, 41))
+>t : Symbol(t, Decl(objectSpreadIntersection.ts, 21, 45))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 21, 36))
+>u : Symbol(u, Decl(objectSpreadIntersection.ts, 21, 50))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 21, 38))
+>v : Symbol(v, Decl(objectSpreadIntersection.ts, 21, 56))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 21, 41))
+
+    let tu: T & U;
+>tu : Symbol(tu, Decl(objectSpreadIntersection.ts, 22, 7))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 21, 36))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 21, 38))
+
+    let uv: U & V;
+>uv : Symbol(uv, Decl(objectSpreadIntersection.ts, 23, 7))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 21, 38))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 21, 41))
+
+    let result = { id: 'bar', ...tu, ...uv };
+>result : Symbol(result, Decl(objectSpreadIntersection.ts, 24, 7))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 24, 18))
+
+    let expected: { id: string, ...T, ...U } & { id: string, ...T, ...V } & { id: string, ...U } & { id: string, ...U, ...V };
+>expected : Symbol(expected, Decl(objectSpreadIntersection.ts, 25, 7))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 25, 19))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 21, 36))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 21, 38))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 25, 48))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 21, 36))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 21, 41))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 25, 77))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 21, 38))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 25, 100))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 21, 38))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 21, 41))
+
+    let assignable: { id: string, ...(T & U), ...(U & V) } = result;
+>assignable : Symbol(assignable, Decl(objectSpreadIntersection.ts, 26, 7))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 26, 21))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 21, 36))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 21, 38))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 21, 38))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 21, 41))
+>result : Symbol(result, Decl(objectSpreadIntersection.ts, 24, 7))
+}
+function iteratedIntersectionUnion<T, U, V>(t: T, u: U, v: V): void {
+>iteratedIntersectionUnion : Symbol(iteratedIntersectionUnion, Decl(objectSpreadIntersection.ts, 27, 1))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 28, 35))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 28, 37))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 28, 40))
+>t : Symbol(t, Decl(objectSpreadIntersection.ts, 28, 44))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 28, 35))
+>u : Symbol(u, Decl(objectSpreadIntersection.ts, 28, 49))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 28, 37))
+>v : Symbol(v, Decl(objectSpreadIntersection.ts, 28, 55))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 28, 40))
+
+    let tu: T & U;
+>tu : Symbol(tu, Decl(objectSpreadIntersection.ts, 29, 7))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 28, 35))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 28, 37))
+
+    let uv: U | V;
+>uv : Symbol(uv, Decl(objectSpreadIntersection.ts, 30, 7))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 28, 37))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 28, 40))
+
+    let result = { id: 'bar', ...tu, ...uv };
+>result : Symbol(result, Decl(objectSpreadIntersection.ts, 31, 7))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 31, 18))
+
+    let expected: ({ id: string, ...T, ...U } & { id: string, ...U }) | ({ id: string, ...T, ...V } & { id: string, ...U, ...V });
+>expected : Symbol(expected, Decl(objectSpreadIntersection.ts, 32, 7))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 32, 20))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 28, 35))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 28, 37))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 32, 49))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 28, 37))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 32, 74))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 28, 35))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 28, 40))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 32, 103))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 28, 37))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 28, 40))
+
+    let assignable: { id: string, ...(T & U), ...(U | V) } = result;
+>assignable : Symbol(assignable, Decl(objectSpreadIntersection.ts, 33, 7))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 33, 21))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 28, 35))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 28, 37))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 28, 37))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 28, 40))
+>result : Symbol(result, Decl(objectSpreadIntersection.ts, 31, 7))
+}
+
+
diff --git a/tests/baselines/reference/objectSpreadIntersection.types b/tests/baselines/reference/objectSpreadIntersection.types
new file mode 100644
index 00000000000..7700d8aa384
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadIntersection.types
@@ -0,0 +1,236 @@
+=== tests/cases/conformance/types/spread/objectSpreadIntersection.ts ===
+function iteratedUnionIntersection<T, U, V>(t: T, u: U, v: V): void {
+>iteratedUnionIntersection : <T, U, V>(t: T, u: U, v: V) => void
+>T : T
+>U : U
+>V : V
+>t : T
+>T : T
+>u : U
+>U : U
+>v : V
+>V : V
+
+    let tu: T | U;
+>tu : T | U
+>T : T
+>U : U
+
+    let uv: U & V;
+>uv : U & V
+>U : U
+>V : V
+
+    let result = { id: 'bar', ...tu, ...uv };
+>result : ({ id: string; ...T; ...U } | { id: string; ...U }) & ({ id: string; ...T; ...V } | { id: string; ...U; ...V })
+>{ id: 'bar', ...tu, ...uv } : ({ id: string; ...T; ...U } | { id: string; ...U }) & ({ id: string; ...T; ...V } | { id: string; ...U; ...V })
+>id : string
+>'bar' : "bar"
+>tu : any
+>uv : any
+
+    let expected: ({ id: string, ...T, ...U } & { id: string, ...T, ...V }) | ({ id: string, ...U } & { id: string, ...U, ...V });
+>expected : ({ id: string; ...T; ...U } & { id: string; ...T; ...V }) | ({ id: string; ...U } & { id: string; ...U; ...V })
+>id : string
+>T : T
+>U : U
+>id : string
+>T : T
+>V : V
+>id : string
+>U : U
+>id : string
+>U : U
+>V : V
+
+    let assignable: { id: string, ...(T | U), ...(U & V) } = result;
+>assignable : ({ id: string; ...T; ...U } | { id: string; ...U }) & ({ id: string; ...T; ...V } | { id: string; ...U; ...V })
+>id : string
+>T : T
+>U : U
+>U : U
+>V : V
+>result : ({ id: string; ...T; ...U } | { id: string; ...U }) & ({ id: string; ...T; ...V } | { id: string; ...U; ...V })
+}
+// concrete types work
+interface A1 { a: number }
+>A1 : A1
+>a : number
+
+interface A2 { a: string }
+>A2 : A2
+>a : string
+
+let a12: A1 & A2;
+>a12 : A1 & A2
+>A1 : A1
+>A2 : A2
+
+let result = { ...a12 };
+>result : { a: number; } & { a: string; }
+>{ ...a12 } : { a: number; } & { a: string; }
+>a12 : any
+
+let sn: number & string = result.a;
+>sn : number & string
+>result.a : number & string
+>result : { a: number; } & { a: string; }
+>a : number & string
+
+let assignable: { ...(A1 & A2) } = result;
+>assignable : { a: number; } & { a: string; }
+>A1 : A1
+>A2 : A2
+>result : { a: number; } & { a: string; }
+
+function tripleIntersection<T, U, V>(t: T, u: U, v: V): void {
+>tripleIntersection : <T, U, V>(t: T, u: U, v: V) => void
+>T : T
+>U : U
+>V : V
+>t : T
+>T : T
+>u : U
+>U : U
+>v : V
+>V : V
+
+    let tuv: T & U & V;
+>tuv : T & U & V
+>T : T
+>U : U
+>V : V
+
+    let result = { id: 'foo', ...tuv };
+>result : { id: string; ...T } & { id: string; ...U } & { id: string; ...V }
+>{ id: 'foo', ...tuv } : { id: string; ...T } & { id: string; ...U } & { id: string; ...V }
+>id : string
+>'foo' : "foo"
+>tuv : any
+
+    let expected: { id: string, ...T } & { id: string, ...U } & { id: string, ...V } = result;
+>expected : { id: string; ...T } & { id: string; ...U } & { id: string; ...V }
+>id : string
+>T : T
+>id : string
+>U : U
+>id : string
+>V : V
+>result : { id: string; ...T } & { id: string; ...U } & { id: string; ...V }
+
+    let assignable: { id: string, ...(T & U & V) } = result;
+>assignable : { id: string; ...T } & { id: string; ...U } & { id: string; ...V }
+>id : string
+>T : T
+>U : U
+>V : V
+>result : { id: string; ...T } & { id: string; ...U } & { id: string; ...V }
+}
+function iteratedDoubleIntersection<T, U, V>(t: T, u: U, v: V): void {
+>iteratedDoubleIntersection : <T, U, V>(t: T, u: U, v: V) => void
+>T : T
+>U : U
+>V : V
+>t : T
+>T : T
+>u : U
+>U : U
+>v : V
+>V : V
+
+    let tu: T & U;
+>tu : T & U
+>T : T
+>U : U
+
+    let uv: U & V;
+>uv : U & V
+>U : U
+>V : V
+
+    let result = { id: 'bar', ...tu, ...uv };
+>result : { id: string; ...T; ...U } & { id: string; ...U } & { id: string; ...T; ...V } & { id: string; ...U; ...V }
+>{ id: 'bar', ...tu, ...uv } : { id: string; ...T; ...U } & { id: string; ...U } & { id: string; ...T; ...V } & { id: string; ...U; ...V }
+>id : string
+>'bar' : "bar"
+>tu : any
+>uv : any
+
+    let expected: { id: string, ...T, ...U } & { id: string, ...T, ...V } & { id: string, ...U } & { id: string, ...U, ...V };
+>expected : { id: string; ...T; ...U } & { id: string; ...T; ...V } & { id: string; ...U } & { id: string; ...U; ...V }
+>id : string
+>T : T
+>U : U
+>id : string
+>T : T
+>V : V
+>id : string
+>U : U
+>id : string
+>U : U
+>V : V
+
+    let assignable: { id: string, ...(T & U), ...(U & V) } = result;
+>assignable : { id: string; ...T; ...U } & { id: string; ...U } & { id: string; ...T; ...V } & { id: string; ...U; ...V }
+>id : string
+>T : T
+>U : U
+>U : U
+>V : V
+>result : { id: string; ...T; ...U } & { id: string; ...U } & { id: string; ...T; ...V } & { id: string; ...U; ...V }
+}
+function iteratedIntersectionUnion<T, U, V>(t: T, u: U, v: V): void {
+>iteratedIntersectionUnion : <T, U, V>(t: T, u: U, v: V) => void
+>T : T
+>U : U
+>V : V
+>t : T
+>T : T
+>u : U
+>U : U
+>v : V
+>V : V
+
+    let tu: T & U;
+>tu : T & U
+>T : T
+>U : U
+
+    let uv: U | V;
+>uv : U | V
+>U : U
+>V : V
+
+    let result = { id: 'bar', ...tu, ...uv };
+>result : ({ id: string; ...T; ...U } & { id: string; ...U }) | ({ id: string; ...T; ...V } & { id: string; ...U; ...V })
+>{ id: 'bar', ...tu, ...uv } : ({ id: string; ...T; ...U } & { id: string; ...U }) | ({ id: string; ...T; ...V } & { id: string; ...U; ...V })
+>id : string
+>'bar' : "bar"
+>tu : any
+>uv : any
+
+    let expected: ({ id: string, ...T, ...U } & { id: string, ...U }) | ({ id: string, ...T, ...V } & { id: string, ...U, ...V });
+>expected : ({ id: string; ...T; ...U } & { id: string; ...U }) | ({ id: string; ...T; ...V } & { id: string; ...U; ...V })
+>id : string
+>T : T
+>U : U
+>id : string
+>U : U
+>id : string
+>T : T
+>V : V
+>id : string
+>U : U
+>V : V
+
+    let assignable: { id: string, ...(T & U), ...(U | V) } = result;
+>assignable : ({ id: string; ...T; ...U } & { id: string; ...U }) | ({ id: string; ...T; ...V } & { id: string; ...U; ...V })
+>id : string
+>T : T
+>U : U
+>U : U
+>V : V
+>result : ({ id: string; ...T; ...U } & { id: string; ...U }) | ({ id: string; ...T; ...V } & { id: string; ...U; ...V })
+}
+
+
diff --git a/tests/baselines/reference/objectSpreadNegative.errors.txt b/tests/baselines/reference/objectSpreadNegative.errors.txt
index 38e564c3b5d..84fb1cc4a76 100644
--- a/tests/baselines/reference/objectSpreadNegative.errors.txt
+++ b/tests/baselines/reference/objectSpreadNegative.errors.txt
@@ -5,19 +5,23 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(20,5): error TS2322
   Property 'b' is missing in type '{ s: string; }'.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(22,1): error TS2322: Type 'Bool' is not assignable to type '{ s: string; b: boolean; }'.
   Property 's' is missing in type 'Bool'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(25,15): error TS2697: Spread properties must be identifiers, property accesses, or object literals.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(26,15): error TS2697: Spread properties must be identifiers, property accesses, or object literals.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(29,36): error TS2300: Duplicate identifier 'b'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(29,53): error TS2300: Duplicate identifier 'b'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(34,12): error TS2339: Property 'b' does not exist on type '{}'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(40,9): error TS2339: Property 'm' does not exist on type '{ p: number; }'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(43,1): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type '{ x: number; }' has no compatible call signatures.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(44,1): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(47,39): error TS2697: Spread properties must be identifiers, property accesses, or object literals.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(51,12): error TS2322: Type '{ ...U }' is not assignable to type 'U'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(25,36): error TS2300: Duplicate identifier 'b'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(25,53): error TS2300: Duplicate identifier 'b'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(30,12): error TS2339: Property 'null' does not exist on type '{}'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(32,17): error TS2339: Property 'undefined' does not exist on type '{}'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(36,11): error TS2339: Property 'toFixed' does not exist on type '{}'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(38,11): error TS2339: Property 'toFixed' does not exist on type '{}'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(40,11): error TS2339: Property 'length' does not exist on type '{}'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(41,11): error TS2339: Property 'charAt' does not exist on type '{}'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(45,1): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type '{}' has no compatible call signatures.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(49,12): error TS2339: Property 'b' does not exist on type '{}'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(55,9): error TS2339: Property 'm' does not exist on type '{ p: number; }'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(58,1): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type '{ x: number; }' has no compatible call signatures.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(59,1): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(63,12): error TS2322: Type '{ ...U }' is not assignable to type 'U'.
 
 
-==== tests/cases/conformance/types/spread/objectSpreadNegative.ts (14 errors) ====
+==== tests/cases/conformance/types/spread/objectSpreadNegative.ts (18 errors) ====
     let o = { a: 1, b: 'no' }
     
     /// private propagates
@@ -27,8 +31,8 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(51,12): error TS232
     class PublicX {
         public x: number;
     }
-    let o3: { ...PublicX, ...PrivateOptionalX };
-    let sn: number = o3.x; // error, x is private
+    let o2: { ...PublicX, ...PrivateOptionalX };
+    let sn: number = o2.x; // error, x is private
                         ~
 !!! error TS2339: Property 'x' does not exist on type '{}'.
     let optionalString: { sn?: string };
@@ -52,14 +56,6 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(51,12): error TS232
 !!! error TS2322: Type 'Bool' is not assignable to type '{ s: string; b: boolean; }'.
 !!! error TS2322:   Property 's' is missing in type 'Bool'.
     
-    // expressions are not allowed
-    let o1 = { ...1 + 1 };
-                  ~~~~~
-!!! error TS2697: Spread properties must be identifiers, property accesses, or object literals.
-    let o2 = { ...(1 + 1) };
-                  ~~~~~~~
-!!! error TS2697: Spread properties must be identifiers, property accesses, or object literals.
-    
     // literal repeats are not allowed, but spread repeats are fine
     let duplicated = { b: 'bad', ...o, b: 'bad', ...o2, b: 'bad' }
                                        ~
@@ -68,6 +64,39 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(51,12): error TS232
 !!! error TS2300: Duplicate identifier 'b'.
     let duplicatedSpread = { ...o, ...o }
     
+    // null and undefined are just skipped
+    let spreadNull = { ...null }
+    spreadNull.null;
+               ~~~~
+!!! error TS2339: Property 'null' does not exist on type '{}'.
+    let spreadUndefined = { ...undefined }
+    spreadUndefined.undefined;
+                    ~~~~~~~~~
+!!! error TS2339: Property 'undefined' does not exist on type '{}'.
+    
+    // primitives and functions are skipped
+    let spreadNum = { ...12 };
+    spreadNum.toFixed(); // error, no methods from number
+              ~~~~~~~
+!!! error TS2339: Property 'toFixed' does not exist on type '{}'.
+    let spreadSum = { ...1 + 1 };
+    spreadSum.toFixed(); // error, no methods from number
+              ~~~~~~~
+!!! error TS2339: Property 'toFixed' does not exist on type '{}'.
+    let spreadStr = { ...'foo' };
+    spreadStr.length; // error, no 'length'
+              ~~~~~~
+!!! error TS2339: Property 'length' does not exist on type '{}'.
+    spreadStr.charAt(1); // error, no methods either
+              ~~~~~~
+!!! error TS2339: Property 'charAt' does not exist on type '{}'.
+    let spreadBool = { ...true };
+    spreadBool.valueOf(); // error, what were you thinking?
+    let spreadFunc = { ...function () { } }
+    spreadFunc(); // error, no call signature
+    ~~~~~~~~~~~~
+!!! error TS2349: Cannot invoke an expression whose type lacks a call signature. Type '{}' has no compatible call signatures.
+    
     // write-only properties get skipped
     let setterOnly = { ...{ set b (bad: number) { } } };
     setterOnly.b = 12; // error, 'b' does not exist
@@ -90,11 +119,6 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(51,12): error TS232
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
     
-    let publicx: PublicX;
-    let callableSpread = { ...publicx, ...(n => n + 1) }; // error, can't spread functions
-                                          ~~~~~~~~~~~~
-!!! error TS2697: Spread properties must be identifiers, property accesses, or object literals.
-    
     // { ...U } is not assignable to U
     function override<U>(initial: U, override: U): U {
         return { ...initial, ...override };
diff --git a/tests/baselines/reference/objectSpreadNegative.js b/tests/baselines/reference/objectSpreadNegative.js
index 6874380599b..452ec457e9a 100644
--- a/tests/baselines/reference/objectSpreadNegative.js
+++ b/tests/baselines/reference/objectSpreadNegative.js
@@ -8,8 +8,8 @@ class PrivateOptionalX {
 class PublicX {
     public x: number;
 }
-let o3: { ...PublicX, ...PrivateOptionalX };
-let sn: number = o3.x; // error, x is private
+let o2: { ...PublicX, ...PrivateOptionalX };
+let sn: number = o2.x; // error, x is private
 let optionalString: { sn?: string };
 let optionalNumber: { sn?: number };
 let allOptional: { sn: string | number } = { ...optionalString, ...optionalNumber };
@@ -22,14 +22,29 @@ let spread: { ...Bool, ...Str } = { s: 'foo' }; // error, missing 'b'
 let b: Bool;
 spread = b; // error, missing 's'
 
-// expressions are not allowed
-let o1 = { ...1 + 1 };
-let o2 = { ...(1 + 1) };
-
 // literal repeats are not allowed, but spread repeats are fine
 let duplicated = { b: 'bad', ...o, b: 'bad', ...o2, b: 'bad' }
 let duplicatedSpread = { ...o, ...o }
 
+// null and undefined are just skipped
+let spreadNull = { ...null }
+spreadNull.null;
+let spreadUndefined = { ...undefined }
+spreadUndefined.undefined;
+
+// primitives and functions are skipped
+let spreadNum = { ...12 };
+spreadNum.toFixed(); // error, no methods from number
+let spreadSum = { ...1 + 1 };
+spreadSum.toFixed(); // error, no methods from number
+let spreadStr = { ...'foo' };
+spreadStr.length; // error, no 'length'
+spreadStr.charAt(1); // error, no methods either
+let spreadBool = { ...true };
+spreadBool.valueOf(); // error, what were you thinking?
+let spreadFunc = { ...function () { } }
+spreadFunc(); // error, no call signature
+
 // write-only properties get skipped
 let setterOnly = { ...{ set b (bad: number) { } } };
 setterOnly.b = 12; // error, 'b' does not exist
@@ -44,9 +59,6 @@ let callableConstructableSpread: { ...PublicX, (n: number): number, new (p: numb
 callableConstructableSpread(12); // error, no call signature
 new callableConstructableSpread(12); // error, no construct signature
 
-let publicx: PublicX;
-let callableSpread = { ...publicx, ...(n => n + 1) }; // error, can't spread functions
-
 // { ...U } is not assignable to U
 function override<U>(initial: U, override: U): U {
     return { ...initial, ...override };
@@ -74,8 +86,8 @@ var PublicX = (function () {
     }
     return PublicX;
 }());
-var o3;
-var sn = o3.x; // error, x is private
+var o2;
+var sn = o2.x; // error, x is private
 var optionalString;
 var optionalNumber;
 var allOptional = __assign({}, optionalString, optionalNumber);
@@ -84,12 +96,26 @@ var allOptional = __assign({}, optionalString, optionalNumber);
 var spread = { s: 'foo' }; // error, missing 'b'
 var b;
 spread = b; // error, missing 's'
-// expressions are not allowed
-var o1 = __assign({}, 1 + 1);
-var o2 = __assign({}, (1 + 1));
 // 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);
+// null and undefined are just skipped
+var spreadNull = __assign({}, null);
+spreadNull.null;
+var spreadUndefined = __assign({}, undefined);
+spreadUndefined.undefined;
+// primitives and functions are skipped
+var spreadNum = __assign({}, 12);
+spreadNum.toFixed(); // error, no methods from number
+var spreadSum = __assign({}, 1 + 1);
+spreadSum.toFixed(); // error, no methods from number
+var spreadStr = __assign({}, 'foo');
+spreadStr.length; // error, no 'length'
+spreadStr.charAt(1); // error, no methods either
+var spreadBool = __assign({}, true);
+spreadBool.valueOf(); // error, what were you thinking?
+var spreadFunc = __assign({}, function () { });
+spreadFunc(); // error, no call signature
 // write-only properties get skipped
 var setterOnly = __assign({ set b(bad: number) { } });
 setterOnly.b = 12; // error, 'b' does not exist
@@ -107,8 +133,6 @@ spreadC.m(); // error 'm' is not in '{ ... c }'
 var callableConstructableSpread;
 callableConstructableSpread(12); // error, no call signature
 new callableConstructableSpread(12); // error, no construct signature
-var publicx;
-var callableSpread = __assign({}, publicx, (function (n) { return n + 1; })); // error, can't spread functions
 // { ...U } is not assignable to U
 function override(initial, override) {
     return __assign({}, initial, override);
diff --git a/tests/baselines/reference/objectSpreadUnion.js b/tests/baselines/reference/objectSpreadUnion.js
new file mode 100644
index 00000000000..500b8a5ddc7
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadUnion.js
@@ -0,0 +1,52 @@
+//// [objectSpreadUnion.ts]
+// concrete types work
+interface A1 { a: number }
+interface A2 { a: string }
+let a12: A1 | A2;
+let result = { ...a12 };
+let sn: number | string = result.a;
+let assignable: { ...(A1 | A2) } = result;
+
+function tripleUnion<T, U, V>(t: T, u: U, v: V): void {
+    let tuv: T | U | V;
+    let result = { id: 'foo', ...tuv };
+    let expected: { id: string, ...T } | { id: string, ...U } | { id: string, ...V } = result;
+    let assignable: { id: string, ...(T | U | V) } = result;
+}
+function iteratedDoubleUnion<T, U, V>(t: T, u: U, v: V): void {
+    let tu: T | U;
+    let uv: U | V;
+    let result = { id: 'bar', ...tu, ...uv };
+    let expected: { id: string, ...T, ...U } | { id: string, ...T, ...V } | { id: string, ...U } | { id: string, ...U, ...V };
+    let assignable: { id: string, ...(T | U), ...(U | V) } = result;
+}
+
+
+
+
+//// [objectSpreadUnion.js]
+var __assign = (this && this.__assign) || Object.assign || function(t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+        s = arguments[i];
+        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+            t[p] = s[p];
+    }
+    return t;
+};
+var a12;
+var result = __assign({}, a12);
+var sn = result.a;
+var assignable = result;
+function tripleUnion(t, u, v) {
+    var tuv;
+    var result = __assign({ id: 'foo' }, tuv);
+    var expected = result;
+    var assignable = result;
+}
+function iteratedDoubleUnion(t, u, v) {
+    var tu;
+    var uv;
+    var result = __assign({ id: 'bar' }, tu, uv);
+    var expected;
+    var assignable = result;
+}
diff --git a/tests/baselines/reference/objectSpreadUnion.symbols b/tests/baselines/reference/objectSpreadUnion.symbols
new file mode 100644
index 00000000000..eea9e65185d
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadUnion.symbols
@@ -0,0 +1,122 @@
+=== tests/cases/conformance/types/spread/objectSpreadUnion.ts ===
+// concrete types work
+interface A1 { a: number }
+>A1 : Symbol(A1, Decl(objectSpreadUnion.ts, 0, 0))
+>a : Symbol(A1.a, Decl(objectSpreadUnion.ts, 1, 14))
+
+interface A2 { a: string }
+>A2 : Symbol(A2, Decl(objectSpreadUnion.ts, 1, 26))
+>a : Symbol(A2.a, Decl(objectSpreadUnion.ts, 2, 14))
+
+let a12: A1 | A2;
+>a12 : Symbol(a12, Decl(objectSpreadUnion.ts, 3, 3))
+>A1 : Symbol(A1, Decl(objectSpreadUnion.ts, 0, 0))
+>A2 : Symbol(A2, Decl(objectSpreadUnion.ts, 1, 26))
+
+let result = { ...a12 };
+>result : Symbol(result, Decl(objectSpreadUnion.ts, 4, 3))
+
+let sn: number | string = result.a;
+>sn : Symbol(sn, Decl(objectSpreadUnion.ts, 5, 3))
+>result.a : Symbol(a, Decl(objectSpreadUnion.ts, 1, 14), Decl(objectSpreadUnion.ts, 2, 14))
+>result : Symbol(result, Decl(objectSpreadUnion.ts, 4, 3))
+>a : Symbol(a, Decl(objectSpreadUnion.ts, 1, 14), Decl(objectSpreadUnion.ts, 2, 14))
+
+let assignable: { ...(A1 | A2) } = result;
+>assignable : Symbol(assignable, Decl(objectSpreadUnion.ts, 6, 3))
+>A1 : Symbol(A1, Decl(objectSpreadUnion.ts, 0, 0))
+>A2 : Symbol(A2, Decl(objectSpreadUnion.ts, 1, 26))
+>result : Symbol(result, Decl(objectSpreadUnion.ts, 4, 3))
+
+function tripleUnion<T, U, V>(t: T, u: U, v: V): void {
+>tripleUnion : Symbol(tripleUnion, Decl(objectSpreadUnion.ts, 6, 42))
+>T : Symbol(T, Decl(objectSpreadUnion.ts, 8, 21))
+>U : Symbol(U, Decl(objectSpreadUnion.ts, 8, 23))
+>V : Symbol(V, Decl(objectSpreadUnion.ts, 8, 26))
+>t : Symbol(t, Decl(objectSpreadUnion.ts, 8, 30))
+>T : Symbol(T, Decl(objectSpreadUnion.ts, 8, 21))
+>u : Symbol(u, Decl(objectSpreadUnion.ts, 8, 35))
+>U : Symbol(U, Decl(objectSpreadUnion.ts, 8, 23))
+>v : Symbol(v, Decl(objectSpreadUnion.ts, 8, 41))
+>V : Symbol(V, Decl(objectSpreadUnion.ts, 8, 26))
+
+    let tuv: T | U | V;
+>tuv : Symbol(tuv, Decl(objectSpreadUnion.ts, 9, 7))
+>T : Symbol(T, Decl(objectSpreadUnion.ts, 8, 21))
+>U : Symbol(U, Decl(objectSpreadUnion.ts, 8, 23))
+>V : Symbol(V, Decl(objectSpreadUnion.ts, 8, 26))
+
+    let result = { id: 'foo', ...tuv };
+>result : Symbol(result, Decl(objectSpreadUnion.ts, 10, 7))
+>id : Symbol(id, Decl(objectSpreadUnion.ts, 10, 18))
+
+    let expected: { id: string, ...T } | { id: string, ...U } | { id: string, ...V } = result;
+>expected : Symbol(expected, Decl(objectSpreadUnion.ts, 11, 7))
+>id : Symbol(id, Decl(objectSpreadUnion.ts, 11, 19))
+>T : Symbol(T, Decl(objectSpreadUnion.ts, 8, 21))
+>id : Symbol(id, Decl(objectSpreadUnion.ts, 11, 42))
+>U : Symbol(U, Decl(objectSpreadUnion.ts, 8, 23))
+>id : Symbol(id, Decl(objectSpreadUnion.ts, 11, 65))
+>V : Symbol(V, Decl(objectSpreadUnion.ts, 8, 26))
+>result : Symbol(result, Decl(objectSpreadUnion.ts, 10, 7))
+
+    let assignable: { id: string, ...(T | U | V) } = result;
+>assignable : Symbol(assignable, Decl(objectSpreadUnion.ts, 12, 7))
+>id : Symbol(id, Decl(objectSpreadUnion.ts, 12, 21))
+>T : Symbol(T, Decl(objectSpreadUnion.ts, 8, 21))
+>U : Symbol(U, Decl(objectSpreadUnion.ts, 8, 23))
+>V : Symbol(V, Decl(objectSpreadUnion.ts, 8, 26))
+>result : Symbol(result, Decl(objectSpreadUnion.ts, 10, 7))
+}
+function iteratedDoubleUnion<T, U, V>(t: T, u: U, v: V): void {
+>iteratedDoubleUnion : Symbol(iteratedDoubleUnion, Decl(objectSpreadUnion.ts, 13, 1))
+>T : Symbol(T, Decl(objectSpreadUnion.ts, 14, 29))
+>U : Symbol(U, Decl(objectSpreadUnion.ts, 14, 31))
+>V : Symbol(V, Decl(objectSpreadUnion.ts, 14, 34))
+>t : Symbol(t, Decl(objectSpreadUnion.ts, 14, 38))
+>T : Symbol(T, Decl(objectSpreadUnion.ts, 14, 29))
+>u : Symbol(u, Decl(objectSpreadUnion.ts, 14, 43))
+>U : Symbol(U, Decl(objectSpreadUnion.ts, 14, 31))
+>v : Symbol(v, Decl(objectSpreadUnion.ts, 14, 49))
+>V : Symbol(V, Decl(objectSpreadUnion.ts, 14, 34))
+
+    let tu: T | U;
+>tu : Symbol(tu, Decl(objectSpreadUnion.ts, 15, 7))
+>T : Symbol(T, Decl(objectSpreadUnion.ts, 14, 29))
+>U : Symbol(U, Decl(objectSpreadUnion.ts, 14, 31))
+
+    let uv: U | V;
+>uv : Symbol(uv, Decl(objectSpreadUnion.ts, 16, 7))
+>U : Symbol(U, Decl(objectSpreadUnion.ts, 14, 31))
+>V : Symbol(V, Decl(objectSpreadUnion.ts, 14, 34))
+
+    let result = { id: 'bar', ...tu, ...uv };
+>result : Symbol(result, Decl(objectSpreadUnion.ts, 17, 7))
+>id : Symbol(id, Decl(objectSpreadUnion.ts, 17, 18))
+
+    let expected: { id: string, ...T, ...U } | { id: string, ...T, ...V } | { id: string, ...U } | { id: string, ...U, ...V };
+>expected : Symbol(expected, Decl(objectSpreadUnion.ts, 18, 7))
+>id : Symbol(id, Decl(objectSpreadUnion.ts, 18, 19))
+>T : Symbol(T, Decl(objectSpreadUnion.ts, 14, 29))
+>U : Symbol(U, Decl(objectSpreadUnion.ts, 14, 31))
+>id : Symbol(id, Decl(objectSpreadUnion.ts, 18, 48))
+>T : Symbol(T, Decl(objectSpreadUnion.ts, 14, 29))
+>V : Symbol(V, Decl(objectSpreadUnion.ts, 14, 34))
+>id : Symbol(id, Decl(objectSpreadUnion.ts, 18, 77))
+>U : Symbol(U, Decl(objectSpreadUnion.ts, 14, 31))
+>id : Symbol(id, Decl(objectSpreadUnion.ts, 18, 100))
+>U : Symbol(U, Decl(objectSpreadUnion.ts, 14, 31))
+>V : Symbol(V, Decl(objectSpreadUnion.ts, 14, 34))
+
+    let assignable: { id: string, ...(T | U), ...(U | V) } = result;
+>assignable : Symbol(assignable, Decl(objectSpreadUnion.ts, 19, 7))
+>id : Symbol(id, Decl(objectSpreadUnion.ts, 19, 21))
+>T : Symbol(T, Decl(objectSpreadUnion.ts, 14, 29))
+>U : Symbol(U, Decl(objectSpreadUnion.ts, 14, 31))
+>U : Symbol(U, Decl(objectSpreadUnion.ts, 14, 31))
+>V : Symbol(V, Decl(objectSpreadUnion.ts, 14, 34))
+>result : Symbol(result, Decl(objectSpreadUnion.ts, 17, 7))
+}
+
+
+
diff --git a/tests/baselines/reference/objectSpreadUnion.types b/tests/baselines/reference/objectSpreadUnion.types
new file mode 100644
index 00000000000..7cbffcf0a58
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadUnion.types
@@ -0,0 +1,131 @@
+=== tests/cases/conformance/types/spread/objectSpreadUnion.ts ===
+// concrete types work
+interface A1 { a: number }
+>A1 : A1
+>a : number
+
+interface A2 { a: string }
+>A2 : A2
+>a : string
+
+let a12: A1 | A2;
+>a12 : A1 | A2
+>A1 : A1
+>A2 : A2
+
+let result = { ...a12 };
+>result : { a: number; } | { a: string; }
+>{ ...a12 } : { a: number; } | { a: string; }
+>a12 : any
+
+let sn: number | string = result.a;
+>sn : string | number
+>result.a : string | number
+>result : { a: number; } | { a: string; }
+>a : string | number
+
+let assignable: { ...(A1 | A2) } = result;
+>assignable : { a: number; } | { a: string; }
+>A1 : A1
+>A2 : A2
+>result : { a: number; } | { a: string; }
+
+function tripleUnion<T, U, V>(t: T, u: U, v: V): void {
+>tripleUnion : <T, U, V>(t: T, u: U, v: V) => void
+>T : T
+>U : U
+>V : V
+>t : T
+>T : T
+>u : U
+>U : U
+>v : V
+>V : V
+
+    let tuv: T | U | V;
+>tuv : T | U | V
+>T : T
+>U : U
+>V : V
+
+    let result = { id: 'foo', ...tuv };
+>result : { id: string; ...T } | { id: string; ...U } | { id: string; ...V }
+>{ id: 'foo', ...tuv } : { id: string; ...T } | { id: string; ...U } | { id: string; ...V }
+>id : string
+>'foo' : "foo"
+>tuv : any
+
+    let expected: { id: string, ...T } | { id: string, ...U } | { id: string, ...V } = result;
+>expected : { id: string; ...T } | { id: string; ...U } | { id: string; ...V }
+>id : string
+>T : T
+>id : string
+>U : U
+>id : string
+>V : V
+>result : { id: string; ...T } | { id: string; ...U } | { id: string; ...V }
+
+    let assignable: { id: string, ...(T | U | V) } = result;
+>assignable : { id: string; ...T } | { id: string; ...U } | { id: string; ...V }
+>id : string
+>T : T
+>U : U
+>V : V
+>result : { id: string; ...T } | { id: string; ...U } | { id: string; ...V }
+}
+function iteratedDoubleUnion<T, U, V>(t: T, u: U, v: V): void {
+>iteratedDoubleUnion : <T, U, V>(t: T, u: U, v: V) => void
+>T : T
+>U : U
+>V : V
+>t : T
+>T : T
+>u : U
+>U : U
+>v : V
+>V : V
+
+    let tu: T | U;
+>tu : T | U
+>T : T
+>U : U
+
+    let uv: U | V;
+>uv : U | V
+>U : U
+>V : V
+
+    let result = { id: 'bar', ...tu, ...uv };
+>result : { id: string; ...T; ...U } | { id: string; ...U } | { id: string; ...T; ...V } | { id: string; ...U; ...V }
+>{ id: 'bar', ...tu, ...uv } : { id: string; ...T; ...U } | { id: string; ...U } | { id: string; ...T; ...V } | { id: string; ...U; ...V }
+>id : string
+>'bar' : "bar"
+>tu : any
+>uv : any
+
+    let expected: { id: string, ...T, ...U } | { id: string, ...T, ...V } | { id: string, ...U } | { id: string, ...U, ...V };
+>expected : { id: string; ...T; ...U } | { id: string; ...T; ...V } | { id: string; ...U } | { id: string; ...U; ...V }
+>id : string
+>T : T
+>U : U
+>id : string
+>T : T
+>V : V
+>id : string
+>U : U
+>id : string
+>U : U
+>V : V
+
+    let assignable: { id: string, ...(T | U), ...(U | V) } = result;
+>assignable : { id: string; ...T; ...U } | { id: string; ...U } | { id: string; ...T; ...V } | { id: string; ...U; ...V }
+>id : string
+>T : T
+>U : U
+>U : U
+>V : V
+>result : { id: string; ...T; ...U } | { id: string; ...U } | { id: string; ...T; ...V } | { id: string; ...U; ...V }
+}
+
+
+
diff --git a/tests/cases/conformance/types/spread/objectSpread.ts b/tests/cases/conformance/types/spread/objectSpread.ts
index 9828e86f0a6..e94775649e7 100644
--- a/tests/cases/conformance/types/spread/objectSpread.ts
+++ b/tests/cases/conformance/types/spread/objectSpread.ts
@@ -35,11 +35,13 @@ let getter: { a: number, c: number } =
     { ...op, c: 7 }
 getter.a = 12;
 
-// null and undefined are just skipped
-let spreadNull: { a: number } =
-    { a: 7, ...null }
-let spreadUndefined: { a: number } =
-    { a: 7, ...undefined }
+// null, undefined, functions and primitives result in { }
+let spreadNull = { ...null };
+let spreadUndefind = { ...undefined };
+let spreadNum = { ...12 };
+let spreadStr = { ...'foo' };
+let spreadBool = { ...false };
+let spreadFunc = { ...(function () { }) };
 
 // methods are not enumerable
 class C { p = 1; m() { } }
diff --git a/tests/cases/conformance/types/spread/objectSpreadIntersection.ts b/tests/cases/conformance/types/spread/objectSpreadIntersection.ts
new file mode 100644
index 00000000000..6471e622b68
--- /dev/null
+++ b/tests/cases/conformance/types/spread/objectSpreadIntersection.ts
@@ -0,0 +1,36 @@
+function iteratedUnionIntersection<T, U, V>(t: T, u: U, v: V): void {
+    let tu: T | U;
+    let uv: U & V;
+    let result = { id: 'bar', ...tu, ...uv };
+    let expected: ({ id: string, ...T, ...U } & { id: string, ...T, ...V }) | ({ id: string, ...U } & { id: string, ...U, ...V });
+    let assignable: { id: string, ...(T | U), ...(U & V) } = result;
+}
+// concrete types work
+interface A1 { a: number }
+interface A2 { a: string }
+let a12: A1 & A2;
+let result = { ...a12 };
+let sn: number & string = result.a;
+let assignable: { ...(A1 & A2) } = result;
+
+function tripleIntersection<T, U, V>(t: T, u: U, v: V): void {
+    let tuv: T & U & V;
+    let result = { id: 'foo', ...tuv };
+    let expected: { id: string, ...T } & { id: string, ...U } & { id: string, ...V } = result;
+    let assignable: { id: string, ...(T & U & V) } = result;
+}
+function iteratedDoubleIntersection<T, U, V>(t: T, u: U, v: V): void {
+    let tu: T & U;
+    let uv: U & V;
+    let result = { id: 'bar', ...tu, ...uv };
+    let expected: { id: string, ...T, ...U } & { id: string, ...T, ...V } & { id: string, ...U } & { id: string, ...U, ...V };
+    let assignable: { id: string, ...(T & U), ...(U & V) } = result;
+}
+function iteratedIntersectionUnion<T, U, V>(t: T, u: U, v: V): void {
+    let tu: T & U;
+    let uv: U | V;
+    let result = { id: 'bar', ...tu, ...uv };
+    let expected: ({ id: string, ...T, ...U } & { id: string, ...U }) | ({ id: string, ...T, ...V } & { id: string, ...U, ...V });
+    let assignable: { id: string, ...(T & U), ...(U | V) } = result;
+}
+
diff --git a/tests/cases/conformance/types/spread/objectSpreadNegative.ts b/tests/cases/conformance/types/spread/objectSpreadNegative.ts
index d492db4c638..04a88d2a427 100644
--- a/tests/cases/conformance/types/spread/objectSpreadNegative.ts
+++ b/tests/cases/conformance/types/spread/objectSpreadNegative.ts
@@ -8,8 +8,8 @@ class PrivateOptionalX {
 class PublicX {
     public x: number;
 }
-let o3: { ...PublicX, ...PrivateOptionalX };
-let sn: number = o3.x; // error, x is private
+let o2: { ...PublicX, ...PrivateOptionalX };
+let sn: number = o2.x; // error, x is private
 let optionalString: { sn?: string };
 let optionalNumber: { sn?: number };
 let allOptional: { sn: string | number } = { ...optionalString, ...optionalNumber };
@@ -22,14 +22,29 @@ let spread: { ...Bool, ...Str } = { s: 'foo' }; // error, missing 'b'
 let b: Bool;
 spread = b; // error, missing 's'
 
-// expressions are not allowed
-let o1 = { ...1 + 1 };
-let o2 = { ...(1 + 1) };
-
 // literal repeats are not allowed, but spread repeats are fine
 let duplicated = { b: 'bad', ...o, b: 'bad', ...o2, b: 'bad' }
 let duplicatedSpread = { ...o, ...o }
 
+// null and undefined are just skipped
+let spreadNull = { ...null }
+spreadNull.null;
+let spreadUndefined = { ...undefined }
+spreadUndefined.undefined;
+
+// primitives and functions are skipped
+let spreadNum = { ...12 };
+spreadNum.toFixed(); // error, no methods from number
+let spreadSum = { ...1 + 1 };
+spreadSum.toFixed(); // error, no methods from number
+let spreadStr = { ...'foo' };
+spreadStr.length; // error, no 'length'
+spreadStr.charAt(1); // error, no methods either
+let spreadBool = { ...true };
+spreadBool.valueOf(); // error, what were you thinking?
+let spreadFunc = { ...function () { } }
+spreadFunc(); // error, no call signature
+
 // write-only properties get skipped
 let setterOnly = { ...{ set b (bad: number) { } } };
 setterOnly.b = 12; // error, 'b' does not exist
@@ -44,9 +59,6 @@ let callableConstructableSpread: { ...PublicX, (n: number): number, new (p: numb
 callableConstructableSpread(12); // error, no call signature
 new callableConstructableSpread(12); // error, no construct signature
 
-let publicx: PublicX;
-let callableSpread = { ...publicx, ...(n => n + 1) }; // error, can't spread functions
-
 // { ...U } is not assignable to U
 function override<U>(initial: U, override: U): U {
     return { ...initial, ...override };
diff --git a/tests/cases/conformance/types/spread/objectSpreadUnion.ts b/tests/cases/conformance/types/spread/objectSpreadUnion.ts
new file mode 100644
index 00000000000..03a4251ca81
--- /dev/null
+++ b/tests/cases/conformance/types/spread/objectSpreadUnion.ts
@@ -0,0 +1,23 @@
+// concrete types work
+interface A1 { a: number }
+interface A2 { a: string }
+let a12: A1 | A2;
+let result = { ...a12 };
+let sn: number | string = result.a;
+let assignable: { ...(A1 | A2) } = result;
+
+function tripleUnion<T, U, V>(t: T, u: U, v: V): void {
+    let tuv: T | U | V;
+    let result = { id: 'foo', ...tuv };
+    let expected: { id: string, ...T } | { id: string, ...U } | { id: string, ...V } = result;
+    let assignable: { id: string, ...(T | U | V) } = result;
+}
+function iteratedDoubleUnion<T, U, V>(t: T, u: U, v: V): void {
+    let tu: T | U;
+    let uv: U | V;
+    let result = { id: 'bar', ...tu, ...uv };
+    let expected: { id: string, ...T, ...U } | { id: string, ...T, ...V } | { id: string, ...U } | { id: string, ...U, ...V };
+    let assignable: { id: string, ...(T | U), ...(U | V) } = result;
+}
+
+

From 05ec512d32bae646d96cba97595a173a11a02b88 Mon Sep 17 00:00:00 2001
From: Paul van Brenk <paul.van.brenk@microsoft.com>
Date: Tue, 11 Oct 2016 15:04:04 -0700
Subject: [PATCH 024/421] Codefixes for unused variables, properties etc.

---
 src/harness/fourslash.ts                      |   2 +-
 src/services/codefixes/fixes.ts               |   1 +
 .../codefixes/unusedIdentifierFixes.ts        | 153 ++++++++++++++++++
 .../fourslash/unusedClassInNamespace1.ts      |  10 ++
 .../fourslash/unusedClassInNamespace2.ts      |  15 ++
 .../fourslash/unusedClassInNamespace3.ts      |  12 ++
 .../fourslash/unusedClassInNamespace4.ts      |  19 +++
 .../fourslash/unusedClassInNamespace5.ts      |  26 +++
 .../fourslash/unusedClassInNamespace6.ts      |  27 ++++
 .../fourslash/unusedConstantInFunction1.ts    |  10 ++
 .../cases/fourslash/unusedEnumInFunction1.ts  |  11 ++
 .../fourslash/unusedFunctionInNamespace1.ts   |  10 ++
 .../fourslash/unusedFunctionInNamespace2.ts   |  14 ++
 .../fourslash/unusedFunctionInNamespace3.ts   |  12 ++
 .../fourslash/unusedFunctionInNamespace4.ts   |  11 ++
 .../fourslash/unusedFunctionInNamespace5.ts   |  28 ++++
 tests/cases/fourslash/unusedImports10FS.ts    |  16 ++
 tests/cases/fourslash/unusedImports1FS.ts     |  12 ++
 tests/cases/fourslash/unusedImports2FS.ts     |  20 +++
 tests/cases/fourslash/unusedImports3FS.ts     |  24 +++
 tests/cases/fourslash/unusedImports4FS.ts     |  24 +++
 tests/cases/fourslash/unusedImports5FS.ts     |  24 +++
 tests/cases/fourslash/unusedImports6FS.ts     |  20 +++
 tests/cases/fourslash/unusedImports7FS.ts     |  20 +++
 tests/cases/fourslash/unusedImports8FS.ts     |  24 +++
 tests/cases/fourslash/unusedImports9FS.ts     |  20 +++
 .../fourslash/unusedInterfaceInNamespace1.ts  |  11 ++
 .../fourslash/unusedInterfaceInNamespace2.ts  |  12 ++
 .../fourslash/unusedLocalsInFunction1.ts      |  10 ++
 .../fourslash/unusedLocalsInFunction2.ts      |   9 ++
 .../fourslash/unusedLocalsInFunction3.ts      |  10 ++
 .../fourslash/unusedLocalsInFunction4.ts      |  10 ++
 .../fourslash/unusedLocalsInMethodFS1.ts      |  12 ++
 .../fourslash/unusedLocalsInMethodFS2.ts      |  12 ++
 .../fourslash/unusedLocalsinConstructorFS1.ts |  12 ++
 .../fourslash/unusedLocalsinConstructorFS2.ts |  18 +++
 tests/cases/fourslash/unusedMethodInClass1.ts |  11 ++
 tests/cases/fourslash/unusedMethodInClass2.ts |  15 ++
 tests/cases/fourslash/unusedMethodInClass3.ts |  11 ++
 tests/cases/fourslash/unusedMethodInClass4.ts |  12 ++
 .../fourslash/unusedNamespaceInNamespace.ts   |  13 ++
 .../unusedParameterInConstructor1.ts          |   8 +
 .../fourslash/unusedParameterInFunction1.ts   |   7 +
 .../fourslash/unusedParameterInFunction2.ts   |   8 +
 .../fourslash/unusedParameterInFunction3.ts   |   8 +
 .../fourslash/unusedParameterInFunction4.ts   |   9 ++
 .../fourslash/unusedParameterInLambda1.ts     |   9 ++
 .../fourslash/unusedTypeParametersInClass1.ts |   7 +
 .../fourslash/unusedTypeParametersInClass2.ts |   8 +
 .../fourslash/unusedTypeParametersInClass3.ts |   9 ++
 .../unusedTypeParametersInFunction1.ts        |   6 +
 .../unusedTypeParametersInFunction2.ts        |   6 +
 .../unusedTypeParametersInFunction3.ts        |   6 +
 .../unusedTypeParametersInInterface1.ts       |   7 +
 .../unusedTypeParametersInLambda1.ts          |   9 ++
 .../unusedTypeParametersInLambda2.ts          |   9 ++
 .../unusedTypeParametersInLambda3.ts          |  10 ++
 .../unusedTypeParametersInLambda4.ts          |   9 ++
 .../unusedTypeParametersInMethod1.ts          |   8 +
 .../unusedTypeParametersInMethod2.ts          |   8 +
 .../unusedTypeParametersInMethods1.ts         |   8 +
 .../cases/fourslash/unusedVariableInBlocks.ts |  15 ++
 .../cases/fourslash/unusedVariableInClass1.ts |   8 +
 .../cases/fourslash/unusedVariableInClass2.ts |   9 ++
 .../cases/fourslash/unusedVariableInClass3.ts |   8 +
 .../fourslash/unusedVariableInForLoop1FS.ts   |  11 ++
 .../fourslash/unusedVariableInForLoop2FS.ts   |  10 ++
 .../fourslash/unusedVariableInForLoop3FS.ts   |  10 ++
 .../fourslash/unusedVariableInForLoop4FS.ts   |  10 ++
 .../fourslash/unusedVariableInForLoop5FS.ts   |  11 ++
 .../fourslash/unusedVariableInForLoop6FS.ts   |  11 ++
 .../fourslash/unusedVariableInForLoop7FS.ts   |  12 ++
 .../fourslash/unusedVariableInModule1.ts      |   9 ++
 .../fourslash/unusedVariableInModule2.ts      |  10 ++
 .../fourslash/unusedVariableInModule3.ts      |   9 ++
 .../fourslash/unusedVariableInModule4.ts      |  10 ++
 .../fourslash/unusedVariableInNamespace1.ts   |   8 +
 .../fourslash/unusedVariableInNamespace2.ts   |  12 ++
 .../fourslash/unusedVariableInNamespace3.ts   |  12 ++
 79 files changed, 1086 insertions(+), 1 deletion(-)
 create mode 100644 src/services/codefixes/unusedIdentifierFixes.ts
 create mode 100644 tests/cases/fourslash/unusedClassInNamespace1.ts
 create mode 100644 tests/cases/fourslash/unusedClassInNamespace2.ts
 create mode 100644 tests/cases/fourslash/unusedClassInNamespace3.ts
 create mode 100644 tests/cases/fourslash/unusedClassInNamespace4.ts
 create mode 100644 tests/cases/fourslash/unusedClassInNamespace5.ts
 create mode 100644 tests/cases/fourslash/unusedClassInNamespace6.ts
 create mode 100644 tests/cases/fourslash/unusedConstantInFunction1.ts
 create mode 100644 tests/cases/fourslash/unusedEnumInFunction1.ts
 create mode 100644 tests/cases/fourslash/unusedFunctionInNamespace1.ts
 create mode 100644 tests/cases/fourslash/unusedFunctionInNamespace2.ts
 create mode 100644 tests/cases/fourslash/unusedFunctionInNamespace3.ts
 create mode 100644 tests/cases/fourslash/unusedFunctionInNamespace4.ts
 create mode 100644 tests/cases/fourslash/unusedFunctionInNamespace5.ts
 create mode 100644 tests/cases/fourslash/unusedImports10FS.ts
 create mode 100644 tests/cases/fourslash/unusedImports1FS.ts
 create mode 100644 tests/cases/fourslash/unusedImports2FS.ts
 create mode 100644 tests/cases/fourslash/unusedImports3FS.ts
 create mode 100644 tests/cases/fourslash/unusedImports4FS.ts
 create mode 100644 tests/cases/fourslash/unusedImports5FS.ts
 create mode 100644 tests/cases/fourslash/unusedImports6FS.ts
 create mode 100644 tests/cases/fourslash/unusedImports7FS.ts
 create mode 100644 tests/cases/fourslash/unusedImports8FS.ts
 create mode 100644 tests/cases/fourslash/unusedImports9FS.ts
 create mode 100644 tests/cases/fourslash/unusedInterfaceInNamespace1.ts
 create mode 100644 tests/cases/fourslash/unusedInterfaceInNamespace2.ts
 create mode 100644 tests/cases/fourslash/unusedLocalsInFunction1.ts
 create mode 100644 tests/cases/fourslash/unusedLocalsInFunction2.ts
 create mode 100644 tests/cases/fourslash/unusedLocalsInFunction3.ts
 create mode 100644 tests/cases/fourslash/unusedLocalsInFunction4.ts
 create mode 100644 tests/cases/fourslash/unusedLocalsInMethodFS1.ts
 create mode 100644 tests/cases/fourslash/unusedLocalsInMethodFS2.ts
 create mode 100644 tests/cases/fourslash/unusedLocalsinConstructorFS1.ts
 create mode 100644 tests/cases/fourslash/unusedLocalsinConstructorFS2.ts
 create mode 100644 tests/cases/fourslash/unusedMethodInClass1.ts
 create mode 100644 tests/cases/fourslash/unusedMethodInClass2.ts
 create mode 100644 tests/cases/fourslash/unusedMethodInClass3.ts
 create mode 100644 tests/cases/fourslash/unusedMethodInClass4.ts
 create mode 100644 tests/cases/fourslash/unusedNamespaceInNamespace.ts
 create mode 100644 tests/cases/fourslash/unusedParameterInConstructor1.ts
 create mode 100644 tests/cases/fourslash/unusedParameterInFunction1.ts
 create mode 100644 tests/cases/fourslash/unusedParameterInFunction2.ts
 create mode 100644 tests/cases/fourslash/unusedParameterInFunction3.ts
 create mode 100644 tests/cases/fourslash/unusedParameterInFunction4.ts
 create mode 100644 tests/cases/fourslash/unusedParameterInLambda1.ts
 create mode 100644 tests/cases/fourslash/unusedTypeParametersInClass1.ts
 create mode 100644 tests/cases/fourslash/unusedTypeParametersInClass2.ts
 create mode 100644 tests/cases/fourslash/unusedTypeParametersInClass3.ts
 create mode 100644 tests/cases/fourslash/unusedTypeParametersInFunction1.ts
 create mode 100644 tests/cases/fourslash/unusedTypeParametersInFunction2.ts
 create mode 100644 tests/cases/fourslash/unusedTypeParametersInFunction3.ts
 create mode 100644 tests/cases/fourslash/unusedTypeParametersInInterface1.ts
 create mode 100644 tests/cases/fourslash/unusedTypeParametersInLambda1.ts
 create mode 100644 tests/cases/fourslash/unusedTypeParametersInLambda2.ts
 create mode 100644 tests/cases/fourslash/unusedTypeParametersInLambda3.ts
 create mode 100644 tests/cases/fourslash/unusedTypeParametersInLambda4.ts
 create mode 100644 tests/cases/fourslash/unusedTypeParametersInMethod1.ts
 create mode 100644 tests/cases/fourslash/unusedTypeParametersInMethod2.ts
 create mode 100644 tests/cases/fourslash/unusedTypeParametersInMethods1.ts
 create mode 100644 tests/cases/fourslash/unusedVariableInBlocks.ts
 create mode 100644 tests/cases/fourslash/unusedVariableInClass1.ts
 create mode 100644 tests/cases/fourslash/unusedVariableInClass2.ts
 create mode 100644 tests/cases/fourslash/unusedVariableInClass3.ts
 create mode 100644 tests/cases/fourslash/unusedVariableInForLoop1FS.ts
 create mode 100644 tests/cases/fourslash/unusedVariableInForLoop2FS.ts
 create mode 100644 tests/cases/fourslash/unusedVariableInForLoop3FS.ts
 create mode 100644 tests/cases/fourslash/unusedVariableInForLoop4FS.ts
 create mode 100644 tests/cases/fourslash/unusedVariableInForLoop5FS.ts
 create mode 100644 tests/cases/fourslash/unusedVariableInForLoop6FS.ts
 create mode 100644 tests/cases/fourslash/unusedVariableInForLoop7FS.ts
 create mode 100644 tests/cases/fourslash/unusedVariableInModule1.ts
 create mode 100644 tests/cases/fourslash/unusedVariableInModule2.ts
 create mode 100644 tests/cases/fourslash/unusedVariableInModule3.ts
 create mode 100644 tests/cases/fourslash/unusedVariableInModule4.ts
 create mode 100644 tests/cases/fourslash/unusedVariableInNamespace1.ts
 create mode 100644 tests/cases/fourslash/unusedVariableInNamespace2.ts
 create mode 100644 tests/cases/fourslash/unusedVariableInNamespace3.ts

diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
index f54804c0eb5..e58a189c923 100644
--- a/src/harness/fourslash.ts
+++ b/src/harness/fourslash.ts
@@ -2049,7 +2049,7 @@ namespace FourSlash {
                 this.raiseError("Errors expected.");
             }
 
-            if (diagnostics.length > 1 && errorCode !== undefined) {
+            if (diagnostics.length > 1 && errorCode === undefined) {
                 this.raiseError("When there's more than one error, you must specify the errror to fix.");
             }
 
diff --git a/src/services/codefixes/fixes.ts b/src/services/codefixes/fixes.ts
index d64a99ca1b9..ae13a965838 100644
--- a/src/services/codefixes/fixes.ts
+++ b/src/services/codefixes/fixes.ts
@@ -1 +1,2 @@
 ///<reference path='superFixes.ts' />
+///<reference path='unusedIdentifierFixes.ts' />
\ No newline at end of file
diff --git a/src/services/codefixes/unusedIdentifierFixes.ts b/src/services/codefixes/unusedIdentifierFixes.ts
new file mode 100644
index 00000000000..9a69af04bfc
--- /dev/null
+++ b/src/services/codefixes/unusedIdentifierFixes.ts
@@ -0,0 +1,153 @@
+/* @internal */
+namespace ts.codefix {
+    registerCodeFix({
+        errorCodes: [
+            Diagnostics._0_is_declared_but_never_used.code,
+            Diagnostics.Property_0_is_declared_but_never_used.code
+        ],
+        getCodeActions: (context: CodeFixContext) => {
+            const sourceFile = context.sourceFile;
+            const start = context.span.start;
+            const token = getTokenAtPosition(sourceFile, start);
+
+            if (token.kind === ts.SyntaxKind.Identifier) {
+                if (token.parent.kind === ts.SyntaxKind.VariableDeclaration) {
+                    if (token.parent.parent.parent.kind === SyntaxKind.ForStatement) {
+                        const forStatement = <ForStatement>token.parent.parent.parent;
+                        const initializer = <VariableDeclarationList>forStatement.initializer;
+                        if (initializer.declarations.length === 1) {
+                            return createCodeFix("", initializer.pos, initializer.end - initializer.pos);
+                        }
+                        else {
+                            if (initializer.declarations[0] === token.parent) {
+                                return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos + 1);
+                            }
+                            else {
+                                return createCodeFix("", token.parent.pos - 1, token.parent.end - token.parent.pos + 1);
+                            }
+                        }
+                    }
+                    else if (token.parent.parent.parent.kind === SyntaxKind.ForInStatement) {
+                        const forInStatement = <ForInStatement>token.parent.parent.parent;
+                        const initializer = <VariableDeclarationList>forInStatement.initializer;
+                        return createCodeFix("{}", initializer.declarations[0].pos, initializer.declarations[0].end - initializer.declarations[0].pos);
+                    }
+                    else if (token.parent.parent.parent.kind === SyntaxKind.ForOfStatement) {
+                        const forOfStatement = <ForOfStatement>token.parent.parent.parent;
+                        const initializer = <VariableDeclarationList>forOfStatement.initializer;
+                        return createCodeFix("{}", initializer.declarations[0].pos, initializer.declarations[0].end - initializer.declarations[0].pos);
+                    }
+                    else if (token.parent.parent.kind === SyntaxKind.CatchClause) {
+                        const catchClause = <CatchClause>token.parent.parent;
+                        const parameter = catchClause.variableDeclaration.getChildren()[0];
+                        return createCodeFix("", parameter.pos, parameter.end - parameter.pos);
+                    }
+                    else {
+                        const variableStatement = <VariableStatement>token.parent.parent.parent;
+                        if (variableStatement.declarationList.declarations.length === 1) {
+                            return createCodeFix("", variableStatement.pos, variableStatement.end - variableStatement.pos);
+                        }
+                        else {
+                            const declarations = variableStatement.declarationList.declarations;
+                            if (declarations[0].name === token) {
+                                return createCodeFix("", token.parent.pos + 1, token.parent.end - token.parent.pos);
+                            }
+                            else {
+                                return createCodeFix("", token.parent.pos - 1, token.parent.end - token.parent.pos + 1);
+                            }
+                        }
+                    }
+                }
+
+                if (token.parent.kind === SyntaxKind.FunctionDeclaration ||
+                    token.parent.kind === SyntaxKind.ClassDeclaration ||
+                    token.parent.kind === SyntaxKind.InterfaceDeclaration ||
+                    token.parent.kind === SyntaxKind.MethodDeclaration ||
+                    token.parent.kind === SyntaxKind.ModuleDeclaration ||
+                    token.parent.kind === SyntaxKind.PropertyDeclaration ||
+                    token.parent.kind === SyntaxKind.ArrowFunction) {
+                    return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
+                }
+
+                if (token.parent.kind === SyntaxKind.TypeParameter) {
+                    const typeParameters = (<ClassDeclaration>token.parent.parent).typeParameters;
+                    if (typeParameters.length === 1) {
+                        return createCodeFix("", token.parent.pos - 1, token.parent.end - token.parent.pos + 2);
+                    }
+                    else {
+                        if (typeParameters[0] === token.parent) {
+                            return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos + 1);
+                        }
+                        else {
+                            return createCodeFix("", token.parent.pos - 1, token.parent.end - token.parent.pos + 1);
+                        }
+                    }
+                }
+
+                if (token.parent.kind === ts.SyntaxKind.Parameter) {
+                    const functionDeclaration = <FunctionDeclaration>token.parent.parent;
+                    if (functionDeclaration.parameters.length === 1) {
+                        return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
+                    }
+                    else {
+                        if (functionDeclaration.parameters[0] === token.parent) {
+                            return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos + 1);
+                        }
+                        else {
+                            return createCodeFix("", token.parent.pos - 1, token.parent.end - token.parent.pos + 1);
+                        }
+                    }
+                }
+
+                if (token.parent.kind === SyntaxKind.ImportSpecifier) {
+                    const namedImports = <NamedImports>token.parent.parent;
+                    const elements = namedImports.elements;
+                    if (elements.length === 1) {
+                        // Only 1 import and it is unused. So the entire line could be removed.
+                        return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
+                    }
+                    else {
+                        if (elements[0] === token.parent) {
+                            return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos + 1);
+                        }
+                        else {
+                            return createCodeFix("", token.parent.pos - 1, token.parent.end - token.parent.pos + 1);
+                        }
+                    }
+                }
+
+                if (token.parent.parent.kind === SyntaxKind.ImportClause || token.parent.parent.kind === SyntaxKind.ImportDeclaration) {
+                    return createCodeFix("{}", token.parent.pos, token.parent.end - token.parent.pos);
+                }
+
+                if (token.parent.kind === SyntaxKind.ImportEqualsDeclaration) {
+                    return createCodeFix("{}", token.pos, token.end - token.pos);
+                }
+
+                if (token.parent.kind === SyntaxKind.EnumDeclaration) {
+                    return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
+                }
+            }
+
+            if (token.kind === SyntaxKind.PrivateKeyword && token.parent.kind === SyntaxKind.PropertyDeclaration) {
+                return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
+            }
+
+            if (token.kind === SyntaxKind.AsteriskToken && token.parent.kind === SyntaxKind.NamespaceImport) {
+                return createCodeFix("{}", token.parent.pos, token.parent.end - token.parent.pos);
+            }
+
+            return undefined;
+
+            function createCodeFix(newText: string, start: number, length: number): CodeAction[] {
+                return [{
+                    description: getLocaleSpecificMessage(Diagnostics.Remove_unused_identifiers),
+                    changes: [{
+                        fileName: sourceFile.fileName,
+                        textChanges: [{ newText, span: { start, length } }]
+                    }]
+                }];
+            }
+        }
+    });
+}
diff --git a/tests/cases/fourslash/unusedClassInNamespace1.ts b/tests/cases/fourslash/unusedClassInNamespace1.ts
new file mode 100644
index 00000000000..586202ab0c7
--- /dev/null
+++ b/tests/cases/fourslash/unusedClassInNamespace1.ts
@@ -0,0 +1,10 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// [| namespace greeter {
+////   class class1 {
+////   }
+//// } |]
+
+verify.codeFixAtPosition(`namespace greeter {
+}`);
diff --git a/tests/cases/fourslash/unusedClassInNamespace2.ts b/tests/cases/fourslash/unusedClassInNamespace2.ts
new file mode 100644
index 00000000000..c182f4e3655
--- /dev/null
+++ b/tests/cases/fourslash/unusedClassInNamespace2.ts
@@ -0,0 +1,15 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// [| namespace greeter {
+////    export class class2 {
+////    }
+////    class class1 {
+////    }
+//// } |]
+
+verify.codeFixAtPosition(`namespace greeter {
+    export class class2 {
+    }
+}`);
+
diff --git a/tests/cases/fourslash/unusedClassInNamespace3.ts b/tests/cases/fourslash/unusedClassInNamespace3.ts
new file mode 100644
index 00000000000..6102f744717
--- /dev/null
+++ b/tests/cases/fourslash/unusedClassInNamespace3.ts
@@ -0,0 +1,12 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+// @noUnusedParameters:true
+//// [| namespace Validation {
+////    class c1 {
+////
+////   }/*1*/
+//// } |]
+
+verify.codeFixAtPosition(`namespace Validation {
+}`);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedClassInNamespace4.ts b/tests/cases/fourslash/unusedClassInNamespace4.ts
new file mode 100644
index 00000000000..79701a5e0e2
--- /dev/null
+++ b/tests/cases/fourslash/unusedClassInNamespace4.ts
@@ -0,0 +1,19 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+// @noUnusedParameters:true
+
+//// [| namespace Validation {
+////    class c1 {
+////
+////    }
+////
+////    export class c2 {
+////
+////    }
+//// } |]
+
+verify.codeFixAtPosition(`namespace Validation {
+    export class c2 {
+    }
+}`);
diff --git a/tests/cases/fourslash/unusedClassInNamespace5.ts b/tests/cases/fourslash/unusedClassInNamespace5.ts
new file mode 100644
index 00000000000..80d8fe857bd
--- /dev/null
+++ b/tests/cases/fourslash/unusedClassInNamespace5.ts
@@ -0,0 +1,26 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+// @noUnusedParameters:true
+
+//// [| namespace Validation {
+////    class c1 {
+////
+////    }
+////
+////    export class c2 {
+////
+////    }
+////
+////    class c3 extends c1 {
+////
+////    }
+////} |]
+
+verify.codeFixAtPosition(`namespace Validation {
+    class c1 {
+    }
+
+    export class c2 {
+    }
+}`);
diff --git a/tests/cases/fourslash/unusedClassInNamespace6.ts b/tests/cases/fourslash/unusedClassInNamespace6.ts
new file mode 100644
index 00000000000..5db5b1aefa6
--- /dev/null
+++ b/tests/cases/fourslash/unusedClassInNamespace6.ts
@@ -0,0 +1,27 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+// @noUnusedParameters:true
+//// [| namespace Validation {
+////    class c1 {
+////
+////    }
+////
+////    export class c2 {
+////
+////    }
+////
+////    class c3 {
+////        public x: c1;
+////    }
+////} |]
+
+verify.codeFixAtPosition(`namespace Validation {
+    class c1 {
+
+    }
+
+    export class c2 {
+
+    }
+}`);
diff --git a/tests/cases/fourslash/unusedConstantInFunction1.ts b/tests/cases/fourslash/unusedConstantInFunction1.ts
new file mode 100644
index 00000000000..df373257809
--- /dev/null
+++ b/tests/cases/fourslash/unusedConstantInFunction1.ts
@@ -0,0 +1,10 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// [| function f1 () {
+////     const x: string = "x";
+//// } |]
+
+verify.codeFixAtPosition(`function f1 () {
+}`);
+
diff --git a/tests/cases/fourslash/unusedEnumInFunction1.ts b/tests/cases/fourslash/unusedEnumInFunction1.ts
new file mode 100644
index 00000000000..1d88f07ebf7
--- /dev/null
+++ b/tests/cases/fourslash/unusedEnumInFunction1.ts
@@ -0,0 +1,11 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// [| function f1 () {
+////     enum Directions { Up, Down}
+//// } |]
+
+verify.codeFixAtPosition(`function f1 () {
+}
+`);
+
diff --git a/tests/cases/fourslash/unusedFunctionInNamespace1.ts b/tests/cases/fourslash/unusedFunctionInNamespace1.ts
new file mode 100644
index 00000000000..e0f6b2e18ac
--- /dev/null
+++ b/tests/cases/fourslash/unusedFunctionInNamespace1.ts
@@ -0,0 +1,10 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// [| namespace greeter {
+////   function function1() {
+////   }/*1*/
+//// } |]
+
+verify.codeFixAtPosition(`namespace greeter {
+}`);
diff --git a/tests/cases/fourslash/unusedFunctionInNamespace2.ts b/tests/cases/fourslash/unusedFunctionInNamespace2.ts
new file mode 100644
index 00000000000..c823777048e
--- /dev/null
+++ b/tests/cases/fourslash/unusedFunctionInNamespace2.ts
@@ -0,0 +1,14 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// [| namespace greeter {
+////    export function function2() {
+////    }
+////    function function1() {
+////    }
+////} |]
+
+verify.codeFixAtPosition(`namespace greeter {
+    export function function2() {
+    }
+}`);
diff --git a/tests/cases/fourslash/unusedFunctionInNamespace3.ts b/tests/cases/fourslash/unusedFunctionInNamespace3.ts
new file mode 100644
index 00000000000..144e9f325b4
--- /dev/null
+++ b/tests/cases/fourslash/unusedFunctionInNamespace3.ts
@@ -0,0 +1,12 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+// @noUnusedParameters:true
+
+//// [| namespace Validation {
+////    function function1() {
+////    }
+////} |]
+
+verify.codeFixAtPosition(`namespace Validation {
+}`);
diff --git a/tests/cases/fourslash/unusedFunctionInNamespace4.ts b/tests/cases/fourslash/unusedFunctionInNamespace4.ts
new file mode 100644
index 00000000000..5b5995da9c7
--- /dev/null
+++ b/tests/cases/fourslash/unusedFunctionInNamespace4.ts
@@ -0,0 +1,11 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+// @noUnusedParameters:true
+//// [| namespace Validation {
+////    var function1 = function() {
+////    }
+////} |]
+
+verify.codeFixAtPosition(`namespace Validation {
+}`);
diff --git a/tests/cases/fourslash/unusedFunctionInNamespace5.ts b/tests/cases/fourslash/unusedFunctionInNamespace5.ts
new file mode 100644
index 00000000000..fa1eed2364a
--- /dev/null
+++ b/tests/cases/fourslash/unusedFunctionInNamespace5.ts
@@ -0,0 +1,28 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+// @noUnusedParameters:true
+////namespace Validation {
+////    var function1 = function() {
+////    }
+////
+////    export function function2() {
+////
+////    }
+////
+////    [| function function3() {
+////        function1();
+////    }
+////
+////    function function4() {
+////
+////    }
+////
+////    exp ort let a = function3; |]
+////}
+
+verify.codeFixAtPosition(`function function3() {
+        function1();
+    }
+
+    export let a = function3;`, 6133);
diff --git a/tests/cases/fourslash/unusedImports10FS.ts b/tests/cases/fourslash/unusedImports10FS.ts
new file mode 100644
index 00000000000..2eb923c9b8f
--- /dev/null
+++ b/tests/cases/fourslash/unusedImports10FS.ts
@@ -0,0 +1,16 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// module A {
+////    export class Calculator {
+////         public handelChar() {
+////         }
+////     }
+//// }
+
+//// module B {
+////     [|import a = A;|]
+//// }
+
+verify.codeFixAtPosition(" import {} = A;");
+
diff --git a/tests/cases/fourslash/unusedImports1FS.ts b/tests/cases/fourslash/unusedImports1FS.ts
new file mode 100644
index 00000000000..c3ae198d876
--- /dev/null
+++ b/tests/cases/fourslash/unusedImports1FS.ts
@@ -0,0 +1,12 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+// @Filename: file2.ts
+////   [| import {/*0*/Calculator/*1*/} from "./file1" |]
+
+// @Filename: file1.ts
+////    export class Calculator {
+////
+////    }
+
+verify.codeFixAtPosition(`import {} from "./file1"`);
diff --git a/tests/cases/fourslash/unusedImports2FS.ts b/tests/cases/fourslash/unusedImports2FS.ts
new file mode 100644
index 00000000000..a7144d1eb49
--- /dev/null
+++ b/tests/cases/fourslash/unusedImports2FS.ts
@@ -0,0 +1,20 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+// @Filename: file2.ts
+//// [| import {Calculator} from "./file1"
+//// import {test} from "./file1" |]
+
+//// var x = new Calculator();
+//// x.handleChar();
+
+// @Filename: file1.ts
+//// export class Calculator {
+////    handleChar() {}
+//// }
+//// export function test() {
+////
+//// }
+
+verify.codeFixAtPosition(`import {Calculator} from "./file1"
+import {} from "./file1"`);
diff --git a/tests/cases/fourslash/unusedImports3FS.ts b/tests/cases/fourslash/unusedImports3FS.ts
new file mode 100644
index 00000000000..f030232dc1e
--- /dev/null
+++ b/tests/cases/fourslash/unusedImports3FS.ts
@@ -0,0 +1,24 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+// @Filename: file2.ts
+////[| import {/*0*/Calculator,/*1*/ test, test2} from "./file1" |]
+
+//// test();
+//// test2();
+
+// @Filename: file1.ts
+//// export class Calculator {
+////     handleChar() {}
+//// }
+
+//// export function test() {
+////
+//// }
+
+//// export function test2() {
+////
+//// }
+
+verify.codeFixAtPosition(`import {test, test2} from "./file1"`);
+
diff --git a/tests/cases/fourslash/unusedImports4FS.ts b/tests/cases/fourslash/unusedImports4FS.ts
new file mode 100644
index 00000000000..ab37928eb01
--- /dev/null
+++ b/tests/cases/fourslash/unusedImports4FS.ts
@@ -0,0 +1,24 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+// @Filename: file2.ts
+//// [| import {Calculator/*0*/, test/*1*/, test2} from "./file1" |]
+////
+//// var x = new Calculator();
+//// x.handleChar();
+//// test2();
+
+// @Filename: file1.ts
+//// export class Calculator {
+////     handleChar() {}
+//// }
+////
+//// export function test() {
+////
+//// }
+////
+//// export function test2() {
+////
+//// }
+
+verify.codeFixAtPosition(`import {Calculator, test2} from "./file1"`);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedImports5FS.ts b/tests/cases/fourslash/unusedImports5FS.ts
new file mode 100644
index 00000000000..1d68f6ae643
--- /dev/null
+++ b/tests/cases/fourslash/unusedImports5FS.ts
@@ -0,0 +1,24 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+// @Filename: file2.ts
+//// [| import {Calculator, test, test2} from "./file1" |]
+////
+//// var x = new Calculator();
+//// x.handleChar();
+//// test();
+
+// @Filename: file1.ts
+//// export class Calculator {
+////     handleChar() {}
+//// }
+////
+//// export function test() {
+////
+//// }
+////
+//// export function test2() {
+////
+//// }
+
+verify.codeFixAtPosition(`import {Calculator, test} from "./file1"`);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedImports6FS.ts b/tests/cases/fourslash/unusedImports6FS.ts
new file mode 100644
index 00000000000..c8e1af92313
--- /dev/null
+++ b/tests/cases/fourslash/unusedImports6FS.ts
@@ -0,0 +1,20 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+// @Filename: file2.ts
+//// [| import d from "./file1" |]
+
+// @Filename: file1.ts
+//// export class Calculator {
+////     handleChar() { }
+//// }
+
+//// export function test() {
+////
+//// }
+
+//// export default function test2() {
+////
+//// }
+
+verify.codeFixAtPosition(`import {} from "./file1"`);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedImports7FS.ts b/tests/cases/fourslash/unusedImports7FS.ts
new file mode 100644
index 00000000000..6dc0886e8ff
--- /dev/null
+++ b/tests/cases/fourslash/unusedImports7FS.ts
@@ -0,0 +1,20 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+// @Filename: file2.ts
+//// [| import * as n from "./file1" |]
+
+// @Filename: file1.ts
+//// export class Calculator {
+////     handleChar() { }
+//// }
+////
+//// export function test() {
+////
+//// }
+////
+//// export default function test2() {
+////
+//// }
+
+verify.codeFixAtPosition(`import {} from "./file1"`);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedImports8FS.ts b/tests/cases/fourslash/unusedImports8FS.ts
new file mode 100644
index 00000000000..02564e35989
--- /dev/null
+++ b/tests/cases/fourslash/unusedImports8FS.ts
@@ -0,0 +1,24 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+// @Filename: file2.ts
+//// [|import {Calculator as calc, test as t1, test2 as t2} from "./file1"|]
+////
+//// var x = new calc();
+//// x.handleChar();
+//// t1();
+
+// @Filename: file1.ts
+//// export class Calculator {
+////     handleChar() { }
+//// }
+
+//// export function test() {
+////
+//// }
+
+//// export function test2() {
+////
+//// }
+
+verify.codeFixAtPosition(`import {Calculator as calc, test as t1} from "./file1"`);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedImports9FS.ts b/tests/cases/fourslash/unusedImports9FS.ts
new file mode 100644
index 00000000000..2ba30c95bb7
--- /dev/null
+++ b/tests/cases/fourslash/unusedImports9FS.ts
@@ -0,0 +1,20 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+// @Filename: file2.ts
+//// [|import c = require('./file1')|]
+
+// @Filename: file1.ts
+//// export class Calculator {
+////     handleChar() { }
+//// }
+////
+//// export function test() {
+////
+//// }
+////
+//// export function test2() {
+////
+//// }
+
+verify.codeFixAtPosition("import {} = require('./file1')");
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedInterfaceInNamespace1.ts b/tests/cases/fourslash/unusedInterfaceInNamespace1.ts
new file mode 100644
index 00000000000..8d07a8c7912
--- /dev/null
+++ b/tests/cases/fourslash/unusedInterfaceInNamespace1.ts
@@ -0,0 +1,11 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// [| namespace greeter {
+////    interface interface1 {
+////    }
+////} |]
+
+verify.codeFixAtPosition(`
+namespace greeter {
+}`);
diff --git a/tests/cases/fourslash/unusedInterfaceInNamespace2.ts b/tests/cases/fourslash/unusedInterfaceInNamespace2.ts
new file mode 100644
index 00000000000..baa46c65a0c
--- /dev/null
+++ b/tests/cases/fourslash/unusedInterfaceInNamespace2.ts
@@ -0,0 +1,12 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+////namespace greeter {
+////    [| export interface interface2 {
+////    }
+////    interface interface1 {
+////    } |]
+////}
+
+verify.codeFixAtPosition(`export interface interface2 {
+}`);
diff --git a/tests/cases/fourslash/unusedLocalsInFunction1.ts b/tests/cases/fourslash/unusedLocalsInFunction1.ts
new file mode 100644
index 00000000000..2edd7c176e7
--- /dev/null
+++ b/tests/cases/fourslash/unusedLocalsInFunction1.ts
@@ -0,0 +1,10 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// [| function greeter() {
+////    var x = 0;
+////} |]
+
+verify.codeFixAtPosition(`
+function greeter() {
+}`);
diff --git a/tests/cases/fourslash/unusedLocalsInFunction2.ts b/tests/cases/fourslash/unusedLocalsInFunction2.ts
new file mode 100644
index 00000000000..8f843623974
--- /dev/null
+++ b/tests/cases/fourslash/unusedLocalsInFunction2.ts
@@ -0,0 +1,9 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+////function greeter() {
+////    [| var x, y = 0; |]
+////    x++;
+////}
+
+verify.codeFixAtPosition("var x;", 6133);
diff --git a/tests/cases/fourslash/unusedLocalsInFunction3.ts b/tests/cases/fourslash/unusedLocalsInFunction3.ts
new file mode 100644
index 00000000000..3fc92541390
--- /dev/null
+++ b/tests/cases/fourslash/unusedLocalsInFunction3.ts
@@ -0,0 +1,10 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+////function greeter() {
+////   [| var x, y = 0,z = 1; |]
+////    x++;
+////    z++;
+////}
+
+verify.codeFixAtPosition("var x,z = 1;", 6133);
diff --git a/tests/cases/fourslash/unusedLocalsInFunction4.ts b/tests/cases/fourslash/unusedLocalsInFunction4.ts
new file mode 100644
index 00000000000..54d3223f236
--- /dev/null
+++ b/tests/cases/fourslash/unusedLocalsInFunction4.ts
@@ -0,0 +1,10 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+////function greeter() {
+////    [| var  x,y = 0,z = 1; |]
+////    y++;
+////    z++;
+////}
+
+verify.codeFixAtPosition("var y = 0,z = 1;");
diff --git a/tests/cases/fourslash/unusedLocalsInMethodFS1.ts b/tests/cases/fourslash/unusedLocalsInMethodFS1.ts
new file mode 100644
index 00000000000..43b782ce266
--- /dev/null
+++ b/tests/cases/fourslash/unusedLocalsInMethodFS1.ts
@@ -0,0 +1,12 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+// @noUnusedParameters: true
+////class greeter {
+////    public function1() {
+////       [| var /*0*/x,/*1*/ y = 10; |]
+////        y++;
+////    }
+////}
+
+verify.codeFixAtPosition("var y = 10;");
diff --git a/tests/cases/fourslash/unusedLocalsInMethodFS2.ts b/tests/cases/fourslash/unusedLocalsInMethodFS2.ts
new file mode 100644
index 00000000000..322cfad3940
--- /dev/null
+++ b/tests/cases/fourslash/unusedLocalsInMethodFS2.ts
@@ -0,0 +1,12 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+// @noUnusedParameters: true
+////class greeter {
+////    public function1() {
+////        [| var x, y; |]
+////        y = 1;
+////    }
+////}
+
+verify.codeFixAtPosition("var  y;");
diff --git a/tests/cases/fourslash/unusedLocalsinConstructorFS1.ts b/tests/cases/fourslash/unusedLocalsinConstructorFS1.ts
new file mode 100644
index 00000000000..412b599b780
--- /dev/null
+++ b/tests/cases/fourslash/unusedLocalsinConstructorFS1.ts
@@ -0,0 +1,12 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+// @noUnusedParameters:true
+////class greeter {
+////    [| constructor() {
+////        var unused = 20;
+////    } |]
+////}
+
+verify.codeFixAtPosition(`constructor() {
+}`);
diff --git a/tests/cases/fourslash/unusedLocalsinConstructorFS2.ts b/tests/cases/fourslash/unusedLocalsinConstructorFS2.ts
new file mode 100644
index 00000000000..eff9b7c8d54
--- /dev/null
+++ b/tests/cases/fourslash/unusedLocalsinConstructorFS2.ts
@@ -0,0 +1,18 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+// @noUnusedParameters: true
+////class greeter {
+////    [|constructor() {
+////        var unused = 20;
+////        var used = "dummy";
+////        used = used + "second part";
+////    }|]
+////}
+
+verify.codeFixAtPosition(`
+    constructor() {
+        var used = "dummy";
+        used = used + "second part";
+    }
+`);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedMethodInClass1.ts b/tests/cases/fourslash/unusedMethodInClass1.ts
new file mode 100644
index 00000000000..7795a4d1530
--- /dev/null
+++ b/tests/cases/fourslash/unusedMethodInClass1.ts
@@ -0,0 +1,11 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+////[| class greeter {
+////    private function1() {
+////    }
+////} |]
+
+verify.codeFixAtPosition(`
+class greeter {
+}`);
diff --git a/tests/cases/fourslash/unusedMethodInClass2.ts b/tests/cases/fourslash/unusedMethodInClass2.ts
new file mode 100644
index 00000000000..24b6fe155ef
--- /dev/null
+++ b/tests/cases/fourslash/unusedMethodInClass2.ts
@@ -0,0 +1,15 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// [| class greeter {
+////    public function2() {
+////    }
+////    private function1() {
+////    }
+////} |]
+
+verify.codeFixAtPosition(`
+class greeter {
+    public function2() {
+    }
+}`);
diff --git a/tests/cases/fourslash/unusedMethodInClass3.ts b/tests/cases/fourslash/unusedMethodInClass3.ts
new file mode 100644
index 00000000000..eab535fb5af
--- /dev/null
+++ b/tests/cases/fourslash/unusedMethodInClass3.ts
@@ -0,0 +1,11 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+////[|class greeter {
+////    private function1 = function() {
+////    }
+////} |]
+
+verify.codeFixAtPosition(`
+class greeter {
+}`);
diff --git a/tests/cases/fourslash/unusedMethodInClass4.ts b/tests/cases/fourslash/unusedMethodInClass4.ts
new file mode 100644
index 00000000000..ee27ec331eb
--- /dev/null
+++ b/tests/cases/fourslash/unusedMethodInClass4.ts
@@ -0,0 +1,12 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+////class greeter {
+////    [|public function2(){
+////    }
+////    private function1 = function() {
+////    } |]
+////}
+
+verify.codeFixAtPosition(`public function2(){
+}`);
diff --git a/tests/cases/fourslash/unusedNamespaceInNamespace.ts b/tests/cases/fourslash/unusedNamespaceInNamespace.ts
new file mode 100644
index 00000000000..41fe162ef15
--- /dev/null
+++ b/tests/cases/fourslash/unusedNamespaceInNamespace.ts
@@ -0,0 +1,13 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// [|namespace A {
+////    namespace B {
+////     }
+//// }|]
+
+verify.codeFixAtPosition(`
+namespace A {
+}
+`);
+
diff --git a/tests/cases/fourslash/unusedParameterInConstructor1.ts b/tests/cases/fourslash/unusedParameterInConstructor1.ts
new file mode 100644
index 00000000000..f53c6d3e8bd
--- /dev/null
+++ b/tests/cases/fourslash/unusedParameterInConstructor1.ts
@@ -0,0 +1,8 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// class C1 {
+////    [|constructor(private p1: string, public p2: boolean, public p3: any, p5)|] { p5; }
+//// }
+
+verify.codeFixAtPosition("constructor(public p2: boolean, public p3: any, p5)");
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedParameterInFunction1.ts b/tests/cases/fourslash/unusedParameterInFunction1.ts
new file mode 100644
index 00000000000..2243af9f5f5
--- /dev/null
+++ b/tests/cases/fourslash/unusedParameterInFunction1.ts
@@ -0,0 +1,7 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedParameters: true
+////function [|greeter( x)|] {
+////}
+
+verify.codeFixAtPosition("greeter()");
diff --git a/tests/cases/fourslash/unusedParameterInFunction2.ts b/tests/cases/fourslash/unusedParameterInFunction2.ts
new file mode 100644
index 00000000000..493eafc5722
--- /dev/null
+++ b/tests/cases/fourslash/unusedParameterInFunction2.ts
@@ -0,0 +1,8 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedParameters: true
+////function [|greeter(x,y)|] {
+////    x++;
+////}
+
+verify.codeFixAtPosition("greeter(x)");
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedParameterInFunction3.ts b/tests/cases/fourslash/unusedParameterInFunction3.ts
new file mode 100644
index 00000000000..6d79ba071b4
--- /dev/null
+++ b/tests/cases/fourslash/unusedParameterInFunction3.ts
@@ -0,0 +1,8 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedParameters: true
+////function [|greeter(x,y)|] {
+////    y++;
+////}
+
+verify.codeFixAtPosition("greeter(y)");
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedParameterInFunction4.ts b/tests/cases/fourslash/unusedParameterInFunction4.ts
new file mode 100644
index 00000000000..b536543fb6d
--- /dev/null
+++ b/tests/cases/fourslash/unusedParameterInFunction4.ts
@@ -0,0 +1,9 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedParameters: true
+////[|function greeter(x,y,z) |] {
+////    x++;
+////    z++;
+////}
+
+verify.codeFixAtPosition("function greeter(x,z)");
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedParameterInLambda1.ts b/tests/cases/fourslash/unusedParameterInLambda1.ts
new file mode 100644
index 00000000000..c462b742569
--- /dev/null
+++ b/tests/cases/fourslash/unusedParameterInLambda1.ts
@@ -0,0 +1,9 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+// @noUnusedParameters: true
+//// function f1() {
+////     [|return (x:number) => {}|]
+//// }
+
+verify.codeFixAtPosition("return () => {}");
diff --git a/tests/cases/fourslash/unusedTypeParametersInClass1.ts b/tests/cases/fourslash/unusedTypeParametersInClass1.ts
new file mode 100644
index 00000000000..ab654a5150e
--- /dev/null
+++ b/tests/cases/fourslash/unusedTypeParametersInClass1.ts
@@ -0,0 +1,7 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+////[|class greeter<T> |] {
+////}
+
+verify.codeFixAtPosition("class greeter");
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedTypeParametersInClass2.ts b/tests/cases/fourslash/unusedTypeParametersInClass2.ts
new file mode 100644
index 00000000000..8e860c10e04
--- /dev/null
+++ b/tests/cases/fourslash/unusedTypeParametersInClass2.ts
@@ -0,0 +1,8 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+////[|class greeter<X, Y> |] {
+////    public a: X;
+////}
+
+verify.codeFixAtPosition("class greeter<X>");
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedTypeParametersInClass3.ts b/tests/cases/fourslash/unusedTypeParametersInClass3.ts
new file mode 100644
index 00000000000..75ae98f53e0
--- /dev/null
+++ b/tests/cases/fourslash/unusedTypeParametersInClass3.ts
@@ -0,0 +1,9 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+////[|class greeter<X, Y, Z> |] {
+////    public a: X;
+////    public b: Z;
+////}
+
+verify.codeFixAtPosition("class greeter<X, Z>");
diff --git a/tests/cases/fourslash/unusedTypeParametersInFunction1.ts b/tests/cases/fourslash/unusedTypeParametersInFunction1.ts
new file mode 100644
index 00000000000..7177ed41c84
--- /dev/null
+++ b/tests/cases/fourslash/unusedTypeParametersInFunction1.ts
@@ -0,0 +1,6 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// [|function f1<T>() {}|]
+
+verify.codeFixAtPosition("function f1() {}");
diff --git a/tests/cases/fourslash/unusedTypeParametersInFunction2.ts b/tests/cases/fourslash/unusedTypeParametersInFunction2.ts
new file mode 100644
index 00000000000..344ae303c75
--- /dev/null
+++ b/tests/cases/fourslash/unusedTypeParametersInFunction2.ts
@@ -0,0 +1,6 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// [|function f1<X, Y>(a: X) {a}|]
+
+verify.codeFixAtPosition("function f1<X>(a: X) {a}");
diff --git a/tests/cases/fourslash/unusedTypeParametersInFunction3.ts b/tests/cases/fourslash/unusedTypeParametersInFunction3.ts
new file mode 100644
index 00000000000..746b174db18
--- /dev/null
+++ b/tests/cases/fourslash/unusedTypeParametersInFunction3.ts
@@ -0,0 +1,6 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// [|function f1<X, Y, Z>(a: X) {a;var b:Z;b}|]
+
+verify.codeFixAtPosition("function f1<X, Z>(a: X) {a;var b:Z;b}");
diff --git a/tests/cases/fourslash/unusedTypeParametersInInterface1.ts b/tests/cases/fourslash/unusedTypeParametersInInterface1.ts
new file mode 100644
index 00000000000..70d8bc7800c
--- /dev/null
+++ b/tests/cases/fourslash/unusedTypeParametersInInterface1.ts
@@ -0,0 +1,7 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+// @noUnusedParameters: true
+//// [|interface I<T> {}|]
+
+verify.codeFixAtPosition("interface I {}");
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedTypeParametersInLambda1.ts b/tests/cases/fourslash/unusedTypeParametersInLambda1.ts
new file mode 100644
index 00000000000..73d70672368
--- /dev/null
+++ b/tests/cases/fourslash/unusedTypeParametersInLambda1.ts
@@ -0,0 +1,9 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+// @noUnusedParameters: true
+//// function f1() {
+////     [|return <T>(x:number) => {x}|]
+//// }
+
+verify.codeFixAtPosition("return (x:number) => {x}");
diff --git a/tests/cases/fourslash/unusedTypeParametersInLambda2.ts b/tests/cases/fourslash/unusedTypeParametersInLambda2.ts
new file mode 100644
index 00000000000..77c802f5c44
--- /dev/null
+++ b/tests/cases/fourslash/unusedTypeParametersInLambda2.ts
@@ -0,0 +1,9 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+// @noUnusedParameters: true
+//// var x : {
+////     [|new <T, U>(a: T): void;|]
+//// }
+
+verify.codeFixAtPosition("new <T>(a: T): void;");
diff --git a/tests/cases/fourslash/unusedTypeParametersInLambda3.ts b/tests/cases/fourslash/unusedTypeParametersInLambda3.ts
new file mode 100644
index 00000000000..0ecb0338be2
--- /dev/null
+++ b/tests/cases/fourslash/unusedTypeParametersInLambda3.ts
@@ -0,0 +1,10 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+// @noUnusedParameters: true
+//// class A<Dummy> { public x: Dummy }
+//// var x : {
+////     [|new <T, U, K>(a: T): A<U>;|]
+//// }
+
+verify.codeFixAtPosition("new <T, U>(a: T): A<U>;");
diff --git a/tests/cases/fourslash/unusedTypeParametersInLambda4.ts b/tests/cases/fourslash/unusedTypeParametersInLambda4.ts
new file mode 100644
index 00000000000..5a226fc9005
--- /dev/null
+++ b/tests/cases/fourslash/unusedTypeParametersInLambda4.ts
@@ -0,0 +1,9 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// class A<T> {
+////    public x: T;
+//// }
+//// [|var y: new <T,U>(a:T)=>void;|]
+
+verify.codeFixAtPosition("var y: new <T>(a:T)=>void;");
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedTypeParametersInMethod1.ts b/tests/cases/fourslash/unusedTypeParametersInMethod1.ts
new file mode 100644
index 00000000000..7a9f04147d6
--- /dev/null
+++ b/tests/cases/fourslash/unusedTypeParametersInMethod1.ts
@@ -0,0 +1,8 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// class C1 {
+////    [|f1<T extends number>()|] {}
+//// }
+
+verify.codeFixAtPosition("f1()");
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedTypeParametersInMethod2.ts b/tests/cases/fourslash/unusedTypeParametersInMethod2.ts
new file mode 100644
index 00000000000..3650cfbad98
--- /dev/null
+++ b/tests/cases/fourslash/unusedTypeParametersInMethod2.ts
@@ -0,0 +1,8 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// class C1 {
+////    [|f1<T extends number, U>(a: U)|] {a;}
+//// }
+
+verify.codeFixAtPosition("f1<U>(a: U)");
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedTypeParametersInMethods1.ts b/tests/cases/fourslash/unusedTypeParametersInMethods1.ts
new file mode 100644
index 00000000000..cb9b965ca4d
--- /dev/null
+++ b/tests/cases/fourslash/unusedTypeParametersInMethods1.ts
@@ -0,0 +1,8 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// class A {
+////     [|public f1<X, Y, Z>(a: X)|] { a; var b: Z; b }
+//// }
+
+verify.codeFixAtPosition("public f1<X, Z>(a: X)");
diff --git a/tests/cases/fourslash/unusedVariableInBlocks.ts b/tests/cases/fourslash/unusedVariableInBlocks.ts
new file mode 100644
index 00000000000..e9dedaef31e
--- /dev/null
+++ b/tests/cases/fourslash/unusedVariableInBlocks.ts
@@ -0,0 +1,15 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// function f1 () {
+////    [|let x = 10;
+////    {
+////        let x = 11;
+////    }
+////    x;|]
+//// }
+
+verify.codeFixAtPosition(`let x = 10;
+   {
+   }
+   x;`);
diff --git a/tests/cases/fourslash/unusedVariableInClass1.ts b/tests/cases/fourslash/unusedVariableInClass1.ts
new file mode 100644
index 00000000000..82bb99016ef
--- /dev/null
+++ b/tests/cases/fourslash/unusedVariableInClass1.ts
@@ -0,0 +1,8 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+////class greeter {
+////    [|private greeting: string;|]
+////}
+
+verify.codeFixAtPosition("");
diff --git a/tests/cases/fourslash/unusedVariableInClass2.ts b/tests/cases/fourslash/unusedVariableInClass2.ts
new file mode 100644
index 00000000000..c971092584a
--- /dev/null
+++ b/tests/cases/fourslash/unusedVariableInClass2.ts
@@ -0,0 +1,9 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+////class greeter {
+////    [|public greeting1;
+////    private greeting: string;|]
+////}
+
+verify.codeFixAtPosition("public greeting1;");
diff --git a/tests/cases/fourslash/unusedVariableInClass3.ts b/tests/cases/fourslash/unusedVariableInClass3.ts
new file mode 100644
index 00000000000..8d2a62e7175
--- /dev/null
+++ b/tests/cases/fourslash/unusedVariableInClass3.ts
@@ -0,0 +1,8 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+////class greeter {[|
+////    private X = function() {};
+////|]}
+
+verify.codeFixAtPosition("");
diff --git a/tests/cases/fourslash/unusedVariableInForLoop1FS.ts b/tests/cases/fourslash/unusedVariableInForLoop1FS.ts
new file mode 100644
index 00000000000..0ee02ab4363
--- /dev/null
+++ b/tests/cases/fourslash/unusedVariableInForLoop1FS.ts
@@ -0,0 +1,11 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// function f1 () {
+////     [|for(var i = 0; ;) |]{
+////
+////     }
+//// }
+
+verify.codeFixAtPosition("for(; ;)");
+
diff --git a/tests/cases/fourslash/unusedVariableInForLoop2FS.ts b/tests/cases/fourslash/unusedVariableInForLoop2FS.ts
new file mode 100644
index 00000000000..1b1a0798c04
--- /dev/null
+++ b/tests/cases/fourslash/unusedVariableInForLoop2FS.ts
@@ -0,0 +1,10 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// function f1 () {
+////     [|for(var i = 0, j= 0; ;i++)|] {
+////
+////     }
+//// }
+
+verify.codeFixAtPosition("for(var i = 0; ;i++)");
diff --git a/tests/cases/fourslash/unusedVariableInForLoop3FS.ts b/tests/cases/fourslash/unusedVariableInForLoop3FS.ts
new file mode 100644
index 00000000000..4eed9599b15
--- /dev/null
+++ b/tests/cases/fourslash/unusedVariableInForLoop3FS.ts
@@ -0,0 +1,10 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// function f1 () {
+////     [|for(var i = 0, j= 0, k=0; ;i++, k++)|] {
+////
+////     }
+//// }
+
+verify.codeFixAtPosition("for(var i = 0, k=0; ;i++,k++)");
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedVariableInForLoop4FS.ts b/tests/cases/fourslash/unusedVariableInForLoop4FS.ts
new file mode 100644
index 00000000000..76e551612ba
--- /dev/null
+++ b/tests/cases/fourslash/unusedVariableInForLoop4FS.ts
@@ -0,0 +1,10 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// function f1 () {
+////     [|for(var i = 0, j= 0, k=0; ;j++, k++) |]{
+////
+////     }
+//// }
+
+verify.codeFixAtPosition("for(var j = 0, k=0; ;j++,k++)");
diff --git a/tests/cases/fourslash/unusedVariableInForLoop5FS.ts b/tests/cases/fourslash/unusedVariableInForLoop5FS.ts
new file mode 100644
index 00000000000..60369da522d
--- /dev/null
+++ b/tests/cases/fourslash/unusedVariableInForLoop5FS.ts
@@ -0,0 +1,11 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// function f1 () {
+////     for ([|const elem in|] ["a", "b", "c"]) {
+////
+////     }
+//// }
+
+verify.codeFixAtPosition("const {} in ");
+
diff --git a/tests/cases/fourslash/unusedVariableInForLoop6FS.ts b/tests/cases/fourslash/unusedVariableInForLoop6FS.ts
new file mode 100644
index 00000000000..4187c3141b5
--- /dev/null
+++ b/tests/cases/fourslash/unusedVariableInForLoop6FS.ts
@@ -0,0 +1,11 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// function f1 () {
+////     for ([|const elem of|] ["a", "b", "c"]) {
+////
+////     }
+//// }
+
+verify.codeFixAtPosition("const {} of ");
+
diff --git a/tests/cases/fourslash/unusedVariableInForLoop7FS.ts b/tests/cases/fourslash/unusedVariableInForLoop7FS.ts
new file mode 100644
index 00000000000..8fd0fee735e
--- /dev/null
+++ b/tests/cases/fourslash/unusedVariableInForLoop7FS.ts
@@ -0,0 +1,12 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// function f1 () {
+////     for (const elem of ["a", "b", "c"]) {
+////         elem;
+////         [|var x = 20;|]
+////     }
+////}
+////
+
+verify.codeFixAtPosition("");
diff --git a/tests/cases/fourslash/unusedVariableInModule1.ts b/tests/cases/fourslash/unusedVariableInModule1.ts
new file mode 100644
index 00000000000..011434ce098
--- /dev/null
+++ b/tests/cases/fourslash/unusedVariableInModule1.ts
@@ -0,0 +1,9 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+// @noUnusedParameters: true
+//// export {}
+//// [|var x: string;|]
+//// export var y: string;
+
+verify.codeFixAtPosition("");
diff --git a/tests/cases/fourslash/unusedVariableInModule2.ts b/tests/cases/fourslash/unusedVariableInModule2.ts
new file mode 100644
index 00000000000..09108ab1ee0
--- /dev/null
+++ b/tests/cases/fourslash/unusedVariableInModule2.ts
@@ -0,0 +1,10 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+// @noUnusedParameters: true
+//// export {}
+//// [|var x: string, y: number;|]
+//// y;
+//// export var y: string;
+
+verify.codeFixAtPosition("var y: number;", 6133);
diff --git a/tests/cases/fourslash/unusedVariableInModule3.ts b/tests/cases/fourslash/unusedVariableInModule3.ts
new file mode 100644
index 00000000000..bffffc768d3
--- /dev/null
+++ b/tests/cases/fourslash/unusedVariableInModule3.ts
@@ -0,0 +1,9 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+// @noUnusedParameters: true
+//// export {}
+//// [|var x = function f1() {}|]
+//// export var y: string;
+
+verify.codeFixAtPosition("");
diff --git a/tests/cases/fourslash/unusedVariableInModule4.ts b/tests/cases/fourslash/unusedVariableInModule4.ts
new file mode 100644
index 00000000000..6a1be9fe5b8
--- /dev/null
+++ b/tests/cases/fourslash/unusedVariableInModule4.ts
@@ -0,0 +1,10 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+// @noUnusedParameters: true
+//// export {}
+//// [|var x = function f1(m: number) {}|]
+//// x;
+//// export var y: string;
+
+verify.codeFixAtPosition(`var x = function f1() {}`);
diff --git a/tests/cases/fourslash/unusedVariableInNamespace1.ts b/tests/cases/fourslash/unusedVariableInNamespace1.ts
new file mode 100644
index 00000000000..caf778bc0da
--- /dev/null
+++ b/tests/cases/fourslash/unusedVariableInNamespace1.ts
@@ -0,0 +1,8 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+////namespace greeter {
+////    [|let a = "dummy entry";|]
+////}
+
+verify.codeFixAtPosition("");
diff --git a/tests/cases/fourslash/unusedVariableInNamespace2.ts b/tests/cases/fourslash/unusedVariableInNamespace2.ts
new file mode 100644
index 00000000000..fbb9e2d6a0c
--- /dev/null
+++ b/tests/cases/fourslash/unusedVariableInNamespace2.ts
@@ -0,0 +1,12 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+////namespace greeter {
+////    [|let a = "dummy entry", b, c = 0;|]
+////    export function function1() {
+////        a = "dummy";
+////        c++;
+////    }
+////}
+
+verify.codeFixAtPosition(`let a = "dummy entry", c = 0;`);
diff --git a/tests/cases/fourslash/unusedVariableInNamespace3.ts b/tests/cases/fourslash/unusedVariableInNamespace3.ts
new file mode 100644
index 00000000000..33e501d0c0d
--- /dev/null
+++ b/tests/cases/fourslash/unusedVariableInNamespace3.ts
@@ -0,0 +1,12 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+////namespace greeter {
+////    [|let a = "dummy entry", b, c = 0;|]
+////    export function function1() {
+////        a = "dummy";
+////        b = 0;
+////    }
+////}
+
+verify.codeFixAtPosition(`let a = "dummy entry", b;`);

From 1b3b35f3e0be5c880c01b262f6731659dc4725dd Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 11 Oct 2016 16:12:57 -0700
Subject: [PATCH 025/421] Type inference for spread types

Also:
1. Fix missing spread index signatures in getTypeFromTypeLiteral
2. Spread adjacent object types during spread type creation.
---
 src/compiler/checker.ts | 129 ++++++++++++++++++++++++++++++----------
 1 file changed, 99 insertions(+), 30 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 9d8ea29a381..93d9c19a71b 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -5715,19 +5715,37 @@ namespace ts {
                 let type: ObjectType;
                 if (isSpread) {
                     let members: Map<Symbol>;
+                    let stringIndexInfo: IndexInfo;
+                    let numberIndexInfo: IndexInfo;
                     const spreads: Type[] = [];
                     for (const member of (node as TypeLiteralNode).members) {
                         if (member.kind === SyntaxKind.SpreadTypeElement) {
                             if (members) {
-                                spreads.push(createAnonymousType(node.symbol, members, emptyArray, emptyArray, undefined, undefined));
+                                spreads.push(createAnonymousType(node.symbol, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo));
                                 members = undefined;
+                                stringIndexInfo = undefined;
+                                numberIndexInfo = undefined;
                             }
                             spreads.push(getTypeFromTypeNode((member as SpreadTypeElement).type));
                         }
-                        else if (member.kind !== SyntaxKind.CallSignature &&
-                                 member.kind !== SyntaxKind.ConstructSignature &&
-                                 member.kind !== SyntaxKind.IndexSignature) {
-                            // note that spread types don't include call and construct signatures, and index signatures are resolved later
+                        else if (member.kind === SyntaxKind.IndexSignature) {
+                            const index = member as IndexSignatureDeclaration;
+                            if (index.parameters.length === 1) {
+                                const parameter = index.parameters[0];
+                                if (parameter && parameter.type) {
+                                    const indexInfo = createIndexInfo(index.type ? getTypeFromTypeNode(index.type) : anyType,
+                                                                      (getModifierFlags(index) & ModifierFlags.Readonly) !== 0, index);
+                                    if (parameter.type.kind === SyntaxKind.StringKeyword) {
+                                        stringIndexInfo = indexInfo;
+                                    }
+                                    else {
+                                        numberIndexInfo = indexInfo;
+                                    }
+                                }
+                            }
+                        }
+                        else if (member.kind !== SyntaxKind.CallSignature && member.kind !== SyntaxKind.ConstructSignature) {
+                            // note that spread types don't include call and construct signatures
                             const flags = SymbolFlags.Property | SymbolFlags.Transient | (member.questionToken ? SymbolFlags.Optional : 0);
                             const text = getTextOfPropertyName(member.name);
                             const symbol = <TransientSymbol>createSymbol(flags, text);
@@ -5740,8 +5758,8 @@ namespace ts {
                             members[symbol.name] = symbol;
                         }
                     }
-                    if (members) {
-                        spreads.push(createAnonymousType(node.symbol, members, emptyArray, emptyArray, undefined, undefined));
+                    if (members || stringIndexInfo || numberIndexInfo) {
+                        spreads.push(createAnonymousType(node.symbol, members || emptySymbols, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo));
                     }
                     return getSpreadType(spreads, node.symbol, aliasSymbol, aliasTypeArguments);
                 }
@@ -5802,6 +5820,15 @@ namespace ts {
                 // for types like T ... T, just return ... T
                 return left;
             }
+
+            if (right.flags & TypeFlags.ObjectType &&
+                left.flags & TypeFlags.Spread &&
+                (left as SpreadType).right.flags & TypeFlags.ObjectType) {
+                // simplify two adjacent object types: T ... { x } ... { y } becomes T ... { x, y }
+                // Note: left.left is always a spread type. Can we use this fact to avoid calling getSpreadType again?
+                return getSpreadType([getSpreadType([right, (left as SpreadType).right], symbol, aliasSymbol, aliasTypeArguments),
+                                      (left as SpreadType).left], symbol, aliasSymbol, aliasTypeArguments);
+            }
             if (left.flags & TypeFlags.Intersection) {
                 const spreads = map((left as IntersectionType).types,
                                   t => getSpreadType(types.slice().concat([t, right]), symbol, aliasSymbol, aliasTypeArguments));
@@ -7991,7 +8018,8 @@ namespace ts {
             return !!(type.flags & TypeFlags.TypeParameter ||
                 type.flags & TypeFlags.Reference && forEach((<TypeReference>type).typeArguments, couldContainTypeParameters) ||
                 type.flags & TypeFlags.Anonymous && type.symbol && type.symbol.flags & (SymbolFlags.Method | SymbolFlags.TypeLiteral | SymbolFlags.Class) ||
-                type.flags & TypeFlags.UnionOrIntersection && couldUnionOrIntersectionContainTypeParameters(<UnionOrIntersectionType>type));
+                type.flags & TypeFlags.UnionOrIntersection && couldUnionOrIntersectionContainTypeParameters(<UnionOrIntersectionType>type) ||
+                type.flags & TypeFlags.Spread && couldSpreadContainTypeParameters(type as SpreadType));
         }
 
         function couldUnionOrIntersectionContainTypeParameters(type: UnionOrIntersectionType): boolean {
@@ -8001,6 +8029,11 @@ namespace ts {
             return type.couldContainTypeParameters;
         }
 
+        function couldSpreadContainTypeParameters(type: SpreadType): boolean {
+            return !!(type.right.flags & TypeFlags.TypeParameter ||
+                      type.left.flags & TypeFlags.Spread && (type.left as SpreadType).right.flags & TypeFlags.TypeParameter);
+        }
+
         function isTypeParameterAtTopLevel(type: Type, typeParameter: TypeParameter): boolean {
             return type === typeParameter || type.flags & TypeFlags.UnionOrIntersection && forEach((<UnionOrIntersectionType>type).types, t => isTypeParameterAtTopLevel(t, typeParameter));
         }
@@ -8064,6 +8097,16 @@ namespace ts {
                         target = removeTypesFromUnionOrIntersection(<UnionOrIntersectionType>target, matchingTypes);
                     }
                 }
+                if (source.flags & TypeFlags.Spread && target.flags & TypeFlags.Spread) {
+                    // only the last type parameter is a valid inference site,
+                    // and only if not followed by object literal properties.
+                    if((source as SpreadType).right.flags & TypeFlags.TypeParameter &&
+                       (target as SpreadType).right.flags & TypeFlags.TypeParameter) {
+                        inferFromTypes((source as SpreadType).right, (target as SpreadType).right);
+                    }
+
+                    return;
+                }
                 if (target.flags & TypeFlags.TypeParameter) {
                     // 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).
@@ -8140,33 +8183,59 @@ namespace ts {
                 else {
                     source = getApparentType(source);
                     if (source.flags & TypeFlags.ObjectType) {
-                        if (isInProcess(source, target)) {
-                            return;
+                        if (target.flags & TypeFlags.Spread) {
+                            // with an object type as source, a spread target infers to its last type parameter it
+                            // contains, after removing any properties from a object type that precedes the type parameter
+                            // Note that the call to `typeDifference` creates a new anonymous type.
+                            const spread = target as SpreadType;
+                            const parameter = spread.right.flags & TypeFlags.TypeParameter ? spread.right : (spread.left as SpreadType).right;
+                            const object = spread.right.flags & TypeFlags.TypeParameter ? emptyObjectType : spread.right as ResolvedType;
+                            inferFromTypes(getTypeDifference(source, object), parameter);
+                            target = object;
                         }
-                        if (isDeeplyNestedGeneric(source, sourceStack, depth) && isDeeplyNestedGeneric(target, targetStack, depth)) {
-                            return;
-                        }
-                        const key = source.id + "," + target.id;
-                        if (visited[key]) {
-                            return;
-                        }
-                        visited[key] = true;
-                        if (depth === 0) {
-                            sourceStack = [];
-                            targetStack = [];
-                        }
-                        sourceStack[depth] = source;
-                        targetStack[depth] = target;
-                        depth++;
-                        inferFromProperties(source, target);
-                        inferFromSignatures(source, target, SignatureKind.Call);
-                        inferFromSignatures(source, target, SignatureKind.Construct);
-                        inferFromIndexTypes(source, target);
-                        depth--;
+                        inferFromStructure(source, target);
                     }
                 }
             }
 
+            function inferFromStructure(source: Type, target: Type) {
+                if (isInProcess(source, target)) {
+                    return;
+                }
+                if (isDeeplyNestedGeneric(source, sourceStack, depth) && isDeeplyNestedGeneric(target, targetStack, depth)) {
+                    return;
+                }
+                const key = source.id + "," + target.id;
+                if (visited[key]) {
+                    return;
+                }
+                visited[key] = true;
+                if (depth === 0) {
+                    sourceStack = [];
+                    targetStack = [];
+                }
+                sourceStack[depth] = source;
+                targetStack[depth] = target;
+                depth++;
+                inferFromProperties(source, target);
+                inferFromSignatures(source, target, SignatureKind.Call);
+                inferFromSignatures(source, target, SignatureKind.Construct);
+                inferFromIndexTypes(source, target);
+                depth--;
+            }
+
+            function getTypeDifference(type: ObjectType, diff: ResolvedType): ResolvedType {
+                const members = createMap<Symbol>();
+                for (const prop of getPropertiesOfObjectType(type)) {
+                    if (!(prop.name in diff.members)) {
+                        members[prop.name] = prop;
+                    }
+                }
+                const stringIndexInfo = getIndexInfoOfType(diff, IndexKind.String) ? undefined : getIndexInfoOfType(type, IndexKind.String);
+                const numberIndexInfo = getIndexInfoOfType(diff, IndexKind.Number) ? undefined : getIndexInfoOfType(type, IndexKind.Number);
+                return createAnonymousType(type.symbol, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
+            }
+
             function inferFromProperties(source: Type, target: Type) {
                 const properties = getPropertiesOfObjectType(target);
                 for (const targetProp of properties) {

From 4bc4a008bbc9c8fdb55e3a2f7bf9e8c2745ed30e Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 11 Oct 2016 16:14:47 -0700
Subject: [PATCH 026/421] Test spread type inference+more index signature tests

---
 .../spread/objectSpreadIndexSignature.ts      |  4 ++
 .../types/spread/objectSpreadInference.ts     | 59 +++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 tests/cases/conformance/types/spread/objectSpreadInference.ts

diff --git a/tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts b/tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts
index d6f9f511c7b..daf8e4e63c5 100644
--- a/tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts
+++ b/tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts
@@ -18,3 +18,7 @@ interface Indexed2 {
 }
 let ii: { ...Indexed, ...Indexed2, b: boolean, d: number };
 let nb: number | boolean = ii[1001];
+
+function f<T>(t: T) {
+    let i: { ...T, [n: number]: string };
+}
diff --git a/tests/cases/conformance/types/spread/objectSpreadInference.ts b/tests/cases/conformance/types/spread/objectSpreadInference.ts
new file mode 100644
index 00000000000..19841932419
--- /dev/null
+++ b/tests/cases/conformance/types/spread/objectSpreadInference.ts
@@ -0,0 +1,59 @@
+interface Result<T,U,V> {
+    t: T;
+    u: U;
+    v: V;
+}
+declare function infer<T,U,V>(tuv: { ...T, ...U, a: V }): { t: T, u: U, v: V };
+declare function infer2<T,U,V>(utv: { ...U, a: V, ...T }): { t: T, u: U, v: V };
+function generic<W, X, Y>(w: W, x: X, y: Y) {
+    // should infer { t: {}, u: {}, v: {} } because there is no trailing type parameter
+    return infer({ ...w, ...x, a: y, b: "different type" });
+}
+let b: { b: number };
+let c: { c: number };
+// should infer { t: {}, u: { b: number, c: number }, v: number }
+let i1 = infer({ ...b, ...c, a: 12 });
+// should infer { t: { a: number, b: number, c: number }, u: {}, v: {} }
+let i2 = infer2({ ...b, ...c, a: 12 });
+// should infer { t: {}, u: {}, v: {} }
+let i3 = generic(b, c, { a: 12 });
+
+interface Preserved {
+    kind: 0 | 1 | 2 | 3;
+}
+class C implements Preserved {
+    kind: 0 = 0;
+    a = 1;
+    method() { return "C"; }
+}
+declare function revive<T extends Preserved>(t: { ...T }): T;
+function genericRevive<U extends Preserved>(u: U) {
+    let us: { ...U };
+    return revive(us);
+}
+// result should not have `method`
+let result = revive({ a: 12, kind: 0 });
+// result2 should be of type C and have `method`
+let result2 = revive<C>({ a: 12, kind: 0 });
+
+declare function destructureRevive<T extends Preserved>(t: { ...T, a: number }): T;
+function genericDestructureRevive<U extends Preserved & { a: number }>(u: U) {
+    let us: { ...U };
+    return destructureRevive(us);
+}
+// result3 is just `Preserved` because `a` and `method` both get removed
+let result3 = destructureRevive({ a: 12, kind: 0 });
+// result4 is still C -- a is not removed -- because we specified the argument explicitly
+let result4 = destructureRevive<C>({ a: 12, kind: 0 });
+result4.method();
+result4.a;
+
+declare function removeIndexSignature<T>(t: { ...T, a: number, [s: string]: number, [n: number]: number }): T;
+interface I {
+    a: number;
+    b: number;
+    [s: string]: number;
+    [n: number]: number;
+}
+let i: I;
+let result5 = removeIndexSignature(i);

From 7417af6f15cb0abfd547932378f78250d92838d0 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 11 Oct 2016 16:15:37 -0700
Subject: [PATCH 027/421] Update baselines

---
 .../reference/objectSpreadIndexSignature.js   |   7 +
 .../objectSpreadIndexSignature.symbols        |  12 +
 .../objectSpreadIndexSignature.types          |  18 +-
 .../reference/objectSpreadInference.js        | 111 +++++++
 .../reference/objectSpreadInference.symbols   | 241 +++++++++++++++
 .../reference/objectSpreadInference.types     | 282 ++++++++++++++++++
 6 files changed, 668 insertions(+), 3 deletions(-)
 create mode 100644 tests/baselines/reference/objectSpreadInference.js
 create mode 100644 tests/baselines/reference/objectSpreadInference.symbols
 create mode 100644 tests/baselines/reference/objectSpreadInference.types

diff --git a/tests/baselines/reference/objectSpreadIndexSignature.js b/tests/baselines/reference/objectSpreadIndexSignature.js
index b5ec35277e0..709cd9446d8 100644
--- a/tests/baselines/reference/objectSpreadIndexSignature.js
+++ b/tests/baselines/reference/objectSpreadIndexSignature.js
@@ -19,6 +19,10 @@ interface Indexed2 {
 }
 let ii: { ...Indexed, ...Indexed2, b: boolean, d: number };
 let nb: number | boolean = ii[1001];
+
+function f<T>(t: T) {
+    let i: { ...T, [n: number]: string };
+}
 
 
 //// [objectSpreadIndexSignature.js]
@@ -35,3 +39,6 @@ n = i[101];
 n = i.b;
 var ii;
 var nb = ii[1001];
+function f(t) {
+    var i;
+}
diff --git a/tests/baselines/reference/objectSpreadIndexSignature.symbols b/tests/baselines/reference/objectSpreadIndexSignature.symbols
index a3510f98658..e76ad3e1b13 100644
--- a/tests/baselines/reference/objectSpreadIndexSignature.symbols
+++ b/tests/baselines/reference/objectSpreadIndexSignature.symbols
@@ -69,3 +69,15 @@ let nb: number | boolean = ii[1001];
 >nb : Symbol(nb, Decl(objectSpreadIndexSignature.ts, 19, 3))
 >ii : Symbol(ii, Decl(objectSpreadIndexSignature.ts, 18, 3))
 
+function f<T>(t: T) {
+>f : Symbol(f, Decl(objectSpreadIndexSignature.ts, 19, 36))
+>T : Symbol(T, Decl(objectSpreadIndexSignature.ts, 21, 11))
+>t : Symbol(t, Decl(objectSpreadIndexSignature.ts, 21, 14))
+>T : Symbol(T, Decl(objectSpreadIndexSignature.ts, 21, 11))
+
+    let i: { ...T, [n: number]: string };
+>i : Symbol(i, Decl(objectSpreadIndexSignature.ts, 22, 7))
+>T : Symbol(T, Decl(objectSpreadIndexSignature.ts, 21, 11))
+>n : Symbol(n, Decl(objectSpreadIndexSignature.ts, 22, 20))
+}
+
diff --git a/tests/baselines/reference/objectSpreadIndexSignature.types b/tests/baselines/reference/objectSpreadIndexSignature.types
index 6e9ba881db1..f646361765d 100644
--- a/tests/baselines/reference/objectSpreadIndexSignature.types
+++ b/tests/baselines/reference/objectSpreadIndexSignature.types
@@ -9,7 +9,7 @@ class C {
 >c : boolean
 }
 let c: { ...C, b: string, c?: string, [n: number]: string };
->c : { [n: number]: string; b: string; c: string | boolean; a: number; }
+>c : { [x: number]: string; b: string; c: string | boolean; a: number; }
 >C : C
 >b : string
 >c : string
@@ -18,13 +18,13 @@ let c: { ...C, b: string, c?: string, [n: number]: string };
 let n: number = c.a;
 >n : number
 >c.a : number
->c : { [n: number]: string; b: string; c: string | boolean; a: number; }
+>c : { [x: number]: string; b: string; c: string | boolean; a: number; }
 >a : number
 
 let s: string = c[12];
 >s : string
 >c[12] : string
->c : { [n: number]: string; b: string; c: string | boolean; a: number; }
+>c : { [x: number]: string; b: string; c: string | boolean; a: number; }
 >12 : 12
 
 interface Indexed {
@@ -77,3 +77,15 @@ let nb: number | boolean = ii[1001];
 >ii : { [x: string]: number | boolean; b: boolean; d: number; c: boolean; a: number; }
 >1001 : 1001
 
+function f<T>(t: T) {
+>f : <T>(t: T) => void
+>T : T
+>t : T
+>T : T
+
+    let i: { ...T, [n: number]: string };
+>i : { ...T; [n: number]: string; }
+>T : T
+>n : number
+}
+
diff --git a/tests/baselines/reference/objectSpreadInference.js b/tests/baselines/reference/objectSpreadInference.js
new file mode 100644
index 00000000000..06b17cfa1f9
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadInference.js
@@ -0,0 +1,111 @@
+//// [objectSpreadInference.ts]
+interface Result<T,U,V> {
+    t: T;
+    u: U;
+    v: V;
+}
+declare function infer<T,U,V>(tuv: { ...T, ...U, a: V }): { t: T, u: U, v: V };
+declare function infer2<T,U,V>(utv: { ...U, a: V, ...T }): { t: T, u: U, v: V };
+function generic<W, X, Y>(w: W, x: X, y: Y) {
+    // should infer { t: {}, u: {}, v: {} } because there is no trailing type parameter
+    return infer({ ...w, ...x, a: y, b: "different type" });
+}
+let b: { b: number };
+let c: { c: number };
+// should infer { t: {}, u: { b: number, c: number }, v: number }
+let i1 = infer({ ...b, ...c, a: 12 });
+// should infer { t: { a: number, b: number, c: number }, u: {}, v: {} }
+let i2 = infer2({ ...b, ...c, a: 12 });
+// should infer { t: {}, u: {}, v: {} }
+let i3 = generic(b, c, { a: 12 });
+
+interface Preserved {
+    kind: 0 | 1 | 2 | 3;
+}
+class C implements Preserved {
+    kind: 0 = 0;
+    a = 1;
+    method() { return "C"; }
+}
+declare function revive<T extends Preserved>(t: { ...T }): T;
+function genericRevive<U extends Preserved>(u: U) {
+    let us: { ...U };
+    return revive(us);
+}
+// result should not have `method`
+let result = revive({ a: 12, kind: 0 });
+// result2 should be of type C and have `method`
+let result2 = revive<C>({ a: 12, kind: 0 });
+
+declare function destructureRevive<T extends Preserved>(t: { ...T, a: number }): T;
+function genericDestructureRevive<U extends Preserved & { a: number }>(u: U) {
+    let us: { ...U };
+    return destructureRevive(us);
+}
+// result3 is just `Preserved` because `a` and `method` both get removed
+let result3 = destructureRevive({ a: 12, kind: 0 });
+// result4 is still C -- a is not removed -- because we specified the argument explicitly
+let result4 = destructureRevive<C>({ a: 12, kind: 0 });
+result4.method();
+result4.a;
+
+declare function removeIndexSignature<T>(t: { ...T, a: number, [s: string]: number, [n: number]: number }): T;
+interface I {
+    a: number;
+    b: number;
+    [s: string]: number;
+    [n: number]: number;
+}
+let i: I;
+let result5 = removeIndexSignature(i);
+
+
+//// [objectSpreadInference.js]
+var __assign = (this && this.__assign) || Object.assign || function(t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+        s = arguments[i];
+        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+            t[p] = s[p];
+    }
+    return t;
+};
+function generic(w, x, y) {
+    // should infer { t: {}, u: {}, v: {} } because there is no trailing type parameter
+    return infer(__assign({}, w, x, { a: y, b: "different type" }));
+}
+var b;
+var c;
+// should infer { t: {}, u: { b: number, c: number }, v: number }
+var i1 = infer(__assign({}, b, c, { a: 12 }));
+// should infer { t: { a: number, b: number, c: number }, u: {}, v: {} }
+var i2 = infer2(__assign({}, b, c, { a: 12 }));
+// should infer { t: {}, u: {}, v: {} }
+var i3 = generic(b, c, { a: 12 });
+var C = (function () {
+    function C() {
+        this.kind = 0;
+        this.a = 1;
+    }
+    C.prototype.method = function () { return "C"; };
+    return C;
+}());
+function genericRevive(u) {
+    var us;
+    return revive(us);
+}
+// result should not have `method`
+var result = revive({ a: 12, kind: 0 });
+// result2 should be of type C and have `method`
+var result2 = revive({ a: 12, kind: 0 });
+function genericDestructureRevive(u) {
+    var us;
+    return destructureRevive(us);
+}
+// result3 is just `Preserved` because `a` and `method` both get removed
+var result3 = destructureRevive({ a: 12, kind: 0 });
+// result4 is still C -- a is not removed -- because we specified the argument explicitly
+var result4 = destructureRevive({ a: 12, kind: 0 });
+result4.method();
+result4.a;
+var i;
+var result5 = removeIndexSignature(i);
diff --git a/tests/baselines/reference/objectSpreadInference.symbols b/tests/baselines/reference/objectSpreadInference.symbols
new file mode 100644
index 00000000000..f03cd6b44e1
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadInference.symbols
@@ -0,0 +1,241 @@
+=== tests/cases/conformance/types/spread/objectSpreadInference.ts ===
+interface Result<T,U,V> {
+>Result : Symbol(Result, Decl(objectSpreadInference.ts, 0, 0))
+>T : Symbol(T, Decl(objectSpreadInference.ts, 0, 17))
+>U : Symbol(U, Decl(objectSpreadInference.ts, 0, 19))
+>V : Symbol(V, Decl(objectSpreadInference.ts, 0, 21))
+
+    t: T;
+>t : Symbol(Result.t, Decl(objectSpreadInference.ts, 0, 25))
+>T : Symbol(T, Decl(objectSpreadInference.ts, 0, 17))
+
+    u: U;
+>u : Symbol(Result.u, Decl(objectSpreadInference.ts, 1, 9))
+>U : Symbol(U, Decl(objectSpreadInference.ts, 0, 19))
+
+    v: V;
+>v : Symbol(Result.v, Decl(objectSpreadInference.ts, 2, 9))
+>V : Symbol(V, Decl(objectSpreadInference.ts, 0, 21))
+}
+declare function infer<T,U,V>(tuv: { ...T, ...U, a: V }): { t: T, u: U, v: V };
+>infer : Symbol(infer, Decl(objectSpreadInference.ts, 4, 1))
+>T : Symbol(T, Decl(objectSpreadInference.ts, 5, 23))
+>U : Symbol(U, Decl(objectSpreadInference.ts, 5, 25))
+>V : Symbol(V, Decl(objectSpreadInference.ts, 5, 27))
+>tuv : Symbol(tuv, Decl(objectSpreadInference.ts, 5, 30))
+>T : Symbol(T, Decl(objectSpreadInference.ts, 5, 23))
+>U : Symbol(U, Decl(objectSpreadInference.ts, 5, 25))
+>a : Symbol(a, Decl(objectSpreadInference.ts, 5, 48))
+>V : Symbol(V, Decl(objectSpreadInference.ts, 5, 27))
+>t : Symbol(t, Decl(objectSpreadInference.ts, 5, 59))
+>T : Symbol(T, Decl(objectSpreadInference.ts, 5, 23))
+>u : Symbol(u, Decl(objectSpreadInference.ts, 5, 65))
+>U : Symbol(U, Decl(objectSpreadInference.ts, 5, 25))
+>v : Symbol(v, Decl(objectSpreadInference.ts, 5, 71))
+>V : Symbol(V, Decl(objectSpreadInference.ts, 5, 27))
+
+declare function infer2<T,U,V>(utv: { ...U, a: V, ...T }): { t: T, u: U, v: V };
+>infer2 : Symbol(infer2, Decl(objectSpreadInference.ts, 5, 79))
+>T : Symbol(T, Decl(objectSpreadInference.ts, 6, 24))
+>U : Symbol(U, Decl(objectSpreadInference.ts, 6, 26))
+>V : Symbol(V, Decl(objectSpreadInference.ts, 6, 28))
+>utv : Symbol(utv, Decl(objectSpreadInference.ts, 6, 31))
+>U : Symbol(U, Decl(objectSpreadInference.ts, 6, 26))
+>a : Symbol(a, Decl(objectSpreadInference.ts, 6, 43))
+>V : Symbol(V, Decl(objectSpreadInference.ts, 6, 28))
+>T : Symbol(T, Decl(objectSpreadInference.ts, 6, 24))
+>t : Symbol(t, Decl(objectSpreadInference.ts, 6, 60))
+>T : Symbol(T, Decl(objectSpreadInference.ts, 6, 24))
+>u : Symbol(u, Decl(objectSpreadInference.ts, 6, 66))
+>U : Symbol(U, Decl(objectSpreadInference.ts, 6, 26))
+>v : Symbol(v, Decl(objectSpreadInference.ts, 6, 72))
+>V : Symbol(V, Decl(objectSpreadInference.ts, 6, 28))
+
+function generic<W, X, Y>(w: W, x: X, y: Y) {
+>generic : Symbol(generic, Decl(objectSpreadInference.ts, 6, 80))
+>W : Symbol(W, Decl(objectSpreadInference.ts, 7, 17))
+>X : Symbol(X, Decl(objectSpreadInference.ts, 7, 19))
+>Y : Symbol(Y, Decl(objectSpreadInference.ts, 7, 22))
+>w : Symbol(w, Decl(objectSpreadInference.ts, 7, 26))
+>W : Symbol(W, Decl(objectSpreadInference.ts, 7, 17))
+>x : Symbol(x, Decl(objectSpreadInference.ts, 7, 31))
+>X : Symbol(X, Decl(objectSpreadInference.ts, 7, 19))
+>y : Symbol(y, Decl(objectSpreadInference.ts, 7, 37))
+>Y : Symbol(Y, Decl(objectSpreadInference.ts, 7, 22))
+
+    // should infer { t: {}, u: {}, v: {} } because there is no trailing type parameter
+    return infer({ ...w, ...x, a: y, b: "different type" });
+>infer : Symbol(infer, Decl(objectSpreadInference.ts, 4, 1))
+>a : Symbol(a, Decl(objectSpreadInference.ts, 9, 30))
+>y : Symbol(y, Decl(objectSpreadInference.ts, 7, 37))
+>b : Symbol(b, Decl(objectSpreadInference.ts, 9, 36))
+}
+let b: { b: number };
+>b : Symbol(b, Decl(objectSpreadInference.ts, 11, 3))
+>b : Symbol(b, Decl(objectSpreadInference.ts, 11, 8))
+
+let c: { c: number };
+>c : Symbol(c, Decl(objectSpreadInference.ts, 12, 3))
+>c : Symbol(c, Decl(objectSpreadInference.ts, 12, 8))
+
+// should infer { t: {}, u: { b: number, c: number }, v: number }
+let i1 = infer({ ...b, ...c, a: 12 });
+>i1 : Symbol(i1, Decl(objectSpreadInference.ts, 14, 3))
+>infer : Symbol(infer, Decl(objectSpreadInference.ts, 4, 1))
+>a : Symbol(a, Decl(objectSpreadInference.ts, 14, 28))
+
+// should infer { t: { a: number, b: number, c: number }, u: {}, v: {} }
+let i2 = infer2({ ...b, ...c, a: 12 });
+>i2 : Symbol(i2, Decl(objectSpreadInference.ts, 16, 3))
+>infer2 : Symbol(infer2, Decl(objectSpreadInference.ts, 5, 79))
+>a : Symbol(a, Decl(objectSpreadInference.ts, 16, 29))
+
+// should infer { t: {}, u: {}, v: {} }
+let i3 = generic(b, c, { a: 12 });
+>i3 : Symbol(i3, Decl(objectSpreadInference.ts, 18, 3))
+>generic : Symbol(generic, Decl(objectSpreadInference.ts, 6, 80))
+>b : Symbol(b, Decl(objectSpreadInference.ts, 11, 3))
+>c : Symbol(c, Decl(objectSpreadInference.ts, 12, 3))
+>a : Symbol(a, Decl(objectSpreadInference.ts, 18, 24))
+
+interface Preserved {
+>Preserved : Symbol(Preserved, Decl(objectSpreadInference.ts, 18, 34))
+
+    kind: 0 | 1 | 2 | 3;
+>kind : Symbol(Preserved.kind, Decl(objectSpreadInference.ts, 20, 21))
+}
+class C implements Preserved {
+>C : Symbol(C, Decl(objectSpreadInference.ts, 22, 1))
+>Preserved : Symbol(Preserved, Decl(objectSpreadInference.ts, 18, 34))
+
+    kind: 0 = 0;
+>kind : Symbol(C.kind, Decl(objectSpreadInference.ts, 23, 30))
+
+    a = 1;
+>a : Symbol(C.a, Decl(objectSpreadInference.ts, 24, 16))
+
+    method() { return "C"; }
+>method : Symbol(C.method, Decl(objectSpreadInference.ts, 25, 10))
+}
+declare function revive<T extends Preserved>(t: { ...T }): T;
+>revive : Symbol(revive, Decl(objectSpreadInference.ts, 27, 1))
+>T : Symbol(T, Decl(objectSpreadInference.ts, 28, 24))
+>Preserved : Symbol(Preserved, Decl(objectSpreadInference.ts, 18, 34))
+>t : Symbol(t, Decl(objectSpreadInference.ts, 28, 45))
+>T : Symbol(T, Decl(objectSpreadInference.ts, 28, 24))
+>T : Symbol(T, Decl(objectSpreadInference.ts, 28, 24))
+
+function genericRevive<U extends Preserved>(u: U) {
+>genericRevive : Symbol(genericRevive, Decl(objectSpreadInference.ts, 28, 61))
+>U : Symbol(U, Decl(objectSpreadInference.ts, 29, 23))
+>Preserved : Symbol(Preserved, Decl(objectSpreadInference.ts, 18, 34))
+>u : Symbol(u, Decl(objectSpreadInference.ts, 29, 44))
+>U : Symbol(U, Decl(objectSpreadInference.ts, 29, 23))
+
+    let us: { ...U };
+>us : Symbol(us, Decl(objectSpreadInference.ts, 30, 7))
+>U : Symbol(U, Decl(objectSpreadInference.ts, 29, 23))
+
+    return revive(us);
+>revive : Symbol(revive, Decl(objectSpreadInference.ts, 27, 1))
+>us : Symbol(us, Decl(objectSpreadInference.ts, 30, 7))
+}
+// result should not have `method`
+let result = revive({ a: 12, kind: 0 });
+>result : Symbol(result, Decl(objectSpreadInference.ts, 34, 3))
+>revive : Symbol(revive, Decl(objectSpreadInference.ts, 27, 1))
+>a : Symbol(a, Decl(objectSpreadInference.ts, 34, 21))
+>kind : Symbol(kind, Decl(objectSpreadInference.ts, 34, 28))
+
+// result2 should be of type C and have `method`
+let result2 = revive<C>({ a: 12, kind: 0 });
+>result2 : Symbol(result2, Decl(objectSpreadInference.ts, 36, 3))
+>revive : Symbol(revive, Decl(objectSpreadInference.ts, 27, 1))
+>C : Symbol(C, Decl(objectSpreadInference.ts, 22, 1))
+>a : Symbol(a, Decl(objectSpreadInference.ts, 36, 25))
+>kind : Symbol(kind, Decl(objectSpreadInference.ts, 36, 32))
+
+declare function destructureRevive<T extends Preserved>(t: { ...T, a: number }): T;
+>destructureRevive : Symbol(destructureRevive, Decl(objectSpreadInference.ts, 36, 44))
+>T : Symbol(T, Decl(objectSpreadInference.ts, 38, 35))
+>Preserved : Symbol(Preserved, Decl(objectSpreadInference.ts, 18, 34))
+>t : Symbol(t, Decl(objectSpreadInference.ts, 38, 56))
+>T : Symbol(T, Decl(objectSpreadInference.ts, 38, 35))
+>a : Symbol(a, Decl(objectSpreadInference.ts, 38, 66))
+>T : Symbol(T, Decl(objectSpreadInference.ts, 38, 35))
+
+function genericDestructureRevive<U extends Preserved & { a: number }>(u: U) {
+>genericDestructureRevive : Symbol(genericDestructureRevive, Decl(objectSpreadInference.ts, 38, 83))
+>U : Symbol(U, Decl(objectSpreadInference.ts, 39, 34))
+>Preserved : Symbol(Preserved, Decl(objectSpreadInference.ts, 18, 34))
+>a : Symbol(a, Decl(objectSpreadInference.ts, 39, 57))
+>u : Symbol(u, Decl(objectSpreadInference.ts, 39, 71))
+>U : Symbol(U, Decl(objectSpreadInference.ts, 39, 34))
+
+    let us: { ...U };
+>us : Symbol(us, Decl(objectSpreadInference.ts, 40, 7))
+>U : Symbol(U, Decl(objectSpreadInference.ts, 39, 34))
+
+    return destructureRevive(us);
+>destructureRevive : Symbol(destructureRevive, Decl(objectSpreadInference.ts, 36, 44))
+>us : Symbol(us, Decl(objectSpreadInference.ts, 40, 7))
+}
+// result3 is just `Preserved` because `a` and `method` both get removed
+let result3 = destructureRevive({ a: 12, kind: 0 });
+>result3 : Symbol(result3, Decl(objectSpreadInference.ts, 44, 3))
+>destructureRevive : Symbol(destructureRevive, Decl(objectSpreadInference.ts, 36, 44))
+>a : Symbol(a, Decl(objectSpreadInference.ts, 44, 33))
+>kind : Symbol(kind, Decl(objectSpreadInference.ts, 44, 40))
+
+// result4 is still C -- a is not removed -- because we specified the argument explicitly
+let result4 = destructureRevive<C>({ a: 12, kind: 0 });
+>result4 : Symbol(result4, Decl(objectSpreadInference.ts, 46, 3))
+>destructureRevive : Symbol(destructureRevive, Decl(objectSpreadInference.ts, 36, 44))
+>C : Symbol(C, Decl(objectSpreadInference.ts, 22, 1))
+>a : Symbol(a, Decl(objectSpreadInference.ts, 46, 36))
+>kind : Symbol(kind, Decl(objectSpreadInference.ts, 46, 43))
+
+result4.method();
+>result4.method : Symbol(C.method, Decl(objectSpreadInference.ts, 25, 10))
+>result4 : Symbol(result4, Decl(objectSpreadInference.ts, 46, 3))
+>method : Symbol(C.method, Decl(objectSpreadInference.ts, 25, 10))
+
+result4.a;
+>result4.a : Symbol(C.a, Decl(objectSpreadInference.ts, 24, 16))
+>result4 : Symbol(result4, Decl(objectSpreadInference.ts, 46, 3))
+>a : Symbol(C.a, Decl(objectSpreadInference.ts, 24, 16))
+
+declare function removeIndexSignature<T>(t: { ...T, a: number, [s: string]: number, [n: number]: number }): T;
+>removeIndexSignature : Symbol(removeIndexSignature, Decl(objectSpreadInference.ts, 48, 10))
+>T : Symbol(T, Decl(objectSpreadInference.ts, 50, 38))
+>t : Symbol(t, Decl(objectSpreadInference.ts, 50, 41))
+>T : Symbol(T, Decl(objectSpreadInference.ts, 50, 38))
+>a : Symbol(a, Decl(objectSpreadInference.ts, 50, 51))
+>s : Symbol(s, Decl(objectSpreadInference.ts, 50, 64))
+>n : Symbol(n, Decl(objectSpreadInference.ts, 50, 85))
+>T : Symbol(T, Decl(objectSpreadInference.ts, 50, 38))
+
+interface I {
+>I : Symbol(I, Decl(objectSpreadInference.ts, 50, 110))
+
+    a: number;
+>a : Symbol(I.a, Decl(objectSpreadInference.ts, 51, 13))
+
+    b: number;
+>b : Symbol(I.b, Decl(objectSpreadInference.ts, 52, 14))
+
+    [s: string]: number;
+>s : Symbol(s, Decl(objectSpreadInference.ts, 54, 5))
+
+    [n: number]: number;
+>n : Symbol(n, Decl(objectSpreadInference.ts, 55, 5))
+}
+let i: I;
+>i : Symbol(i, Decl(objectSpreadInference.ts, 57, 3))
+>I : Symbol(I, Decl(objectSpreadInference.ts, 50, 110))
+
+let result5 = removeIndexSignature(i);
+>result5 : Symbol(result5, Decl(objectSpreadInference.ts, 58, 3))
+>removeIndexSignature : Symbol(removeIndexSignature, Decl(objectSpreadInference.ts, 48, 10))
+>i : Symbol(i, Decl(objectSpreadInference.ts, 57, 3))
+
diff --git a/tests/baselines/reference/objectSpreadInference.types b/tests/baselines/reference/objectSpreadInference.types
new file mode 100644
index 00000000000..55303119932
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadInference.types
@@ -0,0 +1,282 @@
+=== tests/cases/conformance/types/spread/objectSpreadInference.ts ===
+interface Result<T,U,V> {
+>Result : Result<T, U, V>
+>T : T
+>U : U
+>V : V
+
+    t: T;
+>t : T
+>T : T
+
+    u: U;
+>u : U
+>U : U
+
+    v: V;
+>v : V
+>V : V
+}
+declare function infer<T,U,V>(tuv: { ...T, ...U, a: V }): { t: T, u: U, v: V };
+>infer : <T, U, V>(tuv: { ...T; ...U; a: V; }) => { t: T; u: U; v: V; }
+>T : T
+>U : U
+>V : V
+>tuv : { ...T; ...U; a: V; }
+>T : T
+>U : U
+>a : V
+>V : V
+>t : T
+>T : T
+>u : U
+>U : U
+>v : V
+>V : V
+
+declare function infer2<T,U,V>(utv: { ...U, a: V, ...T }): { t: T, u: U, v: V };
+>infer2 : <T, U, V>(utv: { ...U; a: V; ...T }) => { t: T; u: U; v: V; }
+>T : T
+>U : U
+>V : V
+>utv : { ...U; a: V; ...T }
+>U : U
+>a : V
+>V : V
+>T : T
+>t : T
+>T : T
+>u : U
+>U : U
+>v : V
+>V : V
+
+function generic<W, X, Y>(w: W, x: X, y: Y) {
+>generic : <W, X, Y>(w: W, x: X, y: Y) => { t: {}; u: {}; v: {}; }
+>W : W
+>X : X
+>Y : Y
+>w : W
+>W : W
+>x : X
+>X : X
+>y : Y
+>Y : Y
+
+    // should infer { t: {}, u: {}, v: {} } because there is no trailing type parameter
+    return infer({ ...w, ...x, a: y, b: "different type" });
+>infer({ ...w, ...x, a: y, b: "different type" }) : { t: {}; u: {}; v: {}; }
+>infer : <T, U, V>(tuv: { ...T; ...U; a: V; }) => { t: T; u: U; v: V; }
+>{ ...w, ...x, a: y, b: "different type" } : { ...W; ...X; a: Y; b: string; }
+>w : any
+>x : any
+>a : Y
+>y : Y
+>b : string
+>"different type" : "different type"
+}
+let b: { b: number };
+>b : { b: number; }
+>b : number
+
+let c: { c: number };
+>c : { c: number; }
+>c : number
+
+// should infer { t: {}, u: { b: number, c: number }, v: number }
+let i1 = infer({ ...b, ...c, a: 12 });
+>i1 : { t: {}; u: { c: number; b: number; }; v: number; }
+>infer({ ...b, ...c, a: 12 }) : { t: {}; u: { c: number; b: number; }; v: number; }
+>infer : <T, U, V>(tuv: { ...T; ...U; a: V; }) => { t: T; u: U; v: V; }
+>{ ...b, ...c, a: 12 } : { a: number; c: number; b: number; }
+>b : any
+>c : any
+>a : number
+>12 : 12
+
+// should infer { t: { a: number, b: number, c: number }, u: {}, v: {} }
+let i2 = infer2({ ...b, ...c, a: 12 });
+>i2 : { t: { a: number; c: number; b: number; }; u: {}; v: {}; }
+>infer2({ ...b, ...c, a: 12 }) : { t: { a: number; c: number; b: number; }; u: {}; v: {}; }
+>infer2 : <T, U, V>(utv: { ...U; a: V; ...T }) => { t: T; u: U; v: V; }
+>{ ...b, ...c, a: 12 } : { a: number; c: number; b: number; }
+>b : any
+>c : any
+>a : number
+>12 : 12
+
+// should infer { t: {}, u: {}, v: {} }
+let i3 = generic(b, c, { a: 12 });
+>i3 : { t: {}; u: {}; v: {}; }
+>generic(b, c, { a: 12 }) : { t: {}; u: {}; v: {}; }
+>generic : <W, X, Y>(w: W, x: X, y: Y) => { t: {}; u: {}; v: {}; }
+>b : { b: number; }
+>c : { c: number; }
+>{ a: 12 } : { a: number; }
+>a : number
+>12 : 12
+
+interface Preserved {
+>Preserved : Preserved
+
+    kind: 0 | 1 | 2 | 3;
+>kind : 0 | 1 | 2 | 3
+}
+class C implements Preserved {
+>C : C
+>Preserved : Preserved
+
+    kind: 0 = 0;
+>kind : 0
+>0 : 0
+
+    a = 1;
+>a : number
+>1 : 1
+
+    method() { return "C"; }
+>method : () => string
+>"C" : "C"
+}
+declare function revive<T extends Preserved>(t: { ...T }): T;
+>revive : <T extends Preserved>(t: { ...T }) => T
+>T : T
+>Preserved : Preserved
+>t : { ...T }
+>T : T
+>T : T
+
+function genericRevive<U extends Preserved>(u: U) {
+>genericRevive : <U extends Preserved>(u: U) => U
+>U : U
+>Preserved : Preserved
+>u : U
+>U : U
+
+    let us: { ...U };
+>us : { ...U }
+>U : U
+
+    return revive(us);
+>revive(us) : U
+>revive : <T extends Preserved>(t: { ...T }) => T
+>us : { ...U }
+}
+// result should not have `method`
+let result = revive({ a: 12, kind: 0 });
+>result : { a: number; kind: 0; }
+>revive({ a: 12, kind: 0 }) : { a: number; kind: 0; }
+>revive : <T extends Preserved>(t: { ...T }) => T
+>{ a: 12, kind: 0 } : { a: number; kind: 0; }
+>a : number
+>12 : 12
+>kind : number
+>0 : 0
+
+// result2 should be of type C and have `method`
+let result2 = revive<C>({ a: 12, kind: 0 });
+>result2 : C
+>revive<C>({ a: 12, kind: 0 }) : C
+>revive : <T extends Preserved>(t: { ...T }) => T
+>C : C
+>{ a: 12, kind: 0 } : { a: number; kind: 0; }
+>a : number
+>12 : 12
+>kind : number
+>0 : 0
+
+declare function destructureRevive<T extends Preserved>(t: { ...T, a: number }): T;
+>destructureRevive : <T extends Preserved>(t: { ...T; a: number; }) => T
+>T : T
+>Preserved : Preserved
+>t : { ...T; a: number; }
+>T : T
+>a : number
+>T : T
+
+function genericDestructureRevive<U extends Preserved & { a: number }>(u: U) {
+>genericDestructureRevive : <U extends Preserved & { a: number; }>(u: U) => Preserved
+>U : U
+>Preserved : Preserved
+>a : number
+>u : U
+>U : U
+
+    let us: { ...U };
+>us : { ...U }
+>U : U
+
+    return destructureRevive(us);
+>destructureRevive(us) : Preserved
+>destructureRevive : <T extends Preserved>(t: { ...T; a: number; }) => T
+>us : { ...U }
+}
+// result3 is just `Preserved` because `a` and `method` both get removed
+let result3 = destructureRevive({ a: 12, kind: 0 });
+>result3 : { kind: 0; }
+>destructureRevive({ a: 12, kind: 0 }) : { kind: 0; }
+>destructureRevive : <T extends Preserved>(t: { ...T; a: number; }) => T
+>{ a: 12, kind: 0 } : { a: number; kind: 0; }
+>a : number
+>12 : 12
+>kind : number
+>0 : 0
+
+// result4 is still C -- a is not removed -- because we specified the argument explicitly
+let result4 = destructureRevive<C>({ a: 12, kind: 0 });
+>result4 : C
+>destructureRevive<C>({ a: 12, kind: 0 }) : C
+>destructureRevive : <T extends Preserved>(t: { ...T; a: number; }) => T
+>C : C
+>{ a: 12, kind: 0 } : { a: number; kind: 0; }
+>a : number
+>12 : 12
+>kind : number
+>0 : 0
+
+result4.method();
+>result4.method() : string
+>result4.method : () => string
+>result4 : C
+>method : () => string
+
+result4.a;
+>result4.a : number
+>result4 : C
+>a : number
+
+declare function removeIndexSignature<T>(t: { ...T, a: number, [s: string]: number, [n: number]: number }): T;
+>removeIndexSignature : <T>(t: { ...T; [s: string]: number; [n: number]: number; a: number; }) => T
+>T : T
+>t : { ...T; [s: string]: number; [n: number]: number; a: number; }
+>T : T
+>a : number
+>s : string
+>n : number
+>T : T
+
+interface I {
+>I : I
+
+    a: number;
+>a : number
+
+    b: number;
+>b : number
+
+    [s: string]: number;
+>s : string
+
+    [n: number]: number;
+>n : number
+}
+let i: I;
+>i : I
+>I : I
+
+let result5 = removeIndexSignature(i);
+>result5 : { b: number; }
+>removeIndexSignature(i) : { b: number; }
+>removeIndexSignature : <T>(t: { ...T; [s: string]: number; [n: number]: number; a: number; }) => T
+>i : I
+

From ce373d904a0dc6abd79736ac8bac12af647f8572 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 11 Oct 2016 16:16:36 -0700
Subject: [PATCH 028/421] Revert lib.d.ts error message baseline (unrelated)

It should fixed in a separate PR.
---
 .../reference/variableDeclarationInStrictMode1.errors.txt     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt b/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt
index 46782aaa1d6..c47ac71f748 100644
--- a/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt
+++ b/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt
@@ -1,4 +1,4 @@
-lib.d.ts(32,18): error TS2300: Duplicate identifier 'eval'.
+lib.d.ts(28,18): error TS2300: Duplicate identifier 'eval'.
 tests/cases/compiler/variableDeclarationInStrictMode1.ts(2,5): error TS1100: Invalid use of 'eval' in strict mode.
 tests/cases/compiler/variableDeclarationInStrictMode1.ts(2,5): error TS2300: Duplicate identifier 'eval'.
 
@@ -9,4 +9,4 @@ tests/cases/compiler/variableDeclarationInStrictMode1.ts(2,5): error TS2300: Dup
         ~~~~
 !!! error TS1100: Invalid use of 'eval' in strict mode.
         ~~~~
-!!! error TS2300: Duplicate identifier 'eval'.
\ No newline at end of file
+!!! error TS2300: Duplicate identifier 'eval'.

From 97dda6e0eb8568871cb38ede8cd90303beb7cade Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 12 Oct 2016 08:40:08 -0700
Subject: [PATCH 029/421] Remove emacs-added newline at end of baseline

---
 .../reference/variableDeclarationInStrictMode1.errors.txt       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt b/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt
index c47ac71f748..15c79179f70 100644
--- a/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt
+++ b/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt
@@ -9,4 +9,4 @@ tests/cases/compiler/variableDeclarationInStrictMode1.ts(2,5): error TS2300: Dup
         ~~~~
 !!! error TS1100: Invalid use of 'eval' in strict mode.
         ~~~~
-!!! error TS2300: Duplicate identifier 'eval'.
+!!! error TS2300: Duplicate identifier 'eval'. 
\ No newline at end of file

From c5228d3435b3b7d528520f74735e354559879574 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 12 Oct 2016 08:58:49 -0700
Subject: [PATCH 030/421] Remove space at end of line in baseline

---
 .../reference/variableDeclarationInStrictMode1.errors.txt       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt b/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt
index 15c79179f70..9dd9a8d41a1 100644
--- a/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt
+++ b/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt
@@ -9,4 +9,4 @@ tests/cases/compiler/variableDeclarationInStrictMode1.ts(2,5): error TS2300: Dup
         ~~~~
 !!! error TS1100: Invalid use of 'eval' in strict mode.
         ~~~~
-!!! error TS2300: Duplicate identifier 'eval'. 
\ No newline at end of file
+!!! error TS2300: Duplicate identifier 'eval'.
\ No newline at end of file

From 5a037ad36867b5b5f8aad51bb12e9dd18005cf99 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 12 Oct 2016 09:00:17 -0700
Subject: [PATCH 031/421] Add numeric indexer to strings and remove lint

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 93d9c19a71b..bfd6d78e891 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -5781,7 +5781,10 @@ namespace ts {
             if (id in spreadTypes) {
                 return spreadTypes[id];
             }
-            const right = types.pop();
+            let right = types.pop();
+            if (right.flags & TypeFlags.StringLike) {
+                right = createAnonymousType(symbol, emptySymbols, emptyArray, emptyArray, undefined, createIndexInfo(stringType, /*isReadonly*/ false));
+            }
             if (right.flags & TypeFlags.Any) {
                 return anyType;
             }
@@ -5801,16 +5804,13 @@ namespace ts {
                 return getIntersectionType(spreads, aliasSymbol, aliasTypeArguments);
             }
             if (right.flags & TypeFlags.Union) {
-                // TODO: types is mutable, so this block has to happen before the call to `const left = getSpreadType(...)`
-                // because that call consumes the array. It might be worthwhile to use a simple linked list here instead.
-                // It would avoid the slice+concat call that is needed here for multiple calls to getSpreadType.
                 const spreads = map((right as UnionType).types,
                                     t => getSpreadType(types.slice().concat([t]), symbol, aliasSymbol, aliasTypeArguments));
                 return getUnionType(spreads, /*subtypeReduction*/ false, aliasSymbol, aliasTypeArguments);
             }
             const atBeginning = types.length === 0;
             const left = getSpreadType(types, symbol, aliasSymbol, aliasTypeArguments);
-            if (right.flags & TypeFlags.Primitive || left.flags & TypeFlags.Any) {
+            if (right.flags & (TypeFlags.Primitive & ~TypeFlags.StringLike) || left.flags & TypeFlags.Any) {
                 return left;
             }
             if (right.flags & TypeFlags.TypeParameter &&
@@ -5837,7 +5837,7 @@ namespace ts {
             if (left.flags & TypeFlags.Union) {
                 const spreads = map((left as UnionType).types,
                                   t => getSpreadType(types.slice().concat([t, right]), symbol, aliasSymbol, aliasTypeArguments));
-                return getUnionType(spreads, /*subTypeReduction*/ false, aliasSymbol, aliasTypeArguments);
+                return getUnionType(spreads, /*subtypeReduction*/ false, aliasSymbol, aliasTypeArguments);
             }
             if (right.flags & TypeFlags.ObjectType && left.flags & TypeFlags.ObjectType) {
                 const members = createMap<Symbol>();
@@ -8100,7 +8100,7 @@ namespace ts {
                 if (source.flags & TypeFlags.Spread && target.flags & TypeFlags.Spread) {
                     // only the last type parameter is a valid inference site,
                     // and only if not followed by object literal properties.
-                    if((source as SpreadType).right.flags & TypeFlags.TypeParameter &&
+                    if ((source as SpreadType).right.flags & TypeFlags.TypeParameter &&
                        (target as SpreadType).right.flags & TypeFlags.TypeParameter) {
                         inferFromTypes((source as SpreadType).right, (target as SpreadType).right);
                     }
@@ -19053,7 +19053,6 @@ namespace ts {
         function getRootSymbols(symbol: Symbol): Symbol[] {
             if (symbol.flags & SymbolFlags.SyntheticProperty) {
                 if (symbol.syntheticKind === SyntheticSymbolKind.Spread) {
-                    const name = symbol.name;
                     const links = getSymbolLinks(symbol);
                     return [links.leftSpread, links.rightSpread];
                 }

From 1728ae1cbc0d454e6e47292e22dd6a6d885f74fa Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 12 Oct 2016 09:01:14 -0700
Subject: [PATCH 032/421] Update baselines with spread string's numeric
 indexers

---
 tests/baselines/reference/objectSpread.js     |  11 +-
 .../baselines/reference/objectSpread.symbols  | 257 +++++++++---------
 tests/baselines/reference/objectSpread.types  |  11 +-
 .../reference/objectSpreadNegative.errors.txt |   8 +-
 ...ariableDeclarationInStrictMode1.errors.txt |   2 +-
 .../conformance/types/spread/objectSpread.ts  |   6 +-
 6 files changed, 151 insertions(+), 144 deletions(-)

diff --git a/tests/baselines/reference/objectSpread.js b/tests/baselines/reference/objectSpread.js
index a09f5aa0fbb..efb73bcb353 100644
--- a/tests/baselines/reference/objectSpread.js
+++ b/tests/baselines/reference/objectSpread.js
@@ -35,14 +35,16 @@ let getter: { a: number, c: number } =
     { ...op, c: 7 }
 getter.a = 12;
 
-// null, undefined, functions and primitives result in { }
+// null, undefined, functions and primitives besides string result in { }
 let spreadNull = { ...null };
 let spreadUndefind = { ...undefined };
 let spreadNum = { ...12 };
-let spreadStr = { ...'foo' };
 let spreadBool = { ...false };
 let spreadFunc = { ...(function () { }) };
 
+// strings get a numeric indexer: [n: number]: string
+let spreadStr = { ...'foo' };
+
 // methods are not enumerable
 class C { p = 1; m() { } }
 let c: C = new C()
@@ -128,13 +130,14 @@ var propertyNested = __assign({ a: __assign({}, o) });
 var op = { get a() { return 6; } };
 var getter = __assign({}, op, { c: 7 });
 getter.a = 12;
-// null, undefined, functions and primitives result in { }
+// null, undefined, functions and primitives besides string result in { }
 var spreadNull = __assign({}, null);
 var spreadUndefind = __assign({}, undefined);
 var spreadNum = __assign({}, 12);
-var spreadStr = __assign({}, 'foo');
 var spreadBool = __assign({}, false);
 var spreadFunc = __assign({}, (function () { }));
+// strings get a numeric indexer: [n: number]: string
+var spreadStr = __assign({}, 'foo');
 // methods are not enumerable
 var C = (function () {
     function C() {
diff --git a/tests/baselines/reference/objectSpread.symbols b/tests/baselines/reference/objectSpread.symbols
index edb0b4c2f08..d23016ddb1e 100644
--- a/tests/baselines/reference/objectSpread.symbols
+++ b/tests/baselines/reference/objectSpread.symbols
@@ -150,7 +150,7 @@ getter.a = 12;
 >getter : Symbol(getter, Decl(objectSpread.ts, 32, 3))
 >a : Symbol(a, Decl(objectSpread.ts, 32, 13))
 
-// null, undefined, functions and primitives result in { }
+// null, undefined, functions and primitives besides string result in { }
 let spreadNull = { ...null };
 >spreadNull : Symbol(spreadNull, Decl(objectSpread.ts, 37, 3))
 
@@ -160,214 +160,215 @@ let spreadUndefind = { ...undefined };
 let spreadNum = { ...12 };
 >spreadNum : Symbol(spreadNum, Decl(objectSpread.ts, 39, 3))
 
-let spreadStr = { ...'foo' };
->spreadStr : Symbol(spreadStr, Decl(objectSpread.ts, 40, 3))
-
 let spreadBool = { ...false };
->spreadBool : Symbol(spreadBool, Decl(objectSpread.ts, 41, 3))
+>spreadBool : Symbol(spreadBool, Decl(objectSpread.ts, 40, 3))
 
 let spreadFunc = { ...(function () { }) };
->spreadFunc : Symbol(spreadFunc, Decl(objectSpread.ts, 42, 3))
+>spreadFunc : Symbol(spreadFunc, Decl(objectSpread.ts, 41, 3))
+
+// strings get a numeric indexer: [n: number]: string
+let spreadStr = { ...'foo' };
+>spreadStr : Symbol(spreadStr, Decl(objectSpread.ts, 44, 3))
 
 // methods are not enumerable
 class C { p = 1; m() { } }
->C : Symbol(C, Decl(objectSpread.ts, 42, 42))
->p : Symbol(C.p, Decl(objectSpread.ts, 45, 9))
->m : Symbol(C.m, Decl(objectSpread.ts, 45, 16))
+>C : Symbol(C, Decl(objectSpread.ts, 44, 29))
+>p : Symbol(C.p, Decl(objectSpread.ts, 47, 9))
+>m : Symbol(C.m, Decl(objectSpread.ts, 47, 16))
 
 let c: C = new C()
->c : Symbol(c, Decl(objectSpread.ts, 46, 3))
->C : Symbol(C, Decl(objectSpread.ts, 42, 42))
->C : Symbol(C, Decl(objectSpread.ts, 42, 42))
+>c : Symbol(c, Decl(objectSpread.ts, 48, 3))
+>C : Symbol(C, Decl(objectSpread.ts, 44, 29))
+>C : Symbol(C, Decl(objectSpread.ts, 44, 29))
 
 let spreadC: { p: number } = { ...c }
->spreadC : Symbol(spreadC, Decl(objectSpread.ts, 47, 3))
->p : Symbol(p, Decl(objectSpread.ts, 47, 14))
+>spreadC : Symbol(spreadC, Decl(objectSpread.ts, 49, 3))
+>p : Symbol(p, Decl(objectSpread.ts, 49, 14))
 
 // own methods are enumerable
 let cplus: { p: number, plus(): void } = { ...c, plus() { return this.p + 1; } };
->cplus : Symbol(cplus, Decl(objectSpread.ts, 50, 3))
->p : Symbol(p, Decl(objectSpread.ts, 50, 12))
->plus : Symbol(plus, Decl(objectSpread.ts, 50, 23))
->plus : Symbol(plus, Decl(objectSpread.ts, 50, 48))
+>cplus : Symbol(cplus, Decl(objectSpread.ts, 52, 3))
+>p : Symbol(p, Decl(objectSpread.ts, 52, 12))
+>plus : Symbol(plus, Decl(objectSpread.ts, 52, 23))
+>plus : Symbol(plus, Decl(objectSpread.ts, 52, 48))
 
 cplus.plus();
->cplus.plus : Symbol(plus, Decl(objectSpread.ts, 50, 23))
->cplus : Symbol(cplus, Decl(objectSpread.ts, 50, 3))
->plus : Symbol(plus, Decl(objectSpread.ts, 50, 23))
+>cplus.plus : Symbol(plus, Decl(objectSpread.ts, 52, 23))
+>cplus : Symbol(cplus, Decl(objectSpread.ts, 52, 3))
+>plus : Symbol(plus, Decl(objectSpread.ts, 52, 23))
 
 // new field's type conflicting with existing field is OK
 let changeTypeAfter: { a: string, b: string } =
->changeTypeAfter : Symbol(changeTypeAfter, Decl(objectSpread.ts, 54, 3))
->a : Symbol(a, Decl(objectSpread.ts, 54, 22))
->b : Symbol(b, Decl(objectSpread.ts, 54, 33))
+>changeTypeAfter : Symbol(changeTypeAfter, Decl(objectSpread.ts, 56, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 56, 22))
+>b : Symbol(b, Decl(objectSpread.ts, 56, 33))
 
     { ...o, a: 'wrong type?' }
->a : Symbol(a, Decl(objectSpread.ts, 55, 11))
+>a : Symbol(a, Decl(objectSpread.ts, 57, 11))
 
 let changeTypeBefore: { a: number, b: string } =
->changeTypeBefore : Symbol(changeTypeBefore, Decl(objectSpread.ts, 56, 3))
->a : Symbol(a, Decl(objectSpread.ts, 56, 23))
->b : Symbol(b, Decl(objectSpread.ts, 56, 34))
+>changeTypeBefore : Symbol(changeTypeBefore, Decl(objectSpread.ts, 58, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 58, 23))
+>b : Symbol(b, Decl(objectSpread.ts, 58, 34))
 
     { a: 'wrong type?', ...o };
->a : Symbol(a, Decl(objectSpread.ts, 57, 5))
+>a : Symbol(a, Decl(objectSpread.ts, 59, 5))
 
 let changeTypeBoth: { a: string, b: number } =
->changeTypeBoth : Symbol(changeTypeBoth, Decl(objectSpread.ts, 58, 3))
->a : Symbol(a, Decl(objectSpread.ts, 58, 21))
->b : Symbol(b, Decl(objectSpread.ts, 58, 32))
+>changeTypeBoth : Symbol(changeTypeBoth, Decl(objectSpread.ts, 60, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 60, 21))
+>b : Symbol(b, Decl(objectSpread.ts, 60, 32))
 
     { ...o, ...swap };
 
 // optional
 let definiteBoolean: { sn: boolean };
->definiteBoolean : Symbol(definiteBoolean, Decl(objectSpread.ts, 62, 3))
->sn : Symbol(sn, Decl(objectSpread.ts, 62, 22))
+>definiteBoolean : Symbol(definiteBoolean, Decl(objectSpread.ts, 64, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 64, 22))
 
 let definiteString: { sn: string };
->definiteString : Symbol(definiteString, Decl(objectSpread.ts, 63, 3))
->sn : Symbol(sn, Decl(objectSpread.ts, 63, 21))
-
-let optionalString: { sn?: string };
->optionalString : Symbol(optionalString, Decl(objectSpread.ts, 64, 3))
->sn : Symbol(sn, Decl(objectSpread.ts, 64, 21))
-
-let optionalNumber: { sn?: number };
->optionalNumber : Symbol(optionalNumber, Decl(objectSpread.ts, 65, 3))
+>definiteString : Symbol(definiteString, Decl(objectSpread.ts, 65, 3))
 >sn : Symbol(sn, Decl(objectSpread.ts, 65, 21))
 
+let optionalString: { sn?: string };
+>optionalString : Symbol(optionalString, Decl(objectSpread.ts, 66, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 66, 21))
+
+let optionalNumber: { sn?: number };
+>optionalNumber : Symbol(optionalNumber, Decl(objectSpread.ts, 67, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 67, 21))
+
 let optionalUnionStops: { sn: string | number | boolean } = { ...definiteBoolean, ...definiteString, ...optionalNumber };
->optionalUnionStops : Symbol(optionalUnionStops, Decl(objectSpread.ts, 66, 3))
->sn : Symbol(sn, Decl(objectSpread.ts, 66, 25))
+>optionalUnionStops : Symbol(optionalUnionStops, Decl(objectSpread.ts, 68, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 68, 25))
 
 let optionalUnionDuplicates: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...optionalString, ...optionalNumber };
->optionalUnionDuplicates : Symbol(optionalUnionDuplicates, Decl(objectSpread.ts, 67, 3))
->sn : Symbol(sn, Decl(objectSpread.ts, 67, 30))
+>optionalUnionDuplicates : Symbol(optionalUnionDuplicates, Decl(objectSpread.ts, 69, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 69, 30))
 
 let allOptional: { sn?: string | number } = { ...optionalString, ...optionalNumber };
->allOptional : Symbol(allOptional, Decl(objectSpread.ts, 68, 3))
->sn : Symbol(sn, Decl(objectSpread.ts, 68, 18))
+>allOptional : Symbol(allOptional, Decl(objectSpread.ts, 70, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 70, 18))
 
 // computed property
 let computedFirst: { a: number, b: string, "before everything": number } =
->computedFirst : Symbol(computedFirst, Decl(objectSpread.ts, 71, 3))
->a : Symbol(a, Decl(objectSpread.ts, 71, 20))
->b : Symbol(b, Decl(objectSpread.ts, 71, 31))
+>computedFirst : Symbol(computedFirst, Decl(objectSpread.ts, 73, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 73, 20))
+>b : Symbol(b, Decl(objectSpread.ts, 73, 31))
 
     { ['before everything']: 12, ...o, b: 'yes' }
->'before everything' : Symbol(['before everything'], Decl(objectSpread.ts, 72, 5))
->b : Symbol(b, Decl(objectSpread.ts, 72, 38))
+>'before everything' : Symbol(['before everything'], Decl(objectSpread.ts, 74, 5))
+>b : Symbol(b, Decl(objectSpread.ts, 74, 38))
 
 let computedMiddle: { a: number, b: string, c: boolean, "in the middle": number } =
->computedMiddle : Symbol(computedMiddle, Decl(objectSpread.ts, 73, 3))
->a : Symbol(a, Decl(objectSpread.ts, 73, 21))
->b : Symbol(b, Decl(objectSpread.ts, 73, 32))
->c : Symbol(c, Decl(objectSpread.ts, 73, 43))
+>computedMiddle : Symbol(computedMiddle, Decl(objectSpread.ts, 75, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 75, 21))
+>b : Symbol(b, Decl(objectSpread.ts, 75, 32))
+>c : Symbol(c, Decl(objectSpread.ts, 75, 43))
 
     { ...o, ['in the middle']: 13, b: 'maybe?', ...o2 }
->'in the middle' : Symbol(['in the middle'], Decl(objectSpread.ts, 74, 11))
->b : Symbol(b, Decl(objectSpread.ts, 74, 34))
+>'in the middle' : Symbol(['in the middle'], Decl(objectSpread.ts, 76, 11))
+>b : Symbol(b, Decl(objectSpread.ts, 76, 34))
 
 let computedAfter: { a: number, b: string, "at the end": number } =
->computedAfter : Symbol(computedAfter, Decl(objectSpread.ts, 75, 3))
->a : Symbol(a, Decl(objectSpread.ts, 75, 20))
->b : Symbol(b, Decl(objectSpread.ts, 75, 31))
+>computedAfter : Symbol(computedAfter, Decl(objectSpread.ts, 77, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 77, 20))
+>b : Symbol(b, Decl(objectSpread.ts, 77, 31))
 
     { ...o, b: 'yeah', ['at the end']: 14 }
->b : Symbol(b, Decl(objectSpread.ts, 76, 11))
->'at the end' : Symbol(['at the end'], Decl(objectSpread.ts, 76, 22))
+>b : Symbol(b, Decl(objectSpread.ts, 78, 11))
+>'at the end' : Symbol(['at the end'], Decl(objectSpread.ts, 78, 22))
 
 // shortcut syntax
 let a = 12;
->a : Symbol(a, Decl(objectSpread.ts, 78, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 80, 3))
 
 let shortCutted: { a: number, b: string } = { ...o, a }
->shortCutted : Symbol(shortCutted, Decl(objectSpread.ts, 79, 3))
->a : Symbol(a, Decl(objectSpread.ts, 79, 18))
->b : Symbol(b, Decl(objectSpread.ts, 79, 29))
->a : Symbol(a, Decl(objectSpread.ts, 79, 51))
+>shortCutted : Symbol(shortCutted, Decl(objectSpread.ts, 81, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 81, 18))
+>b : Symbol(b, Decl(objectSpread.ts, 81, 29))
+>a : Symbol(a, Decl(objectSpread.ts, 81, 51))
 
 // generics
 function f<T, U>(t: T, u: U): { id: string, ...T, ...U } {
->f : Symbol(f, Decl(objectSpread.ts, 79, 55))
->T : Symbol(T, Decl(objectSpread.ts, 82, 11))
->U : Symbol(U, Decl(objectSpread.ts, 82, 13))
->t : Symbol(t, Decl(objectSpread.ts, 82, 17))
->T : Symbol(T, Decl(objectSpread.ts, 82, 11))
->u : Symbol(u, Decl(objectSpread.ts, 82, 22))
->U : Symbol(U, Decl(objectSpread.ts, 82, 13))
->id : Symbol(id, Decl(objectSpread.ts, 82, 31))
->T : Symbol(T, Decl(objectSpread.ts, 82, 11))
->U : Symbol(U, Decl(objectSpread.ts, 82, 13))
+>f : Symbol(f, Decl(objectSpread.ts, 81, 55))
+>T : Symbol(T, Decl(objectSpread.ts, 84, 11))
+>U : Symbol(U, Decl(objectSpread.ts, 84, 13))
+>t : Symbol(t, Decl(objectSpread.ts, 84, 17))
+>T : Symbol(T, Decl(objectSpread.ts, 84, 11))
+>u : Symbol(u, Decl(objectSpread.ts, 84, 22))
+>U : Symbol(U, Decl(objectSpread.ts, 84, 13))
+>id : Symbol(id, Decl(objectSpread.ts, 84, 31))
+>T : Symbol(T, Decl(objectSpread.ts, 84, 11))
+>U : Symbol(U, Decl(objectSpread.ts, 84, 13))
 
     return { id: 'id', ...t, ...u };
->id : Symbol(id, Decl(objectSpread.ts, 83, 12))
+>id : Symbol(id, Decl(objectSpread.ts, 85, 12))
 }
 let exclusive: { id: string, a: number, b: string, c: string, d: boolean } =
->exclusive : Symbol(exclusive, Decl(objectSpread.ts, 85, 3))
->id : Symbol(id, Decl(objectSpread.ts, 85, 16))
->a : Symbol(a, Decl(objectSpread.ts, 85, 28))
->b : Symbol(b, Decl(objectSpread.ts, 85, 39))
->c : Symbol(c, Decl(objectSpread.ts, 85, 50))
->d : Symbol(d, Decl(objectSpread.ts, 85, 61))
+>exclusive : Symbol(exclusive, Decl(objectSpread.ts, 87, 3))
+>id : Symbol(id, Decl(objectSpread.ts, 87, 16))
+>a : Symbol(a, Decl(objectSpread.ts, 87, 28))
+>b : Symbol(b, Decl(objectSpread.ts, 87, 39))
+>c : Symbol(c, Decl(objectSpread.ts, 87, 50))
+>d : Symbol(d, Decl(objectSpread.ts, 87, 61))
 
     f({ a: 1, b: 'yes' }, { c: 'no', d: false })
->f : Symbol(f, Decl(objectSpread.ts, 79, 55))
->a : Symbol(a, Decl(objectSpread.ts, 86, 7))
->b : Symbol(b, Decl(objectSpread.ts, 86, 13))
->c : Symbol(c, Decl(objectSpread.ts, 86, 27))
->d : Symbol(d, Decl(objectSpread.ts, 86, 36))
+>f : Symbol(f, Decl(objectSpread.ts, 81, 55))
+>a : Symbol(a, Decl(objectSpread.ts, 88, 7))
+>b : Symbol(b, Decl(objectSpread.ts, 88, 13))
+>c : Symbol(c, Decl(objectSpread.ts, 88, 27))
+>d : Symbol(d, Decl(objectSpread.ts, 88, 36))
 
 let overlap: { id: string, a: number, b: string } =
->overlap : Symbol(overlap, Decl(objectSpread.ts, 87, 3))
->id : Symbol(id, Decl(objectSpread.ts, 87, 14))
->a : Symbol(a, Decl(objectSpread.ts, 87, 26))
->b : Symbol(b, Decl(objectSpread.ts, 87, 37))
+>overlap : Symbol(overlap, Decl(objectSpread.ts, 89, 3))
+>id : Symbol(id, Decl(objectSpread.ts, 89, 14))
+>a : Symbol(a, Decl(objectSpread.ts, 89, 26))
+>b : Symbol(b, Decl(objectSpread.ts, 89, 37))
 
     f({ a: 1 }, { a: 2, b: 'extra' })
->f : Symbol(f, Decl(objectSpread.ts, 79, 55))
->a : Symbol(a, Decl(objectSpread.ts, 88, 7))
->a : Symbol(a, Decl(objectSpread.ts, 88, 17))
->b : Symbol(b, Decl(objectSpread.ts, 88, 23))
-
-let overlapConflict: { id:string, a: string } =
->overlapConflict : Symbol(overlapConflict, Decl(objectSpread.ts, 89, 3))
->id : Symbol(id, Decl(objectSpread.ts, 89, 22))
->a : Symbol(a, Decl(objectSpread.ts, 89, 33))
-
-    f({ a: 1 }, { a: 'mismatch' })
->f : Symbol(f, Decl(objectSpread.ts, 79, 55))
+>f : Symbol(f, Decl(objectSpread.ts, 81, 55))
 >a : Symbol(a, Decl(objectSpread.ts, 90, 7))
 >a : Symbol(a, Decl(objectSpread.ts, 90, 17))
+>b : Symbol(b, Decl(objectSpread.ts, 90, 23))
+
+let overlapConflict: { id:string, a: string } =
+>overlapConflict : Symbol(overlapConflict, Decl(objectSpread.ts, 91, 3))
+>id : Symbol(id, Decl(objectSpread.ts, 91, 22))
+>a : Symbol(a, Decl(objectSpread.ts, 91, 33))
+
+    f({ a: 1 }, { a: 'mismatch' })
+>f : Symbol(f, Decl(objectSpread.ts, 81, 55))
+>a : Symbol(a, Decl(objectSpread.ts, 92, 7))
+>a : Symbol(a, Decl(objectSpread.ts, 92, 17))
 
 let overwriteId: { id: boolean, a: number, c: number, d: string } =
->overwriteId : Symbol(overwriteId, Decl(objectSpread.ts, 91, 3))
->id : Symbol(id, Decl(objectSpread.ts, 91, 18))
->a : Symbol(a, Decl(objectSpread.ts, 91, 31))
->c : Symbol(c, Decl(objectSpread.ts, 91, 42))
->d : Symbol(d, Decl(objectSpread.ts, 91, 53))
+>overwriteId : Symbol(overwriteId, Decl(objectSpread.ts, 93, 3))
+>id : Symbol(id, Decl(objectSpread.ts, 93, 18))
+>a : Symbol(a, Decl(objectSpread.ts, 93, 31))
+>c : Symbol(c, Decl(objectSpread.ts, 93, 42))
+>d : Symbol(d, Decl(objectSpread.ts, 93, 53))
 
     f({ a: 1, id: true }, { c: 1, d: 'no' })
->f : Symbol(f, Decl(objectSpread.ts, 79, 55))
->a : Symbol(a, Decl(objectSpread.ts, 92, 7))
->id : Symbol(id, Decl(objectSpread.ts, 92, 13))
->c : Symbol(c, Decl(objectSpread.ts, 92, 27))
->d : Symbol(d, Decl(objectSpread.ts, 92, 33))
+>f : Symbol(f, Decl(objectSpread.ts, 81, 55))
+>a : Symbol(a, Decl(objectSpread.ts, 94, 7))
+>id : Symbol(id, Decl(objectSpread.ts, 94, 13))
+>c : Symbol(c, Decl(objectSpread.ts, 94, 27))
+>d : Symbol(d, Decl(objectSpread.ts, 94, 33))
 
 class D { m() { }; q = 2; }
->D : Symbol(D, Decl(objectSpread.ts, 92, 44))
->m : Symbol(D.m, Decl(objectSpread.ts, 94, 9))
->q : Symbol(D.q, Decl(objectSpread.ts, 94, 18))
+>D : Symbol(D, Decl(objectSpread.ts, 94, 44))
+>m : Symbol(D.m, Decl(objectSpread.ts, 96, 9))
+>q : Symbol(D.q, Decl(objectSpread.ts, 96, 18))
 
 let classesAreWrong: { id: string, ...C, ...D } =
->classesAreWrong : Symbol(classesAreWrong, Decl(objectSpread.ts, 95, 3))
->id : Symbol(id, Decl(objectSpread.ts, 95, 22))
->C : Symbol(C, Decl(objectSpread.ts, 42, 42))
->D : Symbol(D, Decl(objectSpread.ts, 92, 44))
+>classesAreWrong : Symbol(classesAreWrong, Decl(objectSpread.ts, 97, 3))
+>id : Symbol(id, Decl(objectSpread.ts, 97, 22))
+>C : Symbol(C, Decl(objectSpread.ts, 44, 29))
+>D : Symbol(D, Decl(objectSpread.ts, 94, 44))
 
     f(new C(), new D())
->f : Symbol(f, Decl(objectSpread.ts, 79, 55))
->C : Symbol(C, Decl(objectSpread.ts, 42, 42))
->D : Symbol(D, Decl(objectSpread.ts, 92, 44))
+>f : Symbol(f, Decl(objectSpread.ts, 81, 55))
+>C : Symbol(C, Decl(objectSpread.ts, 44, 29))
+>D : Symbol(D, Decl(objectSpread.ts, 94, 44))
 
diff --git a/tests/baselines/reference/objectSpread.types b/tests/baselines/reference/objectSpread.types
index 2b13af1d3d6..efab098fd6e 100644
--- a/tests/baselines/reference/objectSpread.types
+++ b/tests/baselines/reference/objectSpread.types
@@ -223,7 +223,7 @@ getter.a = 12;
 >a : number
 >12 : 12
 
-// null, undefined, functions and primitives result in { }
+// null, undefined, functions and primitives besides string result in { }
 let spreadNull = { ...null };
 >spreadNull : {}
 >{ ...null } : {}
@@ -238,10 +238,6 @@ let spreadNum = { ...12 };
 >spreadNum : {}
 >{ ...12 } : {}
 
-let spreadStr = { ...'foo' };
->spreadStr : {}
->{ ...'foo' } : {}
-
 let spreadBool = { ...false };
 >spreadBool : {}
 >{ ...false } : {}
@@ -253,6 +249,11 @@ let spreadFunc = { ...(function () { }) };
 >(function () { }) : () => void
 >function () { } : () => void
 
+// strings get a numeric indexer: [n: number]: string
+let spreadStr = { ...'foo' };
+>spreadStr : { [x: number]: string; }
+>{ ...'foo' } : { [x: number]: string; }
+
 // methods are not enumerable
 class C { p = 1; m() { } }
 >C : C
diff --git a/tests/baselines/reference/objectSpreadNegative.errors.txt b/tests/baselines/reference/objectSpreadNegative.errors.txt
index 84fb1cc4a76..b79354c4a94 100644
--- a/tests/baselines/reference/objectSpreadNegative.errors.txt
+++ b/tests/baselines/reference/objectSpreadNegative.errors.txt
@@ -11,8 +11,8 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(30,12): error TS233
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(32,17): error TS2339: Property 'undefined' does not exist on type '{}'.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(36,11): error TS2339: Property 'toFixed' does not exist on type '{}'.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(38,11): error TS2339: Property 'toFixed' does not exist on type '{}'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(40,11): error TS2339: Property 'length' does not exist on type '{}'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(41,11): error TS2339: Property 'charAt' does not exist on type '{}'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(40,11): error TS2339: Property 'length' does not exist on type '{ [x: number]: string; }'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(41,11): error TS2339: Property 'charAt' does not exist on type '{ [x: number]: string; }'.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(45,1): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type '{}' has no compatible call signatures.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(49,12): error TS2339: Property 'b' does not exist on type '{}'.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(55,9): error TS2339: Property 'm' does not exist on type '{ p: number; }'.
@@ -86,10 +86,10 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(63,12): error TS232
     let spreadStr = { ...'foo' };
     spreadStr.length; // error, no 'length'
               ~~~~~~
-!!! error TS2339: Property 'length' does not exist on type '{}'.
+!!! error TS2339: Property 'length' does not exist on type '{ [x: number]: string; }'.
     spreadStr.charAt(1); // error, no methods either
               ~~~~~~
-!!! error TS2339: Property 'charAt' does not exist on type '{}'.
+!!! error TS2339: Property 'charAt' does not exist on type '{ [x: number]: string; }'.
     let spreadBool = { ...true };
     spreadBool.valueOf(); // error, what were you thinking?
     let spreadFunc = { ...function () { } }
diff --git a/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt b/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt
index 9dd9a8d41a1..46782aaa1d6 100644
--- a/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt
+++ b/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt
@@ -1,4 +1,4 @@
-lib.d.ts(28,18): error TS2300: Duplicate identifier 'eval'.
+lib.d.ts(32,18): error TS2300: Duplicate identifier 'eval'.
 tests/cases/compiler/variableDeclarationInStrictMode1.ts(2,5): error TS1100: Invalid use of 'eval' in strict mode.
 tests/cases/compiler/variableDeclarationInStrictMode1.ts(2,5): error TS2300: Duplicate identifier 'eval'.
 
diff --git a/tests/cases/conformance/types/spread/objectSpread.ts b/tests/cases/conformance/types/spread/objectSpread.ts
index e94775649e7..fc076e79543 100644
--- a/tests/cases/conformance/types/spread/objectSpread.ts
+++ b/tests/cases/conformance/types/spread/objectSpread.ts
@@ -35,14 +35,16 @@ let getter: { a: number, c: number } =
     { ...op, c: 7 }
 getter.a = 12;
 
-// null, undefined, functions and primitives result in { }
+// null, undefined, functions and primitives besides string result in { }
 let spreadNull = { ...null };
 let spreadUndefind = { ...undefined };
 let spreadNum = { ...12 };
-let spreadStr = { ...'foo' };
 let spreadBool = { ...false };
 let spreadFunc = { ...(function () { }) };
 
+// strings get a numeric indexer: [n: number]: string
+let spreadStr = { ...'foo' };
+
 // methods are not enumerable
 class C { p = 1; m() { } }
 let c: C = new C()

From ab1b2bb2a94ee6a44d4d3e343d5077b39bbb2d98 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 12 Oct 2016 09:20:12 -0700
Subject: [PATCH 033/421] Reset baseline line number to the locally incorrect
 value

---
 .../reference/variableDeclarationInStrictMode1.errors.txt     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt b/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt
index 46782aaa1d6..c47ac71f748 100644
--- a/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt
+++ b/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt
@@ -1,4 +1,4 @@
-lib.d.ts(32,18): error TS2300: Duplicate identifier 'eval'.
+lib.d.ts(28,18): error TS2300: Duplicate identifier 'eval'.
 tests/cases/compiler/variableDeclarationInStrictMode1.ts(2,5): error TS1100: Invalid use of 'eval' in strict mode.
 tests/cases/compiler/variableDeclarationInStrictMode1.ts(2,5): error TS2300: Duplicate identifier 'eval'.
 
@@ -9,4 +9,4 @@ tests/cases/compiler/variableDeclarationInStrictMode1.ts(2,5): error TS2300: Dup
         ~~~~
 !!! error TS1100: Invalid use of 'eval' in strict mode.
         ~~~~
-!!! error TS2300: Duplicate identifier 'eval'.
\ No newline at end of file
+!!! error TS2300: Duplicate identifier 'eval'.

From 3a85312dd816de4031fa1aae1ccccb53eca67e46 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 12 Oct 2016 10:11:33 -0700
Subject: [PATCH 034/421] Remove trailing newline from baseline again

---
 .../reference/variableDeclarationInStrictMode1.errors.txt       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt b/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt
index c47ac71f748..9dd9a8d41a1 100644
--- a/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt
+++ b/tests/baselines/reference/variableDeclarationInStrictMode1.errors.txt
@@ -9,4 +9,4 @@ tests/cases/compiler/variableDeclarationInStrictMode1.ts(2,5): error TS2300: Dup
         ~~~~
 !!! error TS1100: Invalid use of 'eval' in strict mode.
         ~~~~
-!!! error TS2300: Duplicate identifier 'eval'.
+!!! error TS2300: Duplicate identifier 'eval'.
\ No newline at end of file

From dceebcdc47d8f3cec9c05735a3df6f5882fb9743 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 12 Oct 2016 11:36:40 -0700
Subject: [PATCH 035/421] Refactor getTypeFromTypeLiteral, from PR comments

---
 src/compiler/checker.ts | 112 ++++++++++++++++++++--------------------
 1 file changed, 57 insertions(+), 55 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index bfd6d78e891..13de95485c8 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -5710,62 +5710,13 @@ namespace ts {
         function getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node: Node, aliasSymbol?: Symbol, aliasTypeArguments?: Type[]): Type {
             const links = getNodeLinks(node);
             if (!links.resolvedType) {
-                const isSpread = (node.kind === SyntaxKind.TypeLiteral &&
-                                  find((node as TypeLiteralNode).members, elt => elt.kind === SyntaxKind.SpreadTypeElement));
-                let type: ObjectType;
-                if (isSpread) {
-                    let members: Map<Symbol>;
-                    let stringIndexInfo: IndexInfo;
-                    let numberIndexInfo: IndexInfo;
-                    const spreads: Type[] = [];
-                    for (const member of (node as TypeLiteralNode).members) {
-                        if (member.kind === SyntaxKind.SpreadTypeElement) {
-                            if (members) {
-                                spreads.push(createAnonymousType(node.symbol, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo));
-                                members = undefined;
-                                stringIndexInfo = undefined;
-                                numberIndexInfo = undefined;
-                            }
-                            spreads.push(getTypeFromTypeNode((member as SpreadTypeElement).type));
-                        }
-                        else if (member.kind === SyntaxKind.IndexSignature) {
-                            const index = member as IndexSignatureDeclaration;
-                            if (index.parameters.length === 1) {
-                                const parameter = index.parameters[0];
-                                if (parameter && parameter.type) {
-                                    const indexInfo = createIndexInfo(index.type ? getTypeFromTypeNode(index.type) : anyType,
-                                                                      (getModifierFlags(index) & ModifierFlags.Readonly) !== 0, index);
-                                    if (parameter.type.kind === SyntaxKind.StringKeyword) {
-                                        stringIndexInfo = indexInfo;
-                                    }
-                                    else {
-                                        numberIndexInfo = indexInfo;
-                                    }
-                                }
-                            }
-                        }
-                        else if (member.kind !== SyntaxKind.CallSignature && member.kind !== SyntaxKind.ConstructSignature) {
-                            // note that spread types don't include call and construct signatures
-                            const flags = SymbolFlags.Property | SymbolFlags.Transient | (member.questionToken ? SymbolFlags.Optional : 0);
-                            const text = getTextOfPropertyName(member.name);
-                            const symbol = <TransientSymbol>createSymbol(flags, text);
-                            symbol.declarations = [member];
-                            symbol.valueDeclaration = member;
-                            symbol.type = getTypeFromTypeNodeNoAlias((member as IndexSignatureDeclaration | PropertySignature | MethodSignature).type);
-                            if (!members) {
-                                members = createMap<Symbol>();
-                            }
-                            members[symbol.name] = symbol;
-                        }
-                    }
-                    if (members || stringIndexInfo || numberIndexInfo) {
-                        spreads.push(createAnonymousType(node.symbol, members || emptySymbols, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo));
-                    }
-                    return getSpreadType(spreads, node.symbol, aliasSymbol, aliasTypeArguments);
-                }
-                else {
-                    type = createObjectType(TypeFlags.Anonymous, node.symbol);
+                const hasSpread = (node.kind === SyntaxKind.TypeLiteral &&
+                                   find((node as TypeLiteralNode).members, elt => elt.kind === SyntaxKind.SpreadTypeElement));
+                if (hasSpread) {
+                    return getTypeFromSpreadTypeLiteral(node, aliasSymbol, aliasTypeArguments);
                 }
+
+                let type = createObjectType(TypeFlags.Anonymous, node.symbol);
                 type.aliasSymbol = aliasSymbol;
                 type.aliasTypeArguments = aliasTypeArguments;
                 links.resolvedType = type;
@@ -5773,6 +5724,57 @@ namespace ts {
             return links.resolvedType;
         }
 
+        function getTypeFromSpreadTypeLiteral(node: Node, aliasSymbol?: Symbol, aliasTypeArguments?: Type[]): Type {
+            let members: Map<Symbol>;
+            let stringIndexInfo: IndexInfo;
+            let numberIndexInfo: IndexInfo;
+            const spreads: Type[] = [];
+            for (const member of (node as TypeLiteralNode).members) {
+                if (member.kind === SyntaxKind.SpreadTypeElement) {
+                    if (members) {
+                        spreads.push(createAnonymousType(node.symbol, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo));
+                        members = undefined;
+                        stringIndexInfo = undefined;
+                        numberIndexInfo = undefined;
+                    }
+                    spreads.push(getTypeFromTypeNode((member as SpreadTypeElement).type));
+                }
+                else if (member.kind === SyntaxKind.IndexSignature) {
+                    const index = member as IndexSignatureDeclaration;
+                    if (index.parameters.length === 1) {
+                        const parameter = index.parameters[0];
+                        if (parameter && parameter.type) {
+                            const indexInfo = createIndexInfo(index.type ? getTypeFromTypeNode(index.type) : anyType,
+                                                              (getModifierFlags(index) & ModifierFlags.Readonly) !== 0, index);
+                            if (parameter.type.kind === SyntaxKind.StringKeyword) {
+                                stringIndexInfo = indexInfo;
+                            }
+                            else {
+                                numberIndexInfo = indexInfo;
+                            }
+                        }
+                    }
+                }
+                else if (member.kind !== SyntaxKind.CallSignature && member.kind !== SyntaxKind.ConstructSignature) {
+                    // note that spread types don't include call and construct signatures
+                    const flags = SymbolFlags.Property | SymbolFlags.Transient | (member.questionToken ? SymbolFlags.Optional : 0);
+                    const text = getTextOfPropertyName(member.name);
+                    const symbol = <TransientSymbol>createSymbol(flags, text);
+                    symbol.declarations = [member];
+                    symbol.valueDeclaration = member;
+                    symbol.type = getTypeFromTypeNodeNoAlias((member as IndexSignatureDeclaration | PropertySignature | MethodSignature).type);
+                    if (!members) {
+                        members = createMap<Symbol>();
+                    }
+                    members[symbol.name] = symbol;
+                }
+            }
+            if (members || stringIndexInfo || numberIndexInfo) {
+                spreads.push(createAnonymousType(node.symbol, members || emptySymbols, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo));
+            }
+            return getSpreadType(spreads, node.symbol, aliasSymbol, aliasTypeArguments);
+        }
+
         function getSpreadType(types: Type[], symbol: Symbol, aliasSymbol?: Symbol, aliasTypeArguments?: Type[]): Type {
             if (types.length === 0) {
                 return emptyObjectType;

From ce84cee0f26192eed2aac3c405b06514fd7485a1 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 12 Oct 2016 11:53:54 -0700
Subject: [PATCH 036/421] Fix lint

---
 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 13de95485c8..9a30fe435ae 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -5716,7 +5716,7 @@ namespace ts {
                     return getTypeFromSpreadTypeLiteral(node, aliasSymbol, aliasTypeArguments);
                 }
 
-                let type = createObjectType(TypeFlags.Anonymous, node.symbol);
+                const type = createObjectType(TypeFlags.Anonymous, node.symbol);
                 type.aliasSymbol = aliasSymbol;
                 type.aliasTypeArguments = aliasTypeArguments;
                 links.resolvedType = type;

From 00ebf59b500d064524af5ddfef87b6c45b53e655 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Thu, 13 Oct 2016 16:26:44 -0700
Subject: [PATCH 037/421] Use same literal comparison rules for switch/===

switch was missing the rule for converting literal types to the literal
base type if needed.
---
 src/compiler/checker.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 30a0bbd2042..6df09cca704 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -16584,7 +16584,7 @@ namespace ts {
             let firstDefaultClause: CaseOrDefaultClause;
             let hasDuplicateDefaultClause = false;
 
-            const expressionType = checkExpression(node.expression);
+            let expressionType = checkExpression(node.expression);
             forEach(node.caseBlock.clauses, clause => {
                 // Grammar check for duplicate default clauses, skip if we already report duplicate default clause
                 if (clause.kind === SyntaxKind.DefaultClause && !hasDuplicateDefaultClause) {
@@ -16605,7 +16605,13 @@ namespace ts {
                     // 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.
-                    const caseType = checkExpression(caseClause.expression);
+                    let caseType = checkExpression(caseClause.expression);
+                    const expressionIsLiteral = isLiteralType(expressionType);
+                    const caseIsLiteral = isLiteralType(caseType);
+                    if (!expressionIsLiteral || !caseIsLiteral) {
+                        expressionType = expressionIsLiteral ? getBaseTypeOfLiteralType(expressionType) : expressionType;
+                        caseType = caseIsLiteral ? getBaseTypeOfLiteralType(caseType) : caseType;
+                    }
                     if (!isTypeEqualityComparableTo(expressionType, caseType)) {
                         // expressionType is not comparable to caseType, try the reversed check and report errors if it fails
                         checkTypeComparableTo(caseType, expressionType, caseClause.expression, /*headMessage*/ undefined);

From 982abc29442fc145e9364aa7fad510c15f1008ac Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Thu, 13 Oct 2016 16:29:35 -0700
Subject: [PATCH 038/421] Add switch comparability test and update baselines

---
 .../switchAssignmentCompat.errors.txt         |  4 +--
 .../switchCaseCircularRefeference.errors.txt  | 10 +++----
 ...itchCasesExpressionTypeMismatch.errors.txt | 17 +++++------
 .../switchComparableCompatForBrands.js        | 29 +++++++++++++++++++
 .../switchComparableCompatForBrands.symbols   | 22 ++++++++++++++
 .../switchComparableCompatForBrands.types     | 26 +++++++++++++++++
 .../switchComparableCompatForBrands.ts        | 13 +++++++++
 7 files changed, 103 insertions(+), 18 deletions(-)
 create mode 100644 tests/baselines/reference/switchComparableCompatForBrands.js
 create mode 100644 tests/baselines/reference/switchComparableCompatForBrands.symbols
 create mode 100644 tests/baselines/reference/switchComparableCompatForBrands.types
 create mode 100644 tests/cases/compiler/switchComparableCompatForBrands.ts

diff --git a/tests/baselines/reference/switchAssignmentCompat.errors.txt b/tests/baselines/reference/switchAssignmentCompat.errors.txt
index 46c89fa5b52..747a1035b68 100644
--- a/tests/baselines/reference/switchAssignmentCompat.errors.txt
+++ b/tests/baselines/reference/switchAssignmentCompat.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/switchAssignmentCompat.ts(4,10): error TS2678: Type 'typeof Foo' is not comparable to type '0'.
+tests/cases/compiler/switchAssignmentCompat.ts(4,10): error TS2678: Type 'typeof Foo' is not comparable to type 'number'.
 
 
 ==== tests/cases/compiler/switchAssignmentCompat.ts (1 errors) ====
@@ -7,6 +7,6 @@ tests/cases/compiler/switchAssignmentCompat.ts(4,10): error TS2678: Type 'typeof
     switch (0) {
         case Foo: break; // Error expected
              ~~~
-!!! error TS2678: Type 'typeof Foo' is not comparable to type '0'.
+!!! error TS2678: Type 'typeof Foo' is not comparable to type 'number'.
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/switchCaseCircularRefeference.errors.txt b/tests/baselines/reference/switchCaseCircularRefeference.errors.txt
index 9ee571de468..bc576f8e723 100644
--- a/tests/baselines/reference/switchCaseCircularRefeference.errors.txt
+++ b/tests/baselines/reference/switchCaseCircularRefeference.errors.txt
@@ -1,6 +1,5 @@
-tests/cases/compiler/switchCaseCircularRefeference.ts(5,10): error TS2678: Type '{ a: "A"; b: any; } | { a: "C"; e: any; }' is not comparable to type '"A" | "C"'.
-  Type '{ a: "C"; e: any; }' is not comparable to type '"A" | "C"'.
-    Type '{ a: "C"; e: any; }' is not comparable to type '"C"'.
+tests/cases/compiler/switchCaseCircularRefeference.ts(5,10): error TS2678: Type '{ a: "A"; b: any; } | { a: "C"; e: any; }' is not comparable to type 'string'.
+  Type '{ a: "C"; e: any; }' is not comparable to type 'string'.
 
 
 ==== tests/cases/compiler/switchCaseCircularRefeference.ts (1 errors) ====
@@ -10,9 +9,8 @@ tests/cases/compiler/switchCaseCircularRefeference.ts(5,10): error TS2678: Type
         switch (x.a) {
         case x:
              ~
-!!! error TS2678: Type '{ a: "A"; b: any; } | { a: "C"; e: any; }' is not comparable to type '"A" | "C"'.
-!!! error TS2678:   Type '{ a: "C"; e: any; }' is not comparable to type '"A" | "C"'.
-!!! error TS2678:     Type '{ a: "C"; e: any; }' is not comparable to type '"C"'.
+!!! error TS2678: Type '{ a: "A"; b: any; } | { a: "C"; e: any; }' is not comparable to type 'string'.
+!!! error TS2678:   Type '{ a: "C"; e: any; }' is not comparable to type 'string'.
             break;
         }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/switchCasesExpressionTypeMismatch.errors.txt b/tests/baselines/reference/switchCasesExpressionTypeMismatch.errors.txt
index 3ea12e2460f..26d39efef48 100644
--- a/tests/baselines/reference/switchCasesExpressionTypeMismatch.errors.txt
+++ b/tests/baselines/reference/switchCasesExpressionTypeMismatch.errors.txt
@@ -1,25 +1,22 @@
-tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(4,10): error TS2678: Type 'typeof Foo' is not comparable to type '0'.
-tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(5,10): error TS2678: Type '"sss"' is not comparable to type '0'.
-tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(6,10): error TS2678: Type '123' is not comparable to type '0'.
-tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(7,10): error TS2678: Type 'true' is not comparable to type '0'.
+tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(4,10): error TS2678: Type 'typeof Foo' is not comparable to type 'number'.
+tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(5,10): error TS2678: Type 'string' is not comparable to type 'number'.
+tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(7,10): error TS2678: Type 'boolean' is not comparable to type 'number'.
 
 
-==== tests/cases/compiler/switchCasesExpressionTypeMismatch.ts (4 errors) ====
+==== tests/cases/compiler/switchCasesExpressionTypeMismatch.ts (3 errors) ====
     class Foo { }
     
     switch (0) {
         case Foo: break;    // Error
              ~~~
-!!! error TS2678: Type 'typeof Foo' is not comparable to type '0'.
+!!! error TS2678: Type 'typeof Foo' is not comparable to type 'number'.
         case "sss": break;  // Error
              ~~~~~
-!!! error TS2678: Type '"sss"' is not comparable to type '0'.
+!!! error TS2678: Type 'string' is not comparable to type 'number'.
         case 123: break;    // No Error
-             ~~~
-!!! error TS2678: Type '123' is not comparable to type '0'.
         case true: break;   // Error
              ~~~~
-!!! error TS2678: Type 'true' is not comparable to type '0'.
+!!! error TS2678: Type 'boolean' is not comparable to type 'number'.
     }
     
     var s: any = 0;
diff --git a/tests/baselines/reference/switchComparableCompatForBrands.js b/tests/baselines/reference/switchComparableCompatForBrands.js
new file mode 100644
index 00000000000..316edfc9c31
--- /dev/null
+++ b/tests/baselines/reference/switchComparableCompatForBrands.js
@@ -0,0 +1,29 @@
+//// [switchComparableCompatForBrands.ts]
+class MyBrand
+{
+    private _a: number;
+}
+
+function test(strInput: string & MyBrand) {
+    switch(strInput)
+    {
+        case "a":
+        return 1;
+    }
+    return 0;
+}
+
+
+//// [switchComparableCompatForBrands.js]
+var MyBrand = (function () {
+    function MyBrand() {
+    }
+    return MyBrand;
+}());
+function test(strInput) {
+    switch (strInput) {
+        case "a":
+            return 1;
+    }
+    return 0;
+}
diff --git a/tests/baselines/reference/switchComparableCompatForBrands.symbols b/tests/baselines/reference/switchComparableCompatForBrands.symbols
new file mode 100644
index 00000000000..adf6a5174ad
--- /dev/null
+++ b/tests/baselines/reference/switchComparableCompatForBrands.symbols
@@ -0,0 +1,22 @@
+=== tests/cases/compiler/switchComparableCompatForBrands.ts ===
+class MyBrand
+>MyBrand : Symbol(MyBrand, Decl(switchComparableCompatForBrands.ts, 0, 0))
+{
+    private _a: number;
+>_a : Symbol(MyBrand._a, Decl(switchComparableCompatForBrands.ts, 1, 1))
+}
+
+function test(strInput: string & MyBrand) {
+>test : Symbol(test, Decl(switchComparableCompatForBrands.ts, 3, 1))
+>strInput : Symbol(strInput, Decl(switchComparableCompatForBrands.ts, 5, 14))
+>MyBrand : Symbol(MyBrand, Decl(switchComparableCompatForBrands.ts, 0, 0))
+
+    switch(strInput)
+>strInput : Symbol(strInput, Decl(switchComparableCompatForBrands.ts, 5, 14))
+    {
+        case "a":
+        return 1;
+    }
+    return 0;
+}
+
diff --git a/tests/baselines/reference/switchComparableCompatForBrands.types b/tests/baselines/reference/switchComparableCompatForBrands.types
new file mode 100644
index 00000000000..5e479ee29dc
--- /dev/null
+++ b/tests/baselines/reference/switchComparableCompatForBrands.types
@@ -0,0 +1,26 @@
+=== tests/cases/compiler/switchComparableCompatForBrands.ts ===
+class MyBrand
+>MyBrand : MyBrand
+{
+    private _a: number;
+>_a : number
+}
+
+function test(strInput: string & MyBrand) {
+>test : (strInput: string & MyBrand) => 1 | 0
+>strInput : string & MyBrand
+>MyBrand : MyBrand
+
+    switch(strInput)
+>strInput : string & MyBrand
+    {
+        case "a":
+>"a" : "a"
+
+        return 1;
+>1 : 1
+    }
+    return 0;
+>0 : 0
+}
+
diff --git a/tests/cases/compiler/switchComparableCompatForBrands.ts b/tests/cases/compiler/switchComparableCompatForBrands.ts
new file mode 100644
index 00000000000..4b90db40e1d
--- /dev/null
+++ b/tests/cases/compiler/switchComparableCompatForBrands.ts
@@ -0,0 +1,13 @@
+class MyBrand
+{
+    private _a: number;
+}
+
+function test(strInput: string & MyBrand) {
+    switch(strInput)
+    {
+        case "a":
+        return 1;
+    }
+    return 0;
+}

From 0168f67f63c1180caca7c1d3500773e64580d952 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Fri, 14 Oct 2016 08:55:01 -0700
Subject: [PATCH 039/421] Push eitherIsNotLiteral check into
 isTypeEqualityComparableTo

Since all callers need this check -- it's how equality is supposed to
work everywhere.
---
 src/compiler/checker.ts | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 6df09cca704..24f71ee41ed 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -13532,6 +13532,12 @@ namespace ts {
         }
 
         function isTypeEqualityComparableTo(source: Type, target: Type) {
+            const sourceIsLiteral = isLiteralType(source);
+            const targetIsLiteral = isLiteralType(target);
+            if (!sourceIsLiteral || !targetIsLiteral) {
+                source = sourceIsLiteral ? getBaseTypeOfLiteralType(source) : source;
+                target = targetIsLiteral ? getBaseTypeOfLiteralType(target) : target;
+            }
             return (target.flags & TypeFlags.Nullable) !== 0 || isTypeComparableTo(source, target);
         }
 
@@ -13672,12 +13678,6 @@ namespace ts {
                 case SyntaxKind.ExclamationEqualsToken:
                 case SyntaxKind.EqualsEqualsEqualsToken:
                 case SyntaxKind.ExclamationEqualsEqualsToken:
-                    const leftIsLiteral = isLiteralType(leftType);
-                    const rightIsLiteral = isLiteralType(rightType);
-                    if (!leftIsLiteral || !rightIsLiteral) {
-                        leftType = leftIsLiteral ? getBaseTypeOfLiteralType(leftType) : leftType;
-                        rightType = rightIsLiteral ? getBaseTypeOfLiteralType(rightType) : rightType;
-                    }
                     if (!isTypeEqualityComparableTo(leftType, rightType) && !isTypeEqualityComparableTo(rightType, leftType)) {
                         reportOperatorError();
                     }
@@ -16584,7 +16584,7 @@ namespace ts {
             let firstDefaultClause: CaseOrDefaultClause;
             let hasDuplicateDefaultClause = false;
 
-            let expressionType = checkExpression(node.expression);
+            const expressionType = checkExpression(node.expression);
             forEach(node.caseBlock.clauses, clause => {
                 // Grammar check for duplicate default clauses, skip if we already report duplicate default clause
                 if (clause.kind === SyntaxKind.DefaultClause && !hasDuplicateDefaultClause) {
@@ -16605,13 +16605,7 @@ namespace ts {
                     // 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.
-                    let caseType = checkExpression(caseClause.expression);
-                    const expressionIsLiteral = isLiteralType(expressionType);
-                    const caseIsLiteral = isLiteralType(caseType);
-                    if (!expressionIsLiteral || !caseIsLiteral) {
-                        expressionType = expressionIsLiteral ? getBaseTypeOfLiteralType(expressionType) : expressionType;
-                        caseType = caseIsLiteral ? getBaseTypeOfLiteralType(caseType) : caseType;
-                    }
+                    const caseType = checkExpression(caseClause.expression);
                     if (!isTypeEqualityComparableTo(expressionType, caseType)) {
                         // expressionType is not comparable to caseType, try the reversed check and report errors if it fails
                         checkTypeComparableTo(caseType, expressionType, caseClause.expression, /*headMessage*/ undefined);

From 83d6abcd9eb829c9ac01376d27741228e09d1ae6 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Fri, 14 Oct 2016 08:59:00 -0700
Subject: [PATCH 040/421] Update baselines

There are more literal types in error messages because error reporting
no longer has the advantage of calls to getBaseLiteralType
---
 tests/baselines/reference/expr.errors.txt       |  8 ++++----
 .../for-inStatementsArrayErrors.errors.txt      |  4 ++--
 ...AssertionsInEqualityComparisons02.errors.txt |  4 ++--
 .../reference/switchAssignmentCompat.errors.txt |  4 ++--
 .../switchCaseCircularRefeference.errors.txt    | 10 ++++++----
 ...switchCasesExpressionTypeMismatch.errors.txt | 17 ++++++++++-------
 .../baselines/reference/symbolType9.errors.txt  | 16 ++++++++--------
 7 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/tests/baselines/reference/expr.errors.txt b/tests/baselines/reference/expr.errors.txt
index 23215cac6ba..52f6f64fef2 100644
--- a/tests/baselines/reference/expr.errors.txt
+++ b/tests/baselines/reference/expr.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/expr.ts(87,5): error TS2365: Operator '==' cannot be applied to types 'number' and 'string'.
-tests/cases/compiler/expr.ts(88,5): error TS2365: Operator '==' cannot be applied to types 'number' and 'boolean'.
+tests/cases/compiler/expr.ts(88,5): error TS2365: Operator '==' cannot be applied to types 'number' and 'false'.
 tests/cases/compiler/expr.ts(94,5): error TS2365: Operator '==' cannot be applied to types 'string' and 'number'.
-tests/cases/compiler/expr.ts(95,5): error TS2365: Operator '==' cannot be applied to types 'string' and 'boolean'.
+tests/cases/compiler/expr.ts(95,5): error TS2365: Operator '==' cannot be applied to types 'string' and 'false'.
 tests/cases/compiler/expr.ts(98,5): error TS2365: Operator '==' cannot be applied to types 'string' and 'E'.
 tests/cases/compiler/expr.ts(115,5): error TS2365: Operator '==' cannot be applied to types 'E' and 'string'.
 tests/cases/compiler/expr.ts(116,5): error TS2365: Operator '==' cannot be applied to types 'E' and 'false'.
@@ -161,7 +161,7 @@ tests/cases/compiler/expr.ts(242,7): error TS2363: The right-hand side of an ari
 !!! error TS2365: Operator '==' cannot be applied to types 'number' and 'string'.
         n==b;
         ~~~~
-!!! error TS2365: Operator '==' cannot be applied to types 'number' and 'boolean'.
+!!! error TS2365: Operator '==' cannot be applied to types 'number' and 'false'.
         n==i;
         n==n;
         n==e;
@@ -172,7 +172,7 @@ tests/cases/compiler/expr.ts(242,7): error TS2363: The right-hand side of an ari
 !!! error TS2365: Operator '==' cannot be applied to types 'string' and 'number'.
         s==b;
         ~~~~
-!!! error TS2365: Operator '==' cannot be applied to types 'string' and 'boolean'.
+!!! error TS2365: Operator '==' cannot be applied to types 'string' and 'false'.
         s==i;
         s==s;
         s==e;
diff --git a/tests/baselines/reference/for-inStatementsArrayErrors.errors.txt b/tests/baselines/reference/for-inStatementsArrayErrors.errors.txt
index 6886d992bb2..e639d8452de 100644
--- a/tests/baselines/reference/for-inStatementsArrayErrors.errors.txt
+++ b/tests/baselines/reference/for-inStatementsArrayErrors.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/conformance/statements/for-inStatements/for-inStatementsArrayErrors.ts(5,14): error TS7015: Element implicitly has an 'any' type because index expression is not of type 'number'.
 tests/cases/conformance/statements/for-inStatements/for-inStatementsArrayErrors.ts(6,16): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-tests/cases/conformance/statements/for-inStatements/for-inStatementsArrayErrors.ts(7,9): error TS2365: Operator '===' cannot be applied to types 'string' and 'number'.
+tests/cases/conformance/statements/for-inStatements/for-inStatementsArrayErrors.ts(7,9): error TS2365: Operator '===' cannot be applied to types 'string' and '1'.
 tests/cases/conformance/statements/for-inStatements/for-inStatementsArrayErrors.ts(9,16): error TS2339: Property 'unknownProperty' does not exist on type 'string'.
 tests/cases/conformance/statements/for-inStatements/for-inStatementsArrayErrors.ts(13,10): error TS2403: Subsequent variable declarations must have the same type.  Variable 'i' must be of type 'number', but here has type 'string'.
 tests/cases/conformance/statements/for-inStatements/for-inStatementsArrayErrors.ts(17,10): error TS2403: Subsequent variable declarations must have the same type.  Variable 'j' must be of type 'any', but here has type 'string'.
@@ -19,7 +19,7 @@ tests/cases/conformance/statements/for-inStatements/for-inStatementsArrayErrors.
 !!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
         if (x === 1) {
             ~~~~~~~
-!!! error TS2365: Operator '===' cannot be applied to types 'string' and 'number'.
+!!! error TS2365: Operator '===' cannot be applied to types 'string' and '1'.
         }
         let a3 = x.unknownProperty;
                    ~~~~~~~~~~~~~~~
diff --git a/tests/baselines/reference/stringLiteralsAssertionsInEqualityComparisons02.errors.txt b/tests/baselines/reference/stringLiteralsAssertionsInEqualityComparisons02.errors.txt
index fd92af4e84f..81adf58dbde 100644
--- a/tests/baselines/reference/stringLiteralsAssertionsInEqualityComparisons02.errors.txt
+++ b/tests/baselines/reference/stringLiteralsAssertionsInEqualityComparisons02.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/types/literal/stringLiteralsAssertionsInEqualityComparisons02.ts(3,9): error TS2365: Operator '===' cannot be applied to types '"foo"' and '"baz"'.
-tests/cases/conformance/types/literal/stringLiteralsAssertionsInEqualityComparisons02.ts(5,9): error TS2365: Operator '==' cannot be applied to types 'string' and 'number'.
+tests/cases/conformance/types/literal/stringLiteralsAssertionsInEqualityComparisons02.ts(5,9): error TS2365: Operator '==' cannot be applied to types '"foo"' and 'number'.
 tests/cases/conformance/types/literal/stringLiteralsAssertionsInEqualityComparisons02.ts(5,19): error TS2352: Type 'string' cannot be converted to type 'number'.
 
 
@@ -12,7 +12,7 @@ tests/cases/conformance/types/literal/stringLiteralsAssertionsInEqualityComparis
     var b = "foo" !== ("bar" as "foo");
     var c = "foo" == (<number>"bar");
             ~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2365: Operator '==' cannot be applied to types 'string' and 'number'.
+!!! error TS2365: Operator '==' cannot be applied to types '"foo"' and 'number'.
                       ~~~~~~~~~~~~~
 !!! error TS2352: Type 'string' cannot be converted to type 'number'.
     var d = "foo" === ("bar" as EnhancedString);
\ No newline at end of file
diff --git a/tests/baselines/reference/switchAssignmentCompat.errors.txt b/tests/baselines/reference/switchAssignmentCompat.errors.txt
index 747a1035b68..46c89fa5b52 100644
--- a/tests/baselines/reference/switchAssignmentCompat.errors.txt
+++ b/tests/baselines/reference/switchAssignmentCompat.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/switchAssignmentCompat.ts(4,10): error TS2678: Type 'typeof Foo' is not comparable to type 'number'.
+tests/cases/compiler/switchAssignmentCompat.ts(4,10): error TS2678: Type 'typeof Foo' is not comparable to type '0'.
 
 
 ==== tests/cases/compiler/switchAssignmentCompat.ts (1 errors) ====
@@ -7,6 +7,6 @@ tests/cases/compiler/switchAssignmentCompat.ts(4,10): error TS2678: Type 'typeof
     switch (0) {
         case Foo: break; // Error expected
              ~~~
-!!! error TS2678: Type 'typeof Foo' is not comparable to type 'number'.
+!!! error TS2678: Type 'typeof Foo' is not comparable to type '0'.
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/switchCaseCircularRefeference.errors.txt b/tests/baselines/reference/switchCaseCircularRefeference.errors.txt
index bc576f8e723..9ee571de468 100644
--- a/tests/baselines/reference/switchCaseCircularRefeference.errors.txt
+++ b/tests/baselines/reference/switchCaseCircularRefeference.errors.txt
@@ -1,5 +1,6 @@
-tests/cases/compiler/switchCaseCircularRefeference.ts(5,10): error TS2678: Type '{ a: "A"; b: any; } | { a: "C"; e: any; }' is not comparable to type 'string'.
-  Type '{ a: "C"; e: any; }' is not comparable to type 'string'.
+tests/cases/compiler/switchCaseCircularRefeference.ts(5,10): error TS2678: Type '{ a: "A"; b: any; } | { a: "C"; e: any; }' is not comparable to type '"A" | "C"'.
+  Type '{ a: "C"; e: any; }' is not comparable to type '"A" | "C"'.
+    Type '{ a: "C"; e: any; }' is not comparable to type '"C"'.
 
 
 ==== tests/cases/compiler/switchCaseCircularRefeference.ts (1 errors) ====
@@ -9,8 +10,9 @@ tests/cases/compiler/switchCaseCircularRefeference.ts(5,10): error TS2678: Type
         switch (x.a) {
         case x:
              ~
-!!! error TS2678: Type '{ a: "A"; b: any; } | { a: "C"; e: any; }' is not comparable to type 'string'.
-!!! error TS2678:   Type '{ a: "C"; e: any; }' is not comparable to type 'string'.
+!!! error TS2678: Type '{ a: "A"; b: any; } | { a: "C"; e: any; }' is not comparable to type '"A" | "C"'.
+!!! error TS2678:   Type '{ a: "C"; e: any; }' is not comparable to type '"A" | "C"'.
+!!! error TS2678:     Type '{ a: "C"; e: any; }' is not comparable to type '"C"'.
             break;
         }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/switchCasesExpressionTypeMismatch.errors.txt b/tests/baselines/reference/switchCasesExpressionTypeMismatch.errors.txt
index 26d39efef48..3ea12e2460f 100644
--- a/tests/baselines/reference/switchCasesExpressionTypeMismatch.errors.txt
+++ b/tests/baselines/reference/switchCasesExpressionTypeMismatch.errors.txt
@@ -1,22 +1,25 @@
-tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(4,10): error TS2678: Type 'typeof Foo' is not comparable to type 'number'.
-tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(5,10): error TS2678: Type 'string' is not comparable to type 'number'.
-tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(7,10): error TS2678: Type 'boolean' is not comparable to type 'number'.
+tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(4,10): error TS2678: Type 'typeof Foo' is not comparable to type '0'.
+tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(5,10): error TS2678: Type '"sss"' is not comparable to type '0'.
+tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(6,10): error TS2678: Type '123' is not comparable to type '0'.
+tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(7,10): error TS2678: Type 'true' is not comparable to type '0'.
 
 
-==== tests/cases/compiler/switchCasesExpressionTypeMismatch.ts (3 errors) ====
+==== tests/cases/compiler/switchCasesExpressionTypeMismatch.ts (4 errors) ====
     class Foo { }
     
     switch (0) {
         case Foo: break;    // Error
              ~~~
-!!! error TS2678: Type 'typeof Foo' is not comparable to type 'number'.
+!!! error TS2678: Type 'typeof Foo' is not comparable to type '0'.
         case "sss": break;  // Error
              ~~~~~
-!!! error TS2678: Type 'string' is not comparable to type 'number'.
+!!! error TS2678: Type '"sss"' is not comparable to type '0'.
         case 123: break;    // No Error
+             ~~~
+!!! error TS2678: Type '123' is not comparable to type '0'.
         case true: break;   // Error
              ~~~~
-!!! error TS2678: Type 'boolean' is not comparable to type 'number'.
+!!! error TS2678: Type 'true' is not comparable to type '0'.
     }
     
     var s: any = 0;
diff --git a/tests/baselines/reference/symbolType9.errors.txt b/tests/baselines/reference/symbolType9.errors.txt
index 5506fdc6f9d..55a766a379e 100644
--- a/tests/baselines/reference/symbolType9.errors.txt
+++ b/tests/baselines/reference/symbolType9.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/Symbols/symbolType9.ts(3,1): error TS2365: Operator '==' cannot be applied to types 'symbol' and 'boolean'.
-tests/cases/conformance/es6/Symbols/symbolType9.ts(5,1): error TS2365: Operator '!=' cannot be applied to types 'number' and 'symbol'.
-tests/cases/conformance/es6/Symbols/symbolType9.ts(7,1): error TS2365: Operator '===' cannot be applied to types 'symbol' and 'number'.
-tests/cases/conformance/es6/Symbols/symbolType9.ts(9,1): error TS2365: Operator '!==' cannot be applied to types 'boolean' and 'symbol'.
+tests/cases/conformance/es6/Symbols/symbolType9.ts(3,1): error TS2365: Operator '==' cannot be applied to types 'symbol' and 'true'.
+tests/cases/conformance/es6/Symbols/symbolType9.ts(5,1): error TS2365: Operator '!=' cannot be applied to types '0' and 'symbol'.
+tests/cases/conformance/es6/Symbols/symbolType9.ts(7,1): error TS2365: Operator '===' cannot be applied to types 'symbol' and '1'.
+tests/cases/conformance/es6/Symbols/symbolType9.ts(9,1): error TS2365: Operator '!==' cannot be applied to types 'false' and 'symbol'.
 
 
 ==== tests/cases/conformance/es6/Symbols/symbolType9.ts (4 errors) ====
@@ -9,16 +9,16 @@ tests/cases/conformance/es6/Symbols/symbolType9.ts(9,1): error TS2365: Operator
     s == s;
     s == true;
     ~~~~~~~~~
-!!! error TS2365: Operator '==' cannot be applied to types 'symbol' and 'boolean'.
+!!! error TS2365: Operator '==' cannot be applied to types 'symbol' and 'true'.
     s != s;
     0 != s;
     ~~~~~~
-!!! error TS2365: Operator '!=' cannot be applied to types 'number' and 'symbol'.
+!!! error TS2365: Operator '!=' cannot be applied to types '0' and 'symbol'.
     s === s;
     s === 1;
     ~~~~~~~
-!!! error TS2365: Operator '===' cannot be applied to types 'symbol' and 'number'.
+!!! error TS2365: Operator '===' cannot be applied to types 'symbol' and '1'.
     s !== s;
     false !== s;
     ~~~~~~~~~~~
-!!! error TS2365: Operator '!==' cannot be applied to types 'boolean' and 'symbol'.
\ No newline at end of file
+!!! error TS2365: Operator '!==' cannot be applied to types 'false' and 'symbol'.
\ No newline at end of file

From 18c692a429421d7231d8a58b784c452e40176d82 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 19 Oct 2016 13:14:06 -0700
Subject: [PATCH 041/421] Remove type inference for spread types

---
 src/compiler/checker.ts | 88 +++++++++++------------------------------
 1 file changed, 23 insertions(+), 65 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 55d4361dc3e..8e196da87de 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -8045,8 +8045,7 @@ namespace ts {
             return !!(type.flags & TypeFlags.TypeParameter ||
                 type.flags & TypeFlags.Reference && forEach((<TypeReference>type).typeArguments, couldContainTypeParameters) ||
                 type.flags & TypeFlags.Anonymous && type.symbol && type.symbol.flags & (SymbolFlags.Method | SymbolFlags.TypeLiteral | SymbolFlags.Class) ||
-                type.flags & TypeFlags.UnionOrIntersection && couldUnionOrIntersectionContainTypeParameters(<UnionOrIntersectionType>type) ||
-                type.flags & TypeFlags.Spread && couldSpreadContainTypeParameters(type as SpreadType));
+                type.flags & TypeFlags.UnionOrIntersection && couldUnionOrIntersectionContainTypeParameters(<UnionOrIntersectionType>type));
         }
 
         function couldUnionOrIntersectionContainTypeParameters(type: UnionOrIntersectionType): boolean {
@@ -8056,11 +8055,6 @@ namespace ts {
             return type.couldContainTypeParameters;
         }
 
-        function couldSpreadContainTypeParameters(type: SpreadType): boolean {
-            return !!(type.right.flags & TypeFlags.TypeParameter ||
-                      type.left.flags & TypeFlags.Spread && (type.left as SpreadType).right.flags & TypeFlags.TypeParameter);
-        }
-
         function isTypeParameterAtTopLevel(type: Type, typeParameter: TypeParameter): boolean {
             return type === typeParameter || type.flags & TypeFlags.UnionOrIntersection && forEach((<UnionOrIntersectionType>type).types, t => isTypeParameterAtTopLevel(t, typeParameter));
         }
@@ -8124,16 +8118,6 @@ namespace ts {
                         target = removeTypesFromUnionOrIntersection(<UnionOrIntersectionType>target, matchingTypes);
                     }
                 }
-                if (source.flags & TypeFlags.Spread && target.flags & TypeFlags.Spread) {
-                    // only the last type parameter is a valid inference site,
-                    // and only if not followed by object literal properties.
-                    if ((source as SpreadType).right.flags & TypeFlags.TypeParameter &&
-                       (target as SpreadType).right.flags & TypeFlags.TypeParameter) {
-                        inferFromTypes((source as SpreadType).right, (target as SpreadType).right);
-                    }
-
-                    return;
-                }
                 if (target.flags & TypeFlags.TypeParameter) {
                     // 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).
@@ -8210,59 +8194,33 @@ namespace ts {
                 else {
                     source = getApparentType(source);
                     if (source.flags & TypeFlags.ObjectType) {
-                        if (target.flags & TypeFlags.Spread) {
-                            // with an object type as source, a spread target infers to its last type parameter it
-                            // contains, after removing any properties from a object type that precedes the type parameter
-                            // Note that the call to `typeDifference` creates a new anonymous type.
-                            const spread = target as SpreadType;
-                            const parameter = spread.right.flags & TypeFlags.TypeParameter ? spread.right : (spread.left as SpreadType).right;
-                            const object = spread.right.flags & TypeFlags.TypeParameter ? emptyObjectType : spread.right as ResolvedType;
-                            inferFromTypes(getTypeDifference(source, object), parameter);
-                            target = object;
+                        if (isInProcess(source, target)) {
+                            return;
                         }
-                        inferFromStructure(source, target);
+                        if (isDeeplyNestedGeneric(source, sourceStack, depth) && isDeeplyNestedGeneric(target, targetStack, depth)) {
+                            return;
+                        }
+                        const key = source.id + "," + target.id;
+                        if (visited[key]) {
+                            return;
+                        }
+                        visited[key] = true;
+                        if (depth === 0) {
+                            sourceStack = [];
+                            targetStack = [];
+                        }
+                        sourceStack[depth] = source;
+                        targetStack[depth] = target;
+                        depth++;
+                        inferFromProperties(source, target);
+                        inferFromSignatures(source, target, SignatureKind.Call);
+                        inferFromSignatures(source, target, SignatureKind.Construct);
+                        inferFromIndexTypes(source, target);
+                        depth--;
                     }
                 }
             }
 
-            function inferFromStructure(source: Type, target: Type) {
-                if (isInProcess(source, target)) {
-                    return;
-                }
-                if (isDeeplyNestedGeneric(source, sourceStack, depth) && isDeeplyNestedGeneric(target, targetStack, depth)) {
-                    return;
-                }
-                const key = source.id + "," + target.id;
-                if (visited[key]) {
-                    return;
-                }
-                visited[key] = true;
-                if (depth === 0) {
-                    sourceStack = [];
-                    targetStack = [];
-                }
-                sourceStack[depth] = source;
-                targetStack[depth] = target;
-                depth++;
-                inferFromProperties(source, target);
-                inferFromSignatures(source, target, SignatureKind.Call);
-                inferFromSignatures(source, target, SignatureKind.Construct);
-                inferFromIndexTypes(source, target);
-                depth--;
-            }
-
-            function getTypeDifference(type: ObjectType, diff: ResolvedType): ResolvedType {
-                const members = createMap<Symbol>();
-                for (const prop of getPropertiesOfObjectType(type)) {
-                    if (!(prop.name in diff.members)) {
-                        members[prop.name] = prop;
-                    }
-                }
-                const stringIndexInfo = getIndexInfoOfType(diff, IndexKind.String) ? undefined : getIndexInfoOfType(type, IndexKind.String);
-                const numberIndexInfo = getIndexInfoOfType(diff, IndexKind.Number) ? undefined : getIndexInfoOfType(type, IndexKind.Number);
-                return createAnonymousType(type.symbol, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
-            }
-
             function inferFromProperties(source: Type, target: Type) {
                 const properties = getPropertiesOfObjectType(target);
                 for (const targetProp of properties) {

From 62c186872d986dabf770dc7877de0f1167537af0 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 19 Oct 2016 13:14:20 -0700
Subject: [PATCH 042/421] Update inference test for spread types

---
 .../reference/objectSpreadInference.js        |  80 +-------
 .../reference/objectSpreadInference.symbols   | 147 +--------------
 .../reference/objectSpreadInference.types     | 178 +-----------------
 .../types/spread/objectSpreadInference.ts     |  46 +----
 4 files changed, 19 insertions(+), 432 deletions(-)

diff --git a/tests/baselines/reference/objectSpreadInference.js b/tests/baselines/reference/objectSpreadInference.js
index 06b17cfa1f9..77930e56511 100644
--- a/tests/baselines/reference/objectSpreadInference.js
+++ b/tests/baselines/reference/objectSpreadInference.js
@@ -12,52 +12,12 @@ function generic<W, X, Y>(w: W, x: X, y: Y) {
 }
 let b: { b: number };
 let c: { c: number };
-// should infer { t: {}, u: { b: number, c: number }, v: number }
+// can only infer { t: {}, u: {}, v: {} }
 let i1 = infer({ ...b, ...c, a: 12 });
-// should infer { t: { a: number, b: number, c: number }, u: {}, v: {} }
+// can only infer { t: {}, u: {}, v: {} }
 let i2 = infer2({ ...b, ...c, a: 12 });
-// should infer { t: {}, u: {}, v: {} }
+// can only infer { t: {}, u: {}, v: {} }
 let i3 = generic(b, c, { a: 12 });
-
-interface Preserved {
-    kind: 0 | 1 | 2 | 3;
-}
-class C implements Preserved {
-    kind: 0 = 0;
-    a = 1;
-    method() { return "C"; }
-}
-declare function revive<T extends Preserved>(t: { ...T }): T;
-function genericRevive<U extends Preserved>(u: U) {
-    let us: { ...U };
-    return revive(us);
-}
-// result should not have `method`
-let result = revive({ a: 12, kind: 0 });
-// result2 should be of type C and have `method`
-let result2 = revive<C>({ a: 12, kind: 0 });
-
-declare function destructureRevive<T extends Preserved>(t: { ...T, a: number }): T;
-function genericDestructureRevive<U extends Preserved & { a: number }>(u: U) {
-    let us: { ...U };
-    return destructureRevive(us);
-}
-// result3 is just `Preserved` because `a` and `method` both get removed
-let result3 = destructureRevive({ a: 12, kind: 0 });
-// result4 is still C -- a is not removed -- because we specified the argument explicitly
-let result4 = destructureRevive<C>({ a: 12, kind: 0 });
-result4.method();
-result4.a;
-
-declare function removeIndexSignature<T>(t: { ...T, a: number, [s: string]: number, [n: number]: number }): T;
-interface I {
-    a: number;
-    b: number;
-    [s: string]: number;
-    [n: number]: number;
-}
-let i: I;
-let result5 = removeIndexSignature(i);
 
 
 //// [objectSpreadInference.js]
@@ -75,37 +35,9 @@ function generic(w, x, y) {
 }
 var b;
 var c;
-// should infer { t: {}, u: { b: number, c: number }, v: number }
+// can only infer { t: {}, u: {}, v: {} }
 var i1 = infer(__assign({}, b, c, { a: 12 }));
-// should infer { t: { a: number, b: number, c: number }, u: {}, v: {} }
+// can only infer { t: {}, u: {}, v: {} }
 var i2 = infer2(__assign({}, b, c, { a: 12 }));
-// should infer { t: {}, u: {}, v: {} }
+// can only infer { t: {}, u: {}, v: {} }
 var i3 = generic(b, c, { a: 12 });
-var C = (function () {
-    function C() {
-        this.kind = 0;
-        this.a = 1;
-    }
-    C.prototype.method = function () { return "C"; };
-    return C;
-}());
-function genericRevive(u) {
-    var us;
-    return revive(us);
-}
-// result should not have `method`
-var result = revive({ a: 12, kind: 0 });
-// result2 should be of type C and have `method`
-var result2 = revive({ a: 12, kind: 0 });
-function genericDestructureRevive(u) {
-    var us;
-    return destructureRevive(us);
-}
-// result3 is just `Preserved` because `a` and `method` both get removed
-var result3 = destructureRevive({ a: 12, kind: 0 });
-// result4 is still C -- a is not removed -- because we specified the argument explicitly
-var result4 = destructureRevive({ a: 12, kind: 0 });
-result4.method();
-result4.a;
-var i;
-var result5 = removeIndexSignature(i);
diff --git a/tests/baselines/reference/objectSpreadInference.symbols b/tests/baselines/reference/objectSpreadInference.symbols
index f03cd6b44e1..ddecc4d7e5d 100644
--- a/tests/baselines/reference/objectSpreadInference.symbols
+++ b/tests/baselines/reference/objectSpreadInference.symbols
@@ -78,19 +78,19 @@ let c: { c: number };
 >c : Symbol(c, Decl(objectSpreadInference.ts, 12, 3))
 >c : Symbol(c, Decl(objectSpreadInference.ts, 12, 8))
 
-// should infer { t: {}, u: { b: number, c: number }, v: number }
+// can only infer { t: {}, u: {}, v: {} }
 let i1 = infer({ ...b, ...c, a: 12 });
 >i1 : Symbol(i1, Decl(objectSpreadInference.ts, 14, 3))
 >infer : Symbol(infer, Decl(objectSpreadInference.ts, 4, 1))
 >a : Symbol(a, Decl(objectSpreadInference.ts, 14, 28))
 
-// should infer { t: { a: number, b: number, c: number }, u: {}, v: {} }
+// can only infer { t: {}, u: {}, v: {} }
 let i2 = infer2({ ...b, ...c, a: 12 });
 >i2 : Symbol(i2, Decl(objectSpreadInference.ts, 16, 3))
 >infer2 : Symbol(infer2, Decl(objectSpreadInference.ts, 5, 79))
 >a : Symbol(a, Decl(objectSpreadInference.ts, 16, 29))
 
-// should infer { t: {}, u: {}, v: {} }
+// can only infer { t: {}, u: {}, v: {} }
 let i3 = generic(b, c, { a: 12 });
 >i3 : Symbol(i3, Decl(objectSpreadInference.ts, 18, 3))
 >generic : Symbol(generic, Decl(objectSpreadInference.ts, 6, 80))
@@ -98,144 +98,3 @@ let i3 = generic(b, c, { a: 12 });
 >c : Symbol(c, Decl(objectSpreadInference.ts, 12, 3))
 >a : Symbol(a, Decl(objectSpreadInference.ts, 18, 24))
 
-interface Preserved {
->Preserved : Symbol(Preserved, Decl(objectSpreadInference.ts, 18, 34))
-
-    kind: 0 | 1 | 2 | 3;
->kind : Symbol(Preserved.kind, Decl(objectSpreadInference.ts, 20, 21))
-}
-class C implements Preserved {
->C : Symbol(C, Decl(objectSpreadInference.ts, 22, 1))
->Preserved : Symbol(Preserved, Decl(objectSpreadInference.ts, 18, 34))
-
-    kind: 0 = 0;
->kind : Symbol(C.kind, Decl(objectSpreadInference.ts, 23, 30))
-
-    a = 1;
->a : Symbol(C.a, Decl(objectSpreadInference.ts, 24, 16))
-
-    method() { return "C"; }
->method : Symbol(C.method, Decl(objectSpreadInference.ts, 25, 10))
-}
-declare function revive<T extends Preserved>(t: { ...T }): T;
->revive : Symbol(revive, Decl(objectSpreadInference.ts, 27, 1))
->T : Symbol(T, Decl(objectSpreadInference.ts, 28, 24))
->Preserved : Symbol(Preserved, Decl(objectSpreadInference.ts, 18, 34))
->t : Symbol(t, Decl(objectSpreadInference.ts, 28, 45))
->T : Symbol(T, Decl(objectSpreadInference.ts, 28, 24))
->T : Symbol(T, Decl(objectSpreadInference.ts, 28, 24))
-
-function genericRevive<U extends Preserved>(u: U) {
->genericRevive : Symbol(genericRevive, Decl(objectSpreadInference.ts, 28, 61))
->U : Symbol(U, Decl(objectSpreadInference.ts, 29, 23))
->Preserved : Symbol(Preserved, Decl(objectSpreadInference.ts, 18, 34))
->u : Symbol(u, Decl(objectSpreadInference.ts, 29, 44))
->U : Symbol(U, Decl(objectSpreadInference.ts, 29, 23))
-
-    let us: { ...U };
->us : Symbol(us, Decl(objectSpreadInference.ts, 30, 7))
->U : Symbol(U, Decl(objectSpreadInference.ts, 29, 23))
-
-    return revive(us);
->revive : Symbol(revive, Decl(objectSpreadInference.ts, 27, 1))
->us : Symbol(us, Decl(objectSpreadInference.ts, 30, 7))
-}
-// result should not have `method`
-let result = revive({ a: 12, kind: 0 });
->result : Symbol(result, Decl(objectSpreadInference.ts, 34, 3))
->revive : Symbol(revive, Decl(objectSpreadInference.ts, 27, 1))
->a : Symbol(a, Decl(objectSpreadInference.ts, 34, 21))
->kind : Symbol(kind, Decl(objectSpreadInference.ts, 34, 28))
-
-// result2 should be of type C and have `method`
-let result2 = revive<C>({ a: 12, kind: 0 });
->result2 : Symbol(result2, Decl(objectSpreadInference.ts, 36, 3))
->revive : Symbol(revive, Decl(objectSpreadInference.ts, 27, 1))
->C : Symbol(C, Decl(objectSpreadInference.ts, 22, 1))
->a : Symbol(a, Decl(objectSpreadInference.ts, 36, 25))
->kind : Symbol(kind, Decl(objectSpreadInference.ts, 36, 32))
-
-declare function destructureRevive<T extends Preserved>(t: { ...T, a: number }): T;
->destructureRevive : Symbol(destructureRevive, Decl(objectSpreadInference.ts, 36, 44))
->T : Symbol(T, Decl(objectSpreadInference.ts, 38, 35))
->Preserved : Symbol(Preserved, Decl(objectSpreadInference.ts, 18, 34))
->t : Symbol(t, Decl(objectSpreadInference.ts, 38, 56))
->T : Symbol(T, Decl(objectSpreadInference.ts, 38, 35))
->a : Symbol(a, Decl(objectSpreadInference.ts, 38, 66))
->T : Symbol(T, Decl(objectSpreadInference.ts, 38, 35))
-
-function genericDestructureRevive<U extends Preserved & { a: number }>(u: U) {
->genericDestructureRevive : Symbol(genericDestructureRevive, Decl(objectSpreadInference.ts, 38, 83))
->U : Symbol(U, Decl(objectSpreadInference.ts, 39, 34))
->Preserved : Symbol(Preserved, Decl(objectSpreadInference.ts, 18, 34))
->a : Symbol(a, Decl(objectSpreadInference.ts, 39, 57))
->u : Symbol(u, Decl(objectSpreadInference.ts, 39, 71))
->U : Symbol(U, Decl(objectSpreadInference.ts, 39, 34))
-
-    let us: { ...U };
->us : Symbol(us, Decl(objectSpreadInference.ts, 40, 7))
->U : Symbol(U, Decl(objectSpreadInference.ts, 39, 34))
-
-    return destructureRevive(us);
->destructureRevive : Symbol(destructureRevive, Decl(objectSpreadInference.ts, 36, 44))
->us : Symbol(us, Decl(objectSpreadInference.ts, 40, 7))
-}
-// result3 is just `Preserved` because `a` and `method` both get removed
-let result3 = destructureRevive({ a: 12, kind: 0 });
->result3 : Symbol(result3, Decl(objectSpreadInference.ts, 44, 3))
->destructureRevive : Symbol(destructureRevive, Decl(objectSpreadInference.ts, 36, 44))
->a : Symbol(a, Decl(objectSpreadInference.ts, 44, 33))
->kind : Symbol(kind, Decl(objectSpreadInference.ts, 44, 40))
-
-// result4 is still C -- a is not removed -- because we specified the argument explicitly
-let result4 = destructureRevive<C>({ a: 12, kind: 0 });
->result4 : Symbol(result4, Decl(objectSpreadInference.ts, 46, 3))
->destructureRevive : Symbol(destructureRevive, Decl(objectSpreadInference.ts, 36, 44))
->C : Symbol(C, Decl(objectSpreadInference.ts, 22, 1))
->a : Symbol(a, Decl(objectSpreadInference.ts, 46, 36))
->kind : Symbol(kind, Decl(objectSpreadInference.ts, 46, 43))
-
-result4.method();
->result4.method : Symbol(C.method, Decl(objectSpreadInference.ts, 25, 10))
->result4 : Symbol(result4, Decl(objectSpreadInference.ts, 46, 3))
->method : Symbol(C.method, Decl(objectSpreadInference.ts, 25, 10))
-
-result4.a;
->result4.a : Symbol(C.a, Decl(objectSpreadInference.ts, 24, 16))
->result4 : Symbol(result4, Decl(objectSpreadInference.ts, 46, 3))
->a : Symbol(C.a, Decl(objectSpreadInference.ts, 24, 16))
-
-declare function removeIndexSignature<T>(t: { ...T, a: number, [s: string]: number, [n: number]: number }): T;
->removeIndexSignature : Symbol(removeIndexSignature, Decl(objectSpreadInference.ts, 48, 10))
->T : Symbol(T, Decl(objectSpreadInference.ts, 50, 38))
->t : Symbol(t, Decl(objectSpreadInference.ts, 50, 41))
->T : Symbol(T, Decl(objectSpreadInference.ts, 50, 38))
->a : Symbol(a, Decl(objectSpreadInference.ts, 50, 51))
->s : Symbol(s, Decl(objectSpreadInference.ts, 50, 64))
->n : Symbol(n, Decl(objectSpreadInference.ts, 50, 85))
->T : Symbol(T, Decl(objectSpreadInference.ts, 50, 38))
-
-interface I {
->I : Symbol(I, Decl(objectSpreadInference.ts, 50, 110))
-
-    a: number;
->a : Symbol(I.a, Decl(objectSpreadInference.ts, 51, 13))
-
-    b: number;
->b : Symbol(I.b, Decl(objectSpreadInference.ts, 52, 14))
-
-    [s: string]: number;
->s : Symbol(s, Decl(objectSpreadInference.ts, 54, 5))
-
-    [n: number]: number;
->n : Symbol(n, Decl(objectSpreadInference.ts, 55, 5))
-}
-let i: I;
->i : Symbol(i, Decl(objectSpreadInference.ts, 57, 3))
->I : Symbol(I, Decl(objectSpreadInference.ts, 50, 110))
-
-let result5 = removeIndexSignature(i);
->result5 : Symbol(result5, Decl(objectSpreadInference.ts, 58, 3))
->removeIndexSignature : Symbol(removeIndexSignature, Decl(objectSpreadInference.ts, 48, 10))
->i : Symbol(i, Decl(objectSpreadInference.ts, 57, 3))
-
diff --git a/tests/baselines/reference/objectSpreadInference.types b/tests/baselines/reference/objectSpreadInference.types
index 55303119932..3e71e29b83c 100644
--- a/tests/baselines/reference/objectSpreadInference.types
+++ b/tests/baselines/reference/objectSpreadInference.types
@@ -83,10 +83,10 @@ let c: { c: number };
 >c : { c: number; }
 >c : number
 
-// should infer { t: {}, u: { b: number, c: number }, v: number }
+// can only infer { t: {}, u: {}, v: {} }
 let i1 = infer({ ...b, ...c, a: 12 });
->i1 : { t: {}; u: { c: number; b: number; }; v: number; }
->infer({ ...b, ...c, a: 12 }) : { t: {}; u: { c: number; b: number; }; v: number; }
+>i1 : { t: {}; u: {}; v: {}; }
+>infer({ ...b, ...c, a: 12 }) : { t: {}; u: {}; v: {}; }
 >infer : <T, U, V>(tuv: { ...T; ...U; a: V; }) => { t: T; u: U; v: V; }
 >{ ...b, ...c, a: 12 } : { a: number; c: number; b: number; }
 >b : any
@@ -94,10 +94,10 @@ let i1 = infer({ ...b, ...c, a: 12 });
 >a : number
 >12 : 12
 
-// should infer { t: { a: number, b: number, c: number }, u: {}, v: {} }
+// can only infer { t: {}, u: {}, v: {} }
 let i2 = infer2({ ...b, ...c, a: 12 });
->i2 : { t: { a: number; c: number; b: number; }; u: {}; v: {}; }
->infer2({ ...b, ...c, a: 12 }) : { t: { a: number; c: number; b: number; }; u: {}; v: {}; }
+>i2 : { t: {}; u: {}; v: {}; }
+>infer2({ ...b, ...c, a: 12 }) : { t: {}; u: {}; v: {}; }
 >infer2 : <T, U, V>(utv: { ...U; a: V; ...T }) => { t: T; u: U; v: V; }
 >{ ...b, ...c, a: 12 } : { a: number; c: number; b: number; }
 >b : any
@@ -105,7 +105,7 @@ let i2 = infer2({ ...b, ...c, a: 12 });
 >a : number
 >12 : 12
 
-// should infer { t: {}, u: {}, v: {} }
+// can only infer { t: {}, u: {}, v: {} }
 let i3 = generic(b, c, { a: 12 });
 >i3 : { t: {}; u: {}; v: {}; }
 >generic(b, c, { a: 12 }) : { t: {}; u: {}; v: {}; }
@@ -116,167 +116,3 @@ let i3 = generic(b, c, { a: 12 });
 >a : number
 >12 : 12
 
-interface Preserved {
->Preserved : Preserved
-
-    kind: 0 | 1 | 2 | 3;
->kind : 0 | 1 | 2 | 3
-}
-class C implements Preserved {
->C : C
->Preserved : Preserved
-
-    kind: 0 = 0;
->kind : 0
->0 : 0
-
-    a = 1;
->a : number
->1 : 1
-
-    method() { return "C"; }
->method : () => string
->"C" : "C"
-}
-declare function revive<T extends Preserved>(t: { ...T }): T;
->revive : <T extends Preserved>(t: { ...T }) => T
->T : T
->Preserved : Preserved
->t : { ...T }
->T : T
->T : T
-
-function genericRevive<U extends Preserved>(u: U) {
->genericRevive : <U extends Preserved>(u: U) => U
->U : U
->Preserved : Preserved
->u : U
->U : U
-
-    let us: { ...U };
->us : { ...U }
->U : U
-
-    return revive(us);
->revive(us) : U
->revive : <T extends Preserved>(t: { ...T }) => T
->us : { ...U }
-}
-// result should not have `method`
-let result = revive({ a: 12, kind: 0 });
->result : { a: number; kind: 0; }
->revive({ a: 12, kind: 0 }) : { a: number; kind: 0; }
->revive : <T extends Preserved>(t: { ...T }) => T
->{ a: 12, kind: 0 } : { a: number; kind: 0; }
->a : number
->12 : 12
->kind : number
->0 : 0
-
-// result2 should be of type C and have `method`
-let result2 = revive<C>({ a: 12, kind: 0 });
->result2 : C
->revive<C>({ a: 12, kind: 0 }) : C
->revive : <T extends Preserved>(t: { ...T }) => T
->C : C
->{ a: 12, kind: 0 } : { a: number; kind: 0; }
->a : number
->12 : 12
->kind : number
->0 : 0
-
-declare function destructureRevive<T extends Preserved>(t: { ...T, a: number }): T;
->destructureRevive : <T extends Preserved>(t: { ...T; a: number; }) => T
->T : T
->Preserved : Preserved
->t : { ...T; a: number; }
->T : T
->a : number
->T : T
-
-function genericDestructureRevive<U extends Preserved & { a: number }>(u: U) {
->genericDestructureRevive : <U extends Preserved & { a: number; }>(u: U) => Preserved
->U : U
->Preserved : Preserved
->a : number
->u : U
->U : U
-
-    let us: { ...U };
->us : { ...U }
->U : U
-
-    return destructureRevive(us);
->destructureRevive(us) : Preserved
->destructureRevive : <T extends Preserved>(t: { ...T; a: number; }) => T
->us : { ...U }
-}
-// result3 is just `Preserved` because `a` and `method` both get removed
-let result3 = destructureRevive({ a: 12, kind: 0 });
->result3 : { kind: 0; }
->destructureRevive({ a: 12, kind: 0 }) : { kind: 0; }
->destructureRevive : <T extends Preserved>(t: { ...T; a: number; }) => T
->{ a: 12, kind: 0 } : { a: number; kind: 0; }
->a : number
->12 : 12
->kind : number
->0 : 0
-
-// result4 is still C -- a is not removed -- because we specified the argument explicitly
-let result4 = destructureRevive<C>({ a: 12, kind: 0 });
->result4 : C
->destructureRevive<C>({ a: 12, kind: 0 }) : C
->destructureRevive : <T extends Preserved>(t: { ...T; a: number; }) => T
->C : C
->{ a: 12, kind: 0 } : { a: number; kind: 0; }
->a : number
->12 : 12
->kind : number
->0 : 0
-
-result4.method();
->result4.method() : string
->result4.method : () => string
->result4 : C
->method : () => string
-
-result4.a;
->result4.a : number
->result4 : C
->a : number
-
-declare function removeIndexSignature<T>(t: { ...T, a: number, [s: string]: number, [n: number]: number }): T;
->removeIndexSignature : <T>(t: { ...T; [s: string]: number; [n: number]: number; a: number; }) => T
->T : T
->t : { ...T; [s: string]: number; [n: number]: number; a: number; }
->T : T
->a : number
->s : string
->n : number
->T : T
-
-interface I {
->I : I
-
-    a: number;
->a : number
-
-    b: number;
->b : number
-
-    [s: string]: number;
->s : string
-
-    [n: number]: number;
->n : number
-}
-let i: I;
->i : I
->I : I
-
-let result5 = removeIndexSignature(i);
->result5 : { b: number; }
->removeIndexSignature(i) : { b: number; }
->removeIndexSignature : <T>(t: { ...T; [s: string]: number; [n: number]: number; a: number; }) => T
->i : I
-
diff --git a/tests/cases/conformance/types/spread/objectSpreadInference.ts b/tests/cases/conformance/types/spread/objectSpreadInference.ts
index 19841932419..9608f0a16cb 100644
--- a/tests/cases/conformance/types/spread/objectSpreadInference.ts
+++ b/tests/cases/conformance/types/spread/objectSpreadInference.ts
@@ -11,49 +11,9 @@ function generic<W, X, Y>(w: W, x: X, y: Y) {
 }
 let b: { b: number };
 let c: { c: number };
-// should infer { t: {}, u: { b: number, c: number }, v: number }
+// can only infer { t: {}, u: {}, v: {} }
 let i1 = infer({ ...b, ...c, a: 12 });
-// should infer { t: { a: number, b: number, c: number }, u: {}, v: {} }
+// can only infer { t: {}, u: {}, v: {} }
 let i2 = infer2({ ...b, ...c, a: 12 });
-// should infer { t: {}, u: {}, v: {} }
+// can only infer { t: {}, u: {}, v: {} }
 let i3 = generic(b, c, { a: 12 });
-
-interface Preserved {
-    kind: 0 | 1 | 2 | 3;
-}
-class C implements Preserved {
-    kind: 0 = 0;
-    a = 1;
-    method() { return "C"; }
-}
-declare function revive<T extends Preserved>(t: { ...T }): T;
-function genericRevive<U extends Preserved>(u: U) {
-    let us: { ...U };
-    return revive(us);
-}
-// result should not have `method`
-let result = revive({ a: 12, kind: 0 });
-// result2 should be of type C and have `method`
-let result2 = revive<C>({ a: 12, kind: 0 });
-
-declare function destructureRevive<T extends Preserved>(t: { ...T, a: number }): T;
-function genericDestructureRevive<U extends Preserved & { a: number }>(u: U) {
-    let us: { ...U };
-    return destructureRevive(us);
-}
-// result3 is just `Preserved` because `a` and `method` both get removed
-let result3 = destructureRevive({ a: 12, kind: 0 });
-// result4 is still C -- a is not removed -- because we specified the argument explicitly
-let result4 = destructureRevive<C>({ a: 12, kind: 0 });
-result4.method();
-result4.a;
-
-declare function removeIndexSignature<T>(t: { ...T, a: number, [s: string]: number, [n: number]: number }): T;
-interface I {
-    a: number;
-    b: number;
-    [s: string]: number;
-    [n: number]: number;
-}
-let i: I;
-let result5 = removeIndexSignature(i);

From a90905358d5baf6224392bac9ba62394e102d07e Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 19 Oct 2016 15:04:30 -0700
Subject: [PATCH 043/421] Make spread assignability and apparent type stricter

Assignability now does not allow properties to the left of a type
parameter.
Apparent type now only returns the apparent type of the right-most
spread member.
---
 src/compiler/checker.ts | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 8e196da87de..e3651f6cf30 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -4515,7 +4515,7 @@ namespace ts {
         }
 
         function getApparentTypeOfSpread(type: SpreadType) {
-            return getSpreadType([getApparentType(type.left), getApparentType(type.right)], type.symbol);
+            return getApparentType(type.right);
         }
 
         /**
@@ -5837,9 +5837,8 @@ namespace ts {
                 left.flags & TypeFlags.Spread &&
                 (left as SpreadType).right.flags & TypeFlags.ObjectType) {
                 // simplify two adjacent object types: T ... { x } ... { y } becomes T ... { x, y }
-                // Note: left.left is always a spread type. Can we use this fact to avoid calling getSpreadType again?
-                return getSpreadType([getSpreadType([right, (left as SpreadType).right], symbol, aliasSymbol, aliasTypeArguments),
-                                      (left as SpreadType).left], symbol, aliasSymbol, aliasTypeArguments);
+                const simplified = getSpreadType([right, (left as SpreadType).right], symbol, aliasSymbol, aliasTypeArguments);
+                return getSpreadType([(left as SpreadType).left, simplified], symbol, aliasSymbol, aliasTypeArguments);
             }
             if (left.flags & TypeFlags.Intersection) {
                 const spreads = map((left as IntersectionType).types,
@@ -6872,7 +6871,7 @@ namespace ts {
 
                 if (source.flags & TypeFlags.Spread && target.flags & TypeFlags.Spread) {
                     // you only see this for spreads with type parameters
-                    if (!(spreadTypeRelatedTo(source as SpreadType, target as SpreadType))) {
+                    if (!(spreadTypeRelatedTo(source as SpreadType, target as SpreadType, /*atRightEdge*/ true))) {
                         if (reportErrors) {
                             reportRelationError(headMessage, source, target);
                         }
@@ -6945,13 +6944,14 @@ namespace ts {
                 return Ternary.False;
             }
 
-            function spreadTypeRelatedTo(source: SpreadType, target: SpreadType): boolean {
+            function spreadTypeRelatedTo(source: SpreadType, target: SpreadType, atRightEdge?: boolean): boolean {
                 // If the right side of a spread type is ObjectType, then the left side must be a Spread.
                 // Structural compatibility of the spreads' object types are checked separately in isRelatedTo,
                 // so just skip them for now.
                 if (source.right.flags & TypeFlags.ObjectType || target.right.flags & TypeFlags.ObjectType) {
-                    return spreadTypeRelatedTo(source.right.flags & TypeFlags.ObjectType ? source.left as SpreadType : source,
-                                               target.right.flags & TypeFlags.ObjectType ? target.left as SpreadType : target);
+                    return atRightEdge &&
+                        spreadTypeRelatedTo(source.right.flags & TypeFlags.ObjectType ? source.left as SpreadType : source,
+                                            target.right.flags & TypeFlags.ObjectType ? target.left as SpreadType : target);
                 }
                 // If both right sides are type parameters, then they must be identical for the spread types to be related.
                 // It also means that the left sides are either spread types or object types.
@@ -6964,9 +6964,9 @@ namespace ts {
                     // If the left sides are both spread types, then recursively check them.
                     return spreadTypeRelatedTo(source.left as SpreadType, target.left as SpreadType);
                 }
-                // If the left sides are both object types, then isRelatedTo will check the structural compatibility next.
-                // Otherwise, one side has more type parameters than the other and the spread types are not related.
-                return !!(source.left.flags & TypeFlags.ObjectType && target.left.flags & TypeFlags.ObjectType);
+                // If the left sides are both object types, then we should be at the end and both should be emptyObjectType.
+                // If not, we can't know what properties might have been overwritten, so fail.
+                return source.left === emptyObjectType && target.left === emptyObjectType;
             }
 
             function isIdenticalTo(source: Type, target: Type): Ternary {

From ad10ec56c1214ee5a52f1de3f2dce00f0ca3d025 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 19 Oct 2016 15:05:42 -0700
Subject: [PATCH 044/421] Update tests w/spread assignability+apparent type

---
 tests/baselines/reference/objectSpread.js     |  8 +-
 .../baselines/reference/objectSpread.symbols  | 16 +--
 tests/baselines/reference/objectSpread.types  | 40 ++++----
 .../reference/objectSpreadGeneric.errors.txt  | 49 ++++++----
 .../reference/objectSpreadGeneric.js          | 36 ++++---
 .../reference/objectSpreadIntersection.js     | 32 +++---
 .../objectSpreadIntersection.symbols          | 70 ++++++-------
 .../reference/objectSpreadIntersection.types  | 98 +++++++++----------
 .../baselines/reference/objectSpreadUnion.js  | 16 +--
 .../reference/objectSpreadUnion.symbols       | 34 +++----
 .../reference/objectSpreadUnion.types         | 48 ++++-----
 .../conformance/types/spread/objectSpread.ts  |  6 +-
 .../types/spread/objectSpreadGeneric.ts       | 18 ++--
 .../types/spread/objectSpreadIntersection.ts  | 24 ++---
 .../types/spread/objectSpreadUnion.ts         | 12 +--
 15 files changed, 262 insertions(+), 245 deletions(-)

diff --git a/tests/baselines/reference/objectSpread.js b/tests/baselines/reference/objectSpread.js
index efb73bcb353..359284f9c6c 100644
--- a/tests/baselines/reference/objectSpread.js
+++ b/tests/baselines/reference/objectSpread.js
@@ -83,8 +83,8 @@ let a = 12;
 let shortCutted: { a: number, b: string } = { ...o, a }
 
 // generics
-function f<T, U>(t: T, u: U): { id: string, ...T, ...U } {
-    return { id: 'id', ...t, ...u };
+function f<T, U>(t: T, u: U): { ...T, ...U, id: string } {
+    return { ...t, ...u, id: 'id' };
 }
 let exclusive: { id: string, a: number, b: string, c: string, d: boolean } =
     f({ a: 1, b: 'yes' }, { c: 'no', d: false })
@@ -92,7 +92,7 @@ let overlap: { id: string, a: number, b: string } =
     f({ a: 1 }, { a: 2, b: 'extra' })
 let overlapConflict: { id:string, a: string } =
     f({ a: 1 }, { a: 'mismatch' })
-let overwriteId: { id: boolean, a: number, c: number, d: string } =
+let overwriteId: { id: string, a: number, c: number, d: string } =
     f({ a: 1, id: true }, { c: 1, d: 'no' })
 
 class D { m() { }; q = 2; }
@@ -172,7 +172,7 @@ var a = 12;
 var shortCutted = __assign({}, o, { a: a });
 // generics
 function f(t, u) {
-    return __assign({ id: 'id' }, t, u);
+    return __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' });
diff --git a/tests/baselines/reference/objectSpread.symbols b/tests/baselines/reference/objectSpread.symbols
index d23016ddb1e..fb7a1e22b33 100644
--- a/tests/baselines/reference/objectSpread.symbols
+++ b/tests/baselines/reference/objectSpread.symbols
@@ -290,7 +290,7 @@ let shortCutted: { a: number, b: string } = { ...o, a }
 >a : Symbol(a, Decl(objectSpread.ts, 81, 51))
 
 // generics
-function f<T, U>(t: T, u: U): { id: string, ...T, ...U } {
+function f<T, U>(t: T, u: U): { ...T, ...U, id: string } {
 >f : Symbol(f, Decl(objectSpread.ts, 81, 55))
 >T : Symbol(T, Decl(objectSpread.ts, 84, 11))
 >U : Symbol(U, Decl(objectSpread.ts, 84, 13))
@@ -298,12 +298,12 @@ function f<T, U>(t: T, u: U): { id: string, ...T, ...U } {
 >T : Symbol(T, Decl(objectSpread.ts, 84, 11))
 >u : Symbol(u, Decl(objectSpread.ts, 84, 22))
 >U : Symbol(U, Decl(objectSpread.ts, 84, 13))
->id : Symbol(id, Decl(objectSpread.ts, 84, 31))
 >T : Symbol(T, Decl(objectSpread.ts, 84, 11))
 >U : Symbol(U, Decl(objectSpread.ts, 84, 13))
+>id : Symbol(id, Decl(objectSpread.ts, 84, 43))
 
-    return { id: 'id', ...t, ...u };
->id : Symbol(id, Decl(objectSpread.ts, 85, 12))
+    return { ...t, ...u, id: 'id' };
+>id : Symbol(id, Decl(objectSpread.ts, 85, 24))
 }
 let exclusive: { id: string, a: number, b: string, c: string, d: boolean } =
 >exclusive : Symbol(exclusive, Decl(objectSpread.ts, 87, 3))
@@ -342,12 +342,12 @@ let overlapConflict: { id:string, a: string } =
 >a : Symbol(a, Decl(objectSpread.ts, 92, 7))
 >a : Symbol(a, Decl(objectSpread.ts, 92, 17))
 
-let overwriteId: { id: boolean, a: number, c: number, d: string } =
+let overwriteId: { id: string, a: number, c: number, d: string } =
 >overwriteId : Symbol(overwriteId, Decl(objectSpread.ts, 93, 3))
 >id : Symbol(id, Decl(objectSpread.ts, 93, 18))
->a : Symbol(a, Decl(objectSpread.ts, 93, 31))
->c : Symbol(c, Decl(objectSpread.ts, 93, 42))
->d : Symbol(d, Decl(objectSpread.ts, 93, 53))
+>a : Symbol(a, Decl(objectSpread.ts, 93, 30))
+>c : Symbol(c, Decl(objectSpread.ts, 93, 41))
+>d : Symbol(d, Decl(objectSpread.ts, 93, 52))
 
     f({ a: 1, id: true }, { c: 1, d: 'no' })
 >f : Symbol(f, Decl(objectSpread.ts, 81, 55))
diff --git a/tests/baselines/reference/objectSpread.types b/tests/baselines/reference/objectSpread.types
index efab098fd6e..b6fcb9150bf 100644
--- a/tests/baselines/reference/objectSpread.types
+++ b/tests/baselines/reference/objectSpread.types
@@ -423,24 +423,24 @@ let shortCutted: { a: number, b: string } = { ...o, a }
 >a : number
 
 // generics
-function f<T, U>(t: T, u: U): { id: string, ...T, ...U } {
->f : <T, U>(t: T, u: U) => { id: string; ...T; ...U }
+function f<T, U>(t: T, u: U): { ...T, ...U, id: string } {
+>f : <T, U>(t: T, u: U) => { ...T; ...U; id: string; }
 >T : T
 >U : U
 >t : T
 >T : T
 >u : U
 >U : U
->id : string
 >T : T
 >U : U
-
-    return { id: 'id', ...t, ...u };
->{ id: 'id', ...t, ...u } : { id: string; ...T; ...U }
 >id : string
->'id' : "id"
+
+    return { ...t, ...u, id: 'id' };
+>{ ...t, ...u, id: 'id' } : { ...T; ...U; id: string; }
 >t : any
 >u : any
+>id : string
+>'id' : "id"
 }
 let exclusive: { id: string, a: number, b: string, c: string, d: boolean } =
 >exclusive : { id: string; a: number; b: string; c: string; d: boolean; }
@@ -451,8 +451,8 @@ let exclusive: { id: string, a: number, b: string, c: string, d: boolean } =
 >d : boolean
 
     f({ a: 1, b: 'yes' }, { c: 'no', d: false })
->f({ a: 1, b: 'yes' }, { c: 'no', d: false }) : { c: string; d: boolean; a: number; b: string; id: string; }
->f : <T, U>(t: T, u: U) => { id: string; ...T; ...U }
+>f({ a: 1, b: 'yes' }, { c: 'no', d: false }) : { id: string; c: string; d: boolean; a: number; b: string; }
+>f : <T, U>(t: T, u: U) => { ...T; ...U; id: string; }
 >{ a: 1, b: 'yes' } : { a: number; b: string; }
 >a : number
 >1 : 1
@@ -471,8 +471,8 @@ let overlap: { id: string, a: number, b: string } =
 >b : string
 
     f({ a: 1 }, { a: 2, b: 'extra' })
->f({ a: 1 }, { a: 2, b: 'extra' }) : { a: number; b: string; id: string; }
->f : <T, U>(t: T, u: U) => { id: string; ...T; ...U }
+>f({ a: 1 }, { a: 2, b: 'extra' }) : { id: string; a: number; b: string; }
+>f : <T, U>(t: T, u: U) => { ...T; ...U; id: string; }
 >{ a: 1 } : { a: number; }
 >a : number
 >1 : 1
@@ -488,8 +488,8 @@ let overlapConflict: { id:string, a: string } =
 >a : string
 
     f({ a: 1 }, { a: 'mismatch' })
->f({ a: 1 }, { a: 'mismatch' }) : { a: string; id: string; }
->f : <T, U>(t: T, u: U) => { id: string; ...T; ...U }
+>f({ a: 1 }, { a: 'mismatch' }) : { id: string; a: string; }
+>f : <T, U>(t: T, u: U) => { ...T; ...U; id: string; }
 >{ a: 1 } : { a: number; }
 >a : number
 >1 : 1
@@ -497,16 +497,16 @@ let overlapConflict: { id:string, a: string } =
 >a : string
 >'mismatch' : "mismatch"
 
-let overwriteId: { id: boolean, a: number, c: number, d: string } =
->overwriteId : { id: boolean; a: number; c: number; d: string; }
->id : boolean
+let overwriteId: { id: string, a: number, c: number, d: string } =
+>overwriteId : { id: string; a: number; c: number; d: string; }
+>id : string
 >a : number
 >c : number
 >d : string
 
     f({ a: 1, id: true }, { c: 1, d: 'no' })
->f({ a: 1, id: true }, { c: 1, d: 'no' }) : { c: number; d: string; a: number; id: boolean; }
->f : <T, U>(t: T, u: U) => { id: string; ...T; ...U }
+>f({ a: 1, id: true }, { c: 1, d: 'no' }) : { id: string; c: number; d: string; a: number; }
+>f : <T, U>(t: T, u: U) => { ...T; ...U; id: string; }
 >{ a: 1, id: true } : { a: number; id: true; }
 >a : number
 >1 : 1
@@ -531,8 +531,8 @@ let classesAreWrong: { id: string, ...C, ...D } =
 >D : D
 
     f(new C(), new D())
->f(new C(), new D()) : { q: number; p: number; id: string; }
->f : <T, U>(t: T, u: U) => { id: string; ...T; ...U }
+>f(new C(), new D()) : { id: string; q: number; p: number; }
+>f : <T, U>(t: T, u: U) => { ...T; ...U; id: string; }
 >new C() : C
 >C : typeof C
 >new D() : D
diff --git a/tests/baselines/reference/objectSpreadGeneric.errors.txt b/tests/baselines/reference/objectSpreadGeneric.errors.txt
index 6e55040f223..8b9c767f6de 100644
--- a/tests/baselines/reference/objectSpreadGeneric.errors.txt
+++ b/tests/baselines/reference/objectSpreadGeneric.errors.txt
@@ -4,17 +4,19 @@ tests/cases/conformance/types/spread/objectSpreadGeneric.ts(11,11): error TS2322
 tests/cases/conformance/types/spread/objectSpreadGeneric.ts(12,11): error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...U; ...V }'.
 tests/cases/conformance/types/spread/objectSpreadGeneric.ts(13,11): error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...T; ...V }'.
 tests/cases/conformance/types/spread/objectSpreadGeneric.ts(14,11): error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...T; ...U }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(16,11): error TS2322: Type '{ first: string; ...T; ...U }' is not assignable to type '{ first: string; ...T; ...U }'.
 tests/cases/conformance/types/spread/objectSpreadGeneric.ts(19,11): error TS2322: Type '{}' is not assignable to type '{ ...T; ...U }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(32,11): error TS2322: Type '{ first: string; ...T; second: string; ...U; third: string; }' is not assignable to type '{ first: string; second: string; ...T; third: string; }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(40,11): error TS2322: Type '{ firrrrrrst: string; ...T; second: string; ...U; third: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
-  Property 'first' is missing in type '{ third: string; second: string; firrrrrrst: string; }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(42,11): error TS2322: Type '{ first: string; ...T; ssssssssecond: string; ...U; third: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
-  Property 'second' is missing in type '{ third: string; ssssssssecond: string; first: string; }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(44,11): error TS2322: Type '{ first: string; ...T; second: string; ...U; thirrrrrrrd: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
-  Property 'third' is missing in type '{ thirrrrrrrd: string; second: string; first: string; }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(26,11): error TS2322: Type '{ sn?: boolean; ...T; sn?: string | number; }' is not assignable to type '{ ...T; sn?: string | number | boolean; }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(32,11): error TS2322: Type '{ first: string; ...T; second: string; ...U; third: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(34,11): error TS2322: Type '{ first: string; ...T; second: string; ...U; third: string; }' is not assignable to type '{ first: string; second: string; ...T; third: string; }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(36,11): error TS2322: Type '{ first: string; ...T; second: string; ...U; third: string; secondsecond: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; secondsecond: string; }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(38,11): error TS2322: Type '{ first: string; ...T; second: string; ...U; third: string; secondsecond: string; }' is not assignable to type '{ first: string; second: string; secondsecond: string; third: string; ...T; ...U }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(42,11): error TS2322: Type '{ firrrrrrst: string; ...T; second: string; ...U; third: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(44,11): error TS2322: Type '{ first: string; ...T; ssssssssecond: string; ...U; third: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(46,11): error TS2322: Type '{ first: string; ...T; second: string; ...U; thirrrrrrrd: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
 
 
-==== tests/cases/conformance/types/spread/objectSpreadGeneric.ts (11 errors) ====
+==== tests/cases/conformance/types/spread/objectSpreadGeneric.ts (16 errors) ====
     function f<T, U, V>(t: T, u: U, v: V): void {
         let o: { ...T, ...U, ...V };
         let uus: { ...U, ...U};
@@ -42,48 +44,57 @@ tests/cases/conformance/types/spread/objectSpreadGeneric.ts(44,11): error TS2322
               ~~~~~~~~
 !!! error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...T; ...U }'.
         const atEnd: { ...T, ...U, second: string } = { ...t, ...u, second: 'foo' }; // ok
-        const atBeginning: { first: string, ...T, ...U, } = { first: 'foo', ...t, ...u }; // ok
+        const atBeginning: { first: string, ...T, ...U, } = { first: 'foo', ...t, ...u }; // error, not assignable
+              ~~~~~~~~~~~
+!!! error TS2322: Type '{ first: string; ...T; ...U }' is not assignable to type '{ first: string; ...T; ...U }'.
     
         const emptyTarget: { } = { ...t, ...u } // ok
         const emptySource: { ...T, ...U } = { }; // error, {} is not assignable to U (or T)
               ~~~~~~~~~~~
 !!! error TS2322: Type '{}' is not assignable to type '{ ...T; ...U }'.
     
+        // error, { sn?: boolean } ...T ... { sn?: number | string } is not assignable to
+        //        T ... { sn?: number | string | boolean }
         let optionalNumber: { sn?: number };
         let optionalString: { sn?: string };
         let optionalBoolean: { sn?: boolean };
         const unionCutoff: { ...T, sn?: number | string | boolean } =
-            { ...optionalBoolean, ...t, ...optionalString, ...optionalNumber } // ok
+              ~~~~~~~~~~~
+!!! error TS2322: Type '{ sn?: boolean; ...T; sn?: string | number; }' is not assignable to type '{ ...T; sn?: string | number | boolean; }'.
+            { ...optionalBoolean, ...t, ...optionalString, ...optionalNumber }
         unionCutoff.sn; // ok
         const optionalCutoff = { ...t, ...optionalNumber }; // ok
         optionalCutoff.sn; // ok
     
         const interspersed: { first: string, ...T, second: string, ...U, third: string } =
-            { first: '1', ...t, second: '2', ...u, third: '3' }; // ok
+              ~~~~~~~~~~~~
+!!! error TS2322: Type '{ first: string; ...T; second: string; ...U; third: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
+            { first: '1', ...t, second: '2', ...u, third: '3' }; // error, not assignable
         const interspersedMissingU: { first: string, second: string, ...T, third: string } =
               ~~~~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type '{ first: string; ...T; second: string; ...U; third: string; }' is not assignable to type '{ first: string; second: string; ...T; third: string; }'.
             { first: '1', ...t, second: '2', ...u, third: '3' }; // error, 'U' is missing
         const interspersedOrder1: { first: string, ...T, second: string, ...U, third: string, secondsecond: string } =
-            { first: '1', ...t, second: '2', ...u, third: '3', secondsecond: 'false' }; // ok
+              ~~~~~~~~~~~~~~~~~~
+!!! error TS2322: Type '{ first: string; ...T; second: string; ...U; third: string; secondsecond: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; secondsecond: string; }'.
+            { first: '1', ...t, second: '2', ...u, third: '3', secondsecond: 'false' }; // error, not assignable
         const interspersedOrder2: { first: string, second: string, secondsecond: string, third: string, ...T, ...U } =
-            { first: '1', ...t, second: '2', ...u, third: '3', secondsecond: 'false' }; // ok
+              ~~~~~~~~~~~~~~~~~~
+!!! error TS2322: Type '{ first: string; ...T; second: string; ...U; third: string; secondsecond: string; }' is not assignable to type '{ first: string; second: string; secondsecond: string; third: string; ...T; ...U }'.
+            { first: '1', ...t, second: '2', ...u, third: '3', secondsecond: 'false' }; // error, not assignable
     
     
         const mismatchFirst: { first: string, ...T, second: string, ...U, third: string } =
               ~~~~~~~~~~~~~
 !!! error TS2322: Type '{ firrrrrrst: string; ...T; second: string; ...U; third: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
-!!! error TS2322:   Property 'first' is missing in type '{ third: string; second: string; firrrrrrst: string; }'.
-            { firrrrrrst: '1', ...t, second: '2', ...u, third: '3' }; // error, 'first' not found
+            { firrrrrrst: '1', ...t, second: '2', ...u, third: '3' }; // error, not assignable
         const mismatchSecond: { first: string, ...T, second: string, ...U, third: string } =
               ~~~~~~~~~~~~~~
 !!! error TS2322: Type '{ first: string; ...T; ssssssssecond: string; ...U; third: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
-!!! error TS2322:   Property 'second' is missing in type '{ third: string; ssssssssecond: string; first: string; }'.
-            { first: '1', ...t, ssssssssecond: '2', ...u, third: '3' }; // error, 'second' not found
+            { first: '1', ...t, ssssssssecond: '2', ...u, third: '3' }; // error, not assignable
         const mismatchLast: { first: string, ...T, second: string, ...U, third: string } =
               ~~~~~~~~~~~~
 !!! error TS2322: Type '{ first: string; ...T; second: string; ...U; thirrrrrrrd: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
-!!! error TS2322:   Property 'third' is missing in type '{ thirrrrrrrd: string; second: string; first: string; }'.
-            { first: '1', ...t, second: '2', ...u, thirrrrrrrd: '3' }; // error, 'third' not found
+            { first: '1', ...t, second: '2', ...u, thirrrrrrrd: '3' }; // error, not assignable
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/objectSpreadGeneric.js b/tests/baselines/reference/objectSpreadGeneric.js
index 9414b9ef76e..fa19e47df39 100644
--- a/tests/baselines/reference/objectSpreadGeneric.js
+++ b/tests/baselines/reference/objectSpreadGeneric.js
@@ -14,36 +14,38 @@ function f<T, U, V>(t: T, u: U, v: V): void {
     const missingU: { ...T, ...V } = o; // error, missing U
     const missingV: { ...T, ...U } = o; // error, missing V
     const atEnd: { ...T, ...U, second: string } = { ...t, ...u, second: 'foo' }; // ok
-    const atBeginning: { first: string, ...T, ...U, } = { first: 'foo', ...t, ...u }; // ok
+    const atBeginning: { first: string, ...T, ...U, } = { first: 'foo', ...t, ...u }; // error, not assignable
 
     const emptyTarget: { } = { ...t, ...u } // ok
     const emptySource: { ...T, ...U } = { }; // error, {} is not assignable to U (or T)
 
+    // error, { sn?: boolean } ...T ... { sn?: number | string } is not assignable to
+    //        T ... { sn?: number | string | boolean }
     let optionalNumber: { sn?: number };
     let optionalString: { sn?: string };
     let optionalBoolean: { sn?: boolean };
     const unionCutoff: { ...T, sn?: number | string | boolean } =
-        { ...optionalBoolean, ...t, ...optionalString, ...optionalNumber } // ok
+        { ...optionalBoolean, ...t, ...optionalString, ...optionalNumber }
     unionCutoff.sn; // ok
     const optionalCutoff = { ...t, ...optionalNumber }; // ok
     optionalCutoff.sn; // ok
 
     const interspersed: { first: string, ...T, second: string, ...U, third: string } =
-        { first: '1', ...t, second: '2', ...u, third: '3' }; // ok
+        { first: '1', ...t, second: '2', ...u, third: '3' }; // error, not assignable
     const interspersedMissingU: { first: string, second: string, ...T, third: string } =
         { first: '1', ...t, second: '2', ...u, third: '3' }; // error, 'U' is missing
     const interspersedOrder1: { first: string, ...T, second: string, ...U, third: string, secondsecond: string } =
-        { first: '1', ...t, second: '2', ...u, third: '3', secondsecond: 'false' }; // ok
+        { first: '1', ...t, second: '2', ...u, third: '3', secondsecond: 'false' }; // error, not assignable
     const interspersedOrder2: { first: string, second: string, secondsecond: string, third: string, ...T, ...U } =
-        { first: '1', ...t, second: '2', ...u, third: '3', secondsecond: 'false' }; // ok
+        { first: '1', ...t, second: '2', ...u, third: '3', secondsecond: 'false' }; // error, not assignable
 
 
     const mismatchFirst: { first: string, ...T, second: string, ...U, third: string } =
-        { firrrrrrst: '1', ...t, second: '2', ...u, third: '3' }; // error, 'first' not found
+        { firrrrrrst: '1', ...t, second: '2', ...u, third: '3' }; // error, not assignable
     const mismatchSecond: { first: string, ...T, second: string, ...U, third: string } =
-        { first: '1', ...t, ssssssssecond: '2', ...u, third: '3' }; // error, 'second' not found
+        { first: '1', ...t, ssssssssecond: '2', ...u, third: '3' }; // error, not assignable
     const mismatchLast: { first: string, ...T, second: string, ...U, third: string } =
-        { first: '1', ...t, second: '2', ...u, thirrrrrrrd: '3' }; // error, 'third' not found
+        { first: '1', ...t, second: '2', ...u, thirrrrrrrd: '3' }; // error, not assignable
 }
 
 
@@ -71,21 +73,23 @@ function f(t, u, v) {
     var missingU = o; // error, missing U
     var missingV = o; // error, missing V
     var atEnd = __assign({}, t, u, { second: 'foo' }); // ok
-    var atBeginning = __assign({ first: 'foo' }, t, u); // ok
+    var atBeginning = __assign({ first: 'foo' }, t, u); // error, not assignable
     var emptyTarget = __assign({}, t, u); // ok
     var emptySource = {}; // error, {} is not assignable to U (or T)
+    // error, { sn?: boolean } ...T ... { sn?: number | string } is not assignable to
+    //        T ... { sn?: number | string | boolean }
     var optionalNumber;
     var optionalString;
     var optionalBoolean;
-    var unionCutoff = __assign({}, optionalBoolean, t, optionalString, optionalNumber); // ok
+    var unionCutoff = __assign({}, optionalBoolean, t, optionalString, optionalNumber);
     unionCutoff.sn; // ok
     var optionalCutoff = __assign({}, t, optionalNumber); // ok
     optionalCutoff.sn; // ok
-    var interspersed = __assign({ first: '1' }, t, { second: '2' }, u, { third: '3' }); // ok
+    var interspersed = __assign({ first: '1' }, t, { second: '2' }, u, { third: '3' }); // error, not assignable
     var interspersedMissingU = __assign({ first: '1' }, t, { second: '2' }, u, { third: '3' }); // error, 'U' is missing
-    var interspersedOrder1 = __assign({ first: '1' }, t, { second: '2' }, u, { third: '3', secondsecond: 'false' }); // ok
-    var interspersedOrder2 = __assign({ first: '1' }, t, { second: '2' }, u, { third: '3', secondsecond: 'false' }); // ok
-    var mismatchFirst = __assign({ firrrrrrst: '1' }, t, { second: '2' }, u, { third: '3' }); // error, 'first' not found
-    var mismatchSecond = __assign({ first: '1' }, t, { ssssssssecond: '2' }, u, { third: '3' }); // error, 'second' not found
-    var mismatchLast = __assign({ first: '1' }, t, { second: '2' }, u, { thirrrrrrrd: '3' }); // error, 'third' not found
+    var interspersedOrder1 = __assign({ first: '1' }, t, { second: '2' }, u, { third: '3', secondsecond: 'false' }); // error, not assignable
+    var interspersedOrder2 = __assign({ first: '1' }, t, { second: '2' }, u, { third: '3', secondsecond: 'false' }); // error, not assignable
+    var mismatchFirst = __assign({ firrrrrrst: '1' }, t, { second: '2' }, u, { third: '3' }); // error, not assignable
+    var mismatchSecond = __assign({ first: '1' }, t, { ssssssssecond: '2' }, u, { third: '3' }); // error, not assignable
+    var mismatchLast = __assign({ first: '1' }, t, { second: '2' }, u, { thirrrrrrrd: '3' }); // error, not assignable
 }
diff --git a/tests/baselines/reference/objectSpreadIntersection.js b/tests/baselines/reference/objectSpreadIntersection.js
index cb93c547963..0a7f1ddfcee 100644
--- a/tests/baselines/reference/objectSpreadIntersection.js
+++ b/tests/baselines/reference/objectSpreadIntersection.js
@@ -2,9 +2,9 @@
 function iteratedUnionIntersection<T, U, V>(t: T, u: U, v: V): void {
     let tu: T | U;
     let uv: U & V;
-    let result = { id: 'bar', ...tu, ...uv };
-    let expected: ({ id: string, ...T, ...U } & { id: string, ...T, ...V }) | ({ id: string, ...U } & { id: string, ...U, ...V });
-    let assignable: { id: string, ...(T | U), ...(U & V) } = result;
+    let result = { ...tu, ...uv, id: 'foo' };
+    let expected: ({ ...T, ...U, id: string } & { ...T, ...V, id: string }) | ({ ...U, id: string } & { ...U, ...V, id: string });
+    let assignable: { ...(T | U), ...(U & V), id: string } = result;
 }
 // concrete types work
 interface A1 { a: number }
@@ -16,23 +16,23 @@ let assignable: { ...(A1 & A2) } = result;
 
 function tripleIntersection<T, U, V>(t: T, u: U, v: V): void {
     let tuv: T & U & V;
-    let result = { id: 'foo', ...tuv };
-    let expected: { id: string, ...T } & { id: string, ...U } & { id: string, ...V } = result;
-    let assignable: { id: string, ...(T & U & V) } = result;
+    let result = { ...tuv, id: 'bar' };
+    let expected: { ...T, id: string } & { ...U, id: string } & { ...V, id: string } = result;
+    let assignable: { ...(T & U & V), id: string } = result;
 }
 function iteratedDoubleIntersection<T, U, V>(t: T, u: U, v: V): void {
     let tu: T & U;
     let uv: U & V;
-    let result = { id: 'bar', ...tu, ...uv };
-    let expected: { id: string, ...T, ...U } & { id: string, ...T, ...V } & { id: string, ...U } & { id: string, ...U, ...V };
-    let assignable: { id: string, ...(T & U), ...(U & V) } = result;
+    let result = { ...tu, ...uv, id: 'baz' };
+    let expected: { ...T, ...U, id: string } & { ...T, ...V, id: string } & { ...U, id: string } & { ...U, ...V, id: string };
+    let assignable: { ...(T & U), ...(U & V), id: string } = result;
 }
 function iteratedIntersectionUnion<T, U, V>(t: T, u: U, v: V): void {
     let tu: T & U;
     let uv: U | V;
-    let result = { id: 'bar', ...tu, ...uv };
-    let expected: ({ id: string, ...T, ...U } & { id: string, ...U }) | ({ id: string, ...T, ...V } & { id: string, ...U, ...V });
-    let assignable: { id: string, ...(T & U), ...(U | V) } = result;
+    let result = { ...tu, ...uv, id: 'qux' };
+    let expected: ({ ...T, ...U, id: string } & { ...U, id: string }) | ({ ...T, ...V, id: string } & { ...U, ...V, id: string });
+    let assignable: { ...(T & U), ...(U | V), id: string } = result;
 }
 
 
@@ -49,7 +49,7 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
 function iteratedUnionIntersection(t, u, v) {
     var tu;
     var uv;
-    var result = __assign({ id: 'bar' }, tu, uv);
+    var result = __assign({}, tu, uv, { id: 'foo' });
     var expected;
     var assignable = result;
 }
@@ -59,21 +59,21 @@ var sn = result.a;
 var assignable = result;
 function tripleIntersection(t, u, v) {
     var tuv;
-    var result = __assign({ id: 'foo' }, tuv);
+    var result = __assign({}, tuv, { id: 'bar' });
     var expected = result;
     var assignable = result;
 }
 function iteratedDoubleIntersection(t, u, v) {
     var tu;
     var uv;
-    var result = __assign({ id: 'bar' }, tu, uv);
+    var result = __assign({}, tu, uv, { id: 'baz' });
     var expected;
     var assignable = result;
 }
 function iteratedIntersectionUnion(t, u, v) {
     var tu;
     var uv;
-    var result = __assign({ id: 'bar' }, tu, uv);
+    var result = __assign({}, tu, uv, { id: 'qux' });
     var expected;
     var assignable = result;
 }
diff --git a/tests/baselines/reference/objectSpreadIntersection.symbols b/tests/baselines/reference/objectSpreadIntersection.symbols
index f45b04a20a5..c59c37670b2 100644
--- a/tests/baselines/reference/objectSpreadIntersection.symbols
+++ b/tests/baselines/reference/objectSpreadIntersection.symbols
@@ -21,31 +21,31 @@ function iteratedUnionIntersection<T, U, V>(t: T, u: U, v: V): void {
 >U : Symbol(U, Decl(objectSpreadIntersection.ts, 0, 37))
 >V : Symbol(V, Decl(objectSpreadIntersection.ts, 0, 40))
 
-    let result = { id: 'bar', ...tu, ...uv };
+    let result = { ...tu, ...uv, id: 'foo' };
 >result : Symbol(result, Decl(objectSpreadIntersection.ts, 3, 7))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 3, 18))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 3, 32))
 
-    let expected: ({ id: string, ...T, ...U } & { id: string, ...T, ...V }) | ({ id: string, ...U } & { id: string, ...U, ...V });
+    let expected: ({ ...T, ...U, id: string } & { ...T, ...V, id: string }) | ({ ...U, id: string } & { ...U, ...V, id: string });
 >expected : Symbol(expected, Decl(objectSpreadIntersection.ts, 4, 7))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 4, 20))
 >T : Symbol(T, Decl(objectSpreadIntersection.ts, 0, 35))
 >U : Symbol(U, Decl(objectSpreadIntersection.ts, 0, 37))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 4, 49))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 4, 32))
 >T : Symbol(T, Decl(objectSpreadIntersection.ts, 0, 35))
 >V : Symbol(V, Decl(objectSpreadIntersection.ts, 0, 40))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 4, 80))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 4, 61))
 >U : Symbol(U, Decl(objectSpreadIntersection.ts, 0, 37))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 4, 103))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 4, 86))
 >U : Symbol(U, Decl(objectSpreadIntersection.ts, 0, 37))
 >V : Symbol(V, Decl(objectSpreadIntersection.ts, 0, 40))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 4, 115))
 
-    let assignable: { id: string, ...(T | U), ...(U & V) } = result;
+    let assignable: { ...(T | U), ...(U & V), id: string } = result;
 >assignable : Symbol(assignable, Decl(objectSpreadIntersection.ts, 5, 7))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 5, 21))
 >T : Symbol(T, Decl(objectSpreadIntersection.ts, 0, 35))
 >U : Symbol(U, Decl(objectSpreadIntersection.ts, 0, 37))
 >U : Symbol(U, Decl(objectSpreadIntersection.ts, 0, 37))
 >V : Symbol(V, Decl(objectSpreadIntersection.ts, 0, 40))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 5, 45))
 >result : Symbol(result, Decl(objectSpreadIntersection.ts, 3, 7))
 }
 // concrete types work
@@ -95,26 +95,26 @@ function tripleIntersection<T, U, V>(t: T, u: U, v: V): void {
 >U : Symbol(U, Decl(objectSpreadIntersection.ts, 15, 30))
 >V : Symbol(V, Decl(objectSpreadIntersection.ts, 15, 33))
 
-    let result = { id: 'foo', ...tuv };
+    let result = { ...tuv, id: 'bar' };
 >result : Symbol(result, Decl(objectSpreadIntersection.ts, 17, 7))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 17, 18))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 17, 26))
 
-    let expected: { id: string, ...T } & { id: string, ...U } & { id: string, ...V } = result;
+    let expected: { ...T, id: string } & { ...U, id: string } & { ...V, id: string } = result;
 >expected : Symbol(expected, Decl(objectSpreadIntersection.ts, 18, 7))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 18, 19))
 >T : Symbol(T, Decl(objectSpreadIntersection.ts, 15, 28))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 18, 42))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 18, 25))
 >U : Symbol(U, Decl(objectSpreadIntersection.ts, 15, 30))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 18, 65))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 18, 48))
 >V : Symbol(V, Decl(objectSpreadIntersection.ts, 15, 33))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 18, 71))
 >result : Symbol(result, Decl(objectSpreadIntersection.ts, 17, 7))
 
-    let assignable: { id: string, ...(T & U & V) } = result;
+    let assignable: { ...(T & U & V), id: string } = result;
 >assignable : Symbol(assignable, Decl(objectSpreadIntersection.ts, 19, 7))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 19, 21))
 >T : Symbol(T, Decl(objectSpreadIntersection.ts, 15, 28))
 >U : Symbol(U, Decl(objectSpreadIntersection.ts, 15, 30))
 >V : Symbol(V, Decl(objectSpreadIntersection.ts, 15, 33))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 19, 37))
 >result : Symbol(result, Decl(objectSpreadIntersection.ts, 17, 7))
 }
 function iteratedDoubleIntersection<T, U, V>(t: T, u: U, v: V): void {
@@ -139,31 +139,31 @@ function iteratedDoubleIntersection<T, U, V>(t: T, u: U, v: V): void {
 >U : Symbol(U, Decl(objectSpreadIntersection.ts, 21, 38))
 >V : Symbol(V, Decl(objectSpreadIntersection.ts, 21, 41))
 
-    let result = { id: 'bar', ...tu, ...uv };
+    let result = { ...tu, ...uv, id: 'baz' };
 >result : Symbol(result, Decl(objectSpreadIntersection.ts, 24, 7))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 24, 18))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 24, 32))
 
-    let expected: { id: string, ...T, ...U } & { id: string, ...T, ...V } & { id: string, ...U } & { id: string, ...U, ...V };
+    let expected: { ...T, ...U, id: string } & { ...T, ...V, id: string } & { ...U, id: string } & { ...U, ...V, id: string };
 >expected : Symbol(expected, Decl(objectSpreadIntersection.ts, 25, 7))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 25, 19))
 >T : Symbol(T, Decl(objectSpreadIntersection.ts, 21, 36))
 >U : Symbol(U, Decl(objectSpreadIntersection.ts, 21, 38))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 25, 48))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 25, 31))
 >T : Symbol(T, Decl(objectSpreadIntersection.ts, 21, 36))
 >V : Symbol(V, Decl(objectSpreadIntersection.ts, 21, 41))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 25, 77))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 25, 60))
 >U : Symbol(U, Decl(objectSpreadIntersection.ts, 21, 38))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 25, 100))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 25, 83))
 >U : Symbol(U, Decl(objectSpreadIntersection.ts, 21, 38))
 >V : Symbol(V, Decl(objectSpreadIntersection.ts, 21, 41))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 25, 112))
 
-    let assignable: { id: string, ...(T & U), ...(U & V) } = result;
+    let assignable: { ...(T & U), ...(U & V), id: string } = result;
 >assignable : Symbol(assignable, Decl(objectSpreadIntersection.ts, 26, 7))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 26, 21))
 >T : Symbol(T, Decl(objectSpreadIntersection.ts, 21, 36))
 >U : Symbol(U, Decl(objectSpreadIntersection.ts, 21, 38))
 >U : Symbol(U, Decl(objectSpreadIntersection.ts, 21, 38))
 >V : Symbol(V, Decl(objectSpreadIntersection.ts, 21, 41))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 26, 45))
 >result : Symbol(result, Decl(objectSpreadIntersection.ts, 24, 7))
 }
 function iteratedIntersectionUnion<T, U, V>(t: T, u: U, v: V): void {
@@ -188,31 +188,31 @@ function iteratedIntersectionUnion<T, U, V>(t: T, u: U, v: V): void {
 >U : Symbol(U, Decl(objectSpreadIntersection.ts, 28, 37))
 >V : Symbol(V, Decl(objectSpreadIntersection.ts, 28, 40))
 
-    let result = { id: 'bar', ...tu, ...uv };
+    let result = { ...tu, ...uv, id: 'qux' };
 >result : Symbol(result, Decl(objectSpreadIntersection.ts, 31, 7))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 31, 18))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 31, 32))
 
-    let expected: ({ id: string, ...T, ...U } & { id: string, ...U }) | ({ id: string, ...T, ...V } & { id: string, ...U, ...V });
+    let expected: ({ ...T, ...U, id: string } & { ...U, id: string }) | ({ ...T, ...V, id: string } & { ...U, ...V, id: string });
 >expected : Symbol(expected, Decl(objectSpreadIntersection.ts, 32, 7))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 32, 20))
 >T : Symbol(T, Decl(objectSpreadIntersection.ts, 28, 35))
 >U : Symbol(U, Decl(objectSpreadIntersection.ts, 28, 37))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 32, 49))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 32, 32))
 >U : Symbol(U, Decl(objectSpreadIntersection.ts, 28, 37))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 32, 74))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 32, 55))
 >T : Symbol(T, Decl(objectSpreadIntersection.ts, 28, 35))
 >V : Symbol(V, Decl(objectSpreadIntersection.ts, 28, 40))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 32, 103))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 32, 86))
 >U : Symbol(U, Decl(objectSpreadIntersection.ts, 28, 37))
 >V : Symbol(V, Decl(objectSpreadIntersection.ts, 28, 40))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 32, 115))
 
-    let assignable: { id: string, ...(T & U), ...(U | V) } = result;
+    let assignable: { ...(T & U), ...(U | V), id: string } = result;
 >assignable : Symbol(assignable, Decl(objectSpreadIntersection.ts, 33, 7))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 33, 21))
 >T : Symbol(T, Decl(objectSpreadIntersection.ts, 28, 35))
 >U : Symbol(U, Decl(objectSpreadIntersection.ts, 28, 37))
 >U : Symbol(U, Decl(objectSpreadIntersection.ts, 28, 37))
 >V : Symbol(V, Decl(objectSpreadIntersection.ts, 28, 40))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 33, 45))
 >result : Symbol(result, Decl(objectSpreadIntersection.ts, 31, 7))
 }
 
diff --git a/tests/baselines/reference/objectSpreadIntersection.types b/tests/baselines/reference/objectSpreadIntersection.types
index 7700d8aa384..30820017916 100644
--- a/tests/baselines/reference/objectSpreadIntersection.types
+++ b/tests/baselines/reference/objectSpreadIntersection.types
@@ -21,17 +21,16 @@ function iteratedUnionIntersection<T, U, V>(t: T, u: U, v: V): void {
 >U : U
 >V : V
 
-    let result = { id: 'bar', ...tu, ...uv };
->result : ({ id: string; ...T; ...U } | { id: string; ...U }) & ({ id: string; ...T; ...V } | { id: string; ...U; ...V })
->{ id: 'bar', ...tu, ...uv } : ({ id: string; ...T; ...U } | { id: string; ...U }) & ({ id: string; ...T; ...V } | { id: string; ...U; ...V })
->id : string
->'bar' : "bar"
+    let result = { ...tu, ...uv, id: 'foo' };
+>result : ({ ...U; id: string; } | { ...T; ...U; id: string; } | { ...U; ...T; ...U; id: string; } | { ...T; ...U; ...T; ...U; id: string; }) & ({ ...T; ...V; id: string; } | { ...U; ...T; ...V; id: string; } | { ...U; ...V; id: string; } | { ...T; ...U; ...V; id: string; } | { ...T; ...U; ...T; ...V; id: string; } | { ...U; ...T; ...U; ...V; id: string; })
+>{ ...tu, ...uv, id: 'foo' } : ({ ...U; id: string; } | { ...T; ...U; id: string; } | { ...U; ...T; ...U; id: string; } | { ...T; ...U; ...T; ...U; id: string; }) & ({ ...T; ...V; id: string; } | { ...U; ...T; ...V; id: string; } | { ...U; ...V; id: string; } | { ...T; ...U; ...V; id: string; } | { ...T; ...U; ...T; ...V; id: string; } | { ...U; ...T; ...U; ...V; id: string; })
 >tu : any
 >uv : any
+>id : string
+>'foo' : "foo"
 
-    let expected: ({ id: string, ...T, ...U } & { id: string, ...T, ...V }) | ({ id: string, ...U } & { id: string, ...U, ...V });
->expected : ({ id: string; ...T; ...U } & { id: string; ...T; ...V }) | ({ id: string; ...U } & { id: string; ...U; ...V })
->id : string
+    let expected: ({ ...T, ...U, id: string } & { ...T, ...V, id: string }) | ({ ...U, id: string } & { ...U, ...V, id: string });
+>expected : ({ ...T; ...U; id: string; } & { ...T; ...V; id: string; }) | ({ ...U; id: string; } & { ...U; ...V; id: string; })
 >T : T
 >U : U
 >id : string
@@ -42,15 +41,16 @@ function iteratedUnionIntersection<T, U, V>(t: T, u: U, v: V): void {
 >id : string
 >U : U
 >V : V
+>id : string
 
-    let assignable: { id: string, ...(T | U), ...(U & V) } = result;
->assignable : ({ id: string; ...T; ...U } | { id: string; ...U }) & ({ id: string; ...T; ...V } | { id: string; ...U; ...V })
->id : string
+    let assignable: { ...(T | U), ...(U & V), id: string } = result;
+>assignable : ({ ...U; id: string; } | { ...T; ...U; id: string; } | { ...U; ...T; ...U; id: string; } | { ...T; ...U; ...T; ...U; id: string; }) & ({ ...T; ...V; id: string; } | { ...U; ...T; ...V; id: string; } | { ...U; ...V; id: string; } | { ...T; ...U; ...V; id: string; } | { ...T; ...U; ...T; ...V; id: string; } | { ...U; ...T; ...U; ...V; id: string; })
 >T : T
 >U : U
 >U : U
 >V : V
->result : ({ id: string; ...T; ...U } | { id: string; ...U }) & ({ id: string; ...T; ...V } | { id: string; ...U; ...V })
+>id : string
+>result : ({ ...U; id: string; } | { ...T; ...U; id: string; } | { ...U; ...T; ...U; id: string; } | { ...T; ...U; ...T; ...U; id: string; }) & ({ ...T; ...V; id: string; } | { ...U; ...T; ...V; id: string; } | { ...U; ...V; id: string; } | { ...T; ...U; ...V; id: string; } | { ...T; ...U; ...T; ...V; id: string; } | { ...U; ...T; ...U; ...V; id: string; })
 }
 // concrete types work
 interface A1 { a: number }
@@ -101,30 +101,30 @@ function tripleIntersection<T, U, V>(t: T, u: U, v: V): void {
 >U : U
 >V : V
 
-    let result = { id: 'foo', ...tuv };
->result : { id: string; ...T } & { id: string; ...U } & { id: string; ...V }
->{ id: 'foo', ...tuv } : { id: string; ...T } & { id: string; ...U } & { id: string; ...V }
->id : string
->'foo' : "foo"
+    let result = { ...tuv, id: 'bar' };
+>result : { ...T; id: string; } & { ...U; id: string; } & { ...V; id: string; }
+>{ ...tuv, id: 'bar' } : { ...T; id: string; } & { ...U; id: string; } & { ...V; id: string; }
 >tuv : any
-
-    let expected: { id: string, ...T } & { id: string, ...U } & { id: string, ...V } = result;
->expected : { id: string; ...T } & { id: string; ...U } & { id: string; ...V }
 >id : string
+>'bar' : "bar"
+
+    let expected: { ...T, id: string } & { ...U, id: string } & { ...V, id: string } = result;
+>expected : { ...T; id: string; } & { ...U; id: string; } & { ...V; id: string; }
 >T : T
 >id : string
 >U : U
 >id : string
 >V : V
->result : { id: string; ...T } & { id: string; ...U } & { id: string; ...V }
-
-    let assignable: { id: string, ...(T & U & V) } = result;
->assignable : { id: string; ...T } & { id: string; ...U } & { id: string; ...V }
 >id : string
+>result : { ...T; id: string; } & { ...U; id: string; } & { ...V; id: string; }
+
+    let assignable: { ...(T & U & V), id: string } = result;
+>assignable : { ...T; id: string; } & { ...U; id: string; } & { ...V; id: string; }
 >T : T
 >U : U
 >V : V
->result : { id: string; ...T } & { id: string; ...U } & { id: string; ...V }
+>id : string
+>result : { ...T; id: string; } & { ...U; id: string; } & { ...V; id: string; }
 }
 function iteratedDoubleIntersection<T, U, V>(t: T, u: U, v: V): void {
 >iteratedDoubleIntersection : <T, U, V>(t: T, u: U, v: V) => void
@@ -148,17 +148,16 @@ function iteratedDoubleIntersection<T, U, V>(t: T, u: U, v: V): void {
 >U : U
 >V : V
 
-    let result = { id: 'bar', ...tu, ...uv };
->result : { id: string; ...T; ...U } & { id: string; ...U } & { id: string; ...T; ...V } & { id: string; ...U; ...V }
->{ id: 'bar', ...tu, ...uv } : { id: string; ...T; ...U } & { id: string; ...U } & { id: string; ...T; ...V } & { id: string; ...U; ...V }
->id : string
->'bar' : "bar"
+    let result = { ...tu, ...uv, id: 'baz' };
+>result : { ...T; ...U; id: string; } & { ...U; ...T; ...U; id: string; } & { ...U; id: string; } & { ...T; ...V; id: string; } & { ...U; ...T; ...V; id: string; } & { ...T; ...U; ...V; id: string; } & { ...U; ...V; id: string; }
+>{ ...tu, ...uv, id: 'baz' } : { ...T; ...U; id: string; } & { ...U; ...T; ...U; id: string; } & { ...U; id: string; } & { ...T; ...V; id: string; } & { ...U; ...T; ...V; id: string; } & { ...T; ...U; ...V; id: string; } & { ...U; ...V; id: string; }
 >tu : any
 >uv : any
+>id : string
+>'baz' : "baz"
 
-    let expected: { id: string, ...T, ...U } & { id: string, ...T, ...V } & { id: string, ...U } & { id: string, ...U, ...V };
->expected : { id: string; ...T; ...U } & { id: string; ...T; ...V } & { id: string; ...U } & { id: string; ...U; ...V }
->id : string
+    let expected: { ...T, ...U, id: string } & { ...T, ...V, id: string } & { ...U, id: string } & { ...U, ...V, id: string };
+>expected : { ...T; ...U; id: string; } & { ...T; ...V; id: string; } & { ...U; id: string; } & { ...U; ...V; id: string; }
 >T : T
 >U : U
 >id : string
@@ -169,15 +168,16 @@ function iteratedDoubleIntersection<T, U, V>(t: T, u: U, v: V): void {
 >id : string
 >U : U
 >V : V
+>id : string
 
-    let assignable: { id: string, ...(T & U), ...(U & V) } = result;
->assignable : { id: string; ...T; ...U } & { id: string; ...U } & { id: string; ...T; ...V } & { id: string; ...U; ...V }
->id : string
+    let assignable: { ...(T & U), ...(U & V), id: string } = result;
+>assignable : { ...T; ...U; id: string; } & { ...U; ...T; ...U; id: string; } & { ...U; id: string; } & { ...T; ...V; id: string; } & { ...U; ...T; ...V; id: string; } & { ...T; ...U; ...V; id: string; } & { ...U; ...V; id: string; }
 >T : T
 >U : U
 >U : U
 >V : V
->result : { id: string; ...T; ...U } & { id: string; ...U } & { id: string; ...T; ...V } & { id: string; ...U; ...V }
+>id : string
+>result : { ...T; ...U; id: string; } & { ...U; ...T; ...U; id: string; } & { ...U; id: string; } & { ...T; ...V; id: string; } & { ...U; ...T; ...V; id: string; } & { ...T; ...U; ...V; id: string; } & { ...U; ...V; id: string; }
 }
 function iteratedIntersectionUnion<T, U, V>(t: T, u: U, v: V): void {
 >iteratedIntersectionUnion : <T, U, V>(t: T, u: U, v: V) => void
@@ -201,17 +201,16 @@ function iteratedIntersectionUnion<T, U, V>(t: T, u: U, v: V): void {
 >U : U
 >V : V
 
-    let result = { id: 'bar', ...tu, ...uv };
->result : ({ id: string; ...T; ...U } & { id: string; ...U }) | ({ id: string; ...T; ...V } & { id: string; ...U; ...V })
->{ id: 'bar', ...tu, ...uv } : ({ id: string; ...T; ...U } & { id: string; ...U }) | ({ id: string; ...T; ...V } & { id: string; ...U; ...V })
->id : string
->'bar' : "bar"
+    let result = { ...tu, ...uv, id: 'qux' };
+>result : ({ ...T; ...U; id: string; } & { ...U; ...T; ...U; id: string; } & { ...T; ...U; ...T; ...U; id: string; } & { ...U; id: string; }) | ({ ...T; ...V; id: string; } & { ...U; ...T; ...V; id: string; } & { ...T; ...U; ...T; ...V; id: string; } & { ...T; ...U; ...V; id: string; } & { ...U; ...T; ...U; ...V; id: string; } & { ...U; ...V; id: string; })
+>{ ...tu, ...uv, id: 'qux' } : ({ ...T; ...U; id: string; } & { ...U; ...T; ...U; id: string; } & { ...T; ...U; ...T; ...U; id: string; } & { ...U; id: string; }) | ({ ...T; ...V; id: string; } & { ...U; ...T; ...V; id: string; } & { ...T; ...U; ...T; ...V; id: string; } & { ...T; ...U; ...V; id: string; } & { ...U; ...T; ...U; ...V; id: string; } & { ...U; ...V; id: string; })
 >tu : any
 >uv : any
+>id : string
+>'qux' : "qux"
 
-    let expected: ({ id: string, ...T, ...U } & { id: string, ...U }) | ({ id: string, ...T, ...V } & { id: string, ...U, ...V });
->expected : ({ id: string; ...T; ...U } & { id: string; ...U }) | ({ id: string; ...T; ...V } & { id: string; ...U; ...V })
->id : string
+    let expected: ({ ...T, ...U, id: string } & { ...U, id: string }) | ({ ...T, ...V, id: string } & { ...U, ...V, id: string });
+>expected : ({ ...T; ...U; id: string; } & { ...U; id: string; }) | ({ ...T; ...V; id: string; } & { ...U; ...V; id: string; })
 >T : T
 >U : U
 >id : string
@@ -222,15 +221,16 @@ function iteratedIntersectionUnion<T, U, V>(t: T, u: U, v: V): void {
 >id : string
 >U : U
 >V : V
+>id : string
 
-    let assignable: { id: string, ...(T & U), ...(U | V) } = result;
->assignable : ({ id: string; ...T; ...U } & { id: string; ...U }) | ({ id: string; ...T; ...V } & { id: string; ...U; ...V })
->id : string
+    let assignable: { ...(T & U), ...(U | V), id: string } = result;
+>assignable : ({ ...T; ...U; id: string; } & { ...U; ...T; ...U; id: string; } & { ...T; ...U; ...T; ...U; id: string; } & { ...U; id: string; }) | ({ ...T; ...V; id: string; } & { ...U; ...T; ...V; id: string; } & { ...T; ...U; ...T; ...V; id: string; } & { ...T; ...U; ...V; id: string; } & { ...U; ...T; ...U; ...V; id: string; } & { ...U; ...V; id: string; })
 >T : T
 >U : U
 >U : U
 >V : V
->result : ({ id: string; ...T; ...U } & { id: string; ...U }) | ({ id: string; ...T; ...V } & { id: string; ...U; ...V })
+>id : string
+>result : ({ ...T; ...U; id: string; } & { ...U; ...T; ...U; id: string; } & { ...T; ...U; ...T; ...U; id: string; } & { ...U; id: string; }) | ({ ...T; ...V; id: string; } & { ...U; ...T; ...V; id: string; } & { ...T; ...U; ...T; ...V; id: string; } & { ...T; ...U; ...V; id: string; } & { ...U; ...T; ...U; ...V; id: string; } & { ...U; ...V; id: string; })
 }
 
 
diff --git a/tests/baselines/reference/objectSpreadUnion.js b/tests/baselines/reference/objectSpreadUnion.js
index 500b8a5ddc7..b3a114c7722 100644
--- a/tests/baselines/reference/objectSpreadUnion.js
+++ b/tests/baselines/reference/objectSpreadUnion.js
@@ -9,16 +9,16 @@ let assignable: { ...(A1 | A2) } = result;
 
 function tripleUnion<T, U, V>(t: T, u: U, v: V): void {
     let tuv: T | U | V;
-    let result = { id: 'foo', ...tuv };
-    let expected: { id: string, ...T } | { id: string, ...U } | { id: string, ...V } = result;
-    let assignable: { id: string, ...(T | U | V) } = result;
+    let result = { ...tuv, id: 'foo' };
+    let expected: { ...T, id: string } | { ...U, id: string } | { ...V, id: string } = result;
+    let assignable: { ...(T | U | V), id: string } = result;
 }
 function iteratedDoubleUnion<T, U, V>(t: T, u: U, v: V): void {
     let tu: T | U;
     let uv: U | V;
-    let result = { id: 'bar', ...tu, ...uv };
-    let expected: { id: string, ...T, ...U } | { id: string, ...T, ...V } | { id: string, ...U } | { id: string, ...U, ...V };
-    let assignable: { id: string, ...(T | U), ...(U | V) } = result;
+    let result = { ...tu, ...uv, id: 'bar' };
+    let expected: { ...T, ...U, id: string } | { ...T, ...V, id: string } | { ...U, id: string } | { ...U, ...V, id: string };
+    let assignable: { ...(T | U), ...(U | V), id: string } = result;
 }
 
 
@@ -39,14 +39,14 @@ var sn = result.a;
 var assignable = result;
 function tripleUnion(t, u, v) {
     var tuv;
-    var result = __assign({ id: 'foo' }, tuv);
+    var result = __assign({}, tuv, { id: 'foo' });
     var expected = result;
     var assignable = result;
 }
 function iteratedDoubleUnion(t, u, v) {
     var tu;
     var uv;
-    var result = __assign({ id: 'bar' }, tu, uv);
+    var result = __assign({}, tu, uv, { id: 'bar' });
     var expected;
     var assignable = result;
 }
diff --git a/tests/baselines/reference/objectSpreadUnion.symbols b/tests/baselines/reference/objectSpreadUnion.symbols
index eea9e65185d..d630fde518b 100644
--- a/tests/baselines/reference/objectSpreadUnion.symbols
+++ b/tests/baselines/reference/objectSpreadUnion.symbols
@@ -46,26 +46,26 @@ function tripleUnion<T, U, V>(t: T, u: U, v: V): void {
 >U : Symbol(U, Decl(objectSpreadUnion.ts, 8, 23))
 >V : Symbol(V, Decl(objectSpreadUnion.ts, 8, 26))
 
-    let result = { id: 'foo', ...tuv };
+    let result = { ...tuv, id: 'foo' };
 >result : Symbol(result, Decl(objectSpreadUnion.ts, 10, 7))
->id : Symbol(id, Decl(objectSpreadUnion.ts, 10, 18))
+>id : Symbol(id, Decl(objectSpreadUnion.ts, 10, 26))
 
-    let expected: { id: string, ...T } | { id: string, ...U } | { id: string, ...V } = result;
+    let expected: { ...T, id: string } | { ...U, id: string } | { ...V, id: string } = result;
 >expected : Symbol(expected, Decl(objectSpreadUnion.ts, 11, 7))
->id : Symbol(id, Decl(objectSpreadUnion.ts, 11, 19))
 >T : Symbol(T, Decl(objectSpreadUnion.ts, 8, 21))
->id : Symbol(id, Decl(objectSpreadUnion.ts, 11, 42))
+>id : Symbol(id, Decl(objectSpreadUnion.ts, 11, 25))
 >U : Symbol(U, Decl(objectSpreadUnion.ts, 8, 23))
->id : Symbol(id, Decl(objectSpreadUnion.ts, 11, 65))
+>id : Symbol(id, Decl(objectSpreadUnion.ts, 11, 48))
 >V : Symbol(V, Decl(objectSpreadUnion.ts, 8, 26))
+>id : Symbol(id, Decl(objectSpreadUnion.ts, 11, 71))
 >result : Symbol(result, Decl(objectSpreadUnion.ts, 10, 7))
 
-    let assignable: { id: string, ...(T | U | V) } = result;
+    let assignable: { ...(T | U | V), id: string } = result;
 >assignable : Symbol(assignable, Decl(objectSpreadUnion.ts, 12, 7))
->id : Symbol(id, Decl(objectSpreadUnion.ts, 12, 21))
 >T : Symbol(T, Decl(objectSpreadUnion.ts, 8, 21))
 >U : Symbol(U, Decl(objectSpreadUnion.ts, 8, 23))
 >V : Symbol(V, Decl(objectSpreadUnion.ts, 8, 26))
+>id : Symbol(id, Decl(objectSpreadUnion.ts, 12, 37))
 >result : Symbol(result, Decl(objectSpreadUnion.ts, 10, 7))
 }
 function iteratedDoubleUnion<T, U, V>(t: T, u: U, v: V): void {
@@ -90,31 +90,31 @@ function iteratedDoubleUnion<T, U, V>(t: T, u: U, v: V): void {
 >U : Symbol(U, Decl(objectSpreadUnion.ts, 14, 31))
 >V : Symbol(V, Decl(objectSpreadUnion.ts, 14, 34))
 
-    let result = { id: 'bar', ...tu, ...uv };
+    let result = { ...tu, ...uv, id: 'bar' };
 >result : Symbol(result, Decl(objectSpreadUnion.ts, 17, 7))
->id : Symbol(id, Decl(objectSpreadUnion.ts, 17, 18))
+>id : Symbol(id, Decl(objectSpreadUnion.ts, 17, 32))
 
-    let expected: { id: string, ...T, ...U } | { id: string, ...T, ...V } | { id: string, ...U } | { id: string, ...U, ...V };
+    let expected: { ...T, ...U, id: string } | { ...T, ...V, id: string } | { ...U, id: string } | { ...U, ...V, id: string };
 >expected : Symbol(expected, Decl(objectSpreadUnion.ts, 18, 7))
->id : Symbol(id, Decl(objectSpreadUnion.ts, 18, 19))
 >T : Symbol(T, Decl(objectSpreadUnion.ts, 14, 29))
 >U : Symbol(U, Decl(objectSpreadUnion.ts, 14, 31))
->id : Symbol(id, Decl(objectSpreadUnion.ts, 18, 48))
+>id : Symbol(id, Decl(objectSpreadUnion.ts, 18, 31))
 >T : Symbol(T, Decl(objectSpreadUnion.ts, 14, 29))
 >V : Symbol(V, Decl(objectSpreadUnion.ts, 14, 34))
->id : Symbol(id, Decl(objectSpreadUnion.ts, 18, 77))
+>id : Symbol(id, Decl(objectSpreadUnion.ts, 18, 60))
 >U : Symbol(U, Decl(objectSpreadUnion.ts, 14, 31))
->id : Symbol(id, Decl(objectSpreadUnion.ts, 18, 100))
+>id : Symbol(id, Decl(objectSpreadUnion.ts, 18, 83))
 >U : Symbol(U, Decl(objectSpreadUnion.ts, 14, 31))
 >V : Symbol(V, Decl(objectSpreadUnion.ts, 14, 34))
+>id : Symbol(id, Decl(objectSpreadUnion.ts, 18, 112))
 
-    let assignable: { id: string, ...(T | U), ...(U | V) } = result;
+    let assignable: { ...(T | U), ...(U | V), id: string } = result;
 >assignable : Symbol(assignable, Decl(objectSpreadUnion.ts, 19, 7))
->id : Symbol(id, Decl(objectSpreadUnion.ts, 19, 21))
 >T : Symbol(T, Decl(objectSpreadUnion.ts, 14, 29))
 >U : Symbol(U, Decl(objectSpreadUnion.ts, 14, 31))
 >U : Symbol(U, Decl(objectSpreadUnion.ts, 14, 31))
 >V : Symbol(V, Decl(objectSpreadUnion.ts, 14, 34))
+>id : Symbol(id, Decl(objectSpreadUnion.ts, 19, 45))
 >result : Symbol(result, Decl(objectSpreadUnion.ts, 17, 7))
 }
 
diff --git a/tests/baselines/reference/objectSpreadUnion.types b/tests/baselines/reference/objectSpreadUnion.types
index 7cbffcf0a58..5d8cdbae24a 100644
--- a/tests/baselines/reference/objectSpreadUnion.types
+++ b/tests/baselines/reference/objectSpreadUnion.types
@@ -48,30 +48,30 @@ function tripleUnion<T, U, V>(t: T, u: U, v: V): void {
 >U : U
 >V : V
 
-    let result = { id: 'foo', ...tuv };
->result : { id: string; ...T } | { id: string; ...U } | { id: string; ...V }
->{ id: 'foo', ...tuv } : { id: string; ...T } | { id: string; ...U } | { id: string; ...V }
+    let result = { ...tuv, id: 'foo' };
+>result : { ...T; id: string; } | { ...U; id: string; } | { ...V; id: string; }
+>{ ...tuv, id: 'foo' } : { ...T; id: string; } | { ...U; id: string; } | { ...V; id: string; }
+>tuv : any
 >id : string
 >'foo' : "foo"
->tuv : any
 
-    let expected: { id: string, ...T } | { id: string, ...U } | { id: string, ...V } = result;
->expected : { id: string; ...T } | { id: string; ...U } | { id: string; ...V }
->id : string
+    let expected: { ...T, id: string } | { ...U, id: string } | { ...V, id: string } = result;
+>expected : { ...T; id: string; } | { ...U; id: string; } | { ...V; id: string; }
 >T : T
 >id : string
 >U : U
 >id : string
 >V : V
->result : { id: string; ...T } | { id: string; ...U } | { id: string; ...V }
-
-    let assignable: { id: string, ...(T | U | V) } = result;
->assignable : { id: string; ...T } | { id: string; ...U } | { id: string; ...V }
 >id : string
+>result : { ...T; id: string; } | { ...U; id: string; } | { ...V; id: string; }
+
+    let assignable: { ...(T | U | V), id: string } = result;
+>assignable : { ...T; id: string; } | { ...U; id: string; } | { ...V; id: string; }
 >T : T
 >U : U
 >V : V
->result : { id: string; ...T } | { id: string; ...U } | { id: string; ...V }
+>id : string
+>result : { ...T; id: string; } | { ...U; id: string; } | { ...V; id: string; }
 }
 function iteratedDoubleUnion<T, U, V>(t: T, u: U, v: V): void {
 >iteratedDoubleUnion : <T, U, V>(t: T, u: U, v: V) => void
@@ -95,17 +95,16 @@ function iteratedDoubleUnion<T, U, V>(t: T, u: U, v: V): void {
 >U : U
 >V : V
 
-    let result = { id: 'bar', ...tu, ...uv };
->result : { id: string; ...T; ...U } | { id: string; ...U } | { id: string; ...T; ...V } | { id: string; ...U; ...V }
->{ id: 'bar', ...tu, ...uv } : { id: string; ...T; ...U } | { id: string; ...U } | { id: string; ...T; ...V } | { id: string; ...U; ...V }
->id : string
->'bar' : "bar"
+    let result = { ...tu, ...uv, id: 'bar' };
+>result : { ...U; id: string; } | { ...T; ...U; id: string; } | { ...U; ...T; ...U; id: string; } | { ...T; ...V; id: string; } | { ...U; ...T; ...V; id: string; } | { ...U; ...V; id: string; } | { ...T; ...U; ...V; id: string; }
+>{ ...tu, ...uv, id: 'bar' } : { ...U; id: string; } | { ...T; ...U; id: string; } | { ...U; ...T; ...U; id: string; } | { ...T; ...V; id: string; } | { ...U; ...T; ...V; id: string; } | { ...U; ...V; id: string; } | { ...T; ...U; ...V; id: string; }
 >tu : any
 >uv : any
+>id : string
+>'bar' : "bar"
 
-    let expected: { id: string, ...T, ...U } | { id: string, ...T, ...V } | { id: string, ...U } | { id: string, ...U, ...V };
->expected : { id: string; ...T; ...U } | { id: string; ...T; ...V } | { id: string; ...U } | { id: string; ...U; ...V }
->id : string
+    let expected: { ...T, ...U, id: string } | { ...T, ...V, id: string } | { ...U, id: string } | { ...U, ...V, id: string };
+>expected : { ...T; ...U; id: string; } | { ...T; ...V; id: string; } | { ...U; id: string; } | { ...U; ...V; id: string; }
 >T : T
 >U : U
 >id : string
@@ -116,15 +115,16 @@ function iteratedDoubleUnion<T, U, V>(t: T, u: U, v: V): void {
 >id : string
 >U : U
 >V : V
+>id : string
 
-    let assignable: { id: string, ...(T | U), ...(U | V) } = result;
->assignable : { id: string; ...T; ...U } | { id: string; ...U } | { id: string; ...T; ...V } | { id: string; ...U; ...V }
->id : string
+    let assignable: { ...(T | U), ...(U | V), id: string } = result;
+>assignable : { ...U; id: string; } | { ...T; ...U; id: string; } | { ...U; ...T; ...U; id: string; } | { ...T; ...V; id: string; } | { ...U; ...T; ...V; id: string; } | { ...U; ...V; id: string; } | { ...T; ...U; ...V; id: string; }
 >T : T
 >U : U
 >U : U
 >V : V
->result : { id: string; ...T; ...U } | { id: string; ...U } | { id: string; ...T; ...V } | { id: string; ...U; ...V }
+>id : string
+>result : { ...U; id: string; } | { ...T; ...U; id: string; } | { ...U; ...T; ...U; id: string; } | { ...T; ...V; id: string; } | { ...U; ...T; ...V; id: string; } | { ...U; ...V; id: string; } | { ...T; ...U; ...V; id: string; }
 }
 
 
diff --git a/tests/cases/conformance/types/spread/objectSpread.ts b/tests/cases/conformance/types/spread/objectSpread.ts
index fc076e79543..e35a84956c0 100644
--- a/tests/cases/conformance/types/spread/objectSpread.ts
+++ b/tests/cases/conformance/types/spread/objectSpread.ts
@@ -83,8 +83,8 @@ let a = 12;
 let shortCutted: { a: number, b: string } = { ...o, a }
 
 // generics
-function f<T, U>(t: T, u: U): { id: string, ...T, ...U } {
-    return { id: 'id', ...t, ...u };
+function f<T, U>(t: T, u: U): { ...T, ...U, id: string } {
+    return { ...t, ...u, id: 'id' };
 }
 let exclusive: { id: string, a: number, b: string, c: string, d: boolean } =
     f({ a: 1, b: 'yes' }, { c: 'no', d: false })
@@ -92,7 +92,7 @@ let overlap: { id: string, a: number, b: string } =
     f({ a: 1 }, { a: 2, b: 'extra' })
 let overlapConflict: { id:string, a: string } =
     f({ a: 1 }, { a: 'mismatch' })
-let overwriteId: { id: boolean, a: number, c: number, d: string } =
+let overwriteId: { id: string, a: number, c: number, d: string } =
     f({ a: 1, id: true }, { c: 1, d: 'no' })
 
 class D { m() { }; q = 2; }
diff --git a/tests/cases/conformance/types/spread/objectSpreadGeneric.ts b/tests/cases/conformance/types/spread/objectSpreadGeneric.ts
index e3bd1ab7bb3..63e9f00aaae 100644
--- a/tests/cases/conformance/types/spread/objectSpreadGeneric.ts
+++ b/tests/cases/conformance/types/spread/objectSpreadGeneric.ts
@@ -13,34 +13,36 @@ function f<T, U, V>(t: T, u: U, v: V): void {
     const missingU: { ...T, ...V } = o; // error, missing U
     const missingV: { ...T, ...U } = o; // error, missing V
     const atEnd: { ...T, ...U, second: string } = { ...t, ...u, second: 'foo' }; // ok
-    const atBeginning: { first: string, ...T, ...U, } = { first: 'foo', ...t, ...u }; // ok
+    const atBeginning: { first: string, ...T, ...U, } = { first: 'foo', ...t, ...u }; // error, not assignable
 
     const emptyTarget: { } = { ...t, ...u } // ok
     const emptySource: { ...T, ...U } = { }; // error, {} is not assignable to U (or T)
 
+    // error, { sn?: boolean } ...T ... { sn?: number | string } is not assignable to
+    //        T ... { sn?: number | string | boolean }
     let optionalNumber: { sn?: number };
     let optionalString: { sn?: string };
     let optionalBoolean: { sn?: boolean };
     const unionCutoff: { ...T, sn?: number | string | boolean } =
-        { ...optionalBoolean, ...t, ...optionalString, ...optionalNumber } // ok
+        { ...optionalBoolean, ...t, ...optionalString, ...optionalNumber }
     unionCutoff.sn; // ok
     const optionalCutoff = { ...t, ...optionalNumber }; // ok
     optionalCutoff.sn; // ok
 
     const interspersed: { first: string, ...T, second: string, ...U, third: string } =
-        { first: '1', ...t, second: '2', ...u, third: '3' }; // ok
+        { first: '1', ...t, second: '2', ...u, third: '3' }; // error, not assignable
     const interspersedMissingU: { first: string, second: string, ...T, third: string } =
         { first: '1', ...t, second: '2', ...u, third: '3' }; // error, 'U' is missing
     const interspersedOrder1: { first: string, ...T, second: string, ...U, third: string, secondsecond: string } =
-        { first: '1', ...t, second: '2', ...u, third: '3', secondsecond: 'false' }; // ok
+        { first: '1', ...t, second: '2', ...u, third: '3', secondsecond: 'false' }; // error, not assignable
     const interspersedOrder2: { first: string, second: string, secondsecond: string, third: string, ...T, ...U } =
-        { first: '1', ...t, second: '2', ...u, third: '3', secondsecond: 'false' }; // ok
+        { first: '1', ...t, second: '2', ...u, third: '3', secondsecond: 'false' }; // error, not assignable
 
 
     const mismatchFirst: { first: string, ...T, second: string, ...U, third: string } =
-        { firrrrrrst: '1', ...t, second: '2', ...u, third: '3' }; // error, 'first' not found
+        { firrrrrrst: '1', ...t, second: '2', ...u, third: '3' }; // error, not assignable
     const mismatchSecond: { first: string, ...T, second: string, ...U, third: string } =
-        { first: '1', ...t, ssssssssecond: '2', ...u, third: '3' }; // error, 'second' not found
+        { first: '1', ...t, ssssssssecond: '2', ...u, third: '3' }; // error, not assignable
     const mismatchLast: { first: string, ...T, second: string, ...U, third: string } =
-        { first: '1', ...t, second: '2', ...u, thirrrrrrrd: '3' }; // error, 'third' not found
+        { first: '1', ...t, second: '2', ...u, thirrrrrrrd: '3' }; // error, not assignable
 }
diff --git a/tests/cases/conformance/types/spread/objectSpreadIntersection.ts b/tests/cases/conformance/types/spread/objectSpreadIntersection.ts
index 6471e622b68..f70995cb4b2 100644
--- a/tests/cases/conformance/types/spread/objectSpreadIntersection.ts
+++ b/tests/cases/conformance/types/spread/objectSpreadIntersection.ts
@@ -1,9 +1,9 @@
 function iteratedUnionIntersection<T, U, V>(t: T, u: U, v: V): void {
     let tu: T | U;
     let uv: U & V;
-    let result = { id: 'bar', ...tu, ...uv };
-    let expected: ({ id: string, ...T, ...U } & { id: string, ...T, ...V }) | ({ id: string, ...U } & { id: string, ...U, ...V });
-    let assignable: { id: string, ...(T | U), ...(U & V) } = result;
+    let result = { ...tu, ...uv, id: 'foo' };
+    let expected: ({ ...T, ...U, id: string } & { ...T, ...V, id: string }) | ({ ...U, id: string } & { ...U, ...V, id: string });
+    let assignable: { ...(T | U), ...(U & V), id: string } = result;
 }
 // concrete types work
 interface A1 { a: number }
@@ -15,22 +15,22 @@ let assignable: { ...(A1 & A2) } = result;
 
 function tripleIntersection<T, U, V>(t: T, u: U, v: V): void {
     let tuv: T & U & V;
-    let result = { id: 'foo', ...tuv };
-    let expected: { id: string, ...T } & { id: string, ...U } & { id: string, ...V } = result;
-    let assignable: { id: string, ...(T & U & V) } = result;
+    let result = { ...tuv, id: 'bar' };
+    let expected: { ...T, id: string } & { ...U, id: string } & { ...V, id: string } = result;
+    let assignable: { ...(T & U & V), id: string } = result;
 }
 function iteratedDoubleIntersection<T, U, V>(t: T, u: U, v: V): void {
     let tu: T & U;
     let uv: U & V;
-    let result = { id: 'bar', ...tu, ...uv };
-    let expected: { id: string, ...T, ...U } & { id: string, ...T, ...V } & { id: string, ...U } & { id: string, ...U, ...V };
-    let assignable: { id: string, ...(T & U), ...(U & V) } = result;
+    let result = { ...tu, ...uv, id: 'baz' };
+    let expected: { ...T, ...U, id: string } & { ...T, ...V, id: string } & { ...U, id: string } & { ...U, ...V, id: string };
+    let assignable: { ...(T & U), ...(U & V), id: string } = result;
 }
 function iteratedIntersectionUnion<T, U, V>(t: T, u: U, v: V): void {
     let tu: T & U;
     let uv: U | V;
-    let result = { id: 'bar', ...tu, ...uv };
-    let expected: ({ id: string, ...T, ...U } & { id: string, ...U }) | ({ id: string, ...T, ...V } & { id: string, ...U, ...V });
-    let assignable: { id: string, ...(T & U), ...(U | V) } = result;
+    let result = { ...tu, ...uv, id: 'qux' };
+    let expected: ({ ...T, ...U, id: string } & { ...U, id: string }) | ({ ...T, ...V, id: string } & { ...U, ...V, id: string });
+    let assignable: { ...(T & U), ...(U | V), id: string } = result;
 }
 
diff --git a/tests/cases/conformance/types/spread/objectSpreadUnion.ts b/tests/cases/conformance/types/spread/objectSpreadUnion.ts
index 03a4251ca81..cd490d76bda 100644
--- a/tests/cases/conformance/types/spread/objectSpreadUnion.ts
+++ b/tests/cases/conformance/types/spread/objectSpreadUnion.ts
@@ -8,16 +8,16 @@ let assignable: { ...(A1 | A2) } = result;
 
 function tripleUnion<T, U, V>(t: T, u: U, v: V): void {
     let tuv: T | U | V;
-    let result = { id: 'foo', ...tuv };
-    let expected: { id: string, ...T } | { id: string, ...U } | { id: string, ...V } = result;
-    let assignable: { id: string, ...(T | U | V) } = result;
+    let result = { ...tuv, id: 'foo' };
+    let expected: { ...T, id: string } | { ...U, id: string } | { ...V, id: string } = result;
+    let assignable: { ...(T | U | V), id: string } = result;
 }
 function iteratedDoubleUnion<T, U, V>(t: T, u: U, v: V): void {
     let tu: T | U;
     let uv: U | V;
-    let result = { id: 'bar', ...tu, ...uv };
-    let expected: { id: string, ...T, ...U } | { id: string, ...T, ...V } | { id: string, ...U } | { id: string, ...U, ...V };
-    let assignable: { id: string, ...(T | U), ...(U | V) } = result;
+    let result = { ...tu, ...uv, id: 'bar' };
+    let expected: { ...T, ...U, id: string } | { ...T, ...V, id: string } | { ...U, id: string } | { ...U, ...V, id: string };
+    let assignable: { ...(T | U), ...(U | V), id: string } = result;
 }
 
 

From 76d194440c2586557b73bb15cb40dd9550ff3a0b Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Thu, 20 Oct 2016 09:06:36 -0700
Subject: [PATCH 045/421] Spread no longer distributes intersections

---
 src/compiler/checker.ts | 18 ++++--------------
 src/compiler/types.ts   |  2 +-
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index e3651f6cf30..f0ad77cd5c4 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -5810,11 +5810,6 @@ namespace ts {
                 types.push(rspread.right);
                 return getSpreadType(types, symbol, aliasSymbol, aliasTypeArguments);
             }
-            if (right.flags & TypeFlags.Intersection) {
-                const spreads = map((right as IntersectionType).types,
-                                    t => getSpreadType(types.slice().concat([t]), symbol, aliasSymbol, aliasTypeArguments));
-                return getIntersectionType(spreads, aliasSymbol, aliasTypeArguments);
-            }
             if (right.flags & TypeFlags.Union) {
                 const spreads = map((right as UnionType).types,
                                     t => getSpreadType(types.slice().concat([t]), symbol, aliasSymbol, aliasTypeArguments));
@@ -5840,11 +5835,6 @@ namespace ts {
                 const simplified = getSpreadType([right, (left as SpreadType).right], symbol, aliasSymbol, aliasTypeArguments);
                 return getSpreadType([(left as SpreadType).left, simplified], symbol, aliasSymbol, aliasTypeArguments);
             }
-            if (left.flags & TypeFlags.Intersection) {
-                const spreads = map((left as IntersectionType).types,
-                                  t => getSpreadType(types.slice().concat([t, right]), symbol, aliasSymbol, aliasTypeArguments));
-                return getIntersectionType(spreads, aliasSymbol, aliasTypeArguments);
-            }
             if (left.flags & TypeFlags.Union) {
                 const spreads = map((left as UnionType).types,
                                   t => getSpreadType(types.slice().concat([t, right]), symbol, aliasSymbol, aliasTypeArguments));
@@ -5901,9 +5891,9 @@ namespace ts {
             }
             const spread = spreadTypes[id] = createObjectType(TypeFlags.Spread, symbol) as SpreadType;
             Debug.assert(!!(left.flags & (TypeFlags.Spread | TypeFlags.ObjectType)), "Left flags: " + left.flags.toString(2));
-            Debug.assert(!!(right.flags & (TypeFlags.TypeParameter | TypeFlags.ObjectType)), "Right flags: " + right.flags.toString(2));
+            Debug.assert(!!(right.flags & (TypeFlags.TypeParameter | TypeFlags.Intersection | TypeFlags.ObjectType)), "Right flags: " + right.flags.toString(2));
             spread.left = left as SpreadType | ResolvedType;
-            spread.right = right as TypeParameter | ResolvedType;
+            spread.right = right as TypeParameter | IntersectionType | ResolvedType;
             spread.aliasSymbol = aliasSymbol;
             spread.aliasTypeArguments = aliasTypeArguments;
             return spread;
@@ -6953,11 +6943,11 @@ namespace ts {
                         spreadTypeRelatedTo(source.right.flags & TypeFlags.ObjectType ? source.left as SpreadType : source,
                                             target.right.flags & TypeFlags.ObjectType ? target.left as SpreadType : target);
                 }
-                // If both right sides are type parameters, then they must be identical for the spread types to be related.
+                // If both right sides are type parameters or intersections, then they must be identical for the spread types to be related.
                 // It also means that the left sides are either spread types or object types.
 
                 // if one left is object and the other is spread, that means the second has another type parameter. which isn't allowed
-                if (target.right.symbol !== source.right.symbol) {
+                if (target.right !== source.right) {
                     return false;
                 }
                 if (source.left.flags & TypeFlags.Spread && target.left.flags & TypeFlags.Spread) {
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 10c9abbd1ca..3dbfba72acb 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -2780,7 +2780,7 @@ namespace ts {
     /* @internal */
     export interface SpreadType extends Type {
         left: SpreadType | ResolvedType;
-        right: TypeParameter | ResolvedType;
+        right: TypeParameter | IntersectionType | ResolvedType;
     }
 
     /* @internal */

From d9afa34be18a2ab55a321f605de78315fbb57143 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Thu, 20 Oct 2016 09:07:01 -0700
Subject: [PATCH 046/421] Update spread w/intersection tests

---
 .../reference/objectSpreadIntersection.js     |   8 -
 .../objectSpreadIntersection.symbols          | 232 +++++++-----------
 .../reference/objectSpreadIntersection.types  |  94 ++-----
 .../reference/objectSpreadNegative.errors.txt |  14 +-
 .../reference/objectSpreadNegative.js         |  14 +-
 .../types/spread/objectSpreadIntersection.ts  |   4 -
 .../types/spread/objectSpreadNegative.ts      |   7 +-
 7 files changed, 136 insertions(+), 237 deletions(-)

diff --git a/tests/baselines/reference/objectSpreadIntersection.js b/tests/baselines/reference/objectSpreadIntersection.js
index 0a7f1ddfcee..d86b7bfca58 100644
--- a/tests/baselines/reference/objectSpreadIntersection.js
+++ b/tests/baselines/reference/objectSpreadIntersection.js
@@ -3,7 +3,6 @@ function iteratedUnionIntersection<T, U, V>(t: T, u: U, v: V): void {
     let tu: T | U;
     let uv: U & V;
     let result = { ...tu, ...uv, id: 'foo' };
-    let expected: ({ ...T, ...U, id: string } & { ...T, ...V, id: string }) | ({ ...U, id: string } & { ...U, ...V, id: string });
     let assignable: { ...(T | U), ...(U & V), id: string } = result;
 }
 // concrete types work
@@ -17,21 +16,18 @@ let assignable: { ...(A1 & A2) } = result;
 function tripleIntersection<T, U, V>(t: T, u: U, v: V): void {
     let tuv: T & U & V;
     let result = { ...tuv, id: 'bar' };
-    let expected: { ...T, id: string } & { ...U, id: string } & { ...V, id: string } = result;
     let assignable: { ...(T & U & V), id: string } = result;
 }
 function iteratedDoubleIntersection<T, U, V>(t: T, u: U, v: V): void {
     let tu: T & U;
     let uv: U & V;
     let result = { ...tu, ...uv, id: 'baz' };
-    let expected: { ...T, ...U, id: string } & { ...T, ...V, id: string } & { ...U, id: string } & { ...U, ...V, id: string };
     let assignable: { ...(T & U), ...(U & V), id: string } = result;
 }
 function iteratedIntersectionUnion<T, U, V>(t: T, u: U, v: V): void {
     let tu: T & U;
     let uv: U | V;
     let result = { ...tu, ...uv, id: 'qux' };
-    let expected: ({ ...T, ...U, id: string } & { ...U, id: string }) | ({ ...T, ...V, id: string } & { ...U, ...V, id: string });
     let assignable: { ...(T & U), ...(U | V), id: string } = result;
 }
 
@@ -50,7 +46,6 @@ function iteratedUnionIntersection(t, u, v) {
     var tu;
     var uv;
     var result = __assign({}, tu, uv, { id: 'foo' });
-    var expected;
     var assignable = result;
 }
 var a12;
@@ -60,20 +55,17 @@ var assignable = result;
 function tripleIntersection(t, u, v) {
     var tuv;
     var result = __assign({}, tuv, { id: 'bar' });
-    var expected = result;
     var assignable = result;
 }
 function iteratedDoubleIntersection(t, u, v) {
     var tu;
     var uv;
     var result = __assign({}, tu, uv, { id: 'baz' });
-    var expected;
     var assignable = result;
 }
 function iteratedIntersectionUnion(t, u, v) {
     var tu;
     var uv;
     var result = __assign({}, tu, uv, { id: 'qux' });
-    var expected;
     var assignable = result;
 }
diff --git a/tests/baselines/reference/objectSpreadIntersection.symbols b/tests/baselines/reference/objectSpreadIntersection.symbols
index c59c37670b2..6dd27645ddf 100644
--- a/tests/baselines/reference/objectSpreadIntersection.symbols
+++ b/tests/baselines/reference/objectSpreadIntersection.symbols
@@ -25,195 +25,143 @@ function iteratedUnionIntersection<T, U, V>(t: T, u: U, v: V): void {
 >result : Symbol(result, Decl(objectSpreadIntersection.ts, 3, 7))
 >id : Symbol(id, Decl(objectSpreadIntersection.ts, 3, 32))
 
-    let expected: ({ ...T, ...U, id: string } & { ...T, ...V, id: string }) | ({ ...U, id: string } & { ...U, ...V, id: string });
->expected : Symbol(expected, Decl(objectSpreadIntersection.ts, 4, 7))
->T : Symbol(T, Decl(objectSpreadIntersection.ts, 0, 35))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 0, 37))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 4, 32))
->T : Symbol(T, Decl(objectSpreadIntersection.ts, 0, 35))
->V : Symbol(V, Decl(objectSpreadIntersection.ts, 0, 40))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 4, 61))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 0, 37))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 4, 86))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 0, 37))
->V : Symbol(V, Decl(objectSpreadIntersection.ts, 0, 40))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 4, 115))
-
     let assignable: { ...(T | U), ...(U & V), id: string } = result;
->assignable : Symbol(assignable, Decl(objectSpreadIntersection.ts, 5, 7))
+>assignable : Symbol(assignable, Decl(objectSpreadIntersection.ts, 4, 7))
 >T : Symbol(T, Decl(objectSpreadIntersection.ts, 0, 35))
 >U : Symbol(U, Decl(objectSpreadIntersection.ts, 0, 37))
 >U : Symbol(U, Decl(objectSpreadIntersection.ts, 0, 37))
 >V : Symbol(V, Decl(objectSpreadIntersection.ts, 0, 40))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 5, 45))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 4, 45))
 >result : Symbol(result, Decl(objectSpreadIntersection.ts, 3, 7))
 }
 // concrete types work
 interface A1 { a: number }
->A1 : Symbol(A1, Decl(objectSpreadIntersection.ts, 6, 1))
->a : Symbol(A1.a, Decl(objectSpreadIntersection.ts, 8, 14))
+>A1 : Symbol(A1, Decl(objectSpreadIntersection.ts, 5, 1))
+>a : Symbol(A1.a, Decl(objectSpreadIntersection.ts, 7, 14))
 
 interface A2 { a: string }
->A2 : Symbol(A2, Decl(objectSpreadIntersection.ts, 8, 26))
->a : Symbol(A2.a, Decl(objectSpreadIntersection.ts, 9, 14))
+>A2 : Symbol(A2, Decl(objectSpreadIntersection.ts, 7, 26))
+>a : Symbol(A2.a, Decl(objectSpreadIntersection.ts, 8, 14))
 
 let a12: A1 & A2;
->a12 : Symbol(a12, Decl(objectSpreadIntersection.ts, 10, 3))
->A1 : Symbol(A1, Decl(objectSpreadIntersection.ts, 6, 1))
->A2 : Symbol(A2, Decl(objectSpreadIntersection.ts, 8, 26))
+>a12 : Symbol(a12, Decl(objectSpreadIntersection.ts, 9, 3))
+>A1 : Symbol(A1, Decl(objectSpreadIntersection.ts, 5, 1))
+>A2 : Symbol(A2, Decl(objectSpreadIntersection.ts, 7, 26))
 
 let result = { ...a12 };
->result : Symbol(result, Decl(objectSpreadIntersection.ts, 11, 3))
+>result : Symbol(result, Decl(objectSpreadIntersection.ts, 10, 3))
 
 let sn: number & string = result.a;
->sn : Symbol(sn, Decl(objectSpreadIntersection.ts, 12, 3))
->result.a : Symbol(a, Decl(objectSpreadIntersection.ts, 8, 14), Decl(objectSpreadIntersection.ts, 9, 14))
->result : Symbol(result, Decl(objectSpreadIntersection.ts, 11, 3))
->a : Symbol(a, Decl(objectSpreadIntersection.ts, 8, 14), Decl(objectSpreadIntersection.ts, 9, 14))
+>sn : Symbol(sn, Decl(objectSpreadIntersection.ts, 11, 3))
+>result.a : Symbol(a, Decl(objectSpreadIntersection.ts, 7, 14), Decl(objectSpreadIntersection.ts, 8, 14))
+>result : Symbol(result, Decl(objectSpreadIntersection.ts, 10, 3))
+>a : Symbol(a, Decl(objectSpreadIntersection.ts, 7, 14), Decl(objectSpreadIntersection.ts, 8, 14))
 
 let assignable: { ...(A1 & A2) } = result;
->assignable : Symbol(assignable, Decl(objectSpreadIntersection.ts, 13, 3))
->A1 : Symbol(A1, Decl(objectSpreadIntersection.ts, 6, 1))
->A2 : Symbol(A2, Decl(objectSpreadIntersection.ts, 8, 26))
->result : Symbol(result, Decl(objectSpreadIntersection.ts, 11, 3))
+>assignable : Symbol(assignable, Decl(objectSpreadIntersection.ts, 12, 3))
+>A1 : Symbol(A1, Decl(objectSpreadIntersection.ts, 5, 1))
+>A2 : Symbol(A2, Decl(objectSpreadIntersection.ts, 7, 26))
+>result : Symbol(result, Decl(objectSpreadIntersection.ts, 10, 3))
 
 function tripleIntersection<T, U, V>(t: T, u: U, v: V): void {
->tripleIntersection : Symbol(tripleIntersection, Decl(objectSpreadIntersection.ts, 13, 42))
->T : Symbol(T, Decl(objectSpreadIntersection.ts, 15, 28))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 15, 30))
->V : Symbol(V, Decl(objectSpreadIntersection.ts, 15, 33))
->t : Symbol(t, Decl(objectSpreadIntersection.ts, 15, 37))
->T : Symbol(T, Decl(objectSpreadIntersection.ts, 15, 28))
->u : Symbol(u, Decl(objectSpreadIntersection.ts, 15, 42))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 15, 30))
->v : Symbol(v, Decl(objectSpreadIntersection.ts, 15, 48))
->V : Symbol(V, Decl(objectSpreadIntersection.ts, 15, 33))
+>tripleIntersection : Symbol(tripleIntersection, Decl(objectSpreadIntersection.ts, 12, 42))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 14, 28))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 14, 30))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 14, 33))
+>t : Symbol(t, Decl(objectSpreadIntersection.ts, 14, 37))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 14, 28))
+>u : Symbol(u, Decl(objectSpreadIntersection.ts, 14, 42))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 14, 30))
+>v : Symbol(v, Decl(objectSpreadIntersection.ts, 14, 48))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 14, 33))
 
     let tuv: T & U & V;
->tuv : Symbol(tuv, Decl(objectSpreadIntersection.ts, 16, 7))
->T : Symbol(T, Decl(objectSpreadIntersection.ts, 15, 28))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 15, 30))
->V : Symbol(V, Decl(objectSpreadIntersection.ts, 15, 33))
+>tuv : Symbol(tuv, Decl(objectSpreadIntersection.ts, 15, 7))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 14, 28))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 14, 30))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 14, 33))
 
     let result = { ...tuv, id: 'bar' };
->result : Symbol(result, Decl(objectSpreadIntersection.ts, 17, 7))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 17, 26))
-
-    let expected: { ...T, id: string } & { ...U, id: string } & { ...V, id: string } = result;
->expected : Symbol(expected, Decl(objectSpreadIntersection.ts, 18, 7))
->T : Symbol(T, Decl(objectSpreadIntersection.ts, 15, 28))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 18, 25))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 15, 30))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 18, 48))
->V : Symbol(V, Decl(objectSpreadIntersection.ts, 15, 33))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 18, 71))
->result : Symbol(result, Decl(objectSpreadIntersection.ts, 17, 7))
+>result : Symbol(result, Decl(objectSpreadIntersection.ts, 16, 7))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 16, 26))
 
     let assignable: { ...(T & U & V), id: string } = result;
->assignable : Symbol(assignable, Decl(objectSpreadIntersection.ts, 19, 7))
->T : Symbol(T, Decl(objectSpreadIntersection.ts, 15, 28))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 15, 30))
->V : Symbol(V, Decl(objectSpreadIntersection.ts, 15, 33))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 19, 37))
->result : Symbol(result, Decl(objectSpreadIntersection.ts, 17, 7))
+>assignable : Symbol(assignable, Decl(objectSpreadIntersection.ts, 17, 7))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 14, 28))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 14, 30))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 14, 33))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 17, 37))
+>result : Symbol(result, Decl(objectSpreadIntersection.ts, 16, 7))
 }
 function iteratedDoubleIntersection<T, U, V>(t: T, u: U, v: V): void {
->iteratedDoubleIntersection : Symbol(iteratedDoubleIntersection, Decl(objectSpreadIntersection.ts, 20, 1))
->T : Symbol(T, Decl(objectSpreadIntersection.ts, 21, 36))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 21, 38))
->V : Symbol(V, Decl(objectSpreadIntersection.ts, 21, 41))
->t : Symbol(t, Decl(objectSpreadIntersection.ts, 21, 45))
->T : Symbol(T, Decl(objectSpreadIntersection.ts, 21, 36))
->u : Symbol(u, Decl(objectSpreadIntersection.ts, 21, 50))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 21, 38))
->v : Symbol(v, Decl(objectSpreadIntersection.ts, 21, 56))
->V : Symbol(V, Decl(objectSpreadIntersection.ts, 21, 41))
+>iteratedDoubleIntersection : Symbol(iteratedDoubleIntersection, Decl(objectSpreadIntersection.ts, 18, 1))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 19, 36))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 19, 38))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 19, 41))
+>t : Symbol(t, Decl(objectSpreadIntersection.ts, 19, 45))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 19, 36))
+>u : Symbol(u, Decl(objectSpreadIntersection.ts, 19, 50))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 19, 38))
+>v : Symbol(v, Decl(objectSpreadIntersection.ts, 19, 56))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 19, 41))
 
     let tu: T & U;
->tu : Symbol(tu, Decl(objectSpreadIntersection.ts, 22, 7))
->T : Symbol(T, Decl(objectSpreadIntersection.ts, 21, 36))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 21, 38))
+>tu : Symbol(tu, Decl(objectSpreadIntersection.ts, 20, 7))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 19, 36))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 19, 38))
 
     let uv: U & V;
->uv : Symbol(uv, Decl(objectSpreadIntersection.ts, 23, 7))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 21, 38))
->V : Symbol(V, Decl(objectSpreadIntersection.ts, 21, 41))
+>uv : Symbol(uv, Decl(objectSpreadIntersection.ts, 21, 7))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 19, 38))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 19, 41))
 
     let result = { ...tu, ...uv, id: 'baz' };
->result : Symbol(result, Decl(objectSpreadIntersection.ts, 24, 7))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 24, 32))
-
-    let expected: { ...T, ...U, id: string } & { ...T, ...V, id: string } & { ...U, id: string } & { ...U, ...V, id: string };
->expected : Symbol(expected, Decl(objectSpreadIntersection.ts, 25, 7))
->T : Symbol(T, Decl(objectSpreadIntersection.ts, 21, 36))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 21, 38))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 25, 31))
->T : Symbol(T, Decl(objectSpreadIntersection.ts, 21, 36))
->V : Symbol(V, Decl(objectSpreadIntersection.ts, 21, 41))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 25, 60))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 21, 38))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 25, 83))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 21, 38))
->V : Symbol(V, Decl(objectSpreadIntersection.ts, 21, 41))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 25, 112))
+>result : Symbol(result, Decl(objectSpreadIntersection.ts, 22, 7))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 22, 32))
 
     let assignable: { ...(T & U), ...(U & V), id: string } = result;
->assignable : Symbol(assignable, Decl(objectSpreadIntersection.ts, 26, 7))
->T : Symbol(T, Decl(objectSpreadIntersection.ts, 21, 36))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 21, 38))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 21, 38))
->V : Symbol(V, Decl(objectSpreadIntersection.ts, 21, 41))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 26, 45))
->result : Symbol(result, Decl(objectSpreadIntersection.ts, 24, 7))
+>assignable : Symbol(assignable, Decl(objectSpreadIntersection.ts, 23, 7))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 19, 36))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 19, 38))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 19, 38))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 19, 41))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 23, 45))
+>result : Symbol(result, Decl(objectSpreadIntersection.ts, 22, 7))
 }
 function iteratedIntersectionUnion<T, U, V>(t: T, u: U, v: V): void {
->iteratedIntersectionUnion : Symbol(iteratedIntersectionUnion, Decl(objectSpreadIntersection.ts, 27, 1))
->T : Symbol(T, Decl(objectSpreadIntersection.ts, 28, 35))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 28, 37))
->V : Symbol(V, Decl(objectSpreadIntersection.ts, 28, 40))
->t : Symbol(t, Decl(objectSpreadIntersection.ts, 28, 44))
->T : Symbol(T, Decl(objectSpreadIntersection.ts, 28, 35))
->u : Symbol(u, Decl(objectSpreadIntersection.ts, 28, 49))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 28, 37))
->v : Symbol(v, Decl(objectSpreadIntersection.ts, 28, 55))
->V : Symbol(V, Decl(objectSpreadIntersection.ts, 28, 40))
+>iteratedIntersectionUnion : Symbol(iteratedIntersectionUnion, Decl(objectSpreadIntersection.ts, 24, 1))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 25, 35))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 25, 37))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 25, 40))
+>t : Symbol(t, Decl(objectSpreadIntersection.ts, 25, 44))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 25, 35))
+>u : Symbol(u, Decl(objectSpreadIntersection.ts, 25, 49))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 25, 37))
+>v : Symbol(v, Decl(objectSpreadIntersection.ts, 25, 55))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 25, 40))
 
     let tu: T & U;
->tu : Symbol(tu, Decl(objectSpreadIntersection.ts, 29, 7))
->T : Symbol(T, Decl(objectSpreadIntersection.ts, 28, 35))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 28, 37))
+>tu : Symbol(tu, Decl(objectSpreadIntersection.ts, 26, 7))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 25, 35))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 25, 37))
 
     let uv: U | V;
->uv : Symbol(uv, Decl(objectSpreadIntersection.ts, 30, 7))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 28, 37))
->V : Symbol(V, Decl(objectSpreadIntersection.ts, 28, 40))
+>uv : Symbol(uv, Decl(objectSpreadIntersection.ts, 27, 7))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 25, 37))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 25, 40))
 
     let result = { ...tu, ...uv, id: 'qux' };
->result : Symbol(result, Decl(objectSpreadIntersection.ts, 31, 7))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 31, 32))
-
-    let expected: ({ ...T, ...U, id: string } & { ...U, id: string }) | ({ ...T, ...V, id: string } & { ...U, ...V, id: string });
->expected : Symbol(expected, Decl(objectSpreadIntersection.ts, 32, 7))
->T : Symbol(T, Decl(objectSpreadIntersection.ts, 28, 35))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 28, 37))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 32, 32))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 28, 37))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 32, 55))
->T : Symbol(T, Decl(objectSpreadIntersection.ts, 28, 35))
->V : Symbol(V, Decl(objectSpreadIntersection.ts, 28, 40))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 32, 86))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 28, 37))
->V : Symbol(V, Decl(objectSpreadIntersection.ts, 28, 40))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 32, 115))
+>result : Symbol(result, Decl(objectSpreadIntersection.ts, 28, 7))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 28, 32))
 
     let assignable: { ...(T & U), ...(U | V), id: string } = result;
->assignable : Symbol(assignable, Decl(objectSpreadIntersection.ts, 33, 7))
->T : Symbol(T, Decl(objectSpreadIntersection.ts, 28, 35))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 28, 37))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 28, 37))
->V : Symbol(V, Decl(objectSpreadIntersection.ts, 28, 40))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 33, 45))
->result : Symbol(result, Decl(objectSpreadIntersection.ts, 31, 7))
+>assignable : Symbol(assignable, Decl(objectSpreadIntersection.ts, 29, 7))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 25, 35))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 25, 37))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 25, 37))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 25, 40))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 29, 45))
+>result : Symbol(result, Decl(objectSpreadIntersection.ts, 28, 7))
 }
 
 
diff --git a/tests/baselines/reference/objectSpreadIntersection.types b/tests/baselines/reference/objectSpreadIntersection.types
index 30820017916..0e21f42a76b 100644
--- a/tests/baselines/reference/objectSpreadIntersection.types
+++ b/tests/baselines/reference/objectSpreadIntersection.types
@@ -22,35 +22,21 @@ function iteratedUnionIntersection<T, U, V>(t: T, u: U, v: V): void {
 >V : V
 
     let result = { ...tu, ...uv, id: 'foo' };
->result : ({ ...U; id: string; } | { ...T; ...U; id: string; } | { ...U; ...T; ...U; id: string; } | { ...T; ...U; ...T; ...U; id: string; }) & ({ ...T; ...V; id: string; } | { ...U; ...T; ...V; id: string; } | { ...U; ...V; id: string; } | { ...T; ...U; ...V; id: string; } | { ...T; ...U; ...T; ...V; id: string; } | { ...U; ...T; ...U; ...V; id: string; })
->{ ...tu, ...uv, id: 'foo' } : ({ ...U; id: string; } | { ...T; ...U; id: string; } | { ...U; ...T; ...U; id: string; } | { ...T; ...U; ...T; ...U; id: string; }) & ({ ...T; ...V; id: string; } | { ...U; ...T; ...V; id: string; } | { ...U; ...V; id: string; } | { ...T; ...U; ...V; id: string; } | { ...T; ...U; ...T; ...V; id: string; } | { ...U; ...T; ...U; ...V; id: string; })
+>result : { ...T; ...U & V; id: string; } | { ...U; ...U & V; id: string; }
+>{ ...tu, ...uv, id: 'foo' } : { ...T; ...U & V; id: string; } | { ...U; ...U & V; id: string; }
 >tu : any
 >uv : any
 >id : string
 >'foo' : "foo"
 
-    let expected: ({ ...T, ...U, id: string } & { ...T, ...V, id: string }) | ({ ...U, id: string } & { ...U, ...V, id: string });
->expected : ({ ...T; ...U; id: string; } & { ...T; ...V; id: string; }) | ({ ...U; id: string; } & { ...U; ...V; id: string; })
->T : T
->U : U
->id : string
->T : T
->V : V
->id : string
->U : U
->id : string
->U : U
->V : V
->id : string
-
     let assignable: { ...(T | U), ...(U & V), id: string } = result;
->assignable : ({ ...U; id: string; } | { ...T; ...U; id: string; } | { ...U; ...T; ...U; id: string; } | { ...T; ...U; ...T; ...U; id: string; }) & ({ ...T; ...V; id: string; } | { ...U; ...T; ...V; id: string; } | { ...U; ...V; id: string; } | { ...T; ...U; ...V; id: string; } | { ...T; ...U; ...T; ...V; id: string; } | { ...U; ...T; ...U; ...V; id: string; })
+>assignable : { ...T; ...U & V; id: string; } | { ...U; ...U & V; id: string; }
 >T : T
 >U : U
 >U : U
 >V : V
 >id : string
->result : ({ ...U; id: string; } | { ...T; ...U; id: string; } | { ...U; ...T; ...U; id: string; } | { ...T; ...U; ...T; ...U; id: string; }) & ({ ...T; ...V; id: string; } | { ...U; ...T; ...V; id: string; } | { ...U; ...V; id: string; } | { ...T; ...U; ...V; id: string; } | { ...T; ...U; ...T; ...V; id: string; } | { ...U; ...T; ...U; ...V; id: string; })
+>result : { ...T; ...U & V; id: string; } | { ...U; ...U & V; id: string; }
 }
 // concrete types work
 interface A1 { a: number }
@@ -67,21 +53,21 @@ let a12: A1 & A2;
 >A2 : A2
 
 let result = { ...a12 };
->result : { a: number; } & { a: string; }
->{ ...a12 } : { a: number; } & { a: string; }
+>result : { ...A1 & A2 }
+>{ ...a12 } : { ...A1 & A2 }
 >a12 : any
 
 let sn: number & string = result.a;
 >sn : number & string
 >result.a : number & string
->result : { a: number; } & { a: string; }
+>result : { ...A1 & A2 }
 >a : number & string
 
 let assignable: { ...(A1 & A2) } = result;
->assignable : { a: number; } & { a: string; }
+>assignable : { ...A1 & A2 }
 >A1 : A1
 >A2 : A2
->result : { a: number; } & { a: string; }
+>result : { ...A1 & A2 }
 
 function tripleIntersection<T, U, V>(t: T, u: U, v: V): void {
 >tripleIntersection : <T, U, V>(t: T, u: U, v: V) => void
@@ -102,29 +88,19 @@ function tripleIntersection<T, U, V>(t: T, u: U, v: V): void {
 >V : V
 
     let result = { ...tuv, id: 'bar' };
->result : { ...T; id: string; } & { ...U; id: string; } & { ...V; id: string; }
->{ ...tuv, id: 'bar' } : { ...T; id: string; } & { ...U; id: string; } & { ...V; id: string; }
+>result : { ...T & U & V; id: string; }
+>{ ...tuv, id: 'bar' } : { ...T & U & V; id: string; }
 >tuv : any
 >id : string
 >'bar' : "bar"
 
-    let expected: { ...T, id: string } & { ...U, id: string } & { ...V, id: string } = result;
->expected : { ...T; id: string; } & { ...U; id: string; } & { ...V; id: string; }
->T : T
->id : string
->U : U
->id : string
->V : V
->id : string
->result : { ...T; id: string; } & { ...U; id: string; } & { ...V; id: string; }
-
     let assignable: { ...(T & U & V), id: string } = result;
->assignable : { ...T; id: string; } & { ...U; id: string; } & { ...V; id: string; }
+>assignable : { ...T & U & V; id: string; }
 >T : T
 >U : U
 >V : V
 >id : string
->result : { ...T; id: string; } & { ...U; id: string; } & { ...V; id: string; }
+>result : { ...T & U & V; id: string; }
 }
 function iteratedDoubleIntersection<T, U, V>(t: T, u: U, v: V): void {
 >iteratedDoubleIntersection : <T, U, V>(t: T, u: U, v: V) => void
@@ -149,35 +125,21 @@ function iteratedDoubleIntersection<T, U, V>(t: T, u: U, v: V): void {
 >V : V
 
     let result = { ...tu, ...uv, id: 'baz' };
->result : { ...T; ...U; id: string; } & { ...U; ...T; ...U; id: string; } & { ...U; id: string; } & { ...T; ...V; id: string; } & { ...U; ...T; ...V; id: string; } & { ...T; ...U; ...V; id: string; } & { ...U; ...V; id: string; }
->{ ...tu, ...uv, id: 'baz' } : { ...T; ...U; id: string; } & { ...U; ...T; ...U; id: string; } & { ...U; id: string; } & { ...T; ...V; id: string; } & { ...U; ...T; ...V; id: string; } & { ...T; ...U; ...V; id: string; } & { ...U; ...V; id: string; }
+>result : { ...T & U; ...U & V; id: string; }
+>{ ...tu, ...uv, id: 'baz' } : { ...T & U; ...U & V; id: string; }
 >tu : any
 >uv : any
 >id : string
 >'baz' : "baz"
 
-    let expected: { ...T, ...U, id: string } & { ...T, ...V, id: string } & { ...U, id: string } & { ...U, ...V, id: string };
->expected : { ...T; ...U; id: string; } & { ...T; ...V; id: string; } & { ...U; id: string; } & { ...U; ...V; id: string; }
->T : T
->U : U
->id : string
->T : T
->V : V
->id : string
->U : U
->id : string
->U : U
->V : V
->id : string
-
     let assignable: { ...(T & U), ...(U & V), id: string } = result;
->assignable : { ...T; ...U; id: string; } & { ...U; ...T; ...U; id: string; } & { ...U; id: string; } & { ...T; ...V; id: string; } & { ...U; ...T; ...V; id: string; } & { ...T; ...U; ...V; id: string; } & { ...U; ...V; id: string; }
+>assignable : { ...T & U; ...U & V; id: string; }
 >T : T
 >U : U
 >U : U
 >V : V
 >id : string
->result : { ...T; ...U; id: string; } & { ...U; ...T; ...U; id: string; } & { ...U; id: string; } & { ...T; ...V; id: string; } & { ...U; ...T; ...V; id: string; } & { ...T; ...U; ...V; id: string; } & { ...U; ...V; id: string; }
+>result : { ...T & U; ...U & V; id: string; }
 }
 function iteratedIntersectionUnion<T, U, V>(t: T, u: U, v: V): void {
 >iteratedIntersectionUnion : <T, U, V>(t: T, u: U, v: V) => void
@@ -202,35 +164,21 @@ function iteratedIntersectionUnion<T, U, V>(t: T, u: U, v: V): void {
 >V : V
 
     let result = { ...tu, ...uv, id: 'qux' };
->result : ({ ...T; ...U; id: string; } & { ...U; ...T; ...U; id: string; } & { ...T; ...U; ...T; ...U; id: string; } & { ...U; id: string; }) | ({ ...T; ...V; id: string; } & { ...U; ...T; ...V; id: string; } & { ...T; ...U; ...T; ...V; id: string; } & { ...T; ...U; ...V; id: string; } & { ...U; ...T; ...U; ...V; id: string; } & { ...U; ...V; id: string; })
->{ ...tu, ...uv, id: 'qux' } : ({ ...T; ...U; id: string; } & { ...U; ...T; ...U; id: string; } & { ...T; ...U; ...T; ...U; id: string; } & { ...U; id: string; }) | ({ ...T; ...V; id: string; } & { ...U; ...T; ...V; id: string; } & { ...T; ...U; ...T; ...V; id: string; } & { ...T; ...U; ...V; id: string; } & { ...U; ...T; ...U; ...V; id: string; } & { ...U; ...V; id: string; })
+>result : { ...T & U; ...T & U; ...U; id: string; } | { ...T & U; ...T & U; ...V; id: string; }
+>{ ...tu, ...uv, id: 'qux' } : { ...T & U; ...T & U; ...U; id: string; } | { ...T & U; ...T & U; ...V; id: string; }
 >tu : any
 >uv : any
 >id : string
 >'qux' : "qux"
 
-    let expected: ({ ...T, ...U, id: string } & { ...U, id: string }) | ({ ...T, ...V, id: string } & { ...U, ...V, id: string });
->expected : ({ ...T; ...U; id: string; } & { ...U; id: string; }) | ({ ...T; ...V; id: string; } & { ...U; ...V; id: string; })
->T : T
->U : U
->id : string
->U : U
->id : string
->T : T
->V : V
->id : string
->U : U
->V : V
->id : string
-
     let assignable: { ...(T & U), ...(U | V), id: string } = result;
->assignable : ({ ...T; ...U; id: string; } & { ...U; ...T; ...U; id: string; } & { ...T; ...U; ...T; ...U; id: string; } & { ...U; id: string; }) | ({ ...T; ...V; id: string; } & { ...U; ...T; ...V; id: string; } & { ...T; ...U; ...T; ...V; id: string; } & { ...T; ...U; ...V; id: string; } & { ...U; ...T; ...U; ...V; id: string; } & { ...U; ...V; id: string; })
+>assignable : { ...T & U; ...T & U; ...U; id: string; } | { ...T & U; ...T & U; ...V; id: string; }
 >T : T
 >U : U
 >U : U
 >V : V
 >id : string
->result : ({ ...T; ...U; id: string; } & { ...U; ...T; ...U; id: string; } & { ...T; ...U; ...T; ...U; id: string; } & { ...U; id: string; }) | ({ ...T; ...V; id: string; } & { ...U; ...T; ...V; id: string; } & { ...T; ...U; ...T; ...V; id: string; } & { ...T; ...U; ...V; id: string; } & { ...U; ...T; ...U; ...V; id: string; } & { ...U; ...V; id: string; })
+>result : { ...T & U; ...T & U; ...U; id: string; } | { ...T & U; ...T & U; ...V; id: string; }
 }
 
 
diff --git a/tests/baselines/reference/objectSpreadNegative.errors.txt b/tests/baselines/reference/objectSpreadNegative.errors.txt
index b79354c4a94..64928782280 100644
--- a/tests/baselines/reference/objectSpreadNegative.errors.txt
+++ b/tests/baselines/reference/objectSpreadNegative.errors.txt
@@ -18,10 +18,11 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(49,12): error TS233
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(55,9): error TS2339: Property 'm' does not exist on type '{ p: number; }'.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(58,1): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type '{ x: number; }' has no compatible call signatures.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(59,1): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(63,12): error TS2322: Type '{ ...U }' is not assignable to type 'U'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(64,9): error TS2322: Type '{ ...T & V }' is not assignable to type '{ ...T & U }'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(66,12): error TS2322: Type '{ ...U }' is not assignable to type 'U'.
 
 
-==== tests/cases/conformance/types/spread/objectSpreadNegative.ts (18 errors) ====
+==== tests/cases/conformance/types/spread/objectSpreadNegative.ts (19 errors) ====
     let o = { a: 1, b: 'no' }
     
     /// private propagates
@@ -119,8 +120,13 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(63,12): error TS232
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
     
-    // { ...U } is not assignable to U
-    function override<U>(initial: U, override: U): U {
+    function override<T,U,V>(initial: U, override: U, t: T, v: V): U {
+        // { ... T & V } is not assignable to { ... T & U }
+        let tvs: { ...T & V };
+        let mistake: { ...T & U } = tvs;
+            ~~~~~~~
+!!! error TS2322: Type '{ ...T & V }' is not assignable to type '{ ...T & U }'.
+        // { ...U } is not assignable to U
         return { ...initial, ...override };
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2322: Type '{ ...U }' is not assignable to type 'U'.
diff --git a/tests/baselines/reference/objectSpreadNegative.js b/tests/baselines/reference/objectSpreadNegative.js
index 452ec457e9a..7187b6009bd 100644
--- a/tests/baselines/reference/objectSpreadNegative.js
+++ b/tests/baselines/reference/objectSpreadNegative.js
@@ -59,8 +59,11 @@ let callableConstructableSpread: { ...PublicX, (n: number): number, new (p: numb
 callableConstructableSpread(12); // error, no call signature
 new callableConstructableSpread(12); // error, no construct signature
 
-// { ...U } is not assignable to U
-function override<U>(initial: U, override: U): U {
+function override<T,U,V>(initial: U, override: U, t: T, v: V): U {
+    // { ... T & V } is not assignable to { ... T & U }
+    let tvs: { ...T & V };
+    let mistake: { ...T & U } = tvs;
+    // { ...U } is not assignable to U
     return { ...initial, ...override };
 }
 
@@ -133,7 +136,10 @@ spreadC.m(); // error 'm' is not in '{ ... c }'
 var callableConstructableSpread;
 callableConstructableSpread(12); // error, no call signature
 new callableConstructableSpread(12); // error, no construct signature
-// { ...U } is not assignable to U
-function override(initial, override) {
+function override(initial, override, t, v) {
+    // { ... T & V } is not assignable to { ... T & U }
+    var tvs;
+    var mistake = tvs;
+    // { ...U } is not assignable to U
     return __assign({}, initial, override);
 }
diff --git a/tests/cases/conformance/types/spread/objectSpreadIntersection.ts b/tests/cases/conformance/types/spread/objectSpreadIntersection.ts
index f70995cb4b2..636283dd715 100644
--- a/tests/cases/conformance/types/spread/objectSpreadIntersection.ts
+++ b/tests/cases/conformance/types/spread/objectSpreadIntersection.ts
@@ -2,7 +2,6 @@ function iteratedUnionIntersection<T, U, V>(t: T, u: U, v: V): void {
     let tu: T | U;
     let uv: U & V;
     let result = { ...tu, ...uv, id: 'foo' };
-    let expected: ({ ...T, ...U, id: string } & { ...T, ...V, id: string }) | ({ ...U, id: string } & { ...U, ...V, id: string });
     let assignable: { ...(T | U), ...(U & V), id: string } = result;
 }
 // concrete types work
@@ -16,21 +15,18 @@ let assignable: { ...(A1 & A2) } = result;
 function tripleIntersection<T, U, V>(t: T, u: U, v: V): void {
     let tuv: T & U & V;
     let result = { ...tuv, id: 'bar' };
-    let expected: { ...T, id: string } & { ...U, id: string } & { ...V, id: string } = result;
     let assignable: { ...(T & U & V), id: string } = result;
 }
 function iteratedDoubleIntersection<T, U, V>(t: T, u: U, v: V): void {
     let tu: T & U;
     let uv: U & V;
     let result = { ...tu, ...uv, id: 'baz' };
-    let expected: { ...T, ...U, id: string } & { ...T, ...V, id: string } & { ...U, id: string } & { ...U, ...V, id: string };
     let assignable: { ...(T & U), ...(U & V), id: string } = result;
 }
 function iteratedIntersectionUnion<T, U, V>(t: T, u: U, v: V): void {
     let tu: T & U;
     let uv: U | V;
     let result = { ...tu, ...uv, id: 'qux' };
-    let expected: ({ ...T, ...U, id: string } & { ...U, id: string }) | ({ ...T, ...V, id: string } & { ...U, ...V, id: string });
     let assignable: { ...(T & U), ...(U | V), id: string } = result;
 }
 
diff --git a/tests/cases/conformance/types/spread/objectSpreadNegative.ts b/tests/cases/conformance/types/spread/objectSpreadNegative.ts
index 04a88d2a427..146ab072bbf 100644
--- a/tests/cases/conformance/types/spread/objectSpreadNegative.ts
+++ b/tests/cases/conformance/types/spread/objectSpreadNegative.ts
@@ -59,7 +59,10 @@ let callableConstructableSpread: { ...PublicX, (n: number): number, new (p: numb
 callableConstructableSpread(12); // error, no call signature
 new callableConstructableSpread(12); // error, no construct signature
 
-// { ...U } is not assignable to U
-function override<U>(initial: U, override: U): U {
+function override<T,U,V>(initial: U, override: U, t: T, v: V): U {
+    // { ... T & V } is not assignable to { ... T & U }
+    let tvs: { ...T & V };
+    let mistake: { ...T & U } = tvs;
+    // { ...U } is not assignable to U
     return { ...initial, ...override };
 }

From ce61b341599263f2caf68f34c644038f410ddb76 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Fri, 21 Oct 2016 10:53:19 -0700
Subject: [PATCH 047/421] Resolve all-object intersections inside spreads

This means that getSpreadType will return an object type, even when
spreading two intersections, as long as those intersections contain
nothing but object types themselves.
---
 src/compiler/checker.ts | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index bf81d64ea06..5da7cc7e667 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -5828,13 +5828,16 @@ namespace ts {
                 types.push(rspread.right);
                 return getSpreadType(types, symbol, aliasSymbol, aliasTypeArguments);
             }
+            if (right.flags & TypeFlags.Intersection) {
+                right = resolveObjectIntersection(right as IntersectionType);
+            }
             if (right.flags & TypeFlags.Union) {
                 const spreads = map((right as UnionType).types,
                                     t => getSpreadType(types.slice().concat([t]), symbol, aliasSymbol, aliasTypeArguments));
                 return getUnionType(spreads, /*subtypeReduction*/ false, aliasSymbol, aliasTypeArguments);
             }
             const atBeginning = types.length === 0;
-            const left = getSpreadType(types, symbol, aliasSymbol, aliasTypeArguments);
+            let left = getSpreadType(types, symbol, aliasSymbol, aliasTypeArguments);
             if (right.flags & (TypeFlags.Primitive & ~TypeFlags.StringLike) || left.flags & TypeFlags.Any) {
                 return left;
             }
@@ -5853,6 +5856,9 @@ namespace ts {
                 const simplified = getSpreadType([right, (left as SpreadType).right], symbol, aliasSymbol, aliasTypeArguments);
                 return getSpreadType([(left as SpreadType).left, simplified], symbol, aliasSymbol, aliasTypeArguments);
             }
+            if (left.flags & TypeFlags.Intersection) {
+                left = resolveObjectIntersection(left as IntersectionType);
+            }
             if (left.flags & TypeFlags.Union) {
                 const spreads = map((left as UnionType).types,
                                   t => getSpreadType(types.slice().concat([t, right]), symbol, aliasSymbol, aliasTypeArguments));
@@ -5917,6 +5923,20 @@ namespace ts {
             return spread;
         }
 
+        function resolveObjectIntersection(intersection: IntersectionType): IntersectionType | ResolvedType {
+            if (find(intersection.types, t => !(t.flags & TypeFlags.ObjectType && !couldContainTypeParameters(t)))) {
+                return intersection;
+            }
+            const properties = getPropertiesOfType(intersection);
+            const members = createMap<Symbol>();
+            for (const property of properties) {
+                members[property.name] = property;
+            }
+            const stringIndex = getIndexInfoOfType(intersection, IndexKind.String);
+            const numberIndex = getIndexInfoOfType(intersection, IndexKind.Number);
+            return createAnonymousType(undefined, members, emptyArray, emptyArray, stringIndex, numberIndex);
+        }
+
         function createLiteralType(flags: TypeFlags, text: string) {
             const type = <LiteralType>createType(flags);
             type.text = text;

From 422f73b1a99eedc80dd70a7d97c49467b05172e3 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Fri, 21 Oct 2016 10:54:53 -0700
Subject: [PATCH 048/421] Update and improve spread intersection tests

---
 .../reference/objectSpreadIntersection.js     |  12 +-
 .../objectSpreadIntersection.symbols          | 181 ++++++++++--------
 .../reference/objectSpreadIntersection.types  |  37 +++-
 .../types/spread/objectSpreadIntersection.ts  |   8 +-
 4 files changed, 146 insertions(+), 92 deletions(-)

diff --git a/tests/baselines/reference/objectSpreadIntersection.js b/tests/baselines/reference/objectSpreadIntersection.js
index d86b7bfca58..2ec6ad35413 100644
--- a/tests/baselines/reference/objectSpreadIntersection.js
+++ b/tests/baselines/reference/objectSpreadIntersection.js
@@ -8,10 +8,14 @@ function iteratedUnionIntersection<T, U, V>(t: T, u: U, v: V): void {
 // concrete types work
 interface A1 { a: number }
 interface A2 { a: string }
+interface B1 { b: number }
+interface B2 { b: string }
 let a12: A1 & A2;
-let result = { ...a12 };
+let b12: B1 & B2;
+let result = { ...a12, ...b12 };
 let sn: number & string = result.a;
-let assignable: { ...(A1 & A2) } = result;
+sn = result.b;
+let assignable: { ...(A1 & A2), ...(B1 & B2) } = result;
 
 function tripleIntersection<T, U, V>(t: T, u: U, v: V): void {
     let tuv: T & U & V;
@@ -49,8 +53,10 @@ function iteratedUnionIntersection(t, u, v) {
     var assignable = result;
 }
 var a12;
-var result = __assign({}, a12);
+var b12;
+var result = __assign({}, a12, b12);
 var sn = result.a;
+sn = result.b;
 var assignable = result;
 function tripleIntersection(t, u, v) {
     var tuv;
diff --git a/tests/baselines/reference/objectSpreadIntersection.symbols b/tests/baselines/reference/objectSpreadIntersection.symbols
index 6dd27645ddf..bc63cb11348 100644
--- a/tests/baselines/reference/objectSpreadIntersection.symbols
+++ b/tests/baselines/reference/objectSpreadIntersection.symbols
@@ -43,125 +43,146 @@ interface A2 { a: string }
 >A2 : Symbol(A2, Decl(objectSpreadIntersection.ts, 7, 26))
 >a : Symbol(A2.a, Decl(objectSpreadIntersection.ts, 8, 14))
 
+interface B1 { b: number }
+>B1 : Symbol(B1, Decl(objectSpreadIntersection.ts, 8, 26))
+>b : Symbol(B1.b, Decl(objectSpreadIntersection.ts, 9, 14))
+
+interface B2 { b: string }
+>B2 : Symbol(B2, Decl(objectSpreadIntersection.ts, 9, 26))
+>b : Symbol(B2.b, Decl(objectSpreadIntersection.ts, 10, 14))
+
 let a12: A1 & A2;
->a12 : Symbol(a12, Decl(objectSpreadIntersection.ts, 9, 3))
+>a12 : Symbol(a12, Decl(objectSpreadIntersection.ts, 11, 3))
 >A1 : Symbol(A1, Decl(objectSpreadIntersection.ts, 5, 1))
 >A2 : Symbol(A2, Decl(objectSpreadIntersection.ts, 7, 26))
 
-let result = { ...a12 };
->result : Symbol(result, Decl(objectSpreadIntersection.ts, 10, 3))
+let b12: B1 & B2;
+>b12 : Symbol(b12, Decl(objectSpreadIntersection.ts, 12, 3))
+>B1 : Symbol(B1, Decl(objectSpreadIntersection.ts, 8, 26))
+>B2 : Symbol(B2, Decl(objectSpreadIntersection.ts, 9, 26))
+
+let result = { ...a12, ...b12 };
+>result : Symbol(result, Decl(objectSpreadIntersection.ts, 13, 3))
 
 let sn: number & string = result.a;
->sn : Symbol(sn, Decl(objectSpreadIntersection.ts, 11, 3))
+>sn : Symbol(sn, Decl(objectSpreadIntersection.ts, 14, 3))
 >result.a : Symbol(a, Decl(objectSpreadIntersection.ts, 7, 14), Decl(objectSpreadIntersection.ts, 8, 14))
->result : Symbol(result, Decl(objectSpreadIntersection.ts, 10, 3))
+>result : Symbol(result, Decl(objectSpreadIntersection.ts, 13, 3))
 >a : Symbol(a, Decl(objectSpreadIntersection.ts, 7, 14), Decl(objectSpreadIntersection.ts, 8, 14))
 
-let assignable: { ...(A1 & A2) } = result;
->assignable : Symbol(assignable, Decl(objectSpreadIntersection.ts, 12, 3))
+sn = result.b;
+>sn : Symbol(sn, Decl(objectSpreadIntersection.ts, 14, 3))
+>result.b : Symbol(b, Decl(objectSpreadIntersection.ts, 9, 14), Decl(objectSpreadIntersection.ts, 10, 14))
+>result : Symbol(result, Decl(objectSpreadIntersection.ts, 13, 3))
+>b : Symbol(b, Decl(objectSpreadIntersection.ts, 9, 14), Decl(objectSpreadIntersection.ts, 10, 14))
+
+let assignable: { ...(A1 & A2), ...(B1 & B2) } = result;
+>assignable : Symbol(assignable, Decl(objectSpreadIntersection.ts, 16, 3))
 >A1 : Symbol(A1, Decl(objectSpreadIntersection.ts, 5, 1))
 >A2 : Symbol(A2, Decl(objectSpreadIntersection.ts, 7, 26))
->result : Symbol(result, Decl(objectSpreadIntersection.ts, 10, 3))
+>B1 : Symbol(B1, Decl(objectSpreadIntersection.ts, 8, 26))
+>B2 : Symbol(B2, Decl(objectSpreadIntersection.ts, 9, 26))
+>result : Symbol(result, Decl(objectSpreadIntersection.ts, 13, 3))
 
 function tripleIntersection<T, U, V>(t: T, u: U, v: V): void {
->tripleIntersection : Symbol(tripleIntersection, Decl(objectSpreadIntersection.ts, 12, 42))
->T : Symbol(T, Decl(objectSpreadIntersection.ts, 14, 28))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 14, 30))
->V : Symbol(V, Decl(objectSpreadIntersection.ts, 14, 33))
->t : Symbol(t, Decl(objectSpreadIntersection.ts, 14, 37))
->T : Symbol(T, Decl(objectSpreadIntersection.ts, 14, 28))
->u : Symbol(u, Decl(objectSpreadIntersection.ts, 14, 42))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 14, 30))
->v : Symbol(v, Decl(objectSpreadIntersection.ts, 14, 48))
->V : Symbol(V, Decl(objectSpreadIntersection.ts, 14, 33))
+>tripleIntersection : Symbol(tripleIntersection, Decl(objectSpreadIntersection.ts, 16, 56))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 18, 28))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 18, 30))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 18, 33))
+>t : Symbol(t, Decl(objectSpreadIntersection.ts, 18, 37))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 18, 28))
+>u : Symbol(u, Decl(objectSpreadIntersection.ts, 18, 42))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 18, 30))
+>v : Symbol(v, Decl(objectSpreadIntersection.ts, 18, 48))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 18, 33))
 
     let tuv: T & U & V;
->tuv : Symbol(tuv, Decl(objectSpreadIntersection.ts, 15, 7))
->T : Symbol(T, Decl(objectSpreadIntersection.ts, 14, 28))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 14, 30))
->V : Symbol(V, Decl(objectSpreadIntersection.ts, 14, 33))
+>tuv : Symbol(tuv, Decl(objectSpreadIntersection.ts, 19, 7))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 18, 28))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 18, 30))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 18, 33))
 
     let result = { ...tuv, id: 'bar' };
->result : Symbol(result, Decl(objectSpreadIntersection.ts, 16, 7))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 16, 26))
+>result : Symbol(result, Decl(objectSpreadIntersection.ts, 20, 7))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 20, 26))
 
     let assignable: { ...(T & U & V), id: string } = result;
->assignable : Symbol(assignable, Decl(objectSpreadIntersection.ts, 17, 7))
->T : Symbol(T, Decl(objectSpreadIntersection.ts, 14, 28))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 14, 30))
->V : Symbol(V, Decl(objectSpreadIntersection.ts, 14, 33))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 17, 37))
->result : Symbol(result, Decl(objectSpreadIntersection.ts, 16, 7))
+>assignable : Symbol(assignable, Decl(objectSpreadIntersection.ts, 21, 7))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 18, 28))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 18, 30))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 18, 33))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 21, 37))
+>result : Symbol(result, Decl(objectSpreadIntersection.ts, 20, 7))
 }
 function iteratedDoubleIntersection<T, U, V>(t: T, u: U, v: V): void {
->iteratedDoubleIntersection : Symbol(iteratedDoubleIntersection, Decl(objectSpreadIntersection.ts, 18, 1))
->T : Symbol(T, Decl(objectSpreadIntersection.ts, 19, 36))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 19, 38))
->V : Symbol(V, Decl(objectSpreadIntersection.ts, 19, 41))
->t : Symbol(t, Decl(objectSpreadIntersection.ts, 19, 45))
->T : Symbol(T, Decl(objectSpreadIntersection.ts, 19, 36))
->u : Symbol(u, Decl(objectSpreadIntersection.ts, 19, 50))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 19, 38))
->v : Symbol(v, Decl(objectSpreadIntersection.ts, 19, 56))
->V : Symbol(V, Decl(objectSpreadIntersection.ts, 19, 41))
+>iteratedDoubleIntersection : Symbol(iteratedDoubleIntersection, Decl(objectSpreadIntersection.ts, 22, 1))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 23, 36))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 23, 38))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 23, 41))
+>t : Symbol(t, Decl(objectSpreadIntersection.ts, 23, 45))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 23, 36))
+>u : Symbol(u, Decl(objectSpreadIntersection.ts, 23, 50))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 23, 38))
+>v : Symbol(v, Decl(objectSpreadIntersection.ts, 23, 56))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 23, 41))
 
     let tu: T & U;
->tu : Symbol(tu, Decl(objectSpreadIntersection.ts, 20, 7))
->T : Symbol(T, Decl(objectSpreadIntersection.ts, 19, 36))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 19, 38))
+>tu : Symbol(tu, Decl(objectSpreadIntersection.ts, 24, 7))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 23, 36))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 23, 38))
 
     let uv: U & V;
->uv : Symbol(uv, Decl(objectSpreadIntersection.ts, 21, 7))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 19, 38))
->V : Symbol(V, Decl(objectSpreadIntersection.ts, 19, 41))
+>uv : Symbol(uv, Decl(objectSpreadIntersection.ts, 25, 7))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 23, 38))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 23, 41))
 
     let result = { ...tu, ...uv, id: 'baz' };
->result : Symbol(result, Decl(objectSpreadIntersection.ts, 22, 7))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 22, 32))
+>result : Symbol(result, Decl(objectSpreadIntersection.ts, 26, 7))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 26, 32))
 
     let assignable: { ...(T & U), ...(U & V), id: string } = result;
->assignable : Symbol(assignable, Decl(objectSpreadIntersection.ts, 23, 7))
->T : Symbol(T, Decl(objectSpreadIntersection.ts, 19, 36))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 19, 38))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 19, 38))
->V : Symbol(V, Decl(objectSpreadIntersection.ts, 19, 41))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 23, 45))
->result : Symbol(result, Decl(objectSpreadIntersection.ts, 22, 7))
+>assignable : Symbol(assignable, Decl(objectSpreadIntersection.ts, 27, 7))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 23, 36))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 23, 38))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 23, 38))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 23, 41))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 27, 45))
+>result : Symbol(result, Decl(objectSpreadIntersection.ts, 26, 7))
 }
 function iteratedIntersectionUnion<T, U, V>(t: T, u: U, v: V): void {
->iteratedIntersectionUnion : Symbol(iteratedIntersectionUnion, Decl(objectSpreadIntersection.ts, 24, 1))
->T : Symbol(T, Decl(objectSpreadIntersection.ts, 25, 35))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 25, 37))
->V : Symbol(V, Decl(objectSpreadIntersection.ts, 25, 40))
->t : Symbol(t, Decl(objectSpreadIntersection.ts, 25, 44))
->T : Symbol(T, Decl(objectSpreadIntersection.ts, 25, 35))
->u : Symbol(u, Decl(objectSpreadIntersection.ts, 25, 49))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 25, 37))
->v : Symbol(v, Decl(objectSpreadIntersection.ts, 25, 55))
->V : Symbol(V, Decl(objectSpreadIntersection.ts, 25, 40))
+>iteratedIntersectionUnion : Symbol(iteratedIntersectionUnion, Decl(objectSpreadIntersection.ts, 28, 1))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 29, 35))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 29, 37))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 29, 40))
+>t : Symbol(t, Decl(objectSpreadIntersection.ts, 29, 44))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 29, 35))
+>u : Symbol(u, Decl(objectSpreadIntersection.ts, 29, 49))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 29, 37))
+>v : Symbol(v, Decl(objectSpreadIntersection.ts, 29, 55))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 29, 40))
 
     let tu: T & U;
->tu : Symbol(tu, Decl(objectSpreadIntersection.ts, 26, 7))
->T : Symbol(T, Decl(objectSpreadIntersection.ts, 25, 35))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 25, 37))
+>tu : Symbol(tu, Decl(objectSpreadIntersection.ts, 30, 7))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 29, 35))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 29, 37))
 
     let uv: U | V;
->uv : Symbol(uv, Decl(objectSpreadIntersection.ts, 27, 7))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 25, 37))
->V : Symbol(V, Decl(objectSpreadIntersection.ts, 25, 40))
+>uv : Symbol(uv, Decl(objectSpreadIntersection.ts, 31, 7))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 29, 37))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 29, 40))
 
     let result = { ...tu, ...uv, id: 'qux' };
->result : Symbol(result, Decl(objectSpreadIntersection.ts, 28, 7))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 28, 32))
+>result : Symbol(result, Decl(objectSpreadIntersection.ts, 32, 7))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 32, 32))
 
     let assignable: { ...(T & U), ...(U | V), id: string } = result;
->assignable : Symbol(assignable, Decl(objectSpreadIntersection.ts, 29, 7))
->T : Symbol(T, Decl(objectSpreadIntersection.ts, 25, 35))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 25, 37))
->U : Symbol(U, Decl(objectSpreadIntersection.ts, 25, 37))
->V : Symbol(V, Decl(objectSpreadIntersection.ts, 25, 40))
->id : Symbol(id, Decl(objectSpreadIntersection.ts, 29, 45))
->result : Symbol(result, Decl(objectSpreadIntersection.ts, 28, 7))
+>assignable : Symbol(assignable, Decl(objectSpreadIntersection.ts, 33, 7))
+>T : Symbol(T, Decl(objectSpreadIntersection.ts, 29, 35))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 29, 37))
+>U : Symbol(U, Decl(objectSpreadIntersection.ts, 29, 37))
+>V : Symbol(V, Decl(objectSpreadIntersection.ts, 29, 40))
+>id : Symbol(id, Decl(objectSpreadIntersection.ts, 33, 45))
+>result : Symbol(result, Decl(objectSpreadIntersection.ts, 32, 7))
 }
 
 
diff --git a/tests/baselines/reference/objectSpreadIntersection.types b/tests/baselines/reference/objectSpreadIntersection.types
index 0e21f42a76b..13c1384698f 100644
--- a/tests/baselines/reference/objectSpreadIntersection.types
+++ b/tests/baselines/reference/objectSpreadIntersection.types
@@ -47,27 +47,50 @@ interface A2 { a: string }
 >A2 : A2
 >a : string
 
+interface B1 { b: number }
+>B1 : B1
+>b : number
+
+interface B2 { b: string }
+>B2 : B2
+>b : string
+
 let a12: A1 & A2;
 >a12 : A1 & A2
 >A1 : A1
 >A2 : A2
 
-let result = { ...a12 };
->result : { ...A1 & A2 }
->{ ...a12 } : { ...A1 & A2 }
+let b12: B1 & B2;
+>b12 : B1 & B2
+>B1 : B1
+>B2 : B2
+
+let result = { ...a12, ...b12 };
+>result : { b: number & string; a: number & string; }
+>{ ...a12, ...b12 } : { b: number & string; a: number & string; }
 >a12 : any
+>b12 : any
 
 let sn: number & string = result.a;
 >sn : number & string
 >result.a : number & string
->result : { ...A1 & A2 }
+>result : { b: number & string; a: number & string; }
 >a : number & string
 
-let assignable: { ...(A1 & A2) } = result;
->assignable : { ...A1 & A2 }
+sn = result.b;
+>sn = result.b : number & string
+>sn : number & string
+>result.b : number & string
+>result : { b: number & string; a: number & string; }
+>b : number & string
+
+let assignable: { ...(A1 & A2), ...(B1 & B2) } = result;
+>assignable : { b: number & string; a: number & string; }
 >A1 : A1
 >A2 : A2
->result : { ...A1 & A2 }
+>B1 : B1
+>B2 : B2
+>result : { b: number & string; a: number & string; }
 
 function tripleIntersection<T, U, V>(t: T, u: U, v: V): void {
 >tripleIntersection : <T, U, V>(t: T, u: U, v: V) => void
diff --git a/tests/cases/conformance/types/spread/objectSpreadIntersection.ts b/tests/cases/conformance/types/spread/objectSpreadIntersection.ts
index 636283dd715..3bedacca89f 100644
--- a/tests/cases/conformance/types/spread/objectSpreadIntersection.ts
+++ b/tests/cases/conformance/types/spread/objectSpreadIntersection.ts
@@ -7,10 +7,14 @@ function iteratedUnionIntersection<T, U, V>(t: T, u: U, v: V): void {
 // concrete types work
 interface A1 { a: number }
 interface A2 { a: string }
+interface B1 { b: number }
+interface B2 { b: string }
 let a12: A1 & A2;
-let result = { ...a12 };
+let b12: B1 & B2;
+let result = { ...a12, ...b12 };
 let sn: number & string = result.a;
-let assignable: { ...(A1 & A2) } = result;
+sn = result.b;
+let assignable: { ...(A1 & A2), ...(B1 & B2) } = result;
 
 function tripleIntersection<T, U, V>(t: T, u: U, v: V): void {
     let tuv: T & U & V;

From fdfb159024047fff8980391653cda6419046fa36 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Fri, 21 Oct 2016 13:38:24 -0700
Subject: [PATCH 049/421] Simplify expression in resolveObjectIntersection

---
 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 5da7cc7e667..9df086f1bb7 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -5924,7 +5924,7 @@ namespace ts {
         }
 
         function resolveObjectIntersection(intersection: IntersectionType): IntersectionType | ResolvedType {
-            if (find(intersection.types, t => !(t.flags & TypeFlags.ObjectType && !couldContainTypeParameters(t)))) {
+            if (find(intersection.types, t => !(t.flags & TypeFlags.ObjectType) || couldContainTypeParameters(t))) {
                 return intersection;
             }
             const properties = getPropertiesOfType(intersection);

From 03a6eeb6436780c78026c1bbf453feec1d6ba422 Mon Sep 17 00:00:00 2001
From: Paul van Brenk <paul.van.brenk@microsoft.com>
Date: Fri, 21 Oct 2016 14:56:38 -0700
Subject: [PATCH 050/421] Major refactoring after PR feedback

---
 .../codefixes/unusedIdentifierFixes.ts        | 225 ++++++++----------
 1 file changed, 103 insertions(+), 122 deletions(-)

diff --git a/src/services/codefixes/unusedIdentifierFixes.ts b/src/services/codefixes/unusedIdentifierFixes.ts
index 9a69af04bfc..4c5f0873d5f 100644
--- a/src/services/codefixes/unusedIdentifierFixes.ts
+++ b/src/services/codefixes/unusedIdentifierFixes.ts
@@ -10,134 +10,106 @@ namespace ts.codefix {
             const start = context.span.start;
             const token = getTokenAtPosition(sourceFile, start);
 
-            if (token.kind === ts.SyntaxKind.Identifier) {
-                if (token.parent.kind === ts.SyntaxKind.VariableDeclaration) {
-                    if (token.parent.parent.parent.kind === SyntaxKind.ForStatement) {
-                        const forStatement = <ForStatement>token.parent.parent.parent;
-                        const initializer = <VariableDeclarationList>forStatement.initializer;
-                        if (initializer.declarations.length === 1) {
-                            return createCodeFix("", initializer.pos, initializer.end - initializer.pos);
-                        }
-                        else {
-                            if (initializer.declarations[0] === token.parent) {
-                                return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos + 1);
-                            }
-                            else {
-                                return createCodeFix("", token.parent.pos - 1, token.parent.end - token.parent.pos + 1);
-                            }
-                        }
-                    }
-                    else if (token.parent.parent.parent.kind === SyntaxKind.ForInStatement) {
-                        const forInStatement = <ForInStatement>token.parent.parent.parent;
-                        const initializer = <VariableDeclarationList>forInStatement.initializer;
-                        return createCodeFix("{}", initializer.declarations[0].pos, initializer.declarations[0].end - initializer.declarations[0].pos);
-                    }
-                    else if (token.parent.parent.parent.kind === SyntaxKind.ForOfStatement) {
-                        const forOfStatement = <ForOfStatement>token.parent.parent.parent;
-                        const initializer = <VariableDeclarationList>forOfStatement.initializer;
-                        return createCodeFix("{}", initializer.declarations[0].pos, initializer.declarations[0].end - initializer.declarations[0].pos);
-                    }
-                    else if (token.parent.parent.kind === SyntaxKind.CatchClause) {
-                        const catchClause = <CatchClause>token.parent.parent;
-                        const parameter = catchClause.variableDeclaration.getChildren()[0];
-                        return createCodeFix("", parameter.pos, parameter.end - parameter.pos);
-                    }
-                    else {
-                        const variableStatement = <VariableStatement>token.parent.parent.parent;
-                        if (variableStatement.declarationList.declarations.length === 1) {
-                            return createCodeFix("", variableStatement.pos, variableStatement.end - variableStatement.pos);
-                        }
-                        else {
-                            const declarations = variableStatement.declarationList.declarations;
-                            if (declarations[0].name === token) {
-                                return createCodeFix("", token.parent.pos + 1, token.parent.end - token.parent.pos);
-                            }
-                            else {
-                                return createCodeFix("", token.parent.pos - 1, token.parent.end - token.parent.pos + 1);
-                            }
-                        }
-                    }
-                }
+            switch (token.kind) {
+                case ts.SyntaxKind.Identifier:
+                    switch (token.parent.kind) {
+                        case ts.SyntaxKind.VariableDeclaration:
+                            switch (token.parent.parent.parent.kind) {
+                                case SyntaxKind.ForStatement:
+                                    const forStatement = <ForStatement>token.parent.parent.parent;
+                                    const forInitializer = <VariableDeclarationList>forStatement.initializer;
+                                    if (forInitializer.declarations.length === 1) {
+                                        return createCodeFix("", forInitializer.pos, forInitializer.end - forInitializer.pos);
+                                    }
+                                    else {
+                                        return removeSingleItem(forInitializer.declarations, token);
+                                    }
 
-                if (token.parent.kind === SyntaxKind.FunctionDeclaration ||
-                    token.parent.kind === SyntaxKind.ClassDeclaration ||
-                    token.parent.kind === SyntaxKind.InterfaceDeclaration ||
-                    token.parent.kind === SyntaxKind.MethodDeclaration ||
-                    token.parent.kind === SyntaxKind.ModuleDeclaration ||
-                    token.parent.kind === SyntaxKind.PropertyDeclaration ||
-                    token.parent.kind === SyntaxKind.ArrowFunction) {
+                                case SyntaxKind.ForOfStatement:
+                                case SyntaxKind.ForInStatement:
+                                    const forOfStatement = <ForOfStatement | ForInStatement>token.parent.parent.parent;
+                                    if (forOfStatement.initializer.kind === SyntaxKind.VariableDeclarationList) {
+                                        const forOfInitializer = <VariableDeclarationList>forOfStatement.initializer;
+                                        return createCodeFix("{}", forOfInitializer.declarations[0].pos, forOfInitializer.declarations[0].end - forOfInitializer.declarations[0].pos);
+                                    }
+                                    break;
+
+                                case SyntaxKind.CatchClause:
+                                    const catchClause = <CatchClause>token.parent.parent;
+                                    const parameter = catchClause.variableDeclaration.getChildren()[0];
+                                    return createCodeFix("", parameter.pos, parameter.end - parameter.pos);
+
+                                default:
+                                    const variableStatement = <VariableStatement>token.parent.parent.parent;
+                                    if (variableStatement.declarationList.declarations.length === 1) {
+                                        return createCodeFix("", variableStatement.pos, variableStatement.end - variableStatement.pos);
+                                    }
+                                    else {
+                                        const declarations = variableStatement.declarationList.declarations;
+                                        return removeSingleItem(declarations, token);
+                                    }
+                            }
+
+                        case SyntaxKind.FunctionDeclaration:
+                        case SyntaxKind.ClassDeclaration:
+                        case SyntaxKind.InterfaceDeclaration:
+                        case SyntaxKind.MethodDeclaration:
+                        case SyntaxKind.ModuleDeclaration:
+                        case SyntaxKind.PropertyDeclaration:
+                        case SyntaxKind.ArrowFunction:
+                            return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
+
+                        case SyntaxKind.TypeParameter:
+                            const typeParameters = (<DeclarationWithTypeParameters>token.parent.parent).typeParameters;
+                            if (typeParameters.length === 1) {
+                                return createCodeFix("", token.parent.pos - 1, token.parent.end - token.parent.pos + 2);
+                            }
+                            else {
+                                return removeSingleItem(typeParameters, token);
+                            }
+
+                        case ts.SyntaxKind.Parameter:
+                            const functionDeclaration = <FunctionDeclaration>token.parent.parent;
+                            if (functionDeclaration.parameters.length === 1) {
+                                return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
+                            }
+                            else {
+                                return removeSingleItem(functionDeclaration.parameters, token);
+                            }
+
+                        case SyntaxKind.ImportSpecifier:
+                            const namedImports = <NamedImports>token.parent.parent;
+                            const elements = namedImports.elements;
+                            if (elements.length === 1) {
+                                // Only 1 import and it is unused. So the entire line could be removed.
+                                return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
+                            }
+                            else {
+                                return removeSingleItem(elements, token);
+                            }
+
+                        case SyntaxKind.ImportEqualsDeclaration:
+                            return createCodeFix("{}", token.pos, token.end - token.pos);
+
+                        case SyntaxKind.EnumDeclaration:
+                            return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
+                    }
+
+                    if (token.parent.parent.kind === SyntaxKind.ImportClause || token.parent.parent.kind === SyntaxKind.ImportDeclaration) {
+                        return createCodeFix("{}", token.parent.pos, token.parent.end - token.parent.pos);
+                    }
+                    break;
+
+                case SyntaxKind.PrivateKeyword:
+                case SyntaxKind.PropertyDeclaration:
                     return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
-                }
 
-                if (token.parent.kind === SyntaxKind.TypeParameter) {
-                    const typeParameters = (<ClassDeclaration>token.parent.parent).typeParameters;
-                    if (typeParameters.length === 1) {
-                        return createCodeFix("", token.parent.pos - 1, token.parent.end - token.parent.pos + 2);
-                    }
-                    else {
-                        if (typeParameters[0] === token.parent) {
-                            return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos + 1);
-                        }
-                        else {
-                            return createCodeFix("", token.parent.pos - 1, token.parent.end - token.parent.pos + 1);
-                        }
-                    }
-                }
-
-                if (token.parent.kind === ts.SyntaxKind.Parameter) {
-                    const functionDeclaration = <FunctionDeclaration>token.parent.parent;
-                    if (functionDeclaration.parameters.length === 1) {
-                        return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
-                    }
-                    else {
-                        if (functionDeclaration.parameters[0] === token.parent) {
-                            return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos + 1);
-                        }
-                        else {
-                            return createCodeFix("", token.parent.pos - 1, token.parent.end - token.parent.pos + 1);
-                        }
-                    }
-                }
-
-                if (token.parent.kind === SyntaxKind.ImportSpecifier) {
-                    const namedImports = <NamedImports>token.parent.parent;
-                    const elements = namedImports.elements;
-                    if (elements.length === 1) {
-                        // Only 1 import and it is unused. So the entire line could be removed.
-                        return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
-                    }
-                    else {
-                        if (elements[0] === token.parent) {
-                            return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos + 1);
-                        }
-                        else {
-                            return createCodeFix("", token.parent.pos - 1, token.parent.end - token.parent.pos + 1);
-                        }
-                    }
-                }
-
-                if (token.parent.parent.kind === SyntaxKind.ImportClause || token.parent.parent.kind === SyntaxKind.ImportDeclaration) {
+                case SyntaxKind.AsteriskToken:
+                case SyntaxKind.NamespaceImport:
                     return createCodeFix("{}", token.parent.pos, token.parent.end - token.parent.pos);
-                }
-
-                if (token.parent.kind === SyntaxKind.ImportEqualsDeclaration) {
-                    return createCodeFix("{}", token.pos, token.end - token.pos);
-                }
-
-                if (token.parent.kind === SyntaxKind.EnumDeclaration) {
-                    return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
-                }
             }
 
-            if (token.kind === SyntaxKind.PrivateKeyword && token.parent.kind === SyntaxKind.PropertyDeclaration) {
-                return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
-            }
-
-            if (token.kind === SyntaxKind.AsteriskToken && token.parent.kind === SyntaxKind.NamespaceImport) {
-                return createCodeFix("{}", token.parent.pos, token.parent.end - token.parent.pos);
-            }
-
-            return undefined;
+            return [];
 
             function createCodeFix(newText: string, start: number, length: number): CodeAction[] {
                 return [{
@@ -148,6 +120,15 @@ namespace ts.codefix {
                     }]
                 }];
             }
+
+            function removeSingleItem<T extends Node>(elements: NodeArray<T>, token: T): CodeAction[] {
+                if (elements[0] === token.parent) {
+                    return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos + 1);
+                }
+                else {
+                    return createCodeFix("", token.parent.pos - 1, token.parent.end - token.parent.pos + 1);
+                }
+            }
         }
     });
 }

From 79fa9dbc5f21fdd1f70feaa37a9960dd04762bf7 Mon Sep 17 00:00:00 2001
From: Paul van Brenk <paul.van.brenk@microsoft.com>
Date: Fri, 21 Oct 2016 15:48:24 -0700
Subject: [PATCH 051/421] Add tests for different constructor parameter cases.

---
 tests/cases/fourslash/unusedParameterInConstructor2.ts | 8 ++++++++
 tests/cases/fourslash/unusedParameterInConstructor3.ts | 8 ++++++++
 tests/cases/fourslash/unusedParameterInConstructor4.ts | 8 ++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 tests/cases/fourslash/unusedParameterInConstructor2.ts
 create mode 100644 tests/cases/fourslash/unusedParameterInConstructor3.ts
 create mode 100644 tests/cases/fourslash/unusedParameterInConstructor4.ts

diff --git a/tests/cases/fourslash/unusedParameterInConstructor2.ts b/tests/cases/fourslash/unusedParameterInConstructor2.ts
new file mode 100644
index 00000000000..bd5f66ff966
--- /dev/null
+++ b/tests/cases/fourslash/unusedParameterInConstructor2.ts
@@ -0,0 +1,8 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// class C1 {
+////    [|constructor(public p1: string, private p2: boolean, public p3: any, p5)|] { p5; }
+//// }
+
+verify.codeFixAtPosition("constructor(public p1: string, public p3: any, p5)");
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedParameterInConstructor3.ts b/tests/cases/fourslash/unusedParameterInConstructor3.ts
new file mode 100644
index 00000000000..173e00113d8
--- /dev/null
+++ b/tests/cases/fourslash/unusedParameterInConstructor3.ts
@@ -0,0 +1,8 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// class C1 {
+////    [|constructor(public p1: string, public p2: boolean, private p3: any, p5)|] { p5; }
+//// }
+
+verify.codeFixAtPosition("constructor(public p1: string, public p2: boolean, p5)");
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedParameterInConstructor4.ts b/tests/cases/fourslash/unusedParameterInConstructor4.ts
new file mode 100644
index 00000000000..6d0223dc5f4
--- /dev/null
+++ b/tests/cases/fourslash/unusedParameterInConstructor4.ts
@@ -0,0 +1,8 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// class C1 {
+////    [|constructor(private readonly p2: boolean, p5)|] { p5; }
+//// }
+
+verify.codeFixAtPosition("constructor(p5)");
\ No newline at end of file

From ff92afd47bd6a5295cd84e129fea7212f65e3283 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Fri, 21 Oct 2016 16:27:32 -0700
Subject: [PATCH 052/421] Update baselines with new index signature rules

---
 tests/baselines/reference/objectSpread.js     |   7 +-
 .../baselines/reference/objectSpread.symbols  | 239 +++++++++---------
 tests/baselines/reference/objectSpread.types  |   7 +-
 .../objectSpreadIndexSignature.errors.txt     |  35 +++
 .../reference/objectSpreadIndexSignature.js   |   2 +
 .../objectSpreadIndexSignature.symbols        |  83 ------
 .../objectSpreadIndexSignature.types          |  91 -------
 .../reference/objectSpreadIntersection.types  |   8 +-
 .../reference/objectSpreadNegative.errors.txt |   8 +-
 .../reference/objectSpreadUnion.types         |   8 +-
 .../conformance/types/spread/objectSpread.ts  |   4 +-
 .../spread/objectSpreadIndexSignature.ts      |   1 +
 12 files changed, 175 insertions(+), 318 deletions(-)
 create mode 100644 tests/baselines/reference/objectSpreadIndexSignature.errors.txt
 delete mode 100644 tests/baselines/reference/objectSpreadIndexSignature.symbols
 delete mode 100644 tests/baselines/reference/objectSpreadIndexSignature.types

diff --git a/tests/baselines/reference/objectSpread.js b/tests/baselines/reference/objectSpread.js
index 359284f9c6c..23729d4cd6f 100644
--- a/tests/baselines/reference/objectSpread.js
+++ b/tests/baselines/reference/objectSpread.js
@@ -35,14 +35,12 @@ let getter: { a: number, c: number } =
     { ...op, c: 7 }
 getter.a = 12;
 
-// null, undefined, functions and primitives besides string result in { }
+// null, undefined, functions and primitives result in { }
 let spreadNull = { ...null };
 let spreadUndefind = { ...undefined };
 let spreadNum = { ...12 };
 let spreadBool = { ...false };
 let spreadFunc = { ...(function () { }) };
-
-// strings get a numeric indexer: [n: number]: string
 let spreadStr = { ...'foo' };
 
 // methods are not enumerable
@@ -130,13 +128,12 @@ var propertyNested = __assign({ a: __assign({}, o) });
 var op = { get a() { return 6; } };
 var getter = __assign({}, op, { c: 7 });
 getter.a = 12;
-// null, undefined, functions and primitives besides string result in { }
+// null, undefined, functions and primitives result in { }
 var spreadNull = __assign({}, null);
 var spreadUndefind = __assign({}, undefined);
 var spreadNum = __assign({}, 12);
 var spreadBool = __assign({}, false);
 var spreadFunc = __assign({}, (function () { }));
-// strings get a numeric indexer: [n: number]: string
 var spreadStr = __assign({}, 'foo');
 // methods are not enumerable
 var C = (function () {
diff --git a/tests/baselines/reference/objectSpread.symbols b/tests/baselines/reference/objectSpread.symbols
index fb7a1e22b33..039be9e0d7d 100644
--- a/tests/baselines/reference/objectSpread.symbols
+++ b/tests/baselines/reference/objectSpread.symbols
@@ -150,7 +150,7 @@ getter.a = 12;
 >getter : Symbol(getter, Decl(objectSpread.ts, 32, 3))
 >a : Symbol(a, Decl(objectSpread.ts, 32, 13))
 
-// null, undefined, functions and primitives besides string result in { }
+// null, undefined, functions and primitives result in { }
 let spreadNull = { ...null };
 >spreadNull : Symbol(spreadNull, Decl(objectSpread.ts, 37, 3))
 
@@ -166,209 +166,208 @@ let spreadBool = { ...false };
 let spreadFunc = { ...(function () { }) };
 >spreadFunc : Symbol(spreadFunc, Decl(objectSpread.ts, 41, 3))
 
-// strings get a numeric indexer: [n: number]: string
 let spreadStr = { ...'foo' };
->spreadStr : Symbol(spreadStr, Decl(objectSpread.ts, 44, 3))
+>spreadStr : Symbol(spreadStr, Decl(objectSpread.ts, 42, 3))
 
 // methods are not enumerable
 class C { p = 1; m() { } }
->C : Symbol(C, Decl(objectSpread.ts, 44, 29))
->p : Symbol(C.p, Decl(objectSpread.ts, 47, 9))
->m : Symbol(C.m, Decl(objectSpread.ts, 47, 16))
+>C : Symbol(C, Decl(objectSpread.ts, 42, 29))
+>p : Symbol(C.p, Decl(objectSpread.ts, 45, 9))
+>m : Symbol(C.m, Decl(objectSpread.ts, 45, 16))
 
 let c: C = new C()
->c : Symbol(c, Decl(objectSpread.ts, 48, 3))
->C : Symbol(C, Decl(objectSpread.ts, 44, 29))
->C : Symbol(C, Decl(objectSpread.ts, 44, 29))
+>c : Symbol(c, Decl(objectSpread.ts, 46, 3))
+>C : Symbol(C, Decl(objectSpread.ts, 42, 29))
+>C : Symbol(C, Decl(objectSpread.ts, 42, 29))
 
 let spreadC: { p: number } = { ...c }
->spreadC : Symbol(spreadC, Decl(objectSpread.ts, 49, 3))
->p : Symbol(p, Decl(objectSpread.ts, 49, 14))
+>spreadC : Symbol(spreadC, Decl(objectSpread.ts, 47, 3))
+>p : Symbol(p, Decl(objectSpread.ts, 47, 14))
 
 // own methods are enumerable
 let cplus: { p: number, plus(): void } = { ...c, plus() { return this.p + 1; } };
->cplus : Symbol(cplus, Decl(objectSpread.ts, 52, 3))
->p : Symbol(p, Decl(objectSpread.ts, 52, 12))
->plus : Symbol(plus, Decl(objectSpread.ts, 52, 23))
->plus : Symbol(plus, Decl(objectSpread.ts, 52, 48))
+>cplus : Symbol(cplus, Decl(objectSpread.ts, 50, 3))
+>p : Symbol(p, Decl(objectSpread.ts, 50, 12))
+>plus : Symbol(plus, Decl(objectSpread.ts, 50, 23))
+>plus : Symbol(plus, Decl(objectSpread.ts, 50, 48))
 
 cplus.plus();
->cplus.plus : Symbol(plus, Decl(objectSpread.ts, 52, 23))
->cplus : Symbol(cplus, Decl(objectSpread.ts, 52, 3))
->plus : Symbol(plus, Decl(objectSpread.ts, 52, 23))
+>cplus.plus : Symbol(plus, Decl(objectSpread.ts, 50, 23))
+>cplus : Symbol(cplus, Decl(objectSpread.ts, 50, 3))
+>plus : Symbol(plus, Decl(objectSpread.ts, 50, 23))
 
 // new field's type conflicting with existing field is OK
 let changeTypeAfter: { a: string, b: string } =
->changeTypeAfter : Symbol(changeTypeAfter, Decl(objectSpread.ts, 56, 3))
->a : Symbol(a, Decl(objectSpread.ts, 56, 22))
->b : Symbol(b, Decl(objectSpread.ts, 56, 33))
+>changeTypeAfter : Symbol(changeTypeAfter, Decl(objectSpread.ts, 54, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 54, 22))
+>b : Symbol(b, Decl(objectSpread.ts, 54, 33))
 
     { ...o, a: 'wrong type?' }
->a : Symbol(a, Decl(objectSpread.ts, 57, 11))
+>a : Symbol(a, Decl(objectSpread.ts, 55, 11))
 
 let changeTypeBefore: { a: number, b: string } =
->changeTypeBefore : Symbol(changeTypeBefore, Decl(objectSpread.ts, 58, 3))
->a : Symbol(a, Decl(objectSpread.ts, 58, 23))
->b : Symbol(b, Decl(objectSpread.ts, 58, 34))
+>changeTypeBefore : Symbol(changeTypeBefore, Decl(objectSpread.ts, 56, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 56, 23))
+>b : Symbol(b, Decl(objectSpread.ts, 56, 34))
 
     { a: 'wrong type?', ...o };
->a : Symbol(a, Decl(objectSpread.ts, 59, 5))
+>a : Symbol(a, Decl(objectSpread.ts, 57, 5))
 
 let changeTypeBoth: { a: string, b: number } =
->changeTypeBoth : Symbol(changeTypeBoth, Decl(objectSpread.ts, 60, 3))
->a : Symbol(a, Decl(objectSpread.ts, 60, 21))
->b : Symbol(b, Decl(objectSpread.ts, 60, 32))
+>changeTypeBoth : Symbol(changeTypeBoth, Decl(objectSpread.ts, 58, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 58, 21))
+>b : Symbol(b, Decl(objectSpread.ts, 58, 32))
 
     { ...o, ...swap };
 
 // optional
 let definiteBoolean: { sn: boolean };
->definiteBoolean : Symbol(definiteBoolean, Decl(objectSpread.ts, 64, 3))
->sn : Symbol(sn, Decl(objectSpread.ts, 64, 22))
+>definiteBoolean : Symbol(definiteBoolean, Decl(objectSpread.ts, 62, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 62, 22))
 
 let definiteString: { sn: string };
->definiteString : Symbol(definiteString, Decl(objectSpread.ts, 65, 3))
->sn : Symbol(sn, Decl(objectSpread.ts, 65, 21))
+>definiteString : Symbol(definiteString, Decl(objectSpread.ts, 63, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 63, 21))
 
 let optionalString: { sn?: string };
->optionalString : Symbol(optionalString, Decl(objectSpread.ts, 66, 3))
->sn : Symbol(sn, Decl(objectSpread.ts, 66, 21))
+>optionalString : Symbol(optionalString, Decl(objectSpread.ts, 64, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 64, 21))
 
 let optionalNumber: { sn?: number };
->optionalNumber : Symbol(optionalNumber, Decl(objectSpread.ts, 67, 3))
->sn : Symbol(sn, Decl(objectSpread.ts, 67, 21))
+>optionalNumber : Symbol(optionalNumber, Decl(objectSpread.ts, 65, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 65, 21))
 
 let optionalUnionStops: { sn: string | number | boolean } = { ...definiteBoolean, ...definiteString, ...optionalNumber };
->optionalUnionStops : Symbol(optionalUnionStops, Decl(objectSpread.ts, 68, 3))
->sn : Symbol(sn, Decl(objectSpread.ts, 68, 25))
+>optionalUnionStops : Symbol(optionalUnionStops, Decl(objectSpread.ts, 66, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 66, 25))
 
 let optionalUnionDuplicates: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...optionalString, ...optionalNumber };
->optionalUnionDuplicates : Symbol(optionalUnionDuplicates, Decl(objectSpread.ts, 69, 3))
->sn : Symbol(sn, Decl(objectSpread.ts, 69, 30))
+>optionalUnionDuplicates : Symbol(optionalUnionDuplicates, Decl(objectSpread.ts, 67, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 67, 30))
 
 let allOptional: { sn?: string | number } = { ...optionalString, ...optionalNumber };
->allOptional : Symbol(allOptional, Decl(objectSpread.ts, 70, 3))
->sn : Symbol(sn, Decl(objectSpread.ts, 70, 18))
+>allOptional : Symbol(allOptional, Decl(objectSpread.ts, 68, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 68, 18))
 
 // computed property
 let computedFirst: { a: number, b: string, "before everything": number } =
->computedFirst : Symbol(computedFirst, Decl(objectSpread.ts, 73, 3))
->a : Symbol(a, Decl(objectSpread.ts, 73, 20))
->b : Symbol(b, Decl(objectSpread.ts, 73, 31))
+>computedFirst : Symbol(computedFirst, Decl(objectSpread.ts, 71, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 71, 20))
+>b : Symbol(b, Decl(objectSpread.ts, 71, 31))
 
     { ['before everything']: 12, ...o, b: 'yes' }
->'before everything' : Symbol(['before everything'], Decl(objectSpread.ts, 74, 5))
->b : Symbol(b, Decl(objectSpread.ts, 74, 38))
+>'before everything' : Symbol(['before everything'], Decl(objectSpread.ts, 72, 5))
+>b : Symbol(b, Decl(objectSpread.ts, 72, 38))
 
 let computedMiddle: { a: number, b: string, c: boolean, "in the middle": number } =
->computedMiddle : Symbol(computedMiddle, Decl(objectSpread.ts, 75, 3))
->a : Symbol(a, Decl(objectSpread.ts, 75, 21))
->b : Symbol(b, Decl(objectSpread.ts, 75, 32))
->c : Symbol(c, Decl(objectSpread.ts, 75, 43))
+>computedMiddle : Symbol(computedMiddle, Decl(objectSpread.ts, 73, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 73, 21))
+>b : Symbol(b, Decl(objectSpread.ts, 73, 32))
+>c : Symbol(c, Decl(objectSpread.ts, 73, 43))
 
     { ...o, ['in the middle']: 13, b: 'maybe?', ...o2 }
->'in the middle' : Symbol(['in the middle'], Decl(objectSpread.ts, 76, 11))
->b : Symbol(b, Decl(objectSpread.ts, 76, 34))
+>'in the middle' : Symbol(['in the middle'], Decl(objectSpread.ts, 74, 11))
+>b : Symbol(b, Decl(objectSpread.ts, 74, 34))
 
 let computedAfter: { a: number, b: string, "at the end": number } =
->computedAfter : Symbol(computedAfter, Decl(objectSpread.ts, 77, 3))
->a : Symbol(a, Decl(objectSpread.ts, 77, 20))
->b : Symbol(b, Decl(objectSpread.ts, 77, 31))
+>computedAfter : Symbol(computedAfter, Decl(objectSpread.ts, 75, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 75, 20))
+>b : Symbol(b, Decl(objectSpread.ts, 75, 31))
 
     { ...o, b: 'yeah', ['at the end']: 14 }
->b : Symbol(b, Decl(objectSpread.ts, 78, 11))
->'at the end' : Symbol(['at the end'], Decl(objectSpread.ts, 78, 22))
+>b : Symbol(b, Decl(objectSpread.ts, 76, 11))
+>'at the end' : Symbol(['at the end'], Decl(objectSpread.ts, 76, 22))
 
 // shortcut syntax
 let a = 12;
->a : Symbol(a, Decl(objectSpread.ts, 80, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 78, 3))
 
 let shortCutted: { a: number, b: string } = { ...o, a }
->shortCutted : Symbol(shortCutted, Decl(objectSpread.ts, 81, 3))
->a : Symbol(a, Decl(objectSpread.ts, 81, 18))
->b : Symbol(b, Decl(objectSpread.ts, 81, 29))
->a : Symbol(a, Decl(objectSpread.ts, 81, 51))
+>shortCutted : Symbol(shortCutted, Decl(objectSpread.ts, 79, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 79, 18))
+>b : Symbol(b, Decl(objectSpread.ts, 79, 29))
+>a : Symbol(a, Decl(objectSpread.ts, 79, 51))
 
 // generics
 function f<T, U>(t: T, u: U): { ...T, ...U, id: string } {
->f : Symbol(f, Decl(objectSpread.ts, 81, 55))
->T : Symbol(T, Decl(objectSpread.ts, 84, 11))
->U : Symbol(U, Decl(objectSpread.ts, 84, 13))
->t : Symbol(t, Decl(objectSpread.ts, 84, 17))
->T : Symbol(T, Decl(objectSpread.ts, 84, 11))
->u : Symbol(u, Decl(objectSpread.ts, 84, 22))
->U : Symbol(U, Decl(objectSpread.ts, 84, 13))
->T : Symbol(T, Decl(objectSpread.ts, 84, 11))
->U : Symbol(U, Decl(objectSpread.ts, 84, 13))
->id : Symbol(id, Decl(objectSpread.ts, 84, 43))
+>f : Symbol(f, Decl(objectSpread.ts, 79, 55))
+>T : Symbol(T, Decl(objectSpread.ts, 82, 11))
+>U : Symbol(U, Decl(objectSpread.ts, 82, 13))
+>t : Symbol(t, Decl(objectSpread.ts, 82, 17))
+>T : Symbol(T, Decl(objectSpread.ts, 82, 11))
+>u : Symbol(u, Decl(objectSpread.ts, 82, 22))
+>U : Symbol(U, Decl(objectSpread.ts, 82, 13))
+>T : Symbol(T, Decl(objectSpread.ts, 82, 11))
+>U : Symbol(U, Decl(objectSpread.ts, 82, 13))
+>id : Symbol(id, Decl(objectSpread.ts, 82, 43))
 
     return { ...t, ...u, id: 'id' };
->id : Symbol(id, Decl(objectSpread.ts, 85, 24))
+>id : Symbol(id, Decl(objectSpread.ts, 83, 24))
 }
 let exclusive: { id: string, a: number, b: string, c: string, d: boolean } =
->exclusive : Symbol(exclusive, Decl(objectSpread.ts, 87, 3))
->id : Symbol(id, Decl(objectSpread.ts, 87, 16))
->a : Symbol(a, Decl(objectSpread.ts, 87, 28))
->b : Symbol(b, Decl(objectSpread.ts, 87, 39))
->c : Symbol(c, Decl(objectSpread.ts, 87, 50))
->d : Symbol(d, Decl(objectSpread.ts, 87, 61))
+>exclusive : Symbol(exclusive, Decl(objectSpread.ts, 85, 3))
+>id : Symbol(id, Decl(objectSpread.ts, 85, 16))
+>a : Symbol(a, Decl(objectSpread.ts, 85, 28))
+>b : Symbol(b, Decl(objectSpread.ts, 85, 39))
+>c : Symbol(c, Decl(objectSpread.ts, 85, 50))
+>d : Symbol(d, Decl(objectSpread.ts, 85, 61))
 
     f({ a: 1, b: 'yes' }, { c: 'no', d: false })
->f : Symbol(f, Decl(objectSpread.ts, 81, 55))
->a : Symbol(a, Decl(objectSpread.ts, 88, 7))
->b : Symbol(b, Decl(objectSpread.ts, 88, 13))
->c : Symbol(c, Decl(objectSpread.ts, 88, 27))
->d : Symbol(d, Decl(objectSpread.ts, 88, 36))
+>f : Symbol(f, Decl(objectSpread.ts, 79, 55))
+>a : Symbol(a, Decl(objectSpread.ts, 86, 7))
+>b : Symbol(b, Decl(objectSpread.ts, 86, 13))
+>c : Symbol(c, Decl(objectSpread.ts, 86, 27))
+>d : Symbol(d, Decl(objectSpread.ts, 86, 36))
 
 let overlap: { id: string, a: number, b: string } =
->overlap : Symbol(overlap, Decl(objectSpread.ts, 89, 3))
->id : Symbol(id, Decl(objectSpread.ts, 89, 14))
->a : Symbol(a, Decl(objectSpread.ts, 89, 26))
->b : Symbol(b, Decl(objectSpread.ts, 89, 37))
+>overlap : Symbol(overlap, Decl(objectSpread.ts, 87, 3))
+>id : Symbol(id, Decl(objectSpread.ts, 87, 14))
+>a : Symbol(a, Decl(objectSpread.ts, 87, 26))
+>b : Symbol(b, Decl(objectSpread.ts, 87, 37))
 
     f({ a: 1 }, { a: 2, b: 'extra' })
->f : Symbol(f, Decl(objectSpread.ts, 81, 55))
->a : Symbol(a, Decl(objectSpread.ts, 90, 7))
->a : Symbol(a, Decl(objectSpread.ts, 90, 17))
->b : Symbol(b, Decl(objectSpread.ts, 90, 23))
+>f : Symbol(f, Decl(objectSpread.ts, 79, 55))
+>a : Symbol(a, Decl(objectSpread.ts, 88, 7))
+>a : Symbol(a, Decl(objectSpread.ts, 88, 17))
+>b : Symbol(b, Decl(objectSpread.ts, 88, 23))
 
 let overlapConflict: { id:string, a: string } =
->overlapConflict : Symbol(overlapConflict, Decl(objectSpread.ts, 91, 3))
->id : Symbol(id, Decl(objectSpread.ts, 91, 22))
->a : Symbol(a, Decl(objectSpread.ts, 91, 33))
+>overlapConflict : Symbol(overlapConflict, Decl(objectSpread.ts, 89, 3))
+>id : Symbol(id, Decl(objectSpread.ts, 89, 22))
+>a : Symbol(a, Decl(objectSpread.ts, 89, 33))
 
     f({ a: 1 }, { a: 'mismatch' })
->f : Symbol(f, Decl(objectSpread.ts, 81, 55))
->a : Symbol(a, Decl(objectSpread.ts, 92, 7))
->a : Symbol(a, Decl(objectSpread.ts, 92, 17))
+>f : Symbol(f, Decl(objectSpread.ts, 79, 55))
+>a : Symbol(a, Decl(objectSpread.ts, 90, 7))
+>a : Symbol(a, Decl(objectSpread.ts, 90, 17))
 
 let overwriteId: { id: string, a: number, c: number, d: string } =
->overwriteId : Symbol(overwriteId, Decl(objectSpread.ts, 93, 3))
->id : Symbol(id, Decl(objectSpread.ts, 93, 18))
->a : Symbol(a, Decl(objectSpread.ts, 93, 30))
->c : Symbol(c, Decl(objectSpread.ts, 93, 41))
->d : Symbol(d, Decl(objectSpread.ts, 93, 52))
+>overwriteId : Symbol(overwriteId, Decl(objectSpread.ts, 91, 3))
+>id : Symbol(id, Decl(objectSpread.ts, 91, 18))
+>a : Symbol(a, Decl(objectSpread.ts, 91, 30))
+>c : Symbol(c, Decl(objectSpread.ts, 91, 41))
+>d : Symbol(d, Decl(objectSpread.ts, 91, 52))
 
     f({ a: 1, id: true }, { c: 1, d: 'no' })
->f : Symbol(f, Decl(objectSpread.ts, 81, 55))
->a : Symbol(a, Decl(objectSpread.ts, 94, 7))
->id : Symbol(id, Decl(objectSpread.ts, 94, 13))
->c : Symbol(c, Decl(objectSpread.ts, 94, 27))
->d : Symbol(d, Decl(objectSpread.ts, 94, 33))
+>f : Symbol(f, Decl(objectSpread.ts, 79, 55))
+>a : Symbol(a, Decl(objectSpread.ts, 92, 7))
+>id : Symbol(id, Decl(objectSpread.ts, 92, 13))
+>c : Symbol(c, Decl(objectSpread.ts, 92, 27))
+>d : Symbol(d, Decl(objectSpread.ts, 92, 33))
 
 class D { m() { }; q = 2; }
->D : Symbol(D, Decl(objectSpread.ts, 94, 44))
->m : Symbol(D.m, Decl(objectSpread.ts, 96, 9))
->q : Symbol(D.q, Decl(objectSpread.ts, 96, 18))
+>D : Symbol(D, Decl(objectSpread.ts, 92, 44))
+>m : Symbol(D.m, Decl(objectSpread.ts, 94, 9))
+>q : Symbol(D.q, Decl(objectSpread.ts, 94, 18))
 
 let classesAreWrong: { id: string, ...C, ...D } =
->classesAreWrong : Symbol(classesAreWrong, Decl(objectSpread.ts, 97, 3))
->id : Symbol(id, Decl(objectSpread.ts, 97, 22))
->C : Symbol(C, Decl(objectSpread.ts, 44, 29))
->D : Symbol(D, Decl(objectSpread.ts, 94, 44))
+>classesAreWrong : Symbol(classesAreWrong, Decl(objectSpread.ts, 95, 3))
+>id : Symbol(id, Decl(objectSpread.ts, 95, 22))
+>C : Symbol(C, Decl(objectSpread.ts, 42, 29))
+>D : Symbol(D, Decl(objectSpread.ts, 92, 44))
 
     f(new C(), new D())
->f : Symbol(f, Decl(objectSpread.ts, 81, 55))
->C : Symbol(C, Decl(objectSpread.ts, 44, 29))
->D : Symbol(D, Decl(objectSpread.ts, 94, 44))
+>f : Symbol(f, Decl(objectSpread.ts, 79, 55))
+>C : Symbol(C, Decl(objectSpread.ts, 42, 29))
+>D : Symbol(D, Decl(objectSpread.ts, 92, 44))
 
diff --git a/tests/baselines/reference/objectSpread.types b/tests/baselines/reference/objectSpread.types
index b6fcb9150bf..78f4f7583d9 100644
--- a/tests/baselines/reference/objectSpread.types
+++ b/tests/baselines/reference/objectSpread.types
@@ -223,7 +223,7 @@ getter.a = 12;
 >a : number
 >12 : 12
 
-// null, undefined, functions and primitives besides string result in { }
+// null, undefined, functions and primitives result in { }
 let spreadNull = { ...null };
 >spreadNull : {}
 >{ ...null } : {}
@@ -249,10 +249,9 @@ let spreadFunc = { ...(function () { }) };
 >(function () { }) : () => void
 >function () { } : () => void
 
-// strings get a numeric indexer: [n: number]: string
 let spreadStr = { ...'foo' };
->spreadStr : { [x: number]: string; }
->{ ...'foo' } : { [x: number]: string; }
+>spreadStr : {}
+>{ ...'foo' } : {}
 
 // methods are not enumerable
 class C { p = 1; m() { } }
diff --git a/tests/baselines/reference/objectSpreadIndexSignature.errors.txt b/tests/baselines/reference/objectSpreadIndexSignature.errors.txt
new file mode 100644
index 00000000000..3909c466952
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadIndexSignature.errors.txt
@@ -0,0 +1,35 @@
+tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts(6,39): error TS2698: Type literals with spreads cannot contain an index signature.
+tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts(24,20): error TS2698: Type literals with spreads cannot contain an index signature.
+
+
+==== tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts (2 errors) ====
+    class C {
+        a: number;
+        c: boolean;
+    }
+    // index signatures are not allowed in object literals with spread types
+    let c: { ...C, b: string, c?: string, [n: number]: string };
+                                          ~~~~~~~~~~~~~~~~~~~
+!!! error TS2698: Type literals with spreads cannot contain an index signature.
+    let n: number = c.a;
+    let s: string = c[12];
+    interface Indexed {
+        [n: string]: number;
+        a: number;
+    }
+    let i: { ...Indexed, b: number };
+    n = i[101];
+    n = i.b;
+    interface Indexed2 {
+        [n: string]: boolean;
+        c: boolean;
+    }
+    let ii: { ...Indexed, ...Indexed2, b: boolean, d: number };
+    let nb: number | boolean = ii[1001];
+    
+    function f<T>(t: T) {
+        let i: { ...T, [n: number]: string };
+                       ~~~~~~~~~~~~~~~~~~~
+!!! error TS2698: Type literals with spreads cannot contain an index signature.
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/objectSpreadIndexSignature.js b/tests/baselines/reference/objectSpreadIndexSignature.js
index 709cd9446d8..ab18c0f24a9 100644
--- a/tests/baselines/reference/objectSpreadIndexSignature.js
+++ b/tests/baselines/reference/objectSpreadIndexSignature.js
@@ -3,6 +3,7 @@ class C {
     a: number;
     c: boolean;
 }
+// index signatures are not allowed in object literals with spread types
 let c: { ...C, b: string, c?: string, [n: number]: string };
 let n: number = c.a;
 let s: string = c[12];
@@ -31,6 +32,7 @@ var C = (function () {
     }
     return C;
 }());
+// index signatures are not allowed in object literals with spread types
 var c;
 var n = c.a;
 var s = c[12];
diff --git a/tests/baselines/reference/objectSpreadIndexSignature.symbols b/tests/baselines/reference/objectSpreadIndexSignature.symbols
deleted file mode 100644
index e76ad3e1b13..00000000000
--- a/tests/baselines/reference/objectSpreadIndexSignature.symbols
+++ /dev/null
@@ -1,83 +0,0 @@
-=== tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts ===
-class C {
->C : Symbol(C, Decl(objectSpreadIndexSignature.ts, 0, 0))
-
-    a: number;
->a : Symbol(C.a, Decl(objectSpreadIndexSignature.ts, 0, 9))
-
-    c: boolean;
->c : Symbol(C.c, Decl(objectSpreadIndexSignature.ts, 1, 14))
-}
-let c: { ...C, b: string, c?: string, [n: number]: string };
->c : Symbol(c, Decl(objectSpreadIndexSignature.ts, 4, 3))
->C : Symbol(C, Decl(objectSpreadIndexSignature.ts, 0, 0))
->b : Symbol(b, Decl(objectSpreadIndexSignature.ts, 4, 14))
->c : Symbol(c, Decl(objectSpreadIndexSignature.ts, 4, 25))
->n : Symbol(n, Decl(objectSpreadIndexSignature.ts, 4, 39))
-
-let n: number = c.a;
->n : Symbol(n, Decl(objectSpreadIndexSignature.ts, 5, 3))
->c.a : Symbol(C.a, Decl(objectSpreadIndexSignature.ts, 0, 9))
->c : Symbol(c, Decl(objectSpreadIndexSignature.ts, 4, 3))
->a : Symbol(C.a, Decl(objectSpreadIndexSignature.ts, 0, 9))
-
-let s: string = c[12];
->s : Symbol(s, Decl(objectSpreadIndexSignature.ts, 6, 3))
->c : Symbol(c, Decl(objectSpreadIndexSignature.ts, 4, 3))
-
-interface Indexed {
->Indexed : Symbol(Indexed, Decl(objectSpreadIndexSignature.ts, 6, 22))
-
-    [n: string]: number;
->n : Symbol(n, Decl(objectSpreadIndexSignature.ts, 8, 5))
-
-    a: number;
->a : Symbol(Indexed.a, Decl(objectSpreadIndexSignature.ts, 8, 24))
-}
-let i: { ...Indexed, b: number };
->i : Symbol(i, Decl(objectSpreadIndexSignature.ts, 11, 3))
->Indexed : Symbol(Indexed, Decl(objectSpreadIndexSignature.ts, 6, 22))
->b : Symbol(b, Decl(objectSpreadIndexSignature.ts, 11, 20))
-
-n = i[101];
->n : Symbol(n, Decl(objectSpreadIndexSignature.ts, 5, 3))
->i : Symbol(i, Decl(objectSpreadIndexSignature.ts, 11, 3))
-
-n = i.b;
->n : Symbol(n, Decl(objectSpreadIndexSignature.ts, 5, 3))
->i.b : Symbol(b, Decl(objectSpreadIndexSignature.ts, 11, 20))
->i : Symbol(i, Decl(objectSpreadIndexSignature.ts, 11, 3))
->b : Symbol(b, Decl(objectSpreadIndexSignature.ts, 11, 20))
-
-interface Indexed2 {
->Indexed2 : Symbol(Indexed2, Decl(objectSpreadIndexSignature.ts, 13, 8))
-
-    [n: string]: boolean;
->n : Symbol(n, Decl(objectSpreadIndexSignature.ts, 15, 5))
-
-    c: boolean;
->c : Symbol(Indexed2.c, Decl(objectSpreadIndexSignature.ts, 15, 25))
-}
-let ii: { ...Indexed, ...Indexed2, b: boolean, d: number };
->ii : Symbol(ii, Decl(objectSpreadIndexSignature.ts, 18, 3))
->Indexed : Symbol(Indexed, Decl(objectSpreadIndexSignature.ts, 6, 22))
->Indexed2 : Symbol(Indexed2, Decl(objectSpreadIndexSignature.ts, 13, 8))
->b : Symbol(b, Decl(objectSpreadIndexSignature.ts, 18, 34))
->d : Symbol(d, Decl(objectSpreadIndexSignature.ts, 18, 46))
-
-let nb: number | boolean = ii[1001];
->nb : Symbol(nb, Decl(objectSpreadIndexSignature.ts, 19, 3))
->ii : Symbol(ii, Decl(objectSpreadIndexSignature.ts, 18, 3))
-
-function f<T>(t: T) {
->f : Symbol(f, Decl(objectSpreadIndexSignature.ts, 19, 36))
->T : Symbol(T, Decl(objectSpreadIndexSignature.ts, 21, 11))
->t : Symbol(t, Decl(objectSpreadIndexSignature.ts, 21, 14))
->T : Symbol(T, Decl(objectSpreadIndexSignature.ts, 21, 11))
-
-    let i: { ...T, [n: number]: string };
->i : Symbol(i, Decl(objectSpreadIndexSignature.ts, 22, 7))
->T : Symbol(T, Decl(objectSpreadIndexSignature.ts, 21, 11))
->n : Symbol(n, Decl(objectSpreadIndexSignature.ts, 22, 20))
-}
-
diff --git a/tests/baselines/reference/objectSpreadIndexSignature.types b/tests/baselines/reference/objectSpreadIndexSignature.types
deleted file mode 100644
index f646361765d..00000000000
--- a/tests/baselines/reference/objectSpreadIndexSignature.types
+++ /dev/null
@@ -1,91 +0,0 @@
-=== tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts ===
-class C {
->C : C
-
-    a: number;
->a : number
-
-    c: boolean;
->c : boolean
-}
-let c: { ...C, b: string, c?: string, [n: number]: string };
->c : { [x: number]: string; b: string; c: string | boolean; a: number; }
->C : C
->b : string
->c : string
->n : number
-
-let n: number = c.a;
->n : number
->c.a : number
->c : { [x: number]: string; b: string; c: string | boolean; a: number; }
->a : number
-
-let s: string = c[12];
->s : string
->c[12] : string
->c : { [x: number]: string; b: string; c: string | boolean; a: number; }
->12 : 12
-
-interface Indexed {
->Indexed : Indexed
-
-    [n: string]: number;
->n : string
-
-    a: number;
->a : number
-}
-let i: { ...Indexed, b: number };
->i : { [n: string]: number; b: number; a: number; }
->Indexed : Indexed
->b : number
-
-n = i[101];
->n = i[101] : number
->n : number
->i[101] : number
->i : { [n: string]: number; b: number; a: number; }
->101 : 101
-
-n = i.b;
->n = i.b : number
->n : number
->i.b : number
->i : { [n: string]: number; b: number; a: number; }
->b : number
-
-interface Indexed2 {
->Indexed2 : Indexed2
-
-    [n: string]: boolean;
->n : string
-
-    c: boolean;
->c : boolean
-}
-let ii: { ...Indexed, ...Indexed2, b: boolean, d: number };
->ii : { [x: string]: number | boolean; b: boolean; d: number; c: boolean; a: number; }
->Indexed : Indexed
->Indexed2 : Indexed2
->b : boolean
->d : number
-
-let nb: number | boolean = ii[1001];
->nb : number | boolean
->ii[1001] : number | boolean
->ii : { [x: string]: number | boolean; b: boolean; d: number; c: boolean; a: number; }
->1001 : 1001
-
-function f<T>(t: T) {
->f : <T>(t: T) => void
->T : T
->t : T
->T : T
-
-    let i: { ...T, [n: number]: string };
->i : { ...T; [n: number]: string; }
->T : T
->n : number
-}
-
diff --git a/tests/baselines/reference/objectSpreadIntersection.types b/tests/baselines/reference/objectSpreadIntersection.types
index 13c1384698f..e6a7b7c19ee 100644
--- a/tests/baselines/reference/objectSpreadIntersection.types
+++ b/tests/baselines/reference/objectSpreadIntersection.types
@@ -187,21 +187,21 @@ function iteratedIntersectionUnion<T, U, V>(t: T, u: U, v: V): void {
 >V : V
 
     let result = { ...tu, ...uv, id: 'qux' };
->result : { ...T & U; ...T & U; ...U; id: string; } | { ...T & U; ...T & U; ...V; id: string; }
->{ ...tu, ...uv, id: 'qux' } : { ...T & U; ...T & U; ...U; id: string; } | { ...T & U; ...T & U; ...V; id: string; }
+>result : { ...T & U; ...U; id: string; } | { ...T & U; ...V; id: string; }
+>{ ...tu, ...uv, id: 'qux' } : { ...T & U; ...U; id: string; } | { ...T & U; ...V; id: string; }
 >tu : any
 >uv : any
 >id : string
 >'qux' : "qux"
 
     let assignable: { ...(T & U), ...(U | V), id: string } = result;
->assignable : { ...T & U; ...T & U; ...U; id: string; } | { ...T & U; ...T & U; ...V; id: string; }
+>assignable : { ...T & U; ...U; id: string; } | { ...T & U; ...V; id: string; }
 >T : T
 >U : U
 >U : U
 >V : V
 >id : string
->result : { ...T & U; ...T & U; ...U; id: string; } | { ...T & U; ...T & U; ...V; id: string; }
+>result : { ...T & U; ...U; id: string; } | { ...T & U; ...V; id: string; }
 }
 
 
diff --git a/tests/baselines/reference/objectSpreadNegative.errors.txt b/tests/baselines/reference/objectSpreadNegative.errors.txt
index 64928782280..16c257b1044 100644
--- a/tests/baselines/reference/objectSpreadNegative.errors.txt
+++ b/tests/baselines/reference/objectSpreadNegative.errors.txt
@@ -11,8 +11,8 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(30,12): error TS233
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(32,17): error TS2339: Property 'undefined' does not exist on type '{}'.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(36,11): error TS2339: Property 'toFixed' does not exist on type '{}'.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(38,11): error TS2339: Property 'toFixed' does not exist on type '{}'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(40,11): error TS2339: Property 'length' does not exist on type '{ [x: number]: string; }'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(41,11): error TS2339: Property 'charAt' does not exist on type '{ [x: number]: string; }'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(40,11): error TS2339: Property 'length' does not exist on type '{}'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(41,11): error TS2339: Property 'charAt' does not exist on type '{}'.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(45,1): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type '{}' has no compatible call signatures.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(49,12): error TS2339: Property 'b' does not exist on type '{}'.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(55,9): error TS2339: Property 'm' does not exist on type '{ p: number; }'.
@@ -87,10 +87,10 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(66,12): error TS232
     let spreadStr = { ...'foo' };
     spreadStr.length; // error, no 'length'
               ~~~~~~
-!!! error TS2339: Property 'length' does not exist on type '{ [x: number]: string; }'.
+!!! error TS2339: Property 'length' does not exist on type '{}'.
     spreadStr.charAt(1); // error, no methods either
               ~~~~~~
-!!! error TS2339: Property 'charAt' does not exist on type '{ [x: number]: string; }'.
+!!! error TS2339: Property 'charAt' does not exist on type '{}'.
     let spreadBool = { ...true };
     spreadBool.valueOf(); // error, what were you thinking?
     let spreadFunc = { ...function () { } }
diff --git a/tests/baselines/reference/objectSpreadUnion.types b/tests/baselines/reference/objectSpreadUnion.types
index 5d8cdbae24a..20633295acb 100644
--- a/tests/baselines/reference/objectSpreadUnion.types
+++ b/tests/baselines/reference/objectSpreadUnion.types
@@ -96,8 +96,8 @@ function iteratedDoubleUnion<T, U, V>(t: T, u: U, v: V): void {
 >V : V
 
     let result = { ...tu, ...uv, id: 'bar' };
->result : { ...U; id: string; } | { ...T; ...U; id: string; } | { ...U; ...T; ...U; id: string; } | { ...T; ...V; id: string; } | { ...U; ...T; ...V; id: string; } | { ...U; ...V; id: string; } | { ...T; ...U; ...V; id: string; }
->{ ...tu, ...uv, id: 'bar' } : { ...U; id: string; } | { ...T; ...U; id: string; } | { ...U; ...T; ...U; id: string; } | { ...T; ...V; id: string; } | { ...U; ...T; ...V; id: string; } | { ...U; ...V; id: string; } | { ...T; ...U; ...V; id: string; }
+>result : { ...U; id: string; } | { ...T; ...U; id: string; } | { ...T; ...V; id: string; } | { ...U; ...V; id: string; }
+>{ ...tu, ...uv, id: 'bar' } : { ...U; id: string; } | { ...T; ...U; id: string; } | { ...T; ...V; id: string; } | { ...U; ...V; id: string; }
 >tu : any
 >uv : any
 >id : string
@@ -118,13 +118,13 @@ function iteratedDoubleUnion<T, U, V>(t: T, u: U, v: V): void {
 >id : string
 
     let assignable: { ...(T | U), ...(U | V), id: string } = result;
->assignable : { ...U; id: string; } | { ...T; ...U; id: string; } | { ...U; ...T; ...U; id: string; } | { ...T; ...V; id: string; } | { ...U; ...T; ...V; id: string; } | { ...U; ...V; id: string; } | { ...T; ...U; ...V; id: string; }
+>assignable : { ...U; id: string; } | { ...T; ...U; id: string; } | { ...T; ...V; id: string; } | { ...U; ...V; id: string; }
 >T : T
 >U : U
 >U : U
 >V : V
 >id : string
->result : { ...U; id: string; } | { ...T; ...U; id: string; } | { ...U; ...T; ...U; id: string; } | { ...T; ...V; id: string; } | { ...U; ...T; ...V; id: string; } | { ...U; ...V; id: string; } | { ...T; ...U; ...V; id: string; }
+>result : { ...U; id: string; } | { ...T; ...U; id: string; } | { ...T; ...V; id: string; } | { ...U; ...V; id: string; }
 }
 
 
diff --git a/tests/cases/conformance/types/spread/objectSpread.ts b/tests/cases/conformance/types/spread/objectSpread.ts
index e35a84956c0..daadb1e3270 100644
--- a/tests/cases/conformance/types/spread/objectSpread.ts
+++ b/tests/cases/conformance/types/spread/objectSpread.ts
@@ -35,14 +35,12 @@ let getter: { a: number, c: number } =
     { ...op, c: 7 }
 getter.a = 12;
 
-// null, undefined, functions and primitives besides string result in { }
+// null, undefined, functions and primitives result in { }
 let spreadNull = { ...null };
 let spreadUndefind = { ...undefined };
 let spreadNum = { ...12 };
 let spreadBool = { ...false };
 let spreadFunc = { ...(function () { }) };
-
-// strings get a numeric indexer: [n: number]: string
 let spreadStr = { ...'foo' };
 
 // methods are not enumerable
diff --git a/tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts b/tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts
index daf8e4e63c5..8c9194d2d4c 100644
--- a/tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts
+++ b/tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts
@@ -2,6 +2,7 @@ class C {
     a: number;
     c: boolean;
 }
+// index signatures are not allowed in object literals with spread types
 let c: { ...C, b: string, c?: string, [n: number]: string };
 let n: number = c.a;
 let s: string = c[12];

From 510ab1c42ff4652f7209efa69846b6c8fc75fb42 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Fri, 21 Oct 2016 16:33:28 -0700
Subject: [PATCH 053/421] Move n-ary spread handling into separate function.

To be moved to callers in the next step.
---
 src/compiler/checker.ts              | 63 ++++++++++++++++++----------
 src/compiler/diagnosticMessages.json |  4 ++
 2 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 9df086f1bb7..abc70d49a43 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -5803,7 +5803,8 @@ namespace ts {
             return getSpreadType(spreads, node.symbol, aliasSymbol, aliasTypeArguments);
         }
 
-        function getSpreadType(types: Type[], symbol: Symbol, aliasSymbol?: Symbol, aliasTypeArguments?: Type[]): Type {
+        function getSpreadType(types: Type[], symbol: Symbol, aliasSymbol?: Symbol, aliasTypeArguments?: Type[]) {
+            // TODO: Move this function's body into callers, except for caching, and leave that back in getSpreadType proper
             if (types.length === 0) {
                 return emptyObjectType;
             }
@@ -5811,9 +5812,18 @@ namespace ts {
             if (id in spreadTypes) {
                 return spreadTypes[id];
             }
-            let right = types.pop();
-            if (right.flags & TypeFlags.StringLike) {
-                right = createAnonymousType(symbol, emptySymbols, emptyArray, emptyArray, undefined, createIndexInfo(stringType, /*isReadonly*/ false));
+            let spread: Type = emptyObjectType;
+            for (const left of types) {
+                spread = getSpreadTypeWorker(spread, left, symbol, aliasSymbol, aliasTypeArguments);
+            }
+            return spread;
+        }
+
+        function getSpreadTypeWorker(left: Type, right: Type, symbol: Symbol, aliasSymbol?: Symbol, aliasTypeArguments?: Type[]): Type {
+            // TODO: Reorder everything now that it's order independent, to be easier to read
+            const id = getTypeListId([left, right]);
+            if (id in spreadTypes) {
+                return spreadTypes[id];
             }
             if (right.flags & TypeFlags.Any) {
                 return anyType;
@@ -5822,23 +5832,21 @@ namespace ts {
                 // spread is right associative and associativity applies, so transform
                 // (T ... U) ... V to T ... (U ... V)
                 const rspread = right as SpreadType;
-                if (rspread.left !== emptyObjectType) {
-                    types.push(rspread.left);
+                if (rspread.left === emptyObjectType) {
+                    return getSpreadTypeWorker(left, rspread.right, symbol, aliasSymbol, aliasTypeArguments);
                 }
-                types.push(rspread.right);
-                return getSpreadType(types, symbol, aliasSymbol, aliasTypeArguments);
+                return getSpreadTypeWorker(getSpreadTypeWorker(left, rspread.left, symbol, aliasSymbol, aliasTypeArguments),
+                                           rspread.right, symbol, aliasSymbol, aliasTypeArguments);
             }
             if (right.flags & TypeFlags.Intersection) {
                 right = resolveObjectIntersection(right as IntersectionType);
             }
             if (right.flags & TypeFlags.Union) {
                 const spreads = map((right as UnionType).types,
-                                    t => getSpreadType(types.slice().concat([t]), symbol, aliasSymbol, aliasTypeArguments));
+                                    t => getSpreadTypeWorker(left, t, symbol, aliasSymbol, aliasTypeArguments));
                 return getUnionType(spreads, /*subtypeReduction*/ false, aliasSymbol, aliasTypeArguments);
             }
-            const atBeginning = types.length === 0;
-            let left = getSpreadType(types, symbol, aliasSymbol, aliasTypeArguments);
-            if (right.flags & (TypeFlags.Primitive & ~TypeFlags.StringLike) || left.flags & TypeFlags.Any) {
+            if (right.flags & TypeFlags.Primitive || left.flags & TypeFlags.Any) {
                 return left;
             }
             if (right.flags & TypeFlags.TypeParameter &&
@@ -5861,19 +5869,21 @@ namespace ts {
             }
             if (left.flags & TypeFlags.Union) {
                 const spreads = map((left as UnionType).types,
-                                  t => getSpreadType(types.slice().concat([t, right]), symbol, aliasSymbol, aliasTypeArguments));
+                                    t => getSpreadTypeWorker(t, right, symbol, aliasSymbol, aliasTypeArguments));
                 return getUnionType(spreads, /*subtypeReduction*/ false, aliasSymbol, aliasTypeArguments);
             }
             if (right.flags & TypeFlags.ObjectType && left.flags & TypeFlags.ObjectType) {
                 const members = createMap<Symbol>();
                 const skippedPrivateMembers = createMap<boolean>();
-                let stringIndexInfo = unionIndexInfos(getIndexInfoOfType(left, IndexKind.String), getIndexInfoOfType(right, IndexKind.String));
-                let numberIndexInfo = unionIndexInfos(getIndexInfoOfType(left, IndexKind.Number), getIndexInfoOfType(right, IndexKind.Number));
-                if (atBeginning) {
-                    // only get index info from the entire type once per spread type
-                    stringIndexInfo = unionIndexInfos(stringIndexInfo, getIndexInfoOfSymbol(symbol, IndexKind.String));
-                    numberIndexInfo = unionIndexInfos(numberIndexInfo, getIndexInfoOfSymbol(symbol, IndexKind.Number));
-                }
+
+                // TODO: This is pretty ugly
+                const leftString = getIndexInfoOfType(left, IndexKind.String);
+                const rightString = getIndexInfoOfType(right, IndexKind.String);
+                const leftNumber = getIndexInfoOfType(left, IndexKind.Number);
+                const rightNumber = getIndexInfoOfType(right, IndexKind.Number);
+                const stringIndexInfo = leftString && rightString && unionIndexInfos(leftString, rightString);
+                const numberIndexInfo = leftNumber && rightNumber && unionIndexInfos(leftNumber, rightNumber);
+
                 const isFromSpread = right.symbol !== symbol;
                 for (const rightProp of getPropertiesOfType(right)) {
                     if (getDeclarationModifierFlagsFromSymbol(rightProp) & (ModifierFlags.Private | ModifierFlags.Protected)) {
@@ -5924,7 +5934,7 @@ namespace ts {
         }
 
         function resolveObjectIntersection(intersection: IntersectionType): IntersectionType | ResolvedType {
-            if (find(intersection.types, t => !(t.flags & TypeFlags.ObjectType) || couldContainTypeParameters(t))) {
+            if (find(intersection.types, t => !(t.flags & TypeFlags.ObjectType))) {
                 return intersection;
             }
             const properties = getPropertiesOfType(intersection);
@@ -15267,6 +15277,17 @@ namespace ts {
                     checkTypeForDuplicateIndexSignatures(node);
                     checkObjectTypeForDuplicateDeclarations(node);
                 }
+                if (type.flags & (TypeFlags.ObjectType | TypeFlags.Spread) &&
+                    find(node.members, p => p.kind === SyntaxKind.SpreadTypeElement)) {
+                    const declaredNumberIndexer = getIndexDeclarationOfSymbol(type.symbol, IndexKind.Number);
+                    const declaredStringIndexer = getIndexDeclarationOfSymbol(type.symbol, IndexKind.String);
+                    if (declaredStringIndexer) {
+                        error(declaredStringIndexer, Diagnostics.Type_literals_with_spreads_cannot_contain_an_index_signature);
+                    }
+                    if (declaredNumberIndexer) {
+                        error(declaredNumberIndexer, Diagnostics.Type_literals_with_spreads_cannot_contain_an_index_signature);
+                    }
+                }
             }
         }
 
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index bfc6dabfb9d..424d6f59ca0 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -1971,6 +1971,10 @@
         "category": "Error",
         "code": 2697
     },
+    "Type literals with spreads cannot contain an index signature.": {
+        "category": "Error",
+        "code": 2698
+    },
 
     "Import declaration '{0}' is using private name '{1}'.": {
         "category": "Error",

From 1f94e14d84d60caf9e634ba334636e4438c5a0a3 Mon Sep 17 00:00:00 2001
From: Paul van Brenk <paul.van.brenk@microsoft.com>
Date: Fri, 21 Oct 2016 17:11:32 -0700
Subject: [PATCH 054/421] Remove unused case, and fix for..in

---
 src/services/codefixes/unusedIdentifierFixes.ts     | 11 +++++++----
 tests/cases/fourslash/unusedVariableInForLoop5FS.ts |  4 ++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/services/codefixes/unusedIdentifierFixes.ts b/src/services/codefixes/unusedIdentifierFixes.ts
index 4c5f0873d5f..8e76f95a3d3 100644
--- a/src/services/codefixes/unusedIdentifierFixes.ts
+++ b/src/services/codefixes/unusedIdentifierFixes.ts
@@ -26,14 +26,18 @@ namespace ts.codefix {
                                     }
 
                                 case SyntaxKind.ForOfStatement:
-                                case SyntaxKind.ForInStatement:
-                                    const forOfStatement = <ForOfStatement | ForInStatement>token.parent.parent.parent;
+                                    const forOfStatement = <ForOfStatement>token.parent.parent.parent;
                                     if (forOfStatement.initializer.kind === SyntaxKind.VariableDeclarationList) {
                                         const forOfInitializer = <VariableDeclarationList>forOfStatement.initializer;
                                         return createCodeFix("{}", forOfInitializer.declarations[0].pos, forOfInitializer.declarations[0].end - forOfInitializer.declarations[0].pos);
                                     }
                                     break;
 
+                                case SyntaxKind.ForInStatement:
+                                    // There is no valid fix in the case of:
+                                    //  for .. in
+                                    return undefined;
+
                                 case SyntaxKind.CatchClause:
                                     const catchClause = <CatchClause>token.parent.parent;
                                     const parameter = catchClause.variableDeclaration.getChildren()[0];
@@ -56,7 +60,6 @@ namespace ts.codefix {
                         case SyntaxKind.MethodDeclaration:
                         case SyntaxKind.ModuleDeclaration:
                         case SyntaxKind.PropertyDeclaration:
-                        case SyntaxKind.ArrowFunction:
                             return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
 
                         case SyntaxKind.TypeParameter:
@@ -109,7 +112,7 @@ namespace ts.codefix {
                     return createCodeFix("{}", token.parent.pos, token.parent.end - token.parent.pos);
             }
 
-            return [];
+            return undefined;
 
             function createCodeFix(newText: string, start: number, length: number): CodeAction[] {
                 return [{
diff --git a/tests/cases/fourslash/unusedVariableInForLoop5FS.ts b/tests/cases/fourslash/unusedVariableInForLoop5FS.ts
index 60369da522d..23df03480e3 100644
--- a/tests/cases/fourslash/unusedVariableInForLoop5FS.ts
+++ b/tests/cases/fourslash/unusedVariableInForLoop5FS.ts
@@ -2,10 +2,10 @@
 
 // @noUnusedLocals: true
 //// function f1 () {
-////     for ([|const elem in|] ["a", "b", "c"]) {
+////     for (const elem in ["a", "b", "c"]) {
 ////
 ////     }
 //// }
 
-verify.codeFixAtPosition("const {} in ");
+verify.not.codeFixAvailable();
 

From 485e2490e77c2aad766375e3981360bbe4fc9c4e Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Sat, 22 Oct 2016 09:07:48 -0700
Subject: [PATCH 055/421] Move multiple-spread handling out of getSpreadType

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index abc70d49a43..a610dcf2f36 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -5753,19 +5753,19 @@ namespace ts {
         }
 
         function getTypeFromSpreadTypeLiteral(node: Node, aliasSymbol?: Symbol, aliasTypeArguments?: Type[]): Type {
+            let spread: Type = emptyObjectType;
             let members: Map<Symbol>;
             let stringIndexInfo: IndexInfo;
             let numberIndexInfo: IndexInfo;
-            const spreads: Type[] = [];
             for (const member of (node as TypeLiteralNode).members) {
                 if (member.kind === SyntaxKind.SpreadTypeElement) {
                     if (members) {
-                        spreads.push(createAnonymousType(node.symbol, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo));
+                        spread = getSpreadTypeWorker(spread, createAnonymousType(node.symbol, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo), node.symbol, aliasSymbol, aliasTypeArguments);
                         members = undefined;
                         stringIndexInfo = undefined;
                         numberIndexInfo = undefined;
                     }
-                    spreads.push(getTypeFromTypeNode((member as SpreadTypeElement).type));
+                    spread = getSpreadTypeWorker(spread, getTypeFromTypeNode((member as SpreadTypeElement).type), node.symbol, aliasSymbol, aliasTypeArguments);
                 }
                 else if (member.kind === SyntaxKind.IndexSignature) {
                     const index = member as IndexSignatureDeclaration;
@@ -5798,23 +5798,7 @@ namespace ts {
                 }
             }
             if (members || stringIndexInfo || numberIndexInfo) {
-                spreads.push(createAnonymousType(node.symbol, members || emptySymbols, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo));
-            }
-            return getSpreadType(spreads, node.symbol, aliasSymbol, aliasTypeArguments);
-        }
-
-        function getSpreadType(types: Type[], symbol: Symbol, aliasSymbol?: Symbol, aliasTypeArguments?: Type[]) {
-            // TODO: Move this function's body into callers, except for caching, and leave that back in getSpreadType proper
-            if (types.length === 0) {
-                return emptyObjectType;
-            }
-            const id = getTypeListId(types);
-            if (id in spreadTypes) {
-                return spreadTypes[id];
-            }
-            let spread: Type = emptyObjectType;
-            for (const left of types) {
-                spread = getSpreadTypeWorker(spread, left, symbol, aliasSymbol, aliasTypeArguments);
+                spread = getSpreadTypeWorker(spread, createAnonymousType(node.symbol, members || emptySymbols, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo), node.symbol, aliasSymbol, aliasTypeArguments);
             }
             return spread;
         }
@@ -5861,8 +5845,8 @@ namespace ts {
                 left.flags & TypeFlags.Spread &&
                 (left as SpreadType).right.flags & TypeFlags.ObjectType) {
                 // simplify two adjacent object types: T ... { x } ... { y } becomes T ... { x, y }
-                const simplified = getSpreadType([right, (left as SpreadType).right], symbol, aliasSymbol, aliasTypeArguments);
-                return getSpreadType([(left as SpreadType).left, simplified], symbol, aliasSymbol, aliasTypeArguments);
+                const simplified = getSpreadTypeWorker(right, (left as SpreadType).right, symbol, aliasSymbol, aliasTypeArguments);
+                return getSpreadTypeWorker((left as SpreadType).left, simplified, symbol, aliasSymbol, aliasTypeArguments);
             }
             if (left.flags & TypeFlags.Intersection) {
                 left = resolveObjectIntersection(left as IntersectionType);
@@ -6355,7 +6339,7 @@ namespace ts {
                 }
                 if (type.flags & TypeFlags.Spread) {
                     const spread = type as SpreadType;
-                    return getSpreadType([instantiateType(spread.left, mapper), instantiateType(spread.right, mapper)], type.symbol, type.aliasSymbol, mapper.targetTypes);
+                    return getSpreadTypeWorker(instantiateType(spread.left, mapper), instantiateType(spread.right, mapper), type.symbol, type.aliasSymbol, mapper.targetTypes);
                 }
             }
             return type;
@@ -10881,7 +10865,9 @@ namespace ts {
 
             let propertiesTable = createMap<Symbol>();
             let propertiesArray: Symbol[] = [];
-            const spreads: Type[] = [];
+            let spread: Type = emptyObjectType;
+            let propagatedFlags: TypeFlags = 0;
+
             const contextualType = getApparentTypeOfContextualType(node);
             const contextualTypeHasPattern = contextualType && contextualType.pattern &&
                 (contextualType.pattern.kind === SyntaxKind.ObjectBindingPattern || contextualType.pattern.kind === SyntaxKind.ObjectLiteralExpression);
@@ -10947,13 +10933,15 @@ namespace ts {
                 }
                 else if (memberDecl.kind === SyntaxKind.SpreadElementExpression) {
                     if (propertiesArray.length > 0) {
-                        spreads.push(createObjectLiteralType());
+                        spread = getSpreadTypeWorker(spread, createObjectLiteralType(), node.symbol);
                         propertiesArray = [];
                         propertiesTable = createMap<Symbol>();
                         hasComputedStringProperty = false;
                         hasComputedNumberProperty = false;
+                        typeFlags = 0;
                     }
-                    spreads.push(checkExpression((memberDecl as SpreadElementExpression).expression));
+                    const type = checkExpression((memberDecl as SpreadElementExpression).expression);
+                    spread = getSpreadTypeWorker(spread, type, node.symbol);
                     continue;
                 }
                 else {
@@ -10995,12 +10983,11 @@ namespace ts {
                 }
             }
 
-            if (spreads.length > 0) {
+            if (spread !== emptyObjectType) {
                 if (propertiesArray.length > 0) {
-                    spreads.push(createObjectLiteralType());
+                    spread = getSpreadTypeWorker(spread, createObjectLiteralType(), node.symbol);
                 }
-                const propagatedFlags = getPropagatingFlagsOfTypes(spreads, /*excludeKinds*/ TypeFlags.Nullable);
-                const spread = getSpreadType(spreads, node.symbol, undefined, undefined);
+                // TODO: REname getSpreadTypeWorker back to getSpreadType
                 spread.flags |= propagatedFlags;
                 return spread;
             }
@@ -11019,6 +11006,9 @@ namespace ts {
                 if (inDestructuringPattern) {
                     result.pattern = node;
                 }
+                if (!(result.flags & TypeFlags.Nullable)) {
+                    propagatedFlags |= (result.flags & TypeFlags.PropagatingFlags);
+                }
                 return result;
             }
        }

From 16dfdc49dc25d11a51a60225b5aee63ef890b8ca Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Sat, 22 Oct 2016 10:08:58 -0700
Subject: [PATCH 056/421] Clean up and reorder getSpreadType body

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index a610dcf2f36..2560b12597d 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -4358,8 +4358,8 @@ namespace ts {
                 getIntersectionType([info1.type, info2.type]), info1.isReadonly && info2.isReadonly);
         }
 
-        function unionIndexInfos(info1: IndexInfo, info2: IndexInfo): IndexInfo {
-            return !info1 ? info2 : !info2 ? info1 : createIndexInfo(
+        function unionSpreadIndexInfos(info1: IndexInfo, info2: IndexInfo): IndexInfo {
+            return info1 && info2 && createIndexInfo(
                 getUnionType([info1.type, info2.type]), info1.isReadonly || info2.isReadonly);
         }
 
@@ -5760,12 +5760,14 @@ namespace ts {
             for (const member of (node as TypeLiteralNode).members) {
                 if (member.kind === SyntaxKind.SpreadTypeElement) {
                     if (members) {
-                        spread = getSpreadTypeWorker(spread, createAnonymousType(node.symbol, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo), node.symbol, aliasSymbol, aliasTypeArguments);
+                        const type = createAnonymousType(node.symbol, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
+                        spread = getSpreadType(spread, type, node.symbol, aliasSymbol, aliasTypeArguments);
                         members = undefined;
                         stringIndexInfo = undefined;
                         numberIndexInfo = undefined;
                     }
-                    spread = getSpreadTypeWorker(spread, getTypeFromTypeNode((member as SpreadTypeElement).type), node.symbol, aliasSymbol, aliasTypeArguments);
+                    const type = getTypeFromTypeNode((member as SpreadTypeElement).type);
+                    spread = getSpreadType(spread, type, node.symbol, aliasSymbol, aliasTypeArguments);
                 }
                 else if (member.kind === SyntaxKind.IndexSignature) {
                     const index = member as IndexSignatureDeclaration;
@@ -5798,75 +5800,77 @@ namespace ts {
                 }
             }
             if (members || stringIndexInfo || numberIndexInfo) {
-                spread = getSpreadTypeWorker(spread, createAnonymousType(node.symbol, members || emptySymbols, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo), node.symbol, aliasSymbol, aliasTypeArguments);
+                const type = createAnonymousType(node.symbol, members || emptySymbols, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
+                spread = getSpreadType(spread, type, node.symbol, aliasSymbol, aliasTypeArguments);
             }
             return spread;
         }
 
-        function getSpreadTypeWorker(left: Type, right: Type, symbol: Symbol, aliasSymbol?: Symbol, aliasTypeArguments?: Type[]): Type {
+        function getSpreadType(left: Type, right: Type, symbol: Symbol, aliasSymbol?: Symbol, aliasTypeArguments?: Type[]): Type {
             // TODO: Reorder everything now that it's order independent, to be easier to read
             const id = getTypeListId([left, right]);
             if (id in spreadTypes) {
                 return spreadTypes[id];
             }
-            if (right.flags & TypeFlags.Any) {
+
+            // non-spreadable types
+            if (left.flags & TypeFlags.Any || right.flags & TypeFlags.Any) {
                 return anyType;
             }
+            if (left.flags & TypeFlags.Intersection) {
+                left = resolveObjectIntersection(left as IntersectionType);
+            }
+            if (right.flags & TypeFlags.Intersection) {
+                right = resolveObjectIntersection(right as IntersectionType);
+            }
+            if (left.flags & TypeFlags.Union) {
+                const spreads = map((left as UnionType).types,
+                                    t => getSpreadType(t, right, symbol, aliasSymbol, aliasTypeArguments));
+                return getUnionType(spreads, /*subtypeReduction*/ false, aliasSymbol, aliasTypeArguments);
+            }
+            if (right.flags & TypeFlags.Union) {
+                const spreads = map((right as UnionType).types,
+                                    t => getSpreadType(left, t, symbol, aliasSymbol, aliasTypeArguments));
+                return getUnionType(spreads, /*subtypeReduction*/ false, aliasSymbol, aliasTypeArguments);
+            }
+            if (right.flags & TypeFlags.Primitive) {
+                return left;
+            }
+
+            // spread simplifications
+            if (left.flags & TypeFlags.Spread &&
+                right.flags & TypeFlags.TypeParameter &&
+                (left as SpreadType).right.flags & TypeFlags.TypeParameter &&
+                right.symbol === (left as SpreadType).right.symbol) {
+                // for types like T ... T, just return ... T
+                return left;
+            }
+            if (left.flags & TypeFlags.Spread &&
+                right.flags & TypeFlags.ObjectType &&
+                (left as SpreadType).right.flags & TypeFlags.ObjectType) {
+                // simplify two adjacent object types: T ... { x } ... { y } becomes T ... { x, y }
+                const simplified = getSpreadType(right, (left as SpreadType).right, symbol, aliasSymbol, aliasTypeArguments);
+                return getSpreadType((left as SpreadType).left, simplified, symbol, aliasSymbol, aliasTypeArguments);
+            }
             if (right.flags & TypeFlags.Spread) {
                 // spread is right associative and associativity applies, so transform
                 // (T ... U) ... V to T ... (U ... V)
                 const rspread = right as SpreadType;
                 if (rspread.left === emptyObjectType) {
-                    return getSpreadTypeWorker(left, rspread.right, symbol, aliasSymbol, aliasTypeArguments);
+                    // U ... ({} ... T) => (U ... T)
+                    return getSpreadType(left, rspread.right, symbol, aliasSymbol, aliasTypeArguments);
                 }
-                return getSpreadTypeWorker(getSpreadTypeWorker(left, rspread.left, symbol, aliasSymbol, aliasTypeArguments),
-                                           rspread.right, symbol, aliasSymbol, aliasTypeArguments);
-            }
-            if (right.flags & TypeFlags.Intersection) {
-                right = resolveObjectIntersection(right as IntersectionType);
-            }
-            if (right.flags & TypeFlags.Union) {
-                const spreads = map((right as UnionType).types,
-                                    t => getSpreadTypeWorker(left, t, symbol, aliasSymbol, aliasTypeArguments));
-                return getUnionType(spreads, /*subtypeReduction*/ false, aliasSymbol, aliasTypeArguments);
-            }
-            if (right.flags & TypeFlags.Primitive || left.flags & TypeFlags.Any) {
-                return left;
-            }
-            if (right.flags & TypeFlags.TypeParameter &&
-                left.flags & TypeFlags.Spread &&
-                (left as SpreadType).right.flags & TypeFlags.TypeParameter &&
-                right.symbol === (left as SpreadType).right.symbol) {
-                // for types like T ... T, just return ... T
-                return left;
+                return getSpreadType(getSpreadType(left, rspread.left, symbol, aliasSymbol, aliasTypeArguments),
+                                     rspread.right, symbol, aliasSymbol, aliasTypeArguments);
             }
 
-            if (right.flags & TypeFlags.ObjectType &&
-                left.flags & TypeFlags.Spread &&
-                (left as SpreadType).right.flags & TypeFlags.ObjectType) {
-                // simplify two adjacent object types: T ... { x } ... { y } becomes T ... { x, y }
-                const simplified = getSpreadTypeWorker(right, (left as SpreadType).right, symbol, aliasSymbol, aliasTypeArguments);
-                return getSpreadTypeWorker((left as SpreadType).left, simplified, symbol, aliasSymbol, aliasTypeArguments);
-            }
-            if (left.flags & TypeFlags.Intersection) {
-                left = resolveObjectIntersection(left as IntersectionType);
-            }
-            if (left.flags & TypeFlags.Union) {
-                const spreads = map((left as UnionType).types,
-                                    t => getSpreadTypeWorker(t, right, symbol, aliasSymbol, aliasTypeArguments));
-                return getUnionType(spreads, /*subtypeReduction*/ false, aliasSymbol, aliasTypeArguments);
-            }
+            // create an object type if left and right are both objects,
+            // otherwise create a spread type
             if (right.flags & TypeFlags.ObjectType && left.flags & TypeFlags.ObjectType) {
                 const members = createMap<Symbol>();
                 const skippedPrivateMembers = createMap<boolean>();
-
-                // TODO: This is pretty ugly
-                const leftString = getIndexInfoOfType(left, IndexKind.String);
-                const rightString = getIndexInfoOfType(right, IndexKind.String);
-                const leftNumber = getIndexInfoOfType(left, IndexKind.Number);
-                const rightNumber = getIndexInfoOfType(right, IndexKind.Number);
-                const stringIndexInfo = leftString && rightString && unionIndexInfos(leftString, rightString);
-                const numberIndexInfo = leftNumber && rightNumber && unionIndexInfos(leftNumber, rightNumber);
+                const stringIndexInfo = unionSpreadIndexInfos(getIndexInfoOfType(left, IndexKind.String), getIndexInfoOfType(right, IndexKind.String));
+                const numberIndexInfo = unionSpreadIndexInfos(getIndexInfoOfType(left, IndexKind.Number), getIndexInfoOfType(right, IndexKind.Number));
 
                 const isFromSpread = right.symbol !== symbol;
                 for (const rightProp of getPropertiesOfType(right)) {
@@ -6339,7 +6343,7 @@ namespace ts {
                 }
                 if (type.flags & TypeFlags.Spread) {
                     const spread = type as SpreadType;
-                    return getSpreadTypeWorker(instantiateType(spread.left, mapper), instantiateType(spread.right, mapper), type.symbol, type.aliasSymbol, mapper.targetTypes);
+                    return getSpreadType(instantiateType(spread.left, mapper), instantiateType(spread.right, mapper), type.symbol, type.aliasSymbol, mapper.targetTypes);
                 }
             }
             return type;
@@ -10933,7 +10937,7 @@ namespace ts {
                 }
                 else if (memberDecl.kind === SyntaxKind.SpreadElementExpression) {
                     if (propertiesArray.length > 0) {
-                        spread = getSpreadTypeWorker(spread, createObjectLiteralType(), node.symbol);
+                        spread = getSpreadType(spread, createObjectLiteralType(), node.symbol);
                         propertiesArray = [];
                         propertiesTable = createMap<Symbol>();
                         hasComputedStringProperty = false;
@@ -10941,7 +10945,7 @@ namespace ts {
                         typeFlags = 0;
                     }
                     const type = checkExpression((memberDecl as SpreadElementExpression).expression);
-                    spread = getSpreadTypeWorker(spread, type, node.symbol);
+                    spread = getSpreadType(spread, type, node.symbol);
                     continue;
                 }
                 else {
@@ -10985,9 +10989,8 @@ namespace ts {
 
             if (spread !== emptyObjectType) {
                 if (propertiesArray.length > 0) {
-                    spread = getSpreadTypeWorker(spread, createObjectLiteralType(), node.symbol);
+                    spread = getSpreadType(spread, createObjectLiteralType(), node.symbol);
                 }
-                // TODO: REname getSpreadTypeWorker back to getSpreadType
                 spread.flags |= propagatedFlags;
                 return spread;
             }

From 66d4798145ae9b7af5633b64f228f149e10a4fee Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 24 Oct 2016 09:21:23 -0700
Subject: [PATCH 057/421] Error for call/construct signatures in spread type

1. Simplify the error reporting code to handle all kinds of signatures.
2. Remove index signature handling code when creating a spread type
since it's an error anyway.
---
 src/compiler/checker.ts              | 36 +++++++---------------------
 src/compiler/diagnosticMessages.json |  2 +-
 2 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 2560b12597d..e19c779b35a 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -5769,24 +5769,10 @@ namespace ts {
                     const type = getTypeFromTypeNode((member as SpreadTypeElement).type);
                     spread = getSpreadType(spread, type, node.symbol, aliasSymbol, aliasTypeArguments);
                 }
-                else if (member.kind === SyntaxKind.IndexSignature) {
-                    const index = member as IndexSignatureDeclaration;
-                    if (index.parameters.length === 1) {
-                        const parameter = index.parameters[0];
-                        if (parameter && parameter.type) {
-                            const indexInfo = createIndexInfo(index.type ? getTypeFromTypeNode(index.type) : anyType,
-                                                              (getModifierFlags(index) & ModifierFlags.Readonly) !== 0, index);
-                            if (parameter.type.kind === SyntaxKind.StringKeyword) {
-                                stringIndexInfo = indexInfo;
-                            }
-                            else {
-                                numberIndexInfo = indexInfo;
-                            }
-                        }
-                    }
-                }
-                else if (member.kind !== SyntaxKind.CallSignature && member.kind !== SyntaxKind.ConstructSignature) {
-                    // note that spread types don't include call and construct signatures
+                else if (member.kind !== SyntaxKind.IndexSignature &&
+                         member.kind !== SyntaxKind.CallSignature &&
+                         member.kind !== SyntaxKind.ConstructSignature) {
+                    // it is an error for spread types to include index, call or construct signatures
                     const flags = SymbolFlags.Property | SymbolFlags.Transient | (member.questionToken ? SymbolFlags.Optional : 0);
                     const text = getTextOfPropertyName(member.name);
                     const symbol = <TransientSymbol>createSymbol(flags, text);
@@ -15270,15 +15256,11 @@ namespace ts {
                     checkTypeForDuplicateIndexSignatures(node);
                     checkObjectTypeForDuplicateDeclarations(node);
                 }
-                if (type.flags & (TypeFlags.ObjectType | TypeFlags.Spread) &&
-                    find(node.members, p => p.kind === SyntaxKind.SpreadTypeElement)) {
-                    const declaredNumberIndexer = getIndexDeclarationOfSymbol(type.symbol, IndexKind.Number);
-                    const declaredStringIndexer = getIndexDeclarationOfSymbol(type.symbol, IndexKind.String);
-                    if (declaredStringIndexer) {
-                        error(declaredStringIndexer, Diagnostics.Type_literals_with_spreads_cannot_contain_an_index_signature);
-                    }
-                    if (declaredNumberIndexer) {
-                        error(declaredNumberIndexer, Diagnostics.Type_literals_with_spreads_cannot_contain_an_index_signature);
+                if (find(node.members, p => p.kind === SyntaxKind.SpreadTypeElement)) {
+                    for (const signature of filter(node.members, p => p.kind === SyntaxKind.IndexSignature ||
+                                                                      p.kind === SyntaxKind.CallSignature ||
+                                                                      p.kind === SyntaxKind.ConstructSignature)) {
+                        error(signature, Diagnostics.Type_literals_with_spreads_cannot_contain_index_call_or_construct_signatures);
                     }
                 }
             }
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 424d6f59ca0..68206196dff 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -1971,7 +1971,7 @@
         "category": "Error",
         "code": 2697
     },
-    "Type literals with spreads cannot contain an index signature.": {
+    "Type literals with spreads cannot contain index, call or construct signatures.": {
         "category": "Error",
         "code": 2698
     },

From 24300932cfea12050748522f380bc53ee504f0b2 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 24 Oct 2016 09:22:40 -0700
Subject: [PATCH 058/421] Update baselines with new spread type index errors

---
 .../reference/objectSpreadIndexSignature.errors.txt       | 8 ++++----
 tests/baselines/reference/objectSpreadNegative.errors.txt | 8 +++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/tests/baselines/reference/objectSpreadIndexSignature.errors.txt b/tests/baselines/reference/objectSpreadIndexSignature.errors.txt
index 3909c466952..fa4d4c28aec 100644
--- a/tests/baselines/reference/objectSpreadIndexSignature.errors.txt
+++ b/tests/baselines/reference/objectSpreadIndexSignature.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts(6,39): error TS2698: Type literals with spreads cannot contain an index signature.
-tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts(24,20): error TS2698: Type literals with spreads cannot contain an index signature.
+tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts(6,39): error TS2698: Type literals with spreads cannot contain index, call or construct signatures.
+tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts(24,20): error TS2698: Type literals with spreads cannot contain index, call or construct signatures.
 
 
 ==== tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts (2 errors) ====
@@ -10,7 +10,7 @@ tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts(24,20): error
     // index signatures are not allowed in object literals with spread types
     let c: { ...C, b: string, c?: string, [n: number]: string };
                                           ~~~~~~~~~~~~~~~~~~~
-!!! error TS2698: Type literals with spreads cannot contain an index signature.
+!!! error TS2698: Type literals with spreads cannot contain index, call or construct signatures.
     let n: number = c.a;
     let s: string = c[12];
     interface Indexed {
@@ -30,6 +30,6 @@ tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts(24,20): error
     function f<T>(t: T) {
         let i: { ...T, [n: number]: string };
                        ~~~~~~~~~~~~~~~~~~~
-!!! error TS2698: Type literals with spreads cannot contain an index signature.
+!!! error TS2698: Type literals with spreads cannot contain index, call or construct signatures.
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/objectSpreadNegative.errors.txt b/tests/baselines/reference/objectSpreadNegative.errors.txt
index 16c257b1044..90cd2405c24 100644
--- a/tests/baselines/reference/objectSpreadNegative.errors.txt
+++ b/tests/baselines/reference/objectSpreadNegative.errors.txt
@@ -16,13 +16,15 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(41,11): error TS233
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(45,1): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type '{}' has no compatible call signatures.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(49,12): error TS2339: Property 'b' does not exist on type '{}'.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(55,9): error TS2339: Property 'm' does not exist on type '{ p: number; }'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(57,48): error TS2698: Type literals with spreads cannot contain index, call or construct signatures.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(57,69): error TS2698: Type literals with spreads cannot contain index, call or construct signatures.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(58,1): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type '{ x: number; }' has no compatible call signatures.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(59,1): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(64,9): error TS2322: Type '{ ...T & V }' is not assignable to type '{ ...T & U }'.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(66,12): error TS2322: Type '{ ...U }' is not assignable to type 'U'.
 
 
-==== tests/cases/conformance/types/spread/objectSpreadNegative.ts (19 errors) ====
+==== tests/cases/conformance/types/spread/objectSpreadNegative.ts (21 errors) ====
     let o = { a: 1, b: 'no' }
     
     /// private propagates
@@ -113,6 +115,10 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(66,12): error TS232
 !!! error TS2339: Property 'm' does not exist on type '{ p: number; }'.
     
     let callableConstructableSpread: { ...PublicX, (n: number): number, new (p: number) };
+                                                   ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2698: Type literals with spreads cannot contain index, call or construct signatures.
+                                                                        ~~~~~~~~~~~~~~~
+!!! error TS2698: Type literals with spreads cannot contain index, call or construct signatures.
     callableConstructableSpread(12); // error, no call signature
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2349: Cannot invoke an expression whose type lacks a call signature. Type '{ x: number; }' has no compatible call signatures.

From a94fb2f5a3103b26eda73b02b0cb6554d371212f Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 24 Oct 2016 09:40:10 -0700
Subject: [PATCH 059/421] Explain writeSpreadType a little better

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index e19c779b35a..cfe33252d67 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -2338,6 +2338,8 @@ namespace ts {
                         inObjectTypeLiteral = saveInObjectTypeLiteral;
                     }
                     if (type.right.symbol === container) {
+                        // if type.right was written as part of the spread type, don't surround with ...{ }.
+                        // this gives { a: number, ... T } instead of { ...{ a: number }, ...T }
                         const saveInObjectTypeLiteral = inObjectTypeLiteral;
                         inObjectTypeLiteral = true;
                         writeObjectLiteralType(resolveStructuredTypeMembers(type.right));

From 35be8c351cadbc0fcb63d7370316db7856c31331 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 24 Oct 2016 10:02:04 -0700
Subject: [PATCH 060/421] Add more commentary to getSpreadType

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index cfe33252d67..2378c65f6c3 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -5794,23 +5794,29 @@ namespace ts {
             return spread;
         }
 
+        /**
+         * Since the source of spread types are object literals and type literals, which are not binary,
+         * this function should be called in a left folding style, with left = previous result of getSpreadType
+         * and right = the new element to be spread.
+         */
         function getSpreadType(left: Type, right: Type, symbol: Symbol, aliasSymbol?: Symbol, aliasTypeArguments?: Type[]): Type {
-            // TODO: Reorder everything now that it's order independent, to be easier to read
             const id = getTypeListId([left, right]);
             if (id in spreadTypes) {
                 return spreadTypes[id];
             }
 
-            // non-spreadable types
+            // any spreads to any
             if (left.flags & TypeFlags.Any || right.flags & TypeFlags.Any) {
                 return anyType;
             }
+            // flatten intersections to objects if all member types are objects
             if (left.flags & TypeFlags.Intersection) {
                 left = resolveObjectIntersection(left as IntersectionType);
             }
             if (right.flags & TypeFlags.Intersection) {
                 right = resolveObjectIntersection(right as IntersectionType);
             }
+            // distribute unions
             if (left.flags & TypeFlags.Union) {
                 const spreads = map((left as UnionType).types,
                                     t => getSpreadType(t, right, symbol, aliasSymbol, aliasTypeArguments));
@@ -5821,7 +5827,14 @@ namespace ts {
                                     t => getSpreadType(left, t, symbol, aliasSymbol, aliasTypeArguments));
                 return getUnionType(spreads, /*subtypeReduction*/ false, aliasSymbol, aliasTypeArguments);
             }
-            if (right.flags & TypeFlags.Primitive) {
+            // skip primitives
+            if (left.flags & TypeFlags.Primitive && right.flags & TypeFlags.Primitive) {
+                return emptyObjectType;
+            }
+            else if (left.flags & TypeFlags.Primitive) {
+                return right;
+            }
+            else if (right.flags & TypeFlags.Primitive) {
                 return left;
             }
 
@@ -5845,7 +5858,7 @@ namespace ts {
                 // (T ... U) ... V to T ... (U ... V)
                 const rspread = right as SpreadType;
                 if (rspread.left === emptyObjectType) {
-                    // U ... ({} ... T) => (U ... T)
+                    // ... U ... ({} ... T) => ... U ... T
                     return getSpreadType(left, rspread.right, symbol, aliasSymbol, aliasTypeArguments);
                 }
                 return getSpreadType(getSpreadType(left, rspread.left, symbol, aliasSymbol, aliasTypeArguments),

From 409787495e09b9ba37c903d1233b73ddd079af15 Mon Sep 17 00:00:00 2001
From: Paul van Brenk <paul.van.brenk@microsoft.com>
Date: Mon, 24 Oct 2016 11:40:23 -0700
Subject: [PATCH 061/421] Fix 'import a = A' case

---
 src/services/codefixes/unusedIdentifierFixes.ts | 5 ++++-
 tests/cases/fourslash/unusedImports10FS.ts      | 2 +-
 tests/cases/fourslash/unusedImports9FS.ts       | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/services/codefixes/unusedIdentifierFixes.ts b/src/services/codefixes/unusedIdentifierFixes.ts
index 8e76f95a3d3..f801d5182d8 100644
--- a/src/services/codefixes/unusedIdentifierFixes.ts
+++ b/src/services/codefixes/unusedIdentifierFixes.ts
@@ -91,8 +91,11 @@ namespace ts.codefix {
                                 return removeSingleItem(elements, token);
                             }
 
+                        // handle case where 'import a = A;'
+                        // remove entire line
                         case SyntaxKind.ImportEqualsDeclaration:
-                            return createCodeFix("{}", token.pos, token.end - token.pos);
+                            const importDecl = token.parent;
+                            return createCodeFix("", importDecl.pos, importDecl.end - importDecl.pos);
 
                         case SyntaxKind.EnumDeclaration:
                             return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
diff --git a/tests/cases/fourslash/unusedImports10FS.ts b/tests/cases/fourslash/unusedImports10FS.ts
index 2eb923c9b8f..f9d38e4cfb0 100644
--- a/tests/cases/fourslash/unusedImports10FS.ts
+++ b/tests/cases/fourslash/unusedImports10FS.ts
@@ -12,5 +12,5 @@
 ////     [|import a = A;|]
 //// }
 
-verify.codeFixAtPosition(" import {} = A;");
+verify.codeFixAtPosition("");
 
diff --git a/tests/cases/fourslash/unusedImports9FS.ts b/tests/cases/fourslash/unusedImports9FS.ts
index 2ba30c95bb7..324d57a1928 100644
--- a/tests/cases/fourslash/unusedImports9FS.ts
+++ b/tests/cases/fourslash/unusedImports9FS.ts
@@ -17,4 +17,4 @@
 ////
 //// }
 
-verify.codeFixAtPosition("import {} = require('./file1')");
\ No newline at end of file
+verify.codeFixAtPosition("");
\ No newline at end of file

From d4b99d66e07625124891177b0ceec38473af0f31 Mon Sep 17 00:00:00 2001
From: Paul van Brenk <paul.van.brenk@microsoft.com>
Date: Mon, 24 Oct 2016 17:32:58 -0700
Subject: [PATCH 062/421] Simplifying handling import cases

---
 .../codefixes/unusedIdentifierFixes.ts         | 18 ++++++++++--------
 tests/cases/fourslash/unusedImports11FS.ts     | 14 ++++++++++++++
 tests/cases/fourslash/unusedImports12FS.ts     | 13 +++++++++++++
 tests/cases/fourslash/unusedImports1FS.ts      |  4 ++--
 tests/cases/fourslash/unusedImports2FS.ts      |  3 +--
 tests/cases/fourslash/unusedImports3FS.ts      |  2 +-
 tests/cases/fourslash/unusedImports4FS.ts      |  2 +-
 tests/cases/fourslash/unusedImports6FS.ts      |  2 +-
 tests/cases/fourslash/unusedImports7FS.ts      |  6 +-----
 9 files changed, 44 insertions(+), 20 deletions(-)
 create mode 100644 tests/cases/fourslash/unusedImports11FS.ts
 create mode 100644 tests/cases/fourslash/unusedImports12FS.ts

diff --git a/src/services/codefixes/unusedIdentifierFixes.ts b/src/services/codefixes/unusedIdentifierFixes.ts
index f801d5182d8..bb3664b974e 100644
--- a/src/services/codefixes/unusedIdentifierFixes.ts
+++ b/src/services/codefixes/unusedIdentifierFixes.ts
@@ -92,18 +92,20 @@ namespace ts.codefix {
                             }
 
                         // handle case where 'import a = A;'
-                        // remove entire line
                         case SyntaxKind.ImportEqualsDeclaration:
-                            const importDecl = token.parent;
-                            return createCodeFix("", importDecl.pos, importDecl.end - importDecl.pos);
+                            return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
+
+                        // handle case where 'import d from './file'
+                        case SyntaxKind.ImportClause:
+                            return createCodeFix("", token.parent.parent.pos, token.parent.parent.end - token.parent.parent.pos);
+
+                        // handle case where 'import * as a from './file'
+                        case SyntaxKind.NamespaceImport:
+                            return createCodeFix("", token.parent.parent.parent.pos, token.parent.parent.parent.end - token.parent.parent.parent.pos);
 
                         case SyntaxKind.EnumDeclaration:
                             return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
                     }
-
-                    if (token.parent.parent.kind === SyntaxKind.ImportClause || token.parent.parent.kind === SyntaxKind.ImportDeclaration) {
-                        return createCodeFix("{}", token.parent.pos, token.parent.end - token.parent.pos);
-                    }
                     break;
 
                 case SyntaxKind.PrivateKeyword:
@@ -112,7 +114,7 @@ namespace ts.codefix {
 
                 case SyntaxKind.AsteriskToken:
                 case SyntaxKind.NamespaceImport:
-                    return createCodeFix("{}", token.parent.pos, token.parent.end - token.parent.pos);
+                    return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
             }
 
             return undefined;
diff --git a/tests/cases/fourslash/unusedImports11FS.ts b/tests/cases/fourslash/unusedImports11FS.ts
new file mode 100644
index 00000000000..a18a4634d71
--- /dev/null
+++ b/tests/cases/fourslash/unusedImports11FS.ts
@@ -0,0 +1,14 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+// @Filename: file2.ts
+//// [| import f1, * as s from "./file1"; |]
+//// s.f2('hello');
+
+// @Filename: file1.ts
+//// export var v1;
+//// export function f1(n: number){}
+//// export function f2(s: string){};
+//// export default f1;
+
+verify.codeFixAtPosition('import * as s from "./file1";');
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedImports12FS.ts b/tests/cases/fourslash/unusedImports12FS.ts
new file mode 100644
index 00000000000..647b7dfbe16
--- /dev/null
+++ b/tests/cases/fourslash/unusedImports12FS.ts
@@ -0,0 +1,13 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+// @Filename: file2.ts
+//// [| import f1, * as s from "./file1"; |]
+//// f1(42);
+
+// @Filename: file1.ts
+//// export function f1(n: number){}
+//// export function f2(s: string){};
+//// export default f1;
+
+verify.codeFixAtPosition('import f1 "./file1";');
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedImports1FS.ts b/tests/cases/fourslash/unusedImports1FS.ts
index c3ae198d876..411e9b3530b 100644
--- a/tests/cases/fourslash/unusedImports1FS.ts
+++ b/tests/cases/fourslash/unusedImports1FS.ts
@@ -2,11 +2,11 @@
 
 // @noUnusedLocals: true
 // @Filename: file2.ts
-////   [| import {/*0*/Calculator/*1*/} from "./file1" |]
+////   [| import { Calculator } from "./file1" |]
 
 // @Filename: file1.ts
 ////    export class Calculator {
 ////
 ////    }
 
-verify.codeFixAtPosition(`import {} from "./file1"`);
+verify.codeFixAtPosition('');
diff --git a/tests/cases/fourslash/unusedImports2FS.ts b/tests/cases/fourslash/unusedImports2FS.ts
index a7144d1eb49..a27f568b0d2 100644
--- a/tests/cases/fourslash/unusedImports2FS.ts
+++ b/tests/cases/fourslash/unusedImports2FS.ts
@@ -16,5 +16,4 @@
 ////
 //// }
 
-verify.codeFixAtPosition(`import {Calculator} from "./file1"
-import {} from "./file1"`);
+verify.codeFixAtPosition(`import {Calculator} from "./file1"`);
diff --git a/tests/cases/fourslash/unusedImports3FS.ts b/tests/cases/fourslash/unusedImports3FS.ts
index f030232dc1e..205666e971d 100644
--- a/tests/cases/fourslash/unusedImports3FS.ts
+++ b/tests/cases/fourslash/unusedImports3FS.ts
@@ -2,7 +2,7 @@
 
 // @noUnusedLocals: true
 // @Filename: file2.ts
-////[| import {/*0*/Calculator,/*1*/ test, test2} from "./file1" |]
+////[| import {Calculator, test, test2} from "./file1" |]
 
 //// test();
 //// test2();
diff --git a/tests/cases/fourslash/unusedImports4FS.ts b/tests/cases/fourslash/unusedImports4FS.ts
index ab37928eb01..302007748f4 100644
--- a/tests/cases/fourslash/unusedImports4FS.ts
+++ b/tests/cases/fourslash/unusedImports4FS.ts
@@ -2,7 +2,7 @@
 
 // @noUnusedLocals: true
 // @Filename: file2.ts
-//// [| import {Calculator/*0*/, test/*1*/, test2} from "./file1" |]
+//// [| import {Calculator, test, test2} from "./file1" |]
 ////
 //// var x = new Calculator();
 //// x.handleChar();
diff --git a/tests/cases/fourslash/unusedImports6FS.ts b/tests/cases/fourslash/unusedImports6FS.ts
index c8e1af92313..a5c6744855a 100644
--- a/tests/cases/fourslash/unusedImports6FS.ts
+++ b/tests/cases/fourslash/unusedImports6FS.ts
@@ -17,4 +17,4 @@
 ////
 //// }
 
-verify.codeFixAtPosition(`import {} from "./file1"`);
\ No newline at end of file
+verify.codeFixAtPosition('');
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedImports7FS.ts b/tests/cases/fourslash/unusedImports7FS.ts
index 6dc0886e8ff..23066ef538d 100644
--- a/tests/cases/fourslash/unusedImports7FS.ts
+++ b/tests/cases/fourslash/unusedImports7FS.ts
@@ -8,13 +8,9 @@
 //// export class Calculator {
 ////     handleChar() { }
 //// }
-////
 //// export function test() {
-////
 //// }
-////
 //// export default function test2() {
-////
 //// }
 
-verify.codeFixAtPosition(`import {} from "./file1"`);
\ No newline at end of file
+verify.codeFixAtPosition('');
\ No newline at end of file

From 83f5d3f25ccfd184164ec1572f2b4394789b3c3b Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Fri, 21 Oct 2016 18:44:13 -0700
Subject: [PATCH 063/421] Move emit helpers into related transformers

---
 src/compiler/checker.ts                    |   2 +-
 src/compiler/core.ts                       |  23 +-
 src/compiler/emitter.ts                    | 290 ++--------
 src/compiler/factory.ts                    | 617 +++++++++++----------
 src/compiler/transformers/es2015.ts        |  39 +-
 src/compiler/transformers/es2017.ts        | 137 +++--
 src/compiler/transformers/generators.ts    | 159 +++++-
 src/compiler/transformers/jsx.ts           | 553 +++++++++---------
 src/compiler/transformers/module/es2015.ts |  22 +-
 src/compiler/transformers/module/module.ts |  16 +-
 src/compiler/transformers/module/system.ts |  22 +-
 src/compiler/transformers/ts.ts            | 158 ++++--
 src/compiler/types.ts                      |  26 +-
 src/compiler/utilities.ts                  | 147 -----
 14 files changed, 1104 insertions(+), 1107 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 4fa14658494..e6617c88eb3 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -19034,7 +19034,7 @@ namespace ts {
 
         function isNameOfModuleOrEnumDeclaration(node: Identifier) {
             const parent = node.parent;
-            return isModuleOrEnumDeclaration(parent) && node === parent.name;
+            return parent && isModuleOrEnumDeclaration(parent) && node === parent.name;
         }
 
         // When resolved as an expression identifier, if the given node references an exported entity, return the declaration
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index 13813182d32..ac881200837 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -538,7 +538,7 @@ namespace ts {
      */
     export function append<T>(to: T[] | undefined, value: T | undefined): T[] | undefined {
         if (value === undefined) return to;
-        if (to === undefined) to = [];
+        if (to === undefined) return [value];
         to.push(value);
         return to;
     }
@@ -559,6 +559,16 @@ namespace ts {
         return to;
     }
 
+    /**
+     * Stable sort of an array. Elements equal to each other maintain their relative position in the array.
+     */
+    export function stableSort<T>(array: T[], comparer: (x: T, y: T) => Comparison = compareValues) {
+        return array
+            .map((_, i) => i) // create array of indices
+            .sort((x, y) => comparer(array[x], array[y]) || compareValues(x, y)) // sort indices by value then position
+            .map(i => array[i]); // get sorted array
+    }
+
     export function rangeEquals<T>(array1: T[], array2: T[], pos: number, end: number) {
         while (pos < end) {
             if (array1[pos] !== array2[pos]) {
@@ -2022,6 +2032,17 @@ namespace ts {
     }
 
     /** Remove an item from an array, moving everything to its right one space left. */
+    export function orderedRemoveItem<T>(array: T[], item: T): boolean {
+        for (let i = 0; i < array.length; i++) {
+            if (array[i] === item) {
+                orderedRemoveItemAt(array, i);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /** Remove an item by index from an array, moving everything to its right one space left. */
     export function orderedRemoveItemAt<T>(array: T[], index: number): void {
         // This seems to be faster than either `array.splice(i, 1)` or `array.copyWithin(i, i+ 1)`.
         for (let i = index; i < array.length - 1; i++) {
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 1051c9adca9..ed16ec06159 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -21,153 +21,6 @@ namespace ts {
         const delimiters = createDelimiterMap();
         const brackets = createBracketsMap();
 
-        // emit output for the __extends helper function
-        const extendsHelper = `
-var __extends = (this && this.__extends) || function (d, b) {
-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-};`;
-
-        // Emit output for the __assign helper function.
-        // This is typically used for JSX spread attributes,
-        // and can be used for object literal spread properties.
-        const assignHelper = `
-var __assign = (this && this.__assign) || Object.assign || function(t) {
-    for (var s, i = 1, n = arguments.length; i < n; i++) {
-        s = arguments[i];
-        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-            t[p] = s[p];
-    }
-    return t;
-};`;
-
-        // emit output for the __decorate helper function
-        const decorateHelper = `
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};`;
-
-        // emit output for the __metadata helper function
-        const metadataHelper = `
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};`;
-
-        // emit output for the __param helper function
-        const paramHelper = `
-var __param = (this && this.__param) || function (paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-};`;
-
-        // emit output for the __awaiter helper function
-        const awaiterHelper = `
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    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); }
-        step((generator = generator.apply(thisArg, _arguments)).next());
-    });
-};`;
-
-        // The __generator helper is used by down-level transformations to emulate the runtime
-        // semantics of an ES2015 generator function. When called, this helper returns an
-        // object that implements the Iterator protocol, in that it has `next`, `return`, and
-        // `throw` methods that step through the generator when invoked.
-        //
-        // parameters:
-        //  thisArg  The value to use as the `this` binding for the transformed generator body.
-        //  body     A function that acts as the transformed generator body.
-        //
-        // variables:
-        //  _       Persistent state for the generator that is shared between the helper and the
-        //          generator body. The state object has the following members:
-        //            sent() - A method that returns or throws the current completion value.
-        //            label  - The next point at which to resume evaluation of the generator body.
-        //            trys   - A stack of protected regions (try/catch/finally blocks).
-        //            ops    - A stack of pending instructions when inside of a finally block.
-        //  f       A value indicating whether the generator is executing.
-        //  y       An iterator to delegate for a yield*.
-        //  t       A temporary variable that holds one of the following values (note that these
-        //          cases do not overlap):
-        //          - The completion value when resuming from a `yield` or `yield*`.
-        //          - The error value for a catch block.
-        //          - The current protected region (array of try/catch/finally/end labels).
-        //          - The verb (`next`, `throw`, or `return` method) to delegate to the expression
-        //            of a `yield*`.
-        //          - The result of evaluating the verb delegated to the expression of a `yield*`.
-        //
-        // functions:
-        //  verb(n)     Creates a bound callback to the `step` function for opcode `n`.
-        //  step(op)    Evaluates opcodes in a generator body until execution is suspended or
-        //              completed.
-        //
-        // The __generator helper understands a limited set of instructions:
-        //  0: next(value?)     - Start or resume the generator with the specified value.
-        //  1: throw(error)     - Resume the generator with an exception. If the generator is
-        //                        suspended inside of one or more protected regions, evaluates
-        //                        any intervening finally blocks between the current label and
-        //                        the nearest catch block or function boundary. If uncaught, the
-        //                        exception is thrown to the caller.
-        //  2: return(value?)   - Resume the generator as if with a return. If the generator is
-        //                        suspended inside of one or more protected regions, evaluates any
-        //                        intervening finally blocks.
-        //  3: break(label)     - Jump to the specified label. If the label is outside of the
-        //                        current protected region, evaluates any intervening finally
-        //                        blocks.
-        //  4: yield(value?)    - Yield execution to the caller with an optional value. When
-        //                        resumed, the generator will continue at the next label.
-        //  5: yield*(value)    - Delegates evaluation to the supplied iterator. When
-        //                        delegation completes, the generator will continue at the next
-        //                        label.
-        //  6: catch(error)     - Handles an exception thrown from within the generator body. If
-        //                        the current label is inside of one or more protected regions,
-        //                        evaluates any intervening finally blocks between the current
-        //                        label and the nearest catch block or function boundary. If
-        //                        uncaught, the exception is thrown to the caller.
-        //  7: endfinally       - Ends a finally block, resuming the last instruction prior to
-        //                        entering a finally block.
-        //
-        // For examples of how these are used, see the comments in ./transformers/generators.ts
-        const generatorHelper = `
-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;
-    return { next: verb(0), "throw": verb(1), "return": verb(2) };
-    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 = y[op[0] & 2 ? "return" : op[0] ? "throw" : "next"]) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [0, 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 };
-    }
-};`;
-
-        // emit output for the __export helper function
-        const exportStarHelper = `
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}`;
-
         // emit output for the UMD helper function.
         const umdHelper = `
 (function (dependencies, factory) {
@@ -179,15 +32,6 @@ function __export(m) {
     }
 })`;
 
-        const superHelper = `
-const _super = name => super[name];`;
-
-        const advancedSuperHelper = `
-const _super = (function (geti, seti) {
-    const cache = Object.create(null);
-    return name => cache[name] || (cache[name] = { get value() { return geti(name); }, set value(v) { seti(name, v); } });
-})(name => super[name], (name, value) => super[name] = value);`;
-
         const compilerOptions = host.getCompilerOptions();
         const languageVersion = getEmitScriptTarget(compilerOptions);
         const moduleKind = getEmitModuleKind(compilerOptions);
@@ -224,11 +68,7 @@ const _super = (function (geti, seti) {
         let currentSourceFile: SourceFile;
         let currentText: string;
         let currentFileIdentifiers: Map<string>;
-        let extendsEmitted: boolean;
-        let assignEmitted: boolean;
-        let decorateEmitted: boolean;
-        let paramEmitted: boolean;
-        let awaiterEmitted: boolean;
+        let bundledHelpers: Map<boolean>;
         let isOwnFileEmit: boolean;
         let emitSkipped = false;
 
@@ -293,12 +133,13 @@ const _super = (function (geti, seti) {
             nodeIdToGeneratedName = [];
             autoGeneratedIdToGeneratedName = [];
             generatedNameSet = createMap<string>();
+            bundledHelpers = isBundledEmit ? createMap<boolean>() : undefined;
             isOwnFileEmit = !isBundledEmit;
 
             // Emit helpers from all the files
             if (isBundledEmit && moduleKind) {
                 for (const sourceFile of sourceFiles) {
-                    emitEmitHelpers(sourceFile);
+                    emitHelpers(sourceFile, /*isBundle*/ true);
                 }
             }
 
@@ -333,11 +174,6 @@ const _super = (function (geti, seti) {
             tempFlags = TempFlags.Auto;
             currentSourceFile = undefined;
             currentText = undefined;
-            extendsEmitted = false;
-            assignEmitted = false;
-            decorateEmitted = false;
-            paramEmitted = false;
-            awaiterEmitted = false;
             isOwnFileEmit = false;
         }
 
@@ -2141,85 +1977,39 @@ const _super = (function (geti, seti) {
             return statements.length;
         }
 
-        function emitHelpers(node: Node) {
-            const emitFlags = getEmitFlags(node);
-            let helpersEmitted = false;
-            if (emitFlags & EmitFlags.EmitEmitHelpers) {
-                helpersEmitted = emitEmitHelpers(currentSourceFile);
-            }
-
-            if (emitFlags & EmitFlags.EmitExportStar) {
-                writeLines(exportStarHelper);
-                helpersEmitted = true;
-            }
-
-            if (emitFlags & EmitFlags.EmitSuperHelper) {
-                writeLines(superHelper);
-                helpersEmitted = true;
-            }
-
-            if (emitFlags & EmitFlags.EmitAdvancedSuperHelper) {
-                writeLines(advancedSuperHelper);
-                helpersEmitted = true;
-            }
-
-            return helpersEmitted;
-        }
-
-        function emitEmitHelpers(node: SourceFile) {
-            // Only emit helpers if the user did not say otherwise.
-            if (compilerOptions.noEmitHelpers) {
-                return false;
-            }
-
-            // Don't emit helpers if we can import them.
-            if (compilerOptions.importHelpers
-                && (isExternalModule(node) || compilerOptions.isolatedModules)) {
-                return false;
-            }
+        function emitHelpers(node: Node, isBundle?: boolean) {
+            const sourceFile = isSourceFile(node) ? node : currentSourceFile;
+            const shouldSkip = compilerOptions.noEmitHelpers || (sourceFile && getExternalHelpersModuleName(sourceFile) !== undefined);
+            const shouldBundle = isSourceFile(node) && !isOwnFileEmit;
 
             let helpersEmitted = false;
+            const helpers = getEmitHelpers(node);
+            if (helpers) {
+                for (const helper of stableSort(helpers, compareEmitHelpers)) {
+                    if (!helper.scoped) {
+                        // Skip the helper if it can be skipped and the noEmitHelpers compiler
+                        // option is set, or if it can be imported and the importHelpers compiler
+                        // option is set.
+                        if (shouldSkip) continue;
 
-            // Only Emit __extends function when target ES5.
-            // For target ES6 and above, we can emit classDeclaration as is.
-            if ((languageVersion < ScriptTarget.ES2015) && (!extendsEmitted && node.flags & NodeFlags.HasClassExtends)) {
-                writeLines(extendsHelper);
-                extendsEmitted = true;
-                helpersEmitted = true;
-            }
+                        // Skip the helper if it can be bundled but hasn't already been emitted and we
+                        // are emitting a bundled module.
+                        if (shouldBundle) {
+                            if (helper.name in bundledHelpers) {
+                                continue;
+                            }
 
-            if (compilerOptions.jsx !== JsxEmit.Preserve && !assignEmitted && (node.flags & NodeFlags.HasJsxSpreadAttributes)) {
-                writeLines(assignHelper);
-                assignEmitted = true;
-            }
+                            bundledHelpers[helper.name] = true;
+                        }
+                    }
+                    else if (isBundle) {
+                        // Skip the helper if it is scoped and we are emitting bundled helpers
+                        continue;
+                    }
 
-            if (!decorateEmitted && node.flags & NodeFlags.HasDecorators) {
-                writeLines(decorateHelper);
-                if (compilerOptions.emitDecoratorMetadata) {
-                    writeLines(metadataHelper);
+                    writeLines(helper.text);
+                    helpersEmitted = true;
                 }
-
-                decorateEmitted = true;
-                helpersEmitted = true;
-            }
-
-            if (!paramEmitted && node.flags & NodeFlags.HasParamDecorators) {
-                writeLines(paramHelper);
-                paramEmitted = true;
-                helpersEmitted = true;
-            }
-
-            // Only emit __awaiter function when target ES5/ES6.
-            // Only emit __generator function when target ES5.
-            // For target ES2017 and above, we can emit async/await as is.
-            if ((languageVersion < ScriptTarget.ES2017) && (!awaiterEmitted && node.flags & NodeFlags.HasAsyncFunctions)) {
-                writeLines(awaiterHelper);
-                if (languageVersion < ScriptTarget.ES2015) {
-                    writeLines(generatorHelper);
-                }
-
-                awaiterEmitted = true;
-                helpersEmitted = true;
             }
 
             if (helpersEmitted) {
@@ -2230,9 +2020,10 @@ const _super = (function (geti, seti) {
         }
 
         function writeLines(text: string): void {
-            const lines = text.split(/\r\n|\r|\n/g);
+            const lines = text.split(/\r\n?|\n/g);
+            const indentation = guessIndentation(lines);
             for (let i = 0; i < lines.length; i++) {
-                const line = lines[i];
+                const line = indentation ? lines[i].slice(indentation) : lines[i];
                 if (line.length) {
                     if (i > 0) {
                         writeLine();
@@ -2242,6 +2033,21 @@ const _super = (function (geti, seti) {
             }
         }
 
+        function guessIndentation(lines: string[]) {
+            let indentation: number;
+            for (const line of lines) {
+                for (let i = 0; i < line.length && (indentation === undefined || i < indentation); i++) {
+                    if (!isWhiteSpace(line.charCodeAt(i))) {
+                        if (indentation === undefined || i < indentation) {
+                            indentation = i;
+                            break;
+                        }
+                    }
+                }
+            }
+            return indentation;
+        }
+
         //
         // Helpers
         //
diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index c557e3514a5..04b7079d094 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -1440,7 +1440,6 @@ namespace ts {
             if (node.resolvedTypeReferenceDirectiveNames !== undefined) updated.resolvedTypeReferenceDirectiveNames = node.resolvedTypeReferenceDirectiveNames;
             if (node.imports !== undefined) updated.imports = node.imports;
             if (node.moduleAugmentations !== undefined) updated.moduleAugmentations = node.moduleAugmentations;
-            if (node.externalHelpersModuleName !== undefined) updated.externalHelpersModuleName = node.externalHelpersModuleName;
             return updateNode(updated, node);
         }
 
@@ -1683,278 +1682,23 @@ namespace ts {
 
     // Helpers
 
-    export function createHelperName(externalHelpersModuleName: Identifier | undefined, name: string) {
+    export interface EmitHelperState {
+        currentSourceFile: SourceFile;
+        compilerOptions: CompilerOptions;
+        requestedHelpers?: EmitHelper[];
+    }
+
+    export function getHelperName(helperState: EmitHelperState, name: string) {
+        const externalHelpersModuleName = getOrCreateExternalHelpersModuleName(helperState.currentSourceFile, helperState.compilerOptions);
         return externalHelpersModuleName
             ? createPropertyAccess(externalHelpersModuleName, name)
             : createIdentifier(name);
     }
 
-    export function createExtendsHelper(externalHelpersModuleName: Identifier | undefined, name: Identifier) {
-        return createCall(
-            createHelperName(externalHelpersModuleName, "__extends"),
-            /*typeArguments*/ undefined,
-            [
-                name,
-                createIdentifier("_super")
-            ]
-        );
-    }
-
-    export function createAssignHelper(externalHelpersModuleName: Identifier | undefined, attributesSegments: Expression[]) {
-        return createCall(
-            createHelperName(externalHelpersModuleName, "__assign"),
-            /*typeArguments*/ undefined,
-            attributesSegments
-        );
-    }
-
-    export function createParamHelper(externalHelpersModuleName: Identifier | undefined, expression: Expression, parameterOffset: number, location?: TextRange) {
-        return createCall(
-            createHelperName(externalHelpersModuleName, "__param"),
-            /*typeArguments*/ undefined,
-            [
-                createLiteral(parameterOffset),
-                expression
-            ],
-            location
-        );
-    }
-
-    export function createMetadataHelper(externalHelpersModuleName: Identifier | undefined, metadataKey: string, metadataValue: Expression) {
-        return createCall(
-            createHelperName(externalHelpersModuleName, "__metadata"),
-            /*typeArguments*/ undefined,
-            [
-                createLiteral(metadataKey),
-                metadataValue
-            ]
-        );
-    }
-
-    export function createDecorateHelper(externalHelpersModuleName: Identifier | undefined, decoratorExpressions: Expression[], target: Expression, memberName?: Expression, descriptor?: Expression, location?: TextRange) {
-        const argumentsArray: Expression[] = [];
-        argumentsArray.push(createArrayLiteral(decoratorExpressions, /*location*/ undefined, /*multiLine*/ true));
-        argumentsArray.push(target);
-        if (memberName) {
-            argumentsArray.push(memberName);
-            if (descriptor) {
-                argumentsArray.push(descriptor);
-            }
+    export function requestEmitHelper(helperState: EmitHelperState, helper: EmitHelper) {
+        if (!contains(helperState.requestedHelpers, helper)) {
+            helperState.requestedHelpers = append(helperState.requestedHelpers, helper);
         }
-
-        return createCall(createHelperName(externalHelpersModuleName, "__decorate"), /*typeArguments*/ undefined, argumentsArray, location);
-    }
-
-    export function createAwaiterHelper(externalHelpersModuleName: Identifier | undefined, hasLexicalArguments: boolean, promiseConstructor: EntityName | Expression, body: Block) {
-        const generatorFunc = createFunctionExpression(
-            /*modifiers*/ undefined,
-            createToken(SyntaxKind.AsteriskToken),
-            /*name*/ undefined,
-            /*typeParameters*/ undefined,
-            /*parameters*/ [],
-            /*type*/ undefined,
-            body
-        );
-
-        // Mark this node as originally an async function
-        (generatorFunc.emitNode || (generatorFunc.emitNode = {})).flags |= EmitFlags.AsyncFunctionBody;
-
-        return createCall(
-            createHelperName(externalHelpersModuleName, "__awaiter"),
-            /*typeArguments*/ undefined,
-            [
-                createThis(),
-                hasLexicalArguments ? createIdentifier("arguments") : createVoidZero(),
-                promiseConstructor ? createExpressionFromEntityName(promiseConstructor) : createVoidZero(),
-                generatorFunc
-            ]
-        );
-    }
-
-    export function createHasOwnProperty(target: LeftHandSideExpression, propertyName: Expression) {
-        return createCall(
-            createPropertyAccess(target, "hasOwnProperty"),
-            /*typeArguments*/ undefined,
-            [propertyName]
-        );
-    }
-
-    function createObjectCreate(prototype: Expression) {
-        return createCall(
-            createPropertyAccess(createIdentifier("Object"), "create"),
-            /*typeArguments*/ undefined,
-            [prototype]
-        );
-    }
-
-    function createGeti(target: LeftHandSideExpression) {
-        // name => super[name]
-        return createArrowFunction(
-            /*modifiers*/ undefined,
-            /*typeParameters*/ undefined,
-            [createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "name")],
-            /*type*/ undefined,
-            createToken(SyntaxKind.EqualsGreaterThanToken),
-            createElementAccess(target, createIdentifier("name"))
-        );
-    }
-
-    function createSeti(target: LeftHandSideExpression) {
-        // (name, value) => super[name] = value
-        return createArrowFunction(
-            /*modifiers*/ undefined,
-            /*typeParameters*/ undefined,
-            [
-                createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "name"),
-                createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "value")
-            ],
-            /*type*/ undefined,
-            createToken(SyntaxKind.EqualsGreaterThanToken),
-            createAssignment(
-                createElementAccess(
-                    target,
-                    createIdentifier("name")
-                ),
-                createIdentifier("value")
-            )
-        );
-    }
-
-    export function createAdvancedAsyncSuperHelper() {
-        //  const _super = (function (geti, seti) {
-        //      const cache = Object.create(null);
-        //      return name => cache[name] || (cache[name] = { get value() { return geti(name); }, set value(v) { seti(name, v); } });
-        //  })(name => super[name], (name, value) => super[name] = value);
-
-        // const cache = Object.create(null);
-        const createCache = createVariableStatement(
-            /*modifiers*/ undefined,
-            createConstDeclarationList([
-                createVariableDeclaration(
-                    "cache",
-                    /*type*/ undefined,
-                    createObjectCreate(createNull())
-                )
-            ])
-        );
-
-        // get value() { return geti(name); }
-        const getter = createGetAccessor(
-            /*decorators*/ undefined,
-            /*modifiers*/ undefined,
-            "value",
-            /*parameters*/ [],
-            /*type*/ undefined,
-            createBlock([
-                createReturn(
-                    createCall(
-                        createIdentifier("geti"),
-                        /*typeArguments*/ undefined,
-                        [createIdentifier("name")]
-                    )
-                )
-            ])
-        );
-
-        // set value(v) { seti(name, v); }
-        const setter = createSetAccessor(
-            /*decorators*/ undefined,
-            /*modifiers*/ undefined,
-            "value",
-            [createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "v")],
-            createBlock([
-                createStatement(
-                    createCall(
-                        createIdentifier("seti"),
-                        /*typeArguments*/ undefined,
-                        [
-                            createIdentifier("name"),
-                            createIdentifier("v")
-                        ]
-                    )
-                )
-            ])
-        );
-
-        // return name => cache[name] || ...
-        const getOrCreateAccessorsForName = createReturn(
-            createArrowFunction(
-                /*modifiers*/ undefined,
-                /*typeParameters*/ undefined,
-                [createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "name")],
-                /*type*/ undefined,
-                createToken(SyntaxKind.EqualsGreaterThanToken),
-                createLogicalOr(
-                    createElementAccess(
-                        createIdentifier("cache"),
-                        createIdentifier("name")
-                    ),
-                    createParen(
-                        createAssignment(
-                            createElementAccess(
-                                createIdentifier("cache"),
-                                createIdentifier("name")
-                            ),
-                            createObjectLiteral([
-                                getter,
-                                setter
-                            ])
-                        )
-                    )
-                )
-            )
-        );
-
-        //  const _super = (function (geti, seti) {
-        //      const cache = Object.create(null);
-        //      return name => cache[name] || (cache[name] = { get value() { return geti(name); }, set value(v) { seti(name, v); } });
-        //  })(name => super[name], (name, value) => super[name] = value);
-        return createVariableStatement(
-            /*modifiers*/ undefined,
-            createConstDeclarationList([
-                createVariableDeclaration(
-                    "_super",
-                    /*type*/ undefined,
-                    createCall(
-                        createParen(
-                            createFunctionExpression(
-                                /*modifiers*/ undefined,
-                                /*asteriskToken*/ undefined,
-                                /*name*/ undefined,
-                                /*typeParameters*/ undefined,
-                                [
-                                    createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "geti"),
-                                    createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "seti")
-                                ],
-                                /*type*/ undefined,
-                                createBlock([
-                                    createCache,
-                                    getOrCreateAccessorsForName
-                                ])
-                            )
-                        ),
-                        /*typeArguments*/ undefined,
-                        [
-                            createGeti(createSuper()),
-                            createSeti(createSuper())
-                        ]
-                    )
-                )
-            ])
-        );
-    }
-
-    export function createSimpleAsyncSuperHelper() {
-        return createVariableStatement(
-            /*modifiers*/ undefined,
-            createConstDeclarationList([
-                createVariableDeclaration(
-                    "_super",
-                    /*type*/ undefined,
-                    createGeti(createSuper())
-                )
-            ])
-        );
     }
 
     export interface CallBinding {
@@ -2356,11 +2100,11 @@ namespace ts {
     /**
      * Ensures "use strict" directive is added
      *
-     * @param node source file
+     * @param statements An array of statements
      */
-    export function ensureUseStrict(node: SourceFile): SourceFile {
+    export function ensureUseStrict(statements: NodeArray<Statement>): NodeArray<Statement> {
         let foundUseStrict = false;
-        for (const statement of node.statements) {
+        for (const statement of statements) {
             if (isPrologueDirective(statement)) {
                 if (isUseStrictPrologue(statement as ExpressionStatement)) {
                     foundUseStrict = true;
@@ -2371,13 +2115,15 @@ namespace ts {
                 break;
             }
         }
+
         if (!foundUseStrict) {
-            const statements: Statement[] = [];
-            statements.push(startOnNewLine(createStatement(createLiteral("use strict"))));
-            // add "use strict" as the first statement
-            return updateSourceFileNode(node, statements.concat(node.statements));
+            return createNodeArray<Statement>([
+                startOnNewLine(createStatement(createLiteral("use strict"))),
+                ...statements
+            ], statements);
         }
-        return node;
+
+        return statements;
     }
 
     /**
@@ -2796,12 +2542,21 @@ namespace ts {
     }
 
     function mergeEmitNode(sourceEmitNode: EmitNode, destEmitNode: EmitNode) {
-        const { flags, commentRange, sourceMapRange, tokenSourceMapRanges } = sourceEmitNode;
-        if (!destEmitNode && (flags || commentRange || sourceMapRange || tokenSourceMapRanges)) destEmitNode = {};
+        const {
+            flags,
+            commentRange,
+            sourceMapRange,
+            tokenSourceMapRanges,
+            constantValue,
+            helpers
+        } = sourceEmitNode;
+        if (!destEmitNode) destEmitNode = {};
         if (flags) destEmitNode.flags = flags;
         if (commentRange) destEmitNode.commentRange = commentRange;
         if (sourceMapRange) destEmitNode.sourceMapRange = sourceMapRange;
         if (tokenSourceMapRanges) destEmitNode.tokenSourceMapRanges = mergeTokenSourceMapRanges(tokenSourceMapRanges, destEmitNode.tokenSourceMapRanges);
+        if (constantValue !== undefined) destEmitNode.constantValue = constantValue;
+        if (helpers) destEmitNode.helpers = addRange(destEmitNode.helpers, helpers);
         return destEmitNode;
     }
 
@@ -2879,6 +2634,16 @@ namespace ts {
         return node;
     }
 
+    /**
+     * Gets a custom text range to use when emitting source maps.
+     *
+     * @param node The node.
+     */
+    export function getSourceMapRange(node: Node) {
+        const emitNode = node.emitNode;
+        return (emitNode && emitNode.sourceMapRange) || node;
+    }
+
     /**
      * Sets a custom text range to use when emitting source maps.
      *
@@ -2890,6 +2655,18 @@ namespace ts {
         return node;
     }
 
+    /**
+     * Gets the TextRange to use for source maps for a token of a node.
+     *
+     * @param node The node.
+     * @param token The token.
+     */
+    export function getTokenSourceMapRange(node: Node, token: SyntaxKind) {
+        const emitNode = node.emitNode;
+        const tokenSourceMapRanges = emitNode && emitNode.tokenSourceMapRanges;
+        return tokenSourceMapRanges && tokenSourceMapRanges[token];
+    }
+
     /**
      * Sets the TextRange to use for source maps for a token of a node.
      *
@@ -2904,14 +2681,6 @@ namespace ts {
         return node;
     }
 
-    /**
-     * Sets a custom text range to use when emitting comments.
-     */
-    export function setCommentRange<T extends Node>(node: T, range: TextRange) {
-        getOrCreateEmitNode(node).commentRange = range;
-        return node;
-    }
-
     /**
      * Gets a custom text range to use when emitting comments.
      *
@@ -2923,25 +2692,11 @@ namespace ts {
     }
 
     /**
-     * Gets a custom text range to use when emitting source maps.
-     *
-     * @param node The node.
+     * Sets a custom text range to use when emitting comments.
      */
-    export function getSourceMapRange(node: Node) {
-        const emitNode = node.emitNode;
-        return (emitNode && emitNode.sourceMapRange) || node;
-    }
-
-    /**
-     * Gets the TextRange to use for source maps for a token of a node.
-     *
-     * @param node The node.
-     * @param token The token.
-     */
-    export function getTokenSourceMapRange(node: Node, token: SyntaxKind) {
-        const emitNode = node.emitNode;
-        const tokenSourceMapRanges = emitNode && emitNode.tokenSourceMapRanges;
-        return tokenSourceMapRanges && tokenSourceMapRanges[token];
+    export function setCommentRange<T extends Node>(node: T, range: TextRange) {
+        getOrCreateEmitNode(node).commentRange = range;
+        return node;
     }
 
     /**
@@ -2961,6 +2716,102 @@ namespace ts {
         return node;
     }
 
+    export function getExternalHelpersModuleName(node: SourceFile) {
+        const parseNode = getOriginalNode(node, isSourceFile);
+        const emitNode = parseNode && parseNode.emitNode;
+        return emitNode && emitNode.externalHelpersModuleName;
+    }
+
+    export function getOrCreateExternalHelpersModuleName(node: SourceFile, compilerOptions: CompilerOptions) {
+        if (compilerOptions.importHelpers && (isExternalModule(node) || compilerOptions.isolatedModules)) {
+            const parseNode = getOriginalNode(node, isSourceFile);
+            const emitNode = getOrCreateEmitNode(parseNode);
+            return emitNode.externalHelpersModuleName || (emitNode.externalHelpersModuleName = createUniqueName(externalHelpersModuleNameText));
+        }
+    }
+
+    /**
+     * Adds an EmitHelper to a node.
+     */
+    export function addEmitHelper<T extends Node>(node: T, helper: EmitHelper): T {
+        const emitNode = getOrCreateEmitNode(node);
+        emitNode.helpers = append(emitNode.helpers, helper);
+        return node;
+    }
+
+    /**
+     * Adds an EmitHelper to a node.
+     */
+    export function addEmitHelpers<T extends Node>(node: T, helpers: EmitHelper[] | undefined): T {
+        if (some(helpers)) {
+            const emitNode = getOrCreateEmitNode(node);
+            for (const helper of helpers) {
+                if (!contains(emitNode.helpers, helper)) {
+                    emitNode.helpers = append(emitNode.helpers, helper);
+                }
+            }
+        }
+        return node;
+    }
+
+    /**
+     * Removes an EmitHelper from a node.
+     */
+    export function removeEmitHelper(node: Node, helper: EmitHelper): boolean {
+        const emitNode = node.emitNode;
+        if (emitNode) {
+            const helpers = emitNode.helpers;
+            if (helpers) {
+                return orderedRemoveItem(helpers, helper);
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Gets the EmitHelpers of a node.
+     */
+    export function getEmitHelpers(node: Node): EmitHelper[] | undefined {
+        const emitNode = node.emitNode;
+        return emitNode && emitNode.helpers;
+    }
+
+    /**
+     * Moves matching emit helpers from a source node to a target node.
+     */
+    export function moveEmitHelpers(source: Node, target: Node, predicate: (helper: EmitHelper) => boolean) {
+        const sourceEmitNode = source.emitNode;
+        const sourceEmitHelpers = sourceEmitNode && sourceEmitNode.helpers;
+        if (!some(sourceEmitHelpers)) return;
+
+        const targetEmitNode = getOrCreateEmitNode(target);
+        let helpersRemoved = 0;
+        for (let i = 0; i < sourceEmitHelpers.length; i++) {
+            const helper = sourceEmitHelpers[i];
+            if (predicate(helper)) {
+                helpersRemoved++;
+                if (!contains(targetEmitNode.helpers, helper)) {
+                    targetEmitNode.helpers = append(targetEmitNode.helpers, helper);
+                }
+            }
+            else if (helpersRemoved > 0) {
+                sourceEmitHelpers[i - helpersRemoved] = helper;
+            }
+        }
+
+        if (helpersRemoved > 0) {
+            sourceEmitHelpers.length -= helpersRemoved;
+        }
+    }
+
+    export function compareEmitHelpers(x: EmitHelper, y: EmitHelper) {
+        if (x === y) return Comparison.EqualTo;
+        if (x.priority === y.priority) return Comparison.EqualTo;
+        if (x.priority === undefined) return Comparison.GreaterThan;
+        if (y.priority === undefined) return Comparison.LessThan;
+        return compareValues(x.priority, y.priority);
+    }
+
     export function setTextRange<T extends TextRange>(node: T, location: TextRange): T {
         if (location) {
             node.pos = location.pos;
@@ -3055,4 +2906,164 @@ namespace ts {
     function tryGetModuleNameFromDeclaration(declaration: ImportEqualsDeclaration | ImportDeclaration | ExportDeclaration, host: EmitHost, resolver: EmitResolver, compilerOptions: CompilerOptions) {
         return tryGetModuleNameFromFile(resolver.getExternalModuleFileFromDeclaration(declaration), host, compilerOptions);
     }
+
+    export interface ExternalModuleInfo {
+        externalImports: (ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration)[]; // imports of other external modules
+        externalHelpersImportDeclaration: ImportDeclaration | undefined; // import of external helpers
+        exportSpecifiers: Map<ExportSpecifier[]>; // export specifiers by name
+        exportedBindings: Map<Identifier[]>; // exported names of local declarations
+        exportedNames: Identifier[]; // all exported names local to module
+        exportEquals: ExportAssignment | undefined; // an export= declaration if one was present
+        hasExportStarsToExportValues: boolean; // whether this module contains export*
+    }
+
+    export function collectExternalModuleInfo(sourceFile: SourceFile, resolver: EmitResolver): ExternalModuleInfo {
+        const externalImports: (ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration)[] = [];
+        const exportSpecifiers = createMap<ExportSpecifier[]>();
+        const exportedBindings = createMap<Identifier[]>();
+        const uniqueExports = createMap<Identifier>();
+        let hasExportDefault = false;
+        let exportEquals: ExportAssignment = undefined;
+        let hasExportStarsToExportValues = false;
+
+        const externalHelpersModuleName = getExternalHelpersModuleName(sourceFile);
+        const externalHelpersImportDeclaration = externalHelpersModuleName && createImportDeclaration(
+            /*decorators*/ undefined,
+            /*modifiers*/ undefined,
+            createImportClause(/*name*/ undefined, createNamespaceImport(externalHelpersModuleName)),
+            createLiteral(externalHelpersModuleNameText));
+
+        if (externalHelpersImportDeclaration) {
+            externalImports.push(externalHelpersImportDeclaration);
+        }
+
+        for (const node of sourceFile.statements) {
+            switch (node.kind) {
+                case SyntaxKind.ImportDeclaration:
+                    // import "mod"
+                    // import x from "mod"
+                    // import * as x from "mod"
+                    // import { x, y } from "mod"
+                    externalImports.push(<ImportDeclaration>node);
+                    break;
+
+                case SyntaxKind.ImportEqualsDeclaration:
+                    if ((<ImportEqualsDeclaration>node).moduleReference.kind === SyntaxKind.ExternalModuleReference) {
+                        // import x = require("mod")
+                        externalImports.push(<ImportEqualsDeclaration>node);
+                    }
+
+                    break;
+
+                case SyntaxKind.ExportDeclaration:
+                    if ((<ExportDeclaration>node).moduleSpecifier) {
+                        if (!(<ExportDeclaration>node).exportClause) {
+                            // export * from "mod"
+                            externalImports.push(<ExportDeclaration>node);
+                            hasExportStarsToExportValues = true;
+                        }
+                        else {
+                            // export { x, y } from "mod"
+                            externalImports.push(<ExportDeclaration>node);
+                        }
+                    }
+                    else {
+                        // export { x, y }
+                        for (const specifier of (<ExportDeclaration>node).exportClause.elements) {
+                            if (!uniqueExports[specifier.name.text]) {
+                                const name = specifier.propertyName || specifier.name;
+                                multiMapAdd(exportSpecifiers, name.text, specifier);
+
+                                const decl = resolver.getReferencedImportDeclaration(name)
+                                    || resolver.getReferencedValueDeclaration(name);
+
+                                if (decl) {
+                                    multiMapAdd(exportedBindings, getOriginalNodeId(decl), specifier.name);
+                                }
+
+                                uniqueExports[specifier.name.text] = specifier.name;
+                            }
+                        }
+                    }
+                    break;
+
+                case SyntaxKind.ExportAssignment:
+                    if ((<ExportAssignment>node).isExportEquals && !exportEquals) {
+                        // export = x
+                        exportEquals = <ExportAssignment>node;
+                    }
+                    break;
+
+                case SyntaxKind.VariableStatement:
+                    if (hasModifier(node, ModifierFlags.Export)) {
+                        for (const decl of (<VariableStatement>node).declarationList.declarations) {
+                            collectExportedVariableInfo(decl, uniqueExports);
+                        }
+                    }
+                    break;
+
+                case SyntaxKind.FunctionDeclaration:
+                    if (hasModifier(node, ModifierFlags.Export)) {
+                        if (hasModifier(node, ModifierFlags.Default)) {
+                            // export default function() { }
+                            if (!hasExportDefault) {
+                                multiMapAdd(exportedBindings, getOriginalNodeId(node), getDeclarationName(<FunctionDeclaration>node));
+                                hasExportDefault = true;
+                            }
+                        }
+                        else {
+                            // export function x() { }
+                            const name = (<FunctionDeclaration>node).name;
+                            if (!uniqueExports[name.text]) {
+                                multiMapAdd(exportedBindings, getOriginalNodeId(node), name);
+                                uniqueExports[name.text] = name;
+                            }
+                        }
+                    }
+                    break;
+
+                case SyntaxKind.ClassDeclaration:
+                    if (hasModifier(node, ModifierFlags.Export)) {
+                        if (hasModifier(node, ModifierFlags.Default)) {
+                            // export default class { }
+                            if (!hasExportDefault) {
+                                multiMapAdd(exportedBindings, getOriginalNodeId(node), getDeclarationName(<ClassDeclaration>node));
+                                hasExportDefault = true;
+                            }
+                        }
+                        else {
+                            // export class x { }
+                            const name = (<ClassDeclaration>node).name;
+                            if (!uniqueExports[name.text]) {
+                                multiMapAdd(exportedBindings, getOriginalNodeId(node), name);
+                                uniqueExports[name.text] = name;
+                            }
+                        }
+                    }
+                    break;
+            }
+        }
+
+        let exportedNames: Identifier[];
+        for (const key in uniqueExports) {
+            exportedNames = ts.append(exportedNames, uniqueExports[key]);
+        }
+
+        return { externalImports, exportSpecifiers, exportEquals, hasExportStarsToExportValues, exportedBindings, exportedNames, externalHelpersImportDeclaration };
+    }
+
+    function collectExportedVariableInfo(decl: VariableDeclaration | BindingElement, uniqueExports: Map<Identifier>) {
+        if (isBindingPattern(decl.name)) {
+            for (const element of decl.name.elements) {
+                if (!isOmittedExpression(element)) {
+                    collectExportedVariableInfo(element, uniqueExports);
+                }
+            }
+        }
+        else if (!isGeneratedIdentifier(decl.name)) {
+            if (!uniqueExports[decl.name.text]) {
+                uniqueExports[decl.name.text] = decl.name;
+            }
+        }
+    }
 }
diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts
index 25c15305c4a..60d1ad95682 100644
--- a/src/compiler/transformers/es2015.ts
+++ b/src/compiler/transformers/es2015.ts
@@ -3,7 +3,6 @@
 
 /*@internal*/
 namespace ts {
-
     const enum ES2015SubstitutionFlags {
         /** Enables substitutions for captured `this` */
         CapturedThis = 1 << 0,
@@ -170,6 +169,7 @@ namespace ts {
             hoistVariableDeclaration,
         } = context;
 
+        const compilerOptions = context.getCompilerOptions();
         const resolver = context.getEmitResolver();
         const previousOnSubstituteNode = context.onSubstituteNode;
         const previousOnEmitNode = context.onEmitNode;
@@ -187,6 +187,7 @@ namespace ts {
         let enclosingNonArrowFunction: FunctionLikeDeclaration;
         let enclosingNonAsyncFunctionBody: FunctionLikeDeclaration | ClassElement;
         let isInConstructorWithCapturedSuper: boolean;
+        let helperState: EmitHelperState;
 
         /**
          * Used to track if we are emitting body of the converted loop
@@ -209,7 +210,15 @@ namespace ts {
 
             currentSourceFile = node;
             currentText = node.text;
-            return visitNode(node, visitor, isSourceFile);
+            helperState = { currentSourceFile, compilerOptions };
+
+            const visited = visitNode(node, visitor, isSourceFile);
+            addEmitHelpers(visited, helperState.requestedHelpers);
+
+            currentSourceFile = undefined;
+            currentText = undefined;
+            helperState = undefined;
+            return visited;
         }
 
         function visitor(node: Node): VisitResult<Node> {
@@ -778,7 +787,7 @@ namespace ts {
             if (extendsClauseElement) {
                 statements.push(
                     createStatement(
-                        createExtendsHelper(currentSourceFile.externalHelpersModuleName, getLocalName(node)),
+                        createExtendsHelper(helperState, getLocalName(node)),
                         /*location*/ extendsClauseElement
                     )
                 );
@@ -3274,4 +3283,28 @@ namespace ts {
             return isIdentifier(expression) && expression === parameter.name;
         }
     }
+
+    function createExtendsHelper(helperState: EmitHelperState, name: Identifier) {
+        requestEmitHelper(helperState, extendsHelper);
+        return createCall(
+            getHelperName(helperState, "__extends"),
+            /*typeArguments*/ undefined,
+            [
+                name,
+                createIdentifier("_super")
+            ]
+        );
+    }
+
+    const extendsHelper: EmitHelper = {
+        name: "typescript:extends",
+        scoped: false,
+        priority: 0,
+        text: `
+            var __extends = (this && this.__extends) || function (d, b) {
+                for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+                function __() { this.constructor = d; }
+                d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+            };`
+    };
 }
diff --git a/src/compiler/transformers/es2017.ts b/src/compiler/transformers/es2017.ts
index 7800a41e147..14d97ade2ac 100644
--- a/src/compiler/transformers/es2017.ts
+++ b/src/compiler/transformers/es2017.ts
@@ -5,13 +5,12 @@
 namespace ts {
     type SuperContainer = ClassDeclaration | MethodDeclaration | GetAccessorDeclaration | SetAccessorDeclaration | ConstructorDeclaration;
 
+    const enum ES2017SubstitutionFlags {
+        /** Enables substitutions for async methods with `super` calls. */
+        AsyncMethodsWithSuper = 1 << 0
+    }
+
     export function transformES2017(context: TransformationContext) {
-
-        const enum ES2017SubstitutionFlags {
-            /** Enables substitutions for async methods with `super` calls. */
-            AsyncMethodsWithSuper = 1 << 0
-        }
-
         const {
             startLexicalEnvironment,
             endLexicalEnvironment,
@@ -22,7 +21,9 @@ namespace ts {
         const languageVersion = getEmitScriptTarget(compilerOptions);
 
         // These variables contain state that changes as we descend into the tree.
-        let currentSourceFileExternalHelpersModuleName: Identifier;
+        let currentSourceFile: SourceFile;
+        let helperState: EmitHelperState;
+
         /**
          * 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.
@@ -58,9 +59,16 @@ namespace ts {
                 return node;
             }
 
-            currentSourceFileExternalHelpersModuleName = node.externalHelpersModuleName;
+            currentSourceFile = node;
+            helperState = { currentSourceFile, compilerOptions };
 
-            return visitEachChild(node, visitor, context);
+            const visited = visitEachChild(node, visitor, context);
+
+            addEmitHelpers(visited, helperState.requestedHelpers);
+
+            currentSourceFile = undefined;
+            helperState = undefined;
+            return visited;
         }
 
         function visitor(node: Node): VisitResult<Node> {
@@ -107,11 +115,11 @@ namespace ts {
         }
 
         /**
-         * Visits an await expression.
+         * Visits an AwaitExpression node.
          *
          * This function will be called any time a ES2017 await expression is encountered.
          *
-         * @param node The await expression node.
+         * @param node The node to visit.
          */
         function visitAwaitExpression(node: AwaitExpression): Expression {
             return setOriginalNode(
@@ -125,17 +133,15 @@ namespace ts {
         }
 
         /**
-         * Visits a method declaration of a class.
+         * Visits a MethodDeclaration node.
          *
          * This function will be called when one of the following conditions are met:
          * - The node is marked as async
          *
-         * @param node The method node.
+         * @param node The node to visit.
          */
         function visitMethodDeclaration(node: MethodDeclaration) {
-            if (!isAsyncFunctionLike(node)) {
-                return node;
-            }
+            Debug.assert(hasModifier(node, ModifierFlags.Async));
             const method = createMethod(
                 /*decorators*/ undefined,
                 visitNodes(node.modifiers, visitor, isModifier),
@@ -150,25 +156,20 @@ namespace ts {
 
             // While we emit the source map for the node after skipping decorators and modifiers,
             // we need to emit the comments for the original range.
-            setCommentRange(method, node);
-            setSourceMapRange(method, moveRangePastDecorators(node));
             setOriginalNode(method, node);
-
             return method;
         }
 
         /**
-         * Visits a function declaration.
+         * Visits a FunctionDeclaration node.
          *
          * This function will be called when one of the following conditions are met:
          * - The node is marked async
          *
-         * @param node The function node.
+         * @param node The node to visit.
          */
         function visitFunctionDeclaration(node: FunctionDeclaration): VisitResult<Statement> {
-            if (!isAsyncFunctionLike(node)) {
-                return node;
-            }
+            Debug.assert(hasModifier(node, ModifierFlags.Async));
             const func = createFunctionDeclaration(
                 /*decorators*/ undefined,
                 visitNodes(node.modifiers, visitor, isModifier),
@@ -180,23 +181,21 @@ namespace ts {
                 transformFunctionBody(node),
                 /*location*/ node
             );
-            setOriginalNode(func, node);
 
+            setOriginalNode(func, node);
             return func;
         }
 
         /**
-         * Visits a function expression node.
+         * Visits a FunctionExpression node.
          *
          * This function will be called when one of the following conditions are met:
          * - The node is marked async
          *
-         * @param node The function expression node.
+         * @param node The node to visit.
          */
         function visitFunctionExpression(node: FunctionExpression): Expression {
-            if (!isAsyncFunctionLike(node)) {
-                return node;
-            }
+            Debug.assert(hasModifier(node, ModifierFlags.Async));
             if (nodeIsMissing(node.body)) {
                 return createOmittedExpression();
             }
@@ -213,19 +212,19 @@ namespace ts {
             );
 
             setOriginalNode(func, node);
-
             return func;
         }
 
         /**
-         * @remarks
+         * Visits an ArrowFunction.
+         *
          * This function will be called when one of the following conditions are met:
          * - The node is marked async
+         *
+         * @param node The node to visit.
          */
         function visitArrowFunction(node: ArrowFunction) {
-            if (!isAsyncFunctionLike(node)) {
-                return node;
-            }
+            Debug.assert(hasModifier(node, ModifierFlags.Async));
             const func = createArrowFunction(
                 visitNodes(node.modifiers, visitor, isModifier),
                 /*typeParameters*/ undefined,
@@ -237,7 +236,6 @@ namespace ts {
             );
 
             setOriginalNode(func, node);
-
             return func;
         }
 
@@ -280,7 +278,7 @@ namespace ts {
                 statements.push(
                     createReturn(
                         createAwaiterHelper(
-                            currentSourceFileExternalHelpersModuleName,
+                            helperState,
                             hasLexicalArguments,
                             promiseConstructor,
                             transformFunctionBodyWorker(<Block>node.body, statementOffset)
@@ -295,11 +293,11 @@ namespace ts {
                 if (languageVersion >= ScriptTarget.ES2015) {
                     if (resolver.getNodeCheckFlags(node) & NodeCheckFlags.AsyncMethodWithSuperBinding) {
                         enableSubstitutionForAsyncMethodsWithSuper();
-                        setEmitFlags(block, EmitFlags.EmitAdvancedSuperHelper);
+                        addEmitHelper(block, advancedAsyncSuperHelper);
                     }
                     else if (resolver.getNodeCheckFlags(node) & NodeCheckFlags.AsyncMethodWithSuper) {
                         enableSubstitutionForAsyncMethodsWithSuper();
-                        setEmitFlags(block, EmitFlags.EmitSuperHelper);
+                        addEmitHelper(block, asyncSuperHelper);
                     }
                 }
 
@@ -307,7 +305,7 @@ namespace ts {
             }
             else {
                 return createAwaiterHelper(
-                    currentSourceFileExternalHelpersModuleName,
+                    helperState,
                     hasLexicalArguments,
                     promiseConstructor,
                     <Block>transformConciseBodyWorker(node.body, /*forceBlockFunctionBody*/ true)
@@ -507,4 +505,63 @@ namespace ts {
                 && resolver.getNodeCheckFlags(currentSuperContainer) & (NodeCheckFlags.AsyncMethodWithSuper | NodeCheckFlags.AsyncMethodWithSuperBinding);
         }
     }
+
+    function createAwaiterHelper(helperState: EmitHelperState, hasLexicalArguments: boolean, promiseConstructor: EntityName | Expression, body: Block) {
+        const generatorFunc = createFunctionExpression(
+            /*modifiers*/ undefined,
+            createToken(SyntaxKind.AsteriskToken),
+            /*name*/ undefined,
+            /*typeParameters*/ undefined,
+            /*parameters*/ [],
+            /*type*/ undefined,
+            body
+        );
+
+        // Mark this node as originally an async function
+        (generatorFunc.emitNode || (generatorFunc.emitNode = {})).flags |= EmitFlags.AsyncFunctionBody;
+
+        requestEmitHelper(helperState, awaiterHelper);
+        return createCall(
+            getHelperName(helperState, "__awaiter"),
+            /*typeArguments*/ undefined,
+            [
+                createThis(),
+                hasLexicalArguments ? createIdentifier("arguments") : createVoidZero(),
+                promiseConstructor ? createExpressionFromEntityName(promiseConstructor) : createVoidZero(),
+                generatorFunc
+            ]
+        );
+    }
+
+    const awaiterHelper: EmitHelper = {
+        name: "typescript:awaiter",
+        scoped: false,
+        priority: 5,
+        text: `
+            var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+                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); }
+                    step((generator = generator.apply(thisArg, _arguments)).next());
+                });
+            };`
+    };
+
+    const asyncSuperHelper: EmitHelper = {
+        name: "typescript:async-super",
+        scoped: true,
+        text: `
+            const _super = name => super[name];`
+    };
+
+    const advancedAsyncSuperHelper: EmitHelper = {
+        name: "typescript:advanced-async-super",
+        scoped: true,
+        text: `
+            const _super = (function (geti, seti) {
+                const cache = Object.create(null);
+                return name => cache[name] || (cache[name] = { get value() { return geti(name); }, set value(v) { seti(name, v); } });
+            })(name => super[name], (name, value) => super[name] = value);`
+    };
 }
diff --git a/src/compiler/transformers/generators.ts b/src/compiler/transformers/generators.ts
index 7c9cde59fde..78c9e42c1bf 100644
--- a/src/compiler/transformers/generators.ts
+++ b/src/compiler/transformers/generators.ts
@@ -242,6 +242,7 @@ namespace ts {
         let currentSourceFile: SourceFile;
         let renamedCatchVariables: Map<boolean>;
         let renamedCatchVariableDeclarations: Map<Identifier>;
+        let helperState: EmitHelperState;
 
         let inGeneratorFunctionBody: boolean;
         let inStatementContainingYield: boolean;
@@ -291,17 +292,20 @@ namespace ts {
         return transformSourceFile;
 
         function transformSourceFile(node: SourceFile) {
-            if (isDeclarationFile(node)) {
+            if (isDeclarationFile(node)
+                || (node.transformFlags & TransformFlags.ContainsGenerator) === 0) {
                 return node;
             }
 
-            if (node.transformFlags & TransformFlags.ContainsGenerator) {
-                currentSourceFile = node;
-                node = visitEachChild(node, visitor, context);
-                currentSourceFile = undefined;
-            }
+            currentSourceFile = node;
+            helperState = { currentSourceFile, compilerOptions };
 
-            return node;
+            const visited = visitEachChild(node, visitor, context);
+            addEmitHelpers(visited, helperState.requestedHelpers);
+
+            currentSourceFile = undefined;
+            helperState = undefined;
+            return visited;
         }
 
         /**
@@ -2585,28 +2589,24 @@ namespace ts {
             withBlockStack = undefined;
 
             const buildResult = buildStatements();
-            return createCall(
-                createHelperName(currentSourceFile.externalHelpersModuleName, "__generator"),
-                /*typeArguments*/ undefined,
-                [
-                    createThis(),
-                    setEmitFlags(
-                        createFunctionExpression(
-                            /*modifiers*/ undefined,
-                            /*asteriskToken*/ undefined,
-                            /*name*/ undefined,
-                            /*typeParameters*/ undefined,
-                            [createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, state)],
-                            /*type*/ undefined,
-                            createBlock(
-                                buildResult,
-                                /*location*/ undefined,
-                                /*multiLine*/ buildResult.length > 0
-                            )
-                        ),
-                        EmitFlags.ReuseTempVariableScope
-                    )
-                ]
+            return createGeneratorHelper(
+                helperState,
+                setEmitFlags(
+                    createFunctionExpression(
+                        /*modifiers*/ undefined,
+                        /*asteriskToken*/ undefined,
+                        /*name*/ undefined,
+                        /*typeParameters*/ undefined,
+                        [createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, state)],
+                        /*type*/ undefined,
+                        createBlock(
+                            buildResult,
+                            /*location*/ undefined,
+                            /*multiLine*/ buildResult.length > 0
+                        )
+                    ),
+                    EmitFlags.ReuseTempVariableScope
+                )
             );
         }
 
@@ -3082,4 +3082,105 @@ namespace ts {
             );
         }
     }
+
+    function createGeneratorHelper(helperState: EmitHelperState, body: FunctionExpression) {
+        requestEmitHelper(helperState, generatorHelper);
+        return createCall(
+            getHelperName(helperState, "__generator"),
+            /*typeArguments*/ undefined,
+            [createThis(), body]);
+    }
+
+    // The __generator helper is used by down-level transformations to emulate the runtime
+    // semantics of an ES2015 generator function. When called, this helper returns an
+    // object that implements the Iterator protocol, in that it has `next`, `return`, and
+    // `throw` methods that step through the generator when invoked.
+    //
+    // parameters:
+    //  thisArg  The value to use as the `this` binding for the transformed generator body.
+    //  body     A function that acts as the transformed generator body.
+    //
+    // variables:
+    //  _       Persistent state for the generator that is shared between the helper and the
+    //          generator body. The state object has the following members:
+    //            sent() - A method that returns or throws the current completion value.
+    //            label  - The next point at which to resume evaluation of the generator body.
+    //            trys   - A stack of protected regions (try/catch/finally blocks).
+    //            ops    - A stack of pending instructions when inside of a finally block.
+    //  f       A value indicating whether the generator is executing.
+    //  y       An iterator to delegate for a yield*.
+    //  t       A temporary variable that holds one of the following values (note that these
+    //          cases do not overlap):
+    //          - The completion value when resuming from a `yield` or `yield*`.
+    //          - The error value for a catch block.
+    //          - The current protected region (array of try/catch/finally/end labels).
+    //          - The verb (`next`, `throw`, or `return` method) to delegate to the expression
+    //            of a `yield*`.
+    //          - The result of evaluating the verb delegated to the expression of a `yield*`.
+    //
+    // functions:
+    //  verb(n)     Creates a bound callback to the `step` function for opcode `n`.
+    //  step(op)    Evaluates opcodes in a generator body until execution is suspended or
+    //              completed.
+    //
+    // The __generator helper understands a limited set of instructions:
+    //  0: next(value?)     - Start or resume the generator with the specified value.
+    //  1: throw(error)     - Resume the generator with an exception. If the generator is
+    //                        suspended inside of one or more protected regions, evaluates
+    //                        any intervening finally blocks between the current label and
+    //                        the nearest catch block or function boundary. If uncaught, the
+    //                        exception is thrown to the caller.
+    //  2: return(value?)   - Resume the generator as if with a return. If the generator is
+    //                        suspended inside of one or more protected regions, evaluates any
+    //                        intervening finally blocks.
+    //  3: break(label)     - Jump to the specified label. If the label is outside of the
+    //                        current protected region, evaluates any intervening finally
+    //                        blocks.
+    //  4: yield(value?)    - Yield execution to the caller with an optional value. When
+    //                        resumed, the generator will continue at the next label.
+    //  5: yield*(value)    - Delegates evaluation to the supplied iterator. When
+    //                        delegation completes, the generator will continue at the next
+    //                        label.
+    //  6: catch(error)     - Handles an exception thrown from within the generator body. If
+    //                        the current label is inside of one or more protected regions,
+    //                        evaluates any intervening finally blocks between the current
+    //                        label and the nearest catch block or function boundary. If
+    //                        uncaught, the exception is thrown to the caller.
+    //  7: endfinally       - Ends a finally block, resuming the last instruction prior to
+    //                        entering a finally block.
+    //
+    // For examples of how these are used, see the comments in ./transformers/generators.ts
+    const generatorHelper: EmitHelper = {
+        name: "typescript:generator",
+        scoped: false,
+        priority: 6,
+        text: `
+            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;
+                return { next: verb(0), "throw": verb(1), "return": verb(2) };
+                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 = y[op[0] & 2 ? "return" : op[0] ? "throw" : "next"]) && !(t = t.call(y, op[1])).done) return t;
+                        if (y = 0, t) op = [0, 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 };
+                }
+            };`
+    };
 }
diff --git a/src/compiler/transformers/jsx.ts b/src/compiler/transformers/jsx.ts
index 95a4016bb0a..8867896e51e 100644
--- a/src/compiler/transformers/jsx.ts
+++ b/src/compiler/transformers/jsx.ts
@@ -3,11 +3,11 @@
 
 /*@internal*/
 namespace ts {
-    const entities: Map<number> = createEntitiesMap();
-
     export function transformJsx(context: TransformationContext) {
         const compilerOptions = context.getCompilerOptions();
         let currentSourceFile: SourceFile;
+        let helperState: EmitHelperState;
+
         return transformSourceFile;
 
         /**
@@ -21,9 +21,14 @@ namespace ts {
             }
 
             currentSourceFile = node;
-            node = visitEachChild(node, visitor, context);
+            helperState = { currentSourceFile, compilerOptions };
+
+            const visited = visitEachChild(node, visitor, context);
+            addEmitHelpers(visited, helperState.requestedHelpers);
+
             currentSourceFile = undefined;
-            return node;
+            helperState = undefined;
+            return visited;
         }
 
         function visitor(node: Node): VisitResult<Node> {
@@ -109,8 +114,10 @@ namespace ts {
 
                 // Either emit one big object literal (no spread attribs), or
                 // a call to the __assign helper.
-                objectProperties = singleOrUndefined(segments)
-                    || createAssignHelper(currentSourceFile.externalHelpersModuleName, segments);
+                objectProperties = singleOrUndefined(segments);
+                if (!objectProperties) {
+                    objectProperties = createAssignHelper(helperState, segments);
+                }
             }
 
             const element = createReactCreateElement(
@@ -275,261 +282,283 @@ namespace ts {
         }
     }
 
-    function createEntitiesMap(): Map<number> {
-        return createMap<number>({
-            "quot": 0x0022,
-            "amp": 0x0026,
-            "apos": 0x0027,
-            "lt": 0x003C,
-            "gt": 0x003E,
-            "nbsp": 0x00A0,
-            "iexcl": 0x00A1,
-            "cent": 0x00A2,
-            "pound": 0x00A3,
-            "curren": 0x00A4,
-            "yen": 0x00A5,
-            "brvbar": 0x00A6,
-            "sect": 0x00A7,
-            "uml": 0x00A8,
-            "copy": 0x00A9,
-            "ordf": 0x00AA,
-            "laquo": 0x00AB,
-            "not": 0x00AC,
-            "shy": 0x00AD,
-            "reg": 0x00AE,
-            "macr": 0x00AF,
-            "deg": 0x00B0,
-            "plusmn": 0x00B1,
-            "sup2": 0x00B2,
-            "sup3": 0x00B3,
-            "acute": 0x00B4,
-            "micro": 0x00B5,
-            "para": 0x00B6,
-            "middot": 0x00B7,
-            "cedil": 0x00B8,
-            "sup1": 0x00B9,
-            "ordm": 0x00BA,
-            "raquo": 0x00BB,
-            "frac14": 0x00BC,
-            "frac12": 0x00BD,
-            "frac34": 0x00BE,
-            "iquest": 0x00BF,
-            "Agrave": 0x00C0,
-            "Aacute": 0x00C1,
-            "Acirc": 0x00C2,
-            "Atilde": 0x00C3,
-            "Auml": 0x00C4,
-            "Aring": 0x00C5,
-            "AElig": 0x00C6,
-            "Ccedil": 0x00C7,
-            "Egrave": 0x00C8,
-            "Eacute": 0x00C9,
-            "Ecirc": 0x00CA,
-            "Euml": 0x00CB,
-            "Igrave": 0x00CC,
-            "Iacute": 0x00CD,
-            "Icirc": 0x00CE,
-            "Iuml": 0x00CF,
-            "ETH": 0x00D0,
-            "Ntilde": 0x00D1,
-            "Ograve": 0x00D2,
-            "Oacute": 0x00D3,
-            "Ocirc": 0x00D4,
-            "Otilde": 0x00D5,
-            "Ouml": 0x00D6,
-            "times": 0x00D7,
-            "Oslash": 0x00D8,
-            "Ugrave": 0x00D9,
-            "Uacute": 0x00DA,
-            "Ucirc": 0x00DB,
-            "Uuml": 0x00DC,
-            "Yacute": 0x00DD,
-            "THORN": 0x00DE,
-            "szlig": 0x00DF,
-            "agrave": 0x00E0,
-            "aacute": 0x00E1,
-            "acirc": 0x00E2,
-            "atilde": 0x00E3,
-            "auml": 0x00E4,
-            "aring": 0x00E5,
-            "aelig": 0x00E6,
-            "ccedil": 0x00E7,
-            "egrave": 0x00E8,
-            "eacute": 0x00E9,
-            "ecirc": 0x00EA,
-            "euml": 0x00EB,
-            "igrave": 0x00EC,
-            "iacute": 0x00ED,
-            "icirc": 0x00EE,
-            "iuml": 0x00EF,
-            "eth": 0x00F0,
-            "ntilde": 0x00F1,
-            "ograve": 0x00F2,
-            "oacute": 0x00F3,
-            "ocirc": 0x00F4,
-            "otilde": 0x00F5,
-            "ouml": 0x00F6,
-            "divide": 0x00F7,
-            "oslash": 0x00F8,
-            "ugrave": 0x00F9,
-            "uacute": 0x00FA,
-            "ucirc": 0x00FB,
-            "uuml": 0x00FC,
-            "yacute": 0x00FD,
-            "thorn": 0x00FE,
-            "yuml": 0x00FF,
-            "OElig": 0x0152,
-            "oelig": 0x0153,
-            "Scaron": 0x0160,
-            "scaron": 0x0161,
-            "Yuml": 0x0178,
-            "fnof": 0x0192,
-            "circ": 0x02C6,
-            "tilde": 0x02DC,
-            "Alpha": 0x0391,
-            "Beta": 0x0392,
-            "Gamma": 0x0393,
-            "Delta": 0x0394,
-            "Epsilon": 0x0395,
-            "Zeta": 0x0396,
-            "Eta": 0x0397,
-            "Theta": 0x0398,
-            "Iota": 0x0399,
-            "Kappa": 0x039A,
-            "Lambda": 0x039B,
-            "Mu": 0x039C,
-            "Nu": 0x039D,
-            "Xi": 0x039E,
-            "Omicron": 0x039F,
-            "Pi": 0x03A0,
-            "Rho": 0x03A1,
-            "Sigma": 0x03A3,
-            "Tau": 0x03A4,
-            "Upsilon": 0x03A5,
-            "Phi": 0x03A6,
-            "Chi": 0x03A7,
-            "Psi": 0x03A8,
-            "Omega": 0x03A9,
-            "alpha": 0x03B1,
-            "beta": 0x03B2,
-            "gamma": 0x03B3,
-            "delta": 0x03B4,
-            "epsilon": 0x03B5,
-            "zeta": 0x03B6,
-            "eta": 0x03B7,
-            "theta": 0x03B8,
-            "iota": 0x03B9,
-            "kappa": 0x03BA,
-            "lambda": 0x03BB,
-            "mu": 0x03BC,
-            "nu": 0x03BD,
-            "xi": 0x03BE,
-            "omicron": 0x03BF,
-            "pi": 0x03C0,
-            "rho": 0x03C1,
-            "sigmaf": 0x03C2,
-            "sigma": 0x03C3,
-            "tau": 0x03C4,
-            "upsilon": 0x03C5,
-            "phi": 0x03C6,
-            "chi": 0x03C7,
-            "psi": 0x03C8,
-            "omega": 0x03C9,
-            "thetasym": 0x03D1,
-            "upsih": 0x03D2,
-            "piv": 0x03D6,
-            "ensp": 0x2002,
-            "emsp": 0x2003,
-            "thinsp": 0x2009,
-            "zwnj": 0x200C,
-            "zwj": 0x200D,
-            "lrm": 0x200E,
-            "rlm": 0x200F,
-            "ndash": 0x2013,
-            "mdash": 0x2014,
-            "lsquo": 0x2018,
-            "rsquo": 0x2019,
-            "sbquo": 0x201A,
-            "ldquo": 0x201C,
-            "rdquo": 0x201D,
-            "bdquo": 0x201E,
-            "dagger": 0x2020,
-            "Dagger": 0x2021,
-            "bull": 0x2022,
-            "hellip": 0x2026,
-            "permil": 0x2030,
-            "prime": 0x2032,
-            "Prime": 0x2033,
-            "lsaquo": 0x2039,
-            "rsaquo": 0x203A,
-            "oline": 0x203E,
-            "frasl": 0x2044,
-            "euro": 0x20AC,
-            "image": 0x2111,
-            "weierp": 0x2118,
-            "real": 0x211C,
-            "trade": 0x2122,
-            "alefsym": 0x2135,
-            "larr": 0x2190,
-            "uarr": 0x2191,
-            "rarr": 0x2192,
-            "darr": 0x2193,
-            "harr": 0x2194,
-            "crarr": 0x21B5,
-            "lArr": 0x21D0,
-            "uArr": 0x21D1,
-            "rArr": 0x21D2,
-            "dArr": 0x21D3,
-            "hArr": 0x21D4,
-            "forall": 0x2200,
-            "part": 0x2202,
-            "exist": 0x2203,
-            "empty": 0x2205,
-            "nabla": 0x2207,
-            "isin": 0x2208,
-            "notin": 0x2209,
-            "ni": 0x220B,
-            "prod": 0x220F,
-            "sum": 0x2211,
-            "minus": 0x2212,
-            "lowast": 0x2217,
-            "radic": 0x221A,
-            "prop": 0x221D,
-            "infin": 0x221E,
-            "ang": 0x2220,
-            "and": 0x2227,
-            "or": 0x2228,
-            "cap": 0x2229,
-            "cup": 0x222A,
-            "int": 0x222B,
-            "there4": 0x2234,
-            "sim": 0x223C,
-            "cong": 0x2245,
-            "asymp": 0x2248,
-            "ne": 0x2260,
-            "equiv": 0x2261,
-            "le": 0x2264,
-            "ge": 0x2265,
-            "sub": 0x2282,
-            "sup": 0x2283,
-            "nsub": 0x2284,
-            "sube": 0x2286,
-            "supe": 0x2287,
-            "oplus": 0x2295,
-            "otimes": 0x2297,
-            "perp": 0x22A5,
-            "sdot": 0x22C5,
-            "lceil": 0x2308,
-            "rceil": 0x2309,
-            "lfloor": 0x230A,
-            "rfloor": 0x230B,
-            "lang": 0x2329,
-            "rang": 0x232A,
-            "loz": 0x25CA,
-            "spades": 0x2660,
-            "clubs": 0x2663,
-            "hearts": 0x2665,
-            "diams": 0x2666
-        });
+    const entities = createMap<number>({
+        "quot": 0x0022,
+        "amp": 0x0026,
+        "apos": 0x0027,
+        "lt": 0x003C,
+        "gt": 0x003E,
+        "nbsp": 0x00A0,
+        "iexcl": 0x00A1,
+        "cent": 0x00A2,
+        "pound": 0x00A3,
+        "curren": 0x00A4,
+        "yen": 0x00A5,
+        "brvbar": 0x00A6,
+        "sect": 0x00A7,
+        "uml": 0x00A8,
+        "copy": 0x00A9,
+        "ordf": 0x00AA,
+        "laquo": 0x00AB,
+        "not": 0x00AC,
+        "shy": 0x00AD,
+        "reg": 0x00AE,
+        "macr": 0x00AF,
+        "deg": 0x00B0,
+        "plusmn": 0x00B1,
+        "sup2": 0x00B2,
+        "sup3": 0x00B3,
+        "acute": 0x00B4,
+        "micro": 0x00B5,
+        "para": 0x00B6,
+        "middot": 0x00B7,
+        "cedil": 0x00B8,
+        "sup1": 0x00B9,
+        "ordm": 0x00BA,
+        "raquo": 0x00BB,
+        "frac14": 0x00BC,
+        "frac12": 0x00BD,
+        "frac34": 0x00BE,
+        "iquest": 0x00BF,
+        "Agrave": 0x00C0,
+        "Aacute": 0x00C1,
+        "Acirc": 0x00C2,
+        "Atilde": 0x00C3,
+        "Auml": 0x00C4,
+        "Aring": 0x00C5,
+        "AElig": 0x00C6,
+        "Ccedil": 0x00C7,
+        "Egrave": 0x00C8,
+        "Eacute": 0x00C9,
+        "Ecirc": 0x00CA,
+        "Euml": 0x00CB,
+        "Igrave": 0x00CC,
+        "Iacute": 0x00CD,
+        "Icirc": 0x00CE,
+        "Iuml": 0x00CF,
+        "ETH": 0x00D0,
+        "Ntilde": 0x00D1,
+        "Ograve": 0x00D2,
+        "Oacute": 0x00D3,
+        "Ocirc": 0x00D4,
+        "Otilde": 0x00D5,
+        "Ouml": 0x00D6,
+        "times": 0x00D7,
+        "Oslash": 0x00D8,
+        "Ugrave": 0x00D9,
+        "Uacute": 0x00DA,
+        "Ucirc": 0x00DB,
+        "Uuml": 0x00DC,
+        "Yacute": 0x00DD,
+        "THORN": 0x00DE,
+        "szlig": 0x00DF,
+        "agrave": 0x00E0,
+        "aacute": 0x00E1,
+        "acirc": 0x00E2,
+        "atilde": 0x00E3,
+        "auml": 0x00E4,
+        "aring": 0x00E5,
+        "aelig": 0x00E6,
+        "ccedil": 0x00E7,
+        "egrave": 0x00E8,
+        "eacute": 0x00E9,
+        "ecirc": 0x00EA,
+        "euml": 0x00EB,
+        "igrave": 0x00EC,
+        "iacute": 0x00ED,
+        "icirc": 0x00EE,
+        "iuml": 0x00EF,
+        "eth": 0x00F0,
+        "ntilde": 0x00F1,
+        "ograve": 0x00F2,
+        "oacute": 0x00F3,
+        "ocirc": 0x00F4,
+        "otilde": 0x00F5,
+        "ouml": 0x00F6,
+        "divide": 0x00F7,
+        "oslash": 0x00F8,
+        "ugrave": 0x00F9,
+        "uacute": 0x00FA,
+        "ucirc": 0x00FB,
+        "uuml": 0x00FC,
+        "yacute": 0x00FD,
+        "thorn": 0x00FE,
+        "yuml": 0x00FF,
+        "OElig": 0x0152,
+        "oelig": 0x0153,
+        "Scaron": 0x0160,
+        "scaron": 0x0161,
+        "Yuml": 0x0178,
+        "fnof": 0x0192,
+        "circ": 0x02C6,
+        "tilde": 0x02DC,
+        "Alpha": 0x0391,
+        "Beta": 0x0392,
+        "Gamma": 0x0393,
+        "Delta": 0x0394,
+        "Epsilon": 0x0395,
+        "Zeta": 0x0396,
+        "Eta": 0x0397,
+        "Theta": 0x0398,
+        "Iota": 0x0399,
+        "Kappa": 0x039A,
+        "Lambda": 0x039B,
+        "Mu": 0x039C,
+        "Nu": 0x039D,
+        "Xi": 0x039E,
+        "Omicron": 0x039F,
+        "Pi": 0x03A0,
+        "Rho": 0x03A1,
+        "Sigma": 0x03A3,
+        "Tau": 0x03A4,
+        "Upsilon": 0x03A5,
+        "Phi": 0x03A6,
+        "Chi": 0x03A7,
+        "Psi": 0x03A8,
+        "Omega": 0x03A9,
+        "alpha": 0x03B1,
+        "beta": 0x03B2,
+        "gamma": 0x03B3,
+        "delta": 0x03B4,
+        "epsilon": 0x03B5,
+        "zeta": 0x03B6,
+        "eta": 0x03B7,
+        "theta": 0x03B8,
+        "iota": 0x03B9,
+        "kappa": 0x03BA,
+        "lambda": 0x03BB,
+        "mu": 0x03BC,
+        "nu": 0x03BD,
+        "xi": 0x03BE,
+        "omicron": 0x03BF,
+        "pi": 0x03C0,
+        "rho": 0x03C1,
+        "sigmaf": 0x03C2,
+        "sigma": 0x03C3,
+        "tau": 0x03C4,
+        "upsilon": 0x03C5,
+        "phi": 0x03C6,
+        "chi": 0x03C7,
+        "psi": 0x03C8,
+        "omega": 0x03C9,
+        "thetasym": 0x03D1,
+        "upsih": 0x03D2,
+        "piv": 0x03D6,
+        "ensp": 0x2002,
+        "emsp": 0x2003,
+        "thinsp": 0x2009,
+        "zwnj": 0x200C,
+        "zwj": 0x200D,
+        "lrm": 0x200E,
+        "rlm": 0x200F,
+        "ndash": 0x2013,
+        "mdash": 0x2014,
+        "lsquo": 0x2018,
+        "rsquo": 0x2019,
+        "sbquo": 0x201A,
+        "ldquo": 0x201C,
+        "rdquo": 0x201D,
+        "bdquo": 0x201E,
+        "dagger": 0x2020,
+        "Dagger": 0x2021,
+        "bull": 0x2022,
+        "hellip": 0x2026,
+        "permil": 0x2030,
+        "prime": 0x2032,
+        "Prime": 0x2033,
+        "lsaquo": 0x2039,
+        "rsaquo": 0x203A,
+        "oline": 0x203E,
+        "frasl": 0x2044,
+        "euro": 0x20AC,
+        "image": 0x2111,
+        "weierp": 0x2118,
+        "real": 0x211C,
+        "trade": 0x2122,
+        "alefsym": 0x2135,
+        "larr": 0x2190,
+        "uarr": 0x2191,
+        "rarr": 0x2192,
+        "darr": 0x2193,
+        "harr": 0x2194,
+        "crarr": 0x21B5,
+        "lArr": 0x21D0,
+        "uArr": 0x21D1,
+        "rArr": 0x21D2,
+        "dArr": 0x21D3,
+        "hArr": 0x21D4,
+        "forall": 0x2200,
+        "part": 0x2202,
+        "exist": 0x2203,
+        "empty": 0x2205,
+        "nabla": 0x2207,
+        "isin": 0x2208,
+        "notin": 0x2209,
+        "ni": 0x220B,
+        "prod": 0x220F,
+        "sum": 0x2211,
+        "minus": 0x2212,
+        "lowast": 0x2217,
+        "radic": 0x221A,
+        "prop": 0x221D,
+        "infin": 0x221E,
+        "ang": 0x2220,
+        "and": 0x2227,
+        "or": 0x2228,
+        "cap": 0x2229,
+        "cup": 0x222A,
+        "int": 0x222B,
+        "there4": 0x2234,
+        "sim": 0x223C,
+        "cong": 0x2245,
+        "asymp": 0x2248,
+        "ne": 0x2260,
+        "equiv": 0x2261,
+        "le": 0x2264,
+        "ge": 0x2265,
+        "sub": 0x2282,
+        "sup": 0x2283,
+        "nsub": 0x2284,
+        "sube": 0x2286,
+        "supe": 0x2287,
+        "oplus": 0x2295,
+        "otimes": 0x2297,
+        "perp": 0x22A5,
+        "sdot": 0x22C5,
+        "lceil": 0x2308,
+        "rceil": 0x2309,
+        "lfloor": 0x230A,
+        "rfloor": 0x230B,
+        "lang": 0x2329,
+        "rang": 0x232A,
+        "loz": 0x25CA,
+        "spades": 0x2660,
+        "clubs": 0x2663,
+        "hearts": 0x2665,
+        "diams": 0x2666
+    });
+
+    function createAssignHelper(helperState: EmitHelperState, attributesSegments: Expression[]) {
+        requestEmitHelper(helperState, assignHelper);
+        return createCall(
+            getHelperName(helperState, "__assign"),
+            /*typeArguments*/ undefined,
+            attributesSegments
+        );
     }
+
+    const assignHelper: EmitHelper = {
+        name: "typescript:assign",
+        scoped: false,
+        priority: 1,
+        text: `
+            var __assign = (this && this.__assign) || Object.assign || function(t) {
+                for (var s, i = 1, n = arguments.length; i < n; i++) {
+                    s = arguments[i];
+                    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                        t[p] = s[p];
+                }
+                return t;
+            };`
+    };
 }
\ No newline at end of file
diff --git a/src/compiler/transformers/module/es2015.ts b/src/compiler/transformers/module/es2015.ts
index 93aa108617a..daef9cb5a4d 100644
--- a/src/compiler/transformers/module/es2015.ts
+++ b/src/compiler/transformers/module/es2015.ts
@@ -13,7 +13,27 @@ namespace ts {
             }
 
             if (isExternalModule(node) || compilerOptions.isolatedModules) {
-                return visitEachChild(node, visitor, context);
+                const externalHelpersModuleName = getExternalHelpersModuleName(node);
+                if (externalHelpersModuleName) {
+                    const statements: Statement[] = [];
+                    const statementOffset = addPrologueDirectives(statements, node.statements);
+                    append(statements,
+                        createImportDeclaration(
+                            /*decorators*/ undefined,
+                            /*modifiers*/ undefined,
+                            createImportClause(/*name*/ undefined, createNamespaceImport(externalHelpersModuleName)),
+                            createLiteral(externalHelpersModuleNameText)
+                        )
+                    );
+
+                    addRange(statements, visitNodes(node.statements, visitor, isStatement, statementOffset));
+                    return updateSourceFileNode(
+                        node,
+                        createNodeArray(statements, node.statements));
+                }
+                else {
+                    return visitEachChild(node, visitor, context);
+                }
             }
 
             return node;
diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
index 87d02b44025..b946d93f32d 100644
--- a/src/compiler/transformers/module/module.ts
+++ b/src/compiler/transformers/module/module.ts
@@ -82,13 +82,14 @@ namespace ts {
 
             const statements: Statement[] = [];
             const statementOffset = addPrologueDirectives(statements, node.statements, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict, sourceElementVisitor);
+            append(statements, visitNode(currentModuleInfo.externalHelpersImportDeclaration, sourceElementVisitor, isStatement, /*optional*/ true));
             addRange(statements, visitNodes(node.statements, sourceElementVisitor, isStatement, statementOffset));
             addRange(statements, endLexicalEnvironment());
             addExportEqualsIfNeeded(statements, /*emitAsReturn*/ false);
 
             const updated = updateSourceFileNode(node, createNodeArray(statements, node.statements));
             if (currentModuleInfo.hasExportStarsToExportValues) {
-                setEmitFlags(updated, EmitFlags.EmitExportStar | getEmitFlags(node));
+                addEmitHelper(updated, exportStarHelper);
             }
 
             return updated;
@@ -257,6 +258,7 @@ namespace ts {
             const statementOffset = addPrologueDirectives(statements, node.statements, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict, sourceElementVisitor);
 
             // Visit each statement of the module body.
+            append(statements, visitNode(currentModuleInfo.externalHelpersImportDeclaration, sourceElementVisitor, isStatement, /*optional*/ true));
             addRange(statements, visitNodes(node.statements, sourceElementVisitor, isStatement, statementOffset));
 
             // End the lexical environment for the module body
@@ -270,7 +272,7 @@ namespace ts {
             if (currentModuleInfo.hasExportStarsToExportValues) {
                 // If we have any `export * from ...` declarations
                 // we need to inform the emitter to add the __export helper.
-                setEmitFlags(body, EmitFlags.EmitExportStar);
+                addEmitHelper(body, exportStarHelper);
             }
 
             return body;
@@ -1312,4 +1314,14 @@ namespace ts {
             }
         }
     }
+
+    // emit output for the __export helper function
+    const exportStarHelper: EmitHelper = {
+        name: "typescript:export-star",
+        scoped: true,
+        text: `
+            function __export(m) {
+                for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+            }`
+    };
 }
diff --git a/src/compiler/transformers/module/system.ts b/src/compiler/transformers/module/system.ts
index adc9385935b..4b24d5c1641 100644
--- a/src/compiler/transformers/module/system.ts
+++ b/src/compiler/transformers/module/system.ts
@@ -82,6 +82,7 @@ namespace ts {
 
             // Add the body of the module.
             const dependencyGroups = collectDependencyGroups(moduleInfo.externalImports);
+            const moduleBodyBlock = createSystemModuleBody(node, dependencyGroups);
             const moduleBodyFunction = createFunctionExpression(
                 /*modifiers*/ undefined,
                 /*asteriskToken*/ undefined,
@@ -92,7 +93,7 @@ namespace ts {
                     createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, contextObject)
                 ],
                 /*type*/ undefined,
-                createSystemModuleBody(node, dependencyGroups)
+                moduleBodyBlock
             );
 
             // Write the call to `System.register`
@@ -115,7 +116,9 @@ namespace ts {
                 ], node.statements)
             );
 
-            setEmitFlags(updated, getEmitFlags(node) & ~EmitFlags.EmitEmitHelpers);
+            if (!(compilerOptions.outFile || compilerOptions.out)) {
+                moveEmitHelpers(updated, moduleBodyBlock, helper => !helper.scoped);
+            }
 
             if (noSubstitution) {
                 noSubstitutionMap[id] = noSubstitution;
@@ -236,6 +239,9 @@ namespace ts {
                 )
             );
 
+            // Visit the synthetic external helpers import declaration if present
+            visitNode(moduleInfo.externalHelpersImportDeclaration, sourceElementVisitor, isStatement, /*optional*/ true);
+
             // Visit the statements of the source file, emitting any transformations into
             // the `executeStatements` array. We do this *before* we fill the `setters` array
             // as we both emit transformations as well as aggregate some data used when creating
@@ -280,9 +286,7 @@ namespace ts {
                 )
             );
 
-            const body = createBlock(statements, /*location*/ undefined, /*multiLine*/ true);
-            setEmitFlags(body, EmitFlags.EmitEmitHelpers);
-            return body;
+            return createBlock(statements, /*location*/ undefined, /*multiLine*/ true);
         }
 
         /**
@@ -394,7 +398,13 @@ namespace ts {
             if (localNames) {
                 condition = createLogicalAnd(
                     condition,
-                    createLogicalNot(createHasOwnProperty(localNames, n))
+                    createLogicalNot(
+                        createCall(
+                            createPropertyAccess(localNames, "hasOwnProperty"),
+                            /*typeArguments*/ undefined,
+                            [n]
+                        )
+                    )
                 );
             }
 
diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
index fe264876b25..02c7b107b25 100644
--- a/src/compiler/transformers/ts.ts
+++ b/src/compiler/transformers/ts.ts
@@ -48,7 +48,7 @@ namespace ts {
         let currentNamespaceContainerName: Identifier;
         let currentScope: SourceFile | Block | ModuleBlock | CaseBlock;
         let currentScopeFirstDeclarationsOfName: Map<Node>;
-        let currentExternalHelpersModuleName: Identifier;
+        let helperState: EmitHelperState;
 
         /**
          * Keeps track of whether expression substitution has been enabled for specific edge cases.
@@ -80,7 +80,23 @@ namespace ts {
                 return node;
             }
 
-            return visitNode(node, visitor, isSourceFile);
+            currentSourceFile = node;
+            currentScope = node;
+            currentScopeFirstDeclarationsOfName = createMap<Node>();
+            helperState = { currentSourceFile, compilerOptions };
+
+            let visited = visitEachChild(node, sourceElementVisitor, context);
+            if (compilerOptions.alwaysStrict) {
+                visited = updateSourceFileNode(visited, ensureUseStrict(visited.statements));
+            }
+
+            addEmitHelpers(visited, helperState.requestedHelpers);
+
+            currentSourceFile = undefined;
+            currentScope = undefined;
+            currentScopeFirstDeclarationsOfName = undefined;
+            helperState = undefined;
+            return visited;
         }
 
         /**
@@ -122,10 +138,7 @@ namespace ts {
          * @param node The node to visit.
          */
         function visitorWorker(node: Node): VisitResult<Node> {
-            if (node.kind === SyntaxKind.SourceFile) {
-                return visitSourceFile(<SourceFile>node);
-            }
-            else if (node.transformFlags & TransformFlags.TypeScript) {
+            if (node.transformFlags & TransformFlags.TypeScript) {
                 // This node is explicitly marked as TypeScript, so we should transform the node.
                 return visitTypeScript(node);
             }
@@ -252,7 +265,6 @@ namespace ts {
             return node;
         }
 
-
         /**
          * Branching visitor, visits a TypeScript syntax node.
          *
@@ -446,7 +458,6 @@ namespace ts {
          */
         function onBeforeVisitNode(node: Node) {
             switch (node.kind) {
-                case SyntaxKind.SourceFile:
                 case SyntaxKind.CaseBlock:
                 case SyntaxKind.ModuleBlock:
                 case SyntaxKind.Block:
@@ -465,50 +476,6 @@ namespace ts {
             }
         }
 
-        function visitSourceFile(node: SourceFile) {
-            currentSourceFile = node;
-
-            // ensure "use strict" is emitted in all scenarios in alwaysStrict mode
-            if (compilerOptions.alwaysStrict) {
-                node = ensureUseStrict(node);
-            }
-
-            // If the source file requires any helpers and is an external module, and
-            // the importHelpers compiler option is enabled, emit a synthesized import
-            // statement for the helpers library.
-            if (node.flags & NodeFlags.EmitHelperFlags
-                && compilerOptions.importHelpers
-                && (isExternalModule(node) || compilerOptions.isolatedModules)) {
-                startLexicalEnvironment();
-                const statements: Statement[] = [];
-                const statementOffset = addPrologueDirectives(statements, node.statements, /*ensureUseStrict*/ false, visitor);
-                const externalHelpersModuleName = createUniqueName(externalHelpersModuleNameText);
-                const externalHelpersModuleImport = createImportDeclaration(
-                    /*decorators*/ undefined,
-                    /*modifiers*/ undefined,
-                    createImportClause(/*name*/ undefined, createNamespaceImport(externalHelpersModuleName)),
-                    createLiteral(externalHelpersModuleNameText));
-
-                externalHelpersModuleImport.parent = node;
-                externalHelpersModuleImport.flags &= ~NodeFlags.Synthesized;
-                statements.push(externalHelpersModuleImport);
-
-                currentExternalHelpersModuleName = externalHelpersModuleName;
-                addRange(statements, visitNodes(node.statements, sourceElementVisitor, isStatement, statementOffset));
-                addRange(statements, endLexicalEnvironment());
-                currentExternalHelpersModuleName = undefined;
-
-                node = updateSourceFileNode(node, createNodeArray(statements, node.statements));
-                node.externalHelpersModuleName = externalHelpersModuleName;
-            }
-            else {
-                node = visitEachChild(node, sourceElementVisitor, context);
-            }
-
-            setEmitFlags(node, EmitFlags.EmitEmitHelpers | getEmitFlags(node));
-            return node;
-        }
-
         /**
          * Tests whether we should emit a __decorate call for a class declaration.
          */
@@ -1418,7 +1385,7 @@ namespace ts {
                 : undefined;
 
             const helper = createDecorateHelper(
-                currentExternalHelpersModuleName,
+                helperState,
                 decoratorExpressions,
                 prefix,
                 memberName,
@@ -1456,7 +1423,7 @@ namespace ts {
 
             const classAlias = classAliases && classAliases[getOriginalNodeId(node)];
             const localName = getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
-            const decorate = createDecorateHelper(currentExternalHelpersModuleName, decoratorExpressions, localName);
+            const decorate = createDecorateHelper(helperState, decoratorExpressions, localName);
             const expression = createAssignment(localName, classAlias ? createAssignment(classAlias, decorate) : decorate);
             setEmitFlags(expression, EmitFlags.NoComments);
             setSourceMapRange(expression, moveRangePastDecorators(node));
@@ -1484,7 +1451,7 @@ namespace ts {
                 expressions = [];
                 for (const decorator of decorators) {
                     const helper = createParamHelper(
-                        currentExternalHelpersModuleName,
+                        helperState,
                         transformDecorator(decorator),
                         parameterOffset,
                         /*location*/ decorator.expression);
@@ -1514,13 +1481,13 @@ namespace ts {
         function addOldTypeMetadata(node: Declaration, decoratorExpressions: Expression[]) {
             if (compilerOptions.emitDecoratorMetadata) {
                 if (shouldAddTypeMetadata(node)) {
-                    decoratorExpressions.push(createMetadataHelper(currentExternalHelpersModuleName, "design:type", serializeTypeOfNode(node)));
+                    decoratorExpressions.push(createMetadataHelper(helperState, "design:type", serializeTypeOfNode(node)));
                 }
                 if (shouldAddParamTypesMetadata(node)) {
-                    decoratorExpressions.push(createMetadataHelper(currentExternalHelpersModuleName, "design:paramtypes", serializeParameterTypesOfNode(node)));
+                    decoratorExpressions.push(createMetadataHelper(helperState, "design:paramtypes", serializeParameterTypesOfNode(node)));
                 }
                 if (shouldAddReturnTypeMetadata(node)) {
-                    decoratorExpressions.push(createMetadataHelper(currentExternalHelpersModuleName, "design:returntype", serializeReturnTypeOfNode(node)));
+                    decoratorExpressions.push(createMetadataHelper(helperState, "design:returntype", serializeReturnTypeOfNode(node)));
                 }
             }
         }
@@ -1538,7 +1505,7 @@ namespace ts {
                     (properties || (properties = [])).push(createPropertyAssignment("returnType", createArrowFunction(/*modifiers*/ undefined, /*typeParameters*/ undefined, [], /*type*/ undefined, createToken(SyntaxKind.EqualsGreaterThanToken), serializeReturnTypeOfNode(node))));
                 }
                 if (properties) {
-                    decoratorExpressions.push(createMetadataHelper(currentExternalHelpersModuleName, "design:typeinfo", createObjectLiteral(properties, /*location*/ undefined, /*multiLine*/ true)));
+                    decoratorExpressions.push(createMetadataHelper(helperState, "design:typeinfo", createObjectLiteral(properties, /*location*/ undefined, /*multiLine*/ true)));
                 }
             }
         }
@@ -3404,4 +3371,77 @@ namespace ts {
                 : undefined;
         }
     }
+
+    function createParamHelper(helperState: EmitHelperState, expression: Expression, parameterOffset: number, location?: TextRange) {
+        requestEmitHelper(helperState, paramHelper);
+        return createCall(
+            getHelperName(helperState, "__param"),
+            /*typeArguments*/ undefined,
+            [
+                createLiteral(parameterOffset),
+                expression
+            ],
+            location
+        );
+    }
+
+    function createMetadataHelper(helperState: EmitHelperState, metadataKey: string, metadataValue: Expression) {
+        requestEmitHelper(helperState, metadataHelper);
+        return createCall(
+            getHelperName(helperState, "__metadata"),
+            /*typeArguments*/ undefined,
+            [
+                createLiteral(metadataKey),
+                metadataValue
+            ]
+        );
+    }
+
+    function createDecorateHelper(helperState: EmitHelperState, decoratorExpressions: Expression[], target: Expression, memberName?: Expression, descriptor?: Expression, location?: TextRange) {
+        const argumentsArray: Expression[] = [];
+        argumentsArray.push(createArrayLiteral(decoratorExpressions, /*location*/ undefined, /*multiLine*/ true));
+        argumentsArray.push(target);
+        if (memberName) {
+            argumentsArray.push(memberName);
+            if (descriptor) {
+                argumentsArray.push(descriptor);
+            }
+        }
+
+        requestEmitHelper(helperState, decorateHelper);
+        return createCall(getHelperName(helperState, "__decorate"), /*typeArguments*/ undefined, argumentsArray, location);
+    }
+
+    const decorateHelper: EmitHelper = {
+        name: "typescript:decorate",
+        scoped: false,
+        priority: 2,
+        text: `
+            var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+                var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+                if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+                else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+                return c > 3 && r && Object.defineProperty(target, key, r), r;
+            };`
+    };
+
+    const metadataHelper: EmitHelper = {
+        name: "typescript:metadata",
+        scoped: false,
+        priority: 3,
+        text: `
+            var __metadata = (this && this.__metadata) || function (k, v) {
+                if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+            };`
+    };
+
+    const paramHelper: EmitHelper = {
+        name: "typescript:param",
+        scoped: false,
+        priority: 4,
+        text: `
+            var __param = (this && this.__param) || function (paramIndex, decorator) {
+                return function (target, key) { decorator(target, key, paramIndex); }
+            };`
+    };
 }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index cfe7cc97ec5..d8043d1fc01 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -2088,8 +2088,6 @@ namespace ts {
         /* @internal */ imports: LiteralExpression[];
         /* @internal */ moduleAugmentations: LiteralExpression[];
         /* @internal */ patternAmbientModules?: PatternAmbientModule[];
-        // The synthesized identifier for an imported external helpers module.
-        /* @internal */ externalHelpersModuleName?: Identifier;
     }
 
     export interface ScriptReferenceHost {
@@ -3476,20 +3474,18 @@ namespace ts {
 
     /* @internal */
     export interface EmitNode {
-        flags?: EmitFlags;
-        commentRange?: TextRange;
-        sourceMapRange?: TextRange;
-        tokenSourceMapRanges?: Map<TextRange>;
         annotatedNodes?: Node[];                // Tracks Parse-tree nodes with EmitNodes for eventual cleanup.
-        constantValue?: number;
+        flags?: EmitFlags;                      // Flags that customize emit
+        commentRange?: TextRange;               // The text range to use when emitting leading or trailing comments
+        sourceMapRange?: TextRange;             // The text range to use when emitting leading or trailing source mappings
+        tokenSourceMapRanges?: Map<TextRange>;  // The text range to use when emitting source mappings for tokens
+        constantValue?: number;                 // The constant value of an expression
+        externalHelpersModuleName?: Identifier; // The local name for an imported helpers module
+        helpers?: EmitHelper[];                 // Emit helpers for the node
     }
 
     /* @internal */
     export const enum EmitFlags {
-        EmitEmitHelpers = 1 << 0,                // Any emit helpers should be written to this node.
-        EmitExportStar = 1 << 1,                 // The export * helper should be written to this node.
-        EmitSuperHelper = 1 << 2,                // Emit the basic _super helper for async methods.
-        EmitAdvancedSuperHelper = 1 << 3,        // Emit the advanced _super helper for async methods.
         UMDDefine = 1 << 4,                      // This node should be replaced with the UMD define helper.
         SingleLine = 1 << 5,                     // The contents of this node should be emitted on a single line.
         AdviseOnEmitNode = 1 << 6,               // The printer should invoke the onEmitNode callback when printing this node.
@@ -3517,6 +3513,14 @@ namespace ts {
         HasEndOfDeclarationMarker = 1 << 25,     // Declaration has an associated NotEmittedStatement to mark the end of the declaration
     }
 
+    /* @internal */
+    export interface EmitHelper {
+        readonly name: string;      // A unique name for this helper.
+        readonly scoped: boolean;   // Indicates whether ther helper MUST be emitted in the current scope.
+        readonly text: string;      // ES3-compatible raw script text.
+        readonly priority?: number; // Helpers with a higher priority are emitted earlier than other helpers on the node.
+    }
+
     /* @internal */
     export const enum EmitContext {
         SourceFile,         // Emitting a SourceFile
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index bec92b9a5ca..44e2d4b1135 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -3493,153 +3493,6 @@ namespace ts {
         return positionIsSynthesized(range.pos) ? -1 : skipTrivia(sourceFile.text, range.pos);
     }
 
-    export interface ExternalModuleInfo {
-        externalImports: (ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration)[]; // imports of other external modules
-        exportSpecifiers: Map<ExportSpecifier[]>; // export specifiers by name
-        exportedBindings: Map<Identifier[]>; // exported names of local declarations
-        exportedNames: Identifier[]; // all exported names local to module
-        exportEquals: ExportAssignment | undefined; // an export= declaration if one was present
-        hasExportStarsToExportValues: boolean; // whether this module contains export*
-    }
-
-    export function collectExternalModuleInfo(sourceFile: SourceFile, resolver: EmitResolver): ExternalModuleInfo {
-        const externalImports: (ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration)[] = [];
-        const exportSpecifiers = createMap<ExportSpecifier[]>();
-        const exportedBindings = createMap<Identifier[]>();
-        const uniqueExports = createMap<Identifier>();
-        let hasExportDefault = false;
-        let exportEquals: ExportAssignment = undefined;
-        let hasExportStarsToExportValues = false;
-        for (const node of sourceFile.statements) {
-            switch (node.kind) {
-                case SyntaxKind.ImportDeclaration:
-                    // import "mod"
-                    // import x from "mod"
-                    // import * as x from "mod"
-                    // import { x, y } from "mod"
-                    externalImports.push(<ImportDeclaration>node);
-                    break;
-
-                case SyntaxKind.ImportEqualsDeclaration:
-                    if ((<ImportEqualsDeclaration>node).moduleReference.kind === SyntaxKind.ExternalModuleReference) {
-                        // import x = require("mod")
-                        externalImports.push(<ImportEqualsDeclaration>node);
-                    }
-
-                    break;
-
-                case SyntaxKind.ExportDeclaration:
-                    if ((<ExportDeclaration>node).moduleSpecifier) {
-                        if (!(<ExportDeclaration>node).exportClause) {
-                            // export * from "mod"
-                            externalImports.push(<ExportDeclaration>node);
-                            hasExportStarsToExportValues = true;
-                        }
-                        else {
-                            // export { x, y } from "mod"
-                            externalImports.push(<ExportDeclaration>node);
-                        }
-                    }
-                    else {
-                        // export { x, y }
-                        for (const specifier of (<ExportDeclaration>node).exportClause.elements) {
-                            if (!uniqueExports[specifier.name.text]) {
-                                const name = specifier.propertyName || specifier.name;
-                                multiMapAdd(exportSpecifiers, name.text, specifier);
-
-                                const decl = resolver.getReferencedImportDeclaration(name)
-                                    || resolver.getReferencedValueDeclaration(name);
-
-                                if (decl) {
-                                    multiMapAdd(exportedBindings, getOriginalNodeId(decl), specifier.name);
-                                }
-
-                                uniqueExports[specifier.name.text] = specifier.name;
-                            }
-                        }
-                    }
-                    break;
-
-                case SyntaxKind.ExportAssignment:
-                    if ((<ExportAssignment>node).isExportEquals && !exportEquals) {
-                        // export = x
-                        exportEquals = <ExportAssignment>node;
-                    }
-                    break;
-
-                case SyntaxKind.VariableStatement:
-                    if (hasModifier(node, ModifierFlags.Export)) {
-                        for (const decl of (<VariableStatement>node).declarationList.declarations) {
-                            collectExportedVariableInfo(decl, uniqueExports);
-                        }
-                    }
-                    break;
-
-                case SyntaxKind.FunctionDeclaration:
-                    if (hasModifier(node, ModifierFlags.Export)) {
-                        if (hasModifier(node, ModifierFlags.Default)) {
-                            // export default function() { }
-                            if (!hasExportDefault) {
-                                multiMapAdd(exportedBindings, getOriginalNodeId(node), getDeclarationName(<FunctionDeclaration>node));
-                                hasExportDefault = true;
-                            }
-                        }
-                        else {
-                            // export function x() { }
-                            const name = (<FunctionDeclaration>node).name;
-                            if (!uniqueExports[name.text]) {
-                                multiMapAdd(exportedBindings, getOriginalNodeId(node), name);
-                                uniqueExports[name.text] = name;
-                            }
-                        }
-                    }
-                    break;
-
-                case SyntaxKind.ClassDeclaration:
-                    if (hasModifier(node, ModifierFlags.Export)) {
-                        if (hasModifier(node, ModifierFlags.Default)) {
-                            // export default class { }
-                            if (!hasExportDefault) {
-                                multiMapAdd(exportedBindings, getOriginalNodeId(node), getDeclarationName(<ClassDeclaration>node));
-                                hasExportDefault = true;
-                            }
-                        }
-                        else {
-                            // export class x { }
-                            const name = (<ClassDeclaration>node).name;
-                            if (!uniqueExports[name.text]) {
-                                multiMapAdd(exportedBindings, getOriginalNodeId(node), name);
-                                uniqueExports[name.text] = name;
-                            }
-                        }
-                    }
-                    break;
-            }
-        }
-
-        let exportedNames: Identifier[];
-        for (const key in uniqueExports) {
-            exportedNames = ts.append(exportedNames, uniqueExports[key]);
-        }
-
-        return { externalImports, exportSpecifiers, exportEquals, hasExportStarsToExportValues, exportedBindings, exportedNames };
-    }
-
-    function collectExportedVariableInfo(decl: VariableDeclaration | BindingElement, uniqueExports: Map<Identifier>) {
-        if (isBindingPattern(decl.name)) {
-            for (const element of decl.name.elements) {
-                if (!isOmittedExpression(element)) {
-                    collectExportedVariableInfo(element, uniqueExports);
-                }
-            }
-        }
-        else if (!isGeneratedIdentifier(decl.name)) {
-            if (!uniqueExports[decl.name.text]) {
-                uniqueExports[decl.name.text] = decl.name;
-            }
-        }
-    }
-
     /**
      * Determines whether a name was originally the declaration name of an enum or namespace
      * declaration.

From c1505a0ed9b1281ac64955e7359406f53bc39386 Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Wed, 26 Oct 2016 18:38:59 -0700
Subject: [PATCH 064/421] Added RawExpression to move the UMD helper out of the
 emitter

---
 src/compiler/emitter.ts                    | 21 ++------
 src/compiler/factory.ts                    | 15 +++++-
 src/compiler/transformers/module/module.ts | 14 +++++-
 src/compiler/types.ts                      | 56 +++++++++++++---------
 src/compiler/utilities.ts                  |  5 +-
 5 files changed, 66 insertions(+), 45 deletions(-)

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index ed16ec06159..a4096d91574 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -20,18 +20,6 @@ namespace ts {
     export function emitFiles(resolver: EmitResolver, host: EmitHost, targetSourceFile: SourceFile, emitOnlyDtsFiles?: boolean): EmitResult {
         const delimiters = createDelimiterMap();
         const brackets = createBracketsMap();
-
-        // emit output for the UMD helper function.
-        const umdHelper = `
-(function (dependencies, factory) {
-    if (typeof module === 'object' && typeof module.exports === 'object') {
-        var v = factory(require, exports); if (v !== undefined) module.exports = v;
-    }
-    else if (typeof define === 'function' && define.amd) {
-        define(dependencies, factory);
-    }
-})`;
-
         const compilerOptions = host.getCompilerOptions();
         const languageVersion = getEmitScriptTarget(compilerOptions);
         const moduleKind = getEmitModuleKind(compilerOptions);
@@ -674,6 +662,8 @@ namespace ts {
                 // Transformation nodes
                 case SyntaxKind.PartiallyEmittedExpression:
                     return emitPartiallyEmittedExpression(<PartiallyEmittedExpression>node);
+                case SyntaxKind.RawExpression:
+                    return writeLines((<RawExpression>node).text);
             }
         }
 
@@ -711,12 +701,7 @@ namespace ts {
         //
 
         function emitIdentifier(node: Identifier) {
-            if (getEmitFlags(node) & EmitFlags.UMDDefine) {
-                writeLines(umdHelper);
-            }
-            else {
-                write(getTextOfNode(node, /*includeTrivia*/ false));
-            }
+            write(getTextOfNode(node, /*includeTrivia*/ false));
         }
 
         //
diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index 04b7079d094..046e6f24c26 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -1504,6 +1504,19 @@ namespace ts {
         return node;
     }
 
+    /**
+     * Creates a node that emits a string of raw text in an expression position. Raw text is never
+     * transformed, should be ES3 compliant, and should have the same precedence as
+     * PrimaryExpression.
+     *
+     * @param text The raw text of the node.
+     */
+    export function createRawExpression(text: string) {
+        const node = <RawExpression>createNode(SyntaxKind.RawExpression);
+        node.text = text;
+        return node;
+    }
+
     // Compound nodes
 
     export function createComma(left: Expression, right: Expression) {
@@ -1621,7 +1634,7 @@ namespace ts {
         // flag and setting a parent node.
         const react = createIdentifier(reactNamespace || "React");
         react.flags &= ~NodeFlags.Synthesized;
-        // Set the parent that is in parse tree 
+        // Set the parent that is in parse tree
         // this makes sure that parent chain is intact for checker to traverse complete scope tree
         react.parent = getParseTreeNode(parent);
         return react;
diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
index b946d93f32d..22e4e844a69 100644
--- a/src/compiler/transformers/module/module.ts
+++ b/src/compiler/transformers/module/module.ts
@@ -112,8 +112,7 @@ namespace ts {
          * @param node The SourceFile node.
          */
         function transformUMDModule(node: SourceFile) {
-            const define = createIdentifier("define");
-            setEmitFlags(define, EmitFlags.UMDDefine);
+            const define = createRawExpression(umdHelper);
             return transformAsynchronousModule(node, define, /*moduleName*/ undefined, /*includeNonAmdDependencies*/ false);
         }
 
@@ -1324,4 +1323,15 @@ namespace ts {
                 for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
             }`
     };
+
+    // emit output for the UMD helper function.
+    const umdHelper = `
+        (function (dependencies, factory) {
+            if (typeof module === 'object' && typeof module.exports === 'object') {
+                var v = factory(require, exports); if (v !== undefined) module.exports = v;
+            }
+            else if (typeof define === 'function' && define.amd) {
+                define(dependencies, factory);
+            }
+        })`;
 }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index d8043d1fc01..526c4e15cb8 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -364,6 +364,7 @@ namespace ts {
         PartiallyEmittedExpression,
         MergeDeclarationMarker,
         EndOfDeclarationMarker,
+        RawExpression,
 
         // Enum value count
         Count,
@@ -423,7 +424,7 @@ namespace ts {
         ThisNodeHasError =   1 << 19, // If the parser encountered an error when parsing the code that created this node
         JavaScriptFile =     1 << 20, // If node was parsed in a JavaScript
         ThisNodeOrAnySubNodesHasError = 1 << 21, // If this node or any of its children had an error
-        HasAggregatedChildData = 1 << 22, // If we've computed data from children and cached it in this node 
+        HasAggregatedChildData = 1 << 22, // If we've computed data from children and cached it in this node
 
         BlockScoped = Let | Const,
 
@@ -1453,6 +1454,16 @@ namespace ts {
         kind: SyntaxKind.EndOfDeclarationMarker;
     }
 
+    /**
+     * Emits a string of raw text in an expression position. Raw text is never transformed, should
+     * be ES3 compliant, and should have the same precedence as PrimaryExpression.
+     */
+    /* @internal */
+    export interface RawExpression extends PrimaryExpression {
+        kind: SyntaxKind.RawExpression;
+        text: string;
+    }
+
     /**
      * Marks the beginning of a merged transformed declaration.
      */
@@ -3486,31 +3497,30 @@ namespace ts {
 
     /* @internal */
     export const enum EmitFlags {
-        UMDDefine = 1 << 4,                      // This node should be replaced with the UMD define helper.
-        SingleLine = 1 << 5,                     // The contents of this node should be emitted on a single line.
-        AdviseOnEmitNode = 1 << 6,               // The printer should invoke the onEmitNode callback when printing this node.
-        NoSubstitution = 1 << 7,                 // Disables further substitution of an expression.
-        CapturesThis = 1 << 8,                   // The function captures a lexical `this`
-        NoLeadingSourceMap = 1 << 9,             // Do not emit a leading source map location for this node.
-        NoTrailingSourceMap = 1 << 10,           // Do not emit a trailing source map location for this node.
+        SingleLine = 1 << 0,                     // The contents of this node should be emitted on a single line.
+        AdviseOnEmitNode = 1 << 1,               // The printer should invoke the onEmitNode callback when printing this node.
+        NoSubstitution = 1 << 2,                 // Disables further substitution of an expression.
+        CapturesThis = 1 << 3,                   // The function captures a lexical `this`
+        NoLeadingSourceMap = 1 << 4,             // Do not emit a leading source map location for this node.
+        NoTrailingSourceMap = 1 << 5,            // Do not emit a trailing source map location for this node.
         NoSourceMap = NoLeadingSourceMap | NoTrailingSourceMap, // Do not emit a source map location for this node.
-        NoNestedSourceMaps = 1 << 11,            // Do not emit source map locations for children of this node.
-        NoTokenLeadingSourceMaps = 1 << 12,      // Do not emit leading source map location for token nodes.
-        NoTokenTrailingSourceMaps = 1 << 13,     // Do not emit trailing source map location for token nodes.
+        NoNestedSourceMaps = 1 << 6,             // Do not emit source map locations for children of this node.
+        NoTokenLeadingSourceMaps = 1 << 7,       // Do not emit leading source map location for token nodes.
+        NoTokenTrailingSourceMaps = 1 << 8,      // Do not emit trailing source map location for token nodes.
         NoTokenSourceMaps = NoTokenLeadingSourceMaps | NoTokenTrailingSourceMaps, // Do not emit source map locations for tokens of this node.
-        NoLeadingComments = 1 << 14,             // Do not emit leading comments for this node.
-        NoTrailingComments = 1 << 15,            // Do not emit trailing comments for this node.
+        NoLeadingComments = 1 << 9,              // Do not emit leading comments for this node.
+        NoTrailingComments = 1 << 10,            // Do not emit trailing comments for this node.
         NoComments = NoLeadingComments | NoTrailingComments, // Do not emit comments for this node.
-        NoNestedComments = 1 << 16,
-        ExportName = 1 << 17,                    // Ensure an export prefix is added for an identifier that points to an exported declaration with a local name (see SymbolFlags.ExportHasLocal).
-        LocalName = 1 << 18,                     // Ensure an export prefix is not added for an identifier that points to an exported declaration.
-        Indented = 1 << 19,                      // Adds an explicit extra indentation level for class and function bodies when printing (used to match old emitter).
-        NoIndentation = 1 << 20,                 // Do not indent the node.
-        AsyncFunctionBody = 1 << 21,
-        ReuseTempVariableScope = 1 << 22,        // Reuse the existing temp variable scope during emit.
-        CustomPrologue = 1 << 23,                // Treat the statement as if it were a prologue directive (NOTE: Prologue directives are *not* transformed).
-        NoHoisting = 1 << 24,                    // Do not hoist this declaration in --module system
-        HasEndOfDeclarationMarker = 1 << 25,     // Declaration has an associated NotEmittedStatement to mark the end of the declaration
+        NoNestedComments = 1 << 11,
+        ExportName = 1 << 12,                    // Ensure an export prefix is added for an identifier that points to an exported declaration with a local name (see SymbolFlags.ExportHasLocal).
+        LocalName = 1 << 13,                     // Ensure an export prefix is not added for an identifier that points to an exported declaration.
+        Indented = 1 << 14,                      // Adds an explicit extra indentation level for class and function bodies when printing (used to match old emitter).
+        NoIndentation = 1 << 15,                 // Do not indent the node.
+        AsyncFunctionBody = 1 << 16,
+        ReuseTempVariableScope = 1 << 17,        // Reuse the existing temp variable scope during emit.
+        CustomPrologue = 1 << 18,                // Treat the statement as if it were a prologue directive (NOTE: Prologue directives are *not* transformed).
+        NoHoisting = 1 << 19,                    // Do not hoist this declaration in --module system
+        HasEndOfDeclarationMarker = 1 << 20,     // Declaration has an associated NotEmittedStatement to mark the end of the declaration
     }
 
     /* @internal */
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 44e2d4b1135..0ea82dfceb4 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -2087,6 +2087,7 @@ namespace ts {
             case SyntaxKind.TemplateExpression:
             case SyntaxKind.ParenthesizedExpression:
             case SyntaxKind.OmittedExpression:
+            case SyntaxKind.RawExpression:
                 return 19;
 
             case SyntaxKind.TaggedTemplateExpression:
@@ -3796,7 +3797,8 @@ namespace ts {
             || kind === SyntaxKind.ThisKeyword
             || kind === SyntaxKind.TrueKeyword
             || kind === SyntaxKind.SuperKeyword
-            || kind === SyntaxKind.NonNullExpression;
+            || kind === SyntaxKind.NonNullExpression
+            || kind === SyntaxKind.RawExpression;
     }
 
     export function isLeftHandSideExpression(node: Node): node is LeftHandSideExpression {
@@ -3826,6 +3828,7 @@ namespace ts {
             || kind === SyntaxKind.SpreadElementExpression
             || kind === SyntaxKind.AsExpression
             || kind === SyntaxKind.OmittedExpression
+            || kind === SyntaxKind.RawExpression
             || isUnaryExpressionKind(kind);
     }
 

From 39b9163715fac6975c5691ae4d85afbc2eabcb62 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Thu, 27 Oct 2016 16:03:01 -0700
Subject: [PATCH 065/421] Rename Experimental transform to ESNext

1. Spread/rest are no longer experimental.
2. We need a place to put stage 3 ES features.
---
 Jakefile.js                                              | 4 ++--
 src/compiler/transformer.ts                              | 4 ++--
 src/compiler/transformers/{experimental.ts => esnext.ts} | 2 +-
 src/compiler/tsconfig.json                               | 2 +-
 src/harness/tsconfig.json                                | 2 +-
 src/services/tsconfig.json                               | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename src/compiler/transformers/{experimental.ts => esnext.ts} (95%)

diff --git a/Jakefile.js b/Jakefile.js
index e6698474a22..85f5ef681e8 100644
--- a/Jakefile.js
+++ b/Jakefile.js
@@ -71,7 +71,7 @@ var compilerSources = [
     "transformers/destructuring.ts",
     "transformers/ts.ts",
     "transformers/jsx.ts",
-    "transformers/experimental.ts",
+    "transformers/esnext.ts",
     "transformers/es2017.ts",
     "transformers/es2016.ts",
     "transformers/es2015.ts",
@@ -108,7 +108,7 @@ var servicesSources = [
     "transformers/destructuring.ts",
     "transformers/ts.ts",
     "transformers/jsx.ts",
-    "transformers/experimental.ts",
+    "transformers/esnext.ts",
     "transformers/es2017.ts",
     "transformers/es2016.ts",
     "transformers/es2015.ts",
diff --git a/src/compiler/transformer.ts b/src/compiler/transformer.ts
index 467d57a0983..069b1e46af5 100644
--- a/src/compiler/transformer.ts
+++ b/src/compiler/transformer.ts
@@ -1,7 +1,7 @@
 /// <reference path="visitor.ts" />
 /// <reference path="transformers/ts.ts" />
 /// <reference path="transformers/jsx.ts" />
-/// <reference path="transformers/experimental.ts" />
+/// <reference path="transformers/esnext.ts" />
 /// <reference path="transformers/es2017.ts" />
 /// <reference path="transformers/es2016.ts" />
 /// <reference path="transformers/es2015.ts" />
@@ -117,7 +117,7 @@ namespace ts {
             transformers.push(transformJsx);
         }
 
-        transformers.push(transformExperimental);
+        transformers.push(transformESNext);
         if (languageVersion < ScriptTarget.ES2017) {
             transformers.push(transformES2017);
         }
diff --git a/src/compiler/transformers/experimental.ts b/src/compiler/transformers/esnext.ts
similarity index 95%
rename from src/compiler/transformers/experimental.ts
rename to src/compiler/transformers/esnext.ts
index 2ee623db43a..58cf1a1c01a 100644
--- a/src/compiler/transformers/experimental.ts
+++ b/src/compiler/transformers/esnext.ts
@@ -3,7 +3,7 @@
 
 /*@internal*/
 namespace ts {
-    export function transformExperimental(context: TransformationContext) {
+    export function transformESNext(context: TransformationContext) {
         return transformSourceFile;
 
         function transformSourceFile(node: SourceFile) {
diff --git a/src/compiler/tsconfig.json b/src/compiler/tsconfig.json
index 3e9b6a765bd..bd70a0afb10 100644
--- a/src/compiler/tsconfig.json
+++ b/src/compiler/tsconfig.json
@@ -27,7 +27,7 @@
         "visitor.ts",
         "transformers/ts.ts",
         "transformers/jsx.ts",
-        "transformers/experimental.ts",
+        "transformers/esnext.ts",
         "transformers/es2017.ts",
         "transformers/es2016.ts",
         "transformers/es2015.ts",
diff --git a/src/harness/tsconfig.json b/src/harness/tsconfig.json
index 9b174236cbc..d3a814f26ca 100644
--- a/src/harness/tsconfig.json
+++ b/src/harness/tsconfig.json
@@ -29,7 +29,7 @@
         "../compiler/visitor.ts",
         "../compiler/transformers/ts.ts",
         "../compiler/transformers/jsx.ts",
-        "../compiler/transformers/experimental.ts",
+        "../compiler/transformers/esnext.ts",
         "../compiler/transformers/es2017.ts",
         "../compiler/transformers/es2016.ts",
         "../compiler/transformers/es2015.ts",
diff --git a/src/services/tsconfig.json b/src/services/tsconfig.json
index 2b947d60cf2..9c3e068918d 100644
--- a/src/services/tsconfig.json
+++ b/src/services/tsconfig.json
@@ -28,7 +28,7 @@
         "../compiler/visitor.ts",
         "../compiler/transformers/ts.ts",
         "../compiler/transformers/jsx.ts",
-        "../compiler/transformers/experimental.ts",
+        "../compiler/transformers/esnext.ts",
         "../compiler/transformers/es2017.ts",
         "../compiler/transformers/es2016.ts",
         "../compiler/transformers/es2015.ts",

From 988bf1fc69fbcdbd06e07dd5d988f1d221ab73cf Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Fri, 28 Oct 2016 10:24:30 -0700
Subject: [PATCH 066/421] Rename TransformFlags.Experimental -> ESNext

---
 src/compiler/binder.ts              | 4 ++--
 src/compiler/transformers/esnext.ts | 4 ++--
 src/compiler/types.ts               | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index 0b8f59a82ef..35844095da4 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -3160,8 +3160,8 @@ namespace ts {
 
                 if (subtreeFlags & TransformFlags.ContainsSpreadExpression) {
                     // If an ObjectLiteralExpression contains a spread element, then it
-                    // is an ES experimental node.
-                    transformFlags |= TransformFlags.AssertExperimental;
+                    // is an ES next node.
+                    transformFlags |= TransformFlags.AssertESNext;
                 }
 
                 break;
diff --git a/src/compiler/transformers/esnext.ts b/src/compiler/transformers/esnext.ts
index 58cf1a1c01a..1a8ed7da5eb 100644
--- a/src/compiler/transformers/esnext.ts
+++ b/src/compiler/transformers/esnext.ts
@@ -11,10 +11,10 @@ namespace ts {
         }
 
         function visitor(node: Node): VisitResult<Node> {
-            if (node.transformFlags & TransformFlags.Experimental) {
+            if (node.transformFlags & TransformFlags.ESNext) {
                 return visitorWorker(node);
             }
-            else if (node.transformFlags & TransformFlags.ContainsExperimental) {
+            else if (node.transformFlags & TransformFlags.ContainsESNext) {
                 return visitEachChild(node, visitor, context);
             }
             else {
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index c9a51a9622b..e331ebc02f6 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -3463,8 +3463,8 @@ namespace ts {
         ContainsTypeScript = 1 << 1,
         Jsx = 1 << 2,
         ContainsJsx = 1 << 3,
-        Experimental = 1 << 4,
-        ContainsExperimental = 1 << 5,
+        ESNext = 1 << 4,
+        ContainsESNext = 1 << 5,
         ES2017 = 1 << 6,
         ContainsES2017 = 1 << 7,
         ES2016 = 1 << 8,
@@ -3498,7 +3498,7 @@ namespace ts {
         // - Bitmasks that are used to assert facts about the syntax of a node and its subtree.
         AssertTypeScript = TypeScript | ContainsTypeScript,
         AssertJsx = Jsx | ContainsJsx,
-        AssertExperimental = Experimental | ContainsExperimental,
+        AssertESNext = ESNext | ContainsESNext,
         AssertES2017 = ES2017 | ContainsES2017,
         AssertES2016 = ES2016 | ContainsES2016,
         AssertES2015 = ES2015 | ContainsES2015,
@@ -3508,7 +3508,7 @@ namespace ts {
         // Scope Exclusions
         // - Bitmasks that exclude flags from propagating out of a specific context
         //   into the subtree flags of their container.
-        NodeExcludes = TypeScript | Jsx | Experimental | ES2017 | ES2016 | ES2015 | DestructuringAssignment | Generator | HasComputedFlags,
+        NodeExcludes = TypeScript | Jsx | ESNext | ES2017 | ES2016 | ES2015 | DestructuringAssignment | Generator | HasComputedFlags,
         ArrowFunctionExcludes = NodeExcludes | ContainsDecorators | ContainsDefaultValueAssignments | ContainsLexicalThis | ContainsParameterPropertyAssignments | ContainsBlockScopedBinding | ContainsYield | ContainsHoistedDeclarationOrCompletion,
         FunctionExcludes = NodeExcludes | ContainsDecorators | ContainsDefaultValueAssignments | ContainsCapturedLexicalThis | ContainsLexicalThis | ContainsParameterPropertyAssignments | ContainsBlockScopedBinding | ContainsYield | ContainsHoistedDeclarationOrCompletion,
         ConstructorExcludes = NodeExcludes | ContainsDefaultValueAssignments | ContainsLexicalThis | ContainsCapturedLexicalThis | ContainsBlockScopedBinding | ContainsYield | ContainsHoistedDeclarationOrCompletion,

From ebef408dfa18061fb3ae984bbc2f0315177d756b Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 31 Oct 2016 14:44:04 -0700
Subject: [PATCH 067/421] Move eitherIsNotLiteral check into switch and ===
 checks

This improves error messages
---
 src/compiler/checker.ts                       | 22 ++++++++++++-------
 tests/baselines/reference/expr.errors.txt     |  8 +++----
 .../for-inStatementsArrayErrors.errors.txt    |  4 ++--
 ...sertionsInEqualityComparisons02.errors.txt |  4 ++--
 .../switchAssignmentCompat.errors.txt         |  4 ++--
 .../switchCaseCircularRefeference.errors.txt  | 10 ++++-----
 ...itchCasesExpressionTypeMismatch.errors.txt | 17 ++++++--------
 .../reference/symbolType9.errors.txt          | 16 +++++++-------
 8 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index d76d4e1e770..2d05e16ef82 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -13814,12 +13814,6 @@ namespace ts {
         }
 
         function isTypeEqualityComparableTo(source: Type, target: Type) {
-            const sourceIsLiteral = isLiteralType(source);
-            const targetIsLiteral = isLiteralType(target);
-            if (!sourceIsLiteral || !targetIsLiteral) {
-                source = sourceIsLiteral ? getBaseTypeOfLiteralType(source) : source;
-                target = targetIsLiteral ? getBaseTypeOfLiteralType(target) : target;
-            }
             return (target.flags & TypeFlags.Nullable) !== 0 || isTypeComparableTo(source, target);
         }
 
@@ -13960,6 +13954,12 @@ namespace ts {
                 case SyntaxKind.ExclamationEqualsToken:
                 case SyntaxKind.EqualsEqualsEqualsToken:
                 case SyntaxKind.ExclamationEqualsEqualsToken:
+                    const leftIsLiteral = isLiteralType(leftType);
+                    const rightIsLiteral = isLiteralType(rightType);
+                    if (!leftIsLiteral || !rightIsLiteral) {
+                        leftType = leftIsLiteral ? getBaseTypeOfLiteralType(leftType) : leftType;
+                        rightType = rightIsLiteral ? getBaseTypeOfLiteralType(rightType) : rightType;
+                    }
                     if (!isTypeEqualityComparableTo(leftType, rightType) && !isTypeEqualityComparableTo(rightType, leftType)) {
                         reportOperatorError();
                     }
@@ -16882,7 +16882,7 @@ namespace ts {
             let firstDefaultClause: CaseOrDefaultClause;
             let hasDuplicateDefaultClause = false;
 
-            const expressionType = checkExpression(node.expression);
+            let expressionType = checkExpression(node.expression);
             forEach(node.caseBlock.clauses, clause => {
                 // Grammar check for duplicate default clauses, skip if we already report duplicate default clause
                 if (clause.kind === SyntaxKind.DefaultClause && !hasDuplicateDefaultClause) {
@@ -16903,7 +16903,13 @@ namespace ts {
                     // 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.
-                    const caseType = checkExpression(caseClause.expression);
+                    let caseType = checkExpression(caseClause.expression);
+                    const caseIsLiteral = isLiteralType(caseType);
+                    const expressionIsLiteral = isLiteralType(expressionType);
+                    if (!caseIsLiteral || !expressionIsLiteral) {
+                        caseType = caseIsLiteral ? getBaseTypeOfLiteralType(caseType) : caseType;
+                        expressionType = expressionIsLiteral ? getBaseTypeOfLiteralType(expressionType) : expressionType;
+                    }
                     if (!isTypeEqualityComparableTo(expressionType, caseType)) {
                         // expressionType is not comparable to caseType, try the reversed check and report errors if it fails
                         checkTypeComparableTo(caseType, expressionType, caseClause.expression, /*headMessage*/ undefined);
diff --git a/tests/baselines/reference/expr.errors.txt b/tests/baselines/reference/expr.errors.txt
index 52f6f64fef2..23215cac6ba 100644
--- a/tests/baselines/reference/expr.errors.txt
+++ b/tests/baselines/reference/expr.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/expr.ts(87,5): error TS2365: Operator '==' cannot be applied to types 'number' and 'string'.
-tests/cases/compiler/expr.ts(88,5): error TS2365: Operator '==' cannot be applied to types 'number' and 'false'.
+tests/cases/compiler/expr.ts(88,5): error TS2365: Operator '==' cannot be applied to types 'number' and 'boolean'.
 tests/cases/compiler/expr.ts(94,5): error TS2365: Operator '==' cannot be applied to types 'string' and 'number'.
-tests/cases/compiler/expr.ts(95,5): error TS2365: Operator '==' cannot be applied to types 'string' and 'false'.
+tests/cases/compiler/expr.ts(95,5): error TS2365: Operator '==' cannot be applied to types 'string' and 'boolean'.
 tests/cases/compiler/expr.ts(98,5): error TS2365: Operator '==' cannot be applied to types 'string' and 'E'.
 tests/cases/compiler/expr.ts(115,5): error TS2365: Operator '==' cannot be applied to types 'E' and 'string'.
 tests/cases/compiler/expr.ts(116,5): error TS2365: Operator '==' cannot be applied to types 'E' and 'false'.
@@ -161,7 +161,7 @@ tests/cases/compiler/expr.ts(242,7): error TS2363: The right-hand side of an ari
 !!! error TS2365: Operator '==' cannot be applied to types 'number' and 'string'.
         n==b;
         ~~~~
-!!! error TS2365: Operator '==' cannot be applied to types 'number' and 'false'.
+!!! error TS2365: Operator '==' cannot be applied to types 'number' and 'boolean'.
         n==i;
         n==n;
         n==e;
@@ -172,7 +172,7 @@ tests/cases/compiler/expr.ts(242,7): error TS2363: The right-hand side of an ari
 !!! error TS2365: Operator '==' cannot be applied to types 'string' and 'number'.
         s==b;
         ~~~~
-!!! error TS2365: Operator '==' cannot be applied to types 'string' and 'false'.
+!!! error TS2365: Operator '==' cannot be applied to types 'string' and 'boolean'.
         s==i;
         s==s;
         s==e;
diff --git a/tests/baselines/reference/for-inStatementsArrayErrors.errors.txt b/tests/baselines/reference/for-inStatementsArrayErrors.errors.txt
index e639d8452de..6886d992bb2 100644
--- a/tests/baselines/reference/for-inStatementsArrayErrors.errors.txt
+++ b/tests/baselines/reference/for-inStatementsArrayErrors.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/conformance/statements/for-inStatements/for-inStatementsArrayErrors.ts(5,14): error TS7015: Element implicitly has an 'any' type because index expression is not of type 'number'.
 tests/cases/conformance/statements/for-inStatements/for-inStatementsArrayErrors.ts(6,16): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-tests/cases/conformance/statements/for-inStatements/for-inStatementsArrayErrors.ts(7,9): error TS2365: Operator '===' cannot be applied to types 'string' and '1'.
+tests/cases/conformance/statements/for-inStatements/for-inStatementsArrayErrors.ts(7,9): error TS2365: Operator '===' cannot be applied to types 'string' and 'number'.
 tests/cases/conformance/statements/for-inStatements/for-inStatementsArrayErrors.ts(9,16): error TS2339: Property 'unknownProperty' does not exist on type 'string'.
 tests/cases/conformance/statements/for-inStatements/for-inStatementsArrayErrors.ts(13,10): error TS2403: Subsequent variable declarations must have the same type.  Variable 'i' must be of type 'number', but here has type 'string'.
 tests/cases/conformance/statements/for-inStatements/for-inStatementsArrayErrors.ts(17,10): error TS2403: Subsequent variable declarations must have the same type.  Variable 'j' must be of type 'any', but here has type 'string'.
@@ -19,7 +19,7 @@ tests/cases/conformance/statements/for-inStatements/for-inStatementsArrayErrors.
 !!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
         if (x === 1) {
             ~~~~~~~
-!!! error TS2365: Operator '===' cannot be applied to types 'string' and '1'.
+!!! error TS2365: Operator '===' cannot be applied to types 'string' and 'number'.
         }
         let a3 = x.unknownProperty;
                    ~~~~~~~~~~~~~~~
diff --git a/tests/baselines/reference/stringLiteralsAssertionsInEqualityComparisons02.errors.txt b/tests/baselines/reference/stringLiteralsAssertionsInEqualityComparisons02.errors.txt
index 81adf58dbde..fd92af4e84f 100644
--- a/tests/baselines/reference/stringLiteralsAssertionsInEqualityComparisons02.errors.txt
+++ b/tests/baselines/reference/stringLiteralsAssertionsInEqualityComparisons02.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/types/literal/stringLiteralsAssertionsInEqualityComparisons02.ts(3,9): error TS2365: Operator '===' cannot be applied to types '"foo"' and '"baz"'.
-tests/cases/conformance/types/literal/stringLiteralsAssertionsInEqualityComparisons02.ts(5,9): error TS2365: Operator '==' cannot be applied to types '"foo"' and 'number'.
+tests/cases/conformance/types/literal/stringLiteralsAssertionsInEqualityComparisons02.ts(5,9): error TS2365: Operator '==' cannot be applied to types 'string' and 'number'.
 tests/cases/conformance/types/literal/stringLiteralsAssertionsInEqualityComparisons02.ts(5,19): error TS2352: Type 'string' cannot be converted to type 'number'.
 
 
@@ -12,7 +12,7 @@ tests/cases/conformance/types/literal/stringLiteralsAssertionsInEqualityComparis
     var b = "foo" !== ("bar" as "foo");
     var c = "foo" == (<number>"bar");
             ~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2365: Operator '==' cannot be applied to types '"foo"' and 'number'.
+!!! error TS2365: Operator '==' cannot be applied to types 'string' and 'number'.
                       ~~~~~~~~~~~~~
 !!! error TS2352: Type 'string' cannot be converted to type 'number'.
     var d = "foo" === ("bar" as EnhancedString);
\ No newline at end of file
diff --git a/tests/baselines/reference/switchAssignmentCompat.errors.txt b/tests/baselines/reference/switchAssignmentCompat.errors.txt
index 46c89fa5b52..747a1035b68 100644
--- a/tests/baselines/reference/switchAssignmentCompat.errors.txt
+++ b/tests/baselines/reference/switchAssignmentCompat.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/switchAssignmentCompat.ts(4,10): error TS2678: Type 'typeof Foo' is not comparable to type '0'.
+tests/cases/compiler/switchAssignmentCompat.ts(4,10): error TS2678: Type 'typeof Foo' is not comparable to type 'number'.
 
 
 ==== tests/cases/compiler/switchAssignmentCompat.ts (1 errors) ====
@@ -7,6 +7,6 @@ tests/cases/compiler/switchAssignmentCompat.ts(4,10): error TS2678: Type 'typeof
     switch (0) {
         case Foo: break; // Error expected
              ~~~
-!!! error TS2678: Type 'typeof Foo' is not comparable to type '0'.
+!!! error TS2678: Type 'typeof Foo' is not comparable to type 'number'.
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/switchCaseCircularRefeference.errors.txt b/tests/baselines/reference/switchCaseCircularRefeference.errors.txt
index 9ee571de468..bc576f8e723 100644
--- a/tests/baselines/reference/switchCaseCircularRefeference.errors.txt
+++ b/tests/baselines/reference/switchCaseCircularRefeference.errors.txt
@@ -1,6 +1,5 @@
-tests/cases/compiler/switchCaseCircularRefeference.ts(5,10): error TS2678: Type '{ a: "A"; b: any; } | { a: "C"; e: any; }' is not comparable to type '"A" | "C"'.
-  Type '{ a: "C"; e: any; }' is not comparable to type '"A" | "C"'.
-    Type '{ a: "C"; e: any; }' is not comparable to type '"C"'.
+tests/cases/compiler/switchCaseCircularRefeference.ts(5,10): error TS2678: Type '{ a: "A"; b: any; } | { a: "C"; e: any; }' is not comparable to type 'string'.
+  Type '{ a: "C"; e: any; }' is not comparable to type 'string'.
 
 
 ==== tests/cases/compiler/switchCaseCircularRefeference.ts (1 errors) ====
@@ -10,9 +9,8 @@ tests/cases/compiler/switchCaseCircularRefeference.ts(5,10): error TS2678: Type
         switch (x.a) {
         case x:
              ~
-!!! error TS2678: Type '{ a: "A"; b: any; } | { a: "C"; e: any; }' is not comparable to type '"A" | "C"'.
-!!! error TS2678:   Type '{ a: "C"; e: any; }' is not comparable to type '"A" | "C"'.
-!!! error TS2678:     Type '{ a: "C"; e: any; }' is not comparable to type '"C"'.
+!!! error TS2678: Type '{ a: "A"; b: any; } | { a: "C"; e: any; }' is not comparable to type 'string'.
+!!! error TS2678:   Type '{ a: "C"; e: any; }' is not comparable to type 'string'.
             break;
         }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/switchCasesExpressionTypeMismatch.errors.txt b/tests/baselines/reference/switchCasesExpressionTypeMismatch.errors.txt
index 3ea12e2460f..26d39efef48 100644
--- a/tests/baselines/reference/switchCasesExpressionTypeMismatch.errors.txt
+++ b/tests/baselines/reference/switchCasesExpressionTypeMismatch.errors.txt
@@ -1,25 +1,22 @@
-tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(4,10): error TS2678: Type 'typeof Foo' is not comparable to type '0'.
-tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(5,10): error TS2678: Type '"sss"' is not comparable to type '0'.
-tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(6,10): error TS2678: Type '123' is not comparable to type '0'.
-tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(7,10): error TS2678: Type 'true' is not comparable to type '0'.
+tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(4,10): error TS2678: Type 'typeof Foo' is not comparable to type 'number'.
+tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(5,10): error TS2678: Type 'string' is not comparable to type 'number'.
+tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(7,10): error TS2678: Type 'boolean' is not comparable to type 'number'.
 
 
-==== tests/cases/compiler/switchCasesExpressionTypeMismatch.ts (4 errors) ====
+==== tests/cases/compiler/switchCasesExpressionTypeMismatch.ts (3 errors) ====
     class Foo { }
     
     switch (0) {
         case Foo: break;    // Error
              ~~~
-!!! error TS2678: Type 'typeof Foo' is not comparable to type '0'.
+!!! error TS2678: Type 'typeof Foo' is not comparable to type 'number'.
         case "sss": break;  // Error
              ~~~~~
-!!! error TS2678: Type '"sss"' is not comparable to type '0'.
+!!! error TS2678: Type 'string' is not comparable to type 'number'.
         case 123: break;    // No Error
-             ~~~
-!!! error TS2678: Type '123' is not comparable to type '0'.
         case true: break;   // Error
              ~~~~
-!!! error TS2678: Type 'true' is not comparable to type '0'.
+!!! error TS2678: Type 'boolean' is not comparable to type 'number'.
     }
     
     var s: any = 0;
diff --git a/tests/baselines/reference/symbolType9.errors.txt b/tests/baselines/reference/symbolType9.errors.txt
index 55a766a379e..5506fdc6f9d 100644
--- a/tests/baselines/reference/symbolType9.errors.txt
+++ b/tests/baselines/reference/symbolType9.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/Symbols/symbolType9.ts(3,1): error TS2365: Operator '==' cannot be applied to types 'symbol' and 'true'.
-tests/cases/conformance/es6/Symbols/symbolType9.ts(5,1): error TS2365: Operator '!=' cannot be applied to types '0' and 'symbol'.
-tests/cases/conformance/es6/Symbols/symbolType9.ts(7,1): error TS2365: Operator '===' cannot be applied to types 'symbol' and '1'.
-tests/cases/conformance/es6/Symbols/symbolType9.ts(9,1): error TS2365: Operator '!==' cannot be applied to types 'false' and 'symbol'.
+tests/cases/conformance/es6/Symbols/symbolType9.ts(3,1): error TS2365: Operator '==' cannot be applied to types 'symbol' and 'boolean'.
+tests/cases/conformance/es6/Symbols/symbolType9.ts(5,1): error TS2365: Operator '!=' cannot be applied to types 'number' and 'symbol'.
+tests/cases/conformance/es6/Symbols/symbolType9.ts(7,1): error TS2365: Operator '===' cannot be applied to types 'symbol' and 'number'.
+tests/cases/conformance/es6/Symbols/symbolType9.ts(9,1): error TS2365: Operator '!==' cannot be applied to types 'boolean' and 'symbol'.
 
 
 ==== tests/cases/conformance/es6/Symbols/symbolType9.ts (4 errors) ====
@@ -9,16 +9,16 @@ tests/cases/conformance/es6/Symbols/symbolType9.ts(9,1): error TS2365: Operator
     s == s;
     s == true;
     ~~~~~~~~~
-!!! error TS2365: Operator '==' cannot be applied to types 'symbol' and 'true'.
+!!! error TS2365: Operator '==' cannot be applied to types 'symbol' and 'boolean'.
     s != s;
     0 != s;
     ~~~~~~
-!!! error TS2365: Operator '!=' cannot be applied to types '0' and 'symbol'.
+!!! error TS2365: Operator '!=' cannot be applied to types 'number' and 'symbol'.
     s === s;
     s === 1;
     ~~~~~~~
-!!! error TS2365: Operator '===' cannot be applied to types 'symbol' and '1'.
+!!! error TS2365: Operator '===' cannot be applied to types 'symbol' and 'number'.
     s !== s;
     false !== s;
     ~~~~~~~~~~~
-!!! error TS2365: Operator '!==' cannot be applied to types 'false' and 'symbol'.
\ No newline at end of file
+!!! error TS2365: Operator '!==' cannot be applied to types 'boolean' and 'symbol'.
\ No newline at end of file

From d7f5fc8fcf1c083029588217303324a145c20650 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 1 Nov 2016 09:09:40 -0700
Subject: [PATCH 068/421] Get literal type only once

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 2d05e16ef82..326d84278be 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -16882,7 +16882,8 @@ namespace ts {
             let firstDefaultClause: CaseOrDefaultClause;
             let hasDuplicateDefaultClause = false;
 
-            let expressionType = checkExpression(node.expression);
+            const expressionType = checkExpression(node.expression);
+            const expressionIsLiteral = isLiteralType(expressionType);
             forEach(node.caseBlock.clauses, clause => {
                 // Grammar check for duplicate default clauses, skip if we already report duplicate default clause
                 if (clause.kind === SyntaxKind.DefaultClause && !hasDuplicateDefaultClause) {
@@ -16905,14 +16906,14 @@ namespace ts {
                     // to or from the type of the 'switch' expression.
                     let caseType = checkExpression(caseClause.expression);
                     const caseIsLiteral = isLiteralType(caseType);
-                    const expressionIsLiteral = isLiteralType(expressionType);
+                    let literalExpressionType = expressionType;
                     if (!caseIsLiteral || !expressionIsLiteral) {
                         caseType = caseIsLiteral ? getBaseTypeOfLiteralType(caseType) : caseType;
-                        expressionType = expressionIsLiteral ? getBaseTypeOfLiteralType(expressionType) : expressionType;
+                        literalExpressionType = getBaseTypeOfLiteralType(expressionType);
                     }
-                    if (!isTypeEqualityComparableTo(expressionType, caseType)) {
+                    if (!isTypeEqualityComparableTo(literalExpressionType, caseType)) {
                         // expressionType is not comparable to caseType, try the reversed check and report errors if it fails
-                        checkTypeComparableTo(caseType, expressionType, caseClause.expression, /*headMessage*/ undefined);
+                        checkTypeComparableTo(caseType, literalExpressionType, caseClause.expression, /*headMessage*/ undefined);
                     }
                 }
                 forEach(clause.statements, checkSourceElement);

From 357d58b4f1ea650e8b261a45aef66febaaadc55e Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 1 Nov 2016 09:10:39 -0700
Subject: [PATCH 069/421] Update baselines

---
 ...witchCasesExpressionTypeMismatch.errors.txt | 18 +++++++++++-------
 .../switchCasesExpressionTypeMismatch.js       |  7 ++++---
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/tests/baselines/reference/switchCasesExpressionTypeMismatch.errors.txt b/tests/baselines/reference/switchCasesExpressionTypeMismatch.errors.txt
index 26d39efef48..7a5fd12182e 100644
--- a/tests/baselines/reference/switchCasesExpressionTypeMismatch.errors.txt
+++ b/tests/baselines/reference/switchCasesExpressionTypeMismatch.errors.txt
@@ -1,9 +1,10 @@
 tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(4,10): error TS2678: Type 'typeof Foo' is not comparable to type 'number'.
-tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(5,10): error TS2678: Type 'string' is not comparable to type 'number'.
-tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(7,10): error TS2678: Type 'boolean' is not comparable to type 'number'.
+tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(5,10): error TS2678: Type '"sss"' is not comparable to type '0'.
+tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(6,10): error TS2678: Type '123' is not comparable to type '0'.
+tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(7,10): error TS2678: Type 'true' is not comparable to type '0'.
 
 
-==== tests/cases/compiler/switchCasesExpressionTypeMismatch.ts (3 errors) ====
+==== tests/cases/compiler/switchCasesExpressionTypeMismatch.ts (4 errors) ====
     class Foo { }
     
     switch (0) {
@@ -12,11 +13,13 @@ tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(7,10): error TS2678: T
 !!! error TS2678: Type 'typeof Foo' is not comparable to type 'number'.
         case "sss": break;  // Error
              ~~~~~
-!!! error TS2678: Type 'string' is not comparable to type 'number'.
-        case 123: break;    // No Error
+!!! error TS2678: Type '"sss"' is not comparable to type '0'.
+        case 123: break;    // Error
+             ~~~
+!!! error TS2678: Type '123' is not comparable to type '0'.
         case true: break;   // Error
              ~~~~
-!!! error TS2678: Type 'boolean' is not comparable to type 'number'.
+!!! error TS2678: Type 'true' is not comparable to type '0'.
     }
     
     var s: any = 0;
@@ -27,4 +30,5 @@ tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(7,10): error TS2678: T
         case "sss": break;
         case 123: break;
         case true: break;
-    }
\ No newline at end of file
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/switchCasesExpressionTypeMismatch.js b/tests/baselines/reference/switchCasesExpressionTypeMismatch.js
index ba929691d25..43a43224579 100644
--- a/tests/baselines/reference/switchCasesExpressionTypeMismatch.js
+++ b/tests/baselines/reference/switchCasesExpressionTypeMismatch.js
@@ -4,7 +4,7 @@ class Foo { }
 switch (0) {
     case Foo: break;    // Error
     case "sss": break;  // Error
-    case 123: break;    // No Error
+    case 123: break;    // Error
     case true: break;   // Error
 }
 
@@ -16,7 +16,8 @@ switch (s) {
     case "sss": break;
     case 123: break;
     case true: break;
-}
+}
+
 
 //// [switchCasesExpressionTypeMismatch.js]
 var Foo = (function () {
@@ -27,7 +28,7 @@ var Foo = (function () {
 switch (0) {
     case Foo: break; // Error
     case "sss": break; // Error
-    case 123: break; // No Error
+    case 123: break; // Error
     case true: break; // Error
 }
 var s = 0;

From d58a13f6a1c8020e9ab8d88355300e1eb81b5134 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 1 Nov 2016 10:07:30 -0700
Subject: [PATCH 070/421] Add missed test update

---
 tests/cases/compiler/switchCasesExpressionTypeMismatch.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/cases/compiler/switchCasesExpressionTypeMismatch.ts b/tests/cases/compiler/switchCasesExpressionTypeMismatch.ts
index 4de01ebba17..ee547705b84 100644
--- a/tests/cases/compiler/switchCasesExpressionTypeMismatch.ts
+++ b/tests/cases/compiler/switchCasesExpressionTypeMismatch.ts
@@ -3,7 +3,7 @@ class Foo { }
 switch (0) {
     case Foo: break;    // Error
     case "sss": break;  // Error
-    case 123: break;    // No Error
+    case 123: break;    // Error
     case true: break;   // Error
 }
 
@@ -15,4 +15,4 @@ switch (s) {
     case "sss": break;
     case 123: break;
     case true: break;
-}
\ No newline at end of file
+}

From d896d3f8a91d19814c35103244a9e17e01cafe87 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Tue, 1 Nov 2016 11:05:09 -0700
Subject: [PATCH 071/421] Add test cases to report errors for decorators in js
 file

---
 src/compiler/program.ts                            |  6 ++++++
 src/compiler/utilities.ts                          |  4 ++++
 .../baselines/reference/decoratorInJsFile.symbols  | 12 ++++++++++++
 tests/baselines/reference/decoratorInJsFile.types  | 14 ++++++++++++++
 .../reference/decoratorInJsFile1.errors.txt        | 13 +++++++++++++
 tests/cases/compiler/decoratorInJsFile.ts          | 12 ++++++++++++
 tests/cases/compiler/decoratorInJsFile1.ts         | 10 ++++++++++
 7 files changed, 71 insertions(+)
 create mode 100644 tests/baselines/reference/decoratorInJsFile.symbols
 create mode 100644 tests/baselines/reference/decoratorInJsFile.types
 create mode 100644 tests/baselines/reference/decoratorInJsFile1.errors.txt
 create mode 100644 tests/cases/compiler/decoratorInJsFile.ts
 create mode 100644 tests/cases/compiler/decoratorInJsFile1.ts

diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 726df380e81..1eeeded5d36 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -943,6 +943,12 @@ namespace ts {
 
                     return false;
                 }
+
+                // Since these are syntactic diagnostics, parent might not have been set
+                // this means the sourceFile cannot be infered from the node
+                function createDiagnosticForNode(node: Node, message: DiagnosticMessage, arg0?: string | number, arg1?: string | number, arg2?: string | number): Diagnostic {
+                    return createDiagnosticForNodeInSourceFile(sourceFile, node, message, arg0, arg1, arg2);
+                }
             });
         }
 
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index d78418e1976..84c27f6397b 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -498,6 +498,10 @@ namespace ts {
 
     export function createDiagnosticForNode(node: Node, message: DiagnosticMessage, arg0?: string | number, arg1?: string | number, arg2?: string | number): Diagnostic {
         const sourceFile = getSourceFileOfNode(node);
+        return createDiagnosticForNodeInSourceFile(sourceFile, node, message, arg0, arg1, arg2);
+    }
+
+    export function createDiagnosticForNodeInSourceFile(sourceFile: SourceFile, node: Node, message: DiagnosticMessage, arg0?: string | number, arg1?: string | number, arg2?: string | number): Diagnostic {
         const span = getErrorSpanForNode(sourceFile, node);
         return createFileDiagnostic(sourceFile, span.start, span.length, message, arg0, arg1, arg2);
     }
diff --git a/tests/baselines/reference/decoratorInJsFile.symbols b/tests/baselines/reference/decoratorInJsFile.symbols
new file mode 100644
index 00000000000..1ad477095c1
--- /dev/null
+++ b/tests/baselines/reference/decoratorInJsFile.symbols
@@ -0,0 +1,12 @@
+=== tests/cases/compiler/a.js ===
+
+@SomeDecorator
+class SomeClass {
+>SomeClass : Symbol(SomeClass, Decl(a.js, 0, 0))
+
+    foo(x: number) {
+>foo : Symbol(SomeClass.foo, Decl(a.js, 2, 17))
+>x : Symbol(x, Decl(a.js, 3, 8))
+
+    }
+}
diff --git a/tests/baselines/reference/decoratorInJsFile.types b/tests/baselines/reference/decoratorInJsFile.types
new file mode 100644
index 00000000000..49403979460
--- /dev/null
+++ b/tests/baselines/reference/decoratorInJsFile.types
@@ -0,0 +1,14 @@
+=== tests/cases/compiler/a.js ===
+
+@SomeDecorator
+>SomeDecorator : any
+
+class SomeClass {
+>SomeClass : SomeClass
+
+    foo(x: number) {
+>foo : (x: number) => void
+>x : number
+
+    }
+}
diff --git a/tests/baselines/reference/decoratorInJsFile1.errors.txt b/tests/baselines/reference/decoratorInJsFile1.errors.txt
new file mode 100644
index 00000000000..a90aa922f96
--- /dev/null
+++ b/tests/baselines/reference/decoratorInJsFile1.errors.txt
@@ -0,0 +1,13 @@
+tests/cases/compiler/a.js(2,1): error TS1219: Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option to remove this warning.
+
+
+==== tests/cases/compiler/a.js (1 errors) ====
+    
+    @SomeDecorator
+    ~~~~~~~~~~~~~~
+!!! error TS1219: Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option to remove this warning.
+    class SomeClass {
+        foo(x: number) {
+    
+        }
+    }
\ No newline at end of file
diff --git a/tests/cases/compiler/decoratorInJsFile.ts b/tests/cases/compiler/decoratorInJsFile.ts
new file mode 100644
index 00000000000..611be319209
--- /dev/null
+++ b/tests/cases/compiler/decoratorInJsFile.ts
@@ -0,0 +1,12 @@
+// @experimentaldecorators: true
+// @emitdecoratormetadata: true
+// @allowjs: true
+// @noEmit: true
+
+// @filename: a.js
+@SomeDecorator
+class SomeClass {
+    foo(x: number) {
+
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/decoratorInJsFile1.ts b/tests/cases/compiler/decoratorInJsFile1.ts
new file mode 100644
index 00000000000..6bbe38cb835
--- /dev/null
+++ b/tests/cases/compiler/decoratorInJsFile1.ts
@@ -0,0 +1,10 @@
+// @allowjs: true
+// @noEmit: true
+
+// @filename: a.js
+@SomeDecorator
+class SomeClass {
+    foo(x: number) {
+
+    }
+}
\ No newline at end of file

From 06331b57de68c603ad7d9e7cc793b48fd58a3440 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Tue, 1 Nov 2016 12:54:27 -0700
Subject: [PATCH 072/421] Report all the js file errors and skip only the nodes
 that are not allowed in js Fixes #11800

---
 src/compiler/program.ts                       | 269 +++++++++---------
 .../reference/decoratorInJsFile.errors.txt    |  13 +
 .../reference/decoratorInJsFile.symbols       |  12 -
 .../reference/decoratorInJsFile.types         |  14 -
 .../reference/decoratorInJsFile1.errors.txt   |  11 +-
 .../getJavaScriptSyntacticDiagnostics02.ts    |   7 +
 6 files changed, 158 insertions(+), 168 deletions(-)
 create mode 100644 tests/baselines/reference/decoratorInJsFile.errors.txt
 delete mode 100644 tests/baselines/reference/decoratorInJsFile.symbols
 delete mode 100644 tests/baselines/reference/decoratorInJsFile.types

diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 1eeeded5d36..06476d29fbe 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -773,48 +773,24 @@ namespace ts {
         function getJavaScriptSyntacticDiagnosticsForFile(sourceFile: SourceFile): Diagnostic[] {
             return runWithCancellationToken(() => {
                 const diagnostics: Diagnostic[] = [];
+                let parent: Node = sourceFile;
                 walk(sourceFile);
 
                 return diagnostics;
 
-                function walk(node: Node): boolean {
-                    if (!node) {
-                        return false;
-                    }
+                function walk(node: Node) {
+                    // Return directly from the case if the given node doesnt want to visit each child
+                    // Otherwise break to visit each child
 
-                    switch (node.kind) {
-                        case SyntaxKind.ImportEqualsDeclaration:
-                            diagnostics.push(createDiagnosticForNode(node, Diagnostics.import_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case SyntaxKind.ExportAssignment:
-                            if ((<ExportAssignment>node).isExportEquals) {
-                                diagnostics.push(createDiagnosticForNode(node, Diagnostics.export_can_only_be_used_in_a_ts_file));
-                                return true;
+                    switch (parent.kind) {
+                        case SyntaxKind.Parameter:
+                        case SyntaxKind.PropertyDeclaration:
+                            if ((<ParameterDeclaration | PropertyDeclaration>parent).questionToken === node) {
+                                diagnostics.push(createDiagnosticForNode(node, Diagnostics._0_can_only_be_used_in_a_ts_file, "?"));
+                                return;
                             }
-                            break;
-                        case SyntaxKind.ClassDeclaration:
-                            let classDeclaration = <ClassDeclaration>node;
-                            if (checkModifiers(classDeclaration.modifiers) ||
-                                checkTypeParameters(classDeclaration.typeParameters)) {
-                                return true;
-                            }
-                            break;
-                        case SyntaxKind.HeritageClause:
-                            let heritageClause = <HeritageClause>node;
-                            if (heritageClause.token === SyntaxKind.ImplementsKeyword) {
-                                diagnostics.push(createDiagnosticForNode(node, Diagnostics.implements_clauses_can_only_be_used_in_a_ts_file));
-                                return true;
-                            }
-                            break;
-                        case SyntaxKind.InterfaceDeclaration:
-                            diagnostics.push(createDiagnosticForNode(node, Diagnostics.interface_declarations_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case SyntaxKind.ModuleDeclaration:
-                            diagnostics.push(createDiagnosticForNode(node, Diagnostics.module_declarations_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case SyntaxKind.TypeAliasDeclaration:
-                            diagnostics.push(createDiagnosticForNode(node, Diagnostics.type_aliases_can_only_be_used_in_a_ts_file));
-                            return true;
+
+                        // Pass through
                         case SyntaxKind.MethodDeclaration:
                         case SyntaxKind.MethodSignature:
                         case SyntaxKind.Constructor:
@@ -824,124 +800,141 @@ namespace ts {
                         case SyntaxKind.FunctionDeclaration:
                         case SyntaxKind.ArrowFunction:
                         case SyntaxKind.FunctionDeclaration:
-                            const functionDeclaration = <FunctionLikeDeclaration>node;
-                            if (checkModifiers(functionDeclaration.modifiers) ||
-                                checkTypeParameters(functionDeclaration.typeParameters) ||
-                                checkTypeAnnotation(functionDeclaration.type)) {
-                                return true;
-                            }
-                            break;
-                        case SyntaxKind.VariableStatement:
-                            const variableStatement = <VariableStatement>node;
-                            if (checkModifiers(variableStatement.modifiers)) {
-                                return true;
-                            }
-                            break;
                         case SyntaxKind.VariableDeclaration:
-                            const variableDeclaration = <VariableDeclaration>node;
-                            if (checkTypeAnnotation(variableDeclaration.type)) {
-                                return true;
+                            // type annotation
+                            if ((<FunctionLikeDeclaration | VariableDeclaration | ParameterDeclaration | PropertyDeclaration>parent).type === node) {
+                                diagnostics.push(createDiagnosticForNode(node, Diagnostics.types_can_only_be_used_in_a_ts_file));
+                                return;
+                            }
+                    }
+
+                    switch (node.kind) {
+                        case SyntaxKind.ImportEqualsDeclaration:
+                            diagnostics.push(createDiagnosticForNode(node, Diagnostics.import_can_only_be_used_in_a_ts_file));
+                            return;
+                        case SyntaxKind.ExportAssignment:
+                            if ((<ExportAssignment>node).isExportEquals) {
+                                diagnostics.push(createDiagnosticForNode(node, Diagnostics.export_can_only_be_used_in_a_ts_file));
+                                return;
+                            }
+                            break;
+                        case SyntaxKind.HeritageClause:
+                            let heritageClause = <HeritageClause>node;
+                            if (heritageClause.token === SyntaxKind.ImplementsKeyword) {
+                                diagnostics.push(createDiagnosticForNode(node, Diagnostics.implements_clauses_can_only_be_used_in_a_ts_file));
+                                return;
+                            }
+                            break;
+                        case SyntaxKind.InterfaceDeclaration:
+                            diagnostics.push(createDiagnosticForNode(node, Diagnostics.interface_declarations_can_only_be_used_in_a_ts_file));
+                            return;
+                        case SyntaxKind.ModuleDeclaration:
+                            diagnostics.push(createDiagnosticForNode(node, Diagnostics.module_declarations_can_only_be_used_in_a_ts_file));
+                            return;
+                        case SyntaxKind.TypeAliasDeclaration:
+                            diagnostics.push(createDiagnosticForNode(node, Diagnostics.type_aliases_can_only_be_used_in_a_ts_file));
+                            return;
+                        case SyntaxKind.EnumDeclaration:
+                            diagnostics.push(createDiagnosticForNode(node, Diagnostics.enum_declarations_can_only_be_used_in_a_ts_file));
+                            return;
+                        case SyntaxKind.TypeAssertionExpression:
+                            let typeAssertionExpression = <TypeAssertion>node;
+                            diagnostics.push(createDiagnosticForNode(typeAssertionExpression.type, Diagnostics.type_assertion_expressions_can_only_be_used_in_a_ts_file));
+                            return;
+                    }
+
+                    const prevParent = parent;
+                    parent = node;
+                    forEachChild(node, walk, walkArray);
+                    parent = prevParent;
+                }
+
+                function walkArray(nodes: NodeArray<Node>) {
+                    if (parent.decorators === nodes && !options.experimentalDecorators) {
+                        diagnostics.push(createDiagnosticForNode(parent, 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));
+                    }
+
+                    switch (parent.kind) {
+                        case SyntaxKind.ClassDeclaration:
+                        case SyntaxKind.MethodDeclaration:
+                        case SyntaxKind.MethodSignature:
+                        case SyntaxKind.Constructor:
+                        case SyntaxKind.GetAccessor:
+                        case SyntaxKind.SetAccessor:
+                        case SyntaxKind.FunctionExpression:
+                        case SyntaxKind.FunctionDeclaration:
+                        case SyntaxKind.ArrowFunction:
+                        case SyntaxKind.FunctionDeclaration:
+                            // Check type parameters
+                            if (nodes === (<ClassDeclaration | FunctionLikeDeclaration>parent).typeParameters) {
+                                diagnostics.push(createDiagnosticForNodeArray(nodes, Diagnostics.type_parameter_declarations_can_only_be_used_in_a_ts_file));
+                                return;
+                            }
+                        // pass through
+                        case SyntaxKind.VariableStatement:
+                            // Check modifiers
+                            if (nodes === (<ClassDeclaration | FunctionLikeDeclaration | VariableStatement>parent).modifiers) {
+                                return checkModifiers(<NodeArray<Modifier>>nodes);
+                            }
+                            break;
+                        case SyntaxKind.PropertyDeclaration:
+                            // Check modifiers of property declaration
+                            if (nodes === (<PropertyDeclaration>parent).modifiers) {
+                                for (const modifier of <NodeArray<Modifier>>nodes) {
+                                    if (modifier.kind !== SyntaxKind.StaticKeyword) {
+                                        diagnostics.push(createDiagnosticForNode(modifier, Diagnostics._0_can_only_be_used_in_a_ts_file, tokenToString(modifier.kind)));
+                                    }
+                                }
+                                return;
+                            }
+                            break;
+                        case SyntaxKind.Parameter:
+                            // Check modifiers of parameter declaration
+                            if (nodes === (<ParameterDeclaration>parent).modifiers) {
+                                diagnostics.push(createDiagnosticForNodeArray(nodes, Diagnostics.parameter_modifiers_can_only_be_used_in_a_ts_file));
+                                return;
                             }
                             break;
                         case SyntaxKind.CallExpression:
                         case SyntaxKind.NewExpression:
-                            const expression = <CallExpression>node;
-                            if (expression.typeArguments && expression.typeArguments.length > 0) {
-                                const start = expression.typeArguments.pos;
-                                diagnostics.push(createFileDiagnostic(sourceFile, start, expression.typeArguments.end - start,
-                                    Diagnostics.type_arguments_can_only_be_used_in_a_ts_file));
-                                return true;
+                        case SyntaxKind.ExpressionWithTypeArguments:
+                            // Check type arguments
+                            if (nodes === (<CallExpression | NewExpression | ExpressionWithTypeArguments>parent).typeArguments) {
+                                diagnostics.push(createDiagnosticForNodeArray(nodes, Diagnostics.type_arguments_can_only_be_used_in_a_ts_file));
+                                return;
                             }
                             break;
-                        case SyntaxKind.Parameter:
-                            const parameter = <ParameterDeclaration>node;
-                            if (parameter.modifiers) {
-                                const start = parameter.modifiers.pos;
-                                diagnostics.push(createFileDiagnostic(sourceFile, start, parameter.modifiers.end - start,
-                                    Diagnostics.parameter_modifiers_can_only_be_used_in_a_ts_file));
-                                return true;
-                            }
-                            if (parameter.questionToken) {
-                                diagnostics.push(createDiagnosticForNode(parameter.questionToken, Diagnostics._0_can_only_be_used_in_a_ts_file, "?"));
-                                return true;
-                            }
-                            if (parameter.type) {
-                                diagnostics.push(createDiagnosticForNode(parameter.type, Diagnostics.types_can_only_be_used_in_a_ts_file));
-                                return true;
-                            }
-                            break;
-                        case SyntaxKind.PropertyDeclaration:
-                            const propertyDeclaration = <PropertyDeclaration>node;
-                            if (propertyDeclaration.modifiers) {
-                                for (const modifier of propertyDeclaration.modifiers) {
-                                    if (modifier.kind !== SyntaxKind.StaticKeyword) {
-                                        diagnostics.push(createDiagnosticForNode(modifier, Diagnostics._0_can_only_be_used_in_a_ts_file, tokenToString(modifier.kind)));
-                                        return true;
-                                    }
-                                }
-                            }
-                            if (checkTypeAnnotation((<PropertyDeclaration>node).type)) {
-                                return true;
-                            }
-                            break;
-                        case SyntaxKind.EnumDeclaration:
-                            diagnostics.push(createDiagnosticForNode(node, Diagnostics.enum_declarations_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case SyntaxKind.TypeAssertionExpression:
-                            let typeAssertionExpression = <TypeAssertion>node;
-                            diagnostics.push(createDiagnosticForNode(typeAssertionExpression.type, Diagnostics.type_assertion_expressions_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case SyntaxKind.Decorator:
-                            if (!options.experimentalDecorators) {
-                                diagnostics.push(createDiagnosticForNode(node, 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));
-                            }
-                            return true;
                     }
 
-                    return forEachChild(node, walk);
-                }
-
-                function checkTypeParameters(typeParameters: NodeArray<TypeParameterDeclaration>): boolean {
-                    if (typeParameters) {
-                        const start = typeParameters.pos;
-                        diagnostics.push(createFileDiagnostic(sourceFile, start, typeParameters.end - start, Diagnostics.type_parameter_declarations_can_only_be_used_in_a_ts_file));
-                        return true;
+                    for (const node of nodes) {
+                        walk(node);
                     }
-                    return false;
                 }
 
-                function checkTypeAnnotation(type: TypeNode): boolean {
-                    if (type) {
-                        diagnostics.push(createDiagnosticForNode(type, Diagnostics.types_can_only_be_used_in_a_ts_file));
-                        return true;
-                    }
+                function checkModifiers(modifiers: NodeArray<Modifier>) {
+                    for (const modifier of modifiers) {
+                        switch (modifier.kind) {
+                            case SyntaxKind.PublicKeyword:
+                            case SyntaxKind.PrivateKeyword:
+                            case SyntaxKind.ProtectedKeyword:
+                            case SyntaxKind.ReadonlyKeyword:
+                            case SyntaxKind.DeclareKeyword:
+                                diagnostics.push(createDiagnosticForNode(modifier, Diagnostics._0_can_only_be_used_in_a_ts_file, tokenToString(modifier.kind)));
+                                break;
 
-                    return false;
-                }
-
-                function checkModifiers(modifiers: NodeArray<Modifier>): boolean {
-                    if (modifiers) {
-                        for (const modifier of modifiers) {
-                            switch (modifier.kind) {
-                                case SyntaxKind.PublicKeyword:
-                                case SyntaxKind.PrivateKeyword:
-                                case SyntaxKind.ProtectedKeyword:
-                                case SyntaxKind.ReadonlyKeyword:
-                                case SyntaxKind.DeclareKeyword:
-                                    diagnostics.push(createDiagnosticForNode(modifier, Diagnostics._0_can_only_be_used_in_a_ts_file, tokenToString(modifier.kind)));
-                                    return true;
-
-                                // These are all legal modifiers.
-                                case SyntaxKind.StaticKeyword:
-                                case SyntaxKind.ExportKeyword:
-                                case SyntaxKind.ConstKeyword:
-                                case SyntaxKind.DefaultKeyword:
-                                case SyntaxKind.AbstractKeyword:
-                            }
+                            // These are all legal modifiers.
+                            case SyntaxKind.StaticKeyword:
+                            case SyntaxKind.ExportKeyword:
+                            case SyntaxKind.ConstKeyword:
+                            case SyntaxKind.DefaultKeyword:
+                            case SyntaxKind.AbstractKeyword:
                         }
                     }
+                }
 
-                    return false;
+                function createDiagnosticForNodeArray(nodes: NodeArray<Node>, message: DiagnosticMessage, arg0?: string | number, arg1?: string | number, arg2?: string | number): Diagnostic {
+                    const start = nodes.pos;
+                    return createFileDiagnostic(sourceFile, start, nodes.end - start, message, arg0, arg1, arg2);
                 }
 
                 // Since these are syntactic diagnostics, parent might not have been set
diff --git a/tests/baselines/reference/decoratorInJsFile.errors.txt b/tests/baselines/reference/decoratorInJsFile.errors.txt
new file mode 100644
index 00000000000..93bd5143b74
--- /dev/null
+++ b/tests/baselines/reference/decoratorInJsFile.errors.txt
@@ -0,0 +1,13 @@
+tests/cases/compiler/a.js(4,12): error TS8010: 'types' can only be used in a .ts file.
+
+
+==== tests/cases/compiler/a.js (1 errors) ====
+    
+    @SomeDecorator
+    class SomeClass {
+        foo(x: number) {
+               ~~~~~~
+!!! error TS8010: 'types' can only be used in a .ts file.
+    
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorInJsFile.symbols b/tests/baselines/reference/decoratorInJsFile.symbols
deleted file mode 100644
index 1ad477095c1..00000000000
--- a/tests/baselines/reference/decoratorInJsFile.symbols
+++ /dev/null
@@ -1,12 +0,0 @@
-=== tests/cases/compiler/a.js ===
-
-@SomeDecorator
-class SomeClass {
->SomeClass : Symbol(SomeClass, Decl(a.js, 0, 0))
-
-    foo(x: number) {
->foo : Symbol(SomeClass.foo, Decl(a.js, 2, 17))
->x : Symbol(x, Decl(a.js, 3, 8))
-
-    }
-}
diff --git a/tests/baselines/reference/decoratorInJsFile.types b/tests/baselines/reference/decoratorInJsFile.types
deleted file mode 100644
index 49403979460..00000000000
--- a/tests/baselines/reference/decoratorInJsFile.types
+++ /dev/null
@@ -1,14 +0,0 @@
-=== tests/cases/compiler/a.js ===
-
-@SomeDecorator
->SomeDecorator : any
-
-class SomeClass {
->SomeClass : SomeClass
-
-    foo(x: number) {
->foo : (x: number) => void
->x : number
-
-    }
-}
diff --git a/tests/baselines/reference/decoratorInJsFile1.errors.txt b/tests/baselines/reference/decoratorInJsFile1.errors.txt
index a90aa922f96..f4422c0c2d9 100644
--- a/tests/baselines/reference/decoratorInJsFile1.errors.txt
+++ b/tests/baselines/reference/decoratorInJsFile1.errors.txt
@@ -1,13 +1,16 @@
-tests/cases/compiler/a.js(2,1): error TS1219: Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option to remove this warning.
+tests/cases/compiler/a.js(3,7): error TS1219: Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option to remove this warning.
+tests/cases/compiler/a.js(4,12): error TS8010: 'types' can only be used in a .ts file.
 
 
-==== tests/cases/compiler/a.js (1 errors) ====
+==== tests/cases/compiler/a.js (2 errors) ====
     
     @SomeDecorator
-    ~~~~~~~~~~~~~~
-!!! error TS1219: Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option to remove this warning.
     class SomeClass {
+          ~~~~~~~~~
+!!! error TS1219: Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option to remove this warning.
         foo(x: number) {
+               ~~~~~~
+!!! error TS8010: 'types' can only be used in a .ts file.
     
         }
     }
\ No newline at end of file
diff --git a/tests/cases/fourslash/server/getJavaScriptSyntacticDiagnostics02.ts b/tests/cases/fourslash/server/getJavaScriptSyntacticDiagnostics02.ts
index dd9becad10b..a19d170217c 100644
--- a/tests/cases/fourslash/server/getJavaScriptSyntacticDiagnostics02.ts
+++ b/tests/cases/fourslash/server/getJavaScriptSyntacticDiagnostics02.ts
@@ -15,6 +15,13 @@ verify.getSyntacticDiagnostics(`[
     "category": "error",
     "code": 8010
   },
+  {
+    "message": "\'types\' can only be used in a .ts file.",
+    "start": 52,
+    "length": 6,
+    "category": "error",
+    "code": 8010
+  },
   {
     "message": "Variable declaration expected.",
     "start": 67,

From b59714ea7e808c4afe82e7fba38d77a893d1ea02 Mon Sep 17 00:00:00 2001
From: Paul van Brenk <paul.van.brenk@microsoft.com>
Date: Tue, 1 Nov 2016 16:31:23 -0700
Subject: [PATCH 073/421] Add more testcases and simplify

---
 .../codefixes/unusedIdentifierFixes.ts        | 14 +++++-----
 .../fourslash/unusedClassInNamespace3.ts      | 19 ++++++++++---
 .../fourslash/unusedClassInNamespace4.ts      | 12 +++++++--
 .../fourslash/unusedClassInNamespace5.ts      | 26 ------------------
 .../fourslash/unusedClassInNamespace6.ts      | 27 -------------------
 .../cases/fourslash/unusedEnumInNamespace1.ts | 11 ++++++++
 .../fourslash/unusedTypeAliasInNamespace1.ts  | 11 ++++++++
 7 files changed, 54 insertions(+), 66 deletions(-)
 delete mode 100644 tests/cases/fourslash/unusedClassInNamespace5.ts
 delete mode 100644 tests/cases/fourslash/unusedClassInNamespace6.ts
 create mode 100644 tests/cases/fourslash/unusedEnumInNamespace1.ts
 create mode 100644 tests/cases/fourslash/unusedTypeAliasInNamespace1.ts

diff --git a/src/services/codefixes/unusedIdentifierFixes.ts b/src/services/codefixes/unusedIdentifierFixes.ts
index bb3664b974e..1f6dcb5535f 100644
--- a/src/services/codefixes/unusedIdentifierFixes.ts
+++ b/src/services/codefixes/unusedIdentifierFixes.ts
@@ -54,14 +54,6 @@ namespace ts.codefix {
                                     }
                             }
 
-                        case SyntaxKind.FunctionDeclaration:
-                        case SyntaxKind.ClassDeclaration:
-                        case SyntaxKind.InterfaceDeclaration:
-                        case SyntaxKind.MethodDeclaration:
-                        case SyntaxKind.ModuleDeclaration:
-                        case SyntaxKind.PropertyDeclaration:
-                            return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
-
                         case SyntaxKind.TypeParameter:
                             const typeParameters = (<DeclarationWithTypeParameters>token.parent.parent).typeParameters;
                             if (typeParameters.length === 1) {
@@ -105,6 +97,12 @@ namespace ts.codefix {
 
                         case SyntaxKind.EnumDeclaration:
                             return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
+
+                        default:
+                            if (isDeclarationName(token)) {
+                                return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
+                            }
+                            break;
                     }
                     break;
 
diff --git a/tests/cases/fourslash/unusedClassInNamespace3.ts b/tests/cases/fourslash/unusedClassInNamespace3.ts
index 6102f744717..391c5e833ef 100644
--- a/tests/cases/fourslash/unusedClassInNamespace3.ts
+++ b/tests/cases/fourslash/unusedClassInNamespace3.ts
@@ -5,8 +5,21 @@
 //// [| namespace Validation {
 ////    class c1 {
 ////
-////   }/*1*/
-//// } |]
+////    }
+////
+////    export class c2 {
+////
+////    }
+////
+////    class c3 extends c1 {
+////
+////    }
+////} |]
 
 verify.codeFixAtPosition(`namespace Validation {
-}`);
\ No newline at end of file
+    class c1 {
+    }
+
+    export class c2 {
+    }
+}`);
diff --git a/tests/cases/fourslash/unusedClassInNamespace4.ts b/tests/cases/fourslash/unusedClassInNamespace4.ts
index 79701a5e0e2..5db5b1aefa6 100644
--- a/tests/cases/fourslash/unusedClassInNamespace4.ts
+++ b/tests/cases/fourslash/unusedClassInNamespace4.ts
@@ -2,7 +2,6 @@
 
 // @noUnusedLocals: true
 // @noUnusedParameters:true
-
 //// [| namespace Validation {
 ////    class c1 {
 ////
@@ -11,9 +10,18 @@
 ////    export class c2 {
 ////
 ////    }
-//// } |]
+////
+////    class c3 {
+////        public x: c1;
+////    }
+////} |]
 
 verify.codeFixAtPosition(`namespace Validation {
+    class c1 {
+
+    }
+
     export class c2 {
+
     }
 }`);
diff --git a/tests/cases/fourslash/unusedClassInNamespace5.ts b/tests/cases/fourslash/unusedClassInNamespace5.ts
deleted file mode 100644
index 80d8fe857bd..00000000000
--- a/tests/cases/fourslash/unusedClassInNamespace5.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-// @noUnusedLocals: true
-// @noUnusedParameters:true
-
-//// [| namespace Validation {
-////    class c1 {
-////
-////    }
-////
-////    export class c2 {
-////
-////    }
-////
-////    class c3 extends c1 {
-////
-////    }
-////} |]
-
-verify.codeFixAtPosition(`namespace Validation {
-    class c1 {
-    }
-
-    export class c2 {
-    }
-}`);
diff --git a/tests/cases/fourslash/unusedClassInNamespace6.ts b/tests/cases/fourslash/unusedClassInNamespace6.ts
deleted file mode 100644
index 5db5b1aefa6..00000000000
--- a/tests/cases/fourslash/unusedClassInNamespace6.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-// @noUnusedLocals: true
-// @noUnusedParameters:true
-//// [| namespace Validation {
-////    class c1 {
-////
-////    }
-////
-////    export class c2 {
-////
-////    }
-////
-////    class c3 {
-////        public x: c1;
-////    }
-////} |]
-
-verify.codeFixAtPosition(`namespace Validation {
-    class c1 {
-
-    }
-
-    export class c2 {
-
-    }
-}`);
diff --git a/tests/cases/fourslash/unusedEnumInNamespace1.ts b/tests/cases/fourslash/unusedEnumInNamespace1.ts
new file mode 100644
index 00000000000..88e8e32d5f8
--- /dev/null
+++ b/tests/cases/fourslash/unusedEnumInNamespace1.ts
@@ -0,0 +1,11 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// [| namespace greeter {
+////   enum enum1 {
+////       Monday
+////   }
+//// } |]
+
+verify.codeFixAtPosition(`namespace greeter {
+}`);
diff --git a/tests/cases/fourslash/unusedTypeAliasInNamespace1.ts b/tests/cases/fourslash/unusedTypeAliasInNamespace1.ts
new file mode 100644
index 00000000000..593c0fe8cf4
--- /dev/null
+++ b/tests/cases/fourslash/unusedTypeAliasInNamespace1.ts
@@ -0,0 +1,11 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// [| namespace greeter {
+////         type hw = "Hello" |"world";
+////         export type nw = "No" | "Way"; 
+//// } |]
+
+verify.codeFixAtPosition(`namespace greeter {
+    export type nw = "No" | "Way";
+}`);

From 71960187cdea4901b1ffa95afb0015d183f4badb Mon Sep 17 00:00:00 2001
From: Paul van Brenk <paul.van.brenk@microsoft.com>
Date: Tue, 1 Nov 2016 16:39:29 -0700
Subject: [PATCH 074/421] Removed unused, confusing cases

---
 src/services/codefixes/unusedIdentifierFixes.ts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/services/codefixes/unusedIdentifierFixes.ts b/src/services/codefixes/unusedIdentifierFixes.ts
index 1f6dcb5535f..1e8220d4b7a 100644
--- a/src/services/codefixes/unusedIdentifierFixes.ts
+++ b/src/services/codefixes/unusedIdentifierFixes.ts
@@ -95,9 +95,6 @@ namespace ts.codefix {
                         case SyntaxKind.NamespaceImport:
                             return createCodeFix("", token.parent.parent.parent.pos, token.parent.parent.parent.end - token.parent.parent.parent.pos);
 
-                        case SyntaxKind.EnumDeclaration:
-                            return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
-
                         default:
                             if (isDeclarationName(token)) {
                                 return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
@@ -106,11 +103,9 @@ namespace ts.codefix {
                     }
                     break;
 
-                case SyntaxKind.PrivateKeyword:
                 case SyntaxKind.PropertyDeclaration:
                     return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
 
-                case SyntaxKind.AsteriskToken:
                 case SyntaxKind.NamespaceImport:
                     return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
             }

From 116c87819a737c9c31d97989d1982444e2885727 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Wed, 2 Nov 2016 11:07:33 -0700
Subject: [PATCH 075/421] Test case for property used in destructuring variable
 declaration

---
 .../reference/unusedLocalProperty.errors.txt  | 18 +++++++++++++
 .../reference/unusedLocalProperty.js          | 25 +++++++++++++++++++
 tests/cases/compiler/unusedLocalProperty.ts   | 12 +++++++++
 3 files changed, 55 insertions(+)
 create mode 100644 tests/baselines/reference/unusedLocalProperty.errors.txt
 create mode 100644 tests/baselines/reference/unusedLocalProperty.js
 create mode 100644 tests/cases/compiler/unusedLocalProperty.ts

diff --git a/tests/baselines/reference/unusedLocalProperty.errors.txt b/tests/baselines/reference/unusedLocalProperty.errors.txt
new file mode 100644
index 00000000000..c9a4b3cb6d9
--- /dev/null
+++ b/tests/baselines/reference/unusedLocalProperty.errors.txt
@@ -0,0 +1,18 @@
+tests/cases/compiler/unusedLocalProperty.ts(3,25): error TS6138: Property 'species' is declared but never used.
+
+
+==== tests/cases/compiler/unusedLocalProperty.ts (1 errors) ====
+    declare var console: { log(msg: any): void; }
+    class Animal {
+        constructor(private species: string) {
+                            ~~~~~~~
+!!! error TS6138: Property 'species' is declared but never used.
+        }
+    
+        printSpecies() {
+            let { species } = this;
+            console.log(species);
+        }
+    }
+    
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unusedLocalProperty.js b/tests/baselines/reference/unusedLocalProperty.js
new file mode 100644
index 00000000000..a124b752125
--- /dev/null
+++ b/tests/baselines/reference/unusedLocalProperty.js
@@ -0,0 +1,25 @@
+//// [unusedLocalProperty.ts]
+declare var console: { log(msg: any): void; }
+class Animal {
+    constructor(private species: string) {
+    }
+
+    printSpecies() {
+        let { species } = this;
+        console.log(species);
+    }
+}
+
+
+
+//// [unusedLocalProperty.js]
+var Animal = (function () {
+    function Animal(species) {
+        this.species = species;
+    }
+    Animal.prototype.printSpecies = function () {
+        var species = this.species;
+        console.log(species);
+    };
+    return Animal;
+}());
diff --git a/tests/cases/compiler/unusedLocalProperty.ts b/tests/cases/compiler/unusedLocalProperty.ts
new file mode 100644
index 00000000000..fdd33116135
--- /dev/null
+++ b/tests/cases/compiler/unusedLocalProperty.ts
@@ -0,0 +1,12 @@
+//@noUnusedLocals:true
+declare var console: { log(msg: any): void; }
+class Animal {
+    constructor(private species: string) {
+    }
+
+    printSpecies() {
+        let { species } = this;
+        console.log(species);
+    }
+}
+

From 13e8f7fadaa702bc871e98edc592c11a3d2c439a Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Wed, 2 Nov 2016 11:08:34 -0700
Subject: [PATCH 076/421] Mark property referenced in the destructuring as
 referenced Fixes #11324

---
 src/compiler/checker.ts                       | 28 ++++++++++-------
 .../reference/unusedLocalProperty.errors.txt  | 18 -----------
 .../reference/unusedLocalProperty.symbols     | 29 ++++++++++++++++++
 .../reference/unusedLocalProperty.types       | 30 +++++++++++++++++++
 4 files changed, 76 insertions(+), 29 deletions(-)
 delete mode 100644 tests/baselines/reference/unusedLocalProperty.errors.txt
 create mode 100644 tests/baselines/reference/unusedLocalProperty.symbols
 create mode 100644 tests/baselines/reference/unusedLocalProperty.types

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index cf0c048ecbf..cfba4999212 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -11504,6 +11504,21 @@ namespace ts {
             diagnostics.add(createDiagnosticForNodeFromMessageChain(propNode, errorInfo));
         }
 
+        function markPropertyAsReferenced(prop: Symbol) {
+            if (prop &&
+                noUnusedIdentifiers &&
+                (prop.flags & SymbolFlags.ClassMember) &&
+                prop.valueDeclaration && (getModifierFlags(prop.valueDeclaration) & ModifierFlags.Private)) {
+                if (prop.flags & SymbolFlags.Instantiated) {
+                    getSymbolLinks(prop).target.isReferenced = true;
+
+                }
+                else {
+                    prop.isReferenced = true;
+                }
+            }
+        }
+
         function checkPropertyAccessExpressionOrQualifiedName(node: PropertyAccessExpression | QualifiedName, left: Expression | QualifiedName, right: Identifier) {
             const type = checkNonNullExpression(left);
             if (isTypeAny(type) || type === silentNeverType) {
@@ -11523,17 +11538,7 @@ namespace ts {
                 return unknownType;
             }
 
-            if (noUnusedIdentifiers &&
-                (prop.flags & SymbolFlags.ClassMember) &&
-                prop.valueDeclaration && (getModifierFlags(prop.valueDeclaration) & ModifierFlags.Private)) {
-                if (prop.flags & SymbolFlags.Instantiated) {
-                    getSymbolLinks(prop).target.isReferenced = true;
-
-                }
-                else {
-                    prop.isReferenced = true;
-                }
-            }
+            markPropertyAsReferenced(prop);
 
             getNodeLinks(node).resolvedSymbol = prop;
 
@@ -16323,6 +16328,7 @@ namespace ts {
                 const parentType = getTypeForBindingElementParent(parent);
                 const name = node.propertyName || <Identifier>node.name;
                 const property = getPropertyOfType(parentType, getTextOfPropertyName(name));
+                markPropertyAsReferenced(property);
                 if (parent.initializer && property && getParentOfSymbol(property)) {
                     checkClassPropertyAccess(parent, parent.initializer, parentType, property);
                 }
diff --git a/tests/baselines/reference/unusedLocalProperty.errors.txt b/tests/baselines/reference/unusedLocalProperty.errors.txt
deleted file mode 100644
index c9a4b3cb6d9..00000000000
--- a/tests/baselines/reference/unusedLocalProperty.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-tests/cases/compiler/unusedLocalProperty.ts(3,25): error TS6138: Property 'species' is declared but never used.
-
-
-==== tests/cases/compiler/unusedLocalProperty.ts (1 errors) ====
-    declare var console: { log(msg: any): void; }
-    class Animal {
-        constructor(private species: string) {
-                            ~~~~~~~
-!!! error TS6138: Property 'species' is declared but never used.
-        }
-    
-        printSpecies() {
-            let { species } = this;
-            console.log(species);
-        }
-    }
-    
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unusedLocalProperty.symbols b/tests/baselines/reference/unusedLocalProperty.symbols
new file mode 100644
index 00000000000..6a3343bd545
--- /dev/null
+++ b/tests/baselines/reference/unusedLocalProperty.symbols
@@ -0,0 +1,29 @@
+=== tests/cases/compiler/unusedLocalProperty.ts ===
+declare var console: { log(msg: any): void; }
+>console : Symbol(console, Decl(unusedLocalProperty.ts, 0, 11))
+>log : Symbol(log, Decl(unusedLocalProperty.ts, 0, 22))
+>msg : Symbol(msg, Decl(unusedLocalProperty.ts, 0, 27))
+
+class Animal {
+>Animal : Symbol(Animal, Decl(unusedLocalProperty.ts, 0, 45))
+
+    constructor(private species: string) {
+>species : Symbol(Animal.species, Decl(unusedLocalProperty.ts, 2, 16))
+    }
+
+    printSpecies() {
+>printSpecies : Symbol(Animal.printSpecies, Decl(unusedLocalProperty.ts, 3, 5))
+
+        let { species } = this;
+>species : Symbol(species, Decl(unusedLocalProperty.ts, 6, 13))
+>this : Symbol(Animal, Decl(unusedLocalProperty.ts, 0, 45))
+
+        console.log(species);
+>console.log : Symbol(log, Decl(unusedLocalProperty.ts, 0, 22))
+>console : Symbol(console, Decl(unusedLocalProperty.ts, 0, 11))
+>log : Symbol(log, Decl(unusedLocalProperty.ts, 0, 22))
+>species : Symbol(species, Decl(unusedLocalProperty.ts, 6, 13))
+    }
+}
+
+
diff --git a/tests/baselines/reference/unusedLocalProperty.types b/tests/baselines/reference/unusedLocalProperty.types
new file mode 100644
index 00000000000..3cb8747957d
--- /dev/null
+++ b/tests/baselines/reference/unusedLocalProperty.types
@@ -0,0 +1,30 @@
+=== tests/cases/compiler/unusedLocalProperty.ts ===
+declare var console: { log(msg: any): void; }
+>console : { log(msg: any): void; }
+>log : (msg: any) => void
+>msg : any
+
+class Animal {
+>Animal : Animal
+
+    constructor(private species: string) {
+>species : string
+    }
+
+    printSpecies() {
+>printSpecies : () => void
+
+        let { species } = this;
+>species : string
+>this : this
+
+        console.log(species);
+>console.log(species) : void
+>console.log : (msg: any) => void
+>console : { log(msg: any): void; }
+>log : (msg: any) => void
+>species : string
+    }
+}
+
+

From f2d739ffcfef63b738bf6d71eb9e9d8b552cb71b Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 2 Nov 2016 11:36:25 -0700
Subject: [PATCH 077/421] Spread types handle nested index [access] types

Nested index [access] types are treated as assignable to themselves only,
just like type parameters.
---
 src/compiler/checker.ts | 7 ++++---
 src/compiler/types.ts   | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 53d38c1892f..5447e652f08 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -6097,10 +6097,10 @@ namespace ts {
             }
             const spread = spreadTypes[id] = createType(TypeFlags.Spread) as SpreadType;
             Debug.assert(!!(left.flags & (TypeFlags.Spread | TypeFlags.Object)), "Left flags: " + left.flags.toString(2));
-            Debug.assert(!!(right.flags & (TypeFlags.TypeParameter | TypeFlags.Intersection | TypeFlags.Object)), "Right flags: " + right.flags.toString(2));
+            Debug.assert(!!(right.flags & (TypeFlags.TypeParameter | TypeFlags.Intersection | TypeFlags.Index | TypeFlags.IndexedAccess | TypeFlags.Object)), "Right flags: " + right.flags.toString(2));
             spread.symbol = symbol;
             spread.left = left as SpreadType | ResolvedType;
-            spread.right = right as TypeParameter | IntersectionType | ResolvedType;
+            spread.right = right as TypeParameter | IntersectionType | IndexType | IndexedAccessType | ResolvedType;
             spread.aliasSymbol = aliasSymbol;
             spread.aliasTypeArguments = aliasTypeArguments;
             return spread;
@@ -7173,7 +7173,8 @@ namespace ts {
                         spreadTypeRelatedTo(source.right.flags & TypeFlags.Object ? source.left as SpreadType : source,
                                             target.right.flags & TypeFlags.Object ? target.left as SpreadType : target);
                 }
-                // If both right sides are type parameters or intersections, then they must be identical for the spread types to be related.
+                // If both right sides are type parameters, intersections, index types or indexed access types,
+                // then they must be identical for the spread types to be related.
                 // It also means that the left sides are either spread types or object types.
 
                 // if one left is object and the other is spread, that means the second has another type parameter. which isn't allowed
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 73d1c6d1ed9..ba5e6b2db99 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -2852,7 +2852,7 @@ namespace ts {
     /* @internal */
     export interface SpreadType extends Type {
         left: SpreadType | ResolvedType;
-        right: TypeParameter | IntersectionType | ResolvedType;
+        right: TypeParameter | IntersectionType | IndexType | IndexedAccessType | ResolvedType;
     }
 
     /* @internal */

From f65dd2101c33fc6e222e97757c892402c68fe99a Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 2 Nov 2016 11:37:52 -0700
Subject: [PATCH 078/421] Test index [access] types inside spread types

---
 .../reference/objectSpreadGeneric.errors.txt  | 50 ++++++++++++++++++-
 .../reference/objectSpreadGeneric.js          | 46 +++++++++++++++++
 .../types/spread/objectSpreadGeneric.ts       | 24 +++++++++
 3 files changed, 119 insertions(+), 1 deletion(-)

diff --git a/tests/baselines/reference/objectSpreadGeneric.errors.txt b/tests/baselines/reference/objectSpreadGeneric.errors.txt
index 8b9c767f6de..f1e2b7e4828 100644
--- a/tests/baselines/reference/objectSpreadGeneric.errors.txt
+++ b/tests/baselines/reference/objectSpreadGeneric.errors.txt
@@ -14,9 +14,17 @@ tests/cases/conformance/types/spread/objectSpreadGeneric.ts(38,11): error TS2322
 tests/cases/conformance/types/spread/objectSpreadGeneric.ts(42,11): error TS2322: Type '{ firrrrrrst: string; ...T; second: string; ...U; third: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
 tests/cases/conformance/types/spread/objectSpreadGeneric.ts(44,11): error TS2322: Type '{ first: string; ...T; ssssssssecond: string; ...U; third: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
 tests/cases/conformance/types/spread/objectSpreadGeneric.ts(46,11): error TS2322: Type '{ first: string; ...T; second: string; ...U; thirrrrrrrd: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(57,5): error TS2322: Type '{ ...keyof U }' is not assignable to type '{ ...keyof T }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(58,5): error TS2322: Type '{ ...keyof T }' is not assignable to type '{ ...keyof U }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(61,5): error TS2322: Type '{ ...K }' is not assignable to type '{ ...keyof T }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(62,5): error TS2322: Type '{ ...keyof T }' is not assignable to type '{ ...K }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(63,5): error TS2322: Type '{ ...J }' is not assignable to type '{ ...keyof U }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(64,5): error TS2322: Type '{ ...keyof U }' is not assignable to type '{ ...J }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(70,5): error TS2322: Type '{ ...U[J] }' is not assignable to type '{ ...T[K] }'.
+tests/cases/conformance/types/spread/objectSpreadGeneric.ts(71,5): error TS2322: Type '{ ...T[K] }' is not assignable to type '{ ...U[J] }'.
 
 
-==== tests/cases/conformance/types/spread/objectSpreadGeneric.ts (16 errors) ====
+==== tests/cases/conformance/types/spread/objectSpreadGeneric.ts (24 errors) ====
     function f<T, U, V>(t: T, u: U, v: V): void {
         let o: { ...T, ...U, ...V };
         let uus: { ...U, ...U};
@@ -97,4 +105,44 @@ tests/cases/conformance/types/spread/objectSpreadGeneric.ts(46,11): error TS2322
 !!! error TS2322: Type '{ first: string; ...T; second: string; ...U; thirrrrrrrd: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
             { first: '1', ...t, second: '2', ...u, thirrrrrrrd: '3' }; // error, not assignable
     }
+    
+    function indexAccessedTest<T, K extends keyof T, U, J extends keyof U>(t: T, u: U, key1: K, key2: J) {
+        let k1: { ...keyof T };
+        let k2: { ...keyof U };
+        let k3: { ...K };
+        let k4: { ...J };
+        k1 = k1; // ok
+        k2 = k2; // ok
+        k1 = k2; // error
+        ~~
+!!! error TS2322: Type '{ ...keyof U }' is not assignable to type '{ ...keyof T }'.
+        k2 = k1; // error
+        ~~
+!!! error TS2322: Type '{ ...keyof T }' is not assignable to type '{ ...keyof U }'.
+        k3 = k3; // ok
+        k4 = k4; // ok
+        k1 = k3; // error
+        ~~
+!!! error TS2322: Type '{ ...K }' is not assignable to type '{ ...keyof T }'.
+        k3 = k1; // error
+        ~~
+!!! error TS2322: Type '{ ...keyof T }' is not assignable to type '{ ...K }'.
+        k2 = k4; // error
+        ~~
+!!! error TS2322: Type '{ ...J }' is not assignable to type '{ ...keyof U }'.
+        k4 = k2; // error
+        ~~
+!!! error TS2322: Type '{ ...keyof U }' is not assignable to type '{ ...J }'.
+    
+        let i1: { ...T[K] };
+        let i2: { ...U[J] };
+        i1 = i1; // ok
+        i2 = i2; // ok
+        i1 = i2; // error
+        ~~
+!!! error TS2322: Type '{ ...U[J] }' is not assignable to type '{ ...T[K] }'.
+        i2 = i1; // error
+        ~~
+!!! error TS2322: Type '{ ...T[K] }' is not assignable to type '{ ...U[J] }'.
+    }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/objectSpreadGeneric.js b/tests/baselines/reference/objectSpreadGeneric.js
index fa19e47df39..8e89ebeef64 100644
--- a/tests/baselines/reference/objectSpreadGeneric.js
+++ b/tests/baselines/reference/objectSpreadGeneric.js
@@ -47,6 +47,30 @@ function f<T, U, V>(t: T, u: U, v: V): void {
     const mismatchLast: { first: string, ...T, second: string, ...U, third: string } =
         { first: '1', ...t, second: '2', ...u, thirrrrrrrd: '3' }; // error, not assignable
 }
+
+function indexAccessedTest<T, K extends keyof T, U, J extends keyof U>(t: T, u: U, key1: K, key2: J) {
+    let k1: { ...keyof T };
+    let k2: { ...keyof U };
+    let k3: { ...K };
+    let k4: { ...J };
+    k1 = k1; // ok
+    k2 = k2; // ok
+    k1 = k2; // error
+    k2 = k1; // error
+    k3 = k3; // ok
+    k4 = k4; // ok
+    k1 = k3; // error
+    k3 = k1; // error
+    k2 = k4; // error
+    k4 = k2; // error
+
+    let i1: { ...T[K] };
+    let i2: { ...U[J] };
+    i1 = i1; // ok
+    i2 = i2; // ok
+    i1 = i2; // error
+    i2 = i1; // error
+}
 
 
 //// [objectSpreadGeneric.js]
@@ -93,3 +117,25 @@ function f(t, u, v) {
     var mismatchSecond = __assign({ first: '1' }, t, { ssssssssecond: '2' }, u, { third: '3' }); // error, not assignable
     var mismatchLast = __assign({ first: '1' }, t, { second: '2' }, u, { thirrrrrrrd: '3' }); // error, not assignable
 }
+function indexAccessedTest(t, u, key1, key2) {
+    var k1;
+    var k2;
+    var k3;
+    var k4;
+    k1 = k1; // ok
+    k2 = k2; // ok
+    k1 = k2; // error
+    k2 = k1; // error
+    k3 = k3; // ok
+    k4 = k4; // ok
+    k1 = k3; // error
+    k3 = k1; // error
+    k2 = k4; // error
+    k4 = k2; // error
+    var i1;
+    var i2;
+    i1 = i1; // ok
+    i2 = i2; // ok
+    i1 = i2; // error
+    i2 = i1; // error
+}
diff --git a/tests/cases/conformance/types/spread/objectSpreadGeneric.ts b/tests/cases/conformance/types/spread/objectSpreadGeneric.ts
index 63e9f00aaae..6f22358b7e2 100644
--- a/tests/cases/conformance/types/spread/objectSpreadGeneric.ts
+++ b/tests/cases/conformance/types/spread/objectSpreadGeneric.ts
@@ -46,3 +46,27 @@ function f<T, U, V>(t: T, u: U, v: V): void {
     const mismatchLast: { first: string, ...T, second: string, ...U, third: string } =
         { first: '1', ...t, second: '2', ...u, thirrrrrrrd: '3' }; // error, not assignable
 }
+
+function indexAccessedTest<T, K extends keyof T, U, J extends keyof U>(t: T, u: U, key1: K, key2: J) {
+    let k1: { ...keyof T };
+    let k2: { ...keyof U };
+    let k3: { ...K };
+    let k4: { ...J };
+    k1 = k1; // ok
+    k2 = k2; // ok
+    k1 = k2; // error
+    k2 = k1; // error
+    k3 = k3; // ok
+    k4 = k4; // ok
+    k1 = k3; // error
+    k3 = k1; // error
+    k2 = k4; // error
+    k4 = k2; // error
+
+    let i1: { ...T[K] };
+    let i2: { ...U[J] };
+    i1 = i1; // ok
+    i2 = i2; // ok
+    i1 = i2; // error
+    i2 = i1; // error
+}

From a7c18367cad6169428d1ed09bfcc8ce768d51035 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 2 Nov 2016 14:55:24 -0700
Subject: [PATCH 079/421] Parse, bind and check rest elements

---
 src/compiler/binder.ts               | 72 ++++++++++++++++----
 src/compiler/checker.ts              | 98 +++++++++++++++++-----------
 src/compiler/diagnosticMessages.json |  6 +-
 src/compiler/parser.ts               | 11 +++-
 src/compiler/types.ts                | 19 +++---
 src/compiler/utilities.ts            | 16 +++++
 6 files changed, 161 insertions(+), 61 deletions(-)

diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index b0c456a6770..a4d9a5a30ed 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -1916,6 +1916,9 @@ namespace ts {
                     return bindParameter(<ParameterDeclaration>node);
                 case SyntaxKind.VariableDeclaration:
                 case SyntaxKind.BindingElement:
+                    if ((node as BindingElement).dotDotDotToken && node.parent.kind === SyntaxKind.ObjectBindingPattern) {
+                        emitFlags |= NodeFlags.HasRestAttribute;
+                    }
                     return bindVariableDeclarationOrBindingElement(<VariableDeclaration | BindingElement>node);
                 case SyntaxKind.PropertyDeclaration:
                 case SyntaxKind.PropertySignature:
@@ -1931,7 +1934,11 @@ namespace ts {
 
                 case SyntaxKind.SpreadElementExpression:
                 case SyntaxKind.JsxSpreadAttribute:
-                    emitFlags |= NodeFlags.HasSpreadAttribute;
+                    let root = container;
+                    while (root && root.kind !== SyntaxKind.BinaryExpression) {
+                        root = root.parent;
+                    }
+                    emitFlags |= root && isDestructuringAssignment(root) ? NodeFlags.HasRestAttribute : NodeFlags.HasSpreadAttribute;
                     return;
 
                 case SyntaxKind.CallSignature:
@@ -2542,10 +2549,13 @@ namespace ts {
         const operatorTokenKind = node.operatorToken.kind;
         const leftKind = node.left.kind;
 
-        if (operatorTokenKind === SyntaxKind.EqualsToken
-            && (leftKind === SyntaxKind.ObjectLiteralExpression
-                || leftKind === SyntaxKind.ArrayLiteralExpression)) {
-            // Destructuring assignments are ES6 syntax.
+        if (operatorTokenKind === SyntaxKind.EqualsToken && leftKind === SyntaxKind.ObjectLiteralExpression) {
+            // Destructuring object assignments with are ES2015 syntax
+            // and possibly ESNext if they contain rest
+            transformFlags |= TransformFlags.AssertESNext | TransformFlags.AssertES2015 | TransformFlags.AssertDestructuringAssignment;
+        }
+        else if (operatorTokenKind === SyntaxKind.EqualsToken && leftKind === SyntaxKind.ArrayLiteralExpression) {
+            // Destructuring assignments are ES2015 syntax.
             transformFlags |= TransformFlags.AssertES2015 | TransformFlags.AssertDestructuringAssignment;
         }
         else if (operatorTokenKind === SyntaxKind.AsteriskAsteriskToken
@@ -2579,6 +2589,11 @@ namespace ts {
             transformFlags |= TransformFlags.AssertTypeScript | TransformFlags.ContainsParameterPropertyAssignments;
         }
 
+        // parameters with object rest destructuring are ES Next syntax
+        if (subtreeFlags & TransformFlags.ContainsSpreadExpression) {
+            transformFlags |= TransformFlags.AssertESNext;
+        }
+
         // If a parameter has an initializer, a binding pattern or a dotDotDot token, then
         // it is ES6 syntax and its container must emit default value assignments or parameter destructuring downlevel.
         if (subtreeFlags & TransformFlags.ContainsBindingPattern || initializer || dotDotDotToken) {
@@ -2812,6 +2827,11 @@ namespace ts {
                 transformFlags |= TransformFlags.AssertES2017;
             }
 
+            // function declarations with object rest destructuring are ES Next syntax
+            if (subtreeFlags & TransformFlags.ContainsSpreadExpression) {
+                transformFlags |= TransformFlags.AssertESNext;
+            }
+
             // If a FunctionDeclaration's subtree has marked the container as needing to capture the
             // lexical this, or the function contains parameters with initializers, then this node is
             // ES6 syntax.
@@ -2849,6 +2869,12 @@ namespace ts {
             transformFlags |= TransformFlags.AssertES2017;
         }
 
+        // function expressions with object rest destructuring are ES Next syntax
+        if (subtreeFlags & TransformFlags.ContainsSpreadExpression) {
+            transformFlags |= TransformFlags.AssertESNext;
+        }
+
+
         // If a FunctionExpression's subtree has marked the container as needing to capture the
         // lexical this, or the function contains parameters with initializers, then this node is
         // ES6 syntax.
@@ -2886,6 +2912,11 @@ namespace ts {
             transformFlags |= TransformFlags.AssertES2017;
         }
 
+        // arrow functions with object rest destructuring are ES Next syntax
+        if (subtreeFlags & TransformFlags.ContainsSpreadExpression) {
+            transformFlags |= TransformFlags.AssertESNext;
+        }
+
         // If an ArrowFunction contains a lexical this, its container must capture the lexical this.
         if (subtreeFlags & TransformFlags.ContainsLexicalThis) {
             transformFlags |= TransformFlags.ContainsCapturedLexicalThis;
@@ -2914,8 +2945,13 @@ namespace ts {
         let transformFlags = subtreeFlags;
         const nameKind = node.name.kind;
 
-        // A VariableDeclaration with a binding pattern is ES6 syntax.
-        if (nameKind === SyntaxKind.ObjectBindingPattern || nameKind === SyntaxKind.ArrayBindingPattern) {
+        // A VariableDeclaration with an object binding pattern is ES2015 syntax
+        // and possibly ESNext syntax if it contains an object binding pattern
+        if (nameKind === SyntaxKind.ObjectBindingPattern) {
+            transformFlags |= TransformFlags.AssertESNext | TransformFlags.AssertES2015 | TransformFlags.ContainsBindingPattern;
+        }
+        // A VariableDeclaration with an object binding pattern is ES2015 syntax.
+        else if (nameKind === SyntaxKind.ArrayBindingPattern) {
             transformFlags |= TransformFlags.AssertES2015 | TransformFlags.ContainsBindingPattern;
         }
 
@@ -3056,6 +3092,10 @@ namespace ts {
                 transformFlags |= TransformFlags.AssertJsx;
                 break;
 
+            case SyntaxKind.ForOfStatement:
+                // for-of might be ESNext if it has a rest destructuring
+                transformFlags |= TransformFlags.AssertESNext;
+                // FALLTHROUGH
             case SyntaxKind.NoSubstitutionTemplateLiteral:
             case SyntaxKind.TemplateHead:
             case SyntaxKind.TemplateMiddle:
@@ -3063,7 +3103,6 @@ namespace ts {
             case SyntaxKind.TemplateExpression:
             case SyntaxKind.TaggedTemplateExpression:
             case SyntaxKind.ShorthandPropertyAssignment:
-            case SyntaxKind.ForOfStatement:
             case SyntaxKind.StaticKeyword:
                 // These nodes are ES6 syntax.
                 transformFlags |= TransformFlags.AssertES2015;
@@ -3129,10 +3168,16 @@ namespace ts {
 
             case SyntaxKind.SpreadExpression:
             case SyntaxKind.SpreadElementExpression:
-                // This node is ES6 or ES future syntax, but is handled by a containing node.
+                // This node is ES2015 or ES next syntax, but is handled by a containing node.
                 transformFlags |= TransformFlags.ContainsSpreadExpression;
                 break;
 
+            case SyntaxKind.BindingElement:
+                if ((node as BindingElement).dotDotDotToken) {
+                    // this node is ES2015 or ES next syntax, but is handled by a containing node.
+                    transformFlags |= TransformFlags.ContainsSpreadExpression;
+                }
+
             case SyntaxKind.SuperKeyword:
                 // This node is ES6 syntax.
                 transformFlags |= TransformFlags.AssertES2015;
@@ -3145,8 +3190,13 @@ namespace ts {
 
             case SyntaxKind.ObjectBindingPattern:
             case SyntaxKind.ArrayBindingPattern:
-                // These nodes are ES6 syntax.
-                transformFlags |= TransformFlags.AssertES2015 | TransformFlags.ContainsBindingPattern;
+                // These nodes are ES2015 or ES Next syntax.
+                if (subtreeFlags & TransformFlags.ContainsSpreadExpression) {
+                    transformFlags |= TransformFlags.AssertESNext | TransformFlags.ContainsBindingPattern;
+                }
+                else {
+                    transformFlags |= TransformFlags.AssertES2015 | TransformFlags.ContainsBindingPattern;
+                }
                 break;
 
             case SyntaxKind.Decorator:
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 5447e652f08..1c4a1350883 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -2245,7 +2245,7 @@ namespace ts {
                         writeUnionOrIntersectionType(<UnionOrIntersectionType>type, nextFlags);
                     }
                     else if (type.flags & TypeFlags.Spread) {
-                        writeSpreadType(<SpreadType>type);
+                        writeSpreadType(type as SpreadType);
                     }
                     else if (getObjectFlags(type) & ObjectFlags.Anonymous) {
                         writeAnonymousType(<ObjectType>type, nextFlags);
@@ -3028,26 +3028,31 @@ namespace ts {
             return symbol && getSymbolLinks(symbol).type || getTypeForVariableLikeDeclaration(node, /*includeOptionality*/ false);
         }
 
-        function getTextOfPropertyName(name: PropertyName): string {
-            switch (name.kind) {
-                case SyntaxKind.Identifier:
-                    return (<Identifier>name).text;
-                case SyntaxKind.StringLiteral:
-                case SyntaxKind.NumericLiteral:
-                    return (<LiteralExpression>name).text;
-                case SyntaxKind.ComputedPropertyName:
-                    if (isStringOrNumericLiteral((<ComputedPropertyName>name).expression.kind)) {
-                        return (<LiteralExpression>(<ComputedPropertyName>name).expression).text;
-                    }
-            }
-
-            return undefined;
-        }
-
         function isComputedNonLiteralName(name: PropertyName): boolean {
             return name.kind === SyntaxKind.ComputedPropertyName && !isStringOrNumericLiteral((<ComputedPropertyName>name).expression.kind);
         }
 
+        function getRestType(source: Type, properties: PropertyName[], symbol: Symbol): Type {
+            Debug.assert(!!(source.flags & TypeFlags.Object), "Rest types only support object types right now.");
+            const members = createMap<Symbol>();
+            const names = createMap<true>();
+            for (const name of properties) {
+                names[getTextOfPropertyName(name)] = true;
+            }
+            for (const prop of getPropertiesOfType(source)) {
+                const inNamesToRemove = prop.name in names;
+                const isPrivate = getDeclarationModifierFlagsFromSymbol(prop) & (ModifierFlags.Private | ModifierFlags.Protected);
+                const isMethod = prop.flags & SymbolFlags.Method;
+                const isSetOnlyAccessor = prop.flags & SymbolFlags.SetAccessor && !(prop.flags & SymbolFlags.GetAccessor);
+                if (!inNamesToRemove && !isPrivate && !isMethod && !isSetOnlyAccessor) {
+                    members[prop.name] = prop;
+                }
+            }
+            const stringIndexInfo = getIndexInfoOfType(source, IndexKind.String);
+            const numberIndexInfo = getIndexInfoOfType(source, IndexKind.Number);
+            return createAnonymousType(symbol, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
+        }
+
         /** Return the inferred type for a binding element */
         function getTypeForBindingElement(declaration: BindingElement): Type {
             const pattern = <BindingPattern>declaration.parent;
@@ -3068,26 +3073,41 @@ namespace ts {
 
             let type: Type;
             if (pattern.kind === SyntaxKind.ObjectBindingPattern) {
-                // Use explicitly specified property name ({ p: xxx } form), or otherwise the implied name ({ p } form)
-                const name = declaration.propertyName || <Identifier>declaration.name;
-                if (isComputedNonLiteralName(name)) {
-                    // computed properties with non-literal names are treated as 'any'
-                    return anyType;
-                }
-                if (declaration.initializer) {
-                    getContextualType(declaration.initializer);
+                if (declaration.dotDotDotToken) {
+                    if (!(parentType.flags & TypeFlags.Object)) {
+                        error(declaration, Diagnostics.Rest_types_may_only_be_created_from_object_types);
+                        return unknownType;
+                    }
+                    const literalMembers: PropertyName[] = [];
+                    for (const element of pattern.elements) {
+                        if (element.kind !== SyntaxKind.OmittedExpression && !(element as BindingElement).dotDotDotToken) {
+                            literalMembers.push(element.propertyName || element.name as Identifier);
+                        }
+                    }
+                    type = getRestType(parentType, literalMembers, declaration.symbol);
                 }
+                else {
+                    // Use explicitly specified property name ({ p: xxx } form), or otherwise the implied name ({ p } form)
+                    const name = declaration.propertyName || <Identifier>declaration.name;
+                    if (isComputedNonLiteralName(name)) {
+                        // computed properties with non-literal names are treated as 'any'
+                        return anyType;
+                    }
+                    if (declaration.initializer) {
+                        getContextualType(declaration.initializer);
+                    }
 
-                // Use type of the specified property, or otherwise, for a numeric name, the type of the numeric index signature,
-                // or otherwise the type of the string index signature.
-                const text = getTextOfPropertyName(name);
+                    // Use type of the specified property, or otherwise, for a numeric name, the type of the numeric index signature,
+                    // or otherwise the type of the string index signature.
+                    const text = getTextOfPropertyName(name);
 
-                type = getTypeOfPropertyOfType(parentType, text) ||
-                    isNumericLiteralName(text) && getIndexTypeOfType(parentType, IndexKind.Number) ||
-                    getIndexTypeOfType(parentType, IndexKind.String);
-                if (!type) {
-                    error(name, Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(parentType), declarationNameToString(name));
-                    return unknownType;
+                    type = getTypeOfPropertyOfType(parentType, text) ||
+                        isNumericLiteralName(text) && getIndexTypeOfType(parentType, IndexKind.Number) ||
+                        getIndexTypeOfType(parentType, IndexKind.String);
+                    if (!type) {
+                        error(name, Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(parentType), declarationNameToString(name));
+                        return unknownType;
+                    }
                 }
             }
             else {
@@ -3295,8 +3315,8 @@ namespace ts {
             let hasComputedProperties = false;
             forEach(pattern.elements, e => {
                 const name = e.propertyName || <Identifier>e.name;
-                if (isComputedNonLiteralName(name)) {
-                    // do not include computed properties in the implied type
+                if (isComputedNonLiteralName(name) || e.dotDotDotToken) {
+                    // do not include computed properties or rests in the implied type
                     hasComputedProperties = true;
                     return;
                 }
@@ -14097,7 +14117,7 @@ namespace ts {
                     error(name, Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(objectLiteralType), declarationNameToString(name));
                 }
             }
-            else {
+            else if (property.kind !== SyntaxKind.SpreadElementExpression) {
                 error(property, Diagnostics.Property_assignment_expected);
             }
         }
@@ -14143,7 +14163,7 @@ namespace ts {
                 }
                 else {
                     if (elementIndex < elements.length - 1) {
-                        error(element, Diagnostics.A_rest_element_must_be_last_in_an_array_destructuring_pattern);
+                        error(element, Diagnostics.A_rest_element_must_be_last_in_a_destructuring_pattern);
                     }
                     else {
                         const restExpression = (<SpreadExpression>element).expression;
@@ -21058,7 +21078,7 @@ namespace ts {
             if (node.dotDotDotToken) {
                 const elements = (<BindingPattern>node.parent).elements;
                 if (node !== lastOrUndefined(elements)) {
-                    return grammarErrorOnNode(node, Diagnostics.A_rest_element_must_be_last_in_an_array_destructuring_pattern);
+                    return grammarErrorOnNode(node, Diagnostics.A_rest_element_must_be_last_in_a_destructuring_pattern);
                 }
 
                 if (node.name.kind === SyntaxKind.ArrayBindingPattern || node.name.kind === SyntaxKind.ObjectBindingPattern) {
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 1d45e96cb6f..5b6d958061e 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -1455,7 +1455,7 @@
         "category": "Error",
         "code": 2461
     },
-    "A rest element must be last in an array destructuring pattern": {
+    "A rest element must be last in a destructuring pattern": {
         "category": "Error",
         "code": 2462
     },
@@ -1991,6 +1991,10 @@
         "category": "Error",
         "code": 2699
     },
+    "Rest types may only be created from object types.": {
+        "category": "Error",
+        "code": 2700
+    },
 
     "Import declaration '{0}' is using private name '{1}'.": {
         "category": "Error",
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index ac41d78bb12..43182ca83b6 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -1274,8 +1274,10 @@ namespace ts {
                     return token() === SyntaxKind.OpenBracketToken || isLiteralPropertyName();
                 case ParsingContext.ObjectLiteralMembers:
                     return token() === SyntaxKind.OpenBracketToken || token() === SyntaxKind.AsteriskToken || token() === SyntaxKind.DotDotDotToken || isLiteralPropertyName();
+                case ParsingContext.RestProperties:
+                    return isLiteralPropertyName();
                 case ParsingContext.ObjectBindingElements:
-                    return token() === SyntaxKind.OpenBracketToken || isLiteralPropertyName();
+                    return token() === SyntaxKind.OpenBracketToken || token() === SyntaxKind.DotDotDotToken || isLiteralPropertyName();
                 case ParsingContext.HeritageClauseElement:
                     // If we see { } then only consume it as an expression if it is followed by , or {
                     // That way we won't consume the body of a class in its heritage clause.
@@ -1402,6 +1404,7 @@ namespace ts {
                 case ParsingContext.ArrayBindingElements:
                     return token() === SyntaxKind.CloseBracketToken;
                 case ParsingContext.Parameters:
+                case ParsingContext.RestProperties:
                     // Tokens other than ')' and ']' (the latter for index signatures) are here for better error recovery
                     return token() === SyntaxKind.CloseParenToken || token() === SyntaxKind.CloseBracketToken /*|| token === SyntaxKind.OpenBraceToken*/;
                 case ParsingContext.TypeArguments:
@@ -1587,6 +1590,9 @@ namespace ts {
                 case ParsingContext.Parameters:
                     return isReusableParameter(node);
 
+                case ParsingContext.RestProperties:
+                    return false;
+
                 // Any other lists we do not care about reusing nodes in.  But feel free to add if
                 // you can do so safely.  Danger areas involve nodes that may involve speculative
                 // parsing.  If speculative parsing is involved with the node, then the range the
@@ -1784,6 +1790,7 @@ namespace ts {
                 case ParsingContext.BlockStatements: return Diagnostics.Declaration_or_statement_expected;
                 case ParsingContext.SwitchClauses: return Diagnostics.case_or_default_expected;
                 case ParsingContext.SwitchClauseStatements: return Diagnostics.Statement_expected;
+                case ParsingContext.RestProperties: // fallthrough
                 case ParsingContext.TypeMembers: return Diagnostics.Property_or_signature_expected;
                 case ParsingContext.ClassMembers: return Diagnostics.Unexpected_token_A_constructor_method_accessor_or_property_was_expected;
                 case ParsingContext.EnumMembers: return Diagnostics.Enum_member_expected;
@@ -4890,6 +4897,7 @@ namespace ts {
 
         function parseObjectBindingElement(): BindingElement {
             const node = <BindingElement>createNode(SyntaxKind.BindingElement);
+            node.dotDotDotToken = parseOptionalToken(SyntaxKind.DotDotDotToken);
             const tokenIsIdentifier = isIdentifier();
             const propertyName = parsePropertyName();
             if (tokenIsIdentifier && token() !== SyntaxKind.ColonToken) {
@@ -5834,6 +5842,7 @@ namespace ts {
             JsxChildren,               // Things between opening and closing JSX tags
             ArrayLiteralMembers,       // Members in array literal
             Parameters,                // Parameters in parameter list
+            RestProperties,            // Property names in a rest type list
             TypeParameters,            // Type parameters in type parameter list
             TypeArguments,             // Type arguments in type argument list
             TupleElementTypes,         // Element types in tuple element type list
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index ba5e6b2db99..b9d223931fc 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -422,14 +422,15 @@ namespace ts {
         HasParamDecorators = 1 << 12, // If the file has parameter decorators (initialized by binding)
         HasAsyncFunctions =  1 << 13, // If the file has async functions (initialized by binding)
         HasSpreadAttribute = 1 << 14, // If the file as JSX spread attributes (initialized by binding)
-        DisallowInContext =  1 << 15, // If node was parsed in a context where 'in-expressions' are not allowed
-        YieldContext =       1 << 16, // If node was parsed in the 'yield' context created when parsing a generator
-        DecoratorContext =   1 << 17, // If node was parsed as part of a decorator
-        AwaitContext =       1 << 18, // If node was parsed in the 'await' context created when parsing an async function
-        ThisNodeHasError =   1 << 19, // If the parser encountered an error when parsing the code that created this node
-        JavaScriptFile =     1 << 20, // If node was parsed in a JavaScript
-        ThisNodeOrAnySubNodesHasError = 1 << 21, // If this node or any of its children had an error
-        HasAggregatedChildData = 1 << 22, // If we've computed data from children and cached it in this node
+        HasRestAttribute =   1 << 15, // If the file has object destructure elements
+        DisallowInContext =  1 << 16, // If node was parsed in a context where 'in-expressions' are not allowed
+        YieldContext =       1 << 17, // If node was parsed in the 'yield' context created when parsing a generator
+        DecoratorContext =   1 << 18, // If node was parsed as part of a decorator
+        AwaitContext =       1 << 19, // If node was parsed in the 'await' context created when parsing an async function
+        ThisNodeHasError =   1 << 20, // If the parser encountered an error when parsing the code that created this node
+        JavaScriptFile =     1 << 21, // If node was parsed in a JavaScript
+        ThisNodeOrAnySubNodesHasError = 1 << 22, // If this node or any of its children had an error
+        HasAggregatedChildData = 1 << 23, // If we've computed data from children and cached it in this node
 
         BlockScoped = Let | Const,
 
@@ -651,7 +652,7 @@ namespace ts {
     export interface BindingElement extends Declaration {
         kind: SyntaxKind.BindingElement;
         propertyName?: PropertyName;        // Binding property name (in object binding pattern)
-        dotDotDotToken?: DotDotDotToken;              // Present on rest binding element
+        dotDotDotToken?: DotDotDotToken;    // Present on rest element (in object binding pattern)
         name: BindingName;                  // Declared binding element name
         initializer?: Expression;           // Optional initializer
     }
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index cd3e6ab9575..67742347568 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -485,6 +485,22 @@ namespace ts {
         return getFullWidth(name) === 0 ? "(Missing)" : getTextOfNode(name);
     }
 
+    export function getTextOfPropertyName(name: PropertyName): string {
+        switch (name.kind) {
+        case SyntaxKind.Identifier:
+            return (<Identifier>name).text;
+        case SyntaxKind.StringLiteral:
+        case SyntaxKind.NumericLiteral:
+            return (<LiteralExpression>name).text;
+        case SyntaxKind.ComputedPropertyName:
+            if (isStringOrNumericLiteral((<ComputedPropertyName>name).expression.kind)) {
+                return (<LiteralExpression>(<ComputedPropertyName>name).expression).text;
+            }
+        }
+
+        return undefined;
+    }
+
     export function entityNameToString(name: EntityNameOrEntityNameExpression): string {
         switch (name.kind) {
             case SyntaxKind.Identifier:

From e3a08ed663446753b1d52a8c1f036560072a4e29 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 2 Nov 2016 14:56:01 -0700
Subject: [PATCH 080/421] Downlevel emit of rest elements

---
 src/compiler/emitter.ts                    |  15 +
 src/compiler/transformers/destructuring.ts | 197 ++++++++--
 src/compiler/transformers/esnext.ts        | 428 +++++++++++++++++++++
 3 files changed, 598 insertions(+), 42 deletions(-)

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 0ee598c507a..c89fa1f1550 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -42,6 +42,15 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
     return t;
 };`;
 
+        const restHelper = `
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && !e.indexOf(p))
+        t[p] = s[p];
+    return t;
+};`;
+
         // emit output for the __decorate helper function
         const decorateHelper = `
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -226,6 +235,7 @@ const _super = (function (geti, seti) {
         let currentFileIdentifiers: Map<string>;
         let extendsEmitted: boolean;
         let assignEmitted: boolean;
+        let restEmitted: boolean;
         let decorateEmitted: boolean;
         let paramEmitted: boolean;
         let awaiterEmitted: boolean;
@@ -2210,6 +2220,11 @@ const _super = (function (geti, seti) {
                 assignEmitted = true;
             }
 
+            if (!restEmitted && node.flags & NodeFlags.HasRestAttribute) {
+                writeLines(restHelper);
+                restEmitted = true;
+            }
+
             if (!decorateEmitted && node.flags & NodeFlags.HasDecorators) {
                 writeLines(decorateHelper);
                 if (compilerOptions.emitDecoratorMetadata) {
diff --git a/src/compiler/transformers/destructuring.ts b/src/compiler/transformers/destructuring.ts
index 89beade577d..bac8e994201 100644
--- a/src/compiler/transformers/destructuring.ts
+++ b/src/compiler/transformers/destructuring.ts
@@ -17,7 +17,8 @@ namespace ts {
         node: BinaryExpression,
         needsValue: boolean,
         recordTempVariable: (node: Identifier) => void,
-        visitor?: (node: Node) => VisitResult<Node>): Expression {
+        visitor?: (node: Node) => VisitResult<Node>,
+        transformRest?: boolean): Expression {
 
         if (isEmptyObjectLiteralOrArrayLiteral(node.left)) {
             const right = node.right;
@@ -51,7 +52,7 @@ namespace ts {
             location = value;
         }
 
-        flattenDestructuring(node, value, location, emitAssignment, emitTempVariableAssignment, visitor);
+        flattenDestructuring(node, value, location, emitAssignment, emitTempVariableAssignment, emitRestAssignment, transformRest, visitor);
 
         if (needsValue) {
             expressions.push(value);
@@ -61,7 +62,7 @@ namespace ts {
         aggregateTransformFlags(expression);
         return expression;
 
-        function emitAssignment(name: Identifier, value: Expression, location: TextRange) {
+        function emitAssignment(name: Identifier | ObjectLiteralExpression, value: Expression, location: TextRange) {
             const expression = createAssignment(name, value, location);
 
             // NOTE: this completely disables source maps, but aligns with the behavior of
@@ -77,6 +78,10 @@ namespace ts {
             emitAssignment(name, value, location);
             return name;
         }
+
+        function emitRestAssignment(elements: ObjectLiteralElementLike[], value: Expression, location: TextRange) {
+            emitAssignment(createObjectLiteral(elements), value, location);
+        }
     }
 
     /**
@@ -89,14 +94,15 @@ namespace ts {
     export function flattenParameterDestructuring(
         node: ParameterDeclaration,
         value: Expression,
-        visitor?: (node: Node) => VisitResult<Node>) {
+        visitor?: (node: Node) => VisitResult<Node>,
+        transformRest?: boolean) {
         const declarations: VariableDeclaration[] = [];
 
-        flattenDestructuring(node, value, node, emitAssignment, emitTempVariableAssignment, visitor);
+        flattenDestructuring(node, value, node, emitAssignment, emitTempVariableAssignment, emitRestAssignment, transformRest, visitor);
 
         return declarations;
 
-        function emitAssignment(name: Identifier, value: Expression, location: TextRange) {
+        function emitAssignment(name: Identifier | BindingPattern, value: Expression, location: TextRange) {
             const declaration = createVariableDeclaration(name, /*type*/ undefined, value, location);
 
             // NOTE: this completely disables source maps, but aligns with the behavior of
@@ -112,6 +118,10 @@ namespace ts {
             emitAssignment(name, value, location);
             return name;
         }
+
+        function emitRestAssignment(elements: BindingElement[], value: Expression, location: TextRange) {
+            emitAssignment(createObjectBindingPattern(elements), value, location);
+        }
     }
 
     /**
@@ -125,15 +135,16 @@ namespace ts {
         node: VariableDeclaration,
         value?: Expression,
         visitor?: (node: Node) => VisitResult<Node>,
-        recordTempVariable?: (node: Identifier) => void) {
+        recordTempVariable?: (node: Identifier) => void,
+        transformRest?: boolean) {
         const declarations: VariableDeclaration[] = [];
 
         let pendingAssignments: Expression[];
-        flattenDestructuring(node, value, node, emitAssignment, emitTempVariableAssignment, visitor);
+        flattenDestructuring(node, value, node, emitAssignment, emitTempVariableAssignment, emitRestAssignment, transformRest, visitor);
 
         return declarations;
 
-        function emitAssignment(name: Identifier, value: Expression, location: TextRange, original: Node) {
+        function emitAssignment(name: Identifier | BindingPattern, value: Expression, location: TextRange, original: Node) {
             if (pendingAssignments) {
                 pendingAssignments.push(value);
                 value = inlineExpressions(pendingAssignments);
@@ -167,6 +178,10 @@ namespace ts {
             }
             return name;
         }
+
+        function emitRestAssignment(elements: BindingElement[], value: Expression, location: TextRange, original: Node) {
+            emitAssignment(createObjectBindingPattern(elements), value, location, original);
+        }
     }
 
     /**
@@ -186,15 +201,17 @@ namespace ts {
 
         const pendingAssignments: Expression[] = [];
 
-        flattenDestructuring(node, /*value*/ undefined, node, emitAssignment, emitTempVariableAssignment, visitor);
+        flattenDestructuring(node, /*value*/ undefined, node, emitAssignment, emitTempVariableAssignment, emitRestAssignment, /*transformRest*/ false, visitor);
 
         const expression = inlineExpressions(pendingAssignments);
         aggregateTransformFlags(expression);
         return expression;
 
-        function emitAssignment(name: Identifier, value: Expression, location: TextRange, original: Node) {
+        function emitAssignment(name: Identifier | ObjectLiteralExpression, value: Expression, location: TextRange, original: Node) {
             const expression = createAssignmentCallback
-                ? createAssignmentCallback(name, value, location)
+                ? createAssignmentCallback(name.kind === SyntaxKind.Identifier ? name : emitTempVariableAssignment(name, location),
+                                           value,
+                                           location)
                 : createAssignment(name, value, location);
 
             emitPendingAssignment(expression, original);
@@ -206,6 +223,10 @@ namespace ts {
             return name;
         }
 
+        function emitRestAssignment(elements: ObjectLiteralElementLike[], value: Expression, location: TextRange, original: Node) {
+            emitAssignment(createObjectLiteral(elements), value, location, original);
+        }
+
         function emitPendingAssignment(expression: Expression, original: Node) {
             expression.original = original;
 
@@ -223,6 +244,8 @@ namespace ts {
         location: TextRange,
         emitAssignment: (name: Identifier, value: Expression, location: TextRange, original: Node) => void,
         emitTempVariableAssignment: (value: Expression, location: TextRange) => Identifier,
+        emitRestAssignment: (elements: (ObjectLiteralElementLike[] | BindingElement[]), value: Expression, location: TextRange, original: Node) => void,
+        transformRest: boolean,
         visitor?: (node: Node) => VisitResult<Node>) {
         if (value && visitor) {
             value = visitNode(value, visitor, isExpression);
@@ -284,13 +307,38 @@ namespace ts {
                 value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ true, location, emitTempVariableAssignment);
             }
 
-            for (const p of properties) {
+            let es2015: ObjectLiteralElementLike[] = [];
+            for (let i = 0; i < properties.length; i++) {
+                const p = properties[i];
                 if (p.kind === SyntaxKind.PropertyAssignment || p.kind === SyntaxKind.ShorthandPropertyAssignment) {
-                    const propName = <Identifier | LiteralExpression>(<PropertyAssignment>p).name;
-                    const target = p.kind === SyntaxKind.ShorthandPropertyAssignment ? <ShorthandPropertyAssignment>p : (<PropertyAssignment>p).initializer || propName;
-                    // Assignment for target = value.propName should highligh whole property, hence use p as source map node
-                    emitDestructuringAssignment(target, createDestructuringPropertyAccess(value, propName), p);
+                    if (!transformRest || p.transformFlags & TransformFlags.ContainsSpreadExpression) {
+                        if (es2015.length) {
+                            emitRestAssignment(es2015, value, location, target);
+                            es2015 = [];
+                        }
+                        const propName = <Identifier | LiteralExpression>(<PropertyAssignment>p).name;
+                        const bindingTarget = p.kind === SyntaxKind.ShorthandPropertyAssignment ? <ShorthandPropertyAssignment>p : (<PropertyAssignment>p).initializer || propName;
+                        // Assignment for bindingTarget = value.propName should highlight whole property, hence use p as source map node
+                        emitDestructuringAssignment(bindingTarget, createDestructuringPropertyAccess(value, propName), p);
+                    }
+                    else {
+                        es2015.push(p);
+                    }
                 }
+                else if (i === properties.length - 1 && p.kind === SyntaxKind.SpreadElementExpression) {
+                    Debug.assert((p as SpreadElementExpression).expression.kind === SyntaxKind.Identifier);
+                    if (es2015.length) {
+                        emitRestAssignment(es2015, value, location, target);
+                        es2015 = [];
+                    }
+                    const propName = (p as SpreadElementExpression).expression as Identifier;
+                    const restCall = createRestCall(value, target.properties, p => p.name, target);
+                    emitDestructuringAssignment(propName, restCall, p);
+                }
+            }
+            if (es2015.length) {
+                emitRestAssignment(es2015, value, location, target);
+                es2015 = [];
             }
         }
 
@@ -318,10 +366,31 @@ namespace ts {
             }
         }
 
+        /** Given value: o, propName: p, pattern: { a, b, ...p } from the original statement
+         * `{ a, b, ...p } = o`, create `p = __rest(o, ["a", "b"]);`*/
+        function createRestCall<T extends Node>(value: Expression, elements: T[], getPropertyName: (element: T) => PropertyName, location: TextRange): Expression {
+            const propertyNames: LiteralExpression[] = [];
+            for (let i = 0; i < elements.length - 1; i++) {
+                if (isOmittedExpression(elements[i])) {
+                    continue;
+                }
+                const str = <StringLiteral>createSynthesizedNode(SyntaxKind.StringLiteral);
+                str.pos = location.pos;
+                str.end = location.end;
+                str.text = getTextOfPropertyName(getPropertyName(elements[i]));
+                propertyNames.push(str);
+            }
+            const args = createSynthesizedNodeArray([value, createArrayLiteral(propertyNames, location)]);
+            return createCall(createIdentifier("__rest"), undefined, args);
+        }
+
         function emitBindingElement(target: VariableDeclaration | ParameterDeclaration | BindingElement, value: Expression) {
             // Any temporary assignments needed to emit target = value should point to target
             const initializer = visitor ? visitNode(target.initializer, visitor, isExpression) : target.initializer;
-            if (initializer) {
+            if (transformRest) {
+                value = value || initializer;
+            }
+            else if (initializer) {
                 // Combine value and initializer
                 value = value ? createDefaultValueCheck(value, initializer, target) : initializer;
             }
@@ -331,9 +400,11 @@ namespace ts {
             }
 
             const name = target.name;
-            if (isBindingPattern(name)) {
-                const elements = name.elements;
-                const numElements = elements.length;
+            if (!isBindingPattern(name)) {
+                emitAssignment(name, value, target, target);
+            }
+            else {
+                const numElements = name.elements.length;
                 if (numElements !== 1) {
                     // For anything other than a single-element destructuring we need to generate a temporary
                     // to ensure value is evaluated exactly once. Additionally, if we have zero elements
@@ -341,29 +412,71 @@ namespace ts {
                     // so in that case, we'll intentionally create that temporary.
                     value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ numElements !== 0, target, emitTempVariableAssignment);
                 }
-                for (let i = 0; i < numElements; i++) {
-                    const element = elements[i];
-                    if (isOmittedExpression(element)) {
-                        continue;
-                    }
-                    else if (name.kind === SyntaxKind.ObjectBindingPattern) {
-                        // Rewrite element to a declaration with an initializer that fetches property
-                        const propName = element.propertyName || <Identifier>element.name;
-                        emitBindingElement(element, createDestructuringPropertyAccess(value, propName));
-                    }
-                    else {
-                        if (!element.dotDotDotToken) {
-                            // Rewrite element to a declaration that accesses array element at index i
-                            emitBindingElement(element, createElementAccess(value, i));
-                        }
-                        else if (i === numElements - 1) {
-                            emitBindingElement(element, createArraySlice(value, i));
-                        }
-                    }
+                if (name.kind === SyntaxKind.ArrayBindingPattern) {
+                    emitArrayBindingElement(name, value);
+                }
+                else {
+                    emitObjectBindingElement(target, value);
                 }
             }
-            else {
-                emitAssignment(name, value, target, target);
+        }
+
+        function emitArrayBindingElement(name: BindingPattern, value: Expression) {
+            const elements = name.elements;
+            const numElements = elements.length;
+            for (let i = 0; i < numElements; i++) {
+                const element = elements[i];
+                if (isOmittedExpression(element)) {
+                    continue;
+                }
+                if (!element.dotDotDotToken) {
+                    // Rewrite element to a declaration that accesses array element at index i
+                    emitBindingElement(element, createElementAccess(value, i));
+                }
+                else if (i === numElements - 1) {
+                    emitBindingElement(element, createArraySlice(value, i));
+                }
+            }
+        }
+
+        function emitObjectBindingElement(target: VariableDeclaration | ParameterDeclaration | BindingElement, value: Expression) {
+            const name = target.name as BindingPattern;
+            const elements = name.elements;
+            const numElements = elements.length;
+            let es2015: BindingElement[] = [];
+            for (let i = 0; i < numElements; i++) {
+                const element = elements[i];
+                if (isOmittedExpression(element)) {
+                    continue;
+                }
+                if (i === numElements - 1 && element.dotDotDotToken) {
+                    if (es2015.length) {
+                        emitRestAssignment(es2015, value, target, target);
+                        es2015 = [];
+                    }
+                    const restCall = createRestCall(value,
+                                                    name.elements,
+                                                    element => (element as BindingElement).propertyName || <Identifier>(element as BindingElement).name,
+                                                    name);
+                    emitBindingElement(element, restCall);
+                }
+                else if (!transformRest || element.transformFlags & TransformFlags.ContainsSpreadExpression) {
+                    if (es2015.length) {
+                        emitRestAssignment(es2015, value, target, target);
+                        es2015 = [];
+                    }
+                    // Rewrite element to a declaration with an initializer that fetches property
+                    const propName = element.propertyName || <Identifier>element.name;
+                    emitBindingElement(element, createDestructuringPropertyAccess(value, propName));
+                }
+                else {
+                    // do not emit until we have a complete bundle of ES2015 syntax
+                    es2015.push(element);
+                }
+            }
+            if (es2015.length) {
+                emitRestAssignment(es2015, value, target, target);
+                es2015 = [];
             }
         }
 
diff --git a/src/compiler/transformers/esnext.ts b/src/compiler/transformers/esnext.ts
index 1a8ed7da5eb..a85098f03b6 100644
--- a/src/compiler/transformers/esnext.ts
+++ b/src/compiler/transformers/esnext.ts
@@ -4,9 +4,16 @@
 /*@internal*/
 namespace ts {
     export function transformESNext(context: TransformationContext) {
+        const {
+            startLexicalEnvironment,
+            endLexicalEnvironment,
+            hoistVariableDeclaration,
+        } = context;
+        let currentSourceFile: SourceFile;
         return transformSourceFile;
 
         function transformSourceFile(node: SourceFile) {
+            currentSourceFile = node;
             return visitEachChild(node, visitor, context);
         }
 
@@ -26,6 +33,23 @@ namespace ts {
             switch (node.kind) {
                 case SyntaxKind.ObjectLiteralExpression:
                     return visitObjectLiteralExpression(node as ObjectLiteralExpression);
+                case SyntaxKind.BinaryExpression:
+                    return visitBinaryExpression(node as BinaryExpression);
+                case SyntaxKind.VariableDeclaration:
+                    return visitVariableDeclaration(node as VariableDeclaration);
+                case SyntaxKind.ForOfStatement:
+                    return visitForOfStatement(node as ForOfStatement);
+                case SyntaxKind.ObjectBindingPattern:
+                case SyntaxKind.ArrayBindingPattern:
+                    return node;
+                case SyntaxKind.FunctionDeclaration:
+                    return visitFunctionDeclaration(node as FunctionDeclaration);
+                case SyntaxKind.FunctionExpression:
+                    return visitFunctionExpression(node as FunctionExpression);
+                case SyntaxKind.ArrowFunction:
+                    return visitArrowFunction(node as ArrowFunction);
+                case SyntaxKind.Parameter:
+                    return visitParameter(node as ParameterDeclaration);
                 default:
                     Debug.failBadSyntaxKind(node);
                     return visitEachChild(node, visitor, context);
@@ -76,5 +100,409 @@ namespace ts {
             }
             return createCall(createIdentifier("__assign"), undefined, objects);
         }
+
+        /**
+         * Visits a BinaryExpression that contains a destructuring assignment.
+         *
+         * @param node A BinaryExpression node.
+         */
+        function visitBinaryExpression(node: BinaryExpression): Expression {
+            if (isDestructuringAssignment(node) && node.left.transformFlags & TransformFlags.AssertESNext) {
+                return flattenDestructuringAssignment(context, node, /*needsDestructuringValue*/ true, hoistVariableDeclaration, visitor, /*transformRest*/ true);
+            }
+
+            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 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.AssertESNext) {
+                const result = flattenVariableDestructuring(node, /*value*/ undefined, visitor, /*recordTempVariable*/ undefined, /*transformRest*/ true);
+                return result;
+            }
+
+            return visitEachChild(node, visitor, context);
+        }
+
+        /**
+         * Visits a ForOfStatement and converts it into a ES2015-compatible ForOfStatement.
+         *
+         * @param node A ForOfStatement.
+         */
+        function visitForOfStatement(node: ForOfStatement): VisitResult<Statement> {
+            // The following ESNext code:
+            //
+            //    for (let { x, y, ...rest } of expr) { }
+            //
+            // should be emitted as
+            //
+            //    for (var _a of expr) {
+            //        let { x, y } = _a, rest = __rest(_a, ["x", "y"]);
+            //    }
+            //
+            // where _a is a temp emitted to capture the RHS.
+            // When the left hand side is an expression instead of a let declaration,
+            // the `let` before the `{ x, y }` is not emitted.
+            // When the left hand side is a let/const, the v is renamed if there is
+            // another v in scope.
+            // Note that all assignments to the LHS are emitted in the body, including
+            // all destructuring.
+            // Note also that because an extra statement is needed to assign to the LHS,
+            // for-of bodies are always emitted as blocks.
+
+            // for (<init> of <expression>) <statement>
+            // where <init> is [let] variabledeclarationlist | expression
+            const initializer = node.initializer;
+            if (!isRestBindingPattern(initializer) && !isRestAssignment(initializer)) {
+                return visitEachChild(node, visitor, context);
+            }
+
+            const expression = visitNode(node.expression, visitor, isExpression);
+            const statements: Statement[] = [];
+            const rhsReference = createTempVariable(/*recordTempVariable*/ undefined);
+
+            // var { x, y } = _a, rest = __rest(_a, ["x", "y"]);
+            if (isVariableDeclarationList(initializer)) {
+                // This works whether the declaration is a var, let, or const.
+                // It will use rhsReference _a as the initializer.
+                const declarations = flattenVariableDestructuring(
+                    initializer.declarations[0],
+                    rhsReference,
+                    visitor,
+                    /*recordTempVariable*/ undefined,
+                    /*transformRest*/ true,
+                );
+
+                const declarationList = createVariableDeclarationList(declarations, /*location*/ initializer);
+                setOriginalNode(declarationList, initializer);
+
+                // Adjust the source map range for the first declaration to align with the old
+                // emitter.
+                const firstDeclaration = declarations[0];
+                const lastDeclaration = lastOrUndefined(declarations);
+                setSourceMapRange(declarationList, createRange(firstDeclaration.pos, lastDeclaration.end));
+
+                statements.push(
+                    createVariableStatement(
+                        /*modifiers*/ undefined,
+                        declarationList
+                    )
+                );
+            }
+            else {
+                // Initializer is an object literal destructuring assignment.
+                // Emit the flattened assignments from the object literal expression in the body
+                const assignment = createAssignment(initializer, rhsReference);
+                statements.push(
+                    createStatement(
+                        flattenDestructuringAssignment(
+                            context,
+                            assignment,
+                            /*needsValue*/ false,
+                            hoistVariableDeclaration,
+                            visitor,
+                            /*transformRest*/ true
+                        )
+                    )
+                );
+            }
+
+            let bodyLocation: TextRange;
+            let statementsLocation: TextRange;
+            const statement = visitNode(node.statement, visitor, isStatement);
+            if (isBlock(statement)) {
+                addRange(statements, statement.statements);
+                bodyLocation = statement;
+                statementsLocation = statement.statements;
+            }
+            else {
+                statements.push(statement);
+            }
+
+            // The old emitter does not emit source maps for the expression
+            setEmitFlags(expression, EmitFlags.NoSourceMap | getEmitFlags(expression));
+
+            // The old emitter does not emit source maps for the block.
+            // We add the location to preserve comments.
+            const body = createBlock(
+                createNodeArray(statements, /*location*/ statementsLocation),
+                /*location*/ bodyLocation
+            );
+
+            setEmitFlags(body, EmitFlags.NoSourceMap | EmitFlags.NoTokenSourceMaps);
+
+            const forStatement = createForOf(
+                createVariableDeclarationList([
+                    createVariableDeclaration(rhsReference, /*type*/ undefined, /*initializer*/ undefined, /*location*/ node.expression)
+                ], /*location*/ node.expression),
+                node.expression,
+                body,
+                /*location*/ node
+            );
+
+            // Disable trailing source maps for the OpenParenToken to align source map emit with the old emitter.
+            setEmitFlags(forStatement, EmitFlags.NoTokenTrailingSourceMaps);
+            return forStatement;
+        }
+
+        function isRestBindingPattern(initializer: ForInitializer) {
+            if (isVariableDeclarationList(initializer)) {
+                const declaration = firstOrUndefined(initializer.declarations);
+                return declaration && declaration.name &&
+                    declaration.name.kind === SyntaxKind.ObjectBindingPattern &&
+                    !!(declaration.name.transformFlags & TransformFlags.ContainsSpreadExpression);
+            }
+            return false;
+        }
+
+        function isRestAssignment(initializer: ForInitializer) {
+            return initializer.kind === SyntaxKind.ObjectLiteralExpression &&
+                initializer.transformFlags & TransformFlags.ContainsSpreadExpression;
+        }
+
+        function visitParameter(node: ParameterDeclaration): ParameterDeclaration {
+            if (isObjectRestParameter(node)) {
+                // Binding patterns are converted into a generated name and are
+                // evaluated inside the function body.
+                return setOriginalNode(
+                    createParameter(
+                        /*decorators*/ undefined,
+                        /*modifiers*/ undefined,
+                        /*dotDotDotToken*/ undefined,
+                        getGeneratedNameForNode(node),
+                        /*questionToken*/ undefined,
+                        /*type*/ undefined,
+                        node.initializer,
+                        /*location*/ node
+                    ),
+                    /*original*/ node
+                );
+            }
+            else {
+                return node;
+            }
+        }
+
+        function isObjectRestParameter(node: ParameterDeclaration) {
+            return node.name &&
+                node.name.kind === SyntaxKind.ObjectBindingPattern &&
+                !!(node.name.transformFlags & TransformFlags.ContainsSpreadExpression);
+        }
+
+        function visitFunctionDeclaration(node: FunctionDeclaration): FunctionDeclaration {
+            return setOriginalNode(
+                createFunctionDeclaration(
+                    /*decorators*/ undefined,
+                    node.modifiers,
+                    node.asteriskToken,
+                    node.name,
+                    /*typeParameters*/ undefined,
+                    visitNodes(node.parameters, visitor, isParameter),
+                    /*type*/ undefined,
+                    transformFunctionBody(node) as Block,
+                    /*location*/ node
+                ),
+                /*original*/ node);
+        }
+
+        function visitArrowFunction(node: ArrowFunction) {
+            const func = setOriginalNode(
+                createArrowFunction(
+                    /*modifiers*/ undefined,
+                    /*typeParameters*/ undefined,
+                    visitNodes(node.parameters, visitor, isParameter),
+                    /*type*/ undefined,
+                    node.equalsGreaterThanToken,
+                    transformFunctionBody(node),
+                    /*location*/ node
+                ),
+                /*original*/ node
+            );
+            setEmitFlags(func, EmitFlags.CapturesThis);
+            return func;
+        }
+
+        function visitFunctionExpression(node: FunctionExpression): Expression {
+            return setOriginalNode(
+                createFunctionExpression(
+                    /*modifiers*/ undefined,
+                    node.asteriskToken,
+                    name,
+                    /*typeParameters*/ undefined,
+                    visitNodes(node.parameters, visitor, isParameter),
+                    /*type*/ undefined,
+                    transformFunctionBody(node) as Block,
+                    /*location*/ node
+                ),
+                /*original*/ node
+            );
+        }
+
+        /**
+         * Transforms the body of a function-like node.
+         *
+         * @param node A function-like node.
+         */
+        function transformFunctionBody(node: FunctionLikeDeclaration): Block | Expression {
+            const hasRest = forEach(node.parameters, isObjectRestParameter);
+            if (!hasRest) {
+                return visitEachChild(node.body, visitor, context);
+            }
+
+            let multiLine = false; // indicates whether the block *must* be emitted as multiple lines
+            let singleLine = false; // indicates whether the block *may* be emitted as a single line
+            let statementsLocation: TextRange;
+            let closeBraceLocation: TextRange;
+
+            const statements: Statement[] = [];
+            const body = node.body;
+            let statementOffset: number;
+
+            startLexicalEnvironment();
+            if (isBlock(body)) {
+                // ensureUseStrict is false because no new prologue-directive should be added.
+                // addPrologueDirectives will simply put already-existing directives at the beginning of the target statement-array
+                statementOffset = addPrologueDirectives(statements, body.statements, /*ensureUseStrict*/ false, visitor);
+            }
+
+            addDefaultValueAssignmentsIfNeeded(statements, node);
+
+            // If we added any generated statements, this must be a multi-line block.
+            if (!multiLine && statements.length > 0) {
+                multiLine = true;
+            }
+
+            if (isBlock(body)) {
+                statementsLocation = body.statements;
+                addRange(statements, visitNodes(body.statements, visitor, isStatement, statementOffset));
+
+                // If the original body was a multi-line block, this must be a multi-line block.
+                if (!multiLine && body.multiLine) {
+                    multiLine = true;
+                }
+            }
+            else {
+                Debug.assert(node.kind === SyntaxKind.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
+                // being emitted for the end position only.
+                statementsLocation = moveRangeEnd(body, -1);
+
+                const equalsGreaterThanToken = (<ArrowFunction>node).equalsGreaterThanToken;
+                if (!nodeIsSynthesized(equalsGreaterThanToken) && !nodeIsSynthesized(body)) {
+                    if (rangeEndIsOnSameLineAsRangeStart(equalsGreaterThanToken, body, currentSourceFile)) {
+                        singleLine = true;
+                    }
+                    else {
+                        multiLine = true;
+                    }
+                }
+
+                const expression = visitNode(body, visitor, isExpression);
+                const returnStatement = createReturn(expression, /*location*/ body);
+                setEmitFlags(returnStatement, EmitFlags.NoTokenSourceMaps | EmitFlags.NoTrailingSourceMap | EmitFlags.NoTrailingComments);
+                statements.push(returnStatement);
+
+                // To align with the source map emit for the old emitter, we set a custom
+                // source map location for the close brace.
+                closeBraceLocation = body;
+            }
+
+            const lexicalEnvironment = endLexicalEnvironment();
+            addRange(statements, lexicalEnvironment);
+
+            // If we added any final generated statements, this must be a multi-line block
+            if (!multiLine && lexicalEnvironment && lexicalEnvironment.length) {
+                multiLine = true;
+            }
+
+            const block = createBlock(createNodeArray(statements, statementsLocation), node.body, multiLine);
+            if (!multiLine && singleLine) {
+                setEmitFlags(block, EmitFlags.SingleLine);
+            }
+
+            if (closeBraceLocation) {
+                setTokenSourceMapRange(block, SyntaxKind.CloseBraceToken, closeBraceLocation);
+            }
+
+            setOriginalNode(block, node.body);
+            return block;
+        }
+
+        function shouldAddDefaultValueAssignments(node: FunctionLikeDeclaration): boolean {
+            return !!(node.transformFlags & TransformFlags.ContainsDefaultValueAssignments);
+        }
+
+        /**
+         * Adds statements to the body of a function-like node if it contains parameters with
+         * binding patterns or initializers.
+         *
+         * @param statements The statements for the new function body.
+         * @param node A function-like node.
+         */
+        function addDefaultValueAssignmentsIfNeeded(statements: Statement[], node: FunctionLikeDeclaration): void {
+            if (!shouldAddDefaultValueAssignments(node)) {
+                return;
+            }
+
+            for (const parameter of node.parameters) {
+                // A rest parameter cannot have a binding pattern or an initializer,
+                // so let's just ignore it.
+                if (parameter.dotDotDotToken) {
+                    continue;
+                }
+
+                if (isBindingPattern(parameter.name)) {
+                    addDefaultValueAssignmentForBindingPattern(statements, parameter);
+                }
+            }
+        }
+
+        /**
+         * Adds statements to the body of a function-like node for parameters with binding patterns
+         *
+         * @param statements The statements for the new function body.
+         * @param parameter The parameter for the function.
+         */
+        function addDefaultValueAssignmentForBindingPattern(statements: Statement[], parameter: ParameterDeclaration): void {
+            const temp = getGeneratedNameForNode(parameter);
+
+            // In cases where a binding pattern is simply '[]' or '{}',
+            // we usually don't want to emit a var declaration; however, in the presence
+            // of an initializer, we must emit that expression to preserve side effects.
+            if ((parameter.name as BindingPattern).elements.length > 0) {
+                statements.push(
+                    setEmitFlags(
+                        createVariableStatement(
+                            /*modifiers*/ undefined,
+                            createVariableDeclarationList(
+                                flattenParameterDestructuring(parameter, temp, visitor, /*transformRest*/ true)
+                            )
+                        ),
+                        EmitFlags.CustomPrologue
+                    )
+                );
+            }
+            else if (parameter.initializer) {
+                statements.push(
+                    setEmitFlags(
+                        createStatement(
+                            createAssignment(
+                                temp,
+                                visitNode(parameter.initializer, visitor, isExpression)
+                            )
+                        ),
+                        EmitFlags.CustomPrologue
+                    )
+                );
+            }
+        }
     }
 }

From ac20b46f4fbd7a526bef4cf3fa20f36b079aee28 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 2 Nov 2016 14:56:58 -0700
Subject: [PATCH 081/421] Add rest tests

---
 .../conformance/types/rest/objectRest.ts      | 33 +++++++++++++++++++
 .../types/rest/objectRestAssignment.ts        |  7 ++++
 .../conformance/types/rest/objectRestForOf.ts | 14 ++++++++
 .../types/rest/objectRestNegative.ts          |  8 +++++
 .../types/rest/objectRestParameter.ts         |  8 +++++
 .../rest}/restElementMustBeLast.ts            |  0
 .../cases/fourslash/completionListForRest.ts  | 13 ++++++++
 tests/cases/fourslash/findAllRefsForRest.ts   | 12 +++++++
 tests/cases/fourslash/goToDefinitionRest.ts   | 12 +++++++
 tests/cases/fourslash/renameRest.ts           | 15 +++++++++
 10 files changed, 122 insertions(+)
 create mode 100644 tests/cases/conformance/types/rest/objectRest.ts
 create mode 100644 tests/cases/conformance/types/rest/objectRestAssignment.ts
 create mode 100644 tests/cases/conformance/types/rest/objectRestForOf.ts
 create mode 100644 tests/cases/conformance/types/rest/objectRestNegative.ts
 create mode 100644 tests/cases/conformance/types/rest/objectRestParameter.ts
 rename tests/cases/conformance/{es6/destructuring => types/rest}/restElementMustBeLast.ts (100%)
 create mode 100644 tests/cases/fourslash/completionListForRest.ts
 create mode 100644 tests/cases/fourslash/findAllRefsForRest.ts
 create mode 100644 tests/cases/fourslash/goToDefinitionRest.ts
 create mode 100644 tests/cases/fourslash/renameRest.ts

diff --git a/tests/cases/conformance/types/rest/objectRest.ts b/tests/cases/conformance/types/rest/objectRest.ts
new file mode 100644
index 00000000000..f1a77b1c129
--- /dev/null
+++ b/tests/cases/conformance/types/rest/objectRest.ts
@@ -0,0 +1,33 @@
+// @target: es2015
+let o = { a: 1, b: 'no' }
+var { ...clone } = o;
+var { a, ...justB } = o;
+var { a, b: renamed, ...empty } = o;
+var { ['b']: renamed, ...justA } = o;
+var { 'b': renamed, ...justA } = o;
+var { b: { '0': n, '1': oooo }, ...justA } = o;
+
+let o2 = { c: 'terrible idea?', d: 'yes' };
+var { d: renamed, ...d } = o2;
+
+let nestedrest: { x: number, n1: { y: number, n2: { z: number, n3: { n4: number } } }, rest: number, restrest: number };
+var { x, n1: { y, n2: { z, n3: { ...nr } } }, ...restrest } = nestedrest;
+
+let complex: { x: { ka, ki }, y: number };
+var { x: { ka, ...nested }, y: other, ...rest } = complex;
+({x: { ka, ...nested }, y: other, ...rest} = complex);
+var { x, ...fresh } = { x: 1, y: 2 };
+({ x, ...fresh } = { x: 1, y: 2 });
+
+class Removable {
+    private x: number;
+    protected y: number;
+    set z(value: number) { }
+    get both(): number { return 12 }
+    set both(value: number) { }
+    m() { }
+    removed: string;
+    remainder: string;
+}
+var removable = new Removable();
+var { removed, ...removableRest } = removable;
diff --git a/tests/cases/conformance/types/rest/objectRestAssignment.ts b/tests/cases/conformance/types/rest/objectRestAssignment.ts
new file mode 100644
index 00000000000..19be53d29a3
--- /dev/null
+++ b/tests/cases/conformance/types/rest/objectRestAssignment.ts
@@ -0,0 +1,7 @@
+let x;
+let ka;
+let nested;
+let other;
+let rest;
+let complex: { x: { ka, ki }, y: number };
+({x: { ka, ...nested }, y: other, ...rest} = complex);
diff --git a/tests/cases/conformance/types/rest/objectRestForOf.ts b/tests/cases/conformance/types/rest/objectRestForOf.ts
new file mode 100644
index 00000000000..4f675b1f15b
--- /dev/null
+++ b/tests/cases/conformance/types/rest/objectRestForOf.ts
@@ -0,0 +1,14 @@
+// @target: es2015
+let array: { x: number, y: string }[];
+for (let { x, ...restOf } of array) {
+    [x, restOf];
+}
+let xx: number;
+let rrestOff: { y: string };
+for ({ x: xx, ...rrestOff } of array ) {
+    [xx, rrestOff];
+}
+for (const norest of array.map(a => ({ ...a, x: 'a string' }))) {
+    [norest.x, norest.y];
+    // x is now a string. who knows why.
+}
diff --git a/tests/cases/conformance/types/rest/objectRestNegative.ts b/tests/cases/conformance/types/rest/objectRestNegative.ts
new file mode 100644
index 00000000000..7296f2d274e
--- /dev/null
+++ b/tests/cases/conformance/types/rest/objectRestNegative.ts
@@ -0,0 +1,8 @@
+let o = { a: 1, b: 'no' };
+var { ...mustBeLast, a } = o;
+function stillMustBeLast({ ...mustBeLast, a }: { a: number, b: string }): void {
+}
+function generic<T extends { x, y }>(t: T) {
+    let { x, ...rest } = t;
+    return rest;
+}
diff --git a/tests/cases/conformance/types/rest/objectRestParameter.ts b/tests/cases/conformance/types/rest/objectRestParameter.ts
new file mode 100644
index 00000000000..5b47442f047
--- /dev/null
+++ b/tests/cases/conformance/types/rest/objectRestParameter.ts
@@ -0,0 +1,8 @@
+// @target: es2015
+function cloneAgain({ a, ...clone }: { a: number, b: string }): void {
+}
+
+declare function suddenly(f: (a: { x: { z, ka }, y: string }) => void);
+suddenly(({ x: a, ...rest }) => rest.y);
+suddenly(({ x: { z = 12, ...nested }, ...rest } = { x: { z: 1, ka: 1 }, y: 'noo' }) => rest.y + nested.ka);
+
diff --git a/tests/cases/conformance/es6/destructuring/restElementMustBeLast.ts b/tests/cases/conformance/types/rest/restElementMustBeLast.ts
similarity index 100%
rename from tests/cases/conformance/es6/destructuring/restElementMustBeLast.ts
rename to tests/cases/conformance/types/rest/restElementMustBeLast.ts
diff --git a/tests/cases/fourslash/completionListForRest.ts b/tests/cases/fourslash/completionListForRest.ts
new file mode 100644
index 00000000000..b880a90b3df
--- /dev/null
+++ b/tests/cases/fourslash/completionListForRest.ts
@@ -0,0 +1,13 @@
+/// <reference path='fourslash.ts'/>
+////interface Gen {
+////    x: number;
+////    parent: Gen;
+////    millenial: string;
+////}
+////let t: Gen;
+////var { x, ...rest } = t;
+////rest./*1*/x;
+goTo.marker('1');
+verify.memberListContains('parent', '(property) Gen.parent: Gen');
+verify.memberListContains('millenial', '(property) Gen.millenial: string');
+verify.memberListCount(2);
diff --git a/tests/cases/fourslash/findAllRefsForRest.ts b/tests/cases/fourslash/findAllRefsForRest.ts
new file mode 100644
index 00000000000..c3a970e9e73
--- /dev/null
+++ b/tests/cases/fourslash/findAllRefsForRest.ts
@@ -0,0 +1,12 @@
+/// <reference path='fourslash.ts'/>
+////interface Gen {
+////    x: number
+////    [|parent|]: Gen;
+////    millenial: string;
+////}
+////let t: Gen;
+////var { x, ...rest } = t;
+////rest.[|parent|];
+const ranges = test.ranges();
+verify.referencesOf(ranges[0], ranges);
+verify.referencesOf(ranges[1], ranges);
diff --git a/tests/cases/fourslash/goToDefinitionRest.ts b/tests/cases/fourslash/goToDefinitionRest.ts
new file mode 100644
index 00000000000..1459b9ffa88
--- /dev/null
+++ b/tests/cases/fourslash/goToDefinitionRest.ts
@@ -0,0 +1,12 @@
+
+/// <reference path='fourslash.ts'/>
+////interface Gen {
+////    x: number;
+////    /*1*/parent: Gen;
+////    millenial: string;
+////}
+////let t: Gen;
+////var { x, ...rest } = t;
+////rest./*2*/parent;
+const ranges = test.ranges();
+verify.goToDefinition('2', [ '1' ]);
diff --git a/tests/cases/fourslash/renameRest.ts b/tests/cases/fourslash/renameRest.ts
new file mode 100644
index 00000000000..a5cc2c38683
--- /dev/null
+++ b/tests/cases/fourslash/renameRest.ts
@@ -0,0 +1,15 @@
+/// <reference path='fourslash.ts'/>
+////interface Gen {
+////    x: number;
+////    [|parent|]: Gen;
+////    millenial: string;
+////}
+////let t: Gen;
+////var { x, ...rest } = t;
+////rest.[|parent|];
+const ranges = test.ranges();
+verify.assertHasRanges(ranges);
+goTo.position(ranges[0].start);
+verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false, ranges);
+goTo.position(ranges[1].start);
+verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false, ranges);

From 9d4ddb68c783de2c67384b408a788d3a2ec59bf8 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 2 Nov 2016 14:57:18 -0700
Subject: [PATCH 082/421] Update baselines

---
 tests/baselines/reference/objectRest.js       |   67 +
 tests/baselines/reference/objectRest.symbols  |  146 ++
 tests/baselines/reference/objectRest.types    |  170 ++
 .../reference/objectRestAssignment.js         |   25 +
 .../reference/objectRestAssignment.symbols    |   30 +
 .../reference/objectRestAssignment.types      |   36 +
 tests/baselines/reference/objectRestForOf.js  |   45 +
 .../reference/objectRestForOf.symbols         |   50 +
 .../baselines/reference/objectRestForOf.types |   61 +
 .../reference/objectRestNegative.errors.txt   |   21 +
 .../baselines/reference/objectRestNegative.js |   27 +
 .../reference/objectRestParameter.js          |   28 +
 .../reference/objectRestParameter.symbols     |   45 +
 .../reference/objectRestParameter.types       |   56 +
 .../restElementMustBeLast.errors.txt          |   10 +-
 ...ngForObjectBindingPatternDefaultValues2.js |   27 +-
 ...rObjectBindingPatternDefaultValues2.js.map |    2 +-
 ...BindingPatternDefaultValues2.sourcemap.txt | 1485 +++++++++--------
 18 files changed, 1582 insertions(+), 749 deletions(-)
 create mode 100644 tests/baselines/reference/objectRest.js
 create mode 100644 tests/baselines/reference/objectRest.symbols
 create mode 100644 tests/baselines/reference/objectRest.types
 create mode 100644 tests/baselines/reference/objectRestAssignment.js
 create mode 100644 tests/baselines/reference/objectRestAssignment.symbols
 create mode 100644 tests/baselines/reference/objectRestAssignment.types
 create mode 100644 tests/baselines/reference/objectRestForOf.js
 create mode 100644 tests/baselines/reference/objectRestForOf.symbols
 create mode 100644 tests/baselines/reference/objectRestForOf.types
 create mode 100644 tests/baselines/reference/objectRestNegative.errors.txt
 create mode 100644 tests/baselines/reference/objectRestNegative.js
 create mode 100644 tests/baselines/reference/objectRestParameter.js
 create mode 100644 tests/baselines/reference/objectRestParameter.symbols
 create mode 100644 tests/baselines/reference/objectRestParameter.types

diff --git a/tests/baselines/reference/objectRest.js b/tests/baselines/reference/objectRest.js
new file mode 100644
index 00000000000..a295ff7b9f1
--- /dev/null
+++ b/tests/baselines/reference/objectRest.js
@@ -0,0 +1,67 @@
+//// [objectRest.ts]
+let o = { a: 1, b: 'no' }
+var { ...clone } = o;
+var { a, ...justB } = o;
+var { a, b: renamed, ...empty } = o;
+var { ['b']: renamed, ...justA } = o;
+var { 'b': renamed, ...justA } = o;
+var { b: { '0': n, '1': oooo }, ...justA } = o;
+
+let o2 = { c: 'terrible idea?', d: 'yes' };
+var { d: renamed, ...d } = o2;
+
+let nestedrest: { x: number, n1: { y: number, n2: { z: number, n3: { n4: number } } }, rest: number, restrest: number };
+var { x, n1: { y, n2: { z, n3: { ...nr } } }, ...restrest } = nestedrest;
+
+let complex: { x: { ka, ki }, y: number };
+var { x: { ka, ...nested }, y: other, ...rest } = complex;
+({x: { ka, ...nested }, y: other, ...rest} = complex);
+var { x, ...fresh } = { x: 1, y: 2 };
+({ x, ...fresh } = { x: 1, y: 2 });
+
+class Removable {
+    private x: number;
+    protected y: number;
+    set z(value: number) { }
+    get both(): number { return 12 }
+    set both(value: number) { }
+    m() { }
+    removed: string;
+    remainder: string;
+}
+var removable = new Removable();
+var { removed, ...removableRest } = removable;
+
+
+//// [objectRest.js]
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && !e.indexOf(p))
+        t[p] = s[p];
+    return t;
+};
+let o = { a: 1, b: 'no' };
+var clone = __rest(o, []);
+var { a } = o, justB = __rest(o, ["a"]);
+var { a, b: renamed } = o, empty = __rest(o, ["a", "b"]);
+var { ['b']: renamed } = o, justA = __rest(o, ["b"]);
+var { 'b': renamed } = o, justA = __rest(o, ["b"]);
+var { b: { '0': n, '1': oooo } } = o, justA = __rest(o, ["b"]);
+let o2 = { c: 'terrible idea?', d: 'yes' };
+var { d: renamed } = o2, d = __rest(o2, ["d"]);
+let nestedrest;
+var { x } = nestedrest, _a = nestedrest.n1, { y } = _a, _b = _a.n2, { z } = _b, nr = __rest(_b.n3, []), restrest = __rest(nestedrest, ["x", "n1"]);
+let complex;
+var _c = complex.x, { ka } = _c, nested = __rest(_c, ["ka"]), { y: other } = complex, rest = __rest(complex, ["x", "y"]);
+(_d = complex.x, { ka } = _d, nested = __rest(_d, ["ka"]), { y: other } = complex, rest = __rest(complex, ["x", "y"]), complex);
+var _e = { x: 1, y: 2 }, { x } = _e, fresh = __rest(_e, ["x"]);
+(_f = { x: 1, y: 2 }, { x } = _f, fresh = __rest(_f, ["x"]), _f);
+class Removable {
+    set z(value) { }
+    get both() { return 12; }
+    set both(value) { }
+    m() { }
+}
+var removable = new Removable();
+var { removed } = removable, removableRest = __rest(removable, ["removed"]);
+var _d, _f;
diff --git a/tests/baselines/reference/objectRest.symbols b/tests/baselines/reference/objectRest.symbols
new file mode 100644
index 00000000000..427656248ee
--- /dev/null
+++ b/tests/baselines/reference/objectRest.symbols
@@ -0,0 +1,146 @@
+=== tests/cases/conformance/types/rest/objectRest.ts ===
+let o = { a: 1, b: 'no' }
+>o : Symbol(o, Decl(objectRest.ts, 0, 3))
+>a : Symbol(a, Decl(objectRest.ts, 0, 9))
+>b : Symbol(b, Decl(objectRest.ts, 0, 15))
+
+var { ...clone } = o;
+>clone : Symbol(clone, Decl(objectRest.ts, 1, 5))
+>o : Symbol(o, Decl(objectRest.ts, 0, 3))
+
+var { a, ...justB } = o;
+>a : Symbol(a, Decl(objectRest.ts, 2, 5), Decl(objectRest.ts, 3, 5))
+>justB : Symbol(justB, Decl(objectRest.ts, 2, 8))
+>o : Symbol(o, Decl(objectRest.ts, 0, 3))
+
+var { a, b: renamed, ...empty } = o;
+>a : Symbol(a, Decl(objectRest.ts, 2, 5), Decl(objectRest.ts, 3, 5))
+>b : Symbol(b, Decl(objectRest.ts, 0, 15))
+>renamed : Symbol(renamed, Decl(objectRest.ts, 3, 8), Decl(objectRest.ts, 4, 5), Decl(objectRest.ts, 5, 5), Decl(objectRest.ts, 9, 5))
+>empty : Symbol(empty, Decl(objectRest.ts, 3, 20))
+>o : Symbol(o, Decl(objectRest.ts, 0, 3))
+
+var { ['b']: renamed, ...justA } = o;
+>'b' : Symbol(renamed, Decl(objectRest.ts, 3, 8), Decl(objectRest.ts, 4, 5), Decl(objectRest.ts, 5, 5), Decl(objectRest.ts, 9, 5))
+>renamed : Symbol(renamed, Decl(objectRest.ts, 3, 8), Decl(objectRest.ts, 4, 5), Decl(objectRest.ts, 5, 5), Decl(objectRest.ts, 9, 5))
+>justA : Symbol(justA, Decl(objectRest.ts, 4, 21), Decl(objectRest.ts, 5, 19), Decl(objectRest.ts, 6, 31))
+>o : Symbol(o, Decl(objectRest.ts, 0, 3))
+
+var { 'b': renamed, ...justA } = o;
+>renamed : Symbol(renamed, Decl(objectRest.ts, 3, 8), Decl(objectRest.ts, 4, 5), Decl(objectRest.ts, 5, 5), Decl(objectRest.ts, 9, 5))
+>justA : Symbol(justA, Decl(objectRest.ts, 4, 21), Decl(objectRest.ts, 5, 19), Decl(objectRest.ts, 6, 31))
+>o : Symbol(o, Decl(objectRest.ts, 0, 3))
+
+var { b: { '0': n, '1': oooo }, ...justA } = o;
+>b : Symbol(b, Decl(objectRest.ts, 0, 15))
+>n : Symbol(n, Decl(objectRest.ts, 6, 10))
+>oooo : Symbol(oooo, Decl(objectRest.ts, 6, 18))
+>justA : Symbol(justA, Decl(objectRest.ts, 4, 21), Decl(objectRest.ts, 5, 19), Decl(objectRest.ts, 6, 31))
+>o : Symbol(o, Decl(objectRest.ts, 0, 3))
+
+let o2 = { c: 'terrible idea?', d: 'yes' };
+>o2 : Symbol(o2, Decl(objectRest.ts, 8, 3))
+>c : Symbol(c, Decl(objectRest.ts, 8, 10))
+>d : Symbol(d, Decl(objectRest.ts, 8, 31))
+
+var { d: renamed, ...d } = o2;
+>d : Symbol(d, Decl(objectRest.ts, 8, 31))
+>renamed : Symbol(renamed, Decl(objectRest.ts, 3, 8), Decl(objectRest.ts, 4, 5), Decl(objectRest.ts, 5, 5), Decl(objectRest.ts, 9, 5))
+>d : Symbol(d, Decl(objectRest.ts, 9, 17))
+>o2 : Symbol(o2, Decl(objectRest.ts, 8, 3))
+
+let nestedrest: { x: number, n1: { y: number, n2: { z: number, n3: { n4: number } } }, rest: number, restrest: number };
+>nestedrest : Symbol(nestedrest, Decl(objectRest.ts, 11, 3))
+>x : Symbol(x, Decl(objectRest.ts, 11, 17))
+>n1 : Symbol(n1, Decl(objectRest.ts, 11, 28))
+>y : Symbol(y, Decl(objectRest.ts, 11, 34))
+>n2 : Symbol(n2, Decl(objectRest.ts, 11, 45))
+>z : Symbol(z, Decl(objectRest.ts, 11, 51))
+>n3 : Symbol(n3, Decl(objectRest.ts, 11, 62))
+>n4 : Symbol(n4, Decl(objectRest.ts, 11, 68))
+>rest : Symbol(rest, Decl(objectRest.ts, 11, 86))
+>restrest : Symbol(restrest, Decl(objectRest.ts, 11, 100))
+
+var { x, n1: { y, n2: { z, n3: { ...nr } } }, ...restrest } = nestedrest;
+>x : Symbol(x, Decl(objectRest.ts, 12, 5), Decl(objectRest.ts, 17, 5))
+>n1 : Symbol(n1, Decl(objectRest.ts, 11, 28))
+>y : Symbol(y, Decl(objectRest.ts, 12, 14))
+>n2 : Symbol(n2, Decl(objectRest.ts, 11, 45))
+>z : Symbol(z, Decl(objectRest.ts, 12, 23))
+>n3 : Symbol(n3, Decl(objectRest.ts, 11, 62))
+>nr : Symbol(nr, Decl(objectRest.ts, 12, 32))
+>restrest : Symbol(restrest, Decl(objectRest.ts, 12, 45))
+>nestedrest : Symbol(nestedrest, Decl(objectRest.ts, 11, 3))
+
+let complex: { x: { ka, ki }, y: number };
+>complex : Symbol(complex, Decl(objectRest.ts, 14, 3))
+>x : Symbol(x, Decl(objectRest.ts, 14, 14))
+>ka : Symbol(ka, Decl(objectRest.ts, 14, 19))
+>ki : Symbol(ki, Decl(objectRest.ts, 14, 23))
+>y : Symbol(y, Decl(objectRest.ts, 14, 29))
+
+var { x: { ka, ...nested }, y: other, ...rest } = complex;
+>x : Symbol(x, Decl(objectRest.ts, 14, 14))
+>ka : Symbol(ka, Decl(objectRest.ts, 15, 10))
+>nested : Symbol(nested, Decl(objectRest.ts, 15, 14))
+>y : Symbol(y, Decl(objectRest.ts, 14, 29))
+>other : Symbol(other, Decl(objectRest.ts, 15, 27))
+>rest : Symbol(rest, Decl(objectRest.ts, 15, 37))
+>complex : Symbol(complex, Decl(objectRest.ts, 14, 3))
+
+({x: { ka, ...nested }, y: other, ...rest} = complex);
+>x : Symbol(x, Decl(objectRest.ts, 16, 2))
+>ka : Symbol(ka, Decl(objectRest.ts, 16, 6))
+>y : Symbol(y, Decl(objectRest.ts, 16, 23))
+>other : Symbol(other, Decl(objectRest.ts, 15, 27))
+>complex : Symbol(complex, Decl(objectRest.ts, 14, 3))
+
+var { x, ...fresh } = { x: 1, y: 2 };
+>x : Symbol(x, Decl(objectRest.ts, 12, 5), Decl(objectRest.ts, 17, 5))
+>fresh : Symbol(fresh, Decl(objectRest.ts, 17, 8))
+>x : Symbol(x, Decl(objectRest.ts, 17, 23))
+>y : Symbol(y, Decl(objectRest.ts, 17, 29))
+
+({ x, ...fresh } = { x: 1, y: 2 });
+>x : Symbol(x, Decl(objectRest.ts, 18, 2))
+>x : Symbol(x, Decl(objectRest.ts, 18, 20))
+>y : Symbol(y, Decl(objectRest.ts, 18, 26))
+
+class Removable {
+>Removable : Symbol(Removable, Decl(objectRest.ts, 18, 35))
+
+    private x: number;
+>x : Symbol(Removable.x, Decl(objectRest.ts, 20, 17))
+
+    protected y: number;
+>y : Symbol(Removable.y, Decl(objectRest.ts, 21, 22))
+
+    set z(value: number) { }
+>z : Symbol(Removable.z, Decl(objectRest.ts, 22, 24))
+>value : Symbol(value, Decl(objectRest.ts, 23, 10))
+
+    get both(): number { return 12 }
+>both : Symbol(Removable.both, Decl(objectRest.ts, 23, 28), Decl(objectRest.ts, 24, 36))
+
+    set both(value: number) { }
+>both : Symbol(Removable.both, Decl(objectRest.ts, 23, 28), Decl(objectRest.ts, 24, 36))
+>value : Symbol(value, Decl(objectRest.ts, 25, 13))
+
+    m() { }
+>m : Symbol(Removable.m, Decl(objectRest.ts, 25, 31))
+
+    removed: string;
+>removed : Symbol(Removable.removed, Decl(objectRest.ts, 26, 11))
+
+    remainder: string;
+>remainder : Symbol(Removable.remainder, Decl(objectRest.ts, 27, 20))
+}
+var removable = new Removable();
+>removable : Symbol(removable, Decl(objectRest.ts, 30, 3))
+>Removable : Symbol(Removable, Decl(objectRest.ts, 18, 35))
+
+var { removed, ...removableRest } = removable;
+>removed : Symbol(removed, Decl(objectRest.ts, 31, 5))
+>removableRest : Symbol(removableRest, Decl(objectRest.ts, 31, 14))
+>removable : Symbol(removable, Decl(objectRest.ts, 30, 3))
+
diff --git a/tests/baselines/reference/objectRest.types b/tests/baselines/reference/objectRest.types
new file mode 100644
index 00000000000..95e378359c8
--- /dev/null
+++ b/tests/baselines/reference/objectRest.types
@@ -0,0 +1,170 @@
+=== tests/cases/conformance/types/rest/objectRest.ts ===
+let o = { a: 1, b: 'no' }
+>o : { a: number; b: string; }
+>{ a: 1, b: 'no' } : { a: number; b: string; }
+>a : number
+>1 : 1
+>b : string
+>'no' : "no"
+
+var { ...clone } = o;
+>clone : { a: number; b: string; }
+>o : { a: number; b: string; }
+
+var { a, ...justB } = o;
+>a : number
+>justB : { b: string; }
+>o : { a: number; b: string; }
+
+var { a, b: renamed, ...empty } = o;
+>a : number
+>b : any
+>renamed : string
+>empty : {}
+>o : { a: number; b: string; }
+
+var { ['b']: renamed, ...justA } = o;
+>'b' : "b"
+>renamed : string
+>justA : { a: number; }
+>o : { a: number; b: string; }
+
+var { 'b': renamed, ...justA } = o;
+>renamed : string
+>justA : { a: number; }
+>o : { a: number; b: string; }
+
+var { b: { '0': n, '1': oooo }, ...justA } = o;
+>b : any
+>n : string
+>oooo : string
+>justA : { a: number; }
+>o : { a: number; b: string; }
+
+let o2 = { c: 'terrible idea?', d: 'yes' };
+>o2 : { c: string; d: string; }
+>{ c: 'terrible idea?', d: 'yes' } : { c: string; d: string; }
+>c : string
+>'terrible idea?' : "terrible idea?"
+>d : string
+>'yes' : "yes"
+
+var { d: renamed, ...d } = o2;
+>d : any
+>renamed : string
+>d : { c: string; }
+>o2 : { c: string; d: string; }
+
+let nestedrest: { x: number, n1: { y: number, n2: { z: number, n3: { n4: number } } }, rest: number, restrest: number };
+>nestedrest : { x: number; n1: { y: number; n2: { z: number; n3: { n4: number; }; }; }; rest: number; restrest: number; }
+>x : number
+>n1 : { y: number; n2: { z: number; n3: { n4: number; }; }; }
+>y : number
+>n2 : { z: number; n3: { n4: number; }; }
+>z : number
+>n3 : { n4: number; }
+>n4 : number
+>rest : number
+>restrest : number
+
+var { x, n1: { y, n2: { z, n3: { ...nr } } }, ...restrest } = nestedrest;
+>x : number
+>n1 : any
+>y : number
+>n2 : any
+>z : number
+>n3 : any
+>nr : { n4: number; }
+>restrest : { rest: number; restrest: number; }
+>nestedrest : { x: number; n1: { y: number; n2: { z: number; n3: { n4: number; }; }; }; rest: number; restrest: number; }
+
+let complex: { x: { ka, ki }, y: number };
+>complex : { x: { ka: any; ki: any; }; y: number; }
+>x : { ka: any; ki: any; }
+>ka : any
+>ki : any
+>y : number
+
+var { x: { ka, ...nested }, y: other, ...rest } = complex;
+>x : any
+>ka : any
+>nested : { ki: any; }
+>y : any
+>other : number
+>rest : {}
+>complex : { x: { ka: any; ki: any; }; y: number; }
+
+({x: { ka, ...nested }, y: other, ...rest} = complex);
+>({x: { ka, ...nested }, y: other, ...rest} = complex) : { x: { ka: any; ki: any; }; y: number; }
+>{x: { ka, ...nested }, y: other, ...rest} = complex : { x: { ka: any; ki: any; }; y: number; }
+>{x: { ka, ...nested }, y: other, ...rest} : { x: { ki: any; ka: any; }; y: number; }
+>x : { ki: any; ka: any; }
+>{ ka, ...nested } : { ki: any; ka: any; }
+>ka : any
+>nested : any
+>y : number
+>other : number
+>rest : any
+>complex : { x: { ka: any; ki: any; }; y: number; }
+
+var { x, ...fresh } = { x: 1, y: 2 };
+>x : number
+>fresh : { y: number; }
+>{ x: 1, y: 2 } : { x: number; y: number; }
+>x : number
+>1 : 1
+>y : number
+>2 : 2
+
+({ x, ...fresh } = { x: 1, y: 2 });
+>({ x, ...fresh } = { x: 1, y: 2 }) : { x: number; y: number; }
+>{ x, ...fresh } = { x: 1, y: 2 } : { x: number; y: number; }
+>{ x, ...fresh } : { y: number; x: number; }
+>x : number
+>fresh : any
+>{ x: 1, y: 2 } : { x: number; y: number; }
+>x : number
+>1 : 1
+>y : number
+>2 : 2
+
+class Removable {
+>Removable : Removable
+
+    private x: number;
+>x : number
+
+    protected y: number;
+>y : number
+
+    set z(value: number) { }
+>z : number
+>value : number
+
+    get both(): number { return 12 }
+>both : number
+>12 : 12
+
+    set both(value: number) { }
+>both : number
+>value : number
+
+    m() { }
+>m : () => void
+
+    removed: string;
+>removed : string
+
+    remainder: string;
+>remainder : string
+}
+var removable = new Removable();
+>removable : Removable
+>new Removable() : Removable
+>Removable : typeof Removable
+
+var { removed, ...removableRest } = removable;
+>removed : string
+>removableRest : { both: number; remainder: string; }
+>removable : Removable
+
diff --git a/tests/baselines/reference/objectRestAssignment.js b/tests/baselines/reference/objectRestAssignment.js
new file mode 100644
index 00000000000..7ecd54c5152
--- /dev/null
+++ b/tests/baselines/reference/objectRestAssignment.js
@@ -0,0 +1,25 @@
+//// [objectRestAssignment.ts]
+let x;
+let ka;
+let nested;
+let other;
+let rest;
+let complex: { x: { ka, ki }, y: number };
+({x: { ka, ...nested }, y: other, ...rest} = complex);
+
+
+//// [objectRestAssignment.js]
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && !e.indexOf(p))
+        t[p] = s[p];
+    return t;
+};
+var x;
+var ka;
+var nested;
+var other;
+var rest;
+var complex;
+(_a = complex.x, (ka = _a.ka, _a), nested = __rest(_a, ["ka"]), (other = complex.y, complex), rest = __rest(complex, ["x", "y"]), complex);
+var _a;
diff --git a/tests/baselines/reference/objectRestAssignment.symbols b/tests/baselines/reference/objectRestAssignment.symbols
new file mode 100644
index 00000000000..3c54290b595
--- /dev/null
+++ b/tests/baselines/reference/objectRestAssignment.symbols
@@ -0,0 +1,30 @@
+=== tests/cases/conformance/types/rest/objectRestAssignment.ts ===
+let x;
+>x : Symbol(x, Decl(objectRestAssignment.ts, 0, 3))
+
+let ka;
+>ka : Symbol(ka, Decl(objectRestAssignment.ts, 1, 3))
+
+let nested;
+>nested : Symbol(nested, Decl(objectRestAssignment.ts, 2, 3))
+
+let other;
+>other : Symbol(other, Decl(objectRestAssignment.ts, 3, 3))
+
+let rest;
+>rest : Symbol(rest, Decl(objectRestAssignment.ts, 4, 3))
+
+let complex: { x: { ka, ki }, y: number };
+>complex : Symbol(complex, Decl(objectRestAssignment.ts, 5, 3))
+>x : Symbol(x, Decl(objectRestAssignment.ts, 5, 14))
+>ka : Symbol(ka, Decl(objectRestAssignment.ts, 5, 19))
+>ki : Symbol(ki, Decl(objectRestAssignment.ts, 5, 23))
+>y : Symbol(y, Decl(objectRestAssignment.ts, 5, 29))
+
+({x: { ka, ...nested }, y: other, ...rest} = complex);
+>x : Symbol(x, Decl(objectRestAssignment.ts, 6, 2))
+>ka : Symbol(ka, Decl(objectRestAssignment.ts, 6, 6))
+>y : Symbol(y, Decl(objectRestAssignment.ts, 6, 23))
+>other : Symbol(other, Decl(objectRestAssignment.ts, 3, 3))
+>complex : Symbol(complex, Decl(objectRestAssignment.ts, 5, 3))
+
diff --git a/tests/baselines/reference/objectRestAssignment.types b/tests/baselines/reference/objectRestAssignment.types
new file mode 100644
index 00000000000..5af3e5872b9
--- /dev/null
+++ b/tests/baselines/reference/objectRestAssignment.types
@@ -0,0 +1,36 @@
+=== tests/cases/conformance/types/rest/objectRestAssignment.ts ===
+let x;
+>x : any
+
+let ka;
+>ka : any
+
+let nested;
+>nested : any
+
+let other;
+>other : any
+
+let rest;
+>rest : any
+
+let complex: { x: { ka, ki }, y: number };
+>complex : { x: { ka: any; ki: any; }; y: number; }
+>x : { ka: any; ki: any; }
+>ka : any
+>ki : any
+>y : number
+
+({x: { ka, ...nested }, y: other, ...rest} = complex);
+>({x: { ka, ...nested }, y: other, ...rest} = complex) : { x: { ka: any; ki: any; }; y: number; }
+>{x: { ka, ...nested }, y: other, ...rest} = complex : { x: { ka: any; ki: any; }; y: number; }
+>{x: { ka, ...nested }, y: other, ...rest} : { x: { ka: any; }; y: any; }
+>x : { ka: any; }
+>{ ka, ...nested } : { ka: any; }
+>ka : any
+>nested : any
+>y : any
+>other : any
+>rest : any
+>complex : { x: { ka: any; ki: any; }; y: number; }
+
diff --git a/tests/baselines/reference/objectRestForOf.js b/tests/baselines/reference/objectRestForOf.js
new file mode 100644
index 00000000000..0a6e2dc40ed
--- /dev/null
+++ b/tests/baselines/reference/objectRestForOf.js
@@ -0,0 +1,45 @@
+//// [objectRestForOf.ts]
+let array: { x: number, y: string }[];
+for (let { x, ...restOf } of array) {
+    [x, restOf];
+}
+let xx: number;
+let rrestOff: { y: string };
+for ({ x: xx, ...rrestOff } of array ) {
+    [xx, rrestOff];
+}
+for (const norest of array.map(a => ({ ...a, x: 'a string' }))) {
+    [norest.x, norest.y];
+    // x is now a string. who knows why.
+}
+
+
+//// [objectRestForOf.js]
+var __assign = (this && this.__assign) || Object.assign || function(t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+        s = arguments[i];
+        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+            t[p] = s[p];
+    }
+    return t;
+};
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && !e.indexOf(p))
+        t[p] = s[p];
+    return t;
+};
+let array;
+for (var _a of array) {
+    var { x } = _a, restOf = __rest(_a, ["x"]);
+    [x, restOf];
+}
+let xx;
+let rrestOff;
+for (var _b of array) {
+    ({ x: xx } = _b, rrestOff = __rest(_b, ["x"]));
+    [xx, rrestOff];
+}
+for (const norest of array.map(a => (__assign({}, a, { x: 'a string' })))) {
+    [norest.x, norest.y];
+}
diff --git a/tests/baselines/reference/objectRestForOf.symbols b/tests/baselines/reference/objectRestForOf.symbols
new file mode 100644
index 00000000000..ec0ccde740d
--- /dev/null
+++ b/tests/baselines/reference/objectRestForOf.symbols
@@ -0,0 +1,50 @@
+=== tests/cases/conformance/types/rest/objectRestForOf.ts ===
+let array: { x: number, y: string }[];
+>array : Symbol(array, Decl(objectRestForOf.ts, 0, 3))
+>x : Symbol(x, Decl(objectRestForOf.ts, 0, 12))
+>y : Symbol(y, Decl(objectRestForOf.ts, 0, 23))
+
+for (let { x, ...restOf } of array) {
+>x : Symbol(x, Decl(objectRestForOf.ts, 1, 10))
+>restOf : Symbol(restOf, Decl(objectRestForOf.ts, 1, 13))
+>array : Symbol(array, Decl(objectRestForOf.ts, 0, 3))
+
+    [x, restOf];
+>x : Symbol(x, Decl(objectRestForOf.ts, 1, 10))
+>restOf : Symbol(restOf, Decl(objectRestForOf.ts, 1, 13))
+}
+let xx: number;
+>xx : Symbol(xx, Decl(objectRestForOf.ts, 4, 3))
+
+let rrestOff: { y: string };
+>rrestOff : Symbol(rrestOff, Decl(objectRestForOf.ts, 5, 3))
+>y : Symbol(y, Decl(objectRestForOf.ts, 5, 15))
+
+for ({ x: xx, ...rrestOff } of array ) {
+>x : Symbol(x, Decl(objectRestForOf.ts, 6, 6))
+>xx : Symbol(xx, Decl(objectRestForOf.ts, 4, 3))
+>array : Symbol(array, Decl(objectRestForOf.ts, 0, 3))
+
+    [xx, rrestOff];
+>xx : Symbol(xx, Decl(objectRestForOf.ts, 4, 3))
+>rrestOff : Symbol(rrestOff, Decl(objectRestForOf.ts, 5, 3))
+}
+for (const norest of array.map(a => ({ ...a, x: 'a string' }))) {
+>norest : Symbol(norest, Decl(objectRestForOf.ts, 9, 10))
+>array.map : Symbol(Array.map, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>array : Symbol(array, Decl(objectRestForOf.ts, 0, 3))
+>map : Symbol(Array.map, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>a : Symbol(a, Decl(objectRestForOf.ts, 9, 31))
+>x : Symbol(x, Decl(objectRestForOf.ts, 9, 44))
+
+    [norest.x, norest.y];
+>norest.x : Symbol(x, Decl(objectRestForOf.ts, 9, 44))
+>norest : Symbol(norest, Decl(objectRestForOf.ts, 9, 10))
+>x : Symbol(x, Decl(objectRestForOf.ts, 9, 44))
+>norest.y : Symbol(y, Decl(objectRestForOf.ts, 0, 23))
+>norest : Symbol(norest, Decl(objectRestForOf.ts, 9, 10))
+>y : Symbol(y, Decl(objectRestForOf.ts, 0, 23))
+
+    // x is now a string. who knows why.
+}
+
diff --git a/tests/baselines/reference/objectRestForOf.types b/tests/baselines/reference/objectRestForOf.types
new file mode 100644
index 00000000000..e8c3b4a82ab
--- /dev/null
+++ b/tests/baselines/reference/objectRestForOf.types
@@ -0,0 +1,61 @@
+=== tests/cases/conformance/types/rest/objectRestForOf.ts ===
+let array: { x: number, y: string }[];
+>array : { x: number; y: string; }[]
+>x : number
+>y : string
+
+for (let { x, ...restOf } of array) {
+>x : number
+>restOf : { y: string; }
+>array : { x: number; y: string; }[]
+
+    [x, restOf];
+>[x, restOf] : (number | { y: string; })[]
+>x : number
+>restOf : { y: string; }
+}
+let xx: number;
+>xx : number
+
+let rrestOff: { y: string };
+>rrestOff : { y: string; }
+>y : string
+
+for ({ x: xx, ...rrestOff } of array ) {
+>{ x: xx, ...rrestOff } : { y: string; x: number; }
+>x : { x: number; y: string; }
+>xx : number
+>rrestOff : any
+>array : { x: number; y: string; }[]
+
+    [xx, rrestOff];
+>[xx, rrestOff] : (number | { y: string; })[]
+>xx : number
+>rrestOff : { y: string; }
+}
+for (const norest of array.map(a => ({ ...a, x: 'a string' }))) {
+>norest : { x: string; y: string; }
+>array.map(a => ({ ...a, x: 'a string' })) : { x: string; y: string; }[]
+>array.map : { <U>(this: [{ x: number; y: string; }, { x: number; y: string; }, { x: number; y: string; }, { x: number; y: string; }, { x: number; y: string; }], callbackfn: (value: { x: number; y: string; }, index: number, array: { x: number; y: string; }[]) => U, thisArg?: any): [U, U, U, U, U]; <U>(this: [{ x: number; y: string; }, { x: number; y: string; }, { x: number; y: string; }, { x: number; y: string; }], callbackfn: (value: { x: number; y: string; }, index: number, array: { x: number; y: string; }[]) => U, thisArg?: any): [U, U, U, U]; <U>(this: [{ x: number; y: string; }, { x: number; y: string; }, { x: number; y: string; }], callbackfn: (value: { x: number; y: string; }, index: number, array: { x: number; y: string; }[]) => U, thisArg?: any): [U, U, U]; <U>(this: [{ x: number; y: string; }, { x: number; y: string; }], callbackfn: (value: { x: number; y: string; }, index: number, array: { x: number; y: string; }[]) => U, thisArg?: any): [U, U]; <U>(callbackfn: (value: { x: number; y: string; }, index: number, array: { x: number; y: string; }[]) => U, thisArg?: any): U[]; }
+>array : { x: number; y: string; }[]
+>map : { <U>(this: [{ x: number; y: string; }, { x: number; y: string; }, { x: number; y: string; }, { x: number; y: string; }, { x: number; y: string; }], callbackfn: (value: { x: number; y: string; }, index: number, array: { x: number; y: string; }[]) => U, thisArg?: any): [U, U, U, U, U]; <U>(this: [{ x: number; y: string; }, { x: number; y: string; }, { x: number; y: string; }, { x: number; y: string; }], callbackfn: (value: { x: number; y: string; }, index: number, array: { x: number; y: string; }[]) => U, thisArg?: any): [U, U, U, U]; <U>(this: [{ x: number; y: string; }, { x: number; y: string; }, { x: number; y: string; }], callbackfn: (value: { x: number; y: string; }, index: number, array: { x: number; y: string; }[]) => U, thisArg?: any): [U, U, U]; <U>(this: [{ x: number; y: string; }, { x: number; y: string; }], callbackfn: (value: { x: number; y: string; }, index: number, array: { x: number; y: string; }[]) => U, thisArg?: any): [U, U]; <U>(callbackfn: (value: { x: number; y: string; }, index: number, array: { x: number; y: string; }[]) => U, thisArg?: any): U[]; }
+>a => ({ ...a, x: 'a string' }) : (a: { x: number; y: string; }) => { x: string; y: string; }
+>a : { x: number; y: string; }
+>({ ...a, x: 'a string' }) : { x: string; y: string; }
+>{ ...a, x: 'a string' } : { x: string; y: string; }
+>a : any
+>x : string
+>'a string' : "a string"
+
+    [norest.x, norest.y];
+>[norest.x, norest.y] : string[]
+>norest.x : string
+>norest : { x: string; y: string; }
+>x : string
+>norest.y : string
+>norest : { x: string; y: string; }
+>y : string
+
+    // x is now a string. who knows why.
+}
+
diff --git a/tests/baselines/reference/objectRestNegative.errors.txt b/tests/baselines/reference/objectRestNegative.errors.txt
new file mode 100644
index 00000000000..1874570da7c
--- /dev/null
+++ b/tests/baselines/reference/objectRestNegative.errors.txt
@@ -0,0 +1,21 @@
+tests/cases/conformance/types/rest/objectRestNegative.ts(2,10): error TS2462: A rest element must be last in a destructuring pattern
+tests/cases/conformance/types/rest/objectRestNegative.ts(3,31): error TS2462: A rest element must be last in a destructuring pattern
+tests/cases/conformance/types/rest/objectRestNegative.ts(6,17): error TS2700: Rest types may only be created from object types.
+
+
+==== tests/cases/conformance/types/rest/objectRestNegative.ts (3 errors) ====
+    let o = { a: 1, b: 'no' };
+    var { ...mustBeLast, a } = o;
+             ~~~~~~~~~~
+!!! error TS2462: A rest element must be last in a destructuring pattern
+    function stillMustBeLast({ ...mustBeLast, a }: { a: number, b: string }): void {
+                                  ~~~~~~~~~~
+!!! error TS2462: A rest element must be last in a destructuring pattern
+    }
+    function generic<T extends { x, y }>(t: T) {
+        let { x, ...rest } = t;
+                    ~~~~
+!!! error TS2700: Rest types may only be created from object types.
+        return rest;
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/objectRestNegative.js b/tests/baselines/reference/objectRestNegative.js
new file mode 100644
index 00000000000..b3b49740762
--- /dev/null
+++ b/tests/baselines/reference/objectRestNegative.js
@@ -0,0 +1,27 @@
+//// [objectRestNegative.ts]
+let o = { a: 1, b: 'no' };
+var { ...mustBeLast, a } = o;
+function stillMustBeLast({ ...mustBeLast, a }: { a: number, b: string }): void {
+}
+function generic<T extends { x, y }>(t: T) {
+    let { x, ...rest } = t;
+    return rest;
+}
+
+
+//// [objectRestNegative.js]
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && !e.indexOf(p))
+        t[p] = s[p];
+    return t;
+};
+var o = { a: 1, b: 'no' };
+var mustBeLast = o.mustBeLast, a = o.a;
+function stillMustBeLast(_a) {
+    var mustBeLast = _a.mustBeLast, a = _a.a;
+}
+function generic(t) {
+    var x = t.x, rest = __rest(t, ["x"]);
+    return rest;
+}
diff --git a/tests/baselines/reference/objectRestParameter.js b/tests/baselines/reference/objectRestParameter.js
new file mode 100644
index 00000000000..49434f24eec
--- /dev/null
+++ b/tests/baselines/reference/objectRestParameter.js
@@ -0,0 +1,28 @@
+//// [objectRestParameter.ts]
+function cloneAgain({ a, ...clone }: { a: number, b: string }): void {
+}
+
+declare function suddenly(f: (a: { x: { z, ka }, y: string }) => void);
+suddenly(({ x: a, ...rest }) => rest.y);
+suddenly(({ x: { z = 12, ...nested }, ...rest } = { x: { z: 1, ka: 1 }, y: 'noo' }) => rest.y + nested.ka);
+
+
+
+//// [objectRestParameter.js]
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && !e.indexOf(p))
+        t[p] = s[p];
+    return t;
+};
+function cloneAgain(_a) {
+    var { a } = _a, clone = __rest(_a, ["a"]);
+}
+suddenly((_a) => {
+    var { x: a } = _a, rest = __rest(_a, ["x"]);
+    return rest.y;
+});
+suddenly((_a = { x: { z: 1, ka: 1 }, y: 'noo' }) => {
+    var _b = _a.x, { z = 12 } = _b, nested = __rest(_b, ["z"]), rest = __rest(_a, ["x"]);
+    return rest.y + nested.ka;
+});
diff --git a/tests/baselines/reference/objectRestParameter.symbols b/tests/baselines/reference/objectRestParameter.symbols
new file mode 100644
index 00000000000..9569dc53d3a
--- /dev/null
+++ b/tests/baselines/reference/objectRestParameter.symbols
@@ -0,0 +1,45 @@
+=== tests/cases/conformance/types/rest/objectRestParameter.ts ===
+function cloneAgain({ a, ...clone }: { a: number, b: string }): void {
+>cloneAgain : Symbol(cloneAgain, Decl(objectRestParameter.ts, 0, 0))
+>a : Symbol(a, Decl(objectRestParameter.ts, 0, 21))
+>clone : Symbol(clone, Decl(objectRestParameter.ts, 0, 24))
+>a : Symbol(a, Decl(objectRestParameter.ts, 0, 38))
+>b : Symbol(b, Decl(objectRestParameter.ts, 0, 49))
+}
+
+declare function suddenly(f: (a: { x: { z, ka }, y: string }) => void);
+>suddenly : Symbol(suddenly, Decl(objectRestParameter.ts, 1, 1))
+>f : Symbol(f, Decl(objectRestParameter.ts, 3, 26))
+>a : Symbol(a, Decl(objectRestParameter.ts, 3, 30))
+>x : Symbol(x, Decl(objectRestParameter.ts, 3, 34))
+>z : Symbol(z, Decl(objectRestParameter.ts, 3, 39))
+>ka : Symbol(ka, Decl(objectRestParameter.ts, 3, 42))
+>y : Symbol(y, Decl(objectRestParameter.ts, 3, 48))
+
+suddenly(({ x: a, ...rest }) => rest.y);
+>suddenly : Symbol(suddenly, Decl(objectRestParameter.ts, 1, 1))
+>x : Symbol(x, Decl(objectRestParameter.ts, 3, 34))
+>a : Symbol(a, Decl(objectRestParameter.ts, 4, 11))
+>rest : Symbol(rest, Decl(objectRestParameter.ts, 4, 17))
+>rest.y : Symbol(y, Decl(objectRestParameter.ts, 3, 48))
+>rest : Symbol(rest, Decl(objectRestParameter.ts, 4, 17))
+>y : Symbol(y, Decl(objectRestParameter.ts, 3, 48))
+
+suddenly(({ x: { z = 12, ...nested }, ...rest } = { x: { z: 1, ka: 1 }, y: 'noo' }) => rest.y + nested.ka);
+>suddenly : Symbol(suddenly, Decl(objectRestParameter.ts, 1, 1))
+>x : Symbol(x, Decl(objectRestParameter.ts, 3, 34))
+>z : Symbol(z, Decl(objectRestParameter.ts, 5, 16))
+>nested : Symbol(nested, Decl(objectRestParameter.ts, 5, 24))
+>rest : Symbol(rest, Decl(objectRestParameter.ts, 5, 37))
+>x : Symbol(x, Decl(objectRestParameter.ts, 5, 51))
+>z : Symbol(z, Decl(objectRestParameter.ts, 5, 56))
+>ka : Symbol(ka, Decl(objectRestParameter.ts, 5, 62))
+>y : Symbol(y, Decl(objectRestParameter.ts, 5, 71))
+>rest.y : Symbol(y, Decl(objectRestParameter.ts, 3, 48))
+>rest : Symbol(rest, Decl(objectRestParameter.ts, 5, 37))
+>y : Symbol(y, Decl(objectRestParameter.ts, 3, 48))
+>nested.ka : Symbol(ka, Decl(objectRestParameter.ts, 3, 42))
+>nested : Symbol(nested, Decl(objectRestParameter.ts, 5, 24))
+>ka : Symbol(ka, Decl(objectRestParameter.ts, 3, 42))
+
+
diff --git a/tests/baselines/reference/objectRestParameter.types b/tests/baselines/reference/objectRestParameter.types
new file mode 100644
index 00000000000..c634c9c5cd5
--- /dev/null
+++ b/tests/baselines/reference/objectRestParameter.types
@@ -0,0 +1,56 @@
+=== tests/cases/conformance/types/rest/objectRestParameter.ts ===
+function cloneAgain({ a, ...clone }: { a: number, b: string }): void {
+>cloneAgain : ({a, ...clone}: { a: number; b: string; }) => void
+>a : number
+>clone : { b: string; }
+>a : number
+>b : string
+}
+
+declare function suddenly(f: (a: { x: { z, ka }, y: string }) => void);
+>suddenly : (f: (a: { x: { z: any; ka: any; }; y: string; }) => void) => any
+>f : (a: { x: { z: any; ka: any; }; y: string; }) => void
+>a : { x: { z: any; ka: any; }; y: string; }
+>x : { z: any; ka: any; }
+>z : any
+>ka : any
+>y : string
+
+suddenly(({ x: a, ...rest }) => rest.y);
+>suddenly(({ x: a, ...rest }) => rest.y) : any
+>suddenly : (f: (a: { x: { z: any; ka: any; }; y: string; }) => void) => any
+>({ x: a, ...rest }) => rest.y : ({x: a, ...rest}: { x: { z: any; ka: any; }; y: string; }) => string
+>x : any
+>a : { z: any; ka: any; }
+>rest : { y: string; }
+>rest.y : string
+>rest : { y: string; }
+>y : string
+
+suddenly(({ x: { z = 12, ...nested }, ...rest } = { x: { z: 1, ka: 1 }, y: 'noo' }) => rest.y + nested.ka);
+>suddenly(({ x: { z = 12, ...nested }, ...rest } = { x: { z: 1, ka: 1 }, y: 'noo' }) => rest.y + nested.ka) : any
+>suddenly : (f: (a: { x: { z: any; ka: any; }; y: string; }) => void) => any
+>({ x: { z = 12, ...nested }, ...rest } = { x: { z: 1, ka: 1 }, y: 'noo' }) => rest.y + nested.ka : ({x: {z, ...nested}, ...rest}?: { x: { z: any; ka: any; }; y: string; }) => string
+>x : any
+>z : any
+>12 : 12
+>nested : { ka: any; }
+>rest : { y: string; }
+>{ x: { z: 1, ka: 1 }, y: 'noo' } : { x: { z: number; ka: number; }; y: string; }
+>x : { z: number; ka: number; }
+>{ z: 1, ka: 1 } : { z: number; ka: number; }
+>z : number
+>1 : 1
+>ka : number
+>1 : 1
+>y : string
+>'noo' : "noo"
+>rest.y + nested.ka : string
+>rest.y : string
+>rest : { y: string; }
+>y : string
+>nested.ka : any
+>nested : { ka: any; }
+>ka : any
+
+
diff --git a/tests/baselines/reference/restElementMustBeLast.errors.txt b/tests/baselines/reference/restElementMustBeLast.errors.txt
index 269d984bc00..5eb5a4cd208 100644
--- a/tests/baselines/reference/restElementMustBeLast.errors.txt
+++ b/tests/baselines/reference/restElementMustBeLast.errors.txt
@@ -1,12 +1,12 @@
-tests/cases/conformance/es6/destructuring/restElementMustBeLast.ts(1,9): error TS2462: A rest element must be last in an array destructuring pattern
-tests/cases/conformance/es6/destructuring/restElementMustBeLast.ts(2,2): error TS2462: A rest element must be last in an array destructuring pattern
+tests/cases/conformance/types/rest/restElementMustBeLast.ts(1,9): error TS2462: A rest element must be last in a destructuring pattern
+tests/cases/conformance/types/rest/restElementMustBeLast.ts(2,2): error TS2462: A rest element must be last in a destructuring pattern
 
 
-==== tests/cases/conformance/es6/destructuring/restElementMustBeLast.ts (2 errors) ====
+==== tests/cases/conformance/types/rest/restElementMustBeLast.ts (2 errors) ====
     var [...a, x] = [1, 2, 3];  // Error, rest must be last element
             ~
-!!! error TS2462: A rest element must be last in an array destructuring pattern
+!!! error TS2462: A rest element must be last in a destructuring pattern
     [...a, x] = [1, 2, 3];      // Error, rest must be last element
      ~~~~
-!!! error TS2462: A rest element must be last in an array destructuring pattern
+!!! error TS2462: A rest element must be last in a destructuring pattern
     
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js
index 9f7a70699bd..8355d61d9c3 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js
@@ -194,13 +194,13 @@ for (_b = getRobot(), _c = _b.name, nameA = _c === void 0 ? "noName" : _c, _b, i
 for (_d = { name: "trimmer", skill: "trimming" }, _e = _d.name, nameA = _e === void 0 ? "noName" : _e, _d, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for (_f = multiRobot.skills, _g = _f === void 0 ? { primary: "none", secondary: "none" } : _f, _h = _g.primary, primaryA = _h === void 0 ? "primary" : _h, _j = _g.secondary, secondaryA = _j === void 0 ? "secondary" : _j, multiRobot, i = 0; i < 1; i++) {
+for (_f = multiRobot.skills, _g = _f === void 0 ? { primary: "none", secondary: "none" } : _f, _h = _g.primary, primaryA = _h === void 0 ? "primary" : _h, _j = _g.secondary, secondaryA = _j === void 0 ? "secondary" : _j, multiRobot, multiRobot, i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for (_k = getMultiRobot(), _l = _k.skills, _m = _l === void 0 ? { primary: "none", secondary: "none" } : _l, _o = _m.primary, primaryA = _o === void 0 ? "primary" : _o, _p = _m.secondary, secondaryA = _p === void 0 ? "secondary" : _p, _k, i = 0; i < 1; i++) {
+for (_k = getMultiRobot(), (_l = _k.skills, _m = _l === void 0 ? { primary: "none", secondary: "none" } : _l, _o = _m.primary, primaryA = _o === void 0 ? "primary" : _o, _p = _m.secondary, secondaryA = _p === void 0 ? "secondary" : _p, _k), _k, i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for (_q = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _r = _q.skills, _s = _r === void 0 ? { primary: "none", secondary: "none" } : _r, _t = _s.primary, primaryA = _t === void 0 ? "primary" : _t, _u = _s.secondary, secondaryA = _u === void 0 ? "secondary" : _u, _q,
+for (_q = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, (_r = _q.skills, _s = _r === void 0 ? { primary: "none", secondary: "none" } : _r, _t = _s.primary, primaryA = _t === void 0 ? "primary" : _t, _u = _s.secondary, secondaryA = _u === void 0 ? "secondary" : _u, _q), _q,
     i = 0; i < 1; i++) {
     console.log(primaryA);
 }
@@ -213,13 +213,13 @@ for (_w = getRobot(), _x = _w.name, name = _x === void 0 ? "noName" : _x, _w, i
 for (_y = { name: "trimmer", skill: "trimming" }, _z = _y.name, name = _z === void 0 ? "noName" : _z, _y, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for (_0 = multiRobot.skills, _1 = _0 === void 0 ? { primary: "none", secondary: "none" } : _0, _2 = _1.primary, primary = _2 === void 0 ? "primary" : _2, _3 = _1.secondary, secondary = _3 === void 0 ? "secondary" : _3, multiRobot, i = 0; i < 1; i++) {
+for (_0 = multiRobot.skills, _1 = _0 === void 0 ? { primary: "none", secondary: "none" } : _0, _2 = _1.primary, primary = _2 === void 0 ? "primary" : _2, _3 = _1.secondary, secondary = _3 === void 0 ? "secondary" : _3, multiRobot, multiRobot, i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for (_4 = getMultiRobot(), _5 = _4.skills, _6 = _5 === void 0 ? { primary: "none", secondary: "none" } : _5, _7 = _6.primary, primary = _7 === void 0 ? "primary" : _7, _8 = _6.secondary, secondary = _8 === void 0 ? "secondary" : _8, _4, i = 0; i < 1; i++) {
+for (_4 = getMultiRobot(), (_5 = _4.skills, _6 = _5 === void 0 ? { primary: "none", secondary: "none" } : _5, _7 = _6.primary, primary = _7 === void 0 ? "primary" : _7, _8 = _6.secondary, secondary = _8 === void 0 ? "secondary" : _8, _4), _4, i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for (_9 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _10 = _9.skills, _11 = _10 === void 0 ? { primary: "none", secondary: "none" } : _10, _12 = _11.primary, primary = _12 === void 0 ? "primary" : _12, _13 = _11.secondary, secondary = _13 === void 0 ? "secondary" : _13, _9,
+for (_9 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, (_10 = _9.skills, _11 = _10 === void 0 ? { primary: "none", secondary: "none" } : _10, _12 = _11.primary, primary = _12 === void 0 ? "primary" : _12, _13 = _11.secondary, secondary = _13 === void 0 ? "secondary" : _13, _9), _9,
     i = 0; i < 1; i++) {
     console.log(primaryA);
 }
@@ -232,13 +232,13 @@ for (_16 = getRobot(), _17 = _16.name, nameA = _17 === void 0 ? "noName" : _17,
 for (_19 = { name: "trimmer", skill: "trimming" }, _20 = _19.name, nameA = _20 === void 0 ? "noName" : _20, _21 = _19.skill, skillA = _21 === void 0 ? "skill" : _21, _19, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for (_22 = multiRobot.name, nameA = _22 === void 0 ? "noName" : _22, _23 = multiRobot.skills, _24 = _23 === void 0 ? { primary: "none", secondary: "none" } : _23, _25 = _24.primary, primaryA = _25 === void 0 ? "primary" : _25, _26 = _24.secondary, secondaryA = _26 === void 0 ? "secondary" : _26, multiRobot, i = 0; i < 1; i++) {
+for (_22 = multiRobot.name, nameA = _22 === void 0 ? "noName" : _22, _23 = multiRobot.skills, _24 = _23 === void 0 ? { primary: "none", secondary: "none" } : _23, _25 = _24.primary, primaryA = _25 === void 0 ? "primary" : _25, _26 = _24.secondary, secondaryA = _26 === void 0 ? "secondary" : _26, multiRobot, multiRobot, i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for (_27 = getMultiRobot(), _28 = _27.name, nameA = _28 === void 0 ? "noName" : _28, _29 = _27.skills, _30 = _29 === void 0 ? { primary: "none", secondary: "none" } : _29, _31 = _30.primary, primaryA = _31 === void 0 ? "primary" : _31, _32 = _30.secondary, secondaryA = _32 === void 0 ? "secondary" : _32, _27, i = 0; i < 1; i++) {
+for (_27 = getMultiRobot(), (_28 = _27.name, nameA = _28 === void 0 ? "noName" : _28, _29 = _27.skills, _30 = _29 === void 0 ? { primary: "none", secondary: "none" } : _29, _31 = _30.primary, primaryA = _31 === void 0 ? "primary" : _31, _32 = _30.secondary, secondaryA = _32 === void 0 ? "secondary" : _32, _27), _27, i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for (_33 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _34 = _33.name, nameA = _34 === void 0 ? "noName" : _34, _35 = _33.skills, _36 = _35 === void 0 ? { primary: "none", secondary: "none" } : _35, _37 = _36.primary, primaryA = _37 === void 0 ? "primary" : _37, _38 = _36.secondary, secondaryA = _38 === void 0 ? "secondary" : _38, _33,
+for (_33 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, (_34 = _33.name, nameA = _34 === void 0 ? "noName" : _34, _35 = _33.skills, _36 = _35 === void 0 ? { primary: "none", secondary: "none" } : _35, _37 = _36.primary, primaryA = _37 === void 0 ? "primary" : _37, _38 = _36.secondary, secondaryA = _38 === void 0 ? "secondary" : _38, _33), _33,
     i = 0; i < 1; i++) {
     console.log(primaryA);
 }
@@ -251,15 +251,16 @@ for (_41 = getRobot(), _42 = _41.name, name = _42 === void 0 ? "noName" : _42, _
 for (_44 = { name: "trimmer", skill: "trimming" }, _45 = _44.name, name = _45 === void 0 ? "noName" : _45, _46 = _44.skill, skill = _46 === void 0 ? "skill" : _46, _44, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for (_47 = multiRobot.name, name = _47 === void 0 ? "noName" : _47, _48 = multiRobot.skills, _49 = _48 === void 0 ? { primary: "none", secondary: "none" } : _48, _50 = _49.primary, primary = _50 === void 0 ? "primary" : _50, _51 = _49.secondary, secondary = _51 === void 0 ? "secondary" : _51, multiRobot, i = 0; i < 1; i++) {
+for (_47 = multiRobot.name, name = _47 === void 0 ? "noName" : _47, _48 = multiRobot.skills, _49 = _48 === void 0 ? { primary: "none", secondary: "none" } : _48, _50 = _49.primary, primary = _50 === void 0 ? "primary" : _50, _51 = _49.secondary, secondary = _51 === void 0 ? "secondary" : _51, multiRobot, multiRobot, i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for (_52 = getMultiRobot(), _53 = _52.name, name = _53 === void 0 ? "noName" : _53, _54 = _52.skills, _55 = _54 === void 0 ? { primary: "none", secondary: "none" } : _54, _56 = _55.primary, primary = _56 === void 0 ? "primary" : _56, _57 = _55.secondary, secondary = _57 === void 0 ? "secondary" : _57, _52, i = 0; i < 1; i++) {
+for (_52 = getMultiRobot(), (_53 = _52.name, name = _53 === void 0 ? "noName" : _53, _54 = _52.skills, _55 = _54 === void 0 ? { primary: "none", secondary: "none" } : _54, _56 = _55.primary, primary = _56 === void 0 ? "primary" : _56, _57 = _55.secondary, secondary = _57 === void 0 ? "secondary" : _57, _52), _52, i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for (_58 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _59 = _58.name, name = _59 === void 0 ? "noName" : _59, _60 = _58.skills, _61 = _60 === void 0 ? { primary: "none", secondary: "none" } : _60, _62 = _61.primary, primary = _62 === void 0 ? "primary" : _62, _63 = _61.secondary, secondary = _63 === void 0 ? "secondary" : _63, _58,
+for (_58 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, (_59 = _58.name, name = _59 === void 0 ? "noName" : _59, _60 = _58.skills, _61 = _60 === void 0 ? { primary: "none", secondary: "none" } : _60, _62 = _61.primary, primary = _62 === void 0 ? "primary" : _62, _63 = _61.secondary, secondary = _63 === void 0 ? "secondary" : _63, _58), _58,
     i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63;
+var _k, _q, _4, _9, _27, _33, _52, _58;
+var _a, _b, _c, _d, _e, _f, _g, _h, _j, _l, _m, _o, _p, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _5, _6, _7, _8, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _28, _29, _30, _31, _32, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _53, _54, _55, _56, _57, _59, _60, _61, _62, _63;
 //# sourceMappingURL=sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js.map b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js.map
index dd248e89944..56f8aa0f607 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.ts"],"names":[],"mappings":"AAgBA,IAAI,KAAK,GAAU,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;AACtD,IAAI,UAAU,GAAe,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,CAAC;AACjG;IACI,MAAM,CAAC,KAAK,CAAC;AACjB,CAAC;AACD;IACI,MAAM,CAAC,UAAU,CAAC;AACtB,CAAC;AAED,IAAI,KAAa,EAAE,QAAgB,EAAE,UAAkB,EAAE,CAAS,EAAE,MAAc,CAAC;AACnF,IAAI,IAAY,EAAE,OAAe,EAAE,SAAiB,EAAE,KAAa,CAAC;AAEpE,GAAG,CAAC,CAAE,eAAsB,EAAtB,qCAAsB,EAAK,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACxD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,eAAsC,EAArC,YAAsB,EAAtB,qCAAsB,MAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,2CAAyE,EAAxE,YAAsB,EAAtB,qCAAsB,MAAoD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CACA,sBAG0C,EAH1C,gEAG0C,EAFtC,eAA6B,EAA7B,yCAA6B,EAC7B,iBAAmC,EAAnC,6CAAmC,EAEvC,UAAU,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,oBAKc,EAJf,cAG0C,EAH1C,gEAG0C,EAFtC,eAA6B,EAA7B,yCAA6B,EAC7B,iBAAmC,EAAnC,6CAAmC,MAEtB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,8EAKoF,EAJrF,cAG0C,EAH1C,gEAG0C,EAFtC,eAA6B,EAA7B,yCAA6B,EAC7B,iBAAmC,EAAnC,6CAAmC;IAGvC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AAED,GAAG,CAAC,CAAG,eAAe,EAAf,oCAAe,EAAK,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAClD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,eAAgC,EAA9B,YAAe,EAAf,oCAAe,MAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACvD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,2CAAmE,EAAjE,YAAe,EAAf,oCAAe,MAAoD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC1F,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CACA,sBAG0C,EAH1C,gEAG0C,EAFtC,eAAmB,EAAnB,wCAAmB,EACnB,iBAAuB,EAAvB,4CAAuB,EAE3B,UAAU,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,oBAKc,EAJf,cAG0C,EAH1C,gEAG0C,EAFtC,eAAmB,EAAnB,wCAAmB,EACnB,iBAAuB,EAAvB,4CAAuB,MAEV,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,8EAKoF,EAJrF,eAG0C,EAH1C,mEAG0C,EAFtC,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB;IAG3B,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AAGD,GAAG,CAAC,CAAE,gBAAsB,EAAtB,uCAAsB,EAAE,iBAAuB,EAAvB,uCAAuB,EAAK,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,gBAA+D,EAA9D,cAAsB,EAAtB,uCAAsB,EAAE,eAAuB,EAAvB,uCAAuB,OAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACtF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,4CAAkG,EAAjG,cAAsB,EAAtB,uCAAsB,EAAE,eAAuB,EAAvB,uCAAuB,OAAoD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACzH,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CACA,qBAAsB,EAAtB,uCAAsB,EACtB,uBAG0C,EAH1C,mEAG0C,EAFtC,iBAA6B,EAA7B,2CAA6B,EAC7B,mBAAmC,EAAnC,+CAAmC,EAEvC,UAAU,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,qBAMc,EALf,cAAsB,EAAtB,uCAAsB,EACtB,gBAG0C,EAH1C,mEAG0C,EAFtC,iBAA6B,EAA7B,2CAA6B,EAC7B,mBAAmC,EAAnC,+CAAmC,OAEtB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,+EAMoF,EALrF,cAAsB,EAAtB,uCAAsB,EACtB,gBAG0C,EAH1C,mEAG0C,EAFtC,iBAA6B,EAA7B,2CAA6B,EAC7B,mBAAmC,EAAnC,+CAAmC;IAGvC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AAED,GAAG,CAAC,CAAG,gBAAe,EAAf,sCAAe,EAAE,iBAAe,EAAf,sCAAe,EAAK,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACnE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,gBAAiD,EAA/C,cAAe,EAAf,sCAAe,EAAE,eAAe,EAAf,sCAAe,OAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACxE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,4CAAoF,EAAlF,cAAe,EAAf,sCAAe,EAAE,eAAe,EAAf,sCAAe,OAAoD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC3G,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CACA,qBAAe,EAAf,sCAAe,EACf,uBAG0C,EAH1C,mEAG0C,EAFtC,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB,EAE3B,UAAU,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,qBAMc,EALf,cAAe,EAAf,sCAAe,EACf,gBAG0C,EAH1C,mEAG0C,EAFtC,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB,OAEV,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,+EAMoF,EALrF,cAAe,EAAf,sCAAe,EACf,gBAG0C,EAH1C,mEAG0C,EAFtC,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB;IAG3B,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.ts"],"names":[],"mappings":"AAgBA,IAAI,KAAK,GAAU,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;AACtD,IAAI,UAAU,GAAe,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,CAAC;AACjG;IACI,MAAM,CAAC,KAAK,CAAC;AACjB,CAAC;AACD;IACI,MAAM,CAAC,UAAU,CAAC;AACtB,CAAC;AAED,IAAI,KAAa,EAAE,QAAgB,EAAE,UAAkB,EAAE,CAAS,EAAE,MAAc,CAAC;AACnF,IAAI,IAAY,EAAE,OAAe,EAAE,SAAiB,EAAE,KAAa,CAAC;AAEpE,GAAG,CAAC,CAAE,eAAsB,EAAtB,qCAAsB,EAAK,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACxD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,eAAsC,EAArC,YAAsB,EAAtB,qCAAsB,MAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,2CAAyE,EAAxE,YAAsB,EAAtB,qCAAsB,MAAoD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CACA,sBAG0C,EAH1C,gEAG0C,EAFtC,eAA6B,EAA7B,yCAA6B,EAC7B,iBAAmC,EAAnC,6CAAmC,EAEvC,UAAU,EAAV,UAAU,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,oBAKc,GAJf,cAG0C,EAH1C,gEAG0C,EAFtC,eAA6B,EAA7B,yCAA6B,EAC7B,iBAAmC,EAAnC,6CAAmC,WAEtB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,8EAKoF,GAJrF,cAG0C,EAH1C,gEAG0C,EAFtC,eAA6B,EAA7B,yCAA6B,EAC7B,iBAAmC,EAAnC,6CAAmC;IAGvC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AAED,GAAG,CAAC,CAAG,eAAe,EAAf,oCAAe,EAAK,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAClD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,eAAgC,EAA9B,YAAe,EAAf,oCAAe,MAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACvD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,2CAAmE,EAAjE,YAAe,EAAf,oCAAe,MAAoD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC1F,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CACA,sBAG0C,EAH1C,gEAG0C,EAFtC,eAAmB,EAAnB,wCAAmB,EACnB,iBAAuB,EAAvB,4CAAuB,EAE3B,UAAU,EAAV,UAAU,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,oBAKc,GAJf,cAG0C,EAH1C,gEAG0C,EAFtC,eAAmB,EAAnB,wCAAmB,EACnB,iBAAuB,EAAvB,4CAAuB,WAEV,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,8EAKoF,GAJrF,eAG0C,EAH1C,mEAG0C,EAFtC,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB;IAG3B,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AAGD,GAAG,CAAC,CAAE,gBAAsB,EAAtB,uCAAsB,EAAE,iBAAuB,EAAvB,uCAAuB,EAAK,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,gBAA+D,EAA9D,cAAsB,EAAtB,uCAAsB,EAAE,eAAuB,EAAvB,uCAAuB,OAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACtF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,4CAAkG,EAAjG,cAAsB,EAAtB,uCAAsB,EAAE,eAAuB,EAAvB,uCAAuB,OAAoD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACzH,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CACA,qBAAsB,EAAtB,uCAAsB,EACtB,uBAG0C,EAH1C,mEAG0C,EAFtC,iBAA6B,EAA7B,2CAA6B,EAC7B,mBAAmC,EAAnC,+CAAmC,EAEvC,UAAU,EAAV,UAAU,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,qBAMc,GALf,cAAsB,EAAtB,uCAAsB,EACtB,gBAG0C,EAH1C,mEAG0C,EAFtC,iBAA6B,EAA7B,2CAA6B,EAC7B,mBAAmC,EAAnC,+CAAmC,aAEtB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,+EAMoF,GALrF,cAAsB,EAAtB,uCAAsB,EACtB,gBAG0C,EAH1C,mEAG0C,EAFtC,iBAA6B,EAA7B,2CAA6B,EAC7B,mBAAmC,EAAnC,+CAAmC;IAGvC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AAED,GAAG,CAAC,CAAG,gBAAe,EAAf,sCAAe,EAAE,iBAAe,EAAf,sCAAe,EAAK,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACnE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,gBAAiD,EAA/C,cAAe,EAAf,sCAAe,EAAE,eAAe,EAAf,sCAAe,OAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACxE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,4CAAoF,EAAlF,cAAe,EAAf,sCAAe,EAAE,eAAe,EAAf,sCAAe,OAAoD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC3G,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CACA,qBAAe,EAAf,sCAAe,EACf,uBAG0C,EAH1C,mEAG0C,EAFtC,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB,EAE3B,UAAU,EAAV,UAAU,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,qBAMc,GALf,cAAe,EAAf,sCAAe,EACf,gBAG0C,EAH1C,mEAG0C,EAFtC,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB,aAEV,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,+EAMoF,GALrF,cAAe,EAAf,sCAAe,EACf,gBAG0C,EAH1C,mEAG0C,EAFtC,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB;IAG3B,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.sourcemap.txt
index 97271e8f3d0..9e0e92d4a68 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.sourcemap.txt
@@ -594,14 +594,14 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(19, 1) Source(37, 1) + SourceIndex(0)
 2 >Emitted(19, 2) Source(37, 2) + SourceIndex(0)
 ---
->>>for (_f = multiRobot.skills, _g = _f === void 0 ? { primary: "none", secondary: "none" } : _f, _h = _g.primary, primaryA = _h === void 0 ? "primary" : _h, _j = _g.secondary, secondaryA = _j === void 0 ? "secondary" : _j, multiRobot, i = 0; i < 1; i++) {
+>>>for (_f = multiRobot.skills, _g = _f === void 0 ? { primary: "none", secondary: "none" } : _f, _h = _g.primary, primaryA = _h === void 0 ? "primary" : _h, _j = _g.secondary, secondaryA = _j === void 0 ? "secondary" : _j, multiRobot, multiRobot, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
@@ -620,18 +620,20 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 16>                                                                                                                                                                                                                           ^^
 17>                                                                                                                                                                                                                             ^^^^^^^^^^
 18>                                                                                                                                                                                                                                       ^^
-19>                                                                                                                                                                                                                                         ^
-20>                                                                                                                                                                                                                                          ^^^
-21>                                                                                                                                                                                                                                             ^
-22>                                                                                                                                                                                                                                              ^^
-23>                                                                                                                                                                                                                                                ^
-24>                                                                                                                                                                                                                                                 ^^^
-25>                                                                                                                                                                                                                                                    ^
-26>                                                                                                                                                                                                                                                     ^^
-27>                                                                                                                                                                                                                                                       ^
-28>                                                                                                                                                                                                                                                        ^^
-29>                                                                                                                                                                                                                                                          ^^
-30>                                                                                                                                                                                                                                                            ^
+19>                                                                                                                                                                                                                                         ^^^^^^^^^^
+20>                                                                                                                                                                                                                                                   ^^
+21>                                                                                                                                                                                                                                                     ^
+22>                                                                                                                                                                                                                                                      ^^^
+23>                                                                                                                                                                                                                                                         ^
+24>                                                                                                                                                                                                                                                          ^^
+25>                                                                                                                                                                                                                                                            ^
+26>                                                                                                                                                                                                                                                             ^^^
+27>                                                                                                                                                                                                                                                                ^
+28>                                                                                                                                                                                                                                                                 ^^
+29>                                                                                                                                                                                                                                                                   ^
+30>                                                                                                                                                                                                                                                                    ^^
+31>                                                                                                                                                                                                                                                                      ^^
+32>                                                                                                                                                                                                                                                                        ^
 1->
   >
 2 >for
@@ -660,19 +662,21 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
   >                                                                                                                                                                                                                               } = { primary: "none", secondary: "none" }
   >                                                                                                                                                                                                                           } = 
 17>                                                                                                                                                                                                                             multiRobot
-18>                                                                                                                                                                                                                                       , 
-19>                                                                                                                                                                                                                                         i
-20>                                                                                                                                                                                                                                           = 
-21>                                                                                                                                                                                                                                             0
-22>                                                                                                                                                                                                                                              ; 
-23>                                                                                                                                                                                                                                                i
-24>                                                                                                                                                                                                                                                  < 
-25>                                                                                                                                                                                                                                                    1
-26>                                                                                                                                                                                                                                                     ; 
-27>                                                                                                                                                                                                                                                       i
-28>                                                                                                                                                                                                                                                        ++
-29>                                                                                                                                                                                                                                                          ) 
-30>                                                                                                                                                                                                                                                            {
+18>                                                                                                                                                                                                                                       
+19>                                                                                                                                                                                                                                         multiRobot
+20>                                                                                                                                                                                                                                                   , 
+21>                                                                                                                                                                                                                                                     i
+22>                                                                                                                                                                                                                                                       = 
+23>                                                                                                                                                                                                                                                         0
+24>                                                                                                                                                                                                                                                          ; 
+25>                                                                                                                                                                                                                                                            i
+26>                                                                                                                                                                                                                                                              < 
+27>                                                                                                                                                                                                                                                                1
+28>                                                                                                                                                                                                                                                                 ; 
+29>                                                                                                                                                                                                                                                                   i
+30>                                                                                                                                                                                                                                                                    ++
+31>                                                                                                                                                                                                                                                                      ) 
+32>                                                                                                                                                                                                                                                                        {
 1->Emitted(20, 1) Source(38, 1) + SourceIndex(0)
 2 >Emitted(20, 4) Source(38, 4) + SourceIndex(0)
 3 >Emitted(20, 5) Source(38, 5) + SourceIndex(0)
@@ -690,19 +694,21 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 15>Emitted(20, 220) Source(41, 44) + SourceIndex(0)
 16>Emitted(20, 222) Source(43, 5) + SourceIndex(0)
 17>Emitted(20, 232) Source(43, 15) + SourceIndex(0)
-18>Emitted(20, 234) Source(43, 17) + SourceIndex(0)
-19>Emitted(20, 235) Source(43, 18) + SourceIndex(0)
-20>Emitted(20, 238) Source(43, 21) + SourceIndex(0)
-21>Emitted(20, 239) Source(43, 22) + SourceIndex(0)
-22>Emitted(20, 241) Source(43, 24) + SourceIndex(0)
-23>Emitted(20, 242) Source(43, 25) + SourceIndex(0)
-24>Emitted(20, 245) Source(43, 28) + SourceIndex(0)
-25>Emitted(20, 246) Source(43, 29) + SourceIndex(0)
-26>Emitted(20, 248) Source(43, 31) + SourceIndex(0)
-27>Emitted(20, 249) Source(43, 32) + SourceIndex(0)
-28>Emitted(20, 251) Source(43, 34) + SourceIndex(0)
-29>Emitted(20, 253) Source(43, 36) + SourceIndex(0)
-30>Emitted(20, 254) Source(43, 37) + SourceIndex(0)
+18>Emitted(20, 234) Source(43, 5) + SourceIndex(0)
+19>Emitted(20, 244) Source(43, 15) + SourceIndex(0)
+20>Emitted(20, 246) Source(43, 17) + SourceIndex(0)
+21>Emitted(20, 247) Source(43, 18) + SourceIndex(0)
+22>Emitted(20, 250) Source(43, 21) + SourceIndex(0)
+23>Emitted(20, 251) Source(43, 22) + SourceIndex(0)
+24>Emitted(20, 253) Source(43, 24) + SourceIndex(0)
+25>Emitted(20, 254) Source(43, 25) + SourceIndex(0)
+26>Emitted(20, 257) Source(43, 28) + SourceIndex(0)
+27>Emitted(20, 258) Source(43, 29) + SourceIndex(0)
+28>Emitted(20, 260) Source(43, 31) + SourceIndex(0)
+29>Emitted(20, 261) Source(43, 32) + SourceIndex(0)
+30>Emitted(20, 263) Source(43, 34) + SourceIndex(0)
+31>Emitted(20, 265) Source(43, 36) + SourceIndex(0)
+32>Emitted(20, 266) Source(43, 37) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -734,44 +740,44 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(22, 1) Source(45, 1) + SourceIndex(0)
 2 >Emitted(22, 2) Source(45, 2) + SourceIndex(0)
 ---
->>>for (_k = getMultiRobot(), _l = _k.skills, _m = _l === void 0 ? { primary: "none", secondary: "none" } : _l, _o = _m.primary, primaryA = _o === void 0 ? "primary" : _o, _p = _m.secondary, secondaryA = _p === void 0 ? "secondary" : _p, _k, i = 0; i < 1; i++) {
+>>>for (_k = getMultiRobot(), (_l = _k.skills, _m = _l === void 0 ? { primary: "none", secondary: "none" } : _l, _o = _m.primary, primaryA = _o === void 0 ? "primary" : _o, _p = _m.secondary, secondaryA = _p === void 0 ? "secondary" : _p, _k), _k, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
 5 >     ^^^^^^^^^^^^^^^^^^^^
-6 >                         ^^
-7 >                           ^^^^^^^^^^^^^^
-8 >                                         ^^
-9 >                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-10>                                                                                                           ^^
-11>                                                                                                             ^^^^^^^^^^^^^^^
-12>                                                                                                                            ^^
-13>                                                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-14>                                                                                                                                                                       ^^
-15>                                                                                                                                                                         ^^^^^^^^^^^^^^^^^
-16>                                                                                                                                                                                          ^^
-17>                                                                                                                                                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-18>                                                                                                                                                                                                                                         ^^^^^^
-19>                                                                                                                                                                                                                                               ^
-20>                                                                                                                                                                                                                                                ^^^
-21>                                                                                                                                                                                                                                                   ^
-22>                                                                                                                                                                                                                                                    ^^
-23>                                                                                                                                                                                                                                                      ^
-24>                                                                                                                                                                                                                                                       ^^^
-25>                                                                                                                                                                                                                                                          ^
-26>                                                                                                                                                                                                                                                           ^^
-27>                                                                                                                                                                                                                                                             ^
-28>                                                                                                                                                                                                                                                              ^^
-29>                                                                                                                                                                                                                                                                ^^
-30>                                                                                                                                                                                                                                                                  ^
+6 >                         ^^^
+7 >                            ^^^^^^^^^^^^^^
+8 >                                          ^^
+9 >                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                            ^^
+11>                                                                                                              ^^^^^^^^^^^^^^^
+12>                                                                                                                             ^^
+13>                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                        ^^
+15>                                                                                                                                                                          ^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                           ^^
+17>                                                                                                                                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+18>                                                                                                                                                                                                                                          ^^^^^^^^^^^
+19>                                                                                                                                                                                                                                                     ^
+20>                                                                                                                                                                                                                                                      ^^^
+21>                                                                                                                                                                                                                                                         ^
+22>                                                                                                                                                                                                                                                          ^^
+23>                                                                                                                                                                                                                                                            ^
+24>                                                                                                                                                                                                                                                             ^^^
+25>                                                                                                                                                                                                                                                                ^
+26>                                                                                                                                                                                                                                                                 ^^
+27>                                                                                                                                                                                                                                                                   ^
+28>                                                                                                                                                                                                                                                                    ^^
+29>                                                                                                                                                                                                                                                                      ^^
+30>                                                                                                                                                                                                                                                                        ^
 1->
   >
 2 >for
@@ -784,69 +790,69 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
   >         } = { primary: "none", secondary: "none" }
   >     } = getMultiRobot()
 6 >                         
-7 >                           skills: {
-  >                                   primary: primaryA = "primary",
-  >                                   secondary: secondaryA = "secondary"
-  >                               } = { primary: "none", secondary: "none" }
-8 >                                         
-9 >                                           skills: {
-  >                                                   primary: primaryA = "primary",
-  >                                                   secondary: secondaryA = "secondary"
-  >                                               } = { primary: "none", secondary: "none" }
-10>                                                                                                           
-11>                                                                                                             primary: primaryA = "primary"
-12>                                                                                                                            
-13>                                                                                                                              primary: primaryA = "primary"
-14>                                                                                                                                                                       ,
-  >                                                                                                                                                                               
-15>                                                                                                                                                                         secondary: secondaryA = "secondary"
-16>                                                                                                                                                                                          
-17>                                                                                                                                                                                            secondary: secondaryA = "secondary"
-18>                                                                                                                                                                                                                                         
-  >                                                                                                                                                                                                                                             } = { primary: "none", secondary: "none" }
-  >                                                                                                                                                                                                                                         } = getMultiRobot(), 
-19>                                                                                                                                                                                                                                               i
-20>                                                                                                                                                                                                                                                 = 
-21>                                                                                                                                                                                                                                                   0
-22>                                                                                                                                                                                                                                                    ; 
-23>                                                                                                                                                                                                                                                      i
-24>                                                                                                                                                                                                                                                        < 
-25>                                                                                                                                                                                                                                                          1
-26>                                                                                                                                                                                                                                                           ; 
-27>                                                                                                                                                                                                                                                             i
-28>                                                                                                                                                                                                                                                              ++
-29>                                                                                                                                                                                                                                                                ) 
-30>                                                                                                                                                                                                                                                                  {
+7 >                            skills: {
+  >                                    primary: primaryA = "primary",
+  >                                    secondary: secondaryA = "secondary"
+  >                                } = { primary: "none", secondary: "none" }
+8 >                                          
+9 >                                            skills: {
+  >                                                    primary: primaryA = "primary",
+  >                                                    secondary: secondaryA = "secondary"
+  >                                                } = { primary: "none", secondary: "none" }
+10>                                                                                                            
+11>                                                                                                              primary: primaryA = "primary"
+12>                                                                                                                             
+13>                                                                                                                               primary: primaryA = "primary"
+14>                                                                                                                                                                        ,
+  >                                                                                                                                                                                
+15>                                                                                                                                                                          secondary: secondaryA = "secondary"
+16>                                                                                                                                                                                           
+17>                                                                                                                                                                                             secondary: secondaryA = "secondary"
+18>                                                                                                                                                                                                                                          
+  >                                                                                                                                                                                                                                              } = { primary: "none", secondary: "none" }
+  >                                                                                                                                                                                                                                          } = getMultiRobot(), 
+19>                                                                                                                                                                                                                                                     i
+20>                                                                                                                                                                                                                                                       = 
+21>                                                                                                                                                                                                                                                         0
+22>                                                                                                                                                                                                                                                          ; 
+23>                                                                                                                                                                                                                                                            i
+24>                                                                                                                                                                                                                                                              < 
+25>                                                                                                                                                                                                                                                                1
+26>                                                                                                                                                                                                                                                                 ; 
+27>                                                                                                                                                                                                                                                                   i
+28>                                                                                                                                                                                                                                                                    ++
+29>                                                                                                                                                                                                                                                                      ) 
+30>                                                                                                                                                                                                                                                                        {
 1->Emitted(23, 1) Source(46, 1) + SourceIndex(0)
 2 >Emitted(23, 4) Source(46, 4) + SourceIndex(0)
 3 >Emitted(23, 5) Source(46, 5) + SourceIndex(0)
 4 >Emitted(23, 6) Source(46, 6) + SourceIndex(0)
 5 >Emitted(23, 26) Source(51, 20) + SourceIndex(0)
-6 >Emitted(23, 28) Source(47, 5) + SourceIndex(0)
-7 >Emitted(23, 42) Source(50, 47) + SourceIndex(0)
-8 >Emitted(23, 44) Source(47, 5) + SourceIndex(0)
-9 >Emitted(23, 108) Source(50, 47) + SourceIndex(0)
-10>Emitted(23, 110) Source(48, 9) + SourceIndex(0)
-11>Emitted(23, 125) Source(48, 38) + SourceIndex(0)
-12>Emitted(23, 127) Source(48, 9) + SourceIndex(0)
-13>Emitted(23, 168) Source(48, 38) + SourceIndex(0)
-14>Emitted(23, 170) Source(49, 9) + SourceIndex(0)
-15>Emitted(23, 187) Source(49, 44) + SourceIndex(0)
-16>Emitted(23, 189) Source(49, 9) + SourceIndex(0)
-17>Emitted(23, 234) Source(49, 44) + SourceIndex(0)
-18>Emitted(23, 240) Source(51, 22) + SourceIndex(0)
-19>Emitted(23, 241) Source(51, 23) + SourceIndex(0)
-20>Emitted(23, 244) Source(51, 26) + SourceIndex(0)
-21>Emitted(23, 245) Source(51, 27) + SourceIndex(0)
-22>Emitted(23, 247) Source(51, 29) + SourceIndex(0)
-23>Emitted(23, 248) Source(51, 30) + SourceIndex(0)
-24>Emitted(23, 251) Source(51, 33) + SourceIndex(0)
-25>Emitted(23, 252) Source(51, 34) + SourceIndex(0)
-26>Emitted(23, 254) Source(51, 36) + SourceIndex(0)
-27>Emitted(23, 255) Source(51, 37) + SourceIndex(0)
-28>Emitted(23, 257) Source(51, 39) + SourceIndex(0)
-29>Emitted(23, 259) Source(51, 41) + SourceIndex(0)
-30>Emitted(23, 260) Source(51, 42) + SourceIndex(0)
+6 >Emitted(23, 29) Source(47, 5) + SourceIndex(0)
+7 >Emitted(23, 43) Source(50, 47) + SourceIndex(0)
+8 >Emitted(23, 45) Source(47, 5) + SourceIndex(0)
+9 >Emitted(23, 109) Source(50, 47) + SourceIndex(0)
+10>Emitted(23, 111) Source(48, 9) + SourceIndex(0)
+11>Emitted(23, 126) Source(48, 38) + SourceIndex(0)
+12>Emitted(23, 128) Source(48, 9) + SourceIndex(0)
+13>Emitted(23, 169) Source(48, 38) + SourceIndex(0)
+14>Emitted(23, 171) Source(49, 9) + SourceIndex(0)
+15>Emitted(23, 188) Source(49, 44) + SourceIndex(0)
+16>Emitted(23, 190) Source(49, 9) + SourceIndex(0)
+17>Emitted(23, 235) Source(49, 44) + SourceIndex(0)
+18>Emitted(23, 246) Source(51, 22) + SourceIndex(0)
+19>Emitted(23, 247) Source(51, 23) + SourceIndex(0)
+20>Emitted(23, 250) Source(51, 26) + SourceIndex(0)
+21>Emitted(23, 251) Source(51, 27) + SourceIndex(0)
+22>Emitted(23, 253) Source(51, 29) + SourceIndex(0)
+23>Emitted(23, 254) Source(51, 30) + SourceIndex(0)
+24>Emitted(23, 257) Source(51, 33) + SourceIndex(0)
+25>Emitted(23, 258) Source(51, 34) + SourceIndex(0)
+26>Emitted(23, 260) Source(51, 36) + SourceIndex(0)
+27>Emitted(23, 261) Source(51, 37) + SourceIndex(0)
+28>Emitted(23, 263) Source(51, 39) + SourceIndex(0)
+29>Emitted(23, 265) Source(51, 41) + SourceIndex(0)
+30>Emitted(23, 266) Source(51, 42) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -878,31 +884,31 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(25, 1) Source(53, 1) + SourceIndex(0)
 2 >Emitted(25, 2) Source(53, 2) + SourceIndex(0)
 ---
->>>for (_q = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _r = _q.skills, _s = _r === void 0 ? { primary: "none", secondary: "none" } : _r, _t = _s.primary, primaryA = _t === void 0 ? "primary" : _t, _u = _s.secondary, secondaryA = _u === void 0 ? "secondary" : _u, _q,
+>>>for (_q = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, (_r = _q.skills, _s = _r === void 0 ? { primary: "none", secondary: "none" } : _r, _t = _s.primary, primaryA = _t === void 0 ? "primary" : _t, _u = _s.secondary, secondaryA = _u === void 0 ? "secondary" : _u, _q), _q,
 1->
 2 >^^^
 3 >   ^
 4 >    ^
 5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                                                                   ^^
-7 >                                                                                     ^^^^^^^^^^^^^^
-8 >                                                                                                   ^^
-9 >                                                                                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-10>                                                                                                                                                                     ^^
-11>                                                                                                                                                                       ^^^^^^^^^^^^^^^
-12>                                                                                                                                                                                      ^^
-13>                                                                                                                                                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-14>                                                                                                                                                                                                                                 ^^
-15>                                                                                                                                                                                                                                   ^^^^^^^^^^^^^^^^^
-16>                                                                                                                                                                                                                                                    ^^
-17>                                                                                                                                                                                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                                                   ^^^
+7 >                                                                                      ^^^^^^^^^^^^^^
+8 >                                                                                                    ^^
+9 >                                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                                                                                      ^^
+11>                                                                                                                                                                        ^^^^^^^^^^^^^^^
+12>                                                                                                                                                                                       ^^
+13>                                                                                                                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                                                                                  ^^
+15>                                                                                                                                                                                                                                    ^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                                                                                     ^^
+17>                                                                                                                                                                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
 2 >for
@@ -915,41 +921,41 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
   >         } = { primary: "none", secondary: "none" }
   >     } = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }
 6 >                                                                                   
-7 >                                                                                     skills: {
-  >                                                                                             primary: primaryA = "primary",
-  >                                                                                             secondary: secondaryA = "secondary"
-  >                                                                                         } = { primary: "none", secondary: "none" }
-8 >                                                                                                   
-9 >                                                                                                     skills: {
-  >                                                                                                             primary: primaryA = "primary",
-  >                                                                                                             secondary: secondaryA = "secondary"
-  >                                                                                                         } = { primary: "none", secondary: "none" }
-10>                                                                                                                                                                     
-11>                                                                                                                                                                       primary: primaryA = "primary"
-12>                                                                                                                                                                                      
-13>                                                                                                                                                                                        primary: primaryA = "primary"
-14>                                                                                                                                                                                                                                 ,
-  >                                                                                                                                                                                                                                         
-15>                                                                                                                                                                                                                                   secondary: secondaryA = "secondary"
-16>                                                                                                                                                                                                                                                    
-17>                                                                                                                                                                                                                                                      secondary: secondaryA = "secondary"
+7 >                                                                                      skills: {
+  >                                                                                              primary: primaryA = "primary",
+  >                                                                                              secondary: secondaryA = "secondary"
+  >                                                                                          } = { primary: "none", secondary: "none" }
+8 >                                                                                                    
+9 >                                                                                                      skills: {
+  >                                                                                                              primary: primaryA = "primary",
+  >                                                                                                              secondary: secondaryA = "secondary"
+  >                                                                                                          } = { primary: "none", secondary: "none" }
+10>                                                                                                                                                                      
+11>                                                                                                                                                                        primary: primaryA = "primary"
+12>                                                                                                                                                                                       
+13>                                                                                                                                                                                         primary: primaryA = "primary"
+14>                                                                                                                                                                                                                                  ,
+  >                                                                                                                                                                                                                                          
+15>                                                                                                                                                                                                                                    secondary: secondaryA = "secondary"
+16>                                                                                                                                                                                                                                                     
+17>                                                                                                                                                                                                                                                       secondary: secondaryA = "secondary"
 1->Emitted(26, 1) Source(54, 1) + SourceIndex(0)
 2 >Emitted(26, 4) Source(54, 4) + SourceIndex(0)
 3 >Emitted(26, 5) Source(54, 5) + SourceIndex(0)
 4 >Emitted(26, 6) Source(54, 6) + SourceIndex(0)
 5 >Emitted(26, 84) Source(59, 90) + SourceIndex(0)
-6 >Emitted(26, 86) Source(55, 5) + SourceIndex(0)
-7 >Emitted(26, 100) Source(58, 47) + SourceIndex(0)
-8 >Emitted(26, 102) Source(55, 5) + SourceIndex(0)
-9 >Emitted(26, 166) Source(58, 47) + SourceIndex(0)
-10>Emitted(26, 168) Source(56, 9) + SourceIndex(0)
-11>Emitted(26, 183) Source(56, 38) + SourceIndex(0)
-12>Emitted(26, 185) Source(56, 9) + SourceIndex(0)
-13>Emitted(26, 226) Source(56, 38) + SourceIndex(0)
-14>Emitted(26, 228) Source(57, 9) + SourceIndex(0)
-15>Emitted(26, 245) Source(57, 44) + SourceIndex(0)
-16>Emitted(26, 247) Source(57, 9) + SourceIndex(0)
-17>Emitted(26, 292) Source(57, 44) + SourceIndex(0)
+6 >Emitted(26, 87) Source(55, 5) + SourceIndex(0)
+7 >Emitted(26, 101) Source(58, 47) + SourceIndex(0)
+8 >Emitted(26, 103) Source(55, 5) + SourceIndex(0)
+9 >Emitted(26, 167) Source(58, 47) + SourceIndex(0)
+10>Emitted(26, 169) Source(56, 9) + SourceIndex(0)
+11>Emitted(26, 184) Source(56, 38) + SourceIndex(0)
+12>Emitted(26, 186) Source(56, 9) + SourceIndex(0)
+13>Emitted(26, 227) Source(56, 38) + SourceIndex(0)
+14>Emitted(26, 229) Source(57, 9) + SourceIndex(0)
+15>Emitted(26, 246) Source(57, 44) + SourceIndex(0)
+16>Emitted(26, 248) Source(57, 9) + SourceIndex(0)
+17>Emitted(26, 293) Source(57, 44) + SourceIndex(0)
 ---
 >>>    i = 0; i < 1; i++) {
 1 >^^^^
@@ -1345,14 +1351,14 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(38, 1) Source(72, 1) + SourceIndex(0)
 2 >Emitted(38, 2) Source(72, 2) + SourceIndex(0)
 ---
->>>for (_0 = multiRobot.skills, _1 = _0 === void 0 ? { primary: "none", secondary: "none" } : _0, _2 = _1.primary, primary = _2 === void 0 ? "primary" : _2, _3 = _1.secondary, secondary = _3 === void 0 ? "secondary" : _3, multiRobot, i = 0; i < 1; i++) {
+>>>for (_0 = multiRobot.skills, _1 = _0 === void 0 ? { primary: "none", secondary: "none" } : _0, _2 = _1.primary, primary = _2 === void 0 ? "primary" : _2, _3 = _1.secondary, secondary = _3 === void 0 ? "secondary" : _3, multiRobot, multiRobot, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
@@ -1371,18 +1377,20 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 16>                                                                                                                                                                                                                         ^^
 17>                                                                                                                                                                                                                           ^^^^^^^^^^
 18>                                                                                                                                                                                                                                     ^^
-19>                                                                                                                                                                                                                                       ^
-20>                                                                                                                                                                                                                                        ^^^
-21>                                                                                                                                                                                                                                           ^
-22>                                                                                                                                                                                                                                            ^^
-23>                                                                                                                                                                                                                                              ^
-24>                                                                                                                                                                                                                                               ^^^
-25>                                                                                                                                                                                                                                                  ^
-26>                                                                                                                                                                                                                                                   ^^
-27>                                                                                                                                                                                                                                                     ^
-28>                                                                                                                                                                                                                                                      ^^
-29>                                                                                                                                                                                                                                                        ^^
-30>                                                                                                                                                                                                                                                          ^
+19>                                                                                                                                                                                                                                       ^^^^^^^^^^
+20>                                                                                                                                                                                                                                                 ^^
+21>                                                                                                                                                                                                                                                   ^
+22>                                                                                                                                                                                                                                                    ^^^
+23>                                                                                                                                                                                                                                                       ^
+24>                                                                                                                                                                                                                                                        ^^
+25>                                                                                                                                                                                                                                                          ^
+26>                                                                                                                                                                                                                                                           ^^^
+27>                                                                                                                                                                                                                                                              ^
+28>                                                                                                                                                                                                                                                               ^^
+29>                                                                                                                                                                                                                                                                 ^
+30>                                                                                                                                                                                                                                                                  ^^
+31>                                                                                                                                                                                                                                                                    ^^
+32>                                                                                                                                                                                                                                                                      ^
 1->
   >
 2 >for
@@ -1411,19 +1419,21 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
   >                                                                                                                                                                                                                             } = { primary: "none", secondary: "none" }
   >                                                                                                                                                                                                                         } = 
 17>                                                                                                                                                                                                                           multiRobot
-18>                                                                                                                                                                                                                                     , 
-19>                                                                                                                                                                                                                                       i
-20>                                                                                                                                                                                                                                         = 
-21>                                                                                                                                                                                                                                           0
-22>                                                                                                                                                                                                                                            ; 
-23>                                                                                                                                                                                                                                              i
-24>                                                                                                                                                                                                                                                < 
-25>                                                                                                                                                                                                                                                  1
-26>                                                                                                                                                                                                                                                   ; 
-27>                                                                                                                                                                                                                                                     i
-28>                                                                                                                                                                                                                                                      ++
-29>                                                                                                                                                                                                                                                        ) 
-30>                                                                                                                                                                                                                                                          {
+18>                                                                                                                                                                                                                                     
+19>                                                                                                                                                                                                                                       multiRobot
+20>                                                                                                                                                                                                                                                 , 
+21>                                                                                                                                                                                                                                                   i
+22>                                                                                                                                                                                                                                                     = 
+23>                                                                                                                                                                                                                                                       0
+24>                                                                                                                                                                                                                                                        ; 
+25>                                                                                                                                                                                                                                                          i
+26>                                                                                                                                                                                                                                                            < 
+27>                                                                                                                                                                                                                                                              1
+28>                                                                                                                                                                                                                                                               ; 
+29>                                                                                                                                                                                                                                                                 i
+30>                                                                                                                                                                                                                                                                  ++
+31>                                                                                                                                                                                                                                                                    ) 
+32>                                                                                                                                                                                                                                                                      {
 1->Emitted(39, 1) Source(73, 1) + SourceIndex(0)
 2 >Emitted(39, 4) Source(73, 4) + SourceIndex(0)
 3 >Emitted(39, 5) Source(73, 5) + SourceIndex(0)
@@ -1441,19 +1451,21 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 15>Emitted(39, 218) Source(76, 32) + SourceIndex(0)
 16>Emitted(39, 220) Source(78, 5) + SourceIndex(0)
 17>Emitted(39, 230) Source(78, 15) + SourceIndex(0)
-18>Emitted(39, 232) Source(78, 17) + SourceIndex(0)
-19>Emitted(39, 233) Source(78, 18) + SourceIndex(0)
-20>Emitted(39, 236) Source(78, 21) + SourceIndex(0)
-21>Emitted(39, 237) Source(78, 22) + SourceIndex(0)
-22>Emitted(39, 239) Source(78, 24) + SourceIndex(0)
-23>Emitted(39, 240) Source(78, 25) + SourceIndex(0)
-24>Emitted(39, 243) Source(78, 28) + SourceIndex(0)
-25>Emitted(39, 244) Source(78, 29) + SourceIndex(0)
-26>Emitted(39, 246) Source(78, 31) + SourceIndex(0)
-27>Emitted(39, 247) Source(78, 32) + SourceIndex(0)
-28>Emitted(39, 249) Source(78, 34) + SourceIndex(0)
-29>Emitted(39, 251) Source(78, 36) + SourceIndex(0)
-30>Emitted(39, 252) Source(78, 37) + SourceIndex(0)
+18>Emitted(39, 232) Source(78, 5) + SourceIndex(0)
+19>Emitted(39, 242) Source(78, 15) + SourceIndex(0)
+20>Emitted(39, 244) Source(78, 17) + SourceIndex(0)
+21>Emitted(39, 245) Source(78, 18) + SourceIndex(0)
+22>Emitted(39, 248) Source(78, 21) + SourceIndex(0)
+23>Emitted(39, 249) Source(78, 22) + SourceIndex(0)
+24>Emitted(39, 251) Source(78, 24) + SourceIndex(0)
+25>Emitted(39, 252) Source(78, 25) + SourceIndex(0)
+26>Emitted(39, 255) Source(78, 28) + SourceIndex(0)
+27>Emitted(39, 256) Source(78, 29) + SourceIndex(0)
+28>Emitted(39, 258) Source(78, 31) + SourceIndex(0)
+29>Emitted(39, 259) Source(78, 32) + SourceIndex(0)
+30>Emitted(39, 261) Source(78, 34) + SourceIndex(0)
+31>Emitted(39, 263) Source(78, 36) + SourceIndex(0)
+32>Emitted(39, 264) Source(78, 37) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -1485,44 +1497,44 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(41, 1) Source(80, 1) + SourceIndex(0)
 2 >Emitted(41, 2) Source(80, 2) + SourceIndex(0)
 ---
->>>for (_4 = getMultiRobot(), _5 = _4.skills, _6 = _5 === void 0 ? { primary: "none", secondary: "none" } : _5, _7 = _6.primary, primary = _7 === void 0 ? "primary" : _7, _8 = _6.secondary, secondary = _8 === void 0 ? "secondary" : _8, _4, i = 0; i < 1; i++) {
+>>>for (_4 = getMultiRobot(), (_5 = _4.skills, _6 = _5 === void 0 ? { primary: "none", secondary: "none" } : _5, _7 = _6.primary, primary = _7 === void 0 ? "primary" : _7, _8 = _6.secondary, secondary = _8 === void 0 ? "secondary" : _8, _4), _4, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
 5 >     ^^^^^^^^^^^^^^^^^^^^
-6 >                         ^^
-7 >                           ^^^^^^^^^^^^^^
-8 >                                         ^^
-9 >                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-10>                                                                                                           ^^
-11>                                                                                                             ^^^^^^^^^^^^^^^
-12>                                                                                                                            ^^
-13>                                                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-14>                                                                                                                                                                      ^^
-15>                                                                                                                                                                        ^^^^^^^^^^^^^^^^^
-16>                                                                                                                                                                                         ^^
-17>                                                                                                                                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-18>                                                                                                                                                                                                                                       ^^^^^^
-19>                                                                                                                                                                                                                                             ^
-20>                                                                                                                                                                                                                                              ^^^
-21>                                                                                                                                                                                                                                                 ^
-22>                                                                                                                                                                                                                                                  ^^
-23>                                                                                                                                                                                                                                                    ^
-24>                                                                                                                                                                                                                                                     ^^^
-25>                                                                                                                                                                                                                                                        ^
-26>                                                                                                                                                                                                                                                         ^^
-27>                                                                                                                                                                                                                                                           ^
-28>                                                                                                                                                                                                                                                            ^^
-29>                                                                                                                                                                                                                                                              ^^
-30>                                                                                                                                                                                                                                                                ^
+6 >                         ^^^
+7 >                            ^^^^^^^^^^^^^^
+8 >                                          ^^
+9 >                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                            ^^
+11>                                                                                                              ^^^^^^^^^^^^^^^
+12>                                                                                                                             ^^
+13>                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                       ^^
+15>                                                                                                                                                                         ^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                          ^^
+17>                                                                                                                                                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+18>                                                                                                                                                                                                                                        ^^^^^^^^^^^
+19>                                                                                                                                                                                                                                                   ^
+20>                                                                                                                                                                                                                                                    ^^^
+21>                                                                                                                                                                                                                                                       ^
+22>                                                                                                                                                                                                                                                        ^^
+23>                                                                                                                                                                                                                                                          ^
+24>                                                                                                                                                                                                                                                           ^^^
+25>                                                                                                                                                                                                                                                              ^
+26>                                                                                                                                                                                                                                                               ^^
+27>                                                                                                                                                                                                                                                                 ^
+28>                                                                                                                                                                                                                                                                  ^^
+29>                                                                                                                                                                                                                                                                    ^^
+30>                                                                                                                                                                                                                                                                      ^
 1->
   >
 2 >for
@@ -1535,69 +1547,69 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
   >         } = { primary: "none", secondary: "none" }
   >     } = getMultiRobot()
 6 >                         
-7 >                           skills: {
-  >                                   primary = "primary",
-  >                                   secondary = "secondary"
-  >                               } = { primary: "none", secondary: "none" }
-8 >                                         
-9 >                                           skills: {
-  >                                                   primary = "primary",
-  >                                                   secondary = "secondary"
-  >                                               } = { primary: "none", secondary: "none" }
-10>                                                                                                           
-11>                                                                                                             primary = "primary"
-12>                                                                                                                            
-13>                                                                                                                              primary = "primary"
-14>                                                                                                                                                                      ,
-  >                                                                                                                                                                              
-15>                                                                                                                                                                        secondary = "secondary"
-16>                                                                                                                                                                                         
-17>                                                                                                                                                                                           secondary = "secondary"
-18>                                                                                                                                                                                                                                       
-  >                                                                                                                                                                                                                                           } = { primary: "none", secondary: "none" }
-  >                                                                                                                                                                                                                                       } = getMultiRobot(), 
-19>                                                                                                                                                                                                                                             i
-20>                                                                                                                                                                                                                                               = 
-21>                                                                                                                                                                                                                                                 0
-22>                                                                                                                                                                                                                                                  ; 
-23>                                                                                                                                                                                                                                                    i
-24>                                                                                                                                                                                                                                                      < 
-25>                                                                                                                                                                                                                                                        1
-26>                                                                                                                                                                                                                                                         ; 
-27>                                                                                                                                                                                                                                                           i
-28>                                                                                                                                                                                                                                                            ++
-29>                                                                                                                                                                                                                                                              ) 
-30>                                                                                                                                                                                                                                                                {
+7 >                            skills: {
+  >                                    primary = "primary",
+  >                                    secondary = "secondary"
+  >                                } = { primary: "none", secondary: "none" }
+8 >                                          
+9 >                                            skills: {
+  >                                                    primary = "primary",
+  >                                                    secondary = "secondary"
+  >                                                } = { primary: "none", secondary: "none" }
+10>                                                                                                            
+11>                                                                                                              primary = "primary"
+12>                                                                                                                             
+13>                                                                                                                               primary = "primary"
+14>                                                                                                                                                                       ,
+  >                                                                                                                                                                               
+15>                                                                                                                                                                         secondary = "secondary"
+16>                                                                                                                                                                                          
+17>                                                                                                                                                                                            secondary = "secondary"
+18>                                                                                                                                                                                                                                        
+  >                                                                                                                                                                                                                                            } = { primary: "none", secondary: "none" }
+  >                                                                                                                                                                                                                                        } = getMultiRobot(), 
+19>                                                                                                                                                                                                                                                   i
+20>                                                                                                                                                                                                                                                     = 
+21>                                                                                                                                                                                                                                                       0
+22>                                                                                                                                                                                                                                                        ; 
+23>                                                                                                                                                                                                                                                          i
+24>                                                                                                                                                                                                                                                            < 
+25>                                                                                                                                                                                                                                                              1
+26>                                                                                                                                                                                                                                                               ; 
+27>                                                                                                                                                                                                                                                                 i
+28>                                                                                                                                                                                                                                                                  ++
+29>                                                                                                                                                                                                                                                                    ) 
+30>                                                                                                                                                                                                                                                                      {
 1->Emitted(42, 1) Source(81, 1) + SourceIndex(0)
 2 >Emitted(42, 4) Source(81, 4) + SourceIndex(0)
 3 >Emitted(42, 5) Source(81, 5) + SourceIndex(0)
 4 >Emitted(42, 6) Source(81, 6) + SourceIndex(0)
 5 >Emitted(42, 26) Source(86, 20) + SourceIndex(0)
-6 >Emitted(42, 28) Source(82, 5) + SourceIndex(0)
-7 >Emitted(42, 42) Source(85, 47) + SourceIndex(0)
-8 >Emitted(42, 44) Source(82, 5) + SourceIndex(0)
-9 >Emitted(42, 108) Source(85, 47) + SourceIndex(0)
-10>Emitted(42, 110) Source(83, 9) + SourceIndex(0)
-11>Emitted(42, 125) Source(83, 28) + SourceIndex(0)
-12>Emitted(42, 127) Source(83, 9) + SourceIndex(0)
-13>Emitted(42, 167) Source(83, 28) + SourceIndex(0)
-14>Emitted(42, 169) Source(84, 9) + SourceIndex(0)
-15>Emitted(42, 186) Source(84, 32) + SourceIndex(0)
-16>Emitted(42, 188) Source(84, 9) + SourceIndex(0)
-17>Emitted(42, 232) Source(84, 32) + SourceIndex(0)
-18>Emitted(42, 238) Source(86, 22) + SourceIndex(0)
-19>Emitted(42, 239) Source(86, 23) + SourceIndex(0)
-20>Emitted(42, 242) Source(86, 26) + SourceIndex(0)
-21>Emitted(42, 243) Source(86, 27) + SourceIndex(0)
-22>Emitted(42, 245) Source(86, 29) + SourceIndex(0)
-23>Emitted(42, 246) Source(86, 30) + SourceIndex(0)
-24>Emitted(42, 249) Source(86, 33) + SourceIndex(0)
-25>Emitted(42, 250) Source(86, 34) + SourceIndex(0)
-26>Emitted(42, 252) Source(86, 36) + SourceIndex(0)
-27>Emitted(42, 253) Source(86, 37) + SourceIndex(0)
-28>Emitted(42, 255) Source(86, 39) + SourceIndex(0)
-29>Emitted(42, 257) Source(86, 41) + SourceIndex(0)
-30>Emitted(42, 258) Source(86, 42) + SourceIndex(0)
+6 >Emitted(42, 29) Source(82, 5) + SourceIndex(0)
+7 >Emitted(42, 43) Source(85, 47) + SourceIndex(0)
+8 >Emitted(42, 45) Source(82, 5) + SourceIndex(0)
+9 >Emitted(42, 109) Source(85, 47) + SourceIndex(0)
+10>Emitted(42, 111) Source(83, 9) + SourceIndex(0)
+11>Emitted(42, 126) Source(83, 28) + SourceIndex(0)
+12>Emitted(42, 128) Source(83, 9) + SourceIndex(0)
+13>Emitted(42, 168) Source(83, 28) + SourceIndex(0)
+14>Emitted(42, 170) Source(84, 9) + SourceIndex(0)
+15>Emitted(42, 187) Source(84, 32) + SourceIndex(0)
+16>Emitted(42, 189) Source(84, 9) + SourceIndex(0)
+17>Emitted(42, 233) Source(84, 32) + SourceIndex(0)
+18>Emitted(42, 244) Source(86, 22) + SourceIndex(0)
+19>Emitted(42, 245) Source(86, 23) + SourceIndex(0)
+20>Emitted(42, 248) Source(86, 26) + SourceIndex(0)
+21>Emitted(42, 249) Source(86, 27) + SourceIndex(0)
+22>Emitted(42, 251) Source(86, 29) + SourceIndex(0)
+23>Emitted(42, 252) Source(86, 30) + SourceIndex(0)
+24>Emitted(42, 255) Source(86, 33) + SourceIndex(0)
+25>Emitted(42, 256) Source(86, 34) + SourceIndex(0)
+26>Emitted(42, 258) Source(86, 36) + SourceIndex(0)
+27>Emitted(42, 259) Source(86, 37) + SourceIndex(0)
+28>Emitted(42, 261) Source(86, 39) + SourceIndex(0)
+29>Emitted(42, 263) Source(86, 41) + SourceIndex(0)
+30>Emitted(42, 264) Source(86, 42) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -1629,31 +1641,31 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(44, 1) Source(88, 1) + SourceIndex(0)
 2 >Emitted(44, 2) Source(88, 2) + SourceIndex(0)
 ---
->>>for (_9 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _10 = _9.skills, _11 = _10 === void 0 ? { primary: "none", secondary: "none" } : _10, _12 = _11.primary, primary = _12 === void 0 ? "primary" : _12, _13 = _11.secondary, secondary = _13 === void 0 ? "secondary" : _13, _9,
+>>>for (_9 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, (_10 = _9.skills, _11 = _10 === void 0 ? { primary: "none", secondary: "none" } : _10, _12 = _11.primary, primary = _12 === void 0 ? "primary" : _12, _13 = _11.secondary, secondary = _13 === void 0 ? "secondary" : _13, _9), _9,
 1->
 2 >^^^
 3 >   ^
 4 >    ^
 5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                                                                   ^^
-7 >                                                                                     ^^^^^^^^^^^^^^^
-8 >                                                                                                    ^^
-9 >                                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-10>                                                                                                                                                                         ^^
-11>                                                                                                                                                                           ^^^^^^^^^^^^^^^^^
-12>                                                                                                                                                                                            ^^
-13>                                                                                                                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-14>                                                                                                                                                                                                                                        ^^
-15>                                                                                                                                                                                                                                          ^^^^^^^^^^^^^^^^^^^
-16>                                                                                                                                                                                                                                                             ^^
-17>                                                                                                                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                                                   ^^^
+7 >                                                                                      ^^^^^^^^^^^^^^^
+8 >                                                                                                     ^^
+9 >                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                                                                                          ^^
+11>                                                                                                                                                                            ^^^^^^^^^^^^^^^^^
+12>                                                                                                                                                                                             ^^
+13>                                                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                                                                                         ^^
+15>                                                                                                                                                                                                                                           ^^^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                                                                                              ^^
+17>                                                                                                                                                                                                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
 2 >for
@@ -1666,41 +1678,41 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
   >         } = { primary: "none", secondary: "none" }
   >     } = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }
 6 >                                                                                   
-7 >                                                                                     skills: {
-  >                                                                                             primary = "primary",
-  >                                                                                             secondary = "secondary"
-  >                                                                                         } = { primary: "none", secondary: "none" }
-8 >                                                                                                    
-9 >                                                                                                      skills: {
-  >                                                                                                              primary = "primary",
-  >                                                                                                              secondary = "secondary"
-  >                                                                                                          } = { primary: "none", secondary: "none" }
-10>                                                                                                                                                                         
-11>                                                                                                                                                                           primary = "primary"
-12>                                                                                                                                                                                            
-13>                                                                                                                                                                                              primary = "primary"
-14>                                                                                                                                                                                                                                        ,
-  >                                                                                                                                                                                                                                                
-15>                                                                                                                                                                                                                                          secondary = "secondary"
-16>                                                                                                                                                                                                                                                             
-17>                                                                                                                                                                                                                                                               secondary = "secondary"
+7 >                                                                                      skills: {
+  >                                                                                              primary = "primary",
+  >                                                                                              secondary = "secondary"
+  >                                                                                          } = { primary: "none", secondary: "none" }
+8 >                                                                                                     
+9 >                                                                                                       skills: {
+  >                                                                                                               primary = "primary",
+  >                                                                                                               secondary = "secondary"
+  >                                                                                                           } = { primary: "none", secondary: "none" }
+10>                                                                                                                                                                          
+11>                                                                                                                                                                            primary = "primary"
+12>                                                                                                                                                                                             
+13>                                                                                                                                                                                               primary = "primary"
+14>                                                                                                                                                                                                                                         ,
+  >                                                                                                                                                                                                                                                 
+15>                                                                                                                                                                                                                                           secondary = "secondary"
+16>                                                                                                                                                                                                                                                              
+17>                                                                                                                                                                                                                                                                secondary = "secondary"
 1->Emitted(45, 1) Source(89, 1) + SourceIndex(0)
 2 >Emitted(45, 4) Source(89, 4) + SourceIndex(0)
 3 >Emitted(45, 5) Source(89, 5) + SourceIndex(0)
 4 >Emitted(45, 6) Source(89, 6) + SourceIndex(0)
 5 >Emitted(45, 84) Source(94, 90) + SourceIndex(0)
-6 >Emitted(45, 86) Source(90, 5) + SourceIndex(0)
-7 >Emitted(45, 101) Source(93, 47) + SourceIndex(0)
-8 >Emitted(45, 103) Source(90, 5) + SourceIndex(0)
-9 >Emitted(45, 170) Source(93, 47) + SourceIndex(0)
-10>Emitted(45, 172) Source(91, 9) + SourceIndex(0)
-11>Emitted(45, 189) Source(91, 28) + SourceIndex(0)
-12>Emitted(45, 191) Source(91, 9) + SourceIndex(0)
-13>Emitted(45, 233) Source(91, 28) + SourceIndex(0)
-14>Emitted(45, 235) Source(92, 9) + SourceIndex(0)
-15>Emitted(45, 254) Source(92, 32) + SourceIndex(0)
-16>Emitted(45, 256) Source(92, 9) + SourceIndex(0)
-17>Emitted(45, 302) Source(92, 32) + SourceIndex(0)
+6 >Emitted(45, 87) Source(90, 5) + SourceIndex(0)
+7 >Emitted(45, 102) Source(93, 47) + SourceIndex(0)
+8 >Emitted(45, 104) Source(90, 5) + SourceIndex(0)
+9 >Emitted(45, 171) Source(93, 47) + SourceIndex(0)
+10>Emitted(45, 173) Source(91, 9) + SourceIndex(0)
+11>Emitted(45, 190) Source(91, 28) + SourceIndex(0)
+12>Emitted(45, 192) Source(91, 9) + SourceIndex(0)
+13>Emitted(45, 234) Source(91, 28) + SourceIndex(0)
+14>Emitted(45, 236) Source(92, 9) + SourceIndex(0)
+15>Emitted(45, 255) Source(92, 32) + SourceIndex(0)
+16>Emitted(45, 257) Source(92, 9) + SourceIndex(0)
+17>Emitted(45, 303) Source(92, 32) + SourceIndex(0)
 ---
 >>>    i = 0; i < 1; i++) {
 1 >^^^^
@@ -2133,14 +2145,14 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(57, 1) Source(108, 1) + SourceIndex(0)
 2 >Emitted(57, 2) Source(108, 2) + SourceIndex(0)
 ---
->>>for (_22 = multiRobot.name, nameA = _22 === void 0 ? "noName" : _22, _23 = multiRobot.skills, _24 = _23 === void 0 ? { primary: "none", secondary: "none" } : _23, _25 = _24.primary, primaryA = _25 === void 0 ? "primary" : _25, _26 = _24.secondary, secondaryA = _26 === void 0 ? "secondary" : _26, multiRobot, i = 0; i < 1; i++) {
+>>>for (_22 = multiRobot.name, nameA = _22 === void 0 ? "noName" : _22, _23 = multiRobot.skills, _24 = _23 === void 0 ? { primary: "none", secondary: "none" } : _23, _25 = _24.primary, primaryA = _25 === void 0 ? "primary" : _25, _26 = _24.secondary, secondaryA = _26 === void 0 ? "secondary" : _26, multiRobot, multiRobot, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
@@ -2163,18 +2175,20 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 20>                                                                                                                                                                                                                                                                                                       ^^
 21>                                                                                                                                                                                                                                                                                                         ^^^^^^^^^^
 22>                                                                                                                                                                                                                                                                                                                   ^^
-23>                                                                                                                                                                                                                                                                                                                     ^
-24>                                                                                                                                                                                                                                                                                                                      ^^^
-25>                                                                                                                                                                                                                                                                                                                         ^
-26>                                                                                                                                                                                                                                                                                                                          ^^
-27>                                                                                                                                                                                                                                                                                                                            ^
-28>                                                                                                                                                                                                                                                                                                                             ^^^
-29>                                                                                                                                                                                                                                                                                                                                ^
-30>                                                                                                                                                                                                                                                                                                                                 ^^
-31>                                                                                                                                                                                                                                                                                                                                   ^
-32>                                                                                                                                                                                                                                                                                                                                    ^^
-33>                                                                                                                                                                                                                                                                                                                                      ^^
-34>                                                                                                                                                                                                                                                                                                                                        ^
+23>                                                                                                                                                                                                                                                                                                                     ^^^^^^^^^^
+24>                                                                                                                                                                                                                                                                                                                               ^^
+25>                                                                                                                                                                                                                                                                                                                                 ^
+26>                                                                                                                                                                                                                                                                                                                                  ^^^
+27>                                                                                                                                                                                                                                                                                                                                     ^
+28>                                                                                                                                                                                                                                                                                                                                      ^^
+29>                                                                                                                                                                                                                                                                                                                                        ^
+30>                                                                                                                                                                                                                                                                                                                                         ^^^
+31>                                                                                                                                                                                                                                                                                                                                            ^
+32>                                                                                                                                                                                                                                                                                                                                             ^^
+33>                                                                                                                                                                                                                                                                                                                                               ^
+34>                                                                                                                                                                                                                                                                                                                                                ^^
+35>                                                                                                                                                                                                                                                                                                                                                  ^^
+36>                                                                                                                                                                                                                                                                                                                                                    ^
 1->
   >
 2 >for
@@ -2208,19 +2222,21 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
   >                                                                                                                                                                                                                                                                                                           } = { primary: "none", secondary: "none" }
   >                                                                                                                                                                                                                                                                                                       } = 
 21>                                                                                                                                                                                                                                                                                                         multiRobot
-22>                                                                                                                                                                                                                                                                                                                   , 
-23>                                                                                                                                                                                                                                                                                                                     i
-24>                                                                                                                                                                                                                                                                                                                       = 
-25>                                                                                                                                                                                                                                                                                                                         0
-26>                                                                                                                                                                                                                                                                                                                          ; 
-27>                                                                                                                                                                                                                                                                                                                            i
-28>                                                                                                                                                                                                                                                                                                                              < 
-29>                                                                                                                                                                                                                                                                                                                                1
-30>                                                                                                                                                                                                                                                                                                                                 ; 
-31>                                                                                                                                                                                                                                                                                                                                   i
-32>                                                                                                                                                                                                                                                                                                                                    ++
-33>                                                                                                                                                                                                                                                                                                                                      ) 
-34>                                                                                                                                                                                                                                                                                                                                        {
+22>                                                                                                                                                                                                                                                                                                                   
+23>                                                                                                                                                                                                                                                                                                                     multiRobot
+24>                                                                                                                                                                                                                                                                                                                               , 
+25>                                                                                                                                                                                                                                                                                                                                 i
+26>                                                                                                                                                                                                                                                                                                                                   = 
+27>                                                                                                                                                                                                                                                                                                                                     0
+28>                                                                                                                                                                                                                                                                                                                                      ; 
+29>                                                                                                                                                                                                                                                                                                                                        i
+30>                                                                                                                                                                                                                                                                                                                                          < 
+31>                                                                                                                                                                                                                                                                                                                                            1
+32>                                                                                                                                                                                                                                                                                                                                             ; 
+33>                                                                                                                                                                                                                                                                                                                                               i
+34>                                                                                                                                                                                                                                                                                                                                                ++
+35>                                                                                                                                                                                                                                                                                                                                                  ) 
+36>                                                                                                                                                                                                                                                                                                                                                    {
 1->Emitted(58, 1) Source(109, 1) + SourceIndex(0)
 2 >Emitted(58, 4) Source(109, 4) + SourceIndex(0)
 3 >Emitted(58, 5) Source(109, 5) + SourceIndex(0)
@@ -2242,19 +2258,21 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 19>Emitted(58, 296) Source(113, 44) + SourceIndex(0)
 20>Emitted(58, 298) Source(115, 5) + SourceIndex(0)
 21>Emitted(58, 308) Source(115, 15) + SourceIndex(0)
-22>Emitted(58, 310) Source(115, 17) + SourceIndex(0)
-23>Emitted(58, 311) Source(115, 18) + SourceIndex(0)
-24>Emitted(58, 314) Source(115, 21) + SourceIndex(0)
-25>Emitted(58, 315) Source(115, 22) + SourceIndex(0)
-26>Emitted(58, 317) Source(115, 24) + SourceIndex(0)
-27>Emitted(58, 318) Source(115, 25) + SourceIndex(0)
-28>Emitted(58, 321) Source(115, 28) + SourceIndex(0)
-29>Emitted(58, 322) Source(115, 29) + SourceIndex(0)
-30>Emitted(58, 324) Source(115, 31) + SourceIndex(0)
-31>Emitted(58, 325) Source(115, 32) + SourceIndex(0)
-32>Emitted(58, 327) Source(115, 34) + SourceIndex(0)
-33>Emitted(58, 329) Source(115, 36) + SourceIndex(0)
-34>Emitted(58, 330) Source(115, 37) + SourceIndex(0)
+22>Emitted(58, 310) Source(115, 5) + SourceIndex(0)
+23>Emitted(58, 320) Source(115, 15) + SourceIndex(0)
+24>Emitted(58, 322) Source(115, 17) + SourceIndex(0)
+25>Emitted(58, 323) Source(115, 18) + SourceIndex(0)
+26>Emitted(58, 326) Source(115, 21) + SourceIndex(0)
+27>Emitted(58, 327) Source(115, 22) + SourceIndex(0)
+28>Emitted(58, 329) Source(115, 24) + SourceIndex(0)
+29>Emitted(58, 330) Source(115, 25) + SourceIndex(0)
+30>Emitted(58, 333) Source(115, 28) + SourceIndex(0)
+31>Emitted(58, 334) Source(115, 29) + SourceIndex(0)
+32>Emitted(58, 336) Source(115, 31) + SourceIndex(0)
+33>Emitted(58, 337) Source(115, 32) + SourceIndex(0)
+34>Emitted(58, 339) Source(115, 34) + SourceIndex(0)
+35>Emitted(58, 341) Source(115, 36) + SourceIndex(0)
+36>Emitted(58, 342) Source(115, 37) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -2286,48 +2304,48 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(60, 1) Source(117, 1) + SourceIndex(0)
 2 >Emitted(60, 2) Source(117, 2) + SourceIndex(0)
 ---
->>>for (_27 = getMultiRobot(), _28 = _27.name, nameA = _28 === void 0 ? "noName" : _28, _29 = _27.skills, _30 = _29 === void 0 ? { primary: "none", secondary: "none" } : _29, _31 = _30.primary, primaryA = _31 === void 0 ? "primary" : _31, _32 = _30.secondary, secondaryA = _32 === void 0 ? "secondary" : _32, _27, i = 0; i < 1; i++) {
+>>>for (_27 = getMultiRobot(), (_28 = _27.name, nameA = _28 === void 0 ? "noName" : _28, _29 = _27.skills, _30 = _29 === void 0 ? { primary: "none", secondary: "none" } : _29, _31 = _30.primary, primaryA = _31 === void 0 ? "primary" : _31, _32 = _30.secondary, secondaryA = _32 === void 0 ? "secondary" : _32, _27), _27, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
 5 >     ^^^^^^^^^^^^^^^^^^^^^
-6 >                          ^^
-7 >                            ^^^^^^^^^^^^^^
-8 >                                          ^^
-9 >                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-10>                                                                                   ^^
-11>                                                                                     ^^^^^^^^^^^^^^^^
-12>                                                                                                     ^^
-13>                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-14>                                                                                                                                                                          ^^
-15>                                                                                                                                                                            ^^^^^^^^^^^^^^^^^
-16>                                                                                                                                                                                             ^^
-17>                                                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-18>                                                                                                                                                                                                                                          ^^
-19>                                                                                                                                                                                                                                            ^^^^^^^^^^^^^^^^^^^
-20>                                                                                                                                                                                                                                                               ^^
-21>                                                                                                                                                                                                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-22>                                                                                                                                                                                                                                                                                                                ^^^^^^^
-23>                                                                                                                                                                                                                                                                                                                       ^
-24>                                                                                                                                                                                                                                                                                                                        ^^^
-25>                                                                                                                                                                                                                                                                                                                           ^
-26>                                                                                                                                                                                                                                                                                                                            ^^
-27>                                                                                                                                                                                                                                                                                                                              ^
-28>                                                                                                                                                                                                                                                                                                                               ^^^
-29>                                                                                                                                                                                                                                                                                                                                  ^
-30>                                                                                                                                                                                                                                                                                                                                   ^^
-31>                                                                                                                                                                                                                                                                                                                                     ^
-32>                                                                                                                                                                                                                                                                                                                                      ^^
-33>                                                                                                                                                                                                                                                                                                                                        ^^
-34>                                                                                                                                                                                                                                                                                                                                          ^
+6 >                          ^^^
+7 >                             ^^^^^^^^^^^^^^
+8 >                                           ^^
+9 >                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                    ^^
+11>                                                                                      ^^^^^^^^^^^^^^^^
+12>                                                                                                      ^^
+13>                                                                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                           ^^
+15>                                                                                                                                                                             ^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                              ^^
+17>                                                                                                                                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+18>                                                                                                                                                                                                                                           ^^
+19>                                                                                                                                                                                                                                             ^^^^^^^^^^^^^^^^^^^
+20>                                                                                                                                                                                                                                                                ^^
+21>                                                                                                                                                                                                                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+22>                                                                                                                                                                                                                                                                                                                 ^^^^^^^^^^^^^
+23>                                                                                                                                                                                                                                                                                                                              ^
+24>                                                                                                                                                                                                                                                                                                                               ^^^
+25>                                                                                                                                                                                                                                                                                                                                  ^
+26>                                                                                                                                                                                                                                                                                                                                   ^^
+27>                                                                                                                                                                                                                                                                                                                                     ^
+28>                                                                                                                                                                                                                                                                                                                                      ^^^
+29>                                                                                                                                                                                                                                                                                                                                         ^
+30>                                                                                                                                                                                                                                                                                                                                          ^^
+31>                                                                                                                                                                                                                                                                                                                                            ^
+32>                                                                                                                                                                                                                                                                                                                                             ^^
+33>                                                                                                                                                                                                                                                                                                                                               ^^
+34>                                                                                                                                                                                                                                                                                                                                                 ^
 1->
   >
 2 >for
@@ -2341,78 +2359,78 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
   >         } = { primary: "none", secondary: "none" }
   >     } = getMultiRobot()
 6 >                          
-7 >                            name: nameA = "noName"
-8 >                                          
-9 >                                            name: nameA = "noName"
-10>                                                                                   ,
-  >                                                                                       
-11>                                                                                     skills: {
-  >                                                                                             primary: primaryA = "primary",
-  >                                                                                             secondary: secondaryA = "secondary"
-  >                                                                                         } = { primary: "none", secondary: "none" }
-12>                                                                                                     
-13>                                                                                                       skills: {
-  >                                                                                                               primary: primaryA = "primary",
-  >                                                                                                               secondary: secondaryA = "secondary"
-  >                                                                                                           } = { primary: "none", secondary: "none" }
-14>                                                                                                                                                                          
-15>                                                                                                                                                                            primary: primaryA = "primary"
-16>                                                                                                                                                                                             
-17>                                                                                                                                                                                               primary: primaryA = "primary"
-18>                                                                                                                                                                                                                                          ,
-  >                                                                                                                                                                                                                                                  
-19>                                                                                                                                                                                                                                            secondary: secondaryA = "secondary"
-20>                                                                                                                                                                                                                                                               
-21>                                                                                                                                                                                                                                                                 secondary: secondaryA = "secondary"
-22>                                                                                                                                                                                                                                                                                                                
-  >                                                                                                                                                                                                                                                                                                                    } = { primary: "none", secondary: "none" }
-  >                                                                                                                                                                                                                                                                                                                } = getMultiRobot(), 
-23>                                                                                                                                                                                                                                                                                                                       i
-24>                                                                                                                                                                                                                                                                                                                         = 
-25>                                                                                                                                                                                                                                                                                                                           0
-26>                                                                                                                                                                                                                                                                                                                            ; 
-27>                                                                                                                                                                                                                                                                                                                              i
-28>                                                                                                                                                                                                                                                                                                                                < 
-29>                                                                                                                                                                                                                                                                                                                                  1
-30>                                                                                                                                                                                                                                                                                                                                   ; 
-31>                                                                                                                                                                                                                                                                                                                                     i
-32>                                                                                                                                                                                                                                                                                                                                      ++
-33>                                                                                                                                                                                                                                                                                                                                        ) 
-34>                                                                                                                                                                                                                                                                                                                                          {
+7 >                             name: nameA = "noName"
+8 >                                           
+9 >                                             name: nameA = "noName"
+10>                                                                                    ,
+  >                                                                                        
+11>                                                                                      skills: {
+  >                                                                                              primary: primaryA = "primary",
+  >                                                                                              secondary: secondaryA = "secondary"
+  >                                                                                          } = { primary: "none", secondary: "none" }
+12>                                                                                                      
+13>                                                                                                        skills: {
+  >                                                                                                                primary: primaryA = "primary",
+  >                                                                                                                secondary: secondaryA = "secondary"
+  >                                                                                                            } = { primary: "none", secondary: "none" }
+14>                                                                                                                                                                           
+15>                                                                                                                                                                             primary: primaryA = "primary"
+16>                                                                                                                                                                                              
+17>                                                                                                                                                                                                primary: primaryA = "primary"
+18>                                                                                                                                                                                                                                           ,
+  >                                                                                                                                                                                                                                                   
+19>                                                                                                                                                                                                                                             secondary: secondaryA = "secondary"
+20>                                                                                                                                                                                                                                                                
+21>                                                                                                                                                                                                                                                                  secondary: secondaryA = "secondary"
+22>                                                                                                                                                                                                                                                                                                                 
+  >                                                                                                                                                                                                                                                                                                                     } = { primary: "none", secondary: "none" }
+  >                                                                                                                                                                                                                                                                                                                 } = getMultiRobot(), 
+23>                                                                                                                                                                                                                                                                                                                              i
+24>                                                                                                                                                                                                                                                                                                                                = 
+25>                                                                                                                                                                                                                                                                                                                                  0
+26>                                                                                                                                                                                                                                                                                                                                   ; 
+27>                                                                                                                                                                                                                                                                                                                                     i
+28>                                                                                                                                                                                                                                                                                                                                       < 
+29>                                                                                                                                                                                                                                                                                                                                         1
+30>                                                                                                                                                                                                                                                                                                                                          ; 
+31>                                                                                                                                                                                                                                                                                                                                            i
+32>                                                                                                                                                                                                                                                                                                                                             ++
+33>                                                                                                                                                                                                                                                                                                                                               ) 
+34>                                                                                                                                                                                                                                                                                                                                                 {
 1->Emitted(61, 1) Source(118, 1) + SourceIndex(0)
 2 >Emitted(61, 4) Source(118, 4) + SourceIndex(0)
 3 >Emitted(61, 5) Source(118, 5) + SourceIndex(0)
 4 >Emitted(61, 6) Source(118, 6) + SourceIndex(0)
 5 >Emitted(61, 27) Source(124, 20) + SourceIndex(0)
-6 >Emitted(61, 29) Source(119, 5) + SourceIndex(0)
-7 >Emitted(61, 43) Source(119, 27) + SourceIndex(0)
-8 >Emitted(61, 45) Source(119, 5) + SourceIndex(0)
-9 >Emitted(61, 84) Source(119, 27) + SourceIndex(0)
-10>Emitted(61, 86) Source(120, 5) + SourceIndex(0)
-11>Emitted(61, 102) Source(123, 47) + SourceIndex(0)
-12>Emitted(61, 104) Source(120, 5) + SourceIndex(0)
-13>Emitted(61, 171) Source(123, 47) + SourceIndex(0)
-14>Emitted(61, 173) Source(121, 9) + SourceIndex(0)
-15>Emitted(61, 190) Source(121, 38) + SourceIndex(0)
-16>Emitted(61, 192) Source(121, 9) + SourceIndex(0)
-17>Emitted(61, 235) Source(121, 38) + SourceIndex(0)
-18>Emitted(61, 237) Source(122, 9) + SourceIndex(0)
-19>Emitted(61, 256) Source(122, 44) + SourceIndex(0)
-20>Emitted(61, 258) Source(122, 9) + SourceIndex(0)
-21>Emitted(61, 305) Source(122, 44) + SourceIndex(0)
-22>Emitted(61, 312) Source(124, 22) + SourceIndex(0)
-23>Emitted(61, 313) Source(124, 23) + SourceIndex(0)
-24>Emitted(61, 316) Source(124, 26) + SourceIndex(0)
-25>Emitted(61, 317) Source(124, 27) + SourceIndex(0)
-26>Emitted(61, 319) Source(124, 29) + SourceIndex(0)
-27>Emitted(61, 320) Source(124, 30) + SourceIndex(0)
-28>Emitted(61, 323) Source(124, 33) + SourceIndex(0)
-29>Emitted(61, 324) Source(124, 34) + SourceIndex(0)
-30>Emitted(61, 326) Source(124, 36) + SourceIndex(0)
-31>Emitted(61, 327) Source(124, 37) + SourceIndex(0)
-32>Emitted(61, 329) Source(124, 39) + SourceIndex(0)
-33>Emitted(61, 331) Source(124, 41) + SourceIndex(0)
-34>Emitted(61, 332) Source(124, 42) + SourceIndex(0)
+6 >Emitted(61, 30) Source(119, 5) + SourceIndex(0)
+7 >Emitted(61, 44) Source(119, 27) + SourceIndex(0)
+8 >Emitted(61, 46) Source(119, 5) + SourceIndex(0)
+9 >Emitted(61, 85) Source(119, 27) + SourceIndex(0)
+10>Emitted(61, 87) Source(120, 5) + SourceIndex(0)
+11>Emitted(61, 103) Source(123, 47) + SourceIndex(0)
+12>Emitted(61, 105) Source(120, 5) + SourceIndex(0)
+13>Emitted(61, 172) Source(123, 47) + SourceIndex(0)
+14>Emitted(61, 174) Source(121, 9) + SourceIndex(0)
+15>Emitted(61, 191) Source(121, 38) + SourceIndex(0)
+16>Emitted(61, 193) Source(121, 9) + SourceIndex(0)
+17>Emitted(61, 236) Source(121, 38) + SourceIndex(0)
+18>Emitted(61, 238) Source(122, 9) + SourceIndex(0)
+19>Emitted(61, 257) Source(122, 44) + SourceIndex(0)
+20>Emitted(61, 259) Source(122, 9) + SourceIndex(0)
+21>Emitted(61, 306) Source(122, 44) + SourceIndex(0)
+22>Emitted(61, 319) Source(124, 22) + SourceIndex(0)
+23>Emitted(61, 320) Source(124, 23) + SourceIndex(0)
+24>Emitted(61, 323) Source(124, 26) + SourceIndex(0)
+25>Emitted(61, 324) Source(124, 27) + SourceIndex(0)
+26>Emitted(61, 326) Source(124, 29) + SourceIndex(0)
+27>Emitted(61, 327) Source(124, 30) + SourceIndex(0)
+28>Emitted(61, 330) Source(124, 33) + SourceIndex(0)
+29>Emitted(61, 331) Source(124, 34) + SourceIndex(0)
+30>Emitted(61, 333) Source(124, 36) + SourceIndex(0)
+31>Emitted(61, 334) Source(124, 37) + SourceIndex(0)
+32>Emitted(61, 336) Source(124, 39) + SourceIndex(0)
+33>Emitted(61, 338) Source(124, 41) + SourceIndex(0)
+34>Emitted(61, 339) Source(124, 42) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -2444,35 +2462,35 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(63, 1) Source(126, 1) + SourceIndex(0)
 2 >Emitted(63, 2) Source(126, 2) + SourceIndex(0)
 ---
->>>for (_33 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _34 = _33.name, nameA = _34 === void 0 ? "noName" : _34, _35 = _33.skills, _36 = _35 === void 0 ? { primary: "none", secondary: "none" } : _35, _37 = _36.primary, primaryA = _37 === void 0 ? "primary" : _37, _38 = _36.secondary, secondaryA = _38 === void 0 ? "secondary" : _38, _33,
+>>>for (_33 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, (_34 = _33.name, nameA = _34 === void 0 ? "noName" : _34, _35 = _33.skills, _36 = _35 === void 0 ? { primary: "none", secondary: "none" } : _35, _37 = _36.primary, primaryA = _37 === void 0 ? "primary" : _37, _38 = _36.secondary, secondaryA = _38 === void 0 ? "secondary" : _38, _33), _33,
 1->
 2 >^^^
 3 >   ^
 4 >    ^
 5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                                                                    ^^
-7 >                                                                                      ^^^^^^^^^^^^^^
-8 >                                                                                                    ^^
-9 >                                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-10>                                                                                                                                             ^^
-11>                                                                                                                                               ^^^^^^^^^^^^^^^^
-12>                                                                                                                                                               ^^
-13>                                                                                                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-14>                                                                                                                                                                                                                                    ^^
-15>                                                                                                                                                                                                                                      ^^^^^^^^^^^^^^^^^
-16>                                                                                                                                                                                                                                                       ^^
-17>                                                                                                                                                                                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-18>                                                                                                                                                                                                                                                                                                    ^^
-19>                                                                                                                                                                                                                                                                                                      ^^^^^^^^^^^^^^^^^^^
-20>                                                                                                                                                                                                                                                                                                                         ^^
-21>                                                                                                                                                                                                                                                                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                                                    ^^^
+7 >                                                                                       ^^^^^^^^^^^^^^
+8 >                                                                                                     ^^
+9 >                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                                                              ^^
+11>                                                                                                                                                ^^^^^^^^^^^^^^^^
+12>                                                                                                                                                                ^^
+13>                                                                                                                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                                                                                     ^^
+15>                                                                                                                                                                                                                                       ^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                                                                                        ^^
+17>                                                                                                                                                                                                                                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+18>                                                                                                                                                                                                                                                                                                     ^^
+19>                                                                                                                                                                                                                                                                                                       ^^^^^^^^^^^^^^^^^^^
+20>                                                                                                                                                                                                                                                                                                                          ^^
+21>                                                                                                                                                                                                                                                                                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
 2 >for
@@ -2486,50 +2504,50 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
   >         } = { primary: "none", secondary: "none" }
   >     } = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }
 6 >                                                                                    
-7 >                                                                                      name: nameA = "noName"
-8 >                                                                                                    
-9 >                                                                                                      name: nameA = "noName"
-10>                                                                                                                                             ,
-  >                                                                                                                                                 
-11>                                                                                                                                               skills: {
-  >                                                                                                                                                       primary: primaryA = "primary",
-  >                                                                                                                                                       secondary: secondaryA = "secondary"
-  >                                                                                                                                                   } = { primary: "none", secondary: "none" }
-12>                                                                                                                                                               
-13>                                                                                                                                                                 skills: {
-  >                                                                                                                                                                         primary: primaryA = "primary",
-  >                                                                                                                                                                         secondary: secondaryA = "secondary"
-  >                                                                                                                                                                     } = { primary: "none", secondary: "none" }
-14>                                                                                                                                                                                                                                    
-15>                                                                                                                                                                                                                                      primary: primaryA = "primary"
-16>                                                                                                                                                                                                                                                       
-17>                                                                                                                                                                                                                                                         primary: primaryA = "primary"
-18>                                                                                                                                                                                                                                                                                                    ,
-  >                                                                                                                                                                                                                                                                                                            
-19>                                                                                                                                                                                                                                                                                                      secondary: secondaryA = "secondary"
-20>                                                                                                                                                                                                                                                                                                                         
-21>                                                                                                                                                                                                                                                                                                                           secondary: secondaryA = "secondary"
+7 >                                                                                       name: nameA = "noName"
+8 >                                                                                                     
+9 >                                                                                                       name: nameA = "noName"
+10>                                                                                                                                              ,
+  >                                                                                                                                                  
+11>                                                                                                                                                skills: {
+  >                                                                                                                                                        primary: primaryA = "primary",
+  >                                                                                                                                                        secondary: secondaryA = "secondary"
+  >                                                                                                                                                    } = { primary: "none", secondary: "none" }
+12>                                                                                                                                                                
+13>                                                                                                                                                                  skills: {
+  >                                                                                                                                                                          primary: primaryA = "primary",
+  >                                                                                                                                                                          secondary: secondaryA = "secondary"
+  >                                                                                                                                                                      } = { primary: "none", secondary: "none" }
+14>                                                                                                                                                                                                                                     
+15>                                                                                                                                                                                                                                       primary: primaryA = "primary"
+16>                                                                                                                                                                                                                                                        
+17>                                                                                                                                                                                                                                                          primary: primaryA = "primary"
+18>                                                                                                                                                                                                                                                                                                     ,
+  >                                                                                                                                                                                                                                                                                                             
+19>                                                                                                                                                                                                                                                                                                       secondary: secondaryA = "secondary"
+20>                                                                                                                                                                                                                                                                                                                          
+21>                                                                                                                                                                                                                                                                                                                            secondary: secondaryA = "secondary"
 1->Emitted(64, 1) Source(127, 1) + SourceIndex(0)
 2 >Emitted(64, 4) Source(127, 4) + SourceIndex(0)
 3 >Emitted(64, 5) Source(127, 5) + SourceIndex(0)
 4 >Emitted(64, 6) Source(127, 6) + SourceIndex(0)
 5 >Emitted(64, 85) Source(133, 90) + SourceIndex(0)
-6 >Emitted(64, 87) Source(128, 5) + SourceIndex(0)
-7 >Emitted(64, 101) Source(128, 27) + SourceIndex(0)
-8 >Emitted(64, 103) Source(128, 5) + SourceIndex(0)
-9 >Emitted(64, 142) Source(128, 27) + SourceIndex(0)
-10>Emitted(64, 144) Source(129, 5) + SourceIndex(0)
-11>Emitted(64, 160) Source(132, 47) + SourceIndex(0)
-12>Emitted(64, 162) Source(129, 5) + SourceIndex(0)
-13>Emitted(64, 229) Source(132, 47) + SourceIndex(0)
-14>Emitted(64, 231) Source(130, 9) + SourceIndex(0)
-15>Emitted(64, 248) Source(130, 38) + SourceIndex(0)
-16>Emitted(64, 250) Source(130, 9) + SourceIndex(0)
-17>Emitted(64, 293) Source(130, 38) + SourceIndex(0)
-18>Emitted(64, 295) Source(131, 9) + SourceIndex(0)
-19>Emitted(64, 314) Source(131, 44) + SourceIndex(0)
-20>Emitted(64, 316) Source(131, 9) + SourceIndex(0)
-21>Emitted(64, 363) Source(131, 44) + SourceIndex(0)
+6 >Emitted(64, 88) Source(128, 5) + SourceIndex(0)
+7 >Emitted(64, 102) Source(128, 27) + SourceIndex(0)
+8 >Emitted(64, 104) Source(128, 5) + SourceIndex(0)
+9 >Emitted(64, 143) Source(128, 27) + SourceIndex(0)
+10>Emitted(64, 145) Source(129, 5) + SourceIndex(0)
+11>Emitted(64, 161) Source(132, 47) + SourceIndex(0)
+12>Emitted(64, 163) Source(129, 5) + SourceIndex(0)
+13>Emitted(64, 230) Source(132, 47) + SourceIndex(0)
+14>Emitted(64, 232) Source(130, 9) + SourceIndex(0)
+15>Emitted(64, 249) Source(130, 38) + SourceIndex(0)
+16>Emitted(64, 251) Source(130, 9) + SourceIndex(0)
+17>Emitted(64, 294) Source(130, 38) + SourceIndex(0)
+18>Emitted(64, 296) Source(131, 9) + SourceIndex(0)
+19>Emitted(64, 315) Source(131, 44) + SourceIndex(0)
+20>Emitted(64, 317) Source(131, 9) + SourceIndex(0)
+21>Emitted(64, 364) Source(131, 44) + SourceIndex(0)
 ---
 >>>    i = 0; i < 1; i++) {
 1 >^^^^
@@ -2961,14 +2979,14 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(76, 1) Source(146, 1) + SourceIndex(0)
 2 >Emitted(76, 2) Source(146, 2) + SourceIndex(0)
 ---
->>>for (_47 = multiRobot.name, name = _47 === void 0 ? "noName" : _47, _48 = multiRobot.skills, _49 = _48 === void 0 ? { primary: "none", secondary: "none" } : _48, _50 = _49.primary, primary = _50 === void 0 ? "primary" : _50, _51 = _49.secondary, secondary = _51 === void 0 ? "secondary" : _51, multiRobot, i = 0; i < 1; i++) {
+>>>for (_47 = multiRobot.name, name = _47 === void 0 ? "noName" : _47, _48 = multiRobot.skills, _49 = _48 === void 0 ? { primary: "none", secondary: "none" } : _48, _50 = _49.primary, primary = _50 === void 0 ? "primary" : _50, _51 = _49.secondary, secondary = _51 === void 0 ? "secondary" : _51, multiRobot, multiRobot, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
@@ -2991,18 +3009,20 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 20>                                                                                                                                                                                                                                                                                                    ^^
 21>                                                                                                                                                                                                                                                                                                      ^^^^^^^^^^
 22>                                                                                                                                                                                                                                                                                                                ^^
-23>                                                                                                                                                                                                                                                                                                                  ^
-24>                                                                                                                                                                                                                                                                                                                   ^^^
-25>                                                                                                                                                                                                                                                                                                                      ^
-26>                                                                                                                                                                                                                                                                                                                       ^^
-27>                                                                                                                                                                                                                                                                                                                         ^
-28>                                                                                                                                                                                                                                                                                                                          ^^^
-29>                                                                                                                                                                                                                                                                                                                             ^
-30>                                                                                                                                                                                                                                                                                                                              ^^
-31>                                                                                                                                                                                                                                                                                                                                ^
-32>                                                                                                                                                                                                                                                                                                                                 ^^
-33>                                                                                                                                                                                                                                                                                                                                   ^^
-34>                                                                                                                                                                                                                                                                                                                                     ^
+23>                                                                                                                                                                                                                                                                                                                  ^^^^^^^^^^
+24>                                                                                                                                                                                                                                                                                                                            ^^
+25>                                                                                                                                                                                                                                                                                                                              ^
+26>                                                                                                                                                                                                                                                                                                                               ^^^
+27>                                                                                                                                                                                                                                                                                                                                  ^
+28>                                                                                                                                                                                                                                                                                                                                   ^^
+29>                                                                                                                                                                                                                                                                                                                                     ^
+30>                                                                                                                                                                                                                                                                                                                                      ^^^
+31>                                                                                                                                                                                                                                                                                                                                         ^
+32>                                                                                                                                                                                                                                                                                                                                          ^^
+33>                                                                                                                                                                                                                                                                                                                                            ^
+34>                                                                                                                                                                                                                                                                                                                                             ^^
+35>                                                                                                                                                                                                                                                                                                                                               ^^
+36>                                                                                                                                                                                                                                                                                                                                                 ^
 1->
   >
 2 >for
@@ -3036,19 +3056,21 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
   >                                                                                                                                                                                                                                                                                                        } = { primary: "none", secondary: "none" }
   >                                                                                                                                                                                                                                                                                                    } = 
 21>                                                                                                                                                                                                                                                                                                      multiRobot
-22>                                                                                                                                                                                                                                                                                                                , 
-23>                                                                                                                                                                                                                                                                                                                  i
-24>                                                                                                                                                                                                                                                                                                                    = 
-25>                                                                                                                                                                                                                                                                                                                      0
-26>                                                                                                                                                                                                                                                                                                                       ; 
-27>                                                                                                                                                                                                                                                                                                                         i
-28>                                                                                                                                                                                                                                                                                                                           < 
-29>                                                                                                                                                                                                                                                                                                                             1
-30>                                                                                                                                                                                                                                                                                                                              ; 
-31>                                                                                                                                                                                                                                                                                                                                i
-32>                                                                                                                                                                                                                                                                                                                                 ++
-33>                                                                                                                                                                                                                                                                                                                                   ) 
-34>                                                                                                                                                                                                                                                                                                                                     {
+22>                                                                                                                                                                                                                                                                                                                
+23>                                                                                                                                                                                                                                                                                                                  multiRobot
+24>                                                                                                                                                                                                                                                                                                                            , 
+25>                                                                                                                                                                                                                                                                                                                              i
+26>                                                                                                                                                                                                                                                                                                                                = 
+27>                                                                                                                                                                                                                                                                                                                                  0
+28>                                                                                                                                                                                                                                                                                                                                   ; 
+29>                                                                                                                                                                                                                                                                                                                                     i
+30>                                                                                                                                                                                                                                                                                                                                       < 
+31>                                                                                                                                                                                                                                                                                                                                         1
+32>                                                                                                                                                                                                                                                                                                                                          ; 
+33>                                                                                                                                                                                                                                                                                                                                            i
+34>                                                                                                                                                                                                                                                                                                                                             ++
+35>                                                                                                                                                                                                                                                                                                                                               ) 
+36>                                                                                                                                                                                                                                                                                                                                                 {
 1->Emitted(77, 1) Source(147, 1) + SourceIndex(0)
 2 >Emitted(77, 4) Source(147, 4) + SourceIndex(0)
 3 >Emitted(77, 5) Source(147, 5) + SourceIndex(0)
@@ -3070,19 +3092,21 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 19>Emitted(77, 293) Source(151, 32) + SourceIndex(0)
 20>Emitted(77, 295) Source(153, 5) + SourceIndex(0)
 21>Emitted(77, 305) Source(153, 15) + SourceIndex(0)
-22>Emitted(77, 307) Source(153, 17) + SourceIndex(0)
-23>Emitted(77, 308) Source(153, 18) + SourceIndex(0)
-24>Emitted(77, 311) Source(153, 21) + SourceIndex(0)
-25>Emitted(77, 312) Source(153, 22) + SourceIndex(0)
-26>Emitted(77, 314) Source(153, 24) + SourceIndex(0)
-27>Emitted(77, 315) Source(153, 25) + SourceIndex(0)
-28>Emitted(77, 318) Source(153, 28) + SourceIndex(0)
-29>Emitted(77, 319) Source(153, 29) + SourceIndex(0)
-30>Emitted(77, 321) Source(153, 31) + SourceIndex(0)
-31>Emitted(77, 322) Source(153, 32) + SourceIndex(0)
-32>Emitted(77, 324) Source(153, 34) + SourceIndex(0)
-33>Emitted(77, 326) Source(153, 36) + SourceIndex(0)
-34>Emitted(77, 327) Source(153, 37) + SourceIndex(0)
+22>Emitted(77, 307) Source(153, 5) + SourceIndex(0)
+23>Emitted(77, 317) Source(153, 15) + SourceIndex(0)
+24>Emitted(77, 319) Source(153, 17) + SourceIndex(0)
+25>Emitted(77, 320) Source(153, 18) + SourceIndex(0)
+26>Emitted(77, 323) Source(153, 21) + SourceIndex(0)
+27>Emitted(77, 324) Source(153, 22) + SourceIndex(0)
+28>Emitted(77, 326) Source(153, 24) + SourceIndex(0)
+29>Emitted(77, 327) Source(153, 25) + SourceIndex(0)
+30>Emitted(77, 330) Source(153, 28) + SourceIndex(0)
+31>Emitted(77, 331) Source(153, 29) + SourceIndex(0)
+32>Emitted(77, 333) Source(153, 31) + SourceIndex(0)
+33>Emitted(77, 334) Source(153, 32) + SourceIndex(0)
+34>Emitted(77, 336) Source(153, 34) + SourceIndex(0)
+35>Emitted(77, 338) Source(153, 36) + SourceIndex(0)
+36>Emitted(77, 339) Source(153, 37) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -3114,48 +3138,48 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(79, 1) Source(155, 1) + SourceIndex(0)
 2 >Emitted(79, 2) Source(155, 2) + SourceIndex(0)
 ---
->>>for (_52 = getMultiRobot(), _53 = _52.name, name = _53 === void 0 ? "noName" : _53, _54 = _52.skills, _55 = _54 === void 0 ? { primary: "none", secondary: "none" } : _54, _56 = _55.primary, primary = _56 === void 0 ? "primary" : _56, _57 = _55.secondary, secondary = _57 === void 0 ? "secondary" : _57, _52, i = 0; i < 1; i++) {
+>>>for (_52 = getMultiRobot(), (_53 = _52.name, name = _53 === void 0 ? "noName" : _53, _54 = _52.skills, _55 = _54 === void 0 ? { primary: "none", secondary: "none" } : _54, _56 = _55.primary, primary = _56 === void 0 ? "primary" : _56, _57 = _55.secondary, secondary = _57 === void 0 ? "secondary" : _57, _52), _52, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
 5 >     ^^^^^^^^^^^^^^^^^^^^^
-6 >                          ^^
-7 >                            ^^^^^^^^^^^^^^
-8 >                                          ^^
-9 >                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-10>                                                                                  ^^
-11>                                                                                    ^^^^^^^^^^^^^^^^
-12>                                                                                                    ^^
-13>                                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-14>                                                                                                                                                                         ^^
-15>                                                                                                                                                                           ^^^^^^^^^^^^^^^^^
-16>                                                                                                                                                                                            ^^
-17>                                                                                                                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-18>                                                                                                                                                                                                                                        ^^
-19>                                                                                                                                                                                                                                          ^^^^^^^^^^^^^^^^^^^
-20>                                                                                                                                                                                                                                                             ^^
-21>                                                                                                                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-22>                                                                                                                                                                                                                                                                                                             ^^^^^^^
-23>                                                                                                                                                                                                                                                                                                                    ^
-24>                                                                                                                                                                                                                                                                                                                     ^^^
-25>                                                                                                                                                                                                                                                                                                                        ^
-26>                                                                                                                                                                                                                                                                                                                         ^^
-27>                                                                                                                                                                                                                                                                                                                           ^
-28>                                                                                                                                                                                                                                                                                                                            ^^^
-29>                                                                                                                                                                                                                                                                                                                               ^
-30>                                                                                                                                                                                                                                                                                                                                ^^
-31>                                                                                                                                                                                                                                                                                                                                  ^
-32>                                                                                                                                                                                                                                                                                                                                   ^^
-33>                                                                                                                                                                                                                                                                                                                                     ^^
-34>                                                                                                                                                                                                                                                                                                                                       ^
+6 >                          ^^^
+7 >                             ^^^^^^^^^^^^^^
+8 >                                           ^^
+9 >                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                   ^^
+11>                                                                                     ^^^^^^^^^^^^^^^^
+12>                                                                                                     ^^
+13>                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                          ^^
+15>                                                                                                                                                                            ^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                             ^^
+17>                                                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+18>                                                                                                                                                                                                                                         ^^
+19>                                                                                                                                                                                                                                           ^^^^^^^^^^^^^^^^^^^
+20>                                                                                                                                                                                                                                                              ^^
+21>                                                                                                                                                                                                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+22>                                                                                                                                                                                                                                                                                                              ^^^^^^^^^^^^^
+23>                                                                                                                                                                                                                                                                                                                           ^
+24>                                                                                                                                                                                                                                                                                                                            ^^^
+25>                                                                                                                                                                                                                                                                                                                               ^
+26>                                                                                                                                                                                                                                                                                                                                ^^
+27>                                                                                                                                                                                                                                                                                                                                  ^
+28>                                                                                                                                                                                                                                                                                                                                   ^^^
+29>                                                                                                                                                                                                                                                                                                                                      ^
+30>                                                                                                                                                                                                                                                                                                                                       ^^
+31>                                                                                                                                                                                                                                                                                                                                         ^
+32>                                                                                                                                                                                                                                                                                                                                          ^^
+33>                                                                                                                                                                                                                                                                                                                                            ^^
+34>                                                                                                                                                                                                                                                                                                                                              ^
 1->
   >
 2 >for
@@ -3169,78 +3193,78 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
   >         } = { primary: "none", secondary: "none" }
   >     } = getMultiRobot()
 6 >                          
-7 >                            name = "noName"
-8 >                                          
-9 >                                            name = "noName"
-10>                                                                                  ,
-  >                                                                                      
-11>                                                                                    skills: {
-  >                                                                                            primary = "primary",
-  >                                                                                            secondary = "secondary"
-  >                                                                                        } = { primary: "none", secondary: "none" }
-12>                                                                                                    
-13>                                                                                                      skills: {
-  >                                                                                                              primary = "primary",
-  >                                                                                                              secondary = "secondary"
-  >                                                                                                          } = { primary: "none", secondary: "none" }
-14>                                                                                                                                                                         
-15>                                                                                                                                                                           primary = "primary"
-16>                                                                                                                                                                                            
-17>                                                                                                                                                                                              primary = "primary"
-18>                                                                                                                                                                                                                                        ,
-  >                                                                                                                                                                                                                                                
-19>                                                                                                                                                                                                                                          secondary = "secondary"
-20>                                                                                                                                                                                                                                                             
-21>                                                                                                                                                                                                                                                               secondary = "secondary"
-22>                                                                                                                                                                                                                                                                                                             
-  >                                                                                                                                                                                                                                                                                                                 } = { primary: "none", secondary: "none" }
-  >                                                                                                                                                                                                                                                                                                             } = getMultiRobot(), 
-23>                                                                                                                                                                                                                                                                                                                    i
-24>                                                                                                                                                                                                                                                                                                                      = 
-25>                                                                                                                                                                                                                                                                                                                        0
-26>                                                                                                                                                                                                                                                                                                                         ; 
-27>                                                                                                                                                                                                                                                                                                                           i
-28>                                                                                                                                                                                                                                                                                                                             < 
-29>                                                                                                                                                                                                                                                                                                                               1
-30>                                                                                                                                                                                                                                                                                                                                ; 
-31>                                                                                                                                                                                                                                                                                                                                  i
-32>                                                                                                                                                                                                                                                                                                                                   ++
-33>                                                                                                                                                                                                                                                                                                                                     ) 
-34>                                                                                                                                                                                                                                                                                                                                       {
+7 >                             name = "noName"
+8 >                                           
+9 >                                             name = "noName"
+10>                                                                                   ,
+  >                                                                                       
+11>                                                                                     skills: {
+  >                                                                                             primary = "primary",
+  >                                                                                             secondary = "secondary"
+  >                                                                                         } = { primary: "none", secondary: "none" }
+12>                                                                                                     
+13>                                                                                                       skills: {
+  >                                                                                                               primary = "primary",
+  >                                                                                                               secondary = "secondary"
+  >                                                                                                           } = { primary: "none", secondary: "none" }
+14>                                                                                                                                                                          
+15>                                                                                                                                                                            primary = "primary"
+16>                                                                                                                                                                                             
+17>                                                                                                                                                                                               primary = "primary"
+18>                                                                                                                                                                                                                                         ,
+  >                                                                                                                                                                                                                                                 
+19>                                                                                                                                                                                                                                           secondary = "secondary"
+20>                                                                                                                                                                                                                                                              
+21>                                                                                                                                                                                                                                                                secondary = "secondary"
+22>                                                                                                                                                                                                                                                                                                              
+  >                                                                                                                                                                                                                                                                                                                  } = { primary: "none", secondary: "none" }
+  >                                                                                                                                                                                                                                                                                                              } = getMultiRobot(), 
+23>                                                                                                                                                                                                                                                                                                                           i
+24>                                                                                                                                                                                                                                                                                                                             = 
+25>                                                                                                                                                                                                                                                                                                                               0
+26>                                                                                                                                                                                                                                                                                                                                ; 
+27>                                                                                                                                                                                                                                                                                                                                  i
+28>                                                                                                                                                                                                                                                                                                                                    < 
+29>                                                                                                                                                                                                                                                                                                                                      1
+30>                                                                                                                                                                                                                                                                                                                                       ; 
+31>                                                                                                                                                                                                                                                                                                                                         i
+32>                                                                                                                                                                                                                                                                                                                                          ++
+33>                                                                                                                                                                                                                                                                                                                                            ) 
+34>                                                                                                                                                                                                                                                                                                                                              {
 1->Emitted(80, 1) Source(156, 1) + SourceIndex(0)
 2 >Emitted(80, 4) Source(156, 4) + SourceIndex(0)
 3 >Emitted(80, 5) Source(156, 5) + SourceIndex(0)
 4 >Emitted(80, 6) Source(156, 6) + SourceIndex(0)
 5 >Emitted(80, 27) Source(162, 20) + SourceIndex(0)
-6 >Emitted(80, 29) Source(157, 5) + SourceIndex(0)
-7 >Emitted(80, 43) Source(157, 20) + SourceIndex(0)
-8 >Emitted(80, 45) Source(157, 5) + SourceIndex(0)
-9 >Emitted(80, 83) Source(157, 20) + SourceIndex(0)
-10>Emitted(80, 85) Source(158, 5) + SourceIndex(0)
-11>Emitted(80, 101) Source(161, 47) + SourceIndex(0)
-12>Emitted(80, 103) Source(158, 5) + SourceIndex(0)
-13>Emitted(80, 170) Source(161, 47) + SourceIndex(0)
-14>Emitted(80, 172) Source(159, 9) + SourceIndex(0)
-15>Emitted(80, 189) Source(159, 28) + SourceIndex(0)
-16>Emitted(80, 191) Source(159, 9) + SourceIndex(0)
-17>Emitted(80, 233) Source(159, 28) + SourceIndex(0)
-18>Emitted(80, 235) Source(160, 9) + SourceIndex(0)
-19>Emitted(80, 254) Source(160, 32) + SourceIndex(0)
-20>Emitted(80, 256) Source(160, 9) + SourceIndex(0)
-21>Emitted(80, 302) Source(160, 32) + SourceIndex(0)
-22>Emitted(80, 309) Source(162, 22) + SourceIndex(0)
-23>Emitted(80, 310) Source(162, 23) + SourceIndex(0)
-24>Emitted(80, 313) Source(162, 26) + SourceIndex(0)
-25>Emitted(80, 314) Source(162, 27) + SourceIndex(0)
-26>Emitted(80, 316) Source(162, 29) + SourceIndex(0)
-27>Emitted(80, 317) Source(162, 30) + SourceIndex(0)
-28>Emitted(80, 320) Source(162, 33) + SourceIndex(0)
-29>Emitted(80, 321) Source(162, 34) + SourceIndex(0)
-30>Emitted(80, 323) Source(162, 36) + SourceIndex(0)
-31>Emitted(80, 324) Source(162, 37) + SourceIndex(0)
-32>Emitted(80, 326) Source(162, 39) + SourceIndex(0)
-33>Emitted(80, 328) Source(162, 41) + SourceIndex(0)
-34>Emitted(80, 329) Source(162, 42) + SourceIndex(0)
+6 >Emitted(80, 30) Source(157, 5) + SourceIndex(0)
+7 >Emitted(80, 44) Source(157, 20) + SourceIndex(0)
+8 >Emitted(80, 46) Source(157, 5) + SourceIndex(0)
+9 >Emitted(80, 84) Source(157, 20) + SourceIndex(0)
+10>Emitted(80, 86) Source(158, 5) + SourceIndex(0)
+11>Emitted(80, 102) Source(161, 47) + SourceIndex(0)
+12>Emitted(80, 104) Source(158, 5) + SourceIndex(0)
+13>Emitted(80, 171) Source(161, 47) + SourceIndex(0)
+14>Emitted(80, 173) Source(159, 9) + SourceIndex(0)
+15>Emitted(80, 190) Source(159, 28) + SourceIndex(0)
+16>Emitted(80, 192) Source(159, 9) + SourceIndex(0)
+17>Emitted(80, 234) Source(159, 28) + SourceIndex(0)
+18>Emitted(80, 236) Source(160, 9) + SourceIndex(0)
+19>Emitted(80, 255) Source(160, 32) + SourceIndex(0)
+20>Emitted(80, 257) Source(160, 9) + SourceIndex(0)
+21>Emitted(80, 303) Source(160, 32) + SourceIndex(0)
+22>Emitted(80, 316) Source(162, 22) + SourceIndex(0)
+23>Emitted(80, 317) Source(162, 23) + SourceIndex(0)
+24>Emitted(80, 320) Source(162, 26) + SourceIndex(0)
+25>Emitted(80, 321) Source(162, 27) + SourceIndex(0)
+26>Emitted(80, 323) Source(162, 29) + SourceIndex(0)
+27>Emitted(80, 324) Source(162, 30) + SourceIndex(0)
+28>Emitted(80, 327) Source(162, 33) + SourceIndex(0)
+29>Emitted(80, 328) Source(162, 34) + SourceIndex(0)
+30>Emitted(80, 330) Source(162, 36) + SourceIndex(0)
+31>Emitted(80, 331) Source(162, 37) + SourceIndex(0)
+32>Emitted(80, 333) Source(162, 39) + SourceIndex(0)
+33>Emitted(80, 335) Source(162, 41) + SourceIndex(0)
+34>Emitted(80, 336) Source(162, 42) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -3272,35 +3296,35 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(82, 1) Source(164, 1) + SourceIndex(0)
 2 >Emitted(82, 2) Source(164, 2) + SourceIndex(0)
 ---
->>>for (_58 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _59 = _58.name, name = _59 === void 0 ? "noName" : _59, _60 = _58.skills, _61 = _60 === void 0 ? { primary: "none", secondary: "none" } : _60, _62 = _61.primary, primary = _62 === void 0 ? "primary" : _62, _63 = _61.secondary, secondary = _63 === void 0 ? "secondary" : _63, _58,
+>>>for (_58 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, (_59 = _58.name, name = _59 === void 0 ? "noName" : _59, _60 = _58.skills, _61 = _60 === void 0 ? { primary: "none", secondary: "none" } : _60, _62 = _61.primary, primary = _62 === void 0 ? "primary" : _62, _63 = _61.secondary, secondary = _63 === void 0 ? "secondary" : _63, _58), _58,
 1->
 2 >^^^
 3 >   ^
 4 >    ^
 5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                                                                    ^^
-7 >                                                                                      ^^^^^^^^^^^^^^
-8 >                                                                                                    ^^
-9 >                                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-10>                                                                                                                                            ^^
-11>                                                                                                                                              ^^^^^^^^^^^^^^^^
-12>                                                                                                                                                              ^^
-13>                                                                                                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-14>                                                                                                                                                                                                                                   ^^
-15>                                                                                                                                                                                                                                     ^^^^^^^^^^^^^^^^^
-16>                                                                                                                                                                                                                                                      ^^
-17>                                                                                                                                                                                                                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-18>                                                                                                                                                                                                                                                                                                  ^^
-19>                                                                                                                                                                                                                                                                                                    ^^^^^^^^^^^^^^^^^^^
-20>                                                                                                                                                                                                                                                                                                                       ^^
-21>                                                                                                                                                                                                                                                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                                                    ^^^
+7 >                                                                                       ^^^^^^^^^^^^^^
+8 >                                                                                                     ^^
+9 >                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                                                             ^^
+11>                                                                                                                                               ^^^^^^^^^^^^^^^^
+12>                                                                                                                                                               ^^
+13>                                                                                                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                                                                                    ^^
+15>                                                                                                                                                                                                                                      ^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                                                                                       ^^
+17>                                                                                                                                                                                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+18>                                                                                                                                                                                                                                                                                                   ^^
+19>                                                                                                                                                                                                                                                                                                     ^^^^^^^^^^^^^^^^^^^
+20>                                                                                                                                                                                                                                                                                                                        ^^
+21>                                                                                                                                                                                                                                                                                                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
 2 >for
@@ -3314,50 +3338,50 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
   >         } = { primary: "none", secondary: "none" }
   >     } = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }
 6 >                                                                                    
-7 >                                                                                      name = "noName"
-8 >                                                                                                    
-9 >                                                                                                      name = "noName"
-10>                                                                                                                                            ,
-  >                                                                                                                                                
-11>                                                                                                                                              skills: {
-  >                                                                                                                                                      primary = "primary",
-  >                                                                                                                                                      secondary = "secondary"
-  >                                                                                                                                                  } = { primary: "none", secondary: "none" }
-12>                                                                                                                                                              
-13>                                                                                                                                                                skills: {
-  >                                                                                                                                                                        primary = "primary",
-  >                                                                                                                                                                        secondary = "secondary"
-  >                                                                                                                                                                    } = { primary: "none", secondary: "none" }
-14>                                                                                                                                                                                                                                   
-15>                                                                                                                                                                                                                                     primary = "primary"
-16>                                                                                                                                                                                                                                                      
-17>                                                                                                                                                                                                                                                        primary = "primary"
-18>                                                                                                                                                                                                                                                                                                  ,
-  >                                                                                                                                                                                                                                                                                                          
-19>                                                                                                                                                                                                                                                                                                    secondary = "secondary"
-20>                                                                                                                                                                                                                                                                                                                       
-21>                                                                                                                                                                                                                                                                                                                         secondary = "secondary"
+7 >                                                                                       name = "noName"
+8 >                                                                                                     
+9 >                                                                                                       name = "noName"
+10>                                                                                                                                             ,
+  >                                                                                                                                                 
+11>                                                                                                                                               skills: {
+  >                                                                                                                                                       primary = "primary",
+  >                                                                                                                                                       secondary = "secondary"
+  >                                                                                                                                                   } = { primary: "none", secondary: "none" }
+12>                                                                                                                                                               
+13>                                                                                                                                                                 skills: {
+  >                                                                                                                                                                         primary = "primary",
+  >                                                                                                                                                                         secondary = "secondary"
+  >                                                                                                                                                                     } = { primary: "none", secondary: "none" }
+14>                                                                                                                                                                                                                                    
+15>                                                                                                                                                                                                                                      primary = "primary"
+16>                                                                                                                                                                                                                                                       
+17>                                                                                                                                                                                                                                                         primary = "primary"
+18>                                                                                                                                                                                                                                                                                                   ,
+  >                                                                                                                                                                                                                                                                                                           
+19>                                                                                                                                                                                                                                                                                                     secondary = "secondary"
+20>                                                                                                                                                                                                                                                                                                                        
+21>                                                                                                                                                                                                                                                                                                                          secondary = "secondary"
 1->Emitted(83, 1) Source(165, 1) + SourceIndex(0)
 2 >Emitted(83, 4) Source(165, 4) + SourceIndex(0)
 3 >Emitted(83, 5) Source(165, 5) + SourceIndex(0)
 4 >Emitted(83, 6) Source(165, 6) + SourceIndex(0)
 5 >Emitted(83, 85) Source(171, 90) + SourceIndex(0)
-6 >Emitted(83, 87) Source(166, 5) + SourceIndex(0)
-7 >Emitted(83, 101) Source(166, 20) + SourceIndex(0)
-8 >Emitted(83, 103) Source(166, 5) + SourceIndex(0)
-9 >Emitted(83, 141) Source(166, 20) + SourceIndex(0)
-10>Emitted(83, 143) Source(167, 5) + SourceIndex(0)
-11>Emitted(83, 159) Source(170, 47) + SourceIndex(0)
-12>Emitted(83, 161) Source(167, 5) + SourceIndex(0)
-13>Emitted(83, 228) Source(170, 47) + SourceIndex(0)
-14>Emitted(83, 230) Source(168, 9) + SourceIndex(0)
-15>Emitted(83, 247) Source(168, 28) + SourceIndex(0)
-16>Emitted(83, 249) Source(168, 9) + SourceIndex(0)
-17>Emitted(83, 291) Source(168, 28) + SourceIndex(0)
-18>Emitted(83, 293) Source(169, 9) + SourceIndex(0)
-19>Emitted(83, 312) Source(169, 32) + SourceIndex(0)
-20>Emitted(83, 314) Source(169, 9) + SourceIndex(0)
-21>Emitted(83, 360) Source(169, 32) + SourceIndex(0)
+6 >Emitted(83, 88) Source(166, 5) + SourceIndex(0)
+7 >Emitted(83, 102) Source(166, 20) + SourceIndex(0)
+8 >Emitted(83, 104) Source(166, 5) + SourceIndex(0)
+9 >Emitted(83, 142) Source(166, 20) + SourceIndex(0)
+10>Emitted(83, 144) Source(167, 5) + SourceIndex(0)
+11>Emitted(83, 160) Source(170, 47) + SourceIndex(0)
+12>Emitted(83, 162) Source(167, 5) + SourceIndex(0)
+13>Emitted(83, 229) Source(170, 47) + SourceIndex(0)
+14>Emitted(83, 231) Source(168, 9) + SourceIndex(0)
+15>Emitted(83, 248) Source(168, 28) + SourceIndex(0)
+16>Emitted(83, 250) Source(168, 9) + SourceIndex(0)
+17>Emitted(83, 292) Source(168, 28) + SourceIndex(0)
+18>Emitted(83, 294) Source(169, 9) + SourceIndex(0)
+19>Emitted(83, 313) Source(169, 32) + SourceIndex(0)
+20>Emitted(83, 315) Source(169, 9) + SourceIndex(0)
+21>Emitted(83, 361) Source(169, 32) + SourceIndex(0)
 ---
 >>>    i = 0; i < 1; i++) {
 1 >^^^^
@@ -3434,12 +3458,13 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(86, 1) Source(174, 1) + SourceIndex(0)
 2 >Emitted(86, 2) Source(174, 2) + SourceIndex(0)
 ---
->>>var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63;
+>>>var _k, _q, _4, _9, _27, _33, _52, _58;
+>>>var _a, _b, _c, _d, _e, _f, _g, _h, _j, _l, _m, _o, _p, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _5, _6, _7, _8, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _28, _29, _30, _31, _32, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _53, _54, _55, _56, _57, _59, _60, _61, _62, _63;
 >>>//# sourceMappingURL=sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js.map
\ No newline at end of file

From 334820c357c50f9926ea4c4cbd09f9673755cf65 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 2 Nov 2016 16:26:34 -0700
Subject: [PATCH 083/421] Remove spread types, leaving spread syntax/emit

Spreads are still typed, but cannot be created from a non-object type.
Tests still need to be updated.
---
 src/compiler/checker.ts              | 351 ++++-----------------------
 src/compiler/declarationEmitter.ts   |   9 -
 src/compiler/diagnosticMessages.json |   6 +-
 src/compiler/parser.ts               |  17 --
 src/compiler/types.ts                |  22 +-
 src/lib/es2015.core.d.ts             |   6 +-
 6 files changed, 57 insertions(+), 354 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 5447e652f08..c6924e2cb0a 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -113,7 +113,6 @@ namespace ts {
         const tupleTypes: GenericType[] = [];
         const unionTypes = createMap<UnionType>();
         const intersectionTypes = createMap<IntersectionType>();
-        const spreadTypes = createMap<SpreadType>();
         const stringLiteralTypes = createMap<LiteralType>();
         const numericLiteralTypes = createMap<LiteralType>();
         const evolvingArrayTypes: EvolvingArrayType[] = [];
@@ -2244,9 +2243,6 @@ namespace ts {
                     else if (type.flags & TypeFlags.UnionOrIntersection) {
                         writeUnionOrIntersectionType(<UnionOrIntersectionType>type, nextFlags);
                     }
-                    else if (type.flags & TypeFlags.Spread) {
-                        writeSpreadType(<SpreadType>type);
-                    }
                     else if (getObjectFlags(type) & ObjectFlags.Anonymous) {
                         writeAnonymousType(<ObjectType>type, nextFlags);
                     }
@@ -2362,48 +2358,6 @@ namespace ts {
                     }
                 }
 
-                function writeSpreadType(type: SpreadType) {
-                    writePunctuation(writer, SyntaxKind.OpenBraceToken);
-                    writer.writeLine();
-                    writer.increaseIndent();
-
-                    writeSpreadTypeWorker(type, /*atEnd*/true, type.symbol);
-
-                    writer.decreaseIndent();
-                    writePunctuation(writer, SyntaxKind.CloseBraceToken);
-                }
-
-                function writeSpreadTypeWorker(type: SpreadType, atEnd: boolean, container: Symbol): void {
-                    if (type.left.flags & TypeFlags.Spread) {
-                        writeSpreadTypeWorker(type.left as SpreadType, /*atEnd*/false, container);
-                    }
-                    else {
-                        const saveInObjectTypeLiteral = inObjectTypeLiteral;
-                        inObjectTypeLiteral = true;
-                        writeObjectLiteralType(resolveStructuredTypeMembers(type.left as ResolvedType));
-                        inObjectTypeLiteral = saveInObjectTypeLiteral;
-                    }
-                    if (type.right.symbol === container) {
-                        // if type.right was written as part of the spread type, don't surround with ...{ }.
-                        // this gives { a: number, ... T } instead of { ...{ a: number }, ...T }
-                        const saveInObjectTypeLiteral = inObjectTypeLiteral;
-                        inObjectTypeLiteral = true;
-                        writeObjectLiteralType(resolveStructuredTypeMembers(type.right as ResolvedType));
-                        inObjectTypeLiteral = saveInObjectTypeLiteral;
-                    }
-                    else {
-                        writePunctuation(writer, SyntaxKind.DotDotDotToken);
-                        writeType(type.right, TypeFormatFlags.None);
-                        if (atEnd) {
-                            writeSpace(writer);
-                        }
-                        else {
-                            writePunctuation(writer, SyntaxKind.SemicolonToken);
-                            writer.writeLine();
-                        }
-                    }
-                }
-
                 function writeAnonymousType(type: ObjectType, flags: TypeFormatFlags) {
                     const symbol = type.symbol;
                     if (symbol) {
@@ -3623,7 +3577,6 @@ namespace ts {
                 links.type = getUnionType([getTypeOfSymbol(links.leftSpread), getTypeOfSymbol(links.rightSpread)]);
             }
             return links.type;
-
         }
 
         function getTargetType(type: Type): Type {
@@ -4567,10 +4520,6 @@ namespace ts {
             return type.resolvedApparentType;
         }
 
-        function getApparentTypeOfSpread(type: SpreadType) {
-            return getApparentType(type.right);
-        }
-
         /**
          * For a type parameter, return the base constraint of the type parameter. For the string, number,
          * boolean, and symbol primitive types, return the corresponding object types. Otherwise return the
@@ -4578,7 +4527,6 @@ namespace ts {
          */
         function getApparentType(type: Type): Type {
             let t = type.flags & TypeFlags.TypeParameter ? getApparentTypeOfTypeParameter(<TypeParameter>type) : type;
-            t = t.flags & TypeFlags.Spread ? getApparentTypeOfSpread(type as SpreadType) : t;
             return t.flags & TypeFlags.StringLike ? globalStringType :
                 t.flags & TypeFlags.NumberLike ? globalNumberType :
                 t.flags & TypeFlags.BooleanLike ? globalBooleanType :
@@ -4640,7 +4588,7 @@ namespace ts {
                 propTypes.push(type);
             }
             const result = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | SymbolFlags.SyntheticProperty | commonFlags, name);
-            result.syntheticKind === SyntheticSymbolKind.UnionOrIntersection;
+            result.syntheticKind = SyntheticSymbolKind.UnionOrIntersection;
             result.containingType = containingType;
             result.hasNonUniformType = hasNonUniformType;
             result.isPartial = isPartial;
@@ -5917,12 +5865,6 @@ namespace ts {
         function getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node: Node, aliasSymbol?: Symbol, aliasTypeArguments?: Type[]): Type {
             const links = getNodeLinks(node);
             if (!links.resolvedType) {
-                const hasSpread = (node.kind === SyntaxKind.TypeLiteral &&
-                                   find((node as TypeLiteralNode).members, elt => elt.kind === SyntaxKind.SpreadTypeElement));
-                if (hasSpread) {
-                    return getTypeFromSpreadTypeLiteral(node, aliasSymbol, aliasTypeArguments);
-                }
-
                 // Deferred resolution of members is handled by resolveObjectTypeMembers
                 if (isEmpty(node.symbol.members) && !aliasSymbol && !aliasTypeArguments) {
                     links.resolvedType = emptyTypeLiteralType;
@@ -5937,187 +5879,56 @@ namespace ts {
             return links.resolvedType;
         }
 
-        function getTypeFromSpreadTypeLiteral(node: Node, aliasSymbol?: Symbol, aliasTypeArguments?: Type[]): Type {
-            let spread: Type = emptyObjectType;
-            let members: Map<Symbol>;
-            let stringIndexInfo: IndexInfo;
-            let numberIndexInfo: IndexInfo;
-            for (const member of (node as TypeLiteralNode).members) {
-                if (member.kind === SyntaxKind.SpreadTypeElement) {
-                    if (members) {
-                        const type = createAnonymousType(node.symbol, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
-                        spread = getSpreadType(spread, type, node.symbol, aliasSymbol, aliasTypeArguments);
-                        members = undefined;
-                        stringIndexInfo = undefined;
-                        numberIndexInfo = undefined;
-                    }
-                    const type = getTypeFromTypeNode((member as SpreadTypeElement).type);
-                    spread = getSpreadType(spread, type, node.symbol, aliasSymbol, aliasTypeArguments);
-                }
-                else if (member.kind !== SyntaxKind.IndexSignature &&
-                         member.kind !== SyntaxKind.CallSignature &&
-                         member.kind !== SyntaxKind.ConstructSignature) {
-                    // it is an error for spread types to include index, call or construct signatures
-                    const flags = SymbolFlags.Property | SymbolFlags.Transient | (member.questionToken ? SymbolFlags.Optional : 0);
-                    const text = getTextOfPropertyName(member.name);
-                    const symbol = <TransientSymbol>createSymbol(flags, text);
-                    symbol.declarations = [member];
-                    symbol.valueDeclaration = member;
-                    symbol.type = getTypeFromTypeNodeNoAlias((member as IndexSignatureDeclaration | PropertySignature | MethodSignature).type);
-                    if (!members) {
-                        members = createMap<Symbol>();
-                    }
-                    members[symbol.name] = symbol;
-                }
-            }
-            if (members || stringIndexInfo || numberIndexInfo) {
-                const type = createAnonymousType(node.symbol, members || emptySymbols, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
-                spread = getSpreadType(spread, type, node.symbol, aliasSymbol, aliasTypeArguments);
-            }
-            return spread;
-        }
-
         /**
          * Since the source of spread types are object literals and type literals, which are not binary,
          * this function should be called in a left folding style, with left = previous result of getSpreadType
          * and right = the new element to be spread.
          */
-        function getSpreadType(left: Type, right: Type, symbol: Symbol, aliasSymbol?: Symbol, aliasTypeArguments?: Type[]): Type {
-            const id = getTypeListId([left, right]);
-            if (id in spreadTypes) {
-                return spreadTypes[id];
-            }
-
-            // any spreads to any
-            if (left.flags & TypeFlags.Any || right.flags & TypeFlags.Any) {
-                return anyType;
-            }
-            // flatten intersections to objects if all member types are objects
-            if (left.flags & TypeFlags.Intersection) {
-                left = resolveObjectIntersection(left as IntersectionType);
-            }
-            if (right.flags & TypeFlags.Intersection) {
-                right = resolveObjectIntersection(right as IntersectionType);
-            }
-            // distribute unions
-            if (left.flags & TypeFlags.Union) {
-                const spreads = map((left as UnionType).types,
-                                    t => getSpreadType(t, right, symbol, aliasSymbol, aliasTypeArguments));
-                return getUnionType(spreads, /*subtypeReduction*/ false, aliasSymbol, aliasTypeArguments);
-            }
-            if (right.flags & TypeFlags.Union) {
-                const spreads = map((right as UnionType).types,
-                                    t => getSpreadType(left, t, symbol, aliasSymbol, aliasTypeArguments));
-                return getUnionType(spreads, /*subtypeReduction*/ false, aliasSymbol, aliasTypeArguments);
-            }
-            // skip primitives
-            if (left.flags & TypeFlags.Primitive && right.flags & TypeFlags.Primitive) {
-                return emptyObjectType;
-            }
-            else if (left.flags & TypeFlags.Primitive) {
-                return right;
-            }
-            else if (right.flags & TypeFlags.Primitive) {
-                return left;
-            }
-
-            // spread simplifications
-            if (left.flags & TypeFlags.Spread &&
-                right.flags & TypeFlags.TypeParameter &&
-                (left as SpreadType).right.flags & TypeFlags.TypeParameter &&
-                right.symbol === (left as SpreadType).right.symbol) {
-                // for types like T ... T, just return ... T
-                return left;
-            }
-            if (left.flags & TypeFlags.Spread &&
-                right.flags & TypeFlags.Object &&
-                (left as SpreadType).right.flags & TypeFlags.Object) {
-                // simplify two adjacent object types: T ... { x } ... { y } becomes T ... { x, y }
-                const simplified = getSpreadType(right, (left as SpreadType).right, symbol, aliasSymbol, aliasTypeArguments);
-                return getSpreadType((left as SpreadType).left, simplified, symbol, aliasSymbol, aliasTypeArguments);
-            }
-            if (right.flags & TypeFlags.Spread) {
-                // spread is right associative and associativity applies, so transform
-                // (T ... U) ... V to T ... (U ... V)
-                const rspread = right as SpreadType;
-                if (rspread.left === emptyObjectType) {
-                    // ... U ... ({} ... T) => ... U ... T
-                    return getSpreadType(left, rspread.right, symbol, aliasSymbol, aliasTypeArguments);
-                }
-                return getSpreadType(getSpreadType(left, rspread.left, symbol, aliasSymbol, aliasTypeArguments),
-                                     rspread.right, symbol, aliasSymbol, aliasTypeArguments);
-            }
-
-            // create an object type if left and right are both objects,
-            // otherwise create a spread type
-            if (right.flags & TypeFlags.Object && left.flags & TypeFlags.Object) {
-                const members = createMap<Symbol>();
-                const skippedPrivateMembers = createMap<boolean>();
-                const stringIndexInfo = unionSpreadIndexInfos(getIndexInfoOfType(left, IndexKind.String), getIndexInfoOfType(right, IndexKind.String));
-                const numberIndexInfo = unionSpreadIndexInfos(getIndexInfoOfType(left, IndexKind.Number), getIndexInfoOfType(right, IndexKind.Number));
-
-                const isFromSpread = right.symbol !== symbol;
-                for (const rightProp of getPropertiesOfType(right)) {
-                    if (getDeclarationModifierFlagsFromSymbol(rightProp) & (ModifierFlags.Private | ModifierFlags.Protected)) {
-                        skippedPrivateMembers[rightProp.name] = true;
-                    }
-                    else if (!(rightProp.flags & SymbolFlags.Method && isFromSpread) &&
-                             !(rightProp.flags & SymbolFlags.SetAccessor && !(rightProp.flags & SymbolFlags.GetAccessor))) {
-                        // skip methods from spreads and accessors with setters but no getters
-                        members[rightProp.name] = rightProp;
-                    }
-                }
-                for (const leftProp of getPropertiesOfType(left)) {
-                    if (leftProp.flags & SymbolFlags.SetAccessor && !(leftProp.flags & SymbolFlags.GetAccessor)
-                       || leftProp.name in skippedPrivateMembers) {
-                        continue;
-                    }
-                    if (leftProp.name in members) {
-                        const rightProp = members[leftProp.name];
-                        if (rightProp.flags & SymbolFlags.Optional) {
-                            const declarations: Declaration[] = concatenate(leftProp.declarations, rightProp.declarations);
-                            const flags = SymbolFlags.Property | SymbolFlags.Transient | SymbolFlags.SyntheticProperty | (leftProp.flags & SymbolFlags.Optional);
-                            const result = <TransientSymbol>createSymbol(flags, leftProp.name);
-                            result.syntheticKind = SyntheticSymbolKind.Spread;
-                            result.leftSpread = leftProp;
-                            result.rightSpread = rightProp;
-                            result.declarations = declarations;
-                            if (declarations.length) {
-                                result.valueDeclaration = declarations[0];
-                            }
-                            result.isReadonly = isReadonlySymbol(leftProp) || isReadonlySymbol(rightProp);
-                            members[leftProp.name] = result;
-                        }
-                    }
-                    else {
-                        members[leftProp.name] = leftProp;
-                    }
-                }
-                return createAnonymousType(symbol, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
-            }
-            const spread = spreadTypes[id] = createType(TypeFlags.Spread) as SpreadType;
-            Debug.assert(!!(left.flags & (TypeFlags.Spread | TypeFlags.Object)), "Left flags: " + left.flags.toString(2));
-            Debug.assert(!!(right.flags & (TypeFlags.TypeParameter | TypeFlags.Intersection | TypeFlags.Index | TypeFlags.IndexedAccess | TypeFlags.Object)), "Right flags: " + right.flags.toString(2));
-            spread.symbol = symbol;
-            spread.left = left as SpreadType | ResolvedType;
-            spread.right = right as TypeParameter | IntersectionType | IndexType | IndexedAccessType | ResolvedType;
-            spread.aliasSymbol = aliasSymbol;
-            spread.aliasTypeArguments = aliasTypeArguments;
-            return spread;
-        }
-
-        function resolveObjectIntersection(intersection: IntersectionType): IntersectionType | ResolvedType {
-            if (find(intersection.types, t => !(t.flags & TypeFlags.Object))) {
-                return intersection;
-            }
-            const properties = getPropertiesOfType(intersection);
+        function getSpreadType(left: Type, right: Type, symbol: Symbol): ResolvedType {
+            Debug.assert(!!(left.flags & TypeFlags.Object) && !!(right.flags & TypeFlags.Object), "Only object types may be spread.");
             const members = createMap<Symbol>();
-            for (const property of properties) {
-                members[property.name] = property;
+            const skippedPrivateMembers = createMap<boolean>();
+            const stringIndexInfo = unionSpreadIndexInfos(getIndexInfoOfType(left, IndexKind.String), getIndexInfoOfType(right, IndexKind.String));
+            const numberIndexInfo = unionSpreadIndexInfos(getIndexInfoOfType(left, IndexKind.Number), getIndexInfoOfType(right, IndexKind.Number));
+
+            const isFromSpread = right.symbol !== symbol;
+            for (const rightProp of getPropertiesOfType(right)) {
+                if (getDeclarationModifierFlagsFromSymbol(rightProp) & (ModifierFlags.Private | ModifierFlags.Protected)) {
+                    skippedPrivateMembers[rightProp.name] = true;
+                }
+                else if (!(rightProp.flags & SymbolFlags.Method && isFromSpread) &&
+                         !(rightProp.flags & SymbolFlags.SetAccessor && !(rightProp.flags & SymbolFlags.GetAccessor))) {
+                    // skip methods from spreads and accessors with setters but no getters
+                    members[rightProp.name] = rightProp;
+                }
             }
-            const stringIndex = getIndexInfoOfType(intersection, IndexKind.String);
-            const numberIndex = getIndexInfoOfType(intersection, IndexKind.Number);
-            return createAnonymousType(undefined, members, emptyArray, emptyArray, stringIndex, numberIndex);
+            for (const leftProp of getPropertiesOfType(left)) {
+                if (leftProp.flags & SymbolFlags.SetAccessor && !(leftProp.flags & SymbolFlags.GetAccessor)
+                    || leftProp.name in skippedPrivateMembers) {
+                    continue;
+                }
+                if (leftProp.name in members) {
+                    const rightProp = members[leftProp.name];
+                    if (rightProp.flags & SymbolFlags.Optional) {
+                        const declarations: Declaration[] = concatenate(leftProp.declarations, rightProp.declarations);
+                        const flags = SymbolFlags.Property | SymbolFlags.Transient | SymbolFlags.SyntheticProperty | (leftProp.flags & SymbolFlags.Optional);
+                        const result = <TransientSymbol>createSymbol(flags, leftProp.name);
+                        result.syntheticKind = SyntheticSymbolKind.Spread;
+                        result.leftSpread = leftProp;
+                        result.rightSpread = rightProp;
+                        result.declarations = declarations;
+                        if (declarations.length) {
+                            result.valueDeclaration = declarations[0];
+                        }
+                        result.isReadonly = isReadonlySymbol(leftProp) || isReadonlySymbol(rightProp);
+                        members[leftProp.name] = result;
+                    }
+                }
+                else {
+                    members[leftProp.name] = leftProp;
+                }
+            }
+            return createAnonymousType(symbol, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
         }
 
         function createLiteralType(flags: TypeFlags, text: string) {
@@ -6535,10 +6346,6 @@ namespace ts {
                 if (type.flags & TypeFlags.Intersection) {
                     return getIntersectionType(instantiateList((<IntersectionType>type).types, mapper, instantiateType), type.aliasSymbol, mapper.targetTypes);
                 }
-                if (type.flags & TypeFlags.Spread) {
-                    const spread = type as SpreadType;
-                    return getSpreadType(instantiateType(spread.left, mapper), instantiateType(spread.right, mapper), type.symbol, type.aliasSymbol, mapper.targetTypes);
-                }
                 if (type.flags & TypeFlags.Index) {
                     return getIndexType(instantiateType((<IndexType>type).type, mapper));
                 }
@@ -7089,30 +6896,7 @@ namespace ts {
                     }
                 }
 
-                if (source.flags & TypeFlags.Spread && target.flags & TypeFlags.Spread) {
-                    // you only see this for spreads with type parameters
-                    if (!(spreadTypeRelatedTo(source as SpreadType, target as SpreadType, /*atRightEdge*/ true))) {
-                        if (reportErrors) {
-                            reportRelationError(headMessage, source, target);
-                        }
-                        return Ternary.False;
-                    }
-                    const reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo;
-                    const apparentSource = getApparentType(source);
-                    if (result = objectTypeRelatedTo(apparentSource, source, getApparentType(target), reportStructuralErrors)) {
-                        errorInfo = saveErrorInfo;
-                        return result;
-                    }
-                }
-
                 if (source.flags & TypeFlags.TypeParameter) {
-                    if (target.flags & TypeFlags.Spread) {
-                        // T is assignable to ...T
-                        if (source.symbol === (target as SpreadType).right.symbol
-                            && (target as SpreadType).left === emptyObjectType) {
-                            return Ternary.True;
-                        }
-                    }
                     let constraint = getConstraintOfTypeParameter(<TypeParameter>source);
 
                     if (!constraint || constraint.flags & TypeFlags.Any) {
@@ -7164,32 +6948,6 @@ namespace ts {
                 return Ternary.False;
             }
 
-            function spreadTypeRelatedTo(source: SpreadType, target: SpreadType, atRightEdge?: boolean): boolean {
-                // If the right side of a spread type is ObjectType, then the left side must be a Spread.
-                // Structural compatibility of the spreads' object types are checked separately in isRelatedTo,
-                // so just skip them for now.
-                if (source.right.flags & TypeFlags.Object || target.right.flags & TypeFlags.Object) {
-                    return atRightEdge &&
-                        spreadTypeRelatedTo(source.right.flags & TypeFlags.Object ? source.left as SpreadType : source,
-                                            target.right.flags & TypeFlags.Object ? target.left as SpreadType : target);
-                }
-                // If both right sides are type parameters, intersections, index types or indexed access types,
-                // then they must be identical for the spread types to be related.
-                // It also means that the left sides are either spread types or object types.
-
-                // if one left is object and the other is spread, that means the second has another type parameter. which isn't allowed
-                if (target.right !== source.right) {
-                    return false;
-                }
-                if (source.left.flags & TypeFlags.Spread && target.left.flags & TypeFlags.Spread) {
-                    // If the left sides are both spread types, then recursively check them.
-                    return spreadTypeRelatedTo(source.left as SpreadType, target.left as SpreadType);
-                }
-                // If the left sides are both object types, then we should be at the end and both should be emptyObjectType.
-                // If not, we can't know what properties might have been overwritten, so fail.
-                return source.left === emptyObjectType && target.left === emptyObjectType;
-            }
-
             function isIdenticalTo(source: Type, target: Type): Ternary {
                 let result: Ternary;
                 if (source.flags & TypeFlags.Object && target.flags & TypeFlags.Object) {
@@ -11167,6 +10925,10 @@ namespace ts {
                         typeFlags = 0;
                     }
                     const type = checkExpression((memberDecl as SpreadElementExpression).expression);
+                    if (!(type.flags & TypeFlags.Object)) {
+                        error(memberDecl, Diagnostics.Spread_types_may_only_be_created_from_object_types);
+                        return unknownType;
+                    }
                     spread = getSpreadType(spread, type, node.symbol);
                     continue;
                 }
@@ -15403,13 +15165,6 @@ namespace ts {
                     checkTypeForDuplicateIndexSignatures(node);
                     checkObjectTypeForDuplicateDeclarations(node);
                 }
-                if (find(node.members, p => p.kind === SyntaxKind.SpreadTypeElement)) {
-                    for (const signature of filter(node.members, p => p.kind === SyntaxKind.IndexSignature ||
-                                                                      p.kind === SyntaxKind.CallSignature ||
-                                                                      p.kind === SyntaxKind.ConstructSignature)) {
-                        error(signature, Diagnostics.Type_literals_with_spreads_cannot_contain_index_call_or_construct_signatures);
-                    }
-                }
             }
         }
 
@@ -17467,9 +17222,7 @@ namespace ts {
                 // perform property check if property or indexer is declared in 'type'
                 // this allows to rule out cases when both property and indexer are inherited from the base class
                 let errorNode: Node;
-                    if (prop.valueDeclaration.name.kind === SyntaxKind.ComputedPropertyName ||
-                        prop.parent === containingType.symbol ||
-                        containingType.flags & TypeFlags.Spread) {
+                    if (prop.valueDeclaration.name.kind === SyntaxKind.ComputedPropertyName || prop.parent === containingType.symbol) {
                     errorNode = prop.valueDeclaration;
                 }
                 else if (indexDeclaration) {
@@ -20699,12 +20452,6 @@ namespace ts {
                     checkGrammarHeritageClause(heritageClause);
                 }
             }
-
-            let result: TypeElement;
-            if (result = find(node.members, e => e.kind === SyntaxKind.SpreadTypeElement)) {
-                return grammarErrorOnNode(result, Diagnostics.Interface_declaration_cannot_contain_a_spread_property);
-            }
-
             return false;
         }
 
diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts
index 7a23ba8722b..0bba375a2cb 100644
--- a/src/compiler/declarationEmitter.ts
+++ b/src/compiler/declarationEmitter.ts
@@ -1138,13 +1138,6 @@ namespace ts {
             writeLine();
         }
 
-        function emitSpreadTypeElement(type: SpreadTypeElement) {
-            write("...");
-            emitType(type.type);
-            write(";");
-            writeLine();
-        }
-
         function emitVariableDeclaration(node: VariableDeclaration | PropertyDeclaration | PropertySignature | ParameterDeclaration) {
             // If we are emitting property it isn't moduleElement and hence we already know it needs to be emitted
             // so there is no check needed to see if declaration is visible
@@ -1729,8 +1722,6 @@ namespace ts {
                 case SyntaxKind.PropertyDeclaration:
                 case SyntaxKind.PropertySignature:
                     return emitPropertyDeclaration(<PropertyDeclaration>node);
-                case SyntaxKind.SpreadTypeElement:
-                    return emitSpreadTypeElement(node as SpreadTypeElement);
                 case SyntaxKind.EnumMember:
                     return emitEnumMemberDeclaration(<EnumMember>node);
                 case SyntaxKind.ExportAssignment:
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 1d45e96cb6f..58c59b18f5e 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -1983,14 +1983,10 @@
         "category": "Error",
         "code": 2697
     },
-    "Interface declaration cannot contain a spread property.": {
+    "Spread types may only be created from object types.": {
         "category": "Error",
         "code": 2698
     },
-    "Type literals with spreads cannot contain index, call or construct signatures.": {
-        "category": "Error",
-        "code": 2699
-    },
 
     "Import declaration '{0}' is using private name '{1}'.": {
         "category": "Error",
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index ac41d78bb12..464f6ca01d8 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -76,8 +76,6 @@ namespace ts {
                     visitNode(cbNode, (<ShorthandPropertyAssignment>node).objectAssignmentInitializer);
             case SyntaxKind.SpreadElementExpression:
                 return visitNode(cbNode, (<SpreadElementExpression>node).expression);
-            case SyntaxKind.SpreadTypeElement:
-                return visitNode(cbNode, (node as SpreadTypeElement).type);
             case SyntaxKind.Parameter:
             case SyntaxKind.PropertyDeclaration:
             case SyntaxKind.PropertySignature:
@@ -2346,10 +2344,6 @@ namespace ts {
             if (token() === SyntaxKind.OpenBracketToken) {
                 return true;
             }
-            // spread elements are type members
-            if (token() === SyntaxKind.DotDotDotToken) {
-                return true;
-            }
             // Try to get the first property-like token following all modifiers
             if (isLiteralPropertyName()) {
                 idToken = token();
@@ -2375,9 +2369,6 @@ namespace ts {
             if (token() === SyntaxKind.NewKeyword && lookAhead(isStartOfConstructSignature)) {
                 return parseSignatureMember(SyntaxKind.ConstructSignature);
             }
-            if (token() === SyntaxKind.DotDotDotToken) {
-                return parseSpreadTypeElement();
-            }
             const fullStart = getNodePos();
             const modifiers = parseModifiers();
             if (isIndexSignature()) {
@@ -2386,14 +2377,6 @@ namespace ts {
             return parsePropertyOrMethodSignature(fullStart, modifiers);
         }
 
-        function parseSpreadTypeElement() {
-            const element = createNode(SyntaxKind.SpreadTypeElement, scanner.getStartPos()) as SpreadTypeElement;
-            parseTokenNode<Node>(); // parse `...`
-            element.type = parseType();
-            parseTypeMemberSemicolon();
-            return finishNode(element);
-        }
-
         function isStartOfConstructSignature() {
             nextToken();
             return token() === SyntaxKind.OpenParenToken || token() === SyntaxKind.LessThanToken;
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index ba5e6b2db99..d3b4cb3b6e7 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -321,8 +321,6 @@ namespace ts {
         PropertyAssignment,
         ShorthandPropertyAssignment,
         SpreadElementExpression,
-        SpreadTypeElement,
-
 
         // Enum
         EnumMember,
@@ -664,11 +662,6 @@ namespace ts {
         initializer?: Expression;           // Optional initializer
     }
 
-    // @kind(SyntaxKind.SpreadTypeElement)
-    export interface SpreadTypeElement extends TypeElement {
-        type: TypeNode;
-    }
-
     // @kind(SyntaxKind.PropertyDeclaration)
     export interface PropertyDeclaration extends ClassElement {
         kind: SyntaxKind.PropertyDeclaration;
@@ -2521,7 +2514,7 @@ namespace ts {
         Merged                  = 0x02000000,  // Merged symbol (created during program binding)
         Transient               = 0x04000000,  // Transient symbol (created during type check)
         Prototype               = 0x08000000,  // Prototype property (no source representation)
-        SyntheticProperty       = 0x10000000,  // Property in union, intersection or spread type
+        SyntheticProperty       = 0x10000000,  // Property in union or intersection type
         Optional                = 0x20000000,  // Optional property
         ExportStar              = 0x40000000,  // Export * declaration
 
@@ -2711,7 +2704,6 @@ namespace ts {
         ContainsObjectLiteral   = 1 << 22,  // Type is or contains object literal type
         /* @internal */
         ContainsAnyFunctionType = 1 << 23,  // Type is or contains object literal type
-        Spread                  = 1 << 24,  // Spread types
 
         /* @internal */
         Nullable = Undefined | Null,
@@ -2729,12 +2721,12 @@ namespace ts {
         BooleanLike = Boolean | BooleanLiteral,
         EnumLike = Enum | EnumLiteral,
         UnionOrIntersection = Union | Intersection,
-        StructuredType = Object | Union | Intersection | Spread,
+        StructuredType = Object | Union | Intersection,
         StructuredOrTypeParameter = StructuredType | TypeParameter,
 
         // 'Narrowable' types are types where narrowing actually narrows.
         // This *should* be every type other than null, undefined, void, and never
-        Narrowable = Any | StructuredType | TypeParameter | Index | IndexedAccess | StringLike | NumberLike | BooleanLike | ESSymbol | Spread,
+        Narrowable = Any | StructuredType | TypeParameter | Index | IndexedAccess | StringLike | NumberLike | BooleanLike | ESSymbol,
         NotUnionOrUnit = Any | ESSymbol | Object,
         /* @internal */
         RequiresWidening = ContainsWideningType | ContainsObjectLiteral,
@@ -2849,12 +2841,6 @@ namespace ts {
 
     export type StructuredType = ObjectType | UnionType | IntersectionType;
 
-    /* @internal */
-    export interface SpreadType extends Type {
-        left: SpreadType | ResolvedType;
-        right: TypeParameter | IntersectionType | IndexType | IndexedAccessType | ResolvedType;
-    }
-
     /* @internal */
     // An instantiated anonymous type has a target and a mapper
     export interface AnonymousType extends ObjectType {
@@ -2868,7 +2854,7 @@ namespace ts {
     }
 
     /* @internal */
-    // Resolved object, spread, union, or intersection type
+    // Resolved object, union, or intersection type
     export interface ResolvedType extends ObjectType, UnionOrIntersectionType {
         members: SymbolTable;              // Properties by name
         properties: Symbol[];              // Properties
diff --git a/src/lib/es2015.core.d.ts b/src/lib/es2015.core.d.ts
index cc61445effe..28f2e12248b 100644
--- a/src/lib/es2015.core.d.ts
+++ b/src/lib/es2015.core.d.ts
@@ -278,7 +278,7 @@ interface ObjectConstructor {
       * @param target The target object to copy to.
       * @param source The source object from which to copy properties.
       */
-    assign<T, U>(target: T, source: U): { ...T, ...U };
+    assign<T, U>(target: T, source: U): T & U;
 
     /**
       * Copy the values of all of the enumerable own properties from one or more source objects to a
@@ -287,7 +287,7 @@ interface ObjectConstructor {
       * @param source1 The first source object from which to copy properties.
       * @param source2 The second source object from which to copy properties.
       */
-    assign<T, U, V>(target: T, source1: U, source2: V): { ...T, ...U, ...V };
+    assign<T, U, V>(target: T, source1: U, source2: V): T & U & V;
 
     /**
       * Copy the values of all of the enumerable own properties from one or more source objects to a
@@ -297,7 +297,7 @@ interface ObjectConstructor {
       * @param source2 The second source object from which to copy properties.
       * @param source3 The third source object from which to copy properties.
       */
-    assign<T, U, V, W>(target: T, source1: U, source2: V, source3: W): { ...T, ...U, ...V, ...W };
+    assign<T, U, V, W>(target: T, source1: U, source2: V, source3: W): T & U & V & W;
 
     /**
       * Copy the values of all of the enumerable own properties from one or more source objects to a

From a6320203bec279d0d8db6ce9d479aba29ef0d388 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 2 Nov 2016 16:31:04 -0700
Subject: [PATCH 084/421] Fix lint

---
 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 c6924e2cb0a..872aad6b046 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -4526,7 +4526,7 @@ namespace ts {
          * type itself. Note that the apparent type of a union type is the union type itself.
          */
         function getApparentType(type: Type): Type {
-            let t = type.flags & TypeFlags.TypeParameter ? getApparentTypeOfTypeParameter(<TypeParameter>type) : type;
+            const t = type.flags & TypeFlags.TypeParameter ? getApparentTypeOfTypeParameter(<TypeParameter>type) : type;
             return t.flags & TypeFlags.StringLike ? globalStringType :
                 t.flags & TypeFlags.NumberLike ? globalNumberType :
                 t.flags & TypeFlags.BooleanLike ? globalBooleanType :

From 7cd39e381837368058cdad30edd7edf45fe94de2 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Thu, 3 Nov 2016 06:09:44 -0700
Subject: [PATCH 085/421] Parsing of mapped types

---
 src/compiler/binder.ts          |  1 +
 src/compiler/checker.ts         |  8 ++++++++
 src/compiler/parser.ts          | 30 +++++++++++++++++++++++++++++-
 src/compiler/transformers/ts.ts |  2 ++
 src/compiler/types.ts           | 11 +++++++++++
 5 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index c1011e57568..0a2df4f70d5 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -3099,6 +3099,7 @@ namespace ts {
             case SyntaxKind.ThisType:
             case SyntaxKind.TypeOperator:
             case SyntaxKind.IndexedAccessType:
+            case SyntaxKind.MappedType:
             case SyntaxKind.LiteralType:
                 // Types and signatures are TypeScript syntax, and exclude all other facts.
                 transformFlags = TransformFlags.AssertTypeScript;
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index cf0c048ecbf..647bc7e3e5d 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -6002,6 +6002,8 @@ namespace ts {
                     return getTypeFromTypeOperatorNode(<TypeOperatorNode>node);
                 case SyntaxKind.IndexedAccessType:
                     return getTypeFromIndexedAccessTypeNode(<IndexedAccessTypeNode>node);
+                case SyntaxKind.MappedType:
+                    return unknownType;  // !!!
                 // This function assumes that an identifier or qualified name is a type expression
                 // Callers should first ensure this by calling isTypeNode
                 case SyntaxKind.Identifier:
@@ -15072,6 +15074,10 @@ namespace ts {
             getTypeFromIndexedAccessTypeNode(node);
         }
 
+        function checkMappedType(node: MappedTypeNode) {
+            node; // !!!
+        }
+
         function isPrivateWithinAmbient(node: Node): boolean {
             return (getModifierFlags(node) & ModifierFlags.Private) && isInAmbientContext(node);
         }
@@ -18312,6 +18318,8 @@ namespace ts {
                     return checkSourceElement((<ParenthesizedTypeNode | TypeOperatorNode>node).type);
                 case SyntaxKind.IndexedAccessType:
                     return checkIndexedAccessType(<IndexedAccessTypeNode>node);
+                case SyntaxKind.IndexedAccessType:
+                    return checkMappedType(<MappedTypeNode>node);
                 case SyntaxKind.FunctionDeclaration:
                     return checkFunctionDeclaration(<FunctionDeclaration>node);
                 case SyntaxKind.Block:
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 92a3dcbef11..f4a41d8da12 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -139,6 +139,10 @@ namespace ts {
             case SyntaxKind.IndexedAccessType:
                 return visitNode(cbNode, (<IndexedAccessTypeNode>node).objectType) ||
                     visitNode(cbNode, (<IndexedAccessTypeNode>node).indexType);
+            case SyntaxKind.MappedType:
+                return visitNode(cbNode, (<MappedTypeNode>node).iterationTypeName) ||
+                    visitNode(cbNode, (<MappedTypeNode>node).indexType) ||
+                    visitNode(cbNode, (<MappedTypeNode>node).type);
             case SyntaxKind.LiteralType:
                 return visitNode(cbNode, (<LiteralTypeNode>node).literal);
             case SyntaxKind.ObjectBindingPattern:
@@ -2399,6 +2403,30 @@ namespace ts {
             return members;
         }
 
+        function isStartOfMappedType() {
+            nextToken();
+            if (token() === SyntaxKind.ReadonlyKeyword) {
+                nextToken();
+            }
+            return token() === SyntaxKind.OpenBracketToken && nextTokenIsIdentifier() && nextToken() === SyntaxKind.InKeyword;
+        }
+
+        function parseMappedType() {
+            const node = <MappedTypeNode>createNode(SyntaxKind.MappedType);
+            parseExpected(SyntaxKind.OpenBraceToken);
+            node.readonlyToken = parseOptionalToken(SyntaxKind.ReadonlyKeyword);
+            parseExpected(SyntaxKind.OpenBracketToken);
+            node.iterationTypeName = parseIdentifier();
+            parseExpected(SyntaxKind.InKeyword);
+            node.indexType = parseType();
+            parseExpected(SyntaxKind.CloseBracketToken);
+            node.questionToken = parseOptionalToken(SyntaxKind.QuestionToken);
+            node.type = parseTypeAnnotation();
+            parseSemicolon();
+            parseExpected(SyntaxKind.CloseBraceToken);
+            return finishNode(node);
+        }
+
         function parseTupleType(): TupleTypeNode {
             const node = <TupleTypeNode>createNode(SyntaxKind.TupleType);
             node.elementTypes = parseBracketedList(ParsingContext.TupleElementTypes, parseType, SyntaxKind.OpenBracketToken, SyntaxKind.CloseBracketToken);
@@ -2472,7 +2500,7 @@ namespace ts {
                 case SyntaxKind.TypeOfKeyword:
                     return parseTypeQuery();
                 case SyntaxKind.OpenBraceToken:
-                    return parseTypeLiteral();
+                    return lookAhead(isStartOfMappedType) ? parseMappedType() : parseTypeLiteral();
                 case SyntaxKind.OpenBracketToken:
                     return parseTupleType();
                 case SyntaxKind.OpenParenToken:
diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
index 1362746ba57..65e31ab1ee6 100644
--- a/src/compiler/transformers/ts.ts
+++ b/src/compiler/transformers/ts.ts
@@ -302,6 +302,7 @@ namespace ts {
                 case SyntaxKind.ThisType:
                 case SyntaxKind.TypeOperator:
                 case SyntaxKind.IndexedAccessType:
+                case SyntaxKind.MappedType:
                 case SyntaxKind.LiteralType:
                     // TypeScript type nodes are elided.
 
@@ -1787,6 +1788,7 @@ namespace ts {
                 case SyntaxKind.TypeQuery:
                 case SyntaxKind.TypeOperator:
                 case SyntaxKind.IndexedAccessType:
+                case SyntaxKind.MappedType:
                 case SyntaxKind.TypeLiteral:
                 case SyntaxKind.AnyKeyword:
                 case SyntaxKind.ThisType:
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 381289b133b..22fbe29c76b 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -219,6 +219,7 @@ namespace ts {
         ThisType,
         TypeOperator,
         IndexedAccessType,
+        MappedType,
         LiteralType,
         // Binding patterns
         ObjectBindingPattern,
@@ -519,6 +520,7 @@ namespace ts {
     export type EqualsGreaterThanToken = Token<SyntaxKind.EqualsGreaterThanToken>;
     export type EndOfFileToken = Token<SyntaxKind.EndOfFileToken>;
     export type AtToken = Token<SyntaxKind.AtToken>;
+    export type ReadonlyToken = Token<SyntaxKind.ReadonlyKeyword>;
 
     export type Modifier
         = Token<SyntaxKind.AbstractKeyword>
@@ -897,6 +899,15 @@ namespace ts {
         indexType: TypeNode;
     }
 
+    export interface MappedTypeNode extends TypeNode {
+        kind: SyntaxKind.MappedType;
+        readonlyToken?: ReadonlyToken;
+        iterationTypeName: Identifier;
+        indexType: TypeNode;
+        questionToken?: QuestionToken;
+        type?: TypeNode;
+    }
+
     export interface LiteralTypeNode extends TypeNode {
         kind: SyntaxKind.LiteralType;
         literal: Expression;

From 2eca0af91b0e4d28c4cb7fbe6a6a6c3da72d8ae4 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Wed, 2 Nov 2016 07:05:54 -0700
Subject: [PATCH 086/421] Leave files from `node_modules` out when calculating
 `getCommonSourceDirectory`

---
 src/compiler/program.ts                       | 13 ++++---
 src/compiler/utilities.ts                     | 20 ++++++++---
 src/harness/harness.ts                        | 36 +++++++------------
 src/harness/runnerbase.ts                     |  2 +-
 .../reference/commonSourceDirectory.js        | 16 +++++++++
 .../reference/commonSourceDirectory.symbols   | 13 +++++++
 .../reference/commonSourceDirectory.types     | 16 +++++++++
 tests/cases/compiler/commonSourceDirectory.ts | 18 ++++++++++
 8 files changed, 102 insertions(+), 32 deletions(-)
 create mode 100644 tests/baselines/reference/commonSourceDirectory.js
 create mode 100644 tests/baselines/reference/commonSourceDirectory.symbols
 create mode 100644 tests/baselines/reference/commonSourceDirectory.types
 create mode 100644 tests/cases/compiler/commonSourceDirectory.ts

diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 82d274e0487..35c6818fea8 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -430,13 +430,14 @@ namespace ts {
         return program;
 
         function getCommonSourceDirectory() {
-            if (typeof commonSourceDirectory === "undefined") {
-                if (options.rootDir && checkSourceFilesBelongToPath(files, options.rootDir)) {
+            if (commonSourceDirectory === undefined) {
+                const emittedFiles = filterSourceFilesInDirectory(files, isSourceFileFromExternalLibrary);
+                if (options.rootDir && checkSourceFilesBelongToPath(emittedFiles, options.rootDir)) {
                     // If a rootDir is specified and is valid use it as the commonSourceDirectory
                     commonSourceDirectory = getNormalizedAbsolutePath(options.rootDir, currentDirectory);
                 }
                 else {
-                    commonSourceDirectory = computeCommonSourceDirectory(files);
+                    commonSourceDirectory = computeCommonSourceDirectory(emittedFiles);
                 }
                 if (commonSourceDirectory && commonSourceDirectory[commonSourceDirectory.length - 1] !== directorySeparator) {
                     // Make sure directory path ends with directory separator so this string can directly
@@ -448,6 +449,10 @@ namespace ts {
             return commonSourceDirectory;
         }
 
+        function isSourceFileFromExternalLibrary(file: SourceFile): boolean {
+            return !!sourceFilesFoundSearchingNodeModules[file.path];
+        }
+
         function getClassifiableNames() {
             if (!classifiableNames) {
                 // Initialize a checker so that all our files are bound.
@@ -722,7 +727,7 @@ namespace ts {
                 getSourceFile: program.getSourceFile,
                 getSourceFileByPath: program.getSourceFileByPath,
                 getSourceFiles: program.getSourceFiles,
-                isSourceFileFromExternalLibrary: (file: SourceFile) => !!sourceFilesFoundSearchingNodeModules[file.path],
+                isSourceFileFromExternalLibrary,
                 writeFile: writeFileCallback || (
                     (fileName, data, writeByteOrderMark, onError, sourceFiles) => host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles)),
                 isEmitBlocked,
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 299f91be662..a2fe7a2d3c6 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -2556,16 +2556,29 @@ namespace ts {
         }
         else {
             const sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
-            return filter(sourceFiles, isNonDeclarationFile);
+            return filterSourceFilesInDirectory(sourceFiles, file => host.isSourceFileFromExternalLibrary(file));
         }
     }
 
+    /** Don't call this for `--outFile`, just for `--outDir` or plain emit. */
+    export function filterSourceFilesInDirectory(sourceFiles: SourceFile[], isSourceFileFromExternalLibrary: (file: SourceFile) => boolean): SourceFile[] {
+        return filter(sourceFiles, file => shouldEmitInDirectory(file, isSourceFileFromExternalLibrary));
+    }
+
     function isNonDeclarationFile(sourceFile: SourceFile) {
         return !isDeclarationFile(sourceFile);
     }
 
+    /**
+     * Whether a file should be emitted in a non-`--outFile` case.
+     * Don't emit if source file is a declaration file, or was located under node_modules
+     */
+    function shouldEmitInDirectory(sourceFile: SourceFile, isSourceFileFromExternalLibrary: (file: SourceFile) => boolean): boolean {
+        return isNonDeclarationFile(sourceFile) && !isSourceFileFromExternalLibrary(sourceFile);
+    }
+
     function isBundleEmitNonExternalModule(sourceFile: SourceFile) {
-        return !isDeclarationFile(sourceFile) && !isExternalModule(sourceFile);
+        return isNonDeclarationFile(sourceFile) && !isExternalModule(sourceFile);
     }
 
     /**
@@ -2653,8 +2666,7 @@ namespace ts {
         else {
             const sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
             for (const sourceFile of sourceFiles) {
-                // Don't emit if source file is a declaration file, or was located under node_modules
-                if (!isDeclarationFile(sourceFile) && !host.isSourceFileFromExternalLibrary(sourceFile)) {
+                if (shouldEmitInDirectory(sourceFile, file => host.isSourceFileFromExternalLibrary(file))) {
                     onSingleFileEmit(host, sourceFile);
                 }
             }
diff --git a/src/harness/harness.ts b/src/harness/harness.ts
index a6e1ffad7f7..57ee46299b5 100644
--- a/src/harness/harness.ts
+++ b/src/harness/harness.ts
@@ -470,19 +470,6 @@ namespace Utils {
     }
 }
 
-namespace Harness.Path {
-    export function getFileName(fullPath: string) {
-        return fullPath.replace(/^.*[\\\/]/, "");
-    }
-
-    export function filePath(fullPath: string) {
-        fullPath = ts.normalizeSlashes(fullPath);
-        const components = fullPath.split("/");
-        const path: string[] = components.slice(0, components.length - 1);
-        return path.join("/") + "/";
-    }
-}
-
 namespace Harness {
     export interface IO {
         newLine(): string;
@@ -1090,7 +1077,9 @@ namespace Harness {
             { name: "suppressOutputPathCheck", type: "boolean" },
             { name: "noImplicitReferences", type: "boolean" },
             { name: "currentDirectory", type: "string" },
-            { name: "symlink", type: "string" }
+            { name: "symlink", type: "string" },
+            // Emitted js baseline will print full paths for every output file
+            { name: "fullEmitPaths", type: "boolean" }
         ];
 
         let optionsIndex: ts.Map<ts.CommandLineOption>;
@@ -1588,7 +1577,7 @@ namespace Harness {
 
                     let sourceMapCode = "";
                     for (let i = 0; i < result.sourceMaps.length; i++) {
-                        sourceMapCode += "//// [" + Harness.Path.getFileName(result.sourceMaps[i].fileName) + "]\r\n";
+                        sourceMapCode += "//// [" + ts.getBaseFileName(result.sourceMaps[i].fileName) + "]\r\n";
                         sourceMapCode += getByteOrderMarkText(result.sourceMaps[i]);
                         sourceMapCode += result.sourceMaps[i].code;
                     }
@@ -1611,21 +1600,22 @@ namespace Harness {
                     tsCode += "//// [" + header + "] ////\r\n\r\n";
                 }
                 for (let i = 0; i < tsSources.length; i++) {
-                    tsCode += "//// [" + Harness.Path.getFileName(tsSources[i].unitName) + "]\r\n";
+                    tsCode += "//// [" + ts.getBaseFileName(tsSources[i].unitName) + "]\r\n";
                     tsCode += tsSources[i].content + (i < (tsSources.length - 1) ? "\r\n" : "");
                 }
 
                 let jsCode = "";
-                for (let i = 0; i < result.files.length; i++) {
-                    jsCode += "//// [" + Harness.Path.getFileName(result.files[i].fileName) + "]\r\n";
-                    jsCode += getByteOrderMarkText(result.files[i]);
-                    jsCode += result.files[i].code;
+                for (const file of result.files) {
+                    const fileName = harnessSettings["fullEmitPaths"] ? file.fileName : ts.getBaseFileName(file.fileName);
+                    jsCode += "//// [" + fileName + "]\r\n";
+                    jsCode += getByteOrderMarkText(file);
+                    jsCode += file.code;
                 }
 
                 if (result.declFilesCode.length > 0) {
                     jsCode += "\r\n\r\n";
                     for (let i = 0; i < result.declFilesCode.length; i++) {
-                        jsCode += "//// [" + Harness.Path.getFileName(result.declFilesCode[i].fileName) + "]\r\n";
+                        jsCode += "//// [" + ts.getBaseFileName(result.declFilesCode[i].fileName) + "]\r\n";
                         jsCode += getByteOrderMarkText(result.declFilesCode[i]);
                         jsCode += result.declFilesCode[i].code;
                     }
@@ -1848,7 +1838,7 @@ namespace Harness {
             }
 
             // normalize the fileName for the single file case
-            currentFileName = testUnitData.length > 0 || currentFileName ? currentFileName : Path.getFileName(fileName);
+            currentFileName = testUnitData.length > 0 || currentFileName ? currentFileName : ts.getBaseFileName(fileName);
 
             // EOF, push whatever remains
             const newTestFile2 = {
@@ -2012,7 +2002,7 @@ namespace Harness {
 
     export function isDefaultLibraryFile(filePath: string): boolean {
         // We need to make sure that the filePath is prefixed with "lib." not just containing "lib." and end with ".d.ts"
-        const fileName = Path.getFileName(filePath);
+        const fileName = ts.getBaseFileName(filePath);
         return ts.startsWith(fileName, "lib.") && ts.endsWith(fileName, ".d.ts");
     }
 
diff --git a/src/harness/runnerbase.ts b/src/harness/runnerbase.ts
index 346382b7a57..d50604803ed 100644
--- a/src/harness/runnerbase.ts
+++ b/src/harness/runnerbase.ts
@@ -32,7 +32,7 @@ abstract class RunnerBase {
     /** Replaces instances of full paths with fileNames only */
     static removeFullPaths(path: string) {
         // If its a full path (starts with "C:" or "/") replace with just the filename
-        let fixedPath = /^(\w:|\/)/.test(path) ? Harness.Path.getFileName(path) : path;
+        let fixedPath = /^(\w:|\/)/.test(path) ? ts.getBaseFileName(path) : path;
 
         // when running in the browser the 'full path' is the host name, shows up in error baselines
         const localHost = /http:\/localhost:\d+/g;
diff --git a/tests/baselines/reference/commonSourceDirectory.js b/tests/baselines/reference/commonSourceDirectory.js
new file mode 100644
index 00000000000..3babba98337
--- /dev/null
+++ b/tests/baselines/reference/commonSourceDirectory.js
@@ -0,0 +1,16 @@
+//// [tests/cases/compiler/commonSourceDirectory.ts] ////
+
+//// [index.ts]
+// Test that importing a file from `node_modules` does not affect calculation of the common source directory.
+
+export const x = 0;
+
+//// [index.ts]
+import { x } from "foo";
+x + 1;
+
+
+//// [/app/bin/index.js]
+"use strict";
+var foo_1 = require("foo");
+foo_1.x + 1;
diff --git a/tests/baselines/reference/commonSourceDirectory.symbols b/tests/baselines/reference/commonSourceDirectory.symbols
new file mode 100644
index 00000000000..88ded4c8c87
--- /dev/null
+++ b/tests/baselines/reference/commonSourceDirectory.symbols
@@ -0,0 +1,13 @@
+=== /app/index.ts ===
+import { x } from "foo";
+>x : Symbol(x, Decl(index.ts, 0, 8))
+
+x + 1;
+>x : Symbol(x, Decl(index.ts, 0, 8))
+
+=== /node_modules/foo/index.ts ===
+// Test that importing a file from `node_modules` does not affect calculation of the common source directory.
+
+export const x = 0;
+>x : Symbol(x, Decl(index.ts, 2, 12))
+
diff --git a/tests/baselines/reference/commonSourceDirectory.types b/tests/baselines/reference/commonSourceDirectory.types
new file mode 100644
index 00000000000..a0c66b86ae0
--- /dev/null
+++ b/tests/baselines/reference/commonSourceDirectory.types
@@ -0,0 +1,16 @@
+=== /app/index.ts ===
+import { x } from "foo";
+>x : 0
+
+x + 1;
+>x + 1 : number
+>x : 0
+>1 : 1
+
+=== /node_modules/foo/index.ts ===
+// Test that importing a file from `node_modules` does not affect calculation of the common source directory.
+
+export const x = 0;
+>x : 0
+>0 : 0
+
diff --git a/tests/cases/compiler/commonSourceDirectory.ts b/tests/cases/compiler/commonSourceDirectory.ts
new file mode 100644
index 00000000000..6583da67c6a
--- /dev/null
+++ b/tests/cases/compiler/commonSourceDirectory.ts
@@ -0,0 +1,18 @@
+// Test that importing a file from `node_modules` does not affect calculation of the common source directory.
+// @noImplicitReferences: true
+// @moduleResolution: node
+// @fullEmitPaths: true
+
+// @filename: /node_modules/foo/index.ts
+export const x = 0;
+
+// @filename: /app/index.ts
+import { x } from "foo";
+x + 1;
+
+// @filename: /app/tsconfig.json
+{
+    "compilerOptions": {
+        "outDir": "bin"
+    }
+}

From b6727ea582d1c457228dc37fad1fab070736cd8d Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Thu, 3 Nov 2016 06:09:47 -0700
Subject: [PATCH 087/421] Only resolve symlinks in `node_modules`

---
 src/compiler/moduleNameResolver.ts            |  5 +-
 src/harness/harness.ts                        | 50 +++++++++++--------
 .../importWithTrailingSlash.trace.json        |  4 --
 .../moduleResolutionWithExtensions.trace.json |  3 --
 ...tionWithExtensions_notSupported.trace.json |  3 --
 ...ionWithExtensions_notSupported2.trace.json |  1 -
 ...ionWithExtensions_notSupported3.trace.json |  1 -
 ...solutionWithExtensions_preferTs.trace.json |  1 -
 .../reference/moduleResolutionWithSymlinks.js | 50 +++++++++++++++++--
 .../moduleResolutionWithSymlinks.symbols      | 23 ++++++++-
 .../moduleResolutionWithSymlinks.trace.json   |  2 -
 .../moduleResolutionWithSymlinks.types        | 21 ++++++++
 ...ResolutionWithSymlinks_notInNodeModules.js | 32 ++++++++++++
 ...utionWithSymlinks_notInNodeModules.symbols | 12 +++++
 ...onWithSymlinks_notInNodeModules.trace.json | 12 +++++
 ...olutionWithSymlinks_notInNodeModules.types | 13 +++++
 ...moduleResolutionWithSymlinks_withOutDir.js | 40 +++++++++++++++
 ...eResolutionWithSymlinks_withOutDir.symbols | 38 ++++++++++++++
 ...solutionWithSymlinks_withOutDir.trace.json | 30 +++++++++++
 ...uleResolutionWithSymlinks_withOutDir.types | 40 +++++++++++++++
 ...pingBasedModuleResolution3_node.trace.json |  2 -
 ...pingBasedModuleResolution4_node.trace.json |  2 -
 ...pingBasedModuleResolution5_node.trace.json |  3 --
 ...pingBasedModuleResolution6_node.trace.json |  2 -
 ...pingBasedModuleResolution7_node.trace.json |  4 --
 .../typeReferenceDirectives10.trace.json      |  1 -
 .../typeReferenceDirectives11.trace.json      |  1 -
 .../typeReferenceDirectives12.trace.json      |  3 --
 .../typeReferenceDirectives13.trace.json      |  1 -
 .../typeReferenceDirectives5.trace.json       |  1 -
 .../typeReferenceDirectives8.trace.json       |  1 -
 .../typeReferenceDirectives9.trace.json       |  3 --
 .../compiler/moduleResolutionWithSymlinks.ts  | 25 +++++++++-
 ...ResolutionWithSymlinks_notInNodeModules.ts | 40 +++++++++++++++
 ...moduleResolutionWithSymlinks_withOutDir.ts | 22 ++++++++
 35 files changed, 423 insertions(+), 69 deletions(-)
 create mode 100644 tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js
 create mode 100644 tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.symbols
 create mode 100644 tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.trace.json
 create mode 100644 tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.types
 create mode 100644 tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js
 create mode 100644 tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.symbols
 create mode 100644 tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.trace.json
 create mode 100644 tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.types
 create mode 100644 tests/cases/compiler/moduleResolutionWithSymlinks_notInNodeModules.ts
 create mode 100644 tests/cases/compiler/moduleResolutionWithSymlinks_withOutDir.ts

diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
index 86e0157d847..6c9ce00b3b8 100644
--- a/src/compiler/moduleNameResolver.ts
+++ b/src/compiler/moduleNameResolver.ts
@@ -548,7 +548,7 @@ namespace ts {
         const result = tryResolve(Extensions.TypeScript) || tryResolve(Extensions.JavaScript);
         if (result) {
             const { resolved, isExternalLibraryImport } = result;
-            return createResolvedModuleWithFailedLookupLocations(resolved && resolvedWithRealpath(resolved, host, traceEnabled), isExternalLibraryImport, failedLookupLocations);
+            return createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations);
         }
         return { resolvedModule: undefined, failedLookupLocations };
 
@@ -563,7 +563,8 @@ namespace ts {
                     trace(host, Diagnostics.Loading_module_0_from_node_modules_folder, moduleName);
                 }
                 const resolved = loadModuleFromNodeModules(extensions, moduleName, containingDirectory, failedLookupLocations, state, /*checkOneLevel*/ false);
-                return resolved && { resolved, isExternalLibraryImport: true };
+                // For node_modules lookups, get the real path so that multiple accesses to an `npm link`-ed module do not create duplicate files.
+                return resolved && { resolved: resolvedWithRealpath(resolved, host, traceEnabled), isExternalLibraryImport: true };
             }
             else {
                 const candidate = normalizePath(combinePaths(containingDirectory, moduleName));
diff --git a/src/harness/harness.ts b/src/harness/harness.ts
index 57ee46299b5..b5dd39b1542 100644
--- a/src/harness/harness.ts
+++ b/src/harness/harness.ts
@@ -958,28 +958,38 @@ namespace Harness {
             // Local get canonical file name function, that depends on passed in parameter for useCaseSensitiveFileNames
             const getCanonicalFileName = ts.createGetCanonicalFileName(useCaseSensitiveFileNames);
 
-            const realPathMap: ts.FileMap<string> = ts.createFileMap<string>();
-            const fileMap: ts.FileMap<() => ts.SourceFile> = ts.createFileMap<() => ts.SourceFile>();
+            /** Maps a symlink name to a realpath. Used only for exposing `realpath`. */
+            const realPathMap = ts.createFileMap<string>();
+            /**
+             * Maps a file name to a source file.
+             * This will have a different SourceFile for every symlink pointing to that file;
+             * if the program resolves realpaths then symlink entries will be ignored.
+             */
+            const fileMap = ts.createFileMap<ts.SourceFile>();
             for (const file of inputFiles) {
                 if (file.content !== undefined) {
                     const fileName = ts.normalizePath(file.unitName);
                     const path = ts.toPath(file.unitName, currentDirectory, getCanonicalFileName);
                     if (file.fileOptions && file.fileOptions["symlink"]) {
-                        const link = file.fileOptions["symlink"];
-                        const linkPath = ts.toPath(link, currentDirectory, getCanonicalFileName);
-                        realPathMap.set(linkPath, fileName);
-                        fileMap.set(path, (): ts.SourceFile => { throw new Error("Symlinks should always be resolved to a realpath first"); });
+                        const links = file.fileOptions["symlink"].split(",");
+                        for (const link of links) {
+                            const linkPath = ts.toPath(link, currentDirectory, getCanonicalFileName);
+                            realPathMap.set(linkPath, fileName);
+                            // Create a different SourceFile for every symlink.
+                            const sourceFile = createSourceFileAndAssertInvariants(linkPath, file.content, scriptTarget);
+                            fileMap.set(linkPath, sourceFile);
+                        }
                     }
                     const sourceFile = createSourceFileAndAssertInvariants(fileName, file.content, scriptTarget);
-                    fileMap.set(path, () => sourceFile);
+                    fileMap.set(path, sourceFile);
                 }
             }
 
             function getSourceFile(fileName: string) {
                 fileName = ts.normalizePath(fileName);
-                const path = ts.toPath(fileName, currentDirectory, getCanonicalFileName);
-                if (fileMap.contains(path)) {
-                    return fileMap.get(path)();
+                const fromFileMap = fileMap.get(toPath(fileName));
+                if (fromFileMap) {
+                    return fromFileMap;
                 }
                 else if (fileName === fourslashFileName) {
                     const tsFn = "tests/cases/fourslash/" + fourslashFileName;
@@ -998,6 +1008,9 @@ namespace Harness {
                     newLineKind === ts.NewLineKind.LineFeed ? lineFeed :
                         Harness.IO.newLine();
 
+            function toPath(fileName: string): ts.Path {
+                return ts.toPath(fileName, currentDirectory, getCanonicalFileName);
+            }
 
             return {
                 getCurrentDirectory: () => currentDirectory,
@@ -1007,24 +1020,19 @@ namespace Harness {
                 getCanonicalFileName,
                 useCaseSensitiveFileNames: () => useCaseSensitiveFileNames,
                 getNewLine: () => newLine,
-                fileExists: fileName => {
-                    const path = ts.toPath(fileName, currentDirectory, getCanonicalFileName);
-                    return fileMap.contains(path) || (realPathMap && realPathMap.contains(path));
+                fileExists: fileName => fileMap.contains(toPath(fileName)),
+                readFile: (fileName: string): string => fileMap.get(toPath(fileName)).getText(),
+                realpath: (fileName: string): ts.Path => {
+                    const path = toPath(fileName);
+                    return (realPathMap.get(path) as ts.Path) || path;
                 },
-                readFile: (fileName: string): string => {
-                    return fileMap.get(ts.toPath(fileName, currentDirectory, getCanonicalFileName))().getText();
-                },
-                realpath: realPathMap && ((f: string) => {
-                    const path = ts.toPath(f, currentDirectory, getCanonicalFileName);
-                    return realPathMap.get(path) || path;
-                }),
                 directoryExists: dir => {
                     let path = ts.toPath(dir, currentDirectory, getCanonicalFileName);
                     // Strip trailing /, which may exist if the path is a drive root
                     if (path[path.length - 1] === "/") {
                         path = <ts.Path>path.substr(0, path.length - 1);
                     }
-                    return mapHasFileInDirectory(path, fileMap) || mapHasFileInDirectory(path, realPathMap);
+                    return mapHasFileInDirectory(path, fileMap);
                 },
                 getDirectories: d => {
                     const path = ts.toPath(d, currentDirectory, getCanonicalFileName);
diff --git a/tests/baselines/reference/importWithTrailingSlash.trace.json b/tests/baselines/reference/importWithTrailingSlash.trace.json
index 3c99d4eb6a0..56de914f395 100644
--- a/tests/baselines/reference/importWithTrailingSlash.trace.json
+++ b/tests/baselines/reference/importWithTrailingSlash.trace.json
@@ -3,26 +3,22 @@
     "Explicitly specified module resolution kind: 'NodeJs'.",
     "Loading module as file / folder, candidate module location '/a'.",
     "File '/a.ts' exist - use it as a name resolution result.",
-    "Resolving real path for '/a.ts', result '/a.ts'",
     "======== Module name '.' was successfully resolved to '/a.ts'. ========",
     "======== Resolving module './' from '/a/test.ts'. ========",
     "Explicitly specified module resolution kind: 'NodeJs'.",
     "Loading module as file / folder, candidate module location '/a/'.",
     "File '/a/package.json' does not exist.",
     "File '/a/index.ts' exist - use it as a name resolution result.",
-    "Resolving real path for '/a/index.ts', result '/a/index.ts'",
     "======== Module name './' was successfully resolved to '/a/index.ts'. ========",
     "======== Resolving module '..' from '/a/b/test.ts'. ========",
     "Explicitly specified module resolution kind: 'NodeJs'.",
     "Loading module as file / folder, candidate module location '/a'.",
     "File '/a.ts' exist - use it as a name resolution result.",
-    "Resolving real path for '/a.ts', result '/a.ts'",
     "======== Module name '..' was successfully resolved to '/a.ts'. ========",
     "======== Resolving module '../' from '/a/b/test.ts'. ========",
     "Explicitly specified module resolution kind: 'NodeJs'.",
     "Loading module as file / folder, candidate module location '/a/'.",
     "File '/a/package.json' does not exist.",
     "File '/a/index.ts' exist - use it as a name resolution result.",
-    "Resolving real path for '/a/index.ts', result '/a/index.ts'",
     "======== Module name '../' was successfully resolved to '/a/index.ts'. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions.trace.json b/tests/baselines/reference/moduleResolutionWithExtensions.trace.json
index 5060006ac56..6860c61bb17 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions.trace.json
+++ b/tests/baselines/reference/moduleResolutionWithExtensions.trace.json
@@ -3,7 +3,6 @@
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module as file / folder, candidate module location '/src/a'.",
     "File '/src/a.ts' exist - use it as a name resolution result.",
-    "Resolving real path for '/src/a.ts', result '/src/a.ts'",
     "======== Module name './a' was successfully resolved to '/src/a.ts'. ========",
     "======== Resolving module './a.js' from '/src/d.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
@@ -13,7 +12,6 @@
     "File '/src/a.js.d.ts' does not exist.",
     "File name '/src/a.js' has a '.js' extension - stripping it",
     "File '/src/a.ts' exist - use it as a name resolution result.",
-    "Resolving real path for '/src/a.ts', result '/src/a.ts'",
     "======== Module name './a.js' was successfully resolved to '/src/a.ts'. ========",
     "======== Resolving module './jquery.js' from '/src/jquery_user_1.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
@@ -25,6 +23,5 @@
     "File '/src/jquery.ts' does not exist.",
     "File '/src/jquery.tsx' does not exist.",
     "File '/src/jquery.d.ts' exist - use it as a name resolution result.",
-    "Resolving real path for '/src/jquery.d.ts', result '/src/jquery.d.ts'",
     "======== Module name './jquery.js' was successfully resolved to '/src/jquery.d.ts'. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_notSupported.trace.json b/tests/baselines/reference/moduleResolutionWithExtensions_notSupported.trace.json
index 0073abaca3a..f2b0214602c 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_notSupported.trace.json
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_notSupported.trace.json
@@ -4,7 +4,6 @@
     "Loading module as file / folder, candidate module location '/tsx'.",
     "File '/tsx.ts' does not exist.",
     "File '/tsx.tsx' exist - use it as a name resolution result.",
-    "Resolving real path for '/tsx.tsx', result '/tsx.tsx'",
     "======== Module name './tsx' was successfully resolved to '/tsx.tsx'. ========",
     "======== Resolving module './jsx' from '/a.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
@@ -19,7 +18,6 @@
     "Loading module as file / folder, candidate module location '/jsx'.",
     "File '/jsx.js' does not exist.",
     "File '/jsx.jsx' exist - use it as a name resolution result.",
-    "Resolving real path for '/jsx.jsx', result '/jsx.jsx'",
     "======== Module name './jsx' was successfully resolved to '/jsx.jsx'. ========",
     "======== Resolving module './js' from '/a.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
@@ -33,6 +31,5 @@
     "File '/js/index.d.ts' does not exist.",
     "Loading module as file / folder, candidate module location '/js'.",
     "File '/js.js' exist - use it as a name resolution result.",
-    "Resolving real path for '/js.js', result '/js.js'",
     "======== Module name './js' was successfully resolved to '/js.js'. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_notSupported2.trace.json b/tests/baselines/reference/moduleResolutionWithExtensions_notSupported2.trace.json
index c366843ce86..89bd061301e 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_notSupported2.trace.json
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_notSupported2.trace.json
@@ -12,6 +12,5 @@
     "Loading module as file / folder, candidate module location '/jsx'.",
     "File '/jsx.js' does not exist.",
     "File '/jsx.jsx' exist - use it as a name resolution result.",
-    "Resolving real path for '/jsx.jsx', result '/jsx.jsx'",
     "======== Module name './jsx' was successfully resolved to '/jsx.jsx'. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_notSupported3.trace.json b/tests/baselines/reference/moduleResolutionWithExtensions_notSupported3.trace.json
index c366843ce86..89bd061301e 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_notSupported3.trace.json
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_notSupported3.trace.json
@@ -12,6 +12,5 @@
     "Loading module as file / folder, candidate module location '/jsx'.",
     "File '/jsx.js' does not exist.",
     "File '/jsx.jsx' exist - use it as a name resolution result.",
-    "Resolving real path for '/jsx.jsx', result '/jsx.jsx'",
     "======== Module name './jsx' was successfully resolved to '/jsx.jsx'. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.trace.json b/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.trace.json
index 292472c710c..f6612b84cc3 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.trace.json
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.trace.json
@@ -7,6 +7,5 @@
     "File '/b.d.ts' does not exist.",
     "File '/b/package.json' does not exist.",
     "File '/b/index.ts' exist - use it as a name resolution result.",
-    "Resolving real path for '/b/index.ts', result '/b/index.ts'",
     "======== Module name './b' was successfully resolved to '/b/index.ts'. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks.js b/tests/baselines/reference/moduleResolutionWithSymlinks.js
index fa6fea5520b..fbf97fa3ba0 100644
--- a/tests/baselines/reference/moduleResolutionWithSymlinks.js
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks.js
@@ -1,6 +1,8 @@
 //// [tests/cases/compiler/moduleResolutionWithSymlinks.ts] ////
 
 //// [index.ts]
+// When symlinked files are in node_modules, they are resolved with realpath;
+// so a linked file does not create a duplicate SourceFile of the real one.
 
 export class MyClass { private x: number; }
 
@@ -15,9 +17,31 @@ import { MyClass2 } from "./library-b";
 let x: MyClass;
 let y: MyClass2;
 x = y;
-y = x;
+y = x;
+
+/*
+# To reproduce in a real project:
+
+mkdir src; cd src
+mkdir library-a
+echo 'export class MyClass { private x: number; }' > library-a/index.ts
+
+mkdir library-b; cd library-b
+echo 'import {MyClass} from "library-a"; export { MyClass as MyClass2 }' > index.ts
+mkdir node_modules; cd node_modules
+
+ln -s ../../library-a library-a # Linux
+# Windows: open command prompt as administrator and run: mklink /D library-a ..\..\library-a
+
+cd ../.. # back to src
+echo 'import { MyClass } from "./library-a"; import { MyClass2 } from "./library-b"; let x: MyClass; let y: MyClass2; x = y; y = x;' > app.ts
+tsc app.ts # Should write to library-a/index.js, library-b/index.js, and app.js
+*/
 
-//// [index.js]
+
+//// [/src/library-a/index.js]
+// When symlinked files are in node_modules, they are resolved with realpath;
+// so a linked file does not create a duplicate SourceFile of the real one.
 "use strict";
 var MyClass = (function () {
     function MyClass() {
@@ -25,13 +49,31 @@ var MyClass = (function () {
     return MyClass;
 }());
 exports.MyClass = MyClass;
-//// [index.js]
+//// [/src/library-b/index.js]
 "use strict";
 var library_a_1 = require("library-a");
 exports.MyClass2 = library_a_1.MyClass;
-//// [app.js]
+//// [/src/app.js]
 "use strict";
 var x;
 var y;
 x = y;
 y = x;
+/*
+# To reproduce in a real project:
+
+mkdir src; cd src
+mkdir library-a
+echo 'export class MyClass { private x: number; }' > library-a/index.ts
+
+mkdir library-b; cd library-b
+echo 'import {MyClass} from "library-a"; export { MyClass as MyClass2 }' > index.ts
+mkdir node_modules; cd node_modules
+
+ln -s ../../library-a library-a # Linux
+# Windows: open command prompt as administrator and run: mklink /D library-a ..\..\library-a
+
+cd ../.. # back to src
+echo 'import { MyClass } from "./library-a"; import { MyClass2 } from "./library-b"; let x: MyClass; let y: MyClass2; x = y; y = x;' > app.ts
+tsc app.ts # Should write to library-a/index.js, library-b/index.js, and app.js
+*/
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks.symbols b/tests/baselines/reference/moduleResolutionWithSymlinks.symbols
index 9e9e3ee8a67..ede12be3555 100644
--- a/tests/baselines/reference/moduleResolutionWithSymlinks.symbols
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks.symbols
@@ -21,11 +21,32 @@ y = x;
 >y : Symbol(y, Decl(app.ts, 4, 3))
 >x : Symbol(x, Decl(app.ts, 3, 3))
 
+/*
+# To reproduce in a real project:
+
+mkdir src; cd src
+mkdir library-a
+echo 'export class MyClass { private x: number; }' > library-a/index.ts
+
+mkdir library-b; cd library-b
+echo 'import {MyClass} from "library-a"; export { MyClass as MyClass2 }' > index.ts
+mkdir node_modules; cd node_modules
+
+ln -s ../../library-a library-a # Linux
+# Windows: open command prompt as administrator and run: mklink /D library-a ..\..\library-a
+
+cd ../.. # back to src
+echo 'import { MyClass } from "./library-a"; import { MyClass2 } from "./library-b"; let x: MyClass; let y: MyClass2; x = y; y = x;' > app.ts
+tsc app.ts # Should write to library-a/index.js, library-b/index.js, and app.js
+*/
+
 === /src/library-a/index.ts ===
+// When symlinked files are in node_modules, they are resolved with realpath;
+// so a linked file does not create a duplicate SourceFile of the real one.
 
 export class MyClass { private x: number; }
 >MyClass : Symbol(MyClass, Decl(index.ts, 0, 0))
->x : Symbol(MyClass.x, Decl(index.ts, 1, 22))
+>x : Symbol(MyClass.x, Decl(index.ts, 3, 22))
 
 === /src/library-b/index.ts ===
 import {MyClass} from "library-a";
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks.trace.json b/tests/baselines/reference/moduleResolutionWithSymlinks.trace.json
index 7f1c2890180..bd23ccdb366 100644
--- a/tests/baselines/reference/moduleResolutionWithSymlinks.trace.json
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks.trace.json
@@ -7,7 +7,6 @@
     "File '/src/library-a.d.ts' does not exist.",
     "File '/src/library-a/package.json' does not exist.",
     "File '/src/library-a/index.ts' exist - use it as a name resolution result.",
-    "Resolving real path for '/src/library-a/index.ts', result '/src/library-a/index.ts'",
     "======== Module name './library-a' was successfully resolved to '/src/library-a/index.ts'. ========",
     "======== Resolving module './library-b' from '/src/app.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
@@ -17,7 +16,6 @@
     "File '/src/library-b.d.ts' does not exist.",
     "File '/src/library-b/package.json' does not exist.",
     "File '/src/library-b/index.ts' exist - use it as a name resolution result.",
-    "Resolving real path for '/src/library-b/index.ts', result '/src/library-b/index.ts'",
     "======== Module name './library-b' was successfully resolved to '/src/library-b/index.ts'. ========",
     "======== Resolving module 'library-a' from '/src/library-b/index.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks.types b/tests/baselines/reference/moduleResolutionWithSymlinks.types
index 3c0ccd168dd..04781dcac0f 100644
--- a/tests/baselines/reference/moduleResolutionWithSymlinks.types
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks.types
@@ -23,7 +23,28 @@ y = x;
 >y : MyClass
 >x : MyClass
 
+/*
+# To reproduce in a real project:
+
+mkdir src; cd src
+mkdir library-a
+echo 'export class MyClass { private x: number; }' > library-a/index.ts
+
+mkdir library-b; cd library-b
+echo 'import {MyClass} from "library-a"; export { MyClass as MyClass2 }' > index.ts
+mkdir node_modules; cd node_modules
+
+ln -s ../../library-a library-a # Linux
+# Windows: open command prompt as administrator and run: mklink /D library-a ..\..\library-a
+
+cd ../.. # back to src
+echo 'import { MyClass } from "./library-a"; import { MyClass2 } from "./library-b"; let x: MyClass; let y: MyClass2; x = y; y = x;' > app.ts
+tsc app.ts # Should write to library-a/index.js, library-b/index.js, and app.js
+*/
+
 === /src/library-a/index.ts ===
+// When symlinked files are in node_modules, they are resolved with realpath;
+// so a linked file does not create a duplicate SourceFile of the real one.
 
 export class MyClass { private x: number; }
 >MyClass : MyClass
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js b/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js
new file mode 100644
index 00000000000..a927a496a96
--- /dev/null
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js
@@ -0,0 +1,32 @@
+//// [tests/cases/compiler/moduleResolutionWithSymlinks_notInNodeModules.ts] ////
+
+//// [abc.ts]
+// When symlinked files are not in node_modules, realpath is not used.
+// A symlink file acts like the real thing. So, 2 symlinks act like 2 different files.
+// See GH#10364. 
+
+export const x = 0;
+
+//// [app.ts]
+import { x } from "./shared/abc";
+import { x as x2 } from "./shared2/abc";
+x + x2;
+
+
+//// [/src/bin/shared/abc.js]
+// When symlinked files are not in node_modules, realpath is not used.
+// A symlink file acts like the real thing. So, 2 symlinks act like 2 different files.
+// See GH#10364. 
+"use strict";
+exports.x = 0;
+//// [/src/bin/shared2/abc.js]
+// When symlinked files are not in node_modules, realpath is not used.
+// A symlink file acts like the real thing. So, 2 symlinks act like 2 different files.
+// See GH#10364. 
+"use strict";
+exports.x = 0;
+//// [/src/bin/app.js]
+"use strict";
+var abc_1 = require("./shared/abc");
+var abc_2 = require("./shared2/abc");
+abc_1.x + abc_2.x;
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.symbols b/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.symbols
new file mode 100644
index 00000000000..b496e1b76ac
--- /dev/null
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.symbols
@@ -0,0 +1,12 @@
+=== /src/app.ts ===
+import { x } from "./shared/abc";
+>x : Symbol(x, Decl(app.ts, 0, 8))
+
+import { x as x2 } from "./shared2/abc";
+>x : Symbol(x2, Decl(app.ts, 1, 8))
+>x2 : Symbol(x2, Decl(app.ts, 1, 8))
+
+x + x2;
+>x : Symbol(x, Decl(app.ts, 0, 8))
+>x2 : Symbol(x2, Decl(app.ts, 1, 8))
+
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.trace.json b/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.trace.json
new file mode 100644
index 00000000000..c2f0c04d07f
--- /dev/null
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.trace.json
@@ -0,0 +1,12 @@
+[
+    "======== Resolving module './shared/abc' from '/src/app.ts'. ========",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "Loading module as file / folder, candidate module location '/src/shared/abc'.",
+    "File '/src/shared/abc.ts' exist - use it as a name resolution result.",
+    "======== Module name './shared/abc' was successfully resolved to '/src/shared/abc.ts'. ========",
+    "======== Resolving module './shared2/abc' from '/src/app.ts'. ========",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "Loading module as file / folder, candidate module location '/src/shared2/abc'.",
+    "File '/src/shared2/abc.ts' exist - use it as a name resolution result.",
+    "======== Module name './shared2/abc' was successfully resolved to '/src/shared2/abc.ts'. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.types b/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.types
new file mode 100644
index 00000000000..0d7fe290334
--- /dev/null
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.types
@@ -0,0 +1,13 @@
+=== /src/app.ts ===
+import { x } from "./shared/abc";
+>x : 0
+
+import { x as x2 } from "./shared2/abc";
+>x : 0
+>x2 : 0
+
+x + x2;
+>x + x2 : number
+>x : 0
+>x2 : 0
+
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js b/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js
new file mode 100644
index 00000000000..312bcf4c174
--- /dev/null
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js
@@ -0,0 +1,40 @@
+//// [tests/cases/compiler/moduleResolutionWithSymlinks_withOutDir.ts] ////
+
+//// [index.ts]
+// Same as moduleResolutionWithSymlinks.ts, but with outDir
+
+export class MyClass { private x: number; }
+
+//// [index.ts]
+import {MyClass} from "library-a";
+export { MyClass as MyClass2 }
+
+//// [app.ts]
+import { MyClass } from "./library-a";
+import { MyClass2 } from "./library-b";
+
+let x: MyClass;
+let y: MyClass2;
+x = y;
+y = x;
+
+
+//// [/src/bin/library-a/index.js]
+// Same as moduleResolutionWithSymlinks.ts, but with outDir
+"use strict";
+var MyClass = (function () {
+    function MyClass() {
+    }
+    return MyClass;
+}());
+exports.MyClass = MyClass;
+//// [/src/bin/library-b/index.js]
+"use strict";
+var library_a_1 = require("library-a");
+exports.MyClass2 = library_a_1.MyClass;
+//// [/src/bin/app.js]
+"use strict";
+var x;
+var y;
+x = y;
+y = x;
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.symbols b/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.symbols
new file mode 100644
index 00000000000..3e7598815de
--- /dev/null
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.symbols
@@ -0,0 +1,38 @@
+=== /src/app.ts ===
+import { MyClass } from "./library-a";
+>MyClass : Symbol(MyClass, Decl(app.ts, 0, 8))
+
+import { MyClass2 } from "./library-b";
+>MyClass2 : Symbol(MyClass2, Decl(app.ts, 1, 8))
+
+let x: MyClass;
+>x : Symbol(x, Decl(app.ts, 3, 3))
+>MyClass : Symbol(MyClass, Decl(app.ts, 0, 8))
+
+let y: MyClass2;
+>y : Symbol(y, Decl(app.ts, 4, 3))
+>MyClass2 : Symbol(MyClass2, Decl(app.ts, 1, 8))
+
+x = y;
+>x : Symbol(x, Decl(app.ts, 3, 3))
+>y : Symbol(y, Decl(app.ts, 4, 3))
+
+y = x;
+>y : Symbol(y, Decl(app.ts, 4, 3))
+>x : Symbol(x, Decl(app.ts, 3, 3))
+
+=== /src/library-a/index.ts ===
+// Same as moduleResolutionWithSymlinks.ts, but with outDir
+
+export class MyClass { private x: number; }
+>MyClass : Symbol(MyClass, Decl(index.ts, 0, 0))
+>x : Symbol(MyClass.x, Decl(index.ts, 2, 22))
+
+=== /src/library-b/index.ts ===
+import {MyClass} from "library-a";
+>MyClass : Symbol(MyClass, Decl(index.ts, 0, 8))
+
+export { MyClass as MyClass2 }
+>MyClass : Symbol(MyClass2, Decl(index.ts, 1, 8))
+>MyClass2 : Symbol(MyClass2, Decl(index.ts, 1, 8))
+
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.trace.json b/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.trace.json
new file mode 100644
index 00000000000..bd23ccdb366
--- /dev/null
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.trace.json
@@ -0,0 +1,30 @@
+[
+    "======== Resolving module './library-a' from '/src/app.ts'. ========",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "Loading module as file / folder, candidate module location '/src/library-a'.",
+    "File '/src/library-a.ts' does not exist.",
+    "File '/src/library-a.tsx' does not exist.",
+    "File '/src/library-a.d.ts' does not exist.",
+    "File '/src/library-a/package.json' does not exist.",
+    "File '/src/library-a/index.ts' exist - use it as a name resolution result.",
+    "======== Module name './library-a' was successfully resolved to '/src/library-a/index.ts'. ========",
+    "======== Resolving module './library-b' from '/src/app.ts'. ========",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "Loading module as file / folder, candidate module location '/src/library-b'.",
+    "File '/src/library-b.ts' does not exist.",
+    "File '/src/library-b.tsx' does not exist.",
+    "File '/src/library-b.d.ts' does not exist.",
+    "File '/src/library-b/package.json' does not exist.",
+    "File '/src/library-b/index.ts' exist - use it as a name resolution result.",
+    "======== Module name './library-b' was successfully resolved to '/src/library-b/index.ts'. ========",
+    "======== Resolving module 'library-a' from '/src/library-b/index.ts'. ========",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "Loading module 'library-a' from 'node_modules' folder.",
+    "File '/src/library-b/node_modules/library-a.ts' does not exist.",
+    "File '/src/library-b/node_modules/library-a.tsx' does not exist.",
+    "File '/src/library-b/node_modules/library-a.d.ts' does not exist.",
+    "File '/src/library-b/node_modules/library-a/package.json' does not exist.",
+    "File '/src/library-b/node_modules/library-a/index.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/src/library-b/node_modules/library-a/index.ts', result '/src/library-a/index.ts'",
+    "======== Module name 'library-a' was successfully resolved to '/src/library-a/index.ts'. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.types b/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.types
new file mode 100644
index 00000000000..35fa2167920
--- /dev/null
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.types
@@ -0,0 +1,40 @@
+=== /src/app.ts ===
+import { MyClass } from "./library-a";
+>MyClass : typeof MyClass
+
+import { MyClass2 } from "./library-b";
+>MyClass2 : typeof MyClass
+
+let x: MyClass;
+>x : MyClass
+>MyClass : MyClass
+
+let y: MyClass2;
+>y : MyClass
+>MyClass2 : MyClass
+
+x = y;
+>x = y : MyClass
+>x : MyClass
+>y : MyClass
+
+y = x;
+>y = x : MyClass
+>y : MyClass
+>x : MyClass
+
+=== /src/library-a/index.ts ===
+// Same as moduleResolutionWithSymlinks.ts, but with outDir
+
+export class MyClass { private x: number; }
+>MyClass : MyClass
+>x : number
+
+=== /src/library-b/index.ts ===
+import {MyClass} from "library-a";
+>MyClass : typeof MyClass
+
+export { MyClass as MyClass2 }
+>MyClass : typeof MyClass
+>MyClass2 : typeof MyClass
+
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_node.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution3_node.trace.json
index ab7210d7d02..12a32edede2 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution3_node.trace.json
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_node.trace.json
@@ -5,13 +5,11 @@
     "Resolving module name 'folder2/file2' relative to base url 'c:/root' - 'c:/root/folder2/file2'.",
     "Loading module as file / folder, candidate module location 'c:/root/folder2/file2'.",
     "File 'c:/root/folder2/file2.ts' exist - use it as a name resolution result.",
-    "Resolving real path for 'c:/root/folder2/file2.ts', result 'c:/root/folder2/file2.ts'",
     "======== Module name 'folder2/file2' was successfully resolved to 'c:/root/folder2/file2.ts'. ========",
     "======== Resolving module './file3' from 'c:/root/folder2/file2.ts'. ========",
     "Explicitly specified module resolution kind: 'NodeJs'.",
     "Loading module as file / folder, candidate module location 'c:/root/folder2/file3'.",
     "File 'c:/root/folder2/file3.ts' exist - use it as a name resolution result.",
-    "Resolving real path for 'c:/root/folder2/file3.ts', result 'c:/root/folder2/file3.ts'",
     "======== Module name './file3' was successfully resolved to 'c:/root/folder2/file3.ts'. ========",
     "======== Resolving module 'file4' from 'c:/root/folder2/file2.ts'. ========",
     "Explicitly specified module resolution kind: 'NodeJs'.",
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_node.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution4_node.trace.json
index ab7210d7d02..12a32edede2 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution4_node.trace.json
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_node.trace.json
@@ -5,13 +5,11 @@
     "Resolving module name 'folder2/file2' relative to base url 'c:/root' - 'c:/root/folder2/file2'.",
     "Loading module as file / folder, candidate module location 'c:/root/folder2/file2'.",
     "File 'c:/root/folder2/file2.ts' exist - use it as a name resolution result.",
-    "Resolving real path for 'c:/root/folder2/file2.ts', result 'c:/root/folder2/file2.ts'",
     "======== Module name 'folder2/file2' was successfully resolved to 'c:/root/folder2/file2.ts'. ========",
     "======== Resolving module './file3' from 'c:/root/folder2/file2.ts'. ========",
     "Explicitly specified module resolution kind: 'NodeJs'.",
     "Loading module as file / folder, candidate module location 'c:/root/folder2/file3'.",
     "File 'c:/root/folder2/file3.ts' exist - use it as a name resolution result.",
-    "Resolving real path for 'c:/root/folder2/file3.ts', result 'c:/root/folder2/file3.ts'",
     "======== Module name './file3' was successfully resolved to 'c:/root/folder2/file3.ts'. ========",
     "======== Resolving module 'file4' from 'c:/root/folder2/file2.ts'. ========",
     "Explicitly specified module resolution kind: 'NodeJs'.",
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution5_node.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.trace.json
index 2efeefa24e5..f883b2afe36 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution5_node.trace.json
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.trace.json
@@ -7,7 +7,6 @@
     "Trying substitution '*', candidate module location: 'folder2/file1'.",
     "Loading module as file / folder, candidate module location 'c:/root/folder2/file1'.",
     "File 'c:/root/folder2/file1.ts' exist - use it as a name resolution result.",
-    "Resolving real path for 'c:/root/folder2/file1.ts', result 'c:/root/folder2/file1.ts'",
     "======== Module name 'folder2/file1' was successfully resolved to 'c:/root/folder2/file1.ts'. ========",
     "======== Resolving module 'folder3/file2' from 'c:/root/folder1/file1.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
@@ -26,7 +25,6 @@
     "Trying substitution 'generated/*', candidate module location: 'generated/folder3/file2'.",
     "Loading module as file / folder, candidate module location 'c:/root/generated/folder3/file2'.",
     "File 'c:/root/generated/folder3/file2.ts' exist - use it as a name resolution result.",
-    "Resolving real path for 'c:/root/generated/folder3/file2.ts', result 'c:/root/generated/folder3/file2.ts'",
     "======== Module name 'folder3/file2' was successfully resolved to 'c:/root/generated/folder3/file2.ts'. ========",
     "======== Resolving module 'components/file3' from 'c:/root/folder1/file1.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
@@ -42,7 +40,6 @@
     "File 'c:/root/shared/components/file3/index.ts' does not exist.",
     "File 'c:/root/shared/components/file3/index.tsx' does not exist.",
     "File 'c:/root/shared/components/file3/index.d.ts' exist - use it as a name resolution result.",
-    "Resolving real path for 'c:/root/shared/components/file3/index.d.ts', result 'c:/root/shared/components/file3/index.d.ts'",
     "======== Module name 'components/file3' was successfully resolved to 'c:/root/shared/components/file3/index.d.ts'. ========",
     "======== Resolving module 'file4' from 'c:/root/folder1/file1.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6_node.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution6_node.trace.json
index 28e51a11915..7c5e76a2847 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution6_node.trace.json
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution6_node.trace.json
@@ -18,7 +18,6 @@
     "Loading 'project/file3' from the root dir 'c:/root/generated/src', candidate location 'c:/root/generated/src/project/file3'",
     "Loading module as file / folder, candidate module location 'c:/root/generated/src/project/file3'.",
     "File 'c:/root/generated/src/project/file3.ts' exist - use it as a name resolution result.",
-    "Resolving real path for 'c:/root/generated/src/project/file3.ts', result 'c:/root/generated/src/project/file3.ts'",
     "======== Module name './project/file3' was successfully resolved to 'c:/root/generated/src/project/file3.ts'. ========",
     "======== Resolving module '../file2' from 'c:/root/generated/src/project/file3.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
@@ -45,6 +44,5 @@
     "File 'c:/root/src/file2/index.ts' does not exist.",
     "File 'c:/root/src/file2/index.tsx' does not exist.",
     "File 'c:/root/src/file2/index.d.ts' exist - use it as a name resolution result.",
-    "Resolving real path for 'c:/root/src/file2/index.d.ts', result 'c:/root/src/file2/index.d.ts'",
     "======== Module name '../file2' was successfully resolved to 'c:/root/src/file2/index.d.ts'. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_node.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution7_node.trace.json
index 48633c85e3b..24139361b0b 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution7_node.trace.json
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_node.trace.json
@@ -18,7 +18,6 @@
     "Loading 'project/file2' from the root dir 'c:/root/generated/src', candidate location 'c:/root/generated/src/project/file2'",
     "Loading module as file / folder, candidate module location 'c:/root/generated/src/project/file2'.",
     "File 'c:/root/generated/src/project/file2.ts' exist - use it as a name resolution result.",
-    "Resolving real path for 'c:/root/generated/src/project/file2.ts', result 'c:/root/generated/src/project/file2.ts'",
     "======== Module name './project/file2' was successfully resolved to 'c:/root/generated/src/project/file2.ts'. ========",
     "======== Resolving module 'module3' from 'c:/root/src/file1.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
@@ -100,7 +99,6 @@
     "File 'c:/shared/module1/index.ts' does not exist.",
     "File 'c:/shared/module1/index.tsx' does not exist.",
     "File 'c:/shared/module1/index.d.ts' exist - use it as a name resolution result.",
-    "Resolving real path for 'c:/shared/module1/index.d.ts', result 'c:/shared/module1/index.d.ts'",
     "======== Module name 'module1' was successfully resolved to 'c:/shared/module1/index.d.ts'. ========",
     "======== Resolving module 'templates/module2' from 'c:/root/generated/src/project/file2.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
@@ -110,7 +108,6 @@
     "Trying substitution 'generated/src/templates/*', candidate module location: 'generated/src/templates/module2'.",
     "Loading module as file / folder, candidate module location 'c:/root/generated/src/templates/module2'.",
     "File 'c:/root/generated/src/templates/module2.ts' exist - use it as a name resolution result.",
-    "Resolving real path for 'c:/root/generated/src/templates/module2.ts', result 'c:/root/generated/src/templates/module2.ts'",
     "======== Module name 'templates/module2' was successfully resolved to 'c:/root/generated/src/templates/module2.ts'. ========",
     "======== Resolving module '../file3' from 'c:/root/generated/src/project/file2.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
@@ -137,6 +134,5 @@
     "File 'c:/root/src/file3/index.ts' does not exist.",
     "File 'c:/root/src/file3/index.tsx' does not exist.",
     "File 'c:/root/src/file3/index.d.ts' exist - use it as a name resolution result.",
-    "Resolving real path for 'c:/root/src/file3/index.d.ts', result 'c:/root/src/file3/index.d.ts'",
     "======== Module name '../file3' was successfully resolved to 'c:/root/src/file3/index.d.ts'. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/typeReferenceDirectives10.trace.json b/tests/baselines/reference/typeReferenceDirectives10.trace.json
index 61341afdab3..2dfd1fe0939 100644
--- a/tests/baselines/reference/typeReferenceDirectives10.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives10.trace.json
@@ -10,7 +10,6 @@
     "File '/ref.ts' does not exist.",
     "File '/ref.tsx' does not exist.",
     "File '/ref.d.ts' exist - use it as a name resolution result.",
-    "Resolving real path for '/ref.d.ts', result '/ref.d.ts'",
     "======== Module name './ref' was successfully resolved to '/ref.d.ts'. ========",
     "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
diff --git a/tests/baselines/reference/typeReferenceDirectives11.trace.json b/tests/baselines/reference/typeReferenceDirectives11.trace.json
index 37fa7900a7c..862c941079a 100644
--- a/tests/baselines/reference/typeReferenceDirectives11.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives11.trace.json
@@ -3,7 +3,6 @@
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module as file / folder, candidate module location '/mod1'.",
     "File '/mod1.ts' exist - use it as a name resolution result.",
-    "Resolving real path for '/mod1.ts', result '/mod1.ts'",
     "======== Module name './mod1' was successfully resolved to '/mod1.ts'. ========",
     "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
diff --git a/tests/baselines/reference/typeReferenceDirectives12.trace.json b/tests/baselines/reference/typeReferenceDirectives12.trace.json
index 1024b0cdef3..627ad13588a 100644
--- a/tests/baselines/reference/typeReferenceDirectives12.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives12.trace.json
@@ -3,13 +3,11 @@
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module as file / folder, candidate module location '/main'.",
     "File '/main.ts' exist - use it as a name resolution result.",
-    "Resolving real path for '/main.ts', result '/main.ts'",
     "======== Module name './main' was successfully resolved to '/main.ts'. ========",
     "======== Resolving module './mod1' from '/mod2.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module as file / folder, candidate module location '/mod1'.",
     "File '/mod1.ts' exist - use it as a name resolution result.",
-    "Resolving real path for '/mod1.ts', result '/mod1.ts'",
     "======== Module name './mod1' was successfully resolved to '/mod1.ts'. ========",
     "======== Resolving type reference directive 'lib', containing file '/mod1.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
@@ -20,7 +18,6 @@
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module as file / folder, candidate module location '/main'.",
     "File '/main.ts' exist - use it as a name resolution result.",
-    "Resolving real path for '/main.ts', result '/main.ts'",
     "======== Module name './main' was successfully resolved to '/main.ts'. ========",
     "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
diff --git a/tests/baselines/reference/typeReferenceDirectives13.trace.json b/tests/baselines/reference/typeReferenceDirectives13.trace.json
index 61341afdab3..2dfd1fe0939 100644
--- a/tests/baselines/reference/typeReferenceDirectives13.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives13.trace.json
@@ -10,7 +10,6 @@
     "File '/ref.ts' does not exist.",
     "File '/ref.tsx' does not exist.",
     "File '/ref.d.ts' exist - use it as a name resolution result.",
-    "Resolving real path for '/ref.d.ts', result '/ref.d.ts'",
     "======== Module name './ref' was successfully resolved to '/ref.d.ts'. ========",
     "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
diff --git a/tests/baselines/reference/typeReferenceDirectives5.trace.json b/tests/baselines/reference/typeReferenceDirectives5.trace.json
index 61341afdab3..2dfd1fe0939 100644
--- a/tests/baselines/reference/typeReferenceDirectives5.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives5.trace.json
@@ -10,7 +10,6 @@
     "File '/ref.ts' does not exist.",
     "File '/ref.tsx' does not exist.",
     "File '/ref.d.ts' exist - use it as a name resolution result.",
-    "Resolving real path for '/ref.d.ts', result '/ref.d.ts'",
     "======== Module name './ref' was successfully resolved to '/ref.d.ts'. ========",
     "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
diff --git a/tests/baselines/reference/typeReferenceDirectives8.trace.json b/tests/baselines/reference/typeReferenceDirectives8.trace.json
index 37fa7900a7c..862c941079a 100644
--- a/tests/baselines/reference/typeReferenceDirectives8.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives8.trace.json
@@ -3,7 +3,6 @@
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module as file / folder, candidate module location '/mod1'.",
     "File '/mod1.ts' exist - use it as a name resolution result.",
-    "Resolving real path for '/mod1.ts', result '/mod1.ts'",
     "======== Module name './mod1' was successfully resolved to '/mod1.ts'. ========",
     "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
diff --git a/tests/baselines/reference/typeReferenceDirectives9.trace.json b/tests/baselines/reference/typeReferenceDirectives9.trace.json
index 1024b0cdef3..627ad13588a 100644
--- a/tests/baselines/reference/typeReferenceDirectives9.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives9.trace.json
@@ -3,13 +3,11 @@
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module as file / folder, candidate module location '/main'.",
     "File '/main.ts' exist - use it as a name resolution result.",
-    "Resolving real path for '/main.ts', result '/main.ts'",
     "======== Module name './main' was successfully resolved to '/main.ts'. ========",
     "======== Resolving module './mod1' from '/mod2.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module as file / folder, candidate module location '/mod1'.",
     "File '/mod1.ts' exist - use it as a name resolution result.",
-    "Resolving real path for '/mod1.ts', result '/mod1.ts'",
     "======== Module name './mod1' was successfully resolved to '/mod1.ts'. ========",
     "======== Resolving type reference directive 'lib', containing file '/mod1.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
@@ -20,7 +18,6 @@
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module as file / folder, candidate module location '/main'.",
     "File '/main.ts' exist - use it as a name resolution result.",
-    "Resolving real path for '/main.ts', result '/main.ts'",
     "======== Module name './main' was successfully resolved to '/main.ts'. ========",
     "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
diff --git a/tests/cases/compiler/moduleResolutionWithSymlinks.ts b/tests/cases/compiler/moduleResolutionWithSymlinks.ts
index 4819b68ffc6..069f11f85da 100644
--- a/tests/cases/compiler/moduleResolutionWithSymlinks.ts
+++ b/tests/cases/compiler/moduleResolutionWithSymlinks.ts
@@ -1,6 +1,8 @@
-// @module: commonjs
+// When symlinked files are in node_modules, they are resolved with realpath;
+// so a linked file does not create a duplicate SourceFile of the real one.
 // @noImplicitReferences: true
 // @traceResolution: true
+// @fullEmitPaths: true
 
 // @filename: /src/library-a/index.ts
 // @symlink: /src/library-b/node_modules/library-a/index.ts
@@ -17,4 +19,23 @@ import { MyClass2 } from "./library-b";
 let x: MyClass;
 let y: MyClass2;
 x = y;
-y = x;
\ No newline at end of file
+y = x;
+
+/*
+# To reproduce in a real project:
+
+mkdir src; cd src
+mkdir library-a
+echo 'export class MyClass { private x: number; }' > library-a/index.ts
+
+mkdir library-b; cd library-b
+echo 'import {MyClass} from "library-a"; export { MyClass as MyClass2 }' > index.ts
+mkdir node_modules; cd node_modules
+
+ln -s ../../library-a library-a # Linux
+# Windows: open command prompt as administrator and run: mklink /D library-a ..\..\library-a
+
+cd ../.. # back to src
+echo 'import { MyClass } from "./library-a"; import { MyClass2 } from "./library-b"; let x: MyClass; let y: MyClass2; x = y; y = x;' > app.ts
+tsc app.ts # Should write to library-a/index.js, library-b/index.js, and app.js
+*/
diff --git a/tests/cases/compiler/moduleResolutionWithSymlinks_notInNodeModules.ts b/tests/cases/compiler/moduleResolutionWithSymlinks_notInNodeModules.ts
new file mode 100644
index 00000000000..f861813942f
--- /dev/null
+++ b/tests/cases/compiler/moduleResolutionWithSymlinks_notInNodeModules.ts
@@ -0,0 +1,40 @@
+// When symlinked files are not in node_modules, realpath is not used.
+// A symlink file acts like the real thing. So, 2 symlinks act like 2 different files.
+// See GH#10364. 
+// @noImplicitReferences: true
+// @traceResolution: true
+// @fullEmitPaths: true
+
+// @filename: /shared/abc.ts
+// @symlink: /src/shared/abc.ts,/src/shared2/abc.ts
+export const x = 0;
+
+// @filename: /src/app.ts
+import { x } from "./shared/abc";
+import { x as x2 } from "./shared2/abc";
+x + x2;
+
+// @filename: /src/tsconfig.json
+{
+    "compilerOptions": {
+        "outDir": "bin"
+    }
+}
+
+/*
+# To reproduce in a real project:
+
+mkdir shared
+echo 'export const x = 0;' > shared/abc.ts
+
+mkdir src; cd src
+echo 'import { x } from "./shared/abc"; import { x as x2 } from "./shared2/abc"; x + x2;' > app.ts
+
+ln -s ../shared ./shared; ln -s ../shared ./shared2 # Linux
+# Windows: Open command prompt as administrator and run: `mklink /D shared ..\shared; mklink /D shared2 ..\shared`
+
+echo '{ "compilerOptions": { "outDir": "bin" } }' > tsconfig.json
+node ../../../../TypeScript/built/local/tsc.js
+
+# Should create `bin/app.js`, `bin/shared/abc.js`, and `bin/shared2/abc.js`
+*/
diff --git a/tests/cases/compiler/moduleResolutionWithSymlinks_withOutDir.ts b/tests/cases/compiler/moduleResolutionWithSymlinks_withOutDir.ts
new file mode 100644
index 00000000000..c17e9091de4
--- /dev/null
+++ b/tests/cases/compiler/moduleResolutionWithSymlinks_withOutDir.ts
@@ -0,0 +1,22 @@
+// Same as moduleResolutionWithSymlinks.ts, but with outDir
+// @noImplicitReferences: true
+// @traceResolution: true
+// @fullEmitPaths: true
+// @outDir: /src/bin
+
+// @filename: /src/library-a/index.ts
+// @symlink: /src/library-b/node_modules/library-a/index.ts
+export class MyClass { private x: number; }
+
+// @filename: /src/library-b/index.ts
+import {MyClass} from "library-a";
+export { MyClass as MyClass2 }
+
+// @filename: /src/app.ts
+import { MyClass } from "./library-a";
+import { MyClass2 } from "./library-b";
+
+let x: MyClass;
+let y: MyClass2;
+x = y;
+y = x;

From a077fd104aa6be0237bc6dfe00f57528c6fb89e1 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Thu, 3 Nov 2016 09:39:58 -0700
Subject: [PATCH 088/421] Remove spread type tests from spread tests

---
 tests/baselines/reference/objectSpread.js     |  47 +---
 .../baselines/reference/objectSpread.symbols  | 223 +++++-------------
 tests/baselines/reference/objectSpread.types  | 140 +----------
 .../reference/objectSpreadGeneric.errors.txt  | 148 ------------
 .../reference/objectSpreadGeneric.js          | 141 -----------
 .../objectSpreadIndexSignature.errors.txt     |  35 ---
 .../reference/objectSpreadIndexSignature.js   |  56 ++---
 .../objectSpreadIndexSignature.symbols        |  42 ++++
 .../objectSpreadIndexSignature.types          |  52 ++++
 .../reference/objectSpreadNegative.errors.txt | 141 ++++++-----
 .../reference/objectSpreadNegative.js         |  86 +++----
 .../objectSpreadNegativeParse.errors.txt      |  14 +-
 .../types/spread/interfaceSpread.ts           |   8 -
 .../conformance/types/spread/objectSpread.ts  |  23 +-
 .../types/spread/objectSpreadGeneric.ts       |  72 ------
 .../spread/objectSpreadIndexSignature.ts      |  25 +-
 .../types/spread/objectSpreadInference.ts     |  19 --
 .../types/spread/objectSpreadIntersection.ts  |  36 ---
 .../types/spread/objectSpreadNegative.ts      |  47 ++--
 .../types/spread/objectSpreadScenarios.ts     |  17 --
 .../types/spread/objectSpreadUnion.ts         |  23 --
 .../fourslash/findAllRefsForObjectSpread.ts   |   4 +-
 .../fourslash/goToDefinitionObjectSpread.ts   |   4 +-
 tests/cases/fourslash/renameObjectSpread.ts   |   4 +-
 24 files changed, 350 insertions(+), 1057 deletions(-)
 delete mode 100644 tests/baselines/reference/objectSpreadGeneric.errors.txt
 delete mode 100644 tests/baselines/reference/objectSpreadGeneric.js
 delete mode 100644 tests/baselines/reference/objectSpreadIndexSignature.errors.txt
 create mode 100644 tests/baselines/reference/objectSpreadIndexSignature.symbols
 create mode 100644 tests/baselines/reference/objectSpreadIndexSignature.types
 delete mode 100644 tests/cases/conformance/types/spread/interfaceSpread.ts
 delete mode 100644 tests/cases/conformance/types/spread/objectSpreadGeneric.ts
 delete mode 100644 tests/cases/conformance/types/spread/objectSpreadInference.ts
 delete mode 100644 tests/cases/conformance/types/spread/objectSpreadIntersection.ts
 delete mode 100644 tests/cases/conformance/types/spread/objectSpreadScenarios.ts
 delete mode 100644 tests/cases/conformance/types/spread/objectSpreadUnion.ts

diff --git a/tests/baselines/reference/objectSpread.js b/tests/baselines/reference/objectSpread.js
index 23729d4cd6f..c19ead478cb 100644
--- a/tests/baselines/reference/objectSpread.js
+++ b/tests/baselines/reference/objectSpread.js
@@ -35,13 +35,8 @@ let getter: { a: number, c: number } =
     { ...op, c: 7 }
 getter.a = 12;
 
-// null, undefined, functions and primitives result in { }
-let spreadNull = { ...null };
-let spreadUndefind = { ...undefined };
-let spreadNum = { ...12 };
-let spreadBool = { ...false };
+// functions result in { }
 let spreadFunc = { ...(function () { }) };
-let spreadStr = { ...'foo' };
 
 // methods are not enumerable
 class C { p = 1; m() { } }
@@ -80,22 +75,6 @@ let computedAfter: { a: number, b: string, "at the end": number } =
 let a = 12;
 let shortCutted: { a: number, b: string } = { ...o, a }
 
-// generics
-function f<T, U>(t: T, u: U): { ...T, ...U, id: string } {
-    return { ...t, ...u, id: 'id' };
-}
-let exclusive: { id: string, a: number, b: string, c: string, d: boolean } =
-    f({ a: 1, b: 'yes' }, { c: 'no', d: false })
-let overlap: { id: string, a: number, b: string } =
-    f({ a: 1 }, { a: 2, b: 'extra' })
-let overlapConflict: { id:string, a: string } =
-    f({ a: 1 }, { a: 'mismatch' })
-let overwriteId: { id: string, a: number, c: number, d: string } =
-    f({ a: 1, id: true }, { c: 1, d: 'no' })
-
-class D { m() { }; q = 2; }
-let classesAreWrong: { id: string, ...C, ...D } =
-    f(new C(), new D())
 
 
 //// [objectSpread.js]
@@ -128,13 +107,8 @@ var propertyNested = __assign({ a: __assign({}, o) });
 var op = { get a() { return 6; } };
 var getter = __assign({}, op, { c: 7 });
 getter.a = 12;
-// null, undefined, functions and primitives result in { }
-var spreadNull = __assign({}, null);
-var spreadUndefind = __assign({}, undefined);
-var spreadNum = __assign({}, 12);
-var spreadBool = __assign({}, false);
+// functions result in { }
 var spreadFunc = __assign({}, (function () { }));
-var spreadStr = __assign({}, 'foo');
 // methods are not enumerable
 var C = (function () {
     function C() {
@@ -167,21 +141,4 @@ var computedAfter = __assign({}, o, (_c = { b: 'yeah' }, _c['at the end'] = 14,
 // shortcut syntax
 var a = 12;
 var shortCutted = __assign({}, o, { a: a });
-// generics
-function f(t, u) {
-    return __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' });
-var overlapConflict = f({ a: 1 }, { a: 'mismatch' });
-var overwriteId = f({ a: 1, id: true }, { c: 1, d: 'no' });
-var D = (function () {
-    function D() {
-        this.q = 2;
-    }
-    D.prototype.m = function () { };
-    ;
-    return D;
-}());
-var classesAreWrong = f(new C(), new D());
 var _a, _b, _c;
diff --git a/tests/baselines/reference/objectSpread.symbols b/tests/baselines/reference/objectSpread.symbols
index 039be9e0d7d..b95f8273724 100644
--- a/tests/baselines/reference/objectSpread.symbols
+++ b/tests/baselines/reference/objectSpread.symbols
@@ -150,224 +150,127 @@ getter.a = 12;
 >getter : Symbol(getter, Decl(objectSpread.ts, 32, 3))
 >a : Symbol(a, Decl(objectSpread.ts, 32, 13))
 
-// null, undefined, functions and primitives result in { }
-let spreadNull = { ...null };
->spreadNull : Symbol(spreadNull, Decl(objectSpread.ts, 37, 3))
-
-let spreadUndefind = { ...undefined };
->spreadUndefind : Symbol(spreadUndefind, Decl(objectSpread.ts, 38, 3))
-
-let spreadNum = { ...12 };
->spreadNum : Symbol(spreadNum, Decl(objectSpread.ts, 39, 3))
-
-let spreadBool = { ...false };
->spreadBool : Symbol(spreadBool, Decl(objectSpread.ts, 40, 3))
-
+// functions result in { }
 let spreadFunc = { ...(function () { }) };
->spreadFunc : Symbol(spreadFunc, Decl(objectSpread.ts, 41, 3))
-
-let spreadStr = { ...'foo' };
->spreadStr : Symbol(spreadStr, Decl(objectSpread.ts, 42, 3))
+>spreadFunc : Symbol(spreadFunc, Decl(objectSpread.ts, 37, 3))
 
 // methods are not enumerable
 class C { p = 1; m() { } }
->C : Symbol(C, Decl(objectSpread.ts, 42, 29))
->p : Symbol(C.p, Decl(objectSpread.ts, 45, 9))
->m : Symbol(C.m, Decl(objectSpread.ts, 45, 16))
+>C : Symbol(C, Decl(objectSpread.ts, 37, 42))
+>p : Symbol(C.p, Decl(objectSpread.ts, 40, 9))
+>m : Symbol(C.m, Decl(objectSpread.ts, 40, 16))
 
 let c: C = new C()
->c : Symbol(c, Decl(objectSpread.ts, 46, 3))
->C : Symbol(C, Decl(objectSpread.ts, 42, 29))
->C : Symbol(C, Decl(objectSpread.ts, 42, 29))
+>c : Symbol(c, Decl(objectSpread.ts, 41, 3))
+>C : Symbol(C, Decl(objectSpread.ts, 37, 42))
+>C : Symbol(C, Decl(objectSpread.ts, 37, 42))
 
 let spreadC: { p: number } = { ...c }
->spreadC : Symbol(spreadC, Decl(objectSpread.ts, 47, 3))
->p : Symbol(p, Decl(objectSpread.ts, 47, 14))
+>spreadC : Symbol(spreadC, Decl(objectSpread.ts, 42, 3))
+>p : Symbol(p, Decl(objectSpread.ts, 42, 14))
 
 // own methods are enumerable
 let cplus: { p: number, plus(): void } = { ...c, plus() { return this.p + 1; } };
->cplus : Symbol(cplus, Decl(objectSpread.ts, 50, 3))
->p : Symbol(p, Decl(objectSpread.ts, 50, 12))
->plus : Symbol(plus, Decl(objectSpread.ts, 50, 23))
->plus : Symbol(plus, Decl(objectSpread.ts, 50, 48))
+>cplus : Symbol(cplus, Decl(objectSpread.ts, 45, 3))
+>p : Symbol(p, Decl(objectSpread.ts, 45, 12))
+>plus : Symbol(plus, Decl(objectSpread.ts, 45, 23))
+>plus : Symbol(plus, Decl(objectSpread.ts, 45, 48))
 
 cplus.plus();
->cplus.plus : Symbol(plus, Decl(objectSpread.ts, 50, 23))
->cplus : Symbol(cplus, Decl(objectSpread.ts, 50, 3))
->plus : Symbol(plus, Decl(objectSpread.ts, 50, 23))
+>cplus.plus : Symbol(plus, Decl(objectSpread.ts, 45, 23))
+>cplus : Symbol(cplus, Decl(objectSpread.ts, 45, 3))
+>plus : Symbol(plus, Decl(objectSpread.ts, 45, 23))
 
 // new field's type conflicting with existing field is OK
 let changeTypeAfter: { a: string, b: string } =
->changeTypeAfter : Symbol(changeTypeAfter, Decl(objectSpread.ts, 54, 3))
->a : Symbol(a, Decl(objectSpread.ts, 54, 22))
->b : Symbol(b, Decl(objectSpread.ts, 54, 33))
+>changeTypeAfter : Symbol(changeTypeAfter, Decl(objectSpread.ts, 49, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 49, 22))
+>b : Symbol(b, Decl(objectSpread.ts, 49, 33))
 
     { ...o, a: 'wrong type?' }
->a : Symbol(a, Decl(objectSpread.ts, 55, 11))
+>a : Symbol(a, Decl(objectSpread.ts, 50, 11))
 
 let changeTypeBefore: { a: number, b: string } =
->changeTypeBefore : Symbol(changeTypeBefore, Decl(objectSpread.ts, 56, 3))
->a : Symbol(a, Decl(objectSpread.ts, 56, 23))
->b : Symbol(b, Decl(objectSpread.ts, 56, 34))
+>changeTypeBefore : Symbol(changeTypeBefore, Decl(objectSpread.ts, 51, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 51, 23))
+>b : Symbol(b, Decl(objectSpread.ts, 51, 34))
 
     { a: 'wrong type?', ...o };
->a : Symbol(a, Decl(objectSpread.ts, 57, 5))
+>a : Symbol(a, Decl(objectSpread.ts, 52, 5))
 
 let changeTypeBoth: { a: string, b: number } =
->changeTypeBoth : Symbol(changeTypeBoth, Decl(objectSpread.ts, 58, 3))
->a : Symbol(a, Decl(objectSpread.ts, 58, 21))
->b : Symbol(b, Decl(objectSpread.ts, 58, 32))
+>changeTypeBoth : Symbol(changeTypeBoth, Decl(objectSpread.ts, 53, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 53, 21))
+>b : Symbol(b, Decl(objectSpread.ts, 53, 32))
 
     { ...o, ...swap };
 
 // optional
 let definiteBoolean: { sn: boolean };
->definiteBoolean : Symbol(definiteBoolean, Decl(objectSpread.ts, 62, 3))
->sn : Symbol(sn, Decl(objectSpread.ts, 62, 22))
+>definiteBoolean : Symbol(definiteBoolean, Decl(objectSpread.ts, 57, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 57, 22))
 
 let definiteString: { sn: string };
->definiteString : Symbol(definiteString, Decl(objectSpread.ts, 63, 3))
->sn : Symbol(sn, Decl(objectSpread.ts, 63, 21))
+>definiteString : Symbol(definiteString, Decl(objectSpread.ts, 58, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 58, 21))
 
 let optionalString: { sn?: string };
->optionalString : Symbol(optionalString, Decl(objectSpread.ts, 64, 3))
->sn : Symbol(sn, Decl(objectSpread.ts, 64, 21))
+>optionalString : Symbol(optionalString, Decl(objectSpread.ts, 59, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 59, 21))
 
 let optionalNumber: { sn?: number };
->optionalNumber : Symbol(optionalNumber, Decl(objectSpread.ts, 65, 3))
->sn : Symbol(sn, Decl(objectSpread.ts, 65, 21))
+>optionalNumber : Symbol(optionalNumber, Decl(objectSpread.ts, 60, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 60, 21))
 
 let optionalUnionStops: { sn: string | number | boolean } = { ...definiteBoolean, ...definiteString, ...optionalNumber };
->optionalUnionStops : Symbol(optionalUnionStops, Decl(objectSpread.ts, 66, 3))
->sn : Symbol(sn, Decl(objectSpread.ts, 66, 25))
+>optionalUnionStops : Symbol(optionalUnionStops, Decl(objectSpread.ts, 61, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 61, 25))
 
 let optionalUnionDuplicates: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...optionalString, ...optionalNumber };
->optionalUnionDuplicates : Symbol(optionalUnionDuplicates, Decl(objectSpread.ts, 67, 3))
->sn : Symbol(sn, Decl(objectSpread.ts, 67, 30))
+>optionalUnionDuplicates : Symbol(optionalUnionDuplicates, Decl(objectSpread.ts, 62, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 62, 30))
 
 let allOptional: { sn?: string | number } = { ...optionalString, ...optionalNumber };
->allOptional : Symbol(allOptional, Decl(objectSpread.ts, 68, 3))
->sn : Symbol(sn, Decl(objectSpread.ts, 68, 18))
+>allOptional : Symbol(allOptional, Decl(objectSpread.ts, 63, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 63, 18))
 
 // computed property
 let computedFirst: { a: number, b: string, "before everything": number } =
->computedFirst : Symbol(computedFirst, Decl(objectSpread.ts, 71, 3))
->a : Symbol(a, Decl(objectSpread.ts, 71, 20))
->b : Symbol(b, Decl(objectSpread.ts, 71, 31))
+>computedFirst : Symbol(computedFirst, Decl(objectSpread.ts, 66, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 66, 20))
+>b : Symbol(b, Decl(objectSpread.ts, 66, 31))
 
     { ['before everything']: 12, ...o, b: 'yes' }
->'before everything' : Symbol(['before everything'], Decl(objectSpread.ts, 72, 5))
->b : Symbol(b, Decl(objectSpread.ts, 72, 38))
+>'before everything' : Symbol(['before everything'], Decl(objectSpread.ts, 67, 5))
+>b : Symbol(b, Decl(objectSpread.ts, 67, 38))
 
 let computedMiddle: { a: number, b: string, c: boolean, "in the middle": number } =
->computedMiddle : Symbol(computedMiddle, Decl(objectSpread.ts, 73, 3))
->a : Symbol(a, Decl(objectSpread.ts, 73, 21))
->b : Symbol(b, Decl(objectSpread.ts, 73, 32))
->c : Symbol(c, Decl(objectSpread.ts, 73, 43))
+>computedMiddle : Symbol(computedMiddle, Decl(objectSpread.ts, 68, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 68, 21))
+>b : Symbol(b, Decl(objectSpread.ts, 68, 32))
+>c : Symbol(c, Decl(objectSpread.ts, 68, 43))
 
     { ...o, ['in the middle']: 13, b: 'maybe?', ...o2 }
->'in the middle' : Symbol(['in the middle'], Decl(objectSpread.ts, 74, 11))
->b : Symbol(b, Decl(objectSpread.ts, 74, 34))
+>'in the middle' : Symbol(['in the middle'], Decl(objectSpread.ts, 69, 11))
+>b : Symbol(b, Decl(objectSpread.ts, 69, 34))
 
 let computedAfter: { a: number, b: string, "at the end": number } =
->computedAfter : Symbol(computedAfter, Decl(objectSpread.ts, 75, 3))
->a : Symbol(a, Decl(objectSpread.ts, 75, 20))
->b : Symbol(b, Decl(objectSpread.ts, 75, 31))
+>computedAfter : Symbol(computedAfter, Decl(objectSpread.ts, 70, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 70, 20))
+>b : Symbol(b, Decl(objectSpread.ts, 70, 31))
 
     { ...o, b: 'yeah', ['at the end']: 14 }
->b : Symbol(b, Decl(objectSpread.ts, 76, 11))
->'at the end' : Symbol(['at the end'], Decl(objectSpread.ts, 76, 22))
+>b : Symbol(b, Decl(objectSpread.ts, 71, 11))
+>'at the end' : Symbol(['at the end'], Decl(objectSpread.ts, 71, 22))
 
 // shortcut syntax
 let a = 12;
->a : Symbol(a, Decl(objectSpread.ts, 78, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 73, 3))
 
 let shortCutted: { a: number, b: string } = { ...o, a }
->shortCutted : Symbol(shortCutted, Decl(objectSpread.ts, 79, 3))
->a : Symbol(a, Decl(objectSpread.ts, 79, 18))
->b : Symbol(b, Decl(objectSpread.ts, 79, 29))
->a : Symbol(a, Decl(objectSpread.ts, 79, 51))
+>shortCutted : Symbol(shortCutted, Decl(objectSpread.ts, 74, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 74, 18))
+>b : Symbol(b, Decl(objectSpread.ts, 74, 29))
+>a : Symbol(a, Decl(objectSpread.ts, 74, 51))
 
-// generics
-function f<T, U>(t: T, u: U): { ...T, ...U, id: string } {
->f : Symbol(f, Decl(objectSpread.ts, 79, 55))
->T : Symbol(T, Decl(objectSpread.ts, 82, 11))
->U : Symbol(U, Decl(objectSpread.ts, 82, 13))
->t : Symbol(t, Decl(objectSpread.ts, 82, 17))
->T : Symbol(T, Decl(objectSpread.ts, 82, 11))
->u : Symbol(u, Decl(objectSpread.ts, 82, 22))
->U : Symbol(U, Decl(objectSpread.ts, 82, 13))
->T : Symbol(T, Decl(objectSpread.ts, 82, 11))
->U : Symbol(U, Decl(objectSpread.ts, 82, 13))
->id : Symbol(id, Decl(objectSpread.ts, 82, 43))
-
-    return { ...t, ...u, id: 'id' };
->id : Symbol(id, Decl(objectSpread.ts, 83, 24))
-}
-let exclusive: { id: string, a: number, b: string, c: string, d: boolean } =
->exclusive : Symbol(exclusive, Decl(objectSpread.ts, 85, 3))
->id : Symbol(id, Decl(objectSpread.ts, 85, 16))
->a : Symbol(a, Decl(objectSpread.ts, 85, 28))
->b : Symbol(b, Decl(objectSpread.ts, 85, 39))
->c : Symbol(c, Decl(objectSpread.ts, 85, 50))
->d : Symbol(d, Decl(objectSpread.ts, 85, 61))
-
-    f({ a: 1, b: 'yes' }, { c: 'no', d: false })
->f : Symbol(f, Decl(objectSpread.ts, 79, 55))
->a : Symbol(a, Decl(objectSpread.ts, 86, 7))
->b : Symbol(b, Decl(objectSpread.ts, 86, 13))
->c : Symbol(c, Decl(objectSpread.ts, 86, 27))
->d : Symbol(d, Decl(objectSpread.ts, 86, 36))
-
-let overlap: { id: string, a: number, b: string } =
->overlap : Symbol(overlap, Decl(objectSpread.ts, 87, 3))
->id : Symbol(id, Decl(objectSpread.ts, 87, 14))
->a : Symbol(a, Decl(objectSpread.ts, 87, 26))
->b : Symbol(b, Decl(objectSpread.ts, 87, 37))
-
-    f({ a: 1 }, { a: 2, b: 'extra' })
->f : Symbol(f, Decl(objectSpread.ts, 79, 55))
->a : Symbol(a, Decl(objectSpread.ts, 88, 7))
->a : Symbol(a, Decl(objectSpread.ts, 88, 17))
->b : Symbol(b, Decl(objectSpread.ts, 88, 23))
-
-let overlapConflict: { id:string, a: string } =
->overlapConflict : Symbol(overlapConflict, Decl(objectSpread.ts, 89, 3))
->id : Symbol(id, Decl(objectSpread.ts, 89, 22))
->a : Symbol(a, Decl(objectSpread.ts, 89, 33))
-
-    f({ a: 1 }, { a: 'mismatch' })
->f : Symbol(f, Decl(objectSpread.ts, 79, 55))
->a : Symbol(a, Decl(objectSpread.ts, 90, 7))
->a : Symbol(a, Decl(objectSpread.ts, 90, 17))
-
-let overwriteId: { id: string, a: number, c: number, d: string } =
->overwriteId : Symbol(overwriteId, Decl(objectSpread.ts, 91, 3))
->id : Symbol(id, Decl(objectSpread.ts, 91, 18))
->a : Symbol(a, Decl(objectSpread.ts, 91, 30))
->c : Symbol(c, Decl(objectSpread.ts, 91, 41))
->d : Symbol(d, Decl(objectSpread.ts, 91, 52))
-
-    f({ a: 1, id: true }, { c: 1, d: 'no' })
->f : Symbol(f, Decl(objectSpread.ts, 79, 55))
->a : Symbol(a, Decl(objectSpread.ts, 92, 7))
->id : Symbol(id, Decl(objectSpread.ts, 92, 13))
->c : Symbol(c, Decl(objectSpread.ts, 92, 27))
->d : Symbol(d, Decl(objectSpread.ts, 92, 33))
-
-class D { m() { }; q = 2; }
->D : Symbol(D, Decl(objectSpread.ts, 92, 44))
->m : Symbol(D.m, Decl(objectSpread.ts, 94, 9))
->q : Symbol(D.q, Decl(objectSpread.ts, 94, 18))
-
-let classesAreWrong: { id: string, ...C, ...D } =
->classesAreWrong : Symbol(classesAreWrong, Decl(objectSpread.ts, 95, 3))
->id : Symbol(id, Decl(objectSpread.ts, 95, 22))
->C : Symbol(C, Decl(objectSpread.ts, 42, 29))
->D : Symbol(D, Decl(objectSpread.ts, 92, 44))
-
-    f(new C(), new D())
->f : Symbol(f, Decl(objectSpread.ts, 79, 55))
->C : Symbol(C, Decl(objectSpread.ts, 42, 29))
->D : Symbol(D, Decl(objectSpread.ts, 92, 44))
 
diff --git a/tests/baselines/reference/objectSpread.types b/tests/baselines/reference/objectSpread.types
index 78f4f7583d9..e9b9a6421c2 100644
--- a/tests/baselines/reference/objectSpread.types
+++ b/tests/baselines/reference/objectSpread.types
@@ -223,36 +223,13 @@ getter.a = 12;
 >a : number
 >12 : 12
 
-// null, undefined, functions and primitives result in { }
-let spreadNull = { ...null };
->spreadNull : {}
->{ ...null } : {}
->null : null
-
-let spreadUndefind = { ...undefined };
->spreadUndefind : {}
->{ ...undefined } : {}
->undefined : any
-
-let spreadNum = { ...12 };
->spreadNum : {}
->{ ...12 } : {}
-
-let spreadBool = { ...false };
->spreadBool : {}
->{ ...false } : {}
->false : false
-
+// functions result in { }
 let spreadFunc = { ...(function () { }) };
 >spreadFunc : {}
 >{ ...(function () { }) } : {}
 >(function () { }) : () => void
 >function () { } : () => void
 
-let spreadStr = { ...'foo' };
->spreadStr : {}
->{ ...'foo' } : {}
-
 // methods are not enumerable
 class C { p = 1; m() { } }
 >C : C
@@ -421,119 +398,4 @@ let shortCutted: { a: number, b: string } = { ...o, a }
 >o : any
 >a : number
 
-// generics
-function f<T, U>(t: T, u: U): { ...T, ...U, id: string } {
->f : <T, U>(t: T, u: U) => { ...T; ...U; id: string; }
->T : T
->U : U
->t : T
->T : T
->u : U
->U : U
->T : T
->U : U
->id : string
-
-    return { ...t, ...u, id: 'id' };
->{ ...t, ...u, id: 'id' } : { ...T; ...U; id: string; }
->t : any
->u : any
->id : string
->'id' : "id"
-}
-let exclusive: { id: string, a: number, b: string, c: string, d: boolean } =
->exclusive : { id: string; a: number; b: string; c: string; d: boolean; }
->id : string
->a : number
->b : string
->c : string
->d : boolean
-
-    f({ a: 1, b: 'yes' }, { c: 'no', d: false })
->f({ a: 1, b: 'yes' }, { c: 'no', d: false }) : { id: string; c: string; d: boolean; a: number; b: string; }
->f : <T, U>(t: T, u: U) => { ...T; ...U; id: string; }
->{ a: 1, b: 'yes' } : { a: number; b: string; }
->a : number
->1 : 1
->b : string
->'yes' : "yes"
->{ c: 'no', d: false } : { c: string; d: false; }
->c : string
->'no' : "no"
->d : boolean
->false : false
-
-let overlap: { id: string, a: number, b: string } =
->overlap : { id: string; a: number; b: string; }
->id : string
->a : number
->b : string
-
-    f({ a: 1 }, { a: 2, b: 'extra' })
->f({ a: 1 }, { a: 2, b: 'extra' }) : { id: string; a: number; b: string; }
->f : <T, U>(t: T, u: U) => { ...T; ...U; id: string; }
->{ a: 1 } : { a: number; }
->a : number
->1 : 1
->{ a: 2, b: 'extra' } : { a: number; b: string; }
->a : number
->2 : 2
->b : string
->'extra' : "extra"
-
-let overlapConflict: { id:string, a: string } =
->overlapConflict : { id: string; a: string; }
->id : string
->a : string
-
-    f({ a: 1 }, { a: 'mismatch' })
->f({ a: 1 }, { a: 'mismatch' }) : { id: string; a: string; }
->f : <T, U>(t: T, u: U) => { ...T; ...U; id: string; }
->{ a: 1 } : { a: number; }
->a : number
->1 : 1
->{ a: 'mismatch' } : { a: string; }
->a : string
->'mismatch' : "mismatch"
-
-let overwriteId: { id: string, a: number, c: number, d: string } =
->overwriteId : { id: string; a: number; c: number; d: string; }
->id : string
->a : number
->c : number
->d : string
-
-    f({ a: 1, id: true }, { c: 1, d: 'no' })
->f({ a: 1, id: true }, { c: 1, d: 'no' }) : { id: string; c: number; d: string; a: number; }
->f : <T, U>(t: T, u: U) => { ...T; ...U; id: string; }
->{ a: 1, id: true } : { a: number; id: true; }
->a : number
->1 : 1
->id : boolean
->true : true
->{ c: 1, d: 'no' } : { c: number; d: string; }
->c : number
->1 : 1
->d : string
->'no' : "no"
-
-class D { m() { }; q = 2; }
->D : D
->m : () => void
->q : number
->2 : 2
-
-let classesAreWrong: { id: string, ...C, ...D } =
->classesAreWrong : { q: number; p: number; id: string; }
->id : string
->C : C
->D : D
-
-    f(new C(), new D())
->f(new C(), new D()) : { id: string; q: number; p: number; }
->f : <T, U>(t: T, u: U) => { ...T; ...U; id: string; }
->new C() : C
->C : typeof C
->new D() : D
->D : typeof D
 
diff --git a/tests/baselines/reference/objectSpreadGeneric.errors.txt b/tests/baselines/reference/objectSpreadGeneric.errors.txt
deleted file mode 100644
index f1e2b7e4828..00000000000
--- a/tests/baselines/reference/objectSpreadGeneric.errors.txt
+++ /dev/null
@@ -1,148 +0,0 @@
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(9,5): error TS2322: Type '{ ...U }' is not assignable to type 'U'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(10,11): error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...V; ...U; ...T }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(11,11): error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...U; ...T; ...V }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(12,11): error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...U; ...V }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(13,11): error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...T; ...V }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(14,11): error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...T; ...U }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(16,11): error TS2322: Type '{ first: string; ...T; ...U }' is not assignable to type '{ first: string; ...T; ...U }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(19,11): error TS2322: Type '{}' is not assignable to type '{ ...T; ...U }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(26,11): error TS2322: Type '{ sn?: boolean; ...T; sn?: string | number; }' is not assignable to type '{ ...T; sn?: string | number | boolean; }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(32,11): error TS2322: Type '{ first: string; ...T; second: string; ...U; third: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(34,11): error TS2322: Type '{ first: string; ...T; second: string; ...U; third: string; }' is not assignable to type '{ first: string; second: string; ...T; third: string; }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(36,11): error TS2322: Type '{ first: string; ...T; second: string; ...U; third: string; secondsecond: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; secondsecond: string; }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(38,11): error TS2322: Type '{ first: string; ...T; second: string; ...U; third: string; secondsecond: string; }' is not assignable to type '{ first: string; second: string; secondsecond: string; third: string; ...T; ...U }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(42,11): error TS2322: Type '{ firrrrrrst: string; ...T; second: string; ...U; third: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(44,11): error TS2322: Type '{ first: string; ...T; ssssssssecond: string; ...U; third: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(46,11): error TS2322: Type '{ first: string; ...T; second: string; ...U; thirrrrrrrd: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(57,5): error TS2322: Type '{ ...keyof U }' is not assignable to type '{ ...keyof T }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(58,5): error TS2322: Type '{ ...keyof T }' is not assignable to type '{ ...keyof U }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(61,5): error TS2322: Type '{ ...K }' is not assignable to type '{ ...keyof T }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(62,5): error TS2322: Type '{ ...keyof T }' is not assignable to type '{ ...K }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(63,5): error TS2322: Type '{ ...J }' is not assignable to type '{ ...keyof U }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(64,5): error TS2322: Type '{ ...keyof U }' is not assignable to type '{ ...J }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(70,5): error TS2322: Type '{ ...U[J] }' is not assignable to type '{ ...T[K] }'.
-tests/cases/conformance/types/spread/objectSpreadGeneric.ts(71,5): error TS2322: Type '{ ...T[K] }' is not assignable to type '{ ...U[J] }'.
-
-
-==== tests/cases/conformance/types/spread/objectSpreadGeneric.ts (24 errors) ====
-    function f<T, U, V>(t: T, u: U, v: V): void {
-        let o: { ...T, ...U, ...V };
-        let uus: { ...U, ...U};
-        let us: { ...U };
-        const same: { ...T, ...U, ...V } = o; // ok
-        uus = us; // ok, multiple spreads are equivalent to a single one
-        us = uus; // ok, multiple spreads are equivalent to a single one
-        us = u;   // ok, type has at least all the properties of the spread
-        u = us;   // error, might be missing a ton of stuff
-        ~
-!!! error TS2322: Type '{ ...U }' is not assignable to type 'U'.
-        const reversed: { ...V, ...U, ...T } = o; // error, reversed
-              ~~~~~~~~
-!!! error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...V; ...U; ...T }'.
-        const reversed2: { ...U, ...T, ...V } = o; // error, U and T are still reversed
-              ~~~~~~~~~
-!!! error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...U; ...T; ...V }'.
-        const missingT: { ...U, ...V } = o; // error, missing T
-              ~~~~~~~~
-!!! error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...U; ...V }'.
-        const missingU: { ...T, ...V } = o; // error, missing U
-              ~~~~~~~~
-!!! error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...T; ...V }'.
-        const missingV: { ...T, ...U } = o; // error, missing V
-              ~~~~~~~~
-!!! error TS2322: Type '{ ...T; ...U; ...V }' is not assignable to type '{ ...T; ...U }'.
-        const atEnd: { ...T, ...U, second: string } = { ...t, ...u, second: 'foo' }; // ok
-        const atBeginning: { first: string, ...T, ...U, } = { first: 'foo', ...t, ...u }; // error, not assignable
-              ~~~~~~~~~~~
-!!! error TS2322: Type '{ first: string; ...T; ...U }' is not assignable to type '{ first: string; ...T; ...U }'.
-    
-        const emptyTarget: { } = { ...t, ...u } // ok
-        const emptySource: { ...T, ...U } = { }; // error, {} is not assignable to U (or T)
-              ~~~~~~~~~~~
-!!! error TS2322: Type '{}' is not assignable to type '{ ...T; ...U }'.
-    
-        // error, { sn?: boolean } ...T ... { sn?: number | string } is not assignable to
-        //        T ... { sn?: number | string | boolean }
-        let optionalNumber: { sn?: number };
-        let optionalString: { sn?: string };
-        let optionalBoolean: { sn?: boolean };
-        const unionCutoff: { ...T, sn?: number | string | boolean } =
-              ~~~~~~~~~~~
-!!! error TS2322: Type '{ sn?: boolean; ...T; sn?: string | number; }' is not assignable to type '{ ...T; sn?: string | number | boolean; }'.
-            { ...optionalBoolean, ...t, ...optionalString, ...optionalNumber }
-        unionCutoff.sn; // ok
-        const optionalCutoff = { ...t, ...optionalNumber }; // ok
-        optionalCutoff.sn; // ok
-    
-        const interspersed: { first: string, ...T, second: string, ...U, third: string } =
-              ~~~~~~~~~~~~
-!!! error TS2322: Type '{ first: string; ...T; second: string; ...U; third: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
-            { first: '1', ...t, second: '2', ...u, third: '3' }; // error, not assignable
-        const interspersedMissingU: { first: string, second: string, ...T, third: string } =
-              ~~~~~~~~~~~~~~~~~~~~
-!!! error TS2322: Type '{ first: string; ...T; second: string; ...U; third: string; }' is not assignable to type '{ first: string; second: string; ...T; third: string; }'.
-            { first: '1', ...t, second: '2', ...u, third: '3' }; // error, 'U' is missing
-        const interspersedOrder1: { first: string, ...T, second: string, ...U, third: string, secondsecond: string } =
-              ~~~~~~~~~~~~~~~~~~
-!!! error TS2322: Type '{ first: string; ...T; second: string; ...U; third: string; secondsecond: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; secondsecond: string; }'.
-            { first: '1', ...t, second: '2', ...u, third: '3', secondsecond: 'false' }; // error, not assignable
-        const interspersedOrder2: { first: string, second: string, secondsecond: string, third: string, ...T, ...U } =
-              ~~~~~~~~~~~~~~~~~~
-!!! error TS2322: Type '{ first: string; ...T; second: string; ...U; third: string; secondsecond: string; }' is not assignable to type '{ first: string; second: string; secondsecond: string; third: string; ...T; ...U }'.
-            { first: '1', ...t, second: '2', ...u, third: '3', secondsecond: 'false' }; // error, not assignable
-    
-    
-        const mismatchFirst: { first: string, ...T, second: string, ...U, third: string } =
-              ~~~~~~~~~~~~~
-!!! error TS2322: Type '{ firrrrrrst: string; ...T; second: string; ...U; third: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
-            { firrrrrrst: '1', ...t, second: '2', ...u, third: '3' }; // error, not assignable
-        const mismatchSecond: { first: string, ...T, second: string, ...U, third: string } =
-              ~~~~~~~~~~~~~~
-!!! error TS2322: Type '{ first: string; ...T; ssssssssecond: string; ...U; third: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
-            { first: '1', ...t, ssssssssecond: '2', ...u, third: '3' }; // error, not assignable
-        const mismatchLast: { first: string, ...T, second: string, ...U, third: string } =
-              ~~~~~~~~~~~~
-!!! error TS2322: Type '{ first: string; ...T; second: string; ...U; thirrrrrrrd: string; }' is not assignable to type '{ first: string; ...T; second: string; ...U; third: string; }'.
-            { first: '1', ...t, second: '2', ...u, thirrrrrrrd: '3' }; // error, not assignable
-    }
-    
-    function indexAccessedTest<T, K extends keyof T, U, J extends keyof U>(t: T, u: U, key1: K, key2: J) {
-        let k1: { ...keyof T };
-        let k2: { ...keyof U };
-        let k3: { ...K };
-        let k4: { ...J };
-        k1 = k1; // ok
-        k2 = k2; // ok
-        k1 = k2; // error
-        ~~
-!!! error TS2322: Type '{ ...keyof U }' is not assignable to type '{ ...keyof T }'.
-        k2 = k1; // error
-        ~~
-!!! error TS2322: Type '{ ...keyof T }' is not assignable to type '{ ...keyof U }'.
-        k3 = k3; // ok
-        k4 = k4; // ok
-        k1 = k3; // error
-        ~~
-!!! error TS2322: Type '{ ...K }' is not assignable to type '{ ...keyof T }'.
-        k3 = k1; // error
-        ~~
-!!! error TS2322: Type '{ ...keyof T }' is not assignable to type '{ ...K }'.
-        k2 = k4; // error
-        ~~
-!!! error TS2322: Type '{ ...J }' is not assignable to type '{ ...keyof U }'.
-        k4 = k2; // error
-        ~~
-!!! error TS2322: Type '{ ...keyof U }' is not assignable to type '{ ...J }'.
-    
-        let i1: { ...T[K] };
-        let i2: { ...U[J] };
-        i1 = i1; // ok
-        i2 = i2; // ok
-        i1 = i2; // error
-        ~~
-!!! error TS2322: Type '{ ...U[J] }' is not assignable to type '{ ...T[K] }'.
-        i2 = i1; // error
-        ~~
-!!! error TS2322: Type '{ ...T[K] }' is not assignable to type '{ ...U[J] }'.
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/objectSpreadGeneric.js b/tests/baselines/reference/objectSpreadGeneric.js
deleted file mode 100644
index 8e89ebeef64..00000000000
--- a/tests/baselines/reference/objectSpreadGeneric.js
+++ /dev/null
@@ -1,141 +0,0 @@
-//// [objectSpreadGeneric.ts]
-function f<T, U, V>(t: T, u: U, v: V): void {
-    let o: { ...T, ...U, ...V };
-    let uus: { ...U, ...U};
-    let us: { ...U };
-    const same: { ...T, ...U, ...V } = o; // ok
-    uus = us; // ok, multiple spreads are equivalent to a single one
-    us = uus; // ok, multiple spreads are equivalent to a single one
-    us = u;   // ok, type has at least all the properties of the spread
-    u = us;   // error, might be missing a ton of stuff
-    const reversed: { ...V, ...U, ...T } = o; // error, reversed
-    const reversed2: { ...U, ...T, ...V } = o; // error, U and T are still reversed
-    const missingT: { ...U, ...V } = o; // error, missing T
-    const missingU: { ...T, ...V } = o; // error, missing U
-    const missingV: { ...T, ...U } = o; // error, missing V
-    const atEnd: { ...T, ...U, second: string } = { ...t, ...u, second: 'foo' }; // ok
-    const atBeginning: { first: string, ...T, ...U, } = { first: 'foo', ...t, ...u }; // error, not assignable
-
-    const emptyTarget: { } = { ...t, ...u } // ok
-    const emptySource: { ...T, ...U } = { }; // error, {} is not assignable to U (or T)
-
-    // error, { sn?: boolean } ...T ... { sn?: number | string } is not assignable to
-    //        T ... { sn?: number | string | boolean }
-    let optionalNumber: { sn?: number };
-    let optionalString: { sn?: string };
-    let optionalBoolean: { sn?: boolean };
-    const unionCutoff: { ...T, sn?: number | string | boolean } =
-        { ...optionalBoolean, ...t, ...optionalString, ...optionalNumber }
-    unionCutoff.sn; // ok
-    const optionalCutoff = { ...t, ...optionalNumber }; // ok
-    optionalCutoff.sn; // ok
-
-    const interspersed: { first: string, ...T, second: string, ...U, third: string } =
-        { first: '1', ...t, second: '2', ...u, third: '3' }; // error, not assignable
-    const interspersedMissingU: { first: string, second: string, ...T, third: string } =
-        { first: '1', ...t, second: '2', ...u, third: '3' }; // error, 'U' is missing
-    const interspersedOrder1: { first: string, ...T, second: string, ...U, third: string, secondsecond: string } =
-        { first: '1', ...t, second: '2', ...u, third: '3', secondsecond: 'false' }; // error, not assignable
-    const interspersedOrder2: { first: string, second: string, secondsecond: string, third: string, ...T, ...U } =
-        { first: '1', ...t, second: '2', ...u, third: '3', secondsecond: 'false' }; // error, not assignable
-
-
-    const mismatchFirst: { first: string, ...T, second: string, ...U, third: string } =
-        { firrrrrrst: '1', ...t, second: '2', ...u, third: '3' }; // error, not assignable
-    const mismatchSecond: { first: string, ...T, second: string, ...U, third: string } =
-        { first: '1', ...t, ssssssssecond: '2', ...u, third: '3' }; // error, not assignable
-    const mismatchLast: { first: string, ...T, second: string, ...U, third: string } =
-        { first: '1', ...t, second: '2', ...u, thirrrrrrrd: '3' }; // error, not assignable
-}
-
-function indexAccessedTest<T, K extends keyof T, U, J extends keyof U>(t: T, u: U, key1: K, key2: J) {
-    let k1: { ...keyof T };
-    let k2: { ...keyof U };
-    let k3: { ...K };
-    let k4: { ...J };
-    k1 = k1; // ok
-    k2 = k2; // ok
-    k1 = k2; // error
-    k2 = k1; // error
-    k3 = k3; // ok
-    k4 = k4; // ok
-    k1 = k3; // error
-    k3 = k1; // error
-    k2 = k4; // error
-    k4 = k2; // error
-
-    let i1: { ...T[K] };
-    let i2: { ...U[J] };
-    i1 = i1; // ok
-    i2 = i2; // ok
-    i1 = i2; // error
-    i2 = i1; // error
-}
-
-
-//// [objectSpreadGeneric.js]
-var __assign = (this && this.__assign) || Object.assign || function(t) {
-    for (var s, i = 1, n = arguments.length; i < n; i++) {
-        s = arguments[i];
-        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-            t[p] = s[p];
-    }
-    return t;
-};
-function f(t, u, v) {
-    var o;
-    var uus;
-    var us;
-    var same = o; // ok
-    uus = us; // ok, multiple spreads are equivalent to a single one
-    us = uus; // ok, multiple spreads are equivalent to a single one
-    us = u; // ok, type has at least all the properties of the spread
-    u = us; // error, might be missing a ton of stuff
-    var reversed = o; // error, reversed
-    var reversed2 = o; // error, U and T are still reversed
-    var missingT = o; // error, missing T
-    var missingU = o; // error, missing U
-    var missingV = o; // error, missing V
-    var atEnd = __assign({}, t, u, { second: 'foo' }); // ok
-    var atBeginning = __assign({ first: 'foo' }, t, u); // error, not assignable
-    var emptyTarget = __assign({}, t, u); // ok
-    var emptySource = {}; // error, {} is not assignable to U (or T)
-    // error, { sn?: boolean } ...T ... { sn?: number | string } is not assignable to
-    //        T ... { sn?: number | string | boolean }
-    var optionalNumber;
-    var optionalString;
-    var optionalBoolean;
-    var unionCutoff = __assign({}, optionalBoolean, t, optionalString, optionalNumber);
-    unionCutoff.sn; // ok
-    var optionalCutoff = __assign({}, t, optionalNumber); // ok
-    optionalCutoff.sn; // ok
-    var interspersed = __assign({ first: '1' }, t, { second: '2' }, u, { third: '3' }); // error, not assignable
-    var interspersedMissingU = __assign({ first: '1' }, t, { second: '2' }, u, { third: '3' }); // error, 'U' is missing
-    var interspersedOrder1 = __assign({ first: '1' }, t, { second: '2' }, u, { third: '3', secondsecond: 'false' }); // error, not assignable
-    var interspersedOrder2 = __assign({ first: '1' }, t, { second: '2' }, u, { third: '3', secondsecond: 'false' }); // error, not assignable
-    var mismatchFirst = __assign({ firrrrrrst: '1' }, t, { second: '2' }, u, { third: '3' }); // error, not assignable
-    var mismatchSecond = __assign({ first: '1' }, t, { ssssssssecond: '2' }, u, { third: '3' }); // error, not assignable
-    var mismatchLast = __assign({ first: '1' }, t, { second: '2' }, u, { thirrrrrrrd: '3' }); // error, not assignable
-}
-function indexAccessedTest(t, u, key1, key2) {
-    var k1;
-    var k2;
-    var k3;
-    var k4;
-    k1 = k1; // ok
-    k2 = k2; // ok
-    k1 = k2; // error
-    k2 = k1; // error
-    k3 = k3; // ok
-    k4 = k4; // ok
-    k1 = k3; // error
-    k3 = k1; // error
-    k2 = k4; // error
-    k4 = k2; // error
-    var i1;
-    var i2;
-    i1 = i1; // ok
-    i2 = i2; // ok
-    i1 = i2; // error
-    i2 = i1; // error
-}
diff --git a/tests/baselines/reference/objectSpreadIndexSignature.errors.txt b/tests/baselines/reference/objectSpreadIndexSignature.errors.txt
deleted file mode 100644
index d3faa2e6ff8..00000000000
--- a/tests/baselines/reference/objectSpreadIndexSignature.errors.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts(6,39): error TS2699: Type literals with spreads cannot contain index, call or construct signatures.
-tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts(24,20): error TS2699: Type literals with spreads cannot contain index, call or construct signatures.
-
-
-==== tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts (2 errors) ====
-    class C {
-        a: number;
-        c: boolean;
-    }
-    // index signatures are not allowed in object literals with spread types
-    let c: { ...C, b: string, c?: string, [n: number]: string };
-                                          ~~~~~~~~~~~~~~~~~~~
-!!! error TS2699: Type literals with spreads cannot contain index, call or construct signatures.
-    let n: number = c.a;
-    let s: string = c[12];
-    interface Indexed {
-        [n: string]: number;
-        a: number;
-    }
-    let i: { ...Indexed, b: number };
-    n = i[101];
-    n = i.b;
-    interface Indexed2 {
-        [n: string]: boolean;
-        c: boolean;
-    }
-    let ii: { ...Indexed, ...Indexed2, b: boolean, d: number };
-    let nb: number | boolean = ii[1001];
-    
-    function f<T>(t: T) {
-        let i: { ...T, [n: number]: string };
-                       ~~~~~~~~~~~~~~~~~~~
-!!! error TS2699: Type literals with spreads cannot contain index, call or construct signatures.
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/objectSpreadIndexSignature.js b/tests/baselines/reference/objectSpreadIndexSignature.js
index ab18c0f24a9..22e92e6a844 100644
--- a/tests/baselines/reference/objectSpreadIndexSignature.js
+++ b/tests/baselines/reference/objectSpreadIndexSignature.js
@@ -1,46 +1,36 @@
 //// [objectSpreadIndexSignature.ts]
-class C {
-    a: number;
-    c: boolean;
-}
-// index signatures are not allowed in object literals with spread types
-let c: { ...C, b: string, c?: string, [n: number]: string };
-let n: number = c.a;
-let s: string = c[12];
 interface Indexed {
     [n: string]: number;
     a: number;
 }
-let i: { ...Indexed, b: number };
-n = i[101];
-n = i.b;
 interface Indexed2 {
     [n: string]: boolean;
     c: boolean;
 }
-let ii: { ...Indexed, ...Indexed2, b: boolean, d: number };
-let nb: number | boolean = ii[1001];
-
-function f<T>(t: T) {
-    let i: { ...T, [n: number]: string };
-}
+let indexed: Indexed;
+let indexed2: Indexed2;
+let i = { ...indexed, b: 11 };
+// only indexed has indexer, so i[101]: any
+i[101];
+let ii = { ...indexed, ...indexed2 };
+// both have indexer, so i[1001]: number | boolean
+ii[1001];
 
 
 //// [objectSpreadIndexSignature.js]
-var C = (function () {
-    function C() {
+var __assign = (this && this.__assign) || Object.assign || function(t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+        s = arguments[i];
+        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+            t[p] = s[p];
     }
-    return C;
-}());
-// index signatures are not allowed in object literals with spread types
-var c;
-var n = c.a;
-var s = c[12];
-var i;
-n = i[101];
-n = i.b;
-var ii;
-var nb = ii[1001];
-function f(t) {
-    var i;
-}
+    return t;
+};
+var indexed;
+var indexed2;
+var i = __assign({}, indexed, { b: 11 });
+// only indexed has indexer, so i[101]: any
+i[101];
+var ii = __assign({}, indexed, indexed2);
+// both have indexer, so i[1001]: number | boolean
+ii[1001];
diff --git a/tests/baselines/reference/objectSpreadIndexSignature.symbols b/tests/baselines/reference/objectSpreadIndexSignature.symbols
new file mode 100644
index 00000000000..c51e7f4532f
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadIndexSignature.symbols
@@ -0,0 +1,42 @@
+=== tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts ===
+interface Indexed {
+>Indexed : Symbol(Indexed, Decl(objectSpreadIndexSignature.ts, 0, 0))
+
+    [n: string]: number;
+>n : Symbol(n, Decl(objectSpreadIndexSignature.ts, 1, 5))
+
+    a: number;
+>a : Symbol(Indexed.a, Decl(objectSpreadIndexSignature.ts, 1, 24))
+}
+interface Indexed2 {
+>Indexed2 : Symbol(Indexed2, Decl(objectSpreadIndexSignature.ts, 3, 1))
+
+    [n: string]: boolean;
+>n : Symbol(n, Decl(objectSpreadIndexSignature.ts, 5, 5))
+
+    c: boolean;
+>c : Symbol(Indexed2.c, Decl(objectSpreadIndexSignature.ts, 5, 25))
+}
+let indexed: Indexed;
+>indexed : Symbol(indexed, Decl(objectSpreadIndexSignature.ts, 8, 3))
+>Indexed : Symbol(Indexed, Decl(objectSpreadIndexSignature.ts, 0, 0))
+
+let indexed2: Indexed2;
+>indexed2 : Symbol(indexed2, Decl(objectSpreadIndexSignature.ts, 9, 3))
+>Indexed2 : Symbol(Indexed2, Decl(objectSpreadIndexSignature.ts, 3, 1))
+
+let i = { ...indexed, b: 11 };
+>i : Symbol(i, Decl(objectSpreadIndexSignature.ts, 10, 3))
+>b : Symbol(b, Decl(objectSpreadIndexSignature.ts, 10, 21))
+
+// only indexed has indexer, so i[101]: any
+i[101];
+>i : Symbol(i, Decl(objectSpreadIndexSignature.ts, 10, 3))
+
+let ii = { ...indexed, ...indexed2 };
+>ii : Symbol(ii, Decl(objectSpreadIndexSignature.ts, 13, 3))
+
+// both have indexer, so i[1001]: number | boolean
+ii[1001];
+>ii : Symbol(ii, Decl(objectSpreadIndexSignature.ts, 13, 3))
+
diff --git a/tests/baselines/reference/objectSpreadIndexSignature.types b/tests/baselines/reference/objectSpreadIndexSignature.types
new file mode 100644
index 00000000000..79a515e7374
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadIndexSignature.types
@@ -0,0 +1,52 @@
+=== tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts ===
+interface Indexed {
+>Indexed : Indexed
+
+    [n: string]: number;
+>n : string
+
+    a: number;
+>a : number
+}
+interface Indexed2 {
+>Indexed2 : Indexed2
+
+    [n: string]: boolean;
+>n : string
+
+    c: boolean;
+>c : boolean
+}
+let indexed: Indexed;
+>indexed : Indexed
+>Indexed : Indexed
+
+let indexed2: Indexed2;
+>indexed2 : Indexed2
+>Indexed2 : Indexed2
+
+let i = { ...indexed, b: 11 };
+>i : { b: number; a: number; }
+>{ ...indexed, b: 11 } : { b: number; a: number; }
+>indexed : any
+>b : number
+>11 : 11
+
+// only indexed has indexer, so i[101]: any
+i[101];
+>i[101] : any
+>i : { b: number; a: number; }
+>101 : 101
+
+let ii = { ...indexed, ...indexed2 };
+>ii : { [x: string]: number | boolean; c: boolean; a: number; }
+>{ ...indexed, ...indexed2 } : { [x: string]: number | boolean; c: boolean; a: number; }
+>indexed : any
+>indexed2 : any
+
+// both have indexer, so i[1001]: number | boolean
+ii[1001];
+>ii[1001] : number | boolean
+>ii : { [x: string]: number | boolean; c: boolean; a: number; }
+>1001 : 1001
+
diff --git a/tests/baselines/reference/objectSpreadNegative.errors.txt b/tests/baselines/reference/objectSpreadNegative.errors.txt
index 1af94007dc1..dc6a356708f 100644
--- a/tests/baselines/reference/objectSpreadNegative.errors.txt
+++ b/tests/baselines/reference/objectSpreadNegative.errors.txt
@@ -1,30 +1,26 @@
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(11,21): error TS2339: Property 'x' does not exist on type '{}'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(14,5): error TS2322: Type '{ sn?: string | number; }' is not assignable to type '{ sn: string | number; }'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(13,21): error TS2339: Property 'x' does not exist on type '{}'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(16,5): error TS2322: Type '{ sn?: string | number; }' is not assignable to type '{ sn: string | number; }'.
   Property 'sn' is optional in type '{ sn?: string | number; }' but required in type '{ sn: string | number; }'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(20,5): error TS2322: Type '{ s: string; }' is not assignable to type '{ s: string; b: boolean; }'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(23,1): error TS2322: Type '{ s: string; }' is not assignable to type '{ s: string; b: boolean; }'.
   Property 'b' is missing in type '{ s: string; }'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(22,1): error TS2322: Type 'Bool' is not assignable to type '{ s: string; b: boolean; }'.
-  Property 's' is missing in type 'Bool'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(25,36): error TS2300: Duplicate identifier 'b'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(25,53): error TS2300: Duplicate identifier 'b'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(30,12): error TS2339: Property 'null' does not exist on type '{}'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(32,17): error TS2339: Property 'undefined' does not exist on type '{}'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(36,11): error TS2339: Property 'toFixed' does not exist on type '{}'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(38,11): error TS2339: Property 'toFixed' does not exist on type '{}'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(40,11): error TS2339: Property 'length' does not exist on type '{}'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(41,11): error TS2339: Property 'charAt' does not exist on type '{}'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(45,1): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type '{}' has no compatible call signatures.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(49,12): error TS2339: Property 'b' does not exist on type '{}'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(55,9): error TS2339: Property 'm' does not exist on type '{ p: number; }'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(57,48): error TS2699: Type literals with spreads cannot contain index, call or construct signatures.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(57,69): error TS2699: Type literals with spreads cannot contain index, call or construct signatures.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(58,1): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type '{ x: number; }' has no compatible call signatures.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(59,1): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(64,9): error TS2322: Type '{ ...T & V }' is not assignable to type '{ ...T & U }'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(66,12): error TS2322: Type '{ ...U }' is not assignable to type 'U'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(25,1): error TS2322: Type '{ b: boolean; }' is not assignable to type '{ s: string; b: boolean; }'.
+  Property 's' is missing in type '{ b: boolean; }'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(28,36): error TS2300: Duplicate identifier 'b'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(28,53): error TS2300: Duplicate identifier 'b'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(32,20): error TS2698: Spread types may only be created from object types.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(33,24): error TS2698: Spread types may only be created from object types.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(34,19): error TS2698: Spread types may only be created from object types.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(35,19): error TS2698: Spread types may only be created from object types.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(37,20): error TS2698: Spread types may only be created from object types.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(39,19): error TS2698: Spread types may only be created from object types.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(44,1): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type '{}' has no compatible call signatures.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(48,12): error TS2339: Property 'b' does not exist on type '{}'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(54,9): error TS2339: Property 'm' does not exist on type '{ p: number; }'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(58,14): error TS2698: Spread types may only be created from object types.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(61,14): error TS2698: Spread types may only be created from object types.
 
 
-==== tests/cases/conformance/types/spread/objectSpreadNegative.ts (21 errors) ====
+==== tests/cases/conformance/types/spread/objectSpreadNegative.ts (17 errors) ====
     let o = { a: 1, b: 'no' }
     
     /// private propagates
@@ -34,7 +30,9 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(66,12): error TS232
     class PublicX {
         public x: number;
     }
-    let o2: { ...PublicX, ...PrivateOptionalX };
+    let publicX: PublicX;
+    let privateOptionalX: PrivateOptionalX;
+    let o2 = { ...publicX, ...privateOptionalX };
     let sn: number = o2.x; // error, x is private
                         ~
 !!! error TS2339: Property 'x' does not exist on type '{}'.
@@ -49,15 +47,16 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(66,12): error TS232
     // assignability as target
     interface Bool { b: boolean };
     interface Str { s: string };
-    let spread: { ...Bool, ...Str } = { s: 'foo' }; // error, missing 'b'
-        ~~~~~~
+    let spread = { ...{ b: true }, ...{s: "foo" } };
+    spread = { s: "foo" };  // error, missing 'b'
+    ~~~~~~
 !!! error TS2322: Type '{ s: string; }' is not assignable to type '{ s: string; b: boolean; }'.
 !!! error TS2322:   Property 'b' is missing in type '{ s: string; }'.
-    let b: Bool;
+    let b = { b: false };
     spread = b; // error, missing 's'
     ~~~~~~
-!!! error TS2322: Type 'Bool' is not assignable to type '{ s: string; b: boolean; }'.
-!!! error TS2322:   Property 's' is missing in type 'Bool'.
+!!! error TS2322: Type '{ b: boolean; }' is not assignable to type '{ s: string; b: boolean; }'.
+!!! error TS2322:   Property 's' is missing in type '{ b: boolean; }'.
     
     // literal repeats are not allowed, but spread repeats are fine
     let duplicated = { b: 'bad', ...o, b: 'bad', ...o2, b: 'bad' }
@@ -67,34 +66,30 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(66,12): error TS232
 !!! error TS2300: Duplicate identifier 'b'.
     let duplicatedSpread = { ...o, ...o }
     
-    // null and undefined are just skipped
-    let spreadNull = { ...null }
-    spreadNull.null;
-               ~~~~
-!!! error TS2339: Property 'null' does not exist on type '{}'.
-    let spreadUndefined = { ...undefined }
-    spreadUndefined.undefined;
-                    ~~~~~~~~~
-!!! error TS2339: Property 'undefined' does not exist on type '{}'.
-    
-    // primitives and functions are skipped
+    // null, undefined and primitives are not allowed
+    let spreadNull = { ...null };
+                       ~~~~~~~
+!!! error TS2698: Spread types may only be created from object types.
+    let spreadUndefind = { ...undefined };
+                           ~~~~~~~~~~~~
+!!! error TS2698: Spread types may only be created from object types.
     let spreadNum = { ...12 };
-    spreadNum.toFixed(); // error, no methods from number
-              ~~~~~~~
-!!! error TS2339: Property 'toFixed' does not exist on type '{}'.
+                      ~~~~~
+!!! error TS2698: Spread types may only be created from object types.
     let spreadSum = { ...1 + 1 };
+                      ~~~~~~~~
+!!! error TS2698: Spread types may only be created from object types.
     spreadSum.toFixed(); // error, no methods from number
-              ~~~~~~~
-!!! error TS2339: Property 'toFixed' does not exist on type '{}'.
-    let spreadStr = { ...'foo' };
-    spreadStr.length; // error, no 'length'
-              ~~~~~~
-!!! error TS2339: Property 'length' does not exist on type '{}'.
-    spreadStr.charAt(1); // error, no methods either
-              ~~~~~~
-!!! error TS2339: Property 'charAt' does not exist on type '{}'.
-    let spreadBool = { ...true };
+    let spreadBool = { ...false };
+                       ~~~~~~~~
+!!! error TS2698: Spread types may only be created from object types.
     spreadBool.valueOf(); // error, what were you thinking?
+    let spreadStr = { ...'foo' };
+                      ~~~~~~~~
+!!! error TS2698: Spread types may only be created from object types.
+    spreadStr.length; // error, no 'length'
+    spreadStr.charAt(1); // error, no methods either
+    // functions are skipped
     let spreadFunc = { ...function () { } }
     spreadFunc(); // error, no call signature
     ~~~~~~~~~~~~
@@ -114,27 +109,23 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(66,12): error TS232
             ~
 !!! error TS2339: Property 'm' does not exist on type '{ p: number; }'.
     
-    let callableConstructableSpread: { ...PublicX, (n: number): number, new (p: number) };
-                                                   ~~~~~~~~~~~~~~~~~~~~
-!!! error TS2699: Type literals with spreads cannot contain index, call or construct signatures.
-                                                                        ~~~~~~~~~~~~~~~
-!!! error TS2699: Type literals with spreads cannot contain index, call or construct signatures.
-    callableConstructableSpread(12); // error, no call signature
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2349: Cannot invoke an expression whose type lacks a call signature. Type '{ x: number; }' has no compatible call signatures.
-    new callableConstructableSpread(12); // error, no construct signature
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
-    
-    function override<T,U,V>(initial: U, override: U, t: T, v: V): U {
-        // { ... T & V } is not assignable to { ... T & U }
-        let tvs: { ...T & V };
-        let mistake: { ...T & U } = tvs;
-            ~~~~~~~
-!!! error TS2322: Type '{ ...T & V }' is not assignable to type '{ ...T & U }'.
-        // { ...U } is not assignable to U
-        return { ...initial, ...override };
-               ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2322: Type '{ ...U }' is not assignable to type 'U'.
+    // generics
+    function f<T, U>(t: T, u: U) {
+        return { ...t, ...u, id: 'id' };
+                 ~~~~
+!!! error TS2698: Spread types may only be created from object types.
     }
+    function override<U>(initial: U, override: U): U {
+        return { ...initial, ...override };
+                 ~~~~~~~~~~
+!!! error TS2698: Spread types may only be created from object types.
+    }
+    let exclusive: { id: string, a: number, b: string, c: string, d: boolean } =
+        f({ a: 1, b: 'yes' }, { c: 'no', d: false })
+    let overlap: { id: string, a: number, b: string } =
+        f({ a: 1 }, { a: 2, b: 'extra' })
+    let overlapConflict: { id:string, a: string } =
+        f({ a: 1 }, { a: 'mismatch' })
+    let overwriteId: { id: string, a: number, c: number, d: string } =
+        f({ a: 1, id: true }, { c: 1, d: 'no' })
     
\ No newline at end of file
diff --git a/tests/baselines/reference/objectSpreadNegative.js b/tests/baselines/reference/objectSpreadNegative.js
index 7187b6009bd..4faacd97444 100644
--- a/tests/baselines/reference/objectSpreadNegative.js
+++ b/tests/baselines/reference/objectSpreadNegative.js
@@ -8,7 +8,9 @@ class PrivateOptionalX {
 class PublicX {
     public x: number;
 }
-let o2: { ...PublicX, ...PrivateOptionalX };
+let publicX: PublicX;
+let privateOptionalX: PrivateOptionalX;
+let o2 = { ...publicX, ...privateOptionalX };
 let sn: number = o2.x; // error, x is private
 let optionalString: { sn?: string };
 let optionalNumber: { sn?: number };
@@ -18,30 +20,27 @@ let allOptional: { sn: string | number } = { ...optionalString, ...optionalNumbe
 // assignability as target
 interface Bool { b: boolean };
 interface Str { s: string };
-let spread: { ...Bool, ...Str } = { s: 'foo' }; // error, missing 'b'
-let b: Bool;
+let spread = { ...{ b: true }, ...{s: "foo" } };
+spread = { s: "foo" };  // error, missing 'b'
+let b = { b: false };
 spread = b; // error, missing 's'
 
 // literal repeats are not allowed, but spread repeats are fine
 let duplicated = { b: 'bad', ...o, b: 'bad', ...o2, b: 'bad' }
 let duplicatedSpread = { ...o, ...o }
 
-// null and undefined are just skipped
-let spreadNull = { ...null }
-spreadNull.null;
-let spreadUndefined = { ...undefined }
-spreadUndefined.undefined;
-
-// primitives and functions are skipped
+// null, undefined and primitives are not allowed
+let spreadNull = { ...null };
+let spreadUndefind = { ...undefined };
 let spreadNum = { ...12 };
-spreadNum.toFixed(); // error, no methods from number
 let spreadSum = { ...1 + 1 };
 spreadSum.toFixed(); // error, no methods from number
+let spreadBool = { ...false };
+spreadBool.valueOf(); // error, what were you thinking?
 let spreadStr = { ...'foo' };
 spreadStr.length; // error, no 'length'
 spreadStr.charAt(1); // error, no methods either
-let spreadBool = { ...true };
-spreadBool.valueOf(); // error, what were you thinking?
+// functions are skipped
 let spreadFunc = { ...function () { } }
 spreadFunc(); // error, no call signature
 
@@ -55,17 +54,21 @@ let c: C = new C()
 let spreadC = { ...c }
 spreadC.m(); // error 'm' is not in '{ ... c }'
 
-let callableConstructableSpread: { ...PublicX, (n: number): number, new (p: number) };
-callableConstructableSpread(12); // error, no call signature
-new callableConstructableSpread(12); // error, no construct signature
-
-function override<T,U,V>(initial: U, override: U, t: T, v: V): U {
-    // { ... T & V } is not assignable to { ... T & U }
-    let tvs: { ...T & V };
-    let mistake: { ...T & U } = tvs;
-    // { ...U } is not assignable to U
+// generics
+function f<T, U>(t: T, u: U) {
+    return { ...t, ...u, id: 'id' };
+}
+function override<U>(initial: U, override: U): U {
     return { ...initial, ...override };
 }
+let exclusive: { id: string, a: number, b: string, c: string, d: boolean } =
+    f({ a: 1, b: 'yes' }, { c: 'no', d: false })
+let overlap: { id: string, a: number, b: string } =
+    f({ a: 1 }, { a: 2, b: 'extra' })
+let overlapConflict: { id:string, a: string } =
+    f({ a: 1 }, { a: 'mismatch' })
+let overwriteId: { id: string, a: number, c: number, d: string } =
+    f({ a: 1, id: true }, { c: 1, d: 'no' })
 
 
 //// [objectSpreadNegative.js]
@@ -89,34 +92,34 @@ var PublicX = (function () {
     }
     return PublicX;
 }());
-var o2;
+var publicX;
+var privateOptionalX;
+var o2 = __assign({}, publicX, privateOptionalX);
 var sn = o2.x; // error, x is private
 var optionalString;
 var optionalNumber;
 var allOptional = __assign({}, optionalString, optionalNumber);
 ;
 ;
-var spread = { s: 'foo' }; // error, missing 'b'
-var b;
+var spread = __assign({ b: true }, { s: "foo" });
+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);
-// null and undefined are just skipped
+// null, undefined and primitives are not allowed
 var spreadNull = __assign({}, null);
-spreadNull.null;
-var spreadUndefined = __assign({}, undefined);
-spreadUndefined.undefined;
-// primitives and functions are skipped
+var spreadUndefind = __assign({}, undefined);
 var spreadNum = __assign({}, 12);
-spreadNum.toFixed(); // error, no methods from number
 var spreadSum = __assign({}, 1 + 1);
 spreadSum.toFixed(); // error, no methods from number
+var spreadBool = __assign({}, false);
+spreadBool.valueOf(); // error, what were you thinking?
 var spreadStr = __assign({}, 'foo');
 spreadStr.length; // error, no 'length'
 spreadStr.charAt(1); // error, no methods either
-var spreadBool = __assign({}, true);
-spreadBool.valueOf(); // error, what were you thinking?
+// functions are skipped
 var spreadFunc = __assign({}, function () { });
 spreadFunc(); // error, no call signature
 // write-only properties get skipped
@@ -133,13 +136,14 @@ var C = (function () {
 var c = new C();
 var spreadC = __assign({}, c);
 spreadC.m(); // error 'm' is not in '{ ... c }'
-var callableConstructableSpread;
-callableConstructableSpread(12); // error, no call signature
-new callableConstructableSpread(12); // error, no construct signature
-function override(initial, override, t, v) {
-    // { ... T & V } is not assignable to { ... T & U }
-    var tvs;
-    var mistake = tvs;
-    // { ...U } is not assignable to U
+// generics
+function f(t, u) {
+    return __assign({}, t, u, { id: 'id' });
+}
+function override(initial, override) {
     return __assign({}, initial, override);
 }
+var exclusive = f({ a: 1, b: 'yes' }, { c: 'no', d: false });
+var overlap = f({ a: 1 }, { a: 2, b: 'extra' });
+var overlapConflict = f({ a: 1 }, { a: 'mismatch' });
+var overwriteId = f({ a: 1, id: true }, { c: 1, d: 'no' });
diff --git a/tests/baselines/reference/objectSpreadNegativeParse.errors.txt b/tests/baselines/reference/objectSpreadNegativeParse.errors.txt
index 41651fb1d1c..987172ef867 100644
--- a/tests/baselines/reference/objectSpreadNegativeParse.errors.txt
+++ b/tests/baselines/reference/objectSpreadNegativeParse.errors.txt
@@ -1,26 +1,36 @@
+tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(1,12): error TS2698: Spread types may only be created from object types.
 tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(1,15): error TS2304: Cannot find name 'o'.
 tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(1,18): error TS1109: Expression expected.
+tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(2,12): error TS2698: Spread types may only be created from object types.
 tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(2,15): error TS1109: Expression expected.
 tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(2,16): error TS2304: Cannot find name 'o'.
+tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(3,12): error TS2698: Spread types may only be created from object types.
 tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(3,15): error TS2304: Cannot find name 'matchMedia'.
 tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(3,28): error TS1005: ',' expected.
 tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(3,31): error TS1128: Declaration or statement expected.
+tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(4,13): error TS2698: Spread types may only be created from object types.
 tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(4,16): error TS2304: Cannot find name 'get'.
 tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(4,20): error TS1005: ',' expected.
 
 
-==== tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts (9 errors) ====
+==== tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts (13 errors) ====
     let o7 = { ...o? };
+               ~~~~~
+!!! error TS2698: Spread types may only be created from object types.
                   ~
 !!! error TS2304: Cannot find name 'o'.
                      ~
 !!! error TS1109: Expression expected.
     let o8 = { ...*o };
+               ~~~~~
+!!! error TS2698: Spread types may only be created from object types.
                   ~
 !!! error TS1109: Expression expected.
                    ~
 !!! error TS2304: Cannot find name 'o'.
     let o9 = { ...matchMedia() { }};
+               ~~~~~~~~~~~~~~~
+!!! error TS2698: Spread types may only be created from object types.
                   ~~~~~~~~~~
 !!! error TS2304: Cannot find name 'matchMedia'.
                                ~
@@ -28,6 +38,8 @@ tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(4,20): error T
                                   ~
 !!! error TS1128: Declaration or statement expected.
     let o10 = { ...get x() { return 12; }};
+                ~~~~~~
+!!! error TS2698: Spread types may only be created from object types.
                    ~~~
 !!! error TS2304: Cannot find name 'get'.
                        ~
diff --git a/tests/cases/conformance/types/spread/interfaceSpread.ts b/tests/cases/conformance/types/spread/interfaceSpread.ts
deleted file mode 100644
index a92a188e1a8..00000000000
--- a/tests/cases/conformance/types/spread/interfaceSpread.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-interface Congealed<T, U> {
-    ...T
-    ...U
-}
-
-let sandwich: Congealed<{jam: number }, { peanutButter: number }>;
-sandwich.jam;
-sandwich.peanutButter;
diff --git a/tests/cases/conformance/types/spread/objectSpread.ts b/tests/cases/conformance/types/spread/objectSpread.ts
index daadb1e3270..3336196e136 100644
--- a/tests/cases/conformance/types/spread/objectSpread.ts
+++ b/tests/cases/conformance/types/spread/objectSpread.ts
@@ -35,13 +35,8 @@ let getter: { a: number, c: number } =
     { ...op, c: 7 }
 getter.a = 12;
 
-// null, undefined, functions and primitives result in { }
-let spreadNull = { ...null };
-let spreadUndefind = { ...undefined };
-let spreadNum = { ...12 };
-let spreadBool = { ...false };
+// functions result in { }
 let spreadFunc = { ...(function () { }) };
-let spreadStr = { ...'foo' };
 
 // methods are not enumerable
 class C { p = 1; m() { } }
@@ -80,19 +75,3 @@ let computedAfter: { a: number, b: string, "at the end": number } =
 let a = 12;
 let shortCutted: { a: number, b: string } = { ...o, a }
 
-// generics
-function f<T, U>(t: T, u: U): { ...T, ...U, id: string } {
-    return { ...t, ...u, id: 'id' };
-}
-let exclusive: { id: string, a: number, b: string, c: string, d: boolean } =
-    f({ a: 1, b: 'yes' }, { c: 'no', d: false })
-let overlap: { id: string, a: number, b: string } =
-    f({ a: 1 }, { a: 2, b: 'extra' })
-let overlapConflict: { id:string, a: string } =
-    f({ a: 1 }, { a: 'mismatch' })
-let overwriteId: { id: string, a: number, c: number, d: string } =
-    f({ a: 1, id: true }, { c: 1, d: 'no' })
-
-class D { m() { }; q = 2; }
-let classesAreWrong: { id: string, ...C, ...D } =
-    f(new C(), new D())
diff --git a/tests/cases/conformance/types/spread/objectSpreadGeneric.ts b/tests/cases/conformance/types/spread/objectSpreadGeneric.ts
deleted file mode 100644
index 6f22358b7e2..00000000000
--- a/tests/cases/conformance/types/spread/objectSpreadGeneric.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-function f<T, U, V>(t: T, u: U, v: V): void {
-    let o: { ...T, ...U, ...V };
-    let uus: { ...U, ...U};
-    let us: { ...U };
-    const same: { ...T, ...U, ...V } = o; // ok
-    uus = us; // ok, multiple spreads are equivalent to a single one
-    us = uus; // ok, multiple spreads are equivalent to a single one
-    us = u;   // ok, type has at least all the properties of the spread
-    u = us;   // error, might be missing a ton of stuff
-    const reversed: { ...V, ...U, ...T } = o; // error, reversed
-    const reversed2: { ...U, ...T, ...V } = o; // error, U and T are still reversed
-    const missingT: { ...U, ...V } = o; // error, missing T
-    const missingU: { ...T, ...V } = o; // error, missing U
-    const missingV: { ...T, ...U } = o; // error, missing V
-    const atEnd: { ...T, ...U, second: string } = { ...t, ...u, second: 'foo' }; // ok
-    const atBeginning: { first: string, ...T, ...U, } = { first: 'foo', ...t, ...u }; // error, not assignable
-
-    const emptyTarget: { } = { ...t, ...u } // ok
-    const emptySource: { ...T, ...U } = { }; // error, {} is not assignable to U (or T)
-
-    // error, { sn?: boolean } ...T ... { sn?: number | string } is not assignable to
-    //        T ... { sn?: number | string | boolean }
-    let optionalNumber: { sn?: number };
-    let optionalString: { sn?: string };
-    let optionalBoolean: { sn?: boolean };
-    const unionCutoff: { ...T, sn?: number | string | boolean } =
-        { ...optionalBoolean, ...t, ...optionalString, ...optionalNumber }
-    unionCutoff.sn; // ok
-    const optionalCutoff = { ...t, ...optionalNumber }; // ok
-    optionalCutoff.sn; // ok
-
-    const interspersed: { first: string, ...T, second: string, ...U, third: string } =
-        { first: '1', ...t, second: '2', ...u, third: '3' }; // error, not assignable
-    const interspersedMissingU: { first: string, second: string, ...T, third: string } =
-        { first: '1', ...t, second: '2', ...u, third: '3' }; // error, 'U' is missing
-    const interspersedOrder1: { first: string, ...T, second: string, ...U, third: string, secondsecond: string } =
-        { first: '1', ...t, second: '2', ...u, third: '3', secondsecond: 'false' }; // error, not assignable
-    const interspersedOrder2: { first: string, second: string, secondsecond: string, third: string, ...T, ...U } =
-        { first: '1', ...t, second: '2', ...u, third: '3', secondsecond: 'false' }; // error, not assignable
-
-
-    const mismatchFirst: { first: string, ...T, second: string, ...U, third: string } =
-        { firrrrrrst: '1', ...t, second: '2', ...u, third: '3' }; // error, not assignable
-    const mismatchSecond: { first: string, ...T, second: string, ...U, third: string } =
-        { first: '1', ...t, ssssssssecond: '2', ...u, third: '3' }; // error, not assignable
-    const mismatchLast: { first: string, ...T, second: string, ...U, third: string } =
-        { first: '1', ...t, second: '2', ...u, thirrrrrrrd: '3' }; // error, not assignable
-}
-
-function indexAccessedTest<T, K extends keyof T, U, J extends keyof U>(t: T, u: U, key1: K, key2: J) {
-    let k1: { ...keyof T };
-    let k2: { ...keyof U };
-    let k3: { ...K };
-    let k4: { ...J };
-    k1 = k1; // ok
-    k2 = k2; // ok
-    k1 = k2; // error
-    k2 = k1; // error
-    k3 = k3; // ok
-    k4 = k4; // ok
-    k1 = k3; // error
-    k3 = k1; // error
-    k2 = k4; // error
-    k4 = k2; // error
-
-    let i1: { ...T[K] };
-    let i2: { ...U[J] };
-    i1 = i1; // ok
-    i2 = i2; // ok
-    i1 = i2; // error
-    i2 = i1; // error
-}
diff --git a/tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts b/tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts
index 8c9194d2d4c..ae46f2547d5 100644
--- a/tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts
+++ b/tests/cases/conformance/types/spread/objectSpreadIndexSignature.ts
@@ -1,25 +1,16 @@
-class C {
-    a: number;
-    c: boolean;
-}
-// index signatures are not allowed in object literals with spread types
-let c: { ...C, b: string, c?: string, [n: number]: string };
-let n: number = c.a;
-let s: string = c[12];
 interface Indexed {
     [n: string]: number;
     a: number;
 }
-let i: { ...Indexed, b: number };
-n = i[101];
-n = i.b;
 interface Indexed2 {
     [n: string]: boolean;
     c: boolean;
 }
-let ii: { ...Indexed, ...Indexed2, b: boolean, d: number };
-let nb: number | boolean = ii[1001];
-
-function f<T>(t: T) {
-    let i: { ...T, [n: number]: string };
-}
+let indexed: Indexed;
+let indexed2: Indexed2;
+let i = { ...indexed, b: 11 };
+// only indexed has indexer, so i[101]: any
+i[101];
+let ii = { ...indexed, ...indexed2 };
+// both have indexer, so i[1001]: number | boolean
+ii[1001];
diff --git a/tests/cases/conformance/types/spread/objectSpreadInference.ts b/tests/cases/conformance/types/spread/objectSpreadInference.ts
deleted file mode 100644
index 9608f0a16cb..00000000000
--- a/tests/cases/conformance/types/spread/objectSpreadInference.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-interface Result<T,U,V> {
-    t: T;
-    u: U;
-    v: V;
-}
-declare function infer<T,U,V>(tuv: { ...T, ...U, a: V }): { t: T, u: U, v: V };
-declare function infer2<T,U,V>(utv: { ...U, a: V, ...T }): { t: T, u: U, v: V };
-function generic<W, X, Y>(w: W, x: X, y: Y) {
-    // should infer { t: {}, u: {}, v: {} } because there is no trailing type parameter
-    return infer({ ...w, ...x, a: y, b: "different type" });
-}
-let b: { b: number };
-let c: { c: number };
-// can only infer { t: {}, u: {}, v: {} }
-let i1 = infer({ ...b, ...c, a: 12 });
-// can only infer { t: {}, u: {}, v: {} }
-let i2 = infer2({ ...b, ...c, a: 12 });
-// can only infer { t: {}, u: {}, v: {} }
-let i3 = generic(b, c, { a: 12 });
diff --git a/tests/cases/conformance/types/spread/objectSpreadIntersection.ts b/tests/cases/conformance/types/spread/objectSpreadIntersection.ts
deleted file mode 100644
index 3bedacca89f..00000000000
--- a/tests/cases/conformance/types/spread/objectSpreadIntersection.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-function iteratedUnionIntersection<T, U, V>(t: T, u: U, v: V): void {
-    let tu: T | U;
-    let uv: U & V;
-    let result = { ...tu, ...uv, id: 'foo' };
-    let assignable: { ...(T | U), ...(U & V), id: string } = result;
-}
-// concrete types work
-interface A1 { a: number }
-interface A2 { a: string }
-interface B1 { b: number }
-interface B2 { b: string }
-let a12: A1 & A2;
-let b12: B1 & B2;
-let result = { ...a12, ...b12 };
-let sn: number & string = result.a;
-sn = result.b;
-let assignable: { ...(A1 & A2), ...(B1 & B2) } = result;
-
-function tripleIntersection<T, U, V>(t: T, u: U, v: V): void {
-    let tuv: T & U & V;
-    let result = { ...tuv, id: 'bar' };
-    let assignable: { ...(T & U & V), id: string } = result;
-}
-function iteratedDoubleIntersection<T, U, V>(t: T, u: U, v: V): void {
-    let tu: T & U;
-    let uv: U & V;
-    let result = { ...tu, ...uv, id: 'baz' };
-    let assignable: { ...(T & U), ...(U & V), id: string } = result;
-}
-function iteratedIntersectionUnion<T, U, V>(t: T, u: U, v: V): void {
-    let tu: T & U;
-    let uv: U | V;
-    let result = { ...tu, ...uv, id: 'qux' };
-    let assignable: { ...(T & U), ...(U | V), id: string } = result;
-}
-
diff --git a/tests/cases/conformance/types/spread/objectSpreadNegative.ts b/tests/cases/conformance/types/spread/objectSpreadNegative.ts
index 146ab072bbf..3cd819d0613 100644
--- a/tests/cases/conformance/types/spread/objectSpreadNegative.ts
+++ b/tests/cases/conformance/types/spread/objectSpreadNegative.ts
@@ -8,7 +8,9 @@ class PrivateOptionalX {
 class PublicX {
     public x: number;
 }
-let o2: { ...PublicX, ...PrivateOptionalX };
+let publicX: PublicX;
+let privateOptionalX: PrivateOptionalX;
+let o2 = { ...publicX, ...privateOptionalX };
 let sn: number = o2.x; // error, x is private
 let optionalString: { sn?: string };
 let optionalNumber: { sn?: number };
@@ -18,30 +20,27 @@ let allOptional: { sn: string | number } = { ...optionalString, ...optionalNumbe
 // assignability as target
 interface Bool { b: boolean };
 interface Str { s: string };
-let spread: { ...Bool, ...Str } = { s: 'foo' }; // error, missing 'b'
-let b: Bool;
+let spread = { ...{ b: true }, ...{s: "foo" } };
+spread = { s: "foo" };  // error, missing 'b'
+let b = { b: false };
 spread = b; // error, missing 's'
 
 // literal repeats are not allowed, but spread repeats are fine
 let duplicated = { b: 'bad', ...o, b: 'bad', ...o2, b: 'bad' }
 let duplicatedSpread = { ...o, ...o }
 
-// null and undefined are just skipped
-let spreadNull = { ...null }
-spreadNull.null;
-let spreadUndefined = { ...undefined }
-spreadUndefined.undefined;
-
-// primitives and functions are skipped
+// null, undefined and primitives are not allowed
+let spreadNull = { ...null };
+let spreadUndefind = { ...undefined };
 let spreadNum = { ...12 };
-spreadNum.toFixed(); // error, no methods from number
 let spreadSum = { ...1 + 1 };
 spreadSum.toFixed(); // error, no methods from number
+let spreadBool = { ...false };
+spreadBool.valueOf(); // error, what were you thinking?
 let spreadStr = { ...'foo' };
 spreadStr.length; // error, no 'length'
 spreadStr.charAt(1); // error, no methods either
-let spreadBool = { ...true };
-spreadBool.valueOf(); // error, what were you thinking?
+// functions are skipped
 let spreadFunc = { ...function () { } }
 spreadFunc(); // error, no call signature
 
@@ -55,14 +54,18 @@ let c: C = new C()
 let spreadC = { ...c }
 spreadC.m(); // error 'm' is not in '{ ... c }'
 
-let callableConstructableSpread: { ...PublicX, (n: number): number, new (p: number) };
-callableConstructableSpread(12); // error, no call signature
-new callableConstructableSpread(12); // error, no construct signature
-
-function override<T,U,V>(initial: U, override: U, t: T, v: V): U {
-    // { ... T & V } is not assignable to { ... T & U }
-    let tvs: { ...T & V };
-    let mistake: { ...T & U } = tvs;
-    // { ...U } is not assignable to U
+// generics
+function f<T, U>(t: T, u: U) {
+    return { ...t, ...u, id: 'id' };
+}
+function override<U>(initial: U, override: U): U {
     return { ...initial, ...override };
 }
+let exclusive: { id: string, a: number, b: string, c: string, d: boolean } =
+    f({ a: 1, b: 'yes' }, { c: 'no', d: false })
+let overlap: { id: string, a: number, b: string } =
+    f({ a: 1 }, { a: 2, b: 'extra' })
+let overlapConflict: { id:string, a: string } =
+    f({ a: 1 }, { a: 'mismatch' })
+let overwriteId: { id: string, a: number, c: number, d: string } =
+    f({ a: 1, id: true }, { c: 1, d: 'no' })
diff --git a/tests/cases/conformance/types/spread/objectSpreadScenarios.ts b/tests/cases/conformance/types/spread/objectSpreadScenarios.ts
deleted file mode 100644
index 1db930cb71c..00000000000
--- a/tests/cases/conformance/types/spread/objectSpreadScenarios.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-interface A1 { a: boolean }
-interface B1 { b: number };
-function override<U>(initial: U, override: U): { ...U, ...U } {
-    return { ...initial, ...override };
-}
-function update<U>(this: { u: { ...U } }, override: U): void {
-    this.u = { ...this.u, ...override };
-}
-function mixin<T, U>(one: T, two: U): { ...T, ...U } {
-    return { ...one, ...two };
-}
-let a1: A1 = { a: true };
-let b1: B1 = { b: 101 };
-a1 = override(a1, { a: false });
-let host = { u: a1, update };
-host.update({ a: false });
-let mixed = mixin(a1, b1);
diff --git a/tests/cases/conformance/types/spread/objectSpreadUnion.ts b/tests/cases/conformance/types/spread/objectSpreadUnion.ts
deleted file mode 100644
index cd490d76bda..00000000000
--- a/tests/cases/conformance/types/spread/objectSpreadUnion.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-// concrete types work
-interface A1 { a: number }
-interface A2 { a: string }
-let a12: A1 | A2;
-let result = { ...a12 };
-let sn: number | string = result.a;
-let assignable: { ...(A1 | A2) } = result;
-
-function tripleUnion<T, U, V>(t: T, u: U, v: V): void {
-    let tuv: T | U | V;
-    let result = { ...tuv, id: 'foo' };
-    let expected: { ...T, id: string } | { ...U, id: string } | { ...V, id: string } = result;
-    let assignable: { ...(T | U | V), id: string } = result;
-}
-function iteratedDoubleUnion<T, U, V>(t: T, u: U, v: V): void {
-    let tu: T | U;
-    let uv: U | V;
-    let result = { ...tu, ...uv, id: 'bar' };
-    let expected: { ...T, ...U, id: string } | { ...T, ...V, id: string } | { ...U, id: string } | { ...U, ...V, id: string };
-    let assignable: { ...(T | U), ...(U | V), id: string } = result;
-}
-
-
diff --git a/tests/cases/fourslash/findAllRefsForObjectSpread.ts b/tests/cases/fourslash/findAllRefsForObjectSpread.ts
index 650324a5d84..05c83491f66 100644
--- a/tests/cases/fourslash/findAllRefsForObjectSpread.ts
+++ b/tests/cases/fourslash/findAllRefsForObjectSpread.ts
@@ -2,7 +2,9 @@
 
 ////interface A1 { [|a|]: string };
 ////interface A2 { [|a|]?: number };
-////let a12: { ...A1, ...A2 };
+////let a1: A1;
+////let a2: A2;
+////let a12 = { ...a1, ...a2 };
 ////a12.[|a|];
 const ranges = test.ranges();
 // members of spread types only refer to themselves and the resulting property
diff --git a/tests/cases/fourslash/goToDefinitionObjectSpread.ts b/tests/cases/fourslash/goToDefinitionObjectSpread.ts
index 64623c36cb7..b23d0a80448 100644
--- a/tests/cases/fourslash/goToDefinitionObjectSpread.ts
+++ b/tests/cases/fourslash/goToDefinitionObjectSpread.ts
@@ -2,6 +2,8 @@
 
 ////interface A1 { /*1*/a: number };
 ////interface A2 { /*2*/a?: number };
-////let a12: { ...A1, ...A2 };
+////let a1: A1;
+////let a2: A2;
+////let a12 = { ...a1, ...a2 };
 ////a12.a/*3*/;
 verify.goToDefinition('3', [ '1', '2' ]);
diff --git a/tests/cases/fourslash/renameObjectSpread.ts b/tests/cases/fourslash/renameObjectSpread.ts
index a2c640361e5..eba148c0e39 100644
--- a/tests/cases/fourslash/renameObjectSpread.ts
+++ b/tests/cases/fourslash/renameObjectSpread.ts
@@ -2,7 +2,9 @@
 
 ////interface A1 { [|a|]: number };
 ////interface A2 { [|a|]?: number };
-////let a12: { ...A1, ...A2 };
+////let a1: A1;
+////let a2: A2;
+////let a12 = { ...a1, ...a2 };
 ////a12.[|a|];
 const ranges = test.ranges();
 verify.assertHasRanges(ranges);

From 7a2c7ad37420ad8f11652a6b87116c1b20fca802 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Thu, 3 Nov 2016 09:41:31 -0700
Subject: [PATCH 089/421] Spread handles index signatures from singleton
 spreads

I broke it when simplifying the logic earlier.
---
 src/compiler/checker.ts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 872aad6b046..3475a9d52c6 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -5888,8 +5888,17 @@ namespace ts {
             Debug.assert(!!(left.flags & TypeFlags.Object) && !!(right.flags & TypeFlags.Object), "Only object types may be spread.");
             const members = createMap<Symbol>();
             const skippedPrivateMembers = createMap<boolean>();
-            const stringIndexInfo = unionSpreadIndexInfos(getIndexInfoOfType(left, IndexKind.String), getIndexInfoOfType(right, IndexKind.String));
-            const numberIndexInfo = unionSpreadIndexInfos(getIndexInfoOfType(left, IndexKind.Number), getIndexInfoOfType(right, IndexKind.Number));
+            let stringIndexInfo: IndexInfo;
+            let numberIndexInfo: IndexInfo;
+            if (left === emptyObjectType) {
+                // for the first spread element, left === emptyObjectType, so take the right's string indexer
+                stringIndexInfo = getIndexInfoOfType(right, IndexKind.String);
+                numberIndexInfo = getIndexInfoOfType(right, IndexKind.Number);
+            }
+            else {
+                stringIndexInfo = unionSpreadIndexInfos(getIndexInfoOfType(left, IndexKind.String), getIndexInfoOfType(right, IndexKind.String));
+                numberIndexInfo = unionSpreadIndexInfos(getIndexInfoOfType(left, IndexKind.Number), getIndexInfoOfType(right, IndexKind.Number));
+            }
 
             const isFromSpread = right.symbol !== symbol;
             for (const rightProp of getPropertiesOfType(right)) {

From 7ed52044d11fb30e396a171847faee0fa1d5ce42 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Thu, 3 Nov 2016 10:54:07 -0700
Subject: [PATCH 090/421] Update objectRestAssignment test and baselines

---
 .../reference/objectRestAssignment.js         | 10 ++---
 .../reference/objectRestAssignment.symbols    | 40 +++++++++----------
 .../reference/objectRestAssignment.types      | 28 ++++++-------
 3 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/tests/baselines/reference/objectRestAssignment.js b/tests/baselines/reference/objectRestAssignment.js
index 7ecd54c5152..20f87ff8375 100644
--- a/tests/baselines/reference/objectRestAssignment.js
+++ b/tests/baselines/reference/objectRestAssignment.js
@@ -1,9 +1,8 @@
 //// [objectRestAssignment.ts]
-let x;
-let ka;
-let nested;
-let other;
-let rest;
+let ka: any;
+let nested: { ki };
+let other: number;
+let rest: { };
 let complex: { x: { ka, ki }, y: number };
 ({x: { ka, ...nested }, y: other, ...rest} = complex);
 
@@ -15,7 +14,6 @@ var __rest = (this && this.__rest) || function (s, e) {
         t[p] = s[p];
     return t;
 };
-var x;
 var ka;
 var nested;
 var other;
diff --git a/tests/baselines/reference/objectRestAssignment.symbols b/tests/baselines/reference/objectRestAssignment.symbols
index 3c54290b595..38127dbee2d 100644
--- a/tests/baselines/reference/objectRestAssignment.symbols
+++ b/tests/baselines/reference/objectRestAssignment.symbols
@@ -1,30 +1,28 @@
 === tests/cases/conformance/types/rest/objectRestAssignment.ts ===
-let x;
->x : Symbol(x, Decl(objectRestAssignment.ts, 0, 3))
+let ka: any;
+>ka : Symbol(ka, Decl(objectRestAssignment.ts, 0, 3))
 
-let ka;
->ka : Symbol(ka, Decl(objectRestAssignment.ts, 1, 3))
+let nested: { ki };
+>nested : Symbol(nested, Decl(objectRestAssignment.ts, 1, 3))
+>ki : Symbol(ki, Decl(objectRestAssignment.ts, 1, 13))
 
-let nested;
->nested : Symbol(nested, Decl(objectRestAssignment.ts, 2, 3))
+let other: number;
+>other : Symbol(other, Decl(objectRestAssignment.ts, 2, 3))
 
-let other;
->other : Symbol(other, Decl(objectRestAssignment.ts, 3, 3))
-
-let rest;
->rest : Symbol(rest, Decl(objectRestAssignment.ts, 4, 3))
+let rest: { };
+>rest : Symbol(rest, Decl(objectRestAssignment.ts, 3, 3))
 
 let complex: { x: { ka, ki }, y: number };
->complex : Symbol(complex, Decl(objectRestAssignment.ts, 5, 3))
->x : Symbol(x, Decl(objectRestAssignment.ts, 5, 14))
->ka : Symbol(ka, Decl(objectRestAssignment.ts, 5, 19))
->ki : Symbol(ki, Decl(objectRestAssignment.ts, 5, 23))
->y : Symbol(y, Decl(objectRestAssignment.ts, 5, 29))
+>complex : Symbol(complex, Decl(objectRestAssignment.ts, 4, 3))
+>x : Symbol(x, Decl(objectRestAssignment.ts, 4, 14))
+>ka : Symbol(ka, Decl(objectRestAssignment.ts, 4, 19))
+>ki : Symbol(ki, Decl(objectRestAssignment.ts, 4, 23))
+>y : Symbol(y, Decl(objectRestAssignment.ts, 4, 29))
 
 ({x: { ka, ...nested }, y: other, ...rest} = complex);
->x : Symbol(x, Decl(objectRestAssignment.ts, 6, 2))
->ka : Symbol(ka, Decl(objectRestAssignment.ts, 6, 6))
->y : Symbol(y, Decl(objectRestAssignment.ts, 6, 23))
->other : Symbol(other, Decl(objectRestAssignment.ts, 3, 3))
->complex : Symbol(complex, Decl(objectRestAssignment.ts, 5, 3))
+>x : Symbol(x, Decl(objectRestAssignment.ts, 5, 2))
+>ka : Symbol(ka, Decl(objectRestAssignment.ts, 5, 6))
+>y : Symbol(y, Decl(objectRestAssignment.ts, 5, 23))
+>other : Symbol(other, Decl(objectRestAssignment.ts, 2, 3))
+>complex : Symbol(complex, Decl(objectRestAssignment.ts, 4, 3))
 
diff --git a/tests/baselines/reference/objectRestAssignment.types b/tests/baselines/reference/objectRestAssignment.types
index 5af3e5872b9..a4d88f89bb2 100644
--- a/tests/baselines/reference/objectRestAssignment.types
+++ b/tests/baselines/reference/objectRestAssignment.types
@@ -1,18 +1,16 @@
 === tests/cases/conformance/types/rest/objectRestAssignment.ts ===
-let x;
->x : any
-
-let ka;
+let ka: any;
 >ka : any
 
-let nested;
->nested : any
+let nested: { ki };
+>nested : { ki: any; }
+>ki : any
 
-let other;
->other : any
+let other: number;
+>other : number
 
-let rest;
->rest : any
+let rest: { };
+>rest : {}
 
 let complex: { x: { ka, ki }, y: number };
 >complex : { x: { ka: any; ki: any; }; y: number; }
@@ -24,13 +22,13 @@ let complex: { x: { ka, ki }, y: number };
 ({x: { ka, ...nested }, y: other, ...rest} = complex);
 >({x: { ka, ...nested }, y: other, ...rest} = complex) : { x: { ka: any; ki: any; }; y: number; }
 >{x: { ka, ...nested }, y: other, ...rest} = complex : { x: { ka: any; ki: any; }; y: number; }
->{x: { ka, ...nested }, y: other, ...rest} : { x: { ka: any; }; y: any; }
->x : { ka: any; }
->{ ka, ...nested } : { ka: any; }
+>{x: { ka, ...nested }, y: other, ...rest} : { x: { ki: any; ka: any; }; y: number; }
+>x : { ki: any; ka: any; }
+>{ ka, ...nested } : { ki: any; ka: any; }
 >ka : any
 >nested : any
->y : any
->other : any
+>y : number
+>other : number
 >rest : any
 >complex : { x: { ka: any; ki: any; }; y: number; }
 

From 0b71df50997de7e09ff91836b7190ba237ab235d Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Thu, 3 Nov 2016 12:28:19 -0700
Subject: [PATCH 091/421] Add a `.d.ts` file to the test to ensure it is
 excluded from the calculation too

---
 .../reference/commonSourceDirectory.js          | 13 +++++++++++--
 .../reference/commonSourceDirectory.symbols     | 17 ++++++++++++++---
 .../reference/commonSourceDirectory.types       | 17 ++++++++++++++---
 tests/cases/compiler/commonSourceDirectory.ts   | 12 ++++++++++--
 4 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/tests/baselines/reference/commonSourceDirectory.js b/tests/baselines/reference/commonSourceDirectory.js
index 3babba98337..5299095ae74 100644
--- a/tests/baselines/reference/commonSourceDirectory.js
+++ b/tests/baselines/reference/commonSourceDirectory.js
@@ -5,12 +5,21 @@
 
 export const x = 0;
 
+//// [bar.d.ts]
+declare module "bar" {
+    export const y = 0;
+}
+
 //// [index.ts]
+/// <reference path="../types/bar.d.ts"/>
 import { x } from "foo";
-x + 1;
+import { y } from "bar";
+x + y;
 
 
 //// [/app/bin/index.js]
 "use strict";
+/// <reference path="../types/bar.d.ts"/>
 var foo_1 = require("foo");
-foo_1.x + 1;
+var bar_1 = require("bar");
+foo_1.x + bar_1.y;
diff --git a/tests/baselines/reference/commonSourceDirectory.symbols b/tests/baselines/reference/commonSourceDirectory.symbols
index 88ded4c8c87..5409286ede5 100644
--- a/tests/baselines/reference/commonSourceDirectory.symbols
+++ b/tests/baselines/reference/commonSourceDirectory.symbols
@@ -1,9 +1,14 @@
 === /app/index.ts ===
+/// <reference path="../types/bar.d.ts"/>
 import { x } from "foo";
->x : Symbol(x, Decl(index.ts, 0, 8))
+>x : Symbol(x, Decl(index.ts, 1, 8))
 
-x + 1;
->x : Symbol(x, Decl(index.ts, 0, 8))
+import { y } from "bar";
+>y : Symbol(y, Decl(index.ts, 2, 8))
+
+x + y;
+>x : Symbol(x, Decl(index.ts, 1, 8))
+>y : Symbol(y, Decl(index.ts, 2, 8))
 
 === /node_modules/foo/index.ts ===
 // Test that importing a file from `node_modules` does not affect calculation of the common source directory.
@@ -11,3 +16,9 @@ x + 1;
 export const x = 0;
 >x : Symbol(x, Decl(index.ts, 2, 12))
 
+=== /types/bar.d.ts ===
+declare module "bar" {
+    export const y = 0;
+>y : Symbol(y, Decl(bar.d.ts, 1, 16))
+}
+
diff --git a/tests/baselines/reference/commonSourceDirectory.types b/tests/baselines/reference/commonSourceDirectory.types
index a0c66b86ae0..ce0169582d7 100644
--- a/tests/baselines/reference/commonSourceDirectory.types
+++ b/tests/baselines/reference/commonSourceDirectory.types
@@ -1,11 +1,15 @@
 === /app/index.ts ===
+/// <reference path="../types/bar.d.ts"/>
 import { x } from "foo";
 >x : 0
 
-x + 1;
->x + 1 : number
+import { y } from "bar";
+>y : 0
+
+x + y;
+>x + y : number
 >x : 0
->1 : 1
+>y : 0
 
 === /node_modules/foo/index.ts ===
 // Test that importing a file from `node_modules` does not affect calculation of the common source directory.
@@ -14,3 +18,10 @@ export const x = 0;
 >x : 0
 >0 : 0
 
+=== /types/bar.d.ts ===
+declare module "bar" {
+    export const y = 0;
+>y : 0
+>0 : 0
+}
+
diff --git a/tests/cases/compiler/commonSourceDirectory.ts b/tests/cases/compiler/commonSourceDirectory.ts
index 6583da67c6a..930f922e10d 100644
--- a/tests/cases/compiler/commonSourceDirectory.ts
+++ b/tests/cases/compiler/commonSourceDirectory.ts
@@ -6,13 +6,21 @@
 // @filename: /node_modules/foo/index.ts
 export const x = 0;
 
+// @filename: /types/bar.d.ts
+declare module "bar" {
+    export const y = 0;
+}
+
 // @filename: /app/index.ts
+/// <reference path="../types/bar.d.ts"/>
 import { x } from "foo";
-x + 1;
+import { y } from "bar";
+x + y;
 
 // @filename: /app/tsconfig.json
 {
     "compilerOptions": {
-        "outDir": "bin"
+        "outDir": "bin",
+        "typeRoots": ["../types"]
     }
 }

From 2f453ce674c6f3f35610215ffc8944e0ca8b3281 Mon Sep 17 00:00:00 2001
From: Paul van Brenk <paul.van.brenk@microsoft.com>
Date: Thu, 3 Nov 2016 12:48:28 -0700
Subject: [PATCH 092/421] Handle most module cases

---
 src/harness/fourslash.ts                      |  2 +-
 .../codefixes/unusedIdentifierFixes.ts        | 95 ++++++++++++++-----
 tests/cases/fourslash/unusedImports12FS.ts    |  2 +-
 tests/cases/fourslash/unusedImports1FS.ts     |  2 +-
 tests/cases/fourslash/unusedImports2FS.ts     |  4 +-
 tests/cases/fourslash/unusedMethodInClass5.ts |  8 ++
 tests/cases/fourslash/unusedMethodInClass6.ts |  8 ++
 7 files changed, 92 insertions(+), 29 deletions(-)
 create mode 100644 tests/cases/fourslash/unusedMethodInClass5.ts
 create mode 100644 tests/cases/fourslash/unusedMethodInClass6.ts

diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
index e58a189c923..fb1545d6aa4 100644
--- a/src/harness/fourslash.ts
+++ b/src/harness/fourslash.ts
@@ -2055,7 +2055,7 @@ namespace FourSlash {
 
             const diagnostic = !errorCode ? diagnostics[0] : ts.find(diagnostics, d => d.code == errorCode);
 
-            return this.languageService.getCodeFixesAtPosition(fileName, diagnostic.start, diagnostic.length, [diagnostic.code]);
+            return this.languageService.getCodeFixesAtPosition(fileName, diagnostic.start, diagnostic.start + diagnostic.length, [diagnostic.code]);
         }
 
         public verifyCodeFixAtPosition(expectedText: string, errorCode?: number) {
diff --git a/src/services/codefixes/unusedIdentifierFixes.ts b/src/services/codefixes/unusedIdentifierFixes.ts
index 1e8220d4b7a..e563b78583f 100644
--- a/src/services/codefixes/unusedIdentifierFixes.ts
+++ b/src/services/codefixes/unusedIdentifierFixes.ts
@@ -8,7 +8,13 @@ namespace ts.codefix {
         getCodeActions: (context: CodeFixContext) => {
             const sourceFile = context.sourceFile;
             const start = context.span.start;
-            const token = getTokenAtPosition(sourceFile, start);
+
+            let token = getTokenAtPosition(sourceFile, start);
+
+            // this handles var ["computed"] = 12;
+            if (token.kind === SyntaxKind.OpenBracketToken) {
+                token = getTokenAtPosition(sourceFile, start + 1);
+            }
 
             switch (token.kind) {
                 case ts.SyntaxKind.Identifier:
@@ -72,34 +78,43 @@ namespace ts.codefix {
                                 return removeSingleItem(functionDeclaration.parameters, token);
                             }
 
-                        case SyntaxKind.ImportSpecifier:
-                            const namedImports = <NamedImports>token.parent.parent;
-                            const elements = namedImports.elements;
-                            if (elements.length === 1) {
-                                // Only 1 import and it is unused. So the entire line could be removed.
-                                return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
-                            }
-                            else {
-                                return removeSingleItem(elements, token);
-                            }
-
                         // handle case where 'import a = A;'
                         case SyntaxKind.ImportEqualsDeclaration:
-                            return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
+                            let importEquals = findImportDeclaration(token);
+                            return createCodeFix("", importEquals.pos, importEquals.end - importEquals.pos);
 
-                        // handle case where 'import d from './file'
-                        case SyntaxKind.ImportClause:
-                            return createCodeFix("", token.parent.parent.pos, token.parent.parent.end - token.parent.parent.pos);
+                        case SyntaxKind.ImportSpecifier:
+                            const namedImports = <NamedImports>token.parent.parent;
+                            if (namedImports.elements.length === 1) {
+                                // Only 1 import and it is unused. So the entire declaration should be removed.
+                                let importSpec = findImportDeclaration(token);
+                                return createCodeFix("", importSpec.pos, importSpec.end - importSpec.pos);
+                            }
+                            else {
+                                return removeSingleItem(namedImports.elements, token);
+                            }
 
-                        // handle case where 'import * as a from './file'
+                        // handle case where "import d, * as ns from './file'" 
+                        // or "'import {a, b as ns} from './file'"
+                        case SyntaxKind.ImportClause: // this covers both 'import |d|' and 'import |d,| *'  
+                            const importClause = <ImportClause>token.parent;
+                            if (!importClause.namedBindings) { // |import d from './file'| or |import * as ns from './file'|
+                                const importDecl = findImportDeclaration(importClause);
+                                return createCodeFix("", importDecl.pos, importDecl.end - importDecl.pos);
+                            }
+                            else { // import |d,| * as ns from './file'
+                                return createCodeFix("", importClause.name.pos, importClause.namedBindings.pos - importClause.name.pos);
+                            }
+
                         case SyntaxKind.NamespaceImport:
-                            return createCodeFix("", token.parent.parent.parent.pos, token.parent.parent.parent.end - token.parent.parent.parent.pos);
-
-                        default:
-                            if (isDeclarationName(token)) {
-                                return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
+                            const namespaceImport = <NamespaceImport>token.parent;
+                            if(namespaceImport.name == token && !(<ImportClause>namespaceImport.parent).name){
+                                const importDecl = findImportDeclaration(namespaceImport);
+                                return createCodeFix("", importDecl.pos, importDecl.end - importDecl.pos);
+                            } else {
+                                const start = (<ImportClause>namespaceImport.parent).name.end;
+                                return createCodeFix("", start, (<ImportClause>namespaceImport.parent).namedBindings.end - start);
                             }
-                            break;
                     }
                     break;
 
@@ -109,8 +124,24 @@ namespace ts.codefix {
                 case SyntaxKind.NamespaceImport:
                     return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
             }
+            if (isDeclarationName(token)) {
+                return createCodeFix("", token.parent.pos, token.parent.end - token.parent.pos);
+            }
+            else if (isLiteralComputedPropertyDeclarationName(token)) {
+                return createCodeFix("", token.parent.parent.pos, token.parent.parent.end - token.parent.parent.pos);
+            }
+            else {
+                return undefined;
+            }
 
-            return undefined;
+            function findImportDeclaration(token: Node): Node {
+                let importDecl = token;
+                while (importDecl.kind != SyntaxKind.ImportDeclaration && importDecl.parent) {
+                    importDecl = importDecl.parent;
+                }
+
+                return importDecl;
+            }
 
             function createCodeFix(newText: string, start: number, length: number): CodeAction[] {
                 return [{
@@ -133,3 +164,19 @@ namespace ts.codefix {
         }
     });
 }
+
+const s = "hello";
+
+class C {
+
+
+
+    private ["string"]: string;
+    private "b  iz": string;
+
+    bar() {
+        this
+    }
+}
+
+
diff --git a/tests/cases/fourslash/unusedImports12FS.ts b/tests/cases/fourslash/unusedImports12FS.ts
index 647b7dfbe16..4d8243eb4ab 100644
--- a/tests/cases/fourslash/unusedImports12FS.ts
+++ b/tests/cases/fourslash/unusedImports12FS.ts
@@ -10,4 +10,4 @@
 //// export function f2(s: string){};
 //// export default f1;
 
-verify.codeFixAtPosition('import f1 "./file1";');
\ No newline at end of file
+verify.codeFixAtPosition('import f1 from "./file1";');
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedImports1FS.ts b/tests/cases/fourslash/unusedImports1FS.ts
index 411e9b3530b..d9fc17a2448 100644
--- a/tests/cases/fourslash/unusedImports1FS.ts
+++ b/tests/cases/fourslash/unusedImports1FS.ts
@@ -2,7 +2,7 @@
 
 // @noUnusedLocals: true
 // @Filename: file2.ts
-////   [| import { Calculator } from "./file1" |]
+////   [|import { Calculator } from "./file1" |]
 
 // @Filename: file1.ts
 ////    export class Calculator {
diff --git a/tests/cases/fourslash/unusedImports2FS.ts b/tests/cases/fourslash/unusedImports2FS.ts
index a27f568b0d2..6e3d9527c52 100644
--- a/tests/cases/fourslash/unusedImports2FS.ts
+++ b/tests/cases/fourslash/unusedImports2FS.ts
@@ -2,8 +2,8 @@
 
 // @noUnusedLocals: true
 // @Filename: file2.ts
-//// [| import {Calculator} from "./file1"
-//// import {test} from "./file1" |]
+//// [|import {Calculator} from "./file1"
+//// import {test} from "./file1"|]
 
 //// var x = new Calculator();
 //// x.handleChar();
diff --git a/tests/cases/fourslash/unusedMethodInClass5.ts b/tests/cases/fourslash/unusedMethodInClass5.ts
new file mode 100644
index 00000000000..36ef3670cac
--- /dev/null
+++ b/tests/cases/fourslash/unusedMethodInClass5.ts
@@ -0,0 +1,8 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// [|class C {
+////     private ["string"] (){} 
+//// }|]
+
+verify.codeFixAtPosition("class C { }");
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedMethodInClass6.ts b/tests/cases/fourslash/unusedMethodInClass6.ts
new file mode 100644
index 00000000000..71fcb92d037
--- /dev/null
+++ b/tests/cases/fourslash/unusedMethodInClass6.ts
@@ -0,0 +1,8 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+//// [|class C {
+////     private "string" (){} 
+//// }|]
+
+verify.codeFixAtPosition("class C { }");
\ No newline at end of file

From 40c0cbd7b58ed17f5cd3d7e1fe5e2220552aa9ac Mon Sep 17 00:00:00 2001
From: Paul van Brenk <paul.van.brenk@microsoft.com>
Date: Thu, 3 Nov 2016 13:28:08 -0700
Subject: [PATCH 093/421] Clean up

---
 .../codefixes/unusedIdentifierFixes.ts        | 27 +++++--------------
 src/services/tsconfig.json                    |  2 +-
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/src/services/codefixes/unusedIdentifierFixes.ts b/src/services/codefixes/unusedIdentifierFixes.ts
index e563b78583f..8e14bdcb73e 100644
--- a/src/services/codefixes/unusedIdentifierFixes.ts
+++ b/src/services/codefixes/unusedIdentifierFixes.ts
@@ -80,14 +80,14 @@ namespace ts.codefix {
 
                         // handle case where 'import a = A;'
                         case SyntaxKind.ImportEqualsDeclaration:
-                            let importEquals = findImportDeclaration(token);
+                            const importEquals = findImportDeclaration(token);
                             return createCodeFix("", importEquals.pos, importEquals.end - importEquals.pos);
 
                         case SyntaxKind.ImportSpecifier:
                             const namedImports = <NamedImports>token.parent.parent;
                             if (namedImports.elements.length === 1) {
                                 // Only 1 import and it is unused. So the entire declaration should be removed.
-                                let importSpec = findImportDeclaration(token);
+                                const importSpec = findImportDeclaration(token);
                                 return createCodeFix("", importSpec.pos, importSpec.end - importSpec.pos);
                             }
                             else {
@@ -108,10 +108,11 @@ namespace ts.codefix {
 
                         case SyntaxKind.NamespaceImport:
                             const namespaceImport = <NamespaceImport>token.parent;
-                            if(namespaceImport.name == token && !(<ImportClause>namespaceImport.parent).name){
+                            if (namespaceImport.name == token && !(<ImportClause>namespaceImport.parent).name) {
                                 const importDecl = findImportDeclaration(namespaceImport);
                                 return createCodeFix("", importDecl.pos, importDecl.end - importDecl.pos);
-                            } else {
+                            }
+                            else {
                                 const start = (<ImportClause>namespaceImport.parent).name.end;
                                 return createCodeFix("", start, (<ImportClause>namespaceImport.parent).namedBindings.end - start);
                             }
@@ -163,20 +164,4 @@ namespace ts.codefix {
             }
         }
     });
-}
-
-const s = "hello";
-
-class C {
-
-
-
-    private ["string"]: string;
-    private "b  iz": string;
-
-    bar() {
-        this
-    }
-}
-
-
+}
\ No newline at end of file
diff --git a/src/services/tsconfig.json b/src/services/tsconfig.json
index 0066ef94343..17ca5ac9739 100644
--- a/src/services/tsconfig.json
+++ b/src/services/tsconfig.json
@@ -1,4 +1,4 @@
-{
+{
     "compilerOptions": {
         "noImplicitAny": true,
         "noImplicitThis": true,

From 14f8b9990f7307484ab317c6b9016d50a26db1c7 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Thu, 3 Nov 2016 13:33:16 -0700
Subject: [PATCH 094/421] Update objectRestAssignment test

Missed previously, just got the baselines
---
 .../cases/conformance/types/rest/objectRestAssignment.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/cases/conformance/types/rest/objectRestAssignment.ts b/tests/cases/conformance/types/rest/objectRestAssignment.ts
index 19be53d29a3..4c8da304bc3 100644
--- a/tests/cases/conformance/types/rest/objectRestAssignment.ts
+++ b/tests/cases/conformance/types/rest/objectRestAssignment.ts
@@ -1,7 +1,6 @@
-let x;
-let ka;
-let nested;
-let other;
-let rest;
+let ka: any;
+let nested: { ki };
+let other: number;
+let rest: { };
 let complex: { x: { ka, ki }, y: number };
 ({x: { ka, ...nested }, y: other, ...rest} = complex);

From c9c5f49a24c0ea8a56af4797f710de3fec0ebd3a Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Thu, 3 Nov 2016 13:36:35 -0700
Subject: [PATCH 095/421] Improve readability of ES next destructuring emit

---
 src/compiler/transformers/destructuring.ts | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/compiler/transformers/destructuring.ts b/src/compiler/transformers/destructuring.ts
index bac8e994201..4c9682c10b6 100644
--- a/src/compiler/transformers/destructuring.ts
+++ b/src/compiler/transformers/destructuring.ts
@@ -311,7 +311,10 @@ namespace ts {
             for (let i = 0; i < properties.length; i++) {
                 const p = properties[i];
                 if (p.kind === SyntaxKind.PropertyAssignment || p.kind === SyntaxKind.ShorthandPropertyAssignment) {
-                    if (!transformRest || p.transformFlags & TransformFlags.ContainsSpreadExpression) {
+                    if (transformRest && !(p.transformFlags & TransformFlags.ContainsSpreadExpression)) {
+                        es2015.push(p);
+                    }
+                    else {
                         if (es2015.length) {
                             emitRestAssignment(es2015, value, location, target);
                             es2015 = [];
@@ -321,9 +324,6 @@ namespace ts {
                         // Assignment for bindingTarget = value.propName should highlight whole property, hence use p as source map node
                         emitDestructuringAssignment(bindingTarget, createDestructuringPropertyAccess(value, propName), p);
                     }
-                    else {
-                        es2015.push(p);
-                    }
                 }
                 else if (i === properties.length - 1 && p.kind === SyntaxKind.SpreadElementExpression) {
                     Debug.assert((p as SpreadElementExpression).expression.kind === SyntaxKind.Identifier);
@@ -460,7 +460,11 @@ namespace ts {
                                                     name);
                     emitBindingElement(element, restCall);
                 }
-                else if (!transformRest || element.transformFlags & TransformFlags.ContainsSpreadExpression) {
+                else if (transformRest && !(element.transformFlags & TransformFlags.ContainsSpreadExpression)) {
+                    // do not emit until we have a complete bundle of ES2015 syntax
+                    es2015.push(element);
+                }
+                else {
                     if (es2015.length) {
                         emitRestAssignment(es2015, value, target, target);
                         es2015 = [];
@@ -469,10 +473,6 @@ namespace ts {
                     const propName = element.propertyName || <Identifier>element.name;
                     emitBindingElement(element, createDestructuringPropertyAccess(value, propName));
                 }
-                else {
-                    // do not emit until we have a complete bundle of ES2015 syntax
-                    es2015.push(element);
-                }
             }
             if (es2015.length) {
                 emitRestAssignment(es2015, value, target, target);

From d1a8af532092378b07e3d441838070e5b5360466 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Thu, 3 Nov 2016 14:35:27 -0700
Subject: [PATCH 096/421] Parse '[P in K]' part of mapped type as a type
 parameter declaration

---
 src/compiler/binder.ts  |  2 ++
 src/compiler/checker.ts | 18 +++++++++++++++---
 src/compiler/parser.ts  | 15 ++++++++++-----
 src/compiler/types.ts   |  3 +--
 4 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index 0a2df4f70d5..e9419ab1cc6 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -1302,6 +1302,7 @@ namespace ts {
                 case SyntaxKind.JSDocFunctionType:
                 case SyntaxKind.ModuleDeclaration:
                 case SyntaxKind.TypeAliasDeclaration:
+                case SyntaxKind.MappedType:
                     return ContainerFlags.IsContainer | ContainerFlags.HasLocals;
 
                 case SyntaxKind.SourceFile:
@@ -1421,6 +1422,7 @@ namespace ts {
                 case SyntaxKind.ArrowFunction:
                 case SyntaxKind.JSDocFunctionType:
                 case SyntaxKind.TypeAliasDeclaration:
+                case SyntaxKind.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
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 647bc7e3e5d..9e1a0b6ec7b 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -5834,6 +5834,18 @@ namespace ts {
             return links.resolvedType;
         }
 
+        function getTypeFromMappedTypeNode(node: MappedTypeNode) {
+            const links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                getTypeFromTypeNode(node.typeParameter.constraint);
+                if (node.type) {
+                    getTypeFromTypeNode(node.type);
+                }
+                links.resolvedType = unknownType;
+            }
+            return links.resolvedType;
+        }
+
         function getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node: Node, aliasSymbol?: Symbol, aliasTypeArguments?: Type[]): Type {
             const links = getNodeLinks(node);
             if (!links.resolvedType) {
@@ -6003,7 +6015,7 @@ namespace ts {
                 case SyntaxKind.IndexedAccessType:
                     return getTypeFromIndexedAccessTypeNode(<IndexedAccessTypeNode>node);
                 case SyntaxKind.MappedType:
-                    return unknownType;  // !!!
+                    return getTypeFromMappedTypeNode(<MappedTypeNode>node);
                 // This function assumes that an identifier or qualified name is a type expression
                 // Callers should first ensure this by calling isTypeNode
                 case SyntaxKind.Identifier:
@@ -15075,7 +15087,7 @@ namespace ts {
         }
 
         function checkMappedType(node: MappedTypeNode) {
-            node; // !!!
+            getTypeFromMappedTypeNode(node);
         }
 
         function isPrivateWithinAmbient(node: Node): boolean {
@@ -18318,7 +18330,7 @@ namespace ts {
                     return checkSourceElement((<ParenthesizedTypeNode | TypeOperatorNode>node).type);
                 case SyntaxKind.IndexedAccessType:
                     return checkIndexedAccessType(<IndexedAccessTypeNode>node);
-                case SyntaxKind.IndexedAccessType:
+                case SyntaxKind.MappedType:
                     return checkMappedType(<MappedTypeNode>node);
                 case SyntaxKind.FunctionDeclaration:
                     return checkFunctionDeclaration(<FunctionDeclaration>node);
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index f4a41d8da12..a685baea3e9 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -140,8 +140,7 @@ namespace ts {
                 return visitNode(cbNode, (<IndexedAccessTypeNode>node).objectType) ||
                     visitNode(cbNode, (<IndexedAccessTypeNode>node).indexType);
             case SyntaxKind.MappedType:
-                return visitNode(cbNode, (<MappedTypeNode>node).iterationTypeName) ||
-                    visitNode(cbNode, (<MappedTypeNode>node).indexType) ||
+                return visitNode(cbNode, (<MappedTypeNode>node).typeParameter) ||
                     visitNode(cbNode, (<MappedTypeNode>node).type);
             case SyntaxKind.LiteralType:
                 return visitNode(cbNode, (<LiteralTypeNode>node).literal);
@@ -2411,14 +2410,20 @@ namespace ts {
             return token() === SyntaxKind.OpenBracketToken && nextTokenIsIdentifier() && nextToken() === SyntaxKind.InKeyword;
         }
 
+        function parseMappedTypeParameter() {
+            const node = <TypeParameterDeclaration>createNode(SyntaxKind.TypeParameter);
+            node.name = parseIdentifier();
+            parseExpected(SyntaxKind.InKeyword);
+            node.constraint = parseType();
+            return finishNode(node);
+        }
+
         function parseMappedType() {
             const node = <MappedTypeNode>createNode(SyntaxKind.MappedType);
             parseExpected(SyntaxKind.OpenBraceToken);
             node.readonlyToken = parseOptionalToken(SyntaxKind.ReadonlyKeyword);
             parseExpected(SyntaxKind.OpenBracketToken);
-            node.iterationTypeName = parseIdentifier();
-            parseExpected(SyntaxKind.InKeyword);
-            node.indexType = parseType();
+            node.typeParameter = parseMappedTypeParameter();
             parseExpected(SyntaxKind.CloseBracketToken);
             node.questionToken = parseOptionalToken(SyntaxKind.QuestionToken);
             node.type = parseTypeAnnotation();
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 22fbe29c76b..6858d028377 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -902,8 +902,7 @@ namespace ts {
     export interface MappedTypeNode extends TypeNode {
         kind: SyntaxKind.MappedType;
         readonlyToken?: ReadonlyToken;
-        iterationTypeName: Identifier;
-        indexType: TypeNode;
+        typeParameter: TypeParameterDeclaration;
         questionToken?: QuestionToken;
         type?: TypeNode;
     }

From cbec19afd76855b48c95ba09498ac21d5a17b544 Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Thu, 3 Nov 2016 17:21:36 -0700
Subject: [PATCH 097/421] Ensure transformFlags are correct before visiting a
 node.

---
 src/compiler/visitor.ts                       |   2 +
 tests/baselines/reference/callWithSpread.js   |  24 ++-
 .../reference/callWithSpread.symbols          | 115 +++++++++---
 .../baselines/reference/callWithSpread.types  | 177 ++++++++++++++----
 .../functionCalls/callWithSpread.ts           |  10 +-
 5 files changed, 257 insertions(+), 71 deletions(-)

diff --git a/src/compiler/visitor.ts b/src/compiler/visitor.ts
index 609031a8221..45b82a6a08a 100644
--- a/src/compiler/visitor.ts
+++ b/src/compiler/visitor.ts
@@ -553,6 +553,7 @@ namespace ts {
             return undefined;
         }
 
+        aggregateTransformFlags(node);
         const visited = visitor(node);
         if (visited === node) {
             return node;
@@ -621,6 +622,7 @@ namespace ts {
         // Visit each original node.
         for (let i = 0; i < count; i++) {
             const node = nodes[i + start];
+            aggregateTransformFlags(node);
             const visited = node !== undefined ? visitor(node) : undefined;
             if (updated !== undefined || visited === undefined || visited !== node) {
                 if (updated === undefined) {
diff --git a/tests/baselines/reference/callWithSpread.js b/tests/baselines/reference/callWithSpread.js
index 161eb36dbcf..69f7e4e30b0 100644
--- a/tests/baselines/reference/callWithSpread.js
+++ b/tests/baselines/reference/callWithSpread.js
@@ -1,6 +1,6 @@
 //// [callWithSpread.ts]
 interface X {
-    foo(x: number, y: number, ...z: string[]);
+    foo(x: number, y: number, ...z: string[]): X;
 }
 
 function foo(x: number, y: number, ...z: string[]) {
@@ -19,10 +19,18 @@ obj.foo(1, 2, "abc");
 obj.foo(1, 2, ...a);
 obj.foo(1, 2, ...a, "abc");
 
+obj.foo(1, 2, ...a).foo(1, 2, "abc");
+obj.foo(1, 2, ...a).foo(1, 2, ...a);
+obj.foo(1, 2, ...a).foo(1, 2, ...a, "abc");
+
 (obj.foo)(1, 2, "abc");
 (obj.foo)(1, 2, ...a);
 (obj.foo)(1, 2, ...a, "abc");
 
+((obj.foo)(1, 2, ...a).foo)(1, 2, "abc");
+((obj.foo)(1, 2, ...a).foo)(1, 2, ...a);
+((obj.foo)(1, 2, ...a).foo)(1, 2, ...a, "abc");
+
 xa[1].foo(1, 2, "abc");
 xa[1].foo(1, 2, ...a);
 xa[1].foo(1, 2, ...a, "abc");
@@ -72,13 +80,19 @@ foo.apply(void 0, [1, 2].concat(a, ["abc"]));
 obj.foo(1, 2, "abc");
 obj.foo.apply(obj, [1, 2].concat(a));
 obj.foo.apply(obj, [1, 2].concat(a, ["abc"]));
+obj.foo.apply(obj, [1, 2].concat(a)).foo(1, 2, "abc");
+(_a = obj.foo.apply(obj, [1, 2].concat(a))).foo.apply(_a, [1, 2].concat(a));
+(_b = obj.foo.apply(obj, [1, 2].concat(a))).foo.apply(_b, [1, 2].concat(a, ["abc"]));
 (obj.foo)(1, 2, "abc");
 obj.foo.apply(obj, [1, 2].concat(a));
 obj.foo.apply(obj, [1, 2].concat(a, ["abc"]));
+(obj.foo.apply(obj, [1, 2].concat(a)).foo)(1, 2, "abc");
+(_c = obj.foo.apply(obj, [1, 2].concat(a))).foo.apply(_c, [1, 2].concat(a));
+(_d = obj.foo.apply(obj, [1, 2].concat(a))).foo.apply(_d, [1, 2].concat(a, ["abc"]));
 xa[1].foo(1, 2, "abc");
-(_a = xa[1]).foo.apply(_a, [1, 2].concat(a));
-(_b = xa[1]).foo.apply(_b, [1, 2].concat(a, ["abc"]));
-(_c = xa[1]).foo.apply(_c, [1, 2, "abc"]);
+(_e = xa[1]).foo.apply(_e, [1, 2].concat(a));
+(_f = xa[1]).foo.apply(_f, [1, 2].concat(a, ["abc"]));
+(_g = xa[1]).foo.apply(_g, [1, 2, "abc"]);
 var C = (function () {
     function C(x, y) {
         var z = [];
@@ -109,4 +123,4 @@ var D = (function (_super) {
     };
     return D;
 }(C));
-var _a, _b, _c;
+var _a, _b, _c, _d, _e, _f, _g;
diff --git a/tests/baselines/reference/callWithSpread.symbols b/tests/baselines/reference/callWithSpread.symbols
index bc2d9bfebd9..42331422df7 100644
--- a/tests/baselines/reference/callWithSpread.symbols
+++ b/tests/baselines/reference/callWithSpread.symbols
@@ -2,11 +2,12 @@
 interface X {
 >X : Symbol(X, Decl(callWithSpread.ts, 0, 0))
 
-    foo(x: number, y: number, ...z: string[]);
+    foo(x: number, y: number, ...z: string[]): X;
 >foo : Symbol(X.foo, Decl(callWithSpread.ts, 0, 13))
 >x : Symbol(x, Decl(callWithSpread.ts, 1, 8))
 >y : Symbol(y, Decl(callWithSpread.ts, 1, 18))
 >z : Symbol(z, Decl(callWithSpread.ts, 1, 29))
+>X : Symbol(X, Decl(callWithSpread.ts, 0, 0))
 }
 
 function foo(x: number, y: number, ...z: string[]) {
@@ -58,6 +59,32 @@ obj.foo(1, 2, ...a, "abc");
 >foo : Symbol(X.foo, Decl(callWithSpread.ts, 0, 13))
 >a : Symbol(a, Decl(callWithSpread.ts, 7, 3))
 
+obj.foo(1, 2, ...a).foo(1, 2, "abc");
+>obj.foo(1, 2, ...a).foo : Symbol(X.foo, Decl(callWithSpread.ts, 0, 13))
+>obj.foo : Symbol(X.foo, Decl(callWithSpread.ts, 0, 13))
+>obj : Symbol(obj, Decl(callWithSpread.ts, 9, 3))
+>foo : Symbol(X.foo, Decl(callWithSpread.ts, 0, 13))
+>a : Symbol(a, Decl(callWithSpread.ts, 7, 3))
+>foo : Symbol(X.foo, Decl(callWithSpread.ts, 0, 13))
+
+obj.foo(1, 2, ...a).foo(1, 2, ...a);
+>obj.foo(1, 2, ...a).foo : Symbol(X.foo, Decl(callWithSpread.ts, 0, 13))
+>obj.foo : Symbol(X.foo, Decl(callWithSpread.ts, 0, 13))
+>obj : Symbol(obj, Decl(callWithSpread.ts, 9, 3))
+>foo : Symbol(X.foo, Decl(callWithSpread.ts, 0, 13))
+>a : Symbol(a, Decl(callWithSpread.ts, 7, 3))
+>foo : Symbol(X.foo, Decl(callWithSpread.ts, 0, 13))
+>a : Symbol(a, Decl(callWithSpread.ts, 7, 3))
+
+obj.foo(1, 2, ...a).foo(1, 2, ...a, "abc");
+>obj.foo(1, 2, ...a).foo : Symbol(X.foo, Decl(callWithSpread.ts, 0, 13))
+>obj.foo : Symbol(X.foo, Decl(callWithSpread.ts, 0, 13))
+>obj : Symbol(obj, Decl(callWithSpread.ts, 9, 3))
+>foo : Symbol(X.foo, Decl(callWithSpread.ts, 0, 13))
+>a : Symbol(a, Decl(callWithSpread.ts, 7, 3))
+>foo : Symbol(X.foo, Decl(callWithSpread.ts, 0, 13))
+>a : Symbol(a, Decl(callWithSpread.ts, 7, 3))
+
 (obj.foo)(1, 2, "abc");
 >obj.foo : Symbol(X.foo, Decl(callWithSpread.ts, 0, 13))
 >obj : Symbol(obj, Decl(callWithSpread.ts, 9, 3))
@@ -75,6 +102,32 @@ obj.foo(1, 2, ...a, "abc");
 >foo : Symbol(X.foo, Decl(callWithSpread.ts, 0, 13))
 >a : Symbol(a, Decl(callWithSpread.ts, 7, 3))
 
+((obj.foo)(1, 2, ...a).foo)(1, 2, "abc");
+>(obj.foo)(1, 2, ...a).foo : Symbol(X.foo, Decl(callWithSpread.ts, 0, 13))
+>obj.foo : Symbol(X.foo, Decl(callWithSpread.ts, 0, 13))
+>obj : Symbol(obj, Decl(callWithSpread.ts, 9, 3))
+>foo : Symbol(X.foo, Decl(callWithSpread.ts, 0, 13))
+>a : Symbol(a, Decl(callWithSpread.ts, 7, 3))
+>foo : Symbol(X.foo, Decl(callWithSpread.ts, 0, 13))
+
+((obj.foo)(1, 2, ...a).foo)(1, 2, ...a);
+>(obj.foo)(1, 2, ...a).foo : Symbol(X.foo, Decl(callWithSpread.ts, 0, 13))
+>obj.foo : Symbol(X.foo, Decl(callWithSpread.ts, 0, 13))
+>obj : Symbol(obj, Decl(callWithSpread.ts, 9, 3))
+>foo : Symbol(X.foo, Decl(callWithSpread.ts, 0, 13))
+>a : Symbol(a, Decl(callWithSpread.ts, 7, 3))
+>foo : Symbol(X.foo, Decl(callWithSpread.ts, 0, 13))
+>a : Symbol(a, Decl(callWithSpread.ts, 7, 3))
+
+((obj.foo)(1, 2, ...a).foo)(1, 2, ...a, "abc");
+>(obj.foo)(1, 2, ...a).foo : Symbol(X.foo, Decl(callWithSpread.ts, 0, 13))
+>obj.foo : Symbol(X.foo, Decl(callWithSpread.ts, 0, 13))
+>obj : Symbol(obj, Decl(callWithSpread.ts, 9, 3))
+>foo : Symbol(X.foo, Decl(callWithSpread.ts, 0, 13))
+>a : Symbol(a, Decl(callWithSpread.ts, 7, 3))
+>foo : Symbol(X.foo, Decl(callWithSpread.ts, 0, 13))
+>a : Symbol(a, Decl(callWithSpread.ts, 7, 3))
+
 xa[1].foo(1, 2, "abc");
 >xa[1].foo : Symbol(X.foo, Decl(callWithSpread.ts, 0, 13))
 >xa : Symbol(xa, Decl(callWithSpread.ts, 10, 3))
@@ -99,60 +152,60 @@ xa[1].foo(1, 2, ...a, "abc");
 >foo : Symbol(X.foo, Decl(callWithSpread.ts, 0, 13))
 
 class C {
->C : Symbol(C, Decl(callWithSpread.ts, 28, 40))
+>C : Symbol(C, Decl(callWithSpread.ts, 36, 40))
 
     constructor(x: number, y: number, ...z: string[]) {
->x : Symbol(x, Decl(callWithSpread.ts, 31, 16))
->y : Symbol(y, Decl(callWithSpread.ts, 31, 26))
->z : Symbol(z, Decl(callWithSpread.ts, 31, 37))
+>x : Symbol(x, Decl(callWithSpread.ts, 39, 16))
+>y : Symbol(y, Decl(callWithSpread.ts, 39, 26))
+>z : Symbol(z, Decl(callWithSpread.ts, 39, 37))
 
         this.foo(x, y);
->this.foo : Symbol(C.foo, Decl(callWithSpread.ts, 34, 5))
->this : Symbol(C, Decl(callWithSpread.ts, 28, 40))
->foo : Symbol(C.foo, Decl(callWithSpread.ts, 34, 5))
->x : Symbol(x, Decl(callWithSpread.ts, 31, 16))
->y : Symbol(y, Decl(callWithSpread.ts, 31, 26))
+>this.foo : Symbol(C.foo, Decl(callWithSpread.ts, 42, 5))
+>this : Symbol(C, Decl(callWithSpread.ts, 36, 40))
+>foo : Symbol(C.foo, Decl(callWithSpread.ts, 42, 5))
+>x : Symbol(x, Decl(callWithSpread.ts, 39, 16))
+>y : Symbol(y, Decl(callWithSpread.ts, 39, 26))
 
         this.foo(x, y, ...z);
->this.foo : Symbol(C.foo, Decl(callWithSpread.ts, 34, 5))
->this : Symbol(C, Decl(callWithSpread.ts, 28, 40))
->foo : Symbol(C.foo, Decl(callWithSpread.ts, 34, 5))
->x : Symbol(x, Decl(callWithSpread.ts, 31, 16))
->y : Symbol(y, Decl(callWithSpread.ts, 31, 26))
->z : Symbol(z, Decl(callWithSpread.ts, 31, 37))
+>this.foo : Symbol(C.foo, Decl(callWithSpread.ts, 42, 5))
+>this : Symbol(C, Decl(callWithSpread.ts, 36, 40))
+>foo : Symbol(C.foo, Decl(callWithSpread.ts, 42, 5))
+>x : Symbol(x, Decl(callWithSpread.ts, 39, 16))
+>y : Symbol(y, Decl(callWithSpread.ts, 39, 26))
+>z : Symbol(z, Decl(callWithSpread.ts, 39, 37))
     }
     foo(x: number, y: number, ...z: string[]) {
->foo : Symbol(C.foo, Decl(callWithSpread.ts, 34, 5))
->x : Symbol(x, Decl(callWithSpread.ts, 35, 8))
->y : Symbol(y, Decl(callWithSpread.ts, 35, 18))
->z : Symbol(z, Decl(callWithSpread.ts, 35, 29))
+>foo : Symbol(C.foo, Decl(callWithSpread.ts, 42, 5))
+>x : Symbol(x, Decl(callWithSpread.ts, 43, 8))
+>y : Symbol(y, Decl(callWithSpread.ts, 43, 18))
+>z : Symbol(z, Decl(callWithSpread.ts, 43, 29))
     }
 }
 
 class D extends C {
->D : Symbol(D, Decl(callWithSpread.ts, 37, 1))
->C : Symbol(C, Decl(callWithSpread.ts, 28, 40))
+>D : Symbol(D, Decl(callWithSpread.ts, 45, 1))
+>C : Symbol(C, Decl(callWithSpread.ts, 36, 40))
 
     constructor() {
         super(1, 2);
->super : Symbol(C, Decl(callWithSpread.ts, 28, 40))
+>super : Symbol(C, Decl(callWithSpread.ts, 36, 40))
 
         super(1, 2, ...a);
->super : Symbol(C, Decl(callWithSpread.ts, 28, 40))
+>super : Symbol(C, Decl(callWithSpread.ts, 36, 40))
 >a : Symbol(a, Decl(callWithSpread.ts, 7, 3))
     }
     foo() {
->foo : Symbol(D.foo, Decl(callWithSpread.ts, 43, 5))
+>foo : Symbol(D.foo, Decl(callWithSpread.ts, 51, 5))
 
         super.foo(1, 2);
->super.foo : Symbol(C.foo, Decl(callWithSpread.ts, 34, 5))
->super : Symbol(C, Decl(callWithSpread.ts, 28, 40))
->foo : Symbol(C.foo, Decl(callWithSpread.ts, 34, 5))
+>super.foo : Symbol(C.foo, Decl(callWithSpread.ts, 42, 5))
+>super : Symbol(C, Decl(callWithSpread.ts, 36, 40))
+>foo : Symbol(C.foo, Decl(callWithSpread.ts, 42, 5))
 
         super.foo(1, 2, ...a);
->super.foo : Symbol(C.foo, Decl(callWithSpread.ts, 34, 5))
->super : Symbol(C, Decl(callWithSpread.ts, 28, 40))
->foo : Symbol(C.foo, Decl(callWithSpread.ts, 34, 5))
+>super.foo : Symbol(C.foo, Decl(callWithSpread.ts, 42, 5))
+>super : Symbol(C, Decl(callWithSpread.ts, 36, 40))
+>foo : Symbol(C.foo, Decl(callWithSpread.ts, 42, 5))
 >a : Symbol(a, Decl(callWithSpread.ts, 7, 3))
     }
 }
diff --git a/tests/baselines/reference/callWithSpread.types b/tests/baselines/reference/callWithSpread.types
index c9403f1bb69..5af9d2fef84 100644
--- a/tests/baselines/reference/callWithSpread.types
+++ b/tests/baselines/reference/callWithSpread.types
@@ -2,11 +2,12 @@
 interface X {
 >X : X
 
-    foo(x: number, y: number, ...z: string[]);
->foo : (x: number, y: number, ...z: string[]) => any
+    foo(x: number, y: number, ...z: string[]): X;
+>foo : (x: number, y: number, ...z: string[]) => X
 >x : number
 >y : number
 >z : string[]
+>X : X
 }
 
 function foo(x: number, y: number, ...z: string[]) {
@@ -55,29 +56,80 @@ foo(1, 2, ...a, "abc");
 >"abc" : "abc"
 
 obj.foo(1, 2, "abc");
->obj.foo(1, 2, "abc") : any
->obj.foo : (x: number, y: number, ...z: string[]) => any
+>obj.foo(1, 2, "abc") : X
+>obj.foo : (x: number, y: number, ...z: string[]) => X
 >obj : X
->foo : (x: number, y: number, ...z: string[]) => any
+>foo : (x: number, y: number, ...z: string[]) => X
 >1 : 1
 >2 : 2
 >"abc" : "abc"
 
 obj.foo(1, 2, ...a);
->obj.foo(1, 2, ...a) : any
->obj.foo : (x: number, y: number, ...z: string[]) => any
+>obj.foo(1, 2, ...a) : X
+>obj.foo : (x: number, y: number, ...z: string[]) => X
 >obj : X
->foo : (x: number, y: number, ...z: string[]) => any
+>foo : (x: number, y: number, ...z: string[]) => X
 >1 : 1
 >2 : 2
 >...a : string
 >a : string[]
 
 obj.foo(1, 2, ...a, "abc");
->obj.foo(1, 2, ...a, "abc") : any
->obj.foo : (x: number, y: number, ...z: string[]) => any
+>obj.foo(1, 2, ...a, "abc") : X
+>obj.foo : (x: number, y: number, ...z: string[]) => X
 >obj : X
->foo : (x: number, y: number, ...z: string[]) => any
+>foo : (x: number, y: number, ...z: string[]) => X
+>1 : 1
+>2 : 2
+>...a : string
+>a : string[]
+>"abc" : "abc"
+
+obj.foo(1, 2, ...a).foo(1, 2, "abc");
+>obj.foo(1, 2, ...a).foo(1, 2, "abc") : X
+>obj.foo(1, 2, ...a).foo : (x: number, y: number, ...z: string[]) => X
+>obj.foo(1, 2, ...a) : X
+>obj.foo : (x: number, y: number, ...z: string[]) => X
+>obj : X
+>foo : (x: number, y: number, ...z: string[]) => X
+>1 : 1
+>2 : 2
+>...a : string
+>a : string[]
+>foo : (x: number, y: number, ...z: string[]) => X
+>1 : 1
+>2 : 2
+>"abc" : "abc"
+
+obj.foo(1, 2, ...a).foo(1, 2, ...a);
+>obj.foo(1, 2, ...a).foo(1, 2, ...a) : X
+>obj.foo(1, 2, ...a).foo : (x: number, y: number, ...z: string[]) => X
+>obj.foo(1, 2, ...a) : X
+>obj.foo : (x: number, y: number, ...z: string[]) => X
+>obj : X
+>foo : (x: number, y: number, ...z: string[]) => X
+>1 : 1
+>2 : 2
+>...a : string
+>a : string[]
+>foo : (x: number, y: number, ...z: string[]) => X
+>1 : 1
+>2 : 2
+>...a : string
+>a : string[]
+
+obj.foo(1, 2, ...a).foo(1, 2, ...a, "abc");
+>obj.foo(1, 2, ...a).foo(1, 2, ...a, "abc") : X
+>obj.foo(1, 2, ...a).foo : (x: number, y: number, ...z: string[]) => X
+>obj.foo(1, 2, ...a) : X
+>obj.foo : (x: number, y: number, ...z: string[]) => X
+>obj : X
+>foo : (x: number, y: number, ...z: string[]) => X
+>1 : 1
+>2 : 2
+>...a : string
+>a : string[]
+>foo : (x: number, y: number, ...z: string[]) => X
 >1 : 1
 >2 : 2
 >...a : string
@@ -85,32 +137,89 @@ obj.foo(1, 2, ...a, "abc");
 >"abc" : "abc"
 
 (obj.foo)(1, 2, "abc");
->(obj.foo)(1, 2, "abc") : any
->(obj.foo) : (x: number, y: number, ...z: string[]) => any
->obj.foo : (x: number, y: number, ...z: string[]) => any
+>(obj.foo)(1, 2, "abc") : X
+>(obj.foo) : (x: number, y: number, ...z: string[]) => X
+>obj.foo : (x: number, y: number, ...z: string[]) => X
 >obj : X
->foo : (x: number, y: number, ...z: string[]) => any
+>foo : (x: number, y: number, ...z: string[]) => X
 >1 : 1
 >2 : 2
 >"abc" : "abc"
 
 (obj.foo)(1, 2, ...a);
->(obj.foo)(1, 2, ...a) : any
->(obj.foo) : (x: number, y: number, ...z: string[]) => any
->obj.foo : (x: number, y: number, ...z: string[]) => any
+>(obj.foo)(1, 2, ...a) : X
+>(obj.foo) : (x: number, y: number, ...z: string[]) => X
+>obj.foo : (x: number, y: number, ...z: string[]) => X
 >obj : X
->foo : (x: number, y: number, ...z: string[]) => any
+>foo : (x: number, y: number, ...z: string[]) => X
 >1 : 1
 >2 : 2
 >...a : string
 >a : string[]
 
 (obj.foo)(1, 2, ...a, "abc");
->(obj.foo)(1, 2, ...a, "abc") : any
->(obj.foo) : (x: number, y: number, ...z: string[]) => any
->obj.foo : (x: number, y: number, ...z: string[]) => any
+>(obj.foo)(1, 2, ...a, "abc") : X
+>(obj.foo) : (x: number, y: number, ...z: string[]) => X
+>obj.foo : (x: number, y: number, ...z: string[]) => X
 >obj : X
->foo : (x: number, y: number, ...z: string[]) => any
+>foo : (x: number, y: number, ...z: string[]) => X
+>1 : 1
+>2 : 2
+>...a : string
+>a : string[]
+>"abc" : "abc"
+
+((obj.foo)(1, 2, ...a).foo)(1, 2, "abc");
+>((obj.foo)(1, 2, ...a).foo)(1, 2, "abc") : X
+>((obj.foo)(1, 2, ...a).foo) : (x: number, y: number, ...z: string[]) => X
+>(obj.foo)(1, 2, ...a).foo : (x: number, y: number, ...z: string[]) => X
+>(obj.foo)(1, 2, ...a) : X
+>(obj.foo) : (x: number, y: number, ...z: string[]) => X
+>obj.foo : (x: number, y: number, ...z: string[]) => X
+>obj : X
+>foo : (x: number, y: number, ...z: string[]) => X
+>1 : 1
+>2 : 2
+>...a : string
+>a : string[]
+>foo : (x: number, y: number, ...z: string[]) => X
+>1 : 1
+>2 : 2
+>"abc" : "abc"
+
+((obj.foo)(1, 2, ...a).foo)(1, 2, ...a);
+>((obj.foo)(1, 2, ...a).foo)(1, 2, ...a) : X
+>((obj.foo)(1, 2, ...a).foo) : (x: number, y: number, ...z: string[]) => X
+>(obj.foo)(1, 2, ...a).foo : (x: number, y: number, ...z: string[]) => X
+>(obj.foo)(1, 2, ...a) : X
+>(obj.foo) : (x: number, y: number, ...z: string[]) => X
+>obj.foo : (x: number, y: number, ...z: string[]) => X
+>obj : X
+>foo : (x: number, y: number, ...z: string[]) => X
+>1 : 1
+>2 : 2
+>...a : string
+>a : string[]
+>foo : (x: number, y: number, ...z: string[]) => X
+>1 : 1
+>2 : 2
+>...a : string
+>a : string[]
+
+((obj.foo)(1, 2, ...a).foo)(1, 2, ...a, "abc");
+>((obj.foo)(1, 2, ...a).foo)(1, 2, ...a, "abc") : X
+>((obj.foo)(1, 2, ...a).foo) : (x: number, y: number, ...z: string[]) => X
+>(obj.foo)(1, 2, ...a).foo : (x: number, y: number, ...z: string[]) => X
+>(obj.foo)(1, 2, ...a) : X
+>(obj.foo) : (x: number, y: number, ...z: string[]) => X
+>obj.foo : (x: number, y: number, ...z: string[]) => X
+>obj : X
+>foo : (x: number, y: number, ...z: string[]) => X
+>1 : 1
+>2 : 2
+>...a : string
+>a : string[]
+>foo : (x: number, y: number, ...z: string[]) => X
 >1 : 1
 >2 : 2
 >...a : string
@@ -118,35 +227,35 @@ obj.foo(1, 2, ...a, "abc");
 >"abc" : "abc"
 
 xa[1].foo(1, 2, "abc");
->xa[1].foo(1, 2, "abc") : any
->xa[1].foo : (x: number, y: number, ...z: string[]) => any
+>xa[1].foo(1, 2, "abc") : X
+>xa[1].foo : (x: number, y: number, ...z: string[]) => X
 >xa[1] : X
 >xa : X[]
 >1 : 1
->foo : (x: number, y: number, ...z: string[]) => any
+>foo : (x: number, y: number, ...z: string[]) => X
 >1 : 1
 >2 : 2
 >"abc" : "abc"
 
 xa[1].foo(1, 2, ...a);
->xa[1].foo(1, 2, ...a) : any
->xa[1].foo : (x: number, y: number, ...z: string[]) => any
+>xa[1].foo(1, 2, ...a) : X
+>xa[1].foo : (x: number, y: number, ...z: string[]) => X
 >xa[1] : X
 >xa : X[]
 >1 : 1
->foo : (x: number, y: number, ...z: string[]) => any
+>foo : (x: number, y: number, ...z: string[]) => X
 >1 : 1
 >2 : 2
 >...a : string
 >a : string[]
 
 xa[1].foo(1, 2, ...a, "abc");
->xa[1].foo(1, 2, ...a, "abc") : any
->xa[1].foo : (x: number, y: number, ...z: string[]) => any
+>xa[1].foo(1, 2, ...a, "abc") : X
+>xa[1].foo : (x: number, y: number, ...z: string[]) => X
 >xa[1] : X
 >xa : X[]
 >1 : 1
->foo : (x: number, y: number, ...z: string[]) => any
+>foo : (x: number, y: number, ...z: string[]) => X
 >1 : 1
 >2 : 2
 >...a : string
@@ -158,11 +267,11 @@ xa[1].foo(1, 2, ...a, "abc");
 >(<Function>xa[1].foo) : Function
 ><Function>xa[1].foo : Function
 >Function : Function
->xa[1].foo : (x: number, y: number, ...z: string[]) => any
+>xa[1].foo : (x: number, y: number, ...z: string[]) => X
 >xa[1] : X
 >xa : X[]
 >1 : 1
->foo : (x: number, y: number, ...z: string[]) => any
+>foo : (x: number, y: number, ...z: string[]) => X
 >...[1, 2, "abc"] : string | number
 >[1, 2, "abc"] : (string | number)[]
 >1 : 1
diff --git a/tests/cases/conformance/expressions/functionCalls/callWithSpread.ts b/tests/cases/conformance/expressions/functionCalls/callWithSpread.ts
index 245028db3d4..b1e2ee75784 100644
--- a/tests/cases/conformance/expressions/functionCalls/callWithSpread.ts
+++ b/tests/cases/conformance/expressions/functionCalls/callWithSpread.ts
@@ -1,5 +1,5 @@
 interface X {
-    foo(x: number, y: number, ...z: string[]);
+    foo(x: number, y: number, ...z: string[]): X;
 }
 
 function foo(x: number, y: number, ...z: string[]) {
@@ -18,10 +18,18 @@ obj.foo(1, 2, "abc");
 obj.foo(1, 2, ...a);
 obj.foo(1, 2, ...a, "abc");
 
+obj.foo(1, 2, ...a).foo(1, 2, "abc");
+obj.foo(1, 2, ...a).foo(1, 2, ...a);
+obj.foo(1, 2, ...a).foo(1, 2, ...a, "abc");
+
 (obj.foo)(1, 2, "abc");
 (obj.foo)(1, 2, ...a);
 (obj.foo)(1, 2, ...a, "abc");
 
+((obj.foo)(1, 2, ...a).foo)(1, 2, "abc");
+((obj.foo)(1, 2, ...a).foo)(1, 2, ...a);
+((obj.foo)(1, 2, ...a).foo)(1, 2, ...a, "abc");
+
 xa[1].foo(1, 2, "abc");
 xa[1].foo(1, 2, ...a);
 xa[1].foo(1, 2, ...a, "abc");

From 1c004bf317a3e9103572668191055ba1c86f1788 Mon Sep 17 00:00:00 2001
From: Zhengbo Li <zhengbli@microsoft.com>
Date: Thu, 3 Nov 2016 21:13:41 -0700
Subject: [PATCH 098/421] Port #12027, #11980 and #11932 to master (#12037)

* add test for the fix for overwrite emitting error

* cr feedback
---
 src/compiler/core.ts                          | 12 +++++++++
 src/compiler/diagnosticMessages.json          |  4 +++
 src/compiler/program.ts                       | 25 ++++++++++++++-----
 src/compiler/types.ts                         |  1 +
 src/harness/fourslash.ts                      | 13 +++++++++-
 .../unittests/tsserverProjectSystem.ts        | 24 ++++++++++++++++++
 src/server/project.ts                         |  4 +++
 ...sWhenEmitBlockingErrorOnOtherFile.baseline |  3 ++-
 .../declarationFileOverwriteError.errors.txt  |  2 ++
 ...rationFileOverwriteErrorWithOut.errors.txt |  2 ++
 .../exportDefaultInJsFile01.errors.txt        |  2 ++
 .../exportDefaultInJsFile02.errors.txt        |  2 ++
 ...tionAmbientVarDeclarationSyntax.errors.txt |  2 ++
 ...CompilationEmitBlockedCorrectly.errors.txt |  2 ++
 .../jsFileCompilationEnumSyntax.errors.txt    |  2 ++
 ...onsWithJsFileReferenceWithNoOut.errors.txt |  2 ++
 ...mpilationExportAssignmentSyntax.errors.txt |  2 ++
 ...tionHeritageClauseSyntaxOfClass.errors.txt |  2 ++
 ...leCompilationImportEqualsSyntax.errors.txt |  2 ++
 ...sFileCompilationInterfaceSyntax.errors.txt |  2 ++
 .../jsFileCompilationModuleSyntax.errors.txt  |  2 ++
 ...onsWithJsFileReferenceWithNoOut.errors.txt |  2 ++
 ...ileCompilationOptionalParameter.errors.txt |  2 ++
 ...lationPublicMethodSyntaxOfClass.errors.txt |  2 ++
 ...pilationPublicParameterModifier.errors.txt |  2 ++
 ...ationReturnTypeSyntaxOfFunction.errors.txt |  2 ++
 .../jsFileCompilationSyntaxError.errors.txt   |  2 ++
 ...sFileCompilationTypeAliasSyntax.errors.txt |  2 ++
 ...ilationTypeArgumentSyntaxOfCall.errors.txt |  2 ++
 ...jsFileCompilationTypeAssertions.errors.txt |  2 ++
 ...sFileCompilationTypeOfParameter.errors.txt |  2 ++
 ...ationTypeParameterSyntaxOfClass.errors.txt |  2 ++
 ...onTypeParameterSyntaxOfFunction.errors.txt |  2 ++
 ...sFileCompilationTypeSyntaxOfVar.errors.txt |  2 ++
 ...hDeclarationEmitPathSameAsInput.errors.txt |  2 ++
 ...lationWithJsEmitPathSameAsInput.errors.txt |  2 ++
 ...sFileCompilationWithMapFileAsJs.errors.txt |  2 ++
 ...hMapFileAsJsWithInlineSourceMap.errors.txt |  2 ++
 ...rationFileNameSameAsInputJsFile.errors.txt |  2 ++
 ...ithOutFileNameSameAsInputJsFile.errors.txt |  2 ++
 .../jsFileCompilationWithoutOut.errors.txt    |  2 ++
 ...eNameDtsNotSpecifiedWithAllowJs.errors.txt |  2 ++
 ...eNameDtsNotSpecifiedWithAllowJs.errors.txt |  2 ++
 43 files changed, 148 insertions(+), 8 deletions(-)

diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index dd71877930a..8175730159b 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -1127,6 +1127,18 @@ namespace ts {
         };
     }
 
+    export function createCompilerDiagnosticFromMessageChain(chain: DiagnosticMessageChain): Diagnostic {
+        return {
+            file: undefined,
+            start: undefined,
+            length: undefined,
+
+            code: chain.code,
+            category: chain.category,
+            messageText: chain.next ? chain : chain.messageText
+        };
+    }
+
     export function chainDiagnosticMessages(details: DiagnosticMessageChain, message: DiagnosticMessage, ...args: any[]): DiagnosticMessageChain;
     export function chainDiagnosticMessages(details: DiagnosticMessageChain, message: DiagnosticMessage): DiagnosticMessageChain {
         let text = getLocaleSpecificMessage(message);
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 5290782c156..9a353e6fb36 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -3158,5 +3158,9 @@
     "Implement inherited abstract class": {
         "category": "Message",
         "code": 90007
+    },
+    "Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig": {
+        "category": "Error",
+        "code": 90009
     }
 }
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 82d274e0487..dcb9cce0adb 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -239,11 +239,11 @@ namespace ts {
                 const { line, character } = getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start);
                 const fileName = diagnostic.file.fileName;
                 const relativeFileName = convertToRelativePath(fileName, host.getCurrentDirectory(), fileName => host.getCanonicalFileName(fileName));
-                output += `${ relativeFileName }(${ line + 1 },${ character + 1 }): `;
+                output += `${relativeFileName}(${line + 1},${character + 1}): `;
             }
 
             const category = DiagnosticCategory[diagnostic.category].toLowerCase();
-            output += `${ category } TS${ diagnostic.code }: ${ flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine()) }${ host.getNewLine() }`;
+            output += `${category} TS${diagnostic.code}: ${flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine())}${host.getNewLine()}`;
         }
         return output;
     }
@@ -1685,13 +1685,24 @@ namespace ts {
                     const emitFilePath = toPath(emitFileName, currentDirectory, getCanonicalFileName);
                     // Report error if the output overwrites input file
                     if (filesByName.contains(emitFilePath)) {
-                        createEmitBlockingDiagnostics(emitFileName, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file);
+                        if (options.noEmitOverwritenFiles && !options.out && !options.outDir && !options.outFile) {
+                            blockEmittingOfFile(emitFileName);
+                        }
+                        else {
+                            let chain: DiagnosticMessageChain;
+                            if (!options.configFilePath) {
+                                // The program is from either an inferred project or an external project
+                                chain = chainDiagnosticMessages(/*details*/ undefined, 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 = chainDiagnosticMessages(chain, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
+                            blockEmittingOfFile(emitFileName, createCompilerDiagnosticFromMessageChain(chain));
+                        }
                     }
 
                     // Report error if multiple files write into same file
                     if (emitFilesSeen.contains(emitFilePath)) {
                         // Already seen the same emit file - report error
-                        createEmitBlockingDiagnostics(emitFileName, Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files);
+                        blockEmittingOfFile(emitFileName, createCompilerDiagnostic(Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files, emitFileName));
                     }
                     else {
                         emitFilesSeen.set(emitFilePath, true);
@@ -1700,9 +1711,11 @@ namespace ts {
             }
         }
 
-        function createEmitBlockingDiagnostics(emitFileName: string, message: DiagnosticMessage) {
+        function blockEmittingOfFile(emitFileName: string, diag?: Diagnostic) {
             hasEmitBlockingDiagnostics.set(toPath(emitFileName, currentDirectory, getCanonicalFileName), true);
-            programDiagnostics.add(createCompilerDiagnostic(message, emitFileName));
+            if (diag) {
+                programDiagnostics.add(diag);
+            }
         }
     }
 
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index b865beca76b..5536a818df5 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -3058,6 +3058,7 @@ namespace ts {
         moduleResolution?: ModuleResolutionKind;
         newLine?: NewLineKind;
         noEmit?: boolean;
+        /*@internal*/noEmitOverwritenFiles?: boolean;
         noEmitHelpers?: boolean;
         noEmitOnError?: boolean;
         noErrorTruncation?: boolean;
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
index b008ca65370..ae32fe3db16 100644
--- a/src/harness/fourslash.ts
+++ b/src/harness/fourslash.ts
@@ -1253,7 +1253,18 @@ namespace FourSlash {
                             resultString += "Diagnostics:" + Harness.IO.newLine();
                             const diagnostics = ts.getPreEmitDiagnostics(this.languageService.getProgram());
                             for (const diagnostic of diagnostics) {
-                                resultString += "  " + diagnostic.messageText + Harness.IO.newLine();
+                                if (typeof diagnostic.messageText !== "string") {
+                                    let chainedMessage = <ts.DiagnosticMessageChain>diagnostic.messageText;
+                                    let indentation = " ";
+                                    while (chainedMessage) {
+                                        resultString += indentation + chainedMessage.messageText + Harness.IO.newLine();
+                                        chainedMessage = chainedMessage.next;
+                                        indentation = indentation + " ";
+                                    }
+                                }
+                                else {
+                                    resultString += "  " + diagnostic.messageText + Harness.IO.newLine();
+                                }
                             }
                         }
 
diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
index 870926a8c55..15cfa3f8c8e 100644
--- a/src/harness/unittests/tsserverProjectSystem.ts
+++ b/src/harness/unittests/tsserverProjectSystem.ts
@@ -2505,4 +2505,28 @@ namespace ts.projectSystem {
             checkProjectActualFiles(projectService.inferredProjects[0], [f.path]);
         });
     });
+
+    describe("No overwrite emit error", () => {
+        it("for inferred project", () => {
+            const f1 = {
+                path: "/a/b/f1.js",
+                content: "function test1() { }"
+            };
+            const host = createServerHost([f1, libFile]);
+            const session = createSession(host);
+            openFilesForSession([f1], session);
+
+            const projectService = session.getProjectService();
+            checkNumberOfProjects(projectService, { inferredProjects: 1 });
+            const projectName = projectService.inferredProjects[0].getProjectName();
+
+            const diags = session.executeCommand(<server.protocol.CompilerOptionsDiagnosticsRequest>{
+                type: "request",
+                command: server.CommandNames.CompilerOptionsDiagnosticsFull,
+                seq: 2,
+                arguments: { projectFileName: projectName }
+            }).response;
+            assert.isTrue(diags.length === 0);
+        });
+    });
 }
\ No newline at end of file
diff --git a/src/server/project.ts b/src/server/project.ts
index 457f5e2b261..563b0456910 100644
--- a/src/server/project.ts
+++ b/src/server/project.ts
@@ -161,6 +161,10 @@ namespace ts.server {
                 this.compilerOptions.allowNonTsExtensions = true;
             }
 
+            if (this.projectKind === ProjectKind.Inferred) {
+                this.compilerOptions.noEmitOverwritenFiles = true;
+            }
+
             if (languageServiceEnabled) {
                 this.enableLanguageService();
             }
diff --git a/tests/baselines/reference/compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.baseline b/tests/baselines/reference/compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.baseline
index a088006d145..f8b479e6d7b 100644
--- a/tests/baselines/reference/compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.baseline
+++ b/tests/baselines/reference/compileOnSaveWorksWhenEmitBlockingErrorOnOtherFile.baseline
@@ -1,6 +1,7 @@
 EmitSkipped: true
 Diagnostics:
-  Cannot write file '/tests/cases/fourslash/b.js' because it would overwrite input file.
+ Cannot write file '/tests/cases/fourslash/b.js' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 
 EmitSkipped: false
 FileName : /tests/cases/fourslash/a.js
diff --git a/tests/baselines/reference/declarationFileOverwriteError.errors.txt b/tests/baselines/reference/declarationFileOverwriteError.errors.txt
index 1974976dee1..211469778b1 100644
--- a/tests/baselines/reference/declarationFileOverwriteError.errors.txt
+++ b/tests/baselines/reference/declarationFileOverwriteError.errors.txt
@@ -1,7 +1,9 @@
 error TS5055: Cannot write file 'tests/cases/compiler/a.d.ts' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 
 
 !!! error TS5055: Cannot write file 'tests/cases/compiler/a.d.ts' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 ==== tests/cases/compiler/a.d.ts (0 errors) ====
     
     declare class c {
diff --git a/tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt b/tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt
index 658465de9c2..ea4a93b3b12 100644
--- a/tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt
+++ b/tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt
@@ -1,7 +1,9 @@
 error TS5055: Cannot write file 'tests/cases/compiler/out.d.ts' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 
 
 !!! error TS5055: Cannot write file 'tests/cases/compiler/out.d.ts' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 ==== tests/cases/compiler/out.d.ts (0 errors) ====
     
     declare class c {
diff --git a/tests/baselines/reference/exportDefaultInJsFile01.errors.txt b/tests/baselines/reference/exportDefaultInJsFile01.errors.txt
index 34035e1e14e..0565c8bd61e 100644
--- a/tests/baselines/reference/exportDefaultInJsFile01.errors.txt
+++ b/tests/baselines/reference/exportDefaultInJsFile01.errors.txt
@@ -1,7 +1,9 @@
 error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile01.js' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 
 
 !!! error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile01.js' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 ==== tests/cases/conformance/salsa/myFile01.js (0 errors) ====
     
     export default "hello";
\ No newline at end of file
diff --git a/tests/baselines/reference/exportDefaultInJsFile02.errors.txt b/tests/baselines/reference/exportDefaultInJsFile02.errors.txt
index 5e17306e066..a74fbacfcfd 100644
--- a/tests/baselines/reference/exportDefaultInJsFile02.errors.txt
+++ b/tests/baselines/reference/exportDefaultInJsFile02.errors.txt
@@ -1,7 +1,9 @@
 error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile02.js' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 
 
 !!! error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile02.js' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 ==== tests/cases/conformance/salsa/myFile02.js (0 errors) ====
     
     export default "hello";
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationAmbientVarDeclarationSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationAmbientVarDeclarationSyntax.errors.txt
index 19bfd5d1c02..039834ff702 100644
--- a/tests/baselines/reference/jsFileCompilationAmbientVarDeclarationSyntax.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationAmbientVarDeclarationSyntax.errors.txt
@@ -1,8 +1,10 @@
 error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 tests/cases/compiler/a.js(1,1): error TS8009: 'declare' can only be used in a .ts file.
 
 
 !!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 ==== tests/cases/compiler/a.js (1 errors) ====
     declare var v;
     ~~~~~~~
diff --git a/tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.errors.txt b/tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.errors.txt
index 0aa9d5733d5..75bcf88b10a 100644
--- a/tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.errors.txt
@@ -1,8 +1,10 @@
 error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 error TS5056: Cannot write file 'tests/cases/compiler/a.js' because it would be overwritten by multiple input files.
 
 
 !!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 !!! error TS5056: Cannot write file 'tests/cases/compiler/a.js' because it would be overwritten by multiple input files.
 ==== tests/cases/compiler/a.ts (0 errors) ====
     class c {
diff --git a/tests/baselines/reference/jsFileCompilationEnumSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationEnumSyntax.errors.txt
index 538dfb38972..c6da8931d5e 100644
--- a/tests/baselines/reference/jsFileCompilationEnumSyntax.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationEnumSyntax.errors.txt
@@ -1,8 +1,10 @@
 error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 tests/cases/compiler/a.js(1,6): error TS8015: 'enum declarations' can only be used in a .ts file.
 
 
 !!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 ==== tests/cases/compiler/a.js (1 errors) ====
     enum E { }
          ~
diff --git a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.errors.txt b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.errors.txt
index 641731936f8..54e91c5d196 100644
--- a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.errors.txt
@@ -1,9 +1,11 @@
 error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
 error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 
 
 !!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
 !!! error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 ==== tests/cases/compiler/a.ts (0 errors) ====
     class c {
     }
diff --git a/tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt
index f537941c55c..babbeea8004 100644
--- a/tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt
@@ -1,8 +1,10 @@
 error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 tests/cases/compiler/a.js(1,1): error TS8003: 'export=' can only be used in a .ts file.
 
 
 !!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 ==== tests/cases/compiler/a.js (1 errors) ====
     export = b;
     ~~~~~~~~~~~
diff --git a/tests/baselines/reference/jsFileCompilationHeritageClauseSyntaxOfClass.errors.txt b/tests/baselines/reference/jsFileCompilationHeritageClauseSyntaxOfClass.errors.txt
index 33b8a45f1aa..3b30663308f 100644
--- a/tests/baselines/reference/jsFileCompilationHeritageClauseSyntaxOfClass.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationHeritageClauseSyntaxOfClass.errors.txt
@@ -1,8 +1,10 @@
 error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 tests/cases/compiler/a.js(1,9): error TS8005: 'implements clauses' can only be used in a .ts file.
 
 
 !!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 ==== tests/cases/compiler/a.js (1 errors) ====
     class C implements D { }
             ~~~~~~~~~~~~
diff --git a/tests/baselines/reference/jsFileCompilationImportEqualsSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationImportEqualsSyntax.errors.txt
index b4161367037..a064f53e92f 100644
--- a/tests/baselines/reference/jsFileCompilationImportEqualsSyntax.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationImportEqualsSyntax.errors.txt
@@ -1,8 +1,10 @@
 error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 tests/cases/compiler/a.js(1,1): error TS8002: 'import ... =' can only be used in a .ts file.
 
 
 !!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 ==== tests/cases/compiler/a.js (1 errors) ====
     import a = b;
     ~~~~~~~~~~~~~
diff --git a/tests/baselines/reference/jsFileCompilationInterfaceSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationInterfaceSyntax.errors.txt
index 17fb8fcb187..9e53438c732 100644
--- a/tests/baselines/reference/jsFileCompilationInterfaceSyntax.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationInterfaceSyntax.errors.txt
@@ -1,8 +1,10 @@
 error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 tests/cases/compiler/a.js(1,11): error TS8006: 'interface declarations' can only be used in a .ts file.
 
 
 !!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 ==== tests/cases/compiler/a.js (1 errors) ====
     interface I { }
               ~
diff --git a/tests/baselines/reference/jsFileCompilationModuleSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationModuleSyntax.errors.txt
index 662028c53ed..6952c0055c0 100644
--- a/tests/baselines/reference/jsFileCompilationModuleSyntax.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationModuleSyntax.errors.txt
@@ -1,8 +1,10 @@
 error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 tests/cases/compiler/a.js(1,8): error TS8007: 'module declarations' can only be used in a .ts file.
 
 
 !!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 ==== tests/cases/compiler/a.js (1 errors) ====
     module M { }
            ~
diff --git a/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.errors.txt b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.errors.txt
index f2f4142b993..888310414f2 100644
--- a/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.errors.txt
@@ -1,7 +1,9 @@
 error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 
 
 !!! error TS5055: Cannot write file 'tests/cases/compiler/c.js' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 ==== tests/cases/compiler/a.ts (0 errors) ====
     class c {
     }
diff --git a/tests/baselines/reference/jsFileCompilationOptionalParameter.errors.txt b/tests/baselines/reference/jsFileCompilationOptionalParameter.errors.txt
index 295f827dd2d..15bfe2281d9 100644
--- a/tests/baselines/reference/jsFileCompilationOptionalParameter.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationOptionalParameter.errors.txt
@@ -1,8 +1,10 @@
 error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 tests/cases/compiler/a.js(1,13): error TS8009: '?' can only be used in a .ts file.
 
 
 !!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 ==== tests/cases/compiler/a.js (1 errors) ====
     function F(p?) { }
                 ~
diff --git a/tests/baselines/reference/jsFileCompilationPublicMethodSyntaxOfClass.errors.txt b/tests/baselines/reference/jsFileCompilationPublicMethodSyntaxOfClass.errors.txt
index d67c9baea70..af95c136205 100644
--- a/tests/baselines/reference/jsFileCompilationPublicMethodSyntaxOfClass.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationPublicMethodSyntaxOfClass.errors.txt
@@ -1,8 +1,10 @@
 error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 tests/cases/compiler/a.js(2,5): error TS8009: 'public' can only be used in a .ts file.
 
 
 !!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 ==== tests/cases/compiler/a.js (1 errors) ====
     class C {
         public foo() {
diff --git a/tests/baselines/reference/jsFileCompilationPublicParameterModifier.errors.txt b/tests/baselines/reference/jsFileCompilationPublicParameterModifier.errors.txt
index bc4913f6217..9314e1da807 100644
--- a/tests/baselines/reference/jsFileCompilationPublicParameterModifier.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationPublicParameterModifier.errors.txt
@@ -1,8 +1,10 @@
 error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 tests/cases/compiler/a.js(1,23): error TS8012: 'parameter modifiers' can only be used in a .ts file.
 
 
 !!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 ==== tests/cases/compiler/a.js (1 errors) ====
     class C { constructor(public x) { }}
                           ~~~~~~
diff --git a/tests/baselines/reference/jsFileCompilationReturnTypeSyntaxOfFunction.errors.txt b/tests/baselines/reference/jsFileCompilationReturnTypeSyntaxOfFunction.errors.txt
index 6dad5a29485..acae950d081 100644
--- a/tests/baselines/reference/jsFileCompilationReturnTypeSyntaxOfFunction.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationReturnTypeSyntaxOfFunction.errors.txt
@@ -1,8 +1,10 @@
 error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 tests/cases/compiler/a.js(1,15): error TS8010: 'types' can only be used in a .ts file.
 
 
 !!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 ==== tests/cases/compiler/a.js (1 errors) ====
     function F(): number { }
                   ~~~~~~
diff --git a/tests/baselines/reference/jsFileCompilationSyntaxError.errors.txt b/tests/baselines/reference/jsFileCompilationSyntaxError.errors.txt
index d98a1e7e7bb..eb4c114d3d0 100644
--- a/tests/baselines/reference/jsFileCompilationSyntaxError.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationSyntaxError.errors.txt
@@ -1,7 +1,9 @@
 error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 
 
 !!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 ==== tests/cases/compiler/a.js (0 errors) ====
     /**
       * @type {number}
diff --git a/tests/baselines/reference/jsFileCompilationTypeAliasSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationTypeAliasSyntax.errors.txt
index 2b5112e1ce2..74978eddf8c 100644
--- a/tests/baselines/reference/jsFileCompilationTypeAliasSyntax.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationTypeAliasSyntax.errors.txt
@@ -1,8 +1,10 @@
 error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 tests/cases/compiler/a.js(1,6): error TS8008: 'type aliases' can only be used in a .ts file.
 
 
 !!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 ==== tests/cases/compiler/a.js (1 errors) ====
     type a = b;
          ~
diff --git a/tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.errors.txt b/tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.errors.txt
index 8ac59196ed9..f53ec55d2b1 100644
--- a/tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationTypeArgumentSyntaxOfCall.errors.txt
@@ -1,8 +1,10 @@
 error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 tests/cases/compiler/a.js(1,5): error TS8011: 'type arguments' can only be used in a .ts file.
 
 
 !!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 ==== tests/cases/compiler/a.js (1 errors) ====
     Foo<number>();
         ~~~~~~
diff --git a/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt b/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt
index 662eea4d405..be1e6d32436 100644
--- a/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt
@@ -1,9 +1,11 @@
 error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 tests/cases/compiler/a.js(1,10): error TS17008: JSX element 'string' has no corresponding closing tag.
 tests/cases/compiler/a.js(1,27): error TS1005: '</' expected.
 
 
 !!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 ==== tests/cases/compiler/a.js (2 errors) ====
     var v = <string>undefined;
              ~~~~~~
diff --git a/tests/baselines/reference/jsFileCompilationTypeOfParameter.errors.txt b/tests/baselines/reference/jsFileCompilationTypeOfParameter.errors.txt
index 680b32a64f1..811c0793ffe 100644
--- a/tests/baselines/reference/jsFileCompilationTypeOfParameter.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationTypeOfParameter.errors.txt
@@ -1,8 +1,10 @@
 error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 tests/cases/compiler/a.js(1,15): error TS8010: 'types' can only be used in a .ts file.
 
 
 !!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 ==== tests/cases/compiler/a.js (1 errors) ====
     function F(a: number) { }
                   ~~~~~~
diff --git a/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfClass.errors.txt b/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfClass.errors.txt
index 161c832ffd5..0fe902aa661 100644
--- a/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfClass.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfClass.errors.txt
@@ -1,8 +1,10 @@
 error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 tests/cases/compiler/a.js(1,9): error TS8004: 'type parameter declarations' can only be used in a .ts file.
 
 
 !!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 ==== tests/cases/compiler/a.js (1 errors) ====
     class C<T> { }
             ~
diff --git a/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfFunction.errors.txt b/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfFunction.errors.txt
index d7626f68564..bfc4c7be26a 100644
--- a/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfFunction.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationTypeParameterSyntaxOfFunction.errors.txt
@@ -1,8 +1,10 @@
 error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 tests/cases/compiler/a.js(1,12): error TS8004: 'type parameter declarations' can only be used in a .ts file.
 
 
 !!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 ==== tests/cases/compiler/a.js (1 errors) ====
     function F<T>() { }
                ~
diff --git a/tests/baselines/reference/jsFileCompilationTypeSyntaxOfVar.errors.txt b/tests/baselines/reference/jsFileCompilationTypeSyntaxOfVar.errors.txt
index 2c6ac3771be..65333751780 100644
--- a/tests/baselines/reference/jsFileCompilationTypeSyntaxOfVar.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationTypeSyntaxOfVar.errors.txt
@@ -1,8 +1,10 @@
 error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 tests/cases/compiler/a.js(1,8): error TS8010: 'types' can only be used in a .ts file.
 
 
 !!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 ==== tests/cases/compiler/a.js (1 errors) ====
     var v: () => number;
            ~~~~~~~~~~~~
diff --git a/tests/baselines/reference/jsFileCompilationWithDeclarationEmitPathSameAsInput.errors.txt b/tests/baselines/reference/jsFileCompilationWithDeclarationEmitPathSameAsInput.errors.txt
index 9e9c2adb0ef..4170e818fd7 100644
--- a/tests/baselines/reference/jsFileCompilationWithDeclarationEmitPathSameAsInput.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationWithDeclarationEmitPathSameAsInput.errors.txt
@@ -1,7 +1,9 @@
 error TS5055: Cannot write file 'tests/cases/compiler/a.d.ts' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 
 
 !!! error TS5055: Cannot write file 'tests/cases/compiler/a.d.ts' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 ==== tests/cases/compiler/a.ts (0 errors) ====
     class c {
     }
diff --git a/tests/baselines/reference/jsFileCompilationWithJsEmitPathSameAsInput.errors.txt b/tests/baselines/reference/jsFileCompilationWithJsEmitPathSameAsInput.errors.txt
index 4cc2cc2ab45..8004efd02ef 100644
--- a/tests/baselines/reference/jsFileCompilationWithJsEmitPathSameAsInput.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationWithJsEmitPathSameAsInput.errors.txt
@@ -1,8 +1,10 @@
 error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 error TS5056: Cannot write file 'tests/cases/compiler/a.js' because it would be overwritten by multiple input files.
 
 
 !!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 !!! error TS5056: Cannot write file 'tests/cases/compiler/a.js' because it would be overwritten by multiple input files.
 ==== tests/cases/compiler/a.ts (0 errors) ====
     class c {
diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.errors.txt b/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.errors.txt
index 06186b9f0b2..069c562f29b 100644
--- a/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.errors.txt
@@ -1,8 +1,10 @@
 error TS5055: Cannot write file 'tests/cases/compiler/b.js' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 error TS6054: File 'tests/cases/compiler/b.js.map' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts', '.js', '.jsx'.
 
 
 !!! error TS5055: Cannot write file 'tests/cases/compiler/b.js' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 !!! error TS6054: File 'tests/cases/compiler/b.js.map' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts', '.js', '.jsx'.
 ==== tests/cases/compiler/a.ts (0 errors) ====
     
diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.errors.txt b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.errors.txt
index 06186b9f0b2..069c562f29b 100644
--- a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.errors.txt
@@ -1,8 +1,10 @@
 error TS5055: Cannot write file 'tests/cases/compiler/b.js' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 error TS6054: File 'tests/cases/compiler/b.js.map' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts', '.js', '.jsx'.
 
 
 !!! error TS5055: Cannot write file 'tests/cases/compiler/b.js' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 !!! error TS6054: File 'tests/cases/compiler/b.js.map' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts', '.js', '.jsx'.
 ==== tests/cases/compiler/a.ts (0 errors) ====
     
diff --git a/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt b/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt
index 10c7b8c90dd..0a4f0cdf1a4 100644
--- a/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt
@@ -1,7 +1,9 @@
 error TS5055: Cannot write file 'tests/cases/compiler/b.d.ts' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 
 
 !!! error TS5055: Cannot write file 'tests/cases/compiler/b.d.ts' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 ==== tests/cases/compiler/a.ts (0 errors) ====
     class c {
     }
diff --git a/tests/baselines/reference/jsFileCompilationWithOutFileNameSameAsInputJsFile.errors.txt b/tests/baselines/reference/jsFileCompilationWithOutFileNameSameAsInputJsFile.errors.txt
index 0f6852b21a0..3f72a8113ef 100644
--- a/tests/baselines/reference/jsFileCompilationWithOutFileNameSameAsInputJsFile.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationWithOutFileNameSameAsInputJsFile.errors.txt
@@ -1,7 +1,9 @@
 error TS5055: Cannot write file 'tests/cases/compiler/b.js' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 
 
 !!! error TS5055: Cannot write file 'tests/cases/compiler/b.js' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 ==== tests/cases/compiler/a.ts (0 errors) ====
     class c {
     }
diff --git a/tests/baselines/reference/jsFileCompilationWithoutOut.errors.txt b/tests/baselines/reference/jsFileCompilationWithoutOut.errors.txt
index 0f6852b21a0..3f72a8113ef 100644
--- a/tests/baselines/reference/jsFileCompilationWithoutOut.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationWithoutOut.errors.txt
@@ -1,7 +1,9 @@
 error TS5055: Cannot write file 'tests/cases/compiler/b.js' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 
 
 !!! error TS5055: Cannot write file 'tests/cases/compiler/b.js' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 ==== tests/cases/compiler/a.ts (0 errors) ====
     class c {
     }
diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt
index ac25edc1bd5..668f037a03b 100644
--- a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt
+++ b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt
@@ -1,9 +1,11 @@
 error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
 error TS5055: Cannot write file 'SameNameDTsNotSpecifiedWithAllowJs/a.js' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 
 
 !!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
 !!! error TS5055: Cannot write file 'SameNameDTsNotSpecifiedWithAllowJs/a.js' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 ==== SameNameDTsNotSpecifiedWithAllowJs/a.d.ts (0 errors) ====
     declare var a: number;
 ==== SameNameDTsNotSpecifiedWithAllowJs/a.js (0 errors) ====
diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt
index ac25edc1bd5..668f037a03b 100644
--- a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt
+++ b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt
@@ -1,9 +1,11 @@
 error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
 error TS5055: Cannot write file 'SameNameDTsNotSpecifiedWithAllowJs/a.js' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 
 
 !!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
 !!! error TS5055: Cannot write file 'SameNameDTsNotSpecifiedWithAllowJs/a.js' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig
 ==== SameNameDTsNotSpecifiedWithAllowJs/a.d.ts (0 errors) ====
     declare var a: number;
 ==== SameNameDTsNotSpecifiedWithAllowJs/a.js (0 errors) ====

From 71f3157a35cacd404371d6020929a1299d959f15 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Fri, 4 Nov 2016 09:03:03 -0700
Subject: [PATCH 099/421] Address PR comments

1. Remove extra line in __rest shim.
2. Improve __rest vs __assign check for destructuring assignment.
---
 src/compiler/binder.ts  | 12 ++++++++++--
 src/compiler/emitter.ts |  1 -
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index a4d9a5a30ed..7aa27e520d3 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -1935,10 +1935,18 @@ namespace ts {
                 case SyntaxKind.SpreadElementExpression:
                 case SyntaxKind.JsxSpreadAttribute:
                     let root = container;
-                    while (root && root.kind !== SyntaxKind.BinaryExpression) {
+                    let hasRest = false;
+                    while (root.parent) {
+                        if (root.kind === SyntaxKind.ObjectLiteralExpression &&
+                            root.parent.kind === SyntaxKind.BinaryExpression &&
+                            (root.parent as BinaryExpression).operatorToken.kind === SyntaxKind.EqualsToken &&
+                            (root.parent as BinaryExpression).left === root) {
+                            hasRest = true;
+                            break;
+                        }
                         root = root.parent;
                     }
-                    emitFlags |= root && isDestructuringAssignment(root) ? NodeFlags.HasRestAttribute : NodeFlags.HasSpreadAttribute;
+                    emitFlags |= hasRest ? NodeFlags.HasRestAttribute : NodeFlags.HasSpreadAttribute;
                     return;
 
                 case SyntaxKind.CallSignature:
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index c89fa1f1550..9885ea9c791 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -45,7 +45,6 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         const restHelper = `
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
-
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && !e.indexOf(p))
         t[p] = s[p];
     return t;

From cc342d12e7c63e4abb2725ee81d747672cefae46 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Fri, 4 Nov 2016 11:06:56 -0700
Subject: [PATCH 100/421] Move convertForOf to factory for esnext and es2015

Saves a lot of duplicated code
---
 src/compiler/factory.ts             | 190 ++++++++++++++++++++++++++++
 src/compiler/transformers/es2015.ts | 166 +-----------------------
 src/compiler/transformers/esnext.ts |  87 +------------
 3 files changed, 192 insertions(+), 251 deletions(-)

diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index c7fe7d70574..7f758f70794 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -3055,4 +3055,194 @@ namespace ts {
     function tryGetModuleNameFromDeclaration(declaration: ImportEqualsDeclaration | ImportDeclaration | ExportDeclaration, host: EmitHost, resolver: EmitResolver, compilerOptions: CompilerOptions) {
         return tryGetModuleNameFromFile(resolver.getExternalModuleFileFromDeclaration(declaration), host, compilerOptions);
     }
+
+    export function convertForOf(node: ForOfStatement, convertedLoopBodyStatements: Statement[],
+                                 visitor: (node: Node) => VisitResult<Node>,
+                                 enableSubstitutionsForBlockScopedBindings: () => void,
+                                 context: TransformationContext,
+                                 convertObjectRest?: boolean): ForStatement | ForOfStatement {
+        // The following ES6 code:
+        //
+        //    for (let v of expr) { }
+        //
+        // should be emitted as
+        //
+        //    for (var _i = 0, _a = expr; _i < _a.length; _i++) {
+        //        var v = _a[_i];
+        //    }
+        //
+        // where _a and _i are temps emitted to capture the RHS and the counter,
+        // respectively.
+        // When the left hand side is an expression instead of a let declaration,
+        // the "let v" is not emitted.
+        // When the left hand side is a let/const, the v is renamed if there is
+        // another v in scope.
+        // Note that all assignments to the LHS are emitted in the body, including
+        // all destructuring.
+        // Note also that because an extra statement is needed to assign to the LHS,
+        // for-of bodies are always emitted as blocks.
+
+        const expression = visitNode(node.expression, visitor, isExpression);
+        const initializer = node.initializer;
+        const statements: Statement[] = [];
+
+        // In the case where the user wrote an identifier as the RHS, like this:
+        //
+        //     for (let v of arr) { }
+        //
+        // we don't want to emit a temporary variable for the RHS, just use it directly.
+        const counter = convertObjectRest ? undefined : createLoopVariable();
+        const rhsReference = expression.kind === SyntaxKind.Identifier
+            ? createUniqueName((<Identifier>expression).text)
+            : createTempVariable(/*recordTempVariable*/ undefined);
+        const elementAccess = convertObjectRest ? rhsReference : createElementAccess(rhsReference, counter);
+
+        // Initialize LHS
+        // var v = _a[_i];
+        if (isVariableDeclarationList(initializer)) {
+            if (initializer.flags & NodeFlags.BlockScoped) {
+                enableSubstitutionsForBlockScopedBindings();
+            }
+
+            const firstOriginalDeclaration = firstOrUndefined(initializer.declarations);
+            if (firstOriginalDeclaration && isBindingPattern(firstOriginalDeclaration.name)) {
+                // This works whether the declaration is a var, let, or const.
+                // It will use rhsIterationValue _a[_i] as the initializer.
+                const declarations = flattenVariableDestructuring(
+                    firstOriginalDeclaration,
+                    elementAccess,
+                    visitor,
+                    /*recordTempVariable*/ undefined,
+                    convertObjectRest
+                );
+
+                const declarationList = createVariableDeclarationList(declarations, /*location*/ initializer);
+                setOriginalNode(declarationList, initializer);
+
+                // Adjust the source map range for the first declaration to align with the old
+                // emitter.
+                const firstDeclaration = declarations[0];
+                const lastDeclaration = lastOrUndefined(declarations);
+                setSourceMapRange(declarationList, createRange(firstDeclaration.pos, lastDeclaration.end));
+
+                statements.push(
+                    createVariableStatement(
+                        /*modifiers*/ undefined,
+                        declarationList
+                    )
+                );
+            }
+            else {
+                // The following call does not include the initializer, so we have
+                // to emit it separately.
+                statements.push(
+                    createVariableStatement(
+                        /*modifiers*/ undefined,
+                        setOriginalNode(
+                            createVariableDeclarationList([
+                                createVariableDeclaration(
+                                    firstOriginalDeclaration ? firstOriginalDeclaration.name : createTempVariable(/*recordTempVariable*/ undefined),
+                                    /*type*/ undefined,
+                                    createElementAccess(rhsReference, counter)
+                                )
+                            ], /*location*/ moveRangePos(initializer, -1)),
+                            initializer
+                        ),
+                        /*location*/ moveRangeEnd(initializer, -1)
+                    )
+                );
+            }
+        }
+        else {
+            // Initializer is an expression. Emit the expression in the body, so that it's
+            // evaluated on every iteration.
+            const assignment = createAssignment(initializer, elementAccess);
+            if (isDestructuringAssignment(assignment)) {
+                // This is a destructuring pattern, so we flatten the destructuring instead.
+                statements.push(
+                    createStatement(
+                        flattenDestructuringAssignment(
+                            context,
+                            assignment,
+                            /*needsValue*/ false,
+                            context.hoistVariableDeclaration,
+                            visitor,
+                            convertObjectRest
+                        )
+                    )
+                );
+            }
+            else {
+                // Currently there is not way to check that assignment is binary expression of destructing assignment
+                // so we have to cast never type to binaryExpression
+                (<BinaryExpression>assignment).end = initializer.end;
+                statements.push(createStatement(assignment, /*location*/ moveRangeEnd(initializer, -1)));
+            }
+        }
+
+        let bodyLocation: TextRange;
+        let statementsLocation: TextRange;
+        if (convertedLoopBodyStatements) {
+            addRange(statements, convertedLoopBodyStatements);
+        }
+        else {
+            const statement = visitNode(node.statement, visitor, isStatement);
+            if (isBlock(statement)) {
+                addRange(statements, statement.statements);
+                bodyLocation = statement;
+                statementsLocation = statement.statements;
+            }
+            else {
+                statements.push(statement);
+            }
+        }
+
+        // The old emitter does not emit source maps for the expression
+        setEmitFlags(expression, EmitFlags.NoSourceMap | getEmitFlags(expression));
+
+        // The old emitter does not emit source maps for the block.
+        // We add the location to preserve comments.
+        const body = createBlock(
+            createNodeArray(statements, /*location*/ statementsLocation),
+            /*location*/ bodyLocation
+        );
+
+        setEmitFlags(body, EmitFlags.NoSourceMap | EmitFlags.NoTokenSourceMaps);
+
+        let forStatement: ForStatement | ForOfStatement;
+        if(convertObjectRest) {
+
+            forStatement = createForOf(
+                createVariableDeclarationList([
+                    createVariableDeclaration(rhsReference, /*type*/ undefined, /*initializer*/ undefined, /*location*/ node.expression)
+                ], /*location*/ node.expression),
+                node.expression,
+                body,
+                /*location*/ node
+            );
+        }
+        else {
+            forStatement = createFor(
+                setEmitFlags(
+                    createVariableDeclarationList([
+                        createVariableDeclaration(counter, /*type*/ undefined, createLiteral(0), /*location*/ moveRangePos(node.expression, -1)),
+                        createVariableDeclaration(rhsReference, /*type*/ undefined, expression, /*location*/ node.expression)
+                    ], /*location*/ node.expression),
+                    EmitFlags.NoHoisting
+                ),
+                createLessThan(
+                    counter,
+                    createPropertyAccess(rhsReference, "length"),
+                    /*location*/ node.expression
+                ),
+                createPostfixIncrement(counter, /*location*/ node.expression),
+                body,
+                /*location*/ node
+            );
+        }
+
+        // Disable trailing source maps for the OpenParenToken to align source map emit with the old emitter.
+        setEmitFlags(forStatement, EmitFlags.NoTokenTrailingSourceMaps);
+        return forStatement;
+    }
 }
diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts
index e262b413b4c..76ea6b2ddd0 100644
--- a/src/compiler/transformers/es2015.ts
+++ b/src/compiler/transformers/es2015.ts
@@ -1926,171 +1926,7 @@ namespace ts {
         }
 
         function convertForOfToFor(node: ForOfStatement, convertedLoopBodyStatements: Statement[]): ForStatement {
-            // The following ES6 code:
-            //
-            //    for (let v of expr) { }
-            //
-            // should be emitted as
-            //
-            //    for (var _i = 0, _a = expr; _i < _a.length; _i++) {
-            //        var v = _a[_i];
-            //    }
-            //
-            // where _a and _i are temps emitted to capture the RHS and the counter,
-            // respectively.
-            // When the left hand side is an expression instead of a let declaration,
-            // the "let v" is not emitted.
-            // When the left hand side is a let/const, the v is renamed if there is
-            // another v in scope.
-            // Note that all assignments to the LHS are emitted in the body, including
-            // all destructuring.
-            // Note also that because an extra statement is needed to assign to the LHS,
-            // for-of bodies are always emitted as blocks.
-
-            const expression = visitNode(node.expression, visitor, isExpression);
-            const initializer = node.initializer;
-            const statements: Statement[] = [];
-
-            // In the case where the user wrote an identifier as the RHS, like this:
-            //
-            //     for (let v of arr) { }
-            //
-            // we don't want to emit a temporary variable for the RHS, just use it directly.
-            const counter = createLoopVariable();
-            const rhsReference = expression.kind === SyntaxKind.Identifier
-                ? createUniqueName((<Identifier>expression).text)
-                : createTempVariable(/*recordTempVariable*/ undefined);
-
-            // Initialize LHS
-            // var v = _a[_i];
-            if (isVariableDeclarationList(initializer)) {
-                if (initializer.flags & NodeFlags.BlockScoped) {
-                    enableSubstitutionsForBlockScopedBindings();
-                }
-
-                const firstOriginalDeclaration = firstOrUndefined(initializer.declarations);
-                if (firstOriginalDeclaration && isBindingPattern(firstOriginalDeclaration.name)) {
-                    // This works whether the declaration is a var, let, or const.
-                    // It will use rhsIterationValue _a[_i] as the initializer.
-                    const declarations = flattenVariableDestructuring(
-                        firstOriginalDeclaration,
-                        createElementAccess(rhsReference, counter),
-                        visitor
-                    );
-
-                    const declarationList = createVariableDeclarationList(declarations, /*location*/ initializer);
-                    setOriginalNode(declarationList, initializer);
-
-                    // Adjust the source map range for the first declaration to align with the old
-                    // emitter.
-                    const firstDeclaration = declarations[0];
-                    const lastDeclaration = lastOrUndefined(declarations);
-                    setSourceMapRange(declarationList, createRange(firstDeclaration.pos, lastDeclaration.end));
-
-                    statements.push(
-                        createVariableStatement(
-                            /*modifiers*/ undefined,
-                            declarationList
-                        )
-                    );
-                }
-                else {
-                    // The following call does not include the initializer, so we have
-                    // to emit it separately.
-                    statements.push(
-                        createVariableStatement(
-                            /*modifiers*/ undefined,
-                            setOriginalNode(
-                                createVariableDeclarationList([
-                                    createVariableDeclaration(
-                                        firstOriginalDeclaration ? firstOriginalDeclaration.name : createTempVariable(/*recordTempVariable*/ undefined),
-                                        /*type*/ undefined,
-                                        createElementAccess(rhsReference, counter)
-                                    )
-                                ], /*location*/ moveRangePos(initializer, -1)),
-                                initializer
-                            ),
-                            /*location*/ moveRangeEnd(initializer, -1)
-                        )
-                    );
-                }
-            }
-            else {
-                // Initializer is an expression. Emit the expression in the body, so that it's
-                // evaluated on every iteration.
-                const assignment = createAssignment(initializer, createElementAccess(rhsReference, counter));
-                if (isDestructuringAssignment(assignment)) {
-                    // This is a destructuring pattern, so we flatten the destructuring instead.
-                    statements.push(
-                        createStatement(
-                            flattenDestructuringAssignment(
-                                context,
-                                assignment,
-                                /*needsValue*/ false,
-                                hoistVariableDeclaration,
-                                visitor
-                            )
-                        )
-                    );
-                }
-                else {
-                    // Currently there is not way to check that assignment is binary expression of destructing assignment
-                    // so we have to cast never type to binaryExpression
-                    (<BinaryExpression>assignment).end = initializer.end;
-                    statements.push(createStatement(assignment, /*location*/ moveRangeEnd(initializer, -1)));
-                }
-            }
-
-            let bodyLocation: TextRange;
-            let statementsLocation: TextRange;
-            if (convertedLoopBodyStatements) {
-                addRange(statements, convertedLoopBodyStatements);
-            }
-            else {
-                const statement = visitNode(node.statement, visitor, isStatement);
-                if (isBlock(statement)) {
-                    addRange(statements, statement.statements);
-                    bodyLocation = statement;
-                    statementsLocation = statement.statements;
-                }
-                else {
-                    statements.push(statement);
-                }
-            }
-
-            // The old emitter does not emit source maps for the expression
-            setEmitFlags(expression, EmitFlags.NoSourceMap | getEmitFlags(expression));
-
-            // The old emitter does not emit source maps for the block.
-            // We add the location to preserve comments.
-            const body = createBlock(
-                createNodeArray(statements, /*location*/ statementsLocation),
-                /*location*/ bodyLocation
-            );
-
-            setEmitFlags(body, EmitFlags.NoSourceMap | EmitFlags.NoTokenSourceMaps);
-
-            const forStatement = createFor(
-                setEmitFlags(
-                    createVariableDeclarationList([
-                        createVariableDeclaration(counter, /*type*/ undefined, createLiteral(0), /*location*/ moveRangePos(node.expression, -1)),
-                        createVariableDeclaration(rhsReference, /*type*/ undefined, expression, /*location*/ node.expression)
-                    ], /*location*/ node.expression),
-                    EmitFlags.NoHoisting
-                ),
-                createLessThan(
-                    counter,
-                    createPropertyAccess(rhsReference, "length"),
-                    /*location*/ node.expression
-                ),
-                createPostfixIncrement(counter, /*location*/ node.expression),
-                body,
-                /*location*/ node
-            );
-
-            // Disable trailing source maps for the OpenParenToken to align source map emit with the old emitter.
-            setEmitFlags(forStatement, EmitFlags.NoTokenTrailingSourceMaps);
-            return forStatement;
+            return <ForStatement>convertForOf(node, convertedLoopBodyStatements, visitor, enableSubstitutionsForBlockScopedBindings, context, /*transformRest*/ false);
         }
 
         /**
diff --git a/src/compiler/transformers/esnext.ts b/src/compiler/transformers/esnext.ts
index a85098f03b6..26864a123ea 100644
--- a/src/compiler/transformers/esnext.ts
+++ b/src/compiler/transformers/esnext.ts
@@ -162,92 +162,7 @@ namespace ts {
                 return visitEachChild(node, visitor, context);
             }
 
-            const expression = visitNode(node.expression, visitor, isExpression);
-            const statements: Statement[] = [];
-            const rhsReference = createTempVariable(/*recordTempVariable*/ undefined);
-
-            // var { x, y } = _a, rest = __rest(_a, ["x", "y"]);
-            if (isVariableDeclarationList(initializer)) {
-                // This works whether the declaration is a var, let, or const.
-                // It will use rhsReference _a as the initializer.
-                const declarations = flattenVariableDestructuring(
-                    initializer.declarations[0],
-                    rhsReference,
-                    visitor,
-                    /*recordTempVariable*/ undefined,
-                    /*transformRest*/ true,
-                );
-
-                const declarationList = createVariableDeclarationList(declarations, /*location*/ initializer);
-                setOriginalNode(declarationList, initializer);
-
-                // Adjust the source map range for the first declaration to align with the old
-                // emitter.
-                const firstDeclaration = declarations[0];
-                const lastDeclaration = lastOrUndefined(declarations);
-                setSourceMapRange(declarationList, createRange(firstDeclaration.pos, lastDeclaration.end));
-
-                statements.push(
-                    createVariableStatement(
-                        /*modifiers*/ undefined,
-                        declarationList
-                    )
-                );
-            }
-            else {
-                // Initializer is an object literal destructuring assignment.
-                // Emit the flattened assignments from the object literal expression in the body
-                const assignment = createAssignment(initializer, rhsReference);
-                statements.push(
-                    createStatement(
-                        flattenDestructuringAssignment(
-                            context,
-                            assignment,
-                            /*needsValue*/ false,
-                            hoistVariableDeclaration,
-                            visitor,
-                            /*transformRest*/ true
-                        )
-                    )
-                );
-            }
-
-            let bodyLocation: TextRange;
-            let statementsLocation: TextRange;
-            const statement = visitNode(node.statement, visitor, isStatement);
-            if (isBlock(statement)) {
-                addRange(statements, statement.statements);
-                bodyLocation = statement;
-                statementsLocation = statement.statements;
-            }
-            else {
-                statements.push(statement);
-            }
-
-            // The old emitter does not emit source maps for the expression
-            setEmitFlags(expression, EmitFlags.NoSourceMap | getEmitFlags(expression));
-
-            // The old emitter does not emit source maps for the block.
-            // We add the location to preserve comments.
-            const body = createBlock(
-                createNodeArray(statements, /*location*/ statementsLocation),
-                /*location*/ bodyLocation
-            );
-
-            setEmitFlags(body, EmitFlags.NoSourceMap | EmitFlags.NoTokenSourceMaps);
-
-            const forStatement = createForOf(
-                createVariableDeclarationList([
-                    createVariableDeclaration(rhsReference, /*type*/ undefined, /*initializer*/ undefined, /*location*/ node.expression)
-                ], /*location*/ node.expression),
-                node.expression,
-                body,
-                /*location*/ node
-            );
-
-            // Disable trailing source maps for the OpenParenToken to align source map emit with the old emitter.
-            setEmitFlags(forStatement, EmitFlags.NoTokenTrailingSourceMaps);
-            return forStatement;
+            return convertForOf(node, undefined, visitor, noop, context, /*transformRest*/ true);
         }
 
         function isRestBindingPattern(initializer: ForInitializer) {

From 4337369ed4996856925c59fc43ccde201efaf316 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Fri, 4 Nov 2016 11:07:18 -0700
Subject: [PATCH 101/421] Update improved baselines

---
 tests/baselines/reference/objectRestForOf.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/baselines/reference/objectRestForOf.js b/tests/baselines/reference/objectRestForOf.js
index 0a6e2dc40ed..26ebd8f8229 100644
--- a/tests/baselines/reference/objectRestForOf.js
+++ b/tests/baselines/reference/objectRestForOf.js
@@ -30,14 +30,14 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 let array;
-for (var _a of array) {
-    var { x } = _a, restOf = __rest(_a, ["x"]);
+for (var array_1 of array) {
+    var { x } = array_1, restOf = __rest(array_1, ["x"]);
     [x, restOf];
 }
 let xx;
 let rrestOff;
-for (var _b of array) {
-    ({ x: xx } = _b, rrestOff = __rest(_b, ["x"]));
+for (var array_2 of array) {
+    ({ x: xx } = array_2, rrestOff = __rest(array_2, ["x"]));
     [xx, rrestOff];
 }
 for (const norest of array.map(a => (__assign({}, a, { x: 'a string' })))) {

From 4c365bd76a6357f33a5f3f5345a2ed276d22149a Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Fri, 4 Nov 2016 13:56:28 -0700
Subject: [PATCH 102/421] Move transformFunctionBody to factory

It is shared by es2015 and esNext transformers.

This commit just adds a convertObjectRest flag to be passed on to
flattenDestructuring functions, as well as adding necessary parameters
to use the code outside a transformer.
---
 src/compiler/factory.ts             | 345 ++++++++++++++++++++++++++++
 src/compiler/transformers/es2015.ts | 338 +--------------------------
 src/compiler/transformers/esnext.ts | 183 ++-------------
 3 files changed, 367 insertions(+), 499 deletions(-)

diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index 7f758f70794..605725b89cf 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -3056,6 +3056,351 @@ namespace ts {
         return tryGetModuleNameFromFile(resolver.getExternalModuleFileFromDeclaration(declaration), host, compilerOptions);
     }
 
+    /**
+     * Transforms the body of a function-like node.
+     *
+     * @param node A function-like node.
+     */
+    export function transformFunctionBody(node: FunctionLikeDeclaration,
+                                          visitor: (node: Node) => VisitResult<Node>,
+                                          currentSourceFile: SourceFile,
+                                          context: TransformationContext,
+                                          enableSubstitutionsForCapturedThis: () => void,
+                                          convertObjectRest?: boolean) {
+        let multiLine = false; // indicates whether the block *must* be emitted as multiple lines
+        let singleLine = false; // indicates whether the block *may* be emitted as a single line
+        let statementsLocation: TextRange;
+        let closeBraceLocation: TextRange;
+
+        const statements: Statement[] = [];
+        const body = node.body;
+        let statementOffset: number;
+
+        context.startLexicalEnvironment();
+        if (isBlock(body)) {
+            // ensureUseStrict is false because no new prologue-directive should be added.
+            // addPrologueDirectives will simply put already-existing directives at the beginning of the target statement-array
+            statementOffset = addPrologueDirectives(statements, body.statements, /*ensureUseStrict*/ false, visitor);
+        }
+
+        addCaptureThisForNodeIfNeeded(statements, node, enableSubstitutionsForCapturedThis);
+        addDefaultValueAssignmentsIfNeeded(statements, node, visitor, convertObjectRest);
+        addRestParameterIfNeeded(statements, node, /*inConstructorWithSynthesizedSuper*/ false);
+
+        // If we added any generated statements, this must be a multi-line block.
+        if (!multiLine && statements.length > 0) {
+            multiLine = true;
+        }
+
+        if (isBlock(body)) {
+            statementsLocation = body.statements;
+            addRange(statements, visitNodes(body.statements, visitor, isStatement, statementOffset));
+
+            // If the original body was a multi-line block, this must be a multi-line block.
+            if (!multiLine && body.multiLine) {
+                multiLine = true;
+            }
+        }
+        else {
+            Debug.assert(node.kind === SyntaxKind.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
+            // being emitted for the end position only.
+            statementsLocation = moveRangeEnd(body, -1);
+
+            const equalsGreaterThanToken = (<ArrowFunction>node).equalsGreaterThanToken;
+            if (!nodeIsSynthesized(equalsGreaterThanToken) && !nodeIsSynthesized(body)) {
+                if (rangeEndIsOnSameLineAsRangeStart(equalsGreaterThanToken, body, currentSourceFile)) {
+                    singleLine = true;
+                }
+                else {
+                    multiLine = true;
+                }
+            }
+
+            const expression = visitNode(body, visitor, isExpression);
+            const returnStatement = createReturn(expression, /*location*/ body);
+            setEmitFlags(returnStatement, EmitFlags.NoTokenSourceMaps | EmitFlags.NoTrailingSourceMap | EmitFlags.NoTrailingComments);
+            statements.push(returnStatement);
+
+            // To align with the source map emit for the old emitter, we set a custom
+            // source map location for the close brace.
+            closeBraceLocation = body;
+        }
+
+        const lexicalEnvironment = context.endLexicalEnvironment();
+        addRange(statements, lexicalEnvironment);
+
+        // If we added any final generated statements, this must be a multi-line block
+        if (!multiLine && lexicalEnvironment && lexicalEnvironment.length) {
+            multiLine = true;
+        }
+
+        const block = createBlock(createNodeArray(statements, statementsLocation), node.body, multiLine);
+        if (!multiLine && singleLine) {
+            setEmitFlags(block, EmitFlags.SingleLine);
+        }
+
+        if (closeBraceLocation) {
+            setTokenSourceMapRange(block, SyntaxKind.CloseBraceToken, closeBraceLocation);
+        }
+
+        setOriginalNode(block, node.body);
+        return block;
+    }
+
+    /**
+     * Adds a statement to capture the `this` of a function declaration if it is needed.
+     *
+     * @param statements The statements for the new function body.
+     * @param node A node.
+     */
+    export function addCaptureThisForNodeIfNeeded(statements: Statement[], node: Node, enableSubstitutionsForCapturedThis: () => void): void {
+        if (node.transformFlags & TransformFlags.ContainsCapturedLexicalThis && node.kind !== SyntaxKind.ArrowFunction) {
+            captureThisForNode(statements, node, createThis(), enableSubstitutionsForCapturedThis);
+        }
+    }
+
+    export function captureThisForNode(statements: Statement[], node: Node, initializer: Expression | undefined, enableSubstitutionsForCapturedThis?: () => void, originalStatement?: Statement): void {
+        enableSubstitutionsForCapturedThis();
+        const captureThisStatement = createVariableStatement(
+            /*modifiers*/ undefined,
+            createVariableDeclarationList([
+                createVariableDeclaration(
+                    "_this",
+                    /*type*/ undefined,
+                    initializer
+                )
+            ]),
+            originalStatement
+        );
+
+        setEmitFlags(captureThisStatement, EmitFlags.NoComments | EmitFlags.CustomPrologue);
+        setSourceMapRange(captureThisStatement, node);
+        statements.push(captureThisStatement);
+    }
+
+    /**
+     * Gets a value indicating whether we need to add default value assignments for a
+     * function-like node.
+     *
+     * @param node A function-like node.
+     */
+    function shouldAddDefaultValueAssignments(node: FunctionLikeDeclaration): boolean {
+        return (node.transformFlags & TransformFlags.ContainsDefaultValueAssignments) !== 0;
+    }
+
+    /**
+     * Adds statements to the body of a function-like node if it contains parameters with
+     * binding patterns or initializers.
+     *
+     * @param statements The statements for the new function body.
+     * @param node A function-like node.
+     */
+    export function addDefaultValueAssignmentsIfNeeded(statements: Statement[],
+                                                       node: FunctionLikeDeclaration,
+                                                       visitor: (node: Node) => VisitResult<Node>,
+                                                       convertObjectRest: boolean): void {
+        if (!shouldAddDefaultValueAssignments(node)) {
+            return;
+        }
+
+        for (const parameter of node.parameters) {
+            const { name, initializer, dotDotDotToken } = parameter;
+
+            // A rest parameter cannot have a binding pattern or an initializer,
+            // so let's just ignore it.
+            if (dotDotDotToken) {
+                continue;
+            }
+
+            if (isBindingPattern(name)) {
+                addDefaultValueAssignmentForBindingPattern(statements, parameter, name, initializer, visitor, convertObjectRest);
+            }
+            else if (initializer) {
+                addDefaultValueAssignmentForInitializer(statements, parameter, name, initializer, visitor);
+            }
+        }
+    }
+
+    /**
+     * Adds statements to the body of a function-like node for parameters with binding patterns
+     *
+     * @param statements The statements for the new function body.
+     * @param parameter The parameter for the function.
+     * @param name The name of the parameter.
+     * @param initializer The initializer for the parameter.
+     */
+    function addDefaultValueAssignmentForBindingPattern(statements: Statement[],
+                                                        parameter: ParameterDeclaration,
+                                                        name: BindingPattern, initializer: Expression,
+                                                        visitor: (node: Node) => VisitResult<Node>,
+                                                        convertObjectRest: boolean): void {
+        const temp = getGeneratedNameForNode(parameter);
+
+        // In cases where a binding pattern is simply '[]' or '{}',
+        // we usually don't want to emit a var declaration; however, in the presence
+        // of an initializer, we must emit that expression to preserve side effects.
+        if (name.elements.length > 0) {
+            statements.push(
+                setEmitFlags(
+                    createVariableStatement(
+                        /*modifiers*/ undefined,
+                        createVariableDeclarationList(
+                            flattenParameterDestructuring(parameter, temp, visitor, convertObjectRest)
+                        )
+                    ),
+                    EmitFlags.CustomPrologue
+                )
+            );
+        }
+        else if (initializer) {
+            statements.push(
+                setEmitFlags(
+                    createStatement(
+                        createAssignment(
+                            temp,
+                            visitNode(initializer, visitor, isExpression)
+                        )
+                    ),
+                    EmitFlags.CustomPrologue
+                )
+            );
+        }
+    }
+
+    /**
+     * Adds statements to the body of a function-like node for parameters with initializers.
+     *
+     * @param statements The statements for the new function body.
+     * @param parameter The parameter for the function.
+     * @param name The name of the parameter.
+     * @param initializer The initializer for the parameter.
+     */
+    function addDefaultValueAssignmentForInitializer(statements: Statement[],
+                                                     parameter: ParameterDeclaration,
+                                                     name: Identifier,
+                                                     initializer: Expression,
+                                                     visitor: (node: Node) => VisitResult<Node>): void {
+        initializer = visitNode(initializer, visitor, isExpression);
+        const statement = createIf(
+            createStrictEquality(
+                getSynthesizedClone(name),
+                createVoidZero()
+            ),
+            setEmitFlags(
+                createBlock([
+                    createStatement(
+                        createAssignment(
+                            setEmitFlags(getMutableClone(name), EmitFlags.NoSourceMap),
+                            setEmitFlags(initializer, EmitFlags.NoSourceMap | getEmitFlags(initializer)),
+                            /*location*/ parameter
+                        )
+                    )
+                ], /*location*/ parameter),
+                EmitFlags.SingleLine | EmitFlags.NoTrailingSourceMap | EmitFlags.NoTokenSourceMaps
+            ),
+            /*elseStatement*/ undefined,
+            /*location*/ parameter
+        );
+        statement.startsOnNewLine = true;
+        setEmitFlags(statement, EmitFlags.NoTokenSourceMaps | EmitFlags.NoTrailingSourceMap | EmitFlags.CustomPrologue);
+        statements.push(statement);
+    }
+
+    /**
+     * Gets a value indicating whether we need to add statements to handle a rest parameter.
+     *
+     * @param node A ParameterDeclaration node.
+     * @param inConstructorWithSynthesizedSuper A value indicating whether the parameter is
+     *                                          part of a constructor declaration with a
+     *                                          synthesized call to `super`
+     */
+    function shouldAddRestParameter(node: ParameterDeclaration, inConstructorWithSynthesizedSuper: boolean) {
+        return node && node.dotDotDotToken && node.name.kind === SyntaxKind.Identifier && !inConstructorWithSynthesizedSuper;
+    }
+
+    /**
+     * Adds statements to the body of a function-like node if it contains a rest parameter.
+     *
+     * @param statements The statements for the new function body.
+     * @param node A function-like node.
+     * @param inConstructorWithSynthesizedSuper A value indicating whether the parameter is
+     *                                          part of a constructor declaration with a
+     *                                          synthesized call to `super`
+     */
+    export function addRestParameterIfNeeded(statements: Statement[], node: FunctionLikeDeclaration, inConstructorWithSynthesizedSuper: boolean): void {
+        const parameter = lastOrUndefined(node.parameters);
+        if (!shouldAddRestParameter(parameter, inConstructorWithSynthesizedSuper)) {
+            return;
+        }
+
+        // `declarationName` is the name of the local declaration for the parameter.
+        const declarationName = getMutableClone(<Identifier>parameter.name);
+        setEmitFlags(declarationName, EmitFlags.NoSourceMap);
+
+        // `expressionName` is the name of the parameter used in expressions.
+        const expressionName = getSynthesizedClone(<Identifier>parameter.name);
+        const restIndex = node.parameters.length - 1;
+        const temp = createLoopVariable();
+
+        // var param = [];
+        statements.push(
+            setEmitFlags(
+                createVariableStatement(
+                    /*modifiers*/ undefined,
+                    createVariableDeclarationList([
+                        createVariableDeclaration(
+                            declarationName,
+                            /*type*/ undefined,
+                            createArrayLiteral([])
+                        )
+                    ]),
+                    /*location*/ parameter
+                ),
+                EmitFlags.CustomPrologue
+            )
+        );
+
+        // for (var _i = restIndex; _i < arguments.length; _i++) {
+        //   param[_i - restIndex] = arguments[_i];
+        // }
+        const forStatement = createFor(
+            createVariableDeclarationList([
+                createVariableDeclaration(temp, /*type*/ undefined, createLiteral(restIndex))
+            ], /*location*/ parameter),
+            createLessThan(
+                temp,
+                createPropertyAccess(createIdentifier("arguments"), "length"),
+                /*location*/ parameter
+            ),
+            createPostfixIncrement(temp, /*location*/ parameter),
+            createBlock([
+                startOnNewLine(
+                    createStatement(
+                        createAssignment(
+                            createElementAccess(
+                                expressionName,
+                                createSubtract(temp, createLiteral(restIndex))
+                            ),
+                            createElementAccess(createIdentifier("arguments"), temp)
+                        ),
+                        /*location*/ parameter
+                    )
+                )
+            ])
+        );
+
+        setEmitFlags(forStatement, EmitFlags.CustomPrologue);
+        startOnNewLine(forStatement);
+        statements.push(forStatement);
+    }
+
+
+
+
     export function convertForOf(node: ForOfStatement, convertedLoopBodyStatements: Statement[],
                                  visitor: (node: Node) => VisitResult<Node>,
                                  enableSubstitutionsForBlockScopedBindings: () => void,
diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts
index 76ea6b2ddd0..121ea5e1234 100644
--- a/src/compiler/transformers/es2015.ts
+++ b/src/compiler/transformers/es2015.ts
@@ -861,7 +861,7 @@ namespace ts {
             }
 
             if (constructor) {
-                addDefaultValueAssignmentsIfNeeded(statements, constructor);
+                addDefaultValueAssignmentsIfNeeded(statements, constructor, visitor, /*convertObjectRest*/ false);
                 addRestParameterIfNeeded(statements, constructor, hasSynthesizedSuper);
                 Debug.assert(statementOffset >= 0, "statementOffset not initialized correctly!");
 
@@ -954,7 +954,7 @@ namespace ts {
             // If this isn't a derived class, just capture 'this' for arrow functions if necessary.
             if (!hasExtendsClause) {
                 if (ctor) {
-                    addCaptureThisForNodeIfNeeded(statements, ctor);
+                    addCaptureThisForNodeIfNeeded(statements, ctor, enableSubstitutionsForCapturedThis);
                 }
                 return SuperCaptureResult.NoReplacement;
             }
@@ -1016,7 +1016,7 @@ namespace ts {
             }
 
             // Perform the capture.
-            captureThisForNode(statements, ctor, superCallExpression, firstStatement);
+            captureThisForNode(statements, ctor, superCallExpression, enableSubstitutionsForCapturedThis, firstStatement);
 
             // If we're actually replacing the original statement, we need to signal this to the caller.
             if (superCallExpression) {
@@ -1085,242 +1085,6 @@ namespace ts {
             }
         }
 
-        /**
-         * Gets a value indicating whether we need to add default value assignments for a
-         * function-like node.
-         *
-         * @param node A function-like node.
-         */
-        function shouldAddDefaultValueAssignments(node: FunctionLikeDeclaration): boolean {
-            return (node.transformFlags & TransformFlags.ContainsDefaultValueAssignments) !== 0;
-        }
-
-        /**
-         * Adds statements to the body of a function-like node if it contains parameters with
-         * binding patterns or initializers.
-         *
-         * @param statements The statements for the new function body.
-         * @param node A function-like node.
-         */
-        function addDefaultValueAssignmentsIfNeeded(statements: Statement[], node: FunctionLikeDeclaration): void {
-            if (!shouldAddDefaultValueAssignments(node)) {
-                return;
-            }
-
-            for (const parameter of node.parameters) {
-                const { name, initializer, dotDotDotToken } = parameter;
-
-                // A rest parameter cannot have a binding pattern or an initializer,
-                // so let's just ignore it.
-                if (dotDotDotToken) {
-                    continue;
-                }
-
-                if (isBindingPattern(name)) {
-                    addDefaultValueAssignmentForBindingPattern(statements, parameter, name, initializer);
-                }
-                else if (initializer) {
-                    addDefaultValueAssignmentForInitializer(statements, parameter, name, initializer);
-                }
-            }
-        }
-
-        /**
-         * Adds statements to the body of a function-like node for parameters with binding patterns
-         *
-         * @param statements The statements for the new function body.
-         * @param parameter The parameter for the function.
-         * @param name The name of the parameter.
-         * @param initializer The initializer for the parameter.
-         */
-        function addDefaultValueAssignmentForBindingPattern(statements: Statement[], parameter: ParameterDeclaration, name: BindingPattern, initializer: Expression): void {
-            const temp = getGeneratedNameForNode(parameter);
-
-            // In cases where a binding pattern is simply '[]' or '{}',
-            // we usually don't want to emit a var declaration; however, in the presence
-            // of an initializer, we must emit that expression to preserve side effects.
-            if (name.elements.length > 0) {
-                statements.push(
-                    setEmitFlags(
-                        createVariableStatement(
-                            /*modifiers*/ undefined,
-                            createVariableDeclarationList(
-                                flattenParameterDestructuring(parameter, temp, visitor)
-                            )
-                        ),
-                        EmitFlags.CustomPrologue
-                    )
-                );
-            }
-            else if (initializer) {
-                statements.push(
-                    setEmitFlags(
-                        createStatement(
-                            createAssignment(
-                                temp,
-                                visitNode(initializer, visitor, isExpression)
-                            )
-                        ),
-                        EmitFlags.CustomPrologue
-                    )
-                );
-            }
-        }
-
-        /**
-         * Adds statements to the body of a function-like node for parameters with initializers.
-         *
-         * @param statements The statements for the new function body.
-         * @param parameter The parameter for the function.
-         * @param name The name of the parameter.
-         * @param initializer The initializer for the parameter.
-         */
-        function addDefaultValueAssignmentForInitializer(statements: Statement[], parameter: ParameterDeclaration, name: Identifier, initializer: Expression): void {
-            initializer = visitNode(initializer, visitor, isExpression);
-            const statement = createIf(
-                createStrictEquality(
-                    getSynthesizedClone(name),
-                    createVoidZero()
-                ),
-                setEmitFlags(
-                    createBlock([
-                        createStatement(
-                            createAssignment(
-                                setEmitFlags(getMutableClone(name), EmitFlags.NoSourceMap),
-                                setEmitFlags(initializer, EmitFlags.NoSourceMap | getEmitFlags(initializer)),
-                                /*location*/ parameter
-                            )
-                        )
-                    ], /*location*/ parameter),
-                    EmitFlags.SingleLine | EmitFlags.NoTrailingSourceMap | EmitFlags.NoTokenSourceMaps
-                ),
-                /*elseStatement*/ undefined,
-                /*location*/ parameter
-            );
-            statement.startsOnNewLine = true;
-            setEmitFlags(statement, EmitFlags.NoTokenSourceMaps | EmitFlags.NoTrailingSourceMap | EmitFlags.CustomPrologue);
-            statements.push(statement);
-        }
-
-        /**
-         * Gets a value indicating whether we need to add statements to handle a rest parameter.
-         *
-         * @param node A ParameterDeclaration node.
-         * @param inConstructorWithSynthesizedSuper A value indicating whether the parameter is
-         *                                          part of a constructor declaration with a
-         *                                          synthesized call to `super`
-         */
-        function shouldAddRestParameter(node: ParameterDeclaration, inConstructorWithSynthesizedSuper: boolean) {
-            return node && node.dotDotDotToken && node.name.kind === SyntaxKind.Identifier && !inConstructorWithSynthesizedSuper;
-        }
-
-        /**
-         * Adds statements to the body of a function-like node if it contains a rest parameter.
-         *
-         * @param statements The statements for the new function body.
-         * @param node A function-like node.
-         * @param inConstructorWithSynthesizedSuper A value indicating whether the parameter is
-         *                                          part of a constructor declaration with a
-         *                                          synthesized call to `super`
-         */
-        function addRestParameterIfNeeded(statements: Statement[], node: FunctionLikeDeclaration, inConstructorWithSynthesizedSuper: boolean): void {
-            const parameter = lastOrUndefined(node.parameters);
-            if (!shouldAddRestParameter(parameter, inConstructorWithSynthesizedSuper)) {
-                return;
-            }
-
-            // `declarationName` is the name of the local declaration for the parameter.
-            const declarationName = getMutableClone(<Identifier>parameter.name);
-            setEmitFlags(declarationName, EmitFlags.NoSourceMap);
-
-            // `expressionName` is the name of the parameter used in expressions.
-            const expressionName = getSynthesizedClone(<Identifier>parameter.name);
-            const restIndex = node.parameters.length - 1;
-            const temp = createLoopVariable();
-
-            // var param = [];
-            statements.push(
-                setEmitFlags(
-                    createVariableStatement(
-                        /*modifiers*/ undefined,
-                        createVariableDeclarationList([
-                            createVariableDeclaration(
-                                declarationName,
-                                /*type*/ undefined,
-                                createArrayLiteral([])
-                            )
-                        ]),
-                        /*location*/ parameter
-                    ),
-                    EmitFlags.CustomPrologue
-                )
-            );
-
-            // for (var _i = restIndex; _i < arguments.length; _i++) {
-            //   param[_i - restIndex] = arguments[_i];
-            // }
-            const forStatement = createFor(
-                createVariableDeclarationList([
-                    createVariableDeclaration(temp, /*type*/ undefined, createLiteral(restIndex))
-                ], /*location*/ parameter),
-                createLessThan(
-                    temp,
-                    createPropertyAccess(createIdentifier("arguments"), "length"),
-                    /*location*/ parameter
-                ),
-                createPostfixIncrement(temp, /*location*/ parameter),
-                createBlock([
-                    startOnNewLine(
-                        createStatement(
-                            createAssignment(
-                                createElementAccess(
-                                    expressionName,
-                                    createSubtract(temp, createLiteral(restIndex))
-                                ),
-                                createElementAccess(createIdentifier("arguments"), temp)
-                            ),
-                            /*location*/ parameter
-                        )
-                    )
-                ])
-            );
-
-            setEmitFlags(forStatement, EmitFlags.CustomPrologue);
-            startOnNewLine(forStatement);
-            statements.push(forStatement);
-        }
-
-        /**
-         * Adds a statement to capture the `this` of a function declaration if it is needed.
-         *
-         * @param statements The statements for the new function body.
-         * @param node A node.
-         */
-        function addCaptureThisForNodeIfNeeded(statements: Statement[], node: Node): void {
-            if (node.transformFlags & TransformFlags.ContainsCapturedLexicalThis && node.kind !== SyntaxKind.ArrowFunction) {
-                captureThisForNode(statements, node, createThis());
-            }
-        }
-
-        function captureThisForNode(statements: Statement[], node: Node, initializer: Expression | undefined, originalStatement?: Statement): void {
-            enableSubstitutionsForCapturedThis();
-            const captureThisStatement = createVariableStatement(
-                /*modifiers*/ undefined,
-                createVariableDeclarationList([
-                    createVariableDeclaration(
-                        "_this",
-                        /*type*/ undefined,
-                        initializer
-                    )
-                ]),
-                originalStatement
-            );
-
-            setEmitFlags(captureThisStatement, EmitFlags.NoComments | EmitFlags.CustomPrologue);
-            setSourceMapRange(captureThisStatement, node);
-            statements.push(captureThisStatement);
-        }
-
         /**
          * Adds statements to the class body function for a class to define the members of the
          * class.
@@ -1518,7 +1282,7 @@ namespace ts {
                     /*typeParameters*/ undefined,
                     visitNodes(node.parameters, visitor, isParameter),
                     /*type*/ undefined,
-                    transformFunctionBody(node),
+                    transformFunctionBody(node, visitor, currentSourceFile, context, enableSubstitutionsForCapturedThis),
                     /*location*/ node
                 ),
                 /*original*/ node);
@@ -1545,7 +1309,7 @@ namespace ts {
                     /*typeParameters*/ undefined,
                     visitNodes(node.parameters, visitor, isParameter),
                     /*type*/ undefined,
-                    saveStateAndInvoke(node, transformFunctionBody),
+                    saveStateAndInvoke(node, node => transformFunctionBody(node, visitor, currentSourceFile, context, enableSubstitutionsForCapturedThis)),
                     location
                 ),
                 /*original*/ node
@@ -1555,96 +1319,6 @@ namespace ts {
             return expression;
         }
 
-        /**
-         * Transforms the body of a function-like node.
-         *
-         * @param node A function-like node.
-         */
-        function transformFunctionBody(node: FunctionLikeDeclaration) {
-            let multiLine = false; // indicates whether the block *must* be emitted as multiple lines
-            let singleLine = false; // indicates whether the block *may* be emitted as a single line
-            let statementsLocation: TextRange;
-            let closeBraceLocation: TextRange;
-
-            const statements: Statement[] = [];
-            const body = node.body;
-            let statementOffset: number;
-
-            startLexicalEnvironment();
-            if (isBlock(body)) {
-                // ensureUseStrict is false because no new prologue-directive should be added.
-                // addPrologueDirectives will simply put already-existing directives at the beginning of the target statement-array
-                statementOffset = addPrologueDirectives(statements, body.statements, /*ensureUseStrict*/ false, visitor);
-            }
-
-            addCaptureThisForNodeIfNeeded(statements, node);
-            addDefaultValueAssignmentsIfNeeded(statements, node);
-            addRestParameterIfNeeded(statements, node, /*inConstructorWithSynthesizedSuper*/ false);
-
-            // If we added any generated statements, this must be a multi-line block.
-            if (!multiLine && statements.length > 0) {
-                multiLine = true;
-            }
-
-            if (isBlock(body)) {
-                statementsLocation = body.statements;
-                addRange(statements, visitNodes(body.statements, visitor, isStatement, statementOffset));
-
-                // If the original body was a multi-line block, this must be a multi-line block.
-                if (!multiLine && body.multiLine) {
-                    multiLine = true;
-                }
-            }
-            else {
-                Debug.assert(node.kind === SyntaxKind.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
-                // being emitted for the end position only.
-                statementsLocation = moveRangeEnd(body, -1);
-
-                const equalsGreaterThanToken = (<ArrowFunction>node).equalsGreaterThanToken;
-                if (!nodeIsSynthesized(equalsGreaterThanToken) && !nodeIsSynthesized(body)) {
-                    if (rangeEndIsOnSameLineAsRangeStart(equalsGreaterThanToken, body, currentSourceFile)) {
-                        singleLine = true;
-                    }
-                    else {
-                        multiLine = true;
-                    }
-                }
-
-                const expression = visitNode(body, visitor, isExpression);
-                const returnStatement = createReturn(expression, /*location*/ body);
-                setEmitFlags(returnStatement, EmitFlags.NoTokenSourceMaps | EmitFlags.NoTrailingSourceMap | EmitFlags.NoTrailingComments);
-                statements.push(returnStatement);
-
-                // To align with the source map emit for the old emitter, we set a custom
-                // source map location for the close brace.
-                closeBraceLocation = body;
-            }
-
-            const lexicalEnvironment = endLexicalEnvironment();
-            addRange(statements, lexicalEnvironment);
-
-            // If we added any final generated statements, this must be a multi-line block
-            if (!multiLine && lexicalEnvironment && lexicalEnvironment.length) {
-                multiLine = true;
-            }
-
-            const block = createBlock(createNodeArray(statements, statementsLocation), node.body, multiLine);
-            if (!multiLine && singleLine) {
-                setEmitFlags(block, EmitFlags.SingleLine);
-            }
-
-            if (closeBraceLocation) {
-                setTokenSourceMapRange(block, SyntaxKind.CloseBraceToken, closeBraceLocation);
-            }
-
-            setOriginalNode(block, node.body);
-            return block;
-        }
-
         /**
          * Visits an ExpressionStatement that contains a destructuring assignment.
          *
@@ -2912,7 +2586,7 @@ namespace ts {
             const statements: Statement[] = [];
             startLexicalEnvironment();
             addRange(statements, prologue);
-            addCaptureThisForNodeIfNeeded(statements, node);
+            addCaptureThisForNodeIfNeeded(statements, node, enableSubstitutionsForCapturedThis);
             addRange(statements, visitNodes(createNodeArray(remaining), visitor, isStatement));
             addRange(statements, endLexicalEnvironment());
             const clone = getMutableClone(node);
diff --git a/src/compiler/transformers/esnext.ts b/src/compiler/transformers/esnext.ts
index 26864a123ea..d57c86d0600 100644
--- a/src/compiler/transformers/esnext.ts
+++ b/src/compiler/transformers/esnext.ts
@@ -5,8 +5,6 @@
 namespace ts {
     export function transformESNext(context: TransformationContext) {
         const {
-            startLexicalEnvironment,
-            endLexicalEnvironment,
             hoistVariableDeclaration,
         } = context;
         let currentSourceFile: SourceFile;
@@ -210,6 +208,11 @@ namespace ts {
         }
 
         function visitFunctionDeclaration(node: FunctionDeclaration): FunctionDeclaration {
+            const hasRest = forEach(node.parameters, isObjectRestParameter);
+            const body = hasRest ?
+                transformFunctionBody(node, visitor, currentSourceFile, context, noop, /*convertObjectRest*/ true) as Block :
+                visitEachChild(node.body, visitor, context);
+
             return setOriginalNode(
                 createFunctionDeclaration(
                     /*decorators*/ undefined,
@@ -219,13 +222,17 @@ namespace ts {
                     /*typeParameters*/ undefined,
                     visitNodes(node.parameters, visitor, isParameter),
                     /*type*/ undefined,
-                    transformFunctionBody(node) as Block,
+                    body,
                     /*location*/ node
                 ),
                 /*original*/ node);
         }
 
         function visitArrowFunction(node: ArrowFunction) {
+            const hasRest = forEach(node.parameters, isObjectRestParameter);
+            const body = hasRest ?
+                transformFunctionBody(node, visitor, currentSourceFile, context, noop, /*convertObjectRest*/ true) as Block :
+                visitEachChild(node.body, visitor, context);
             const func = setOriginalNode(
                 createArrowFunction(
                     /*modifiers*/ undefined,
@@ -233,7 +240,7 @@ namespace ts {
                     visitNodes(node.parameters, visitor, isParameter),
                     /*type*/ undefined,
                     node.equalsGreaterThanToken,
-                    transformFunctionBody(node),
+                    body,
                     /*location*/ node
                 ),
                 /*original*/ node
@@ -243,6 +250,10 @@ namespace ts {
         }
 
         function visitFunctionExpression(node: FunctionExpression): Expression {
+            const hasRest = forEach(node.parameters, isObjectRestParameter);
+            const body = hasRest ?
+                transformFunctionBody(node, visitor, currentSourceFile, context, noop, /*convertObjectRest*/ true) as Block :
+                visitEachChild(node.body, visitor, context);
             return setOriginalNode(
                 createFunctionExpression(
                     /*modifiers*/ undefined,
@@ -251,173 +262,11 @@ namespace ts {
                     /*typeParameters*/ undefined,
                     visitNodes(node.parameters, visitor, isParameter),
                     /*type*/ undefined,
-                    transformFunctionBody(node) as Block,
+                    body,
                     /*location*/ node
                 ),
                 /*original*/ node
             );
         }
-
-        /**
-         * Transforms the body of a function-like node.
-         *
-         * @param node A function-like node.
-         */
-        function transformFunctionBody(node: FunctionLikeDeclaration): Block | Expression {
-            const hasRest = forEach(node.parameters, isObjectRestParameter);
-            if (!hasRest) {
-                return visitEachChild(node.body, visitor, context);
-            }
-
-            let multiLine = false; // indicates whether the block *must* be emitted as multiple lines
-            let singleLine = false; // indicates whether the block *may* be emitted as a single line
-            let statementsLocation: TextRange;
-            let closeBraceLocation: TextRange;
-
-            const statements: Statement[] = [];
-            const body = node.body;
-            let statementOffset: number;
-
-            startLexicalEnvironment();
-            if (isBlock(body)) {
-                // ensureUseStrict is false because no new prologue-directive should be added.
-                // addPrologueDirectives will simply put already-existing directives at the beginning of the target statement-array
-                statementOffset = addPrologueDirectives(statements, body.statements, /*ensureUseStrict*/ false, visitor);
-            }
-
-            addDefaultValueAssignmentsIfNeeded(statements, node);
-
-            // If we added any generated statements, this must be a multi-line block.
-            if (!multiLine && statements.length > 0) {
-                multiLine = true;
-            }
-
-            if (isBlock(body)) {
-                statementsLocation = body.statements;
-                addRange(statements, visitNodes(body.statements, visitor, isStatement, statementOffset));
-
-                // If the original body was a multi-line block, this must be a multi-line block.
-                if (!multiLine && body.multiLine) {
-                    multiLine = true;
-                }
-            }
-            else {
-                Debug.assert(node.kind === SyntaxKind.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
-                // being emitted for the end position only.
-                statementsLocation = moveRangeEnd(body, -1);
-
-                const equalsGreaterThanToken = (<ArrowFunction>node).equalsGreaterThanToken;
-                if (!nodeIsSynthesized(equalsGreaterThanToken) && !nodeIsSynthesized(body)) {
-                    if (rangeEndIsOnSameLineAsRangeStart(equalsGreaterThanToken, body, currentSourceFile)) {
-                        singleLine = true;
-                    }
-                    else {
-                        multiLine = true;
-                    }
-                }
-
-                const expression = visitNode(body, visitor, isExpression);
-                const returnStatement = createReturn(expression, /*location*/ body);
-                setEmitFlags(returnStatement, EmitFlags.NoTokenSourceMaps | EmitFlags.NoTrailingSourceMap | EmitFlags.NoTrailingComments);
-                statements.push(returnStatement);
-
-                // To align with the source map emit for the old emitter, we set a custom
-                // source map location for the close brace.
-                closeBraceLocation = body;
-            }
-
-            const lexicalEnvironment = endLexicalEnvironment();
-            addRange(statements, lexicalEnvironment);
-
-            // If we added any final generated statements, this must be a multi-line block
-            if (!multiLine && lexicalEnvironment && lexicalEnvironment.length) {
-                multiLine = true;
-            }
-
-            const block = createBlock(createNodeArray(statements, statementsLocation), node.body, multiLine);
-            if (!multiLine && singleLine) {
-                setEmitFlags(block, EmitFlags.SingleLine);
-            }
-
-            if (closeBraceLocation) {
-                setTokenSourceMapRange(block, SyntaxKind.CloseBraceToken, closeBraceLocation);
-            }
-
-            setOriginalNode(block, node.body);
-            return block;
-        }
-
-        function shouldAddDefaultValueAssignments(node: FunctionLikeDeclaration): boolean {
-            return !!(node.transformFlags & TransformFlags.ContainsDefaultValueAssignments);
-        }
-
-        /**
-         * Adds statements to the body of a function-like node if it contains parameters with
-         * binding patterns or initializers.
-         *
-         * @param statements The statements for the new function body.
-         * @param node A function-like node.
-         */
-        function addDefaultValueAssignmentsIfNeeded(statements: Statement[], node: FunctionLikeDeclaration): void {
-            if (!shouldAddDefaultValueAssignments(node)) {
-                return;
-            }
-
-            for (const parameter of node.parameters) {
-                // A rest parameter cannot have a binding pattern or an initializer,
-                // so let's just ignore it.
-                if (parameter.dotDotDotToken) {
-                    continue;
-                }
-
-                if (isBindingPattern(parameter.name)) {
-                    addDefaultValueAssignmentForBindingPattern(statements, parameter);
-                }
-            }
-        }
-
-        /**
-         * Adds statements to the body of a function-like node for parameters with binding patterns
-         *
-         * @param statements The statements for the new function body.
-         * @param parameter The parameter for the function.
-         */
-        function addDefaultValueAssignmentForBindingPattern(statements: Statement[], parameter: ParameterDeclaration): void {
-            const temp = getGeneratedNameForNode(parameter);
-
-            // In cases where a binding pattern is simply '[]' or '{}',
-            // we usually don't want to emit a var declaration; however, in the presence
-            // of an initializer, we must emit that expression to preserve side effects.
-            if ((parameter.name as BindingPattern).elements.length > 0) {
-                statements.push(
-                    setEmitFlags(
-                        createVariableStatement(
-                            /*modifiers*/ undefined,
-                            createVariableDeclarationList(
-                                flattenParameterDestructuring(parameter, temp, visitor, /*transformRest*/ true)
-                            )
-                        ),
-                        EmitFlags.CustomPrologue
-                    )
-                );
-            }
-            else if (parameter.initializer) {
-                statements.push(
-                    setEmitFlags(
-                        createStatement(
-                            createAssignment(
-                                temp,
-                                visitNode(parameter.initializer, visitor, isExpression)
-                            )
-                        ),
-                        EmitFlags.CustomPrologue
-                    )
-                );
-            }
-        }
     }
 }

From fc450a2d2f6ee7e4e5768eb27aa921ccb5cb9f10 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Fri, 4 Nov 2016 14:17:51 -0700
Subject: [PATCH 103/421] Introduce MappedType in type checker

---
 src/compiler/checker.ts | 103 ++++++++++++++++++++++++++++++++++++----
 src/compiler/types.ts   |  18 +++++--
 2 files changed, 107 insertions(+), 14 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 9e1a0b6ec7b..460f0f449f5 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -2246,6 +2246,9 @@ namespace ts {
                     else if (getObjectFlags(type) & ObjectFlags.Anonymous) {
                         writeAnonymousType(<ObjectType>type, nextFlags);
                     }
+                    else if (getObjectFlags(type) & ObjectFlags.Mapped) {
+                        writeMappedType(<MappedType>type);
+                    }
                     else if (type.flags & TypeFlags.StringOrNumberLiteral) {
                         writer.writeStringLiteral(literalTypeToString(<LiteralType>type));
                     }
@@ -2536,6 +2539,32 @@ namespace ts {
                     writePunctuation(writer, SyntaxKind.CloseBraceToken);
                     inObjectTypeLiteral = saveInObjectTypeLiteral;
                 }
+
+                function writeMappedType(type: MappedType) {
+                    const constraintType = getConstraintTypeFromMappedType(type);
+                    if (constraintType.flags & (TypeFlags.TypeParameter | TypeFlags.Index)) {
+                        writePunctuation(writer, SyntaxKind.OpenBraceToken);
+                        writer.writeLine();
+                        writer.increaseIndent();
+                        writePunctuation(writer, SyntaxKind.OpenBracketToken);
+                        appendSymbolNameOnly((type.target || type).typeParameter.symbol, writer);
+                        writeSpace(writer);
+                        writeKeyword(writer, SyntaxKind.InKeyword);
+                        writeSpace(writer);
+                        writeType(constraintType, TypeFormatFlags.None);
+                        writePunctuation(writer, SyntaxKind.CloseBracketToken);
+                        writePunctuation(writer, SyntaxKind.ColonToken);
+                        writeSpace(writer);
+                        writeType(getTemplateTypeFromMappedType(type), TypeFormatFlags.None);
+                        writePunctuation(writer, SyntaxKind.SemicolonToken);
+                        writer.writeLine();
+                        writer.decreaseIndent();
+                        writePunctuation(writer, SyntaxKind.CloseBraceToken);
+                    }
+                    else {
+                        writeLiteralType(type, TypeFormatFlags.None);
+                    }
+                }
             }
 
             function buildTypeParameterDisplayFromSymbol(symbol: Symbol, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags) {
@@ -4408,6 +4437,46 @@ namespace ts {
             }
         }
 
+        function forEachType<T>(type: Type, f: (t: Type) => T): T {
+            return type.flags & TypeFlags.Union ? forEach((<UnionType>type).types, f) : f(type);
+        }
+
+        // { [P in K]: T }
+        // Get apparent type of K
+        // If apparent type is a 'keyof T', get apparent type of T
+        // For each constituent literal type U
+        // create mapper from P to U
+        // instantiate T using mapper
+        // if U is string or number, create index signature with instantiated type
+        // otherwise create property with name from U and instantiated type
+        function resolveMappedTypeMembers(type: MappedType) {
+            const members: SymbolTable = createMap<Symbol>();
+            let stringIndexInfo: IndexInfo;
+            let numberIndexInfo: IndexInfo;
+            const target = type.target || type;
+            const keyType = getApparentType(getConstraintTypeFromMappedType(type));
+            const iterationType = keyType.flags & TypeFlags.Index ? getIndexType(getApparentType((<IndexType>keyType).type)) : keyType;
+            forEachType(iterationType, t => {
+                const iterationMapper = createUnaryTypeMapper(target.typeParameter, t);
+                const templateMapper = type.mapper ? combineTypeMappers(type.mapper, iterationMapper) : iterationMapper;
+                if (t.flags & (TypeFlags.StringLiteral | TypeFlags.NumberLiteral | TypeFlags.EnumLiteral)) {
+                    const propName = (<LiteralType>t).text;
+                    const prop = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient, propName);
+                    prop.type = instantiateType(target.templateType, templateMapper);
+                    members[propName] = prop;
+                }
+            })
+            setStructuredTypeMembers(type, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
+        }
+
+        function getConstraintTypeFromMappedType(type: MappedType) {
+            return instantiateType(getConstraintOfTypeParameter((type.target || type).typeParameter), type.mapper || identityMapper);
+        }
+
+        function getTemplateTypeFromMappedType(type: MappedType) {
+            return instantiateType((type.target || type).templateType, type.mapper || identityMapper);
+        }
+
         function resolveStructuredTypeMembers(type: StructuredType): ResolvedType {
             if (!(<ResolvedType>type).members) {
                 if (type.flags & TypeFlags.Object) {
@@ -4420,6 +4489,9 @@ namespace ts {
                     else if ((<ObjectType>type).objectFlags & ObjectFlags.Anonymous) {
                         resolveAnonymousTypeMembers(<AnonymousType>type);
                     }
+                    else if ((<MappedType>type).objectFlags & ObjectFlags.Mapped) {
+                        resolveMappedTypeMembers(<MappedType>type);
+                    }
                 }
                 else if (type.flags & TypeFlags.Union) {
                     resolveUnionTypeMembers(<UnionType>type);
@@ -5834,14 +5906,16 @@ namespace ts {
             return links.resolvedType;
         }
 
-        function getTypeFromMappedTypeNode(node: MappedTypeNode) {
+        function getTypeFromMappedTypeNode(node: MappedTypeNode, aliasSymbol?: Symbol, aliasTypeArguments?: Type[]): Type {
             const links = getNodeLinks(node);
             if (!links.resolvedType) {
-                getTypeFromTypeNode(node.typeParameter.constraint);
-                if (node.type) {
-                    getTypeFromTypeNode(node.type);
-                }
-                links.resolvedType = unknownType;
+                const type = <MappedType>createObjectType(ObjectFlags.Mapped);
+                type.declaration = node;
+                type.typeParameter = getDeclaredTypeOfTypeParameter(getSymbolOfNode(node.typeParameter));
+                type.templateType = node.type ? getTypeFromTypeNode(node.type) : anyType;
+                type.aliasSymbol = aliasSymbol;
+                type.aliasTypeArguments = aliasTypeArguments;
+                links.resolvedType = type;
             }
             return links.resolvedType;
         }
@@ -6015,7 +6089,7 @@ namespace ts {
                 case SyntaxKind.IndexedAccessType:
                     return getTypeFromIndexedAccessTypeNode(<IndexedAccessTypeNode>node);
                 case SyntaxKind.MappedType:
-                    return getTypeFromMappedTypeNode(<MappedTypeNode>node);
+                    return getTypeFromMappedTypeNode(<MappedTypeNode>node, aliasSymbol, aliasTypeArguments);
                 // This function assumes that an identifier or qualified name is a type expression
                 // Callers should first ensure this by calling isTypeNode
                 case SyntaxKind.Identifier:
@@ -6180,7 +6254,13 @@ namespace ts {
             return result;
         }
 
-        function instantiateAnonymousType(type: AnonymousType, mapper: TypeMapper): ObjectType {
+        function instantiateAnonymousOrMappedType(type: AnonymousType | MappedType, mapper: TypeMapper): ObjectType {
+            if (type.objectFlags & ObjectFlags.Instantiated) {
+                // If the type being instantiated is itself a instantiation, fetch the original target and
+                // combine the type mappers.
+                mapper = combineTypeMappers(type.mapper, mapper);
+                type = type.target;
+            }
             if (mapper.instantiations) {
                 const cachedType = <ObjectType>mapper.instantiations[type.id];
                 if (cachedType) {
@@ -6191,7 +6271,7 @@ namespace ts {
                 mapper.instantiations = [];
             }
             // Mark the anonymous type as instantiated such that our infinite instantiation detection logic can recognize it
-            const result = <AnonymousType>createObjectType(ObjectFlags.Anonymous | ObjectFlags.Instantiated, type.symbol);
+            const result = <AnonymousType | MappedType>createObjectType(type.objectFlags | ObjectFlags.Instantiated, type.symbol);
             result.target = type;
             result.mapper = mapper;
             result.aliasSymbol = type.aliasSymbol;
@@ -6268,7 +6348,10 @@ namespace ts {
                         return type.symbol &&
                             type.symbol.flags & (SymbolFlags.Function | SymbolFlags.Method | SymbolFlags.Class | SymbolFlags.TypeLiteral | SymbolFlags.ObjectLiteral) &&
                             ((<ObjectType>type).objectFlags & ObjectFlags.Instantiated || isSymbolInScopeOfMappedTypeParameter(type.symbol, mapper)) ?
-                            instantiateAnonymousType(<AnonymousType>type, mapper) : type;
+                            instantiateAnonymousOrMappedType(<AnonymousType>type, mapper) : type;
+                    }
+                    if ((<ObjectType>type).objectFlags & ObjectFlags.Mapped) {
+                        return instantiateAnonymousOrMappedType(<MappedType>type, mapper);
                     }
                     if ((<ObjectType>type).objectFlags & ObjectFlags.Reference) {
                         return createTypeReference((<TypeReference>type).target, instantiateList((<TypeReference>type).typeArguments, mapper, instantiateType));
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 6858d028377..c721770d845 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -2770,10 +2770,11 @@ namespace ts {
         Reference        = 1 << 2,  // Generic type reference
         Tuple            = 1 << 3,  // Synthesized generic tuple type
         Anonymous        = 1 << 4,  // Anonymous
-        Instantiated     = 1 << 5,  // Instantiated anonymous type
-        ObjectLiteral    = 1 << 6,  // Originates in an object literal
-        EvolvingArray    = 1 << 7,  // Evolving array type
-        ObjectLiteralPatternWithComputedProperties = 1 << 8,  // Object literal pattern with computed properties
+        Mapped           = 1 << 5,  // Mapped
+        Instantiated     = 1 << 6,  // Instantiated anonymous or mapped type
+        ObjectLiteral    = 1 << 7,  // Originates in an object literal
+        EvolvingArray    = 1 << 8,  // Evolving array type
+        ObjectLiteralPatternWithComputedProperties = 1 << 9,  // Object literal pattern with computed properties
         ClassOrInterface = Class | Interface
     }
 
@@ -2842,6 +2843,15 @@ namespace ts {
         mapper?: TypeMapper;     // Instantiation mapper
     }
 
+    /* @internal */
+    export interface MappedType extends ObjectType {
+        declaration: MappedTypeNode;
+        typeParameter: TypeParameter;
+        templateType: Type;
+        target?: MappedType;  // Instantiation target
+        mapper?: TypeMapper;  // Instantiation mapper
+    }
+
     export interface EvolvingArrayType extends ObjectType {
         elementType: Type;      // Element expressions of evolving array type
         finalArrayType?: Type;  // Final array type of evolving array type

From a55ed26d2be4ac49e6a0b4060eac6ea4ff2333b9 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Fri, 4 Nov 2016 16:06:33 -0700
Subject: [PATCH 104/421] Spread any types to any

---
 src/compiler/checker.ts                       |   9 +-
 tests/baselines/reference/objectSpread.js     |   7 +
 .../baselines/reference/objectSpread.symbols  | 141 +++++++++---------
 tests/baselines/reference/objectSpread.types  |   9 ++
 .../objectSpreadNegativeParse.errors.txt      |  11 +-
 .../conformance/types/spread/objectSpread.ts  |   4 +
 6 files changed, 101 insertions(+), 80 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 3475a9d52c6..20e90f4db25 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -5884,8 +5884,11 @@ namespace ts {
          * this function should be called in a left folding style, with left = previous result of getSpreadType
          * and right = the new element to be spread.
          */
-        function getSpreadType(left: Type, right: Type, symbol: Symbol): ResolvedType {
-            Debug.assert(!!(left.flags & TypeFlags.Object) && !!(right.flags & TypeFlags.Object), "Only object types may be spread.");
+        function getSpreadType(left: Type, right: Type, symbol: Symbol): ResolvedType | IntrinsicType {
+            Debug.assert(!!(left.flags & (TypeFlags.Object | TypeFlags.Any)) && !!(right.flags & (TypeFlags.Object | TypeFlags.Any)), "Only object types may be spread.");
+            if (left.flags & TypeFlags.Any || right.flags & TypeFlags.Any) {
+                return anyType;
+            }
             const members = createMap<Symbol>();
             const skippedPrivateMembers = createMap<boolean>();
             let stringIndexInfo: IndexInfo;
@@ -10934,7 +10937,7 @@ namespace ts {
                         typeFlags = 0;
                     }
                     const type = checkExpression((memberDecl as SpreadElementExpression).expression);
-                    if (!(type.flags & TypeFlags.Object)) {
+                    if (!(type.flags & (TypeFlags.Object | TypeFlags.Any))) {
                         error(memberDecl, Diagnostics.Spread_types_may_only_be_created_from_object_types);
                         return unknownType;
                     }
diff --git a/tests/baselines/reference/objectSpread.js b/tests/baselines/reference/objectSpread.js
index c19ead478cb..d1de48c5cab 100644
--- a/tests/baselines/reference/objectSpread.js
+++ b/tests/baselines/reference/objectSpread.js
@@ -38,6 +38,10 @@ getter.a = 12;
 // functions result in { }
 let spreadFunc = { ...(function () { }) };
 
+// any results in any
+let anything: any;
+let spreadAny = { ...anything };
+
 // methods are not enumerable
 class C { p = 1; m() { } }
 let c: C = new C()
@@ -109,6 +113,9 @@ var getter = __assign({}, op, { c: 7 });
 getter.a = 12;
 // functions result in { }
 var spreadFunc = __assign({}, (function () { }));
+// any results in any
+var anything;
+var spreadAny = __assign({}, anything);
 // methods are not enumerable
 var C = (function () {
     function C() {
diff --git a/tests/baselines/reference/objectSpread.symbols b/tests/baselines/reference/objectSpread.symbols
index b95f8273724..4b0a62a5a24 100644
--- a/tests/baselines/reference/objectSpread.symbols
+++ b/tests/baselines/reference/objectSpread.symbols
@@ -154,123 +154,130 @@ getter.a = 12;
 let spreadFunc = { ...(function () { }) };
 >spreadFunc : Symbol(spreadFunc, Decl(objectSpread.ts, 37, 3))
 
+// any results in any
+let anything: any;
+>anything : Symbol(anything, Decl(objectSpread.ts, 40, 3))
+
+let spreadAny = { ...anything };
+>spreadAny : Symbol(spreadAny, Decl(objectSpread.ts, 41, 3))
+
 // methods are not enumerable
 class C { p = 1; m() { } }
->C : Symbol(C, Decl(objectSpread.ts, 37, 42))
->p : Symbol(C.p, Decl(objectSpread.ts, 40, 9))
->m : Symbol(C.m, Decl(objectSpread.ts, 40, 16))
+>C : Symbol(C, Decl(objectSpread.ts, 41, 32))
+>p : Symbol(C.p, Decl(objectSpread.ts, 44, 9))
+>m : Symbol(C.m, Decl(objectSpread.ts, 44, 16))
 
 let c: C = new C()
->c : Symbol(c, Decl(objectSpread.ts, 41, 3))
->C : Symbol(C, Decl(objectSpread.ts, 37, 42))
->C : Symbol(C, Decl(objectSpread.ts, 37, 42))
+>c : Symbol(c, Decl(objectSpread.ts, 45, 3))
+>C : Symbol(C, Decl(objectSpread.ts, 41, 32))
+>C : Symbol(C, Decl(objectSpread.ts, 41, 32))
 
 let spreadC: { p: number } = { ...c }
->spreadC : Symbol(spreadC, Decl(objectSpread.ts, 42, 3))
->p : Symbol(p, Decl(objectSpread.ts, 42, 14))
+>spreadC : Symbol(spreadC, Decl(objectSpread.ts, 46, 3))
+>p : Symbol(p, Decl(objectSpread.ts, 46, 14))
 
 // own methods are enumerable
 let cplus: { p: number, plus(): void } = { ...c, plus() { return this.p + 1; } };
->cplus : Symbol(cplus, Decl(objectSpread.ts, 45, 3))
->p : Symbol(p, Decl(objectSpread.ts, 45, 12))
->plus : Symbol(plus, Decl(objectSpread.ts, 45, 23))
->plus : Symbol(plus, Decl(objectSpread.ts, 45, 48))
+>cplus : Symbol(cplus, Decl(objectSpread.ts, 49, 3))
+>p : Symbol(p, Decl(objectSpread.ts, 49, 12))
+>plus : Symbol(plus, Decl(objectSpread.ts, 49, 23))
+>plus : Symbol(plus, Decl(objectSpread.ts, 49, 48))
 
 cplus.plus();
->cplus.plus : Symbol(plus, Decl(objectSpread.ts, 45, 23))
->cplus : Symbol(cplus, Decl(objectSpread.ts, 45, 3))
->plus : Symbol(plus, Decl(objectSpread.ts, 45, 23))
+>cplus.plus : Symbol(plus, Decl(objectSpread.ts, 49, 23))
+>cplus : Symbol(cplus, Decl(objectSpread.ts, 49, 3))
+>plus : Symbol(plus, Decl(objectSpread.ts, 49, 23))
 
 // new field's type conflicting with existing field is OK
 let changeTypeAfter: { a: string, b: string } =
->changeTypeAfter : Symbol(changeTypeAfter, Decl(objectSpread.ts, 49, 3))
->a : Symbol(a, Decl(objectSpread.ts, 49, 22))
->b : Symbol(b, Decl(objectSpread.ts, 49, 33))
+>changeTypeAfter : Symbol(changeTypeAfter, Decl(objectSpread.ts, 53, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 53, 22))
+>b : Symbol(b, Decl(objectSpread.ts, 53, 33))
 
     { ...o, a: 'wrong type?' }
->a : Symbol(a, Decl(objectSpread.ts, 50, 11))
+>a : Symbol(a, Decl(objectSpread.ts, 54, 11))
 
 let changeTypeBefore: { a: number, b: string } =
->changeTypeBefore : Symbol(changeTypeBefore, Decl(objectSpread.ts, 51, 3))
->a : Symbol(a, Decl(objectSpread.ts, 51, 23))
->b : Symbol(b, Decl(objectSpread.ts, 51, 34))
+>changeTypeBefore : Symbol(changeTypeBefore, Decl(objectSpread.ts, 55, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 55, 23))
+>b : Symbol(b, Decl(objectSpread.ts, 55, 34))
 
     { a: 'wrong type?', ...o };
->a : Symbol(a, Decl(objectSpread.ts, 52, 5))
+>a : Symbol(a, Decl(objectSpread.ts, 56, 5))
 
 let changeTypeBoth: { a: string, b: number } =
->changeTypeBoth : Symbol(changeTypeBoth, Decl(objectSpread.ts, 53, 3))
->a : Symbol(a, Decl(objectSpread.ts, 53, 21))
->b : Symbol(b, Decl(objectSpread.ts, 53, 32))
+>changeTypeBoth : Symbol(changeTypeBoth, Decl(objectSpread.ts, 57, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 57, 21))
+>b : Symbol(b, Decl(objectSpread.ts, 57, 32))
 
     { ...o, ...swap };
 
 // optional
 let definiteBoolean: { sn: boolean };
->definiteBoolean : Symbol(definiteBoolean, Decl(objectSpread.ts, 57, 3))
->sn : Symbol(sn, Decl(objectSpread.ts, 57, 22))
+>definiteBoolean : Symbol(definiteBoolean, Decl(objectSpread.ts, 61, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 61, 22))
 
 let definiteString: { sn: string };
->definiteString : Symbol(definiteString, Decl(objectSpread.ts, 58, 3))
->sn : Symbol(sn, Decl(objectSpread.ts, 58, 21))
+>definiteString : Symbol(definiteString, Decl(objectSpread.ts, 62, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 62, 21))
 
 let optionalString: { sn?: string };
->optionalString : Symbol(optionalString, Decl(objectSpread.ts, 59, 3))
->sn : Symbol(sn, Decl(objectSpread.ts, 59, 21))
+>optionalString : Symbol(optionalString, Decl(objectSpread.ts, 63, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 63, 21))
 
 let optionalNumber: { sn?: number };
->optionalNumber : Symbol(optionalNumber, Decl(objectSpread.ts, 60, 3))
->sn : Symbol(sn, Decl(objectSpread.ts, 60, 21))
+>optionalNumber : Symbol(optionalNumber, Decl(objectSpread.ts, 64, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 64, 21))
 
 let optionalUnionStops: { sn: string | number | boolean } = { ...definiteBoolean, ...definiteString, ...optionalNumber };
->optionalUnionStops : Symbol(optionalUnionStops, Decl(objectSpread.ts, 61, 3))
->sn : Symbol(sn, Decl(objectSpread.ts, 61, 25))
+>optionalUnionStops : Symbol(optionalUnionStops, Decl(objectSpread.ts, 65, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 65, 25))
 
 let optionalUnionDuplicates: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...optionalString, ...optionalNumber };
->optionalUnionDuplicates : Symbol(optionalUnionDuplicates, Decl(objectSpread.ts, 62, 3))
->sn : Symbol(sn, Decl(objectSpread.ts, 62, 30))
+>optionalUnionDuplicates : Symbol(optionalUnionDuplicates, Decl(objectSpread.ts, 66, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 66, 30))
 
 let allOptional: { sn?: string | number } = { ...optionalString, ...optionalNumber };
->allOptional : Symbol(allOptional, Decl(objectSpread.ts, 63, 3))
->sn : Symbol(sn, Decl(objectSpread.ts, 63, 18))
+>allOptional : Symbol(allOptional, Decl(objectSpread.ts, 67, 3))
+>sn : Symbol(sn, Decl(objectSpread.ts, 67, 18))
 
 // computed property
 let computedFirst: { a: number, b: string, "before everything": number } =
->computedFirst : Symbol(computedFirst, Decl(objectSpread.ts, 66, 3))
->a : Symbol(a, Decl(objectSpread.ts, 66, 20))
->b : Symbol(b, Decl(objectSpread.ts, 66, 31))
-
-    { ['before everything']: 12, ...o, b: 'yes' }
->'before everything' : Symbol(['before everything'], Decl(objectSpread.ts, 67, 5))
->b : Symbol(b, Decl(objectSpread.ts, 67, 38))
-
-let computedMiddle: { a: number, b: string, c: boolean, "in the middle": number } =
->computedMiddle : Symbol(computedMiddle, Decl(objectSpread.ts, 68, 3))
->a : Symbol(a, Decl(objectSpread.ts, 68, 21))
->b : Symbol(b, Decl(objectSpread.ts, 68, 32))
->c : Symbol(c, Decl(objectSpread.ts, 68, 43))
-
-    { ...o, ['in the middle']: 13, b: 'maybe?', ...o2 }
->'in the middle' : Symbol(['in the middle'], Decl(objectSpread.ts, 69, 11))
->b : Symbol(b, Decl(objectSpread.ts, 69, 34))
-
-let computedAfter: { a: number, b: string, "at the end": number } =
->computedAfter : Symbol(computedAfter, Decl(objectSpread.ts, 70, 3))
+>computedFirst : Symbol(computedFirst, Decl(objectSpread.ts, 70, 3))
 >a : Symbol(a, Decl(objectSpread.ts, 70, 20))
 >b : Symbol(b, Decl(objectSpread.ts, 70, 31))
 
+    { ['before everything']: 12, ...o, b: 'yes' }
+>'before everything' : Symbol(['before everything'], Decl(objectSpread.ts, 71, 5))
+>b : Symbol(b, Decl(objectSpread.ts, 71, 38))
+
+let computedMiddle: { a: number, b: string, c: boolean, "in the middle": number } =
+>computedMiddle : Symbol(computedMiddle, Decl(objectSpread.ts, 72, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 72, 21))
+>b : Symbol(b, Decl(objectSpread.ts, 72, 32))
+>c : Symbol(c, Decl(objectSpread.ts, 72, 43))
+
+    { ...o, ['in the middle']: 13, b: 'maybe?', ...o2 }
+>'in the middle' : Symbol(['in the middle'], Decl(objectSpread.ts, 73, 11))
+>b : Symbol(b, Decl(objectSpread.ts, 73, 34))
+
+let computedAfter: { a: number, b: string, "at the end": number } =
+>computedAfter : Symbol(computedAfter, Decl(objectSpread.ts, 74, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 74, 20))
+>b : Symbol(b, Decl(objectSpread.ts, 74, 31))
+
     { ...o, b: 'yeah', ['at the end']: 14 }
->b : Symbol(b, Decl(objectSpread.ts, 71, 11))
->'at the end' : Symbol(['at the end'], Decl(objectSpread.ts, 71, 22))
+>b : Symbol(b, Decl(objectSpread.ts, 75, 11))
+>'at the end' : Symbol(['at the end'], Decl(objectSpread.ts, 75, 22))
 
 // shortcut syntax
 let a = 12;
->a : Symbol(a, Decl(objectSpread.ts, 73, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 77, 3))
 
 let shortCutted: { a: number, b: string } = { ...o, a }
->shortCutted : Symbol(shortCutted, Decl(objectSpread.ts, 74, 3))
->a : Symbol(a, Decl(objectSpread.ts, 74, 18))
->b : Symbol(b, Decl(objectSpread.ts, 74, 29))
->a : Symbol(a, Decl(objectSpread.ts, 74, 51))
+>shortCutted : Symbol(shortCutted, Decl(objectSpread.ts, 78, 3))
+>a : Symbol(a, Decl(objectSpread.ts, 78, 18))
+>b : Symbol(b, Decl(objectSpread.ts, 78, 29))
+>a : Symbol(a, Decl(objectSpread.ts, 78, 51))
 
 
diff --git a/tests/baselines/reference/objectSpread.types b/tests/baselines/reference/objectSpread.types
index e9b9a6421c2..a1c70720d12 100644
--- a/tests/baselines/reference/objectSpread.types
+++ b/tests/baselines/reference/objectSpread.types
@@ -230,6 +230,15 @@ let spreadFunc = { ...(function () { }) };
 >(function () { }) : () => void
 >function () { } : () => void
 
+// any results in any
+let anything: any;
+>anything : any
+
+let spreadAny = { ...anything };
+>spreadAny : any
+>{ ...anything } : any
+>anything : any
+
 // methods are not enumerable
 class C { p = 1; m() { } }
 >C : C
diff --git a/tests/baselines/reference/objectSpreadNegativeParse.errors.txt b/tests/baselines/reference/objectSpreadNegativeParse.errors.txt
index 987172ef867..b37200c4f02 100644
--- a/tests/baselines/reference/objectSpreadNegativeParse.errors.txt
+++ b/tests/baselines/reference/objectSpreadNegativeParse.errors.txt
@@ -1,22 +1,17 @@
-tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(1,12): error TS2698: Spread types may only be created from object types.
 tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(1,15): error TS2304: Cannot find name 'o'.
 tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(1,18): error TS1109: Expression expected.
 tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(2,12): error TS2698: Spread types may only be created from object types.
 tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(2,15): error TS1109: Expression expected.
 tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(2,16): error TS2304: Cannot find name 'o'.
-tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(3,12): error TS2698: Spread types may only be created from object types.
 tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(3,15): error TS2304: Cannot find name 'matchMedia'.
 tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(3,28): error TS1005: ',' expected.
 tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(3,31): error TS1128: Declaration or statement expected.
-tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(4,13): error TS2698: Spread types may only be created from object types.
 tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(4,16): error TS2304: Cannot find name 'get'.
 tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(4,20): error TS1005: ',' expected.
 
 
-==== tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts (13 errors) ====
+==== tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts (10 errors) ====
     let o7 = { ...o? };
-               ~~~~~
-!!! error TS2698: Spread types may only be created from object types.
                   ~
 !!! error TS2304: Cannot find name 'o'.
                      ~
@@ -29,8 +24,6 @@ tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(4,20): error T
                    ~
 !!! error TS2304: Cannot find name 'o'.
     let o9 = { ...matchMedia() { }};
-               ~~~~~~~~~~~~~~~
-!!! error TS2698: Spread types may only be created from object types.
                   ~~~~~~~~~~
 !!! error TS2304: Cannot find name 'matchMedia'.
                                ~
@@ -38,8 +31,6 @@ tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(4,20): error T
                                   ~
 !!! error TS1128: Declaration or statement expected.
     let o10 = { ...get x() { return 12; }};
-                ~~~~~~
-!!! error TS2698: Spread types may only be created from object types.
                    ~~~
 !!! error TS2304: Cannot find name 'get'.
                        ~
diff --git a/tests/cases/conformance/types/spread/objectSpread.ts b/tests/cases/conformance/types/spread/objectSpread.ts
index 3336196e136..ebf2bdb2ade 100644
--- a/tests/cases/conformance/types/spread/objectSpread.ts
+++ b/tests/cases/conformance/types/spread/objectSpread.ts
@@ -38,6 +38,10 @@ getter.a = 12;
 // functions result in { }
 let spreadFunc = { ...(function () { }) };
 
+// any results in any
+let anything: any;
+let spreadAny = { ...anything };
+
 // methods are not enumerable
 class C { p = 1; m() { } }
 let c: C = new C()

From 7807ac96f58304e5a6ba979f83005b4e954055e2 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Fri, 4 Nov 2016 16:47:43 -0700
Subject: [PATCH 105/421] Attach symbols to mapped types

---
 src/compiler/binder.ts  | 3 ++-
 src/compiler/checker.ts | 7 ++-----
 src/compiler/types.ts   | 3 +--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index e9419ab1cc6..4d923888e86 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -1957,9 +1957,10 @@ namespace ts {
                 case SyntaxKind.JSDocFunctionType:
                     return bindFunctionOrConstructorType(<SignatureDeclaration>node);
                 case SyntaxKind.TypeLiteral:
+                case SyntaxKind.MappedType:
                 case SyntaxKind.JSDocTypeLiteral:
                 case SyntaxKind.JSDocRecordType:
-                    return bindAnonymousDeclaration(<TypeLiteralNode>node, SymbolFlags.TypeLiteral, "__type");
+                    return bindAnonymousDeclaration(<Declaration>node, SymbolFlags.TypeLiteral, "__type");
                 case SyntaxKind.ObjectLiteralExpression:
                     return bindObjectLiteralExpression(<ObjectLiteralExpression>node);
                 case SyntaxKind.FunctionExpression:
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 7e87980cf15..afd2b50c871 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -5884,10 +5884,8 @@ namespace ts {
 
         function getIndexedAccessType(objectType: Type, indexType: Type, accessNode?: ElementAccessExpression | IndexedAccessTypeNode) {
             if (indexType.flags & TypeFlags.TypeParameter) {
-                if (!isTypeAssignableTo(getConstraintOfTypeParameter(<TypeParameter>indexType) || emptyObjectType, getIndexType(objectType))) {
-                    if (accessNode) {
-                        error(accessNode, Diagnostics.Type_0_is_not_constrained_to_keyof_1, typeToString(indexType), typeToString(objectType));
-                    }
+                if (accessNode && !isTypeAssignableTo(getConstraintOfTypeParameter(<TypeParameter>indexType) || emptyObjectType, getIndexType(objectType))) {
+                    error(accessNode, Diagnostics.Type_0_is_not_constrained_to_keyof_1, typeToString(indexType), typeToString(objectType));
                     return unknownType;
                 }
                 return getIndexedAccessTypeForTypeParameter(objectType, <TypeParameter>indexType);
@@ -5919,7 +5917,6 @@ namespace ts {
             const links = getNodeLinks(node);
             if (!links.resolvedType) {
                 const type = <MappedType>createObjectType(ObjectFlags.Mapped);
-                type.declaration = node;
                 type.typeParameter = getDeclaredTypeOfTypeParameter(getSymbolOfNode(node.typeParameter));
                 type.templateType = node.type ? getTypeFromTypeNode(node.type) : anyType;
                 type.aliasSymbol = aliasSymbol;
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 36d0d3fd7b9..fcd5b68950b 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -2497,7 +2497,7 @@ namespace ts {
         RegularEnum             = 0x00000100,  // Enum
         ValueModule             = 0x00000200,  // Instantiated module
         NamespaceModule         = 0x00000400,  // Uninstantiated module
-        TypeLiteral             = 0x00000800,  // Type Literal
+        TypeLiteral             = 0x00000800,  // Type Literal or mapped type
         ObjectLiteral           = 0x00001000,  // Object Literal
         Method                  = 0x00002000,  // Method
         Constructor             = 0x00004000,  // Constructor
@@ -2848,7 +2848,6 @@ namespace ts {
 
     /* @internal */
     export interface MappedType extends ObjectType {
-        declaration: MappedTypeNode;
         typeParameter: TypeParameter;
         templateType: Type;
         target?: MappedType;  // Instantiation target

From ed4fead087ab0fea1811e4b42b6d8e599ee13f1e Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Fri, 4 Nov 2016 21:54:22 -0700
Subject: [PATCH 106/421] add missing bind calls to properly set parent on
 token nodes (#12057)

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

diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index c1011e57568..1d721e2db90 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -1234,9 +1234,11 @@ namespace ts {
             const postExpressionLabel = createBranchLabel();
             bindCondition(node.condition, trueLabel, falseLabel);
             currentFlow = finishFlowLabel(trueLabel);
+            bind(node.questionToken);
             bind(node.whenTrue);
             addAntecedent(postExpressionLabel, currentFlow);
             currentFlow = finishFlowLabel(falseLabel);
+            bind(node.colonToken);
             bind(node.whenFalse);
             addAntecedent(postExpressionLabel, currentFlow);
             currentFlow = finishFlowLabel(postExpressionLabel);

From 1c7b397fbb512320c0eea0065fd38fdcdc121636 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sat, 5 Nov 2016 07:04:56 -0700
Subject: [PATCH 107/421] Introduce instantiateCached function

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index afd2b50c871..2a0c4eee988 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -4465,7 +4465,7 @@ namespace ts {
                     prop.type = instantiateType(target.templateType, templateMapper);
                     members[propName] = prop;
                 }
-            })
+            });
             setStructuredTypeMembers(type, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
         }
 
@@ -6122,6 +6122,11 @@ namespace ts {
             return items;
         }
 
+        function instantiateCached<T extends Type>(type: T, mapper: TypeMapper, instantiator: (item: T, mapper: TypeMapper) => T): T {
+            const instantiations = mapper.instantiations || (mapper.instantiations = []);
+            return <T>instantiations[type.id] || (instantiations[type.id] = instantiator(type, mapper));
+        }
+
         function createUnaryTypeMapper(source: Type, target: Type): TypeMapper {
             return t => t === source ? target : t;
         }
@@ -6261,28 +6266,11 @@ namespace ts {
         }
 
         function instantiateAnonymousOrMappedType(type: AnonymousType | MappedType, mapper: TypeMapper): ObjectType {
-            if (type.objectFlags & ObjectFlags.Instantiated) {
-                // If the type being instantiated is itself a instantiation, fetch the original target and
-                // combine the type mappers.
-                mapper = combineTypeMappers(type.mapper, mapper);
-                type = type.target;
-            }
-            if (mapper.instantiations) {
-                const cachedType = <ObjectType>mapper.instantiations[type.id];
-                if (cachedType) {
-                    return cachedType;
-                }
-            }
-            else {
-                mapper.instantiations = [];
-            }
-            // Mark the anonymous type as instantiated such that our infinite instantiation detection logic can recognize it
             const result = <AnonymousType | MappedType>createObjectType(type.objectFlags | ObjectFlags.Instantiated, type.symbol);
-            result.target = type;
-            result.mapper = mapper;
+            result.target = type.objectFlags & ObjectFlags.Instantiated ? type.target : type;
+            result.mapper = type.objectFlags & ObjectFlags.Instantiated ? combineTypeMappers(type.mapper, mapper) : mapper;
             result.aliasSymbol = type.aliasSymbol;
             result.aliasTypeArguments = mapper.targetTypes;
-            mapper.instantiations[type.id] = result;
             return result;
         }
 
@@ -6354,10 +6342,10 @@ namespace ts {
                         return type.symbol &&
                             type.symbol.flags & (SymbolFlags.Function | SymbolFlags.Method | SymbolFlags.Class | SymbolFlags.TypeLiteral | SymbolFlags.ObjectLiteral) &&
                             ((<ObjectType>type).objectFlags & ObjectFlags.Instantiated || isSymbolInScopeOfMappedTypeParameter(type.symbol, mapper)) ?
-                            instantiateAnonymousOrMappedType(<AnonymousType>type, mapper) : type;
+                            instantiateCached(type, mapper, instantiateAnonymousOrMappedType) : type;
                     }
                     if ((<ObjectType>type).objectFlags & ObjectFlags.Mapped) {
-                        return instantiateAnonymousOrMappedType(<MappedType>type, mapper);
+                        return instantiateCached(type, mapper, instantiateAnonymousOrMappedType);
                     }
                     if ((<ObjectType>type).objectFlags & ObjectFlags.Reference) {
                         return createTypeReference((<TypeReference>type).target, instantiateList((<TypeReference>type).typeArguments, mapper, instantiateType));

From 61b9da548a6eb8d6b11849d129996625968833f4 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sat, 5 Nov 2016 08:20:02 -0700
Subject: [PATCH 108/421] Cache generic signature instantiations

---
 src/compiler/checker.ts | 8 +++++++-
 src/compiler/types.ts   | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 0f2c642124a..9647077d943 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -4232,7 +4232,7 @@ namespace ts {
             for (const baseSig of baseSignatures) {
                 const typeParamCount = baseSig.typeParameters ? baseSig.typeParameters.length : 0;
                 if (typeParamCount === typeArgCount) {
-                    const sig = typeParamCount ? getSignatureInstantiation(baseSig, typeArguments) : cloneSignature(baseSig);
+                    const sig = typeParamCount ? createSignatureInstantiation(baseSig, typeArguments) : cloneSignature(baseSig);
                     sig.typeParameters = classType.localTypeParameters;
                     sig.resolvedReturnType = classType;
                     result.push(sig);
@@ -4982,6 +4982,12 @@ namespace ts {
         }
 
         function getSignatureInstantiation(signature: Signature, typeArguments: Type[]): Signature {
+            const instantiations = signature.instantiations || (signature.instantiations = createMap<Signature>());
+            const id = getTypeListId(typeArguments);
+            return instantiations[id] || (instantiations[id] = createSignatureInstantiation(signature, typeArguments));
+        }
+
+        function createSignatureInstantiation(signature: Signature, typeArguments: Type[]): Signature {
             return instantiateSignature(signature, createTypeMapper(signature.typeParameters, typeArguments), /*eraseTypeParameters*/ true);
         }
 
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 5536a818df5..37a3cc466a0 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -2923,6 +2923,8 @@ namespace ts {
         isolatedSignatureType?: ObjectType; // A manufactured type that just contains the signature for purposes of signature comparison
         /* @internal */
         typePredicate?: TypePredicate;
+        /* @internal */
+        instantiations?: Map<Signature>;    // Generic signature instantiation cache
     }
 
     export const enum IndexKind {

From 4c1e4169bded1a3e6fbfb72edf8ae3a47e78b5ad Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sat, 5 Nov 2016 08:23:42 -0700
Subject: [PATCH 109/421] Accept new baselines

---
 tests/baselines/reference/promisePermutations.errors.txt  | 4 ----
 tests/baselines/reference/promisePermutations2.errors.txt | 4 ----
 tests/baselines/reference/promisePermutations3.errors.txt | 4 ----
 3 files changed, 12 deletions(-)

diff --git a/tests/baselines/reference/promisePermutations.errors.txt b/tests/baselines/reference/promisePermutations.errors.txt
index 65fa0981643..13fc0718596 100644
--- a/tests/baselines/reference/promisePermutations.errors.txt
+++ b/tests/baselines/reference/promisePermutations.errors.txt
@@ -25,8 +25,6 @@ tests/cases/compiler/promisePermutations.ts(106,19): error TS2345: Argument of t
   Types of parameters 'cb' and 'value' are incompatible.
     Type 'string' is not assignable to type '<T>(a: T) => T'.
 tests/cases/compiler/promisePermutations.ts(109,19): error TS2345: Argument of type '(cb: <T>(a: T) => T) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
-  Types of parameters 'cb' and 'value' are incompatible.
-    Type 'string' is not assignable to type '<T>(a: T) => T'.
 tests/cases/compiler/promisePermutations.ts(110,19): error TS2345: Argument of type '(cb: <T>(a: T) => T) => Promise<string>' is not assignable to parameter of type '(value: string) => Promise<string>'.
   Types of parameters 'cb' and 'value' are incompatible.
     Type 'string' is not assignable to type '<T>(a: T) => T'.
@@ -229,8 +227,6 @@ tests/cases/compiler/promisePermutations.ts(160,21): error TS2345: Argument of t
     var s7a = r7.then(testFunction7, testFunction7, testFunction7); // error
                       ~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(cb: <T>(a: T) => T) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
-!!! error TS2345:   Types of parameters 'cb' and 'value' are incompatible.
-!!! error TS2345:     Type 'string' is not assignable to type '<T>(a: T) => T'.
     var s7b = r7.then(testFunction7P, testFunction7P, testFunction7P); // error
                       ~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(cb: <T>(a: T) => T) => Promise<string>' is not assignable to parameter of type '(value: string) => Promise<string>'.
diff --git a/tests/baselines/reference/promisePermutations2.errors.txt b/tests/baselines/reference/promisePermutations2.errors.txt
index 0fc6f04911a..b21a3a39208 100644
--- a/tests/baselines/reference/promisePermutations2.errors.txt
+++ b/tests/baselines/reference/promisePermutations2.errors.txt
@@ -25,8 +25,6 @@ tests/cases/compiler/promisePermutations2.ts(105,19): error TS2345: Argument of
   Types of parameters 'cb' and 'value' are incompatible.
     Type 'string' is not assignable to type '<T>(a: T) => T'.
 tests/cases/compiler/promisePermutations2.ts(108,19): error TS2345: Argument of type '(cb: <T>(a: T) => T) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
-  Types of parameters 'cb' and 'value' are incompatible.
-    Type 'string' is not assignable to type '<T>(a: T) => T'.
 tests/cases/compiler/promisePermutations2.ts(109,19): error TS2345: Argument of type '(cb: <T>(a: T) => T) => Promise<string>' is not assignable to parameter of type '(value: string) => Promise<string>'.
   Types of parameters 'cb' and 'value' are incompatible.
     Type 'string' is not assignable to type '<T>(a: T) => T'.
@@ -228,8 +226,6 @@ tests/cases/compiler/promisePermutations2.ts(159,21): error TS2345: Argument of
     var s7a = r7.then(testFunction7, testFunction7, testFunction7); // error
                       ~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(cb: <T>(a: T) => T) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
-!!! error TS2345:   Types of parameters 'cb' and 'value' are incompatible.
-!!! error TS2345:     Type 'string' is not assignable to type '<T>(a: T) => T'.
     var s7b = r7.then(testFunction7P, testFunction7P, testFunction7P); // error
                       ~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(cb: <T>(a: T) => T) => Promise<string>' is not assignable to parameter of type '(value: string) => Promise<string>'.
diff --git a/tests/baselines/reference/promisePermutations3.errors.txt b/tests/baselines/reference/promisePermutations3.errors.txt
index a1a1b3f493f..1a33d1083aa 100644
--- a/tests/baselines/reference/promisePermutations3.errors.txt
+++ b/tests/baselines/reference/promisePermutations3.errors.txt
@@ -28,8 +28,6 @@ tests/cases/compiler/promisePermutations3.ts(105,19): error TS2345: Argument of
   Types of parameters 'cb' and 'value' are incompatible.
     Type 'string' is not assignable to type '<T>(a: T) => T'.
 tests/cases/compiler/promisePermutations3.ts(108,19): error TS2345: Argument of type '(cb: <T>(a: T) => T) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
-  Types of parameters 'cb' and 'value' are incompatible.
-    Type 'string' is not assignable to type '<T>(a: T) => T'.
 tests/cases/compiler/promisePermutations3.ts(109,19): error TS2345: Argument of type '(cb: <T>(a: T) => T) => Promise<string>' is not assignable to parameter of type '(value: string) => Promise<string>'.
   Types of parameters 'cb' and 'value' are incompatible.
     Type 'string' is not assignable to type '<T>(a: T) => T'.
@@ -240,8 +238,6 @@ tests/cases/compiler/promisePermutations3.ts(165,21): error TS2345: Argument of
     var s7a = r7.then(testFunction7, testFunction7, testFunction7); // error
                       ~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(cb: <T>(a: T) => T) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
-!!! error TS2345:   Types of parameters 'cb' and 'value' are incompatible.
-!!! error TS2345:     Type 'string' is not assignable to type '<T>(a: T) => T'.
     var s7b = r7.then(testFunction7P, testFunction7P, testFunction7P); // error
                       ~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(cb: <T>(a: T) => T) => Promise<string>' is not assignable to parameter of type '(value: string) => Promise<string>'.

From 507ab30e9c4d2ab02d4caf8d033ae11226c4753a Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sat, 5 Nov 2016 17:01:47 -0700
Subject: [PATCH 110/421] Handle readonly and optional properties + index
 signatures

---
 src/compiler/checker.ts | 57 ++++++++++++++++++++++++++++++++---------
 src/compiler/types.ts   |  6 +++--
 2 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 2a0c4eee988..fe895d5be45 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -2546,13 +2546,20 @@ namespace ts {
                         writePunctuation(writer, SyntaxKind.OpenBraceToken);
                         writer.writeLine();
                         writer.increaseIndent();
+                        if (type.isReadonly) {
+                            writeKeyword(writer, SyntaxKind.ReadonlyKeyword);
+                            writeSpace(writer);
+                        }
                         writePunctuation(writer, SyntaxKind.OpenBracketToken);
-                        appendSymbolNameOnly((type.target || type).typeParameter.symbol, writer);
+                        appendSymbolNameOnly(type.typeParameter.symbol, writer);
                         writeSpace(writer);
                         writeKeyword(writer, SyntaxKind.InKeyword);
                         writeSpace(writer);
                         writeType(constraintType, TypeFormatFlags.None);
                         writePunctuation(writer, SyntaxKind.CloseBracketToken);
+                        if (type.isOptional) {
+                            writePunctuation(writer, SyntaxKind.QuestionToken);
+                        }
                         writePunctuation(writer, SyntaxKind.ColonToken);
                         writeSpace(writer);
                         writeType(getTemplateTypeFromMappedType(type), TypeFormatFlags.None);
@@ -4453,28 +4460,40 @@ namespace ts {
             const members: SymbolTable = createMap<Symbol>();
             let stringIndexInfo: IndexInfo;
             let numberIndexInfo: IndexInfo;
-            const target = type.target || type;
-            const keyType = getApparentType(getConstraintTypeFromMappedType(type));
+            const constraintType = getConstraintTypeFromMappedType(type);
+            const keyType = constraintType.flags & TypeFlags.TypeParameter ? getApparentType(constraintType) : constraintType;
             const iterationType = keyType.flags & TypeFlags.Index ? getIndexType(getApparentType((<IndexType>keyType).type)) : keyType;
             forEachType(iterationType, t => {
-                const iterationMapper = createUnaryTypeMapper(target.typeParameter, t);
+                const iterationMapper = createUnaryTypeMapper(type.typeParameter, t);
                 const templateMapper = type.mapper ? combineTypeMappers(type.mapper, iterationMapper) : iterationMapper;
+                const propType = instantiateType(type.templateType, templateMapper);
                 if (t.flags & (TypeFlags.StringLiteral | TypeFlags.NumberLiteral | TypeFlags.EnumLiteral)) {
                     const propName = (<LiteralType>t).text;
-                    const prop = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient, propName);
-                    prop.type = instantiateType(target.templateType, templateMapper);
+                    const optionalFlag = type.isOptional ? SymbolFlags.Optional : 0;
+                    const prop = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | optionalFlag, propName);
+                    prop.type = addOptionality(propType, type.isOptional);
+                    prop.isReadonly = type.isReadonly;
                     members[propName] = prop;
                 }
+                else if (t.flags & TypeFlags.String) {
+                    stringIndexInfo = createIndexInfo(propType, type.isReadonly);
+                }
+                else if (t.flags & TypeFlags.Number) {
+                    numberIndexInfo = createIndexInfo(propType, type.isReadonly);
+                }
             });
+            if (stringIndexInfo && numberIndexInfo && isTypeIdenticalTo(stringIndexInfo.type, numberIndexInfo.type)) {
+                numberIndexInfo = undefined;
+            }
             setStructuredTypeMembers(type, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
         }
 
         function getConstraintTypeFromMappedType(type: MappedType) {
-            return instantiateType(getConstraintOfTypeParameter((type.target || type).typeParameter), type.mapper || identityMapper);
+            return instantiateType(getConstraintOfTypeParameter(type.typeParameter), type.mapper || identityMapper);
         }
 
         function getTemplateTypeFromMappedType(type: MappedType) {
-            return instantiateType((type.target || type).templateType, type.mapper || identityMapper);
+            return instantiateType(type.templateType, type.mapper || identityMapper);
         }
 
         function resolveStructuredTypeMembers(type: StructuredType): ResolvedType {
@@ -5919,6 +5938,8 @@ namespace ts {
                 const type = <MappedType>createObjectType(ObjectFlags.Mapped);
                 type.typeParameter = getDeclaredTypeOfTypeParameter(getSymbolOfNode(node.typeParameter));
                 type.templateType = node.type ? getTypeFromTypeNode(node.type) : anyType;
+                type.isReadonly = !!node.readonlyToken;
+                type.isOptional = !!node.questionToken;
                 type.aliasSymbol = aliasSymbol;
                 type.aliasTypeArguments = aliasTypeArguments;
                 links.resolvedType = type;
@@ -6265,8 +6286,8 @@ namespace ts {
             return result;
         }
 
-        function instantiateAnonymousOrMappedType(type: AnonymousType | MappedType, mapper: TypeMapper): ObjectType {
-            const result = <AnonymousType | MappedType>createObjectType(type.objectFlags | ObjectFlags.Instantiated, type.symbol);
+        function instantiateAnonymousType(type: AnonymousType, mapper: TypeMapper): AnonymousType {
+            const result = <AnonymousType>createObjectType(ObjectFlags.Anonymous | ObjectFlags.Instantiated, type.symbol);
             result.target = type.objectFlags & ObjectFlags.Instantiated ? type.target : type;
             result.mapper = type.objectFlags & ObjectFlags.Instantiated ? combineTypeMappers(type.mapper, mapper) : mapper;
             result.aliasSymbol = type.aliasSymbol;
@@ -6274,6 +6295,18 @@ namespace ts {
             return result;
         }
 
+        function instantiateMappedType(type: MappedType, mapper: TypeMapper): MappedType {
+            const result = <MappedType>createObjectType(ObjectFlags.Mapped | ObjectFlags.Instantiated, type.symbol);
+            result.typeParameter = type.typeParameter;
+            result.templateType = type.templateType;
+            result.isReadonly = type.isReadonly;
+            result.isOptional = type.isOptional;
+            result.mapper = type.objectFlags & ObjectFlags.Instantiated ? combineTypeMappers(type.mapper, mapper) : mapper;
+            result.aliasSymbol = type.aliasSymbol;
+            result.aliasTypeArguments = mapper.targetTypes;
+            return result;
+        }
+
         function isSymbolInScopeOfMappedTypeParameter(symbol: Symbol, mapper: TypeMapper) {
             if (!(symbol.declarations && symbol.declarations.length)) {
                 return false;
@@ -6342,10 +6375,10 @@ namespace ts {
                         return type.symbol &&
                             type.symbol.flags & (SymbolFlags.Function | SymbolFlags.Method | SymbolFlags.Class | SymbolFlags.TypeLiteral | SymbolFlags.ObjectLiteral) &&
                             ((<ObjectType>type).objectFlags & ObjectFlags.Instantiated || isSymbolInScopeOfMappedTypeParameter(type.symbol, mapper)) ?
-                            instantiateCached(type, mapper, instantiateAnonymousOrMappedType) : type;
+                            instantiateCached(type, mapper, instantiateAnonymousType) : type;
                     }
                     if ((<ObjectType>type).objectFlags & ObjectFlags.Mapped) {
-                        return instantiateCached(type, mapper, instantiateAnonymousOrMappedType);
+                        return instantiateCached(type, mapper, instantiateMappedType);
                     }
                     if ((<ObjectType>type).objectFlags & ObjectFlags.Reference) {
                         return createTypeReference((<TypeReference>type).target, instantiateList((<TypeReference>type).typeArguments, mapper, instantiateType));
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index fcd5b68950b..7bea81ef6b6 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -899,7 +899,7 @@ namespace ts {
         indexType: TypeNode;
     }
 
-    export interface MappedTypeNode extends TypeNode {
+    export interface MappedTypeNode extends TypeNode, Declaration {
         kind: SyntaxKind.MappedType;
         readonlyToken?: ReadonlyToken;
         typeParameter: TypeParameterDeclaration;
@@ -2850,7 +2850,9 @@ namespace ts {
     export interface MappedType extends ObjectType {
         typeParameter: TypeParameter;
         templateType: Type;
-        target?: MappedType;  // Instantiation target
+        isReadonly: boolean;
+        isOptional: boolean;
+        // target?: MappedType;  // Instantiation target
         mapper?: TypeMapper;  // Instantiation mapper
     }
 

From da7f11fe4bc7a2b95705601590df17a720f8e072 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sat, 5 Nov 2016 17:36:00 -0700
Subject: [PATCH 111/421] Properly instantiate aliasTypeArguments

---
 src/compiler/checker.ts | 25 ++++++++++++++++---------
 src/compiler/types.ts   |  1 -
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 0f2c642124a..d0028896baa 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -4164,8 +4164,8 @@ namespace ts {
             else {
                 mapper = createTypeMapper(typeParameters, typeArguments);
                 members = createInstantiatedSymbolTable(source.declaredProperties, mapper, /*mappingThisOnly*/ typeParameters.length === 1);
-                callSignatures = instantiateList(source.declaredCallSignatures, mapper, instantiateSignature);
-                constructSignatures = instantiateList(source.declaredConstructSignatures, mapper, instantiateSignature);
+                callSignatures = instantiateSignatures(source.declaredCallSignatures, mapper);
+                constructSignatures = instantiateSignatures(source.declaredConstructSignatures, mapper);
                 stringIndexInfo = instantiateIndexInfo(source.declaredStringIndexInfo, mapper);
                 numberIndexInfo = instantiateIndexInfo(source.declaredNumberIndexInfo, mapper);
             }
@@ -4363,8 +4363,8 @@ namespace ts {
             const symbol = type.symbol;
             if (type.target) {
                 const members = createInstantiatedSymbolTable(getPropertiesOfObjectType(type.target), type.mapper, /*mappingThisOnly*/ false);
-                const callSignatures = instantiateList(getSignaturesOfType(type.target, SignatureKind.Call), type.mapper, instantiateSignature);
-                const constructSignatures = instantiateList(getSignaturesOfType(type.target, SignatureKind.Construct), type.mapper, instantiateSignature);
+                const callSignatures = instantiateSignatures(getSignaturesOfType(type.target, SignatureKind.Call), type.mapper);
+                const constructSignatures = instantiateSignatures(getSignaturesOfType(type.target, SignatureKind.Construct), type.mapper);
                 const stringIndexInfo = instantiateIndexInfo(getIndexInfoOfType(type.target, IndexKind.String), type.mapper);
                 const numberIndexInfo = instantiateIndexInfo(getIndexInfoOfType(type.target, IndexKind.Number), type.mapper);
                 setStructuredTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
@@ -6037,6 +6037,14 @@ namespace ts {
             return items;
         }
 
+        function instantiateTypes(types: Type[], mapper: TypeMapper) {
+            return instantiateList(types, mapper, instantiateType);
+        }
+
+        function instantiateSignatures(signatures: Signature[], mapper: TypeMapper) {
+            return instantiateList(signatures, mapper, instantiateSignature);
+        }
+
         function createUnaryTypeMapper(source: Type, target: Type): TypeMapper {
             return t => t === source ? target : t;
         }
@@ -6063,7 +6071,6 @@ namespace ts {
                     count == 2 ? createBinaryTypeMapper(sources[0], targets ? targets[0] : anyType, sources[1], targets ? targets[1] : anyType) :
                         createArrayTypeMapper(sources, targets);
             mapper.mappedTypes = sources;
-            mapper.targetTypes = targets;
             return mapper;
         }
 
@@ -6190,7 +6197,7 @@ namespace ts {
             result.target = type;
             result.mapper = mapper;
             result.aliasSymbol = type.aliasSymbol;
-            result.aliasTypeArguments = mapper.targetTypes;
+            result.aliasTypeArguments = instantiateTypes(type.aliasTypeArguments, mapper);
             mapper.instantiations[type.id] = result;
             return result;
         }
@@ -6266,14 +6273,14 @@ namespace ts {
                             instantiateAnonymousType(<AnonymousType>type, mapper) : type;
                     }
                     if ((<ObjectType>type).objectFlags & ObjectFlags.Reference) {
-                        return createTypeReference((<TypeReference>type).target, instantiateList((<TypeReference>type).typeArguments, mapper, instantiateType));
+                        return createTypeReference((<TypeReference>type).target, instantiateTypes((<TypeReference>type).typeArguments, mapper));
                     }
                 }
                 if (type.flags & TypeFlags.Union && !(type.flags & TypeFlags.Primitive)) {
-                    return getUnionType(instantiateList((<UnionType>type).types, mapper, instantiateType), /*subtypeReduction*/ false, type.aliasSymbol, mapper.targetTypes);
+                    return getUnionType(instantiateTypes((<UnionType>type).types, mapper), /*subtypeReduction*/ false, type.aliasSymbol, instantiateTypes(type.aliasTypeArguments, mapper));
                 }
                 if (type.flags & TypeFlags.Intersection) {
-                    return getIntersectionType(instantiateList((<IntersectionType>type).types, mapper, instantiateType), type.aliasSymbol, mapper.targetTypes);
+                    return getIntersectionType(instantiateTypes((<IntersectionType>type).types, mapper), type.aliasSymbol, instantiateTypes(type.aliasTypeArguments, mapper));
                 }
                 if (type.flags & TypeFlags.Index) {
                     return getIndexType(instantiateType((<IndexType>type).type, mapper));
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 5536a818df5..f8c77a821a3 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -2940,7 +2940,6 @@ namespace ts {
     export interface TypeMapper {
         (t: TypeParameter): Type;
         mappedTypes?: Type[];       // Types mapped by this mapper
-        targetTypes?: Type[];       // Types substituted for mapped types
         instantiations?: Type[];    // Cache of instantiations created using this type mapper.
         context?: InferenceContext; // The inference context this mapper was created from.
                                     // Only inference mappers have this set (in createInferenceMapper).

From adfa271e4487b0e86932f936b53536262db84c35 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sat, 5 Nov 2016 17:36:13 -0700
Subject: [PATCH 112/421] Add regression test

---
 .../reference/instantiatedTypeAliasDisplay.js | 21 ++++++
 .../instantiatedTypeAliasDisplay.symbols      | 60 +++++++++++++++++
 .../instantiatedTypeAliasDisplay.types        | 66 +++++++++++++++++++
 .../compiler/instantiatedTypeAliasDisplay.ts  | 15 +++++
 4 files changed, 162 insertions(+)
 create mode 100644 tests/baselines/reference/instantiatedTypeAliasDisplay.js
 create mode 100644 tests/baselines/reference/instantiatedTypeAliasDisplay.symbols
 create mode 100644 tests/baselines/reference/instantiatedTypeAliasDisplay.types
 create mode 100644 tests/cases/compiler/instantiatedTypeAliasDisplay.ts

diff --git a/tests/baselines/reference/instantiatedTypeAliasDisplay.js b/tests/baselines/reference/instantiatedTypeAliasDisplay.js
new file mode 100644
index 00000000000..86b17262e0f
--- /dev/null
+++ b/tests/baselines/reference/instantiatedTypeAliasDisplay.js
@@ -0,0 +1,21 @@
+//// [instantiatedTypeAliasDisplay.ts]
+// Repros from #12066
+
+interface X<A> {
+    a: A;
+}
+interface Y<B> {
+    b: B;
+}
+type Z<A, B> = X<A> | Y<B>;
+
+declare function f1<A>(): Z<A, number>;
+declare function f2<A, B, C, D, E>(a: A, b: B, c: C, d: D): Z<A, string[]>;
+
+const x1 = f1<string>();  // Z<string, number>
+const x2 = f2({}, {}, {}, {});  // Z<{}, string[]>
+
+//// [instantiatedTypeAliasDisplay.js]
+// Repros from #12066
+var x1 = f1(); // Z<string, number>
+var x2 = f2({}, {}, {}, {}); // Z<{}, string[]>
diff --git a/tests/baselines/reference/instantiatedTypeAliasDisplay.symbols b/tests/baselines/reference/instantiatedTypeAliasDisplay.symbols
new file mode 100644
index 00000000000..3c6f7d2b725
--- /dev/null
+++ b/tests/baselines/reference/instantiatedTypeAliasDisplay.symbols
@@ -0,0 +1,60 @@
+=== tests/cases/compiler/instantiatedTypeAliasDisplay.ts ===
+// Repros from #12066
+
+interface X<A> {
+>X : Symbol(X, Decl(instantiatedTypeAliasDisplay.ts, 0, 0))
+>A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 2, 12))
+
+    a: A;
+>a : Symbol(X.a, Decl(instantiatedTypeAliasDisplay.ts, 2, 16))
+>A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 2, 12))
+}
+interface Y<B> {
+>Y : Symbol(Y, Decl(instantiatedTypeAliasDisplay.ts, 4, 1))
+>B : Symbol(B, Decl(instantiatedTypeAliasDisplay.ts, 5, 12))
+
+    b: B;
+>b : Symbol(Y.b, Decl(instantiatedTypeAliasDisplay.ts, 5, 16))
+>B : Symbol(B, Decl(instantiatedTypeAliasDisplay.ts, 5, 12))
+}
+type Z<A, B> = X<A> | Y<B>;
+>Z : Symbol(Z, Decl(instantiatedTypeAliasDisplay.ts, 7, 1))
+>A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 8, 7))
+>B : Symbol(B, Decl(instantiatedTypeAliasDisplay.ts, 8, 9))
+>X : Symbol(X, Decl(instantiatedTypeAliasDisplay.ts, 0, 0))
+>A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 8, 7))
+>Y : Symbol(Y, Decl(instantiatedTypeAliasDisplay.ts, 4, 1))
+>B : Symbol(B, Decl(instantiatedTypeAliasDisplay.ts, 8, 9))
+
+declare function f1<A>(): Z<A, number>;
+>f1 : Symbol(f1, Decl(instantiatedTypeAliasDisplay.ts, 8, 27))
+>A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 10, 20))
+>Z : Symbol(Z, Decl(instantiatedTypeAliasDisplay.ts, 7, 1))
+>A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 10, 20))
+
+declare function f2<A, B, C, D, E>(a: A, b: B, c: C, d: D): Z<A, string[]>;
+>f2 : Symbol(f2, Decl(instantiatedTypeAliasDisplay.ts, 10, 39))
+>A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 11, 20))
+>B : Symbol(B, Decl(instantiatedTypeAliasDisplay.ts, 11, 22))
+>C : Symbol(C, Decl(instantiatedTypeAliasDisplay.ts, 11, 25))
+>D : Symbol(D, Decl(instantiatedTypeAliasDisplay.ts, 11, 28))
+>E : Symbol(E, Decl(instantiatedTypeAliasDisplay.ts, 11, 31))
+>a : Symbol(a, Decl(instantiatedTypeAliasDisplay.ts, 11, 35))
+>A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 11, 20))
+>b : Symbol(b, Decl(instantiatedTypeAliasDisplay.ts, 11, 40))
+>B : Symbol(B, Decl(instantiatedTypeAliasDisplay.ts, 11, 22))
+>c : Symbol(c, Decl(instantiatedTypeAliasDisplay.ts, 11, 46))
+>C : Symbol(C, Decl(instantiatedTypeAliasDisplay.ts, 11, 25))
+>d : Symbol(d, Decl(instantiatedTypeAliasDisplay.ts, 11, 52))
+>D : Symbol(D, Decl(instantiatedTypeAliasDisplay.ts, 11, 28))
+>Z : Symbol(Z, Decl(instantiatedTypeAliasDisplay.ts, 7, 1))
+>A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 11, 20))
+
+const x1 = f1<string>();  // Z<string, number>
+>x1 : Symbol(x1, Decl(instantiatedTypeAliasDisplay.ts, 13, 5))
+>f1 : Symbol(f1, Decl(instantiatedTypeAliasDisplay.ts, 8, 27))
+
+const x2 = f2({}, {}, {}, {});  // Z<{}, string[]>
+>x2 : Symbol(x2, Decl(instantiatedTypeAliasDisplay.ts, 14, 5))
+>f2 : Symbol(f2, Decl(instantiatedTypeAliasDisplay.ts, 10, 39))
+
diff --git a/tests/baselines/reference/instantiatedTypeAliasDisplay.types b/tests/baselines/reference/instantiatedTypeAliasDisplay.types
new file mode 100644
index 00000000000..44885777e74
--- /dev/null
+++ b/tests/baselines/reference/instantiatedTypeAliasDisplay.types
@@ -0,0 +1,66 @@
+=== tests/cases/compiler/instantiatedTypeAliasDisplay.ts ===
+// Repros from #12066
+
+interface X<A> {
+>X : X<A>
+>A : A
+
+    a: A;
+>a : A
+>A : A
+}
+interface Y<B> {
+>Y : Y<B>
+>B : B
+
+    b: B;
+>b : B
+>B : B
+}
+type Z<A, B> = X<A> | Y<B>;
+>Z : Z<A, B>
+>A : A
+>B : B
+>X : X<A>
+>A : A
+>Y : Y<B>
+>B : B
+
+declare function f1<A>(): Z<A, number>;
+>f1 : <A>() => Z<A, number>
+>A : A
+>Z : Z<A, B>
+>A : A
+
+declare function f2<A, B, C, D, E>(a: A, b: B, c: C, d: D): Z<A, string[]>;
+>f2 : <A, B, C, D, E>(a: A, b: B, c: C, d: D) => Z<A, string[]>
+>A : A
+>B : B
+>C : C
+>D : D
+>E : E
+>a : A
+>A : A
+>b : B
+>B : B
+>c : C
+>C : C
+>d : D
+>D : D
+>Z : Z<A, B>
+>A : A
+
+const x1 = f1<string>();  // Z<string, number>
+>x1 : Z<string, number>
+>f1<string>() : Z<string, number>
+>f1 : <A>() => Z<A, number>
+
+const x2 = f2({}, {}, {}, {});  // Z<{}, string[]>
+>x2 : Z<{}, string[]>
+>f2({}, {}, {}, {}) : Z<{}, string[]>
+>f2 : <A, B, C, D, E>(a: A, b: B, c: C, d: D) => Z<A, string[]>
+>{} : {}
+>{} : {}
+>{} : {}
+>{} : {}
+
diff --git a/tests/cases/compiler/instantiatedTypeAliasDisplay.ts b/tests/cases/compiler/instantiatedTypeAliasDisplay.ts
new file mode 100644
index 00000000000..d2abaaf8afe
--- /dev/null
+++ b/tests/cases/compiler/instantiatedTypeAliasDisplay.ts
@@ -0,0 +1,15 @@
+// Repros from #12066
+
+interface X<A> {
+    a: A;
+}
+interface Y<B> {
+    b: B;
+}
+type Z<A, B> = X<A> | Y<B>;
+
+declare function f1<A>(): Z<A, number>;
+declare function f2<A, B, C, D, E>(a: A, b: B, c: C, d: D): Z<A, string[]>;
+
+const x1 = f1<string>();  // Z<string, number>
+const x2 = f2({}, {}, {}, {});  // Z<{}, string[]>
\ No newline at end of file

From 2564e1cd26428d3ec36d9db5b3c4aeb6800e2976 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sun, 6 Nov 2016 12:38:49 -0800
Subject: [PATCH 113/421] Handle recursion in mapped type display

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index fe895d5be45..5c171341e6c 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -2243,12 +2243,9 @@ namespace ts {
                     else if (type.flags & TypeFlags.UnionOrIntersection) {
                         writeUnionOrIntersectionType(<UnionOrIntersectionType>type, nextFlags);
                     }
-                    else if (getObjectFlags(type) & ObjectFlags.Anonymous) {
+                    else if (getObjectFlags(type) & (ObjectFlags.Anonymous | ObjectFlags.Mapped)) {
                         writeAnonymousType(<ObjectType>type, nextFlags);
                     }
-                    else if (getObjectFlags(type) & ObjectFlags.Mapped) {
-                        writeMappedType(<MappedType>type);
-                    }
                     else if (type.flags & TypeFlags.StringOrNumberLiteral) {
                         writer.writeStringLiteral(literalTypeToString(<LiteralType>type));
                     }
@@ -2465,6 +2462,13 @@ namespace ts {
                 }
 
                 function writeLiteralType(type: ObjectType, flags: TypeFormatFlags) {
+                    if (type.objectFlags & ObjectFlags.Mapped) {
+                        if (getConstraintTypeFromMappedType(<MappedType>type).flags & (TypeFlags.TypeParameter | TypeFlags.Index)) {
+                            writeMappedType(<MappedType>type);
+                            return;
+                        }
+                    }
+
                     const resolved = resolveStructuredTypeMembers(type);
                     if (!resolved.properties.length && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
                         if (!resolved.callSignatures.length && !resolved.constructSignatures.length) {
@@ -2541,36 +2545,30 @@ namespace ts {
                 }
 
                 function writeMappedType(type: MappedType) {
-                    const constraintType = getConstraintTypeFromMappedType(type);
-                    if (constraintType.flags & (TypeFlags.TypeParameter | TypeFlags.Index)) {
-                        writePunctuation(writer, SyntaxKind.OpenBraceToken);
-                        writer.writeLine();
-                        writer.increaseIndent();
-                        if (type.isReadonly) {
-                            writeKeyword(writer, SyntaxKind.ReadonlyKeyword);
-                            writeSpace(writer);
-                        }
-                        writePunctuation(writer, SyntaxKind.OpenBracketToken);
-                        appendSymbolNameOnly(type.typeParameter.symbol, writer);
+                    writePunctuation(writer, SyntaxKind.OpenBraceToken);
+                    writer.writeLine();
+                    writer.increaseIndent();
+                    if (type.isReadonly) {
+                        writeKeyword(writer, SyntaxKind.ReadonlyKeyword);
                         writeSpace(writer);
-                        writeKeyword(writer, SyntaxKind.InKeyword);
-                        writeSpace(writer);
-                        writeType(constraintType, TypeFormatFlags.None);
-                        writePunctuation(writer, SyntaxKind.CloseBracketToken);
-                        if (type.isOptional) {
-                            writePunctuation(writer, SyntaxKind.QuestionToken);
-                        }
-                        writePunctuation(writer, SyntaxKind.ColonToken);
-                        writeSpace(writer);
-                        writeType(getTemplateTypeFromMappedType(type), TypeFormatFlags.None);
-                        writePunctuation(writer, SyntaxKind.SemicolonToken);
-                        writer.writeLine();
-                        writer.decreaseIndent();
-                        writePunctuation(writer, SyntaxKind.CloseBraceToken);
                     }
-                    else {
-                        writeLiteralType(type, TypeFormatFlags.None);
+                    writePunctuation(writer, SyntaxKind.OpenBracketToken);
+                    appendSymbolNameOnly(type.typeParameter.symbol, writer);
+                    writeSpace(writer);
+                    writeKeyword(writer, SyntaxKind.InKeyword);
+                    writeSpace(writer);
+                    writeType(getConstraintTypeFromMappedType(type), TypeFormatFlags.None);
+                    writePunctuation(writer, SyntaxKind.CloseBracketToken);
+                    if (type.isOptional) {
+                        writePunctuation(writer, SyntaxKind.QuestionToken);
                     }
+                    writePunctuation(writer, SyntaxKind.ColonToken);
+                    writeSpace(writer);
+                    writeType(getTemplateTypeFromMappedType(type), TypeFormatFlags.None);
+                    writePunctuation(writer, SyntaxKind.SemicolonToken);
+                    writer.writeLine();
+                    writer.decreaseIndent();
+                    writePunctuation(writer, SyntaxKind.CloseBraceToken);
                 }
             }
 
@@ -5935,7 +5933,7 @@ namespace ts {
         function getTypeFromMappedTypeNode(node: MappedTypeNode, aliasSymbol?: Symbol, aliasTypeArguments?: Type[]): Type {
             const links = getNodeLinks(node);
             if (!links.resolvedType) {
-                const type = <MappedType>createObjectType(ObjectFlags.Mapped);
+                const type = <MappedType>createObjectType(ObjectFlags.Mapped, node.symbol);
                 type.typeParameter = getDeclaredTypeOfTypeParameter(getSymbolOfNode(node.typeParameter));
                 type.templateType = node.type ? getTypeFromTypeNode(node.type) : anyType;
                 type.isReadonly = !!node.readonlyToken;

From 2bf4bad0e16a3e3d4546afe47d8ef4fb837778f4 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sun, 6 Nov 2016 16:00:41 -0800
Subject: [PATCH 114/421] Revert incorrect logic from #11392

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index d0028896baa..1a93909834b 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -2229,14 +2229,8 @@ namespace ts {
                         // The specified symbol flags need to be reinterpreted as type flags
                         buildSymbolDisplay(type.symbol, writer, enclosingDeclaration, SymbolFlags.Type, SymbolFormatFlags.None, nextFlags);
                     }
-                    else if (!(flags & TypeFormatFlags.InTypeAlias) && ((getObjectFlags(type) & ObjectFlags.Anonymous && !(<AnonymousType>type).target) || type.flags & TypeFlags.UnionOrIntersection) && type.aliasSymbol &&
+                    else if (!(flags & TypeFormatFlags.InTypeAlias) && (getObjectFlags(type) & ObjectFlags.Anonymous || type.flags & TypeFlags.UnionOrIntersection) && type.aliasSymbol &&
                         isSymbolAccessible(type.aliasSymbol, enclosingDeclaration, SymbolFlags.Type, /*shouldComputeAliasesToMakeVisible*/ false).accessibility === SymbolAccessibility.Accessible) {
-                        // We emit inferred type as type-alias at the current localtion if all the following is true
-                        //      the input type is has alias symbol that is accessible
-                        //      the input type is a union, intersection or anonymous type that is fully instantiated (if not we want to keep dive into)
-                        //          e.g.: export type Bar<X, Y> = () => [X, Y];
-                        //                export type Foo<Y> = Bar<any, Y>;
-                        //                export const y = (x: Foo<string>) => 1  // we want to emit as ...x: () => [any, string])
                         const typeArguments = type.aliasTypeArguments;
                         writeSymbolTypeReference(type.aliasSymbol, typeArguments, 0, typeArguments ? typeArguments.length : 0, nextFlags);
                     }

From cc9daca38d06719612803e90bdf8ca4fcb706b67 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sun, 6 Nov 2016 16:02:32 -0800
Subject: [PATCH 115/421] Accept new baselines

---
 .../declarationEmitTypeAliasWithTypeParameters1.js     |  2 +-
 .../declarationEmitTypeAliasWithTypeParameters1.types  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js
index c41c4690391..6079de35964 100644
--- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js
@@ -12,4 +12,4 @@ exports.y = function (x) { return 1; };
 //// [declarationEmitTypeAliasWithTypeParameters1.d.ts]
 export declare type Bar<X, Y> = () => [X, Y];
 export declare type Foo<Y> = Bar<any, Y>;
-export declare const y: (x: () => [any, string]) => number;
+export declare const y: (x: Bar<any, string>) => number;
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.types b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.types
index 3ff9f9bde1d..a8b0f146f8e 100644
--- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.types
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.types
@@ -8,15 +8,15 @@ export type Bar<X, Y> = () => [X, Y];
 >Y : Y
 
 export type Foo<Y> = Bar<any, Y>;
->Foo : () => [any, Y]
+>Foo : Bar<any, Y>
 >Y : Y
 >Bar : Bar<X, Y>
 >Y : Y
 
 export const y = (x: Foo<string>) => 1
->y : (x: () => [any, string]) => number
->(x: Foo<string>) => 1 : (x: () => [any, string]) => number
->x : () => [any, string]
->Foo : () => [any, Y]
+>y : (x: Bar<any, string>) => number
+>(x: Foo<string>) => 1 : (x: Bar<any, string>) => number
+>x : Bar<any, string>
+>Foo : Bar<any, Y>
 >1 : 1
 

From 07630e95e00fe61d51fd92de1f019be4da9c813d Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Mon, 7 Nov 2016 07:14:47 -0800
Subject: [PATCH 116/421] Add source maps and declarations to test

---
 src/harness/compilerRunner.ts                 |  2 +-
 src/harness/harness.ts                        | 24 ++++----
 .../reference/commonSourceDirectory.js        |  4 ++
 .../reference/commonSourceDirectory.js.map    |  2 +
 .../commonSourceDirectory.sourcemap.txt       | 58 +++++++++++++++++++
 tests/cases/compiler/commonSourceDirectory.ts |  6 +-
 6 files changed, 81 insertions(+), 15 deletions(-)
 create mode 100644 tests/baselines/reference/commonSourceDirectory.js.map
 create mode 100644 tests/baselines/reference/commonSourceDirectory.sourcemap.txt

diff --git a/src/harness/compilerRunner.ts b/src/harness/compilerRunner.ts
index 70c6fdac329..327932f3667 100644
--- a/src/harness/compilerRunner.ts
+++ b/src/harness/compilerRunner.ts
@@ -170,7 +170,7 @@ class CompilerBaselineRunner extends RunnerBase {
             });
 
             it("Correct Sourcemap output for " + fileName, () => {
-                Harness.Compiler.doSourcemapBaseline(justName, options, result);
+                Harness.Compiler.doSourcemapBaseline(justName, options, result, harnessSettings);
             });
 
             it("Correct type/symbol baselines for " + fileName, () => {
diff --git a/src/harness/harness.ts b/src/harness/harness.ts
index 57ee46299b5..1173576f0c7 100644
--- a/src/harness/harness.ts
+++ b/src/harness/harness.ts
@@ -1554,7 +1554,7 @@ namespace Harness {
             return file.writeByteOrderMark ? "\u00EF\u00BB\u00BF" : "";
         }
 
-        export function doSourcemapBaseline(baselinePath: string, options: ts.CompilerOptions, result: CompilerResult) {
+        export function doSourcemapBaseline(baselinePath: string, options: ts.CompilerOptions, result: CompilerResult, harnessSettings: Harness.TestCaseParser.CompilerSettings) {
             if (options.inlineSourceMap) {
                 if (result.sourceMaps.length > 0) {
                     throw new Error("No sourcemap files should be generated if inlineSourceMaps was set.");
@@ -1576,10 +1576,8 @@ namespace Harness {
                     }
 
                     let sourceMapCode = "";
-                    for (let i = 0; i < result.sourceMaps.length; i++) {
-                        sourceMapCode += "//// [" + ts.getBaseFileName(result.sourceMaps[i].fileName) + "]\r\n";
-                        sourceMapCode += getByteOrderMarkText(result.sourceMaps[i]);
-                        sourceMapCode += result.sourceMaps[i].code;
+                    for (const sourceMap of result.sourceMaps) {
+                        sourceMapCode += fileOutput(sourceMap, harnessSettings);
                     }
 
                     return sourceMapCode;
@@ -1606,18 +1604,13 @@ namespace Harness {
 
                 let jsCode = "";
                 for (const file of result.files) {
-                    const fileName = harnessSettings["fullEmitPaths"] ? file.fileName : ts.getBaseFileName(file.fileName);
-                    jsCode += "//// [" + fileName + "]\r\n";
-                    jsCode += getByteOrderMarkText(file);
-                    jsCode += file.code;
+                    jsCode += fileOutput(file, harnessSettings);
                 }
 
                 if (result.declFilesCode.length > 0) {
                     jsCode += "\r\n\r\n";
-                    for (let i = 0; i < result.declFilesCode.length; i++) {
-                        jsCode += "//// [" + ts.getBaseFileName(result.declFilesCode[i].fileName) + "]\r\n";
-                        jsCode += getByteOrderMarkText(result.declFilesCode[i]);
-                        jsCode += result.declFilesCode[i].code;
+                    for (const declFile of result.declFilesCode) {
+                        jsCode += fileOutput(declFile, harnessSettings);
                     }
                 }
 
@@ -1642,6 +1635,11 @@ namespace Harness {
             });
         }
 
+        function fileOutput(file: GeneratedFile, harnessSettings: Harness.TestCaseParser.CompilerSettings): string {
+            const fileName = harnessSettings["fullEmitPaths"] ? file.fileName : ts.getBaseFileName(file.fileName);
+            return "//// [" + fileName + "]\r\n" + getByteOrderMarkText(file) + file.code;
+        }
+
         export function collateOutputs(outputFiles: Harness.Compiler.GeneratedFile[]): string {
             // Collect, test, and sort the fileNames
             outputFiles.sort((a, b) => ts.compareStrings(cleanName(a.fileName), cleanName(b.fileName)));
diff --git a/tests/baselines/reference/commonSourceDirectory.js b/tests/baselines/reference/commonSourceDirectory.js
index 5299095ae74..1a863dbecbd 100644
--- a/tests/baselines/reference/commonSourceDirectory.js
+++ b/tests/baselines/reference/commonSourceDirectory.js
@@ -23,3 +23,7 @@ x + y;
 var foo_1 = require("foo");
 var bar_1 = require("bar");
 foo_1.x + bar_1.y;
+//# sourceMappingURL=/app/myMapRoot/index.js.map
+
+//// [/app/bin/index.d.ts]
+/// <reference path="../../types/bar.d.ts" />
diff --git a/tests/baselines/reference/commonSourceDirectory.js.map b/tests/baselines/reference/commonSourceDirectory.js.map
new file mode 100644
index 00000000000..8e3f925eee9
--- /dev/null
+++ b/tests/baselines/reference/commonSourceDirectory.js.map
@@ -0,0 +1,2 @@
+//// [/app/bin/index.js.map]
+{"version":3,"file":"index.js","sourceRoot":"/app/mySourceRoot/","sources":["index.ts"],"names":[],"mappings":";AAAA,yCAAyC;AACzC,2BAAwB;AACxB,2BAAwB;AACxB,OAAC,GAAG,OAAC,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/commonSourceDirectory.sourcemap.txt b/tests/baselines/reference/commonSourceDirectory.sourcemap.txt
new file mode 100644
index 00000000000..ac198eaf02c
--- /dev/null
+++ b/tests/baselines/reference/commonSourceDirectory.sourcemap.txt
@@ -0,0 +1,58 @@
+===================================================================
+JsFile: index.js
+mapUrl: /app/myMapRoot/index.js.map
+sourceRoot: /app/mySourceRoot/
+sources: index.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:/app/bin/index.js
+sourceFile:index.ts
+-------------------------------------------------------------------
+>>>"use strict";
+>>>/// <reference path="../types/bar.d.ts"/>
+1 >
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path="../types/bar.d.ts"/>
+1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(2, 42) Source(1, 42) + SourceIndex(0)
+---
+>>>var foo_1 = require("foo");
+1 >
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                           ^->
+1 >
+  >
+2 >import { x } from "foo";
+1 >Emitted(3, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(3, 28) Source(2, 25) + SourceIndex(0)
+---
+>>>var bar_1 = require("bar");
+1->
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+  >
+2 >import { y } from "bar";
+1->Emitted(4, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(4, 28) Source(3, 25) + SourceIndex(0)
+---
+>>>foo_1.x + bar_1.y;
+1 >
+2 >^^^^^^^
+3 >       ^^^
+4 >          ^^^^^^^
+5 >                 ^
+6 >                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+2 >x
+3 >        + 
+4 >          y
+5 >                 ;
+1 >Emitted(5, 1) Source(4, 1) + SourceIndex(0)
+2 >Emitted(5, 8) Source(4, 2) + SourceIndex(0)
+3 >Emitted(5, 11) Source(4, 5) + SourceIndex(0)
+4 >Emitted(5, 18) Source(4, 6) + SourceIndex(0)
+5 >Emitted(5, 19) Source(4, 7) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=/app/myMapRoot/index.js.map
\ No newline at end of file
diff --git a/tests/cases/compiler/commonSourceDirectory.ts b/tests/cases/compiler/commonSourceDirectory.ts
index 930f922e10d..9baa27431a3 100644
--- a/tests/cases/compiler/commonSourceDirectory.ts
+++ b/tests/cases/compiler/commonSourceDirectory.ts
@@ -21,6 +21,10 @@ x + y;
 {
     "compilerOptions": {
         "outDir": "bin",
-        "typeRoots": ["../types"]
+        "typeRoots": ["../types"],
+        "sourceMap": true,
+        "mapRoot": "myMapRoot",
+        "sourceRoot": "mySourceRoot",
+        "declaration": true
     }
 }

From a84c7aeea4f0109af303dfad05232011abfca212 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 7 Nov 2016 08:36:03 -0800
Subject: [PATCH 117/421] Rename SpreadElementExpression -> SpreadAssignment

and SpreadExpression (formerly SpreadElementExpression) -> SpreadElement
---
 src/compiler/binder.ts                     | 14 +++++-----
 src/compiler/checker.ts                    | 30 +++++++++++-----------
 src/compiler/emitter.ts                    |  6 ++---
 src/compiler/factory.ts                    |  4 +--
 src/compiler/parser.ts                     | 16 ++++++------
 src/compiler/transformers/destructuring.ts |  4 +--
 src/compiler/transformers/es2015.ts        |  6 ++---
 src/compiler/transformers/esnext.ts        |  4 +--
 src/compiler/types.ts                      | 16 +++++-------
 src/compiler/utilities.ts                  | 14 +++++-----
 src/compiler/visitor.ts                    | 10 ++++----
 src/services/breakpoints.ts                |  2 +-
 src/services/utilities.ts                  |  4 +--
 13 files changed, 64 insertions(+), 66 deletions(-)

diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index b0c456a6770..902d20b0cfd 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -1138,8 +1138,8 @@ namespace ts {
             }
             else if (node.kind === SyntaxKind.ArrayLiteralExpression) {
                 for (const e of (<ArrayLiteralExpression>node).elements) {
-                    if (e.kind === SyntaxKind.SpreadExpression) {
-                        bindAssignmentTargetFlow((<SpreadExpression>e).expression);
+                    if (e.kind === SyntaxKind.SpreadElement) {
+                        bindAssignmentTargetFlow((<SpreadElement>e).expression);
                     }
                     else {
                         bindDestructuringTargetFlow(e);
@@ -1154,8 +1154,8 @@ namespace ts {
                     else if (p.kind === SyntaxKind.ShorthandPropertyAssignment) {
                         bindAssignmentTargetFlow((<ShorthandPropertyAssignment>p).name);
                     }
-                    else if (p.kind === SyntaxKind.SpreadElementExpression) {
-                        bindAssignmentTargetFlow((<SpreadElementExpression>p).expression);
+                    else if (p.kind === SyntaxKind.SpreadAssignment) {
+                        bindAssignmentTargetFlow((<SpreadAssignment>p).expression);
                     }
                 }
             }
@@ -1929,7 +1929,7 @@ namespace ts {
                 case SyntaxKind.EnumMember:
                     return bindPropertyOrMethodOrAccessor(<Declaration>node, SymbolFlags.EnumMember, SymbolFlags.EnumMemberExcludes);
 
-                case SyntaxKind.SpreadElementExpression:
+                case SyntaxKind.SpreadAssignment:
                 case SyntaxKind.JsxSpreadAttribute:
                     emitFlags |= NodeFlags.HasSpreadAttribute;
                     return;
@@ -3127,8 +3127,8 @@ namespace ts {
                 }
                 break;
 
-            case SyntaxKind.SpreadExpression:
-            case SyntaxKind.SpreadElementExpression:
+            case SyntaxKind.SpreadElement:
+            case SyntaxKind.SpreadAssignment:
                 // This node is ES6 or ES future syntax, but is handled by a containing node.
                 transformFlags |= TransformFlags.ContainsSpreadExpression;
                 break;
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 20e90f4db25..09172d02ad7 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -8640,7 +8640,7 @@ namespace ts {
             return getTypeOfDestructuredArrayElement(getAssignedType(node), indexOf(node.elements, element));
         }
 
-        function getAssignedTypeOfSpreadExpression(node: SpreadExpression): Type {
+        function getAssignedTypeOfSpreadExpression(node: SpreadElement): Type {
             return getTypeOfDestructuredSpreadExpression(getAssignedType(<ArrayLiteralExpression>node.parent));
         }
 
@@ -8665,8 +8665,8 @@ namespace ts {
                     return undefinedType;
                 case SyntaxKind.ArrayLiteralExpression:
                     return getAssignedTypeOfArrayLiteralElement(<ArrayLiteralExpression>parent, node);
-                case SyntaxKind.SpreadExpression:
-                    return getAssignedTypeOfSpreadExpression(<SpreadExpression>parent);
+                case SyntaxKind.SpreadElement:
+                    return getAssignedTypeOfSpreadExpression(<SpreadElement>parent);
                 case SyntaxKind.PropertyAssignment:
                     return getAssignedTypeOfPropertyAssignment(<PropertyAssignment>parent);
                 case SyntaxKind.ShorthandPropertyAssignment:
@@ -10697,7 +10697,7 @@ namespace ts {
             return mapper && mapper.context;
         }
 
-        function checkSpreadExpression(node: SpreadExpression, contextualMapper?: TypeMapper): Type {
+        function checkSpreadExpression(node: SpreadElement, contextualMapper?: TypeMapper): Type {
             // It is usually not safe to call checkExpressionCached if we can be contextually typing.
             // You can tell that we are contextually typing because of the contextualMapper parameter.
             // While it is true that a spread element can have a contextual type, it does not do anything
@@ -10719,7 +10719,7 @@ namespace ts {
             const elementTypes: Type[] = [];
             const inDestructuringPattern = isAssignmentTarget(node);
             for (const e of elements) {
-                if (inDestructuringPattern && e.kind === SyntaxKind.SpreadExpression) {
+                if (inDestructuringPattern && e.kind === SyntaxKind.SpreadElement) {
                     // Given the following situation:
                     //    var c: {};
                     //    [...c] = ["", 0];
@@ -10732,7 +10732,7 @@ namespace ts {
                     // get the contextual element type from it. So we do something similar to
                     // getContextualTypeForElementExpression, which will crucially not error
                     // if there is no index type / iterated type.
-                    const restArrayType = checkExpression((<SpreadExpression>e).expression, contextualMapper);
+                    const restArrayType = checkExpression((<SpreadElement>e).expression, contextualMapper);
                     const restElementType = getIndexTypeOfType(restArrayType, IndexKind.Number) ||
                         (languageVersion >= ScriptTarget.ES2015 ? getElementTypeOfIterable(restArrayType, /*errorNode*/ undefined) : undefined);
                     if (restElementType) {
@@ -10743,7 +10743,7 @@ namespace ts {
                     const type = checkExpressionForMutableLocation(e, contextualMapper);
                     elementTypes.push(type);
                 }
-                hasSpreadElement = hasSpreadElement || e.kind === SyntaxKind.SpreadExpression;
+                hasSpreadElement = hasSpreadElement || e.kind === SyntaxKind.SpreadElement;
             }
             if (!hasSpreadElement) {
                 // If array literal is actually a destructuring pattern, mark it as an implied type. We do this such
@@ -10927,7 +10927,7 @@ namespace ts {
                     prop.target = member;
                     member = prop;
                 }
-                else if (memberDecl.kind === SyntaxKind.SpreadElementExpression) {
+                else if (memberDecl.kind === SyntaxKind.SpreadAssignment) {
                     if (propertiesArray.length > 0) {
                         spread = getSpreadType(spread, createObjectLiteralType(), node.symbol);
                         propertiesArray = [];
@@ -10936,7 +10936,7 @@ namespace ts {
                         hasComputedNumberProperty = false;
                         typeFlags = 0;
                     }
-                    const type = checkExpression((memberDecl as SpreadElementExpression).expression);
+                    const type = checkExpression((memberDecl as SpreadAssignment).expression);
                     if (!(type.flags & (TypeFlags.Object | TypeFlags.Any))) {
                         error(memberDecl, Diagnostics.Spread_types_may_only_be_created_from_object_types);
                         return unknownType;
@@ -11905,7 +11905,7 @@ namespace ts {
         function getSpreadArgumentIndex(args: Expression[]): number {
             for (let i = 0; i < args.length; i++) {
                 const arg = args[i];
-                if (arg && arg.kind === SyntaxKind.SpreadExpression) {
+                if (arg && arg.kind === SyntaxKind.SpreadElement) {
                     return i;
                 }
             }
@@ -13893,7 +13893,7 @@ namespace ts {
             const elements = node.elements;
             const element = elements[elementIndex];
             if (element.kind !== SyntaxKind.OmittedExpression) {
-                if (element.kind !== SyntaxKind.SpreadExpression) {
+                if (element.kind !== SyntaxKind.SpreadElement) {
                     const propName = "" + elementIndex;
                     const type = isTypeAny(sourceType)
                         ? sourceType
@@ -13920,7 +13920,7 @@ namespace ts {
                         error(element, Diagnostics.A_rest_element_must_be_last_in_an_array_destructuring_pattern);
                     }
                     else {
-                        const restExpression = (<SpreadExpression>element).expression;
+                        const restExpression = (<SpreadElement>element).expression;
                         if (restExpression.kind === SyntaxKind.BinaryExpression && (<BinaryExpression>restExpression).operatorToken.kind === SyntaxKind.EqualsToken) {
                             error((<BinaryExpression>restExpression).operatorToken, Diagnostics.A_rest_element_cannot_have_an_initializer);
                         }
@@ -14553,8 +14553,8 @@ namespace ts {
                     return checkBinaryExpression(<BinaryExpression>node, contextualMapper);
                 case SyntaxKind.ConditionalExpression:
                     return checkConditionalExpression(<ConditionalExpression>node, contextualMapper);
-                case SyntaxKind.SpreadExpression:
-                    return checkSpreadExpression(<SpreadExpression>node, contextualMapper);
+                case SyntaxKind.SpreadElement:
+                    return checkSpreadExpression(<SpreadElement>node, contextualMapper);
                 case SyntaxKind.OmittedExpression:
                     return undefinedWideningType;
                 case SyntaxKind.YieldExpression:
@@ -20511,7 +20511,7 @@ namespace ts {
             const GetOrSetAccessor = GetAccessor | SetAccessor;
 
             for (const prop of node.properties) {
-                if (prop.kind === SyntaxKind.SpreadElementExpression) {
+                if (prop.kind === SyntaxKind.SpreadAssignment) {
                     continue;
                 }
                 const name = prop.name;
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 0ee598c507a..6d4688ac004 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -822,8 +822,8 @@ const _super = (function (geti, seti) {
                     return emitTemplateExpression(<TemplateExpression>node);
                 case SyntaxKind.YieldExpression:
                     return emitYieldExpression(<YieldExpression>node);
-                case SyntaxKind.SpreadExpression:
-                    return emitSpreadExpression(<SpreadExpression>node);
+                case SyntaxKind.SpreadElement:
+                    return emitSpreadExpression(<SpreadElement>node);
                 case SyntaxKind.ClassExpression:
                     return emitClassExpression(<ClassExpression>node);
                 case SyntaxKind.OmittedExpression:
@@ -1374,7 +1374,7 @@ const _super = (function (geti, seti) {
             emitExpressionWithPrefix(" ", node.expression);
         }
 
-        function emitSpreadExpression(node: SpreadExpression) {
+        function emitSpreadExpression(node: SpreadElement) {
             write("...");
             emitExpression(node.expression);
         }
diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index c7fe7d70574..536ee4cb4b4 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -692,12 +692,12 @@ namespace ts {
     }
 
     export function createSpread(expression: Expression, location?: TextRange) {
-        const node = <SpreadExpression>createNode(SyntaxKind.SpreadExpression, location);
+        const node = <SpreadElement>createNode(SyntaxKind.SpreadElement, location);
         node.expression = parenthesizeExpressionForList(expression);
         return node;
     }
 
-    export function updateSpread(node: SpreadExpression, expression: Expression) {
+    export function updateSpread(node: SpreadElement, expression: Expression) {
         if (node.expression !== expression) {
             return updateNode(createSpread(expression, node), node);
         }
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 464f6ca01d8..9e0a5b4cd33 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -74,8 +74,8 @@ namespace ts {
                     visitNode(cbNode, (<ShorthandPropertyAssignment>node).questionToken) ||
                     visitNode(cbNode, (<ShorthandPropertyAssignment>node).equalsToken) ||
                     visitNode(cbNode, (<ShorthandPropertyAssignment>node).objectAssignmentInitializer);
-            case SyntaxKind.SpreadElementExpression:
-                return visitNode(cbNode, (<SpreadElementExpression>node).expression);
+            case SyntaxKind.SpreadAssignment:
+                return visitNode(cbNode, (<SpreadAssignment>node).expression);
             case SyntaxKind.Parameter:
             case SyntaxKind.PropertyDeclaration:
             case SyntaxKind.PropertySignature:
@@ -199,8 +199,8 @@ namespace ts {
                     visitNode(cbNode, (<ConditionalExpression>node).whenTrue) ||
                     visitNode(cbNode, (<ConditionalExpression>node).colonToken) ||
                     visitNode(cbNode, (<ConditionalExpression>node).whenFalse);
-            case SyntaxKind.SpreadExpression:
-                return visitNode(cbNode, (<SpreadExpression>node).expression);
+            case SyntaxKind.SpreadElement:
+                return visitNode(cbNode, (<SpreadElement>node).expression);
             case SyntaxKind.Block:
             case SyntaxKind.ModuleBlock:
                 return visitNodes(cbNodes, (<Block>node).statements);
@@ -4123,15 +4123,15 @@ namespace ts {
             return finishNode(node);
         }
 
-        function parseSpreadExpression(): Expression {
-            const node = <SpreadExpression>createNode(SyntaxKind.SpreadExpression);
+        function parseSpreadElement(): Expression {
+            const node = <SpreadElement>createNode(SyntaxKind.SpreadElement);
             parseExpected(SyntaxKind.DotDotDotToken);
             node.expression = parseAssignmentExpressionOrHigher();
             return finishNode(node);
         }
 
         function parseArgumentOrArrayLiteralElement(): Expression {
-            return token() === SyntaxKind.DotDotDotToken ? parseSpreadExpression() :
+            return token() === SyntaxKind.DotDotDotToken ? parseSpreadElement() :
                 token() === SyntaxKind.CommaToken ? <Expression>createNode(SyntaxKind.OmittedExpression) :
                     parseAssignmentExpressionOrHigher();
         }
@@ -4166,7 +4166,7 @@ namespace ts {
             const fullStart = scanner.getStartPos();
             const dotDotDotToken = parseOptionalToken(SyntaxKind.DotDotDotToken);
             if (dotDotDotToken) {
-                const spreadElement = <SpreadElementExpression>createNode(SyntaxKind.SpreadElementExpression, fullStart);
+                const spreadElement = <SpreadAssignment>createNode(SyntaxKind.SpreadAssignment, fullStart);
                 spreadElement.expression = parseAssignmentExpressionOrHigher();
                 return addJSDocComment(finishNode(spreadElement));
             }
diff --git a/src/compiler/transformers/destructuring.ts b/src/compiler/transformers/destructuring.ts
index 89beade577d..8994a28a97e 100644
--- a/src/compiler/transformers/destructuring.ts
+++ b/src/compiler/transformers/destructuring.ts
@@ -308,11 +308,11 @@ namespace ts {
                 const e = elements[i];
                 if (e.kind !== SyntaxKind.OmittedExpression) {
                     // Assignment for target = value.propName should highligh whole property, hence use e as source map node
-                    if (e.kind !== SyntaxKind.SpreadExpression) {
+                    if (e.kind !== SyntaxKind.SpreadElement) {
                         emitDestructuringAssignment(e, createElementAccess(value, createLiteral(i)), e);
                     }
                     else if (i === numElements - 1) {
-                        emitDestructuringAssignment((<SpreadExpression>e).expression, createArraySlice(value, i), e);
+                        emitDestructuringAssignment((<SpreadElement>e).expression, createArraySlice(value, i), e);
                     }
                 }
             }
diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts
index e262b413b4c..6869b2b5eb7 100644
--- a/src/compiler/transformers/es2015.ts
+++ b/src/compiler/transformers/es2015.ts
@@ -2890,7 +2890,7 @@ namespace ts {
          *
          * @param node A SpreadExpression node.
          */
-        function visitExpressionOfSpread(node: SpreadExpression) {
+        function visitExpressionOfSpread(node: SpreadElement) {
             return visitNode(node.expression, visitor, isExpression);
         }
 
@@ -3266,11 +3266,11 @@ namespace ts {
             }
 
             const callArgument = singleOrUndefined((<CallExpression>statementExpression).arguments);
-            if (!callArgument || !nodeIsSynthesized(callArgument) || callArgument.kind !== SyntaxKind.SpreadExpression) {
+            if (!callArgument || !nodeIsSynthesized(callArgument) || callArgument.kind !== SyntaxKind.SpreadElement) {
                 return false;
             }
 
-            const expression = (<SpreadExpression>callArgument).expression;
+            const expression = (<SpreadElement>callArgument).expression;
             return isIdentifier(expression) && expression === parameter.name;
         }
     }
diff --git a/src/compiler/transformers/esnext.ts b/src/compiler/transformers/esnext.ts
index 1a8ed7da5eb..38ff99fd78a 100644
--- a/src/compiler/transformers/esnext.ts
+++ b/src/compiler/transformers/esnext.ts
@@ -36,12 +36,12 @@ namespace ts {
             let chunkObject: (ShorthandPropertyAssignment | PropertyAssignment)[];
             const objects: Expression[] = [];
             for (const e of elements) {
-                if (e.kind === SyntaxKind.SpreadElementExpression) {
+                if (e.kind === SyntaxKind.SpreadAssignment) {
                     if (chunkObject) {
                         objects.push(createObjectLiteral(chunkObject));
                         chunkObject = undefined;
                     }
-                    const target = (e as SpreadElementExpression).expression;
+                    const target = (e as SpreadAssignment).expression;
                     objects.push(visitNode(target, visitor, isExpression));
                 }
                 else {
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index d3b4cb3b6e7..3f40272bd4c 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -246,7 +246,7 @@ namespace ts {
         ConditionalExpression,
         TemplateExpression,
         YieldExpression,
-        SpreadExpression,
+        SpreadElement,
         ClassExpression,
         OmittedExpression,
         ExpressionWithTypeArguments,
@@ -320,7 +320,7 @@ namespace ts {
         // Property assignments
         PropertyAssignment,
         ShorthandPropertyAssignment,
-        SpreadElementExpression,
+        SpreadAssignment,
 
         // Enum
         EnumMember,
@@ -662,7 +662,6 @@ namespace ts {
         initializer?: Expression;           // Optional initializer
     }
 
-    // @kind(SyntaxKind.PropertyDeclaration)
     export interface PropertyDeclaration extends ClassElement {
         kind: SyntaxKind.PropertyDeclaration;
         questionToken?: QuestionToken;               // Present for use with reporting a grammar error
@@ -676,7 +675,7 @@ namespace ts {
         name?: PropertyName;
     }
 
-    export type ObjectLiteralElementLike = PropertyAssignment | ShorthandPropertyAssignment | MethodDeclaration | AccessorDeclaration | SpreadElementExpression;
+    export type ObjectLiteralElementLike = PropertyAssignment | ShorthandPropertyAssignment | MethodDeclaration | AccessorDeclaration | SpreadAssignment;
 
     export interface PropertyAssignment extends ObjectLiteralElement {
         kind: SyntaxKind.PropertyAssignment;
@@ -695,8 +694,8 @@ namespace ts {
         objectAssignmentInitializer?: Expression;
     }
 
-    export interface SpreadElementExpression extends ObjectLiteralElement {
-        kind: SyntaxKind.SpreadElementExpression;
+    export interface SpreadAssignment extends ObjectLiteralElement {
+        kind: SyntaxKind.SpreadAssignment;
         expression: Expression;
     }
 
@@ -1285,9 +1284,8 @@ namespace ts {
         multiLine?: boolean;
     }
 
-    // @kind(SyntaxKind.SpreadExpression)
-    export interface SpreadExpression extends Expression {
-        kind: SyntaxKind.SpreadExpression;
+    export interface SpreadElement extends Expression {
+        kind: SyntaxKind.SpreadElement;
         expression: Expression;
     }
 
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index cd3e6ab9575..b668fe6eb15 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -1179,7 +1179,7 @@ namespace ts {
             case SyntaxKind.PostfixUnaryExpression:
             case SyntaxKind.BinaryExpression:
             case SyntaxKind.ConditionalExpression:
-            case SyntaxKind.SpreadExpression:
+            case SyntaxKind.SpreadElement:
             case SyntaxKind.TemplateExpression:
             case SyntaxKind.NoSubstitutionTemplateLiteral:
             case SyntaxKind.OmittedExpression:
@@ -1641,7 +1641,7 @@ namespace ts {
                     return (<ForInStatement | ForOfStatement>parent).initializer === node ? AssignmentKind.Definite : AssignmentKind.None;
                 case SyntaxKind.ParenthesizedExpression:
                 case SyntaxKind.ArrayLiteralExpression:
-                case SyntaxKind.SpreadExpression:
+                case SyntaxKind.SpreadElement:
                     node = parent;
                     break;
                 case SyntaxKind.ShorthandPropertyAssignment:
@@ -2226,7 +2226,7 @@ namespace ts {
             case SyntaxKind.YieldExpression:
                 return 2;
 
-            case SyntaxKind.SpreadExpression:
+            case SyntaxKind.SpreadElement:
                 return 1;
 
             default:
@@ -3862,7 +3862,7 @@ namespace ts {
         const kind = node.kind;
         return kind === SyntaxKind.PropertyAssignment
             || kind === SyntaxKind.ShorthandPropertyAssignment
-            || kind === SyntaxKind.SpreadElementExpression
+            || kind === SyntaxKind.SpreadAssignment
             || kind === SyntaxKind.MethodDeclaration
             || kind === SyntaxKind.GetAccessor
             || kind === SyntaxKind.SetAccessor
@@ -3950,8 +3950,8 @@ namespace ts {
             || kind === SyntaxKind.NoSubstitutionTemplateLiteral;
     }
 
-    export function isSpreadExpression(node: Node): node is SpreadExpression {
-        return node.kind === SyntaxKind.SpreadExpression;
+    export function isSpreadExpression(node: Node): node is SpreadElement {
+        return node.kind === SyntaxKind.SpreadElement;
     }
 
     export function isExpressionWithTypeArguments(node: Node): node is ExpressionWithTypeArguments {
@@ -4009,7 +4009,7 @@ namespace ts {
             || kind === SyntaxKind.YieldExpression
             || kind === SyntaxKind.ArrowFunction
             || kind === SyntaxKind.BinaryExpression
-            || kind === SyntaxKind.SpreadExpression
+            || kind === SyntaxKind.SpreadElement
             || kind === SyntaxKind.AsExpression
             || kind === SyntaxKind.OmittedExpression
             || isUnaryExpressionKind(kind);
diff --git a/src/compiler/visitor.ts b/src/compiler/visitor.ts
index 4bcc697a999..0fb0b182345 100644
--- a/src/compiler/visitor.ts
+++ b/src/compiler/visitor.ts
@@ -267,9 +267,9 @@ namespace ts {
             case SyntaxKind.VoidExpression:
             case SyntaxKind.AwaitExpression:
             case SyntaxKind.YieldExpression:
-            case SyntaxKind.SpreadExpression:
+            case SyntaxKind.SpreadElement:
             case SyntaxKind.NonNullExpression:
-                result = reduceNode((<ParenthesizedExpression | DeleteExpression | TypeOfExpression | VoidExpression | AwaitExpression | YieldExpression | SpreadExpression | NonNullExpression>node).expression, f, result);
+                result = reduceNode((<ParenthesizedExpression | DeleteExpression | TypeOfExpression | VoidExpression | AwaitExpression | YieldExpression | SpreadElement | NonNullExpression>node).expression, f, result);
                 break;
 
             case SyntaxKind.PrefixUnaryExpression:
@@ -870,9 +870,9 @@ namespace ts {
                 return updateYield(<YieldExpression>node,
                     visitNode((<YieldExpression>node).expression, visitor, isExpression));
 
-            case SyntaxKind.SpreadExpression:
-                return updateSpread(<SpreadExpression>node,
-                    visitNode((<SpreadExpression>node).expression, visitor, isExpression));
+            case SyntaxKind.SpreadElement:
+                return updateSpread(<SpreadElement>node,
+                    visitNode((<SpreadElement>node).expression, visitor, isExpression));
 
             case SyntaxKind.ClassExpression:
                 return updateClassExpression(<ClassExpression>node,
diff --git a/src/services/breakpoints.ts b/src/services/breakpoints.ts
index f1cc233e676..6825ccb6371 100644
--- a/src/services/breakpoints.ts
+++ b/src/services/breakpoints.ts
@@ -264,7 +264,7 @@ namespace ts.BreakpointResolver {
                         // a or ...c  or d: x from
                         // [a, b, ...c] or { a, b } or { d: x } from destructuring pattern
                         if ((node.kind === SyntaxKind.Identifier ||
-                            node.kind == SyntaxKind.SpreadExpression ||
+                            node.kind == SyntaxKind.SpreadElement ||
                             node.kind === SyntaxKind.PropertyAssignment ||
                             node.kind === SyntaxKind.ShorthandPropertyAssignment) &&
                             isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent)) {
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
index 2db495a51f9..cfb6aae010b 100644
--- a/src/services/utilities.ts
+++ b/src/services/utilities.ts
@@ -530,8 +530,8 @@ namespace ts {
             case SyntaxKind.DeleteExpression:
             case SyntaxKind.VoidExpression:
             case SyntaxKind.YieldExpression:
-            case SyntaxKind.SpreadExpression:
-                const unaryWordExpression = n as (TypeOfExpression | DeleteExpression | VoidExpression | YieldExpression | SpreadExpression);
+            case SyntaxKind.SpreadElement:
+                const unaryWordExpression = n as (TypeOfExpression | DeleteExpression | VoidExpression | YieldExpression | SpreadElement);
                 return isCompletedNode(unaryWordExpression.expression, sourceFile);
 
             case SyntaxKind.TaggedTemplateExpression:

From 6a82ae4cbb209d6f3fdad74cdf6146747ed33449 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 7 Nov 2016 09:04:00 -0800
Subject: [PATCH 118/421] Add SpreadAssignment to visitors

1. visitNode
2. reduceNode
3. emit

This fixes an emit bug for setters.
---
 src/compiler/emitter.ts                         |  9 +++++++++
 src/compiler/factory.ts                         | 17 +++++++++++++++--
 src/compiler/visitor.ts                         | 10 +++++++++-
 .../baselines/reference/objectSpreadNegative.js |  2 +-
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 6d4688ac004..b0413b2578e 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -732,6 +732,8 @@ const _super = (function (geti, seti) {
                     return emitPropertyAssignment(<PropertyAssignment>node);
                 case SyntaxKind.ShorthandPropertyAssignment:
                     return emitShorthandPropertyAssignment(<ShorthandPropertyAssignment>node);
+                case SyntaxKind.ShorthandPropertyAssignment:
+                    return emitSpreadAssignment(node as SpreadAssignment);
 
                 // Enum
                 case SyntaxKind.EnumMember:
@@ -2102,6 +2104,13 @@ const _super = (function (geti, seti) {
             }
         }
 
+        function emitSpreadAssignment(node: SpreadAssignment) {
+            if (node.expression) {
+                write("...");
+                emitExpression(node.expression);
+            }
+        }
+
         //
         // Enum
         //
diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index 536ee4cb4b4..fd2b7c1ccee 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -1399,14 +1399,27 @@ namespace ts {
         return node;
     }
 
-    export function updateShorthandPropertyAssignment(node: ShorthandPropertyAssignment, name: Identifier, objectAssignmentInitializer: Expression) {
+    export function createSpreadAssignment(expression: Expression, location?: TextRange) {
+        const node = <SpreadAssignment>createNode(SyntaxKind.SpreadAssignment, location);
+        node.expression = expression !== undefined ? parenthesizeExpressionForList(expression) : undefined;
+        return node;
+    }
+
+   export function updateShorthandPropertyAssignment(node: ShorthandPropertyAssignment, name: Identifier, objectAssignmentInitializer: Expression) {
         if (node.name !== name || node.objectAssignmentInitializer !== objectAssignmentInitializer) {
             return updateNode(createShorthandPropertyAssignment(name, objectAssignmentInitializer, node), node);
         }
         return node;
     }
 
-    // Top-level nodes
+    export function updateSpreadAssignment(node: SpreadAssignment, expression: Expression) {
+        if (node.expression !== expression) {
+            return updateNode(createSpreadAssignment(expression, node), node);
+        }
+        return node;
+    }
+
+   // Top-level nodes
 
     export function updateSourceFileNode(node: SourceFile, statements: Statement[]) {
         if (node.statements !== statements) {
diff --git a/src/compiler/visitor.ts b/src/compiler/visitor.ts
index 0fb0b182345..db59c309345 100644
--- a/src/compiler/visitor.ts
+++ b/src/compiler/visitor.ts
@@ -510,6 +510,10 @@ namespace ts {
                 result = reduceNode((<ShorthandPropertyAssignment>node).objectAssignmentInitializer, f, result);
                 break;
 
+            case SyntaxKind.SpreadAssignment:
+                result = reduceNode((node as SpreadAssignment).expression, f, result);
+                break;
+
             // Top-level nodes
             case SyntaxKind.SourceFile:
                 result = reduceLeft((<SourceFile>node).statements, f, result);
@@ -1125,7 +1129,11 @@ namespace ts {
                     visitNode((<ShorthandPropertyAssignment>node).name, visitor, isIdentifier),
                     visitNode((<ShorthandPropertyAssignment>node).objectAssignmentInitializer, visitor, isExpression));
 
-            // Top-level nodes
+            case SyntaxKind.SpreadAssignment:
+                return updateSpreadAssignment(node as SpreadAssignment,
+                    visitNode((node as SpreadAssignment).expression, visitor, isExpression));
+
+           // Top-level nodes
             case SyntaxKind.SourceFile:
                 context.startLexicalEnvironment();
                 return updateSourceFileNode(<SourceFile>node,
diff --git a/tests/baselines/reference/objectSpreadNegative.js b/tests/baselines/reference/objectSpreadNegative.js
index 4faacd97444..6287f4559a7 100644
--- a/tests/baselines/reference/objectSpreadNegative.js
+++ b/tests/baselines/reference/objectSpreadNegative.js
@@ -123,7 +123,7 @@ spreadStr.charAt(1); // error, no methods either
 var spreadFunc = __assign({}, function () { });
 spreadFunc(); // error, no call signature
 // write-only properties get skipped
-var setterOnly = __assign({ set b(bad: number) { } });
+var setterOnly = __assign({ set b(bad) { } });
 setterOnly.b = 12; // error, 'b' does not exist
 // methods are skipped because they aren't enumerable
 var C = (function () {

From 5de63a74eb896265a9c948080d5dd8fc4960877f Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Mon, 7 Nov 2016 09:43:01 -0800
Subject: [PATCH 119/421] Validate constraint type in mapped type

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 5c171341e6c..94d5a393fea 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -5933,14 +5933,22 @@ namespace ts {
         function getTypeFromMappedTypeNode(node: MappedTypeNode, aliasSymbol?: Symbol, aliasTypeArguments?: Type[]): Type {
             const links = getNodeLinks(node);
             if (!links.resolvedType) {
-                const type = <MappedType>createObjectType(ObjectFlags.Mapped, node.symbol);
-                type.typeParameter = getDeclaredTypeOfTypeParameter(getSymbolOfNode(node.typeParameter));
-                type.templateType = node.type ? getTypeFromTypeNode(node.type) : anyType;
-                type.isReadonly = !!node.readonlyToken;
-                type.isOptional = !!node.questionToken;
-                type.aliasSymbol = aliasSymbol;
-                type.aliasTypeArguments = aliasTypeArguments;
-                links.resolvedType = type;
+                const typeParameter = getDeclaredTypeOfTypeParameter(getSymbolOfNode(node.typeParameter));
+                const constraintType = getConstraintOfTypeParameter(typeParameter);
+                const keyType = constraintType && constraintType.flags & TypeFlags.TypeParameter ? getApparentType(constraintType) : constraintType;
+                if (keyType && (keyType.flags & TypeFlags.Index || checkTypeAssignableTo(keyType, stringOrNumberType, node.typeParameter.constraint))) {
+                    const type = <MappedType>createObjectType(ObjectFlags.Mapped, node.symbol);
+                    type.typeParameter = typeParameter;
+                    type.templateType = node.type ? getTypeFromTypeNode(node.type) : unknownType;
+                    type.isReadonly = !!node.readonlyToken;
+                    type.isOptional = !!node.questionToken;
+                    type.aliasSymbol = aliasSymbol;
+                    type.aliasTypeArguments = aliasTypeArguments;
+                    links.resolvedType = type;
+                }
+                else {
+                    links.resolvedType = unknownType;
+                }
             }
             return links.resolvedType;
         }

From de93876abe412c89f0f114c2b31f7c715c8652bf Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Mon, 7 Nov 2016 09:43:20 -0800
Subject: [PATCH 120/421] Correct symbol display for type parameter of mapped
 type

---
 src/services/symbolDisplay.ts | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/services/symbolDisplay.ts b/src/services/symbolDisplay.ts
index 516b5d7fbc5..b32bd8f331d 100644
--- a/src/services/symbolDisplay.ts
+++ b/src/services/symbolDisplay.ts
@@ -272,11 +272,9 @@ namespace ts.SymbolDisplay {
             displayParts.push(punctuationPart(SyntaxKind.CloseParenToken));
             displayParts.push(spacePart());
             addFullSymbolName(symbol);
-            displayParts.push(spacePart());
-            displayParts.push(keywordPart(SyntaxKind.InKeyword));
-            displayParts.push(spacePart());
             if (symbol.parent) {
                 // Class/Interface type parameter
+                addInPrefix();
                 addFullSymbolName(symbol.parent, enclosingDeclaration);
                 writeTypeParametersOfSymbol(symbol.parent, enclosingDeclaration);
             }
@@ -288,6 +286,7 @@ namespace ts.SymbolDisplay {
 
                 if (declaration) {
                     if (isFunctionLikeKind(declaration.kind)) {
+                        addInPrefix();
                         const signature = typeChecker.getSignatureFromDeclaration(<SignatureDeclaration>declaration);
                         if (declaration.kind === SyntaxKind.ConstructSignature) {
                             displayParts.push(keywordPart(SyntaxKind.NewKeyword));
@@ -298,10 +297,11 @@ namespace ts.SymbolDisplay {
                         }
                         addRange(displayParts, signatureToDisplayParts(typeChecker, signature, sourceFile, TypeFormatFlags.WriteTypeArgumentsOfSignature));
                     }
-                    else {
+                    else if (declaration.kind === SyntaxKind.TypeAliasDeclaration) {
                         // Type alias type parameter
                         // For example
                         //      type list<T> = T[];  // Both T will go through same code path
+                        addInPrefix();
                         displayParts.push(keywordPart(SyntaxKind.TypeKeyword));
                         displayParts.push(spacePart());
                         addFullSymbolName(declaration.symbol);
@@ -439,6 +439,12 @@ namespace ts.SymbolDisplay {
             }
         }
 
+        function addInPrefix() {
+            displayParts.push(spacePart());
+            displayParts.push(keywordPart(SyntaxKind.InKeyword));
+            displayParts.push(spacePart());
+        }
+
         function addFullSymbolName(symbol: Symbol, enclosingDeclaration?: Node) {
             const fullSymbolDisplayParts = symbolToDisplayParts(typeChecker, symbol, enclosingDeclaration || sourceFile, /*meaning*/ undefined,
                 SymbolFormatFlags.WriteTypeParametersOrArguments | SymbolFormatFlags.UseOnlyExternalAliasing);

From 7b9a42f9958b072f057d42d506b7e082ebf19974 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 7 Nov 2016 09:54:48 -0800
Subject: [PATCH 121/421] Add --target esnext

Currently, this disables the rest and spread transforms. This will
change as proposals enter and leave stage 3.
---
 src/compiler/commandLineParser.ts | 1 +
 src/compiler/emitter.ts           | 7 +++++--
 src/compiler/transformer.ts       | 5 ++++-
 src/compiler/types.ts             | 3 ++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index 50399fd5c38..6e5256bafa4 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -265,6 +265,7 @@ namespace ts {
                 "es2015": ScriptTarget.ES2015,
                 "es2016": ScriptTarget.ES2016,
                 "es2017": ScriptTarget.ES2017,
+                "esnext": ScriptTarget.ESNext,
             }),
             description: Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015,
             paramType: Diagnostics.VERSION,
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index b0413b2578e..ce37492f666 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -732,7 +732,7 @@ const _super = (function (geti, seti) {
                     return emitPropertyAssignment(<PropertyAssignment>node);
                 case SyntaxKind.ShorthandPropertyAssignment:
                     return emitShorthandPropertyAssignment(<ShorthandPropertyAssignment>node);
-                case SyntaxKind.ShorthandPropertyAssignment:
+                case SyntaxKind.SpreadAssignment:
                     return emitSpreadAssignment(node as SpreadAssignment);
 
                 // Enum
@@ -2214,7 +2214,10 @@ const _super = (function (geti, seti) {
                 helpersEmitted = true;
             }
 
-            if (compilerOptions.jsx !== JsxEmit.Preserve && !assignEmitted && (node.flags & NodeFlags.HasSpreadAttribute)) {
+            if ((languageVersion < ScriptTarget.ESNext || currentSourceFile.scriptKind === ScriptKind.JSX || currentSourceFile.scriptKind === ScriptKind.TSX) &&
+                compilerOptions.jsx !== JsxEmit.Preserve &&
+                !assignEmitted &&
+                node.flags & NodeFlags.HasSpreadAttribute) {
                 writeLines(assignHelper);
                 assignEmitted = true;
             }
diff --git a/src/compiler/transformer.ts b/src/compiler/transformer.ts
index 069b1e46af5..b005b1906f6 100644
--- a/src/compiler/transformer.ts
+++ b/src/compiler/transformer.ts
@@ -117,7 +117,10 @@ namespace ts {
             transformers.push(transformJsx);
         }
 
-        transformers.push(transformESNext);
+        if (languageVersion < ScriptTarget.ESNext) {
+            transformers.push(transformESNext);
+        }
+
         if (languageVersion < ScriptTarget.ES2017) {
             transformers.push(transformES2017);
         }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 3f40272bd4c..13b66c1c0aa 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -3171,7 +3171,8 @@ namespace ts {
         ES2015 = 2,
         ES2016 = 3,
         ES2017 = 4,
-        Latest = ES2017,
+        ESNext = 5,
+        Latest = ESNext,
     }
 
     export const enum LanguageVariant {

From d4a5b0855caf74542903963fc012e75ca7ef3a48 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 7 Nov 2016 09:56:48 -0800
Subject: [PATCH 122/421] Add --target esnext tests and update baselines

---
 src/harness/unittests/commandLineParsing.ts      |  2 +-
 .../unittests/convertCompilerOptionsFromJson.ts  |  2 +-
 .../reference/objectSpreadNoTransform.js         |  8 ++++++++
 .../reference/objectSpreadNoTransform.symbols    | 10 ++++++++++
 .../reference/objectSpreadNoTransform.types      | 16 ++++++++++++++++
 .../types/spread/objectSpreadNoTransform.ts      |  3 +++
 6 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 tests/baselines/reference/objectSpreadNoTransform.js
 create mode 100644 tests/baselines/reference/objectSpreadNoTransform.symbols
 create mode 100644 tests/baselines/reference/objectSpreadNoTransform.types
 create mode 100644 tests/cases/conformance/types/spread/objectSpreadNoTransform.ts

diff --git a/src/harness/unittests/commandLineParsing.ts b/src/harness/unittests/commandLineParsing.ts
index c15490738fa..890f167e2dd 100644
--- a/src/harness/unittests/commandLineParsing.ts
+++ b/src/harness/unittests/commandLineParsing.ts
@@ -165,7 +165,7 @@ namespace ts {
                         start: undefined,
                         length: undefined,
                     }, {
-                            messageText: "Argument for '--target' option must be: 'es3', 'es5', 'es6', 'es2015', 'es2016', 'es2017'",
+                            messageText: "Argument for '--target' option must be: 'es3', 'es5', 'es6', 'es2015', 'es2016', 'es2017', 'esnext'",
                             category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
                             code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
 
diff --git a/src/harness/unittests/convertCompilerOptionsFromJson.ts b/src/harness/unittests/convertCompilerOptionsFromJson.ts
index 2942675f0ac..23c372b5313 100644
--- a/src/harness/unittests/convertCompilerOptionsFromJson.ts
+++ b/src/harness/unittests/convertCompilerOptionsFromJson.ts
@@ -176,7 +176,7 @@ namespace ts {
                         file: undefined,
                         start: 0,
                         length: 0,
-                        messageText: "Argument for '--target' option must be: 'es3', 'es5', 'es6', 'es2015', 'es2016', 'es2017'",
+                        messageText: "Argument for '--target' option must be: 'es3', 'es5', 'es6', 'es2015', 'es2016', 'es2017', 'esnext'",
                         code: Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
                         category: Diagnostics.Argument_for_0_option_must_be_Colon_1.category
                     }]
diff --git a/tests/baselines/reference/objectSpreadNoTransform.js b/tests/baselines/reference/objectSpreadNoTransform.js
new file mode 100644
index 00000000000..8916c621969
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadNoTransform.js
@@ -0,0 +1,8 @@
+//// [objectSpreadNoTransform.ts]
+const y = { a: 'yes', b: 'no' };
+const o = { x: 1, ...y };
+
+
+//// [objectSpreadNoTransform.js]
+const y = { a: 'yes', b: 'no' };
+const o = { x: 1, ...y };
diff --git a/tests/baselines/reference/objectSpreadNoTransform.symbols b/tests/baselines/reference/objectSpreadNoTransform.symbols
new file mode 100644
index 00000000000..4d77bc84830
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadNoTransform.symbols
@@ -0,0 +1,10 @@
+=== tests/cases/conformance/types/spread/objectSpreadNoTransform.ts ===
+const y = { a: 'yes', b: 'no' };
+>y : Symbol(y, Decl(objectSpreadNoTransform.ts, 0, 5))
+>a : Symbol(a, Decl(objectSpreadNoTransform.ts, 0, 11))
+>b : Symbol(b, Decl(objectSpreadNoTransform.ts, 0, 21))
+
+const o = { x: 1, ...y };
+>o : Symbol(o, Decl(objectSpreadNoTransform.ts, 1, 5))
+>x : Symbol(x, Decl(objectSpreadNoTransform.ts, 1, 11))
+
diff --git a/tests/baselines/reference/objectSpreadNoTransform.types b/tests/baselines/reference/objectSpreadNoTransform.types
new file mode 100644
index 00000000000..3a412e2894e
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadNoTransform.types
@@ -0,0 +1,16 @@
+=== tests/cases/conformance/types/spread/objectSpreadNoTransform.ts ===
+const y = { a: 'yes', b: 'no' };
+>y : { a: string; b: string; }
+>{ a: 'yes', b: 'no' } : { a: string; b: string; }
+>a : string
+>'yes' : "yes"
+>b : string
+>'no' : "no"
+
+const o = { x: 1, ...y };
+>o : { a: string; b: string; x: number; }
+>{ x: 1, ...y } : { a: string; b: string; x: number; }
+>x : number
+>1 : 1
+>y : any
+
diff --git a/tests/cases/conformance/types/spread/objectSpreadNoTransform.ts b/tests/cases/conformance/types/spread/objectSpreadNoTransform.ts
new file mode 100644
index 00000000000..00039117a20
--- /dev/null
+++ b/tests/cases/conformance/types/spread/objectSpreadNoTransform.ts
@@ -0,0 +1,3 @@
+// @target: esnext
+const y = { a: 'yes', b: 'no' };
+const o = { x: 1, ...y };

From 9f3aa38d17976ba54ffcc3f7a4331d499be18b94 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Mon, 7 Nov 2016 10:24:54 -0800
Subject: [PATCH 123/421] Improve sharing by re-instantiating top level type
 aliases

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 94d5a393fea..c0228a97eaf 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -5259,21 +5259,27 @@ namespace ts {
             return type;
         }
 
+        function getTypeAliasInstantiation(symbol: Symbol, typeArguments: Type[]): Type {
+            const type = getDeclaredTypeOfSymbol(symbol);
+            const links = getSymbolLinks(symbol);
+            const typeParameters = links.typeParameters;
+            const id = getTypeListId(typeArguments);
+            return links.instantiations[id] || (links.instantiations[id] = instantiateTypeNoAlias(type, createTypeMapper(typeParameters, typeArguments)));
+        }
+
         // Get type from reference to type alias. When a type alias is generic, the declared type of the type alias may include
         // references to the type parameters of the alias. We replace those with the actual type arguments by instantiating the
         // declared type. Instantiations are cached using the type identities of the type arguments as the key.
         function getTypeFromTypeAliasReference(node: TypeReferenceNode | ExpressionWithTypeArguments | JSDocTypeReference, symbol: Symbol): Type {
             const type = getDeclaredTypeOfSymbol(symbol);
-            const links = getSymbolLinks(symbol);
-            const typeParameters = links.typeParameters;
+            const typeParameters = getSymbolLinks(symbol).typeParameters;
             if (typeParameters) {
                 if (!node.typeArguments || node.typeArguments.length !== typeParameters.length) {
                     error(node, Diagnostics.Generic_type_0_requires_1_type_argument_s, symbolToString(symbol), typeParameters.length);
                     return unknownType;
                 }
                 const typeArguments = map(node.typeArguments, getTypeFromTypeNodeNoAlias);
-                const id = getTypeListId(typeArguments);
-                return links.instantiations[id] || (links.instantiations[id] = instantiateType(type, createTypeMapper(typeParameters, typeArguments)));
+                return getTypeAliasInstantiation(symbol, typeArguments);
             }
             if (node.typeArguments) {
                 error(node, Diagnostics.Type_0_is_not_generic, symbolToString(symbol));
@@ -6365,44 +6371,63 @@ namespace ts {
             return false;
         }
 
+        function isTopLevelTypeAlias(symbol: Symbol) {
+            if (symbol.declarations && symbol.declarations.length) {
+                const declaration = symbol.declarations[0];
+                return declaration.kind === SyntaxKind.SourceFile || declaration.kind === SyntaxKind.ModuleBlock;
+            }
+            return false;
+        }
+
         function instantiateType(type: Type, mapper: TypeMapper): Type {
             if (type && mapper !== identityMapper) {
-                if (type.flags & TypeFlags.TypeParameter) {
-                    return mapper(<TypeParameter>type);
-                }
-                if (type.flags & TypeFlags.Object) {
-                    if ((<ObjectType>type).objectFlags & ObjectFlags.Anonymous) {
-                        // 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. We skip instantiation
-                        // if none of the type parameters that are in scope in the type's declaration are mapped by
-                        // the given mapper, however we can only do that analysis if the type isn't itself an
-                        // instantiation.
-                        return type.symbol &&
-                            type.symbol.flags & (SymbolFlags.Function | SymbolFlags.Method | SymbolFlags.Class | SymbolFlags.TypeLiteral | SymbolFlags.ObjectLiteral) &&
-                            ((<ObjectType>type).objectFlags & ObjectFlags.Instantiated || isSymbolInScopeOfMappedTypeParameter(type.symbol, mapper)) ?
-                            instantiateCached(type, mapper, instantiateAnonymousType) : type;
-                    }
-                    if ((<ObjectType>type).objectFlags & ObjectFlags.Mapped) {
-                        return instantiateCached(type, mapper, instantiateMappedType);
-                    }
-                    if ((<ObjectType>type).objectFlags & ObjectFlags.Reference) {
-                        return createTypeReference((<TypeReference>type).target, instantiateList((<TypeReference>type).typeArguments, mapper, instantiateType));
+                if (type.aliasSymbol && isTopLevelTypeAlias(type.aliasSymbol)) {
+                    if (type.aliasTypeArguments) {
+                        return getTypeAliasInstantiation(type.aliasSymbol, instantiateList(type.aliasTypeArguments, mapper, instantiateType));
                     }
+                    return type;
                 }
-                if (type.flags & TypeFlags.Union && !(type.flags & TypeFlags.Primitive)) {
-                    return getUnionType(instantiateList((<UnionType>type).types, mapper, instantiateType), /*subtypeReduction*/ false, type.aliasSymbol, mapper.targetTypes);
+                return instantiateTypeNoAlias(type, mapper);
+            }
+            return type;
+        }
+
+        function instantiateTypeNoAlias(type: Type, mapper: TypeMapper): Type {
+            if (type.flags & TypeFlags.TypeParameter) {
+                return mapper(<TypeParameter>type);
+            }
+            if (type.flags & TypeFlags.Object) {
+                if ((<ObjectType>type).objectFlags & ObjectFlags.Anonymous) {
+                    // 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. We skip instantiation
+                    // if none of the type parameters that are in scope in the type's declaration are mapped by
+                    // the given mapper, however we can only do that analysis if the type isn't itself an
+                    // instantiation.
+                    return type.symbol &&
+                        type.symbol.flags & (SymbolFlags.Function | SymbolFlags.Method | SymbolFlags.Class | SymbolFlags.TypeLiteral | SymbolFlags.ObjectLiteral) &&
+                        ((<ObjectType>type).objectFlags & ObjectFlags.Instantiated || isSymbolInScopeOfMappedTypeParameter(type.symbol, mapper)) ?
+                        instantiateCached(type, mapper, instantiateAnonymousType) : type;
                 }
-                if (type.flags & TypeFlags.Intersection) {
-                    return getIntersectionType(instantiateList((<IntersectionType>type).types, mapper, instantiateType), type.aliasSymbol, mapper.targetTypes);
+                if ((<ObjectType>type).objectFlags & ObjectFlags.Mapped) {
+                    return instantiateCached(type, mapper, instantiateMappedType);
                 }
-                if (type.flags & TypeFlags.Index) {
-                    return getIndexType(instantiateType((<IndexType>type).type, mapper));
-                }
-                if (type.flags & TypeFlags.IndexedAccess) {
-                    return getIndexedAccessType(instantiateType((<IndexedAccessType>type).objectType, mapper), instantiateType((<IndexedAccessType>type).indexType, mapper));
+                if ((<ObjectType>type).objectFlags & ObjectFlags.Reference) {
+                    return createTypeReference((<TypeReference>type).target, instantiateList((<TypeReference>type).typeArguments, mapper, instantiateType));
                 }
             }
+            if (type.flags & TypeFlags.Union && !(type.flags & TypeFlags.Primitive)) {
+                return getUnionType(instantiateList((<UnionType>type).types, mapper, instantiateType), /*subtypeReduction*/ false, type.aliasSymbol, mapper.targetTypes);
+            }
+            if (type.flags & TypeFlags.Intersection) {
+                return getIntersectionType(instantiateList((<IntersectionType>type).types, mapper, instantiateType), type.aliasSymbol, mapper.targetTypes);
+            }
+            if (type.flags & TypeFlags.Index) {
+                return getIndexType(instantiateType((<IndexType>type).type, mapper));
+            }
+            if (type.flags & TypeFlags.IndexedAccess) {
+                return getIndexedAccessType(instantiateType((<IndexedAccessType>type).objectType, mapper), instantiateType((<IndexedAccessType>type).indexType, mapper));
+            }
             return type;
         }
 

From 83e95d43f8db0f19d810399d80c85228c612acf3 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 7 Nov 2016 10:58:31 -0800
Subject: [PATCH 124/421] Revert unneeded change and comments per PR

---
 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 09172d02ad7..7612bf1dddf 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -4597,7 +4597,7 @@ namespace ts {
                 result.valueDeclaration = declarations[0];
             }
             result.isReadonly = isReadonly;
-            result.type = containingType.flags & TypeFlags.Intersection ? getIntersectionType(propTypes) : getUnionType(propTypes);
+            result.type = containingType.flags & TypeFlags.Union ? getUnionType(propTypes) : getIntersectionType(propTypes);
             return result;
         }
 
@@ -5880,7 +5880,7 @@ namespace ts {
         }
 
         /**
-         * Since the source of spread types are object literals and type literals, which are not binary,
+         * Since the source of spread types are object literals, which are not binary,
          * this function should be called in a left folding style, with left = previous result of getSpreadType
          * and right = the new element to be spread.
          */

From 1866d0580c4801e3d4284e5952026de680643945 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 7 Nov 2016 11:16:54 -0800
Subject: [PATCH 125/421] Rename variable in checkSwitchStatement per PR

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 326d84278be..38d3a97a287 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -16906,14 +16906,14 @@ namespace ts {
                     // to or from the type of the 'switch' expression.
                     let caseType = checkExpression(caseClause.expression);
                     const caseIsLiteral = isLiteralType(caseType);
-                    let literalExpressionType = expressionType;
+                    let comparedExpressionType = expressionType;
                     if (!caseIsLiteral || !expressionIsLiteral) {
                         caseType = caseIsLiteral ? getBaseTypeOfLiteralType(caseType) : caseType;
-                        literalExpressionType = getBaseTypeOfLiteralType(expressionType);
+                        comparedExpressionType = getBaseTypeOfLiteralType(expressionType);
                     }
-                    if (!isTypeEqualityComparableTo(literalExpressionType, caseType)) {
+                    if (!isTypeEqualityComparableTo(comparedExpressionType, caseType)) {
                         // expressionType is not comparable to caseType, try the reversed check and report errors if it fails
-                        checkTypeComparableTo(caseType, literalExpressionType, caseClause.expression, /*headMessage*/ undefined);
+                        checkTypeComparableTo(caseType, comparedExpressionType, caseClause.expression, /*headMessage*/ undefined);
                     }
                 }
                 forEach(clause.statements, checkSourceElement);

From 9977936190fd15c1ec4043276ba1f7a8815b3d06 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 7 Nov 2016 11:34:37 -0800
Subject: [PATCH 126/421] Do not emit __rest for --target esnext

---
 src/compiler/emitter.ts                            |  2 +-
 .../baselines/reference/objectSpreadNoTransform.js |  6 ++++++
 .../reference/objectSpreadNoTransform.symbols      | 10 ++++++++++
 .../reference/objectSpreadNoTransform.types        | 14 ++++++++++++++
 .../types/spread/objectSpreadNoTransform.ts        |  3 +++
 5 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index f22f695a3e5..fa0d44a695f 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -2231,7 +2231,7 @@ const _super = (function (geti, seti) {
                 assignEmitted = true;
             }
 
-            if (!restEmitted && node.flags & NodeFlags.HasRestAttribute) {
+            if (languageVersion < ScriptTarget.ESNext && !restEmitted && node.flags & NodeFlags.HasRestAttribute) {
                 writeLines(restHelper);
                 restEmitted = true;
             }
diff --git a/tests/baselines/reference/objectSpreadNoTransform.js b/tests/baselines/reference/objectSpreadNoTransform.js
index 8916c621969..3442d086409 100644
--- a/tests/baselines/reference/objectSpreadNoTransform.js
+++ b/tests/baselines/reference/objectSpreadNoTransform.js
@@ -1,8 +1,14 @@
 //// [objectSpreadNoTransform.ts]
 const y = { a: 'yes', b: 'no' };
 const o = { x: 1, ...y };
+var b;
+var rest;
+({ b, ...rest } = o);
 
 
 //// [objectSpreadNoTransform.js]
 const y = { a: 'yes', b: 'no' };
 const o = { x: 1, ...y };
+var b;
+var rest;
+({ b, ...rest } = o);
diff --git a/tests/baselines/reference/objectSpreadNoTransform.symbols b/tests/baselines/reference/objectSpreadNoTransform.symbols
index 4d77bc84830..d7dac11a530 100644
--- a/tests/baselines/reference/objectSpreadNoTransform.symbols
+++ b/tests/baselines/reference/objectSpreadNoTransform.symbols
@@ -8,3 +8,13 @@ const o = { x: 1, ...y };
 >o : Symbol(o, Decl(objectSpreadNoTransform.ts, 1, 5))
 >x : Symbol(x, Decl(objectSpreadNoTransform.ts, 1, 11))
 
+var b;
+>b : Symbol(b, Decl(objectSpreadNoTransform.ts, 2, 3))
+
+var rest;
+>rest : Symbol(rest, Decl(objectSpreadNoTransform.ts, 3, 3))
+
+({ b, ...rest } = o);
+>b : Symbol(b, Decl(objectSpreadNoTransform.ts, 4, 2))
+>o : Symbol(o, Decl(objectSpreadNoTransform.ts, 1, 5))
+
diff --git a/tests/baselines/reference/objectSpreadNoTransform.types b/tests/baselines/reference/objectSpreadNoTransform.types
index 3a412e2894e..0a6c867e8fe 100644
--- a/tests/baselines/reference/objectSpreadNoTransform.types
+++ b/tests/baselines/reference/objectSpreadNoTransform.types
@@ -14,3 +14,17 @@ const o = { x: 1, ...y };
 >1 : 1
 >y : any
 
+var b;
+>b : any
+
+var rest;
+>rest : any
+
+({ b, ...rest } = o);
+>({ b, ...rest } = o) : { a: string; b: string; x: number; }
+>{ b, ...rest } = o : { a: string; b: string; x: number; }
+>{ b, ...rest } : any
+>b : any
+>rest : any
+>o : { a: string; b: string; x: number; }
+
diff --git a/tests/cases/conformance/types/spread/objectSpreadNoTransform.ts b/tests/cases/conformance/types/spread/objectSpreadNoTransform.ts
index 00039117a20..36c75e70887 100644
--- a/tests/cases/conformance/types/spread/objectSpreadNoTransform.ts
+++ b/tests/cases/conformance/types/spread/objectSpreadNoTransform.ts
@@ -1,3 +1,6 @@
 // @target: esnext
 const y = { a: 'yes', b: 'no' };
 const o = { x: 1, ...y };
+var b;
+var rest;
+({ b, ...rest } = o);

From d5c67312f619f3283c2c1a448b965d6698da41a5 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Mon, 7 Nov 2016 12:41:22 -0800
Subject: [PATCH 127/421] Add `realpath` implementation for lshost

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

diff --git a/src/server/lsHost.ts b/src/server/lsHost.ts
index 628de71bb7a..f1e80d95880 100644
--- a/src/server/lsHost.ts
+++ b/src/server/lsHost.ts
@@ -13,6 +13,7 @@ namespace ts.server {
 
         private readonly resolveModuleName: typeof resolveModuleName;
         readonly trace: (s: string) => void;
+        readonly realpath?: (path: string) => string;
 
         constructor(private readonly host: ServerHost, private readonly project: Project, private readonly cancellationToken: HostCancellationToken) {
             this.getCanonicalFileName = ts.createGetCanonicalFileName(this.host.useCaseSensitiveFileNames);
@@ -39,6 +40,10 @@ namespace ts.server {
                 }
                 return primaryResult;
             };
+
+            if (this.host.realpath) {
+                this.realpath = path => this.host.realpath(path);
+            }
         }
 
         public startRecordingFilesWithChangedResolutions() {

From 78fdd44dd1fc352129314b580a27019ccd9ba496 Mon Sep 17 00:00:00 2001
From: Paul van Brenk <paul.van.brenk@microsoft.com>
Date: Mon, 7 Nov 2016 13:01:14 -0800
Subject: [PATCH 128/421] Remove error-codes from fourslash tests

---
 tests/cases/fourslash/unusedFunctionInNamespace5.ts | 4 ++--
 tests/cases/fourslash/unusedLocalsInFunction2.ts    | 4 ++--
 tests/cases/fourslash/unusedLocalsInFunction3.ts    | 4 ++--
 tests/cases/fourslash/unusedVariableInModule2.ts    | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/cases/fourslash/unusedFunctionInNamespace5.ts b/tests/cases/fourslash/unusedFunctionInNamespace5.ts
index fa1eed2364a..b839d9dcd97 100644
--- a/tests/cases/fourslash/unusedFunctionInNamespace5.ts
+++ b/tests/cases/fourslash/unusedFunctionInNamespace5.ts
@@ -18,11 +18,11 @@
 ////
 ////    }
 ////
-////    exp ort let a = function3; |]
+////    export let a = function3; |]
 ////}
 
 verify.codeFixAtPosition(`function function3() {
         function1();
     }
 
-    export let a = function3;`, 6133);
+    export let a = function3;`);
diff --git a/tests/cases/fourslash/unusedLocalsInFunction2.ts b/tests/cases/fourslash/unusedLocalsInFunction2.ts
index 8f843623974..b7094328041 100644
--- a/tests/cases/fourslash/unusedLocalsInFunction2.ts
+++ b/tests/cases/fourslash/unusedLocalsInFunction2.ts
@@ -3,7 +3,7 @@
 // @noUnusedLocals: true
 ////function greeter() {
 ////    [| var x, y = 0; |]
-////    x++;
+////    x+1;
 ////}
 
-verify.codeFixAtPosition("var x;", 6133);
+verify.codeFixAtPosition("var x;");
diff --git a/tests/cases/fourslash/unusedLocalsInFunction3.ts b/tests/cases/fourslash/unusedLocalsInFunction3.ts
index 3fc92541390..906517ee0a7 100644
--- a/tests/cases/fourslash/unusedLocalsInFunction3.ts
+++ b/tests/cases/fourslash/unusedLocalsInFunction3.ts
@@ -3,8 +3,8 @@
 // @noUnusedLocals: true
 ////function greeter() {
 ////   [| var x, y = 0,z = 1; |]
-////    x++;
-////    z++;
+////    x+1;
+////    z+1;
 ////}
 
 verify.codeFixAtPosition("var x,z = 1;", 6133);
diff --git a/tests/cases/fourslash/unusedVariableInModule2.ts b/tests/cases/fourslash/unusedVariableInModule2.ts
index 09108ab1ee0..db4519c8faa 100644
--- a/tests/cases/fourslash/unusedVariableInModule2.ts
+++ b/tests/cases/fourslash/unusedVariableInModule2.ts
@@ -3,8 +3,8 @@
 // @noUnusedLocals: true
 // @noUnusedParameters: true
 //// export {}
-//// [|var x: string, y: number;|]
-//// y;
+//// [|var x: string, z: number;|]
+//// z;
 //// export var y: string;
 
-verify.codeFixAtPosition("var y: number;", 6133);
+verify.codeFixAtPosition("var z: number;");

From 567f5636e3e4c9bf4790f99fd8bb2e07afcb8561 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 7 Nov 2016 13:02:05 -0800
Subject: [PATCH 129/421] Create spread property types eagerly

This avoids the need for a synthetic symbol and later code called from
getTypeOfSymbol.
---
 src/compiler/checker.ts   | 44 +++++++++++++--------------------------
 src/compiler/types.ts     |  1 -
 src/compiler/utilities.ts |  1 +
 3 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index b3200ab239b..73e4e273d66 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -3550,9 +3550,6 @@ namespace ts {
             if (symbol.flags & SymbolFlags.Instantiated) {
                 return getTypeOfInstantiatedSymbol(symbol);
             }
-            if (symbol.flags & SymbolFlags.SyntheticProperty && symbol.syntheticKind === SyntheticSymbolKind.Spread) {
-                return getTypeOfSpreadProperty(symbol);
-            }
             if (symbol.flags & (SymbolFlags.Variable | SymbolFlags.Property)) {
                 return getTypeOfVariableOrParameterOrProperty(symbol);
             }
@@ -3571,14 +3568,6 @@ namespace ts {
             return unknownType;
         }
 
-        function getTypeOfSpreadProperty(symbol: Symbol) {
-            const links = getSymbolLinks(symbol);
-            if (!links.type) {
-                links.type = getUnionType([getTypeOfSymbol(links.leftSpread), getTypeOfSymbol(links.rightSpread)]);
-            }
-            return links.type;
-        }
-
         function getTargetType(type: Type): Type {
             return getObjectFlags(type) & ObjectFlags.Reference ? (<TypeReference>type).target : type;
         }
@@ -4588,7 +4577,6 @@ namespace ts {
                 propTypes.push(type);
             }
             const result = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | SymbolFlags.SyntheticProperty | commonFlags, name);
-            result.syntheticKind = SyntheticSymbolKind.UnionOrIntersection;
             result.containingType = containingType;
             result.hasNonUniformType = hasNonUniformType;
             result.isPartial = isPartial;
@@ -5932,9 +5920,9 @@ namespace ts {
                     const rightProp = members[leftProp.name];
                     if (rightProp.flags & SymbolFlags.Optional) {
                         const declarations: Declaration[] = concatenate(leftProp.declarations, rightProp.declarations);
-                        const flags = SymbolFlags.Property | SymbolFlags.Transient | SymbolFlags.SyntheticProperty | (leftProp.flags & SymbolFlags.Optional);
+                        const flags = SymbolFlags.Property | SymbolFlags.Transient | (leftProp.flags & SymbolFlags.Optional);
                         const result = <TransientSymbol>createSymbol(flags, leftProp.name);
-                        result.syntheticKind = SyntheticSymbolKind.Spread;
+                        result.type = getUnionType([getTypeOfSymbol(leftProp), getTypeOfSymbol(rightProp)]);
                         result.leftSpread = leftProp;
                         result.rightSpread = rightProp;
                         result.declarations = declarations;
@@ -19220,23 +19208,21 @@ namespace ts {
 
         function getRootSymbols(symbol: Symbol): Symbol[] {
             if (symbol.flags & SymbolFlags.SyntheticProperty) {
-                if (symbol.syntheticKind === SyntheticSymbolKind.Spread) {
-                    const links = getSymbolLinks(symbol);
-                    return [links.leftSpread, links.rightSpread];
-                }
-                else {
-                    const symbols: Symbol[] = [];
-                    const name = symbol.name;
-                    forEach(getSymbolLinks(symbol).containingType.types, t => {
-                        const symbol = getPropertyOfType(t, name);
-                        if (symbol) {
-                            symbols.push(symbol);
-                        }
-                    });
-                    return symbols;
-                }
+                const symbols: Symbol[] = [];
+                const name = symbol.name;
+                forEach(getSymbolLinks(symbol).containingType.types, t => {
+                    const symbol = getPropertyOfType(t, name);
+                    if (symbol) {
+                        symbols.push(symbol);
+                    }
+                });
+                return symbols;
             }
             else if (symbol.flags & SymbolFlags.Transient) {
+                if ((symbol as SymbolLinks).leftSpread) {
+                    const links = symbol as SymbolLinks;
+                    return [links.leftSpread, links.rightSpread];
+                }
                 let target: Symbol;
                 let next = symbol;
                 while (next = getSymbolLinks(next).target) {
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index dcff28d6a48..61bbff691bc 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -2590,7 +2590,6 @@ namespace ts {
         /* @internal */ isReferenced?: boolean; // True if the symbol is referenced elsewhere
         /* @internal */ isReplaceableByMethod?: boolean; // Can this Javascript class property be replaced by a method symbol?
         /* @internal */ isAssigned?: boolean;   // True if the symbol is a parameter with assignments
-        /* @internal */ syntheticKind?: SyntheticSymbolKind; // Synthetic symbols are either spread or union/intersection
     }
 
     /* @internal */
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index b668fe6eb15..53a4ad33f34 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -4311,6 +4311,7 @@ namespace ts {
 namespace ts {
     export function getDefaultLibFileName(options: CompilerOptions): string {
         switch (options.target) {
+            case ScriptTarget.ESNext:
             case ScriptTarget.ES2017:
                 return "lib.es2017.d.ts";
             case ScriptTarget.ES2016:

From bd5ce284c9c2d8b29d131100615db437dde5ae28 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 7 Nov 2016 13:35:36 -0800
Subject: [PATCH 130/421] Set spread type symbols in checkObjectLiteral

Instead of getSpreadType.

Also clean up special-case handling inside getSpreadType to be more
readable.
---
 src/compiler/checker.ts                       | 19 ++++++++++---------
 .../baselines/reference/objectSpread.symbols  |  1 +
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 73e4e273d66..263ee47a6b7 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -5881,7 +5881,7 @@ namespace ts {
          * this function should be called in a left folding style, with left = previous result of getSpreadType
          * and right = the new element to be spread.
          */
-        function getSpreadType(left: Type, right: Type, symbol: Symbol): ResolvedType | IntrinsicType {
+        function getSpreadType(left: Type, right: Type, isFromObjectLiteral: boolean): ResolvedType | IntrinsicType {
             Debug.assert(!!(left.flags & (TypeFlags.Object | TypeFlags.Any)) && !!(right.flags & (TypeFlags.Object | TypeFlags.Any)), "Only object types may be spread.");
             if (left.flags & TypeFlags.Any || right.flags & TypeFlags.Any) {
                 return anyType;
@@ -5900,14 +5900,14 @@ namespace ts {
                 numberIndexInfo = unionSpreadIndexInfos(getIndexInfoOfType(left, IndexKind.Number), getIndexInfoOfType(right, IndexKind.Number));
             }
 
-            const isFromSpread = right.symbol !== symbol;
             for (const rightProp of getPropertiesOfType(right)) {
+                // we approximate own properties as non-methods plus methods that are inside the object literal
+                const isOwnProperty = !(rightProp.flags & SymbolFlags.Method) || isFromObjectLiteral;
+                const isSetterWithoutGetter = rightProp.flags & SymbolFlags.SetAccessor && !(rightProp.flags & SymbolFlags.GetAccessor);
                 if (getDeclarationModifierFlagsFromSymbol(rightProp) & (ModifierFlags.Private | ModifierFlags.Protected)) {
                     skippedPrivateMembers[rightProp.name] = true;
                 }
-                else if (!(rightProp.flags & SymbolFlags.Method && isFromSpread) &&
-                         !(rightProp.flags & SymbolFlags.SetAccessor && !(rightProp.flags & SymbolFlags.GetAccessor))) {
-                    // skip methods from spreads and accessors with setters but no getters
+                else if (isOwnProperty && !isSetterWithoutGetter) {
                     members[rightProp.name] = rightProp;
                 }
             }
@@ -5937,7 +5937,7 @@ namespace ts {
                     members[leftProp.name] = leftProp;
                 }
             }
-            return createAnonymousType(symbol, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
+            return createAnonymousType(undefined, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
         }
 
         function createLiteralType(flags: TypeFlags, text: string) {
@@ -10947,7 +10947,7 @@ namespace ts {
                 }
                 else if (memberDecl.kind === SyntaxKind.SpreadAssignment) {
                     if (propertiesArray.length > 0) {
-                        spread = getSpreadType(spread, createObjectLiteralType(), node.symbol);
+                        spread = getSpreadType(spread, createObjectLiteralType(), /*isFromObjectLiteral*/ true);
                         propertiesArray = [];
                         propertiesTable = createMap<Symbol>();
                         hasComputedStringProperty = false;
@@ -10959,7 +10959,7 @@ namespace ts {
                         error(memberDecl, Diagnostics.Spread_types_may_only_be_created_from_object_types);
                         return unknownType;
                     }
-                    spread = getSpreadType(spread, type, node.symbol);
+                    spread = getSpreadType(spread, type, /*isFromObjectLiteral*/ false);
                     continue;
                 }
                 else {
@@ -11003,9 +11003,10 @@ namespace ts {
 
             if (spread !== emptyObjectType) {
                 if (propertiesArray.length > 0) {
-                    spread = getSpreadType(spread, createObjectLiteralType(), node.symbol);
+                    spread = getSpreadType(spread, createObjectLiteralType(), /*isFromObjectLiteral*/ true);
                 }
                 spread.flags |= propagatedFlags;
+                spread.symbol = node.symbol;
                 return spread;
             }
 
diff --git a/tests/baselines/reference/objectSpread.symbols b/tests/baselines/reference/objectSpread.symbols
index 4b0a62a5a24..9946b313f52 100644
--- a/tests/baselines/reference/objectSpread.symbols
+++ b/tests/baselines/reference/objectSpread.symbols
@@ -182,6 +182,7 @@ let cplus: { p: number, plus(): void } = { ...c, plus() { return this.p + 1; } }
 >p : Symbol(p, Decl(objectSpread.ts, 49, 12))
 >plus : Symbol(plus, Decl(objectSpread.ts, 49, 23))
 >plus : Symbol(plus, Decl(objectSpread.ts, 49, 48))
+>this : Symbol(__object, Decl(objectSpread.ts, 41, 15))
 
 cplus.plus();
 >cplus.plus : Symbol(plus, Decl(objectSpread.ts, 49, 23))

From 4ffdea838a65cf948f4ace6e659fc7936c7ea9a7 Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Mon, 7 Nov 2016 13:36:08 -0800
Subject: [PATCH 131/421] Ports #12051 and #12032 into master (#12090)

* use local registry to check if typings package exist (#12014)

use local registry to check if typings package exist

* enable sending telemetry events to tsserver client (#12035)

enable sending telemetry events
---
 Jakefile.js                                   |   2 +
 .../unittests/tsserverProjectSystem.ts        |  33 +--
 src/harness/unittests/typingsInstaller.ts     | 261 ++++++++++--------
 src/server/editorServices.ts                  |   4 +-
 src/server/protocol.ts                        |  26 ++
 src/server/server.ts                          |  77 ++++--
 src/server/session.ts                         |   6 +-
 src/server/shared.ts                          |  24 ++
 src/server/tsconfig.json                      |   1 +
 src/server/tsconfig.library.json              |   1 +
 src/server/types.d.ts                         |  26 +-
 .../typingsInstaller/nodeTypingsInstaller.ts  | 141 +++++-----
 src/server/typingsInstaller/tsconfig.json     |   1 +
 .../typingsInstaller/typingsInstaller.ts      | 135 ++++-----
 src/server/utilities.ts                       |   2 +
 15 files changed, 415 insertions(+), 325 deletions(-)
 create mode 100644 src/server/shared.ts

diff --git a/Jakefile.js b/Jakefile.js
index 8ce70eb353f..fc2b6359355 100644
--- a/Jakefile.js
+++ b/Jakefile.js
@@ -171,6 +171,7 @@ var servicesSources = [
 
 var serverCoreSources = [
     "types.d.ts",
+    "shared.ts",
     "utilities.ts",
     "scriptVersionCache.ts",
     "typingsCache.ts",
@@ -193,6 +194,7 @@ var cancellationTokenSources = [
 
 var typingsInstallerSources = [
     "../types.d.ts",
+    "../shared.ts",
     "typingsInstaller.ts",
     "nodeTypingsInstaller.ts"
 ].map(function (f) {
diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
index 15cfa3f8c8e..ee6139b1215 100644
--- a/src/harness/unittests/tsserverProjectSystem.ts
+++ b/src/harness/unittests/tsserverProjectSystem.ts
@@ -18,7 +18,6 @@ namespace ts.projectSystem {
     };
 
     export interface PostExecAction {
-        readonly requestKind: TI.RequestKind;
         readonly success: boolean;
         readonly callback: TI.RequestCompletedAction;
     }
@@ -47,9 +46,14 @@ namespace ts.projectSystem {
 
     export class TestTypingsInstaller extends TI.TypingsInstaller implements server.ITypingsInstaller {
         protected projectService: server.ProjectService;
-        constructor(readonly globalTypingsCacheLocation: string, throttleLimit: number, readonly installTypingHost: server.ServerHost, log?: TI.Log) {
-            super(globalTypingsCacheLocation, safeList.path, throttleLimit, log);
-            this.init();
+        constructor(
+            readonly globalTypingsCacheLocation: string,
+            throttleLimit: number,
+            installTypingHost: server.ServerHost,
+            readonly typesRegistry = createMap<void>(),
+            telemetryEnabled?: boolean,
+            log?: TI.Log) {
+            super(installTypingHost, globalTypingsCacheLocation, safeList.path, throttleLimit, telemetryEnabled, log);
         }
 
         safeFileList = safeList.path;
@@ -63,9 +67,8 @@ namespace ts.projectSystem {
             }
         }
 
-        checkPendingCommands(expected: TI.RequestKind[]) {
-            assert.equal(this.postExecActions.length, expected.length, `Expected ${expected.length} post install actions`);
-            this.postExecActions.forEach((act, i) => assert.equal(act.requestKind, expected[i], "Unexpected post install action"));
+        checkPendingCommands(expectedCount: number) {
+            assert.equal(this.postExecActions.length, expectedCount, `Expected ${expectedCount} post install actions`);
         }
 
         onProjectClosed() {
@@ -79,15 +82,8 @@ namespace ts.projectSystem {
             return this.installTypingHost;
         }
 
-        executeRequest(requestKind: TI.RequestKind, _requestId: number, _args: string[], _cwd: string, cb: TI.RequestCompletedAction): void {
-            switch (requestKind) {
-                case TI.NpmViewRequest:
-                case TI.NpmInstallRequest:
-                    break;
-                default:
-                    assert.isTrue(false, `request ${requestKind} is not supported`);
-            }
-            this.addPostExecAction(requestKind, "success", cb);
+        installWorker(_requestId: number, _args: string[], _cwd: string, cb: TI.RequestCompletedAction): void {
+            this.addPostExecAction("success", cb);
         }
 
         sendResponse(response: server.SetTypings | server.InvalidateCachedTypings) {
@@ -99,12 +95,11 @@ namespace ts.projectSystem {
             this.install(request);
         }
 
-        addPostExecAction(requestKind: TI.RequestKind, stdout: string | string[], cb: TI.RequestCompletedAction) {
+        addPostExecAction(stdout: string | string[], cb: TI.RequestCompletedAction) {
             const out = typeof stdout === "string" ? stdout : createNpmPackageJsonString(stdout);
             const action: PostExecAction = {
                 success: !!out,
-                callback: cb,
-                requestKind
+                callback: cb
             };
             this.postExecActions.push(action);
         }
diff --git a/src/harness/unittests/typingsInstaller.ts b/src/harness/unittests/typingsInstaller.ts
index 356992d5717..2dda506ad58 100644
--- a/src/harness/unittests/typingsInstaller.ts
+++ b/src/harness/unittests/typingsInstaller.ts
@@ -8,44 +8,44 @@ namespace ts.projectSystem {
     interface InstallerParams {
         globalTypingsCacheLocation?: string;
         throttleLimit?: number;
+        typesRegistry?: Map<void>;
+    }
+
+    function createTypesRegistry(...list: string[]): Map<void> {
+        const map = createMap<void>();
+        for (const l of list) {
+            map[l] = undefined;
+        }
+        return map;
     }
 
     class Installer extends TestTypingsInstaller {
-        constructor(host: server.ServerHost, p?: InstallerParams, log?: TI.Log) {
+        constructor(host: server.ServerHost, p?: InstallerParams, telemetryEnabled?: boolean, log?: TI.Log) {
             super(
                 (p && p.globalTypingsCacheLocation) || "/a/data",
                 (p && p.throttleLimit) || 5,
                 host,
+                (p && p.typesRegistry),
+                telemetryEnabled,
                 log);
         }
 
-        installAll(expectedView: typeof TI.NpmViewRequest[], expectedInstall: typeof TI.NpmInstallRequest[]) {
-            this.checkPendingCommands(expectedView);
-            this.executePendingCommands();
-            this.checkPendingCommands(expectedInstall);
+        installAll(expectedCount: number) {
+            this.checkPendingCommands(expectedCount);
             this.executePendingCommands();
         }
     }
 
-    describe("typingsInstaller", () => {
-        function executeCommand(self: Installer, host: TestServerHost, installedTypings: string[], typingFiles: FileOrFolder[], requestKind: TI.RequestKind, cb: TI.RequestCompletedAction): void {
-            switch (requestKind) {
-                case TI.NpmInstallRequest:
-                    self.addPostExecAction(requestKind, installedTypings, success => {
-                        for (const file of typingFiles) {
-                            host.createFileOrFolder(file, /*createParentDirectory*/ true);
-                        }
-                        cb(success);
-                    });
-                    break;
-                case TI.NpmViewRequest:
-                    self.addPostExecAction(requestKind, installedTypings, cb);
-                    break;
-                default:
-                    assert.isTrue(false, `unexpected request kind ${requestKind}`);
-                    break;
+    function executeCommand(self: Installer, host: TestServerHost, installedTypings: string[], typingFiles: FileOrFolder[], cb: TI.RequestCompletedAction): void {
+        self.addPostExecAction(installedTypings, success => {
+            for (const file of typingFiles) {
+                host.createFileOrFolder(file, /*createParentDirectory*/ true);
             }
-        }
+            cb(success);
+        });
+    }
+
+    describe("typingsInstaller", () => {
         it("configured projects (typings installed) 1", () => {
             const file1 = {
                 path: "/a/b/app.js",
@@ -79,12 +79,12 @@ namespace ts.projectSystem {
             const host = createServerHost([file1, tsconfig, packageJson]);
             const installer = new (class extends Installer {
                 constructor() {
-                    super(host);
+                    super(host, { typesRegistry: createTypesRegistry("jquery") });
                 }
-                executeRequest(requestKind: TI.RequestKind, _requestId: number, _args: string[], _cwd: string, cb: server.typingsInstaller.RequestCompletedAction) {
+                installWorker(_requestId: number, _args: string[], _cwd: string, cb: server.typingsInstaller.RequestCompletedAction) {
                     const installedTypings = ["@types/jquery"];
                     const typingFiles = [jquery];
-                    executeCommand(this, host, installedTypings, typingFiles, requestKind, cb);
+                    executeCommand(this, host, installedTypings, typingFiles, cb);
                 }
             })();
 
@@ -95,7 +95,7 @@ namespace ts.projectSystem {
             const p = projectService.configuredProjects[0];
             checkProjectActualFiles(p, [file1.path]);
 
-            installer.installAll([TI.NpmViewRequest], [TI.NpmInstallRequest]);
+            installer.installAll(/*expectedCount*/ 1);
 
             checkNumberOfProjects(projectService, { configuredProjects: 1 });
             checkProjectActualFiles(p, [file1.path, jquery.path]);
@@ -123,12 +123,12 @@ namespace ts.projectSystem {
             const host = createServerHost([file1, packageJson]);
             const installer = new (class extends Installer {
                 constructor() {
-                    super(host);
+                    super(host, { typesRegistry: createTypesRegistry("jquery") });
                 }
-                executeRequest(requestKind: TI.RequestKind, _requestId: number, _args: string[], _cwd: string, cb: server.typingsInstaller.RequestCompletedAction) {
+                installWorker(_requestId: number, _args: string[], _cwd: string, cb: server.typingsInstaller.RequestCompletedAction) {
                     const installedTypings = ["@types/jquery"];
                     const typingFiles = [jquery];
-                    executeCommand(this, host, installedTypings, typingFiles, requestKind, cb);
+                    executeCommand(this, host, installedTypings, typingFiles, cb);
                 }
             })();
 
@@ -139,7 +139,7 @@ namespace ts.projectSystem {
             const p = projectService.inferredProjects[0];
             checkProjectActualFiles(p, [file1.path]);
 
-            installer.installAll([TI.NpmViewRequest], [TI.NpmInstallRequest]);
+            installer.installAll(/*expectedCount*/ 1);
 
             checkNumberOfProjects(projectService, { inferredProjects: 1 });
             checkProjectActualFiles(p, [file1.path, jquery.path]);
@@ -167,7 +167,7 @@ namespace ts.projectSystem {
                 options: {},
                 rootFiles: [toExternalFile(file1.path)]
             });
-            installer.checkPendingCommands([]);
+            installer.checkPendingCommands(/*expectedCount*/ 0);
             // by default auto discovery will kick in if project contain only .js/.d.ts files
             // in this case project contain only ts files - no auto discovery
             projectService.checkNumberOfProjects({ externalProjects: 1 });
@@ -181,7 +181,7 @@ namespace ts.projectSystem {
             const host = createServerHost([file1]);
             const installer = new (class extends Installer {
                 constructor() {
-                    super(host);
+                    super(host, { typesRegistry: createTypesRegistry("jquery") });
                 }
                 enqueueInstallTypingsRequest() {
                     assert(false, "auto discovery should not be enabled");
@@ -196,7 +196,7 @@ namespace ts.projectSystem {
                 rootFiles: [toExternalFile(file1.path)],
                 typingOptions: { include: ["jquery"] }
             });
-            installer.checkPendingCommands([]);
+            installer.checkPendingCommands(/*expectedCount*/ 0);
             // by default auto discovery will kick in if project contain only .js/.d.ts files
             // in this case project contain only ts files - no auto discovery even if typing options is set
             projectService.checkNumberOfProjects({ externalProjects: 1 });
@@ -215,16 +215,16 @@ namespace ts.projectSystem {
             let enqueueIsCalled = false;
             const installer = new (class extends Installer {
                 constructor() {
-                    super(host);
+                    super(host, { typesRegistry: createTypesRegistry("jquery") });
                 }
                 enqueueInstallTypingsRequest(project: server.Project, typingOptions: TypingOptions, unresolvedImports: server.SortedReadonlyArray<string>) {
                     enqueueIsCalled = true;
                     super.enqueueInstallTypingsRequest(project, typingOptions, unresolvedImports);
                 }
-                executeRequest(requestKind: TI.RequestKind, _requestId: number, _args: string[], _cwd: string, cb: TI.RequestCompletedAction): void {
-                    const installedTypings = ["@types/jquery"];
+                installWorker(_requestId: number, _args: string[], _cwd: string, cb: TI.RequestCompletedAction): void {
+                    const installedTypings = ["@types/node"];
                     const typingFiles = [jquery];
-                    executeCommand(this, host, installedTypings, typingFiles, requestKind, cb);
+                    executeCommand(this, host, installedTypings, typingFiles, cb);
                 }
             })();
 
@@ -234,11 +234,11 @@ namespace ts.projectSystem {
                 projectFileName,
                 options: {},
                 rootFiles: [toExternalFile(file1.path)],
-                typingOptions: { enableAutoDiscovery: true, include: ["node"] }
+                typingOptions: { enableAutoDiscovery: true, include: ["jquery"] }
             });
 
             assert.isTrue(enqueueIsCalled, "expected enqueueIsCalled to be true");
-            installer.installAll([TI.NpmViewRequest], [TI.NpmInstallRequest]);
+            installer.installAll(/*expectedCount*/ 1);
 
             // autoDiscovery is set in typing options - use it even if project contains only .ts files
             projectService.checkNumberOfProjects({ externalProjects: 1 });
@@ -273,12 +273,12 @@ namespace ts.projectSystem {
             const host = createServerHost([file1, file2, file3]);
             const installer = new (class extends Installer {
                 constructor() {
-                    super(host);
+                    super(host, { typesRegistry: createTypesRegistry("lodash", "react") });
                 }
-                executeRequest(requestKind: TI.RequestKind, _requestId: number, _args: string[], _cwd: string, cb: TI.RequestCompletedAction): void {
+                installWorker(_requestId: number, _args: string[], _cwd: string, cb: TI.RequestCompletedAction): void {
                     const installedTypings = ["@types/lodash", "@types/react"];
                     const typingFiles = [lodash, react];
-                    executeCommand(this, host, installedTypings, typingFiles, requestKind, cb);
+                    executeCommand(this, host, installedTypings, typingFiles, cb);
                 }
             })();
 
@@ -295,7 +295,7 @@ namespace ts.projectSystem {
             projectService.checkNumberOfProjects({ externalProjects: 1 });
             checkProjectActualFiles(p, [file1.path, file2.path, file3.path]);
 
-            installer.installAll([TI.NpmViewRequest, TI.NpmViewRequest], [TI.NpmInstallRequest], );
+            installer.installAll(/*expectedCount*/ 1);
 
             checkNumberOfProjects(projectService, { externalProjects: 1 });
             checkProjectActualFiles(p, [file1.path, file2.path, file3.path, lodash.path, react.path]);
@@ -317,16 +317,16 @@ namespace ts.projectSystem {
             let enqueueIsCalled = false;
             const installer = new (class extends Installer {
                 constructor() {
-                    super(host);
+                    super(host, { typesRegistry: createTypesRegistry("jquery") });
                 }
                 enqueueInstallTypingsRequest(project: server.Project, typingOptions: TypingOptions, unresolvedImports: server.SortedReadonlyArray<string>) {
                     enqueueIsCalled = true;
                     super.enqueueInstallTypingsRequest(project, typingOptions, unresolvedImports);
                 }
-                executeRequest(requestKind: TI.RequestKind, _requestId: number, _args: string[], _cwd: string, cb: TI.RequestCompletedAction): void {
+                installWorker(_requestId: number, _args: string[], _cwd: string, cb: TI.RequestCompletedAction): void {
                     const installedTypings: string[] = [];
                     const typingFiles: FileOrFolder[] = [];
-                    executeCommand(this, host, installedTypings, typingFiles, requestKind, cb);
+                    executeCommand(this, host, installedTypings, typingFiles, cb);
                 }
             })();
 
@@ -343,7 +343,7 @@ namespace ts.projectSystem {
             projectService.checkNumberOfProjects({ externalProjects: 1 });
             checkProjectActualFiles(p, [file1.path, file2.path]);
 
-            installer.checkPendingCommands([]);
+            installer.checkPendingCommands(/*expectedCount*/ 0);
 
             checkNumberOfProjects(projectService, { externalProjects: 1 });
             checkProjectActualFiles(p, [file1.path, file2.path]);
@@ -396,12 +396,12 @@ namespace ts.projectSystem {
             const host = createServerHost([file1, file2, file3, packageJson]);
             const installer = new (class extends Installer {
                 constructor() {
-                    super(host);
+                    super(host, { typesRegistry: createTypesRegistry("jquery", "commander", "moment", "express") });
                 }
-                executeRequest(requestKind: TI.RequestKind, _requestId: number, _args: string[], _cwd: string, cb: TI.RequestCompletedAction): void {
+                installWorker(_requestId: number, _args: string[], _cwd: string, cb: TI.RequestCompletedAction): void {
                     const installedTypings = ["@types/commander", "@types/express", "@types/jquery", "@types/moment"];
                     const typingFiles = [commander, express, jquery, moment];
-                    executeCommand(this, host, installedTypings, typingFiles, requestKind, cb);
+                    executeCommand(this, host, installedTypings, typingFiles, cb);
                 }
             })();
 
@@ -418,10 +418,7 @@ namespace ts.projectSystem {
             projectService.checkNumberOfProjects({ externalProjects: 1 });
             checkProjectActualFiles(p, [file1.path, file2.path, file3.path]);
 
-            installer.installAll(
-                [TI.NpmViewRequest, TI.NpmViewRequest, TI.NpmViewRequest, TI.NpmViewRequest],
-                [TI.NpmInstallRequest]
-            );
+            installer.installAll(/*expectedCount*/ 1);
 
             checkNumberOfProjects(projectService, { externalProjects: 1 });
             checkProjectActualFiles(p, [file1.path, file2.path, file3.path, commander.path, express.path, jquery.path, moment.path]);
@@ -475,11 +472,11 @@ namespace ts.projectSystem {
             const host = createServerHost([lodashJs, commanderJs, file3, packageJson]);
             const installer = new (class extends Installer {
                 constructor() {
-                    super(host, { throttleLimit: 3 });
+                    super(host, { throttleLimit: 3, typesRegistry: createTypesRegistry("commander", "express", "jquery", "moment", "lodash") });
                 }
-                executeRequest(requestKind: TI.RequestKind, _requestId: number, _args: string[], _cwd: string, cb: TI.RequestCompletedAction): void {
+                installWorker(_requestId: number, _args: string[], _cwd: string, cb: TI.RequestCompletedAction): void {
                     const installedTypings = ["@types/commander", "@types/express", "@types/jquery", "@types/moment", "@types/lodash"];
-                    executeCommand(this, host, installedTypings, typingFiles, requestKind, cb);
+                    executeCommand(this, host, installedTypings, typingFiles, cb);
                 }
             })();
 
@@ -495,18 +492,7 @@ namespace ts.projectSystem {
             const p = projectService.externalProjects[0];
             projectService.checkNumberOfProjects({ externalProjects: 1 });
             checkProjectActualFiles(p, [lodashJs.path, commanderJs.path, file3.path]);
-            // expected 3 view requests in the queue
-            installer.checkPendingCommands([TI.NpmViewRequest, TI.NpmViewRequest, TI.NpmViewRequest]);
-            assert.equal(installer.pendingRunRequests.length, 2, "expected 2 pending requests");
-
-            // push view requests
-            installer.executePendingCommands();
-            // expected 2 remaining view requests in the queue
-            installer.checkPendingCommands([TI.NpmViewRequest, TI.NpmViewRequest]);
-            // push view requests
-            installer.executePendingCommands();
-            // expected one install request
-            installer.checkPendingCommands([TI.NpmInstallRequest]);
+            installer.checkPendingCommands(/*expectedCount*/ 1);
             installer.executePendingCommands();
             // expected all typings file to exist
             for (const f of typingFiles) {
@@ -565,22 +551,17 @@ namespace ts.projectSystem {
             const host = createServerHost([lodashJs, commanderJs, file3]);
             const installer = new (class extends Installer {
                 constructor() {
-                    super(host, { throttleLimit: 3 });
+                    super(host, { throttleLimit: 1, typesRegistry: createTypesRegistry("commander", "jquery", "lodash", "cordova", "gulp", "grunt") });
                 }
-                executeRequest(requestKind: TI.RequestKind, _requestId: number, args: string[], _cwd: string, cb: TI.RequestCompletedAction): void {
-                    if (requestKind === TI.NpmInstallRequest) {
-                        let typingFiles: (FileOrFolder & { typings: string })[] = [];
-                        if (args.indexOf("@types/commander") >= 0) {
-                            typingFiles = [commander, jquery, lodash, cordova];
-                        }
-                        else {
-                            typingFiles = [grunt, gulp];
-                        }
-                        executeCommand(this, host, typingFiles.map(f => f.typings), typingFiles, requestKind, cb);
+                installWorker(_requestId: number, args: string[], _cwd: string, cb: TI.RequestCompletedAction): void {
+                    let typingFiles: (FileOrFolder & { typings: string })[] = [];
+                    if (args.indexOf("@types/commander") >= 0) {
+                        typingFiles = [commander, jquery, lodash, cordova];
                     }
                     else {
-                        executeCommand(this, host, [], [], requestKind, cb);
+                        typingFiles = [grunt, gulp];
                     }
+                    executeCommand(this, host, typingFiles.map(f => f.typings), typingFiles, cb);
                 }
             })();
 
@@ -594,8 +575,8 @@ namespace ts.projectSystem {
                 typingOptions: { include: ["jquery", "cordova"] }
             });
 
-            installer.checkPendingCommands([TI.NpmViewRequest, TI.NpmViewRequest, TI.NpmViewRequest]);
-            assert.equal(installer.pendingRunRequests.length, 1, "expect one throttled request");
+            installer.checkPendingCommands(/*expectedCount*/ 1);
+            assert.equal(installer.pendingRunRequests.length, 0, "expect no throttled requests");
 
             // Create project #2 with 2 typings
             const projectFileName2 = "/a/app/test2.csproj";
@@ -605,7 +586,7 @@ namespace ts.projectSystem {
                 rootFiles: [toExternalFile(file3.path)],
                 typingOptions: { include: ["grunt", "gulp"] }
             });
-            assert.equal(installer.pendingRunRequests.length, 3, "expect three throttled request");
+            assert.equal(installer.pendingRunRequests.length, 1, "expect one throttled request");
 
             const p1 = projectService.externalProjects[0];
             const p2 = projectService.externalProjects[1];
@@ -613,18 +594,14 @@ namespace ts.projectSystem {
             checkProjectActualFiles(p1, [lodashJs.path, commanderJs.path, file3.path]);
             checkProjectActualFiles(p2, [file3.path]);
 
-
             installer.executePendingCommands();
-            // expected one view request from the first project and two - from the second one
-            installer.checkPendingCommands([TI.NpmViewRequest, TI.NpmViewRequest, TI.NpmViewRequest]);
+
+            // expected one install request from the second project
+            installer.checkPendingCommands(/*expectedCount*/ 1);
             assert.equal(installer.pendingRunRequests.length, 0, "expected no throttled requests");
 
             installer.executePendingCommands();
 
-            // should be two install requests from both projects
-            installer.checkPendingCommands([TI.NpmInstallRequest, TI.NpmInstallRequest]);
-            installer.executePendingCommands();
-
             checkProjectActualFiles(p1, [lodashJs.path, commanderJs.path, file3.path, commander.path, jquery.path, lodash.path, cordova.path]);
             checkProjectActualFiles(p2, [file3.path, grunt.path, gulp.path]);
         });
@@ -653,12 +630,12 @@ namespace ts.projectSystem {
             const host = createServerHost([app, jsconfig, jquery, jqueryPackage]);
             const installer = new (class extends Installer {
                 constructor() {
-                    super(host, { globalTypingsCacheLocation: "/tmp" });
+                    super(host, { globalTypingsCacheLocation: "/tmp", typesRegistry: createTypesRegistry("jquery") });
                 }
-                executeRequest(requestKind: TI.RequestKind, _requestId: number, _args: string[], _cwd: string, cb: server.typingsInstaller.RequestCompletedAction) {
+                installWorker(_requestId: number, _args: string[], _cwd: string, cb: server.typingsInstaller.RequestCompletedAction) {
                     const installedTypings = ["@types/jquery"];
                     const typingFiles = [jqueryDTS];
-                    executeCommand(this, host, installedTypings, typingFiles, requestKind, cb);
+                    executeCommand(this, host, installedTypings, typingFiles, cb);
                 }
             })();
 
@@ -669,7 +646,7 @@ namespace ts.projectSystem {
             const p = projectService.configuredProjects[0];
             checkProjectActualFiles(p, [app.path]);
 
-            installer.installAll([TI.NpmViewRequest], [TI.NpmInstallRequest]);
+            installer.installAll(/*expectedCount*/ 1);
 
             checkNumberOfProjects(projectService, { configuredProjects: 1 });
             checkProjectActualFiles(p, [app.path, jqueryDTS.path]);
@@ -699,12 +676,12 @@ namespace ts.projectSystem {
             const host = createServerHost([app, jsconfig, bowerJson]);
             const installer = new (class extends Installer {
                 constructor() {
-                    super(host, { globalTypingsCacheLocation: "/tmp" });
+                    super(host, { globalTypingsCacheLocation: "/tmp", typesRegistry: createTypesRegistry("jquery") });
                 }
-                executeRequest(requestKind: TI.RequestKind, _requestId: number, _args: string[], _cwd: string, cb: server.typingsInstaller.RequestCompletedAction) {
+                installWorker(_requestId: number, _args: string[], _cwd: string, cb: server.typingsInstaller.RequestCompletedAction) {
                     const installedTypings = ["@types/jquery"];
                     const typingFiles = [jqueryDTS];
-                    executeCommand(this, host, installedTypings, typingFiles, requestKind, cb);
+                    executeCommand(this, host, installedTypings, typingFiles, cb);
                 }
             })();
 
@@ -715,7 +692,7 @@ namespace ts.projectSystem {
             const p = projectService.configuredProjects[0];
             checkProjectActualFiles(p, [app.path]);
 
-            installer.installAll([TI.NpmViewRequest], [TI.NpmInstallRequest]);
+            installer.installAll(/*expectedCount*/ 1);
 
             checkNumberOfProjects(projectService, { configuredProjects: 1 });
             checkProjectActualFiles(p, [app.path, jqueryDTS.path]);
@@ -742,23 +719,23 @@ namespace ts.projectSystem {
             const host = createServerHost([f, brokenPackageJson]);
             const installer = new (class extends Installer {
                 constructor() {
-                    super(host, { globalTypingsCacheLocation: cachePath });
+                    super(host, { globalTypingsCacheLocation: cachePath, typesRegistry: createTypesRegistry("commander") });
                 }
-                executeRequest(requestKind: TI.RequestKind, _requestId: number, _args: string[], _cwd: string, cb: server.typingsInstaller.RequestCompletedAction) {
+                installWorker(_requestId: number, _args: string[], _cwd: string, cb: server.typingsInstaller.RequestCompletedAction) {
                     const installedTypings = ["@types/commander"];
                     const typingFiles = [commander];
-                    executeCommand(this, host, installedTypings, typingFiles, requestKind, cb);
+                    executeCommand(this, host, installedTypings, typingFiles, cb);
                 }
             })();
             const service = createProjectService(host, { typingsInstaller: installer });
             service.openClientFile(f.path);
 
-            installer.checkPendingCommands([]);
+            installer.checkPendingCommands(/*expectedCount*/ 0);
 
             host.reloadFS([f, fixedPackageJson]);
             host.triggerFileWatcherCallback(fixedPackageJson.path, /*removed*/ false);
-            // expected one view and one install request
-            installer.installAll([TI.NpmViewRequest], [TI.NpmInstallRequest]);
+            // expected install request
+            installer.installAll(/*expectedCount*/ 1);
 
             service.checkNumberOfProjects({ inferredProjects: 1 });
             checkProjectActualFiles(service.inferredProjects[0], [f.path, commander.path]);
@@ -783,12 +760,12 @@ namespace ts.projectSystem {
             const host = createServerHost([file]);
             const installer = new (class extends Installer {
                 constructor() {
-                    super(host, { globalTypingsCacheLocation: cachePath });
+                    super(host, { globalTypingsCacheLocation: cachePath, typesRegistry: createTypesRegistry("node", "commander") });
                 }
-                executeRequest(requestKind: TI.RequestKind, _requestId: number, _args: string[], _cwd: string, cb: server.typingsInstaller.RequestCompletedAction) {
+                installWorker(_requestId: number, _args: string[], _cwd: string, cb: server.typingsInstaller.RequestCompletedAction) {
                     const installedTypings = ["@types/node", "@types/commander"];
                     const typingFiles = [node, commander];
-                    executeCommand(this, host, installedTypings, typingFiles, requestKind, cb);
+                    executeCommand(this, host, installedTypings, typingFiles, cb);
                 }
             })();
             const service = createProjectService(host, { typingsInstaller: installer });
@@ -797,7 +774,7 @@ namespace ts.projectSystem {
             service.checkNumberOfProjects({ inferredProjects: 1 });
             checkProjectActualFiles(service.inferredProjects[0], [file.path]);
 
-            installer.installAll([TI.NpmViewRequest, TI.NpmViewRequest], [TI.NpmInstallRequest]);
+            installer.installAll(/*expectedCount*/1);
 
             assert.isTrue(host.fileExists(node.path), "typings for 'node' should be created");
             assert.isTrue(host.fileExists(commander.path), "typings for 'commander' should be created");
@@ -822,14 +799,10 @@ namespace ts.projectSystem {
             const host = createServerHost([f1]);
             const installer = new (class extends Installer {
                 constructor() {
-                    super(host, { globalTypingsCacheLocation: "/tmp" });
+                    super(host, { globalTypingsCacheLocation: "/tmp", typesRegistry: createTypesRegistry("foo") });
                 }
-                executeRequest(requestKind: TI.RequestKind, _requestId: number, args: string[], _cwd: string, cb: server.typingsInstaller.RequestCompletedAction) {
-                    if (requestKind === TI.NpmViewRequest) {
-                        // args should have only non-scoped packages - scoped packages are not yet supported
-                        assert.deepEqual(args, ["foo"]);
-                    }
-                    executeCommand(this, host, ["foo"], [], requestKind, cb);
+                installWorker(_requestId: number, _args: string[], _cwd: string, cb: server.typingsInstaller.RequestCompletedAction) {
+                    executeCommand(this, host, ["foo"], [], cb);
                 }
             })();
             const projectService = createProjectService(host, { typingsInstaller: installer });
@@ -844,7 +817,7 @@ namespace ts.projectSystem {
                 ["foo", "foo", "foo", "@bar/router", "@bar/common", "@bar/common"]
             );
 
-            installer.installAll([TI.NpmViewRequest], [TI.NpmInstallRequest]);
+            installer.installAll(/*expectedCount*/ 1);
         });
 
         it("cached unresolved typings are not recomputed if program structure did not change", () => {
@@ -934,16 +907,16 @@ namespace ts.projectSystem {
             const host = createServerHost([f1, packageJson]);
             const installer = new (class extends Installer {
                 constructor() {
-                    super(host, { globalTypingsCacheLocation: "/tmp" }, { isEnabled: () => true, writeLine: msg => messages.push(msg) });
+                    super(host, { globalTypingsCacheLocation: "/tmp" }, /*telemetryEnabled*/ false, { isEnabled: () => true, writeLine: msg => messages.push(msg) });
                 }
-                executeRequest() {
+                installWorker(_requestId: number, _args: string[], _cwd: string, _cb: server.typingsInstaller.RequestCompletedAction) {
                     assert(false, "runCommand should not be invoked");
                 }
             })();
             const projectService = createProjectService(host, { typingsInstaller: installer });
             projectService.openClientFile(f1.path);
 
-            installer.checkPendingCommands([]);
+            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");
         });
     });
@@ -978,4 +951,50 @@ namespace ts.projectSystem {
             assert.deepEqual(result.newTypingNames, ["bar"]);
         });
     });
+
+    describe("telemetry events", () => {
+        it ("should be received", () => {
+            const f1 = {
+                path: "/a/app.js",
+                content: ""
+            };
+            const package = {
+                path: "/a/package.json",
+                content: JSON.stringify({ dependencies: { "commander": "1.0.0" } })
+            };
+            const cachePath = "/a/cache/";
+            const commander = {
+                path: cachePath + "node_modules/@types/commander/index.d.ts",
+                content: "export let x: number"
+            };
+            const host = createServerHost([f1, package]);
+            let seenTelemetryEvent = false;
+            const installer = new (class extends Installer {
+                constructor() {
+                    super(host, { globalTypingsCacheLocation: cachePath, typesRegistry: createTypesRegistry("commander") }, /*telemetryEnabled*/ true);
+                }
+                installWorker(_requestId: number, _args: string[], _cwd: string, cb: server.typingsInstaller.RequestCompletedAction) {
+                    const installedTypings = ["@types/commander"];
+                    const typingFiles = [commander];
+                    executeCommand(this, host, installedTypings, typingFiles, cb);
+                }
+                sendResponse(response: server.SetTypings | server.InvalidateCachedTypings | server.TypingsInstallEvent) {
+                    if (response.kind === server.EventInstall) {
+                        assert.deepEqual(response.packagesToInstall, ["@types/commander"]);
+                        seenTelemetryEvent = true;
+                        return;
+                    }
+                    super.sendResponse(response);
+                }
+            })();
+            const projectService = createProjectService(host, { typingsInstaller: installer });
+            projectService.openClientFile(f1.path);
+
+            installer.installAll(/*expectedCount*/ 1);
+
+            assert.isTrue(seenTelemetryEvent);
+            checkNumberOfProjects(projectService, { inferredProjects: 1 });
+            checkProjectActualFiles(projectService.inferredProjects[0], [f1.path, commander.path]);
+        });
+    });
 }
\ No newline at end of file
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index a02becd87c4..bf760106b74 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -286,10 +286,10 @@ namespace ts.server {
                 return;
             }
             switch (response.kind) {
-                case "set":
+                case ActionSet:
                     this.typingsCache.updateTypingsForProject(response.projectName, response.compilerOptions, response.typingOptions, response.unresolvedImports, response.typings);
                     break;
-                case "invalidate":
+                case ActionInvalidate:
                     this.typingsCache.deleteTypingsForProject(response.projectName);
                     break;
             }
diff --git a/src/server/protocol.ts b/src/server/protocol.ts
index 7da95e49575..d13caf7f01b 100644
--- a/src/server/protocol.ts
+++ b/src/server/protocol.ts
@@ -2057,6 +2057,32 @@ namespace ts.server.protocol {
         childItems?: NavigationTree[];
     }
 
+    export type TelemetryEventName = "telemetry";
+
+    export interface TelemetryEvent extends Event {
+        event: TelemetryEventName;
+        body: TelemetryEventBody;
+    }
+
+    export interface TelemetryEventBody {
+        telemetryEventName: string;
+        payload: any;
+    }
+
+    export type TypingsInstalledTelemetryEventName = "typingsInstalled";
+
+    export interface TypingsInstalledTelemetryEventBody extends TelemetryEventBody {
+        telemetryEventName: TypingsInstalledTelemetryEventName;
+        payload: TypingsInstalledTelemetryEventPayload;
+    }
+
+    export interface TypingsInstalledTelemetryEventPayload {
+        /**
+         * Comma separated list of installed typing packages
+         */
+        installedPackages: string;
+    }
+
     export interface NavBarResponse extends Response {
         body?: NavigationBarItem[];
     }
diff --git a/src/server/server.ts b/src/server/server.ts
index 5057a13dbd1..3b33554aaba 100644
--- a/src/server/server.ts
+++ b/src/server/server.ts
@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference path="shared.ts" />
 /// <reference path="session.ts" />
 // used in fs.writeSync
 /* tslint:disable:no-null-keyword */
@@ -196,8 +197,10 @@ namespace ts.server {
         private socket: NodeSocket;
         private projectService: ProjectService;
         private throttledOperations: ThrottledOperations;
+        private telemetrySender: EventSender;
 
         constructor(
+            private readonly telemetryEnabled: boolean,
             private readonly logger: server.Logger,
             host: ServerHost,
             eventPort: number,
@@ -226,15 +229,22 @@ namespace ts.server {
             this.socket.write(formatMessage({ seq, type: "event", event, body }, this.logger, Buffer.byteLength, this.newLine), "utf8");
         }
 
+        setTelemetrySender(telemetrySender: EventSender) {
+            this.telemetrySender = telemetrySender;
+        }
+
         attach(projectService: ProjectService) {
             this.projectService = projectService;
             if (this.logger.hasLevel(LogLevel.requestTime)) {
                 this.logger.info("Binding...");
             }
 
-            const args: string[] = ["--globalTypingsCacheLocation", this.globalTypingsCacheLocation];
+            const args: string[] = [Arguments.GlobalCacheLocation, this.globalTypingsCacheLocation];
+            if (this.telemetryEnabled) {
+                args.push(Arguments.EnableTelemetry);
+            }
             if (this.logger.loggingEnabled() && this.logger.getLogFileName()) {
-                args.push("--logFile", combinePaths(getDirectoryPath(normalizeSlashes(this.logger.getLogFileName())), `ti-${process.pid}.log`));
+                args.push(Arguments.LogFile, combinePaths(getDirectoryPath(normalizeSlashes(this.logger.getLogFileName())), `ti-${process.pid}.log`));
             }
             const execArgv: string[] = [];
             {
@@ -280,12 +290,25 @@ namespace ts.server {
             });
         }
 
-        private handleMessage(response: SetTypings | InvalidateCachedTypings) {
+        private handleMessage(response: SetTypings | InvalidateCachedTypings | TypingsInstallEvent) {
             if (this.logger.hasLevel(LogLevel.verbose)) {
                 this.logger.info(`Received response: ${JSON.stringify(response)}`);
             }
+            if (response.kind === EventInstall) {
+                if (this.telemetrySender) {
+                    const body: protocol.TypingsInstalledTelemetryEventBody = {
+                        telemetryEventName: "typingsInstalled",
+                        payload: {
+                            installedPackages: response.packagesToInstall.join(",")
+                        }
+                    };
+                    const eventName: protocol.TelemetryEventName = "telemetry";
+                    this.telemetrySender.event(body, eventName);
+                }
+                return;
+            }
             this.projectService.updateTypingsForProject(response);
-            if (response.kind == "set" && this.socket) {
+            if (response.kind == ActionSet && this.socket) {
                 this.sendEvent(0, "setTypings", response);
             }
         }
@@ -300,18 +323,25 @@ namespace ts.server {
             useSingleInferredProject: boolean,
             disableAutomaticTypingAcquisition: boolean,
             globalTypingsCacheLocation: string,
+            telemetryEnabled: boolean,
             logger: server.Logger) {
-            super(
-                host,
-                cancellationToken,
-                useSingleInferredProject,
-                disableAutomaticTypingAcquisition
-                    ? nullTypingsInstaller
-                    : new NodeTypingsInstaller(logger, host, installerEventPort, globalTypingsCacheLocation, host.newLine),
-                Buffer.byteLength,
-                process.hrtime,
-                logger,
-                canUseEvents);
+                const typingsInstaller = disableAutomaticTypingAcquisition
+                    ? undefined
+                    : new NodeTypingsInstaller(telemetryEnabled, logger, host, installerEventPort, globalTypingsCacheLocation, host.newLine);
+
+                super(
+                    host,
+                    cancellationToken,
+                    useSingleInferredProject,
+                    typingsInstaller || nullTypingsInstaller,
+                    Buffer.byteLength,
+                    process.hrtime,
+                    logger,
+                    canUseEvents);
+
+                if (telemetryEnabled && typingsInstaller) {
+                    typingsInstaller.setTelemetrySender(this);
+                }
         }
 
         exit() {
@@ -538,17 +568,17 @@ namespace ts.server {
 
     let eventPort: number;
     {
-        const index = sys.args.indexOf("--eventPort");
-        if (index >= 0 && index < sys.args.length - 1) {
-            const v = parseInt(sys.args[index + 1]);
-            if (!isNaN(v)) {
-                eventPort = v;
-            }
+        const str = findArgument("--eventPort");
+        const v = str && parseInt(str);
+        if (!isNaN(v)) {
+            eventPort = v;
         }
     }
 
-    const useSingleInferredProject = sys.args.indexOf("--useSingleInferredProject") >= 0;
-    const disableAutomaticTypingAcquisition = sys.args.indexOf("--disableAutomaticTypingAcquisition") >= 0;
+    const useSingleInferredProject = hasArgument("--useSingleInferredProject");
+    const disableAutomaticTypingAcquisition = hasArgument("--disableAutomaticTypingAcquisition");
+    const telemetryEnabled = hasArgument(Arguments.EnableTelemetry);
+
     const ioSession = new IOSession(
         sys,
         cancellationToken,
@@ -557,6 +587,7 @@ namespace ts.server {
         useSingleInferredProject,
         disableAutomaticTypingAcquisition,
         getGlobalTypingsCacheLocation(),
+        telemetryEnabled,
         logger);
     process.on("uncaughtException", function (err: Error) {
         ioSession.logError(err, "unknown");
diff --git a/src/server/session.ts b/src/server/session.ts
index 545701f1449..b250393b7ff 100644
--- a/src/server/session.ts
+++ b/src/server/session.ts
@@ -73,6 +73,10 @@ namespace ts.server {
         project: Project;
     }
 
+    export interface EventSender {
+        event(payload: any, eventName: string): void;
+    }
+
     function allEditsBeforePos(edits: ts.TextChange[], pos: number) {
         for (const edit of edits) {
             if (textSpanEnd(edit.span) >= pos) {
@@ -165,7 +169,7 @@ namespace ts.server {
         return `Content-Length: ${1 + len}\r\n\r\n${json}${newLine}`;
     }
 
-    export class Session {
+    export class Session implements EventSender {
         private readonly gcTimer: GcTimer;
         protected projectService: ProjectService;
         private errorTimer: any; /*NodeJS.Timer | number*/
diff --git a/src/server/shared.ts b/src/server/shared.ts
new file mode 100644
index 00000000000..81a1f7fb55b
--- /dev/null
+++ b/src/server/shared.ts
@@ -0,0 +1,24 @@
+/// <reference path="types.d.ts" />
+
+namespace ts.server {
+    export const ActionSet: ActionSet = "action::set";
+    export const ActionInvalidate: ActionInvalidate = "action::invalidate";
+    export const EventInstall: EventInstall = "event::install";
+
+    export namespace Arguments {
+        export const GlobalCacheLocation = "--globalTypingsCacheLocation";
+        export const LogFile = "--logFile";
+        export const EnableTelemetry = "--enableTelemetry";
+    }
+
+    export function hasArgument(argumentName: string) {
+        return sys.args.indexOf(argumentName) >= 0;
+    }
+
+    export function findArgument(argumentName: string) {
+        const index = sys.args.indexOf(argumentName);
+        return index >= 0 && index < sys.args.length - 1
+            ? sys.args[index + 1]
+            : undefined;
+    }
+}
\ No newline at end of file
diff --git a/src/server/tsconfig.json b/src/server/tsconfig.json
index a99994d97c5..85c88679164 100644
--- a/src/server/tsconfig.json
+++ b/src/server/tsconfig.json
@@ -18,6 +18,7 @@
     "files": [
         "../services/shims.ts",
         "../services/utilities.ts",
+        "shared.ts",
         "utilities.ts",
         "scriptVersionCache.ts",
         "scriptInfo.ts",
diff --git a/src/server/tsconfig.library.json b/src/server/tsconfig.library.json
index e269629b558..5483cc8ec28 100644
--- a/src/server/tsconfig.library.json
+++ b/src/server/tsconfig.library.json
@@ -15,6 +15,7 @@
     "files": [
         "../services/shims.ts",
         "../services/utilities.ts",
+        "shared.ts",
         "utilities.ts",
         "scriptVersionCache.ts",
         "scriptInfo.ts",
diff --git a/src/server/types.d.ts b/src/server/types.d.ts
index ec2befe8fa9..95f9519cc38 100644
--- a/src/server/types.d.ts
+++ b/src/server/types.d.ts
@@ -41,23 +41,33 @@ declare namespace ts.server {
         readonly kind: "closeProject";
     }
 
-    export type SetRequest = "set";
-    export type InvalidateRequest = "invalidate";
+    export type ActionSet = "action::set";
+    export type ActionInvalidate = "action::invalidate";
+    export type EventInstall = "event::install";
+
     export interface TypingInstallerResponse {
-        readonly projectName: string;
-        readonly kind: SetRequest | InvalidateRequest;
+        readonly kind: ActionSet | ActionInvalidate | EventInstall;
     }
 
-    export interface SetTypings extends TypingInstallerResponse {
+    export interface ProjectResponse extends TypingInstallerResponse {
+        readonly projectName: string;
+    }
+
+    export interface SetTypings extends ProjectResponse {
         readonly typingOptions: ts.TypingOptions;
         readonly compilerOptions: ts.CompilerOptions;
         readonly typings: string[];
         readonly unresolvedImports: SortedReadonlyArray<string>;
-        readonly kind: SetRequest;
+        readonly kind: ActionSet;
     }
 
-    export interface InvalidateCachedTypings extends TypingInstallerResponse {
-        readonly kind: InvalidateRequest;
+    export interface InvalidateCachedTypings extends ProjectResponse {
+        readonly kind: ActionInvalidate;
+    }
+
+    export interface TypingsInstallEvent extends TypingInstallerResponse {
+        readonly packagesToInstall: ReadonlyArray<string>;
+        readonly kind: EventInstall;
     }
 
     export interface InstallTypingHost extends JsTyping.TypingResolutionHost {
diff --git a/src/server/typingsInstaller/nodeTypingsInstaller.ts b/src/server/typingsInstaller/nodeTypingsInstaller.ts
index 89419264930..7020b6aa4f8 100644
--- a/src/server/typingsInstaller/nodeTypingsInstaller.ts
+++ b/src/server/typingsInstaller/nodeTypingsInstaller.ts
@@ -33,42 +33,81 @@ namespace ts.server.typingsInstaller {
         }
     }
 
-    type HttpGet = {
-        (url: string, callback: (response: HttpResponse) => void): NodeJS.EventEmitter;
-    };
-
-    interface HttpResponse extends NodeJS.ReadableStream {
-        statusCode: number;
-        statusMessage: string;
-        destroy(): void;
+    interface TypesRegistryFile {
+        entries: MapLike<void>;
     }
 
+    function loadTypesRegistryFile(typesRegistryFilePath: string, host: InstallTypingHost, log: Log): Map<void> {
+        if (!host.fileExists(typesRegistryFilePath)) {
+            if (log.isEnabled()) {
+                log.writeLine(`Types registry file '${typesRegistryFilePath}' does not exist`);
+            }
+            return createMap<void>();
+        }
+        try {
+            const content = <TypesRegistryFile>JSON.parse(host.readFile(typesRegistryFilePath));
+            return createMap<void>(content.entries);
+        }
+        catch (e) {
+            if (log.isEnabled()) {
+                log.writeLine(`Error when loading types registry file '${typesRegistryFilePath}': ${(<Error>e).message}, ${(<Error>e).stack}`);
+            }
+            return createMap<void>();
+        }
+    }
+
+    const TypesRegistryPackageName = "types-registry";
+    function getTypesRegistryFileLocation(globalTypingsCacheLocation: string): string {
+        return combinePaths(normalizeSlashes(globalTypingsCacheLocation), `node_modules/${TypesRegistryPackageName}/index.json`);
+    }
+
+
     type Exec = {
         (command: string, options: { cwd: string }, callback?: (error: Error, stdout: string, stderr: string) => void): any
     };
 
+    type ExecSync = {
+        (command: string, options: { cwd: string, stdio: "ignore" }): any
+    };
+
     export class NodeTypingsInstaller extends TypingsInstaller {
         private readonly exec: Exec;
-        private readonly httpGet: HttpGet;
         private readonly npmPath: string;
-        readonly installTypingHost: InstallTypingHost = sys;
+        readonly typesRegistry: Map<void>;
 
-        constructor(globalTypingsCacheLocation: string, throttleLimit: number, log: Log) {
+        constructor(globalTypingsCacheLocation: string, throttleLimit: number, telemetryEnabled: boolean, log: Log) {
             super(
+                sys,
                 globalTypingsCacheLocation,
                 toPath("typingSafeList.json", __dirname, createGetCanonicalFileName(sys.useCaseSensitiveFileNames)),
                 throttleLimit,
+                telemetryEnabled,
                 log);
             if (this.log.isEnabled()) {
                 this.log.writeLine(`Process id: ${process.pid}`);
             }
             this.npmPath = getNPMLocation(process.argv[0]);
-            this.exec = require("child_process").exec;
-            this.httpGet = require("http").get;
+            let execSync: ExecSync;
+            ({ exec: this.exec, execSync } = require("child_process"));
+
+            this.ensurePackageDirectoryExists(globalTypingsCacheLocation);
+
+            try {
+                if (this.log.isEnabled()) {
+                    this.log.writeLine(`Updating ${TypesRegistryPackageName} npm package...`);
+                }
+                execSync(`${this.npmPath} install ${TypesRegistryPackageName}`, { cwd: globalTypingsCacheLocation, stdio: "ignore" });
+            }
+            catch (e) {
+                if (this.log.isEnabled()) {
+                    this.log.writeLine(`Error updating ${TypesRegistryPackageName} package: ${(<Error>e).message}`);
+                }
+            }
+
+            this.typesRegistry = loadTypesRegistryFile(getTypesRegistryFileLocation(globalTypingsCacheLocation), this.installTypingHost, this.log);
         }
 
-        init() {
-            super.init();
+        listen() {
             process.on("message", (req: DiscoverTypings | CloseProject) => {
                 switch (req.kind) {
                     case "discover":
@@ -90,66 +129,26 @@ namespace ts.server.typingsInstaller {
             }
         }
 
-        protected executeRequest(requestKind: RequestKind, requestId: number, args: string[], cwd: string, onRequestCompleted: RequestCompletedAction): void {
+        protected installWorker(requestId: number, args: string[], cwd: string, onRequestCompleted: RequestCompletedAction): void {
             if (this.log.isEnabled()) {
-                this.log.writeLine(`#${requestId} executing ${requestKind}, arguments'${JSON.stringify(args)}'.`);
-            }
-            switch (requestKind) {
-                case NpmViewRequest: {
-                        // const command = `${self.npmPath} view @types/${typing} --silent name`;
-                        // use http request to global npm registry instead of running npm view
-                        Debug.assert(args.length === 1);
-                        const url = `http://registry.npmjs.org/@types%2f${args[0]}`;
-                        const start = Date.now();
-                        this.httpGet(url, response => {
-                            let ok = false;
-                            if (this.log.isEnabled()) {
-                                this.log.writeLine(`${requestKind} #${requestId} request to ${url}:: status code ${response.statusCode}, status message '${response.statusMessage}', took ${Date.now() - start} ms`);
-                            }
-                            switch (response.statusCode) {
-                                case 200: // OK
-                                case 301: // redirect - Moved - treat package as present
-                                case 302: // redirect - Found - treat package as present
-                                    ok = true;
-                                    break;
-                            }
-                            response.destroy();
-                            onRequestCompleted(ok);
-                        }).on("error", (err: Error) => {
-                            if (this.log.isEnabled()) {
-                                this.log.writeLine(`${requestKind} #${requestId} query to npm registry failed with error ${err.message}, stack ${err.stack}`);
-                            }
-                            onRequestCompleted(/*success*/ false);
-                        });
-                    }
-                    break;
-                case NpmInstallRequest: {
-                        const command = `${this.npmPath} install ${args.join(" ")} --save-dev`;
-                        const start = Date.now();
-                        this.exec(command, { cwd }, (_err, stdout, stderr) => {
-                            if (this.log.isEnabled()) {
-                                this.log.writeLine(`${requestKind} #${requestId} took: ${Date.now() - start} ms${sys.newLine}stdout: ${stdout}${sys.newLine}stderr: ${stderr}`);
-                            }
-                            // treat any output on stdout as success
-                            onRequestCompleted(!!stdout);
-                        });
-                    }
-                    break;
-                default:
-                    Debug.assert(false, `Unknown request kind ${requestKind}`);
+                this.log.writeLine(`#${requestId} with arguments'${JSON.stringify(args)}'.`);
             }
+            const command = `${this.npmPath} install ${args.join(" ")} --save-dev`;
+            const start = Date.now();
+            this.exec(command, { cwd }, (_err, stdout, stderr) => {
+                if (this.log.isEnabled()) {
+                    this.log.writeLine(`npm install #${requestId} took: ${Date.now() - start} ms${sys.newLine}stdout: ${stdout}${sys.newLine}stderr: ${stderr}`);
+                }
+                // treat any output on stdout as success
+                onRequestCompleted(!!stdout);
+            });
         }
     }
 
-    function findArgument(argumentName: string) {
-        const index = sys.args.indexOf(argumentName);
-        return index >= 0 && index < sys.args.length - 1
-            ? sys.args[index + 1]
-            : undefined;
-    }
+    const logFilePath = findArgument(server.Arguments.LogFile);
+    const globalTypingsCacheLocation = findArgument(server.Arguments.GlobalCacheLocation);
+    const telemetryEnabled = hasArgument(server.Arguments.EnableTelemetry);
 
-    const logFilePath = findArgument("--logFile");
-    const globalTypingsCacheLocation = findArgument("--globalTypingsCacheLocation");
     const log = new FileLog(logFilePath);
     if (log.isEnabled()) {
         process.on("uncaughtException", (e: Error) => {
@@ -162,6 +161,6 @@ namespace ts.server.typingsInstaller {
         }
         process.exit(0);
     });
-    const installer = new NodeTypingsInstaller(globalTypingsCacheLocation, /*throttleLimit*/5, log);
-    installer.init();
+    const installer = new NodeTypingsInstaller(globalTypingsCacheLocation, /*throttleLimit*/5, telemetryEnabled, log);
+    installer.listen();
 }
\ No newline at end of file
diff --git a/src/server/typingsInstaller/tsconfig.json b/src/server/typingsInstaller/tsconfig.json
index c9b4d8f0ad1..c6031b19aae 100644
--- a/src/server/typingsInstaller/tsconfig.json
+++ b/src/server/typingsInstaller/tsconfig.json
@@ -17,6 +17,7 @@
     },
     "files": [
         "../types.d.ts",
+        "../shared.ts",
         "typingsInstaller.ts",
         "nodeTypingsInstaller.ts"
     ]
diff --git a/src/server/typingsInstaller/typingsInstaller.ts b/src/server/typingsInstaller/typingsInstaller.ts
index df043fc26ae..a602a9f1a26 100644
--- a/src/server/typingsInstaller/typingsInstaller.ts
+++ b/src/server/typingsInstaller/typingsInstaller.ts
@@ -2,6 +2,7 @@
 /// <reference path="../../compiler/moduleNameResolver.ts" />
 /// <reference path="../../services/jsTyping.ts"/>
 /// <reference path="../types.d.ts"/>
+/// <reference path="../shared.ts"/>
 
 namespace ts.server.typingsInstaller {
     interface NpmConfig {
@@ -63,14 +64,8 @@ namespace ts.server.typingsInstaller {
         return PackageNameValidationResult.Ok;
     }
 
-    export const NpmViewRequest: "npm view" = "npm view";
-    export const NpmInstallRequest: "npm install" = "npm install";
-
-    export type RequestKind = typeof NpmViewRequest | typeof NpmInstallRequest;
-
     export type RequestCompletedAction = (success: boolean) => void;
     type PendingRequest = {
-        requestKind: RequestKind;
         requestId: number;
         args: string[];
         cwd: string;
@@ -87,19 +82,18 @@ namespace ts.server.typingsInstaller {
         private installRunCount = 1;
         private inFlightRequestCount = 0;
 
-        abstract readonly installTypingHost: InstallTypingHost;
+        abstract readonly typesRegistry: Map<void>;
 
         constructor(
+            readonly installTypingHost: InstallTypingHost,
             readonly globalCachePath: string,
             readonly safeListPath: Path,
             readonly throttleLimit: number,
+            readonly telemetryEnabled: boolean,
             protected readonly log = nullLog) {
             if (this.log.isEnabled()) {
                 this.log.writeLine(`Global cache location '${globalCachePath}', safe file path '${safeListPath}'`);
             }
-        }
-
-        init() {
             this.processCacheLocation(this.globalCachePath);
         }
 
@@ -224,7 +218,7 @@ namespace ts.server.typingsInstaller {
             this.knownCachesSet[cacheLocation] = true;
         }
 
-        private filterTypings(typingsToInstall: string[]) {
+        private filterAndMapToScopedName(typingsToInstall: string[]) {
             if (typingsToInstall.length === 0) {
                 return typingsToInstall;
             }
@@ -235,7 +229,14 @@ namespace ts.server.typingsInstaller {
                 }
                 const validationResult = validatePackageName(typing);
                 if (validationResult === PackageNameValidationResult.Ok) {
-                    result.push(typing);
+                    if (typing in this.typesRegistry) {
+                        result.push(`@types/${typing}`);
+                    }
+                    else {
+                        if (this.log.isEnabled()) {
+                            this.log.writeLine(`Entry for package '${typing}' does not exist in local types registry - skipping...`);
+                        }
+                    }
                 }
                 else {
                     // add typing name to missing set so we won't process it again
@@ -267,19 +268,8 @@ namespace ts.server.typingsInstaller {
             return result;
         }
 
-        private installTypings(req: DiscoverTypings, cachePath: string, currentlyCachedTypings: string[], typingsToInstall: string[]) {
-            if (this.log.isEnabled()) {
-                this.log.writeLine(`Installing typings ${JSON.stringify(typingsToInstall)}`);
-            }
-            typingsToInstall = this.filterTypings(typingsToInstall);
-            if (typingsToInstall.length === 0) {
-                if (this.log.isEnabled()) {
-                    this.log.writeLine(`All typings are known to be missing or invalid - no need to go any further`);
-                }
-                return;
-            }
-
-            const npmConfigPath = combinePaths(cachePath, "package.json");
+        protected ensurePackageDirectoryExists(directory: string) {
+            const npmConfigPath = combinePaths(directory, "package.json");
             if (this.log.isEnabled()) {
                 this.log.writeLine(`Npm config file: ${npmConfigPath}`);
             }
@@ -287,23 +277,50 @@ namespace ts.server.typingsInstaller {
                 if (this.log.isEnabled()) {
                     this.log.writeLine(`Npm config file: '${npmConfigPath}' is missing, creating new one...`);
                 }
-                this.ensureDirectoryExists(cachePath, this.installTypingHost);
+                this.ensureDirectoryExists(directory, this.installTypingHost);
                 this.installTypingHost.writeFile(npmConfigPath, "{}");
             }
+        }
+
+        private installTypings(req: DiscoverTypings, cachePath: string, currentlyCachedTypings: string[], typingsToInstall: string[]) {
+            if (this.log.isEnabled()) {
+                this.log.writeLine(`Installing typings ${JSON.stringify(typingsToInstall)}`);
+            }
+            const scopedTypings = this.filterAndMapToScopedName(typingsToInstall);
+            if (scopedTypings.length === 0) {
+                if (this.log.isEnabled()) {
+                    this.log.writeLine(`All typings are known to be missing or invalid - no need to go any further`);
+                }
+                return;
+            }
+
+            this.ensurePackageDirectoryExists(cachePath);
+
+            const requestId = this.installRunCount;
+            this.installRunCount++;
+
+            this.installTypingsAsync(requestId, scopedTypings, cachePath, ok => {
+                if (this.telemetryEnabled) {
+                    this.sendResponse(<TypingsInstallEvent>{
+                        kind: EventInstall,
+                        packagesToInstall: scopedTypings
+                    });
+                }
+
+                if (!ok) {
+                    return;
+                }
 
-            this.runInstall(cachePath, typingsToInstall, installedTypings => {
                 // TODO: watch project directory
                 if (this.log.isEnabled()) {
-                    this.log.writeLine(`Requested to install typings ${JSON.stringify(typingsToInstall)}, installed typings ${JSON.stringify(installedTypings)}`);
+                    this.log.writeLine(`Requested to install typings ${JSON.stringify(scopedTypings)}, installed typings ${JSON.stringify(scopedTypings)}`);
                 }
-                const installedPackages: Map<true> = createMap<true>();
                 const installedTypingFiles: string[] = [];
-                for (const t of installedTypings) {
+                for (const t of scopedTypings) {
                     const packageName = getBaseFileName(t);
                     if (!packageName) {
                         continue;
                     }
-                    installedPackages[packageName] = true;
                     const typingFile = typingToFileName(cachePath, packageName, this.installTypingHost);
                     if (!typingFile) {
                         continue;
@@ -316,53 +333,11 @@ namespace ts.server.typingsInstaller {
                 if (this.log.isEnabled()) {
                     this.log.writeLine(`Installed typing files ${JSON.stringify(installedTypingFiles)}`);
                 }
-                for (const toInstall of typingsToInstall) {
-                    if (!installedPackages[toInstall]) {
-                        if (this.log.isEnabled()) {
-                            this.log.writeLine(`New missing typing package '${toInstall}'`);
-                        }
-                        this.missingTypingsSet[toInstall] = true;
-                    }
-                }
 
                 this.sendResponse(this.createSetTypings(req, currentlyCachedTypings.concat(installedTypingFiles)));
             });
         }
 
-        private runInstall(cachePath: string, typingsToInstall: string[], postInstallAction: (installedTypings: string[]) => void): void {
-            const requestId = this.installRunCount;
-
-            this.installRunCount++;
-            let execInstallCmdCount = 0;
-            const filteredTypings: string[] = [];
-            for (const typing of typingsToInstall) {
-                filterExistingTypings(this, typing);
-            }
-
-            function filterExistingTypings(self: TypingsInstaller, typing: string) {
-                self.execAsync(NpmViewRequest, requestId, [typing], cachePath, ok => {
-                    if (ok) {
-                        filteredTypings.push(typing);
-                    }
-                    execInstallCmdCount++;
-                    if (execInstallCmdCount === typingsToInstall.length) {
-                        installFilteredTypings(self, filteredTypings);
-                    }
-                });
-            }
-
-            function installFilteredTypings(self: TypingsInstaller, filteredTypings: string[]) {
-                if (filteredTypings.length === 0) {
-                    postInstallAction([]);
-                    return;
-                }
-                const scopedTypings = filteredTypings.map(t => "@types/" + t);
-                self.execAsync(NpmInstallRequest, requestId, scopedTypings, cachePath, ok => {
-                    postInstallAction(ok ? scopedTypings : []);
-                });
-            }
-        }
-
         private ensureDirectoryExists(directory: string, host: InstallTypingHost): void {
             const directoryName = getDirectoryPath(directory);
             if (!host.directoryExists(directoryName)) {
@@ -389,7 +364,7 @@ namespace ts.server.typingsInstaller {
                         this.log.writeLine(`Got FS notification for ${f}, handler is already invoked '${isInvoked}'`);
                     }
                     if (!isInvoked) {
-                        this.sendResponse({ projectName: projectName, kind: "invalidate" });
+                        this.sendResponse({ projectName: projectName, kind: server.ActionInvalidate });
                         isInvoked = true;
                     }
                 });
@@ -405,12 +380,12 @@ namespace ts.server.typingsInstaller {
                 compilerOptions: request.compilerOptions,
                 typings,
                 unresolvedImports: request.unresolvedImports,
-                kind: "set"
+                kind: server.ActionSet
             };
         }
 
-        private execAsync(requestKind: RequestKind, requestId: number, args: string[], cwd: string, onRequestCompleted: RequestCompletedAction): void {
-            this.pendingRunRequests.unshift({ requestKind, requestId, args, cwd, onRequestCompleted });
+        private installTypingsAsync(requestId: number, args: string[], cwd: string, onRequestCompleted: RequestCompletedAction): void {
+            this.pendingRunRequests.unshift({ requestId, args, cwd, onRequestCompleted });
             this.executeWithThrottling();
         }
 
@@ -418,7 +393,7 @@ namespace ts.server.typingsInstaller {
             while (this.inFlightRequestCount < this.throttleLimit && this.pendingRunRequests.length) {
                 this.inFlightRequestCount++;
                 const request = this.pendingRunRequests.pop();
-                this.executeRequest(request.requestKind, request.requestId, request.args, request.cwd, ok => {
+                this.installWorker(request.requestId, request.args, request.cwd, ok => {
                     this.inFlightRequestCount--;
                     request.onRequestCompleted(ok);
                     this.executeWithThrottling();
@@ -426,7 +401,7 @@ namespace ts.server.typingsInstaller {
             }
         }
 
-        protected abstract executeRequest(requestKind: RequestKind, requestId: number, args: string[], cwd: string, onRequestCompleted: RequestCompletedAction): void;
-        protected abstract sendResponse(response: SetTypings | InvalidateCachedTypings): void;
+        protected abstract installWorker(requestId: number, args: string[], cwd: string, onRequestCompleted: RequestCompletedAction): void;
+        protected abstract sendResponse(response: SetTypings | InvalidateCachedTypings | TypingsInstallEvent): void;
     }
 }
\ No newline at end of file
diff --git a/src/server/utilities.ts b/src/server/utilities.ts
index 8806b759e3f..9a832d22c8d 100644
--- a/src/server/utilities.ts
+++ b/src/server/utilities.ts
@@ -1,4 +1,5 @@
 /// <reference path="types.d.ts" />
+/// <reference path="shared.ts" />
 
 namespace ts.server {
     export enum LogLevel {
@@ -10,6 +11,7 @@ namespace ts.server {
 
     export const emptyArray: ReadonlyArray<any> = [];
 
+
     export interface Logger {
         close(): void;
         hasLevel(level: LogLevel): boolean;

From e1c50e1c406a27a505f4c8393a81f2b1232d51ae Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 7 Nov 2016 13:57:26 -0800
Subject: [PATCH 132/421] Address more PR comments

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 263ee47a6b7..8ac6b0f6471 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -4488,10 +4488,9 @@ namespace ts {
 
         function getPropertiesOfType(type: Type): Symbol[] {
             type = getApparentType(type);
-            if (type.flags & TypeFlags.UnionOrIntersection) {
-                return getPropertiesOfUnionOrIntersectionType(<UnionType>type);
-            }
-            return getPropertiesOfObjectType(type);
+            return type.flags & TypeFlags.UnionOrIntersection ?
+                getPropertiesOfUnionOrIntersectionType(<UnionType>type) :
+                getPropertiesOfObjectType(type);
         }
 
         /**
@@ -4581,9 +4580,6 @@ namespace ts {
             result.hasNonUniformType = hasNonUniformType;
             result.isPartial = isPartial;
             result.declarations = declarations;
-            if (declarations.length) {
-                result.valueDeclaration = declarations[0];
-            }
             result.isReadonly = isReadonly;
             result.type = containingType.flags & TypeFlags.Union ? getUnionType(propTypes) : getIntersectionType(propTypes);
             return result;
@@ -5057,7 +5053,7 @@ namespace ts {
             const declaration = getIndexDeclarationOfSymbol(symbol, kind);
             if (declaration) {
                 return createIndexInfo(declaration.type ? getTypeFromTypeNode(declaration.type) : anyType,
-                                       (getModifierFlags(declaration) & ModifierFlags.Readonly) !== 0, declaration);
+                    (getModifierFlags(declaration) & ModifierFlags.Readonly) !== 0, declaration);
             }
             return undefined;
         }
@@ -5926,9 +5922,6 @@ namespace ts {
                         result.leftSpread = leftProp;
                         result.rightSpread = rightProp;
                         result.declarations = declarations;
-                        if (declarations.length) {
-                            result.valueDeclaration = declarations[0];
-                        }
                         result.isReadonly = isReadonlySymbol(leftProp) || isReadonlySymbol(rightProp);
                         members[leftProp.name] = result;
                     }
@@ -15196,11 +15189,9 @@ namespace ts {
             forEach(node.members, checkSourceElement);
             if (produceDiagnostics) {
                 const type = getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node);
-                if (type.flags & TypeFlags.Object) {
-                    checkIndexConstraints(type);
-                    checkTypeForDuplicateIndexSignatures(node);
-                    checkObjectTypeForDuplicateDeclarations(node);
-                }
+                checkIndexConstraints(type);
+                checkTypeForDuplicateIndexSignatures(node);
+                checkObjectTypeForDuplicateDeclarations(node);
             }
         }
 
@@ -17259,7 +17250,7 @@ namespace ts {
                 // perform property check if property or indexer is declared in 'type'
                 // this allows to rule out cases when both property and indexer are inherited from the base class
                 let errorNode: Node;
-                    if (prop.valueDeclaration.name.kind === SyntaxKind.ComputedPropertyName || prop.parent === containingType.symbol) {
+                if (prop.valueDeclaration.name.kind === SyntaxKind.ComputedPropertyName || prop.parent === containingType.symbol) {
                     errorNode = prop.valueDeclaration;
                 }
                 else if (indexDeclaration) {
@@ -20538,7 +20529,7 @@ namespace ts {
                     continue;
                 }
                 const name = prop.name;
-                if (name && name.kind === SyntaxKind.ComputedPropertyName) {
+                if (name.kind === SyntaxKind.ComputedPropertyName) {
                     // If the name is not a ComputedPropertyName, the grammar checking will skip it
                     checkGrammarComputedPropertyName(<ComputedPropertyName>name);
                 }

From 0173a3fa790ca49b74d609c410c77d363e18229d Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Mon, 7 Nov 2016 15:48:46 -0800
Subject: [PATCH 133/421] return empty file watcher in case if target directory
 does not exist (#12091)

* return empty file watcher in case if target directory does not exist

* linter
---
 src/compiler/sys.ts                           |  3 ++-
 .../unittests/tsserverProjectSystem.ts        | 27 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index 13bbfc2ab15..9cf95d6de9b 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -439,6 +439,7 @@ namespace ts {
                 return filter<string>(_fs.readdirSync(path), dir => fileSystemEntryExists(combinePaths(path, dir), FileSystemEntryKind.Directory));
             }
 
+            const noOpFileWatcher: FileWatcher = { close: noop };
             const nodeSystem: System = {
                 args: process.argv.slice(2),
                 newLine: _os.EOL,
@@ -475,7 +476,7 @@ namespace ts {
                     // (ref: https://github.com/nodejs/node/pull/2649 and https://github.com/Microsoft/TypeScript/issues/4643)
                     let options: any;
                     if (!directoryExists(directoryName)) {
-                        return;
+                        return noOpFileWatcher;
                     }
 
                     if (isNode4OrLater() && (process.platform === "win32" || process.platform === "darwin")) {
diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
index ee6139b1215..c3974f03772 100644
--- a/src/harness/unittests/tsserverProjectSystem.ts
+++ b/src/harness/unittests/tsserverProjectSystem.ts
@@ -1964,6 +1964,33 @@ namespace ts.projectSystem {
             projectService.checkNumberOfProjects({ configuredProjects: 1 });
             checkProjectActualFiles(projectService.configuredProjects[0], [libES5.path, libES2015Promise.path, app.path]);
         });
+
+        it("should handle non-existing directories in config file", () => {
+            const f = {
+                path: "/a/src/app.ts",
+                content: "let x = 1;"
+            };
+            const config = {
+                path: "/a/tsconfig.json",
+                content: JSON.stringify({
+                    compilerOptions: {},
+                    include: [
+                        "src/**/*",
+                        "notexistingfolder/*"
+                    ]
+                })
+            };
+            const host = createServerHost([f, config]);
+            const projectService = createProjectService(host);
+            projectService.openClientFile(f.path);
+            projectService.checkNumberOfProjects({ configuredProjects: 1 });
+
+            projectService.closeClientFile(f.path);
+            projectService.checkNumberOfProjects({ configuredProjects: 0 });
+
+            projectService.openClientFile(f.path);
+            projectService.checkNumberOfProjects({ configuredProjects: 1 });
+        });
     });
 
     describe("prefer typings to js", () => {

From be2e8e85d63f472a5a7762e1e56316026156317c Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Mon, 7 Nov 2016 15:49:19 -0800
Subject: [PATCH 134/421] property handle missing config files in external
 projects (#12094)

---
 .../unittests/tsserverProjectSystem.ts        | 21 +++++++++++++++++++
 src/server/editorServices.ts                  |  4 +++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
index c3974f03772..62c0957d6a3 100644
--- a/src/harness/unittests/tsserverProjectSystem.ts
+++ b/src/harness/unittests/tsserverProjectSystem.ts
@@ -2249,6 +2249,27 @@ namespace ts.projectSystem {
             assert.equal(diags.length, 0);
         });
 
+        it("should property handle missing config files", () => {
+            const f1 = {
+                path: "/a/b/app.ts",
+                content: "let x = 1"
+            };
+            const config = {
+                path: "/a/b/tsconfig.json",
+                content: "{}"
+            };
+            const projectName = "project1";
+            const host = createServerHost([f1]);
+            const projectService = createProjectService(host);
+            projectService.openExternalProject({ rootFiles: toExternalFiles([f1.path, config.path]), options: {}, projectFileName: projectName });
+
+            // should have one external project since config file is missing
+            projectService.checkNumberOfProjects({ externalProjects: 1 });
+
+            host.reloadFS([f1, config]);
+            projectService.openExternalProject({ rootFiles: toExternalFiles([f1.path, config.path]), options: {}, projectFileName: projectName });
+            projectService.checkNumberOfProjects({ configuredProjects: 1 });
+        });
     });
 
     describe("add the missing module file for inferred project", () => {
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index bf760106b74..269eea06464 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -1288,7 +1288,9 @@ namespace ts.server {
             for (const file of proj.rootFiles) {
                 const normalized = toNormalizedPath(file.fileName);
                 if (getBaseFileName(normalized) === "tsconfig.json") {
-                    (tsConfigFiles || (tsConfigFiles = [])).push(normalized);
+                    if (this.host.fileExists(normalized)) {
+                        (tsConfigFiles || (tsConfigFiles = [])).push(normalized);
+                    }
                 }
                 else {
                     rootFiles.push(file);

From ddc4ae7eac9526b5dbd6624f89a2f0308b32b425 Mon Sep 17 00:00:00 2001
From: Ron Buckton <ron.buckton@microsoft.com>
Date: Mon, 7 Nov 2016 16:03:04 -0800
Subject: [PATCH 135/421] Reuse subtree transform flags for incrementally
 parsed nodes (#12088)

---
 src/compiler/binder.ts                     | 66 +++++++++++++++++++++-
 src/compiler/visitor.ts                    | 60 --------------------
 src/harness/unittests/incrementalParser.ts | 24 +++++---
 src/services/services.ts                   |  2 -
 4 files changed, 81 insertions(+), 71 deletions(-)

diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index 1d721e2db90..112a53e88ec 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -560,6 +560,7 @@ namespace ts {
                 skipTransformFlagAggregation = true;
                 bindChildrenWorker(node);
                 skipTransformFlagAggregation = false;
+                subtreeTransformFlags |= node.transformFlags & ~getTransformFlagsSubtreeExclusions(node.kind);
             }
             else {
                 const savedSubtreeTransformFlags = subtreeTransformFlags;
@@ -895,8 +896,8 @@ namespace ts {
             const enclosingLabeledStatement = node.parent.kind === SyntaxKind.LabeledStatement
                 ? lastOrUndefined(activeLabels)
                 : undefined;
-            // if do statement is wrapped in labeled statement then target labels for break/continue with or without 
-            // label should be the same 
+            // if do statement is wrapped in labeled statement then target labels for break/continue with or without
+            // label should be the same
             const preConditionLabel = enclosingLabeledStatement ? enclosingLabeledStatement.continueTarget : createBranchLabel();
             const postDoLabel = enclosingLabeledStatement ? enclosingLabeledStatement.breakTarget : createBranchLabel();
             addAntecedent(preDoLabel, currentFlow);
@@ -3206,4 +3207,65 @@ namespace ts {
         node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
         return transformFlags & ~excludeFlags;
     }
+
+    /**
+     * Gets the transform flags to exclude when unioning the transform flags of a subtree.
+     *
+     * NOTE: This needs to be kept up-to-date with the exclusions used in `computeTransformFlagsForNode`.
+     *       For performance reasons, `computeTransformFlagsForNode` uses local constant values rather
+     *       than calling this function.
+     */
+    /* @internal */
+    export function getTransformFlagsSubtreeExclusions(kind: SyntaxKind) {
+        if (kind >= SyntaxKind.FirstTypeNode && kind <= SyntaxKind.LastTypeNode) {
+            return TransformFlags.TypeExcludes;
+        }
+
+        switch (kind) {
+            case SyntaxKind.CallExpression:
+            case SyntaxKind.NewExpression:
+            case SyntaxKind.ArrayLiteralExpression:
+                return TransformFlags.ArrayLiteralOrCallOrNewExcludes;
+            case SyntaxKind.ModuleDeclaration:
+                return TransformFlags.ModuleExcludes;
+            case SyntaxKind.Parameter:
+                return TransformFlags.ParameterExcludes;
+            case SyntaxKind.ArrowFunction:
+                return TransformFlags.ArrowFunctionExcludes;
+            case SyntaxKind.FunctionExpression:
+            case SyntaxKind.FunctionDeclaration:
+                return TransformFlags.FunctionExcludes;
+            case SyntaxKind.VariableDeclarationList:
+                return TransformFlags.VariableDeclarationListExcludes;
+            case SyntaxKind.ClassDeclaration:
+            case SyntaxKind.ClassExpression:
+                return TransformFlags.ClassExcludes;
+            case SyntaxKind.Constructor:
+                return TransformFlags.ConstructorExcludes;
+            case SyntaxKind.MethodDeclaration:
+            case SyntaxKind.GetAccessor:
+            case SyntaxKind.SetAccessor:
+                return TransformFlags.MethodOrAccessorExcludes;
+            case SyntaxKind.AnyKeyword:
+            case SyntaxKind.NumberKeyword:
+            case SyntaxKind.NeverKeyword:
+            case SyntaxKind.StringKeyword:
+            case SyntaxKind.BooleanKeyword:
+            case SyntaxKind.SymbolKeyword:
+            case SyntaxKind.VoidKeyword:
+            case SyntaxKind.TypeParameter:
+            case SyntaxKind.PropertySignature:
+            case SyntaxKind.MethodSignature:
+            case SyntaxKind.CallSignature:
+            case SyntaxKind.ConstructSignature:
+            case SyntaxKind.IndexSignature:
+            case SyntaxKind.InterfaceDeclaration:
+            case SyntaxKind.TypeAliasDeclaration:
+                return TransformFlags.TypeExcludes;
+            case SyntaxKind.ObjectLiteralExpression:
+                return TransformFlags.ObjectLiteralExcludes;
+            default:
+                return TransformFlags.NodeExcludes;
+        }
+    }
 }
diff --git a/src/compiler/visitor.ts b/src/compiler/visitor.ts
index 45b82a6a08a..34cc2e07436 100644
--- a/src/compiler/visitor.ts
+++ b/src/compiler/visitor.ts
@@ -1270,66 +1270,6 @@ namespace ts {
         return transformFlags | aggregateTransformFlagsForNode(child);
     }
 
-    /**
-     * Gets the transform flags to exclude when unioning the transform flags of a subtree.
-     *
-     * NOTE: This needs to be kept up-to-date with the exclusions used in `computeTransformFlagsForNode`.
-     *       For performance reasons, `computeTransformFlagsForNode` uses local constant values rather
-     *       than calling this function.
-     */
-    function getTransformFlagsSubtreeExclusions(kind: SyntaxKind) {
-        if (kind >= SyntaxKind.FirstTypeNode && kind <= SyntaxKind.LastTypeNode) {
-            return TransformFlags.TypeExcludes;
-        }
-
-        switch (kind) {
-            case SyntaxKind.CallExpression:
-            case SyntaxKind.NewExpression:
-            case SyntaxKind.ArrayLiteralExpression:
-                return TransformFlags.ArrayLiteralOrCallOrNewExcludes;
-            case SyntaxKind.ModuleDeclaration:
-                return TransformFlags.ModuleExcludes;
-            case SyntaxKind.Parameter:
-                return TransformFlags.ParameterExcludes;
-            case SyntaxKind.ArrowFunction:
-                return TransformFlags.ArrowFunctionExcludes;
-            case SyntaxKind.FunctionExpression:
-            case SyntaxKind.FunctionDeclaration:
-                return TransformFlags.FunctionExcludes;
-            case SyntaxKind.VariableDeclarationList:
-                return TransformFlags.VariableDeclarationListExcludes;
-            case SyntaxKind.ClassDeclaration:
-            case SyntaxKind.ClassExpression:
-                return TransformFlags.ClassExcludes;
-            case SyntaxKind.Constructor:
-                return TransformFlags.ConstructorExcludes;
-            case SyntaxKind.MethodDeclaration:
-            case SyntaxKind.GetAccessor:
-            case SyntaxKind.SetAccessor:
-                return TransformFlags.MethodOrAccessorExcludes;
-            case SyntaxKind.AnyKeyword:
-            case SyntaxKind.NumberKeyword:
-            case SyntaxKind.NeverKeyword:
-            case SyntaxKind.StringKeyword:
-            case SyntaxKind.BooleanKeyword:
-            case SyntaxKind.SymbolKeyword:
-            case SyntaxKind.VoidKeyword:
-            case SyntaxKind.TypeParameter:
-            case SyntaxKind.PropertySignature:
-            case SyntaxKind.MethodSignature:
-            case SyntaxKind.CallSignature:
-            case SyntaxKind.ConstructSignature:
-            case SyntaxKind.IndexSignature:
-            case SyntaxKind.InterfaceDeclaration:
-            case SyntaxKind.TypeAliasDeclaration:
-                return TransformFlags.TypeExcludes;
-            case SyntaxKind.ObjectLiteralExpression:
-                return TransformFlags.ObjectLiteralExcludes;
-            default:
-                return TransformFlags.NodeExcludes;
-        }
-    }
-
     export namespace Debug {
         export const failNotOptional = shouldAssert(AssertionLevel.Normal)
             ? (message?: string) => assert(false, message || "Node not optional.")
diff --git a/src/harness/unittests/incrementalParser.ts b/src/harness/unittests/incrementalParser.ts
index 0082207e699..6088e5fe082 100644
--- a/src/harness/unittests/incrementalParser.ts
+++ b/src/harness/unittests/incrementalParser.ts
@@ -44,10 +44,10 @@ namespace ts {
 
     // NOTE: 'reusedElements' is the expected count of elements reused from the old tree to the new
     // tree.  It may change as we tweak the parser.  If the count increases then that should always
-    // be a good thing.  If it decreases, that's not great (less reusability), but that may be 
-    // unavoidable.  If it does decrease an investigation should be done to make sure that things 
+    // be a good thing.  If it decreases, that's not great (less reusability), but that may be
+    // unavoidable.  If it does decrease an investigation should be done to make sure that things
     // are still ok and we're still appropriately reusing most of the tree.
-    function compareTrees(oldText: IScriptSnapshot, newText: IScriptSnapshot, textChangeRange: TextChangeRange, expectedReusedElements: number, oldTree?: SourceFile): SourceFile {
+    function compareTrees(oldText: IScriptSnapshot, newText: IScriptSnapshot, textChangeRange: TextChangeRange, expectedReusedElements: number, oldTree?: SourceFile) {
         oldTree = oldTree || createTree(oldText, /*version:*/ ".");
         Utils.assertInvariants(oldTree, /*parent:*/ undefined);
 
@@ -76,7 +76,7 @@ namespace ts {
             assert.equal(actualReusedCount, expectedReusedElements, actualReusedCount + " !== " + expectedReusedElements);
         }
 
-        return incrementalNewTree;
+        return { oldTree, newTree, incrementalNewTree };
     }
 
     function reusedElements(oldNode: SourceFile, newNode: SourceFile): number {
@@ -103,7 +103,7 @@ namespace ts {
         for (let i = 0; i < repeat; i++) {
             const oldText = ScriptSnapshot.fromString(source);
             const newTextAndChange = withDelete(oldText, index, 1);
-            const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree);
+            const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree).incrementalNewTree;
 
             source = newTextAndChange.text.getText(0, newTextAndChange.text.getLength());
             oldTree = newTree;
@@ -116,7 +116,7 @@ namespace ts {
         for (let i = 0; i < repeat; i++) {
             const oldText = ScriptSnapshot.fromString(source);
             const newTextAndChange = withInsert(oldText, index + i, toInsert.charAt(i));
-            const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree);
+            const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree).incrementalNewTree;
 
             source = newTextAndChange.text.getText(0, newTextAndChange.text.getLength());
             oldTree = newTree;
@@ -639,7 +639,7 @@ module m3 { }\
         });
 
         it("Unterminated comment after keyword converted to identifier", () => {
-            // 'public' as a keyword should be incrementally unusable (because it has an 
+            // 'public' as a keyword should be incrementally unusable (because it has an
             // unterminated comment).  When we convert it to an identifier, that shouldn't
             // change anything, and we should still get the same errors.
             const source = "return; a.public /*";
@@ -796,6 +796,16 @@ module m3 { }\
             compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, 4);
         });
 
+        it("Reuse transformFlags of subtree during bind", () => {
+            const source = `class Greeter { constructor(element: HTMLElement) { } }`;
+            const oldText = ScriptSnapshot.fromString(source);
+            const newTextAndChange = withChange(oldText, 15, 0, "\n");
+            const { oldTree, incrementalNewTree } = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1);
+            bindSourceFile(oldTree, {});
+            bindSourceFile(incrementalNewTree, {});
+            assert.equal(oldTree.transformFlags, incrementalNewTree.transformFlags);
+        });
+
         // Simulated typing tests.
 
         it("Type extends clause 1", () => {
diff --git a/src/services/services.ts b/src/services/services.ts
index 8abcf8f7684..56e604abeb3 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -48,7 +48,6 @@ namespace ts {
         public jsDocComments: JSDoc[];
         public original: Node;
         public transformFlags: TransformFlags;
-        public excludeTransformFlags: TransformFlags;
         private _children: Node[];
 
         constructor(kind: SyntaxKind, pos: number, end: number) {
@@ -56,7 +55,6 @@ namespace ts {
             this.end = end;
             this.flags = NodeFlags.None;
             this.transformFlags = undefined;
-            this.excludeTransformFlags = undefined;
             this.parent = undefined;
             this.kind = kind;
         }

From 2bf38ab6cd6a2321b2422a503573d492115d3457 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Mon, 7 Nov 2016 21:09:17 -0800
Subject: [PATCH 136/421] Port fix for
 https://github.com/Microsoft/TypeScript/issues/12069 (#12095)

---
 src/lib/dom.generated.d.ts       | 4 ++--
 src/lib/webworker.generated.d.ts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/dom.generated.d.ts b/src/lib/dom.generated.d.ts
index 9a87020d4f0..fd77f369fd8 100644
--- a/src/lib/dom.generated.d.ts
+++ b/src/lib/dom.generated.d.ts
@@ -7586,7 +7586,7 @@ declare var IDBCursorWithValue: {
 
 interface IDBDatabase extends EventTarget {
     readonly name: string;
-    readonly objectStoreNames: string[];
+    readonly objectStoreNames: DOMStringList;
     onabort: (this: this, ev: Event) => any;
     onerror: (this: this, ev: ErrorEvent) => any;
     version: number;
@@ -7652,7 +7652,7 @@ declare var IDBKeyRange: {
 }
 
 interface IDBObjectStore {
-    readonly indexNames: string[];
+    readonly indexNames: DOMStringList;
     keyPath: string | string[];
     readonly name: string;
     readonly transaction: IDBTransaction;
diff --git a/src/lib/webworker.generated.d.ts b/src/lib/webworker.generated.d.ts
index 4aeba696306..130510334d6 100644
--- a/src/lib/webworker.generated.d.ts
+++ b/src/lib/webworker.generated.d.ts
@@ -341,7 +341,7 @@ declare var IDBCursorWithValue: {
 
 interface IDBDatabase extends EventTarget {
     readonly name: string;
-    readonly objectStoreNames: string[];
+    readonly objectStoreNames: DOMStringList;
     onabort: (this: this, ev: Event) => any;
     onerror: (this: this, ev: ErrorEvent) => any;
     version: number;
@@ -407,7 +407,7 @@ declare var IDBKeyRange: {
 }
 
 interface IDBObjectStore {
-    readonly indexNames: string[];
+    readonly indexNames: DOMStringList;
     keyPath: string | string[];
     readonly name: string;
     readonly transaction: IDBTransaction;

From 9e3d6efb199520ac66529b933e549e432cd1776c Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Mon, 7 Nov 2016 21:13:11 -0800
Subject: [PATCH 137/421] reduce set of files being watched, increase polling
 interval (#12054) (#12092)

---
 src/compiler/program.ts                         |  7 ++++++-
 src/compiler/sys.ts                             | 10 +++++++---
 src/compiler/types.ts                           |  1 +
 src/server/project.ts                           | 12 +++++++++---
 src/server/types.d.ts                           |  2 +-
 src/server/typingsInstaller/typingsInstaller.ts |  2 +-
 src/server/utilities.ts                         |  2 +-
 src/services/jsTyping.ts                        |  2 +-
 8 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index dcb9cce0adb..1b36d99d7c9 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -420,6 +420,7 @@ namespace ts {
             getTypeCount: () => getDiagnosticsProducingTypeChecker().getTypeCount(),
             getFileProcessingDiagnostics: () => fileProcessingDiagnostics,
             getResolvedTypeReferenceDirectives: () => resolvedTypeReferenceDirectives,
+            isSourceFileFromExternalLibrary,
             dropDiagnosticsProducingTypeChecker
         };
 
@@ -722,13 +723,17 @@ namespace ts {
                 getSourceFile: program.getSourceFile,
                 getSourceFileByPath: program.getSourceFileByPath,
                 getSourceFiles: program.getSourceFiles,
-                isSourceFileFromExternalLibrary: (file: SourceFile) => !!sourceFilesFoundSearchingNodeModules[file.path],
+                isSourceFileFromExternalLibrary,
                 writeFile: writeFileCallback || (
                     (fileName, data, writeByteOrderMark, onError, sourceFiles) => host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles)),
                 isEmitBlocked,
             };
         }
 
+        function isSourceFileFromExternalLibrary(file: SourceFile): boolean {
+            return sourceFilesFoundSearchingNodeModules[file.path];
+        }
+
         function getDiagnosticsProducingTypeChecker() {
             return diagnosticsProducingTypeChecker || (diagnosticsProducingTypeChecker = createTypeChecker(program, /*produceDiagnostics:*/ true));
         }
diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index 9cf95d6de9b..a1e82a66595 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -17,7 +17,11 @@ namespace ts {
         readFile(path: string, encoding?: string): string;
         getFileSize?(path: string): number;
         writeFile(path: string, data: string, writeByteOrderMark?: boolean): void;
-        watchFile?(path: string, callback: FileWatcherCallback): FileWatcher;
+        /**
+         * @pollingInterval - this parameter is used in polling-based watchers and ignored in watchers that 
+         * use native OS file watching
+         */
+        watchFile?(path: string, callback: FileWatcherCallback, pollingInterval?: number): FileWatcher;
         watchDirectory?(path: string, callback: DirectoryWatcherCallback, recursive?: boolean): FileWatcher;
         resolvePath(path: string): string;
         fileExists(path: string): boolean;
@@ -449,7 +453,7 @@ namespace ts {
                 },
                 readFile,
                 writeFile,
-                watchFile: (fileName, callback) => {
+                watchFile: (fileName, callback, pollingInterval) => {
                     if (useNonPollingWatchers) {
                         const watchedFile = watchedFileSet.addFile(fileName, callback);
                         return {
@@ -457,7 +461,7 @@ namespace ts {
                         };
                     }
                     else {
-                        _fs.watchFile(fileName, { persistent: true, interval: 250 }, fileChanged);
+                        _fs.watchFile(fileName, { persistent: true, interval: pollingInterval || 250 }, fileChanged);
                         return {
                             close: () => _fs.unwatchFile(fileName, fileChanged)
                         };
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 37a3cc466a0..aa0b3e505f6 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -2192,6 +2192,7 @@ namespace ts {
 
         /* @internal */ getFileProcessingDiagnostics(): DiagnosticCollection;
         /* @internal */ getResolvedTypeReferenceDirectives(): Map<ResolvedTypeReferenceDirective>;
+        /* @internal */ isSourceFileFromExternalLibrary(file: SourceFile): boolean;
         // For testing purposes only.
         /* @internal */ structureIsReused?: boolean;
     }
diff --git a/src/server/project.ts b/src/server/project.ts
index 563b0456910..d01df728248 100644
--- a/src/server/project.ts
+++ b/src/server/project.ts
@@ -301,7 +301,7 @@ namespace ts.server {
             return this.getLanguageService().getEmitOutput(info.fileName, emitOnlyDtsFiles);
         }
 
-        getFileNames() {
+        getFileNames(excludeFilesFromExternalLibraries?: boolean) {
             if (!this.program) {
                 return [];
             }
@@ -317,8 +317,14 @@ namespace ts.server {
                 }
                 return rootFiles;
             }
-            const sourceFiles = this.program.getSourceFiles();
-            return sourceFiles.map(sourceFile => asNormalizedPath(sourceFile.fileName));
+            const result: NormalizedPath[] = [];
+            for (const f of this.program.getSourceFiles()) {
+                if (excludeFilesFromExternalLibraries && this.program.isSourceFileFromExternalLibrary(f)) {
+                    continue;
+                }
+                result.push(asNormalizedPath(f.fileName));
+            }
+            return result;
         }
 
         getAllEmittableFiles() {
diff --git a/src/server/types.d.ts b/src/server/types.d.ts
index 95f9519cc38..aebc3121252 100644
--- a/src/server/types.d.ts
+++ b/src/server/types.d.ts
@@ -73,6 +73,6 @@ declare namespace ts.server {
     export interface InstallTypingHost extends JsTyping.TypingResolutionHost {
         writeFile(path: string, content: string): void;
         createDirectory(path: string): void;
-        watchFile?(path: string, callback: FileWatcherCallback): FileWatcher;
+        watchFile?(path: string, callback: FileWatcherCallback, pollingInterval?: number): FileWatcher;
     }
 }
\ No newline at end of file
diff --git a/src/server/typingsInstaller/typingsInstaller.ts b/src/server/typingsInstaller/typingsInstaller.ts
index a602a9f1a26..da97dbcd194 100644
--- a/src/server/typingsInstaller/typingsInstaller.ts
+++ b/src/server/typingsInstaller/typingsInstaller.ts
@@ -367,7 +367,7 @@ namespace ts.server.typingsInstaller {
                         this.sendResponse({ projectName: projectName, kind: server.ActionInvalidate });
                         isInvoked = true;
                     }
-                });
+                }, /*pollingInterval*/ 2000);
                 watchers.push(w);
             }
             this.projectWatchers[projectName] = watchers;
diff --git a/src/server/utilities.ts b/src/server/utilities.ts
index 9a832d22c8d..ac809652119 100644
--- a/src/server/utilities.ts
+++ b/src/server/utilities.ts
@@ -50,7 +50,7 @@ namespace ts.server {
     export function createInstallTypingsRequest(project: Project, typingOptions: TypingOptions, unresolvedImports: SortedReadonlyArray<string>, cachePath?: string): DiscoverTypings {
         return {
             projectName: project.getProjectName(),
-            fileNames: project.getFileNames(),
+            fileNames: project.getFileNames(/*excludeFilesFromExternalLibraries*/ true),
             compilerOptions: project.getCompilerOptions(),
             typingOptions,
             unresolvedImports,
diff --git a/src/services/jsTyping.ts b/src/services/jsTyping.ts
index 0f635c15174..316dcd355c2 100644
--- a/src/services/jsTyping.ts
+++ b/src/services/jsTyping.ts
@@ -88,7 +88,7 @@ namespace ts.JsTyping {
         exclude = typingOptions.exclude || [];
 
         const possibleSearchDirs = map(fileNames, getDirectoryPath);
-        if (projectRootPath !== undefined) {
+        if (projectRootPath) {
             possibleSearchDirs.push(projectRootPath);
         }
         searchDirs = deduplicate(possibleSearchDirs);

From 84f8f8bba89ff459180852179c31ea7e9105736d Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Mon, 7 Nov 2016 21:58:53 -0800
Subject: [PATCH 138/421] Update authors for release-2.1

---
 .mailmap   | 43 ++++++++++++++++++++++++++++++++++++-------
 AUTHORS.md | 32 +++++++++++++++++++++++++++++++-
 2 files changed, 67 insertions(+), 8 deletions(-)

diff --git a/.mailmap b/.mailmap
index e66f669b8ee..cc101c0517e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,32 +1,38 @@
 
-Alexander <alexander@kuvaev.me># Alexander Kuvaev
 AbubakerB <abubaker_bashir@hotmail.com> # Abubaker Bashir
+Alexander <alexander@kuvaev.me># Alexander Kuvaev
 Adam Freidin <adam.freidin@gmail.com> Adam Freidin <afreidin@adobe.com>
 Adi Dahiya <adahiya@palantir.com> Adi Dahiya <adi.dahiya14@gmail.com>
 Ahmad Farid <ahfarid@microsoft.com> ahmad-farid <ahfarid@microsoft.com>
+Alexander Rusakov  <a_s_rusakov@mail.ru>
 Alex Eagle <alexeagle@google.com>
+Anatoly Ressin  <anatoly.ressin@icloud.com>
 Anders Hejlsberg <andersh@microsoft.com> unknown <andersh@AndersX1.NOE.Nokia.com> unknown <andersh@andersh-yoga.redmond.corp.microsoft.com>
+Andrej Baran  <andrej.baran@gmail.com>
 Andrew Z Allen <me@andrewzallen.com>
 Andy Hanson <anhans@microsoft.com> Andy <anhans@microsoft.com>
 Anil Anar <anilanar@hotmail.com>
 Anton Tolmachev <myste@mail.ru>
 Arnavion <arnavion@gmail.com> # Arnav Singh
-Arthur Ozga <aozgaa@umich.edu> Arthur Ozga <t-arthoz@microsoft.com>
+Arthur Ozga <aozgaa@umich.edu> Arthur Ozga <t-arthoz@microsoft.com> Arthur Ozga  <aozgaa-ms@outlook.com> Arthur Ozga  <aozgaa@users.noreply.github.com> Arthur Ozga  <arozga@microsoft.com>
 Asad Saeeduddin <masaeedu@gmail.com>
 Schmavery <avery.schmavery@gmail.com> # Avery Morin
 Basarat Ali Syed <basaratali@gmail.com> Basarat Syed <basaratali@gmail.com> basarat <basaratali@gmail.com>
 Bill Ticehurst <billti@hotmail.com> Bill Ticehurst <billti@microsoft.com>
 Ben Duffield <jebavarde@gmail.com>
+Ben Mosher  <me@benmosher.com>
 Blake Embrey <hello@blakeembrey.com>
 Bowden Kelly <wilkelly@microsoft.com>
 Brett Mayen <bmayen@midnightsnacks.net>
 Bryan Forbes <bryan@reigndropsfall.net>
 Caitlin Potter <caitpotter88@gmail.com>
 ChrisBubernak <chris.bubernak@gmail.com> unknown <chrbub@chrbub1.redmond.corp.microsoft.com> # Chris Bubernak
+Christophe Vidal  <kriss@krizalys.com>
 Chuck Jazdzewski <chuckj@google.com>
 Colby Russell <mr@colbyrussell.com>
 Colin Snover <github.com@zetafleet.com>
 Cyrus Najmabadi <cyrusn@microsoft.com> CyrusNajmabadi <cyrusn@microsoft.com> unknown <cyrusn@cylap.ntdev.corp.microsoft.com>
+Dafrok  <o.o@mug.dog> # Dafrok Zhang
 Dan Corder <dev@dancorder.com>
 Dan Quirk <danquirk@microsoft.com> Dan Quirk <danquirk@users.noreply.github.com> nknown <danquirk@DANQUIRK1.redmond.corp.microsoft.com>
 Daniel Rosenwasser <drosen@microsoft.com> Daniel Rosenwasser <DanielRosenwasser@users.noreply.github.com> Daniel Rosenwasser <DanielRosenwasser@gmail.com> Daniel Rosenwasser <Daniel.Rosenwasser@microsoft.com> Daniel Rosenwasser <DanielRosenwasser@microsoft.com>
@@ -36,17 +42,22 @@ Denis Nedelyaev <denvned@gmail.com>
 Dick van den Brink <d_vandenbrink@outlook.com> unknown <d_vandenbrink@outlook.com> unknown <d_vandenbrink@live.com>
 Dirk Baeumer <dirkb@microsoft.com> Dirk Bäumer <dirkb@microsoft.com> # Dirk Bäumer
 Dirk Holtwick <dirk.holtwick@gmail.com>
+Dom Chen  <domchen@users.noreply.github.com>
 Doug Ilijev <dilijev@users.noreply.github.com>
 Erik Edrosa <erik.edrosa@gmail.com>
+erictsangx  <erictsangx@gmail.com> # Eric Tsang
 Ethan Rubio <ethanrubio@users.noreply.github.com>
 Evan Martin <martine@danga.com>
 Evan Sebastian <evanlhoini@gmail.com>
 Eyas <eyas.sharaiha@gmail.com> # Eyas Sharaiha
+Fabian Cook  <faybecook@gmail.com>
 falsandtru <falsandtru@users.noreply.github.com> # @falsandtru
 Frank Wallis <fwallis@outlook.com>
-František Žiačik <fziacik@gratex.com> František Žiačik <ziacik@gmail.com>
+František Žiacik <fziacik@gratex.com> František Žiacik <ziacik@gmail.com>
+Gabe Moothart  <gmoothart@gmail.com>
 Gabriel Isenberg <gisenberg@gmail.com>
 Gilad Peleg <giladp007@gmail.com>
+Godfrey Chan  <godfreykfc@gmail.com>
 Graeme Wicksted <graeme.wicksted@gmail.com>
 Guillaume Salles <guillaume.salles@me.com>
 Guy Bedford <guybedford@gmail.com> guybedford <guybedford@gmail.com>
@@ -55,6 +66,7 @@ Iain Monro <iain.monro@softwire.com>
 Ingvar Stepanyan <me@rreverser.com>
 impinball <impinball@gmail.com> # Isiah Meadows
 Ivo Gabe de Wolff <ivogabe@ivogabe.nl>
+Jakub Młokosiewicz  <hckr@users.noreply.github.com>
 James Whitney <james@whitney.io>
 Jason Freeman <jfreeman@microsoft.com> Jason Freeman <JsonFreeman@users.noreply.github.com>
 Jason Killian <jkillian@palantir.com>
@@ -69,11 +81,14 @@ Jonathan Park <jpark@daptiv.com>
 Jonathan Turner <jont@microsoft.com> Jonathan Turner <probata@hotmail.com>
 Jonathan Toland <toland@dnalot.com>
 Jesse Schalken <me@jesseschalken.com>
+Josh Abernathy  <joshaber@gmail.com> joshaber  <joshaber@gmail.com>
 Josh Kalderimis <josh.kalderimis@gmail.com>
 Josh Soref <jsoref@users.noreply.github.com>
 Juan Luis Boya García <ntrrgc@gmail.com>
 Julian Williams <julianjw92@gmail.com>
-Herrington Darkholme <nonamesheep1@gmail.com>
+Justin Bay  <justin.bay@outlook.com>
+Justin Johansson  <thebabellion@gmail.com>
+Herrington Darkholme <nonamesheep1@gmail.com> (´·?·`)  <HerringtonDarkholme@users.noreply.github.com> # Herrington Darkholme
 Kagami Sascha Rosylight <saschanaz@outlook.com> SaschaNaz <saschanaz@outlook.com>
 Kanchalai Tanglertsampan <yuisu@microsoft.com> Yui <yuit@users.noreply.github.com>
 Kanchalai Tanglertsampan <yuisu@microsoft.com> Yui T <yuisu@microsoft.com>
@@ -82,23 +97,29 @@ Kanchalai Tanglertsampan <yuisu@microsoft.com> Yui <yuisu@microsoft.com>
 Kanchalai Tanglertsampan <yuisu@microsoft.com> yui T <yuisu@microsoft.com>
 Keith Mashinter <kmashint@yahoo.com> kmashint <kmashint@yahoo.com>
 Ken Howard <ken@simplicatedweb.com>
+Kevin Lang  <klang2012@gmail.com>
 kimamula <kenji.imamula@gmail.com> # Kenji Imamula
 Kyle Kelley <rgbkrk@gmail.com>
 Lorant Pinter <lorant.pinter@prezi.com>
 Lucien Greathouse <me@lpghatguy.com>
+Lukas Elmer  <lukas.elmer@gmail.com> Lukas Elmer  <lukas.elmer@renuo.ch>
 Martin Vseticka <vseticka.martin@gmail.com> Martin Všeticka <vseticka.martin@gmail.com> MartyIX <vseticka.martin@gmail.com>
+gcnew  <gcnew@abv.bg> # Marin Marinov
 vvakame <vvakame+dev@gmail.com> # Masahiro Wakame
 Matt McCutchen <rmccutch@mit.edu>
 Max Deepfield <maxdeepfield@absolutefreakout.com>
 Micah Zoltu <micah@zoltu.net>
+Michael  <maykelchiche@gmail.com>
 Mohamed Hegazy <mhegazy@microsoft.com>
 Nathan Shively-Sanders <nathansa@microsoft.com>
 Nathan Yee <ny.nathan.yee@gmail.com>
 Nima Zahedi <nima.zahedee@gmail.com>
+Noah Chen  <nchen@palantir.com>
 Noj Vek <nojvek@gmail.com>
 mihailik <mihailik@gmail.com> # Oleg Mihailik
 Oleksandr Chekhovskyi <oleksandr.chekhovskyi@hansoft.com>
 Paul van Brenk <paul.van.brenk@microsoft.com> Paul van Brenk <paul.van.brenk@outlook.com> unknown <paul.van.brenk@microsoft.com> unknown <paul.van.brenk@microsoft.com>	unknown <pvanbren@pvbvsproai.redmond.corp.microsoft.com>
+Omer Sheikh  <ojsheikh@gmail.com>
 Oskar Segersva¨rd <oskar.segersvard@widespace.com>
 pcan <piero.cangianiello@gmail.com> # Piero Cangianiello
 pcbro <2bux89+dk3zspjmuh16o@sharklasers.com> # @pcbro
@@ -109,21 +130,26 @@ progre <djyayutto@gmail.com> # @progre
 Prayag Verma <prayag.verma@gmail.com>
 Punya Biswal <pbiswal@palantir.com>
 Rado Kirov <radokirov@google.com>
-Ron Buckton <rbuckton@microsoft.com> Ron Buckton <ron.buckton@microsoft.com>
+Ron Buckton <rbuckton@microsoft.com> Ron Buckton <ron.buckton@microsoft.com> rbuckton  <rbuckton@chronicles.org>
+Rostislav Galimsky  <rostgal@gmail.com>
 Richard Knoll <riknoll@users.noreply.github.com> Richard Knoll <riknoll@microsoft.com>
 Rowan Wyborn <rwyborn@internode.on.net>
 Ryan Cavanaugh <RyanCavanaugh@users.noreply.github.com> Ryan Cavanaugh <ryan.cavanaugh@microsoft.com> Ryan Cavanaugh <ryanca@microsoft.com>
 Ryohei Ikegami <iofg2100@gmail.com>
 Sarangan Rajamanickam <sarajama@microsoft.com>
 Sébastien Arod <sebastien.arod@gmail.com>
+Sergey Shandar  <sergey-shandar@users.noreply.github.com>
 Sheetal Nandi <shkamat@microsoft.com>
 Shengping Zhong <zhongsp@users.noreply.github.com>
 shyyko.serhiy@gmail.com <shyyko.serhiy@gmail.com> # Shyyko Serhiy
+Sam El-Husseini  <samelh@microsoft.com>
 Simon Hürlimann <simon.huerlimann@cyt.ch>
+Slawomir Sadziak  <slsadzia@microsoft.com>
 Solal Pirelli <solal.pirelli@gmail.com>
 Stan Thomas <stmsdn@norvil.net>
 Stanislav Sysoev <d4rkr00t@gmail.com>
 Steve Lucco <steveluc@users.noreply.github.com> steveluc <steveluc@microsoft.com>
+Sudheesh Singanamalla  <sudheesh1995@outlook.com>
 Tarik <tarik@pushmote.com> # Tarik Ozket
 Tetsuharu OHZEKI <saneyuki.snyk@gmail.com> # Tetsuharu Ohzeki
 Tien Nguyen <tihoanh@microsoft.com> tien <hoanhtien@users.noreply.github.com> unknown <tihoanh@microsoft.com> #Tien Hoanhtien
@@ -133,6 +159,7 @@ Tingan Ho <tingan87@gmail.com>
 togru <v3nomzxgt8@gmail.com> # togru
 Tomas Grubliauskas <tgrubliauskas@gmail.com>
 ToddThomson <achilles@telus.net> # Todd Thomson
+Torben Fitschen  <torben.fitschen@mayflower.de>
 TruongSinh Tran-Nguyen <i@truongsinh.pro>
 vilicvane <i@vilic.info> # Vilic Vane
 Vladimir Matveev <vladima@microsoft.com> vladima <vladima@microsoft.com> v2m <desco.by@gmail.com>
@@ -140,7 +167,9 @@ Wesley Wigham <t-weswig@microsoft.com> Wesley Wigham <wwigham@gmail.com>
 York Yao <plantain-00@users.noreply.github.com> york yao <yaoao12306@outlook.com> yaoyao <yaoyao12306@163.com>
 Yuichi Nukiyama <oscar.wilde84@hotmail.co.jp> YuichiNukiyama <oscar.wilde84@hotmail.co.jp>
 Zev Spitz <shivisi@etrog.net.il>
-Zhengbo Li <zhengbli@microsoft.com> zhengbli <zhengbli@microsoft.com> Zhengbo Li <Zhengbo Li> Zhengbo Li <zhengbli@mirosoft.com> tinza123 <li.zhengbo@outlook.com> unknown <zhengbli@zhengblit430.redmond.corp.microsoft.com> Zhengbo Li <Zhengbo Li>
+Zhengbo Li <zhengbli@microsoft.com> zhengbli <zhengbli@microsoft.com> Zhengbo Li <Zhengbo Li> Zhengbo Li <zhengbli@mirosoft.com> tinza123 <li.zhengbo@outlook.com> unknown <zhengbli@zhengblit430.redmond.corp.microsoft.com> Zhengbo Li <Zhengbo Li> zhengbli  <zhengli@microsoft.com>
 zhongsp <patrick.zhongsp@gmail.com> # Patrick Zhong
 T18970237136 <T18970237136@users.noreply.github.com> # @T18970237136
-JBerger <JBerger@melco.com>
\ No newline at end of file
+JBerger <JBerger@melco.com>
+bootstraponline  <code@bootstraponline.com> # @bootstraponline
+yortus  <yortus@gmail.com> # @yortus
\ No newline at end of file
diff --git a/AUTHORS.md b/AUTHORS.md
index 08039127d9d..50f1ea12c2b 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -5,7 +5,10 @@ TypeScript is authored by:
 * Ahmad Farid
 * Alex Eagle
 * Alexander Kuvaev
+* Alexander Rusakov 
+* Anatoly Ressin 
 * Anders Hejlsberg
+* Andrej Baran 
 * Andrew Z Allen
 * Andy Hanson
 * Anil Anar
@@ -16,17 +19,21 @@ TypeScript is authored by:
 * Avery Morin
 * Basarat Ali Syed
 * Ben Duffield
+* Ben Mosher 
 * Bill Ticehurst
 * Blake Embrey
+* @bootstraponline
 * Bowden Kelly
 * Brett Mayen
 * Bryan Forbes
 * Caitlin Potter
 * Chris Bubernak
+* Christophe Vidal 
 * Chuck Jazdzewski
 * Colby Russell
 * Colin Snover
 * Cyrus Najmabadi
+* Dafrok Zhang
 * Dan Corder
 * Dan Quirk
 * Daniel Rosenwasser
@@ -36,17 +43,22 @@ TypeScript is authored by:
 * Dick van den Brink
 * Dirk Bäumer
 * Dirk Holtwick
+* Dom Chen 
 * Doug Ilijev
+* Eric Tsang
 * Erik Edrosa
 * Ethan Rubio
 * Evan Martin
 * Evan Sebastian
 * Eyas Sharaiha
+* Fabian Cook 
 * @falsandtru
 * Frank Wallis
-* František Žiačik
+* František Žiacik
+* Gabe Moothart 
 * Gabriel Isenberg
 * Gilad Peleg
+* Godfrey Chan 
 * Graeme Wicksted
 * Guillaume Salles
 * Guy Bedford
@@ -56,6 +68,7 @@ TypeScript is authored by:
 * Ingvar Stepanyan
 * Isiah Meadows
 * Ivo Gabe de Wolff
+* Jakub Młokosiewicz 
 * James Whitney
 * Jason Freeman
 * Jason Killian
@@ -71,30 +84,39 @@ TypeScript is authored by:
 * Jonathan Park
 * Jonathan Toland
 * Jonathan Turner
+* Josh Abernathy 
 * Josh Kalderimis
 * Josh Soref
 * Juan Luis Boya García
 * Julian Williams
+* Justin Bay 
+* Justin Johansson 
 * Kagami Sascha Rosylight
 * Kanchalai Tanglertsampan
 * Keith Mashinter
 * Ken Howard
 * Kenji Imamula
+* Kevin Lang 
 * Kyle Kelley
 * Lorant Pinter
 * Lucien Greathouse
+* Lukas Elmer 
+* Marin Marinov
 * Martin Vseticka
 * Masahiro Wakame
 * Matt McCutchen
 * Max Deepfield
 * Micah Zoltu
+* Michael 
 * Mohamed Hegazy
 * Nathan Shively-Sanders
 * Nathan Yee
 * Nima Zahedi
+* Noah Chen 
 * Noj Vek
 * Oleg Mihailik
 * Oleksandr Chekhovskyi
+* Omer Sheikh 
 * Oskar Segersva¨rd
 * Patrick Zhong
 * Paul van Brenk
@@ -109,21 +131,27 @@ TypeScript is authored by:
 * Rado Kirov
 * Richard Knoll
 * Ron Buckton
+* Rostislav Galimsky 
 * Rowan Wyborn
 * Ryan Cavanaugh
 * Ryohei Ikegami
+* Sam El-Husseini 
 * Sarangan Rajamanickam
+* Sergey Shandar 
 * Sheetal Nandi
 * Shengping Zhong
 * Shyyko Serhiy
 * Simon Hürlimann
+* Slawomir Sadziak 
 * Solal Pirelli
 * Stan Thomas
 * Stanislav Sysoev
 * Steve Lucco
+* Sudheesh Singanamalla 
 * Sébastien Arod
 * @T18970237136
 * Tarik Ozket
+* Tetsuharu Ohzeki
 * Tien Hoanhtien
 * Tim Perry
 * Tim Viiding-Spader
@@ -131,11 +159,13 @@ TypeScript is authored by:
 * Todd Thomson
 * togru
 * Tomas Grubliauskas
+* Torben Fitschen 
 * TruongSinh Tran-Nguyen
 * Vilic Vane
 * Vladimir Matveev
 * Wesley Wigham
 * York Yao
+* @yortus
 * Yuichi Nukiyama
 * Zev Spitz
 * Zhengbo Li
\ No newline at end of file

From be0358cc0cff88b0e5b05e656735da80a052c0f6 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Tue, 8 Nov 2016 06:09:41 -0800
Subject: [PATCH 139/421] Include declaration file emit

---
 .../reference/instantiatedTypeAliasDisplay.js | 15 ++++
 .../instantiatedTypeAliasDisplay.symbols      | 75 ++++++++++---------
 .../instantiatedTypeAliasDisplay.types        |  1 +
 .../compiler/instantiatedTypeAliasDisplay.ts  |  2 +
 4 files changed, 56 insertions(+), 37 deletions(-)

diff --git a/tests/baselines/reference/instantiatedTypeAliasDisplay.js b/tests/baselines/reference/instantiatedTypeAliasDisplay.js
index 86b17262e0f..9c2b91b613e 100644
--- a/tests/baselines/reference/instantiatedTypeAliasDisplay.js
+++ b/tests/baselines/reference/instantiatedTypeAliasDisplay.js
@@ -1,4 +1,5 @@
 //// [instantiatedTypeAliasDisplay.ts]
+
 // Repros from #12066
 
 interface X<A> {
@@ -19,3 +20,17 @@ const x2 = f2({}, {}, {}, {});  // Z<{}, string[]>
 // Repros from #12066
 var x1 = f1(); // Z<string, number>
 var x2 = f2({}, {}, {}, {}); // Z<{}, string[]>
+
+
+//// [instantiatedTypeAliasDisplay.d.ts]
+interface X<A> {
+    a: A;
+}
+interface Y<B> {
+    b: B;
+}
+declare type Z<A, B> = X<A> | Y<B>;
+declare function f1<A>(): Z<A, number>;
+declare function f2<A, B, C, D, E>(a: A, b: B, c: C, d: D): Z<A, string[]>;
+declare const x1: Z<string, number>;
+declare const x2: Z<{}, string[]>;
diff --git a/tests/baselines/reference/instantiatedTypeAliasDisplay.symbols b/tests/baselines/reference/instantiatedTypeAliasDisplay.symbols
index 3c6f7d2b725..fa8140cfcd7 100644
--- a/tests/baselines/reference/instantiatedTypeAliasDisplay.symbols
+++ b/tests/baselines/reference/instantiatedTypeAliasDisplay.symbols
@@ -1,60 +1,61 @@
 === tests/cases/compiler/instantiatedTypeAliasDisplay.ts ===
+
 // Repros from #12066
 
 interface X<A> {
 >X : Symbol(X, Decl(instantiatedTypeAliasDisplay.ts, 0, 0))
->A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 2, 12))
+>A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 3, 12))
 
     a: A;
->a : Symbol(X.a, Decl(instantiatedTypeAliasDisplay.ts, 2, 16))
->A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 2, 12))
+>a : Symbol(X.a, Decl(instantiatedTypeAliasDisplay.ts, 3, 16))
+>A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 3, 12))
 }
 interface Y<B> {
->Y : Symbol(Y, Decl(instantiatedTypeAliasDisplay.ts, 4, 1))
->B : Symbol(B, Decl(instantiatedTypeAliasDisplay.ts, 5, 12))
+>Y : Symbol(Y, Decl(instantiatedTypeAliasDisplay.ts, 5, 1))
+>B : Symbol(B, Decl(instantiatedTypeAliasDisplay.ts, 6, 12))
 
     b: B;
->b : Symbol(Y.b, Decl(instantiatedTypeAliasDisplay.ts, 5, 16))
->B : Symbol(B, Decl(instantiatedTypeAliasDisplay.ts, 5, 12))
+>b : Symbol(Y.b, Decl(instantiatedTypeAliasDisplay.ts, 6, 16))
+>B : Symbol(B, Decl(instantiatedTypeAliasDisplay.ts, 6, 12))
 }
 type Z<A, B> = X<A> | Y<B>;
->Z : Symbol(Z, Decl(instantiatedTypeAliasDisplay.ts, 7, 1))
->A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 8, 7))
->B : Symbol(B, Decl(instantiatedTypeAliasDisplay.ts, 8, 9))
+>Z : Symbol(Z, Decl(instantiatedTypeAliasDisplay.ts, 8, 1))
+>A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 9, 7))
+>B : Symbol(B, Decl(instantiatedTypeAliasDisplay.ts, 9, 9))
 >X : Symbol(X, Decl(instantiatedTypeAliasDisplay.ts, 0, 0))
->A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 8, 7))
->Y : Symbol(Y, Decl(instantiatedTypeAliasDisplay.ts, 4, 1))
->B : Symbol(B, Decl(instantiatedTypeAliasDisplay.ts, 8, 9))
+>A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 9, 7))
+>Y : Symbol(Y, Decl(instantiatedTypeAliasDisplay.ts, 5, 1))
+>B : Symbol(B, Decl(instantiatedTypeAliasDisplay.ts, 9, 9))
 
 declare function f1<A>(): Z<A, number>;
->f1 : Symbol(f1, Decl(instantiatedTypeAliasDisplay.ts, 8, 27))
->A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 10, 20))
->Z : Symbol(Z, Decl(instantiatedTypeAliasDisplay.ts, 7, 1))
->A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 10, 20))
+>f1 : Symbol(f1, Decl(instantiatedTypeAliasDisplay.ts, 9, 27))
+>A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 11, 20))
+>Z : Symbol(Z, Decl(instantiatedTypeAliasDisplay.ts, 8, 1))
+>A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 11, 20))
 
 declare function f2<A, B, C, D, E>(a: A, b: B, c: C, d: D): Z<A, string[]>;
->f2 : Symbol(f2, Decl(instantiatedTypeAliasDisplay.ts, 10, 39))
->A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 11, 20))
->B : Symbol(B, Decl(instantiatedTypeAliasDisplay.ts, 11, 22))
->C : Symbol(C, Decl(instantiatedTypeAliasDisplay.ts, 11, 25))
->D : Symbol(D, Decl(instantiatedTypeAliasDisplay.ts, 11, 28))
->E : Symbol(E, Decl(instantiatedTypeAliasDisplay.ts, 11, 31))
->a : Symbol(a, Decl(instantiatedTypeAliasDisplay.ts, 11, 35))
->A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 11, 20))
->b : Symbol(b, Decl(instantiatedTypeAliasDisplay.ts, 11, 40))
->B : Symbol(B, Decl(instantiatedTypeAliasDisplay.ts, 11, 22))
->c : Symbol(c, Decl(instantiatedTypeAliasDisplay.ts, 11, 46))
->C : Symbol(C, Decl(instantiatedTypeAliasDisplay.ts, 11, 25))
->d : Symbol(d, Decl(instantiatedTypeAliasDisplay.ts, 11, 52))
->D : Symbol(D, Decl(instantiatedTypeAliasDisplay.ts, 11, 28))
->Z : Symbol(Z, Decl(instantiatedTypeAliasDisplay.ts, 7, 1))
->A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 11, 20))
+>f2 : Symbol(f2, Decl(instantiatedTypeAliasDisplay.ts, 11, 39))
+>A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 12, 20))
+>B : Symbol(B, Decl(instantiatedTypeAliasDisplay.ts, 12, 22))
+>C : Symbol(C, Decl(instantiatedTypeAliasDisplay.ts, 12, 25))
+>D : Symbol(D, Decl(instantiatedTypeAliasDisplay.ts, 12, 28))
+>E : Symbol(E, Decl(instantiatedTypeAliasDisplay.ts, 12, 31))
+>a : Symbol(a, Decl(instantiatedTypeAliasDisplay.ts, 12, 35))
+>A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 12, 20))
+>b : Symbol(b, Decl(instantiatedTypeAliasDisplay.ts, 12, 40))
+>B : Symbol(B, Decl(instantiatedTypeAliasDisplay.ts, 12, 22))
+>c : Symbol(c, Decl(instantiatedTypeAliasDisplay.ts, 12, 46))
+>C : Symbol(C, Decl(instantiatedTypeAliasDisplay.ts, 12, 25))
+>d : Symbol(d, Decl(instantiatedTypeAliasDisplay.ts, 12, 52))
+>D : Symbol(D, Decl(instantiatedTypeAliasDisplay.ts, 12, 28))
+>Z : Symbol(Z, Decl(instantiatedTypeAliasDisplay.ts, 8, 1))
+>A : Symbol(A, Decl(instantiatedTypeAliasDisplay.ts, 12, 20))
 
 const x1 = f1<string>();  // Z<string, number>
->x1 : Symbol(x1, Decl(instantiatedTypeAliasDisplay.ts, 13, 5))
->f1 : Symbol(f1, Decl(instantiatedTypeAliasDisplay.ts, 8, 27))
+>x1 : Symbol(x1, Decl(instantiatedTypeAliasDisplay.ts, 14, 5))
+>f1 : Symbol(f1, Decl(instantiatedTypeAliasDisplay.ts, 9, 27))
 
 const x2 = f2({}, {}, {}, {});  // Z<{}, string[]>
->x2 : Symbol(x2, Decl(instantiatedTypeAliasDisplay.ts, 14, 5))
->f2 : Symbol(f2, Decl(instantiatedTypeAliasDisplay.ts, 10, 39))
+>x2 : Symbol(x2, Decl(instantiatedTypeAliasDisplay.ts, 15, 5))
+>f2 : Symbol(f2, Decl(instantiatedTypeAliasDisplay.ts, 11, 39))
 
diff --git a/tests/baselines/reference/instantiatedTypeAliasDisplay.types b/tests/baselines/reference/instantiatedTypeAliasDisplay.types
index 44885777e74..89320e1dba6 100644
--- a/tests/baselines/reference/instantiatedTypeAliasDisplay.types
+++ b/tests/baselines/reference/instantiatedTypeAliasDisplay.types
@@ -1,4 +1,5 @@
 === tests/cases/compiler/instantiatedTypeAliasDisplay.ts ===
+
 // Repros from #12066
 
 interface X<A> {
diff --git a/tests/cases/compiler/instantiatedTypeAliasDisplay.ts b/tests/cases/compiler/instantiatedTypeAliasDisplay.ts
index d2abaaf8afe..8f7500e7830 100644
--- a/tests/cases/compiler/instantiatedTypeAliasDisplay.ts
+++ b/tests/cases/compiler/instantiatedTypeAliasDisplay.ts
@@ -1,3 +1,5 @@
+// @declaration: true
+
 // Repros from #12066
 
 interface X<A> {

From 8aef1e6bb14a05401468f9107245615cc8c2dd2b Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Tue, 8 Nov 2016 06:55:35 -0800
Subject: [PATCH 140/421] Type inference for mapped types

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index c0228a97eaf..8349f985f58 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -5941,7 +5941,7 @@ namespace ts {
             if (!links.resolvedType) {
                 const typeParameter = getDeclaredTypeOfTypeParameter(getSymbolOfNode(node.typeParameter));
                 const constraintType = getConstraintOfTypeParameter(typeParameter);
-                const keyType = constraintType && constraintType.flags & TypeFlags.TypeParameter ? getApparentType(constraintType) : constraintType;
+                const keyType = constraintType && constraintType.flags & TypeFlags.TypeParameter ? getApparentTypeOfTypeParameter(<TypeParameter>constraintType) : constraintType;
                 if (keyType && (keyType.flags & TypeFlags.Index || checkTypeAssignableTo(keyType, stringOrNumberType, node.typeParameter.constraint))) {
                     const type = <MappedType>createObjectType(ObjectFlags.Mapped, node.symbol);
                     type.typeParameter = typeParameter;
@@ -8117,9 +8117,11 @@ namespace ts {
         // we perform type inference (i.e. a type parameter of a generic function). We cache
         // results for union and intersection types for performance reasons.
         function couldContainTypeParameters(type: Type): boolean {
+            const objectFlags = getObjectFlags(type);
             return !!(type.flags & TypeFlags.TypeParameter ||
-                getObjectFlags(type) & ObjectFlags.Reference && forEach((<TypeReference>type).typeArguments, couldContainTypeParameters) ||
-                getObjectFlags(type) & ObjectFlags.Anonymous && type.symbol && type.symbol.flags & (SymbolFlags.Method | SymbolFlags.TypeLiteral | SymbolFlags.Class) ||
+                objectFlags & ObjectFlags.Reference && forEach((<TypeReference>type).typeArguments, couldContainTypeParameters) ||
+                objectFlags & ObjectFlags.Anonymous && type.symbol && type.symbol.flags & (SymbolFlags.Method | SymbolFlags.TypeLiteral | SymbolFlags.Class) ||
+                objectFlags & ObjectFlags.Mapped ||
                 type.flags & TypeFlags.UnionOrIntersection && couldUnionOrIntersectionContainTypeParameters(<UnionOrIntersectionType>type));
         }
 
@@ -8267,6 +8269,19 @@ namespace ts {
                     }
                 }
                 else {
+                    if (getObjectFlags(target) & ObjectFlags.Mapped) {
+                        const constraintType = getConstraintTypeFromMappedType(<MappedType>target);
+                        if (getObjectFlags(source) & ObjectFlags.Mapped) {
+                            inferFromTypes(getConstraintTypeFromMappedType(<MappedType>source), constraintType);
+                            inferFromTypes(getTemplateTypeFromMappedType(<MappedType>source), getTemplateTypeFromMappedType(<MappedType>target));
+                            return;
+                        }
+                        if (constraintType.flags & TypeFlags.TypeParameter) {
+                            inferFromTypes(getIndexType(source), constraintType);
+                            inferFromTypes(getUnionType(map(getPropertiesOfType(source), getTypeOfSymbol)), getTemplateTypeFromMappedType(<MappedType>target));
+                            return;
+                        }
+                    }
                     source = getApparentType(source);
                     if (source.flags & TypeFlags.Object) {
                         if (isInProcess(source, target)) {

From 1c64615e32466d0e9f71a112939df6b7a566c2bb Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Tue, 8 Nov 2016 06:56:24 -0800
Subject: [PATCH 141/421] Allow a path mapping to provide a file extension

---
 src/compiler/core.ts                          | 15 ++++++-
 src/compiler/moduleNameResolver.ts            | 15 ++++---
 ...pingBasedModuleResolution_withExtension.js | 16 ++++++++
 ...asedModuleResolution_withExtension.symbols |  9 ++++
 ...dModuleResolution_withExtension.trace.json | 11 +++++
 ...gBasedModuleResolution_withExtension.types |  9 ++++
 ...tion_withExtension_failedLookup.errors.txt |  9 ++++
 ...leResolution_withExtension_failedLookup.js |  7 ++++
 ...tion_withExtension_failedLookup.trace.json | 41 +++++++++++++++++++
 ...pingBasedModuleResolution_withExtension.ts | 18 ++++++++
 ...leResolution_withExtension_failedLookup.ts | 15 +++++++
 11 files changed, 157 insertions(+), 8 deletions(-)
 create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js
 create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.symbols
 create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.trace.json
 create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.types
 create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.errors.txt
 create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.js
 create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.trace.json
 create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution_withExtension.ts
 create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution_withExtension_failedLookup.ts

diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index 8175730159b..ded186691de 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -2210,6 +2210,17 @@ namespace ts {
      * Path must have a valid extension.
      */
     export function extensionFromPath(path: string): Extension {
+        const ts = tryGetTypeScriptExtensionFromPath(path);
+        if (ts !== undefined) {
+            return ts;
+        }
+        const js = tryGetJavaScriptExtensionFromPath(path);
+        if (js !== undefined) {
+            return js;
+        }
+        Debug.fail(`File ${path} has unknown extension.`);
+    }
+    export function tryGetTypeScriptExtensionFromPath(path: string): Extension | undefined {
         if (fileExtensionIs(path, ".d.ts")) {
             return Extension.Dts;
         }
@@ -2219,13 +2230,13 @@ namespace ts {
         if (fileExtensionIs(path, ".tsx")) {
             return Extension.Tsx;
         }
+    }
+    function tryGetJavaScriptExtensionFromPath(path: string): Extension | undefined {
         if (fileExtensionIs(path, ".js")) {
             return Extension.Js;
         }
         if (fileExtensionIs(path, ".jsx")) {
             return Extension.Jsx;
         }
-        Debug.fail(`File ${path} has unknown extension.`);
-        return Extension.Js;
     }
 }
diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
index 86e0157d847..831a19c4000 100644
--- a/src/compiler/moduleNameResolver.ts
+++ b/src/compiler/moduleNameResolver.ts
@@ -514,18 +514,21 @@ namespace ts {
             if (state.traceEnabled) {
                 trace(state.host, Diagnostics.Module_name_0_matched_pattern_1, moduleName, matchedPatternText);
             }
-            for (const subst of state.compilerOptions.paths[matchedPatternText]) {
+            return forEach(state.compilerOptions.paths[matchedPatternText], subst => {
                 const path = matchedStar ? subst.replace("*", matchedStar) : subst;
                 const candidate = normalizePath(combinePaths(state.compilerOptions.baseUrl, path));
                 if (state.traceEnabled) {
                     trace(state.host, Diagnostics.Trying_substitution_0_candidate_module_location_Colon_1, subst, path);
                 }
-                const resolved = loader(extensions, candidate, failedLookupLocations, !directoryProbablyExists(getDirectoryPath(candidate), state.host), state);
-                if (resolved) {
-                    return resolved;
+                // A path mapping may have a ".ts" extension; in contrast to an import, which should omit it.
+                const tsExtension = tryGetTypeScriptExtensionFromPath(candidate);
+                if (tsExtension !== undefined) {
+                    const path = tryFile(candidate, failedLookupLocations, /*onlyRecordFailures*/false, state);
+                    return path && { path, extension: tsExtension };
                 }
-            }
-            return undefined;
+
+                return loader(extensions, candidate, failedLookupLocations, !directoryProbablyExists(getDirectoryPath(candidate), state.host), state);
+            });
         }
         else {
             const candidate = normalizePath(combinePaths(state.compilerOptions.baseUrl, moduleName));
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js
new file mode 100644
index 00000000000..7ed0026a050
--- /dev/null
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js
@@ -0,0 +1,16 @@
+//// [tests/cases/compiler/pathMappingBasedModuleResolution_withExtension.ts] ////
+
+//// [foo.ts]
+
+export function foo() {}
+
+//// [a.ts]
+import { foo } from "foo";
+
+
+//// [foo.js]
+"use strict";
+function foo() { }
+exports.foo = foo;
+//// [a.js]
+"use strict";
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.symbols
new file mode 100644
index 00000000000..0adeab146cd
--- /dev/null
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.symbols
@@ -0,0 +1,9 @@
+=== /a.ts ===
+import { foo } from "foo";
+>foo : Symbol(foo, Decl(a.ts, 0, 8))
+
+=== /foo/foo.ts ===
+
+export function foo() {}
+>foo : Symbol(foo, Decl(foo.ts, 0, 0))
+
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.trace.json
new file mode 100644
index 00000000000..56c03de869e
--- /dev/null
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.trace.json
@@ -0,0 +1,11 @@
+[
+    "======== Resolving module 'foo' from '/a.ts'. ========",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "'baseUrl' option is set to '/', using this value to resolve non-relative module name 'foo'",
+    "'paths' option is specified, looking for a pattern to match module name 'foo'.",
+    "Module name 'foo', matched pattern 'foo'.",
+    "Trying substitution 'foo/foo.ts', candidate module location: 'foo/foo.ts'.",
+    "File '/foo/foo.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/foo/foo.ts', result '/foo/foo.ts'",
+    "======== Module name 'foo' was successfully resolved to '/foo/foo.ts'. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.types b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.types
new file mode 100644
index 00000000000..0bc686d64e5
--- /dev/null
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.types
@@ -0,0 +1,9 @@
+=== /a.ts ===
+import { foo } from "foo";
+>foo : () => void
+
+=== /foo/foo.ts ===
+
+export function foo() {}
+>foo : () => void
+
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.errors.txt
new file mode 100644
index 00000000000..7578f730c33
--- /dev/null
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.errors.txt
@@ -0,0 +1,9 @@
+/a.ts(2,21): error TS2307: Cannot find module 'foo'.
+
+
+==== /a.ts (1 errors) ====
+    
+    import { foo } from "foo";
+                        ~~~~~
+!!! error TS2307: Cannot find module 'foo'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.js b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.js
new file mode 100644
index 00000000000..1774876911f
--- /dev/null
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.js
@@ -0,0 +1,7 @@
+//// [a.ts]
+
+import { foo } from "foo";
+
+
+//// [a.js]
+"use strict";
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.trace.json
new file mode 100644
index 00000000000..17e78176f4c
--- /dev/null
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.trace.json
@@ -0,0 +1,41 @@
+[
+    "======== Resolving module 'foo' from '/a.ts'. ========",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "'baseUrl' option is set to '/', using this value to resolve non-relative module name 'foo'",
+    "'paths' option is specified, looking for a pattern to match module name 'foo'.",
+    "Module name 'foo', matched pattern 'foo'.",
+    "Trying substitution 'foo/foo.ts', candidate module location: 'foo/foo.ts'.",
+    "File '/foo/foo.ts' does not exist.",
+    "Loading module 'foo' from 'node_modules' folder.",
+    "File '/node_modules/foo.ts' does not exist.",
+    "File '/node_modules/foo.tsx' does not exist.",
+    "File '/node_modules/foo.d.ts' does not exist.",
+    "File '/node_modules/foo/package.json' does not exist.",
+    "File '/node_modules/foo/index.ts' does not exist.",
+    "File '/node_modules/foo/index.tsx' does not exist.",
+    "File '/node_modules/foo/index.d.ts' does not exist.",
+    "File '/node_modules/@types/foo.ts' does not exist.",
+    "File '/node_modules/@types/foo.tsx' does not exist.",
+    "File '/node_modules/@types/foo.d.ts' does not exist.",
+    "File '/node_modules/@types/foo/package.json' does not exist.",
+    "File '/node_modules/@types/foo/index.ts' does not exist.",
+    "File '/node_modules/@types/foo/index.tsx' does not exist.",
+    "File '/node_modules/@types/foo/index.d.ts' does not exist.",
+    "'baseUrl' option is set to '/', using this value to resolve non-relative module name 'foo'",
+    "'paths' option is specified, looking for a pattern to match module name 'foo'.",
+    "Module name 'foo', matched pattern 'foo'.",
+    "Trying substitution 'foo/foo.ts', candidate module location: 'foo/foo.ts'.",
+    "File '/foo/foo.ts' does not exist.",
+    "Loading module 'foo' from 'node_modules' folder.",
+    "File '/node_modules/foo.js' does not exist.",
+    "File '/node_modules/foo.jsx' does not exist.",
+    "File '/node_modules/foo/package.json' does not exist.",
+    "File '/node_modules/foo/index.js' does not exist.",
+    "File '/node_modules/foo/index.jsx' does not exist.",
+    "File '/node_modules/@types/foo.js' does not exist.",
+    "File '/node_modules/@types/foo.jsx' does not exist.",
+    "File '/node_modules/@types/foo/package.json' does not exist.",
+    "File '/node_modules/@types/foo/index.js' does not exist.",
+    "File '/node_modules/@types/foo/index.jsx' does not exist.",
+    "======== Module name 'foo' was not resolved. ========"
+]
\ No newline at end of file
diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution_withExtension.ts b/tests/cases/compiler/pathMappingBasedModuleResolution_withExtension.ts
new file mode 100644
index 00000000000..0bfba0c0280
--- /dev/null
+++ b/tests/cases/compiler/pathMappingBasedModuleResolution_withExtension.ts
@@ -0,0 +1,18 @@
+// @noImplicitReferences: true
+// @traceResolution: true
+
+// @Filename: /foo/foo.ts
+export function foo() {}
+
+// @Filename: /a.ts
+import { foo } from "foo";
+
+// @Filename: /tsconfig.json
+{
+    "compilerOptions": {
+        "baseUrl": ".",
+        "paths": {
+            "foo": ["foo/foo.ts"]
+        }
+    }
+}
diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution_withExtension_failedLookup.ts b/tests/cases/compiler/pathMappingBasedModuleResolution_withExtension_failedLookup.ts
new file mode 100644
index 00000000000..a983b6c4825
--- /dev/null
+++ b/tests/cases/compiler/pathMappingBasedModuleResolution_withExtension_failedLookup.ts
@@ -0,0 +1,15 @@
+// @noImplicitReferences: true
+// @traceResolution: true
+
+// @Filename: /a.ts
+import { foo } from "foo";
+
+// @Filename: /tsconfig.json
+{
+    "compilerOptions": {
+        "baseUrl": ".",
+        "paths": {
+            "foo": ["foo/foo.ts"]
+        }
+    }
+}

From a562d6e63ff221763e3dca6e133100c4b3b8ffad Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Tue, 8 Nov 2016 10:14:44 -0800
Subject: [PATCH 142/421] Make keyof T assignable to and subtype of string |
 number

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index af7dae030db..3b17c06c0e8 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -6917,6 +6917,13 @@ namespace ts {
 
                 if (isSimpleTypeRelatedTo(source, target, relation, reportErrors ? reportError : undefined)) return Ternary.True;
 
+                if (source.flags & TypeFlags.Index) {
+                    // A keyof T is related to a union type containing both string and number
+                    if (maybeTypeOfKind(target, TypeFlags.String) && maybeTypeOfKind(target, TypeFlags.Number)) {
+                        return Ternary.True;
+                    }
+                }
+
                 if (getObjectFlags(source) & ObjectFlags.ObjectLiteral && source.flags & TypeFlags.FreshLiteral) {
                     if (hasExcessProperties(<FreshObjectLiteralType>source, target, reportErrors)) {
                         if (reportErrors) {

From cf2953bc44dd99b51fdc15c4eb084d06f0f07d0a Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Tue, 8 Nov 2016 12:21:44 -0800
Subject: [PATCH 143/421] Add relations for keyof S / keyof T and [P in S]: X /
 [P in T]: X

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 3b17c06c0e8..d2d2e9f84d9 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -2229,7 +2229,7 @@ namespace ts {
                         // The specified symbol flags need to be reinterpreted as type flags
                         buildSymbolDisplay(type.symbol, writer, enclosingDeclaration, SymbolFlags.Type, SymbolFormatFlags.None, nextFlags);
                     }
-                    else if (!(flags & TypeFormatFlags.InTypeAlias) && (getObjectFlags(type) & ObjectFlags.Anonymous || type.flags & TypeFlags.UnionOrIntersection) && type.aliasSymbol &&
+                    else if (!(flags & TypeFormatFlags.InTypeAlias) && type.aliasSymbol &&
                         isSymbolAccessible(type.aliasSymbol, enclosingDeclaration, SymbolFlags.Type, /*shouldComputeAliasesToMakeVisible*/ false).accessibility === SymbolAccessibility.Accessible) {
                         const typeArguments = type.aliasTypeArguments;
                         writeSymbolTypeReference(type.aliasSymbol, typeArguments, 0, typeArguments ? typeArguments.length : 0, nextFlags);
@@ -4488,6 +4488,14 @@ namespace ts {
             return instantiateType(type.templateType, type.mapper || identityMapper);
         }
 
+        function isGenericMappedType(type: Type) {
+            if (getObjectFlags(type) & ObjectFlags.Mapped) {
+                const constraintType = getConstraintTypeFromMappedType(<MappedType>type);
+                return !!(constraintType.flags & (TypeFlags.TypeParameter | TypeFlags.Index));
+            }
+            return false;
+        }
+
         function resolveStructuredTypeMembers(type: StructuredType): ResolvedType {
             if (!(<ResolvedType>type).members) {
                 if (type.flags & TypeFlags.Object) {
@@ -6996,6 +7004,12 @@ namespace ts {
                     }
                 }
                 else if (target.flags & TypeFlags.Index) {
+                    // A keyof S is related to a keyof T if T is related to S.
+                    if (source.flags & TypeFlags.Index) {
+                        if (result = isRelatedTo((<IndexType>target).type, (<IndexType>source).type, /*reportErrors*/ false)) {
+                            return result;
+                        }
+                    }
                     // Given a type parameter T with a constraint C, a type S is assignable to
                     // keyof T if S is assignable to keyof C.
                     const constraint = getConstraintOfTypeParameter((<IndexType>target).type);
@@ -7030,18 +7044,28 @@ namespace ts {
                             return result;
                         }
                     }
-                    // Even if relationship doesn't hold for unions, intersections, or generic type references,
-                    // it may hold in a structural comparison.
-                    const apparentSource = getApparentType(source);
-                    // In a check of the form X = A & B, we will have previously checked if A relates to X or B relates
-                    // to X. Failing both of those we want to check if the aggregation of A and B's members structurally
-                    // relates to X. Thus, we include intersection types on the source side here.
-                    if (apparentSource.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 && !(source.flags & TypeFlags.Primitive);
-                        if (result = objectTypeRelatedTo(apparentSource, source, target, reportStructuralErrors)) {
-                            errorInfo = saveErrorInfo;
-                            return result;
+                    else if (isGenericMappedType(target)) {
+                        // A type [P in S]: X is related to a type [P in T]: X if T is related to S.
+                        if (isGenericMappedType(source) &&
+                            isRelatedTo(getConstraintTypeFromMappedType(<MappedType>target), getConstraintTypeFromMappedType(<MappedType>source), /*reportErrors*/ false) &&
+                            isTypeIdenticalTo(getTemplateTypeFromMappedType(<MappedType>source), getTemplateTypeFromMappedType(<MappedType>target))) {
+                            return Ternary.True;
+                        }
+                    }
+                    else {
+                        // Even if relationship doesn't hold for unions, intersections, or generic type references,
+                        // it may hold in a structural comparison.
+                        const apparentSource = getApparentType(source);
+                        // In a check of the form X = A & B, we will have previously checked if A relates to X or B relates
+                        // to X. Failing both of those we want to check if the aggregation of A and B's members structurally
+                        // relates to X. Thus, we include intersection types on the source side here.
+                        if (apparentSource.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 && !(source.flags & TypeFlags.Primitive);
+                            if (result = objectTypeRelatedTo(apparentSource, source, target, reportStructuralErrors)) {
+                                errorInfo = saveErrorInfo;
+                                return result;
+                            }
                         }
                     }
                 }

From aca7e2fa3bcb6b1ebe623e79578aaa7faf98a8b6 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Tue, 8 Nov 2016 13:38:52 -0800
Subject: [PATCH 144/421] Don't include private/protected properties in keyof T

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index d2d2e9f84d9..8ed8df17c68 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -5816,7 +5816,9 @@ namespace ts {
         }
 
         function getLiteralTypeFromPropertyName(prop: Symbol) {
-            return startsWith(prop.name, "__@") ? neverType : getLiteralTypeForText(TypeFlags.StringLiteral, unescapeIdentifier(prop.name));
+            return getDeclarationModifierFlagsFromSymbol(prop) & ModifierFlags.NonPublicAccessibilityModifier || startsWith(prop.name, "__@") ?
+                neverType :
+                getLiteralTypeForText(TypeFlags.StringLiteral, unescapeIdentifier(prop.name));
         }
 
         function getLiteralTypeFromPropertyNames(type: Type) {
@@ -7044,7 +7046,7 @@ namespace ts {
                             return result;
                         }
                     }
-                    else if (isGenericMappedType(target)) {
+                    if (isGenericMappedType(target)) {
                         // A type [P in S]: X is related to a type [P in T]: X if T is related to S.
                         if (isGenericMappedType(source) &&
                             isRelatedTo(getConstraintTypeFromMappedType(<MappedType>target), getConstraintTypeFromMappedType(<MappedType>source), /*reportErrors*/ false) &&

From 9a9f45f0fbafebb0b52b524db8448d8330c5984b Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Tue, 8 Nov 2016 15:32:53 -0800
Subject: [PATCH 145/421] use createHash from ServerHost instead of explicit
 require (#12043)

* use createHash from ServerHost instead of explicit require

* added missing method in ServerHost stub
---
 src/harness/harnessLanguageService.ts          |  4 ++++
 src/harness/unittests/cachingInServerLSHost.ts |  3 ++-
 src/harness/unittests/session.ts               |  3 ++-
 src/harness/unittests/tsserverProjectSystem.ts |  4 ++++
 src/server/builder.ts                          | 13 +------------
 src/server/editorServices.ts                   |  2 ++
 6 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts
index 889d4f28ce9..a49f8926729 100644
--- a/src/harness/harnessLanguageService.ts
+++ b/src/harness/harnessLanguageService.ts
@@ -720,6 +720,10 @@ namespace Harness.LanguageService {
         clearImmediate(timeoutId: any): void {
             clearImmediate(timeoutId);
         }
+
+        createHash(s: string) {
+            return s;
+        }
     }
 
     export class ServerLanguageServiceAdapter implements LanguageServiceAdapter {
diff --git a/src/harness/unittests/cachingInServerLSHost.ts b/src/harness/unittests/cachingInServerLSHost.ts
index 1100bb3663b..4286d3555d8 100644
--- a/src/harness/unittests/cachingInServerLSHost.ts
+++ b/src/harness/unittests/cachingInServerLSHost.ts
@@ -43,7 +43,8 @@ namespace ts {
             setTimeout,
             clearTimeout,
             setImmediate: typeof setImmediate !== "undefined" ? setImmediate : action => setTimeout(action, 0),
-            clearImmediate: typeof clearImmediate !== "undefined" ? clearImmediate : clearTimeout
+            clearImmediate: typeof clearImmediate !== "undefined" ? clearImmediate : clearTimeout,
+            createHash: s => s
         };
     }
 
diff --git a/src/harness/unittests/session.ts b/src/harness/unittests/session.ts
index 05f62c4b9f6..8800e84474b 100644
--- a/src/harness/unittests/session.ts
+++ b/src/harness/unittests/session.ts
@@ -24,7 +24,8 @@ namespace ts.server {
         setTimeout() { return 0; },
         clearTimeout: noop,
         setImmediate: () => 0,
-        clearImmediate: noop
+        clearImmediate: noop,
+        createHash: s => s
     };
     const nullCancellationToken: HostCancellationToken = { isCancellationRequested: () => false };
     const mockLogger: Logger = {
diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
index 62c0957d6a3..17b1dd3e585 100644
--- a/src/harness/unittests/tsserverProjectSystem.ts
+++ b/src/harness/unittests/tsserverProjectSystem.ts
@@ -434,6 +434,10 @@ namespace ts.projectSystem {
             };
         }
 
+        createHash(s: string): string {
+            return s;
+        }
+
         triggerDirectoryWatcherCallback(directoryName: string, fileName: string): void {
             const path = this.toPath(directoryName);
             const callbacks = this.watchedDirectories[path];
diff --git a/src/server/builder.ts b/src/server/builder.ts
index 548a3ac854c..5354e7ed508 100644
--- a/src/server/builder.ts
+++ b/src/server/builder.ts
@@ -5,15 +5,6 @@
 
 namespace ts.server {
 
-    interface Hash {
-        update(data: any, input_encoding?: string): Hash;
-        digest(encoding: string): any;
-    }
-
-    const crypto: {
-        createHash(algorithm: string): Hash
-    } = require("crypto");
-
     export function shouldEmitFile(scriptInfo: ScriptInfo) {
         return !scriptInfo.hasMixedContent;
     }
@@ -49,9 +40,7 @@ namespace ts.server {
         }
 
         private computeHash(text: string): string {
-            return crypto.createHash("md5")
-                .update(text)
-                .digest("base64");
+            return this.project.projectService.host.createHash(text);
         }
 
         private getSourceFile(): SourceFile {
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index 269eea06464..d7dcfc810b4 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -250,6 +250,8 @@ namespace ts.server {
             readonly typingsInstaller: ITypingsInstaller = nullTypingsInstaller,
             private readonly eventHandler?: ProjectServiceEventHandler) {
 
+            Debug.assert(!!host.createHash, "'ServerHost.createHash' is required for ProjectService");
+
             this.toCanonicalFileName = createGetCanonicalFileName(host.useCaseSensitiveFileNames);
             this.directoryWatchers = new DirectoryWatchers(this);
             this.throttledOperations = new ThrottledOperations(host);

From 28cc9385035a65f5dcd74a4f9b47e7022678302f Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Tue, 8 Nov 2016 16:10:34 -0800
Subject: [PATCH 146/421] (signature help) type parameter lists are never
 variadic (#12112)

---
 src/harness/fourslash.ts                               | 10 +++++++++-
 src/services/signatureHelp.ts                          |  5 ++++-
 tests/cases/fourslash/fourslash.ts                     |  1 +
 .../signatureHelpTypeParametersNotVariadic.ts          |  8 ++++++++
 4 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 tests/cases/fourslash/signatureHelpTypeParametersNotVariadic.ts

diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
index ae32fe3db16..6ff4dccdee3 100644
--- a/src/harness/fourslash.ts
+++ b/src/harness/fourslash.ts
@@ -1026,7 +1026,7 @@ namespace FourSlash {
                 ts.displayPartsToString(help.suffixDisplayParts), expected);
         }
 
-        public verifyCurrentParameterIsletiable(isVariable: boolean) {
+        public verifyCurrentParameterIsVariable(isVariable: boolean) {
             const signature = this.getActiveSignatureHelpItem();
             assert.isOk(signature);
             assert.equal(isVariable, signature.isVariadic);
@@ -1053,6 +1053,10 @@ namespace FourSlash {
             assert.equal(this.getActiveSignatureHelpItem().parameters.length, expectedCount);
         }
 
+        public verifyCurrentSignatureHelpIsVariadic(expected: boolean) {
+            assert.equal(this.getActiveSignatureHelpItem().isVariadic, expected);
+        }
+
         public verifyCurrentSignatureHelpDocComment(docComment: string) {
             const actualDocComment = this.getActiveSignatureHelpItem().documentation;
             assert.equal(ts.displayPartsToString(actualDocComment), docComment, this.assertionMessageAtLastKnownMarker("current signature help doc comment"));
@@ -3231,6 +3235,10 @@ namespace FourSlashInterface {
             this.state.verifySignatureHelpCount(expected);
         }
 
+        public signatureHelpCurrentArgumentListIsVariadic(expected: boolean) {
+            this.state.verifyCurrentSignatureHelpIsVariadic(expected);
+        }
+
         public signatureHelpArgumentCountIs(expected: number) {
             this.state.verifySignatureHelpArgumentCount(expected);
         }
diff --git a/src/services/signatureHelp.ts b/src/services/signatureHelp.ts
index 211e55b23ba..44c2ede9fbb 100644
--- a/src/services/signatureHelp.ts
+++ b/src/services/signatureHelp.ts
@@ -557,7 +557,9 @@ namespace ts.SignatureHelp {
                 addRange(prefixDisplayParts, callTargetDisplayParts);
             }
 
+            let isVariadic: boolean;
             if (isTypeParameterList) {
+                isVariadic = false; // type parameter lists are not variadic
                 prefixDisplayParts.push(punctuationPart(SyntaxKind.LessThanToken));
                 const typeParameters = candidateSignature.typeParameters;
                 signatureHelpParameters = typeParameters && typeParameters.length > 0 ? map(typeParameters, createSignatureHelpParameterForTypeParameter) : emptyArray;
@@ -567,6 +569,7 @@ namespace ts.SignatureHelp {
                 addRange(suffixDisplayParts, parameterParts);
             }
             else {
+                isVariadic = candidateSignature.hasRestParameter;
                 const typeParameterParts = mapToDisplayParts(writer =>
                     typeChecker.getSymbolDisplayBuilder().buildDisplayForTypeParametersAndDelimiters(candidateSignature.typeParameters, writer, invocation));
                 addRange(prefixDisplayParts, typeParameterParts);
@@ -582,7 +585,7 @@ namespace ts.SignatureHelp {
             addRange(suffixDisplayParts, returnTypeParts);
 
             return {
-                isVariadic: candidateSignature.hasRestParameter,
+                isVariadic,
                 prefixDisplayParts,
                 suffixDisplayParts,
                 separatorDisplayParts: [punctuationPart(SyntaxKind.CommaToken), spacePart()],
diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts
index 0a72d295295..295b8e422b9 100644
--- a/tests/cases/fourslash/fourslash.ts
+++ b/tests/cases/fourslash/fourslash.ts
@@ -194,6 +194,7 @@ declare namespace FourSlashInterface {
         currentSignatureHelpDocCommentIs(docComment: string): void;
         signatureHelpCountIs(expected: number): void;
         signatureHelpArgumentCountIs(expected: number): void;
+        signatureHelpCurrentArgumentListIsVariadic(expected: boolean);
         currentSignatureParameterCountIs(expected: number): void;
         currentSignatureTypeParameterCountIs(expected: number): void;
         currentSignatureHelpIs(expected: string): void;
diff --git a/tests/cases/fourslash/signatureHelpTypeParametersNotVariadic.ts b/tests/cases/fourslash/signatureHelpTypeParametersNotVariadic.ts
new file mode 100644
index 00000000000..30b0bac7e71
--- /dev/null
+++ b/tests/cases/fourslash/signatureHelpTypeParametersNotVariadic.ts
@@ -0,0 +1,8 @@
+/// <reference path="fourslash.ts" />
+
+//// declare function f(a: any, ...b: any[]): any;
+//// f</*1*/>(1, 2);
+
+goTo.marker("1");
+verify.signatureHelpArgumentCountIs(0);
+verify.signatureHelpCurrentArgumentListIsVariadic(false);
\ No newline at end of file

From 12cd0bfb69b88fffc5135a4bccd3eb6b6c4c35b1 Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Tue, 8 Nov 2016 16:32:41 -0800
Subject: [PATCH 147/421] Remove EmitHelperState, general helper cleanup.

---
 src/compiler/factory.ts                    |  57 ++--
 src/compiler/transformer.ts                | 178 +++++------
 src/compiler/transformers/es2015.ts        | 246 ++++++++-------
 src/compiler/transformers/es2017.ts        | 141 ++++-----
 src/compiler/transformers/generators.ts    |  13 +-
 src/compiler/transformers/jsx.ts           |  13 +-
 src/compiler/transformers/module/es2015.ts |  60 +++-
 src/compiler/transformers/module/module.ts |  10 +-
 src/compiler/transformers/module/system.ts |  10 +-
 src/compiler/transformers/ts.ts            | 345 +++++++++------------
 src/compiler/types.ts                      | 135 +++++++-
 src/compiler/utilities.ts                  |  20 +-
 src/compiler/visitor.ts                    | 117 ++++---
 13 files changed, 725 insertions(+), 620 deletions(-)

diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index cd4f4561fd9..f8b71a733cd 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -1695,23 +1695,8 @@ namespace ts {
 
     // Helpers
 
-    export interface EmitHelperState {
-        currentSourceFile: SourceFile;
-        compilerOptions: CompilerOptions;
-        requestedHelpers?: EmitHelper[];
-    }
-
-    export function getHelperName(helperState: EmitHelperState, name: string) {
-        const externalHelpersModuleName = getOrCreateExternalHelpersModuleName(helperState.currentSourceFile, helperState.compilerOptions);
-        return externalHelpersModuleName
-            ? createPropertyAccess(externalHelpersModuleName, name)
-            : createIdentifier(name);
-    }
-
-    export function requestEmitHelper(helperState: EmitHelperState, helper: EmitHelper) {
-        if (!contains(helperState.requestedHelpers, helper)) {
-            helperState.requestedHelpers = append(helperState.requestedHelpers, helper);
-        }
+    export function getHelperName(name: string) {
+        return setEmitFlags(createIdentifier(name), EmitFlags.HelperName | EmitFlags.AdviseOnEmitNode);
     }
 
     export interface CallBinding {
@@ -2061,6 +2046,10 @@ namespace ts {
 
     // Utilities
 
+    export function convertToFunctionBody(node: ConciseBody) {
+        return isBlock(node) ? node : createBlock([createReturn(node, /*location*/ node)], /*location*/ node);
+    }
+
     function isUseStrictPrologue(node: ExpressionStatement): boolean {
         return (node.expression as StringLiteral).text === "use strict";
     }
@@ -2110,6 +2099,13 @@ namespace ts {
         return statementOffset;
     }
 
+    export function startsWithUseStrict(statements: Statement[]) {
+        const firstStatement = firstOrUndefined(statements);
+        return firstStatement !== undefined
+            && isPrologueDirective(firstStatement)
+            && isUseStrictPrologue(firstStatement);
+    }
+
     /**
      * Ensures "use strict" directive is added
      *
@@ -2606,7 +2602,7 @@ namespace ts {
      *
      * @param node The node.
      */
-    function getOrCreateEmitNode(node: Node) {
+    export function getOrCreateEmitNode(node: Node) {
         if (!node.emitNode) {
             if (isParseTreeNode(node)) {
                 // To avoid holding onto transformation artifacts, we keep track of any
@@ -2735,14 +2731,25 @@ namespace ts {
         return emitNode && emitNode.externalHelpersModuleName;
     }
 
-    export function getOrCreateExternalHelpersModuleName(node: SourceFile, compilerOptions: CompilerOptions) {
+    export function getOrCreateExternalHelpersModuleNameIfNeeded(node: SourceFile, compilerOptions: CompilerOptions) {
         if (compilerOptions.importHelpers && (isExternalModule(node) || compilerOptions.isolatedModules)) {
-            const parseNode = getOriginalNode(node, isSourceFile);
-            const emitNode = getOrCreateEmitNode(parseNode);
-            return emitNode.externalHelpersModuleName || (emitNode.externalHelpersModuleName = createUniqueName(externalHelpersModuleNameText));
+            const externalHelpersModuleName = getExternalHelpersModuleName(node);
+            if (externalHelpersModuleName) {
+                return externalHelpersModuleName;
+            }
+
+            const helpers = getEmitHelpers(node);
+            if (helpers) {
+                for (const helper of helpers) {
+                    if (!helper.scoped) {
+                        const parseNode = getOriginalNode(node, isSourceFile);
+                        const emitNode = getOrCreateEmitNode(parseNode);
+                        return emitNode.externalHelpersModuleName || (emitNode.externalHelpersModuleName = createUniqueName(externalHelpersModuleNameText));
+                    }
+                }
+            }
         }
     }
-
     /**
      * Adds an EmitHelper to a node.
      */
@@ -2930,7 +2937,7 @@ namespace ts {
         hasExportStarsToExportValues: boolean; // whether this module contains export*
     }
 
-    export function collectExternalModuleInfo(sourceFile: SourceFile, resolver: EmitResolver): ExternalModuleInfo {
+    export function collectExternalModuleInfo(sourceFile: SourceFile, resolver: EmitResolver, compilerOptions: CompilerOptions): ExternalModuleInfo {
         const externalImports: (ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration)[] = [];
         const exportSpecifiers = createMap<ExportSpecifier[]>();
         const exportedBindings = createMap<Identifier[]>();
@@ -2940,7 +2947,7 @@ namespace ts {
         let exportEquals: ExportAssignment = undefined;
         let hasExportStarsToExportValues = false;
 
-        const externalHelpersModuleName = getExternalHelpersModuleName(sourceFile);
+        const externalHelpersModuleName = getOrCreateExternalHelpersModuleNameIfNeeded(sourceFile, compilerOptions);
         const externalHelpersImportDeclaration = externalHelpersModuleName && createImportDeclaration(
             /*decorators*/ undefined,
             /*modifiers*/ undefined,
diff --git a/src/compiler/transformer.ts b/src/compiler/transformer.ts
index ee9c081e6eb..1ae123ce5ca 100644
--- a/src/compiler/transformer.ts
+++ b/src/compiler/transformer.ts
@@ -26,84 +26,6 @@ namespace ts {
         EmitNotifications = 1 << 1,
     }
 
-    export interface TransformationResult {
-        /**
-         * Gets the transformed source files.
-         */
-        transformed: SourceFile[];
-
-        /**
-         * Emits the substitute for a node, if one is available; otherwise, emits the node.
-         *
-         * @param emitContext The current emit context.
-         * @param node The node to substitute.
-         * @param emitCallback A callback used to emit the node or its substitute.
-         */
-        emitNodeWithSubstitution(emitContext: EmitContext, node: Node, emitCallback: (emitContext: EmitContext, node: Node) => void): void;
-
-        /**
-         * Emits a node with possible notification.
-         *
-         * @param emitContext The current emit context.
-         * @param node The node to emit.
-         * @param emitCallback A callback used to emit the node.
-         */
-        emitNodeWithNotification(emitContext: EmitContext, node: Node, emitCallback: (emitContext: EmitContext, node: Node) => void): void;
-    }
-
-    export interface TransformationContext extends LexicalEnvironment {
-        getCompilerOptions(): CompilerOptions;
-        getEmitResolver(): EmitResolver;
-        getEmitHost(): EmitHost;
-
-        /**
-         * Hoists a function declaration to the containing scope.
-         */
-        hoistFunctionDeclaration(node: FunctionDeclaration): void;
-
-        /**
-         * Hoists a variable declaration to the containing scope.
-         */
-        hoistVariableDeclaration(node: Identifier): void;
-
-        /**
-         * Enables expression substitutions in the pretty printer for the provided SyntaxKind.
-         */
-        enableSubstitution(kind: SyntaxKind): void;
-
-        /**
-         * Determines whether expression substitutions are enabled for the provided node.
-         */
-        isSubstitutionEnabled(node: Node): boolean;
-
-        /**
-         * Hook used by transformers to substitute expressions just before they
-         * are emitted by the pretty printer.
-         */
-        onSubstituteNode?: (emitContext: EmitContext, node: Node) => Node;
-
-        /**
-         * Enables before/after emit notifications in the pretty printer for the provided
-         * SyntaxKind.
-         */
-        enableEmitNotification(kind: SyntaxKind): void;
-
-        /**
-         * Determines whether before/after emit notifications should be raised in the pretty
-         * printer when it emits a node.
-         */
-        isEmitNotificationEnabled(node: Node): boolean;
-
-        /**
-         * Hook used to allow transformers to capture state before or after
-         * the printer emits a node.
-         */
-        onEmitNode?: (emitContext: EmitContext, node: Node, emitCallback: (emitContext: EmitContext, node: Node) => void) => void;
-    }
-
-    /* @internal */
-    export type Transformer = (context: TransformationContext) => (node: SourceFile) => SourceFile;
-
     export function getTransformers(compilerOptions: CompilerOptions) {
         const jsx = compilerOptions.jsx;
         const languageVersion = getEmitScriptTarget(compilerOptions);
@@ -149,14 +71,18 @@ namespace ts {
      * @param transforms An array of Transformers.
      */
     export function transformFiles(resolver: EmitResolver, host: EmitHost, sourceFiles: SourceFile[], transformers: Transformer[]): TransformationResult {
-        const lexicalEnvironmentVariableDeclarationsStack: VariableDeclaration[][] = [];
-        const lexicalEnvironmentFunctionDeclarationsStack: FunctionDeclaration[][] = [];
         const enabledSyntaxKindFeatures = new Array<SyntaxKindFeatureFlags>(SyntaxKind.Count);
 
+        let scopeModificationDisabled = false;
+
+        let lexicalEnvironmentVariableDeclarations: VariableDeclaration[];
+        let lexicalEnvironmentFunctionDeclarations: FunctionDeclaration[];
+        let lexicalEnvironmentVariableDeclarationsStack: VariableDeclaration[][] = [];
+        let lexicalEnvironmentFunctionDeclarationsStack: FunctionDeclaration[][] = [];
         let lexicalEnvironmentStackOffset = 0;
-        let hoistedVariableDeclarations: VariableDeclaration[];
-        let hoistedFunctionDeclarations: FunctionDeclaration[];
-        let lexicalEnvironmentDisabled: boolean;
+        let lexicalEnvironmentSuspended = false;
+
+        let emitHelpers: EmitHelper[];
 
         // The transformation context is provided to each transformer as part of transformer
         // initialization.
@@ -164,10 +90,14 @@ namespace ts {
             getCompilerOptions: () => host.getCompilerOptions(),
             getEmitResolver: () => resolver,
             getEmitHost: () => host,
+            startLexicalEnvironment,
+            suspendLexicalEnvironment,
+            resumeLexicalEnvironment,
+            endLexicalEnvironment,
             hoistVariableDeclaration,
             hoistFunctionDeclaration,
-            startLexicalEnvironment,
-            endLexicalEnvironment,
+            requestEmitHelper,
+            readEmitHelpers,
             onSubstituteNode: (_emitContext, node) => node,
             enableSubstitution,
             isSubstitutionEnabled,
@@ -183,7 +113,7 @@ namespace ts {
         const transformed = map(sourceFiles, transformSourceFile);
 
         // Disable modification of the lexical environment.
-        lexicalEnvironmentDisabled = true;
+        scopeModificationDisabled = true;
 
         return {
             transformed,
@@ -278,13 +208,13 @@ namespace ts {
          * Records a hoisted variable declaration for the provided name within a lexical environment.
          */
         function hoistVariableDeclaration(name: Identifier): void {
-            Debug.assert(!lexicalEnvironmentDisabled, "Cannot modify the lexical environment during the print phase.");
+            Debug.assert(!scopeModificationDisabled, "Cannot modify the lexical environment during the print phase.");
             const decl = createVariableDeclaration(name);
-            if (!hoistedVariableDeclarations) {
-                hoistedVariableDeclarations = [decl];
+            if (!lexicalEnvironmentVariableDeclarations) {
+                lexicalEnvironmentVariableDeclarations = [decl];
             }
             else {
-                hoistedVariableDeclarations.push(decl);
+                lexicalEnvironmentVariableDeclarations.push(decl);
             }
         }
 
@@ -292,31 +222,46 @@ namespace ts {
          * Records a hoisted function declaration within a lexical environment.
          */
         function hoistFunctionDeclaration(func: FunctionDeclaration): void {
-            Debug.assert(!lexicalEnvironmentDisabled, "Cannot modify the lexical environment during the print phase.");
-            if (!hoistedFunctionDeclarations) {
-                hoistedFunctionDeclarations = [func];
+            Debug.assert(!scopeModificationDisabled, "Cannot modify the lexical environment during the print phase.");
+            if (!lexicalEnvironmentFunctionDeclarations) {
+                lexicalEnvironmentFunctionDeclarations = [func];
             }
             else {
-                hoistedFunctionDeclarations.push(func);
+                lexicalEnvironmentFunctionDeclarations.push(func);
             }
         }
 
+        /** Suspends the current lexical environment, usually after visiting a parameter list. */
+        function suspendLexicalEnvironment(): void {
+            Debug.assert(!scopeModificationDisabled, "Cannot suspend a lexical environment during the print phase.");
+            Debug.assert(!lexicalEnvironmentSuspended, "Lexical environment is already suspended.");
+            lexicalEnvironmentSuspended = true;
+        }
+
+        /** Resumes a suspended lexical environment, usually before visiting a function body. */
+        function resumeLexicalEnvironment(): void {
+            Debug.assert(!scopeModificationDisabled, "Cannot resume a lexical environment during the print phase.");
+            Debug.assert(lexicalEnvironmentSuspended, "Lexical environment is not suspended suspended.");
+            lexicalEnvironmentSuspended = false;
+        }
+
         /**
          * Starts a new lexical environment. Any existing hoisted variable or function declarations
          * are pushed onto a stack, and the related storage variables are reset.
          */
         function startLexicalEnvironment(): void {
-            Debug.assert(!lexicalEnvironmentDisabled, "Cannot start a lexical environment during the print phase.");
+            Debug.assert(!scopeModificationDisabled, "Cannot start a lexical environment during the print phase.");
+            Debug.assert(!lexicalEnvironmentSuspended, "Lexical environment is suspended.");
 
             // Save the current lexical environment. Rather than resizing the array we adjust the
             // stack size variable. This allows us to reuse existing array slots we've
             // already allocated between transformations to avoid allocation and GC overhead during
             // transformation.
-            lexicalEnvironmentVariableDeclarationsStack[lexicalEnvironmentStackOffset] = hoistedVariableDeclarations;
-            lexicalEnvironmentFunctionDeclarationsStack[lexicalEnvironmentStackOffset] = hoistedFunctionDeclarations;
+            lexicalEnvironmentVariableDeclarationsStack[lexicalEnvironmentStackOffset] = lexicalEnvironmentVariableDeclarations;
+            lexicalEnvironmentFunctionDeclarationsStack[lexicalEnvironmentStackOffset] = lexicalEnvironmentFunctionDeclarations;
             lexicalEnvironmentStackOffset++;
-            hoistedVariableDeclarations = undefined;
-            hoistedFunctionDeclarations = undefined;
+            lexicalEnvironmentVariableDeclarations = undefined;
+            lexicalEnvironmentFunctionDeclarations = undefined;
         }
 
         /**
@@ -324,18 +269,19 @@ namespace ts {
          * any hoisted declarations added in this environment are returned.
          */
         function endLexicalEnvironment(): Statement[] {
-            Debug.assert(!lexicalEnvironmentDisabled, "Cannot end a lexical environment during the print phase.");
+            Debug.assert(!scopeModificationDisabled, "Cannot end a lexical environment during the print phase.");
+            Debug.assert(!lexicalEnvironmentSuspended, "Lexical environment is suspended.");
 
             let statements: Statement[];
-            if (hoistedVariableDeclarations || hoistedFunctionDeclarations) {
-                if (hoistedFunctionDeclarations) {
-                    statements = [...hoistedFunctionDeclarations];
+            if (lexicalEnvironmentVariableDeclarations || lexicalEnvironmentFunctionDeclarations) {
+                if (lexicalEnvironmentFunctionDeclarations) {
+                    statements = [...lexicalEnvironmentFunctionDeclarations];
                 }
 
-                if (hoistedVariableDeclarations) {
+                if (lexicalEnvironmentVariableDeclarations) {
                     const statement = createVariableStatement(
                         /*modifiers*/ undefined,
-                        createVariableDeclarationList(hoistedVariableDeclarations)
+                        createVariableDeclarationList(lexicalEnvironmentVariableDeclarations)
                     );
 
                     if (!statements) {
@@ -349,9 +295,27 @@ namespace ts {
 
             // Restore the previous lexical environment.
             lexicalEnvironmentStackOffset--;
-            hoistedVariableDeclarations = lexicalEnvironmentVariableDeclarationsStack[lexicalEnvironmentStackOffset];
-            hoistedFunctionDeclarations = lexicalEnvironmentFunctionDeclarationsStack[lexicalEnvironmentStackOffset];
+            lexicalEnvironmentVariableDeclarations = lexicalEnvironmentVariableDeclarationsStack[lexicalEnvironmentStackOffset];
+            lexicalEnvironmentFunctionDeclarations = lexicalEnvironmentFunctionDeclarationsStack[lexicalEnvironmentStackOffset];
+            if (lexicalEnvironmentStackOffset === 0) {
+                lexicalEnvironmentVariableDeclarationsStack = [];
+                lexicalEnvironmentFunctionDeclarationsStack = [];
+            }
+
             return statements;
         }
+
+        function requestEmitHelper(helper: EmitHelper): void {
+            Debug.assert(!scopeModificationDisabled, "Cannot modify the lexical environment during the print phase.");
+            Debug.assert(!helper.scoped, "Cannot request a scoped emit helper.");
+            emitHelpers = append(emitHelpers, helper);
+        }
+
+        function readEmitHelpers(): EmitHelper[] | undefined {
+            Debug.assert(!scopeModificationDisabled, "Cannot modify the lexical environment during the print phase.");
+            const helpers = emitHelpers;
+            emitHelpers = undefined;
+            return helpers;
+        }
     }
 }
diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts
index 60d1ad95682..733e47eaa67 100644
--- a/src/compiler/transformers/es2015.ts
+++ b/src/compiler/transformers/es2015.ts
@@ -165,11 +165,11 @@ namespace ts {
     export function transformES2015(context: TransformationContext) {
         const {
             startLexicalEnvironment,
+            resumeLexicalEnvironment,
             endLexicalEnvironment,
             hoistVariableDeclaration,
         } = context;
 
-        const compilerOptions = context.getCompilerOptions();
         const resolver = context.getEmitResolver();
         const previousOnSubstituteNode = context.onSubstituteNode;
         const previousOnEmitNode = context.onEmitNode;
@@ -187,7 +187,6 @@ namespace ts {
         let enclosingNonArrowFunction: FunctionLikeDeclaration;
         let enclosingNonAsyncFunctionBody: FunctionLikeDeclaration | ClassElement;
         let isInConstructorWithCapturedSuper: boolean;
-        let helperState: EmitHelperState;
 
         /**
          * Used to track if we are emitting body of the converted loop
@@ -210,14 +209,12 @@ namespace ts {
 
             currentSourceFile = node;
             currentText = node.text;
-            helperState = { currentSourceFile, compilerOptions };
 
-            const visited = visitNode(node, visitor, isSourceFile);
-            addEmitHelpers(visited, helperState.requestedHelpers);
+            const visited = saveStateAndInvoke(node, visitSourceFile);
+            addEmitHelpers(visited, context.readEmitHelpers());
 
             currentSourceFile = undefined;
             currentText = undefined;
-            helperState = undefined;
             return visited;
         }
 
@@ -264,6 +261,47 @@ namespace ts {
             return visited;
         }
 
+        function onBeforeVisitNode(node: Node) {
+            if (currentNode) {
+                if (isBlockScope(currentNode, currentParent)) {
+                    enclosingBlockScopeContainer = currentNode;
+                    enclosingBlockScopeContainerParent = currentParent;
+                }
+
+                if (isFunctionLike(currentNode)) {
+                    enclosingFunction = currentNode;
+                    if (currentNode.kind !== SyntaxKind.ArrowFunction) {
+                        enclosingNonArrowFunction = currentNode;
+                        if (!(getEmitFlags(currentNode) & EmitFlags.AsyncFunctionBody)) {
+                            enclosingNonAsyncFunctionBody = currentNode;
+                        }
+                    }
+                }
+
+                // keep track of the enclosing variable statement when in the context of
+                // variable statements, variable declarations, binding elements, and binding
+                // patterns.
+                switch (currentNode.kind) {
+                    case SyntaxKind.VariableStatement:
+                        enclosingVariableStatement = <VariableStatement>currentNode;
+                        break;
+
+                    case SyntaxKind.VariableDeclarationList:
+                    case SyntaxKind.VariableDeclaration:
+                    case SyntaxKind.BindingElement:
+                    case SyntaxKind.ObjectBindingPattern:
+                    case SyntaxKind.ArrayBindingPattern:
+                        break;
+
+                    default:
+                        enclosingVariableStatement = undefined;
+                }
+            }
+
+            currentParent = currentNode;
+            currentNode = node;
+        }
+
         function returnCapturedThis(node: Node): Node {
             return setOriginalNode(createReturn(createIdentifier("_this")), node);
         }
@@ -288,7 +326,7 @@ namespace ts {
             else if (node.transformFlags & TransformFlags.ContainsES2015 || (isInConstructorWithCapturedSuper && !isExpression(node))) {
                 // we want to dive in this branch either if node has children with ES2015 specific syntax
                 // or we are inside constructor that captures result of the super call so all returns without expression should be
-                // rewritten. Note: we skip expressions since returns should never appear there 
+                // rewritten. Note: we skip expressions since returns should never appear there
                 return visitEachChild(node, visitor, context);
             }
             else {
@@ -426,6 +464,9 @@ namespace ts {
                 case SyntaxKind.YieldExpression:
                     return visitYieldExpression(<YieldExpression>node);
 
+                case SyntaxKind.SpreadElementExpression:
+                    return visitSpreadElementExpression(<SpreadElementExpression>node);
+
                 case SyntaxKind.SuperKeyword:
                     return visitSuperKeyword();
 
@@ -436,9 +477,6 @@ namespace ts {
                 case SyntaxKind.MethodDeclaration:
                     return visitMethodDeclaration(<MethodDeclaration>node);
 
-                case SyntaxKind.SourceFile:
-                    return visitSourceFileNode(<SourceFile>node);
-
                 case SyntaxKind.VariableStatement:
                     return visitVariableStatement(<VariableStatement>node);
 
@@ -446,48 +484,19 @@ namespace ts {
                     Debug.failBadSyntaxKind(node);
                     return visitEachChild(node, visitor, context);
             }
-
         }
 
-        function onBeforeVisitNode(node: Node) {
-            if (currentNode) {
-                if (isBlockScope(currentNode, currentParent)) {
-                    enclosingBlockScopeContainer = currentNode;
-                    enclosingBlockScopeContainerParent = currentParent;
-                }
-
-                if (isFunctionLike(currentNode)) {
-                    enclosingFunction = currentNode;
-                    if (currentNode.kind !== SyntaxKind.ArrowFunction) {
-                        enclosingNonArrowFunction = currentNode;
-                        if (!(getEmitFlags(currentNode) & EmitFlags.AsyncFunctionBody)) {
-                            enclosingNonAsyncFunctionBody = currentNode;
-                        }
-                    }
-                }
-
-                // keep track of the enclosing variable statement when in the context of
-                // variable statements, variable declarations, binding elements, and binding
-                // patterns.
-                switch (currentNode.kind) {
-                    case SyntaxKind.VariableStatement:
-                        enclosingVariableStatement = <VariableStatement>currentNode;
-                        break;
-
-                    case SyntaxKind.VariableDeclarationList:
-                    case SyntaxKind.VariableDeclaration:
-                    case SyntaxKind.BindingElement:
-                    case SyntaxKind.ObjectBindingPattern:
-                    case SyntaxKind.ArrayBindingPattern:
-                        break;
-
-                    default:
-                        enclosingVariableStatement = undefined;
-                }
-            }
-
-            currentParent = currentNode;
-            currentNode = node;
+        function visitSourceFile(node: SourceFile): SourceFile {
+            const statements: Statement[] = [];
+            startLexicalEnvironment();
+            const statementOffset = addPrologueDirectives(statements, node.statements, /*ensureUseStrict*/ false, visitor);
+            addCaptureThisForNodeIfNeeded(statements, node);
+            addRange(statements, visitNodes(node.statements, visitor, isStatement, statementOffset));
+            addRange(statements, endLexicalEnvironment());
+            return updateSourceFileNode(
+                node,
+                createNodeArray(statements, node.statements)
+            );
         }
 
         function visitSwitchStatement(node: SwitchStatement): SwitchStatement {
@@ -787,7 +796,7 @@ namespace ts {
             if (extendsClauseElement) {
                 statements.push(
                     createStatement(
-                        createExtendsHelper(helperState, getLocalName(node)),
+                        createExtendsHelper(context, getLocalName(node)),
                         /*location*/ extendsClauseElement
                     )
                 );
@@ -837,11 +846,8 @@ namespace ts {
             // `super` call.
             // If this is the case, we do not include the synthetic `...args` parameter and
             // will instead use the `arguments` object in ES5/3.
-            if (constructor && !hasSynthesizedSuper) {
-                return visitNodes(constructor.parameters, visitor, isParameter);
-            }
-
-            return [];
+            return visitParameterList(constructor && !hasSynthesizedSuper && constructor.parameters, visitor, context)
+                || [];
         }
 
         /**
@@ -855,14 +861,14 @@ namespace ts {
          */
         function transformConstructorBody(constructor: ConstructorDeclaration | undefined, node: ClassDeclaration | ClassExpression, extendsClauseElement: ExpressionWithTypeArguments, hasSynthesizedSuper: boolean) {
             const statements: Statement[] = [];
-            startLexicalEnvironment();
+            resumeLexicalEnvironment();
 
             let statementOffset = -1;
             if (hasSynthesizedSuper) {
                 // If a super call has already been synthesized,
                 // we're going to assume that we should just transform everything after that.
                 // The assumption is that no prior step in the pipeline has added any prologue directives.
-                statementOffset = 1;
+                statementOffset = 0;
             }
             else if (constructor) {
                 // Otherwise, try to emit all potential prologue directives first.
@@ -1386,20 +1392,13 @@ namespace ts {
         function transformClassMethodDeclarationToStatement(receiver: LeftHandSideExpression, member: MethodDeclaration) {
             const commentRange = getCommentRange(member);
             const sourceMapRange = getSourceMapRange(member);
-
-            const func = transformFunctionLikeToExpression(member, /*location*/ member, /*name*/ undefined);
-            setEmitFlags(func, EmitFlags.NoComments);
-            setSourceMapRange(func, sourceMapRange);
+            const memberName = createMemberAccessForPropertyName(receiver, visitNode(member.name, visitor, isPropertyName), /*location*/ member.name);
+            const memberFunction = transformFunctionLikeToExpression(member, /*location*/ member, /*name*/ undefined);
+            setEmitFlags(memberFunction, EmitFlags.NoComments);
+            setSourceMapRange(memberFunction, sourceMapRange);
 
             const statement = createStatement(
-                createAssignment(
-                    createMemberAccessForPropertyName(
-                        receiver,
-                        visitNode(member.name, visitor, isPropertyName),
-                        /*location*/ member.name
-                    ),
-                    func
-                ),
+                createAssignment(memberName, memberFunction),
                 /*location*/ member
             );
 
@@ -1497,8 +1496,17 @@ namespace ts {
             if (node.transformFlags & TransformFlags.ContainsLexicalThis) {
                 enableSubstitutionsForCapturedThis();
             }
-
-            const func = transformFunctionLikeToExpression(node, /*location*/ node, /*name*/ undefined);
+            const func = createFunctionExpression(
+                /*modifiers*/ undefined,
+                /*asteriskToken*/ undefined,
+                /*name*/ undefined,
+                /*typeParameters*/ undefined,
+                visitParameterList(node.parameters, visitor, context),
+                /*type*/ undefined,
+                transformFunctionBody(node),
+                node
+            );
+            setOriginalNode(func, node);
             setEmitFlags(func, EmitFlags.CapturesThis);
             return func;
         }
@@ -1509,7 +1517,17 @@ namespace ts {
          * @param node a FunctionExpression node.
          */
         function visitFunctionExpression(node: FunctionExpression): Expression {
-            return transformFunctionLikeToExpression(node, /*location*/ node, node.name);
+            return updateFunctionExpression(
+                node,
+                /*modifiers*/ undefined,
+                node.name,
+                /*typeParameters*/ undefined,
+                visitParameterList(node.parameters, visitor, context),
+                /*type*/ undefined,
+                node.transformFlags & TransformFlags.ES2015
+                    ? transformFunctionBody(node)
+                    : visitFunctionBody(node.body, visitor, context)
+            );
         }
 
         /**
@@ -1518,19 +1536,18 @@ namespace ts {
          * @param node a FunctionDeclaration node.
          */
         function visitFunctionDeclaration(node: FunctionDeclaration): FunctionDeclaration {
-            return setOriginalNode(
-                createFunctionDeclaration(
-                    /*decorators*/ undefined,
-                    node.modifiers,
-                    node.asteriskToken,
-                    node.name,
-                    /*typeParameters*/ undefined,
-                    visitNodes(node.parameters, visitor, isParameter),
-                    /*type*/ undefined,
-                    transformFunctionBody(node),
-                    /*location*/ node
-                ),
-                /*original*/ node);
+            return updateFunctionDeclaration(
+                node,
+                /*decorators*/ undefined,
+                node.modifiers,
+                node.name,
+                /*typeParameters*/ undefined,
+                visitParameterList(node.parameters, visitor, context),
+                /*type*/ undefined,
+                node.transformFlags & TransformFlags.ES2015
+                    ? transformFunctionBody(node)
+                    : visitFunctionBody(node.body, visitor, context)
+            );
         }
 
         /**
@@ -1552,7 +1569,7 @@ namespace ts {
                     node.asteriskToken,
                     name,
                     /*typeParameters*/ undefined,
-                    visitNodes(node.parameters, visitor, isParameter),
+                    visitParameterList(node.parameters, visitor, context),
                     /*type*/ undefined,
                     saveStateAndInvoke(node, transformFunctionBody),
                     location
@@ -1579,7 +1596,8 @@ namespace ts {
             const body = node.body;
             let statementOffset: number;
 
-            startLexicalEnvironment();
+            resumeLexicalEnvironment();
+
             if (isBlock(body)) {
                 // ensureUseStrict is false because no new prologue-directive should be added.
                 // addPrologueDirectives will simply put already-existing directives at the beginning of the target statement-array
@@ -1633,15 +1651,21 @@ namespace ts {
                 closeBraceLocation = body;
             }
 
-            const lexicalEnvironment = endLexicalEnvironment();
-            addRange(statements, lexicalEnvironment);
+            const declarations = endLexicalEnvironment();
+            addRange(statements, declarations);
 
             // If we added any final generated statements, this must be a multi-line block
-            if (!multiLine && lexicalEnvironment && lexicalEnvironment.length) {
+            if (!multiLine && declarations && declarations.length) {
                 multiLine = true;
             }
 
-            const block = createBlock(createNodeArray(statements, statementsLocation), node.body, multiLine);
+            const block = createBlock(
+                createNodeArray(statements, statementsLocation),
+                node.body,
+                multiLine);
+
+            setOriginalNode(block, node.body);
+
             if (!multiLine && singleLine) {
                 setEmitFlags(block, EmitFlags.SingleLine);
             }
@@ -1650,7 +1674,6 @@ namespace ts {
                 setTokenSourceMapRange(block, SyntaxKind.CloseBraceToken, closeBraceLocation);
             }
 
-            setOriginalNode(block, node.body);
             return block;
         }
 
@@ -1659,7 +1682,7 @@ namespace ts {
          *
          * @param node An ExpressionStatement node.
          */
-        function visitExpressionStatement(node: ExpressionStatement): ExpressionStatement {
+        function visitExpressionStatement(node: ExpressionStatement): Statement {
             // If we are here it is most likely because our expression is a destructuring assignment.
             switch (node.expression.kind) {
                 case SyntaxKind.ParenthesizedExpression:
@@ -1713,8 +1736,11 @@ namespace ts {
          */
         function visitBinaryExpression(node: BinaryExpression, needsDestructuringValue: boolean): Expression {
             // If we are here it is because this is a destructuring assignment.
-            Debug.assert(isDestructuringAssignment(node));
-            return flattenDestructuringAssignment(context, node, needsDestructuringValue, hoistVariableDeclaration, visitor);
+            if (isDestructuringAssignment(node)) {
+                return flattenDestructuringAssignment(context, node, needsDestructuringValue, hoistVariableDeclaration, visitor);
+            }
+
+            return visitEachChild(node, visitor, context);
         }
 
         function visitVariableStatement(node: VariableStatement): Statement {
@@ -2894,6 +2920,10 @@ namespace ts {
             );
         }
 
+        function visitSpreadElementExpression(node: SpreadElementExpression) {
+            return visitNode(node.expression, visitor, isExpression);
+        }
+
         /**
          * Transforms the expression of a SpreadElementExpression node.
          *
@@ -3080,19 +3110,6 @@ namespace ts {
                     : createIdentifier("_super");
         }
 
-        function visitSourceFileNode(node: SourceFile): SourceFile {
-            const [prologue, remaining] = span(node.statements, isPrologueDirective);
-            const statements: Statement[] = [];
-            startLexicalEnvironment();
-            addRange(statements, prologue);
-            addCaptureThisForNodeIfNeeded(statements, node);
-            addRange(statements, visitNodes(createNodeArray(remaining), visitor, isStatement));
-            addRange(statements, endLexicalEnvironment());
-            const clone = getMutableClone(node);
-            clone.statements = createNodeArray(statements, /*location*/ node.statements);
-            return clone;
-        }
-
         /**
          * Called by the printer just before a node is printed.
          *
@@ -3254,8 +3271,7 @@ namespace ts {
                 return false;
             }
 
-            const parameter = singleOrUndefined(constructor.parameters);
-            if (!parameter || !nodeIsSynthesized(parameter) || !parameter.dotDotDotToken) {
+            if (some(constructor.parameters)) {
                 return false;
             }
 
@@ -3280,14 +3296,14 @@ namespace ts {
             }
 
             const expression = (<SpreadElementExpression>callArgument).expression;
-            return isIdentifier(expression) && expression === parameter.name;
+            return isIdentifier(expression) && expression.text === "arguments";
         }
     }
 
-    function createExtendsHelper(helperState: EmitHelperState, name: Identifier) {
-        requestEmitHelper(helperState, extendsHelper);
+    function createExtendsHelper(context: TransformationContext, name: Identifier) {
+        context.requestEmitHelper(extendsHelper);
         return createCall(
-            getHelperName(helperState, "__extends"),
+            getHelperName("__extends"),
             /*typeArguments*/ undefined,
             [
                 name,
diff --git a/src/compiler/transformers/es2017.ts b/src/compiler/transformers/es2017.ts
index 14d97ade2ac..eca0e9a1488 100644
--- a/src/compiler/transformers/es2017.ts
+++ b/src/compiler/transformers/es2017.ts
@@ -13,6 +13,7 @@ namespace ts {
     export function transformES2017(context: TransformationContext) {
         const {
             startLexicalEnvironment,
+            resumeLexicalEnvironment,
             endLexicalEnvironment,
         } = context;
 
@@ -22,7 +23,6 @@ namespace ts {
 
         // These variables contain state that changes as we descend into the tree.
         let currentSourceFile: SourceFile;
-        let helperState: EmitHelperState;
 
         /**
          * Keeps track of whether expression substitution has been enabled for specific edge cases.
@@ -50,8 +50,6 @@ namespace ts {
         context.onEmitNode = onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
 
-        let currentScope: SourceFile | Block | ModuleBlock | CaseBlock;
-
         return transformSourceFile;
 
         function transformSourceFile(node: SourceFile) {
@@ -60,14 +58,11 @@ namespace ts {
             }
 
             currentSourceFile = node;
-            helperState = { currentSourceFile, compilerOptions };
 
             const visited = visitEachChild(node, visitor, context);
-
-            addEmitHelpers(visited, helperState.requestedHelpers);
+            addEmitHelpers(visited, context.readEmitHelpers());
 
             currentSourceFile = undefined;
-            helperState = undefined;
             return visited;
         }
 
@@ -142,22 +137,17 @@ namespace ts {
          */
         function visitMethodDeclaration(node: MethodDeclaration) {
             Debug.assert(hasModifier(node, ModifierFlags.Async));
-            const method = createMethod(
+            const updated = updateMethod(
+                node,
                 /*decorators*/ undefined,
                 visitNodes(node.modifiers, visitor, isModifier),
-                node.asteriskToken,
                 node.name,
                 /*typeParameters*/ undefined,
-                visitNodes(node.parameters, visitor, isParameter),
+                visitParameterList(node.parameters, visitor, context),
                 /*type*/ undefined,
-                transformFunctionBody(node),
-                /*location*/ node
+                transformFunctionBody(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.
-            setOriginalNode(method, node);
-            return method;
+            return updated;
         }
 
         /**
@@ -170,20 +160,17 @@ namespace ts {
          */
         function visitFunctionDeclaration(node: FunctionDeclaration): VisitResult<Statement> {
             Debug.assert(hasModifier(node, ModifierFlags.Async));
-            const func = createFunctionDeclaration(
+            const updated = updateFunctionDeclaration(
+                node,
                 /*decorators*/ undefined,
                 visitNodes(node.modifiers, visitor, isModifier),
-                node.asteriskToken,
                 node.name,
                 /*typeParameters*/ undefined,
-                visitNodes(node.parameters, visitor, isParameter),
+                visitParameterList(node.parameters, visitor, context),
                 /*type*/ undefined,
-                transformFunctionBody(node),
-                /*location*/ node
+                transformFunctionBody(node)
             );
-
-            setOriginalNode(func, node);
-            return func;
+            return updated;
         }
 
         /**
@@ -199,20 +186,18 @@ namespace ts {
             if (nodeIsMissing(node.body)) {
                 return createOmittedExpression();
             }
-
-            const func = createFunctionExpression(
-                /*modifiers*/ undefined,
-                node.asteriskToken,
+            const updated = updateFunctionExpression(
+                node,
+                visitNodes(node.modifiers, visitor, isModifier),
                 node.name,
                 /*typeParameters*/ undefined,
-                visitNodes(node.parameters, visitor, isParameter),
+                visitParameterList(node.parameters, visitor, context),
                 /*type*/ undefined,
-                transformFunctionBody(node),
-                /*location*/ node
+                transformFunctionBody(node)
             );
 
-            setOriginalNode(func, node);
-            return func;
+            setOriginalNode(updated, node);
+            return updated;
         }
 
         /**
@@ -225,42 +210,24 @@ namespace ts {
          */
         function visitArrowFunction(node: ArrowFunction) {
             Debug.assert(hasModifier(node, ModifierFlags.Async));
-            const func = createArrowFunction(
+            const updated = updateArrowFunction(
+                node,
                 visitNodes(node.modifiers, visitor, isModifier),
                 /*typeParameters*/ undefined,
-                visitNodes(node.parameters, visitor, isParameter),
+                visitParameterList(node.parameters, visitor, context),
                 /*type*/ undefined,
-                node.equalsGreaterThanToken,
-                transformConciseBody(node),
-                /*location*/ node
+                transformFunctionBody(node)
             );
 
-            setOriginalNode(func, node);
-            return func;
+            setOriginalNode(updated, node);
+            return updated;
         }
 
-        function transformFunctionBody(node: MethodDeclaration | AccessorDeclaration | FunctionDeclaration | FunctionExpression): FunctionBody {
-            return <FunctionBody>transformAsyncFunctionBody(node);
-        }
-
-        function transformConciseBody(node: ArrowFunction): ConciseBody {
-            return transformAsyncFunctionBody(node);
-        }
-
-        function transformFunctionBodyWorker(body: Block, start = 0) {
-            const savedCurrentScope = currentScope;
-            currentScope = body;
-            startLexicalEnvironment();
-
-            const statements = visitNodes(body.statements, visitor, isStatement, start);
-            const visited = updateBlock(body, statements);
-            const declarations = endLexicalEnvironment();
-            currentScope = savedCurrentScope;
-            return mergeFunctionBodyLexicalEnvironment(visited, declarations);
-        }
-
-        function transformAsyncFunctionBody(node: FunctionLikeDeclaration): ConciseBody | FunctionBody {
-            const nodeType = node.original ? (<FunctionLikeDeclaration>node.original).type : node.type;
+        function transformFunctionBody(node: MethodDeclaration | AccessorDeclaration | FunctionDeclaration | FunctionExpression): FunctionBody;
+        function transformFunctionBody(node: ArrowFunction): ConciseBody;
+        function transformFunctionBody(node: FunctionLikeDeclaration): ConciseBody {
+            const original = getOriginalNode(node, isFunctionLike);
+            const nodeType = original.type;
             const promiseConstructor = languageVersion < ScriptTarget.ES2015 ? getPromiseConstructor(nodeType) : undefined;
             const isArrowFunction = node.kind === SyntaxKind.ArrowFunction;
             const hasLexicalArguments = (resolver.getNodeCheckFlags(node) & NodeCheckFlags.CaptureArguments) !== 0;
@@ -271,6 +238,7 @@ namespace ts {
             // passed to `__awaiter` is executed inside of the callback to the
             // promise constructor.
 
+            resumeLexicalEnvironment();
 
             if (!isArrowFunction) {
                 const statements: Statement[] = [];
@@ -278,7 +246,7 @@ namespace ts {
                 statements.push(
                     createReturn(
                         createAwaiterHelper(
-                            helperState,
+                            context,
                             hasLexicalArguments,
                             promiseConstructor,
                             transformFunctionBodyWorker(<Block>node.body, statementOffset)
@@ -286,6 +254,8 @@ namespace ts {
                     )
                 );
 
+                addRange(statements, endLexicalEnvironment());
+
                 const block = createBlock(statements, /*location*/ node.body, /*multiLine*/ true);
 
                 // Minor optimization, emit `_super` helper to capture `super` access in an arrow.
@@ -304,37 +274,40 @@ namespace ts {
                 return block;
             }
             else {
-                return createAwaiterHelper(
-                    helperState,
+                const expression = createAwaiterHelper(
+                    context,
                     hasLexicalArguments,
                     promiseConstructor,
-                    <Block>transformConciseBodyWorker(node.body, /*forceBlockFunctionBody*/ true)
+                    transformFunctionBodyWorker(node.body)
                 );
+
+                const declarations = endLexicalEnvironment();
+                if (some(declarations)) {
+                    const block = convertToFunctionBody(expression);
+                    const statements = mergeLexicalEnvironment(block.statements, declarations);
+                    return updateBlock(block, statements);
+                }
+
+                return expression;
             }
         }
 
-        function transformConciseBodyWorker(body: Block | Expression, forceBlockFunctionBody: boolean) {
+        function transformFunctionBodyWorker(body: ConciseBody, start?: number) {
             if (isBlock(body)) {
-                return transformFunctionBodyWorker(body);
+                return updateBlock(
+                    body,
+                    visitLexicalEnvironment(body.statements, visitor, context, start));
             }
             else {
                 startLexicalEnvironment();
-                const visited: Expression | Block = visitNode(body, visitor, isConciseBody);
-                const declarations = endLexicalEnvironment();
-                const merged = mergeFunctionBodyLexicalEnvironment(visited, declarations);
-                if (forceBlockFunctionBody && !isBlock(merged)) {
-                    return createBlock([
-                        createReturn(<Expression>merged)
-                    ]);
-                }
-                else {
-                    return merged;
-                }
+                const visited = convertToFunctionBody(visitNode(body, visitor, isConciseBody));
+                const statements = mergeLexicalEnvironment(visited.statements, endLexicalEnvironment());
+                return updateBlock(visited, statements);
             }
         }
 
         function getPromiseConstructor(type: TypeNode) {
-            const typeName = getEntityNameFromTypeNode(type);
+            const typeName = type && getEntityNameFromTypeNode(type);
             if (typeName && isEntityName(typeName)) {
                 const serializationKind = resolver.getTypeReferenceSerializationKind(typeName);
                 if (serializationKind === TypeReferenceSerializationKind.TypeWithConstructSignatureAndValue
@@ -506,7 +479,8 @@ namespace ts {
         }
     }
 
-    function createAwaiterHelper(helperState: EmitHelperState, hasLexicalArguments: boolean, promiseConstructor: EntityName | Expression, body: Block) {
+    function createAwaiterHelper(context: TransformationContext, hasLexicalArguments: boolean, promiseConstructor: EntityName | Expression, body: Block) {
+        context.requestEmitHelper(awaiterHelper);
         const generatorFunc = createFunctionExpression(
             /*modifiers*/ undefined,
             createToken(SyntaxKind.AsteriskToken),
@@ -520,9 +494,8 @@ namespace ts {
         // Mark this node as originally an async function
         (generatorFunc.emitNode || (generatorFunc.emitNode = {})).flags |= EmitFlags.AsyncFunctionBody;
 
-        requestEmitHelper(helperState, awaiterHelper);
         return createCall(
-            getHelperName(helperState, "__awaiter"),
+            getHelperName("__awaiter"),
             /*typeArguments*/ undefined,
             [
                 createThis(),
diff --git a/src/compiler/transformers/generators.ts b/src/compiler/transformers/generators.ts
index 78c9e42c1bf..6047a8d8edd 100644
--- a/src/compiler/transformers/generators.ts
+++ b/src/compiler/transformers/generators.ts
@@ -242,7 +242,6 @@ namespace ts {
         let currentSourceFile: SourceFile;
         let renamedCatchVariables: Map<boolean>;
         let renamedCatchVariableDeclarations: Map<Identifier>;
-        let helperState: EmitHelperState;
 
         let inGeneratorFunctionBody: boolean;
         let inStatementContainingYield: boolean;
@@ -298,13 +297,11 @@ namespace ts {
             }
 
             currentSourceFile = node;
-            helperState = { currentSourceFile, compilerOptions };
 
             const visited = visitEachChild(node, visitor, context);
-            addEmitHelpers(visited, helperState.requestedHelpers);
+            addEmitHelpers(visited, context.readEmitHelpers());
 
             currentSourceFile = undefined;
-            helperState = undefined;
             return visited;
         }
 
@@ -2590,7 +2587,7 @@ namespace ts {
 
             const buildResult = buildStatements();
             return createGeneratorHelper(
-                helperState,
+                context,
                 setEmitFlags(
                     createFunctionExpression(
                         /*modifiers*/ undefined,
@@ -3083,10 +3080,10 @@ namespace ts {
         }
     }
 
-    function createGeneratorHelper(helperState: EmitHelperState, body: FunctionExpression) {
-        requestEmitHelper(helperState, generatorHelper);
+    function createGeneratorHelper(context: TransformationContext, body: FunctionExpression) {
+        context.requestEmitHelper(generatorHelper);
         return createCall(
-            getHelperName(helperState, "__generator"),
+            getHelperName("__generator"),
             /*typeArguments*/ undefined,
             [createThis(), body]);
     }
diff --git a/src/compiler/transformers/jsx.ts b/src/compiler/transformers/jsx.ts
index 8867896e51e..e342f2b7906 100644
--- a/src/compiler/transformers/jsx.ts
+++ b/src/compiler/transformers/jsx.ts
@@ -6,7 +6,6 @@ namespace ts {
     export function transformJsx(context: TransformationContext) {
         const compilerOptions = context.getCompilerOptions();
         let currentSourceFile: SourceFile;
-        let helperState: EmitHelperState;
 
         return transformSourceFile;
 
@@ -21,13 +20,11 @@ namespace ts {
             }
 
             currentSourceFile = node;
-            helperState = { currentSourceFile, compilerOptions };
 
             const visited = visitEachChild(node, visitor, context);
-            addEmitHelpers(visited, helperState.requestedHelpers);
+            addEmitHelpers(visited, context.readEmitHelpers());
 
             currentSourceFile = undefined;
-            helperState = undefined;
             return visited;
         }
 
@@ -116,7 +113,7 @@ namespace ts {
                 // a call to the __assign helper.
                 objectProperties = singleOrUndefined(segments);
                 if (!objectProperties) {
-                    objectProperties = createAssignHelper(helperState, segments);
+                    objectProperties = createAssignHelper(context, segments);
                 }
             }
 
@@ -538,10 +535,10 @@ namespace ts {
         "diams": 0x2666
     });
 
-    function createAssignHelper(helperState: EmitHelperState, attributesSegments: Expression[]) {
-        requestEmitHelper(helperState, assignHelper);
+    function createAssignHelper(context: TransformationContext, attributesSegments: Expression[]) {
+        context.requestEmitHelper(assignHelper);
         return createCall(
-            getHelperName(helperState, "__assign"),
+            getHelperName("__assign"),
             /*typeArguments*/ undefined,
             attributesSegments
         );
diff --git a/src/compiler/transformers/module/es2015.ts b/src/compiler/transformers/module/es2015.ts
index daef9cb5a4d..5611f890164 100644
--- a/src/compiler/transformers/module/es2015.ts
+++ b/src/compiler/transformers/module/es2015.ts
@@ -5,6 +5,14 @@
 namespace ts {
     export function transformES2015Module(context: TransformationContext) {
         const compilerOptions = context.getCompilerOptions();
+        const previousOnEmitNode = context.onEmitNode;
+        const previousOnSubstituteNode = context.onSubstituteNode;
+        context.onEmitNode = onEmitNode;
+        context.onSubstituteNode = onSubstituteNode;
+        context.enableEmitNotification(SyntaxKind.SourceFile);
+        context.enableSubstitution(SyntaxKind.Identifier);
+
+        let currentSourceFile: SourceFile;
         return transformSourceFile;
 
         function transformSourceFile(node: SourceFile) {
@@ -13,7 +21,7 @@ namespace ts {
             }
 
             if (isExternalModule(node) || compilerOptions.isolatedModules) {
-                const externalHelpersModuleName = getExternalHelpersModuleName(node);
+                const externalHelpersModuleName = getOrCreateExternalHelpersModuleNameIfNeeded(node, compilerOptions);
                 if (externalHelpersModuleName) {
                     const statements: Statement[] = [];
                     const statementOffset = addPrologueDirectives(statements, node.statements);
@@ -55,5 +63,55 @@ namespace ts {
             // Elide `export=` as it is not legal with --module ES6
             return node.isExportEquals ? undefined : node;
         }
+
+        //
+        // Emit Notification
+        //
+
+        /**
+         * Hook for node emit.
+         *
+         * @param emitContext A context hint for the emitter.
+         * @param node The node to emit.
+         * @param emit A callback used to emit the node in the printer.
+         */
+        function onEmitNode(emitContext: EmitContext, node: Node, emitCallback: (emitContext: EmitContext, node: Node) => void): void {
+            if (isSourceFile(node)) {
+                currentSourceFile = node;
+                previousOnEmitNode(emitContext, node, emitCallback);
+                currentSourceFile = undefined;
+            }
+            else {
+                previousOnEmitNode(emitContext, node, emitCallback);
+            }
+        }
+
+        //
+        // Substitutions
+        //
+
+        /**
+         * Hooks node substitutions.
+         *
+         * @param emitContext A context hint for the emitter.
+         * @param node The node to substitute.
+         */
+        function onSubstituteNode(emitContext: EmitContext, node: Node) {
+            node = previousOnSubstituteNode(emitContext, node);
+            if (isIdentifier(node) && emitContext === EmitContext.Expression) {
+                return substituteExpressionIdentifier(node);
+            }
+            return node;
+        }
+
+        function substituteExpressionIdentifier(node: Identifier): Expression {
+            if (getEmitFlags(node) & EmitFlags.HelperName) {
+                const externalHelpersModuleName = getExternalHelpersModuleName(currentSourceFile);
+                if (externalHelpersModuleName) {
+                    return createPropertyAccess(externalHelpersModuleName, node);
+                }
+            }
+            return node;
+        }
     }
 }
diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
index 22e4e844a69..7b6fcc60f1b 100644
--- a/src/compiler/transformers/module/module.ts
+++ b/src/compiler/transformers/module/module.ts
@@ -61,7 +61,7 @@ namespace ts {
             }
 
             currentSourceFile = node;
-            currentModuleInfo = moduleInfoMap[getOriginalNodeId(node)] = collectExternalModuleInfo(node, resolver);
+            currentModuleInfo = moduleInfoMap[getOriginalNodeId(node)] = collectExternalModuleInfo(node, resolver, compilerOptions);
 
             // Perform the transformation.
             const transformModule = transformModuleDelegates[moduleKind] || transformModuleDelegates[ModuleKind.None];
@@ -1187,6 +1187,14 @@ namespace ts {
          * @param node The node to substitute.
          */
         function substituteExpressionIdentifier(node: Identifier): Expression {
+            if (getEmitFlags(node) & EmitFlags.HelperName) {
+                const externalHelpersModuleName = getExternalHelpersModuleName(currentSourceFile);
+                if (externalHelpersModuleName) {
+                    return createPropertyAccess(externalHelpersModuleName, node);
+                }
+                return node;
+            }
+
             if (!isGeneratedIdentifier(node) && !isLocalName(node)) {
                 const exportContainer = resolver.getReferencedExportContainer(node, isExportName(node));
                 if (exportContainer && exportContainer.kind === SyntaxKind.SourceFile) {
diff --git a/src/compiler/transformers/module/system.ts b/src/compiler/transformers/module/system.ts
index 4b24d5c1641..b979f66efd1 100644
--- a/src/compiler/transformers/module/system.ts
+++ b/src/compiler/transformers/module/system.ts
@@ -73,7 +73,7 @@ namespace ts {
             // see comment to 'substitutePostfixUnaryExpression' for more details
 
             // Collect information about the external module and dependency groups.
-            moduleInfo = moduleInfoMap[id] = collectExternalModuleInfo(node, resolver);
+            moduleInfo = moduleInfoMap[id] = collectExternalModuleInfo(node, resolver, compilerOptions);
 
             // Make sure that the name of the 'exports' function does not conflict with
             // existing identifiers.
@@ -1609,6 +1609,14 @@ namespace ts {
          * @param node The node to substitute.
          */
         function substituteExpressionIdentifier(node: Identifier): Expression {
+            if (getEmitFlags(node) & EmitFlags.HelperName) {
+                const externalHelpersModuleName = getExternalHelpersModuleName(currentSourceFile);
+                if (externalHelpersModuleName) {
+                    return createPropertyAccess(externalHelpersModuleName, node);
+                }
+                return node;
+            }
+
             // When we see an identifier in an expression position that
             // points to an imported symbol, we should substitute a qualified
             // reference to the imported symbol if one is needed.
diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
index 02c7b107b25..09bfba2263e 100644
--- a/src/compiler/transformers/ts.ts
+++ b/src/compiler/transformers/ts.ts
@@ -21,6 +21,7 @@ namespace ts {
     export function transformTypeScript(context: TransformationContext) {
         const {
             startLexicalEnvironment,
+            resumeLexicalEnvironment,
             endLexicalEnvironment,
             hoistVariableDeclaration,
         } = context;
@@ -48,7 +49,6 @@ namespace ts {
         let currentNamespaceContainerName: Identifier;
         let currentScope: SourceFile | Block | ModuleBlock | CaseBlock;
         let currentScopeFirstDeclarationsOfName: Map<Node>;
-        let helperState: EmitHelperState;
 
         /**
          * Keeps track of whether expression substitution has been enabled for specific edge cases.
@@ -81,21 +81,11 @@ namespace ts {
             }
 
             currentSourceFile = node;
-            currentScope = node;
-            currentScopeFirstDeclarationsOfName = createMap<Node>();
-            helperState = { currentSourceFile, compilerOptions };
 
-            let visited = visitEachChild(node, sourceElementVisitor, context);
-            if (compilerOptions.alwaysStrict) {
-                visited = updateSourceFileNode(visited, ensureUseStrict(visited.statements));
-            }
-
-            addEmitHelpers(visited, helperState.requestedHelpers);
+            const visited = saveStateAndInvoke(node, visitSourceFile);
+            addEmitHelpers(visited, context.readEmitHelpers());
 
             currentSourceFile = undefined;
-            currentScope = undefined;
-            currentScopeFirstDeclarationsOfName = undefined;
-            helperState = undefined;
             return visited;
         }
 
@@ -123,6 +113,32 @@ namespace ts {
             return visited;
         }
 
+        /**
+         * Performs actions that should always occur immediately before visiting a node.
+         *
+         * @param node The node to visit.
+         */
+        function onBeforeVisitNode(node: Node) {
+            switch (node.kind) {
+                case SyntaxKind.SourceFile:
+                case SyntaxKind.CaseBlock:
+                case SyntaxKind.ModuleBlock:
+                case SyntaxKind.Block:
+                    currentScope = <SourceFile | CaseBlock | ModuleBlock | Block>node;
+                    currentScopeFirstDeclarationsOfName = undefined;
+                    break;
+
+                case SyntaxKind.ClassDeclaration:
+                case SyntaxKind.FunctionDeclaration:
+                    if (hasModifier(node, ModifierFlags.Ambient)) {
+                        break;
+                    }
+
+                    recordEmittedDeclarationInScope(node);
+                    break;
+            }
+        }
+
         /**
          * General-purpose node visitor.
          *
@@ -451,29 +467,10 @@ namespace ts {
             }
         }
 
-        /**
-         * Performs actions that should always occur immediately before visiting a node.
-         *
-         * @param node The node to visit.
-         */
-        function onBeforeVisitNode(node: Node) {
-            switch (node.kind) {
-                case SyntaxKind.CaseBlock:
-                case SyntaxKind.ModuleBlock:
-                case SyntaxKind.Block:
-                    currentScope = <SourceFile | CaseBlock | ModuleBlock | Block>node;
-                    currentScopeFirstDeclarationsOfName = undefined;
-                    break;
-
-                case SyntaxKind.ClassDeclaration:
-                case SyntaxKind.FunctionDeclaration:
-                    if (hasModifier(node, ModifierFlags.Ambient)) {
-                        break;
-                    }
-
-                    recordEmittedDeclarationInScope(node);
-                    break;
-            }
+        function visitSourceFile(node: SourceFile) {
+            return updateSourceFileNode(
+                node,
+                visitLexicalEnvironment(node.statements, sourceElementVisitor, context, /*start*/ 0, compilerOptions.alwaysStrict));
         }
 
         /**
@@ -845,9 +842,8 @@ namespace ts {
             // 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 constructor
-                ? visitNodes(constructor.parameters, visitor, isParameter)
-                : <ParameterDeclaration[]>[];
+            return visitParameterList(constructor && constructor.parameters, visitor, context)
+                || <ParameterDeclaration[]>[];
         }
 
         /**
@@ -863,7 +859,7 @@ namespace ts {
             let indexOfFirstStatement = 0;
 
             // The body of a constructor is a new lexical environment
-            startLexicalEnvironment();
+            resumeLexicalEnvironment();
 
             if (constructor) {
                 indexOfFirstStatement = addPrologueDirectivesAndInitialSuperCall(constructor, statements);
@@ -919,15 +915,13 @@ namespace ts {
 
             // End the lexical environment.
             addRange(statements, endLexicalEnvironment());
-            return setMultiLine(
-                createBlock(
-                    createNodeArray(
-                        statements,
-                        /*location*/ constructor ? constructor.body.statements : node.members
-                    ),
-                    /*location*/ constructor ? constructor.body : /*location*/ undefined
+            return createBlock(
+                createNodeArray(
+                    statements,
+                    /*location*/ constructor ? constructor.body.statements : node.members
                 ),
-                true
+                /*location*/ constructor ? constructor.body : /*location*/ undefined,
+                /*multiLine*/ true
             );
         }
 
@@ -1385,7 +1379,7 @@ namespace ts {
                 : undefined;
 
             const helper = createDecorateHelper(
-                helperState,
+                context,
                 decoratorExpressions,
                 prefix,
                 memberName,
@@ -1423,7 +1417,7 @@ namespace ts {
 
             const classAlias = classAliases && classAliases[getOriginalNodeId(node)];
             const localName = getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
-            const decorate = createDecorateHelper(helperState, decoratorExpressions, localName);
+            const decorate = createDecorateHelper(context, decoratorExpressions, localName);
             const expression = createAssignment(localName, classAlias ? createAssignment(classAlias, decorate) : decorate);
             setEmitFlags(expression, EmitFlags.NoComments);
             setSourceMapRange(expression, moveRangePastDecorators(node));
@@ -1451,7 +1445,7 @@ namespace ts {
                 expressions = [];
                 for (const decorator of decorators) {
                     const helper = createParamHelper(
-                        helperState,
+                        context,
                         transformDecorator(decorator),
                         parameterOffset,
                         /*location*/ decorator.expression);
@@ -1481,13 +1475,13 @@ namespace ts {
         function addOldTypeMetadata(node: Declaration, decoratorExpressions: Expression[]) {
             if (compilerOptions.emitDecoratorMetadata) {
                 if (shouldAddTypeMetadata(node)) {
-                    decoratorExpressions.push(createMetadataHelper(helperState, "design:type", serializeTypeOfNode(node)));
+                    decoratorExpressions.push(createMetadataHelper(context, "design:type", serializeTypeOfNode(node)));
                 }
                 if (shouldAddParamTypesMetadata(node)) {
-                    decoratorExpressions.push(createMetadataHelper(helperState, "design:paramtypes", serializeParameterTypesOfNode(node)));
+                    decoratorExpressions.push(createMetadataHelper(context, "design:paramtypes", serializeParameterTypesOfNode(node)));
                 }
                 if (shouldAddReturnTypeMetadata(node)) {
-                    decoratorExpressions.push(createMetadataHelper(helperState, "design:returntype", serializeReturnTypeOfNode(node)));
+                    decoratorExpressions.push(createMetadataHelper(context, "design:returntype", serializeReturnTypeOfNode(node)));
                 }
             }
         }
@@ -1505,7 +1499,7 @@ namespace ts {
                     (properties || (properties = [])).push(createPropertyAssignment("returnType", createArrowFunction(/*modifiers*/ undefined, /*typeParameters*/ undefined, [], /*type*/ undefined, createToken(SyntaxKind.EqualsGreaterThanToken), serializeReturnTypeOfNode(node))));
                 }
                 if (properties) {
-                    decoratorExpressions.push(createMetadataHelper(helperState, "design:typeinfo", createObjectLiteral(properties, /*location*/ undefined, /*multiLine*/ true)));
+                    decoratorExpressions.push(createMetadataHelper(context, "design:typeinfo", createObjectLiteral(properties, /*location*/ undefined, /*multiLine*/ true)));
                 }
             }
         }
@@ -2020,26 +2014,23 @@ namespace ts {
             if (!shouldEmitFunctionLikeDeclaration(node)) {
                 return undefined;
             }
-
-            const method = createMethod(
+            const updated = updateMethod(
+                node,
                 /*decorators*/ undefined,
                 visitNodes(node.modifiers, modifierVisitor, isModifier),
-                node.asteriskToken,
                 visitPropertyNameOfClassElement(node),
                 /*typeParameters*/ undefined,
-                visitNodes(node.parameters, visitor, isParameter),
+                visitParameterList(node.parameters, visitor, context),
                 /*type*/ undefined,
-                transformFunctionBody(node),
-                /*location*/ node
+                visitFunctionBody(node.body, visitor, context)
             );
-
-            // While we emit the source map for the node after skipping decorators and modifiers,
-            // we need to emit the comments for the original range.
-            setCommentRange(method, node);
-            setSourceMapRange(method, moveRangePastDecorators(node));
-            setOriginalNode(method, node);
-
-            return method;
+            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.
+                setCommentRange(updated, node);
+                setSourceMapRange(updated, moveRangePastDecorators(node));
+            }
+            return updated;
         }
 
         /**
@@ -2065,24 +2056,22 @@ namespace ts {
             if (!shouldEmitAccessorDeclaration(node)) {
                 return undefined;
             }
-
-            const accessor = createGetAccessor(
+            const updated = updateGetAccessor(
+                node,
                 /*decorators*/ undefined,
                 visitNodes(node.modifiers, modifierVisitor, isModifier),
                 visitPropertyNameOfClassElement(node),
-                visitNodes(node.parameters, visitor, isParameter),
+                visitParameterList(node.parameters, visitor, context),
                 /*type*/ undefined,
-                node.body ? visitEachChild(node.body, visitor, context) : createBlock([]),
-                /*location*/ node
+                visitFunctionBody(node.body, visitor, context) || createBlock([])
             );
-
-            // While we emit the source map for the node after skipping decorators and modifiers,
-            // we need to emit the comments for the original range.
-            setOriginalNode(accessor, node);
-            setCommentRange(accessor, node);
-            setSourceMapRange(accessor, moveRangePastDecorators(node));
-
-            return accessor;
+            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.
+                setCommentRange(updated, node);
+                setSourceMapRange(updated, moveRangePastDecorators(node));
+            }
+            return updated;
         }
 
         /**
@@ -2098,23 +2087,21 @@ namespace ts {
             if (!shouldEmitAccessorDeclaration(node)) {
                 return undefined;
             }
-
-            const accessor = createSetAccessor(
+            const updated = updateSetAccessor(
+                node,
                 /*decorators*/ undefined,
                 visitNodes(node.modifiers, modifierVisitor, isModifier),
                 visitPropertyNameOfClassElement(node),
-                visitNodes(node.parameters, visitor, isParameter),
-                node.body ? visitEachChild(node.body, visitor, context) : createBlock([]),
-                /*location*/ node
+                visitParameterList(node.parameters, visitor, context),
+                visitFunctionBody(node.body, visitor, context) || createBlock([])
             );
-
-            // While we emit the source map for the node after skipping decorators and modifiers,
-            // we need to emit the comments for the original range.
-            setOriginalNode(accessor, node);
-            setCommentRange(accessor, node);
-            setSourceMapRange(accessor, moveRangePastDecorators(node));
-
-            return accessor;
+            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.
+                setCommentRange(updated, node);
+                setSourceMapRange(updated, moveRangePastDecorators(node));
+            }
+            return updated;
         }
 
         /**
@@ -2131,27 +2118,22 @@ namespace ts {
             if (!shouldEmitFunctionLikeDeclaration(node)) {
                 return createNotEmittedStatement(node);
             }
-
-            const func = createFunctionDeclaration(
+            const updated = updateFunctionDeclaration(
+                node,
                 /*decorators*/ undefined,
                 visitNodes(node.modifiers, modifierVisitor, isModifier),
-                node.asteriskToken,
                 node.name,
                 /*typeParameters*/ undefined,
-                visitNodes(node.parameters, visitor, isParameter),
+                visitParameterList(node.parameters, visitor, context),
                 /*type*/ undefined,
-                transformFunctionBody(node),
-                /*location*/ node
+                visitFunctionBody(node.body, visitor, context) || createBlock([])
             );
-            setOriginalNode(func, node);
-
             if (isNamespaceExport(node)) {
-                const statements: Statement[] = [func];
+                const statements: Statement[] = [updated];
                 addExportMemberAssignment(statements, node);
                 return statements;
             }
-
-            return func;
+            return updated;
         }
 
         /**
@@ -2166,21 +2148,16 @@ namespace ts {
             if (nodeIsMissing(node.body)) {
                 return createOmittedExpression();
             }
-
-            const func = createFunctionExpression(
+            const updated = updateFunctionExpression(
+                node,
                 visitNodes(node.modifiers, modifierVisitor, isModifier),
-                node.asteriskToken,
                 node.name,
                 /*typeParameters*/ undefined,
-                visitNodes(node.parameters, visitor, isParameter),
+                visitParameterList(node.parameters, visitor, context),
                 /*type*/ undefined,
-                transformFunctionBody(node),
-                /*location*/ node
+                visitFunctionBody(node.body, visitor, context)
             );
-
-            setOriginalNode(func, node);
-
-            return func;
+            return updated;
         }
 
         /**
@@ -2189,62 +2166,15 @@ namespace ts {
          * - The node has type annotations
          */
         function visitArrowFunction(node: ArrowFunction) {
-            const func = createArrowFunction(
+            const updated = updateArrowFunction(
+                node,
                 visitNodes(node.modifiers, modifierVisitor, isModifier),
                 /*typeParameters*/ undefined,
-                visitNodes(node.parameters, visitor, isParameter),
+                visitParameterList(node.parameters, visitor, context),
                 /*type*/ undefined,
-                node.equalsGreaterThanToken,
-                transformConciseBody(node),
-                /*location*/ node
+                visitFunctionBody(node.body, visitor, context)
             );
-
-            setOriginalNode(func, node);
-
-            return func;
-        }
-
-        function transformFunctionBody(node: MethodDeclaration | AccessorDeclaration | FunctionDeclaration | FunctionExpression): FunctionBody {
-            return transformFunctionBodyWorker(node.body);
-        }
-
-        function transformFunctionBodyWorker(body: Block, start = 0) {
-            const savedCurrentScope = currentScope;
-            const savedCurrentScopeFirstDeclarationsOfName = currentScopeFirstDeclarationsOfName;
-            currentScope = body;
-            currentScopeFirstDeclarationsOfName = createMap<Node>();
-            startLexicalEnvironment();
-
-            const statements = visitNodes(body.statements, visitor, isStatement, start);
-            const visited = updateBlock(body, statements);
-            const declarations = endLexicalEnvironment();
-            currentScope = savedCurrentScope;
-            currentScopeFirstDeclarationsOfName = savedCurrentScopeFirstDeclarationsOfName;
-            return mergeFunctionBodyLexicalEnvironment(visited, declarations);
-        }
-
-        function transformConciseBody(node: ArrowFunction): ConciseBody {
-            return transformConciseBodyWorker(node.body, /*forceBlockFunctionBody*/ false);
-        }
-
-        function transformConciseBodyWorker(body: Block | Expression, forceBlockFunctionBody: boolean) {
-            if (isBlock(body)) {
-                return transformFunctionBodyWorker(body);
-            }
-            else {
-                startLexicalEnvironment();
-                const visited: Expression | Block = visitNode(body, visitor, isConciseBody);
-                const declarations = endLexicalEnvironment();
-                const merged = mergeFunctionBodyLexicalEnvironment(visited, declarations);
-                if (forceBlockFunctionBody && !isBlock(merged)) {
-                    return createBlock([
-                        createReturn(<Expression>merged)
-                    ]);
-                }
-                else {
-                    return merged;
-                }
-            }
+            return updated;
         }
 
         /**
@@ -3316,7 +3246,7 @@ namespace ts {
 
         function trySubstituteNamespaceExportedName(node: Identifier): Expression {
             // If this is explicitly a local name, do not substitute.
-            if (enabledSubstitutions & applicableSubstitutions && !isLocalName(node)) {
+            if (enabledSubstitutions & applicableSubstitutions && !isGeneratedIdentifier(node) && !isLocalName(node)) {
                 // If we are nested within a namespace declaration, we may need to qualifiy
                 // an identifier that is exported from a merged namespace.
                 const container = resolver.getReferencedExportContainer(node, /*prefixLocals*/ false);
@@ -3372,10 +3302,20 @@ namespace ts {
         }
     }
 
-    function createParamHelper(helperState: EmitHelperState, expression: Expression, parameterOffset: number, location?: TextRange) {
-        requestEmitHelper(helperState, paramHelper);
+    const paramHelper: EmitHelper = {
+        name: "typescript:param",
+        scoped: false,
+        priority: 4,
+        text: `
+            var __param = (this && this.__param) || function (paramIndex, decorator) {
+                return function (target, key) { decorator(target, key, paramIndex); }
+            };`
+    };
+
+    function createParamHelper(context: TransformationContext, expression: Expression, parameterOffset: number, location?: TextRange) {
+        context.requestEmitHelper(paramHelper);
         return createCall(
-            getHelperName(helperState, "__param"),
+            getHelperName("__param"),
             /*typeArguments*/ undefined,
             [
                 createLiteral(parameterOffset),
@@ -3385,10 +3325,20 @@ namespace ts {
         );
     }
 
-    function createMetadataHelper(helperState: EmitHelperState, metadataKey: string, metadataValue: Expression) {
-        requestEmitHelper(helperState, metadataHelper);
+    const metadataHelper: EmitHelper = {
+        name: "typescript:metadata",
+        scoped: false,
+        priority: 3,
+        text: `
+            var __metadata = (this && this.__metadata) || function (k, v) {
+                if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+            };`
+    };
+
+    function createMetadataHelper(context: TransformationContext, metadataKey: string, metadataValue: Expression) {
+        context.requestEmitHelper(metadataHelper);
         return createCall(
-            getHelperName(helperState, "__metadata"),
+            getHelperName("__metadata"),
             /*typeArguments*/ undefined,
             [
                 createLiteral(metadataKey),
@@ -3397,20 +3347,6 @@ namespace ts {
         );
     }
 
-    function createDecorateHelper(helperState: EmitHelperState, decoratorExpressions: Expression[], target: Expression, memberName?: Expression, descriptor?: Expression, location?: TextRange) {
-        const argumentsArray: Expression[] = [];
-        argumentsArray.push(createArrayLiteral(decoratorExpressions, /*location*/ undefined, /*multiLine*/ true));
-        argumentsArray.push(target);
-        if (memberName) {
-            argumentsArray.push(memberName);
-            if (descriptor) {
-                argumentsArray.push(descriptor);
-            }
-        }
-
-        requestEmitHelper(helperState, decorateHelper);
-        return createCall(getHelperName(helperState, "__decorate"), /*typeArguments*/ undefined, argumentsArray, location);
-    }
 
     const decorateHelper: EmitHelper = {
         name: "typescript:decorate",
@@ -3425,23 +3361,18 @@ namespace ts {
             };`
     };
 
-    const metadataHelper: EmitHelper = {
-        name: "typescript:metadata",
-        scoped: false,
-        priority: 3,
-        text: `
-            var __metadata = (this && this.__metadata) || function (k, v) {
-                if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-            };`
-    };
+    function createDecorateHelper(context: TransformationContext, decoratorExpressions: Expression[], target: Expression, memberName?: Expression, descriptor?: Expression, location?: TextRange) {
+        context.requestEmitHelper(decorateHelper);
+        const argumentsArray: Expression[] = [];
+        argumentsArray.push(createArrayLiteral(decoratorExpressions, /*location*/ undefined, /*multiLine*/ true));
+        argumentsArray.push(target);
+        if (memberName) {
+            argumentsArray.push(memberName);
+            if (descriptor) {
+                argumentsArray.push(descriptor);
+            }
+        }
 
-    const paramHelper: EmitHelper = {
-        name: "typescript:param",
-        scoped: false,
-        priority: 4,
-        text: `
-            var __param = (this && this.__param) || function (paramIndex, decorator) {
-                return function (target, key) { decorator(target, key, paramIndex); }
-            };`
-    };
+        return createCall(getHelperName("__decorate"), /*typeArguments*/ undefined, argumentsArray, location);
+    }
 }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 69ac1d76c9e..178e0bf6de7 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -1503,6 +1503,11 @@ namespace ts {
         expression: Expression;
     }
 
+    /* @internal */
+    export interface PrologueDirective extends ExpressionStatement {
+        expression: StringLiteral;
+    }
+
     export interface IfStatement extends Statement {
         kind: SyntaxKind.IfStatement;
         expression: Expression;
@@ -3541,15 +3546,16 @@ 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,
-        ExportName = 1 << 12,                    // Ensure an export prefix is added for an identifier that points to an exported declaration with a local name (see SymbolFlags.ExportHasLocal).
-        LocalName = 1 << 13,                     // Ensure an export prefix is not added for an identifier that points to an exported declaration.
-        Indented = 1 << 14,                      // Adds an explicit extra indentation level for class and function bodies when printing (used to match old emitter).
-        NoIndentation = 1 << 15,                 // Do not indent the node.
-        AsyncFunctionBody = 1 << 16,
-        ReuseTempVariableScope = 1 << 17,        // Reuse the existing temp variable scope during emit.
-        CustomPrologue = 1 << 18,                // Treat the statement as if it were a prologue directive (NOTE: Prologue directives are *not* transformed).
-        NoHoisting = 1 << 19,                    // Do not hoist this declaration in --module system
-        HasEndOfDeclarationMarker = 1 << 20,     // Declaration has an associated NotEmittedStatement to mark the end of the declaration
+        HelperName = 1 << 12,
+        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.
+        Indented = 1 << 15,                      // Adds an explicit extra indentation level for class and function bodies when printing (used to match old emitter).
+        NoIndentation = 1 << 16,                 // Do not indent the node.
+        AsyncFunctionBody = 1 << 17,
+        ReuseTempVariableScope = 1 << 18,        // Reuse the existing temp variable scope during emit.
+        CustomPrologue = 1 << 19,                // Treat the statement as if it were a prologue directive (NOTE: Prologue directives are *not* transformed).
+        NoHoisting = 1 << 20,                    // Do not hoist this declaration in --module system
+        HasEndOfDeclarationMarker = 1 << 21,     // Declaration has an associated NotEmittedStatement to mark the end of the declaration
     }
 
     /* @internal */
@@ -3568,16 +3574,123 @@ namespace ts {
         Unspecified,        // Emitting an otherwise unspecified node
     }
 
-    /** Additional context provided to `visitEachChild` */
     /* @internal */
-    export interface LexicalEnvironment {
+    export interface EmitHost extends ScriptReferenceHost {
+        getSourceFiles(): SourceFile[];
+
+        /* @internal */
+        isSourceFileFromExternalLibrary(file: SourceFile): boolean;
+
+        getCommonSourceDirectory(): string;
+        getCanonicalFileName(fileName: string): string;
+        getNewLine(): string;
+
+        isEmitBlocked(emitFileName: string): boolean;
+
+        writeFile: WriteFileCallback;
+    }
+
+    /* @internal */
+    export interface TransformationContext {
+        getCompilerOptions(): CompilerOptions;
+        getEmitResolver(): EmitResolver;
+        getEmitHost(): EmitHost;
+
         /** Starts a new lexical environment. */
         startLexicalEnvironment(): void;
 
+        /** Suspends the current lexical environment, usually after visiting a parameter list. */
+        suspendLexicalEnvironment(): void;
+
+        /** Resumes a suspended lexical environment, usually before visiting a function body. */
+        resumeLexicalEnvironment(): void;
+
         /** Ends a lexical environment, returning any declarations. */
         endLexicalEnvironment(): Statement[];
+
+        /**
+         * Hoists a function declaration to the containing scope.
+         */
+        hoistFunctionDeclaration(node: FunctionDeclaration): void;
+
+        /**
+         * Hoists a variable declaration to the containing scope.
+         */
+        hoistVariableDeclaration(node: Identifier): void;
+
+        /**
+         * Records a request for a non-scoped emit helper in the current context.
+         */
+        requestEmitHelper(helper: EmitHelper): void;
+
+        /**
+         * Gets and resets the requested non-scoped emit helpers.
+         */
+        readEmitHelpers(): EmitHelper[] | undefined;
+
+        /**
+         * Enables expression substitutions in the pretty printer for the provided SyntaxKind.
+         */
+        enableSubstitution(kind: SyntaxKind): void;
+
+        /**
+         * Determines whether expression substitutions are enabled for the provided node.
+         */
+        isSubstitutionEnabled(node: Node): boolean;
+
+        /**
+         * Hook used by transformers to substitute expressions just before they
+         * are emitted by the pretty printer.
+         */
+        onSubstituteNode?: (emitContext: EmitContext, node: Node) => Node;
+
+        /**
+         * Enables before/after emit notifications in the pretty printer for the provided
+         * SyntaxKind.
+         */
+        enableEmitNotification(kind: SyntaxKind): void;
+
+        /**
+         * Determines whether before/after emit notifications should be raised in the pretty
+         * printer when it emits a node.
+         */
+        isEmitNotificationEnabled(node: Node): boolean;
+
+        /**
+         * Hook used to allow transformers to capture state before or after
+         * the printer emits a node.
+         */
+        onEmitNode?: (emitContext: EmitContext, node: Node, emitCallback: (emitContext: EmitContext, node: Node) => void) => void;
     }
 
+    /* @internal */
+    export interface TransformationResult {
+        /**
+         * Gets the transformed source files.
+         */
+        transformed: SourceFile[];
+
+        /**
+         * Emits the substitute for a node, if one is available; otherwise, emits the node.
+         *
+         * @param emitContext The current emit context.
+         * @param node The node to substitute.
+         * @param emitCallback A callback used to emit the node or its substitute.
+         */
+        emitNodeWithSubstitution(emitContext: EmitContext, node: Node, emitCallback: (emitContext: EmitContext, node: Node) => void): void;
+
+        /**
+         * Emits a node with possible notification.
+         *
+         * @param emitContext The current emit context.
+         * @param node The node to emit.
+         * @param emitCallback A callback used to emit the node.
+         */
+        emitNodeWithNotification(emitContext: EmitContext, node: Node, emitCallback: (emitContext: EmitContext, node: Node) => void): void;
+    }
+
+    /* @internal */
+    export type Transformer = (context: TransformationContext) => (node: SourceFile) => SourceFile;
 
     export interface TextSpan {
         start: number;
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 79e15566e1d..5bdcf27769f 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -28,21 +28,6 @@ namespace ts {
         string(): string;
     }
 
-    export interface EmitHost extends ScriptReferenceHost {
-        getSourceFiles(): SourceFile[];
-
-        /* @internal */
-        isSourceFileFromExternalLibrary(file: SourceFile): boolean;
-
-        getCommonSourceDirectory(): string;
-        getCanonicalFileName(fileName: string): string;
-        getNewLine(): string;
-
-        isEmitBlocked(emitFileName: string): boolean;
-
-        writeFile: WriteFileCallback;
-    }
-
     // Pool writers to avoid needing to allocate them for every symbol we write.
     const stringWriters: StringSymbolWriter[] = [];
     export function getSingleLineStringWriter(): StringSymbolWriter {
@@ -595,8 +580,9 @@ namespace ts {
         return n.kind === SyntaxKind.CallExpression && (<CallExpression>n).expression.kind === SyntaxKind.SuperKeyword;
     }
 
-    export function isPrologueDirective(node: Node): boolean {
-        return node.kind === SyntaxKind.ExpressionStatement && (<ExpressionStatement>node).expression.kind === SyntaxKind.StringLiteral;
+    export function isPrologueDirective(node: Node): node is PrologueDirective {
+        return node.kind === SyntaxKind.ExpressionStatement
+            && (<ExpressionStatement>node).expression.kind === SyntaxKind.StringLiteral;
     }
 
     export function getLeadingCommentRangesOfNode(node: Node, sourceFileOfNode: SourceFile) {
diff --git a/src/compiler/visitor.ts b/src/compiler/visitor.ts
index 609031a8221..dc0e69a9b0f 100644
--- a/src/compiler/visitor.ts
+++ b/src/compiler/visitor.ts
@@ -653,6 +653,53 @@ namespace ts {
         return updated || nodes;
     }
 
+    /**
+     * Starts a new lexical environment and visits a statement list, ending the lexical environment
+     * and merging hoisted declarations upon completion.
+     */
+    export function visitLexicalEnvironment(statements: NodeArray<Statement>, visitor: (node: Node) => VisitResult<Node>, context: TransformationContext, start?: number, ensureUseStrict?: boolean) {
+        context.startLexicalEnvironment();
+        statements = visitNodes(statements, visitor, isStatement, start);
+        if (ensureUseStrict && !startsWithUseStrict(statements)) {
+            statements = createNodeArray([createStatement(createLiteral("use strict")), ...statements], statements);
+        }
+        statements = mergeLexicalEnvironment(statements, context.endLexicalEnvironment());
+        return statements;
+    }
+
+    /**
+     * Starts a new lexical environment and visits a parameter list, suspending the lexical
+     * environment upon completion.
+     */
+    export function visitParameterList(nodes: NodeArray<ParameterDeclaration>, visitor: (node: Node) => VisitResult<Node>, context: TransformationContext) {
+        context.startLexicalEnvironment();
+        const updated = visitNodes(nodes, visitor, isParameterDeclaration);
+        context.suspendLexicalEnvironment();
+        return updated;
+    }
+
+    /**
+     * Resumes a suspended lexical environment and visits a function body, ending the lexical
+     * environment and merging hoisted declarations upon completion.
+     */
+    export function visitFunctionBody(node: FunctionBody, visitor: (node: Node) => VisitResult<Node>, context: TransformationContext, optional?: boolean): FunctionBody;
+    /**
+     * Resumes a suspended lexical environment and visits a concise body, ending the lexical
+     * environment and merging hoisted declarations upon completion.
+     */
+    export function visitFunctionBody(node: ConciseBody, visitor: (node: Node) => VisitResult<Node>, context: TransformationContext): ConciseBody;
+    export function visitFunctionBody(node: ConciseBody, visitor: (node: Node) => VisitResult<Node>, context: TransformationContext, optional?: boolean): ConciseBody {
+        context.resumeLexicalEnvironment();
+        const updated = visitNode(node, visitor, isConciseBody, optional);
+        const declarations = context.endLexicalEnvironment();
+        if (some(declarations)) {
+            const block = convertToFunctionBody(updated);
+            const statements = mergeLexicalEnvironment(block.statements, declarations);
+            return updateBlock(block, statements);
+        }
+        return updated;
+    }
+
     /**
      * Visits each child of a Node using the supplied visitor, possibly returning a new Node of the same kind in its place.
      *
@@ -660,8 +707,8 @@ namespace ts {
      * @param visitor The callback used to visit each child.
      * @param context A lexical environment context for the visitor.
      */
-    export function visitEachChild<T extends Node>(node: T, visitor: (node: Node) => VisitResult<Node>, context: LexicalEnvironment): T;
-    export function visitEachChild(node: Node, visitor: (node: Node) => VisitResult<Node>, context: LexicalEnvironment): Node {
+    export function visitEachChild<T extends Node>(node: T, visitor: (node: Node) => VisitResult<Node>, context: TransformationContext): T;
+    export function visitEachChild(node: Node, visitor: (node: Node) => VisitResult<Node>, context: TransformationContext): Node {
         if (node === undefined) {
             return undefined;
         }
@@ -714,41 +761,33 @@ namespace ts {
                     visitNodes((<MethodDeclaration>node).modifiers, visitor, isModifier),
                     visitNode((<MethodDeclaration>node).name, visitor, isPropertyName),
                     visitNodes((<MethodDeclaration>node).typeParameters, visitor, isTypeParameter),
-                    (context.startLexicalEnvironment(), visitNodes((<MethodDeclaration>node).parameters, visitor, isParameter)),
+                    visitParameterList((<MethodDeclaration>node).parameters, visitor, context),
                     visitNode((<MethodDeclaration>node).type, visitor, isTypeNode, /*optional*/ true),
-                    mergeFunctionBodyLexicalEnvironment(
-                        visitNode((<MethodDeclaration>node).body, visitor, isFunctionBody, /*optional*/ true),
-                        context.endLexicalEnvironment()));
+                    visitFunctionBody((<MethodDeclaration>node).body, visitor, context, /*optional*/ true));
 
             case SyntaxKind.Constructor:
                 return updateConstructor(<ConstructorDeclaration>node,
                     visitNodes((<ConstructorDeclaration>node).decorators, visitor, isDecorator),
                     visitNodes((<ConstructorDeclaration>node).modifiers, visitor, isModifier),
-                    (context.startLexicalEnvironment(), visitNodes((<ConstructorDeclaration>node).parameters, visitor, isParameter)),
-                    mergeFunctionBodyLexicalEnvironment(
-                        visitNode((<ConstructorDeclaration>node).body, visitor, isFunctionBody, /*optional*/ true),
-                        context.endLexicalEnvironment()));
+                    visitParameterList((<ConstructorDeclaration>node).parameters, visitor, context),
+                    visitFunctionBody((<ConstructorDeclaration>node).body, visitor, context, /*optional*/ true));
 
             case SyntaxKind.GetAccessor:
                 return updateGetAccessor(<GetAccessorDeclaration>node,
                     visitNodes((<GetAccessorDeclaration>node).decorators, visitor, isDecorator),
                     visitNodes((<GetAccessorDeclaration>node).modifiers, visitor, isModifier),
                     visitNode((<GetAccessorDeclaration>node).name, visitor, isPropertyName),
-                    (context.startLexicalEnvironment(), visitNodes((<GetAccessorDeclaration>node).parameters, visitor, isParameter)),
+                    visitParameterList((<GetAccessorDeclaration>node).parameters, visitor, context),
                     visitNode((<GetAccessorDeclaration>node).type, visitor, isTypeNode, /*optional*/ true),
-                    mergeFunctionBodyLexicalEnvironment(
-                        visitNode((<GetAccessorDeclaration>node).body, visitor, isFunctionBody, /*optional*/ true),
-                        context.endLexicalEnvironment()));
+                    visitFunctionBody((<GetAccessorDeclaration>node).body, visitor, context, /*optional*/ true));
 
             case SyntaxKind.SetAccessor:
                 return updateSetAccessor(<SetAccessorDeclaration>node,
                     visitNodes((<SetAccessorDeclaration>node).decorators, visitor, isDecorator),
                     visitNodes((<SetAccessorDeclaration>node).modifiers, visitor, isModifier),
                     visitNode((<SetAccessorDeclaration>node).name, visitor, isPropertyName),
-                    (context.startLexicalEnvironment(), visitNodes((<SetAccessorDeclaration>node).parameters, visitor, isParameter)),
-                    mergeFunctionBodyLexicalEnvironment(
-                        visitNode((<SetAccessorDeclaration>node).body, visitor, isFunctionBody, /*optional*/ true),
-                        context.endLexicalEnvironment()));
+                    visitParameterList((<SetAccessorDeclaration>node).parameters, visitor, context),
+                    visitFunctionBody((<SetAccessorDeclaration>node).body, visitor, context, /*optional*/ true));
 
             // Binding patterns
             case SyntaxKind.ObjectBindingPattern:
@@ -810,21 +849,17 @@ namespace ts {
                     visitNodes((<FunctionExpression>node).modifiers, visitor, isModifier),
                     visitNode((<FunctionExpression>node).name, visitor, isPropertyName),
                     visitNodes((<FunctionExpression>node).typeParameters, visitor, isTypeParameter),
-                    (context.startLexicalEnvironment(), visitNodes((<FunctionExpression>node).parameters, visitor, isParameter)),
+                    visitParameterList((<FunctionExpression>node).parameters, visitor, context),
                     visitNode((<FunctionExpression>node).type, visitor, isTypeNode, /*optional*/ true),
-                    mergeFunctionBodyLexicalEnvironment(
-                        visitNode((<FunctionExpression>node).body, visitor, isFunctionBody, /*optional*/ true),
-                        context.endLexicalEnvironment()));
+                    visitFunctionBody((<FunctionExpression>node).body, visitor, context, /*optional*/ true));
 
             case SyntaxKind.ArrowFunction:
                 return updateArrowFunction(<ArrowFunction>node,
                     visitNodes((<ArrowFunction>node).modifiers, visitor, isModifier),
                     visitNodes((<ArrowFunction>node).typeParameters, visitor, isTypeParameter),
-                    (context.startLexicalEnvironment(), visitNodes((<ArrowFunction>node).parameters, visitor, isParameter)),
+                    visitParameterList((<ArrowFunction>node).parameters, visitor, context),
                     visitNode((<ArrowFunction>node).type, visitor, isTypeNode, /*optional*/ true),
-                    mergeFunctionBodyLexicalEnvironment(
-                        visitNode((<ArrowFunction>node).body, visitor, isConciseBody, /*optional*/ true),
-                        context.endLexicalEnvironment()));
+                    visitFunctionBody((<ArrowFunction>node).body, visitor, context));
 
             case SyntaxKind.DeleteExpression:
                 return updateDelete(<DeleteExpression>node,
@@ -995,11 +1030,9 @@ namespace ts {
                     visitNodes((<FunctionDeclaration>node).modifiers, visitor, isModifier),
                     visitNode((<FunctionDeclaration>node).name, visitor, isPropertyName),
                     visitNodes((<FunctionDeclaration>node).typeParameters, visitor, isTypeParameter),
-                    (context.startLexicalEnvironment(), visitNodes((<FunctionDeclaration>node).parameters, visitor, isParameter)),
+                    visitParameterList((<FunctionDeclaration>node).parameters, visitor, context),
                     visitNode((<FunctionDeclaration>node).type, visitor, isTypeNode, /*optional*/ true),
-                    mergeFunctionBodyLexicalEnvironment(
-                        visitNode((<FunctionDeclaration>node).body, visitor, isFunctionBody, /*optional*/ true),
-                        context.endLexicalEnvironment()));
+                    visitFunctionBody((<FunctionExpression>node).body, visitor, context, /*optional*/ true));
 
             case SyntaxKind.ClassDeclaration:
                 return updateClassDeclaration(<ClassDeclaration>node,
@@ -1129,11 +1162,7 @@ namespace ts {
             case SyntaxKind.SourceFile:
                 context.startLexicalEnvironment();
                 return updateSourceFileNode(<SourceFile>node,
-                    createNodeArray(
-                        concatenate(
-                            visitNodes((<SourceFile>node).statements, visitor, isStatement),
-                            context.endLexicalEnvironment()),
-                        (<SourceFile>node).statements));
+                    visitLexicalEnvironment((<SourceFile>node).statements, visitor, context));
 
             // Transformation nodes
             case SyntaxKind.PartiallyEmittedExpression:
@@ -1167,6 +1196,24 @@ namespace ts {
         // return node;
     }
 
+    /**
+     * Merges generated lexical declarations into a new statement list.
+     */
+    export function mergeLexicalEnvironment(statements: NodeArray<Statement>, declarations: Statement[]): NodeArray<Statement>;
+    /**
+     * Appends generated lexical declarations to an array of statements.
+     */
+    export function mergeLexicalEnvironment(statements: Statement[], declarations: Statement[]): Statement[];
+    export function mergeLexicalEnvironment(statements: Statement[], declarations: Statement[]) {
+        if (!some(declarations)) {
+            return statements;
+        }
+        return isNodeArray(statements)
+            ? createNodeArray(concatenate(statements, declarations), statements)
+            : addRange(statements, declarations);
+    }
+
+
     /**
      * Merges generated lexical declarations into the FunctionBody of a non-arrow function-like declaration.
      *

From 9c80909a90e967535470d811bebe8c088f0824cf Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Wed, 9 Nov 2016 07:41:25 -0800
Subject: [PATCH 148/421] Resolve symlinks for type reference directives too.

---
 src/compiler/moduleNameResolver.ts            | 101 +++++++++---------
 src/compiler/program.ts                       |  23 ++--
 src/harness/harness.ts                        |   9 +-
 .../reference/library-reference-1.trace.json  |   6 +-
 .../reference/library-reference-10.trace.json |   6 +-
 .../reference/library-reference-11.trace.json |   1 +
 .../reference/library-reference-12.trace.json |   1 +
 .../reference/library-reference-13.trace.json |   1 +
 .../reference/library-reference-14.trace.json |   1 +
 .../reference/library-reference-15.trace.json |   3 +-
 .../reference/library-reference-2.trace.json  |   2 +
 .../reference/library-reference-3.trace.json  |   1 +
 .../reference/library-reference-4.trace.json  |   4 +
 .../reference/library-reference-5.trace.json  |   4 +
 .../reference/library-reference-6.trace.json  |   2 +
 .../reference/library-reference-7.trace.json  |   1 +
 .../reference/library-reference-8.trace.json  |   6 ++
 ...leResolutionWithSymlinks_referenceTypes.js |  73 +++++++++++++
 ...olutionWithSymlinks_referenceTypes.symbols |  45 ++++++++
 ...tionWithSymlinks_referenceTypes.trace.json |  35 ++++++
 ...esolutionWithSymlinks_referenceTypes.types |  45 ++++++++
 .../typeReferenceDirectives1.trace.json       |   2 +
 .../typeReferenceDirectives10.trace.json      |   2 +
 .../typeReferenceDirectives11.trace.json      |   1 +
 .../typeReferenceDirectives12.trace.json      |   2 +
 .../typeReferenceDirectives13.trace.json      |   2 +
 .../typeReferenceDirectives2.trace.json       |   1 +
 .../typeReferenceDirectives3.trace.json       |   2 +
 .../typeReferenceDirectives4.trace.json       |   2 +
 .../typeReferenceDirectives5.trace.json       |   2 +
 .../typeReferenceDirectives6.trace.json       |   2 +
 .../typeReferenceDirectives7.trace.json       |   2 +
 .../typeReferenceDirectives8.trace.json       |   1 +
 .../typeReferenceDirectives9.trace.json       |   2 +
 ...mMultipleNodeModulesDirectories.trace.json |   3 +
 ...romNodeModulesInParentDirectory.trace.json |   1 +
 .../reference/typingsLookup1.trace.json       |   2 +
 .../reference/typingsLookup3.trace.json       |   2 +
 .../reference/typingsLookup4.trace.json       |   3 +
 .../reference/typingsLookupAmd.trace.json     |   1 +
 ...ResolutionWithSymlinks_notInNodeModules.ts |   4 +-
 ...leResolutionWithSymlinks_referenceTypes.ts |  45 ++++++++
 42 files changed, 386 insertions(+), 68 deletions(-)
 create mode 100644 tests/baselines/reference/moduleResolutionWithSymlinks_referenceTypes.js
 create mode 100644 tests/baselines/reference/moduleResolutionWithSymlinks_referenceTypes.symbols
 create mode 100644 tests/baselines/reference/moduleResolutionWithSymlinks_referenceTypes.trace.json
 create mode 100644 tests/baselines/reference/moduleResolutionWithSymlinks_referenceTypes.types
 create mode 100644 tests/cases/compiler/moduleResolutionWithSymlinks_referenceTypes.ts

diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
index 6c9ce00b3b8..8019944e8a2 100644
--- a/src/compiler/moduleNameResolver.ts
+++ b/src/compiler/moduleNameResolver.ts
@@ -195,63 +195,66 @@ namespace ts {
 
         const failedLookupLocations: string[] = [];
 
-        // Check primary library paths
-        if (typeRoots && typeRoots.length) {
+        let resolved = primaryLookup();
+        let primary = true;
+        if (!resolved) {
+            resolved = secondaryLookup();
+            primary = false;
+        }
+
+        let resolvedTypeReferenceDirective: ResolvedTypeReferenceDirective | undefined;
+        if (resolved) {
+            resolved = realpath(resolved, host, traceEnabled);
             if (traceEnabled) {
-                trace(host, Diagnostics.Resolving_with_primary_search_path_0, typeRoots.join(", "));
+                trace(host, Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolved, primary);
             }
-            for (const typeRoot of typeRoots) {
-                const candidate = combinePaths(typeRoot, typeReferenceDirectiveName);
-                const candidateDirectory = getDirectoryPath(candidate);
+            resolvedTypeReferenceDirective = { primary, resolvedFileName: resolved };
+        }
 
-                const resolved = resolvedTypeScriptOnly(
-                    loadNodeModuleFromDirectory(Extensions.DtsOnly, candidate, failedLookupLocations,
-                        !directoryProbablyExists(candidateDirectory, host), moduleResolutionState));
+        return { resolvedTypeReferenceDirective, failedLookupLocations };
 
-                if (resolved) {
-                    if (traceEnabled) {
-                        trace(host, Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolved, true);
-                    }
-                    return {
-                        resolvedTypeReferenceDirective: { primary: true, resolvedFileName: resolved },
-                        failedLookupLocations
-                    };
+        function primaryLookup(): string | undefined {
+            // Check primary library paths
+            if (typeRoots && typeRoots.length) {
+                if (traceEnabled) {
+                    trace(host, Diagnostics.Resolving_with_primary_search_path_0, typeRoots.join(", "));
+                }
+                return forEach(typeRoots, typeRoot => {
+                    const candidate = combinePaths(typeRoot, typeReferenceDirectiveName);
+                    const candidateDirectory = getDirectoryPath(candidate);
+                    return resolvedTypeScriptOnly(
+                        loadNodeModuleFromDirectory(Extensions.DtsOnly, candidate, failedLookupLocations,
+                            !directoryProbablyExists(candidateDirectory, host), moduleResolutionState));
+                });
+            }
+            else {
+                if (traceEnabled) {
+                    trace(host, Diagnostics.Root_directory_cannot_be_determined_skipping_primary_search_paths);
                 }
             }
         }
-        else {
-            if (traceEnabled) {
-                trace(host, Diagnostics.Root_directory_cannot_be_determined_skipping_primary_search_paths);
-            }
-        }
 
-        let resolvedFile: string;
-        const initialLocationForSecondaryLookup = containingFile && getDirectoryPath(containingFile);
+        function secondaryLookup(): string | undefined {
+            let resolvedFile: string;
+            const initialLocationForSecondaryLookup = containingFile && getDirectoryPath(containingFile);
 
-        if (initialLocationForSecondaryLookup !== undefined) {
-            // check secondary locations
-            if (traceEnabled) {
-                trace(host, Diagnostics.Looking_up_in_node_modules_folder_initial_location_0, initialLocationForSecondaryLookup);
-            }
-            resolvedFile = resolvedTypeScriptOnly(loadModuleFromNodeModules(Extensions.DtsOnly, typeReferenceDirectiveName, initialLocationForSecondaryLookup, failedLookupLocations, moduleResolutionState, /*checkOneLevel*/ false));
-            if (traceEnabled) {
-                if (resolvedFile) {
-                    trace(host, Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFile, false);
+            if (initialLocationForSecondaryLookup !== undefined) {
+                // check secondary locations
+                if (traceEnabled) {
+                    trace(host, Diagnostics.Looking_up_in_node_modules_folder_initial_location_0, initialLocationForSecondaryLookup);
                 }
-                else {
+                resolvedFile = resolvedTypeScriptOnly(loadModuleFromNodeModules(Extensions.DtsOnly, typeReferenceDirectiveName, initialLocationForSecondaryLookup, failedLookupLocations, moduleResolutionState, /*checkOneLevel*/ false));
+                if (!resolvedFile && traceEnabled) {
                     trace(host, Diagnostics.Type_reference_directive_0_was_not_resolved, typeReferenceDirectiveName);
                 }
+                return resolvedFile;
+            }
+            else {
+                if (traceEnabled) {
+                    trace(host, Diagnostics.Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_modules_folder);
+                }
             }
         }
-        else {
-            if (traceEnabled) {
-                trace(host, Diagnostics.Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_modules_folder);
-            }
-        }
-        return {
-            resolvedTypeReferenceDirective: resolvedFile ? { primary: false, resolvedFileName: resolvedFile } : undefined,
-            failedLookupLocations
-        };
     }
 
     /**
@@ -564,7 +567,7 @@ namespace ts {
                 }
                 const resolved = loadModuleFromNodeModules(extensions, moduleName, containingDirectory, failedLookupLocations, state, /*checkOneLevel*/ false);
                 // For node_modules lookups, get the real path so that multiple accesses to an `npm link`-ed module do not create duplicate files.
-                return resolved && { resolved: resolvedWithRealpath(resolved, host, traceEnabled), isExternalLibraryImport: true };
+                return resolved && { resolved: { path: realpath(resolved.path, host, traceEnabled), extension: resolved.extension }, isExternalLibraryImport: true };
             }
             else {
                 const candidate = normalizePath(combinePaths(containingDirectory, moduleName));
@@ -574,16 +577,16 @@ namespace ts {
         }
     }
 
-    function resolvedWithRealpath(resolved: Resolved, host: ModuleResolutionHost, traceEnabled: boolean): Resolved {
+    function realpath(path: string, host: ModuleResolutionHost, traceEnabled: boolean): string {
         if (!host.realpath) {
-            return resolved;
+            return path;
         }
 
-        const real = normalizePath(host.realpath(resolved.path));
+        const real = normalizePath(host.realpath(path));
         if (traceEnabled) {
-            trace(host, Diagnostics.Resolving_real_path_for_0_result_1, resolved.path, real);
+            trace(host, Diagnostics.Resolving_real_path_for_0_result_1, path, real);
         }
-        return { path: real, extension: resolved.extension };
+        return real;
     }
 
     function nodeLoadModuleByRelativeName(extensions: Extensions, candidate: string, failedLookupLocations: string[], onlyRecordFailures: boolean, state: ModuleResolutionState): Resolved | undefined {
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 35c6818fea8..717df57765a 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -480,7 +480,7 @@ namespace ts {
                 return resolveModuleNamesWorker(moduleNames, containingFile);
             }
 
-            // at this point we know that either 
+            // at this point we know that either
             // - file has local declarations for ambient modules
             // OR
             // - old program state is available
@@ -674,7 +674,7 @@ namespace ts {
             }
 
             const modifiedFilePaths = modifiedSourceFiles.map(f => f.newFile.path);
-            // try to verify results of module resolution 
+            // try to verify results of module resolution
             for (const { oldFile: oldSourceFile, newFile: newSourceFile } of modifiedSourceFiles) {
                 const newSourceFilePath = getNormalizedAbsolutePath(newSourceFile.fileName, currentDirectory);
                 if (resolveModuleNamesWorker) {
@@ -1395,14 +1395,17 @@ namespace ts {
                     // If we already resolved to this file, it must have been a secondary reference. Check file contents
                     // for sameness and possibly issue an error
                     if (previousResolution) {
-                        const otherFileText = host.readFile(resolvedTypeReferenceDirective.resolvedFileName);
-                        if (otherFileText !== getSourceFile(previousResolution.resolvedFileName).text) {
-                            fileProcessingDiagnostics.add(createDiagnostic(refFile, refPos, refEnd,
-                                Diagnostics.Conflicting_definitions_for_0_found_at_1_and_2_Consider_installing_a_specific_version_of_this_library_to_resolve_the_conflict,
-                                typeReferenceDirective,
-                                resolvedTypeReferenceDirective.resolvedFileName,
-                                previousResolution.resolvedFileName
-                            ));
+                        // Don't bother reading the file again if it's the same file.
+                        if (resolvedTypeReferenceDirective.resolvedFileName !== previousResolution.resolvedFileName) {
+                            const otherFileText = host.readFile(resolvedTypeReferenceDirective.resolvedFileName);
+                            if (otherFileText !== getSourceFile(previousResolution.resolvedFileName).text) {
+                                fileProcessingDiagnostics.add(createDiagnostic(refFile, refPos, refEnd,
+                                    Diagnostics.Conflicting_definitions_for_0_found_at_1_and_2_Consider_installing_a_specific_version_of_this_library_to_resolve_the_conflict,
+                                    typeReferenceDirective,
+                                    resolvedTypeReferenceDirective.resolvedFileName,
+                                    previousResolution.resolvedFileName
+                                ));
+                            }
                         }
                         // don't overwrite previous resolution result
                         saveResolution = false;
diff --git a/src/harness/harness.ts b/src/harness/harness.ts
index b5dd39b1542..611c8aa56d9 100644
--- a/src/harness/harness.ts
+++ b/src/harness/harness.ts
@@ -1021,7 +1021,14 @@ namespace Harness {
                 useCaseSensitiveFileNames: () => useCaseSensitiveFileNames,
                 getNewLine: () => newLine,
                 fileExists: fileName => fileMap.contains(toPath(fileName)),
-                readFile: (fileName: string): string => fileMap.get(toPath(fileName)).getText(),
+                readFile: (fileName: string): string => {
+                    const file = fileMap.get(toPath(fileName));
+                    if (ts.endsWith(fileName, "json")) {
+                        // strip comments
+                        return file.getText();
+                    }
+                    return file.text;
+                },
                 realpath: (fileName: string): ts.Path => {
                     const path = toPath(fileName);
                     return (realPathMap.get(path) as ts.Path) || path;
diff --git a/tests/baselines/reference/library-reference-1.trace.json b/tests/baselines/reference/library-reference-1.trace.json
index 71557236240..d13ac9da455 100644
--- a/tests/baselines/reference/library-reference-1.trace.json
+++ b/tests/baselines/reference/library-reference-1.trace.json
@@ -3,10 +3,12 @@
     "Resolving with primary search path 'types'",
     "File 'types/jquery/package.json' does not exist.",
     "File 'types/jquery/index.d.ts' exist - use it as a name resolution result.",
-    "======== Type reference directive 'jquery' was successfully resolved to 'types/jquery/index.d.ts', primary: true. ========",
+    "Resolving real path for 'types/jquery/index.d.ts', result '/src/types/jquery/index.d.ts'",
+    "======== Type reference directive 'jquery' was successfully resolved to '/src/types/jquery/index.d.ts', primary: true. ========",
     "======== Resolving type reference directive 'jquery', containing file '/src/__inferred type names__.ts', root directory 'types'. ========",
     "Resolving with primary search path 'types'",
     "File 'types/jquery/package.json' does not exist.",
     "File 'types/jquery/index.d.ts' exist - use it as a name resolution result.",
-    "======== Type reference directive 'jquery' was successfully resolved to 'types/jquery/index.d.ts', primary: true. ========"
+    "Resolving real path for 'types/jquery/index.d.ts', result '/src/types/jquery/index.d.ts'",
+    "======== Type reference directive 'jquery' was successfully resolved to '/src/types/jquery/index.d.ts', primary: true. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/library-reference-10.trace.json b/tests/baselines/reference/library-reference-10.trace.json
index f4df00fa52d..760f0c5ec82 100644
--- a/tests/baselines/reference/library-reference-10.trace.json
+++ b/tests/baselines/reference/library-reference-10.trace.json
@@ -4,11 +4,13 @@
     "Found 'package.json' at './types/jquery/package.json'.",
     "'package.json' has 'typings' field 'jquery.d.ts' that references 'types/jquery/jquery.d.ts'.",
     "File 'types/jquery/jquery.d.ts' exist - use it as a name resolution result.",
-    "======== Type reference directive 'jquery' was successfully resolved to 'types/jquery/jquery.d.ts', primary: true. ========",
+    "Resolving real path for 'types/jquery/jquery.d.ts', result '/foo/types/jquery/jquery.d.ts'",
+    "======== Type reference directive 'jquery' was successfully resolved to '/foo/types/jquery/jquery.d.ts', primary: true. ========",
     "======== Resolving type reference directive 'jquery', containing file '/foo/__inferred type names__.ts', root directory './types'. ========",
     "Resolving with primary search path './types'",
     "Found 'package.json' at './types/jquery/package.json'.",
     "'package.json' has 'typings' field 'jquery.d.ts' that references 'types/jquery/jquery.d.ts'.",
     "File 'types/jquery/jquery.d.ts' exist - use it as a name resolution result.",
-    "======== Type reference directive 'jquery' was successfully resolved to 'types/jquery/jquery.d.ts', primary: true. ========"
+    "Resolving real path for 'types/jquery/jquery.d.ts', result '/foo/types/jquery/jquery.d.ts'",
+    "======== Type reference directive 'jquery' was successfully resolved to '/foo/types/jquery/jquery.d.ts', primary: true. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/library-reference-11.trace.json b/tests/baselines/reference/library-reference-11.trace.json
index 6428f421d7e..78ac53013f7 100644
--- a/tests/baselines/reference/library-reference-11.trace.json
+++ b/tests/baselines/reference/library-reference-11.trace.json
@@ -12,5 +12,6 @@
     "Found 'package.json' at '/a/node_modules/jquery/package.json'.",
     "'package.json' has 'typings' field 'jquery.d.ts' that references '/a/node_modules/jquery/jquery.d.ts'.",
     "File '/a/node_modules/jquery/jquery.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/a/node_modules/jquery/jquery.d.ts', result '/a/node_modules/jquery/jquery.d.ts'",
     "======== Type reference directive 'jquery' was successfully resolved to '/a/node_modules/jquery/jquery.d.ts', primary: false. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/library-reference-12.trace.json b/tests/baselines/reference/library-reference-12.trace.json
index 37017c86f0c..6e09c7a3f04 100644
--- a/tests/baselines/reference/library-reference-12.trace.json
+++ b/tests/baselines/reference/library-reference-12.trace.json
@@ -12,5 +12,6 @@
     "Found 'package.json' at '/a/node_modules/jquery/package.json'.",
     "'package.json' has 'types' field 'dist/jquery.d.ts' that references '/a/node_modules/jquery/dist/jquery.d.ts'.",
     "File '/a/node_modules/jquery/dist/jquery.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/a/node_modules/jquery/dist/jquery.d.ts', result '/a/node_modules/jquery/dist/jquery.d.ts'",
     "======== Type reference directive 'jquery' was successfully resolved to '/a/node_modules/jquery/dist/jquery.d.ts', primary: false. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/library-reference-13.trace.json b/tests/baselines/reference/library-reference-13.trace.json
index a23f0ef0ca5..86f7a5a505d 100644
--- a/tests/baselines/reference/library-reference-13.trace.json
+++ b/tests/baselines/reference/library-reference-13.trace.json
@@ -3,5 +3,6 @@
     "Resolving with primary search path '/a/types'",
     "File '/a/types/jquery/package.json' does not exist.",
     "File '/a/types/jquery/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/a/types/jquery/index.d.ts', result '/a/types/jquery/index.d.ts'",
     "======== Type reference directive 'jquery' was successfully resolved to '/a/types/jquery/index.d.ts', primary: true. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/library-reference-14.trace.json b/tests/baselines/reference/library-reference-14.trace.json
index fb3a2bb7da4..338cefbc47e 100644
--- a/tests/baselines/reference/library-reference-14.trace.json
+++ b/tests/baselines/reference/library-reference-14.trace.json
@@ -3,5 +3,6 @@
     "Resolving with primary search path '/a/types'",
     "File '/a/types/jquery/package.json' does not exist.",
     "File '/a/types/jquery/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/a/types/jquery/index.d.ts', result '/a/types/jquery/index.d.ts'",
     "======== Type reference directive 'jquery' was successfully resolved to '/a/types/jquery/index.d.ts', primary: true. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/library-reference-15.trace.json b/tests/baselines/reference/library-reference-15.trace.json
index e23517976b0..6d8b5cf1408 100644
--- a/tests/baselines/reference/library-reference-15.trace.json
+++ b/tests/baselines/reference/library-reference-15.trace.json
@@ -3,5 +3,6 @@
     "Resolving with primary search path 'types'",
     "File 'types/jquery/package.json' does not exist.",
     "File 'types/jquery/index.d.ts' exist - use it as a name resolution result.",
-    "======== Type reference directive 'jquery' was successfully resolved to 'types/jquery/index.d.ts', primary: true. ========"
+    "Resolving real path for 'types/jquery/index.d.ts', result '/a/types/jquery/index.d.ts'",
+    "======== Type reference directive 'jquery' was successfully resolved to '/a/types/jquery/index.d.ts', primary: true. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/library-reference-2.trace.json b/tests/baselines/reference/library-reference-2.trace.json
index 64cdd809183..8837f2c9cb1 100644
--- a/tests/baselines/reference/library-reference-2.trace.json
+++ b/tests/baselines/reference/library-reference-2.trace.json
@@ -4,11 +4,13 @@
     "Found 'package.json' at '/types/jquery/package.json'.",
     "'package.json' has 'types' field 'jquery.d.ts' that references '/types/jquery/jquery.d.ts'.",
     "File '/types/jquery/jquery.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/types/jquery/jquery.d.ts', result '/types/jquery/jquery.d.ts'",
     "======== Type reference directive 'jquery' was successfully resolved to '/types/jquery/jquery.d.ts', primary: true. ========",
     "======== Resolving type reference directive 'jquery', containing file 'test/__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "Found 'package.json' at '/types/jquery/package.json'.",
     "'package.json' has 'types' field 'jquery.d.ts' that references '/types/jquery/jquery.d.ts'.",
     "File '/types/jquery/jquery.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/types/jquery/jquery.d.ts', result '/types/jquery/jquery.d.ts'",
     "======== Type reference directive 'jquery' was successfully resolved to '/types/jquery/jquery.d.ts', primary: true. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/library-reference-3.trace.json b/tests/baselines/reference/library-reference-3.trace.json
index 72cc8c95077..d672eb50de8 100644
--- a/tests/baselines/reference/library-reference-3.trace.json
+++ b/tests/baselines/reference/library-reference-3.trace.json
@@ -5,5 +5,6 @@
     "File '/src/node_modules/jquery.d.ts' does not exist.",
     "File '/src/node_modules/jquery/package.json' does not exist.",
     "File '/src/node_modules/jquery/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/src/node_modules/jquery/index.d.ts', result '/src/node_modules/jquery/index.d.ts'",
     "======== Type reference directive 'jquery' was successfully resolved to '/src/node_modules/jquery/index.d.ts', primary: false. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/library-reference-4.trace.json b/tests/baselines/reference/library-reference-4.trace.json
index 2a128b4fcbe..b47ba1065f5 100644
--- a/tests/baselines/reference/library-reference-4.trace.json
+++ b/tests/baselines/reference/library-reference-4.trace.json
@@ -13,6 +13,7 @@
     "File '/node_modules/foo.d.ts' does not exist.",
     "File '/node_modules/foo/package.json' does not exist.",
     "File '/node_modules/foo/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/node_modules/foo/index.d.ts', result '/node_modules/foo/index.d.ts'",
     "======== Type reference directive 'foo' was successfully resolved to '/node_modules/foo/index.d.ts', primary: false. ========",
     "======== Resolving type reference directive 'bar', containing file '/src/root.ts', root directory '/src'. ========",
     "Resolving with primary search path '/src'",
@@ -28,6 +29,7 @@
     "File '/node_modules/bar.d.ts' does not exist.",
     "File '/node_modules/bar/package.json' does not exist.",
     "File '/node_modules/bar/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/node_modules/bar/index.d.ts', result '/node_modules/bar/index.d.ts'",
     "======== Type reference directive 'bar' was successfully resolved to '/node_modules/bar/index.d.ts', primary: false. ========",
     "======== Resolving type reference directive 'alpha', containing file '/node_modules/foo/index.d.ts', root directory '/src'. ========",
     "Resolving with primary search path '/src'",
@@ -37,6 +39,7 @@
     "File '/node_modules/foo/node_modules/alpha.d.ts' does not exist.",
     "File '/node_modules/foo/node_modules/alpha/package.json' does not exist.",
     "File '/node_modules/foo/node_modules/alpha/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/node_modules/foo/node_modules/alpha/index.d.ts', result '/node_modules/foo/node_modules/alpha/index.d.ts'",
     "======== Type reference directive 'alpha' was successfully resolved to '/node_modules/foo/node_modules/alpha/index.d.ts', primary: false. ========",
     "======== Resolving type reference directive 'alpha', containing file '/node_modules/bar/index.d.ts', root directory '/src'. ========",
     "Resolving with primary search path '/src'",
@@ -46,5 +49,6 @@
     "File '/node_modules/bar/node_modules/alpha.d.ts' does not exist.",
     "File '/node_modules/bar/node_modules/alpha/package.json' does not exist.",
     "File '/node_modules/bar/node_modules/alpha/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/node_modules/bar/node_modules/alpha/index.d.ts', result '/node_modules/bar/node_modules/alpha/index.d.ts'",
     "======== Type reference directive 'alpha' was successfully resolved to '/node_modules/bar/node_modules/alpha/index.d.ts', primary: false. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/library-reference-5.trace.json b/tests/baselines/reference/library-reference-5.trace.json
index dc9bff30b27..8f548e04d10 100644
--- a/tests/baselines/reference/library-reference-5.trace.json
+++ b/tests/baselines/reference/library-reference-5.trace.json
@@ -13,6 +13,7 @@
     "File '/node_modules/foo.d.ts' does not exist.",
     "File '/node_modules/foo/package.json' does not exist.",
     "File '/node_modules/foo/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/node_modules/foo/index.d.ts', result '/node_modules/foo/index.d.ts'",
     "======== Type reference directive 'foo' was successfully resolved to '/node_modules/foo/index.d.ts', primary: false. ========",
     "======== Resolving type reference directive 'bar', containing file '/src/root.ts', root directory 'types'. ========",
     "Resolving with primary search path 'types'",
@@ -28,6 +29,7 @@
     "File '/node_modules/bar.d.ts' does not exist.",
     "File '/node_modules/bar/package.json' does not exist.",
     "File '/node_modules/bar/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/node_modules/bar/index.d.ts', result '/node_modules/bar/index.d.ts'",
     "======== Type reference directive 'bar' was successfully resolved to '/node_modules/bar/index.d.ts', primary: false. ========",
     "======== Resolving type reference directive 'alpha', containing file '/node_modules/foo/index.d.ts', root directory 'types'. ========",
     "Resolving with primary search path 'types'",
@@ -37,6 +39,7 @@
     "File '/node_modules/foo/node_modules/alpha.d.ts' does not exist.",
     "File '/node_modules/foo/node_modules/alpha/package.json' does not exist.",
     "File '/node_modules/foo/node_modules/alpha/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/node_modules/foo/node_modules/alpha/index.d.ts', result '/node_modules/foo/node_modules/alpha/index.d.ts'",
     "======== Type reference directive 'alpha' was successfully resolved to '/node_modules/foo/node_modules/alpha/index.d.ts', primary: false. ========",
     "======== Resolving type reference directive 'alpha', containing file '/node_modules/bar/index.d.ts', root directory 'types'. ========",
     "Resolving with primary search path 'types'",
@@ -46,5 +49,6 @@
     "File '/node_modules/bar/node_modules/alpha.d.ts' does not exist.",
     "File '/node_modules/bar/node_modules/alpha/package.json' does not exist.",
     "File '/node_modules/bar/node_modules/alpha/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/node_modules/bar/node_modules/alpha/index.d.ts', result '/node_modules/bar/node_modules/alpha/index.d.ts'",
     "======== Type reference directive 'alpha' was successfully resolved to '/node_modules/bar/node_modules/alpha/index.d.ts', primary: false. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/library-reference-6.trace.json b/tests/baselines/reference/library-reference-6.trace.json
index fd83c1431b4..6ca81a6c418 100644
--- a/tests/baselines/reference/library-reference-6.trace.json
+++ b/tests/baselines/reference/library-reference-6.trace.json
@@ -3,10 +3,12 @@
     "Resolving with primary search path '/node_modules/@types'",
     "File '/node_modules/@types/alpha/package.json' does not exist.",
     "File '/node_modules/@types/alpha/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/node_modules/@types/alpha/index.d.ts', result '/node_modules/@types/alpha/index.d.ts'",
     "======== Type reference directive 'alpha' was successfully resolved to '/node_modules/@types/alpha/index.d.ts', primary: true. ========",
     "======== Resolving type reference directive 'alpha', containing file '/__inferred type names__.ts', root directory '/node_modules/@types'. ========",
     "Resolving with primary search path '/node_modules/@types'",
     "File '/node_modules/@types/alpha/package.json' does not exist.",
     "File '/node_modules/@types/alpha/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/node_modules/@types/alpha/index.d.ts', result '/node_modules/@types/alpha/index.d.ts'",
     "======== Type reference directive 'alpha' was successfully resolved to '/node_modules/@types/alpha/index.d.ts', primary: true. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/library-reference-7.trace.json b/tests/baselines/reference/library-reference-7.trace.json
index 72cc8c95077..d672eb50de8 100644
--- a/tests/baselines/reference/library-reference-7.trace.json
+++ b/tests/baselines/reference/library-reference-7.trace.json
@@ -5,5 +5,6 @@
     "File '/src/node_modules/jquery.d.ts' does not exist.",
     "File '/src/node_modules/jquery/package.json' does not exist.",
     "File '/src/node_modules/jquery/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/src/node_modules/jquery/index.d.ts', result '/src/node_modules/jquery/index.d.ts'",
     "======== Type reference directive 'jquery' was successfully resolved to '/src/node_modules/jquery/index.d.ts', primary: false. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/library-reference-8.trace.json b/tests/baselines/reference/library-reference-8.trace.json
index d34f206e581..905c3c2bb36 100644
--- a/tests/baselines/reference/library-reference-8.trace.json
+++ b/tests/baselines/reference/library-reference-8.trace.json
@@ -3,30 +3,36 @@
     "Resolving with primary search path '/test/types'",
     "File '/test/types/alpha/package.json' does not exist.",
     "File '/test/types/alpha/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/test/types/alpha/index.d.ts', result '/test/types/alpha/index.d.ts'",
     "======== Type reference directive 'alpha' was successfully resolved to '/test/types/alpha/index.d.ts', primary: true. ========",
     "======== Resolving type reference directive 'beta', containing file '/test/foo.ts', root directory '/test/types'. ========",
     "Resolving with primary search path '/test/types'",
     "File '/test/types/beta/package.json' does not exist.",
     "File '/test/types/beta/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/test/types/beta/index.d.ts', result '/test/types/beta/index.d.ts'",
     "======== Type reference directive 'beta' was successfully resolved to '/test/types/beta/index.d.ts', primary: true. ========",
     "======== Resolving type reference directive 'beta', containing file '/test/types/alpha/index.d.ts', root directory '/test/types'. ========",
     "Resolving with primary search path '/test/types'",
     "File '/test/types/beta/package.json' does not exist.",
     "File '/test/types/beta/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/test/types/beta/index.d.ts', result '/test/types/beta/index.d.ts'",
     "======== Type reference directive 'beta' was successfully resolved to '/test/types/beta/index.d.ts', primary: true. ========",
     "======== Resolving type reference directive 'alpha', containing file '/test/types/beta/index.d.ts', root directory '/test/types'. ========",
     "Resolving with primary search path '/test/types'",
     "File '/test/types/alpha/package.json' does not exist.",
     "File '/test/types/alpha/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/test/types/alpha/index.d.ts', result '/test/types/alpha/index.d.ts'",
     "======== Type reference directive 'alpha' was successfully resolved to '/test/types/alpha/index.d.ts', primary: true. ========",
     "======== Resolving type reference directive 'alpha', containing file '/test/__inferred type names__.ts', root directory '/test/types'. ========",
     "Resolving with primary search path '/test/types'",
     "File '/test/types/alpha/package.json' does not exist.",
     "File '/test/types/alpha/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/test/types/alpha/index.d.ts', result '/test/types/alpha/index.d.ts'",
     "======== Type reference directive 'alpha' was successfully resolved to '/test/types/alpha/index.d.ts', primary: true. ========",
     "======== Resolving type reference directive 'beta', containing file '/test/__inferred type names__.ts', root directory '/test/types'. ========",
     "Resolving with primary search path '/test/types'",
     "File '/test/types/beta/package.json' does not exist.",
     "File '/test/types/beta/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/test/types/beta/index.d.ts', result '/test/types/beta/index.d.ts'",
     "======== Type reference directive 'beta' was successfully resolved to '/test/types/beta/index.d.ts', primary: true. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_referenceTypes.js b/tests/baselines/reference/moduleResolutionWithSymlinks_referenceTypes.js
new file mode 100644
index 00000000000..8fa8ca1c6f1
--- /dev/null
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks_referenceTypes.js
@@ -0,0 +1,73 @@
+//// [tests/cases/compiler/moduleResolutionWithSymlinks_referenceTypes.ts] ////
+
+//// [index.d.ts]
+// Symlinks are always resolved for type reference directives.
+// NOTE: This test would still compile without errors even if they were not,
+// because `processTypeReferenceDirective` also checks for textual equivalence of file contents.
+// But the `moduleResolutionWithSymlinks_referenceTypes.trace.json` shows the difference.
+
+
+declare class MyClass { private x: number; }
+
+//// [index.d.ts]
+/// <reference types="library-a" />
+
+//// [app.ts]
+/// <reference types="library-a" />
+/// <reference types="library-b" />
+
+/*
+# To reproduce in a real project:
+
+echo '/// <reference types="library-a" />' > app.ts
+echo '/// <reference types="library-b" />' >> app.ts
+
+mkdir node_modules/@types
+cd mode_modules/@types
+mkdir library-a
+echo 'declare class MyClass { private x: number; }' > library-a/index.d.ts
+
+mkdir library-b
+cd library-b
+echo '/// <reference types="library-a" />' > index.d.ts
+
+mkdir node_modules
+cd node_modules
+
+ln -s ../../library-a ./library-a
+# Windows: Open command prompt as administrator and run: `mklink /D library-a ..\..\library-a`
+
+cd ../../.. # back to root
+
+tsc app.ts # Should create `app.js`
+*/
+
+
+//// [/app.js]
+/// <reference types="library-a" />
+/// <reference types="library-b" />
+/*
+# To reproduce in a real project:
+
+echo '/// <reference types="library-a" />' > app.ts
+echo '/// <reference types="library-b" />' >> app.ts
+
+mkdir node_modules/@types
+cd mode_modules/@types
+mkdir library-a
+echo 'declare class MyClass { private x: number; }' > library-a/index.d.ts
+
+mkdir library-b
+cd library-b
+echo '/// <reference types="library-a" />' > index.d.ts
+
+mkdir node_modules
+cd node_modules
+
+ln -s ../../library-a ./library-a
+# Windows: Open command prompt as administrator and run: `mklink /D library-a ..\..\library-a`
+
+cd ../../.. # back to root
+
+tsc app.ts # Should create `app.js`
+*/
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_referenceTypes.symbols b/tests/baselines/reference/moduleResolutionWithSymlinks_referenceTypes.symbols
new file mode 100644
index 00000000000..efb46a42f7f
--- /dev/null
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks_referenceTypes.symbols
@@ -0,0 +1,45 @@
+=== /app.ts ===
+/// <reference types="library-a" />
+No type information for this code./// <reference types="library-b" />
+No type information for this code.
+No type information for this code./*
+No type information for this code.# To reproduce in a real project:
+No type information for this code.
+No type information for this code.echo '/// <reference types="library-a" />' > app.ts
+No type information for this code.echo '/// <reference types="library-b" />' >> app.ts
+No type information for this code.
+No type information for this code.mkdir node_modules/@types
+No type information for this code.cd mode_modules/@types
+No type information for this code.mkdir library-a
+No type information for this code.echo 'declare class MyClass { private x: number; }' > library-a/index.d.ts
+No type information for this code.
+No type information for this code.mkdir library-b
+No type information for this code.cd library-b
+No type information for this code.echo '/// <reference types="library-a" />' > index.d.ts
+No type information for this code.
+No type information for this code.mkdir node_modules
+No type information for this code.cd node_modules
+No type information for this code.
+No type information for this code.ln -s ../../library-a ./library-a
+No type information for this code.# Windows: Open command prompt as administrator and run: `mklink /D library-a ..\..\library-a`
+No type information for this code.
+No type information for this code.cd ../../.. # back to root
+No type information for this code.
+No type information for this code.tsc app.ts # Should create `app.js`
+No type information for this code.*/
+No type information for this code.
+No type information for this code.=== /node_modules/@types/library-a/index.d.ts ===
+// Symlinks are always resolved for type reference directives.
+// NOTE: This test would still compile without errors even if they were not,
+// because `processTypeReferenceDirective` also checks for textual equivalence of file contents.
+// But the `moduleResolutionWithSymlinks_referenceTypes.trace.json` shows the difference.
+
+
+declare class MyClass { private x: number; }
+>MyClass : Symbol(MyClass, Decl(index.d.ts, 0, 0))
+>x : Symbol(MyClass.x, Decl(index.d.ts, 6, 23))
+
+=== /node_modules/@types/library-b/index.d.ts ===
+/// <reference types="library-a" />
+No type information for this code.
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_referenceTypes.trace.json b/tests/baselines/reference/moduleResolutionWithSymlinks_referenceTypes.trace.json
new file mode 100644
index 00000000000..658f407c42b
--- /dev/null
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks_referenceTypes.trace.json
@@ -0,0 +1,35 @@
+[
+    "======== Resolving type reference directive 'library-a', containing file '/app.ts', root directory not set. ========",
+    "Root directory cannot be determined, skipping primary search paths.",
+    "Looking up in 'node_modules' folder, initial location '/'",
+    "File '/node_modules/library-a.d.ts' does not exist.",
+    "File '/node_modules/library-a/package.json' does not exist.",
+    "File '/node_modules/library-a/index.d.ts' does not exist.",
+    "File '/node_modules/@types/library-a.d.ts' does not exist.",
+    "File '/node_modules/@types/library-a/package.json' does not exist.",
+    "File '/node_modules/@types/library-a/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/node_modules/@types/library-a/index.d.ts', result '/node_modules/@types/library-a/index.d.ts'",
+    "======== Type reference directive 'library-a' was successfully resolved to '/node_modules/@types/library-a/index.d.ts', primary: false. ========",
+    "======== Resolving type reference directive 'library-b', containing file '/app.ts', root directory not set. ========",
+    "Root directory cannot be determined, skipping primary search paths.",
+    "Looking up in 'node_modules' folder, initial location '/'",
+    "File '/node_modules/library-b.d.ts' does not exist.",
+    "File '/node_modules/library-b/package.json' does not exist.",
+    "File '/node_modules/library-b/index.d.ts' does not exist.",
+    "File '/node_modules/@types/library-b.d.ts' does not exist.",
+    "File '/node_modules/@types/library-b/package.json' does not exist.",
+    "File '/node_modules/@types/library-b/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/node_modules/@types/library-b/index.d.ts', result '/node_modules/@types/library-b/index.d.ts'",
+    "======== Type reference directive 'library-b' was successfully resolved to '/node_modules/@types/library-b/index.d.ts', primary: false. ========",
+    "======== Resolving type reference directive 'library-a', containing file '/node_modules/@types/library-b/index.d.ts', root directory not set. ========",
+    "Root directory cannot be determined, skipping primary search paths.",
+    "Looking up in 'node_modules' folder, initial location '/node_modules/@types/library-b'",
+    "File '/node_modules/@types/library-b/node_modules/library-a.d.ts' does not exist.",
+    "File '/node_modules/@types/library-b/node_modules/library-a/package.json' does not exist.",
+    "File '/node_modules/@types/library-b/node_modules/library-a/index.d.ts' does not exist.",
+    "File '/node_modules/@types/library-b/node_modules/@types/library-a.d.ts' does not exist.",
+    "File '/node_modules/@types/library-b/node_modules/@types/library-a/package.json' does not exist.",
+    "File '/node_modules/@types/library-b/node_modules/@types/library-a/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/node_modules/@types/library-b/node_modules/@types/library-a/index.d.ts', result '/node_modules/@types/library-a/index.d.ts'",
+    "======== Type reference directive 'library-a' was successfully resolved to '/node_modules/@types/library-a/index.d.ts', primary: false. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_referenceTypes.types b/tests/baselines/reference/moduleResolutionWithSymlinks_referenceTypes.types
new file mode 100644
index 00000000000..bee6eb5aae6
--- /dev/null
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks_referenceTypes.types
@@ -0,0 +1,45 @@
+=== /app.ts ===
+/// <reference types="library-a" />
+No type information for this code./// <reference types="library-b" />
+No type information for this code.
+No type information for this code./*
+No type information for this code.# To reproduce in a real project:
+No type information for this code.
+No type information for this code.echo '/// <reference types="library-a" />' > app.ts
+No type information for this code.echo '/// <reference types="library-b" />' >> app.ts
+No type information for this code.
+No type information for this code.mkdir node_modules/@types
+No type information for this code.cd mode_modules/@types
+No type information for this code.mkdir library-a
+No type information for this code.echo 'declare class MyClass { private x: number; }' > library-a/index.d.ts
+No type information for this code.
+No type information for this code.mkdir library-b
+No type information for this code.cd library-b
+No type information for this code.echo '/// <reference types="library-a" />' > index.d.ts
+No type information for this code.
+No type information for this code.mkdir node_modules
+No type information for this code.cd node_modules
+No type information for this code.
+No type information for this code.ln -s ../../library-a ./library-a
+No type information for this code.# Windows: Open command prompt as administrator and run: `mklink /D library-a ..\..\library-a`
+No type information for this code.
+No type information for this code.cd ../../.. # back to root
+No type information for this code.
+No type information for this code.tsc app.ts # Should create `app.js`
+No type information for this code.*/
+No type information for this code.
+No type information for this code.=== /node_modules/@types/library-a/index.d.ts ===
+// Symlinks are always resolved for type reference directives.
+// NOTE: This test would still compile without errors even if they were not,
+// because `processTypeReferenceDirective` also checks for textual equivalence of file contents.
+// But the `moduleResolutionWithSymlinks_referenceTypes.trace.json` shows the difference.
+
+
+declare class MyClass { private x: number; }
+>MyClass : MyClass
+>x : number
+
+=== /node_modules/@types/library-b/index.d.ts ===
+/// <reference types="library-a" />
+No type information for this code.
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/typeReferenceDirectives1.trace.json b/tests/baselines/reference/typeReferenceDirectives1.trace.json
index 58b23783b0b..8532d21da89 100644
--- a/tests/baselines/reference/typeReferenceDirectives1.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives1.trace.json
@@ -3,10 +3,12 @@
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/types/lib/index.d.ts', result '/types/lib/index.d.ts'",
     "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========",
     "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/types/lib/index.d.ts', result '/types/lib/index.d.ts'",
     "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/typeReferenceDirectives10.trace.json b/tests/baselines/reference/typeReferenceDirectives10.trace.json
index 2dfd1fe0939..5bd31419793 100644
--- a/tests/baselines/reference/typeReferenceDirectives10.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives10.trace.json
@@ -3,6 +3,7 @@
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/types/lib/index.d.ts', result '/types/lib/index.d.ts'",
     "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========",
     "======== Resolving module './ref' from '/app.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
@@ -15,5 +16,6 @@
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/types/lib/index.d.ts', result '/types/lib/index.d.ts'",
     "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/typeReferenceDirectives11.trace.json b/tests/baselines/reference/typeReferenceDirectives11.trace.json
index 862c941079a..a6ab6bc8d68 100644
--- a/tests/baselines/reference/typeReferenceDirectives11.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives11.trace.json
@@ -8,5 +8,6 @@
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/types/lib/index.d.ts', result '/types/lib/index.d.ts'",
     "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/typeReferenceDirectives12.trace.json b/tests/baselines/reference/typeReferenceDirectives12.trace.json
index 627ad13588a..f232228a351 100644
--- a/tests/baselines/reference/typeReferenceDirectives12.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives12.trace.json
@@ -13,6 +13,7 @@
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/types/lib/index.d.ts', result '/types/lib/index.d.ts'",
     "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========",
     "======== Resolving module './main' from '/mod1.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
@@ -23,5 +24,6 @@
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/types/lib/index.d.ts', result '/types/lib/index.d.ts'",
     "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/typeReferenceDirectives13.trace.json b/tests/baselines/reference/typeReferenceDirectives13.trace.json
index 2dfd1fe0939..5bd31419793 100644
--- a/tests/baselines/reference/typeReferenceDirectives13.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives13.trace.json
@@ -3,6 +3,7 @@
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/types/lib/index.d.ts', result '/types/lib/index.d.ts'",
     "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========",
     "======== Resolving module './ref' from '/app.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
@@ -15,5 +16,6 @@
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/types/lib/index.d.ts', result '/types/lib/index.d.ts'",
     "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/typeReferenceDirectives2.trace.json b/tests/baselines/reference/typeReferenceDirectives2.trace.json
index 93d3658447d..1258ecdaa2b 100644
--- a/tests/baselines/reference/typeReferenceDirectives2.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives2.trace.json
@@ -3,5 +3,6 @@
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/types/lib/index.d.ts', result '/types/lib/index.d.ts'",
     "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/typeReferenceDirectives3.trace.json b/tests/baselines/reference/typeReferenceDirectives3.trace.json
index 58b23783b0b..8532d21da89 100644
--- a/tests/baselines/reference/typeReferenceDirectives3.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives3.trace.json
@@ -3,10 +3,12 @@
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/types/lib/index.d.ts', result '/types/lib/index.d.ts'",
     "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========",
     "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/types/lib/index.d.ts', result '/types/lib/index.d.ts'",
     "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/typeReferenceDirectives4.trace.json b/tests/baselines/reference/typeReferenceDirectives4.trace.json
index 58b23783b0b..8532d21da89 100644
--- a/tests/baselines/reference/typeReferenceDirectives4.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives4.trace.json
@@ -3,10 +3,12 @@
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/types/lib/index.d.ts', result '/types/lib/index.d.ts'",
     "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========",
     "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/types/lib/index.d.ts', result '/types/lib/index.d.ts'",
     "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/typeReferenceDirectives5.trace.json b/tests/baselines/reference/typeReferenceDirectives5.trace.json
index 2dfd1fe0939..5bd31419793 100644
--- a/tests/baselines/reference/typeReferenceDirectives5.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives5.trace.json
@@ -3,6 +3,7 @@
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/types/lib/index.d.ts', result '/types/lib/index.d.ts'",
     "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========",
     "======== Resolving module './ref' from '/app.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
@@ -15,5 +16,6 @@
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/types/lib/index.d.ts', result '/types/lib/index.d.ts'",
     "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/typeReferenceDirectives6.trace.json b/tests/baselines/reference/typeReferenceDirectives6.trace.json
index 58b23783b0b..8532d21da89 100644
--- a/tests/baselines/reference/typeReferenceDirectives6.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives6.trace.json
@@ -3,10 +3,12 @@
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/types/lib/index.d.ts', result '/types/lib/index.d.ts'",
     "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========",
     "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/types/lib/index.d.ts', result '/types/lib/index.d.ts'",
     "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/typeReferenceDirectives7.trace.json b/tests/baselines/reference/typeReferenceDirectives7.trace.json
index 58b23783b0b..8532d21da89 100644
--- a/tests/baselines/reference/typeReferenceDirectives7.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives7.trace.json
@@ -3,10 +3,12 @@
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/types/lib/index.d.ts', result '/types/lib/index.d.ts'",
     "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========",
     "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/types/lib/index.d.ts', result '/types/lib/index.d.ts'",
     "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/typeReferenceDirectives8.trace.json b/tests/baselines/reference/typeReferenceDirectives8.trace.json
index 862c941079a..a6ab6bc8d68 100644
--- a/tests/baselines/reference/typeReferenceDirectives8.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives8.trace.json
@@ -8,5 +8,6 @@
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/types/lib/index.d.ts', result '/types/lib/index.d.ts'",
     "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/typeReferenceDirectives9.trace.json b/tests/baselines/reference/typeReferenceDirectives9.trace.json
index 627ad13588a..f232228a351 100644
--- a/tests/baselines/reference/typeReferenceDirectives9.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives9.trace.json
@@ -13,6 +13,7 @@
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/types/lib/index.d.ts', result '/types/lib/index.d.ts'",
     "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========",
     "======== Resolving module './main' from '/mod1.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
@@ -23,5 +24,6 @@
     "Resolving with primary search path '/types'",
     "File '/types/lib/package.json' does not exist.",
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/types/lib/index.d.ts', result '/types/lib/index.d.ts'",
     "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.trace.json b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.trace.json
index eec78e40192..8541fd5bee8 100644
--- a/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.trace.json
+++ b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.trace.json
@@ -234,11 +234,13 @@
     "Resolving with primary search path '/foo/node_modules/@types, /node_modules/@types'",
     "File '/foo/node_modules/@types/grumpy/package.json' does not exist.",
     "File '/foo/node_modules/@types/grumpy/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/foo/node_modules/@types/grumpy/index.d.ts', result '/foo/node_modules/@types/grumpy/index.d.ts'",
     "======== Type reference directive 'grumpy' was successfully resolved to '/foo/node_modules/@types/grumpy/index.d.ts', primary: true. ========",
     "======== Resolving type reference directive 'sneezy', containing file '/src/__inferred type names__.ts', root directory '/foo/node_modules/@types,/node_modules/@types'. ========",
     "Resolving with primary search path '/foo/node_modules/@types, /node_modules/@types'",
     "File '/foo/node_modules/@types/sneezy/package.json' does not exist.",
     "File '/foo/node_modules/@types/sneezy/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/foo/node_modules/@types/sneezy/index.d.ts', result '/foo/node_modules/@types/sneezy/index.d.ts'",
     "======== Type reference directive 'sneezy' was successfully resolved to '/foo/node_modules/@types/sneezy/index.d.ts', primary: true. ========",
     "======== Resolving type reference directive 'dopey', containing file '/src/__inferred type names__.ts', root directory '/foo/node_modules/@types,/node_modules/@types'. ========",
     "Resolving with primary search path '/foo/node_modules/@types, /node_modules/@types'",
@@ -246,5 +248,6 @@
     "File '/foo/node_modules/@types/dopey/index.d.ts' does not exist.",
     "File '/node_modules/@types/dopey/package.json' does not exist.",
     "File '/node_modules/@types/dopey/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/node_modules/@types/dopey/index.d.ts', result '/node_modules/@types/dopey/index.d.ts'",
     "======== Type reference directive 'dopey' was successfully resolved to '/node_modules/@types/dopey/index.d.ts', primary: true. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.trace.json b/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.trace.json
index 4bb62bc255a..f7d0b2e40f7 100644
--- a/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.trace.json
+++ b/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.trace.json
@@ -56,5 +56,6 @@
     "Resolving with primary search path '/node_modules/@types'",
     "File '/node_modules/@types/foo/package.json' does not exist.",
     "File '/node_modules/@types/foo/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/node_modules/@types/foo/index.d.ts', result '/node_modules/@types/foo/index.d.ts'",
     "======== Type reference directive 'foo' was successfully resolved to '/node_modules/@types/foo/index.d.ts', primary: true. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/typingsLookup1.trace.json b/tests/baselines/reference/typingsLookup1.trace.json
index 83b0e91d6c7..9445b8564d9 100644
--- a/tests/baselines/reference/typingsLookup1.trace.json
+++ b/tests/baselines/reference/typingsLookup1.trace.json
@@ -3,10 +3,12 @@
     "Resolving with primary search path '/node_modules/@types'",
     "File '/node_modules/@types/jquery/package.json' does not exist.",
     "File '/node_modules/@types/jquery/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/node_modules/@types/jquery/index.d.ts', result '/node_modules/@types/jquery/index.d.ts'",
     "======== Type reference directive 'jquery' was successfully resolved to '/node_modules/@types/jquery/index.d.ts', primary: true. ========",
     "======== Resolving type reference directive 'jquery', containing file '/__inferred type names__.ts', root directory '/node_modules/@types'. ========",
     "Resolving with primary search path '/node_modules/@types'",
     "File '/node_modules/@types/jquery/package.json' does not exist.",
     "File '/node_modules/@types/jquery/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/node_modules/@types/jquery/index.d.ts', result '/node_modules/@types/jquery/index.d.ts'",
     "======== Type reference directive 'jquery' was successfully resolved to '/node_modules/@types/jquery/index.d.ts', primary: true. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/typingsLookup3.trace.json b/tests/baselines/reference/typingsLookup3.trace.json
index 83b0e91d6c7..9445b8564d9 100644
--- a/tests/baselines/reference/typingsLookup3.trace.json
+++ b/tests/baselines/reference/typingsLookup3.trace.json
@@ -3,10 +3,12 @@
     "Resolving with primary search path '/node_modules/@types'",
     "File '/node_modules/@types/jquery/package.json' does not exist.",
     "File '/node_modules/@types/jquery/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/node_modules/@types/jquery/index.d.ts', result '/node_modules/@types/jquery/index.d.ts'",
     "======== Type reference directive 'jquery' was successfully resolved to '/node_modules/@types/jquery/index.d.ts', primary: true. ========",
     "======== Resolving type reference directive 'jquery', containing file '/__inferred type names__.ts', root directory '/node_modules/@types'. ========",
     "Resolving with primary search path '/node_modules/@types'",
     "File '/node_modules/@types/jquery/package.json' does not exist.",
     "File '/node_modules/@types/jquery/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/node_modules/@types/jquery/index.d.ts', result '/node_modules/@types/jquery/index.d.ts'",
     "======== Type reference directive 'jquery' was successfully resolved to '/node_modules/@types/jquery/index.d.ts', primary: true. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/typingsLookup4.trace.json b/tests/baselines/reference/typingsLookup4.trace.json
index bb9d94f43b5..18c7385c3d2 100644
--- a/tests/baselines/reference/typingsLookup4.trace.json
+++ b/tests/baselines/reference/typingsLookup4.trace.json
@@ -62,6 +62,7 @@
     "Found 'package.json' at '/node_modules/@types/jquery/package.json'.",
     "'package.json' has 'typings' field 'jquery.d.ts' that references '/node_modules/@types/jquery/jquery.d.ts'.",
     "File '/node_modules/@types/jquery/jquery.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/node_modules/@types/jquery/jquery.d.ts', result '/node_modules/@types/jquery/jquery.d.ts'",
     "======== Type reference directive 'jquery' was successfully resolved to '/node_modules/@types/jquery/jquery.d.ts', primary: true. ========",
     "======== Resolving type reference directive 'kquery', containing file '/__inferred type names__.ts', root directory '/node_modules/@types'. ========",
     "Resolving with primary search path '/node_modules/@types'",
@@ -71,6 +72,7 @@
     "File '/node_modules/@types/kquery/kquery.ts' does not exist.",
     "File '/node_modules/@types/kquery/kquery.tsx' does not exist.",
     "File '/node_modules/@types/kquery/kquery.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/node_modules/@types/kquery/kquery.d.ts', result '/node_modules/@types/kquery/kquery.d.ts'",
     "======== Type reference directive 'kquery' was successfully resolved to '/node_modules/@types/kquery/kquery.d.ts', primary: true. ========",
     "======== Resolving type reference directive 'lquery', containing file '/__inferred type names__.ts', root directory '/node_modules/@types'. ========",
     "Resolving with primary search path '/node_modules/@types'",
@@ -78,5 +80,6 @@
     "'package.json' has 'typings' field 'lquery' that references '/node_modules/@types/lquery/lquery'.",
     "File '/node_modules/@types/lquery/lquery' does not exist.",
     "File '/node_modules/@types/lquery/lquery.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/node_modules/@types/lquery/lquery.ts', result '/node_modules/@types/lquery/lquery.ts'",
     "======== Type reference directive 'lquery' was successfully resolved to '/node_modules/@types/lquery/lquery.ts', primary: true. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/typingsLookupAmd.trace.json b/tests/baselines/reference/typingsLookupAmd.trace.json
index 496166926a8..90ebf075163 100644
--- a/tests/baselines/reference/typingsLookupAmd.trace.json
+++ b/tests/baselines/reference/typingsLookupAmd.trace.json
@@ -75,5 +75,6 @@
     "Resolving with primary search path '/node_modules/@types'",
     "File '/node_modules/@types/a/package.json' does not exist.",
     "File '/node_modules/@types/a/index.d.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/node_modules/@types/a/index.d.ts', result '/node_modules/@types/a/index.d.ts'",
     "======== Type reference directive 'a' was successfully resolved to '/node_modules/@types/a/index.d.ts', primary: true. ========"
 ]
\ No newline at end of file
diff --git a/tests/cases/compiler/moduleResolutionWithSymlinks_notInNodeModules.ts b/tests/cases/compiler/moduleResolutionWithSymlinks_notInNodeModules.ts
index f861813942f..427fd4d7697 100644
--- a/tests/cases/compiler/moduleResolutionWithSymlinks_notInNodeModules.ts
+++ b/tests/cases/compiler/moduleResolutionWithSymlinks_notInNodeModules.ts
@@ -34,7 +34,5 @@ ln -s ../shared ./shared; ln -s ../shared ./shared2 # Linux
 # Windows: Open command prompt as administrator and run: `mklink /D shared ..\shared; mklink /D shared2 ..\shared`
 
 echo '{ "compilerOptions": { "outDir": "bin" } }' > tsconfig.json
-node ../../../../TypeScript/built/local/tsc.js
-
-# Should create `bin/app.js`, `bin/shared/abc.js`, and `bin/shared2/abc.js`
+tsc # Should create `bin/app.js`, `bin/shared/abc.js`, and `bin/shared2/abc.js`
 */
diff --git a/tests/cases/compiler/moduleResolutionWithSymlinks_referenceTypes.ts b/tests/cases/compiler/moduleResolutionWithSymlinks_referenceTypes.ts
new file mode 100644
index 00000000000..a07352e8d39
--- /dev/null
+++ b/tests/cases/compiler/moduleResolutionWithSymlinks_referenceTypes.ts
@@ -0,0 +1,45 @@
+// Symlinks are always resolved for type reference directives.
+// NOTE: This test would still compile without errors even if they were not,
+// because `processTypeReferenceDirective` also checks for textual equivalence of file contents.
+// But the `moduleResolutionWithSymlinks_referenceTypes.trace.json` shows the difference.
+
+// @noImplicitReferences: true
+// @traceResolution: true
+// @fullEmitPaths: true
+
+// @filename: /node_modules/@types/library-a/index.d.ts
+// @symlink: /node_modules/@types/library-b/node_modules/@types/library-a/index.d.ts
+declare class MyClass { private x: number; }
+
+// @filename: /node_modules/@types/library-b/index.d.ts
+/// <reference types="library-a" />
+
+// @filename: /app.ts
+/// <reference types="library-a" />
+/// <reference types="library-b" />
+
+/*
+# To reproduce in a real project:
+
+echo '/// <reference types="library-a" />' > app.ts
+echo '/// <reference types="library-b" />' >> app.ts
+
+mkdir node_modules/@types
+cd mode_modules/@types
+mkdir library-a
+echo 'declare class MyClass { private x: number; }' > library-a/index.d.ts
+
+mkdir library-b
+cd library-b
+echo '/// <reference types="library-a" />' > index.d.ts
+
+mkdir node_modules
+cd node_modules
+
+ln -s ../../library-a ./library-a
+# Windows: Open command prompt as administrator and run: `mklink /D library-a ..\..\library-a`
+
+cd ../../.. # back to root
+
+tsc app.ts # Should create `app.js`
+*/

From 7079d0450e9cae09d2845e310b0efe5fe65a99a4 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Wed, 9 Nov 2016 09:12:43 -0800
Subject: [PATCH 149/421] Fix duplicate function error

---
 src/compiler/program.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 7829bfcfb78..71c79585f66 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -450,10 +450,6 @@ namespace ts {
             return commonSourceDirectory;
         }
 
-        function isSourceFileFromExternalLibrary(file: SourceFile): boolean {
-            return !!sourceFilesFoundSearchingNodeModules[file.path];
-        }
-
         function getClassifiableNames() {
             if (!classifiableNames) {
                 // Initialize a checker so that all our files are bound.

From 3dd11e48a9fda2e4ee8d4efb2698eb9f92814980 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Wed, 9 Nov 2016 09:59:15 -0800
Subject: [PATCH 150/421] Properly implement type relationship for '[P in S]:
 X' and '[P in T]: Y'

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 8ed8df17c68..cfabcd3f5ba 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -7047,11 +7047,12 @@ namespace ts {
                         }
                     }
                     if (isGenericMappedType(target)) {
-                        // A type [P in S]: X is related to a type [P in T]: X if T is related to S.
-                        if (isGenericMappedType(source) &&
-                            isRelatedTo(getConstraintTypeFromMappedType(<MappedType>target), getConstraintTypeFromMappedType(<MappedType>source), /*reportErrors*/ false) &&
-                            isTypeIdenticalTo(getTemplateTypeFromMappedType(<MappedType>source), getTemplateTypeFromMappedType(<MappedType>target))) {
-                            return Ternary.True;
+                        // A type [P in S]: X is related to a type [P in T]: Y if T is related to S and X is related to Y.
+                        if (isGenericMappedType(source)) {
+                            if ((result = isRelatedTo(getConstraintTypeFromMappedType(<MappedType>target), getConstraintTypeFromMappedType(<MappedType>source), reportErrors)) &&
+                                (result = isRelatedTo(getTemplateTypeFromMappedType(<MappedType>source), getTemplateTypeFromMappedType(<MappedType>target), reportErrors))) {
+                                return result;
+                            }
                         }
                     }
                     else {

From d8b541afa1312046f02a5132c78fc19e710ac94a Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Wed, 9 Nov 2016 10:14:25 -0800
Subject: [PATCH 151/421] Fix test

---
 ...leResolutionWithSymlinks_referenceTypes.js | 51 -------------------
 ...olutionWithSymlinks_referenceTypes.symbols | 26 ----------
 ...tionWithSymlinks_referenceTypes.trace.json |  6 +--
 ...esolutionWithSymlinks_referenceTypes.types | 26 ----------
 ...leResolutionWithSymlinks_referenceTypes.ts |  9 ++++
 5 files changed, 12 insertions(+), 106 deletions(-)

diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_referenceTypes.js b/tests/baselines/reference/moduleResolutionWithSymlinks_referenceTypes.js
index 8fa8ca1c6f1..d04dfe0d8a8 100644
--- a/tests/baselines/reference/moduleResolutionWithSymlinks_referenceTypes.js
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks_referenceTypes.js
@@ -15,59 +15,8 @@ declare class MyClass { private x: number; }
 //// [app.ts]
 /// <reference types="library-a" />
 /// <reference types="library-b" />
-
-/*
-# To reproduce in a real project:
-
-echo '/// <reference types="library-a" />' > app.ts
-echo '/// <reference types="library-b" />' >> app.ts
-
-mkdir node_modules/@types
-cd mode_modules/@types
-mkdir library-a
-echo 'declare class MyClass { private x: number; }' > library-a/index.d.ts
-
-mkdir library-b
-cd library-b
-echo '/// <reference types="library-a" />' > index.d.ts
-
-mkdir node_modules
-cd node_modules
-
-ln -s ../../library-a ./library-a
-# Windows: Open command prompt as administrator and run: `mklink /D library-a ..\..\library-a`
-
-cd ../../.. # back to root
-
-tsc app.ts # Should create `app.js`
-*/
 
 
 //// [/app.js]
 /// <reference types="library-a" />
 /// <reference types="library-b" />
-/*
-# To reproduce in a real project:
-
-echo '/// <reference types="library-a" />' > app.ts
-echo '/// <reference types="library-b" />' >> app.ts
-
-mkdir node_modules/@types
-cd mode_modules/@types
-mkdir library-a
-echo 'declare class MyClass { private x: number; }' > library-a/index.d.ts
-
-mkdir library-b
-cd library-b
-echo '/// <reference types="library-a" />' > index.d.ts
-
-mkdir node_modules
-cd node_modules
-
-ln -s ../../library-a ./library-a
-# Windows: Open command prompt as administrator and run: `mklink /D library-a ..\..\library-a`
-
-cd ../../.. # back to root
-
-tsc app.ts # Should create `app.js`
-*/
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_referenceTypes.symbols b/tests/baselines/reference/moduleResolutionWithSymlinks_referenceTypes.symbols
index efb46a42f7f..46806e5313f 100644
--- a/tests/baselines/reference/moduleResolutionWithSymlinks_referenceTypes.symbols
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks_referenceTypes.symbols
@@ -2,32 +2,6 @@
 /// <reference types="library-a" />
 No type information for this code./// <reference types="library-b" />
 No type information for this code.
-No type information for this code./*
-No type information for this code.# To reproduce in a real project:
-No type information for this code.
-No type information for this code.echo '/// <reference types="library-a" />' > app.ts
-No type information for this code.echo '/// <reference types="library-b" />' >> app.ts
-No type information for this code.
-No type information for this code.mkdir node_modules/@types
-No type information for this code.cd mode_modules/@types
-No type information for this code.mkdir library-a
-No type information for this code.echo 'declare class MyClass { private x: number; }' > library-a/index.d.ts
-No type information for this code.
-No type information for this code.mkdir library-b
-No type information for this code.cd library-b
-No type information for this code.echo '/// <reference types="library-a" />' > index.d.ts
-No type information for this code.
-No type information for this code.mkdir node_modules
-No type information for this code.cd node_modules
-No type information for this code.
-No type information for this code.ln -s ../../library-a ./library-a
-No type information for this code.# Windows: Open command prompt as administrator and run: `mklink /D library-a ..\..\library-a`
-No type information for this code.
-No type information for this code.cd ../../.. # back to root
-No type information for this code.
-No type information for this code.tsc app.ts # Should create `app.js`
-No type information for this code.*/
-No type information for this code.
 No type information for this code.=== /node_modules/@types/library-a/index.d.ts ===
 // Symlinks are always resolved for type reference directives.
 // NOTE: This test would still compile without errors even if they were not,
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_referenceTypes.trace.json b/tests/baselines/reference/moduleResolutionWithSymlinks_referenceTypes.trace.json
index 658f407c42b..3e0609ee325 100644
--- a/tests/baselines/reference/moduleResolutionWithSymlinks_referenceTypes.trace.json
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks_referenceTypes.trace.json
@@ -1,5 +1,5 @@
 [
-    "======== Resolving type reference directive 'library-a', containing file '/app.ts', root directory not set. ========",
+    "======== Resolving type reference directive 'library-a', containing file '/app.ts', root directory ''. ========",
     "Root directory cannot be determined, skipping primary search paths.",
     "Looking up in 'node_modules' folder, initial location '/'",
     "File '/node_modules/library-a.d.ts' does not exist.",
@@ -10,7 +10,7 @@
     "File '/node_modules/@types/library-a/index.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/node_modules/@types/library-a/index.d.ts', result '/node_modules/@types/library-a/index.d.ts'",
     "======== Type reference directive 'library-a' was successfully resolved to '/node_modules/@types/library-a/index.d.ts', primary: false. ========",
-    "======== Resolving type reference directive 'library-b', containing file '/app.ts', root directory not set. ========",
+    "======== Resolving type reference directive 'library-b', containing file '/app.ts', root directory ''. ========",
     "Root directory cannot be determined, skipping primary search paths.",
     "Looking up in 'node_modules' folder, initial location '/'",
     "File '/node_modules/library-b.d.ts' does not exist.",
@@ -21,7 +21,7 @@
     "File '/node_modules/@types/library-b/index.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/node_modules/@types/library-b/index.d.ts', result '/node_modules/@types/library-b/index.d.ts'",
     "======== Type reference directive 'library-b' was successfully resolved to '/node_modules/@types/library-b/index.d.ts', primary: false. ========",
-    "======== Resolving type reference directive 'library-a', containing file '/node_modules/@types/library-b/index.d.ts', root directory not set. ========",
+    "======== Resolving type reference directive 'library-a', containing file '/node_modules/@types/library-b/index.d.ts', root directory ''. ========",
     "Root directory cannot be determined, skipping primary search paths.",
     "Looking up in 'node_modules' folder, initial location '/node_modules/@types/library-b'",
     "File '/node_modules/@types/library-b/node_modules/library-a.d.ts' does not exist.",
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_referenceTypes.types b/tests/baselines/reference/moduleResolutionWithSymlinks_referenceTypes.types
index bee6eb5aae6..2094265709f 100644
--- a/tests/baselines/reference/moduleResolutionWithSymlinks_referenceTypes.types
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks_referenceTypes.types
@@ -2,32 +2,6 @@
 /// <reference types="library-a" />
 No type information for this code./// <reference types="library-b" />
 No type information for this code.
-No type information for this code./*
-No type information for this code.# To reproduce in a real project:
-No type information for this code.
-No type information for this code.echo '/// <reference types="library-a" />' > app.ts
-No type information for this code.echo '/// <reference types="library-b" />' >> app.ts
-No type information for this code.
-No type information for this code.mkdir node_modules/@types
-No type information for this code.cd mode_modules/@types
-No type information for this code.mkdir library-a
-No type information for this code.echo 'declare class MyClass { private x: number; }' > library-a/index.d.ts
-No type information for this code.
-No type information for this code.mkdir library-b
-No type information for this code.cd library-b
-No type information for this code.echo '/// <reference types="library-a" />' > index.d.ts
-No type information for this code.
-No type information for this code.mkdir node_modules
-No type information for this code.cd node_modules
-No type information for this code.
-No type information for this code.ln -s ../../library-a ./library-a
-No type information for this code.# Windows: Open command prompt as administrator and run: `mklink /D library-a ..\..\library-a`
-No type information for this code.
-No type information for this code.cd ../../.. # back to root
-No type information for this code.
-No type information for this code.tsc app.ts # Should create `app.js`
-No type information for this code.*/
-No type information for this code.
 No type information for this code.=== /node_modules/@types/library-a/index.d.ts ===
 // Symlinks are always resolved for type reference directives.
 // NOTE: This test would still compile without errors even if they were not,
diff --git a/tests/cases/compiler/moduleResolutionWithSymlinks_referenceTypes.ts b/tests/cases/compiler/moduleResolutionWithSymlinks_referenceTypes.ts
index a07352e8d39..c0e25784c15 100644
--- a/tests/cases/compiler/moduleResolutionWithSymlinks_referenceTypes.ts
+++ b/tests/cases/compiler/moduleResolutionWithSymlinks_referenceTypes.ts
@@ -18,6 +18,15 @@ declare class MyClass { private x: number; }
 /// <reference types="library-a" />
 /// <reference types="library-b" />
 
+// @filename: tsconfig.json
+{
+    "compilerOptions": {
+        // If this is its default of node_modules/@types,
+        // node_modules/@types/library-a will be looked up be fore node_modules/@types/library-b/node_modules/@types/library-a
+        "typeRoots": []
+    }
+}
+
 /*
 # To reproduce in a real project:
 

From 64563259733f5c611860a9ca88f99d8859a7b24e Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Tue, 8 Nov 2016 16:28:10 -0800
Subject: [PATCH 152/421] Handle abstract and const modifiers

---
 src/compiler/program.ts                           | 15 ++++++++++-----
 .../jsFileCompilationAbstractModifier.errors.txt  | 14 ++++++++++++++
 .../jsFileCompilationConstModifier.symbols        |  4 ++++
 .../jsFileCompilationConstModifier.types          |  5 +++++
 .../compiler/jsFileCompilationAbstractModifier.ts |  5 +++++
 .../compiler/jsFileCompilationConstModifier.ts    |  4 ++++
 6 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 tests/baselines/reference/jsFileCompilationAbstractModifier.errors.txt
 create mode 100644 tests/baselines/reference/jsFileCompilationConstModifier.symbols
 create mode 100644 tests/baselines/reference/jsFileCompilationConstModifier.types
 create mode 100644 tests/cases/compiler/jsFileCompilationAbstractModifier.ts
 create mode 100644 tests/cases/compiler/jsFileCompilationConstModifier.ts

diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 06476d29fbe..0257ed6387b 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -870,11 +870,12 @@ namespace ts {
                                 diagnostics.push(createDiagnosticForNodeArray(nodes, Diagnostics.type_parameter_declarations_can_only_be_used_in_a_ts_file));
                                 return;
                             }
-                        // pass through
+                            // pass through
+                            let isConstInvalid = true;
                         case SyntaxKind.VariableStatement:
                             // Check modifiers
                             if (nodes === (<ClassDeclaration | FunctionLikeDeclaration | VariableStatement>parent).modifiers) {
-                                return checkModifiers(<NodeArray<Modifier>>nodes);
+                                return checkModifiers(<NodeArray<Modifier>>nodes, !isConstInvalid);
                             }
                             break;
                         case SyntaxKind.PropertyDeclaration:
@@ -911,23 +912,27 @@ namespace ts {
                     }
                 }
 
-                function checkModifiers(modifiers: NodeArray<Modifier>) {
+                function checkModifiers(modifiers: NodeArray<Modifier>, isConstValid: boolean) {
                     for (const modifier of modifiers) {
                         switch (modifier.kind) {
+                            case SyntaxKind.ConstKeyword:
+                                if (isConstValid) {
+                                    continue;
+                                }
+                                // Fallthrough to report error
                             case SyntaxKind.PublicKeyword:
                             case SyntaxKind.PrivateKeyword:
                             case SyntaxKind.ProtectedKeyword:
                             case SyntaxKind.ReadonlyKeyword:
                             case SyntaxKind.DeclareKeyword:
+                            case SyntaxKind.AbstractKeyword:
                                 diagnostics.push(createDiagnosticForNode(modifier, Diagnostics._0_can_only_be_used_in_a_ts_file, tokenToString(modifier.kind)));
                                 break;
 
                             // These are all legal modifiers.
                             case SyntaxKind.StaticKeyword:
                             case SyntaxKind.ExportKeyword:
-                            case SyntaxKind.ConstKeyword:
                             case SyntaxKind.DefaultKeyword:
-                            case SyntaxKind.AbstractKeyword:
                         }
                     }
                 }
diff --git a/tests/baselines/reference/jsFileCompilationAbstractModifier.errors.txt b/tests/baselines/reference/jsFileCompilationAbstractModifier.errors.txt
new file mode 100644
index 00000000000..62fc2c3e854
--- /dev/null
+++ b/tests/baselines/reference/jsFileCompilationAbstractModifier.errors.txt
@@ -0,0 +1,14 @@
+error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+tests/cases/compiler/a.js(1,1): error TS8009: 'abstract' can only be used in a .ts file.
+tests/cases/compiler/a.js(2,5): error TS8009: 'abstract' can only be used in a .ts file.
+
+
+!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
+==== tests/cases/compiler/a.js (2 errors) ====
+    abstract class c {
+    ~~~~~~~~
+!!! error TS8009: 'abstract' can only be used in a .ts file.
+        abstract x;
+        ~~~~~~~~
+!!! error TS8009: 'abstract' can only be used in a .ts file.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationConstModifier.symbols b/tests/baselines/reference/jsFileCompilationConstModifier.symbols
new file mode 100644
index 00000000000..137dafd3473
--- /dev/null
+++ b/tests/baselines/reference/jsFileCompilationConstModifier.symbols
@@ -0,0 +1,4 @@
+=== tests/cases/compiler/a.js ===
+const c = 10;
+>c : Symbol(c, Decl(a.js, 0, 5))
+
diff --git a/tests/baselines/reference/jsFileCompilationConstModifier.types b/tests/baselines/reference/jsFileCompilationConstModifier.types
new file mode 100644
index 00000000000..8e74679f2a5
--- /dev/null
+++ b/tests/baselines/reference/jsFileCompilationConstModifier.types
@@ -0,0 +1,5 @@
+=== tests/cases/compiler/a.js ===
+const c = 10;
+>c : 10
+>10 : 10
+
diff --git a/tests/cases/compiler/jsFileCompilationAbstractModifier.ts b/tests/cases/compiler/jsFileCompilationAbstractModifier.ts
new file mode 100644
index 00000000000..ebd021e05a1
--- /dev/null
+++ b/tests/cases/compiler/jsFileCompilationAbstractModifier.ts
@@ -0,0 +1,5 @@
+// @allowJs: true
+// @filename: a.js
+abstract class c {
+    abstract x;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/jsFileCompilationConstModifier.ts b/tests/cases/compiler/jsFileCompilationConstModifier.ts
new file mode 100644
index 00000000000..4ffa62bb6a2
--- /dev/null
+++ b/tests/cases/compiler/jsFileCompilationConstModifier.ts
@@ -0,0 +1,4 @@
+// @allowJs: true
+// @filename: a.js
+// @noEmit: true
+const c = 10;
\ No newline at end of file

From 214ce38a6a64441232b5e7e72d78a2687edfe743 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 9 Nov 2016 10:47:54 -0800
Subject: [PATCH 153/421] Downlevel array destructuring to ES6 in object rest

Previously array destructuring inside an object destructuring with an
object rest would downlevel the array destructuring to ES5. This breaks
if the code that targets ES2015 is using iterators instead of arrays
since iterators don't support [0] or .slice that the ES5 emit uses.
---
 src/compiler/factory.ts                    |   3 +-
 src/compiler/transformers/destructuring.ts | 141 ++++++++++++++++-----
 2 files changed, 110 insertions(+), 34 deletions(-)

diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index 790f9c2df6f..40f5910009c 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -3568,8 +3568,7 @@ namespace ts {
         setEmitFlags(body, EmitFlags.NoSourceMap | EmitFlags.NoTokenSourceMaps);
 
         let forStatement: ForStatement | ForOfStatement;
-        if(convertObjectRest) {
-
+        if (convertObjectRest) {
             forStatement = createForOf(
                 createVariableDeclarationList([
                     createVariableDeclaration(rhsReference, /*type*/ undefined, /*initializer*/ undefined, /*location*/ node.expression)
diff --git a/src/compiler/transformers/destructuring.ts b/src/compiler/transformers/destructuring.ts
index 66b907d4d90..bba09710898 100644
--- a/src/compiler/transformers/destructuring.ts
+++ b/src/compiler/transformers/destructuring.ts
@@ -52,7 +52,7 @@ namespace ts {
             location = value;
         }
 
-        flattenDestructuring(node, value, location, emitAssignment, emitTempVariableAssignment, emitRestAssignment, transformRest, visitor);
+        flattenDestructuring(node, value, location, emitAssignment, emitTempVariableAssignment, recordTempVariable, emitRestAssignment, transformRest, visitor);
 
         if (needsValue) {
             expressions.push(value);
@@ -98,7 +98,7 @@ namespace ts {
         transformRest?: boolean) {
         const declarations: VariableDeclaration[] = [];
 
-        flattenDestructuring(node, value, node, emitAssignment, emitTempVariableAssignment, emitRestAssignment, transformRest, visitor);
+        flattenDestructuring(node, value, node, emitAssignment, emitTempVariableAssignment, noop, emitRestAssignment, transformRest, visitor);
 
         return declarations;
 
@@ -140,7 +140,7 @@ namespace ts {
         const declarations: VariableDeclaration[] = [];
 
         let pendingAssignments: Expression[];
-        flattenDestructuring(node, value, node, emitAssignment, emitTempVariableAssignment, emitRestAssignment, transformRest, visitor);
+        flattenDestructuring(node, value, node, emitAssignment, emitTempVariableAssignment, recordTempVariable, emitRestAssignment, transformRest, visitor);
 
         return declarations;
 
@@ -201,7 +201,7 @@ namespace ts {
 
         const pendingAssignments: Expression[] = [];
 
-        flattenDestructuring(node, /*value*/ undefined, node, emitAssignment, emitTempVariableAssignment, emitRestAssignment, /*transformRest*/ false, visitor);
+        flattenDestructuring(node, /*value*/ undefined, node, emitAssignment, emitTempVariableAssignment, noop, emitRestAssignment, /*transformRest*/ false, visitor);
 
         const expression = inlineExpressions(pendingAssignments);
         aggregateTransformFlags(expression);
@@ -244,6 +244,7 @@ namespace ts {
         location: TextRange,
         emitAssignment: (name: Identifier, value: Expression, location: TextRange, original: Node) => void,
         emitTempVariableAssignment: (value: Expression, location: TextRange) => Identifier,
+        recordTempVariable: (node: Identifier) => void,
         emitRestAssignment: (elements: (ObjectLiteralElementLike[] | BindingElement[]), value: Expression, location: TextRange, original: Node) => void,
         transformRest: boolean,
         visitor?: (node: Node) => VisitResult<Node>) {
@@ -307,48 +308,91 @@ namespace ts {
                 value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ true, location, emitTempVariableAssignment);
             }
 
-            let es2015: ObjectLiteralElementLike[] = [];
+            let bindingElements: ObjectLiteralElementLike[] = [];
             for (let i = 0; i < properties.length; i++) {
                 const p = properties[i];
                 if (p.kind === SyntaxKind.PropertyAssignment || p.kind === SyntaxKind.ShorthandPropertyAssignment) {
-                    if (transformRest && !(p.transformFlags & TransformFlags.ContainsSpreadExpression)) {
-                        es2015.push(p);
-                    }
-                    else {
-                        if (es2015.length) {
-                            emitRestAssignment(es2015, value, location, target);
-                            es2015 = [];
+                    if (!transformRest ||
+                        p.transformFlags & TransformFlags.ContainsSpreadExpression ||
+                        (p.kind === SyntaxKind.PropertyAssignment && p.initializer.transformFlags & TransformFlags.ContainsSpreadExpression)) {
+                        if (bindingElements.length) {
+                            emitRestAssignment(bindingElements, value, location, target);
+                            bindingElements = [];
                         }
                         const propName = <Identifier | LiteralExpression>(<PropertyAssignment>p).name;
                         const bindingTarget = p.kind === SyntaxKind.ShorthandPropertyAssignment ? <ShorthandPropertyAssignment>p : (<PropertyAssignment>p).initializer || propName;
                         // Assignment for bindingTarget = value.propName should highlight whole property, hence use p as source map node
                         emitDestructuringAssignment(bindingTarget, createDestructuringPropertyAccess(value, propName), p);
                     }
+                    else {
+                        bindingElements.push(p);
+                    }
                 }
                 else if (i === properties.length - 1 && p.kind === SyntaxKind.SpreadAssignment) {
                     Debug.assert((p as SpreadAssignment).expression.kind === SyntaxKind.Identifier);
-                    if (es2015.length) {
-                        emitRestAssignment(es2015, value, location, target);
-                        es2015 = [];
+                    if (bindingElements.length) {
+                        emitRestAssignment(bindingElements, value, location, target);
+                        bindingElements = [];
                     }
                     const propName = (p as SpreadAssignment).expression as Identifier;
                     const restCall = createRestCall(value, target.properties, p => p.name, target);
                     emitDestructuringAssignment(propName, restCall, p);
                 }
             }
-            if (es2015.length) {
-                emitRestAssignment(es2015, value, location, target);
-                es2015 = [];
+            if (bindingElements.length) {
+                emitRestAssignment(bindingElements, value, location, target);
+                bindingElements = [];
             }
         }
 
         function emitArrayLiteralAssignment(target: ArrayLiteralExpression, value: Expression, location: TextRange) {
+            if (transformRest) {
+                emitESNextArrayLiteralAssignment(target, value, location);
+            }
+            else {
+                emitES2015ArrayLiteralAssignment(target, value, location);
+            }
+        }
+
+        function emitESNextArrayLiteralAssignment(target: ArrayLiteralExpression, value: Expression, location: TextRange) {
             const elements = target.elements;
             const numElements = elements.length;
             if (numElements !== 1) {
                 // For anything but a single element destructuring we need to generate a temporary
                 // to ensure value is evaluated exactly once.
-                // When doing so we want to hightlight the passed in source map node since thats the one needing this temp assignment
+                // When doing so we want to highlight the passed-in source map node since thats the one needing this temp assignment
+                value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ true, location, emitTempVariableAssignment);
+            }
+
+            const expressions: Expression[] = [];
+            const spreadContainingExpressions: [Expression, Identifier][] = [];
+            for (let i = 0; i < numElements; i++) {
+                const e = elements[i];
+                if (e.kind === SyntaxKind.OmittedExpression) {
+                    continue;
+                }
+                if (e.transformFlags & TransformFlags.ContainsSpreadExpression && i < numElements - 1) {
+                    const tmp = createTempVariable(recordTempVariable);
+                    spreadContainingExpressions.push([e, tmp]);
+                    expressions.push(tmp);
+                }
+                else {
+                    expressions.push(e);
+                }
+            }
+            emitAssignment(updateArrayLiteral(target, expressions) as any as Identifier, value, undefined, undefined);
+            for (const [e, tmp] of spreadContainingExpressions) {
+                emitDestructuringAssignment(e, tmp, e);
+            }
+        }
+
+        function emitES2015ArrayLiteralAssignment(target: ArrayLiteralExpression, value: Expression, location: TextRange) {
+            const elements = target.elements;
+            const numElements = elements.length;
+            if (numElements !== 1) {
+                // For anything but a single element destructuring we need to generate a temporary
+                // to ensure value is evaluated exactly once.
+                // When doing so we want to highlight the passed-in source map node since thats the one needing this temp assignment
                 value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ true, location, emitTempVariableAssignment);
             }
 
@@ -413,7 +457,7 @@ namespace ts {
                     value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ numElements !== 0, target, emitTempVariableAssignment);
                 }
                 if (name.kind === SyntaxKind.ArrayBindingPattern) {
-                    emitArrayBindingElement(name, value);
+                    emitArrayBindingElement(name as ArrayBindingPattern, value);
                 }
                 else {
                     emitObjectBindingElement(target, value);
@@ -421,7 +465,16 @@ namespace ts {
             }
         }
 
-        function emitArrayBindingElement(name: BindingPattern, value: Expression) {
+        function emitArrayBindingElement(name: ArrayBindingPattern, value: Expression) {
+            if (transformRest) {
+                emitESNextArrayBindingElement(name, value);
+            }
+            else {
+                emitES2015ArrayBindingElement(name, value);
+            }
+        }
+
+        function emitES2015ArrayBindingElement(name: ArrayBindingPattern, value: Expression) {
             const elements = name.elements;
             const numElements = elements.length;
             for (let i = 0; i < numElements; i++) {
@@ -439,20 +492,44 @@ namespace ts {
             }
         }
 
+        function emitESNextArrayBindingElement(name: ArrayBindingPattern, value: Expression) {
+            const elements = name.elements;
+            const numElements = elements.length;
+            const bindingElements: BindingElement[] = [];
+            const spreadContainingElements: BindingElement[] = [];
+            for (let i = 0; i < numElements; i++) {
+                const element = elements[i];
+                if (isOmittedExpression(element)) {
+                    continue;
+                }
+                if (element.transformFlags & TransformFlags.ContainsSpreadExpression && i < numElements - 1) {
+                    spreadContainingElements.push(element);
+                    bindingElements.push(createBindingElement(undefined, undefined, getGeneratedNameForNode(element), undefined, value));
+                }
+                else {
+                    bindingElements.push(element);
+                }
+            }
+            emitAssignment(updateArrayBindingPattern(name, bindingElements) as any as Identifier, value, undefined, undefined);
+            for (const element of spreadContainingElements) {
+                emitBindingElement(element, getGeneratedNameForNode(element));
+            }
+        }
+
         function emitObjectBindingElement(target: VariableDeclaration | ParameterDeclaration | BindingElement, value: Expression) {
             const name = target.name as BindingPattern;
             const elements = name.elements;
             const numElements = elements.length;
-            let es2015: BindingElement[] = [];
+            let bindingElements: BindingElement[] = [];
             for (let i = 0; i < numElements; i++) {
                 const element = elements[i];
                 if (isOmittedExpression(element)) {
                     continue;
                 }
                 if (i === numElements - 1 && element.dotDotDotToken) {
-                    if (es2015.length) {
-                        emitRestAssignment(es2015, value, target, target);
-                        es2015 = [];
+                    if (bindingElements.length) {
+                        emitRestAssignment(bindingElements, value, target, target);
+                        bindingElements = [];
                     }
                     const restCall = createRestCall(value,
                                                     name.elements,
@@ -462,21 +539,21 @@ namespace ts {
                 }
                 else if (transformRest && !(element.transformFlags & TransformFlags.ContainsSpreadExpression)) {
                     // do not emit until we have a complete bundle of ES2015 syntax
-                    es2015.push(element);
+                    bindingElements.push(element);
                 }
                 else {
-                    if (es2015.length) {
-                        emitRestAssignment(es2015, value, target, target);
-                        es2015 = [];
+                    if (bindingElements.length) {
+                        emitRestAssignment(bindingElements, value, target, target);
+                        bindingElements = [];
                     }
                     // Rewrite element to a declaration with an initializer that fetches property
                     const propName = element.propertyName || <Identifier>element.name;
                     emitBindingElement(element, createDestructuringPropertyAccess(value, propName));
                 }
             }
-            if (es2015.length) {
-                emitRestAssignment(es2015, value, target, target);
-                es2015 = [];
+            if (bindingElements.length) {
+                emitRestAssignment(bindingElements, value, target, target);
+                bindingElements = [];
             }
         }
 

From 01969475cf576b4f476beeb5aca648e743eb5cd2 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 9 Nov 2016 10:51:56 -0800
Subject: [PATCH 154/421] Improve nested destructuring test for ESNext emit

Now with object destructuring inside array destructuring inside object
destructuring! Each with their own array/object rest!

Also updates baselines.
---
 .../reference/objectRestAssignment.js         | 26 ++++++++----
 .../reference/objectRestAssignment.symbols    | 31 ++++++++++++++
 .../reference/objectRestAssignment.types      | 41 +++++++++++++++++++
 .../types/rest/objectRestAssignment.ts        |  8 ++++
 4 files changed, 99 insertions(+), 7 deletions(-)

diff --git a/tests/baselines/reference/objectRestAssignment.js b/tests/baselines/reference/objectRestAssignment.js
index 20f87ff8375..41620d59b58 100644
--- a/tests/baselines/reference/objectRestAssignment.js
+++ b/tests/baselines/reference/objectRestAssignment.js
@@ -5,6 +5,13 @@ let other: number;
 let rest: { };
 let complex: { x: { ka, ki }, y: number };
 ({x: { ka, ...nested }, y: other, ...rest} = complex);
+
+// should be:
+let overEmit: { a: { ka: string, x: string }[], b: { z: string, ki: string, ku: string }, ke: string, ko: string };
+
+// var _g = overEmit.a, [_h, ...y] = _g, nested2 = __rest(_h, []), _j = overEmit.b, { z } = _j, c = __rest(_j, ["z"]), rest2 = __rest(overEmit, ["a", "b"]);
+var { a: [{ ...nested2 }, ...y], b: { z, ...c }, ...rest2 } = overEmit;
+({ a: [{ ...nested2 }, ...y], b: { z, ...c }, ...rest2 } = overEmit);
 
 
 //// [objectRestAssignment.js]
@@ -14,10 +21,15 @@ var __rest = (this && this.__rest) || function (s, e) {
         t[p] = s[p];
     return t;
 };
-var ka;
-var nested;
-var other;
-var rest;
-var complex;
-(_a = complex.x, (ka = _a.ka, _a), nested = __rest(_a, ["ka"]), (other = complex.y, complex), rest = __rest(complex, ["x", "y"]), complex);
-var _a;
+let ka;
+let nested;
+let other;
+let rest;
+let complex;
+(_a = complex.x, { ka } = _a, nested = __rest(_a, ["ka"]), { y: other } = complex, rest = __rest(complex, ["x", "y"]), complex);
+// should be:
+let overEmit;
+// var _g = overEmit.a, [_h, ...y] = _g, nested2 = __rest(_h, []), _j = overEmit.b, { z } = _j, c = __rest(_j, ["z"]), rest2 = __rest(overEmit, ["a", "b"]);
+var _b = overEmit.a, [_c, ...y] = _b, nested2 = __rest(_c, []), _d = overEmit.b, { z } = _d, c = __rest(_d, ["z"]), rest2 = __rest(overEmit, ["a", "b"]);
+(_e = overEmit.a, [_f, ...y] = _e, nested2 = __rest(_f, []), _g = overEmit.b, { z } = _g, c = __rest(_g, ["z"]), rest2 = __rest(overEmit, ["a", "b"]), overEmit);
+var _a, _e, _f, _g;
diff --git a/tests/baselines/reference/objectRestAssignment.symbols b/tests/baselines/reference/objectRestAssignment.symbols
index 38127dbee2d..4cb27e6e7ec 100644
--- a/tests/baselines/reference/objectRestAssignment.symbols
+++ b/tests/baselines/reference/objectRestAssignment.symbols
@@ -26,3 +26,34 @@ let complex: { x: { ka, ki }, y: number };
 >other : Symbol(other, Decl(objectRestAssignment.ts, 2, 3))
 >complex : Symbol(complex, Decl(objectRestAssignment.ts, 4, 3))
 
+// should be:
+let overEmit: { a: { ka: string, x: string }[], b: { z: string, ki: string, ku: string }, ke: string, ko: string };
+>overEmit : Symbol(overEmit, Decl(objectRestAssignment.ts, 8, 3))
+>a : Symbol(a, Decl(objectRestAssignment.ts, 8, 15))
+>ka : Symbol(ka, Decl(objectRestAssignment.ts, 8, 20))
+>x : Symbol(x, Decl(objectRestAssignment.ts, 8, 32))
+>b : Symbol(b, Decl(objectRestAssignment.ts, 8, 47))
+>z : Symbol(z, Decl(objectRestAssignment.ts, 8, 52))
+>ki : Symbol(ki, Decl(objectRestAssignment.ts, 8, 63))
+>ku : Symbol(ku, Decl(objectRestAssignment.ts, 8, 75))
+>ke : Symbol(ke, Decl(objectRestAssignment.ts, 8, 89))
+>ko : Symbol(ko, Decl(objectRestAssignment.ts, 8, 101))
+
+// var _g = overEmit.a, [_h, ...y] = _g, nested2 = __rest(_h, []), _j = overEmit.b, { z } = _j, c = __rest(_j, ["z"]), rest2 = __rest(overEmit, ["a", "b"]);
+var { a: [{ ...nested2 }, ...y], b: { z, ...c }, ...rest2 } = overEmit;
+>a : Symbol(a, Decl(objectRestAssignment.ts, 8, 15))
+>nested2 : Symbol(nested2, Decl(objectRestAssignment.ts, 11, 11))
+>y : Symbol(y, Decl(objectRestAssignment.ts, 11, 25))
+>b : Symbol(b, Decl(objectRestAssignment.ts, 8, 47))
+>z : Symbol(z, Decl(objectRestAssignment.ts, 11, 37))
+>c : Symbol(c, Decl(objectRestAssignment.ts, 11, 40))
+>rest2 : Symbol(rest2, Decl(objectRestAssignment.ts, 11, 48))
+>overEmit : Symbol(overEmit, Decl(objectRestAssignment.ts, 8, 3))
+
+({ a: [{ ...nested2 }, ...y], b: { z, ...c }, ...rest2 } = overEmit);
+>a : Symbol(a, Decl(objectRestAssignment.ts, 12, 2))
+>y : Symbol(y, Decl(objectRestAssignment.ts, 11, 25))
+>b : Symbol(b, Decl(objectRestAssignment.ts, 12, 29))
+>z : Symbol(z, Decl(objectRestAssignment.ts, 12, 34))
+>overEmit : Symbol(overEmit, Decl(objectRestAssignment.ts, 8, 3))
+
diff --git a/tests/baselines/reference/objectRestAssignment.types b/tests/baselines/reference/objectRestAssignment.types
index a4d88f89bb2..38aa00ce61d 100644
--- a/tests/baselines/reference/objectRestAssignment.types
+++ b/tests/baselines/reference/objectRestAssignment.types
@@ -32,3 +32,44 @@ let complex: { x: { ka, ki }, y: number };
 >rest : any
 >complex : { x: { ka: any; ki: any; }; y: number; }
 
+// should be:
+let overEmit: { a: { ka: string, x: string }[], b: { z: string, ki: string, ku: string }, ke: string, ko: string };
+>overEmit : { a: { ka: string; x: string; }[]; b: { z: string; ki: string; ku: string; }; ke: string; ko: string; }
+>a : { ka: string; x: string; }[]
+>ka : string
+>x : string
+>b : { z: string; ki: string; ku: string; }
+>z : string
+>ki : string
+>ku : string
+>ke : string
+>ko : string
+
+// var _g = overEmit.a, [_h, ...y] = _g, nested2 = __rest(_h, []), _j = overEmit.b, { z } = _j, c = __rest(_j, ["z"]), rest2 = __rest(overEmit, ["a", "b"]);
+var { a: [{ ...nested2 }, ...y], b: { z, ...c }, ...rest2 } = overEmit;
+>a : any
+>nested2 : { ka: string; x: string; }
+>y : { ka: string; x: string; }[]
+>b : any
+>z : string
+>c : { ki: string; ku: string; }
+>rest2 : { ke: string; ko: string; }
+>overEmit : { a: { ka: string; x: string; }[]; b: { z: string; ki: string; ku: string; }; ke: string; ko: string; }
+
+({ a: [{ ...nested2 }, ...y], b: { z, ...c }, ...rest2 } = overEmit);
+>({ a: [{ ...nested2 }, ...y], b: { z, ...c }, ...rest2 } = overEmit) : { a: { ka: string; x: string; }[]; b: { z: string; ki: string; ku: string; }; ke: string; ko: string; }
+>{ a: [{ ...nested2 }, ...y], b: { z, ...c }, ...rest2 } = overEmit : { a: { ka: string; x: string; }[]; b: { z: string; ki: string; ku: string; }; ke: string; ko: string; }
+>{ a: [{ ...nested2 }, ...y], b: { z, ...c }, ...rest2 } : { ke: string; ko: string; a: { ka: string; x: string; }[]; b: { ki: string; ku: string; z: string; }; }
+>a : { ka: string; x: string; }[]
+>[{ ...nested2 }, ...y] : { ka: string; x: string; }[]
+>{ ...nested2 } : { ka: string; x: string; }
+>nested2 : any
+>...y : { ka: string; x: string; }
+>y : { ka: string; x: string; }[]
+>b : { ki: string; ku: string; z: string; }
+>{ z, ...c } : { ki: string; ku: string; z: string; }
+>z : string
+>c : any
+>rest2 : any
+>overEmit : { a: { ka: string; x: string; }[]; b: { z: string; ki: string; ku: string; }; ke: string; ko: string; }
+
diff --git a/tests/cases/conformance/types/rest/objectRestAssignment.ts b/tests/cases/conformance/types/rest/objectRestAssignment.ts
index 4c8da304bc3..dedc99b1f71 100644
--- a/tests/cases/conformance/types/rest/objectRestAssignment.ts
+++ b/tests/cases/conformance/types/rest/objectRestAssignment.ts
@@ -1,6 +1,14 @@
+// @target: es2015
 let ka: any;
 let nested: { ki };
 let other: number;
 let rest: { };
 let complex: { x: { ka, ki }, y: number };
 ({x: { ka, ...nested }, y: other, ...rest} = complex);
+
+// should be:
+let overEmit: { a: { ka: string, x: string }[], b: { z: string, ki: string, ku: string }, ke: string, ko: string };
+
+// var _g = overEmit.a, [_h, ...y] = _g, nested2 = __rest(_h, []), _j = overEmit.b, { z } = _j, c = __rest(_j, ["z"]), rest2 = __rest(overEmit, ["a", "b"]);
+var { a: [{ ...nested2 }, ...y], b: { z, ...c }, ...rest2 } = overEmit;
+({ a: [{ ...nested2 }, ...y], b: { z, ...c }, ...rest2 } = overEmit);

From 4b8a55793a5378bcde27e08212da2a107f773286 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Wed, 9 Nov 2016 12:12:48 -0800
Subject: [PATCH 155/421] Add support for taking in jsxFactory option and
 report errors for invalid combinations

---
 src/compiler/commandLineParser.ts             |  5 ++
 src/compiler/diagnosticMessages.json          |  4 +
 src/compiler/program.ts                       |  7 +-
 src/compiler/types.ts                         |  1 +
 .../jsxFactoryAndReactNamespace.errors.txt    | 53 ++++++++++++
 .../reference/jsxFactoryAndReactNamespace.js  | 81 +++++++++++++++++++
 .../compiler/jsxFactoryAndReactNamespace.ts   | 54 +++++++++++++
 7 files changed, 204 insertions(+), 1 deletion(-)
 create mode 100644 tests/baselines/reference/jsxFactoryAndReactNamespace.errors.txt
 create mode 100644 tests/baselines/reference/jsxFactoryAndReactNamespace.js
 create mode 100644 tests/cases/compiler/jsxFactoryAndReactNamespace.ts

diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index 50399fd5c38..1dfecf33b89 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -77,6 +77,11 @@ namespace ts {
             type: "string",
             description: Diagnostics.Specify_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit
         },
+        {
+            name: "jsxFactory",
+            type: "string",
+            description: Diagnostics.Specify_the_JSX_factory_function_to_use_when_targeting_react_JSX_emit_e_g_React_createElement_or_h
+        },
         {
             name: "listFiles",
             type: "boolean",
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 9a353e6fb36..79e31788390 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -2897,6 +2897,10 @@
         "category": "Message",
         "code": 6145
     },
+    "Specify the JSX factory function to use when targeting 'react' JSX emit, e.g. 'React.createElement' or 'h'.": {
+        "category": "Message",
+        "code": 6146
+    },
     "Variable '{0}' implicitly has an '{1}' type.": {
         "category": "Error",
         "code": 7005
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 1b36d99d7c9..cb7efc49bf3 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -1670,7 +1670,12 @@ namespace ts {
                 programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "emitDecoratorMetadata", "experimentalDecorators"));
             }
 
-            if (options.reactNamespace && !isIdentifierText(options.reactNamespace, languageVersion)) {
+            if (options.jsxFactory) {
+                if (options.reactNamespace) {
+                    programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_with_option_1, "reactNamespace", "jsxFactory"));
+                }
+            }
+            else if (options.reactNamespace && !isIdentifierText(options.reactNamespace, languageVersion)) {
                 programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Invalid_value_for_reactNamespace_0_is_not_a_valid_identifier, options.reactNamespace));
             }
 
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index fb1dffad87d..5ca542cfe11 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -3081,6 +3081,7 @@ namespace ts {
         project?: string;
         /* @internal */ pretty?: DiagnosticStyle;
         reactNamespace?: string;
+        jsxFactory?: string;
         removeComments?: boolean;
         rootDir?: string;
         rootDirs?: string[];
diff --git a/tests/baselines/reference/jsxFactoryAndReactNamespace.errors.txt b/tests/baselines/reference/jsxFactoryAndReactNamespace.errors.txt
new file mode 100644
index 00000000000..c4859fd534c
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryAndReactNamespace.errors.txt
@@ -0,0 +1,53 @@
+error TS5053: Option 'reactNamespace' cannot be specified with option 'jsxFactory'.
+
+
+!!! error TS5053: Option 'reactNamespace' cannot be specified with option 'jsxFactory'.
+==== tests/cases/compiler/Element.ts (0 errors) ====
+    
+    declare namespace JSX {
+        interface Element {
+            name: string;
+            isIntrinsic: boolean;
+            isCustomElement: boolean;
+            toString(renderId?: number): string;
+            bindDOM(renderId?: number): number;
+            resetComponent(): void;
+            instantiateComponents(renderId?: number): number;
+            props: any;
+        }
+    }
+    export namespace Element {
+        export function isElement(el: any): el is JSX.Element {
+            return el.markAsChildOfRootElement !== undefined;
+        }
+    
+        export function createElement(args: any[]) {
+    
+            return {
+            }
+        }
+    }
+    
+    export let createElement = Element.createElement;
+    
+    function toCamelCase(text: string): string {
+        return text[0].toLowerCase() + text.substring(1);
+    }
+    
+==== tests/cases/compiler/test.tsx (0 errors) ====
+    import { Element} from './Element';
+    
+    let c: {
+    	a?: {
+    		b: string
+    	}
+    };
+    
+    class A {
+    	view() {
+    		return [
+    			<meta content="helloworld"></meta>,
+    			<meta content={c.a!.b}></meta>
+    		];
+    	}
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryAndReactNamespace.js b/tests/baselines/reference/jsxFactoryAndReactNamespace.js
new file mode 100644
index 00000000000..0a6402ca70c
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryAndReactNamespace.js
@@ -0,0 +1,81 @@
+//// [tests/cases/compiler/jsxFactoryAndReactNamespace.ts] ////
+
+//// [Element.ts]
+
+declare namespace JSX {
+    interface Element {
+        name: string;
+        isIntrinsic: boolean;
+        isCustomElement: boolean;
+        toString(renderId?: number): string;
+        bindDOM(renderId?: number): number;
+        resetComponent(): void;
+        instantiateComponents(renderId?: number): number;
+        props: any;
+    }
+}
+export namespace Element {
+    export function isElement(el: any): el is JSX.Element {
+        return el.markAsChildOfRootElement !== undefined;
+    }
+
+    export function createElement(args: any[]) {
+
+        return {
+        }
+    }
+}
+
+export let createElement = Element.createElement;
+
+function toCamelCase(text: string): string {
+    return text[0].toLowerCase() + text.substring(1);
+}
+
+//// [test.tsx]
+import { Element} from './Element';
+
+let c: {
+	a?: {
+		b: string
+	}
+};
+
+class A {
+	view() {
+		return [
+			<meta content="helloworld"></meta>,
+			<meta content={c.a!.b}></meta>
+		];
+	}
+}
+
+//// [Element.js]
+"use strict";
+var Element;
+(function (Element) {
+    function isElement(el) {
+        return el.markAsChildOfRootElement !== undefined;
+    }
+    Element.isElement = isElement;
+    function createElement(args) {
+        return {};
+    }
+    Element.createElement = createElement;
+})(Element = exports.Element || (exports.Element = {}));
+exports.createElement = Element.createElement;
+function toCamelCase(text) {
+    return text[0].toLowerCase() + text.substring(1);
+}
+//// [test.js]
+"use strict";
+const Element_1 = require("./Element");
+let c;
+class A {
+    view() {
+        return [
+            Element_1.Element.createElement("meta", { content: "helloworld" }),
+            Element_1.Element.createElement("meta", { content: c.a.b })
+        ];
+    }
+}
diff --git a/tests/cases/compiler/jsxFactoryAndReactNamespace.ts b/tests/cases/compiler/jsxFactoryAndReactNamespace.ts
new file mode 100644
index 00000000000..2bdc954da3a
--- /dev/null
+++ b/tests/cases/compiler/jsxFactoryAndReactNamespace.ts
@@ -0,0 +1,54 @@
+//@jsx: react
+//@target: es6
+//@module: commonjs
+//@reactNamespace: Element
+//@jsxFactory: Element.createElement
+
+// @filename: Element.ts
+declare namespace JSX {
+    interface Element {
+        name: string;
+        isIntrinsic: boolean;
+        isCustomElement: boolean;
+        toString(renderId?: number): string;
+        bindDOM(renderId?: number): number;
+        resetComponent(): void;
+        instantiateComponents(renderId?: number): number;
+        props: any;
+    }
+}
+export namespace Element {
+    export function isElement(el: any): el is JSX.Element {
+        return el.markAsChildOfRootElement !== undefined;
+    }
+
+    export function createElement(args: any[]) {
+
+        return {
+        }
+    }
+}
+
+export let createElement = Element.createElement;
+
+function toCamelCase(text: string): string {
+    return text[0].toLowerCase() + text.substring(1);
+}
+
+// @filename: test.tsx
+import { Element} from './Element';
+
+let c: {
+	a?: {
+		b: string
+	}
+};
+
+class A {
+	view() {
+		return [
+			<meta content="helloworld"></meta>,
+			<meta content={c.a!.b}></meta>
+		];
+	}
+}
\ No newline at end of file

From fcf32c444f8d4eb8382d9ff7b3fb3c278b8ec1b8 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 9 Nov 2016 13:39:42 -0800
Subject: [PATCH 156/421] Treat `| undefined` like optionality in spread type

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 8ac6b0f6471..8558871e6bf 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -4523,7 +4523,7 @@ namespace ts {
                 t;
         }
 
-        function createUnionOrIntersectionProperty(containingType: UnionOrIntersectionType, name: string) {
+        function createUnionOrIntersectionProperty(containingType: UnionOrIntersectionType, name: string): Symbol {
             const types = containingType.types;
             let props: Symbol[];
             // Flags we want to propagate to the result if they exist in all source symbols
@@ -5914,11 +5914,12 @@ namespace ts {
                 }
                 if (leftProp.name in members) {
                     const rightProp = members[leftProp.name];
-                    if (rightProp.flags & SymbolFlags.Optional) {
+                    const rightType = getTypeOfSymbol(rightProp);
+                    if (maybeTypeOfKind(rightType, TypeFlags.Undefined) || rightProp.flags & SymbolFlags.Optional) {
                         const declarations: Declaration[] = concatenate(leftProp.declarations, rightProp.declarations);
                         const flags = SymbolFlags.Property | SymbolFlags.Transient | (leftProp.flags & SymbolFlags.Optional);
                         const result = <TransientSymbol>createSymbol(flags, leftProp.name);
-                        result.type = getUnionType([getTypeOfSymbol(leftProp), getTypeOfSymbol(rightProp)]);
+                        result.type = getUnionType([getTypeOfSymbol(leftProp), getTypeWithFacts(rightType, TypeFacts.NEUndefined)]);
                         result.leftSpread = leftProp;
                         result.rightSpread = rightProp;
                         result.declarations = declarations;

From 9b1f43bdda5118046ce7b604ca978a83fc4e10f5 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 9 Nov 2016 13:40:21 -0800
Subject: [PATCH 157/421] Add strictNullChecks test for object spread

---
 .../reference/objectSpreadStrictNull.js       | 43 +++++++++
 .../reference/objectSpreadStrictNull.symbols  | 60 +++++++++++++
 .../reference/objectSpreadStrictNull.types    | 88 +++++++++++++++++++
 .../types/spread/objectSpreadStrictNull.ts    | 21 +++++
 4 files changed, 212 insertions(+)
 create mode 100644 tests/baselines/reference/objectSpreadStrictNull.js
 create mode 100644 tests/baselines/reference/objectSpreadStrictNull.symbols
 create mode 100644 tests/baselines/reference/objectSpreadStrictNull.types
 create mode 100644 tests/cases/conformance/types/spread/objectSpreadStrictNull.ts

diff --git a/tests/baselines/reference/objectSpreadStrictNull.js b/tests/baselines/reference/objectSpreadStrictNull.js
new file mode 100644
index 00000000000..84604d728cd
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadStrictNull.js
@@ -0,0 +1,43 @@
+//// [objectSpreadStrictNull.ts]
+
+function f(
+    definiteBoolean: { sn: boolean },
+    definiteString: { sn: string },
+    optionalString: { sn?: string },
+    optionalNumber: { sn?: number },
+    undefinedString: { sn: string | undefined },
+    undefinedNumber: { sn: number | undefined }) {
+    // optional
+    let optionalUnionStops: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...optionalNumber };
+    let optionalUnionDuplicates: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...optionalString, ...optionalNumber };
+    let allOptional: { sn?: string | number } = { ...optionalString, ...optionalNumber };
+
+    // undefined
+    let undefinedUnionStops: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...undefinedNumber };
+    let undefinedUnionDuplicates: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...undefinedString, ...undefinedNumber };
+    let allUndefined: { sn: string | number | undefined } = { ...undefinedString, ...undefinedNumber };
+
+    let undefinedWithOptionalContinues: { sn: string | number | boolean } = { ...definiteBoolean, ...undefinedString, ...optionalNumber };
+}
+
+
+//// [objectSpreadStrictNull.js]
+var __assign = (this && this.__assign) || Object.assign || function(t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+        s = arguments[i];
+        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+            t[p] = s[p];
+    }
+    return t;
+};
+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);
+    // 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);
+}
diff --git a/tests/baselines/reference/objectSpreadStrictNull.symbols b/tests/baselines/reference/objectSpreadStrictNull.symbols
new file mode 100644
index 00000000000..85def473ce4
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadStrictNull.symbols
@@ -0,0 +1,60 @@
+=== tests/cases/conformance/types/spread/objectSpreadStrictNull.ts ===
+
+function f(
+>f : Symbol(f, Decl(objectSpreadStrictNull.ts, 0, 0))
+
+    definiteBoolean: { sn: boolean },
+>definiteBoolean : Symbol(definiteBoolean, Decl(objectSpreadStrictNull.ts, 1, 11))
+>sn : Symbol(sn, Decl(objectSpreadStrictNull.ts, 2, 22))
+
+    definiteString: { sn: string },
+>definiteString : Symbol(definiteString, Decl(objectSpreadStrictNull.ts, 2, 37))
+>sn : Symbol(sn, Decl(objectSpreadStrictNull.ts, 3, 21))
+
+    optionalString: { sn?: string },
+>optionalString : Symbol(optionalString, Decl(objectSpreadStrictNull.ts, 3, 35))
+>sn : Symbol(sn, Decl(objectSpreadStrictNull.ts, 4, 21))
+
+    optionalNumber: { sn?: number },
+>optionalNumber : Symbol(optionalNumber, Decl(objectSpreadStrictNull.ts, 4, 36))
+>sn : Symbol(sn, Decl(objectSpreadStrictNull.ts, 5, 21))
+
+    undefinedString: { sn: string | undefined },
+>undefinedString : Symbol(undefinedString, Decl(objectSpreadStrictNull.ts, 5, 36))
+>sn : Symbol(sn, Decl(objectSpreadStrictNull.ts, 6, 22))
+
+    undefinedNumber: { sn: number | undefined }) {
+>undefinedNumber : Symbol(undefinedNumber, Decl(objectSpreadStrictNull.ts, 6, 48))
+>sn : Symbol(sn, Decl(objectSpreadStrictNull.ts, 7, 22))
+
+    // optional
+    let optionalUnionStops: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...optionalNumber };
+>optionalUnionStops : Symbol(optionalUnionStops, Decl(objectSpreadStrictNull.ts, 9, 7))
+>sn : Symbol(sn, Decl(objectSpreadStrictNull.ts, 9, 29))
+
+    let optionalUnionDuplicates: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...optionalString, ...optionalNumber };
+>optionalUnionDuplicates : Symbol(optionalUnionDuplicates, Decl(objectSpreadStrictNull.ts, 10, 7))
+>sn : Symbol(sn, Decl(objectSpreadStrictNull.ts, 10, 34))
+
+    let allOptional: { sn?: string | number } = { ...optionalString, ...optionalNumber };
+>allOptional : Symbol(allOptional, Decl(objectSpreadStrictNull.ts, 11, 7))
+>sn : Symbol(sn, Decl(objectSpreadStrictNull.ts, 11, 22))
+
+    // undefined
+    let undefinedUnionStops: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...undefinedNumber };
+>undefinedUnionStops : Symbol(undefinedUnionStops, Decl(objectSpreadStrictNull.ts, 14, 7))
+>sn : Symbol(sn, Decl(objectSpreadStrictNull.ts, 14, 30))
+
+    let undefinedUnionDuplicates: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...undefinedString, ...undefinedNumber };
+>undefinedUnionDuplicates : Symbol(undefinedUnionDuplicates, Decl(objectSpreadStrictNull.ts, 15, 7))
+>sn : Symbol(sn, Decl(objectSpreadStrictNull.ts, 15, 35))
+
+    let allUndefined: { sn: string | number | undefined } = { ...undefinedString, ...undefinedNumber };
+>allUndefined : Symbol(allUndefined, Decl(objectSpreadStrictNull.ts, 16, 7))
+>sn : Symbol(sn, Decl(objectSpreadStrictNull.ts, 16, 23))
+
+    let undefinedWithOptionalContinues: { sn: string | number | boolean } = { ...definiteBoolean, ...undefinedString, ...optionalNumber };
+>undefinedWithOptionalContinues : Symbol(undefinedWithOptionalContinues, Decl(objectSpreadStrictNull.ts, 18, 7))
+>sn : Symbol(sn, Decl(objectSpreadStrictNull.ts, 18, 41))
+}
+
diff --git a/tests/baselines/reference/objectSpreadStrictNull.types b/tests/baselines/reference/objectSpreadStrictNull.types
new file mode 100644
index 00000000000..a91295b2bca
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadStrictNull.types
@@ -0,0 +1,88 @@
+=== tests/cases/conformance/types/spread/objectSpreadStrictNull.ts ===
+
+function f(
+>f : (definiteBoolean: { sn: boolean; }, definiteString: { sn: string; }, optionalString: { sn?: string | undefined; }, optionalNumber: { sn?: number | undefined; }, undefinedString: { sn: string | undefined; }, undefinedNumber: { sn: number | undefined; }) => void
+
+    definiteBoolean: { sn: boolean },
+>definiteBoolean : { sn: boolean; }
+>sn : boolean
+
+    definiteString: { sn: string },
+>definiteString : { sn: string; }
+>sn : string
+
+    optionalString: { sn?: string },
+>optionalString : { sn?: string | undefined; }
+>sn : string | undefined
+
+    optionalNumber: { sn?: number },
+>optionalNumber : { sn?: number | undefined; }
+>sn : number | undefined
+
+    undefinedString: { sn: string | undefined },
+>undefinedString : { sn: string | undefined; }
+>sn : string | undefined
+
+    undefinedNumber: { sn: number | undefined }) {
+>undefinedNumber : { sn: number | undefined; }
+>sn : number | undefined
+
+    // optional
+    let optionalUnionStops: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...optionalNumber };
+>optionalUnionStops : { sn: string | number; }
+>sn : string | number
+>{ ...definiteBoolean, ...definiteString, ...optionalNumber } : { sn: string | number; }
+>definiteBoolean : any
+>definiteString : any
+>optionalNumber : any
+
+    let optionalUnionDuplicates: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...optionalString, ...optionalNumber };
+>optionalUnionDuplicates : { sn: string | number; }
+>sn : string | number
+>{ ...definiteBoolean, ...definiteString, ...optionalString, ...optionalNumber } : { sn: string | number; }
+>definiteBoolean : any
+>definiteString : any
+>optionalString : any
+>optionalNumber : any
+
+    let allOptional: { sn?: string | number } = { ...optionalString, ...optionalNumber };
+>allOptional : { sn?: string | number | undefined; }
+>sn : string | number | undefined
+>{ ...optionalString, ...optionalNumber } : { sn?: string | number | undefined; }
+>optionalString : any
+>optionalNumber : any
+
+    // undefined
+    let undefinedUnionStops: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...undefinedNumber };
+>undefinedUnionStops : { sn: string | number; }
+>sn : string | number
+>{ ...definiteBoolean, ...definiteString, ...undefinedNumber } : { sn: string | number; }
+>definiteBoolean : any
+>definiteString : any
+>undefinedNumber : any
+
+    let undefinedUnionDuplicates: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...undefinedString, ...undefinedNumber };
+>undefinedUnionDuplicates : { sn: string | number; }
+>sn : string | number
+>{ ...definiteBoolean, ...definiteString, ...undefinedString, ...undefinedNumber } : { sn: string | number; }
+>definiteBoolean : any
+>definiteString : any
+>undefinedString : any
+>undefinedNumber : any
+
+    let allUndefined: { sn: string | number | undefined } = { ...undefinedString, ...undefinedNumber };
+>allUndefined : { sn: string | number | undefined; }
+>sn : string | number | undefined
+>{ ...undefinedString, ...undefinedNumber } : { sn: string | number | undefined; }
+>undefinedString : any
+>undefinedNumber : any
+
+    let undefinedWithOptionalContinues: { sn: string | number | boolean } = { ...definiteBoolean, ...undefinedString, ...optionalNumber };
+>undefinedWithOptionalContinues : { sn: string | number | boolean; }
+>sn : string | number | boolean
+>{ ...definiteBoolean, ...undefinedString, ...optionalNumber } : { sn: string | number | boolean; }
+>definiteBoolean : any
+>undefinedString : any
+>optionalNumber : any
+}
+
diff --git a/tests/cases/conformance/types/spread/objectSpreadStrictNull.ts b/tests/cases/conformance/types/spread/objectSpreadStrictNull.ts
new file mode 100644
index 00000000000..087d47df26c
--- /dev/null
+++ b/tests/cases/conformance/types/spread/objectSpreadStrictNull.ts
@@ -0,0 +1,21 @@
+// @strictNullChecks: true
+
+function f(
+    definiteBoolean: { sn: boolean },
+    definiteString: { sn: string },
+    optionalString: { sn?: string },
+    optionalNumber: { sn?: number },
+    undefinedString: { sn: string | undefined },
+    undefinedNumber: { sn: number | undefined }) {
+    // optional
+    let optionalUnionStops: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...optionalNumber };
+    let optionalUnionDuplicates: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...optionalString, ...optionalNumber };
+    let allOptional: { sn?: string | number } = { ...optionalString, ...optionalNumber };
+
+    // undefined
+    let undefinedUnionStops: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...undefinedNumber };
+    let undefinedUnionDuplicates: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...undefinedString, ...undefinedNumber };
+    let allUndefined: { sn: string | number | undefined } = { ...undefinedString, ...undefinedNumber };
+
+    let undefinedWithOptionalContinues: { sn: string | number | boolean } = { ...definiteBoolean, ...undefinedString, ...optionalNumber };
+}

From f7bac9894835fb55a75894c1ee82fe02e1e3a04c Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Wed, 9 Nov 2016 13:15:13 -0800
Subject: [PATCH 158/421] Verify that jsxFactory is either identifier or
 qualified name

---
 src/compiler/diagnosticMessages.json          |  4 +
 src/compiler/parser.ts                        | 14 ++++
 src/compiler/program.ts                       |  3 +
 src/harness/harness.ts                        | 10 +--
 .../reference/jsxFactoryIdentifier.errors.txt | 57 +++++++++++++
 .../reference/jsxFactoryIdentifier.js         | 82 +++++++++++++++++++
 ...oryNotIdentifierOrQualifiedName.errors.txt | 59 +++++++++++++
 .../jsxFactoryNotIdentifierOrQualifiedName.js | 80 ++++++++++++++++++
 ...ryNotIdentifierOrQualifiedName2.errors.txt | 59 +++++++++++++
 ...jsxFactoryNotIdentifierOrQualifiedName2.js | 80 ++++++++++++++++++
 .../jsxFactoryQualifiedName.errors.txt        | 57 +++++++++++++
 .../reference/jsxFactoryQualifiedName.js      | 80 ++++++++++++++++++
 tests/cases/compiler/jsxFactoryIdentifier.ts  | 53 ++++++++++++
 .../jsxFactoryNotIdentifierOrQualifiedName.ts | 53 ++++++++++++
 ...jsxFactoryNotIdentifierOrQualifiedName2.ts | 53 ++++++++++++
 .../cases/compiler/jsxFactoryQualifiedName.ts | 53 ++++++++++++
 16 files changed, 792 insertions(+), 5 deletions(-)
 create mode 100644 tests/baselines/reference/jsxFactoryIdentifier.errors.txt
 create mode 100644 tests/baselines/reference/jsxFactoryIdentifier.js
 create mode 100644 tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.errors.txt
 create mode 100644 tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js
 create mode 100644 tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.errors.txt
 create mode 100644 tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js
 create mode 100644 tests/baselines/reference/jsxFactoryQualifiedName.errors.txt
 create mode 100644 tests/baselines/reference/jsxFactoryQualifiedName.js
 create mode 100644 tests/cases/compiler/jsxFactoryIdentifier.ts
 create mode 100644 tests/cases/compiler/jsxFactoryNotIdentifierOrQualifiedName.ts
 create mode 100644 tests/cases/compiler/jsxFactoryNotIdentifierOrQualifiedName2.ts
 create mode 100644 tests/cases/compiler/jsxFactoryQualifiedName.ts

diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 79e31788390..c7691b06da7 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -2381,6 +2381,10 @@
         "category": "Error",
         "code": 5066
     },
+    "Invalid value for 'jsxFactory'. '{0}' is not a valid identifier or qualified-name.": {
+        "category": "Error",
+        "code": 5067
+    },
     "Concatenate and emit output to single file.": {
         "category": "Message",
         "code": 6001
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 92a3dcbef11..0d15a548192 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -438,6 +438,10 @@ namespace ts {
         return result;
     }
 
+    export function parseIsolatedEntityName(text: string, languageVersion: ScriptTarget): EntityName {
+        return Parser.parseIsolatedEntityName(text, languageVersion);
+    }
+
     export function isExternalModule(file: SourceFile): boolean {
         return file.externalModuleIndicator !== undefined;
     }
@@ -589,6 +593,16 @@ namespace ts {
             return result;
         }
 
+        export function parseIsolatedEntityName(content: string, languageVersion: ScriptTarget): EntityName {
+            initializeState(content, languageVersion, /*syntaxCursor*/ undefined, ScriptKind.JS);
+            // Prime the scanner.
+            nextToken();
+            const entityName = parseEntityName(/*allowReservedWords*/ true);
+            const isInvalid = token() === SyntaxKind.EndOfFileToken && !parseDiagnostics.length;
+            clearState();
+            return isInvalid ? entityName : undefined;
+        }
+
         function getLanguageVariant(scriptKind: ScriptKind) {
             // .tsx and .jsx files are treated as jsx language variant.
             return scriptKind === ScriptKind.TSX || scriptKind === ScriptKind.JSX || scriptKind === ScriptKind.JS ? LanguageVariant.JSX : LanguageVariant.Standard;
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index cb7efc49bf3..213e6a95ab1 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -1674,6 +1674,9 @@ namespace ts {
                 if (options.reactNamespace) {
                     programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_with_option_1, "reactNamespace", "jsxFactory"));
                 }
+                if (!parseIsolatedEntityName(options.jsxFactory, languageVersion)) {
+                    programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Invalid_value_for_jsxFactory_0_is_not_a_valid_identifier_or_qualified_name, options.jsxFactory));
+                }
             }
             else if (options.reactNamespace && !isIdentifierText(options.reactNamespace, languageVersion)) {
                 programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Invalid_value_for_reactNamespace_0_is_not_a_valid_identifier, options.reactNamespace));
diff --git a/src/harness/harness.ts b/src/harness/harness.ts
index a6e1ffad7f7..b227a0d8fe6 100644
--- a/src/harness/harness.ts
+++ b/src/harness/harness.ts
@@ -1768,7 +1768,7 @@ namespace Harness {
         }
 
         // Regex for parsing options in the format "@Alpha: Value of any sort"
-        const optionRegex = /^[\/]{2}\s*@(\w+)\s*:\s*(\S*)/gm;  // multiple matches on multiple lines
+        const optionRegex = /^[\/]{2}\s*@(\w+)\s*:\s*([^\r\n]*)/gm;  // multiple matches on multiple lines
 
         function extractCompilerSettings(content: string): CompilerSettings {
             const opts: CompilerSettings = {};
@@ -1777,7 +1777,7 @@ namespace Harness {
             /* tslint:disable:no-null-keyword */
             while ((match = optionRegex.exec(content)) !== null) {
             /* tslint:enable:no-null-keyword */
-                opts[match[1]] = match[2];
+                opts[match[1]] = match[2].trim();
             }
 
             return opts;
@@ -1805,7 +1805,7 @@ namespace Harness {
                     // Comment line, check for global/file @options and record them
                     optionRegex.lastIndex = 0;
                     const metaDataName = testMetaData[1].toLowerCase();
-                    currentFileOptions[testMetaData[1]] = testMetaData[2];
+                    currentFileOptions[testMetaData[1]] = testMetaData[2].trim();
                     if (metaDataName !== "filename") {
                         continue;
                     }
@@ -1825,12 +1825,12 @@ namespace Harness {
                         // Reset local data
                         currentFileContent = undefined;
                         currentFileOptions = {};
-                        currentFileName = testMetaData[2];
+                        currentFileName = testMetaData[2].trim();
                         refs = [];
                     }
                     else {
                         // First metadata marker in the file
-                        currentFileName = testMetaData[2];
+                        currentFileName = testMetaData[2].trim();
                     }
                 }
                 else {
diff --git a/tests/baselines/reference/jsxFactoryIdentifier.errors.txt b/tests/baselines/reference/jsxFactoryIdentifier.errors.txt
new file mode 100644
index 00000000000..e0cb485cf7f
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryIdentifier.errors.txt
@@ -0,0 +1,57 @@
+tests/cases/compiler/test.tsx(12,5): error TS2304: Cannot find name 'React'.
+tests/cases/compiler/test.tsx(13,5): error TS2304: Cannot find name 'React'.
+
+
+==== tests/cases/compiler/Element.ts (0 errors) ====
+    
+    declare namespace JSX {
+        interface Element {
+            name: string;
+            isIntrinsic: boolean;
+            isCustomElement: boolean;
+            toString(renderId?: number): string;
+            bindDOM(renderId?: number): number;
+            resetComponent(): void;
+            instantiateComponents(renderId?: number): number;
+            props: any;
+        }
+    }
+    export namespace Element {
+        export function isElement(el: any): el is JSX.Element {
+            return el.markAsChildOfRootElement !== undefined;
+        }
+    
+        export function createElement(args: any[]) {
+    
+            return {
+            }
+        }
+    }
+    
+    export let createElement = Element.createElement;
+    
+    function toCamelCase(text: string): string {
+        return text[0].toLowerCase() + text.substring(1);
+    }
+    
+==== tests/cases/compiler/test.tsx (2 errors) ====
+    import { Element} from './Element';
+    let createElement = Element.createElement;
+    let c: {
+    	a?: {
+    		b: string
+    	}
+    };
+    
+    class A {
+    	view() {
+    		return [
+    			<meta content="helloworld"></meta>,
+    			 ~~~~
+!!! error TS2304: Cannot find name 'React'.
+    			<meta content={c.a!.b}></meta>
+    			 ~~~~
+!!! error TS2304: Cannot find name 'React'.
+    		];
+    	}
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifier.js b/tests/baselines/reference/jsxFactoryIdentifier.js
new file mode 100644
index 00000000000..13abba53751
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryIdentifier.js
@@ -0,0 +1,82 @@
+//// [tests/cases/compiler/jsxFactoryIdentifier.ts] ////
+
+//// [Element.ts]
+
+declare namespace JSX {
+    interface Element {
+        name: string;
+        isIntrinsic: boolean;
+        isCustomElement: boolean;
+        toString(renderId?: number): string;
+        bindDOM(renderId?: number): number;
+        resetComponent(): void;
+        instantiateComponents(renderId?: number): number;
+        props: any;
+    }
+}
+export namespace Element {
+    export function isElement(el: any): el is JSX.Element {
+        return el.markAsChildOfRootElement !== undefined;
+    }
+
+    export function createElement(args: any[]) {
+
+        return {
+        }
+    }
+}
+
+export let createElement = Element.createElement;
+
+function toCamelCase(text: string): string {
+    return text[0].toLowerCase() + text.substring(1);
+}
+
+//// [test.tsx]
+import { Element} from './Element';
+let createElement = Element.createElement;
+let c: {
+	a?: {
+		b: string
+	}
+};
+
+class A {
+	view() {
+		return [
+			<meta content="helloworld"></meta>,
+			<meta content={c.a!.b}></meta>
+		];
+	}
+}
+
+//// [Element.js]
+"use strict";
+var Element;
+(function (Element) {
+    function isElement(el) {
+        return el.markAsChildOfRootElement !== undefined;
+    }
+    Element.isElement = isElement;
+    function createElement(args) {
+        return {};
+    }
+    Element.createElement = createElement;
+})(Element = exports.Element || (exports.Element = {}));
+exports.createElement = Element.createElement;
+function toCamelCase(text) {
+    return text[0].toLowerCase() + text.substring(1);
+}
+//// [test.js]
+"use strict";
+const Element_1 = require("./Element");
+let createElement = Element_1.Element.createElement;
+let c;
+class A {
+    view() {
+        return [
+            React.createElement("meta", { content: "helloworld" }),
+            React.createElement("meta", { content: c.a.b })
+        ];
+    }
+}
diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.errors.txt b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.errors.txt
new file mode 100644
index 00000000000..e14f5f988f8
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.errors.txt
@@ -0,0 +1,59 @@
+error TS5067: Invalid value for 'jsxFactory'. 'Element.createElement=' is not a valid identifier or qualified-name.
+tests/cases/compiler/test.tsx(12,5): error TS2304: Cannot find name 'React'.
+tests/cases/compiler/test.tsx(13,5): error TS2304: Cannot find name 'React'.
+
+
+!!! error TS5067: Invalid value for 'jsxFactory'. 'Element.createElement=' is not a valid identifier or qualified-name.
+==== tests/cases/compiler/Element.ts (0 errors) ====
+    
+    declare namespace JSX {
+        interface Element {
+            name: string;
+            isIntrinsic: boolean;
+            isCustomElement: boolean;
+            toString(renderId?: number): string;
+            bindDOM(renderId?: number): number;
+            resetComponent(): void;
+            instantiateComponents(renderId?: number): number;
+            props: any;
+        }
+    }
+    export namespace Element {
+        export function isElement(el: any): el is JSX.Element {
+            return el.markAsChildOfRootElement !== undefined;
+        }
+    
+        export function createElement(args: any[]) {
+    
+            return {
+            }
+        }
+    }
+    
+    export let createElement = Element.createElement;
+    
+    function toCamelCase(text: string): string {
+        return text[0].toLowerCase() + text.substring(1);
+    }
+    
+==== tests/cases/compiler/test.tsx (2 errors) ====
+    import { Element} from './Element';
+    
+    let c: {
+    	a?: {
+    		b: string
+    	}
+    };
+    
+    class A {
+    	view() {
+    		return [
+    			<meta content="helloworld"></meta>,
+    			 ~~~~
+!!! error TS2304: Cannot find name 'React'.
+    			<meta content={c.a!.b}></meta>
+    			 ~~~~
+!!! error TS2304: Cannot find name 'React'.
+    		];
+    	}
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js
new file mode 100644
index 00000000000..90bb675442a
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js
@@ -0,0 +1,80 @@
+//// [tests/cases/compiler/jsxFactoryNotIdentifierOrQualifiedName.ts] ////
+
+//// [Element.ts]
+
+declare namespace JSX {
+    interface Element {
+        name: string;
+        isIntrinsic: boolean;
+        isCustomElement: boolean;
+        toString(renderId?: number): string;
+        bindDOM(renderId?: number): number;
+        resetComponent(): void;
+        instantiateComponents(renderId?: number): number;
+        props: any;
+    }
+}
+export namespace Element {
+    export function isElement(el: any): el is JSX.Element {
+        return el.markAsChildOfRootElement !== undefined;
+    }
+
+    export function createElement(args: any[]) {
+
+        return {
+        }
+    }
+}
+
+export let createElement = Element.createElement;
+
+function toCamelCase(text: string): string {
+    return text[0].toLowerCase() + text.substring(1);
+}
+
+//// [test.tsx]
+import { Element} from './Element';
+
+let c: {
+	a?: {
+		b: string
+	}
+};
+
+class A {
+	view() {
+		return [
+			<meta content="helloworld"></meta>,
+			<meta content={c.a!.b}></meta>
+		];
+	}
+}
+
+//// [Element.js]
+"use strict";
+var Element;
+(function (Element) {
+    function isElement(el) {
+        return el.markAsChildOfRootElement !== undefined;
+    }
+    Element.isElement = isElement;
+    function createElement(args) {
+        return {};
+    }
+    Element.createElement = createElement;
+})(Element = exports.Element || (exports.Element = {}));
+exports.createElement = Element.createElement;
+function toCamelCase(text) {
+    return text[0].toLowerCase() + text.substring(1);
+}
+//// [test.js]
+"use strict";
+let c;
+class A {
+    view() {
+        return [
+            React.createElement("meta", { content: "helloworld" }),
+            React.createElement("meta", { content: c.a.b })
+        ];
+    }
+}
diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.errors.txt b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.errors.txt
new file mode 100644
index 00000000000..1c33f3a7a51
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.errors.txt
@@ -0,0 +1,59 @@
+error TS5067: Invalid value for 'jsxFactory'. 'id1 id2' is not a valid identifier or qualified-name.
+tests/cases/compiler/test.tsx(12,5): error TS2304: Cannot find name 'React'.
+tests/cases/compiler/test.tsx(13,5): error TS2304: Cannot find name 'React'.
+
+
+!!! error TS5067: Invalid value for 'jsxFactory'. 'id1 id2' is not a valid identifier or qualified-name.
+==== tests/cases/compiler/Element.ts (0 errors) ====
+    
+    declare namespace JSX {
+        interface Element {
+            name: string;
+            isIntrinsic: boolean;
+            isCustomElement: boolean;
+            toString(renderId?: number): string;
+            bindDOM(renderId?: number): number;
+            resetComponent(): void;
+            instantiateComponents(renderId?: number): number;
+            props: any;
+        }
+    }
+    export namespace Element {
+        export function isElement(el: any): el is JSX.Element {
+            return el.markAsChildOfRootElement !== undefined;
+        }
+    
+        export function createElement(args: any[]) {
+    
+            return {
+            }
+        }
+    }
+    
+    export let createElement = Element.createElement;
+    
+    function toCamelCase(text: string): string {
+        return text[0].toLowerCase() + text.substring(1);
+    }
+    
+==== tests/cases/compiler/test.tsx (2 errors) ====
+    import { Element} from './Element';
+    
+    let c: {
+    	a?: {
+    		b: string
+    	}
+    };
+    
+    class A {
+    	view() {
+    		return [
+    			<meta content="helloworld"></meta>,
+    			 ~~~~
+!!! error TS2304: Cannot find name 'React'.
+    			<meta content={c.a!.b}></meta>
+    			 ~~~~
+!!! error TS2304: Cannot find name 'React'.
+    		];
+    	}
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js
new file mode 100644
index 00000000000..0bc0c6e57c5
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js
@@ -0,0 +1,80 @@
+//// [tests/cases/compiler/jsxFactoryNotIdentifierOrQualifiedName2.ts] ////
+
+//// [Element.ts]
+
+declare namespace JSX {
+    interface Element {
+        name: string;
+        isIntrinsic: boolean;
+        isCustomElement: boolean;
+        toString(renderId?: number): string;
+        bindDOM(renderId?: number): number;
+        resetComponent(): void;
+        instantiateComponents(renderId?: number): number;
+        props: any;
+    }
+}
+export namespace Element {
+    export function isElement(el: any): el is JSX.Element {
+        return el.markAsChildOfRootElement !== undefined;
+    }
+
+    export function createElement(args: any[]) {
+
+        return {
+        }
+    }
+}
+
+export let createElement = Element.createElement;
+
+function toCamelCase(text: string): string {
+    return text[0].toLowerCase() + text.substring(1);
+}
+
+//// [test.tsx]
+import { Element} from './Element';
+
+let c: {
+	a?: {
+		b: string
+	}
+};
+
+class A {
+	view() {
+		return [
+			<meta content="helloworld"></meta>,
+			<meta content={c.a!.b}></meta>
+		];
+	}
+}
+
+//// [Element.js]
+"use strict";
+var Element;
+(function (Element) {
+    function isElement(el) {
+        return el.markAsChildOfRootElement !== undefined;
+    }
+    Element.isElement = isElement;
+    function createElement(args) {
+        return {};
+    }
+    Element.createElement = createElement;
+})(Element = exports.Element || (exports.Element = {}));
+exports.createElement = Element.createElement;
+function toCamelCase(text) {
+    return text[0].toLowerCase() + text.substring(1);
+}
+//// [test.js]
+"use strict";
+let c;
+class A {
+    view() {
+        return [
+            React.createElement("meta", { content: "helloworld" }),
+            React.createElement("meta", { content: c.a.b })
+        ];
+    }
+}
diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.errors.txt b/tests/baselines/reference/jsxFactoryQualifiedName.errors.txt
new file mode 100644
index 00000000000..32c8500ea3b
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryQualifiedName.errors.txt
@@ -0,0 +1,57 @@
+tests/cases/compiler/test.tsx(12,5): error TS2304: Cannot find name 'React'.
+tests/cases/compiler/test.tsx(13,5): error TS2304: Cannot find name 'React'.
+
+
+==== tests/cases/compiler/Element.ts (0 errors) ====
+    
+    declare namespace JSX {
+        interface Element {
+            name: string;
+            isIntrinsic: boolean;
+            isCustomElement: boolean;
+            toString(renderId?: number): string;
+            bindDOM(renderId?: number): number;
+            resetComponent(): void;
+            instantiateComponents(renderId?: number): number;
+            props: any;
+        }
+    }
+    export namespace Element {
+        export function isElement(el: any): el is JSX.Element {
+            return el.markAsChildOfRootElement !== undefined;
+        }
+    
+        export function createElement(args: any[]) {
+    
+            return {
+            }
+        }
+    }
+    
+    export let createElement = Element.createElement;
+    
+    function toCamelCase(text: string): string {
+        return text[0].toLowerCase() + text.substring(1);
+    }
+    
+==== tests/cases/compiler/test.tsx (2 errors) ====
+    import { Element} from './Element';
+    
+    let c: {
+    	a?: {
+    		b: string
+    	}
+    };
+    
+    class A {
+    	view() {
+    		return [
+    			<meta content="helloworld"></meta>,
+    			 ~~~~
+!!! error TS2304: Cannot find name 'React'.
+    			<meta content={c.a!.b}></meta>
+    			 ~~~~
+!!! error TS2304: Cannot find name 'React'.
+    		];
+    	}
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.js b/tests/baselines/reference/jsxFactoryQualifiedName.js
new file mode 100644
index 00000000000..aec6614bf01
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryQualifiedName.js
@@ -0,0 +1,80 @@
+//// [tests/cases/compiler/jsxFactoryQualifiedName.ts] ////
+
+//// [Element.ts]
+
+declare namespace JSX {
+    interface Element {
+        name: string;
+        isIntrinsic: boolean;
+        isCustomElement: boolean;
+        toString(renderId?: number): string;
+        bindDOM(renderId?: number): number;
+        resetComponent(): void;
+        instantiateComponents(renderId?: number): number;
+        props: any;
+    }
+}
+export namespace Element {
+    export function isElement(el: any): el is JSX.Element {
+        return el.markAsChildOfRootElement !== undefined;
+    }
+
+    export function createElement(args: any[]) {
+
+        return {
+        }
+    }
+}
+
+export let createElement = Element.createElement;
+
+function toCamelCase(text: string): string {
+    return text[0].toLowerCase() + text.substring(1);
+}
+
+//// [test.tsx]
+import { Element} from './Element';
+
+let c: {
+	a?: {
+		b: string
+	}
+};
+
+class A {
+	view() {
+		return [
+			<meta content="helloworld"></meta>,
+			<meta content={c.a!.b}></meta>
+		];
+	}
+}
+
+//// [Element.js]
+"use strict";
+var Element;
+(function (Element) {
+    function isElement(el) {
+        return el.markAsChildOfRootElement !== undefined;
+    }
+    Element.isElement = isElement;
+    function createElement(args) {
+        return {};
+    }
+    Element.createElement = createElement;
+})(Element = exports.Element || (exports.Element = {}));
+exports.createElement = Element.createElement;
+function toCamelCase(text) {
+    return text[0].toLowerCase() + text.substring(1);
+}
+//// [test.js]
+"use strict";
+let c;
+class A {
+    view() {
+        return [
+            React.createElement("meta", { content: "helloworld" }),
+            React.createElement("meta", { content: c.a.b })
+        ];
+    }
+}
diff --git a/tests/cases/compiler/jsxFactoryIdentifier.ts b/tests/cases/compiler/jsxFactoryIdentifier.ts
new file mode 100644
index 00000000000..9531abeeebf
--- /dev/null
+++ b/tests/cases/compiler/jsxFactoryIdentifier.ts
@@ -0,0 +1,53 @@
+//@jsx: react
+//@target: es6
+//@module: commonjs
+//@jsxFactory: createElement
+
+// @filename: Element.ts
+declare namespace JSX {
+    interface Element {
+        name: string;
+        isIntrinsic: boolean;
+        isCustomElement: boolean;
+        toString(renderId?: number): string;
+        bindDOM(renderId?: number): number;
+        resetComponent(): void;
+        instantiateComponents(renderId?: number): number;
+        props: any;
+    }
+}
+export namespace Element {
+    export function isElement(el: any): el is JSX.Element {
+        return el.markAsChildOfRootElement !== undefined;
+    }
+
+    export function createElement(args: any[]) {
+
+        return {
+        }
+    }
+}
+
+export let createElement = Element.createElement;
+
+function toCamelCase(text: string): string {
+    return text[0].toLowerCase() + text.substring(1);
+}
+
+// @filename: test.tsx
+import { Element} from './Element';
+let createElement = Element.createElement;
+let c: {
+	a?: {
+		b: string
+	}
+};
+
+class A {
+	view() {
+		return [
+			<meta content="helloworld"></meta>,
+			<meta content={c.a!.b}></meta>
+		];
+	}
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/jsxFactoryNotIdentifierOrQualifiedName.ts b/tests/cases/compiler/jsxFactoryNotIdentifierOrQualifiedName.ts
new file mode 100644
index 00000000000..6f7c584d232
--- /dev/null
+++ b/tests/cases/compiler/jsxFactoryNotIdentifierOrQualifiedName.ts
@@ -0,0 +1,53 @@
+//@jsx: react
+//@target: es6
+//@module: commonjs
+//@jsxFactory: Element.createElement=
+
+// @filename: Element.ts
+declare namespace JSX {
+    interface Element {
+        name: string;
+        isIntrinsic: boolean;
+        isCustomElement: boolean;
+        toString(renderId?: number): string;
+        bindDOM(renderId?: number): number;
+        resetComponent(): void;
+        instantiateComponents(renderId?: number): number;
+        props: any;
+    }
+}
+export namespace Element {
+    export function isElement(el: any): el is JSX.Element {
+        return el.markAsChildOfRootElement !== undefined;
+    }
+
+    export function createElement(args: any[]) {
+
+        return {
+        }
+    }
+}
+
+export let createElement = Element.createElement;
+
+function toCamelCase(text: string): string {
+    return text[0].toLowerCase() + text.substring(1);
+}
+
+// @filename: test.tsx
+import { Element} from './Element';
+
+let c: {
+	a?: {
+		b: string
+	}
+};
+
+class A {
+	view() {
+		return [
+			<meta content="helloworld"></meta>,
+			<meta content={c.a!.b}></meta>
+		];
+	}
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/jsxFactoryNotIdentifierOrQualifiedName2.ts b/tests/cases/compiler/jsxFactoryNotIdentifierOrQualifiedName2.ts
new file mode 100644
index 00000000000..610063f7d34
--- /dev/null
+++ b/tests/cases/compiler/jsxFactoryNotIdentifierOrQualifiedName2.ts
@@ -0,0 +1,53 @@
+//@jsx: react
+//@target: es6
+//@module: commonjs
+//@jsxFactory: id1 id2
+
+// @filename: Element.ts
+declare namespace JSX {
+    interface Element {
+        name: string;
+        isIntrinsic: boolean;
+        isCustomElement: boolean;
+        toString(renderId?: number): string;
+        bindDOM(renderId?: number): number;
+        resetComponent(): void;
+        instantiateComponents(renderId?: number): number;
+        props: any;
+    }
+}
+export namespace Element {
+    export function isElement(el: any): el is JSX.Element {
+        return el.markAsChildOfRootElement !== undefined;
+    }
+
+    export function createElement(args: any[]) {
+
+        return {
+        }
+    }
+}
+
+export let createElement = Element.createElement;
+
+function toCamelCase(text: string): string {
+    return text[0].toLowerCase() + text.substring(1);
+}
+
+// @filename: test.tsx
+import { Element} from './Element';
+
+let c: {
+	a?: {
+		b: string
+	}
+};
+
+class A {
+	view() {
+		return [
+			<meta content="helloworld"></meta>,
+			<meta content={c.a!.b}></meta>
+		];
+	}
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/jsxFactoryQualifiedName.ts b/tests/cases/compiler/jsxFactoryQualifiedName.ts
new file mode 100644
index 00000000000..c8d9317138b
--- /dev/null
+++ b/tests/cases/compiler/jsxFactoryQualifiedName.ts
@@ -0,0 +1,53 @@
+//@jsx: react
+//@target: es6
+//@module: commonjs
+//@jsxFactory: Element.createElement
+
+// @filename: Element.ts
+declare namespace JSX {
+    interface Element {
+        name: string;
+        isIntrinsic: boolean;
+        isCustomElement: boolean;
+        toString(renderId?: number): string;
+        bindDOM(renderId?: number): number;
+        resetComponent(): void;
+        instantiateComponents(renderId?: number): number;
+        props: any;
+    }
+}
+export namespace Element {
+    export function isElement(el: any): el is JSX.Element {
+        return el.markAsChildOfRootElement !== undefined;
+    }
+
+    export function createElement(args: any[]) {
+
+        return {
+        }
+    }
+}
+
+export let createElement = Element.createElement;
+
+function toCamelCase(text: string): string {
+    return text[0].toLowerCase() + text.substring(1);
+}
+
+// @filename: test.tsx
+import { Element} from './Element';
+
+let c: {
+	a?: {
+		b: string
+	}
+};
+
+class A {
+	view() {
+		return [
+			<meta content="helloworld"></meta>,
+			<meta content={c.a!.b}></meta>
+		];
+	}
+}
\ No newline at end of file

From 06affa6672bc3b11e72dff76b986983fc7f2e72d Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Wed, 9 Nov 2016 13:15:13 -0800
Subject: [PATCH 159/421] Resolve first identifier of the jsxFactory as part of
 type check

---
 src/compiler/checker.ts                       |  23 ++-
 src/compiler/program.ts                       |   9 +-
 src/compiler/types.ts                         |   2 +
 .../reference/jsxFactoryIdentifier.errors.txt |  57 -------
 .../reference/jsxFactoryIdentifier.symbols    | 125 ++++++++++++++++
 .../reference/jsxFactoryIdentifier.types      | 140 ++++++++++++++++++
 .../jsxFactoryQualifiedName.errors.txt        |  57 -------
 .../reference/jsxFactoryQualifiedName.js      |   1 +
 .../reference/jsxFactoryQualifiedName.symbols | 119 +++++++++++++++
 .../reference/jsxFactoryQualifiedName.types   | 134 +++++++++++++++++
 10 files changed, 548 insertions(+), 119 deletions(-)
 delete mode 100644 tests/baselines/reference/jsxFactoryIdentifier.errors.txt
 create mode 100644 tests/baselines/reference/jsxFactoryIdentifier.symbols
 create mode 100644 tests/baselines/reference/jsxFactoryIdentifier.types
 delete mode 100644 tests/baselines/reference/jsxFactoryQualifiedName.errors.txt
 create mode 100644 tests/baselines/reference/jsxFactoryQualifiedName.symbols
 create mode 100644 tests/baselines/reference/jsxFactoryQualifiedName.types

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 878323a41b8..6d5cee0362e 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -335,6 +335,7 @@ namespace ts {
         });
 
         let jsxElementType: Type;
+        let _jsxNamespace: string;
         /** Things we lazy load from the JSX namespace */
         const jsxTypes = createMap<Type>();
         const JsxNames = {
@@ -372,6 +373,22 @@ namespace ts {
 
         return checker;
 
+        function getJsxNamespace(): string {
+            if (_jsxNamespace === undefined) {
+                _jsxNamespace = "React";
+                if (compilerOptions.jsxFactory) {
+                    const jsxEntity = host.getJsxFactoryEntity();
+                    if (jsxEntity) {
+                        _jsxNamespace = getFirstIdentifier(jsxEntity).text;
+                    }
+                }
+                else if (compilerOptions.reactNamespace) {
+                    _jsxNamespace = compilerOptions.reactNamespace;
+                }
+            }
+            return _jsxNamespace;
+        }
+
         function getEmitResolver(sourceFile: SourceFile, cancellationToken: CancellationToken) {
             // Ensure we have all the type information in place for this file so that all the
             // emitter questions of this resolver will return the right information.
@@ -11337,10 +11354,10 @@ namespace ts {
         function checkJsxOpeningLikeElement(node: JsxOpeningLikeElement) {
             checkGrammarJsxElement(node);
             checkJsxPreconditions(node);
-            // The reactNamespace symbol should be marked as 'used' so we don't incorrectly elide its import. And if there
-            // is no reactNamespace symbol in scope when targeting React emit, we should issue an error.
+            // The reactNamespace/jsxFactory's root symbol should be marked as 'used' so we don't incorrectly elide its import. 
+            // And if there is no reactNamespace/jsxFactory's symbol in scope when targeting React emit, we should issue an error.
             const reactRefErr = compilerOptions.jsx === JsxEmit.React ? Diagnostics.Cannot_find_name_0 : undefined;
-            const reactNamespace = compilerOptions.reactNamespace ? compilerOptions.reactNamespace : "React";
+            const reactNamespace = getJsxNamespace();
             const reactSym = resolveName(node.tagName, reactNamespace, SymbolFlags.Value, reactRefErr, reactNamespace);
             if (reactSym) {
                 // Mark local symbol as referenced here because it might not have been marked
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 213e6a95ab1..a733d93a3dd 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -329,6 +329,9 @@ namespace ts {
         // Map storing if there is emit blocking diagnostics for given input
         const hasEmitBlockingDiagnostics = createFileMap<boolean>(getCanonicalFileName);
 
+        // ReactNamespace and jsxFactory information
+        let jsxFactoryEntity: EntityName;
+
         let resolveModuleNamesWorker: (moduleNames: string[], containingFile: string) => ResolvedModuleFull[];
         if (host.resolveModuleNames) {
             resolveModuleNamesWorker = (moduleNames, containingFile) => host.resolveModuleNames(moduleNames, containingFile).map(resolved => {
@@ -421,7 +424,8 @@ namespace ts {
             getFileProcessingDiagnostics: () => fileProcessingDiagnostics,
             getResolvedTypeReferenceDirectives: () => resolvedTypeReferenceDirectives,
             isSourceFileFromExternalLibrary,
-            dropDiagnosticsProducingTypeChecker
+            dropDiagnosticsProducingTypeChecker,
+            getJsxFactoryEntity: () => jsxFactoryEntity
         };
 
         verifyCompilerOptions();
@@ -1674,7 +1678,8 @@ namespace ts {
                 if (options.reactNamespace) {
                     programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_with_option_1, "reactNamespace", "jsxFactory"));
                 }
-                if (!parseIsolatedEntityName(options.jsxFactory, languageVersion)) {
+                jsxFactoryEntity = parseIsolatedEntityName(options.jsxFactory, languageVersion);
+                if (!jsxFactoryEntity) {
                     programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Invalid_value_for_jsxFactory_0_is_not_a_valid_identifier_or_qualified_name, options.jsxFactory));
                 }
             }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 5ca542cfe11..09d32ad817e 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -2177,6 +2177,7 @@ namespace ts {
         getTypeChecker(): TypeChecker;
 
         /* @internal */ getCommonSourceDirectory(): string;
+        /* @internal */ getJsxFactoryEntity(): EntityName;
 
         // For testing purposes only.  Should not be used by any other consumers (including the
         // language service).
@@ -2250,6 +2251,7 @@ namespace ts {
     /* @internal */
     export interface TypeCheckerHost {
         getCompilerOptions(): CompilerOptions;
+        getJsxFactoryEntity(): EntityName;
 
         getSourceFiles(): SourceFile[];
         getSourceFile(fileName: string): SourceFile;
diff --git a/tests/baselines/reference/jsxFactoryIdentifier.errors.txt b/tests/baselines/reference/jsxFactoryIdentifier.errors.txt
deleted file mode 100644
index e0cb485cf7f..00000000000
--- a/tests/baselines/reference/jsxFactoryIdentifier.errors.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-tests/cases/compiler/test.tsx(12,5): error TS2304: Cannot find name 'React'.
-tests/cases/compiler/test.tsx(13,5): error TS2304: Cannot find name 'React'.
-
-
-==== tests/cases/compiler/Element.ts (0 errors) ====
-    
-    declare namespace JSX {
-        interface Element {
-            name: string;
-            isIntrinsic: boolean;
-            isCustomElement: boolean;
-            toString(renderId?: number): string;
-            bindDOM(renderId?: number): number;
-            resetComponent(): void;
-            instantiateComponents(renderId?: number): number;
-            props: any;
-        }
-    }
-    export namespace Element {
-        export function isElement(el: any): el is JSX.Element {
-            return el.markAsChildOfRootElement !== undefined;
-        }
-    
-        export function createElement(args: any[]) {
-    
-            return {
-            }
-        }
-    }
-    
-    export let createElement = Element.createElement;
-    
-    function toCamelCase(text: string): string {
-        return text[0].toLowerCase() + text.substring(1);
-    }
-    
-==== tests/cases/compiler/test.tsx (2 errors) ====
-    import { Element} from './Element';
-    let createElement = Element.createElement;
-    let c: {
-    	a?: {
-    		b: string
-    	}
-    };
-    
-    class A {
-    	view() {
-    		return [
-    			<meta content="helloworld"></meta>,
-    			 ~~~~
-!!! error TS2304: Cannot find name 'React'.
-    			<meta content={c.a!.b}></meta>
-    			 ~~~~
-!!! error TS2304: Cannot find name 'React'.
-    		];
-    	}
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifier.symbols b/tests/baselines/reference/jsxFactoryIdentifier.symbols
new file mode 100644
index 00000000000..0d0f1e80490
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryIdentifier.symbols
@@ -0,0 +1,125 @@
+=== tests/cases/compiler/Element.ts ===
+
+declare namespace JSX {
+>JSX : Symbol(JSX, Decl(Element.ts, 0, 0))
+
+    interface Element {
+>Element : Symbol(Element, Decl(Element.ts, 1, 23))
+
+        name: string;
+>name : Symbol(Element.name, Decl(Element.ts, 2, 23))
+
+        isIntrinsic: boolean;
+>isIntrinsic : Symbol(Element.isIntrinsic, Decl(Element.ts, 3, 21))
+
+        isCustomElement: boolean;
+>isCustomElement : Symbol(Element.isCustomElement, Decl(Element.ts, 4, 29))
+
+        toString(renderId?: number): string;
+>toString : Symbol(Element.toString, Decl(Element.ts, 5, 33))
+>renderId : Symbol(renderId, Decl(Element.ts, 6, 17))
+
+        bindDOM(renderId?: number): number;
+>bindDOM : Symbol(Element.bindDOM, Decl(Element.ts, 6, 44))
+>renderId : Symbol(renderId, Decl(Element.ts, 7, 16))
+
+        resetComponent(): void;
+>resetComponent : Symbol(Element.resetComponent, Decl(Element.ts, 7, 43))
+
+        instantiateComponents(renderId?: number): number;
+>instantiateComponents : Symbol(Element.instantiateComponents, Decl(Element.ts, 8, 31))
+>renderId : Symbol(renderId, Decl(Element.ts, 9, 30))
+
+        props: any;
+>props : Symbol(Element.props, Decl(Element.ts, 9, 57))
+    }
+}
+export namespace Element {
+>Element : Symbol(Element, Decl(Element.ts, 12, 1))
+
+    export function isElement(el: any): el is JSX.Element {
+>isElement : Symbol(isElement, Decl(Element.ts, 13, 26))
+>el : Symbol(el, Decl(Element.ts, 14, 30))
+>el : Symbol(el, Decl(Element.ts, 14, 30))
+>JSX : Symbol(JSX, Decl(Element.ts, 0, 0))
+>Element : Symbol(JSX.Element, Decl(Element.ts, 1, 23))
+
+        return el.markAsChildOfRootElement !== undefined;
+>el : Symbol(el, Decl(Element.ts, 14, 30))
+>undefined : Symbol(undefined)
+    }
+
+    export function createElement(args: any[]) {
+>createElement : Symbol(createElement, Decl(Element.ts, 16, 5))
+>args : Symbol(args, Decl(Element.ts, 18, 34))
+
+        return {
+        }
+    }
+}
+
+export let createElement = Element.createElement;
+>createElement : Symbol(createElement, Decl(Element.ts, 25, 10))
+>Element.createElement : Symbol(Element.createElement, Decl(Element.ts, 16, 5))
+>Element : Symbol(Element, Decl(Element.ts, 12, 1))
+>createElement : Symbol(Element.createElement, Decl(Element.ts, 16, 5))
+
+function toCamelCase(text: string): string {
+>toCamelCase : Symbol(toCamelCase, Decl(Element.ts, 25, 49))
+>text : Symbol(text, Decl(Element.ts, 27, 21))
+
+    return text[0].toLowerCase() + text.substring(1);
+>text[0].toLowerCase : Symbol(String.toLowerCase, Decl(lib.es5.d.ts, --, --))
+>text : Symbol(text, Decl(Element.ts, 27, 21))
+>toLowerCase : Symbol(String.toLowerCase, Decl(lib.es5.d.ts, --, --))
+>text.substring : Symbol(String.substring, Decl(lib.es5.d.ts, --, --))
+>text : Symbol(text, Decl(Element.ts, 27, 21))
+>substring : Symbol(String.substring, Decl(lib.es5.d.ts, --, --))
+}
+
+=== tests/cases/compiler/test.tsx ===
+import { Element} from './Element';
+>Element : Symbol(Element, Decl(test.tsx, 0, 8))
+
+let createElement = Element.createElement;
+>createElement : Symbol(createElement, Decl(test.tsx, 1, 3))
+>Element.createElement : Symbol(Element.createElement, Decl(Element.ts, 16, 5))
+>Element : Symbol(Element, Decl(test.tsx, 0, 8))
+>createElement : Symbol(Element.createElement, Decl(Element.ts, 16, 5))
+
+let c: {
+>c : Symbol(c, Decl(test.tsx, 2, 3))
+
+	a?: {
+>a : Symbol(a, Decl(test.tsx, 2, 8))
+
+		b: string
+>b : Symbol(b, Decl(test.tsx, 3, 6))
+	}
+};
+
+class A {
+>A : Symbol(A, Decl(test.tsx, 6, 2))
+
+	view() {
+>view : Symbol(A.view, Decl(test.tsx, 8, 9))
+
+		return [
+			<meta content="helloworld"></meta>,
+>meta : Symbol(unknown)
+>content : Symbol(unknown)
+>meta : Symbol(unknown)
+
+			<meta content={c.a!.b}></meta>
+>meta : Symbol(unknown)
+>content : Symbol(unknown)
+>c.a!.b : Symbol(b, Decl(test.tsx, 3, 6))
+>c.a : Symbol(a, Decl(test.tsx, 2, 8))
+>c : Symbol(c, Decl(test.tsx, 2, 3))
+>a : Symbol(a, Decl(test.tsx, 2, 8))
+>b : Symbol(b, Decl(test.tsx, 3, 6))
+>meta : Symbol(unknown)
+
+		];
+	}
+}
diff --git a/tests/baselines/reference/jsxFactoryIdentifier.types b/tests/baselines/reference/jsxFactoryIdentifier.types
new file mode 100644
index 00000000000..c946c90559d
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryIdentifier.types
@@ -0,0 +1,140 @@
+=== tests/cases/compiler/Element.ts ===
+
+declare namespace JSX {
+>JSX : any
+
+    interface Element {
+>Element : Element
+
+        name: string;
+>name : string
+
+        isIntrinsic: boolean;
+>isIntrinsic : boolean
+
+        isCustomElement: boolean;
+>isCustomElement : boolean
+
+        toString(renderId?: number): string;
+>toString : (renderId?: number) => string
+>renderId : number
+
+        bindDOM(renderId?: number): number;
+>bindDOM : (renderId?: number) => number
+>renderId : number
+
+        resetComponent(): void;
+>resetComponent : () => void
+
+        instantiateComponents(renderId?: number): number;
+>instantiateComponents : (renderId?: number) => number
+>renderId : number
+
+        props: any;
+>props : any
+    }
+}
+export namespace Element {
+>Element : typeof Element
+
+    export function isElement(el: any): el is JSX.Element {
+>isElement : (el: any) => el is JSX.Element
+>el : any
+>el : any
+>JSX : any
+>Element : JSX.Element
+
+        return el.markAsChildOfRootElement !== undefined;
+>el.markAsChildOfRootElement !== undefined : boolean
+>el.markAsChildOfRootElement : any
+>el : any
+>markAsChildOfRootElement : any
+>undefined : undefined
+    }
+
+    export function createElement(args: any[]) {
+>createElement : (args: any[]) => {}
+>args : any[]
+
+        return {
+>{        } : {}
+        }
+    }
+}
+
+export let createElement = Element.createElement;
+>createElement : (args: any[]) => {}
+>Element.createElement : (args: any[]) => {}
+>Element : typeof Element
+>createElement : (args: any[]) => {}
+
+function toCamelCase(text: string): string {
+>toCamelCase : (text: string) => string
+>text : string
+
+    return text[0].toLowerCase() + text.substring(1);
+>text[0].toLowerCase() + text.substring(1) : string
+>text[0].toLowerCase() : string
+>text[0].toLowerCase : () => string
+>text[0] : string
+>text : string
+>0 : 0
+>toLowerCase : () => string
+>text.substring(1) : string
+>text.substring : (start: number, end?: number) => string
+>text : string
+>substring : (start: number, end?: number) => string
+>1 : 1
+}
+
+=== tests/cases/compiler/test.tsx ===
+import { Element} from './Element';
+>Element : typeof Element
+
+let createElement = Element.createElement;
+>createElement : (args: any[]) => {}
+>Element.createElement : (args: any[]) => {}
+>Element : typeof Element
+>createElement : (args: any[]) => {}
+
+let c: {
+>c : { a?: { b: string; }; }
+
+	a?: {
+>a : { b: string; }
+
+		b: string
+>b : string
+	}
+};
+
+class A {
+>A : A
+
+	view() {
+>view : () => any[]
+
+		return [
+>[			<meta content="helloworld"></meta>,			<meta content={c.a!.b}></meta>		] : any[]
+
+			<meta content="helloworld"></meta>,
+><meta content="helloworld"></meta> : any
+>meta : any
+>content : any
+>meta : any
+
+			<meta content={c.a!.b}></meta>
+><meta content={c.a!.b}></meta> : any
+>meta : any
+>content : any
+>c.a!.b : string
+>c.a! : { b: string; }
+>c.a : { b: string; }
+>c : { a?: { b: string; }; }
+>a : { b: string; }
+>b : string
+>meta : any
+
+		];
+	}
+}
diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.errors.txt b/tests/baselines/reference/jsxFactoryQualifiedName.errors.txt
deleted file mode 100644
index 32c8500ea3b..00000000000
--- a/tests/baselines/reference/jsxFactoryQualifiedName.errors.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-tests/cases/compiler/test.tsx(12,5): error TS2304: Cannot find name 'React'.
-tests/cases/compiler/test.tsx(13,5): error TS2304: Cannot find name 'React'.
-
-
-==== tests/cases/compiler/Element.ts (0 errors) ====
-    
-    declare namespace JSX {
-        interface Element {
-            name: string;
-            isIntrinsic: boolean;
-            isCustomElement: boolean;
-            toString(renderId?: number): string;
-            bindDOM(renderId?: number): number;
-            resetComponent(): void;
-            instantiateComponents(renderId?: number): number;
-            props: any;
-        }
-    }
-    export namespace Element {
-        export function isElement(el: any): el is JSX.Element {
-            return el.markAsChildOfRootElement !== undefined;
-        }
-    
-        export function createElement(args: any[]) {
-    
-            return {
-            }
-        }
-    }
-    
-    export let createElement = Element.createElement;
-    
-    function toCamelCase(text: string): string {
-        return text[0].toLowerCase() + text.substring(1);
-    }
-    
-==== tests/cases/compiler/test.tsx (2 errors) ====
-    import { Element} from './Element';
-    
-    let c: {
-    	a?: {
-    		b: string
-    	}
-    };
-    
-    class A {
-    	view() {
-    		return [
-    			<meta content="helloworld"></meta>,
-    			 ~~~~
-!!! error TS2304: Cannot find name 'React'.
-    			<meta content={c.a!.b}></meta>
-    			 ~~~~
-!!! error TS2304: Cannot find name 'React'.
-    		];
-    	}
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.js b/tests/baselines/reference/jsxFactoryQualifiedName.js
index aec6614bf01..b5da232a3d4 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedName.js
+++ b/tests/baselines/reference/jsxFactoryQualifiedName.js
@@ -69,6 +69,7 @@ function toCamelCase(text) {
 }
 //// [test.js]
 "use strict";
+const Element_1 = require("./Element");
 let c;
 class A {
     view() {
diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.symbols b/tests/baselines/reference/jsxFactoryQualifiedName.symbols
new file mode 100644
index 00000000000..16cd35d1ca3
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryQualifiedName.symbols
@@ -0,0 +1,119 @@
+=== tests/cases/compiler/Element.ts ===
+
+declare namespace JSX {
+>JSX : Symbol(JSX, Decl(Element.ts, 0, 0))
+
+    interface Element {
+>Element : Symbol(Element, Decl(Element.ts, 1, 23))
+
+        name: string;
+>name : Symbol(Element.name, Decl(Element.ts, 2, 23))
+
+        isIntrinsic: boolean;
+>isIntrinsic : Symbol(Element.isIntrinsic, Decl(Element.ts, 3, 21))
+
+        isCustomElement: boolean;
+>isCustomElement : Symbol(Element.isCustomElement, Decl(Element.ts, 4, 29))
+
+        toString(renderId?: number): string;
+>toString : Symbol(Element.toString, Decl(Element.ts, 5, 33))
+>renderId : Symbol(renderId, Decl(Element.ts, 6, 17))
+
+        bindDOM(renderId?: number): number;
+>bindDOM : Symbol(Element.bindDOM, Decl(Element.ts, 6, 44))
+>renderId : Symbol(renderId, Decl(Element.ts, 7, 16))
+
+        resetComponent(): void;
+>resetComponent : Symbol(Element.resetComponent, Decl(Element.ts, 7, 43))
+
+        instantiateComponents(renderId?: number): number;
+>instantiateComponents : Symbol(Element.instantiateComponents, Decl(Element.ts, 8, 31))
+>renderId : Symbol(renderId, Decl(Element.ts, 9, 30))
+
+        props: any;
+>props : Symbol(Element.props, Decl(Element.ts, 9, 57))
+    }
+}
+export namespace Element {
+>Element : Symbol(Element, Decl(Element.ts, 12, 1))
+
+    export function isElement(el: any): el is JSX.Element {
+>isElement : Symbol(isElement, Decl(Element.ts, 13, 26))
+>el : Symbol(el, Decl(Element.ts, 14, 30))
+>el : Symbol(el, Decl(Element.ts, 14, 30))
+>JSX : Symbol(JSX, Decl(Element.ts, 0, 0))
+>Element : Symbol(JSX.Element, Decl(Element.ts, 1, 23))
+
+        return el.markAsChildOfRootElement !== undefined;
+>el : Symbol(el, Decl(Element.ts, 14, 30))
+>undefined : Symbol(undefined)
+    }
+
+    export function createElement(args: any[]) {
+>createElement : Symbol(createElement, Decl(Element.ts, 16, 5))
+>args : Symbol(args, Decl(Element.ts, 18, 34))
+
+        return {
+        }
+    }
+}
+
+export let createElement = Element.createElement;
+>createElement : Symbol(createElement, Decl(Element.ts, 25, 10))
+>Element.createElement : Symbol(Element.createElement, Decl(Element.ts, 16, 5))
+>Element : Symbol(Element, Decl(Element.ts, 12, 1))
+>createElement : Symbol(Element.createElement, Decl(Element.ts, 16, 5))
+
+function toCamelCase(text: string): string {
+>toCamelCase : Symbol(toCamelCase, Decl(Element.ts, 25, 49))
+>text : Symbol(text, Decl(Element.ts, 27, 21))
+
+    return text[0].toLowerCase() + text.substring(1);
+>text[0].toLowerCase : Symbol(String.toLowerCase, Decl(lib.es5.d.ts, --, --))
+>text : Symbol(text, Decl(Element.ts, 27, 21))
+>toLowerCase : Symbol(String.toLowerCase, Decl(lib.es5.d.ts, --, --))
+>text.substring : Symbol(String.substring, Decl(lib.es5.d.ts, --, --))
+>text : Symbol(text, Decl(Element.ts, 27, 21))
+>substring : Symbol(String.substring, Decl(lib.es5.d.ts, --, --))
+}
+
+=== tests/cases/compiler/test.tsx ===
+import { Element} from './Element';
+>Element : Symbol(Element, Decl(test.tsx, 0, 8))
+
+let c: {
+>c : Symbol(c, Decl(test.tsx, 2, 3))
+
+	a?: {
+>a : Symbol(a, Decl(test.tsx, 2, 8))
+
+		b: string
+>b : Symbol(b, Decl(test.tsx, 3, 6))
+	}
+};
+
+class A {
+>A : Symbol(A, Decl(test.tsx, 6, 2))
+
+	view() {
+>view : Symbol(A.view, Decl(test.tsx, 8, 9))
+
+		return [
+			<meta content="helloworld"></meta>,
+>meta : Symbol(unknown)
+>content : Symbol(unknown)
+>meta : Symbol(unknown)
+
+			<meta content={c.a!.b}></meta>
+>meta : Symbol(unknown)
+>content : Symbol(unknown)
+>c.a!.b : Symbol(b, Decl(test.tsx, 3, 6))
+>c.a : Symbol(a, Decl(test.tsx, 2, 8))
+>c : Symbol(c, Decl(test.tsx, 2, 3))
+>a : Symbol(a, Decl(test.tsx, 2, 8))
+>b : Symbol(b, Decl(test.tsx, 3, 6))
+>meta : Symbol(unknown)
+
+		];
+	}
+}
diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.types b/tests/baselines/reference/jsxFactoryQualifiedName.types
new file mode 100644
index 00000000000..663ba4b5bfc
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryQualifiedName.types
@@ -0,0 +1,134 @@
+=== tests/cases/compiler/Element.ts ===
+
+declare namespace JSX {
+>JSX : any
+
+    interface Element {
+>Element : Element
+
+        name: string;
+>name : string
+
+        isIntrinsic: boolean;
+>isIntrinsic : boolean
+
+        isCustomElement: boolean;
+>isCustomElement : boolean
+
+        toString(renderId?: number): string;
+>toString : (renderId?: number) => string
+>renderId : number
+
+        bindDOM(renderId?: number): number;
+>bindDOM : (renderId?: number) => number
+>renderId : number
+
+        resetComponent(): void;
+>resetComponent : () => void
+
+        instantiateComponents(renderId?: number): number;
+>instantiateComponents : (renderId?: number) => number
+>renderId : number
+
+        props: any;
+>props : any
+    }
+}
+export namespace Element {
+>Element : typeof Element
+
+    export function isElement(el: any): el is JSX.Element {
+>isElement : (el: any) => el is JSX.Element
+>el : any
+>el : any
+>JSX : any
+>Element : JSX.Element
+
+        return el.markAsChildOfRootElement !== undefined;
+>el.markAsChildOfRootElement !== undefined : boolean
+>el.markAsChildOfRootElement : any
+>el : any
+>markAsChildOfRootElement : any
+>undefined : undefined
+    }
+
+    export function createElement(args: any[]) {
+>createElement : (args: any[]) => {}
+>args : any[]
+
+        return {
+>{        } : {}
+        }
+    }
+}
+
+export let createElement = Element.createElement;
+>createElement : (args: any[]) => {}
+>Element.createElement : (args: any[]) => {}
+>Element : typeof Element
+>createElement : (args: any[]) => {}
+
+function toCamelCase(text: string): string {
+>toCamelCase : (text: string) => string
+>text : string
+
+    return text[0].toLowerCase() + text.substring(1);
+>text[0].toLowerCase() + text.substring(1) : string
+>text[0].toLowerCase() : string
+>text[0].toLowerCase : () => string
+>text[0] : string
+>text : string
+>0 : 0
+>toLowerCase : () => string
+>text.substring(1) : string
+>text.substring : (start: number, end?: number) => string
+>text : string
+>substring : (start: number, end?: number) => string
+>1 : 1
+}
+
+=== tests/cases/compiler/test.tsx ===
+import { Element} from './Element';
+>Element : typeof Element
+
+let c: {
+>c : { a?: { b: string; }; }
+
+	a?: {
+>a : { b: string; }
+
+		b: string
+>b : string
+	}
+};
+
+class A {
+>A : A
+
+	view() {
+>view : () => any[]
+
+		return [
+>[			<meta content="helloworld"></meta>,			<meta content={c.a!.b}></meta>		] : any[]
+
+			<meta content="helloworld"></meta>,
+><meta content="helloworld"></meta> : any
+>meta : any
+>content : any
+>meta : any
+
+			<meta content={c.a!.b}></meta>
+><meta content={c.a!.b}></meta> : any
+>meta : any
+>content : any
+>c.a!.b : string
+>c.a! : { b: string; }
+>c.a : { b: string; }
+>c : { a?: { b: string; }; }
+>a : { b: string; }
+>b : string
+>meta : any
+
+		];
+	}
+}

From 3d6950d023b8c43b878292811189c5563128c8ec Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Wed, 9 Nov 2016 13:15:13 -0800
Subject: [PATCH 160/421] When emitting use jsx factory entity expression if
 provided

---
 src/compiler/factory.ts                       | 34 ++++++++++++++++---
 src/compiler/program.ts                       |  1 +
 src/compiler/transformers/jsx.ts              |  3 +-
 src/compiler/utilities.ts                     |  2 ++
 .../reference/jsxFactoryIdentifier.js         |  4 +--
 .../reference/jsxFactoryQualifiedName.js      |  4 +--
 6 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index c557e3514a5..de6191f085a 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -1628,7 +1628,34 @@ namespace ts {
         return react;
     }
 
-    export function createReactCreateElement(reactNamespace: string, tagName: Expression, props: Expression, children: Expression[], parentElement: JsxOpeningLikeElement, location: TextRange): LeftHandSideExpression {
+    function createJsxFactoryExpressionFromEntityName(jsxFactory: EntityName, parent: JsxOpeningLikeElement): Expression {
+        if (isQualifiedName(jsxFactory)) {
+            return createPropertyAccess(
+                createJsxFactoryExpressionFromEntityName(
+                    jsxFactory.left,
+                    parent
+                ),
+                setEmitFlags(
+                    getMutableClone(jsxFactory.right),
+                    EmitFlags.NoSourceMap
+                )
+            );
+        }
+        else {
+            return createReactNamespace(jsxFactory.text, parent);
+        }
+    }
+
+    function createJsxFactoryExpression(jsxFactoryEntity: EntityName, reactNamespace: string, parent: JsxOpeningLikeElement): Expression {
+        return jsxFactoryEntity ?
+            createJsxFactoryExpressionFromEntityName(jsxFactoryEntity, parent) :
+            createPropertyAccess(
+                createReactNamespace(reactNamespace, parent),
+                "createElement"
+            );
+    }
+
+    export function createExpressionForJsxElement(jsxFactoryEntity: EntityName, reactNamespace: string, tagName: Expression, props: Expression, children: Expression[], parentElement: JsxOpeningLikeElement, location: TextRange): LeftHandSideExpression {
         const argumentsList = [tagName];
         if (props) {
             argumentsList.push(props);
@@ -1651,10 +1678,7 @@ namespace ts {
         }
 
         return createCall(
-            createPropertyAccess(
-                createReactNamespace(reactNamespace, parentElement),
-                "createElement"
-            ),
+            createJsxFactoryExpression(jsxFactoryEntity, reactNamespace, parentElement),
             /*typeArguments*/ undefined,
             argumentsList,
             location
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index a733d93a3dd..90448d197d0 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -731,6 +731,7 @@ namespace ts {
                 writeFile: writeFileCallback || (
                     (fileName, data, writeByteOrderMark, onError, sourceFiles) => host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles)),
                 isEmitBlocked,
+                getJsxFactoryEntity: program.getJsxFactoryEntity,
             };
         }
 
diff --git a/src/compiler/transformers/jsx.ts b/src/compiler/transformers/jsx.ts
index 95a4016bb0a..874f4f6862f 100644
--- a/src/compiler/transformers/jsx.ts
+++ b/src/compiler/transformers/jsx.ts
@@ -113,7 +113,8 @@ namespace ts {
                     || createAssignHelper(currentSourceFile.externalHelpersModuleName, segments);
             }
 
-            const element = createReactCreateElement(
+            const element = createExpressionForJsxElement(
+                context.getEmitHost().getJsxFactoryEntity(),
                 compilerOptions.reactNamespace,
                 tagName,
                 objectProperties,
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 299f91be662..826beccc7b1 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -34,6 +34,8 @@ namespace ts {
         /* @internal */
         isSourceFileFromExternalLibrary(file: SourceFile): boolean;
 
+        /* @internal */
+        getJsxFactoryEntity(): EntityName;
         getCommonSourceDirectory(): string;
         getCanonicalFileName(fileName: string): string;
         getNewLine(): string;
diff --git a/tests/baselines/reference/jsxFactoryIdentifier.js b/tests/baselines/reference/jsxFactoryIdentifier.js
index 13abba53751..8205e752abd 100644
--- a/tests/baselines/reference/jsxFactoryIdentifier.js
+++ b/tests/baselines/reference/jsxFactoryIdentifier.js
@@ -75,8 +75,8 @@ let c;
 class A {
     view() {
         return [
-            React.createElement("meta", { content: "helloworld" }),
-            React.createElement("meta", { content: c.a.b })
+            createElement("meta", { content: "helloworld" }),
+            createElement("meta", { content: c.a.b })
         ];
     }
 }
diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.js b/tests/baselines/reference/jsxFactoryQualifiedName.js
index b5da232a3d4..e5c7b04f760 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedName.js
+++ b/tests/baselines/reference/jsxFactoryQualifiedName.js
@@ -74,8 +74,8 @@ let c;
 class A {
     view() {
         return [
-            React.createElement("meta", { content: "helloworld" }),
-            React.createElement("meta", { content: c.a.b })
+            Element_1.Element.createElement("meta", { content: "helloworld" }),
+            Element_1.Element.createElement("meta", { content: c.a.b })
         ];
     }
 }

From 35e4c459f5749e3478160378c0c8ecbb128bb1d0 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Wed, 9 Nov 2016 13:15:13 -0800
Subject: [PATCH 161/421] Transpile unit test case

---
 src/harness/unittests/transpile.ts                            | 4 ++++
 .../reference/transpile/Supports setting jsxFactory.js        | 3 +++
 2 files changed, 7 insertions(+)
 create mode 100644 tests/baselines/reference/transpile/Supports setting jsxFactory.js

diff --git a/src/harness/unittests/transpile.ts b/src/harness/unittests/transpile.ts
index 35b4f808350..20552ab9c2e 100644
--- a/src/harness/unittests/transpile.ts
+++ b/src/harness/unittests/transpile.ts
@@ -385,6 +385,10 @@ var x = 0;`, {
             options: { compilerOptions: { reactNamespace: "react" }, fileName: "input.js", reportDiagnostics: true }
         });
 
+        transpilesCorrectly("Supports setting 'jsxFactory'", "x;", {
+            options: { compilerOptions: { jsxFactory: "createElement" }, fileName: "input.js", reportDiagnostics: true }
+        });
+
         transpilesCorrectly("Supports setting 'removeComments'", "x;", {
             options: { compilerOptions: { removeComments: true }, fileName: "input.js", reportDiagnostics: true }
         });
diff --git a/tests/baselines/reference/transpile/Supports setting jsxFactory.js b/tests/baselines/reference/transpile/Supports setting jsxFactory.js
new file mode 100644
index 00000000000..8d91090453b
--- /dev/null
+++ b/tests/baselines/reference/transpile/Supports setting jsxFactory.js	
@@ -0,0 +1,3 @@
+"use strict";
+x;
+//# sourceMappingURL=input.js.map
\ No newline at end of file

From c6b1bbe12dc17fbd87d9a3c6215027853de028b4 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Wed, 9 Nov 2016 13:15:13 -0800
Subject: [PATCH 162/421] Enabled test case for source map

---
 .../reference/jsxFactoryIdentifier.js         |   3 +-
 .../reference/jsxFactoryIdentifier.js.map     |   3 +
 .../jsxFactoryIdentifier.sourcemap.txt        | 520 ++++++++++++++++++
 .../reference/jsxFactoryQualifiedName.js      |   3 +-
 .../reference/jsxFactoryQualifiedName.js.map  |   3 +
 .../jsxFactoryQualifiedName.sourcemap.txt     | 493 +++++++++++++++++
 tests/cases/compiler/jsxFactoryIdentifier.ts  |   1 +
 .../cases/compiler/jsxFactoryQualifiedName.ts |   1 +
 8 files changed, 1025 insertions(+), 2 deletions(-)
 create mode 100644 tests/baselines/reference/jsxFactoryIdentifier.js.map
 create mode 100644 tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt
 create mode 100644 tests/baselines/reference/jsxFactoryQualifiedName.js.map
 create mode 100644 tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt

diff --git a/tests/baselines/reference/jsxFactoryIdentifier.js b/tests/baselines/reference/jsxFactoryIdentifier.js
index 8205e752abd..82c8f6410e6 100644
--- a/tests/baselines/reference/jsxFactoryIdentifier.js
+++ b/tests/baselines/reference/jsxFactoryIdentifier.js
@@ -67,7 +67,7 @@ exports.createElement = Element.createElement;
 function toCamelCase(text) {
     return text[0].toLowerCase() + text.substring(1);
 }
-//// [test.js]
+//# sourceMappingURL=Element.js.map//// [test.js]
 "use strict";
 const Element_1 = require("./Element");
 let createElement = Element_1.Element.createElement;
@@ -80,3 +80,4 @@ class A {
         ];
     }
 }
+//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifier.js.map b/tests/baselines/reference/jsxFactoryIdentifier.js.map
new file mode 100644
index 00000000000..cad196b8ba5
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryIdentifier.js.map
@@ -0,0 +1,3 @@
+//// [Element.js.map]
+{"version":3,"file":"Element.js","sourceRoot":"","sources":["Element.ts"],"names":[],"mappings":";AAaA,IAAiB,OAAO,CAUvB;AAVD,WAAiB,OAAO;IACpB,mBAA0B,EAAO;QAC7B,MAAM,CAAC,EAAE,CAAC,wBAAwB,KAAK,SAAS,CAAC;IACrD,CAAC;IAFe,iBAAS,YAExB,CAAA;IAED,uBAA8B,IAAW;QAErC,MAAM,CAAC,EACN,CAAA;IACL,CAAC;IAJe,qBAAa,gBAI5B,CAAA;AACL,CAAC,EAVgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAUvB;AAEU,QAAA,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAEjD,qBAAqB,IAAY;IAC7B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC"}//// [test.js.map]
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAAA,uCAAmC;AACnC,IAAI,aAAa,GAAG,iBAAO,CAAC,aAAa,CAAC;AAC1C,IAAI,CAIH,CAAC;AAEF;IACC,IAAI;QACH,MAAM,CAAC;YACN,wBAAM,OAAO,EAAC,YAAY,GAAQ;YAClC,wBAAM,OAAO,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC,GAAS;SAC9B,CAAC;IACH,CAAC;CACD"}
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt
new file mode 100644
index 00000000000..a4ddc8c050b
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt
@@ -0,0 +1,520 @@
+===================================================================
+JsFile: Element.js
+mapUrl: Element.js.map
+sourceRoot: 
+sources: Element.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/compiler/Element.js
+sourceFile:Element.ts
+-------------------------------------------------------------------
+>>>"use strict";
+>>>var Element;
+1 >
+2 >^^^^
+3 >    ^^^^^^^
+4 >           ^
+5 >            ^^^^^^^^^^->
+1 >
+  >declare namespace JSX {
+  >    interface Element {
+  >        name: string;
+  >        isIntrinsic: boolean;
+  >        isCustomElement: boolean;
+  >        toString(renderId?: number): string;
+  >        bindDOM(renderId?: number): number;
+  >        resetComponent(): void;
+  >        instantiateComponents(renderId?: number): number;
+  >        props: any;
+  >    }
+  >}
+  >
+2 >export namespace 
+3 >    Element
+4 >            {
+  >               export function isElement(el: any): el is JSX.Element {
+  >                   return el.markAsChildOfRootElement !== undefined;
+  >               }
+  >           
+  >               export function createElement(args: any[]) {
+  >           
+  >                   return {
+  >                   }
+  >               }
+  >           }
+1 >Emitted(2, 1) Source(14, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(14, 18) + SourceIndex(0)
+3 >Emitted(2, 12) Source(14, 25) + SourceIndex(0)
+4 >Emitted(2, 13) Source(24, 2) + SourceIndex(0)
+---
+>>>(function (Element) {
+1->
+2 >^^^^^^^^^^^
+3 >           ^^^^^^^
+4 >                  ^^^^^^^^^^^->
+1->
+2 >export namespace 
+3 >           Element
+1->Emitted(3, 1) Source(14, 1) + SourceIndex(0)
+2 >Emitted(3, 12) Source(14, 18) + SourceIndex(0)
+3 >Emitted(3, 19) Source(14, 25) + SourceIndex(0)
+---
+>>>    function isElement(el) {
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^
+3 >                       ^^
+4 >                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1-> {
+  >    
+2 >    export function isElement(
+3 >                       el: any
+1->Emitted(4, 5) Source(15, 5) + SourceIndex(0)
+2 >Emitted(4, 24) Source(15, 31) + SourceIndex(0)
+3 >Emitted(4, 26) Source(15, 38) + SourceIndex(0)
+---
+>>>        return el.markAsChildOfRootElement !== undefined;
+1->^^^^^^^^
+2 >        ^^^^^^
+3 >              ^
+4 >               ^^
+5 >                 ^
+6 >                  ^^^^^^^^^^^^^^^^^^^^^^^^
+7 >                                          ^^^^^
+8 >                                               ^^^^^^^^^
+9 >                                                        ^
+1->): el is JSX.Element {
+  >        
+2 >        return
+3 >               
+4 >               el
+5 >                 .
+6 >                  markAsChildOfRootElement
+7 >                                           !== 
+8 >                                               undefined
+9 >                                                        ;
+1->Emitted(5, 9) Source(16, 9) + SourceIndex(0)
+2 >Emitted(5, 15) Source(16, 15) + SourceIndex(0)
+3 >Emitted(5, 16) Source(16, 16) + SourceIndex(0)
+4 >Emitted(5, 18) Source(16, 18) + SourceIndex(0)
+5 >Emitted(5, 19) Source(16, 19) + SourceIndex(0)
+6 >Emitted(5, 43) Source(16, 43) + SourceIndex(0)
+7 >Emitted(5, 48) Source(16, 48) + SourceIndex(0)
+8 >Emitted(5, 57) Source(16, 57) + SourceIndex(0)
+9 >Emitted(5, 58) Source(16, 58) + SourceIndex(0)
+---
+>>>    }
+1 >^^^^
+2 >    ^
+3 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >    
+2 >    }
+1 >Emitted(6, 5) Source(17, 5) + SourceIndex(0)
+2 >Emitted(6, 6) Source(17, 6) + SourceIndex(0)
+---
+>>>    Element.isElement = isElement;
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^
+3 >                     ^^^^^^^^^^^^
+4 >                                 ^
+5 >                                  ^->
+1->
+2 >    isElement
+3 >                     (el: any): el is JSX.Element {
+  >                             return el.markAsChildOfRootElement !== undefined;
+  >                         }
+4 >                                 
+1->Emitted(7, 5) Source(15, 21) + SourceIndex(0)
+2 >Emitted(7, 22) Source(15, 30) + SourceIndex(0)
+3 >Emitted(7, 34) Source(17, 6) + SourceIndex(0)
+4 >Emitted(7, 35) Source(17, 6) + SourceIndex(0)
+---
+>>>    function createElement(args) {
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^
+3 >                           ^^^^
+1->
+  >
+  >    
+2 >    export function createElement(
+3 >                           args: any[]
+1->Emitted(8, 5) Source(19, 5) + SourceIndex(0)
+2 >Emitted(8, 28) Source(19, 35) + SourceIndex(0)
+3 >Emitted(8, 32) Source(19, 46) + SourceIndex(0)
+---
+>>>        return {};
+1 >^^^^^^^^
+2 >        ^^^^^^
+3 >              ^
+4 >               ^^
+5 >                 ^
+1 >) {
+  >
+  >        
+2 >        return
+3 >               
+4 >               {
+  >                       }
+5 >                 
+1 >Emitted(9, 9) Source(21, 9) + SourceIndex(0)
+2 >Emitted(9, 15) Source(21, 15) + SourceIndex(0)
+3 >Emitted(9, 16) Source(21, 16) + SourceIndex(0)
+4 >Emitted(9, 18) Source(22, 10) + SourceIndex(0)
+5 >Emitted(9, 19) Source(22, 10) + SourceIndex(0)
+---
+>>>    }
+1 >^^^^
+2 >    ^
+3 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >    
+2 >    }
+1 >Emitted(10, 5) Source(23, 5) + SourceIndex(0)
+2 >Emitted(10, 6) Source(23, 6) + SourceIndex(0)
+---
+>>>    Element.createElement = createElement;
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^
+3 >                         ^^^^^^^^^^^^^^^^
+4 >                                         ^
+5 >                                          ^^^^^^^^^^^^^^^->
+1->
+2 >    createElement
+3 >                         (args: any[]) {
+  >                         
+  >                                 return {
+  >                                 }
+  >                             }
+4 >                                         
+1->Emitted(11, 5) Source(19, 21) + SourceIndex(0)
+2 >Emitted(11, 26) Source(19, 34) + SourceIndex(0)
+3 >Emitted(11, 42) Source(23, 6) + SourceIndex(0)
+4 >Emitted(11, 43) Source(23, 6) + SourceIndex(0)
+---
+>>>})(Element = exports.Element || (exports.Element = {}));
+1->
+2 >^
+3 > ^^
+4 >   ^^^^^^^
+5 >          ^^^
+6 >             ^^^^^^^^^^^^^^^
+7 >                            ^^^^^
+8 >                                 ^^^^^^^^^^^^^^^
+9 >                                                ^^^^^^^^
+1->
+  >
+2 >}
+3 > 
+4 >   Element
+5 >          
+6 >             Element
+7 >                            
+8 >                                 Element
+9 >                                                 {
+  >                                                    export function isElement(el: any): el is JSX.Element {
+  >                                                        return el.markAsChildOfRootElement !== undefined;
+  >                                                    }
+  >                                                
+  >                                                    export function createElement(args: any[]) {
+  >                                                
+  >                                                        return {
+  >                                                        }
+  >                                                    }
+  >                                                }
+1->Emitted(12, 1) Source(24, 1) + SourceIndex(0)
+2 >Emitted(12, 2) Source(24, 2) + SourceIndex(0)
+3 >Emitted(12, 4) Source(14, 18) + SourceIndex(0)
+4 >Emitted(12, 11) Source(14, 25) + SourceIndex(0)
+5 >Emitted(12, 14) Source(14, 18) + SourceIndex(0)
+6 >Emitted(12, 29) Source(14, 25) + SourceIndex(0)
+7 >Emitted(12, 34) Source(14, 18) + SourceIndex(0)
+8 >Emitted(12, 49) Source(14, 25) + SourceIndex(0)
+9 >Emitted(12, 57) Source(24, 2) + SourceIndex(0)
+---
+>>>exports.createElement = Element.createElement;
+1 >
+2 >^^^^^^^^
+3 >        ^^^^^^^^^^^^^
+4 >                     ^^^
+5 >                        ^^^^^^^
+6 >                               ^
+7 >                                ^^^^^^^^^^^^^
+8 >                                             ^
+1 >
+  >
+  >export let 
+2 >
+3 >        createElement
+4 >                      = 
+5 >                        Element
+6 >                               .
+7 >                                createElement
+8 >                                             ;
+1 >Emitted(13, 1) Source(26, 12) + SourceIndex(0)
+2 >Emitted(13, 9) Source(26, 12) + SourceIndex(0)
+3 >Emitted(13, 22) Source(26, 25) + SourceIndex(0)
+4 >Emitted(13, 25) Source(26, 28) + SourceIndex(0)
+5 >Emitted(13, 32) Source(26, 35) + SourceIndex(0)
+6 >Emitted(13, 33) Source(26, 36) + SourceIndex(0)
+7 >Emitted(13, 46) Source(26, 49) + SourceIndex(0)
+8 >Emitted(13, 47) Source(26, 50) + SourceIndex(0)
+---
+>>>function toCamelCase(text) {
+1 >
+2 >^^^^^^^^^^^^^^^^^^^^^
+3 >                     ^^^^
+4 >                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+  >
+2 >function toCamelCase(
+3 >                     text: string
+1 >Emitted(14, 1) Source(28, 1) + SourceIndex(0)
+2 >Emitted(14, 22) Source(28, 22) + SourceIndex(0)
+3 >Emitted(14, 26) Source(28, 34) + SourceIndex(0)
+---
+>>>    return text[0].toLowerCase() + text.substring(1);
+1->^^^^
+2 >    ^^^^^^
+3 >          ^
+4 >           ^^^^
+5 >               ^
+6 >                ^
+7 >                 ^
+8 >                  ^
+9 >                   ^^^^^^^^^^^
+10>                              ^^
+11>                                ^^^
+12>                                   ^^^^
+13>                                       ^
+14>                                        ^^^^^^^^^
+15>                                                 ^
+16>                                                  ^
+17>                                                   ^
+18>                                                    ^
+1->): string {
+  >    
+2 >    return
+3 >           
+4 >           text
+5 >               [
+6 >                0
+7 >                 ]
+8 >                  .
+9 >                   toLowerCase
+10>                              ()
+11>                                 + 
+12>                                   text
+13>                                       .
+14>                                        substring
+15>                                                 (
+16>                                                  1
+17>                                                   )
+18>                                                    ;
+1->Emitted(15, 5) Source(29, 5) + SourceIndex(0)
+2 >Emitted(15, 11) Source(29, 11) + SourceIndex(0)
+3 >Emitted(15, 12) Source(29, 12) + SourceIndex(0)
+4 >Emitted(15, 16) Source(29, 16) + SourceIndex(0)
+5 >Emitted(15, 17) Source(29, 17) + SourceIndex(0)
+6 >Emitted(15, 18) Source(29, 18) + SourceIndex(0)
+7 >Emitted(15, 19) Source(29, 19) + SourceIndex(0)
+8 >Emitted(15, 20) Source(29, 20) + SourceIndex(0)
+9 >Emitted(15, 31) Source(29, 31) + SourceIndex(0)
+10>Emitted(15, 33) Source(29, 33) + SourceIndex(0)
+11>Emitted(15, 36) Source(29, 36) + SourceIndex(0)
+12>Emitted(15, 40) Source(29, 40) + SourceIndex(0)
+13>Emitted(15, 41) Source(29, 41) + SourceIndex(0)
+14>Emitted(15, 50) Source(29, 50) + SourceIndex(0)
+15>Emitted(15, 51) Source(29, 51) + SourceIndex(0)
+16>Emitted(15, 52) Source(29, 52) + SourceIndex(0)
+17>Emitted(15, 53) Source(29, 53) + SourceIndex(0)
+18>Emitted(15, 54) Source(29, 54) + SourceIndex(0)
+---
+>>>}
+1 >
+2 >^
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+2 >}
+1 >Emitted(16, 1) Source(30, 1) + SourceIndex(0)
+2 >Emitted(16, 2) Source(30, 2) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=Element.js.map===================================================================
+JsFile: test.js
+mapUrl: test.js.map
+sourceRoot: 
+sources: test.tsx
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/compiler/test.js
+sourceFile:test.tsx
+-------------------------------------------------------------------
+>>>"use strict";
+>>>const Element_1 = require("./Element");
+1 >
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                       ^^^^^^^^^^^^^^->
+1 >
+2 >import { Element} from './Element';
+1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(2, 40) Source(1, 36) + SourceIndex(0)
+---
+>>>let createElement = Element_1.Element.createElement;
+1->
+2 >^^^^
+3 >    ^^^^^^^^^^^^^
+4 >                 ^^^
+5 >                    ^^^^^^^^^^^^^^^^^
+6 >                                     ^
+7 >                                      ^^^^^^^^^^^^^
+8 >                                                   ^
+1->
+  >
+2 >let 
+3 >    createElement
+4 >                  = 
+5 >                    Element
+6 >                                     .
+7 >                                      createElement
+8 >                                                   ;
+1->Emitted(3, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(3, 18) Source(2, 18) + SourceIndex(0)
+4 >Emitted(3, 21) Source(2, 21) + SourceIndex(0)
+5 >Emitted(3, 38) Source(2, 28) + SourceIndex(0)
+6 >Emitted(3, 39) Source(2, 29) + SourceIndex(0)
+7 >Emitted(3, 52) Source(2, 42) + SourceIndex(0)
+8 >Emitted(3, 53) Source(2, 43) + SourceIndex(0)
+---
+>>>let c;
+1 >
+2 >^^^^
+3 >    ^
+4 >     ^
+5 >      ^^^^->
+1 >
+  >
+2 >let 
+3 >    c: {
+  >    	a?: {
+  >    		b: string
+  >    	}
+  >    }
+4 >     ;
+1 >Emitted(4, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(4, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(4, 6) Source(7, 2) + SourceIndex(0)
+4 >Emitted(4, 7) Source(7, 3) + SourceIndex(0)
+---
+>>>class A {
+1->
+2 >^^^^^^^^^^^^^->
+1->
+  >
+  >
+1->Emitted(5, 1) Source(9, 1) + SourceIndex(0)
+---
+>>>    view() {
+1->^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^->
+1->class A {
+  >	
+2 >    view
+1->Emitted(6, 5) Source(10, 2) + SourceIndex(0)
+2 >Emitted(6, 9) Source(10, 6) + SourceIndex(0)
+---
+>>>        return [
+1->^^^^^^^^
+2 >        ^^^^^^
+3 >              ^
+4 >               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->() {
+  >		
+2 >        return
+3 >               
+1->Emitted(7, 9) Source(11, 3) + SourceIndex(0)
+2 >Emitted(7, 15) Source(11, 9) + SourceIndex(0)
+3 >Emitted(7, 16) Source(11, 10) + SourceIndex(0)
+---
+>>>            createElement("meta", { content: "helloworld" }),
+1->^^^^^^^^^^^^
+2 >            ^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                    ^^^^^^^
+4 >                                           ^^
+5 >                                             ^^^^^^^^^^^^
+6 >                                                         ^^^
+1->[
+  >			
+2 >            <meta 
+3 >                                    content
+4 >                                           =
+5 >                                             "helloworld"
+6 >                                                         ></meta>
+1->Emitted(8, 13) Source(12, 4) + SourceIndex(0)
+2 >Emitted(8, 37) Source(12, 10) + SourceIndex(0)
+3 >Emitted(8, 44) Source(12, 17) + SourceIndex(0)
+4 >Emitted(8, 46) Source(12, 18) + SourceIndex(0)
+5 >Emitted(8, 58) Source(12, 30) + SourceIndex(0)
+6 >Emitted(8, 61) Source(12, 38) + SourceIndex(0)
+---
+>>>            createElement("meta", { content: c.a.b })
+1 >^^^^^^^^^^^^
+2 >            ^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                    ^^^^^^^
+4 >                                           ^^
+5 >                                             ^
+6 >                                              ^
+7 >                                               ^
+8 >                                                ^
+9 >                                                 ^
+10>                                                  ^^^
+1 >,
+  >			
+2 >            <meta 
+3 >                                    content
+4 >                                           ={
+5 >                                             c
+6 >                                              .
+7 >                                               a!
+8 >                                                .
+9 >                                                 b
+10>                                                  }></meta>
+1 >Emitted(9, 13) Source(13, 4) + SourceIndex(0)
+2 >Emitted(9, 37) Source(13, 10) + SourceIndex(0)
+3 >Emitted(9, 44) Source(13, 17) + SourceIndex(0)
+4 >Emitted(9, 46) Source(13, 19) + SourceIndex(0)
+5 >Emitted(9, 47) Source(13, 20) + SourceIndex(0)
+6 >Emitted(9, 48) Source(13, 21) + SourceIndex(0)
+7 >Emitted(9, 49) Source(13, 23) + SourceIndex(0)
+8 >Emitted(9, 50) Source(13, 24) + SourceIndex(0)
+9 >Emitted(9, 51) Source(13, 25) + SourceIndex(0)
+10>Emitted(9, 54) Source(13, 34) + SourceIndex(0)
+---
+>>>        ];
+1 >^^^^^^^^^
+2 >         ^
+1 >
+  >		]
+2 >         ;
+1 >Emitted(10, 10) Source(14, 4) + SourceIndex(0)
+2 >Emitted(10, 11) Source(14, 5) + SourceIndex(0)
+---
+>>>    }
+1 >^^^^
+2 >    ^
+1 >
+  >	
+2 >    }
+1 >Emitted(11, 5) Source(15, 2) + SourceIndex(0)
+2 >Emitted(11, 6) Source(15, 3) + SourceIndex(0)
+---
+>>>}
+1 >^
+2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >}
+1 >Emitted(12, 2) Source(16, 2) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.js b/tests/baselines/reference/jsxFactoryQualifiedName.js
index e5c7b04f760..80a77d35302 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedName.js
+++ b/tests/baselines/reference/jsxFactoryQualifiedName.js
@@ -67,7 +67,7 @@ exports.createElement = Element.createElement;
 function toCamelCase(text) {
     return text[0].toLowerCase() + text.substring(1);
 }
-//// [test.js]
+//# sourceMappingURL=Element.js.map//// [test.js]
 "use strict";
 const Element_1 = require("./Element");
 let c;
@@ -79,3 +79,4 @@ class A {
         ];
     }
 }
+//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.js.map b/tests/baselines/reference/jsxFactoryQualifiedName.js.map
new file mode 100644
index 00000000000..f8cef24a0f0
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryQualifiedName.js.map
@@ -0,0 +1,3 @@
+//// [Element.js.map]
+{"version":3,"file":"Element.js","sourceRoot":"","sources":["Element.ts"],"names":[],"mappings":";AAaA,IAAiB,OAAO,CAUvB;AAVD,WAAiB,OAAO;IACpB,mBAA0B,EAAO;QAC7B,MAAM,CAAC,EAAE,CAAC,wBAAwB,KAAK,SAAS,CAAC;IACrD,CAAC;IAFe,iBAAS,YAExB,CAAA;IAED,uBAA8B,IAAW;QAErC,MAAM,CAAC,EACN,CAAA;IACL,CAAC;IAJe,qBAAa,gBAI5B,CAAA;AACL,CAAC,EAVgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAUvB;AAEU,QAAA,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAEjD,qBAAqB,IAAY;IAC7B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC"}//// [test.js.map]
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAAA,uCAAmC;AAEnC,IAAI,CAIH,CAAC;AAEF;IACC,IAAI;QACH,MAAM,CAAC;YACN,0CAAM,OAAO,EAAC,YAAY,GAAQ;YAClC,0CAAM,OAAO,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC,GAAS;SAC9B,CAAC;IACH,CAAC;CACD"}
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt b/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt
new file mode 100644
index 00000000000..98517620c73
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt
@@ -0,0 +1,493 @@
+===================================================================
+JsFile: Element.js
+mapUrl: Element.js.map
+sourceRoot: 
+sources: Element.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/compiler/Element.js
+sourceFile:Element.ts
+-------------------------------------------------------------------
+>>>"use strict";
+>>>var Element;
+1 >
+2 >^^^^
+3 >    ^^^^^^^
+4 >           ^
+5 >            ^^^^^^^^^^->
+1 >
+  >declare namespace JSX {
+  >    interface Element {
+  >        name: string;
+  >        isIntrinsic: boolean;
+  >        isCustomElement: boolean;
+  >        toString(renderId?: number): string;
+  >        bindDOM(renderId?: number): number;
+  >        resetComponent(): void;
+  >        instantiateComponents(renderId?: number): number;
+  >        props: any;
+  >    }
+  >}
+  >
+2 >export namespace 
+3 >    Element
+4 >            {
+  >               export function isElement(el: any): el is JSX.Element {
+  >                   return el.markAsChildOfRootElement !== undefined;
+  >               }
+  >           
+  >               export function createElement(args: any[]) {
+  >           
+  >                   return {
+  >                   }
+  >               }
+  >           }
+1 >Emitted(2, 1) Source(14, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(14, 18) + SourceIndex(0)
+3 >Emitted(2, 12) Source(14, 25) + SourceIndex(0)
+4 >Emitted(2, 13) Source(24, 2) + SourceIndex(0)
+---
+>>>(function (Element) {
+1->
+2 >^^^^^^^^^^^
+3 >           ^^^^^^^
+4 >                  ^^^^^^^^^^^->
+1->
+2 >export namespace 
+3 >           Element
+1->Emitted(3, 1) Source(14, 1) + SourceIndex(0)
+2 >Emitted(3, 12) Source(14, 18) + SourceIndex(0)
+3 >Emitted(3, 19) Source(14, 25) + SourceIndex(0)
+---
+>>>    function isElement(el) {
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^
+3 >                       ^^
+4 >                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1-> {
+  >    
+2 >    export function isElement(
+3 >                       el: any
+1->Emitted(4, 5) Source(15, 5) + SourceIndex(0)
+2 >Emitted(4, 24) Source(15, 31) + SourceIndex(0)
+3 >Emitted(4, 26) Source(15, 38) + SourceIndex(0)
+---
+>>>        return el.markAsChildOfRootElement !== undefined;
+1->^^^^^^^^
+2 >        ^^^^^^
+3 >              ^
+4 >               ^^
+5 >                 ^
+6 >                  ^^^^^^^^^^^^^^^^^^^^^^^^
+7 >                                          ^^^^^
+8 >                                               ^^^^^^^^^
+9 >                                                        ^
+1->): el is JSX.Element {
+  >        
+2 >        return
+3 >               
+4 >               el
+5 >                 .
+6 >                  markAsChildOfRootElement
+7 >                                           !== 
+8 >                                               undefined
+9 >                                                        ;
+1->Emitted(5, 9) Source(16, 9) + SourceIndex(0)
+2 >Emitted(5, 15) Source(16, 15) + SourceIndex(0)
+3 >Emitted(5, 16) Source(16, 16) + SourceIndex(0)
+4 >Emitted(5, 18) Source(16, 18) + SourceIndex(0)
+5 >Emitted(5, 19) Source(16, 19) + SourceIndex(0)
+6 >Emitted(5, 43) Source(16, 43) + SourceIndex(0)
+7 >Emitted(5, 48) Source(16, 48) + SourceIndex(0)
+8 >Emitted(5, 57) Source(16, 57) + SourceIndex(0)
+9 >Emitted(5, 58) Source(16, 58) + SourceIndex(0)
+---
+>>>    }
+1 >^^^^
+2 >    ^
+3 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >    
+2 >    }
+1 >Emitted(6, 5) Source(17, 5) + SourceIndex(0)
+2 >Emitted(6, 6) Source(17, 6) + SourceIndex(0)
+---
+>>>    Element.isElement = isElement;
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^
+3 >                     ^^^^^^^^^^^^
+4 >                                 ^
+5 >                                  ^->
+1->
+2 >    isElement
+3 >                     (el: any): el is JSX.Element {
+  >                             return el.markAsChildOfRootElement !== undefined;
+  >                         }
+4 >                                 
+1->Emitted(7, 5) Source(15, 21) + SourceIndex(0)
+2 >Emitted(7, 22) Source(15, 30) + SourceIndex(0)
+3 >Emitted(7, 34) Source(17, 6) + SourceIndex(0)
+4 >Emitted(7, 35) Source(17, 6) + SourceIndex(0)
+---
+>>>    function createElement(args) {
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^
+3 >                           ^^^^
+1->
+  >
+  >    
+2 >    export function createElement(
+3 >                           args: any[]
+1->Emitted(8, 5) Source(19, 5) + SourceIndex(0)
+2 >Emitted(8, 28) Source(19, 35) + SourceIndex(0)
+3 >Emitted(8, 32) Source(19, 46) + SourceIndex(0)
+---
+>>>        return {};
+1 >^^^^^^^^
+2 >        ^^^^^^
+3 >              ^
+4 >               ^^
+5 >                 ^
+1 >) {
+  >
+  >        
+2 >        return
+3 >               
+4 >               {
+  >                       }
+5 >                 
+1 >Emitted(9, 9) Source(21, 9) + SourceIndex(0)
+2 >Emitted(9, 15) Source(21, 15) + SourceIndex(0)
+3 >Emitted(9, 16) Source(21, 16) + SourceIndex(0)
+4 >Emitted(9, 18) Source(22, 10) + SourceIndex(0)
+5 >Emitted(9, 19) Source(22, 10) + SourceIndex(0)
+---
+>>>    }
+1 >^^^^
+2 >    ^
+3 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >    
+2 >    }
+1 >Emitted(10, 5) Source(23, 5) + SourceIndex(0)
+2 >Emitted(10, 6) Source(23, 6) + SourceIndex(0)
+---
+>>>    Element.createElement = createElement;
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^
+3 >                         ^^^^^^^^^^^^^^^^
+4 >                                         ^
+5 >                                          ^^^^^^^^^^^^^^^->
+1->
+2 >    createElement
+3 >                         (args: any[]) {
+  >                         
+  >                                 return {
+  >                                 }
+  >                             }
+4 >                                         
+1->Emitted(11, 5) Source(19, 21) + SourceIndex(0)
+2 >Emitted(11, 26) Source(19, 34) + SourceIndex(0)
+3 >Emitted(11, 42) Source(23, 6) + SourceIndex(0)
+4 >Emitted(11, 43) Source(23, 6) + SourceIndex(0)
+---
+>>>})(Element = exports.Element || (exports.Element = {}));
+1->
+2 >^
+3 > ^^
+4 >   ^^^^^^^
+5 >          ^^^
+6 >             ^^^^^^^^^^^^^^^
+7 >                            ^^^^^
+8 >                                 ^^^^^^^^^^^^^^^
+9 >                                                ^^^^^^^^
+1->
+  >
+2 >}
+3 > 
+4 >   Element
+5 >          
+6 >             Element
+7 >                            
+8 >                                 Element
+9 >                                                 {
+  >                                                    export function isElement(el: any): el is JSX.Element {
+  >                                                        return el.markAsChildOfRootElement !== undefined;
+  >                                                    }
+  >                                                
+  >                                                    export function createElement(args: any[]) {
+  >                                                
+  >                                                        return {
+  >                                                        }
+  >                                                    }
+  >                                                }
+1->Emitted(12, 1) Source(24, 1) + SourceIndex(0)
+2 >Emitted(12, 2) Source(24, 2) + SourceIndex(0)
+3 >Emitted(12, 4) Source(14, 18) + SourceIndex(0)
+4 >Emitted(12, 11) Source(14, 25) + SourceIndex(0)
+5 >Emitted(12, 14) Source(14, 18) + SourceIndex(0)
+6 >Emitted(12, 29) Source(14, 25) + SourceIndex(0)
+7 >Emitted(12, 34) Source(14, 18) + SourceIndex(0)
+8 >Emitted(12, 49) Source(14, 25) + SourceIndex(0)
+9 >Emitted(12, 57) Source(24, 2) + SourceIndex(0)
+---
+>>>exports.createElement = Element.createElement;
+1 >
+2 >^^^^^^^^
+3 >        ^^^^^^^^^^^^^
+4 >                     ^^^
+5 >                        ^^^^^^^
+6 >                               ^
+7 >                                ^^^^^^^^^^^^^
+8 >                                             ^
+1 >
+  >
+  >export let 
+2 >
+3 >        createElement
+4 >                      = 
+5 >                        Element
+6 >                               .
+7 >                                createElement
+8 >                                             ;
+1 >Emitted(13, 1) Source(26, 12) + SourceIndex(0)
+2 >Emitted(13, 9) Source(26, 12) + SourceIndex(0)
+3 >Emitted(13, 22) Source(26, 25) + SourceIndex(0)
+4 >Emitted(13, 25) Source(26, 28) + SourceIndex(0)
+5 >Emitted(13, 32) Source(26, 35) + SourceIndex(0)
+6 >Emitted(13, 33) Source(26, 36) + SourceIndex(0)
+7 >Emitted(13, 46) Source(26, 49) + SourceIndex(0)
+8 >Emitted(13, 47) Source(26, 50) + SourceIndex(0)
+---
+>>>function toCamelCase(text) {
+1 >
+2 >^^^^^^^^^^^^^^^^^^^^^
+3 >                     ^^^^
+4 >                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+  >
+2 >function toCamelCase(
+3 >                     text: string
+1 >Emitted(14, 1) Source(28, 1) + SourceIndex(0)
+2 >Emitted(14, 22) Source(28, 22) + SourceIndex(0)
+3 >Emitted(14, 26) Source(28, 34) + SourceIndex(0)
+---
+>>>    return text[0].toLowerCase() + text.substring(1);
+1->^^^^
+2 >    ^^^^^^
+3 >          ^
+4 >           ^^^^
+5 >               ^
+6 >                ^
+7 >                 ^
+8 >                  ^
+9 >                   ^^^^^^^^^^^
+10>                              ^^
+11>                                ^^^
+12>                                   ^^^^
+13>                                       ^
+14>                                        ^^^^^^^^^
+15>                                                 ^
+16>                                                  ^
+17>                                                   ^
+18>                                                    ^
+1->): string {
+  >    
+2 >    return
+3 >           
+4 >           text
+5 >               [
+6 >                0
+7 >                 ]
+8 >                  .
+9 >                   toLowerCase
+10>                              ()
+11>                                 + 
+12>                                   text
+13>                                       .
+14>                                        substring
+15>                                                 (
+16>                                                  1
+17>                                                   )
+18>                                                    ;
+1->Emitted(15, 5) Source(29, 5) + SourceIndex(0)
+2 >Emitted(15, 11) Source(29, 11) + SourceIndex(0)
+3 >Emitted(15, 12) Source(29, 12) + SourceIndex(0)
+4 >Emitted(15, 16) Source(29, 16) + SourceIndex(0)
+5 >Emitted(15, 17) Source(29, 17) + SourceIndex(0)
+6 >Emitted(15, 18) Source(29, 18) + SourceIndex(0)
+7 >Emitted(15, 19) Source(29, 19) + SourceIndex(0)
+8 >Emitted(15, 20) Source(29, 20) + SourceIndex(0)
+9 >Emitted(15, 31) Source(29, 31) + SourceIndex(0)
+10>Emitted(15, 33) Source(29, 33) + SourceIndex(0)
+11>Emitted(15, 36) Source(29, 36) + SourceIndex(0)
+12>Emitted(15, 40) Source(29, 40) + SourceIndex(0)
+13>Emitted(15, 41) Source(29, 41) + SourceIndex(0)
+14>Emitted(15, 50) Source(29, 50) + SourceIndex(0)
+15>Emitted(15, 51) Source(29, 51) + SourceIndex(0)
+16>Emitted(15, 52) Source(29, 52) + SourceIndex(0)
+17>Emitted(15, 53) Source(29, 53) + SourceIndex(0)
+18>Emitted(15, 54) Source(29, 54) + SourceIndex(0)
+---
+>>>}
+1 >
+2 >^
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+2 >}
+1 >Emitted(16, 1) Source(30, 1) + SourceIndex(0)
+2 >Emitted(16, 2) Source(30, 2) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=Element.js.map===================================================================
+JsFile: test.js
+mapUrl: test.js.map
+sourceRoot: 
+sources: test.tsx
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/compiler/test.js
+sourceFile:test.tsx
+-------------------------------------------------------------------
+>>>"use strict";
+>>>const Element_1 = require("./Element");
+1 >
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >import { Element} from './Element';
+1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(2, 40) Source(1, 36) + SourceIndex(0)
+---
+>>>let c;
+1 >
+2 >^^^^
+3 >    ^
+4 >     ^
+5 >      ^^^^->
+1 >
+  >
+  >
+2 >let 
+3 >    c: {
+  >    	a?: {
+  >    		b: string
+  >    	}
+  >    }
+4 >     ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 6) Source(7, 2) + SourceIndex(0)
+4 >Emitted(3, 7) Source(7, 3) + SourceIndex(0)
+---
+>>>class A {
+1->
+2 >^^^^^^^^^^^^^->
+1->
+  >
+  >
+1->Emitted(4, 1) Source(9, 1) + SourceIndex(0)
+---
+>>>    view() {
+1->^^^^
+2 >    ^^^^
+3 >        ^^^^^^^^^->
+1->class A {
+  >	
+2 >    view
+1->Emitted(5, 5) Source(10, 2) + SourceIndex(0)
+2 >Emitted(5, 9) Source(10, 6) + SourceIndex(0)
+---
+>>>        return [
+1->^^^^^^^^
+2 >        ^^^^^^
+3 >              ^
+4 >               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->() {
+  >		
+2 >        return
+3 >               
+1->Emitted(6, 9) Source(11, 3) + SourceIndex(0)
+2 >Emitted(6, 15) Source(11, 9) + SourceIndex(0)
+3 >Emitted(6, 16) Source(11, 10) + SourceIndex(0)
+---
+>>>            Element_1.Element.createElement("meta", { content: "helloworld" }),
+1->^^^^^^^^^^^^
+2 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                                      ^^^^^^^
+4 >                                                             ^^
+5 >                                                               ^^^^^^^^^^^^
+6 >                                                                           ^^^
+1->[
+  >			
+2 >            <meta 
+3 >                                                      content
+4 >                                                             =
+5 >                                                               "helloworld"
+6 >                                                                           ></meta>
+1->Emitted(7, 13) Source(12, 4) + SourceIndex(0)
+2 >Emitted(7, 55) Source(12, 10) + SourceIndex(0)
+3 >Emitted(7, 62) Source(12, 17) + SourceIndex(0)
+4 >Emitted(7, 64) Source(12, 18) + SourceIndex(0)
+5 >Emitted(7, 76) Source(12, 30) + SourceIndex(0)
+6 >Emitted(7, 79) Source(12, 38) + SourceIndex(0)
+---
+>>>            Element_1.Element.createElement("meta", { content: c.a.b })
+1 >^^^^^^^^^^^^
+2 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                                      ^^^^^^^
+4 >                                                             ^^
+5 >                                                               ^
+6 >                                                                ^
+7 >                                                                 ^
+8 >                                                                  ^
+9 >                                                                   ^
+10>                                                                    ^^^
+1 >,
+  >			
+2 >            <meta 
+3 >                                                      content
+4 >                                                             ={
+5 >                                                               c
+6 >                                                                .
+7 >                                                                 a!
+8 >                                                                  .
+9 >                                                                   b
+10>                                                                    }></meta>
+1 >Emitted(8, 13) Source(13, 4) + SourceIndex(0)
+2 >Emitted(8, 55) Source(13, 10) + SourceIndex(0)
+3 >Emitted(8, 62) Source(13, 17) + SourceIndex(0)
+4 >Emitted(8, 64) Source(13, 19) + SourceIndex(0)
+5 >Emitted(8, 65) Source(13, 20) + SourceIndex(0)
+6 >Emitted(8, 66) Source(13, 21) + SourceIndex(0)
+7 >Emitted(8, 67) Source(13, 23) + SourceIndex(0)
+8 >Emitted(8, 68) Source(13, 24) + SourceIndex(0)
+9 >Emitted(8, 69) Source(13, 25) + SourceIndex(0)
+10>Emitted(8, 72) Source(13, 34) + SourceIndex(0)
+---
+>>>        ];
+1 >^^^^^^^^^
+2 >         ^
+1 >
+  >		]
+2 >         ;
+1 >Emitted(9, 10) Source(14, 4) + SourceIndex(0)
+2 >Emitted(9, 11) Source(14, 5) + SourceIndex(0)
+---
+>>>    }
+1 >^^^^
+2 >    ^
+1 >
+  >	
+2 >    }
+1 >Emitted(10, 5) Source(15, 2) + SourceIndex(0)
+2 >Emitted(10, 6) Source(15, 3) + SourceIndex(0)
+---
+>>>}
+1 >^
+2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >}
+1 >Emitted(11, 2) Source(16, 2) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/cases/compiler/jsxFactoryIdentifier.ts b/tests/cases/compiler/jsxFactoryIdentifier.ts
index 9531abeeebf..88caf27482e 100644
--- a/tests/cases/compiler/jsxFactoryIdentifier.ts
+++ b/tests/cases/compiler/jsxFactoryIdentifier.ts
@@ -2,6 +2,7 @@
 //@target: es6
 //@module: commonjs
 //@jsxFactory: createElement
+//@sourcemap: true
 
 // @filename: Element.ts
 declare namespace JSX {
diff --git a/tests/cases/compiler/jsxFactoryQualifiedName.ts b/tests/cases/compiler/jsxFactoryQualifiedName.ts
index c8d9317138b..769b7cd566d 100644
--- a/tests/cases/compiler/jsxFactoryQualifiedName.ts
+++ b/tests/cases/compiler/jsxFactoryQualifiedName.ts
@@ -2,6 +2,7 @@
 //@target: es6
 //@module: commonjs
 //@jsxFactory: Element.createElement
+//@sourcemap: true
 
 // @filename: Element.ts
 declare namespace JSX {

From a88c2ae1e4ef79a3f076c0f7c3fcb3aabc1f1cb3 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Wed, 9 Nov 2016 13:15:13 -0800
Subject: [PATCH 163/421] Add test cases for when jsxFactory cannot be resolved

---
 .../jsxFactoryIdentifierAsParameter.js        | 24 +++++
 .../jsxFactoryIdentifierAsParameter.js.map    |  2 +
 ...FactoryIdentifierAsParameter.sourcemap.txt | 87 +++++++++++++++++++
 .../jsxFactoryIdentifierAsParameter.symbols   | 25 ++++++
 .../jsxFactoryIdentifierAsParameter.types     | 26 ++++++
 ...ryIdentifierWithAbsentParameter.errors.txt | 19 ++++
 ...jsxFactoryIdentifierWithAbsentParameter.js | 24 +++++
 ...actoryIdentifierWithAbsentParameter.js.map |  2 +
 ...dentifierWithAbsentParameter.sourcemap.txt | 81 +++++++++++++++++
 ...oryQualifiedNameResolutionError.errors.txt | 18 ++++
 .../jsxFactoryQualifiedNameResolutionError.js | 23 +++++
 ...FactoryQualifiedNameResolutionError.js.map |  2 +
 ...QualifiedNameResolutionError.sourcemap.txt | 87 +++++++++++++++++++
 .../jsxFactoryIdentifierAsParameter.ts        | 18 ++++
 ...jsxFactoryIdentifierWithAbsentParameter.ts | 18 ++++
 .../jsxFactoryQualifiedNameResolutionError.ts | 18 ++++
 16 files changed, 474 insertions(+)
 create mode 100644 tests/baselines/reference/jsxFactoryIdentifierAsParameter.js
 create mode 100644 tests/baselines/reference/jsxFactoryIdentifierAsParameter.js.map
 create mode 100644 tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt
 create mode 100644 tests/baselines/reference/jsxFactoryIdentifierAsParameter.symbols
 create mode 100644 tests/baselines/reference/jsxFactoryIdentifierAsParameter.types
 create mode 100644 tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.errors.txt
 create mode 100644 tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js
 create mode 100644 tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js.map
 create mode 100644 tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt
 create mode 100644 tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.errors.txt
 create mode 100644 tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js
 create mode 100644 tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js.map
 create mode 100644 tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt
 create mode 100644 tests/cases/compiler/jsxFactoryIdentifierAsParameter.ts
 create mode 100644 tests/cases/compiler/jsxFactoryIdentifierWithAbsentParameter.ts
 create mode 100644 tests/cases/compiler/jsxFactoryQualifiedNameResolutionError.ts

diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js
new file mode 100644
index 00000000000..ffec40ff7b6
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js
@@ -0,0 +1,24 @@
+//// [test.tsx]
+
+declare module JSX {
+    interface IntrinsicElements {
+        [s: string]: any;
+    }
+}
+
+export class AppComponent {
+    render(createElement) {
+        return <div />;
+    }
+}
+
+
+//// [test.js]
+"use strict";
+class AppComponent {
+    render(createElement) {
+        return createElement("div", null);
+    }
+}
+exports.AppComponent = AppComponent;
+//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js.map b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js.map
new file mode 100644
index 00000000000..c108b93a913
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js.map
@@ -0,0 +1,2 @@
+//// [test.js.map]
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAOA;IACI,MAAM,CAAC,aAAa;QAChB,MAAM,CAAC,0BAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt
new file mode 100644
index 00000000000..c7867fc54e0
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt
@@ -0,0 +1,87 @@
+===================================================================
+JsFile: test.js
+mapUrl: test.js.map
+sourceRoot: 
+sources: test.tsx
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/compiler/test.js
+sourceFile:test.tsx
+-------------------------------------------------------------------
+>>>"use strict";
+>>>class AppComponent {
+1 >
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >declare module JSX {
+  >    interface IntrinsicElements {
+  >        [s: string]: any;
+  >    }
+  >}
+  >
+  >
+1 >Emitted(2, 1) Source(8, 1) + SourceIndex(0)
+---
+>>>    render(createElement) {
+1->^^^^
+2 >    ^^^^^^
+3 >          ^
+4 >           ^^^^^^^^^^^^^
+5 >                        ^^^^^^^^^^^^^^^^^^^->
+1->export class AppComponent {
+  >    
+2 >    render
+3 >          (
+4 >           createElement
+1->Emitted(3, 5) Source(9, 5) + SourceIndex(0)
+2 >Emitted(3, 11) Source(9, 11) + SourceIndex(0)
+3 >Emitted(3, 12) Source(9, 12) + SourceIndex(0)
+4 >Emitted(3, 25) Source(9, 25) + SourceIndex(0)
+---
+>>>        return createElement("div", null);
+1->^^^^^^^^
+2 >        ^^^^^^
+3 >              ^
+4 >               ^^^^^^^^^^^^^^^^^^^^^^^^^^
+5 >                                         ^
+1->) {
+  >        
+2 >        return
+3 >               
+4 >               <div />
+5 >                                         ;
+1->Emitted(4, 9) Source(10, 9) + SourceIndex(0)
+2 >Emitted(4, 15) Source(10, 15) + SourceIndex(0)
+3 >Emitted(4, 16) Source(10, 16) + SourceIndex(0)
+4 >Emitted(4, 42) Source(10, 23) + SourceIndex(0)
+5 >Emitted(4, 43) Source(10, 24) + SourceIndex(0)
+---
+>>>    }
+1 >^^^^
+2 >    ^
+1 >
+  >    
+2 >    }
+1 >Emitted(5, 5) Source(11, 5) + SourceIndex(0)
+2 >Emitted(5, 6) Source(11, 6) + SourceIndex(0)
+---
+>>>}
+1 >^
+2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >}
+1 >Emitted(6, 2) Source(12, 2) + SourceIndex(0)
+---
+>>>exports.AppComponent = AppComponent;
+1->
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >export class AppComponent {
+  >    render(createElement) {
+  >        return <div />;
+  >    }
+  >}
+1->Emitted(7, 1) Source(8, 1) + SourceIndex(0)
+2 >Emitted(7, 37) Source(12, 2) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.symbols b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.symbols
new file mode 100644
index 00000000000..865292092a5
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.symbols
@@ -0,0 +1,25 @@
+=== tests/cases/compiler/test.tsx ===
+
+declare module JSX {
+>JSX : Symbol(JSX, Decl(test.tsx, 0, 0))
+
+    interface IntrinsicElements {
+>IntrinsicElements : Symbol(IntrinsicElements, Decl(test.tsx, 1, 20))
+
+        [s: string]: any;
+>s : Symbol(s, Decl(test.tsx, 3, 9))
+    }
+}
+
+export class AppComponent {
+>AppComponent : Symbol(AppComponent, Decl(test.tsx, 5, 1))
+
+    render(createElement) {
+>render : Symbol(AppComponent.render, Decl(test.tsx, 7, 27))
+>createElement : Symbol(createElement, Decl(test.tsx, 8, 11))
+
+        return <div />;
+>div : Symbol(unknown)
+    }
+}
+
diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.types b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.types
new file mode 100644
index 00000000000..d55737d98ae
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.types
@@ -0,0 +1,26 @@
+=== tests/cases/compiler/test.tsx ===
+
+declare module JSX {
+>JSX : any
+
+    interface IntrinsicElements {
+>IntrinsicElements : IntrinsicElements
+
+        [s: string]: any;
+>s : string
+    }
+}
+
+export class AppComponent {
+>AppComponent : AppComponent
+
+    render(createElement) {
+>render : (createElement: any) => any
+>createElement : any
+
+        return <div />;
+><div /> : any
+>div : any
+    }
+}
+
diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.errors.txt b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.errors.txt
new file mode 100644
index 00000000000..99e039a045f
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.errors.txt
@@ -0,0 +1,19 @@
+tests/cases/compiler/test.tsx(10,17): error TS2304: Cannot find name 'createElement'.
+
+
+==== tests/cases/compiler/test.tsx (1 errors) ====
+    
+    declare module JSX {
+        interface IntrinsicElements {
+            [s: string]: any;
+        }
+    }
+    
+    export class AppComponent {
+        render() {
+            return <div />;
+                    ~~~
+!!! error TS2304: Cannot find name 'createElement'.
+        }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js
new file mode 100644
index 00000000000..23f6f44e0c7
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js
@@ -0,0 +1,24 @@
+//// [test.tsx]
+
+declare module JSX {
+    interface IntrinsicElements {
+        [s: string]: any;
+    }
+}
+
+export class AppComponent {
+    render() {
+        return <div />;
+    }
+}
+
+
+//// [test.js]
+"use strict";
+class AppComponent {
+    render() {
+        return createElement("div", null);
+    }
+}
+exports.AppComponent = AppComponent;
+//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js.map b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js.map
new file mode 100644
index 00000000000..715014ff53f
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js.map
@@ -0,0 +1,2 @@
+//// [test.js.map]
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAOA;IACI,MAAM;QACF,MAAM,CAAC,0BAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt
new file mode 100644
index 00000000000..f1ebaf49870
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt
@@ -0,0 +1,81 @@
+===================================================================
+JsFile: test.js
+mapUrl: test.js.map
+sourceRoot: 
+sources: test.tsx
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/compiler/test.js
+sourceFile:test.tsx
+-------------------------------------------------------------------
+>>>"use strict";
+>>>class AppComponent {
+1 >
+2 >^^^^^^^^^^^^^^^->
+1 >
+  >declare module JSX {
+  >    interface IntrinsicElements {
+  >        [s: string]: any;
+  >    }
+  >}
+  >
+  >
+1 >Emitted(2, 1) Source(8, 1) + SourceIndex(0)
+---
+>>>    render() {
+1->^^^^
+2 >    ^^^^^^
+3 >          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->export class AppComponent {
+  >    
+2 >    render
+1->Emitted(3, 5) Source(9, 5) + SourceIndex(0)
+2 >Emitted(3, 11) Source(9, 11) + SourceIndex(0)
+---
+>>>        return createElement("div", null);
+1->^^^^^^^^
+2 >        ^^^^^^
+3 >              ^
+4 >               ^^^^^^^^^^^^^^^^^^^^^^^^^^
+5 >                                         ^
+1->() {
+  >        
+2 >        return
+3 >               
+4 >               <div />
+5 >                                         ;
+1->Emitted(4, 9) Source(10, 9) + SourceIndex(0)
+2 >Emitted(4, 15) Source(10, 15) + SourceIndex(0)
+3 >Emitted(4, 16) Source(10, 16) + SourceIndex(0)
+4 >Emitted(4, 42) Source(10, 23) + SourceIndex(0)
+5 >Emitted(4, 43) Source(10, 24) + SourceIndex(0)
+---
+>>>    }
+1 >^^^^
+2 >    ^
+1 >
+  >    
+2 >    }
+1 >Emitted(5, 5) Source(11, 5) + SourceIndex(0)
+2 >Emitted(5, 6) Source(11, 6) + SourceIndex(0)
+---
+>>>}
+1 >^
+2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >}
+1 >Emitted(6, 2) Source(12, 2) + SourceIndex(0)
+---
+>>>exports.AppComponent = AppComponent;
+1->
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >export class AppComponent {
+  >    render() {
+  >        return <div />;
+  >    }
+  >}
+1->Emitted(7, 1) Source(8, 1) + SourceIndex(0)
+2 >Emitted(7, 37) Source(12, 2) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.errors.txt b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.errors.txt
new file mode 100644
index 00000000000..97a05d840f0
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.errors.txt
@@ -0,0 +1,18 @@
+tests/cases/compiler/test.tsx(10,17): error TS2304: Cannot find name 'MyElement'.
+
+
+==== tests/cases/compiler/test.tsx (1 errors) ====
+    
+    declare module JSX {
+        interface IntrinsicElements {
+            [s: string]: any;
+        }
+    }
+    
+    export class AppComponent {
+        render(createElement) {
+            return <div />;
+                    ~~~
+!!! error TS2304: Cannot find name 'MyElement'.
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js
new file mode 100644
index 00000000000..6714b68a093
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js
@@ -0,0 +1,23 @@
+//// [test.tsx]
+
+declare module JSX {
+    interface IntrinsicElements {
+        [s: string]: any;
+    }
+}
+
+export class AppComponent {
+    render(createElement) {
+        return <div />;
+    }
+}
+
+//// [test.js]
+"use strict";
+class AppComponent {
+    render(createElement) {
+        return MyElement.createElement("div", null);
+    }
+}
+exports.AppComponent = AppComponent;
+//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js.map b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js.map
new file mode 100644
index 00000000000..ac54c9638cd
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js.map
@@ -0,0 +1,2 @@
+//// [test.js.map]
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAOA;IACI,MAAM,CAAC,aAAa;QAChB,MAAM,CAAC,oCAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt
new file mode 100644
index 00000000000..2616efcf63b
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt
@@ -0,0 +1,87 @@
+===================================================================
+JsFile: test.js
+mapUrl: test.js.map
+sourceRoot: 
+sources: test.tsx
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/compiler/test.js
+sourceFile:test.tsx
+-------------------------------------------------------------------
+>>>"use strict";
+>>>class AppComponent {
+1 >
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >declare module JSX {
+  >    interface IntrinsicElements {
+  >        [s: string]: any;
+  >    }
+  >}
+  >
+  >
+1 >Emitted(2, 1) Source(8, 1) + SourceIndex(0)
+---
+>>>    render(createElement) {
+1->^^^^
+2 >    ^^^^^^
+3 >          ^
+4 >           ^^^^^^^^^^^^^
+5 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->export class AppComponent {
+  >    
+2 >    render
+3 >          (
+4 >           createElement
+1->Emitted(3, 5) Source(9, 5) + SourceIndex(0)
+2 >Emitted(3, 11) Source(9, 11) + SourceIndex(0)
+3 >Emitted(3, 12) Source(9, 12) + SourceIndex(0)
+4 >Emitted(3, 25) Source(9, 25) + SourceIndex(0)
+---
+>>>        return MyElement.createElement("div", null);
+1->^^^^^^^^
+2 >        ^^^^^^
+3 >              ^
+4 >               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+5 >                                                   ^
+1->) {
+  >        
+2 >        return
+3 >               
+4 >               <div />
+5 >                                                   ;
+1->Emitted(4, 9) Source(10, 9) + SourceIndex(0)
+2 >Emitted(4, 15) Source(10, 15) + SourceIndex(0)
+3 >Emitted(4, 16) Source(10, 16) + SourceIndex(0)
+4 >Emitted(4, 52) Source(10, 23) + SourceIndex(0)
+5 >Emitted(4, 53) Source(10, 24) + SourceIndex(0)
+---
+>>>    }
+1 >^^^^
+2 >    ^
+1 >
+  >    
+2 >    }
+1 >Emitted(5, 5) Source(11, 5) + SourceIndex(0)
+2 >Emitted(5, 6) Source(11, 6) + SourceIndex(0)
+---
+>>>}
+1 >^
+2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >}
+1 >Emitted(6, 2) Source(12, 2) + SourceIndex(0)
+---
+>>>exports.AppComponent = AppComponent;
+1->
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >export class AppComponent {
+  >    render(createElement) {
+  >        return <div />;
+  >    }
+  >}
+1->Emitted(7, 1) Source(8, 1) + SourceIndex(0)
+2 >Emitted(7, 37) Source(12, 2) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/cases/compiler/jsxFactoryIdentifierAsParameter.ts b/tests/cases/compiler/jsxFactoryIdentifierAsParameter.ts
new file mode 100644
index 00000000000..bd92a473428
--- /dev/null
+++ b/tests/cases/compiler/jsxFactoryIdentifierAsParameter.ts
@@ -0,0 +1,18 @@
+//@jsx: react
+//@target: es6
+//@module: commonjs
+//@jsxFactory: createElement
+//@sourcemap: true
+
+// @filename: test.tsx
+declare module JSX {
+    interface IntrinsicElements {
+        [s: string]: any;
+    }
+}
+
+export class AppComponent {
+    render(createElement) {
+        return <div />;
+    }
+}
diff --git a/tests/cases/compiler/jsxFactoryIdentifierWithAbsentParameter.ts b/tests/cases/compiler/jsxFactoryIdentifierWithAbsentParameter.ts
new file mode 100644
index 00000000000..49e485a1085
--- /dev/null
+++ b/tests/cases/compiler/jsxFactoryIdentifierWithAbsentParameter.ts
@@ -0,0 +1,18 @@
+//@jsx: react
+//@target: es6
+//@module: commonjs
+//@jsxFactory: createElement
+//@sourcemap: true
+
+// @filename: test.tsx
+declare module JSX {
+    interface IntrinsicElements {
+        [s: string]: any;
+    }
+}
+
+export class AppComponent {
+    render() {
+        return <div />;
+    }
+}
diff --git a/tests/cases/compiler/jsxFactoryQualifiedNameResolutionError.ts b/tests/cases/compiler/jsxFactoryQualifiedNameResolutionError.ts
new file mode 100644
index 00000000000..a8996245138
--- /dev/null
+++ b/tests/cases/compiler/jsxFactoryQualifiedNameResolutionError.ts
@@ -0,0 +1,18 @@
+//@jsx: react
+//@target: es6
+//@module: commonjs
+//@jsxFactory: MyElement.createElement
+//@sourcemap: true
+
+// @filename: test.tsx
+declare module JSX {
+    interface IntrinsicElements {
+        [s: string]: any;
+    }
+}
+
+export class AppComponent {
+    render(createElement) {
+        return <div />;
+    }
+}
\ No newline at end of file

From dd7f00f20b4d34e8a374023a3286f05228ee295f Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Thu, 10 Nov 2016 08:53:32 -0800
Subject: [PATCH 164/421] Parse the jsxFactory again in the checker instead of
 using cached value in the program

---
 src/compiler/checker.ts          | 11 +++++++----
 src/compiler/program.ts          | 10 ++--------
 src/compiler/transformers/jsx.ts |  2 +-
 src/compiler/types.ts            |  3 +--
 src/compiler/utilities.ts        |  2 --
 5 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 6d5cee0362e..d8d214674d3 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -336,6 +336,8 @@ namespace ts {
 
         let jsxElementType: Type;
         let _jsxNamespace: string;
+        let _jsxFactoryEntity: EntityName;
+
         /** Things we lazy load from the JSX namespace */
         const jsxTypes = createMap<Type>();
         const JsxNames = {
@@ -377,9 +379,9 @@ namespace ts {
             if (_jsxNamespace === undefined) {
                 _jsxNamespace = "React";
                 if (compilerOptions.jsxFactory) {
-                    const jsxEntity = host.getJsxFactoryEntity();
-                    if (jsxEntity) {
-                        _jsxNamespace = getFirstIdentifier(jsxEntity).text;
+                    _jsxFactoryEntity = parseIsolatedEntityName(compilerOptions.jsxFactory, languageVersion);
+                    if (_jsxFactoryEntity) {
+                        _jsxNamespace = getFirstIdentifier(_jsxFactoryEntity).text;
                     }
                 }
                 else if (compilerOptions.reactNamespace) {
@@ -19613,7 +19615,8 @@ namespace ts {
                 getTypeReferenceDirectivesForEntityName,
                 getTypeReferenceDirectivesForSymbol,
                 isLiteralConstDeclaration,
-                writeLiteralConstValue
+                writeLiteralConstValue,
+                getJsxFactoryEntity: () => _jsxFactoryEntity
             };
 
             // defined here to avoid outer scope pollution
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 90448d197d0..213e6a95ab1 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -329,9 +329,6 @@ namespace ts {
         // Map storing if there is emit blocking diagnostics for given input
         const hasEmitBlockingDiagnostics = createFileMap<boolean>(getCanonicalFileName);
 
-        // ReactNamespace and jsxFactory information
-        let jsxFactoryEntity: EntityName;
-
         let resolveModuleNamesWorker: (moduleNames: string[], containingFile: string) => ResolvedModuleFull[];
         if (host.resolveModuleNames) {
             resolveModuleNamesWorker = (moduleNames, containingFile) => host.resolveModuleNames(moduleNames, containingFile).map(resolved => {
@@ -424,8 +421,7 @@ namespace ts {
             getFileProcessingDiagnostics: () => fileProcessingDiagnostics,
             getResolvedTypeReferenceDirectives: () => resolvedTypeReferenceDirectives,
             isSourceFileFromExternalLibrary,
-            dropDiagnosticsProducingTypeChecker,
-            getJsxFactoryEntity: () => jsxFactoryEntity
+            dropDiagnosticsProducingTypeChecker
         };
 
         verifyCompilerOptions();
@@ -731,7 +727,6 @@ namespace ts {
                 writeFile: writeFileCallback || (
                     (fileName, data, writeByteOrderMark, onError, sourceFiles) => host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles)),
                 isEmitBlocked,
-                getJsxFactoryEntity: program.getJsxFactoryEntity,
             };
         }
 
@@ -1679,8 +1674,7 @@ namespace ts {
                 if (options.reactNamespace) {
                     programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_with_option_1, "reactNamespace", "jsxFactory"));
                 }
-                jsxFactoryEntity = parseIsolatedEntityName(options.jsxFactory, languageVersion);
-                if (!jsxFactoryEntity) {
+                if (!parseIsolatedEntityName(options.jsxFactory, languageVersion)) {
                     programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Invalid_value_for_jsxFactory_0_is_not_a_valid_identifier_or_qualified_name, options.jsxFactory));
                 }
             }
diff --git a/src/compiler/transformers/jsx.ts b/src/compiler/transformers/jsx.ts
index 874f4f6862f..ba762cc5f12 100644
--- a/src/compiler/transformers/jsx.ts
+++ b/src/compiler/transformers/jsx.ts
@@ -114,7 +114,7 @@ namespace ts {
             }
 
             const element = createExpressionForJsxElement(
-                context.getEmitHost().getJsxFactoryEntity(),
+                context.getEmitResolver().getJsxFactoryEntity(),
                 compilerOptions.reactNamespace,
                 tagName,
                 objectProperties,
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 09d32ad817e..08e117d23e7 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -2177,7 +2177,6 @@ namespace ts {
         getTypeChecker(): TypeChecker;
 
         /* @internal */ getCommonSourceDirectory(): string;
-        /* @internal */ getJsxFactoryEntity(): EntityName;
 
         // For testing purposes only.  Should not be used by any other consumers (including the
         // language service).
@@ -2251,7 +2250,6 @@ namespace ts {
     /* @internal */
     export interface TypeCheckerHost {
         getCompilerOptions(): CompilerOptions;
-        getJsxFactoryEntity(): EntityName;
 
         getSourceFiles(): SourceFile[];
         getSourceFile(fileName: string): SourceFile;
@@ -2475,6 +2473,7 @@ namespace ts {
         getTypeReferenceDirectivesForSymbol(symbol: Symbol, meaning?: SymbolFlags): string[];
         isLiteralConstDeclaration(node: VariableDeclaration | PropertyDeclaration | PropertySignature | ParameterDeclaration): boolean;
         writeLiteralConstValue(node: VariableDeclaration | PropertyDeclaration | PropertySignature | ParameterDeclaration, writer: SymbolWriter): void;
+        getJsxFactoryEntity(): EntityName;
     }
 
     export const enum SymbolFlags {
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 826beccc7b1..299f91be662 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -34,8 +34,6 @@ namespace ts {
         /* @internal */
         isSourceFileFromExternalLibrary(file: SourceFile): boolean;
 
-        /* @internal */
-        getJsxFactoryEntity(): EntityName;
         getCommonSourceDirectory(): string;
         getCanonicalFileName(fileName: string): string;
         getNewLine(): string;

From 2170ff6f16005ff03deb0f19806095c6c5a68c8d Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Thu, 10 Nov 2016 09:11:21 -0800
Subject: [PATCH 165/421] Defer resolution of mapped types to enable recursive
 definitions

---
 src/compiler/checker.ts | 76 +++++++++++++++++++++--------------------
 src/compiler/types.ts   |  9 +++--
 2 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index cfabcd3f5ba..14e01cbc3a2 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -2542,18 +2542,18 @@ namespace ts {
                     writePunctuation(writer, SyntaxKind.OpenBraceToken);
                     writer.writeLine();
                     writer.increaseIndent();
-                    if (type.isReadonly) {
+                    if (type.declaration.readonlyToken) {
                         writeKeyword(writer, SyntaxKind.ReadonlyKeyword);
                         writeSpace(writer);
                     }
                     writePunctuation(writer, SyntaxKind.OpenBracketToken);
-                    appendSymbolNameOnly(type.typeParameter.symbol, writer);
+                    appendSymbolNameOnly(getTypeParameterFromMappedType(type).symbol, writer);
                     writeSpace(writer);
                     writeKeyword(writer, SyntaxKind.InKeyword);
                     writeSpace(writer);
                     writeType(getConstraintTypeFromMappedType(type), TypeFormatFlags.None);
                     writePunctuation(writer, SyntaxKind.CloseBracketToken);
-                    if (type.isOptional) {
+                    if (type.declaration.questionToken) {
                         writePunctuation(writer, SyntaxKind.QuestionToken);
                     }
                     writePunctuation(writer, SyntaxKind.ColonToken);
@@ -4452,26 +4452,29 @@ namespace ts {
             const members: SymbolTable = createMap<Symbol>();
             let stringIndexInfo: IndexInfo;
             let numberIndexInfo: IndexInfo;
+            const typeParameter = getTypeParameterFromMappedType(type);
             const constraintType = getConstraintTypeFromMappedType(type);
+            const templateType = getTemplateTypeFromMappedType(type);
+            const isReadonly = !!type.declaration.readonlyToken;
+            const isOptional = !!type.declaration.questionToken;
             const keyType = constraintType.flags & TypeFlags.TypeParameter ? getApparentType(constraintType) : constraintType;
             const iterationType = keyType.flags & TypeFlags.Index ? getIndexType(getApparentType((<IndexType>keyType).type)) : keyType;
             forEachType(iterationType, t => {
-                const iterationMapper = createUnaryTypeMapper(type.typeParameter, t);
+                const iterationMapper = createUnaryTypeMapper(typeParameter, t);
                 const templateMapper = type.mapper ? combineTypeMappers(type.mapper, iterationMapper) : iterationMapper;
-                const propType = instantiateType(type.templateType, templateMapper);
+                const propType = instantiateType(templateType, templateMapper);
                 if (t.flags & (TypeFlags.StringLiteral | TypeFlags.NumberLiteral | TypeFlags.EnumLiteral)) {
                     const propName = (<LiteralType>t).text;
-                    const optionalFlag = type.isOptional ? SymbolFlags.Optional : 0;
-                    const prop = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | optionalFlag, propName);
-                    prop.type = addOptionality(propType, type.isOptional);
-                    prop.isReadonly = type.isReadonly;
+                    const prop = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | (isOptional ? SymbolFlags.Optional : 0), propName);
+                    prop.type = addOptionality(propType, isOptional);
+                    prop.isReadonly = isReadonly;
                     members[propName] = prop;
                 }
                 else if (t.flags & TypeFlags.String) {
-                    stringIndexInfo = createIndexInfo(propType, type.isReadonly);
+                    stringIndexInfo = createIndexInfo(propType, isReadonly);
                 }
                 else if (t.flags & TypeFlags.Number) {
-                    numberIndexInfo = createIndexInfo(propType, type.isReadonly);
+                    numberIndexInfo = createIndexInfo(propType, isReadonly);
                 }
             });
             if (stringIndexInfo && numberIndexInfo && isTypeIdenticalTo(stringIndexInfo.type, numberIndexInfo.type)) {
@@ -4480,12 +4483,21 @@ namespace ts {
             setStructuredTypeMembers(type, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
         }
 
+        function getTypeParameterFromMappedType(type: MappedType) {
+            return type.typeParameter ||
+                (type.typeParameter = getDeclaredTypeOfTypeParameter(getSymbolOfNode(type.declaration.typeParameter)));
+        }
+
         function getConstraintTypeFromMappedType(type: MappedType) {
-            return instantiateType(getConstraintOfTypeParameter(type.typeParameter), type.mapper || identityMapper);
+            return type.constraintType ||
+                (type.constraintType = instantiateType(getConstraintOfTypeParameter(getTypeParameterFromMappedType(type)), type.mapper || identityMapper) || unknownType);
         }
 
         function getTemplateTypeFromMappedType(type: MappedType) {
-            return instantiateType(type.templateType, type.mapper || identityMapper);
+            return type.templateType ||
+                (type.templateType = type.declaration.type ?
+                    instantiateType(getTypeFromTypeNode(type.declaration.type), type.mapper || identityMapper) :
+                    unknownType);
         }
 
         function isGenericMappedType(type: Type) {
@@ -5949,22 +5961,11 @@ namespace ts {
         function getTypeFromMappedTypeNode(node: MappedTypeNode, aliasSymbol?: Symbol, aliasTypeArguments?: Type[]): Type {
             const links = getNodeLinks(node);
             if (!links.resolvedType) {
-                const typeParameter = getDeclaredTypeOfTypeParameter(getSymbolOfNode(node.typeParameter));
-                const constraintType = getConstraintOfTypeParameter(typeParameter);
-                const keyType = constraintType && constraintType.flags & TypeFlags.TypeParameter ? getApparentTypeOfTypeParameter(<TypeParameter>constraintType) : constraintType;
-                if (keyType && (keyType.flags & TypeFlags.Index || checkTypeAssignableTo(keyType, stringOrNumberType, node.typeParameter.constraint))) {
-                    const type = <MappedType>createObjectType(ObjectFlags.Mapped, node.symbol);
-                    type.typeParameter = typeParameter;
-                    type.templateType = node.type ? getTypeFromTypeNode(node.type) : unknownType;
-                    type.isReadonly = !!node.readonlyToken;
-                    type.isOptional = !!node.questionToken;
-                    type.aliasSymbol = aliasSymbol;
-                    type.aliasTypeArguments = aliasTypeArguments;
-                    links.resolvedType = type;
-                }
-                else {
-                    links.resolvedType = unknownType;
-                }
+                const type = <MappedType>createObjectType(ObjectFlags.Mapped, node.symbol);
+                type.declaration = node;
+                type.aliasSymbol = aliasSymbol;
+                type.aliasTypeArguments = aliasTypeArguments;
+                links.resolvedType = type;
             }
             return links.resolvedType;
         }
@@ -6326,11 +6327,8 @@ namespace ts {
 
         function instantiateMappedType(type: MappedType, mapper: TypeMapper): MappedType {
             const result = <MappedType>createObjectType(ObjectFlags.Mapped | ObjectFlags.Instantiated, type.symbol);
-            result.typeParameter = type.typeParameter;
-            result.templateType = type.templateType;
-            result.isReadonly = type.isReadonly;
-            result.isOptional = type.isOptional;
-            result.mapper = type.objectFlags & ObjectFlags.Instantiated ? combineTypeMappers(type.mapper, mapper) : mapper;
+            result.declaration = type.declaration;
+            result.mapper = type.mapper ? combineTypeMappers(type.mapper, mapper) : mapper;
             result.aliasSymbol = type.aliasSymbol;
             result.aliasTypeArguments = instantiateTypes(type.aliasTypeArguments, mapper);
             return result;
@@ -6390,8 +6388,8 @@ namespace ts {
 
         function isTopLevelTypeAlias(symbol: Symbol) {
             if (symbol.declarations && symbol.declarations.length) {
-                const declaration = symbol.declarations[0];
-                return declaration.kind === SyntaxKind.SourceFile || declaration.kind === SyntaxKind.ModuleBlock;
+                const parentKind = symbol.declarations[0].parent.kind;
+                return parentKind === SyntaxKind.SourceFile || parentKind === SyntaxKind.ModuleBlock;
             }
             return false;
         }
@@ -6400,7 +6398,7 @@ namespace ts {
             if (type && mapper !== identityMapper) {
                 if (type.aliasSymbol && isTopLevelTypeAlias(type.aliasSymbol)) {
                     if (type.aliasTypeArguments) {
-                        return getTypeAliasInstantiation(type.aliasSymbol, instantiateList(type.aliasTypeArguments, mapper, instantiateType));
+                        return getTypeAliasInstantiation(type.aliasSymbol, instantiateTypes(type.aliasTypeArguments, mapper));
                     }
                     return type;
                 }
@@ -15311,6 +15309,10 @@ namespace ts {
 
         function checkMappedType(node: MappedTypeNode) {
             getTypeFromMappedTypeNode(node);
+            // const type = <MappedType>getTypeFromMappedTypeNode(node);
+            // const constraintType = getConstraintTypeFromMappedType(type);
+            // const keyType = constraintType.flags & TypeFlags.TypeParameter ? getApparentTypeOfTypeParameter(<TypeParameter>constraintType) : constraintType;
+            // checkTypeAssignableTo(keyType, stringOrNumberType, node.typeParameter.constraint);
         }
 
         function isPrivateWithinAmbient(node: Node): boolean {
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 99d776650b4..13b313f1689 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -2849,11 +2849,10 @@ namespace ts {
 
     /* @internal */
     export interface MappedType extends ObjectType {
-        typeParameter: TypeParameter;
-        templateType: Type;
-        isReadonly: boolean;
-        isOptional: boolean;
-        // target?: MappedType;  // Instantiation target
+        declaration: MappedTypeNode;
+        typeParameter?: TypeParameter;
+        constraintType?: Type;
+        templateType?: Type;
         mapper?: TypeMapper;  // Instantiation mapper
     }
 

From c05e226c4bbf43cf0b1b8ad451b9046e349ed310 Mon Sep 17 00:00:00 2001
From: Myles Megyesi <mylesmegyesi@users.noreply.github.com>
Date: Thu, 10 Nov 2016 11:31:27 -0600
Subject: [PATCH 166/421] Adds error message for incompatible assignment of
 identically named type

Fixes issue #12050
---
 src/compiler/checker.ts                       | 12 ++++++++---
 src/compiler/diagnosticMessages.json          |  4 ++++
 ...signmentOfIdenticallyNamedTypes.errors.txt | 15 ++++++++++++++
 ...atibleAssignmentOfIdenticallyNamedTypes.js | 20 +++++++++++++++++++
 ...atibleAssignmentOfIdenticallyNamedTypes.ts |  8 ++++++++
 5 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 tests/baselines/reference/incompatibleAssignmentOfIdenticallyNamedTypes.errors.txt
 create mode 100644 tests/baselines/reference/incompatibleAssignmentOfIdenticallyNamedTypes.js
 create mode 100644 tests/cases/compiler/incompatibleAssignmentOfIdenticallyNamedTypes.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 9128398299c..6dad58ebe02 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -6824,9 +6824,15 @@ namespace ts {
                 }
 
                 if (!message) {
-                    message = relation === comparableRelation ?
-                        Diagnostics.Type_0_is_not_comparable_to_type_1 :
-                        Diagnostics.Type_0_is_not_assignable_to_type_1;
+                    if (relation === comparableRelation) {
+                        message = Diagnostics.Type_0_is_not_comparable_to_type_1;
+                    }
+                    else if (sourceType === targetType) {
+                        message = Diagnostics.Type_0_is_not_assignable_to_type_1_Two_different_types_with_this_name_exist_but_they_are_unrelated;
+                    }
+                    else {
+                        message = Diagnostics.Type_0_is_not_assignable_to_type_1;
+                    }
                 }
 
                 reportError(message, sourceType, targetType);
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 5bcc255c0a5..bc2ab6c3ff4 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -3170,5 +3170,9 @@
     "Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig": {
         "category": "Error",
         "code": 90009
+    },
+    "Type '{0}' is not assignable to type '{1}'. Two different types with this name exist, but they are unrelated.": {
+        "category": "Error",
+        "code": 90010
     }
 }
diff --git a/tests/baselines/reference/incompatibleAssignmentOfIdenticallyNamedTypes.errors.txt b/tests/baselines/reference/incompatibleAssignmentOfIdenticallyNamedTypes.errors.txt
new file mode 100644
index 00000000000..3f1de47c347
--- /dev/null
+++ b/tests/baselines/reference/incompatibleAssignmentOfIdenticallyNamedTypes.errors.txt
@@ -0,0 +1,15 @@
+tests/cases/compiler/incompatibleAssignmentOfIdenticallyNamedTypes.ts(6,9): error TS90010: Type 'T' is not assignable to type 'T'. Two different types with this name exist, but they are unrelated.
+
+
+==== tests/cases/compiler/incompatibleAssignmentOfIdenticallyNamedTypes.ts (1 errors) ====
+    interface T { }
+    declare const a: T;
+    class Foo<T> {
+        x: T;
+        fn() {
+            this.x = a;
+            ~~~~~~
+!!! error TS90010: Type 'T' is not assignable to type 'T'. Two different types with this name exist, but they are unrelated.
+        }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/incompatibleAssignmentOfIdenticallyNamedTypes.js b/tests/baselines/reference/incompatibleAssignmentOfIdenticallyNamedTypes.js
new file mode 100644
index 00000000000..677d177a4d0
--- /dev/null
+++ b/tests/baselines/reference/incompatibleAssignmentOfIdenticallyNamedTypes.js
@@ -0,0 +1,20 @@
+//// [incompatibleAssignmentOfIdenticallyNamedTypes.ts]
+interface T { }
+declare const a: T;
+class Foo<T> {
+    x: T;
+    fn() {
+        this.x = a;
+    }
+}
+
+
+//// [incompatibleAssignmentOfIdenticallyNamedTypes.js]
+var Foo = (function () {
+    function Foo() {
+    }
+    Foo.prototype.fn = function () {
+        this.x = a;
+    };
+    return Foo;
+}());
diff --git a/tests/cases/compiler/incompatibleAssignmentOfIdenticallyNamedTypes.ts b/tests/cases/compiler/incompatibleAssignmentOfIdenticallyNamedTypes.ts
new file mode 100644
index 00000000000..493feef1fd7
--- /dev/null
+++ b/tests/cases/compiler/incompatibleAssignmentOfIdenticallyNamedTypes.ts
@@ -0,0 +1,8 @@
+interface T { }
+declare const a: T;
+class Foo<T> {
+    x: T;
+    fn() {
+        this.x = a;
+    }
+}

From 2eba10a25b85150075fd55348e2bd86d6271b54c Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Thu, 10 Nov 2016 08:53:32 -0800
Subject: [PATCH 167/421] Updated condition for more readability

---
 src/compiler/program.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 15e08842e76..7f614494e3b 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -1006,11 +1006,10 @@ namespace ts {
                                 return;
                             }
                             // pass through
-                            let isConstInvalid = true;
                         case SyntaxKind.VariableStatement:
                             // Check modifiers
                             if (nodes === (<ClassDeclaration | FunctionLikeDeclaration | VariableStatement>parent).modifiers) {
-                                return checkModifiers(<NodeArray<Modifier>>nodes, !isConstInvalid);
+                                return checkModifiers(<NodeArray<Modifier>>nodes, parent.kind === SyntaxKind.VariableStatement);
                             }
                             break;
                         case SyntaxKind.PropertyDeclaration:

From 0422a756d9d2d785bad1ef6d3fa2d6155b910f5e Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Thu, 10 Nov 2016 10:15:42 -0800
Subject: [PATCH 168/421] Add test with a referenced dts file

---
 .../reference/commonSourceDirectory_dts.js    | 21 ++++++++++
 .../commonSourceDirectory_dts.js.map          |  2 +
 .../commonSourceDirectory_dts.sourcemap.txt   | 42 +++++++++++++++++++
 .../commonSourceDirectory_dts.symbols         | 12 ++++++
 .../reference/commonSourceDirectory_dts.types | 12 ++++++
 .../compiler/commonSourceDirectory_dts.ts     | 22 ++++++++++
 6 files changed, 111 insertions(+)
 create mode 100644 tests/baselines/reference/commonSourceDirectory_dts.js
 create mode 100644 tests/baselines/reference/commonSourceDirectory_dts.js.map
 create mode 100644 tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt
 create mode 100644 tests/baselines/reference/commonSourceDirectory_dts.symbols
 create mode 100644 tests/baselines/reference/commonSourceDirectory_dts.types
 create mode 100644 tests/cases/compiler/commonSourceDirectory_dts.ts

diff --git a/tests/baselines/reference/commonSourceDirectory_dts.js b/tests/baselines/reference/commonSourceDirectory_dts.js
new file mode 100644
index 00000000000..8aa0bd04e11
--- /dev/null
+++ b/tests/baselines/reference/commonSourceDirectory_dts.js
@@ -0,0 +1,21 @@
+//// [tests/cases/compiler/commonSourceDirectory_dts.ts] ////
+
+//// [bar.d.ts]
+// Test that importing a file from `node_modules` does not affect calculation of the common source directory.
+
+declare const y: number;
+
+//// [index.ts]
+/// <reference path="../lib/bar.d.ts" />
+export const x = y;
+
+
+//// [/app/bin/index.js]
+"use strict";
+/// <reference path="../lib/bar.d.ts" />
+exports.x = y;
+//# sourceMappingURL=/app/myMapRoot/index.js.map
+
+//// [/app/bin/index.d.ts]
+/// <reference path="../lib/bar.d.ts" />
+export declare const x: number;
diff --git a/tests/baselines/reference/commonSourceDirectory_dts.js.map b/tests/baselines/reference/commonSourceDirectory_dts.js.map
new file mode 100644
index 00000000000..b33518dd04c
--- /dev/null
+++ b/tests/baselines/reference/commonSourceDirectory_dts.js.map
@@ -0,0 +1,2 @@
+//// [/app/bin/index.js.map]
+{"version":3,"file":"index.js","sourceRoot":"/app/mySourceRoot/","sources":["index.ts"],"names":[],"mappings":";AAAA,wCAAwC;AAC3B,QAAA,CAAC,GAAG,CAAC,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt b/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt
new file mode 100644
index 00000000000..90603ae3652
--- /dev/null
+++ b/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt
@@ -0,0 +1,42 @@
+===================================================================
+JsFile: index.js
+mapUrl: /app/myMapRoot/index.js.map
+sourceRoot: /app/mySourceRoot/
+sources: index.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:/app/bin/index.js
+sourceFile:index.ts
+-------------------------------------------------------------------
+>>>"use strict";
+>>>/// <reference path="../lib/bar.d.ts" />
+1 >
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path="../lib/bar.d.ts" />
+1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(2, 41) Source(1, 41) + SourceIndex(0)
+---
+>>>exports.x = y;
+1 >
+2 >^^^^^^^^
+3 >        ^
+4 >         ^^^
+5 >            ^
+6 >             ^
+7 >              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >export const 
+2 >
+3 >        x
+4 >          = 
+5 >            y
+6 >             ;
+1 >Emitted(3, 1) Source(2, 14) + SourceIndex(0)
+2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0)
+3 >Emitted(3, 10) Source(2, 15) + SourceIndex(0)
+4 >Emitted(3, 13) Source(2, 18) + SourceIndex(0)
+5 >Emitted(3, 14) Source(2, 19) + SourceIndex(0)
+6 >Emitted(3, 15) Source(2, 20) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=/app/myMapRoot/index.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/commonSourceDirectory_dts.symbols b/tests/baselines/reference/commonSourceDirectory_dts.symbols
new file mode 100644
index 00000000000..740a8aef921
--- /dev/null
+++ b/tests/baselines/reference/commonSourceDirectory_dts.symbols
@@ -0,0 +1,12 @@
+=== /app/src/index.ts ===
+/// <reference path="../lib/bar.d.ts" />
+export const x = y;
+>x : Symbol(x, Decl(index.ts, 1, 12))
+>y : Symbol(y, Decl(bar.d.ts, 2, 13))
+
+=== /app/lib/bar.d.ts ===
+// Test that importing a file from `node_modules` does not affect calculation of the common source directory.
+
+declare const y: number;
+>y : Symbol(y, Decl(bar.d.ts, 2, 13))
+
diff --git a/tests/baselines/reference/commonSourceDirectory_dts.types b/tests/baselines/reference/commonSourceDirectory_dts.types
new file mode 100644
index 00000000000..b41b91c978f
--- /dev/null
+++ b/tests/baselines/reference/commonSourceDirectory_dts.types
@@ -0,0 +1,12 @@
+=== /app/src/index.ts ===
+/// <reference path="../lib/bar.d.ts" />
+export const x = y;
+>x : number
+>y : number
+
+=== /app/lib/bar.d.ts ===
+// Test that importing a file from `node_modules` does not affect calculation of the common source directory.
+
+declare const y: number;
+>y : number
+
diff --git a/tests/cases/compiler/commonSourceDirectory_dts.ts b/tests/cases/compiler/commonSourceDirectory_dts.ts
new file mode 100644
index 00000000000..3a3dfea1772
--- /dev/null
+++ b/tests/cases/compiler/commonSourceDirectory_dts.ts
@@ -0,0 +1,22 @@
+// Test that importing a file from `node_modules` does not affect calculation of the common source directory.
+// @noImplicitReferences: true
+// @moduleResolution: node
+// @fullEmitPaths: true
+
+// @filename: /app/lib/bar.d.ts
+declare const y: number;
+
+// @filename: /app/src/index.ts
+/// <reference path="../lib/bar.d.ts" />
+export const x = y;
+
+// @filename: /app/tsconfig.json
+{
+    "compilerOptions": {
+        "outDir": "bin",
+        "sourceMap": true,
+        "mapRoot": "myMapRoot",
+        "sourceRoot": "mySourceRoot",
+        "declaration": true
+    }
+}

From b81c226639c88be0c26c44c951445b32db1757eb Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Thu, 10 Nov 2016 10:31:24 -0800
Subject: [PATCH 169/421] Use pull model to obtain type alias information for
 type nodes

---
 src/compiler/checker.ts | 78 +++++++++++++++++++++++------------------
 1 file changed, 43 insertions(+), 35 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 14e01cbc3a2..8f7d8aa0d61 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -3685,7 +3685,7 @@ namespace ts {
         function getInstantiatedConstructorsForTypeArguments(type: Type, typeArgumentNodes: TypeNode[]): Signature[] {
             let signatures = getConstructorsForTypeArguments(type, typeArgumentNodes);
             if (typeArgumentNodes) {
-                const typeArguments = map(typeArgumentNodes, getTypeFromTypeNodeNoAlias);
+                const typeArguments = map(typeArgumentNodes, getTypeFromTypeNode);
                 signatures = map(signatures, sig => getSignatureInstantiation(sig, typeArguments));
             }
             return signatures;
@@ -3896,7 +3896,6 @@ namespace ts {
                     return unknownType;
                 }
 
-                const typeParameters = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol);
                 let declaration: JSDocTypedefTag | TypeAliasDeclaration = <JSDocTypedefTag>getDeclarationOfKind(symbol, SyntaxKind.JSDocTypedefTag);
                 let type: Type;
                 if (declaration) {
@@ -3909,16 +3908,17 @@ namespace ts {
                 }
                 else {
                     declaration = <TypeAliasDeclaration>getDeclarationOfKind(symbol, SyntaxKind.TypeAliasDeclaration);
-                    type = getTypeFromTypeNode(declaration.type, symbol, typeParameters);
+                    type = getTypeFromTypeNode(declaration.type);
                 }
 
                 if (popTypeResolution()) {
-                    links.typeParameters = typeParameters;
+                    const typeParameters = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol);
                     if (typeParameters) {
                         // Initialize the instantiation cache for generic type aliases. The declared type corresponds to
                         // an instantiation of the type alias with the type parameters supplied as type arguments.
+                        links.typeParameters = typeParameters;
                         links.instantiations = createMap<Type>();
-                        links.instantiations[getTypeListId(links.typeParameters)] = type;
+                        links.instantiations[getTypeListId(typeParameters)] = type;
                     }
                 }
                 else {
@@ -4254,7 +4254,7 @@ namespace ts {
                 return [createSignature(undefined, classType.localTypeParameters, undefined, emptyArray, classType, /*typePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false)];
             }
             const baseTypeNode = getBaseTypeNodeOfClass(classType);
-            const typeArguments = map(baseTypeNode.typeArguments, getTypeFromTypeNodeNoAlias);
+            const typeArguments = map(baseTypeNode.typeArguments, getTypeFromTypeNode);
             const typeArgCount = typeArguments ? typeArguments.length : 0;
             const result: Signature[] = [];
             for (const baseSig of baseSignatures) {
@@ -5270,7 +5270,7 @@ namespace ts {
                 // In a type reference, the outer type parameters of the referenced class or interface are automatically
                 // supplied as type arguments and the type reference only specifies arguments for the local type parameters
                 // of the class or interface.
-                return createTypeReference(<GenericType>type, concatenate(type.outerTypeParameters, map(node.typeArguments, getTypeFromTypeNodeNoAlias)));
+                return createTypeReference(<GenericType>type, concatenate(type.outerTypeParameters, map(node.typeArguments, getTypeFromTypeNode)));
             }
             if (node.typeArguments) {
                 error(node, Diagnostics.Type_0_is_not_generic, typeToString(type));
@@ -5298,7 +5298,7 @@ namespace ts {
                     error(node, Diagnostics.Generic_type_0_requires_1_type_argument_s, symbolToString(symbol), typeParameters.length);
                     return unknownType;
                 }
-                const typeArguments = map(node.typeArguments, getTypeFromTypeNodeNoAlias);
+                const typeArguments = map(node.typeArguments, getTypeFromTypeNode);
                 return getTypeAliasInstantiation(symbol, typeArguments);
             }
             if (node.typeArguments) {
@@ -5550,7 +5550,7 @@ namespace ts {
         function getTypeFromTupleTypeNode(node: TupleTypeNode): Type {
             const links = getNodeLinks(node);
             if (!links.resolvedType) {
-                links.resolvedType = createTupleType(map(node.elementTypes, getTypeFromTypeNodeNoAlias));
+                links.resolvedType = createTupleType(map(node.elementTypes, getTypeFromTypeNode));
             }
             return links.resolvedType;
         }
@@ -5740,10 +5740,11 @@ namespace ts {
             return type;
         }
 
-        function getTypeFromUnionTypeNode(node: UnionTypeNode, aliasSymbol?: Symbol, aliasTypeArguments?: Type[]): Type {
+        function getTypeFromUnionTypeNode(node: UnionTypeNode): Type {
             const links = getNodeLinks(node);
             if (!links.resolvedType) {
-                links.resolvedType = getUnionType(map(node.types, getTypeFromTypeNodeNoAlias), /*subtypeReduction*/ false, aliasSymbol, aliasTypeArguments);
+                links.resolvedType = getUnionType(map(node.types, getTypeFromTypeNode), /*subtypeReduction*/ false,
+                    getAliasSymbolForTypeNode(node), getAliasTypeArgumentsForTypeNode(node));
             }
             return links.resolvedType;
         }
@@ -5811,10 +5812,11 @@ namespace ts {
             return type;
         }
 
-        function getTypeFromIntersectionTypeNode(node: IntersectionTypeNode, aliasSymbol?: Symbol, aliasTypeArguments?: Type[]): Type {
+        function getTypeFromIntersectionTypeNode(node: IntersectionTypeNode): Type {
             const links = getNodeLinks(node);
             if (!links.resolvedType) {
-                links.resolvedType = getIntersectionType(map(node.types, getTypeFromTypeNodeNoAlias), aliasSymbol, aliasTypeArguments);
+                links.resolvedType = getIntersectionType(map(node.types, getTypeFromTypeNode),
+                    getAliasSymbolForTypeNode(node), getAliasTypeArgumentsForTypeNode(node));
             }
             return links.resolvedType;
         }
@@ -5847,7 +5849,7 @@ namespace ts {
         function getTypeFromTypeOperatorNode(node: TypeOperatorNode) {
             const links = getNodeLinks(node);
             if (!links.resolvedType) {
-                links.resolvedType = getIndexType(getTypeFromTypeNodeNoAlias(node.type));
+                links.resolvedType = getIndexType(getTypeFromTypeNode(node.type));
             }
             return links.resolvedType;
         }
@@ -5953,40 +5955,50 @@ namespace ts {
         function getTypeFromIndexedAccessTypeNode(node: IndexedAccessTypeNode) {
             const links = getNodeLinks(node);
             if (!links.resolvedType) {
-                links.resolvedType = getIndexedAccessType(getTypeFromTypeNodeNoAlias(node.objectType), getTypeFromTypeNodeNoAlias(node.indexType), node);
+                links.resolvedType = getIndexedAccessType(getTypeFromTypeNode(node.objectType), getTypeFromTypeNode(node.indexType), node);
             }
             return links.resolvedType;
         }
 
-        function getTypeFromMappedTypeNode(node: MappedTypeNode, aliasSymbol?: Symbol, aliasTypeArguments?: Type[]): Type {
+        function getTypeFromMappedTypeNode(node: MappedTypeNode): Type {
             const links = getNodeLinks(node);
             if (!links.resolvedType) {
                 const type = <MappedType>createObjectType(ObjectFlags.Mapped, node.symbol);
                 type.declaration = node;
-                type.aliasSymbol = aliasSymbol;
-                type.aliasTypeArguments = aliasTypeArguments;
+                type.aliasSymbol = getAliasSymbolForTypeNode(node);
+                type.aliasTypeArguments = getAliasTypeArgumentsForTypeNode(node);
                 links.resolvedType = type;
             }
             return links.resolvedType;
         }
 
-        function getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node: Node, aliasSymbol?: Symbol, aliasTypeArguments?: Type[]): Type {
+        function getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node: TypeNode): Type {
             const links = getNodeLinks(node);
             if (!links.resolvedType) {
                 // Deferred resolution of members is handled by resolveObjectTypeMembers
-                if (isEmpty(node.symbol.members) && !aliasSymbol && !aliasTypeArguments) {
+                const aliasSymbol = getAliasSymbolForTypeNode(node);
+                if (isEmpty(node.symbol.members) && !aliasSymbol) {
                     links.resolvedType = emptyTypeLiteralType;
                 }
                 else {
                     const type = createObjectType(ObjectFlags.Anonymous, node.symbol);
                     type.aliasSymbol = aliasSymbol;
-                    type.aliasTypeArguments = aliasTypeArguments;
+                    type.aliasTypeArguments = getAliasTypeArgumentsForTypeNode(node);
                     links.resolvedType = type;
                 }
             }
             return links.resolvedType;
         }
 
+        function getAliasSymbolForTypeNode(node: TypeNode) {
+            return node.parent.kind === SyntaxKind.TypeAliasDeclaration ? getSymbolOfNode(node.parent) : undefined;
+        }
+
+        function getAliasTypeArgumentsForTypeNode(node: TypeNode) {
+            const symbol = getAliasSymbolForTypeNode(node);
+            return symbol ? getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol) : undefined;
+        }
+
         function createLiteralType(flags: TypeFlags, text: string) {
             const type = <LiteralType>createType(flags);
             type.text = text;
@@ -6034,7 +6046,7 @@ namespace ts {
         function getTypeFromJSDocTupleType(node: JSDocTupleType): Type {
             const links = getNodeLinks(node);
             if (!links.resolvedType) {
-                const types = map(node.types, getTypeFromTypeNodeNoAlias);
+                const types = map(node.types, getTypeFromTypeNode);
                 links.resolvedType = createTupleType(types);
             }
             return links.resolvedType;
@@ -6061,11 +6073,7 @@ namespace ts {
             return links.resolvedType;
         }
 
-        function getTypeFromTypeNodeNoAlias(type: TypeNode) {
-            return getTypeFromTypeNode(type, /*aliasSymbol*/ undefined, /*aliasTypeArguments*/ undefined);
-        }
-
-        function getTypeFromTypeNode(node: TypeNode, aliasSymbol?: Symbol, aliasTypeArguments?: Type[]): Type {
+        function getTypeFromTypeNode(node: TypeNode): Type {
             switch (node.kind) {
                 case SyntaxKind.AnyKeyword:
                 case SyntaxKind.JSDocAllType:
@@ -6116,9 +6124,9 @@ namespace ts {
                     return getTypeFromTupleTypeNode(<TupleTypeNode>node);
                 case SyntaxKind.UnionType:
                 case SyntaxKind.JSDocUnionType:
-                    return getTypeFromUnionTypeNode(<UnionTypeNode>node, aliasSymbol, aliasTypeArguments);
+                    return getTypeFromUnionTypeNode(<UnionTypeNode>node);
                 case SyntaxKind.IntersectionType:
-                    return getTypeFromIntersectionTypeNode(<IntersectionTypeNode>node, aliasSymbol, aliasTypeArguments);
+                    return getTypeFromIntersectionTypeNode(<IntersectionTypeNode>node);
                 case SyntaxKind.ParenthesizedType:
                 case SyntaxKind.JSDocNullableType:
                 case SyntaxKind.JSDocNonNullableType:
@@ -6133,13 +6141,13 @@ namespace ts {
                 case SyntaxKind.TypeLiteral:
                 case SyntaxKind.JSDocTypeLiteral:
                 case SyntaxKind.JSDocFunctionType:
-                    return getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node, aliasSymbol, aliasTypeArguments);
+                    return getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node);
                 case SyntaxKind.TypeOperator:
                     return getTypeFromTypeOperatorNode(<TypeOperatorNode>node);
                 case SyntaxKind.IndexedAccessType:
                     return getTypeFromIndexedAccessTypeNode(<IndexedAccessTypeNode>node);
                 case SyntaxKind.MappedType:
-                    return getTypeFromMappedTypeNode(<MappedTypeNode>node, aliasSymbol, aliasTypeArguments);
+                    return getTypeFromMappedTypeNode(<MappedTypeNode>node);
                 // This function assumes that an identifier or qualified name is a type expression
                 // Callers should first ensure this by calling isTypeNode
                 case SyntaxKind.Identifier:
@@ -12709,7 +12717,7 @@ namespace ts {
             else if (candidateForTypeArgumentError) {
                 if (!isTaggedTemplate && !isDecorator && typeArguments) {
                     const typeArguments = (<CallExpression>node).typeArguments;
-                    checkTypeArguments(candidateForTypeArgumentError, typeArguments, map(typeArguments, getTypeFromTypeNodeNoAlias), /*reportErrors*/ true, headMessage);
+                    checkTypeArguments(candidateForTypeArgumentError, typeArguments, map(typeArguments, getTypeFromTypeNode), /*reportErrors*/ true, headMessage);
                 }
                 else {
                     Debug.assert(resultOfFailedInference.failedTypeParameterIndex >= 0);
@@ -12740,7 +12748,7 @@ namespace ts {
                 for (let candidate of candidates) {
                     if (hasCorrectArity(node, args, candidate)) {
                         if (candidate.typeParameters && typeArguments) {
-                            candidate = getSignatureInstantiation(candidate, map(typeArguments, getTypeFromTypeNodeNoAlias));
+                            candidate = getSignatureInstantiation(candidate, map(typeArguments, getTypeFromTypeNode));
                         }
                         return candidate;
                     }
@@ -12776,7 +12784,7 @@ namespace ts {
                         if (candidate.typeParameters) {
                             let typeArgumentTypes: Type[];
                             if (typeArguments) {
-                                typeArgumentTypes = map(typeArguments, getTypeFromTypeNodeNoAlias);
+                                typeArgumentTypes = map(typeArguments, getTypeFromTypeNode);
                                 typeArgumentsAreValid = checkTypeArguments(candidate, typeArguments, typeArgumentTypes, /*reportErrors*/ false);
                             }
                             else {
@@ -15238,7 +15246,7 @@ namespace ts {
                 const constraint = getConstraintOfTypeParameter(typeParameters[i]);
                 if (constraint) {
                     if (!typeArguments) {
-                        typeArguments = map(typeArgumentNodes, getTypeFromTypeNodeNoAlias);
+                        typeArguments = map(typeArgumentNodes, getTypeFromTypeNode);
                         mapper = createTypeMapper(typeParameters, typeArguments);
                     }
                     const typeArgument = typeArguments[i];

From de2da2cb72b41ee8b52378be7e01ec491d95ffc2 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Thu, 10 Nov 2016 10:32:05 -0800
Subject: [PATCH 170/421] Accept new baselines

---
 ...structuringParameterProperties5.errors.txt | 24 +++++++++----------
 .../reference/implicitIndexSignatures.types   | 16 ++++++-------
 .../intersectionTypeNormalization.types       | 12 +++++-----
 .../reference/keyofAndIndexedAccess.types     | 12 +++++-----
 .../reference/noErrorTruncation.errors.txt    |  4 ++--
 .../nounusedTypeParameterConstraint.types     |  2 +-
 .../reference/typeAliasDeclarationEmit2.types |  2 +-
 tests/baselines/reference/typeAliases.types   |  8 +++----
 ...lyReferencedTypeAliasToTypeLiteral02.types | 18 +++++++-------
 ...ypeGuardNarrowsPrimitiveIntersection.types | 18 +++++++-------
 10 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/tests/baselines/reference/destructuringParameterProperties5.errors.txt b/tests/baselines/reference/destructuringParameterProperties5.errors.txt
index 8eff6ad0feb..e0540240b61 100644
--- a/tests/baselines/reference/destructuringParameterProperties5.errors.txt
+++ b/tests/baselines/reference/destructuringParameterProperties5.errors.txt
@@ -1,15 +1,15 @@
 tests/cases/conformance/es6/destructuring/destructuringParameterProperties5.ts(5,17): error TS1187: A parameter property may not be declared using a binding pattern.
-tests/cases/conformance/es6/destructuring/destructuringParameterProperties5.ts(5,27): error TS2459: Type '{ x: number; y: string; z: boolean; }' has no property 'x1' and no string index signature.
-tests/cases/conformance/es6/destructuring/destructuringParameterProperties5.ts(5,31): error TS2459: Type '{ x: number; y: string; z: boolean; }' has no property 'x2' and no string index signature.
-tests/cases/conformance/es6/destructuring/destructuringParameterProperties5.ts(5,35): error TS2459: Type '{ x: number; y: string; z: boolean; }' has no property 'x3' and no string index signature.
+tests/cases/conformance/es6/destructuring/destructuringParameterProperties5.ts(5,27): error TS2459: Type 'ObjType1' has no property 'x1' and no string index signature.
+tests/cases/conformance/es6/destructuring/destructuringParameterProperties5.ts(5,31): error TS2459: Type 'ObjType1' has no property 'x2' and no string index signature.
+tests/cases/conformance/es6/destructuring/destructuringParameterProperties5.ts(5,35): error TS2459: Type 'ObjType1' has no property 'x3' and no string index signature.
 tests/cases/conformance/es6/destructuring/destructuringParameterProperties5.ts(7,29): error TS2339: Property 'x1' does not exist on type 'C1'.
 tests/cases/conformance/es6/destructuring/destructuringParameterProperties5.ts(7,40): error TS2339: Property 'x2' does not exist on type 'C1'.
 tests/cases/conformance/es6/destructuring/destructuringParameterProperties5.ts(7,51): error TS2339: Property 'x3' does not exist on type 'C1'.
 tests/cases/conformance/es6/destructuring/destructuringParameterProperties5.ts(7,62): error TS2339: Property 'y' does not exist on type 'C1'.
 tests/cases/conformance/es6/destructuring/destructuringParameterProperties5.ts(7,72): error TS2339: Property 'z' does not exist on type 'C1'.
-tests/cases/conformance/es6/destructuring/destructuringParameterProperties5.ts(11,19): error TS2345: Argument of type '[{ x1: number; x2: string; x3: boolean; }, string, boolean]' is not assignable to parameter of type '[{ x: number; y: string; z: boolean; }, number, string]'.
-  Type '{ x1: number; x2: string; x3: boolean; }' is not assignable to type '{ x: number; y: string; z: boolean; }'.
-    Object literal may only specify known properties, and 'x1' does not exist in type '{ x: number; y: string; z: boolean; }'.
+tests/cases/conformance/es6/destructuring/destructuringParameterProperties5.ts(11,19): error TS2345: Argument of type '[{ x1: number; x2: string; x3: boolean; }, string, boolean]' is not assignable to parameter of type '[ObjType1, number, string]'.
+  Type '{ x1: number; x2: string; x3: boolean; }' is not assignable to type 'ObjType1'.
+    Object literal may only specify known properties, and 'x1' does not exist in type 'ObjType1'.
 
 
 ==== tests/cases/conformance/es6/destructuring/destructuringParameterProperties5.ts (10 errors) ====
@@ -21,11 +21,11 @@ tests/cases/conformance/es6/destructuring/destructuringParameterProperties5.ts(1
                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS1187: A parameter property may not be declared using a binding pattern.
                               ~~
-!!! error TS2459: Type '{ x: number; y: string; z: boolean; }' has no property 'x1' and no string index signature.
+!!! error TS2459: Type 'ObjType1' has no property 'x1' and no string index signature.
                                   ~~
-!!! error TS2459: Type '{ x: number; y: string; z: boolean; }' has no property 'x2' and no string index signature.
+!!! error TS2459: Type 'ObjType1' has no property 'x2' and no string index signature.
                                       ~~
-!!! error TS2459: Type '{ x: number; y: string; z: boolean; }' has no property 'x3' and no string index signature.
+!!! error TS2459: Type 'ObjType1' has no property 'x3' and no string index signature.
             var foo: any = x1 || x2 || x3 || y || z;
             var bar: any = this.x1 || this.x2 || this.x3 || this.y || this.z;
                                 ~~
@@ -43,7 +43,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterProperties5.ts(1
     
     var a = new C1([{ x1: 10, x2: "", x3: true }, "", false]);
                       ~~~~~~
-!!! error TS2345: Argument of type '[{ x1: number; x2: string; x3: boolean; }, string, boolean]' is not assignable to parameter of type '[{ x: number; y: string; z: boolean; }, number, string]'.
-!!! error TS2345:   Type '{ x1: number; x2: string; x3: boolean; }' is not assignable to type '{ x: number; y: string; z: boolean; }'.
-!!! error TS2345:     Object literal may only specify known properties, and 'x1' does not exist in type '{ x: number; y: string; z: boolean; }'.
+!!! error TS2345: Argument of type '[{ x1: number; x2: string; x3: boolean; }, string, boolean]' is not assignable to parameter of type '[ObjType1, number, string]'.
+!!! error TS2345:   Type '{ x1: number; x2: string; x3: boolean; }' is not assignable to type 'ObjType1'.
+!!! error TS2345:     Object literal may only specify known properties, and 'x1' does not exist in type 'ObjType1'.
     var [a_x1, a_x2, a_x3, a_y, a_z] = [a.x1, a.x2, a.x3, a.y, a.z];
\ No newline at end of file
diff --git a/tests/baselines/reference/implicitIndexSignatures.types b/tests/baselines/reference/implicitIndexSignatures.types
index ac8da0c7b6c..0b68f136e2e 100644
--- a/tests/baselines/reference/implicitIndexSignatures.types
+++ b/tests/baselines/reference/implicitIndexSignatures.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/implicitIndexSignatures.ts ===
 type StringMap = { [x: string]: string };
->StringMap : { [x: string]: string; }
+>StringMap : StringMap
 >x : string
 
 const empty1 = {};
@@ -24,12 +24,12 @@ let names2: { a: string, b: string };
 >b : string
 
 let map: StringMap;
->map : { [x: string]: string; }
->StringMap : { [x: string]: string; }
+>map : StringMap
+>StringMap : StringMap
 
 map = { x: "xxx", y: "yyy" };
 >map = { x: "xxx", y: "yyy" } : { x: string; y: string; }
->map : { [x: string]: string; }
+>map : StringMap
 >{ x: "xxx", y: "yyy" } : { x: string; y: string; }
 >x : string
 >"xxx" : "xxx"
@@ -38,22 +38,22 @@ map = { x: "xxx", y: "yyy" };
 
 map = empty1;
 >map = empty1 : {}
->map : { [x: string]: string; }
+>map : StringMap
 >empty1 : {}
 
 map = empty2;
 >map = empty2 : {}
->map : { [x: string]: string; }
+>map : StringMap
 >empty2 : {}
 
 map = names1;
 >map = names1 : { a: string; b: string; }
->map : { [x: string]: string; }
+>map : StringMap
 >names1 : { a: string; b: string; }
 
 map = names2;
 >map = names2 : { a: string; b: string; }
->map : { [x: string]: string; }
+>map : StringMap
 >names2 : { a: string; b: string; }
 
 declare function getStringIndexValue<T>(map: { [x: string]: T }): T;
diff --git a/tests/baselines/reference/intersectionTypeNormalization.types b/tests/baselines/reference/intersectionTypeNormalization.types
index 10ef50ae1b4..99d0ecb1f3a 100644
--- a/tests/baselines/reference/intersectionTypeNormalization.types
+++ b/tests/baselines/reference/intersectionTypeNormalization.types
@@ -189,7 +189,7 @@ var z: Z4;
 // Repro from #9919
 
 type ToString = {
->ToString : { toString(): string; }
+>ToString : ToString
 
     toString(): string;
 >toString : () => string
@@ -207,18 +207,18 @@ type BoxedValue = { kind: 'int',    num: number }
 type IntersectionFail = BoxedValue & ToString
 >IntersectionFail : IntersectionFail
 >BoxedValue : BoxedValue
->ToString : { toString(): string; }
+>ToString : ToString
 
 type IntersectionInline = { kind: 'int',    num: number } & ToString
 >IntersectionInline : IntersectionInline
 >kind : "int"
 >num : number
->ToString : { toString(): string; }
+>ToString : ToString
 
                         | { kind: 'string', str: string } & ToString
 >kind : "string"
 >str : string
->ToString : { toString(): string; }
+>ToString : ToString
 
 function getValueAsString(value: IntersectionFail): string {
 >getValueAsString : (value: IntersectionFail) => string
@@ -236,11 +236,11 @@ function getValueAsString(value: IntersectionFail): string {
 >'' + value.num : string
 >'' : ""
 >value.num : number
->value : { kind: "int"; num: number; } & { toString(): string; }
+>value : { kind: "int"; num: number; } & ToString
 >num : number
     }
     return value.str;
 >value.str : string
->value : { kind: "string"; str: string; } & { toString(): string; }
+>value : { kind: "string"; str: string; } & ToString
 >str : string
 }
diff --git a/tests/baselines/reference/keyofAndIndexedAccess.types b/tests/baselines/reference/keyofAndIndexedAccess.types
index a5395db8292..c252ea4e2bd 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.types
+++ b/tests/baselines/reference/keyofAndIndexedAccess.types
@@ -42,7 +42,7 @@ class Options {
 }
 
 type Dictionary<T> = { [x: string]: T };
->Dictionary : { [x: string]: T; }
+>Dictionary : Dictionary<T>
 >T : T
 >x : string
 >T : T
@@ -88,7 +88,7 @@ type K11 = keyof Shape[];  // number | "length" | "toString" | ...
 
 type K12 = keyof Dictionary<Shape>;  // string | number
 >K12 : string | number
->Dictionary : { [x: string]: T; }
+>Dictionary : Dictionary<T>
 >Shape : Shape
 
 type K13 = keyof {};  // never
@@ -128,7 +128,7 @@ type K20 = KeyOf<Shape>;  // "name" | "width" | "height" | "visible"
 type K21 = KeyOf<Dictionary<Shape>>;  // string | number
 >K21 : string | number
 >KeyOf : keyof T
->Dictionary : { [x: string]: T; }
+>Dictionary : Dictionary<T>
 >Shape : Shape
 
 type NAME = "name";
@@ -201,17 +201,17 @@ type Q41 = (Shape & Options)["visible"];  // true & "yes" | true & "no" | false
 
 type Q50 = Dictionary<Shape>["howdy"];  // Shape
 >Q50 : Shape
->Dictionary : { [x: string]: T; }
+>Dictionary : Dictionary<T>
 >Shape : Shape
 
 type Q51 = Dictionary<Shape>[123];  // Shape
 >Q51 : Shape
->Dictionary : { [x: string]: T; }
+>Dictionary : Dictionary<T>
 >Shape : Shape
 
 type Q52 = Dictionary<Shape>[E.B];  // Shape
 >Q52 : Shape
->Dictionary : { [x: string]: T; }
+>Dictionary : Dictionary<T>
 >Shape : Shape
 >E : any
 >B : E.B
diff --git a/tests/baselines/reference/noErrorTruncation.errors.txt b/tests/baselines/reference/noErrorTruncation.errors.txt
index af3acb54bba..d5244df81a8 100644
--- a/tests/baselines/reference/noErrorTruncation.errors.txt
+++ b/tests/baselines/reference/noErrorTruncation.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/noErrorTruncation.ts(10,7): error TS2322: Type '42' is not assignable to type '{ someLongOptionA: string; } | { someLongOptionB: string; } | { someLongOptionC: string; } | { someLongOptionD: string; } | { someLongOptionE: string; } | { someLongOptionF: string; }'.
+tests/cases/compiler/noErrorTruncation.ts(10,7): error TS2322: Type '42' is not assignable to type 'SomeLongOptionA | SomeLongOptionB | SomeLongOptionC | SomeLongOptionD | SomeLongOptionE | SomeLongOptionF'.
 
 
 ==== tests/cases/compiler/noErrorTruncation.ts (1 errors) ====
@@ -13,7 +13,7 @@ tests/cases/compiler/noErrorTruncation.ts(10,7): error TS2322: Type '42' is not
     
     const x: SomeLongOptionA
           ~
-!!! error TS2322: Type '42' is not assignable to type '{ someLongOptionA: string; } | { someLongOptionB: string; } | { someLongOptionC: string; } | { someLongOptionD: string; } | { someLongOptionE: string; } | { someLongOptionF: string; }'.
+!!! error TS2322: Type '42' is not assignable to type 'SomeLongOptionA | SomeLongOptionB | SomeLongOptionC | SomeLongOptionD | SomeLongOptionE | SomeLongOptionF'.
            | SomeLongOptionB
            | SomeLongOptionC
            | SomeLongOptionD
diff --git a/tests/baselines/reference/nounusedTypeParameterConstraint.types b/tests/baselines/reference/nounusedTypeParameterConstraint.types
index 8f2de483d26..0ded5540092 100644
--- a/tests/baselines/reference/nounusedTypeParameterConstraint.types
+++ b/tests/baselines/reference/nounusedTypeParameterConstraint.types
@@ -8,7 +8,7 @@ import { IEventSourcedEntity } from "./bar";
 >IEventSourcedEntity : any
 
 export type DomainEntityConstructor<TEntity extends IEventSourcedEntity> = { new(): TEntity; };
->DomainEntityConstructor : new () => TEntity
+>DomainEntityConstructor : DomainEntityConstructor<TEntity>
 >TEntity : TEntity
 >IEventSourcedEntity : IEventSourcedEntity
 >TEntity : TEntity
diff --git a/tests/baselines/reference/typeAliasDeclarationEmit2.types b/tests/baselines/reference/typeAliasDeclarationEmit2.types
index bc8bd30935e..2cbee5aae4c 100644
--- a/tests/baselines/reference/typeAliasDeclarationEmit2.types
+++ b/tests/baselines/reference/typeAliasDeclarationEmit2.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/typeAliasDeclarationEmit2.ts ===
 
 export type A<a> = { value: a };
->A : { value: a; }
+>A : A<a>
 >a : a
 >value : a
 >a : a
diff --git a/tests/baselines/reference/typeAliases.types b/tests/baselines/reference/typeAliases.types
index 1d798bc14a6..6c8e897480c 100644
--- a/tests/baselines/reference/typeAliases.types
+++ b/tests/baselines/reference/typeAliases.types
@@ -104,7 +104,7 @@ var x9: T9;
 >T9 : T9
 
 type T10 = { x: number };
->T10 : { x: number; }
+>T10 : T10
 >x : number
 
 var x10: { x: number };
@@ -113,17 +113,17 @@ var x10: { x: number };
 
 var x10: T10;
 >x10 : { x: number; }
->T10 : { x: number; }
+>T10 : T10
 
 type T11 = { new(): boolean };
->T11 : new () => boolean
+>T11 : T11
 
 var x11: { new(): boolean };
 >x11 : new () => boolean
 
 var x11: T11;
 >x11 : new () => boolean
->T11 : new () => boolean
+>T11 : T11
 
 interface I13 { x: string };
 >I13 : I13
diff --git a/tests/baselines/reference/typeArgumentInferenceWithRecursivelyReferencedTypeAliasToTypeLiteral02.types b/tests/baselines/reference/typeArgumentInferenceWithRecursivelyReferencedTypeAliasToTypeLiteral02.types
index 6e3997c2d1f..a75a997eb78 100644
--- a/tests/baselines/reference/typeArgumentInferenceWithRecursivelyReferencedTypeAliasToTypeLiteral02.types
+++ b/tests/baselines/reference/typeArgumentInferenceWithRecursivelyReferencedTypeAliasToTypeLiteral02.types
@@ -11,7 +11,7 @@ type TreeNode = {
 }
 
 type TreeNodeMiddleman = {
->TreeNodeMiddleman : { name: string; parent: TreeNode; }
+>TreeNodeMiddleman : TreeNodeMiddleman
 
     name: string;
 >name : string
@@ -22,17 +22,17 @@ type TreeNodeMiddleman = {
 }
 
 var nodes: TreeNodeMiddleman[];
->nodes : { name: string; parent: TreeNode; }[]
->TreeNodeMiddleman : { name: string; parent: TreeNode; }
+>nodes : TreeNodeMiddleman[]
+>TreeNodeMiddleman : TreeNodeMiddleman
 
 nodes.map(n => n.name);
 >nodes.map(n => n.name) : string[]
->nodes.map : { <U>(this: [{ name: string; parent: TreeNode; }, { name: string; parent: TreeNode; }, { name: string; parent: TreeNode; }, { name: string; parent: TreeNode; }, { name: string; parent: TreeNode; }], callbackfn: (value: { name: string; parent: TreeNode; }, index: number, array: { name: string; parent: TreeNode; }[]) => U, thisArg?: any): [U, U, U, U, U]; <U>(this: [{ name: string; parent: TreeNode; }, { name: string; parent: TreeNode; }, { name: string; parent: TreeNode; }, { name: string; parent: TreeNode; }], callbackfn: (value: { name: string; parent: TreeNode; }, index: number, array: { name: string; parent: TreeNode; }[]) => U, thisArg?: any): [U, U, U, U]; <U>(this: [{ name: string; parent: TreeNode; }, { name: string; parent: TreeNode; }, { name: string; parent: TreeNode; }], callbackfn: (value: { name: string; parent: TreeNode; }, index: number, array: { name: string; parent: TreeNode; }[]) => U, thisArg?: any): [U, U, U]; <U>(this: [{ name: string; parent: TreeNode; }, { name: string; parent: TreeNode; }], callbackfn: (value: { name: string; parent: TreeNode; }, index: number, array: { name: string; parent: TreeNode; }[]) => U, thisArg?: any): [U, U]; <U>(callbackfn: (value: { name: string; parent: TreeNode; }, index: number, array: { name: string; parent: TreeNode; }[]) => U, thisArg?: any): U[]; }
->nodes : { name: string; parent: TreeNode; }[]
->map : { <U>(this: [{ name: string; parent: TreeNode; }, { name: string; parent: TreeNode; }, { name: string; parent: TreeNode; }, { name: string; parent: TreeNode; }, { name: string; parent: TreeNode; }], callbackfn: (value: { name: string; parent: TreeNode; }, index: number, array: { name: string; parent: TreeNode; }[]) => U, thisArg?: any): [U, U, U, U, U]; <U>(this: [{ name: string; parent: TreeNode; }, { name: string; parent: TreeNode; }, { name: string; parent: TreeNode; }, { name: string; parent: TreeNode; }], callbackfn: (value: { name: string; parent: TreeNode; }, index: number, array: { name: string; parent: TreeNode; }[]) => U, thisArg?: any): [U, U, U, U]; <U>(this: [{ name: string; parent: TreeNode; }, { name: string; parent: TreeNode; }, { name: string; parent: TreeNode; }], callbackfn: (value: { name: string; parent: TreeNode; }, index: number, array: { name: string; parent: TreeNode; }[]) => U, thisArg?: any): [U, U, U]; <U>(this: [{ name: string; parent: TreeNode; }, { name: string; parent: TreeNode; }], callbackfn: (value: { name: string; parent: TreeNode; }, index: number, array: { name: string; parent: TreeNode; }[]) => U, thisArg?: any): [U, U]; <U>(callbackfn: (value: { name: string; parent: TreeNode; }, index: number, array: { name: string; parent: TreeNode; }[]) => U, thisArg?: any): U[]; }
->n => n.name : (n: { name: string; parent: TreeNode; }) => string
->n : { name: string; parent: TreeNode; }
+>nodes.map : { <U>(this: [TreeNodeMiddleman, TreeNodeMiddleman, TreeNodeMiddleman, TreeNodeMiddleman, TreeNodeMiddleman], callbackfn: (value: TreeNodeMiddleman, index: number, array: TreeNodeMiddleman[]) => U, thisArg?: any): [U, U, U, U, U]; <U>(this: [TreeNodeMiddleman, TreeNodeMiddleman, TreeNodeMiddleman, TreeNodeMiddleman], callbackfn: (value: TreeNodeMiddleman, index: number, array: TreeNodeMiddleman[]) => U, thisArg?: any): [U, U, U, U]; <U>(this: [TreeNodeMiddleman, TreeNodeMiddleman, TreeNodeMiddleman], callbackfn: (value: TreeNodeMiddleman, index: number, array: TreeNodeMiddleman[]) => U, thisArg?: any): [U, U, U]; <U>(this: [TreeNodeMiddleman, TreeNodeMiddleman], callbackfn: (value: TreeNodeMiddleman, index: number, array: TreeNodeMiddleman[]) => U, thisArg?: any): [U, U]; <U>(callbackfn: (value: TreeNodeMiddleman, index: number, array: TreeNodeMiddleman[]) => U, thisArg?: any): U[]; }
+>nodes : TreeNodeMiddleman[]
+>map : { <U>(this: [TreeNodeMiddleman, TreeNodeMiddleman, TreeNodeMiddleman, TreeNodeMiddleman, TreeNodeMiddleman], callbackfn: (value: TreeNodeMiddleman, index: number, array: TreeNodeMiddleman[]) => U, thisArg?: any): [U, U, U, U, U]; <U>(this: [TreeNodeMiddleman, TreeNodeMiddleman, TreeNodeMiddleman, TreeNodeMiddleman], callbackfn: (value: TreeNodeMiddleman, index: number, array: TreeNodeMiddleman[]) => U, thisArg?: any): [U, U, U, U]; <U>(this: [TreeNodeMiddleman, TreeNodeMiddleman, TreeNodeMiddleman], callbackfn: (value: TreeNodeMiddleman, index: number, array: TreeNodeMiddleman[]) => U, thisArg?: any): [U, U, U]; <U>(this: [TreeNodeMiddleman, TreeNodeMiddleman], callbackfn: (value: TreeNodeMiddleman, index: number, array: TreeNodeMiddleman[]) => U, thisArg?: any): [U, U]; <U>(callbackfn: (value: TreeNodeMiddleman, index: number, array: TreeNodeMiddleman[]) => U, thisArg?: any): U[]; }
+>n => n.name : (n: TreeNodeMiddleman) => string
+>n : TreeNodeMiddleman
 >n.name : string
->n : { name: string; parent: TreeNode; }
+>n : TreeNodeMiddleman
 >name : string
 
diff --git a/tests/baselines/reference/typeGuardNarrowsPrimitiveIntersection.types b/tests/baselines/reference/typeGuardNarrowsPrimitiveIntersection.types
index 478363669b4..f793ca34548 100644
--- a/tests/baselines/reference/typeGuardNarrowsPrimitiveIntersection.types
+++ b/tests/baselines/reference/typeGuardNarrowsPrimitiveIntersection.types
@@ -1,18 +1,18 @@
 === tests/cases/conformance/expressions/typeGuards/typeGuardNarrowsPrimitiveIntersection.ts ===
 type Tag = {__tag: any};
->Tag : { __tag: any; }
+>Tag : Tag
 >__tag : any
 
 declare function isNonBlank(value: string) : value is (string & Tag);
->isNonBlank : (value: string) => value is string & { __tag: any; }
+>isNonBlank : (value: string) => value is string & Tag
 >value : string
 >value : any
->Tag : { __tag: any; }
+>Tag : Tag
 
 declare function doThis(value: string & Tag): void;
->doThis : (value: string & { __tag: any; }) => void
->value : string & { __tag: any; }
->Tag : { __tag: any; }
+>doThis : (value: string & Tag) => void
+>value : string & Tag
+>Tag : Tag
 
 declare function doThat(value: string) : void;
 >doThat : (value: string) => void
@@ -23,13 +23,13 @@ let value: string;
 
 if (isNonBlank(value)) {
 >isNonBlank(value) : boolean
->isNonBlank : (value: string) => value is string & { __tag: any; }
+>isNonBlank : (value: string) => value is string & Tag
 >value : string
 
     doThis(value);
 >doThis(value) : void
->doThis : (value: string & { __tag: any; }) => void
->value : string & { __tag: any; }
+>doThis : (value: string & Tag) => void
+>value : string & Tag
 
 } else {
     doThat(value);

From aca1ab3bfe485ad27d7e21d240f29bcf31fd380a Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Thu, 10 Nov 2016 10:41:17 -0800
Subject: [PATCH 171/421] Check mapped type constraint is assignable to string
 | number

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 8f7d8aa0d61..8aa9a03da04 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -15316,11 +15316,12 @@ namespace ts {
         }
 
         function checkMappedType(node: MappedTypeNode) {
-            getTypeFromMappedTypeNode(node);
-            // const type = <MappedType>getTypeFromMappedTypeNode(node);
-            // const constraintType = getConstraintTypeFromMappedType(type);
-            // const keyType = constraintType.flags & TypeFlags.TypeParameter ? getApparentTypeOfTypeParameter(<TypeParameter>constraintType) : constraintType;
-            // checkTypeAssignableTo(keyType, stringOrNumberType, node.typeParameter.constraint);
+            checkSourceElement(node.typeParameter);
+            checkSourceElement(node.type);
+            const type = <MappedType>getTypeFromMappedTypeNode(node);
+            const constraintType = getConstraintTypeFromMappedType(type);
+            const keyType = constraintType.flags & TypeFlags.TypeParameter ? getApparentTypeOfTypeParameter(<TypeParameter>constraintType) : constraintType;
+            checkTypeAssignableTo(keyType, stringOrNumberType, node.typeParameter.constraint);
         }
 
         function isPrivateWithinAmbient(node: Node): boolean {

From 0d4ac0157466cc2b68d5e5392f9ea94ede20dede Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Thu, 10 Nov 2016 11:45:56 -0800
Subject: [PATCH 172/421] Report errors for import helpers missing __rest

---
 src/compiler/checker.ts | 6 +++++-
 src/compiler/types.ts   | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 95faebd2875..e7f3558a3e6 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -19970,9 +19970,13 @@ namespace ts {
                     if (requestedExternalEmitHelpers & NodeFlags.HasClassExtends && languageVersion < ScriptTarget.ES2015) {
                         verifyHelperSymbol(exports, "__extends", SymbolFlags.Value);
                     }
-                    if (requestedExternalEmitHelpers & NodeFlags.HasSpreadAttribute && compilerOptions.jsx !== JsxEmit.Preserve) {
+                    if (requestedExternalEmitHelpers & NodeFlags.HasSpreadAttribute &&
+                        (languageVersion < ScriptTarget.ESNext || compilerOptions.jsx === JsxEmit.React)) {
                         verifyHelperSymbol(exports, "__assign", SymbolFlags.Value);
                     }
+                    if (languageVersion < ScriptTarget.ESNext && requestedExternalEmitHelpers & NodeFlags.HasRestAttribute) {
+                        verifyHelperSymbol(exports, "__rest", SymbolFlags.Value);
+                    }
                     if (requestedExternalEmitHelpers & NodeFlags.HasDecorators) {
                         verifyHelperSymbol(exports, "__decorate", SymbolFlags.Value);
                         if (compilerOptions.emitDecoratorMetadata) {
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 9889d3ad1af..7db19af7382 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -433,7 +433,7 @@ namespace ts {
         BlockScoped = Let | Const,
 
         ReachabilityCheckFlags = HasImplicitReturn | HasExplicitReturn,
-        EmitHelperFlags = HasClassExtends | HasDecorators | HasParamDecorators | HasAsyncFunctions | HasSpreadAttribute,
+        EmitHelperFlags = HasClassExtends | HasDecorators | HasParamDecorators | HasAsyncFunctions | HasSpreadAttribute | HasRestAttribute,
         ReachabilityAndEmitFlags = ReachabilityCheckFlags | EmitHelperFlags,
 
         // Parsing context flags

From d6bf27d6b6bc4a74d8cd47c68f1b452171cdf3dd Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Thu, 10 Nov 2016 11:46:10 -0800
Subject: [PATCH 173/421] Correctly check spread assignments in strict mode

Previously it crashed in the binder.
---
 src/compiler/binder.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index 197adfdb5c4..3e65b547d5b 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -1553,7 +1553,7 @@ namespace ts {
                 const seen = createMap<ElementKind>();
 
                 for (const prop of node.properties) {
-                    if (prop.name.kind !== SyntaxKind.Identifier) {
+                    if (prop.kind === SyntaxKind.SpreadAssignment || prop.name.kind !== SyntaxKind.Identifier) {
                         continue;
                     }
 

From ba6e5a0ffad18b1852a3f3a2be6804cc95d3ae15 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Thu, 10 Nov 2016 11:47:03 -0800
Subject: [PATCH 174/421] Test error for import helpers with no __rest

---
 .../reference/importHelpersNoHelpers.errors.txt       | 11 ++++++++++-
 tests/baselines/reference/importHelpersNoHelpers.js   | 10 +++++++++-
 tests/cases/compiler/importHelpersNoHelpers.ts        |  6 +++++-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/tests/baselines/reference/importHelpersNoHelpers.errors.txt b/tests/baselines/reference/importHelpersNoHelpers.errors.txt
index ebb25dbd7c9..fa9a935c8d8 100644
--- a/tests/baselines/reference/importHelpersNoHelpers.errors.txt
+++ b/tests/baselines/reference/importHelpersNoHelpers.errors.txt
@@ -1,13 +1,17 @@
+error TS2305: Module 'tslib' has no exported member '__assign'.
 error TS2305: Module 'tslib' has no exported member '__decorate'.
 error TS2305: Module 'tslib' has no exported member '__extends'.
 error TS2305: Module 'tslib' has no exported member '__metadata'.
 error TS2305: Module 'tslib' has no exported member '__param'.
+error TS2305: Module 'tslib' has no exported member '__rest'.
 
 
+!!! error TS2305: Module 'tslib' has no exported member '__assign'.
 !!! error TS2305: Module 'tslib' has no exported member '__decorate'.
 !!! error TS2305: Module 'tslib' has no exported member '__extends'.
 !!! error TS2305: Module 'tslib' has no exported member '__metadata'.
 !!! error TS2305: Module 'tslib' has no exported member '__param'.
+!!! error TS2305: Module 'tslib' has no exported member '__rest'.
 ==== tests/cases/compiler/external.ts (0 errors) ====
     export class A { }
     export class B extends A { }
@@ -20,6 +24,10 @@ error TS2305: Module 'tslib' has no exported member '__param'.
         }
     }
     
+    const o = { a: 1 };
+    const y = { ...o };
+    const { ...x } = y;
+    
 ==== tests/cases/compiler/script.ts (0 errors) ====
     class A { }
     class B extends A { }
@@ -33,4 +41,5 @@ error TS2305: Module 'tslib' has no exported member '__param'.
     }
     
 ==== tests/cases/compiler/tslib.d.ts (0 errors) ====
-    export {}
\ No newline at end of file
+    export {}
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersNoHelpers.js b/tests/baselines/reference/importHelpersNoHelpers.js
index e22d1f4353d..690a6c05f17 100644
--- a/tests/baselines/reference/importHelpersNoHelpers.js
+++ b/tests/baselines/reference/importHelpersNoHelpers.js
@@ -11,6 +11,10 @@ class C {
     method(@dec x: number) {
     }
 }
+
+const o = { a: 1 };
+const y = { ...o };
+const { ...x } = y;
 
 //// [script.ts]
 class A { }
@@ -25,7 +29,8 @@ class C {
 }
 
 //// [tslib.d.ts]
-export {}
+export {}
+
 
 //// [external.js]
 "use strict";
@@ -61,6 +66,9 @@ C = tslib_1.__decorate([
     dec,
     tslib_1.__metadata("design:paramtypes", [])
 ], C);
+var o = { a: 1 };
+var y = __assign({}, o);
+var x = __rest(y, []);
 //// [script.js]
 var __extends = (this && this.__extends) || function (d, b) {
     for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
diff --git a/tests/cases/compiler/importHelpersNoHelpers.ts b/tests/cases/compiler/importHelpersNoHelpers.ts
index 82428552548..4ab48aba7df 100644
--- a/tests/cases/compiler/importHelpersNoHelpers.ts
+++ b/tests/cases/compiler/importHelpersNoHelpers.ts
@@ -16,6 +16,10 @@ class C {
     }
 }
 
+const o = { a: 1 };
+const y = { ...o };
+const { ...x } = y;
+
 // @filename: script.ts
 class A { }
 class B extends A { }
@@ -29,4 +33,4 @@ class C {
 }
 
 // @filename: tslib.d.ts
-export {}
\ No newline at end of file
+export {}

From 3ecb60146b5d91db14cf1467f4a9d9b0d25e9ce5 Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Thu, 10 Nov 2016 11:57:37 -0800
Subject: [PATCH 175/421] synthesize complete import declaration for tslib
 (#12151)

---
 src/compiler/program.ts                        |  9 +++++++--
 src/harness/unittests/tsserverProjectSystem.ts | 17 +++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 5cd957708f5..eb7054a9f06 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -1143,9 +1143,14 @@ namespace ts {
             if (options.importHelpers
                 && (options.isolatedModules || isExternalModuleFile)
                 && !file.isDeclarationFile) {
-                const externalHelpersModuleReference = <StringLiteral>createNode(SyntaxKind.StringLiteral);
+                // synthesize 'import "tslib"' declaration
+                const externalHelpersModuleReference = <StringLiteral>createSynthesizedNode(SyntaxKind.StringLiteral);
                 externalHelpersModuleReference.text = externalHelpersModuleNameText;
-                externalHelpersModuleReference.parent = file;
+                const importDecl = createSynthesizedNode(SyntaxKind.ImportDeclaration);
+
+                importDecl.parent = file;
+                externalHelpersModuleReference.parent = importDecl;
+
                 imports = [externalHelpersModuleReference];
             }
 
diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
index 17b1dd3e585..7986137ca43 100644
--- a/src/harness/unittests/tsserverProjectSystem.ts
+++ b/src/harness/unittests/tsserverProjectSystem.ts
@@ -2576,4 +2576,21 @@ namespace ts.projectSystem {
             assert.isTrue(diags.length === 0);
         });
     });
+
+    describe("import helpers", () => {
+        it("should not crash in tsserver", () => {
+            const f1 = {
+                path: "/a/app.ts",
+                content: "export async function foo() { return 100; }"
+            };
+            const tslib = {
+                path: "/a/node_modules/tslib/index.d.ts",
+                content: ""
+            };
+            const host = createServerHost([f1, tslib]);
+            const service = createProjectService(host);
+            service.openExternalProject({ projectFileName: "p", rootFiles: [toExternalFile(f1.path)], options: { importHelpers: true } });
+            service.checkNumberOfProjects({ externalProjects: 1 });
+        });
+    });
 }
\ No newline at end of file

From 9a8e1bf8a62936bb6acf7d2d8f16de7f466a1be4 Mon Sep 17 00:00:00 2001
From: Cotton Hou <himcotton@gmail.com>
Date: Fri, 11 Nov 2016 04:43:51 +0800
Subject: [PATCH 176/421] Add ES2017 string padding (#12152)

* add es2017.string.d.ts for String.prototype.{padStart,padEnd}

* append es2017.string.d.ts into es2017.d.ts

* add es2017.string into commandLineParser

* append es2017.string into error message for unit tests of commandLineParser

* append es2017.string into Gulpfile

* append es2017.string into Jakefile
---
 Gulpfile.ts                                   |  3 ++-
 Jakefile.js                                   |  3 ++-
 src/compiler/commandLineParser.ts             |  3 ++-
 src/harness/unittests/commandLineParsing.ts   |  6 ++---
 .../convertCompilerOptionsFromJson.ts         |  8 +++---
 src/lib/es2017.d.ts                           |  3 ++-
 src/lib/es2017.string.d.ts                    | 27 +++++++++++++++++++
 7 files changed, 42 insertions(+), 11 deletions(-)
 create mode 100644 src/lib/es2017.string.d.ts

diff --git a/Gulpfile.ts b/Gulpfile.ts
index ebedfd43c23..d7e20a557fd 100644
--- a/Gulpfile.ts
+++ b/Gulpfile.ts
@@ -128,7 +128,8 @@ const es2016LibrarySourceMap = es2016LibrarySource.map(function(source) {
 
 const es2017LibrarySource = [
     "es2017.object.d.ts",
-    "es2017.sharedmemory.d.ts"
+    "es2017.sharedmemory.d.ts",
+    "es2017.string.d.ts",
 ];
 
 const es2017LibrarySourceMap = es2017LibrarySource.map(function(source) {
diff --git a/Jakefile.js b/Jakefile.js
index 0e778b44c35..2e5d660c4f1 100644
--- a/Jakefile.js
+++ b/Jakefile.js
@@ -303,7 +303,8 @@ var es2016LibrarySourceMap = es2016LibrarySource.map(function (source) {
 
 var es2017LibrarySource = [
     "es2017.object.d.ts",
-    "es2017.sharedmemory.d.ts"
+    "es2017.sharedmemory.d.ts",
+    "es2017.string.d.ts",
 ];
 
 var es2017LibrarySourceMap = es2017LibrarySource.map(function (source) {
diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index d96035091c7..df9c3c4abdd 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -434,7 +434,8 @@ namespace ts {
                     "es2015.symbol.wellknown": "lib.es2015.symbol.wellknown.d.ts",
                     "es2016.array.include": "lib.es2016.array.include.d.ts",
                     "es2017.object": "lib.es2017.object.d.ts",
-                    "es2017.sharedmemory": "lib.es2017.sharedmemory.d.ts"
+                    "es2017.sharedmemory": "lib.es2017.sharedmemory.d.ts",
+                    "es2017.string": "lib.es2017.string.d.ts",
                 }),
             },
             description: Diagnostics.Specify_library_files_to_be_included_in_the_compilation_Colon
diff --git a/src/harness/unittests/commandLineParsing.ts b/src/harness/unittests/commandLineParsing.ts
index 890f167e2dd..8c691992043 100644
--- a/src/harness/unittests/commandLineParsing.ts
+++ b/src/harness/unittests/commandLineParsing.ts
@@ -60,7 +60,7 @@ namespace ts {
             assertParseResult(["--lib", "es5,invalidOption", "0.ts"],
                 {
                     errors: [{
-                        messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'dom.iterable', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object', 'es2017.sharedmemory'",
+                        messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'dom.iterable', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object', 'es2017.sharedmemory', 'es2017.string'",
                         category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
                         code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
 
@@ -263,7 +263,7 @@ namespace ts {
             assertParseResult(["--lib", "es5,", "es7", "0.ts"],
                 {
                     errors: [{
-                        messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'dom.iterable', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object', 'es2017.sharedmemory'",
+                        messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'dom.iterable', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object', 'es2017.sharedmemory', 'es2017.string'",
                         category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
                         code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
 
@@ -283,7 +283,7 @@ namespace ts {
             assertParseResult(["--lib", "es5, ", "es7", "0.ts"],
                 {
                     errors: [{
-                        messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'dom.iterable', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object', 'es2017.sharedmemory'",
+                        messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'dom.iterable', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object', 'es2017.sharedmemory', 'es2017.string'",
                         category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
                         code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
 
diff --git a/src/harness/unittests/convertCompilerOptionsFromJson.ts b/src/harness/unittests/convertCompilerOptionsFromJson.ts
index 23c372b5313..f44dc259710 100644
--- a/src/harness/unittests/convertCompilerOptionsFromJson.ts
+++ b/src/harness/unittests/convertCompilerOptionsFromJson.ts
@@ -233,7 +233,7 @@ namespace ts {
                         file: undefined,
                         start: 0,
                         length: 0,
-                        messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'dom.iterable', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object', 'es2017.sharedmemory'",
+                        messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'dom.iterable', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object', 'es2017.sharedmemory', 'es2017.string'",
                         code: Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
                         category: Diagnostics.Argument_for_0_option_must_be_Colon_1.category
                     }]
@@ -264,7 +264,7 @@ namespace ts {
                         file: undefined,
                         start: 0,
                         length: 0,
-                        messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'dom.iterable', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object', 'es2017.sharedmemory'",
+                        messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'dom.iterable', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object', 'es2017.sharedmemory', 'es2017.string'",
                         code: Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
                         category: Diagnostics.Argument_for_0_option_must_be_Colon_1.category
                     }]
@@ -295,7 +295,7 @@ namespace ts {
                         file: undefined,
                         start: 0,
                         length: 0,
-                        messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'dom.iterable', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object', 'es2017.sharedmemory'",
+                        messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'dom.iterable', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object', 'es2017.sharedmemory', 'es2017.string'",
                         code: Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
                         category: Diagnostics.Argument_for_0_option_must_be_Colon_1.category
                     }]
@@ -326,7 +326,7 @@ namespace ts {
                         file: undefined,
                         start: 0,
                         length: 0,
-                        messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'dom.iterable', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object', 'es2017.sharedmemory'",
+                        messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'dom.iterable', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object', 'es2017.sharedmemory', 'es2017.string'",
                         code: Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
                         category: Diagnostics.Argument_for_0_option_must_be_Colon_1.category
                     }]
diff --git a/src/lib/es2017.d.ts b/src/lib/es2017.d.ts
index 13f9d93f444..c234a9edb24 100644
--- a/src/lib/es2017.d.ts
+++ b/src/lib/es2017.d.ts
@@ -1,3 +1,4 @@
 /// <reference path="lib.es2016.d.ts" />
 /// <reference path="lib.es2017.object.d.ts" />
-/// <reference path="lib.es2017.sharedmemory.d.ts" />
\ No newline at end of file
+/// <reference path="lib.es2017.sharedmemory.d.ts" />
+/// <reference path="lib.es2017.string.d.ts" />
diff --git a/src/lib/es2017.string.d.ts b/src/lib/es2017.string.d.ts
new file mode 100644
index 00000000000..51f8e410ecf
--- /dev/null
+++ b/src/lib/es2017.string.d.ts
@@ -0,0 +1,27 @@
+interface String {
+    /**
+      * Pads the current string with a given string (possibly repeated) so that the resulting string reaches a given length.
+      * The padding is applied from the start (left) of the current string.
+      *
+      * @param maxLength The length of the resulting string once the current string has been padded.
+      *        If this parameter is smaller than the current string's length, the current string will be returned as it is.
+      *
+      * @param fillString The string to pad the current string with.
+      *        If this string is too long, it will be truncated and the left-most part will be applied.
+      *        The default value for this parameter is " " (U+0020).
+      */
+    padStart(maxLength: number, fillString?: string): string;
+
+    /**
+      * Pads the current string with a given string (possibly repeated) so that the resulting string reaches a given length.
+      * The padding is applied from the end (right) of the current string.
+      *
+      * @param maxLength The length of the resulting string once the current string has been padded.
+      *        If this parameter is smaller than the current string's length, the current string will be returned as it is.
+      *
+      * @param fillString The string to pad the current string with.
+      *        If this string is too long, it will be truncated and the left-most part will be applied.
+      *        The default value for this parameter is " " (U+0020).
+      */
+    padEnd(maxLength: number, fillString?: string): string;
+}

From 8bd0a47c825d659587b1f1e43fe3dcd8541b96a7 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Thu, 10 Nov 2016 13:11:32 -0800
Subject: [PATCH 177/421] Retain space after first word in multiline jsdoc

For words that were shorter than the jsdoc indent level, the space was
omitted previously.
---
 src/compiler/parser.ts                            | 1 +
 tests/cases/fourslash/jsDocFunctionSignatures8.ts | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 92a3dcbef11..dce53510c87 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -6238,6 +6238,7 @@ namespace ts {
                     }
                     if (token() === SyntaxKind.NewLineTrivia) {
                         state = JSDocState.BeginningOfLine;
+                        indent = 0;
                         nextJSDocToken();
                     }
                     while (token() !== SyntaxKind.EndOfFileToken) {
diff --git a/tests/cases/fourslash/jsDocFunctionSignatures8.ts b/tests/cases/fourslash/jsDocFunctionSignatures8.ts
index 3dbe38e34df..6853c70daf2 100644
--- a/tests/cases/fourslash/jsDocFunctionSignatures8.ts
+++ b/tests/cases/fourslash/jsDocFunctionSignatures8.ts
@@ -3,6 +3,7 @@
 // @Filename: Foo.js
 /////**
 //// * Represents a person
+//// * a b multiline test
 //// * @constructor
 //// * @param {string} name The name of the person
 //// * @param {number} age The age of the person
@@ -13,4 +14,4 @@
 ////}
 ////var p = new Pers/**/on();
 goTo.marker();
-verify.quickInfoIs("function Person(name: string, age: number): void", "Represents a person");
+verify.quickInfoIs("function Person(name: string, age: number): void", "Represents a person\na b multiline test");

From 4dc58dde38bd5b48003984a9b57452c228ed859d Mon Sep 17 00:00:00 2001
From: Zhengbo Li <zhengbli@microsoft.com>
Date: Thu, 10 Nov 2016 14:12:24 -0800
Subject: [PATCH 178/421] Exclude js files in non-configured projects
 compile-on-save emitting (#12118)

* Exclude js files in non-configured projects CoS emitting

* remove unnecessary method
---
 src/compiler/program.ts                | 23 ++++------
 src/compiler/types.ts                  |  2 +-
 src/compiler/utilities.ts              | 58 ++++++++++++++------------
 src/harness/unittests/compileOnSave.ts | 40 ++++++++++++++++++
 src/server/project.ts                  |  4 +-
 5 files changed, 82 insertions(+), 45 deletions(-)

diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index eb7054a9f06..8b53f68bc6f 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -1706,18 +1706,13 @@ namespace ts {
                     const emitFilePath = toPath(emitFileName, currentDirectory, getCanonicalFileName);
                     // Report error if the output overwrites input file
                     if (filesByName.contains(emitFilePath)) {
-                        if (options.noEmitOverwritenFiles && !options.out && !options.outDir && !options.outFile) {
-                            blockEmittingOfFile(emitFileName);
-                        }
-                        else {
-                            let chain: DiagnosticMessageChain;
-                            if (!options.configFilePath) {
-                                // The program is from either an inferred project or an external project
-                                chain = chainDiagnosticMessages(/*details*/ undefined, 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 = chainDiagnosticMessages(chain, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
-                            blockEmittingOfFile(emitFileName, createCompilerDiagnosticFromMessageChain(chain));
+                        let chain: DiagnosticMessageChain;
+                        if (!options.configFilePath) {
+                            // The program is from either an inferred project or an external project
+                            chain = chainDiagnosticMessages(/*details*/ undefined, 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 = chainDiagnosticMessages(chain, Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
+                        blockEmittingOfFile(emitFileName, createCompilerDiagnosticFromMessageChain(chain));
                     }
 
                     // Report error if multiple files write into same file
@@ -1732,11 +1727,9 @@ namespace ts {
             }
         }
 
-        function blockEmittingOfFile(emitFileName: string, diag?: Diagnostic) {
+        function blockEmittingOfFile(emitFileName: string, diag: Diagnostic) {
             hasEmitBlockingDiagnostics.set(toPath(emitFileName, currentDirectory, getCanonicalFileName), true);
-            if (diag) {
-                programDiagnostics.add(diag);
-            }
+            programDiagnostics.add(diag);
         }
     }
 
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 7db19af7382..c814a2b1d46 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -3075,7 +3075,7 @@ namespace ts {
         moduleResolution?: ModuleResolutionKind;
         newLine?: NewLineKind;
         noEmit?: boolean;
-        /*@internal*/noEmitOverwritenFiles?: boolean;
+        /*@internal*/noEmitForJsFiles?: boolean;
         noEmitHelpers?: boolean;
         noEmitOnError?: boolean;
         noErrorTruncation?: boolean;
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 667612d7771..c49c33b857f 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -192,7 +192,7 @@ namespace ts {
     export function nodePosToString(node: Node): string {
         const file = getSourceFileOfNode(node);
         const loc = getLineAndCharacterOfPosition(file, node.pos);
-        return `${ file.fileName }(${ loc.line + 1 },${ loc.character + 1 })`;
+        return `${file.fileName}(${loc.line + 1},${loc.character + 1})`;
     }
 
     export function getStartPosOfNode(node: Node): number {
@@ -439,7 +439,7 @@ namespace ts {
     }
 
     export function isBlockScope(node: Node, parentNode: Node) {
-        switch (node.kind)  {
+        switch (node.kind) {
             case SyntaxKind.SourceFile:
             case SyntaxKind.CaseBlock:
             case SyntaxKind.CatchClause:
@@ -644,9 +644,9 @@ namespace ts {
 
     export function getJsDocCommentsFromText(node: Node, text: string) {
         const commentRanges = (node.kind === SyntaxKind.Parameter ||
-                               node.kind === SyntaxKind.TypeParameter ||
-                               node.kind === SyntaxKind.FunctionExpression ||
-                               node.kind === SyntaxKind.ArrowFunction) ?
+            node.kind === SyntaxKind.TypeParameter ||
+            node.kind === SyntaxKind.FunctionExpression ||
+            node.kind === SyntaxKind.ArrowFunction) ?
             concatenate(getTrailingCommentRanges(text, node.pos), getLeadingCommentRanges(text, node.pos)) :
             getLeadingCommentRangesOfNodeFromText(node, text);
         return filter(commentRanges, isJsDocComment);
@@ -911,7 +911,7 @@ namespace ts {
     export function isObjectLiteralOrClassExpressionMethod(node: Node): node is MethodDeclaration {
         return node.kind === SyntaxKind.MethodDeclaration &&
             (node.parent.kind === SyntaxKind.ObjectLiteralExpression ||
-            node.parent.kind === SyntaxKind.ClassExpression);
+                node.parent.kind === SyntaxKind.ClassExpression);
     }
 
     export function isIdentifierTypePredicate(predicate: TypePredicate): predicate is IdentifierTypePredicate {
@@ -1133,8 +1133,8 @@ namespace ts {
                 // if the parameter's parent has a body and its grandparent is a class declaration, this is a valid target;
                 return (<FunctionLikeDeclaration>node.parent).body !== undefined
                     && (node.parent.kind === SyntaxKind.Constructor
-                    || node.parent.kind === SyntaxKind.MethodDeclaration
-                    || node.parent.kind === SyntaxKind.SetAccessor)
+                        || node.parent.kind === SyntaxKind.MethodDeclaration
+                        || node.parent.kind === SyntaxKind.SetAccessor)
                     && node.parent.parent.kind === SyntaxKind.ClassDeclaration;
         }
 
@@ -1481,7 +1481,7 @@ namespace ts {
         }, tags => tags);
     }
 
-   function getJSDocs<T>(node: Node, checkParentVariableStatement: boolean, getDocs: (docs: JSDoc[]) => T[], getTags: (tags: JSDocTag[]) => T[]): T[] {
+    function getJSDocs<T>(node: Node, checkParentVariableStatement: boolean, getDocs: (docs: JSDoc[]) => T[], getTags: (tags: JSDocTag[]) => T[]): T[] {
         // TODO: Get rid of getJsDocComments and friends (note the lowercase 's' in Js)
         // TODO: A lot of this work should be cached, maybe. I guess it's only used in services right now...
         let result: T[] = undefined;
@@ -1502,8 +1502,8 @@ namespace ts {
 
             const variableStatementNode =
                 isInitializerOfVariableDeclarationInStatement ? node.parent.parent.parent :
-                isVariableOfVariableDeclarationStatement ? node.parent.parent :
-                undefined;
+                    isVariableOfVariableDeclarationStatement ? node.parent.parent :
+                        undefined;
             if (variableStatementNode) {
                 result = append(result, getJSDocs(variableStatementNode, checkParentVariableStatement, getDocs, getTags));
             }
@@ -1668,7 +1668,7 @@ namespace ts {
                     if ((<ShorthandPropertyAssignment>parent).name !== node) {
                         return AssignmentKind.None;
                     }
-                    // Fall through
+                // Fall through
                 case SyntaxKind.PropertyAssignment:
                     node = parent.parent;
                     break;
@@ -2570,14 +2570,18 @@ namespace ts {
         if (options.outFile || options.out) {
             const moduleKind = getEmitModuleKind(options);
             const moduleEmitEnabled = moduleKind === ModuleKind.AMD || moduleKind === ModuleKind.System;
-            const sourceFiles = host.getSourceFiles();
+            const sourceFiles = getAllEmittableSourceFiles();
             // Can emit only sources that are not declaration file and are either non module code or module with --module or --target es6 specified
             return filter(sourceFiles, moduleEmitEnabled ? isNonDeclarationFile : isBundleEmitNonExternalModule);
         }
         else {
-            const sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
+            const sourceFiles = targetSourceFile === undefined ? getAllEmittableSourceFiles() : [targetSourceFile];
             return filter(sourceFiles, isNonDeclarationFile);
         }
+
+        function getAllEmittableSourceFiles() {
+            return options.noEmitForJsFiles ? filter(host.getSourceFiles(), sourceFile => !isSourceFileJavaScript(sourceFile)) : host.getSourceFiles();
+        }
     }
 
     function isNonDeclarationFile(sourceFile: SourceFile) {
@@ -2609,7 +2613,7 @@ namespace ts {
         }
         else {
             for (const sourceFile of sourceFiles) {
-                 // Don't emit if source file is a declaration file, or was located under node_modules
+                // Don't emit if source file is a declaration file, or was located under node_modules
                 if (!isDeclarationFile(sourceFile) && !host.isSourceFileFromExternalLibrary(sourceFile)) {
                     onSingleFileEmit(host, sourceFile);
                 }
@@ -2671,7 +2675,7 @@ namespace ts {
             onBundledEmit(host);
         }
         else {
-            const sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
+            const sourceFiles = targetSourceFile === undefined ? getSourceFilesToEmit(host) : [targetSourceFile];
             for (const sourceFile of sourceFiles) {
                 // Don't emit if source file is a declaration file, or was located under node_modules
                 if (!isDeclarationFile(sourceFile) && !host.isSourceFileFromExternalLibrary(sourceFile)) {
@@ -2709,11 +2713,11 @@ namespace ts {
         function onBundledEmit(host: EmitHost) {
             // Can emit only sources that are not declaration file and are either non module code or module with
             // --module or --target es6 specified. Files included by searching under node_modules are also not emitted.
-            const bundledSources = filter(host.getSourceFiles(),
+            const bundledSources = filter(getSourceFilesToEmit(host),
                 sourceFile => !isDeclarationFile(sourceFile) &&
-                              !host.isSourceFileFromExternalLibrary(sourceFile) &&
-                              (!isExternalModule(sourceFile) ||
-                               !!getEmitModuleKind(options)));
+                    !host.isSourceFileFromExternalLibrary(sourceFile) &&
+                    (!isExternalModule(sourceFile) ||
+                        !!getEmitModuleKind(options)));
             if (bundledSources.length) {
                 const jsFilePath = options.outFile || options.out;
                 const emitFileNames: EmitFileNames = {
@@ -2899,7 +2903,7 @@ namespace ts {
         writeComment: (text: string, lineMap: number[], writer: EmitTextWriter, commentPos: number, commentEnd: number, newLine: string) => void,
         node: TextRange, newLine: string, removeComments: boolean) {
         let leadingComments: CommentRange[];
-        let currentDetachedCommentInfo: {nodePos: number, detachedCommentEndPos: number};
+        let currentDetachedCommentInfo: { nodePos: number, detachedCommentEndPos: number };
         if (removeComments) {
             // removeComments is true, only reserve pinned comment at the top of file
             // For example:
@@ -3246,10 +3250,10 @@ namespace ts {
 
     function stringifyValue(value: any): string {
         return typeof value === "string" ? `"${escapeString(value)}"`
-             : typeof value === "number" ? isFinite(value) ? String(value) : "null"
-             : typeof value === "boolean" ? value ? "true" : "false"
-             : typeof value === "object" && value ? isArray(value) ? cycleCheck(stringifyArray, value) : cycleCheck(stringifyObject, value)
-             : /*fallback*/ "null";
+            : typeof value === "number" ? isFinite(value) ? String(value) : "null"
+                : typeof value === "boolean" ? value ? "true" : "false"
+                    : typeof value === "object" && value ? isArray(value) ? cycleCheck(stringifyArray, value) : cycleCheck(stringifyObject, value)
+                        : /*fallback*/ "null";
     }
 
     function cycleCheck(cb: (value: any) => string, value: any) {
@@ -3274,7 +3278,7 @@ namespace ts {
 
     function stringifyProperty(memo: string, value: any, key: string) {
         return value === undefined || typeof value === "function" || key === "__cycle" ? memo
-             : (memo ? memo + "," : memo) + `"${escapeString(key)}":${stringifyValue(value)}`;
+            : (memo ? memo + "," : memo) + `"${escapeString(key)}":${stringifyValue(value)}`;
     }
 
     const base64Digits = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
@@ -3519,7 +3523,7 @@ namespace ts {
      * @param token The token.
      */
     export function createTokenRange(pos: number, token: SyntaxKind): TextRange {
-        return createRange(pos,  pos + tokenToString(token).length);
+        return createRange(pos, pos + tokenToString(token).length);
     }
 
     export function rangeIsOnSingleLine(range: TextRange, sourceFile: SourceFile) {
diff --git a/src/harness/unittests/compileOnSave.ts b/src/harness/unittests/compileOnSave.ts
index 797268000eb..d7731a625fe 100644
--- a/src/harness/unittests/compileOnSave.ts
+++ b/src/harness/unittests/compileOnSave.ts
@@ -492,5 +492,45 @@ namespace ts.projectSystem {
             assert.isTrue(host.fileExists(expectedEmittedFileName));
             assert.equal(host.readFile(expectedEmittedFileName), `"use strict";\r\nfunction Foo() { return 10; }\r\nexports.Foo = Foo;\r\n`);
         });
+
+        it("shoud not emit js files in external projects", () => {
+            const file1 = {
+                path: "/a/b/file1.ts",
+                content: "consonle.log('file1');"
+            };
+            // file2 has errors. The emitting should not be blocked.
+            const file2 = {
+                path: "/a/b/file2.js",
+                content: "console.log'file2');"
+            };
+            const file3 = {
+                path: "/a/b/file3.js",
+                content: "console.log('file3');"
+            };
+            const externalProjectName = "externalproject";
+            const host = createServerHost([file1, file2, file3, libFile]);
+            const session = createSession(host);
+            const projectService = session.getProjectService();
+
+            projectService.openExternalProject({
+                rootFiles: toExternalFiles([file1.path, file2.path]),
+                options: {
+                    allowJs: true,
+                    outFile: "dist.js",
+                    compileOnSave: true
+                },
+                projectFileName: externalProjectName
+            });
+
+            const emitRequest = makeSessionRequest<server.protocol.CompileOnSaveEmitFileRequestArgs>(CommandNames.CompileOnSaveEmitFile, { file: file1.path });
+            session.executeCommand(emitRequest);
+
+            const expectedOutFileName = "/a/b/dist.js";
+            assert.isTrue(host.fileExists(expectedOutFileName));
+            const outFileContent = host.readFile(expectedOutFileName);
+            assert.isTrue(outFileContent.indexOf(file1.content) !== -1);
+            assert.isTrue(outFileContent.indexOf(file2.content) === -1);
+            assert.isTrue(outFileContent.indexOf(file3.content) === -1);
+        });
     });
 }
\ No newline at end of file
diff --git a/src/server/project.ts b/src/server/project.ts
index d01df728248..db862af7e0d 100644
--- a/src/server/project.ts
+++ b/src/server/project.ts
@@ -161,8 +161,8 @@ namespace ts.server {
                 this.compilerOptions.allowNonTsExtensions = true;
             }
 
-            if (this.projectKind === ProjectKind.Inferred) {
-                this.compilerOptions.noEmitOverwritenFiles = true;
+            if (this.projectKind === ProjectKind.Inferred || this.projectKind === ProjectKind.External) {
+                this.compilerOptions.noEmitForJsFiles = true;
             }
 
             if (languageServiceEnabled) {

From d537b79c617ac28331f2a3574c97efb6578e784e Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Thu, 10 Nov 2016 14:28:34 -0800
Subject: [PATCH 179/421] Merge release-2.1 into master (#12157)

* Update LKG

* Update version

* Update LKG

* Skip overloads with too-short function parameters

If the parameter of an overload is a function and the argument is also a
function, skip the overload if the parameter has fewer arguments than
the argument does. That overload cannot possibly apply, and should not
participate in, for example, contextual typing.

Example:

```ts
interface I {
  (a: number): void;
  (b: string, c): void;
}
declare function f(i: I): void;
f((x, y) => {});
```

This code now skips the first overload instead of considering.

This was a longstanding bug but was only uncovered now that more
functions expressions are context sensitive.

* Test skip overloads w/too-short function params

1. Update changed baseline.
2. Add a new test with baseline.

* Minor style improvements

* Ignore optionality when skipping overloads

* Do not use contextual signatures with too few parameters

* isAritySmaller runs later: getNonGenericSignature

* rewrite void-returning statements in constructors that capture result of super call (#11868)

* rewrite void-returning statements in constructors that capture result of super call

* linter

* Update LKG

* Fix emit inferred type which is a generic type-alias both fully and partially fill type parameters

* Add tests and baselines

* Skip trying to use alias if there is target type

* Update baselines

* Add diagnostics to remind adding tsconfig file for certain external project (#11932)

* Add diagnostics for certain external project

* Show tsconfig suggestion

* fix lint error

* Address pr

* fix comment

* Update error message

* Flag for not overwrite js files by default without generating errors (#11980)

* WIP

* Properly naming things

* refactor

* apply the option to all files and check out options

* Fix typo

* Update LKG

* lockLinter

* use local registry to check if typings package exist (#12014) (#12032)

use local registry to check if typings package exist

* Add test for https://github.com/Microsoft/TypeScript/pull/11980 (#12027)

* add test for the fix for overwrite emitting error

* cr feedback

* enable sending telemetry events to tsserver client (#12034) (#12051)

enable sending telemetry events

* Update LKG

* Reuse subtree transform flags for incrementally parsed nodes (#12088)

* Update LKG

* Update version

* Update LKG

* Do not emit "use strict" when targeting es6 or higher or module kind is es2015 and the file is external module

* Add tests and baselines

* [Release 2.1] fix11754 global augmentation (#12133)

* Exclude global augmentation from module resolution logic

* Address PR: check using string literal instead of NodeFlags.globalAugmentation

* Remove comment
---
 src/compiler/checker.ts                       |  2 +-
 src/compiler/program.ts                       |  8 +++--
 src/compiler/transformers/ts.ts               |  6 +++-
 .../typingsInstaller/typingsInstaller.ts      |  4 +--
 .../reference/alwaysStrictModule3.js          |  8 +++++
 .../reference/alwaysStrictModule3.symbols     |  6 ++++
 .../reference/alwaysStrictModule3.types       |  7 ++++
 .../reference/alwaysStrictModule4.js          |  9 +++++
 .../reference/alwaysStrictModule4.symbols     |  6 ++++
 .../reference/alwaysStrictModule4.types       |  7 ++++
 .../reference/alwaysStrictModule5.js          |  8 +++++
 .../reference/alwaysStrictModule5.symbols     |  6 ++++
 .../reference/alwaysStrictModule5.types       |  7 ++++
 .../reference/alwaysStrictModule6.js          |  9 +++++
 .../reference/alwaysStrictModule6.symbols     |  6 ++++
 .../reference/alwaysStrictModule6.types       |  7 ++++
 ...arationEmitTypeAliasWithTypeParameters2.js | 17 ++++++++++
 ...onEmitTypeAliasWithTypeParameters2.symbols | 30 +++++++++++++++++
 ...tionEmitTypeAliasWithTypeParameters2.types | 32 ++++++++++++++++++
 ...arationEmitTypeAliasWithTypeParameters3.js | 21 ++++++++++++
 ...onEmitTypeAliasWithTypeParameters3.symbols | 20 +++++++++++
 ...tionEmitTypeAliasWithTypeParameters3.types | 22 +++++++++++++
 ...arationEmitTypeAliasWithTypeParameters4.js | 24 ++++++++++++++
 ...onEmitTypeAliasWithTypeParameters4.symbols | 29 ++++++++++++++++
 ...tionEmitTypeAliasWithTypeParameters4.types | 31 +++++++++++++++++
 ...mitTypeAliasWithTypeParameters5.errors.txt | 16 +++++++++
 ...arationEmitTypeAliasWithTypeParameters5.js | 17 ++++++++++
 ...arationEmitTypeAliasWithTypeParameters6.js | 24 ++++++++++++++
 ...onEmitTypeAliasWithTypeParameters6.symbols | 31 +++++++++++++++++
 ...tionEmitTypeAliasWithTypeParameters6.types | 33 +++++++++++++++++++
 .../globalAugmentationModuleResolution.js     | 10 ++++++
 ...globalAugmentationModuleResolution.symbols | 10 ++++++
 ...balAugmentationModuleResolution.trace.json |  1 +
 .../globalAugmentationModuleResolution.types  | 10 ++++++
 tests/cases/compiler/alwaysStrictModule3.ts   |  5 +++
 tests/cases/compiler/alwaysStrictModule4.ts   |  5 +++
 tests/cases/compiler/alwaysStrictModule5.ts   |  5 +++
 tests/cases/compiler/alwaysStrictModule6.ts   |  5 +++
 ...arationEmitTypeAliasWithTypeParameters2.ts |  6 ++++
 ...arationEmitTypeAliasWithTypeParameters3.ts |  8 +++++
 ...arationEmitTypeAliasWithTypeParameters4.ts | 10 ++++++
 ...arationEmitTypeAliasWithTypeParameters5.ts | 10 ++++++
 ...arationEmitTypeAliasWithTypeParameters6.ts | 10 ++++++
 .../globalAugmentationModuleResolution.ts     |  8 +++++
 44 files changed, 549 insertions(+), 7 deletions(-)
 create mode 100644 tests/baselines/reference/alwaysStrictModule3.js
 create mode 100644 tests/baselines/reference/alwaysStrictModule3.symbols
 create mode 100644 tests/baselines/reference/alwaysStrictModule3.types
 create mode 100644 tests/baselines/reference/alwaysStrictModule4.js
 create mode 100644 tests/baselines/reference/alwaysStrictModule4.symbols
 create mode 100644 tests/baselines/reference/alwaysStrictModule4.types
 create mode 100644 tests/baselines/reference/alwaysStrictModule5.js
 create mode 100644 tests/baselines/reference/alwaysStrictModule5.symbols
 create mode 100644 tests/baselines/reference/alwaysStrictModule5.types
 create mode 100644 tests/baselines/reference/alwaysStrictModule6.js
 create mode 100644 tests/baselines/reference/alwaysStrictModule6.symbols
 create mode 100644 tests/baselines/reference/alwaysStrictModule6.types
 create mode 100644 tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js
 create mode 100644 tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.symbols
 create mode 100644 tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.types
 create mode 100644 tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters3.js
 create mode 100644 tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters3.symbols
 create mode 100644 tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters3.types
 create mode 100644 tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters4.js
 create mode 100644 tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters4.symbols
 create mode 100644 tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters4.types
 create mode 100644 tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.errors.txt
 create mode 100644 tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js
 create mode 100644 tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters6.js
 create mode 100644 tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters6.symbols
 create mode 100644 tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters6.types
 create mode 100644 tests/baselines/reference/globalAugmentationModuleResolution.js
 create mode 100644 tests/baselines/reference/globalAugmentationModuleResolution.symbols
 create mode 100644 tests/baselines/reference/globalAugmentationModuleResolution.trace.json
 create mode 100644 tests/baselines/reference/globalAugmentationModuleResolution.types
 create mode 100644 tests/cases/compiler/alwaysStrictModule3.ts
 create mode 100644 tests/cases/compiler/alwaysStrictModule4.ts
 create mode 100644 tests/cases/compiler/alwaysStrictModule5.ts
 create mode 100644 tests/cases/compiler/alwaysStrictModule6.ts
 create mode 100644 tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters2.ts
 create mode 100644 tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters3.ts
 create mode 100644 tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters4.ts
 create mode 100644 tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters5.ts
 create mode 100644 tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters6.ts
 create mode 100644 tests/cases/conformance/externalModules/globalAugmentationModuleResolution.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 1510979305b..7bd8dfae88b 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -11493,7 +11493,7 @@ namespace ts {
         function checkJsxOpeningLikeElement(node: JsxOpeningLikeElement) {
             checkGrammarJsxElement(node);
             checkJsxPreconditions(node);
-            // The reactNamespace/jsxFactory's root symbol should be marked as 'used' so we don't incorrectly elide its import. 
+            // The reactNamespace/jsxFactory's root symbol should be marked as 'used' so we don't incorrectly elide its import.
             // And if there is no reactNamespace/jsxFactory's symbol in scope when targeting React emit, we should issue an error.
             const reactRefErr = compilerOptions.jsx === JsxEmit.React ? Diagnostics.Cannot_find_name_0 : undefined;
             const reactNamespace = getJsxNamespace();
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 8b53f68bc6f..7225b311933 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -476,7 +476,7 @@ namespace ts {
                 return resolveModuleNamesWorker(moduleNames, containingFile);
             }
 
-            // at this point we know that either 
+            // at this point we know that either
             // - file has local declarations for ambient modules
             // OR
             // - old program state is available
@@ -670,7 +670,7 @@ namespace ts {
             }
 
             const modifiedFilePaths = modifiedSourceFiles.map(f => f.newFile.path);
-            // try to verify results of module resolution 
+            // try to verify results of module resolution
             for (const { oldFile: oldSourceFile, newFile: newSourceFile } of modifiedSourceFiles) {
                 const newSourceFilePath = getNormalizedAbsolutePath(newSourceFile.fileName, currentDirectory);
                 if (resolveModuleNamesWorker) {
@@ -1447,7 +1447,9 @@ namespace ts {
             collectExternalModuleReferences(file);
             if (file.imports.length || file.moduleAugmentations.length) {
                 file.resolvedModules = createMap<ResolvedModuleFull>();
-                const moduleNames = map(concatenate(file.imports, file.moduleAugmentations), getTextOfLiteral);
+                // Because global augmentation doesn't have string literal name, we can check for global augmentation as such.
+                const nonGlobalAugmentation = filter(file.moduleAugmentations, (moduleAugmentation) => moduleAugmentation.kind === SyntaxKind.StringLiteral);
+                const moduleNames = map(concatenate(file.imports, nonGlobalAugmentation), getTextOfLiteral);
                 const resolutions = resolveModuleNamesReusingOldState(moduleNames, getNormalizedAbsolutePath(file.fileName, currentDirectory), file);
                 Debug.assert(resolutions.length === moduleNames.length);
                 for (let i = 0; i < moduleNames.length; i++) {
diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
index 1362746ba57..89fa039100a 100644
--- a/src/compiler/transformers/ts.ts
+++ b/src/compiler/transformers/ts.ts
@@ -471,7 +471,11 @@ namespace ts {
             currentSourceFile = node;
 
             // ensure "use strict" is emitted in all scenarios in alwaysStrict mode
-            if (compilerOptions.alwaysStrict) {
+            // There is no need to emit "use strict" in the following cases:
+            //      1. The file is an external module and target is es2015 or higher
+            //      or 2. The file is an external module and module-kind is es6 or es2015 as such value is not allowed when targeting es5 or lower
+            if (compilerOptions.alwaysStrict &&
+                !(isExternalModule(node) && (compilerOptions.target >= ScriptTarget.ES2015 || compilerOptions.module === ModuleKind.ES2015))) {
                 node = ensureUseStrict(node);
             }
 
diff --git a/src/server/typingsInstaller/typingsInstaller.ts b/src/server/typingsInstaller/typingsInstaller.ts
index da97dbcd194..0873d5c328b 100644
--- a/src/server/typingsInstaller/typingsInstaller.ts
+++ b/src/server/typingsInstaller/typingsInstaller.ts
@@ -69,7 +69,7 @@ namespace ts.server.typingsInstaller {
         requestId: number;
         args: string[];
         cwd: string;
-        onRequestCompleted: RequestCompletedAction
+        onRequestCompleted: RequestCompletedAction;
     };
 
     export abstract class TypingsInstaller {
@@ -380,7 +380,7 @@ namespace ts.server.typingsInstaller {
                 compilerOptions: request.compilerOptions,
                 typings,
                 unresolvedImports: request.unresolvedImports,
-                kind: server.ActionSet
+                kind: ActionSet
             };
         }
 
diff --git a/tests/baselines/reference/alwaysStrictModule3.js b/tests/baselines/reference/alwaysStrictModule3.js
new file mode 100644
index 00000000000..894bad25143
--- /dev/null
+++ b/tests/baselines/reference/alwaysStrictModule3.js
@@ -0,0 +1,8 @@
+//// [alwaysStrictModule3.ts]
+
+// module ES2015
+export const a = 1;
+
+//// [alwaysStrictModule3.js]
+// module ES2015
+export var a = 1;
diff --git a/tests/baselines/reference/alwaysStrictModule3.symbols b/tests/baselines/reference/alwaysStrictModule3.symbols
new file mode 100644
index 00000000000..6f053673f0e
--- /dev/null
+++ b/tests/baselines/reference/alwaysStrictModule3.symbols
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/alwaysStrictModule3.ts ===
+
+// module ES2015
+export const a = 1;
+>a : Symbol(a, Decl(alwaysStrictModule3.ts, 2, 12))
+
diff --git a/tests/baselines/reference/alwaysStrictModule3.types b/tests/baselines/reference/alwaysStrictModule3.types
new file mode 100644
index 00000000000..75b11206a4f
--- /dev/null
+++ b/tests/baselines/reference/alwaysStrictModule3.types
@@ -0,0 +1,7 @@
+=== tests/cases/compiler/alwaysStrictModule3.ts ===
+
+// module ES2015
+export const a = 1;
+>a : 1
+>1 : 1
+
diff --git a/tests/baselines/reference/alwaysStrictModule4.js b/tests/baselines/reference/alwaysStrictModule4.js
new file mode 100644
index 00000000000..1444f351bbd
--- /dev/null
+++ b/tests/baselines/reference/alwaysStrictModule4.js
@@ -0,0 +1,9 @@
+//// [alwaysStrictModule4.ts]
+
+// Module commonjs
+export const a = 1
+
+//// [alwaysStrictModule4.js]
+"use strict";
+// Module commonjs
+exports.a = 1;
diff --git a/tests/baselines/reference/alwaysStrictModule4.symbols b/tests/baselines/reference/alwaysStrictModule4.symbols
new file mode 100644
index 00000000000..4b8a968ae16
--- /dev/null
+++ b/tests/baselines/reference/alwaysStrictModule4.symbols
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/alwaysStrictModule4.ts ===
+
+// Module commonjs
+export const a = 1
+>a : Symbol(a, Decl(alwaysStrictModule4.ts, 2, 12))
+
diff --git a/tests/baselines/reference/alwaysStrictModule4.types b/tests/baselines/reference/alwaysStrictModule4.types
new file mode 100644
index 00000000000..fff87967605
--- /dev/null
+++ b/tests/baselines/reference/alwaysStrictModule4.types
@@ -0,0 +1,7 @@
+=== tests/cases/compiler/alwaysStrictModule4.ts ===
+
+// Module commonjs
+export const a = 1
+>a : 1
+>1 : 1
+
diff --git a/tests/baselines/reference/alwaysStrictModule5.js b/tests/baselines/reference/alwaysStrictModule5.js
new file mode 100644
index 00000000000..74b9d72263c
--- /dev/null
+++ b/tests/baselines/reference/alwaysStrictModule5.js
@@ -0,0 +1,8 @@
+//// [alwaysStrictModule5.ts]
+
+// Targeting ES6
+export const a = 1; 
+
+//// [alwaysStrictModule5.js]
+// Targeting ES6
+export const a = 1;
diff --git a/tests/baselines/reference/alwaysStrictModule5.symbols b/tests/baselines/reference/alwaysStrictModule5.symbols
new file mode 100644
index 00000000000..903bf3c5c98
--- /dev/null
+++ b/tests/baselines/reference/alwaysStrictModule5.symbols
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/alwaysStrictModule5.ts ===
+
+// Targeting ES6
+export const a = 1; 
+>a : Symbol(a, Decl(alwaysStrictModule5.ts, 2, 12))
+
diff --git a/tests/baselines/reference/alwaysStrictModule5.types b/tests/baselines/reference/alwaysStrictModule5.types
new file mode 100644
index 00000000000..2bfa329ad7e
--- /dev/null
+++ b/tests/baselines/reference/alwaysStrictModule5.types
@@ -0,0 +1,7 @@
+=== tests/cases/compiler/alwaysStrictModule5.ts ===
+
+// Targeting ES6
+export const a = 1; 
+>a : 1
+>1 : 1
+
diff --git a/tests/baselines/reference/alwaysStrictModule6.js b/tests/baselines/reference/alwaysStrictModule6.js
new file mode 100644
index 00000000000..9a603926169
--- /dev/null
+++ b/tests/baselines/reference/alwaysStrictModule6.js
@@ -0,0 +1,9 @@
+//// [alwaysStrictModule6.ts]
+
+// Targeting ES5
+export const a = 1; 
+
+//// [alwaysStrictModule6.js]
+"use strict";
+// Targeting ES5
+exports.a = 1;
diff --git a/tests/baselines/reference/alwaysStrictModule6.symbols b/tests/baselines/reference/alwaysStrictModule6.symbols
new file mode 100644
index 00000000000..59a70f3e5b5
--- /dev/null
+++ b/tests/baselines/reference/alwaysStrictModule6.symbols
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/alwaysStrictModule6.ts ===
+
+// Targeting ES5
+export const a = 1; 
+>a : Symbol(a, Decl(alwaysStrictModule6.ts, 2, 12))
+
diff --git a/tests/baselines/reference/alwaysStrictModule6.types b/tests/baselines/reference/alwaysStrictModule6.types
new file mode 100644
index 00000000000..0970380911e
--- /dev/null
+++ b/tests/baselines/reference/alwaysStrictModule6.types
@@ -0,0 +1,7 @@
+=== tests/cases/compiler/alwaysStrictModule6.ts ===
+
+// Targeting ES5
+export const a = 1; 
+>a : 1
+>1 : 1
+
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js
new file mode 100644
index 00000000000..d5bf31bd755
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js
@@ -0,0 +1,17 @@
+//// [declarationEmitTypeAliasWithTypeParameters2.ts]
+
+export type Bar<X, Y, Z> = () => [X, Y, Z];
+export type Baz<M, N> = Bar<M, string, N>;
+export type Baa<Y> = Baz<boolean, Y>;
+export const y = (x: Baa<number>) => 1
+
+//// [declarationEmitTypeAliasWithTypeParameters2.js]
+"use strict";
+exports.y = function (x) { return 1; };
+
+
+//// [declarationEmitTypeAliasWithTypeParameters2.d.ts]
+export declare type Bar<X, Y, Z> = () => [X, Y, Z];
+export declare type Baz<M, N> = Bar<M, string, N>;
+export declare type Baa<Y> = Baz<boolean, Y>;
+export declare const y: (x: Bar<boolean, string, number>) => number;
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.symbols b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.symbols
new file mode 100644
index 00000000000..cc13e9fd30b
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.symbols
@@ -0,0 +1,30 @@
+=== tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters2.ts ===
+
+export type Bar<X, Y, Z> = () => [X, Y, Z];
+>Bar : Symbol(Bar, Decl(declarationEmitTypeAliasWithTypeParameters2.ts, 0, 0))
+>X : Symbol(X, Decl(declarationEmitTypeAliasWithTypeParameters2.ts, 1, 16))
+>Y : Symbol(Y, Decl(declarationEmitTypeAliasWithTypeParameters2.ts, 1, 18))
+>Z : Symbol(Z, Decl(declarationEmitTypeAliasWithTypeParameters2.ts, 1, 21))
+>X : Symbol(X, Decl(declarationEmitTypeAliasWithTypeParameters2.ts, 1, 16))
+>Y : Symbol(Y, Decl(declarationEmitTypeAliasWithTypeParameters2.ts, 1, 18))
+>Z : Symbol(Z, Decl(declarationEmitTypeAliasWithTypeParameters2.ts, 1, 21))
+
+export type Baz<M, N> = Bar<M, string, N>;
+>Baz : Symbol(Baz, Decl(declarationEmitTypeAliasWithTypeParameters2.ts, 1, 43))
+>M : Symbol(M, Decl(declarationEmitTypeAliasWithTypeParameters2.ts, 2, 16))
+>N : Symbol(N, Decl(declarationEmitTypeAliasWithTypeParameters2.ts, 2, 18))
+>Bar : Symbol(Bar, Decl(declarationEmitTypeAliasWithTypeParameters2.ts, 0, 0))
+>M : Symbol(M, Decl(declarationEmitTypeAliasWithTypeParameters2.ts, 2, 16))
+>N : Symbol(N, Decl(declarationEmitTypeAliasWithTypeParameters2.ts, 2, 18))
+
+export type Baa<Y> = Baz<boolean, Y>;
+>Baa : Symbol(Baa, Decl(declarationEmitTypeAliasWithTypeParameters2.ts, 2, 42))
+>Y : Symbol(Y, Decl(declarationEmitTypeAliasWithTypeParameters2.ts, 3, 16))
+>Baz : Symbol(Baz, Decl(declarationEmitTypeAliasWithTypeParameters2.ts, 1, 43))
+>Y : Symbol(Y, Decl(declarationEmitTypeAliasWithTypeParameters2.ts, 3, 16))
+
+export const y = (x: Baa<number>) => 1
+>y : Symbol(y, Decl(declarationEmitTypeAliasWithTypeParameters2.ts, 4, 12))
+>x : Symbol(x, Decl(declarationEmitTypeAliasWithTypeParameters2.ts, 4, 18))
+>Baa : Symbol(Baa, Decl(declarationEmitTypeAliasWithTypeParameters2.ts, 2, 42))
+
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.types b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.types
new file mode 100644
index 00000000000..74becc49765
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.types
@@ -0,0 +1,32 @@
+=== tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters2.ts ===
+
+export type Bar<X, Y, Z> = () => [X, Y, Z];
+>Bar : Bar<X, Y, Z>
+>X : X
+>Y : Y
+>Z : Z
+>X : X
+>Y : Y
+>Z : Z
+
+export type Baz<M, N> = Bar<M, string, N>;
+>Baz : Bar<M, string, N>
+>M : M
+>N : N
+>Bar : Bar<X, Y, Z>
+>M : M
+>N : N
+
+export type Baa<Y> = Baz<boolean, Y>;
+>Baa : Bar<boolean, string, Y>
+>Y : Y
+>Baz : Bar<M, string, N>
+>Y : Y
+
+export const y = (x: Baa<number>) => 1
+>y : (x: Bar<boolean, string, number>) => number
+>(x: Baa<number>) => 1 : (x: Bar<boolean, string, number>) => number
+>x : Bar<boolean, string, number>
+>Baa : Bar<boolean, string, Y>
+>1 : 1
+
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters3.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters3.js
new file mode 100644
index 00000000000..9e2a366a685
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters3.js
@@ -0,0 +1,21 @@
+//// [declarationEmitTypeAliasWithTypeParameters3.ts]
+
+type Foo<T> = {
+    foo<U>(): Foo<U>
+};
+function bar() {
+    return {} as Foo<number>;
+}
+
+
+//// [declarationEmitTypeAliasWithTypeParameters3.js]
+function bar() {
+    return {};
+}
+
+
+//// [declarationEmitTypeAliasWithTypeParameters3.d.ts]
+declare type Foo<T> = {
+    foo<U>(): Foo<U>;
+};
+declare function bar(): Foo<number>;
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters3.symbols b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters3.symbols
new file mode 100644
index 00000000000..a18b1372cf1
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters3.symbols
@@ -0,0 +1,20 @@
+=== tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters3.ts ===
+
+type Foo<T> = {
+>Foo : Symbol(Foo, Decl(declarationEmitTypeAliasWithTypeParameters3.ts, 0, 0))
+>T : Symbol(T, Decl(declarationEmitTypeAliasWithTypeParameters3.ts, 1, 9))
+
+    foo<U>(): Foo<U>
+>foo : Symbol(foo, Decl(declarationEmitTypeAliasWithTypeParameters3.ts, 1, 15))
+>U : Symbol(U, Decl(declarationEmitTypeAliasWithTypeParameters3.ts, 2, 8))
+>Foo : Symbol(Foo, Decl(declarationEmitTypeAliasWithTypeParameters3.ts, 0, 0))
+>U : Symbol(U, Decl(declarationEmitTypeAliasWithTypeParameters3.ts, 2, 8))
+
+};
+function bar() {
+>bar : Symbol(bar, Decl(declarationEmitTypeAliasWithTypeParameters3.ts, 3, 2))
+
+    return {} as Foo<number>;
+>Foo : Symbol(Foo, Decl(declarationEmitTypeAliasWithTypeParameters3.ts, 0, 0))
+}
+
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters3.types b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters3.types
new file mode 100644
index 00000000000..1b2ff140178
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters3.types
@@ -0,0 +1,22 @@
+=== tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters3.ts ===
+
+type Foo<T> = {
+>Foo : Foo<T>
+>T : T
+
+    foo<U>(): Foo<U>
+>foo : <U>() => Foo<U>
+>U : U
+>Foo : Foo<T>
+>U : U
+
+};
+function bar() {
+>bar : () => Foo<number>
+
+    return {} as Foo<number>;
+>{} as Foo<number> : Foo<number>
+>{} : {}
+>Foo : Foo<T>
+}
+
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters4.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters4.js
new file mode 100644
index 00000000000..26908d915e0
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters4.js
@@ -0,0 +1,24 @@
+//// [declarationEmitTypeAliasWithTypeParameters4.ts]
+
+type Foo<T, Y> = {
+    foo<U, J>(): Foo<U, J>
+};
+type SubFoo<R> = Foo<string, R>;
+
+function foo() {
+    return {} as SubFoo<number>;
+}
+
+
+//// [declarationEmitTypeAliasWithTypeParameters4.js]
+function foo() {
+    return {};
+}
+
+
+//// [declarationEmitTypeAliasWithTypeParameters4.d.ts]
+declare type Foo<T, Y> = {
+    foo<U, J>(): Foo<U, J>;
+};
+declare type SubFoo<R> = Foo<string, R>;
+declare function foo(): Foo<string, number>;
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters4.symbols b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters4.symbols
new file mode 100644
index 00000000000..de73f544645
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters4.symbols
@@ -0,0 +1,29 @@
+=== tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters4.ts ===
+
+type Foo<T, Y> = {
+>Foo : Symbol(Foo, Decl(declarationEmitTypeAliasWithTypeParameters4.ts, 0, 0))
+>T : Symbol(T, Decl(declarationEmitTypeAliasWithTypeParameters4.ts, 1, 9))
+>Y : Symbol(Y, Decl(declarationEmitTypeAliasWithTypeParameters4.ts, 1, 11))
+
+    foo<U, J>(): Foo<U, J>
+>foo : Symbol(foo, Decl(declarationEmitTypeAliasWithTypeParameters4.ts, 1, 18))
+>U : Symbol(U, Decl(declarationEmitTypeAliasWithTypeParameters4.ts, 2, 8))
+>J : Symbol(J, Decl(declarationEmitTypeAliasWithTypeParameters4.ts, 2, 10))
+>Foo : Symbol(Foo, Decl(declarationEmitTypeAliasWithTypeParameters4.ts, 0, 0))
+>U : Symbol(U, Decl(declarationEmitTypeAliasWithTypeParameters4.ts, 2, 8))
+>J : Symbol(J, Decl(declarationEmitTypeAliasWithTypeParameters4.ts, 2, 10))
+
+};
+type SubFoo<R> = Foo<string, R>;
+>SubFoo : Symbol(SubFoo, Decl(declarationEmitTypeAliasWithTypeParameters4.ts, 3, 2))
+>R : Symbol(R, Decl(declarationEmitTypeAliasWithTypeParameters4.ts, 4, 12))
+>Foo : Symbol(Foo, Decl(declarationEmitTypeAliasWithTypeParameters4.ts, 0, 0))
+>R : Symbol(R, Decl(declarationEmitTypeAliasWithTypeParameters4.ts, 4, 12))
+
+function foo() {
+>foo : Symbol(foo, Decl(declarationEmitTypeAliasWithTypeParameters4.ts, 4, 32))
+
+    return {} as SubFoo<number>;
+>SubFoo : Symbol(SubFoo, Decl(declarationEmitTypeAliasWithTypeParameters4.ts, 3, 2))
+}
+
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters4.types b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters4.types
new file mode 100644
index 00000000000..c545ac6bb05
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters4.types
@@ -0,0 +1,31 @@
+=== tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters4.ts ===
+
+type Foo<T, Y> = {
+>Foo : Foo<T, Y>
+>T : T
+>Y : Y
+
+    foo<U, J>(): Foo<U, J>
+>foo : <U, J>() => Foo<U, J>
+>U : U
+>J : J
+>Foo : Foo<T, Y>
+>U : U
+>J : J
+
+};
+type SubFoo<R> = Foo<string, R>;
+>SubFoo : Foo<string, R>
+>R : R
+>Foo : Foo<T, Y>
+>R : R
+
+function foo() {
+>foo : () => Foo<string, number>
+
+    return {} as SubFoo<number>;
+>{} as SubFoo<number> : Foo<string, number>
+>{} : {}
+>SubFoo : Foo<string, R>
+}
+
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.errors.txt b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.errors.txt
new file mode 100644
index 00000000000..7f683dcc7b7
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.errors.txt
@@ -0,0 +1,16 @@
+tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters5.ts(5,25): error TS4081: Exported type alias 'SubFoo' has or is using private name 'Foo'.
+
+
+==== tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters5.ts (1 errors) ====
+    
+    type Foo<T, Y> = {
+        foo<U, J>(): Foo<U, J>
+    };
+    export type SubFoo<R> = Foo<string, R>;
+                            ~~~
+!!! error TS4081: Exported type alias 'SubFoo' has or is using private name 'Foo'.
+    
+    function foo() {
+        return {} as SubFoo<number>;
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js
new file mode 100644
index 00000000000..2f4fff7d72c
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js
@@ -0,0 +1,17 @@
+//// [declarationEmitTypeAliasWithTypeParameters5.ts]
+
+type Foo<T, Y> = {
+    foo<U, J>(): Foo<U, J>
+};
+export type SubFoo<R> = Foo<string, R>;
+
+function foo() {
+    return {} as SubFoo<number>;
+}
+
+
+//// [declarationEmitTypeAliasWithTypeParameters5.js]
+"use strict";
+function foo() {
+    return {};
+}
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters6.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters6.js
new file mode 100644
index 00000000000..c8001446e3e
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters6.js
@@ -0,0 +1,24 @@
+//// [declarationEmitTypeAliasWithTypeParameters6.ts]
+
+type Foo<T, Y> = {
+    foo<U, J>(): Foo<U, J>
+};
+type SubFoo<R, S> = Foo<S, R>;
+
+function foo() {
+    return {} as SubFoo<number, string>;
+}
+
+
+//// [declarationEmitTypeAliasWithTypeParameters6.js]
+function foo() {
+    return {};
+}
+
+
+//// [declarationEmitTypeAliasWithTypeParameters6.d.ts]
+declare type Foo<T, Y> = {
+    foo<U, J>(): Foo<U, J>;
+};
+declare type SubFoo<R, S> = Foo<S, R>;
+declare function foo(): Foo<string, number>;
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters6.symbols b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters6.symbols
new file mode 100644
index 00000000000..ec29989f078
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters6.symbols
@@ -0,0 +1,31 @@
+=== tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters6.ts ===
+
+type Foo<T, Y> = {
+>Foo : Symbol(Foo, Decl(declarationEmitTypeAliasWithTypeParameters6.ts, 0, 0))
+>T : Symbol(T, Decl(declarationEmitTypeAliasWithTypeParameters6.ts, 1, 9))
+>Y : Symbol(Y, Decl(declarationEmitTypeAliasWithTypeParameters6.ts, 1, 11))
+
+    foo<U, J>(): Foo<U, J>
+>foo : Symbol(foo, Decl(declarationEmitTypeAliasWithTypeParameters6.ts, 1, 18))
+>U : Symbol(U, Decl(declarationEmitTypeAliasWithTypeParameters6.ts, 2, 8))
+>J : Symbol(J, Decl(declarationEmitTypeAliasWithTypeParameters6.ts, 2, 10))
+>Foo : Symbol(Foo, Decl(declarationEmitTypeAliasWithTypeParameters6.ts, 0, 0))
+>U : Symbol(U, Decl(declarationEmitTypeAliasWithTypeParameters6.ts, 2, 8))
+>J : Symbol(J, Decl(declarationEmitTypeAliasWithTypeParameters6.ts, 2, 10))
+
+};
+type SubFoo<R, S> = Foo<S, R>;
+>SubFoo : Symbol(SubFoo, Decl(declarationEmitTypeAliasWithTypeParameters6.ts, 3, 2))
+>R : Symbol(R, Decl(declarationEmitTypeAliasWithTypeParameters6.ts, 4, 12))
+>S : Symbol(S, Decl(declarationEmitTypeAliasWithTypeParameters6.ts, 4, 14))
+>Foo : Symbol(Foo, Decl(declarationEmitTypeAliasWithTypeParameters6.ts, 0, 0))
+>S : Symbol(S, Decl(declarationEmitTypeAliasWithTypeParameters6.ts, 4, 14))
+>R : Symbol(R, Decl(declarationEmitTypeAliasWithTypeParameters6.ts, 4, 12))
+
+function foo() {
+>foo : Symbol(foo, Decl(declarationEmitTypeAliasWithTypeParameters6.ts, 4, 30))
+
+    return {} as SubFoo<number, string>;
+>SubFoo : Symbol(SubFoo, Decl(declarationEmitTypeAliasWithTypeParameters6.ts, 3, 2))
+}
+
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters6.types b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters6.types
new file mode 100644
index 00000000000..b02ccbc2be7
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters6.types
@@ -0,0 +1,33 @@
+=== tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters6.ts ===
+
+type Foo<T, Y> = {
+>Foo : Foo<T, Y>
+>T : T
+>Y : Y
+
+    foo<U, J>(): Foo<U, J>
+>foo : <U, J>() => Foo<U, J>
+>U : U
+>J : J
+>Foo : Foo<T, Y>
+>U : U
+>J : J
+
+};
+type SubFoo<R, S> = Foo<S, R>;
+>SubFoo : Foo<S, R>
+>R : R
+>S : S
+>Foo : Foo<T, Y>
+>S : S
+>R : R
+
+function foo() {
+>foo : () => Foo<string, number>
+
+    return {} as SubFoo<number, string>;
+>{} as SubFoo<number, string> : Foo<string, number>
+>{} : {}
+>SubFoo : Foo<S, R>
+}
+
diff --git a/tests/baselines/reference/globalAugmentationModuleResolution.js b/tests/baselines/reference/globalAugmentationModuleResolution.js
new file mode 100644
index 00000000000..e1a4ebce8c5
--- /dev/null
+++ b/tests/baselines/reference/globalAugmentationModuleResolution.js
@@ -0,0 +1,10 @@
+//// [a.ts]
+
+export { };
+
+declare global {
+  var x: number;
+}
+
+//// [a.js]
+"use strict";
diff --git a/tests/baselines/reference/globalAugmentationModuleResolution.symbols b/tests/baselines/reference/globalAugmentationModuleResolution.symbols
new file mode 100644
index 00000000000..614860d654e
--- /dev/null
+++ b/tests/baselines/reference/globalAugmentationModuleResolution.symbols
@@ -0,0 +1,10 @@
+=== tests/cases/conformance/externalModules/a.ts ===
+
+export { };
+
+declare global {
+>global : Symbol(global, Decl(a.ts, 1, 11))
+
+  var x: number;
+>x : Symbol(x, Decl(a.ts, 4, 5))
+}
diff --git a/tests/baselines/reference/globalAugmentationModuleResolution.trace.json b/tests/baselines/reference/globalAugmentationModuleResolution.trace.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/tests/baselines/reference/globalAugmentationModuleResolution.trace.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/tests/baselines/reference/globalAugmentationModuleResolution.types b/tests/baselines/reference/globalAugmentationModuleResolution.types
new file mode 100644
index 00000000000..c057ea2943d
--- /dev/null
+++ b/tests/baselines/reference/globalAugmentationModuleResolution.types
@@ -0,0 +1,10 @@
+=== tests/cases/conformance/externalModules/a.ts ===
+
+export { };
+
+declare global {
+>global : any
+
+  var x: number;
+>x : number
+}
diff --git a/tests/cases/compiler/alwaysStrictModule3.ts b/tests/cases/compiler/alwaysStrictModule3.ts
new file mode 100644
index 00000000000..adb93cede36
--- /dev/null
+++ b/tests/cases/compiler/alwaysStrictModule3.ts
@@ -0,0 +1,5 @@
+// @alwaysStrict: true
+// @module: es2015
+
+// module ES2015
+export const a = 1;
\ No newline at end of file
diff --git a/tests/cases/compiler/alwaysStrictModule4.ts b/tests/cases/compiler/alwaysStrictModule4.ts
new file mode 100644
index 00000000000..f731e6dd734
--- /dev/null
+++ b/tests/cases/compiler/alwaysStrictModule4.ts
@@ -0,0 +1,5 @@
+// @alwaysStrict: true
+// @module: commonjs
+
+// Module commonjs
+export const a = 1
\ No newline at end of file
diff --git a/tests/cases/compiler/alwaysStrictModule5.ts b/tests/cases/compiler/alwaysStrictModule5.ts
new file mode 100644
index 00000000000..d1ac5288370
--- /dev/null
+++ b/tests/cases/compiler/alwaysStrictModule5.ts
@@ -0,0 +1,5 @@
+// @alwaysStrict: true
+// @target: es6
+
+// Targeting ES6
+export const a = 1; 
\ No newline at end of file
diff --git a/tests/cases/compiler/alwaysStrictModule6.ts b/tests/cases/compiler/alwaysStrictModule6.ts
new file mode 100644
index 00000000000..064ece1a4e1
--- /dev/null
+++ b/tests/cases/compiler/alwaysStrictModule6.ts
@@ -0,0 +1,5 @@
+// @alwaysStrict: true
+// @target: es5
+
+// Targeting ES5
+export const a = 1; 
\ No newline at end of file
diff --git a/tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters2.ts b/tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters2.ts
new file mode 100644
index 00000000000..de94ad4998d
--- /dev/null
+++ b/tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters2.ts
@@ -0,0 +1,6 @@
+// @declaration: true
+
+export type Bar<X, Y, Z> = () => [X, Y, Z];
+export type Baz<M, N> = Bar<M, string, N>;
+export type Baa<Y> = Baz<boolean, Y>;
+export const y = (x: Baa<number>) => 1
\ No newline at end of file
diff --git a/tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters3.ts b/tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters3.ts
new file mode 100644
index 00000000000..6c7d4799abc
--- /dev/null
+++ b/tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters3.ts
@@ -0,0 +1,8 @@
+// @declaration: true
+
+type Foo<T> = {
+    foo<U>(): Foo<U>
+};
+function bar() {
+    return {} as Foo<number>;
+}
diff --git a/tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters4.ts b/tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters4.ts
new file mode 100644
index 00000000000..42bb8097997
--- /dev/null
+++ b/tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters4.ts
@@ -0,0 +1,10 @@
+// @declaration: true
+
+type Foo<T, Y> = {
+    foo<U, J>(): Foo<U, J>
+};
+type SubFoo<R> = Foo<string, R>;
+
+function foo() {
+    return {} as SubFoo<number>;
+}
diff --git a/tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters5.ts b/tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters5.ts
new file mode 100644
index 00000000000..b6334e76337
--- /dev/null
+++ b/tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters5.ts
@@ -0,0 +1,10 @@
+// @declaration: true
+
+type Foo<T, Y> = {
+    foo<U, J>(): Foo<U, J>
+};
+export type SubFoo<R> = Foo<string, R>;
+
+function foo() {
+    return {} as SubFoo<number>;
+}
diff --git a/tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters6.ts b/tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters6.ts
new file mode 100644
index 00000000000..9b313027021
--- /dev/null
+++ b/tests/cases/compiler/declarationEmitTypeAliasWithTypeParameters6.ts
@@ -0,0 +1,10 @@
+// @declaration: true
+
+type Foo<T, Y> = {
+    foo<U, J>(): Foo<U, J>
+};
+type SubFoo<R, S> = Foo<S, R>;
+
+function foo() {
+    return {} as SubFoo<number, string>;
+}
diff --git a/tests/cases/conformance/externalModules/globalAugmentationModuleResolution.ts b/tests/cases/conformance/externalModules/globalAugmentationModuleResolution.ts
new file mode 100644
index 00000000000..4d87ffcab13
--- /dev/null
+++ b/tests/cases/conformance/externalModules/globalAugmentationModuleResolution.ts
@@ -0,0 +1,8 @@
+// @traceResolution: true
+
+// @fileName: a.ts
+export { };
+
+declare global {
+  var x: number;
+}
\ No newline at end of file

From e301cfe58c62454c06d3e6b173295296f2cd6857 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Thu, 10 Nov 2016 14:29:48 -0800
Subject: [PATCH 180/421] Raise literal type to its base in a comparison

Similar to ===, except that it always applies, even when comparing two
literals.
---
 src/compiler/checker.ts                       |  2 +
 .../relationalOperatorComparable.errors.txt   | 40 +++++++++++++++++++
 .../reference/relationalOperatorComparable.js | 34 ++++++++++++++++
 .../compiler/relationalOperatorComparable.ts  | 15 +++++++
 4 files changed, 91 insertions(+)
 create mode 100644 tests/baselines/reference/relationalOperatorComparable.errors.txt
 create mode 100644 tests/baselines/reference/relationalOperatorComparable.js
 create mode 100644 tests/cases/compiler/relationalOperatorComparable.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 1510979305b..e119c965f0f 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -14241,6 +14241,8 @@ namespace ts {
                 case SyntaxKind.LessThanEqualsToken:
                 case SyntaxKind.GreaterThanEqualsToken:
                     if (checkForDisallowedESSymbolOperand(operator)) {
+                        leftType = getBaseTypeOfLiteralType(leftType);
+                        rightType = getBaseTypeOfLiteralType(rightType);
                         if (!isTypeComparableTo(leftType, rightType) && !isTypeComparableTo(rightType, leftType)) {
                             reportOperatorError();
                         }
diff --git a/tests/baselines/reference/relationalOperatorComparable.errors.txt b/tests/baselines/reference/relationalOperatorComparable.errors.txt
new file mode 100644
index 00000000000..bc48eaf92c0
--- /dev/null
+++ b/tests/baselines/reference/relationalOperatorComparable.errors.txt
@@ -0,0 +1,40 @@
+tests/cases/compiler/relationalOperatorComparable.ts(5,14): error TS2365: Operator '<' cannot be applied to types 'number' and 'boolean'.
+tests/cases/compiler/relationalOperatorComparable.ts(6,14): error TS2365: Operator '<=' cannot be applied to types 'number' and 'boolean'.
+tests/cases/compiler/relationalOperatorComparable.ts(7,14): error TS2365: Operator '>=' cannot be applied to types 'number' and 'boolean'.
+tests/cases/compiler/relationalOperatorComparable.ts(8,14): error TS2365: Operator '>' cannot be applied to types 'number' and 'boolean'.
+tests/cases/compiler/relationalOperatorComparable.ts(9,14): error TS2365: Operator '<' cannot be applied to types 'boolean' and 'number'.
+tests/cases/compiler/relationalOperatorComparable.ts(10,14): error TS2365: Operator '<' cannot be applied to types 'boolean' and 'number'.
+tests/cases/compiler/relationalOperatorComparable.ts(11,14): error TS2365: Operator '<' cannot be applied to types 'string' and 'number'.
+
+
+==== tests/cases/compiler/relationalOperatorComparable.ts (7 errors) ====
+    function f(onethree: 1 | 3, two: 2) {
+        const t = true;
+        const f = false;
+        let a1 = onethree < two; // ok
+        let a2 = onethree < true; // error, number and boolean
+                 ~~~~~~~~~~~~~~~
+!!! error TS2365: Operator '<' cannot be applied to types 'number' and 'boolean'.
+        let a3 = onethree <= false; // error, number and boolean
+                 ~~~~~~~~~~~~~~~~~
+!!! error TS2365: Operator '<=' cannot be applied to types 'number' and 'boolean'.
+        let a4 = onethree >= t; // error, number and boolean
+                 ~~~~~~~~~~~~~
+!!! error TS2365: Operator '>=' cannot be applied to types 'number' and 'boolean'.
+        let a5 = onethree > f; // error, number and boolean
+                 ~~~~~~~~~~~~
+!!! error TS2365: Operator '>' cannot be applied to types 'number' and 'boolean'.
+        let a6 = true < onethree; // error, boolean and number
+                 ~~~~~~~~~~~~~~~
+!!! error TS2365: Operator '<' cannot be applied to types 'boolean' and 'number'.
+        let a7 = false < two; // error, boolean and number
+                 ~~~~~~~~~~~
+!!! error TS2365: Operator '<' cannot be applied to types 'boolean' and 'number'.
+        let a8 = 'foo' < onethree; // error, string and number
+                 ~~~~~~~~~~~~~~~~
+!!! error TS2365: Operator '<' cannot be applied to types 'string' and 'number'.
+        let a9 = onethree < 1; // ok
+        let a10 = 1 < two; // ok
+        let a11 = 2 < 1; // ok
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/relationalOperatorComparable.js b/tests/baselines/reference/relationalOperatorComparable.js
new file mode 100644
index 00000000000..019c257fe7d
--- /dev/null
+++ b/tests/baselines/reference/relationalOperatorComparable.js
@@ -0,0 +1,34 @@
+//// [relationalOperatorComparable.ts]
+function f(onethree: 1 | 3, two: 2) {
+    const t = true;
+    const f = false;
+    let a1 = onethree < two; // ok
+    let a2 = onethree < true; // error, number and boolean
+    let a3 = onethree <= false; // error, number and boolean
+    let a4 = onethree >= t; // error, number and boolean
+    let a5 = onethree > f; // error, number and boolean
+    let a6 = true < onethree; // error, boolean and number
+    let a7 = false < two; // error, boolean and number
+    let a8 = 'foo' < onethree; // error, string and number
+    let a9 = onethree < 1; // ok
+    let a10 = 1 < two; // ok
+    let a11 = 2 < 1; // ok
+}
+
+
+//// [relationalOperatorComparable.js]
+function f(onethree, two) {
+    var t = true;
+    var f = false;
+    var a1 = onethree < two; // ok
+    var a2 = onethree < true; // error, number and boolean
+    var a3 = onethree <= false; // error, number and boolean
+    var a4 = onethree >= t; // error, number and boolean
+    var a5 = onethree > f; // error, number and boolean
+    var a6 = true < onethree; // error, boolean and number
+    var a7 = false < two; // error, boolean and number
+    var a8 = 'foo' < onethree; // error, string and number
+    var a9 = onethree < 1; // ok
+    var a10 = 1 < two; // ok
+    var a11 = 2 < 1; // ok
+}
diff --git a/tests/cases/compiler/relationalOperatorComparable.ts b/tests/cases/compiler/relationalOperatorComparable.ts
new file mode 100644
index 00000000000..e95bb6e71cc
--- /dev/null
+++ b/tests/cases/compiler/relationalOperatorComparable.ts
@@ -0,0 +1,15 @@
+function f(onethree: 1 | 3, two: 2) {
+    const t = true;
+    const f = false;
+    let a1 = onethree < two; // ok
+    let a2 = onethree < true; // error, number and boolean
+    let a3 = onethree <= false; // error, number and boolean
+    let a4 = onethree >= t; // error, number and boolean
+    let a5 = onethree > f; // error, number and boolean
+    let a6 = true < onethree; // error, boolean and number
+    let a7 = false < two; // error, boolean and number
+    let a8 = 'foo' < onethree; // error, string and number
+    let a9 = onethree < 1; // ok
+    let a10 = 1 < two; // ok
+    let a11 = 2 < 1; // ok
+}

From 07c47fea04d37209135ca542ac50d175f5c57e9c Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Thu, 10 Nov 2016 14:32:48 -0800
Subject: [PATCH 181/421] Update baselines

Literal types caused a bunch of errors that masked some changes in
baselines. Getting rid of these errors causes the baselines to update
again.
---
 .../capturedLetConstInLoop1.errors.txt        | 128 ----------
 .../reference/capturedLetConstInLoop1.types   | 138 +++++------
 .../capturedLetConstInLoop1_ES6.errors.txt    | 128 ----------
 .../capturedLetConstInLoop1_ES6.types         | 138 +++++------
 .../capturedLetConstInLoop2.errors.txt        | 191 --------------
 .../reference/capturedLetConstInLoop2.types   | 130 +++++-----
 .../capturedLetConstInLoop2_ES6.errors.txt    | 190 --------------
 .../capturedLetConstInLoop2_ES6.types         | 130 +++++-----
 .../capturedLetConstInLoop3.errors.txt        | 232 -----------------
 .../reference/capturedLetConstInLoop3.types   | 178 ++++++-------
 .../capturedLetConstInLoop3_ES6.errors.txt    | 233 ------------------
 .../capturedLetConstInLoop3_ES6.types         | 178 ++++++-------
 .../capturedLetConstInLoop4.errors.txt        | 158 ------------
 .../reference/capturedLetConstInLoop4.types   | 186 +++++++-------
 .../capturedLetConstInLoop4_ES6.errors.txt    | 158 ------------
 .../capturedLetConstInLoop4_ES6.types         | 186 +++++++-------
 .../capturedLetConstInLoop5.errors.txt        |  14 +-
 .../capturedLetConstInLoop5_ES6.errors.txt    |  14 +-
 .../capturedLetConstInLoop6.errors.txt        |  14 +-
 .../capturedLetConstInLoop6_ES6.errors.txt    |  14 +-
 .../capturedLetConstInLoop7.errors.txt        |  14 +-
 .../capturedLetConstInLoop7_ES6.errors.txt    |  14 +-
 .../capturedLetConstInLoop8.errors.txt        |  11 +-
 .../capturedLetConstInLoop8_ES6.errors.txt    |  11 +-
 ...risonOperatorWithNumericLiteral.errors.txt |  58 -----
 ...mparisonOperatorWithNumericLiteral.symbols |  97 ++++++++
 ...comparisonOperatorWithNumericLiteral.types | 161 ++++++++++++
 ...lOperatorConditionIsBooleanType.errors.txt |  71 ------
 ...tionalOperatorConditionIsBooleanType.types |  48 ++--
 .../constDeclarations-errors.errors.txt       |  10 +-
 .../constDeclarations-scopes2.errors.txt      |  21 --
 .../reference/constDeclarations-scopes2.types |  24 +-
 .../reference/constDeclarations.errors.txt    |  17 --
 .../reference/constDeclarations.types         |  32 +--
 .../duplicateLocalVariable1.errors.txt        |   4 +-
 .../duplicateLocalVariable2.errors.txt        |   4 +-
 .../reference/grammarAmbiguities1.errors.txt  |   4 +-
 ...arserGreaterThanTokenAmbiguity2.errors.txt |   4 +-
 ...arserGreaterThanTokenAmbiguity3.errors.txt |   4 +-
 ...arserGreaterThanTokenAmbiguity4.errors.txt |   4 +-
 ...eralTypesWithVariousOperators02.errors.txt |   5 +-
 41 files changed, 965 insertions(+), 2391 deletions(-)
 delete mode 100644 tests/baselines/reference/capturedLetConstInLoop1.errors.txt
 delete mode 100644 tests/baselines/reference/capturedLetConstInLoop1_ES6.errors.txt
 delete mode 100644 tests/baselines/reference/capturedLetConstInLoop2.errors.txt
 delete mode 100644 tests/baselines/reference/capturedLetConstInLoop2_ES6.errors.txt
 delete mode 100644 tests/baselines/reference/capturedLetConstInLoop3.errors.txt
 delete mode 100644 tests/baselines/reference/capturedLetConstInLoop3_ES6.errors.txt
 delete mode 100644 tests/baselines/reference/capturedLetConstInLoop4.errors.txt
 delete mode 100644 tests/baselines/reference/capturedLetConstInLoop4_ES6.errors.txt
 delete mode 100644 tests/baselines/reference/comparisonOperatorWithNumericLiteral.errors.txt
 create mode 100644 tests/baselines/reference/comparisonOperatorWithNumericLiteral.symbols
 create mode 100644 tests/baselines/reference/comparisonOperatorWithNumericLiteral.types
 delete mode 100644 tests/baselines/reference/conditionalOperatorConditionIsBooleanType.errors.txt
 delete mode 100644 tests/baselines/reference/constDeclarations-scopes2.errors.txt
 delete mode 100644 tests/baselines/reference/constDeclarations.errors.txt

diff --git a/tests/baselines/reference/capturedLetConstInLoop1.errors.txt b/tests/baselines/reference/capturedLetConstInLoop1.errors.txt
deleted file mode 100644
index a10b380bcf9..00000000000
--- a/tests/baselines/reference/capturedLetConstInLoop1.errors.txt
+++ /dev/null
@@ -1,128 +0,0 @@
-tests/cases/compiler/capturedLetConstInLoop1.ts(69,19): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop1.ts(86,19): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop1.ts(92,26): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop1.ts(109,19): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-
-
-==== tests/cases/compiler/capturedLetConstInLoop1.ts (4 errors) ====
-    //==== let
-    for (let x in {}) {
-        (function() { return x});
-        (() => x);
-    }
-    
-    for (let x of []) {
-        (function() { return x});
-        (() => x);
-    }
-    
-    for (let x = 0; x < 1; ++x) {
-        (function() { return x});
-        (() => x);
-    }
-    
-    while (1 === 1) {
-        let x;
-        (function() { return x});
-        (() => x);
-    }
-    
-    do {
-        let x;
-        (function() { return x});
-        (() => x);
-    } while (1 === 1)
-    
-    for (let y = 0; y < 1; ++y) {
-        let x = 1;
-        (function() { return x});
-        (() => x);
-    }
-    
-    for (let x = 0, y = 1; x < 1; ++x) {
-        (function() { return x + y});
-        (() => x + y);
-    }
-    
-    while (1 === 1) {
-        let x, y;
-        (function() { return x + y});
-        (() => x + y);
-    }
-    
-    do {
-        let x, y;
-        (function() { return x + y});
-        (() => x + y);
-    } while (1 === 1)
-    
-    for (let y = 0; y < 1; ++y) {
-        let x = 1;
-        (function() { return x + y});
-        (() => x + y);
-    }
-    
-    //=========const
-    for (const x in {}) {
-        (function() { return x});
-        (() => x);
-    }
-    
-    for (const x of []) {
-        (function() { return x});
-        (() => x);
-    }
-    
-    for (const x = 0; x < 1;) {
-                      ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-        (function() { return x});
-        (() => x);
-    }
-    
-    while (1 === 1) {
-        const x = 1;
-        (function() { return x});
-        (() => x);
-    }
-    
-    do {
-        const x = 1;
-        (function() { return x});
-        (() => x);
-    } while (1 === 1)
-    
-    for (const y = 0; y < 1;) {
-                      ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-        const x = 1;
-        (function() { return x});
-        (() => x);
-    }
-    
-    for (const x = 0, y = 1; x < 1;) {
-                             ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-        (function() { return x + y});
-        (() => x + y);
-    }
-    
-    while (1 === 1) {
-        const x = 1, y = 1;
-        (function() { return x + y});
-        (() => x + y);
-    }
-    
-    do {
-        const x = 1, y = 1;
-        (function() { return x + y});
-        (() => x + y);
-    } while (1 === 1)
-    
-    for (const y = 0; y < 1;) {
-                      ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-        const x = 1;
-        (function() { return x + y});
-        (() => x + y);
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/capturedLetConstInLoop1.types b/tests/baselines/reference/capturedLetConstInLoop1.types
index c60ac25ce1f..45d4a1c9368 100644
--- a/tests/baselines/reference/capturedLetConstInLoop1.types
+++ b/tests/baselines/reference/capturedLetConstInLoop1.types
@@ -32,10 +32,10 @@ for (let x of []) {
 
 for (let x = 0; x < 1; ++x) {
 >x : number
->0 : number
+>0 : 0
 >x < 1 : boolean
 >x : number
->1 : number
+>1 : 1
 >++x : number
 >x : number
 
@@ -90,16 +90,16 @@ do {
 
 for (let y = 0; y < 1; ++y) {
 >y : number
->0 : number
+>0 : 0
 >y < 1 : boolean
 >y : number
->1 : number
+>1 : 1
 >++y : number
 >y : number
 
     let x = 1;
 >x : number
->1 : number
+>1 : 1
 
     (function() { return x});
 >(function() { return x}) : () => number
@@ -114,12 +114,12 @@ for (let y = 0; y < 1; ++y) {
 
 for (let x = 0, y = 1; x < 1; ++x) {
 >x : number
->0 : number
+>0 : 0
 >y : number
->1 : number
+>1 : 1
 >x < 1 : boolean
 >x : number
->1 : number
+>1 : 1
 >++x : number
 >x : number
 
@@ -188,16 +188,16 @@ do {
 
 for (let y = 0; y < 1; ++y) {
 >y : number
->0 : number
+>0 : 0
 >y < 1 : boolean
 >y : number
->1 : number
+>1 : 1
 >++y : number
 >y : number
 
     let x = 1;
 >x : number
->1 : number
+>1 : 1
 
     (function() { return x + y});
 >(function() { return x + y}) : () => number
@@ -246,21 +246,21 @@ for (const x of []) {
 }
 
 for (const x = 0; x < 1;) {
->x : number
->0 : number
+>x : 0
+>0 : 0
 >x < 1 : boolean
->x : number
->1 : number
+>x : 0
+>1 : 1
 
     (function() { return x});
 >(function() { return x}) : () => number
 >function() { return x} : () => number
->x : number
+>x : 0
 
     (() => x);
 >(() => x) : () => number
 >() => x : () => number
->x : number
+>x : 0
 }
 
 while (1 === 1) {
@@ -269,34 +269,34 @@ while (1 === 1) {
 >1 : 1
 
     const x = 1;
->x : number
->1 : number
+>x : 1
+>1 : 1
 
     (function() { return x});
 >(function() { return x}) : () => number
 >function() { return x} : () => number
->x : number
+>x : 1
 
     (() => x);
 >(() => x) : () => number
 >() => x : () => number
->x : number
+>x : 1
 }
 
 do {
     const x = 1;
->x : number
->1 : number
+>x : 1
+>1 : 1
 
     (function() { return x});
 >(function() { return x}) : () => number
 >function() { return x} : () => number
->x : number
+>x : 1
 
     (() => x);
 >(() => x) : () => number
 >() => x : () => number
->x : number
+>x : 1
 
 } while (1 === 1)
 >1 === 1 : boolean
@@ -304,49 +304,49 @@ do {
 >1 : 1
 
 for (const y = 0; y < 1;) {
->y : number
->0 : number
+>y : 0
+>0 : 0
 >y < 1 : boolean
->y : number
->1 : number
+>y : 0
+>1 : 1
 
     const x = 1;
->x : number
->1 : number
+>x : 1
+>1 : 1
 
     (function() { return x});
 >(function() { return x}) : () => number
 >function() { return x} : () => number
->x : number
+>x : 1
 
     (() => x);
 >(() => x) : () => number
 >() => x : () => number
->x : number
+>x : 1
 }
 
 for (const x = 0, y = 1; x < 1;) {
->x : number
->0 : number
->y : number
->1 : number
+>x : 0
+>0 : 0
+>y : 1
+>1 : 1
 >x < 1 : boolean
->x : number
->1 : number
+>x : 0
+>1 : 1
 
     (function() { return x + y});
 >(function() { return x + y}) : () => number
 >function() { return x + y} : () => number
 >x + y : number
->x : number
->y : number
+>x : 0
+>y : 1
 
     (() => x + y);
 >(() => x + y) : () => number
 >() => x + y : () => number
 >x + y : number
->x : number
->y : number
+>x : 0
+>y : 1
 }
 
 while (1 === 1) {
@@ -355,46 +355,46 @@ while (1 === 1) {
 >1 : 1
 
     const x = 1, y = 1;
->x : number
->1 : number
->y : number
->1 : number
+>x : 1
+>1 : 1
+>y : 1
+>1 : 1
 
     (function() { return x + y});
 >(function() { return x + y}) : () => number
 >function() { return x + y} : () => number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 1
 
     (() => x + y);
 >(() => x + y) : () => number
 >() => x + y : () => number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 1
 }
 
 do {
     const x = 1, y = 1;
->x : number
->1 : number
->y : number
->1 : number
+>x : 1
+>1 : 1
+>y : 1
+>1 : 1
 
     (function() { return x + y});
 >(function() { return x + y}) : () => number
 >function() { return x + y} : () => number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 1
 
     (() => x + y);
 >(() => x + y) : () => number
 >() => x + y : () => number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 1
 
 } while (1 === 1)
 >1 === 1 : boolean
@@ -402,27 +402,27 @@ do {
 >1 : 1
 
 for (const y = 0; y < 1;) {
->y : number
->0 : number
+>y : 0
+>0 : 0
 >y < 1 : boolean
->y : number
->1 : number
+>y : 0
+>1 : 1
 
     const x = 1;
->x : number
->1 : number
+>x : 1
+>1 : 1
 
     (function() { return x + y});
 >(function() { return x + y}) : () => number
 >function() { return x + y} : () => number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 0
 
     (() => x + y);
 >(() => x + y) : () => number
 >() => x + y : () => number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 0
 }
diff --git a/tests/baselines/reference/capturedLetConstInLoop1_ES6.errors.txt b/tests/baselines/reference/capturedLetConstInLoop1_ES6.errors.txt
deleted file mode 100644
index 24c5ddf17b6..00000000000
--- a/tests/baselines/reference/capturedLetConstInLoop1_ES6.errors.txt
+++ /dev/null
@@ -1,128 +0,0 @@
-tests/cases/compiler/capturedLetConstInLoop1_ES6.ts(69,19): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop1_ES6.ts(86,19): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop1_ES6.ts(92,26): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop1_ES6.ts(109,19): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-
-
-==== tests/cases/compiler/capturedLetConstInLoop1_ES6.ts (4 errors) ====
-    //==== let
-    for (let x in {}) {
-        (function() { return x});
-        (() => x);
-    }
-    
-    for (let x of []) {
-        (function() { return x});
-        (() => x);
-    }
-    
-    for (let x = 0; x < 1; ++x) {
-        (function() { return x});
-        (() => x);
-    }
-    
-    while (1 === 1) {
-        let x;
-        (function() { return x});
-        (() => x);
-    }
-    
-    do {
-        let x;
-        (function() { return x});
-        (() => x);
-    } while (1 === 1)
-    
-    for (let y = 0; y < 1; ++y) {
-        let x = 1;
-        (function() { return x});
-        (() => x);
-    }
-    
-    for (let x = 0, y = 1; x < 1; ++x) {
-        (function() { return x + y});
-        (() => x + y);
-    }
-    
-    while (1 === 1) {
-        let x, y;
-        (function() { return x + y});
-        (() => x + y);
-    }
-    
-    do {
-        let x, y;
-        (function() { return x + y});
-        (() => x + y);
-    } while (1 === 1)
-    
-    for (let y = 0; y < 1; ++y) {
-        let x = 1;
-        (function() { return x + y});
-        (() => x + y);
-    }
-    
-    //=========const
-    for (const x in {}) {
-        (function() { return x});
-        (() => x);
-    }
-    
-    for (const x of []) {
-        (function() { return x});
-        (() => x);
-    }
-    
-    for (const x = 0; x < 1;) {
-                      ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-        (function() { return x});
-        (() => x);
-    }
-    
-    while (1 === 1) {
-        const x = 1;
-        (function() { return x});
-        (() => x);
-    }
-    
-    do {
-        const x = 1;
-        (function() { return x});
-        (() => x);
-    } while (1 === 1)
-    
-    for (const y = 0; y < 1;) {
-                      ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-        const x = 1;
-        (function() { return x});
-        (() => x);
-    }
-    
-    for (const x = 0, y = 1; x < 1;) {
-                             ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-        (function() { return x + y});
-        (() => x + y);
-    }
-    
-    while (1 === 1) {
-        const x = 1, y = 1;
-        (function() { return x + y});
-        (() => x + y);
-    }
-    
-    do {
-        const x = 1, y = 1;
-        (function() { return x + y});
-        (() => x + y);
-    } while (1 === 1)
-    
-    for (const y = 0; y < 1;) {
-                      ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-        const x = 1;
-        (function() { return x + y});
-        (() => x + y);
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/capturedLetConstInLoop1_ES6.types b/tests/baselines/reference/capturedLetConstInLoop1_ES6.types
index cee71c0d5cd..5e803b35863 100644
--- a/tests/baselines/reference/capturedLetConstInLoop1_ES6.types
+++ b/tests/baselines/reference/capturedLetConstInLoop1_ES6.types
@@ -32,10 +32,10 @@ for (let x of []) {
 
 for (let x = 0; x < 1; ++x) {
 >x : number
->0 : number
+>0 : 0
 >x < 1 : boolean
 >x : number
->1 : number
+>1 : 1
 >++x : number
 >x : number
 
@@ -90,16 +90,16 @@ do {
 
 for (let y = 0; y < 1; ++y) {
 >y : number
->0 : number
+>0 : 0
 >y < 1 : boolean
 >y : number
->1 : number
+>1 : 1
 >++y : number
 >y : number
 
     let x = 1;
 >x : number
->1 : number
+>1 : 1
 
     (function() { return x});
 >(function() { return x}) : () => number
@@ -114,12 +114,12 @@ for (let y = 0; y < 1; ++y) {
 
 for (let x = 0, y = 1; x < 1; ++x) {
 >x : number
->0 : number
+>0 : 0
 >y : number
->1 : number
+>1 : 1
 >x < 1 : boolean
 >x : number
->1 : number
+>1 : 1
 >++x : number
 >x : number
 
@@ -188,16 +188,16 @@ do {
 
 for (let y = 0; y < 1; ++y) {
 >y : number
->0 : number
+>0 : 0
 >y < 1 : boolean
 >y : number
->1 : number
+>1 : 1
 >++y : number
 >y : number
 
     let x = 1;
 >x : number
->1 : number
+>1 : 1
 
     (function() { return x + y});
 >(function() { return x + y}) : () => number
@@ -246,21 +246,21 @@ for (const x of []) {
 }
 
 for (const x = 0; x < 1;) {
->x : number
->0 : number
+>x : 0
+>0 : 0
 >x < 1 : boolean
->x : number
->1 : number
+>x : 0
+>1 : 1
 
     (function() { return x});
 >(function() { return x}) : () => number
 >function() { return x} : () => number
->x : number
+>x : 0
 
     (() => x);
 >(() => x) : () => number
 >() => x : () => number
->x : number
+>x : 0
 }
 
 while (1 === 1) {
@@ -269,34 +269,34 @@ while (1 === 1) {
 >1 : 1
 
     const x = 1;
->x : number
->1 : number
+>x : 1
+>1 : 1
 
     (function() { return x});
 >(function() { return x}) : () => number
 >function() { return x} : () => number
->x : number
+>x : 1
 
     (() => x);
 >(() => x) : () => number
 >() => x : () => number
->x : number
+>x : 1
 }
 
 do {
     const x = 1;
->x : number
->1 : number
+>x : 1
+>1 : 1
 
     (function() { return x});
 >(function() { return x}) : () => number
 >function() { return x} : () => number
->x : number
+>x : 1
 
     (() => x);
 >(() => x) : () => number
 >() => x : () => number
->x : number
+>x : 1
 
 } while (1 === 1)
 >1 === 1 : boolean
@@ -304,49 +304,49 @@ do {
 >1 : 1
 
 for (const y = 0; y < 1;) {
->y : number
->0 : number
+>y : 0
+>0 : 0
 >y < 1 : boolean
->y : number
->1 : number
+>y : 0
+>1 : 1
 
     const x = 1;
->x : number
->1 : number
+>x : 1
+>1 : 1
 
     (function() { return x});
 >(function() { return x}) : () => number
 >function() { return x} : () => number
->x : number
+>x : 1
 
     (() => x);
 >(() => x) : () => number
 >() => x : () => number
->x : number
+>x : 1
 }
 
 for (const x = 0, y = 1; x < 1;) {
->x : number
->0 : number
->y : number
->1 : number
+>x : 0
+>0 : 0
+>y : 1
+>1 : 1
 >x < 1 : boolean
->x : number
->1 : number
+>x : 0
+>1 : 1
 
     (function() { return x + y});
 >(function() { return x + y}) : () => number
 >function() { return x + y} : () => number
 >x + y : number
->x : number
->y : number
+>x : 0
+>y : 1
 
     (() => x + y);
 >(() => x + y) : () => number
 >() => x + y : () => number
 >x + y : number
->x : number
->y : number
+>x : 0
+>y : 1
 }
 
 while (1 === 1) {
@@ -355,46 +355,46 @@ while (1 === 1) {
 >1 : 1
 
     const x = 1, y = 1;
->x : number
->1 : number
->y : number
->1 : number
+>x : 1
+>1 : 1
+>y : 1
+>1 : 1
 
     (function() { return x + y});
 >(function() { return x + y}) : () => number
 >function() { return x + y} : () => number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 1
 
     (() => x + y);
 >(() => x + y) : () => number
 >() => x + y : () => number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 1
 }
 
 do {
     const x = 1, y = 1;
->x : number
->1 : number
->y : number
->1 : number
+>x : 1
+>1 : 1
+>y : 1
+>1 : 1
 
     (function() { return x + y});
 >(function() { return x + y}) : () => number
 >function() { return x + y} : () => number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 1
 
     (() => x + y);
 >(() => x + y) : () => number
 >() => x + y : () => number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 1
 
 } while (1 === 1)
 >1 === 1 : boolean
@@ -402,27 +402,27 @@ do {
 >1 : 1
 
 for (const y = 0; y < 1;) {
->y : number
->0 : number
+>y : 0
+>0 : 0
 >y < 1 : boolean
->y : number
->1 : number
+>y : 0
+>1 : 1
 
     const x = 1;
->x : number
->1 : number
+>x : 1
+>1 : 1
 
     (function() { return x + y});
 >(function() { return x + y}) : () => number
 >function() { return x + y} : () => number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 0
 
     (() => x + y);
 >(() => x + y) : () => number
 >() => x + y : () => number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 0
 }
diff --git a/tests/baselines/reference/capturedLetConstInLoop2.errors.txt b/tests/baselines/reference/capturedLetConstInLoop2.errors.txt
deleted file mode 100644
index 9125a87ecfe..00000000000
--- a/tests/baselines/reference/capturedLetConstInLoop2.errors.txt
+++ /dev/null
@@ -1,191 +0,0 @@
-tests/cases/compiler/capturedLetConstInLoop2.ts(108,23): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop2.ts(133,23): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop2.ts(142,30): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop2.ts(170,23): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-
-
-==== tests/cases/compiler/capturedLetConstInLoop2.ts (4 errors) ====
-    
-    
-    // ========let
-    function foo0(x) {
-        for (let x of []) {
-            let a = arguments.length;
-            (function() { return x + a });
-            (() => x + a);
-        }
-    }
-    
-    function foo0_1(x) {
-        for (let x in []) {
-            let a = arguments.length;
-            (function() { return x + a });
-            (() => x + a);
-        }
-    }
-    
-    function foo1(x) {
-        for (let x = 0; x < 1; ++x) {
-            let a = arguments.length;
-            (function() { return x + a });
-            (() => x + a);
-        }
-    }
-    
-    function foo2(x) {
-        while (1 === 1) {
-            let a = arguments.length;
-            (function() { return x + a });
-            (() => x + a);
-        }
-    }
-    
-    function foo3(x) {
-        do {
-            let x;
-            let a = arguments.length;
-            (function() { return x + a });
-            (() => x + a);
-        } while (1 === 1)
-    }
-    
-    function foo4(x) {
-        for (let y = 0; y < 1; ++y) {
-            let a = arguments.length;
-            let x = 1;
-            (function() { return x + a });
-            (() => x + a);
-        }
-    }
-    
-    function foo5(x) {
-        for (let x = 0, y = 1; x < 1; ++x) {
-            let a = arguments.length;
-            (function() { return x + y + a });
-            (() => x + y + a);
-        }
-    }
-    
-    
-    function foo6(x) {
-        while (1 === 1) {
-            let x, y;
-            let a = arguments.length;
-            (function() { return x + y + a });
-            (() => x + y + a);
-        }
-    }
-    
-    function foo7(x) {
-        do {
-            let x, y;
-            let a = arguments.length;
-            (function() { return x + y + a });
-            (() => x + y + a);
-        } while (1 === 1)
-    }
-    
-    
-    function foo8(x) {
-        for (let y = 0; y < 1; ++y) {
-            let x = 1;
-            let a = arguments.length;
-            (function() { return x + y + a });
-            (() => x + y + a);
-        }
-    }
-    ///=======const
-    function foo0_c(x) {
-        for (const x of []) {
-            const a = arguments.length;
-            (function() { return x + a });
-            (() => x + a);
-        }
-    }
-    
-    function foo0_1_c(x) {
-        for (const x in []) {
-            const a = arguments.length;
-            (function() { return x + a });
-            (() => x + a);
-        }
-    }
-    
-    function foo1_c(x) {
-        for (const x = 0; x < 1;) {
-                          ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-            const a = arguments.length;
-            (function() { return x + a });
-            (() => x + a);
-        }
-    }
-    
-    function foo2_c(x) {
-        while (1 === 1) {
-            const a = arguments.length;
-            (function() { return x + a });
-            (() => x + a);
-        }
-    }
-    
-    function foo3_c(x) {
-        do {
-            const x = 1;
-            const a = arguments.length;
-            (function() { return x + a });
-            (() => x + a);
-        } while (1 === 1)
-    }
-    
-    function foo4_c(x) {
-        for (const y = 0; y < 1;) {
-                          ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-            const a = arguments.length;
-            const x = 1;
-            (function() { return x + a });
-            (() => x + a);
-        }
-    }
-    
-    function foo5_c(x) {
-        for (const x = 0, y = 1; x < 1;) {
-                                 ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-            const a = arguments.length;
-            (function() { return x + y + a });
-            (() => x + y + a);
-        }
-    }
-    
-    
-    function foo6_c(x) {
-        while (1 === 1) {
-            const x = 1, y =1 ;
-            const a = arguments.length;
-            (function() { return x + y + a });
-            (() => x + y + a);
-        }
-    }
-    
-    function foo7_c(x) {
-        do {
-            const x = 1, y = 1;
-            const a = arguments.length;
-            (function() { return x + y + a });
-            (() => x + y + a);
-        } while (1 === 1)
-    }
-    
-    
-    function foo8_c(x) {
-        for (const y = 0; y < 1;) {
-                          ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-            const x = 1;
-            const a = arguments.length;
-            (function() { return x + y + a });
-            (() => x + y + a);
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/capturedLetConstInLoop2.types b/tests/baselines/reference/capturedLetConstInLoop2.types
index f4f7a926f89..4f819d3c3f9 100644
--- a/tests/baselines/reference/capturedLetConstInLoop2.types
+++ b/tests/baselines/reference/capturedLetConstInLoop2.types
@@ -68,10 +68,10 @@ function foo1(x) {
 
     for (let x = 0; x < 1; ++x) {
 >x : number
->0 : number
+>0 : 0
 >x < 1 : boolean
 >x : number
->1 : number
+>1 : 1
 >++x : number
 >x : number
 
@@ -168,10 +168,10 @@ function foo4(x) {
 
     for (let y = 0; y < 1; ++y) {
 >y : number
->0 : number
+>0 : 0
 >y < 1 : boolean
 >y : number
->1 : number
+>1 : 1
 >++y : number
 >y : number
 
@@ -183,7 +183,7 @@ function foo4(x) {
 
         let x = 1;
 >x : number
->1 : number
+>1 : 1
 
         (function() { return x + a });
 >(function() { return x + a }) : () => number
@@ -207,12 +207,12 @@ function foo5(x) {
 
     for (let x = 0, y = 1; x < 1; ++x) {
 >x : number
->0 : number
+>0 : 0
 >y : number
->1 : number
+>1 : 1
 >x < 1 : boolean
 >x : number
->1 : number
+>1 : 1
 >++x : number
 >x : number
 
@@ -328,16 +328,16 @@ function foo8(x) {
 
     for (let y = 0; y < 1; ++y) {
 >y : number
->0 : number
+>0 : 0
 >y < 1 : boolean
 >y : number
->1 : number
+>1 : 1
 >++y : number
 >y : number
 
         let x = 1;
 >x : number
->1 : number
+>1 : 1
 
         let a = arguments.length;
 >a : number
@@ -430,11 +430,11 @@ function foo1_c(x) {
 >x : any
 
     for (const x = 0; x < 1;) {
->x : number
->0 : number
+>x : 0
+>0 : 0
 >x < 1 : boolean
->x : number
->1 : number
+>x : 0
+>1 : 1
 
         const a = arguments.length;
 >a : number
@@ -446,14 +446,14 @@ function foo1_c(x) {
 >(function() { return x + a }) : () => number
 >function() { return x + a } : () => number
 >x + a : number
->x : number
+>x : 0
 >a : number
 
         (() => x + a);
 >(() => x + a) : () => number
 >() => x + a : () => number
 >x + a : number
->x : number
+>x : 0
 >a : number
     }
 }
@@ -495,8 +495,8 @@ function foo3_c(x) {
 
     do {
         const x = 1;
->x : number
->1 : number
+>x : 1
+>1 : 1
 
         const a = arguments.length;
 >a : number
@@ -508,14 +508,14 @@ function foo3_c(x) {
 >(function() { return x + a }) : () => number
 >function() { return x + a } : () => number
 >x + a : number
->x : number
+>x : 1
 >a : number
 
         (() => x + a);
 >(() => x + a) : () => number
 >() => x + a : () => number
 >x + a : number
->x : number
+>x : 1
 >a : number
 
     } while (1 === 1)
@@ -529,11 +529,11 @@ function foo4_c(x) {
 >x : any
 
     for (const y = 0; y < 1;) {
->y : number
->0 : number
+>y : 0
+>0 : 0
 >y < 1 : boolean
->y : number
->1 : number
+>y : 0
+>1 : 1
 
         const a = arguments.length;
 >a : number
@@ -542,21 +542,21 @@ function foo4_c(x) {
 >length : number
 
         const x = 1;
->x : number
->1 : number
+>x : 1
+>1 : 1
 
         (function() { return x + a });
 >(function() { return x + a }) : () => number
 >function() { return x + a } : () => number
 >x + a : number
->x : number
+>x : 1
 >a : number
 
         (() => x + a);
 >(() => x + a) : () => number
 >() => x + a : () => number
 >x + a : number
->x : number
+>x : 1
 >a : number
     }
 }
@@ -566,13 +566,13 @@ function foo5_c(x) {
 >x : any
 
     for (const x = 0, y = 1; x < 1;) {
->x : number
->0 : number
->y : number
->1 : number
+>x : 0
+>0 : 0
+>y : 1
+>1 : 1
 >x < 1 : boolean
->x : number
->1 : number
+>x : 0
+>1 : 1
 
         const a = arguments.length;
 >a : number
@@ -585,8 +585,8 @@ function foo5_c(x) {
 >function() { return x + y + a } : () => number
 >x + y + a : number
 >x + y : number
->x : number
->y : number
+>x : 0
+>y : 1
 >a : number
 
         (() => x + y + a);
@@ -594,8 +594,8 @@ function foo5_c(x) {
 >() => x + y + a : () => number
 >x + y + a : number
 >x + y : number
->x : number
->y : number
+>x : 0
+>y : 1
 >a : number
     }
 }
@@ -611,10 +611,10 @@ function foo6_c(x) {
 >1 : 1
 
         const x = 1, y =1 ;
->x : number
->1 : number
->y : number
->1 : number
+>x : 1
+>1 : 1
+>y : 1
+>1 : 1
 
         const a = arguments.length;
 >a : number
@@ -627,8 +627,8 @@ function foo6_c(x) {
 >function() { return x + y + a } : () => number
 >x + y + a : number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 1
 >a : number
 
         (() => x + y + a);
@@ -636,8 +636,8 @@ function foo6_c(x) {
 >() => x + y + a : () => number
 >x + y + a : number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 1
 >a : number
     }
 }
@@ -648,10 +648,10 @@ function foo7_c(x) {
 
     do {
         const x = 1, y = 1;
->x : number
->1 : number
->y : number
->1 : number
+>x : 1
+>1 : 1
+>y : 1
+>1 : 1
 
         const a = arguments.length;
 >a : number
@@ -664,8 +664,8 @@ function foo7_c(x) {
 >function() { return x + y + a } : () => number
 >x + y + a : number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 1
 >a : number
 
         (() => x + y + a);
@@ -673,8 +673,8 @@ function foo7_c(x) {
 >() => x + y + a : () => number
 >x + y + a : number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 1
 >a : number
 
     } while (1 === 1)
@@ -689,15 +689,15 @@ function foo8_c(x) {
 >x : any
 
     for (const y = 0; y < 1;) {
->y : number
->0 : number
+>y : 0
+>0 : 0
 >y < 1 : boolean
->y : number
->1 : number
+>y : 0
+>1 : 1
 
         const x = 1;
->x : number
->1 : number
+>x : 1
+>1 : 1
 
         const a = arguments.length;
 >a : number
@@ -710,8 +710,8 @@ function foo8_c(x) {
 >function() { return x + y + a } : () => number
 >x + y + a : number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 0
 >a : number
 
         (() => x + y + a);
@@ -719,8 +719,8 @@ function foo8_c(x) {
 >() => x + y + a : () => number
 >x + y + a : number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 0
 >a : number
     }
 }
diff --git a/tests/baselines/reference/capturedLetConstInLoop2_ES6.errors.txt b/tests/baselines/reference/capturedLetConstInLoop2_ES6.errors.txt
deleted file mode 100644
index d61bf3619c7..00000000000
--- a/tests/baselines/reference/capturedLetConstInLoop2_ES6.errors.txt
+++ /dev/null
@@ -1,190 +0,0 @@
-tests/cases/compiler/capturedLetConstInLoop2_ES6.ts(107,23): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop2_ES6.ts(132,23): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop2_ES6.ts(141,30): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop2_ES6.ts(169,23): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-
-
-==== tests/cases/compiler/capturedLetConstInLoop2_ES6.ts (4 errors) ====
-    
-    // ========let
-    function foo0(x) {
-        for (let x of []) {
-            let a = arguments.length;
-            (function() { return x + a });
-            (() => x + a);
-        }
-    }
-    
-    function foo0_1(x) {
-        for (let x in []) {
-            let a = arguments.length;
-            (function() { return x + a });
-            (() => x + a);
-        }
-    }
-    
-    function foo1(x) {
-        for (let x = 0; x < 1; ++x) {
-            let a = arguments.length;
-            (function() { return x + a });
-            (() => x + a);
-        }
-    }
-    
-    function foo2(x) {
-        while (1 === 1) {
-            let a = arguments.length;
-            (function() { return x + a });
-            (() => x + a);
-        }
-    }
-    
-    function foo3(x) {
-        do {
-            let x;
-            let a = arguments.length;
-            (function() { return x + a });
-            (() => x + a);
-        } while (1 === 1)
-    }
-    
-    function foo4(x) {
-        for (let y = 0; y < 1; ++y) {
-            let a = arguments.length;
-            let x = 1;
-            (function() { return x + a });
-            (() => x + a);
-        }
-    }
-    
-    function foo5(x) {
-        for (let x = 0, y = 1; x < 1; ++x) {
-            let a = arguments.length;
-            (function() { return x + y + a });
-            (() => x + y + a);
-        }
-    }
-    
-    
-    function foo6(x) {
-        while (1 === 1) {
-            let x, y;
-            let a = arguments.length;
-            (function() { return x + y + a });
-            (() => x + y + a);
-        }
-    }
-    
-    function foo7(x) {
-        do {
-            let x, y;
-            let a = arguments.length;
-            (function() { return x + y + a });
-            (() => x + y + a);
-        } while (1 === 1)
-    }
-    
-    
-    function foo8(x) {
-        for (let y = 0; y < 1; ++y) {
-            let x = 1;
-            let a = arguments.length;
-            (function() { return x + y + a });
-            (() => x + y + a);
-        }
-    }
-    ///=======const
-    function foo0_c(x) {
-        for (const x of []) {
-            const a = arguments.length;
-            (function() { return x + a });
-            (() => x + a);
-        }
-    }
-    
-    function foo0_1_c(x) {
-        for (const x in []) {
-            const a = arguments.length;
-            (function() { return x + a });
-            (() => x + a);
-        }
-    }
-    
-    function foo1_c(x) {
-        for (const x = 0; x < 1;) {
-                          ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-            const a = arguments.length;
-            (function() { return x + a });
-            (() => x + a);
-        }
-    }
-    
-    function foo2_c(x) {
-        while (1 === 1) {
-            const a = arguments.length;
-            (function() { return x + a });
-            (() => x + a);
-        }
-    }
-    
-    function foo3_c(x) {
-        do {
-            const x = 1;
-            const a = arguments.length;
-            (function() { return x + a });
-            (() => x + a);
-        } while (1 === 1)
-    }
-    
-    function foo4_c(x) {
-        for (const y = 0; y < 1;) {
-                          ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-            const a = arguments.length;
-            const x = 1;
-            (function() { return x + a });
-            (() => x + a);
-        }
-    }
-    
-    function foo5_c(x) {
-        for (const x = 0, y = 1; x < 1;) {
-                                 ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-            const a = arguments.length;
-            (function() { return x + y + a });
-            (() => x + y + a);
-        }
-    }
-    
-    
-    function foo6_c(x) {
-        while (1 === 1) {
-            const x = 1, y =1 ;
-            const a = arguments.length;
-            (function() { return x + y + a });
-            (() => x + y + a);
-        }
-    }
-    
-    function foo7_c(x) {
-        do {
-            const x = 1, y = 1;
-            const a = arguments.length;
-            (function() { return x + y + a });
-            (() => x + y + a);
-        } while (1 === 1)
-    }
-    
-    
-    function foo8_c(x) {
-        for (const y = 0; y < 1;) {
-                          ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-            const x = 1;
-            const a = arguments.length;
-            (function() { return x + y + a });
-            (() => x + y + a);
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/capturedLetConstInLoop2_ES6.types b/tests/baselines/reference/capturedLetConstInLoop2_ES6.types
index 80e455e44ce..e72221d85cd 100644
--- a/tests/baselines/reference/capturedLetConstInLoop2_ES6.types
+++ b/tests/baselines/reference/capturedLetConstInLoop2_ES6.types
@@ -67,10 +67,10 @@ function foo1(x) {
 
     for (let x = 0; x < 1; ++x) {
 >x : number
->0 : number
+>0 : 0
 >x < 1 : boolean
 >x : number
->1 : number
+>1 : 1
 >++x : number
 >x : number
 
@@ -167,10 +167,10 @@ function foo4(x) {
 
     for (let y = 0; y < 1; ++y) {
 >y : number
->0 : number
+>0 : 0
 >y < 1 : boolean
 >y : number
->1 : number
+>1 : 1
 >++y : number
 >y : number
 
@@ -182,7 +182,7 @@ function foo4(x) {
 
         let x = 1;
 >x : number
->1 : number
+>1 : 1
 
         (function() { return x + a });
 >(function() { return x + a }) : () => number
@@ -206,12 +206,12 @@ function foo5(x) {
 
     for (let x = 0, y = 1; x < 1; ++x) {
 >x : number
->0 : number
+>0 : 0
 >y : number
->1 : number
+>1 : 1
 >x < 1 : boolean
 >x : number
->1 : number
+>1 : 1
 >++x : number
 >x : number
 
@@ -327,16 +327,16 @@ function foo8(x) {
 
     for (let y = 0; y < 1; ++y) {
 >y : number
->0 : number
+>0 : 0
 >y < 1 : boolean
 >y : number
->1 : number
+>1 : 1
 >++y : number
 >y : number
 
         let x = 1;
 >x : number
->1 : number
+>1 : 1
 
         let a = arguments.length;
 >a : number
@@ -429,11 +429,11 @@ function foo1_c(x) {
 >x : any
 
     for (const x = 0; x < 1;) {
->x : number
->0 : number
+>x : 0
+>0 : 0
 >x < 1 : boolean
->x : number
->1 : number
+>x : 0
+>1 : 1
 
         const a = arguments.length;
 >a : number
@@ -445,14 +445,14 @@ function foo1_c(x) {
 >(function() { return x + a }) : () => number
 >function() { return x + a } : () => number
 >x + a : number
->x : number
+>x : 0
 >a : number
 
         (() => x + a);
 >(() => x + a) : () => number
 >() => x + a : () => number
 >x + a : number
->x : number
+>x : 0
 >a : number
     }
 }
@@ -494,8 +494,8 @@ function foo3_c(x) {
 
     do {
         const x = 1;
->x : number
->1 : number
+>x : 1
+>1 : 1
 
         const a = arguments.length;
 >a : number
@@ -507,14 +507,14 @@ function foo3_c(x) {
 >(function() { return x + a }) : () => number
 >function() { return x + a } : () => number
 >x + a : number
->x : number
+>x : 1
 >a : number
 
         (() => x + a);
 >(() => x + a) : () => number
 >() => x + a : () => number
 >x + a : number
->x : number
+>x : 1
 >a : number
 
     } while (1 === 1)
@@ -528,11 +528,11 @@ function foo4_c(x) {
 >x : any
 
     for (const y = 0; y < 1;) {
->y : number
->0 : number
+>y : 0
+>0 : 0
 >y < 1 : boolean
->y : number
->1 : number
+>y : 0
+>1 : 1
 
         const a = arguments.length;
 >a : number
@@ -541,21 +541,21 @@ function foo4_c(x) {
 >length : number
 
         const x = 1;
->x : number
->1 : number
+>x : 1
+>1 : 1
 
         (function() { return x + a });
 >(function() { return x + a }) : () => number
 >function() { return x + a } : () => number
 >x + a : number
->x : number
+>x : 1
 >a : number
 
         (() => x + a);
 >(() => x + a) : () => number
 >() => x + a : () => number
 >x + a : number
->x : number
+>x : 1
 >a : number
     }
 }
@@ -565,13 +565,13 @@ function foo5_c(x) {
 >x : any
 
     for (const x = 0, y = 1; x < 1;) {
->x : number
->0 : number
->y : number
->1 : number
+>x : 0
+>0 : 0
+>y : 1
+>1 : 1
 >x < 1 : boolean
->x : number
->1 : number
+>x : 0
+>1 : 1
 
         const a = arguments.length;
 >a : number
@@ -584,8 +584,8 @@ function foo5_c(x) {
 >function() { return x + y + a } : () => number
 >x + y + a : number
 >x + y : number
->x : number
->y : number
+>x : 0
+>y : 1
 >a : number
 
         (() => x + y + a);
@@ -593,8 +593,8 @@ function foo5_c(x) {
 >() => x + y + a : () => number
 >x + y + a : number
 >x + y : number
->x : number
->y : number
+>x : 0
+>y : 1
 >a : number
     }
 }
@@ -610,10 +610,10 @@ function foo6_c(x) {
 >1 : 1
 
         const x = 1, y =1 ;
->x : number
->1 : number
->y : number
->1 : number
+>x : 1
+>1 : 1
+>y : 1
+>1 : 1
 
         const a = arguments.length;
 >a : number
@@ -626,8 +626,8 @@ function foo6_c(x) {
 >function() { return x + y + a } : () => number
 >x + y + a : number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 1
 >a : number
 
         (() => x + y + a);
@@ -635,8 +635,8 @@ function foo6_c(x) {
 >() => x + y + a : () => number
 >x + y + a : number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 1
 >a : number
     }
 }
@@ -647,10 +647,10 @@ function foo7_c(x) {
 
     do {
         const x = 1, y = 1;
->x : number
->1 : number
->y : number
->1 : number
+>x : 1
+>1 : 1
+>y : 1
+>1 : 1
 
         const a = arguments.length;
 >a : number
@@ -663,8 +663,8 @@ function foo7_c(x) {
 >function() { return x + y + a } : () => number
 >x + y + a : number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 1
 >a : number
 
         (() => x + y + a);
@@ -672,8 +672,8 @@ function foo7_c(x) {
 >() => x + y + a : () => number
 >x + y + a : number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 1
 >a : number
 
     } while (1 === 1)
@@ -688,15 +688,15 @@ function foo8_c(x) {
 >x : any
 
     for (const y = 0; y < 1;) {
->y : number
->0 : number
+>y : 0
+>0 : 0
 >y < 1 : boolean
->y : number
->1 : number
+>y : 0
+>1 : 1
 
         const x = 1;
->x : number
->1 : number
+>x : 1
+>1 : 1
 
         const a = arguments.length;
 >a : number
@@ -709,8 +709,8 @@ function foo8_c(x) {
 >function() { return x + y + a } : () => number
 >x + y + a : number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 0
 >a : number
 
         (() => x + y + a);
@@ -718,8 +718,8 @@ function foo8_c(x) {
 >() => x + y + a : () => number
 >x + y + a : number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 0
 >a : number
     }
 }
diff --git a/tests/baselines/reference/capturedLetConstInLoop3.errors.txt b/tests/baselines/reference/capturedLetConstInLoop3.errors.txt
deleted file mode 100644
index ecc9dbcccc5..00000000000
--- a/tests/baselines/reference/capturedLetConstInLoop3.errors.txt
+++ /dev/null
@@ -1,232 +0,0 @@
-tests/cases/compiler/capturedLetConstInLoop3.ts(132,23): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop3.ts(164,23): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop3.ts(175,30): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop3.ts(209,23): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-
-
-==== tests/cases/compiler/capturedLetConstInLoop3.ts (4 errors) ====
-    ///=========let
-    declare function use(a: any);
-    function foo0(x) {
-        for (let x of []) {
-            var v = x;
-            (function() { return x + v });
-            (() => x + v);
-        }
-    
-        use(v);
-    }
-    
-    function foo0_1(x) {
-        for (let x in []) {
-            var v = x;
-            (function() { return x + v });
-            (() => x + v);
-        }
-    
-        use(v);
-    }
-    
-    function foo1(x) {
-        for (let x = 0; x < 1; ++x) {
-            var v = x;
-            (function() { return x + v });
-            (() => x + v);
-        }
-    
-        use(v);
-    }
-    
-    function foo2(x) {
-        while (1 === 1) {
-            let x = 1;
-            var v = x;
-            (function() { return x + v });
-            (() => x + v);
-        }
-        
-        use(v);
-    }
-    
-    function foo3(x) {
-        do {
-            let x;
-            var v;
-            (function() { return x + v });
-            (() => x + v);
-        } while (1 === 1);
-        
-        use(v);
-    }
-    
-    function foo4(x) {
-        for (let y = 0; y < 1; ++y) {
-            var v = y;
-            let x = 1;
-            (function() { return x + v });
-            (() => x + v);
-        }
-        
-        use(v);
-    }
-    
-    function foo5(x) {
-        for (let x = 0, y = 1; x < 1; ++x) {
-            var v = x;
-            (function() { return x + y + v });
-            (() => x + y + v);
-        }
-        
-        use(v);
-    }
-    
-    
-    function foo6(x) {
-        while (1 === 1) {
-            let x, y;
-            var v = x;
-            (function() { return x + y + v });
-            (() => x + y + v);
-        }
-        
-        use(v)
-    }
-    
-    function foo7(x) {
-        do {
-            let x, y;
-            var v = x;
-            (function() { return x + y + v });
-            (() => x + y + v);
-        } while (1 === 1);
-        
-        use(v);
-    }
-    
-    
-    function foo8(x) {
-        for (let y = 0; y < 1; ++y) {
-            let x = 1;
-            var v = x;
-            (function() { return x + y + v });
-            (() => x + y + v);
-        }
-        
-        use(v);
-    }
-    //===const
-    function foo0_c(x) {
-        for (const x of []) {
-            var v = x;
-            (function() { return x + v });
-            (() => x + v);
-        }
-    
-        use(v);
-    }
-    
-    function foo0_1_c(x) {
-        for (const x in []) {
-            var v = x;
-            (function() { return x + v });
-            (() => x + v);
-        }
-    
-        use(v);
-    }
-    
-    function foo1_c(x) {
-        for (const x = 0; x < 1;) {
-                          ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-            var v = x;
-            (function() { return x + v });
-            (() => x + v);
-        }
-    
-        use(v);
-    }
-    
-    function foo2_c(x) {
-        while (1 === 1) {
-            const x = 1;
-            var v = x;
-            (function() { return x + v });
-            (() => x + v);
-        }
-        
-        use(v);
-    }
-    
-    function foo3_c(x) {
-        do {
-            const x = 1;
-            var v;
-            (function() { return x + v });
-            (() => x + v);
-        } while (1 === 1);
-        
-        use(v);
-    }
-    
-    function foo4_c(x) {
-        for (const y = 0; y < 1;) {
-                          ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-            var v = y;
-            const x = 1;
-            (function() { return x + v });
-            (() => x + v);
-        }
-        
-        use(v);
-    }
-    
-    function foo5_c(x) {
-        for (const x = 0, y = 1; x < 1;) {
-                                 ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-            var v = x;
-            (function() { return x + y + v });
-            (() => x + y + v);
-        }
-        
-        use(v);
-    }
-    
-    
-    function foo6_c(x) {
-        while (1 === 1) {
-            const x = 1, y = 1;
-            var v = x;
-            (function() { return x + y + v });
-            (() => x + y + v);
-        }
-        
-        use(v)
-    }
-    
-    function foo7_c(x) {
-        do {
-            const x = 1, y = 1;
-            var v = x;
-            (function() { return x + y + v });
-            (() => x + y + v);
-        } while (1 === 1);
-        
-        use(v);
-    }
-    
-    
-    function foo8_c(x) {
-        for (const y = 0; y < 1;) {
-                          ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-            const x = 1;
-            var v = x;
-            (function() { return x + y + v });
-            (() => x + y + v);
-        }
-        
-        use(v);
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/capturedLetConstInLoop3.types b/tests/baselines/reference/capturedLetConstInLoop3.types
index 3f35072fdb2..1fee8db67c4 100644
--- a/tests/baselines/reference/capturedLetConstInLoop3.types
+++ b/tests/baselines/reference/capturedLetConstInLoop3.types
@@ -76,10 +76,10 @@ function foo1(x) {
 
     for (let x = 0; x < 1; ++x) {
 >x : number
->0 : number
+>0 : 0
 >x < 1 : boolean
 >x : number
->1 : number
+>1 : 1
 >++x : number
 >x : number
 
@@ -119,7 +119,7 @@ function foo2(x) {
 
         let x = 1;
 >x : number
->1 : number
+>1 : 1
 
         var v = x;
 >v : number
@@ -179,7 +179,7 @@ function foo3(x) {
     use(v);
 >use(v) : any
 >use : (a: any) => any
->v : any
+>v : undefined
 }
 
 function foo4(x) {
@@ -188,10 +188,10 @@ function foo4(x) {
 
     for (let y = 0; y < 1; ++y) {
 >y : number
->0 : number
+>0 : 0
 >y < 1 : boolean
 >y : number
->1 : number
+>1 : 1
 >++y : number
 >y : number
 
@@ -201,7 +201,7 @@ function foo4(x) {
 
         let x = 1;
 >x : number
->1 : number
+>1 : 1
 
         (function() { return x + v });
 >(function() { return x + v }) : () => number
@@ -230,12 +230,12 @@ function foo5(x) {
 
     for (let x = 0, y = 1; x < 1; ++x) {
 >x : number
->0 : number
+>0 : 0
 >y : number
->1 : number
+>1 : 1
 >x < 1 : boolean
 >x : number
->1 : number
+>1 : 1
 >++x : number
 >x : number
 
@@ -283,8 +283,8 @@ function foo6(x) {
 >y : any
 
         var v = x;
->v : any
->x : any
+>v : undefined
+>x : undefined
 
         (function() { return x + y + v });
 >(function() { return x + y + v }) : () => any
@@ -293,7 +293,7 @@ function foo6(x) {
 >x + y : any
 >x : any
 >y : any
->v : any
+>v : undefined
 
         (() => x + y + v);
 >(() => x + y + v) : () => any
@@ -302,13 +302,13 @@ function foo6(x) {
 >x + y : any
 >x : any
 >y : any
->v : any
+>v : undefined
     }
     
     use(v)
 >use(v) : any
 >use : (a: any) => any
->v : any
+>v : undefined
 }
 
 function foo7(x) {
@@ -321,8 +321,8 @@ function foo7(x) {
 >y : any
 
         var v = x;
->v : any
->x : any
+>v : undefined
+>x : undefined
 
         (function() { return x + y + v });
 >(function() { return x + y + v }) : () => any
@@ -331,7 +331,7 @@ function foo7(x) {
 >x + y : any
 >x : any
 >y : any
->v : any
+>v : undefined
 
         (() => x + y + v);
 >(() => x + y + v) : () => any
@@ -340,7 +340,7 @@ function foo7(x) {
 >x + y : any
 >x : any
 >y : any
->v : any
+>v : undefined
 
     } while (1 === 1);
 >1 === 1 : boolean
@@ -350,7 +350,7 @@ function foo7(x) {
     use(v);
 >use(v) : any
 >use : (a: any) => any
->v : any
+>v : undefined
 }
 
 
@@ -360,16 +360,16 @@ function foo8(x) {
 
     for (let y = 0; y < 1; ++y) {
 >y : number
->0 : number
+>0 : 0
 >y < 1 : boolean
 >y : number
->1 : number
+>1 : 1
 >++y : number
 >y : number
 
         let x = 1;
 >x : number
->1 : number
+>1 : 1
 
         var v = x;
 >v : number
@@ -471,28 +471,28 @@ function foo1_c(x) {
 >x : any
 
     for (const x = 0; x < 1;) {
->x : number
->0 : number
+>x : 0
+>0 : 0
 >x < 1 : boolean
->x : number
->1 : number
+>x : 0
+>1 : 1
 
         var v = x;
 >v : number
->x : number
+>x : 0
 
         (function() { return x + v });
 >(function() { return x + v }) : () => number
 >function() { return x + v } : () => number
 >x + v : number
->x : number
+>x : 0
 >v : number
 
         (() => x + v);
 >(() => x + v) : () => number
 >() => x + v : () => number
 >x + v : number
->x : number
+>x : 0
 >v : number
     }
 
@@ -512,25 +512,25 @@ function foo2_c(x) {
 >1 : 1
 
         const x = 1;
->x : number
->1 : number
+>x : 1
+>1 : 1
 
         var v = x;
 >v : number
->x : number
+>x : 1
 
         (function() { return x + v });
 >(function() { return x + v }) : () => number
 >function() { return x + v } : () => number
 >x + v : number
->x : number
+>x : 1
 >v : number
 
         (() => x + v);
 >(() => x + v) : () => number
 >() => x + v : () => number
 >x + v : number
->x : number
+>x : 1
 >v : number
     }
     
@@ -546,8 +546,8 @@ function foo3_c(x) {
 
     do {
         const x = 1;
->x : number
->1 : number
+>x : 1
+>1 : 1
 
         var v;
 >v : any
@@ -556,14 +556,14 @@ function foo3_c(x) {
 >(function() { return x + v }) : () => any
 >function() { return x + v } : () => any
 >x + v : any
->x : number
+>x : 1
 >v : any
 
         (() => x + v);
 >(() => x + v) : () => any
 >() => x + v : () => any
 >x + v : any
->x : number
+>x : 1
 >v : any
 
     } while (1 === 1);
@@ -574,7 +574,7 @@ function foo3_c(x) {
     use(v);
 >use(v) : any
 >use : (a: any) => any
->v : any
+>v : undefined
 }
 
 function foo4_c(x) {
@@ -582,32 +582,32 @@ function foo4_c(x) {
 >x : any
 
     for (const y = 0; y < 1;) {
->y : number
->0 : number
+>y : 0
+>0 : 0
 >y < 1 : boolean
->y : number
->1 : number
+>y : 0
+>1 : 1
 
         var v = y;
 >v : number
->y : number
+>y : 0
 
         const x = 1;
->x : number
->1 : number
+>x : 1
+>1 : 1
 
         (function() { return x + v });
 >(function() { return x + v }) : () => number
 >function() { return x + v } : () => number
 >x + v : number
->x : number
+>x : 1
 >v : number
 
         (() => x + v);
 >(() => x + v) : () => number
 >() => x + v : () => number
 >x + v : number
->x : number
+>x : 1
 >v : number
     }
     
@@ -622,25 +622,25 @@ function foo5_c(x) {
 >x : any
 
     for (const x = 0, y = 1; x < 1;) {
->x : number
->0 : number
->y : number
->1 : number
+>x : 0
+>0 : 0
+>y : 1
+>1 : 1
 >x < 1 : boolean
->x : number
->1 : number
+>x : 0
+>1 : 1
 
         var v = x;
 >v : number
->x : number
+>x : 0
 
         (function() { return x + y + v });
 >(function() { return x + y + v }) : () => number
 >function() { return x + y + v } : () => number
 >x + y + v : number
 >x + y : number
->x : number
->y : number
+>x : 0
+>y : 1
 >v : number
 
         (() => x + y + v);
@@ -648,8 +648,8 @@ function foo5_c(x) {
 >() => x + y + v : () => number
 >x + y + v : number
 >x + y : number
->x : number
->y : number
+>x : 0
+>y : 1
 >v : number
     }
     
@@ -670,22 +670,22 @@ function foo6_c(x) {
 >1 : 1
 
         const x = 1, y = 1;
->x : number
->1 : number
->y : number
->1 : number
+>x : 1
+>1 : 1
+>y : 1
+>1 : 1
 
         var v = x;
 >v : number
->x : number
+>x : 1
 
         (function() { return x + y + v });
 >(function() { return x + y + v }) : () => number
 >function() { return x + y + v } : () => number
 >x + y + v : number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 1
 >v : number
 
         (() => x + y + v);
@@ -693,8 +693,8 @@ function foo6_c(x) {
 >() => x + y + v : () => number
 >x + y + v : number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 1
 >v : number
     }
     
@@ -710,22 +710,22 @@ function foo7_c(x) {
 
     do {
         const x = 1, y = 1;
->x : number
->1 : number
->y : number
->1 : number
+>x : 1
+>1 : 1
+>y : 1
+>1 : 1
 
         var v = x;
 >v : number
->x : number
+>x : 1
 
         (function() { return x + y + v });
 >(function() { return x + y + v }) : () => number
 >function() { return x + y + v } : () => number
 >x + y + v : number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 1
 >v : number
 
         (() => x + y + v);
@@ -733,8 +733,8 @@ function foo7_c(x) {
 >() => x + y + v : () => number
 >x + y + v : number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 1
 >v : number
 
     } while (1 === 1);
@@ -754,27 +754,27 @@ function foo8_c(x) {
 >x : any
 
     for (const y = 0; y < 1;) {
->y : number
->0 : number
+>y : 0
+>0 : 0
 >y < 1 : boolean
->y : number
->1 : number
+>y : 0
+>1 : 1
 
         const x = 1;
->x : number
->1 : number
+>x : 1
+>1 : 1
 
         var v = x;
 >v : number
->x : number
+>x : 1
 
         (function() { return x + y + v });
 >(function() { return x + y + v }) : () => number
 >function() { return x + y + v } : () => number
 >x + y + v : number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 0
 >v : number
 
         (() => x + y + v);
@@ -782,8 +782,8 @@ function foo8_c(x) {
 >() => x + y + v : () => number
 >x + y + v : number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 0
 >v : number
     }
     
diff --git a/tests/baselines/reference/capturedLetConstInLoop3_ES6.errors.txt b/tests/baselines/reference/capturedLetConstInLoop3_ES6.errors.txt
deleted file mode 100644
index 487c47e32a5..00000000000
--- a/tests/baselines/reference/capturedLetConstInLoop3_ES6.errors.txt
+++ /dev/null
@@ -1,233 +0,0 @@
-tests/cases/compiler/capturedLetConstInLoop3_ES6.ts(133,23): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop3_ES6.ts(165,23): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop3_ES6.ts(176,30): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop3_ES6.ts(210,23): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-
-
-==== tests/cases/compiler/capturedLetConstInLoop3_ES6.ts (4 errors) ====
-    
-    ///=========let
-    declare function use(a: any);
-    function foo0(x) {
-        for (let x of []) {
-            var v = x;
-            (function() { return x + v });
-            (() => x + v);
-        }
-    
-        use(v);
-    }
-    
-    function foo0_1(x) {
-        for (let x in []) {
-            var v = x;
-            (function() { return x + v });
-            (() => x + v);
-        }
-    
-        use(v);
-    }
-    
-    function foo1(x) {
-        for (let x = 0; x < 1; ++x) {
-            var v = x;
-            (function() { return x + v });
-            (() => x + v);
-        }
-    
-        use(v);
-    }
-    
-    function foo2(x) {
-        while (1 === 1) {
-            let x = 1;
-            var v = x;
-            (function() { return x + v });
-            (() => x + v);
-        }
-        
-        use(v);
-    }
-    
-    function foo3(x) {
-        do {
-            let x;
-            var v;
-            (function() { return x + v });
-            (() => x + v);
-        } while (1 === 1);
-        
-        use(v);
-    }
-    
-    function foo4(x) {
-        for (let y = 0; y < 1; ++y) {
-            var v = y;
-            let x = 1;
-            (function() { return x + v });
-            (() => x + v);
-        }
-        
-        use(v);
-    }
-    
-    function foo5(x) {
-        for (let x = 0, y = 1; x < 1; ++x) {
-            var v = x;
-            (function() { return x + y + v });
-            (() => x + y + v);
-        }
-        
-        use(v);
-    }
-    
-    
-    function foo6(x) {
-        while (1 === 1) {
-            let x, y;
-            var v = x;
-            (function() { return x + y + v });
-            (() => x + y + v);
-        }
-        
-        use(v)
-    }
-    
-    function foo7(x) {
-        do {
-            let x, y;
-            var v = x;
-            (function() { return x + y + v });
-            (() => x + y + v);
-        } while (1 === 1);
-        
-        use(v);
-    }
-    
-    
-    function foo8(x) {
-        for (let y = 0; y < 1; ++y) {
-            let x = 1;
-            var v = x;
-            (function() { return x + y + v });
-            (() => x + y + v);
-        }
-        
-        use(v);
-    }
-    //===const
-    function foo0_c(x) {
-        for (const x of []) {
-            var v = x;
-            (function() { return x + v });
-            (() => x + v);
-        }
-    
-        use(v);
-    }
-    
-    function foo0_1_c(x) {
-        for (const x in []) {
-            var v = x;
-            (function() { return x + v });
-            (() => x + v);
-        }
-    
-        use(v);
-    }
-    
-    function foo1_c(x) {
-        for (const x = 0; x < 1;) {
-                          ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-            var v = x;
-            (function() { return x + v });
-            (() => x + v);
-        }
-    
-        use(v);
-    }
-    
-    function foo2_c(x) {
-        while (1 === 1) {
-            const x = 1;
-            var v = x;
-            (function() { return x + v });
-            (() => x + v);
-        }
-        
-        use(v);
-    }
-    
-    function foo3_c(x) {
-        do {
-            const x = 1;
-            var v;
-            (function() { return x + v });
-            (() => x + v);
-        } while (1 === 1);
-        
-        use(v);
-    }
-    
-    function foo4_c(x) {
-        for (const y = 0; y < 1;) {
-                          ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-            var v = y;
-            const x = 1;
-            (function() { return x + v });
-            (() => x + v);
-        }
-        
-        use(v);
-    }
-    
-    function foo5_c(x) {
-        for (const x = 0, y = 1; x < 1;) {
-                                 ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-            var v = x;
-            (function() { return x + y + v });
-            (() => x + y + v);
-        }
-        
-        use(v);
-    }
-    
-    
-    function foo6_c(x) {
-        while (1 === 1) {
-            const x = 1, y = 1;
-            var v = x;
-            (function() { return x + y + v });
-            (() => x + y + v);
-        }
-        
-        use(v)
-    }
-    
-    function foo7_c(x) {
-        do {
-            const x = 1, y = 1;
-            var v = x;
-            (function() { return x + y + v });
-            (() => x + y + v);
-        } while (1 === 1);
-        
-        use(v);
-    }
-    
-    
-    function foo8_c(x) {
-        for (const y = 0; y < 1;) {
-                          ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-            const x = 1;
-            var v = x;
-            (function() { return x + y + v });
-            (() => x + y + v);
-        }
-        
-        use(v);
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/capturedLetConstInLoop3_ES6.types b/tests/baselines/reference/capturedLetConstInLoop3_ES6.types
index 3c7776a6651..bfd279afdff 100644
--- a/tests/baselines/reference/capturedLetConstInLoop3_ES6.types
+++ b/tests/baselines/reference/capturedLetConstInLoop3_ES6.types
@@ -77,10 +77,10 @@ function foo1(x) {
 
     for (let x = 0; x < 1; ++x) {
 >x : number
->0 : number
+>0 : 0
 >x < 1 : boolean
 >x : number
->1 : number
+>1 : 1
 >++x : number
 >x : number
 
@@ -120,7 +120,7 @@ function foo2(x) {
 
         let x = 1;
 >x : number
->1 : number
+>1 : 1
 
         var v = x;
 >v : number
@@ -180,7 +180,7 @@ function foo3(x) {
     use(v);
 >use(v) : any
 >use : (a: any) => any
->v : any
+>v : undefined
 }
 
 function foo4(x) {
@@ -189,10 +189,10 @@ function foo4(x) {
 
     for (let y = 0; y < 1; ++y) {
 >y : number
->0 : number
+>0 : 0
 >y < 1 : boolean
 >y : number
->1 : number
+>1 : 1
 >++y : number
 >y : number
 
@@ -202,7 +202,7 @@ function foo4(x) {
 
         let x = 1;
 >x : number
->1 : number
+>1 : 1
 
         (function() { return x + v });
 >(function() { return x + v }) : () => number
@@ -231,12 +231,12 @@ function foo5(x) {
 
     for (let x = 0, y = 1; x < 1; ++x) {
 >x : number
->0 : number
+>0 : 0
 >y : number
->1 : number
+>1 : 1
 >x < 1 : boolean
 >x : number
->1 : number
+>1 : 1
 >++x : number
 >x : number
 
@@ -284,8 +284,8 @@ function foo6(x) {
 >y : any
 
         var v = x;
->v : any
->x : any
+>v : undefined
+>x : undefined
 
         (function() { return x + y + v });
 >(function() { return x + y + v }) : () => any
@@ -294,7 +294,7 @@ function foo6(x) {
 >x + y : any
 >x : any
 >y : any
->v : any
+>v : undefined
 
         (() => x + y + v);
 >(() => x + y + v) : () => any
@@ -303,13 +303,13 @@ function foo6(x) {
 >x + y : any
 >x : any
 >y : any
->v : any
+>v : undefined
     }
     
     use(v)
 >use(v) : any
 >use : (a: any) => any
->v : any
+>v : undefined
 }
 
 function foo7(x) {
@@ -322,8 +322,8 @@ function foo7(x) {
 >y : any
 
         var v = x;
->v : any
->x : any
+>v : undefined
+>x : undefined
 
         (function() { return x + y + v });
 >(function() { return x + y + v }) : () => any
@@ -332,7 +332,7 @@ function foo7(x) {
 >x + y : any
 >x : any
 >y : any
->v : any
+>v : undefined
 
         (() => x + y + v);
 >(() => x + y + v) : () => any
@@ -341,7 +341,7 @@ function foo7(x) {
 >x + y : any
 >x : any
 >y : any
->v : any
+>v : undefined
 
     } while (1 === 1);
 >1 === 1 : boolean
@@ -351,7 +351,7 @@ function foo7(x) {
     use(v);
 >use(v) : any
 >use : (a: any) => any
->v : any
+>v : undefined
 }
 
 
@@ -361,16 +361,16 @@ function foo8(x) {
 
     for (let y = 0; y < 1; ++y) {
 >y : number
->0 : number
+>0 : 0
 >y < 1 : boolean
 >y : number
->1 : number
+>1 : 1
 >++y : number
 >y : number
 
         let x = 1;
 >x : number
->1 : number
+>1 : 1
 
         var v = x;
 >v : number
@@ -472,28 +472,28 @@ function foo1_c(x) {
 >x : any
 
     for (const x = 0; x < 1;) {
->x : number
->0 : number
+>x : 0
+>0 : 0
 >x < 1 : boolean
->x : number
->1 : number
+>x : 0
+>1 : 1
 
         var v = x;
 >v : number
->x : number
+>x : 0
 
         (function() { return x + v });
 >(function() { return x + v }) : () => number
 >function() { return x + v } : () => number
 >x + v : number
->x : number
+>x : 0
 >v : number
 
         (() => x + v);
 >(() => x + v) : () => number
 >() => x + v : () => number
 >x + v : number
->x : number
+>x : 0
 >v : number
     }
 
@@ -513,25 +513,25 @@ function foo2_c(x) {
 >1 : 1
 
         const x = 1;
->x : number
->1 : number
+>x : 1
+>1 : 1
 
         var v = x;
 >v : number
->x : number
+>x : 1
 
         (function() { return x + v });
 >(function() { return x + v }) : () => number
 >function() { return x + v } : () => number
 >x + v : number
->x : number
+>x : 1
 >v : number
 
         (() => x + v);
 >(() => x + v) : () => number
 >() => x + v : () => number
 >x + v : number
->x : number
+>x : 1
 >v : number
     }
     
@@ -547,8 +547,8 @@ function foo3_c(x) {
 
     do {
         const x = 1;
->x : number
->1 : number
+>x : 1
+>1 : 1
 
         var v;
 >v : any
@@ -557,14 +557,14 @@ function foo3_c(x) {
 >(function() { return x + v }) : () => any
 >function() { return x + v } : () => any
 >x + v : any
->x : number
+>x : 1
 >v : any
 
         (() => x + v);
 >(() => x + v) : () => any
 >() => x + v : () => any
 >x + v : any
->x : number
+>x : 1
 >v : any
 
     } while (1 === 1);
@@ -575,7 +575,7 @@ function foo3_c(x) {
     use(v);
 >use(v) : any
 >use : (a: any) => any
->v : any
+>v : undefined
 }
 
 function foo4_c(x) {
@@ -583,32 +583,32 @@ function foo4_c(x) {
 >x : any
 
     for (const y = 0; y < 1;) {
->y : number
->0 : number
+>y : 0
+>0 : 0
 >y < 1 : boolean
->y : number
->1 : number
+>y : 0
+>1 : 1
 
         var v = y;
 >v : number
->y : number
+>y : 0
 
         const x = 1;
->x : number
->1 : number
+>x : 1
+>1 : 1
 
         (function() { return x + v });
 >(function() { return x + v }) : () => number
 >function() { return x + v } : () => number
 >x + v : number
->x : number
+>x : 1
 >v : number
 
         (() => x + v);
 >(() => x + v) : () => number
 >() => x + v : () => number
 >x + v : number
->x : number
+>x : 1
 >v : number
     }
     
@@ -623,25 +623,25 @@ function foo5_c(x) {
 >x : any
 
     for (const x = 0, y = 1; x < 1;) {
->x : number
->0 : number
->y : number
->1 : number
+>x : 0
+>0 : 0
+>y : 1
+>1 : 1
 >x < 1 : boolean
->x : number
->1 : number
+>x : 0
+>1 : 1
 
         var v = x;
 >v : number
->x : number
+>x : 0
 
         (function() { return x + y + v });
 >(function() { return x + y + v }) : () => number
 >function() { return x + y + v } : () => number
 >x + y + v : number
 >x + y : number
->x : number
->y : number
+>x : 0
+>y : 1
 >v : number
 
         (() => x + y + v);
@@ -649,8 +649,8 @@ function foo5_c(x) {
 >() => x + y + v : () => number
 >x + y + v : number
 >x + y : number
->x : number
->y : number
+>x : 0
+>y : 1
 >v : number
     }
     
@@ -671,22 +671,22 @@ function foo6_c(x) {
 >1 : 1
 
         const x = 1, y = 1;
->x : number
->1 : number
->y : number
->1 : number
+>x : 1
+>1 : 1
+>y : 1
+>1 : 1
 
         var v = x;
 >v : number
->x : number
+>x : 1
 
         (function() { return x + y + v });
 >(function() { return x + y + v }) : () => number
 >function() { return x + y + v } : () => number
 >x + y + v : number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 1
 >v : number
 
         (() => x + y + v);
@@ -694,8 +694,8 @@ function foo6_c(x) {
 >() => x + y + v : () => number
 >x + y + v : number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 1
 >v : number
     }
     
@@ -711,22 +711,22 @@ function foo7_c(x) {
 
     do {
         const x = 1, y = 1;
->x : number
->1 : number
->y : number
->1 : number
+>x : 1
+>1 : 1
+>y : 1
+>1 : 1
 
         var v = x;
 >v : number
->x : number
+>x : 1
 
         (function() { return x + y + v });
 >(function() { return x + y + v }) : () => number
 >function() { return x + y + v } : () => number
 >x + y + v : number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 1
 >v : number
 
         (() => x + y + v);
@@ -734,8 +734,8 @@ function foo7_c(x) {
 >() => x + y + v : () => number
 >x + y + v : number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 1
 >v : number
 
     } while (1 === 1);
@@ -755,27 +755,27 @@ function foo8_c(x) {
 >x : any
 
     for (const y = 0; y < 1;) {
->y : number
->0 : number
+>y : 0
+>0 : 0
 >y < 1 : boolean
->y : number
->1 : number
+>y : 0
+>1 : 1
 
         const x = 1;
->x : number
->1 : number
+>x : 1
+>1 : 1
 
         var v = x;
 >v : number
->x : number
+>x : 1
 
         (function() { return x + y + v });
 >(function() { return x + y + v }) : () => number
 >function() { return x + y + v } : () => number
 >x + y + v : number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 0
 >v : number
 
         (() => x + y + v);
@@ -783,8 +783,8 @@ function foo8_c(x) {
 >() => x + y + v : () => number
 >x + y + v : number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 0
 >v : number
     }
     
diff --git a/tests/baselines/reference/capturedLetConstInLoop4.errors.txt b/tests/baselines/reference/capturedLetConstInLoop4.errors.txt
deleted file mode 100644
index 000286537b8..00000000000
--- a/tests/baselines/reference/capturedLetConstInLoop4.errors.txt
+++ /dev/null
@@ -1,158 +0,0 @@
-tests/cases/compiler/capturedLetConstInLoop4.ts(90,19): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop4.ts(110,19): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop4.ts(117,26): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop4.ts(137,19): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-
-
-==== tests/cases/compiler/capturedLetConstInLoop4.ts (4 errors) ====
-    
-    //======let
-    export function exportedFoo() {
-        return v0 + v00 + v1 + v2 + v3 + v4 + v5 + v6 + v7 + v8;
-    }
-    
-    for (let x of []) {
-        var v0 = x;
-        (function() { return x + v0});
-        (() => x);    
-    }
-    
-    for (let x in []) {
-        var v00 = x;
-        (function() { return x + v00});
-        (() => x);    
-    }
-    
-    for (let x = 0; x < 1; ++x) {
-        var v1 = x;
-        (function() { return x + v1});
-        (() => x);
-    }
-    
-    while (1 === 1) {
-        let x;
-        var v2 = x;
-        (function() { return x + v2});
-        (() => x);
-    }
-    
-    do {
-        let x;
-        var v3 = x;
-        (function() { return x + v3});
-        (() => x);
-    } while (1 === 1)
-    
-    for (let y = 0; y < 1; ++y) {
-        let x = 1;
-        var v4 = x;
-        (function() { return x + v4});
-        (() => x);
-    }
-    
-    for (let x = 0, y = 1; x < 1; ++x) {
-        var v5 = x;
-        (function() { return x + y + v5});
-        (() => x + y);
-    }
-    
-    while (1 === 1) {
-        let x, y;
-        var v6 = x;
-        (function() { return x + y + v6});
-        (() => x + y);
-    }
-    
-    do {
-        let x, y;
-        var v7 = x;
-        (function() { return x + y + v7});
-        (() => x + y);
-    } while (1 === 1)
-    
-    for (let y = 0; y < 1; ++y) {
-        let x = 1;
-        var v8 = x;
-        (function() { return x + y + v8});
-        (() => x + y);
-    }
-    
-    //======const
-    export function exportedFoo2() {
-        return v0_c + v00_c + v1_c + v2_c + v3_c + v4_c + v5_c + v6_c + v7_c + v8_c;
-    }
-    
-    for (const x of []) {
-        var v0_c = x;
-        (function() { return x + v0_c});
-        (() => x);    
-    }
-    
-    for (const x in []) {
-        var v00_c = x;
-        (function() { return x + v00});
-        (() => x);    
-    }
-    
-    for (const x = 0; x < 1;) {
-                      ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-        var v1_c = x;
-        (function() { return x + v1_c});
-        (() => x);
-    }
-    
-    while (1 === 1) {
-        const x =1;
-        var v2_c = x;
-        (function() { return x + v2_c});
-        (() => x);
-    }
-    
-    do {
-        const x = 1;
-        var v3_c = x;
-        (function() { return x + v3_c});
-        (() => x);
-    } while (1 === 1)
-    
-    for (const y = 0; y < 1;) {
-                      ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-        const x = 1;
-        var v4_c = x;
-        (function() { return x + v4_c});
-        (() => x);
-    }
-    
-    for (const x = 0, y = 1; x < 1;) {
-                             ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-        var v5_c = x;
-        (function() { return x + y + v5_c});
-        (() => x + y);
-    }
-    
-    while (1 === 1) {
-        const x = 1, y = 1;
-        var v6_c = x;
-        (function() { return x + y + v6_c});
-        (() => x + y);
-    }
-    
-    do {
-        const x = 1, y = 1;
-        var v7_c = x;
-        (function() { return x + y + v7_c});
-        (() => x + y);
-    } while (1 === 1)
-    
-    for (const y = 0; y < 1;) {
-                      ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-        const x = 1;
-        var v8_c = x;
-        (function() { return x + y + v8_c});
-        (() => x + y);
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/capturedLetConstInLoop4.types b/tests/baselines/reference/capturedLetConstInLoop4.types
index 16226243c53..0feff77f604 100644
--- a/tests/baselines/reference/capturedLetConstInLoop4.types
+++ b/tests/baselines/reference/capturedLetConstInLoop4.types
@@ -17,12 +17,12 @@ export function exportedFoo() {
 >v0 : any
 >v00 : string
 >v1 : number
->v2 : any
->v3 : any
+>v2 : undefined
+>v3 : undefined
 >v4 : number
 >v5 : number
->v6 : any
->v7 : any
+>v6 : undefined
+>v7 : undefined
 >v8 : number
 }
 
@@ -70,10 +70,10 @@ for (let x in []) {
 
 for (let x = 0; x < 1; ++x) {
 >x : number
->0 : number
+>0 : 0
 >x < 1 : boolean
 >x : number
->1 : number
+>1 : 1
 >++x : number
 >x : number
 
@@ -103,15 +103,15 @@ while (1 === 1) {
 >x : any
 
     var v2 = x;
->v2 : any
->x : any
+>v2 : undefined
+>x : undefined
 
     (function() { return x + v2});
 >(function() { return x + v2}) : () => any
 >function() { return x + v2} : () => any
 >x + v2 : any
 >x : any
->v2 : any
+>v2 : undefined
 
     (() => x);
 >(() => x) : () => any
@@ -124,15 +124,15 @@ do {
 >x : any
 
     var v3 = x;
->v3 : any
->x : any
+>v3 : undefined
+>x : undefined
 
     (function() { return x + v3});
 >(function() { return x + v3}) : () => any
 >function() { return x + v3} : () => any
 >x + v3 : any
 >x : any
->v3 : any
+>v3 : undefined
 
     (() => x);
 >(() => x) : () => any
@@ -146,16 +146,16 @@ do {
 
 for (let y = 0; y < 1; ++y) {
 >y : number
->0 : number
+>0 : 0
 >y < 1 : boolean
 >y : number
->1 : number
+>1 : 1
 >++y : number
 >y : number
 
     let x = 1;
 >x : number
->1 : number
+>1 : 1
 
     var v4 = x;
 >v4 : number
@@ -176,12 +176,12 @@ for (let y = 0; y < 1; ++y) {
 
 for (let x = 0, y = 1; x < 1; ++x) {
 >x : number
->0 : number
+>0 : 0
 >y : number
->1 : number
+>1 : 1
 >x < 1 : boolean
 >x : number
->1 : number
+>1 : 1
 >++x : number
 >x : number
 
@@ -216,8 +216,8 @@ while (1 === 1) {
 >y : any
 
     var v6 = x;
->v6 : any
->x : any
+>v6 : undefined
+>x : undefined
 
     (function() { return x + y + v6});
 >(function() { return x + y + v6}) : () => any
@@ -226,7 +226,7 @@ while (1 === 1) {
 >x + y : any
 >x : any
 >y : any
->v6 : any
+>v6 : undefined
 
     (() => x + y);
 >(() => x + y) : () => any
@@ -242,8 +242,8 @@ do {
 >y : any
 
     var v7 = x;
->v7 : any
->x : any
+>v7 : undefined
+>x : undefined
 
     (function() { return x + y + v7});
 >(function() { return x + y + v7}) : () => any
@@ -252,7 +252,7 @@ do {
 >x + y : any
 >x : any
 >y : any
->v7 : any
+>v7 : undefined
 
     (() => x + y);
 >(() => x + y) : () => any
@@ -268,16 +268,16 @@ do {
 
 for (let y = 0; y < 1; ++y) {
 >y : number
->0 : number
+>0 : 0
 >y < 1 : boolean
 >y : number
->1 : number
+>1 : 1
 >++y : number
 >y : number
 
     let x = 1;
 >x : number
->1 : number
+>1 : 1
 
     var v8 = x;
 >v8 : number
@@ -369,27 +369,27 @@ for (const x in []) {
 }
 
 for (const x = 0; x < 1;) {
->x : number
->0 : number
+>x : 0
+>0 : 0
 >x < 1 : boolean
->x : number
->1 : number
+>x : 0
+>1 : 1
 
     var v1_c = x;
 >v1_c : number
->x : number
+>x : 0
 
     (function() { return x + v1_c});
 >(function() { return x + v1_c}) : () => number
 >function() { return x + v1_c} : () => number
 >x + v1_c : number
->x : number
+>x : 0
 >v1_c : number
 
     (() => x);
 >(() => x) : () => number
 >() => x : () => number
->x : number
+>x : 0
 }
 
 while (1 === 1) {
@@ -398,46 +398,46 @@ while (1 === 1) {
 >1 : 1
 
     const x =1;
->x : number
->1 : number
+>x : 1
+>1 : 1
 
     var v2_c = x;
 >v2_c : number
->x : number
+>x : 1
 
     (function() { return x + v2_c});
 >(function() { return x + v2_c}) : () => number
 >function() { return x + v2_c} : () => number
 >x + v2_c : number
->x : number
+>x : 1
 >v2_c : number
 
     (() => x);
 >(() => x) : () => number
 >() => x : () => number
->x : number
+>x : 1
 }
 
 do {
     const x = 1;
->x : number
->1 : number
+>x : 1
+>1 : 1
 
     var v3_c = x;
 >v3_c : number
->x : number
+>x : 1
 
     (function() { return x + v3_c});
 >(function() { return x + v3_c}) : () => number
 >function() { return x + v3_c} : () => number
 >x + v3_c : number
->x : number
+>x : 1
 >v3_c : number
 
     (() => x);
 >(() => x) : () => number
 >() => x : () => number
->x : number
+>x : 1
 
 } while (1 === 1)
 >1 === 1 : boolean
@@ -445,61 +445,61 @@ do {
 >1 : 1
 
 for (const y = 0; y < 1;) {
->y : number
->0 : number
+>y : 0
+>0 : 0
 >y < 1 : boolean
->y : number
->1 : number
+>y : 0
+>1 : 1
 
     const x = 1;
->x : number
->1 : number
+>x : 1
+>1 : 1
 
     var v4_c = x;
 >v4_c : number
->x : number
+>x : 1
 
     (function() { return x + v4_c});
 >(function() { return x + v4_c}) : () => number
 >function() { return x + v4_c} : () => number
 >x + v4_c : number
->x : number
+>x : 1
 >v4_c : number
 
     (() => x);
 >(() => x) : () => number
 >() => x : () => number
->x : number
+>x : 1
 }
 
 for (const x = 0, y = 1; x < 1;) {
->x : number
->0 : number
->y : number
->1 : number
+>x : 0
+>0 : 0
+>y : 1
+>1 : 1
 >x < 1 : boolean
->x : number
->1 : number
+>x : 0
+>1 : 1
 
     var v5_c = x;
 >v5_c : number
->x : number
+>x : 0
 
     (function() { return x + y + v5_c});
 >(function() { return x + y + v5_c}) : () => number
 >function() { return x + y + v5_c} : () => number
 >x + y + v5_c : number
 >x + y : number
->x : number
->y : number
+>x : 0
+>y : 1
 >v5_c : number
 
     (() => x + y);
 >(() => x + y) : () => number
 >() => x + y : () => number
 >x + y : number
->x : number
->y : number
+>x : 0
+>y : 1
 }
 
 while (1 === 1) {
@@ -508,58 +508,58 @@ while (1 === 1) {
 >1 : 1
 
     const x = 1, y = 1;
->x : number
->1 : number
->y : number
->1 : number
+>x : 1
+>1 : 1
+>y : 1
+>1 : 1
 
     var v6_c = x;
 >v6_c : number
->x : number
+>x : 1
 
     (function() { return x + y + v6_c});
 >(function() { return x + y + v6_c}) : () => number
 >function() { return x + y + v6_c} : () => number
 >x + y + v6_c : number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 1
 >v6_c : number
 
     (() => x + y);
 >(() => x + y) : () => number
 >() => x + y : () => number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 1
 }
 
 do {
     const x = 1, y = 1;
->x : number
->1 : number
->y : number
->1 : number
+>x : 1
+>1 : 1
+>y : 1
+>1 : 1
 
     var v7_c = x;
 >v7_c : number
->x : number
+>x : 1
 
     (function() { return x + y + v7_c});
 >(function() { return x + y + v7_c}) : () => number
 >function() { return x + y + v7_c} : () => number
 >x + y + v7_c : number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 1
 >v7_c : number
 
     (() => x + y);
 >(() => x + y) : () => number
 >() => x + y : () => number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 1
 
 } while (1 === 1)
 >1 === 1 : boolean
@@ -567,34 +567,34 @@ do {
 >1 : 1
 
 for (const y = 0; y < 1;) {
->y : number
->0 : number
+>y : 0
+>0 : 0
 >y < 1 : boolean
->y : number
->1 : number
+>y : 0
+>1 : 1
 
     const x = 1;
->x : number
->1 : number
+>x : 1
+>1 : 1
 
     var v8_c = x;
 >v8_c : number
->x : number
+>x : 1
 
     (function() { return x + y + v8_c});
 >(function() { return x + y + v8_c}) : () => number
 >function() { return x + y + v8_c} : () => number
 >x + y + v8_c : number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 0
 >v8_c : number
 
     (() => x + y);
 >(() => x + y) : () => number
 >() => x + y : () => number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 0
 }
 
diff --git a/tests/baselines/reference/capturedLetConstInLoop4_ES6.errors.txt b/tests/baselines/reference/capturedLetConstInLoop4_ES6.errors.txt
deleted file mode 100644
index a83bb1d414f..00000000000
--- a/tests/baselines/reference/capturedLetConstInLoop4_ES6.errors.txt
+++ /dev/null
@@ -1,158 +0,0 @@
-tests/cases/compiler/capturedLetConstInLoop4_ES6.ts(90,19): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop4_ES6.ts(110,19): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop4_ES6.ts(117,26): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop4_ES6.ts(137,19): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-
-
-==== tests/cases/compiler/capturedLetConstInLoop4_ES6.ts (4 errors) ====
-    
-    //======let
-    export function exportedFoo() {
-        return v0 + v00 + v1 + v2 + v3 + v4 + v5 + v6 + v7 + v8;
-    }
-    
-    for (let x of []) {
-        var v0 = x;
-        (function() { return x + v0});
-        (() => x);    
-    }
-    
-    for (let x in []) {
-        var v00 = x;
-        (function() { return x + v00});
-        (() => x);    
-    }
-    
-    for (let x = 0; x < 1; ++x) {
-        var v1 = x;
-        (function() { return x + v1});
-        (() => x);
-    }
-    
-    while (1 === 1) {
-        let x;
-        var v2 = x;
-        (function() { return x + v2});
-        (() => x);
-    }
-    
-    do {
-        let x;
-        var v3 = x;
-        (function() { return x + v3});
-        (() => x);
-    } while (1 === 1)
-    
-    for (let y = 0; y < 1; ++y) {
-        let x = 1;
-        var v4 = x;
-        (function() { return x + v4});
-        (() => x);
-    }
-    
-    for (let x = 0, y = 1; x < 1; ++x) {
-        var v5 = x;
-        (function() { return x + y + v5});
-        (() => x + y);
-    }
-    
-    while (1 === 1) {
-        let x, y;
-        var v6 = x;
-        (function() { return x + y + v6});
-        (() => x + y);
-    }
-    
-    do {
-        let x, y;
-        var v7 = x;
-        (function() { return x + y + v7});
-        (() => x + y);
-    } while (1 === 1)
-    
-    for (let y = 0; y < 1; ++y) {
-        let x = 1;
-        var v8 = x;
-        (function() { return x + y + v8});
-        (() => x + y);
-    }
-    
-    //======const
-    export function exportedFoo2() {
-        return v0_c + v00_c + v1_c + v2_c + v3_c + v4_c + v5_c + v6_c + v7_c + v8_c;
-    }
-    
-    for (const x of []) {
-        var v0_c = x;
-        (function() { return x + v0_c});
-        (() => x);    
-    }
-    
-    for (const x in []) {
-        var v00_c = x;
-        (function() { return x + v00});
-        (() => x);    
-    }
-    
-    for (const x = 0; x < 1;) {
-                      ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-        var v1_c = x;
-        (function() { return x + v1_c});
-        (() => x);
-    }
-    
-    while (1 === 1) {
-        const x =1;
-        var v2_c = x;
-        (function() { return x + v2_c});
-        (() => x);
-    }
-    
-    do {
-        const x = 1;
-        var v3_c = x;
-        (function() { return x + v3_c});
-        (() => x);
-    } while (1 === 1)
-    
-    for (const y = 0; y < 1;) {
-                      ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-        const x = 1;
-        var v4_c = x;
-        (function() { return x + v4_c});
-        (() => x);
-    }
-    
-    for (const x = 0, y = 1; x < 1;) {
-                             ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-        var v5_c = x;
-        (function() { return x + y + v5_c});
-        (() => x + y);
-    }
-    
-    while (1 === 1) {
-        const x = 1, y = 1;
-        var v6_c = x;
-        (function() { return x + y + v6_c});
-        (() => x + y);
-    }
-    
-    do {
-        const x = 1, y = 1;
-        var v7_c = x;
-        (function() { return x + y + v7_c});
-        (() => x + y);
-    } while (1 === 1)
-    
-    for (const y = 0; y < 1;) {
-                      ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-        const x = 1;
-        var v8_c = x;
-        (function() { return x + y + v8_c});
-        (() => x + y);
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/capturedLetConstInLoop4_ES6.types b/tests/baselines/reference/capturedLetConstInLoop4_ES6.types
index fba7d88ec48..301a6ef90f1 100644
--- a/tests/baselines/reference/capturedLetConstInLoop4_ES6.types
+++ b/tests/baselines/reference/capturedLetConstInLoop4_ES6.types
@@ -17,12 +17,12 @@ export function exportedFoo() {
 >v0 : any
 >v00 : string
 >v1 : number
->v2 : any
->v3 : any
+>v2 : undefined
+>v3 : undefined
 >v4 : number
 >v5 : number
->v6 : any
->v7 : any
+>v6 : undefined
+>v7 : undefined
 >v8 : number
 }
 
@@ -70,10 +70,10 @@ for (let x in []) {
 
 for (let x = 0; x < 1; ++x) {
 >x : number
->0 : number
+>0 : 0
 >x < 1 : boolean
 >x : number
->1 : number
+>1 : 1
 >++x : number
 >x : number
 
@@ -103,15 +103,15 @@ while (1 === 1) {
 >x : any
 
     var v2 = x;
->v2 : any
->x : any
+>v2 : undefined
+>x : undefined
 
     (function() { return x + v2});
 >(function() { return x + v2}) : () => any
 >function() { return x + v2} : () => any
 >x + v2 : any
 >x : any
->v2 : any
+>v2 : undefined
 
     (() => x);
 >(() => x) : () => any
@@ -124,15 +124,15 @@ do {
 >x : any
 
     var v3 = x;
->v3 : any
->x : any
+>v3 : undefined
+>x : undefined
 
     (function() { return x + v3});
 >(function() { return x + v3}) : () => any
 >function() { return x + v3} : () => any
 >x + v3 : any
 >x : any
->v3 : any
+>v3 : undefined
 
     (() => x);
 >(() => x) : () => any
@@ -146,16 +146,16 @@ do {
 
 for (let y = 0; y < 1; ++y) {
 >y : number
->0 : number
+>0 : 0
 >y < 1 : boolean
 >y : number
->1 : number
+>1 : 1
 >++y : number
 >y : number
 
     let x = 1;
 >x : number
->1 : number
+>1 : 1
 
     var v4 = x;
 >v4 : number
@@ -176,12 +176,12 @@ for (let y = 0; y < 1; ++y) {
 
 for (let x = 0, y = 1; x < 1; ++x) {
 >x : number
->0 : number
+>0 : 0
 >y : number
->1 : number
+>1 : 1
 >x < 1 : boolean
 >x : number
->1 : number
+>1 : 1
 >++x : number
 >x : number
 
@@ -216,8 +216,8 @@ while (1 === 1) {
 >y : any
 
     var v6 = x;
->v6 : any
->x : any
+>v6 : undefined
+>x : undefined
 
     (function() { return x + y + v6});
 >(function() { return x + y + v6}) : () => any
@@ -226,7 +226,7 @@ while (1 === 1) {
 >x + y : any
 >x : any
 >y : any
->v6 : any
+>v6 : undefined
 
     (() => x + y);
 >(() => x + y) : () => any
@@ -242,8 +242,8 @@ do {
 >y : any
 
     var v7 = x;
->v7 : any
->x : any
+>v7 : undefined
+>x : undefined
 
     (function() { return x + y + v7});
 >(function() { return x + y + v7}) : () => any
@@ -252,7 +252,7 @@ do {
 >x + y : any
 >x : any
 >y : any
->v7 : any
+>v7 : undefined
 
     (() => x + y);
 >(() => x + y) : () => any
@@ -268,16 +268,16 @@ do {
 
 for (let y = 0; y < 1; ++y) {
 >y : number
->0 : number
+>0 : 0
 >y < 1 : boolean
 >y : number
->1 : number
+>1 : 1
 >++y : number
 >y : number
 
     let x = 1;
 >x : number
->1 : number
+>1 : 1
 
     var v8 = x;
 >v8 : number
@@ -369,27 +369,27 @@ for (const x in []) {
 }
 
 for (const x = 0; x < 1;) {
->x : number
->0 : number
+>x : 0
+>0 : 0
 >x < 1 : boolean
->x : number
->1 : number
+>x : 0
+>1 : 1
 
     var v1_c = x;
 >v1_c : number
->x : number
+>x : 0
 
     (function() { return x + v1_c});
 >(function() { return x + v1_c}) : () => number
 >function() { return x + v1_c} : () => number
 >x + v1_c : number
->x : number
+>x : 0
 >v1_c : number
 
     (() => x);
 >(() => x) : () => number
 >() => x : () => number
->x : number
+>x : 0
 }
 
 while (1 === 1) {
@@ -398,46 +398,46 @@ while (1 === 1) {
 >1 : 1
 
     const x =1;
->x : number
->1 : number
+>x : 1
+>1 : 1
 
     var v2_c = x;
 >v2_c : number
->x : number
+>x : 1
 
     (function() { return x + v2_c});
 >(function() { return x + v2_c}) : () => number
 >function() { return x + v2_c} : () => number
 >x + v2_c : number
->x : number
+>x : 1
 >v2_c : number
 
     (() => x);
 >(() => x) : () => number
 >() => x : () => number
->x : number
+>x : 1
 }
 
 do {
     const x = 1;
->x : number
->1 : number
+>x : 1
+>1 : 1
 
     var v3_c = x;
 >v3_c : number
->x : number
+>x : 1
 
     (function() { return x + v3_c});
 >(function() { return x + v3_c}) : () => number
 >function() { return x + v3_c} : () => number
 >x + v3_c : number
->x : number
+>x : 1
 >v3_c : number
 
     (() => x);
 >(() => x) : () => number
 >() => x : () => number
->x : number
+>x : 1
 
 } while (1 === 1)
 >1 === 1 : boolean
@@ -445,61 +445,61 @@ do {
 >1 : 1
 
 for (const y = 0; y < 1;) {
->y : number
->0 : number
+>y : 0
+>0 : 0
 >y < 1 : boolean
->y : number
->1 : number
+>y : 0
+>1 : 1
 
     const x = 1;
->x : number
->1 : number
+>x : 1
+>1 : 1
 
     var v4_c = x;
 >v4_c : number
->x : number
+>x : 1
 
     (function() { return x + v4_c});
 >(function() { return x + v4_c}) : () => number
 >function() { return x + v4_c} : () => number
 >x + v4_c : number
->x : number
+>x : 1
 >v4_c : number
 
     (() => x);
 >(() => x) : () => number
 >() => x : () => number
->x : number
+>x : 1
 }
 
 for (const x = 0, y = 1; x < 1;) {
->x : number
->0 : number
->y : number
->1 : number
+>x : 0
+>0 : 0
+>y : 1
+>1 : 1
 >x < 1 : boolean
->x : number
->1 : number
+>x : 0
+>1 : 1
 
     var v5_c = x;
 >v5_c : number
->x : number
+>x : 0
 
     (function() { return x + y + v5_c});
 >(function() { return x + y + v5_c}) : () => number
 >function() { return x + y + v5_c} : () => number
 >x + y + v5_c : number
 >x + y : number
->x : number
->y : number
+>x : 0
+>y : 1
 >v5_c : number
 
     (() => x + y);
 >(() => x + y) : () => number
 >() => x + y : () => number
 >x + y : number
->x : number
->y : number
+>x : 0
+>y : 1
 }
 
 while (1 === 1) {
@@ -508,58 +508,58 @@ while (1 === 1) {
 >1 : 1
 
     const x = 1, y = 1;
->x : number
->1 : number
->y : number
->1 : number
+>x : 1
+>1 : 1
+>y : 1
+>1 : 1
 
     var v6_c = x;
 >v6_c : number
->x : number
+>x : 1
 
     (function() { return x + y + v6_c});
 >(function() { return x + y + v6_c}) : () => number
 >function() { return x + y + v6_c} : () => number
 >x + y + v6_c : number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 1
 >v6_c : number
 
     (() => x + y);
 >(() => x + y) : () => number
 >() => x + y : () => number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 1
 }
 
 do {
     const x = 1, y = 1;
->x : number
->1 : number
->y : number
->1 : number
+>x : 1
+>1 : 1
+>y : 1
+>1 : 1
 
     var v7_c = x;
 >v7_c : number
->x : number
+>x : 1
 
     (function() { return x + y + v7_c});
 >(function() { return x + y + v7_c}) : () => number
 >function() { return x + y + v7_c} : () => number
 >x + y + v7_c : number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 1
 >v7_c : number
 
     (() => x + y);
 >(() => x + y) : () => number
 >() => x + y : () => number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 1
 
 } while (1 === 1)
 >1 === 1 : boolean
@@ -567,34 +567,34 @@ do {
 >1 : 1
 
 for (const y = 0; y < 1;) {
->y : number
->0 : number
+>y : 0
+>0 : 0
 >y < 1 : boolean
->y : number
->1 : number
+>y : 0
+>1 : 1
 
     const x = 1;
->x : number
->1 : number
+>x : 1
+>1 : 1
 
     var v8_c = x;
 >v8_c : number
->x : number
+>x : 1
 
     (function() { return x + y + v8_c});
 >(function() { return x + y + v8_c}) : () => number
 >function() { return x + y + v8_c} : () => number
 >x + y + v8_c : number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 0
 >v8_c : number
 
     (() => x + y);
 >(() => x + y) : () => number
 >() => x + y : () => number
 >x + y : number
->x : number
->y : number
+>x : 1
+>y : 0
 }
 
diff --git a/tests/baselines/reference/capturedLetConstInLoop5.errors.txt b/tests/baselines/reference/capturedLetConstInLoop5.errors.txt
index b182d8347de..cb641af478d 100644
--- a/tests/baselines/reference/capturedLetConstInLoop5.errors.txt
+++ b/tests/baselines/reference/capturedLetConstInLoop5.errors.txt
@@ -1,12 +1,8 @@
-tests/cases/compiler/capturedLetConstInLoop5.ts(170,23): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
 tests/cases/compiler/capturedLetConstInLoop5.ts(174,13): error TS2365: Operator '==' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop5.ts(211,23): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop5.ts(225,30): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
 tests/cases/compiler/capturedLetConstInLoop5.ts(229,13): error TS2365: Operator '==' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop5.ts(268,23): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
 
 
-==== tests/cases/compiler/capturedLetConstInLoop5.ts (6 errors) ====
+==== tests/cases/compiler/capturedLetConstInLoop5.ts (2 errors) ====
     declare function use(a: any);
     
     //====let
@@ -177,8 +173,6 @@ tests/cases/compiler/capturedLetConstInLoop5.ts(268,23): error TS2365: Operator
     
     function foo1_c(x) {
         for (const x = 0; x < 1;) {
-                          ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
             var v = x;
             (function() { return x + v });
             (() => x + v);
@@ -222,8 +216,6 @@ tests/cases/compiler/capturedLetConstInLoop5.ts(268,23): error TS2365: Operator
     
     function foo4_c(x) {
         for (const y = 0; y < 1;) {
-                          ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
             var v = y;
             let x = 1;
             (function() { return x + v });
@@ -238,8 +230,6 @@ tests/cases/compiler/capturedLetConstInLoop5.ts(268,23): error TS2365: Operator
     
     function foo5_c(x) {
         for (const x = 0, y = 1; x < 1;) {
-                                 ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
             var v = x;
             (function() { return x + y + v });
             (() => x + y + v);
@@ -285,8 +275,6 @@ tests/cases/compiler/capturedLetConstInLoop5.ts(268,23): error TS2365: Operator
     
     function foo8_c(x) {
         for (const y = 0; y < 1;) {
-                          ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
             const x = 1;
             var v = x;
             (function() { return x + y + v });
diff --git a/tests/baselines/reference/capturedLetConstInLoop5_ES6.errors.txt b/tests/baselines/reference/capturedLetConstInLoop5_ES6.errors.txt
index 05eb0626e2d..a9a4742631a 100644
--- a/tests/baselines/reference/capturedLetConstInLoop5_ES6.errors.txt
+++ b/tests/baselines/reference/capturedLetConstInLoop5_ES6.errors.txt
@@ -1,12 +1,8 @@
-tests/cases/compiler/capturedLetConstInLoop5_ES6.ts(171,23): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
 tests/cases/compiler/capturedLetConstInLoop5_ES6.ts(175,13): error TS2365: Operator '==' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop5_ES6.ts(212,23): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop5_ES6.ts(226,30): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
 tests/cases/compiler/capturedLetConstInLoop5_ES6.ts(230,13): error TS2365: Operator '==' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop5_ES6.ts(269,23): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
 
 
-==== tests/cases/compiler/capturedLetConstInLoop5_ES6.ts (6 errors) ====
+==== tests/cases/compiler/capturedLetConstInLoop5_ES6.ts (2 errors) ====
     
     declare function use(a: any);
     
@@ -178,8 +174,6 @@ tests/cases/compiler/capturedLetConstInLoop5_ES6.ts(269,23): error TS2365: Opera
     
     function foo1_c(x) {
         for (const x = 0; x < 1;) {
-                          ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
             var v = x;
             (function() { return x + v });
             (() => x + v);
@@ -223,8 +217,6 @@ tests/cases/compiler/capturedLetConstInLoop5_ES6.ts(269,23): error TS2365: Opera
     
     function foo4_c(x) {
         for (const y = 0; y < 1;) {
-                          ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
             var v = y;
             let x = 1;
             (function() { return x + v });
@@ -239,8 +231,6 @@ tests/cases/compiler/capturedLetConstInLoop5_ES6.ts(269,23): error TS2365: Opera
     
     function foo5_c(x) {
         for (const x = 0, y = 1; x < 1;) {
-                                 ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
             var v = x;
             (function() { return x + y + v });
             (() => x + y + v);
@@ -286,8 +276,6 @@ tests/cases/compiler/capturedLetConstInLoop5_ES6.ts(269,23): error TS2365: Opera
     
     function foo8_c(x) {
         for (const y = 0; y < 1;) {
-                          ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
             const x = 1;
             var v = x;
             (function() { return x + y + v });
diff --git a/tests/baselines/reference/capturedLetConstInLoop6.errors.txt b/tests/baselines/reference/capturedLetConstInLoop6.errors.txt
index c332c5b7323..cc5d238e7af 100644
--- a/tests/baselines/reference/capturedLetConstInLoop6.errors.txt
+++ b/tests/baselines/reference/capturedLetConstInLoop6.errors.txt
@@ -1,14 +1,10 @@
-tests/cases/compiler/capturedLetConstInLoop6.ts(144,19): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
 tests/cases/compiler/capturedLetConstInLoop6.ts(147,9): error TS2365: Operator '==' cannot be applied to types '0' and '1'.
 tests/cases/compiler/capturedLetConstInLoop6.ts(150,9): error TS2365: Operator '==' cannot be applied to types '0' and '2'.
-tests/cases/compiler/capturedLetConstInLoop6.ts(179,19): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop6.ts(191,26): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
 tests/cases/compiler/capturedLetConstInLoop6.ts(194,9): error TS2365: Operator '==' cannot be applied to types '0' and '1'.
 tests/cases/compiler/capturedLetConstInLoop6.ts(197,9): error TS2365: Operator '==' cannot be applied to types '0' and '2'.
-tests/cases/compiler/capturedLetConstInLoop6.ts(226,19): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
 
 
-==== tests/cases/compiler/capturedLetConstInLoop6.ts (8 errors) ====
+==== tests/cases/compiler/capturedLetConstInLoop6.ts (4 errors) ====
     // ====let
     for (let x of []) {
         (function() { return x});
@@ -153,8 +149,6 @@ tests/cases/compiler/capturedLetConstInLoop6.ts(226,19): error TS2365: Operator
     
     
     for (const x = 0; x < 1;) {
-                      ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
         (function() { return x});
         (() => x);
         if (x == 1) {
@@ -194,8 +188,6 @@ tests/cases/compiler/capturedLetConstInLoop6.ts(226,19): error TS2365: Operator
     } while (1 === 1)
     
     for (const y = 0; y < 1;) {
-                      ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
         const x = 1;
         (function() { return x});
         (() => x);
@@ -208,8 +200,6 @@ tests/cases/compiler/capturedLetConstInLoop6.ts(226,19): error TS2365: Operator
     }
     
     for (const x = 0, y = 1; x < 1;) {
-                             ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
         (function() { return x + y});
         (() => x + y);
         if (x == 1) {
@@ -249,8 +239,6 @@ tests/cases/compiler/capturedLetConstInLoop6.ts(226,19): error TS2365: Operator
     } while (1 === 1)
     
     for (const y = 0; y < 1;) {
-                      ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
         const x = 1;
         (function() { return x + y});
         (() => x + y);
diff --git a/tests/baselines/reference/capturedLetConstInLoop6_ES6.errors.txt b/tests/baselines/reference/capturedLetConstInLoop6_ES6.errors.txt
index 18ecfe7c666..4e563153ac9 100644
--- a/tests/baselines/reference/capturedLetConstInLoop6_ES6.errors.txt
+++ b/tests/baselines/reference/capturedLetConstInLoop6_ES6.errors.txt
@@ -1,14 +1,10 @@
-tests/cases/compiler/capturedLetConstInLoop6_ES6.ts(144,19): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
 tests/cases/compiler/capturedLetConstInLoop6_ES6.ts(147,9): error TS2365: Operator '==' cannot be applied to types '0' and '1'.
 tests/cases/compiler/capturedLetConstInLoop6_ES6.ts(150,9): error TS2365: Operator '==' cannot be applied to types '0' and '2'.
-tests/cases/compiler/capturedLetConstInLoop6_ES6.ts(179,19): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop6_ES6.ts(191,26): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
 tests/cases/compiler/capturedLetConstInLoop6_ES6.ts(194,9): error TS2365: Operator '==' cannot be applied to types '0' and '1'.
 tests/cases/compiler/capturedLetConstInLoop6_ES6.ts(197,9): error TS2365: Operator '==' cannot be applied to types '0' and '2'.
-tests/cases/compiler/capturedLetConstInLoop6_ES6.ts(226,19): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
 
 
-==== tests/cases/compiler/capturedLetConstInLoop6_ES6.ts (8 errors) ====
+==== tests/cases/compiler/capturedLetConstInLoop6_ES6.ts (4 errors) ====
     // ====let
     for (let x of []) {
         (function() { return x});
@@ -153,8 +149,6 @@ tests/cases/compiler/capturedLetConstInLoop6_ES6.ts(226,19): error TS2365: Opera
     
     
     for (const x = 0; x < 1;) {
-                      ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
         (function() { return x});
         (() => x);
         if (x == 1) {
@@ -194,8 +188,6 @@ tests/cases/compiler/capturedLetConstInLoop6_ES6.ts(226,19): error TS2365: Opera
     } while (1 === 1)
     
     for (const y = 0; y < 1;) {
-                      ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
         const x = 1;
         (function() { return x});
         (() => x);
@@ -208,8 +200,6 @@ tests/cases/compiler/capturedLetConstInLoop6_ES6.ts(226,19): error TS2365: Opera
     }
     
     for (const x = 0, y = 1; x < 1;) {
-                             ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
         (function() { return x + y});
         (() => x + y);
         if (x == 1) {
@@ -249,8 +239,6 @@ tests/cases/compiler/capturedLetConstInLoop6_ES6.ts(226,19): error TS2365: Opera
     } while (1 === 1)
     
     for (const y = 0; y < 1;) {
-                      ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
         const x = 1;
         (function() { return x + y});
         (() => x + y);
diff --git a/tests/baselines/reference/capturedLetConstInLoop7.errors.txt b/tests/baselines/reference/capturedLetConstInLoop7.errors.txt
index 29e6fbca6cd..4b8e512f41a 100644
--- a/tests/baselines/reference/capturedLetConstInLoop7.errors.txt
+++ b/tests/baselines/reference/capturedLetConstInLoop7.errors.txt
@@ -1,18 +1,14 @@
-tests/cases/compiler/capturedLetConstInLoop7.ts(227,19): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
 tests/cases/compiler/capturedLetConstInLoop7.ts(230,9): error TS2365: Operator '==' cannot be applied to types '0' and '1'.
 tests/cases/compiler/capturedLetConstInLoop7.ts(233,9): error TS2365: Operator '==' cannot be applied to types '0' and '1'.
 tests/cases/compiler/capturedLetConstInLoop7.ts(236,9): error TS2365: Operator '==' cannot be applied to types '0' and '2'.
 tests/cases/compiler/capturedLetConstInLoop7.ts(239,9): error TS2365: Operator '==' cannot be applied to types '0' and '2'.
-tests/cases/compiler/capturedLetConstInLoop7.ts(283,19): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop7.ts(302,26): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
 tests/cases/compiler/capturedLetConstInLoop7.ts(305,9): error TS2365: Operator '==' cannot be applied to types '0' and '1'.
 tests/cases/compiler/capturedLetConstInLoop7.ts(308,9): error TS2365: Operator '==' cannot be applied to types '0' and '1'.
 tests/cases/compiler/capturedLetConstInLoop7.ts(311,9): error TS2365: Operator '==' cannot be applied to types '0' and '2'.
 tests/cases/compiler/capturedLetConstInLoop7.ts(314,9): error TS2365: Operator '==' cannot be applied to types '0' and '2'.
-tests/cases/compiler/capturedLetConstInLoop7.ts(359,19): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
 
 
-==== tests/cases/compiler/capturedLetConstInLoop7.ts (12 errors) ====
+==== tests/cases/compiler/capturedLetConstInLoop7.ts (8 errors) ====
     //===let
     l0:
     for (let x of []) {
@@ -240,8 +236,6 @@ tests/cases/compiler/capturedLetConstInLoop7.ts(359,19): error TS2365: Operator
     
     l1_c:
     for (const x = 0; x < 1;) {
-                      ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
         (function() { return x});
         (() => x);
         if (x == 1) {
@@ -306,8 +300,6 @@ tests/cases/compiler/capturedLetConstInLoop7.ts(359,19): error TS2365: Operator
     
     l4_c:
     for (const y = 0; y < 1;) {
-                      ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
         const x = 1;
         (function() { return x});
         (() => x);
@@ -327,8 +319,6 @@ tests/cases/compiler/capturedLetConstInLoop7.ts(359,19): error TS2365: Operator
     
     l5_c:
     for (const x = 0, y = 1; x < 1;) {
-                             ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
         (function() { return x + y});
         (() => x + y);
         if (x == 1) {
@@ -394,8 +384,6 @@ tests/cases/compiler/capturedLetConstInLoop7.ts(359,19): error TS2365: Operator
     
     l8_c:
     for (const y = 0; y < 1;) {
-                      ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
         const x = 1;
         (function() { return x + y});
         (() => x + y);
diff --git a/tests/baselines/reference/capturedLetConstInLoop7_ES6.errors.txt b/tests/baselines/reference/capturedLetConstInLoop7_ES6.errors.txt
index a2001dc09b3..30e2db6a253 100644
--- a/tests/baselines/reference/capturedLetConstInLoop7_ES6.errors.txt
+++ b/tests/baselines/reference/capturedLetConstInLoop7_ES6.errors.txt
@@ -1,18 +1,14 @@
-tests/cases/compiler/capturedLetConstInLoop7_ES6.ts(227,19): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
 tests/cases/compiler/capturedLetConstInLoop7_ES6.ts(230,9): error TS2365: Operator '==' cannot be applied to types '0' and '1'.
 tests/cases/compiler/capturedLetConstInLoop7_ES6.ts(233,9): error TS2365: Operator '==' cannot be applied to types '0' and '1'.
 tests/cases/compiler/capturedLetConstInLoop7_ES6.ts(236,9): error TS2365: Operator '==' cannot be applied to types '0' and '2'.
 tests/cases/compiler/capturedLetConstInLoop7_ES6.ts(239,9): error TS2365: Operator '==' cannot be applied to types '0' and '2'.
-tests/cases/compiler/capturedLetConstInLoop7_ES6.ts(283,19): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop7_ES6.ts(302,26): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
 tests/cases/compiler/capturedLetConstInLoop7_ES6.ts(305,9): error TS2365: Operator '==' cannot be applied to types '0' and '1'.
 tests/cases/compiler/capturedLetConstInLoop7_ES6.ts(308,9): error TS2365: Operator '==' cannot be applied to types '0' and '1'.
 tests/cases/compiler/capturedLetConstInLoop7_ES6.ts(311,9): error TS2365: Operator '==' cannot be applied to types '0' and '2'.
 tests/cases/compiler/capturedLetConstInLoop7_ES6.ts(314,9): error TS2365: Operator '==' cannot be applied to types '0' and '2'.
-tests/cases/compiler/capturedLetConstInLoop7_ES6.ts(359,19): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
 
 
-==== tests/cases/compiler/capturedLetConstInLoop7_ES6.ts (12 errors) ====
+==== tests/cases/compiler/capturedLetConstInLoop7_ES6.ts (8 errors) ====
     //===let
     l0:
     for (let x of []) {
@@ -240,8 +236,6 @@ tests/cases/compiler/capturedLetConstInLoop7_ES6.ts(359,19): error TS2365: Opera
     
     l1_c:
     for (const x = 0; x < 1;) {
-                      ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
         (function() { return x});
         (() => x);
         if (x == 1) {
@@ -306,8 +300,6 @@ tests/cases/compiler/capturedLetConstInLoop7_ES6.ts(359,19): error TS2365: Opera
     
     l4_c:
     for (const y = 0; y < 1;) {
-                      ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
         const x = 1;
         (function() { return x});
         (() => x);
@@ -327,8 +319,6 @@ tests/cases/compiler/capturedLetConstInLoop7_ES6.ts(359,19): error TS2365: Opera
     
     l5_c:
     for (const x = 0, y = 1; x < 1;) {
-                             ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
         (function() { return x + y});
         (() => x + y);
         if (x == 1) {
@@ -394,8 +384,6 @@ tests/cases/compiler/capturedLetConstInLoop7_ES6.ts(359,19): error TS2365: Opera
     
     l8_c:
     for (const y = 0; y < 1;) {
-                      ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
         const x = 1;
         (function() { return x + y});
         (() => x + y);
diff --git a/tests/baselines/reference/capturedLetConstInLoop8.errors.txt b/tests/baselines/reference/capturedLetConstInLoop8.errors.txt
index c3743feaf90..d54c79dfebb 100644
--- a/tests/baselines/reference/capturedLetConstInLoop8.errors.txt
+++ b/tests/baselines/reference/capturedLetConstInLoop8.errors.txt
@@ -1,6 +1,3 @@
-tests/cases/compiler/capturedLetConstInLoop8.ts(66,23): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop8.ts(68,27): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop8.ts(70,31): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
 tests/cases/compiler/capturedLetConstInLoop8.ts(73,21): error TS2365: Operator '==' cannot be applied to types '0' and '1'.
 tests/cases/compiler/capturedLetConstInLoop8.ts(76,21): error TS2365: Operator '==' cannot be applied to types '0' and '1'.
 tests/cases/compiler/capturedLetConstInLoop8.ts(79,21): error TS2365: Operator '==' cannot be applied to types '0' and '1'.
@@ -19,7 +16,7 @@ tests/cases/compiler/capturedLetConstInLoop8.ts(117,17): error TS2365: Operator
 tests/cases/compiler/capturedLetConstInLoop8.ts(120,17): error TS2365: Operator '==' cannot be applied to types '0' and '3'.
 
 
-==== tests/cases/compiler/capturedLetConstInLoop8.ts (19 errors) ====
+==== tests/cases/compiler/capturedLetConstInLoop8.ts (16 errors) ====
     function foo() {
         l0:
         for (let z = 0; z < 1; ++z) {
@@ -86,16 +83,10 @@ tests/cases/compiler/capturedLetConstInLoop8.ts(120,17): error TS2365: Operator
     function foo_c() {
         l0:
         for (const z = 0; z < 1;) {
-                          ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
             l1:
             for (const x = 0; x < 1;) {
-                              ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
                 ll1:
                 for (const y = 0; y < 1;) {
-                                  ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
                     (function() { return x + y });
                     (() => x + y);
                     if (y == 1) {
diff --git a/tests/baselines/reference/capturedLetConstInLoop8_ES6.errors.txt b/tests/baselines/reference/capturedLetConstInLoop8_ES6.errors.txt
index da6947884fa..b8e856b66bf 100644
--- a/tests/baselines/reference/capturedLetConstInLoop8_ES6.errors.txt
+++ b/tests/baselines/reference/capturedLetConstInLoop8_ES6.errors.txt
@@ -1,6 +1,3 @@
-tests/cases/compiler/capturedLetConstInLoop8_ES6.ts(66,23): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop8_ES6.ts(68,27): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
-tests/cases/compiler/capturedLetConstInLoop8_ES6.ts(70,31): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
 tests/cases/compiler/capturedLetConstInLoop8_ES6.ts(73,21): error TS2365: Operator '==' cannot be applied to types '0' and '1'.
 tests/cases/compiler/capturedLetConstInLoop8_ES6.ts(76,21): error TS2365: Operator '==' cannot be applied to types '0' and '1'.
 tests/cases/compiler/capturedLetConstInLoop8_ES6.ts(79,21): error TS2365: Operator '==' cannot be applied to types '0' and '1'.
@@ -19,7 +16,7 @@ tests/cases/compiler/capturedLetConstInLoop8_ES6.ts(117,17): error TS2365: Opera
 tests/cases/compiler/capturedLetConstInLoop8_ES6.ts(120,17): error TS2365: Operator '==' cannot be applied to types '0' and '3'.
 
 
-==== tests/cases/compiler/capturedLetConstInLoop8_ES6.ts (19 errors) ====
+==== tests/cases/compiler/capturedLetConstInLoop8_ES6.ts (16 errors) ====
     function foo() {
         l0:
         for (let z = 0; z < 1; ++z) {
@@ -86,16 +83,10 @@ tests/cases/compiler/capturedLetConstInLoop8_ES6.ts(120,17): error TS2365: Opera
     function foo_c() {
         l0:
         for (const z = 0; z < 1;) {
-                          ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
             l1:
             for (const x = 0; x < 1;) {
-                              ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
                 ll1:
                 for (const y = 0; y < 1;) {
-                                  ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
                     (function() { return x + y });
                     (() => x + y);
                     if (y == 1) {
diff --git a/tests/baselines/reference/comparisonOperatorWithNumericLiteral.errors.txt b/tests/baselines/reference/comparisonOperatorWithNumericLiteral.errors.txt
deleted file mode 100644
index d863ca29090..00000000000
--- a/tests/baselines/reference/comparisonOperatorWithNumericLiteral.errors.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNumericLiteral.ts(5,1): error TS2365: Operator '>' cannot be applied to types 'BrandedNum' and '0'.
-tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNumericLiteral.ts(10,1): error TS2365: Operator '<' cannot be applied to types 'BrandedNum' and '0'.
-tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNumericLiteral.ts(15,1): error TS2365: Operator '>=' cannot be applied to types 'BrandedNum' and '0'.
-tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNumericLiteral.ts(20,1): error TS2365: Operator '<=' cannot be applied to types 'BrandedNum' and '0'.
-
-
-==== tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNumericLiteral.ts (4 errors) ====
-    type BrandedNum = number & { __numberBrand: any };
-    var x : BrandedNum;
-    
-    // operator >
-    x > 0;
-    ~~~~~
-!!! error TS2365: Operator '>' cannot be applied to types 'BrandedNum' and '0'.
-    x > <number>0;
-    x > <BrandedNum>0;
-    
-    // operator <
-    x < 0;
-    ~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types 'BrandedNum' and '0'.
-    x < <number>0;
-    x < <BrandedNum>0;
-    
-    // operator >=
-    x >= 0;
-    ~~~~~~
-!!! error TS2365: Operator '>=' cannot be applied to types 'BrandedNum' and '0'.
-    x >= <number>0;
-    x >= <BrandedNum>0;
-    
-    // operator <=
-    x <= 0;
-    ~~~~~~
-!!! error TS2365: Operator '<=' cannot be applied to types 'BrandedNum' and '0'.
-    x <= <number>0;
-    x <= <BrandedNum>0;
-    
-    // operator ==
-    x == 0;
-    x == <number>0;
-    x == <BrandedNum>0;
-    
-    // operator !=
-    x != 0;
-    x != <number>0;
-    x != <BrandedNum>0;
-    
-    // operator ===
-    x === 0;
-    x === <number>0;
-    x === <BrandedNum>0;
-    
-    // operator !==
-    x !== 0;
-    x !== <number>0;
-    x !== <BrandedNum>0;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/comparisonOperatorWithNumericLiteral.symbols b/tests/baselines/reference/comparisonOperatorWithNumericLiteral.symbols
new file mode 100644
index 00000000000..0511f88b2a8
--- /dev/null
+++ b/tests/baselines/reference/comparisonOperatorWithNumericLiteral.symbols
@@ -0,0 +1,97 @@
+=== tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNumericLiteral.ts ===
+type BrandedNum = number & { __numberBrand: any };
+>BrandedNum : Symbol(BrandedNum, Decl(comparisonOperatorWithNumericLiteral.ts, 0, 0))
+>__numberBrand : Symbol(__numberBrand, Decl(comparisonOperatorWithNumericLiteral.ts, 0, 28))
+
+var x : BrandedNum;
+>x : Symbol(x, Decl(comparisonOperatorWithNumericLiteral.ts, 1, 3))
+>BrandedNum : Symbol(BrandedNum, Decl(comparisonOperatorWithNumericLiteral.ts, 0, 0))
+
+// operator >
+x > 0;
+>x : Symbol(x, Decl(comparisonOperatorWithNumericLiteral.ts, 1, 3))
+
+x > <number>0;
+>x : Symbol(x, Decl(comparisonOperatorWithNumericLiteral.ts, 1, 3))
+
+x > <BrandedNum>0;
+>x : Symbol(x, Decl(comparisonOperatorWithNumericLiteral.ts, 1, 3))
+>BrandedNum : Symbol(BrandedNum, Decl(comparisonOperatorWithNumericLiteral.ts, 0, 0))
+
+// operator <
+x < 0;
+>x : Symbol(x, Decl(comparisonOperatorWithNumericLiteral.ts, 1, 3))
+
+x < <number>0;
+>x : Symbol(x, Decl(comparisonOperatorWithNumericLiteral.ts, 1, 3))
+
+x < <BrandedNum>0;
+>x : Symbol(x, Decl(comparisonOperatorWithNumericLiteral.ts, 1, 3))
+>BrandedNum : Symbol(BrandedNum, Decl(comparisonOperatorWithNumericLiteral.ts, 0, 0))
+
+// operator >=
+x >= 0;
+>x : Symbol(x, Decl(comparisonOperatorWithNumericLiteral.ts, 1, 3))
+
+x >= <number>0;
+>x : Symbol(x, Decl(comparisonOperatorWithNumericLiteral.ts, 1, 3))
+
+x >= <BrandedNum>0;
+>x : Symbol(x, Decl(comparisonOperatorWithNumericLiteral.ts, 1, 3))
+>BrandedNum : Symbol(BrandedNum, Decl(comparisonOperatorWithNumericLiteral.ts, 0, 0))
+
+// operator <=
+x <= 0;
+>x : Symbol(x, Decl(comparisonOperatorWithNumericLiteral.ts, 1, 3))
+
+x <= <number>0;
+>x : Symbol(x, Decl(comparisonOperatorWithNumericLiteral.ts, 1, 3))
+
+x <= <BrandedNum>0;
+>x : Symbol(x, Decl(comparisonOperatorWithNumericLiteral.ts, 1, 3))
+>BrandedNum : Symbol(BrandedNum, Decl(comparisonOperatorWithNumericLiteral.ts, 0, 0))
+
+// operator ==
+x == 0;
+>x : Symbol(x, Decl(comparisonOperatorWithNumericLiteral.ts, 1, 3))
+
+x == <number>0;
+>x : Symbol(x, Decl(comparisonOperatorWithNumericLiteral.ts, 1, 3))
+
+x == <BrandedNum>0;
+>x : Symbol(x, Decl(comparisonOperatorWithNumericLiteral.ts, 1, 3))
+>BrandedNum : Symbol(BrandedNum, Decl(comparisonOperatorWithNumericLiteral.ts, 0, 0))
+
+// operator !=
+x != 0;
+>x : Symbol(x, Decl(comparisonOperatorWithNumericLiteral.ts, 1, 3))
+
+x != <number>0;
+>x : Symbol(x, Decl(comparisonOperatorWithNumericLiteral.ts, 1, 3))
+
+x != <BrandedNum>0;
+>x : Symbol(x, Decl(comparisonOperatorWithNumericLiteral.ts, 1, 3))
+>BrandedNum : Symbol(BrandedNum, Decl(comparisonOperatorWithNumericLiteral.ts, 0, 0))
+
+// operator ===
+x === 0;
+>x : Symbol(x, Decl(comparisonOperatorWithNumericLiteral.ts, 1, 3))
+
+x === <number>0;
+>x : Symbol(x, Decl(comparisonOperatorWithNumericLiteral.ts, 1, 3))
+
+x === <BrandedNum>0;
+>x : Symbol(x, Decl(comparisonOperatorWithNumericLiteral.ts, 1, 3))
+>BrandedNum : Symbol(BrandedNum, Decl(comparisonOperatorWithNumericLiteral.ts, 0, 0))
+
+// operator !==
+x !== 0;
+>x : Symbol(x, Decl(comparisonOperatorWithNumericLiteral.ts, 1, 3))
+
+x !== <number>0;
+>x : Symbol(x, Decl(comparisonOperatorWithNumericLiteral.ts, 1, 3))
+
+x !== <BrandedNum>0;
+>x : Symbol(x, Decl(comparisonOperatorWithNumericLiteral.ts, 1, 3))
+>BrandedNum : Symbol(BrandedNum, Decl(comparisonOperatorWithNumericLiteral.ts, 0, 0))
+
diff --git a/tests/baselines/reference/comparisonOperatorWithNumericLiteral.types b/tests/baselines/reference/comparisonOperatorWithNumericLiteral.types
new file mode 100644
index 00000000000..31f7aadfec2
--- /dev/null
+++ b/tests/baselines/reference/comparisonOperatorWithNumericLiteral.types
@@ -0,0 +1,161 @@
+=== tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNumericLiteral.ts ===
+type BrandedNum = number & { __numberBrand: any };
+>BrandedNum : BrandedNum
+>__numberBrand : any
+
+var x : BrandedNum;
+>x : BrandedNum
+>BrandedNum : BrandedNum
+
+// operator >
+x > 0;
+>x > 0 : boolean
+>x : BrandedNum
+>0 : 0
+
+x > <number>0;
+>x > <number>0 : boolean
+>x : BrandedNum
+><number>0 : number
+>0 : 0
+
+x > <BrandedNum>0;
+>x > <BrandedNum>0 : boolean
+>x : BrandedNum
+><BrandedNum>0 : BrandedNum
+>BrandedNum : BrandedNum
+>0 : 0
+
+// operator <
+x < 0;
+>x < 0 : boolean
+>x : BrandedNum
+>0 : 0
+
+x < <number>0;
+>x < <number>0 : boolean
+>x : BrandedNum
+><number>0 : number
+>0 : 0
+
+x < <BrandedNum>0;
+>x < <BrandedNum>0 : boolean
+>x : BrandedNum
+><BrandedNum>0 : BrandedNum
+>BrandedNum : BrandedNum
+>0 : 0
+
+// operator >=
+x >= 0;
+>x >= 0 : boolean
+>x : BrandedNum
+>0 : 0
+
+x >= <number>0;
+>x >= <number>0 : boolean
+>x : BrandedNum
+><number>0 : number
+>0 : 0
+
+x >= <BrandedNum>0;
+>x >= <BrandedNum>0 : boolean
+>x : BrandedNum
+><BrandedNum>0 : BrandedNum
+>BrandedNum : BrandedNum
+>0 : 0
+
+// operator <=
+x <= 0;
+>x <= 0 : boolean
+>x : BrandedNum
+>0 : 0
+
+x <= <number>0;
+>x <= <number>0 : boolean
+>x : BrandedNum
+><number>0 : number
+>0 : 0
+
+x <= <BrandedNum>0;
+>x <= <BrandedNum>0 : boolean
+>x : BrandedNum
+><BrandedNum>0 : BrandedNum
+>BrandedNum : BrandedNum
+>0 : 0
+
+// operator ==
+x == 0;
+>x == 0 : boolean
+>x : BrandedNum
+>0 : 0
+
+x == <number>0;
+>x == <number>0 : boolean
+>x : BrandedNum
+><number>0 : number
+>0 : 0
+
+x == <BrandedNum>0;
+>x == <BrandedNum>0 : boolean
+>x : BrandedNum
+><BrandedNum>0 : BrandedNum
+>BrandedNum : BrandedNum
+>0 : 0
+
+// operator !=
+x != 0;
+>x != 0 : boolean
+>x : BrandedNum
+>0 : 0
+
+x != <number>0;
+>x != <number>0 : boolean
+>x : BrandedNum
+><number>0 : number
+>0 : 0
+
+x != <BrandedNum>0;
+>x != <BrandedNum>0 : boolean
+>x : BrandedNum
+><BrandedNum>0 : BrandedNum
+>BrandedNum : BrandedNum
+>0 : 0
+
+// operator ===
+x === 0;
+>x === 0 : boolean
+>x : BrandedNum
+>0 : 0
+
+x === <number>0;
+>x === <number>0 : boolean
+>x : BrandedNum
+><number>0 : number
+>0 : 0
+
+x === <BrandedNum>0;
+>x === <BrandedNum>0 : boolean
+>x : BrandedNum
+><BrandedNum>0 : BrandedNum
+>BrandedNum : BrandedNum
+>0 : 0
+
+// operator !==
+x !== 0;
+>x !== 0 : boolean
+>x : BrandedNum
+>0 : 0
+
+x !== <number>0;
+>x !== <number>0 : boolean
+>x : BrandedNum
+><number>0 : number
+>0 : 0
+
+x !== <BrandedNum>0;
+>x !== <BrandedNum>0 : boolean
+>x : BrandedNum
+><BrandedNum>0 : BrandedNum
+>BrandedNum : BrandedNum
+>0 : 0
+
diff --git a/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.errors.txt b/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.errors.txt
deleted file mode 100644
index 25153c1ba15..00000000000
--- a/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.errors.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditionIsBooleanType.ts(35,1): error TS2365: Operator '>' cannot be applied to types '2' and '1'.
-tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditionIsBooleanType.ts(58,23): error TS2365: Operator '>' cannot be applied to types '2' and '1'.
-
-
-==== tests/cases/conformance/expressions/conditonalOperator/conditionalOperatorConditionIsBooleanType.ts (2 errors) ====
-    //Cond ? Expr1 : Expr2,  Cond is of boolean type, Expr1 and Expr2 have the same type
-    var condBoolean: boolean;
-    
-    var exprAny1: any;
-    var exprBoolean1: boolean;
-    var exprNumber1: number;
-    var exprString1: string;
-    var exprIsObject1: Object;
-    
-    var exprAny2: any;
-    var exprBoolean2: boolean;
-    var exprNumber2: number;
-    var exprString2: string;
-    var exprIsObject2: Object;
-    
-    //Cond is a boolean type variable
-    condBoolean ? exprAny1 : exprAny2;
-    condBoolean ? exprBoolean1 : exprBoolean2;
-    condBoolean ? exprNumber1 : exprNumber2;
-    condBoolean ? exprString1 : exprString2;
-    condBoolean ? exprIsObject1 : exprIsObject2;
-    condBoolean ? exprString1 : exprBoolean1; // union
-    
-    //Cond is a boolean type literal
-    true ? exprAny1 : exprAny2;
-    false ? exprBoolean1 : exprBoolean2;
-    true ? exprNumber1 : exprNumber2;
-    false ? exprString1 : exprString2;
-    true ? exprIsObject1 : exprIsObject2;
-    true ? exprString1 : exprBoolean1; // union
-    
-    //Cond is a boolean type expression
-    !true ? exprAny1 : exprAny2;
-    typeof "123" == "string" ? exprBoolean1 : exprBoolean2;
-    2 > 1 ? exprNumber1 : exprNumber2;
-    ~~~~~
-!!! error TS2365: Operator '>' cannot be applied to types '2' and '1'.
-    null === undefined ? exprString1 : exprString2;
-    true || false ? exprIsObject1 : exprIsObject2;
-    null === undefined ? exprString1 : exprBoolean1; // union
-    
-    //Results shoud be same as Expr1 and Expr2
-    var resultIsAny1 = condBoolean ? exprAny1 : exprAny2;
-    var resultIsBoolean1 = condBoolean ? exprBoolean1 : exprBoolean2;
-    var resultIsNumber1 = condBoolean ? exprNumber1 : exprNumber2;
-    var resultIsString1 = condBoolean ? exprString1 : exprString2;
-    var resultIsObject1 = condBoolean ? exprIsObject1 : exprIsObject2;
-    var resultIsStringOrBoolean1 = condBoolean ? exprString1 : exprBoolean1; // union
-    
-    var resultIsAny2 = true ? exprAny1 : exprAny2;
-    var resultIsBoolean2 = false ? exprBoolean1 : exprBoolean2;
-    var resultIsNumber2 = true ? exprNumber1 : exprNumber2;
-    var resultIsString2 = false ? exprString1 : exprString2;
-    var resultIsObject2 = true ? exprIsObject1 : exprIsObject2;
-    var resultIsStringOrBoolean2 = true ? exprString1 : exprBoolean1; // union
-    var resultIsStringOrBoolean3 = false ? exprString1 : exprBoolean1; // union
-    
-    var resultIsAny3 = !true ? exprAny1 : exprAny2;
-    var resultIsBoolean3 = typeof "123" == "string" ? exprBoolean1 : exprBoolean2;
-    var resultIsNumber3 = 2 > 1 ? exprNumber1 : exprNumber2;
-                          ~~~~~
-!!! error TS2365: Operator '>' cannot be applied to types '2' and '1'.
-    var resultIsString3 = null === undefined ? exprString1 : exprString2;
-    var resultIsObject3 = true || false ? exprIsObject1 : exprIsObject2;
-    var resultIsStringOrBoolean4 = typeof "123" === "string" ? exprString1 : exprBoolean1; // union
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.types b/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.types
index 7733b80f69b..f19769b1c58 100644
--- a/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.types
+++ b/tests/baselines/reference/conditionalOperatorConditionIsBooleanType.types
@@ -75,37 +75,37 @@ condBoolean ? exprString1 : exprBoolean1; // union
 //Cond is a boolean type literal
 true ? exprAny1 : exprAny2;
 >true ? exprAny1 : exprAny2 : any
->true : boolean
+>true : true
 >exprAny1 : any
 >exprAny2 : any
 
 false ? exprBoolean1 : exprBoolean2;
 >false ? exprBoolean1 : exprBoolean2 : boolean
->false : boolean
+>false : false
 >exprBoolean1 : boolean
 >exprBoolean2 : boolean
 
 true ? exprNumber1 : exprNumber2;
 >true ? exprNumber1 : exprNumber2 : number
->true : boolean
+>true : true
 >exprNumber1 : number
 >exprNumber2 : number
 
 false ? exprString1 : exprString2;
 >false ? exprString1 : exprString2 : string
->false : boolean
+>false : false
 >exprString1 : string
 >exprString2 : string
 
 true ? exprIsObject1 : exprIsObject2;
 >true ? exprIsObject1 : exprIsObject2 : Object
->true : boolean
+>true : true
 >exprIsObject1 : Object
 >exprIsObject2 : Object
 
 true ? exprString1 : exprBoolean1; // union
 >true ? exprString1 : exprBoolean1 : string | boolean
->true : boolean
+>true : true
 >exprString1 : string
 >exprBoolean1 : boolean
 
@@ -113,7 +113,7 @@ true ? exprString1 : exprBoolean1; // union
 !true ? exprAny1 : exprAny2;
 >!true ? exprAny1 : exprAny2 : any
 >!true : boolean
->true : boolean
+>true : true
 >exprAny1 : any
 >exprAny2 : any
 
@@ -121,7 +121,7 @@ typeof "123" == "string" ? exprBoolean1 : exprBoolean2;
 >typeof "123" == "string" ? exprBoolean1 : exprBoolean2 : boolean
 >typeof "123" == "string" : boolean
 >typeof "123" : string
->"123" : string
+>"123" : "123"
 >"string" : "string"
 >exprBoolean1 : boolean
 >exprBoolean2 : boolean
@@ -129,8 +129,8 @@ typeof "123" == "string" ? exprBoolean1 : exprBoolean2;
 2 > 1 ? exprNumber1 : exprNumber2;
 >2 > 1 ? exprNumber1 : exprNumber2 : number
 >2 > 1 : boolean
->2 : number
->1 : number
+>2 : 2
+>1 : 1
 >exprNumber1 : number
 >exprNumber2 : number
 
@@ -145,7 +145,7 @@ null === undefined ? exprString1 : exprString2;
 true || false ? exprIsObject1 : exprIsObject2;
 >true || false ? exprIsObject1 : exprIsObject2 : Object
 >true || false : boolean
->true : boolean
+>true : true
 >false : false
 >exprIsObject1 : Object
 >exprIsObject2 : Object
@@ -204,49 +204,49 @@ var resultIsStringOrBoolean1 = condBoolean ? exprString1 : exprBoolean1; // unio
 var resultIsAny2 = true ? exprAny1 : exprAny2;
 >resultIsAny2 : any
 >true ? exprAny1 : exprAny2 : any
->true : boolean
+>true : true
 >exprAny1 : any
 >exprAny2 : any
 
 var resultIsBoolean2 = false ? exprBoolean1 : exprBoolean2;
 >resultIsBoolean2 : boolean
 >false ? exprBoolean1 : exprBoolean2 : boolean
->false : boolean
+>false : false
 >exprBoolean1 : boolean
 >exprBoolean2 : boolean
 
 var resultIsNumber2 = true ? exprNumber1 : exprNumber2;
 >resultIsNumber2 : number
 >true ? exprNumber1 : exprNumber2 : number
->true : boolean
+>true : true
 >exprNumber1 : number
 >exprNumber2 : number
 
 var resultIsString2 = false ? exprString1 : exprString2;
 >resultIsString2 : string
 >false ? exprString1 : exprString2 : string
->false : boolean
+>false : false
 >exprString1 : string
 >exprString2 : string
 
 var resultIsObject2 = true ? exprIsObject1 : exprIsObject2;
 >resultIsObject2 : Object
 >true ? exprIsObject1 : exprIsObject2 : Object
->true : boolean
+>true : true
 >exprIsObject1 : Object
 >exprIsObject2 : Object
 
 var resultIsStringOrBoolean2 = true ? exprString1 : exprBoolean1; // union
 >resultIsStringOrBoolean2 : string | boolean
 >true ? exprString1 : exprBoolean1 : string | boolean
->true : boolean
+>true : true
 >exprString1 : string
 >exprBoolean1 : boolean
 
 var resultIsStringOrBoolean3 = false ? exprString1 : exprBoolean1; // union
 >resultIsStringOrBoolean3 : string | boolean
 >false ? exprString1 : exprBoolean1 : string | boolean
->false : boolean
+>false : false
 >exprString1 : string
 >exprBoolean1 : boolean
 
@@ -254,7 +254,7 @@ var resultIsAny3 = !true ? exprAny1 : exprAny2;
 >resultIsAny3 : any
 >!true ? exprAny1 : exprAny2 : any
 >!true : boolean
->true : boolean
+>true : true
 >exprAny1 : any
 >exprAny2 : any
 
@@ -263,7 +263,7 @@ var resultIsBoolean3 = typeof "123" == "string" ? exprBoolean1 : exprBoolean2;
 >typeof "123" == "string" ? exprBoolean1 : exprBoolean2 : boolean
 >typeof "123" == "string" : boolean
 >typeof "123" : string
->"123" : string
+>"123" : "123"
 >"string" : "string"
 >exprBoolean1 : boolean
 >exprBoolean2 : boolean
@@ -272,8 +272,8 @@ var resultIsNumber3 = 2 > 1 ? exprNumber1 : exprNumber2;
 >resultIsNumber3 : number
 >2 > 1 ? exprNumber1 : exprNumber2 : number
 >2 > 1 : boolean
->2 : number
->1 : number
+>2 : 2
+>1 : 1
 >exprNumber1 : number
 >exprNumber2 : number
 
@@ -290,7 +290,7 @@ var resultIsObject3 = true || false ? exprIsObject1 : exprIsObject2;
 >resultIsObject3 : Object
 >true || false ? exprIsObject1 : exprIsObject2 : Object
 >true || false : boolean
->true : boolean
+>true : true
 >false : false
 >exprIsObject1 : Object
 >exprIsObject2 : Object
@@ -300,7 +300,7 @@ var resultIsStringOrBoolean4 = typeof "123" === "string" ? exprString1 : exprBoo
 >typeof "123" === "string" ? exprString1 : exprBoolean1 : string | boolean
 >typeof "123" === "string" : boolean
 >typeof "123" : string
->"123" : string
+>"123" : "123"
 >"string" : "string"
 >exprString1 : string
 >exprBoolean1 : boolean
diff --git a/tests/baselines/reference/constDeclarations-errors.errors.txt b/tests/baselines/reference/constDeclarations-errors.errors.txt
index ace4cd7b25f..83031e0aa79 100644
--- a/tests/baselines/reference/constDeclarations-errors.errors.txt
+++ b/tests/baselines/reference/constDeclarations-errors.errors.txt
@@ -4,14 +4,12 @@ tests/cases/compiler/constDeclarations-errors.ts(5,7): error TS1155: 'const' dec
 tests/cases/compiler/constDeclarations-errors.ts(5,11): error TS1155: 'const' declarations must be initialized
 tests/cases/compiler/constDeclarations-errors.ts(5,15): error TS1155: 'const' declarations must be initialized
 tests/cases/compiler/constDeclarations-errors.ts(5,27): error TS1155: 'const' declarations must be initialized
-tests/cases/compiler/constDeclarations-errors.ts(10,19): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
 tests/cases/compiler/constDeclarations-errors.ts(10,27): error TS2540: Cannot assign to 'c8' because it is a constant or a read-only property.
 tests/cases/compiler/constDeclarations-errors.ts(13,11): error TS1155: 'const' declarations must be initialized
 tests/cases/compiler/constDeclarations-errors.ts(16,20): error TS1155: 'const' declarations must be initialized
-tests/cases/compiler/constDeclarations-errors.ts(16,25): error TS2365: Operator '<' cannot be applied to types '0' and '1'.
 
 
-==== tests/cases/compiler/constDeclarations-errors.ts (11 errors) ====
+==== tests/cases/compiler/constDeclarations-errors.ts (9 errors) ====
     
     // error, missing intialicer
     const c1;
@@ -34,8 +32,6 @@ tests/cases/compiler/constDeclarations-errors.ts(16,25): error TS2365: Operator
     
     // error, assigning to a const
     for(const c8 = 0; c8 < 1; c8++) { }
-                      ~~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
                               ~~
 !!! error TS2540: Cannot assign to 'c8' because it is a constant or a read-only property.
     
@@ -47,6 +43,4 @@ tests/cases/compiler/constDeclarations-errors.ts(16,25): error TS2365: Operator
     // error, can not be unintalized
     for(const c10 = 0, c11; c10 < 1;) { }
                        ~~~
-!!! error TS1155: 'const' declarations must be initialized
-                            ~~~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '1'.
\ No newline at end of file
+!!! error TS1155: 'const' declarations must be initialized
\ No newline at end of file
diff --git a/tests/baselines/reference/constDeclarations-scopes2.errors.txt b/tests/baselines/reference/constDeclarations-scopes2.errors.txt
deleted file mode 100644
index b998f3a9980..00000000000
--- a/tests/baselines/reference/constDeclarations-scopes2.errors.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-tests/cases/compiler/constDeclarations-scopes2.ts(9,19): error TS2365: Operator '<' cannot be applied to types '0' and '10'.
-
-
-==== tests/cases/compiler/constDeclarations-scopes2.ts (1 errors) ====
-    
-    // global
-    const c = "string";
-    
-    var n: number;
-    var b: boolean;
-    
-    // for scope
-    for (const c = 0; c < 10; n = c ) {
-                      ~~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '10'.
-        // for block
-        const c = false;
-        b = c;
-    }
-    
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/constDeclarations-scopes2.types b/tests/baselines/reference/constDeclarations-scopes2.types
index a6bbdee7612..9834c6bb16e 100644
--- a/tests/baselines/reference/constDeclarations-scopes2.types
+++ b/tests/baselines/reference/constDeclarations-scopes2.types
@@ -2,8 +2,8 @@
 
 // global
 const c = "string";
->c : string
->"string" : string
+>c : "string"
+>"string" : "string"
 
 var n: number;
 >n : number
@@ -13,24 +13,24 @@ var b: boolean;
 
 // for scope
 for (const c = 0; c < 10; n = c ) {
->c : number
->0 : number
+>c : 0
+>0 : 0
 >c < 10 : boolean
->c : number
->10 : number
->n = c : number
+>c : 0
+>10 : 10
+>n = c : 0
 >n : number
->c : number
+>c : 0
 
     // for block
     const c = false;
->c : boolean
->false : boolean
+>c : false
+>false : false
 
     b = c;
->b = c : boolean
+>b = c : false
 >b : boolean
->c : boolean
+>c : false
 }
 
 
diff --git a/tests/baselines/reference/constDeclarations.errors.txt b/tests/baselines/reference/constDeclarations.errors.txt
deleted file mode 100644
index 1642610eec2..00000000000
--- a/tests/baselines/reference/constDeclarations.errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-tests/cases/compiler/constDeclarations.ts(8,19): error TS2365: Operator '<' cannot be applied to types '0' and '9'.
-
-
-==== tests/cases/compiler/constDeclarations.ts (1 errors) ====
-    
-    // No error
-    const c1 = false;
-    const c2: number = 23;
-    const c3 = 0, c4 :string = "", c5 = null;
-    
-    
-    for(const c4 = 0; c4 < 9; ) { break; }
-                      ~~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '0' and '9'.
-    
-    
-    for(const c5 = 0, c6 = 0; c5 < c6; ) { break; }
\ No newline at end of file
diff --git a/tests/baselines/reference/constDeclarations.types b/tests/baselines/reference/constDeclarations.types
index efdc534ef1c..0fa7893529f 100644
--- a/tests/baselines/reference/constDeclarations.types
+++ b/tests/baselines/reference/constDeclarations.types
@@ -2,36 +2,36 @@
 
 // No error
 const c1 = false;
->c1 : boolean
->false : boolean
+>c1 : false
+>false : false
 
 const c2: number = 23;
 >c2 : number
->23 : number
+>23 : 23
 
 const c3 = 0, c4 :string = "", c5 = null;
->c3 : number
->0 : number
+>c3 : 0
+>0 : 0
 >c4 : string
->"" : string
+>"" : ""
 >c5 : any
 >null : null
 
 
 for(const c4 = 0; c4 < 9; ) { break; }
->c4 : number
->0 : number
+>c4 : 0
+>0 : 0
 >c4 < 9 : boolean
->c4 : number
->9 : number
+>c4 : 0
+>9 : 9
 
 
 for(const c5 = 0, c6 = 0; c5 < c6; ) { break; }
->c5 : number
->0 : number
->c6 : number
->0 : number
+>c5 : 0
+>0 : 0
+>c6 : 0
+>0 : 0
 >c5 < c6 : boolean
->c5 : number
->c6 : number
+>c5 : 0
+>c6 : 0
 
diff --git a/tests/baselines/reference/duplicateLocalVariable1.errors.txt b/tests/baselines/reference/duplicateLocalVariable1.errors.txt
index 87bcc71cdfc..b264574ea09 100644
--- a/tests/baselines/reference/duplicateLocalVariable1.errors.txt
+++ b/tests/baselines/reference/duplicateLocalVariable1.errors.txt
@@ -2,7 +2,7 @@ tests/cases/compiler/duplicateLocalVariable1.ts(2,4): error TS1005: ';' expected
 tests/cases/compiler/duplicateLocalVariable1.ts(2,11): error TS1146: Declaration expected.
 tests/cases/compiler/duplicateLocalVariable1.ts(2,13): error TS2304: Cannot find name 'commonjs'.
 tests/cases/compiler/duplicateLocalVariable1.ts(187,22): error TS2403: Subsequent variable declarations must have the same type.  Variable 'i' must be of type 'string', but here has type 'number'.
-tests/cases/compiler/duplicateLocalVariable1.ts(187,29): error TS2365: Operator '<' cannot be applied to types 'string' and '14'.
+tests/cases/compiler/duplicateLocalVariable1.ts(187,29): error TS2365: Operator '<' cannot be applied to types 'string' and 'number'.
 tests/cases/compiler/duplicateLocalVariable1.ts(187,37): error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type.
 
 
@@ -203,7 +203,7 @@ tests/cases/compiler/duplicateLocalVariable1.ts(187,37): error TS2356: An arithm
                          ~
 !!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'i' must be of type 'string', but here has type 'number'.
                                 ~~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types 'string' and '14'.
+!!! error TS2365: Operator '<' cannot be applied to types 'string' and 'number'.
                                         ~
 !!! error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type.
                     bytes.push(fb.readByte());
diff --git a/tests/baselines/reference/duplicateLocalVariable2.errors.txt b/tests/baselines/reference/duplicateLocalVariable2.errors.txt
index 466e145d28d..5e89cc422cc 100644
--- a/tests/baselines/reference/duplicateLocalVariable2.errors.txt
+++ b/tests/baselines/reference/duplicateLocalVariable2.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/duplicateLocalVariable2.ts(27,22): error TS2403: Subsequent variable declarations must have the same type.  Variable 'i' must be of type 'string', but here has type 'number'.
-tests/cases/compiler/duplicateLocalVariable2.ts(27,29): error TS2365: Operator '<' cannot be applied to types 'string' and '14'.
+tests/cases/compiler/duplicateLocalVariable2.ts(27,29): error TS2365: Operator '<' cannot be applied to types 'string' and 'number'.
 tests/cases/compiler/duplicateLocalVariable2.ts(27,37): error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type.
 
 
@@ -34,7 +34,7 @@ tests/cases/compiler/duplicateLocalVariable2.ts(27,37): error TS2356: An arithme
                          ~
 !!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'i' must be of type 'string', but here has type 'number'.
                                 ~~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types 'string' and '14'.
+!!! error TS2365: Operator '<' cannot be applied to types 'string' and 'number'.
                                         ~
 !!! error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type.
                     bytes.push(fb.readByte());
diff --git a/tests/baselines/reference/grammarAmbiguities1.errors.txt b/tests/baselines/reference/grammarAmbiguities1.errors.txt
index 8809c4aa334..12df5f3c1e0 100644
--- a/tests/baselines/reference/grammarAmbiguities1.errors.txt
+++ b/tests/baselines/reference/grammarAmbiguities1.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/grammarAmbiguities1.ts(8,1): error TS2346: Supplied parameters do not match any signature of call target.
 tests/cases/compiler/grammarAmbiguities1.ts(8,3): error TS2365: Operator '<' cannot be applied to types '<T, U>(x: any) => any' and 'typeof A'.
-tests/cases/compiler/grammarAmbiguities1.ts(8,10): error TS2365: Operator '>' cannot be applied to types 'typeof B' and '7'.
+tests/cases/compiler/grammarAmbiguities1.ts(8,10): error TS2365: Operator '>' cannot be applied to types 'typeof B' and 'number'.
 tests/cases/compiler/grammarAmbiguities1.ts(9,1): error TS2346: Supplied parameters do not match any signature of call target.
 tests/cases/compiler/grammarAmbiguities1.ts(9,3): error TS2365: Operator '<' cannot be applied to types '<T, U>(x: any) => any' and 'typeof A'.
 tests/cases/compiler/grammarAmbiguities1.ts(9,10): error TS2365: Operator '>' cannot be applied to types 'typeof B' and 'number'.
@@ -20,7 +20,7 @@ tests/cases/compiler/grammarAmbiguities1.ts(9,10): error TS2365: Operator '>' ca
       ~~~~~
 !!! error TS2365: Operator '<' cannot be applied to types '<T, U>(x: any) => any' and 'typeof A'.
              ~~~~~
-!!! error TS2365: Operator '>' cannot be applied to types 'typeof B' and '7'.
+!!! error TS2365: Operator '>' cannot be applied to types 'typeof B' and 'number'.
     f(g < A, B > +(7));
     ~~~~~~~~~~~~~~~~~~
 !!! error TS2346: Supplied parameters do not match any signature of call target.
diff --git a/tests/baselines/reference/parserGreaterThanTokenAmbiguity2.errors.txt b/tests/baselines/reference/parserGreaterThanTokenAmbiguity2.errors.txt
index ee2d3666682..30ede342a85 100644
--- a/tests/baselines/reference/parserGreaterThanTokenAmbiguity2.errors.txt
+++ b/tests/baselines/reference/parserGreaterThanTokenAmbiguity2.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/parser/ecmascript5/Generics/parserGreaterThanTokenAmbiguity2.ts(1,1): error TS2365: Operator '>' cannot be applied to types 'boolean' and '2'.
+tests/cases/conformance/parser/ecmascript5/Generics/parserGreaterThanTokenAmbiguity2.ts(1,1): error TS2365: Operator '>' cannot be applied to types 'boolean' and 'number'.
 tests/cases/conformance/parser/ecmascript5/Generics/parserGreaterThanTokenAmbiguity2.ts(1,5): error TS1109: Expression expected.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Generics/parserGreaterThanTokenAmbiguity2.ts (2 errors) ====
     1 > > 2;
     ~~~~~~~
-!!! error TS2365: Operator '>' cannot be applied to types 'boolean' and '2'.
+!!! error TS2365: Operator '>' cannot be applied to types 'boolean' and 'number'.
         ~
 !!! error TS1109: Expression expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserGreaterThanTokenAmbiguity3.errors.txt b/tests/baselines/reference/parserGreaterThanTokenAmbiguity3.errors.txt
index 1651009bf0d..baebfd81304 100644
--- a/tests/baselines/reference/parserGreaterThanTokenAmbiguity3.errors.txt
+++ b/tests/baselines/reference/parserGreaterThanTokenAmbiguity3.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/parser/ecmascript5/Generics/parserGreaterThanTokenAmbiguity3.ts(1,1): error TS2365: Operator '>' cannot be applied to types 'boolean' and '2'.
+tests/cases/conformance/parser/ecmascript5/Generics/parserGreaterThanTokenAmbiguity3.ts(1,1): error TS2365: Operator '>' cannot be applied to types 'boolean' and 'number'.
 tests/cases/conformance/parser/ecmascript5/Generics/parserGreaterThanTokenAmbiguity3.ts(1,8): error TS1109: Expression expected.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Generics/parserGreaterThanTokenAmbiguity3.ts (2 errors) ====
     1 >/**/> 2;
     ~~~~~~~~~~
-!!! error TS2365: Operator '>' cannot be applied to types 'boolean' and '2'.
+!!! error TS2365: Operator '>' cannot be applied to types 'boolean' and 'number'.
            ~
 !!! error TS1109: Expression expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserGreaterThanTokenAmbiguity4.errors.txt b/tests/baselines/reference/parserGreaterThanTokenAmbiguity4.errors.txt
index dff69b37612..924c9440d16 100644
--- a/tests/baselines/reference/parserGreaterThanTokenAmbiguity4.errors.txt
+++ b/tests/baselines/reference/parserGreaterThanTokenAmbiguity4.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/parser/ecmascript5/Generics/parserGreaterThanTokenAmbiguity4.ts(1,1): error TS2365: Operator '>' cannot be applied to types 'boolean' and '2'.
+tests/cases/conformance/parser/ecmascript5/Generics/parserGreaterThanTokenAmbiguity4.ts(1,1): error TS2365: Operator '>' cannot be applied to types 'boolean' and 'number'.
 tests/cases/conformance/parser/ecmascript5/Generics/parserGreaterThanTokenAmbiguity4.ts(2,1): error TS1109: Expression expected.
 
 
@@ -7,6 +7,6 @@ tests/cases/conformance/parser/ecmascript5/Generics/parserGreaterThanTokenAmbigu
     ~~~
     > 2;
     ~~~
-!!! error TS2365: Operator '>' cannot be applied to types 'boolean' and '2'.
+!!! error TS2365: Operator '>' cannot be applied to types 'boolean' and 'number'.
     ~
 !!! error TS1109: Expression expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.errors.txt b/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.errors.txt
index a51469baa93..a4944f7f163 100644
--- a/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.errors.txt
+++ b/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.errors.txt
@@ -7,12 +7,11 @@ tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperato
 tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(13,11): error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type.
 tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(14,9): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
 tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(15,9): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(16,9): error TS2365: Operator '<' cannot be applied to types '"ABC"' and '"XYZ"'.
 tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(17,9): error TS2365: Operator '===' cannot be applied to types '"ABC"' and '"XYZ"'.
 tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(18,9): error TS2365: Operator '!=' cannot be applied to types '"ABC"' and '"XYZ"'.
 
 
-==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts (12 errors) ====
+==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts (11 errors) ====
     
     let abc: "ABC" = "ABC";
     let xyz: "XYZ" = "XYZ";
@@ -47,8 +46,6 @@ tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperato
             ~~~~~~~~~~~~~~~~
 !!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
     let j = abc < xyz;
-            ~~~~~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '"ABC"' and '"XYZ"'.
     let k = abc === xyz;
             ~~~~~~~~~~~
 !!! error TS2365: Operator '===' cannot be applied to types '"ABC"' and '"XYZ"'.

From cd185f2cf6cc32969e6d033e40c4738efb5ba79d Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Thu, 10 Nov 2016 15:20:29 -0800
Subject: [PATCH 182/421] Add declaration emit support

---
 src/compiler/declarationEmitter.ts | 32 ++++++++++++++++++++++++++++--
 src/compiler/emitter.ts            | 29 +++++++++++++++++++++++++--
 2 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts
index 0bba375a2cb..7d2f61b6d6f 100644
--- a/src/compiler/declarationEmitter.ts
+++ b/src/compiler/declarationEmitter.ts
@@ -416,7 +416,9 @@ namespace ts {
                 case SyntaxKind.TypeOperator:
                     return emitTypeOperator(<TypeOperatorNode>type);
                 case SyntaxKind.IndexedAccessType:
-                    return emitPropertyAccessType(<IndexedAccessTypeNode>type);
+                    return emitIndexedAccessType(<IndexedAccessTypeNode>type);
+                case SyntaxKind.MappedType:
+                    return emitMappedType(<MappedTypeNode>type);
                 case SyntaxKind.FunctionType:
                 case SyntaxKind.ConstructorType:
                     return emitSignatureDeclarationWithJsDocComments(<FunctionOrConstructorTypeNode>type);
@@ -516,13 +518,39 @@ namespace ts {
                 emitType(type.type);
             }
 
-            function emitPropertyAccessType(node: IndexedAccessTypeNode) {
+            function emitIndexedAccessType(node: IndexedAccessTypeNode) {
                 emitType(node.objectType);
                 write("[");
                 emitType(node.indexType);
                 write("]");
             }
 
+            function emitMappedType(node: MappedTypeNode) {
+                const prevEnclosingDeclaration = enclosingDeclaration;
+                enclosingDeclaration = node;
+                write("{");
+                writeLine();
+                increaseIndent();
+                if (node.readonlyToken) {
+                    write("readonly ");
+                }
+                write("[");
+                writeEntityName(node.typeParameter.name);
+                write(" in ");
+                emitType(node.typeParameter.constraint);
+                write("]");
+                if (node.questionToken) {
+                    write("?");
+                }
+                write(": ");
+                emitType(node.type);
+                write(";");
+                writeLine();
+                decreaseIndent();
+                write("}");
+                enclosingDeclaration = prevEnclosingDeclaration;
+            }
+
             function emitTypeLiteral(type: TypeLiteralNode) {
                 write("{");
                 if (type.members.length) {
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index fa0d44a695f..a18146bdaa1 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -606,7 +606,9 @@ const _super = (function (geti, seti) {
                 case SyntaxKind.TypeOperator:
                     return emitTypeOperator(<TypeOperatorNode>node);
                 case SyntaxKind.IndexedAccessType:
-                    return emitPropertyAccessType(<IndexedAccessTypeNode>node);
+                    return emitIndexedAccessType(<IndexedAccessTypeNode>node);
+                case SyntaxKind.MappedType:
+                    return emitMappedType(<MappedTypeNode>node);
                 case SyntaxKind.LiteralType:
                     return emitLiteralType(<LiteralTypeNode>node);
 
@@ -1109,13 +1111,36 @@ const _super = (function (geti, seti) {
             emit(node.type);
         }
 
-        function emitPropertyAccessType(node: IndexedAccessTypeNode) {
+        function emitIndexedAccessType(node: IndexedAccessTypeNode) {
             emit(node.objectType);
             write("[");
             emit(node.indexType);
             write("]");
         }
 
+        function emitMappedType(node: MappedTypeNode) {
+            write("{");
+            writeLine();
+            increaseIndent();
+            if (node.readonlyToken) {
+                write("readonly ");
+            }
+            write("[");
+            emit(node.typeParameter.name);
+            write(" in ");
+            emit(node.typeParameter.constraint);
+            write("]");
+            if (node.questionToken) {
+                write("?");
+            }
+            write(": ");
+            emit(node.type);
+            write(";");
+            writeLine();
+            decreaseIndent();
+            write("}");
+        }
+
         function emitLiteralType(node: LiteralTypeNode) {
             emitExpression(node.literal);
         }

From ea309fe504368075781267261341d4cc83fdd917 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Thu, 10 Nov 2016 16:30:01 -0800
Subject: [PATCH 183/421] Update version (#12162)

---
 package.json            | 2 +-
 src/compiler/program.ts | 2 +-
 src/services/shims.ts   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 3bf9dbcff7b..ed77c9bd35f 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "http://typescriptlang.org/",
-    "version": "2.1.0",
+    "version": "2.2.0",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 7225b311933..6f0ac93f716 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -5,7 +5,7 @@
 namespace ts {
     /** The version of the TypeScript compiler release */
 
-    export const version = "2.1.0";
+    export const version = "2.2.0";
 
     const emptyArray: any[] = [];
 
diff --git a/src/services/shims.ts b/src/services/shims.ts
index b1fac14674c..f2984186790 100644
--- a/src/services/shims.ts
+++ b/src/services/shims.ts
@@ -1266,6 +1266,6 @@ namespace TypeScript.Services {
 // TODO: it should be moved into a namespace though.
 
 /* @internal */
-const toolsVersion = "2.1";
+const toolsVersion = "2.2";
 
 /* tslint:enable:no-unused-variable */

From 1c7ec6b8cef4290a7b7ea5d647907a067ae98ec5 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Fri, 11 Nov 2016 07:38:44 -0800
Subject: [PATCH 184/421] Add missing node visits in forEachChild

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

diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 7f112ae06a0..02b121c31b6 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -142,7 +142,9 @@ namespace ts {
                 return visitNode(cbNode, (<IndexedAccessTypeNode>node).objectType) ||
                     visitNode(cbNode, (<IndexedAccessTypeNode>node).indexType);
             case SyntaxKind.MappedType:
-                return visitNode(cbNode, (<MappedTypeNode>node).typeParameter) ||
+                return visitNode(cbNode, (<MappedTypeNode>node).readonlyToken) ||
+                    visitNode(cbNode, (<MappedTypeNode>node).typeParameter) ||
+                    visitNode(cbNode, (<MappedTypeNode>node).questionToken) ||
                     visitNode(cbNode, (<MappedTypeNode>node).type);
             case SyntaxKind.LiteralType:
                 return visitNode(cbNode, (<LiteralTypeNode>node).literal);

From 364142c06235b58cf14df7e2c1c927a76adeb75b Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Fri, 11 Nov 2016 07:39:51 -0800
Subject: [PATCH 185/421] Improve type inference for types with same generic
 type alias

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 90d6078c8c9..01ea2227217 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -8318,6 +8318,16 @@ namespace ts {
                 if (!couldContainTypeParameters(target)) {
                     return;
                 }
+                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.
+                    const sourceTypes = source.aliasTypeArguments;
+                    const targetTypes = target.aliasTypeArguments;
+                    for (let i = 0; i < sourceTypes.length; i++) {
+                        inferFromTypes(sourceTypes[i], targetTypes[i]);
+                    }
+                    return;
+                }
                 if (source.flags & TypeFlags.Union && target.flags & TypeFlags.Union && !(source.flags & TypeFlags.Enum && target.flags & TypeFlags.Enum) ||
                     source.flags & TypeFlags.Intersection && target.flags & TypeFlags.Intersection) {
                     // Source and target are both unions or both intersections. If source and target

From e9b6ddc9ae02fc524a34940db4082e98b08508f2 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Fri, 11 Nov 2016 07:40:05 -0800
Subject: [PATCH 186/421] Add tests

---
 tests/baselines/reference/mappedTypes1.js     | 146 ++++++++
 .../baselines/reference/mappedTypes1.symbols  | 138 +++++++
 tests/baselines/reference/mappedTypes1.types  | 143 +++++++
 tests/baselines/reference/mappedTypes2.js     | 183 +++++++++
 .../baselines/reference/mappedTypes2.symbols  | 331 ++++++++++++++++
 tests/baselines/reference/mappedTypes2.types  | 353 ++++++++++++++++++
 tests/baselines/reference/mappedTypes3.js     |  84 +++++
 .../baselines/reference/mappedTypes3.symbols  | 135 +++++++
 tests/baselines/reference/mappedTypes3.types  | 138 +++++++
 .../conformance/types/mapped/mappedTypes1.ts  |  35 ++
 .../conformance/types/mapped/mappedTypes2.ts  |  96 +++++
 .../conformance/types/mapped/mappedTypes3.ts  |  40 ++
 12 files changed, 1822 insertions(+)
 create mode 100644 tests/baselines/reference/mappedTypes1.js
 create mode 100644 tests/baselines/reference/mappedTypes1.symbols
 create mode 100644 tests/baselines/reference/mappedTypes1.types
 create mode 100644 tests/baselines/reference/mappedTypes2.js
 create mode 100644 tests/baselines/reference/mappedTypes2.symbols
 create mode 100644 tests/baselines/reference/mappedTypes2.types
 create mode 100644 tests/baselines/reference/mappedTypes3.js
 create mode 100644 tests/baselines/reference/mappedTypes3.symbols
 create mode 100644 tests/baselines/reference/mappedTypes3.types
 create mode 100644 tests/cases/conformance/types/mapped/mappedTypes1.ts
 create mode 100644 tests/cases/conformance/types/mapped/mappedTypes2.ts
 create mode 100644 tests/cases/conformance/types/mapped/mappedTypes3.ts

diff --git a/tests/baselines/reference/mappedTypes1.js b/tests/baselines/reference/mappedTypes1.js
new file mode 100644
index 00000000000..df03a022966
--- /dev/null
+++ b/tests/baselines/reference/mappedTypes1.js
@@ -0,0 +1,146 @@
+//// [mappedTypes1.ts]
+
+type Item = { a: string, b: number, c: boolean };
+
+type T00 = { [P in "x" | "y"]: number };
+type T01 = { [P in "x" | "y"]: P };
+type T02 = { [P in "a" | "b"]: Item[P]; }
+type T03 = { [P in keyof Item]: Date };
+
+type T10 = { [P in keyof Item]: Item[P] };
+type T11 = { [P in keyof Item]?: Item[P] };
+type T12 = { readonly [P in keyof Item]: Item[P] };
+type T13 = { readonly [P in keyof Item]?: Item[P] };
+
+type T20 = { [P in keyof Item]: Item[P] | null };
+type T21 = { [P in keyof Item]: Array<Item[P]> };
+
+type T30 = { [P in keyof any]: void };
+type T31 = { [P in keyof string]: void };
+type T32 = { [P in keyof number]: void };
+type T33 = { [P in keyof boolean]: void };
+type T34 = { [P in keyof undefined]: void };
+type T35 = { [P in keyof null]: void };
+type T36 = { [P in keyof void]: void };
+type T37 = { [P in keyof symbol]: void };
+type T38 = { [P in keyof never]: void };
+
+declare function f1<T1>(): { [P in keyof T1]: void };
+declare function f2<T1 extends string>(): { [P in keyof T1]: void };
+declare function f3<T1 extends number>(): { [P in keyof T1]: void };
+
+let x1 = f1();
+let x2 = f2();
+let x3 = f3();
+
+//// [mappedTypes1.js]
+var x1 = f1();
+var x2 = f2();
+var x3 = f3();
+
+
+//// [mappedTypes1.d.ts]
+declare type Item = {
+    a: string;
+    b: number;
+    c: boolean;
+};
+declare type T00 = {
+    [P in "x" | "y"]: number;
+};
+declare type T01 = {
+    [P in "x" | "y"]: P;
+};
+declare type T02 = {
+    [P in "a" | "b"]: Item[P];
+};
+declare type T03 = {
+    [P in keyof Item]: Date;
+};
+declare type T10 = {
+    [P in keyof Item]: Item[P];
+};
+declare type T11 = {
+    [P in keyof Item]?: Item[P];
+};
+declare type T12 = {
+    readonly [P in keyof Item]: Item[P];
+};
+declare type T13 = {
+    readonly [P in keyof Item]?: Item[P];
+};
+declare type T20 = {
+    [P in keyof Item]: Item[P] | null;
+};
+declare type T21 = {
+    [P in keyof Item]: Array<Item[P]>;
+};
+declare type T30 = {
+    [P in keyof any]: void;
+};
+declare type T31 = {
+    [P in keyof string]: void;
+};
+declare type T32 = {
+    [P in keyof number]: void;
+};
+declare type T33 = {
+    [P in keyof boolean]: void;
+};
+declare type T34 = {
+    [P in keyof undefined]: void;
+};
+declare type T35 = {
+    [P in keyof null]: void;
+};
+declare type T36 = {
+    [P in keyof void]: void;
+};
+declare type T37 = {
+    [P in keyof symbol]: void;
+};
+declare type T38 = {
+    [P in keyof never]: void;
+};
+declare function f1<T1>(): {
+    [P in keyof T1]: void;
+};
+declare function f2<T1 extends string>(): {
+    [P in keyof T1]: void;
+};
+declare function f3<T1 extends number>(): {
+    [P in keyof T1]: void;
+};
+declare let x1: {};
+declare let x2: {
+    [x: number]: void;
+    toString: void;
+    charAt: void;
+    charCodeAt: void;
+    concat: void;
+    indexOf: void;
+    lastIndexOf: void;
+    localeCompare: void;
+    match: void;
+    replace: void;
+    search: void;
+    slice: void;
+    split: void;
+    substring: void;
+    toLowerCase: void;
+    toLocaleLowerCase: void;
+    toUpperCase: void;
+    toLocaleUpperCase: void;
+    trim: void;
+    length: void;
+    substr: void;
+    valueOf: void;
+};
+declare let x3: {
+    toString: void;
+    valueOf: void;
+    toFixed: void;
+    toExponential: void;
+    toPrecision: void;
+    toLocaleString: void;
+};
diff --git a/tests/baselines/reference/mappedTypes1.symbols b/tests/baselines/reference/mappedTypes1.symbols
new file mode 100644
index 00000000000..65732a4be11
--- /dev/null
+++ b/tests/baselines/reference/mappedTypes1.symbols
@@ -0,0 +1,138 @@
+=== tests/cases/conformance/types/mapped/mappedTypes1.ts ===
+
+type Item = { a: string, b: number, c: boolean };
+>Item : Symbol(Item, Decl(mappedTypes1.ts, 0, 0))
+>a : Symbol(a, Decl(mappedTypes1.ts, 1, 13))
+>b : Symbol(b, Decl(mappedTypes1.ts, 1, 24))
+>c : Symbol(c, Decl(mappedTypes1.ts, 1, 35))
+
+type T00 = { [P in "x" | "y"]: number };
+>T00 : Symbol(T00, Decl(mappedTypes1.ts, 1, 49))
+>P : Symbol(P, Decl(mappedTypes1.ts, 3, 14))
+
+type T01 = { [P in "x" | "y"]: P };
+>T01 : Symbol(T01, Decl(mappedTypes1.ts, 3, 40))
+>P : Symbol(P, Decl(mappedTypes1.ts, 4, 14))
+>P : Symbol(P, Decl(mappedTypes1.ts, 4, 14))
+
+type T02 = { [P in "a" | "b"]: Item[P]; }
+>T02 : Symbol(T02, Decl(mappedTypes1.ts, 4, 35))
+>P : Symbol(P, Decl(mappedTypes1.ts, 5, 14))
+>Item : Symbol(Item, Decl(mappedTypes1.ts, 0, 0))
+>P : Symbol(P, Decl(mappedTypes1.ts, 5, 14))
+
+type T03 = { [P in keyof Item]: Date };
+>T03 : Symbol(T03, Decl(mappedTypes1.ts, 5, 41))
+>P : Symbol(P, Decl(mappedTypes1.ts, 6, 14))
+>Item : Symbol(Item, Decl(mappedTypes1.ts, 0, 0))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+
+type T10 = { [P in keyof Item]: Item[P] };
+>T10 : Symbol(T10, Decl(mappedTypes1.ts, 6, 39))
+>P : Symbol(P, Decl(mappedTypes1.ts, 8, 14))
+>Item : Symbol(Item, Decl(mappedTypes1.ts, 0, 0))
+>Item : Symbol(Item, Decl(mappedTypes1.ts, 0, 0))
+>P : Symbol(P, Decl(mappedTypes1.ts, 8, 14))
+
+type T11 = { [P in keyof Item]?: Item[P] };
+>T11 : Symbol(T11, Decl(mappedTypes1.ts, 8, 42))
+>P : Symbol(P, Decl(mappedTypes1.ts, 9, 14))
+>Item : Symbol(Item, Decl(mappedTypes1.ts, 0, 0))
+>Item : Symbol(Item, Decl(mappedTypes1.ts, 0, 0))
+>P : Symbol(P, Decl(mappedTypes1.ts, 9, 14))
+
+type T12 = { readonly [P in keyof Item]: Item[P] };
+>T12 : Symbol(T12, Decl(mappedTypes1.ts, 9, 43))
+>P : Symbol(P, Decl(mappedTypes1.ts, 10, 23))
+>Item : Symbol(Item, Decl(mappedTypes1.ts, 0, 0))
+>Item : Symbol(Item, Decl(mappedTypes1.ts, 0, 0))
+>P : Symbol(P, Decl(mappedTypes1.ts, 10, 23))
+
+type T13 = { readonly [P in keyof Item]?: Item[P] };
+>T13 : Symbol(T13, Decl(mappedTypes1.ts, 10, 51))
+>P : Symbol(P, Decl(mappedTypes1.ts, 11, 23))
+>Item : Symbol(Item, Decl(mappedTypes1.ts, 0, 0))
+>Item : Symbol(Item, Decl(mappedTypes1.ts, 0, 0))
+>P : Symbol(P, Decl(mappedTypes1.ts, 11, 23))
+
+type T20 = { [P in keyof Item]: Item[P] | null };
+>T20 : Symbol(T20, Decl(mappedTypes1.ts, 11, 52))
+>P : Symbol(P, Decl(mappedTypes1.ts, 13, 14))
+>Item : Symbol(Item, Decl(mappedTypes1.ts, 0, 0))
+>Item : Symbol(Item, Decl(mappedTypes1.ts, 0, 0))
+>P : Symbol(P, Decl(mappedTypes1.ts, 13, 14))
+
+type T21 = { [P in keyof Item]: Array<Item[P]> };
+>T21 : Symbol(T21, Decl(mappedTypes1.ts, 13, 49))
+>P : Symbol(P, Decl(mappedTypes1.ts, 14, 14))
+>Item : Symbol(Item, Decl(mappedTypes1.ts, 0, 0))
+>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Item : Symbol(Item, Decl(mappedTypes1.ts, 0, 0))
+>P : Symbol(P, Decl(mappedTypes1.ts, 14, 14))
+
+type T30 = { [P in keyof any]: void };
+>T30 : Symbol(T30, Decl(mappedTypes1.ts, 14, 49))
+>P : Symbol(P, Decl(mappedTypes1.ts, 16, 14))
+
+type T31 = { [P in keyof string]: void };
+>T31 : Symbol(T31, Decl(mappedTypes1.ts, 16, 38))
+>P : Symbol(P, Decl(mappedTypes1.ts, 17, 14))
+
+type T32 = { [P in keyof number]: void };
+>T32 : Symbol(T32, Decl(mappedTypes1.ts, 17, 41))
+>P : Symbol(P, Decl(mappedTypes1.ts, 18, 14))
+
+type T33 = { [P in keyof boolean]: void };
+>T33 : Symbol(T33, Decl(mappedTypes1.ts, 18, 41))
+>P : Symbol(P, Decl(mappedTypes1.ts, 19, 14))
+
+type T34 = { [P in keyof undefined]: void };
+>T34 : Symbol(T34, Decl(mappedTypes1.ts, 19, 42))
+>P : Symbol(P, Decl(mappedTypes1.ts, 20, 14))
+
+type T35 = { [P in keyof null]: void };
+>T35 : Symbol(T35, Decl(mappedTypes1.ts, 20, 44))
+>P : Symbol(P, Decl(mappedTypes1.ts, 21, 14))
+
+type T36 = { [P in keyof void]: void };
+>T36 : Symbol(T36, Decl(mappedTypes1.ts, 21, 39))
+>P : Symbol(P, Decl(mappedTypes1.ts, 22, 14))
+
+type T37 = { [P in keyof symbol]: void };
+>T37 : Symbol(T37, Decl(mappedTypes1.ts, 22, 39))
+>P : Symbol(P, Decl(mappedTypes1.ts, 23, 14))
+
+type T38 = { [P in keyof never]: void };
+>T38 : Symbol(T38, Decl(mappedTypes1.ts, 23, 41))
+>P : Symbol(P, Decl(mappedTypes1.ts, 24, 14))
+
+declare function f1<T1>(): { [P in keyof T1]: void };
+>f1 : Symbol(f1, Decl(mappedTypes1.ts, 24, 40))
+>T1 : Symbol(T1, Decl(mappedTypes1.ts, 26, 20))
+>P : Symbol(P, Decl(mappedTypes1.ts, 26, 30))
+>T1 : Symbol(T1, Decl(mappedTypes1.ts, 26, 20))
+
+declare function f2<T1 extends string>(): { [P in keyof T1]: void };
+>f2 : Symbol(f2, Decl(mappedTypes1.ts, 26, 53))
+>T1 : Symbol(T1, Decl(mappedTypes1.ts, 27, 20))
+>P : Symbol(P, Decl(mappedTypes1.ts, 27, 45))
+>T1 : Symbol(T1, Decl(mappedTypes1.ts, 27, 20))
+
+declare function f3<T1 extends number>(): { [P in keyof T1]: void };
+>f3 : Symbol(f3, Decl(mappedTypes1.ts, 27, 68))
+>T1 : Symbol(T1, Decl(mappedTypes1.ts, 28, 20))
+>P : Symbol(P, Decl(mappedTypes1.ts, 28, 45))
+>T1 : Symbol(T1, Decl(mappedTypes1.ts, 28, 20))
+
+let x1 = f1();
+>x1 : Symbol(x1, Decl(mappedTypes1.ts, 30, 3))
+>f1 : Symbol(f1, Decl(mappedTypes1.ts, 24, 40))
+
+let x2 = f2();
+>x2 : Symbol(x2, Decl(mappedTypes1.ts, 31, 3))
+>f2 : Symbol(f2, Decl(mappedTypes1.ts, 26, 53))
+
+let x3 = f3();
+>x3 : Symbol(x3, Decl(mappedTypes1.ts, 32, 3))
+>f3 : Symbol(f3, Decl(mappedTypes1.ts, 27, 68))
+
diff --git a/tests/baselines/reference/mappedTypes1.types b/tests/baselines/reference/mappedTypes1.types
new file mode 100644
index 00000000000..222291b008b
--- /dev/null
+++ b/tests/baselines/reference/mappedTypes1.types
@@ -0,0 +1,143 @@
+=== tests/cases/conformance/types/mapped/mappedTypes1.ts ===
+
+type Item = { a: string, b: number, c: boolean };
+>Item : Item
+>a : string
+>b : number
+>c : boolean
+
+type T00 = { [P in "x" | "y"]: number };
+>T00 : T00
+>P : P
+
+type T01 = { [P in "x" | "y"]: P };
+>T01 : T01
+>P : P
+>P : P
+
+type T02 = { [P in "a" | "b"]: Item[P]; }
+>T02 : T02
+>P : P
+>Item : Item
+>P : P
+
+type T03 = { [P in keyof Item]: Date };
+>T03 : T03
+>P : P
+>Item : Item
+>Date : Date
+
+type T10 = { [P in keyof Item]: Item[P] };
+>T10 : T10
+>P : P
+>Item : Item
+>Item : Item
+>P : P
+
+type T11 = { [P in keyof Item]?: Item[P] };
+>T11 : T11
+>P : P
+>Item : Item
+>Item : Item
+>P : P
+
+type T12 = { readonly [P in keyof Item]: Item[P] };
+>T12 : T12
+>P : P
+>Item : Item
+>Item : Item
+>P : P
+
+type T13 = { readonly [P in keyof Item]?: Item[P] };
+>T13 : T13
+>P : P
+>Item : Item
+>Item : Item
+>P : P
+
+type T20 = { [P in keyof Item]: Item[P] | null };
+>T20 : T20
+>P : P
+>Item : Item
+>Item : Item
+>P : P
+>null : null
+
+type T21 = { [P in keyof Item]: Array<Item[P]> };
+>T21 : T21
+>P : P
+>Item : Item
+>Array : T[]
+>Item : Item
+>P : P
+
+type T30 = { [P in keyof any]: void };
+>T30 : T30
+>P : P
+
+type T31 = { [P in keyof string]: void };
+>T31 : T31
+>P : P
+
+type T32 = { [P in keyof number]: void };
+>T32 : T32
+>P : P
+
+type T33 = { [P in keyof boolean]: void };
+>T33 : T33
+>P : P
+
+type T34 = { [P in keyof undefined]: void };
+>T34 : T34
+>P : P
+
+type T35 = { [P in keyof null]: void };
+>T35 : T35
+>P : P
+>null : null
+
+type T36 = { [P in keyof void]: void };
+>T36 : T36
+>P : P
+
+type T37 = { [P in keyof symbol]: void };
+>T37 : T37
+>P : P
+
+type T38 = { [P in keyof never]: void };
+>T38 : T38
+>P : P
+
+declare function f1<T1>(): { [P in keyof T1]: void };
+>f1 : <T1>() => { [P in keyof T1]: void; }
+>T1 : T1
+>P : P
+>T1 : T1
+
+declare function f2<T1 extends string>(): { [P in keyof T1]: void };
+>f2 : <T1 extends string>() => { [P in keyof T1]: void; }
+>T1 : T1
+>P : P
+>T1 : T1
+
+declare function f3<T1 extends number>(): { [P in keyof T1]: void };
+>f3 : <T1 extends number>() => { [P in keyof T1]: void; }
+>T1 : T1
+>P : P
+>T1 : T1
+
+let x1 = f1();
+>x1 : {}
+>f1() : {}
+>f1 : <T1>() => { [P in keyof T1]: void; }
+
+let x2 = f2();
+>x2 : { [x: number]: void; toString: void; charAt: void; charCodeAt: void; concat: void; indexOf: void; lastIndexOf: void; localeCompare: void; match: void; replace: void; search: void; slice: void; split: void; substring: void; toLowerCase: void; toLocaleLowerCase: void; toUpperCase: void; toLocaleUpperCase: void; trim: void; length: void; substr: void; valueOf: void; }
+>f2() : { [x: number]: void; toString: void; charAt: void; charCodeAt: void; concat: void; indexOf: void; lastIndexOf: void; localeCompare: void; match: void; replace: void; search: void; slice: void; split: void; substring: void; toLowerCase: void; toLocaleLowerCase: void; toUpperCase: void; toLocaleUpperCase: void; trim: void; length: void; substr: void; valueOf: void; }
+>f2 : <T1 extends string>() => { [P in keyof T1]: void; }
+
+let x3 = f3();
+>x3 : { toString: void; valueOf: void; toFixed: void; toExponential: void; toPrecision: void; toLocaleString: void; }
+>f3() : { toString: void; valueOf: void; toFixed: void; toExponential: void; toPrecision: void; toLocaleString: void; }
+>f3 : <T1 extends number>() => { [P in keyof T1]: void; }
+
diff --git a/tests/baselines/reference/mappedTypes2.js b/tests/baselines/reference/mappedTypes2.js
new file mode 100644
index 00000000000..8796244c390
--- /dev/null
+++ b/tests/baselines/reference/mappedTypes2.js
@@ -0,0 +1,183 @@
+//// [mappedTypes2.ts]
+
+type Partial<T> = {
+    [P in keyof T]?: T[P];
+};
+
+type Readonly<T> = {
+    readonly [P in keyof T]: T[P];
+};
+
+type Pick<T, K extends keyof T> = {
+    [P in K]: T[P];
+}
+
+type Record<K extends string | number, T> = {
+    [_ in K]: T;
+}
+
+type Proxy<T> = {
+    get(): T;
+    set(value: T): void;
+}
+
+type Proxify<T> = {
+    [P in keyof T]: Proxy<T[P]>;
+}
+
+type DeepReadonly<T> = {
+    readonly [P in keyof T]: DeepReadonly<T[P]>;
+};
+
+declare function assign<T>(obj: T, props: Partial<T>): void;
+declare function freeze<T>(obj: T): Readonly<T>;
+declare function pick<T, K extends keyof T>(obj: T, ...keys: K[]): Pick<T, K>;
+declare function mapObject<K extends string | number, T, U>(obj: Record<K, T>, f: (x: T) => U): Record<K, U>;
+declare function proxify<T>(obj: T): Proxify<T>;
+
+interface Shape {
+    name: string;
+    width: number;
+    height: number;
+    visible: boolean;
+}
+
+interface PartialShape {
+    name?: string;
+    width?: number;
+    height?: number;
+    visible?: boolean;
+}
+
+interface ReadonlyShape {
+    readonly name: string;
+    readonly width: number;
+    readonly height: number;
+    readonly visible: boolean;
+}
+
+function f0(s1: Shape, s2: Shape) {
+    assign(s1, { name: "circle" });
+    assign(s2, { width: 10, height: 20 });
+}
+
+function f1(shape: Shape) {
+    var frozen: ReadonlyShape;
+    var frozen: Readonly<Shape>;
+    var frozen = freeze(shape);
+}
+
+function f2(shape: Shape) {
+    var partial: PartialShape;
+    var partial: Partial<Shape>;
+    var partial: Partial<Shape> = {};
+}
+
+function f3(shape: Shape) {
+    const x = pick(shape, "name", "visible");  // { name: string, visible: boolean }
+}
+
+function f4() {
+    const rec = { foo: "hello", bar: "world", baz: "bye" };
+    const lengths = mapObject(rec, s => s.length);  // { foo: number, bar: number, baz: number }
+}
+
+function f5(shape: Shape) {
+    const p = proxify(shape);
+    let name = p.name.get();
+    p.visible.set(false);
+}
+
+function f6(shape: DeepReadonly<Shape>) {
+    let name = shape.name;  // DeepReadonly<string>
+    let length = name.length;  // DeepReadonly<number>
+    let toString = length.toString;  // DeepReadonly<(radix?: number) => string>
+}
+
+//// [mappedTypes2.js]
+function f0(s1, s2) {
+    assign(s1, { name: "circle" });
+    assign(s2, { width: 10, height: 20 });
+}
+function f1(shape) {
+    var frozen;
+    var frozen;
+    var frozen = freeze(shape);
+}
+function f2(shape) {
+    var partial;
+    var partial;
+    var partial = {};
+}
+function f3(shape) {
+    var x = pick(shape, "name", "visible"); // { name: string, visible: boolean }
+}
+function f4() {
+    var rec = { foo: "hello", bar: "world", baz: "bye" };
+    var lengths = mapObject(rec, function (s) { return s.length; }); // { foo: number, bar: number, baz: number }
+}
+function f5(shape) {
+    var p = proxify(shape);
+    var name = p.name.get();
+    p.visible.set(false);
+}
+function f6(shape) {
+    var name = shape.name; // DeepReadonly<string>
+    var length = name.length; // DeepReadonly<number>
+    var toString = length.toString; // DeepReadonly<(radix?: number) => string>
+}
+
+
+//// [mappedTypes2.d.ts]
+declare type Partial<T> = {
+    [P in keyof T]?: T[P];
+};
+declare type Readonly<T> = {
+    readonly [P in keyof T]: T[P];
+};
+declare type Pick<T, K extends keyof T> = {
+    [P in K]: T[P];
+};
+declare type Record<K extends string | number, T> = {
+    [_ in K]: T;
+};
+declare type Proxy<T> = {
+    get(): T;
+    set(value: T): void;
+};
+declare type Proxify<T> = {
+    [P in keyof T]: Proxy<T[P]>;
+};
+declare type DeepReadonly<T> = {
+    readonly [P in keyof T]: DeepReadonly<T[P]>;
+};
+declare function assign<T>(obj: T, props: Partial<T>): void;
+declare function freeze<T>(obj: T): Readonly<T>;
+declare function pick<T, K extends keyof T>(obj: T, ...keys: K[]): Pick<T, K>;
+declare function mapObject<K extends string | number, T, U>(obj: Record<K, T>, f: (x: T) => U): Record<K, U>;
+declare function proxify<T>(obj: T): Proxify<T>;
+interface Shape {
+    name: string;
+    width: number;
+    height: number;
+    visible: boolean;
+}
+interface PartialShape {
+    name?: string;
+    width?: number;
+    height?: number;
+    visible?: boolean;
+}
+interface ReadonlyShape {
+    readonly name: string;
+    readonly width: number;
+    readonly height: number;
+    readonly visible: boolean;
+}
+declare function f0(s1: Shape, s2: Shape): void;
+declare function f1(shape: Shape): void;
+declare function f2(shape: Shape): void;
+declare function f3(shape: Shape): void;
+declare function f4(): void;
+declare function f5(shape: Shape): void;
+declare function f6(shape: DeepReadonly<Shape>): void;
diff --git a/tests/baselines/reference/mappedTypes2.symbols b/tests/baselines/reference/mappedTypes2.symbols
new file mode 100644
index 00000000000..bc823ed0081
--- /dev/null
+++ b/tests/baselines/reference/mappedTypes2.symbols
@@ -0,0 +1,331 @@
+=== tests/cases/conformance/types/mapped/mappedTypes2.ts ===
+
+type Partial<T> = {
+>Partial : Symbol(Partial, Decl(mappedTypes2.ts, 0, 0))
+>T : Symbol(T, Decl(mappedTypes2.ts, 1, 13))
+
+    [P in keyof T]?: T[P];
+>P : Symbol(P, Decl(mappedTypes2.ts, 2, 5))
+>T : Symbol(T, Decl(mappedTypes2.ts, 1, 13))
+>T : Symbol(T, Decl(mappedTypes2.ts, 1, 13))
+>P : Symbol(P, Decl(mappedTypes2.ts, 2, 5))
+
+};
+
+type Readonly<T> = {
+>Readonly : Symbol(Readonly, Decl(mappedTypes2.ts, 3, 2))
+>T : Symbol(T, Decl(mappedTypes2.ts, 5, 14))
+
+    readonly [P in keyof T]: T[P];
+>P : Symbol(P, Decl(mappedTypes2.ts, 6, 14))
+>T : Symbol(T, Decl(mappedTypes2.ts, 5, 14))
+>T : Symbol(T, Decl(mappedTypes2.ts, 5, 14))
+>P : Symbol(P, Decl(mappedTypes2.ts, 6, 14))
+
+};
+
+type Pick<T, K extends keyof T> = {
+>Pick : Symbol(Pick, Decl(mappedTypes2.ts, 7, 2))
+>T : Symbol(T, Decl(mappedTypes2.ts, 9, 10))
+>K : Symbol(K, Decl(mappedTypes2.ts, 9, 12))
+>T : Symbol(T, Decl(mappedTypes2.ts, 9, 10))
+
+    [P in K]: T[P];
+>P : Symbol(P, Decl(mappedTypes2.ts, 10, 5))
+>K : Symbol(K, Decl(mappedTypes2.ts, 9, 12))
+>T : Symbol(T, Decl(mappedTypes2.ts, 9, 10))
+>P : Symbol(P, Decl(mappedTypes2.ts, 10, 5))
+}
+
+type Record<K extends string | number, T> = {
+>Record : Symbol(Record, Decl(mappedTypes2.ts, 11, 1))
+>K : Symbol(K, Decl(mappedTypes2.ts, 13, 12))
+>T : Symbol(T, Decl(mappedTypes2.ts, 13, 38))
+
+    [_ in K]: T;
+>_ : Symbol(_, Decl(mappedTypes2.ts, 14, 5))
+>K : Symbol(K, Decl(mappedTypes2.ts, 13, 12))
+>T : Symbol(T, Decl(mappedTypes2.ts, 13, 38))
+}
+
+type Proxy<T> = {
+>Proxy : Symbol(Proxy, Decl(mappedTypes2.ts, 15, 1))
+>T : Symbol(T, Decl(mappedTypes2.ts, 17, 11))
+
+    get(): T;
+>get : Symbol(get, Decl(mappedTypes2.ts, 17, 17))
+>T : Symbol(T, Decl(mappedTypes2.ts, 17, 11))
+
+    set(value: T): void;
+>set : Symbol(set, Decl(mappedTypes2.ts, 18, 13))
+>value : Symbol(value, Decl(mappedTypes2.ts, 19, 8))
+>T : Symbol(T, Decl(mappedTypes2.ts, 17, 11))
+}
+
+type Proxify<T> = {
+>Proxify : Symbol(Proxify, Decl(mappedTypes2.ts, 20, 1))
+>T : Symbol(T, Decl(mappedTypes2.ts, 22, 13))
+
+    [P in keyof T]: Proxy<T[P]>;
+>P : Symbol(P, Decl(mappedTypes2.ts, 23, 5))
+>T : Symbol(T, Decl(mappedTypes2.ts, 22, 13))
+>Proxy : Symbol(Proxy, Decl(mappedTypes2.ts, 15, 1))
+>T : Symbol(T, Decl(mappedTypes2.ts, 22, 13))
+>P : Symbol(P, Decl(mappedTypes2.ts, 23, 5))
+}
+
+type DeepReadonly<T> = {
+>DeepReadonly : Symbol(DeepReadonly, Decl(mappedTypes2.ts, 24, 1))
+>T : Symbol(T, Decl(mappedTypes2.ts, 26, 18))
+
+    readonly [P in keyof T]: DeepReadonly<T[P]>;
+>P : Symbol(P, Decl(mappedTypes2.ts, 27, 14))
+>T : Symbol(T, Decl(mappedTypes2.ts, 26, 18))
+>DeepReadonly : Symbol(DeepReadonly, Decl(mappedTypes2.ts, 24, 1))
+>T : Symbol(T, Decl(mappedTypes2.ts, 26, 18))
+>P : Symbol(P, Decl(mappedTypes2.ts, 27, 14))
+
+};
+
+declare function assign<T>(obj: T, props: Partial<T>): void;
+>assign : Symbol(assign, Decl(mappedTypes2.ts, 28, 2))
+>T : Symbol(T, Decl(mappedTypes2.ts, 30, 24))
+>obj : Symbol(obj, Decl(mappedTypes2.ts, 30, 27))
+>T : Symbol(T, Decl(mappedTypes2.ts, 30, 24))
+>props : Symbol(props, Decl(mappedTypes2.ts, 30, 34))
+>Partial : Symbol(Partial, Decl(mappedTypes2.ts, 0, 0))
+>T : Symbol(T, Decl(mappedTypes2.ts, 30, 24))
+
+declare function freeze<T>(obj: T): Readonly<T>;
+>freeze : Symbol(freeze, Decl(mappedTypes2.ts, 30, 60))
+>T : Symbol(T, Decl(mappedTypes2.ts, 31, 24))
+>obj : Symbol(obj, Decl(mappedTypes2.ts, 31, 27))
+>T : Symbol(T, Decl(mappedTypes2.ts, 31, 24))
+>Readonly : Symbol(Readonly, Decl(mappedTypes2.ts, 3, 2))
+>T : Symbol(T, Decl(mappedTypes2.ts, 31, 24))
+
+declare function pick<T, K extends keyof T>(obj: T, ...keys: K[]): Pick<T, K>;
+>pick : Symbol(pick, Decl(mappedTypes2.ts, 31, 48))
+>T : Symbol(T, Decl(mappedTypes2.ts, 32, 22))
+>K : Symbol(K, Decl(mappedTypes2.ts, 32, 24))
+>T : Symbol(T, Decl(mappedTypes2.ts, 32, 22))
+>obj : Symbol(obj, Decl(mappedTypes2.ts, 32, 44))
+>T : Symbol(T, Decl(mappedTypes2.ts, 32, 22))
+>keys : Symbol(keys, Decl(mappedTypes2.ts, 32, 51))
+>K : Symbol(K, Decl(mappedTypes2.ts, 32, 24))
+>Pick : Symbol(Pick, Decl(mappedTypes2.ts, 7, 2))
+>T : Symbol(T, Decl(mappedTypes2.ts, 32, 22))
+>K : Symbol(K, Decl(mappedTypes2.ts, 32, 24))
+
+declare function mapObject<K extends string | number, T, U>(obj: Record<K, T>, f: (x: T) => U): Record<K, U>;
+>mapObject : Symbol(mapObject, Decl(mappedTypes2.ts, 32, 78))
+>K : Symbol(K, Decl(mappedTypes2.ts, 33, 27))
+>T : Symbol(T, Decl(mappedTypes2.ts, 33, 53))
+>U : Symbol(U, Decl(mappedTypes2.ts, 33, 56))
+>obj : Symbol(obj, Decl(mappedTypes2.ts, 33, 60))
+>Record : Symbol(Record, Decl(mappedTypes2.ts, 11, 1))
+>K : Symbol(K, Decl(mappedTypes2.ts, 33, 27))
+>T : Symbol(T, Decl(mappedTypes2.ts, 33, 53))
+>f : Symbol(f, Decl(mappedTypes2.ts, 33, 78))
+>x : Symbol(x, Decl(mappedTypes2.ts, 33, 83))
+>T : Symbol(T, Decl(mappedTypes2.ts, 33, 53))
+>U : Symbol(U, Decl(mappedTypes2.ts, 33, 56))
+>Record : Symbol(Record, Decl(mappedTypes2.ts, 11, 1))
+>K : Symbol(K, Decl(mappedTypes2.ts, 33, 27))
+>U : Symbol(U, Decl(mappedTypes2.ts, 33, 56))
+
+declare function proxify<T>(obj: T): Proxify<T>;
+>proxify : Symbol(proxify, Decl(mappedTypes2.ts, 33, 109))
+>T : Symbol(T, Decl(mappedTypes2.ts, 34, 25))
+>obj : Symbol(obj, Decl(mappedTypes2.ts, 34, 28))
+>T : Symbol(T, Decl(mappedTypes2.ts, 34, 25))
+>Proxify : Symbol(Proxify, Decl(mappedTypes2.ts, 20, 1))
+>T : Symbol(T, Decl(mappedTypes2.ts, 34, 25))
+
+interface Shape {
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 48))
+
+    name: string;
+>name : Symbol(Shape.name, Decl(mappedTypes2.ts, 36, 17))
+
+    width: number;
+>width : Symbol(Shape.width, Decl(mappedTypes2.ts, 37, 17))
+
+    height: number;
+>height : Symbol(Shape.height, Decl(mappedTypes2.ts, 38, 18))
+
+    visible: boolean;
+>visible : Symbol(Shape.visible, Decl(mappedTypes2.ts, 39, 19))
+}
+
+interface PartialShape {
+>PartialShape : Symbol(PartialShape, Decl(mappedTypes2.ts, 41, 1))
+
+    name?: string;
+>name : Symbol(PartialShape.name, Decl(mappedTypes2.ts, 43, 24))
+
+    width?: number;
+>width : Symbol(PartialShape.width, Decl(mappedTypes2.ts, 44, 18))
+
+    height?: number;
+>height : Symbol(PartialShape.height, Decl(mappedTypes2.ts, 45, 19))
+
+    visible?: boolean;
+>visible : Symbol(PartialShape.visible, Decl(mappedTypes2.ts, 46, 20))
+}
+
+interface ReadonlyShape {
+>ReadonlyShape : Symbol(ReadonlyShape, Decl(mappedTypes2.ts, 48, 1))
+
+    readonly name: string;
+>name : Symbol(ReadonlyShape.name, Decl(mappedTypes2.ts, 50, 25))
+
+    readonly width: number;
+>width : Symbol(ReadonlyShape.width, Decl(mappedTypes2.ts, 51, 26))
+
+    readonly height: number;
+>height : Symbol(ReadonlyShape.height, Decl(mappedTypes2.ts, 52, 27))
+
+    readonly visible: boolean;
+>visible : Symbol(ReadonlyShape.visible, Decl(mappedTypes2.ts, 53, 28))
+}
+
+function f0(s1: Shape, s2: Shape) {
+>f0 : Symbol(f0, Decl(mappedTypes2.ts, 55, 1))
+>s1 : Symbol(s1, Decl(mappedTypes2.ts, 57, 12))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 48))
+>s2 : Symbol(s2, Decl(mappedTypes2.ts, 57, 22))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 48))
+
+    assign(s1, { name: "circle" });
+>assign : Symbol(assign, Decl(mappedTypes2.ts, 28, 2))
+>s1 : Symbol(s1, Decl(mappedTypes2.ts, 57, 12))
+>name : Symbol(name, Decl(mappedTypes2.ts, 58, 16))
+
+    assign(s2, { width: 10, height: 20 });
+>assign : Symbol(assign, Decl(mappedTypes2.ts, 28, 2))
+>s2 : Symbol(s2, Decl(mappedTypes2.ts, 57, 22))
+>width : Symbol(width, Decl(mappedTypes2.ts, 59, 16))
+>height : Symbol(height, Decl(mappedTypes2.ts, 59, 27))
+}
+
+function f1(shape: Shape) {
+>f1 : Symbol(f1, Decl(mappedTypes2.ts, 60, 1))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 62, 12))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 48))
+
+    var frozen: ReadonlyShape;
+>frozen : Symbol(frozen, Decl(mappedTypes2.ts, 63, 7), Decl(mappedTypes2.ts, 64, 7), Decl(mappedTypes2.ts, 65, 7))
+>ReadonlyShape : Symbol(ReadonlyShape, Decl(mappedTypes2.ts, 48, 1))
+
+    var frozen: Readonly<Shape>;
+>frozen : Symbol(frozen, Decl(mappedTypes2.ts, 63, 7), Decl(mappedTypes2.ts, 64, 7), Decl(mappedTypes2.ts, 65, 7))
+>Readonly : Symbol(Readonly, Decl(mappedTypes2.ts, 3, 2))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 48))
+
+    var frozen = freeze(shape);
+>frozen : Symbol(frozen, Decl(mappedTypes2.ts, 63, 7), Decl(mappedTypes2.ts, 64, 7), Decl(mappedTypes2.ts, 65, 7))
+>freeze : Symbol(freeze, Decl(mappedTypes2.ts, 30, 60))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 62, 12))
+}
+
+function f2(shape: Shape) {
+>f2 : Symbol(f2, Decl(mappedTypes2.ts, 66, 1))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 68, 12))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 48))
+
+    var partial: PartialShape;
+>partial : Symbol(partial, Decl(mappedTypes2.ts, 69, 7), Decl(mappedTypes2.ts, 70, 7), Decl(mappedTypes2.ts, 71, 7))
+>PartialShape : Symbol(PartialShape, Decl(mappedTypes2.ts, 41, 1))
+
+    var partial: Partial<Shape>;
+>partial : Symbol(partial, Decl(mappedTypes2.ts, 69, 7), Decl(mappedTypes2.ts, 70, 7), Decl(mappedTypes2.ts, 71, 7))
+>Partial : Symbol(Partial, Decl(mappedTypes2.ts, 0, 0))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 48))
+
+    var partial: Partial<Shape> = {};
+>partial : Symbol(partial, Decl(mappedTypes2.ts, 69, 7), Decl(mappedTypes2.ts, 70, 7), Decl(mappedTypes2.ts, 71, 7))
+>Partial : Symbol(Partial, Decl(mappedTypes2.ts, 0, 0))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 48))
+}
+
+function f3(shape: Shape) {
+>f3 : Symbol(f3, Decl(mappedTypes2.ts, 72, 1))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 74, 12))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 48))
+
+    const x = pick(shape, "name", "visible");  // { name: string, visible: boolean }
+>x : Symbol(x, Decl(mappedTypes2.ts, 75, 9))
+>pick : Symbol(pick, Decl(mappedTypes2.ts, 31, 48))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 74, 12))
+}
+
+function f4() {
+>f4 : Symbol(f4, Decl(mappedTypes2.ts, 76, 1))
+
+    const rec = { foo: "hello", bar: "world", baz: "bye" };
+>rec : Symbol(rec, Decl(mappedTypes2.ts, 79, 9))
+>foo : Symbol(foo, Decl(mappedTypes2.ts, 79, 17))
+>bar : Symbol(bar, Decl(mappedTypes2.ts, 79, 31))
+>baz : Symbol(baz, Decl(mappedTypes2.ts, 79, 45))
+
+    const lengths = mapObject(rec, s => s.length);  // { foo: number, bar: number, baz: number }
+>lengths : Symbol(lengths, Decl(mappedTypes2.ts, 80, 9))
+>mapObject : Symbol(mapObject, Decl(mappedTypes2.ts, 32, 78))
+>rec : Symbol(rec, Decl(mappedTypes2.ts, 79, 9))
+>s : Symbol(s, Decl(mappedTypes2.ts, 80, 34))
+>s.length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>s : Symbol(s, Decl(mappedTypes2.ts, 80, 34))
+>length : Symbol(String.length, Decl(lib.d.ts, --, --))
+}
+
+function f5(shape: Shape) {
+>f5 : Symbol(f5, Decl(mappedTypes2.ts, 81, 1))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 83, 12))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 48))
+
+    const p = proxify(shape);
+>p : Symbol(p, Decl(mappedTypes2.ts, 84, 9))
+>proxify : Symbol(proxify, Decl(mappedTypes2.ts, 33, 109))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 83, 12))
+
+    let name = p.name.get();
+>name : Symbol(name, Decl(mappedTypes2.ts, 85, 7))
+>p.name.get : Symbol(get, Decl(mappedTypes2.ts, 17, 17))
+>p.name : Symbol(name)
+>p : Symbol(p, Decl(mappedTypes2.ts, 84, 9))
+>name : Symbol(name)
+>get : Symbol(get, Decl(mappedTypes2.ts, 17, 17))
+
+    p.visible.set(false);
+>p.visible.set : Symbol(set, Decl(mappedTypes2.ts, 18, 13))
+>p.visible : Symbol(visible)
+>p : Symbol(p, Decl(mappedTypes2.ts, 84, 9))
+>visible : Symbol(visible)
+>set : Symbol(set, Decl(mappedTypes2.ts, 18, 13))
+}
+
+function f6(shape: DeepReadonly<Shape>) {
+>f6 : Symbol(f6, Decl(mappedTypes2.ts, 87, 1))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 89, 12))
+>DeepReadonly : Symbol(DeepReadonly, Decl(mappedTypes2.ts, 24, 1))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 48))
+
+    let name = shape.name;  // DeepReadonly<string>
+>name : Symbol(name, Decl(mappedTypes2.ts, 90, 7))
+>shape.name : Symbol(name)
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 89, 12))
+>name : Symbol(name)
+
+    let length = name.length;  // DeepReadonly<number>
+>length : Symbol(length, Decl(mappedTypes2.ts, 91, 7))
+>name.length : Symbol(length)
+>name : Symbol(name, Decl(mappedTypes2.ts, 90, 7))
+>length : Symbol(length)
+
+    let toString = length.toString;  // DeepReadonly<(radix?: number) => string>
+>toString : Symbol(toString, Decl(mappedTypes2.ts, 92, 7))
+>length.toString : Symbol(toString)
+>length : Symbol(length, Decl(mappedTypes2.ts, 91, 7))
+>toString : Symbol(toString)
+}
diff --git a/tests/baselines/reference/mappedTypes2.types b/tests/baselines/reference/mappedTypes2.types
new file mode 100644
index 00000000000..e3b67647993
--- /dev/null
+++ b/tests/baselines/reference/mappedTypes2.types
@@ -0,0 +1,353 @@
+=== tests/cases/conformance/types/mapped/mappedTypes2.ts ===
+
+type Partial<T> = {
+>Partial : Partial<T>
+>T : T
+
+    [P in keyof T]?: T[P];
+>P : P
+>T : T
+>T : T
+>P : P
+
+};
+
+type Readonly<T> = {
+>Readonly : Readonly<T>
+>T : T
+
+    readonly [P in keyof T]: T[P];
+>P : P
+>T : T
+>T : T
+>P : P
+
+};
+
+type Pick<T, K extends keyof T> = {
+>Pick : Pick<T, K>
+>T : T
+>K : K
+>T : T
+
+    [P in K]: T[P];
+>P : P
+>K : K
+>T : T
+>P : P
+}
+
+type Record<K extends string | number, T> = {
+>Record : Record<K, T>
+>K : K
+>T : T
+
+    [_ in K]: T;
+>_ : _
+>K : K
+>T : T
+}
+
+type Proxy<T> = {
+>Proxy : Proxy<T>
+>T : T
+
+    get(): T;
+>get : () => T
+>T : T
+
+    set(value: T): void;
+>set : (value: T) => void
+>value : T
+>T : T
+}
+
+type Proxify<T> = {
+>Proxify : Proxify<T>
+>T : T
+
+    [P in keyof T]: Proxy<T[P]>;
+>P : P
+>T : T
+>Proxy : Proxy<T>
+>T : T
+>P : P
+}
+
+type DeepReadonly<T> = {
+>DeepReadonly : DeepReadonly<T>
+>T : T
+
+    readonly [P in keyof T]: DeepReadonly<T[P]>;
+>P : P
+>T : T
+>DeepReadonly : DeepReadonly<T>
+>T : T
+>P : P
+
+};
+
+declare function assign<T>(obj: T, props: Partial<T>): void;
+>assign : <T>(obj: T, props: Partial<T>) => void
+>T : T
+>obj : T
+>T : T
+>props : Partial<T>
+>Partial : Partial<T>
+>T : T
+
+declare function freeze<T>(obj: T): Readonly<T>;
+>freeze : <T>(obj: T) => Readonly<T>
+>T : T
+>obj : T
+>T : T
+>Readonly : Readonly<T>
+>T : T
+
+declare function pick<T, K extends keyof T>(obj: T, ...keys: K[]): Pick<T, K>;
+>pick : <T, K extends keyof T>(obj: T, ...keys: K[]) => Pick<T, K>
+>T : T
+>K : K
+>T : T
+>obj : T
+>T : T
+>keys : K[]
+>K : K
+>Pick : Pick<T, K>
+>T : T
+>K : K
+
+declare function mapObject<K extends string | number, T, U>(obj: Record<K, T>, f: (x: T) => U): Record<K, U>;
+>mapObject : <K extends string | number, T, U>(obj: Record<K, T>, f: (x: T) => U) => Record<K, U>
+>K : K
+>T : T
+>U : U
+>obj : Record<K, T>
+>Record : Record<K, T>
+>K : K
+>T : T
+>f : (x: T) => U
+>x : T
+>T : T
+>U : U
+>Record : Record<K, T>
+>K : K
+>U : U
+
+declare function proxify<T>(obj: T): Proxify<T>;
+>proxify : <T>(obj: T) => Proxify<T>
+>T : T
+>obj : T
+>T : T
+>Proxify : Proxify<T>
+>T : T
+
+interface Shape {
+>Shape : Shape
+
+    name: string;
+>name : string
+
+    width: number;
+>width : number
+
+    height: number;
+>height : number
+
+    visible: boolean;
+>visible : boolean
+}
+
+interface PartialShape {
+>PartialShape : PartialShape
+
+    name?: string;
+>name : string | undefined
+
+    width?: number;
+>width : number | undefined
+
+    height?: number;
+>height : number | undefined
+
+    visible?: boolean;
+>visible : boolean | undefined
+}
+
+interface ReadonlyShape {
+>ReadonlyShape : ReadonlyShape
+
+    readonly name: string;
+>name : string
+
+    readonly width: number;
+>width : number
+
+    readonly height: number;
+>height : number
+
+    readonly visible: boolean;
+>visible : boolean
+}
+
+function f0(s1: Shape, s2: Shape) {
+>f0 : (s1: Shape, s2: Shape) => void
+>s1 : Shape
+>Shape : Shape
+>s2 : Shape
+>Shape : Shape
+
+    assign(s1, { name: "circle" });
+>assign(s1, { name: "circle" }) : void
+>assign : <T>(obj: T, props: Partial<T>) => void
+>s1 : Shape
+>{ name: "circle" } : { name: string; }
+>name : string
+>"circle" : "circle"
+
+    assign(s2, { width: 10, height: 20 });
+>assign(s2, { width: 10, height: 20 }) : void
+>assign : <T>(obj: T, props: Partial<T>) => void
+>s2 : Shape
+>{ width: 10, height: 20 } : { width: number; height: number; }
+>width : number
+>10 : 10
+>height : number
+>20 : 20
+}
+
+function f1(shape: Shape) {
+>f1 : (shape: Shape) => void
+>shape : Shape
+>Shape : Shape
+
+    var frozen: ReadonlyShape;
+>frozen : ReadonlyShape
+>ReadonlyShape : ReadonlyShape
+
+    var frozen: Readonly<Shape>;
+>frozen : ReadonlyShape
+>Readonly : Readonly<T>
+>Shape : Shape
+
+    var frozen = freeze(shape);
+>frozen : ReadonlyShape
+>freeze(shape) : Readonly<Shape>
+>freeze : <T>(obj: T) => Readonly<T>
+>shape : Shape
+}
+
+function f2(shape: Shape) {
+>f2 : (shape: Shape) => void
+>shape : Shape
+>Shape : Shape
+
+    var partial: PartialShape;
+>partial : PartialShape
+>PartialShape : PartialShape
+
+    var partial: Partial<Shape>;
+>partial : PartialShape
+>Partial : Partial<T>
+>Shape : Shape
+
+    var partial: Partial<Shape> = {};
+>partial : PartialShape
+>Partial : Partial<T>
+>Shape : Shape
+>{} : {}
+}
+
+function f3(shape: Shape) {
+>f3 : (shape: Shape) => void
+>shape : Shape
+>Shape : Shape
+
+    const x = pick(shape, "name", "visible");  // { name: string, visible: boolean }
+>x : Pick<Shape, "name" | "visible">
+>pick(shape, "name", "visible") : Pick<Shape, "name" | "visible">
+>pick : <T, K extends keyof T>(obj: T, ...keys: K[]) => Pick<T, K>
+>shape : Shape
+>"name" : "name"
+>"visible" : "visible"
+}
+
+function f4() {
+>f4 : () => void
+
+    const rec = { foo: "hello", bar: "world", baz: "bye" };
+>rec : { foo: string; bar: string; baz: string; }
+>{ foo: "hello", bar: "world", baz: "bye" } : { foo: string; bar: string; baz: string; }
+>foo : string
+>"hello" : "hello"
+>bar : string
+>"world" : "world"
+>baz : string
+>"bye" : "bye"
+
+    const lengths = mapObject(rec, s => s.length);  // { foo: number, bar: number, baz: number }
+>lengths : Record<"foo" | "bar" | "baz", number>
+>mapObject(rec, s => s.length) : Record<"foo" | "bar" | "baz", number>
+>mapObject : <K extends string | number, T, U>(obj: Record<K, T>, f: (x: T) => U) => Record<K, U>
+>rec : { foo: string; bar: string; baz: string; }
+>s => s.length : (s: string) => number
+>s : string
+>s.length : number
+>s : string
+>length : number
+}
+
+function f5(shape: Shape) {
+>f5 : (shape: Shape) => void
+>shape : Shape
+>Shape : Shape
+
+    const p = proxify(shape);
+>p : Proxify<Shape>
+>proxify(shape) : Proxify<Shape>
+>proxify : <T>(obj: T) => Proxify<T>
+>shape : Shape
+
+    let name = p.name.get();
+>name : string
+>p.name.get() : string
+>p.name.get : () => string
+>p.name : Proxy<string>
+>p : Proxify<Shape>
+>name : Proxy<string>
+>get : () => string
+
+    p.visible.set(false);
+>p.visible.set(false) : void
+>p.visible.set : (value: boolean) => void
+>p.visible : Proxy<boolean>
+>p : Proxify<Shape>
+>visible : Proxy<boolean>
+>set : (value: boolean) => void
+>false : false
+}
+
+function f6(shape: DeepReadonly<Shape>) {
+>f6 : (shape: DeepReadonly<Shape>) => void
+>shape : DeepReadonly<Shape>
+>DeepReadonly : DeepReadonly<T>
+>Shape : Shape
+
+    let name = shape.name;  // DeepReadonly<string>
+>name : DeepReadonly<string>
+>shape.name : DeepReadonly<string>
+>shape : DeepReadonly<Shape>
+>name : DeepReadonly<string>
+
+    let length = name.length;  // DeepReadonly<number>
+>length : DeepReadonly<number>
+>name.length : DeepReadonly<number>
+>name : DeepReadonly<string>
+>length : DeepReadonly<number>
+
+    let toString = length.toString;  // DeepReadonly<(radix?: number) => string>
+>toString : DeepReadonly<(radix?: number | undefined) => string>
+>length.toString : DeepReadonly<(radix?: number | undefined) => string>
+>length : DeepReadonly<number>
+>toString : DeepReadonly<(radix?: number | undefined) => string>
+}
diff --git a/tests/baselines/reference/mappedTypes3.js b/tests/baselines/reference/mappedTypes3.js
new file mode 100644
index 00000000000..712822e8728
--- /dev/null
+++ b/tests/baselines/reference/mappedTypes3.js
@@ -0,0 +1,84 @@
+//// [mappedTypes3.ts]
+
+class Box<P> {
+    value: P;
+}
+
+type Boxified<T> = {
+    [K in keyof T]: Box<T[K]>;
+}
+
+declare function boxify<T>(obj: T): Boxified<T>;
+declare function unboxify<T>(obj: Boxified<T>): T;
+
+interface Bacon {
+    isPerfect: boolean;
+    weight: number;
+}
+
+interface BoxifiedBacon {
+    isPerfect: Box<boolean>;
+    weight: Box<number>;
+}
+
+function f1(b: Bacon) {
+    let bb = boxify(b);
+    let isPerfect = bb.isPerfect.value;
+    let weight = bb.weight.value;
+}
+
+function f2(bb: Boxified<Bacon>) {
+    let b = unboxify(bb);  // Infer Bacon for T
+    let bool = b.isPerfect;
+    let weight = b.weight;
+}
+
+function f3(bb: BoxifiedBacon) {
+    let b = unboxify<Bacon>(bb);  // Explicit type parameter required
+    let bool = b.isPerfect;
+    let weight = bb.weight;
+}
+
+//// [mappedTypes3.js]
+var Box = (function () {
+    function Box() {
+    }
+    return Box;
+}());
+function f1(b) {
+    var bb = boxify(b);
+    var isPerfect = bb.isPerfect.value;
+    var weight = bb.weight.value;
+}
+function f2(bb) {
+    var b = unboxify(bb); // Infer Bacon for T
+    var bool = b.isPerfect;
+    var weight = b.weight;
+}
+function f3(bb) {
+    var b = unboxify(bb); // Explicit type parameter required
+    var bool = b.isPerfect;
+    var weight = bb.weight;
+}
+
+
+//// [mappedTypes3.d.ts]
+declare class Box<P> {
+    value: P;
+}
+declare type Boxified<T> = {
+    [K in keyof T]: Box<T[K]>;
+};
+declare function boxify<T>(obj: T): Boxified<T>;
+declare function unboxify<T>(obj: Boxified<T>): T;
+interface Bacon {
+    isPerfect: boolean;
+    weight: number;
+}
+interface BoxifiedBacon {
+    isPerfect: Box<boolean>;
+    weight: Box<number>;
+}
+declare function f1(b: Bacon): void;
+declare function f2(bb: Boxified<Bacon>): void;
+declare function f3(bb: BoxifiedBacon): void;
diff --git a/tests/baselines/reference/mappedTypes3.symbols b/tests/baselines/reference/mappedTypes3.symbols
new file mode 100644
index 00000000000..3d909c8e532
--- /dev/null
+++ b/tests/baselines/reference/mappedTypes3.symbols
@@ -0,0 +1,135 @@
+=== tests/cases/conformance/types/mapped/mappedTypes3.ts ===
+
+class Box<P> {
+>Box : Symbol(Box, Decl(mappedTypes3.ts, 0, 0))
+>P : Symbol(P, Decl(mappedTypes3.ts, 1, 10))
+
+    value: P;
+>value : Symbol(Box.value, Decl(mappedTypes3.ts, 1, 14))
+>P : Symbol(P, Decl(mappedTypes3.ts, 1, 10))
+}
+
+type Boxified<T> = {
+>Boxified : Symbol(Boxified, Decl(mappedTypes3.ts, 3, 1))
+>T : Symbol(T, Decl(mappedTypes3.ts, 5, 14))
+
+    [K in keyof T]: Box<T[K]>;
+>K : Symbol(K, Decl(mappedTypes3.ts, 6, 5))
+>T : Symbol(T, Decl(mappedTypes3.ts, 5, 14))
+>Box : Symbol(Box, Decl(mappedTypes3.ts, 0, 0))
+>T : Symbol(T, Decl(mappedTypes3.ts, 5, 14))
+>K : Symbol(K, Decl(mappedTypes3.ts, 6, 5))
+}
+
+declare function boxify<T>(obj: T): Boxified<T>;
+>boxify : Symbol(boxify, Decl(mappedTypes3.ts, 7, 1))
+>T : Symbol(T, Decl(mappedTypes3.ts, 9, 24))
+>obj : Symbol(obj, Decl(mappedTypes3.ts, 9, 27))
+>T : Symbol(T, Decl(mappedTypes3.ts, 9, 24))
+>Boxified : Symbol(Boxified, Decl(mappedTypes3.ts, 3, 1))
+>T : Symbol(T, Decl(mappedTypes3.ts, 9, 24))
+
+declare function unboxify<T>(obj: Boxified<T>): T;
+>unboxify : Symbol(unboxify, Decl(mappedTypes3.ts, 9, 48))
+>T : Symbol(T, Decl(mappedTypes3.ts, 10, 26))
+>obj : Symbol(obj, Decl(mappedTypes3.ts, 10, 29))
+>Boxified : Symbol(Boxified, Decl(mappedTypes3.ts, 3, 1))
+>T : Symbol(T, Decl(mappedTypes3.ts, 10, 26))
+>T : Symbol(T, Decl(mappedTypes3.ts, 10, 26))
+
+interface Bacon {
+>Bacon : Symbol(Bacon, Decl(mappedTypes3.ts, 10, 50))
+
+    isPerfect: boolean;
+>isPerfect : Symbol(Bacon.isPerfect, Decl(mappedTypes3.ts, 12, 17))
+
+    weight: number;
+>weight : Symbol(Bacon.weight, Decl(mappedTypes3.ts, 13, 23))
+}
+
+interface BoxifiedBacon {
+>BoxifiedBacon : Symbol(BoxifiedBacon, Decl(mappedTypes3.ts, 15, 1))
+
+    isPerfect: Box<boolean>;
+>isPerfect : Symbol(BoxifiedBacon.isPerfect, Decl(mappedTypes3.ts, 17, 25))
+>Box : Symbol(Box, Decl(mappedTypes3.ts, 0, 0))
+
+    weight: Box<number>;
+>weight : Symbol(BoxifiedBacon.weight, Decl(mappedTypes3.ts, 18, 28))
+>Box : Symbol(Box, Decl(mappedTypes3.ts, 0, 0))
+}
+
+function f1(b: Bacon) {
+>f1 : Symbol(f1, Decl(mappedTypes3.ts, 20, 1))
+>b : Symbol(b, Decl(mappedTypes3.ts, 22, 12))
+>Bacon : Symbol(Bacon, Decl(mappedTypes3.ts, 10, 50))
+
+    let bb = boxify(b);
+>bb : Symbol(bb, Decl(mappedTypes3.ts, 23, 7))
+>boxify : Symbol(boxify, Decl(mappedTypes3.ts, 7, 1))
+>b : Symbol(b, Decl(mappedTypes3.ts, 22, 12))
+
+    let isPerfect = bb.isPerfect.value;
+>isPerfect : Symbol(isPerfect, Decl(mappedTypes3.ts, 24, 7))
+>bb.isPerfect.value : Symbol(Box.value, Decl(mappedTypes3.ts, 1, 14))
+>bb.isPerfect : Symbol(isPerfect)
+>bb : Symbol(bb, Decl(mappedTypes3.ts, 23, 7))
+>isPerfect : Symbol(isPerfect)
+>value : Symbol(Box.value, Decl(mappedTypes3.ts, 1, 14))
+
+    let weight = bb.weight.value;
+>weight : Symbol(weight, Decl(mappedTypes3.ts, 25, 7))
+>bb.weight.value : Symbol(Box.value, Decl(mappedTypes3.ts, 1, 14))
+>bb.weight : Symbol(weight)
+>bb : Symbol(bb, Decl(mappedTypes3.ts, 23, 7))
+>weight : Symbol(weight)
+>value : Symbol(Box.value, Decl(mappedTypes3.ts, 1, 14))
+}
+
+function f2(bb: Boxified<Bacon>) {
+>f2 : Symbol(f2, Decl(mappedTypes3.ts, 26, 1))
+>bb : Symbol(bb, Decl(mappedTypes3.ts, 28, 12))
+>Boxified : Symbol(Boxified, Decl(mappedTypes3.ts, 3, 1))
+>Bacon : Symbol(Bacon, Decl(mappedTypes3.ts, 10, 50))
+
+    let b = unboxify(bb);  // Infer Bacon for T
+>b : Symbol(b, Decl(mappedTypes3.ts, 29, 7))
+>unboxify : Symbol(unboxify, Decl(mappedTypes3.ts, 9, 48))
+>bb : Symbol(bb, Decl(mappedTypes3.ts, 28, 12))
+
+    let bool = b.isPerfect;
+>bool : Symbol(bool, Decl(mappedTypes3.ts, 30, 7))
+>b.isPerfect : Symbol(Bacon.isPerfect, Decl(mappedTypes3.ts, 12, 17))
+>b : Symbol(b, Decl(mappedTypes3.ts, 29, 7))
+>isPerfect : Symbol(Bacon.isPerfect, Decl(mappedTypes3.ts, 12, 17))
+
+    let weight = b.weight;
+>weight : Symbol(weight, Decl(mappedTypes3.ts, 31, 7))
+>b.weight : Symbol(Bacon.weight, Decl(mappedTypes3.ts, 13, 23))
+>b : Symbol(b, Decl(mappedTypes3.ts, 29, 7))
+>weight : Symbol(Bacon.weight, Decl(mappedTypes3.ts, 13, 23))
+}
+
+function f3(bb: BoxifiedBacon) {
+>f3 : Symbol(f3, Decl(mappedTypes3.ts, 32, 1))
+>bb : Symbol(bb, Decl(mappedTypes3.ts, 34, 12))
+>BoxifiedBacon : Symbol(BoxifiedBacon, Decl(mappedTypes3.ts, 15, 1))
+
+    let b = unboxify<Bacon>(bb);  // Explicit type parameter required
+>b : Symbol(b, Decl(mappedTypes3.ts, 35, 7))
+>unboxify : Symbol(unboxify, Decl(mappedTypes3.ts, 9, 48))
+>Bacon : Symbol(Bacon, Decl(mappedTypes3.ts, 10, 50))
+>bb : Symbol(bb, Decl(mappedTypes3.ts, 34, 12))
+
+    let bool = b.isPerfect;
+>bool : Symbol(bool, Decl(mappedTypes3.ts, 36, 7))
+>b.isPerfect : Symbol(Bacon.isPerfect, Decl(mappedTypes3.ts, 12, 17))
+>b : Symbol(b, Decl(mappedTypes3.ts, 35, 7))
+>isPerfect : Symbol(Bacon.isPerfect, Decl(mappedTypes3.ts, 12, 17))
+
+    let weight = bb.weight;
+>weight : Symbol(weight, Decl(mappedTypes3.ts, 37, 7))
+>bb.weight : Symbol(BoxifiedBacon.weight, Decl(mappedTypes3.ts, 18, 28))
+>bb : Symbol(bb, Decl(mappedTypes3.ts, 34, 12))
+>weight : Symbol(BoxifiedBacon.weight, Decl(mappedTypes3.ts, 18, 28))
+}
diff --git a/tests/baselines/reference/mappedTypes3.types b/tests/baselines/reference/mappedTypes3.types
new file mode 100644
index 00000000000..36471938d75
--- /dev/null
+++ b/tests/baselines/reference/mappedTypes3.types
@@ -0,0 +1,138 @@
+=== tests/cases/conformance/types/mapped/mappedTypes3.ts ===
+
+class Box<P> {
+>Box : Box<P>
+>P : P
+
+    value: P;
+>value : P
+>P : P
+}
+
+type Boxified<T> = {
+>Boxified : Boxified<T>
+>T : T
+
+    [K in keyof T]: Box<T[K]>;
+>K : K
+>T : T
+>Box : Box<P>
+>T : T
+>K : K
+}
+
+declare function boxify<T>(obj: T): Boxified<T>;
+>boxify : <T>(obj: T) => Boxified<T>
+>T : T
+>obj : T
+>T : T
+>Boxified : Boxified<T>
+>T : T
+
+declare function unboxify<T>(obj: Boxified<T>): T;
+>unboxify : <T>(obj: Boxified<T>) => T
+>T : T
+>obj : Boxified<T>
+>Boxified : Boxified<T>
+>T : T
+>T : T
+
+interface Bacon {
+>Bacon : Bacon
+
+    isPerfect: boolean;
+>isPerfect : boolean
+
+    weight: number;
+>weight : number
+}
+
+interface BoxifiedBacon {
+>BoxifiedBacon : BoxifiedBacon
+
+    isPerfect: Box<boolean>;
+>isPerfect : Box<boolean>
+>Box : Box<P>
+
+    weight: Box<number>;
+>weight : Box<number>
+>Box : Box<P>
+}
+
+function f1(b: Bacon) {
+>f1 : (b: Bacon) => void
+>b : Bacon
+>Bacon : Bacon
+
+    let bb = boxify(b);
+>bb : Boxified<Bacon>
+>boxify(b) : Boxified<Bacon>
+>boxify : <T>(obj: T) => Boxified<T>
+>b : Bacon
+
+    let isPerfect = bb.isPerfect.value;
+>isPerfect : boolean
+>bb.isPerfect.value : boolean
+>bb.isPerfect : Box<boolean>
+>bb : Boxified<Bacon>
+>isPerfect : Box<boolean>
+>value : boolean
+
+    let weight = bb.weight.value;
+>weight : number
+>bb.weight.value : number
+>bb.weight : Box<number>
+>bb : Boxified<Bacon>
+>weight : Box<number>
+>value : number
+}
+
+function f2(bb: Boxified<Bacon>) {
+>f2 : (bb: Boxified<Bacon>) => void
+>bb : Boxified<Bacon>
+>Boxified : Boxified<T>
+>Bacon : Bacon
+
+    let b = unboxify(bb);  // Infer Bacon for T
+>b : Bacon
+>unboxify(bb) : Bacon
+>unboxify : <T>(obj: Boxified<T>) => T
+>bb : Boxified<Bacon>
+
+    let bool = b.isPerfect;
+>bool : boolean
+>b.isPerfect : boolean
+>b : Bacon
+>isPerfect : boolean
+
+    let weight = b.weight;
+>weight : number
+>b.weight : number
+>b : Bacon
+>weight : number
+}
+
+function f3(bb: BoxifiedBacon) {
+>f3 : (bb: BoxifiedBacon) => void
+>bb : BoxifiedBacon
+>BoxifiedBacon : BoxifiedBacon
+
+    let b = unboxify<Bacon>(bb);  // Explicit type parameter required
+>b : Bacon
+>unboxify<Bacon>(bb) : Bacon
+>unboxify : <T>(obj: Boxified<T>) => T
+>Bacon : Bacon
+>bb : BoxifiedBacon
+
+    let bool = b.isPerfect;
+>bool : boolean
+>b.isPerfect : boolean
+>b : Bacon
+>isPerfect : boolean
+
+    let weight = bb.weight;
+>weight : Box<number>
+>bb.weight : Box<number>
+>bb : BoxifiedBacon
+>weight : Box<number>
+}
diff --git a/tests/cases/conformance/types/mapped/mappedTypes1.ts b/tests/cases/conformance/types/mapped/mappedTypes1.ts
new file mode 100644
index 00000000000..f57a14a2e10
--- /dev/null
+++ b/tests/cases/conformance/types/mapped/mappedTypes1.ts
@@ -0,0 +1,35 @@
+// @strictNullChecks: true
+// @declaration: true
+
+type Item = { a: string, b: number, c: boolean };
+
+type T00 = { [P in "x" | "y"]: number };
+type T01 = { [P in "x" | "y"]: P };
+type T02 = { [P in "a" | "b"]: Item[P]; }
+type T03 = { [P in keyof Item]: Date };
+
+type T10 = { [P in keyof Item]: Item[P] };
+type T11 = { [P in keyof Item]?: Item[P] };
+type T12 = { readonly [P in keyof Item]: Item[P] };
+type T13 = { readonly [P in keyof Item]?: Item[P] };
+
+type T20 = { [P in keyof Item]: Item[P] | null };
+type T21 = { [P in keyof Item]: Array<Item[P]> };
+
+type T30 = { [P in keyof any]: void };
+type T31 = { [P in keyof string]: void };
+type T32 = { [P in keyof number]: void };
+type T33 = { [P in keyof boolean]: void };
+type T34 = { [P in keyof undefined]: void };
+type T35 = { [P in keyof null]: void };
+type T36 = { [P in keyof void]: void };
+type T37 = { [P in keyof symbol]: void };
+type T38 = { [P in keyof never]: void };
+
+declare function f1<T1>(): { [P in keyof T1]: void };
+declare function f2<T1 extends string>(): { [P in keyof T1]: void };
+declare function f3<T1 extends number>(): { [P in keyof T1]: void };
+
+let x1 = f1();
+let x2 = f2();
+let x3 = f3();
\ No newline at end of file
diff --git a/tests/cases/conformance/types/mapped/mappedTypes2.ts b/tests/cases/conformance/types/mapped/mappedTypes2.ts
new file mode 100644
index 00000000000..84bffe2ea17
--- /dev/null
+++ b/tests/cases/conformance/types/mapped/mappedTypes2.ts
@@ -0,0 +1,96 @@
+// @strictNullChecks: true
+// @declaration: true
+
+type Partial<T> = {
+    [P in keyof T]?: T[P];
+};
+
+type Readonly<T> = {
+    readonly [P in keyof T]: T[P];
+};
+
+type Pick<T, K extends keyof T> = {
+    [P in K]: T[P];
+}
+
+type Record<K extends string | number, T> = {
+    [_ in K]: T;
+}
+
+type Proxy<T> = {
+    get(): T;
+    set(value: T): void;
+}
+
+type Proxify<T> = {
+    [P in keyof T]: Proxy<T[P]>;
+}
+
+type DeepReadonly<T> = {
+    readonly [P in keyof T]: DeepReadonly<T[P]>;
+};
+
+declare function assign<T>(obj: T, props: Partial<T>): void;
+declare function freeze<T>(obj: T): Readonly<T>;
+declare function pick<T, K extends keyof T>(obj: T, ...keys: K[]): Pick<T, K>;
+declare function mapObject<K extends string | number, T, U>(obj: Record<K, T>, f: (x: T) => U): Record<K, U>;
+declare function proxify<T>(obj: T): Proxify<T>;
+
+interface Shape {
+    name: string;
+    width: number;
+    height: number;
+    visible: boolean;
+}
+
+interface PartialShape {
+    name?: string;
+    width?: number;
+    height?: number;
+    visible?: boolean;
+}
+
+interface ReadonlyShape {
+    readonly name: string;
+    readonly width: number;
+    readonly height: number;
+    readonly visible: boolean;
+}
+
+function f0(s1: Shape, s2: Shape) {
+    assign(s1, { name: "circle" });
+    assign(s2, { width: 10, height: 20 });
+}
+
+function f1(shape: Shape) {
+    var frozen: ReadonlyShape;
+    var frozen: Readonly<Shape>;
+    var frozen = freeze(shape);
+}
+
+function f2(shape: Shape) {
+    var partial: PartialShape;
+    var partial: Partial<Shape>;
+    var partial: Partial<Shape> = {};
+}
+
+function f3(shape: Shape) {
+    const x = pick(shape, "name", "visible");  // { name: string, visible: boolean }
+}
+
+function f4() {
+    const rec = { foo: "hello", bar: "world", baz: "bye" };
+    const lengths = mapObject(rec, s => s.length);  // { foo: number, bar: number, baz: number }
+}
+
+function f5(shape: Shape) {
+    const p = proxify(shape);
+    let name = p.name.get();
+    p.visible.set(false);
+}
+
+function f6(shape: DeepReadonly<Shape>) {
+    let name = shape.name;  // DeepReadonly<string>
+    let length = name.length;  // DeepReadonly<number>
+    let toString = length.toString;  // DeepReadonly<(radix?: number) => string>
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/types/mapped/mappedTypes3.ts b/tests/cases/conformance/types/mapped/mappedTypes3.ts
new file mode 100644
index 00000000000..bf5a4399b0d
--- /dev/null
+++ b/tests/cases/conformance/types/mapped/mappedTypes3.ts
@@ -0,0 +1,40 @@
+// @declaration: true
+
+class Box<P> {
+    value: P;
+}
+
+type Boxified<T> = {
+    [K in keyof T]: Box<T[K]>;
+}
+
+declare function boxify<T>(obj: T): Boxified<T>;
+declare function unboxify<T>(obj: Boxified<T>): T;
+
+interface Bacon {
+    isPerfect: boolean;
+    weight: number;
+}
+
+interface BoxifiedBacon {
+    isPerfect: Box<boolean>;
+    weight: Box<number>;
+}
+
+function f1(b: Bacon) {
+    let bb = boxify(b);
+    let isPerfect = bb.isPerfect.value;
+    let weight = bb.weight.value;
+}
+
+function f2(bb: Boxified<Bacon>) {
+    let b = unboxify(bb);  // Infer Bacon for T
+    let bool = b.isPerfect;
+    let weight = b.weight;
+}
+
+function f3(bb: BoxifiedBacon) {
+    let b = unboxify<Bacon>(bb);  // Explicit type parameter required
+    let bool = b.isPerfect;
+    let weight = bb.weight;
+}
\ No newline at end of file

From 9b2b2ca19b4b0a3dcc2113b79a20e84cde01877c Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Fri, 11 Nov 2016 08:56:35 -0800
Subject: [PATCH 187/421] Error on non-identifier rest in destructuring
 assignment

---
 src/compiler/checker.ts                    | 7 ++++++-
 src/compiler/diagnosticMessages.json       | 4 ++++
 src/compiler/transformers/destructuring.ts | 5 +++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 7bd8dfae88b..789f2bd8104 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -13941,7 +13941,12 @@ namespace ts {
                     error(name, Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(objectLiteralType), declarationNameToString(name));
                 }
             }
-            else if (property.kind !== SyntaxKind.SpreadAssignment) {
+            else if (property.kind === SyntaxKind.SpreadAssignment) {
+                if (property.expression.kind !== SyntaxKind.Identifier) {
+                    error(property.expression, Diagnostics.An_object_rest_element_must_be_an_identifier);
+                }
+            }
+            else {
                 error(property, Diagnostics.Property_assignment_expected);
             }
         }
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 921c80eec08..ce5e59e509c 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -1991,6 +1991,10 @@
         "category": "Error",
         "code": 2700
     },
+    "An object rest element must be an identifier.": {
+        "category": "Error",
+        "code": 2701
+    },
 
     "Import declaration '{0}' is using private name '{1}'.": {
         "category": "Error",
diff --git a/src/compiler/transformers/destructuring.ts b/src/compiler/transformers/destructuring.ts
index bba09710898..a8c00776741 100644
--- a/src/compiler/transformers/destructuring.ts
+++ b/src/compiler/transformers/destructuring.ts
@@ -328,8 +328,9 @@ namespace ts {
                         bindingElements.push(p);
                     }
                 }
-                else if (i === properties.length - 1 && p.kind === SyntaxKind.SpreadAssignment) {
-                    Debug.assert((p as SpreadAssignment).expression.kind === SyntaxKind.Identifier);
+                else if (i === properties.length - 1 &&
+                         p.kind === SyntaxKind.SpreadAssignment &&
+                         p.expression.kind === SyntaxKind.Identifier) {
                     if (bindingElements.length) {
                         emitRestAssignment(bindingElements, value, location, target);
                         bindingElements = [];

From de9f59a3019030493a49bbf2f32900574ec74591 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Fri, 11 Nov 2016 08:57:11 -0800
Subject: [PATCH 188/421] Test non-identifier rest in destructuring assignment

---
 tests/baselines/reference/objectRestNegative.errors.txt  | 8 +++++++-
 tests/baselines/reference/objectRestNegative.js          | 5 +++++
 tests/cases/conformance/types/rest/objectRestNegative.ts | 3 +++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/tests/baselines/reference/objectRestNegative.errors.txt b/tests/baselines/reference/objectRestNegative.errors.txt
index 1874570da7c..b8144e3209b 100644
--- a/tests/baselines/reference/objectRestNegative.errors.txt
+++ b/tests/baselines/reference/objectRestNegative.errors.txt
@@ -1,9 +1,10 @@
 tests/cases/conformance/types/rest/objectRestNegative.ts(2,10): error TS2462: A rest element must be last in a destructuring pattern
 tests/cases/conformance/types/rest/objectRestNegative.ts(3,31): error TS2462: A rest element must be last in a destructuring pattern
 tests/cases/conformance/types/rest/objectRestNegative.ts(6,17): error TS2700: Rest types may only be created from object types.
+tests/cases/conformance/types/rest/objectRestNegative.ts(11,9): error TS2701: An object rest element must be an identifier.
 
 
-==== tests/cases/conformance/types/rest/objectRestNegative.ts (3 errors) ====
+==== tests/cases/conformance/types/rest/objectRestNegative.ts (4 errors) ====
     let o = { a: 1, b: 'no' };
     var { ...mustBeLast, a } = o;
              ~~~~~~~~~~
@@ -18,4 +19,9 @@ tests/cases/conformance/types/rest/objectRestNegative.ts(6,17): error TS2700: Re
 !!! error TS2700: Rest types may only be created from object types.
         return rest;
     }
+    
+    let rest: { b: string }
+    ({a, ...rest.b + rest.b} = o);
+            ~~~~~~~~~~~~~~~
+!!! error TS2701: An object rest element must be an identifier.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/objectRestNegative.js b/tests/baselines/reference/objectRestNegative.js
index b3b49740762..8692850dbdd 100644
--- a/tests/baselines/reference/objectRestNegative.js
+++ b/tests/baselines/reference/objectRestNegative.js
@@ -7,6 +7,9 @@ function generic<T extends { x, y }>(t: T) {
     let { x, ...rest } = t;
     return rest;
 }
+
+let rest: { b: string }
+({a, ...rest.b + rest.b} = o);
 
 
 //// [objectRestNegative.js]
@@ -25,3 +28,5 @@ function generic(t) {
     var x = t.x, rest = __rest(t, ["x"]);
     return rest;
 }
+var rest;
+(a = o.a, o, o);
diff --git a/tests/cases/conformance/types/rest/objectRestNegative.ts b/tests/cases/conformance/types/rest/objectRestNegative.ts
index 7296f2d274e..75cbe9a55e4 100644
--- a/tests/cases/conformance/types/rest/objectRestNegative.ts
+++ b/tests/cases/conformance/types/rest/objectRestNegative.ts
@@ -6,3 +6,6 @@ function generic<T extends { x, y }>(t: T) {
     let { x, ...rest } = t;
     return rest;
 }
+
+let rest: { b: string }
+({a, ...rest.b + rest.b} = o);

From ca3f79783277beae5b06954cc7bec9463cc6789c Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Fri, 11 Nov 2016 11:00:09 -0800
Subject: [PATCH 189/421] More tests

---
 .../types/mapped/mappedTypeErrors.ts          | 62 +++++++++++++++++++
 .../conformance/types/mapped/mappedTypes1.ts  |  9 +++
 2 files changed, 71 insertions(+)
 create mode 100644 tests/cases/conformance/types/mapped/mappedTypeErrors.ts

diff --git a/tests/cases/conformance/types/mapped/mappedTypeErrors.ts b/tests/cases/conformance/types/mapped/mappedTypeErrors.ts
new file mode 100644
index 00000000000..4017951f7c2
--- /dev/null
+++ b/tests/cases/conformance/types/mapped/mappedTypeErrors.ts
@@ -0,0 +1,62 @@
+// @strictNullChecks: true
+// @declaration: true
+
+type Partial<T> = {
+    [P in keyof T]?: T[P];
+};
+
+type Readonly<T> = {
+    readonly [P in keyof T]: T[P];
+};
+
+type Pick<T, K extends keyof T> = {
+    [P in K]: T[P];
+}
+
+type Record<K extends string | number, T> = {
+    [_ in K]: T;
+}
+
+interface Shape {
+    name: string;
+    width: number;
+    height: number;
+    visible: boolean;
+}
+
+interface Named {
+    name: string;
+}
+
+interface Point {
+    x: number;
+    y: number;
+}
+
+type T00 = { [P in P]: string };  // Error
+type T01 = { [P in Date]: number };  // Error
+type T02 = Record<Date, number>;  // Error
+
+type T10 = Pick<Shape, "name">;
+type T11 = Pick<Shape, "foo">;  // Error
+type T12 = Pick<Shape, "name" | "foo">;  // Error
+type T13 = Pick<Shape, keyof Named>;
+type T14 = Pick<Shape, keyof Point>;  // Error
+type T15 = Pick<Shape, never>;
+type T16 = Pick<Shape, undefined>;
+
+function f1<T>(x: T) {
+    let y: Pick<Shape, T>;  // Error
+}
+
+function f2<T extends string | number>(x: T) {
+    let y: Pick<Shape, T>;  // Error
+}
+
+function f3<T extends keyof Shape>(x: T) {
+    let y: Pick<Shape, T>;
+}
+
+function f4<T extends keyof Named>(x: T) {
+    let y: Pick<Shape, T>;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/types/mapped/mappedTypes1.ts b/tests/cases/conformance/types/mapped/mappedTypes1.ts
index f57a14a2e10..bfc68aaa59d 100644
--- a/tests/cases/conformance/types/mapped/mappedTypes1.ts
+++ b/tests/cases/conformance/types/mapped/mappedTypes1.ts
@@ -26,6 +26,15 @@ type T36 = { [P in keyof void]: void };
 type T37 = { [P in keyof symbol]: void };
 type T38 = { [P in keyof never]: void };
 
+type T40 = { [P in string]: void };
+type T41 = { [P in number]: void };
+type T42 = { [P in string | number]: void };
+type T43 = { [P in "a" | "b" | 0 | 1]: void };
+type T44 = { [P in "a" | "b" | "0" | "1"]: void };
+type T45 = { [P in "a" | "b" | "0" | "1" | 0 | 1]: void };
+type T46 = { [P in number | "a" | "b" | 0 | 1]: void };
+type T47 = { [P in string | number | "a" | "b" | 0 | 1]: void };
+
 declare function f1<T1>(): { [P in keyof T1]: void };
 declare function f2<T1 extends string>(): { [P in keyof T1]: void };
 declare function f3<T1 extends number>(): { [P in keyof T1]: void };

From 5028a44e562c27636c6ad98addc410925e002709 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Fri, 11 Nov 2016 11:00:24 -0800
Subject: [PATCH 190/421] Accept new baselines

---
 .../reference/mappedTypeErrors.errors.txt     | 110 ++++++++++++++++
 tests/baselines/reference/mappedTypeErrors.js | 121 ++++++++++++++++++
 tests/baselines/reference/mappedTypes1.js     |  33 +++++
 .../baselines/reference/mappedTypes1.symbols  |  68 +++++++---
 tests/baselines/reference/mappedTypes1.types  |  32 +++++
 5 files changed, 346 insertions(+), 18 deletions(-)
 create mode 100644 tests/baselines/reference/mappedTypeErrors.errors.txt
 create mode 100644 tests/baselines/reference/mappedTypeErrors.js

diff --git a/tests/baselines/reference/mappedTypeErrors.errors.txt b/tests/baselines/reference/mappedTypeErrors.errors.txt
new file mode 100644
index 00000000000..724ab902fc3
--- /dev/null
+++ b/tests/baselines/reference/mappedTypeErrors.errors.txt
@@ -0,0 +1,110 @@
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(34,20): error TS2313: Type parameter 'P' has a circular constraint.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(35,20): error TS2322: Type 'Date' is not assignable to type 'string | number'.
+  Type 'Date' is not assignable to type 'number'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(36,19): error TS2344: Type 'Date' does not satisfy the constraint 'string | number'.
+  Type 'Date' is not assignable to type 'number'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(39,24): error TS2344: Type '"foo"' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(40,24): error TS2344: Type '"name" | "foo"' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
+  Type '"foo"' is not assignable to type '"name" | "width" | "height" | "visible"'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(42,24): error TS2344: Type '"x" | "y"' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
+  Type '"x"' is not assignable to type '"name" | "width" | "height" | "visible"'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(44,24): error TS2344: Type 'undefined' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(47,24): error TS2344: Type 'T' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
+  Type 'T' is not assignable to type '"visible"'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(51,24): error TS2344: Type 'T' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
+  Type 'string | number' is not assignable to type '"name" | "width" | "height" | "visible"'.
+    Type 'string' is not assignable to type '"name" | "width" | "height" | "visible"'.
+      Type 'T' is not assignable to type '"visible"'.
+        Type 'string | number' is not assignable to type '"visible"'.
+          Type 'string' is not assignable to type '"visible"'.
+
+
+==== tests/cases/conformance/types/mapped/mappedTypeErrors.ts (9 errors) ====
+    
+    type Partial<T> = {
+        [P in keyof T]?: T[P];
+    };
+    
+    type Readonly<T> = {
+        readonly [P in keyof T]: T[P];
+    };
+    
+    type Pick<T, K extends keyof T> = {
+        [P in K]: T[P];
+    }
+    
+    type Record<K extends string | number, T> = {
+        [_ in K]: T;
+    }
+    
+    interface Shape {
+        name: string;
+        width: number;
+        height: number;
+        visible: boolean;
+    }
+    
+    interface Named {
+        name: string;
+    }
+    
+    interface Point {
+        x: number;
+        y: number;
+    }
+    
+    type T00 = { [P in P]: string };  // Error
+                       ~
+!!! error TS2313: Type parameter 'P' has a circular constraint.
+    type T01 = { [P in Date]: number };  // Error
+                       ~~~~
+!!! error TS2322: Type 'Date' is not assignable to type 'string | number'.
+!!! error TS2322:   Type 'Date' is not assignable to type 'number'.
+    type T02 = Record<Date, number>;  // Error
+                      ~~~~
+!!! error TS2344: Type 'Date' does not satisfy the constraint 'string | number'.
+!!! error TS2344:   Type 'Date' is not assignable to type 'number'.
+    
+    type T10 = Pick<Shape, "name">;
+    type T11 = Pick<Shape, "foo">;  // Error
+                           ~~~~~
+!!! error TS2344: Type '"foo"' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
+    type T12 = Pick<Shape, "name" | "foo">;  // Error
+                           ~~~~~~~~~~~~~~
+!!! error TS2344: Type '"name" | "foo"' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
+!!! error TS2344:   Type '"foo"' is not assignable to type '"name" | "width" | "height" | "visible"'.
+    type T13 = Pick<Shape, keyof Named>;
+    type T14 = Pick<Shape, keyof Point>;  // Error
+                           ~~~~~~~~~~~
+!!! error TS2344: Type '"x" | "y"' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
+!!! error TS2344:   Type '"x"' is not assignable to type '"name" | "width" | "height" | "visible"'.
+    type T15 = Pick<Shape, never>;
+    type T16 = Pick<Shape, undefined>;
+                           ~~~~~~~~~
+!!! error TS2344: Type 'undefined' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
+    
+    function f1<T>(x: T) {
+        let y: Pick<Shape, T>;  // Error
+                           ~
+!!! error TS2344: Type 'T' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
+!!! error TS2344:   Type 'T' is not assignable to type '"visible"'.
+    }
+    
+    function f2<T extends string | number>(x: T) {
+        let y: Pick<Shape, T>;  // Error
+                           ~
+!!! error TS2344: Type 'T' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
+!!! error TS2344:   Type 'string | number' is not assignable to type '"name" | "width" | "height" | "visible"'.
+!!! error TS2344:     Type 'string' is not assignable to type '"name" | "width" | "height" | "visible"'.
+!!! error TS2344:       Type 'T' is not assignable to type '"visible"'.
+!!! error TS2344:         Type 'string | number' is not assignable to type '"visible"'.
+!!! error TS2344:           Type 'string' is not assignable to type '"visible"'.
+    }
+    
+    function f3<T extends keyof Shape>(x: T) {
+        let y: Pick<Shape, T>;
+    }
+    
+    function f4<T extends keyof Named>(x: T) {
+        let y: Pick<Shape, T>;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/mappedTypeErrors.js b/tests/baselines/reference/mappedTypeErrors.js
new file mode 100644
index 00000000000..f717f0d02f3
--- /dev/null
+++ b/tests/baselines/reference/mappedTypeErrors.js
@@ -0,0 +1,121 @@
+//// [mappedTypeErrors.ts]
+
+type Partial<T> = {
+    [P in keyof T]?: T[P];
+};
+
+type Readonly<T> = {
+    readonly [P in keyof T]: T[P];
+};
+
+type Pick<T, K extends keyof T> = {
+    [P in K]: T[P];
+}
+
+type Record<K extends string | number, T> = {
+    [_ in K]: T;
+}
+
+interface Shape {
+    name: string;
+    width: number;
+    height: number;
+    visible: boolean;
+}
+
+interface Named {
+    name: string;
+}
+
+interface Point {
+    x: number;
+    y: number;
+}
+
+type T00 = { [P in P]: string };  // Error
+type T01 = { [P in Date]: number };  // Error
+type T02 = Record<Date, number>;  // Error
+
+type T10 = Pick<Shape, "name">;
+type T11 = Pick<Shape, "foo">;  // Error
+type T12 = Pick<Shape, "name" | "foo">;  // Error
+type T13 = Pick<Shape, keyof Named>;
+type T14 = Pick<Shape, keyof Point>;  // Error
+type T15 = Pick<Shape, never>;
+type T16 = Pick<Shape, undefined>;
+
+function f1<T>(x: T) {
+    let y: Pick<Shape, T>;  // Error
+}
+
+function f2<T extends string | number>(x: T) {
+    let y: Pick<Shape, T>;  // Error
+}
+
+function f3<T extends keyof Shape>(x: T) {
+    let y: Pick<Shape, T>;
+}
+
+function f4<T extends keyof Named>(x: T) {
+    let y: Pick<Shape, T>;
+}
+
+//// [mappedTypeErrors.js]
+function f1(x) {
+    var y; // Error
+}
+function f2(x) {
+    var y; // Error
+}
+function f3(x) {
+    var y;
+}
+function f4(x) {
+    var y;
+}
+
+
+//// [mappedTypeErrors.d.ts]
+declare type Partial<T> = {
+    [P in keyof T]?: T[P];
+};
+declare type Readonly<T> = {
+    readonly [P in keyof T]: T[P];
+};
+declare type Pick<T, K extends keyof T> = {
+    [P in K]: T[P];
+};
+declare type Record<K extends string | number, T> = {
+    [_ in K]: T;
+};
+interface Shape {
+    name: string;
+    width: number;
+    height: number;
+    visible: boolean;
+}
+interface Named {
+    name: string;
+}
+interface Point {
+    x: number;
+    y: number;
+}
+declare type T00 = {
+    [P in P]: string;
+};
+declare type T01 = {
+    [P in Date]: number;
+};
+declare type T02 = Record<Date, number>;
+declare type T10 = Pick<Shape, "name">;
+declare type T11 = Pick<Shape, "foo">;
+declare type T12 = Pick<Shape, "name" | "foo">;
+declare type T13 = Pick<Shape, keyof Named>;
+declare type T14 = Pick<Shape, keyof Point>;
+declare type T15 = Pick<Shape, never>;
+declare type T16 = Pick<Shape, undefined>;
+declare function f1<T>(x: T): void;
+declare function f2<T extends string | number>(x: T): void;
+declare function f3<T extends keyof Shape>(x: T): void;
+declare function f4<T extends keyof Named>(x: T): void;
diff --git a/tests/baselines/reference/mappedTypes1.js b/tests/baselines/reference/mappedTypes1.js
index df03a022966..71a8d5abb67 100644
--- a/tests/baselines/reference/mappedTypes1.js
+++ b/tests/baselines/reference/mappedTypes1.js
@@ -25,6 +25,15 @@ type T36 = { [P in keyof void]: void };
 type T37 = { [P in keyof symbol]: void };
 type T38 = { [P in keyof never]: void };
 
+type T40 = { [P in string]: void };
+type T41 = { [P in number]: void };
+type T42 = { [P in string | number]: void };
+type T43 = { [P in "a" | "b" | 0 | 1]: void };
+type T44 = { [P in "a" | "b" | "0" | "1"]: void };
+type T45 = { [P in "a" | "b" | "0" | "1" | 0 | 1]: void };
+type T46 = { [P in number | "a" | "b" | 0 | 1]: void };
+type T47 = { [P in string | number | "a" | "b" | 0 | 1]: void };
+
 declare function f1<T1>(): { [P in keyof T1]: void };
 declare function f2<T1 extends string>(): { [P in keyof T1]: void };
 declare function f3<T1 extends number>(): { [P in keyof T1]: void };
@@ -102,6 +111,30 @@ declare type T37 = {
 declare type T38 = {
     [P in keyof never]: void;
 };
+declare type T40 = {
+    [P in string]: void;
+};
+declare type T41 = {
+    [P in number]: void;
+};
+declare type T42 = {
+    [P in string | number]: void;
+};
+declare type T43 = {
+    [P in "a" | "b" | 0 | 1]: void;
+};
+declare type T44 = {
+    [P in "a" | "b" | "0" | "1"]: void;
+};
+declare type T45 = {
+    [P in "a" | "b" | "0" | "1" | 0 | 1]: void;
+};
+declare type T46 = {
+    [P in number | "a" | "b" | 0 | 1]: void;
+};
+declare type T47 = {
+    [P in string | number | "a" | "b" | 0 | 1]: void;
+};
 declare function f1<T1>(): {
     [P in keyof T1]: void;
 };
diff --git a/tests/baselines/reference/mappedTypes1.symbols b/tests/baselines/reference/mappedTypes1.symbols
index 65732a4be11..908fbb3b0e1 100644
--- a/tests/baselines/reference/mappedTypes1.symbols
+++ b/tests/baselines/reference/mappedTypes1.symbols
@@ -106,33 +106,65 @@ type T38 = { [P in keyof never]: void };
 >T38 : Symbol(T38, Decl(mappedTypes1.ts, 23, 41))
 >P : Symbol(P, Decl(mappedTypes1.ts, 24, 14))
 
+type T40 = { [P in string]: void };
+>T40 : Symbol(T40, Decl(mappedTypes1.ts, 24, 40))
+>P : Symbol(P, Decl(mappedTypes1.ts, 26, 14))
+
+type T41 = { [P in number]: void };
+>T41 : Symbol(T41, Decl(mappedTypes1.ts, 26, 35))
+>P : Symbol(P, Decl(mappedTypes1.ts, 27, 14))
+
+type T42 = { [P in string | number]: void };
+>T42 : Symbol(T42, Decl(mappedTypes1.ts, 27, 35))
+>P : Symbol(P, Decl(mappedTypes1.ts, 28, 14))
+
+type T43 = { [P in "a" | "b" | 0 | 1]: void };
+>T43 : Symbol(T43, Decl(mappedTypes1.ts, 28, 44))
+>P : Symbol(P, Decl(mappedTypes1.ts, 29, 14))
+
+type T44 = { [P in "a" | "b" | "0" | "1"]: void };
+>T44 : Symbol(T44, Decl(mappedTypes1.ts, 29, 46))
+>P : Symbol(P, Decl(mappedTypes1.ts, 30, 14))
+
+type T45 = { [P in "a" | "b" | "0" | "1" | 0 | 1]: void };
+>T45 : Symbol(T45, Decl(mappedTypes1.ts, 30, 50))
+>P : Symbol(P, Decl(mappedTypes1.ts, 31, 14))
+
+type T46 = { [P in number | "a" | "b" | 0 | 1]: void };
+>T46 : Symbol(T46, Decl(mappedTypes1.ts, 31, 58))
+>P : Symbol(P, Decl(mappedTypes1.ts, 32, 14))
+
+type T47 = { [P in string | number | "a" | "b" | 0 | 1]: void };
+>T47 : Symbol(T47, Decl(mappedTypes1.ts, 32, 55))
+>P : Symbol(P, Decl(mappedTypes1.ts, 33, 14))
+
 declare function f1<T1>(): { [P in keyof T1]: void };
->f1 : Symbol(f1, Decl(mappedTypes1.ts, 24, 40))
->T1 : Symbol(T1, Decl(mappedTypes1.ts, 26, 20))
->P : Symbol(P, Decl(mappedTypes1.ts, 26, 30))
->T1 : Symbol(T1, Decl(mappedTypes1.ts, 26, 20))
+>f1 : Symbol(f1, Decl(mappedTypes1.ts, 33, 64))
+>T1 : Symbol(T1, Decl(mappedTypes1.ts, 35, 20))
+>P : Symbol(P, Decl(mappedTypes1.ts, 35, 30))
+>T1 : Symbol(T1, Decl(mappedTypes1.ts, 35, 20))
 
 declare function f2<T1 extends string>(): { [P in keyof T1]: void };
->f2 : Symbol(f2, Decl(mappedTypes1.ts, 26, 53))
->T1 : Symbol(T1, Decl(mappedTypes1.ts, 27, 20))
->P : Symbol(P, Decl(mappedTypes1.ts, 27, 45))
->T1 : Symbol(T1, Decl(mappedTypes1.ts, 27, 20))
+>f2 : Symbol(f2, Decl(mappedTypes1.ts, 35, 53))
+>T1 : Symbol(T1, Decl(mappedTypes1.ts, 36, 20))
+>P : Symbol(P, Decl(mappedTypes1.ts, 36, 45))
+>T1 : Symbol(T1, Decl(mappedTypes1.ts, 36, 20))
 
 declare function f3<T1 extends number>(): { [P in keyof T1]: void };
->f3 : Symbol(f3, Decl(mappedTypes1.ts, 27, 68))
->T1 : Symbol(T1, Decl(mappedTypes1.ts, 28, 20))
->P : Symbol(P, Decl(mappedTypes1.ts, 28, 45))
->T1 : Symbol(T1, Decl(mappedTypes1.ts, 28, 20))
+>f3 : Symbol(f3, Decl(mappedTypes1.ts, 36, 68))
+>T1 : Symbol(T1, Decl(mappedTypes1.ts, 37, 20))
+>P : Symbol(P, Decl(mappedTypes1.ts, 37, 45))
+>T1 : Symbol(T1, Decl(mappedTypes1.ts, 37, 20))
 
 let x1 = f1();
->x1 : Symbol(x1, Decl(mappedTypes1.ts, 30, 3))
->f1 : Symbol(f1, Decl(mappedTypes1.ts, 24, 40))
+>x1 : Symbol(x1, Decl(mappedTypes1.ts, 39, 3))
+>f1 : Symbol(f1, Decl(mappedTypes1.ts, 33, 64))
 
 let x2 = f2();
->x2 : Symbol(x2, Decl(mappedTypes1.ts, 31, 3))
->f2 : Symbol(f2, Decl(mappedTypes1.ts, 26, 53))
+>x2 : Symbol(x2, Decl(mappedTypes1.ts, 40, 3))
+>f2 : Symbol(f2, Decl(mappedTypes1.ts, 35, 53))
 
 let x3 = f3();
->x3 : Symbol(x3, Decl(mappedTypes1.ts, 32, 3))
->f3 : Symbol(f3, Decl(mappedTypes1.ts, 27, 68))
+>x3 : Symbol(x3, Decl(mappedTypes1.ts, 41, 3))
+>f3 : Symbol(f3, Decl(mappedTypes1.ts, 36, 68))
 
diff --git a/tests/baselines/reference/mappedTypes1.types b/tests/baselines/reference/mappedTypes1.types
index 222291b008b..06aeaa89621 100644
--- a/tests/baselines/reference/mappedTypes1.types
+++ b/tests/baselines/reference/mappedTypes1.types
@@ -108,6 +108,38 @@ type T38 = { [P in keyof never]: void };
 >T38 : T38
 >P : P
 
+type T40 = { [P in string]: void };
+>T40 : T40
+>P : P
+
+type T41 = { [P in number]: void };
+>T41 : T41
+>P : P
+
+type T42 = { [P in string | number]: void };
+>T42 : T42
+>P : P
+
+type T43 = { [P in "a" | "b" | 0 | 1]: void };
+>T43 : T43
+>P : P
+
+type T44 = { [P in "a" | "b" | "0" | "1"]: void };
+>T44 : T44
+>P : P
+
+type T45 = { [P in "a" | "b" | "0" | "1" | 0 | 1]: void };
+>T45 : T45
+>P : P
+
+type T46 = { [P in number | "a" | "b" | 0 | 1]: void };
+>T46 : T46
+>P : P
+
+type T47 = { [P in string | number | "a" | "b" | 0 | 1]: void };
+>T47 : T47
+>P : P
+
 declare function f1<T1>(): { [P in keyof T1]: void };
 >f1 : <T1>() => { [P in keyof T1]: void; }
 >T1 : T1

From 8308ab34d81650d3a12474849215044d94884f8e Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Fri, 28 Oct 2016 14:15:15 -0700
Subject: [PATCH 191/421] When looking up modules in @types, only look for
 `index.d.ts` and `package.json`.

---
 src/compiler/moduleNameResolver.ts            | 119 +++++++++---------
 src/harness/unittests/moduleResolution.ts     |  24 ----
 .../unittests/tsserverProjectSystem.ts        |  35 ------
 ...NodeModuleJsDepthDefaultsToZero.trace.json |   4 -
 ...thExtensions_withAmbientPresent.trace.json |   4 -
 ...pingBasedModuleResolution3_node.trace.json |   8 --
 ...pingBasedModuleResolution4_node.trace.json |   8 --
 ...pingBasedModuleResolution5_node.trace.json |   8 --
 ...pingBasedModuleResolution7_node.trace.json |   8 --
 ...mMultipleNodeModulesDirectories.trace.json |  81 ------------
 ...romNodeModulesInParentDirectory.trace.json |  18 ---
 .../reference/typingsLookup4.trace.json       |   6 -
 .../reference/typingsLookupAmd.trace.json     |  24 ----
 13 files changed, 56 insertions(+), 291 deletions(-)

diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
index 86e0157d847..b165bca31ce 100644
--- a/src/compiler/moduleNameResolver.ts
+++ b/src/compiler/moduleNameResolver.ts
@@ -62,8 +62,7 @@ namespace ts {
 
     interface ModuleResolutionState {
         host: ModuleResolutionHost;
-        // We only use this subset of the compiler options.
-        compilerOptions: { rootDirs?: string[], baseUrl?: string, paths?: MapLike<string[]> };
+        compilerOptions: CompilerOptions;
         traceEnabled: boolean;
     }
 
@@ -128,7 +127,9 @@ namespace ts {
             currentDirectory = host.getCurrentDirectory();
         }
 
-        return currentDirectory !== undefined && getDefaultTypeRoots(currentDirectory, host);
+        if (currentDirectory !== undefined) {
+            return getDefaultTypeRoots(currentDirectory, host);
+        }
     }
 
     /**
@@ -142,20 +143,12 @@ namespace ts {
         }
 
         let typeRoots: string[];
-
-        while (true) {
-            const atTypes = combinePaths(currentDirectory, nodeModulesAtTypes);
+        forEachAncestorDirectory(currentDirectory, directory => {
+            const atTypes = combinePaths(directory, nodeModulesAtTypes);
             if (host.directoryExists(atTypes)) {
                 (typeRoots || (typeRoots = [])).push(atTypes);
             }
-
-            const parent = getDirectoryPath(currentDirectory);
-            if (parent === currentDirectory) {
-                break;
-            }
-            currentDirectory = parent;
-        }
-
+        });
         return typeRoots;
     }
     const nodeModulesAtTypes = combinePaths("node_modules", "@types");
@@ -233,7 +226,7 @@ namespace ts {
             if (traceEnabled) {
                 trace(host, Diagnostics.Looking_up_in_node_modules_folder_initial_location_0, initialLocationForSecondaryLookup);
             }
-            resolvedFile = resolvedTypeScriptOnly(loadModuleFromNodeModules(Extensions.DtsOnly, typeReferenceDirectiveName, initialLocationForSecondaryLookup, failedLookupLocations, moduleResolutionState, /*checkOneLevel*/ false));
+            resolvedFile = resolvedTypeScriptOnly(loadModuleFromNodeModules(Extensions.DtsOnly, typeReferenceDirectiveName, initialLocationForSecondaryLookup, failedLookupLocations, moduleResolutionState));
             if (traceEnabled) {
                 if (resolvedFile) {
                     trace(host, Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFile, false);
@@ -562,7 +555,7 @@ namespace ts {
                 if (traceEnabled) {
                     trace(host, Diagnostics.Loading_module_0_from_node_modules_folder, moduleName);
                 }
-                const resolved = loadModuleFromNodeModules(extensions, moduleName, containingDirectory, failedLookupLocations, state, /*checkOneLevel*/ false);
+                const resolved = loadModuleFromNodeModules(extensions, moduleName, containingDirectory, failedLookupLocations, state);
                 return resolved && { resolved, isExternalLibraryImport: true };
             }
             else {
@@ -649,7 +642,7 @@ namespace ts {
     }
 
     /** Return the file if it exists. */
-    function tryFile(fileName: string, failedLookupLocation: string[], onlyRecordFailures: boolean, state: ModuleResolutionState): string | undefined {
+    function tryFile(fileName: string, failedLookupLocations: string[], onlyRecordFailures: boolean, state: ModuleResolutionState): string | undefined {
         if (!onlyRecordFailures && state.host.fileExists(fileName)) {
             if (state.traceEnabled) {
                 trace(state.host, Diagnostics.File_0_exist_use_it_as_a_name_resolution_result, fileName);
@@ -660,12 +653,12 @@ namespace ts {
             if (state.traceEnabled) {
                 trace(state.host, Diagnostics.File_0_does_not_exist, fileName);
             }
-            failedLookupLocation.push(fileName);
+            failedLookupLocations.push(fileName);
             return undefined;
         }
     }
 
-    function loadNodeModuleFromDirectory(extensions: Extensions, candidate: string, failedLookupLocation: string[], onlyRecordFailures: boolean, state: ModuleResolutionState): Resolved | undefined {
+    function loadNodeModuleFromDirectory(extensions: Extensions, candidate: string, failedLookupLocations: string[], onlyRecordFailures: boolean, state: ModuleResolutionState): Resolved | undefined {
         const packageJsonPath = pathToPackageJson(candidate);
         const directoryExists = !onlyRecordFailures && directoryProbablyExists(candidate, state.host);
 
@@ -677,12 +670,12 @@ namespace ts {
             if (typesFile) {
                 const onlyRecordFailures = !directoryProbablyExists(getDirectoryPath(typesFile), state.host);
                 // A package.json "typings" may specify an exact filename, or may choose to omit an extension.
-                const fromFile = tryFile(typesFile, failedLookupLocation, onlyRecordFailures, state);
+                const fromFile = tryFile(typesFile, failedLookupLocations, onlyRecordFailures, state);
                 if (fromFile) {
                     // Note: this would allow a package.json to specify a ".js" file as typings. Maybe that should be forbidden.
                     return resolvedFromAnyFile(fromFile);
                 }
-                const x = tryAddingExtensions(typesFile, Extensions.TypeScript, failedLookupLocation, onlyRecordFailures, state);
+                const x = tryAddingExtensions(typesFile, Extensions.TypeScript, failedLookupLocations, onlyRecordFailures, state);
                 if (x) {
                     return x;
                 }
@@ -698,10 +691,10 @@ namespace ts {
                 trace(state.host, Diagnostics.File_0_does_not_exist, packageJsonPath);
             }
             // record package json as one of failed lookup locations - in the future if this file will appear it will invalidate resolution results
-            failedLookupLocation.push(packageJsonPath);
+            failedLookupLocations.push(packageJsonPath);
         }
 
-        return loadModuleFromFile(extensions, combinePaths(candidate, "index"), failedLookupLocation, !directoryExists, state);
+        return loadModuleFromFile(extensions, combinePaths(candidate, "index"), failedLookupLocations, !directoryExists, state);
     }
 
     function pathToPackageJson(directory: string): string {
@@ -717,34 +710,30 @@ namespace ts {
             loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state);
     }
 
-    function loadModuleFromNodeModules(extensions: Extensions, moduleName: string, directory: string, failedLookupLocations: string[], state: ModuleResolutionState, checkOneLevel: boolean): Resolved | undefined {
-        return loadModuleFromNodeModulesWorker(extensions, moduleName, directory, failedLookupLocations, state, checkOneLevel, /*typesOnly*/ false);
+    function loadModuleFromNodeModules(extensions: Extensions, moduleName: string, directory: string, failedLookupLocations: string[], state: ModuleResolutionState): Resolved | undefined {
+        return loadModuleFromNodeModulesWorker(extensions, moduleName, directory, failedLookupLocations, state, /*typesOnly*/ false);
     }
     function loadModuleFromNodeModulesAtTypes(moduleName: string, directory: string, failedLookupLocations: string[], state: ModuleResolutionState): Resolved | undefined {
-        return loadModuleFromNodeModulesWorker(Extensions.TypeScript, moduleName, directory, failedLookupLocations, state, /*checkOneLevel*/ false, /*typesOnly*/ true);
+        // Extensions parameter here doesn't actually matter, because typesOnly ensures we're just doing @types lookup, which is always DtsOnly.
+        return loadModuleFromNodeModulesWorker(Extensions.DtsOnly, moduleName, directory, failedLookupLocations, state, /*typesOnly*/ true);
     }
 
-    function loadModuleFromNodeModulesWorker(extensions: Extensions, moduleName: string, directory: string, failedLookupLocations: string[], state: ModuleResolutionState, checkOneLevel: boolean, typesOnly: boolean): Resolved | undefined {
-        directory = normalizeSlashes(directory);
-        while (true) {
-            if (getBaseFileName(directory) !== "node_modules") {
-                const resolved = tryInDirectory();
-                if (resolved) {
-                    return resolved;
-                }
+    function loadModuleFromNodeModulesWorker(extensions: Extensions, moduleName: string, directory: string, failedLookupLocations: string[], state: ModuleResolutionState, typesOnly: boolean): Resolved | undefined {
+        return forEachAncestorDirectory(normalizeSlashes(directory), ancestorDirectory => {
+            if (getBaseFileName(ancestorDirectory) !== "node_modules") {
+                return loadModuleFromNodeModulesOneLevel(extensions, moduleName, ancestorDirectory, failedLookupLocations, state, typesOnly);
             }
+        });
+    }
 
-            const parentPath = getDirectoryPath(directory);
-            if (parentPath === directory || checkOneLevel) {
-                return undefined;
-            }
-
-            directory = parentPath;
+    /** Load a module from a single node_modules directory, but not from any ancestors' node_modules directories. */
+    function loadModuleFromNodeModulesOneLevel(extensions: Extensions, moduleName: string, directory: string, failedLookupLocations: string[], state: ModuleResolutionState, typesOnly = false): Resolved | undefined {
+        const packageResult = typesOnly ? undefined : loadModuleFromNodeModulesFolder(extensions, moduleName, directory, failedLookupLocations, state);
+        if (packageResult) {
+            return packageResult;
         }
-
-        function tryInDirectory(): Resolved | undefined {
-            const packageResult = typesOnly ? undefined : loadModuleFromNodeModulesFolder(extensions, moduleName, directory, failedLookupLocations, state);
-            return packageResult || loadModuleFromNodeModulesFolder(extensions, combinePaths("@types", moduleName), directory, failedLookupLocations, state);
+        if (extensions !== Extensions.JavaScript) {
+            return loadModuleFromNodeModulesFolder(Extensions.DtsOnly, combinePaths("@types", moduleName), directory, failedLookupLocations, state);
         }
     }
 
@@ -764,7 +753,11 @@ namespace ts {
             }
 
             if (moduleHasNonRelativeName(moduleName)) {
-                const resolved = loadModuleFromAncestorDirectories(extensions, moduleName, containingDirectory, failedLookupLocations, state);
+                // Climb up parent directories looking for a module.
+                const resolved = forEachAncestorDirectory(containingDirectory, directory => {
+                    const searchName = normalizePath(combinePaths(directory, moduleName));
+                    return loadModuleFromFile(extensions, searchName, failedLookupLocations, /*onlyRecordFailures*/ false, state);
+                });
                 if (resolved) {
                     return resolved;
                 }
@@ -780,22 +773,6 @@ namespace ts {
         }
     }
 
-    /** Climb up parent directories looking for a module. */
-    function loadModuleFromAncestorDirectories(extensions: Extensions, moduleName: string, containingDirectory: string, failedLookupLocations: string[], state: ModuleResolutionState): Resolved | undefined {
-        while (true) {
-            const searchName = normalizePath(combinePaths(containingDirectory, moduleName));
-            const referencedSourceFile = loadModuleFromFile(extensions, searchName, failedLookupLocations, /*onlyRecordFailures*/ false, state);
-            if (referencedSourceFile) {
-                return referencedSourceFile;
-            }
-            const parentPath = getDirectoryPath(containingDirectory);
-            if (parentPath === containingDirectory) {
-                return undefined;
-            }
-            containingDirectory = parentPath;
-        }
-    }
-
     /**
      * 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.
@@ -808,8 +785,24 @@ namespace ts {
         }
         const state: ModuleResolutionState = { compilerOptions, host, traceEnabled };
         const failedLookupLocations: string[] = [];
-        const resolved = loadModuleFromNodeModules(Extensions.TypeScript, moduleName, globalCache, failedLookupLocations, state, /*checkOneLevel*/ true) ||
-            loadModuleFromNodeModules(Extensions.JavaScript, moduleName, globalCache, failedLookupLocations, state, /*checkOneLevel*/ true);
+        const resolved = loadModuleFromNodeModulesOneLevel(Extensions.DtsOnly, moduleName, globalCache, failedLookupLocations, state);
         return createResolvedModuleWithFailedLookupLocations(resolved, /*isExternalLibraryImport*/ true, failedLookupLocations);
     }
+
+    /** Calls `callback` on `directory` and every ancestor directory it has, returning the first defined result. */
+    function forEachAncestorDirectory<T>(directory: string, callback: (directory: string) => T | undefined): T | undefined {
+        while (true) {
+            const result = callback(directory);
+            if (result !== undefined) {
+                return result;
+            }
+
+            const parentPath = getDirectoryPath(directory);
+            if (parentPath === directory) {
+                return undefined;
+            }
+
+            directory = parentPath;
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/harness/unittests/moduleResolution.ts b/src/harness/unittests/moduleResolution.ts
index 0e391445eba..35313e15308 100644
--- a/src/harness/unittests/moduleResolution.ts
+++ b/src/harness/unittests/moduleResolution.ts
@@ -197,13 +197,9 @@ namespace ts {
                     "/a/b/c/d/node_modules/foo/index.tsx",
                     "/a/b/c/d/node_modules/foo/index.d.ts",
 
-                    "/a/b/c/d/node_modules/@types/foo.ts",
-                    "/a/b/c/d/node_modules/@types/foo.tsx",
                     "/a/b/c/d/node_modules/@types/foo.d.ts",
                     "/a/b/c/d/node_modules/@types/foo/package.json",
 
-                    "/a/b/c/d/node_modules/@types/foo/index.ts",
-                    "/a/b/c/d/node_modules/@types/foo/index.tsx",
                     "/a/b/c/d/node_modules/@types/foo/index.d.ts",
 
                     "/a/b/c/node_modules/foo.ts",
@@ -215,13 +211,9 @@ namespace ts {
                     "/a/b/c/node_modules/foo/index.tsx",
                     "/a/b/c/node_modules/foo/index.d.ts",
 
-                    "/a/b/c/node_modules/@types/foo.ts",
-                    "/a/b/c/node_modules/@types/foo.tsx",
                     "/a/b/c/node_modules/@types/foo.d.ts",
                     "/a/b/c/node_modules/@types/foo/package.json",
 
-                    "/a/b/c/node_modules/@types/foo/index.ts",
-                    "/a/b/c/node_modules/@types/foo/index.tsx",
                     "/a/b/c/node_modules/@types/foo/index.d.ts",
                 ]);
             }
@@ -257,13 +249,9 @@ namespace ts {
                     "/a/node_modules/b/c/node_modules/d/node_modules/foo/index.tsx",
                     "/a/node_modules/b/c/node_modules/d/node_modules/foo/index.d.ts",
 
-                    "/a/node_modules/b/c/node_modules/d/node_modules/@types/foo.ts",
-                    "/a/node_modules/b/c/node_modules/d/node_modules/@types/foo.tsx",
                     "/a/node_modules/b/c/node_modules/d/node_modules/@types/foo.d.ts",
                     "/a/node_modules/b/c/node_modules/d/node_modules/@types/foo/package.json",
 
-                    "/a/node_modules/b/c/node_modules/d/node_modules/@types/foo/index.ts",
-                    "/a/node_modules/b/c/node_modules/d/node_modules/@types/foo/index.tsx",
                     "/a/node_modules/b/c/node_modules/d/node_modules/@types/foo/index.d.ts",
 
                     "/a/node_modules/b/c/node_modules/foo.ts",
@@ -275,13 +263,9 @@ namespace ts {
                     "/a/node_modules/b/c/node_modules/foo/index.tsx",
                     "/a/node_modules/b/c/node_modules/foo/index.d.ts",
 
-                    "/a/node_modules/b/c/node_modules/@types/foo.ts",
-                    "/a/node_modules/b/c/node_modules/@types/foo.tsx",
                     "/a/node_modules/b/c/node_modules/@types/foo.d.ts",
                     "/a/node_modules/b/c/node_modules/@types/foo/package.json",
 
-                    "/a/node_modules/b/c/node_modules/@types/foo/index.ts",
-                    "/a/node_modules/b/c/node_modules/@types/foo/index.tsx",
                     "/a/node_modules/b/c/node_modules/@types/foo/index.d.ts",
 
                     "/a/node_modules/b/node_modules/foo.ts",
@@ -293,13 +277,9 @@ namespace ts {
                     "/a/node_modules/b/node_modules/foo/index.tsx",
                     "/a/node_modules/b/node_modules/foo/index.d.ts",
 
-                    "/a/node_modules/b/node_modules/@types/foo.ts",
-                    "/a/node_modules/b/node_modules/@types/foo.tsx",
                     "/a/node_modules/b/node_modules/@types/foo.d.ts",
                     "/a/node_modules/b/node_modules/@types/foo/package.json",
 
-                    "/a/node_modules/b/node_modules/@types/foo/index.ts",
-                    "/a/node_modules/b/node_modules/@types/foo/index.tsx",
                     "/a/node_modules/b/node_modules/@types/foo/index.d.ts",
 
                     "/a/node_modules/foo.ts",
@@ -709,13 +689,9 @@ import b = require("./moduleB");
                     "/root/folder1/node_modules/file6/index.tsx",
                     "/root/folder1/node_modules/file6/index.d.ts",
 
-                    "/root/folder1/node_modules/@types/file6.ts",
-                    "/root/folder1/node_modules/@types/file6.tsx",
                     "/root/folder1/node_modules/@types/file6.d.ts",
 
                     "/root/folder1/node_modules/@types/file6/package.json",
-                    "/root/folder1/node_modules/@types/file6/index.ts",
-                    "/root/folder1/node_modules/@types/file6/index.tsx",
                     "/root/folder1/node_modules/@types/file6/index.d.ts",
                     // success on /root/node_modules/file6.ts
                 ], /*isExternalLibraryImport*/ true);
diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
index 7986137ca43..9c3c7a4cd5b 100644
--- a/src/harness/unittests/tsserverProjectSystem.ts
+++ b/src/harness/unittests/tsserverProjectSystem.ts
@@ -1662,12 +1662,8 @@ namespace ts.projectSystem {
                 "File '/a/b/node_modules/lib/index.ts' does not exist.",
                 "File '/a/b/node_modules/lib/index.tsx' does not exist.",
                 "File '/a/b/node_modules/lib/index.d.ts' does not exist.",
-                "File '/a/b/node_modules/@types/lib.ts' does not exist.",
-                "File '/a/b/node_modules/@types/lib.tsx' does not exist.",
                 "File '/a/b/node_modules/@types/lib.d.ts' does not exist.",
                 "File '/a/b/node_modules/@types/lib/package.json' does not exist.",
-                "File '/a/b/node_modules/@types/lib/index.ts' does not exist.",
-                "File '/a/b/node_modules/@types/lib/index.tsx' does not exist.",
                 "File '/a/b/node_modules/@types/lib/index.d.ts' does not exist.",
                 "File '/a/node_modules/lib.ts' does not exist.",
                 "File '/a/node_modules/lib.tsx' does not exist.",
@@ -1676,12 +1672,8 @@ namespace ts.projectSystem {
                 "File '/a/node_modules/lib/index.ts' does not exist.",
                 "File '/a/node_modules/lib/index.tsx' does not exist.",
                 "File '/a/node_modules/lib/index.d.ts' does not exist.",
-                "File '/a/node_modules/@types/lib.ts' does not exist.",
-                "File '/a/node_modules/@types/lib.tsx' does not exist.",
                 "File '/a/node_modules/@types/lib.d.ts' does not exist.",
                 "File '/a/node_modules/@types/lib/package.json' does not exist.",
-                "File '/a/node_modules/@types/lib/index.ts' does not exist.",
-                "File '/a/node_modules/@types/lib/index.tsx' does not exist.",
                 "File '/a/node_modules/@types/lib/index.d.ts' does not exist.",
                 "File '/node_modules/lib.ts' does not exist.",
                 "File '/node_modules/lib.tsx' does not exist.",
@@ -1690,12 +1682,8 @@ namespace ts.projectSystem {
                 "File '/node_modules/lib/index.ts' does not exist.",
                 "File '/node_modules/lib/index.tsx' does not exist.",
                 "File '/node_modules/lib/index.d.ts' does not exist.",
-                "File '/node_modules/@types/lib.ts' does not exist.",
-                "File '/node_modules/@types/lib.tsx' does not exist.",
                 "File '/node_modules/@types/lib.d.ts' does not exist.",
                 "File '/node_modules/@types/lib/package.json' does not exist.",
-                "File '/node_modules/@types/lib/index.ts' does not exist.",
-                "File '/node_modules/@types/lib/index.tsx' does not exist.",
                 "File '/node_modules/@types/lib/index.d.ts' does not exist.",
                 "Loading module 'lib' from 'node_modules' folder.",
                 "File '/a/b/node_modules/lib.js' does not exist.",
@@ -1703,46 +1691,23 @@ namespace ts.projectSystem {
                 "File '/a/b/node_modules/lib/package.json' does not exist.",
                 "File '/a/b/node_modules/lib/index.js' does not exist.",
                 "File '/a/b/node_modules/lib/index.jsx' does not exist.",
-                "File '/a/b/node_modules/@types/lib.js' does not exist.",
-                "File '/a/b/node_modules/@types/lib.jsx' does not exist.",
-                "File '/a/b/node_modules/@types/lib/package.json' does not exist.",
-                "File '/a/b/node_modules/@types/lib/index.js' does not exist.",
-                "File '/a/b/node_modules/@types/lib/index.jsx' does not exist.",
                 "File '/a/node_modules/lib.js' does not exist.",
                 "File '/a/node_modules/lib.jsx' does not exist.",
                 "File '/a/node_modules/lib/package.json' does not exist.",
                 "File '/a/node_modules/lib/index.js' does not exist.",
                 "File '/a/node_modules/lib/index.jsx' does not exist.",
-                "File '/a/node_modules/@types/lib.js' does not exist.",
-                "File '/a/node_modules/@types/lib.jsx' does not exist.",
-                "File '/a/node_modules/@types/lib/package.json' does not exist.",
-                "File '/a/node_modules/@types/lib/index.js' does not exist.",
-                "File '/a/node_modules/@types/lib/index.jsx' does not exist.",
                 "File '/node_modules/lib.js' does not exist.",
                 "File '/node_modules/lib.jsx' does not exist.",
                 "File '/node_modules/lib/package.json' does not exist.",
                 "File '/node_modules/lib/index.js' does not exist.",
                 "File '/node_modules/lib/index.jsx' does not exist.",
-                "File '/node_modules/@types/lib.js' does not exist.",
-                "File '/node_modules/@types/lib.jsx' does not exist.",
-                "File '/node_modules/@types/lib/package.json' does not exist.",
-                "File '/node_modules/@types/lib/index.js' does not exist.",
-                "File '/node_modules/@types/lib/index.jsx' does not exist.",
                 "======== Module name 'lib' was not resolved. ========",
                 `Auto discovery for typings is enabled in project '${proj.getProjectName()}'. Running extra resolution pass for module 'lib' using cache location '/a/cache'.`,
-                "File '/a/cache/node_modules/lib.ts' does not exist.",
-                "File '/a/cache/node_modules/lib.tsx' does not exist.",
                 "File '/a/cache/node_modules/lib.d.ts' does not exist.",
                 "File '/a/cache/node_modules/lib/package.json' does not exist.",
-                "File '/a/cache/node_modules/lib/index.ts' does not exist.",
-                "File '/a/cache/node_modules/lib/index.tsx' does not exist.",
                 "File '/a/cache/node_modules/lib/index.d.ts' does not exist.",
-                "File '/a/cache/node_modules/@types/lib.ts' does not exist.",
-                "File '/a/cache/node_modules/@types/lib.tsx' does not exist.",
                 "File '/a/cache/node_modules/@types/lib.d.ts' does not exist.",
                 "File '/a/cache/node_modules/@types/lib/package.json' does not exist.",
-                "File '/a/cache/node_modules/@types/lib/index.ts' does not exist.",
-                "File '/a/cache/node_modules/@types/lib/index.tsx' does not exist.",
                 "File '/a/cache/node_modules/@types/lib/index.d.ts' exist - use it as a name resolution result.",
             ]);
             checkProjectActualFiles(proj, [file1.path, lib.path]);
diff --git a/tests/baselines/reference/maxNodeModuleJsDepthDefaultsToZero.trace.json b/tests/baselines/reference/maxNodeModuleJsDepthDefaultsToZero.trace.json
index 3a9d8c4ea79..f6df1476088 100644
--- a/tests/baselines/reference/maxNodeModuleJsDepthDefaultsToZero.trace.json
+++ b/tests/baselines/reference/maxNodeModuleJsDepthDefaultsToZero.trace.json
@@ -9,12 +9,8 @@
     "File '/node_modules/shortid/index.ts' does not exist.",
     "File '/node_modules/shortid/index.tsx' does not exist.",
     "File '/node_modules/shortid/index.d.ts' does not exist.",
-    "File '/node_modules/@types/shortid.ts' does not exist.",
-    "File '/node_modules/@types/shortid.tsx' does not exist.",
     "File '/node_modules/@types/shortid.d.ts' does not exist.",
     "File '/node_modules/@types/shortid/package.json' does not exist.",
-    "File '/node_modules/@types/shortid/index.ts' does not exist.",
-    "File '/node_modules/@types/shortid/index.tsx' does not exist.",
     "File '/node_modules/@types/shortid/index.d.ts' does not exist.",
     "Loading module 'shortid' from 'node_modules' folder.",
     "File '/node_modules/shortid.js' does not exist.",
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.trace.json b/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.trace.json
index 9c6d96fc190..8d4217a92bd 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.trace.json
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.trace.json
@@ -9,12 +9,8 @@
     "File '/node_modules/js/index.ts' does not exist.",
     "File '/node_modules/js/index.tsx' does not exist.",
     "File '/node_modules/js/index.d.ts' does not exist.",
-    "File '/node_modules/@types/js.ts' does not exist.",
-    "File '/node_modules/@types/js.tsx' does not exist.",
     "File '/node_modules/@types/js.d.ts' does not exist.",
     "File '/node_modules/@types/js/package.json' does not exist.",
-    "File '/node_modules/@types/js/index.ts' does not exist.",
-    "File '/node_modules/@types/js/index.tsx' does not exist.",
     "File '/node_modules/@types/js/index.d.ts' does not exist.",
     "Loading module 'js' from 'node_modules' folder.",
     "File '/node_modules/js.js' does not exist.",
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_node.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution3_node.trace.json
index ab7210d7d02..f468d864eef 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution3_node.trace.json
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_node.trace.json
@@ -33,12 +33,8 @@
     "File 'c:/root/folder2/node_modules/file4/index.ts' does not exist.",
     "File 'c:/root/folder2/node_modules/file4/index.tsx' does not exist.",
     "File 'c:/root/folder2/node_modules/file4/index.d.ts' does not exist.",
-    "File 'c:/root/folder2/node_modules/@types/file4.ts' does not exist.",
-    "File 'c:/root/folder2/node_modules/@types/file4.tsx' does not exist.",
     "File 'c:/root/folder2/node_modules/@types/file4.d.ts' does not exist.",
     "File 'c:/root/folder2/node_modules/@types/file4/package.json' does not exist.",
-    "File 'c:/root/folder2/node_modules/@types/file4/index.ts' does not exist.",
-    "File 'c:/root/folder2/node_modules/@types/file4/index.tsx' does not exist.",
     "File 'c:/root/folder2/node_modules/@types/file4/index.d.ts' does not exist.",
     "File 'c:/root/node_modules/file4.ts' does not exist.",
     "File 'c:/root/node_modules/file4.tsx' does not exist.",
@@ -47,12 +43,8 @@
     "File 'c:/root/node_modules/file4/index.ts' does not exist.",
     "File 'c:/root/node_modules/file4/index.tsx' does not exist.",
     "File 'c:/root/node_modules/file4/index.d.ts' does not exist.",
-    "File 'c:/root/node_modules/@types/file4.ts' does not exist.",
-    "File 'c:/root/node_modules/@types/file4.tsx' does not exist.",
     "File 'c:/root/node_modules/@types/file4.d.ts' does not exist.",
     "File 'c:/root/node_modules/@types/file4/package.json' does not exist.",
-    "File 'c:/root/node_modules/@types/file4/index.ts' does not exist.",
-    "File 'c:/root/node_modules/@types/file4/index.tsx' does not exist.",
     "File 'c:/root/node_modules/@types/file4/index.d.ts' does not exist.",
     "File 'c:/node_modules/file4.ts' does not exist.",
     "File 'c:/node_modules/file4.tsx' does not exist.",
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_node.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution4_node.trace.json
index ab7210d7d02..f468d864eef 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution4_node.trace.json
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_node.trace.json
@@ -33,12 +33,8 @@
     "File 'c:/root/folder2/node_modules/file4/index.ts' does not exist.",
     "File 'c:/root/folder2/node_modules/file4/index.tsx' does not exist.",
     "File 'c:/root/folder2/node_modules/file4/index.d.ts' does not exist.",
-    "File 'c:/root/folder2/node_modules/@types/file4.ts' does not exist.",
-    "File 'c:/root/folder2/node_modules/@types/file4.tsx' does not exist.",
     "File 'c:/root/folder2/node_modules/@types/file4.d.ts' does not exist.",
     "File 'c:/root/folder2/node_modules/@types/file4/package.json' does not exist.",
-    "File 'c:/root/folder2/node_modules/@types/file4/index.ts' does not exist.",
-    "File 'c:/root/folder2/node_modules/@types/file4/index.tsx' does not exist.",
     "File 'c:/root/folder2/node_modules/@types/file4/index.d.ts' does not exist.",
     "File 'c:/root/node_modules/file4.ts' does not exist.",
     "File 'c:/root/node_modules/file4.tsx' does not exist.",
@@ -47,12 +43,8 @@
     "File 'c:/root/node_modules/file4/index.ts' does not exist.",
     "File 'c:/root/node_modules/file4/index.tsx' does not exist.",
     "File 'c:/root/node_modules/file4/index.d.ts' does not exist.",
-    "File 'c:/root/node_modules/@types/file4.ts' does not exist.",
-    "File 'c:/root/node_modules/@types/file4.tsx' does not exist.",
     "File 'c:/root/node_modules/@types/file4.d.ts' does not exist.",
     "File 'c:/root/node_modules/@types/file4/package.json' does not exist.",
-    "File 'c:/root/node_modules/@types/file4/index.ts' does not exist.",
-    "File 'c:/root/node_modules/@types/file4/index.tsx' does not exist.",
     "File 'c:/root/node_modules/@types/file4/index.d.ts' does not exist.",
     "File 'c:/node_modules/file4.ts' does not exist.",
     "File 'c:/node_modules/file4.tsx' does not exist.",
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution5_node.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.trace.json
index 2efeefa24e5..92a98a1067c 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution5_node.trace.json
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.trace.json
@@ -75,12 +75,8 @@
     "File 'c:/root/folder1/node_modules/file4/index.ts' does not exist.",
     "File 'c:/root/folder1/node_modules/file4/index.tsx' does not exist.",
     "File 'c:/root/folder1/node_modules/file4/index.d.ts' does not exist.",
-    "File 'c:/root/folder1/node_modules/@types/file4.ts' does not exist.",
-    "File 'c:/root/folder1/node_modules/@types/file4.tsx' does not exist.",
     "File 'c:/root/folder1/node_modules/@types/file4.d.ts' does not exist.",
     "File 'c:/root/folder1/node_modules/@types/file4/package.json' does not exist.",
-    "File 'c:/root/folder1/node_modules/@types/file4/index.ts' does not exist.",
-    "File 'c:/root/folder1/node_modules/@types/file4/index.tsx' does not exist.",
     "File 'c:/root/folder1/node_modules/@types/file4/index.d.ts' does not exist.",
     "File 'c:/root/node_modules/file4.ts' does not exist.",
     "File 'c:/root/node_modules/file4.tsx' does not exist.",
@@ -89,12 +85,8 @@
     "File 'c:/root/node_modules/file4/index.ts' does not exist.",
     "File 'c:/root/node_modules/file4/index.tsx' does not exist.",
     "File 'c:/root/node_modules/file4/index.d.ts' does not exist.",
-    "File 'c:/root/node_modules/@types/file4.ts' does not exist.",
-    "File 'c:/root/node_modules/@types/file4.tsx' does not exist.",
     "File 'c:/root/node_modules/@types/file4.d.ts' does not exist.",
     "File 'c:/root/node_modules/@types/file4/package.json' does not exist.",
-    "File 'c:/root/node_modules/@types/file4/index.ts' does not exist.",
-    "File 'c:/root/node_modules/@types/file4/index.tsx' does not exist.",
     "File 'c:/root/node_modules/@types/file4/index.d.ts' does not exist.",
     "File 'c:/node_modules/file4.ts' exist - use it as a name resolution result.",
     "Resolving real path for 'c:/node_modules/file4.ts', result 'c:/node_modules/file4.ts'",
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_node.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution7_node.trace.json
index 48633c85e3b..cc33d8d1c37 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution7_node.trace.json
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_node.trace.json
@@ -51,12 +51,8 @@
     "File 'c:/root/src/node_modules/module3/index.ts' does not exist.",
     "File 'c:/root/src/node_modules/module3/index.tsx' does not exist.",
     "File 'c:/root/src/node_modules/module3/index.d.ts' does not exist.",
-    "File 'c:/root/src/node_modules/@types/module3.ts' does not exist.",
-    "File 'c:/root/src/node_modules/@types/module3.tsx' does not exist.",
     "File 'c:/root/src/node_modules/@types/module3.d.ts' does not exist.",
     "File 'c:/root/src/node_modules/@types/module3/package.json' does not exist.",
-    "File 'c:/root/src/node_modules/@types/module3/index.ts' does not exist.",
-    "File 'c:/root/src/node_modules/@types/module3/index.tsx' does not exist.",
     "File 'c:/root/src/node_modules/@types/module3/index.d.ts' does not exist.",
     "File 'c:/root/node_modules/module3.ts' does not exist.",
     "File 'c:/root/node_modules/module3.tsx' does not exist.",
@@ -65,12 +61,8 @@
     "File 'c:/root/node_modules/module3/index.ts' does not exist.",
     "File 'c:/root/node_modules/module3/index.tsx' does not exist.",
     "File 'c:/root/node_modules/module3/index.d.ts' does not exist.",
-    "File 'c:/root/node_modules/@types/module3.ts' does not exist.",
-    "File 'c:/root/node_modules/@types/module3.tsx' does not exist.",
     "File 'c:/root/node_modules/@types/module3.d.ts' does not exist.",
     "File 'c:/root/node_modules/@types/module3/package.json' does not exist.",
-    "File 'c:/root/node_modules/@types/module3/index.ts' does not exist.",
-    "File 'c:/root/node_modules/@types/module3/index.tsx' does not exist.",
     "File 'c:/root/node_modules/@types/module3/index.d.ts' does not exist.",
     "File 'c:/node_modules/module3.ts' does not exist.",
     "File 'c:/node_modules/module3.tsx' does not exist.",
diff --git a/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.trace.json b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.trace.json
index eec78e40192..2befbbde729 100644
--- a/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.trace.json
+++ b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.trace.json
@@ -9,12 +9,8 @@
     "File '/foo/bar/node_modules/xyz/index.ts' does not exist.",
     "File '/foo/bar/node_modules/xyz/index.tsx' does not exist.",
     "File '/foo/bar/node_modules/xyz/index.d.ts' does not exist.",
-    "File '/foo/bar/node_modules/@types/xyz.ts' does not exist.",
-    "File '/foo/bar/node_modules/@types/xyz.tsx' does not exist.",
     "File '/foo/bar/node_modules/@types/xyz.d.ts' does not exist.",
     "File '/foo/bar/node_modules/@types/xyz/package.json' does not exist.",
-    "File '/foo/bar/node_modules/@types/xyz/index.ts' does not exist.",
-    "File '/foo/bar/node_modules/@types/xyz/index.tsx' does not exist.",
     "File '/foo/bar/node_modules/@types/xyz/index.d.ts' does not exist.",
     "File '/foo/node_modules/xyz.ts' does not exist.",
     "File '/foo/node_modules/xyz.tsx' does not exist.",
@@ -23,12 +19,8 @@
     "File '/foo/node_modules/xyz/index.ts' does not exist.",
     "File '/foo/node_modules/xyz/index.tsx' does not exist.",
     "File '/foo/node_modules/xyz/index.d.ts' does not exist.",
-    "File '/foo/node_modules/@types/xyz.ts' does not exist.",
-    "File '/foo/node_modules/@types/xyz.tsx' does not exist.",
     "File '/foo/node_modules/@types/xyz.d.ts' does not exist.",
     "File '/foo/node_modules/@types/xyz/package.json' does not exist.",
-    "File '/foo/node_modules/@types/xyz/index.ts' does not exist.",
-    "File '/foo/node_modules/@types/xyz/index.tsx' does not exist.",
     "File '/foo/node_modules/@types/xyz/index.d.ts' does not exist.",
     "File '/node_modules/xyz.ts' does not exist.",
     "File '/node_modules/xyz.tsx' does not exist.",
@@ -37,12 +29,8 @@
     "File '/node_modules/xyz/index.ts' does not exist.",
     "File '/node_modules/xyz/index.tsx' does not exist.",
     "File '/node_modules/xyz/index.d.ts' does not exist.",
-    "File '/node_modules/@types/xyz.ts' does not exist.",
-    "File '/node_modules/@types/xyz.tsx' does not exist.",
     "File '/node_modules/@types/xyz.d.ts' does not exist.",
     "File '/node_modules/@types/xyz/package.json' does not exist.",
-    "File '/node_modules/@types/xyz/index.ts' does not exist.",
-    "File '/node_modules/@types/xyz/index.tsx' does not exist.",
     "File '/node_modules/@types/xyz/index.d.ts' does not exist.",
     "Loading module 'xyz' from 'node_modules' folder.",
     "File '/foo/bar/node_modules/xyz.js' does not exist.",
@@ -50,31 +38,16 @@
     "File '/foo/bar/node_modules/xyz/package.json' does not exist.",
     "File '/foo/bar/node_modules/xyz/index.js' does not exist.",
     "File '/foo/bar/node_modules/xyz/index.jsx' does not exist.",
-    "File '/foo/bar/node_modules/@types/xyz.js' does not exist.",
-    "File '/foo/bar/node_modules/@types/xyz.jsx' does not exist.",
-    "File '/foo/bar/node_modules/@types/xyz/package.json' does not exist.",
-    "File '/foo/bar/node_modules/@types/xyz/index.js' does not exist.",
-    "File '/foo/bar/node_modules/@types/xyz/index.jsx' does not exist.",
     "File '/foo/node_modules/xyz.js' does not exist.",
     "File '/foo/node_modules/xyz.jsx' does not exist.",
     "File '/foo/node_modules/xyz/package.json' does not exist.",
     "File '/foo/node_modules/xyz/index.js' does not exist.",
     "File '/foo/node_modules/xyz/index.jsx' does not exist.",
-    "File '/foo/node_modules/@types/xyz.js' does not exist.",
-    "File '/foo/node_modules/@types/xyz.jsx' does not exist.",
-    "File '/foo/node_modules/@types/xyz/package.json' does not exist.",
-    "File '/foo/node_modules/@types/xyz/index.js' does not exist.",
-    "File '/foo/node_modules/@types/xyz/index.jsx' does not exist.",
     "File '/node_modules/xyz.js' does not exist.",
     "File '/node_modules/xyz.jsx' does not exist.",
     "File '/node_modules/xyz/package.json' does not exist.",
     "File '/node_modules/xyz/index.js' does not exist.",
     "File '/node_modules/xyz/index.jsx' does not exist.",
-    "File '/node_modules/@types/xyz.js' does not exist.",
-    "File '/node_modules/@types/xyz.jsx' does not exist.",
-    "File '/node_modules/@types/xyz/package.json' does not exist.",
-    "File '/node_modules/@types/xyz/index.js' does not exist.",
-    "File '/node_modules/@types/xyz/index.jsx' does not exist.",
     "======== Module name 'xyz' was not resolved. ========",
     "======== Resolving module 'pdq' from '/foo/bar/a.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
@@ -86,12 +59,8 @@
     "File '/foo/bar/node_modules/pdq/index.ts' does not exist.",
     "File '/foo/bar/node_modules/pdq/index.tsx' does not exist.",
     "File '/foo/bar/node_modules/pdq/index.d.ts' does not exist.",
-    "File '/foo/bar/node_modules/@types/pdq.ts' does not exist.",
-    "File '/foo/bar/node_modules/@types/pdq.tsx' does not exist.",
     "File '/foo/bar/node_modules/@types/pdq.d.ts' does not exist.",
     "File '/foo/bar/node_modules/@types/pdq/package.json' does not exist.",
-    "File '/foo/bar/node_modules/@types/pdq/index.ts' does not exist.",
-    "File '/foo/bar/node_modules/@types/pdq/index.tsx' does not exist.",
     "File '/foo/bar/node_modules/@types/pdq/index.d.ts' does not exist.",
     "File '/foo/node_modules/pdq.ts' does not exist.",
     "File '/foo/node_modules/pdq.tsx' does not exist.",
@@ -100,12 +69,8 @@
     "File '/foo/node_modules/pdq/index.ts' does not exist.",
     "File '/foo/node_modules/pdq/index.tsx' does not exist.",
     "File '/foo/node_modules/pdq/index.d.ts' does not exist.",
-    "File '/foo/node_modules/@types/pdq.ts' does not exist.",
-    "File '/foo/node_modules/@types/pdq.tsx' does not exist.",
     "File '/foo/node_modules/@types/pdq.d.ts' does not exist.",
     "File '/foo/node_modules/@types/pdq/package.json' does not exist.",
-    "File '/foo/node_modules/@types/pdq/index.ts' does not exist.",
-    "File '/foo/node_modules/@types/pdq/index.tsx' does not exist.",
     "File '/foo/node_modules/@types/pdq/index.d.ts' does not exist.",
     "File '/node_modules/pdq.ts' does not exist.",
     "File '/node_modules/pdq.tsx' does not exist.",
@@ -114,12 +79,8 @@
     "File '/node_modules/pdq/index.ts' does not exist.",
     "File '/node_modules/pdq/index.tsx' does not exist.",
     "File '/node_modules/pdq/index.d.ts' does not exist.",
-    "File '/node_modules/@types/pdq.ts' does not exist.",
-    "File '/node_modules/@types/pdq.tsx' does not exist.",
     "File '/node_modules/@types/pdq.d.ts' does not exist.",
     "File '/node_modules/@types/pdq/package.json' does not exist.",
-    "File '/node_modules/@types/pdq/index.ts' does not exist.",
-    "File '/node_modules/@types/pdq/index.tsx' does not exist.",
     "File '/node_modules/@types/pdq/index.d.ts' does not exist.",
     "Loading module 'pdq' from 'node_modules' folder.",
     "File '/foo/bar/node_modules/pdq.js' does not exist.",
@@ -127,31 +88,16 @@
     "File '/foo/bar/node_modules/pdq/package.json' does not exist.",
     "File '/foo/bar/node_modules/pdq/index.js' does not exist.",
     "File '/foo/bar/node_modules/pdq/index.jsx' does not exist.",
-    "File '/foo/bar/node_modules/@types/pdq.js' does not exist.",
-    "File '/foo/bar/node_modules/@types/pdq.jsx' does not exist.",
-    "File '/foo/bar/node_modules/@types/pdq/package.json' does not exist.",
-    "File '/foo/bar/node_modules/@types/pdq/index.js' does not exist.",
-    "File '/foo/bar/node_modules/@types/pdq/index.jsx' does not exist.",
     "File '/foo/node_modules/pdq.js' does not exist.",
     "File '/foo/node_modules/pdq.jsx' does not exist.",
     "File '/foo/node_modules/pdq/package.json' does not exist.",
     "File '/foo/node_modules/pdq/index.js' does not exist.",
     "File '/foo/node_modules/pdq/index.jsx' does not exist.",
-    "File '/foo/node_modules/@types/pdq.js' does not exist.",
-    "File '/foo/node_modules/@types/pdq.jsx' does not exist.",
-    "File '/foo/node_modules/@types/pdq/package.json' does not exist.",
-    "File '/foo/node_modules/@types/pdq/index.js' does not exist.",
-    "File '/foo/node_modules/@types/pdq/index.jsx' does not exist.",
     "File '/node_modules/pdq.js' does not exist.",
     "File '/node_modules/pdq.jsx' does not exist.",
     "File '/node_modules/pdq/package.json' does not exist.",
     "File '/node_modules/pdq/index.js' does not exist.",
     "File '/node_modules/pdq/index.jsx' does not exist.",
-    "File '/node_modules/@types/pdq.js' does not exist.",
-    "File '/node_modules/@types/pdq.jsx' does not exist.",
-    "File '/node_modules/@types/pdq/package.json' does not exist.",
-    "File '/node_modules/@types/pdq/index.js' does not exist.",
-    "File '/node_modules/@types/pdq/index.jsx' does not exist.",
     "======== Module name 'pdq' was not resolved. ========",
     "======== Resolving module 'abc' from '/foo/bar/a.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
@@ -163,12 +109,8 @@
     "File '/foo/bar/node_modules/abc/index.ts' does not exist.",
     "File '/foo/bar/node_modules/abc/index.tsx' does not exist.",
     "File '/foo/bar/node_modules/abc/index.d.ts' does not exist.",
-    "File '/foo/bar/node_modules/@types/abc.ts' does not exist.",
-    "File '/foo/bar/node_modules/@types/abc.tsx' does not exist.",
     "File '/foo/bar/node_modules/@types/abc.d.ts' does not exist.",
     "File '/foo/bar/node_modules/@types/abc/package.json' does not exist.",
-    "File '/foo/bar/node_modules/@types/abc/index.ts' does not exist.",
-    "File '/foo/bar/node_modules/@types/abc/index.tsx' does not exist.",
     "File '/foo/bar/node_modules/@types/abc/index.d.ts' does not exist.",
     "File '/foo/node_modules/abc.ts' does not exist.",
     "File '/foo/node_modules/abc.tsx' does not exist.",
@@ -177,12 +119,8 @@
     "File '/foo/node_modules/abc/index.ts' does not exist.",
     "File '/foo/node_modules/abc/index.tsx' does not exist.",
     "File '/foo/node_modules/abc/index.d.ts' does not exist.",
-    "File '/foo/node_modules/@types/abc.ts' does not exist.",
-    "File '/foo/node_modules/@types/abc.tsx' does not exist.",
     "File '/foo/node_modules/@types/abc.d.ts' does not exist.",
     "File '/foo/node_modules/@types/abc/package.json' does not exist.",
-    "File '/foo/node_modules/@types/abc/index.ts' does not exist.",
-    "File '/foo/node_modules/@types/abc/index.tsx' does not exist.",
     "File '/foo/node_modules/@types/abc/index.d.ts' does not exist.",
     "File '/node_modules/abc.ts' does not exist.",
     "File '/node_modules/abc.tsx' does not exist.",
@@ -191,12 +129,8 @@
     "File '/node_modules/abc/index.ts' does not exist.",
     "File '/node_modules/abc/index.tsx' does not exist.",
     "File '/node_modules/abc/index.d.ts' does not exist.",
-    "File '/node_modules/@types/abc.ts' does not exist.",
-    "File '/node_modules/@types/abc.tsx' does not exist.",
     "File '/node_modules/@types/abc.d.ts' does not exist.",
     "File '/node_modules/@types/abc/package.json' does not exist.",
-    "File '/node_modules/@types/abc/index.ts' does not exist.",
-    "File '/node_modules/@types/abc/index.tsx' does not exist.",
     "File '/node_modules/@types/abc/index.d.ts' does not exist.",
     "Loading module 'abc' from 'node_modules' folder.",
     "File '/foo/bar/node_modules/abc.js' does not exist.",
@@ -204,31 +138,16 @@
     "File '/foo/bar/node_modules/abc/package.json' does not exist.",
     "File '/foo/bar/node_modules/abc/index.js' does not exist.",
     "File '/foo/bar/node_modules/abc/index.jsx' does not exist.",
-    "File '/foo/bar/node_modules/@types/abc.js' does not exist.",
-    "File '/foo/bar/node_modules/@types/abc.jsx' does not exist.",
-    "File '/foo/bar/node_modules/@types/abc/package.json' does not exist.",
-    "File '/foo/bar/node_modules/@types/abc/index.js' does not exist.",
-    "File '/foo/bar/node_modules/@types/abc/index.jsx' does not exist.",
     "File '/foo/node_modules/abc.js' does not exist.",
     "File '/foo/node_modules/abc.jsx' does not exist.",
     "File '/foo/node_modules/abc/package.json' does not exist.",
     "File '/foo/node_modules/abc/index.js' does not exist.",
     "File '/foo/node_modules/abc/index.jsx' does not exist.",
-    "File '/foo/node_modules/@types/abc.js' does not exist.",
-    "File '/foo/node_modules/@types/abc.jsx' does not exist.",
-    "File '/foo/node_modules/@types/abc/package.json' does not exist.",
-    "File '/foo/node_modules/@types/abc/index.js' does not exist.",
-    "File '/foo/node_modules/@types/abc/index.jsx' does not exist.",
     "File '/node_modules/abc.js' does not exist.",
     "File '/node_modules/abc.jsx' does not exist.",
     "File '/node_modules/abc/package.json' does not exist.",
     "File '/node_modules/abc/index.js' does not exist.",
     "File '/node_modules/abc/index.jsx' does not exist.",
-    "File '/node_modules/@types/abc.js' does not exist.",
-    "File '/node_modules/@types/abc.jsx' does not exist.",
-    "File '/node_modules/@types/abc/package.json' does not exist.",
-    "File '/node_modules/@types/abc/index.js' does not exist.",
-    "File '/node_modules/@types/abc/index.jsx' does not exist.",
     "======== Module name 'abc' was not resolved. ========",
     "======== Resolving type reference directive 'grumpy', containing file '/src/__inferred type names__.ts', root directory '/foo/node_modules/@types,/node_modules/@types'. ========",
     "Resolving with primary search path '/foo/node_modules/@types, /node_modules/@types'",
diff --git a/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.trace.json b/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.trace.json
index 4bb62bc255a..421c47d30ec 100644
--- a/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.trace.json
+++ b/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.trace.json
@@ -9,12 +9,8 @@
     "File '/src/node_modules/xyz/index.ts' does not exist.",
     "File '/src/node_modules/xyz/index.tsx' does not exist.",
     "File '/src/node_modules/xyz/index.d.ts' does not exist.",
-    "File '/src/node_modules/@types/xyz.ts' does not exist.",
-    "File '/src/node_modules/@types/xyz.tsx' does not exist.",
     "File '/src/node_modules/@types/xyz.d.ts' does not exist.",
     "File '/src/node_modules/@types/xyz/package.json' does not exist.",
-    "File '/src/node_modules/@types/xyz/index.ts' does not exist.",
-    "File '/src/node_modules/@types/xyz/index.tsx' does not exist.",
     "File '/src/node_modules/@types/xyz/index.d.ts' does not exist.",
     "File '/node_modules/xyz.ts' does not exist.",
     "File '/node_modules/xyz.tsx' does not exist.",
@@ -23,12 +19,8 @@
     "File '/node_modules/xyz/index.ts' does not exist.",
     "File '/node_modules/xyz/index.tsx' does not exist.",
     "File '/node_modules/xyz/index.d.ts' does not exist.",
-    "File '/node_modules/@types/xyz.ts' does not exist.",
-    "File '/node_modules/@types/xyz.tsx' does not exist.",
     "File '/node_modules/@types/xyz.d.ts' does not exist.",
     "File '/node_modules/@types/xyz/package.json' does not exist.",
-    "File '/node_modules/@types/xyz/index.ts' does not exist.",
-    "File '/node_modules/@types/xyz/index.tsx' does not exist.",
     "File '/node_modules/@types/xyz/index.d.ts' does not exist.",
     "Loading module 'xyz' from 'node_modules' folder.",
     "File '/src/node_modules/xyz.js' does not exist.",
@@ -36,21 +28,11 @@
     "File '/src/node_modules/xyz/package.json' does not exist.",
     "File '/src/node_modules/xyz/index.js' does not exist.",
     "File '/src/node_modules/xyz/index.jsx' does not exist.",
-    "File '/src/node_modules/@types/xyz.js' does not exist.",
-    "File '/src/node_modules/@types/xyz.jsx' does not exist.",
-    "File '/src/node_modules/@types/xyz/package.json' does not exist.",
-    "File '/src/node_modules/@types/xyz/index.js' does not exist.",
-    "File '/src/node_modules/@types/xyz/index.jsx' does not exist.",
     "File '/node_modules/xyz.js' does not exist.",
     "File '/node_modules/xyz.jsx' does not exist.",
     "File '/node_modules/xyz/package.json' does not exist.",
     "File '/node_modules/xyz/index.js' does not exist.",
     "File '/node_modules/xyz/index.jsx' does not exist.",
-    "File '/node_modules/@types/xyz.js' does not exist.",
-    "File '/node_modules/@types/xyz.jsx' does not exist.",
-    "File '/node_modules/@types/xyz/package.json' does not exist.",
-    "File '/node_modules/@types/xyz/index.js' does not exist.",
-    "File '/node_modules/@types/xyz/index.jsx' does not exist.",
     "======== Module name 'xyz' was not resolved. ========",
     "======== Resolving type reference directive 'foo', containing file '/src/__inferred type names__.ts', root directory '/node_modules/@types'. ========",
     "Resolving with primary search path '/node_modules/@types'",
diff --git a/tests/baselines/reference/typingsLookup4.trace.json b/tests/baselines/reference/typingsLookup4.trace.json
index bb9d94f43b5..d1c29b1f11b 100644
--- a/tests/baselines/reference/typingsLookup4.trace.json
+++ b/tests/baselines/reference/typingsLookup4.trace.json
@@ -9,8 +9,6 @@
     "File '/node_modules/jquery/index.ts' does not exist.",
     "File '/node_modules/jquery/index.tsx' does not exist.",
     "File '/node_modules/jquery/index.d.ts' does not exist.",
-    "File '/node_modules/@types/jquery.ts' does not exist.",
-    "File '/node_modules/@types/jquery.tsx' does not exist.",
     "File '/node_modules/@types/jquery.d.ts' does not exist.",
     "Found 'package.json' at '/node_modules/@types/jquery/package.json'.",
     "'package.json' has 'typings' field 'jquery.d.ts' that references '/node_modules/@types/jquery/jquery.d.ts'.",
@@ -27,8 +25,6 @@
     "File '/node_modules/kquery/index.ts' does not exist.",
     "File '/node_modules/kquery/index.tsx' does not exist.",
     "File '/node_modules/kquery/index.d.ts' does not exist.",
-    "File '/node_modules/@types/kquery.ts' does not exist.",
-    "File '/node_modules/@types/kquery.tsx' does not exist.",
     "File '/node_modules/@types/kquery.d.ts' does not exist.",
     "Found 'package.json' at '/node_modules/@types/kquery/package.json'.",
     "'package.json' has 'typings' field 'kquery' that references '/node_modules/@types/kquery/kquery'.",
@@ -48,8 +44,6 @@
     "File '/node_modules/lquery/index.ts' does not exist.",
     "File '/node_modules/lquery/index.tsx' does not exist.",
     "File '/node_modules/lquery/index.d.ts' does not exist.",
-    "File '/node_modules/@types/lquery.ts' does not exist.",
-    "File '/node_modules/@types/lquery.tsx' does not exist.",
     "File '/node_modules/@types/lquery.d.ts' does not exist.",
     "Found 'package.json' at '/node_modules/@types/lquery/package.json'.",
     "'package.json' has 'typings' field 'lquery' that references '/node_modules/@types/lquery/lquery'.",
diff --git a/tests/baselines/reference/typingsLookupAmd.trace.json b/tests/baselines/reference/typingsLookupAmd.trace.json
index 496166926a8..843f16fe8c6 100644
--- a/tests/baselines/reference/typingsLookupAmd.trace.json
+++ b/tests/baselines/reference/typingsLookupAmd.trace.json
@@ -10,19 +10,11 @@
     "File '/b.ts' does not exist.",
     "File '/b.tsx' does not exist.",
     "File '/b.d.ts' does not exist.",
-    "File '/x/y/node_modules/@types/b.ts' does not exist.",
-    "File '/x/y/node_modules/@types/b.tsx' does not exist.",
     "File '/x/y/node_modules/@types/b.d.ts' does not exist.",
     "File '/x/y/node_modules/@types/b/package.json' does not exist.",
-    "File '/x/y/node_modules/@types/b/index.ts' does not exist.",
-    "File '/x/y/node_modules/@types/b/index.tsx' does not exist.",
     "File '/x/y/node_modules/@types/b/index.d.ts' does not exist.",
-    "File '/x/node_modules/@types/b.ts' does not exist.",
-    "File '/x/node_modules/@types/b.tsx' does not exist.",
     "File '/x/node_modules/@types/b.d.ts' does not exist.",
     "File '/x/node_modules/@types/b/package.json' does not exist.",
-    "File '/x/node_modules/@types/b/index.ts' does not exist.",
-    "File '/x/node_modules/@types/b/index.tsx' does not exist.",
     "File '/x/node_modules/@types/b/index.d.ts' exist - use it as a name resolution result.",
     "======== Module name 'b' was successfully resolved to '/x/node_modules/@types/b/index.d.ts'. ========",
     "======== Resolving module 'a' from '/x/node_modules/@types/b/index.d.ts'. ========",
@@ -42,33 +34,17 @@
     "File '/a.ts' does not exist.",
     "File '/a.tsx' does not exist.",
     "File '/a.d.ts' does not exist.",
-    "File '/x/node_modules/@types/b/node_modules/@types/a.ts' does not exist.",
-    "File '/x/node_modules/@types/b/node_modules/@types/a.tsx' does not exist.",
     "File '/x/node_modules/@types/b/node_modules/@types/a.d.ts' does not exist.",
     "File '/x/node_modules/@types/b/node_modules/@types/a/package.json' does not exist.",
-    "File '/x/node_modules/@types/b/node_modules/@types/a/index.ts' does not exist.",
-    "File '/x/node_modules/@types/b/node_modules/@types/a/index.tsx' does not exist.",
     "File '/x/node_modules/@types/b/node_modules/@types/a/index.d.ts' does not exist.",
-    "File '/x/node_modules/@types/node_modules/@types/a.ts' does not exist.",
-    "File '/x/node_modules/@types/node_modules/@types/a.tsx' does not exist.",
     "File '/x/node_modules/@types/node_modules/@types/a.d.ts' does not exist.",
     "File '/x/node_modules/@types/node_modules/@types/a/package.json' does not exist.",
-    "File '/x/node_modules/@types/node_modules/@types/a/index.ts' does not exist.",
-    "File '/x/node_modules/@types/node_modules/@types/a/index.tsx' does not exist.",
     "File '/x/node_modules/@types/node_modules/@types/a/index.d.ts' does not exist.",
-    "File '/x/node_modules/@types/a.ts' does not exist.",
-    "File '/x/node_modules/@types/a.tsx' does not exist.",
     "File '/x/node_modules/@types/a.d.ts' does not exist.",
     "File '/x/node_modules/@types/a/package.json' does not exist.",
-    "File '/x/node_modules/@types/a/index.ts' does not exist.",
-    "File '/x/node_modules/@types/a/index.tsx' does not exist.",
     "File '/x/node_modules/@types/a/index.d.ts' does not exist.",
-    "File '/node_modules/@types/a.ts' does not exist.",
-    "File '/node_modules/@types/a.tsx' does not exist.",
     "File '/node_modules/@types/a.d.ts' does not exist.",
     "File '/node_modules/@types/a/package.json' does not exist.",
-    "File '/node_modules/@types/a/index.ts' does not exist.",
-    "File '/node_modules/@types/a/index.tsx' does not exist.",
     "File '/node_modules/@types/a/index.d.ts' exist - use it as a name resolution result.",
     "======== Module name 'a' was successfully resolved to '/node_modules/@types/a/index.d.ts'. ========",
     "======== Resolving type reference directive 'a', containing file '/__inferred type names__.ts', root directory '/node_modules/@types'. ========",

From 823d3853225c16b22cd1ee6c7ad6566f21df51e2 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Mon, 31 Oct 2016 09:23:31 -0700
Subject: [PATCH 192/421] Add Push interface

---
 src/compiler/moduleNameResolver.ts | 33 +++++++++++++++++-------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
index b165bca31ce..f37b8ed1a19 100644
--- a/src/compiler/moduleNameResolver.ts
+++ b/src/compiler/moduleNameResolver.ts
@@ -14,6 +14,11 @@ namespace ts {
         return compilerOptions.traceResolution && host.trace !== undefined;
     }
 
+    /** Array that is only intended to be pushed to, never read. */
+    interface Push<T> {
+        push(value: T): void;
+    }
+
     /**
      * Result of trying to resolve a module.
      * At least one of `ts` and `js` should be defined, or the whole thing should be `undefined`.
@@ -334,7 +339,7 @@ namespace ts {
      * 'typings' entry or file 'index' with some supported extension
      * - Classic loader will only try to interpret '/a/b/c' as file.
      */
-    type ResolutionKindSpecificLoader = (extensions: Extensions, candidate: string, failedLookupLocations: string[], onlyRecordFailures: boolean, state: ModuleResolutionState) => Resolved | undefined;
+    type ResolutionKindSpecificLoader = (extensions: Extensions, candidate: string, failedLookupLocations: Push<string>, onlyRecordFailures: boolean, state: ModuleResolutionState) => Resolved | undefined;
 
     /**
      * Any module resolution kind can be augmented with optional settings: 'baseUrl', 'paths' and 'rootDirs' - they are used to
@@ -397,7 +402,7 @@ namespace ts {
      * entries in 'rootDirs', use them to build absolute path out of (*) and try to resolve module from this location.
      */
     function tryLoadModuleUsingOptionalResolutionSettings(extensions: Extensions, moduleName: string, containingDirectory: string, loader: ResolutionKindSpecificLoader,
-        failedLookupLocations: string[], state: ModuleResolutionState): Resolved | undefined {
+        failedLookupLocations: Push<string>, state: ModuleResolutionState): Resolved | undefined {
 
         if (moduleHasNonRelativeName(moduleName)) {
             return tryLoadModuleUsingBaseUrl(extensions, moduleName, loader, failedLookupLocations, state);
@@ -408,7 +413,7 @@ namespace ts {
     }
 
     function tryLoadModuleUsingRootDirs(extensions: Extensions, moduleName: string, containingDirectory: string, loader: ResolutionKindSpecificLoader,
-        failedLookupLocations: string[], state: ModuleResolutionState): Resolved | undefined {
+        failedLookupLocations: Push<string>, state: ModuleResolutionState): Resolved | undefined {
 
         if (!state.compilerOptions.rootDirs) {
             return undefined;
@@ -484,7 +489,7 @@ namespace ts {
         return undefined;
     }
 
-    function tryLoadModuleUsingBaseUrl(extensions: Extensions, moduleName: string, loader: ResolutionKindSpecificLoader, failedLookupLocations: string[], state: ModuleResolutionState): Resolved | undefined {
+    function tryLoadModuleUsingBaseUrl(extensions: Extensions, moduleName: string, loader: ResolutionKindSpecificLoader, failedLookupLocations: Push<string>, state: ModuleResolutionState): Resolved | undefined {
         if (!state.compilerOptions.baseUrl) {
             return undefined;
         }
@@ -578,7 +583,7 @@ namespace ts {
         return { path: real, extension: resolved.extension };
     }
 
-    function nodeLoadModuleByRelativeName(extensions: Extensions, candidate: string, failedLookupLocations: string[], onlyRecordFailures: boolean, state: ModuleResolutionState): Resolved | undefined {
+    function nodeLoadModuleByRelativeName(extensions: Extensions, candidate: string, failedLookupLocations: Push<string>, onlyRecordFailures: boolean, state: ModuleResolutionState): Resolved | undefined {
         if (state.traceEnabled) {
             trace(state.host, Diagnostics.Loading_module_as_file_Slash_folder_candidate_module_location_0, candidate);
         }
@@ -597,7 +602,7 @@ namespace ts {
      * @param {boolean} onlyRecordFailures - if true then function won't try to actually load files but instead record all attempts as failures. This flag is necessary
      * in cases when we know upfront that all load attempts will fail (because containing folder does not exists) however we still need to record all failed lookup locations.
      */
-    function loadModuleFromFile(extensions: Extensions, candidate: string, failedLookupLocations: string[], onlyRecordFailures: boolean, state: ModuleResolutionState): Resolved | undefined {
+    function loadModuleFromFile(extensions: Extensions, candidate: string, failedLookupLocations: Push<string>, onlyRecordFailures: boolean, state: ModuleResolutionState): Resolved | undefined {
         // First, try adding an extension. An import of "foo" could be matched by a file "foo.ts", or "foo.js" by "foo.js.ts"
         const resolvedByAddingExtension = tryAddingExtensions(candidate, extensions, failedLookupLocations, onlyRecordFailures, state);
         if (resolvedByAddingExtension) {
@@ -617,7 +622,7 @@ namespace ts {
     }
 
     /** Try to return an existing file that adds one of the `extensions` to `candidate`. */
-    function tryAddingExtensions(candidate: string, extensions: Extensions, failedLookupLocations: string[], onlyRecordFailures: boolean, state: ModuleResolutionState): Resolved | undefined {
+    function tryAddingExtensions(candidate: string, extensions: Extensions, failedLookupLocations: Push<string>, onlyRecordFailures: boolean, state: ModuleResolutionState): Resolved | undefined {
         if (!onlyRecordFailures) {
             // check if containing folder exists - if it doesn't then just record failures for all supported extensions without disk probing
             const directory = getDirectoryPath(candidate);
@@ -642,7 +647,7 @@ namespace ts {
     }
 
     /** Return the file if it exists. */
-    function tryFile(fileName: string, failedLookupLocations: string[], onlyRecordFailures: boolean, state: ModuleResolutionState): string | undefined {
+    function tryFile(fileName: string, failedLookupLocations: Push<string>, onlyRecordFailures: boolean, state: ModuleResolutionState): string | undefined {
         if (!onlyRecordFailures && state.host.fileExists(fileName)) {
             if (state.traceEnabled) {
                 trace(state.host, Diagnostics.File_0_exist_use_it_as_a_name_resolution_result, fileName);
@@ -658,7 +663,7 @@ namespace ts {
         }
     }
 
-    function loadNodeModuleFromDirectory(extensions: Extensions, candidate: string, failedLookupLocations: string[], onlyRecordFailures: boolean, state: ModuleResolutionState): Resolved | undefined {
+    function loadNodeModuleFromDirectory(extensions: Extensions, candidate: string, failedLookupLocations: Push<string>, onlyRecordFailures: boolean, state: ModuleResolutionState): Resolved | undefined {
         const packageJsonPath = pathToPackageJson(candidate);
         const directoryExists = !onlyRecordFailures && directoryProbablyExists(candidate, state.host);
 
@@ -701,7 +706,7 @@ namespace ts {
         return combinePaths(directory, "package.json");
     }
 
-    function loadModuleFromNodeModulesFolder(extensions: Extensions, moduleName: string, directory: string, failedLookupLocations: string[], state: ModuleResolutionState): Resolved | undefined {
+    function loadModuleFromNodeModulesFolder(extensions: Extensions, moduleName: string, directory: string, failedLookupLocations: Push<string>, state: ModuleResolutionState): Resolved | undefined {
         const nodeModulesFolder = combinePaths(directory, "node_modules");
         const nodeModulesFolderExists = directoryProbablyExists(nodeModulesFolder, state.host);
         const candidate = normalizePath(combinePaths(nodeModulesFolder, moduleName));
@@ -710,15 +715,15 @@ namespace ts {
             loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state);
     }
 
-    function loadModuleFromNodeModules(extensions: Extensions, moduleName: string, directory: string, failedLookupLocations: string[], state: ModuleResolutionState): Resolved | undefined {
+    function loadModuleFromNodeModules(extensions: Extensions, moduleName: string, directory: string, failedLookupLocations: Push<string>, state: ModuleResolutionState): Resolved | undefined {
         return loadModuleFromNodeModulesWorker(extensions, moduleName, directory, failedLookupLocations, state, /*typesOnly*/ false);
     }
-    function loadModuleFromNodeModulesAtTypes(moduleName: string, directory: string, failedLookupLocations: string[], state: ModuleResolutionState): Resolved | undefined {
+    function loadModuleFromNodeModulesAtTypes(moduleName: string, directory: string, failedLookupLocations: Push<string>, state: ModuleResolutionState): Resolved | undefined {
         // Extensions parameter here doesn't actually matter, because typesOnly ensures we're just doing @types lookup, which is always DtsOnly.
         return loadModuleFromNodeModulesWorker(Extensions.DtsOnly, moduleName, directory, failedLookupLocations, state, /*typesOnly*/ true);
     }
 
-    function loadModuleFromNodeModulesWorker(extensions: Extensions, moduleName: string, directory: string, failedLookupLocations: string[], state: ModuleResolutionState, typesOnly: boolean): Resolved | undefined {
+    function loadModuleFromNodeModulesWorker(extensions: Extensions, moduleName: string, directory: string, failedLookupLocations: Push<string>, state: ModuleResolutionState, typesOnly: boolean): Resolved | undefined {
         return forEachAncestorDirectory(normalizeSlashes(directory), ancestorDirectory => {
             if (getBaseFileName(ancestorDirectory) !== "node_modules") {
                 return loadModuleFromNodeModulesOneLevel(extensions, moduleName, ancestorDirectory, failedLookupLocations, state, typesOnly);
@@ -727,7 +732,7 @@ namespace ts {
     }
 
     /** Load a module from a single node_modules directory, but not from any ancestors' node_modules directories. */
-    function loadModuleFromNodeModulesOneLevel(extensions: Extensions, moduleName: string, directory: string, failedLookupLocations: string[], state: ModuleResolutionState, typesOnly = false): Resolved | undefined {
+    function loadModuleFromNodeModulesOneLevel(extensions: Extensions, moduleName: string, directory: string, failedLookupLocations: Push<string>, state: ModuleResolutionState, typesOnly = false): Resolved | undefined {
         const packageResult = typesOnly ? undefined : loadModuleFromNodeModulesFolder(extensions, moduleName, directory, failedLookupLocations, state);
         if (packageResult) {
             return packageResult;

From ce9e5f52270951bf0cb04dbd9dff7543543af79f Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Fri, 11 Nov 2016 13:00:40 -0800
Subject: [PATCH 193/421] Fix test

---
 .../unittests/reuseProgramStructure.ts        | 24 -------------------
 1 file changed, 24 deletions(-)

diff --git a/src/harness/unittests/reuseProgramStructure.ts b/src/harness/unittests/reuseProgramStructure.ts
index 386e02e2450..6dbd74e71d2 100644
--- a/src/harness/unittests/reuseProgramStructure.ts
+++ b/src/harness/unittests/reuseProgramStructure.ts
@@ -394,26 +394,14 @@ namespace ts {
                     "File '/fs.ts' does not exist.",
                     "File '/fs.tsx' does not exist.",
                     "File '/fs.d.ts' does not exist.",
-                    "File '/a/b/node_modules/@types/fs.ts' does not exist.",
-                    "File '/a/b/node_modules/@types/fs.tsx' does not exist.",
                     "File '/a/b/node_modules/@types/fs.d.ts' does not exist.",
                     "File '/a/b/node_modules/@types/fs/package.json' does not exist.",
-                    "File '/a/b/node_modules/@types/fs/index.ts' does not exist.",
-                    "File '/a/b/node_modules/@types/fs/index.tsx' does not exist.",
                     "File '/a/b/node_modules/@types/fs/index.d.ts' does not exist.",
-                    "File '/a/node_modules/@types/fs.ts' does not exist.",
-                    "File '/a/node_modules/@types/fs.tsx' does not exist.",
                     "File '/a/node_modules/@types/fs.d.ts' does not exist.",
                     "File '/a/node_modules/@types/fs/package.json' does not exist.",
-                    "File '/a/node_modules/@types/fs/index.ts' does not exist.",
-                    "File '/a/node_modules/@types/fs/index.tsx' does not exist.",
                     "File '/a/node_modules/@types/fs/index.d.ts' does not exist.",
-                    "File '/node_modules/@types/fs.ts' does not exist.",
-                    "File '/node_modules/@types/fs.tsx' does not exist.",
                     "File '/node_modules/@types/fs.d.ts' does not exist.",
                     "File '/node_modules/@types/fs/package.json' does not exist.",
-                    "File '/node_modules/@types/fs/index.ts' does not exist.",
-                    "File '/node_modules/@types/fs/index.tsx' does not exist.",
                     "File '/node_modules/@types/fs/index.d.ts' does not exist.",
                     "File '/a/b/fs.js' does not exist.",
                     "File '/a/b/fs.jsx' does not exist.",
@@ -448,26 +436,14 @@ namespace ts {
                     "File '/fs.ts' does not exist.",
                     "File '/fs.tsx' does not exist.",
                     "File '/fs.d.ts' does not exist.",
-                    "File '/a/b/node_modules/@types/fs.ts' does not exist.",
-                    "File '/a/b/node_modules/@types/fs.tsx' does not exist.",
                     "File '/a/b/node_modules/@types/fs.d.ts' does not exist.",
                     "File '/a/b/node_modules/@types/fs/package.json' does not exist.",
-                    "File '/a/b/node_modules/@types/fs/index.ts' does not exist.",
-                    "File '/a/b/node_modules/@types/fs/index.tsx' does not exist.",
                     "File '/a/b/node_modules/@types/fs/index.d.ts' does not exist.",
-                    "File '/a/node_modules/@types/fs.ts' does not exist.",
-                    "File '/a/node_modules/@types/fs.tsx' does not exist.",
                     "File '/a/node_modules/@types/fs.d.ts' does not exist.",
                     "File '/a/node_modules/@types/fs/package.json' does not exist.",
-                    "File '/a/node_modules/@types/fs/index.ts' does not exist.",
-                    "File '/a/node_modules/@types/fs/index.tsx' does not exist.",
                     "File '/a/node_modules/@types/fs/index.d.ts' does not exist.",
-                    "File '/node_modules/@types/fs.ts' does not exist.",
-                    "File '/node_modules/@types/fs.tsx' does not exist.",
                     "File '/node_modules/@types/fs.d.ts' does not exist.",
                     "File '/node_modules/@types/fs/package.json' does not exist.",
-                    "File '/node_modules/@types/fs/index.ts' does not exist.",
-                    "File '/node_modules/@types/fs/index.tsx' does not exist.",
                     "File '/node_modules/@types/fs/index.d.ts' does not exist.",
                     "File '/a/b/fs.js' does not exist.",
                     "File '/a/b/fs.jsx' does not exist.",

From a0e4ab94f189b40ce4c7dd7b082c4b794f744ba1 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Fri, 11 Nov 2016 13:59:13 -0800
Subject: [PATCH 194/421] Allow JS files

---
 src/compiler/core.ts                               | 14 ++++----------
 src/compiler/moduleNameResolver.ts                 |  2 +-
 ...thMappingBasedModuleResolution_withExtension.js |  8 ++++++++
 ...pingBasedModuleResolution_withExtension.symbols |  7 +++++++
 ...gBasedModuleResolution_withExtension.trace.json | 11 ++++++++++-
 ...appingBasedModuleResolution_withExtension.types |  7 +++++++
 ...esolution_withExtension_failedLookup.trace.json |  9 ---------
 ...thMappingBasedModuleResolution_withExtension.ts | 12 ++++++++++--
 8 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index ded186691de..f647480979b 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -2210,17 +2210,13 @@ namespace ts {
      * Path must have a valid extension.
      */
     export function extensionFromPath(path: string): Extension {
-        const ts = tryGetTypeScriptExtensionFromPath(path);
-        if (ts !== undefined) {
-            return ts;
-        }
-        const js = tryGetJavaScriptExtensionFromPath(path);
-        if (js !== undefined) {
-            return js;
+        const ext = tryGetExtensionFromPath(path);
+        if (ext !== undefined) {
+            return ext;
         }
         Debug.fail(`File ${path} has unknown extension.`);
     }
-    export function tryGetTypeScriptExtensionFromPath(path: string): Extension | undefined {
+    export function tryGetExtensionFromPath(path: string): Extension | undefined {
         if (fileExtensionIs(path, ".d.ts")) {
             return Extension.Dts;
         }
@@ -2230,8 +2226,6 @@ namespace ts {
         if (fileExtensionIs(path, ".tsx")) {
             return Extension.Tsx;
         }
-    }
-    function tryGetJavaScriptExtensionFromPath(path: string): Extension | undefined {
         if (fileExtensionIs(path, ".js")) {
             return Extension.Js;
         }
diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
index 045e90a6add..c6ffab4908f 100644
--- a/src/compiler/moduleNameResolver.ts
+++ b/src/compiler/moduleNameResolver.ts
@@ -519,7 +519,7 @@ namespace ts {
                     trace(state.host, Diagnostics.Trying_substitution_0_candidate_module_location_Colon_1, subst, path);
                 }
                 // A path mapping may have a ".ts" extension; in contrast to an import, which should omit it.
-                const tsExtension = tryGetTypeScriptExtensionFromPath(candidate);
+                const tsExtension = tryGetExtensionFromPath(candidate);
                 if (tsExtension !== undefined) {
                     const path = tryFile(candidate, failedLookupLocations, /*onlyRecordFailures*/false, state);
                     return path && { path, extension: tsExtension };
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js
index 7ed0026a050..06f6b50e4a0 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.js
@@ -4,13 +4,21 @@
 
 export function foo() {}
 
+//// [bar.js]
+export function bar() {}
+
 //// [a.ts]
 import { foo } from "foo";
+import { bar } from "bar";
 
 
 //// [foo.js]
 "use strict";
 function foo() { }
 exports.foo = foo;
+//// [bar.js]
+"use strict";
+function bar() { }
+exports.bar = bar;
 //// [a.js]
 "use strict";
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.symbols
index 0adeab146cd..717660067ec 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.symbols
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.symbols
@@ -2,8 +2,15 @@
 import { foo } from "foo";
 >foo : Symbol(foo, Decl(a.ts, 0, 8))
 
+import { bar } from "bar";
+>bar : Symbol(bar, Decl(a.ts, 1, 8))
+
 === /foo/foo.ts ===
 
 export function foo() {}
 >foo : Symbol(foo, Decl(foo.ts, 0, 0))
 
+=== /bar/bar.js ===
+export function bar() {}
+>bar : Symbol(bar, Decl(bar.js, 0, 0))
+
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.trace.json
index 56c03de869e..c4064ab8b8b 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.trace.json
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.trace.json
@@ -7,5 +7,14 @@
     "Trying substitution 'foo/foo.ts', candidate module location: 'foo/foo.ts'.",
     "File '/foo/foo.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/foo/foo.ts', result '/foo/foo.ts'",
-    "======== Module name 'foo' was successfully resolved to '/foo/foo.ts'. ========"
+    "======== Module name 'foo' was successfully resolved to '/foo/foo.ts'. ========",
+    "======== Resolving module 'bar' from '/a.ts'. ========",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "'baseUrl' option is set to '/', using this value to resolve non-relative module name 'bar'",
+    "'paths' option is specified, looking for a pattern to match module name 'bar'.",
+    "Module name 'bar', matched pattern 'bar'.",
+    "Trying substitution 'bar/bar.js', candidate module location: 'bar/bar.js'.",
+    "File '/bar/bar.js' exist - use it as a name resolution result.",
+    "Resolving real path for '/bar/bar.js', result '/bar/bar.js'",
+    "======== Module name 'bar' was successfully resolved to '/bar/bar.js'. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.types b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.types
index 0bc686d64e5..8d7c57b1d27 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.types
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.types
@@ -2,8 +2,15 @@
 import { foo } from "foo";
 >foo : () => void
 
+import { bar } from "bar";
+>bar : () => void
+
 === /foo/foo.ts ===
 
 export function foo() {}
 >foo : () => void
 
+=== /bar/bar.js ===
+export function bar() {}
+>bar : () => void
+
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.trace.json
index 17e78176f4c..face88d225e 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.trace.json
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.trace.json
@@ -14,12 +14,8 @@
     "File '/node_modules/foo/index.ts' does not exist.",
     "File '/node_modules/foo/index.tsx' does not exist.",
     "File '/node_modules/foo/index.d.ts' does not exist.",
-    "File '/node_modules/@types/foo.ts' does not exist.",
-    "File '/node_modules/@types/foo.tsx' does not exist.",
     "File '/node_modules/@types/foo.d.ts' does not exist.",
     "File '/node_modules/@types/foo/package.json' does not exist.",
-    "File '/node_modules/@types/foo/index.ts' does not exist.",
-    "File '/node_modules/@types/foo/index.tsx' does not exist.",
     "File '/node_modules/@types/foo/index.d.ts' does not exist.",
     "'baseUrl' option is set to '/', using this value to resolve non-relative module name 'foo'",
     "'paths' option is specified, looking for a pattern to match module name 'foo'.",
@@ -32,10 +28,5 @@
     "File '/node_modules/foo/package.json' does not exist.",
     "File '/node_modules/foo/index.js' does not exist.",
     "File '/node_modules/foo/index.jsx' does not exist.",
-    "File '/node_modules/@types/foo.js' does not exist.",
-    "File '/node_modules/@types/foo.jsx' does not exist.",
-    "File '/node_modules/@types/foo/package.json' does not exist.",
-    "File '/node_modules/@types/foo/index.js' does not exist.",
-    "File '/node_modules/@types/foo/index.jsx' does not exist.",
     "======== Module name 'foo' was not resolved. ========"
 ]
\ No newline at end of file
diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution_withExtension.ts b/tests/cases/compiler/pathMappingBasedModuleResolution_withExtension.ts
index 0bfba0c0280..e40c67e4ea3 100644
--- a/tests/cases/compiler/pathMappingBasedModuleResolution_withExtension.ts
+++ b/tests/cases/compiler/pathMappingBasedModuleResolution_withExtension.ts
@@ -1,18 +1,26 @@
 // @noImplicitReferences: true
 // @traceResolution: true
+// @allowJs: true
 
 // @Filename: /foo/foo.ts
 export function foo() {}
 
+// @Filename: /bar/bar.js
+export function bar() {}
+
 // @Filename: /a.ts
 import { foo } from "foo";
+import { bar } from "bar";
 
 // @Filename: /tsconfig.json
 {
     "compilerOptions": {
         "baseUrl": ".",
         "paths": {
-            "foo": ["foo/foo.ts"]
-        }
+            "foo": ["foo/foo.ts"],
+            "bar": ["bar/bar.js"]
+        },
+        "allowJs": true,
+        "outDir": "bin"
     }
 }

From 43a4b22eba1e3626b7f31deee6b6ec434588555f Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Fri, 11 Nov 2016 14:13:09 -0800
Subject: [PATCH 195/421] Update baseline

---
 .../pathMappingBasedModuleResolution_withExtension.trace.json   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.trace.json
index c4064ab8b8b..a761414eb42 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.trace.json
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.trace.json
@@ -6,7 +6,6 @@
     "Module name 'foo', matched pattern 'foo'.",
     "Trying substitution 'foo/foo.ts', candidate module location: 'foo/foo.ts'.",
     "File '/foo/foo.ts' exist - use it as a name resolution result.",
-    "Resolving real path for '/foo/foo.ts', result '/foo/foo.ts'",
     "======== Module name 'foo' was successfully resolved to '/foo/foo.ts'. ========",
     "======== Resolving module 'bar' from '/a.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
@@ -15,6 +14,5 @@
     "Module name 'bar', matched pattern 'bar'.",
     "Trying substitution 'bar/bar.js', candidate module location: 'bar/bar.js'.",
     "File '/bar/bar.js' exist - use it as a name resolution result.",
-    "Resolving real path for '/bar/bar.js', result '/bar/bar.js'",
     "======== Module name 'bar' was successfully resolved to '/bar/bar.js'. ========"
 ]
\ No newline at end of file

From b8082caa8eb5c16020f805ff70ef61454e07175c Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Fri, 11 Nov 2016 15:58:52 -0800
Subject: [PATCH 196/421] Clean up jsdoc in utilities

Fix functions that were unused (getJsDocComments), redundant (append) or badly named
(getJSDocCommentsFromText)
---
 src/compiler/declarationEmitter.ts |  2 +-
 src/compiler/parser.ts             |  2 +-
 src/compiler/utilities.ts          | 46 +++++++++---------------------
 3 files changed, 15 insertions(+), 35 deletions(-)

diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts
index 0bba375a2cb..3b48f453478 100644
--- a/src/compiler/declarationEmitter.ts
+++ b/src/compiler/declarationEmitter.ts
@@ -371,7 +371,7 @@ namespace ts {
 
         function writeJsDocComments(declaration: Node) {
             if (declaration) {
-                const jsDocComments = getJsDocCommentsFromText(declaration, currentText);
+                const jsDocComments = getJSDocCommentRanges(declaration, currentText);
                 emitNewLineBeforeLeadingComments(currentLineMap, writer, declaration, jsDocComments);
                 // jsDoc comments are emitted at /*leading comment1 */space/*leading comment*/space
                 emitComments(currentText, currentLineMap, writer, jsDocComments, /*leadingSeparator*/ false, /*trailingSeparator*/ true, newLine, writeCommentRange);
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 943a677ef5d..682c22b4fba 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -676,7 +676,7 @@ namespace ts {
 
 
         function addJSDocComment<T extends Node>(node: T): T {
-            const comments = getJsDocCommentsFromText(node, sourceFile.text);
+            const comments = getJSDocCommentRanges(node, sourceFile.text);
             if (comments) {
                 for (const comment of comments) {
                     const jsDoc = JSDocParser.parseJSDocComment(node, comment.pos, comment.end - comment.pos);
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index a9f2429d376..9aa0e4267cf 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -638,25 +638,18 @@ namespace ts {
         return getLeadingCommentRanges(text, node.pos);
     }
 
-    export function getJsDocComments(node: Node, sourceFileOfNode: SourceFile) {
-        return getJsDocCommentsFromText(node, sourceFileOfNode.text);
-    }
-
-    export function getJsDocCommentsFromText(node: Node, text: string) {
+    export function getJSDocCommentRanges(node: Node, text: string) {
         const commentRanges = (node.kind === SyntaxKind.Parameter ||
             node.kind === SyntaxKind.TypeParameter ||
             node.kind === SyntaxKind.FunctionExpression ||
             node.kind === SyntaxKind.ArrowFunction) ?
             concatenate(getTrailingCommentRanges(text, node.pos), getLeadingCommentRanges(text, node.pos)) :
             getLeadingCommentRangesOfNodeFromText(node, text);
-        return filter(commentRanges, isJsDocComment);
-
-        function isJsDocComment(comment: CommentRange) {
-            // True if the comment starts with '/**' but not if it is '/**/'
-            return text.charCodeAt(comment.pos + 1) === CharacterCodes.asterisk &&
-                text.charCodeAt(comment.pos + 2) === CharacterCodes.asterisk &&
-                text.charCodeAt(comment.pos + 3) !== CharacterCodes.slash;
-        }
+        // True if the comment starts with '/**' but not if it is '/**/'
+        return filter(commentRanges, comment =>
+            text.charCodeAt(comment.pos + 1) === CharacterCodes.asterisk &&
+            text.charCodeAt(comment.pos + 2) === CharacterCodes.asterisk &&
+            text.charCodeAt(comment.pos + 3) !== CharacterCodes.slash);
     }
 
     export let fullTripleSlashReferencePathRegEx = /^(\/\/\/\s*<reference\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
@@ -1453,18 +1446,6 @@ namespace ts {
         }
     }
 
-    function append<T>(previous: T[] | undefined, additional: T[] | undefined): T[] | undefined {
-        if (additional) {
-            if (!previous) {
-                previous = [];
-            }
-            for (const x of additional) {
-                previous.push(x);
-            }
-        }
-        return previous;
-    }
-
     export function getJSDocComments(node: Node, checkParentVariableStatement: boolean): string[] {
         return getJSDocs(node, checkParentVariableStatement, docs => map(docs, doc => doc.comment), tags => map(tags, tag => tag.comment));
     }
@@ -1482,7 +1463,6 @@ namespace ts {
     }
 
     function getJSDocs<T>(node: Node, checkParentVariableStatement: boolean, getDocs: (docs: JSDoc[]) => T[], getTags: (tags: JSDocTag[]) => T[]): T[] {
-        // TODO: Get rid of getJsDocComments and friends (note the lowercase 's' in Js)
         // TODO: A lot of this work should be cached, maybe. I guess it's only used in services right now...
         let result: T[] = undefined;
         // prepend documentation from parent sources
@@ -1505,11 +1485,11 @@ namespace ts {
                     isVariableOfVariableDeclarationStatement ? node.parent.parent :
                         undefined;
             if (variableStatementNode) {
-                result = append(result, getJSDocs(variableStatementNode, checkParentVariableStatement, getDocs, getTags));
+                result = concatenate(result, getJSDocs(variableStatementNode, checkParentVariableStatement, getDocs, getTags));
             }
             if (node.kind === SyntaxKind.ModuleDeclaration &&
                 node.parent && node.parent.kind === SyntaxKind.ModuleDeclaration) {
-                result = append(result, getJSDocs(node.parent, checkParentVariableStatement, getDocs, getTags));
+                result = concatenate(result, getJSDocs(node.parent, checkParentVariableStatement, getDocs, getTags));
             }
 
             // Also recognize when the node is the RHS of an assignment expression
@@ -1520,30 +1500,30 @@ namespace ts {
                 (parent as BinaryExpression).operatorToken.kind === SyntaxKind.EqualsToken &&
                 parent.parent.kind === SyntaxKind.ExpressionStatement;
             if (isSourceOfAssignmentExpressionStatement) {
-                result = append(result, getJSDocs(parent.parent, checkParentVariableStatement, getDocs, getTags));
+                result = concatenate(result, getJSDocs(parent.parent, checkParentVariableStatement, getDocs, getTags));
             }
 
             const isPropertyAssignmentExpression = parent && parent.kind === SyntaxKind.PropertyAssignment;
             if (isPropertyAssignmentExpression) {
-                result = append(result, getJSDocs(parent, checkParentVariableStatement, getDocs, getTags));
+                result = concatenate(result, getJSDocs(parent, checkParentVariableStatement, getDocs, getTags));
             }
 
             // Pull parameter comments from declaring function as well
             if (node.kind === SyntaxKind.Parameter) {
                 const paramTags = getJSDocParameterTag(node as ParameterDeclaration, checkParentVariableStatement);
                 if (paramTags) {
-                    result = append(result, getTags(paramTags));
+                    result = concatenate(result, getTags(paramTags));
                 }
             }
         }
 
         if (isVariableLike(node) && node.initializer) {
-            result = append(result, getJSDocs(node.initializer, /*checkParentVariableStatement*/ false, getDocs, getTags));
+            result = concatenate(result, getJSDocs(node.initializer, /*checkParentVariableStatement*/ false, getDocs, getTags));
         }
 
         if (node.jsDocComments) {
             if (result) {
-                result = append(result, getDocs(node.jsDocComments));
+                result = concatenate(result, getDocs(node.jsDocComments));
             }
             else {
                 return getDocs(node.jsDocComments);

From 8babde0b9839fbd500a3089abd33754f478a05d2 Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Fri, 11 Nov 2016 17:23:42 -0800
Subject: [PATCH 197/421] WIP Clean up destructuring

---
 src/compiler/core.ts                       |   7 +
 src/compiler/factory.ts                    |  14 +-
 src/compiler/transformers/destructuring.ts | 758 ++++++++++++++++++++-
 src/compiler/transformers/esnext.ts        |   2 +-
 src/compiler/types.ts                      |  10 +-
 src/compiler/utilities.ts                  |  26 +-
 src/compiler/visitor.ts                    |  30 +
 7 files changed, 814 insertions(+), 33 deletions(-)

diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index 8175730159b..a21477a40d6 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -811,6 +811,13 @@ namespace ts {
         }
     }
 
+    export function appendProperty<T>(map: Map<T>, key: string | number, value: T): Map<T> {
+        if (key === undefined || value === undefined) return map;
+        if (map === undefined) map = createMap<T>();
+        map[key] = value;
+        return map;
+    }
+
     export function assign<T1 extends MapLike<{}>, T2, T3>(t: T1, arg1: T2, arg2: T3): T1 & T2 & T3;
     export function assign<T1 extends MapLike<{}>, T2>(t: T1, arg1: T2): T1 & T2;
     export function assign<T1 extends MapLike<{}>>(t: T1, ...args: any[]): any;
diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index e9935668676..6674ffc7263 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -238,9 +238,9 @@ namespace ts {
         return node;
     }
 
-    export function updateParameter(node: ParameterDeclaration, decorators: Decorator[], modifiers: Modifier[], name: BindingName, type: TypeNode, initializer: Expression) {
-        if (node.decorators !== decorators || node.modifiers !== modifiers || node.name !== name || node.type !== type || node.initializer !== initializer) {
-            return updateNode(createParameter(decorators, modifiers, node.dotDotDotToken, name, node.questionToken, type, initializer, /*location*/ node, /*flags*/ node.flags), node);
+    export function updateParameter(node: ParameterDeclaration, decorators: Decorator[], modifiers: Modifier[], dotDotDotToken: DotDotDotToken, name: BindingName, type: TypeNode, initializer: Expression) {
+        if (node.decorators !== decorators || node.modifiers !== modifiers || node.dotDotDotToken !== dotDotDotToken || node.name !== name || node.type !== type || node.initializer !== initializer) {
+            return updateNode(createParameter(decorators, modifiers, dotDotDotToken, name, node.questionToken, type, initializer, /*location*/ node, /*flags*/ node.flags), node);
         }
 
         return node;
@@ -378,9 +378,9 @@ namespace ts {
         return node;
     }
 
-    export function updateBindingElement(node: BindingElement, propertyName: PropertyName, name: BindingName, initializer: Expression) {
-        if (node.propertyName !== propertyName || node.name !== name || node.initializer !== initializer) {
-            return updateNode(createBindingElement(propertyName, node.dotDotDotToken, name, initializer, node), node);
+    export function updateBindingElement(node: BindingElement, dotDotDotToken: DotDotDotToken, propertyName: PropertyName, name: BindingName, initializer: Expression) {
+        if (node.propertyName !== propertyName || node.dotDotDotToken !== dotDotDotToken || node.name !== name || node.initializer !== initializer) {
+            return updateNode(createBindingElement(propertyName, dotDotDotToken, name, initializer, node), node);
         }
         return node;
     }
@@ -1635,7 +1635,7 @@ namespace ts {
         // flag and setting a parent node.
         const react = createIdentifier(reactNamespace || "React");
         react.flags &= ~NodeFlags.Synthesized;
-        // Set the parent that is in parse tree 
+        // Set the parent that is in parse tree
         // this makes sure that parent chain is intact for checker to traverse complete scope tree
         react.parent = getParseTreeNode(parent);
         return react;
diff --git a/src/compiler/transformers/destructuring.ts b/src/compiler/transformers/destructuring.ts
index bba09710898..b0cb3f9d239 100644
--- a/src/compiler/transformers/destructuring.ts
+++ b/src/compiler/transformers/destructuring.ts
@@ -3,6 +3,18 @@
 
 /*@internal*/
 namespace ts {
+    type EffectiveBindingElement = VariableDeclaration | ParameterDeclaration | BindingElement | ObjectLiteralElementLike | Expression;
+    type EffectiveObjectBindingPattern = ObjectBindingPattern | ObjectLiteralExpression;
+    type EffectiveArrayBindingPattern = ArrayBindingPattern | ArrayLiteralExpression;
+    type EffectiveBindingPattern = EffectiveObjectBindingPattern | EffectiveArrayBindingPattern;
+    type EffectiveBindingTarget = EffectiveBindingPattern | Expression;
+    type EffectiveRestIndicator = DotDotDotToken | SpreadElement | SpreadAssignment;
+
+    export const enum FlattenLevel {
+        All,
+        ObjectRestDestructuringOnly,
+    }
+
     /**
      * Flattens a destructuring assignment expression.
      *
@@ -40,7 +52,7 @@ namespace ts {
             //
             // The source map location for the assignment should point to the entire binary
             // expression.
-            value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ true, location, emitTempVariableAssignment, visitor);
+            value = ensureIdentifierOld(value, /*reuseIdentifierExpressions*/ true, location, emitTempVariableAssignment, visitor);
         }
         else if (nodeIsSynthesized(node)) {
             // Generally, the source map location for a destructuring assignment is the root
@@ -52,7 +64,7 @@ namespace ts {
             location = value;
         }
 
-        flattenDestructuring(node, value, location, emitAssignment, emitTempVariableAssignment, recordTempVariable, emitRestAssignment, transformRest, visitor);
+        flattenDestructuringOld(node, value, location, emitAssignment, emitTempVariableAssignment, recordTempVariable, emitRestAssignment, transformRest, visitor);
 
         if (needsValue) {
             expressions.push(value);
@@ -98,7 +110,7 @@ namespace ts {
         transformRest?: boolean) {
         const declarations: VariableDeclaration[] = [];
 
-        flattenDestructuring(node, value, node, emitAssignment, emitTempVariableAssignment, noop, emitRestAssignment, transformRest, visitor);
+        flattenDestructuringOld(node, value, node, emitAssignment, emitTempVariableAssignment, noop, emitRestAssignment, transformRest, visitor);
 
         return declarations;
 
@@ -140,7 +152,7 @@ namespace ts {
         const declarations: VariableDeclaration[] = [];
 
         let pendingAssignments: Expression[];
-        flattenDestructuring(node, value, node, emitAssignment, emitTempVariableAssignment, recordTempVariable, emitRestAssignment, transformRest, visitor);
+        flattenDestructuringOld(node, value, node, emitAssignment, emitTempVariableAssignment, recordTempVariable, emitRestAssignment, transformRest, visitor);
 
         return declarations;
 
@@ -201,7 +213,7 @@ namespace ts {
 
         const pendingAssignments: Expression[] = [];
 
-        flattenDestructuring(node, /*value*/ undefined, node, emitAssignment, emitTempVariableAssignment, noop, emitRestAssignment, /*transformRest*/ false, visitor);
+        flattenDestructuringOld(node, /*value*/ undefined, node, emitAssignment, emitTempVariableAssignment, noop, emitRestAssignment, /*transformRest*/ false, visitor);
 
         const expression = inlineExpressions(pendingAssignments);
         aggregateTransformFlags(expression);
@@ -238,7 +250,7 @@ namespace ts {
         }
     }
 
-    function flattenDestructuring(
+    function flattenDestructuringOld(
         root: VariableDeclaration | ParameterDeclaration | BindingElement | BinaryExpression,
         value: Expression,
         location: TextRange,
@@ -305,7 +317,7 @@ namespace ts {
                 // For anything but a single element destructuring we need to generate a temporary
                 // to ensure value is evaluated exactly once.
                 // When doing so we want to hightlight the passed in source map node since thats the one needing this temp assignment
-                value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ true, location, emitTempVariableAssignment);
+                value = ensureIdentifierOld(value, /*reuseIdentifierExpressions*/ true, location, emitTempVariableAssignment);
             }
 
             let bindingElements: ObjectLiteralElementLike[] = [];
@@ -361,7 +373,7 @@ namespace ts {
                 // For anything but a single element destructuring we need to generate a temporary
                 // to ensure value is evaluated exactly once.
                 // When doing so we want to highlight the passed-in source map node since thats the one needing this temp assignment
-                value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ true, location, emitTempVariableAssignment);
+                value = ensureIdentifierOld(value, /*reuseIdentifierExpressions*/ true, location, emitTempVariableAssignment);
             }
 
             const expressions: Expression[] = [];
@@ -393,7 +405,7 @@ namespace ts {
                 // For anything but a single element destructuring we need to generate a temporary
                 // to ensure value is evaluated exactly once.
                 // When doing so we want to highlight the passed-in source map node since thats the one needing this temp assignment
-                value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ true, location, emitTempVariableAssignment);
+                value = ensureIdentifierOld(value, /*reuseIdentifierExpressions*/ true, location, emitTempVariableAssignment);
             }
 
             for (let i = 0; i < numElements; i++) {
@@ -454,7 +466,7 @@ namespace ts {
                     // to ensure value is evaluated exactly once. Additionally, if we have zero elements
                     // we need to emit *something* to ensure that in case a 'var' keyword was already emitted,
                     // so in that case, we'll intentionally create that temporary.
-                    value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ numElements !== 0, target, emitTempVariableAssignment);
+                    value = ensureIdentifierOld(value, /*reuseIdentifierExpressions*/ numElements !== 0, target, emitTempVariableAssignment);
                 }
                 if (name.kind === SyntaxKind.ArrayBindingPattern) {
                     emitArrayBindingElement(name as ArrayBindingPattern, value);
@@ -558,7 +570,7 @@ namespace ts {
         }
 
         function createDefaultValueCheck(value: Expression, defaultValue: Expression, location: TextRange): Expression {
-            value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ true, location, emitTempVariableAssignment);
+            value = ensureIdentifierOld(value, /*reuseIdentifierExpressions*/ true, location, emitTempVariableAssignment);
             return createConditional(
                 createStrictEquality(value, createVoidZero()),
                 createToken(SyntaxKind.QuestionToken),
@@ -579,7 +591,7 @@ namespace ts {
             if (isComputedPropertyName(propertyName)) {
                 return createElementAccess(
                     expression,
-                    ensureIdentifier(propertyName.expression, /*reuseIdentifierExpressions*/ false, /*location*/ propertyName, emitTempVariableAssignment)
+                    ensureIdentifierOld(propertyName.expression, /*reuseIdentifierExpressions*/ false, /*location*/ propertyName, emitTempVariableAssignment)
                 );
             }
             else if (isLiteralExpression(propertyName)) {
@@ -612,7 +624,7 @@ namespace ts {
      * @param emitTempVariableAssignment A callback used to emit a temporary variable.
      * @param visitor An optional callback used to visit the value.
      */
-    function ensureIdentifier(
+    function ensureIdentifierOld(
         value: Expression,
         reuseIdentifierExpressions: boolean,
         location: TextRange,
@@ -630,4 +642,724 @@ namespace ts {
             return emitTempVariableAssignment(value, location);
         }
     }
+
+    interface FlattenHost {
+        context: TransformationContext;
+        level: FlattenLevel;
+        recordTempVariablesInLine: boolean;
+        emitAssignment: (target: EffectiveBindingTarget, value: Expression, location: TextRange, original: Node) => void;
+        emitArrayAssignment: (elements: EffectiveBindingElement[], value: Expression, location: TextRange, original: Node) => void;
+        emitObjectAssignment: (elements: EffectiveBindingElement[], value: Expression, location: TextRange, original: Node) => void;
+        emitExpression: (value: Expression) => void;
+    }
+
+    export function flattenDestructuringToDeclarations(
+        context: TransformationContext,
+        node: VariableDeclaration | ParameterDeclaration,
+        boundValue: Expression | undefined,
+        recordTempVariablesInLine: boolean,
+        level: FlattenLevel): VisitResult<VariableDeclaration> {
+
+        const pendingDeclarations: { pendingExpressions?: Expression[], name: BindingName, value: Expression, location?: TextRange, original?: Node; }[] = [];
+        let pendingExpressions: Expression[];
+        let declaration: VariableDeclaration;
+        let declarations: VariableDeclaration[];
+        const host: FlattenHost = {
+            context,
+            level,
+            recordTempVariablesInLine,
+            emitExpression,
+            emitAssignment,
+            emitArrayAssignment,
+            emitObjectAssignment
+        };
+
+        flattenEffectiveBindingElement(host, node, boundValue, node);
+
+        if (pendingExpressions) {
+            const temp = createTempVariable(/*recordTempVariable*/ undefined);
+            if (recordTempVariablesInLine) {
+                const value = inlineExpressions(pendingExpressions);
+                pendingExpressions = undefined;
+                emitAssignment(temp, value, /*location*/ undefined, /*original*/ undefined);
+            }
+            else {
+                context.hoistVariableDeclaration(temp);
+                const pendingDeclaration = lastOrUndefined(pendingDeclarations);
+                pendingDeclaration.pendingExpressions = append(
+                    pendingDeclaration.pendingExpressions,
+                    createAssignment(temp, pendingDeclaration.value)
+                );
+                addRange(pendingDeclaration.pendingExpressions, pendingExpressions);
+                pendingDeclaration.value = temp;
+            }
+        }
+
+        for (const { pendingExpressions, name, value, location, original } of pendingDeclarations) {
+            const variable = createVariableDeclaration(
+                name,
+                /*type*/ undefined,
+                pendingExpressions ? inlineExpressions(append(pendingExpressions, value)) : value,
+                location);
+            variable.original = original;
+            if (isIdentifier(name)) {
+                setEmitFlags(variable, EmitFlags.NoNestedSourceMaps);
+            }
+            aggregateTransformFlags(variable);
+            if (!declaration) {
+                declaration = variable;
+            }
+            else if (!declarations) {
+                declarations = [declaration, variable];
+            }
+            else {
+                declarations.push(variable);
+            }
+        }
+
+        return declarations || declaration;
+
+        function emitExpression(value: Expression) {
+            pendingExpressions = append(pendingExpressions, value);
+        }
+
+        function emitAssignment(target: EffectiveBindingTarget, value: Expression, location: TextRange, original: Node) {
+            Debug.assertNode(target, isBindingName);
+            pendingDeclarations.push({ pendingExpressions, name: <BindingName>target, value, location, original });
+            if (pendingExpressions) {
+                value = inlineExpressions(append(pendingExpressions, value));
+                pendingExpressions = undefined;
+            }
+        }
+
+        function emitArrayAssignment(elements: EffectiveBindingElement[], value: Expression, location: TextRange, original: Node) {
+            Debug.assertEachNode(elements, isArrayBindingElement);
+            emitAssignment(createArrayBindingPattern(<ArrayBindingElement[]>elements), value, location, original);
+        }
+
+        function emitObjectAssignment(elements: EffectiveBindingElement[], value: Expression, location: TextRange, original: Node) {
+            Debug.assertEachNode(elements, isBindingElement);
+            emitAssignment(createObjectBindingPattern(<BindingElement[]>elements), value, location, original);
+        }
+    }
+
+    function flattenEffectiveBindingElement(
+        host: FlattenHost,
+        bindingElement: EffectiveBindingElement,
+        boundValue: Expression | undefined,
+        location: TextRange,
+        skipInitializer?: boolean) {
+        if (!skipInitializer) {
+            const initializer = getInitializerOfEffectiveBindingElement(bindingElement);
+            if (initializer) {
+                // Combine value and initializer
+                boundValue = boundValue ? createDefaultValueCheck(host, boundValue, initializer, location) : initializer;
+            }
+            else if (!boundValue) {
+                // Use 'void 0' in absence of value and initializer
+                boundValue = createVoidZero();
+            }
+        }
+        const bindingTarget = getTargetOfEffectiveBindingElement(bindingElement);
+        if (!isEffectiveBindingPattern(bindingTarget)) {
+            host.emitAssignment(bindingTarget, boundValue, location, /*original*/ bindingElement);
+        }
+        else {
+            const elements = getElementsOfEffectiveBindingPattern(bindingTarget);
+            const numElements = elements.length;
+            if (numElements !== 1) {
+                // For anything other than a single-element destructuring we need to generate a temporary
+                // to ensure value is evaluated exactly once. Additionally, if we have zero elements
+                // we need to emit *something* to ensure that in case a 'var' keyword was already emitted,
+                // so in that case, we'll intentionally create that temporary.
+                const reuseIdentifierExpressions = !isDeclarationBindingElement(bindingElement) || numElements !== 0;
+                boundValue = ensureIdentifier(host, boundValue, reuseIdentifierExpressions, location);
+            }
+            if (isEffectiveObjectBindingPattern(bindingTarget)) {
+                flattenEffectiveObjectBindingElements(host, bindingTarget, elements, boundValue, location);
+            }
+            else {
+                flattenEffectiveArrayBindingElements(host, bindingTarget, elements, boundValue, location);
+            }
+        }
+    }
+
+    function flattenEffectiveObjectBindingElements(host: FlattenHost, bindingTarget: EffectiveObjectBindingPattern, elements: EffectiveBindingElement[], boundValue: Expression, location: TextRange) {
+        let bindingElements: EffectiveBindingElement[];
+        const numElements = elements.length;
+        for (let i = 0; i < numElements; i++) {
+            const element = elements[i];
+            if (!getEffectiveRestIndicator(element)) {
+                if (host.level >= FlattenLevel.ObjectRestDestructuringOnly && !(element.transformFlags & TransformFlags.ContainsSpreadExpression)) {
+                    bindingElements = append(bindingElements, element);
+                }
+                else {
+                    if (bindingElements) {
+                        host.emitObjectAssignment(bindingElements, boundValue, location, bindingTarget);
+                        bindingElements = undefined;
+                    }
+                    const propertyName = getEffectivePropertyNameOfEffectiveBindingElement(element);
+                    const value = createDestructuringPropertyAccess(host, boundValue, propertyName);
+                    flattenEffectiveBindingElement(host, element, value, /*location*/ element);
+                }
+            }
+            else if (i === numElements - 1) {
+                if (bindingElements) {
+                    host.emitObjectAssignment(bindingElements, boundValue, location, bindingTarget);
+                    bindingElements = undefined;
+                }
+                const value = createRestCall(boundValue, elements, bindingTarget);
+                flattenEffectiveBindingElement(host, element, value, element);
+            }
+        }
+        if (bindingElements) {
+            host.emitObjectAssignment(bindingElements, boundValue, location, bindingTarget);
+        }
+    }
+
+    function flattenEffectiveArrayBindingElements(host: FlattenHost, bindingTarget: EffectiveArrayBindingPattern, elements: EffectiveBindingElement[], boundValue: Expression, location: TextRange) {
+        let bindingElements: EffectiveBindingElement[];
+        let spreadContainingElements: EffectiveBindingElement[];
+        let tempNames: Map<Identifier>;
+        const numElements = elements.length;
+        for (let i = 0; i < numElements; i++) {
+            const element = elements[i];
+            if (isOmittedExpression(element)) {
+                continue;
+            }
+            else if (host.level >= FlattenLevel.ObjectRestDestructuringOnly) {
+                if (element.transformFlags & TransformFlags.ContainsSpreadExpression) {
+                    const temp = createTempVariable(/*recordTempVariable*/ undefined);
+                    tempNames = appendProperty(tempNames, getNodeId(element), temp);
+                    spreadContainingElements = append(spreadContainingElements, element);
+                    bindingElements = append(bindingElements, temp);
+                }
+                else {
+                    bindingElements = append(bindingElements, element);
+                }
+            }
+            else if (!getEffectiveRestIndicator(element)) {
+                const value = createElementAccess(boundValue, i);
+                flattenEffectiveBindingElement(host, element, value, /*location*/ element);
+            }
+            else if (i === numElements - 1) {
+                const value = createArraySlice(boundValue, i);
+                flattenEffectiveBindingElement(host, element, value, /*location*/ element);
+            }
+        }
+        if (bindingElements) {
+            host.emitArrayAssignment(bindingElements, boundValue, location, bindingTarget);
+        }
+        if (spreadContainingElements) {
+            for (const element of spreadContainingElements) {
+                flattenEffectiveBindingElement(host, element, tempNames[getNodeId(element)], element);
+            }
+        }
+    }
+
+    /**
+     * Creates an expression used to provide a default value if a value is `undefined` at runtime.
+     */
+    function createDefaultValueCheck(host: FlattenHost, value: Expression, defaultValue: Expression, location: TextRange): Expression {
+        value = ensureIdentifier(host, value, /*reuseIdentifierExpressions*/ true, location);
+        return createConditional(
+            createStrictEquality(value, createVoidZero()),
+            createToken(SyntaxKind.QuestionToken),
+            defaultValue,
+            createToken(SyntaxKind.ColonToken),
+            value
+        );
+    }
+
+    /**
+     * Creates either a PropertyAccessExpression or an ElementAccessExpression for the
+     * right-hand side of a transformed destructuring assignment.
+     *
+     * @param expression The right-hand expression that is the source of the property.
+     * @param propertyName The destructuring property name.
+     * @param emitTempVariableAssignment A callback used to emit a temporary variable.
+     */
+    function createDestructuringPropertyAccess(host: FlattenHost, expression: Expression, propertyName: PropertyName): LeftHandSideExpression {
+        if (isComputedPropertyName(propertyName)) {
+            const argumentExpression = ensureIdentifier(host, propertyName.expression, /*reuseIdentifierExpressions*/ false, /*location*/ propertyName);
+            return createElementAccess(expression, argumentExpression);
+        }
+        else if (isLiteralExpression(propertyName)) {
+            const argumentExpression = getSynthesizedClone(propertyName);
+            argumentExpression.text = unescapeIdentifier(argumentExpression.text);
+            return createElementAccess(expression, argumentExpression);
+        }
+        else if (isGeneratedIdentifier(propertyName)) {
+            const name = getSynthesizedClone(propertyName);
+            name.text = unescapeIdentifier(name.text);
+            return createPropertyAccess(expression, name);
+        }
+        else {
+            const name = createIdentifier(unescapeIdentifier(propertyName.text));
+            return createPropertyAccess(expression, name);
+        }
+    }
+
+    /**
+     * Ensures that there exists a declared identifier whose value holds the given expression.
+     * This function is useful to ensure that the expression's value can be read from in subsequent expressions.
+     * Unless 'reuseIdentifierExpressions' is false, 'value' will be returned if it is just an identifier.
+     *
+     * @param value the expression whose value needs to be bound.
+     * @param reuseIdentifierExpressions true if identifier expressions can simply be returned;
+     * false if it is necessary to always emit an identifier.
+     * @param emitTempVariableAssignment A callback used to emit a temporary variable.
+     * @param location The location to use for source maps and comments.
+     */
+    function ensureIdentifier(
+        host: FlattenHost,
+        value: Expression,
+        reuseIdentifierExpressions: boolean,
+        location: TextRange) {
+
+        if (isIdentifier(value) && reuseIdentifierExpressions) {
+            return value;
+        }
+        else {
+            const temp = createTempVariable(/*recordTempVariable*/ undefined);
+            if (host.recordTempVariablesInLine) {
+                host.emitAssignment(temp, value, location, /*original*/ undefined);
+            }
+            else {
+                host.context.hoistVariableDeclaration(temp);
+                host.emitExpression(createAssignment(temp, value, location));
+            }
+            return temp;
+        }
+    }
+
+    /**
+     * Determines whether the EffectiveBindingElement is a declaration
+     */
+    function isDeclarationBindingElement(bindingElement: EffectiveBindingElement): bindingElement is VariableDeclaration | ParameterDeclaration | BindingElement {
+        switch (bindingElement.kind) {
+            case SyntaxKind.VariableDeclaration:
+            case SyntaxKind.Parameter:
+            case SyntaxKind.BindingElement:
+                return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Gets the initializer of an EffectiveBindingElement.
+     */
+    function getInitializerOfEffectiveBindingElement(bindingElement: EffectiveBindingElement): Expression | undefined {
+        if (isDeclarationBindingElement(bindingElement)) {
+            // `1` in `let { a = 1 } = ...`
+            // `1` in `let { a: b = 1 } = ...`
+            // `1` in `let { a: {b} = 1 } = ...`
+            // `1` in `let { a: [b] = 1 } = ...`
+            // `1` in `let [a = 1] = ...`
+            // `1` in `let [{a} = 1] = ...`
+            // `1` in `let [[a] = 1] = ...`
+            return bindingElement.initializer;
+        }
+
+        if (isPropertyAssignment(bindingElement)) {
+            // `1` in `({ a: b = 1 } = ...)`
+            // `1` in `({ a: {b} = 1 } = ...)`
+            // `1` in `({ a: [b] = 1 } = ...)`
+            return isAssignmentExpression(bindingElement.initializer, /*excludeCompoundAssignment*/ true)
+                ? bindingElement.initializer.right
+                : undefined;
+        }
+
+        if (isShorthandPropertyAssignment(bindingElement)) {
+            // `1` in `({ a = 1 } = ...)`
+            return bindingElement.objectAssignmentInitializer;
+        }
+
+        if (isAssignmentExpression(bindingElement, /*excludeCompoundAssignment*/ true)) {
+            // `1` in `[a = 1] = ...`
+            // `1` in `[{a} = 1] = ...`
+            // `1` in `[[a] = 1] = ...`
+            return bindingElement.right;
+        }
+
+        if (isSpreadExpression(bindingElement) || isPartiallyEmittedExpression(bindingElement)) {
+            // Recovery consistent with existing emit.
+            return getInitializerOfEffectiveBindingElement(bindingElement.expression);
+        }
+    }
+
+    /**
+     * Gets the name of an EffectiveBindingElement.
+     */
+    function getTargetOfEffectiveBindingElement(bindingElement: EffectiveBindingElement): EffectiveBindingTarget {
+        if (isDeclarationBindingElement(bindingElement)) {
+            // `a` in `let { a } = ...`
+            // `a` in `let { a = 1 } = ...`
+            // `b` in `let { a: b } = ...`
+            // `b` in `let { a: b = 1 } = ...`
+            // `a` in `let { ...a } = ...`
+            // `{b}` in `let { a: {b} } = ...`
+            // `{b}` in `let { a: {b} = 1 } = ...`
+            // `[b]` in `let { a: [b] } = ...`
+            // `[b]` in `let { a: [b] = 1 } = ...`
+            // `a` in `let [a] = ...`
+            // `a` in `let [a = 1] = ...`
+            // `a` in `let [...a] = ...`
+            // `{a}` in `let [{a}] = ...`
+            // `{a}` in `let [{a} = 1] = ...`
+            // `[a]` in `let [[a]] = ...`
+            // `[a]` in `let [[a] = 1] = ...`
+            return <ObjectBindingPattern | ArrayBindingPattern | Identifier>bindingElement.name;
+        }
+
+        if (isObjectLiteralElementLike(bindingElement)) {
+            switch (bindingElement.kind) {
+                case SyntaxKind.PropertyAssignment:
+                    // `b` in `({ a: b } = ...)`
+                    // `b` in `({ a: b = 1 } = ...)`
+                    // `{b}` in `({ a: {b} } = ...)`
+                    // `{b}` in `({ a: {b} = 1 } = ...)`
+                    // `[b]` in `({ a: [b] } = ...)`
+                    // `[b]` in `({ a: [b] = 1 } = ...)`
+                    // `b.c` in `({ a: b.c } = ...)`
+                    // `b.c` in `({ a: b.c = 1 } = ...)`
+                    // `b[0]` in `({ a: b[0] } = ...)`
+                    // `b[0]` in `({ a: b[0] = 1 } = ...)`
+                    return getTargetOfEffectiveBindingElement(bindingElement.initializer);
+
+                case SyntaxKind.ShorthandPropertyAssignment:
+                    // `a` in `({ a } = ...)`
+                    // `a` in `({ a = 1 } = ...)`
+                    return bindingElement.name;
+
+                case SyntaxKind.SpreadAssignment:
+                    // `a` in `({ ...a } = ...)`
+                    return getTargetOfEffectiveBindingElement(bindingElement.expression);
+            }
+
+            // no target
+            return undefined;
+        }
+
+        if (isAssignmentExpression(bindingElement, /*excludeCompoundAssignment*/ true)) {
+            // `a` in `[a = 1] = ...`
+            // `{a}` in `[{a} = 1] = ...`
+            // `[a]` in `[[a] = 1] = ...`
+            // `a.b` in `[a.b = 1] = ...`
+            // `a[0]` in `[a[0] = 1] = ...`
+            return getTargetOfEffectiveBindingElement(bindingElement.left);
+        }
+
+        if (isSpreadExpression(bindingElement) || isPartiallyEmittedExpression(bindingElement)) {
+            // `a` in `[...a] = ...`
+            return getTargetOfEffectiveBindingElement(bindingElement.expression);
+        }
+
+        // `a` in `[a] = ...`
+        // `{a}` in `[{a}] = ...`
+        // `[a]` in `[[a]] = ...`
+        // `a.b` in `[a.b] = ...`
+        // `a[0]` in `[a[0]] = ...`
+        return bindingElement;
+    }
+
+    /**
+     * Determines whether an EffectiveBindingElement is a rest element.
+     */
+    function getEffectiveRestIndicator(bindingElement: EffectiveBindingElement): EffectiveRestIndicator {
+        switch (bindingElement.kind) {
+            case SyntaxKind.Parameter:
+            case SyntaxKind.BindingElement:
+                // `...` in `let [...a] = ...`
+                return (<ParameterDeclaration | BindingElement>bindingElement).dotDotDotToken;
+
+            case SyntaxKind.SpreadElement:
+            case SyntaxKind.SpreadAssignment:
+                // `...` in `[...a] = ...`
+                return <SpreadElement | SpreadAssignment>bindingElement;
+        }
+
+        return undefined;
+    }
+
+    /**
+     * Gets the property name of a BindingElement-like element
+     */
+    function getEffectivePropertyNameOfEffectiveBindingElement(bindingElement: EffectiveBindingElement) {
+        switch (bindingElement.kind) {
+            case SyntaxKind.BindingElement:
+                // `a` in `let { a: b } = ...`
+                // `[a]` in `let { [a]: b } = ...`
+                // `"a"` in `let { "a": b } = ...`
+                // `1` in `let { 1: b } = ...`
+                if ((<BindingElement>bindingElement).propertyName) {
+                    return (<BindingElement>bindingElement).propertyName;
+                }
+
+                break;
+
+            case SyntaxKind.PropertyAssignment:
+                // `a` in `({ a: b } = ...)`
+                // `[a]` in `({ [a]: b } = ...)`
+                // `"a"` in `({ "a": b } = ...)`
+                // `1` in `({ 1: b } = ...)`
+                if ((<PropertyAssignment>bindingElement).name) {
+                    return (<PropertyAssignment>bindingElement).name;
+                }
+
+                break;
+
+            case SyntaxKind.SpreadAssignment:
+                // `a` in `({ ...a } = ...)`
+                return (<SpreadAssignment>bindingElement).name;
+        }
+
+        const target = getTargetOfEffectiveBindingElement(bindingElement);
+        if (target && isPropertyName(target)) {
+            return target;
+        }
+
+        Debug.fail("Invalid property name for binding element.");
+    }
+
+    /**
+     * Determines whether a node is BindingPattern-like
+     */
+    function isEffectiveBindingPattern(node: EffectiveBindingTarget): node is EffectiveBindingPattern {
+        return isEffectiveObjectBindingPattern(node)
+            || isEffectiveArrayBindingPattern(node);
+    }
+
+    /**
+     * Determines whether a node is ObjectBindingPattern-like
+     */
+    function isEffectiveObjectBindingPattern(node: EffectiveBindingTarget): node is EffectiveObjectBindingPattern {
+        switch (node.kind) {
+            case SyntaxKind.ObjectBindingPattern:
+            case SyntaxKind.ObjectLiteralExpression:
+                return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Determines whether a node is ArrayBindingPattern-like
+     */
+    function isEffectiveArrayBindingPattern(node: EffectiveBindingTarget): node is EffectiveArrayBindingPattern {
+        switch (node.kind) {
+            case SyntaxKind.ArrayBindingPattern:
+            case SyntaxKind.ArrayLiteralExpression:
+                return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Gets the elements of a BindingPattern-like name
+     */
+    function getElementsOfEffectiveBindingPattern(name: EffectiveBindingPattern): EffectiveBindingElement[] {
+        switch (name.kind) {
+            case SyntaxKind.ObjectBindingPattern:
+            case SyntaxKind.ArrayBindingPattern:
+            case SyntaxKind.ArrayLiteralExpression:
+                // `a` in `{a}`
+                // `a` in `[a]`
+                return name.elements;
+
+            case SyntaxKind.ObjectLiteralExpression:
+                // `a` in `{a}`
+                return name.properties;
+        }
+    }
+
+    // function updateEffectiveBindingElement(bindingElement: EffectiveBindingElement, restIndicator: EffectiveRestIndicator, propertyName: PropertyName, target: EffectiveBindingTarget, initializer: Expression) {
+    //     switch (bindingElement.kind) {
+    //         case SyntaxKind.VariableDeclaration:
+    //             Debug.assertNode(target, isBindingName);
+    //             Debug.assertMissingNode(propertyName);
+    //             return updateVariableDeclaration(
+    //                 <VariableDeclaration>bindingElement,
+    //                 <BindingName>target,
+    //                 /*type*/ undefined,
+    //                 initializer
+    //             );
+
+    //         case SyntaxKind.Parameter:
+    //             Debug.assertOptionalToken(restIndicator, SyntaxKind.DotDotDotToken);
+    //             Debug.assertMissingNode(propertyName);
+    //             Debug.assertNode(target, isBindingName);
+    //             return updateParameter(
+    //                 <ParameterDeclaration>bindingElement,
+    //                 /*decorators*/ undefined,
+    //                 /*modifiers*/ undefined,
+    //                 <DotDotDotToken>restIndicator,
+    //                 <BindingName>target,
+    //                 /*type*/ undefined,
+    //                 initializer
+    //             );
+
+    //         case SyntaxKind.BindingElement:
+    //             Debug.assertOptionalToken(restIndicator, SyntaxKind.DotDotDotToken);
+    //             Debug.assertNode(target, isBindingName);
+    //             return updateBindingElement(
+    //                 <BindingElement>bindingElement,
+    //                 <DotDotDotToken>restIndicator,
+    //                 propertyName,
+    //                 <BindingName>target,
+    //                 initializer
+    //             );
+
+    //         case SyntaxKind.PropertyAssignment:
+    //         case SyntaxKind.ShorthandPropertyAssignment:
+    //         case SyntaxKind.SpreadAssignment:
+    //             if (restIndicator) {
+    //                 return convertToSpreadAssignment(<PropertyAssignment | ShorthandPropertyAssignment | SpreadAssignment>bindingElement, propertyName, target, initializer);
+    //             }
+    //             else if (propertyName) {
+    //                 return convertToPropertyAssignment(<PropertyAssignment | ShorthandPropertyAssignment | SpreadAssignment>bindingElement, propertyName, target, initializer);
+    //             }
+    //             else {
+    //                 return convertToShorthandPropertyAssignment(<PropertyAssignment | ShorthandPropertyAssignment | SpreadAssignment>bindingElement, target, initializer);
+    //             }
+
+    //         case SyntaxKind.ArrayLiteralExpression:
+    //         case SyntaxKind.BinaryExpression:
+    //         case SyntaxKind.SpreadElement:
+    //         case SyntaxKind.PropertyAccessExpression:
+    //         case SyntaxKind.ElementAccessExpression:
+    //             Debug.assertMissingNode(propertyName);
+    //             if (restIndicator) {
+    //                 return convertToSpreadElement(<Expression>bindingElement, target, initializer);
+    //             }
+    //             else {
+
+    //             }
+    //     }
+    // }
+
+    // function convertToSpreadAssignment(node: PropertyAssignment | ShorthandPropertyAssignment | SpreadAssignment, propertyName: PropertyName, target: EffectiveBindingTarget, initializer: Expression) {
+    //     Debug.assertMissingNode(propertyName);
+    //     Debug.assertNode(target, isIdentifier);
+    //     Debug.assertMissingNode(initializer);
+    //     if (node.kind === SyntaxKind.SpreadAssignment) {
+    //         return updateSpreadAssignment(node, <Identifier>target);
+    //     }
+    //     return setOriginalNode(
+    //         createSpreadAssignment(
+    //             <Identifier>target,
+    //             node
+    //         ),
+    //         node
+    //     );
+    // }
+
+    // function convertToPropertyAssignment(node: PropertyAssignment | ShorthandPropertyAssignment | SpreadAssignment, propertyName: PropertyName, target: EffectiveBindingTarget, initializer: Expression) {
+    //     Debug.assertNode(target, isExpression);
+    //     if (node.kind === SyntaxKind.PropertyAssignment) {
+    //         return updatePropertyAssignment(
+    //             node,
+    //             propertyName,
+    //             initializer ?
+    //                 isAssignmentExpression(node.initializer, /*excludeCompoundAssignment*/ true)
+    //                     ? updateBinary(node.initializer, <Expression>target, initializer)
+    //                     : createAssignment(<Expression>target, initializer)
+    //                 : <Expression>target
+    //         );
+    //     }
+    //     return setOriginalNode(
+    //         createPropertyAssignment(
+    //             propertyName,
+    //             initializer ?
+    //                 createAssignment(<Expression>target, initializer)
+    //                 : <Expression>target,
+    //             node
+    //         ),
+    //         node
+    //     );
+    // }
+
+    // function convertToShorthandPropertyAssignment(node: PropertyAssignment | ShorthandPropertyAssignment | SpreadAssignment, target: EffectiveBindingTarget, initializer: Expression) {
+    //     Debug.assertNode(target, isIdentifier);
+    //     if (node.kind === SyntaxKind.ShorthandPropertyAssignment) {
+    //         return updateShorthandPropertyAssignment(
+    //             node,
+    //             <Identifier>target,
+    //             initializer
+    //         );
+    //     }
+    //     return setOriginalNode(
+    //         createShorthandPropertyAssignment(
+    //             <Identifier>target,
+    //             initializer,
+    //             node
+    //         ),
+    //         node
+    //     );
+    // }
+
+    // function convertToSpreadElement(node: Expression, target: EffectiveBindingTarget, initializer: Expression) {
+    //     Debug.assertNode(target, isExpression);
+    //     Debug.assertMissingNode(initializer);
+    //     if (node.kind === SyntaxKind.SpreadElement) {
+    //         return updateSpread(
+    //             <SpreadElement>node,
+    //             <Expression>target);
+    //     }
+    //     return setOriginalNode(
+    //         createSpread(
+    //             <Expression>target,
+    //             node
+    //         ),
+    //         node
+    //     );
+    // }
+
+    // function convertToElement(node: Expression, target: EffectiveBindingTarget, initializer: Expression) {
+
+    // }
+
+    function createOrUpdateVariableDeclaration(node: Node, name: BindingName, initializer: Expression, location: TextRange) {
+        if (node && node.kind === SyntaxKind.VariableDeclaration) {
+            return updateVariableDeclaration(<VariableDeclaration>node, name, /*type*/ undefined, initializer);
+        }
+        const variable = createVariableDeclaration(name, /*type*/ undefined, initializer, location);
+        return node ? setOriginalNode(variable, node) : variable;
+    }
+
+    function createOrUpdateArrayBindingPattern(node: Node, elements: ArrayBindingElement[], location: TextRange) {
+        if (node && node.kind === SyntaxKind.ArrayBindingPattern) {
+            return updateArrayBindingPattern(<ArrayBindingPattern>node, elements);
+        }
+        const pattern = createArrayBindingPattern(elements, location);
+        return node ? setOriginalNode(pattern, node) : pattern;
+    }
+
+    function createOrUpdateObjectBindingPattern(node: Node, elements: BindingElement[], location: TextRange) {
+        if (node && node.kind === SyntaxKind.ArrayBindingPattern) {
+            return updateObjectBindingPattern(<ObjectBindingPattern>node, elements);
+        }
+        const pattern = createObjectBindingPattern(elements, location);
+        return node ? setOriginalNode(pattern, node) : pattern;
+    }
+
+    /** Given value: o, propName: p, pattern: { a, b, ...p } from the original statement
+     * `{ a, b, ...p } = o`, create `p = __rest(o, ["a", "b"]);`*/
+    function createRestCall(value: Expression, elements: EffectiveBindingElement[], location: TextRange): Expression {
+        const propertyNames: LiteralExpression[] = [];
+        for (let i = 0; i < elements.length - 1; i++) {
+            if (isOmittedExpression(elements[i])) {
+                continue;
+            }
+            const str = <StringLiteral>createSynthesizedNode(SyntaxKind.StringLiteral);
+            str.pos = location.pos;
+            str.end = location.end;
+            str.text = getTextOfPropertyName(getEffectivePropertyNameOfEffectiveBindingElement(elements[i]));
+            propertyNames.push(str);
+        }
+        const args = createSynthesizedNodeArray([value, createArrayLiteral(propertyNames, location)]);
+        return createCall(createIdentifier("__rest"), undefined, args);
+    }
 }
diff --git a/src/compiler/transformers/esnext.ts b/src/compiler/transformers/esnext.ts
index 1fad209bdb3..9013fabf584 100644
--- a/src/compiler/transformers/esnext.ts
+++ b/src/compiler/transformers/esnext.ts
@@ -105,7 +105,7 @@ namespace ts {
          * @param node A BinaryExpression node.
          */
         function visitBinaryExpression(node: BinaryExpression): Expression {
-            if (isDestructuringAssignment(node) && node.left.transformFlags & TransformFlags.AssertESNext) {
+            if (isDestructuringAssignment(node) && node.left.transformFlags & TransformFlags.ContainsESNext) {
                 return flattenDestructuringAssignment(context, node, /*needsDestructuringValue*/ true, hoistVariableDeclaration, visitor, /*transformRest*/ true);
             }
 
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index c814a2b1d46..e8018083783 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -1175,16 +1175,18 @@ namespace ts {
         right: Expression;
     }
 
-    export interface AssignmentExpression extends BinaryExpression {
+    export type AssignmentOperatorToken = Token<AssignmentOperator>;
+
+    export interface AssignmentExpression<TOperator extends AssignmentOperatorToken> extends BinaryExpression {
         left: LeftHandSideExpression;
-        operatorToken: Token<SyntaxKind.EqualsToken>;
+        operatorToken: TOperator;
     }
 
-    export interface ObjectDestructuringAssignment extends AssignmentExpression {
+    export interface ObjectDestructuringAssignment extends AssignmentExpression<EqualsToken> {
         left: ObjectLiteralExpression;
     }
 
-    export interface ArrayDestructuringAssignment extends AssignmentExpression {
+    export interface ArrayDestructuringAssignment extends AssignmentExpression<EqualsToken> {
         left: ArrayLiteralExpression;
     }
 
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index c49c33b857f..f0a666e1531 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -3125,19 +3125,21 @@ namespace ts {
         }
     }
 
-    export function isAssignmentExpression(node: Node): node is AssignmentExpression {
+    export function isAssignmentExpression(node: Node, excludeCompoundAssignment: true): node is AssignmentExpression<EqualsToken>;
+    export function isAssignmentExpression(node: Node, excludeCompoundAssignment?: false): node is AssignmentExpression<AssignmentOperatorToken>;
+    export function isAssignmentExpression(node: Node, excludeCompoundAssignment?: boolean): node is AssignmentExpression<AssignmentOperatorToken> {
         return isBinaryExpression(node)
-            && isAssignmentOperator(node.operatorToken.kind)
+            && (excludeCompoundAssignment
+                ? node.operatorToken.kind === SyntaxKind.EqualsToken
+                : isAssignmentOperator(node.operatorToken.kind))
             && isLeftHandSideExpression(node.left);
     }
 
     export function isDestructuringAssignment(node: Node): node is DestructuringAssignment {
-        if (isBinaryExpression(node)) {
-            if (node.operatorToken.kind === SyntaxKind.EqualsToken) {
-                const kind = node.left.kind;
-                return kind === SyntaxKind.ObjectLiteralExpression
-                    || kind === SyntaxKind.ArrayLiteralExpression;
-            }
+        if (isAssignmentExpression(node, /*excludeCompoundAssignment*/ true)) {
+            const kind = node.left.kind;
+            return kind === SyntaxKind.ObjectLiteralExpression
+                || kind === SyntaxKind.ArrayLiteralExpression;
         }
 
         return false;
@@ -3918,6 +3920,14 @@ namespace ts {
 
     // Binding patterns
 
+    export function isArrayBindingPattern(node: Node): node is ArrayBindingPattern {
+        return node.kind === SyntaxKind.ArrayBindingPattern;
+    }
+
+    export function isObjectBindingPattern(node: Node): node is ObjectBindingPattern {
+        return node.kind === SyntaxKind.ObjectBindingPattern;
+    }
+
     export function isBindingPattern(node: Node): node is BindingPattern {
         if (node) {
             const kind = node.kind;
diff --git a/src/compiler/visitor.ts b/src/compiler/visitor.ts
index cc27d5c9ddf..ebb3ec01ed3 100644
--- a/src/compiler/visitor.ts
+++ b/src/compiler/visitor.ts
@@ -701,6 +701,7 @@ namespace ts {
                 return updateParameter(<ParameterDeclaration>node,
                     visitNodes((<ParameterDeclaration>node).decorators, visitor, isDecorator),
                     visitNodes((<ParameterDeclaration>node).modifiers, visitor, isModifier),
+                    (<ParameterDeclaration>node).dotDotDotToken,
                     visitNode((<ParameterDeclaration>node).name, visitor, isBindingName),
                     visitNode((<ParameterDeclaration>node).type, visitor, isTypeNode, /*optional*/ true),
                     visitNode((<ParameterDeclaration>node).initializer, visitor, isExpression, /*optional*/ true));
@@ -767,6 +768,7 @@ namespace ts {
 
             case SyntaxKind.BindingElement:
                 return updateBindingElement(<BindingElement>node,
+                    (<BindingElement>node).dotDotDotToken,
                     visitNode((<BindingElement>node).propertyName, visitor, isPropertyName, /*optional*/ true),
                     visitNode((<BindingElement>node).name, visitor, isBindingName),
                     visitNode((<BindingElement>node).initializer, visitor, isExpression, /*optional*/ true));
@@ -1287,6 +1289,13 @@ namespace ts {
             ? (node: Node, message?: string) => assert(false, message || "Unexpected node.", () => `Node ${formatSyntaxKind(node.kind)} was unexpected.`)
             : noop;
 
+        export const assertEachNode = shouldAssert(AssertionLevel.Normal)
+            ? (nodes: Node[], test: (node: Node) => boolean, message?: string) => assert(
+                    test === undefined || every(nodes, test),
+                    message || "Unexpected node.",
+                    () => `Node array did not pass test '${getFunctionName(test)}'.`)
+            : noop;
+
         export const assertNode = shouldAssert(AssertionLevel.Normal)
             ? (node: Node, test: (node: Node) => boolean, message?: string) => assert(
                     test === undefined || test(node),
@@ -1294,6 +1303,27 @@ namespace ts {
                     () => `Node ${formatSyntaxKind(node.kind)} did not pass test '${getFunctionName(test)}'.`)
             : noop;
 
+        export const assertOptionalNode = shouldAssert(AssertionLevel.Normal)
+            ? (node: Node, test: (node: Node) => boolean, message?: string) => assert(
+                    test === undefined || node === undefined || test(node),
+                    message || "Unexpected node.",
+                    () => `Node ${formatSyntaxKind(node.kind)} did not pass test '${getFunctionName(test)}'.`)
+            : noop;
+
+        export const assertOptionalToken = shouldAssert(AssertionLevel.Normal)
+            ? (node: Node, kind: SyntaxKind, message?: string) => assert(
+                    kind === undefined || node === undefined || node.kind === kind,
+                    message || "Unexpected node.",
+                    () => `Node ${formatSyntaxKind(node.kind)} was not a '${formatSyntaxKind(kind)}' token.`)
+            : noop;
+
+        export const assertMissingNode = shouldAssert(AssertionLevel.Normal)
+            ? (node: Node, message?: string) => assert(
+                    node === undefined,
+                    message || "Unexpected node.",
+                    () => `Node ${formatSyntaxKind(node.kind)} was unexpected'.`)
+            : noop;
+
         function getFunctionName(func: Function) {
             if (typeof func !== "function") {
                 return "";

From 3b09010c7c601f7c2146240ddd444de8de74ced8 Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Fri, 11 Nov 2016 17:35:11 -0800
Subject: [PATCH 198/421] enable syntactic features if project size exceeded
 the limit, send events when state of language service changes

---
 src/compiler/diagnosticMessages.json          |   4 +
 .../unittests/tsserverProjectSystem.ts        | 102 +++++++++++++-
 src/server/editorServices.ts                  |  43 +++++-
 src/server/lsHost.ts                          |   4 +-
 src/server/project.ts                         | 125 +++++++++++++++---
 src/server/protocol.ts                        |  21 +++
 src/server/session.ts                         |  12 +-
 src/server/utilities.ts                       |  63 ---------
 src/services/services.ts                      |   2 +-
 9 files changed, 283 insertions(+), 93 deletions(-)

diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index ce5e59e509c..be33335021b 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -3089,6 +3089,10 @@
         "category": "Error",
         "code": 9003
     },
+    "Language service is disabled.": {
+        "category": "Error",
+        "code": 9004
+    },
     "JSX attributes must only be assigned a non-empty 'expression'.": {
         "category": "Error",
         "code": 17000
diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
index 9c3c7a4cd5b..32a78a07811 100644
--- a/src/harness/unittests/tsserverProjectSystem.ts
+++ b/src/harness/unittests/tsserverProjectSystem.ts
@@ -154,7 +154,6 @@ namespace ts.projectSystem {
             params.executingFilePath || getExecutingFilePathFromLibFile(),
             params.currentDirectory || "/",
             fileOrFolderList);
-        host.createFileOrFolder(safeList, /*createParentDirectory*/ true);
         return host;
     }
 
@@ -355,7 +354,8 @@ namespace ts.projectSystem {
         reloadFS(filesOrFolders: FileOrFolder[]) {
             this.filesOrFolders = filesOrFolders;
             this.fs = createFileMap<FSEntry>();
-            for (const fileOrFolder of filesOrFolders) {
+            // always inject safelist file in the list of files
+            for (const fileOrFolder of filesOrFolders.concat(safeList)) {
                 const path = this.toPath(fileOrFolder.path);
                 const fullPath = getNormalizedAbsolutePath(fileOrFolder.path, this.currentDirectory);
                 if (typeof fileOrFolder.content === "string") {
@@ -1585,6 +1585,104 @@ namespace ts.projectSystem {
             projectService.closeClientFile(file1.path);
             checkNumberOfProjects(projectService, { configuredProjects: 0 });
         });
+
+        it("language service disabled events are triggered", () => {
+            const f1 = {
+                path: "/a/app.js",
+                content: "let x = 1;"
+            };
+            const f2 = {
+                path: "/a/largefile.js",
+                content: ""
+            };
+            const config = {
+                path: "/a/jsconfig.json",
+                content: "{}"
+            };
+            const configWithExclude = {
+                path: config.path,
+                content: JSON.stringify({ exclude: ["largefile.js"] })
+            };
+            const host = createServerHost([f1, f2, config]);
+            const originalGetFileSize = host.getFileSize;
+            host.getFileSize = (filePath: string) =>
+                filePath === f2.path ? server.maxProgramSizeForNonTsFiles + 1 : originalGetFileSize.call(host, filePath);
+
+            let lastEvent: server.ProjectLanguageServiceStateEvent;
+            const session = createSession(host, /*typingsInstaller*/ undefined, e => {
+                if (e.eventName === server.ConfigFileDiagEvent || e.eventName === server.ContextEvent) {
+                    return;
+                }
+                assert.equal(e.eventName, server.ProjectLanguageServiceStateEvent);
+                lastEvent = <server.ProjectLanguageServiceStateEvent>e;
+            });
+            session.executeCommand(<protocol.OpenRequest>{
+                seq: 0,
+                type: "request",
+                command: "open",
+                arguments: { file: f1.path }
+            });
+            const projectService = session.getProjectService();
+            checkNumberOfProjects(projectService, { configuredProjects: 1 });
+            const project = projectService.configuredProjects[0];
+            assert.isFalse(project.languageServiceEnabled, "Language service enabled");
+            assert.isTrue(!!lastEvent, "should receive event");
+            assert.equal(lastEvent.data.project, project, "project name");
+            assert.isFalse(lastEvent.data.languageServiceEnabled, "Language service state");
+
+            host.reloadFS([f1, f2, configWithExclude]);
+            host.triggerFileWatcherCallback(config.path, /*removed*/ false);
+
+            checkNumberOfProjects(projectService, { configuredProjects: 1 });
+            assert.isTrue(project.languageServiceEnabled, "Language service enabled");
+            assert.equal(lastEvent.data.project, project, "project");
+            assert.isTrue(lastEvent.data.languageServiceEnabled, "Language service state");
+        });
+
+        it("syntactic features work even if language service is disabled", () => {
+            const f1 = {
+                path: "/a/app.js",
+                content: "let x =   1;"
+            };
+            const f2 = {
+                path: "/a/largefile.js",
+                content: ""
+            };
+            const config = {
+                path: "/a/jsconfig.json",
+                content: "{}"
+            };
+            const host = createServerHost([f1, f2, config]);
+            const originalGetFileSize = host.getFileSize;
+            host.getFileSize = (filePath: string) =>
+                filePath === f2.path ? server.maxProgramSizeForNonTsFiles + 1 : originalGetFileSize.call(host, filePath);
+            let lastEvent: server.ProjectLanguageServiceStateEvent;
+            const session = createSession(host, /*typingsInstaller*/ undefined, e => {
+                if (e.eventName === server.ConfigFileDiagEvent) {
+                    return;
+                }
+                assert.equal(e.eventName, server.ProjectLanguageServiceStateEvent);
+                lastEvent = <server.ProjectLanguageServiceStateEvent>e;
+            });
+            session.executeCommand(<protocol.OpenRequest>{
+                seq: 0,
+                type: "request",
+                command: "open",
+                arguments: { file: f1.path }
+            });
+
+            const projectService = session.getProjectService();
+            checkNumberOfProjects(projectService, { configuredProjects: 1 });
+            const project = projectService.configuredProjects[0];
+            assert.isFalse(project.languageServiceEnabled, "Language service enabled");
+            assert.isTrue(!!lastEvent, "should receive event");
+            assert.equal(lastEvent.data.project, project, "project name");
+            assert.isFalse(lastEvent.data.languageServiceEnabled, "Language service state");
+
+            const options = projectService.getFormatCodeOptions();
+            const edits = project.getLanguageService().getFormattingEditsForDocument(f1.path, options);
+            assert.deepEqual(edits, [{ span: createTextSpan(/*start*/ 7, /*length*/ 3), newText: " " }]);
+        });
     });
 
     describe("Proper errors", () => {
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index d7dcfc810b4..f69b5c11547 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -10,8 +10,26 @@
 namespace ts.server {
     export const maxProgramSizeForNonTsFiles = 20 * 1024 * 1024;
 
-    export type ProjectServiceEvent =
-        { eventName: "context", data: { project: Project, fileName: NormalizedPath } } | { eventName: "configFileDiag", data: { triggerFile: string, configFileName: string, diagnostics: Diagnostic[] } };
+    export const ContextEvent = "context";
+    export const ConfigFileDiagEvent = "configFileDiag";
+    export const ProjectLanguageServiceStateEvent = "projectLanguageServiceState";
+
+    export interface ContextEvent {
+        eventName: typeof ContextEvent;
+        data: { project: Project; fileName: NormalizedPath };
+    }
+
+    export interface ConfigFileDiagEvent {
+        eventName: typeof ConfigFileDiagEvent;
+        data: { triggerFile: string, configFileName: string, diagnostics: Diagnostic[] };
+    }
+
+    export interface ProjectLanguageServiceStateEvent {
+        eventName: typeof ProjectLanguageServiceStateEvent;
+        data: { project: Project, languageServiceEnabled: boolean };
+    }
+
+    export type ProjectServiceEvent = ContextEvent | ConfigFileDiagEvent | ProjectLanguageServiceStateEvent;
 
     export interface ProjectServiceEventHandler {
         (event: ProjectServiceEvent): void;
@@ -282,6 +300,16 @@ namespace ts.server {
             return this.compilerOptionsForInferredProjects;
         }
 
+        onUpdateLanguageServiceStateForProject(project: Project, languageServiceEnabled: boolean) {
+            if (!this.eventHandler) {
+                return;
+            }
+            this.eventHandler(<ProjectLanguageServiceStateEvent>{
+                eventName: ProjectLanguageServiceStateEvent,
+                data: { project, languageServiceEnabled }
+            });
+        }
+
         updateTypingsForProject(response: SetTypings | InvalidateCachedTypings): void {
             const project = this.findProject(response.projectName);
             if (!project) {
@@ -430,7 +458,10 @@ namespace ts.server {
                 }
 
                 for (const openFile of this.openFiles) {
-                    this.eventHandler({ eventName: "context", data: { project: openFile.getDefaultProject(), fileName: openFile.fileName } });
+                    this.eventHandler(<ContextEvent>{
+                        eventName: ContextEvent,
+                        data: { project: openFile.getDefaultProject(), fileName: openFile.fileName }
+                    });
                 }
             }
 
@@ -834,8 +865,8 @@ namespace ts.server {
                 return;
             }
 
-            this.eventHandler({
-                eventName: "configFileDiag",
+            this.eventHandler(<ConfigFileDiagEvent>{
+                eventName: ConfigFileDiagEvent,
                 data: { configFileName, diagnostics: diagnostics || [], triggerFile }
             });
         }
@@ -1013,7 +1044,7 @@ namespace ts.server {
             const useExistingProject = this.useSingleInferredProject && this.inferredProjects.length;
             const project = useExistingProject
                 ? this.inferredProjects[0]
-                : new InferredProject(this, this.documentRegistry, /*languageServiceEnabled*/ true, this.compilerOptionsForInferredProjects);
+                : new InferredProject(this, this.documentRegistry, this.compilerOptionsForInferredProjects);
 
             project.addRoot(root);
 
diff --git a/src/server/lsHost.ts b/src/server/lsHost.ts
index f1e80d95880..8f57cbf4074 100644
--- a/src/server/lsHost.ts
+++ b/src/server/lsHost.ts
@@ -3,9 +3,9 @@
 /// <reference path="scriptInfo.ts" />
 
 namespace ts.server {
-    export class LSHost implements ts.LanguageServiceHost, ModuleResolutionHost, ServerLanguageServiceHost {
+    export class LSHost implements ts.LanguageServiceHost, ModuleResolutionHost {
         private compilationSettings: ts.CompilerOptions;
-        private readonly resolvedModuleNames= createFileMap<Map<ResolvedModuleWithFailedLookupLocations>>();
+        private readonly resolvedModuleNames = createFileMap<Map<ResolvedModuleWithFailedLookupLocations>>();
         private readonly resolvedTypeReferenceDirectives = createFileMap<Map<ResolvedTypeReferenceDirectiveWithFailedLookupLocations>>();
         private readonly getCanonicalFileName: (fileName: string) => string;
 
diff --git a/src/server/project.ts b/src/server/project.ts
index db862af7e0d..6239ba1be2e 100644
--- a/src/server/project.ts
+++ b/src/server/project.ts
@@ -90,16 +90,100 @@ namespace ts.server {
         }
     }
 
+    const emptyResult: any[] = [];
+    const getEmptyResult = () => emptyResult;
+    const getUndefined = () => <any>undefined;
+
+    export function createNoSemanticFeaturesWrapper(realLanguageService: LanguageService): LanguageService {
+        return {
+            cleanupSemanticCache: noop,
+            getSyntacticDiagnostics: (fileName) =>
+                fileName ? realLanguageService.getSyntacticDiagnostics(fileName) : emptyResult,
+            getSemanticDiagnostics: getEmptyResult,
+            getCompilerOptionsDiagnostics: getEmptyResult,
+            getSyntacticClassifications: (fileName, span) =>
+                realLanguageService.getSyntacticClassifications(fileName, span),
+            getEncodedSyntacticClassifications: (fileName, span) =>
+                realLanguageService.getEncodedSyntacticClassifications(fileName, span),
+            getSemanticClassifications: getEmptyResult,
+            getEncodedSemanticClassifications: () =>
+                ({ spans: [], endOfLineState: EndOfLineState.None }),
+            getCompletionsAtPosition: getUndefined,
+            findReferences: getEmptyResult,
+            getCompletionEntryDetails: getUndefined,
+            getQuickInfoAtPosition: getUndefined,
+            findRenameLocations: getEmptyResult,
+            getNameOrDottedNameSpan: (fileName, startPos, endPos) =>
+                realLanguageService.getNameOrDottedNameSpan(fileName, startPos, endPos),
+            getBreakpointStatementAtPosition: (fileName, position) =>
+                realLanguageService.getBreakpointStatementAtPosition(fileName, position),
+            getBraceMatchingAtPosition: (fileName, position) =>
+                realLanguageService.getBraceMatchingAtPosition(fileName, position),
+            getSignatureHelpItems: getUndefined,
+            getDefinitionAtPosition: getEmptyResult,
+            getRenameInfo: () => ({
+                canRename: false,
+                localizedErrorMessage: getLocaleSpecificMessage(Diagnostics.Language_service_is_disabled),
+                displayName: undefined,
+                fullDisplayName: undefined,
+                kind: undefined,
+                kindModifiers: undefined,
+                triggerSpan: undefined
+            }),
+            getTypeDefinitionAtPosition: getUndefined,
+            getReferencesAtPosition: getEmptyResult,
+            getDocumentHighlights: getEmptyResult,
+            getOccurrencesAtPosition: getEmptyResult,
+            getNavigateToItems: getEmptyResult,
+            getNavigationBarItems: fileName =>
+                realLanguageService.getNavigationBarItems(fileName),
+            getNavigationTree: fileName =>
+                realLanguageService.getNavigationTree(fileName),
+            getOutliningSpans: fileName =>
+                realLanguageService.getOutliningSpans(fileName),
+            getTodoComments: getEmptyResult,
+            getIndentationAtPosition: (fileName, position, options) =>
+                realLanguageService.getIndentationAtPosition(fileName, position, options),
+            getFormattingEditsForRange: (fileName, start, end, options) =>
+                realLanguageService.getFormattingEditsForRange(fileName, start, end, options),
+            getFormattingEditsForDocument: (fileName, options) =>
+                realLanguageService.getFormattingEditsForDocument(fileName, options),
+            getFormattingEditsAfterKeystroke: (fileName, position, key, options) =>
+                realLanguageService.getFormattingEditsAfterKeystroke(fileName, position, key, options),
+            getDocCommentTemplateAtPosition: (fileName, position) =>
+                realLanguageService.getDocCommentTemplateAtPosition(fileName, position),
+            isValidBraceCompletionAtPosition: (fileName, position, openingBrace) =>
+                realLanguageService.isValidBraceCompletionAtPosition(fileName, position, openingBrace),
+            getEmitOutput: getUndefined,
+            getProgram: () =>
+                realLanguageService.getProgram(),
+            getNonBoundSourceFile: fileName =>
+                realLanguageService.getNonBoundSourceFile(fileName),
+            dispose: () =>
+                realLanguageService.dispose(),
+            getCompletionEntrySymbol: getUndefined,
+            getImplementationAtPosition: getEmptyResult,
+            getSourceFile: fileName =>
+                realLanguageService.getSourceFile(fileName),
+            getCodeFixesAtPosition: getEmptyResult
+        };
+    }
+
     export abstract class Project {
         private rootFiles: ScriptInfo[] = [];
         private rootFilesMap: FileMap<ScriptInfo> = createFileMap<ScriptInfo>();
-        private lsHost: ServerLanguageServiceHost;
+        private lsHost: LSHost;
         private program: ts.Program;
 
         private cachedUnresolvedImportsPerFile = new UnresolvedImportsMap();
         private lastCachedUnresolvedImportsList: SortedReadonlyArray<string>;
 
-        private languageService: LanguageService;
+        private readonly languageService: LanguageService;
+        // wrapper over the real language service that will suppress all semantic operations
+        private readonly noSemanticFeaturesLanguageService: LanguageService;
+
+        public languageServiceEnabled = true;
+
         builder: Builder;
         /**
          * Set of files that was returned from the last call to getChangesSinceVersion.
@@ -147,7 +231,7 @@ namespace ts.server {
             readonly projectService: ProjectService,
             private documentRegistry: ts.DocumentRegistry,
             hasExplicitListOfFiles: boolean,
-            public languageServiceEnabled: boolean,
+            languageServiceEnabled: boolean,
             private compilerOptions: CompilerOptions,
             public compileOnSaveEnabled: boolean) {
 
@@ -165,10 +249,13 @@ namespace ts.server {
                 this.compilerOptions.noEmitForJsFiles = true;
             }
 
-            if (languageServiceEnabled) {
-                this.enableLanguageService();
-            }
-            else {
+            this.lsHost = new LSHost(this.projectService.host, this, this.projectService.cancellationToken);
+            this.lsHost.setCompilationSettings(this.compilerOptions);
+
+            this.languageService = ts.createLanguageService(this.lsHost, this.documentRegistry);
+            this.noSemanticFeaturesLanguageService = createNoSemanticFeaturesWrapper(this.languageService);
+
+            if (!languageServiceEnabled) {
                 this.disableLanguageService();
             }
 
@@ -184,7 +271,9 @@ namespace ts.server {
             if (ensureSynchronized) {
                 this.updateGraph();
             }
-            return this.languageService;
+            return this.languageServiceEnabled
+                ? this.languageService
+                : this.noSemanticFeaturesLanguageService;
         }
 
         getCompileOnSaveAffectedFileList(scriptInfo: ScriptInfo): string[] {
@@ -200,18 +289,20 @@ namespace ts.server {
         }
 
         enableLanguageService() {
-            const lsHost = new LSHost(this.projectService.host, this, this.projectService.cancellationToken);
-            lsHost.setCompilationSettings(this.compilerOptions);
-            this.languageService = ts.createLanguageService(lsHost, this.documentRegistry);
-
-            this.lsHost = lsHost;
+            if (this.languageServiceEnabled) {
+                return;
+            }
             this.languageServiceEnabled = true;
+            this.projectService.onUpdateLanguageServiceStateForProject(this, /*languageServiceEnabled*/ true);
         }
 
         disableLanguageService() {
-            this.languageService = nullLanguageService;
-            this.lsHost = nullLanguageServiceHost;
+            if (!this.languageServiceEnabled) {
+                return;
+            }
+            this.languageService.cleanupSemanticCache();
             this.languageServiceEnabled = false;
+            this.projectService.onUpdateLanguageServiceStateForProject(this, /*languageServiceEnabled*/ false);
         }
 
         abstract getProjectName(): string;
@@ -676,12 +767,12 @@ namespace ts.server {
         // Used to keep track of what directories are watched for this project
         directoriesWatchedForTsconfig: string[] = [];
 
-        constructor(projectService: ProjectService, documentRegistry: ts.DocumentRegistry, languageServiceEnabled: boolean, compilerOptions: CompilerOptions) {
+        constructor(projectService: ProjectService, documentRegistry: ts.DocumentRegistry, compilerOptions: CompilerOptions) {
             super(ProjectKind.Inferred,
                 projectService,
                 documentRegistry,
                 /*files*/ undefined,
-                languageServiceEnabled,
+                /*languageServiceEnabled*/ true,
                 compilerOptions,
                 /*compileOnSaveEnabled*/ false);
 
diff --git a/src/server/protocol.ts b/src/server/protocol.ts
index d13caf7f01b..de642a80bf9 100644
--- a/src/server/protocol.ts
+++ b/src/server/protocol.ts
@@ -1814,6 +1814,27 @@ namespace ts.server.protocol {
         event: "configFileDiag";
     }
 
+    export type ProjectLanguageServiceStateEventName = "projectLanguageServiceState";
+    export interface ProjectLanguageServiceStateEvent extends Event {
+        event: ProjectLanguageServiceStateEventName;
+        body?: ProjectLanguageServiceStateEventBody;
+    }
+
+    export interface ProjectLanguageServiceStateEventBody {
+        /**
+         * Project name that has changes in the state of language service.
+         * For configured projects this will be the config file path.
+         * For external projects this will be the name of the projects specified when project was open.
+         * For inferred projects this event is not raised.
+         */
+        projectName: string;
+        /**
+         * True if language service state switched from disabled to enabled
+         * and false otherwise.
+         */
+        languageServiceEnabled: boolean;
+    }
+
     /**
       * Arguments for reload request.
       */
diff --git a/src/server/session.ts b/src/server/session.ts
index b250393b7ff..36144b3212d 100644
--- a/src/server/session.ts
+++ b/src/server/session.ts
@@ -199,15 +199,23 @@ namespace ts.server {
 
         private defaultEventHandler(event: ProjectServiceEvent) {
             switch (event.eventName) {
-                case "context":
+                case ContextEvent:
                     const { project, fileName } = event.data;
                     this.projectService.logger.info(`got context event, updating diagnostics for ${fileName}`);
                     this.updateErrorCheck([{ fileName, project }], this.changeSeq,
                         (n) => n === this.changeSeq, 100);
                     break;
-                case "configFileDiag":
+                case ConfigFileDiagEvent:
                     const { triggerFile, configFileName, diagnostics } = event.data;
                     this.configFileDiagnosticEvent(triggerFile, configFileName, diagnostics);
+                    break;
+                case ProjectLanguageServiceStateEvent:
+                    const eventName: protocol.ProjectLanguageServiceStateEventName = "projectLanguageServiceState";
+                    this.event(<protocol.ProjectLanguageServiceStateEventBody>{
+                        projectName: event.data.project.getProjectName(),
+                        languageServiceEnabled: event.data.languageServiceEnabled
+                    }, eventName);
+                    break;
             }
         }
 
diff --git a/src/server/utilities.ts b/src/server/utilities.ts
index ac809652119..a52e5848de9 100644
--- a/src/server/utilities.ts
+++ b/src/server/utilities.ts
@@ -11,7 +11,6 @@ namespace ts.server {
 
     export const emptyArray: ReadonlyArray<any> = [];
 
-
     export interface Logger {
         close(): void;
         hasLevel(level: LogLevel): boolean;
@@ -160,68 +159,6 @@ namespace ts.server {
             }
         };
     }
-    function throwLanguageServiceIsDisabledError(): never {
-        throw new Error("LanguageService is disabled");
-    }
-
-    export const nullLanguageService: LanguageService = {
-        cleanupSemanticCache: throwLanguageServiceIsDisabledError,
-        getSyntacticDiagnostics: throwLanguageServiceIsDisabledError,
-        getSemanticDiagnostics: throwLanguageServiceIsDisabledError,
-        getCompilerOptionsDiagnostics: throwLanguageServiceIsDisabledError,
-        getSyntacticClassifications: throwLanguageServiceIsDisabledError,
-        getEncodedSyntacticClassifications: throwLanguageServiceIsDisabledError,
-        getSemanticClassifications: throwLanguageServiceIsDisabledError,
-        getEncodedSemanticClassifications: throwLanguageServiceIsDisabledError,
-        getCompletionsAtPosition:  throwLanguageServiceIsDisabledError,
-        findReferences: throwLanguageServiceIsDisabledError,
-        getCompletionEntryDetails: throwLanguageServiceIsDisabledError,
-        getQuickInfoAtPosition: throwLanguageServiceIsDisabledError,
-        findRenameLocations: throwLanguageServiceIsDisabledError,
-        getNameOrDottedNameSpan: throwLanguageServiceIsDisabledError,
-        getBreakpointStatementAtPosition: throwLanguageServiceIsDisabledError,
-        getBraceMatchingAtPosition: throwLanguageServiceIsDisabledError,
-        getSignatureHelpItems: throwLanguageServiceIsDisabledError,
-        getDefinitionAtPosition: throwLanguageServiceIsDisabledError,
-        getRenameInfo: throwLanguageServiceIsDisabledError,
-        getTypeDefinitionAtPosition: throwLanguageServiceIsDisabledError,
-        getReferencesAtPosition: throwLanguageServiceIsDisabledError,
-        getDocumentHighlights: throwLanguageServiceIsDisabledError,
-        getOccurrencesAtPosition: throwLanguageServiceIsDisabledError,
-        getNavigateToItems: throwLanguageServiceIsDisabledError,
-        getNavigationBarItems: throwLanguageServiceIsDisabledError,
-        getNavigationTree: throwLanguageServiceIsDisabledError,
-        getOutliningSpans: throwLanguageServiceIsDisabledError,
-        getTodoComments: throwLanguageServiceIsDisabledError,
-        getIndentationAtPosition: throwLanguageServiceIsDisabledError,
-        getFormattingEditsForRange: throwLanguageServiceIsDisabledError,
-        getFormattingEditsForDocument: throwLanguageServiceIsDisabledError,
-        getFormattingEditsAfterKeystroke: throwLanguageServiceIsDisabledError,
-        getDocCommentTemplateAtPosition: throwLanguageServiceIsDisabledError,
-        isValidBraceCompletionAtPosition: throwLanguageServiceIsDisabledError,
-        getEmitOutput: throwLanguageServiceIsDisabledError,
-        getProgram: throwLanguageServiceIsDisabledError,
-        getNonBoundSourceFile: throwLanguageServiceIsDisabledError,
-        dispose: throwLanguageServiceIsDisabledError,
-        getCompletionEntrySymbol: throwLanguageServiceIsDisabledError,
-        getImplementationAtPosition: throwLanguageServiceIsDisabledError,
-        getSourceFile: throwLanguageServiceIsDisabledError,
-        getCodeFixesAtPosition: throwLanguageServiceIsDisabledError
-    };
-
-    export interface ServerLanguageServiceHost {
-        setCompilationSettings(options: CompilerOptions): void;
-        notifyFileRemoved(info: ScriptInfo): void;
-        startRecordingFilesWithChangedResolutions(): void;
-        finishRecordingFilesWithChangedResolutions(): Path[];
-    }
-
-    export const nullLanguageServiceHost: ServerLanguageServiceHost = {
-        setCompilationSettings: () => undefined,
-        notifyFileRemoved: () => undefined,
-        startRecordingFilesWithChangedResolutions: () => undefined,
-        finishRecordingFilesWithChangedResolutions: () => undefined
-    };
 
     export interface ProjectOptions {
         /**
diff --git a/src/services/services.ts b/src/services/services.ts
index 56e604abeb3..3c0b7838314 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -1205,7 +1205,7 @@ namespace ts {
         }
 
         function cleanupSemanticCache(): void {
-            // TODO: Should we jettison the program (or it's type checker) here?
+            program = undefined;
         }
 
         function dispose(): void {

From 486f156a698ac6bfdfe07e8ee0edf758dffec045 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <Daniel.Rosenwasser@microsoft.com>
Date: Sat, 12 Nov 2016 01:40:37 -0800
Subject: [PATCH 199/421] Added test.

---
 tests/cases/compiler/superCallWithCommentEmit01.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 tests/cases/compiler/superCallWithCommentEmit01.ts

diff --git a/tests/cases/compiler/superCallWithCommentEmit01.ts b/tests/cases/compiler/superCallWithCommentEmit01.ts
new file mode 100644
index 00000000000..800fad29bfb
--- /dev/null
+++ b/tests/cases/compiler/superCallWithCommentEmit01.ts
@@ -0,0 +1,10 @@
+class A {
+    constructor(public text: string) { }
+}
+
+class B extends A {
+    constructor(text: string) {
+        // this is subclass constructor
+        super(text)
+     }
+}
\ No newline at end of file

From 63f70dc09abc6cb27349fe20df73e9a0ade608b0 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <Daniel.Rosenwasser@microsoft.com>
Date: Sat, 12 Nov 2016 01:54:53 -0800
Subject: [PATCH 200/421] Accepted baselines.

---
 .../reference/superCallWithCommentEmit01.js   | 33 +++++++++++++++++++
 .../superCallWithCommentEmit01.symbols        | 21 ++++++++++++
 .../superCallWithCommentEmit01.types          | 22 +++++++++++++
 3 files changed, 76 insertions(+)
 create mode 100644 tests/baselines/reference/superCallWithCommentEmit01.js
 create mode 100644 tests/baselines/reference/superCallWithCommentEmit01.symbols
 create mode 100644 tests/baselines/reference/superCallWithCommentEmit01.types

diff --git a/tests/baselines/reference/superCallWithCommentEmit01.js b/tests/baselines/reference/superCallWithCommentEmit01.js
new file mode 100644
index 00000000000..10f13b98879
--- /dev/null
+++ b/tests/baselines/reference/superCallWithCommentEmit01.js
@@ -0,0 +1,33 @@
+//// [superCallWithCommentEmit01.ts]
+class A {
+    constructor(public text: string) { }
+}
+
+class B extends A {
+    constructor(text: string) {
+        // this is subclass constructor
+        super(text)
+     }
+}
+
+//// [superCallWithCommentEmit01.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+var A = (function () {
+    function A(text) {
+        this.text = text;
+    }
+    return A;
+}());
+var B = (function (_super) {
+    __extends(B, _super);
+    function B(text) {
+        return 
+        // this is subclass constructor
+        _super.call(this, text) || this;
+    }
+    return B;
+}(A));
diff --git a/tests/baselines/reference/superCallWithCommentEmit01.symbols b/tests/baselines/reference/superCallWithCommentEmit01.symbols
new file mode 100644
index 00000000000..9476ee1c4e5
--- /dev/null
+++ b/tests/baselines/reference/superCallWithCommentEmit01.symbols
@@ -0,0 +1,21 @@
+=== tests/cases/compiler/superCallWithCommentEmit01.ts ===
+class A {
+>A : Symbol(A, Decl(superCallWithCommentEmit01.ts, 0, 0))
+
+    constructor(public text: string) { }
+>text : Symbol(A.text, Decl(superCallWithCommentEmit01.ts, 1, 16))
+}
+
+class B extends A {
+>B : Symbol(B, Decl(superCallWithCommentEmit01.ts, 2, 1))
+>A : Symbol(A, Decl(superCallWithCommentEmit01.ts, 0, 0))
+
+    constructor(text: string) {
+>text : Symbol(text, Decl(superCallWithCommentEmit01.ts, 5, 16))
+
+        // this is subclass constructor
+        super(text)
+>super : Symbol(A, Decl(superCallWithCommentEmit01.ts, 0, 0))
+>text : Symbol(text, Decl(superCallWithCommentEmit01.ts, 5, 16))
+     }
+}
diff --git a/tests/baselines/reference/superCallWithCommentEmit01.types b/tests/baselines/reference/superCallWithCommentEmit01.types
new file mode 100644
index 00000000000..dfa0b1ce333
--- /dev/null
+++ b/tests/baselines/reference/superCallWithCommentEmit01.types
@@ -0,0 +1,22 @@
+=== tests/cases/compiler/superCallWithCommentEmit01.ts ===
+class A {
+>A : A
+
+    constructor(public text: string) { }
+>text : string
+}
+
+class B extends A {
+>B : B
+>A : A
+
+    constructor(text: string) {
+>text : string
+
+        // this is subclass constructor
+        super(text)
+>super(text) : void
+>super : typeof A
+>text : string
+     }
+}

From 2f6ba0876c456591e1ce42974e9d96547c8f2abc Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <Daniel.Rosenwasser@microsoft.com>
Date: Sat, 12 Nov 2016 02:56:25 -0800
Subject: [PATCH 201/421] Move comments from super calls to their generated
 return statements.

---
 src/compiler/transformers/es2015.ts | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts
index e4fb8a0aaf0..1cb63f55e91 100644
--- a/src/compiler/transformers/es2015.ts
+++ b/src/compiler/transformers/es2015.ts
@@ -279,7 +279,7 @@ namespace ts {
             else if (node.transformFlags & TransformFlags.ContainsES2015 || (isInConstructorWithCapturedSuper && !isExpression(node))) {
                 // we want to dive in this branch either if node has children with ES2015 specific syntax
                 // or we are inside constructor that captures result of the super call so all returns without expression should be
-                // rewritten. Note: we skip expressions since returns should never appear there 
+                // rewritten. Note: we skip expressions since returns should never appear there
                 return visitEachChild(node, visitor, context);
             }
             else {
@@ -1011,7 +1011,20 @@ namespace ts {
 
             // Return the result if we have an immediate super() call on the last statement.
             if (superCallExpression && statementOffset === ctorStatements.length - 1) {
-                statements.push(createReturn(superCallExpression));
+                const returnStatement = createReturn(superCallExpression);
+
+                if (superCallExpression.kind !== SyntaxKind.BinaryExpression
+                    && (superCallExpression as BinaryExpression).left.kind !== SyntaxKind.CallExpression) {
+                    Debug.fail("Assumed generated super call would have form 'super.call(...) || this'.");
+                }
+
+                // Shift comments from the original super call to the return statement.
+                setCommentRange(returnStatement, getCommentRange(
+                    setEmitFlags(
+                        (superCallExpression as BinaryExpression).left,
+                        EmitFlags.NoComments)));
+
+                statements.push(returnStatement);
                 return SuperCaptureResult.ReplaceWithReturn;
             }
 

From 03ac7ccee496337640748c15a6a4c3d56cb92e96 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <Daniel.Rosenwasser@microsoft.com>
Date: Sat, 12 Nov 2016 02:56:42 -0800
Subject: [PATCH 202/421] Accepted baselines.

---
 tests/baselines/reference/superCallWithCommentEmit01.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/baselines/reference/superCallWithCommentEmit01.js b/tests/baselines/reference/superCallWithCommentEmit01.js
index 10f13b98879..c7ea3cc8b85 100644
--- a/tests/baselines/reference/superCallWithCommentEmit01.js
+++ b/tests/baselines/reference/superCallWithCommentEmit01.js
@@ -25,9 +25,8 @@ var A = (function () {
 var B = (function (_super) {
     __extends(B, _super);
     function B(text) {
-        return 
         // this is subclass constructor
-        _super.call(this, text) || this;
+        return _super.call(this, text) || this;
     }
     return B;
 }(A));

From 9ac7667d5c5c9f7ef6ea7e294043d27b1da32a73 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sat, 12 Nov 2016 08:55:23 -0800
Subject: [PATCH 203/421] Address CR feedback

---
 src/compiler/checker.ts                       | 30 +++++++++++--------
 .../types/mapped/mappedTypeErrors.ts          |  2 +-
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 01ea2227217..d75ae6a8cdc 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -4484,33 +4484,33 @@ namespace ts {
             }
         }
 
-        function forEachType<T>(type: Type, f: (t: Type) => T): T {
-            return type.flags & TypeFlags.Union ? forEach((<UnionType>type).types, f) : f(type);
-        }
-
-        // { [P in K]: T }
-        // Get apparent type of K
-        // If apparent type is a 'keyof T', get apparent type of T
-        // For each constituent literal type U
-        // create mapper from P to U
-        // instantiate T using mapper
-        // if U is string or number, create index signature with instantiated type
-        // otherwise create property with name from U and instantiated type
+        /** Resolve the members of a mapped type { [P in K]: T } */
         function resolveMappedTypeMembers(type: MappedType) {
             const members: SymbolTable = createMap<Symbol>();
             let stringIndexInfo: IndexInfo;
             let numberIndexInfo: IndexInfo;
+            // In { [P in K]: T }, we refer to P as the type parameter type, K as the constraint type,
+            // and T as the template type.
             const typeParameter = getTypeParameterFromMappedType(type);
             const constraintType = getConstraintTypeFromMappedType(type);
             const templateType = getTemplateTypeFromMappedType(type);
             const isReadonly = !!type.declaration.readonlyToken;
             const isOptional = !!type.declaration.questionToken;
+            // First, if the constraint type is a type parameter, obtain the base constraint. Then,
+            // if the key type is a 'keyof X', obtain 'keyof C' where C is the base constraint of X.
+            // Finally, iterate over the constituents of the resulting iteration type.
             const keyType = constraintType.flags & TypeFlags.TypeParameter ? getApparentType(constraintType) : constraintType;
             const iterationType = keyType.flags & TypeFlags.Index ? getIndexType(getApparentType((<IndexType>keyType).type)) : keyType;
             forEachType(iterationType, t => {
+                // Create a mapper from T to the current iteration type constituent. Then, if the
+                // mapped type is itself an instantiated type, combine the iteration mapper with the
+                // instantiation mapper.
                 const iterationMapper = createUnaryTypeMapper(typeParameter, t);
                 const templateMapper = type.mapper ? combineTypeMappers(type.mapper, iterationMapper) : iterationMapper;
                 const propType = instantiateType(templateType, templateMapper);
+                // If the current iteration type constituent is a literal type, create a property.
+                // Otherwise, for type string create a string index signature and for type number
+                // create a numeric index signature.
                 if (t.flags & (TypeFlags.StringLiteral | TypeFlags.NumberLiteral | TypeFlags.EnumLiteral)) {
                     const propName = (<LiteralType>t).text;
                     const prop = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | (isOptional ? SymbolFlags.Optional : 0), propName);
@@ -4525,6 +4525,8 @@ namespace ts {
                     numberIndexInfo = createIndexInfo(propType, isReadonly);
                 }
             });
+            // If we created both a string and a numeric string index signature, and if the two index
+            // signatures have identical types, discard the redundant numeric index signature.
             if (stringIndexInfo && numberIndexInfo && isTypeIdenticalTo(stringIndexInfo.type, numberIndexInfo.type)) {
                 numberIndexInfo = undefined;
             }
@@ -9060,6 +9062,10 @@ namespace ts {
             return containsType(target.types, source);
         }
 
+        function forEachType<T>(type: Type, f: (t: Type) => T): T {
+            return type.flags & TypeFlags.Union ? forEach((<UnionType>type).types, f) : f(type);
+        }
+
         function filterType(type: Type, f: (t: Type) => boolean): Type {
             if (type.flags & TypeFlags.Union) {
                 const types = (<UnionType>type).types;
diff --git a/tests/cases/conformance/types/mapped/mappedTypeErrors.ts b/tests/cases/conformance/types/mapped/mappedTypeErrors.ts
index 4017951f7c2..fce80872185 100644
--- a/tests/cases/conformance/types/mapped/mappedTypeErrors.ts
+++ b/tests/cases/conformance/types/mapped/mappedTypeErrors.ts
@@ -43,7 +43,7 @@ type T12 = Pick<Shape, "name" | "foo">;  // Error
 type T13 = Pick<Shape, keyof Named>;
 type T14 = Pick<Shape, keyof Point>;  // Error
 type T15 = Pick<Shape, never>;
-type T16 = Pick<Shape, undefined>;
+type T16 = Pick<Shape, undefined>;  // Error
 
 function f1<T>(x: T) {
     let y: Pick<Shape, T>;  // Error

From 6ceab7bce78f154c650a6cbbef465b52f5912e92 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sat, 12 Nov 2016 09:20:30 -0800
Subject: [PATCH 204/421] Accept new baselines

---
 tests/baselines/reference/mappedTypeErrors.errors.txt | 2 +-
 tests/baselines/reference/mappedTypeErrors.js         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/baselines/reference/mappedTypeErrors.errors.txt b/tests/baselines/reference/mappedTypeErrors.errors.txt
index 724ab902fc3..4efcc579ba8 100644
--- a/tests/baselines/reference/mappedTypeErrors.errors.txt
+++ b/tests/baselines/reference/mappedTypeErrors.errors.txt
@@ -79,7 +79,7 @@ tests/cases/conformance/types/mapped/mappedTypeErrors.ts(51,24): error TS2344: T
 !!! error TS2344: Type '"x" | "y"' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
 !!! error TS2344:   Type '"x"' is not assignable to type '"name" | "width" | "height" | "visible"'.
     type T15 = Pick<Shape, never>;
-    type T16 = Pick<Shape, undefined>;
+    type T16 = Pick<Shape, undefined>;  // Error
                            ~~~~~~~~~
 !!! error TS2344: Type 'undefined' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
     
diff --git a/tests/baselines/reference/mappedTypeErrors.js b/tests/baselines/reference/mappedTypeErrors.js
index f717f0d02f3..b2c8dc2e84a 100644
--- a/tests/baselines/reference/mappedTypeErrors.js
+++ b/tests/baselines/reference/mappedTypeErrors.js
@@ -42,7 +42,7 @@ type T12 = Pick<Shape, "name" | "foo">;  // Error
 type T13 = Pick<Shape, keyof Named>;
 type T14 = Pick<Shape, keyof Point>;  // Error
 type T15 = Pick<Shape, never>;
-type T16 = Pick<Shape, undefined>;
+type T16 = Pick<Shape, undefined>;  // Error
 
 function f1<T>(x: T) {
     let y: Pick<Shape, T>;  // Error

From ffed2484d37ed60d894834731e592c48a7a9b29e Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <Daniel.Rosenwasser@microsoft.com>
Date: Sat, 12 Nov 2016 12:46:01 -0800
Subject: [PATCH 205/421] Added tests.

---
 .../comparable/optionalProperties01.ts                | 11 +++++++++++
 .../comparable/optionalProperties02.ts                |  9 +++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 tests/cases/conformance/types/typeRelationships/comparable/optionalProperties01.ts
 create mode 100644 tests/cases/conformance/types/typeRelationships/comparable/optionalProperties02.ts

diff --git a/tests/cases/conformance/types/typeRelationships/comparable/optionalProperties01.ts b/tests/cases/conformance/types/typeRelationships/comparable/optionalProperties01.ts
new file mode 100644
index 00000000000..d4f04d78c80
--- /dev/null
+++ b/tests/cases/conformance/types/typeRelationships/comparable/optionalProperties01.ts
@@ -0,0 +1,11 @@
+// @strictNullChecks: true
+// @declaration: true
+
+interface Foo {
+  required1: string;
+  required2: string;
+  optional?: string;
+}
+
+const foo1 = { required1: "hello" } as Foo;
+const foo2 = { required1: "hello", optional: "bar" } as Foo;
diff --git a/tests/cases/conformance/types/typeRelationships/comparable/optionalProperties02.ts b/tests/cases/conformance/types/typeRelationships/comparable/optionalProperties02.ts
new file mode 100644
index 00000000000..21f83276d44
--- /dev/null
+++ b/tests/cases/conformance/types/typeRelationships/comparable/optionalProperties02.ts
@@ -0,0 +1,9 @@
+// @strictNullChecks: true
+// @declaration: true
+
+interface Foo {
+    a?: string;
+    b: string;
+}
+
+<Foo>{ a: undefined };
\ No newline at end of file

From 2edabe0ae0b40a12c7732f690eeb8517631f9a6b Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <Daniel.Rosenwasser@microsoft.com>
Date: Sat, 12 Nov 2016 12:53:23 -0800
Subject: [PATCH 206/421] Accepted baselines.

---
 .../reference/optionalProperties01.errors.txt | 18 +++++++++++++
 .../reference/optionalProperties01.js         | 25 +++++++++++++++++++
 .../reference/optionalProperties02.errors.txt | 15 +++++++++++
 .../reference/optionalProperties02.js         | 18 +++++++++++++
 4 files changed, 76 insertions(+)
 create mode 100644 tests/baselines/reference/optionalProperties01.errors.txt
 create mode 100644 tests/baselines/reference/optionalProperties01.js
 create mode 100644 tests/baselines/reference/optionalProperties02.errors.txt
 create mode 100644 tests/baselines/reference/optionalProperties02.js

diff --git a/tests/baselines/reference/optionalProperties01.errors.txt b/tests/baselines/reference/optionalProperties01.errors.txt
new file mode 100644
index 00000000000..c44829b20a7
--- /dev/null
+++ b/tests/baselines/reference/optionalProperties01.errors.txt
@@ -0,0 +1,18 @@
+tests/cases/conformance/types/typeRelationships/comparable/optionalProperties01.ts(9,14): error TS2352: Type '{ required1: string; optional: string; }' cannot be converted to type 'Foo'.
+  Property 'required2' is missing in type '{ required1: string; optional: string; }'.
+
+
+==== tests/cases/conformance/types/typeRelationships/comparable/optionalProperties01.ts (1 errors) ====
+    
+    interface Foo {
+      required1: string;
+      required2: string;
+      optional?: string;
+    }
+    
+    const foo1 = { required1: "hello" } as Foo;
+    const foo2 = { required1: "hello", optional: "bar" } as Foo;
+                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2352: Type '{ required1: string; optional: string; }' cannot be converted to type 'Foo'.
+!!! error TS2352:   Property 'required2' is missing in type '{ required1: string; optional: string; }'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/optionalProperties01.js b/tests/baselines/reference/optionalProperties01.js
new file mode 100644
index 00000000000..a614b9e7e37
--- /dev/null
+++ b/tests/baselines/reference/optionalProperties01.js
@@ -0,0 +1,25 @@
+//// [optionalProperties01.ts]
+
+interface Foo {
+  required1: string;
+  required2: string;
+  optional?: string;
+}
+
+const foo1 = { required1: "hello" } as Foo;
+const foo2 = { required1: "hello", optional: "bar" } as Foo;
+
+
+//// [optionalProperties01.js]
+var foo1 = { required1: "hello" };
+var foo2 = { required1: "hello", optional: "bar" };
+
+
+//// [optionalProperties01.d.ts]
+interface Foo {
+    required1: string;
+    required2: string;
+    optional?: string;
+}
+declare const foo1: Foo;
+declare const foo2: Foo;
diff --git a/tests/baselines/reference/optionalProperties02.errors.txt b/tests/baselines/reference/optionalProperties02.errors.txt
new file mode 100644
index 00000000000..fefcf1eb95f
--- /dev/null
+++ b/tests/baselines/reference/optionalProperties02.errors.txt
@@ -0,0 +1,15 @@
+tests/cases/conformance/types/typeRelationships/comparable/optionalProperties02.ts(7,1): error TS2352: Type '{ a: undefined; }' cannot be converted to type 'Foo'.
+  Property 'b' is missing in type '{ a: undefined; }'.
+
+
+==== tests/cases/conformance/types/typeRelationships/comparable/optionalProperties02.ts (1 errors) ====
+    
+    interface Foo {
+        a?: string;
+        b: string;
+    }
+    
+    <Foo>{ a: undefined };
+    ~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2352: Type '{ a: undefined; }' cannot be converted to type 'Foo'.
+!!! error TS2352:   Property 'b' is missing in type '{ a: undefined; }'.
\ No newline at end of file
diff --git a/tests/baselines/reference/optionalProperties02.js b/tests/baselines/reference/optionalProperties02.js
new file mode 100644
index 00000000000..f632c5d67a8
--- /dev/null
+++ b/tests/baselines/reference/optionalProperties02.js
@@ -0,0 +1,18 @@
+//// [optionalProperties02.ts]
+
+interface Foo {
+    a?: string;
+    b: string;
+}
+
+<Foo>{ a: undefined };
+
+//// [optionalProperties02.js]
+({ a: undefined });
+
+
+//// [optionalProperties02.d.ts]
+interface Foo {
+    a?: string;
+    b: string;
+}

From 375437ef3cb149d49b560b0b30aa5c305b9c6eaa Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <Daniel.Rosenwasser@microsoft.com>
Date: Sat, 12 Nov 2016 12:59:43 -0800
Subject: [PATCH 207/421] Avoid checking for optionality in comparability
 checks.

---
 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 789f2bd8104..6be5c1c453f 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -7331,7 +7331,8 @@ namespace ts {
                                 return Ternary.False;
                             }
                             result &= related;
-                            if (sourceProp.flags & SymbolFlags.Optional && !(targetProp.flags & SymbolFlags.Optional)) {
+                            // When checking for comparability, be more lenient with optional properties.
+                            if (relation !== comparableRelation && sourceProp.flags & SymbolFlags.Optional && !(targetProp.flags & SymbolFlags.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..

From 8708c8965cbc71496bdb1f232cd6b38061353405 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <Daniel.Rosenwasser@microsoft.com>
Date: Sat, 12 Nov 2016 12:59:57 -0800
Subject: [PATCH 208/421] Accepted baselines.

---
 .../reference/optionalProperties01.errors.txt | 18 ----------
 .../reference/optionalProperties01.symbols    | 26 +++++++++++++++
 .../reference/optionalProperties01.types      | 33 +++++++++++++++++++
 .../reference/optionalProperties02.errors.txt | 15 ---------
 .../reference/optionalProperties02.symbols    | 17 ++++++++++
 .../reference/optionalProperties02.types      | 19 +++++++++++
 6 files changed, 95 insertions(+), 33 deletions(-)
 delete mode 100644 tests/baselines/reference/optionalProperties01.errors.txt
 create mode 100644 tests/baselines/reference/optionalProperties01.symbols
 create mode 100644 tests/baselines/reference/optionalProperties01.types
 delete mode 100644 tests/baselines/reference/optionalProperties02.errors.txt
 create mode 100644 tests/baselines/reference/optionalProperties02.symbols
 create mode 100644 tests/baselines/reference/optionalProperties02.types

diff --git a/tests/baselines/reference/optionalProperties01.errors.txt b/tests/baselines/reference/optionalProperties01.errors.txt
deleted file mode 100644
index c44829b20a7..00000000000
--- a/tests/baselines/reference/optionalProperties01.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-tests/cases/conformance/types/typeRelationships/comparable/optionalProperties01.ts(9,14): error TS2352: Type '{ required1: string; optional: string; }' cannot be converted to type 'Foo'.
-  Property 'required2' is missing in type '{ required1: string; optional: string; }'.
-
-
-==== tests/cases/conformance/types/typeRelationships/comparable/optionalProperties01.ts (1 errors) ====
-    
-    interface Foo {
-      required1: string;
-      required2: string;
-      optional?: string;
-    }
-    
-    const foo1 = { required1: "hello" } as Foo;
-    const foo2 = { required1: "hello", optional: "bar" } as Foo;
-                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2352: Type '{ required1: string; optional: string; }' cannot be converted to type 'Foo'.
-!!! error TS2352:   Property 'required2' is missing in type '{ required1: string; optional: string; }'.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/optionalProperties01.symbols b/tests/baselines/reference/optionalProperties01.symbols
new file mode 100644
index 00000000000..95c53626f6e
--- /dev/null
+++ b/tests/baselines/reference/optionalProperties01.symbols
@@ -0,0 +1,26 @@
+=== tests/cases/conformance/types/typeRelationships/comparable/optionalProperties01.ts ===
+
+interface Foo {
+>Foo : Symbol(Foo, Decl(optionalProperties01.ts, 0, 0))
+
+  required1: string;
+>required1 : Symbol(Foo.required1, Decl(optionalProperties01.ts, 1, 15))
+
+  required2: string;
+>required2 : Symbol(Foo.required2, Decl(optionalProperties01.ts, 2, 20))
+
+  optional?: string;
+>optional : Symbol(Foo.optional, Decl(optionalProperties01.ts, 3, 20))
+}
+
+const foo1 = { required1: "hello" } as Foo;
+>foo1 : Symbol(foo1, Decl(optionalProperties01.ts, 7, 5))
+>required1 : Symbol(required1, Decl(optionalProperties01.ts, 7, 14))
+>Foo : Symbol(Foo, Decl(optionalProperties01.ts, 0, 0))
+
+const foo2 = { required1: "hello", optional: "bar" } as Foo;
+>foo2 : Symbol(foo2, Decl(optionalProperties01.ts, 8, 5))
+>required1 : Symbol(required1, Decl(optionalProperties01.ts, 8, 14))
+>optional : Symbol(optional, Decl(optionalProperties01.ts, 8, 34))
+>Foo : Symbol(Foo, Decl(optionalProperties01.ts, 0, 0))
+
diff --git a/tests/baselines/reference/optionalProperties01.types b/tests/baselines/reference/optionalProperties01.types
new file mode 100644
index 00000000000..20d16d4071e
--- /dev/null
+++ b/tests/baselines/reference/optionalProperties01.types
@@ -0,0 +1,33 @@
+=== tests/cases/conformance/types/typeRelationships/comparable/optionalProperties01.ts ===
+
+interface Foo {
+>Foo : Foo
+
+  required1: string;
+>required1 : string
+
+  required2: string;
+>required2 : string
+
+  optional?: string;
+>optional : string | undefined
+}
+
+const foo1 = { required1: "hello" } as Foo;
+>foo1 : Foo
+>{ required1: "hello" } as Foo : Foo
+>{ required1: "hello" } : { required1: string; }
+>required1 : string
+>"hello" : "hello"
+>Foo : Foo
+
+const foo2 = { required1: "hello", optional: "bar" } as Foo;
+>foo2 : Foo
+>{ required1: "hello", optional: "bar" } as Foo : Foo
+>{ required1: "hello", optional: "bar" } : { required1: string; optional: string; }
+>required1 : string
+>"hello" : "hello"
+>optional : string
+>"bar" : "bar"
+>Foo : Foo
+
diff --git a/tests/baselines/reference/optionalProperties02.errors.txt b/tests/baselines/reference/optionalProperties02.errors.txt
deleted file mode 100644
index fefcf1eb95f..00000000000
--- a/tests/baselines/reference/optionalProperties02.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-tests/cases/conformance/types/typeRelationships/comparable/optionalProperties02.ts(7,1): error TS2352: Type '{ a: undefined; }' cannot be converted to type 'Foo'.
-  Property 'b' is missing in type '{ a: undefined; }'.
-
-
-==== tests/cases/conformance/types/typeRelationships/comparable/optionalProperties02.ts (1 errors) ====
-    
-    interface Foo {
-        a?: string;
-        b: string;
-    }
-    
-    <Foo>{ a: undefined };
-    ~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2352: Type '{ a: undefined; }' cannot be converted to type 'Foo'.
-!!! error TS2352:   Property 'b' is missing in type '{ a: undefined; }'.
\ No newline at end of file
diff --git a/tests/baselines/reference/optionalProperties02.symbols b/tests/baselines/reference/optionalProperties02.symbols
new file mode 100644
index 00000000000..b88f9ad7429
--- /dev/null
+++ b/tests/baselines/reference/optionalProperties02.symbols
@@ -0,0 +1,17 @@
+=== tests/cases/conformance/types/typeRelationships/comparable/optionalProperties02.ts ===
+
+interface Foo {
+>Foo : Symbol(Foo, Decl(optionalProperties02.ts, 0, 0))
+
+    a?: string;
+>a : Symbol(Foo.a, Decl(optionalProperties02.ts, 1, 15))
+
+    b: string;
+>b : Symbol(Foo.b, Decl(optionalProperties02.ts, 2, 15))
+}
+
+<Foo>{ a: undefined };
+>Foo : Symbol(Foo, Decl(optionalProperties02.ts, 0, 0))
+>a : Symbol(a, Decl(optionalProperties02.ts, 6, 6))
+>undefined : Symbol(undefined)
+
diff --git a/tests/baselines/reference/optionalProperties02.types b/tests/baselines/reference/optionalProperties02.types
new file mode 100644
index 00000000000..05e979b3972
--- /dev/null
+++ b/tests/baselines/reference/optionalProperties02.types
@@ -0,0 +1,19 @@
+=== tests/cases/conformance/types/typeRelationships/comparable/optionalProperties02.ts ===
+
+interface Foo {
+>Foo : Foo
+
+    a?: string;
+>a : string | undefined
+
+    b: string;
+>b : string
+}
+
+<Foo>{ a: undefined };
+><Foo>{ a: undefined } : Foo
+>Foo : Foo
+>{ a: undefined } : { a: undefined; }
+>a : undefined
+>undefined : undefined
+

From ea33d6e501fd301090af1a190794f4ef60ac665c Mon Sep 17 00:00:00 2001
From: Ethan Resnick <ethan.resnick@gmail.com>
Date: Sun, 13 Nov 2016 02:59:50 -0500
Subject: [PATCH 209/421] More precise Object.entries type declarations

We can leverage the new index type queries and indexed access types
from #11929 to get better type inference for Object.entries.
---
 src/lib/es2017.object.d.ts                    |  4 +--
 .../reference/useObjectValuesAndEntries1.js   | 11 ++++--
 .../useObjectValuesAndEntries1.symbols        | 16 ++++++++-
 .../useObjectValuesAndEntries1.types          | 34 +++++++++++++++----
 .../useObjectValuesAndEntries4.types          |  8 ++---
 .../es2017/useObjectValuesAndEntries1.ts      |  6 ++--
 6 files changed, 60 insertions(+), 19 deletions(-)

diff --git a/src/lib/es2017.object.d.ts b/src/lib/es2017.object.d.ts
index 95cc5692a03..c219f467ac9 100644
--- a/src/lib/es2017.object.d.ts
+++ b/src/lib/es2017.object.d.ts
@@ -9,6 +9,6 @@ interface ObjectConstructor {
       * Returns an array of key/values of the enumerable properties 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.
       */
-    entries<T>(o: { [s: string]: T }): [string, T][];
+    entries<T extends { [key: string]: any }, K extends keyof T>(o: T): [keyof T, T[K]][];
     entries(o: any): [string, any][];
-}
\ No newline at end of file
+}
diff --git a/tests/baselines/reference/useObjectValuesAndEntries1.js b/tests/baselines/reference/useObjectValuesAndEntries1.js
index ee2c7115813..728e14e7463 100644
--- a/tests/baselines/reference/useObjectValuesAndEntries1.js
+++ b/tests/baselines/reference/useObjectValuesAndEntries1.js
@@ -6,8 +6,11 @@ for (var x of Object.values(o)) {
     let y = x;
 }
 
-var entries = Object.entries(o);
-var entries1 = Object.entries(1); // <-- entries: [string, any][]
+var entries = Object.entries(o);  // <-- entries: ['a' | 'b', number][]
+var entries1 = Object.entries(1); // <-- entries: [string, any][]
+var entries2 = Object.entries({a: true, b: 2}) // ['a' | 'b', number | boolean][]
+var entries3 = Object.entries({}) // [never, any][]
+
 
 //// [useObjectValuesAndEntries1.js]
 var o = { a: 1, b: 2 };
@@ -15,5 +18,7 @@ for (var _i = 0, _a = Object.values(o); _i < _a.length; _i++) {
     var x = _a[_i];
     var y = x;
 }
-var entries = Object.entries(o);
+var entries = Object.entries(o); // <-- entries: ['a' | 'b', number][]
 var entries1 = Object.entries(1); // <-- entries: [string, any][]
+var entries2 = Object.entries({ a: true, b: 2 }); // ['a' | 'b', number | boolean][]
+var entries3 = Object.entries({}); // [never, any][]
diff --git a/tests/baselines/reference/useObjectValuesAndEntries1.symbols b/tests/baselines/reference/useObjectValuesAndEntries1.symbols
index 55181e49bab..521d3ae722e 100644
--- a/tests/baselines/reference/useObjectValuesAndEntries1.symbols
+++ b/tests/baselines/reference/useObjectValuesAndEntries1.symbols
@@ -17,7 +17,7 @@ for (var x of Object.values(o)) {
 >x : Symbol(x, Decl(useObjectValuesAndEntries1.ts, 3, 8))
 }
 
-var entries = Object.entries(o);
+var entries = Object.entries(o);  // <-- entries: ['a' | 'b', number][]
 >entries : Symbol(entries, Decl(useObjectValuesAndEntries1.ts, 7, 3))
 >Object.entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
@@ -30,3 +30,17 @@ var entries1 = Object.entries(1); // <-- entries: [string, any][]
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
 
+var entries2 = Object.entries({a: true, b: 2}) // ['a' | 'b', number | boolean][]
+>entries2 : Symbol(entries2, Decl(useObjectValuesAndEntries1.ts, 9, 3))
+>Object.entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
+>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
+>a : Symbol(a, Decl(useObjectValuesAndEntries1.ts, 9, 31))
+>b : Symbol(b, Decl(useObjectValuesAndEntries1.ts, 9, 39))
+
+var entries3 = Object.entries({}) // [never, any][]
+>entries3 : Symbol(entries3, Decl(useObjectValuesAndEntries1.ts, 10, 3))
+>Object.entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
+>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
+
diff --git a/tests/baselines/reference/useObjectValuesAndEntries1.types b/tests/baselines/reference/useObjectValuesAndEntries1.types
index dba92e85583..f04201450c0 100644
--- a/tests/baselines/reference/useObjectValuesAndEntries1.types
+++ b/tests/baselines/reference/useObjectValuesAndEntries1.types
@@ -21,19 +21,39 @@ for (var x of Object.values(o)) {
 >x : number
 }
 
-var entries = Object.entries(o);
->entries : [string, number][]
->Object.entries(o) : [string, number][]
->Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
+var entries = Object.entries(o);  // <-- entries: ['a' | 'b', number][]
+>entries : ["a" | "b", number][]
+>Object.entries(o) : ["a" | "b", number][]
+>Object.entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
 >Object : ObjectConstructor
->entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
+>entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
 >o : { a: number; b: number; }
 
 var entries1 = Object.entries(1); // <-- entries: [string, any][]
 >entries1 : [string, any][]
 >Object.entries(1) : [string, any][]
->Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
+>Object.entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
 >Object : ObjectConstructor
->entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
+>entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
 >1 : 1
 
+var entries2 = Object.entries({a: true, b: 2}) // ['a' | 'b', number | boolean][]
+>entries2 : ["a" | "b", number | boolean][]
+>Object.entries({a: true, b: 2}) : ["a" | "b", number | boolean][]
+>Object.entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
+>Object : ObjectConstructor
+>entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
+>{a: true, b: 2} : { a: true; b: number; }
+>a : boolean
+>true : true
+>b : number
+>2 : 2
+
+var entries3 = Object.entries({}) // [never, any][]
+>entries3 : [never, any][]
+>Object.entries({}) : [never, any][]
+>Object.entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
+>Object : ObjectConstructor
+>entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
+>{} : {}
+
diff --git a/tests/baselines/reference/useObjectValuesAndEntries4.types b/tests/baselines/reference/useObjectValuesAndEntries4.types
index 05af55d42cb..d68193993e2 100644
--- a/tests/baselines/reference/useObjectValuesAndEntries4.types
+++ b/tests/baselines/reference/useObjectValuesAndEntries4.types
@@ -22,10 +22,10 @@ for (var x of Object.values(o)) {
 }
 
 var entries = Object.entries(o);
->entries : [string, number][]
->Object.entries(o) : [string, number][]
->Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
+>entries : ["a" | "b", number][]
+>Object.entries(o) : ["a" | "b", number][]
+>Object.entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
 >Object : ObjectConstructor
->entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
+>entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
 >o : { a: number; b: number; }
 
diff --git a/tests/cases/conformance/es2017/useObjectValuesAndEntries1.ts b/tests/cases/conformance/es2017/useObjectValuesAndEntries1.ts
index 145239a84b2..60099bb1c0f 100644
--- a/tests/cases/conformance/es2017/useObjectValuesAndEntries1.ts
+++ b/tests/cases/conformance/es2017/useObjectValuesAndEntries1.ts
@@ -7,5 +7,7 @@ for (var x of Object.values(o)) {
     let y = x;
 }
 
-var entries = Object.entries(o);
-var entries1 = Object.entries(1); // <-- entries: [string, any][]
\ No newline at end of file
+var entries = Object.entries(o);  // <-- entries: ['a' | 'b', number][]
+var entries1 = Object.entries(1); // <-- entries: [string, any][]
+var entries2 = Object.entries({a: true, b: 2}) // ['a' | 'b', number | boolean][]
+var entries3 = Object.entries({}) // [never, any][]

From 24567445d6dc26394759483b111f20fad2f92452 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sun, 13 Nov 2016 08:29:21 -0800
Subject: [PATCH 210/421] Add early bail out for call expressions that are
 never type predicates

---
 src/compiler/checker.ts | 24 +++++++++++++++++++++++-
 src/compiler/types.ts   |  1 +
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 789f2bd8104..1ca2aff9961 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -8981,6 +8981,28 @@ namespace ts {
             return isLengthPushOrUnshift || isElementAssignment;
         }
 
+        function maybeTypePredicateCall(node: CallExpression) {
+            const links = getNodeLinks(node);
+            if (links.maybeTypePredicate === undefined) {
+                links.maybeTypePredicate = getMaybeTypePredicate(node);
+            }
+            return links.maybeTypePredicate;
+        }
+
+        function getMaybeTypePredicate(node: CallExpression) {
+            if (node.expression.kind !== SyntaxKind.SuperKeyword) {
+                const funcType = checkNonNullExpression(node.expression);
+                if (funcType !== silentNeverType) {
+                    const apparentType = getApparentType(funcType);
+                    if (apparentType !== unknownType) {
+                        const callSignatures = getSignaturesOfType(apparentType, SignatureKind.Call);
+                        return !!forEach(callSignatures, sig => sig.typePredicate);
+                    }
+                }
+            }
+            return false;
+        }
+
         function getFlowTypeOfReference(reference: Node, declaredType: Type, assumeInitialized: boolean, flowContainer: Node) {
             let key: string;
             if (!reference.flowNode || assumeInitialized && !(declaredType.flags & TypeFlags.Narrowable)) {
@@ -9495,7 +9517,7 @@ namespace ts {
             }
 
             function narrowTypeByTypePredicate(type: Type, callExpression: CallExpression, assumeTrue: boolean): Type {
-                if (!hasMatchingArgument(callExpression, reference)) {
+                if (!hasMatchingArgument(callExpression, reference) || !maybeTypePredicateCall(callExpression)) {
                     return type;
                 }
                 const signature = getResolvedSignature(callExpression);
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index c814a2b1d46..79000ba8f05 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -2668,6 +2668,7 @@ namespace ts {
         resolvedSignature?: Signature;    // Cached signature of signature node or call expression
         resolvedSymbol?: Symbol;          // Cached name resolution result
         resolvedIndexInfo?: IndexInfo;    // Cached indexing info resolution result
+        maybeTypePredicate?: boolean;     // Cached check whether call expression might reference a type predicate 
         enumMemberValue?: number;         // Constant value of enum member
         isVisible?: boolean;              // Is this node visible
         hasReportedStatementInAmbientContext?: boolean;  // Cache boolean if we report statements in ambient context

From 85702197b47555c99fe00e06b6ad01d39c19121b Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sun, 13 Nov 2016 08:35:40 -0800
Subject: [PATCH 211/421] Add regression test

---
 .../reference/typePredicateInLoop.js          | 38 +++++++++++
 .../reference/typePredicateInLoop.symbols     | 59 +++++++++++++++++
 .../reference/typePredicateInLoop.types       | 65 +++++++++++++++++++
 tests/cases/compiler/typePredicateInLoop.ts   | 21 ++++++
 4 files changed, 183 insertions(+)
 create mode 100644 tests/baselines/reference/typePredicateInLoop.js
 create mode 100644 tests/baselines/reference/typePredicateInLoop.symbols
 create mode 100644 tests/baselines/reference/typePredicateInLoop.types
 create mode 100644 tests/cases/compiler/typePredicateInLoop.ts

diff --git a/tests/baselines/reference/typePredicateInLoop.js b/tests/baselines/reference/typePredicateInLoop.js
new file mode 100644
index 00000000000..0a1e621cb50
--- /dev/null
+++ b/tests/baselines/reference/typePredicateInLoop.js
@@ -0,0 +1,38 @@
+//// [typePredicateInLoop.ts]
+// Repro from #12101
+
+interface Type {
+  type: number;
+}
+
+interface TypeExt extends Type {
+  arr: Type[];
+}
+
+const guard = (arg: Type): arg is TypeExt => arg.type === 1;
+const otherFunc = (arg1: Type, arg2: TypeExt): void => {};
+
+export function y(arg: Type): void {
+  if (guard(arg)) {
+    for (const ITEM of arg.arr) {
+      if (otherFunc(ITEM, arg)) {
+      }
+    }
+  }
+}
+
+//// [typePredicateInLoop.js]
+// Repro from #12101
+"use strict";
+var guard = function (arg) { return arg.type === 1; };
+var otherFunc = function (arg1, arg2) { };
+function y(arg) {
+    if (guard(arg)) {
+        for (var _i = 0, _a = arg.arr; _i < _a.length; _i++) {
+            var ITEM = _a[_i];
+            if (otherFunc(ITEM, arg)) {
+            }
+        }
+    }
+}
+exports.y = y;
diff --git a/tests/baselines/reference/typePredicateInLoop.symbols b/tests/baselines/reference/typePredicateInLoop.symbols
new file mode 100644
index 00000000000..1cc57b36c6d
--- /dev/null
+++ b/tests/baselines/reference/typePredicateInLoop.symbols
@@ -0,0 +1,59 @@
+=== tests/cases/compiler/typePredicateInLoop.ts ===
+// Repro from #12101
+
+interface Type {
+>Type : Symbol(Type, Decl(typePredicateInLoop.ts, 0, 0))
+
+  type: number;
+>type : Symbol(Type.type, Decl(typePredicateInLoop.ts, 2, 16))
+}
+
+interface TypeExt extends Type {
+>TypeExt : Symbol(TypeExt, Decl(typePredicateInLoop.ts, 4, 1))
+>Type : Symbol(Type, Decl(typePredicateInLoop.ts, 0, 0))
+
+  arr: Type[];
+>arr : Symbol(TypeExt.arr, Decl(typePredicateInLoop.ts, 6, 32))
+>Type : Symbol(Type, Decl(typePredicateInLoop.ts, 0, 0))
+}
+
+const guard = (arg: Type): arg is TypeExt => arg.type === 1;
+>guard : Symbol(guard, Decl(typePredicateInLoop.ts, 10, 5))
+>arg : Symbol(arg, Decl(typePredicateInLoop.ts, 10, 15))
+>Type : Symbol(Type, Decl(typePredicateInLoop.ts, 0, 0))
+>arg : Symbol(arg, Decl(typePredicateInLoop.ts, 10, 15))
+>TypeExt : Symbol(TypeExt, Decl(typePredicateInLoop.ts, 4, 1))
+>arg.type : Symbol(Type.type, Decl(typePredicateInLoop.ts, 2, 16))
+>arg : Symbol(arg, Decl(typePredicateInLoop.ts, 10, 15))
+>type : Symbol(Type.type, Decl(typePredicateInLoop.ts, 2, 16))
+
+const otherFunc = (arg1: Type, arg2: TypeExt): void => {};
+>otherFunc : Symbol(otherFunc, Decl(typePredicateInLoop.ts, 11, 5))
+>arg1 : Symbol(arg1, Decl(typePredicateInLoop.ts, 11, 19))
+>Type : Symbol(Type, Decl(typePredicateInLoop.ts, 0, 0))
+>arg2 : Symbol(arg2, Decl(typePredicateInLoop.ts, 11, 30))
+>TypeExt : Symbol(TypeExt, Decl(typePredicateInLoop.ts, 4, 1))
+
+export function y(arg: Type): void {
+>y : Symbol(y, Decl(typePredicateInLoop.ts, 11, 58))
+>arg : Symbol(arg, Decl(typePredicateInLoop.ts, 13, 18))
+>Type : Symbol(Type, Decl(typePredicateInLoop.ts, 0, 0))
+
+  if (guard(arg)) {
+>guard : Symbol(guard, Decl(typePredicateInLoop.ts, 10, 5))
+>arg : Symbol(arg, Decl(typePredicateInLoop.ts, 13, 18))
+
+    for (const ITEM of arg.arr) {
+>ITEM : Symbol(ITEM, Decl(typePredicateInLoop.ts, 15, 14))
+>arg.arr : Symbol(TypeExt.arr, Decl(typePredicateInLoop.ts, 6, 32))
+>arg : Symbol(arg, Decl(typePredicateInLoop.ts, 13, 18))
+>arr : Symbol(TypeExt.arr, Decl(typePredicateInLoop.ts, 6, 32))
+
+      if (otherFunc(ITEM, arg)) {
+>otherFunc : Symbol(otherFunc, Decl(typePredicateInLoop.ts, 11, 5))
+>ITEM : Symbol(ITEM, Decl(typePredicateInLoop.ts, 15, 14))
+>arg : Symbol(arg, Decl(typePredicateInLoop.ts, 13, 18))
+      }
+    }
+  }
+}
diff --git a/tests/baselines/reference/typePredicateInLoop.types b/tests/baselines/reference/typePredicateInLoop.types
new file mode 100644
index 00000000000..7ffe887e91d
--- /dev/null
+++ b/tests/baselines/reference/typePredicateInLoop.types
@@ -0,0 +1,65 @@
+=== tests/cases/compiler/typePredicateInLoop.ts ===
+// Repro from #12101
+
+interface Type {
+>Type : Type
+
+  type: number;
+>type : number
+}
+
+interface TypeExt extends Type {
+>TypeExt : TypeExt
+>Type : Type
+
+  arr: Type[];
+>arr : Type[]
+>Type : Type
+}
+
+const guard = (arg: Type): arg is TypeExt => arg.type === 1;
+>guard : (arg: Type) => arg is TypeExt
+>(arg: Type): arg is TypeExt => arg.type === 1 : (arg: Type) => arg is TypeExt
+>arg : Type
+>Type : Type
+>arg : any
+>TypeExt : TypeExt
+>arg.type === 1 : boolean
+>arg.type : number
+>arg : Type
+>type : number
+>1 : 1
+
+const otherFunc = (arg1: Type, arg2: TypeExt): void => {};
+>otherFunc : (arg1: Type, arg2: TypeExt) => void
+>(arg1: Type, arg2: TypeExt): void => {} : (arg1: Type, arg2: TypeExt) => void
+>arg1 : Type
+>Type : Type
+>arg2 : TypeExt
+>TypeExt : TypeExt
+
+export function y(arg: Type): void {
+>y : (arg: Type) => void
+>arg : Type
+>Type : Type
+
+  if (guard(arg)) {
+>guard(arg) : boolean
+>guard : (arg: Type) => arg is TypeExt
+>arg : Type
+
+    for (const ITEM of arg.arr) {
+>ITEM : Type
+>arg.arr : Type[]
+>arg : TypeExt
+>arr : Type[]
+
+      if (otherFunc(ITEM, arg)) {
+>otherFunc(ITEM, arg) : void
+>otherFunc : (arg1: Type, arg2: TypeExt) => void
+>ITEM : Type
+>arg : TypeExt
+      }
+    }
+  }
+}
diff --git a/tests/cases/compiler/typePredicateInLoop.ts b/tests/cases/compiler/typePredicateInLoop.ts
new file mode 100644
index 00000000000..4127e1e3d43
--- /dev/null
+++ b/tests/cases/compiler/typePredicateInLoop.ts
@@ -0,0 +1,21 @@
+// Repro from #12101
+
+interface Type {
+  type: number;
+}
+
+interface TypeExt extends Type {
+  arr: Type[];
+}
+
+const guard = (arg: Type): arg is TypeExt => arg.type === 1;
+const otherFunc = (arg1: Type, arg2: TypeExt): void => {};
+
+export function y(arg: Type): void {
+  if (guard(arg)) {
+    for (const ITEM of arg.arr) {
+      if (otherFunc(ITEM, arg)) {
+      }
+    }
+  }
+}
\ No newline at end of file

From b15d1449550759f57759097a802abf14943e69cf Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Sun, 13 Nov 2016 13:34:18 -0800
Subject: [PATCH 212/421] switch to tslint@next (#12201)

---
 package.json          | 2 +-
 src/services/shims.ts | 5 +----
 tslint.json           | 3 +--
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index ed77c9bd35f..9c2cc3697f1 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
         "travis-fold": "latest",
         "ts-node": "latest",
         "tsd": "latest",
-        "tslint": "4.0.0-dev.0",
+        "tslint": "next",
         "typescript": "next"
     },
     "scripts": {
diff --git a/src/services/shims.ts b/src/services/shims.ts
index f2984186790..4debcb23774 100644
--- a/src/services/shims.ts
+++ b/src/services/shims.ts
@@ -1261,11 +1261,8 @@ namespace TypeScript.Services {
     export const TypeScriptServicesFactory = ts.TypeScriptServicesFactory;
 }
 
-/* tslint:disable:no-unused-variable */
 // 'toolsVersion' gets consumed by the managed side, so it's not unused.
 // TODO: it should be moved into a namespace though.
 
 /* @internal */
-const toolsVersion = "2.2";
-
-/* tslint:enable:no-unused-variable */
+const toolsVersion = "2.2";
\ No newline at end of file
diff --git a/tslint.json b/tslint.json
index 81990190ddb..26657981a63 100644
--- a/tslint.json
+++ b/tslint.json
@@ -17,7 +17,7 @@
             "double",
             "avoid-escape"
         ],
-        "semicolon": true,
+        "semicolon": [true, "ignore-bound-class-methods"],
         "whitespace": [true,
             "check-branch",
             "check-decl",
@@ -41,7 +41,6 @@
         "no-trailing-whitespace": true,
         "no-inferrable-types": true,
         "no-null-keyword": true,
-        "no-unused-variable": true,
         "boolean-trivia": true,
         "type-operator-spacing": true,
         "prefer-const": true,

From 56f97e16e3e937c4d2b69b773707746382cb602e Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Sun, 13 Nov 2016 13:52:25 -0800
Subject: [PATCH 213/421] remove tsd dependency (#12206)

---
 package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.json b/package.json
index 9c2cc3697f1..175c1675f2c 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,6 @@
         "through2": "latest",
         "travis-fold": "latest",
         "ts-node": "latest",
-        "tsd": "latest",
         "tslint": "next",
         "typescript": "next"
     },

From cd05c079ce0ebdf8daab9a568f24d0ca86729fc1 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sun, 13 Nov 2016 15:25:16 -0800
Subject: [PATCH 214/421] Add comment explaining type alias instantiation
 strategy

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index d75ae6a8cdc..11b36ae80fb 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -6519,6 +6519,23 @@ namespace ts {
 
         function instantiateType(type: Type, mapper: TypeMapper): Type {
             if (type && mapper !== identityMapper) {
+                // If we are instantiating a type that has a top-level type alias, obtain the instantiation through
+                // the type alias instead in order to share instantiations for the same type arguments. This can
+                // dramatically reduce the number of structurally identical types we generate. Note that we can only
+                // perform this optimization for top-level type aliases. Consider:
+                //
+                //   function f1<T>(x: T) {
+                //     type Foo<X> = { x: X, t: T };
+                //     let obj: Foo<T> = { x: x };
+                //     return obj;
+                //   }
+                //   function f2<U>(x: U) { return f1(x); }
+                //   let z = f2(42);
+                //
+                // Above, the declaration of f2 has an inferred return type that is an instantiation of f1's Foo<X>
+                // equivalent to { x: U, t: U }. When instantiating this return type, we can't go back to Foo<X>'s
+                // cache because all cached instantiations are of the form { x: ???, t: T }, i.e. they have not been
+                // instantiated for T. Instead, we need to further instantiate the { x: U, t: U } form.
                 if (type.aliasSymbol && isTopLevelTypeAlias(type.aliasSymbol)) {
                     if (type.aliasTypeArguments) {
                         return getTypeAliasInstantiation(type.aliasSymbol, instantiateTypes(type.aliasTypeArguments, mapper));

From 4166eeb28469bad9279af47e4d635c2b87abad06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=28=C2=B4=E3=83=BB=CF=89=E3=83=BB=EF=BD=80=29?=
 <HerringtonDarkholme@users.noreply.github.com>
Date: Mon, 14 Nov 2016 07:27:07 +0800
Subject: [PATCH 215/421] fix #12137, correct ProxyHandler signatures (#12172)

* fix #12137, correct ProxyHandler signatures

* address PR review
---
 src/lib/es2015.proxy.d.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/es2015.proxy.d.ts b/src/lib/es2015.proxy.d.ts
index c37e8fb0f59..34aedce0128 100644
--- a/src/lib/es2015.proxy.d.ts
+++ b/src/lib/es2015.proxy.d.ts
@@ -1,5 +1,5 @@
 interface ProxyHandler<T> {
-    getPrototypeOf? (target: T): any;
+    getPrototypeOf? (target: T): {} | null;
     setPrototypeOf? (target: T, v: any): boolean;
     isExtensible? (target: T): boolean;
     preventExtensions? (target: T): boolean;
@@ -12,11 +12,11 @@ interface ProxyHandler<T> {
     enumerate? (target: T): PropertyKey[];
     ownKeys? (target: T): PropertyKey[];
     apply? (target: T, thisArg: any, argArray?: any): any;
-    construct? (target: T, thisArg: any, argArray?: any): any;
+    construct? (target: T, argArray: any, newTarget?: any): {};
 }
 
 interface ProxyConstructor {
     revocable<T>(target: T, handler: ProxyHandler<T>): { proxy: T; revoke: () => void; };
     new <T>(target: T, handler: ProxyHandler<T>): T
 }
-declare var Proxy: ProxyConstructor;
\ No newline at end of file
+declare var Proxy: ProxyConstructor;

From 0adc76bd2b255d2f07ec5bc5bda285e53385b9b4 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 14 Nov 2016 08:52:16 -0800
Subject: [PATCH 216/421] Test object spread+async emit & nested spread emit

---
 tests/baselines/reference/objectRest2.js      | 42 +++++++++++++++++
 tests/baselines/reference/objectRest2.symbols | 34 ++++++++++++++
 tests/baselines/reference/objectRest2.types   | 45 +++++++++++++++++++
 tests/baselines/reference/objectSpread.js     |  2 +-
 .../conformance/types/rest/objectRest2.ts     | 15 +++++++
 5 files changed, 137 insertions(+), 1 deletion(-)
 create mode 100644 tests/baselines/reference/objectRest2.js
 create mode 100644 tests/baselines/reference/objectRest2.symbols
 create mode 100644 tests/baselines/reference/objectRest2.types
 create mode 100644 tests/cases/conformance/types/rest/objectRest2.ts

diff --git a/tests/baselines/reference/objectRest2.js b/tests/baselines/reference/objectRest2.js
new file mode 100644
index 00000000000..e21c8c79853
--- /dev/null
+++ b/tests/baselines/reference/objectRest2.js
@@ -0,0 +1,42 @@
+//// [objectRest2.ts]
+// test for #12203
+declare function connectionFromArray(objects: number, args: any): {};
+function rootConnection(name: string) {
+  return {
+    resolve: async (context, args) => {
+        const { objects } = await { objects: 12 };
+      return {
+        ...connectionFromArray(objects, args)
+      };
+    }
+  };
+}
+rootConnection('test');
+
+
+//// [objectRest2.js]
+var __assign = (this && this.__assign) || Object.assign || function(t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+        s = arguments[i];
+        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+            t[p] = s[p];
+    }
+    return t;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    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); }
+        step((generator = generator.apply(thisArg, _arguments)).next());
+    });
+};
+function rootConnection(name) {
+    return {
+        resolve: (context, args) => __awaiter(this, void 0, void 0, function* () {
+            const { objects } = yield { objects: 12 };
+            return __assign({}, connectionFromArray(objects, args));
+        })
+    };
+}
+rootConnection('test');
diff --git a/tests/baselines/reference/objectRest2.symbols b/tests/baselines/reference/objectRest2.symbols
new file mode 100644
index 00000000000..42532f5d183
--- /dev/null
+++ b/tests/baselines/reference/objectRest2.symbols
@@ -0,0 +1,34 @@
+=== tests/cases/conformance/types/rest/objectRest2.ts ===
+// test for #12203
+declare function connectionFromArray(objects: number, args: any): {};
+>connectionFromArray : Symbol(connectionFromArray, Decl(objectRest2.ts, 0, 0))
+>objects : Symbol(objects, Decl(objectRest2.ts, 1, 37))
+>args : Symbol(args, Decl(objectRest2.ts, 1, 53))
+
+function rootConnection(name: string) {
+>rootConnection : Symbol(rootConnection, Decl(objectRest2.ts, 1, 69))
+>name : Symbol(name, Decl(objectRest2.ts, 2, 24))
+
+  return {
+    resolve: async (context, args) => {
+>resolve : Symbol(resolve, Decl(objectRest2.ts, 3, 10))
+>context : Symbol(context, Decl(objectRest2.ts, 4, 20))
+>args : Symbol(args, Decl(objectRest2.ts, 4, 28))
+
+        const { objects } = await { objects: 12 };
+>objects : Symbol(objects, Decl(objectRest2.ts, 5, 15))
+>objects : Symbol(objects, Decl(objectRest2.ts, 5, 35))
+
+      return {
+        ...connectionFromArray(objects, args)
+>connectionFromArray : Symbol(connectionFromArray, Decl(objectRest2.ts, 0, 0))
+>objects : Symbol(objects, Decl(objectRest2.ts, 5, 15))
+>args : Symbol(args, Decl(objectRest2.ts, 4, 28))
+
+      };
+    }
+  };
+}
+rootConnection('test');
+>rootConnection : Symbol(rootConnection, Decl(objectRest2.ts, 1, 69))
+
diff --git a/tests/baselines/reference/objectRest2.types b/tests/baselines/reference/objectRest2.types
new file mode 100644
index 00000000000..8e89a3cb573
--- /dev/null
+++ b/tests/baselines/reference/objectRest2.types
@@ -0,0 +1,45 @@
+=== tests/cases/conformance/types/rest/objectRest2.ts ===
+// test for #12203
+declare function connectionFromArray(objects: number, args: any): {};
+>connectionFromArray : (objects: number, args: any) => {}
+>objects : number
+>args : any
+
+function rootConnection(name: string) {
+>rootConnection : (name: string) => { resolve: (context: any, args: any) => Promise<{}>; }
+>name : string
+
+  return {
+>{    resolve: async (context, args) => {        const { objects } = await { objects: 12 };      return {        ...connectionFromArray(objects, args)      };    }  } : { resolve: (context: any, args: any) => Promise<{}>; }
+
+    resolve: async (context, args) => {
+>resolve : (context: any, args: any) => Promise<{}>
+>async (context, args) => {        const { objects } = await { objects: 12 };      return {        ...connectionFromArray(objects, args)      };    } : (context: any, args: any) => Promise<{}>
+>context : any
+>args : any
+
+        const { objects } = await { objects: 12 };
+>objects : number
+>await { objects: 12 } : { objects: number; }
+>{ objects: 12 } : { objects: number; }
+>objects : number
+>12 : 12
+
+      return {
+>{        ...connectionFromArray(objects, args)      } : {}
+
+        ...connectionFromArray(objects, args)
+>connectionFromArray(objects, args) : {}
+>connectionFromArray : (objects: number, args: any) => {}
+>objects : number
+>args : any
+
+      };
+    }
+  };
+}
+rootConnection('test');
+>rootConnection('test') : { resolve: (context: any, args: any) => Promise<{}>; }
+>rootConnection : (name: string) => { resolve: (context: any, args: any) => Promise<{}>; }
+>'test' : "test"
+
diff --git a/tests/baselines/reference/objectSpread.js b/tests/baselines/reference/objectSpread.js
index d1de48c5cab..4305e17ab31 100644
--- a/tests/baselines/reference/objectSpread.js
+++ b/tests/baselines/reference/objectSpread.js
@@ -105,7 +105,7 @@ 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 propertyNested = __assign({ a: __assign({}, o) });
+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; } };
diff --git a/tests/cases/conformance/types/rest/objectRest2.ts b/tests/cases/conformance/types/rest/objectRest2.ts
new file mode 100644
index 00000000000..4a38123f1ac
--- /dev/null
+++ b/tests/cases/conformance/types/rest/objectRest2.ts
@@ -0,0 +1,15 @@
+// @lib: es2015
+// @target: es2015
+// test for #12203
+declare function connectionFromArray(objects: number, args: any): {};
+function rootConnection(name: string) {
+  return {
+    resolve: async (context, args) => {
+        const { objects } = await { objects: 12 };
+      return {
+        ...connectionFromArray(objects, args)
+      };
+    }
+  };
+}
+rootConnection('test');

From fab1416dd26339a7338d009faeb025d37ef0c91b Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 14 Nov 2016 08:58:29 -0800
Subject: [PATCH 217/421] Fixes for object spread emit

1. Retain function modifiers. They were previously dropped.
2. Do not emit __assign for object literals with no spreads, just visit
children.
3. call aggregateTransformFlags after creating an __assign call.
---
 src/compiler/transformers/esnext.ts | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/compiler/transformers/esnext.ts b/src/compiler/transformers/esnext.ts
index 1fad209bdb3..eaaa1e416cd 100644
--- a/src/compiler/transformers/esnext.ts
+++ b/src/compiler/transformers/esnext.ts
@@ -92,11 +92,15 @@ namespace ts {
             //     { a, ...o, b } => __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)
-            const objects = chunkObjectLiteralElements(node.properties);
-            if (objects.length && objects[0].kind !== SyntaxKind.ObjectLiteralExpression) {
-                objects.unshift(createObjectLiteral());
+            if (forEach(node.properties, p => p.kind === SyntaxKind.SpreadAssignment)) {
+                const objects = chunkObjectLiteralElements(node.properties);
+                if (objects.length && objects[0].kind !== SyntaxKind.ObjectLiteralExpression) {
+                    objects.unshift(createObjectLiteral());
+                }
+
+                return aggregateTransformFlags(createCall(createIdentifier("__assign"), undefined, objects));
             }
-            return createCall(createIdentifier("__assign"), undefined, objects);
+            return visitEachChild(node, visitor, context);
         }
 
         /**
@@ -235,7 +239,7 @@ namespace ts {
                 visitEachChild(node.body, visitor, context);
             const func = setOriginalNode(
                 createArrowFunction(
-                    /*modifiers*/ undefined,
+                    node.modifiers,
                     /*typeParameters*/ undefined,
                     visitNodes(node.parameters, visitor, isParameter),
                     /*type*/ undefined,
@@ -256,7 +260,7 @@ namespace ts {
                 visitEachChild(node.body, visitor, context);
             return setOriginalNode(
                 createFunctionExpression(
-                    /*modifiers*/ undefined,
+                    node.modifiers,
                     node.asteriskToken,
                     name,
                     /*typeParameters*/ undefined,

From d5b9263433c7e6b77eee0b138005333eebc00058 Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Mon, 14 Nov 2016 10:40:26 -0800
Subject: [PATCH 218/421] Consolidate destructuring code paths

---
 src/compiler/binder.ts                        |  114 +-
 src/compiler/factory.ts                       |   47 +-
 src/compiler/transformers/destructuring.ts    | 1157 ++++-------------
 src/compiler/transformers/es2015.ts           |   63 +-
 src/compiler/transformers/es2017.ts           |  154 +--
 src/compiler/transformers/esnext.ts           |   60 +-
 src/compiler/transformers/jsx.ts              |    8 +-
 src/compiler/transformers/module/module.ts    |   12 +-
 src/compiler/transformers/module/system.ts    |   10 +-
 src/compiler/transformers/ts.ts               |    6 +-
 src/compiler/types.ts                         |   81 +-
 src/compiler/visitor.ts                       |  447 ++++---
 .../reference/assignmentTypeNarrowing.js      |   10 +-
 .../reference/asyncMethodWithSuper_es5.js     |    8 +-
 .../computedPropertiesInDestructuring1.js     |   16 +-
 .../reference/declarationsAndAssignments.js   |    6 +-
 .../destructuringAssignmentWithDefault.js     |    2 +-
 .../emptyAssignmentPatterns02_ES5.js          |    4 +-
 .../emptyAssignmentPatterns04_ES5.js          |    5 +-
 .../initializePropertiesWithRenamedLet.js     |    5 +-
 .../reference/missingAndExcessProperties.js   |   16 +-
 tests/baselines/reference/objectRest.js       |    4 +-
 .../reference/objectRestAssignment.js         |    6 +-
 .../baselines/reference/objectRestNegative.js |    4 +-
 ...thandPropertyAssignmentsInDestructuring.js |   40 +-
 25 files changed, 889 insertions(+), 1396 deletions(-)

diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index 3e65b547d5b..9a477f05211 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -570,6 +570,31 @@ namespace ts {
             }
         }
 
+        function bindEach(nodes: NodeArray<Node>) {
+            if (nodes === undefined) {
+                return;
+            }
+
+            if (skipTransformFlagAggregation) {
+                forEach(nodes, bind);
+            }
+            else {
+                const savedSubtreeTransformFlags = subtreeTransformFlags;
+                subtreeTransformFlags = TransformFlags.None;
+                let nodeArrayFlags = TransformFlags.None;
+                for (const node of nodes) {
+                    bind(node);
+                    nodeArrayFlags |= node.transformFlags & ~TransformFlags.HasComputedFlags;
+                }
+                nodes.transformFlags = nodeArrayFlags | TransformFlags.HasComputedFlags;
+                subtreeTransformFlags |= savedSubtreeTransformFlags;
+            }
+        }
+
+        function bindEachChild(node: Node) {
+            forEachChild(node, bind, bindEach);
+        }
+
         function bindChildrenWorker(node: Node): void {
             // Binding of JsDocComment should be done before the current block scope container changes.
             // because the scope of JsDocComment should not be affected by whether the current node is a
@@ -578,7 +603,7 @@ namespace ts {
                 forEach(node.jsDocComments, bind);
             }
             if (checkUnreachable(node)) {
-                forEachChild(node, bind);
+                bindEachChild(node);
                 return;
             }
             switch (node.kind) {
@@ -643,7 +668,7 @@ namespace ts {
                     bindCallExpressionFlow(<CallExpression>node);
                     break;
                 default:
-                    forEachChild(node, bind);
+                    bindEachChild(node);
                     break;
             }
         }
@@ -976,7 +1001,7 @@ namespace ts {
             return undefined;
         }
 
-        function bindbreakOrContinueFlow(node: BreakOrContinueStatement, breakTarget: FlowLabel, continueTarget: FlowLabel) {
+        function bindBreakOrContinueFlow(node: BreakOrContinueStatement, breakTarget: FlowLabel, continueTarget: FlowLabel) {
             const flowLabel = node.kind === SyntaxKind.BreakStatement ? breakTarget : continueTarget;
             if (flowLabel) {
                 addAntecedent(flowLabel, currentFlow);
@@ -990,11 +1015,11 @@ namespace ts {
                 const activeLabel = findActiveLabel(node.label.text);
                 if (activeLabel) {
                     activeLabel.referenced = true;
-                    bindbreakOrContinueFlow(node, activeLabel.breakTarget, activeLabel.continueTarget);
+                    bindBreakOrContinueFlow(node, activeLabel.breakTarget, activeLabel.continueTarget);
                 }
             }
             else {
-                bindbreakOrContinueFlow(node, currentBreakTarget, currentContinueTarget);
+                bindBreakOrContinueFlow(node, currentBreakTarget, currentContinueTarget);
             }
         }
 
@@ -1062,6 +1087,8 @@ namespace ts {
         }
 
         function bindCaseBlock(node: CaseBlock): void {
+            const savedSubtreeTransformFlags = subtreeTransformFlags;
+            subtreeTransformFlags = 0;
             const clauses = node.clauses;
             let fallthroughFlow = unreachableFlow;
             for (let i = 0; i < clauses.length; i++) {
@@ -1081,6 +1108,8 @@ namespace ts {
                     errorOnFirstToken(clause, Diagnostics.Fallthrough_case_in_switch);
                 }
             }
+            clauses.transformFlags = subtreeTransformFlags | TransformFlags.HasComputedFlags;
+            subtreeTransformFlags |= savedSubtreeTransformFlags;
         }
 
         function bindCaseClause(node: CaseClause): void {
@@ -1088,7 +1117,7 @@ namespace ts {
             currentFlow = preSwitchCaseFlow;
             bind(node.expression);
             currentFlow = saveCurrentFlow;
-            forEach(node.statements, bind);
+            bindEach(node.statements);
         }
 
         function pushActiveLabel(name: string, breakTarget: FlowLabel, continueTarget: FlowLabel): ActiveLabel {
@@ -1180,12 +1209,12 @@ namespace ts {
                 const saveTrueTarget = currentTrueTarget;
                 currentTrueTarget = currentFalseTarget;
                 currentFalseTarget = saveTrueTarget;
-                forEachChild(node, bind);
+                bindEachChild(node);
                 currentFalseTarget = currentTrueTarget;
                 currentTrueTarget = saveTrueTarget;
             }
             else {
-                forEachChild(node, bind);
+                bindEachChild(node);
                 if (node.operator === SyntaxKind.PlusPlusToken || node.operator === SyntaxKind.MinusMinusToken) {
                     bindAssignmentTargetFlow(node.operand);
                 }
@@ -1193,7 +1222,7 @@ namespace ts {
         }
 
         function bindPostfixUnaryExpressionFlow(node: PostfixUnaryExpression) {
-            forEachChild(node, bind);
+            bindEachChild(node);
             if (node.operator === SyntaxKind.PlusPlusToken || node.operator === SyntaxKind.MinusMinusToken) {
                 bindAssignmentTargetFlow(node.operand);
             }
@@ -1212,7 +1241,7 @@ namespace ts {
                 }
             }
             else {
-                forEachChild(node, bind);
+                bindEachChild(node);
                 if (isAssignmentOperator(operator) && !isAssignmentTarget(node)) {
                     bindAssignmentTargetFlow(node.left);
                     if (operator === SyntaxKind.EqualsToken && node.left.kind === SyntaxKind.ElementAccessExpression) {
@@ -1226,7 +1255,7 @@ namespace ts {
         }
 
         function bindDeleteExpressionFlow(node: DeleteExpression) {
-            forEachChild(node, bind);
+            bindEachChild(node);
             if (node.expression.kind === SyntaxKind.PropertyAccessExpression) {
                 bindAssignmentTargetFlow(node.expression);
             }
@@ -1261,7 +1290,7 @@ namespace ts {
         }
 
         function bindVariableDeclarationFlow(node: VariableDeclaration) {
-            forEachChild(node, bind);
+            bindEachChild(node);
             if (node.initializer || node.parent.parent.kind === SyntaxKind.ForInStatement || node.parent.parent.kind === SyntaxKind.ForOfStatement) {
                 bindInitializedVariableFlow(node);
             }
@@ -1276,12 +1305,12 @@ namespace ts {
                 expr = (<ParenthesizedExpression>expr).expression;
             }
             if (expr.kind === SyntaxKind.FunctionExpression || expr.kind === SyntaxKind.ArrowFunction) {
-                forEach(node.typeArguments, bind);
-                forEach(node.arguments, bind);
+                bindEach(node.typeArguments);
+                bindEach(node.arguments);
                 bind(node.expression);
             }
             else {
-                forEachChild(node, bind);
+                bindEachChild(node);
             }
             if (node.expression.kind === SyntaxKind.PropertyAccessExpression) {
                 const propertyAccess = <PropertyAccessExpression>node.expression;
@@ -2514,7 +2543,7 @@ namespace ts {
             transformFlags |= TransformFlags.AssertTypeScript;
         }
 
-        if (subtreeFlags & TransformFlags.ContainsSpreadExpression
+        if (subtreeFlags & TransformFlags.ContainsSpread
             || isSuperOrSuperProperty(expression, expressionKind)) {
             // If the this node contains a SpreadExpression, or is a super call, then it is an ES6
             // node.
@@ -2545,7 +2574,7 @@ namespace ts {
         if (node.typeArguments) {
             transformFlags |= TransformFlags.AssertTypeScript;
         }
-        if (subtreeFlags & TransformFlags.ContainsSpreadExpression) {
+        if (subtreeFlags & TransformFlags.ContainsSpread) {
             // If the this node contains a SpreadElementExpression then it is an ES6
             // node.
             transformFlags |= TransformFlags.AssertES2015;
@@ -2554,7 +2583,6 @@ namespace ts {
         return transformFlags & ~TransformFlags.ArrayLiteralOrCallOrNewExcludes;
     }
 
-
     function computeBinaryExpression(node: BinaryExpression, subtreeFlags: TransformFlags) {
         let transformFlags = subtreeFlags;
         const operatorTokenKind = node.operatorToken.kind;
@@ -2601,7 +2629,7 @@ namespace ts {
         }
 
         // parameters with object rest destructuring are ES Next syntax
-        if (subtreeFlags & TransformFlags.ContainsSpreadExpression) {
+        if (subtreeFlags & (TransformFlags.ContainsRest | TransformFlags.ContainsObjectRest)) {
             transformFlags |= TransformFlags.AssertESNext;
         }
 
@@ -2723,7 +2751,7 @@ namespace ts {
         }
 
         node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
-        return transformFlags & ~TransformFlags.NodeExcludes;
+        return transformFlags & ~TransformFlags.CatchClauseExcludes;
     }
 
     function computeExpressionWithTypeArguments(node: ExpressionWithTypeArguments, subtreeFlags: TransformFlags) {
@@ -2839,7 +2867,7 @@ namespace ts {
             }
 
             // function declarations with object rest destructuring are ES Next syntax
-            if (subtreeFlags & TransformFlags.ContainsSpreadExpression) {
+            if (subtreeFlags & (TransformFlags.ContainsRest | TransformFlags.ContainsObjectRest)) {
                 transformFlags |= TransformFlags.AssertESNext;
             }
 
@@ -2881,7 +2909,7 @@ namespace ts {
         }
 
         // function expressions with object rest destructuring are ES Next syntax
-        if (subtreeFlags & TransformFlags.ContainsSpreadExpression) {
+        if (subtreeFlags & (TransformFlags.ContainsRest | TransformFlags.ContainsObjectRest)) {
             transformFlags |= TransformFlags.AssertESNext;
         }
 
@@ -2924,7 +2952,7 @@ namespace ts {
         }
 
         // arrow functions with object rest destructuring are ES Next syntax
-        if (subtreeFlags & TransformFlags.ContainsSpreadExpression) {
+        if (subtreeFlags & (TransformFlags.ContainsRest | TransformFlags.ContainsObjectRest)) {
             transformFlags |= TransformFlags.AssertESNext;
         }
 
@@ -3178,16 +3206,19 @@ namespace ts {
                 break;
 
             case SyntaxKind.SpreadElement:
+                transformFlags |= TransformFlags.AssertES2015 | TransformFlags.ContainsSpread;
+                break;
+
             case SyntaxKind.SpreadAssignment:
-                // This node is ES6 or ES next syntax, but is handled by a containing node.
-                transformFlags |= TransformFlags.ContainsSpreadExpression;
+                transformFlags |= TransformFlags.AssertESNext | TransformFlags.ContainsSpread | TransformFlags.ContainsObjectSpread;
                 break;
 
             case SyntaxKind.BindingElement:
-                if ((node as BindingElement).dotDotDotToken) {
-                    // this node is ES2015 or ES next syntax, but is handled by a containing node.
-                    transformFlags |= TransformFlags.ContainsSpreadExpression;
+                transformFlags |= TransformFlags.AssertES2015;
+                if ((<BindingElement>node).dotDotDotToken) {
+                    transformFlags |= TransformFlags.ContainsRest;
                 }
+                break;
 
             case SyntaxKind.SuperKeyword:
                 // This node is ES6 syntax.
@@ -3200,14 +3231,16 @@ namespace ts {
                 break;
 
             case SyntaxKind.ObjectBindingPattern:
+                transformFlags |= TransformFlags.AssertES2015 | TransformFlags.ContainsBindingPattern;
+                if (subtreeFlags & TransformFlags.ContainsSpread) {
+                    transformFlags |= TransformFlags.AssertESNext | TransformFlags.ContainsObjectRest;
+                }
+                excludeFlags = TransformFlags.BindingPatternExcludes;
+                break;
+
             case SyntaxKind.ArrayBindingPattern:
-                // These nodes are ES2015 or ES Next syntax.
-                if (subtreeFlags & TransformFlags.ContainsSpreadExpression) {
-                    transformFlags |= TransformFlags.AssertESNext | TransformFlags.ContainsBindingPattern;
-                }
-                else {
-                    transformFlags |= TransformFlags.AssertES2015 | TransformFlags.ContainsBindingPattern;
-                }
+                transformFlags |= TransformFlags.AssertES2015 | TransformFlags.ContainsBindingPattern;
+                excludeFlags = TransformFlags.BindingPatternExcludes;
                 break;
 
             case SyntaxKind.Decorator:
@@ -3229,10 +3262,10 @@ namespace ts {
                     transformFlags |= TransformFlags.ContainsLexicalThis;
                 }
 
-                if (subtreeFlags & TransformFlags.ContainsSpreadExpression) {
+                if (subtreeFlags & TransformFlags.ContainsSpread) {
                     // If an ObjectLiteralExpression contains a spread element, then it
                     // is an ES next node.
-                    transformFlags |= TransformFlags.AssertESNext;
+                    transformFlags |= TransformFlags.AssertESNext | TransformFlags.ContainsObjectSpread;
                 }
 
                 break;
@@ -3240,7 +3273,7 @@ namespace ts {
             case SyntaxKind.ArrayLiteralExpression:
             case SyntaxKind.NewExpression:
                 excludeFlags = TransformFlags.ArrayLiteralOrCallOrNewExcludes;
-                if (subtreeFlags & TransformFlags.ContainsSpreadExpression) {
+                if (subtreeFlags & TransformFlags.ContainsSpread) {
                     // If the this node contains a SpreadExpression, then it is an ES6
                     // node.
                     transformFlags |= TransformFlags.AssertES2015;
@@ -3333,6 +3366,11 @@ namespace ts {
                 return TransformFlags.TypeExcludes;
             case SyntaxKind.ObjectLiteralExpression:
                 return TransformFlags.ObjectLiteralExcludes;
+            case SyntaxKind.CatchClause:
+                return TransformFlags.CatchClauseExcludes;
+            case SyntaxKind.ObjectBindingPattern:
+            case SyntaxKind.ArrayBindingPattern:
+                return TransformFlags.BindingPatternExcludes;
             default:
                 return TransformFlags.NodeExcludes;
         }
diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index 6674ffc7263..ac3d5ed6e29 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -2341,6 +2341,13 @@ namespace ts {
 
     // Utilities
 
+    export function convertToFunctionBody(node: ConciseBody) {
+        if (isBlock(node)) {
+            return node;
+        }
+        return createBlock([createReturn(node, node)], node);
+    }
+
     function isUseStrictPrologue(node: ExpressionStatement): boolean {
         return (node.expression as StringLiteral).text === "use strict";
     }
@@ -3121,7 +3128,7 @@ namespace ts {
         }
 
         addCaptureThisForNodeIfNeeded(statements, node, enableSubstitutionsForCapturedThis);
-        addDefaultValueAssignmentsIfNeeded(statements, node, visitor, convertObjectRest);
+        addDefaultValueAssignmentsIfNeeded(context, statements, node, visitor, convertObjectRest);
         addRestParameterIfNeeded(statements, node, /*inConstructorWithSynthesizedSuper*/ false);
 
         // If we added any generated statements, this must be a multi-line block.
@@ -3236,7 +3243,8 @@ namespace ts {
      * @param statements The statements for the new function body.
      * @param node A function-like node.
      */
-    export function addDefaultValueAssignmentsIfNeeded(statements: Statement[],
+    export function addDefaultValueAssignmentsIfNeeded(context: TransformationContext,
+                                                       statements: Statement[],
                                                        node: FunctionLikeDeclaration,
                                                        visitor: (node: Node) => VisitResult<Node>,
                                                        convertObjectRest: boolean): void {
@@ -3254,7 +3262,7 @@ namespace ts {
             }
 
             if (isBindingPattern(name)) {
-                addDefaultValueAssignmentForBindingPattern(statements, parameter, name, initializer, visitor, convertObjectRest);
+                addDefaultValueAssignmentForBindingPattern(context, statements, parameter, name, initializer, visitor, convertObjectRest);
             }
             else if (initializer) {
                 addDefaultValueAssignmentForInitializer(statements, parameter, name, initializer, visitor);
@@ -3270,7 +3278,8 @@ namespace ts {
      * @param name The name of the parameter.
      * @param initializer The initializer for the parameter.
      */
-    function addDefaultValueAssignmentForBindingPattern(statements: Statement[],
+    function addDefaultValueAssignmentForBindingPattern(context: TransformationContext,
+                                                        statements: Statement[],
                                                         parameter: ParameterDeclaration,
                                                         name: BindingPattern, initializer: Expression,
                                                         visitor: (node: Node) => VisitResult<Node>,
@@ -3286,7 +3295,17 @@ namespace ts {
                     createVariableStatement(
                         /*modifiers*/ undefined,
                         createVariableDeclarationList(
-                            flattenParameterDestructuring(parameter, temp, visitor, convertObjectRest)
+                            flattenDestructuringToDeclarations(
+                                context,
+                                parameter,
+                                temp,
+                                /*skipInitializer*/ convertObjectRest,
+                                /*recordTempVariablesInLine*/ true,
+                                convertObjectRest
+                                    ? FlattenLevel.ObjectRest
+                                    : FlattenLevel.All,
+                                visitor
+                            )
                         )
                     ),
                     EmitFlags.CustomPrologue
@@ -3490,12 +3509,16 @@ namespace ts {
             if (firstOriginalDeclaration && isBindingPattern(firstOriginalDeclaration.name)) {
                 // This works whether the declaration is a var, let, or const.
                 // It will use rhsIterationValue _a[_i] as the initializer.
-                const declarations = flattenVariableDestructuring(
+                const declarations = flattenDestructuringToDeclarations(
+                    context,
                     firstOriginalDeclaration,
                     elementAccess,
-                    visitor,
-                    /*recordTempVariable*/ undefined,
+                    /*skipInitializer*/ false,
+                    /*recordTempVariablesInLine*/ true,
                     convertObjectRest
+                        ? FlattenLevel.ObjectRest
+                        : FlattenLevel.All,
+                    visitor
                 );
 
                 const declarationList = createVariableDeclarationList(declarations, /*location*/ initializer);
@@ -3543,13 +3566,15 @@ namespace ts {
                 // This is a destructuring pattern, so we flatten the destructuring instead.
                 statements.push(
                     createStatement(
-                        flattenDestructuringAssignment(
+                        flattenDestructuringToExpression(
                             context,
                             assignment,
                             /*needsValue*/ false,
-                            context.hoistVariableDeclaration,
-                            visitor,
                             convertObjectRest
+                                ? FlattenLevel.ObjectRest
+                                : FlattenLevel.All,
+                            /*createAssignmentCallback*/ undefined,
+                            visitor
                         )
                     )
                 );
diff --git a/src/compiler/transformers/destructuring.ts b/src/compiler/transformers/destructuring.ts
index b0cb3f9d239..d4886457062 100644
--- a/src/compiler/transformers/destructuring.ts
+++ b/src/compiler/transformers/destructuring.ts
@@ -3,685 +3,218 @@
 
 /*@internal*/
 namespace ts {
-    type EffectiveBindingElement = VariableDeclaration | ParameterDeclaration | BindingElement | ObjectLiteralElementLike | Expression;
-    type EffectiveObjectBindingPattern = ObjectBindingPattern | ObjectLiteralExpression;
-    type EffectiveArrayBindingPattern = ArrayBindingPattern | ArrayLiteralExpression;
-    type EffectiveBindingPattern = EffectiveObjectBindingPattern | EffectiveArrayBindingPattern;
-    type EffectiveBindingTarget = EffectiveBindingPattern | Expression;
-    type EffectiveRestIndicator = DotDotDotToken | SpreadElement | SpreadAssignment;
-
-    export const enum FlattenLevel {
-        All,
-        ObjectRestDestructuringOnly,
-    }
-
-    /**
-     * Flattens a destructuring assignment expression.
-     *
-     * @param root The destructuring assignment expression.
-     * @param needsValue Indicates whether the value from the right-hand-side of the
-     *                   destructuring assignment is needed as part of a larger expression.
-     * @param recordTempVariable A callback used to record new temporary variables.
-     * @param visitor An optional visitor to use to visit expressions.
-     */
-    export function flattenDestructuringAssignment(
-        context: TransformationContext,
-        node: BinaryExpression,
-        needsValue: boolean,
-        recordTempVariable: (node: Identifier) => void,
-        visitor?: (node: Node) => VisitResult<Node>,
-        transformRest?: boolean): Expression {
-
-        if (isEmptyObjectLiteralOrArrayLiteral(node.left)) {
-            const right = node.right;
-            if (isDestructuringAssignment(right)) {
-                return flattenDestructuringAssignment(context, right, needsValue, recordTempVariable, visitor);
-            }
-            else {
-                return node.right;
-            }
-        }
-
-        let location: TextRange = node;
-        let value = node.right;
-        const expressions: Expression[] = [];
-        if (needsValue) {
-            // If the right-hand value of the destructuring assignment needs to be preserved (as
-            // is the case when the destructuring assignmen) is part of a larger expression),
-            // then we need to cache the right-hand value.
-            //
-            // The source map location for the assignment should point to the entire binary
-            // expression.
-            value = ensureIdentifierOld(value, /*reuseIdentifierExpressions*/ true, location, emitTempVariableAssignment, visitor);
-        }
-        else if (nodeIsSynthesized(node)) {
-            // Generally, the source map location for a destructuring assignment is the root
-            // expression.
-            //
-            // However, if the root expression is synthesized (as in the case
-            // of the initializer when transforming a ForOfStatement), then the source map
-            // location should point to the right-hand value of the expression.
-            location = value;
-        }
-
-        flattenDestructuringOld(node, value, location, emitAssignment, emitTempVariableAssignment, recordTempVariable, emitRestAssignment, transformRest, visitor);
-
-        if (needsValue) {
-            expressions.push(value);
-        }
-
-        const expression = inlineExpressions(expressions);
-        aggregateTransformFlags(expression);
-        return expression;
-
-        function emitAssignment(name: Identifier | ObjectLiteralExpression, value: Expression, location: TextRange) {
-            const expression = createAssignment(name, value, location);
-
-            // NOTE: this completely disables source maps, but aligns with the behavior of
-            //       `emitAssignment` in the old emitter.
-            setEmitFlags(expression, EmitFlags.NoNestedSourceMaps);
-
-            aggregateTransformFlags(expression);
-            expressions.push(expression);
-        }
-
-        function emitTempVariableAssignment(value: Expression, location: TextRange) {
-            const name = createTempVariable(recordTempVariable);
-            emitAssignment(name, value, location);
-            return name;
-        }
-
-        function emitRestAssignment(elements: ObjectLiteralElementLike[], value: Expression, location: TextRange) {
-            emitAssignment(createObjectLiteral(elements), value, location);
-        }
-    }
-
-    /**
-     * Flattens binding patterns in a parameter declaration.
-     *
-     * @param node The ParameterDeclaration to flatten.
-     * @param value The rhs value for the binding pattern.
-     * @param visitor An optional visitor to use to visit expressions.
-     */
-    export function flattenParameterDestructuring(
-        node: ParameterDeclaration,
-        value: Expression,
-        visitor?: (node: Node) => VisitResult<Node>,
-        transformRest?: boolean) {
-        const declarations: VariableDeclaration[] = [];
-
-        flattenDestructuringOld(node, value, node, emitAssignment, emitTempVariableAssignment, noop, emitRestAssignment, transformRest, visitor);
-
-        return declarations;
-
-        function emitAssignment(name: Identifier | BindingPattern, value: Expression, location: TextRange) {
-            const declaration = createVariableDeclaration(name, /*type*/ undefined, value, location);
-
-            // NOTE: this completely disables source maps, but aligns with the behavior of
-            //       `emitAssignment` in the old emitter.
-            setEmitFlags(declaration, EmitFlags.NoNestedSourceMaps);
-
-            aggregateTransformFlags(declaration);
-            declarations.push(declaration);
-        }
-
-        function emitTempVariableAssignment(value: Expression, location: TextRange) {
-            const name = createTempVariable(/*recordTempVariable*/ undefined);
-            emitAssignment(name, value, location);
-            return name;
-        }
-
-        function emitRestAssignment(elements: BindingElement[], value: Expression, location: TextRange) {
-            emitAssignment(createObjectBindingPattern(elements), value, location);
-        }
-    }
-
-    /**
-     * Flattens binding patterns in a variable declaration.
-     *
-     * @param node The VariableDeclaration to flatten.
-     * @param value An optional rhs value for the binding pattern.
-     * @param visitor An optional visitor to use to visit expressions.
-     */
-    export function flattenVariableDestructuring(
-        node: VariableDeclaration,
-        value?: Expression,
-        visitor?: (node: Node) => VisitResult<Node>,
-        recordTempVariable?: (node: Identifier) => void,
-        transformRest?: boolean) {
-        const declarations: VariableDeclaration[] = [];
-
-        let pendingAssignments: Expression[];
-        flattenDestructuringOld(node, value, node, emitAssignment, emitTempVariableAssignment, recordTempVariable, emitRestAssignment, transformRest, visitor);
-
-        return declarations;
-
-        function emitAssignment(name: Identifier | BindingPattern, value: Expression, location: TextRange, original: Node) {
-            if (pendingAssignments) {
-                pendingAssignments.push(value);
-                value = inlineExpressions(pendingAssignments);
-                pendingAssignments = undefined;
-            }
-
-            const declaration = createVariableDeclaration(name, /*type*/ undefined, value, location);
-            declaration.original = original;
-
-            // NOTE: this completely disables source maps, but aligns with the behavior of
-            //       `emitAssignment` in the old emitter.
-            setEmitFlags(declaration, EmitFlags.NoNestedSourceMaps);
-
-            declarations.push(declaration);
-            aggregateTransformFlags(declaration);
-        }
-
-        function emitTempVariableAssignment(value: Expression, location: TextRange) {
-            const name = createTempVariable(recordTempVariable);
-            if (recordTempVariable) {
-                const assignment = createAssignment(name, value, location);
-                if (pendingAssignments) {
-                    pendingAssignments.push(assignment);
-                }
-                else {
-                    pendingAssignments = [assignment];
-                }
-            }
-            else {
-                emitAssignment(name, value, location, /*original*/ undefined);
-            }
-            return name;
-        }
-
-        function emitRestAssignment(elements: BindingElement[], value: Expression, location: TextRange, original: Node) {
-            emitAssignment(createObjectBindingPattern(elements), value, location, original);
-        }
-    }
-
-    /**
-     * Flattens binding patterns in a variable declaration and transforms them into an expression.
-     *
-     * @param node The VariableDeclaration to flatten.
-     * @param recordTempVariable A callback used to record new temporary variables.
-     * @param createAssignmentCallback An optional callback used to create assignment expressions
-     * for non-temporary variables.
-     * @param visitor An optional visitor to use to visit expressions.
-     */
-    export function flattenVariableDestructuringToExpression(
-        node: VariableDeclaration,
-        recordTempVariable: (name: Identifier) => void,
-        createAssignmentCallback?: (name: Identifier, value: Expression, location?: TextRange) => Expression,
-        visitor?: (node: Node) => VisitResult<Node>) {
-
-        const pendingAssignments: Expression[] = [];
-
-        flattenDestructuringOld(node, /*value*/ undefined, node, emitAssignment, emitTempVariableAssignment, noop, emitRestAssignment, /*transformRest*/ false, visitor);
-
-        const expression = inlineExpressions(pendingAssignments);
-        aggregateTransformFlags(expression);
-        return expression;
-
-        function emitAssignment(name: Identifier | ObjectLiteralExpression, value: Expression, location: TextRange, original: Node) {
-            const expression = createAssignmentCallback
-                ? createAssignmentCallback(name.kind === SyntaxKind.Identifier ? name : emitTempVariableAssignment(name, location),
-                                           value,
-                                           location)
-                : createAssignment(name, value, location);
-
-            emitPendingAssignment(expression, original);
-        }
-
-        function emitTempVariableAssignment(value: Expression, location: TextRange) {
-            const name = createTempVariable(recordTempVariable);
-            emitPendingAssignment(createAssignment(name, value, location), /*original*/ undefined);
-            return name;
-        }
-
-        function emitRestAssignment(elements: ObjectLiteralElementLike[], value: Expression, location: TextRange, original: Node) {
-            emitAssignment(createObjectLiteral(elements), value, location, original);
-        }
-
-        function emitPendingAssignment(expression: Expression, original: Node) {
-            expression.original = original;
-
-            // NOTE: this completely disables source maps, but aligns with the behavior of
-            //       `emitAssignment` in the old emitter.
-            setEmitFlags(expression, EmitFlags.NoNestedSourceMaps);
-
-            pendingAssignments.push(expression);
-        }
-    }
-
-    function flattenDestructuringOld(
-        root: VariableDeclaration | ParameterDeclaration | BindingElement | BinaryExpression,
-        value: Expression,
-        location: TextRange,
-        emitAssignment: (name: Identifier, value: Expression, location: TextRange, original: Node) => void,
-        emitTempVariableAssignment: (value: Expression, location: TextRange) => Identifier,
-        recordTempVariable: (node: Identifier) => void,
-        emitRestAssignment: (elements: (ObjectLiteralElementLike[] | BindingElement[]), value: Expression, location: TextRange, original: Node) => void,
-        transformRest: boolean,
-        visitor?: (node: Node) => VisitResult<Node>) {
-        if (value && visitor) {
-            value = visitNode(value, visitor, isExpression);
-        }
-
-        if (isBinaryExpression(root)) {
-            emitDestructuringAssignment(root.left, value, location);
-        }
-        else {
-            emitBindingElement(root, value);
-        }
-
-        function emitDestructuringAssignment(bindingTarget: Expression | ShorthandPropertyAssignment, value: Expression, location: TextRange) {
-            // When emitting target = value use source map node to highlight, including any temporary assignments needed for this
-            let target: Expression;
-            if (isShorthandPropertyAssignment(bindingTarget)) {
-                const initializer = visitor
-                    ? visitNode(bindingTarget.objectAssignmentInitializer, visitor, isExpression)
-                    : bindingTarget.objectAssignmentInitializer;
-
-                if (initializer) {
-                    value = createDefaultValueCheck(value, initializer, location);
-                }
-
-                target = bindingTarget.name;
-            }
-            else if (isBinaryExpression(bindingTarget) && bindingTarget.operatorToken.kind === SyntaxKind.EqualsToken) {
-                const initializer = visitor
-                    ? visitNode(bindingTarget.right, visitor, isExpression)
-                    : bindingTarget.right;
-
-                value = createDefaultValueCheck(value, initializer, location);
-                target = bindingTarget.left;
-            }
-            else {
-                target = bindingTarget;
-            }
-
-            if (target.kind === SyntaxKind.ObjectLiteralExpression) {
-                emitObjectLiteralAssignment(<ObjectLiteralExpression>target, value, location);
-            }
-            else if (target.kind === SyntaxKind.ArrayLiteralExpression) {
-                emitArrayLiteralAssignment(<ArrayLiteralExpression>target, value, location);
-            }
-            else {
-                const name = getMutableClone(<Identifier>target);
-                setSourceMapRange(name, target);
-                setCommentRange(name, target);
-                emitAssignment(name, value, location, /*original*/ undefined);
-            }
-        }
-
-        function emitObjectLiteralAssignment(target: ObjectLiteralExpression, value: Expression, location: TextRange) {
-            const properties = target.properties;
-            if (properties.length !== 1) {
-                // For anything but a single element destructuring we need to generate a temporary
-                // to ensure value is evaluated exactly once.
-                // When doing so we want to hightlight the passed in source map node since thats the one needing this temp assignment
-                value = ensureIdentifierOld(value, /*reuseIdentifierExpressions*/ true, location, emitTempVariableAssignment);
-            }
-
-            let bindingElements: ObjectLiteralElementLike[] = [];
-            for (let i = 0; i < properties.length; i++) {
-                const p = properties[i];
-                if (p.kind === SyntaxKind.PropertyAssignment || p.kind === SyntaxKind.ShorthandPropertyAssignment) {
-                    if (!transformRest ||
-                        p.transformFlags & TransformFlags.ContainsSpreadExpression ||
-                        (p.kind === SyntaxKind.PropertyAssignment && p.initializer.transformFlags & TransformFlags.ContainsSpreadExpression)) {
-                        if (bindingElements.length) {
-                            emitRestAssignment(bindingElements, value, location, target);
-                            bindingElements = [];
-                        }
-                        const propName = <Identifier | LiteralExpression>(<PropertyAssignment>p).name;
-                        const bindingTarget = p.kind === SyntaxKind.ShorthandPropertyAssignment ? <ShorthandPropertyAssignment>p : (<PropertyAssignment>p).initializer || propName;
-                        // Assignment for bindingTarget = value.propName should highlight whole property, hence use p as source map node
-                        emitDestructuringAssignment(bindingTarget, createDestructuringPropertyAccess(value, propName), p);
-                    }
-                    else {
-                        bindingElements.push(p);
-                    }
-                }
-                else if (i === properties.length - 1 && p.kind === SyntaxKind.SpreadAssignment) {
-                    Debug.assert((p as SpreadAssignment).expression.kind === SyntaxKind.Identifier);
-                    if (bindingElements.length) {
-                        emitRestAssignment(bindingElements, value, location, target);
-                        bindingElements = [];
-                    }
-                    const propName = (p as SpreadAssignment).expression as Identifier;
-                    const restCall = createRestCall(value, target.properties, p => p.name, target);
-                    emitDestructuringAssignment(propName, restCall, p);
-                }
-            }
-            if (bindingElements.length) {
-                emitRestAssignment(bindingElements, value, location, target);
-                bindingElements = [];
-            }
-        }
-
-        function emitArrayLiteralAssignment(target: ArrayLiteralExpression, value: Expression, location: TextRange) {
-            if (transformRest) {
-                emitESNextArrayLiteralAssignment(target, value, location);
-            }
-            else {
-                emitES2015ArrayLiteralAssignment(target, value, location);
-            }
-        }
-
-        function emitESNextArrayLiteralAssignment(target: ArrayLiteralExpression, value: Expression, location: TextRange) {
-            const elements = target.elements;
-            const numElements = elements.length;
-            if (numElements !== 1) {
-                // For anything but a single element destructuring we need to generate a temporary
-                // to ensure value is evaluated exactly once.
-                // When doing so we want to highlight the passed-in source map node since thats the one needing this temp assignment
-                value = ensureIdentifierOld(value, /*reuseIdentifierExpressions*/ true, location, emitTempVariableAssignment);
-            }
-
-            const expressions: Expression[] = [];
-            const spreadContainingExpressions: [Expression, Identifier][] = [];
-            for (let i = 0; i < numElements; i++) {
-                const e = elements[i];
-                if (e.kind === SyntaxKind.OmittedExpression) {
-                    continue;
-                }
-                if (e.transformFlags & TransformFlags.ContainsSpreadExpression && i < numElements - 1) {
-                    const tmp = createTempVariable(recordTempVariable);
-                    spreadContainingExpressions.push([e, tmp]);
-                    expressions.push(tmp);
-                }
-                else {
-                    expressions.push(e);
-                }
-            }
-            emitAssignment(updateArrayLiteral(target, expressions) as any as Identifier, value, undefined, undefined);
-            for (const [e, tmp] of spreadContainingExpressions) {
-                emitDestructuringAssignment(e, tmp, e);
-            }
-        }
-
-        function emitES2015ArrayLiteralAssignment(target: ArrayLiteralExpression, value: Expression, location: TextRange) {
-            const elements = target.elements;
-            const numElements = elements.length;
-            if (numElements !== 1) {
-                // For anything but a single element destructuring we need to generate a temporary
-                // to ensure value is evaluated exactly once.
-                // When doing so we want to highlight the passed-in source map node since thats the one needing this temp assignment
-                value = ensureIdentifierOld(value, /*reuseIdentifierExpressions*/ true, location, emitTempVariableAssignment);
-            }
-
-            for (let i = 0; i < numElements; i++) {
-                const e = elements[i];
-                if (e.kind !== SyntaxKind.OmittedExpression) {
-                    // Assignment for target = value.propName should highligh whole property, hence use e as source map node
-                    if (e.kind !== SyntaxKind.SpreadElement) {
-                        emitDestructuringAssignment(e, createElementAccess(value, createLiteral(i)), e);
-                    }
-                    else if (i === numElements - 1) {
-                        emitDestructuringAssignment((<SpreadElement>e).expression, createArraySlice(value, i), e);
-                    }
-                }
-            }
-        }
-
-        /** Given value: o, propName: p, pattern: { a, b, ...p } from the original statement
-         * `{ a, b, ...p } = o`, create `p = __rest(o, ["a", "b"]);`*/
-        function createRestCall<T extends Node>(value: Expression, elements: T[], getPropertyName: (element: T) => PropertyName, location: TextRange): Expression {
-            const propertyNames: LiteralExpression[] = [];
-            for (let i = 0; i < elements.length - 1; i++) {
-                if (isOmittedExpression(elements[i])) {
-                    continue;
-                }
-                const str = <StringLiteral>createSynthesizedNode(SyntaxKind.StringLiteral);
-                str.pos = location.pos;
-                str.end = location.end;
-                str.text = getTextOfPropertyName(getPropertyName(elements[i]));
-                propertyNames.push(str);
-            }
-            const args = createSynthesizedNodeArray([value, createArrayLiteral(propertyNames, location)]);
-            return createCall(createIdentifier("__rest"), undefined, args);
-        }
-
-        function emitBindingElement(target: VariableDeclaration | ParameterDeclaration | BindingElement, value: Expression) {
-            // Any temporary assignments needed to emit target = value should point to target
-            const initializer = visitor ? visitNode(target.initializer, visitor, isExpression) : target.initializer;
-            if (transformRest) {
-                value = value || initializer;
-            }
-            else if (initializer) {
-                // Combine value and initializer
-                value = value ? createDefaultValueCheck(value, initializer, target) : initializer;
-            }
-            else if (!value) {
-                // Use 'void 0' in absence of value and initializer
-                value = createVoidZero();
-            }
-
-            const name = target.name;
-            if (!isBindingPattern(name)) {
-                emitAssignment(name, value, target, target);
-            }
-            else {
-                const numElements = name.elements.length;
-                if (numElements !== 1) {
-                    // For anything other than a single-element destructuring we need to generate a temporary
-                    // to ensure value is evaluated exactly once. Additionally, if we have zero elements
-                    // we need to emit *something* to ensure that in case a 'var' keyword was already emitted,
-                    // so in that case, we'll intentionally create that temporary.
-                    value = ensureIdentifierOld(value, /*reuseIdentifierExpressions*/ numElements !== 0, target, emitTempVariableAssignment);
-                }
-                if (name.kind === SyntaxKind.ArrayBindingPattern) {
-                    emitArrayBindingElement(name as ArrayBindingPattern, value);
-                }
-                else {
-                    emitObjectBindingElement(target, value);
-                }
-            }
-        }
-
-        function emitArrayBindingElement(name: ArrayBindingPattern, value: Expression) {
-            if (transformRest) {
-                emitESNextArrayBindingElement(name, value);
-            }
-            else {
-                emitES2015ArrayBindingElement(name, value);
-            }
-        }
-
-        function emitES2015ArrayBindingElement(name: ArrayBindingPattern, value: Expression) {
-            const elements = name.elements;
-            const numElements = elements.length;
-            for (let i = 0; i < numElements; i++) {
-                const element = elements[i];
-                if (isOmittedExpression(element)) {
-                    continue;
-                }
-                if (!element.dotDotDotToken) {
-                    // Rewrite element to a declaration that accesses array element at index i
-                    emitBindingElement(element, createElementAccess(value, i));
-                }
-                else if (i === numElements - 1) {
-                    emitBindingElement(element, createArraySlice(value, i));
-                }
-            }
-        }
-
-        function emitESNextArrayBindingElement(name: ArrayBindingPattern, value: Expression) {
-            const elements = name.elements;
-            const numElements = elements.length;
-            const bindingElements: BindingElement[] = [];
-            const spreadContainingElements: BindingElement[] = [];
-            for (let i = 0; i < numElements; i++) {
-                const element = elements[i];
-                if (isOmittedExpression(element)) {
-                    continue;
-                }
-                if (element.transformFlags & TransformFlags.ContainsSpreadExpression && i < numElements - 1) {
-                    spreadContainingElements.push(element);
-                    bindingElements.push(createBindingElement(undefined, undefined, getGeneratedNameForNode(element), undefined, value));
-                }
-                else {
-                    bindingElements.push(element);
-                }
-            }
-            emitAssignment(updateArrayBindingPattern(name, bindingElements) as any as Identifier, value, undefined, undefined);
-            for (const element of spreadContainingElements) {
-                emitBindingElement(element, getGeneratedNameForNode(element));
-            }
-        }
-
-        function emitObjectBindingElement(target: VariableDeclaration | ParameterDeclaration | BindingElement, value: Expression) {
-            const name = target.name as BindingPattern;
-            const elements = name.elements;
-            const numElements = elements.length;
-            let bindingElements: BindingElement[] = [];
-            for (let i = 0; i < numElements; i++) {
-                const element = elements[i];
-                if (isOmittedExpression(element)) {
-                    continue;
-                }
-                if (i === numElements - 1 && element.dotDotDotToken) {
-                    if (bindingElements.length) {
-                        emitRestAssignment(bindingElements, value, target, target);
-                        bindingElements = [];
-                    }
-                    const restCall = createRestCall(value,
-                                                    name.elements,
-                                                    element => (element as BindingElement).propertyName || <Identifier>(element as BindingElement).name,
-                                                    name);
-                    emitBindingElement(element, restCall);
-                }
-                else if (transformRest && !(element.transformFlags & TransformFlags.ContainsSpreadExpression)) {
-                    // do not emit until we have a complete bundle of ES2015 syntax
-                    bindingElements.push(element);
-                }
-                else {
-                    if (bindingElements.length) {
-                        emitRestAssignment(bindingElements, value, target, target);
-                        bindingElements = [];
-                    }
-                    // Rewrite element to a declaration with an initializer that fetches property
-                    const propName = element.propertyName || <Identifier>element.name;
-                    emitBindingElement(element, createDestructuringPropertyAccess(value, propName));
-                }
-            }
-            if (bindingElements.length) {
-                emitRestAssignment(bindingElements, value, target, target);
-                bindingElements = [];
-            }
-        }
-
-        function createDefaultValueCheck(value: Expression, defaultValue: Expression, location: TextRange): Expression {
-            value = ensureIdentifierOld(value, /*reuseIdentifierExpressions*/ true, location, emitTempVariableAssignment);
-            return createConditional(
-                createStrictEquality(value, createVoidZero()),
-                createToken(SyntaxKind.QuestionToken),
-                defaultValue,
-                createToken(SyntaxKind.ColonToken),
-                value
-            );
-        }
-
-        /**
-         * Creates either a PropertyAccessExpression or an ElementAccessExpression for the
-         * right-hand side of a transformed destructuring assignment.
-         *
-         * @param expression The right-hand expression that is the source of the property.
-         * @param propertyName The destructuring property name.
-         */
-        function createDestructuringPropertyAccess(expression: Expression, propertyName: PropertyName): LeftHandSideExpression {
-            if (isComputedPropertyName(propertyName)) {
-                return createElementAccess(
-                    expression,
-                    ensureIdentifierOld(propertyName.expression, /*reuseIdentifierExpressions*/ false, /*location*/ propertyName, emitTempVariableAssignment)
-                );
-            }
-            else if (isLiteralExpression(propertyName)) {
-                const clone = getSynthesizedClone(propertyName);
-                clone.text = unescapeIdentifier(clone.text);
-                return createElementAccess(expression, clone);
-            }
-            else {
-                if (isGeneratedIdentifier(propertyName)) {
-                    const clone = getSynthesizedClone(propertyName);
-                    clone.text = unescapeIdentifier(clone.text);
-                    return createPropertyAccess(expression, clone);
-                }
-                else {
-                    return createPropertyAccess(expression, createIdentifier(unescapeIdentifier(propertyName.text)));
-                }
-            }
-        }
-    }
-
-    /**
-     * Ensures that there exists a declared identifier whose value holds the given expression.
-     * This function is useful to ensure that the expression's value can be read from in subsequent expressions.
-     * Unless 'reuseIdentifierExpressions' is false, 'value' will be returned if it is just an identifier.
-     *
-     * @param value the expression whose value needs to be bound.
-     * @param reuseIdentifierExpressions true if identifier expressions can simply be returned;
-     *                                   false if it is necessary to always emit an identifier.
-     * @param location The location to use for source maps and comments.
-     * @param emitTempVariableAssignment A callback used to emit a temporary variable.
-     * @param visitor An optional callback used to visit the value.
-     */
-    function ensureIdentifierOld(
-        value: Expression,
-        reuseIdentifierExpressions: boolean,
-        location: TextRange,
-        emitTempVariableAssignment: (value: Expression, location: TextRange) => Identifier,
-        visitor?: (node: Node) => VisitResult<Node>) {
-
-        if (isIdentifier(value) && reuseIdentifierExpressions) {
-            return value;
-        }
-        else {
-            if (visitor) {
-                value = visitNode(value, visitor, isExpression);
-            }
-
-            return emitTempVariableAssignment(value, location);
-        }
-    }
+    type EffectiveBindingOrAssignmentElement = VariableDeclaration | ParameterDeclaration | BindingElement | ObjectLiteralElementLike | Expression;
+    type EffectiveObjectBindingOrAssignmentPattern = ObjectBindingPattern | ObjectLiteralExpression;
+    type EffectiveArrayBindingOrAssignmentPattern = ArrayBindingPattern | ArrayLiteralExpression;
+    type EffectiveBindingOrAssignmentPattern = EffectiveObjectBindingOrAssignmentPattern | EffectiveArrayBindingOrAssignmentPattern;
+    type EffectiveBindingOrAssignmentTarget = EffectiveBindingOrAssignmentPattern | Expression;
+    type EffectiveBindingOrAssignmentRestIndicator = DotDotDotToken | SpreadElement | SpreadAssignment;
 
     interface FlattenHost {
         context: TransformationContext;
         level: FlattenLevel;
         recordTempVariablesInLine: boolean;
-        emitAssignment: (target: EffectiveBindingTarget, value: Expression, location: TextRange, original: Node) => void;
-        emitArrayAssignment: (elements: EffectiveBindingElement[], value: Expression, location: TextRange, original: Node) => void;
-        emitObjectAssignment: (elements: EffectiveBindingElement[], value: Expression, location: TextRange, original: Node) => void;
         emitExpression: (value: Expression) => void;
+        emitBindingOrAssignment: (target: EffectiveBindingOrAssignmentTarget, value: Expression, location: TextRange, original: Node) => void;
+        createArrayBindingOrAssignmentPattern: (elements: EffectiveBindingOrAssignmentElement[]) => EffectiveArrayBindingOrAssignmentPattern;
+        createObjectBindingOrAssignmentPattern: (elements: EffectiveBindingOrAssignmentElement[]) => EffectiveObjectBindingOrAssignmentPattern;
+        createArrayBindingOrAssignmentElement: (node: Identifier) => EffectiveBindingOrAssignmentElement;
+        visitor?: (node: Node) => VisitResult<Node>;
     }
 
+    export const enum FlattenLevel {
+        ObjectRest,
+        All,
+    }
+
+    export const enum FlattenOutput {
+        Expression,
+        Declarations
+    }
+
+    export const enum FlattenOptions {
+        NeedsValue = 1 << 0,
+        SkipInitializer = 1 << 1,
+        RecordTempVariablesInLine = 1 << 2,
+    }
+
+    export function flattenDestructuring(
+        output: FlattenOutput.Expression,
+        level: FlattenLevel,
+        node: VariableDeclaration | DestructuringAssignment,
+        visitor: (node: Node) => VisitResult<Node>,
+        context: TransformationContext,
+        options: FlattenOptions,
+        createAssignment?: (name: Identifier, value: Expression, location?: TextRange) => Expression): Expression;
+    export function flattenDestructuring(
+        output: FlattenOutput.Declarations,
+        level: FlattenLevel,
+        node: VariableDeclaration | ParameterDeclaration,
+        visitor: (node: Node) => VisitResult<Node>,
+        context: TransformationContext,
+        options: FlattenOptions,
+        boundValue?: Expression): VariableDeclaration[];
+    export function flattenDestructuring(
+        _output: FlattenOutput,
+        _level: FlattenLevel,
+        _node: VariableDeclaration | ParameterDeclaration | DestructuringAssignment,
+        _visitor: (node: Node) => VisitResult<Node>,
+        _context: TransformationContext,
+        _options: FlattenOptions,
+        _valueOrCallback?: Expression | ((name: Identifier, value: Expression, location?: TextRange) => Expression)): Expression | VariableDeclaration[] {
+    //     const flattenMode = flags & FlattenFlags.FlattenMask;
+    //     const outputMode = flags & FlattenFlags.OutputMask;
+    //     const options = flags & FlattenFlags.OptionsMask;
+
+
+    //     if (outputMode === FlattenFlags.OutputExpressions) {
+    //         return flattenDestructuringToExpression(context, <VariableDeclaration | DestructuringAssignment>node, !(options & FlattenFlags.NeedsValue), flattenMode, createAssignmentCallback, visitor);
+    //     }
+    //     else {
+    //         return flattenDestructuringToDeclarations(
+    //             context,
+    //             <VariableDeclaration | ParameterDeclaration>node,
+    //             boundValue)
+    //     }
+        return;
+    }
+
+    /**
+     * Flattens a DestructuringAssignment or a VariableDeclaration to an expression.
+     *
+     * @param context The transformation context
+     * @param node The node to flatten.
+     * @param needsValue Indicates whether the value from the right-hand-side of the
+     * destructuring assignment is needed as part of a larger expression.
+     * @param level Indicates the extent to which flattening should occur.
+     * @param createAssignmentCallback A callback used to create the assignment expression.
+     * @param visitor A visitor used to visit initializers.
+     */
+    export function flattenDestructuringToExpression(
+        context: TransformationContext,
+        node: VariableDeclaration | DestructuringAssignment,
+        needsValue: boolean,
+        level: FlattenLevel,
+        createAssignmentCallback: (name: Identifier, value: Expression, location?: TextRange) => Expression,
+        visitor: (node: Node) => VisitResult<Node>): Expression {
+
+        let location: TextRange = node;
+        let value: Expression;
+        if (isDestructuringAssignment(node)) {
+            value = node.right;
+            while (isEmptyObjectLiteralOrArrayLiteral(node.left)) {
+                if (isDestructuringAssignment(value)) {
+                    location = node = value;
+                    value = node.right;
+                }
+                else {
+                    return value;
+                }
+            }
+        }
+
+        const expressions: Expression[] = [];
+        const host: FlattenHost = {
+            context,
+            level,
+            recordTempVariablesInLine: false,
+            emitExpression,
+            emitBindingOrAssignment,
+            createArrayBindingOrAssignmentPattern: createEffectiveArrayAssignmentPattern,
+            createObjectBindingOrAssignmentPattern: createEffectiveObjectAssignmentPattern,
+            createArrayBindingOrAssignmentElement: createEffectiveAssignmentElement,
+            visitor
+        };
+
+        if (value) {
+            value = visitNode(value, visitor, isExpression);
+            if (needsValue) {
+                // If the right-hand value of the destructuring assignment needs to be preserved (as
+                // is the case when the destructuring assignment is part of a larger expression),
+                // then we need to cache the right-hand value.
+                //
+                // The source map location for the assignment should point to the entire binary
+                // expression.
+                value = ensureIdentifier(host, value, /*reuseIdentifierExpressions*/ true, location);
+            }
+            else if (nodeIsSynthesized(node)) {
+                // Generally, the source map location for a destructuring assignment is the root
+                // expression.
+                //
+                // However, if the root expression is synthesized (as in the case
+                // of the initializer when transforming a ForOfStatement), then the source map
+                // location should point to the right-hand value of the expression.
+                location = value;
+            }
+        }
+
+        flattenEffectiveBindingElement(host, node, value, location, /*skipInitializer*/ isDestructuringAssignment(node));
+
+        if (value && needsValue) {
+            expressions.push(value);
+        }
+
+        return aggregateTransformFlags(inlineExpressions(expressions));
+
+        function emitExpression(expression: Expression) {
+            // NOTE: this completely disables source maps, but aligns with the behavior of
+            //       `emitAssignment` in the old emitter.
+            setEmitFlags(expression, EmitFlags.NoNestedSourceMaps);
+            aggregateTransformFlags(expression);
+            expressions.push(expression);
+        }
+
+        function emitBindingOrAssignment(target: EffectiveBindingOrAssignmentTarget, value: Expression, location: TextRange, original: Node) {
+            Debug.assertNode(target, createAssignmentCallback ? isIdentifier : isExpression);
+            const expression = createAssignmentCallback
+                ? createAssignmentCallback(<Identifier>target, value, location)
+                : createAssignment(visitNode(<Expression>target, visitor, isExpression), value, location);
+            expression.original = original;
+            emitExpression(expression);
+        }
+    }
+
+    /**
+     * Flattens a VariableDeclaration or ParameterDeclaration to one or more variable declarations.
+     *
+     * @param context The transformation context
+     * @param node The node to flatten.
+     * @param boundValue The value bound to the declaration.
+     * @param recordTempVariablesInLine Indicates whether temporary variables should be recored in-line.
+     * @param level Indicates the extent to which flattening should occur.
+     */
     export function flattenDestructuringToDeclarations(
         context: TransformationContext,
         node: VariableDeclaration | ParameterDeclaration,
         boundValue: Expression | undefined,
+        skipInitializer: boolean,
         recordTempVariablesInLine: boolean,
-        level: FlattenLevel): VisitResult<VariableDeclaration> {
+        level: FlattenLevel,
+        visitor: (node: Node) => VisitResult<Node>): VariableDeclaration[] {
 
-        const pendingDeclarations: { pendingExpressions?: Expression[], name: BindingName, value: Expression, location?: TextRange, original?: Node; }[] = [];
         let pendingExpressions: Expression[];
-        let declaration: VariableDeclaration;
-        let declarations: VariableDeclaration[];
+        const pendingDeclarations: { pendingExpressions?: Expression[], name: BindingName, value: Expression, location?: TextRange, original?: Node; }[] = [];
+        const declarations: VariableDeclaration[] = [];
         const host: FlattenHost = {
             context,
             level,
             recordTempVariablesInLine,
             emitExpression,
-            emitAssignment,
-            emitArrayAssignment,
-            emitObjectAssignment
+            emitBindingOrAssignment,
+            createArrayBindingOrAssignmentPattern: createEffectiveArrayBindingPattern,
+            createObjectBindingOrAssignmentPattern: createEffectiveObjectBindingPattern,
+            createArrayBindingOrAssignmentElement: createEffectiveBindingElement,
+            visitor
         };
 
-        flattenEffectiveBindingElement(host, node, boundValue, node);
+        flattenEffectiveBindingElement(host, node, boundValue, node, skipInitializer);
 
         if (pendingExpressions) {
             const temp = createTempVariable(/*recordTempVariable*/ undefined);
             if (recordTempVariablesInLine) {
                 const value = inlineExpressions(pendingExpressions);
                 pendingExpressions = undefined;
-                emitAssignment(temp, value, /*location*/ undefined, /*original*/ undefined);
+                emitBindingOrAssignment(temp, value, /*location*/ undefined, /*original*/ undefined);
             }
             else {
                 context.hoistVariableDeclaration(temp);
@@ -706,51 +239,33 @@ namespace ts {
                 setEmitFlags(variable, EmitFlags.NoNestedSourceMaps);
             }
             aggregateTransformFlags(variable);
-            if (!declaration) {
-                declaration = variable;
-            }
-            else if (!declarations) {
-                declarations = [declaration, variable];
-            }
-            else {
-                declarations.push(variable);
-            }
+            declarations.push(variable);
         }
 
-        return declarations || declaration;
+        return declarations;
 
         function emitExpression(value: Expression) {
             pendingExpressions = append(pendingExpressions, value);
         }
 
-        function emitAssignment(target: EffectiveBindingTarget, value: Expression, location: TextRange, original: Node) {
+        function emitBindingOrAssignment(target: EffectiveBindingOrAssignmentTarget, value: Expression, location: TextRange, original: Node) {
             Debug.assertNode(target, isBindingName);
-            pendingDeclarations.push({ pendingExpressions, name: <BindingName>target, value, location, original });
             if (pendingExpressions) {
                 value = inlineExpressions(append(pendingExpressions, value));
                 pendingExpressions = undefined;
             }
-        }
-
-        function emitArrayAssignment(elements: EffectiveBindingElement[], value: Expression, location: TextRange, original: Node) {
-            Debug.assertEachNode(elements, isArrayBindingElement);
-            emitAssignment(createArrayBindingPattern(<ArrayBindingElement[]>elements), value, location, original);
-        }
-
-        function emitObjectAssignment(elements: EffectiveBindingElement[], value: Expression, location: TextRange, original: Node) {
-            Debug.assertEachNode(elements, isBindingElement);
-            emitAssignment(createObjectBindingPattern(<BindingElement[]>elements), value, location, original);
+            pendingDeclarations.push({ pendingExpressions, name: <BindingName>target, value, location, original });
         }
     }
 
     function flattenEffectiveBindingElement(
         host: FlattenHost,
-        bindingElement: EffectiveBindingElement,
+        bindingElement: EffectiveBindingOrAssignmentElement,
         boundValue: Expression | undefined,
         location: TextRange,
         skipInitializer?: boolean) {
         if (!skipInitializer) {
-            const initializer = getInitializerOfEffectiveBindingElement(bindingElement);
+            const initializer = visitNode(getInitializerOfEffectiveBindingElement(bindingElement), host.visitor, isExpression);
             if (initializer) {
                 // Combine value and initializer
                 boundValue = boundValue ? createDefaultValueCheck(host, boundValue, initializer, location) : initializer;
@@ -762,7 +277,7 @@ namespace ts {
         }
         const bindingTarget = getTargetOfEffectiveBindingElement(bindingElement);
         if (!isEffectiveBindingPattern(bindingTarget)) {
-            host.emitAssignment(bindingTarget, boundValue, location, /*original*/ bindingElement);
+            host.emitBindingOrAssignment(bindingTarget, boundValue, location, /*original*/ bindingElement);
         }
         else {
             const elements = getElementsOfEffectiveBindingPattern(bindingTarget);
@@ -784,18 +299,20 @@ namespace ts {
         }
     }
 
-    function flattenEffectiveObjectBindingElements(host: FlattenHost, bindingTarget: EffectiveObjectBindingPattern, elements: EffectiveBindingElement[], boundValue: Expression, location: TextRange) {
-        let bindingElements: EffectiveBindingElement[];
+    function flattenEffectiveObjectBindingElements(host: FlattenHost, bindingTarget: EffectiveObjectBindingOrAssignmentPattern, elements: EffectiveBindingOrAssignmentElement[], boundValue: Expression, location: TextRange) {
+        let bindingElements: EffectiveBindingOrAssignmentElement[];
         const numElements = elements.length;
         for (let i = 0; i < numElements; i++) {
             const element = elements[i];
             if (!getEffectiveRestIndicator(element)) {
-                if (host.level >= FlattenLevel.ObjectRestDestructuringOnly && !(element.transformFlags & TransformFlags.ContainsSpreadExpression)) {
+                if (host.level <= FlattenLevel.ObjectRest
+                    && !(element.transformFlags & (TransformFlags.ContainsRest | TransformFlags.ContainsObjectRest))
+                    && !(getTargetOfEffectiveBindingElement(element).transformFlags & (TransformFlags.ContainsRest | TransformFlags.ContainsObjectRest))) {
                     bindingElements = append(bindingElements, element);
                 }
                 else {
                     if (bindingElements) {
-                        host.emitObjectAssignment(bindingElements, boundValue, location, bindingTarget);
+                        host.emitBindingOrAssignment(host.createObjectBindingOrAssignmentPattern(bindingElements), boundValue, location, bindingTarget);
                         bindingElements = undefined;
                     }
                     const propertyName = getEffectivePropertyNameOfEffectiveBindingElement(element);
@@ -805,7 +322,7 @@ namespace ts {
             }
             else if (i === numElements - 1) {
                 if (bindingElements) {
-                    host.emitObjectAssignment(bindingElements, boundValue, location, bindingTarget);
+                    host.emitBindingOrAssignment(host.createObjectBindingOrAssignmentPattern(bindingElements), boundValue, location, bindingTarget);
                     bindingElements = undefined;
                 }
                 const value = createRestCall(boundValue, elements, bindingTarget);
@@ -813,31 +330,29 @@ namespace ts {
             }
         }
         if (bindingElements) {
-            host.emitObjectAssignment(bindingElements, boundValue, location, bindingTarget);
+            host.emitBindingOrAssignment(host.createObjectBindingOrAssignmentPattern(bindingElements), boundValue, location, bindingTarget);
         }
     }
 
-    function flattenEffectiveArrayBindingElements(host: FlattenHost, bindingTarget: EffectiveArrayBindingPattern, elements: EffectiveBindingElement[], boundValue: Expression, location: TextRange) {
-        let bindingElements: EffectiveBindingElement[];
-        let spreadContainingElements: EffectiveBindingElement[];
-        let tempNames: Map<Identifier>;
+    function flattenEffectiveArrayBindingElements(host: FlattenHost, bindingTarget: EffectiveArrayBindingOrAssignmentPattern, elements: EffectiveBindingOrAssignmentElement[], boundValue: Expression, location: TextRange) {
+        let bindingElements: EffectiveBindingOrAssignmentElement[];
+        let spreadContainingElements: [Identifier, EffectiveBindingOrAssignmentElement][];
         const numElements = elements.length;
         for (let i = 0; i < numElements; i++) {
             const element = elements[i];
-            if (isOmittedExpression(element)) {
-                continue;
-            }
-            else if (host.level >= FlattenLevel.ObjectRestDestructuringOnly) {
-                if (element.transformFlags & TransformFlags.ContainsSpreadExpression) {
+            if (host.level <= FlattenLevel.ObjectRest) {
+                if (element.transformFlags & (TransformFlags.ContainsRest | TransformFlags.ContainsObjectRest) && i < numElements - 1) {
                     const temp = createTempVariable(/*recordTempVariable*/ undefined);
-                    tempNames = appendProperty(tempNames, getNodeId(element), temp);
-                    spreadContainingElements = append(spreadContainingElements, element);
-                    bindingElements = append(bindingElements, temp);
+                    spreadContainingElements = append(spreadContainingElements, <[Identifier, EffectiveBindingOrAssignmentElement]>[temp, element]);
+                    bindingElements = append(bindingElements, host.createArrayBindingOrAssignmentElement(temp));
                 }
                 else {
                     bindingElements = append(bindingElements, element);
                 }
             }
+            else if (isOmittedExpression(element)) {
+                continue;
+            }
             else if (!getEffectiveRestIndicator(element)) {
                 const value = createElementAccess(boundValue, i);
                 flattenEffectiveBindingElement(host, element, value, /*location*/ element);
@@ -848,11 +363,11 @@ namespace ts {
             }
         }
         if (bindingElements) {
-            host.emitArrayAssignment(bindingElements, boundValue, location, bindingTarget);
+            host.emitBindingOrAssignment(host.createArrayBindingOrAssignmentPattern(bindingElements), boundValue, location, bindingTarget);
         }
         if (spreadContainingElements) {
-            for (const element of spreadContainingElements) {
-                flattenEffectiveBindingElement(host, element, tempNames[getNodeId(element)], element);
+            for (const [id, element] of spreadContainingElements) {
+                flattenEffectiveBindingElement(host, element, id, element);
             }
         }
     }
@@ -923,7 +438,7 @@ namespace ts {
         else {
             const temp = createTempVariable(/*recordTempVariable*/ undefined);
             if (host.recordTempVariablesInLine) {
-                host.emitAssignment(temp, value, location, /*original*/ undefined);
+                host.emitBindingOrAssignment(temp, value, location, /*original*/ undefined);
             }
             else {
                 host.context.hoistVariableDeclaration(temp);
@@ -936,7 +451,7 @@ namespace ts {
     /**
      * Determines whether the EffectiveBindingElement is a declaration
      */
-    function isDeclarationBindingElement(bindingElement: EffectiveBindingElement): bindingElement is VariableDeclaration | ParameterDeclaration | BindingElement {
+    function isDeclarationBindingElement(bindingElement: EffectiveBindingOrAssignmentElement): bindingElement is VariableDeclaration | ParameterDeclaration | BindingElement {
         switch (bindingElement.kind) {
             case SyntaxKind.VariableDeclaration:
             case SyntaxKind.Parameter:
@@ -950,7 +465,7 @@ namespace ts {
     /**
      * Gets the initializer of an EffectiveBindingElement.
      */
-    function getInitializerOfEffectiveBindingElement(bindingElement: EffectiveBindingElement): Expression | undefined {
+    function getInitializerOfEffectiveBindingElement(bindingElement: EffectiveBindingOrAssignmentElement): Expression | undefined {
         if (isDeclarationBindingElement(bindingElement)) {
             // `1` in `let { a = 1 } = ...`
             // `1` in `let { a: b = 1 } = ...`
@@ -992,7 +507,7 @@ namespace ts {
     /**
      * Gets the name of an EffectiveBindingElement.
      */
-    function getTargetOfEffectiveBindingElement(bindingElement: EffectiveBindingElement): EffectiveBindingTarget {
+    function getTargetOfEffectiveBindingElement(bindingElement: EffectiveBindingOrAssignmentElement): EffectiveBindingOrAssignmentTarget {
         if (isDeclarationBindingElement(bindingElement)) {
             // `a` in `let { a } = ...`
             // `a` in `let { a = 1 } = ...`
@@ -1067,7 +582,7 @@ namespace ts {
     /**
      * Determines whether an EffectiveBindingElement is a rest element.
      */
-    function getEffectiveRestIndicator(bindingElement: EffectiveBindingElement): EffectiveRestIndicator {
+    function getEffectiveRestIndicator(bindingElement: EffectiveBindingOrAssignmentElement): EffectiveBindingOrAssignmentRestIndicator {
         switch (bindingElement.kind) {
             case SyntaxKind.Parameter:
             case SyntaxKind.BindingElement:
@@ -1086,7 +601,7 @@ namespace ts {
     /**
      * Gets the property name of a BindingElement-like element
      */
-    function getEffectivePropertyNameOfEffectiveBindingElement(bindingElement: EffectiveBindingElement) {
+    function getEffectivePropertyNameOfEffectiveBindingElement(bindingElement: EffectiveBindingOrAssignmentElement) {
         switch (bindingElement.kind) {
             case SyntaxKind.BindingElement:
                 // `a` in `let { a: b } = ...`
@@ -1126,7 +641,7 @@ namespace ts {
     /**
      * Determines whether a node is BindingPattern-like
      */
-    function isEffectiveBindingPattern(node: EffectiveBindingTarget): node is EffectiveBindingPattern {
+    function isEffectiveBindingPattern(node: EffectiveBindingOrAssignmentTarget): node is EffectiveBindingOrAssignmentPattern {
         return isEffectiveObjectBindingPattern(node)
             || isEffectiveArrayBindingPattern(node);
     }
@@ -1134,7 +649,7 @@ namespace ts {
     /**
      * Determines whether a node is ObjectBindingPattern-like
      */
-    function isEffectiveObjectBindingPattern(node: EffectiveBindingTarget): node is EffectiveObjectBindingPattern {
+    function isEffectiveObjectBindingPattern(node: EffectiveBindingOrAssignmentTarget): node is EffectiveObjectBindingOrAssignmentPattern {
         switch (node.kind) {
             case SyntaxKind.ObjectBindingPattern:
             case SyntaxKind.ObjectLiteralExpression:
@@ -1147,7 +662,7 @@ namespace ts {
     /**
      * Determines whether a node is ArrayBindingPattern-like
      */
-    function isEffectiveArrayBindingPattern(node: EffectiveBindingTarget): node is EffectiveArrayBindingPattern {
+    function isEffectiveArrayBindingPattern(node: EffectiveBindingOrAssignmentTarget): node is EffectiveArrayBindingOrAssignmentPattern {
         switch (node.kind) {
             case SyntaxKind.ArrayBindingPattern:
             case SyntaxKind.ArrayLiteralExpression:
@@ -1160,7 +675,7 @@ namespace ts {
     /**
      * Gets the elements of a BindingPattern-like name
      */
-    function getElementsOfEffectiveBindingPattern(name: EffectiveBindingPattern): EffectiveBindingElement[] {
+    function getElementsOfEffectiveBindingPattern(name: EffectiveBindingOrAssignmentPattern): EffectiveBindingOrAssignmentElement[] {
         switch (name.kind) {
             case SyntaxKind.ObjectBindingPattern:
             case SyntaxKind.ArrayBindingPattern:
@@ -1175,179 +690,79 @@ namespace ts {
         }
     }
 
-    // function updateEffectiveBindingElement(bindingElement: EffectiveBindingElement, restIndicator: EffectiveRestIndicator, propertyName: PropertyName, target: EffectiveBindingTarget, initializer: Expression) {
-    //     switch (bindingElement.kind) {
-    //         case SyntaxKind.VariableDeclaration:
-    //             Debug.assertNode(target, isBindingName);
-    //             Debug.assertMissingNode(propertyName);
-    //             return updateVariableDeclaration(
-    //                 <VariableDeclaration>bindingElement,
-    //                 <BindingName>target,
-    //                 /*type*/ undefined,
-    //                 initializer
-    //             );
-
-    //         case SyntaxKind.Parameter:
-    //             Debug.assertOptionalToken(restIndicator, SyntaxKind.DotDotDotToken);
-    //             Debug.assertMissingNode(propertyName);
-    //             Debug.assertNode(target, isBindingName);
-    //             return updateParameter(
-    //                 <ParameterDeclaration>bindingElement,
-    //                 /*decorators*/ undefined,
-    //                 /*modifiers*/ undefined,
-    //                 <DotDotDotToken>restIndicator,
-    //                 <BindingName>target,
-    //                 /*type*/ undefined,
-    //                 initializer
-    //             );
-
-    //         case SyntaxKind.BindingElement:
-    //             Debug.assertOptionalToken(restIndicator, SyntaxKind.DotDotDotToken);
-    //             Debug.assertNode(target, isBindingName);
-    //             return updateBindingElement(
-    //                 <BindingElement>bindingElement,
-    //                 <DotDotDotToken>restIndicator,
-    //                 propertyName,
-    //                 <BindingName>target,
-    //                 initializer
-    //             );
-
-    //         case SyntaxKind.PropertyAssignment:
-    //         case SyntaxKind.ShorthandPropertyAssignment:
-    //         case SyntaxKind.SpreadAssignment:
-    //             if (restIndicator) {
-    //                 return convertToSpreadAssignment(<PropertyAssignment | ShorthandPropertyAssignment | SpreadAssignment>bindingElement, propertyName, target, initializer);
-    //             }
-    //             else if (propertyName) {
-    //                 return convertToPropertyAssignment(<PropertyAssignment | ShorthandPropertyAssignment | SpreadAssignment>bindingElement, propertyName, target, initializer);
-    //             }
-    //             else {
-    //                 return convertToShorthandPropertyAssignment(<PropertyAssignment | ShorthandPropertyAssignment | SpreadAssignment>bindingElement, target, initializer);
-    //             }
-
-    //         case SyntaxKind.ArrayLiteralExpression:
-    //         case SyntaxKind.BinaryExpression:
-    //         case SyntaxKind.SpreadElement:
-    //         case SyntaxKind.PropertyAccessExpression:
-    //         case SyntaxKind.ElementAccessExpression:
-    //             Debug.assertMissingNode(propertyName);
-    //             if (restIndicator) {
-    //                 return convertToSpreadElement(<Expression>bindingElement, target, initializer);
-    //             }
-    //             else {
-
-    //             }
-    //     }
-    // }
-
-    // function convertToSpreadAssignment(node: PropertyAssignment | ShorthandPropertyAssignment | SpreadAssignment, propertyName: PropertyName, target: EffectiveBindingTarget, initializer: Expression) {
-    //     Debug.assertMissingNode(propertyName);
-    //     Debug.assertNode(target, isIdentifier);
-    //     Debug.assertMissingNode(initializer);
-    //     if (node.kind === SyntaxKind.SpreadAssignment) {
-    //         return updateSpreadAssignment(node, <Identifier>target);
-    //     }
-    //     return setOriginalNode(
-    //         createSpreadAssignment(
-    //             <Identifier>target,
-    //             node
-    //         ),
-    //         node
-    //     );
-    // }
-
-    // function convertToPropertyAssignment(node: PropertyAssignment | ShorthandPropertyAssignment | SpreadAssignment, propertyName: PropertyName, target: EffectiveBindingTarget, initializer: Expression) {
-    //     Debug.assertNode(target, isExpression);
-    //     if (node.kind === SyntaxKind.PropertyAssignment) {
-    //         return updatePropertyAssignment(
-    //             node,
-    //             propertyName,
-    //             initializer ?
-    //                 isAssignmentExpression(node.initializer, /*excludeCompoundAssignment*/ true)
-    //                     ? updateBinary(node.initializer, <Expression>target, initializer)
-    //                     : createAssignment(<Expression>target, initializer)
-    //                 : <Expression>target
-    //         );
-    //     }
-    //     return setOriginalNode(
-    //         createPropertyAssignment(
-    //             propertyName,
-    //             initializer ?
-    //                 createAssignment(<Expression>target, initializer)
-    //                 : <Expression>target,
-    //             node
-    //         ),
-    //         node
-    //     );
-    // }
-
-    // function convertToShorthandPropertyAssignment(node: PropertyAssignment | ShorthandPropertyAssignment | SpreadAssignment, target: EffectiveBindingTarget, initializer: Expression) {
-    //     Debug.assertNode(target, isIdentifier);
-    //     if (node.kind === SyntaxKind.ShorthandPropertyAssignment) {
-    //         return updateShorthandPropertyAssignment(
-    //             node,
-    //             <Identifier>target,
-    //             initializer
-    //         );
-    //     }
-    //     return setOriginalNode(
-    //         createShorthandPropertyAssignment(
-    //             <Identifier>target,
-    //             initializer,
-    //             node
-    //         ),
-    //         node
-    //     );
-    // }
-
-    // function convertToSpreadElement(node: Expression, target: EffectiveBindingTarget, initializer: Expression) {
-    //     Debug.assertNode(target, isExpression);
-    //     Debug.assertMissingNode(initializer);
-    //     if (node.kind === SyntaxKind.SpreadElement) {
-    //         return updateSpread(
-    //             <SpreadElement>node,
-    //             <Expression>target);
-    //     }
-    //     return setOriginalNode(
-    //         createSpread(
-    //             <Expression>target,
-    //             node
-    //         ),
-    //         node
-    //     );
-    // }
-
-    // function convertToElement(node: Expression, target: EffectiveBindingTarget, initializer: Expression) {
-
-    // }
-
-    function createOrUpdateVariableDeclaration(node: Node, name: BindingName, initializer: Expression, location: TextRange) {
-        if (node && node.kind === SyntaxKind.VariableDeclaration) {
-            return updateVariableDeclaration(<VariableDeclaration>node, name, /*type*/ undefined, initializer);
-        }
-        const variable = createVariableDeclaration(name, /*type*/ undefined, initializer, location);
-        return node ? setOriginalNode(variable, node) : variable;
+    function createEffectiveArrayBindingPattern(elements: EffectiveBindingOrAssignmentElement[]) {
+        Debug.assertEachNode(elements, isArrayBindingElement);
+        return createArrayBindingPattern(<ArrayBindingElement[]>elements);
     }
 
-    function createOrUpdateArrayBindingPattern(node: Node, elements: ArrayBindingElement[], location: TextRange) {
-        if (node && node.kind === SyntaxKind.ArrayBindingPattern) {
-            return updateArrayBindingPattern(<ArrayBindingPattern>node, elements);
-        }
-        const pattern = createArrayBindingPattern(elements, location);
-        return node ? setOriginalNode(pattern, node) : pattern;
+    function createEffectiveArrayAssignmentPattern(elements: EffectiveBindingOrAssignmentElement[]) {
+        return createArrayLiteral(map(elements, convertToArrayLiteralElement));
     }
 
-    function createOrUpdateObjectBindingPattern(node: Node, elements: BindingElement[], location: TextRange) {
-        if (node && node.kind === SyntaxKind.ArrayBindingPattern) {
-            return updateObjectBindingPattern(<ObjectBindingPattern>node, elements);
+    function createEffectiveObjectBindingPattern(elements: EffectiveBindingOrAssignmentElement[]) {
+        Debug.assertEachNode(elements, isBindingElement);
+        return createObjectBindingPattern(<BindingElement[]>elements);
+    }
+
+    function createEffectiveObjectAssignmentPattern(elements: EffectiveBindingOrAssignmentElement[]) {
+        return createObjectLiteral(map(elements, convertToObjectLiteralElement));
+    }
+
+    function createEffectiveBindingElement(name: Identifier) {
+        return createBindingElement(/*propertyName*/ undefined, /*dotDotDotToken*/ undefined, name);
+    }
+
+    function createEffectiveAssignmentElement(name: Identifier) {
+        return name;
+    }
+
+    function convertToArrayLiteralElement(element: EffectiveBindingOrAssignmentElement) {
+        if (isBindingElement(element)) {
+            if (element.dotDotDotToken) {
+                Debug.assertNode(element.name, isIdentifier);
+                return setOriginalNode(createSpread(<Identifier>element.name, element), element);
+            }
+            const expression = convertToExpressionTarget(<ObjectBindingPattern | ArrayBindingPattern | Identifier>element.name);
+            return element.initializer ? setOriginalNode(createAssignment(expression, element.initializer, element), element) : expression;
         }
-        const pattern = createObjectBindingPattern(elements, location);
-        return node ? setOriginalNode(pattern, node) : pattern;
+        Debug.assertNode(element, isExpression);
+        return <Expression>element;
+    }
+
+    function convertToObjectLiteralElement(element: EffectiveBindingOrAssignmentElement) {
+        if (isBindingElement(element)) {
+            if (element.dotDotDotToken) {
+                Debug.assertNode(element.name, isIdentifier);
+                return setOriginalNode(createSpreadAssignment(<Identifier>element.name, element), element);
+            }
+            if (element.propertyName) {
+                const expression = convertToExpressionTarget(<ObjectBindingPattern | ArrayBindingPattern | Identifier>element.name);
+                return setOriginalNode(createPropertyAssignment(element.propertyName, element.initializer ? createAssignment(expression, element.initializer) : expression, element), element);
+            }
+            Debug.assertNode(element.name, isIdentifier);
+            return setOriginalNode(createShorthandPropertyAssignment(<Identifier>element.name, element.initializer, element), element);
+        }
+        Debug.assertNode(element, isObjectLiteralElementLike);
+        return <ObjectLiteralElementLike>element;
+    }
+
+    function convertToExpressionTarget(target: EffectiveBindingOrAssignmentTarget): Expression {
+        if (isBindingPattern(target)) {
+            switch (target.kind) {
+                case SyntaxKind.ArrayBindingPattern:
+                    return setOriginalNode(createArrayLiteral(map(target.elements, convertToArrayLiteralElement), target), target);
+                case SyntaxKind.ObjectBindingPattern:
+                    return setOriginalNode(createObjectLiteral(map(target.elements, convertToObjectLiteralElement), target), target);
+            }
+            return;
+        }
+        Debug.assertNode(target, isExpression);
+        return <Expression>target;
     }
 
     /** Given value: o, propName: p, pattern: { a, b, ...p } from the original statement
      * `{ a, b, ...p } = o`, create `p = __rest(o, ["a", "b"]);`*/
-    function createRestCall(value: Expression, elements: EffectiveBindingElement[], location: TextRange): Expression {
+    function createRestCall(value: Expression, elements: EffectiveBindingOrAssignmentElement[], location: TextRange): Expression {
         const propertyNames: LiteralExpression[] = [];
         for (let i = 0; i < elements.length - 1; i++) {
             if (isOmittedExpression(elements[i])) {
diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts
index e4fb8a0aaf0..dd7498c4149 100644
--- a/src/compiler/transformers/es2015.ts
+++ b/src/compiler/transformers/es2015.ts
@@ -279,7 +279,7 @@ namespace ts {
             else if (node.transformFlags & TransformFlags.ContainsES2015 || (isInConstructorWithCapturedSuper && !isExpression(node))) {
                 // we want to dive in this branch either if node has children with ES2015 specific syntax
                 // or we are inside constructor that captures result of the super call so all returns without expression should be
-                // rewritten. Note: we skip expressions since returns should never appear there 
+                // rewritten. Note: we skip expressions since returns should never appear there
                 return visitEachChild(node, visitor, context);
             }
             else {
@@ -861,7 +861,7 @@ namespace ts {
             }
 
             if (constructor) {
-                addDefaultValueAssignmentsIfNeeded(statements, constructor, visitor, /*convertObjectRest*/ false);
+                addDefaultValueAssignmentsIfNeeded(context, statements, constructor, visitor, /*convertObjectRest*/ false);
                 addRestParameterIfNeeded(statements, constructor, hasSynthesizedSuper);
                 Debug.assert(statementOffset >= 0, "statementOffset not initialized correctly!");
 
@@ -1328,16 +1328,10 @@ namespace ts {
             // If we are here it is most likely because our expression is a destructuring assignment.
             switch (node.expression.kind) {
                 case SyntaxKind.ParenthesizedExpression:
-                    return updateStatement(node,
-                        visitParenthesizedExpression(<ParenthesizedExpression>node.expression, /*needsDestructuringValue*/ false)
-                    );
-
+                    return updateStatement(node, visitParenthesizedExpression(<ParenthesizedExpression>node.expression, /*needsDestructuringValue*/ false));
                 case SyntaxKind.BinaryExpression:
-                    return updateStatement(node,
-                        visitBinaryExpression(<BinaryExpression>node.expression, /*needsDestructuringValue*/ false)
-                    );
+                    return updateStatement(node, visitBinaryExpression(<BinaryExpression>node.expression, /*needsDestructuringValue*/ false));
             }
-
             return visitEachChild(node, visitor, context);
         }
 
@@ -1350,22 +1344,14 @@ namespace ts {
          */
         function visitParenthesizedExpression(node: ParenthesizedExpression, needsDestructuringValue: boolean): ParenthesizedExpression {
             // If we are here it is most likely because our expression is a destructuring assignment.
-            if (needsDestructuringValue) {
+            if (!needsDestructuringValue) {
                 switch (node.expression.kind) {
                     case SyntaxKind.ParenthesizedExpression:
-                        return createParen(
-                            visitParenthesizedExpression(<ParenthesizedExpression>node.expression, /*needsDestructuringValue*/ true),
-                            /*location*/ node
-                        );
-
+                        return updateParen(node, visitParenthesizedExpression(<ParenthesizedExpression>node.expression, /*needsDestructuringValue*/ false));
                     case SyntaxKind.BinaryExpression:
-                        return createParen(
-                            visitBinaryExpression(<BinaryExpression>node.expression, /*needsDestructuringValue*/ true),
-                            /*location*/ node
-                        );
+                        return updateParen(node, visitBinaryExpression(<BinaryExpression>node.expression, /*needsDestructuringValue*/ false));
                 }
             }
-
             return visitEachChild(node, visitor, context);
         }
 
@@ -1379,7 +1365,13 @@ namespace ts {
         function visitBinaryExpression(node: BinaryExpression, needsDestructuringValue: boolean): Expression {
             // If we are here it is because this is a destructuring assignment.
             Debug.assert(isDestructuringAssignment(node));
-            return flattenDestructuringAssignment(context, node, needsDestructuringValue, hoistVariableDeclaration, visitor);
+            return flattenDestructuringToExpression(
+                context,
+                <DestructuringAssignment>node,
+                needsDestructuringValue,
+                FlattenLevel.All,
+                /*createAssignmentCallback*/ undefined,
+                visitor);
         }
 
         function visitVariableStatement(node: VariableStatement): Statement {
@@ -1391,7 +1383,14 @@ namespace ts {
                     if (decl.initializer) {
                         let assignment: Expression;
                         if (isBindingPattern(decl.name)) {
-                            assignment = flattenVariableDestructuringToExpression(decl, hoistVariableDeclaration, /*createAssignmentCallback*/ undefined, visitor);
+                            assignment = flattenDestructuringToExpression(
+                                context,
+                                decl,
+                                /*needsValue*/ false,
+                                FlattenLevel.All,
+                                /*createAssignmentCallback*/ undefined,
+                                visitor
+                            );
                         }
                         else {
                             assignment = createBinary(<Identifier>decl.name, SyntaxKind.EqualsToken, visitNode(decl.initializer, visitor, isExpression));
@@ -1544,8 +1543,16 @@ namespace ts {
             if (isBindingPattern(node.name)) {
                 const recordTempVariablesInLine = !enclosingVariableStatement
                     || !hasModifier(enclosingVariableStatement, ModifierFlags.Export);
-                return flattenVariableDestructuring(node, /*value*/ undefined, visitor,
-                    recordTempVariablesInLine ? undefined : hoistVariableDeclaration);
+                debugger;
+                return flattenDestructuringToDeclarations(
+                    context,
+                    node,
+                    /*value*/ undefined,
+                    /*skipInitializer*/ false,
+                    recordTempVariablesInLine,
+                    FlattenLevel.All,
+                    visitor
+                );
             }
 
             return visitEachChild(node, visitor, context);
@@ -2174,7 +2181,7 @@ namespace ts {
             const temp = createTempVariable(undefined);
             const newVariableDeclaration = createVariableDeclaration(temp, undefined, undefined, node.variableDeclaration);
 
-            const vars = flattenVariableDestructuring(node.variableDeclaration, temp, visitor);
+            const vars = flattenDestructuringToDeclarations(context, node.variableDeclaration, temp, /*skipInitializer*/ false, /*recordTempVariablesInLine*/ true, FlattenLevel.All, visitor);
             const list = createVariableDeclarationList(vars, /*location*/node.variableDeclaration, /*flags*/node.variableDeclaration.flags);
             const destructure = createVariableStatement(undefined, list);
 
@@ -2261,7 +2268,7 @@ namespace ts {
                 setEmitFlags(thisArg, EmitFlags.NoSubstitution);
             }
             let resultingCall: CallExpression | BinaryExpression;
-            if (node.transformFlags & TransformFlags.ContainsSpreadExpression) {
+            if (node.transformFlags & TransformFlags.ContainsSpread) {
                 // [source]
                 //      f(...a, b)
                 //      x.m(...a, b)
@@ -2323,7 +2330,7 @@ namespace ts {
          */
         function visitNewExpression(node: NewExpression): LeftHandSideExpression {
             // We are here because we contain a SpreadElementExpression.
-            Debug.assert((node.transformFlags & TransformFlags.ContainsSpreadExpression) !== 0);
+            Debug.assert((node.transformFlags & TransformFlags.ContainsSpread) !== 0);
 
             // [source]
             //      new C(...a)
diff --git a/src/compiler/transformers/es2017.ts b/src/compiler/transformers/es2017.ts
index 548609d676c..0990e9c454f 100644
--- a/src/compiler/transformers/es2017.ts
+++ b/src/compiler/transformers/es2017.ts
@@ -29,12 +29,6 @@ namespace ts {
          */
         let enabledSubstitutions: ES2017SubstitutionFlags;
 
-        /**
-         * Keeps track of whether  we are within any containing namespaces when performing
-         * just-in-time substitution while printing an expression identifier.
-         */
-        let applicableSubstitutions: ES2017SubstitutionFlags;
-
         /**
          * This keeps track of containers where `super` is valid, for use with
          * just-in-time substitution for `super` expressions inside of async methods.
@@ -49,8 +43,6 @@ namespace ts {
         context.onEmitNode = onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
 
-        let currentScope: SourceFile | Block | ModuleBlock | CaseBlock;
-
         return transformSourceFile;
 
         function transformSourceFile(node: SourceFile) {
@@ -64,13 +56,9 @@ namespace ts {
         }
 
         function visitor(node: Node): VisitResult<Node> {
-            if (node.transformFlags & TransformFlags.ES2017) {
+            if (node.transformFlags & TransformFlags.ContainsES2017) {
                 return visitorWorker(node);
             }
-            else if (node.transformFlags & TransformFlags.ContainsES2017) {
-                return visitEachChild(node, visitor, context);
-            }
-
             return node;
         }
 
@@ -101,8 +89,7 @@ namespace ts {
                     return visitArrowFunction(<ArrowFunction>node);
 
                 default:
-                    Debug.failBadSyntaxKind(node);
-                    return node;
+                    return visitEachChild(node, visitor, context);
             }
         }
 
@@ -133,28 +120,18 @@ namespace ts {
          * @param node The method node.
          */
         function visitMethodDeclaration(node: MethodDeclaration) {
-            if (!isAsyncFunctionLike(node)) {
-                return node;
-            }
-            const method = createMethod(
+            return updateMethod(
+                node,
                 /*decorators*/ undefined,
                 visitNodes(node.modifiers, visitor, isModifier),
-                node.asteriskToken,
                 node.name,
                 /*typeParameters*/ undefined,
-                visitNodes(node.parameters, visitor, isParameter),
+                visitParameterList(node.parameters, visitor, context),
                 /*type*/ undefined,
-                transformFunctionBody(node),
-                /*location*/ node
+                isAsyncFunctionLike(node)
+                    ? transformAsyncFunctionBody(node)
+                    : visitFunctionBody(node.body, visitor, context)
             );
-
-            // While we emit the source map for the node after skipping decorators and modifiers,
-            // we need to emit the comments for the original range.
-            setCommentRange(method, node);
-            setSourceMapRange(method, moveRangePastDecorators(node));
-            setOriginalNode(method, node);
-
-            return method;
         }
 
         /**
@@ -166,23 +143,18 @@ namespace ts {
          * @param node The function node.
          */
         function visitFunctionDeclaration(node: FunctionDeclaration): VisitResult<Statement> {
-            if (!isAsyncFunctionLike(node)) {
-                return node;
-            }
-            const func = createFunctionDeclaration(
+            return updateFunctionDeclaration(
+                node,
                 /*decorators*/ undefined,
                 visitNodes(node.modifiers, visitor, isModifier),
-                node.asteriskToken,
                 node.name,
                 /*typeParameters*/ undefined,
                 visitNodes(node.parameters, visitor, isParameter),
                 /*type*/ undefined,
-                transformFunctionBody(node),
-                /*location*/ node
+                isAsyncFunctionLike(node)
+                    ? transformAsyncFunctionBody(node)
+                    : visitFunctionBody(node.body, visitor, context)
             );
-            setOriginalNode(func, node);
-
-            return func;
         }
 
         /**
@@ -194,27 +166,20 @@ namespace ts {
          * @param node The function expression node.
          */
         function visitFunctionExpression(node: FunctionExpression): Expression {
-            if (!isAsyncFunctionLike(node)) {
-                return node;
-            }
             if (nodeIsMissing(node.body)) {
                 return createOmittedExpression();
             }
-
-            const func = createFunctionExpression(
+            return updateFunctionExpression(
+                node,
                 /*modifiers*/ undefined,
-                node.asteriskToken,
                 node.name,
                 /*typeParameters*/ undefined,
                 visitNodes(node.parameters, visitor, isParameter),
                 /*type*/ undefined,
-                transformFunctionBody(node),
-                /*location*/ node
+                isAsyncFunctionLike(node)
+                    ? transformAsyncFunctionBody(node)
+                    : visitFunctionBody(node.body, visitor, context)
             );
-
-            setOriginalNode(func, node);
-
-            return func;
         }
 
         /**
@@ -223,45 +188,21 @@ namespace ts {
          * - The node is marked async
          */
         function visitArrowFunction(node: ArrowFunction) {
-            if (!isAsyncFunctionLike(node)) {
-                return node;
-            }
-            const func = createArrowFunction(
+            return updateArrowFunction(
+                node,
                 visitNodes(node.modifiers, visitor, isModifier),
                 /*typeParameters*/ undefined,
                 visitNodes(node.parameters, visitor, isParameter),
                 /*type*/ undefined,
-                node.equalsGreaterThanToken,
-                transformConciseBody(node),
-                /*location*/ node
+                isAsyncFunctionLike(node)
+                    ? transformAsyncFunctionBody(node)
+                    : visitFunctionBody(node.body, visitor, context)
             );
-
-            setOriginalNode(func, node);
-
-            return func;
         }
 
-        function transformFunctionBody(node: MethodDeclaration | AccessorDeclaration | FunctionDeclaration | FunctionExpression): FunctionBody {
-            return <FunctionBody>transformAsyncFunctionBody(node);
-        }
-
-        function transformConciseBody(node: ArrowFunction): ConciseBody {
-            return transformAsyncFunctionBody(node);
-        }
-
-        function transformFunctionBodyWorker(body: Block, start = 0) {
-            const savedCurrentScope = currentScope;
-            currentScope = body;
-            startLexicalEnvironment();
-
-            const statements = visitNodes(body.statements, visitor, isStatement, start);
-            const visited = updateBlock(body, statements);
-            const declarations = endLexicalEnvironment();
-            currentScope = savedCurrentScope;
-            return mergeFunctionBodyLexicalEnvironment(visited, declarations);
-        }
-
-        function transformAsyncFunctionBody(node: FunctionLikeDeclaration): ConciseBody | FunctionBody {
+        function transformAsyncFunctionBody(node: MethodDeclaration | AccessorDeclaration | FunctionDeclaration | FunctionExpression): FunctionBody;
+        function transformAsyncFunctionBody(node: ArrowFunction): ConciseBody;
+        function transformAsyncFunctionBody(node: FunctionLikeDeclaration): ConciseBody {
             const original = getOriginalNode(node, isFunctionLike);
             const nodeType = original.type;
             const promiseConstructor = languageVersion < ScriptTarget.ES2015 ? getPromiseConstructor(nodeType) : undefined;
@@ -274,7 +215,6 @@ namespace ts {
             // passed to `__awaiter` is executed inside of the callback to the
             // promise constructor.
 
-
             if (!isArrowFunction) {
                 const statements: Statement[] = [];
                 const statementOffset = addPrologueDirectives(statements, (<Block>node.body).statements, /*ensureUseStrict*/ false, visitor);
@@ -289,6 +229,7 @@ namespace ts {
                     )
                 );
 
+                addRange(statements, endLexicalEnvironment());
                 const block = createBlock(statements, /*location*/ node.body, /*multiLine*/ true);
 
                 // Minor optimization, emit `_super` helper to capture `super` access in an arrow.
@@ -307,32 +248,32 @@ namespace ts {
                 return block;
             }
             else {
-                return createAwaiterHelper(
+                const expression = createAwaiterHelper(
                     currentSourceFileExternalHelpersModuleName,
                     hasLexicalArguments,
                     promiseConstructor,
-                    <Block>transformConciseBodyWorker(node.body, /*forceBlockFunctionBody*/ true)
+                    transformFunctionBodyWorker(node.body)
                 );
+
+                const declarations = endLexicalEnvironment();
+                if (some(declarations)) {
+                    const block = convertToFunctionBody(expression);
+                    return updateBlock(block, createNodeArray(concatenate(block.statements, declarations), block.statements));
+                }
+
+                return expression;
             }
         }
 
-        function transformConciseBodyWorker(body: Block | Expression, forceBlockFunctionBody: boolean) {
+        function transformFunctionBodyWorker(body: ConciseBody, start?: number) {
             if (isBlock(body)) {
-                return transformFunctionBodyWorker(body);
+                return updateBlock(body, visitLexicalEnvironment(body.statements, visitor, context, start));
             }
             else {
                 startLexicalEnvironment();
-                const visited: Expression | Block = visitNode(body, visitor, isConciseBody);
+                const visited = convertToFunctionBody(visitNode(body, visitor, isConciseBody));
                 const declarations = endLexicalEnvironment();
-                const merged = mergeFunctionBodyLexicalEnvironment(visited, declarations);
-                if (forceBlockFunctionBody && !isBlock(merged)) {
-                    return createBlock([
-                        createReturn(<Expression>merged)
-                    ]);
-                }
-                else {
-                    return merged;
-                }
+                return updateBlock(visited, createNodeArray(concatenate(visited.statements, declarations), visited.statements));
             }
         }
 
@@ -452,18 +393,17 @@ namespace ts {
          * @param emit A callback used to emit the node in the printer.
          */
         function onEmitNode(emitContext: EmitContext, node: Node, emitCallback: (emitContext: EmitContext, node: Node) => void): void {
-            const savedApplicableSubstitutions = applicableSubstitutions;
-            const savedCurrentSuperContainer = currentSuperContainer;
             // If we need to support substitutions for `super` in an async method,
             // we should track it here.
             if (enabledSubstitutions & ES2017SubstitutionFlags.AsyncMethodsWithSuper && isSuperContainer(node)) {
+                const savedCurrentSuperContainer = currentSuperContainer;
                 currentSuperContainer = node;
+                previousOnEmitNode(emitContext, node, emitCallback);
+                currentSuperContainer = savedCurrentSuperContainer;
+            }
+            else {
+                previousOnEmitNode(emitContext, node, emitCallback);
             }
-
-            previousOnEmitNode(emitContext, node, emitCallback);
-
-            applicableSubstitutions = savedApplicableSubstitutions;
-            currentSuperContainer = savedCurrentSuperContainer;
         }
 
         /**
diff --git a/src/compiler/transformers/esnext.ts b/src/compiler/transformers/esnext.ts
index 9013fabf584..a52ee9b1a24 100644
--- a/src/compiler/transformers/esnext.ts
+++ b/src/compiler/transformers/esnext.ts
@@ -4,9 +4,6 @@
 /*@internal*/
 namespace ts {
     export function transformESNext(context: TransformationContext) {
-        const {
-            hoistVariableDeclaration,
-        } = context;
         let currentSourceFile: SourceFile;
         return transformSourceFile;
 
@@ -20,7 +17,7 @@ namespace ts {
                 return visitorWorker(node);
             }
             else if (node.transformFlags & TransformFlags.ContainsESNext) {
-                return visitEachChild(node, visitor, context);
+                return visitNodeContainingESNext(node);
             }
             else {
                 return node;
@@ -32,7 +29,7 @@ namespace ts {
                 case SyntaxKind.ObjectLiteralExpression:
                     return visitObjectLiteralExpression(node as ObjectLiteralExpression);
                 case SyntaxKind.BinaryExpression:
-                    return visitBinaryExpression(node as BinaryExpression);
+                    return visitBinaryExpression(node as BinaryExpression, /*needsDestructuringValue*/ true);
                 case SyntaxKind.VariableDeclaration:
                     return visitVariableDeclaration(node as VariableDeclaration);
                 case SyntaxKind.ForOfStatement:
@@ -54,6 +51,16 @@ namespace ts {
             }
         }
 
+        function visitNodeContainingESNext(node: Node) {
+            switch (node.kind) {
+                case SyntaxKind.ExpressionStatement:
+                    return visitExpressionStatement(node as ExpressionStatement);
+                case SyntaxKind.ParenthesizedExpression:
+                    return visitParenthesizedExpression(node as ParenthesizedExpression, /*needsDestructuringValue*/ true);
+            }
+            return visitEachChild(node, visitor, context);
+        }
+
         function chunkObjectLiteralElements(elements: ObjectLiteralElement[]): Expression[] {
             let chunkObject: (ShorthandPropertyAssignment | PropertyAssignment)[];
             const objects: Expression[] = [];
@@ -99,14 +106,43 @@ namespace ts {
             return createCall(createIdentifier("__assign"), undefined, objects);
         }
 
+        function visitExpressionStatement(node: ExpressionStatement): ExpressionStatement {
+            switch (node.expression.kind) {
+                case SyntaxKind.ParenthesizedExpression:
+                    return updateStatement(node, visitParenthesizedExpression(<ParenthesizedExpression>node.expression, /*needsDestructuringValue*/ false));
+                case SyntaxKind.BinaryExpression:
+                    return updateStatement(node, visitBinaryExpression(<BinaryExpression>node.expression, /*needsDestructuringValue*/ false));
+            }
+            return visitEachChild(node, visitor, context);
+        }
+
+        function visitParenthesizedExpression(node: ParenthesizedExpression, needsDestructuringValue: boolean): ParenthesizedExpression {
+            if (!needsDestructuringValue) {
+                switch (node.expression.kind) {
+                    case SyntaxKind.ParenthesizedExpression:
+                        return updateParen(node, visitParenthesizedExpression(<ParenthesizedExpression>node.expression, /*needsDestructuringValue*/ false));
+                    case SyntaxKind.BinaryExpression:
+                        return updateParen(node, visitBinaryExpression(<BinaryExpression>node.expression, /*needsDestructuringValue*/ false));
+                }
+            }
+            return visitEachChild(node, visitor, context);
+        }
+
         /**
          * Visits a BinaryExpression that contains a destructuring assignment.
          *
          * @param node A BinaryExpression node.
          */
-        function visitBinaryExpression(node: BinaryExpression): Expression {
+        function visitBinaryExpression(node: BinaryExpression, needsDestructuringValue: boolean): Expression {
             if (isDestructuringAssignment(node) && node.left.transformFlags & TransformFlags.ContainsESNext) {
-                return flattenDestructuringAssignment(context, node, /*needsDestructuringValue*/ true, hoistVariableDeclaration, visitor, /*transformRest*/ true);
+                return flattenDestructuringToExpression(
+                    context,
+                    node,
+                    needsDestructuringValue,
+                    FlattenLevel.ObjectRest,
+                    /*createAssignmentCallback*/ undefined,
+                    visitor
+                );
             }
 
             return visitEachChild(node, visitor, context);
@@ -120,10 +156,8 @@ namespace ts {
         function visitVariableDeclaration(node: VariableDeclaration): 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.AssertESNext) {
-                const result = flattenVariableDestructuring(node, /*value*/ undefined, visitor, /*recordTempVariable*/ undefined, /*transformRest*/ true);
-                return result;
+                return flattenDestructuringToDeclarations(context, node, /*boundValue*/ undefined, /*skipInitializer*/ false, /*recordTempVariablesInLine*/ true, FlattenLevel.ObjectRest, visitor);
             }
-
             return visitEachChild(node, visitor, context);
         }
 
@@ -168,14 +202,14 @@ namespace ts {
                 const declaration = firstOrUndefined(initializer.declarations);
                 return declaration && declaration.name &&
                     declaration.name.kind === SyntaxKind.ObjectBindingPattern &&
-                    !!(declaration.name.transformFlags & TransformFlags.ContainsSpreadExpression);
+                    !!(declaration.name.transformFlags & (TransformFlags.ContainsRest | TransformFlags.ContainsObjectRest));
             }
             return false;
         }
 
         function isRestAssignment(initializer: ForInitializer) {
             return initializer.kind === SyntaxKind.ObjectLiteralExpression &&
-                initializer.transformFlags & TransformFlags.ContainsSpreadExpression;
+                initializer.transformFlags & (TransformFlags.ContainsRest | TransformFlags.ContainsObjectRest);
         }
 
         function visitParameter(node: ParameterDeclaration): ParameterDeclaration {
@@ -204,7 +238,7 @@ namespace ts {
         function isObjectRestParameter(node: ParameterDeclaration) {
             return node.name &&
                 node.name.kind === SyntaxKind.ObjectBindingPattern &&
-                !!(node.name.transformFlags & TransformFlags.ContainsSpreadExpression);
+                !!(node.name.transformFlags & (TransformFlags.ContainsRest | TransformFlags.ContainsObjectRest));
         }
 
         function visitFunctionDeclaration(node: FunctionDeclaration): FunctionDeclaration {
diff --git a/src/compiler/transformers/jsx.ts b/src/compiler/transformers/jsx.ts
index ba762cc5f12..8bc09ea45b2 100644
--- a/src/compiler/transformers/jsx.ts
+++ b/src/compiler/transformers/jsx.ts
@@ -27,12 +27,9 @@ namespace ts {
         }
 
         function visitor(node: Node): VisitResult<Node> {
-            if (node.transformFlags & TransformFlags.Jsx) {
+            if (node.transformFlags & TransformFlags.ContainsJsx) {
                 return visitorWorker(node);
             }
-            else if (node.transformFlags & TransformFlags.ContainsJsx) {
-                return visitEachChild(node, visitor, context);
-            }
             else {
                 return node;
             }
@@ -50,8 +47,7 @@ namespace ts {
                     return visitJsxExpression(<JsxExpression>node);
 
                 default:
-                    Debug.failBadSyntaxKind(node);
-                    return undefined;
+                    return visitEachChild(node, visitor, context);
             }
         }
 
diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
index 87d02b44025..bb17b99e5c6 100644
--- a/src/compiler/transformers/module/module.ts
+++ b/src/compiler/transformers/module/module.ts
@@ -19,8 +19,7 @@ namespace ts {
 
         const {
             startLexicalEnvironment,
-            endLexicalEnvironment,
-            hoistVariableDeclaration,
+            endLexicalEnvironment
         } = context;
 
         const compilerOptions = context.getCompilerOptions();
@@ -757,10 +756,13 @@ namespace ts {
          */
         function transformInitializedVariable(node: VariableDeclaration): Expression {
             if (isBindingPattern(node.name)) {
-                return flattenVariableDestructuringToExpression(
+                return flattenDestructuringToExpression(
+                    context,
                     node,
-                    hoistVariableDeclaration,
-                    createExportExpression
+                    /*needsValue*/ false,
+                    FlattenLevel.All,
+                    createExportExpression,
+                    /*visitor*/ undefined
                 );
             }
             else {
diff --git a/src/compiler/transformers/module/system.ts b/src/compiler/transformers/module/system.ts
index 0524b9354d2..1ed1f82d506 100644
--- a/src/compiler/transformers/module/system.ts
+++ b/src/compiler/transformers/module/system.ts
@@ -808,7 +808,7 @@ namespace ts {
         function transformInitializedVariable(node: VariableDeclaration, isExportedDeclaration: boolean): Expression {
             const createAssignment = isExportedDeclaration ? createExportedVariableAssignment : createNonExportedVariableAssignment;
             return isBindingPattern(node.name)
-                ? flattenVariableDestructuringToExpression(node, hoistVariableDeclaration, createAssignment, destructuringVisitor)
+                ? flattenDestructuringToExpression(context, node, /*needsValue*/ false, FlattenLevel.All, createAssignment, destructuringVisitor)
                 : createAssignment(node.name, visitNode(node.initializer, destructuringVisitor, isExpression));
         }
 
@@ -1459,7 +1459,13 @@ namespace ts {
          */
         function visitDestructuringAssignment(node: DestructuringAssignment): VisitResult<Expression> {
             if (hasExportedReferenceInDestructuringTarget(node.left)) {
-                return flattenDestructuringAssignment(context, node, /*needsValue*/ true, hoistVariableDeclaration, destructuringVisitor);
+                return flattenDestructuringToExpression(
+                    context,
+                    node,
+                    /*needsValue*/ true,
+                    FlattenLevel.All,
+                    /*createAssignmentCallback*/ undefined,
+                    destructuringVisitor);
             }
 
             return visitEachChild(node, destructuringVisitor, context);
diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
index 89fa039100a..118b170b6a4 100644
--- a/src/compiler/transformers/ts.ts
+++ b/src/compiler/transformers/ts.ts
@@ -2353,9 +2353,11 @@ namespace ts {
         function transformInitializedVariable(node: VariableDeclaration): Expression {
             const name = node.name;
             if (isBindingPattern(name)) {
-                return flattenVariableDestructuringToExpression(
+                return flattenDestructuringToExpression(
+                    context,
                     node,
-                    hoistVariableDeclaration,
+                    /*needsValue*/ false,
+                    FlattenLevel.All,
                     createNamespaceExportExpression,
                     visitor
                 );
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index e8018083783..e0ba546fb96 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -506,6 +506,7 @@ namespace ts {
 
     export interface NodeArray<T extends Node> extends Array<T>, TextRange {
         hasTrailingComma?: boolean;
+        /* @internal */ transformFlags?: TransformFlags;
     }
 
     export interface Token<TKind extends SyntaxKind> extends Node {
@@ -3495,45 +3496,46 @@ namespace ts {
         // - Flags used to indicate that a node or subtree contains syntax that requires transformation.
         TypeScript = 1 << 0,
         ContainsTypeScript = 1 << 1,
-        Jsx = 1 << 2,
-        ContainsJsx = 1 << 3,
-        ESNext = 1 << 4,
-        ContainsESNext = 1 << 5,
-        ES2017 = 1 << 6,
-        ContainsES2017 = 1 << 7,
-        ES2016 = 1 << 8,
-        ContainsES2016 = 1 << 9,
-        ES2015 = 1 << 10,
-        ContainsES2015 = 1 << 11,
-        Generator = 1 << 12,
-        ContainsGenerator = 1 << 13,
-        DestructuringAssignment = 1 << 14,
-        ContainsDestructuringAssignment = 1 << 15,
+        ContainsJsx = 1 << 2,
+        ESNext = 1 << 3,
+        ContainsESNext = 1 << 4,
+        ContainsES2017 = 1 << 5,
+        ES2016 = 1 << 6,
+        ContainsES2016 = 1 << 7,
+        ES2015 = 1 << 8,
+        ContainsES2015 = 1 << 9,
+        Generator = 1 << 10,
+        ContainsGenerator = 1 << 11,
+        DestructuringAssignment = 1 << 12,
+        ContainsDestructuringAssignment = 1 << 13,
 
         // Markers
         // - Flags used to indicate that a subtree contains a specific transformation.
-        ContainsDecorators = 1 << 16,
-        ContainsPropertyInitializer = 1 << 17,
-        ContainsLexicalThis = 1 << 18,
-        ContainsCapturedLexicalThis = 1 << 19,
-        ContainsLexicalThisInComputedPropertyName = 1 << 20,
-        ContainsDefaultValueAssignments = 1 << 21,
-        ContainsParameterPropertyAssignments = 1 << 22,
-        ContainsSpreadExpression = 1 << 23,
-        ContainsComputedPropertyName = 1 << 24,
-        ContainsBlockScopedBinding = 1 << 25,
-        ContainsBindingPattern = 1 << 26,
-        ContainsYield = 1 << 27,
-        ContainsHoistedDeclarationOrCompletion = 1 << 28,
+        ContainsDecorators = 1 << 14,
+        ContainsPropertyInitializer = 1 << 15,
+        ContainsLexicalThis = 1 << 16,
+        ContainsCapturedLexicalThis = 1 << 17,
+        ContainsLexicalThisInComputedPropertyName = 1 << 18,
+        ContainsDefaultValueAssignments = 1 << 19,
+        ContainsParameterPropertyAssignments = 1 << 20,
+        ContainsSpread = 1 << 21,
+        ContainsRest = ContainsSpread,
+        ContainsObjectSpread = 1 << 22,
+        ContainsObjectRest = ContainsObjectSpread,
+        ContainsComputedPropertyName = 1 << 23,
+        ContainsBlockScopedBinding = 1 << 24,
+        ContainsBindingPattern = 1 << 25,
+        ContainsYield = 1 << 26,
+        ContainsHoistedDeclarationOrCompletion = 1 << 27,
 
         HasComputedFlags = 1 << 29, // Transform flags have been computed.
 
         // Assertions
         // - Bitmasks that are used to assert facts about the syntax of a node and its subtree.
         AssertTypeScript = TypeScript | ContainsTypeScript,
-        AssertJsx = Jsx | ContainsJsx,
+        AssertJsx = ContainsJsx,
         AssertESNext = ESNext | ContainsESNext,
-        AssertES2017 = ES2017 | ContainsES2017,
+        AssertES2017 = ContainsES2017,
         AssertES2016 = ES2016 | ContainsES2016,
         AssertES2015 = ES2015 | ContainsES2015,
         AssertGenerator = Generator | ContainsGenerator,
@@ -3542,18 +3544,20 @@ namespace ts {
         // Scope Exclusions
         // - Bitmasks that exclude flags from propagating out of a specific context
         //   into the subtree flags of their container.
-        NodeExcludes = TypeScript | Jsx | ESNext | ES2017 | ES2016 | ES2015 | DestructuringAssignment | Generator | HasComputedFlags,
-        ArrowFunctionExcludes = NodeExcludes | ContainsDecorators | ContainsDefaultValueAssignments | ContainsLexicalThis | ContainsParameterPropertyAssignments | ContainsBlockScopedBinding | ContainsYield | ContainsHoistedDeclarationOrCompletion,
-        FunctionExcludes = NodeExcludes | ContainsDecorators | ContainsDefaultValueAssignments | ContainsCapturedLexicalThis | ContainsLexicalThis | ContainsParameterPropertyAssignments | ContainsBlockScopedBinding | ContainsYield | ContainsHoistedDeclarationOrCompletion,
-        ConstructorExcludes = NodeExcludes | ContainsDefaultValueAssignments | ContainsLexicalThis | ContainsCapturedLexicalThis | ContainsBlockScopedBinding | ContainsYield | ContainsHoistedDeclarationOrCompletion,
-        MethodOrAccessorExcludes = NodeExcludes | ContainsDefaultValueAssignments | ContainsLexicalThis | ContainsCapturedLexicalThis | ContainsBlockScopedBinding | ContainsYield | ContainsHoistedDeclarationOrCompletion,
+        NodeExcludes = TypeScript | ESNext | ES2016 | ES2015 | DestructuringAssignment | Generator | HasComputedFlags,
+        ArrowFunctionExcludes = NodeExcludes | ContainsDecorators | ContainsDefaultValueAssignments | ContainsLexicalThis | ContainsParameterPropertyAssignments | ContainsBlockScopedBinding | ContainsYield | ContainsHoistedDeclarationOrCompletion | ContainsBindingPattern | ContainsObjectRest,
+        FunctionExcludes = NodeExcludes | ContainsDecorators | ContainsDefaultValueAssignments | ContainsCapturedLexicalThis | ContainsLexicalThis | ContainsParameterPropertyAssignments | ContainsBlockScopedBinding | ContainsYield | ContainsHoistedDeclarationOrCompletion | ContainsBindingPattern | ContainsObjectRest,
+        ConstructorExcludes = NodeExcludes | ContainsDefaultValueAssignments | ContainsLexicalThis | ContainsCapturedLexicalThis | ContainsBlockScopedBinding | ContainsYield | ContainsHoistedDeclarationOrCompletion | ContainsBindingPattern | ContainsObjectRest,
+        MethodOrAccessorExcludes = NodeExcludes | ContainsDefaultValueAssignments | ContainsLexicalThis | ContainsCapturedLexicalThis | ContainsBlockScopedBinding | ContainsYield | ContainsHoistedDeclarationOrCompletion | ContainsBindingPattern | ContainsObjectRest,
         ClassExcludes = NodeExcludes | ContainsDecorators | ContainsPropertyInitializer | ContainsLexicalThis | ContainsCapturedLexicalThis | ContainsComputedPropertyName | ContainsParameterPropertyAssignments | ContainsLexicalThisInComputedPropertyName,
         ModuleExcludes = NodeExcludes | ContainsDecorators | ContainsLexicalThis | ContainsCapturedLexicalThis | ContainsBlockScopedBinding | ContainsHoistedDeclarationOrCompletion,
         TypeExcludes = ~ContainsTypeScript,
-        ObjectLiteralExcludes = NodeExcludes | ContainsDecorators | ContainsComputedPropertyName | ContainsLexicalThisInComputedPropertyName,
-        ArrayLiteralOrCallOrNewExcludes = NodeExcludes | ContainsSpreadExpression,
-        VariableDeclarationListExcludes = NodeExcludes | ContainsBindingPattern,
-        ParameterExcludes = NodeExcludes | ContainsBindingPattern,
+        ObjectLiteralExcludes = NodeExcludes | ContainsDecorators | ContainsComputedPropertyName | ContainsLexicalThisInComputedPropertyName | ContainsObjectSpread,
+        ArrayLiteralOrCallOrNewExcludes = NodeExcludes | ContainsSpread,
+        VariableDeclarationListExcludes = NodeExcludes | ContainsBindingPattern | ContainsObjectSpread,
+        ParameterExcludes = NodeExcludes,
+        CatchClauseExcludes = NodeExcludes | ContainsObjectSpread,
+        BindingPatternExcludes = NodeExcludes | ContainsSpread,
 
         // Masks
         // - Additional bitmasks
@@ -3622,7 +3626,6 @@ namespace ts {
         endLexicalEnvironment(): Statement[];
     }
 
-
     export interface TextSpan {
         start: number;
         length: number;
diff --git a/src/compiler/visitor.ts b/src/compiler/visitor.ts
index ebb3ec01ed3..825e0b45e45 100644
--- a/src/compiler/visitor.ts
+++ b/src/compiler/visitor.ts
@@ -99,20 +99,26 @@ namespace ts {
         return node ? f(initial, node) : initial;
     }
 
+    function reduceNodeArray<T>(nodes: Node[], f: (memo: T, nodes: Node[]) => T, initial: T) {
+        return nodes ? f(initial, nodes) : initial;
+    }
+
     /**
      * Similar to `reduceLeft`, performs a reduction against each child of a node.
      * NOTE: Unlike `forEachChild`, this does *not* visit every node. Only nodes added to the
      *       `nodeEdgeTraversalMap` above will be visited.
      *
      * @param node The node containing the children to reduce.
-     * @param f The callback function
      * @param initial The initial value to supply to the reduction.
+     * @param f The callback function
      */
-    export function reduceEachChild<T>(node: Node, f: (memo: T, node: Node) => T, initial: T): T {
+    export function reduceEachChild<T>(node: Node, initial: T, cbNode: (memo: T, node: Node) => T, cbNodeArray?: (memo: T, nodes: Node[]) => T): T {
         if (node === undefined) {
             return initial;
         }
 
+        const reduceNodes: (nodes: Node[], f: (memo: T, node: Node | Node[]) => T, initial: T) => T = cbNodeArray ? reduceNodeArray : reduceLeft;
+        const cbNodes = cbNodeArray || cbNode;
         const kind = node.kind;
 
         // No need to visit nodes with no children.
@@ -138,127 +144,127 @@ namespace ts {
 
             // Names
             case SyntaxKind.ComputedPropertyName:
-                result = reduceNode((<ComputedPropertyName>node).expression, f, result);
+                result = reduceNode((<ComputedPropertyName>node).expression, cbNode, result);
                 break;
 
             // Signature elements
             case SyntaxKind.Parameter:
-                result = reduceLeft((<ParameterDeclaration>node).decorators, f, result);
-                result = reduceLeft((<ParameterDeclaration>node).modifiers, f, result);
-                result = reduceNode((<ParameterDeclaration>node).name, f, result);
-                result = reduceNode((<ParameterDeclaration>node).type, f, result);
-                result = reduceNode((<ParameterDeclaration>node).initializer, f, result);
+                result = reduceNodes((<ParameterDeclaration>node).decorators, cbNodes, result);
+                result = reduceNodes((<ParameterDeclaration>node).modifiers, cbNodes, result);
+                result = reduceNode((<ParameterDeclaration>node).name, cbNode, result);
+                result = reduceNode((<ParameterDeclaration>node).type, cbNode, result);
+                result = reduceNode((<ParameterDeclaration>node).initializer, cbNode, result);
                 break;
 
             case SyntaxKind.Decorator:
-                result = reduceNode((<Decorator>node).expression, f, result);
+                result = reduceNode((<Decorator>node).expression, cbNode, result);
                 break;
 
             // Type member
             case SyntaxKind.PropertyDeclaration:
-                result = reduceLeft((<PropertyDeclaration>node).decorators, f, result);
-                result = reduceLeft((<PropertyDeclaration>node).modifiers, f, result);
-                result = reduceNode((<PropertyDeclaration>node).name, f, result);
-                result = reduceNode((<PropertyDeclaration>node).type, f, result);
-                result = reduceNode((<PropertyDeclaration>node).initializer, f, result);
+                result = reduceNodes((<PropertyDeclaration>node).decorators, cbNodes, result);
+                result = reduceNodes((<PropertyDeclaration>node).modifiers, cbNodes, result);
+                result = reduceNode((<PropertyDeclaration>node).name, cbNode, result);
+                result = reduceNode((<PropertyDeclaration>node).type, cbNode, result);
+                result = reduceNode((<PropertyDeclaration>node).initializer, cbNode, result);
                 break;
 
             case SyntaxKind.MethodDeclaration:
-                result = reduceLeft((<MethodDeclaration>node).decorators, f, result);
-                result = reduceLeft((<MethodDeclaration>node).modifiers, f, result);
-                result = reduceNode((<MethodDeclaration>node).name, f, result);
-                result = reduceLeft((<MethodDeclaration>node).typeParameters, f, result);
-                result = reduceLeft((<MethodDeclaration>node).parameters, f, result);
-                result = reduceNode((<MethodDeclaration>node).type, f, result);
-                result = reduceNode((<MethodDeclaration>node).body, f, result);
+                result = reduceNodes((<MethodDeclaration>node).decorators, cbNodes, result);
+                result = reduceNodes((<MethodDeclaration>node).modifiers, cbNodes, result);
+                result = reduceNode((<MethodDeclaration>node).name, cbNode, result);
+                result = reduceNodes((<MethodDeclaration>node).typeParameters, cbNodes, result);
+                result = reduceNodes((<MethodDeclaration>node).parameters, cbNodes, result);
+                result = reduceNode((<MethodDeclaration>node).type, cbNode, result);
+                result = reduceNode((<MethodDeclaration>node).body, cbNode, result);
                 break;
 
             case SyntaxKind.Constructor:
-                result = reduceLeft((<ConstructorDeclaration>node).modifiers, f, result);
-                result = reduceLeft((<ConstructorDeclaration>node).parameters, f, result);
-                result = reduceNode((<ConstructorDeclaration>node).body, f, result);
+                result = reduceNodes((<ConstructorDeclaration>node).modifiers, cbNodes, result);
+                result = reduceNodes((<ConstructorDeclaration>node).parameters, cbNodes, result);
+                result = reduceNode((<ConstructorDeclaration>node).body, cbNode, result);
                 break;
 
             case SyntaxKind.GetAccessor:
-                result = reduceLeft((<GetAccessorDeclaration>node).decorators, f, result);
-                result = reduceLeft((<GetAccessorDeclaration>node).modifiers, f, result);
-                result = reduceNode((<GetAccessorDeclaration>node).name, f, result);
-                result = reduceLeft((<GetAccessorDeclaration>node).parameters, f, result);
-                result = reduceNode((<GetAccessorDeclaration>node).type, f, result);
-                result = reduceNode((<GetAccessorDeclaration>node).body, f, result);
+                result = reduceNodes((<GetAccessorDeclaration>node).decorators, cbNodes, result);
+                result = reduceNodes((<GetAccessorDeclaration>node).modifiers, cbNodes, result);
+                result = reduceNode((<GetAccessorDeclaration>node).name, cbNode, result);
+                result = reduceNodes((<GetAccessorDeclaration>node).parameters, cbNodes, result);
+                result = reduceNode((<GetAccessorDeclaration>node).type, cbNode, result);
+                result = reduceNode((<GetAccessorDeclaration>node).body, cbNode, result);
                 break;
 
             case SyntaxKind.SetAccessor:
-                result = reduceLeft((<GetAccessorDeclaration>node).decorators, f, result);
-                result = reduceLeft((<GetAccessorDeclaration>node).modifiers, f, result);
-                result = reduceNode((<GetAccessorDeclaration>node).name, f, result);
-                result = reduceLeft((<GetAccessorDeclaration>node).parameters, f, result);
-                result = reduceNode((<GetAccessorDeclaration>node).body, f, result);
+                result = reduceNodes((<GetAccessorDeclaration>node).decorators, cbNodes, result);
+                result = reduceNodes((<GetAccessorDeclaration>node).modifiers, cbNodes, result);
+                result = reduceNode((<GetAccessorDeclaration>node).name, cbNode, result);
+                result = reduceNodes((<GetAccessorDeclaration>node).parameters, cbNodes, result);
+                result = reduceNode((<GetAccessorDeclaration>node).body, cbNode, result);
                 break;
 
             // Binding patterns
             case SyntaxKind.ObjectBindingPattern:
             case SyntaxKind.ArrayBindingPattern:
-                result = reduceLeft((<BindingPattern>node).elements, f, result);
+                result = reduceNodes((<BindingPattern>node).elements, cbNodes, result);
                 break;
 
             case SyntaxKind.BindingElement:
-                result = reduceNode((<BindingElement>node).propertyName, f, result);
-                result = reduceNode((<BindingElement>node).name, f, result);
-                result = reduceNode((<BindingElement>node).initializer, f, result);
+                result = reduceNode((<BindingElement>node).propertyName, cbNode, result);
+                result = reduceNode((<BindingElement>node).name, cbNode, result);
+                result = reduceNode((<BindingElement>node).initializer, cbNode, result);
                 break;
 
             // Expression
             case SyntaxKind.ArrayLiteralExpression:
-                result = reduceLeft((<ArrayLiteralExpression>node).elements, f, result);
+                result = reduceNodes((<ArrayLiteralExpression>node).elements, cbNodes, result);
                 break;
 
             case SyntaxKind.ObjectLiteralExpression:
-                result = reduceLeft((<ObjectLiteralExpression>node).properties, f, result);
+                result = reduceNodes((<ObjectLiteralExpression>node).properties, cbNodes, result);
                 break;
 
             case SyntaxKind.PropertyAccessExpression:
-                result = reduceNode((<PropertyAccessExpression>node).expression, f, result);
-                result = reduceNode((<PropertyAccessExpression>node).name, f, result);
+                result = reduceNode((<PropertyAccessExpression>node).expression, cbNode, result);
+                result = reduceNode((<PropertyAccessExpression>node).name, cbNode, result);
                 break;
 
             case SyntaxKind.ElementAccessExpression:
-                result = reduceNode((<ElementAccessExpression>node).expression, f, result);
-                result = reduceNode((<ElementAccessExpression>node).argumentExpression, f, result);
+                result = reduceNode((<ElementAccessExpression>node).expression, cbNode, result);
+                result = reduceNode((<ElementAccessExpression>node).argumentExpression, cbNode, result);
                 break;
 
             case SyntaxKind.CallExpression:
-                result = reduceNode((<CallExpression>node).expression, f, result);
-                result = reduceLeft((<CallExpression>node).typeArguments, f, result);
-                result = reduceLeft((<CallExpression>node).arguments, f, result);
+                result = reduceNode((<CallExpression>node).expression, cbNode, result);
+                result = reduceNodes((<CallExpression>node).typeArguments, cbNodes, result);
+                result = reduceNodes((<CallExpression>node).arguments, cbNodes, result);
                 break;
 
             case SyntaxKind.NewExpression:
-                result = reduceNode((<NewExpression>node).expression, f, result);
-                result = reduceLeft((<NewExpression>node).typeArguments, f, result);
-                result = reduceLeft((<NewExpression>node).arguments, f, result);
+                result = reduceNode((<NewExpression>node).expression, cbNode, result);
+                result = reduceNodes((<NewExpression>node).typeArguments, cbNodes, result);
+                result = reduceNodes((<NewExpression>node).arguments, cbNodes, result);
                 break;
 
             case SyntaxKind.TaggedTemplateExpression:
-                result = reduceNode((<TaggedTemplateExpression>node).tag, f, result);
-                result = reduceNode((<TaggedTemplateExpression>node).template, f, result);
+                result = reduceNode((<TaggedTemplateExpression>node).tag, cbNode, result);
+                result = reduceNode((<TaggedTemplateExpression>node).template, cbNode, result);
                 break;
 
             case SyntaxKind.FunctionExpression:
-                result = reduceLeft((<FunctionExpression>node).modifiers, f, result);
-                result = reduceNode((<FunctionExpression>node).name, f, result);
-                result = reduceLeft((<FunctionExpression>node).typeParameters, f, result);
-                result = reduceLeft((<FunctionExpression>node).parameters, f, result);
-                result = reduceNode((<FunctionExpression>node).type, f, result);
-                result = reduceNode((<FunctionExpression>node).body, f, result);
+                result = reduceNodes((<FunctionExpression>node).modifiers, cbNodes, result);
+                result = reduceNode((<FunctionExpression>node).name, cbNode, result);
+                result = reduceNodes((<FunctionExpression>node).typeParameters, cbNodes, result);
+                result = reduceNodes((<FunctionExpression>node).parameters, cbNodes, result);
+                result = reduceNode((<FunctionExpression>node).type, cbNode, result);
+                result = reduceNode((<FunctionExpression>node).body, cbNode, result);
                 break;
 
             case SyntaxKind.ArrowFunction:
-                result = reduceLeft((<ArrowFunction>node).modifiers, f, result);
-                result = reduceLeft((<ArrowFunction>node).typeParameters, f, result);
-                result = reduceLeft((<ArrowFunction>node).parameters, f, result);
-                result = reduceNode((<ArrowFunction>node).type, f, result);
-                result = reduceNode((<ArrowFunction>node).body, f, result);
+                result = reduceNodes((<ArrowFunction>node).modifiers, cbNodes, result);
+                result = reduceNodes((<ArrowFunction>node).typeParameters, cbNodes, result);
+                result = reduceNodes((<ArrowFunction>node).parameters, cbNodes, result);
+                result = reduceNode((<ArrowFunction>node).type, cbNode, result);
+                result = reduceNode((<ArrowFunction>node).body, cbNode, result);
                 break;
 
             case SyntaxKind.ParenthesizedExpression:
@@ -269,258 +275,258 @@ namespace ts {
             case SyntaxKind.YieldExpression:
             case SyntaxKind.SpreadElement:
             case SyntaxKind.NonNullExpression:
-                result = reduceNode((<ParenthesizedExpression | DeleteExpression | TypeOfExpression | VoidExpression | AwaitExpression | YieldExpression | SpreadElement | NonNullExpression>node).expression, f, result);
+                result = reduceNode((<ParenthesizedExpression | DeleteExpression | TypeOfExpression | VoidExpression | AwaitExpression | YieldExpression | SpreadElement | NonNullExpression>node).expression, cbNode, result);
                 break;
 
             case SyntaxKind.PrefixUnaryExpression:
             case SyntaxKind.PostfixUnaryExpression:
-                result = reduceNode((<PrefixUnaryExpression | PostfixUnaryExpression>node).operand, f, result);
+                result = reduceNode((<PrefixUnaryExpression | PostfixUnaryExpression>node).operand, cbNode, result);
                 break;
 
             case SyntaxKind.BinaryExpression:
-                result = reduceNode((<BinaryExpression>node).left, f, result);
-                result = reduceNode((<BinaryExpression>node).right, f, result);
+                result = reduceNode((<BinaryExpression>node).left, cbNode, result);
+                result = reduceNode((<BinaryExpression>node).right, cbNode, result);
                 break;
 
             case SyntaxKind.ConditionalExpression:
-                result = reduceNode((<ConditionalExpression>node).condition, f, result);
-                result = reduceNode((<ConditionalExpression>node).whenTrue, f, result);
-                result = reduceNode((<ConditionalExpression>node).whenFalse, f, result);
+                result = reduceNode((<ConditionalExpression>node).condition, cbNode, result);
+                result = reduceNode((<ConditionalExpression>node).whenTrue, cbNode, result);
+                result = reduceNode((<ConditionalExpression>node).whenFalse, cbNode, result);
                 break;
 
             case SyntaxKind.TemplateExpression:
-                result = reduceNode((<TemplateExpression>node).head, f, result);
-                result = reduceLeft((<TemplateExpression>node).templateSpans, f, result);
+                result = reduceNode((<TemplateExpression>node).head, cbNode, result);
+                result = reduceNodes((<TemplateExpression>node).templateSpans, cbNodes, result);
                 break;
 
             case SyntaxKind.ClassExpression:
-                result = reduceLeft((<ClassExpression>node).modifiers, f, result);
-                result = reduceNode((<ClassExpression>node).name, f, result);
-                result = reduceLeft((<ClassExpression>node).typeParameters, f, result);
-                result = reduceLeft((<ClassExpression>node).heritageClauses, f, result);
-                result = reduceLeft((<ClassExpression>node).members, f, result);
+                result = reduceNodes((<ClassExpression>node).modifiers, cbNodes, result);
+                result = reduceNode((<ClassExpression>node).name, cbNode, result);
+                result = reduceNodes((<ClassExpression>node).typeParameters, cbNodes, result);
+                result = reduceNodes((<ClassExpression>node).heritageClauses, cbNodes, result);
+                result = reduceNodes((<ClassExpression>node).members, cbNodes, result);
                 break;
 
             case SyntaxKind.ExpressionWithTypeArguments:
-                result = reduceNode((<ExpressionWithTypeArguments>node).expression, f, result);
-                result = reduceLeft((<ExpressionWithTypeArguments>node).typeArguments, f, result);
+                result = reduceNode((<ExpressionWithTypeArguments>node).expression, cbNode, result);
+                result = reduceNodes((<ExpressionWithTypeArguments>node).typeArguments, cbNodes, result);
                 break;
 
             // Misc
             case SyntaxKind.TemplateSpan:
-                result = reduceNode((<TemplateSpan>node).expression, f, result);
-                result = reduceNode((<TemplateSpan>node).literal, f, result);
+                result = reduceNode((<TemplateSpan>node).expression, cbNode, result);
+                result = reduceNode((<TemplateSpan>node).literal, cbNode, result);
                 break;
 
             // Element
             case SyntaxKind.Block:
-                result = reduceLeft((<Block>node).statements, f, result);
+                result = reduceNodes((<Block>node).statements, cbNodes, result);
                 break;
 
             case SyntaxKind.VariableStatement:
-                result = reduceLeft((<VariableStatement>node).modifiers, f, result);
-                result = reduceNode((<VariableStatement>node).declarationList, f, result);
+                result = reduceNodes((<VariableStatement>node).modifiers, cbNodes, result);
+                result = reduceNode((<VariableStatement>node).declarationList, cbNode, result);
                 break;
 
             case SyntaxKind.ExpressionStatement:
-                result = reduceNode((<ExpressionStatement>node).expression, f, result);
+                result = reduceNode((<ExpressionStatement>node).expression, cbNode, result);
                 break;
 
             case SyntaxKind.IfStatement:
-                result = reduceNode((<IfStatement>node).expression, f, result);
-                result = reduceNode((<IfStatement>node).thenStatement, f, result);
-                result = reduceNode((<IfStatement>node).elseStatement, f, result);
+                result = reduceNode((<IfStatement>node).expression, cbNode, result);
+                result = reduceNode((<IfStatement>node).thenStatement, cbNode, result);
+                result = reduceNode((<IfStatement>node).elseStatement, cbNode, result);
                 break;
 
             case SyntaxKind.DoStatement:
-                result = reduceNode((<DoStatement>node).statement, f, result);
-                result = reduceNode((<DoStatement>node).expression, f, result);
+                result = reduceNode((<DoStatement>node).statement, cbNode, result);
+                result = reduceNode((<DoStatement>node).expression, cbNode, result);
                 break;
 
             case SyntaxKind.WhileStatement:
             case SyntaxKind.WithStatement:
-                result = reduceNode((<WhileStatement | WithStatement>node).expression, f, result);
-                result = reduceNode((<WhileStatement | WithStatement>node).statement, f, result);
+                result = reduceNode((<WhileStatement | WithStatement>node).expression, cbNode, result);
+                result = reduceNode((<WhileStatement | WithStatement>node).statement, cbNode, result);
                 break;
 
             case SyntaxKind.ForStatement:
-                result = reduceNode((<ForStatement>node).initializer, f, result);
-                result = reduceNode((<ForStatement>node).condition, f, result);
-                result = reduceNode((<ForStatement>node).incrementor, f, result);
-                result = reduceNode((<ForStatement>node).statement, f, result);
+                result = reduceNode((<ForStatement>node).initializer, cbNode, result);
+                result = reduceNode((<ForStatement>node).condition, cbNode, result);
+                result = reduceNode((<ForStatement>node).incrementor, cbNode, result);
+                result = reduceNode((<ForStatement>node).statement, cbNode, result);
                 break;
 
             case SyntaxKind.ForInStatement:
             case SyntaxKind.ForOfStatement:
-                result = reduceNode((<ForInStatement | ForOfStatement>node).initializer, f, result);
-                result = reduceNode((<ForInStatement | ForOfStatement>node).expression, f, result);
-                result = reduceNode((<ForInStatement | ForOfStatement>node).statement, f, result);
+                result = reduceNode((<ForInStatement | ForOfStatement>node).initializer, cbNode, result);
+                result = reduceNode((<ForInStatement | ForOfStatement>node).expression, cbNode, result);
+                result = reduceNode((<ForInStatement | ForOfStatement>node).statement, cbNode, result);
                 break;
 
             case SyntaxKind.ReturnStatement:
             case SyntaxKind.ThrowStatement:
-                result = reduceNode((<ReturnStatement>node).expression, f, result);
+                result = reduceNode((<ReturnStatement>node).expression, cbNode, result);
                 break;
 
             case SyntaxKind.SwitchStatement:
-                result = reduceNode((<SwitchStatement>node).expression, f, result);
-                result = reduceNode((<SwitchStatement>node).caseBlock, f, result);
+                result = reduceNode((<SwitchStatement>node).expression, cbNode, result);
+                result = reduceNode((<SwitchStatement>node).caseBlock, cbNode, result);
                 break;
 
             case SyntaxKind.LabeledStatement:
-                result = reduceNode((<LabeledStatement>node).label, f, result);
-                result = reduceNode((<LabeledStatement>node).statement, f, result);
+                result = reduceNode((<LabeledStatement>node).label, cbNode, result);
+                result = reduceNode((<LabeledStatement>node).statement, cbNode, result);
                 break;
 
             case SyntaxKind.TryStatement:
-                result = reduceNode((<TryStatement>node).tryBlock, f, result);
-                result = reduceNode((<TryStatement>node).catchClause, f, result);
-                result = reduceNode((<TryStatement>node).finallyBlock, f, result);
+                result = reduceNode((<TryStatement>node).tryBlock, cbNode, result);
+                result = reduceNode((<TryStatement>node).catchClause, cbNode, result);
+                result = reduceNode((<TryStatement>node).finallyBlock, cbNode, result);
                 break;
 
             case SyntaxKind.VariableDeclaration:
-                result = reduceNode((<VariableDeclaration>node).name, f, result);
-                result = reduceNode((<VariableDeclaration>node).type, f, result);
-                result = reduceNode((<VariableDeclaration>node).initializer, f, result);
+                result = reduceNode((<VariableDeclaration>node).name, cbNode, result);
+                result = reduceNode((<VariableDeclaration>node).type, cbNode, result);
+                result = reduceNode((<VariableDeclaration>node).initializer, cbNode, result);
                 break;
 
             case SyntaxKind.VariableDeclarationList:
-                result = reduceLeft((<VariableDeclarationList>node).declarations, f, result);
+                result = reduceNodes((<VariableDeclarationList>node).declarations, cbNodes, result);
                 break;
 
             case SyntaxKind.FunctionDeclaration:
-                result = reduceLeft((<FunctionDeclaration>node).decorators, f, result);
-                result = reduceLeft((<FunctionDeclaration>node).modifiers, f, result);
-                result = reduceNode((<FunctionDeclaration>node).name, f, result);
-                result = reduceLeft((<FunctionDeclaration>node).typeParameters, f, result);
-                result = reduceLeft((<FunctionDeclaration>node).parameters, f, result);
-                result = reduceNode((<FunctionDeclaration>node).type, f, result);
-                result = reduceNode((<FunctionDeclaration>node).body, f, result);
+                result = reduceNodes((<FunctionDeclaration>node).decorators, cbNodes, result);
+                result = reduceNodes((<FunctionDeclaration>node).modifiers, cbNodes, result);
+                result = reduceNode((<FunctionDeclaration>node).name, cbNode, result);
+                result = reduceNodes((<FunctionDeclaration>node).typeParameters, cbNodes, result);
+                result = reduceNodes((<FunctionDeclaration>node).parameters, cbNodes, result);
+                result = reduceNode((<FunctionDeclaration>node).type, cbNode, result);
+                result = reduceNode((<FunctionDeclaration>node).body, cbNode, result);
                 break;
 
             case SyntaxKind.ClassDeclaration:
-                result = reduceLeft((<ClassDeclaration>node).decorators, f, result);
-                result = reduceLeft((<ClassDeclaration>node).modifiers, f, result);
-                result = reduceNode((<ClassDeclaration>node).name, f, result);
-                result = reduceLeft((<ClassDeclaration>node).typeParameters, f, result);
-                result = reduceLeft((<ClassDeclaration>node).heritageClauses, f, result);
-                result = reduceLeft((<ClassDeclaration>node).members, f, result);
+                result = reduceNodes((<ClassDeclaration>node).decorators, cbNodes, result);
+                result = reduceNodes((<ClassDeclaration>node).modifiers, cbNodes, result);
+                result = reduceNode((<ClassDeclaration>node).name, cbNode, result);
+                result = reduceNodes((<ClassDeclaration>node).typeParameters, cbNodes, result);
+                result = reduceNodes((<ClassDeclaration>node).heritageClauses, cbNodes, result);
+                result = reduceNodes((<ClassDeclaration>node).members, cbNodes, result);
                 break;
 
             case SyntaxKind.CaseBlock:
-                result = reduceLeft((<CaseBlock>node).clauses, f, result);
+                result = reduceNodes((<CaseBlock>node).clauses, cbNodes, result);
                 break;
 
             case SyntaxKind.ImportDeclaration:
-                result = reduceLeft((<ImportDeclaration>node).decorators, f, result);
-                result = reduceLeft((<ImportDeclaration>node).modifiers, f, result);
-                result = reduceNode((<ImportDeclaration>node).importClause, f, result);
-                result = reduceNode((<ImportDeclaration>node).moduleSpecifier, f, result);
+                result = reduceNodes((<ImportDeclaration>node).decorators, cbNodes, result);
+                result = reduceNodes((<ImportDeclaration>node).modifiers, cbNodes, result);
+                result = reduceNode((<ImportDeclaration>node).importClause, cbNode, result);
+                result = reduceNode((<ImportDeclaration>node).moduleSpecifier, cbNode, result);
                 break;
 
             case SyntaxKind.ImportClause:
-                result = reduceNode((<ImportClause>node).name, f, result);
-                result = reduceNode((<ImportClause>node).namedBindings, f, result);
+                result = reduceNode((<ImportClause>node).name, cbNode, result);
+                result = reduceNode((<ImportClause>node).namedBindings, cbNode, result);
                 break;
 
             case SyntaxKind.NamespaceImport:
-                result = reduceNode((<NamespaceImport>node).name, f, result);
+                result = reduceNode((<NamespaceImport>node).name, cbNode, result);
                 break;
 
             case SyntaxKind.NamedImports:
             case SyntaxKind.NamedExports:
-                result = reduceLeft((<NamedImports | NamedExports>node).elements, f, result);
+                result = reduceNodes((<NamedImports | NamedExports>node).elements, cbNodes, result);
                 break;
 
             case SyntaxKind.ImportSpecifier:
             case SyntaxKind.ExportSpecifier:
-                result = reduceNode((<ImportSpecifier | ExportSpecifier>node).propertyName, f, result);
-                result = reduceNode((<ImportSpecifier | ExportSpecifier>node).name, f, result);
+                result = reduceNode((<ImportSpecifier | ExportSpecifier>node).propertyName, cbNode, result);
+                result = reduceNode((<ImportSpecifier | ExportSpecifier>node).name, cbNode, result);
                 break;
 
             case SyntaxKind.ExportAssignment:
-                result = reduceLeft((<ExportAssignment>node).decorators, f, result);
-                result = reduceLeft((<ExportAssignment>node).modifiers, f, result);
-                result = reduceNode((<ExportAssignment>node).expression, f, result);
+                result = reduceLeft((<ExportAssignment>node).decorators, cbNode, result);
+                result = reduceLeft((<ExportAssignment>node).modifiers, cbNode, result);
+                result = reduceNode((<ExportAssignment>node).expression, cbNode, result);
                 break;
 
             case SyntaxKind.ExportDeclaration:
-                result = reduceLeft((<ExportDeclaration>node).decorators, f, result);
-                result = reduceLeft((<ExportDeclaration>node).modifiers, f, result);
-                result = reduceNode((<ExportDeclaration>node).exportClause, f, result);
-                result = reduceNode((<ExportDeclaration>node).moduleSpecifier, f, result);
+                result = reduceLeft((<ExportDeclaration>node).decorators, cbNode, result);
+                result = reduceLeft((<ExportDeclaration>node).modifiers, cbNode, result);
+                result = reduceNode((<ExportDeclaration>node).exportClause, cbNode, result);
+                result = reduceNode((<ExportDeclaration>node).moduleSpecifier, cbNode, result);
                 break;
 
             // JSX
             case SyntaxKind.JsxElement:
-                result = reduceNode((<JsxElement>node).openingElement, f, result);
-                result = reduceLeft((<JsxElement>node).children, f, result);
-                result = reduceNode((<JsxElement>node).closingElement, f, result);
+                result = reduceNode((<JsxElement>node).openingElement, cbNode, result);
+                result = reduceLeft((<JsxElement>node).children, cbNode, result);
+                result = reduceNode((<JsxElement>node).closingElement, cbNode, result);
                 break;
 
             case SyntaxKind.JsxSelfClosingElement:
             case SyntaxKind.JsxOpeningElement:
-                result = reduceNode((<JsxSelfClosingElement | JsxOpeningElement>node).tagName, f, result);
-                result = reduceLeft((<JsxSelfClosingElement | JsxOpeningElement>node).attributes, f, result);
+                result = reduceNode((<JsxSelfClosingElement | JsxOpeningElement>node).tagName, cbNode, result);
+                result = reduceNodes((<JsxSelfClosingElement | JsxOpeningElement>node).attributes, cbNodes, result);
                 break;
 
             case SyntaxKind.JsxClosingElement:
-                result = reduceNode((<JsxClosingElement>node).tagName, f, result);
+                result = reduceNode((<JsxClosingElement>node).tagName, cbNode, result);
                 break;
 
             case SyntaxKind.JsxAttribute:
-                result = reduceNode((<JsxAttribute>node).name, f, result);
-                result = reduceNode((<JsxAttribute>node).initializer, f, result);
+                result = reduceNode((<JsxAttribute>node).name, cbNode, result);
+                result = reduceNode((<JsxAttribute>node).initializer, cbNode, result);
                 break;
 
             case SyntaxKind.JsxSpreadAttribute:
-                result = reduceNode((<JsxSpreadAttribute>node).expression, f, result);
+                result = reduceNode((<JsxSpreadAttribute>node).expression, cbNode, result);
                 break;
 
             case SyntaxKind.JsxExpression:
-                result = reduceNode((<JsxExpression>node).expression, f, result);
+                result = reduceNode((<JsxExpression>node).expression, cbNode, result);
                 break;
 
             // Clauses
             case SyntaxKind.CaseClause:
-                result = reduceNode((<CaseClause>node).expression, f, result);
+                result = reduceNode((<CaseClause>node).expression, cbNode, result);
                 // fall-through
 
             case SyntaxKind.DefaultClause:
-                result = reduceLeft((<CaseClause | DefaultClause>node).statements, f, result);
+                result = reduceNodes((<CaseClause | DefaultClause>node).statements, cbNodes, result);
                 break;
 
             case SyntaxKind.HeritageClause:
-                result = reduceLeft((<HeritageClause>node).types, f, result);
+                result = reduceNodes((<HeritageClause>node).types, cbNodes, result);
                 break;
 
             case SyntaxKind.CatchClause:
-                result = reduceNode((<CatchClause>node).variableDeclaration, f, result);
-                result = reduceNode((<CatchClause>node).block, f, result);
+                result = reduceNode((<CatchClause>node).variableDeclaration, cbNode, result);
+                result = reduceNode((<CatchClause>node).block, cbNode, result);
                 break;
 
             // Property assignments
             case SyntaxKind.PropertyAssignment:
-                result = reduceNode((<PropertyAssignment>node).name, f, result);
-                result = reduceNode((<PropertyAssignment>node).initializer, f, result);
+                result = reduceNode((<PropertyAssignment>node).name, cbNode, result);
+                result = reduceNode((<PropertyAssignment>node).initializer, cbNode, result);
                 break;
 
             case SyntaxKind.ShorthandPropertyAssignment:
-                result = reduceNode((<ShorthandPropertyAssignment>node).name, f, result);
-                result = reduceNode((<ShorthandPropertyAssignment>node).objectAssignmentInitializer, f, result);
+                result = reduceNode((<ShorthandPropertyAssignment>node).name, cbNode, result);
+                result = reduceNode((<ShorthandPropertyAssignment>node).objectAssignmentInitializer, cbNode, result);
                 break;
 
             case SyntaxKind.SpreadAssignment:
-                result = reduceNode((node as SpreadAssignment).expression, f, result);
+                result = reduceNode((node as SpreadAssignment).expression, cbNode, result);
                 break;
 
             // Top-level nodes
             case SyntaxKind.SourceFile:
-                result = reduceLeft((<SourceFile>node).statements, f, result);
+                result = reduceNodes((<SourceFile>node).statements, cbNodes, result);
                 break;
 
             case SyntaxKind.PartiallyEmittedExpression:
-                result = reduceNode((<PartiallyEmittedExpression>node).expression, f, result);
+                result = reduceNode((<PartiallyEmittedExpression>node).expression, cbNode, result);
                 break;
 
             default:
@@ -530,8 +536,8 @@ namespace ts {
                         const value = (<MapLike<any>>node)[edge.name];
                         if (value !== undefined) {
                             result = isArray(value)
-                                ? reduceLeft(<NodeArray<Node>>value, f, result)
-                                : f(result, <Node>value);
+                                ? reduceNodes(<NodeArray<Node>>value, cbNodes, result)
+                                : cbNode(result, <Node>value);
                         }
                     }
                 }
@@ -553,8 +559,8 @@ namespace ts {
     export function visitNode<T extends Node>(node: T, visitor: (node: Node) => VisitResult<Node>, test: (node: Node) => boolean, optional?: boolean, lift?: (node: NodeArray<Node>) => T): T;
     export function visitNode<T extends Node>(node: T, visitor: (node: Node) => VisitResult<Node>, test: (node: Node) => boolean, optional: boolean, lift: (node: NodeArray<Node>) => T, parenthesize: (node: Node, parentNode: Node) => Node, parentNode: Node): T;
     export function visitNode(node: Node, visitor: (node: Node) => VisitResult<Node>, test: (node: Node) => boolean, optional?: boolean, lift?: (node: Node[]) => Node, parenthesize?: (node: Node, parentNode: Node) => Node, parentNode?: Node): Node {
-        if (node === undefined) {
-            return undefined;
+        if (node === undefined || visitor === undefined) {
+            return node;
         }
 
         aggregateTransformFlags(node);
@@ -659,6 +665,30 @@ namespace ts {
         return updated || nodes;
     }
 
+    export function visitLexicalEnvironment(nodes: NodeArray<Statement>, visitor: (node: Node) => VisitResult<Node>, context: LexicalEnvironment, start?: number) {
+        context.startLexicalEnvironment();
+        const updated = visitNodes(nodes, visitor, isStatement, start);
+        const declarations = context.endLexicalEnvironment();
+        return createNodeArray(concatenate(updated, declarations), updated);
+    }
+
+    export function visitParameterList(nodes: NodeArray<ParameterDeclaration>, visitor: (node: Node) => VisitResult<Node>, context: LexicalEnvironment) {
+        context.startLexicalEnvironment();
+        return visitNodes(nodes, visitor, isParameter);
+    }
+
+    export function visitFunctionBody(node: FunctionBody, visitor: (node: Node) => VisitResult<Node>, context: LexicalEnvironment): FunctionBody;
+    export function visitFunctionBody(node: ConciseBody, visitor: (node: Node) => VisitResult<Node>, context: LexicalEnvironment): ConciseBody;
+    export function visitFunctionBody(node: ConciseBody, visitor: (node: Node) => VisitResult<Node>, context: LexicalEnvironment) {
+        const visited = visitNode(node, visitor, isConciseBody);
+        const declarations = context.endLexicalEnvironment();
+        if (some(declarations)) {
+            const block = convertToFunctionBody(visited);
+            return updateBlock(block, createNodeArray(concatenate(block.statements, declarations), block.statements));
+        }
+        return visited;
+    }
+
     /**
      * Visits each child of a Node using the supplied visitor, possibly returning a new Node of the same kind in its place.
      *
@@ -721,41 +751,33 @@ namespace ts {
                     visitNodes((<MethodDeclaration>node).modifiers, visitor, isModifier),
                     visitNode((<MethodDeclaration>node).name, visitor, isPropertyName),
                     visitNodes((<MethodDeclaration>node).typeParameters, visitor, isTypeParameter),
-                    (context.startLexicalEnvironment(), visitNodes((<MethodDeclaration>node).parameters, visitor, isParameter)),
+                    visitParameterList((<MethodDeclaration>node).parameters, visitor, context),
                     visitNode((<MethodDeclaration>node).type, visitor, isTypeNode, /*optional*/ true),
-                    mergeFunctionBodyLexicalEnvironment(
-                        visitNode((<MethodDeclaration>node).body, visitor, isFunctionBody, /*optional*/ true),
-                        context.endLexicalEnvironment()));
+                    visitFunctionBody((<MethodDeclaration>node).body, visitor, context));
 
             case SyntaxKind.Constructor:
                 return updateConstructor(<ConstructorDeclaration>node,
                     visitNodes((<ConstructorDeclaration>node).decorators, visitor, isDecorator),
                     visitNodes((<ConstructorDeclaration>node).modifiers, visitor, isModifier),
-                    (context.startLexicalEnvironment(), visitNodes((<ConstructorDeclaration>node).parameters, visitor, isParameter)),
-                    mergeFunctionBodyLexicalEnvironment(
-                        visitNode((<ConstructorDeclaration>node).body, visitor, isFunctionBody, /*optional*/ true),
-                        context.endLexicalEnvironment()));
+                    visitParameterList((<ConstructorDeclaration>node).parameters, visitor, context),
+                    visitFunctionBody((<ConstructorDeclaration>node).body, visitor, context));
 
             case SyntaxKind.GetAccessor:
                 return updateGetAccessor(<GetAccessorDeclaration>node,
                     visitNodes((<GetAccessorDeclaration>node).decorators, visitor, isDecorator),
                     visitNodes((<GetAccessorDeclaration>node).modifiers, visitor, isModifier),
                     visitNode((<GetAccessorDeclaration>node).name, visitor, isPropertyName),
-                    (context.startLexicalEnvironment(), visitNodes((<GetAccessorDeclaration>node).parameters, visitor, isParameter)),
+                    visitParameterList((<GetAccessorDeclaration>node).parameters, visitor, context),
                     visitNode((<GetAccessorDeclaration>node).type, visitor, isTypeNode, /*optional*/ true),
-                    mergeFunctionBodyLexicalEnvironment(
-                        visitNode((<GetAccessorDeclaration>node).body, visitor, isFunctionBody, /*optional*/ true),
-                        context.endLexicalEnvironment()));
+                    visitFunctionBody((<GetAccessorDeclaration>node).body, visitor, context));
 
             case SyntaxKind.SetAccessor:
                 return updateSetAccessor(<SetAccessorDeclaration>node,
                     visitNodes((<SetAccessorDeclaration>node).decorators, visitor, isDecorator),
                     visitNodes((<SetAccessorDeclaration>node).modifiers, visitor, isModifier),
                     visitNode((<SetAccessorDeclaration>node).name, visitor, isPropertyName),
-                    (context.startLexicalEnvironment(), visitNodes((<SetAccessorDeclaration>node).parameters, visitor, isParameter)),
-                    mergeFunctionBodyLexicalEnvironment(
-                        visitNode((<SetAccessorDeclaration>node).body, visitor, isFunctionBody, /*optional*/ true),
-                        context.endLexicalEnvironment()));
+                    visitParameterList((<SetAccessorDeclaration>node).parameters, visitor, context),
+                    visitFunctionBody((<SetAccessorDeclaration>node).body, visitor, context));
 
             // Binding patterns
             case SyntaxKind.ObjectBindingPattern:
@@ -818,21 +840,17 @@ namespace ts {
                     visitNodes((<FunctionExpression>node).modifiers, visitor, isModifier),
                     visitNode((<FunctionExpression>node).name, visitor, isPropertyName),
                     visitNodes((<FunctionExpression>node).typeParameters, visitor, isTypeParameter),
-                    (context.startLexicalEnvironment(), visitNodes((<FunctionExpression>node).parameters, visitor, isParameter)),
+                    visitParameterList((<FunctionExpression>node).parameters, visitor, context),
                     visitNode((<FunctionExpression>node).type, visitor, isTypeNode, /*optional*/ true),
-                    mergeFunctionBodyLexicalEnvironment(
-                        visitNode((<FunctionExpression>node).body, visitor, isFunctionBody, /*optional*/ true),
-                        context.endLexicalEnvironment()));
+                    visitFunctionBody((<FunctionExpression>node).body, visitor, context));
 
             case SyntaxKind.ArrowFunction:
                 return updateArrowFunction(<ArrowFunction>node,
                     visitNodes((<ArrowFunction>node).modifiers, visitor, isModifier),
                     visitNodes((<ArrowFunction>node).typeParameters, visitor, isTypeParameter),
-                    (context.startLexicalEnvironment(), visitNodes((<ArrowFunction>node).parameters, visitor, isParameter)),
+                    visitParameterList((<ArrowFunction>node).parameters, visitor, context),
                     visitNode((<ArrowFunction>node).type, visitor, isTypeNode, /*optional*/ true),
-                    mergeFunctionBodyLexicalEnvironment(
-                        visitNode((<ArrowFunction>node).body, visitor, isConciseBody, /*optional*/ true),
-                        context.endLexicalEnvironment()));
+                    visitFunctionBody((<ArrowFunction>node).body, visitor, context));
 
             case SyntaxKind.DeleteExpression:
                 return updateDelete(<DeleteExpression>node,
@@ -1003,11 +1021,9 @@ namespace ts {
                     visitNodes((<FunctionDeclaration>node).modifiers, visitor, isModifier),
                     visitNode((<FunctionDeclaration>node).name, visitor, isPropertyName),
                     visitNodes((<FunctionDeclaration>node).typeParameters, visitor, isTypeParameter),
-                    (context.startLexicalEnvironment(), visitNodes((<FunctionDeclaration>node).parameters, visitor, isParameter)),
+                    visitParameterList((<FunctionDeclaration>node).parameters, visitor, context),
                     visitNode((<FunctionDeclaration>node).type, visitor, isTypeNode, /*optional*/ true),
-                    mergeFunctionBodyLexicalEnvironment(
-                        visitNode((<FunctionDeclaration>node).body, visitor, isFunctionBody, /*optional*/ true),
-                        context.endLexicalEnvironment()));
+                    visitFunctionBody((<FunctionDeclaration>node).body, visitor, context));
 
             case SyntaxKind.ClassDeclaration:
                 return updateClassDeclaration(<ClassDeclaration>node,
@@ -1139,13 +1155,8 @@ namespace ts {
 
            // Top-level nodes
             case SyntaxKind.SourceFile:
-                context.startLexicalEnvironment();
                 return updateSourceFileNode(<SourceFile>node,
-                    createNodeArray(
-                        concatenate(
-                            visitNodes((<SourceFile>node).statements, visitor, isStatement),
-                            context.endLexicalEnvironment()),
-                        (<SourceFile>node).statements));
+                    visitLexicalEnvironment((<SourceFile>node).statements, visitor, context));
 
             // Transformation nodes
             case SyntaxKind.PartiallyEmittedExpression:
@@ -1249,13 +1260,25 @@ namespace ts {
         if (node === undefined) {
             return TransformFlags.None;
         }
-        else if (node.transformFlags & TransformFlags.HasComputedFlags) {
+        if (node.transformFlags & TransformFlags.HasComputedFlags) {
             return node.transformFlags & ~getTransformFlagsSubtreeExclusions(node.kind);
         }
-        else {
-            const subtreeFlags = aggregateTransformFlagsForSubtree(node);
-            return computeTransformFlagsForNode(node, subtreeFlags);
+        const subtreeFlags = aggregateTransformFlagsForSubtree(node);
+        return computeTransformFlagsForNode(node, subtreeFlags);
+    }
+
+    function aggregateTransformFlagsForNodeArray(nodes: NodeArray<Node>): TransformFlags {
+        if (nodes === undefined) {
+            return TransformFlags.None;
         }
+        let subtreeFlags = TransformFlags.None;
+        let nodeArrayFlags = TransformFlags.None;
+        for (const node of nodes) {
+            subtreeFlags |= aggregateTransformFlagsForNode(node);
+            nodeArrayFlags |= node.transformFlags & ~TransformFlags.HasComputedFlags;
+        }
+        nodes.transformFlags = nodeArrayFlags | TransformFlags.HasComputedFlags;
+        return subtreeFlags;
     }
 
     /**
@@ -1269,15 +1292,19 @@ namespace ts {
         }
 
         // Aggregate the transform flags of each child.
-        return reduceEachChild(node, aggregateTransformFlagsForChildNode, TransformFlags.None);
+        return reduceEachChild(node, TransformFlags.None, aggregateTransformFlagsForChildNode, aggregateTransformFlagsForChildNodes);
     }
 
     /**
      * Aggregates the TransformFlags of a child node with the TransformFlags of its
      * siblings.
      */
-    function aggregateTransformFlagsForChildNode(transformFlags: TransformFlags, child: Node): TransformFlags {
-        return transformFlags | aggregateTransformFlagsForNode(child);
+    function aggregateTransformFlagsForChildNode(transformFlags: TransformFlags, node: Node): TransformFlags {
+        return transformFlags | aggregateTransformFlagsForNode(node);
+    }
+
+    function aggregateTransformFlagsForChildNodes(transformFlags: TransformFlags, nodes: NodeArray<Node>): TransformFlags {
+        return transformFlags | aggregateTransformFlagsForNodeArray(nodes);
     }
 
     export namespace Debug {
diff --git a/tests/baselines/reference/assignmentTypeNarrowing.js b/tests/baselines/reference/assignmentTypeNarrowing.js
index 7c10dde65cc..92fd49d9941 100644
--- a/tests/baselines/reference/assignmentTypeNarrowing.js
+++ b/tests/baselines/reference/assignmentTypeNarrowing.js
@@ -37,17 +37,17 @@ x = [true][0];
 x; // boolean
 _a = [1][0], x = _a === void 0 ? "" : _a;
 x; // string | number
-(_b = { x: true }, x = _b.x, _b);
+(x = { x: true }.x);
 x; // boolean
-(_c = { y: 1 }, x = _c.y, _c);
+(x = { y: 1 }.y);
 x; // number
-(_d = { x: true }, _e = _d.x, x = _e === void 0 ? "" : _e, _d);
+(_b = { x: true }.x, x = _b === void 0 ? "" : _b);
 x; // string | boolean
-(_f = { y: 1 }, _g = _f.y, x = _g === void 0 ? /a/ : _g, _f);
+(_c = { y: 1 }.y, x = _c === void 0 ? /a/ : _c);
 x; // number | RegExp
 var a;
 for (var _i = 0, a_1 = a; _i < a_1.length; _i++) {
     x = a_1[_i];
     x; // string
 }
-var _a, _b, _c, _d, _e, _f, _g;
+var _a, _b, _c;
diff --git a/tests/baselines/reference/asyncMethodWithSuper_es5.js b/tests/baselines/reference/asyncMethodWithSuper_es5.js
index 9ceff6bab4e..235f2763f9f 100644
--- a/tests/baselines/reference/asyncMethodWithSuper_es5.js
+++ b/tests/baselines/reference/asyncMethodWithSuper_es5.js
@@ -81,8 +81,8 @@ var B = (function (_super) {
     // async method with assignment/destructuring on 'super' requires a binding
     B.prototype.advanced = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var f, a, b, _a, _b;
-            return __generator(this, function (_c) {
+            var f, a, b;
+            return __generator(this, function (_a) {
                 f = function () { };
                 // call with property access
                 _super.prototype.x.call(this);
@@ -95,9 +95,9 @@ var B = (function (_super) {
                 // element access (assign)
                 _super.prototype["x"] = f;
                 // destructuring assign with property access
-                (_a = { f: f }, super.x = _a.f, _a);
+                (_super.prototype.x = { f: f }.f);
                 // destructuring assign with element access
-                (_b = { f: f }, super["x"] = _b.f, _b);
+                (_super.prototype["x"] = { f: f }.f);
                 return [2 /*return*/];
             });
         });
diff --git a/tests/baselines/reference/computedPropertiesInDestructuring1.js b/tests/baselines/reference/computedPropertiesInDestructuring1.js
index 0bc4286ed7b..b0dc33a4b4e 100644
--- a/tests/baselines/reference/computedPropertiesInDestructuring1.js
+++ b/tests/baselines/reference/computedPropertiesInDestructuring1.js
@@ -65,11 +65,11 @@ function f5(_a) {
 var _f = foo(), bar6 = [{ bar: "bar" }][0][_f];
 var _g = foo.toExponential(), bar7 = [{ bar: "bar" }][0][_g];
 // destructuring assignment
-(_h = { bar: "bar" }, _j = foo, bar = _h[_j], _h);
-(_k = { bar: "bar" }, _l = "bar", bar2 = _k[_l], _k);
-(_m = { bar: "bar" }, _o = foo2(), bar3 = _m[_o], _m);
-_p = foo, bar4 = [{ bar: "bar" }][0][_p];
-_q = foo2(), bar5 = [{ bar: "bar" }][0][_q];
-_r = foo(), bar4 = [{ bar: "bar" }][0][_r];
-_s = (1 + {}), bar4 = [{ bar: "bar" }][0][_s];
-var _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+(_h = foo, bar = { bar: "bar" }[_h]);
+(_j = "bar", bar2 = { bar: "bar" }[_j]);
+(_k = foo2(), bar3 = { bar: "bar" }[_k]);
+_l = foo, bar4 = [{ bar: "bar" }][0][_l];
+_m = foo2(), bar5 = [{ bar: "bar" }][0][_m];
+_o = foo(), bar4 = [{ bar: "bar" }][0][_o];
+_p = (1 + {}), bar4 = [{ bar: "bar" }][0][_p];
+var _h, _j, _k, _l, _m, _o, _p;
diff --git a/tests/baselines/reference/declarationsAndAssignments.js b/tests/baselines/reference/declarationsAndAssignments.js
index 018aa5522ca..3a2f9ef3b4e 100644
--- a/tests/baselines/reference/declarationsAndAssignments.js
+++ b/tests/baselines/reference/declarationsAndAssignments.js
@@ -300,8 +300,8 @@ function f18() {
     var a;
     var b;
     var aa;
-    (_a = { a: a, b: b }, a = _a.a, b = _a.b, _a);
-    (_b = { b: b, a: a }, a = _b.a, b = _b.b, _b);
+    (_a = { a: a, b: b }, a = _a.a, b = _a.b);
+    (_b = { b: b, a: a }, a = _b.a, b = _b.b);
     _c = [a, b], aa[0] = _c[0], b = _c[1];
     _d = [b, a], a = _d[0], b = _d[1]; // Error
     _e = [2, "def"], _f = _e[0], a = _f === void 0 ? 1 : _f, _g = _e[1], b = _g === void 0 ? "abc" : _g;
@@ -311,7 +311,7 @@ function f19() {
     var a, b;
     _a = [1, 2], a = _a[0], b = _a[1];
     _b = [b, a], a = _b[0], b = _b[1];
-    (_c = { b: b, a: a }, a = _c.a, b = _c.b, _c);
+    (_c = { b: b, a: a }, a = _c.a, b = _c.b);
     _d = [[2, 3]][0], _e = _d === void 0 ? [1, 2] : _d, a = _e[0], b = _e[1];
     var x = (_f = [1, 2], a = _f[0], b = _f[1], _f);
     var _a, _b, _c, _d, _e, _f;
diff --git a/tests/baselines/reference/destructuringAssignmentWithDefault.js b/tests/baselines/reference/destructuringAssignmentWithDefault.js
index ce3837e1162..fe3ccdcee53 100644
--- a/tests/baselines/reference/destructuringAssignmentWithDefault.js
+++ b/tests/baselines/reference/destructuringAssignmentWithDefault.js
@@ -7,5 +7,5 @@ let x = 0;
 //// [destructuringAssignmentWithDefault.js]
 var a = {};
 var x = 0;
-(_a = a.x, x = _a === void 0 ? 1 : _a, a);
+(_a = a.x, x = _a === void 0 ? 1 : _a);
 var _a;
diff --git a/tests/baselines/reference/emptyAssignmentPatterns02_ES5.js b/tests/baselines/reference/emptyAssignmentPatterns02_ES5.js
index 370e019104f..f5434d4a1c3 100644
--- a/tests/baselines/reference/emptyAssignmentPatterns02_ES5.js
+++ b/tests/baselines/reference/emptyAssignmentPatterns02_ES5.js
@@ -9,8 +9,8 @@ let x, y, z, a1, a2, a3;
 //// [emptyAssignmentPatterns02_ES5.js]
 var a;
 var x, y, z, a1, a2, a3;
-(x = a.x, y = a.y, z = a.z, a);
-(a1 = a[0], a2 = a[1], a3 = a[2], a);
+(x = a.x, y = a.y, z = a.z);
+(a1 = a[0], a2 = a[1], a3 = a[2]);
 
 
 //// [emptyAssignmentPatterns02_ES5.d.ts]
diff --git a/tests/baselines/reference/emptyAssignmentPatterns04_ES5.js b/tests/baselines/reference/emptyAssignmentPatterns04_ES5.js
index e6b3cc7e3f2..91559d18252 100644
--- a/tests/baselines/reference/emptyAssignmentPatterns04_ES5.js
+++ b/tests/baselines/reference/emptyAssignmentPatterns04_ES5.js
@@ -9,9 +9,8 @@ let x, y, z, a1, a2, a3;
 //// [emptyAssignmentPatterns04_ES5.js]
 var a;
 var x, y, z, a1, a2, a3;
-(_a = a, x = _a.x, y = _a.y, z = _a.z, _a);
-(_b = a, a1 = _b[0], a2 = _b[1], a3 = _b[2], _b);
-var _a, _b;
+(x = a.x, y = a.y, z = a.z);
+(a1 = a[0], a2 = a[1], a3 = a[2]);
 
 
 //// [emptyAssignmentPatterns04_ES5.d.ts]
diff --git a/tests/baselines/reference/initializePropertiesWithRenamedLet.js b/tests/baselines/reference/initializePropertiesWithRenamedLet.js
index d53fed8c0f7..4abe488aa08 100644
--- a/tests/baselines/reference/initializePropertiesWithRenamedLet.js
+++ b/tests/baselines/reference/initializePropertiesWithRenamedLet.js
@@ -28,7 +28,6 @@ if (true) {
     var x_1 = { x: 0 }.x;
     var y_1 = { y: 0 }.y;
     var z_1;
-    (_a = { z: 0 }, z_1 = _a.z, _a);
-    (_b = { z: 0 }, z_1 = _b.z, _b);
+    (z_1 = { z: 0 }.z);
+    (z_1 = { z: 0 }.z);
 }
-var _a, _b;
diff --git a/tests/baselines/reference/missingAndExcessProperties.js b/tests/baselines/reference/missingAndExcessProperties.js
index b9fcadd9519..daefe18eed7 100644
--- a/tests/baselines/reference/missingAndExcessProperties.js
+++ b/tests/baselines/reference/missingAndExcessProperties.js
@@ -45,10 +45,10 @@ function f1() {
 // Missing properties
 function f2() {
     var x, y;
-    (_a = {}, x = _a.x, y = _a.y, _a);
-    (_b = {}, _c = _b.x, x = _c === void 0 ? 1 : _c, y = _b.y, _b);
-    (_d = {}, x = _d.x, _e = _d.y, y = _e === void 0 ? 1 : _e, _d);
-    (_f = {}, _g = _f.x, x = _g === void 0 ? 1 : _g, _h = _f.y, y = _h === void 0 ? 1 : _h, _f);
+    (_a = {}, x = _a.x, y = _a.y);
+    (_b = {}, _c = _b.x, x = _c === void 0 ? 1 : _c, y = _b.y);
+    (_d = {}, x = _d.x, _e = _d.y, y = _e === void 0 ? 1 : _e);
+    (_f = {}, _g = _f.x, x = _g === void 0 ? 1 : _g, _h = _f.y, y = _h === void 0 ? 1 : _h);
     var _a, _b, _c, _d, _e, _f, _g, _h;
 }
 // Excess properties
@@ -62,8 +62,8 @@ function f3() {
 function f4() {
     var x, y;
     ({ x: 0, y: 0 });
-    (_a = { x: 0, y: 0 }, x = _a.x, _a);
-    (_b = { x: 0, y: 0 }, y = _b.y, _b);
-    (_c = { x: 0, y: 0 }, x = _c.x, y = _c.y, _c);
-    var _a, _b, _c;
+    (x = { x: 0, y: 0 }.x);
+    (y = { x: 0, y: 0 }.y);
+    (_a = { x: 0, y: 0 }, x = _a.x, y = _a.y);
+    var _a;
 }
diff --git a/tests/baselines/reference/objectRest.js b/tests/baselines/reference/objectRest.js
index a295ff7b9f1..519283b32e5 100644
--- a/tests/baselines/reference/objectRest.js
+++ b/tests/baselines/reference/objectRest.js
@@ -53,9 +53,9 @@ let nestedrest;
 var { x } = nestedrest, _a = nestedrest.n1, { y } = _a, _b = _a.n2, { z } = _b, nr = __rest(_b.n3, []), restrest = __rest(nestedrest, ["x", "n1"]);
 let complex;
 var _c = complex.x, { ka } = _c, nested = __rest(_c, ["ka"]), { y: other } = complex, rest = __rest(complex, ["x", "y"]);
-(_d = complex.x, { ka } = _d, nested = __rest(_d, ["ka"]), { y: other } = complex, rest = __rest(complex, ["x", "y"]), complex);
+(_d = complex.x, { ka } = _d, nested = __rest(_d, ["ka"]), { y: other } = complex, rest = __rest(complex, ["x", "y"]));
 var _e = { x: 1, y: 2 }, { x } = _e, fresh = __rest(_e, ["x"]);
-(_f = { x: 1, y: 2 }, { x } = _f, fresh = __rest(_f, ["x"]), _f);
+(_f = { x: 1, y: 2 }, { x } = _f, fresh = __rest(_f, ["x"]));
 class Removable {
     set z(value) { }
     get both() { return 12; }
diff --git a/tests/baselines/reference/objectRestAssignment.js b/tests/baselines/reference/objectRestAssignment.js
index 41620d59b58..d4d266d3fe5 100644
--- a/tests/baselines/reference/objectRestAssignment.js
+++ b/tests/baselines/reference/objectRestAssignment.js
@@ -26,10 +26,10 @@ let nested;
 let other;
 let rest;
 let complex;
-(_a = complex.x, { ka } = _a, nested = __rest(_a, ["ka"]), { y: other } = complex, rest = __rest(complex, ["x", "y"]), complex);
+(_a = complex.x, { ka } = _a, nested = __rest(_a, ["ka"]), { y: other } = complex, rest = __rest(complex, ["x", "y"]));
 // should be:
 let overEmit;
 // var _g = overEmit.a, [_h, ...y] = _g, nested2 = __rest(_h, []), _j = overEmit.b, { z } = _j, c = __rest(_j, ["z"]), rest2 = __rest(overEmit, ["a", "b"]);
 var _b = overEmit.a, [_c, ...y] = _b, nested2 = __rest(_c, []), _d = overEmit.b, { z } = _d, c = __rest(_d, ["z"]), rest2 = __rest(overEmit, ["a", "b"]);
-(_e = overEmit.a, [_f, ...y] = _e, nested2 = __rest(_f, []), _g = overEmit.b, { z } = _g, c = __rest(_g, ["z"]), rest2 = __rest(overEmit, ["a", "b"]), overEmit);
-var _a, _e, _f, _g;
+(_e = overEmit.a, [_f, ...y] = _e, nested2 = __rest(_f, []), _g = overEmit.b, { z } = _g, c = __rest(_g, ["z"]), rest2 = __rest(overEmit, ["a", "b"]));
+var _a, _e, _g;
diff --git a/tests/baselines/reference/objectRestNegative.js b/tests/baselines/reference/objectRestNegative.js
index b3b49740762..6a710a22870 100644
--- a/tests/baselines/reference/objectRestNegative.js
+++ b/tests/baselines/reference/objectRestNegative.js
@@ -17,9 +17,9 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 var o = { a: 1, b: 'no' };
-var mustBeLast = o.mustBeLast, a = o.a;
+var a = o.a;
 function stillMustBeLast(_a) {
-    var mustBeLast = _a.mustBeLast, a = _a.a;
+    var a = _a.a;
 }
 function generic(t) {
     var x = t.x, rest = __rest(t, ["x"]);
diff --git a/tests/baselines/reference/shorthandPropertyAssignmentsInDestructuring.js b/tests/baselines/reference/shorthandPropertyAssignmentsInDestructuring.js
index 981ee08e20c..6be02246e39 100644
--- a/tests/baselines/reference/shorthandPropertyAssignmentsInDestructuring.js
+++ b/tests/baselines/reference/shorthandPropertyAssignmentsInDestructuring.js
@@ -176,63 +176,63 @@ function foo({a = 4, b = { x: 5 }}) {
 });
 (function () {
     var y;
-    (_a = { y: 1 }, _b = _a.y, y = _b === void 0 ? 5 : _b, _a);
-    var _a, _b;
+    (_a = { y: 1 }.y, y = _a === void 0 ? 5 : _a);
+    var _a;
 });
 (function () {
     var y;
-    (_a = { y: 1 }, _b = _a.y, y = _b === void 0 ? 5 : _b, _a);
-    var _a, _b;
+    (_a = { y: 1 }.y, y = _a === void 0 ? 5 : _a);
+    var _a;
 });
 (function () {
     var y0;
-    (_a = { y0: 1 }, _b = _a.y0, y0 = _b === void 0 ? 5 : _b, _a);
-    var _a, _b;
+    (_a = { y0: 1 }.y0, y0 = _a === void 0 ? 5 : _a);
+    var _a;
 });
 (function () {
     var y0;
-    (_a = { y0: 1 }, _b = _a.y0, y0 = _b === void 0 ? 5 : _b, _a);
-    var _a, _b;
+    (_a = { y0: 1 }.y0, y0 = _a === void 0 ? 5 : _a);
+    var _a;
 });
 (function () {
     var y1;
-    (_a = {}, _b = _a.y1, y1 = _b === void 0 ? 5 : _b, _a);
-    var _a, _b;
+    (_a = {}.y1, y1 = _a === void 0 ? 5 : _a);
+    var _a;
 });
 (function () {
     var y1;
-    (_a = {}, _b = _a.y1, y1 = _b === void 0 ? 5 : _b, _a);
-    var _a, _b;
+    (_a = {}.y1, y1 = _a === void 0 ? 5 : _a);
+    var _a;
 });
 (function () {
     var y2, y3;
-    (_a = {}, _b = _a.y2, y2 = _b === void 0 ? 5 : _b, _c = _a.y3, y3 = _c === void 0 ? { x: 1 } : _c, _a);
+    (_a = {}, _b = _a.y2, y2 = _b === void 0 ? 5 : _b, _c = _a.y3, y3 = _c === void 0 ? { x: 1 } : _c);
     var _a, _b, _c;
 });
 (function () {
     var y2, y3;
-    (_a = {}, _b = _a.y2, y2 = _b === void 0 ? 5 : _b, _c = _a.y3, y3 = _c === void 0 ? { x: 1 } : _c, _a);
+    (_a = {}, _b = _a.y2, y2 = _b === void 0 ? 5 : _b, _c = _a.y3, y3 = _c === void 0 ? { x: 1 } : _c);
     var _a, _b, _c;
 });
 (function () {
     var y4, y5;
-    (_a = {}, _b = _a.y4, y4 = _b === void 0 ? 5 : _b, _c = _a.y5, y5 = _c === void 0 ? { x: 1 } : _c, _a);
+    (_a = {}, _b = _a.y4, y4 = _b === void 0 ? 5 : _b, _c = _a.y5, y5 = _c === void 0 ? { x: 1 } : _c);
     var _a, _b, _c;
 });
 (function () {
     var y4, y5;
-    (_a = {}, _b = _a.y4, y4 = _b === void 0 ? 5 : _b, _c = _a.y5, y5 = _c === void 0 ? { x: 1 } : _c, _a);
+    (_a = {}, _b = _a.y4, y4 = _b === void 0 ? 5 : _b, _c = _a.y5, y5 = _c === void 0 ? { x: 1 } : _c);
     var _a, _b, _c;
 });
 (function () {
     var z;
-    (_a = { z: { x: 1 } }, _b = _a.z, z = _b === void 0 ? { x: 5 } : _b, _a);
-    var _a, _b;
+    (_a = { z: { x: 1 } }.z, z = _a === void 0 ? { x: 5 } : _a);
+    var _a;
 });
 (function () {
     var z;
-    (_a = { z: { x: 1 } }, _b = _a.z, z = _b === void 0 ? { x: 5 } : _b, _a);
-    var _a, _b;
+    (_a = { z: { x: 1 } }.z, z = _a === void 0 ? { x: 5 } : _a);
+    var _a;
 });
 (function () {
     var a = { s: s };

From 36511838a437b0807992dc8d61d5fdd1523a80d1 Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Mon, 14 Nov 2016 10:41:48 -0800
Subject: [PATCH 219/421] allow getting compiler options diagnostics when
 language service is disabled

---
 src/server/project.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/server/project.ts b/src/server/project.ts
index 6239ba1be2e..3e5c810e805 100644
--- a/src/server/project.ts
+++ b/src/server/project.ts
@@ -93,6 +93,7 @@ namespace ts.server {
     const emptyResult: any[] = [];
     const getEmptyResult = () => emptyResult;
     const getUndefined = () => <any>undefined;
+    const emptyEncodedSemanticClassifications = { spans: emptyResult, endOfLineState: EndOfLineState.None };
 
     export function createNoSemanticFeaturesWrapper(realLanguageService: LanguageService): LanguageService {
         return {
@@ -100,14 +101,15 @@ namespace ts.server {
             getSyntacticDiagnostics: (fileName) =>
                 fileName ? realLanguageService.getSyntacticDiagnostics(fileName) : emptyResult,
             getSemanticDiagnostics: getEmptyResult,
-            getCompilerOptionsDiagnostics: getEmptyResult,
+            getCompilerOptionsDiagnostics: () =>
+                realLanguageService.getCompilerOptionsDiagnostics(),
             getSyntacticClassifications: (fileName, span) =>
                 realLanguageService.getSyntacticClassifications(fileName, span),
             getEncodedSyntacticClassifications: (fileName, span) =>
                 realLanguageService.getEncodedSyntacticClassifications(fileName, span),
             getSemanticClassifications: getEmptyResult,
             getEncodedSemanticClassifications: () =>
-                ({ spans: [], endOfLineState: EndOfLineState.None }),
+                emptyEncodedSemanticClassifications,
             getCompletionsAtPosition: getUndefined,
             findReferences: getEmptyResult,
             getCompletionEntryDetails: getUndefined,

From f6a570cc7902ba04fcd26931bcfa516d2a03f6e4 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <Daniel.Rosenwasser@microsoft.com>
Date: Mon, 14 Nov 2016 11:01:05 -0800
Subject: [PATCH 220/421] && -> ||

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

diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts
index 1cb63f55e91..07c42eb1fb3 100644
--- a/src/compiler/transformers/es2015.ts
+++ b/src/compiler/transformers/es2015.ts
@@ -1014,7 +1014,7 @@ namespace ts {
                 const returnStatement = createReturn(superCallExpression);
 
                 if (superCallExpression.kind !== SyntaxKind.BinaryExpression
-                    && (superCallExpression as BinaryExpression).left.kind !== SyntaxKind.CallExpression) {
+                    || (superCallExpression as BinaryExpression).left.kind !== SyntaxKind.CallExpression) {
                     Debug.fail("Assumed generated super call would have form 'super.call(...) || this'.");
                 }
 

From 4782563ee3e443cdcf8d398bb0c579976753efd0 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Mon, 14 Nov 2016 12:46:56 -0800
Subject: [PATCH 221/421] Filter JS files from resolutions sent to VS through
 shims

---
 src/services/shims.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/services/shims.ts b/src/services/shims.ts
index 4debcb23774..0aa411536f1 100644
--- a/src/services/shims.ts
+++ b/src/services/shims.ts
@@ -1060,8 +1060,15 @@ namespace ts {
             return this.forwardJSONCall(`resolveModuleName('${fileName}')`, () => {
                 const compilerOptions = <CompilerOptions>JSON.parse(compilerOptionsJson);
                 const result = resolveModuleName(moduleName, normalizeSlashes(fileName), compilerOptions, this.host);
+                const resolvedFileName = result.resolvedModule ? result.resolvedModule.resolvedFileName : undefined;
+                if (resolvedFileName && !compilerOptions.allowJs && fileExtensionIs(resolvedFileName, ".js")) {
+                    return {
+                        resolvedFileName: undefined,
+                        failedLookupLocations: undefined
+                    };
+                }
                 return {
-                    resolvedFileName: result.resolvedModule ? result.resolvedModule.resolvedFileName : undefined,
+                    resolvedFileName,
                     failedLookupLocations: result.failedLookupLocations
                 };
             });

From 57a602b924f54bd7311708eefbda491d1f86f822 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Mon, 14 Nov 2016 12:47:04 -0800
Subject: [PATCH 222/421] Include no types in services

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

diff --git a/src/services/tsconfig.json b/src/services/tsconfig.json
index 9c3e068918d..a419877bcd8 100644
--- a/src/services/tsconfig.json
+++ b/src/services/tsconfig.json
@@ -12,7 +12,8 @@
         "declaration": true,
         "target": "es5",
         "noUnusedLocals": true,
-        "noUnusedParameters": true
+        "noUnusedParameters": true,
+        "types": []
     },
     "files": [
         "../compiler/core.ts",

From 964f9c5fe28fdd62ef82478af2a7ce8d850bffa0 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Mon, 14 Nov 2016 13:24:03 -0800
Subject: [PATCH 223/421] Make failedLookupLocations an array

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

diff --git a/src/services/shims.ts b/src/services/shims.ts
index 0aa411536f1..1c8132793a3 100644
--- a/src/services/shims.ts
+++ b/src/services/shims.ts
@@ -1064,7 +1064,7 @@ namespace ts {
                 if (resolvedFileName && !compilerOptions.allowJs && fileExtensionIs(resolvedFileName, ".js")) {
                     return {
                         resolvedFileName: undefined,
-                        failedLookupLocations: undefined
+                        failedLookupLocations: []
                     };
                 }
                 return {

From f11e8a3c6987fa35d8cb982c2c785fcccd4b9e60 Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Thu, 10 Nov 2016 16:52:36 -0800
Subject: [PATCH 224/421] add 'installSuccess' flag to telemetry, cache misses
 if npm install fails (#12163)

* add 'installSuccess' flag to telemetry, cache misses if npm install fails

* fix typo
---
 src/server/protocol.ts                           |  4 ++++
 src/server/server.ts                             |  3 ++-
 src/server/types.d.ts                            |  1 +
 .../typingsInstaller/nodeTypingsInstaller.ts     |  6 +++---
 src/server/typingsInstaller/typingsInstaller.ts  | 16 ++++++++++++----
 5 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/server/protocol.ts b/src/server/protocol.ts
index d13caf7f01b..a112cd942b6 100644
--- a/src/server/protocol.ts
+++ b/src/server/protocol.ts
@@ -2081,6 +2081,10 @@ namespace ts.server.protocol {
          * Comma separated list of installed typing packages
          */
         installedPackages: string;
+        /**
+         * true if install request succeeded, otherwise - false
+         */
+        installSuccess: boolean;
     }
 
     export interface NavBarResponse extends Response {
diff --git a/src/server/server.ts b/src/server/server.ts
index 3b33554aaba..c561277c7d2 100644
--- a/src/server/server.ts
+++ b/src/server/server.ts
@@ -299,7 +299,8 @@ namespace ts.server {
                     const body: protocol.TypingsInstalledTelemetryEventBody = {
                         telemetryEventName: "typingsInstalled",
                         payload: {
-                            installedPackages: response.packagesToInstall.join(",")
+                            installedPackages: response.packagesToInstall.join(","),
+                            installSuccess: response.installSuccess
                         }
                     };
                     const eventName: protocol.TelemetryEventName = "telemetry";
diff --git a/src/server/types.d.ts b/src/server/types.d.ts
index aebc3121252..3fd90e7fd3e 100644
--- a/src/server/types.d.ts
+++ b/src/server/types.d.ts
@@ -68,6 +68,7 @@ declare namespace ts.server {
     export interface TypingsInstallEvent extends TypingInstallerResponse {
         readonly packagesToInstall: ReadonlyArray<string>;
         readonly kind: EventInstall;
+        readonly installSuccess: boolean;
     }
 
     export interface InstallTypingHost extends JsTyping.TypingResolutionHost {
diff --git a/src/server/typingsInstaller/nodeTypingsInstaller.ts b/src/server/typingsInstaller/nodeTypingsInstaller.ts
index 7020b6aa4f8..74311dae4e2 100644
--- a/src/server/typingsInstaller/nodeTypingsInstaller.ts
+++ b/src/server/typingsInstaller/nodeTypingsInstaller.ts
@@ -135,12 +135,12 @@ namespace ts.server.typingsInstaller {
             }
             const command = `${this.npmPath} install ${args.join(" ")} --save-dev`;
             const start = Date.now();
-            this.exec(command, { cwd }, (_err, stdout, stderr) => {
+            this.exec(command, { cwd }, (err, stdout, stderr) => {
                 if (this.log.isEnabled()) {
                     this.log.writeLine(`npm install #${requestId} took: ${Date.now() - start} ms${sys.newLine}stdout: ${stdout}${sys.newLine}stderr: ${stderr}`);
                 }
-                // treat any output on stdout as success
-                onRequestCompleted(!!stdout);
+                // treat absence of error as success
+                onRequestCompleted(!err);
             });
         }
     }
diff --git a/src/server/typingsInstaller/typingsInstaller.ts b/src/server/typingsInstaller/typingsInstaller.ts
index 0873d5c328b..2ea0296e22a 100644
--- a/src/server/typingsInstaller/typingsInstaller.ts
+++ b/src/server/typingsInstaller/typingsInstaller.ts
@@ -218,7 +218,7 @@ namespace ts.server.typingsInstaller {
             this.knownCachesSet[cacheLocation] = true;
         }
 
-        private filterAndMapToScopedName(typingsToInstall: string[]) {
+        private filterTypings(typingsToInstall: string[]) {
             if (typingsToInstall.length === 0) {
                 return typingsToInstall;
             }
@@ -230,7 +230,7 @@ namespace ts.server.typingsInstaller {
                 const validationResult = validatePackageName(typing);
                 if (validationResult === PackageNameValidationResult.Ok) {
                     if (typing in this.typesRegistry) {
-                        result.push(`@types/${typing}`);
+                        result.push(typing);
                     }
                     else {
                         if (this.log.isEnabled()) {
@@ -286,7 +286,8 @@ namespace ts.server.typingsInstaller {
             if (this.log.isEnabled()) {
                 this.log.writeLine(`Installing typings ${JSON.stringify(typingsToInstall)}`);
             }
-            const scopedTypings = this.filterAndMapToScopedName(typingsToInstall);
+            const filteredTypings = this.filterTypings(typingsToInstall);
+            const scopedTypings = filteredTypings.map(x => `@types/${x}`);
             if (scopedTypings.length === 0) {
                 if (this.log.isEnabled()) {
                     this.log.writeLine(`All typings are known to be missing or invalid - no need to go any further`);
@@ -303,11 +304,18 @@ namespace ts.server.typingsInstaller {
                 if (this.telemetryEnabled) {
                     this.sendResponse(<TypingsInstallEvent>{
                         kind: EventInstall,
-                        packagesToInstall: scopedTypings
+                        packagesToInstall: scopedTypings,
+                        installSuccess: ok
                     });
                 }
 
                 if (!ok) {
+                    if (this.log.isEnabled()) {
+                        this.log.writeLine(`install request failed, marking packages as missing to prevent repeated requests: ${JSON.stringify(filteredTypings)}`);
+                    }
+                    for (const typing of filteredTypings) {
+                        this.missingTypingsSet[typing] = true;
+                    }
                     return;
                 }
 

From 08f467bd4cfd25393ee9993f536dc32a2ae0a6c6 Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Mon, 14 Nov 2016 14:20:25 -0800
Subject: [PATCH 225/421] Clean up destructuring

---
 src/compiler/binder.ts                     |   39 +-
 src/compiler/factory.ts                    | 1094 ++++++++++++--------
 src/compiler/transformers/destructuring.ts |  491 ++-------
 src/compiler/transformers/es2015.ts        |    9 +-
 src/compiler/transformers/esnext.ts        |   10 +-
 src/compiler/transformers/module/module.ts |    2 +-
 src/compiler/transformers/module/system.ts |    4 +-
 src/compiler/transformers/ts.ts            |    2 +-
 src/compiler/types.ts                      |   64 +-
 src/compiler/utilities.ts                  |   72 ++
 10 files changed, 914 insertions(+), 873 deletions(-)

diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index 9a477f05211..52131a90c3a 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -1280,7 +1280,7 @@ namespace ts {
         function bindInitializedVariableFlow(node: VariableDeclaration | ArrayBindingElement) {
             const name = !isOmittedExpression(node) ? node.name : undefined;
             if (isBindingPattern(name)) {
-                for (const child of name.elements) {
+                for (const child of <ArrayBindingElement[]>name.elements) {
                     bindInitializedVariableFlow(child);
                 }
             }
@@ -2629,7 +2629,7 @@ namespace ts {
         }
 
         // parameters with object rest destructuring are ES Next syntax
-        if (subtreeFlags & (TransformFlags.ContainsRest | TransformFlags.ContainsObjectRest)) {
+        if (subtreeFlags & TransformFlags.ContainsObjectRest) {
             transformFlags |= TransformFlags.AssertESNext;
         }
 
@@ -2867,7 +2867,7 @@ namespace ts {
             }
 
             // function declarations with object rest destructuring are ES Next syntax
-            if (subtreeFlags & (TransformFlags.ContainsRest | TransformFlags.ContainsObjectRest)) {
+            if (subtreeFlags & TransformFlags.ContainsObjectRest) {
                 transformFlags |= TransformFlags.AssertESNext;
             }
 
@@ -2909,7 +2909,7 @@ namespace ts {
         }
 
         // function expressions with object rest destructuring are ES Next syntax
-        if (subtreeFlags & (TransformFlags.ContainsRest | TransformFlags.ContainsObjectRest)) {
+        if (subtreeFlags & TransformFlags.ContainsObjectRest) {
             transformFlags |= TransformFlags.AssertESNext;
         }
 
@@ -2952,7 +2952,7 @@ namespace ts {
         }
 
         // arrow functions with object rest destructuring are ES Next syntax
-        if (subtreeFlags & (TransformFlags.ContainsRest | TransformFlags.ContainsObjectRest)) {
+        if (subtreeFlags & TransformFlags.ContainsObjectRest) {
             transformFlags |= TransformFlags.AssertESNext;
         }
 
@@ -2982,16 +2982,11 @@ namespace ts {
 
     function computeVariableDeclaration(node: VariableDeclaration, subtreeFlags: TransformFlags) {
         let transformFlags = subtreeFlags;
-        const nameKind = node.name.kind;
+        transformFlags |= TransformFlags.AssertES2015 | TransformFlags.ContainsBindingPattern;
 
-        // A VariableDeclaration with an object binding pattern is ES2015 syntax
-        // and possibly ESNext syntax if it contains an object binding pattern
-        if (nameKind === SyntaxKind.ObjectBindingPattern) {
-            transformFlags |= TransformFlags.AssertESNext | TransformFlags.AssertES2015 | TransformFlags.ContainsBindingPattern;
-        }
-        // A VariableDeclaration with an object binding pattern is ES2015 syntax.
-        else if (nameKind === SyntaxKind.ArrayBindingPattern) {
-            transformFlags |= TransformFlags.AssertES2015 | TransformFlags.ContainsBindingPattern;
+        // A VariableDeclaration containing ObjectRest is ESNext syntax
+        if (subtreeFlags & TransformFlags.ContainsObjectRest) {
+            transformFlags |= TransformFlags.AssertESNext;
         }
 
         // Type annotations are TypeScript syntax.
@@ -3213,13 +3208,6 @@ namespace ts {
                 transformFlags |= TransformFlags.AssertESNext | TransformFlags.ContainsSpread | TransformFlags.ContainsObjectSpread;
                 break;
 
-            case SyntaxKind.BindingElement:
-                transformFlags |= TransformFlags.AssertES2015;
-                if ((<BindingElement>node).dotDotDotToken) {
-                    transformFlags |= TransformFlags.ContainsRest;
-                }
-                break;
-
             case SyntaxKind.SuperKeyword:
                 // This node is ES6 syntax.
                 transformFlags |= TransformFlags.AssertES2015;
@@ -3232,7 +3220,7 @@ namespace ts {
 
             case SyntaxKind.ObjectBindingPattern:
                 transformFlags |= TransformFlags.AssertES2015 | TransformFlags.ContainsBindingPattern;
-                if (subtreeFlags & TransformFlags.ContainsSpread) {
+                if (subtreeFlags & TransformFlags.ContainsRest) {
                     transformFlags |= TransformFlags.AssertESNext | TransformFlags.ContainsObjectRest;
                 }
                 excludeFlags = TransformFlags.BindingPatternExcludes;
@@ -3243,6 +3231,13 @@ namespace ts {
                 excludeFlags = TransformFlags.BindingPatternExcludes;
                 break;
 
+            case SyntaxKind.BindingElement:
+                transformFlags |= TransformFlags.AssertES2015;
+                if ((<BindingElement>node).dotDotDotToken) {
+                    transformFlags |= TransformFlags.ContainsRest;
+                }
+                break;
+
             case SyntaxKind.Decorator:
                 // This node is TypeScript syntax, and marks its container as also being TypeScript syntax.
                 transformFlags |= TransformFlags.AssertTypeScript | TransformFlags.ContainsDecorators;
diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index ac3d5ed6e29..c107263b9d8 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -1405,7 +1405,7 @@ namespace ts {
         return node;
     }
 
-   export function updateShorthandPropertyAssignment(node: ShorthandPropertyAssignment, name: Identifier, objectAssignmentInitializer: Expression) {
+    export function updateShorthandPropertyAssignment(node: ShorthandPropertyAssignment, name: Identifier, objectAssignmentInitializer: Expression) {
         if (node.name !== name || node.objectAssignmentInitializer !== objectAssignmentInitializer) {
             return updateNode(createShorthandPropertyAssignment(name, objectAssignmentInitializer, node), node);
         }
@@ -1419,7 +1419,7 @@ namespace ts {
         return node;
     }
 
-   // Top-level nodes
+    // Top-level nodes
 
     export function updateSourceFileNode(node: SourceFile, statements: Statement[]) {
         if (node.statements !== statements) {
@@ -1994,6 +1994,8 @@ namespace ts {
         );
     }
 
+    // Utilities
+
     export interface CallBinding {
         target: LeftHandSideExpression;
         thisArg: Expression;
@@ -2339,8 +2341,6 @@ namespace ts {
         return qualifiedName;
     }
 
-    // Utilities
-
     export function convertToFunctionBody(node: ConciseBody) {
         if (isBlock(node)) {
             return node;
@@ -2424,407 +2424,6 @@ namespace ts {
         return node;
     }
 
-    /**
-     * Wraps the operand to a BinaryExpression in parentheses if they are needed to preserve the intended
-     * order of operations.
-     *
-     * @param binaryOperator The operator for the BinaryExpression.
-     * @param operand The operand for the BinaryExpression.
-     * @param isLeftSideOfBinary A value indicating whether the operand is the left side of the
-     *                           BinaryExpression.
-     */
-    export function parenthesizeBinaryOperand(binaryOperator: SyntaxKind, operand: Expression, isLeftSideOfBinary: boolean, leftOperand?: Expression) {
-        const skipped = skipPartiallyEmittedExpressions(operand);
-
-        // If the resulting expression is already parenthesized, we do not need to do any further processing.
-        if (skipped.kind === SyntaxKind.ParenthesizedExpression) {
-            return operand;
-        }
-
-        return binaryOperandNeedsParentheses(binaryOperator, operand, isLeftSideOfBinary, leftOperand)
-            ? createParen(operand)
-            : operand;
-    }
-
-    /**
-     * Determines whether the operand to a BinaryExpression needs to be parenthesized.
-     *
-     * @param binaryOperator The operator for the BinaryExpression.
-     * @param operand The operand for the BinaryExpression.
-     * @param isLeftSideOfBinary A value indicating whether the operand is the left side of the
-     *                           BinaryExpression.
-     */
-    function binaryOperandNeedsParentheses(binaryOperator: SyntaxKind, operand: Expression, isLeftSideOfBinary: boolean, leftOperand: Expression) {
-        // If the operand has lower precedence, then it needs to be parenthesized to preserve the
-        // intent of the expression. For example, if the operand is `a + b` and the operator is
-        // `*`, then we need to parenthesize the operand to preserve the intended order of
-        // operations: `(a + b) * x`.
-        //
-        // If the operand has higher precedence, then it does not need to be parenthesized. For
-        // example, if the operand is `a * b` and the operator is `+`, then we do not need to
-        // parenthesize to preserve the intended order of operations: `a * b + x`.
-        //
-        // If the operand has the same precedence, then we need to check the associativity of
-        // the operator based on whether this is the left or right operand of the expression.
-        //
-        // For example, if `a / d` is on the right of operator `*`, we need to parenthesize
-        // to preserve the intended order of operations: `x * (a / d)`
-        //
-        // If `a ** d` is on the left of operator `**`, we need to parenthesize to preserve
-        // the intended order of operations: `(a ** b) ** c`
-        const binaryOperatorPrecedence = getOperatorPrecedence(SyntaxKind.BinaryExpression, binaryOperator);
-        const binaryOperatorAssociativity = getOperatorAssociativity(SyntaxKind.BinaryExpression, binaryOperator);
-        const emittedOperand = skipPartiallyEmittedExpressions(operand);
-        const operandPrecedence = getExpressionPrecedence(emittedOperand);
-        switch (compareValues(operandPrecedence, binaryOperatorPrecedence)) {
-            case Comparison.LessThan:
-                // If the operand is the right side of a right-associative binary operation
-                // and is a yield expression, then we do not need parentheses.
-                if (!isLeftSideOfBinary
-                    && binaryOperatorAssociativity === Associativity.Right
-                    && operand.kind === SyntaxKind.YieldExpression) {
-                    return false;
-                }
-
-                return true;
-
-            case Comparison.GreaterThan:
-                return false;
-
-            case Comparison.EqualTo:
-                if (isLeftSideOfBinary) {
-                    // No need to parenthesize the left operand when the binary operator is
-                    // left associative:
-                    //  (a*b)/x    ->  a*b/x
-                    //  (a**b)/x   ->  a**b/x
-                    //
-                    // Parentheses are needed for the left operand when the binary operator is
-                    // right associative:
-                    //  (a/b)**x   ->  (a/b)**x
-                    //  (a**b)**x  ->  (a**b)**x
-                    return binaryOperatorAssociativity === Associativity.Right;
-                }
-                else {
-                    if (isBinaryExpression(emittedOperand)
-                        && emittedOperand.operatorToken.kind === binaryOperator) {
-                        // No need to parenthesize the right operand when the binary operator and
-                        // operand are the same and one of the following:
-                        //  x*(a*b)     => x*a*b
-                        //  x|(a|b)     => x|a|b
-                        //  x&(a&b)     => x&a&b
-                        //  x^(a^b)     => x^a^b
-                        if (operatorHasAssociativeProperty(binaryOperator)) {
-                            return false;
-                        }
-
-                        // No need to parenthesize the right operand when the binary operator
-                        // is plus (+) if both the left and right operands consist solely of either
-                        // literals of the same kind or binary plus (+) expressions for literals of
-                        // the same kind (recursively).
-                        //  "a"+(1+2)       => "a"+(1+2)
-                        //  "a"+("b"+"c")   => "a"+"b"+"c"
-                        if (binaryOperator === SyntaxKind.PlusToken) {
-                            const leftKind = leftOperand ? getLiteralKindOfBinaryPlusOperand(leftOperand) : SyntaxKind.Unknown;
-                            if (isLiteralKind(leftKind) && leftKind === getLiteralKindOfBinaryPlusOperand(emittedOperand)) {
-                                return false;
-                            }
-                        }
-                    }
-
-                    // No need to parenthesize the right operand when the operand is right
-                    // associative:
-                    //  x/(a**b)    -> x/a**b
-                    //  x**(a**b)   -> x**a**b
-                    //
-                    // Parentheses are needed for the right operand when the operand is left
-                    // associative:
-                    //  x/(a*b)     -> x/(a*b)
-                    //  x**(a/b)    -> x**(a/b)
-                    const operandAssociativity = getExpressionAssociativity(emittedOperand);
-                    return operandAssociativity === Associativity.Left;
-                }
-        }
-    }
-
-    /**
-     * Determines whether a binary operator is mathematically associative.
-     *
-     * @param binaryOperator The binary operator.
-     */
-    function operatorHasAssociativeProperty(binaryOperator: SyntaxKind) {
-        // The following operators are associative in JavaScript:
-        //  (a*b)*c     -> a*(b*c)  -> a*b*c
-        //  (a|b)|c     -> a|(b|c)  -> a|b|c
-        //  (a&b)&c     -> a&(b&c)  -> a&b&c
-        //  (a^b)^c     -> a^(b^c)  -> a^b^c
-        //
-        // While addition is associative in mathematics, JavaScript's `+` is not
-        // guaranteed to be associative as it is overloaded with string concatenation.
-        return binaryOperator === SyntaxKind.AsteriskToken
-            || binaryOperator === SyntaxKind.BarToken
-            || binaryOperator === SyntaxKind.AmpersandToken
-            || binaryOperator === SyntaxKind.CaretToken;
-    }
-
-    interface BinaryPlusExpression extends BinaryExpression {
-        cachedLiteralKind: SyntaxKind;
-    }
-
-    /**
-     * This function determines whether an expression consists of a homogeneous set of
-     * literal expressions or binary plus expressions that all share the same literal kind.
-     * It is used to determine whether the right-hand operand of a binary plus expression can be
-     * emitted without parentheses.
-     */
-    function getLiteralKindOfBinaryPlusOperand(node: Expression): SyntaxKind {
-        node = skipPartiallyEmittedExpressions(node);
-
-        if (isLiteralKind(node.kind)) {
-            return node.kind;
-        }
-
-        if (node.kind === SyntaxKind.BinaryExpression && (<BinaryExpression>node).operatorToken.kind === SyntaxKind.PlusToken) {
-            if ((<BinaryPlusExpression>node).cachedLiteralKind !== undefined) {
-                return (<BinaryPlusExpression>node).cachedLiteralKind;
-            }
-
-            const leftKind = getLiteralKindOfBinaryPlusOperand((<BinaryExpression>node).left);
-            const literalKind = isLiteralKind(leftKind)
-                && leftKind === getLiteralKindOfBinaryPlusOperand((<BinaryExpression>node).right)
-                    ? leftKind
-                    : SyntaxKind.Unknown;
-
-            (<BinaryPlusExpression>node).cachedLiteralKind = literalKind;
-            return literalKind;
-        }
-
-        return SyntaxKind.Unknown;
-    }
-
-    /**
-     * Wraps an expression in parentheses if it is needed in order to use the expression
-     * as the expression of a NewExpression node.
-     *
-     * @param expression The Expression node.
-     */
-    export function parenthesizeForNew(expression: Expression): LeftHandSideExpression {
-        const emittedExpression = skipPartiallyEmittedExpressions(expression);
-        switch (emittedExpression.kind) {
-            case SyntaxKind.CallExpression:
-                return createParen(expression);
-
-            case SyntaxKind.NewExpression:
-                return (<NewExpression>emittedExpression).arguments
-                    ? <LeftHandSideExpression>expression
-                    : createParen(expression);
-        }
-
-        return parenthesizeForAccess(expression);
-    }
-
-    /**
-     * Wraps an expression in parentheses if it is needed in order to use the expression for
-     * property or element access.
-     *
-     * @param expr The expression node.
-     */
-    export function parenthesizeForAccess(expression: Expression): LeftHandSideExpression {
-        // isLeftHandSideExpression is almost the correct criterion for when it is not necessary
-        // to parenthesize the expression before a dot. The known exceptions are:
-        //
-        //    NewExpression:
-        //       new C.x        -> not the same as (new C).x
-        //    NumericLiteral
-        //       1.x            -> not the same as (1).x
-        //
-        const emittedExpression = skipPartiallyEmittedExpressions(expression);
-        if (isLeftHandSideExpression(emittedExpression)
-            && (emittedExpression.kind !== SyntaxKind.NewExpression || (<NewExpression>emittedExpression).arguments)
-            && emittedExpression.kind !== SyntaxKind.NumericLiteral) {
-            return <LeftHandSideExpression>expression;
-        }
-
-        return createParen(expression, /*location*/ expression);
-    }
-
-    export function parenthesizePostfixOperand(operand: Expression) {
-        return isLeftHandSideExpression(operand)
-            ? <LeftHandSideExpression>operand
-            : createParen(operand, /*location*/ operand);
-    }
-
-    export function parenthesizePrefixOperand(operand: Expression) {
-        return isUnaryExpression(operand)
-            ? <UnaryExpression>operand
-            : createParen(operand, /*location*/ operand);
-    }
-
-    function parenthesizeListElements(elements: NodeArray<Expression>) {
-        let result: Expression[];
-        for (let i = 0; i < elements.length; i++) {
-            const element = parenthesizeExpressionForList(elements[i]);
-            if (result !== undefined || element !== elements[i]) {
-                if (result === undefined) {
-                    result = elements.slice(0, i);
-                }
-
-                result.push(element);
-            }
-        }
-
-        if (result !== undefined) {
-            return createNodeArray(result, elements, elements.hasTrailingComma);
-        }
-
-        return elements;
-    }
-
-    export function parenthesizeExpressionForList(expression: Expression) {
-        const emittedExpression = skipPartiallyEmittedExpressions(expression);
-        const expressionPrecedence = getExpressionPrecedence(emittedExpression);
-        const commaPrecedence = getOperatorPrecedence(SyntaxKind.BinaryExpression, SyntaxKind.CommaToken);
-        return expressionPrecedence > commaPrecedence
-            ? expression
-            : createParen(expression, /*location*/ expression);
-    }
-
-    export function parenthesizeExpressionForExpressionStatement(expression: Expression) {
-        const emittedExpression = skipPartiallyEmittedExpressions(expression);
-        if (isCallExpression(emittedExpression)) {
-            const callee = emittedExpression.expression;
-            const kind = skipPartiallyEmittedExpressions(callee).kind;
-            if (kind === SyntaxKind.FunctionExpression || kind === SyntaxKind.ArrowFunction) {
-                const mutableCall = getMutableClone(emittedExpression);
-                mutableCall.expression = createParen(callee, /*location*/ callee);
-                return recreatePartiallyEmittedExpressions(expression, mutableCall);
-            }
-        }
-        else {
-            const leftmostExpressionKind = getLeftmostExpression(emittedExpression).kind;
-            if (leftmostExpressionKind === SyntaxKind.ObjectLiteralExpression || leftmostExpressionKind === SyntaxKind.FunctionExpression) {
-                return createParen(expression, /*location*/ expression);
-            }
-        }
-
-        return expression;
-    }
-
-    /**
-     * Clones a series of not-emitted expressions with a new inner expression.
-     *
-     * @param originalOuterExpression The original outer expression.
-     * @param newInnerExpression The new inner expression.
-     */
-    function recreatePartiallyEmittedExpressions(originalOuterExpression: Expression, newInnerExpression: Expression) {
-        if (isPartiallyEmittedExpression(originalOuterExpression)) {
-            const clone = getMutableClone(originalOuterExpression);
-            clone.expression = recreatePartiallyEmittedExpressions(clone.expression, newInnerExpression);
-            return clone;
-        }
-
-        return newInnerExpression;
-    }
-
-    function getLeftmostExpression(node: Expression): Expression {
-        while (true) {
-            switch (node.kind) {
-                case SyntaxKind.PostfixUnaryExpression:
-                    node = (<PostfixUnaryExpression>node).operand;
-                    continue;
-
-                case SyntaxKind.BinaryExpression:
-                    node = (<BinaryExpression>node).left;
-                    continue;
-
-                case SyntaxKind.ConditionalExpression:
-                    node = (<ConditionalExpression>node).condition;
-                    continue;
-
-                case SyntaxKind.CallExpression:
-                case SyntaxKind.ElementAccessExpression:
-                case SyntaxKind.PropertyAccessExpression:
-                    node = (<CallExpression | PropertyAccessExpression | ElementAccessExpression>node).expression;
-                    continue;
-
-                case SyntaxKind.PartiallyEmittedExpression:
-                    node = (<PartiallyEmittedExpression>node).expression;
-                    continue;
-            }
-
-            return node;
-        }
-    }
-
-    export function parenthesizeConciseBody(body: ConciseBody): ConciseBody {
-        const emittedBody = skipPartiallyEmittedExpressions(body);
-        if (emittedBody.kind === SyntaxKind.ObjectLiteralExpression) {
-            return createParen(<Expression>body, /*location*/ body);
-        }
-
-        return body;
-    }
-
-    export const enum OuterExpressionKinds {
-        Parentheses = 1 << 0,
-        Assertions = 1 << 1,
-        PartiallyEmittedExpressions = 1 << 2,
-
-        All = Parentheses | Assertions | PartiallyEmittedExpressions
-    }
-
-    export function skipOuterExpressions(node: Expression, kinds?: OuterExpressionKinds): Expression;
-    export function skipOuterExpressions(node: Node, kinds?: OuterExpressionKinds): Node;
-    export function skipOuterExpressions(node: Node, kinds = OuterExpressionKinds.All) {
-        let previousNode: Node;
-        do {
-            previousNode = node;
-            if (kinds & OuterExpressionKinds.Parentheses) {
-                node = skipParentheses(node);
-            }
-
-            if (kinds & OuterExpressionKinds.Assertions) {
-                node = skipAssertions(node);
-            }
-
-            if (kinds & OuterExpressionKinds.PartiallyEmittedExpressions) {
-                node = skipPartiallyEmittedExpressions(node);
-            }
-        }
-        while (previousNode !== node);
-
-        return node;
-    }
-
-    export function skipParentheses(node: Expression): Expression;
-    export function skipParentheses(node: Node): Node;
-    export function skipParentheses(node: Node): Node {
-        while (node.kind === SyntaxKind.ParenthesizedExpression) {
-            node = (<ParenthesizedExpression>node).expression;
-        }
-
-        return node;
-    }
-
-    export function skipAssertions(node: Expression): Expression;
-    export function skipAssertions(node: Node): Node;
-    export function skipAssertions(node: Node): Node {
-        while (isAssertionExpression(node)) {
-            node = (<AssertionExpression>node).expression;
-        }
-
-        return node;
-    }
-
-    export function skipPartiallyEmittedExpressions(node: Expression): Expression;
-    export function skipPartiallyEmittedExpressions(node: Node): Node;
-    export function skipPartiallyEmittedExpressions(node: Node) {
-        while (node.kind === SyntaxKind.PartiallyEmittedExpression) {
-            node = (<PartiallyEmittedExpression>node).expression;
-        }
-
-        return node;
-    }
-
     export function startOnNewLine<T extends Node>(node: T): T {
         node.startsOnNewLine = true;
         return node;
@@ -3295,7 +2894,7 @@ namespace ts {
                     createVariableStatement(
                         /*modifiers*/ undefined,
                         createVariableDeclarationList(
-                            flattenDestructuringToDeclarations(
+                            flattenDestructuringBinding(
                                 context,
                                 parameter,
                                 temp,
@@ -3454,9 +3053,6 @@ namespace ts {
         statements.push(forStatement);
     }
 
-
-
-
     export function convertForOf(node: ForOfStatement, convertedLoopBodyStatements: Statement[],
                                  visitor: (node: Node) => VisitResult<Node>,
                                  enableSubstitutionsForBlockScopedBindings: () => void,
@@ -3509,7 +3105,7 @@ namespace ts {
             if (firstOriginalDeclaration && isBindingPattern(firstOriginalDeclaration.name)) {
                 // This works whether the declaration is a var, let, or const.
                 // It will use rhsIterationValue _a[_i] as the initializer.
-                const declarations = flattenDestructuringToDeclarations(
+                const declarations = flattenDestructuringBinding(
                     context,
                     firstOriginalDeclaration,
                     elementAccess,
@@ -3566,7 +3162,7 @@ namespace ts {
                 // This is a destructuring pattern, so we flatten the destructuring instead.
                 statements.push(
                     createStatement(
-                        flattenDestructuringToExpression(
+                        flattenDestructuringAssignment(
                             context,
                             assignment,
                             /*needsValue*/ false,
@@ -3651,4 +3247,680 @@ namespace ts {
         setEmitFlags(forStatement, EmitFlags.NoTokenTrailingSourceMaps);
         return forStatement;
     }
+
+    /**
+     * Gets the initializer of an BindingOrAssignmentElement.
+     */
+    export function getInitializerOfBindingOrAssignmentElement(bindingElement: BindingOrAssignmentElement): Expression | undefined {
+        if (isDeclarationBindingElement(bindingElement)) {
+            // `1` in `let { a = 1 } = ...`
+            // `1` in `let { a: b = 1 } = ...`
+            // `1` in `let { a: {b} = 1 } = ...`
+            // `1` in `let { a: [b] = 1 } = ...`
+            // `1` in `let [a = 1] = ...`
+            // `1` in `let [{a} = 1] = ...`
+            // `1` in `let [[a] = 1] = ...`
+            return bindingElement.initializer;
+        }
+
+        if (isPropertyAssignment(bindingElement)) {
+            // `1` in `({ a: b = 1 } = ...)`
+            // `1` in `({ a: {b} = 1 } = ...)`
+            // `1` in `({ a: [b] = 1 } = ...)`
+            return isAssignmentExpression(bindingElement.initializer, /*excludeCompoundAssignment*/ true)
+                ? bindingElement.initializer.right
+                : undefined;
+        }
+
+        if (isShorthandPropertyAssignment(bindingElement)) {
+            // `1` in `({ a = 1 } = ...)`
+            return bindingElement.objectAssignmentInitializer;
+        }
+
+        if (isAssignmentExpression(bindingElement, /*excludeCompoundAssignment*/ true)) {
+            // `1` in `[a = 1] = ...`
+            // `1` in `[{a} = 1] = ...`
+            // `1` in `[[a] = 1] = ...`
+            return bindingElement.right;
+        }
+
+        if (isSpreadExpression(bindingElement) && isBindingOrAssignmentElement(bindingElement.expression)) {
+            // Recovery consistent with existing emit.
+            return getInitializerOfBindingOrAssignmentElement(bindingElement.expression);
+        }
+    }
+
+    /**
+     * Gets the name of an BindingOrAssignmentElement.
+     */
+    export function getTargetOfBindingOrAssignmentElement(bindingElement: BindingOrAssignmentElement): BindingOrAssignmentElementTarget {
+        if (isDeclarationBindingElement(bindingElement)) {
+            // `a` in `let { a } = ...`
+            // `a` in `let { a = 1 } = ...`
+            // `b` in `let { a: b } = ...`
+            // `b` in `let { a: b = 1 } = ...`
+            // `a` in `let { ...a } = ...`
+            // `{b}` in `let { a: {b} } = ...`
+            // `{b}` in `let { a: {b} = 1 } = ...`
+            // `[b]` in `let { a: [b] } = ...`
+            // `[b]` in `let { a: [b] = 1 } = ...`
+            // `a` in `let [a] = ...`
+            // `a` in `let [a = 1] = ...`
+            // `a` in `let [...a] = ...`
+            // `{a}` in `let [{a}] = ...`
+            // `{a}` in `let [{a} = 1] = ...`
+            // `[a]` in `let [[a]] = ...`
+            // `[a]` in `let [[a] = 1] = ...`
+            return <ObjectBindingPattern | ArrayBindingPattern | Identifier>bindingElement.name;
+        }
+
+        if (isObjectLiteralElementLike(bindingElement)) {
+            switch (bindingElement.kind) {
+                case SyntaxKind.PropertyAssignment:
+                    // `b` in `({ a: b } = ...)`
+                    // `b` in `({ a: b = 1 } = ...)`
+                    // `{b}` in `({ a: {b} } = ...)`
+                    // `{b}` in `({ a: {b} = 1 } = ...)`
+                    // `[b]` in `({ a: [b] } = ...)`
+                    // `[b]` in `({ a: [b] = 1 } = ...)`
+                    // `b.c` in `({ a: b.c } = ...)`
+                    // `b.c` in `({ a: b.c = 1 } = ...)`
+                    // `b[0]` in `({ a: b[0] } = ...)`
+                    // `b[0]` in `({ a: b[0] = 1 } = ...)`
+                    return isBindingOrAssignmentElement(bindingElement.initializer)
+                        ? getTargetOfBindingOrAssignmentElement(bindingElement.initializer)
+                        : undefined;
+
+                case SyntaxKind.ShorthandPropertyAssignment:
+                    // `a` in `({ a } = ...)`
+                    // `a` in `({ a = 1 } = ...)`
+                    return bindingElement.name;
+
+                case SyntaxKind.SpreadAssignment:
+                    // `a` in `({ ...a } = ...)`
+                    return isBindingOrAssignmentElement(bindingElement.expression)
+                        ? getTargetOfBindingOrAssignmentElement(bindingElement.expression)
+                        : undefined;
+            }
+
+            // no target
+            return undefined;
+        }
+
+        if (isAssignmentExpression(bindingElement, /*excludeCompoundAssignment*/ true)) {
+            // `a` in `[a = 1] = ...`
+            // `{a}` in `[{a} = 1] = ...`
+            // `[a]` in `[[a] = 1] = ...`
+            // `a.b` in `[a.b = 1] = ...`
+            // `a[0]` in `[a[0] = 1] = ...`
+            return isBindingOrAssignmentElement(bindingElement.left)
+                ? getTargetOfBindingOrAssignmentElement(bindingElement.left)
+                : undefined;
+        }
+
+        if (isSpreadExpression(bindingElement)) {
+            // `a` in `[...a] = ...`
+            return isBindingOrAssignmentElement(bindingElement.expression)
+                ? getTargetOfBindingOrAssignmentElement(bindingElement.expression)
+                : undefined;
+        }
+
+        // `a` in `[a] = ...`
+        // `{a}` in `[{a}] = ...`
+        // `[a]` in `[[a]] = ...`
+        // `a.b` in `[a.b] = ...`
+        // `a[0]` in `[a[0]] = ...`
+        return bindingElement;
+    }
+
+    /**
+     * Determines whether an BindingOrAssignmentElement is a rest element.
+     */
+    export function getRestIndicatorOfBindingOrAssignmentElement(bindingElement: BindingOrAssignmentElement): BindingOrAssignmentElementRestIndicator {
+        switch (bindingElement.kind) {
+            case SyntaxKind.Parameter:
+            case SyntaxKind.BindingElement:
+                // `...` in `let [...a] = ...`
+                return (<ParameterDeclaration | BindingElement>bindingElement).dotDotDotToken;
+
+            case SyntaxKind.SpreadElement:
+            case SyntaxKind.SpreadAssignment:
+                // `...` in `[...a] = ...`
+                return <SpreadElement | SpreadAssignment>bindingElement;
+        }
+
+        return undefined;
+    }
+
+    /**
+     * Gets the property name of a BindingOrAssignmentElement
+     */
+    export function getPropertyNameOfBindingOrAssignmentElement(bindingElement: BindingOrAssignmentElement) {
+        switch (bindingElement.kind) {
+            case SyntaxKind.BindingElement:
+                // `a` in `let { a: b } = ...`
+                // `[a]` in `let { [a]: b } = ...`
+                // `"a"` in `let { "a": b } = ...`
+                // `1` in `let { 1: b } = ...`
+                if ((<BindingElement>bindingElement).propertyName) {
+                    return (<BindingElement>bindingElement).propertyName;
+                }
+
+                break;
+
+            case SyntaxKind.PropertyAssignment:
+                // `a` in `({ a: b } = ...)`
+                // `[a]` in `({ [a]: b } = ...)`
+                // `"a"` in `({ "a": b } = ...)`
+                // `1` in `({ 1: b } = ...)`
+                if ((<PropertyAssignment>bindingElement).name) {
+                    return (<PropertyAssignment>bindingElement).name;
+                }
+
+                break;
+
+            case SyntaxKind.SpreadAssignment:
+                // `a` in `({ ...a } = ...)`
+                return (<SpreadAssignment>bindingElement).name;
+        }
+
+        const target = getTargetOfBindingOrAssignmentElement(bindingElement);
+        if (target && isPropertyName(target)) {
+            return target;
+        }
+
+        Debug.fail("Invalid property name for binding element.");
+    }
+
+    /**
+     * Gets the elements of a BindingOrAssignmentPattern
+     */
+    export function getElementsOfBindingOrAssignmentPattern(name: BindingOrAssignmentPattern): BindingOrAssignmentElement[] {
+        switch (name.kind) {
+            case SyntaxKind.ObjectBindingPattern:
+            case SyntaxKind.ArrayBindingPattern:
+            case SyntaxKind.ArrayLiteralExpression:
+                // `a` in `{a}`
+                // `a` in `[a]`
+                return map(name.elements, convertToBindingOrAssignmentElement);
+
+            case SyntaxKind.ObjectLiteralExpression:
+                // `a` in `{a}`
+                return filter(name.properties, isBindingOrAssignmentElement);
+        }
+    }
+
+    function convertToBindingOrAssignmentElement(node: Node) {
+        return isBindingOrAssignmentElement(node) ? node : createOmittedExpression(node);
+    }
+
+    export function convertToArrayAssignmentElement(element: BindingOrAssignmentElement) {
+        if (isBindingElement(element)) {
+            if (element.dotDotDotToken) {
+                Debug.assertNode(element.name, isIdentifier);
+                return setOriginalNode(createSpread(<Identifier>element.name, element), element);
+            }
+            const expression = convertToAssignmentElementTarget(<ObjectBindingPattern | ArrayBindingPattern | Identifier>element.name);
+            return element.initializer ? setOriginalNode(createAssignment(expression, element.initializer, element), element) : expression;
+        }
+        Debug.assertNode(element, isExpression);
+        return <Expression>element;
+    }
+
+    export function convertToObjectAssignmentElement(element: BindingOrAssignmentElement) {
+        if (isBindingElement(element)) {
+            if (element.dotDotDotToken) {
+                Debug.assertNode(element.name, isIdentifier);
+                return setOriginalNode(createSpreadAssignment(<Identifier>element.name, element), element);
+            }
+            if (element.propertyName) {
+                const expression = convertToAssignmentElementTarget(<ObjectBindingPattern | ArrayBindingPattern | Identifier>element.name);
+                return setOriginalNode(createPropertyAssignment(element.propertyName, element.initializer ? createAssignment(expression, element.initializer) : expression, element), element);
+            }
+            Debug.assertNode(element.name, isIdentifier);
+            return setOriginalNode(createShorthandPropertyAssignment(<Identifier>element.name, element.initializer, element), element);
+        }
+        Debug.assertNode(element, isObjectLiteralElementLike);
+        return <ObjectLiteralElementLike>element;
+    }
+
+    export function convertToAssignmentPattern(node: BindingOrAssignmentPattern): AssignmentPattern {
+        switch (node.kind) {
+            case SyntaxKind.ArrayBindingPattern:
+            case SyntaxKind.ArrayLiteralExpression:
+                return convertToArrayAssignmentPattern(node);
+
+            case SyntaxKind.ObjectBindingPattern:
+            case SyntaxKind.ObjectLiteralExpression:
+                return convertToObjectAssignmentPattern(node);
+        }
+    }
+
+    export function convertToObjectAssignmentPattern(node: ObjectBindingOrAssignmentPattern) {
+        if (isObjectBindingPattern(node)) {
+            return setOriginalNode(createObjectLiteral(map(node.elements, convertToObjectAssignmentElement), node), node);
+        }
+        Debug.assertNode(node, isObjectLiteralExpression);
+        return <ObjectLiteralExpression>node;
+    }
+
+    export function convertToArrayAssignmentPattern(node: ArrayBindingOrAssignmentPattern) {
+        if (isArrayBindingPattern(node)) {
+            return setOriginalNode(createArrayLiteral(map(node.elements, convertToArrayAssignmentElement), node), node);
+        }
+        Debug.assertNode(node, isArrayLiteralExpression);
+        return <ArrayLiteralExpression>node;
+    }
+
+    export function convertToAssignmentElementTarget(node: BindingOrAssignmentElementTarget): Expression {
+        if (isBindingPattern(node)) {
+            return convertToAssignmentPattern(node);
+        }
+
+        Debug.assertNode(node, isExpression);
+        return <Expression>node;
+    }
+
+    // Parenthesizing
+
+    /**
+     * Wraps the operand to a BinaryExpression in parentheses if they are needed to preserve the intended
+     * order of operations.
+     *
+     * @param binaryOperator The operator for the BinaryExpression.
+     * @param operand The operand for the BinaryExpression.
+     * @param isLeftSideOfBinary A value indicating whether the operand is the left side of the
+     *                           BinaryExpression.
+     */
+    export function parenthesizeBinaryOperand(binaryOperator: SyntaxKind, operand: Expression, isLeftSideOfBinary: boolean, leftOperand?: Expression) {
+        const skipped = skipPartiallyEmittedExpressions(operand);
+
+        // If the resulting expression is already parenthesized, we do not need to do any further processing.
+        if (skipped.kind === SyntaxKind.ParenthesizedExpression) {
+            return operand;
+        }
+
+        return binaryOperandNeedsParentheses(binaryOperator, operand, isLeftSideOfBinary, leftOperand)
+            ? createParen(operand)
+            : operand;
+    }
+
+    /**
+     * Determines whether the operand to a BinaryExpression needs to be parenthesized.
+     *
+     * @param binaryOperator The operator for the BinaryExpression.
+     * @param operand The operand for the BinaryExpression.
+     * @param isLeftSideOfBinary A value indicating whether the operand is the left side of the
+     *                           BinaryExpression.
+     */
+    function binaryOperandNeedsParentheses(binaryOperator: SyntaxKind, operand: Expression, isLeftSideOfBinary: boolean, leftOperand: Expression) {
+        // If the operand has lower precedence, then it needs to be parenthesized to preserve the
+        // intent of the expression. For example, if the operand is `a + b` and the operator is
+        // `*`, then we need to parenthesize the operand to preserve the intended order of
+        // operations: `(a + b) * x`.
+        //
+        // If the operand has higher precedence, then it does not need to be parenthesized. For
+        // example, if the operand is `a * b` and the operator is `+`, then we do not need to
+        // parenthesize to preserve the intended order of operations: `a * b + x`.
+        //
+        // If the operand has the same precedence, then we need to check the associativity of
+        // the operator based on whether this is the left or right operand of the expression.
+        //
+        // For example, if `a / d` is on the right of operator `*`, we need to parenthesize
+        // to preserve the intended order of operations: `x * (a / d)`
+        //
+        // If `a ** d` is on the left of operator `**`, we need to parenthesize to preserve
+        // the intended order of operations: `(a ** b) ** c`
+        const binaryOperatorPrecedence = getOperatorPrecedence(SyntaxKind.BinaryExpression, binaryOperator);
+        const binaryOperatorAssociativity = getOperatorAssociativity(SyntaxKind.BinaryExpression, binaryOperator);
+        const emittedOperand = skipPartiallyEmittedExpressions(operand);
+        const operandPrecedence = getExpressionPrecedence(emittedOperand);
+        switch (compareValues(operandPrecedence, binaryOperatorPrecedence)) {
+            case Comparison.LessThan:
+                // If the operand is the right side of a right-associative binary operation
+                // and is a yield expression, then we do not need parentheses.
+                if (!isLeftSideOfBinary
+                    && binaryOperatorAssociativity === Associativity.Right
+                    && operand.kind === SyntaxKind.YieldExpression) {
+                    return false;
+                }
+
+                return true;
+
+            case Comparison.GreaterThan:
+                return false;
+
+            case Comparison.EqualTo:
+                if (isLeftSideOfBinary) {
+                    // No need to parenthesize the left operand when the binary operator is
+                    // left associative:
+                    //  (a*b)/x    ->  a*b/x
+                    //  (a**b)/x   ->  a**b/x
+                    //
+                    // Parentheses are needed for the left operand when the binary operator is
+                    // right associative:
+                    //  (a/b)**x   ->  (a/b)**x
+                    //  (a**b)**x  ->  (a**b)**x
+                    return binaryOperatorAssociativity === Associativity.Right;
+                }
+                else {
+                    if (isBinaryExpression(emittedOperand)
+                        && emittedOperand.operatorToken.kind === binaryOperator) {
+                        // No need to parenthesize the right operand when the binary operator and
+                        // operand are the same and one of the following:
+                        //  x*(a*b)     => x*a*b
+                        //  x|(a|b)     => x|a|b
+                        //  x&(a&b)     => x&a&b
+                        //  x^(a^b)     => x^a^b
+                        if (operatorHasAssociativeProperty(binaryOperator)) {
+                            return false;
+                        }
+
+                        // No need to parenthesize the right operand when the binary operator
+                        // is plus (+) if both the left and right operands consist solely of either
+                        // literals of the same kind or binary plus (+) expressions for literals of
+                        // the same kind (recursively).
+                        //  "a"+(1+2)       => "a"+(1+2)
+                        //  "a"+("b"+"c")   => "a"+"b"+"c"
+                        if (binaryOperator === SyntaxKind.PlusToken) {
+                            const leftKind = leftOperand ? getLiteralKindOfBinaryPlusOperand(leftOperand) : SyntaxKind.Unknown;
+                            if (isLiteralKind(leftKind) && leftKind === getLiteralKindOfBinaryPlusOperand(emittedOperand)) {
+                                return false;
+                            }
+                        }
+                    }
+
+                    // No need to parenthesize the right operand when the operand is right
+                    // associative:
+                    //  x/(a**b)    -> x/a**b
+                    //  x**(a**b)   -> x**a**b
+                    //
+                    // Parentheses are needed for the right operand when the operand is left
+                    // associative:
+                    //  x/(a*b)     -> x/(a*b)
+                    //  x**(a/b)    -> x**(a/b)
+                    const operandAssociativity = getExpressionAssociativity(emittedOperand);
+                    return operandAssociativity === Associativity.Left;
+                }
+        }
+    }
+
+    /**
+     * Determines whether a binary operator is mathematically associative.
+     *
+     * @param binaryOperator The binary operator.
+     */
+    function operatorHasAssociativeProperty(binaryOperator: SyntaxKind) {
+        // The following operators are associative in JavaScript:
+        //  (a*b)*c     -> a*(b*c)  -> a*b*c
+        //  (a|b)|c     -> a|(b|c)  -> a|b|c
+        //  (a&b)&c     -> a&(b&c)  -> a&b&c
+        //  (a^b)^c     -> a^(b^c)  -> a^b^c
+        //
+        // While addition is associative in mathematics, JavaScript's `+` is not
+        // guaranteed to be associative as it is overloaded with string concatenation.
+        return binaryOperator === SyntaxKind.AsteriskToken
+            || binaryOperator === SyntaxKind.BarToken
+            || binaryOperator === SyntaxKind.AmpersandToken
+            || binaryOperator === SyntaxKind.CaretToken;
+    }
+
+    interface BinaryPlusExpression extends BinaryExpression {
+        cachedLiteralKind: SyntaxKind;
+    }
+
+    /**
+     * This function determines whether an expression consists of a homogeneous set of
+     * literal expressions or binary plus expressions that all share the same literal kind.
+     * It is used to determine whether the right-hand operand of a binary plus expression can be
+     * emitted without parentheses.
+     */
+    function getLiteralKindOfBinaryPlusOperand(node: Expression): SyntaxKind {
+        node = skipPartiallyEmittedExpressions(node);
+
+        if (isLiteralKind(node.kind)) {
+            return node.kind;
+        }
+
+        if (node.kind === SyntaxKind.BinaryExpression && (<BinaryExpression>node).operatorToken.kind === SyntaxKind.PlusToken) {
+            if ((<BinaryPlusExpression>node).cachedLiteralKind !== undefined) {
+                return (<BinaryPlusExpression>node).cachedLiteralKind;
+            }
+
+            const leftKind = getLiteralKindOfBinaryPlusOperand((<BinaryExpression>node).left);
+            const literalKind = isLiteralKind(leftKind)
+                && leftKind === getLiteralKindOfBinaryPlusOperand((<BinaryExpression>node).right)
+                    ? leftKind
+                    : SyntaxKind.Unknown;
+
+            (<BinaryPlusExpression>node).cachedLiteralKind = literalKind;
+            return literalKind;
+        }
+
+        return SyntaxKind.Unknown;
+    }
+
+    /**
+     * Wraps an expression in parentheses if it is needed in order to use the expression
+     * as the expression of a NewExpression node.
+     *
+     * @param expression The Expression node.
+     */
+    export function parenthesizeForNew(expression: Expression): LeftHandSideExpression {
+        const emittedExpression = skipPartiallyEmittedExpressions(expression);
+        switch (emittedExpression.kind) {
+            case SyntaxKind.CallExpression:
+                return createParen(expression);
+
+            case SyntaxKind.NewExpression:
+                return (<NewExpression>emittedExpression).arguments
+                    ? <LeftHandSideExpression>expression
+                    : createParen(expression);
+        }
+
+        return parenthesizeForAccess(expression);
+    }
+
+    /**
+     * Wraps an expression in parentheses if it is needed in order to use the expression for
+     * property or element access.
+     *
+     * @param expr The expression node.
+     */
+    export function parenthesizeForAccess(expression: Expression): LeftHandSideExpression {
+        // isLeftHandSideExpression is almost the correct criterion for when it is not necessary
+        // to parenthesize the expression before a dot. The known exceptions are:
+        //
+        //    NewExpression:
+        //       new C.x        -> not the same as (new C).x
+        //    NumericLiteral
+        //       1.x            -> not the same as (1).x
+        //
+        const emittedExpression = skipPartiallyEmittedExpressions(expression);
+        if (isLeftHandSideExpression(emittedExpression)
+            && (emittedExpression.kind !== SyntaxKind.NewExpression || (<NewExpression>emittedExpression).arguments)
+            && emittedExpression.kind !== SyntaxKind.NumericLiteral) {
+            return <LeftHandSideExpression>expression;
+        }
+
+        return createParen(expression, /*location*/ expression);
+    }
+
+    export function parenthesizePostfixOperand(operand: Expression) {
+        return isLeftHandSideExpression(operand)
+            ? <LeftHandSideExpression>operand
+            : createParen(operand, /*location*/ operand);
+    }
+
+    export function parenthesizePrefixOperand(operand: Expression) {
+        return isUnaryExpression(operand)
+            ? <UnaryExpression>operand
+            : createParen(operand, /*location*/ operand);
+    }
+
+    function parenthesizeListElements(elements: NodeArray<Expression>) {
+        let result: Expression[];
+        for (let i = 0; i < elements.length; i++) {
+            const element = parenthesizeExpressionForList(elements[i]);
+            if (result !== undefined || element !== elements[i]) {
+                if (result === undefined) {
+                    result = elements.slice(0, i);
+                }
+
+                result.push(element);
+            }
+        }
+
+        if (result !== undefined) {
+            return createNodeArray(result, elements, elements.hasTrailingComma);
+        }
+
+        return elements;
+    }
+
+    export function parenthesizeExpressionForList(expression: Expression) {
+        const emittedExpression = skipPartiallyEmittedExpressions(expression);
+        const expressionPrecedence = getExpressionPrecedence(emittedExpression);
+        const commaPrecedence = getOperatorPrecedence(SyntaxKind.BinaryExpression, SyntaxKind.CommaToken);
+        return expressionPrecedence > commaPrecedence
+            ? expression
+            : createParen(expression, /*location*/ expression);
+    }
+
+    export function parenthesizeExpressionForExpressionStatement(expression: Expression) {
+        const emittedExpression = skipPartiallyEmittedExpressions(expression);
+        if (isCallExpression(emittedExpression)) {
+            const callee = emittedExpression.expression;
+            const kind = skipPartiallyEmittedExpressions(callee).kind;
+            if (kind === SyntaxKind.FunctionExpression || kind === SyntaxKind.ArrowFunction) {
+                const mutableCall = getMutableClone(emittedExpression);
+                mutableCall.expression = createParen(callee, /*location*/ callee);
+                return recreatePartiallyEmittedExpressions(expression, mutableCall);
+            }
+        }
+        else {
+            const leftmostExpressionKind = getLeftmostExpression(emittedExpression).kind;
+            if (leftmostExpressionKind === SyntaxKind.ObjectLiteralExpression || leftmostExpressionKind === SyntaxKind.FunctionExpression) {
+                return createParen(expression, /*location*/ expression);
+            }
+        }
+
+        return expression;
+    }
+
+    /**
+     * Clones a series of not-emitted expressions with a new inner expression.
+     *
+     * @param originalOuterExpression The original outer expression.
+     * @param newInnerExpression The new inner expression.
+     */
+    function recreatePartiallyEmittedExpressions(originalOuterExpression: Expression, newInnerExpression: Expression) {
+        if (isPartiallyEmittedExpression(originalOuterExpression)) {
+            const clone = getMutableClone(originalOuterExpression);
+            clone.expression = recreatePartiallyEmittedExpressions(clone.expression, newInnerExpression);
+            return clone;
+        }
+
+        return newInnerExpression;
+    }
+
+    function getLeftmostExpression(node: Expression): Expression {
+        while (true) {
+            switch (node.kind) {
+                case SyntaxKind.PostfixUnaryExpression:
+                    node = (<PostfixUnaryExpression>node).operand;
+                    continue;
+
+                case SyntaxKind.BinaryExpression:
+                    node = (<BinaryExpression>node).left;
+                    continue;
+
+                case SyntaxKind.ConditionalExpression:
+                    node = (<ConditionalExpression>node).condition;
+                    continue;
+
+                case SyntaxKind.CallExpression:
+                case SyntaxKind.ElementAccessExpression:
+                case SyntaxKind.PropertyAccessExpression:
+                    node = (<CallExpression | PropertyAccessExpression | ElementAccessExpression>node).expression;
+                    continue;
+
+                case SyntaxKind.PartiallyEmittedExpression:
+                    node = (<PartiallyEmittedExpression>node).expression;
+                    continue;
+            }
+
+            return node;
+        }
+    }
+
+    export function parenthesizeConciseBody(body: ConciseBody): ConciseBody {
+        const emittedBody = skipPartiallyEmittedExpressions(body);
+        if (emittedBody.kind === SyntaxKind.ObjectLiteralExpression) {
+            return createParen(<Expression>body, /*location*/ body);
+        }
+
+        return body;
+    }
+
+    export const enum OuterExpressionKinds {
+        Parentheses = 1 << 0,
+        Assertions = 1 << 1,
+        PartiallyEmittedExpressions = 1 << 2,
+
+        All = Parentheses | Assertions | PartiallyEmittedExpressions
+    }
+
+    export function skipOuterExpressions(node: Expression, kinds?: OuterExpressionKinds): Expression;
+    export function skipOuterExpressions(node: Node, kinds?: OuterExpressionKinds): Node;
+    export function skipOuterExpressions(node: Node, kinds = OuterExpressionKinds.All) {
+        let previousNode: Node;
+        do {
+            previousNode = node;
+            if (kinds & OuterExpressionKinds.Parentheses) {
+                node = skipParentheses(node);
+            }
+
+            if (kinds & OuterExpressionKinds.Assertions) {
+                node = skipAssertions(node);
+            }
+
+            if (kinds & OuterExpressionKinds.PartiallyEmittedExpressions) {
+                node = skipPartiallyEmittedExpressions(node);
+            }
+        }
+        while (previousNode !== node);
+
+        return node;
+    }
+
+    export function skipParentheses(node: Expression): Expression;
+    export function skipParentheses(node: Node): Node;
+    export function skipParentheses(node: Node): Node {
+        while (node.kind === SyntaxKind.ParenthesizedExpression) {
+            node = (<ParenthesizedExpression>node).expression;
+        }
+
+        return node;
+    }
+
+    export function skipAssertions(node: Expression): Expression;
+    export function skipAssertions(node: Node): Node;
+    export function skipAssertions(node: Node): Node {
+        while (isAssertionExpression(node)) {
+            node = (<AssertionExpression>node).expression;
+        }
+
+        return node;
+    }
+
+    export function skipPartiallyEmittedExpressions(node: Expression): Expression;
+    export function skipPartiallyEmittedExpressions(node: Node): Node;
+    export function skipPartiallyEmittedExpressions(node: Node) {
+        while (node.kind === SyntaxKind.PartiallyEmittedExpression) {
+            node = (<PartiallyEmittedExpression>node).expression;
+        }
+
+        return node;
+    }
 }
diff --git a/src/compiler/transformers/destructuring.ts b/src/compiler/transformers/destructuring.ts
index d4886457062..b8da29ae291 100644
--- a/src/compiler/transformers/destructuring.ts
+++ b/src/compiler/transformers/destructuring.ts
@@ -3,80 +3,21 @@
 
 /*@internal*/
 namespace ts {
-    type EffectiveBindingOrAssignmentElement = VariableDeclaration | ParameterDeclaration | BindingElement | ObjectLiteralElementLike | Expression;
-    type EffectiveObjectBindingOrAssignmentPattern = ObjectBindingPattern | ObjectLiteralExpression;
-    type EffectiveArrayBindingOrAssignmentPattern = ArrayBindingPattern | ArrayLiteralExpression;
-    type EffectiveBindingOrAssignmentPattern = EffectiveObjectBindingOrAssignmentPattern | EffectiveArrayBindingOrAssignmentPattern;
-    type EffectiveBindingOrAssignmentTarget = EffectiveBindingOrAssignmentPattern | Expression;
-    type EffectiveBindingOrAssignmentRestIndicator = DotDotDotToken | SpreadElement | SpreadAssignment;
-
     interface FlattenHost {
         context: TransformationContext;
         level: FlattenLevel;
         recordTempVariablesInLine: boolean;
         emitExpression: (value: Expression) => void;
-        emitBindingOrAssignment: (target: EffectiveBindingOrAssignmentTarget, value: Expression, location: TextRange, original: Node) => void;
-        createArrayBindingOrAssignmentPattern: (elements: EffectiveBindingOrAssignmentElement[]) => EffectiveArrayBindingOrAssignmentPattern;
-        createObjectBindingOrAssignmentPattern: (elements: EffectiveBindingOrAssignmentElement[]) => EffectiveObjectBindingOrAssignmentPattern;
-        createArrayBindingOrAssignmentElement: (node: Identifier) => EffectiveBindingOrAssignmentElement;
+        emitBindingOrAssignment: (target: BindingOrAssignmentElementTarget, value: Expression, location: TextRange, original: Node) => void;
+        createArrayBindingOrAssignmentPattern: (elements: BindingOrAssignmentElement[]) => ArrayBindingOrAssignmentPattern;
+        createObjectBindingOrAssignmentPattern: (elements: BindingOrAssignmentElement[]) => ObjectBindingOrAssignmentPattern;
+        createArrayBindingOrAssignmentElement: (node: Identifier) => BindingOrAssignmentElement;
         visitor?: (node: Node) => VisitResult<Node>;
     }
 
     export const enum FlattenLevel {
-        ObjectRest,
         All,
-    }
-
-    export const enum FlattenOutput {
-        Expression,
-        Declarations
-    }
-
-    export const enum FlattenOptions {
-        NeedsValue = 1 << 0,
-        SkipInitializer = 1 << 1,
-        RecordTempVariablesInLine = 1 << 2,
-    }
-
-    export function flattenDestructuring(
-        output: FlattenOutput.Expression,
-        level: FlattenLevel,
-        node: VariableDeclaration | DestructuringAssignment,
-        visitor: (node: Node) => VisitResult<Node>,
-        context: TransformationContext,
-        options: FlattenOptions,
-        createAssignment?: (name: Identifier, value: Expression, location?: TextRange) => Expression): Expression;
-    export function flattenDestructuring(
-        output: FlattenOutput.Declarations,
-        level: FlattenLevel,
-        node: VariableDeclaration | ParameterDeclaration,
-        visitor: (node: Node) => VisitResult<Node>,
-        context: TransformationContext,
-        options: FlattenOptions,
-        boundValue?: Expression): VariableDeclaration[];
-    export function flattenDestructuring(
-        _output: FlattenOutput,
-        _level: FlattenLevel,
-        _node: VariableDeclaration | ParameterDeclaration | DestructuringAssignment,
-        _visitor: (node: Node) => VisitResult<Node>,
-        _context: TransformationContext,
-        _options: FlattenOptions,
-        _valueOrCallback?: Expression | ((name: Identifier, value: Expression, location?: TextRange) => Expression)): Expression | VariableDeclaration[] {
-    //     const flattenMode = flags & FlattenFlags.FlattenMask;
-    //     const outputMode = flags & FlattenFlags.OutputMask;
-    //     const options = flags & FlattenFlags.OptionsMask;
-
-
-    //     if (outputMode === FlattenFlags.OutputExpressions) {
-    //         return flattenDestructuringToExpression(context, <VariableDeclaration | DestructuringAssignment>node, !(options & FlattenFlags.NeedsValue), flattenMode, createAssignmentCallback, visitor);
-    //     }
-    //     else {
-    //         return flattenDestructuringToDeclarations(
-    //             context,
-    //             <VariableDeclaration | ParameterDeclaration>node,
-    //             boundValue)
-    //     }
-        return;
+        ObjectRest,
     }
 
     /**
@@ -90,7 +31,7 @@ namespace ts {
      * @param createAssignmentCallback A callback used to create the assignment expression.
      * @param visitor A visitor used to visit initializers.
      */
-    export function flattenDestructuringToExpression(
+    export function flattenDestructuringAssignment(
         context: TransformationContext,
         node: VariableDeclaration | DestructuringAssignment,
         needsValue: boolean,
@@ -120,9 +61,9 @@ namespace ts {
             recordTempVariablesInLine: false,
             emitExpression,
             emitBindingOrAssignment,
-            createArrayBindingOrAssignmentPattern: createEffectiveArrayAssignmentPattern,
-            createObjectBindingOrAssignmentPattern: createEffectiveObjectAssignmentPattern,
-            createArrayBindingOrAssignmentElement: createEffectiveAssignmentElement,
+            createArrayBindingOrAssignmentPattern: makeArrayAssignmentPattern,
+            createObjectBindingOrAssignmentPattern: makeObjectAssignmentPattern,
+            createArrayBindingOrAssignmentElement: makeAssignmentElement,
             visitor
         };
 
@@ -148,7 +89,7 @@ namespace ts {
             }
         }
 
-        flattenEffectiveBindingElement(host, node, value, location, /*skipInitializer*/ isDestructuringAssignment(node));
+        flattenBindingOrAssignmentElement(host, node, value, location, /*skipInitializer*/ isDestructuringAssignment(node));
 
         if (value && needsValue) {
             expressions.push(value);
@@ -164,7 +105,7 @@ namespace ts {
             expressions.push(expression);
         }
 
-        function emitBindingOrAssignment(target: EffectiveBindingOrAssignmentTarget, value: Expression, location: TextRange, original: Node) {
+        function emitBindingOrAssignment(target: BindingOrAssignmentElementTarget, value: Expression, location: TextRange, original: Node) {
             Debug.assertNode(target, createAssignmentCallback ? isIdentifier : isExpression);
             const expression = createAssignmentCallback
                 ? createAssignmentCallback(<Identifier>target, value, location)
@@ -183,7 +124,7 @@ namespace ts {
      * @param recordTempVariablesInLine Indicates whether temporary variables should be recored in-line.
      * @param level Indicates the extent to which flattening should occur.
      */
-    export function flattenDestructuringToDeclarations(
+    export function flattenDestructuringBinding(
         context: TransformationContext,
         node: VariableDeclaration | ParameterDeclaration,
         boundValue: Expression | undefined,
@@ -201,13 +142,13 @@ namespace ts {
             recordTempVariablesInLine,
             emitExpression,
             emitBindingOrAssignment,
-            createArrayBindingOrAssignmentPattern: createEffectiveArrayBindingPattern,
-            createObjectBindingOrAssignmentPattern: createEffectiveObjectBindingPattern,
-            createArrayBindingOrAssignmentElement: createEffectiveBindingElement,
+            createArrayBindingOrAssignmentPattern: makeArrayBindingPattern,
+            createObjectBindingOrAssignmentPattern: makeObjectBindingPattern,
+            createArrayBindingOrAssignmentElement: makeBindingElement,
             visitor
         };
 
-        flattenEffectiveBindingElement(host, node, boundValue, node, skipInitializer);
+        flattenBindingOrAssignmentElement(host, node, boundValue, node, skipInitializer);
 
         if (pendingExpressions) {
             const temp = createTempVariable(/*recordTempVariable*/ undefined);
@@ -248,7 +189,7 @@ namespace ts {
             pendingExpressions = append(pendingExpressions, value);
         }
 
-        function emitBindingOrAssignment(target: EffectiveBindingOrAssignmentTarget, value: Expression, location: TextRange, original: Node) {
+        function emitBindingOrAssignment(target: BindingOrAssignmentElementTarget, value: Expression, location: TextRange, original: Node) {
             Debug.assertNode(target, isBindingName);
             if (pendingExpressions) {
                 value = inlineExpressions(append(pendingExpressions, value));
@@ -258,14 +199,14 @@ namespace ts {
         }
     }
 
-    function flattenEffectiveBindingElement(
+    function flattenBindingOrAssignmentElement(
         host: FlattenHost,
-        bindingElement: EffectiveBindingOrAssignmentElement,
+        bindingElement: BindingOrAssignmentElement,
         boundValue: Expression | undefined,
         location: TextRange,
         skipInitializer?: boolean) {
         if (!skipInitializer) {
-            const initializer = visitNode(getInitializerOfEffectiveBindingElement(bindingElement), host.visitor, isExpression);
+            const initializer = visitNode(getInitializerOfBindingOrAssignmentElement(bindingElement), host.visitor, isExpression);
             if (initializer) {
                 // Combine value and initializer
                 boundValue = boundValue ? createDefaultValueCheck(host, boundValue, initializer, location) : initializer;
@@ -275,39 +216,36 @@ namespace ts {
                 boundValue = createVoidZero();
             }
         }
-        const bindingTarget = getTargetOfEffectiveBindingElement(bindingElement);
-        if (!isEffectiveBindingPattern(bindingTarget)) {
-            host.emitBindingOrAssignment(bindingTarget, boundValue, location, /*original*/ bindingElement);
+        const bindingTarget = getTargetOfBindingOrAssignmentElement(bindingElement);
+        if (isObjectBindingOrAssignmentPattern(bindingTarget)) {
+            flattenObjectBindingOrAssignmentPattern(host, bindingElement, bindingTarget, boundValue, location);
+        }
+        else if (isArrayBindingOrAssignmentPattern(bindingTarget)) {
+            flattenArrayBindingOrAssignmentPattern(host, bindingElement, bindingTarget, boundValue, location);
         }
         else {
-            const elements = getElementsOfEffectiveBindingPattern(bindingTarget);
-            const numElements = elements.length;
-            if (numElements !== 1) {
-                // For anything other than a single-element destructuring we need to generate a temporary
-                // to ensure value is evaluated exactly once. Additionally, if we have zero elements
-                // we need to emit *something* to ensure that in case a 'var' keyword was already emitted,
-                // so in that case, we'll intentionally create that temporary.
-                const reuseIdentifierExpressions = !isDeclarationBindingElement(bindingElement) || numElements !== 0;
-                boundValue = ensureIdentifier(host, boundValue, reuseIdentifierExpressions, location);
-            }
-            if (isEffectiveObjectBindingPattern(bindingTarget)) {
-                flattenEffectiveObjectBindingElements(host, bindingTarget, elements, boundValue, location);
-            }
-            else {
-                flattenEffectiveArrayBindingElements(host, bindingTarget, elements, boundValue, location);
-            }
+            host.emitBindingOrAssignment(bindingTarget, boundValue, location, /*original*/ bindingElement);
         }
     }
 
-    function flattenEffectiveObjectBindingElements(host: FlattenHost, bindingTarget: EffectiveObjectBindingOrAssignmentPattern, elements: EffectiveBindingOrAssignmentElement[], boundValue: Expression, location: TextRange) {
-        let bindingElements: EffectiveBindingOrAssignmentElement[];
+    function flattenObjectBindingOrAssignmentPattern(host: FlattenHost, parentElement: BindingOrAssignmentElement, bindingTarget: ObjectBindingOrAssignmentPattern, boundValue: Expression, location: TextRange) {
+        const elements = getElementsOfBindingOrAssignmentPattern(bindingTarget);
         const numElements = elements.length;
+        if (numElements !== 1) {
+            // For anything other than a single-element destructuring we need to generate a temporary
+            // to ensure value is evaluated exactly once. Additionally, if we have zero elements
+            // we need to emit *something* to ensure that in case a 'var' keyword was already emitted,
+            // so in that case, we'll intentionally create that temporary.
+            const reuseIdentifierExpressions = !isDeclarationBindingElement(parentElement) || numElements !== 0;
+            boundValue = ensureIdentifier(host, boundValue, reuseIdentifierExpressions, location);
+        }
+        let bindingElements: BindingOrAssignmentElement[];
         for (let i = 0; i < numElements; i++) {
             const element = elements[i];
-            if (!getEffectiveRestIndicator(element)) {
-                if (host.level <= FlattenLevel.ObjectRest
+            if (!getRestIndicatorOfBindingOrAssignmentElement(element)) {
+                if (host.level >= FlattenLevel.ObjectRest
                     && !(element.transformFlags & (TransformFlags.ContainsRest | TransformFlags.ContainsObjectRest))
-                    && !(getTargetOfEffectiveBindingElement(element).transformFlags & (TransformFlags.ContainsRest | TransformFlags.ContainsObjectRest))) {
+                    && !(getTargetOfBindingOrAssignmentElement(element).transformFlags & (TransformFlags.ContainsRest | TransformFlags.ContainsObjectRest))) {
                     bindingElements = append(bindingElements, element);
                 }
                 else {
@@ -315,9 +253,9 @@ namespace ts {
                         host.emitBindingOrAssignment(host.createObjectBindingOrAssignmentPattern(bindingElements), boundValue, location, bindingTarget);
                         bindingElements = undefined;
                     }
-                    const propertyName = getEffectivePropertyNameOfEffectiveBindingElement(element);
+                    const propertyName = getPropertyNameOfBindingOrAssignmentElement(element);
                     const value = createDestructuringPropertyAccess(host, boundValue, propertyName);
-                    flattenEffectiveBindingElement(host, element, value, /*location*/ element);
+                    flattenBindingOrAssignmentElement(host, element, value, /*location*/ element);
                 }
             }
             else if (i === numElements - 1) {
@@ -326,7 +264,7 @@ namespace ts {
                     bindingElements = undefined;
                 }
                 const value = createRestCall(boundValue, elements, bindingTarget);
-                flattenEffectiveBindingElement(host, element, value, element);
+                flattenBindingOrAssignmentElement(host, element, value, element);
             }
         }
         if (bindingElements) {
@@ -334,16 +272,27 @@ namespace ts {
         }
     }
 
-    function flattenEffectiveArrayBindingElements(host: FlattenHost, bindingTarget: EffectiveArrayBindingOrAssignmentPattern, elements: EffectiveBindingOrAssignmentElement[], boundValue: Expression, location: TextRange) {
-        let bindingElements: EffectiveBindingOrAssignmentElement[];
-        let spreadContainingElements: [Identifier, EffectiveBindingOrAssignmentElement][];
+    function flattenArrayBindingOrAssignmentPattern(host: FlattenHost, parentElement: BindingOrAssignmentElement, bindingTarget: ArrayBindingOrAssignmentPattern, boundValue: Expression, location: TextRange) {
+        const elements = getElementsOfBindingOrAssignmentPattern(bindingTarget);
         const numElements = elements.length;
+        if (numElements !== 1 && (host.level < FlattenLevel.ObjectRest || numElements === 0)) {
+            // For anything other than a single-element destructuring we need to generate a temporary
+            // to ensure value is evaluated exactly once. Additionally, if we have zero elements
+            // we need to emit *something* to ensure that in case a 'var' keyword was already emitted,
+            // so in that case, we'll intentionally create that temporary.
+            const reuseIdentifierExpressions = !isDeclarationBindingElement(parentElement) || numElements !== 0;
+            boundValue = ensureIdentifier(host, boundValue, reuseIdentifierExpressions, location);
+        }
+        let bindingElements: BindingOrAssignmentElement[];
+        let restContainingElements: [Identifier, BindingOrAssignmentElement][];
         for (let i = 0; i < numElements; i++) {
             const element = elements[i];
-            if (host.level <= FlattenLevel.ObjectRest) {
-                if (element.transformFlags & (TransformFlags.ContainsRest | TransformFlags.ContainsObjectRest) && i < numElements - 1) {
+            if (host.level >= FlattenLevel.ObjectRest) {
+                // If an array pattern contains an ObjectRest, we must cache the result so that we
+                // can perform the ObjectRest destructuring in a different declaration
+                if (element.transformFlags & TransformFlags.ContainsObjectRest) {
                     const temp = createTempVariable(/*recordTempVariable*/ undefined);
-                    spreadContainingElements = append(spreadContainingElements, <[Identifier, EffectiveBindingOrAssignmentElement]>[temp, element]);
+                    restContainingElements = append(restContainingElements, <[Identifier, BindingOrAssignmentElement]>[temp, element]);
                     bindingElements = append(bindingElements, host.createArrayBindingOrAssignmentElement(temp));
                 }
                 else {
@@ -353,21 +302,21 @@ namespace ts {
             else if (isOmittedExpression(element)) {
                 continue;
             }
-            else if (!getEffectiveRestIndicator(element)) {
+            else if (!getRestIndicatorOfBindingOrAssignmentElement(element)) {
                 const value = createElementAccess(boundValue, i);
-                flattenEffectiveBindingElement(host, element, value, /*location*/ element);
+                flattenBindingOrAssignmentElement(host, element, value, /*location*/ element);
             }
             else if (i === numElements - 1) {
                 const value = createArraySlice(boundValue, i);
-                flattenEffectiveBindingElement(host, element, value, /*location*/ element);
+                flattenBindingOrAssignmentElement(host, element, value, /*location*/ element);
             }
         }
         if (bindingElements) {
             host.emitBindingOrAssignment(host.createArrayBindingOrAssignmentPattern(bindingElements), boundValue, location, bindingTarget);
         }
-        if (spreadContainingElements) {
-            for (const [id, element] of spreadContainingElements) {
-                flattenEffectiveBindingElement(host, element, id, element);
+        if (restContainingElements) {
+            for (const [id, element] of restContainingElements) {
+                flattenBindingOrAssignmentElement(host, element, id, element);
             }
         }
     }
@@ -448,321 +397,35 @@ namespace ts {
         }
     }
 
-    /**
-     * Determines whether the EffectiveBindingElement is a declaration
-     */
-    function isDeclarationBindingElement(bindingElement: EffectiveBindingOrAssignmentElement): bindingElement is VariableDeclaration | ParameterDeclaration | BindingElement {
-        switch (bindingElement.kind) {
-            case SyntaxKind.VariableDeclaration:
-            case SyntaxKind.Parameter:
-            case SyntaxKind.BindingElement:
-                return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Gets the initializer of an EffectiveBindingElement.
-     */
-    function getInitializerOfEffectiveBindingElement(bindingElement: EffectiveBindingOrAssignmentElement): Expression | undefined {
-        if (isDeclarationBindingElement(bindingElement)) {
-            // `1` in `let { a = 1 } = ...`
-            // `1` in `let { a: b = 1 } = ...`
-            // `1` in `let { a: {b} = 1 } = ...`
-            // `1` in `let { a: [b] = 1 } = ...`
-            // `1` in `let [a = 1] = ...`
-            // `1` in `let [{a} = 1] = ...`
-            // `1` in `let [[a] = 1] = ...`
-            return bindingElement.initializer;
-        }
-
-        if (isPropertyAssignment(bindingElement)) {
-            // `1` in `({ a: b = 1 } = ...)`
-            // `1` in `({ a: {b} = 1 } = ...)`
-            // `1` in `({ a: [b] = 1 } = ...)`
-            return isAssignmentExpression(bindingElement.initializer, /*excludeCompoundAssignment*/ true)
-                ? bindingElement.initializer.right
-                : undefined;
-        }
-
-        if (isShorthandPropertyAssignment(bindingElement)) {
-            // `1` in `({ a = 1 } = ...)`
-            return bindingElement.objectAssignmentInitializer;
-        }
-
-        if (isAssignmentExpression(bindingElement, /*excludeCompoundAssignment*/ true)) {
-            // `1` in `[a = 1] = ...`
-            // `1` in `[{a} = 1] = ...`
-            // `1` in `[[a] = 1] = ...`
-            return bindingElement.right;
-        }
-
-        if (isSpreadExpression(bindingElement) || isPartiallyEmittedExpression(bindingElement)) {
-            // Recovery consistent with existing emit.
-            return getInitializerOfEffectiveBindingElement(bindingElement.expression);
-        }
-    }
-
-    /**
-     * Gets the name of an EffectiveBindingElement.
-     */
-    function getTargetOfEffectiveBindingElement(bindingElement: EffectiveBindingOrAssignmentElement): EffectiveBindingOrAssignmentTarget {
-        if (isDeclarationBindingElement(bindingElement)) {
-            // `a` in `let { a } = ...`
-            // `a` in `let { a = 1 } = ...`
-            // `b` in `let { a: b } = ...`
-            // `b` in `let { a: b = 1 } = ...`
-            // `a` in `let { ...a } = ...`
-            // `{b}` in `let { a: {b} } = ...`
-            // `{b}` in `let { a: {b} = 1 } = ...`
-            // `[b]` in `let { a: [b] } = ...`
-            // `[b]` in `let { a: [b] = 1 } = ...`
-            // `a` in `let [a] = ...`
-            // `a` in `let [a = 1] = ...`
-            // `a` in `let [...a] = ...`
-            // `{a}` in `let [{a}] = ...`
-            // `{a}` in `let [{a} = 1] = ...`
-            // `[a]` in `let [[a]] = ...`
-            // `[a]` in `let [[a] = 1] = ...`
-            return <ObjectBindingPattern | ArrayBindingPattern | Identifier>bindingElement.name;
-        }
-
-        if (isObjectLiteralElementLike(bindingElement)) {
-            switch (bindingElement.kind) {
-                case SyntaxKind.PropertyAssignment:
-                    // `b` in `({ a: b } = ...)`
-                    // `b` in `({ a: b = 1 } = ...)`
-                    // `{b}` in `({ a: {b} } = ...)`
-                    // `{b}` in `({ a: {b} = 1 } = ...)`
-                    // `[b]` in `({ a: [b] } = ...)`
-                    // `[b]` in `({ a: [b] = 1 } = ...)`
-                    // `b.c` in `({ a: b.c } = ...)`
-                    // `b.c` in `({ a: b.c = 1 } = ...)`
-                    // `b[0]` in `({ a: b[0] } = ...)`
-                    // `b[0]` in `({ a: b[0] = 1 } = ...)`
-                    return getTargetOfEffectiveBindingElement(bindingElement.initializer);
-
-                case SyntaxKind.ShorthandPropertyAssignment:
-                    // `a` in `({ a } = ...)`
-                    // `a` in `({ a = 1 } = ...)`
-                    return bindingElement.name;
-
-                case SyntaxKind.SpreadAssignment:
-                    // `a` in `({ ...a } = ...)`
-                    return getTargetOfEffectiveBindingElement(bindingElement.expression);
-            }
-
-            // no target
-            return undefined;
-        }
-
-        if (isAssignmentExpression(bindingElement, /*excludeCompoundAssignment*/ true)) {
-            // `a` in `[a = 1] = ...`
-            // `{a}` in `[{a} = 1] = ...`
-            // `[a]` in `[[a] = 1] = ...`
-            // `a.b` in `[a.b = 1] = ...`
-            // `a[0]` in `[a[0] = 1] = ...`
-            return getTargetOfEffectiveBindingElement(bindingElement.left);
-        }
-
-        if (isSpreadExpression(bindingElement) || isPartiallyEmittedExpression(bindingElement)) {
-            // `a` in `[...a] = ...`
-            return getTargetOfEffectiveBindingElement(bindingElement.expression);
-        }
-
-        // `a` in `[a] = ...`
-        // `{a}` in `[{a}] = ...`
-        // `[a]` in `[[a]] = ...`
-        // `a.b` in `[a.b] = ...`
-        // `a[0]` in `[a[0]] = ...`
-        return bindingElement;
-    }
-
-    /**
-     * Determines whether an EffectiveBindingElement is a rest element.
-     */
-    function getEffectiveRestIndicator(bindingElement: EffectiveBindingOrAssignmentElement): EffectiveBindingOrAssignmentRestIndicator {
-        switch (bindingElement.kind) {
-            case SyntaxKind.Parameter:
-            case SyntaxKind.BindingElement:
-                // `...` in `let [...a] = ...`
-                return (<ParameterDeclaration | BindingElement>bindingElement).dotDotDotToken;
-
-            case SyntaxKind.SpreadElement:
-            case SyntaxKind.SpreadAssignment:
-                // `...` in `[...a] = ...`
-                return <SpreadElement | SpreadAssignment>bindingElement;
-        }
-
-        return undefined;
-    }
-
-    /**
-     * Gets the property name of a BindingElement-like element
-     */
-    function getEffectivePropertyNameOfEffectiveBindingElement(bindingElement: EffectiveBindingOrAssignmentElement) {
-        switch (bindingElement.kind) {
-            case SyntaxKind.BindingElement:
-                // `a` in `let { a: b } = ...`
-                // `[a]` in `let { [a]: b } = ...`
-                // `"a"` in `let { "a": b } = ...`
-                // `1` in `let { 1: b } = ...`
-                if ((<BindingElement>bindingElement).propertyName) {
-                    return (<BindingElement>bindingElement).propertyName;
-                }
-
-                break;
-
-            case SyntaxKind.PropertyAssignment:
-                // `a` in `({ a: b } = ...)`
-                // `[a]` in `({ [a]: b } = ...)`
-                // `"a"` in `({ "a": b } = ...)`
-                // `1` in `({ 1: b } = ...)`
-                if ((<PropertyAssignment>bindingElement).name) {
-                    return (<PropertyAssignment>bindingElement).name;
-                }
-
-                break;
-
-            case SyntaxKind.SpreadAssignment:
-                // `a` in `({ ...a } = ...)`
-                return (<SpreadAssignment>bindingElement).name;
-        }
-
-        const target = getTargetOfEffectiveBindingElement(bindingElement);
-        if (target && isPropertyName(target)) {
-            return target;
-        }
-
-        Debug.fail("Invalid property name for binding element.");
-    }
-
-    /**
-     * Determines whether a node is BindingPattern-like
-     */
-    function isEffectiveBindingPattern(node: EffectiveBindingOrAssignmentTarget): node is EffectiveBindingOrAssignmentPattern {
-        return isEffectiveObjectBindingPattern(node)
-            || isEffectiveArrayBindingPattern(node);
-    }
-
-    /**
-     * Determines whether a node is ObjectBindingPattern-like
-     */
-    function isEffectiveObjectBindingPattern(node: EffectiveBindingOrAssignmentTarget): node is EffectiveObjectBindingOrAssignmentPattern {
-        switch (node.kind) {
-            case SyntaxKind.ObjectBindingPattern:
-            case SyntaxKind.ObjectLiteralExpression:
-                return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Determines whether a node is ArrayBindingPattern-like
-     */
-    function isEffectiveArrayBindingPattern(node: EffectiveBindingOrAssignmentTarget): node is EffectiveArrayBindingOrAssignmentPattern {
-        switch (node.kind) {
-            case SyntaxKind.ArrayBindingPattern:
-            case SyntaxKind.ArrayLiteralExpression:
-                return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Gets the elements of a BindingPattern-like name
-     */
-    function getElementsOfEffectiveBindingPattern(name: EffectiveBindingOrAssignmentPattern): EffectiveBindingOrAssignmentElement[] {
-        switch (name.kind) {
-            case SyntaxKind.ObjectBindingPattern:
-            case SyntaxKind.ArrayBindingPattern:
-            case SyntaxKind.ArrayLiteralExpression:
-                // `a` in `{a}`
-                // `a` in `[a]`
-                return name.elements;
-
-            case SyntaxKind.ObjectLiteralExpression:
-                // `a` in `{a}`
-                return name.properties;
-        }
-    }
-
-    function createEffectiveArrayBindingPattern(elements: EffectiveBindingOrAssignmentElement[]) {
+    function makeArrayBindingPattern(elements: BindingOrAssignmentElement[]) {
         Debug.assertEachNode(elements, isArrayBindingElement);
         return createArrayBindingPattern(<ArrayBindingElement[]>elements);
     }
 
-    function createEffectiveArrayAssignmentPattern(elements: EffectiveBindingOrAssignmentElement[]) {
-        return createArrayLiteral(map(elements, convertToArrayLiteralElement));
+    function makeArrayAssignmentPattern(elements: BindingOrAssignmentElement[]) {
+        return createArrayLiteral(map(elements, convertToArrayAssignmentElement));
     }
 
-    function createEffectiveObjectBindingPattern(elements: EffectiveBindingOrAssignmentElement[]) {
+    function makeObjectBindingPattern(elements: BindingOrAssignmentElement[]) {
         Debug.assertEachNode(elements, isBindingElement);
         return createObjectBindingPattern(<BindingElement[]>elements);
     }
 
-    function createEffectiveObjectAssignmentPattern(elements: EffectiveBindingOrAssignmentElement[]) {
-        return createObjectLiteral(map(elements, convertToObjectLiteralElement));
+    function makeObjectAssignmentPattern(elements: BindingOrAssignmentElement[]) {
+        return createObjectLiteral(map(elements, convertToObjectAssignmentElement));
     }
 
-    function createEffectiveBindingElement(name: Identifier) {
+    function makeBindingElement(name: Identifier) {
         return createBindingElement(/*propertyName*/ undefined, /*dotDotDotToken*/ undefined, name);
     }
 
-    function createEffectiveAssignmentElement(name: Identifier) {
+    function makeAssignmentElement(name: Identifier) {
         return name;
     }
 
-    function convertToArrayLiteralElement(element: EffectiveBindingOrAssignmentElement) {
-        if (isBindingElement(element)) {
-            if (element.dotDotDotToken) {
-                Debug.assertNode(element.name, isIdentifier);
-                return setOriginalNode(createSpread(<Identifier>element.name, element), element);
-            }
-            const expression = convertToExpressionTarget(<ObjectBindingPattern | ArrayBindingPattern | Identifier>element.name);
-            return element.initializer ? setOriginalNode(createAssignment(expression, element.initializer, element), element) : expression;
-        }
-        Debug.assertNode(element, isExpression);
-        return <Expression>element;
-    }
-
-    function convertToObjectLiteralElement(element: EffectiveBindingOrAssignmentElement) {
-        if (isBindingElement(element)) {
-            if (element.dotDotDotToken) {
-                Debug.assertNode(element.name, isIdentifier);
-                return setOriginalNode(createSpreadAssignment(<Identifier>element.name, element), element);
-            }
-            if (element.propertyName) {
-                const expression = convertToExpressionTarget(<ObjectBindingPattern | ArrayBindingPattern | Identifier>element.name);
-                return setOriginalNode(createPropertyAssignment(element.propertyName, element.initializer ? createAssignment(expression, element.initializer) : expression, element), element);
-            }
-            Debug.assertNode(element.name, isIdentifier);
-            return setOriginalNode(createShorthandPropertyAssignment(<Identifier>element.name, element.initializer, element), element);
-        }
-        Debug.assertNode(element, isObjectLiteralElementLike);
-        return <ObjectLiteralElementLike>element;
-    }
-
-    function convertToExpressionTarget(target: EffectiveBindingOrAssignmentTarget): Expression {
-        if (isBindingPattern(target)) {
-            switch (target.kind) {
-                case SyntaxKind.ArrayBindingPattern:
-                    return setOriginalNode(createArrayLiteral(map(target.elements, convertToArrayLiteralElement), target), target);
-                case SyntaxKind.ObjectBindingPattern:
-                    return setOriginalNode(createObjectLiteral(map(target.elements, convertToObjectLiteralElement), target), target);
-            }
-            return;
-        }
-        Debug.assertNode(target, isExpression);
-        return <Expression>target;
-    }
-
     /** Given value: o, propName: p, pattern: { a, b, ...p } from the original statement
      * `{ a, b, ...p } = o`, create `p = __rest(o, ["a", "b"]);`*/
-    function createRestCall(value: Expression, elements: EffectiveBindingOrAssignmentElement[], location: TextRange): Expression {
+    function createRestCall(value: Expression, elements: BindingOrAssignmentElement[], location: TextRange): Expression {
         const propertyNames: LiteralExpression[] = [];
         for (let i = 0; i < elements.length - 1; i++) {
             if (isOmittedExpression(elements[i])) {
@@ -771,7 +434,7 @@ namespace ts {
             const str = <StringLiteral>createSynthesizedNode(SyntaxKind.StringLiteral);
             str.pos = location.pos;
             str.end = location.end;
-            str.text = getTextOfPropertyName(getEffectivePropertyNameOfEffectiveBindingElement(elements[i]));
+            str.text = getTextOfPropertyName(getPropertyNameOfBindingOrAssignmentElement(elements[i]));
             propertyNames.push(str);
         }
         const args = createSynthesizedNodeArray([value, createArrayLiteral(propertyNames, location)]);
diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts
index dd7498c4149..29107e149f4 100644
--- a/src/compiler/transformers/es2015.ts
+++ b/src/compiler/transformers/es2015.ts
@@ -1365,7 +1365,7 @@ namespace ts {
         function visitBinaryExpression(node: BinaryExpression, needsDestructuringValue: boolean): Expression {
             // If we are here it is because this is a destructuring assignment.
             Debug.assert(isDestructuringAssignment(node));
-            return flattenDestructuringToExpression(
+            return flattenDestructuringAssignment(
                 context,
                 <DestructuringAssignment>node,
                 needsDestructuringValue,
@@ -1383,7 +1383,7 @@ namespace ts {
                     if (decl.initializer) {
                         let assignment: Expression;
                         if (isBindingPattern(decl.name)) {
-                            assignment = flattenDestructuringToExpression(
+                            assignment = flattenDestructuringAssignment(
                                 context,
                                 decl,
                                 /*needsValue*/ false,
@@ -1543,8 +1543,7 @@ namespace ts {
             if (isBindingPattern(node.name)) {
                 const recordTempVariablesInLine = !enclosingVariableStatement
                     || !hasModifier(enclosingVariableStatement, ModifierFlags.Export);
-                debugger;
-                return flattenDestructuringToDeclarations(
+                return flattenDestructuringBinding(
                     context,
                     node,
                     /*value*/ undefined,
@@ -2181,7 +2180,7 @@ namespace ts {
             const temp = createTempVariable(undefined);
             const newVariableDeclaration = createVariableDeclaration(temp, undefined, undefined, node.variableDeclaration);
 
-            const vars = flattenDestructuringToDeclarations(context, node.variableDeclaration, temp, /*skipInitializer*/ false, /*recordTempVariablesInLine*/ true, FlattenLevel.All, visitor);
+            const vars = flattenDestructuringBinding(context, node.variableDeclaration, temp, /*skipInitializer*/ false, /*recordTempVariablesInLine*/ true, FlattenLevel.All, visitor);
             const list = createVariableDeclarationList(vars, /*location*/node.variableDeclaration, /*flags*/node.variableDeclaration.flags);
             const destructure = createVariableStatement(undefined, list);
 
diff --git a/src/compiler/transformers/esnext.ts b/src/compiler/transformers/esnext.ts
index a52ee9b1a24..fb854318e69 100644
--- a/src/compiler/transformers/esnext.ts
+++ b/src/compiler/transformers/esnext.ts
@@ -135,7 +135,7 @@ namespace ts {
          */
         function visitBinaryExpression(node: BinaryExpression, needsDestructuringValue: boolean): Expression {
             if (isDestructuringAssignment(node) && node.left.transformFlags & TransformFlags.ContainsESNext) {
-                return flattenDestructuringToExpression(
+                return flattenDestructuringAssignment(
                     context,
                     node,
                     needsDestructuringValue,
@@ -156,7 +156,7 @@ namespace ts {
         function visitVariableDeclaration(node: VariableDeclaration): 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.AssertESNext) {
-                return flattenDestructuringToDeclarations(context, node, /*boundValue*/ undefined, /*skipInitializer*/ false, /*recordTempVariablesInLine*/ true, FlattenLevel.ObjectRest, visitor);
+                return flattenDestructuringBinding(context, node, /*boundValue*/ undefined, /*skipInitializer*/ false, /*recordTempVariablesInLine*/ true, FlattenLevel.ObjectRest, visitor);
             }
             return visitEachChild(node, visitor, context);
         }
@@ -202,14 +202,14 @@ namespace ts {
                 const declaration = firstOrUndefined(initializer.declarations);
                 return declaration && declaration.name &&
                     declaration.name.kind === SyntaxKind.ObjectBindingPattern &&
-                    !!(declaration.name.transformFlags & (TransformFlags.ContainsRest | TransformFlags.ContainsObjectRest));
+                    !!(declaration.name.transformFlags & TransformFlags.ContainsObjectRest);
             }
             return false;
         }
 
         function isRestAssignment(initializer: ForInitializer) {
             return initializer.kind === SyntaxKind.ObjectLiteralExpression &&
-                initializer.transformFlags & (TransformFlags.ContainsRest | TransformFlags.ContainsObjectRest);
+                initializer.transformFlags & TransformFlags.ContainsObjectRest;
         }
 
         function visitParameter(node: ParameterDeclaration): ParameterDeclaration {
@@ -238,7 +238,7 @@ namespace ts {
         function isObjectRestParameter(node: ParameterDeclaration) {
             return node.name &&
                 node.name.kind === SyntaxKind.ObjectBindingPattern &&
-                !!(node.name.transformFlags & (TransformFlags.ContainsRest | TransformFlags.ContainsObjectRest));
+                !!(node.name.transformFlags & TransformFlags.ContainsObjectRest);
         }
 
         function visitFunctionDeclaration(node: FunctionDeclaration): FunctionDeclaration {
diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
index bb17b99e5c6..8c65630aa5c 100644
--- a/src/compiler/transformers/module/module.ts
+++ b/src/compiler/transformers/module/module.ts
@@ -756,7 +756,7 @@ namespace ts {
          */
         function transformInitializedVariable(node: VariableDeclaration): Expression {
             if (isBindingPattern(node.name)) {
-                return flattenDestructuringToExpression(
+                return flattenDestructuringAssignment(
                     context,
                     node,
                     /*needsValue*/ false,
diff --git a/src/compiler/transformers/module/system.ts b/src/compiler/transformers/module/system.ts
index 1ed1f82d506..3d89305f617 100644
--- a/src/compiler/transformers/module/system.ts
+++ b/src/compiler/transformers/module/system.ts
@@ -808,7 +808,7 @@ namespace ts {
         function transformInitializedVariable(node: VariableDeclaration, isExportedDeclaration: boolean): Expression {
             const createAssignment = isExportedDeclaration ? createExportedVariableAssignment : createNonExportedVariableAssignment;
             return isBindingPattern(node.name)
-                ? flattenDestructuringToExpression(context, node, /*needsValue*/ false, FlattenLevel.All, createAssignment, destructuringVisitor)
+                ? flattenDestructuringAssignment(context, node, /*needsValue*/ false, FlattenLevel.All, createAssignment, destructuringVisitor)
                 : createAssignment(node.name, visitNode(node.initializer, destructuringVisitor, isExpression));
         }
 
@@ -1459,7 +1459,7 @@ namespace ts {
          */
         function visitDestructuringAssignment(node: DestructuringAssignment): VisitResult<Expression> {
             if (hasExportedReferenceInDestructuringTarget(node.left)) {
-                return flattenDestructuringToExpression(
+                return flattenDestructuringAssignment(
                     context,
                     node,
                     /*needsValue*/ true,
diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
index 118b170b6a4..4fc68566795 100644
--- a/src/compiler/transformers/ts.ts
+++ b/src/compiler/transformers/ts.ts
@@ -2353,7 +2353,7 @@ namespace ts {
         function transformInitializedVariable(node: VariableDeclaration): Expression {
             const name = node.name;
             if (isBindingPattern(name)) {
-                return flattenDestructuringToExpression(
+                return flattenDestructuringAssignment(
                     context,
                     node,
                     /*needsValue*/ false,
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index e0ba546fb96..0cda729f998 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -722,22 +722,20 @@ namespace ts {
         name: PropertyName;
     }
 
-    export interface BindingPattern extends Node {
-        elements: NodeArray<BindingElement | ArrayBindingElement>;
-    }
-
-    export interface ObjectBindingPattern extends BindingPattern {
+    export interface ObjectBindingPattern extends Node {
         kind: SyntaxKind.ObjectBindingPattern;
         elements: NodeArray<BindingElement>;
     }
 
-    export type ArrayBindingElement = BindingElement | OmittedExpression;
-
-    export interface ArrayBindingPattern extends BindingPattern {
+    export interface ArrayBindingPattern extends Node {
         kind: SyntaxKind.ArrayBindingPattern;
         elements: NodeArray<ArrayBindingElement>;
     }
 
+    export type BindingPattern = (ObjectBindingPattern | ArrayBindingPattern) & { elements: NodeArray<ArrayBindingElement>; };
+
+    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 FunctionLikeDeclaration.
@@ -1191,7 +1189,49 @@ namespace ts {
         left: ArrayLiteralExpression;
     }
 
-    export type DestructuringAssignment = ObjectDestructuringAssignment | ArrayDestructuringAssignment;
+    export type DestructuringAssignment
+        = ObjectDestructuringAssignment
+        | ArrayDestructuringAssignment
+        ;
+
+    export type BindingOrAssignmentElement
+        = VariableDeclaration
+        | ParameterDeclaration
+        | BindingElement
+        | PropertyAssignment // AssignmentProperty
+        | ShorthandPropertyAssignment // AssignmentProperty
+        | SpreadAssignment // AssignmentRestProperty
+        | OmittedExpression // Elision
+        | SpreadElement // AssignmentRestElement
+        | ArrayLiteralExpression // ArrayAssignmentPattern
+        | ObjectLiteralExpression // ObjectAssignmentPattern
+        | AssignmentExpression<EqualsToken> // AssignmentElement
+        | Identifier // DestructuringAssignmentTarget
+        | PropertyAccessExpression // DestructuringAssignmentTarget
+        | ElementAccessExpression // DestructuringAssignmentTarget
+        ;
+
+    export type BindingOrAssignmentElementRestIndicator
+        = DotDotDotToken // from BindingElement
+        | SpreadElement // AssignmentRestElement
+        | SpreadAssignment // AssignmentRestProperty
+        ;
+
+    export type BindingOrAssignmentElementTarget = BindingOrAssignmentPattern | Expression;
+
+    export type ObjectBindingOrAssignmentPattern
+        = ObjectBindingPattern
+        | ObjectLiteralExpression // ObjectAssignmentPattern
+        ;
+
+    export type ArrayBindingOrAssignmentPattern
+        = ArrayBindingPattern
+        | ArrayLiteralExpression // ArrayAssignmentPattern
+        ;
+
+    export type AssignmentPattern = ObjectLiteralExpression | ArrayLiteralExpression;
+
+    export type BindingOrAssignmentPattern = ObjectBindingOrAssignmentPattern | ArrayBindingOrAssignmentPattern;
 
     export interface ConditionalExpression extends Expression {
         kind: SyntaxKind.ConditionalExpression;
@@ -3554,10 +3594,10 @@ namespace ts {
         TypeExcludes = ~ContainsTypeScript,
         ObjectLiteralExcludes = NodeExcludes | ContainsDecorators | ContainsComputedPropertyName | ContainsLexicalThisInComputedPropertyName | ContainsObjectSpread,
         ArrayLiteralOrCallOrNewExcludes = NodeExcludes | ContainsSpread,
-        VariableDeclarationListExcludes = NodeExcludes | ContainsBindingPattern | ContainsObjectSpread,
+        VariableDeclarationListExcludes = NodeExcludes | ContainsBindingPattern | ContainsObjectRest,
         ParameterExcludes = NodeExcludes,
-        CatchClauseExcludes = NodeExcludes | ContainsObjectSpread,
-        BindingPatternExcludes = NodeExcludes | ContainsSpread,
+        CatchClauseExcludes = NodeExcludes | ContainsObjectRest,
+        BindingPatternExcludes = NodeExcludes | ContainsRest,
 
         // Masks
         // - Additional bitmasks
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index f0a666e1531..669b0d542ac 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -3948,6 +3948,78 @@ namespace ts {
             || kind === SyntaxKind.OmittedExpression;
     }
 
+
+    /**
+     * Determines whether the BindingOrAssignmentElement is a BindingElement-like declaration
+     */
+    export function isDeclarationBindingElement(bindingElement: BindingOrAssignmentElement): bindingElement is VariableDeclaration | ParameterDeclaration | BindingElement {
+        switch (bindingElement.kind) {
+            case SyntaxKind.VariableDeclaration:
+            case SyntaxKind.Parameter:
+            case SyntaxKind.BindingElement:
+                return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Determines whether a node is a BindingOrAssignmentElement
+     */
+    export function isBindingOrAssignmentElement(node: Node): node is BindingOrAssignmentElement {
+        switch (node.kind) {
+            case SyntaxKind.VariableDeclaration:
+            case SyntaxKind.Parameter:
+            case SyntaxKind.BindingElement:
+            case SyntaxKind.PropertyAssignment:
+            case SyntaxKind.ShorthandPropertyAssignment:
+            case SyntaxKind.SpreadAssignment:
+            case SyntaxKind.OmittedExpression:
+            case SyntaxKind.ArrayLiteralExpression:
+            case SyntaxKind.ObjectLiteralExpression:
+            case SyntaxKind.PropertyAccessExpression:
+            case SyntaxKind.ElementAccessExpression:
+            case SyntaxKind.Identifier:
+            case SyntaxKind.SpreadElement:
+                return true;
+        }
+        return isAssignmentExpression(node, /*excludeCompoundAssignment*/ true);
+    }
+
+    /**
+     * Determines whether a node is a BindingOrAssignmentPattern
+     */
+    export function isBindingOrAssignmentPattern(node: BindingOrAssignmentElementTarget): node is BindingOrAssignmentPattern {
+        return isObjectBindingOrAssignmentPattern(node)
+            || isArrayBindingOrAssignmentPattern(node);
+    }
+
+    /**
+     * Determines whether a node is an ObjectBindingOrAssignmentPattern
+     */
+    export function isObjectBindingOrAssignmentPattern(node: BindingOrAssignmentElementTarget): node is ObjectBindingOrAssignmentPattern {
+        switch (node.kind) {
+            case SyntaxKind.ObjectBindingPattern:
+            case SyntaxKind.ObjectLiteralExpression:
+                return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Determines whether a node is an ArrayBindingOrAssignmentPattern
+     */
+    export function isArrayBindingOrAssignmentPattern(node: BindingOrAssignmentElementTarget): node is ArrayBindingOrAssignmentPattern {
+        switch (node.kind) {
+            case SyntaxKind.ArrayBindingPattern:
+            case SyntaxKind.ArrayLiteralExpression:
+                return true;
+        }
+
+        return false;
+    }
+
     // Expression
 
     export function isArrayLiteralExpression(node: Node): node is ArrayLiteralExpression {

From 06a13b9d1001a91dc9dc079e91e40b6bb5b4520c Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Mon, 14 Nov 2016 15:22:04 -0800
Subject: [PATCH 226/421] Fix string constituent check in
 checkElementTypeOfArrayOrString

---
 lib/cancellationToken.js                      |     2 -
 lib/lib.d.ts                                  |    24 +-
 lib/lib.dom.d.ts                              |    24 +-
 lib/lib.es2015.core.d.ts                      |     8 +-
 lib/lib.es2015.proxy.d.ts                     |     6 +-
 lib/lib.es2017.d.ts                           |     3 +-
 lib/lib.es2017.object.d.ts                    |     4 +-
 lib/lib.es2017.string.d.ts                    |    47 +
 lib/lib.es6.d.ts                              |    39 +-
 lib/lib.webworker.d.ts                        |     2 +
 lib/protocol.d.ts                             |   373 +-
 lib/tsc.js                                    | 16256 +++++----
 lib/tsserver.js                               | 29657 ++++++++--------
 lib/tsserverlibrary.d.ts                      |  9704 ++++-
 lib/tsserverlibrary.js                        | 29545 +++++++--------
 lib/typescript.d.ts                           |   536 +-
 lib/typescript.js                             | 21247 ++++++-----
 lib/typescriptServices.d.ts                   |   536 +-
 lib/typescriptServices.js                     | 21247 ++++++-----
 lib/typingsInstaller.js                       |  2136 +-
 src/compiler/checker.ts                       |     6 +-
 .../cases/compiler/forOfStringConstituents.ts |     8 +
 22 files changed, 73139 insertions(+), 58271 deletions(-)
 create mode 100644 lib/lib.es2017.string.d.ts
 create mode 100644 tests/cases/compiler/forOfStringConstituents.ts

diff --git a/lib/cancellationToken.js b/lib/cancellationToken.js
index f5a28f8d52d..8af21172df4 100644
--- a/lib/cancellationToken.js
+++ b/lib/cancellationToken.js
@@ -39,5 +39,3 @@ function createCancellationToken(args) {
     };
 }
 module.exports = createCancellationToken;
-
-//# sourceMappingURL=cancellationToken.js.map
diff --git a/lib/lib.d.ts b/lib/lib.d.ts
index 969bf70448c..4eb501c04d2 100644
--- a/lib/lib.d.ts
+++ b/lib/lib.d.ts
@@ -5836,6 +5836,7 @@ interface CSSStyleDeclaration {
     writingMode: string | null;
     zIndex: string | null;
     zoom: string | null;
+    resize: string | null;
     getPropertyPriority(propertyName: string): string;
     getPropertyValue(propertyName: string): string;
     item(index: number): string;
@@ -5905,6 +5906,7 @@ declare var CanvasGradient: {
 }
 
 interface CanvasPattern {
+    setTransform(matrix: SVGMatrix): void;
 }
 
 declare var CanvasPattern: {
@@ -6330,7 +6332,7 @@ interface DataTransfer {
     effectAllowed: string;
     readonly files: FileList;
     readonly items: DataTransferItemList;
-    readonly types: DOMStringList;
+    readonly types: string[];
     clearData(format?: string): boolean;
     getData(format: string): string;
     setData(format: string, data: string): boolean;
@@ -12759,7 +12761,7 @@ interface MouseEvent extends UIEvent {
     readonly x: number;
     readonly y: number;
     getModifierState(keyArg: string): boolean;
-    initMouseEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, ctrlKeyArg: boolean, altKeyArg: boolean, shiftKeyArg: boolean, metaKeyArg: boolean, buttonArg: number, relatedTargetArg: EventTarget): void;
+    initMouseEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, ctrlKeyArg: boolean, altKeyArg: boolean, shiftKeyArg: boolean, metaKeyArg: boolean, buttonArg: number, relatedTargetArg: EventTarget | null): void;
 }
 
 declare var MouseEvent: {
@@ -12872,6 +12874,7 @@ interface Navigator extends Object, NavigatorID, NavigatorOnLine, NavigatorConte
     readonly plugins: PluginArray;
     readonly pointerEnabled: boolean;
     readonly webdriver: boolean;
+    readonly hardwareConcurrency: number;
     getGamepads(): Gamepad[];
     javaEnabled(): boolean;
     msLaunchUri(uri: string, successCallback?: MSLaunchUriCallback, noHandlerCallback?: MSLaunchUriCallback): void;
@@ -12889,18 +12892,18 @@ interface Node extends EventTarget {
     readonly attributes: NamedNodeMap;
     readonly baseURI: string | null;
     readonly childNodes: NodeList;
-    readonly firstChild: Node;
-    readonly lastChild: Node;
+    readonly firstChild: Node | null;
+    readonly lastChild: Node | null;
     readonly localName: string | null;
     readonly namespaceURI: string | null;
-    readonly nextSibling: Node;
+    readonly nextSibling: Node | null;
     readonly nodeName: string;
     readonly nodeType: number;
     nodeValue: string | null;
     readonly ownerDocument: Document;
-    readonly parentElement: HTMLElement;
-    readonly parentNode: Node;
-    readonly previousSibling: Node;
+    readonly parentElement: HTMLElement | null;
+    readonly parentNode: Node | null;
+    readonly previousSibling: Node | null;
     textContent: string | null;
     appendChild(newChild: Node): Node;
     cloneNode(deep?: boolean): Node;
@@ -17010,7 +17013,7 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     readonly devicePixelRatio: number;
     readonly doNotTrack: string;
     readonly document: Document;
-    event: Event;
+    event: Event | undefined;
     readonly external: External;
     readonly frameElement: Element;
     readonly frames: Window;
@@ -17312,6 +17315,7 @@ interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
     readonly upload: XMLHttpRequestUpload;
     withCredentials: boolean;
     msCaching?: string;
+    readonly responseURL: string;
     abort(): void;
     getAllResponseHeaders(): string;
     getResponseHeader(header: string): string | null;
@@ -18458,7 +18462,7 @@ declare var defaultStatus: string;
 declare var devicePixelRatio: number;
 declare var doNotTrack: string;
 declare var document: Document;
-declare var event: Event;
+declare var event: Event | undefined;
 declare var external: External;
 declare var frameElement: Element;
 declare var frames: Window;
diff --git a/lib/lib.dom.d.ts b/lib/lib.dom.d.ts
index b80f167b7a8..217c7bf64d2 100644
--- a/lib/lib.dom.d.ts
+++ b/lib/lib.dom.d.ts
@@ -1699,6 +1699,7 @@ interface CSSStyleDeclaration {
     writingMode: string | null;
     zIndex: string | null;
     zoom: string | null;
+    resize: string | null;
     getPropertyPriority(propertyName: string): string;
     getPropertyValue(propertyName: string): string;
     item(index: number): string;
@@ -1768,6 +1769,7 @@ declare var CanvasGradient: {
 }
 
 interface CanvasPattern {
+    setTransform(matrix: SVGMatrix): void;
 }
 
 declare var CanvasPattern: {
@@ -2193,7 +2195,7 @@ interface DataTransfer {
     effectAllowed: string;
     readonly files: FileList;
     readonly items: DataTransferItemList;
-    readonly types: DOMStringList;
+    readonly types: string[];
     clearData(format?: string): boolean;
     getData(format: string): string;
     setData(format: string, data: string): boolean;
@@ -8622,7 +8624,7 @@ interface MouseEvent extends UIEvent {
     readonly x: number;
     readonly y: number;
     getModifierState(keyArg: string): boolean;
-    initMouseEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, ctrlKeyArg: boolean, altKeyArg: boolean, shiftKeyArg: boolean, metaKeyArg: boolean, buttonArg: number, relatedTargetArg: EventTarget): void;
+    initMouseEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, ctrlKeyArg: boolean, altKeyArg: boolean, shiftKeyArg: boolean, metaKeyArg: boolean, buttonArg: number, relatedTargetArg: EventTarget | null): void;
 }
 
 declare var MouseEvent: {
@@ -8735,6 +8737,7 @@ interface Navigator extends Object, NavigatorID, NavigatorOnLine, NavigatorConte
     readonly plugins: PluginArray;
     readonly pointerEnabled: boolean;
     readonly webdriver: boolean;
+    readonly hardwareConcurrency: number;
     getGamepads(): Gamepad[];
     javaEnabled(): boolean;
     msLaunchUri(uri: string, successCallback?: MSLaunchUriCallback, noHandlerCallback?: MSLaunchUriCallback): void;
@@ -8752,18 +8755,18 @@ interface Node extends EventTarget {
     readonly attributes: NamedNodeMap;
     readonly baseURI: string | null;
     readonly childNodes: NodeList;
-    readonly firstChild: Node;
-    readonly lastChild: Node;
+    readonly firstChild: Node | null;
+    readonly lastChild: Node | null;
     readonly localName: string | null;
     readonly namespaceURI: string | null;
-    readonly nextSibling: Node;
+    readonly nextSibling: Node | null;
     readonly nodeName: string;
     readonly nodeType: number;
     nodeValue: string | null;
     readonly ownerDocument: Document;
-    readonly parentElement: HTMLElement;
-    readonly parentNode: Node;
-    readonly previousSibling: Node;
+    readonly parentElement: HTMLElement | null;
+    readonly parentNode: Node | null;
+    readonly previousSibling: Node | null;
     textContent: string | null;
     appendChild(newChild: Node): Node;
     cloneNode(deep?: boolean): Node;
@@ -12873,7 +12876,7 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     readonly devicePixelRatio: number;
     readonly doNotTrack: string;
     readonly document: Document;
-    event: Event;
+    event: Event | undefined;
     readonly external: External;
     readonly frameElement: Element;
     readonly frames: Window;
@@ -13175,6 +13178,7 @@ interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
     readonly upload: XMLHttpRequestUpload;
     withCredentials: boolean;
     msCaching?: string;
+    readonly responseURL: string;
     abort(): void;
     getAllResponseHeaders(): string;
     getResponseHeader(header: string): string | null;
@@ -14321,7 +14325,7 @@ declare var defaultStatus: string;
 declare var devicePixelRatio: number;
 declare var doNotTrack: string;
 declare var document: Document;
-declare var event: Event;
+declare var event: Event | undefined;
 declare var external: External;
 declare var frameElement: Element;
 declare var frames: Window;
diff --git a/lib/lib.es2015.core.d.ts b/lib/lib.es2015.core.d.ts
index 499d0de52db..82e2761b759 100644
--- a/lib/lib.es2015.core.d.ts
+++ b/lib/lib.es2015.core.d.ts
@@ -225,13 +225,13 @@ interface NumberConstructor {
       * number. Only finite values of the type number, result in true.
       * @param number A numeric value.
       */
-    isFinite(number: number): boolean;
+    isFinite(value: any): value is number;
 
     /**
       * Returns true if the value passed is an integer, false otherwise.
       * @param number A numeric value.
       */
-    isInteger(number: number): boolean;
+    isInteger(value: any): value is number;
 
     /**
       * Returns a Boolean value that indicates whether a value is the reserved value NaN (not a
@@ -239,13 +239,13 @@ interface NumberConstructor {
       * to a number. Only values of the type number, that are also NaN, result in true.
       * @param number A numeric value.
       */
-    isNaN(number: number): boolean;
+    isNaN(value: any): value is number;
 
     /**
       * Returns true if the value passed is a safe integer.
       * @param number A numeric value.
       */
-    isSafeInteger(number: number): boolean;
+    isSafeInteger(value: any): value is number;
 
     /**
       * The value of the largest integer n such that n and n + 1 are both exactly representable as
diff --git a/lib/lib.es2015.proxy.d.ts b/lib/lib.es2015.proxy.d.ts
index 03996c6ad9f..6f01f10bfbd 100644
--- a/lib/lib.es2015.proxy.d.ts
+++ b/lib/lib.es2015.proxy.d.ts
@@ -19,7 +19,7 @@ and limitations under the License.
 
 
 interface ProxyHandler<T> {
-    getPrototypeOf? (target: T): any;
+    getPrototypeOf? (target: T): {} | null;
     setPrototypeOf? (target: T, v: any): boolean;
     isExtensible? (target: T): boolean;
     preventExtensions? (target: T): boolean;
@@ -32,11 +32,11 @@ interface ProxyHandler<T> {
     enumerate? (target: T): PropertyKey[];
     ownKeys? (target: T): PropertyKey[];
     apply? (target: T, thisArg: any, argArray?: any): any;
-    construct? (target: T, thisArg: any, argArray?: any): any;
+    construct? (target: T, argArray: any, newTarget?: any): {};
 }
 
 interface ProxyConstructor {
     revocable<T>(target: T, handler: ProxyHandler<T>): { proxy: T; revoke: () => void; };
     new <T>(target: T, handler: ProxyHandler<T>): T
 }
-declare var Proxy: ProxyConstructor;
\ No newline at end of file
+declare var Proxy: ProxyConstructor;
diff --git a/lib/lib.es2017.d.ts b/lib/lib.es2017.d.ts
index 8354de37f7f..94c75a1b49e 100644
--- a/lib/lib.es2017.d.ts
+++ b/lib/lib.es2017.d.ts
@@ -20,4 +20,5 @@ and limitations under the License.
 
 /// <reference path="lib.es2016.d.ts" />
 /// <reference path="lib.es2017.object.d.ts" />
-/// <reference path="lib.es2017.sharedmemory.d.ts" />
\ No newline at end of file
+/// <reference path="lib.es2017.sharedmemory.d.ts" />
+/// <reference path="lib.es2017.string.d.ts" />
diff --git a/lib/lib.es2017.object.d.ts b/lib/lib.es2017.object.d.ts
index 996147a9746..dc3806835ef 100644
--- a/lib/lib.es2017.object.d.ts
+++ b/lib/lib.es2017.object.d.ts
@@ -29,6 +29,6 @@ interface ObjectConstructor {
       * Returns an array of key/values of the enumerable properties 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.
       */
-    entries<T>(o: { [s: string]: T }): [string, T][];
+    entries<T extends { [key: string]: any }, K extends keyof T>(o: T): [keyof T, T[K]][];
     entries(o: any): [string, any][];
-}
\ No newline at end of file
+}
diff --git a/lib/lib.es2017.string.d.ts b/lib/lib.es2017.string.d.ts
new file mode 100644
index 00000000000..d82def20ece
--- /dev/null
+++ b/lib/lib.es2017.string.d.ts
@@ -0,0 +1,47 @@
+/*! *****************************************************************************
+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"/>
+
+
+interface String {
+    /**
+      * Pads the current string with a given string (possibly repeated) so that the resulting string reaches a given length.
+      * The padding is applied from the start (left) of the current string.
+      *
+      * @param maxLength The length of the resulting string once the current string has been padded.
+      *        If this parameter is smaller than the current string's length, the current string will be returned as it is.
+      *
+      * @param fillString The string to pad the current string with.
+      *        If this string is too long, it will be truncated and the left-most part will be applied.
+      *        The default value for this parameter is " " (U+0020).
+      */
+    padStart(maxLength: number, fillString?: string): string;
+
+    /**
+      * Pads the current string with a given string (possibly repeated) so that the resulting string reaches a given length.
+      * The padding is applied from the end (right) of the current string.
+      *
+      * @param maxLength The length of the resulting string once the current string has been padded.
+      *        If this parameter is smaller than the current string's length, the current string will be returned as it is.
+      *
+      * @param fillString The string to pad the current string with.
+      *        If this string is too long, it will be truncated and the left-most part will be applied.
+      *        The default value for this parameter is " " (U+0020).
+      */
+    padEnd(maxLength: number, fillString?: string): string;
+}
diff --git a/lib/lib.es6.d.ts b/lib/lib.es6.d.ts
index 1ace5f499b1..27a57bd914e 100644
--- a/lib/lib.es6.d.ts
+++ b/lib/lib.es6.d.ts
@@ -4362,13 +4362,13 @@ interface NumberConstructor {
       * number. Only finite values of the type number, result in true.
       * @param number A numeric value.
       */
-    isFinite(number: number): boolean;
+    isFinite(value: any): value is number;
 
     /**
       * Returns true if the value passed is an integer, false otherwise.
       * @param number A numeric value.
       */
-    isInteger(number: number): boolean;
+    isInteger(value: any): value is number;
 
     /**
       * Returns a Boolean value that indicates whether a value is the reserved value NaN (not a
@@ -4376,13 +4376,13 @@ interface NumberConstructor {
       * to a number. Only values of the type number, that are also NaN, result in true.
       * @param number A numeric value.
       */
-    isNaN(number: number): boolean;
+    isNaN(value: any): value is number;
 
     /**
       * Returns true if the value passed is a safe integer.
       * @param number A numeric value.
       */
-    isSafeInteger(number: number): boolean;
+    isSafeInteger(value: any): value is number;
 
     /**
       * The value of the largest integer n such that n and n + 1 are both exactly representable as
@@ -5471,7 +5471,7 @@ interface PromiseConstructor {
 declare var Promise: PromiseConstructor;
 
 interface ProxyHandler<T> {
-    getPrototypeOf? (target: T): any;
+    getPrototypeOf? (target: T): {} | null;
     setPrototypeOf? (target: T, v: any): boolean;
     isExtensible? (target: T): boolean;
     preventExtensions? (target: T): boolean;
@@ -5484,14 +5484,15 @@ interface ProxyHandler<T> {
     enumerate? (target: T): PropertyKey[];
     ownKeys? (target: T): PropertyKey[];
     apply? (target: T, thisArg: any, argArray?: any): any;
-    construct? (target: T, thisArg: any, argArray?: any): any;
+    construct? (target: T, argArray: any, newTarget?: any): {};
 }
 
 interface ProxyConstructor {
     revocable<T>(target: T, handler: ProxyHandler<T>): { proxy: T; revoke: () => void; };
     new <T>(target: T, handler: ProxyHandler<T>): T
 }
-declare var Proxy: ProxyConstructor;
+declare var Proxy: ProxyConstructor;
+
 
 declare namespace Reflect {
     function apply(target: Function, thisArgument: any, argumentsList: ArrayLike<any>): any;
@@ -7555,6 +7556,7 @@ interface CSSStyleDeclaration {
     writingMode: string | null;
     zIndex: string | null;
     zoom: string | null;
+    resize: string | null;
     getPropertyPriority(propertyName: string): string;
     getPropertyValue(propertyName: string): string;
     item(index: number): string;
@@ -7624,6 +7626,7 @@ declare var CanvasGradient: {
 }
 
 interface CanvasPattern {
+    setTransform(matrix: SVGMatrix): void;
 }
 
 declare var CanvasPattern: {
@@ -8049,7 +8052,7 @@ interface DataTransfer {
     effectAllowed: string;
     readonly files: FileList;
     readonly items: DataTransferItemList;
-    readonly types: DOMStringList;
+    readonly types: string[];
     clearData(format?: string): boolean;
     getData(format: string): string;
     setData(format: string, data: string): boolean;
@@ -14478,7 +14481,7 @@ interface MouseEvent extends UIEvent {
     readonly x: number;
     readonly y: number;
     getModifierState(keyArg: string): boolean;
-    initMouseEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, ctrlKeyArg: boolean, altKeyArg: boolean, shiftKeyArg: boolean, metaKeyArg: boolean, buttonArg: number, relatedTargetArg: EventTarget): void;
+    initMouseEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, ctrlKeyArg: boolean, altKeyArg: boolean, shiftKeyArg: boolean, metaKeyArg: boolean, buttonArg: number, relatedTargetArg: EventTarget | null): void;
 }
 
 declare var MouseEvent: {
@@ -14591,6 +14594,7 @@ interface Navigator extends Object, NavigatorID, NavigatorOnLine, NavigatorConte
     readonly plugins: PluginArray;
     readonly pointerEnabled: boolean;
     readonly webdriver: boolean;
+    readonly hardwareConcurrency: number;
     getGamepads(): Gamepad[];
     javaEnabled(): boolean;
     msLaunchUri(uri: string, successCallback?: MSLaunchUriCallback, noHandlerCallback?: MSLaunchUriCallback): void;
@@ -14608,18 +14612,18 @@ interface Node extends EventTarget {
     readonly attributes: NamedNodeMap;
     readonly baseURI: string | null;
     readonly childNodes: NodeList;
-    readonly firstChild: Node;
-    readonly lastChild: Node;
+    readonly firstChild: Node | null;
+    readonly lastChild: Node | null;
     readonly localName: string | null;
     readonly namespaceURI: string | null;
-    readonly nextSibling: Node;
+    readonly nextSibling: Node | null;
     readonly nodeName: string;
     readonly nodeType: number;
     nodeValue: string | null;
     readonly ownerDocument: Document;
-    readonly parentElement: HTMLElement;
-    readonly parentNode: Node;
-    readonly previousSibling: Node;
+    readonly parentElement: HTMLElement | null;
+    readonly parentNode: Node | null;
+    readonly previousSibling: Node | null;
     textContent: string | null;
     appendChild(newChild: Node): Node;
     cloneNode(deep?: boolean): Node;
@@ -18729,7 +18733,7 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     readonly devicePixelRatio: number;
     readonly doNotTrack: string;
     readonly document: Document;
-    event: Event;
+    event: Event | undefined;
     readonly external: External;
     readonly frameElement: Element;
     readonly frames: Window;
@@ -19031,6 +19035,7 @@ interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
     readonly upload: XMLHttpRequestUpload;
     withCredentials: boolean;
     msCaching?: string;
+    readonly responseURL: string;
     abort(): void;
     getAllResponseHeaders(): string;
     getResponseHeader(header: string): string | null;
@@ -20177,7 +20182,7 @@ declare var defaultStatus: string;
 declare var devicePixelRatio: number;
 declare var doNotTrack: string;
 declare var document: Document;
-declare var event: Event;
+declare var event: Event | undefined;
 declare var external: External;
 declare var frameElement: Element;
 declare var frames: Window;
diff --git a/lib/lib.webworker.d.ts b/lib/lib.webworker.d.ts
index 53129567256..cef348959e2 100644
--- a/lib/lib.webworker.d.ts
+++ b/lib/lib.webworker.d.ts
@@ -760,6 +760,7 @@ interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
     readonly upload: XMLHttpRequestUpload;
     withCredentials: boolean;
     msCaching?: string;
+    readonly responseURL: string;
     abort(): void;
     getAllResponseHeaders(): string;
     getResponseHeader(header: string): string | null;
@@ -922,6 +923,7 @@ declare var WorkerLocation: {
 }
 
 interface WorkerNavigator extends Object, NavigatorID, NavigatorOnLine {
+    readonly hardwareConcurrency: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
diff --git a/lib/protocol.d.ts b/lib/protocol.d.ts
index 2b57b5de644..0d5c5fbfc0e 100644
--- a/lib/protocol.d.ts
+++ b/lib/protocol.d.ts
@@ -59,7 +59,7 @@ declare namespace ts.server.protocol {
         /**
           * One of "request", "response", or "event"
           */
-        type: string;
+        type: "request" | "response" | "event";
     }
     /**
       * Client-initiated request message
@@ -653,7 +653,7 @@ declare namespace ts.server.protocol {
         /**
          * Script kind of the file
          */
-        scriptKind?: ScriptKind;
+        scriptKind?: ScriptKindName | ts.ScriptKind;
         /**
          * Whether file has mixed content (i.e. .cshtml file that combines html markup with C#/JavaScript)
          */
@@ -684,37 +684,17 @@ declare namespace ts.server.protocol {
          */
         typingOptions?: TypingOptions;
     }
-    /**
-     * For external projects, some of the project settings are sent together with
-     * compiler settings.
-     */
-    interface ExternalProjectCompilerOptions extends CompilerOptions {
+    interface CompileOnSaveMixin {
         /**
          * If compile on save is enabled for the project
          */
         compileOnSave?: boolean;
     }
     /**
-     * Contains information about current project version
+     * For external projects, some of the project settings are sent together with
+     * compiler settings.
      */
-    interface ProjectVersionInfo {
-        /**
-         * Project name
-         */
-        projectName: string;
-        /**
-         * true if project is inferred or false if project is external or configured
-         */
-        isInferred: boolean;
-        /**
-         * Project version
-         */
-        version: number;
-        /**
-         * Current set of compiler options for project
-         */
-        options: CompilerOptions;
-    }
+    type ExternalProjectCompilerOptions = CompilerOptions & CompileOnSaveMixin;
     /**
      * Represents a set of changes that happen in project
      */
@@ -728,36 +708,6 @@ declare namespace ts.server.protocol {
          */
         removed: string[];
     }
-    /**
-     * Describes set of files in the project.
-     * info might be omitted in case of inferred projects
-     * if files is set - then this is the entire set of files in the project
-     * if changes is set - then this is the set of changes that should be applied to existing project
-     * otherwise - assume that nothing is changed
-     */
-    interface ProjectFiles {
-        /**
-         * Information abount project verison
-         */
-        info?: ProjectVersionInfo;
-        /**
-         * List of files in project (might be omitted if current state of project can be computed using only information from 'changes')
-         */
-        files?: string[];
-        /**
-         * Set of changes in project (omitted if the entire set of files in project should be replaced)
-         */
-        changes?: ProjectChanges;
-    }
-    /**
-     * Combines project information with project level errors.
-     */
-    interface ProjectFilesWithDiagnostics extends ProjectFiles {
-        /**
-         * List of errors in project
-         */
-        projectErrors: DiagnosticWithLinePosition[];
-    }
     /**
       * Information found in a configure request.
       */
@@ -803,8 +753,9 @@ declare namespace ts.server.protocol {
          * Used to specify the script kind of the file explicitly. It could be one of the following:
          *      "TS", "JS", "TSX", "JSX"
          */
-        scriptKindName?: "TS" | "JS" | "TSX" | "JSX";
+        scriptKindName?: ScriptKindName;
     }
+    type ScriptKindName = "TS" | "JS" | "TSX" | "JSX";
     /**
       * Open request; value of command field is "open". Notify the
       * server that the client has file open.  The server will not
@@ -878,15 +829,6 @@ declare namespace ts.server.protocol {
      */
     interface CloseExternalProjectResponse extends Response {
     }
-    /**
-     * Arguments to SynchronizeProjectListRequest
-     */
-    interface SynchronizeProjectListRequestArgs {
-        /**
-         * List of last known projects
-         */
-        knownProjects: protocol.ProjectVersionInfo[];
-    }
     /**
      * Request to set compiler options for inferred projects.
      * External projects are opened / closed explicitly.
@@ -1669,12 +1611,158 @@ declare namespace ts.server.protocol {
         spans: TextSpan[];
         childItems?: NavigationTree[];
     }
+    type TelemetryEventName = "telemetry";
+    interface TelemetryEvent extends Event {
+        event: TelemetryEventName;
+        body: TelemetryEventBody;
+    }
+    interface TelemetryEventBody {
+        telemetryEventName: string;
+        payload: any;
+    }
+    type TypingsInstalledTelemetryEventName = "typingsInstalled";
+    interface TypingsInstalledTelemetryEventBody extends TelemetryEventBody {
+        telemetryEventName: TypingsInstalledTelemetryEventName;
+        payload: TypingsInstalledTelemetryEventPayload;
+    }
+    interface TypingsInstalledTelemetryEventPayload {
+        /**
+         * Comma separated list of installed typing packages
+         */
+        installedPackages: string;
+        /**
+         * true if install request succeeded, otherwise - false
+         */
+        installSuccess: boolean;
+    }
     interface NavBarResponse extends Response {
         body?: NavigationBarItem[];
     }
     interface NavTreeResponse extends Response {
         body?: NavigationTree;
     }
+    namespace IndentStyle {
+        type None = "None";
+        type Block = "Block";
+        type Smart = "Smart";
+    }
+    type IndentStyle = IndentStyle.None | IndentStyle.Block | IndentStyle.Smart;
+    interface EditorSettings {
+        baseIndentSize?: number;
+        indentSize?: number;
+        tabSize?: number;
+        newLineCharacter?: string;
+        convertTabsToSpaces?: boolean;
+        indentStyle?: IndentStyle | ts.IndentStyle;
+    }
+    interface FormatCodeSettings extends EditorSettings {
+        insertSpaceAfterCommaDelimiter?: boolean;
+        insertSpaceAfterSemicolonInForStatements?: boolean;
+        insertSpaceBeforeAndAfterBinaryOperators?: boolean;
+        insertSpaceAfterKeywordsInControlFlowStatements?: boolean;
+        insertSpaceAfterFunctionKeywordForAnonymousFunctions?: boolean;
+        insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis?: boolean;
+        insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets?: boolean;
+        insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces?: boolean;
+        insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces?: boolean;
+        placeOpenBraceOnNewLineForFunctions?: boolean;
+        placeOpenBraceOnNewLineForControlBlocks?: boolean;
+    }
+    interface CompilerOptions {
+        allowJs?: boolean;
+        allowSyntheticDefaultImports?: boolean;
+        allowUnreachableCode?: boolean;
+        allowUnusedLabels?: boolean;
+        baseUrl?: string;
+        charset?: string;
+        declaration?: boolean;
+        declarationDir?: string;
+        disableSizeLimit?: boolean;
+        emitBOM?: boolean;
+        emitDecoratorMetadata?: boolean;
+        experimentalDecorators?: boolean;
+        forceConsistentCasingInFileNames?: boolean;
+        inlineSourceMap?: boolean;
+        inlineSources?: boolean;
+        isolatedModules?: boolean;
+        jsx?: JsxEmit | ts.JsxEmit;
+        lib?: string[];
+        locale?: string;
+        mapRoot?: string;
+        maxNodeModuleJsDepth?: number;
+        module?: ModuleKind | ts.ModuleKind;
+        moduleResolution?: ModuleResolutionKind | ts.ModuleResolutionKind;
+        newLine?: NewLineKind | ts.NewLineKind;
+        noEmit?: boolean;
+        noEmitHelpers?: boolean;
+        noEmitOnError?: boolean;
+        noErrorTruncation?: boolean;
+        noFallthroughCasesInSwitch?: boolean;
+        noImplicitAny?: boolean;
+        noImplicitReturns?: boolean;
+        noImplicitThis?: boolean;
+        noUnusedLocals?: boolean;
+        noUnusedParameters?: boolean;
+        noImplicitUseStrict?: boolean;
+        noLib?: boolean;
+        noResolve?: boolean;
+        out?: string;
+        outDir?: string;
+        outFile?: string;
+        paths?: MapLike<string[]>;
+        preserveConstEnums?: boolean;
+        project?: string;
+        reactNamespace?: string;
+        removeComments?: boolean;
+        rootDir?: string;
+        rootDirs?: string[];
+        skipLibCheck?: boolean;
+        skipDefaultLibCheck?: boolean;
+        sourceMap?: boolean;
+        sourceRoot?: string;
+        strictNullChecks?: boolean;
+        suppressExcessPropertyErrors?: boolean;
+        suppressImplicitAnyIndexErrors?: boolean;
+        target?: ScriptTarget | ts.ScriptTarget;
+        traceResolution?: boolean;
+        types?: string[];
+        /** Paths used to used to compute primary types search locations */
+        typeRoots?: string[];
+        [option: string]: CompilerOptionsValue | undefined;
+    }
+    namespace JsxEmit {
+        type None = "None";
+        type Preserve = "Preserve";
+        type React = "React";
+    }
+    type JsxEmit = JsxEmit.None | JsxEmit.Preserve | JsxEmit.React;
+    namespace ModuleKind {
+        type None = "None";
+        type CommonJS = "CommonJS";
+        type AMD = "AMD";
+        type UMD = "UMD";
+        type System = "System";
+        type ES6 = "ES6";
+        type ES2015 = "ES2015";
+    }
+    type ModuleKind = ModuleKind.None | ModuleKind.CommonJS | ModuleKind.AMD | ModuleKind.UMD | ModuleKind.System | ModuleKind.ES6 | ModuleKind.ES2015;
+    namespace ModuleResolutionKind {
+        type Classic = "Classic";
+        type Node = "Node";
+    }
+    type ModuleResolutionKind = ModuleResolutionKind.Classic | ModuleResolutionKind.Node;
+    namespace NewLineKind {
+        type Crlf = "Crlf";
+        type Lf = "Lf";
+    }
+    type NewLineKind = NewLineKind.Crlf | NewLineKind.Lf;
+    namespace ScriptTarget {
+        type ES3 = "ES3";
+        type ES5 = "ES5";
+        type ES6 = "ES6";
+        type ES2015 = "ES2015";
+    }
+    type ScriptTarget = ScriptTarget.ES3 | ScriptTarget.ES5 | ScriptTarget.ES6 | ScriptTarget.ES2015;
 }
 declare namespace ts.server.protocol {
 
@@ -1695,29 +1783,6 @@ declare namespace ts.server.protocol {
         position: number;
     }
 
-    interface EditorSettings {
-        baseIndentSize?: number;
-        indentSize?: number;
-        tabSize?: number;
-        newLineCharacter?: string;
-        convertTabsToSpaces?: boolean;
-        indentStyle?: IndentStyle;
-    }
-
-    enum IndentStyle {
-        None = 0,
-        Block = 1,
-        Smart = 2,
-    }
-
-    enum ScriptKind {
-        Unknown = 0,
-        JS = 1,
-        JSX = 2,
-        TS = 3,
-        TSX = 4,
-    }
-
     interface TypingOptions {
         enableAutoDiscovery?: boolean;
         include?: string[];
@@ -1725,124 +1790,22 @@ declare namespace ts.server.protocol {
         [option: string]: string[] | boolean | undefined;
     }
 
-    interface CompilerOptions {
-        allowJs?: boolean;
-        allowSyntheticDefaultImports?: boolean;
-        allowUnreachableCode?: boolean;
-        allowUnusedLabels?: boolean;
-        alwaysStrict?: boolean;
-        baseUrl?: string;
-        charset?: string;
-        declaration?: boolean;
-        declarationDir?: string;
-        disableSizeLimit?: boolean;
-        emitBOM?: boolean;
-        emitDecoratorMetadata?: boolean;
-        experimentalDecorators?: boolean;
-        forceConsistentCasingInFileNames?: boolean;
-        importHelpers?: boolean;
-        inlineSourceMap?: boolean;
-        inlineSources?: boolean;
-        isolatedModules?: boolean;
-        jsx?: JsxEmit;
-        lib?: string[];
-        locale?: string;
-        mapRoot?: string;
-        maxNodeModuleJsDepth?: number;
-        module?: ModuleKind;
-        moduleResolution?: ModuleResolutionKind;
-        newLine?: NewLineKind;
-        noEmit?: boolean;
-        noEmitHelpers?: boolean;
-        noEmitOnError?: boolean;
-        noErrorTruncation?: boolean;
-        noFallthroughCasesInSwitch?: boolean;
-        noImplicitAny?: boolean;
-        noImplicitReturns?: boolean;
-        noImplicitThis?: boolean;
-        noUnusedLocals?: boolean;
-        noUnusedParameters?: boolean;
-        noImplicitUseStrict?: boolean;
-        noLib?: boolean;
-        noResolve?: boolean;
-        out?: string;
-        outDir?: string;
-        outFile?: string;
-        paths?: MapLike<string[]>;
-        preserveConstEnums?: boolean;
-        project?: string;
-        reactNamespace?: string;
-        removeComments?: boolean;
-        rootDir?: string;
-        rootDirs?: string[];
-        skipLibCheck?: boolean;
-        skipDefaultLibCheck?: boolean;
-        sourceMap?: boolean;
-        sourceRoot?: string;
-        strictNullChecks?: boolean;
-        suppressExcessPropertyErrors?: boolean;
-        suppressImplicitAnyIndexErrors?: boolean;
-        target?: ScriptTarget;
-        traceResolution?: boolean;
-        types?: string[];
-        /** Paths used to used to compute primary types search locations */
-        typeRoots?: string[];
-        [option: string]: CompilerOptionsValue | undefined;
-    }
-
-    enum JsxEmit {
-        None = 0,
-        Preserve = 1,
-        React = 2,
-    }
-
-    enum ModuleKind {
-        None = 0,
-        CommonJS = 1,
-        AMD = 2,
-        UMD = 3,
-        System = 4,
-        ES6 = 5,
-        ES2015 = 5,
-    }
-
-    enum ModuleResolutionKind {
-        Classic = 1,
-        NodeJs = 2,
-    }
-
-    enum NewLineKind {
-        CarriageReturnLineFeed = 0,
-        LineFeed = 1,
-    }
-
     interface MapLike<T> {
         [index: string]: T;
     }
 
-    enum ScriptTarget {
-        ES3 = 0,
-        ES5 = 1,
-        ES6 = 2,
-        ES2015 = 2,
-        Latest = 2,
-    }
-
     type CompilerOptionsValue = string | number | boolean | (string | number)[] | string[] | MapLike<string[]>;
-
-    interface FormatCodeSettings extends EditorSettings {
-        insertSpaceAfterCommaDelimiter?: boolean;
-        insertSpaceAfterSemicolonInForStatements?: boolean;
-        insertSpaceBeforeAndAfterBinaryOperators?: boolean;
-        insertSpaceAfterKeywordsInControlFlowStatements?: boolean;
-        insertSpaceAfterFunctionKeywordForAnonymousFunctions?: boolean;
-        insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis?: boolean;
-        insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets?: boolean;
-        insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces?: boolean;
-        insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces?: boolean;
-        insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces?: boolean;
-        insertSpaceAfterTypeAssertion?: boolean;
-        placeOpenBraceOnNewLineForFunctions?: boolean;
-        placeOpenBraceOnNewLineForControlBlocks?: boolean;
-    }
-}
\ No newline at end of file
+}
+declare namespace ts {
+    // these types are empty stubs for types from services and should not be used directly
+    export type ScriptKind = never;
+    export type IndentStyle = never;
+    export type JsxEmit = never;
+    export type ModuleKind = never;
+    export type ModuleResolutionKind = never;
+    export type NewLineKind = never;
+    export type ScriptTarget = never;
+}
+import protocol = ts.server.protocol;
+export = protocol;
+export as namespace protocol;
\ No newline at end of file
diff --git a/lib/tsc.js b/lib/tsc.js
index fbfe07a4588..98b51ba9216 100644
--- a/lib/tsc.js
+++ b/lib/tsc.js
@@ -15,418 +15,6 @@ and limitations under the License.
 
 var ts;
 (function (ts) {
-    (function (SyntaxKind) {
-        SyntaxKind[SyntaxKind["Unknown"] = 0] = "Unknown";
-        SyntaxKind[SyntaxKind["EndOfFileToken"] = 1] = "EndOfFileToken";
-        SyntaxKind[SyntaxKind["SingleLineCommentTrivia"] = 2] = "SingleLineCommentTrivia";
-        SyntaxKind[SyntaxKind["MultiLineCommentTrivia"] = 3] = "MultiLineCommentTrivia";
-        SyntaxKind[SyntaxKind["NewLineTrivia"] = 4] = "NewLineTrivia";
-        SyntaxKind[SyntaxKind["WhitespaceTrivia"] = 5] = "WhitespaceTrivia";
-        SyntaxKind[SyntaxKind["ShebangTrivia"] = 6] = "ShebangTrivia";
-        SyntaxKind[SyntaxKind["ConflictMarkerTrivia"] = 7] = "ConflictMarkerTrivia";
-        SyntaxKind[SyntaxKind["NumericLiteral"] = 8] = "NumericLiteral";
-        SyntaxKind[SyntaxKind["StringLiteral"] = 9] = "StringLiteral";
-        SyntaxKind[SyntaxKind["JsxText"] = 10] = "JsxText";
-        SyntaxKind[SyntaxKind["RegularExpressionLiteral"] = 11] = "RegularExpressionLiteral";
-        SyntaxKind[SyntaxKind["NoSubstitutionTemplateLiteral"] = 12] = "NoSubstitutionTemplateLiteral";
-        SyntaxKind[SyntaxKind["TemplateHead"] = 13] = "TemplateHead";
-        SyntaxKind[SyntaxKind["TemplateMiddle"] = 14] = "TemplateMiddle";
-        SyntaxKind[SyntaxKind["TemplateTail"] = 15] = "TemplateTail";
-        SyntaxKind[SyntaxKind["OpenBraceToken"] = 16] = "OpenBraceToken";
-        SyntaxKind[SyntaxKind["CloseBraceToken"] = 17] = "CloseBraceToken";
-        SyntaxKind[SyntaxKind["OpenParenToken"] = 18] = "OpenParenToken";
-        SyntaxKind[SyntaxKind["CloseParenToken"] = 19] = "CloseParenToken";
-        SyntaxKind[SyntaxKind["OpenBracketToken"] = 20] = "OpenBracketToken";
-        SyntaxKind[SyntaxKind["CloseBracketToken"] = 21] = "CloseBracketToken";
-        SyntaxKind[SyntaxKind["DotToken"] = 22] = "DotToken";
-        SyntaxKind[SyntaxKind["DotDotDotToken"] = 23] = "DotDotDotToken";
-        SyntaxKind[SyntaxKind["SemicolonToken"] = 24] = "SemicolonToken";
-        SyntaxKind[SyntaxKind["CommaToken"] = 25] = "CommaToken";
-        SyntaxKind[SyntaxKind["LessThanToken"] = 26] = "LessThanToken";
-        SyntaxKind[SyntaxKind["LessThanSlashToken"] = 27] = "LessThanSlashToken";
-        SyntaxKind[SyntaxKind["GreaterThanToken"] = 28] = "GreaterThanToken";
-        SyntaxKind[SyntaxKind["LessThanEqualsToken"] = 29] = "LessThanEqualsToken";
-        SyntaxKind[SyntaxKind["GreaterThanEqualsToken"] = 30] = "GreaterThanEqualsToken";
-        SyntaxKind[SyntaxKind["EqualsEqualsToken"] = 31] = "EqualsEqualsToken";
-        SyntaxKind[SyntaxKind["ExclamationEqualsToken"] = 32] = "ExclamationEqualsToken";
-        SyntaxKind[SyntaxKind["EqualsEqualsEqualsToken"] = 33] = "EqualsEqualsEqualsToken";
-        SyntaxKind[SyntaxKind["ExclamationEqualsEqualsToken"] = 34] = "ExclamationEqualsEqualsToken";
-        SyntaxKind[SyntaxKind["EqualsGreaterThanToken"] = 35] = "EqualsGreaterThanToken";
-        SyntaxKind[SyntaxKind["PlusToken"] = 36] = "PlusToken";
-        SyntaxKind[SyntaxKind["MinusToken"] = 37] = "MinusToken";
-        SyntaxKind[SyntaxKind["AsteriskToken"] = 38] = "AsteriskToken";
-        SyntaxKind[SyntaxKind["AsteriskAsteriskToken"] = 39] = "AsteriskAsteriskToken";
-        SyntaxKind[SyntaxKind["SlashToken"] = 40] = "SlashToken";
-        SyntaxKind[SyntaxKind["PercentToken"] = 41] = "PercentToken";
-        SyntaxKind[SyntaxKind["PlusPlusToken"] = 42] = "PlusPlusToken";
-        SyntaxKind[SyntaxKind["MinusMinusToken"] = 43] = "MinusMinusToken";
-        SyntaxKind[SyntaxKind["LessThanLessThanToken"] = 44] = "LessThanLessThanToken";
-        SyntaxKind[SyntaxKind["GreaterThanGreaterThanToken"] = 45] = "GreaterThanGreaterThanToken";
-        SyntaxKind[SyntaxKind["GreaterThanGreaterThanGreaterThanToken"] = 46] = "GreaterThanGreaterThanGreaterThanToken";
-        SyntaxKind[SyntaxKind["AmpersandToken"] = 47] = "AmpersandToken";
-        SyntaxKind[SyntaxKind["BarToken"] = 48] = "BarToken";
-        SyntaxKind[SyntaxKind["CaretToken"] = 49] = "CaretToken";
-        SyntaxKind[SyntaxKind["ExclamationToken"] = 50] = "ExclamationToken";
-        SyntaxKind[SyntaxKind["TildeToken"] = 51] = "TildeToken";
-        SyntaxKind[SyntaxKind["AmpersandAmpersandToken"] = 52] = "AmpersandAmpersandToken";
-        SyntaxKind[SyntaxKind["BarBarToken"] = 53] = "BarBarToken";
-        SyntaxKind[SyntaxKind["QuestionToken"] = 54] = "QuestionToken";
-        SyntaxKind[SyntaxKind["ColonToken"] = 55] = "ColonToken";
-        SyntaxKind[SyntaxKind["AtToken"] = 56] = "AtToken";
-        SyntaxKind[SyntaxKind["EqualsToken"] = 57] = "EqualsToken";
-        SyntaxKind[SyntaxKind["PlusEqualsToken"] = 58] = "PlusEqualsToken";
-        SyntaxKind[SyntaxKind["MinusEqualsToken"] = 59] = "MinusEqualsToken";
-        SyntaxKind[SyntaxKind["AsteriskEqualsToken"] = 60] = "AsteriskEqualsToken";
-        SyntaxKind[SyntaxKind["AsteriskAsteriskEqualsToken"] = 61] = "AsteriskAsteriskEqualsToken";
-        SyntaxKind[SyntaxKind["SlashEqualsToken"] = 62] = "SlashEqualsToken";
-        SyntaxKind[SyntaxKind["PercentEqualsToken"] = 63] = "PercentEqualsToken";
-        SyntaxKind[SyntaxKind["LessThanLessThanEqualsToken"] = 64] = "LessThanLessThanEqualsToken";
-        SyntaxKind[SyntaxKind["GreaterThanGreaterThanEqualsToken"] = 65] = "GreaterThanGreaterThanEqualsToken";
-        SyntaxKind[SyntaxKind["GreaterThanGreaterThanGreaterThanEqualsToken"] = 66] = "GreaterThanGreaterThanGreaterThanEqualsToken";
-        SyntaxKind[SyntaxKind["AmpersandEqualsToken"] = 67] = "AmpersandEqualsToken";
-        SyntaxKind[SyntaxKind["BarEqualsToken"] = 68] = "BarEqualsToken";
-        SyntaxKind[SyntaxKind["CaretEqualsToken"] = 69] = "CaretEqualsToken";
-        SyntaxKind[SyntaxKind["Identifier"] = 70] = "Identifier";
-        SyntaxKind[SyntaxKind["BreakKeyword"] = 71] = "BreakKeyword";
-        SyntaxKind[SyntaxKind["CaseKeyword"] = 72] = "CaseKeyword";
-        SyntaxKind[SyntaxKind["CatchKeyword"] = 73] = "CatchKeyword";
-        SyntaxKind[SyntaxKind["ClassKeyword"] = 74] = "ClassKeyword";
-        SyntaxKind[SyntaxKind["ConstKeyword"] = 75] = "ConstKeyword";
-        SyntaxKind[SyntaxKind["ContinueKeyword"] = 76] = "ContinueKeyword";
-        SyntaxKind[SyntaxKind["DebuggerKeyword"] = 77] = "DebuggerKeyword";
-        SyntaxKind[SyntaxKind["DefaultKeyword"] = 78] = "DefaultKeyword";
-        SyntaxKind[SyntaxKind["DeleteKeyword"] = 79] = "DeleteKeyword";
-        SyntaxKind[SyntaxKind["DoKeyword"] = 80] = "DoKeyword";
-        SyntaxKind[SyntaxKind["ElseKeyword"] = 81] = "ElseKeyword";
-        SyntaxKind[SyntaxKind["EnumKeyword"] = 82] = "EnumKeyword";
-        SyntaxKind[SyntaxKind["ExportKeyword"] = 83] = "ExportKeyword";
-        SyntaxKind[SyntaxKind["ExtendsKeyword"] = 84] = "ExtendsKeyword";
-        SyntaxKind[SyntaxKind["FalseKeyword"] = 85] = "FalseKeyword";
-        SyntaxKind[SyntaxKind["FinallyKeyword"] = 86] = "FinallyKeyword";
-        SyntaxKind[SyntaxKind["ForKeyword"] = 87] = "ForKeyword";
-        SyntaxKind[SyntaxKind["FunctionKeyword"] = 88] = "FunctionKeyword";
-        SyntaxKind[SyntaxKind["IfKeyword"] = 89] = "IfKeyword";
-        SyntaxKind[SyntaxKind["ImportKeyword"] = 90] = "ImportKeyword";
-        SyntaxKind[SyntaxKind["InKeyword"] = 91] = "InKeyword";
-        SyntaxKind[SyntaxKind["InstanceOfKeyword"] = 92] = "InstanceOfKeyword";
-        SyntaxKind[SyntaxKind["NewKeyword"] = 93] = "NewKeyword";
-        SyntaxKind[SyntaxKind["NullKeyword"] = 94] = "NullKeyword";
-        SyntaxKind[SyntaxKind["ReturnKeyword"] = 95] = "ReturnKeyword";
-        SyntaxKind[SyntaxKind["SuperKeyword"] = 96] = "SuperKeyword";
-        SyntaxKind[SyntaxKind["SwitchKeyword"] = 97] = "SwitchKeyword";
-        SyntaxKind[SyntaxKind["ThisKeyword"] = 98] = "ThisKeyword";
-        SyntaxKind[SyntaxKind["ThrowKeyword"] = 99] = "ThrowKeyword";
-        SyntaxKind[SyntaxKind["TrueKeyword"] = 100] = "TrueKeyword";
-        SyntaxKind[SyntaxKind["TryKeyword"] = 101] = "TryKeyword";
-        SyntaxKind[SyntaxKind["TypeOfKeyword"] = 102] = "TypeOfKeyword";
-        SyntaxKind[SyntaxKind["VarKeyword"] = 103] = "VarKeyword";
-        SyntaxKind[SyntaxKind["VoidKeyword"] = 104] = "VoidKeyword";
-        SyntaxKind[SyntaxKind["WhileKeyword"] = 105] = "WhileKeyword";
-        SyntaxKind[SyntaxKind["WithKeyword"] = 106] = "WithKeyword";
-        SyntaxKind[SyntaxKind["ImplementsKeyword"] = 107] = "ImplementsKeyword";
-        SyntaxKind[SyntaxKind["InterfaceKeyword"] = 108] = "InterfaceKeyword";
-        SyntaxKind[SyntaxKind["LetKeyword"] = 109] = "LetKeyword";
-        SyntaxKind[SyntaxKind["PackageKeyword"] = 110] = "PackageKeyword";
-        SyntaxKind[SyntaxKind["PrivateKeyword"] = 111] = "PrivateKeyword";
-        SyntaxKind[SyntaxKind["ProtectedKeyword"] = 112] = "ProtectedKeyword";
-        SyntaxKind[SyntaxKind["PublicKeyword"] = 113] = "PublicKeyword";
-        SyntaxKind[SyntaxKind["StaticKeyword"] = 114] = "StaticKeyword";
-        SyntaxKind[SyntaxKind["YieldKeyword"] = 115] = "YieldKeyword";
-        SyntaxKind[SyntaxKind["AbstractKeyword"] = 116] = "AbstractKeyword";
-        SyntaxKind[SyntaxKind["AsKeyword"] = 117] = "AsKeyword";
-        SyntaxKind[SyntaxKind["AnyKeyword"] = 118] = "AnyKeyword";
-        SyntaxKind[SyntaxKind["AsyncKeyword"] = 119] = "AsyncKeyword";
-        SyntaxKind[SyntaxKind["AwaitKeyword"] = 120] = "AwaitKeyword";
-        SyntaxKind[SyntaxKind["BooleanKeyword"] = 121] = "BooleanKeyword";
-        SyntaxKind[SyntaxKind["ConstructorKeyword"] = 122] = "ConstructorKeyword";
-        SyntaxKind[SyntaxKind["DeclareKeyword"] = 123] = "DeclareKeyword";
-        SyntaxKind[SyntaxKind["GetKeyword"] = 124] = "GetKeyword";
-        SyntaxKind[SyntaxKind["IsKeyword"] = 125] = "IsKeyword";
-        SyntaxKind[SyntaxKind["ModuleKeyword"] = 126] = "ModuleKeyword";
-        SyntaxKind[SyntaxKind["NamespaceKeyword"] = 127] = "NamespaceKeyword";
-        SyntaxKind[SyntaxKind["NeverKeyword"] = 128] = "NeverKeyword";
-        SyntaxKind[SyntaxKind["ReadonlyKeyword"] = 129] = "ReadonlyKeyword";
-        SyntaxKind[SyntaxKind["RequireKeyword"] = 130] = "RequireKeyword";
-        SyntaxKind[SyntaxKind["NumberKeyword"] = 131] = "NumberKeyword";
-        SyntaxKind[SyntaxKind["SetKeyword"] = 132] = "SetKeyword";
-        SyntaxKind[SyntaxKind["StringKeyword"] = 133] = "StringKeyword";
-        SyntaxKind[SyntaxKind["SymbolKeyword"] = 134] = "SymbolKeyword";
-        SyntaxKind[SyntaxKind["TypeKeyword"] = 135] = "TypeKeyword";
-        SyntaxKind[SyntaxKind["UndefinedKeyword"] = 136] = "UndefinedKeyword";
-        SyntaxKind[SyntaxKind["FromKeyword"] = 137] = "FromKeyword";
-        SyntaxKind[SyntaxKind["GlobalKeyword"] = 138] = "GlobalKeyword";
-        SyntaxKind[SyntaxKind["OfKeyword"] = 139] = "OfKeyword";
-        SyntaxKind[SyntaxKind["QualifiedName"] = 140] = "QualifiedName";
-        SyntaxKind[SyntaxKind["ComputedPropertyName"] = 141] = "ComputedPropertyName";
-        SyntaxKind[SyntaxKind["TypeParameter"] = 142] = "TypeParameter";
-        SyntaxKind[SyntaxKind["Parameter"] = 143] = "Parameter";
-        SyntaxKind[SyntaxKind["Decorator"] = 144] = "Decorator";
-        SyntaxKind[SyntaxKind["PropertySignature"] = 145] = "PropertySignature";
-        SyntaxKind[SyntaxKind["PropertyDeclaration"] = 146] = "PropertyDeclaration";
-        SyntaxKind[SyntaxKind["MethodSignature"] = 147] = "MethodSignature";
-        SyntaxKind[SyntaxKind["MethodDeclaration"] = 148] = "MethodDeclaration";
-        SyntaxKind[SyntaxKind["Constructor"] = 149] = "Constructor";
-        SyntaxKind[SyntaxKind["GetAccessor"] = 150] = "GetAccessor";
-        SyntaxKind[SyntaxKind["SetAccessor"] = 151] = "SetAccessor";
-        SyntaxKind[SyntaxKind["CallSignature"] = 152] = "CallSignature";
-        SyntaxKind[SyntaxKind["ConstructSignature"] = 153] = "ConstructSignature";
-        SyntaxKind[SyntaxKind["IndexSignature"] = 154] = "IndexSignature";
-        SyntaxKind[SyntaxKind["TypePredicate"] = 155] = "TypePredicate";
-        SyntaxKind[SyntaxKind["TypeReference"] = 156] = "TypeReference";
-        SyntaxKind[SyntaxKind["FunctionType"] = 157] = "FunctionType";
-        SyntaxKind[SyntaxKind["ConstructorType"] = 158] = "ConstructorType";
-        SyntaxKind[SyntaxKind["TypeQuery"] = 159] = "TypeQuery";
-        SyntaxKind[SyntaxKind["TypeLiteral"] = 160] = "TypeLiteral";
-        SyntaxKind[SyntaxKind["ArrayType"] = 161] = "ArrayType";
-        SyntaxKind[SyntaxKind["TupleType"] = 162] = "TupleType";
-        SyntaxKind[SyntaxKind["UnionType"] = 163] = "UnionType";
-        SyntaxKind[SyntaxKind["IntersectionType"] = 164] = "IntersectionType";
-        SyntaxKind[SyntaxKind["ParenthesizedType"] = 165] = "ParenthesizedType";
-        SyntaxKind[SyntaxKind["ThisType"] = 166] = "ThisType";
-        SyntaxKind[SyntaxKind["LiteralType"] = 167] = "LiteralType";
-        SyntaxKind[SyntaxKind["ObjectBindingPattern"] = 168] = "ObjectBindingPattern";
-        SyntaxKind[SyntaxKind["ArrayBindingPattern"] = 169] = "ArrayBindingPattern";
-        SyntaxKind[SyntaxKind["BindingElement"] = 170] = "BindingElement";
-        SyntaxKind[SyntaxKind["ArrayLiteralExpression"] = 171] = "ArrayLiteralExpression";
-        SyntaxKind[SyntaxKind["ObjectLiteralExpression"] = 172] = "ObjectLiteralExpression";
-        SyntaxKind[SyntaxKind["PropertyAccessExpression"] = 173] = "PropertyAccessExpression";
-        SyntaxKind[SyntaxKind["ElementAccessExpression"] = 174] = "ElementAccessExpression";
-        SyntaxKind[SyntaxKind["CallExpression"] = 175] = "CallExpression";
-        SyntaxKind[SyntaxKind["NewExpression"] = 176] = "NewExpression";
-        SyntaxKind[SyntaxKind["TaggedTemplateExpression"] = 177] = "TaggedTemplateExpression";
-        SyntaxKind[SyntaxKind["TypeAssertionExpression"] = 178] = "TypeAssertionExpression";
-        SyntaxKind[SyntaxKind["ParenthesizedExpression"] = 179] = "ParenthesizedExpression";
-        SyntaxKind[SyntaxKind["FunctionExpression"] = 180] = "FunctionExpression";
-        SyntaxKind[SyntaxKind["ArrowFunction"] = 181] = "ArrowFunction";
-        SyntaxKind[SyntaxKind["DeleteExpression"] = 182] = "DeleteExpression";
-        SyntaxKind[SyntaxKind["TypeOfExpression"] = 183] = "TypeOfExpression";
-        SyntaxKind[SyntaxKind["VoidExpression"] = 184] = "VoidExpression";
-        SyntaxKind[SyntaxKind["AwaitExpression"] = 185] = "AwaitExpression";
-        SyntaxKind[SyntaxKind["PrefixUnaryExpression"] = 186] = "PrefixUnaryExpression";
-        SyntaxKind[SyntaxKind["PostfixUnaryExpression"] = 187] = "PostfixUnaryExpression";
-        SyntaxKind[SyntaxKind["BinaryExpression"] = 188] = "BinaryExpression";
-        SyntaxKind[SyntaxKind["ConditionalExpression"] = 189] = "ConditionalExpression";
-        SyntaxKind[SyntaxKind["TemplateExpression"] = 190] = "TemplateExpression";
-        SyntaxKind[SyntaxKind["YieldExpression"] = 191] = "YieldExpression";
-        SyntaxKind[SyntaxKind["SpreadElementExpression"] = 192] = "SpreadElementExpression";
-        SyntaxKind[SyntaxKind["ClassExpression"] = 193] = "ClassExpression";
-        SyntaxKind[SyntaxKind["OmittedExpression"] = 194] = "OmittedExpression";
-        SyntaxKind[SyntaxKind["ExpressionWithTypeArguments"] = 195] = "ExpressionWithTypeArguments";
-        SyntaxKind[SyntaxKind["AsExpression"] = 196] = "AsExpression";
-        SyntaxKind[SyntaxKind["NonNullExpression"] = 197] = "NonNullExpression";
-        SyntaxKind[SyntaxKind["TemplateSpan"] = 198] = "TemplateSpan";
-        SyntaxKind[SyntaxKind["SemicolonClassElement"] = 199] = "SemicolonClassElement";
-        SyntaxKind[SyntaxKind["Block"] = 200] = "Block";
-        SyntaxKind[SyntaxKind["VariableStatement"] = 201] = "VariableStatement";
-        SyntaxKind[SyntaxKind["EmptyStatement"] = 202] = "EmptyStatement";
-        SyntaxKind[SyntaxKind["ExpressionStatement"] = 203] = "ExpressionStatement";
-        SyntaxKind[SyntaxKind["IfStatement"] = 204] = "IfStatement";
-        SyntaxKind[SyntaxKind["DoStatement"] = 205] = "DoStatement";
-        SyntaxKind[SyntaxKind["WhileStatement"] = 206] = "WhileStatement";
-        SyntaxKind[SyntaxKind["ForStatement"] = 207] = "ForStatement";
-        SyntaxKind[SyntaxKind["ForInStatement"] = 208] = "ForInStatement";
-        SyntaxKind[SyntaxKind["ForOfStatement"] = 209] = "ForOfStatement";
-        SyntaxKind[SyntaxKind["ContinueStatement"] = 210] = "ContinueStatement";
-        SyntaxKind[SyntaxKind["BreakStatement"] = 211] = "BreakStatement";
-        SyntaxKind[SyntaxKind["ReturnStatement"] = 212] = "ReturnStatement";
-        SyntaxKind[SyntaxKind["WithStatement"] = 213] = "WithStatement";
-        SyntaxKind[SyntaxKind["SwitchStatement"] = 214] = "SwitchStatement";
-        SyntaxKind[SyntaxKind["LabeledStatement"] = 215] = "LabeledStatement";
-        SyntaxKind[SyntaxKind["ThrowStatement"] = 216] = "ThrowStatement";
-        SyntaxKind[SyntaxKind["TryStatement"] = 217] = "TryStatement";
-        SyntaxKind[SyntaxKind["DebuggerStatement"] = 218] = "DebuggerStatement";
-        SyntaxKind[SyntaxKind["VariableDeclaration"] = 219] = "VariableDeclaration";
-        SyntaxKind[SyntaxKind["VariableDeclarationList"] = 220] = "VariableDeclarationList";
-        SyntaxKind[SyntaxKind["FunctionDeclaration"] = 221] = "FunctionDeclaration";
-        SyntaxKind[SyntaxKind["ClassDeclaration"] = 222] = "ClassDeclaration";
-        SyntaxKind[SyntaxKind["InterfaceDeclaration"] = 223] = "InterfaceDeclaration";
-        SyntaxKind[SyntaxKind["TypeAliasDeclaration"] = 224] = "TypeAliasDeclaration";
-        SyntaxKind[SyntaxKind["EnumDeclaration"] = 225] = "EnumDeclaration";
-        SyntaxKind[SyntaxKind["ModuleDeclaration"] = 226] = "ModuleDeclaration";
-        SyntaxKind[SyntaxKind["ModuleBlock"] = 227] = "ModuleBlock";
-        SyntaxKind[SyntaxKind["CaseBlock"] = 228] = "CaseBlock";
-        SyntaxKind[SyntaxKind["NamespaceExportDeclaration"] = 229] = "NamespaceExportDeclaration";
-        SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 230] = "ImportEqualsDeclaration";
-        SyntaxKind[SyntaxKind["ImportDeclaration"] = 231] = "ImportDeclaration";
-        SyntaxKind[SyntaxKind["ImportClause"] = 232] = "ImportClause";
-        SyntaxKind[SyntaxKind["NamespaceImport"] = 233] = "NamespaceImport";
-        SyntaxKind[SyntaxKind["NamedImports"] = 234] = "NamedImports";
-        SyntaxKind[SyntaxKind["ImportSpecifier"] = 235] = "ImportSpecifier";
-        SyntaxKind[SyntaxKind["ExportAssignment"] = 236] = "ExportAssignment";
-        SyntaxKind[SyntaxKind["ExportDeclaration"] = 237] = "ExportDeclaration";
-        SyntaxKind[SyntaxKind["NamedExports"] = 238] = "NamedExports";
-        SyntaxKind[SyntaxKind["ExportSpecifier"] = 239] = "ExportSpecifier";
-        SyntaxKind[SyntaxKind["MissingDeclaration"] = 240] = "MissingDeclaration";
-        SyntaxKind[SyntaxKind["ExternalModuleReference"] = 241] = "ExternalModuleReference";
-        SyntaxKind[SyntaxKind["JsxElement"] = 242] = "JsxElement";
-        SyntaxKind[SyntaxKind["JsxSelfClosingElement"] = 243] = "JsxSelfClosingElement";
-        SyntaxKind[SyntaxKind["JsxOpeningElement"] = 244] = "JsxOpeningElement";
-        SyntaxKind[SyntaxKind["JsxClosingElement"] = 245] = "JsxClosingElement";
-        SyntaxKind[SyntaxKind["JsxAttribute"] = 246] = "JsxAttribute";
-        SyntaxKind[SyntaxKind["JsxSpreadAttribute"] = 247] = "JsxSpreadAttribute";
-        SyntaxKind[SyntaxKind["JsxExpression"] = 248] = "JsxExpression";
-        SyntaxKind[SyntaxKind["CaseClause"] = 249] = "CaseClause";
-        SyntaxKind[SyntaxKind["DefaultClause"] = 250] = "DefaultClause";
-        SyntaxKind[SyntaxKind["HeritageClause"] = 251] = "HeritageClause";
-        SyntaxKind[SyntaxKind["CatchClause"] = 252] = "CatchClause";
-        SyntaxKind[SyntaxKind["PropertyAssignment"] = 253] = "PropertyAssignment";
-        SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 254] = "ShorthandPropertyAssignment";
-        SyntaxKind[SyntaxKind["EnumMember"] = 255] = "EnumMember";
-        SyntaxKind[SyntaxKind["SourceFile"] = 256] = "SourceFile";
-        SyntaxKind[SyntaxKind["JSDocTypeExpression"] = 257] = "JSDocTypeExpression";
-        SyntaxKind[SyntaxKind["JSDocAllType"] = 258] = "JSDocAllType";
-        SyntaxKind[SyntaxKind["JSDocUnknownType"] = 259] = "JSDocUnknownType";
-        SyntaxKind[SyntaxKind["JSDocArrayType"] = 260] = "JSDocArrayType";
-        SyntaxKind[SyntaxKind["JSDocUnionType"] = 261] = "JSDocUnionType";
-        SyntaxKind[SyntaxKind["JSDocTupleType"] = 262] = "JSDocTupleType";
-        SyntaxKind[SyntaxKind["JSDocNullableType"] = 263] = "JSDocNullableType";
-        SyntaxKind[SyntaxKind["JSDocNonNullableType"] = 264] = "JSDocNonNullableType";
-        SyntaxKind[SyntaxKind["JSDocRecordType"] = 265] = "JSDocRecordType";
-        SyntaxKind[SyntaxKind["JSDocRecordMember"] = 266] = "JSDocRecordMember";
-        SyntaxKind[SyntaxKind["JSDocTypeReference"] = 267] = "JSDocTypeReference";
-        SyntaxKind[SyntaxKind["JSDocOptionalType"] = 268] = "JSDocOptionalType";
-        SyntaxKind[SyntaxKind["JSDocFunctionType"] = 269] = "JSDocFunctionType";
-        SyntaxKind[SyntaxKind["JSDocVariadicType"] = 270] = "JSDocVariadicType";
-        SyntaxKind[SyntaxKind["JSDocConstructorType"] = 271] = "JSDocConstructorType";
-        SyntaxKind[SyntaxKind["JSDocThisType"] = 272] = "JSDocThisType";
-        SyntaxKind[SyntaxKind["JSDocComment"] = 273] = "JSDocComment";
-        SyntaxKind[SyntaxKind["JSDocTag"] = 274] = "JSDocTag";
-        SyntaxKind[SyntaxKind["JSDocParameterTag"] = 275] = "JSDocParameterTag";
-        SyntaxKind[SyntaxKind["JSDocReturnTag"] = 276] = "JSDocReturnTag";
-        SyntaxKind[SyntaxKind["JSDocTypeTag"] = 277] = "JSDocTypeTag";
-        SyntaxKind[SyntaxKind["JSDocTemplateTag"] = 278] = "JSDocTemplateTag";
-        SyntaxKind[SyntaxKind["JSDocTypedefTag"] = 279] = "JSDocTypedefTag";
-        SyntaxKind[SyntaxKind["JSDocPropertyTag"] = 280] = "JSDocPropertyTag";
-        SyntaxKind[SyntaxKind["JSDocTypeLiteral"] = 281] = "JSDocTypeLiteral";
-        SyntaxKind[SyntaxKind["JSDocLiteralType"] = 282] = "JSDocLiteralType";
-        SyntaxKind[SyntaxKind["JSDocNullKeyword"] = 283] = "JSDocNullKeyword";
-        SyntaxKind[SyntaxKind["JSDocUndefinedKeyword"] = 284] = "JSDocUndefinedKeyword";
-        SyntaxKind[SyntaxKind["JSDocNeverKeyword"] = 285] = "JSDocNeverKeyword";
-        SyntaxKind[SyntaxKind["SyntaxList"] = 286] = "SyntaxList";
-        SyntaxKind[SyntaxKind["NotEmittedStatement"] = 287] = "NotEmittedStatement";
-        SyntaxKind[SyntaxKind["PartiallyEmittedExpression"] = 288] = "PartiallyEmittedExpression";
-        SyntaxKind[SyntaxKind["Count"] = 289] = "Count";
-        SyntaxKind[SyntaxKind["FirstAssignment"] = 57] = "FirstAssignment";
-        SyntaxKind[SyntaxKind["LastAssignment"] = 69] = "LastAssignment";
-        SyntaxKind[SyntaxKind["FirstCompoundAssignment"] = 58] = "FirstCompoundAssignment";
-        SyntaxKind[SyntaxKind["LastCompoundAssignment"] = 69] = "LastCompoundAssignment";
-        SyntaxKind[SyntaxKind["FirstReservedWord"] = 71] = "FirstReservedWord";
-        SyntaxKind[SyntaxKind["LastReservedWord"] = 106] = "LastReservedWord";
-        SyntaxKind[SyntaxKind["FirstKeyword"] = 71] = "FirstKeyword";
-        SyntaxKind[SyntaxKind["LastKeyword"] = 139] = "LastKeyword";
-        SyntaxKind[SyntaxKind["FirstFutureReservedWord"] = 107] = "FirstFutureReservedWord";
-        SyntaxKind[SyntaxKind["LastFutureReservedWord"] = 115] = "LastFutureReservedWord";
-        SyntaxKind[SyntaxKind["FirstTypeNode"] = 155] = "FirstTypeNode";
-        SyntaxKind[SyntaxKind["LastTypeNode"] = 167] = "LastTypeNode";
-        SyntaxKind[SyntaxKind["FirstPunctuation"] = 16] = "FirstPunctuation";
-        SyntaxKind[SyntaxKind["LastPunctuation"] = 69] = "LastPunctuation";
-        SyntaxKind[SyntaxKind["FirstToken"] = 0] = "FirstToken";
-        SyntaxKind[SyntaxKind["LastToken"] = 139] = "LastToken";
-        SyntaxKind[SyntaxKind["FirstTriviaToken"] = 2] = "FirstTriviaToken";
-        SyntaxKind[SyntaxKind["LastTriviaToken"] = 7] = "LastTriviaToken";
-        SyntaxKind[SyntaxKind["FirstLiteralToken"] = 8] = "FirstLiteralToken";
-        SyntaxKind[SyntaxKind["LastLiteralToken"] = 12] = "LastLiteralToken";
-        SyntaxKind[SyntaxKind["FirstTemplateToken"] = 12] = "FirstTemplateToken";
-        SyntaxKind[SyntaxKind["LastTemplateToken"] = 15] = "LastTemplateToken";
-        SyntaxKind[SyntaxKind["FirstBinaryOperator"] = 26] = "FirstBinaryOperator";
-        SyntaxKind[SyntaxKind["LastBinaryOperator"] = 69] = "LastBinaryOperator";
-        SyntaxKind[SyntaxKind["FirstNode"] = 140] = "FirstNode";
-        SyntaxKind[SyntaxKind["FirstJSDocNode"] = 257] = "FirstJSDocNode";
-        SyntaxKind[SyntaxKind["LastJSDocNode"] = 282] = "LastJSDocNode";
-        SyntaxKind[SyntaxKind["FirstJSDocTagNode"] = 273] = "FirstJSDocTagNode";
-        SyntaxKind[SyntaxKind["LastJSDocTagNode"] = 285] = "LastJSDocTagNode";
-    })(ts.SyntaxKind || (ts.SyntaxKind = {}));
-    var SyntaxKind = ts.SyntaxKind;
-    (function (NodeFlags) {
-        NodeFlags[NodeFlags["None"] = 0] = "None";
-        NodeFlags[NodeFlags["Let"] = 1] = "Let";
-        NodeFlags[NodeFlags["Const"] = 2] = "Const";
-        NodeFlags[NodeFlags["NestedNamespace"] = 4] = "NestedNamespace";
-        NodeFlags[NodeFlags["Synthesized"] = 8] = "Synthesized";
-        NodeFlags[NodeFlags["Namespace"] = 16] = "Namespace";
-        NodeFlags[NodeFlags["ExportContext"] = 32] = "ExportContext";
-        NodeFlags[NodeFlags["ContainsThis"] = 64] = "ContainsThis";
-        NodeFlags[NodeFlags["HasImplicitReturn"] = 128] = "HasImplicitReturn";
-        NodeFlags[NodeFlags["HasExplicitReturn"] = 256] = "HasExplicitReturn";
-        NodeFlags[NodeFlags["GlobalAugmentation"] = 512] = "GlobalAugmentation";
-        NodeFlags[NodeFlags["HasClassExtends"] = 1024] = "HasClassExtends";
-        NodeFlags[NodeFlags["HasDecorators"] = 2048] = "HasDecorators";
-        NodeFlags[NodeFlags["HasParamDecorators"] = 4096] = "HasParamDecorators";
-        NodeFlags[NodeFlags["HasAsyncFunctions"] = 8192] = "HasAsyncFunctions";
-        NodeFlags[NodeFlags["HasJsxSpreadAttributes"] = 16384] = "HasJsxSpreadAttributes";
-        NodeFlags[NodeFlags["DisallowInContext"] = 32768] = "DisallowInContext";
-        NodeFlags[NodeFlags["YieldContext"] = 65536] = "YieldContext";
-        NodeFlags[NodeFlags["DecoratorContext"] = 131072] = "DecoratorContext";
-        NodeFlags[NodeFlags["AwaitContext"] = 262144] = "AwaitContext";
-        NodeFlags[NodeFlags["ThisNodeHasError"] = 524288] = "ThisNodeHasError";
-        NodeFlags[NodeFlags["JavaScriptFile"] = 1048576] = "JavaScriptFile";
-        NodeFlags[NodeFlags["ThisNodeOrAnySubNodesHasError"] = 2097152] = "ThisNodeOrAnySubNodesHasError";
-        NodeFlags[NodeFlags["HasAggregatedChildData"] = 4194304] = "HasAggregatedChildData";
-        NodeFlags[NodeFlags["BlockScoped"] = 3] = "BlockScoped";
-        NodeFlags[NodeFlags["ReachabilityCheckFlags"] = 384] = "ReachabilityCheckFlags";
-        NodeFlags[NodeFlags["EmitHelperFlags"] = 31744] = "EmitHelperFlags";
-        NodeFlags[NodeFlags["ReachabilityAndEmitFlags"] = 32128] = "ReachabilityAndEmitFlags";
-        NodeFlags[NodeFlags["ContextFlags"] = 1540096] = "ContextFlags";
-        NodeFlags[NodeFlags["TypeExcludesFlags"] = 327680] = "TypeExcludesFlags";
-    })(ts.NodeFlags || (ts.NodeFlags = {}));
-    var NodeFlags = ts.NodeFlags;
-    (function (ModifierFlags) {
-        ModifierFlags[ModifierFlags["None"] = 0] = "None";
-        ModifierFlags[ModifierFlags["Export"] = 1] = "Export";
-        ModifierFlags[ModifierFlags["Ambient"] = 2] = "Ambient";
-        ModifierFlags[ModifierFlags["Public"] = 4] = "Public";
-        ModifierFlags[ModifierFlags["Private"] = 8] = "Private";
-        ModifierFlags[ModifierFlags["Protected"] = 16] = "Protected";
-        ModifierFlags[ModifierFlags["Static"] = 32] = "Static";
-        ModifierFlags[ModifierFlags["Readonly"] = 64] = "Readonly";
-        ModifierFlags[ModifierFlags["Abstract"] = 128] = "Abstract";
-        ModifierFlags[ModifierFlags["Async"] = 256] = "Async";
-        ModifierFlags[ModifierFlags["Default"] = 512] = "Default";
-        ModifierFlags[ModifierFlags["Const"] = 2048] = "Const";
-        ModifierFlags[ModifierFlags["HasComputedFlags"] = 536870912] = "HasComputedFlags";
-        ModifierFlags[ModifierFlags["AccessibilityModifier"] = 28] = "AccessibilityModifier";
-        ModifierFlags[ModifierFlags["ParameterPropertyModifier"] = 92] = "ParameterPropertyModifier";
-        ModifierFlags[ModifierFlags["NonPublicAccessibilityModifier"] = 24] = "NonPublicAccessibilityModifier";
-        ModifierFlags[ModifierFlags["TypeScriptModifier"] = 2270] = "TypeScriptModifier";
-    })(ts.ModifierFlags || (ts.ModifierFlags = {}));
-    var ModifierFlags = ts.ModifierFlags;
-    (function (JsxFlags) {
-        JsxFlags[JsxFlags["None"] = 0] = "None";
-        JsxFlags[JsxFlags["IntrinsicNamedElement"] = 1] = "IntrinsicNamedElement";
-        JsxFlags[JsxFlags["IntrinsicIndexedElement"] = 2] = "IntrinsicIndexedElement";
-        JsxFlags[JsxFlags["IntrinsicElement"] = 3] = "IntrinsicElement";
-    })(ts.JsxFlags || (ts.JsxFlags = {}));
-    var JsxFlags = ts.JsxFlags;
-    (function (RelationComparisonResult) {
-        RelationComparisonResult[RelationComparisonResult["Succeeded"] = 1] = "Succeeded";
-        RelationComparisonResult[RelationComparisonResult["Failed"] = 2] = "Failed";
-        RelationComparisonResult[RelationComparisonResult["FailedAndReported"] = 3] = "FailedAndReported";
-    })(ts.RelationComparisonResult || (ts.RelationComparisonResult = {}));
-    var RelationComparisonResult = ts.RelationComparisonResult;
-    (function (GeneratedIdentifierKind) {
-        GeneratedIdentifierKind[GeneratedIdentifierKind["None"] = 0] = "None";
-        GeneratedIdentifierKind[GeneratedIdentifierKind["Auto"] = 1] = "Auto";
-        GeneratedIdentifierKind[GeneratedIdentifierKind["Loop"] = 2] = "Loop";
-        GeneratedIdentifierKind[GeneratedIdentifierKind["Unique"] = 3] = "Unique";
-        GeneratedIdentifierKind[GeneratedIdentifierKind["Node"] = 4] = "Node";
-    })(ts.GeneratedIdentifierKind || (ts.GeneratedIdentifierKind = {}));
-    var GeneratedIdentifierKind = ts.GeneratedIdentifierKind;
-    (function (FlowFlags) {
-        FlowFlags[FlowFlags["Unreachable"] = 1] = "Unreachable";
-        FlowFlags[FlowFlags["Start"] = 2] = "Start";
-        FlowFlags[FlowFlags["BranchLabel"] = 4] = "BranchLabel";
-        FlowFlags[FlowFlags["LoopLabel"] = 8] = "LoopLabel";
-        FlowFlags[FlowFlags["Assignment"] = 16] = "Assignment";
-        FlowFlags[FlowFlags["TrueCondition"] = 32] = "TrueCondition";
-        FlowFlags[FlowFlags["FalseCondition"] = 64] = "FalseCondition";
-        FlowFlags[FlowFlags["SwitchClause"] = 128] = "SwitchClause";
-        FlowFlags[FlowFlags["ArrayMutation"] = 256] = "ArrayMutation";
-        FlowFlags[FlowFlags["Referenced"] = 512] = "Referenced";
-        FlowFlags[FlowFlags["Shared"] = 1024] = "Shared";
-        FlowFlags[FlowFlags["Label"] = 12] = "Label";
-        FlowFlags[FlowFlags["Condition"] = 96] = "Condition";
-    })(ts.FlowFlags || (ts.FlowFlags = {}));
-    var FlowFlags = ts.FlowFlags;
     var OperationCanceledException = (function () {
         function OperationCanceledException() {
         }
@@ -439,38 +27,6 @@ var ts;
         ExitStatus[ExitStatus["DiagnosticsPresent_OutputsGenerated"] = 2] = "DiagnosticsPresent_OutputsGenerated";
     })(ts.ExitStatus || (ts.ExitStatus = {}));
     var ExitStatus = ts.ExitStatus;
-    (function (TypeFormatFlags) {
-        TypeFormatFlags[TypeFormatFlags["None"] = 0] = "None";
-        TypeFormatFlags[TypeFormatFlags["WriteArrayAsGenericType"] = 1] = "WriteArrayAsGenericType";
-        TypeFormatFlags[TypeFormatFlags["UseTypeOfFunction"] = 2] = "UseTypeOfFunction";
-        TypeFormatFlags[TypeFormatFlags["NoTruncation"] = 4] = "NoTruncation";
-        TypeFormatFlags[TypeFormatFlags["WriteArrowStyleSignature"] = 8] = "WriteArrowStyleSignature";
-        TypeFormatFlags[TypeFormatFlags["WriteOwnNameForAnyLike"] = 16] = "WriteOwnNameForAnyLike";
-        TypeFormatFlags[TypeFormatFlags["WriteTypeArgumentsOfSignature"] = 32] = "WriteTypeArgumentsOfSignature";
-        TypeFormatFlags[TypeFormatFlags["InElementType"] = 64] = "InElementType";
-        TypeFormatFlags[TypeFormatFlags["UseFullyQualifiedType"] = 128] = "UseFullyQualifiedType";
-        TypeFormatFlags[TypeFormatFlags["InFirstTypeArgument"] = 256] = "InFirstTypeArgument";
-        TypeFormatFlags[TypeFormatFlags["InTypeAlias"] = 512] = "InTypeAlias";
-        TypeFormatFlags[TypeFormatFlags["UseTypeAliasValue"] = 1024] = "UseTypeAliasValue";
-    })(ts.TypeFormatFlags || (ts.TypeFormatFlags = {}));
-    var TypeFormatFlags = ts.TypeFormatFlags;
-    (function (SymbolFormatFlags) {
-        SymbolFormatFlags[SymbolFormatFlags["None"] = 0] = "None";
-        SymbolFormatFlags[SymbolFormatFlags["WriteTypeParametersOrArguments"] = 1] = "WriteTypeParametersOrArguments";
-        SymbolFormatFlags[SymbolFormatFlags["UseOnlyExternalAliasing"] = 2] = "UseOnlyExternalAliasing";
-    })(ts.SymbolFormatFlags || (ts.SymbolFormatFlags = {}));
-    var SymbolFormatFlags = ts.SymbolFormatFlags;
-    (function (SymbolAccessibility) {
-        SymbolAccessibility[SymbolAccessibility["Accessible"] = 0] = "Accessible";
-        SymbolAccessibility[SymbolAccessibility["NotAccessible"] = 1] = "NotAccessible";
-        SymbolAccessibility[SymbolAccessibility["CannotBeNamed"] = 2] = "CannotBeNamed";
-    })(ts.SymbolAccessibility || (ts.SymbolAccessibility = {}));
-    var SymbolAccessibility = ts.SymbolAccessibility;
-    (function (TypePredicateKind) {
-        TypePredicateKind[TypePredicateKind["This"] = 0] = "This";
-        TypePredicateKind[TypePredicateKind["Identifier"] = 1] = "Identifier";
-    })(ts.TypePredicateKind || (ts.TypePredicateKind = {}));
-    var TypePredicateKind = ts.TypePredicateKind;
     (function (TypeReferenceSerializationKind) {
         TypeReferenceSerializationKind[TypeReferenceSerializationKind["Unknown"] = 0] = "Unknown";
         TypeReferenceSerializationKind[TypeReferenceSerializationKind["TypeWithConstructSignatureAndValue"] = 1] = "TypeWithConstructSignatureAndValue";
@@ -485,166 +41,6 @@ var ts;
         TypeReferenceSerializationKind[TypeReferenceSerializationKind["ObjectType"] = 10] = "ObjectType";
     })(ts.TypeReferenceSerializationKind || (ts.TypeReferenceSerializationKind = {}));
     var TypeReferenceSerializationKind = ts.TypeReferenceSerializationKind;
-    (function (SymbolFlags) {
-        SymbolFlags[SymbolFlags["None"] = 0] = "None";
-        SymbolFlags[SymbolFlags["FunctionScopedVariable"] = 1] = "FunctionScopedVariable";
-        SymbolFlags[SymbolFlags["BlockScopedVariable"] = 2] = "BlockScopedVariable";
-        SymbolFlags[SymbolFlags["Property"] = 4] = "Property";
-        SymbolFlags[SymbolFlags["EnumMember"] = 8] = "EnumMember";
-        SymbolFlags[SymbolFlags["Function"] = 16] = "Function";
-        SymbolFlags[SymbolFlags["Class"] = 32] = "Class";
-        SymbolFlags[SymbolFlags["Interface"] = 64] = "Interface";
-        SymbolFlags[SymbolFlags["ConstEnum"] = 128] = "ConstEnum";
-        SymbolFlags[SymbolFlags["RegularEnum"] = 256] = "RegularEnum";
-        SymbolFlags[SymbolFlags["ValueModule"] = 512] = "ValueModule";
-        SymbolFlags[SymbolFlags["NamespaceModule"] = 1024] = "NamespaceModule";
-        SymbolFlags[SymbolFlags["TypeLiteral"] = 2048] = "TypeLiteral";
-        SymbolFlags[SymbolFlags["ObjectLiteral"] = 4096] = "ObjectLiteral";
-        SymbolFlags[SymbolFlags["Method"] = 8192] = "Method";
-        SymbolFlags[SymbolFlags["Constructor"] = 16384] = "Constructor";
-        SymbolFlags[SymbolFlags["GetAccessor"] = 32768] = "GetAccessor";
-        SymbolFlags[SymbolFlags["SetAccessor"] = 65536] = "SetAccessor";
-        SymbolFlags[SymbolFlags["Signature"] = 131072] = "Signature";
-        SymbolFlags[SymbolFlags["TypeParameter"] = 262144] = "TypeParameter";
-        SymbolFlags[SymbolFlags["TypeAlias"] = 524288] = "TypeAlias";
-        SymbolFlags[SymbolFlags["ExportValue"] = 1048576] = "ExportValue";
-        SymbolFlags[SymbolFlags["ExportType"] = 2097152] = "ExportType";
-        SymbolFlags[SymbolFlags["ExportNamespace"] = 4194304] = "ExportNamespace";
-        SymbolFlags[SymbolFlags["Alias"] = 8388608] = "Alias";
-        SymbolFlags[SymbolFlags["Instantiated"] = 16777216] = "Instantiated";
-        SymbolFlags[SymbolFlags["Merged"] = 33554432] = "Merged";
-        SymbolFlags[SymbolFlags["Transient"] = 67108864] = "Transient";
-        SymbolFlags[SymbolFlags["Prototype"] = 134217728] = "Prototype";
-        SymbolFlags[SymbolFlags["SyntheticProperty"] = 268435456] = "SyntheticProperty";
-        SymbolFlags[SymbolFlags["Optional"] = 536870912] = "Optional";
-        SymbolFlags[SymbolFlags["ExportStar"] = 1073741824] = "ExportStar";
-        SymbolFlags[SymbolFlags["Enum"] = 384] = "Enum";
-        SymbolFlags[SymbolFlags["Variable"] = 3] = "Variable";
-        SymbolFlags[SymbolFlags["Value"] = 107455] = "Value";
-        SymbolFlags[SymbolFlags["Type"] = 793064] = "Type";
-        SymbolFlags[SymbolFlags["Namespace"] = 1920] = "Namespace";
-        SymbolFlags[SymbolFlags["Module"] = 1536] = "Module";
-        SymbolFlags[SymbolFlags["Accessor"] = 98304] = "Accessor";
-        SymbolFlags[SymbolFlags["FunctionScopedVariableExcludes"] = 107454] = "FunctionScopedVariableExcludes";
-        SymbolFlags[SymbolFlags["BlockScopedVariableExcludes"] = 107455] = "BlockScopedVariableExcludes";
-        SymbolFlags[SymbolFlags["ParameterExcludes"] = 107455] = "ParameterExcludes";
-        SymbolFlags[SymbolFlags["PropertyExcludes"] = 0] = "PropertyExcludes";
-        SymbolFlags[SymbolFlags["EnumMemberExcludes"] = 900095] = "EnumMemberExcludes";
-        SymbolFlags[SymbolFlags["FunctionExcludes"] = 106927] = "FunctionExcludes";
-        SymbolFlags[SymbolFlags["ClassExcludes"] = 899519] = "ClassExcludes";
-        SymbolFlags[SymbolFlags["InterfaceExcludes"] = 792968] = "InterfaceExcludes";
-        SymbolFlags[SymbolFlags["RegularEnumExcludes"] = 899327] = "RegularEnumExcludes";
-        SymbolFlags[SymbolFlags["ConstEnumExcludes"] = 899967] = "ConstEnumExcludes";
-        SymbolFlags[SymbolFlags["ValueModuleExcludes"] = 106639] = "ValueModuleExcludes";
-        SymbolFlags[SymbolFlags["NamespaceModuleExcludes"] = 0] = "NamespaceModuleExcludes";
-        SymbolFlags[SymbolFlags["MethodExcludes"] = 99263] = "MethodExcludes";
-        SymbolFlags[SymbolFlags["GetAccessorExcludes"] = 41919] = "GetAccessorExcludes";
-        SymbolFlags[SymbolFlags["SetAccessorExcludes"] = 74687] = "SetAccessorExcludes";
-        SymbolFlags[SymbolFlags["TypeParameterExcludes"] = 530920] = "TypeParameterExcludes";
-        SymbolFlags[SymbolFlags["TypeAliasExcludes"] = 793064] = "TypeAliasExcludes";
-        SymbolFlags[SymbolFlags["AliasExcludes"] = 8388608] = "AliasExcludes";
-        SymbolFlags[SymbolFlags["ModuleMember"] = 8914931] = "ModuleMember";
-        SymbolFlags[SymbolFlags["ExportHasLocal"] = 944] = "ExportHasLocal";
-        SymbolFlags[SymbolFlags["HasExports"] = 1952] = "HasExports";
-        SymbolFlags[SymbolFlags["HasMembers"] = 6240] = "HasMembers";
-        SymbolFlags[SymbolFlags["BlockScoped"] = 418] = "BlockScoped";
-        SymbolFlags[SymbolFlags["PropertyOrAccessor"] = 98308] = "PropertyOrAccessor";
-        SymbolFlags[SymbolFlags["Export"] = 7340032] = "Export";
-        SymbolFlags[SymbolFlags["ClassMember"] = 106500] = "ClassMember";
-        SymbolFlags[SymbolFlags["Classifiable"] = 788448] = "Classifiable";
-    })(ts.SymbolFlags || (ts.SymbolFlags = {}));
-    var SymbolFlags = ts.SymbolFlags;
-    (function (NodeCheckFlags) {
-        NodeCheckFlags[NodeCheckFlags["TypeChecked"] = 1] = "TypeChecked";
-        NodeCheckFlags[NodeCheckFlags["LexicalThis"] = 2] = "LexicalThis";
-        NodeCheckFlags[NodeCheckFlags["CaptureThis"] = 4] = "CaptureThis";
-        NodeCheckFlags[NodeCheckFlags["SuperInstance"] = 256] = "SuperInstance";
-        NodeCheckFlags[NodeCheckFlags["SuperStatic"] = 512] = "SuperStatic";
-        NodeCheckFlags[NodeCheckFlags["ContextChecked"] = 1024] = "ContextChecked";
-        NodeCheckFlags[NodeCheckFlags["AsyncMethodWithSuper"] = 2048] = "AsyncMethodWithSuper";
-        NodeCheckFlags[NodeCheckFlags["AsyncMethodWithSuperBinding"] = 4096] = "AsyncMethodWithSuperBinding";
-        NodeCheckFlags[NodeCheckFlags["CaptureArguments"] = 8192] = "CaptureArguments";
-        NodeCheckFlags[NodeCheckFlags["EnumValuesComputed"] = 16384] = "EnumValuesComputed";
-        NodeCheckFlags[NodeCheckFlags["LexicalModuleMergesWithClass"] = 32768] = "LexicalModuleMergesWithClass";
-        NodeCheckFlags[NodeCheckFlags["LoopWithCapturedBlockScopedBinding"] = 65536] = "LoopWithCapturedBlockScopedBinding";
-        NodeCheckFlags[NodeCheckFlags["CapturedBlockScopedBinding"] = 131072] = "CapturedBlockScopedBinding";
-        NodeCheckFlags[NodeCheckFlags["BlockScopedBindingInLoop"] = 262144] = "BlockScopedBindingInLoop";
-        NodeCheckFlags[NodeCheckFlags["ClassWithBodyScopedClassBinding"] = 524288] = "ClassWithBodyScopedClassBinding";
-        NodeCheckFlags[NodeCheckFlags["BodyScopedClassBinding"] = 1048576] = "BodyScopedClassBinding";
-        NodeCheckFlags[NodeCheckFlags["NeedsLoopOutParameter"] = 2097152] = "NeedsLoopOutParameter";
-        NodeCheckFlags[NodeCheckFlags["AssignmentsMarked"] = 4194304] = "AssignmentsMarked";
-        NodeCheckFlags[NodeCheckFlags["ClassWithConstructorReference"] = 8388608] = "ClassWithConstructorReference";
-        NodeCheckFlags[NodeCheckFlags["ConstructorReferenceInClass"] = 16777216] = "ConstructorReferenceInClass";
-    })(ts.NodeCheckFlags || (ts.NodeCheckFlags = {}));
-    var NodeCheckFlags = ts.NodeCheckFlags;
-    (function (TypeFlags) {
-        TypeFlags[TypeFlags["Any"] = 1] = "Any";
-        TypeFlags[TypeFlags["String"] = 2] = "String";
-        TypeFlags[TypeFlags["Number"] = 4] = "Number";
-        TypeFlags[TypeFlags["Boolean"] = 8] = "Boolean";
-        TypeFlags[TypeFlags["Enum"] = 16] = "Enum";
-        TypeFlags[TypeFlags["StringLiteral"] = 32] = "StringLiteral";
-        TypeFlags[TypeFlags["NumberLiteral"] = 64] = "NumberLiteral";
-        TypeFlags[TypeFlags["BooleanLiteral"] = 128] = "BooleanLiteral";
-        TypeFlags[TypeFlags["EnumLiteral"] = 256] = "EnumLiteral";
-        TypeFlags[TypeFlags["ESSymbol"] = 512] = "ESSymbol";
-        TypeFlags[TypeFlags["Void"] = 1024] = "Void";
-        TypeFlags[TypeFlags["Undefined"] = 2048] = "Undefined";
-        TypeFlags[TypeFlags["Null"] = 4096] = "Null";
-        TypeFlags[TypeFlags["Never"] = 8192] = "Never";
-        TypeFlags[TypeFlags["TypeParameter"] = 16384] = "TypeParameter";
-        TypeFlags[TypeFlags["Class"] = 32768] = "Class";
-        TypeFlags[TypeFlags["Interface"] = 65536] = "Interface";
-        TypeFlags[TypeFlags["Reference"] = 131072] = "Reference";
-        TypeFlags[TypeFlags["Tuple"] = 262144] = "Tuple";
-        TypeFlags[TypeFlags["Union"] = 524288] = "Union";
-        TypeFlags[TypeFlags["Intersection"] = 1048576] = "Intersection";
-        TypeFlags[TypeFlags["Anonymous"] = 2097152] = "Anonymous";
-        TypeFlags[TypeFlags["Instantiated"] = 4194304] = "Instantiated";
-        TypeFlags[TypeFlags["ObjectLiteral"] = 8388608] = "ObjectLiteral";
-        TypeFlags[TypeFlags["FreshLiteral"] = 16777216] = "FreshLiteral";
-        TypeFlags[TypeFlags["ContainsWideningType"] = 33554432] = "ContainsWideningType";
-        TypeFlags[TypeFlags["ContainsObjectLiteral"] = 67108864] = "ContainsObjectLiteral";
-        TypeFlags[TypeFlags["ContainsAnyFunctionType"] = 134217728] = "ContainsAnyFunctionType";
-        TypeFlags[TypeFlags["Nullable"] = 6144] = "Nullable";
-        TypeFlags[TypeFlags["Literal"] = 480] = "Literal";
-        TypeFlags[TypeFlags["StringOrNumberLiteral"] = 96] = "StringOrNumberLiteral";
-        TypeFlags[TypeFlags["DefinitelyFalsy"] = 7392] = "DefinitelyFalsy";
-        TypeFlags[TypeFlags["PossiblyFalsy"] = 7406] = "PossiblyFalsy";
-        TypeFlags[TypeFlags["Intrinsic"] = 16015] = "Intrinsic";
-        TypeFlags[TypeFlags["Primitive"] = 8190] = "Primitive";
-        TypeFlags[TypeFlags["StringLike"] = 34] = "StringLike";
-        TypeFlags[TypeFlags["NumberLike"] = 340] = "NumberLike";
-        TypeFlags[TypeFlags["BooleanLike"] = 136] = "BooleanLike";
-        TypeFlags[TypeFlags["EnumLike"] = 272] = "EnumLike";
-        TypeFlags[TypeFlags["ObjectType"] = 2588672] = "ObjectType";
-        TypeFlags[TypeFlags["UnionOrIntersection"] = 1572864] = "UnionOrIntersection";
-        TypeFlags[TypeFlags["StructuredType"] = 4161536] = "StructuredType";
-        TypeFlags[TypeFlags["StructuredOrTypeParameter"] = 4177920] = "StructuredOrTypeParameter";
-        TypeFlags[TypeFlags["Narrowable"] = 4178943] = "Narrowable";
-        TypeFlags[TypeFlags["NotUnionOrUnit"] = 2589185] = "NotUnionOrUnit";
-        TypeFlags[TypeFlags["RequiresWidening"] = 100663296] = "RequiresWidening";
-        TypeFlags[TypeFlags["PropagatingFlags"] = 234881024] = "PropagatingFlags";
-    })(ts.TypeFlags || (ts.TypeFlags = {}));
-    var TypeFlags = ts.TypeFlags;
-    (function (SignatureKind) {
-        SignatureKind[SignatureKind["Call"] = 0] = "Call";
-        SignatureKind[SignatureKind["Construct"] = 1] = "Construct";
-    })(ts.SignatureKind || (ts.SignatureKind = {}));
-    var SignatureKind = ts.SignatureKind;
-    (function (IndexKind) {
-        IndexKind[IndexKind["String"] = 0] = "String";
-        IndexKind[IndexKind["Number"] = 1] = "Number";
-    })(ts.IndexKind || (ts.IndexKind = {}));
-    var IndexKind = ts.IndexKind;
-    (function (SpecialPropertyAssignmentKind) {
-        SpecialPropertyAssignmentKind[SpecialPropertyAssignmentKind["None"] = 0] = "None";
-        SpecialPropertyAssignmentKind[SpecialPropertyAssignmentKind["ExportsProperty"] = 1] = "ExportsProperty";
-        SpecialPropertyAssignmentKind[SpecialPropertyAssignmentKind["ModuleExports"] = 2] = "ModuleExports";
-        SpecialPropertyAssignmentKind[SpecialPropertyAssignmentKind["PrototypeProperty"] = 3] = "PrototypeProperty";
-        SpecialPropertyAssignmentKind[SpecialPropertyAssignmentKind["ThisProperty"] = 4] = "ThisProperty";
-    })(ts.SpecialPropertyAssignmentKind || (ts.SpecialPropertyAssignmentKind = {}));
-    var SpecialPropertyAssignmentKind = ts.SpecialPropertyAssignmentKind;
     (function (DiagnosticCategory) {
         DiagnosticCategory[DiagnosticCategory["Warning"] = 0] = "Warning";
         DiagnosticCategory[DiagnosticCategory["Error"] = 1] = "Error";
@@ -665,264 +61,15 @@ var ts;
         ModuleKind[ModuleKind["ES2015"] = 5] = "ES2015";
     })(ts.ModuleKind || (ts.ModuleKind = {}));
     var ModuleKind = ts.ModuleKind;
-    (function (JsxEmit) {
-        JsxEmit[JsxEmit["None"] = 0] = "None";
-        JsxEmit[JsxEmit["Preserve"] = 1] = "Preserve";
-        JsxEmit[JsxEmit["React"] = 2] = "React";
-    })(ts.JsxEmit || (ts.JsxEmit = {}));
-    var JsxEmit = ts.JsxEmit;
-    (function (NewLineKind) {
-        NewLineKind[NewLineKind["CarriageReturnLineFeed"] = 0] = "CarriageReturnLineFeed";
-        NewLineKind[NewLineKind["LineFeed"] = 1] = "LineFeed";
-    })(ts.NewLineKind || (ts.NewLineKind = {}));
-    var NewLineKind = ts.NewLineKind;
-    (function (ScriptKind) {
-        ScriptKind[ScriptKind["Unknown"] = 0] = "Unknown";
-        ScriptKind[ScriptKind["JS"] = 1] = "JS";
-        ScriptKind[ScriptKind["JSX"] = 2] = "JSX";
-        ScriptKind[ScriptKind["TS"] = 3] = "TS";
-        ScriptKind[ScriptKind["TSX"] = 4] = "TSX";
-    })(ts.ScriptKind || (ts.ScriptKind = {}));
-    var ScriptKind = ts.ScriptKind;
-    (function (ScriptTarget) {
-        ScriptTarget[ScriptTarget["ES3"] = 0] = "ES3";
-        ScriptTarget[ScriptTarget["ES5"] = 1] = "ES5";
-        ScriptTarget[ScriptTarget["ES2015"] = 2] = "ES2015";
-        ScriptTarget[ScriptTarget["ES2016"] = 3] = "ES2016";
-        ScriptTarget[ScriptTarget["ES2017"] = 4] = "ES2017";
-        ScriptTarget[ScriptTarget["Latest"] = 4] = "Latest";
-    })(ts.ScriptTarget || (ts.ScriptTarget = {}));
-    var ScriptTarget = ts.ScriptTarget;
-    (function (LanguageVariant) {
-        LanguageVariant[LanguageVariant["Standard"] = 0] = "Standard";
-        LanguageVariant[LanguageVariant["JSX"] = 1] = "JSX";
-    })(ts.LanguageVariant || (ts.LanguageVariant = {}));
-    var LanguageVariant = ts.LanguageVariant;
-    (function (DiagnosticStyle) {
-        DiagnosticStyle[DiagnosticStyle["Simple"] = 0] = "Simple";
-        DiagnosticStyle[DiagnosticStyle["Pretty"] = 1] = "Pretty";
-    })(ts.DiagnosticStyle || (ts.DiagnosticStyle = {}));
-    var DiagnosticStyle = ts.DiagnosticStyle;
-    (function (WatchDirectoryFlags) {
-        WatchDirectoryFlags[WatchDirectoryFlags["None"] = 0] = "None";
-        WatchDirectoryFlags[WatchDirectoryFlags["Recursive"] = 1] = "Recursive";
-    })(ts.WatchDirectoryFlags || (ts.WatchDirectoryFlags = {}));
-    var WatchDirectoryFlags = ts.WatchDirectoryFlags;
-    (function (CharacterCodes) {
-        CharacterCodes[CharacterCodes["nullCharacter"] = 0] = "nullCharacter";
-        CharacterCodes[CharacterCodes["maxAsciiCharacter"] = 127] = "maxAsciiCharacter";
-        CharacterCodes[CharacterCodes["lineFeed"] = 10] = "lineFeed";
-        CharacterCodes[CharacterCodes["carriageReturn"] = 13] = "carriageReturn";
-        CharacterCodes[CharacterCodes["lineSeparator"] = 8232] = "lineSeparator";
-        CharacterCodes[CharacterCodes["paragraphSeparator"] = 8233] = "paragraphSeparator";
-        CharacterCodes[CharacterCodes["nextLine"] = 133] = "nextLine";
-        CharacterCodes[CharacterCodes["space"] = 32] = "space";
-        CharacterCodes[CharacterCodes["nonBreakingSpace"] = 160] = "nonBreakingSpace";
-        CharacterCodes[CharacterCodes["enQuad"] = 8192] = "enQuad";
-        CharacterCodes[CharacterCodes["emQuad"] = 8193] = "emQuad";
-        CharacterCodes[CharacterCodes["enSpace"] = 8194] = "enSpace";
-        CharacterCodes[CharacterCodes["emSpace"] = 8195] = "emSpace";
-        CharacterCodes[CharacterCodes["threePerEmSpace"] = 8196] = "threePerEmSpace";
-        CharacterCodes[CharacterCodes["fourPerEmSpace"] = 8197] = "fourPerEmSpace";
-        CharacterCodes[CharacterCodes["sixPerEmSpace"] = 8198] = "sixPerEmSpace";
-        CharacterCodes[CharacterCodes["figureSpace"] = 8199] = "figureSpace";
-        CharacterCodes[CharacterCodes["punctuationSpace"] = 8200] = "punctuationSpace";
-        CharacterCodes[CharacterCodes["thinSpace"] = 8201] = "thinSpace";
-        CharacterCodes[CharacterCodes["hairSpace"] = 8202] = "hairSpace";
-        CharacterCodes[CharacterCodes["zeroWidthSpace"] = 8203] = "zeroWidthSpace";
-        CharacterCodes[CharacterCodes["narrowNoBreakSpace"] = 8239] = "narrowNoBreakSpace";
-        CharacterCodes[CharacterCodes["ideographicSpace"] = 12288] = "ideographicSpace";
-        CharacterCodes[CharacterCodes["mathematicalSpace"] = 8287] = "mathematicalSpace";
-        CharacterCodes[CharacterCodes["ogham"] = 5760] = "ogham";
-        CharacterCodes[CharacterCodes["_"] = 95] = "_";
-        CharacterCodes[CharacterCodes["$"] = 36] = "$";
-        CharacterCodes[CharacterCodes["_0"] = 48] = "_0";
-        CharacterCodes[CharacterCodes["_1"] = 49] = "_1";
-        CharacterCodes[CharacterCodes["_2"] = 50] = "_2";
-        CharacterCodes[CharacterCodes["_3"] = 51] = "_3";
-        CharacterCodes[CharacterCodes["_4"] = 52] = "_4";
-        CharacterCodes[CharacterCodes["_5"] = 53] = "_5";
-        CharacterCodes[CharacterCodes["_6"] = 54] = "_6";
-        CharacterCodes[CharacterCodes["_7"] = 55] = "_7";
-        CharacterCodes[CharacterCodes["_8"] = 56] = "_8";
-        CharacterCodes[CharacterCodes["_9"] = 57] = "_9";
-        CharacterCodes[CharacterCodes["a"] = 97] = "a";
-        CharacterCodes[CharacterCodes["b"] = 98] = "b";
-        CharacterCodes[CharacterCodes["c"] = 99] = "c";
-        CharacterCodes[CharacterCodes["d"] = 100] = "d";
-        CharacterCodes[CharacterCodes["e"] = 101] = "e";
-        CharacterCodes[CharacterCodes["f"] = 102] = "f";
-        CharacterCodes[CharacterCodes["g"] = 103] = "g";
-        CharacterCodes[CharacterCodes["h"] = 104] = "h";
-        CharacterCodes[CharacterCodes["i"] = 105] = "i";
-        CharacterCodes[CharacterCodes["j"] = 106] = "j";
-        CharacterCodes[CharacterCodes["k"] = 107] = "k";
-        CharacterCodes[CharacterCodes["l"] = 108] = "l";
-        CharacterCodes[CharacterCodes["m"] = 109] = "m";
-        CharacterCodes[CharacterCodes["n"] = 110] = "n";
-        CharacterCodes[CharacterCodes["o"] = 111] = "o";
-        CharacterCodes[CharacterCodes["p"] = 112] = "p";
-        CharacterCodes[CharacterCodes["q"] = 113] = "q";
-        CharacterCodes[CharacterCodes["r"] = 114] = "r";
-        CharacterCodes[CharacterCodes["s"] = 115] = "s";
-        CharacterCodes[CharacterCodes["t"] = 116] = "t";
-        CharacterCodes[CharacterCodes["u"] = 117] = "u";
-        CharacterCodes[CharacterCodes["v"] = 118] = "v";
-        CharacterCodes[CharacterCodes["w"] = 119] = "w";
-        CharacterCodes[CharacterCodes["x"] = 120] = "x";
-        CharacterCodes[CharacterCodes["y"] = 121] = "y";
-        CharacterCodes[CharacterCodes["z"] = 122] = "z";
-        CharacterCodes[CharacterCodes["A"] = 65] = "A";
-        CharacterCodes[CharacterCodes["B"] = 66] = "B";
-        CharacterCodes[CharacterCodes["C"] = 67] = "C";
-        CharacterCodes[CharacterCodes["D"] = 68] = "D";
-        CharacterCodes[CharacterCodes["E"] = 69] = "E";
-        CharacterCodes[CharacterCodes["F"] = 70] = "F";
-        CharacterCodes[CharacterCodes["G"] = 71] = "G";
-        CharacterCodes[CharacterCodes["H"] = 72] = "H";
-        CharacterCodes[CharacterCodes["I"] = 73] = "I";
-        CharacterCodes[CharacterCodes["J"] = 74] = "J";
-        CharacterCodes[CharacterCodes["K"] = 75] = "K";
-        CharacterCodes[CharacterCodes["L"] = 76] = "L";
-        CharacterCodes[CharacterCodes["M"] = 77] = "M";
-        CharacterCodes[CharacterCodes["N"] = 78] = "N";
-        CharacterCodes[CharacterCodes["O"] = 79] = "O";
-        CharacterCodes[CharacterCodes["P"] = 80] = "P";
-        CharacterCodes[CharacterCodes["Q"] = 81] = "Q";
-        CharacterCodes[CharacterCodes["R"] = 82] = "R";
-        CharacterCodes[CharacterCodes["S"] = 83] = "S";
-        CharacterCodes[CharacterCodes["T"] = 84] = "T";
-        CharacterCodes[CharacterCodes["U"] = 85] = "U";
-        CharacterCodes[CharacterCodes["V"] = 86] = "V";
-        CharacterCodes[CharacterCodes["W"] = 87] = "W";
-        CharacterCodes[CharacterCodes["X"] = 88] = "X";
-        CharacterCodes[CharacterCodes["Y"] = 89] = "Y";
-        CharacterCodes[CharacterCodes["Z"] = 90] = "Z";
-        CharacterCodes[CharacterCodes["ampersand"] = 38] = "ampersand";
-        CharacterCodes[CharacterCodes["asterisk"] = 42] = "asterisk";
-        CharacterCodes[CharacterCodes["at"] = 64] = "at";
-        CharacterCodes[CharacterCodes["backslash"] = 92] = "backslash";
-        CharacterCodes[CharacterCodes["backtick"] = 96] = "backtick";
-        CharacterCodes[CharacterCodes["bar"] = 124] = "bar";
-        CharacterCodes[CharacterCodes["caret"] = 94] = "caret";
-        CharacterCodes[CharacterCodes["closeBrace"] = 125] = "closeBrace";
-        CharacterCodes[CharacterCodes["closeBracket"] = 93] = "closeBracket";
-        CharacterCodes[CharacterCodes["closeParen"] = 41] = "closeParen";
-        CharacterCodes[CharacterCodes["colon"] = 58] = "colon";
-        CharacterCodes[CharacterCodes["comma"] = 44] = "comma";
-        CharacterCodes[CharacterCodes["dot"] = 46] = "dot";
-        CharacterCodes[CharacterCodes["doubleQuote"] = 34] = "doubleQuote";
-        CharacterCodes[CharacterCodes["equals"] = 61] = "equals";
-        CharacterCodes[CharacterCodes["exclamation"] = 33] = "exclamation";
-        CharacterCodes[CharacterCodes["greaterThan"] = 62] = "greaterThan";
-        CharacterCodes[CharacterCodes["hash"] = 35] = "hash";
-        CharacterCodes[CharacterCodes["lessThan"] = 60] = "lessThan";
-        CharacterCodes[CharacterCodes["minus"] = 45] = "minus";
-        CharacterCodes[CharacterCodes["openBrace"] = 123] = "openBrace";
-        CharacterCodes[CharacterCodes["openBracket"] = 91] = "openBracket";
-        CharacterCodes[CharacterCodes["openParen"] = 40] = "openParen";
-        CharacterCodes[CharacterCodes["percent"] = 37] = "percent";
-        CharacterCodes[CharacterCodes["plus"] = 43] = "plus";
-        CharacterCodes[CharacterCodes["question"] = 63] = "question";
-        CharacterCodes[CharacterCodes["semicolon"] = 59] = "semicolon";
-        CharacterCodes[CharacterCodes["singleQuote"] = 39] = "singleQuote";
-        CharacterCodes[CharacterCodes["slash"] = 47] = "slash";
-        CharacterCodes[CharacterCodes["tilde"] = 126] = "tilde";
-        CharacterCodes[CharacterCodes["backspace"] = 8] = "backspace";
-        CharacterCodes[CharacterCodes["formFeed"] = 12] = "formFeed";
-        CharacterCodes[CharacterCodes["byteOrderMark"] = 65279] = "byteOrderMark";
-        CharacterCodes[CharacterCodes["tab"] = 9] = "tab";
-        CharacterCodes[CharacterCodes["verticalTab"] = 11] = "verticalTab";
-    })(ts.CharacterCodes || (ts.CharacterCodes = {}));
-    var CharacterCodes = ts.CharacterCodes;
-    (function (TransformFlags) {
-        TransformFlags[TransformFlags["None"] = 0] = "None";
-        TransformFlags[TransformFlags["TypeScript"] = 1] = "TypeScript";
-        TransformFlags[TransformFlags["ContainsTypeScript"] = 2] = "ContainsTypeScript";
-        TransformFlags[TransformFlags["Jsx"] = 4] = "Jsx";
-        TransformFlags[TransformFlags["ContainsJsx"] = 8] = "ContainsJsx";
-        TransformFlags[TransformFlags["ES2017"] = 16] = "ES2017";
-        TransformFlags[TransformFlags["ContainsES2017"] = 32] = "ContainsES2017";
-        TransformFlags[TransformFlags["ES2016"] = 64] = "ES2016";
-        TransformFlags[TransformFlags["ContainsES2016"] = 128] = "ContainsES2016";
-        TransformFlags[TransformFlags["ES2015"] = 256] = "ES2015";
-        TransformFlags[TransformFlags["ContainsES2015"] = 512] = "ContainsES2015";
-        TransformFlags[TransformFlags["DestructuringAssignment"] = 1024] = "DestructuringAssignment";
-        TransformFlags[TransformFlags["Generator"] = 2048] = "Generator";
-        TransformFlags[TransformFlags["ContainsGenerator"] = 4096] = "ContainsGenerator";
-        TransformFlags[TransformFlags["ContainsDecorators"] = 8192] = "ContainsDecorators";
-        TransformFlags[TransformFlags["ContainsPropertyInitializer"] = 16384] = "ContainsPropertyInitializer";
-        TransformFlags[TransformFlags["ContainsLexicalThis"] = 32768] = "ContainsLexicalThis";
-        TransformFlags[TransformFlags["ContainsCapturedLexicalThis"] = 65536] = "ContainsCapturedLexicalThis";
-        TransformFlags[TransformFlags["ContainsLexicalThisInComputedPropertyName"] = 131072] = "ContainsLexicalThisInComputedPropertyName";
-        TransformFlags[TransformFlags["ContainsDefaultValueAssignments"] = 262144] = "ContainsDefaultValueAssignments";
-        TransformFlags[TransformFlags["ContainsParameterPropertyAssignments"] = 524288] = "ContainsParameterPropertyAssignments";
-        TransformFlags[TransformFlags["ContainsSpreadElementExpression"] = 1048576] = "ContainsSpreadElementExpression";
-        TransformFlags[TransformFlags["ContainsComputedPropertyName"] = 2097152] = "ContainsComputedPropertyName";
-        TransformFlags[TransformFlags["ContainsBlockScopedBinding"] = 4194304] = "ContainsBlockScopedBinding";
-        TransformFlags[TransformFlags["ContainsBindingPattern"] = 8388608] = "ContainsBindingPattern";
-        TransformFlags[TransformFlags["ContainsYield"] = 16777216] = "ContainsYield";
-        TransformFlags[TransformFlags["ContainsHoistedDeclarationOrCompletion"] = 33554432] = "ContainsHoistedDeclarationOrCompletion";
-        TransformFlags[TransformFlags["HasComputedFlags"] = 536870912] = "HasComputedFlags";
-        TransformFlags[TransformFlags["AssertTypeScript"] = 3] = "AssertTypeScript";
-        TransformFlags[TransformFlags["AssertJsx"] = 12] = "AssertJsx";
-        TransformFlags[TransformFlags["AssertES2017"] = 48] = "AssertES2017";
-        TransformFlags[TransformFlags["AssertES2016"] = 192] = "AssertES2016";
-        TransformFlags[TransformFlags["AssertES2015"] = 768] = "AssertES2015";
-        TransformFlags[TransformFlags["AssertGenerator"] = 6144] = "AssertGenerator";
-        TransformFlags[TransformFlags["NodeExcludes"] = 536874325] = "NodeExcludes";
-        TransformFlags[TransformFlags["ArrowFunctionExcludes"] = 592227669] = "ArrowFunctionExcludes";
-        TransformFlags[TransformFlags["FunctionExcludes"] = 592293205] = "FunctionExcludes";
-        TransformFlags[TransformFlags["ConstructorExcludes"] = 591760725] = "ConstructorExcludes";
-        TransformFlags[TransformFlags["MethodOrAccessorExcludes"] = 591760725] = "MethodOrAccessorExcludes";
-        TransformFlags[TransformFlags["ClassExcludes"] = 539749717] = "ClassExcludes";
-        TransformFlags[TransformFlags["ModuleExcludes"] = 574729557] = "ModuleExcludes";
-        TransformFlags[TransformFlags["TypeExcludes"] = -3] = "TypeExcludes";
-        TransformFlags[TransformFlags["ObjectLiteralExcludes"] = 539110741] = "ObjectLiteralExcludes";
-        TransformFlags[TransformFlags["ArrayLiteralOrCallOrNewExcludes"] = 537922901] = "ArrayLiteralOrCallOrNewExcludes";
-        TransformFlags[TransformFlags["VariableDeclarationListExcludes"] = 545262933] = "VariableDeclarationListExcludes";
-        TransformFlags[TransformFlags["ParameterExcludes"] = 545262933] = "ParameterExcludes";
-        TransformFlags[TransformFlags["TypeScriptClassSyntaxMask"] = 548864] = "TypeScriptClassSyntaxMask";
-        TransformFlags[TransformFlags["ES2015FunctionSyntaxMask"] = 327680] = "ES2015FunctionSyntaxMask";
-    })(ts.TransformFlags || (ts.TransformFlags = {}));
-    var TransformFlags = ts.TransformFlags;
-    (function (EmitFlags) {
-        EmitFlags[EmitFlags["EmitEmitHelpers"] = 1] = "EmitEmitHelpers";
-        EmitFlags[EmitFlags["EmitExportStar"] = 2] = "EmitExportStar";
-        EmitFlags[EmitFlags["EmitSuperHelper"] = 4] = "EmitSuperHelper";
-        EmitFlags[EmitFlags["EmitAdvancedSuperHelper"] = 8] = "EmitAdvancedSuperHelper";
-        EmitFlags[EmitFlags["UMDDefine"] = 16] = "UMDDefine";
-        EmitFlags[EmitFlags["SingleLine"] = 32] = "SingleLine";
-        EmitFlags[EmitFlags["AdviseOnEmitNode"] = 64] = "AdviseOnEmitNode";
-        EmitFlags[EmitFlags["NoSubstitution"] = 128] = "NoSubstitution";
-        EmitFlags[EmitFlags["CapturesThis"] = 256] = "CapturesThis";
-        EmitFlags[EmitFlags["NoLeadingSourceMap"] = 512] = "NoLeadingSourceMap";
-        EmitFlags[EmitFlags["NoTrailingSourceMap"] = 1024] = "NoTrailingSourceMap";
-        EmitFlags[EmitFlags["NoSourceMap"] = 1536] = "NoSourceMap";
-        EmitFlags[EmitFlags["NoNestedSourceMaps"] = 2048] = "NoNestedSourceMaps";
-        EmitFlags[EmitFlags["NoTokenLeadingSourceMaps"] = 4096] = "NoTokenLeadingSourceMaps";
-        EmitFlags[EmitFlags["NoTokenTrailingSourceMaps"] = 8192] = "NoTokenTrailingSourceMaps";
-        EmitFlags[EmitFlags["NoTokenSourceMaps"] = 12288] = "NoTokenSourceMaps";
-        EmitFlags[EmitFlags["NoLeadingComments"] = 16384] = "NoLeadingComments";
-        EmitFlags[EmitFlags["NoTrailingComments"] = 32768] = "NoTrailingComments";
-        EmitFlags[EmitFlags["NoComments"] = 49152] = "NoComments";
-        EmitFlags[EmitFlags["NoNestedComments"] = 65536] = "NoNestedComments";
-        EmitFlags[EmitFlags["ExportName"] = 131072] = "ExportName";
-        EmitFlags[EmitFlags["LocalName"] = 262144] = "LocalName";
-        EmitFlags[EmitFlags["Indented"] = 524288] = "Indented";
-        EmitFlags[EmitFlags["NoIndentation"] = 1048576] = "NoIndentation";
-        EmitFlags[EmitFlags["AsyncFunctionBody"] = 2097152] = "AsyncFunctionBody";
-        EmitFlags[EmitFlags["ReuseTempVariableScope"] = 4194304] = "ReuseTempVariableScope";
-        EmitFlags[EmitFlags["CustomPrologue"] = 8388608] = "CustomPrologue";
-    })(ts.EmitFlags || (ts.EmitFlags = {}));
-    var EmitFlags = ts.EmitFlags;
-    (function (EmitContext) {
-        EmitContext[EmitContext["SourceFile"] = 0] = "SourceFile";
-        EmitContext[EmitContext["Expression"] = 1] = "Expression";
-        EmitContext[EmitContext["IdentifierName"] = 2] = "IdentifierName";
-        EmitContext[EmitContext["Unspecified"] = 3] = "Unspecified";
-    })(ts.EmitContext || (ts.EmitContext = {}));
-    var EmitContext = ts.EmitContext;
+    (function (Extension) {
+        Extension[Extension["Ts"] = 0] = "Ts";
+        Extension[Extension["Tsx"] = 1] = "Tsx";
+        Extension[Extension["Dts"] = 2] = "Dts";
+        Extension[Extension["Js"] = 3] = "Js";
+        Extension[Extension["Jsx"] = 4] = "Jsx";
+        Extension[Extension["LastTypeScriptExtension"] = 2] = "LastTypeScriptExtension";
+    })(ts.Extension || (ts.Extension = {}));
+    var Extension = ts.Extension;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -985,12 +132,6 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    (function (Ternary) {
-        Ternary[Ternary["False"] = 0] = "False";
-        Ternary[Ternary["Maybe"] = 1] = "Maybe";
-        Ternary[Ternary["True"] = -1] = "True";
-    })(ts.Ternary || (ts.Ternary = {}));
-    var Ternary = ts.Ternary;
     var createObject = Object.create;
     ts.collator = typeof Intl === "object" && typeof Intl.Collator === "function" ? new Intl.Collator() : undefined;
     function createMap(template) {
@@ -1055,12 +196,6 @@ var ts;
         return getCanonicalFileName(nonCanonicalizedPath);
     }
     ts.toPath = toPath;
-    (function (Comparison) {
-        Comparison[Comparison["LessThan"] = -1] = "LessThan";
-        Comparison[Comparison["EqualTo"] = 0] = "EqualTo";
-        Comparison[Comparison["GreaterThan"] = 1] = "GreaterThan";
-    })(ts.Comparison || (ts.Comparison = {}));
-    var Comparison = ts.Comparison;
     function forEach(array, callback) {
         if (array) {
             for (var i = 0, len = array.length; i < len; i++) {
@@ -1073,6 +208,13 @@ var ts;
         return undefined;
     }
     ts.forEach = forEach;
+    function zipWith(arrayA, arrayB, callback) {
+        Debug.assert(arrayA.length === arrayB.length);
+        for (var i = 0; i < arrayA.length; i++) {
+            callback(arrayA[i], arrayB[i], i);
+        }
+    }
+    ts.zipWith = zipWith;
     function every(array, callback) {
         if (array) {
             for (var i = 0, len = array.length; i < len; i++) {
@@ -1332,20 +474,25 @@ var ts;
     ts.mapObject = mapObject;
     function some(array, predicate) {
         if (array) {
-            for (var _i = 0, array_5 = array; _i < array_5.length; _i++) {
-                var v = array_5[_i];
-                if (!predicate || predicate(v)) {
-                    return true;
+            if (predicate) {
+                for (var _i = 0, array_5 = array; _i < array_5.length; _i++) {
+                    var v = array_5[_i];
+                    if (predicate(v)) {
+                        return true;
+                    }
                 }
             }
+            else {
+                return array.length > 0;
+            }
         }
         return false;
     }
     ts.some = some;
     function concatenate(array1, array2) {
-        if (!array2 || !array2.length)
+        if (!some(array2))
             return array1;
-        if (!array1 || !array1.length)
+        if (!some(array1))
             return array2;
         return array1.concat(array2);
     }
@@ -1368,6 +515,41 @@ var ts;
         return result;
     }
     ts.deduplicate = deduplicate;
+    function arrayIsEqualTo(array1, array2, equaler) {
+        if (!array1 || !array2) {
+            return array1 === array2;
+        }
+        if (array1.length !== array2.length) {
+            return false;
+        }
+        for (var i = 0; i < array1.length; i++) {
+            var equals = equaler ? equaler(array1[i], array2[i]) : array1[i] === array2[i];
+            if (!equals) {
+                return false;
+            }
+        }
+        return true;
+    }
+    ts.arrayIsEqualTo = arrayIsEqualTo;
+    function changesAffectModuleResolution(oldOptions, newOptions) {
+        return !oldOptions ||
+            (oldOptions.module !== newOptions.module) ||
+            (oldOptions.moduleResolution !== newOptions.moduleResolution) ||
+            (oldOptions.noResolve !== newOptions.noResolve) ||
+            (oldOptions.target !== newOptions.target) ||
+            (oldOptions.noLib !== newOptions.noLib) ||
+            (oldOptions.jsx !== newOptions.jsx) ||
+            (oldOptions.allowJs !== newOptions.allowJs) ||
+            (oldOptions.rootDir !== newOptions.rootDir) ||
+            (oldOptions.configFilePath !== newOptions.configFilePath) ||
+            (oldOptions.baseUrl !== newOptions.baseUrl) ||
+            (oldOptions.maxNodeModuleJsDepth !== newOptions.maxNodeModuleJsDepth) ||
+            !arrayIsEqualTo(oldOptions.lib, newOptions.lib) ||
+            !arrayIsEqualTo(oldOptions.typeRoots, newOptions.typeRoots) ||
+            !arrayIsEqualTo(oldOptions.rootDirs, newOptions.rootDirs) ||
+            !equalOwnProperties(oldOptions.paths, newOptions.paths);
+    }
+    ts.changesAffectModuleResolution = changesAffectModuleResolution;
     function compact(array) {
         var result;
         if (array) {
@@ -1386,6 +568,26 @@ var ts;
         return result || array;
     }
     ts.compact = compact;
+    function relativeComplement(arrayA, arrayB, comparer, offsetA, offsetB) {
+        if (comparer === void 0) { comparer = compareValues; }
+        if (offsetA === void 0) { offsetA = 0; }
+        if (offsetB === void 0) { offsetB = 0; }
+        if (!arrayB || !arrayA || arrayB.length === 0 || arrayA.length === 0)
+            return arrayB;
+        var result = [];
+        outer: for (; offsetB < arrayB.length; offsetB++) {
+            inner: for (; offsetA < arrayA.length; offsetA++) {
+                switch (comparer(arrayB[offsetB], arrayA[offsetA])) {
+                    case -1: break inner;
+                    case 0: continue outer;
+                    case 1: continue inner;
+                }
+            }
+            result.push(arrayB[offsetB]);
+        }
+        return result;
+    }
+    ts.relativeComplement = relativeComplement;
     function sum(array, prop) {
         var result = 0;
         for (var _i = 0, array_7 = array; _i < array_7.length; _i++) {
@@ -1395,15 +597,23 @@ var ts;
         return result;
     }
     ts.sum = sum;
+    function append(to, value) {
+        if (value === undefined)
+            return to;
+        if (to === undefined)
+            to = [];
+        to.push(value);
+        return to;
+    }
+    ts.append = append;
     function addRange(to, from) {
-        if (to && from) {
-            for (var _i = 0, from_1 = from; _i < from_1.length; _i++) {
-                var v = from_1[_i];
-                if (v !== undefined) {
-                    to.push(v);
-                }
-            }
+        if (from === undefined)
+            return to;
+        for (var _i = 0, from_1 = from; _i < from_1.length; _i++) {
+            var v = from_1[_i];
+            to = append(to, v);
         }
+        return to;
     }
     ts.addRange = addRange;
     function rangeEquals(array1, array2, pos, end) {
@@ -1422,6 +632,12 @@ var ts;
             : undefined;
     }
     ts.firstOrUndefined = firstOrUndefined;
+    function lastOrUndefined(array) {
+        return array && array.length > 0
+            ? array[array.length - 1]
+            : undefined;
+    }
+    ts.lastOrUndefined = lastOrUndefined;
     function singleOrUndefined(array) {
         return array && array.length === 1
             ? array[0]
@@ -1434,17 +650,17 @@ var ts;
             : array;
     }
     ts.singleOrMany = singleOrMany;
-    function lastOrUndefined(array) {
-        return array && array.length > 0
-            ? array[array.length - 1]
-            : undefined;
+    function replaceElement(array, index, value) {
+        var result = array.slice(0);
+        result[index] = value;
+        return result;
     }
-    ts.lastOrUndefined = lastOrUndefined;
-    function binarySearch(array, value, comparer) {
+    ts.replaceElement = replaceElement;
+    function binarySearch(array, value, comparer, offset) {
         if (!array || array.length === 0) {
             return -1;
         }
-        var low = 0;
+        var low = offset || 0;
         var high = array.length - 1;
         comparer = comparer !== undefined
             ? comparer
@@ -1678,6 +894,12 @@ var ts;
         return Array.isArray ? Array.isArray(value) : value instanceof Array;
     }
     ts.isArray = isArray;
+    function noop() { }
+    ts.noop = noop;
+    function notImplemented() {
+        throw new Error("Not implemented");
+    }
+    ts.notImplemented = notImplemented;
     function memoize(callback) {
         var value;
         return function () {
@@ -1793,6 +1015,17 @@ var ts;
         };
     }
     ts.createCompilerDiagnostic = createCompilerDiagnostic;
+    function createCompilerDiagnosticFromMessageChain(chain) {
+        return {
+            file: undefined,
+            start: undefined,
+            length: undefined,
+            code: chain.code,
+            category: chain.category,
+            messageText: chain.next ? chain : chain.messageText
+        };
+    }
+    ts.createCompilerDiagnosticFromMessageChain = createCompilerDiagnosticFromMessageChain;
     function chainDiagnosticMessages(details, message) {
         var text = getLocaleSpecificMessage(message);
         if (arguments.length > 2) {
@@ -2185,6 +1418,10 @@ var ts;
         return expectedPos >= 0 && str.indexOf(suffix, expectedPos) === expectedPos;
     }
     ts.endsWith = endsWith;
+    function hasExtension(fileName) {
+        return getBaseFileName(fileName).indexOf(".") >= 0;
+    }
+    ts.hasExtension = hasExtension;
     function fileExtensionIs(path, extension) {
         return path.length > extension.length && endsWith(path, extension);
     }
@@ -2212,68 +1449,83 @@ var ts;
         var doubleAsteriskRegexFragment = usage === "exclude" ? "(/.+?)?" : "(/[^/.][^/]*)*?";
         var pattern = "";
         var hasWrittenSubpattern = false;
-        spec: for (var _i = 0, specs_1 = specs; _i < specs_1.length; _i++) {
+        for (var _i = 0, specs_1 = specs; _i < specs_1.length; _i++) {
             var spec = specs_1[_i];
             if (!spec) {
                 continue;
             }
-            var subpattern = "";
-            var hasRecursiveDirectoryWildcard = false;
-            var hasWrittenComponent = false;
-            var components = getNormalizedPathComponents(spec, basePath);
-            if (usage !== "exclude" && components[components.length - 1] === "**") {
-                continue spec;
-            }
-            components[0] = removeTrailingDirectorySeparator(components[0]);
-            var optionalCount = 0;
-            for (var _a = 0, components_1 = components; _a < components_1.length; _a++) {
-                var component = components_1[_a];
-                if (component === "**") {
-                    if (hasRecursiveDirectoryWildcard) {
-                        continue spec;
-                    }
-                    subpattern += doubleAsteriskRegexFragment;
-                    hasRecursiveDirectoryWildcard = true;
-                    hasWrittenComponent = true;
-                }
-                else {
-                    if (usage === "directories") {
-                        subpattern += "(";
-                        optionalCount++;
-                    }
-                    if (hasWrittenComponent) {
-                        subpattern += ts.directorySeparator;
-                    }
-                    if (usage !== "exclude") {
-                        if (component.charCodeAt(0) === 42) {
-                            subpattern += "([^./]" + singleAsteriskRegexFragment + ")?";
-                            component = component.substr(1);
-                        }
-                        else if (component.charCodeAt(0) === 63) {
-                            subpattern += "[^./]";
-                            component = component.substr(1);
-                        }
-                    }
-                    subpattern += component.replace(reservedCharacterPattern, replaceWildcardCharacter);
-                    hasWrittenComponent = true;
-                }
-            }
-            while (optionalCount > 0) {
-                subpattern += ")?";
-                optionalCount--;
+            var subPattern = getSubPatternFromSpec(spec, basePath, usage, singleAsteriskRegexFragment, doubleAsteriskRegexFragment, replaceWildcardCharacter);
+            if (subPattern === undefined) {
+                continue;
             }
             if (hasWrittenSubpattern) {
                 pattern += "|";
             }
-            pattern += "(" + subpattern + ")";
+            pattern += "(" + subPattern + ")";
             hasWrittenSubpattern = true;
         }
         if (!pattern) {
             return undefined;
         }
-        return "^(" + pattern + (usage === "exclude" ? ")($|/)" : ")$");
+        var terminator = usage === "exclude" ? "($|/)" : "$";
+        return "^(" + pattern + ")" + terminator;
     }
     ts.getRegularExpressionForWildcard = getRegularExpressionForWildcard;
+    function isImplicitGlob(lastPathComponent) {
+        return !/[.*?]/.test(lastPathComponent);
+    }
+    ts.isImplicitGlob = isImplicitGlob;
+    function getSubPatternFromSpec(spec, basePath, usage, singleAsteriskRegexFragment, doubleAsteriskRegexFragment, replaceWildcardCharacter) {
+        var subpattern = "";
+        var hasRecursiveDirectoryWildcard = false;
+        var hasWrittenComponent = false;
+        var components = getNormalizedPathComponents(spec, basePath);
+        var lastComponent = lastOrUndefined(components);
+        if (usage !== "exclude" && lastComponent === "**") {
+            return undefined;
+        }
+        components[0] = removeTrailingDirectorySeparator(components[0]);
+        if (isImplicitGlob(lastComponent)) {
+            components.push("**", "*");
+        }
+        var optionalCount = 0;
+        for (var _i = 0, components_1 = components; _i < components_1.length; _i++) {
+            var component = components_1[_i];
+            if (component === "**") {
+                if (hasRecursiveDirectoryWildcard) {
+                    return undefined;
+                }
+                subpattern += doubleAsteriskRegexFragment;
+                hasRecursiveDirectoryWildcard = true;
+            }
+            else {
+                if (usage === "directories") {
+                    subpattern += "(";
+                    optionalCount++;
+                }
+                if (hasWrittenComponent) {
+                    subpattern += ts.directorySeparator;
+                }
+                if (usage !== "exclude") {
+                    if (component.charCodeAt(0) === 42) {
+                        subpattern += "([^./]" + singleAsteriskRegexFragment + ")?";
+                        component = component.substr(1);
+                    }
+                    else if (component.charCodeAt(0) === 63) {
+                        subpattern += "[^./]";
+                        component = component.substr(1);
+                    }
+                }
+                subpattern += component.replace(reservedCharacterPattern, replaceWildcardCharacter);
+            }
+            hasWrittenComponent = true;
+        }
+        while (optionalCount > 0) {
+            subpattern += ")?";
+            optionalCount--;
+        }
+        return subpattern;
+    }
     function replaceWildCardCharacterFiles(match) {
         return replaceWildcardCharacter(match, singleAsteriskRegexFragmentFiles);
     }
@@ -2340,25 +1592,30 @@ var ts;
             for (var _i = 0, includes_1 = includes; _i < includes_1.length; _i++) {
                 var include = includes_1[_i];
                 var absolute = isRootedDiskPath(include) ? include : normalizePath(combinePaths(path, include));
-                var wildcardOffset = indexOfAnyCharCode(absolute, wildcardCharCodes);
-                var includeBasePath = wildcardOffset < 0
-                    ? removeTrailingDirectorySeparator(getDirectoryPath(absolute))
-                    : absolute.substring(0, absolute.lastIndexOf(ts.directorySeparator, wildcardOffset));
-                includeBasePaths.push(includeBasePath);
+                includeBasePaths.push(getIncludeBasePath(absolute));
             }
             includeBasePaths.sort(useCaseSensitiveFileNames ? compareStrings : compareStringsCaseInsensitive);
-            include: for (var i = 0; i < includeBasePaths.length; i++) {
-                var includeBasePath = includeBasePaths[i];
-                for (var j = 0; j < basePaths.length; j++) {
-                    if (containsPath(basePaths[j], includeBasePath, path, !useCaseSensitiveFileNames)) {
-                        continue include;
-                    }
+            var _loop_1 = function (includeBasePath) {
+                if (ts.every(basePaths, function (basePath) { return !containsPath(basePath, includeBasePath, path, !useCaseSensitiveFileNames); })) {
+                    basePaths.push(includeBasePath);
                 }
-                basePaths.push(includeBasePath);
+            };
+            for (var _a = 0, includeBasePaths_1 = includeBasePaths; _a < includeBasePaths_1.length; _a++) {
+                var includeBasePath = includeBasePaths_1[_a];
+                _loop_1(includeBasePath);
             }
         }
         return basePaths;
     }
+    function getIncludeBasePath(absolute) {
+        var wildcardOffset = indexOfAnyCharCode(absolute, wildcardCharCodes);
+        if (wildcardOffset < 0) {
+            return !hasExtension(absolute)
+                ? absolute
+                : removeTrailingDirectorySeparator(getDirectoryPath(absolute));
+        }
+        return absolute.substring(0, absolute.lastIndexOf(ts.directorySeparator, wildcardOffset));
+    }
     function ensureScriptKind(fileName, scriptKind) {
         return (scriptKind || getScriptKindFromFileName(fileName)) || 3;
     }
@@ -2408,14 +1665,6 @@ var ts;
         return false;
     }
     ts.isSupportedSourceFileName = isSupportedSourceFileName;
-    (function (ExtensionPriority) {
-        ExtensionPriority[ExtensionPriority["TypeScriptFiles"] = 0] = "TypeScriptFiles";
-        ExtensionPriority[ExtensionPriority["DeclarationAndJavaScriptFiles"] = 2] = "DeclarationAndJavaScriptFiles";
-        ExtensionPriority[ExtensionPriority["Limit"] = 5] = "Limit";
-        ExtensionPriority[ExtensionPriority["Highest"] = 0] = "Highest";
-        ExtensionPriority[ExtensionPriority["Lowest"] = 2] = "Lowest";
-    })(ts.ExtensionPriority || (ts.ExtensionPriority = {}));
-    var ExtensionPriority = ts.ExtensionPriority;
     function getExtensionPriority(path, supportedExtensions) {
         for (var i = supportedExtensions.length - 1; i >= 0; i--) {
             if (fileExtensionIs(path, supportedExtensions[i])) {
@@ -2466,10 +1715,6 @@ var ts;
         return path.substring(0, path.length - extension.length);
     }
     ts.removeExtension = removeExtension;
-    function isJsxOrTsxExtension(ext) {
-        return ext === ".jsx" || ext === ".tsx";
-    }
-    ts.isJsxOrTsxExtension = isJsxOrTsxExtension;
     function changeExtension(path, newExtension) {
         return (removeFileExtension(path) + newExtension);
     }
@@ -2504,13 +1749,6 @@ var ts;
         getTypeConstructor: function () { return Type; },
         getSignatureConstructor: function () { return Signature; }
     };
-    (function (AssertionLevel) {
-        AssertionLevel[AssertionLevel["None"] = 0] = "None";
-        AssertionLevel[AssertionLevel["Normal"] = 1] = "Normal";
-        AssertionLevel[AssertionLevel["Aggressive"] = 2] = "Aggressive";
-        AssertionLevel[AssertionLevel["VeryAggressive"] = 3] = "VeryAggressive";
-    })(ts.AssertionLevel || (ts.AssertionLevel = {}));
-    var AssertionLevel = ts.AssertionLevel;
     var Debug;
     (function (Debug) {
         Debug.currentAssertionLevel = 0;
@@ -2622,6 +1860,36 @@ var ts;
         return !(pos >= 0);
     }
     ts.positionIsSynthesized = positionIsSynthesized;
+    function extensionIsTypeScript(ext) {
+        return ext <= ts.Extension.LastTypeScriptExtension;
+    }
+    ts.extensionIsTypeScript = extensionIsTypeScript;
+    function extensionFromPath(path) {
+        var ext = tryGetExtensionFromPath(path);
+        if (ext !== undefined) {
+            return ext;
+        }
+        Debug.fail("File " + path + " has unknown extension.");
+    }
+    ts.extensionFromPath = extensionFromPath;
+    function tryGetExtensionFromPath(path) {
+        if (fileExtensionIs(path, ".d.ts")) {
+            return ts.Extension.Dts;
+        }
+        if (fileExtensionIs(path, ".ts")) {
+            return ts.Extension.Ts;
+        }
+        if (fileExtensionIs(path, ".tsx")) {
+            return ts.Extension.Tsx;
+        }
+        if (fileExtensionIs(path, ".js")) {
+            return ts.Extension.Js;
+        }
+        if (fileExtensionIs(path, ".jsx")) {
+            return ts.Extension.Jsx;
+        }
+    }
+    ts.tryGetExtensionFromPath = tryGetExtensionFromPath;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -2895,11 +2163,6 @@ var ts;
             function readDirectory(path, extensions, excludes, includes) {
                 return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), getAccessibleFileSystemEntries);
             }
-            var FileSystemEntryKind;
-            (function (FileSystemEntryKind) {
-                FileSystemEntryKind[FileSystemEntryKind["File"] = 0] = "File";
-                FileSystemEntryKind[FileSystemEntryKind["Directory"] = 1] = "Directory";
-            })(FileSystemEntryKind || (FileSystemEntryKind = {}));
             function fileSystemEntryExists(path, entryKind) {
                 try {
                     var stat = _fs.statSync(path);
@@ -2921,6 +2184,7 @@ var ts;
             function getDirectories(path) {
                 return ts.filter(_fs.readdirSync(path), function (dir) { return fileSystemEntryExists(ts.combinePaths(path, dir), 1); });
             }
+            var noOpFileWatcher = { close: ts.noop };
             var nodeSystem = {
                 args: process.argv.slice(2),
                 newLine: _os.EOL,
@@ -2930,7 +2194,7 @@ var ts;
                 },
                 readFile: readFile,
                 writeFile: writeFile,
-                watchFile: function (fileName, callback) {
+                watchFile: function (fileName, callback, pollingInterval) {
                     if (useNonPollingWatchers) {
                         var watchedFile_1 = watchedFileSet.addFile(fileName, callback);
                         return {
@@ -2938,7 +2202,7 @@ var ts;
                         };
                     }
                     else {
-                        _fs.watchFile(fileName, { persistent: true, interval: 250 }, fileChanged);
+                        _fs.watchFile(fileName, { persistent: true, interval: pollingInterval || 250 }, fileChanged);
                         return {
                             close: function () { return _fs.unwatchFile(fileName, fileChanged); }
                         };
@@ -2953,7 +2217,7 @@ var ts;
                 watchDirectory: function (directoryName, callback, recursive) {
                     var options;
                     if (!directoryExists(directoryName)) {
-                        return;
+                        return noOpFileWatcher;
                     }
                     if (isNode4OrLater() && (process.platform === "win32" || process.platform === "darwin")) {
                         options = { persistent: true, recursive: !!recursive };
@@ -3030,7 +2294,9 @@ var ts;
                     }
                     catch (e) {
                     }
-                }
+                },
+                setTimeout: setTimeout,
+                clearTimeout: clearTimeout
             };
             return nodeSystem;
         }
@@ -3148,7 +2414,7 @@ var ts;
         A_set_accessor_parameter_cannot_have_an_initializer: { code: 1052, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_parameter_cannot_have_an_initializer_1052", message: "A 'set' accessor parameter cannot have an initializer." },
         A_set_accessor_cannot_have_rest_parameter: { code: 1053, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_cannot_have_rest_parameter_1053", message: "A 'set' accessor cannot have rest parameter." },
         A_get_accessor_cannot_have_parameters: { code: 1054, category: ts.DiagnosticCategory.Error, key: "A_get_accessor_cannot_have_parameters_1054", message: "A 'get' accessor cannot have parameters." },
-        Type_0_is_not_a_valid_async_function_return_type: { code: 1055, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_a_valid_async_function_return_type_1055", message: "Type '{0}' is not a valid async function return type." },
+        Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value: { code: 1055, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Prom_1055", message: "Type '{0}' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value." },
         Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher: { code: 1056, category: ts.DiagnosticCategory.Error, key: "Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher_1056", message: "Accessors are only available when targeting ECMAScript 5 and higher." },
         An_async_function_or_method_must_have_a_valid_awaitable_return_type: { code: 1057, category: ts.DiagnosticCategory.Error, key: "An_async_function_or_method_must_have_a_valid_awaitable_return_type_1057", message: "An async function or method must have a valid awaitable return type." },
         Operand_for_await_does_not_have_a_valid_callable_then_member: { code: 1058, category: ts.DiagnosticCategory.Error, key: "Operand_for_await_does_not_have_a_valid_callable_then_member_1058", message: "Operand for 'await' does not have a valid callable 'then' member." },
@@ -3258,7 +2524,6 @@ var ts;
         Module_0_has_no_default_export: { code: 1192, category: ts.DiagnosticCategory.Error, key: "Module_0_has_no_default_export_1192", message: "Module '{0}' has no default export." },
         An_export_declaration_cannot_have_modifiers: { code: 1193, category: ts.DiagnosticCategory.Error, key: "An_export_declaration_cannot_have_modifiers_1193", message: "An export declaration cannot have modifiers." },
         Export_declarations_are_not_permitted_in_a_namespace: { code: 1194, category: ts.DiagnosticCategory.Error, key: "Export_declarations_are_not_permitted_in_a_namespace_1194", message: "Export declarations are not permitted in a namespace." },
-        Catch_clause_variable_name_must_be_an_identifier: { code: 1195, category: ts.DiagnosticCategory.Error, key: "Catch_clause_variable_name_must_be_an_identifier_1195", message: "Catch clause variable name must be an identifier." },
         Catch_clause_variable_cannot_have_a_type_annotation: { code: 1196, category: ts.DiagnosticCategory.Error, key: "Catch_clause_variable_cannot_have_a_type_annotation_1196", message: "Catch clause variable cannot have a type annotation." },
         Catch_clause_variable_cannot_have_an_initializer: { code: 1197, category: ts.DiagnosticCategory.Error, key: "Catch_clause_variable_cannot_have_an_initializer_1197", message: "Catch clause variable cannot have an initializer." },
         An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive: { code: 1198, category: ts.DiagnosticCategory.Error, key: "An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive_1198", message: "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive." },
@@ -3376,14 +2641,14 @@ var ts;
         Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1: { code: 2353, category: ts.DiagnosticCategory.Error, key: "Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1_2353", message: "Object literal may only specify known properties, and '{0}' does not exist in type '{1}'." },
         A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value: { code: 2355, category: ts.DiagnosticCategory.Error, key: "A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value_2355", message: "A function whose declared type is neither 'void' nor 'any' must return a value." },
         An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type: { code: 2356, category: ts.DiagnosticCategory.Error, key: "An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type_2356", message: "An arithmetic operand must be of type 'any', 'number' or an enum type." },
-        The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer: { code: 2357, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer_2357", message: "The operand of an increment or decrement operator must be a variable, property or indexer." },
+        The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_or_a_property_access: { code: 2357, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_or_a_property_access_2357", message: "The operand of an increment or decrement operator must be a variable or a property access." },
         The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2358, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_paramete_2358", message: "The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter." },
         The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_Function_interface_type: { code: 2359, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_F_2359", message: "The right-hand side of an 'instanceof' expression must be of type 'any' or of a type assignable to the 'Function' interface type." },
         The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol: { code: 2360, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol_2360", message: "The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'." },
         The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2361, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter_2361", message: "The right-hand side of an 'in' expression must be of type 'any', an object type or a type parameter" },
         The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2362, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type_2362", message: "The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
         The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2363, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type_2363", message: "The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
-        Invalid_left_hand_side_of_assignment_expression: { code: 2364, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_of_assignment_expression_2364", message: "Invalid left-hand side of assignment expression." },
+        The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access: { code: 2364, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access_2364", message: "The left-hand side of an assignment expression must be a variable or a property access." },
         Operator_0_cannot_be_applied_to_types_1_and_2: { code: 2365, category: ts.DiagnosticCategory.Error, key: "Operator_0_cannot_be_applied_to_types_1_and_2_2365", message: "Operator '{0}' cannot be applied to types '{1}' and '{2}'." },
         Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined: { code: 2366, category: ts.DiagnosticCategory.Error, key: "Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined_2366", message: "Function lacks ending return statement and return type does not include 'undefined'." },
         Type_parameter_name_cannot_be_0: { code: 2368, category: ts.DiagnosticCategory.Error, key: "Type_parameter_name_cannot_be_0_2368", message: "Type parameter name cannot be '{0}'" },
@@ -3423,7 +2688,7 @@ var ts;
         Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2: { code: 2403, category: ts.DiagnosticCategory.Error, key: "Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_t_2403", message: "Subsequent variable declarations must have the same type.  Variable '{0}' must be of type '{1}', but here has type '{2}'." },
         The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation: { code: 2404, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation_2404", message: "The left-hand side of a 'for...in' statement cannot use a type annotation." },
         The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any: { code: 2405, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any_2405", message: "The left-hand side of a 'for...in' statement must be of type 'string' or 'any'." },
-        Invalid_left_hand_side_in_for_in_statement: { code: 2406, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_in_for_in_statement_2406", message: "Invalid left-hand side in 'for...in' statement." },
+        The_left_hand_side_of_a_for_in_statement_must_be_a_variable_or_a_property_access: { code: 2406, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_must_be_a_variable_or_a_property_access_2406", message: "The left-hand side of a 'for...in' statement must be a variable or a property access." },
         The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2407, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter_2407", message: "The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter." },
         Setters_cannot_return_a_value: { code: 2408, category: ts.DiagnosticCategory.Error, key: "Setters_cannot_return_a_value_2408", message: "Setters cannot return a value." },
         Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class: { code: 2409, category: ts.DiagnosticCategory.Error, key: "Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class_2409", message: "Return type of constructor signature must be assignable to the instance type of the class" },
@@ -3461,8 +2726,6 @@ var ts;
         Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1: { code: 2446, category: ts.DiagnosticCategory.Error, key: "Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1_2446", message: "Property '{0}' is protected and only accessible through an instance of class '{1}'." },
         The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead: { code: 2447, category: ts.DiagnosticCategory.Error, key: "The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead_2447", message: "The '{0}' operator is not allowed for boolean types. Consider using '{1}' instead." },
         Block_scoped_variable_0_used_before_its_declaration: { code: 2448, category: ts.DiagnosticCategory.Error, key: "Block_scoped_variable_0_used_before_its_declaration_2448", message: "Block-scoped variable '{0}' used before its declaration." },
-        The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property: { code: 2449, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property_2449", message: "The operand of an increment or decrement operator cannot be a constant or a read-only property." },
-        Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property: { code: 2450, category: ts.DiagnosticCategory.Error, key: "Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property_2450", message: "Left-hand side of assignment expression cannot be a constant or a read-only property." },
         Cannot_redeclare_block_scoped_variable_0: { code: 2451, category: ts.DiagnosticCategory.Error, key: "Cannot_redeclare_block_scoped_variable_0_2451", message: "Cannot redeclare block-scoped variable '{0}'." },
         An_enum_member_cannot_have_a_numeric_name: { code: 2452, category: ts.DiagnosticCategory.Error, key: "An_enum_member_cannot_have_a_numeric_name_2452", message: "An enum member cannot have a numeric name." },
         The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_type_arguments_explicitly: { code: 2453, category: ts.DiagnosticCategory.Error, key: "The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_typ_2453", message: "The type argument for type parameter '{0}' cannot be inferred from the usage. Consider specifying the type arguments explicitly." },
@@ -3474,7 +2737,7 @@ var ts;
         Type_0_has_no_property_1_and_no_string_index_signature: { code: 2459, category: ts.DiagnosticCategory.Error, key: "Type_0_has_no_property_1_and_no_string_index_signature_2459", message: "Type '{0}' has no property '{1}' and no string index signature." },
         Type_0_has_no_property_1: { code: 2460, category: ts.DiagnosticCategory.Error, key: "Type_0_has_no_property_1_2460", message: "Type '{0}' has no property '{1}'." },
         Type_0_is_not_an_array_type: { code: 2461, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_an_array_type_2461", message: "Type '{0}' is not an array type." },
-        A_rest_element_must_be_last_in_an_array_destructuring_pattern: { code: 2462, category: ts.DiagnosticCategory.Error, key: "A_rest_element_must_be_last_in_an_array_destructuring_pattern_2462", message: "A rest element must be last in an array destructuring pattern" },
+        A_rest_element_must_be_last_in_a_destructuring_pattern: { code: 2462, category: ts.DiagnosticCategory.Error, key: "A_rest_element_must_be_last_in_a_destructuring_pattern_2462", message: "A rest element must be last in a destructuring pattern" },
         A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature: { code: 2463, category: ts.DiagnosticCategory.Error, key: "A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature_2463", message: "A binding pattern parameter cannot be optional in an implementation signature." },
         A_computed_property_name_must_be_of_type_string_number_symbol_or_any: { code: 2464, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_must_be_of_type_string_number_symbol_or_any_2464", message: "A computed property name must be of type 'string', 'number', 'symbol', or 'any'." },
         this_cannot_be_referenced_in_a_computed_property_name: { code: 2465, category: ts.DiagnosticCategory.Error, key: "this_cannot_be_referenced_in_a_computed_property_name_2465", message: "'this' cannot be referenced in a computed property name." },
@@ -3496,9 +2759,7 @@ var ts;
         Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1: { code: 2481, category: ts.DiagnosticCategory.Error, key: "Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1_2481", message: "Cannot initialize outer scoped variable '{0}' in the same scope as block scoped declaration '{1}'." },
         The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation: { code: 2483, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation_2483", message: "The left-hand side of a 'for...of' statement cannot use a type annotation." },
         Export_declaration_conflicts_with_exported_declaration_of_0: { code: 2484, category: ts.DiagnosticCategory.Error, key: "Export_declaration_conflicts_with_exported_declaration_of_0_2484", message: "Export declaration conflicts with exported declaration of '{0}'" },
-        The_left_hand_side_of_a_for_of_statement_cannot_be_a_constant_or_a_read_only_property: { code: 2485, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_cannot_be_a_constant_or_a_read_only_property_2485", message: "The left-hand side of a 'for...of' statement cannot be a constant or a read-only property." },
-        The_left_hand_side_of_a_for_in_statement_cannot_be_a_constant_or_a_read_only_property: { code: 2486, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_be_a_constant_or_a_read_only_property_2486", message: "The left-hand side of a 'for...in' statement cannot be a constant or a read-only property." },
-        Invalid_left_hand_side_in_for_of_statement: { code: 2487, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_in_for_of_statement_2487", message: "Invalid left-hand side in 'for...of' statement." },
+        The_left_hand_side_of_a_for_of_statement_must_be_a_variable_or_a_property_access: { code: 2487, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_must_be_a_variable_or_a_property_access_2487", message: "The left-hand side of a 'for...of' statement must be a variable or a property access." },
         Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator: { code: 2488, category: ts.DiagnosticCategory.Error, key: "Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator_2488", message: "Type must have a '[Symbol.iterator]()' method that returns an iterator." },
         An_iterator_must_have_a_next_method: { code: 2489, category: ts.DiagnosticCategory.Error, key: "An_iterator_must_have_a_next_method_2489", message: "An iterator must have a 'next()' method." },
         The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: { code: 2490, category: ts.DiagnosticCategory.Error, key: "The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property_2490", message: "The type returned by the 'next()' method of an iterator must have a 'value' property." },
@@ -3545,6 +2806,13 @@ var ts;
         Object_is_possibly_null_or_undefined: { code: 2533, category: ts.DiagnosticCategory.Error, key: "Object_is_possibly_null_or_undefined_2533", message: "Object is possibly 'null' or 'undefined'." },
         A_function_returning_never_cannot_have_a_reachable_end_point: { code: 2534, category: ts.DiagnosticCategory.Error, key: "A_function_returning_never_cannot_have_a_reachable_end_point_2534", message: "A function returning 'never' cannot have a reachable end point." },
         Enum_type_0_has_members_with_initializers_that_are_not_literals: { code: 2535, category: ts.DiagnosticCategory.Error, key: "Enum_type_0_has_members_with_initializers_that_are_not_literals_2535", message: "Enum type '{0}' has members with initializers that are not literals." },
+        Type_0_is_not_constrained_to_keyof_1: { code: 2536, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_constrained_to_keyof_1_2536", message: "Type '{0}' is not constrained to 'keyof {1}'." },
+        Type_0_has_no_matching_index_signature_for_type_1: { code: 2537, category: ts.DiagnosticCategory.Error, key: "Type_0_has_no_matching_index_signature_for_type_1_2537", message: "Type '{0}' has no matching index signature for type '{1}'." },
+        Type_0_cannot_be_used_as_an_index_type: { code: 2538, category: ts.DiagnosticCategory.Error, key: "Type_0_cannot_be_used_as_an_index_type_2538", message: "Type '{0}' cannot be used as an index type." },
+        Cannot_assign_to_0_because_it_is_not_a_variable: { code: 2539, category: ts.DiagnosticCategory.Error, key: "Cannot_assign_to_0_because_it_is_not_a_variable_2539", message: "Cannot assign to '{0}' because it is not a variable." },
+        Cannot_assign_to_0_because_it_is_a_constant_or_a_read_only_property: { code: 2540, category: ts.DiagnosticCategory.Error, key: "Cannot_assign_to_0_because_it_is_a_constant_or_a_read_only_property_2540", message: "Cannot assign to '{0}' because it is a constant or a read-only property." },
+        The_target_of_an_assignment_must_be_a_variable_or_a_property_access: { code: 2541, category: ts.DiagnosticCategory.Error, key: "The_target_of_an_assignment_must_be_a_variable_or_a_property_access_2541", message: "The target of an assignment must be a variable or a property access." },
+        Index_signature_in_type_0_only_permits_reading: { code: 2542, category: ts.DiagnosticCategory.Error, key: "Index_signature_in_type_0_only_permits_reading_2542", message: "Index signature in type '{0}' only permits reading." },
         JSX_element_attributes_type_0_may_not_be_a_union_type: { code: 2600, category: ts.DiagnosticCategory.Error, key: "JSX_element_attributes_type_0_may_not_be_a_union_type_2600", message: "JSX element attributes type '{0}' may not be a union type." },
         The_return_type_of_a_JSX_element_constructor_must_return_an_object_type: { code: 2601, category: ts.DiagnosticCategory.Error, key: "The_return_type_of_a_JSX_element_constructor_must_return_an_object_type_2601", message: "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: { code: 2602, category: ts.DiagnosticCategory.Error, key: "JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist_2602", message: "JSX element implicitly has type 'any' because the global type 'JSX.Element' does not exist." },
@@ -3568,6 +2836,7 @@ var ts;
         Cannot_find_name_0_Did_you_mean_the_static_member_1_0: { code: 2662, category: ts.DiagnosticCategory.Error, key: "Cannot_find_name_0_Did_you_mean_the_static_member_1_0_2662", message: "Cannot find name '{0}'. Did you mean the static member '{1}.{0}'?" },
         Cannot_find_name_0_Did_you_mean_the_instance_member_this_0: { code: 2663, category: ts.DiagnosticCategory.Error, key: "Cannot_find_name_0_Did_you_mean_the_instance_member_this_0_2663", message: "Cannot find name '{0}'. Did you mean the instance member 'this.{0}'?" },
         Invalid_module_name_in_augmentation_module_0_cannot_be_found: { code: 2664, category: ts.DiagnosticCategory.Error, key: "Invalid_module_name_in_augmentation_module_0_cannot_be_found_2664", message: "Invalid module name in augmentation, module '{0}' cannot be found." },
+        Invalid_module_name_in_augmentation_Module_0_resolves_to_an_untyped_module_at_1_which_cannot_be_augmented: { code: 2665, category: ts.DiagnosticCategory.Error, key: "Invalid_module_name_in_augmentation_Module_0_resolves_to_an_untyped_module_at_1_which_cannot_be_augm_2665", message: "Invalid module name in augmentation. Module '{0}' resolves to an untyped module at '{1}', which cannot be augmented." },
         Exports_and_export_assignments_are_not_permitted_in_module_augmentations: { code: 2666, category: ts.DiagnosticCategory.Error, key: "Exports_and_export_assignments_are_not_permitted_in_module_augmentations_2666", message: "Exports and export assignments are not permitted in module augmentations." },
         Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_module: { code: 2667, category: ts.DiagnosticCategory.Error, key: "Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_mod_2667", message: "Imports are not permitted in module augmentations. Consider moving them to the enclosing external module." },
         export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always_visible: { code: 2668, category: ts.DiagnosticCategory.Error, key: "export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always__2668", message: "'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible." },
@@ -3599,6 +2868,10 @@ var ts;
         Namespace_0_has_no_exported_member_1: { code: 2694, category: ts.DiagnosticCategory.Error, key: "Namespace_0_has_no_exported_member_1_2694", message: "Namespace '{0}' has no exported member '{1}'." },
         Left_side_of_comma_operator_is_unused_and_has_no_side_effects: { code: 2695, category: ts.DiagnosticCategory.Error, key: "Left_side_of_comma_operator_is_unused_and_has_no_side_effects_2695", message: "Left side of comma operator is unused and has no side effects." },
         The_Object_type_is_assignable_to_very_few_other_types_Did_you_mean_to_use_the_any_type_instead: { code: 2696, category: ts.DiagnosticCategory.Error, key: "The_Object_type_is_assignable_to_very_few_other_types_Did_you_mean_to_use_the_any_type_instead_2696", message: "The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?" },
+        An_async_function_or_method_must_return_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES2015_in_your_lib_option: { code: 2697, category: ts.DiagnosticCategory.Error, key: "An_async_function_or_method_must_return_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_in_2697", message: "An async function or method must return a 'Promise'. Make sure you have a declaration for 'Promise' or include 'ES2015' in your `--lib` option." },
+        Spread_types_may_only_be_created_from_object_types: { code: 2698, category: ts.DiagnosticCategory.Error, key: "Spread_types_may_only_be_created_from_object_types_2698", message: "Spread types may only be created from object types." },
+        Rest_types_may_only_be_created_from_object_types: { code: 2700, category: ts.DiagnosticCategory.Error, key: "Rest_types_may_only_be_created_from_object_types_2700", message: "Rest types may only be created from object types." },
+        An_object_rest_element_must_be_an_identifier: { code: 2701, category: ts.DiagnosticCategory.Error, key: "An_object_rest_element_must_be_an_identifier_2701", message: "An object rest element must be an identifier." },
         Import_declaration_0_is_using_private_name_1: { code: 4000, category: ts.DiagnosticCategory.Error, key: "Import_declaration_0_is_using_private_name_1_4000", message: "Import declaration '{0}' is using private name '{1}'." },
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", message: "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: { code: 4004, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", message: "Type parameter '{0}' of exported interface has or is using private name '{1}'." },
@@ -3698,6 +2971,7 @@ var ts;
         Substitution_0_for_pattern_1_has_incorrect_type_expected_string_got_2: { code: 5064, category: ts.DiagnosticCategory.Error, key: "Substitution_0_for_pattern_1_has_incorrect_type_expected_string_got_2_5064", message: "Substitution '{0}' for pattern '{1}' has incorrect type, expected 'string', got '{2}'." },
         File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0: { code: 5065, category: ts.DiagnosticCategory.Error, key: "File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildca_5065", message: "File specification cannot contain a parent directory ('..') that appears after a recursive directory wildcard ('**'): '{0}'." },
         Substitutions_for_pattern_0_shouldn_t_be_an_empty_array: { code: 5066, category: ts.DiagnosticCategory.Error, key: "Substitutions_for_pattern_0_shouldn_t_be_an_empty_array_5066", message: "Substitutions for pattern '{0}' shouldn't be an empty array." },
+        Invalid_value_for_jsxFactory_0_is_not_a_valid_identifier_or_qualified_name: { code: 5067, category: ts.DiagnosticCategory.Error, key: "Invalid_value_for_jsxFactory_0_is_not_a_valid_identifier_or_qualified_name_5067", message: "Invalid value for 'jsxFactory'. '{0}' is not a valid identifier or qualified-name." },
         Concatenate_and_emit_output_to_single_file: { code: 6001, category: ts.DiagnosticCategory.Message, key: "Concatenate_and_emit_output_to_single_file_6001", message: "Concatenate and emit output to single file." },
         Generates_corresponding_d_ts_file: { code: 6002, category: ts.DiagnosticCategory.Message, key: "Generates_corresponding_d_ts_file_6002", message: "Generates corresponding '.d.ts' file." },
         Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations: { code: 6003, category: ts.DiagnosticCategory.Message, key: "Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations_6003", message: "Specify the location where debugger should locate map files instead of generated locations." },
@@ -3781,7 +3055,7 @@ var ts;
         File_0_exist_use_it_as_a_name_resolution_result: { code: 6097, category: ts.DiagnosticCategory.Message, key: "File_0_exist_use_it_as_a_name_resolution_result_6097", message: "File '{0}' exist - use it as a name resolution result." },
         Loading_module_0_from_node_modules_folder: { code: 6098, category: ts.DiagnosticCategory.Message, key: "Loading_module_0_from_node_modules_folder_6098", message: "Loading module '{0}' from 'node_modules' folder." },
         Found_package_json_at_0: { code: 6099, category: ts.DiagnosticCategory.Message, key: "Found_package_json_at_0_6099", message: "Found 'package.json' at '{0}'." },
-        package_json_does_not_have_types_field: { code: 6100, category: ts.DiagnosticCategory.Message, key: "package_json_does_not_have_types_field_6100", message: "'package.json' does not have 'types' field." },
+        package_json_does_not_have_a_types_or_main_field: { code: 6100, category: ts.DiagnosticCategory.Message, key: "package_json_does_not_have_a_types_or_main_field_6100", message: "'package.json' does not have a 'types' or 'main' field." },
         package_json_has_0_field_1_that_references_2: { code: 6101, category: ts.DiagnosticCategory.Message, key: "package_json_has_0_field_1_that_references_2_6101", message: "'package.json' has '{0}' field '{1}' that references '{2}'." },
         Allow_javascript_files_to_be_compiled: { code: 6102, category: ts.DiagnosticCategory.Message, key: "Allow_javascript_files_to_be_compiled_6102", message: "Allow javascript files to be compiled." },
         Option_0_should_have_array_of_strings_as_a_value: { code: 6103, category: ts.DiagnosticCategory.Error, key: "Option_0_should_have_array_of_strings_as_a_value_6103", message: "Option '{0}' should have array of strings as a value." },
@@ -3818,11 +3092,16 @@ var ts;
         Report_errors_on_unused_locals: { code: 6134, category: ts.DiagnosticCategory.Message, key: "Report_errors_on_unused_locals_6134", message: "Report errors on unused locals." },
         Report_errors_on_unused_parameters: { code: 6135, category: ts.DiagnosticCategory.Message, key: "Report_errors_on_unused_parameters_6135", message: "Report errors on unused parameters." },
         The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files: { code: 6136, category: ts.DiagnosticCategory.Message, key: "The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files_6136", message: "The maximum dependency depth to search under node_modules and load JavaScript files" },
-        No_types_specified_in_package_json_but_allowJs_is_set_so_returning_main_value_of_0: { code: 6137, category: ts.DiagnosticCategory.Message, key: "No_types_specified_in_package_json_but_allowJs_is_set_so_returning_main_value_of_0_6137", message: "No types specified in 'package.json' but 'allowJs' is set, so returning 'main' value of '{0}'" },
+        No_types_specified_in_package_json_so_returning_main_value_of_0: { code: 6137, category: ts.DiagnosticCategory.Message, key: "No_types_specified_in_package_json_so_returning_main_value_of_0_6137", message: "No types specified in 'package.json', so returning 'main' value of '{0}'" },
         Property_0_is_declared_but_never_used: { code: 6138, category: ts.DiagnosticCategory.Error, key: "Property_0_is_declared_but_never_used_6138", message: "Property '{0}' is declared but never used." },
         Import_emit_helpers_from_tslib: { code: 6139, category: ts.DiagnosticCategory.Message, key: "Import_emit_helpers_from_tslib_6139", message: "Import emit helpers from 'tslib'." },
         Auto_discovery_for_typings_is_enabled_in_project_0_Running_extra_resolution_pass_for_module_1_using_cache_location_2: { code: 6140, category: ts.DiagnosticCategory.Error, key: "Auto_discovery_for_typings_is_enabled_in_project_0_Running_extra_resolution_pass_for_module_1_using__6140", message: "Auto discovery for typings is enabled in project '{0}'. Running extra resolution pass for module '{1}' using cache location '{2}'." },
         Parse_in_strict_mode_and_emit_use_strict_for_each_source_file: { code: 6141, category: ts.DiagnosticCategory.Message, key: "Parse_in_strict_mode_and_emit_use_strict_for_each_source_file_6141", message: "Parse in strict mode and emit \"use strict\" for each source file" },
+        Module_0_was_resolved_to_1_but_jsx_is_not_set: { code: 6142, category: ts.DiagnosticCategory.Error, key: "Module_0_was_resolved_to_1_but_jsx_is_not_set_6142", message: "Module '{0}' was resolved to '{1}', but '--jsx' is not set." },
+        Module_0_was_resolved_to_1_but_allowJs_is_not_set: { code: 6143, category: ts.DiagnosticCategory.Error, key: "Module_0_was_resolved_to_1_but_allowJs_is_not_set_6143", message: "Module '{0}' was resolved to '{1}', but '--allowJs' is not set." },
+        Module_0_was_resolved_as_locally_declared_ambient_module_in_file_1: { code: 6144, category: ts.DiagnosticCategory.Message, key: "Module_0_was_resolved_as_locally_declared_ambient_module_in_file_1_6144", message: "Module '{0}' was resolved as locally declared ambient module in file '{1}'." },
+        Module_0_was_resolved_as_ambient_module_declared_in_1_since_this_file_was_not_modified: { code: 6145, category: ts.DiagnosticCategory.Message, key: "Module_0_was_resolved_as_ambient_module_declared_in_1_since_this_file_was_not_modified_6145", message: "Module '{0}' was resolved as ambient module declared in '{1}' since this file was not modified." },
+        Specify_the_JSX_factory_function_to_use_when_targeting_react_JSX_emit_e_g_React_createElement_or_h: { code: 6146, category: ts.DiagnosticCategory.Message, key: "Specify_the_JSX_factory_function_to_use_when_targeting_react_JSX_emit_e_g_React_createElement_or_h_6146", message: "Specify the JSX factory function to use when targeting 'react' JSX emit, e.g. 'React.createElement' or 'h'." },
         Variable_0_implicitly_has_an_1_type: { code: 7005, category: ts.DiagnosticCategory.Error, key: "Variable_0_implicitly_has_an_1_type_7005", message: "Variable '{0}' implicitly has an '{1}' type." },
         Parameter_0_implicitly_has_an_1_type: { code: 7006, category: ts.DiagnosticCategory.Error, key: "Parameter_0_implicitly_has_an_1_type_7006", message: "Parameter '{0}' implicitly has an '{1}' type." },
         Member_0_implicitly_has_an_1_type: { code: 7008, category: ts.DiagnosticCategory.Error, key: "Member_0_implicitly_has_an_1_type_7008", message: "Member '{0}' implicitly has an '{1}' type." },
@@ -3831,7 +3110,8 @@ var ts;
         Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type: { code: 7011, category: ts.DiagnosticCategory.Error, key: "Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type_7011", message: "Function expression, which lacks return-type annotation, implicitly has an '{0}' return type." },
         Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7013, category: ts.DiagnosticCategory.Error, key: "Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type_7013", message: "Construct signature, which lacks return-type annotation, implicitly has an 'any' return type." },
         Element_implicitly_has_an_any_type_because_index_expression_is_not_of_type_number: { code: 7015, category: ts.DiagnosticCategory.Error, key: "Element_implicitly_has_an_any_type_because_index_expression_is_not_of_type_number_7015", message: "Element implicitly has an 'any' type because index expression is not of type 'number'." },
-        Index_signature_of_object_type_implicitly_has_an_any_type: { code: 7017, category: ts.DiagnosticCategory.Error, key: "Index_signature_of_object_type_implicitly_has_an_any_type_7017", message: "Index signature of object type implicitly has an 'any' type." },
+        Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type: { code: 7016, category: ts.DiagnosticCategory.Error, key: "Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type_7016", message: "Could not find a declaration file for module '{0}'. '{1}' implicitly has an 'any' type." },
+        Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature: { code: 7017, category: ts.DiagnosticCategory.Error, key: "Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_7017", message: "Element implicitly has an 'any' type because type '{0}' has no index signature." },
         Object_literal_s_property_0_implicitly_has_an_1_type: { code: 7018, category: ts.DiagnosticCategory.Error, key: "Object_literal_s_property_0_implicitly_has_an_1_type_7018", message: "Object literal's property '{0}' implicitly has an '{1}' type." },
         Rest_parameter_0_implicitly_has_an_any_type: { code: 7019, category: ts.DiagnosticCategory.Error, key: "Rest_parameter_0_implicitly_has_an_any_type_7019", message: "Rest parameter '{0}' implicitly has an 'any[]' type." },
         Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7020, category: ts.DiagnosticCategory.Error, key: "Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type_7020", message: "Call signature, which lacks return-type annotation, implicitly has an 'any' return type." },
@@ -3878,6 +3158,8 @@ var ts;
         Unknown_typing_option_0: { code: 17010, category: ts.DiagnosticCategory.Error, key: "Unknown_typing_option_0_17010", message: "Unknown typing option '{0}'." },
         Circularity_detected_while_resolving_configuration_Colon_0: { code: 18000, category: ts.DiagnosticCategory.Error, key: "Circularity_detected_while_resolving_configuration_Colon_0_18000", message: "Circularity detected while resolving configuration: {0}" },
         The_path_in_an_extends_options_must_be_relative_or_rooted: { code: 18001, category: ts.DiagnosticCategory.Error, key: "The_path_in_an_extends_options_must_be_relative_or_rooted_18001", message: "The path in an 'extends' options must be relative or rooted." },
+        The_files_list_in_config_file_0_is_empty: { code: 18002, category: ts.DiagnosticCategory.Error, key: "The_files_list_in_config_file_0_is_empty_18002", message: "The 'files' list in config file '{0}' is empty." },
+        No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2: { code: 18003, category: ts.DiagnosticCategory.Error, key: "No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2_18003", message: "No inputs were found in config file '{0}'. Specified 'include' paths were '{1}' and 'exclude' paths were '{2}'." },
         Add_missing_super_call: { code: 90001, category: ts.DiagnosticCategory.Message, key: "Add_missing_super_call_90001", message: "Add missing 'super()' call." },
         Make_super_call_the_first_statement_in_the_constructor: { code: 90002, category: ts.DiagnosticCategory.Message, key: "Make_super_call_the_first_statement_in_the_constructor_90002", message: "Make 'super()' call the first statement in the constructor." },
         Change_extends_to_implements: { code: 90003, category: ts.DiagnosticCategory.Message, key: "Change_extends_to_implements_90003", message: "Change 'extends' to 'implements'" },
@@ -3885,6 +3167,8 @@ var ts;
         Implement_interface_on_reference: { code: 90005, category: ts.DiagnosticCategory.Message, key: "Implement_interface_on_reference_90005", message: "Implement interface on reference" },
         Implement_interface_on_class: { code: 90006, category: ts.DiagnosticCategory.Message, key: "Implement_interface_on_class_90006", message: "Implement interface on class" },
         Implement_inherited_abstract_class: { code: 90007, category: ts.DiagnosticCategory.Message, key: "Implement_inherited_abstract_class_90007", message: "Implement inherited abstract class" },
+        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: { code: 90009, category: ts.DiagnosticCategory.Error, key: "Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript__90009", message: "Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig" },
+        Type_0_is_not_assignable_to_type_1_Two_different_types_with_this_name_exist_but_they_are_unrelated: { code: 90010, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_assignable_to_type_1_Two_different_types_with_this_name_exist_but_they_are_unrelated_90010", message: "Type '{0}' is not assignable to type '{1}'. Two different types with this name exist, but they are unrelated." },
     };
 })(ts || (ts = {}));
 var ts;
@@ -3917,7 +3201,7 @@ var ts;
         "false": 85,
         "finally": 86,
         "for": 87,
-        "from": 137,
+        "from": 138,
         "function": 88,
         "get": 124,
         "if": 89,
@@ -3927,34 +3211,35 @@ var ts;
         "instanceof": 92,
         "interface": 108,
         "is": 125,
+        "keyof": 126,
         "let": 109,
-        "module": 126,
-        "namespace": 127,
-        "never": 128,
+        "module": 127,
+        "namespace": 128,
+        "never": 129,
         "new": 93,
         "null": 94,
-        "number": 131,
+        "number": 132,
         "package": 110,
         "private": 111,
         "protected": 112,
         "public": 113,
-        "readonly": 129,
-        "require": 130,
-        "global": 138,
+        "readonly": 130,
+        "require": 131,
+        "global": 139,
         "return": 95,
-        "set": 132,
+        "set": 133,
         "static": 114,
-        "string": 133,
+        "string": 134,
         "super": 96,
         "switch": 97,
-        "symbol": 134,
+        "symbol": 135,
         "this": 98,
         "throw": 99,
         "true": 100,
         "try": 101,
-        "type": 135,
+        "type": 136,
         "typeof": 102,
-        "undefined": 136,
+        "undefined": 137,
         "var": 103,
         "void": 104,
         "while": 105,
@@ -3962,7 +3247,7 @@ var ts;
         "yield": 115,
         "async": 119,
         "await": 120,
-        "of": 139,
+        "of": 140,
         "{": 16,
         "}": 17,
         "(": 18,
@@ -5345,10 +4630,13 @@ var ts;
                 case 44:
                     pos++;
                     return token = 25;
+                case 46:
+                    pos++;
+                    return token = 22;
             }
-            if (isIdentifierStart(ch, 4)) {
+            if (isIdentifierStart(ch, 5)) {
                 pos++;
-                while (isIdentifierPart(text.charCodeAt(pos), 4) && pos < end) {
+                while (isIdentifierPart(text.charCodeAt(pos), 5) && pos < end) {
                     pos++;
                 }
                 return token = 70;
@@ -5466,11 +4754,11 @@ var ts;
                 writeParameter: writeText,
                 writeSymbol: writeText,
                 writeLine: function () { return str_1 += " "; },
-                increaseIndent: function () { },
-                decreaseIndent: function () { },
+                increaseIndent: ts.noop,
+                decreaseIndent: ts.noop,
                 clear: function () { return str_1 = ""; },
-                trackSymbol: function () { },
-                reportInaccessibleThisError: function () { }
+                trackSymbol: ts.noop,
+                reportInaccessibleThisError: ts.noop
             };
         }
         return stringWriters.pop();
@@ -5485,22 +4773,6 @@ var ts;
         return node.end - node.pos;
     }
     ts.getFullWidth = getFullWidth;
-    function arrayIsEqualTo(array1, array2, equaler) {
-        if (!array1 || !array2) {
-            return array1 === array2;
-        }
-        if (array1.length !== array2.length) {
-            return false;
-        }
-        for (var i = 0; i < array1.length; i++) {
-            var equals = equaler ? equaler(array1[i], array2[i]) : array1[i] === array2[i];
-            if (!equals) {
-                return false;
-            }
-        }
-        return true;
-    }
-    ts.arrayIsEqualTo = arrayIsEqualTo;
     function hasResolvedModule(sourceFile, moduleNameText) {
         return !!(sourceFile && sourceFile.resolvedModules && sourceFile.resolvedModules[moduleNameText]);
     }
@@ -5524,7 +4796,9 @@ var ts;
     }
     ts.setResolvedTypeReferenceDirective = setResolvedTypeReferenceDirective;
     function moduleResolutionIsEqualTo(oldResolution, newResolution) {
-        return oldResolution.resolvedFileName === newResolution.resolvedFileName && oldResolution.isExternalLibraryImport === newResolution.isExternalLibraryImport;
+        return oldResolution.isExternalLibraryImport === newResolution.isExternalLibraryImport &&
+            oldResolution.extension === newResolution.extension &&
+            oldResolution.resolvedFileName === newResolution.resolvedFileName;
     }
     ts.moduleResolutionIsEqualTo = moduleResolutionIsEqualTo;
     function typeDirectiveIsEqualTo(oldResolution, newResolution) {
@@ -5550,21 +4824,21 @@ var ts;
     ts.hasChangesInResolutions = hasChangesInResolutions;
     function containsParseError(node) {
         aggregateChildData(node);
-        return (node.flags & 2097152) !== 0;
+        return (node.flags & 4194304) !== 0;
     }
     ts.containsParseError = containsParseError;
     function aggregateChildData(node) {
-        if (!(node.flags & 4194304)) {
-            var thisNodeOrAnySubNodesHasError = ((node.flags & 524288) !== 0) ||
+        if (!(node.flags & 8388608)) {
+            var thisNodeOrAnySubNodesHasError = ((node.flags & 1048576) !== 0) ||
                 ts.forEachChild(node, containsParseError);
             if (thisNodeOrAnySubNodesHasError) {
-                node.flags |= 2097152;
+                node.flags |= 4194304;
             }
-            node.flags |= 4194304;
+            node.flags |= 8388608;
         }
     }
     function getSourceFileOfNode(node) {
-        while (node && node.kind !== 256) {
+        while (node && node.kind !== 261) {
             node = node.parent;
         }
         return node;
@@ -5572,11 +4846,11 @@ var ts;
     ts.getSourceFileOfNode = getSourceFileOfNode;
     function isStatementWithLocals(node) {
         switch (node.kind) {
-            case 200:
-            case 228:
-            case 207:
-            case 208:
-            case 209:
+            case 204:
+            case 232:
+            case 211:
+            case 212:
+            case 213:
                 return true;
         }
         return false;
@@ -5641,18 +4915,18 @@ var ts;
         if (includeJsDocComment && node.jsDocComments && node.jsDocComments.length > 0) {
             return getTokenPosOfNode(node.jsDocComments[0]);
         }
-        if (node.kind === 286 && node._children.length > 0) {
+        if (node.kind === 291 && node._children.length > 0) {
             return getTokenPosOfNode(node._children[0], sourceFile, includeJsDocComment);
         }
         return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos);
     }
     ts.getTokenPosOfNode = getTokenPosOfNode;
     function isJSDocNode(node) {
-        return node.kind >= 257 && node.kind <= 282;
+        return node.kind >= 262 && node.kind <= 287;
     }
     ts.isJSDocNode = isJSDocNode;
     function isJSDocTag(node) {
-        return node.kind >= 273 && node.kind <= 285;
+        return node.kind >= 278 && node.kind <= 290;
     }
     ts.isJSDocTag = isJSDocTag;
     function getNonDecoratorTokenPosOfNode(node, sourceFile) {
@@ -5741,11 +5015,16 @@ var ts;
     ts.makeIdentifierFromModuleName = makeIdentifierFromModuleName;
     function isBlockOrCatchScoped(declaration) {
         return (ts.getCombinedNodeFlags(declaration) & 3) !== 0 ||
-            isCatchClauseVariableDeclaration(declaration);
+            isCatchClauseVariableDeclarationOrBindingElement(declaration);
     }
     ts.isBlockOrCatchScoped = isBlockOrCatchScoped;
+    function isCatchClauseVariableDeclarationOrBindingElement(declaration) {
+        var node = getRootDeclaration(declaration);
+        return node.kind === 223 && node.parent.kind === 256;
+    }
+    ts.isCatchClauseVariableDeclarationOrBindingElement = isCatchClauseVariableDeclarationOrBindingElement;
     function isAmbientModule(node) {
-        return node && node.kind === 226 &&
+        return node && node.kind === 230 &&
             (node.name.kind === 9 || isGlobalScopeAugmentation(node));
     }
     ts.isAmbientModule = isAmbientModule;
@@ -5754,11 +5033,11 @@ var ts;
     }
     ts.isShorthandAmbientModuleSymbol = isShorthandAmbientModuleSymbol;
     function isShorthandAmbientModule(node) {
-        return node.kind === 226 && (!node.body);
+        return node.kind === 230 && (!node.body);
     }
     function isBlockScopedContainerTopLevel(node) {
-        return node.kind === 256 ||
-            node.kind === 226 ||
+        return node.kind === 261 ||
+            node.kind === 230 ||
             isFunctionLike(node);
     }
     ts.isBlockScopedContainerTopLevel = isBlockScopedContainerTopLevel;
@@ -5771,9 +5050,9 @@ var ts;
             return false;
         }
         switch (node.parent.kind) {
-            case 256:
+            case 261:
                 return ts.isExternalModule(node.parent);
-            case 227:
+            case 231:
                 return isAmbientModule(node.parent.parent) && !ts.isExternalModule(node.parent.parent.parent);
         }
         return false;
@@ -5781,22 +5060,22 @@ var ts;
     ts.isExternalModuleAugmentation = isExternalModuleAugmentation;
     function isBlockScope(node, parentNode) {
         switch (node.kind) {
+            case 261:
+            case 232:
             case 256:
-            case 228:
-            case 252:
-            case 226:
-            case 207:
-            case 208:
-            case 209:
-            case 149:
-            case 148:
+            case 230:
+            case 211:
+            case 212:
+            case 213:
             case 150:
+            case 149:
             case 151:
-            case 221:
-            case 180:
-            case 181:
+            case 152:
+            case 225:
+            case 184:
+            case 185:
                 return true;
-            case 200:
+            case 204:
                 return parentNode && !isFunctionLike(parentNode);
         }
         return false;
@@ -5812,23 +5091,46 @@ var ts;
         }
     }
     ts.getEnclosingBlockScopeContainer = getEnclosingBlockScopeContainer;
-    function isCatchClauseVariableDeclaration(declaration) {
-        return declaration &&
-            declaration.kind === 219 &&
-            declaration.parent &&
-            declaration.parent.kind === 252;
-    }
-    ts.isCatchClauseVariableDeclaration = isCatchClauseVariableDeclaration;
     function declarationNameToString(name) {
         return getFullWidth(name) === 0 ? "(Missing)" : getTextOfNode(name);
     }
     ts.declarationNameToString = declarationNameToString;
+    function getTextOfPropertyName(name) {
+        switch (name.kind) {
+            case 70:
+                return name.text;
+            case 9:
+            case 8:
+                return name.text;
+            case 142:
+                if (isStringOrNumericLiteral(name.expression.kind)) {
+                    return name.expression.text;
+                }
+        }
+        return undefined;
+    }
+    ts.getTextOfPropertyName = getTextOfPropertyName;
+    function entityNameToString(name) {
+        switch (name.kind) {
+            case 70:
+                return getFullWidth(name) === 0 ? unescapeIdentifier(name.text) : getTextOfNode(name);
+            case 141:
+                return entityNameToString(name.left) + "." + entityNameToString(name.right);
+            case 177:
+                return entityNameToString(name.expression) + "." + entityNameToString(name.name);
+        }
+    }
+    ts.entityNameToString = entityNameToString;
     function createDiagnosticForNode(node, message, arg0, arg1, arg2) {
         var sourceFile = getSourceFileOfNode(node);
+        return createDiagnosticForNodeInSourceFile(sourceFile, node, message, arg0, arg1, arg2);
+    }
+    ts.createDiagnosticForNode = createDiagnosticForNode;
+    function createDiagnosticForNodeInSourceFile(sourceFile, node, message, arg0, arg1, arg2) {
         var span = getErrorSpanForNode(sourceFile, node);
         return ts.createFileDiagnostic(sourceFile, span.start, span.length, message, arg0, arg1, arg2);
     }
-    ts.createDiagnosticForNode = createDiagnosticForNode;
+    ts.createDiagnosticForNodeInSourceFile = createDiagnosticForNodeInSourceFile;
     function createDiagnosticForNodeFromMessageChain(node, messageChain) {
         var sourceFile = getSourceFileOfNode(node);
         var span = getErrorSpanForNode(sourceFile, node);
@@ -5851,7 +5153,7 @@ var ts;
     ts.getSpanOfTokenAtPosition = getSpanOfTokenAtPosition;
     function getErrorSpanForArrowFunction(sourceFile, node) {
         var pos = ts.skipTrivia(sourceFile.text, node.pos);
-        if (node.body && node.body.kind === 200) {
+        if (node.body && node.body.kind === 204) {
             var startLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.pos).line;
             var endLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.end).line;
             if (startLine < endLine) {
@@ -5863,29 +5165,29 @@ var ts;
     function getErrorSpanForNode(sourceFile, node) {
         var errorNode = node;
         switch (node.kind) {
-            case 256:
+            case 261:
                 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 219:
-            case 170:
-            case 222:
-            case 193:
             case 223:
+            case 174:
             case 226:
+            case 197:
+            case 227:
+            case 230:
+            case 229:
+            case 260:
             case 225:
-            case 255:
-            case 221:
-            case 180:
-            case 148:
-            case 150:
+            case 184:
+            case 149:
             case 151:
-            case 224:
+            case 152:
+            case 228:
                 errorNode = node.name;
                 break;
-            case 181:
+            case 185:
                 return getErrorSpanForArrowFunction(sourceFile, node);
         }
         if (errorNode === undefined) {
@@ -5906,7 +5208,7 @@ var ts;
     }
     ts.isDeclarationFile = isDeclarationFile;
     function isConstEnumDeclaration(node) {
-        return node.kind === 225 && isConst(node);
+        return node.kind === 229 && isConst(node);
     }
     ts.isConstEnumDeclaration = isConstEnumDeclaration;
     function isConst(node) {
@@ -5919,11 +5221,11 @@ var ts;
     }
     ts.isLet = isLet;
     function isSuperCall(n) {
-        return n.kind === 175 && n.expression.kind === 96;
+        return n.kind === 179 && n.expression.kind === 96;
     }
     ts.isSuperCall = isSuperCall;
     function isPrologueDirective(node) {
-        return node.kind === 203 && node.expression.kind === 9;
+        return node.kind === 207 && node.expression.kind === 9;
     }
     ts.isPrologueDirective = isPrologueDirective;
     function getLeadingCommentRangesOfNode(node, sourceFileOfNode) {
@@ -5939,10 +5241,10 @@ var ts;
     }
     ts.getJsDocComments = getJsDocComments;
     function getJsDocCommentsFromText(node, text) {
-        var commentRanges = (node.kind === 143 ||
-            node.kind === 142 ||
-            node.kind === 180 ||
-            node.kind === 181) ?
+        var commentRanges = (node.kind === 144 ||
+            node.kind === 143 ||
+            node.kind === 184 ||
+            node.kind === 185) ?
             ts.concatenate(ts.getTrailingCommentRanges(text, node.pos), ts.getLeadingCommentRanges(text, node.pos)) :
             getLeadingCommentRangesOfNodeFromText(node, text);
         return ts.filter(commentRanges, isJsDocComment);
@@ -5957,69 +5259,69 @@ var ts;
     ts.fullTripleSlashReferenceTypeReferenceDirectiveRegEx = /^(\/\/\/\s*<reference\s+types\s*=\s*)('|")(.+?)\2.*?\/>/;
     ts.fullTripleSlashAMDReferencePathRegEx = /^(\/\/\/\s*<amd-dependency\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
     function isPartOfTypeNode(node) {
-        if (155 <= node.kind && node.kind <= 167) {
+        if (156 <= node.kind && node.kind <= 171) {
             return true;
         }
         switch (node.kind) {
             case 118:
-            case 131:
-            case 133:
-            case 121:
+            case 132:
             case 134:
-            case 136:
-            case 128:
+            case 121:
+            case 135:
+            case 137:
+            case 129:
                 return true;
             case 104:
-                return node.parent.kind !== 184;
-            case 195:
+                return node.parent.kind !== 188;
+            case 199:
                 return !isExpressionWithTypeArgumentsInClassExtendsClause(node);
             case 70:
-                if (node.parent.kind === 140 && node.parent.right === node) {
+                if (node.parent.kind === 141 && node.parent.right === node) {
                     node = node.parent;
                 }
-                else if (node.parent.kind === 173 && node.parent.name === node) {
+                else if (node.parent.kind === 177 && node.parent.name === node) {
                     node = node.parent;
                 }
-                ts.Debug.assert(node.kind === 70 || node.kind === 140 || node.kind === 173, "'node' was expected to be a qualified name, identifier or property access in 'isPartOfTypeNode'.");
-            case 140:
-            case 173:
+                ts.Debug.assert(node.kind === 70 || node.kind === 141 || node.kind === 177, "'node' was expected to be a qualified name, identifier or property access in 'isPartOfTypeNode'.");
+            case 141:
+            case 177:
             case 98:
                 var parent_1 = node.parent;
-                if (parent_1.kind === 159) {
+                if (parent_1.kind === 160) {
                     return false;
                 }
-                if (155 <= parent_1.kind && parent_1.kind <= 167) {
+                if (156 <= parent_1.kind && parent_1.kind <= 171) {
                     return true;
                 }
                 switch (parent_1.kind) {
-                    case 195:
+                    case 199:
                         return !isExpressionWithTypeArgumentsInClassExtendsClause(parent_1);
-                    case 142:
-                        return node === parent_1.constraint;
-                    case 146:
-                    case 145:
                     case 143:
-                    case 219:
+                        return node === parent_1.constraint;
+                    case 147:
+                    case 146:
+                    case 144:
+                    case 223:
                         return node === parent_1.type;
-                    case 221:
-                    case 180:
-                    case 181:
+                    case 225:
+                    case 184:
+                    case 185:
+                    case 150:
                     case 149:
                     case 148:
-                    case 147:
-                    case 150:
                     case 151:
-                        return node === parent_1.type;
                     case 152:
+                        return node === parent_1.type;
                     case 153:
                     case 154:
+                    case 155:
                         return node === parent_1.type;
-                    case 178:
+                    case 182:
                         return node === parent_1.type;
-                    case 175:
-                    case 176:
+                    case 179:
+                    case 180:
                         return parent_1.typeArguments && ts.indexOf(parent_1.typeArguments, node) >= 0;
-                    case 177:
+                    case 181:
                         return false;
                 }
         }
@@ -6030,23 +5332,23 @@ var ts;
         return traverse(body);
         function traverse(node) {
             switch (node.kind) {
-                case 212:
+                case 216:
                     return visitor(node);
-                case 228:
-                case 200:
+                case 232:
                 case 204:
-                case 205:
-                case 206:
-                case 207:
                 case 208:
                 case 209:
+                case 210:
+                case 211:
+                case 212:
                 case 213:
-                case 214:
-                case 249:
-                case 250:
-                case 215:
                 case 217:
-                case 252:
+                case 218:
+                case 253:
+                case 254:
+                case 219:
+                case 221:
+                case 256:
                     return ts.forEachChild(node, traverse);
             }
         }
@@ -6056,23 +5358,23 @@ var ts;
         return traverse(body);
         function traverse(node) {
             switch (node.kind) {
-                case 191:
+                case 195:
                     visitor(node);
                     var operand = node.expression;
                     if (operand) {
                         traverse(operand);
                     }
-                case 225:
-                case 223:
+                case 229:
+                case 227:
+                case 230:
+                case 228:
                 case 226:
-                case 224:
-                case 222:
-                case 193:
+                case 197:
                     return;
                 default:
                     if (isFunctionLike(node)) {
                         var name_5 = node.name;
-                        if (name_5 && name_5.kind === 141) {
+                        if (name_5 && name_5.kind === 142) {
                             traverse(name_5.expression);
                             return;
                         }
@@ -6087,14 +5389,14 @@ var ts;
     function isVariableLike(node) {
         if (node) {
             switch (node.kind) {
-                case 170:
-                case 255:
-                case 143:
-                case 253:
+                case 174:
+                case 260:
+                case 144:
+                case 257:
+                case 147:
                 case 146:
-                case 145:
-                case 254:
-                case 219:
+                case 258:
+                case 223:
                     return true;
             }
         }
@@ -6102,11 +5404,11 @@ var ts;
     }
     ts.isVariableLike = isVariableLike;
     function isAccessor(node) {
-        return node && (node.kind === 150 || node.kind === 151);
+        return node && (node.kind === 151 || node.kind === 152);
     }
     ts.isAccessor = isAccessor;
     function isClassLike(node) {
-        return node && (node.kind === 222 || node.kind === 193);
+        return node && (node.kind === 226 || node.kind === 197);
     }
     ts.isClassLike = isClassLike;
     function isFunctionLike(node) {
@@ -6115,19 +5417,19 @@ var ts;
     ts.isFunctionLike = isFunctionLike;
     function isFunctionLikeKind(kind) {
         switch (kind) {
-            case 149:
-            case 180:
-            case 221:
-            case 181:
-            case 148:
-            case 147:
             case 150:
+            case 184:
+            case 225:
+            case 185:
+            case 149:
+            case 148:
             case 151:
             case 152:
             case 153:
             case 154:
-            case 157:
+            case 155:
             case 158:
+            case 159:
                 return true;
         }
         return false;
@@ -6135,13 +5437,13 @@ var ts;
     ts.isFunctionLikeKind = isFunctionLikeKind;
     function introducesArgumentsExoticObject(node) {
         switch (node.kind) {
-            case 148:
-            case 147:
             case 149:
+            case 148:
             case 150:
             case 151:
-            case 221:
-            case 180:
+            case 152:
+            case 225:
+            case 184:
                 return true;
         }
         return false;
@@ -6149,30 +5451,30 @@ var ts;
     ts.introducesArgumentsExoticObject = introducesArgumentsExoticObject;
     function isIterationStatement(node, lookInLabeledStatements) {
         switch (node.kind) {
-            case 207:
-            case 208:
+            case 211:
+            case 212:
+            case 213:
             case 209:
-            case 205:
-            case 206:
+            case 210:
                 return true;
-            case 215:
+            case 219:
                 return lookInLabeledStatements && isIterationStatement(node.statement, lookInLabeledStatements);
         }
         return false;
     }
     ts.isIterationStatement = isIterationStatement;
     function isFunctionBlock(node) {
-        return node && node.kind === 200 && isFunctionLike(node.parent);
+        return node && node.kind === 204 && isFunctionLike(node.parent);
     }
     ts.isFunctionBlock = isFunctionBlock;
     function isObjectLiteralMethod(node) {
-        return node && node.kind === 148 && node.parent.kind === 172;
+        return node && node.kind === 149 && node.parent.kind === 176;
     }
     ts.isObjectLiteralMethod = isObjectLiteralMethod;
     function isObjectLiteralOrClassExpressionMethod(node) {
-        return node.kind === 148 &&
-            (node.parent.kind === 172 ||
-                node.parent.kind === 193);
+        return node.kind === 149 &&
+            (node.parent.kind === 176 ||
+                node.parent.kind === 197);
     }
     ts.isObjectLiteralOrClassExpressionMethod = isObjectLiteralOrClassExpressionMethod;
     function isIdentifierTypePredicate(predicate) {
@@ -6208,39 +5510,39 @@ var ts;
                 return undefined;
             }
             switch (node.kind) {
-                case 141:
+                case 142:
                     if (isClassLike(node.parent.parent)) {
                         return node;
                     }
                     node = node.parent;
                     break;
-                case 144:
-                    if (node.parent.kind === 143 && isClassElement(node.parent.parent)) {
+                case 145:
+                    if (node.parent.kind === 144 && isClassElement(node.parent.parent)) {
                         node = node.parent.parent;
                     }
                     else if (isClassElement(node.parent)) {
                         node = node.parent;
                     }
                     break;
-                case 181:
+                case 185:
                     if (!includeArrowFunctions) {
                         continue;
                     }
-                case 221:
-                case 180:
-                case 226:
-                case 146:
-                case 145:
-                case 148:
+                case 225:
+                case 184:
+                case 230:
                 case 147:
+                case 146:
                 case 149:
+                case 148:
                 case 150:
                 case 151:
                 case 152:
                 case 153:
                 case 154:
-                case 225:
-                case 256:
+                case 155:
+                case 229:
+                case 261:
                     return node;
             }
         }
@@ -6253,25 +5555,25 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 141:
+                case 142:
                     node = node.parent;
                     break;
-                case 221:
-                case 180:
-                case 181:
+                case 225:
+                case 184:
+                case 185:
                     if (!stopOnFunctions) {
                         continue;
                     }
-                case 146:
-                case 145:
-                case 148:
                 case 147:
+                case 146:
                 case 149:
+                case 148:
                 case 150:
                 case 151:
+                case 152:
                     return node;
-                case 144:
-                    if (node.parent.kind === 143 && isClassElement(node.parent.parent)) {
+                case 145:
+                    if (node.parent.kind === 144 && isClassElement(node.parent.parent)) {
                         node = node.parent.parent;
                     }
                     else if (isClassElement(node.parent)) {
@@ -6283,14 +5585,14 @@ var ts;
     }
     ts.getSuperContainer = getSuperContainer;
     function getImmediatelyInvokedFunctionExpression(func) {
-        if (func.kind === 180 || func.kind === 181) {
+        if (func.kind === 184 || func.kind === 185) {
             var prev = func;
             var parent_2 = func.parent;
-            while (parent_2.kind === 179) {
+            while (parent_2.kind === 183) {
                 prev = parent_2;
                 parent_2 = parent_2.parent;
             }
-            if (parent_2.kind === 175 && parent_2.expression === prev) {
+            if (parent_2.kind === 179 && parent_2.expression === prev) {
                 return parent_2;
             }
         }
@@ -6298,32 +5600,32 @@ var ts;
     ts.getImmediatelyInvokedFunctionExpression = getImmediatelyInvokedFunctionExpression;
     function isSuperProperty(node) {
         var kind = node.kind;
-        return (kind === 173 || kind === 174)
+        return (kind === 177 || kind === 178)
             && node.expression.kind === 96;
     }
     ts.isSuperProperty = isSuperProperty;
     function getEntityNameFromTypeNode(node) {
-        if (node) {
-            switch (node.kind) {
-                case 156:
-                    return node.typeName;
-                case 195:
-                    ts.Debug.assert(isEntityNameExpression(node.expression));
-                    return node.expression;
-                case 70:
-                case 140:
-                    return node;
-            }
+        switch (node.kind) {
+            case 157:
+            case 272:
+                return node.typeName;
+            case 199:
+                return isEntityNameExpression(node.expression)
+                    ? node.expression
+                    : undefined;
+            case 70:
+            case 141:
+                return node;
         }
         return undefined;
     }
     ts.getEntityNameFromTypeNode = getEntityNameFromTypeNode;
     function isCallLikeExpression(node) {
         switch (node.kind) {
-            case 175:
-            case 176:
-            case 177:
-            case 144:
+            case 179:
+            case 180:
+            case 181:
+            case 145:
                 return true;
             default:
                 return false;
@@ -6331,7 +5633,7 @@ var ts;
     }
     ts.isCallLikeExpression = isCallLikeExpression;
     function getInvokedExpression(node) {
-        if (node.kind === 177) {
+        if (node.kind === 181) {
             return node.tag;
         }
         return node.expression;
@@ -6339,21 +5641,21 @@ var ts;
     ts.getInvokedExpression = getInvokedExpression;
     function nodeCanBeDecorated(node) {
         switch (node.kind) {
-            case 222:
+            case 226:
                 return true;
-            case 146:
-                return node.parent.kind === 222;
-            case 150:
+            case 147:
+                return node.parent.kind === 226;
             case 151:
-            case 148:
+            case 152:
+            case 149:
                 return node.body !== undefined
-                    && node.parent.kind === 222;
-            case 143:
+                    && node.parent.kind === 226;
+            case 144:
                 return node.parent.body !== undefined
-                    && (node.parent.kind === 149
-                        || node.parent.kind === 148
-                        || node.parent.kind === 151)
-                    && node.parent.parent.kind === 222;
+                    && (node.parent.kind === 150
+                        || node.parent.kind === 149
+                        || node.parent.kind === 152)
+                    && node.parent.parent.kind === 226;
         }
         return false;
     }
@@ -6369,19 +5671,19 @@ var ts;
     ts.nodeOrChildIsDecorated = nodeOrChildIsDecorated;
     function childIsDecorated(node) {
         switch (node.kind) {
-            case 222:
+            case 226:
                 return ts.forEach(node.members, nodeOrChildIsDecorated);
-            case 148:
-            case 151:
+            case 149:
+            case 152:
                 return ts.forEach(node.parameters, nodeIsDecorated);
         }
     }
     ts.childIsDecorated = childIsDecorated;
     function isJSXTagName(node) {
         var parent = node.parent;
-        if (parent.kind === 244 ||
-            parent.kind === 243 ||
-            parent.kind === 245) {
+        if (parent.kind === 248 ||
+            parent.kind === 247 ||
+            parent.kind === 249) {
             return parent.tagName === node;
         }
         return false;
@@ -6395,43 +5697,43 @@ var ts;
             case 100:
             case 85:
             case 11:
-            case 171:
-            case 172:
-            case 173:
-            case 174:
             case 175:
             case 176:
             case 177:
-            case 196:
             case 178:
-            case 197:
             case 179:
             case 180:
-            case 193:
             case 181:
-            case 184:
+            case 200:
             case 182:
+            case 201:
             case 183:
+            case 184:
+            case 197:
+            case 185:
+            case 188:
             case 186:
             case 187:
-            case 188:
-            case 189:
-            case 192:
             case 190:
-            case 12:
-            case 194:
-            case 242:
-            case 243:
             case 191:
-            case 185:
+            case 192:
+            case 193:
+            case 196:
+            case 194:
+            case 12:
+            case 198:
+            case 246:
+            case 247:
+            case 195:
+            case 189:
                 return true;
-            case 140:
-                while (node.parent.kind === 140) {
+            case 141:
+                while (node.parent.kind === 141) {
                     node = node.parent;
                 }
-                return node.parent.kind === 159 || isJSXTagName(node);
+                return node.parent.kind === 160 || isJSXTagName(node);
             case 70:
-                if (node.parent.kind === 159 || isJSXTagName(node)) {
+                if (node.parent.kind === 160 || isJSXTagName(node)) {
                     return true;
                 }
             case 8:
@@ -6439,47 +5741,47 @@ var ts;
             case 98:
                 var parent_3 = node.parent;
                 switch (parent_3.kind) {
-                    case 219:
-                    case 143:
+                    case 223:
+                    case 144:
+                    case 147:
                     case 146:
-                    case 145:
-                    case 255:
-                    case 253:
-                    case 170:
+                    case 260:
+                    case 257:
+                    case 174:
                         return parent_3.initializer === node;
-                    case 203:
-                    case 204:
-                    case 205:
-                    case 206:
-                    case 212:
-                    case 213:
-                    case 214:
-                    case 249:
-                    case 216:
-                    case 214:
-                        return parent_3.expression === node;
                     case 207:
-                        var forStatement = parent_3;
-                        return (forStatement.initializer === node && forStatement.initializer.kind !== 220) ||
-                            forStatement.condition === node ||
-                            forStatement.incrementor === node;
                     case 208:
                     case 209:
+                    case 210:
+                    case 216:
+                    case 217:
+                    case 218:
+                    case 253:
+                    case 220:
+                    case 218:
+                        return parent_3.expression === node;
+                    case 211:
+                        var forStatement = parent_3;
+                        return (forStatement.initializer === node && forStatement.initializer.kind !== 224) ||
+                            forStatement.condition === node ||
+                            forStatement.incrementor === node;
+                    case 212:
+                    case 213:
                         var forInStatement = parent_3;
-                        return (forInStatement.initializer === node && forInStatement.initializer.kind !== 220) ||
+                        return (forInStatement.initializer === node && forInStatement.initializer.kind !== 224) ||
                             forInStatement.expression === node;
-                    case 178:
-                    case 196:
+                    case 182:
+                    case 200:
                         return node === parent_3.expression;
-                    case 198:
+                    case 202:
                         return node === parent_3.expression;
-                    case 141:
+                    case 142:
                         return node === parent_3.expression;
-                    case 144:
-                    case 248:
-                    case 247:
+                    case 145:
+                    case 252:
+                    case 251:
                         return true;
-                    case 195:
+                    case 199:
                         return parent_3.expression === node && isExpressionWithTypeArgumentsInClassExtendsClause(parent_3);
                     default:
                         if (isPartOfExpression(parent_3)) {
@@ -6497,7 +5799,7 @@ var ts;
     }
     ts.isInstantiatedModule = isInstantiatedModule;
     function isExternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 230 && node.moduleReference.kind === 241;
+        return node.kind === 234 && node.moduleReference.kind === 245;
     }
     ts.isExternalModuleImportEqualsDeclaration = isExternalModuleImportEqualsDeclaration;
     function getExternalModuleImportEqualsDeclarationExpression(node) {
@@ -6506,7 +5808,7 @@ var ts;
     }
     ts.getExternalModuleImportEqualsDeclarationExpression = getExternalModuleImportEqualsDeclarationExpression;
     function isInternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 230 && node.moduleReference.kind !== 241;
+        return node.kind === 234 && node.moduleReference.kind !== 245;
     }
     ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration;
     function isSourceFileJavaScript(file) {
@@ -6514,11 +5816,11 @@ var ts;
     }
     ts.isSourceFileJavaScript = isSourceFileJavaScript;
     function isInJavaScriptFile(node) {
-        return node && !!(node.flags & 1048576);
+        return node && !!(node.flags & 2097152);
     }
     ts.isInJavaScriptFile = isInJavaScriptFile;
     function isRequireCall(expression, checkArgumentIsStringLiteral) {
-        var isRequire = expression.kind === 175 &&
+        var isRequire = expression.kind === 179 &&
             expression.expression.kind === 70 &&
             expression.expression.text === "require" &&
             expression.arguments.length === 1;
@@ -6530,9 +5832,9 @@ var ts;
     }
     ts.isSingleOrDoubleQuote = isSingleOrDoubleQuote;
     function isDeclarationOfFunctionExpression(s) {
-        if (s.valueDeclaration && s.valueDeclaration.kind === 219) {
+        if (s.valueDeclaration && s.valueDeclaration.kind === 223) {
             var declaration = s.valueDeclaration;
-            return declaration.initializer && declaration.initializer.kind === 180;
+            return declaration.initializer && declaration.initializer.kind === 184;
         }
         return false;
     }
@@ -6541,11 +5843,11 @@ var ts;
         if (!isInJavaScriptFile(expression)) {
             return 0;
         }
-        if (expression.kind !== 188) {
+        if (expression.kind !== 192) {
             return 0;
         }
         var expr = expression;
-        if (expr.operatorToken.kind !== 57 || expr.left.kind !== 173) {
+        if (expr.operatorToken.kind !== 57 || expr.left.kind !== 177) {
             return 0;
         }
         var lhs = expr.left;
@@ -6561,7 +5863,7 @@ var ts;
         else if (lhs.expression.kind === 98) {
             return 4;
         }
-        else if (lhs.expression.kind === 173) {
+        else if (lhs.expression.kind === 177) {
             var innerPropertyAccess = lhs.expression;
             if (innerPropertyAccess.expression.kind === 70) {
                 var innerPropertyAccessIdentifier = innerPropertyAccess.expression;
@@ -6577,35 +5879,35 @@ var ts;
     }
     ts.getSpecialPropertyAssignmentKind = getSpecialPropertyAssignmentKind;
     function getExternalModuleName(node) {
-        if (node.kind === 231) {
+        if (node.kind === 235) {
             return node.moduleSpecifier;
         }
-        if (node.kind === 230) {
+        if (node.kind === 234) {
             var reference = node.moduleReference;
-            if (reference.kind === 241) {
+            if (reference.kind === 245) {
                 return reference.expression;
             }
         }
-        if (node.kind === 237) {
+        if (node.kind === 241) {
             return node.moduleSpecifier;
         }
-        if (node.kind === 226 && node.name.kind === 9) {
+        if (node.kind === 230 && node.name.kind === 9) {
             return node.name;
         }
     }
     ts.getExternalModuleName = getExternalModuleName;
     function getNamespaceDeclarationNode(node) {
-        if (node.kind === 230) {
+        if (node.kind === 234) {
             return node;
         }
         var importClause = node.importClause;
-        if (importClause && importClause.namedBindings && importClause.namedBindings.kind === 233) {
+        if (importClause && importClause.namedBindings && importClause.namedBindings.kind === 237) {
             return importClause.namedBindings;
         }
     }
     ts.getNamespaceDeclarationNode = getNamespaceDeclarationNode;
     function isDefaultImport(node) {
-        return node.kind === 231
+        return node.kind === 235
             && node.importClause
             && !!node.importClause.name;
     }
@@ -6613,13 +5915,13 @@ var ts;
     function hasQuestionToken(node) {
         if (node) {
             switch (node.kind) {
-                case 143:
+                case 144:
+                case 149:
                 case 148:
+                case 258:
+                case 257:
                 case 147:
-                case 254:
-                case 253:
                 case 146:
-                case 145:
                     return node.questionToken !== undefined;
             }
         }
@@ -6627,9 +5929,9 @@ var ts;
     }
     ts.hasQuestionToken = hasQuestionToken;
     function isJSDocConstructSignature(node) {
-        return node.kind === 269 &&
+        return node.kind === 274 &&
             node.parameters.length > 0 &&
-            node.parameters[0].type.kind === 271;
+            node.parameters[0].type.kind === 276;
     }
     ts.isJSDocConstructSignature = isJSDocConstructSignature;
     function getJSDocTag(node, kind, checkParentVariableStatement) {
@@ -6680,32 +5982,32 @@ var ts;
         if (checkParentVariableStatement) {
             var isInitializerOfVariableDeclarationInStatement = isVariableLike(node.parent) &&
                 (node.parent).initializer === node &&
-                node.parent.parent.parent.kind === 201;
+                node.parent.parent.parent.kind === 205;
             var isVariableOfVariableDeclarationStatement = isVariableLike(node) &&
-                node.parent.parent.kind === 201;
+                node.parent.parent.kind === 205;
             var variableStatementNode = isInitializerOfVariableDeclarationInStatement ? node.parent.parent.parent :
                 isVariableOfVariableDeclarationStatement ? node.parent.parent :
                     undefined;
             if (variableStatementNode) {
                 result = append(result, getJSDocs(variableStatementNode, checkParentVariableStatement, getDocs, getTags));
             }
-            if (node.kind === 226 &&
-                node.parent && node.parent.kind === 226) {
+            if (node.kind === 230 &&
+                node.parent && node.parent.kind === 230) {
                 result = append(result, getJSDocs(node.parent, checkParentVariableStatement, getDocs, getTags));
             }
             var parent_4 = node.parent;
             var isSourceOfAssignmentExpressionStatement = parent_4 && parent_4.parent &&
-                parent_4.kind === 188 &&
+                parent_4.kind === 192 &&
                 parent_4.operatorToken.kind === 57 &&
-                parent_4.parent.kind === 203;
+                parent_4.parent.kind === 207;
             if (isSourceOfAssignmentExpressionStatement) {
                 result = append(result, getJSDocs(parent_4.parent, checkParentVariableStatement, getDocs, getTags));
             }
-            var isPropertyAssignmentExpression = parent_4 && parent_4.kind === 253;
+            var isPropertyAssignmentExpression = parent_4 && parent_4.kind === 257;
             if (isPropertyAssignmentExpression) {
                 result = append(result, getJSDocs(parent_4, checkParentVariableStatement, getDocs, getTags));
             }
-            if (node.kind === 143) {
+            if (node.kind === 144) {
                 var paramTags = getJSDocParameterTag(node, checkParentVariableStatement);
                 if (paramTags) {
                     result = append(result, getTags(paramTags));
@@ -6730,14 +6032,14 @@ var ts;
         var tags = getJSDocTags(func, checkParentVariableStatement);
         if (!param.name) {
             var i = func.parameters.indexOf(param);
-            var paramTags = ts.filter(tags, function (tag) { return tag.kind === 275; });
+            var paramTags = ts.filter(tags, function (tag) { return tag.kind === 280; });
             if (paramTags && 0 <= i && i < paramTags.length) {
                 return [paramTags[i]];
             }
         }
         else if (param.name.kind === 70) {
             var name_6 = param.name.text;
-            var paramTags = ts.filter(tags, function (tag) { return tag.kind === 275 && tag.parameterName.text === name_6; });
+            var paramTags = ts.filter(tags, function (tag) { return tag.kind === 280 && tag.parameterName.text === name_6; });
             if (paramTags) {
                 return paramTags;
             }
@@ -6747,15 +6049,15 @@ var ts;
         }
     }
     function getJSDocTypeTag(node) {
-        return getJSDocTag(node, 277, false);
+        return getJSDocTag(node, 282, false);
     }
     ts.getJSDocTypeTag = getJSDocTypeTag;
     function getJSDocReturnTag(node) {
-        return getJSDocTag(node, 276, true);
+        return getJSDocTag(node, 281, true);
     }
     ts.getJSDocReturnTag = getJSDocReturnTag;
     function getJSDocTemplateTag(node) {
-        return getJSDocTag(node, 278, false);
+        return getJSDocTag(node, 283, false);
     }
     ts.getJSDocTemplateTag = getJSDocTemplateTag;
     function getCorrespondingJSDocParameterTag(parameter) {
@@ -6767,7 +6069,7 @@ var ts;
             }
             for (var _i = 0, jsDocTags_2 = jsDocTags; _i < jsDocTags_2.length; _i++) {
                 var tag = jsDocTags_2[_i];
-                if (tag.kind === 275) {
+                if (tag.kind === 280) {
                     var parameterTag = tag;
                     if (parameterTag.parameterName.text === parameterName) {
                         return parameterTag;
@@ -6787,13 +6089,13 @@ var ts;
     }
     ts.hasDeclaredRestParameter = hasDeclaredRestParameter;
     function isRestParameter(node) {
-        if (node && (node.flags & 1048576)) {
-            if (node.type && node.type.kind === 270) {
+        if (node && (node.flags & 2097152)) {
+            if (node.type && node.type.kind === 275) {
                 return true;
             }
             var paramTag = getCorrespondingJSDocParameterTag(node);
             if (paramTag && paramTag.typeExpression) {
-                return paramTag.typeExpression.type.kind === 270;
+                return paramTag.typeExpression.type.kind === 275;
             }
         }
         return isDeclaredRestParam(node);
@@ -6803,27 +6105,44 @@ var ts;
         return node && node.dotDotDotToken !== undefined;
     }
     ts.isDeclaredRestParam = isDeclaredRestParam;
-    function isAssignmentTarget(node) {
-        while (node.parent.kind === 179) {
-            node = node.parent;
-        }
+    function getAssignmentTargetKind(node) {
+        var parent = node.parent;
         while (true) {
-            var parent_5 = node.parent;
-            if (parent_5.kind === 171 || parent_5.kind === 192) {
-                node = parent_5;
-                continue;
+            switch (parent.kind) {
+                case 192:
+                    var binaryOperator = parent.operatorToken.kind;
+                    return isAssignmentOperator(binaryOperator) && parent.left === node ?
+                        binaryOperator === 57 ? 1 : 2 :
+                        0;
+                case 190:
+                case 191:
+                    var unaryOperator = parent.operator;
+                    return unaryOperator === 42 || unaryOperator === 43 ? 2 : 0;
+                case 212:
+                case 213:
+                    return parent.initializer === node ? 1 : 0;
+                case 183:
+                case 175:
+                case 196:
+                    node = parent;
+                    break;
+                case 258:
+                    if (parent.name !== node) {
+                        return 0;
+                    }
+                case 257:
+                    node = parent.parent;
+                    break;
+                default:
+                    return 0;
             }
-            if (parent_5.kind === 253 || parent_5.kind === 254) {
-                node = parent_5.parent;
-                continue;
-            }
-            return parent_5.kind === 188 &&
-                isAssignmentOperator(parent_5.operatorToken.kind) &&
-                parent_5.left === node ||
-                (parent_5.kind === 208 || parent_5.kind === 209) &&
-                    parent_5.initializer === node;
+            parent = node.parent;
         }
     }
+    ts.getAssignmentTargetKind = getAssignmentTargetKind;
+    function isAssignmentTarget(node) {
+        return getAssignmentTargetKind(node) !== 0;
+    }
     ts.isAssignmentTarget = isAssignmentTarget;
     function isNodeDescendantOf(node, ancestor) {
         while (node) {
@@ -6836,7 +6155,7 @@ var ts;
     ts.isNodeDescendantOf = isNodeDescendantOf;
     function isInAmbientContext(node) {
         while (node) {
-            if (hasModifier(node, 2) || (node.kind === 256 && node.isDeclarationFile)) {
+            if (hasModifier(node, 2) || (node.kind === 261 && node.isDeclarationFile)) {
                 return true;
             }
             node = node.parent;
@@ -6849,7 +6168,7 @@ var ts;
             return false;
         }
         var parent = name.parent;
-        if (parent.kind === 235 || parent.kind === 239) {
+        if (parent.kind === 239 || parent.kind === 243) {
             if (parent.propertyName) {
                 return true;
             }
@@ -6862,48 +6181,48 @@ var ts;
     ts.isDeclarationName = isDeclarationName;
     function isLiteralComputedPropertyDeclarationName(node) {
         return (node.kind === 9 || node.kind === 8) &&
-            node.parent.kind === 141 &&
+            node.parent.kind === 142 &&
             isDeclaration(node.parent.parent);
     }
     ts.isLiteralComputedPropertyDeclarationName = isLiteralComputedPropertyDeclarationName;
     function isIdentifierName(node) {
         var parent = node.parent;
         switch (parent.kind) {
-            case 146:
-            case 145:
-            case 148:
             case 147:
-            case 150:
+            case 146:
+            case 149:
+            case 148:
             case 151:
-            case 255:
-            case 253:
-            case 173:
+            case 152:
+            case 260:
+            case 257:
+            case 177:
                 return parent.name === node;
-            case 140:
+            case 141:
                 if (parent.right === node) {
-                    while (parent.kind === 140) {
+                    while (parent.kind === 141) {
                         parent = parent.parent;
                     }
-                    return parent.kind === 159;
+                    return parent.kind === 160;
                 }
                 return false;
-            case 170:
-            case 235:
-                return parent.propertyName === node;
+            case 174:
             case 239:
+                return parent.propertyName === node;
+            case 243:
                 return true;
         }
         return false;
     }
     ts.isIdentifierName = isIdentifierName;
     function isAliasSymbolDeclaration(node) {
-        return node.kind === 230 ||
-            node.kind === 229 ||
-            node.kind === 232 && !!node.name ||
+        return node.kind === 234 ||
             node.kind === 233 ||
-            node.kind === 235 ||
+            node.kind === 236 && !!node.name ||
+            node.kind === 237 ||
             node.kind === 239 ||
-            node.kind === 236 && exportAssignmentIsAlias(node);
+            node.kind === 243 ||
+            node.kind === 240 && exportAssignmentIsAlias(node);
     }
     ts.isAliasSymbolDeclaration = isAliasSymbolDeclaration;
     function exportAssignmentIsAlias(node) {
@@ -6989,7 +6308,7 @@ var ts;
     }
     ts.getFileReferenceFromReferencePath = getFileReferenceFromReferencePath;
     function isKeyword(token) {
-        return 71 <= token && token <= 139;
+        return 71 <= token && token <= 140;
     }
     ts.isKeyword = isKeyword;
     function isTrivia(token) {
@@ -7009,7 +6328,7 @@ var ts;
     }
     ts.hasDynamicName = hasDynamicName;
     function isDynamicName(name) {
-        return name.kind === 141 &&
+        return name.kind === 142 &&
             !isStringOrNumericLiteral(name.expression.kind) &&
             !isWellKnownSymbolSyntactically(name.expression);
     }
@@ -7019,10 +6338,10 @@ var ts;
     }
     ts.isWellKnownSymbolSyntactically = isWellKnownSymbolSyntactically;
     function getPropertyNameForPropertyNameNode(name) {
-        if (name.kind === 70 || name.kind === 9 || name.kind === 8 || name.kind === 143) {
+        if (name.kind === 70 || name.kind === 9 || name.kind === 8 || name.kind === 144) {
             return name.text;
         }
-        if (name.kind === 141) {
+        if (name.kind === 142) {
             var nameExpression = name.expression;
             if (isWellKnownSymbolSyntactically(nameExpression)) {
                 var rightHandSideName = nameExpression.name.text;
@@ -7058,7 +6377,7 @@ var ts;
             case 113:
             case 111:
             case 112:
-            case 129:
+            case 130:
             case 114:
                 return true;
         }
@@ -7067,11 +6386,11 @@ var ts;
     ts.isModifierKind = isModifierKind;
     function isParameterDeclaration(node) {
         var root = getRootDeclaration(node);
-        return root.kind === 143;
+        return root.kind === 144;
     }
     ts.isParameterDeclaration = isParameterDeclaration;
     function getRootDeclaration(node) {
-        while (node.kind === 170) {
+        while (node.kind === 174) {
             node = node.parent.parent;
         }
         return node;
@@ -7079,15 +6398,15 @@ var ts;
     ts.getRootDeclaration = getRootDeclaration;
     function nodeStartsNewLexicalEnvironment(node) {
         var kind = node.kind;
-        return kind === 149
-            || kind === 180
-            || kind === 221
-            || kind === 181
-            || kind === 148
-            || kind === 150
+        return kind === 150
+            || kind === 184
+            || kind === 225
+            || kind === 185
+            || kind === 149
             || kind === 151
-            || kind === 226
-            || kind === 256;
+            || kind === 152
+            || kind === 230
+            || kind === 261;
     }
     ts.nodeStartsNewLexicalEnvironment = nodeStartsNewLexicalEnvironment;
     function nodeIsSynthesized(node) {
@@ -7095,13 +6414,13 @@ var ts;
             || ts.positionIsSynthesized(node.end);
     }
     ts.nodeIsSynthesized = nodeIsSynthesized;
-    function getOriginalNode(node) {
+    function getOriginalNode(node, nodeTest) {
         if (node) {
             while (node.original !== undefined) {
                 node = node.original;
             }
         }
-        return node;
+        return !nodeTest || nodeTest(node) ? node : undefined;
     }
     ts.getOriginalNode = getOriginalNode;
     function isParseTreeNode(node) {
@@ -7136,30 +6455,25 @@ var ts;
         return node ? ts.getNodeId(node) : 0;
     }
     ts.getOriginalNodeId = getOriginalNodeId;
-    (function (Associativity) {
-        Associativity[Associativity["Left"] = 0] = "Left";
-        Associativity[Associativity["Right"] = 1] = "Right";
-    })(ts.Associativity || (ts.Associativity = {}));
-    var Associativity = ts.Associativity;
     function getExpressionAssociativity(expression) {
         var operator = getOperator(expression);
-        var hasArguments = expression.kind === 176 && expression.arguments !== undefined;
+        var hasArguments = expression.kind === 180 && expression.arguments !== undefined;
         return getOperatorAssociativity(expression.kind, operator, hasArguments);
     }
     ts.getExpressionAssociativity = getExpressionAssociativity;
     function getOperatorAssociativity(kind, operator, hasArguments) {
         switch (kind) {
-            case 176:
+            case 180:
                 return hasArguments ? 0 : 1;
-            case 186:
-            case 183:
-            case 184:
-            case 182:
-            case 185:
-            case 189:
-            case 191:
-                return 1;
+            case 190:
+            case 187:
             case 188:
+            case 186:
+            case 189:
+            case 193:
+            case 195:
+                return 1;
+            case 192:
                 switch (operator) {
                     case 39:
                     case 57:
@@ -7183,15 +6497,15 @@ var ts;
     ts.getOperatorAssociativity = getOperatorAssociativity;
     function getExpressionPrecedence(expression) {
         var operator = getOperator(expression);
-        var hasArguments = expression.kind === 176 && expression.arguments !== undefined;
+        var hasArguments = expression.kind === 180 && expression.arguments !== undefined;
         return getOperatorPrecedence(expression.kind, operator, hasArguments);
     }
     ts.getExpressionPrecedence = getExpressionPrecedence;
     function getOperator(expression) {
-        if (expression.kind === 188) {
+        if (expression.kind === 192) {
             return expression.operatorToken.kind;
         }
-        else if (expression.kind === 186 || expression.kind === 187) {
+        else if (expression.kind === 190 || expression.kind === 191) {
             return expression.operator;
         }
         else {
@@ -7209,36 +6523,36 @@ var ts;
             case 85:
             case 8:
             case 9:
-            case 171:
-            case 172:
-            case 180:
-            case 181:
-            case 193:
-            case 242:
-            case 243:
+            case 175:
+            case 176:
+            case 184:
+            case 185:
+            case 197:
+            case 246:
+            case 247:
             case 11:
             case 12:
-            case 190:
-            case 179:
             case 194:
-                return 19;
-            case 177:
-            case 173:
-            case 174:
-                return 18;
-            case 176:
-                return hasArguments ? 18 : 17;
-            case 175:
-                return 17;
-            case 187:
-                return 16;
-            case 186:
             case 183:
-            case 184:
-            case 182:
-            case 185:
-                return 15;
+            case 198:
+                return 19;
+            case 181:
+            case 177:
+            case 178:
+                return 18;
+            case 180:
+                return hasArguments ? 18 : 17;
+            case 179:
+                return 17;
+            case 191:
+                return 16;
+            case 190:
+            case 187:
             case 188:
+            case 186:
+            case 189:
+                return 15;
+            case 192:
                 switch (operatorKind) {
                     case 50:
                     case 51:
@@ -7296,11 +6610,11 @@ var ts;
                     default:
                         return -1;
                 }
-            case 189:
+            case 193:
                 return 4;
-            case 191:
+            case 195:
                 return 2;
-            case 192:
+            case 196:
                 return 1;
             default:
                 return -1;
@@ -7546,20 +6860,30 @@ var ts;
         if (options.outFile || options.out) {
             var moduleKind = ts.getEmitModuleKind(options);
             var moduleEmitEnabled = moduleKind === ts.ModuleKind.AMD || moduleKind === ts.ModuleKind.System;
-            var sourceFiles = host.getSourceFiles();
+            var sourceFiles = getAllEmittableSourceFiles();
             return ts.filter(sourceFiles, moduleEmitEnabled ? isNonDeclarationFile : isBundleEmitNonExternalModule);
         }
         else {
-            var sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
-            return ts.filter(sourceFiles, isNonDeclarationFile);
+            var sourceFiles = targetSourceFile === undefined ? getAllEmittableSourceFiles() : [targetSourceFile];
+            return filterSourceFilesInDirectory(sourceFiles, function (file) { return host.isSourceFileFromExternalLibrary(file); });
+        }
+        function getAllEmittableSourceFiles() {
+            return options.noEmitForJsFiles ? ts.filter(host.getSourceFiles(), function (sourceFile) { return !isSourceFileJavaScript(sourceFile); }) : host.getSourceFiles();
         }
     }
     ts.getSourceFilesToEmit = getSourceFilesToEmit;
+    function filterSourceFilesInDirectory(sourceFiles, isSourceFileFromExternalLibrary) {
+        return ts.filter(sourceFiles, function (file) { return shouldEmitInDirectory(file, isSourceFileFromExternalLibrary); });
+    }
+    ts.filterSourceFilesInDirectory = filterSourceFilesInDirectory;
     function isNonDeclarationFile(sourceFile) {
         return !isDeclarationFile(sourceFile);
     }
+    function shouldEmitInDirectory(sourceFile, isSourceFileFromExternalLibrary) {
+        return isNonDeclarationFile(sourceFile) && !isSourceFileFromExternalLibrary(sourceFile);
+    }
     function isBundleEmitNonExternalModule(sourceFile) {
-        return !isDeclarationFile(sourceFile) && !ts.isExternalModule(sourceFile);
+        return isNonDeclarationFile(sourceFile) && !ts.isExternalModule(sourceFile);
     }
     function forEachTransformedEmitFile(host, sourceFiles, action, emitOnlyDtsFiles) {
         var options = host.getCompilerOptions();
@@ -7610,10 +6934,10 @@ var ts;
             onBundledEmit(host);
         }
         else {
-            var sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
+            var sourceFiles = targetSourceFile === undefined ? getSourceFilesToEmit(host) : [targetSourceFile];
             for (var _i = 0, sourceFiles_3 = sourceFiles; _i < sourceFiles_3.length; _i++) {
                 var sourceFile = sourceFiles_3[_i];
-                if (!isDeclarationFile(sourceFile) && !host.isSourceFileFromExternalLibrary(sourceFile)) {
+                if (shouldEmitInDirectory(sourceFile, function (file) { return host.isSourceFileFromExternalLibrary(file); })) {
                     onSingleFileEmit(host, sourceFile);
                 }
             }
@@ -7640,7 +6964,7 @@ var ts;
             action(emitFileNames, [sourceFile], false, emitOnlyDtsFiles);
         }
         function onBundledEmit(host) {
-            var bundledSources = ts.filter(host.getSourceFiles(), function (sourceFile) { return !isDeclarationFile(sourceFile) &&
+            var bundledSources = ts.filter(getSourceFilesToEmit(host), function (sourceFile) { return !isDeclarationFile(sourceFile) &&
                 !host.isSourceFileFromExternalLibrary(sourceFile) &&
                 (!ts.isExternalModule(sourceFile) ||
                     !!ts.getEmitModuleKind(options)); });
@@ -7680,7 +7004,7 @@ var ts;
     ts.getLineOfLocalPositionFromLineMap = getLineOfLocalPositionFromLineMap;
     function getFirstConstructorWithBody(node) {
         return ts.forEach(node.members, function (member) {
-            if (member.kind === 149 && nodeIsPresent(member.body)) {
+            if (member.kind === 150 && nodeIsPresent(member.body)) {
                 return member;
             }
         });
@@ -7721,10 +7045,10 @@ var ts;
         var setAccessor;
         if (hasDynamicName(accessor)) {
             firstAccessor = accessor;
-            if (accessor.kind === 150) {
+            if (accessor.kind === 151) {
                 getAccessor = accessor;
             }
-            else if (accessor.kind === 151) {
+            else if (accessor.kind === 152) {
                 setAccessor = accessor;
             }
             else {
@@ -7733,7 +7057,7 @@ var ts;
         }
         else {
             ts.forEach(declarations, function (member) {
-                if ((member.kind === 150 || member.kind === 151)
+                if ((member.kind === 151 || member.kind === 152)
                     && hasModifier(member, 32) === hasModifier(accessor, 32)) {
                     var memberName = getPropertyNameForPropertyNameNode(member.name);
                     var accessorName = getPropertyNameForPropertyNameNode(accessor.name);
@@ -7744,10 +7068,10 @@ var ts;
                         else if (!secondAccessor) {
                             secondAccessor = member;
                         }
-                        if (member.kind === 150 && !getAccessor) {
+                        if (member.kind === 151 && !getAccessor) {
                             getAccessor = member;
                         }
-                        if (member.kind === 151 && !setAccessor) {
+                        if (member.kind === 152 && !setAccessor) {
                             setAccessor = member;
                         }
                     }
@@ -7930,7 +7254,7 @@ var ts;
                 flags |= modifierToFlag(modifier.kind);
             }
         }
-        if (node.flags & 4) {
+        if (node.flags & 4 || (node.kind === 70 && node.isInJSDocNamespace)) {
             flags |= 1;
         }
         node.modifierFlagsCache = flags | 536870912;
@@ -7949,7 +7273,7 @@ var ts;
             case 75: return 2048;
             case 78: return 512;
             case 119: return 256;
-            case 129: return 64;
+            case 130: return 64;
         }
         return 0;
     }
@@ -7965,19 +7289,25 @@ var ts;
     }
     ts.isAssignmentOperator = isAssignmentOperator;
     function tryGetClassExtendingExpressionWithTypeArguments(node) {
-        if (node.kind === 195 &&
+        if (node.kind === 199 &&
             node.parent.token === 84 &&
             isClassLike(node.parent.parent)) {
             return node.parent.parent;
         }
     }
     ts.tryGetClassExtendingExpressionWithTypeArguments = tryGetClassExtendingExpressionWithTypeArguments;
+    function isAssignmentExpression(node) {
+        return isBinaryExpression(node)
+            && isAssignmentOperator(node.operatorToken.kind)
+            && isLeftHandSideExpression(node.left);
+    }
+    ts.isAssignmentExpression = isAssignmentExpression;
     function isDestructuringAssignment(node) {
         if (isBinaryExpression(node)) {
             if (node.operatorToken.kind === 57) {
                 var kind = node.left.kind;
-                return kind === 172
-                    || kind === 171;
+                return kind === 176
+                    || kind === 175;
             }
         }
         return false;
@@ -8004,20 +7334,20 @@ var ts;
     ts.isExpressionWithTypeArgumentsInClassExtendsClause = isExpressionWithTypeArgumentsInClassExtendsClause;
     function isEntityNameExpression(node) {
         return node.kind === 70 ||
-            node.kind === 173 && isEntityNameExpression(node.expression);
+            node.kind === 177 && isEntityNameExpression(node.expression);
     }
     ts.isEntityNameExpression = isEntityNameExpression;
     function isRightSideOfQualifiedNameOrPropertyAccess(node) {
-        return (node.parent.kind === 140 && node.parent.right === node) ||
-            (node.parent.kind === 173 && node.parent.name === node);
+        return (node.parent.kind === 141 && node.parent.right === node) ||
+            (node.parent.kind === 177 && node.parent.name === node);
     }
     ts.isRightSideOfQualifiedNameOrPropertyAccess = isRightSideOfQualifiedNameOrPropertyAccess;
     function isEmptyObjectLiteralOrArrayLiteral(expression) {
         var kind = expression.kind;
-        if (kind === 172) {
+        if (kind === 176) {
             return expression.properties.length === 0;
         }
-        if (kind === 171) {
+        if (kind === 175) {
             return expression.elements.length === 0;
         }
         return false;
@@ -8151,39 +7481,39 @@ var ts;
                 || kind === 94) {
                 return true;
             }
-            else if (kind === 173) {
+            else if (kind === 177) {
                 return isSimpleExpressionWorker(node.expression, depth + 1);
             }
-            else if (kind === 174) {
+            else if (kind === 178) {
                 return isSimpleExpressionWorker(node.expression, depth + 1)
                     && isSimpleExpressionWorker(node.argumentExpression, depth + 1);
             }
-            else if (kind === 186
-                || kind === 187) {
+            else if (kind === 190
+                || kind === 191) {
                 return isSimpleExpressionWorker(node.operand, depth + 1);
             }
-            else if (kind === 188) {
+            else if (kind === 192) {
                 return node.operatorToken.kind !== 39
                     && isSimpleExpressionWorker(node.left, depth + 1)
                     && isSimpleExpressionWorker(node.right, depth + 1);
             }
-            else if (kind === 189) {
+            else if (kind === 193) {
                 return isSimpleExpressionWorker(node.condition, depth + 1)
                     && isSimpleExpressionWorker(node.whenTrue, depth + 1)
                     && isSimpleExpressionWorker(node.whenFalse, depth + 1);
             }
-            else if (kind === 184
-                || kind === 183
-                || kind === 182) {
+            else if (kind === 188
+                || kind === 187
+                || kind === 186) {
                 return isSimpleExpressionWorker(node.expression, depth + 1);
             }
-            else if (kind === 171) {
+            else if (kind === 175) {
                 return node.elements.length === 0;
             }
-            else if (kind === 172) {
+            else if (kind === 176) {
                 return node.properties.length === 0;
             }
-            else if (kind === 175) {
+            else if (kind === 179) {
                 if (!isSimpleExpressionWorker(node.expression, depth + 1)) {
                     return false;
                 }
@@ -8289,23 +7619,26 @@ var ts;
         return ts.positionIsSynthesized(range.pos) ? -1 : ts.skipTrivia(sourceFile.text, range.pos);
     }
     ts.getStartPositionOfRange = getStartPositionOfRange;
-    function collectExternalModuleInfo(sourceFile) {
+    function collectExternalModuleInfo(sourceFile, resolver) {
         var externalImports = [];
         var exportSpecifiers = ts.createMap();
+        var exportedBindings = ts.createMap();
+        var uniqueExports = ts.createMap();
+        var hasExportDefault = false;
         var exportEquals = undefined;
         var hasExportStarsToExportValues = false;
         for (var _i = 0, _a = sourceFile.statements; _i < _a.length; _i++) {
             var node = _a[_i];
             switch (node.kind) {
-                case 231:
+                case 235:
                     externalImports.push(node);
                     break;
-                case 230:
-                    if (node.moduleReference.kind === 241) {
+                case 234:
+                    if (node.moduleReference.kind === 245) {
                         externalImports.push(node);
                     }
                     break;
-                case 237:
+                case 241:
                     if (node.moduleSpecifier) {
                         if (!node.exportClause) {
                             externalImports.push(node);
@@ -8318,21 +7651,102 @@ var ts;
                     else {
                         for (var _b = 0, _c = node.exportClause.elements; _b < _c.length; _b++) {
                             var specifier = _c[_b];
-                            var name_8 = (specifier.propertyName || specifier.name).text;
-                            (exportSpecifiers[name_8] || (exportSpecifiers[name_8] = [])).push(specifier);
+                            if (!uniqueExports[specifier.name.text]) {
+                                var name_8 = specifier.propertyName || specifier.name;
+                                ts.multiMapAdd(exportSpecifiers, name_8.text, specifier);
+                                var decl = resolver.getReferencedImportDeclaration(name_8)
+                                    || resolver.getReferencedValueDeclaration(name_8);
+                                if (decl) {
+                                    ts.multiMapAdd(exportedBindings, getOriginalNodeId(decl), specifier.name);
+                                }
+                                uniqueExports[specifier.name.text] = specifier.name;
+                            }
                         }
                     }
                     break;
-                case 236:
+                case 240:
                     if (node.isExportEquals && !exportEquals) {
                         exportEquals = node;
                     }
                     break;
+                case 205:
+                    if (hasModifier(node, 1)) {
+                        for (var _d = 0, _e = node.declarationList.declarations; _d < _e.length; _d++) {
+                            var decl = _e[_d];
+                            collectExportedVariableInfo(decl, uniqueExports);
+                        }
+                    }
+                    break;
+                case 225:
+                    if (hasModifier(node, 1)) {
+                        if (hasModifier(node, 512)) {
+                            if (!hasExportDefault) {
+                                ts.multiMapAdd(exportedBindings, getOriginalNodeId(node), ts.getDeclarationName(node));
+                                hasExportDefault = true;
+                            }
+                        }
+                        else {
+                            var name_9 = node.name;
+                            if (!uniqueExports[name_9.text]) {
+                                ts.multiMapAdd(exportedBindings, getOriginalNodeId(node), name_9);
+                                uniqueExports[name_9.text] = name_9;
+                            }
+                        }
+                    }
+                    break;
+                case 226:
+                    if (hasModifier(node, 1)) {
+                        if (hasModifier(node, 512)) {
+                            if (!hasExportDefault) {
+                                ts.multiMapAdd(exportedBindings, getOriginalNodeId(node), ts.getDeclarationName(node));
+                                hasExportDefault = true;
+                            }
+                        }
+                        else {
+                            var name_10 = node.name;
+                            if (!uniqueExports[name_10.text]) {
+                                ts.multiMapAdd(exportedBindings, getOriginalNodeId(node), name_10);
+                                uniqueExports[name_10.text] = name_10;
+                            }
+                        }
+                    }
+                    break;
             }
         }
-        return { externalImports: externalImports, exportSpecifiers: exportSpecifiers, exportEquals: exportEquals, hasExportStarsToExportValues: hasExportStarsToExportValues };
+        var exportedNames;
+        for (var key in uniqueExports) {
+            exportedNames = ts.append(exportedNames, uniqueExports[key]);
+        }
+        return { externalImports: externalImports, exportSpecifiers: exportSpecifiers, exportEquals: exportEquals, hasExportStarsToExportValues: hasExportStarsToExportValues, exportedBindings: exportedBindings, exportedNames: exportedNames };
     }
     ts.collectExternalModuleInfo = collectExternalModuleInfo;
+    function collectExportedVariableInfo(decl, uniqueExports) {
+        if (isBindingPattern(decl.name)) {
+            for (var _i = 0, _a = decl.name.elements; _i < _a.length; _i++) {
+                var element = _a[_i];
+                if (!isOmittedExpression(element)) {
+                    collectExportedVariableInfo(element, uniqueExports);
+                }
+            }
+        }
+        else if (!isGeneratedIdentifier(decl.name)) {
+            if (!uniqueExports[decl.name.text]) {
+                uniqueExports[decl.name.text] = decl.name;
+            }
+        }
+    }
+    function isDeclarationNameOfEnumOrNamespace(node) {
+        var parseNode = getParseTreeNode(node);
+        if (parseNode) {
+            switch (parseNode.parent.kind) {
+                case 229:
+                case 230:
+                    return parseNode === parseNode.parent.name;
+            }
+        }
+        return false;
+    }
+    ts.isDeclarationNameOfEnumOrNamespace = isDeclarationNameOfEnumOrNamespace;
     function getInitializedVariables(node) {
         return ts.filter(node.declarations, isInitializedVariable);
     }
@@ -8344,7 +7758,7 @@ var ts;
         if (node.symbol) {
             for (var _i = 0, _a = node.symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 222 && declaration !== node) {
+                if (declaration.kind === 226 && declaration !== node) {
                     return true;
                 }
             }
@@ -8404,16 +7818,16 @@ var ts;
     }
     ts.isModifier = isModifier;
     function isQualifiedName(node) {
-        return node.kind === 140;
+        return node.kind === 141;
     }
     ts.isQualifiedName = isQualifiedName;
     function isComputedPropertyName(node) {
-        return node.kind === 141;
+        return node.kind === 142;
     }
     ts.isComputedPropertyName = isComputedPropertyName;
     function isEntityName(node) {
         var kind = node.kind;
-        return kind === 140
+        return kind === 141
             || kind === 70;
     }
     ts.isEntityName = isEntityName;
@@ -8422,7 +7836,7 @@ var ts;
         return kind === 70
             || kind === 9
             || kind === 8
-            || kind === 141;
+            || kind === 142;
     }
     ts.isPropertyName = isPropertyName;
     function isModuleName(node) {
@@ -8434,57 +7848,58 @@ var ts;
     function isBindingName(node) {
         var kind = node.kind;
         return kind === 70
-            || kind === 168
-            || kind === 169;
+            || kind === 172
+            || kind === 173;
     }
     ts.isBindingName = isBindingName;
     function isTypeParameter(node) {
-        return node.kind === 142;
+        return node.kind === 143;
     }
     ts.isTypeParameter = isTypeParameter;
     function isParameter(node) {
-        return node.kind === 143;
+        return node.kind === 144;
     }
     ts.isParameter = isParameter;
     function isDecorator(node) {
-        return node.kind === 144;
+        return node.kind === 145;
     }
     ts.isDecorator = isDecorator;
     function isMethodDeclaration(node) {
-        return node.kind === 148;
+        return node.kind === 149;
     }
     ts.isMethodDeclaration = isMethodDeclaration;
     function isClassElement(node) {
         var kind = node.kind;
-        return kind === 149
-            || kind === 146
-            || kind === 148
-            || kind === 150
+        return kind === 150
+            || kind === 147
+            || kind === 149
             || kind === 151
-            || kind === 154
-            || kind === 199;
+            || kind === 152
+            || kind === 155
+            || kind === 203;
     }
     ts.isClassElement = isClassElement;
     function isObjectLiteralElementLike(node) {
         var kind = node.kind;
-        return kind === 253
-            || kind === 254
-            || kind === 148
-            || kind === 150
+        return kind === 257
+            || kind === 258
+            || kind === 259
+            || kind === 149
             || kind === 151
-            || kind === 240;
+            || kind === 152
+            || kind === 244;
     }
     ts.isObjectLiteralElementLike = isObjectLiteralElementLike;
     function isTypeNodeKind(kind) {
-        return (kind >= 155 && kind <= 167)
+        return (kind >= 156 && kind <= 171)
             || kind === 118
-            || kind === 131
+            || kind === 132
             || kind === 121
-            || kind === 133
             || kind === 134
+            || kind === 135
             || kind === 104
-            || kind === 128
-            || kind === 195;
+            || kind === 129
+            || kind === 199;
     }
     function isTypeNode(node) {
         return isTypeNodeKind(node.kind);
@@ -8493,94 +7908,102 @@ var ts;
     function isBindingPattern(node) {
         if (node) {
             var kind = node.kind;
-            return kind === 169
-                || kind === 168;
+            return kind === 173
+                || kind === 172;
         }
         return false;
     }
     ts.isBindingPattern = isBindingPattern;
     function isBindingElement(node) {
-        return node.kind === 170;
+        return node.kind === 174;
     }
     ts.isBindingElement = isBindingElement;
     function isArrayBindingElement(node) {
         var kind = node.kind;
-        return kind === 170
-            || kind === 194;
+        return kind === 174
+            || kind === 198;
     }
     ts.isArrayBindingElement = isArrayBindingElement;
+    function isArrayLiteralExpression(node) {
+        return node.kind === 175;
+    }
+    ts.isArrayLiteralExpression = isArrayLiteralExpression;
+    function isObjectLiteralExpression(node) {
+        return node.kind === 176;
+    }
+    ts.isObjectLiteralExpression = isObjectLiteralExpression;
     function isPropertyAccessExpression(node) {
-        return node.kind === 173;
+        return node.kind === 177;
     }
     ts.isPropertyAccessExpression = isPropertyAccessExpression;
     function isElementAccessExpression(node) {
-        return node.kind === 174;
+        return node.kind === 178;
     }
     ts.isElementAccessExpression = isElementAccessExpression;
     function isBinaryExpression(node) {
-        return node.kind === 188;
+        return node.kind === 192;
     }
     ts.isBinaryExpression = isBinaryExpression;
     function isConditionalExpression(node) {
-        return node.kind === 189;
+        return node.kind === 193;
     }
     ts.isConditionalExpression = isConditionalExpression;
     function isCallExpression(node) {
-        return node.kind === 175;
+        return node.kind === 179;
     }
     ts.isCallExpression = isCallExpression;
     function isTemplateLiteral(node) {
         var kind = node.kind;
-        return kind === 190
+        return kind === 194
             || kind === 12;
     }
     ts.isTemplateLiteral = isTemplateLiteral;
-    function isSpreadElementExpression(node) {
-        return node.kind === 192;
+    function isSpreadExpression(node) {
+        return node.kind === 196;
     }
-    ts.isSpreadElementExpression = isSpreadElementExpression;
+    ts.isSpreadExpression = isSpreadExpression;
     function isExpressionWithTypeArguments(node) {
-        return node.kind === 195;
+        return node.kind === 199;
     }
     ts.isExpressionWithTypeArguments = isExpressionWithTypeArguments;
     function isLeftHandSideExpressionKind(kind) {
-        return kind === 173
-            || kind === 174
-            || kind === 176
-            || kind === 175
-            || kind === 242
-            || kind === 243
-            || kind === 177
-            || kind === 171
-            || kind === 179
-            || kind === 172
-            || kind === 193
+        return kind === 177
+            || kind === 178
             || kind === 180
+            || kind === 179
+            || kind === 246
+            || kind === 247
+            || kind === 181
+            || kind === 175
+            || kind === 183
+            || kind === 176
+            || kind === 197
+            || kind === 184
             || kind === 70
             || kind === 11
             || kind === 8
             || kind === 9
             || kind === 12
-            || kind === 190
+            || kind === 194
             || kind === 85
             || kind === 94
             || kind === 98
             || kind === 100
             || kind === 96
-            || kind === 197;
+            || kind === 201;
     }
     function isLeftHandSideExpression(node) {
         return isLeftHandSideExpressionKind(ts.skipPartiallyEmittedExpressions(node).kind);
     }
     ts.isLeftHandSideExpression = isLeftHandSideExpression;
     function isUnaryExpressionKind(kind) {
-        return kind === 186
+        return kind === 190
+            || kind === 191
+            || kind === 186
             || kind === 187
+            || kind === 188
+            || kind === 189
             || kind === 182
-            || kind === 183
-            || kind === 184
-            || kind === 185
-            || kind === 178
             || isLeftHandSideExpressionKind(kind);
     }
     function isUnaryExpression(node) {
@@ -8588,13 +8011,13 @@ var ts;
     }
     ts.isUnaryExpression = isUnaryExpression;
     function isExpressionKind(kind) {
-        return kind === 189
-            || kind === 191
-            || kind === 181
-            || kind === 188
+        return kind === 193
+            || kind === 195
+            || kind === 185
             || kind === 192
             || kind === 196
-            || kind === 194
+            || kind === 200
+            || kind === 198
             || isUnaryExpressionKind(kind);
     }
     function isExpression(node) {
@@ -8603,16 +8026,16 @@ var ts;
     ts.isExpression = isExpression;
     function isAssertionExpression(node) {
         var kind = node.kind;
-        return kind === 178
-            || kind === 196;
+        return kind === 182
+            || kind === 200;
     }
     ts.isAssertionExpression = isAssertionExpression;
     function isPartiallyEmittedExpression(node) {
-        return node.kind === 288;
+        return node.kind === 293;
     }
     ts.isPartiallyEmittedExpression = isPartiallyEmittedExpression;
     function isNotEmittedStatement(node) {
-        return node.kind === 287;
+        return node.kind === 292;
     }
     ts.isNotEmittedStatement = isNotEmittedStatement;
     function isNotEmittedOrPartiallyEmittedNode(node) {
@@ -8621,15 +8044,15 @@ var ts;
     }
     ts.isNotEmittedOrPartiallyEmittedNode = isNotEmittedOrPartiallyEmittedNode;
     function isOmittedExpression(node) {
-        return node.kind === 194;
+        return node.kind === 198;
     }
     ts.isOmittedExpression = isOmittedExpression;
     function isTemplateSpan(node) {
-        return node.kind === 198;
+        return node.kind === 202;
     }
     ts.isTemplateSpan = isTemplateSpan;
     function isBlock(node) {
-        return node.kind === 200;
+        return node.kind === 204;
     }
     ts.isBlock = isBlock;
     function isConciseBody(node) {
@@ -8647,119 +8070,121 @@ var ts;
     }
     ts.isForInitializer = isForInitializer;
     function isVariableDeclaration(node) {
-        return node.kind === 219;
+        return node.kind === 223;
     }
     ts.isVariableDeclaration = isVariableDeclaration;
     function isVariableDeclarationList(node) {
-        return node.kind === 220;
+        return node.kind === 224;
     }
     ts.isVariableDeclarationList = isVariableDeclarationList;
     function isCaseBlock(node) {
-        return node.kind === 228;
+        return node.kind === 232;
     }
     ts.isCaseBlock = isCaseBlock;
     function isModuleBody(node) {
         var kind = node.kind;
-        return kind === 227
-            || kind === 226;
+        return kind === 231
+            || kind === 230;
     }
     ts.isModuleBody = isModuleBody;
     function isImportEqualsDeclaration(node) {
-        return node.kind === 230;
+        return node.kind === 234;
     }
     ts.isImportEqualsDeclaration = isImportEqualsDeclaration;
     function isImportClause(node) {
-        return node.kind === 232;
+        return node.kind === 236;
     }
     ts.isImportClause = isImportClause;
     function isNamedImportBindings(node) {
         var kind = node.kind;
-        return kind === 234
-            || kind === 233;
+        return kind === 238
+            || kind === 237;
     }
     ts.isNamedImportBindings = isNamedImportBindings;
     function isImportSpecifier(node) {
-        return node.kind === 235;
+        return node.kind === 239;
     }
     ts.isImportSpecifier = isImportSpecifier;
     function isNamedExports(node) {
-        return node.kind === 238;
+        return node.kind === 242;
     }
     ts.isNamedExports = isNamedExports;
     function isExportSpecifier(node) {
-        return node.kind === 239;
+        return node.kind === 243;
     }
     ts.isExportSpecifier = isExportSpecifier;
     function isModuleOrEnumDeclaration(node) {
-        return node.kind === 226 || node.kind === 225;
+        return node.kind === 230 || node.kind === 229;
     }
     ts.isModuleOrEnumDeclaration = isModuleOrEnumDeclaration;
     function isDeclarationKind(kind) {
-        return kind === 181
-            || kind === 170
-            || kind === 222
-            || kind === 193
-            || kind === 149
-            || kind === 225
-            || kind === 255
-            || kind === 239
-            || kind === 221
-            || kind === 180
-            || kind === 150
-            || kind === 232
-            || kind === 230
-            || kind === 235
-            || kind === 223
-            || kind === 148
-            || kind === 147
+        return kind === 185
+            || kind === 174
             || kind === 226
+            || kind === 197
+            || kind === 150
             || kind === 229
-            || kind === 233
-            || kind === 143
-            || kind === 253
-            || kind === 146
-            || kind === 145
+            || kind === 260
+            || kind === 243
+            || kind === 225
+            || kind === 184
             || kind === 151
-            || kind === 254
-            || kind === 224
-            || kind === 142
-            || kind === 219
-            || kind === 279;
+            || kind === 236
+            || kind === 234
+            || kind === 239
+            || kind === 227
+            || kind === 149
+            || kind === 148
+            || kind === 230
+            || kind === 233
+            || kind === 237
+            || kind === 144
+            || kind === 257
+            || kind === 147
+            || kind === 146
+            || kind === 152
+            || kind === 258
+            || kind === 228
+            || kind === 143
+            || kind === 223
+            || kind === 284;
     }
     function isDeclarationStatementKind(kind) {
-        return kind === 221
-            || kind === 240
-            || kind === 222
-            || kind === 223
-            || kind === 224
-            || kind === 225
+        return kind === 225
+            || kind === 244
             || kind === 226
-            || kind === 231
+            || kind === 227
+            || kind === 228
+            || kind === 229
             || kind === 230
-            || kind === 237
-            || kind === 236
-            || kind === 229;
+            || kind === 235
+            || kind === 234
+            || kind === 241
+            || kind === 240
+            || kind === 233;
     }
     function isStatementKindButNotDeclarationKind(kind) {
-        return kind === 211
-            || kind === 210
-            || kind === 218
-            || kind === 205
-            || kind === 203
-            || kind === 202
-            || kind === 208
+        return kind === 215
+            || kind === 214
+            || kind === 222
             || kind === 209
             || kind === 207
-            || kind === 204
-            || kind === 215
-            || kind === 212
-            || kind === 214
-            || kind === 216
-            || kind === 217
-            || kind === 201
             || kind === 206
+            || kind === 212
             || kind === 213
-            || kind === 287;
+            || kind === 211
+            || kind === 208
+            || kind === 219
+            || kind === 216
+            || kind === 218
+            || kind === 220
+            || kind === 221
+            || kind === 205
+            || kind === 210
+            || kind === 217
+            || kind === 292
+            || kind === 295
+            || kind === 294;
     }
     function isDeclaration(node) {
         return isDeclarationKind(node.kind);
@@ -8777,87 +8202,87 @@ var ts;
         var kind = node.kind;
         return isStatementKindButNotDeclarationKind(kind)
             || isDeclarationStatementKind(kind)
-            || kind === 200;
+            || kind === 204;
     }
     ts.isStatement = isStatement;
     function isModuleReference(node) {
         var kind = node.kind;
-        return kind === 241
-            || kind === 140
+        return kind === 245
+            || kind === 141
             || kind === 70;
     }
     ts.isModuleReference = isModuleReference;
     function isJsxOpeningElement(node) {
-        return node.kind === 244;
+        return node.kind === 248;
     }
     ts.isJsxOpeningElement = isJsxOpeningElement;
     function isJsxClosingElement(node) {
-        return node.kind === 245;
+        return node.kind === 249;
     }
     ts.isJsxClosingElement = isJsxClosingElement;
     function isJsxTagNameExpression(node) {
         var kind = node.kind;
         return kind === 98
             || kind === 70
-            || kind === 173;
+            || kind === 177;
     }
     ts.isJsxTagNameExpression = isJsxTagNameExpression;
     function isJsxChild(node) {
         var kind = node.kind;
-        return kind === 242
-            || kind === 248
-            || kind === 243
+        return kind === 246
+            || kind === 252
+            || kind === 247
             || kind === 10;
     }
     ts.isJsxChild = isJsxChild;
     function isJsxAttributeLike(node) {
         var kind = node.kind;
-        return kind === 246
-            || kind === 247;
+        return kind === 250
+            || kind === 251;
     }
     ts.isJsxAttributeLike = isJsxAttributeLike;
     function isJsxSpreadAttribute(node) {
-        return node.kind === 247;
+        return node.kind === 251;
     }
     ts.isJsxSpreadAttribute = isJsxSpreadAttribute;
     function isJsxAttribute(node) {
-        return node.kind === 246;
+        return node.kind === 250;
     }
     ts.isJsxAttribute = isJsxAttribute;
     function isStringLiteralOrJsxExpression(node) {
         var kind = node.kind;
         return kind === 9
-            || kind === 248;
+            || kind === 252;
     }
     ts.isStringLiteralOrJsxExpression = isStringLiteralOrJsxExpression;
     function isCaseOrDefaultClause(node) {
         var kind = node.kind;
-        return kind === 249
-            || kind === 250;
+        return kind === 253
+            || kind === 254;
     }
     ts.isCaseOrDefaultClause = isCaseOrDefaultClause;
     function isHeritageClause(node) {
-        return node.kind === 251;
+        return node.kind === 255;
     }
     ts.isHeritageClause = isHeritageClause;
     function isCatchClause(node) {
-        return node.kind === 252;
+        return node.kind === 256;
     }
     ts.isCatchClause = isCatchClause;
     function isPropertyAssignment(node) {
-        return node.kind === 253;
+        return node.kind === 257;
     }
     ts.isPropertyAssignment = isPropertyAssignment;
     function isShorthandPropertyAssignment(node) {
-        return node.kind === 254;
+        return node.kind === 258;
     }
     ts.isShorthandPropertyAssignment = isShorthandPropertyAssignment;
     function isEnumMember(node) {
-        return node.kind === 255;
+        return node.kind === 260;
     }
     ts.isEnumMember = isEnumMember;
     function isSourceFile(node) {
-        return node.kind === 256;
+        return node.kind === 261;
     }
     ts.isSourceFile = isSourceFile;
     function isWatchSet(options) {
@@ -8868,6 +8293,7 @@ var ts;
 (function (ts) {
     function getDefaultLibFileName(options) {
         switch (options.target) {
+            case 5:
             case 4:
                 return "lib.es2017.d.ts";
             case 3:
@@ -8995,9 +8421,9 @@ var ts;
     }
     ts.collapseTextChangeRangesAcrossMultipleVersions = collapseTextChangeRangesAcrossMultipleVersions;
     function getTypeParameterOwner(d) {
-        if (d && d.kind === 142) {
+        if (d && d.kind === 143) {
             for (var current = d; current; current = current.parent) {
-                if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 223) {
+                if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 227) {
                     return current;
                 }
             }
@@ -9005,11 +8431,11 @@ var ts;
     }
     ts.getTypeParameterOwner = getTypeParameterOwner;
     function isParameterPropertyDeclaration(node) {
-        return ts.hasModifier(node, 92) && node.parent.kind === 149 && ts.isClassLike(node.parent.parent);
+        return ts.hasModifier(node, 92) && node.parent.kind === 150 && ts.isClassLike(node.parent.parent);
     }
     ts.isParameterPropertyDeclaration = isParameterPropertyDeclaration;
     function walkUpBindingElementsAndPatterns(node) {
-        while (node && (node.kind === 170 || ts.isBindingPattern(node))) {
+        while (node && (node.kind === 174 || ts.isBindingPattern(node))) {
             node = node.parent;
         }
         return node;
@@ -9017,14 +8443,14 @@ var ts;
     function getCombinedModifierFlags(node) {
         node = walkUpBindingElementsAndPatterns(node);
         var flags = ts.getModifierFlags(node);
-        if (node.kind === 219) {
+        if (node.kind === 223) {
             node = node.parent;
         }
-        if (node && node.kind === 220) {
+        if (node && node.kind === 224) {
             flags |= ts.getModifierFlags(node);
             node = node.parent;
         }
-        if (node && node.kind === 201) {
+        if (node && node.kind === 205) {
             flags |= ts.getModifierFlags(node);
         }
         return flags;
@@ -9033,14 +8459,14 @@ var ts;
     function getCombinedNodeFlags(node) {
         node = walkUpBindingElementsAndPatterns(node);
         var flags = node.flags;
-        if (node.kind === 219) {
+        if (node.kind === 223) {
             node = node.parent;
         }
-        if (node && node.kind === 220) {
+        if (node && node.kind === 224) {
             flags |= node.flags;
             node = node.parent;
         }
-        if (node && node.kind === 201) {
+        if (node && node.kind === 205) {
             flags |= node.flags;
         }
         return flags;
@@ -9052,7 +8478,7 @@ var ts;
     var NodeConstructor;
     var SourceFileConstructor;
     function createNode(kind, location, flags) {
-        var ConstructorForKind = kind === 256
+        var ConstructorForKind = kind === 261
             ? (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))
             : (NodeConstructor || (NodeConstructor = ts.objectAllocator.getNodeConstructor()));
         var node = location
@@ -9222,7 +8648,7 @@ var ts;
     }
     ts.createNull = createNull;
     function createComputedPropertyName(expression, location) {
-        var node = createNode(141, location);
+        var node = createNode(142, location);
         node.expression = expression;
         return node;
     }
@@ -9234,12 +8660,8 @@ var ts;
         return node;
     }
     ts.updateComputedPropertyName = updateComputedPropertyName;
-    function createParameter(name, initializer, location) {
-        return createParameterDeclaration(undefined, undefined, undefined, name, undefined, undefined, initializer, location);
-    }
-    ts.createParameter = createParameter;
-    function createParameterDeclaration(decorators, modifiers, dotDotDotToken, name, questionToken, type, initializer, location, flags) {
-        var node = createNode(143, location, flags);
+    function createParameter(decorators, modifiers, dotDotDotToken, name, questionToken, type, initializer, location, flags) {
+        var node = createNode(144, location, flags);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.dotDotDotToken = dotDotDotToken;
@@ -9249,16 +8671,16 @@ var ts;
         node.initializer = initializer ? parenthesizeExpressionForList(initializer) : undefined;
         return node;
     }
-    ts.createParameterDeclaration = createParameterDeclaration;
-    function updateParameterDeclaration(node, decorators, modifiers, name, type, initializer) {
+    ts.createParameter = createParameter;
+    function updateParameter(node, decorators, modifiers, name, type, initializer) {
         if (node.decorators !== decorators || node.modifiers !== modifiers || node.name !== name || node.type !== type || node.initializer !== initializer) {
-            return updateNode(createParameterDeclaration(decorators, modifiers, node.dotDotDotToken, name, node.questionToken, type, initializer, node, node.flags), node);
+            return updateNode(createParameter(decorators, modifiers, node.dotDotDotToken, name, node.questionToken, type, initializer, node, node.flags), node);
         }
         return node;
     }
-    ts.updateParameterDeclaration = updateParameterDeclaration;
+    ts.updateParameter = updateParameter;
     function createProperty(decorators, modifiers, name, questionToken, type, initializer, location) {
-        var node = createNode(146, location);
+        var node = createNode(147, location);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
@@ -9276,7 +8698,7 @@ var ts;
     }
     ts.updateProperty = updateProperty;
     function createMethod(decorators, modifiers, asteriskToken, name, typeParameters, parameters, type, body, location, flags) {
-        var node = createNode(148, location, flags);
+        var node = createNode(149, location, flags);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.asteriskToken = asteriskToken;
@@ -9296,7 +8718,7 @@ var ts;
     }
     ts.updateMethod = updateMethod;
     function createConstructor(decorators, modifiers, parameters, body, location, flags) {
-        var node = createNode(149, location, flags);
+        var node = createNode(150, location, flags);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.typeParameters = undefined;
@@ -9314,7 +8736,7 @@ var ts;
     }
     ts.updateConstructor = updateConstructor;
     function createGetAccessor(decorators, modifiers, name, parameters, type, body, location, flags) {
-        var node = createNode(150, location, flags);
+        var node = createNode(151, location, flags);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
@@ -9333,7 +8755,7 @@ var ts;
     }
     ts.updateGetAccessor = updateGetAccessor;
     function createSetAccessor(decorators, modifiers, name, parameters, body, location, flags) {
-        var node = createNode(151, location, flags);
+        var node = createNode(152, location, flags);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
@@ -9351,7 +8773,7 @@ var ts;
     }
     ts.updateSetAccessor = updateSetAccessor;
     function createObjectBindingPattern(elements, location) {
-        var node = createNode(168, location);
+        var node = createNode(172, location);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -9364,7 +8786,7 @@ var ts;
     }
     ts.updateObjectBindingPattern = updateObjectBindingPattern;
     function createArrayBindingPattern(elements, location) {
-        var node = createNode(169, location);
+        var node = createNode(173, location);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -9377,7 +8799,7 @@ var ts;
     }
     ts.updateArrayBindingPattern = updateArrayBindingPattern;
     function createBindingElement(propertyName, dotDotDotToken, name, initializer, location) {
-        var node = createNode(170, location);
+        var node = createNode(174, location);
         node.propertyName = typeof propertyName === "string" ? createIdentifier(propertyName) : propertyName;
         node.dotDotDotToken = dotDotDotToken;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
@@ -9393,7 +8815,7 @@ var ts;
     }
     ts.updateBindingElement = updateBindingElement;
     function createArrayLiteral(elements, location, multiLine) {
-        var node = createNode(171, location);
+        var node = createNode(175, location);
         node.elements = parenthesizeListElements(createNodeArray(elements));
         if (multiLine) {
             node.multiLine = true;
@@ -9409,7 +8831,7 @@ var ts;
     }
     ts.updateArrayLiteral = updateArrayLiteral;
     function createObjectLiteral(properties, location, multiLine) {
-        var node = createNode(172, location);
+        var node = createNode(176, location);
         node.properties = createNodeArray(properties);
         if (multiLine) {
             node.multiLine = true;
@@ -9425,7 +8847,7 @@ var ts;
     }
     ts.updateObjectLiteral = updateObjectLiteral;
     function createPropertyAccess(expression, name, location, flags) {
-        var node = createNode(173, location, flags);
+        var node = createNode(177, location, flags);
         node.expression = parenthesizeForAccess(expression);
         (node.emitNode || (node.emitNode = {})).flags |= 1048576;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
@@ -9442,7 +8864,7 @@ var ts;
     }
     ts.updatePropertyAccess = updatePropertyAccess;
     function createElementAccess(expression, index, location) {
-        var node = createNode(174, location);
+        var node = createNode(178, location);
         node.expression = parenthesizeForAccess(expression);
         node.argumentExpression = typeof index === "number" ? createLiteral(index) : index;
         return node;
@@ -9456,7 +8878,7 @@ var ts;
     }
     ts.updateElementAccess = updateElementAccess;
     function createCall(expression, typeArguments, argumentsArray, location, flags) {
-        var node = createNode(175, location, flags);
+        var node = createNode(179, location, flags);
         node.expression = parenthesizeForAccess(expression);
         if (typeArguments) {
             node.typeArguments = createNodeArray(typeArguments);
@@ -9473,7 +8895,7 @@ var ts;
     }
     ts.updateCall = updateCall;
     function createNew(expression, typeArguments, argumentsArray, location, flags) {
-        var node = createNode(176, location, flags);
+        var node = createNode(180, location, flags);
         node.expression = parenthesizeForNew(expression);
         node.typeArguments = typeArguments ? createNodeArray(typeArguments) : undefined;
         node.arguments = argumentsArray ? parenthesizeListElements(createNodeArray(argumentsArray)) : undefined;
@@ -9488,7 +8910,7 @@ var ts;
     }
     ts.updateNew = updateNew;
     function createTaggedTemplate(tag, template, location) {
-        var node = createNode(177, location);
+        var node = createNode(181, location);
         node.tag = parenthesizeForAccess(tag);
         node.template = template;
         return node;
@@ -9502,7 +8924,7 @@ var ts;
     }
     ts.updateTaggedTemplate = updateTaggedTemplate;
     function createParen(expression, location) {
-        var node = createNode(179, location);
+        var node = createNode(183, location);
         node.expression = expression;
         return node;
     }
@@ -9515,7 +8937,7 @@ var ts;
     }
     ts.updateParen = updateParen;
     function createFunctionExpression(modifiers, asteriskToken, name, typeParameters, parameters, type, body, location, flags) {
-        var node = createNode(180, location, flags);
+        var node = createNode(184, location, flags);
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.asteriskToken = asteriskToken;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
@@ -9534,7 +8956,7 @@ var ts;
     }
     ts.updateFunctionExpression = updateFunctionExpression;
     function createArrowFunction(modifiers, typeParameters, parameters, type, equalsGreaterThanToken, body, location, flags) {
-        var node = createNode(181, location, flags);
+        var node = createNode(185, location, flags);
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.typeParameters = typeParameters ? createNodeArray(typeParameters) : undefined;
         node.parameters = createNodeArray(parameters);
@@ -9552,7 +8974,7 @@ var ts;
     }
     ts.updateArrowFunction = updateArrowFunction;
     function createDelete(expression, location) {
-        var node = createNode(182, location);
+        var node = createNode(186, location);
         node.expression = parenthesizePrefixOperand(expression);
         return node;
     }
@@ -9565,7 +8987,7 @@ var ts;
     }
     ts.updateDelete = updateDelete;
     function createTypeOf(expression, location) {
-        var node = createNode(183, location);
+        var node = createNode(187, location);
         node.expression = parenthesizePrefixOperand(expression);
         return node;
     }
@@ -9578,7 +9000,7 @@ var ts;
     }
     ts.updateTypeOf = updateTypeOf;
     function createVoid(expression, location) {
-        var node = createNode(184, location);
+        var node = createNode(188, location);
         node.expression = parenthesizePrefixOperand(expression);
         return node;
     }
@@ -9591,7 +9013,7 @@ var ts;
     }
     ts.updateVoid = updateVoid;
     function createAwait(expression, location) {
-        var node = createNode(185, location);
+        var node = createNode(189, location);
         node.expression = parenthesizePrefixOperand(expression);
         return node;
     }
@@ -9604,7 +9026,7 @@ var ts;
     }
     ts.updateAwait = updateAwait;
     function createPrefix(operator, operand, location) {
-        var node = createNode(186, location);
+        var node = createNode(190, location);
         node.operator = operator;
         node.operand = parenthesizePrefixOperand(operand);
         return node;
@@ -9618,7 +9040,7 @@ var ts;
     }
     ts.updatePrefix = updatePrefix;
     function createPostfix(operand, operator, location) {
-        var node = createNode(187, location);
+        var node = createNode(191, location);
         node.operand = parenthesizePostfixOperand(operand);
         node.operator = operator;
         return node;
@@ -9634,7 +9056,7 @@ var ts;
     function createBinary(left, operator, right, location) {
         var operatorToken = typeof operator === "number" ? createToken(operator) : operator;
         var operatorKind = operatorToken.kind;
-        var node = createNode(188, location);
+        var node = createNode(192, location);
         node.left = parenthesizeBinaryOperand(operatorKind, left, true, undefined);
         node.operatorToken = operatorToken;
         node.right = parenthesizeBinaryOperand(operatorKind, right, false, node.left);
@@ -9649,7 +9071,7 @@ var ts;
     }
     ts.updateBinary = updateBinary;
     function createConditional(condition, questionToken, whenTrue, colonToken, whenFalse, location) {
-        var node = createNode(189, location);
+        var node = createNode(193, location);
         node.condition = condition;
         node.questionToken = questionToken;
         node.whenTrue = whenTrue;
@@ -9666,7 +9088,7 @@ var ts;
     }
     ts.updateConditional = updateConditional;
     function createTemplateExpression(head, templateSpans, location) {
-        var node = createNode(190, location);
+        var node = createNode(194, location);
         node.head = head;
         node.templateSpans = createNodeArray(templateSpans);
         return node;
@@ -9680,7 +9102,7 @@ var ts;
     }
     ts.updateTemplateExpression = updateTemplateExpression;
     function createYield(asteriskToken, expression, location) {
-        var node = createNode(191, location);
+        var node = createNode(195, location);
         node.asteriskToken = asteriskToken;
         node.expression = expression;
         return node;
@@ -9694,7 +9116,7 @@ var ts;
     }
     ts.updateYield = updateYield;
     function createSpread(expression, location) {
-        var node = createNode(192, location);
+        var node = createNode(196, location);
         node.expression = parenthesizeExpressionForList(expression);
         return node;
     }
@@ -9707,7 +9129,7 @@ var ts;
     }
     ts.updateSpread = updateSpread;
     function createClassExpression(modifiers, name, typeParameters, heritageClauses, members, location) {
-        var node = createNode(193, location);
+        var node = createNode(197, location);
         node.decorators = undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.name = name;
@@ -9725,12 +9147,12 @@ var ts;
     }
     ts.updateClassExpression = updateClassExpression;
     function createOmittedExpression(location) {
-        var node = createNode(194, location);
+        var node = createNode(198, location);
         return node;
     }
     ts.createOmittedExpression = createOmittedExpression;
     function createExpressionWithTypeArguments(typeArguments, expression, location) {
-        var node = createNode(195, location);
+        var node = createNode(199, location);
         node.typeArguments = typeArguments ? createNodeArray(typeArguments) : undefined;
         node.expression = parenthesizeForAccess(expression);
         return node;
@@ -9744,7 +9166,7 @@ var ts;
     }
     ts.updateExpressionWithTypeArguments = updateExpressionWithTypeArguments;
     function createTemplateSpan(expression, literal, location) {
-        var node = createNode(198, location);
+        var node = createNode(202, location);
         node.expression = expression;
         node.literal = literal;
         return node;
@@ -9758,7 +9180,7 @@ var ts;
     }
     ts.updateTemplateSpan = updateTemplateSpan;
     function createBlock(statements, location, multiLine, flags) {
-        var block = createNode(200, location, flags);
+        var block = createNode(204, location, flags);
         block.statements = createNodeArray(statements);
         if (multiLine) {
             block.multiLine = true;
@@ -9774,7 +9196,7 @@ var ts;
     }
     ts.updateBlock = updateBlock;
     function createVariableStatement(modifiers, declarationList, location, flags) {
-        var node = createNode(201, location, flags);
+        var node = createNode(205, location, flags);
         node.decorators = undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.declarationList = ts.isArray(declarationList) ? createVariableDeclarationList(declarationList) : declarationList;
@@ -9789,7 +9211,7 @@ var ts;
     }
     ts.updateVariableStatement = updateVariableStatement;
     function createVariableDeclarationList(declarations, location, flags) {
-        var node = createNode(220, location, flags);
+        var node = createNode(224, location, flags);
         node.declarations = createNodeArray(declarations);
         return node;
     }
@@ -9802,7 +9224,7 @@ var ts;
     }
     ts.updateVariableDeclarationList = updateVariableDeclarationList;
     function createVariableDeclaration(name, type, initializer, location, flags) {
-        var node = createNode(219, location, flags);
+        var node = createNode(223, location, flags);
         node.name = typeof name === "string" ? createIdentifier(name) : name;
         node.type = type;
         node.initializer = initializer !== undefined ? parenthesizeExpressionForList(initializer) : undefined;
@@ -9817,11 +9239,11 @@ var ts;
     }
     ts.updateVariableDeclaration = updateVariableDeclaration;
     function createEmptyStatement(location) {
-        return createNode(202, location);
+        return createNode(206, location);
     }
     ts.createEmptyStatement = createEmptyStatement;
     function createStatement(expression, location, flags) {
-        var node = createNode(203, location, flags);
+        var node = createNode(207, location, flags);
         node.expression = parenthesizeExpressionForExpressionStatement(expression);
         return node;
     }
@@ -9834,7 +9256,7 @@ var ts;
     }
     ts.updateStatement = updateStatement;
     function createIf(expression, thenStatement, elseStatement, location) {
-        var node = createNode(204, location);
+        var node = createNode(208, location);
         node.expression = expression;
         node.thenStatement = thenStatement;
         node.elseStatement = elseStatement;
@@ -9849,7 +9271,7 @@ var ts;
     }
     ts.updateIf = updateIf;
     function createDo(statement, expression, location) {
-        var node = createNode(205, location);
+        var node = createNode(209, location);
         node.statement = statement;
         node.expression = expression;
         return node;
@@ -9863,7 +9285,7 @@ var ts;
     }
     ts.updateDo = updateDo;
     function createWhile(expression, statement, location) {
-        var node = createNode(206, location);
+        var node = createNode(210, location);
         node.expression = expression;
         node.statement = statement;
         return node;
@@ -9877,7 +9299,7 @@ var ts;
     }
     ts.updateWhile = updateWhile;
     function createFor(initializer, condition, incrementor, statement, location) {
-        var node = createNode(207, location, undefined);
+        var node = createNode(211, location, undefined);
         node.initializer = initializer;
         node.condition = condition;
         node.incrementor = incrementor;
@@ -9893,7 +9315,7 @@ var ts;
     }
     ts.updateFor = updateFor;
     function createForIn(initializer, expression, statement, location) {
-        var node = createNode(208, location);
+        var node = createNode(212, location);
         node.initializer = initializer;
         node.expression = expression;
         node.statement = statement;
@@ -9908,7 +9330,7 @@ var ts;
     }
     ts.updateForIn = updateForIn;
     function createForOf(initializer, expression, statement, location) {
-        var node = createNode(209, location);
+        var node = createNode(213, location);
         node.initializer = initializer;
         node.expression = expression;
         node.statement = statement;
@@ -9923,7 +9345,7 @@ var ts;
     }
     ts.updateForOf = updateForOf;
     function createContinue(label, location) {
-        var node = createNode(210, location);
+        var node = createNode(214, location);
         if (label) {
             node.label = label;
         }
@@ -9938,7 +9360,7 @@ var ts;
     }
     ts.updateContinue = updateContinue;
     function createBreak(label, location) {
-        var node = createNode(211, location);
+        var node = createNode(215, location);
         if (label) {
             node.label = label;
         }
@@ -9953,7 +9375,7 @@ var ts;
     }
     ts.updateBreak = updateBreak;
     function createReturn(expression, location) {
-        var node = createNode(212, location);
+        var node = createNode(216, location);
         node.expression = expression;
         return node;
     }
@@ -9966,7 +9388,7 @@ var ts;
     }
     ts.updateReturn = updateReturn;
     function createWith(expression, statement, location) {
-        var node = createNode(213, location);
+        var node = createNode(217, location);
         node.expression = expression;
         node.statement = statement;
         return node;
@@ -9980,7 +9402,7 @@ var ts;
     }
     ts.updateWith = updateWith;
     function createSwitch(expression, caseBlock, location) {
-        var node = createNode(214, location);
+        var node = createNode(218, location);
         node.expression = parenthesizeExpressionForList(expression);
         node.caseBlock = caseBlock;
         return node;
@@ -9994,7 +9416,7 @@ var ts;
     }
     ts.updateSwitch = updateSwitch;
     function createLabel(label, statement, location) {
-        var node = createNode(215, location);
+        var node = createNode(219, location);
         node.label = typeof label === "string" ? createIdentifier(label) : label;
         node.statement = statement;
         return node;
@@ -10008,7 +9430,7 @@ var ts;
     }
     ts.updateLabel = updateLabel;
     function createThrow(expression, location) {
-        var node = createNode(216, location);
+        var node = createNode(220, location);
         node.expression = expression;
         return node;
     }
@@ -10021,7 +9443,7 @@ var ts;
     }
     ts.updateThrow = updateThrow;
     function createTry(tryBlock, catchClause, finallyBlock, location) {
-        var node = createNode(217, location);
+        var node = createNode(221, location);
         node.tryBlock = tryBlock;
         node.catchClause = catchClause;
         node.finallyBlock = finallyBlock;
@@ -10036,7 +9458,7 @@ var ts;
     }
     ts.updateTry = updateTry;
     function createCaseBlock(clauses, location) {
-        var node = createNode(228, location);
+        var node = createNode(232, location);
         node.clauses = createNodeArray(clauses);
         return node;
     }
@@ -10049,7 +9471,7 @@ var ts;
     }
     ts.updateCaseBlock = updateCaseBlock;
     function createFunctionDeclaration(decorators, modifiers, asteriskToken, name, typeParameters, parameters, type, body, location, flags) {
-        var node = createNode(221, location, flags);
+        var node = createNode(225, location, flags);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.asteriskToken = asteriskToken;
@@ -10069,7 +9491,7 @@ var ts;
     }
     ts.updateFunctionDeclaration = updateFunctionDeclaration;
     function createClassDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members, location) {
-        var node = createNode(222, location);
+        var node = createNode(226, location);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.name = name;
@@ -10087,7 +9509,7 @@ var ts;
     }
     ts.updateClassDeclaration = updateClassDeclaration;
     function createImportDeclaration(decorators, modifiers, importClause, moduleSpecifier, location) {
-        var node = createNode(231, location);
+        var node = createNode(235, location);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.importClause = importClause;
@@ -10103,7 +9525,7 @@ var ts;
     }
     ts.updateImportDeclaration = updateImportDeclaration;
     function createImportClause(name, namedBindings, location) {
-        var node = createNode(232, location);
+        var node = createNode(236, location);
         node.name = name;
         node.namedBindings = namedBindings;
         return node;
@@ -10117,7 +9539,7 @@ var ts;
     }
     ts.updateImportClause = updateImportClause;
     function createNamespaceImport(name, location) {
-        var node = createNode(233, location);
+        var node = createNode(237, location);
         node.name = name;
         return node;
     }
@@ -10130,7 +9552,7 @@ var ts;
     }
     ts.updateNamespaceImport = updateNamespaceImport;
     function createNamedImports(elements, location) {
-        var node = createNode(234, location);
+        var node = createNode(238, location);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -10143,7 +9565,7 @@ var ts;
     }
     ts.updateNamedImports = updateNamedImports;
     function createImportSpecifier(propertyName, name, location) {
-        var node = createNode(235, location);
+        var node = createNode(239, location);
         node.propertyName = propertyName;
         node.name = name;
         return node;
@@ -10157,7 +9579,7 @@ var ts;
     }
     ts.updateImportSpecifier = updateImportSpecifier;
     function createExportAssignment(decorators, modifiers, isExportEquals, expression, location) {
-        var node = createNode(236, location);
+        var node = createNode(240, location);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.isExportEquals = isExportEquals;
@@ -10173,7 +9595,7 @@ var ts;
     }
     ts.updateExportAssignment = updateExportAssignment;
     function createExportDeclaration(decorators, modifiers, exportClause, moduleSpecifier, location) {
-        var node = createNode(237, location);
+        var node = createNode(241, location);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.exportClause = exportClause;
@@ -10189,7 +9611,7 @@ var ts;
     }
     ts.updateExportDeclaration = updateExportDeclaration;
     function createNamedExports(elements, location) {
-        var node = createNode(238, location);
+        var node = createNode(242, location);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -10202,7 +9624,7 @@ var ts;
     }
     ts.updateNamedExports = updateNamedExports;
     function createExportSpecifier(name, propertyName, location) {
-        var node = createNode(239, location);
+        var node = createNode(243, location);
         node.name = typeof name === "string" ? createIdentifier(name) : name;
         node.propertyName = typeof propertyName === "string" ? createIdentifier(propertyName) : propertyName;
         return node;
@@ -10216,7 +9638,7 @@ var ts;
     }
     ts.updateExportSpecifier = updateExportSpecifier;
     function createJsxElement(openingElement, children, closingElement, location) {
-        var node = createNode(242, location);
+        var node = createNode(246, location);
         node.openingElement = openingElement;
         node.children = createNodeArray(children);
         node.closingElement = closingElement;
@@ -10231,7 +9653,7 @@ var ts;
     }
     ts.updateJsxElement = updateJsxElement;
     function createJsxSelfClosingElement(tagName, attributes, location) {
-        var node = createNode(243, location);
+        var node = createNode(247, location);
         node.tagName = tagName;
         node.attributes = createNodeArray(attributes);
         return node;
@@ -10245,7 +9667,7 @@ var ts;
     }
     ts.updateJsxSelfClosingElement = updateJsxSelfClosingElement;
     function createJsxOpeningElement(tagName, attributes, location) {
-        var node = createNode(244, location);
+        var node = createNode(248, location);
         node.tagName = tagName;
         node.attributes = createNodeArray(attributes);
         return node;
@@ -10259,7 +9681,7 @@ var ts;
     }
     ts.updateJsxOpeningElement = updateJsxOpeningElement;
     function createJsxClosingElement(tagName, location) {
-        var node = createNode(245, location);
+        var node = createNode(249, location);
         node.tagName = tagName;
         return node;
     }
@@ -10272,7 +9694,7 @@ var ts;
     }
     ts.updateJsxClosingElement = updateJsxClosingElement;
     function createJsxAttribute(name, initializer, location) {
-        var node = createNode(246, location);
+        var node = createNode(250, location);
         node.name = name;
         node.initializer = initializer;
         return node;
@@ -10286,7 +9708,7 @@ var ts;
     }
     ts.updateJsxAttribute = updateJsxAttribute;
     function createJsxSpreadAttribute(expression, location) {
-        var node = createNode(247, location);
+        var node = createNode(251, location);
         node.expression = expression;
         return node;
     }
@@ -10299,7 +9721,7 @@ var ts;
     }
     ts.updateJsxSpreadAttribute = updateJsxSpreadAttribute;
     function createJsxExpression(expression, location) {
-        var node = createNode(248, location);
+        var node = createNode(252, location);
         node.expression = expression;
         return node;
     }
@@ -10312,7 +9734,7 @@ var ts;
     }
     ts.updateJsxExpression = updateJsxExpression;
     function createHeritageClause(token, types, location) {
-        var node = createNode(251, location);
+        var node = createNode(255, location);
         node.token = token;
         node.types = createNodeArray(types);
         return node;
@@ -10326,7 +9748,7 @@ var ts;
     }
     ts.updateHeritageClause = updateHeritageClause;
     function createCaseClause(expression, statements, location) {
-        var node = createNode(249, location);
+        var node = createNode(253, location);
         node.expression = parenthesizeExpressionForList(expression);
         node.statements = createNodeArray(statements);
         return node;
@@ -10340,7 +9762,7 @@ var ts;
     }
     ts.updateCaseClause = updateCaseClause;
     function createDefaultClause(statements, location) {
-        var node = createNode(250, location);
+        var node = createNode(254, location);
         node.statements = createNodeArray(statements);
         return node;
     }
@@ -10353,7 +9775,7 @@ var ts;
     }
     ts.updateDefaultClause = updateDefaultClause;
     function createCatchClause(variableDeclaration, block, location) {
-        var node = createNode(252, location);
+        var node = createNode(256, location);
         node.variableDeclaration = typeof variableDeclaration === "string" ? createVariableDeclaration(variableDeclaration) : variableDeclaration;
         node.block = block;
         return node;
@@ -10367,7 +9789,7 @@ var ts;
     }
     ts.updateCatchClause = updateCatchClause;
     function createPropertyAssignment(name, initializer, location) {
-        var node = createNode(253, location);
+        var node = createNode(257, location);
         node.name = typeof name === "string" ? createIdentifier(name) : name;
         node.questionToken = undefined;
         node.initializer = initializer !== undefined ? parenthesizeExpressionForList(initializer) : undefined;
@@ -10382,12 +9804,18 @@ var ts;
     }
     ts.updatePropertyAssignment = updatePropertyAssignment;
     function createShorthandPropertyAssignment(name, objectAssignmentInitializer, location) {
-        var node = createNode(254, location);
+        var node = createNode(258, location);
         node.name = typeof name === "string" ? createIdentifier(name) : name;
         node.objectAssignmentInitializer = objectAssignmentInitializer !== undefined ? parenthesizeExpressionForList(objectAssignmentInitializer) : undefined;
         return node;
     }
     ts.createShorthandPropertyAssignment = createShorthandPropertyAssignment;
+    function createSpreadAssignment(expression, location) {
+        var node = createNode(259, location);
+        node.expression = expression !== undefined ? parenthesizeExpressionForList(expression) : undefined;
+        return node;
+    }
+    ts.createSpreadAssignment = createSpreadAssignment;
     function updateShorthandPropertyAssignment(node, name, objectAssignmentInitializer) {
         if (node.name !== name || node.objectAssignmentInitializer !== objectAssignmentInitializer) {
             return updateNode(createShorthandPropertyAssignment(name, objectAssignmentInitializer, node), node);
@@ -10395,9 +9823,16 @@ var ts;
         return node;
     }
     ts.updateShorthandPropertyAssignment = updateShorthandPropertyAssignment;
+    function updateSpreadAssignment(node, expression) {
+        if (node.expression !== expression) {
+            return updateNode(createSpreadAssignment(expression, node), node);
+        }
+        return node;
+    }
+    ts.updateSpreadAssignment = updateSpreadAssignment;
     function updateSourceFileNode(node, statements) {
         if (node.statements !== statements) {
-            var updated = createNode(256, node, node.flags);
+            var updated = createNode(261, node, node.flags);
             updated.statements = createNodeArray(statements);
             updated.endOfFileToken = node.endOfFileToken;
             updated.fileName = node.fileName;
@@ -10459,13 +9894,27 @@ var ts;
     }
     ts.updateSourceFileNode = updateSourceFileNode;
     function createNotEmittedStatement(original) {
-        var node = createNode(287, original);
+        var node = createNode(292, original);
         node.original = original;
         return node;
     }
     ts.createNotEmittedStatement = createNotEmittedStatement;
+    function createEndOfDeclarationMarker(original) {
+        var node = createNode(295);
+        node.emitNode = {};
+        node.original = original;
+        return node;
+    }
+    ts.createEndOfDeclarationMarker = createEndOfDeclarationMarker;
+    function createMergeDeclarationMarker(original) {
+        var node = createNode(294);
+        node.emitNode = {};
+        node.original = original;
+        return node;
+    }
+    ts.createMergeDeclarationMarker = createMergeDeclarationMarker;
     function createPartiallyEmittedExpression(expression, original, location) {
-        var node = createNode(288, location || original);
+        var node = createNode(293, location || original);
         node.expression = expression;
         node.original = original;
         return node;
@@ -10537,10 +9986,6 @@ var ts;
         }
     }
     ts.createMemberAccessForPropertyName = createMemberAccessForPropertyName;
-    function createRestParameter(name) {
-        return createParameterDeclaration(undefined, undefined, createToken(23), name, undefined, undefined, undefined);
-    }
-    ts.createRestParameter = createRestParameter;
     function createFunctionCall(func, thisArg, argumentsList, location) {
         return createCall(createPropertyAccess(func, "call"), undefined, [
             thisArg
@@ -10573,10 +10018,23 @@ var ts;
     function createReactNamespace(reactNamespace, parent) {
         var react = createIdentifier(reactNamespace || "React");
         react.flags &= ~8;
-        react.parent = parent;
+        react.parent = ts.getParseTreeNode(parent);
         return react;
     }
-    function createReactCreateElement(reactNamespace, tagName, props, children, parentElement, location) {
+    function createJsxFactoryExpressionFromEntityName(jsxFactory, parent) {
+        if (ts.isQualifiedName(jsxFactory)) {
+            return createPropertyAccess(createJsxFactoryExpressionFromEntityName(jsxFactory.left, parent), setEmitFlags(getMutableClone(jsxFactory.right), 1536));
+        }
+        else {
+            return createReactNamespace(jsxFactory.text, parent);
+        }
+    }
+    function createJsxFactoryExpression(jsxFactoryEntity, reactNamespace, parent) {
+        return jsxFactoryEntity ?
+            createJsxFactoryExpressionFromEntityName(jsxFactoryEntity, parent) :
+            createPropertyAccess(createReactNamespace(reactNamespace, parent), "createElement");
+    }
+    function createExpressionForJsxElement(jsxFactoryEntity, reactNamespace, tagName, props, children, parentElement, location) {
         var argumentsList = [tagName];
         if (props) {
             argumentsList.push(props);
@@ -10596,9 +10054,21 @@ var ts;
                 argumentsList.push(children[0]);
             }
         }
-        return createCall(createPropertyAccess(createReactNamespace(reactNamespace, parentElement), "createElement"), undefined, argumentsList, location);
+        return createCall(createJsxFactoryExpression(jsxFactoryEntity, reactNamespace, parentElement), undefined, argumentsList, location);
     }
-    ts.createReactCreateElement = createReactCreateElement;
+    ts.createExpressionForJsxElement = createExpressionForJsxElement;
+    function createExportDefault(expression) {
+        return createExportAssignment(undefined, undefined, false, expression);
+    }
+    ts.createExportDefault = createExportDefault;
+    function createExternalModuleExport(exportName) {
+        return createExportDeclaration(undefined, undefined, createNamedExports([createExportSpecifier(exportName)]));
+    }
+    ts.createExternalModuleExport = createExternalModuleExport;
+    function createLetStatement(name, initializer, location) {
+        return createVariableStatement(undefined, createLetDeclarationList([createVariableDeclaration(name, undefined, initializer)]), location);
+    }
+    ts.createLetStatement = createLetStatement;
     function createLetDeclarationList(declarations, location) {
         return createVariableDeclarationList(declarations, location, 1);
     }
@@ -10670,13 +10140,13 @@ var ts;
         return createCall(createPropertyAccess(createIdentifier("Object"), "create"), undefined, [prototype]);
     }
     function createGeti(target) {
-        return createArrowFunction(undefined, undefined, [createParameter("name")], undefined, undefined, createElementAccess(target, createIdentifier("name")));
+        return createArrowFunction(undefined, undefined, [createParameter(undefined, undefined, undefined, "name")], undefined, createToken(35), createElementAccess(target, createIdentifier("name")));
     }
     function createSeti(target) {
         return createArrowFunction(undefined, undefined, [
-            createParameter("name"),
-            createParameter("value")
-        ], undefined, undefined, createAssignment(createElementAccess(target, createIdentifier("name")), createIdentifier("value")));
+            createParameter(undefined, undefined, undefined, "name"),
+            createParameter(undefined, undefined, undefined, "value")
+        ], undefined, createToken(35), createAssignment(createElementAccess(target, createIdentifier("name")), createIdentifier("value")));
     }
     function createAdvancedAsyncSuperHelper() {
         var createCache = createVariableStatement(undefined, createConstDeclarationList([
@@ -10685,20 +10155,20 @@ var ts;
         var getter = createGetAccessor(undefined, undefined, "value", [], undefined, createBlock([
             createReturn(createCall(createIdentifier("geti"), undefined, [createIdentifier("name")]))
         ]));
-        var setter = createSetAccessor(undefined, undefined, "value", [createParameter("v")], createBlock([
+        var setter = createSetAccessor(undefined, undefined, "value", [createParameter(undefined, undefined, undefined, "v")], createBlock([
             createStatement(createCall(createIdentifier("seti"), undefined, [
                 createIdentifier("name"),
                 createIdentifier("v")
             ]))
         ]));
-        var getOrCreateAccessorsForName = createReturn(createArrowFunction(undefined, undefined, [createParameter("name")], undefined, undefined, createLogicalOr(createElementAccess(createIdentifier("cache"), createIdentifier("name")), createParen(createAssignment(createElementAccess(createIdentifier("cache"), createIdentifier("name")), createObjectLiteral([
+        var getOrCreateAccessorsForName = createReturn(createArrowFunction(undefined, undefined, [createParameter(undefined, undefined, undefined, "name")], undefined, createToken(35), createLogicalOr(createElementAccess(createIdentifier("cache"), createIdentifier("name")), createParen(createAssignment(createElementAccess(createIdentifier("cache"), createIdentifier("name")), createObjectLiteral([
             getter,
             setter
         ]))))));
         return createVariableStatement(undefined, createConstDeclarationList([
             createVariableDeclaration("_super", undefined, createCall(createParen(createFunctionExpression(undefined, undefined, undefined, undefined, [
-                createParameter("geti"),
-                createParameter("seti")
+                createParameter(undefined, undefined, undefined, "geti"),
+                createParameter(undefined, undefined, undefined, "seti")
             ], undefined, createBlock([
                 createCache,
                 getOrCreateAccessorsForName
@@ -10724,13 +10194,13 @@ var ts;
             case 8:
             case 9:
                 return false;
-            case 171:
+            case 175:
                 var elements = target.elements;
                 if (elements.length === 0) {
                     return false;
                 }
                 return true;
-            case 172:
+            case 176:
                 return target.properties.length > 0;
             default:
                 return true;
@@ -10750,7 +10220,7 @@ var ts;
         }
         else {
             switch (callee.kind) {
-                case 173: {
+                case 177: {
                     if (shouldBeCapturedInTempVariable(callee.expression, cacheIdentifiers)) {
                         thisArg = createTempVariable(recordTempVariable);
                         target = createPropertyAccess(createAssignment(thisArg, callee.expression, callee.expression), callee.name, callee);
@@ -10761,7 +10231,7 @@ var ts;
                     }
                     break;
                 }
-                case 174: {
+                case 178: {
                     if (shouldBeCapturedInTempVariable(callee.expression, cacheIdentifiers)) {
                         thisArg = createTempVariable(recordTempVariable);
                         target = createElementAccess(createAssignment(thisArg, callee.expression, callee.expression), callee.argumentExpression, callee);
@@ -10811,14 +10281,14 @@ var ts;
     ts.createExpressionForPropertyName = createExpressionForPropertyName;
     function createExpressionForObjectLiteralElementLike(node, property, receiver) {
         switch (property.kind) {
-            case 150:
             case 151:
+            case 152:
                 return createExpressionForAccessorDeclaration(node.properties, property, receiver, node.multiLine);
-            case 253:
+            case 257:
                 return createExpressionForPropertyAssignment(property, receiver);
-            case 254:
+            case 258:
                 return createExpressionForShorthandPropertyAssignment(property, receiver);
-            case 148:
+            case 149:
                 return createExpressionForMethodDeclaration(property, receiver);
         }
     }
@@ -10859,6 +10329,59 @@ var ts;
     function createExpressionForMethodDeclaration(method, receiver) {
         return ts.aggregateTransformFlags(setOriginalNode(createAssignment(createMemberAccessForPropertyName(receiver, method.name, method.name), setOriginalNode(createFunctionExpression(method.modifiers, method.asteriskToken, undefined, undefined, method.parameters, undefined, method.body, method), method), method), method));
     }
+    function getLocalName(node, allowComments, allowSourceMaps) {
+        return getName(node, allowComments, allowSourceMaps, 262144);
+    }
+    ts.getLocalName = getLocalName;
+    function isLocalName(node) {
+        return (getEmitFlags(node) & 262144) !== 0;
+    }
+    ts.isLocalName = isLocalName;
+    function getExportName(node, allowComments, allowSourceMaps) {
+        return getName(node, allowComments, allowSourceMaps, 131072);
+    }
+    ts.getExportName = getExportName;
+    function isExportName(node) {
+        return (getEmitFlags(node) & 131072) !== 0;
+    }
+    ts.isExportName = isExportName;
+    function getDeclarationName(node, allowComments, allowSourceMaps) {
+        return getName(node, allowComments, allowSourceMaps);
+    }
+    ts.getDeclarationName = getDeclarationName;
+    function getName(node, allowComments, allowSourceMaps, emitFlags) {
+        if (node.name && ts.isIdentifier(node.name) && !ts.isGeneratedIdentifier(node.name)) {
+            var name_11 = getMutableClone(node.name);
+            emitFlags |= getEmitFlags(node.name);
+            if (!allowSourceMaps)
+                emitFlags |= 1536;
+            if (!allowComments)
+                emitFlags |= 49152;
+            if (emitFlags)
+                setEmitFlags(name_11, emitFlags);
+            return name_11;
+        }
+        return getGeneratedNameForNode(node);
+    }
+    function getExternalModuleOrNamespaceExportName(ns, node, allowComments, allowSourceMaps) {
+        if (ns && ts.hasModifier(node, 1)) {
+            return getNamespaceMemberName(ns, getName(node), allowComments, allowSourceMaps);
+        }
+        return getExportName(node, allowComments, allowSourceMaps);
+    }
+    ts.getExternalModuleOrNamespaceExportName = getExternalModuleOrNamespaceExportName;
+    function getNamespaceMemberName(ns, name, allowComments, allowSourceMaps) {
+        var qualifiedName = createPropertyAccess(ns, ts.nodeIsSynthesized(name) ? name : getSynthesizedClone(name), name);
+        var emitFlags;
+        if (!allowSourceMaps)
+            emitFlags |= 1536;
+        if (!allowComments)
+            emitFlags |= 49152;
+        if (emitFlags)
+            setEmitFlags(qualifiedName, emitFlags);
+        return qualifiedName;
+    }
+    ts.getNamespaceMemberName = getNamespaceMemberName;
     function isUseStrictPrologue(node) {
         return node.expression.text === "use strict";
     }
@@ -10920,7 +10443,7 @@ var ts;
     ts.ensureUseStrict = ensureUseStrict;
     function parenthesizeBinaryOperand(binaryOperator, operand, isLeftSideOfBinary, leftOperand) {
         var skipped = skipPartiallyEmittedExpressions(operand);
-        if (skipped.kind === 179) {
+        if (skipped.kind === 183) {
             return operand;
         }
         return binaryOperandNeedsParentheses(binaryOperator, operand, isLeftSideOfBinary, leftOperand)
@@ -10929,15 +10452,15 @@ var ts;
     }
     ts.parenthesizeBinaryOperand = parenthesizeBinaryOperand;
     function binaryOperandNeedsParentheses(binaryOperator, operand, isLeftSideOfBinary, leftOperand) {
-        var binaryOperatorPrecedence = ts.getOperatorPrecedence(188, binaryOperator);
-        var binaryOperatorAssociativity = ts.getOperatorAssociativity(188, binaryOperator);
+        var binaryOperatorPrecedence = ts.getOperatorPrecedence(192, binaryOperator);
+        var binaryOperatorAssociativity = ts.getOperatorAssociativity(192, binaryOperator);
         var emittedOperand = skipPartiallyEmittedExpressions(operand);
         var operandPrecedence = ts.getExpressionPrecedence(emittedOperand);
         switch (ts.compareValues(operandPrecedence, binaryOperatorPrecedence)) {
             case -1:
                 if (!isLeftSideOfBinary
                     && binaryOperatorAssociativity === 1
-                    && operand.kind === 191) {
+                    && operand.kind === 195) {
                     return false;
                 }
                 return true;
@@ -10976,7 +10499,7 @@ var ts;
         if (ts.isLiteralKind(node.kind)) {
             return node.kind;
         }
-        if (node.kind === 188 && node.operatorToken.kind === 36) {
+        if (node.kind === 192 && node.operatorToken.kind === 36) {
             if (node.cachedLiteralKind !== undefined) {
                 return node.cachedLiteralKind;
             }
@@ -10993,9 +10516,9 @@ var ts;
     function parenthesizeForNew(expression) {
         var emittedExpression = skipPartiallyEmittedExpressions(expression);
         switch (emittedExpression.kind) {
-            case 175:
+            case 179:
                 return createParen(expression);
-            case 176:
+            case 180:
                 return emittedExpression.arguments
                     ? expression
                     : createParen(expression);
@@ -11006,7 +10529,7 @@ var ts;
     function parenthesizeForAccess(expression) {
         var emittedExpression = skipPartiallyEmittedExpressions(expression);
         if (ts.isLeftHandSideExpression(emittedExpression)
-            && (emittedExpression.kind !== 176 || emittedExpression.arguments)
+            && (emittedExpression.kind !== 180 || emittedExpression.arguments)
             && emittedExpression.kind !== 8) {
             return expression;
         }
@@ -11044,7 +10567,7 @@ var ts;
     function parenthesizeExpressionForList(expression) {
         var emittedExpression = skipPartiallyEmittedExpressions(expression);
         var expressionPrecedence = ts.getExpressionPrecedence(emittedExpression);
-        var commaPrecedence = ts.getOperatorPrecedence(188, 25);
+        var commaPrecedence = ts.getOperatorPrecedence(192, 25);
         return expressionPrecedence > commaPrecedence
             ? expression
             : createParen(expression, expression);
@@ -11055,7 +10578,7 @@ var ts;
         if (ts.isCallExpression(emittedExpression)) {
             var callee = emittedExpression.expression;
             var kind = skipPartiallyEmittedExpressions(callee).kind;
-            if (kind === 180 || kind === 181) {
+            if (kind === 184 || kind === 185) {
                 var mutableCall = getMutableClone(emittedExpression);
                 mutableCall.expression = createParen(callee, callee);
                 return recreatePartiallyEmittedExpressions(expression, mutableCall);
@@ -11063,7 +10586,7 @@ var ts;
         }
         else {
             var leftmostExpressionKind = getLeftmostExpression(emittedExpression).kind;
-            if (leftmostExpressionKind === 172 || leftmostExpressionKind === 180) {
+            if (leftmostExpressionKind === 176 || leftmostExpressionKind === 184) {
                 return createParen(expression, expression);
             }
         }
@@ -11081,21 +10604,21 @@ var ts;
     function getLeftmostExpression(node) {
         while (true) {
             switch (node.kind) {
-                case 187:
+                case 191:
                     node = node.operand;
                     continue;
-                case 188:
+                case 192:
                     node = node.left;
                     continue;
-                case 189:
+                case 193:
                     node = node.condition;
                     continue;
-                case 175:
-                case 174:
-                case 173:
+                case 179:
+                case 178:
+                case 177:
                     node = node.expression;
                     continue;
-                case 288:
+                case 293:
                     node = node.expression;
                     continue;
             }
@@ -11104,19 +10627,12 @@ var ts;
     }
     function parenthesizeConciseBody(body) {
         var emittedBody = skipPartiallyEmittedExpressions(body);
-        if (emittedBody.kind === 172) {
+        if (emittedBody.kind === 176) {
             return createParen(body, body);
         }
         return body;
     }
     ts.parenthesizeConciseBody = parenthesizeConciseBody;
-    (function (OuterExpressionKinds) {
-        OuterExpressionKinds[OuterExpressionKinds["Parentheses"] = 1] = "Parentheses";
-        OuterExpressionKinds[OuterExpressionKinds["Assertions"] = 2] = "Assertions";
-        OuterExpressionKinds[OuterExpressionKinds["PartiallyEmittedExpressions"] = 4] = "PartiallyEmittedExpressions";
-        OuterExpressionKinds[OuterExpressionKinds["All"] = 7] = "All";
-    })(ts.OuterExpressionKinds || (ts.OuterExpressionKinds = {}));
-    var OuterExpressionKinds = ts.OuterExpressionKinds;
     function skipOuterExpressions(node, kinds) {
         if (kinds === void 0) { kinds = 7; }
         var previousNode;
@@ -11136,7 +10652,7 @@ var ts;
     }
     ts.skipOuterExpressions = skipOuterExpressions;
     function skipParentheses(node) {
-        while (node.kind === 179) {
+        while (node.kind === 183) {
             node = node.expression;
         }
         return node;
@@ -11150,7 +10666,7 @@ var ts;
     }
     ts.skipAssertions = skipAssertions;
     function skipPartiallyEmittedExpressions(node) {
-        while (node.kind === 288) {
+        while (node.kind === 293) {
             node = node.expression;
         }
         return node;
@@ -11206,7 +10722,7 @@ var ts;
     function getOrCreateEmitNode(node) {
         if (!node.emitNode) {
             if (ts.isParseTreeNode(node)) {
-                if (node.kind === 256) {
+                if (node.kind === 261) {
                     return node.emitNode = { annotatedNodes: [node] };
                 }
                 var sourceFile = ts.getSourceFileOfNode(node);
@@ -11296,13 +10812,13 @@ var ts;
     function getLocalNameForExternalImport(node, sourceFile) {
         var namespaceDeclaration = ts.getNamespaceDeclarationNode(node);
         if (namespaceDeclaration && !ts.isDefaultImport(node)) {
-            var name_9 = namespaceDeclaration.name;
-            return ts.isGeneratedIdentifier(name_9) ? name_9 : createIdentifier(ts.getSourceTextOfNodeFromSourceFile(sourceFile, namespaceDeclaration.name));
+            var name_12 = namespaceDeclaration.name;
+            return ts.isGeneratedIdentifier(name_12) ? name_12 : createIdentifier(ts.getSourceTextOfNodeFromSourceFile(sourceFile, namespaceDeclaration.name));
         }
-        if (node.kind === 231 && node.importClause) {
+        if (node.kind === 235 && node.importClause) {
             return getGeneratedNameForNode(node);
         }
-        if (node.kind === 237 && node.moduleSpecifier) {
+        if (node.kind === 241 && node.moduleSpecifier) {
             return getGeneratedNameForNode(node);
         }
         return undefined;
@@ -11340,6 +10856,221 @@ var ts;
     function tryGetModuleNameFromDeclaration(declaration, host, resolver, compilerOptions) {
         return tryGetModuleNameFromFile(resolver.getExternalModuleFileFromDeclaration(declaration), host, compilerOptions);
     }
+    function transformFunctionBody(node, visitor, currentSourceFile, context, enableSubstitutionsForCapturedThis, convertObjectRest) {
+        var multiLine = false;
+        var singleLine = false;
+        var statementsLocation;
+        var closeBraceLocation;
+        var statements = [];
+        var body = node.body;
+        var statementOffset;
+        context.startLexicalEnvironment();
+        if (ts.isBlock(body)) {
+            statementOffset = addPrologueDirectives(statements, body.statements, false, visitor);
+        }
+        addCaptureThisForNodeIfNeeded(statements, node, enableSubstitutionsForCapturedThis);
+        addDefaultValueAssignmentsIfNeeded(statements, node, visitor, convertObjectRest);
+        addRestParameterIfNeeded(statements, node, false);
+        if (!multiLine && statements.length > 0) {
+            multiLine = true;
+        }
+        if (ts.isBlock(body)) {
+            statementsLocation = body.statements;
+            ts.addRange(statements, ts.visitNodes(body.statements, visitor, ts.isStatement, statementOffset));
+            if (!multiLine && body.multiLine) {
+                multiLine = true;
+            }
+        }
+        else {
+            ts.Debug.assert(node.kind === 185);
+            statementsLocation = ts.moveRangeEnd(body, -1);
+            var equalsGreaterThanToken = node.equalsGreaterThanToken;
+            if (!ts.nodeIsSynthesized(equalsGreaterThanToken) && !ts.nodeIsSynthesized(body)) {
+                if (ts.rangeEndIsOnSameLineAsRangeStart(equalsGreaterThanToken, body, currentSourceFile)) {
+                    singleLine = true;
+                }
+                else {
+                    multiLine = true;
+                }
+            }
+            var expression = ts.visitNode(body, visitor, ts.isExpression);
+            var returnStatement = createReturn(expression, body);
+            setEmitFlags(returnStatement, 12288 | 1024 | 32768);
+            statements.push(returnStatement);
+            closeBraceLocation = body;
+        }
+        var lexicalEnvironment = context.endLexicalEnvironment();
+        ts.addRange(statements, lexicalEnvironment);
+        if (!multiLine && lexicalEnvironment && lexicalEnvironment.length) {
+            multiLine = true;
+        }
+        var block = createBlock(createNodeArray(statements, statementsLocation), node.body, multiLine);
+        if (!multiLine && singleLine) {
+            setEmitFlags(block, 32);
+        }
+        if (closeBraceLocation) {
+            setTokenSourceMapRange(block, 17, closeBraceLocation);
+        }
+        setOriginalNode(block, node.body);
+        return block;
+    }
+    ts.transformFunctionBody = transformFunctionBody;
+    function addCaptureThisForNodeIfNeeded(statements, node, enableSubstitutionsForCapturedThis) {
+        if (node.transformFlags & 524288 && node.kind !== 185) {
+            captureThisForNode(statements, node, createThis(), enableSubstitutionsForCapturedThis);
+        }
+    }
+    ts.addCaptureThisForNodeIfNeeded = addCaptureThisForNodeIfNeeded;
+    function captureThisForNode(statements, node, initializer, enableSubstitutionsForCapturedThis, originalStatement) {
+        enableSubstitutionsForCapturedThis();
+        var captureThisStatement = createVariableStatement(undefined, createVariableDeclarationList([
+            createVariableDeclaration("_this", undefined, initializer)
+        ]), originalStatement);
+        setEmitFlags(captureThisStatement, 49152 | 8388608);
+        setSourceMapRange(captureThisStatement, node);
+        statements.push(captureThisStatement);
+    }
+    ts.captureThisForNode = captureThisForNode;
+    function shouldAddDefaultValueAssignments(node) {
+        return (node.transformFlags & 2097152) !== 0;
+    }
+    function addDefaultValueAssignmentsIfNeeded(statements, node, visitor, convertObjectRest) {
+        if (!shouldAddDefaultValueAssignments(node)) {
+            return;
+        }
+        for (var _i = 0, _a = node.parameters; _i < _a.length; _i++) {
+            var parameter = _a[_i];
+            var name_13 = parameter.name, initializer = parameter.initializer, dotDotDotToken = parameter.dotDotDotToken;
+            if (dotDotDotToken) {
+                continue;
+            }
+            if (ts.isBindingPattern(name_13)) {
+                addDefaultValueAssignmentForBindingPattern(statements, parameter, name_13, initializer, visitor, convertObjectRest);
+            }
+            else if (initializer) {
+                addDefaultValueAssignmentForInitializer(statements, parameter, name_13, initializer, visitor);
+            }
+        }
+    }
+    ts.addDefaultValueAssignmentsIfNeeded = addDefaultValueAssignmentsIfNeeded;
+    function addDefaultValueAssignmentForBindingPattern(statements, parameter, name, initializer, visitor, convertObjectRest) {
+        var temp = getGeneratedNameForNode(parameter);
+        if (name.elements.length > 0) {
+            statements.push(setEmitFlags(createVariableStatement(undefined, createVariableDeclarationList(ts.flattenParameterDestructuring(parameter, temp, visitor, convertObjectRest))), 8388608));
+        }
+        else if (initializer) {
+            statements.push(setEmitFlags(createStatement(createAssignment(temp, ts.visitNode(initializer, visitor, ts.isExpression))), 8388608));
+        }
+    }
+    function addDefaultValueAssignmentForInitializer(statements, parameter, name, initializer, visitor) {
+        initializer = ts.visitNode(initializer, visitor, ts.isExpression);
+        var statement = createIf(createStrictEquality(getSynthesizedClone(name), createVoidZero()), setEmitFlags(createBlock([
+            createStatement(createAssignment(setEmitFlags(getMutableClone(name), 1536), setEmitFlags(initializer, 1536 | getEmitFlags(initializer)), parameter))
+        ], parameter), 32 | 1024 | 12288), undefined, parameter);
+        statement.startsOnNewLine = true;
+        setEmitFlags(statement, 12288 | 1024 | 8388608);
+        statements.push(statement);
+    }
+    function shouldAddRestParameter(node, inConstructorWithSynthesizedSuper) {
+        return node && node.dotDotDotToken && node.name.kind === 70 && !inConstructorWithSynthesizedSuper;
+    }
+    function addRestParameterIfNeeded(statements, node, inConstructorWithSynthesizedSuper) {
+        var parameter = ts.lastOrUndefined(node.parameters);
+        if (!shouldAddRestParameter(parameter, inConstructorWithSynthesizedSuper)) {
+            return;
+        }
+        var declarationName = getMutableClone(parameter.name);
+        setEmitFlags(declarationName, 1536);
+        var expressionName = getSynthesizedClone(parameter.name);
+        var restIndex = node.parameters.length - 1;
+        var temp = createLoopVariable();
+        statements.push(setEmitFlags(createVariableStatement(undefined, createVariableDeclarationList([
+            createVariableDeclaration(declarationName, undefined, createArrayLiteral([]))
+        ]), parameter), 8388608));
+        var forStatement = createFor(createVariableDeclarationList([
+            createVariableDeclaration(temp, undefined, createLiteral(restIndex))
+        ], parameter), createLessThan(temp, createPropertyAccess(createIdentifier("arguments"), "length"), parameter), createPostfixIncrement(temp, parameter), createBlock([
+            startOnNewLine(createStatement(createAssignment(createElementAccess(expressionName, createSubtract(temp, createLiteral(restIndex))), createElementAccess(createIdentifier("arguments"), temp)), parameter))
+        ]));
+        setEmitFlags(forStatement, 8388608);
+        startOnNewLine(forStatement);
+        statements.push(forStatement);
+    }
+    ts.addRestParameterIfNeeded = addRestParameterIfNeeded;
+    function convertForOf(node, convertedLoopBodyStatements, visitor, enableSubstitutionsForBlockScopedBindings, context, convertObjectRest) {
+        var expression = ts.visitNode(node.expression, visitor, ts.isExpression);
+        var initializer = node.initializer;
+        var statements = [];
+        var counter = convertObjectRest ? undefined : createLoopVariable();
+        var rhsReference = expression.kind === 70
+            ? createUniqueName(expression.text)
+            : createTempVariable(undefined);
+        var elementAccess = convertObjectRest ? rhsReference : createElementAccess(rhsReference, counter);
+        if (ts.isVariableDeclarationList(initializer)) {
+            if (initializer.flags & 3) {
+                enableSubstitutionsForBlockScopedBindings();
+            }
+            var firstOriginalDeclaration = ts.firstOrUndefined(initializer.declarations);
+            if (firstOriginalDeclaration && ts.isBindingPattern(firstOriginalDeclaration.name)) {
+                var declarations = ts.flattenVariableDestructuring(firstOriginalDeclaration, elementAccess, visitor, undefined, convertObjectRest);
+                var declarationList = createVariableDeclarationList(declarations, initializer);
+                setOriginalNode(declarationList, initializer);
+                var firstDeclaration = declarations[0];
+                var lastDeclaration = ts.lastOrUndefined(declarations);
+                setSourceMapRange(declarationList, ts.createRange(firstDeclaration.pos, lastDeclaration.end));
+                statements.push(createVariableStatement(undefined, declarationList));
+            }
+            else {
+                statements.push(createVariableStatement(undefined, setOriginalNode(createVariableDeclarationList([
+                    createVariableDeclaration(firstOriginalDeclaration ? firstOriginalDeclaration.name : createTempVariable(undefined), undefined, createElementAccess(rhsReference, counter))
+                ], ts.moveRangePos(initializer, -1)), initializer), ts.moveRangeEnd(initializer, -1)));
+            }
+        }
+        else {
+            var assignment = createAssignment(initializer, elementAccess);
+            if (ts.isDestructuringAssignment(assignment)) {
+                statements.push(createStatement(ts.flattenDestructuringAssignment(context, assignment, false, context.hoistVariableDeclaration, visitor, convertObjectRest)));
+            }
+            else {
+                assignment.end = initializer.end;
+                statements.push(createStatement(assignment, ts.moveRangeEnd(initializer, -1)));
+            }
+        }
+        var bodyLocation;
+        var statementsLocation;
+        if (convertedLoopBodyStatements) {
+            ts.addRange(statements, convertedLoopBodyStatements);
+        }
+        else {
+            var statement = ts.visitNode(node.statement, visitor, ts.isStatement);
+            if (ts.isBlock(statement)) {
+                ts.addRange(statements, statement.statements);
+                bodyLocation = statement;
+                statementsLocation = statement.statements;
+            }
+            else {
+                statements.push(statement);
+            }
+        }
+        setEmitFlags(expression, 1536 | getEmitFlags(expression));
+        var body = createBlock(createNodeArray(statements, statementsLocation), bodyLocation);
+        setEmitFlags(body, 1536 | 12288);
+        var forStatement;
+        if (convertObjectRest) {
+            forStatement = createForOf(createVariableDeclarationList([
+                createVariableDeclaration(rhsReference, undefined, undefined, node.expression)
+            ], node.expression), node.expression, body, node);
+        }
+        else {
+            forStatement = createFor(setEmitFlags(createVariableDeclarationList([
+                createVariableDeclaration(counter, undefined, createLiteral(0), ts.moveRangePos(node.expression, -1)),
+                createVariableDeclaration(rhsReference, undefined, expression, node.expression)
+            ], node.expression), 16777216), createLessThan(counter, createPropertyAccess(rhsReference, "length"), node.expression), createPostfixIncrement(counter, node.expression), body, node);
+        }
+        setEmitFlags(forStatement, 8192);
+        return forStatement;
+    }
+    ts.convertForOf = convertForOf;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -11348,13 +11079,13 @@ var ts;
     var IdentifierConstructor;
     var SourceFileConstructor;
     function createNode(kind, pos, end) {
-        if (kind === 256) {
+        if (kind === 261) {
             return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, pos, end);
         }
         else if (kind === 70) {
             return new (IdentifierConstructor || (IdentifierConstructor = ts.objectAllocator.getIdentifierConstructor()))(kind, pos, end);
         }
-        else if (kind < 140) {
+        else if (kind < 141) {
             return new (TokenConstructor || (TokenConstructor = ts.objectAllocator.getTokenConstructor()))(kind, pos, end);
         }
         else {
@@ -11390,26 +11121,28 @@ var ts;
         var visitNodes = cbNodeArray ? visitNodeArray : visitEachNode;
         var cbNodes = cbNodeArray || cbNode;
         switch (node.kind) {
-            case 140:
+            case 141:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.right);
-            case 142:
+            case 143:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.constraint) ||
                     visitNode(cbNode, node.expression);
-            case 254:
+            case 258:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.equalsToken) ||
                     visitNode(cbNode, node.objectAssignmentInitializer);
-            case 143:
+            case 259:
+                return visitNode(cbNode, node.expression);
+            case 144:
+            case 147:
             case 146:
-            case 145:
-            case 253:
-            case 219:
-            case 170:
+            case 257:
+            case 223:
+            case 174:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.propertyName) ||
@@ -11418,24 +11151,24 @@ var ts;
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 157:
             case 158:
-            case 152:
+            case 159:
             case 153:
             case 154:
+            case 155:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNodes(cbNodes, node.typeParameters) ||
                     visitNodes(cbNodes, node.parameters) ||
                     visitNode(cbNode, node.type);
-            case 148:
-            case 147:
             case 149:
+            case 148:
             case 150:
             case 151:
-            case 180:
-            case 221:
-            case 181:
+            case 152:
+            case 184:
+            case 225:
+            case 185:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.asteriskToken) ||
@@ -11446,308 +11179,318 @@ var ts;
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.equalsGreaterThanToken) ||
                     visitNode(cbNode, node.body);
-            case 156:
+            case 157:
                 return visitNode(cbNode, node.typeName) ||
                     visitNodes(cbNodes, node.typeArguments);
-            case 155:
+            case 156:
                 return visitNode(cbNode, node.parameterName) ||
                     visitNode(cbNode, node.type);
-            case 159:
-                return visitNode(cbNode, node.exprName);
             case 160:
-                return visitNodes(cbNodes, node.members);
+                return visitNode(cbNode, node.exprName);
             case 161:
-                return visitNode(cbNode, node.elementType);
+                return visitNodes(cbNodes, node.members);
             case 162:
-                return visitNodes(cbNodes, node.elementTypes);
+                return visitNode(cbNode, node.elementType);
             case 163:
+                return visitNodes(cbNodes, node.elementTypes);
             case 164:
-                return visitNodes(cbNodes, node.types);
             case 165:
-                return visitNode(cbNode, node.type);
-            case 167:
-                return visitNode(cbNode, node.literal);
+                return visitNodes(cbNodes, node.types);
+            case 166:
             case 168:
+                return visitNode(cbNode, node.type);
             case 169:
-                return visitNodes(cbNodes, node.elements);
+                return visitNode(cbNode, node.objectType) ||
+                    visitNode(cbNode, node.indexType);
+            case 170:
+                return visitNode(cbNode, node.readonlyToken) ||
+                    visitNode(cbNode, node.typeParameter) ||
+                    visitNode(cbNode, node.questionToken) ||
+                    visitNode(cbNode, node.type);
             case 171:
-                return visitNodes(cbNodes, node.elements);
+                return visitNode(cbNode, node.literal);
             case 172:
-                return visitNodes(cbNodes, node.properties);
             case 173:
+                return visitNodes(cbNodes, node.elements);
+            case 175:
+                return visitNodes(cbNodes, node.elements);
+            case 176:
+                return visitNodes(cbNodes, node.properties);
+            case 177:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.name);
-            case 174:
+            case 178:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.argumentExpression);
-            case 175:
-            case 176:
+            case 179:
+            case 180:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNodes, node.typeArguments) ||
                     visitNodes(cbNodes, node.arguments);
-            case 177:
+            case 181:
                 return visitNode(cbNode, node.tag) ||
                     visitNode(cbNode, node.template);
-            case 178:
+            case 182:
                 return visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.expression);
-            case 179:
-                return visitNode(cbNode, node.expression);
-            case 182:
-                return visitNode(cbNode, node.expression);
             case 183:
                 return visitNode(cbNode, node.expression);
-            case 184:
-                return visitNode(cbNode, node.expression);
             case 186:
-                return visitNode(cbNode, node.operand);
-            case 191:
-                return visitNode(cbNode, node.asteriskToken) ||
-                    visitNode(cbNode, node.expression);
-            case 185:
                 return visitNode(cbNode, node.expression);
             case 187:
-                return visitNode(cbNode, node.operand);
+                return visitNode(cbNode, node.expression);
             case 188:
+                return visitNode(cbNode, node.expression);
+            case 190:
+                return visitNode(cbNode, node.operand);
+            case 195:
+                return visitNode(cbNode, node.asteriskToken) ||
+                    visitNode(cbNode, node.expression);
+            case 189:
+                return visitNode(cbNode, node.expression);
+            case 191:
+                return visitNode(cbNode, node.operand);
+            case 192:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.operatorToken) ||
                     visitNode(cbNode, node.right);
-            case 196:
+            case 200:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.type);
-            case 197:
+            case 201:
                 return visitNode(cbNode, node.expression);
-            case 189:
+            case 193:
                 return visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.whenTrue) ||
                     visitNode(cbNode, node.colonToken) ||
                     visitNode(cbNode, node.whenFalse);
-            case 192:
+            case 196:
                 return visitNode(cbNode, node.expression);
-            case 200:
-            case 227:
+            case 204:
+            case 231:
                 return visitNodes(cbNodes, node.statements);
-            case 256:
+            case 261:
                 return visitNodes(cbNodes, node.statements) ||
                     visitNode(cbNode, node.endOfFileToken);
-            case 201:
+            case 205:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.declarationList);
-            case 220:
+            case 224:
                 return visitNodes(cbNodes, node.declarations);
-            case 203:
+            case 207:
                 return visitNode(cbNode, node.expression);
-            case 204:
+            case 208:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.thenStatement) ||
                     visitNode(cbNode, node.elseStatement);
-            case 205:
+            case 209:
                 return visitNode(cbNode, node.statement) ||
                     visitNode(cbNode, node.expression);
-            case 206:
+            case 210:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 207:
+            case 211:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.incrementor) ||
                     visitNode(cbNode, node.statement);
-            case 208:
-                return visitNode(cbNode, node.initializer) ||
-                    visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.statement);
-            case 209:
-                return visitNode(cbNode, node.initializer) ||
-                    visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.statement);
-            case 210:
-            case 211:
-                return visitNode(cbNode, node.label);
             case 212:
-                return visitNode(cbNode, node.expression);
+                return visitNode(cbNode, node.initializer) ||
+                    visitNode(cbNode, node.expression) ||
+                    visitNode(cbNode, node.statement);
             case 213:
-                return visitNode(cbNode, node.expression) ||
+                return visitNode(cbNode, node.initializer) ||
+                    visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
             case 214:
-                return visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.caseBlock);
-            case 228:
-                return visitNodes(cbNodes, node.clauses);
-            case 249:
-                return visitNode(cbNode, node.expression) ||
-                    visitNodes(cbNodes, node.statements);
-            case 250:
-                return visitNodes(cbNodes, node.statements);
             case 215:
-                return visitNode(cbNode, node.label) ||
-                    visitNode(cbNode, node.statement);
+                return visitNode(cbNode, node.label);
             case 216:
                 return visitNode(cbNode, node.expression);
             case 217:
+                return visitNode(cbNode, node.expression) ||
+                    visitNode(cbNode, node.statement);
+            case 218:
+                return visitNode(cbNode, node.expression) ||
+                    visitNode(cbNode, node.caseBlock);
+            case 232:
+                return visitNodes(cbNodes, node.clauses);
+            case 253:
+                return visitNode(cbNode, node.expression) ||
+                    visitNodes(cbNodes, node.statements);
+            case 254:
+                return visitNodes(cbNodes, node.statements);
+            case 219:
+                return visitNode(cbNode, node.label) ||
+                    visitNode(cbNode, node.statement);
+            case 220:
+                return visitNode(cbNode, node.expression);
+            case 221:
                 return visitNode(cbNode, node.tryBlock) ||
                     visitNode(cbNode, node.catchClause) ||
                     visitNode(cbNode, node.finallyBlock);
-            case 252:
+            case 256:
                 return visitNode(cbNode, node.variableDeclaration) ||
                     visitNode(cbNode, node.block);
-            case 144:
+            case 145:
                 return visitNode(cbNode, node.expression);
-            case 222:
-            case 193:
+            case 226:
+            case 197:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNodes, node.typeParameters) ||
                     visitNodes(cbNodes, node.heritageClauses) ||
                     visitNodes(cbNodes, node.members);
-            case 223:
+            case 227:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNodes, node.typeParameters) ||
                     visitNodes(cbNodes, node.heritageClauses) ||
                     visitNodes(cbNodes, node.members);
-            case 224:
+            case 228:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNodes, node.typeParameters) ||
                     visitNode(cbNode, node.type);
-            case 225:
+            case 229:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNodes, node.members);
-            case 255:
+            case 260:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 226:
-                return visitNodes(cbNodes, node.decorators) ||
-                    visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.body);
             case 230:
+                return visitNodes(cbNodes, node.decorators) ||
+                    visitNodes(cbNodes, node.modifiers) ||
+                    visitNode(cbNode, node.name) ||
+                    visitNode(cbNode, node.body);
+            case 234:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.moduleReference);
-            case 231:
+            case 235:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.importClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 232:
+            case 236:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.namedBindings);
-            case 229:
-                return visitNode(cbNode, node.name);
             case 233:
                 return visitNode(cbNode, node.name);
-            case 234:
-            case 238:
-                return visitNodes(cbNodes, node.elements);
             case 237:
+                return visitNode(cbNode, node.name);
+            case 238:
+            case 242:
+                return visitNodes(cbNodes, node.elements);
+            case 241:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.exportClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 235:
             case 239:
+            case 243:
                 return visitNode(cbNode, node.propertyName) ||
                     visitNode(cbNode, node.name);
-            case 236:
+            case 240:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.expression);
-            case 190:
+            case 194:
                 return visitNode(cbNode, node.head) || visitNodes(cbNodes, node.templateSpans);
-            case 198:
+            case 202:
                 return visitNode(cbNode, node.expression) || visitNode(cbNode, node.literal);
-            case 141:
+            case 142:
                 return visitNode(cbNode, node.expression);
-            case 251:
+            case 255:
                 return visitNodes(cbNodes, node.types);
-            case 195:
+            case 199:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNodes, node.typeArguments);
-            case 241:
+            case 245:
                 return visitNode(cbNode, node.expression);
-            case 240:
+            case 244:
                 return visitNodes(cbNodes, node.decorators);
-            case 242:
+            case 246:
                 return visitNode(cbNode, node.openingElement) ||
                     visitNodes(cbNodes, node.children) ||
                     visitNode(cbNode, node.closingElement);
-            case 243:
-            case 244:
+            case 247:
+            case 248:
                 return visitNode(cbNode, node.tagName) ||
                     visitNodes(cbNodes, node.attributes);
-            case 246:
+            case 250:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 247:
+            case 251:
                 return visitNode(cbNode, node.expression);
-            case 248:
+            case 252:
                 return visitNode(cbNode, node.expression);
-            case 245:
+            case 249:
                 return visitNode(cbNode, node.tagName);
-            case 257:
-                return visitNode(cbNode, node.type);
-            case 261:
-                return visitNodes(cbNodes, node.types);
             case 262:
-                return visitNodes(cbNodes, node.types);
-            case 260:
-                return visitNode(cbNode, node.elementType);
-            case 264:
-                return visitNode(cbNode, node.type);
-            case 263:
-                return visitNode(cbNode, node.type);
-            case 265:
-                return visitNode(cbNode, node.literal);
-            case 267:
-                return visitNode(cbNode, node.name) ||
-                    visitNodes(cbNodes, node.typeArguments);
-            case 268:
-                return visitNode(cbNode, node.type);
-            case 269:
-                return visitNodes(cbNodes, node.parameters) ||
-                    visitNode(cbNode, node.type);
-            case 270:
-                return visitNode(cbNode, node.type);
-            case 271:
-                return visitNode(cbNode, node.type);
-            case 272:
                 return visitNode(cbNode, node.type);
             case 266:
+                return visitNodes(cbNodes, node.types);
+            case 267:
+                return visitNodes(cbNodes, node.types);
+            case 265:
+                return visitNode(cbNode, node.elementType);
+            case 269:
+                return visitNode(cbNode, node.type);
+            case 268:
+                return visitNode(cbNode, node.type);
+            case 270:
+                return visitNode(cbNode, node.literal);
+            case 272:
+                return visitNode(cbNode, node.name) ||
+                    visitNodes(cbNodes, node.typeArguments);
+            case 273:
+                return visitNode(cbNode, node.type);
+            case 274:
+                return visitNodes(cbNodes, node.parameters) ||
+                    visitNode(cbNode, node.type);
+            case 275:
+                return visitNode(cbNode, node.type);
+            case 276:
+                return visitNode(cbNode, node.type);
+            case 277:
+                return visitNode(cbNode, node.type);
+            case 271:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.type);
-            case 273:
+            case 278:
                 return visitNodes(cbNodes, node.tags);
-            case 275:
+            case 280:
                 return visitNode(cbNode, node.preParameterName) ||
                     visitNode(cbNode, node.typeExpression) ||
                     visitNode(cbNode, node.postParameterName);
-            case 276:
+            case 281:
                 return visitNode(cbNode, node.typeExpression);
-            case 277:
+            case 282:
                 return visitNode(cbNode, node.typeExpression);
-            case 278:
+            case 283:
                 return visitNodes(cbNodes, node.typeParameters);
-            case 279:
+            case 284:
                 return visitNode(cbNode, node.typeExpression) ||
+                    visitNode(cbNode, node.fullName) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.jsDocTypeLiteral);
-            case 281:
+            case 286:
                 return visitNodes(cbNodes, node.jsDocPropertyTags);
-            case 280:
+            case 285:
                 return visitNode(cbNode, node.typeExpression) ||
                     visitNode(cbNode, node.name);
-            case 288:
+            case 293:
                 return visitNode(cbNode, node.expression);
-            case 282:
+            case 287:
                 return visitNode(cbNode, node.literal);
         }
     }
@@ -11761,6 +11504,10 @@ var ts;
         return result;
     }
     ts.createSourceFile = createSourceFile;
+    function parseIsolatedEntityName(text, languageVersion) {
+        return Parser.parseIsolatedEntityName(text, languageVersion);
+    }
+    ts.parseIsolatedEntityName = parseIsolatedEntityName;
     function isExternalModule(file) {
         return file.externalModuleIndicator !== undefined;
     }
@@ -11783,8 +11530,8 @@ var ts;
     ts.parseJSDocTypeExpressionForTests = parseJSDocTypeExpressionForTests;
     var Parser;
     (function (Parser) {
-        var scanner = ts.createScanner(4, true);
-        var disallowInAndDecoratorContext = 32768 | 131072;
+        var scanner = ts.createScanner(5, true);
+        var disallowInAndDecoratorContext = 65536 | 262144;
         var NodeConstructor;
         var TokenConstructor;
         var IdentifierConstructor;
@@ -11808,6 +11555,15 @@ var ts;
             return result;
         }
         Parser.parseSourceFile = parseSourceFile;
+        function parseIsolatedEntityName(content, languageVersion) {
+            initializeState(content, languageVersion, undefined, 1);
+            nextToken();
+            var entityName = parseEntityName(true);
+            var isInvalid = token() === 1 && !parseDiagnostics.length;
+            clearState();
+            return isInvalid ? entityName : undefined;
+        }
+        Parser.parseIsolatedEntityName = parseIsolatedEntityName;
         function getLanguageVariant(scriptKind) {
             return scriptKind === 4 || scriptKind === 2 || scriptKind === 1 ? 1 : 0;
         }
@@ -11823,7 +11579,7 @@ var ts;
             identifiers = ts.createMap();
             identifierCount = 0;
             nodeCount = 0;
-            contextFlags = scriptKind === 1 || scriptKind === 2 ? 1048576 : 0;
+            contextFlags = scriptKind === 1 || scriptKind === 2 ? 2097152 : 0;
             parseErrorBeforeNextFinishedNode = false;
             scanner.setText(sourceText);
             scanner.setOnError(scanError);
@@ -11898,7 +11654,7 @@ var ts;
         }
         Parser.fixupParentReferences = fixupParentReferences;
         function createSourceFile(fileName, languageVersion, scriptKind) {
-            var sourceFile = new SourceFileConstructor(256, 0, sourceText.length);
+            var sourceFile = new SourceFileConstructor(261, 0, sourceText.length);
             nodeCount++;
             sourceFile.text = sourceText;
             sourceFile.bindDiagnostics = [];
@@ -11918,17 +11674,17 @@ var ts;
             }
         }
         function setDisallowInContext(val) {
-            setContextFlag(val, 32768);
-        }
-        function setYieldContext(val) {
             setContextFlag(val, 65536);
         }
-        function setDecoratorContext(val) {
+        function setYieldContext(val) {
             setContextFlag(val, 131072);
         }
-        function setAwaitContext(val) {
+        function setDecoratorContext(val) {
             setContextFlag(val, 262144);
         }
+        function setAwaitContext(val) {
+            setContextFlag(val, 524288);
+        }
         function doOutsideOfContext(context, func) {
             var contextFlagsToClear = context & contextFlags;
             if (contextFlagsToClear) {
@@ -11950,41 +11706,41 @@ var ts;
             return func();
         }
         function allowInAnd(func) {
-            return doOutsideOfContext(32768, func);
+            return doOutsideOfContext(65536, func);
         }
         function disallowInAnd(func) {
-            return doInsideOfContext(32768, func);
-        }
-        function doInYieldContext(func) {
             return doInsideOfContext(65536, func);
         }
-        function doInDecoratorContext(func) {
+        function doInYieldContext(func) {
             return doInsideOfContext(131072, func);
         }
-        function doInAwaitContext(func) {
+        function doInDecoratorContext(func) {
             return doInsideOfContext(262144, func);
         }
+        function doInAwaitContext(func) {
+            return doInsideOfContext(524288, func);
+        }
         function doOutsideOfAwaitContext(func) {
-            return doOutsideOfContext(262144, func);
+            return doOutsideOfContext(524288, func);
         }
         function doInYieldAndAwaitContext(func) {
-            return doInsideOfContext(65536 | 262144, func);
+            return doInsideOfContext(131072 | 524288, func);
         }
         function inContext(flags) {
             return (contextFlags & flags) !== 0;
         }
         function inYieldContext() {
-            return inContext(65536);
-        }
-        function inDisallowInContext() {
-            return inContext(32768);
-        }
-        function inDecoratorContext() {
             return inContext(131072);
         }
-        function inAwaitContext() {
+        function inDisallowInContext() {
+            return inContext(65536);
+        }
+        function inDecoratorContext() {
             return inContext(262144);
         }
+        function inAwaitContext() {
+            return inContext(524288);
+        }
         function parseErrorAtCurrentToken(message, arg0) {
             var start = scanner.getTokenPos();
             var length = scanner.getTextPos() - start;
@@ -12125,7 +11881,7 @@ var ts;
             if (!(pos >= 0)) {
                 pos = scanner.getStartPos();
             }
-            return kind >= 140 ? new NodeConstructor(kind, pos, pos) :
+            return kind >= 141 ? new NodeConstructor(kind, pos, pos) :
                 kind === 70 ? new IdentifierConstructor(kind, pos, pos) :
                     new TokenConstructor(kind, pos, pos);
         }
@@ -12145,7 +11901,7 @@ var ts;
             }
             if (parseErrorBeforeNextFinishedNode) {
                 parseErrorBeforeNextFinishedNode = false;
-                node.flags |= 524288;
+                node.flags |= 1048576;
             }
             return node;
         }
@@ -12207,7 +11963,7 @@ var ts;
             return token() === 9 || token() === 8 || ts.tokenIsIdentifierOrKeyword(token());
         }
         function parseComputedPropertyName() {
-            var node = createNode(141);
+            var node = createNode(142);
             parseExpected(20);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21);
@@ -12277,9 +12033,11 @@ var ts;
                 case 6:
                     return token() === 20 || isLiteralPropertyName();
                 case 12:
-                    return token() === 20 || token() === 38 || isLiteralPropertyName();
+                    return token() === 20 || token() === 38 || token() === 23 || isLiteralPropertyName();
+                case 17:
+                    return isLiteralPropertyName();
                 case 9:
-                    return token() === 20 || isLiteralPropertyName();
+                    return token() === 20 || token() === 23 || isLiteralPropertyName();
                 case 7:
                     if (token() === 16) {
                         return lookAhead(isValidHeritageClauseObjectLiteral);
@@ -12294,29 +12052,29 @@ var ts;
                     return isIdentifierOrPattern();
                 case 10:
                     return token() === 25 || token() === 23 || isIdentifierOrPattern();
-                case 17:
+                case 18:
                     return isIdentifier();
                 case 11:
                 case 15:
                     return token() === 25 || token() === 23 || isStartOfExpression();
                 case 16:
                     return isStartOfParameter();
-                case 18:
                 case 19:
-                    return token() === 25 || isStartOfType();
                 case 20:
-                    return isHeritageClause();
+                    return token() === 25 || isStartOfType();
                 case 21:
+                    return isHeritageClause();
+                case 22:
                     return ts.tokenIsIdentifierOrKeyword(token());
                 case 13:
                     return ts.tokenIsIdentifierOrKeyword(token()) || token() === 16;
                 case 14:
                     return true;
-                case 22:
                 case 23:
-                case 25:
-                    return JSDocParser.isJSDocType();
                 case 24:
+                case 26:
+                    return JSDocParser.isJSDocType();
+                case 25:
                     return isSimplePropertyName();
             }
             ts.Debug.fail("Non-exhaustive case in 'isListElement'.");
@@ -12360,7 +12118,7 @@ var ts;
                 case 6:
                 case 12:
                 case 9:
-                case 21:
+                case 22:
                     return token() === 17;
                 case 3:
                     return token() === 17 || token() === 72 || token() === 78;
@@ -12368,31 +12126,32 @@ var ts;
                     return token() === 16 || token() === 84 || token() === 107;
                 case 8:
                     return isVariableDeclaratorListTerminator();
-                case 17:
+                case 18:
                     return token() === 28 || token() === 18 || token() === 16 || token() === 84 || token() === 107;
                 case 11:
                     return token() === 19 || token() === 24;
                 case 15:
-                case 19:
+                case 20:
                 case 10:
                     return token() === 21;
                 case 16:
+                case 17:
                     return token() === 19 || token() === 21;
-                case 18:
+                case 19:
                     return token() !== 25;
-                case 20:
+                case 21:
                     return token() === 16 || token() === 17;
                 case 13:
                     return token() === 28 || token() === 40;
                 case 14:
                     return token() === 26 && lookAhead(nextTokenIsSlash);
-                case 22:
-                    return token() === 19 || token() === 55 || token() === 17;
                 case 23:
-                    return token() === 28 || token() === 17;
-                case 25:
-                    return token() === 21 || token() === 17;
+                    return token() === 19 || token() === 55 || token() === 17;
                 case 24:
+                    return token() === 28 || token() === 17;
+                case 26:
+                    return token() === 21 || token() === 17;
+                case 25:
                     return token() === 17;
             }
         }
@@ -12409,7 +12168,7 @@ var ts;
             return false;
         }
         function isInSomeParsingContext() {
-            for (var kind = 0; kind < 26; kind++) {
+            for (var kind = 0; kind < 27; kind++) {
                 if (parsingContext & (1 << kind)) {
                     if (isListElement(kind, true) || isListTerminator(kind)) {
                         return true;
@@ -12460,7 +12219,7 @@ var ts;
             if (ts.containsParseError(node)) {
                 return undefined;
             }
-            var nodeContextFlags = node.flags & 1540096;
+            var nodeContextFlags = node.flags & 3080192;
             if (nodeContextFlags !== contextFlags) {
                 return undefined;
             }
@@ -12492,10 +12251,12 @@ var ts;
                     return isReusableVariableDeclaration(node);
                 case 16:
                     return isReusableParameter(node);
-                case 20:
                 case 17:
-                case 19:
+                    return false;
+                case 21:
                 case 18:
+                case 20:
+                case 19:
                 case 11:
                 case 12:
                 case 7:
@@ -12507,14 +12268,14 @@ var ts;
         function isReusableClassMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 149:
-                    case 154:
                     case 150:
+                    case 155:
                     case 151:
-                    case 146:
-                    case 199:
+                    case 152:
+                    case 147:
+                    case 203:
                         return true;
-                    case 148:
+                    case 149:
                         var methodDeclaration = node;
                         var nameIsConstructor = methodDeclaration.name.kind === 70 &&
                             methodDeclaration.name.originalKeywordKind === 122;
@@ -12526,8 +12287,8 @@ var ts;
         function isReusableSwitchClause(node) {
             if (node) {
                 switch (node.kind) {
-                    case 249:
-                    case 250:
+                    case 253:
+                    case 254:
                         return true;
                 }
             }
@@ -12536,65 +12297,65 @@ var ts;
         function isReusableStatement(node) {
             if (node) {
                 switch (node.kind) {
-                    case 221:
-                    case 201:
-                    case 200:
+                    case 225:
+                    case 205:
                     case 204:
-                    case 203:
+                    case 208:
+                    case 207:
+                    case 220:
                     case 216:
-                    case 212:
+                    case 218:
+                    case 215:
                     case 214:
+                    case 212:
+                    case 213:
                     case 211:
                     case 210:
-                    case 208:
-                    case 209:
-                    case 207:
-                    case 206:
-                    case 213:
-                    case 202:
                     case 217:
-                    case 215:
-                    case 205:
-                    case 218:
-                    case 231:
-                    case 230:
-                    case 237:
-                    case 236:
-                    case 226:
+                    case 206:
+                    case 221:
+                    case 219:
+                    case 209:
                     case 222:
-                    case 223:
-                    case 225:
-                    case 224:
+                    case 235:
+                    case 234:
+                    case 241:
+                    case 240:
+                    case 230:
+                    case 226:
+                    case 227:
+                    case 229:
+                    case 228:
                         return true;
                 }
             }
             return false;
         }
         function isReusableEnumMember(node) {
-            return node.kind === 255;
+            return node.kind === 260;
         }
         function isReusableTypeMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 153:
-                    case 147:
                     case 154:
-                    case 145:
-                    case 152:
+                    case 148:
+                    case 155:
+                    case 146:
+                    case 153:
                         return true;
                 }
             }
             return false;
         }
         function isReusableVariableDeclaration(node) {
-            if (node.kind !== 219) {
+            if (node.kind !== 223) {
                 return false;
             }
             var variableDeclarator = node;
             return variableDeclarator.initializer === undefined;
         }
         function isReusableParameter(node) {
-            if (node.kind !== 143) {
+            if (node.kind !== 144) {
                 return false;
             }
             var parameter = node;
@@ -12614,6 +12375,7 @@ var ts;
                 case 1: return ts.Diagnostics.Declaration_or_statement_expected;
                 case 2: return ts.Diagnostics.case_or_default_expected;
                 case 3: return ts.Diagnostics.Statement_expected;
+                case 17:
                 case 4: return ts.Diagnostics.Property_or_signature_expected;
                 case 5: return ts.Diagnostics.Unexpected_token_A_constructor_method_accessor_or_property_was_expected;
                 case 6: return ts.Diagnostics.Enum_member_expected;
@@ -12625,17 +12387,17 @@ var ts;
                 case 12: return ts.Diagnostics.Property_assignment_expected;
                 case 15: return ts.Diagnostics.Expression_or_comma_expected;
                 case 16: return ts.Diagnostics.Parameter_declaration_expected;
-                case 17: return ts.Diagnostics.Type_parameter_declaration_expected;
-                case 18: return ts.Diagnostics.Type_argument_expected;
-                case 19: return ts.Diagnostics.Type_expected;
-                case 20: return ts.Diagnostics.Unexpected_token_expected;
-                case 21: return ts.Diagnostics.Identifier_expected;
+                case 18: return ts.Diagnostics.Type_parameter_declaration_expected;
+                case 19: return ts.Diagnostics.Type_argument_expected;
+                case 20: return ts.Diagnostics.Type_expected;
+                case 21: return ts.Diagnostics.Unexpected_token_expected;
+                case 22: return ts.Diagnostics.Identifier_expected;
                 case 13: return ts.Diagnostics.Identifier_expected;
                 case 14: return ts.Diagnostics.Identifier_expected;
-                case 22: return ts.Diagnostics.Parameter_declaration_expected;
-                case 23: return ts.Diagnostics.Type_argument_expected;
-                case 25: return ts.Diagnostics.Type_expected;
-                case 24: return ts.Diagnostics.Property_assignment_expected;
+                case 23: return ts.Diagnostics.Parameter_declaration_expected;
+                case 24: return ts.Diagnostics.Type_argument_expected;
+                case 26: return ts.Diagnostics.Type_expected;
+                case 25: return ts.Diagnostics.Property_assignment_expected;
             }
         }
         ;
@@ -12689,7 +12451,7 @@ var ts;
         function parseEntityName(allowReservedWords, diagnosticMessage) {
             var entity = parseIdentifier(diagnosticMessage);
             while (parseOptional(22)) {
-                var node = createNode(140, entity.pos);
+                var node = createNode(141, entity.pos);
                 node.left = entity;
                 node.right = parseRightSideOfDot(allowReservedWords);
                 entity = finishNode(node);
@@ -12706,7 +12468,7 @@ var ts;
             return allowIdentifierNames ? parseIdentifierName() : parseIdentifier();
         }
         function parseTemplateExpression() {
-            var template = createNode(190);
+            var template = createNode(194);
             template.head = parseTemplateHead();
             ts.Debug.assert(template.head.kind === 13, "Template head has wrong token kind");
             var templateSpans = createNodeArray();
@@ -12718,7 +12480,7 @@ var ts;
             return finishNode(template);
         }
         function parseTemplateSpan() {
-            var span = createNode(198);
+            var span = createNode(202);
             span.expression = allowInAnd(parseExpression);
             var literal;
             if (token() === 17) {
@@ -12766,33 +12528,33 @@ var ts;
         }
         function parseTypeReference() {
             var typeName = parseEntityName(false, ts.Diagnostics.Type_expected);
-            var node = createNode(156, typeName.pos);
+            var node = createNode(157, typeName.pos);
             node.typeName = typeName;
             if (!scanner.hasPrecedingLineBreak() && token() === 26) {
-                node.typeArguments = parseBracketedList(18, parseType, 26, 28);
+                node.typeArguments = parseBracketedList(19, parseType, 26, 28);
             }
             return finishNode(node);
         }
         function parseThisTypePredicate(lhs) {
             nextToken();
-            var node = createNode(155, lhs.pos);
+            var node = createNode(156, lhs.pos);
             node.parameterName = lhs;
             node.type = parseType();
             return finishNode(node);
         }
         function parseThisTypeNode() {
-            var node = createNode(166);
+            var node = createNode(167);
             nextToken();
             return finishNode(node);
         }
         function parseTypeQuery() {
-            var node = createNode(159);
+            var node = createNode(160);
             parseExpected(102);
             node.exprName = parseEntityName(true);
             return finishNode(node);
         }
         function parseTypeParameter() {
-            var node = createNode(142);
+            var node = createNode(143);
             node.name = parseIdentifier();
             if (parseOptional(84)) {
                 if (isStartOfType() || !isStartOfExpression()) {
@@ -12806,7 +12568,7 @@ var ts;
         }
         function parseTypeParameters() {
             if (token() === 26) {
-                return parseBracketedList(17, parseTypeParameter, 26, 28);
+                return parseBracketedList(18, parseTypeParameter, 26, 28);
             }
         }
         function parseParameterType() {
@@ -12819,7 +12581,7 @@ var ts;
             return token() === 23 || isIdentifierOrPattern() || ts.isModifierKind(token()) || token() === 56 || token() === 98;
         }
         function parseParameter() {
-            var node = createNode(143);
+            var node = createNode(144);
             if (token() === 98) {
                 node.name = createIdentifier(true, undefined);
                 node.type = parseParameterType();
@@ -12879,7 +12641,7 @@ var ts;
         }
         function parseSignatureMember(kind) {
             var node = createNode(kind);
-            if (kind === 153) {
+            if (kind === 154) {
                 parseExpected(93);
             }
             fillSignature(55, false, false, false, node);
@@ -12919,7 +12681,7 @@ var ts;
             return token() === 55 || token() === 25 || token() === 21;
         }
         function parseIndexSignatureDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(154, fullStart);
+            var node = createNode(155, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             node.parameters = parseBracketedList(16, parseParameter, 20, 21);
@@ -12931,7 +12693,7 @@ var ts;
             var name = parsePropertyName();
             var questionToken = parseOptionalToken(54);
             if (token() === 18 || token() === 26) {
-                var method = createNode(147, fullStart);
+                var method = createNode(148, fullStart);
                 method.modifiers = modifiers;
                 method.name = name;
                 method.questionToken = questionToken;
@@ -12940,7 +12702,7 @@ var ts;
                 return addJSDocComment(finishNode(method));
             }
             else {
-                var property = createNode(145, fullStart);
+                var property = createNode(146, fullStart);
                 property.modifiers = modifiers;
                 property.name = name;
                 property.questionToken = questionToken;
@@ -12980,10 +12742,10 @@ var ts;
         }
         function parseTypeMember() {
             if (token() === 18 || token() === 26) {
-                return parseSignatureMember(152);
+                return parseSignatureMember(153);
             }
             if (token() === 93 && lookAhead(isStartOfConstructSignature)) {
-                return parseSignatureMember(153);
+                return parseSignatureMember(154);
             }
             var fullStart = getNodePos();
             var modifiers = parseModifiers();
@@ -12997,7 +12759,7 @@ var ts;
             return token() === 18 || token() === 26;
         }
         function parseTypeLiteral() {
-            var node = createNode(160);
+            var node = createNode(161);
             node.members = parseObjectTypeMembers();
             return finishNode(node);
         }
@@ -13012,13 +12774,40 @@ var ts;
             }
             return members;
         }
+        function isStartOfMappedType() {
+            nextToken();
+            if (token() === 130) {
+                nextToken();
+            }
+            return token() === 20 && nextTokenIsIdentifier() && nextToken() === 91;
+        }
+        function parseMappedTypeParameter() {
+            var node = createNode(143);
+            node.name = parseIdentifier();
+            parseExpected(91);
+            node.constraint = parseType();
+            return finishNode(node);
+        }
+        function parseMappedType() {
+            var node = createNode(170);
+            parseExpected(16);
+            node.readonlyToken = parseOptionalToken(130);
+            parseExpected(20);
+            node.typeParameter = parseMappedTypeParameter();
+            parseExpected(21);
+            node.questionToken = parseOptionalToken(54);
+            node.type = parseTypeAnnotation();
+            parseSemicolon();
+            parseExpected(17);
+            return finishNode(node);
+        }
         function parseTupleType() {
-            var node = createNode(162);
-            node.elementTypes = parseBracketedList(19, parseType, 20, 21);
+            var node = createNode(163);
+            node.elementTypes = parseBracketedList(20, parseType, 20, 21);
             return finishNode(node);
         }
         function parseParenthesizedType() {
-            var node = createNode(165);
+            var node = createNode(166);
             parseExpected(18);
             node.type = parseType();
             parseExpected(19);
@@ -13026,7 +12815,7 @@ var ts;
         }
         function parseFunctionOrConstructorType(kind) {
             var node = createNode(kind);
-            if (kind === 158) {
+            if (kind === 159) {
                 parseExpected(93);
             }
             fillSignature(35, false, false, false, node);
@@ -13037,7 +12826,7 @@ var ts;
             return token() === 22 ? undefined : node;
         }
         function parseLiteralTypeNode() {
-            var node = createNode(167);
+            var node = createNode(171);
             node.literal = parseSimpleUnaryExpression();
             finishNode(node);
             return node;
@@ -13048,12 +12837,12 @@ var ts;
         function parseNonArrayType() {
             switch (token()) {
                 case 118:
-                case 133:
-                case 131:
-                case 121:
                 case 134:
-                case 136:
-                case 128:
+                case 132:
+                case 121:
+                case 135:
+                case 137:
+                case 129:
                     var node = tryParse(parseKeywordAndNoDot);
                     return node || parseTypeReference();
                 case 9:
@@ -13078,7 +12867,7 @@ var ts;
                 case 102:
                     return parseTypeQuery();
                 case 16:
-                    return parseTypeLiteral();
+                    return lookAhead(isStartOfMappedType) ? parseMappedType() : parseTypeLiteral();
                 case 20:
                     return parseTupleType();
                 case 18:
@@ -13090,16 +12879,16 @@ var ts;
         function isStartOfType() {
             switch (token()) {
                 case 118:
-                case 133:
-                case 131:
-                case 121:
                 case 134:
+                case 132:
+                case 121:
+                case 135:
                 case 104:
-                case 136:
+                case 137:
                 case 94:
                 case 98:
                 case 102:
-                case 128:
+                case 129:
                 case 16:
                 case 20:
                 case 26:
@@ -13124,13 +12913,36 @@ var ts;
         function parseArrayTypeOrHigher() {
             var type = parseNonArrayType();
             while (!scanner.hasPrecedingLineBreak() && parseOptional(20)) {
-                parseExpected(21);
-                var node = createNode(161, type.pos);
-                node.elementType = type;
-                type = finishNode(node);
+                if (isStartOfType()) {
+                    var node = createNode(169, type.pos);
+                    node.objectType = type;
+                    node.indexType = parseType();
+                    parseExpected(21);
+                    type = finishNode(node);
+                }
+                else {
+                    var node = createNode(162, type.pos);
+                    node.elementType = type;
+                    parseExpected(21);
+                    type = finishNode(node);
+                }
             }
             return type;
         }
+        function parseTypeOperator(operator) {
+            var node = createNode(168);
+            parseExpected(operator);
+            node.operator = operator;
+            node.type = parseTypeOperatorOrHigher();
+            return finishNode(node);
+        }
+        function parseTypeOperatorOrHigher() {
+            switch (token()) {
+                case 126:
+                    return parseTypeOperator(126);
+            }
+            return parseArrayTypeOrHigher();
+        }
         function parseUnionOrIntersectionType(kind, parseConstituentType, operator) {
             var type = parseConstituentType();
             if (token() === operator) {
@@ -13146,10 +12958,10 @@ var ts;
             return type;
         }
         function parseIntersectionTypeOrHigher() {
-            return parseUnionOrIntersectionType(164, parseArrayTypeOrHigher, 47);
+            return parseUnionOrIntersectionType(165, parseTypeOperatorOrHigher, 47);
         }
         function parseUnionTypeOrHigher() {
-            return parseUnionOrIntersectionType(163, parseIntersectionTypeOrHigher, 48);
+            return parseUnionOrIntersectionType(164, parseIntersectionTypeOrHigher, 48);
         }
         function isStartOfFunctionType() {
             if (token() === 26) {
@@ -13195,7 +13007,7 @@ var ts;
             var typePredicateVariable = isIdentifier() && tryParse(parseTypePredicatePrefix);
             var type = parseType();
             if (typePredicateVariable) {
-                var node = createNode(155, typePredicateVariable.pos);
+                var node = createNode(156, typePredicateVariable.pos);
                 node.parameterName = typePredicateVariable;
                 node.type = type;
                 return finishNode(node);
@@ -13212,14 +13024,14 @@ var ts;
             }
         }
         function parseType() {
-            return doOutsideOfContext(327680, parseTypeWorker);
+            return doOutsideOfContext(655360, parseTypeWorker);
         }
         function parseTypeWorker() {
             if (isStartOfFunctionType()) {
-                return parseFunctionOrConstructorType(157);
+                return parseFunctionOrConstructorType(158);
             }
             if (token() === 93) {
-                return parseFunctionOrConstructorType(158);
+                return parseFunctionOrConstructorType(159);
             }
             return parseUnionTypeOrHigher();
         }
@@ -13338,7 +13150,7 @@ var ts;
             return !scanner.hasPrecedingLineBreak() && isIdentifier();
         }
         function parseYieldExpression() {
-            var node = createNode(191);
+            var node = createNode(195);
             nextToken();
             if (!scanner.hasPrecedingLineBreak() &&
                 (token() === 38 || isStartOfExpression())) {
@@ -13354,13 +13166,13 @@ var ts;
             ts.Debug.assert(token() === 35, "parseSimpleArrowFunctionExpression should only have been called if we had a =>");
             var node;
             if (asyncModifier) {
-                node = createNode(181, asyncModifier.pos);
+                node = createNode(185, asyncModifier.pos);
                 node.modifiers = asyncModifier;
             }
             else {
-                node = createNode(181, identifier.pos);
+                node = createNode(185, identifier.pos);
             }
-            var parameter = createNode(143, identifier.pos);
+            var parameter = createNode(144, identifier.pos);
             parameter.name = identifier;
             finishNode(parameter);
             node.parameters = createNodeArray([parameter], parameter.pos);
@@ -13494,7 +13306,7 @@ var ts;
             return 0;
         }
         function parseParenthesizedArrowFunctionExpressionHead(allowAmbiguity) {
-            var node = createNode(181);
+            var node = createNode(185);
             node.modifiers = parseModifiersForArrowFunction();
             var isAsync = !!(ts.getModifierFlags(node) & 256);
             fillSignature(55, false, isAsync, !allowAmbiguity, node);
@@ -13526,7 +13338,7 @@ var ts;
             if (!questionToken) {
                 return leftOperand;
             }
-            var node = createNode(189, leftOperand.pos);
+            var node = createNode(193, leftOperand.pos);
             node.condition = leftOperand;
             node.questionToken = questionToken;
             node.whenTrue = doOutsideOfContext(disallowInAndDecoratorContext, parseAssignmentExpressionOrHigher);
@@ -13539,7 +13351,7 @@ var ts;
             return parseBinaryExpressionRest(precedence, leftOperand);
         }
         function isInOrOfKeyword(t) {
-            return t === 91 || t === 139;
+            return t === 91 || t === 140;
         }
         function parseBinaryExpressionRest(precedence, leftOperand) {
             while (true) {
@@ -13617,39 +13429,39 @@ var ts;
             return -1;
         }
         function makeBinaryExpression(left, operatorToken, right) {
-            var node = createNode(188, left.pos);
+            var node = createNode(192, left.pos);
             node.left = left;
             node.operatorToken = operatorToken;
             node.right = right;
             return finishNode(node);
         }
         function makeAsExpression(left, right) {
-            var node = createNode(196, left.pos);
+            var node = createNode(200, left.pos);
             node.expression = left;
             node.type = right;
             return finishNode(node);
         }
         function parsePrefixUnaryExpression() {
-            var node = createNode(186);
+            var node = createNode(190);
             node.operator = token();
             nextToken();
             node.operand = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseDeleteExpression() {
-            var node = createNode(182);
+            var node = createNode(186);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseTypeOfExpression() {
-            var node = createNode(183);
+            var node = createNode(187);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseVoidExpression() {
-            var node = createNode(184);
+            var node = createNode(188);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
@@ -13664,7 +13476,7 @@ var ts;
             return false;
         }
         function parseAwaitExpression() {
-            var node = createNode(185);
+            var node = createNode(189);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
@@ -13680,7 +13492,7 @@ var ts;
             var simpleUnaryExpression = parseSimpleUnaryExpression();
             if (token() === 39) {
                 var start = ts.skipTrivia(sourceText, simpleUnaryExpression.pos);
-                if (simpleUnaryExpression.kind === 178) {
+                if (simpleUnaryExpression.kind === 182) {
                     parseErrorAtPosition(start, simpleUnaryExpression.end - start, 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 {
@@ -13733,7 +13545,7 @@ var ts;
         }
         function parseIncrementExpression() {
             if (token() === 42 || token() === 43) {
-                var node = createNode(186);
+                var node = createNode(190);
                 node.operator = token();
                 nextToken();
                 node.operand = parseLeftHandSideExpressionOrHigher();
@@ -13745,7 +13557,7 @@ var ts;
             var expression = parseLeftHandSideExpressionOrHigher();
             ts.Debug.assert(ts.isLeftHandSideExpression(expression));
             if ((token() === 42 || token() === 43) && !scanner.hasPrecedingLineBreak()) {
-                var node = createNode(187, expression.pos);
+                var node = createNode(191, expression.pos);
                 node.operand = expression;
                 node.operator = token();
                 nextToken();
@@ -13768,7 +13580,7 @@ var ts;
             if (token() === 18 || token() === 22 || token() === 20) {
                 return expression;
             }
-            var node = createNode(173, expression.pos);
+            var node = createNode(177, expression.pos);
             node.expression = expression;
             parseExpectedToken(22, false, ts.Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access);
             node.name = parseRightSideOfDot(true);
@@ -13790,8 +13602,8 @@ var ts;
         function parseJsxElementOrSelfClosingElement(inExpressionContext) {
             var opening = parseJsxOpeningOrSelfClosingElement(inExpressionContext);
             var result;
-            if (opening.kind === 244) {
-                var node = createNode(242, opening.pos);
+            if (opening.kind === 248) {
+                var node = createNode(246, opening.pos);
                 node.openingElement = opening;
                 node.children = parseJsxChildren(node.openingElement.tagName);
                 node.closingElement = parseJsxClosingElement(inExpressionContext);
@@ -13801,14 +13613,14 @@ var ts;
                 result = finishNode(node);
             }
             else {
-                ts.Debug.assert(opening.kind === 243);
+                ts.Debug.assert(opening.kind === 247);
                 result = opening;
             }
             if (inExpressionContext && token() === 26) {
                 var invalidElement = tryParse(function () { return parseJsxElementOrSelfClosingElement(true); });
                 if (invalidElement) {
                     parseErrorAtCurrentToken(ts.Diagnostics.JSX_expressions_must_have_one_parent_element);
-                    var badNode = createNode(188, result.pos);
+                    var badNode = createNode(192, result.pos);
                     badNode.end = invalidElement.end;
                     badNode.left = result;
                     badNode.right = invalidElement;
@@ -13861,7 +13673,7 @@ var ts;
             var attributes = parseList(13, parseJsxAttribute);
             var node;
             if (token() === 28) {
-                node = createNode(244, fullStart);
+                node = createNode(248, fullStart);
                 scanJsxText();
             }
             else {
@@ -13873,7 +13685,7 @@ var ts;
                     parseExpected(28, undefined, false);
                     scanJsxText();
                 }
-                node = createNode(243, fullStart);
+                node = createNode(247, fullStart);
             }
             node.tagName = tagName;
             node.attributes = attributes;
@@ -13884,7 +13696,7 @@ var ts;
             var expression = token() === 98 ?
                 parseTokenNode() : parseIdentifierName();
             while (parseOptional(22)) {
-                var propertyAccess = createNode(173, expression.pos);
+                var propertyAccess = createNode(177, expression.pos);
                 propertyAccess.expression = expression;
                 propertyAccess.name = parseRightSideOfDot(true);
                 expression = finishNode(propertyAccess);
@@ -13892,7 +13704,7 @@ var ts;
             return expression;
         }
         function parseJsxExpression(inExpressionContext) {
-            var node = createNode(248);
+            var node = createNode(252);
             parseExpected(16);
             if (token() !== 17) {
                 node.expression = parseAssignmentExpressionOrHigher();
@@ -13911,7 +13723,7 @@ var ts;
                 return parseJsxSpreadAttribute();
             }
             scanJsxIdentifier();
-            var node = createNode(246);
+            var node = createNode(250);
             node.name = parseIdentifierName();
             if (token() === 57) {
                 switch (scanJsxAttributeValue()) {
@@ -13926,7 +13738,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxSpreadAttribute() {
-            var node = createNode(247);
+            var node = createNode(251);
             parseExpected(16);
             parseExpected(23);
             node.expression = parseExpression();
@@ -13934,7 +13746,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxClosingElement(inExpressionContext) {
-            var node = createNode(245);
+            var node = createNode(249);
             parseExpected(27);
             node.tagName = parseJsxElementName();
             if (inExpressionContext) {
@@ -13947,7 +13759,7 @@ var ts;
             return finishNode(node);
         }
         function parseTypeAssertion() {
-            var node = createNode(178);
+            var node = createNode(182);
             parseExpected(26);
             node.type = parseType();
             parseExpected(28);
@@ -13958,7 +13770,7 @@ var ts;
             while (true) {
                 var dotToken = parseOptionalToken(22);
                 if (dotToken) {
-                    var propertyAccess = createNode(173, expression.pos);
+                    var propertyAccess = createNode(177, expression.pos);
                     propertyAccess.expression = expression;
                     propertyAccess.name = parseRightSideOfDot(true);
                     expression = finishNode(propertyAccess);
@@ -13966,13 +13778,13 @@ var ts;
                 }
                 if (token() === 50 && !scanner.hasPrecedingLineBreak()) {
                     nextToken();
-                    var nonNullExpression = createNode(197, expression.pos);
+                    var nonNullExpression = createNode(201, expression.pos);
                     nonNullExpression.expression = expression;
                     expression = finishNode(nonNullExpression);
                     continue;
                 }
                 if (!inDecoratorContext() && parseOptional(20)) {
-                    var indexedAccess = createNode(174, expression.pos);
+                    var indexedAccess = createNode(178, expression.pos);
                     indexedAccess.expression = expression;
                     if (token() !== 21) {
                         indexedAccess.argumentExpression = allowInAnd(parseExpression);
@@ -13986,7 +13798,7 @@ var ts;
                     continue;
                 }
                 if (token() === 12 || token() === 13) {
-                    var tagExpression = createNode(177, expression.pos);
+                    var tagExpression = createNode(181, expression.pos);
                     tagExpression.tag = expression;
                     tagExpression.template = token() === 12
                         ? parseLiteralNode()
@@ -14005,7 +13817,7 @@ var ts;
                     if (!typeArguments) {
                         return expression;
                     }
-                    var callExpr = createNode(175, expression.pos);
+                    var callExpr = createNode(179, expression.pos);
                     callExpr.expression = expression;
                     callExpr.typeArguments = typeArguments;
                     callExpr.arguments = parseArgumentList();
@@ -14013,7 +13825,7 @@ var ts;
                     continue;
                 }
                 else if (token() === 18) {
-                    var callExpr = createNode(175, expression.pos);
+                    var callExpr = createNode(179, expression.pos);
                     callExpr.expression = expression;
                     callExpr.arguments = parseArgumentList();
                     expression = finishNode(callExpr);
@@ -14032,7 +13844,7 @@ var ts;
             if (!parseOptional(26)) {
                 return undefined;
             }
-            var typeArguments = parseDelimitedList(18, parseType);
+            var typeArguments = parseDelimitedList(19, parseType);
             if (!parseExpected(28)) {
                 return undefined;
             }
@@ -14108,28 +13920,28 @@ var ts;
             return parseIdentifier(ts.Diagnostics.Expression_expected);
         }
         function parseParenthesizedExpression() {
-            var node = createNode(179);
+            var node = createNode(183);
             parseExpected(18);
             node.expression = allowInAnd(parseExpression);
             parseExpected(19);
             return finishNode(node);
         }
         function parseSpreadElement() {
-            var node = createNode(192);
+            var node = createNode(196);
             parseExpected(23);
             node.expression = parseAssignmentExpressionOrHigher();
             return finishNode(node);
         }
         function parseArgumentOrArrayLiteralElement() {
             return token() === 23 ? parseSpreadElement() :
-                token() === 25 ? createNode(194) :
+                token() === 25 ? createNode(198) :
                     parseAssignmentExpressionOrHigher();
         }
         function parseArgumentExpression() {
             return doOutsideOfContext(disallowInAndDecoratorContext, parseArgumentOrArrayLiteralElement);
         }
         function parseArrayLiteralExpression() {
-            var node = createNode(171);
+            var node = createNode(175);
             parseExpected(20);
             if (scanner.hasPrecedingLineBreak()) {
                 node.multiLine = true;
@@ -14140,15 +13952,21 @@ var ts;
         }
         function tryParseAccessorDeclaration(fullStart, decorators, modifiers) {
             if (parseContextualModifier(124)) {
-                return parseAccessorDeclaration(150, fullStart, decorators, modifiers);
-            }
-            else if (parseContextualModifier(132)) {
                 return parseAccessorDeclaration(151, fullStart, decorators, modifiers);
             }
+            else if (parseContextualModifier(133)) {
+                return parseAccessorDeclaration(152, fullStart, decorators, modifiers);
+            }
             return undefined;
         }
         function parseObjectLiteralElement() {
             var fullStart = scanner.getStartPos();
+            var dotDotDotToken = parseOptionalToken(23);
+            if (dotDotDotToken) {
+                var spreadElement = createNode(259, fullStart);
+                spreadElement.expression = parseAssignmentExpressionOrHigher();
+                return addJSDocComment(finishNode(spreadElement));
+            }
             var decorators = parseDecorators();
             var modifiers = parseModifiers();
             var accessor = tryParseAccessorDeclaration(fullStart, decorators, modifiers);
@@ -14164,7 +13982,7 @@ var ts;
             }
             var isShorthandPropertyAssignment = tokenIsIdentifier && (token() === 25 || token() === 17 || token() === 57);
             if (isShorthandPropertyAssignment) {
-                var shorthandDeclaration = createNode(254, fullStart);
+                var shorthandDeclaration = createNode(258, fullStart);
                 shorthandDeclaration.name = propertyName;
                 shorthandDeclaration.questionToken = questionToken;
                 var equalsToken = parseOptionalToken(57);
@@ -14175,7 +13993,7 @@ var ts;
                 return addJSDocComment(finishNode(shorthandDeclaration));
             }
             else {
-                var propertyAssignment = createNode(253, fullStart);
+                var propertyAssignment = createNode(257, fullStart);
                 propertyAssignment.modifiers = modifiers;
                 propertyAssignment.name = propertyName;
                 propertyAssignment.questionToken = questionToken;
@@ -14185,7 +14003,7 @@ var ts;
             }
         }
         function parseObjectLiteralExpression() {
-            var node = createNode(172);
+            var node = createNode(176);
             parseExpected(16);
             if (scanner.hasPrecedingLineBreak()) {
                 node.multiLine = true;
@@ -14199,7 +14017,7 @@ var ts;
             if (saveDecoratorContext) {
                 setDecoratorContext(false);
             }
-            var node = createNode(180);
+            var node = createNode(184);
             node.modifiers = parseModifiers();
             parseExpected(88);
             node.asteriskToken = parseOptionalToken(38);
@@ -14221,7 +14039,7 @@ var ts;
             return isIdentifier() ? parseIdentifier() : undefined;
         }
         function parseNewExpression() {
-            var node = createNode(176);
+            var node = createNode(180);
             parseExpected(93);
             node.expression = parseMemberExpressionOrHigher();
             node.typeArguments = tryParse(parseTypeArgumentsInExpression);
@@ -14231,7 +14049,7 @@ var ts;
             return finishNode(node);
         }
         function parseBlock(ignoreMissingOpenBrace, diagnosticMessage) {
-            var node = createNode(200);
+            var node = createNode(204);
             if (parseExpected(16, diagnosticMessage) || ignoreMissingOpenBrace) {
                 if (scanner.hasPrecedingLineBreak()) {
                     node.multiLine = true;
@@ -14262,12 +14080,12 @@ var ts;
             return block;
         }
         function parseEmptyStatement() {
-            var node = createNode(202);
+            var node = createNode(206);
             parseExpected(24);
             return finishNode(node);
         }
         function parseIfStatement() {
-            var node = createNode(204);
+            var node = createNode(208);
             parseExpected(89);
             parseExpected(18);
             node.expression = allowInAnd(parseExpression);
@@ -14277,7 +14095,7 @@ var ts;
             return finishNode(node);
         }
         function parseDoStatement() {
-            var node = createNode(205);
+            var node = createNode(209);
             parseExpected(80);
             node.statement = parseStatement();
             parseExpected(105);
@@ -14288,7 +14106,7 @@ var ts;
             return finishNode(node);
         }
         function parseWhileStatement() {
-            var node = createNode(206);
+            var node = createNode(210);
             parseExpected(105);
             parseExpected(18);
             node.expression = allowInAnd(parseExpression);
@@ -14311,21 +14129,21 @@ var ts;
             }
             var forOrForInOrForOfStatement;
             if (parseOptional(91)) {
-                var forInStatement = createNode(208, pos);
+                var forInStatement = createNode(212, pos);
                 forInStatement.initializer = initializer;
                 forInStatement.expression = allowInAnd(parseExpression);
                 parseExpected(19);
                 forOrForInOrForOfStatement = forInStatement;
             }
-            else if (parseOptional(139)) {
-                var forOfStatement = createNode(209, pos);
+            else if (parseOptional(140)) {
+                var forOfStatement = createNode(213, pos);
                 forOfStatement.initializer = initializer;
                 forOfStatement.expression = allowInAnd(parseAssignmentExpressionOrHigher);
                 parseExpected(19);
                 forOrForInOrForOfStatement = forOfStatement;
             }
             else {
-                var forStatement = createNode(207, pos);
+                var forStatement = createNode(211, pos);
                 forStatement.initializer = initializer;
                 parseExpected(24);
                 if (token() !== 24 && token() !== 19) {
@@ -14343,7 +14161,7 @@ var ts;
         }
         function parseBreakOrContinueStatement(kind) {
             var node = createNode(kind);
-            parseExpected(kind === 211 ? 71 : 76);
+            parseExpected(kind === 215 ? 71 : 76);
             if (!canParseSemicolon()) {
                 node.label = parseIdentifier();
             }
@@ -14351,7 +14169,7 @@ var ts;
             return finishNode(node);
         }
         function parseReturnStatement() {
-            var node = createNode(212);
+            var node = createNode(216);
             parseExpected(95);
             if (!canParseSemicolon()) {
                 node.expression = allowInAnd(parseExpression);
@@ -14360,7 +14178,7 @@ var ts;
             return finishNode(node);
         }
         function parseWithStatement() {
-            var node = createNode(213);
+            var node = createNode(217);
             parseExpected(106);
             parseExpected(18);
             node.expression = allowInAnd(parseExpression);
@@ -14369,7 +14187,7 @@ var ts;
             return finishNode(node);
         }
         function parseCaseClause() {
-            var node = createNode(249);
+            var node = createNode(253);
             parseExpected(72);
             node.expression = allowInAnd(parseExpression);
             parseExpected(55);
@@ -14377,7 +14195,7 @@ var ts;
             return finishNode(node);
         }
         function parseDefaultClause() {
-            var node = createNode(250);
+            var node = createNode(254);
             parseExpected(78);
             parseExpected(55);
             node.statements = parseList(3, parseStatement);
@@ -14387,12 +14205,12 @@ var ts;
             return token() === 72 ? parseCaseClause() : parseDefaultClause();
         }
         function parseSwitchStatement() {
-            var node = createNode(214);
+            var node = createNode(218);
             parseExpected(97);
             parseExpected(18);
             node.expression = allowInAnd(parseExpression);
             parseExpected(19);
-            var caseBlock = createNode(228, scanner.getStartPos());
+            var caseBlock = createNode(232, scanner.getStartPos());
             parseExpected(16);
             caseBlock.clauses = parseList(2, parseCaseOrDefaultClause);
             parseExpected(17);
@@ -14400,14 +14218,14 @@ var ts;
             return finishNode(node);
         }
         function parseThrowStatement() {
-            var node = createNode(216);
+            var node = createNode(220);
             parseExpected(99);
             node.expression = scanner.hasPrecedingLineBreak() ? undefined : allowInAnd(parseExpression);
             parseSemicolon();
             return finishNode(node);
         }
         function parseTryStatement() {
-            var node = createNode(217);
+            var node = createNode(221);
             parseExpected(101);
             node.tryBlock = parseBlock(false);
             node.catchClause = token() === 73 ? parseCatchClause() : undefined;
@@ -14418,7 +14236,7 @@ var ts;
             return finishNode(node);
         }
         function parseCatchClause() {
-            var result = createNode(252);
+            var result = createNode(256);
             parseExpected(73);
             if (parseExpected(18)) {
                 result.variableDeclaration = parseVariableDeclaration();
@@ -14428,7 +14246,7 @@ var ts;
             return finishNode(result);
         }
         function parseDebuggerStatement() {
-            var node = createNode(218);
+            var node = createNode(222);
             parseExpected(77);
             parseSemicolon();
             return finishNode(node);
@@ -14437,13 +14255,13 @@ var ts;
             var fullStart = scanner.getStartPos();
             var expression = allowInAnd(parseExpression);
             if (expression.kind === 70 && parseOptional(55)) {
-                var labeledStatement = createNode(215, fullStart);
+                var labeledStatement = createNode(219, fullStart);
                 labeledStatement.label = expression;
                 labeledStatement.statement = parseStatement();
                 return addJSDocComment(finishNode(labeledStatement));
             }
             else {
-                var expressionStatement = createNode(203, fullStart);
+                var expressionStatement = createNode(207, fullStart);
                 expressionStatement.expression = expression;
                 parseSemicolon();
                 return addJSDocComment(finishNode(expressionStatement));
@@ -14472,10 +14290,10 @@ var ts;
                     case 82:
                         return true;
                     case 108:
-                    case 135:
+                    case 136:
                         return nextTokenIsIdentifierOnSameLine();
-                    case 126:
                     case 127:
+                    case 128:
                         return nextTokenIsIdentifierOrStringLiteralOnSameLine();
                     case 116:
                     case 119:
@@ -14483,13 +14301,13 @@ var ts;
                     case 111:
                     case 112:
                     case 113:
-                    case 129:
+                    case 130:
                         nextToken();
                         if (scanner.hasPrecedingLineBreak()) {
                             return false;
                         }
                         continue;
-                    case 138:
+                    case 139:
                         nextToken();
                         return token() === 16 || token() === 70 || token() === 83;
                     case 90:
@@ -14547,16 +14365,16 @@ var ts;
                 case 119:
                 case 123:
                 case 108:
-                case 126:
                 case 127:
-                case 135:
-                case 138:
+                case 128:
+                case 136:
+                case 139:
                     return true;
                 case 113:
                 case 111:
                 case 112:
                 case 114:
-                case 129:
+                case 130:
                     return isStartOfDeclaration() || !lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine);
                 default:
                     return isStartOfExpression();
@@ -14595,9 +14413,9 @@ var ts;
                 case 87:
                     return parseForOrForInOrForOfStatement();
                 case 76:
-                    return parseBreakOrContinueStatement(210);
+                    return parseBreakOrContinueStatement(214);
                 case 71:
-                    return parseBreakOrContinueStatement(211);
+                    return parseBreakOrContinueStatement(215);
                 case 95:
                     return parseReturnStatement();
                 case 106:
@@ -14616,9 +14434,9 @@ var ts;
                     return parseDeclaration();
                 case 119:
                 case 108:
-                case 135:
-                case 126:
+                case 136:
                 case 127:
+                case 128:
                 case 123:
                 case 75:
                 case 82:
@@ -14629,8 +14447,8 @@ var ts;
                 case 113:
                 case 116:
                 case 114:
-                case 129:
-                case 138:
+                case 130:
+                case 139:
                     if (isStartOfDeclaration()) {
                         return parseDeclaration();
                     }
@@ -14653,13 +14471,13 @@ var ts;
                     return parseClassDeclaration(fullStart, decorators, modifiers);
                 case 108:
                     return parseInterfaceDeclaration(fullStart, decorators, modifiers);
-                case 135:
+                case 136:
                     return parseTypeAliasDeclaration(fullStart, decorators, modifiers);
                 case 82:
                     return parseEnumDeclaration(fullStart, decorators, modifiers);
-                case 138:
-                case 126:
+                case 139:
                 case 127:
+                case 128:
                     return parseModuleDeclaration(fullStart, decorators, modifiers);
                 case 90:
                     return parseImportDeclarationOrImportEqualsDeclaration(fullStart, decorators, modifiers);
@@ -14676,7 +14494,7 @@ var ts;
                     }
                 default:
                     if (decorators || modifiers) {
-                        var node = createMissingNode(240, true, ts.Diagnostics.Declaration_expected);
+                        var node = createMissingNode(244, true, ts.Diagnostics.Declaration_expected);
                         node.pos = fullStart;
                         node.decorators = decorators;
                         node.modifiers = modifiers;
@@ -14697,16 +14515,17 @@ var ts;
         }
         function parseArrayBindingElement() {
             if (token() === 25) {
-                return createNode(194);
+                return createNode(198);
             }
-            var node = createNode(170);
+            var node = createNode(174);
             node.dotDotDotToken = parseOptionalToken(23);
             node.name = parseIdentifierOrPattern();
             node.initializer = parseBindingElementInitializer(false);
             return finishNode(node);
         }
         function parseObjectBindingElement() {
-            var node = createNode(170);
+            var node = createNode(174);
+            node.dotDotDotToken = parseOptionalToken(23);
             var tokenIsIdentifier = isIdentifier();
             var propertyName = parsePropertyName();
             if (tokenIsIdentifier && token() !== 55) {
@@ -14721,14 +14540,14 @@ var ts;
             return finishNode(node);
         }
         function parseObjectBindingPattern() {
-            var node = createNode(168);
+            var node = createNode(172);
             parseExpected(16);
             node.elements = parseDelimitedList(9, parseObjectBindingElement);
             parseExpected(17);
             return finishNode(node);
         }
         function parseArrayBindingPattern() {
-            var node = createNode(169);
+            var node = createNode(173);
             parseExpected(20);
             node.elements = parseDelimitedList(10, parseArrayBindingElement);
             parseExpected(21);
@@ -14747,7 +14566,7 @@ var ts;
             return parseIdentifier();
         }
         function parseVariableDeclaration() {
-            var node = createNode(219);
+            var node = createNode(223);
             node.name = parseIdentifierOrPattern();
             node.type = parseTypeAnnotation();
             if (!isInOrOfKeyword(token())) {
@@ -14756,7 +14575,7 @@ var ts;
             return finishNode(node);
         }
         function parseVariableDeclarationList(inForStatementInitializer) {
-            var node = createNode(220);
+            var node = createNode(224);
             switch (token()) {
                 case 103:
                     break;
@@ -14770,7 +14589,7 @@ var ts;
                     ts.Debug.fail();
             }
             nextToken();
-            if (token() === 139 && lookAhead(canFollowContextualOfKeyword)) {
+            if (token() === 140 && lookAhead(canFollowContextualOfKeyword)) {
                 node.declarations = createMissingList();
             }
             else {
@@ -14785,7 +14604,7 @@ var ts;
             return nextTokenIsIdentifier() && nextToken() === 19;
         }
         function parseVariableStatement(fullStart, decorators, modifiers) {
-            var node = createNode(201, fullStart);
+            var node = createNode(205, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             node.declarationList = parseVariableDeclarationList(false);
@@ -14793,7 +14612,7 @@ var ts;
             return addJSDocComment(finishNode(node));
         }
         function parseFunctionDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(221, fullStart);
+            var node = createNode(225, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             parseExpected(88);
@@ -14806,7 +14625,7 @@ var ts;
             return addJSDocComment(finishNode(node));
         }
         function parseConstructorDeclaration(pos, decorators, modifiers) {
-            var node = createNode(149, pos);
+            var node = createNode(150, pos);
             node.decorators = decorators;
             node.modifiers = modifiers;
             parseExpected(122);
@@ -14815,7 +14634,7 @@ var ts;
             return addJSDocComment(finishNode(node));
         }
         function parseMethodDeclaration(fullStart, decorators, modifiers, asteriskToken, name, questionToken, diagnosticMessage) {
-            var method = createNode(148, fullStart);
+            var method = createNode(149, fullStart);
             method.decorators = decorators;
             method.modifiers = modifiers;
             method.asteriskToken = asteriskToken;
@@ -14828,7 +14647,7 @@ var ts;
             return addJSDocComment(finishNode(method));
         }
         function parsePropertyDeclaration(fullStart, decorators, modifiers, name, questionToken) {
-            var property = createNode(146, fullStart);
+            var property = createNode(147, fullStart);
             property.decorators = decorators;
             property.modifiers = modifiers;
             property.name = name;
@@ -14836,7 +14655,7 @@ var ts;
             property.type = parseTypeAnnotation();
             property.initializer = ts.hasModifier(property, 32)
                 ? allowInAnd(parseNonParameterInitializer)
-                : doOutsideOfContext(65536 | 32768, parseNonParameterInitializer);
+                : doOutsideOfContext(131072 | 65536, parseNonParameterInitializer);
             parseSemicolon();
             return addJSDocComment(finishNode(property));
         }
@@ -14869,7 +14688,7 @@ var ts;
                 case 111:
                 case 112:
                 case 114:
-                case 129:
+                case 130:
                     return true;
                 default:
                     return false;
@@ -14898,7 +14717,7 @@ var ts;
                 return true;
             }
             if (idToken !== undefined) {
-                if (!ts.isKeyword(idToken) || idToken === 132 || idToken === 124) {
+                if (!ts.isKeyword(idToken) || idToken === 133 || idToken === 124) {
                     return true;
                 }
                 switch (token()) {
@@ -14921,7 +14740,7 @@ var ts;
                 if (!parseOptional(56)) {
                     break;
                 }
-                var decorator = createNode(144, decoratorStart);
+                var decorator = createNode(145, decoratorStart);
                 decorator.expression = doInDecoratorContext(parseLeftHandSideExpressionOrHigher);
                 finishNode(decorator);
                 if (!decorators) {
@@ -14978,7 +14797,7 @@ var ts;
         }
         function parseClassElement() {
             if (token() === 24) {
-                var result = createNode(199);
+                var result = createNode(203);
                 nextToken();
                 return finishNode(result);
             }
@@ -15003,16 +14822,16 @@ var ts;
                 return parsePropertyOrMethodDeclaration(fullStart, decorators, modifiers);
             }
             if (decorators || modifiers) {
-                var name_10 = createMissingNode(70, true, ts.Diagnostics.Declaration_expected);
-                return parsePropertyDeclaration(fullStart, decorators, modifiers, name_10, undefined);
+                var name_14 = createMissingNode(70, true, ts.Diagnostics.Declaration_expected);
+                return parsePropertyDeclaration(fullStart, decorators, modifiers, name_14, undefined);
             }
             ts.Debug.fail("Should not have attempted to parse class member declaration.");
         }
         function parseClassExpression() {
-            return parseClassDeclarationOrExpression(scanner.getStartPos(), undefined, undefined, 193);
+            return parseClassDeclarationOrExpression(scanner.getStartPos(), undefined, undefined, 197);
         }
         function parseClassDeclaration(fullStart, decorators, modifiers) {
-            return parseClassDeclarationOrExpression(fullStart, decorators, modifiers, 222);
+            return parseClassDeclarationOrExpression(fullStart, decorators, modifiers, 226);
         }
         function parseClassDeclarationOrExpression(fullStart, decorators, modifiers, kind) {
             var node = createNode(kind, fullStart);
@@ -15041,13 +14860,13 @@ var ts;
         }
         function parseHeritageClauses() {
             if (isHeritageClause()) {
-                return parseList(20, parseHeritageClause);
+                return parseList(21, parseHeritageClause);
             }
             return undefined;
         }
         function parseHeritageClause() {
             if (token() === 84 || token() === 107) {
-                var node = createNode(251);
+                var node = createNode(255);
                 node.token = token();
                 nextToken();
                 node.types = parseDelimitedList(7, parseExpressionWithTypeArguments);
@@ -15056,10 +14875,10 @@ var ts;
             return undefined;
         }
         function parseExpressionWithTypeArguments() {
-            var node = createNode(195);
+            var node = createNode(199);
             node.expression = parseLeftHandSideExpressionOrHigher();
             if (token() === 26) {
-                node.typeArguments = parseBracketedList(18, parseType, 26, 28);
+                node.typeArguments = parseBracketedList(19, parseType, 26, 28);
             }
             return finishNode(node);
         }
@@ -15070,7 +14889,7 @@ var ts;
             return parseList(5, parseClassElement);
         }
         function parseInterfaceDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(223, fullStart);
+            var node = createNode(227, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             parseExpected(108);
@@ -15081,10 +14900,10 @@ var ts;
             return addJSDocComment(finishNode(node));
         }
         function parseTypeAliasDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(224, fullStart);
+            var node = createNode(228, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
-            parseExpected(135);
+            parseExpected(136);
             node.name = parseIdentifier();
             node.typeParameters = parseTypeParameters();
             parseExpected(57);
@@ -15093,13 +14912,13 @@ var ts;
             return addJSDocComment(finishNode(node));
         }
         function parseEnumMember() {
-            var node = createNode(255, scanner.getStartPos());
+            var node = createNode(260, scanner.getStartPos());
             node.name = parsePropertyName();
             node.initializer = allowInAnd(parseNonParameterInitializer);
             return addJSDocComment(finishNode(node));
         }
         function parseEnumDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(225, fullStart);
+            var node = createNode(229, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             parseExpected(82);
@@ -15114,7 +14933,7 @@ var ts;
             return addJSDocComment(finishNode(node));
         }
         function parseModuleBlock() {
-            var node = createNode(227, scanner.getStartPos());
+            var node = createNode(231, scanner.getStartPos());
             if (parseExpected(16)) {
                 node.statements = parseList(1, parseStatement);
                 parseExpected(17);
@@ -15125,7 +14944,7 @@ var ts;
             return finishNode(node);
         }
         function parseModuleOrNamespaceDeclaration(fullStart, decorators, modifiers, flags) {
-            var node = createNode(226, fullStart);
+            var node = createNode(230, fullStart);
             var namespaceFlag = flags & 16;
             node.decorators = decorators;
             node.modifiers = modifiers;
@@ -15137,10 +14956,10 @@ var ts;
             return addJSDocComment(finishNode(node));
         }
         function parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(226, fullStart);
+            var node = createNode(230, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
-            if (token() === 138) {
+            if (token() === 139) {
                 node.name = parseIdentifier();
                 node.flags |= 512;
             }
@@ -15157,14 +14976,14 @@ var ts;
         }
         function parseModuleDeclaration(fullStart, decorators, modifiers) {
             var flags = 0;
-            if (token() === 138) {
+            if (token() === 139) {
                 return parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers);
             }
-            else if (parseOptional(127)) {
+            else if (parseOptional(128)) {
                 flags |= 16;
             }
             else {
-                parseExpected(126);
+                parseExpected(127);
                 if (token() === 9) {
                     return parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers);
                 }
@@ -15172,7 +14991,7 @@ var ts;
             return parseModuleOrNamespaceDeclaration(fullStart, decorators, modifiers, flags);
         }
         function isExternalModuleReference() {
-            return token() === 130 &&
+            return token() === 131 &&
                 lookAhead(nextTokenIsOpenParen);
         }
         function nextTokenIsOpenParen() {
@@ -15182,13 +15001,13 @@ var ts;
             return nextToken() === 40;
         }
         function parseNamespaceExportDeclaration(fullStart, decorators, modifiers) {
-            var exportDeclaration = createNode(229, fullStart);
+            var exportDeclaration = createNode(233, fullStart);
             exportDeclaration.decorators = decorators;
             exportDeclaration.modifiers = modifiers;
             parseExpected(117);
-            parseExpected(127);
+            parseExpected(128);
             exportDeclaration.name = parseIdentifier();
-            parseExpected(24);
+            parseSemicolon();
             return finishNode(exportDeclaration);
         }
         function parseImportDeclarationOrImportEqualsDeclaration(fullStart, decorators, modifiers) {
@@ -15197,8 +15016,8 @@ var ts;
             var identifier;
             if (isIdentifier()) {
                 identifier = parseIdentifier();
-                if (token() !== 25 && token() !== 137) {
-                    var importEqualsDeclaration = createNode(230, fullStart);
+                if (token() !== 25 && token() !== 138) {
+                    var importEqualsDeclaration = createNode(234, fullStart);
                     importEqualsDeclaration.decorators = decorators;
                     importEqualsDeclaration.modifiers = modifiers;
                     importEqualsDeclaration.name = identifier;
@@ -15208,27 +15027,27 @@ var ts;
                     return addJSDocComment(finishNode(importEqualsDeclaration));
                 }
             }
-            var importDeclaration = createNode(231, fullStart);
+            var importDeclaration = createNode(235, fullStart);
             importDeclaration.decorators = decorators;
             importDeclaration.modifiers = modifiers;
             if (identifier ||
                 token() === 38 ||
                 token() === 16) {
                 importDeclaration.importClause = parseImportClause(identifier, afterImportPos);
-                parseExpected(137);
+                parseExpected(138);
             }
             importDeclaration.moduleSpecifier = parseModuleSpecifier();
             parseSemicolon();
             return finishNode(importDeclaration);
         }
         function parseImportClause(identifier, fullStart) {
-            var importClause = createNode(232, fullStart);
+            var importClause = createNode(236, fullStart);
             if (identifier) {
                 importClause.name = identifier;
             }
             if (!importClause.name ||
                 parseOptional(25)) {
-                importClause.namedBindings = token() === 38 ? parseNamespaceImport() : parseNamedImportsOrExports(234);
+                importClause.namedBindings = token() === 38 ? parseNamespaceImport() : parseNamedImportsOrExports(238);
             }
             return finishNode(importClause);
         }
@@ -15238,8 +15057,8 @@ var ts;
                 : parseEntityName(false);
         }
         function parseExternalModuleReference() {
-            var node = createNode(241);
-            parseExpected(130);
+            var node = createNode(245);
+            parseExpected(131);
             parseExpected(18);
             node.expression = parseModuleSpecifier();
             parseExpected(19);
@@ -15256,7 +15075,7 @@ var ts;
             }
         }
         function parseNamespaceImport() {
-            var namespaceImport = createNode(233);
+            var namespaceImport = createNode(237);
             parseExpected(38);
             parseExpected(117);
             namespaceImport.name = parseIdentifier();
@@ -15264,14 +15083,14 @@ var ts;
         }
         function parseNamedImportsOrExports(kind) {
             var node = createNode(kind);
-            node.elements = parseBracketedList(21, kind === 234 ? parseImportSpecifier : parseExportSpecifier, 16, 17);
+            node.elements = parseBracketedList(22, kind === 238 ? parseImportSpecifier : parseExportSpecifier, 16, 17);
             return finishNode(node);
         }
         function parseExportSpecifier() {
-            return parseImportOrExportSpecifier(239);
+            return parseImportOrExportSpecifier(243);
         }
         function parseImportSpecifier() {
-            return parseImportOrExportSpecifier(235);
+            return parseImportOrExportSpecifier(239);
         }
         function parseImportOrExportSpecifier(kind) {
             var node = createNode(kind);
@@ -15290,23 +15109,23 @@ var ts;
             else {
                 node.name = identifierName;
             }
-            if (kind === 235 && checkIdentifierIsKeyword) {
+            if (kind === 239 && checkIdentifierIsKeyword) {
                 parseErrorAtPosition(checkIdentifierStart, checkIdentifierEnd - checkIdentifierStart, ts.Diagnostics.Identifier_expected);
             }
             return finishNode(node);
         }
         function parseExportDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(237, fullStart);
+            var node = createNode(241, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             if (parseOptional(38)) {
-                parseExpected(137);
+                parseExpected(138);
                 node.moduleSpecifier = parseModuleSpecifier();
             }
             else {
-                node.exportClause = parseNamedImportsOrExports(238);
-                if (token() === 137 || (token() === 9 && !scanner.hasPrecedingLineBreak())) {
-                    parseExpected(137);
+                node.exportClause = parseNamedImportsOrExports(242);
+                if (token() === 138 || (token() === 9 && !scanner.hasPrecedingLineBreak())) {
+                    parseExpected(138);
                     node.moduleSpecifier = parseModuleSpecifier();
                 }
             }
@@ -15314,7 +15133,7 @@ var ts;
             return finishNode(node);
         }
         function parseExportAssignment(fullStart, decorators, modifiers) {
-            var node = createNode(236, fullStart);
+            var node = createNode(240, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             if (parseOptional(57)) {
@@ -15393,50 +15212,14 @@ var ts;
         function setExternalModuleIndicator(sourceFile) {
             sourceFile.externalModuleIndicator = ts.forEach(sourceFile.statements, function (node) {
                 return ts.hasModifier(node, 1)
-                    || node.kind === 230 && node.moduleReference.kind === 241
-                    || node.kind === 231
-                    || node.kind === 236
-                    || node.kind === 237
+                    || node.kind === 234 && node.moduleReference.kind === 245
+                    || node.kind === 235
+                    || node.kind === 240
+                    || node.kind === 241
                     ? node
                     : undefined;
             });
         }
-        var ParsingContext;
-        (function (ParsingContext) {
-            ParsingContext[ParsingContext["SourceElements"] = 0] = "SourceElements";
-            ParsingContext[ParsingContext["BlockStatements"] = 1] = "BlockStatements";
-            ParsingContext[ParsingContext["SwitchClauses"] = 2] = "SwitchClauses";
-            ParsingContext[ParsingContext["SwitchClauseStatements"] = 3] = "SwitchClauseStatements";
-            ParsingContext[ParsingContext["TypeMembers"] = 4] = "TypeMembers";
-            ParsingContext[ParsingContext["ClassMembers"] = 5] = "ClassMembers";
-            ParsingContext[ParsingContext["EnumMembers"] = 6] = "EnumMembers";
-            ParsingContext[ParsingContext["HeritageClauseElement"] = 7] = "HeritageClauseElement";
-            ParsingContext[ParsingContext["VariableDeclarations"] = 8] = "VariableDeclarations";
-            ParsingContext[ParsingContext["ObjectBindingElements"] = 9] = "ObjectBindingElements";
-            ParsingContext[ParsingContext["ArrayBindingElements"] = 10] = "ArrayBindingElements";
-            ParsingContext[ParsingContext["ArgumentExpressions"] = 11] = "ArgumentExpressions";
-            ParsingContext[ParsingContext["ObjectLiteralMembers"] = 12] = "ObjectLiteralMembers";
-            ParsingContext[ParsingContext["JsxAttributes"] = 13] = "JsxAttributes";
-            ParsingContext[ParsingContext["JsxChildren"] = 14] = "JsxChildren";
-            ParsingContext[ParsingContext["ArrayLiteralMembers"] = 15] = "ArrayLiteralMembers";
-            ParsingContext[ParsingContext["Parameters"] = 16] = "Parameters";
-            ParsingContext[ParsingContext["TypeParameters"] = 17] = "TypeParameters";
-            ParsingContext[ParsingContext["TypeArguments"] = 18] = "TypeArguments";
-            ParsingContext[ParsingContext["TupleElementTypes"] = 19] = "TupleElementTypes";
-            ParsingContext[ParsingContext["HeritageClauses"] = 20] = "HeritageClauses";
-            ParsingContext[ParsingContext["ImportOrExportSpecifiers"] = 21] = "ImportOrExportSpecifiers";
-            ParsingContext[ParsingContext["JSDocFunctionParameters"] = 22] = "JSDocFunctionParameters";
-            ParsingContext[ParsingContext["JSDocTypeArguments"] = 23] = "JSDocTypeArguments";
-            ParsingContext[ParsingContext["JSDocRecordMembers"] = 24] = "JSDocRecordMembers";
-            ParsingContext[ParsingContext["JSDocTupleTypes"] = 25] = "JSDocTupleTypes";
-            ParsingContext[ParsingContext["Count"] = 26] = "Count";
-        })(ParsingContext || (ParsingContext = {}));
-        var Tristate;
-        (function (Tristate) {
-            Tristate[Tristate["False"] = 0] = "False";
-            Tristate[Tristate["True"] = 1] = "True";
-            Tristate[Tristate["Unknown"] = 2] = "Unknown";
-        })(Tristate || (Tristate = {}));
         var JSDocParser;
         (function (JSDocParser) {
             function isJSDocType() {
@@ -15457,8 +15240,8 @@ var ts;
             }
             JSDocParser.isJSDocType = isJSDocType;
             function parseJSDocTypeExpressionForTests(content, start, length) {
-                initializeState(content, 4, undefined, 1);
-                sourceFile = createSourceFile("file.js", 4, 1);
+                initializeState(content, 5, undefined, 1);
+                sourceFile = createSourceFile("file.js", 5, 1);
                 scanner.setText(content, start, length);
                 currentToken = scanner.scan();
                 var jsDocTypeExpression = parseJSDocTypeExpression();
@@ -15468,7 +15251,7 @@ var ts;
             }
             JSDocParser.parseJSDocTypeExpressionForTests = parseJSDocTypeExpressionForTests;
             function parseJSDocTypeExpression() {
-                var result = createNode(257, scanner.getTokenPos());
+                var result = createNode(262, scanner.getTokenPos());
                 parseExpected(16);
                 result.type = parseJSDocTopLevelType();
                 parseExpected(17);
@@ -15479,12 +15262,12 @@ var ts;
             function parseJSDocTopLevelType() {
                 var type = parseJSDocType();
                 if (token() === 48) {
-                    var unionType = createNode(261, type.pos);
+                    var unionType = createNode(266, type.pos);
                     unionType.types = parseJSDocTypeList(type);
                     type = finishNode(unionType);
                 }
                 if (token() === 57) {
-                    var optionalType = createNode(268, type.pos);
+                    var optionalType = createNode(273, type.pos);
                     nextToken();
                     optionalType.type = type;
                     type = finishNode(optionalType);
@@ -15495,20 +15278,20 @@ var ts;
                 var type = parseBasicTypeExpression();
                 while (true) {
                     if (token() === 20) {
-                        var arrayType = createNode(260, type.pos);
+                        var arrayType = createNode(265, type.pos);
                         arrayType.elementType = type;
                         nextToken();
                         parseExpected(21);
                         type = finishNode(arrayType);
                     }
                     else if (token() === 54) {
-                        var nullableType = createNode(263, type.pos);
+                        var nullableType = createNode(268, type.pos);
                         nullableType.type = type;
                         nextToken();
                         type = finishNode(nullableType);
                     }
                     else if (token() === 50) {
-                        var nonNullableType = createNode(264, type.pos);
+                        var nonNullableType = createNode(269, type.pos);
                         nonNullableType.type = type;
                         nextToken();
                         type = finishNode(nonNullableType);
@@ -15542,14 +15325,14 @@ var ts;
                     case 98:
                         return parseJSDocThisType();
                     case 118:
-                    case 133:
-                    case 131:
-                    case 121:
                     case 134:
+                    case 132:
+                    case 121:
+                    case 135:
                     case 104:
                     case 94:
-                    case 136:
-                    case 128:
+                    case 137:
+                    case 129:
                         return parseTokenNode();
                     case 9:
                     case 8:
@@ -15560,30 +15343,30 @@ var ts;
                 return parseJSDocTypeReference();
             }
             function parseJSDocThisType() {
-                var result = createNode(272);
+                var result = createNode(277);
                 nextToken();
                 parseExpected(55);
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocConstructorType() {
-                var result = createNode(271);
+                var result = createNode(276);
                 nextToken();
                 parseExpected(55);
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocVariadicType() {
-                var result = createNode(270);
+                var result = createNode(275);
                 nextToken();
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocFunctionType() {
-                var result = createNode(269);
+                var result = createNode(274);
                 nextToken();
                 parseExpected(18);
-                result.parameters = parseDelimitedList(22, parseJSDocParameter);
+                result.parameters = parseDelimitedList(23, parseJSDocParameter);
                 checkForTrailingComma(result.parameters);
                 parseExpected(19);
                 if (token() === 55) {
@@ -15593,7 +15376,7 @@ var ts;
                 return finishNode(result);
             }
             function parseJSDocParameter() {
-                var parameter = createNode(143);
+                var parameter = createNode(144);
                 parameter.type = parseJSDocType();
                 if (parseOptional(57)) {
                     parameter.questionToken = createNode(57);
@@ -15601,7 +15384,7 @@ var ts;
                 return finishNode(parameter);
             }
             function parseJSDocTypeReference() {
-                var result = createNode(267);
+                var result = createNode(272);
                 result.name = parseSimplePropertyName();
                 if (token() === 26) {
                     result.typeArguments = parseTypeArguments();
@@ -15621,7 +15404,7 @@ var ts;
             }
             function parseTypeArguments() {
                 nextToken();
-                var typeArguments = parseDelimitedList(23, parseJSDocType);
+                var typeArguments = parseDelimitedList(24, parseJSDocType);
                 checkForTrailingComma(typeArguments);
                 checkForEmptyTypeArgumentList(typeArguments);
                 parseExpected(28);
@@ -15635,26 +15418,26 @@ var ts;
                 }
             }
             function parseQualifiedName(left) {
-                var result = createNode(140, left.pos);
+                var result = createNode(141, left.pos);
                 result.left = left;
                 result.right = parseIdentifierName();
                 return finishNode(result);
             }
             function parseJSDocRecordType() {
-                var result = createNode(265);
+                var result = createNode(270);
                 result.literal = parseTypeLiteral();
                 return finishNode(result);
             }
             function parseJSDocNonNullableType() {
-                var result = createNode(264);
+                var result = createNode(269);
                 nextToken();
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocTupleType() {
-                var result = createNode(262);
+                var result = createNode(267);
                 nextToken();
-                result.types = parseDelimitedList(25, parseJSDocType);
+                result.types = parseDelimitedList(26, parseJSDocType);
                 checkForTrailingComma(result.types);
                 parseExpected(21);
                 return finishNode(result);
@@ -15666,7 +15449,7 @@ var ts;
                 }
             }
             function parseJSDocUnionType() {
-                var result = createNode(261);
+                var result = createNode(266);
                 nextToken();
                 result.types = parseJSDocTypeList(parseJSDocType());
                 parseExpected(19);
@@ -15682,12 +15465,12 @@ var ts;
                 return types;
             }
             function parseJSDocAllType() {
-                var result = createNode(258);
+                var result = createNode(263);
                 nextToken();
                 return finishNode(result);
             }
             function parseJSDocLiteralType() {
-                var result = createNode(282);
+                var result = createNode(287);
                 result.literal = parseLiteralTypeNode();
                 return finishNode(result);
             }
@@ -15700,17 +15483,17 @@ var ts;
                     token() === 28 ||
                     token() === 57 ||
                     token() === 48) {
-                    var result = createNode(259, pos);
+                    var result = createNode(264, pos);
                     return finishNode(result);
                 }
                 else {
-                    var result = createNode(263, pos);
+                    var result = createNode(268, pos);
                     result.type = parseJSDocType();
                     return finishNode(result);
                 }
             }
             function parseIsolatedJSDocComment(content, start, length) {
-                initializeState(content, 4, undefined, 1);
+                initializeState(content, 5, undefined, 1);
                 sourceFile = { languageVariant: 0, text: content };
                 var jsDoc = parseJSDocCommentWorker(start, length);
                 var diagnostics = parseDiagnostics;
@@ -15732,12 +15515,6 @@ var ts;
                 return comment;
             }
             JSDocParser.parseJSDocComment = parseJSDocComment;
-            var JSDocState;
-            (function (JSDocState) {
-                JSDocState[JSDocState["BeginningOfLine"] = 0] = "BeginningOfLine";
-                JSDocState[JSDocState["SawAsterisk"] = 1] = "SawAsterisk";
-                JSDocState[JSDocState["SavingComments"] = 2] = "SavingComments";
-            })(JSDocState || (JSDocState = {}));
             function parseJSDocCommentWorker(start, length) {
                 var content = sourceText;
                 start = start || 0;
@@ -15770,6 +15547,7 @@ var ts;
                     }
                     if (token() === 4) {
                         state = 0;
+                        indent = 0;
                         nextJSDocToken();
                     }
                     while (token() !== 1) {
@@ -15849,7 +15627,7 @@ var ts;
                         content.charCodeAt(start + 3) !== 42;
                 }
                 function createJSDocComment() {
-                    var result = createNode(273, start);
+                    var result = createNode(278, start);
                     result.tags = tags;
                     result.comment = comments.length ? comments.join("") : undefined;
                     return finishNode(result, end);
@@ -15956,7 +15734,7 @@ var ts;
                     return comments;
                 }
                 function parseUnknownTag(atToken, tagName) {
-                    var result = createNode(274, atToken.pos);
+                    var result = createNode(279, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     return finishNode(result);
@@ -16011,7 +15789,7 @@ var ts;
                     if (!typeExpression) {
                         typeExpression = tryParseTypeExpression();
                     }
-                    var result = createNode(275, atToken.pos);
+                    var result = createNode(280, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.preParameterName = preName;
@@ -16022,20 +15800,20 @@ var ts;
                     return finishNode(result);
                 }
                 function parseReturnTag(atToken, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 276; })) {
+                    if (ts.forEach(tags, function (t) { return t.kind === 281; })) {
                         parseErrorAtPosition(tagName.pos, scanner.getTokenPos() - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
                     }
-                    var result = createNode(276, atToken.pos);
+                    var result = createNode(281, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.typeExpression = tryParseTypeExpression();
                     return finishNode(result);
                 }
                 function parseTypeTag(atToken, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 277; })) {
+                    if (ts.forEach(tags, function (t) { return t.kind === 282; })) {
                         parseErrorAtPosition(tagName.pos, scanner.getTokenPos() - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
                     }
-                    var result = createNode(277, atToken.pos);
+                    var result = createNode(282, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.typeExpression = tryParseTypeExpression();
@@ -16050,7 +15828,7 @@ var ts;
                         parseErrorAtPosition(scanner.getStartPos(), 0, ts.Diagnostics.Identifier_expected);
                         return undefined;
                     }
-                    var result = createNode(280, atToken.pos);
+                    var result = createNode(285, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.name = name;
@@ -16060,18 +15838,25 @@ var ts;
                 function parseTypedefTag(atToken, tagName) {
                     var typeExpression = tryParseTypeExpression();
                     skipWhitespace();
-                    var typedefTag = createNode(279, atToken.pos);
+                    var typedefTag = createNode(284, atToken.pos);
                     typedefTag.atToken = atToken;
                     typedefTag.tagName = tagName;
-                    typedefTag.name = parseJSDocIdentifierName();
+                    typedefTag.fullName = parseJSDocTypeNameWithNamespace(0);
+                    if (typedefTag.fullName) {
+                        var rightNode = typedefTag.fullName;
+                        while (rightNode.kind !== 70) {
+                            rightNode = rightNode.body;
+                        }
+                        typedefTag.name = rightNode;
+                    }
                     typedefTag.typeExpression = typeExpression;
                     skipWhitespace();
                     if (typeExpression) {
-                        if (typeExpression.type.kind === 267) {
+                        if (typeExpression.type.kind === 272) {
                             var jsDocTypeReference = typeExpression.type;
                             if (jsDocTypeReference.name.kind === 70) {
-                                var name_11 = jsDocTypeReference.name;
-                                if (name_11.text === "Object") {
+                                var name_15 = jsDocTypeReference.name;
+                                if (name_15.text === "Object") {
                                     typedefTag.jsDocTypeLiteral = scanChildTags();
                                 }
                             }
@@ -16085,7 +15870,7 @@ var ts;
                     }
                     return finishNode(typedefTag);
                     function scanChildTags() {
-                        var jsDocTypeLiteral = createNode(281, scanner.getStartPos());
+                        var jsDocTypeLiteral = createNode(286, scanner.getStartPos());
                         var resumePos = scanner.getStartPos();
                         var canParseTag = true;
                         var seenAsterisk = false;
@@ -16122,6 +15907,21 @@ var ts;
                         scanner.setTextPos(resumePos);
                         return finishNode(jsDocTypeLiteral);
                     }
+                    function parseJSDocTypeNameWithNamespace(flags) {
+                        var pos = scanner.getTokenPos();
+                        var typeNameOrNamespaceName = parseJSDocIdentifierName();
+                        if (typeNameOrNamespaceName && parseOptional(22)) {
+                            var jsDocNamespaceNode = createNode(230, pos);
+                            jsDocNamespaceNode.flags |= flags;
+                            jsDocNamespaceNode.name = typeNameOrNamespaceName;
+                            jsDocNamespaceNode.body = parseJSDocTypeNameWithNamespace(4);
+                            return jsDocNamespaceNode;
+                        }
+                        if (typeNameOrNamespaceName && flags & 4) {
+                            typeNameOrNamespaceName.isInJSDocNamespace = true;
+                        }
+                        return typeNameOrNamespaceName;
+                    }
                 }
                 function tryParseChildTag(parentTag) {
                     ts.Debug.assert(token() === 56);
@@ -16142,29 +15942,32 @@ var ts;
                             return true;
                         case "prop":
                         case "property":
-                            if (!parentTag.jsDocPropertyTags) {
-                                parentTag.jsDocPropertyTags = [];
-                            }
                             var propertyTag = parsePropertyTag(atToken, tagName);
-                            parentTag.jsDocPropertyTags.push(propertyTag);
-                            return true;
+                            if (propertyTag) {
+                                if (!parentTag.jsDocPropertyTags) {
+                                    parentTag.jsDocPropertyTags = [];
+                                }
+                                parentTag.jsDocPropertyTags.push(propertyTag);
+                                return true;
+                            }
+                            return false;
                     }
                     return false;
                 }
                 function parseTemplateTag(atToken, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 278; })) {
+                    if (ts.forEach(tags, function (t) { return t.kind === 283; })) {
                         parseErrorAtPosition(tagName.pos, scanner.getTokenPos() - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
                     }
                     var typeParameters = createNodeArray();
                     while (true) {
-                        var name_12 = parseJSDocIdentifierName();
+                        var name_16 = parseJSDocIdentifierName();
                         skipWhitespace();
-                        if (!name_12) {
+                        if (!name_16) {
                             parseErrorAtPosition(scanner.getStartPos(), 0, ts.Diagnostics.Identifier_expected);
                             return undefined;
                         }
-                        var typeParameter = createNode(142, name_12.pos);
-                        typeParameter.name = name_12;
+                        var typeParameter = createNode(143, name_16.pos);
+                        typeParameter.name = name_16;
                         finishNode(typeParameter);
                         typeParameters.push(typeParameter);
                         if (token() === 25) {
@@ -16175,7 +15978,7 @@ var ts;
                             break;
                         }
                     }
-                    var result = createNode(278, atToken.pos);
+                    var result = createNode(283, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.typeParameters = typeParameters;
@@ -16489,31 +16292,21 @@ var ts;
                 }
             }
         }
-        var InvalidPosition;
-        (function (InvalidPosition) {
-            InvalidPosition[InvalidPosition["Value"] = -1] = "Value";
-        })(InvalidPosition || (InvalidPosition = {}));
     })(IncrementalParser || (IncrementalParser = {}));
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    (function (ModuleInstanceState) {
-        ModuleInstanceState[ModuleInstanceState["NonInstantiated"] = 0] = "NonInstantiated";
-        ModuleInstanceState[ModuleInstanceState["Instantiated"] = 1] = "Instantiated";
-        ModuleInstanceState[ModuleInstanceState["ConstEnumOnly"] = 2] = "ConstEnumOnly";
-    })(ts.ModuleInstanceState || (ts.ModuleInstanceState = {}));
-    var ModuleInstanceState = ts.ModuleInstanceState;
     function getModuleInstanceState(node) {
-        if (node.kind === 223 || node.kind === 224) {
+        if (node.kind === 227 || node.kind === 228) {
             return 0;
         }
         else if (ts.isConstEnumDeclaration(node)) {
             return 2;
         }
-        else if ((node.kind === 231 || node.kind === 230) && !(ts.hasModifier(node, 1))) {
+        else if ((node.kind === 235 || node.kind === 234) && !(ts.hasModifier(node, 1))) {
             return 0;
         }
-        else if (node.kind === 227) {
+        else if (node.kind === 231) {
             var state_1 = 0;
             ts.forEachChild(node, function (n) {
                 switch (getModuleInstanceState(n)) {
@@ -16529,27 +16322,18 @@ var ts;
             });
             return state_1;
         }
-        else if (node.kind === 226) {
+        else if (node.kind === 230) {
             var body = node.body;
             return body ? getModuleInstanceState(body) : 1;
         }
+        else if (node.kind === 70 && node.isInJSDocNamespace) {
+            return 0;
+        }
         else {
             return 1;
         }
     }
     ts.getModuleInstanceState = getModuleInstanceState;
-    var ContainerFlags;
-    (function (ContainerFlags) {
-        ContainerFlags[ContainerFlags["None"] = 0] = "None";
-        ContainerFlags[ContainerFlags["IsContainer"] = 1] = "IsContainer";
-        ContainerFlags[ContainerFlags["IsBlockScopedContainer"] = 2] = "IsBlockScopedContainer";
-        ContainerFlags[ContainerFlags["IsControlFlowContainer"] = 4] = "IsControlFlowContainer";
-        ContainerFlags[ContainerFlags["IsFunctionLike"] = 8] = "IsFunctionLike";
-        ContainerFlags[ContainerFlags["IsFunctionExpression"] = 16] = "IsFunctionExpression";
-        ContainerFlags[ContainerFlags["HasLocals"] = 32] = "HasLocals";
-        ContainerFlags[ContainerFlags["IsInterface"] = 64] = "IsInterface";
-        ContainerFlags[ContainerFlags["IsObjectLiteralOrClassExpressionMethod"] = 128] = "IsObjectLiteralOrClassExpressionMethod";
-    })(ContainerFlags || (ContainerFlags = {}));
     var binder = createBinder();
     function bindSourceFile(file, options) {
         ts.performance.mark("beforeBind");
@@ -16647,7 +16431,7 @@ var ts;
             if (symbolFlags & 107455) {
                 var valueDeclaration = symbol.valueDeclaration;
                 if (!valueDeclaration ||
-                    (valueDeclaration.kind !== node.kind && valueDeclaration.kind === 226)) {
+                    (valueDeclaration.kind !== node.kind && valueDeclaration.kind === 230)) {
                     symbol.valueDeclaration = node;
                 }
             }
@@ -16657,7 +16441,7 @@ var ts;
                 if (ts.isAmbientModule(node)) {
                     return ts.isGlobalScopeAugmentation(node) ? "__global" : "\"" + node.name.text + "\"";
                 }
-                if (node.name.kind === 141) {
+                if (node.name.kind === 142) {
                     var nameExpression = node.name.expression;
                     if (ts.isStringOrNumericLiteral(nameExpression.kind)) {
                         return nameExpression.text;
@@ -16668,21 +16452,21 @@ var ts;
                 return node.name.text;
             }
             switch (node.kind) {
-                case 149:
+                case 150:
                     return "__constructor";
-                case 157:
-                case 152:
-                    return "__call";
                 case 158:
                 case 153:
-                    return "__new";
+                    return "__call";
+                case 159:
                 case 154:
+                    return "__new";
+                case 155:
                     return "__index";
-                case 237:
+                case 241:
                     return "__export";
-                case 236:
+                case 240:
                     return node.isExportEquals ? "export=" : "default";
-                case 188:
+                case 192:
                     switch (ts.getSpecialPropertyAssignmentKind(node)) {
                         case 2:
                             return "export=";
@@ -16694,20 +16478,20 @@ var ts;
                     }
                     ts.Debug.fail("Unknown binary declaration kind");
                     break;
-                case 221:
-                case 222:
+                case 225:
+                case 226:
                     return ts.hasModifier(node, 512) ? "default" : undefined;
-                case 269:
+                case 274:
                     return ts.isJSDocConstructSignature(node) ? "__new" : "__call";
-                case 143:
-                    ts.Debug.assert(node.parent.kind === 269);
+                case 144:
+                    ts.Debug.assert(node.parent.kind === 274);
                     var functionType = node.parent;
                     var index = ts.indexOf(functionType.parameters, node);
                     return "arg" + index;
-                case 279:
+                case 284:
                     var parentNode = node.parent && node.parent.parent;
                     var nameFromParentNode = void 0;
-                    if (parentNode && parentNode.kind === 201) {
+                    if (parentNode && parentNode.kind === 205) {
                         if (parentNode.declarationList.declarations.length > 0) {
                             var nameIdentifier = parentNode.declarationList.declarations[0].name;
                             if (nameIdentifier.kind === 70) {
@@ -16751,7 +16535,7 @@ var ts;
                             }
                             else {
                                 if (symbol.declarations && symbol.declarations.length &&
-                                    (isDefaultExport || (node.kind === 236 && !node.isExportEquals))) {
+                                    (isDefaultExport || (node.kind === 240 && !node.isExportEquals))) {
                                     message_1 = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
                                 }
                             }
@@ -16771,7 +16555,7 @@ var ts;
         function declareModuleMember(node, symbolFlags, symbolExcludes) {
             var hasExportModifier = ts.getCombinedModifierFlags(node) & 1;
             if (symbolFlags & 8388608) {
-                if (node.kind === 239 || (node.kind === 230 && hasExportModifier)) {
+                if (node.kind === 243 || (node.kind === 234 && hasExportModifier)) {
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
                 }
                 else {
@@ -16779,7 +16563,11 @@ var ts;
                 }
             }
             else {
-                if (!ts.isAmbientModule(node) && (hasExportModifier || container.flags & 32)) {
+                var isJSDocTypedefInJSDocNamespace = node.kind === 284 &&
+                    node.name &&
+                    node.name.kind === 70 &&
+                    node.name.isInJSDocNamespace;
+                if ((!ts.isAmbientModule(node) && (hasExportModifier || container.flags & 32)) || isJSDocTypedefInJSDocNamespace) {
                     var exportKind = (symbolFlags & 107455 ? 1048576 : 0) |
                         (symbolFlags & 793064 ? 2097152 : 0) |
                         (symbolFlags & 1920 ? 4194304 : 0);
@@ -16814,7 +16602,7 @@ var ts;
                 var saveReturnTarget = currentReturnTarget;
                 var saveActiveLabels = activeLabels;
                 var saveHasExplicitReturn = hasExplicitReturn;
-                var isIIFE = containerFlags & 16 && !!ts.getImmediatelyInvokedFunctionExpression(node);
+                var isIIFE = containerFlags & 16 && !ts.hasModifier(node, 256) && !!ts.getImmediatelyInvokedFunctionExpression(node);
                 if (isIIFE) {
                     currentReturnTarget = createBranchLabel();
                 }
@@ -16830,13 +16618,13 @@ var ts;
                 activeLabels = undefined;
                 hasExplicitReturn = false;
                 bindChildren(node);
-                node.flags &= ~32128;
+                node.flags &= ~64896;
                 if (!(currentFlow.flags & 1) && containerFlags & 8 && ts.nodeIsPresent(node.body)) {
                     node.flags |= 128;
                     if (hasExplicitReturn)
                         node.flags |= 256;
                 }
-                if (node.kind === 256) {
+                if (node.kind === 261) {
                     node.flags |= emitFlags;
                 }
                 if (isIIFE) {
@@ -16871,6 +16659,7 @@ var ts;
                 skipTransformFlagAggregation = true;
                 bindChildrenWorker(node);
                 skipTransformFlagAggregation = false;
+                subtreeTransformFlags |= node.transformFlags & ~getTransformFlagsSubtreeExclusions(node.kind);
             }
             else {
                 var savedSubtreeTransformFlags = subtreeTransformFlags;
@@ -16888,64 +16677,64 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 206:
+                case 210:
                     bindWhileStatement(node);
                     break;
-                case 205:
+                case 209:
                     bindDoStatement(node);
                     break;
-                case 207:
+                case 211:
                     bindForStatement(node);
                     break;
-                case 208:
-                case 209:
+                case 212:
+                case 213:
                     bindForInOrForOfStatement(node);
                     break;
-                case 204:
+                case 208:
                     bindIfStatement(node);
                     break;
-                case 212:
                 case 216:
+                case 220:
                     bindReturnOrThrow(node);
                     break;
-                case 211:
-                case 210:
+                case 215:
+                case 214:
                     bindBreakOrContinueStatement(node);
                     break;
-                case 217:
+                case 221:
                     bindTryStatement(node);
                     break;
-                case 214:
+                case 218:
                     bindSwitchStatement(node);
                     break;
-                case 228:
+                case 232:
                     bindCaseBlock(node);
                     break;
-                case 249:
+                case 253:
                     bindCaseClause(node);
                     break;
-                case 215:
+                case 219:
                     bindLabeledStatement(node);
                     break;
-                case 186:
+                case 190:
                     bindPrefixUnaryExpressionFlow(node);
                     break;
-                case 187:
+                case 191:
                     bindPostfixUnaryExpressionFlow(node);
                     break;
-                case 188:
+                case 192:
                     bindBinaryExpressionFlow(node);
                     break;
-                case 182:
+                case 186:
                     bindDeleteExpressionFlow(node);
                     break;
-                case 189:
+                case 193:
                     bindConditionalExpressionFlow(node);
                     break;
-                case 219:
+                case 223:
                     bindVariableDeclarationFlow(node);
                     break;
-                case 175:
+                case 179:
                     bindCallExpressionFlow(node);
                     break;
                 default:
@@ -16957,15 +16746,15 @@ var ts;
             switch (expr.kind) {
                 case 70:
                 case 98:
-                case 173:
+                case 177:
                     return isNarrowableReference(expr);
-                case 175:
-                    return hasNarrowableArgument(expr);
                 case 179:
+                    return hasNarrowableArgument(expr);
+                case 183:
                     return isNarrowingExpression(expr.expression);
-                case 188:
+                case 192:
                     return isNarrowingBinaryExpression(expr);
-                case 186:
+                case 190:
                     return expr.operator === 50 && isNarrowingExpression(expr.operand);
             }
             return false;
@@ -16973,7 +16762,7 @@ var ts;
         function isNarrowableReference(expr) {
             return expr.kind === 70 ||
                 expr.kind === 98 ||
-                expr.kind === 173 && isNarrowableReference(expr.expression);
+                expr.kind === 177 && isNarrowableReference(expr.expression);
         }
         function hasNarrowableArgument(expr) {
             if (expr.arguments) {
@@ -16984,14 +16773,14 @@ var ts;
                     }
                 }
             }
-            if (expr.expression.kind === 173 &&
+            if (expr.expression.kind === 177 &&
                 isNarrowableReference(expr.expression.expression)) {
                 return true;
             }
             return false;
         }
         function isNarrowingTypeofOperands(expr1, expr2) {
-            return expr1.kind === 183 && isNarrowableOperand(expr1.expression) && expr2.kind === 9;
+            return expr1.kind === 187 && isNarrowableOperand(expr1.expression) && expr2.kind === 9;
         }
         function isNarrowingBinaryExpression(expr) {
             switch (expr.operatorToken.kind) {
@@ -17012,9 +16801,9 @@ var ts;
         }
         function isNarrowableOperand(expr) {
             switch (expr.kind) {
-                case 179:
+                case 183:
                     return isNarrowableOperand(expr.expression);
-                case 188:
+                case 192:
                     switch (expr.operatorToken.kind) {
                         case 57:
                             return isNarrowableOperand(expr.left);
@@ -17108,33 +16897,33 @@ var ts;
         function isStatementCondition(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 204:
-                case 206:
-                case 205:
+                case 208:
+                case 210:
+                case 209:
                     return parent.expression === node;
-                case 207:
-                case 189:
+                case 211:
+                case 193:
                     return parent.condition === node;
             }
             return false;
         }
         function isLogicalExpression(node) {
             while (true) {
-                if (node.kind === 179) {
+                if (node.kind === 183) {
                     node = node.expression;
                 }
-                else if (node.kind === 186 && node.operator === 50) {
+                else if (node.kind === 190 && node.operator === 50) {
                     node = node.operand;
                 }
                 else {
-                    return node.kind === 188 && (node.operatorToken.kind === 52 ||
+                    return node.kind === 192 && (node.operatorToken.kind === 52 ||
                         node.operatorToken.kind === 53);
                 }
             }
         }
         function isTopLevelLogicalExpression(node) {
-            while (node.parent.kind === 179 ||
-                node.parent.kind === 186 &&
+            while (node.parent.kind === 183 ||
+                node.parent.kind === 190 &&
                     node.parent.operator === 50) {
                 node = node.parent;
             }
@@ -17176,8 +16965,11 @@ var ts;
         }
         function bindDoStatement(node) {
             var preDoLabel = createLoopLabel();
-            var preConditionLabel = createBranchLabel();
-            var postDoLabel = createBranchLabel();
+            var enclosingLabeledStatement = node.parent.kind === 219
+                ? ts.lastOrUndefined(activeLabels)
+                : undefined;
+            var preConditionLabel = enclosingLabeledStatement ? enclosingLabeledStatement.continueTarget : createBranchLabel();
+            var postDoLabel = enclosingLabeledStatement ? enclosingLabeledStatement.breakTarget : createBranchLabel();
             addAntecedent(preDoLabel, currentFlow);
             currentFlow = preDoLabel;
             bindIterativeStatement(node.statement, postDoLabel, preConditionLabel);
@@ -17208,7 +17000,7 @@ var ts;
             bind(node.expression);
             addAntecedent(postLoopLabel, currentFlow);
             bind(node.initializer);
-            if (node.initializer.kind !== 220) {
+            if (node.initializer.kind !== 224) {
                 bindAssignmentTargetFlow(node.initializer);
             }
             bindIterativeStatement(node.statement, postLoopLabel, preLoopLabel);
@@ -17230,7 +17022,7 @@ var ts;
         }
         function bindReturnOrThrow(node) {
             bind(node.expression);
-            if (node.kind === 212) {
+            if (node.kind === 216) {
                 hasExplicitReturn = true;
                 if (currentReturnTarget) {
                     addAntecedent(currentReturnTarget, currentFlow);
@@ -17250,7 +17042,7 @@ var ts;
             return undefined;
         }
         function bindbreakOrContinueFlow(node, breakTarget, continueTarget) {
-            var flowLabel = node.kind === 211 ? breakTarget : continueTarget;
+            var flowLabel = node.kind === 215 ? breakTarget : continueTarget;
             if (flowLabel) {
                 addAntecedent(flowLabel, currentFlow);
                 currentFlow = unreachableFlow;
@@ -17307,7 +17099,7 @@ var ts;
             preSwitchCaseFlow = currentFlow;
             bind(node.caseBlock);
             addAntecedent(postSwitchLabel, currentFlow);
-            var hasDefault = ts.forEach(node.caseBlock.clauses, function (c) { return c.kind === 250; });
+            var hasDefault = ts.forEach(node.caseBlock.clauses, function (c) { return c.kind === 254; });
             node.possiblyExhaustive = !hasDefault && !postSwitchLabel.antecedents;
             if (!hasDefault) {
                 addAntecedent(postSwitchLabel, createFlowSwitchClause(preSwitchCaseFlow, node, 0, 0));
@@ -17368,11 +17160,13 @@ var ts;
             if (!activeLabel.referenced && !options.allowUnusedLabels) {
                 file.bindDiagnostics.push(ts.createDiagnosticForNode(node.label, ts.Diagnostics.Unused_label));
             }
-            addAntecedent(postStatementLabel, currentFlow);
-            currentFlow = finishFlowLabel(postStatementLabel);
+            if (!node.statement || node.statement.kind !== 209) {
+                addAntecedent(postStatementLabel, currentFlow);
+                currentFlow = finishFlowLabel(postStatementLabel);
+            }
         }
         function bindDestructuringTargetFlow(node) {
-            if (node.kind === 188 && node.operatorToken.kind === 57) {
+            if (node.kind === 192 && node.operatorToken.kind === 57) {
                 bindAssignmentTargetFlow(node.left);
             }
             else {
@@ -17383,10 +17177,10 @@ var ts;
             if (isNarrowableReference(node)) {
                 currentFlow = createFlowAssignment(currentFlow, node);
             }
-            else if (node.kind === 171) {
+            else if (node.kind === 175) {
                 for (var _i = 0, _a = node.elements; _i < _a.length; _i++) {
                     var e = _a[_i];
-                    if (e.kind === 192) {
+                    if (e.kind === 196) {
                         bindAssignmentTargetFlow(e.expression);
                     }
                     else {
@@ -17394,15 +17188,18 @@ var ts;
                     }
                 }
             }
-            else if (node.kind === 172) {
+            else if (node.kind === 176) {
                 for (var _b = 0, _c = node.properties; _b < _c.length; _b++) {
                     var p = _c[_b];
-                    if (p.kind === 253) {
+                    if (p.kind === 257) {
                         bindDestructuringTargetFlow(p.initializer);
                     }
-                    else if (p.kind === 254) {
+                    else if (p.kind === 258) {
                         bindAssignmentTargetFlow(p.name);
                     }
+                    else if (p.kind === 259) {
+                        bindAssignmentTargetFlow(p.expression);
+                    }
                 }
             }
         }
@@ -17454,9 +17251,9 @@ var ts;
             }
             else {
                 ts.forEachChild(node, bind);
-                if (operator === 57 && !ts.isAssignmentTarget(node)) {
+                if (ts.isAssignmentOperator(operator) && !ts.isAssignmentTarget(node)) {
                     bindAssignmentTargetFlow(node.left);
-                    if (node.left.kind === 174) {
+                    if (operator === 57 && node.left.kind === 178) {
                         var elementAccess = node.left;
                         if (isNarrowableOperand(elementAccess.expression)) {
                             currentFlow = createFlowArrayMutation(currentFlow, node);
@@ -17467,7 +17264,7 @@ var ts;
         }
         function bindDeleteExpressionFlow(node) {
             ts.forEachChild(node, bind);
-            if (node.expression.kind === 173) {
+            if (node.expression.kind === 177) {
                 bindAssignmentTargetFlow(node.expression);
             }
         }
@@ -17477,9 +17274,11 @@ var ts;
             var postExpressionLabel = createBranchLabel();
             bindCondition(node.condition, trueLabel, falseLabel);
             currentFlow = finishFlowLabel(trueLabel);
+            bind(node.questionToken);
             bind(node.whenTrue);
             addAntecedent(postExpressionLabel, currentFlow);
             currentFlow = finishFlowLabel(falseLabel);
+            bind(node.colonToken);
             bind(node.whenFalse);
             addAntecedent(postExpressionLabel, currentFlow);
             currentFlow = finishFlowLabel(postExpressionLabel);
@@ -17498,16 +17297,16 @@ var ts;
         }
         function bindVariableDeclarationFlow(node) {
             ts.forEachChild(node, bind);
-            if (node.initializer || node.parent.parent.kind === 208 || node.parent.parent.kind === 209) {
+            if (node.initializer || node.parent.parent.kind === 212 || node.parent.parent.kind === 213) {
                 bindInitializedVariableFlow(node);
             }
         }
         function bindCallExpressionFlow(node) {
             var expr = node.expression;
-            while (expr.kind === 179) {
+            while (expr.kind === 183) {
                 expr = expr.expression;
             }
-            if (expr.kind === 180 || expr.kind === 181) {
+            if (expr.kind === 184 || expr.kind === 185) {
                 ts.forEach(node.typeArguments, bind);
                 ts.forEach(node.arguments, bind);
                 bind(node.expression);
@@ -17515,7 +17314,7 @@ var ts;
             else {
                 ts.forEachChild(node, bind);
             }
-            if (node.expression.kind === 173) {
+            if (node.expression.kind === 177) {
                 var propertyAccess = node.expression;
                 if (isNarrowableOperand(propertyAccess.expression) && ts.isPushOrUnshiftIdentifier(propertyAccess.name)) {
                     currentFlow = createFlowArrayMutation(currentFlow, node);
@@ -17524,51 +17323,52 @@ var ts;
         }
         function getContainerFlags(node) {
             switch (node.kind) {
-                case 193:
-                case 222:
-                case 225:
-                case 172:
-                case 160:
-                case 281:
-                case 265:
-                    return 1;
-                case 223:
-                    return 1 | 64;
-                case 269:
+                case 197:
                 case 226:
-                case 224:
+                case 229:
+                case 176:
+                case 161:
+                case 286:
+                case 270:
+                    return 1;
+                case 227:
+                    return 1 | 64;
+                case 274:
+                case 230:
+                case 228:
+                case 170:
                     return 1 | 32;
-                case 256:
+                case 261:
                     return 1 | 4 | 32;
-                case 148:
+                case 149:
                     if (ts.isObjectLiteralOrClassExpressionMethod(node)) {
                         return 1 | 4 | 32 | 8 | 128;
                     }
-                case 149:
-                case 221:
-                case 147:
                 case 150:
+                case 225:
+                case 148:
                 case 151:
                 case 152:
                 case 153:
                 case 154:
-                case 157:
+                case 155:
                 case 158:
+                case 159:
                     return 1 | 4 | 32 | 8;
-                case 180:
-                case 181:
+                case 184:
+                case 185:
                     return 1 | 4 | 32 | 8 | 16;
-                case 227:
+                case 231:
                     return 4;
-                case 146:
+                case 147:
                     return node.initializer ? 4 : 0;
-                case 252:
-                case 207:
-                case 208:
-                case 209:
-                case 228:
+                case 256:
+                case 211:
+                case 212:
+                case 213:
+                case 232:
                     return 2;
-                case 200:
+                case 204:
                     return ts.isFunctionLike(node.parent) ? 0 : 2;
             }
             return 0;
@@ -17584,36 +17384,37 @@ var ts;
         }
         function declareSymbolAndAddToSymbolTableWorker(node, symbolFlags, symbolExcludes) {
             switch (container.kind) {
-                case 226:
+                case 230:
                     return declareModuleMember(node, symbolFlags, symbolExcludes);
-                case 256:
+                case 261:
                     return declareSourceFileMember(node, symbolFlags, symbolExcludes);
-                case 193:
-                case 222:
+                case 197:
+                case 226:
                     return declareClassMember(node, symbolFlags, symbolExcludes);
-                case 225:
+                case 229:
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
-                case 160:
-                case 172:
-                case 223:
-                case 265:
-                case 281:
+                case 161:
+                case 176:
+                case 227:
+                case 270:
+                case 286:
                     return declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
-                case 157:
                 case 158:
-                case 152:
+                case 159:
                 case 153:
                 case 154:
-                case 148:
-                case 147:
+                case 155:
                 case 149:
+                case 148:
                 case 150:
                 case 151:
-                case 221:
-                case 180:
-                case 181:
-                case 269:
-                case 224:
+                case 152:
+                case 225:
+                case 184:
+                case 185:
+                case 274:
+                case 228:
+                case 170:
                     return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes);
             }
         }
@@ -17628,11 +17429,11 @@ var ts;
                 : declareSymbol(file.locals, undefined, node, symbolFlags, symbolExcludes);
         }
         function hasExportDeclarations(node) {
-            var body = node.kind === 256 ? node : node.body;
-            if (body && (body.kind === 256 || body.kind === 227)) {
+            var body = node.kind === 261 ? node : node.body;
+            if (body && (body.kind === 261 || body.kind === 231)) {
                 for (var _i = 0, _a = body.statements; _i < _a.length; _i++) {
                     var stat = _a[_i];
-                    if (stat.kind === 237 || stat.kind === 236) {
+                    if (stat.kind === 241 || stat.kind === 240) {
                         return true;
                     }
                 }
@@ -17704,20 +17505,15 @@ var ts;
             typeLiteralSymbol.members[symbol.name] = symbol;
         }
         function bindObjectLiteralExpression(node) {
-            var ElementKind;
-            (function (ElementKind) {
-                ElementKind[ElementKind["Property"] = 1] = "Property";
-                ElementKind[ElementKind["Accessor"] = 2] = "Accessor";
-            })(ElementKind || (ElementKind = {}));
             if (inStrictMode) {
                 var seen = ts.createMap();
                 for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                     var prop = _a[_i];
-                    if (prop.name.kind !== 70) {
+                    if (prop.kind === 259 || prop.name.kind !== 70) {
                         continue;
                     }
                     var identifier = prop.name;
-                    var currentKind = prop.kind === 253 || prop.kind === 254 || prop.kind === 148
+                    var currentKind = prop.kind === 257 || prop.kind === 258 || prop.kind === 149
                         ? 1
                         : 2;
                     var existingKind = seen[identifier.text];
@@ -17739,10 +17535,10 @@ var ts;
         }
         function bindBlockScopedDeclaration(node, symbolFlags, symbolExcludes) {
             switch (blockScopeContainer.kind) {
-                case 226:
+                case 230:
                     declareModuleMember(node, symbolFlags, symbolExcludes);
                     break;
-                case 256:
+                case 261:
                     if (ts.isExternalModule(container)) {
                         declareModuleMember(node, symbolFlags, symbolExcludes);
                         break;
@@ -17832,8 +17628,8 @@ var ts;
         }
         function checkStrictModeFunctionDeclaration(node) {
             if (languageVersion < 2) {
-                if (blockScopeContainer.kind !== 256 &&
-                    blockScopeContainer.kind !== 226 &&
+                if (blockScopeContainer.kind !== 261 &&
+                    blockScopeContainer.kind !== 230 &&
                     !ts.isFunctionLike(blockScopeContainer)) {
                     var errorSpan = ts.getErrorSpanForNode(file, node);
                     file.bindDiagnostics.push(ts.createFileDiagnostic(file, errorSpan.start, errorSpan.length, getStrictModeBlockScopeFunctionDeclarationMessage(node)));
@@ -17876,7 +17672,7 @@ var ts;
             node.parent = parent;
             var saveInStrictMode = inStrictMode;
             bindWorker(node);
-            if (node.kind > 139) {
+            if (node.kind > 140) {
                 var saveParent = parent;
                 parent = node;
                 var containerFlags = getContainerFlags(node);
@@ -17914,17 +17710,25 @@ var ts;
         function bindWorker(node) {
             switch (node.kind) {
                 case 70:
+                    if (node.isInJSDocNamespace) {
+                        var parentNode = node.parent;
+                        while (parentNode && parentNode.kind !== 284) {
+                            parentNode = parentNode.parent;
+                        }
+                        bindBlockScopedDeclaration(parentNode, 524288, 793064);
+                        break;
+                    }
                 case 98:
-                    if (currentFlow && (ts.isExpression(node) || parent.kind === 254)) {
+                    if (currentFlow && (ts.isExpression(node) || parent.kind === 258)) {
                         node.flowNode = currentFlow;
                     }
                     return checkStrictModeIdentifier(node);
-                case 173:
+                case 177:
                     if (currentFlow && isNarrowableReference(node)) {
                         node.flowNode = currentFlow;
                     }
                     break;
-                case 188:
+                case 192:
                     if (ts.isInJavaScriptFile(node)) {
                         var specialKind = ts.getSpecialPropertyAssignmentKind(node);
                         switch (specialKind) {
@@ -17947,111 +17751,132 @@ var ts;
                         }
                     }
                     return checkStrictModeBinaryExpression(node);
-                case 252:
+                case 256:
                     return checkStrictModeCatchClause(node);
-                case 182:
+                case 186:
                     return checkStrictModeDeleteExpression(node);
                 case 8:
                     return checkStrictModeNumericLiteral(node);
-                case 187:
+                case 191:
                     return checkStrictModePostfixUnaryExpression(node);
-                case 186:
+                case 190:
                     return checkStrictModePrefixUnaryExpression(node);
-                case 213:
+                case 217:
                     return checkStrictModeWithStatement(node);
-                case 166:
+                case 167:
                     seenThisKeyword = true;
                     return;
-                case 155:
+                case 156:
                     return checkTypePredicate(node);
-                case 142:
-                    return declareSymbolAndAddToSymbolTable(node, 262144, 530920);
                 case 143:
+                    return declareSymbolAndAddToSymbolTable(node, 262144, 530920);
+                case 144:
                     return bindParameter(node);
-                case 219:
-                case 170:
+                case 223:
+                case 174:
+                    if (node.dotDotDotToken && node.parent.kind === 172) {
+                        emitFlags |= 32768;
+                    }
                     return bindVariableDeclarationOrBindingElement(node);
+                case 147:
                 case 146:
-                case 145:
-                case 266:
+                case 271:
                     return bindPropertyOrMethodOrAccessor(node, 4 | (node.questionToken ? 536870912 : 0), 0);
-                case 280:
+                case 285:
                     return bindJSDocProperty(node);
-                case 253:
-                case 254:
+                case 257:
+                case 258:
                     return bindPropertyOrMethodOrAccessor(node, 4, 0);
-                case 255:
+                case 260:
                     return bindPropertyOrMethodOrAccessor(node, 8, 900095);
-                case 247:
-                    emitFlags |= 16384;
+                case 259:
+                case 251:
+                    var root = container;
+                    var hasRest = false;
+                    while (root.parent) {
+                        if (root.kind === 176 &&
+                            root.parent.kind === 192 &&
+                            root.parent.operatorToken.kind === 57 &&
+                            root.parent.left === root) {
+                            hasRest = true;
+                            break;
+                        }
+                        root = root.parent;
+                    }
+                    emitFlags |= hasRest ? 32768 : 16384;
                     return;
-                case 152:
                 case 153:
                 case 154:
+                case 155:
                     return declareSymbolAndAddToSymbolTable(node, 131072, 0);
-                case 148:
-                case 147:
-                    return bindPropertyOrMethodOrAccessor(node, 8192 | (node.questionToken ? 536870912 : 0), ts.isObjectLiteralMethod(node) ? 0 : 99263);
-                case 221:
-                    return bindFunctionDeclaration(node);
                 case 149:
-                    return declareSymbolAndAddToSymbolTable(node, 16384, 0);
+                case 148:
+                    return bindPropertyOrMethodOrAccessor(node, 8192 | (node.questionToken ? 536870912 : 0), ts.isObjectLiteralMethod(node) ? 0 : 99263);
+                case 225:
+                    return bindFunctionDeclaration(node);
                 case 150:
-                    return bindPropertyOrMethodOrAccessor(node, 32768, 41919);
+                    return declareSymbolAndAddToSymbolTable(node, 16384, 0);
                 case 151:
+                    return bindPropertyOrMethodOrAccessor(node, 32768, 41919);
+                case 152:
                     return bindPropertyOrMethodOrAccessor(node, 65536, 74687);
-                case 157:
                 case 158:
-                case 269:
+                case 159:
+                case 274:
                     return bindFunctionOrConstructorType(node);
-                case 160:
-                case 281:
-                case 265:
+                case 161:
+                case 170:
+                case 286:
+                case 270:
                     return bindAnonymousDeclaration(node, 2048, "__type");
-                case 172:
+                case 176:
                     return bindObjectLiteralExpression(node);
-                case 180:
-                case 181:
+                case 184:
+                case 185:
                     return bindFunctionExpression(node);
-                case 175:
+                case 179:
                     if (ts.isInJavaScriptFile(node)) {
                         bindCallExpression(node);
                     }
                     break;
-                case 193:
-                case 222:
+                case 197:
+                case 226:
                     inStrictMode = true;
                     return bindClassLikeDeclaration(node);
-                case 223:
+                case 227:
                     return bindBlockScopedDeclaration(node, 64, 792968);
-                case 279:
-                case 224:
+                case 284:
+                    if (!node.fullName || node.fullName.kind === 70) {
+                        return bindBlockScopedDeclaration(node, 524288, 793064);
+                    }
+                    break;
+                case 228:
                     return bindBlockScopedDeclaration(node, 524288, 793064);
-                case 225:
-                    return bindEnumDeclaration(node);
-                case 226:
-                    return bindModuleDeclaration(node);
-                case 230:
-                case 233:
-                case 235:
-                case 239:
-                    return declareSymbolAndAddToSymbolTable(node, 8388608, 8388608);
                 case 229:
-                    return bindNamespaceExportDeclaration(node);
-                case 232:
-                    return bindImportClause(node);
+                    return bindEnumDeclaration(node);
+                case 230:
+                    return bindModuleDeclaration(node);
+                case 234:
                 case 237:
-                    return bindExportDeclaration(node);
+                case 239:
+                case 243:
+                    return declareSymbolAndAddToSymbolTable(node, 8388608, 8388608);
+                case 233:
+                    return bindNamespaceExportDeclaration(node);
                 case 236:
+                    return bindImportClause(node);
+                case 241:
+                    return bindExportDeclaration(node);
+                case 240:
                     return bindExportAssignment(node);
-                case 256:
+                case 261:
                     updateStrictModeStatementList(node.statements);
                     return bindSourceFileIfExternalModule();
-                case 200:
+                case 204:
                     if (!ts.isFunctionLike(node.parent)) {
                         return;
                     }
-                case 227:
+                case 231:
                     return updateStrictModeStatementList(node.statements);
             }
         }
@@ -18060,7 +17885,7 @@ var ts;
             if (parameterName && parameterName.kind === 70) {
                 checkStrictModeIdentifier(parameterName);
             }
-            if (parameterName && parameterName.kind === 166) {
+            if (parameterName && parameterName.kind === 167) {
                 seenThisKeyword = true;
             }
             bind(type);
@@ -18079,7 +17904,7 @@ var ts;
                 bindAnonymousDeclaration(node, 8388608, getDeclarationName(node));
             }
             else {
-                var flags = node.kind === 236 && ts.exportAssignmentIsAlias(node)
+                var flags = node.kind === 240 && ts.exportAssignmentIsAlias(node)
                     ? 8388608
                     : 4;
                 declareSymbol(container.symbol.exports, container.symbol, node, flags, 4 | 8388608 | 32 | 16);
@@ -18089,17 +17914,17 @@ var ts;
             if (node.modifiers && node.modifiers.length) {
                 file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Modifiers_cannot_appear_here));
             }
-            if (node.parent.kind !== 256) {
+            if (node.parent.kind !== 261) {
                 file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Global_module_exports_may_only_appear_at_top_level));
                 return;
             }
             else {
-                var parent_6 = node.parent;
-                if (!ts.isExternalModule(parent_6)) {
+                var parent_5 = node.parent;
+                if (!ts.isExternalModule(parent_5)) {
                     file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Global_module_exports_may_only_appear_in_module_files));
                     return;
                 }
-                if (!parent_6.isDeclarationFile) {
+                if (!parent_5.isDeclarationFile) {
                     file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Global_module_exports_may_only_appear_in_declaration_files));
                     return;
                 }
@@ -18138,11 +17963,11 @@ var ts;
         }
         function bindThisPropertyAssignment(node) {
             ts.Debug.assert(ts.isInJavaScriptFile(node));
-            if (container.kind === 221 || container.kind === 180) {
+            if (container.kind === 225 || container.kind === 184) {
                 container.symbol.members = container.symbol.members || ts.createMap();
                 declareSymbol(container.symbol.members, container.symbol, node, 4, 0 & ~4);
             }
-            else if (container.kind === 149) {
+            else if (container.kind === 150) {
                 var saveContainer = container;
                 container = container.parent;
                 var symbol = bindPropertyOrMethodOrAccessor(node, 4, 0);
@@ -18182,7 +18007,7 @@ var ts;
                     emitFlags |= 2048;
                 }
             }
-            if (node.kind === 222) {
+            if (node.kind === 226) {
                 bindBlockScopedDeclaration(node, 32, 899519);
             }
             else {
@@ -18300,15 +18125,15 @@ var ts;
                 return false;
             }
             if (currentFlow === unreachableFlow) {
-                var reportError = (ts.isStatementButNotDeclaration(node) && node.kind !== 202) ||
-                    node.kind === 222 ||
-                    (node.kind === 226 && shouldReportErrorOnModuleDeclaration(node)) ||
-                    (node.kind === 225 && (!ts.isConstEnumDeclaration(node) || options.preserveConstEnums));
+                var reportError = (ts.isStatementButNotDeclaration(node) && node.kind !== 206) ||
+                    node.kind === 226 ||
+                    (node.kind === 230 && shouldReportErrorOnModuleDeclaration(node)) ||
+                    (node.kind === 229 && (!ts.isConstEnumDeclaration(node) || options.preserveConstEnums));
                 if (reportError) {
                     currentFlow = reportedUnreachableFlow;
                     var reportUnreachableCode = !options.allowUnreachableCode &&
                         !ts.isInAmbientContext(node) &&
-                        (node.kind !== 201 ||
+                        (node.kind !== 205 ||
                             ts.getCombinedNodeFlags(node.declarationList) & 3 ||
                             ts.forEach(node.declarationList.declarations, function (d) { return d.initializer; }));
                     if (reportUnreachableCode) {
@@ -18322,54 +18147,56 @@ var ts;
     function computeTransformFlagsForNode(node, subtreeFlags) {
         var kind = node.kind;
         switch (kind) {
-            case 175:
-                return computeCallExpression(node, subtreeFlags);
-            case 176:
-                return computeNewExpression(node, subtreeFlags);
-            case 226:
-                return computeModuleDeclaration(node, subtreeFlags);
             case 179:
-                return computeParenthesizedExpression(node, subtreeFlags);
-            case 188:
-                return computeBinaryExpression(node, subtreeFlags);
-            case 203:
-                return computeExpressionStatement(node, subtreeFlags);
-            case 143:
-                return computeParameter(node, subtreeFlags);
-            case 181:
-                return computeArrowFunction(node, subtreeFlags);
+                return computeCallExpression(node, subtreeFlags);
             case 180:
-                return computeFunctionExpression(node, subtreeFlags);
-            case 221:
-                return computeFunctionDeclaration(node, subtreeFlags);
-            case 219:
-                return computeVariableDeclaration(node, subtreeFlags);
-            case 220:
-                return computeVariableDeclarationList(node, subtreeFlags);
-            case 201:
-                return computeVariableStatement(node, subtreeFlags);
-            case 215:
-                return computeLabeledStatement(node, subtreeFlags);
-            case 222:
-                return computeClassDeclaration(node, subtreeFlags);
-            case 193:
-                return computeClassExpression(node, subtreeFlags);
-            case 251:
-                return computeHeritageClause(node, subtreeFlags);
-            case 195:
-                return computeExpressionWithTypeArguments(node, subtreeFlags);
-            case 149:
-                return computeConstructor(node, subtreeFlags);
-            case 146:
-                return computePropertyDeclaration(node, subtreeFlags);
-            case 148:
-                return computeMethod(node, subtreeFlags);
-            case 150:
-            case 151:
-                return computeAccessor(node, subtreeFlags);
+                return computeNewExpression(node, subtreeFlags);
             case 230:
+                return computeModuleDeclaration(node, subtreeFlags);
+            case 183:
+                return computeParenthesizedExpression(node, subtreeFlags);
+            case 192:
+                return computeBinaryExpression(node, subtreeFlags);
+            case 207:
+                return computeExpressionStatement(node, subtreeFlags);
+            case 144:
+                return computeParameter(node, subtreeFlags);
+            case 185:
+                return computeArrowFunction(node, subtreeFlags);
+            case 184:
+                return computeFunctionExpression(node, subtreeFlags);
+            case 225:
+                return computeFunctionDeclaration(node, subtreeFlags);
+            case 223:
+                return computeVariableDeclaration(node, subtreeFlags);
+            case 224:
+                return computeVariableDeclarationList(node, subtreeFlags);
+            case 205:
+                return computeVariableStatement(node, subtreeFlags);
+            case 219:
+                return computeLabeledStatement(node, subtreeFlags);
+            case 226:
+                return computeClassDeclaration(node, subtreeFlags);
+            case 197:
+                return computeClassExpression(node, subtreeFlags);
+            case 255:
+                return computeHeritageClause(node, subtreeFlags);
+            case 256:
+                return computeCatchClause(node, subtreeFlags);
+            case 199:
+                return computeExpressionWithTypeArguments(node, subtreeFlags);
+            case 150:
+                return computeConstructor(node, subtreeFlags);
+            case 147:
+                return computePropertyDeclaration(node, subtreeFlags);
+            case 149:
+                return computeMethod(node, subtreeFlags);
+            case 151:
+            case 152:
+                return computeAccessor(node, subtreeFlags);
+            case 234:
                 return computeImportEquals(node, subtreeFlags);
-            case 173:
+            case 177:
                 return computePropertyAccess(node, subtreeFlags);
             default:
                 return computeOther(node, kind, subtreeFlags);
@@ -18383,19 +18210,19 @@ var ts;
         if (node.typeArguments) {
             transformFlags |= 3;
         }
-        if (subtreeFlags & 1048576
+        if (subtreeFlags & 8388608
             || isSuperOrSuperProperty(expression, expressionKind)) {
-            transformFlags |= 768;
+            transformFlags |= 3072;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~537922901;
+        return transformFlags & ~545281365;
     }
     function isSuperOrSuperProperty(node, kind) {
         switch (kind) {
             case 96:
                 return true;
-            case 173:
-            case 174:
+            case 177:
+            case 178:
                 var expression = node.expression;
                 var expressionKind = expression.kind;
                 return expressionKind === 96;
@@ -18407,27 +18234,28 @@ var ts;
         if (node.typeArguments) {
             transformFlags |= 3;
         }
-        if (subtreeFlags & 1048576) {
-            transformFlags |= 768;
+        if (subtreeFlags & 8388608) {
+            transformFlags |= 3072;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~537922901;
+        return transformFlags & ~545281365;
     }
     function computeBinaryExpression(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         var operatorTokenKind = node.operatorToken.kind;
         var leftKind = node.left.kind;
-        if (operatorTokenKind === 57
-            && (leftKind === 172
-                || leftKind === 171)) {
-            transformFlags |= 768 | 1024;
+        if (operatorTokenKind === 57 && leftKind === 176) {
+            transformFlags |= 48 | 3072 | 49152;
+        }
+        else if (operatorTokenKind === 57 && leftKind === 175) {
+            transformFlags |= 3072 | 49152;
         }
         else if (operatorTokenKind === 39
             || operatorTokenKind === 61) {
-            transformFlags |= 192;
+            transformFlags |= 768;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~536874325;
+        return transformFlags & ~536892757;
     }
     function computeParameter(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
@@ -18437,33 +18265,36 @@ var ts;
         var dotDotDotToken = node.dotDotDotToken;
         if (node.questionToken
             || node.type
-            || subtreeFlags & 8192
+            || subtreeFlags & 65536
             || ts.isThisIdentifier(name)) {
             transformFlags |= 3;
         }
         if (modifierFlags & 92) {
-            transformFlags |= 3 | 524288;
+            transformFlags |= 3 | 4194304;
         }
-        if (subtreeFlags & 8388608 || initializer || dotDotDotToken) {
-            transformFlags |= 768 | 262144;
+        if (subtreeFlags & 8388608) {
+            transformFlags |= 48;
+        }
+        if (subtreeFlags & 67108864 || initializer || dotDotDotToken) {
+            transformFlags |= 3072 | 2097152;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~545262933;
+        return transformFlags & ~604001621;
     }
     function computeParenthesizedExpression(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         var expression = node.expression;
         var expressionKind = expression.kind;
         var expressionTransformFlags = expression.transformFlags;
-        if (expressionKind === 196
-            || expressionKind === 178) {
+        if (expressionKind === 200
+            || expressionKind === 182) {
             transformFlags |= 3;
         }
-        if (expressionTransformFlags & 1024) {
-            transformFlags |= 1024;
+        if (expressionTransformFlags & 16384) {
+            transformFlags |= 16384;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~536874325;
+        return transformFlags & ~536892757;
     }
     function computeClassDeclaration(node, subtreeFlags) {
         var transformFlags;
@@ -18472,36 +18303,35 @@ var ts;
             transformFlags = 3;
         }
         else {
-            transformFlags = subtreeFlags | 768;
-            if ((subtreeFlags & 548864)
-                || (modifierFlags & 1)
+            transformFlags = subtreeFlags | 3072;
+            if ((subtreeFlags & 4390912)
                 || node.typeParameters) {
                 transformFlags |= 3;
             }
-            if (subtreeFlags & 131072) {
-                transformFlags |= 32768;
+            if (subtreeFlags & 1048576) {
+                transformFlags |= 262144;
             }
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~539749717;
+        return transformFlags & ~559895893;
     }
     function computeClassExpression(node, subtreeFlags) {
-        var transformFlags = subtreeFlags | 768;
-        if (subtreeFlags & 548864
+        var transformFlags = subtreeFlags | 3072;
+        if (subtreeFlags & 4390912
             || node.typeParameters) {
             transformFlags |= 3;
         }
-        if (subtreeFlags & 131072) {
-            transformFlags |= 32768;
+        if (subtreeFlags & 1048576) {
+            transformFlags |= 262144;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~539749717;
+        return transformFlags & ~559895893;
     }
     function computeHeritageClause(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         switch (node.token) {
             case 84:
-                transformFlags |= 768;
+                transformFlags |= 3072;
                 break;
             case 107:
                 transformFlags |= 3;
@@ -18511,15 +18341,23 @@ var ts;
                 break;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~536874325;
+        return transformFlags & ~536892757;
+    }
+    function computeCatchClause(node, subtreeFlags) {
+        var transformFlags = subtreeFlags;
+        if (node.variableDeclaration && ts.isBindingPattern(node.variableDeclaration.name)) {
+            transformFlags |= 3072;
+        }
+        node.transformFlags = transformFlags | 536870912;
+        return transformFlags & ~536892757;
     }
     function computeExpressionWithTypeArguments(node, subtreeFlags) {
-        var transformFlags = subtreeFlags | 768;
+        var transformFlags = subtreeFlags | 3072;
         if (node.typeArguments) {
             transformFlags |= 3;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~536874325;
+        return transformFlags & ~536892757;
     }
     function computeConstructor(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
@@ -18528,10 +18366,10 @@ var ts;
             transformFlags |= 3;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~591760725;
+        return transformFlags & ~975983957;
     }
     function computeMethod(node, subtreeFlags) {
-        var transformFlags = subtreeFlags | 768;
+        var transformFlags = subtreeFlags | 3072;
         if (node.decorators
             || ts.hasModifier(node, 2270)
             || node.typeParameters
@@ -18540,13 +18378,13 @@ var ts;
             transformFlags |= 3;
         }
         if (ts.hasModifier(node, 256)) {
-            transformFlags |= 48;
+            transformFlags |= 192;
         }
         if (node.asteriskToken && ts.getEmitFlags(node) & 2097152) {
-            transformFlags |= 6144;
+            transformFlags |= 12288;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~591760725;
+        return transformFlags & ~975983957;
     }
     function computeAccessor(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
@@ -18557,15 +18395,15 @@ var ts;
             transformFlags |= 3;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~591760725;
+        return transformFlags & ~975983957;
     }
     function computePropertyDeclaration(node, subtreeFlags) {
         var transformFlags = subtreeFlags | 3;
         if (node.initializer) {
-            transformFlags |= 16384;
+            transformFlags |= 131072;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~536874325;
+        return transformFlags & ~536892757;
     }
     function computeFunctionDeclaration(node, subtreeFlags) {
         var transformFlags;
@@ -18575,27 +18413,27 @@ var ts;
             transformFlags = 3;
         }
         else {
-            transformFlags = subtreeFlags | 33554432;
-            if (modifierFlags & 1) {
-                transformFlags |= 3 | 768;
-            }
+            transformFlags = subtreeFlags | 268435456;
             if (modifierFlags & 2270
                 || node.typeParameters
                 || node.type) {
                 transformFlags |= 3;
             }
             if (modifierFlags & 256) {
+                transformFlags |= 192;
+            }
+            if (subtreeFlags & 8388608) {
                 transformFlags |= 48;
             }
-            if (subtreeFlags & 327680) {
-                transformFlags |= 768;
+            if (subtreeFlags & 2621440) {
+                transformFlags |= 3072;
             }
             if (node.asteriskToken && ts.getEmitFlags(node) & 2097152) {
-                transformFlags |= 6144;
+                transformFlags |= 12288;
             }
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~592293205;
+        return transformFlags & ~980243797;
     }
     function computeFunctionExpression(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
@@ -18605,54 +18443,63 @@ var ts;
             transformFlags |= 3;
         }
         if (ts.hasModifier(node, 256)) {
+            transformFlags |= 192;
+        }
+        if (subtreeFlags & 8388608) {
             transformFlags |= 48;
         }
-        if (subtreeFlags & 327680) {
-            transformFlags |= 768;
+        if (subtreeFlags & 2621440) {
+            transformFlags |= 3072;
         }
         if (node.asteriskToken && ts.getEmitFlags(node) & 2097152) {
-            transformFlags |= 6144;
+            transformFlags |= 12288;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~592293205;
+        return transformFlags & ~980243797;
     }
     function computeArrowFunction(node, subtreeFlags) {
-        var transformFlags = subtreeFlags | 768;
+        var transformFlags = subtreeFlags | 3072;
         if (ts.hasModifier(node, 2270)
             || node.typeParameters
             || node.type) {
             transformFlags |= 3;
         }
         if (ts.hasModifier(node, 256)) {
+            transformFlags |= 192;
+        }
+        if (subtreeFlags & 8388608) {
             transformFlags |= 48;
         }
-        if (subtreeFlags & 32768) {
-            transformFlags |= 65536;
+        if (subtreeFlags & 262144) {
+            transformFlags |= 524288;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~592227669;
+        return transformFlags & ~979719509;
     }
     function computePropertyAccess(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         var expression = node.expression;
         var expressionKind = expression.kind;
         if (expressionKind === 96) {
-            transformFlags |= 32768;
+            transformFlags |= 262144;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~536874325;
+        return transformFlags & ~536892757;
     }
     function computeVariableDeclaration(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         var nameKind = node.name.kind;
-        if (nameKind === 168 || nameKind === 169) {
-            transformFlags |= 768 | 8388608;
+        if (nameKind === 172) {
+            transformFlags |= 48 | 3072 | 67108864;
+        }
+        else if (nameKind === 173) {
+            transformFlags |= 3072 | 67108864;
         }
         if (node.type) {
             transformFlags |= 3;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~536874325;
+        return transformFlags & ~536892757;
     }
     function computeVariableStatement(node, subtreeFlags) {
         var transformFlags;
@@ -18663,24 +18510,21 @@ var ts;
         }
         else {
             transformFlags = subtreeFlags;
-            if (modifierFlags & 1) {
-                transformFlags |= 768 | 3;
-            }
-            if (declarationListTransformFlags & 8388608) {
-                transformFlags |= 768;
+            if (declarationListTransformFlags & 67108864) {
+                transformFlags |= 3072;
             }
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~536874325;
+        return transformFlags & ~536892757;
     }
     function computeLabeledStatement(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
-        if (subtreeFlags & 4194304
+        if (subtreeFlags & 33554432
             && ts.isIterationStatement(node, true)) {
-            transformFlags |= 768;
+            transformFlags |= 3072;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~536874325;
+        return transformFlags & ~536892757;
     }
     function computeImportEquals(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
@@ -18688,15 +18532,15 @@ var ts;
             transformFlags |= 3;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~536874325;
+        return transformFlags & ~536892757;
     }
     function computeExpressionStatement(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
-        if (node.expression.transformFlags & 1024) {
-            transformFlags |= 768;
+        if (node.expression.transformFlags & 16384) {
+            transformFlags |= 3072;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~536874325;
+        return transformFlags & ~536892757;
     }
     function computeModuleDeclaration(node, subtreeFlags) {
         var transformFlags = 3;
@@ -18705,26 +18549,26 @@ var ts;
             transformFlags |= subtreeFlags;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~574729557;
+        return transformFlags & ~839734613;
     }
     function computeVariableDeclarationList(node, subtreeFlags) {
-        var transformFlags = subtreeFlags | 33554432;
-        if (subtreeFlags & 8388608) {
-            transformFlags |= 768;
+        var transformFlags = subtreeFlags | 268435456;
+        if (subtreeFlags & 67108864) {
+            transformFlags |= 3072;
         }
         if (node.flags & 3) {
-            transformFlags |= 768 | 4194304;
+            transformFlags |= 3072 | 33554432;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~545262933;
+        return transformFlags & ~604001621;
     }
     function computeOther(node, kind, subtreeFlags) {
         var transformFlags = subtreeFlags;
-        var excludeFlags = 536874325;
+        var excludeFlags = 536892757;
         switch (kind) {
             case 119:
-            case 185:
-                transformFlags |= 48;
+            case 189:
+                transformFlags |= 192;
                 break;
             case 113:
             case 111:
@@ -18732,52 +18576,49 @@ var ts;
             case 116:
             case 123:
             case 75:
-            case 225:
-            case 255:
-            case 178:
-            case 196:
-            case 197:
-            case 129:
+            case 229:
+            case 260:
+            case 182:
+            case 200:
+            case 201:
+            case 130:
                 transformFlags |= 3;
                 break;
-            case 242:
-            case 243:
-            case 244:
-            case 10:
-            case 245:
             case 246:
             case 247:
             case 248:
+            case 10:
+            case 249:
+            case 250:
+            case 251:
+            case 252:
                 transformFlags |= 12;
                 break;
-            case 83:
-                transformFlags |= 768 | 3;
-                break;
-            case 78:
+            case 213:
+                transformFlags |= 48;
             case 12:
             case 13:
             case 14:
             case 15:
-            case 190:
-            case 177:
-            case 254:
-            case 209:
-                transformFlags |= 768;
+            case 194:
+            case 181:
+            case 258:
+            case 114:
+                transformFlags |= 3072;
                 break;
-            case 191:
-                transformFlags |= 768 | 16777216;
+            case 195:
+                transformFlags |= 3072 | 134217728;
                 break;
             case 118:
-            case 131:
-            case 128:
-            case 133:
-            case 121:
+            case 132:
+            case 129:
             case 134:
+            case 121:
+            case 135:
             case 104:
-            case 142:
-            case 145:
-            case 147:
-            case 152:
+            case 143:
+            case 146:
+            case 148:
             case 153:
             case 154:
             case 155:
@@ -18791,73 +18632,142 @@ var ts;
             case 163:
             case 164:
             case 165:
-            case 223:
-            case 224:
             case 166:
+            case 227:
+            case 228:
             case 167:
+            case 168:
+            case 169:
+            case 170:
+            case 171:
                 transformFlags = 3;
                 excludeFlags = -3;
                 break;
-            case 141:
-                transformFlags |= 2097152;
-                if (subtreeFlags & 32768) {
-                    transformFlags |= 131072;
+            case 142:
+                transformFlags |= 16777216;
+                if (subtreeFlags & 262144) {
+                    transformFlags |= 1048576;
                 }
                 break;
-            case 192:
-                transformFlags |= 1048576;
+            case 196:
+            case 259:
+                transformFlags |= 8388608;
                 break;
+            case 174:
+                if (node.dotDotDotToken) {
+                    transformFlags |= 8388608;
+                }
             case 96:
-                transformFlags |= 768;
+                transformFlags |= 3072;
                 break;
             case 98:
-                transformFlags |= 32768;
-                break;
-            case 168:
-            case 169:
-                transformFlags |= 768 | 8388608;
-                break;
-            case 144:
-                transformFlags |= 3 | 8192;
+                transformFlags |= 262144;
                 break;
             case 172:
-                excludeFlags = 539110741;
-                if (subtreeFlags & 2097152) {
-                    transformFlags |= 768;
+            case 173:
+                if (subtreeFlags & 8388608) {
+                    transformFlags |= 48 | 67108864;
                 }
-                if (subtreeFlags & 131072) {
-                    transformFlags |= 32768;
+                else {
+                    transformFlags |= 3072 | 67108864;
                 }
                 break;
-            case 171:
+            case 145:
+                transformFlags |= 3 | 65536;
+                break;
             case 176:
-                excludeFlags = 537922901;
+                excludeFlags = 554784085;
+                if (subtreeFlags & 16777216) {
+                    transformFlags |= 3072;
+                }
                 if (subtreeFlags & 1048576) {
-                    transformFlags |= 768;
+                    transformFlags |= 262144;
+                }
+                if (subtreeFlags & 8388608) {
+                    transformFlags |= 48;
                 }
                 break;
-            case 205:
-            case 206:
-            case 207:
-            case 208:
-                if (subtreeFlags & 4194304) {
-                    transformFlags |= 768;
+            case 175:
+            case 180:
+                excludeFlags = 545281365;
+                if (subtreeFlags & 8388608) {
+                    transformFlags |= 3072;
                 }
                 break;
-            case 256:
-                if (subtreeFlags & 65536) {
-                    transformFlags |= 768;
-                }
-                break;
-            case 212:
+            case 209:
             case 210:
             case 211:
-                transformFlags |= 33554432;
+            case 212:
+                if (subtreeFlags & 33554432) {
+                    transformFlags |= 3072;
+                }
+                break;
+            case 261:
+                if (subtreeFlags & 524288) {
+                    transformFlags |= 3072;
+                }
+                break;
+            case 216:
+            case 214:
+            case 215:
+                transformFlags |= 268435456;
                 break;
         }
         node.transformFlags = transformFlags | 536870912;
         return transformFlags & ~excludeFlags;
     }
+    function getTransformFlagsSubtreeExclusions(kind) {
+        if (kind >= 156 && kind <= 171) {
+            return -3;
+        }
+        switch (kind) {
+            case 179:
+            case 180:
+            case 175:
+                return 545281365;
+            case 230:
+                return 839734613;
+            case 144:
+                return 604001621;
+            case 185:
+                return 979719509;
+            case 184:
+            case 225:
+                return 980243797;
+            case 224:
+                return 604001621;
+            case 226:
+            case 197:
+                return 559895893;
+            case 150:
+                return 975983957;
+            case 149:
+            case 151:
+            case 152:
+                return 975983957;
+            case 118:
+            case 132:
+            case 129:
+            case 134:
+            case 121:
+            case 135:
+            case 104:
+            case 143:
+            case 146:
+            case 148:
+            case 153:
+            case 154:
+            case 155:
+            case 227:
+            case 228:
+                return -3;
+            case 176:
+                return 554784085;
+            default:
+                return 536892757;
+        }
+    }
+    ts.getTransformFlagsSubtreeExclusions = getTransformFlagsSubtreeExclusions;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -18869,24 +18779,50 @@ var ts;
         return compilerOptions.traceResolution && host.trace !== undefined;
     }
     ts.isTraceEnabled = isTraceEnabled;
-    function createResolvedModule(resolvedFileName, isExternalLibraryImport, failedLookupLocations) {
-        return { resolvedModule: resolvedFileName ? { resolvedFileName: resolvedFileName, isExternalLibraryImport: isExternalLibraryImport } : undefined, failedLookupLocations: failedLookupLocations };
+    function resolvedTypeScriptOnly(resolved) {
+        if (!resolved) {
+            return undefined;
+        }
+        ts.Debug.assert(ts.extensionIsTypeScript(resolved.extension));
+        return resolved.path;
+    }
+    function resolvedFromAnyFile(path) {
+        return { path: path, extension: ts.extensionFromPath(path) };
+    }
+    function resolvedModuleFromResolved(_a, isExternalLibraryImport) {
+        var path = _a.path, extension = _a.extension;
+        return { resolvedFileName: path, extension: extension, isExternalLibraryImport: isExternalLibraryImport };
+    }
+    function createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations) {
+        return { resolvedModule: resolved && resolvedModuleFromResolved(resolved, isExternalLibraryImport), failedLookupLocations: failedLookupLocations };
     }
-    ts.createResolvedModule = createResolvedModule;
     function moduleHasNonRelativeName(moduleName) {
         return !(ts.isRootedDiskPath(moduleName) || ts.isExternalModuleNameRelative(moduleName));
     }
-    function tryReadTypesSection(packageJsonPath, baseDirectory, state) {
+    function tryReadTypesSection(extensions, packageJsonPath, baseDirectory, state) {
         var jsonContent = readJson(packageJsonPath, state.host);
+        switch (extensions) {
+            case 2:
+            case 0:
+                return tryReadFromField("typings") || tryReadFromField("types");
+            case 1:
+                if (typeof jsonContent.main === "string") {
+                    if (state.traceEnabled) {
+                        trace(state.host, ts.Diagnostics.No_types_specified_in_package_json_so_returning_main_value_of_0, jsonContent.main);
+                    }
+                    return ts.normalizePath(ts.combinePaths(baseDirectory, jsonContent.main));
+                }
+                return undefined;
+        }
         function tryReadFromField(fieldName) {
             if (ts.hasProperty(jsonContent, fieldName)) {
                 var typesFile = jsonContent[fieldName];
                 if (typeof typesFile === "string") {
-                    var typesFilePath_1 = ts.normalizePath(ts.combinePaths(baseDirectory, typesFile));
+                    var typesFilePath = ts.normalizePath(ts.combinePaths(baseDirectory, typesFile));
                     if (state.traceEnabled) {
-                        trace(state.host, ts.Diagnostics.package_json_has_0_field_1_that_references_2, fieldName, typesFile, typesFilePath_1);
+                        trace(state.host, ts.Diagnostics.package_json_has_0_field_1_that_references_2, fieldName, typesFile, typesFilePath);
                     }
-                    return typesFilePath_1;
+                    return typesFilePath;
                 }
                 else {
                     if (state.traceEnabled) {
@@ -18895,18 +18831,6 @@ var ts;
                 }
             }
         }
-        var typesFilePath = tryReadFromField("typings") || tryReadFromField("types");
-        if (typesFilePath) {
-            return typesFilePath;
-        }
-        if (state.compilerOptions.allowJs && jsonContent.main && typeof jsonContent.main === "string") {
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.No_types_specified_in_package_json_but_allowJs_is_set_so_returning_main_value_of_0, jsonContent.main);
-            }
-            var mainFilePath = ts.normalizePath(ts.combinePaths(baseDirectory, jsonContent.main));
-            return mainFilePath;
-        }
-        return undefined;
     }
     function readJson(path, host) {
         try {
@@ -18917,7 +18841,6 @@ var ts;
             return {};
         }
     }
-    var typeReferenceExtensions = [".d.ts"];
     function getEffectiveTypeRoots(options, host) {
         if (options.typeRoots) {
             return options.typeRoots;
@@ -18929,7 +18852,9 @@ var ts;
         else if (host.getCurrentDirectory) {
             currentDirectory = host.getCurrentDirectory();
         }
-        return currentDirectory !== undefined && getDefaultTypeRoots(currentDirectory, host);
+        if (currentDirectory !== undefined) {
+            return getDefaultTypeRoots(currentDirectory, host);
+        }
     }
     ts.getEffectiveTypeRoots = getEffectiveTypeRoots;
     function getDefaultTypeRoots(currentDirectory, host) {
@@ -18937,17 +18862,12 @@ var ts;
             return [ts.combinePaths(currentDirectory, nodeModulesAtTypes)];
         }
         var typeRoots;
-        while (true) {
-            var atTypes = ts.combinePaths(currentDirectory, nodeModulesAtTypes);
+        forEachAncestorDirectory(currentDirectory, function (directory) {
+            var atTypes = ts.combinePaths(directory, nodeModulesAtTypes);
             if (host.directoryExists(atTypes)) {
                 (typeRoots || (typeRoots = [])).push(atTypes);
             }
-            var parent_7 = ts.getDirectoryPath(currentDirectory);
-            if (parent_7 === currentDirectory) {
-                break;
-            }
-            currentDirectory = parent_7;
-        }
+        });
         return typeRoots;
     }
     var nodeModulesAtTypes = ts.combinePaths("node_modules", "@types");
@@ -18956,7 +18876,6 @@ var ts;
         var moduleResolutionState = {
             compilerOptions: options,
             host: host,
-            skipTsx: true,
             traceEnabled: traceEnabled
         };
         var typeRoots = getEffectiveTypeRoots(options, host);
@@ -18979,62 +18898,57 @@ var ts;
             }
         }
         var failedLookupLocations = [];
-        if (typeRoots && typeRoots.length) {
+        var resolved = primaryLookup();
+        var primary = true;
+        if (!resolved) {
+            resolved = secondaryLookup();
+            primary = false;
+        }
+        var resolvedTypeReferenceDirective;
+        if (resolved) {
+            resolved = realpath(resolved, host, traceEnabled);
             if (traceEnabled) {
-                trace(host, ts.Diagnostics.Resolving_with_primary_search_path_0, typeRoots.join(", "));
+                trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolved, primary);
             }
-            var primarySearchPaths = typeRoots;
-            for (var _i = 0, primarySearchPaths_1 = primarySearchPaths; _i < primarySearchPaths_1.length; _i++) {
-                var typeRoot = primarySearchPaths_1[_i];
-                var candidate = ts.combinePaths(typeRoot, typeReferenceDirectiveName);
-                var candidateDirectory = ts.getDirectoryPath(candidate);
-                var resolvedFile_1 = loadNodeModuleFromDirectory(typeReferenceExtensions, candidate, failedLookupLocations, !directoryProbablyExists(candidateDirectory, host), moduleResolutionState);
-                if (resolvedFile_1) {
-                    if (traceEnabled) {
-                        trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFile_1, true);
-                    }
-                    return {
-                        resolvedTypeReferenceDirective: { primary: true, resolvedFileName: resolvedFile_1 },
-                        failedLookupLocations: failedLookupLocations
-                    };
+            resolvedTypeReferenceDirective = { primary: primary, resolvedFileName: resolved };
+        }
+        return { resolvedTypeReferenceDirective: resolvedTypeReferenceDirective, failedLookupLocations: failedLookupLocations };
+        function primaryLookup() {
+            if (typeRoots && typeRoots.length) {
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Resolving_with_primary_search_path_0, typeRoots.join(", "));
+                }
+                return ts.forEach(typeRoots, function (typeRoot) {
+                    var candidate = ts.combinePaths(typeRoot, typeReferenceDirectiveName);
+                    var candidateDirectory = ts.getDirectoryPath(candidate);
+                    return resolvedTypeScriptOnly(loadNodeModuleFromDirectory(2, candidate, failedLookupLocations, !directoryProbablyExists(candidateDirectory, host), moduleResolutionState));
+                });
+            }
+            else {
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Root_directory_cannot_be_determined_skipping_primary_search_paths);
                 }
             }
         }
-        else {
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Root_directory_cannot_be_determined_skipping_primary_search_paths);
-            }
-        }
-        var resolvedFile;
-        var initialLocationForSecondaryLookup;
-        if (containingFile) {
-            initialLocationForSecondaryLookup = ts.getDirectoryPath(containingFile);
-        }
-        if (initialLocationForSecondaryLookup !== undefined) {
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Looking_up_in_node_modules_folder_initial_location_0, initialLocationForSecondaryLookup);
-            }
-            resolvedFile = loadModuleFromNodeModules(typeReferenceDirectiveName, initialLocationForSecondaryLookup, failedLookupLocations, moduleResolutionState, false);
-            if (traceEnabled) {
-                if (resolvedFile) {
-                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFile, false);
+        function secondaryLookup() {
+            var resolvedFile;
+            var initialLocationForSecondaryLookup = containingFile && ts.getDirectoryPath(containingFile);
+            if (initialLocationForSecondaryLookup !== undefined) {
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Looking_up_in_node_modules_folder_initial_location_0, initialLocationForSecondaryLookup);
                 }
-                else {
+                resolvedFile = resolvedTypeScriptOnly(loadModuleFromNodeModules(2, typeReferenceDirectiveName, initialLocationForSecondaryLookup, failedLookupLocations, moduleResolutionState));
+                if (!resolvedFile && traceEnabled) {
                     trace(host, ts.Diagnostics.Type_reference_directive_0_was_not_resolved, typeReferenceDirectiveName);
                 }
+                return resolvedFile;
+            }
+            else {
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_modules_folder);
+                }
             }
         }
-        else {
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_modules_folder);
-            }
-        }
-        return {
-            resolvedTypeReferenceDirective: resolvedFile
-                ? { primary: false, resolvedFileName: resolvedFile }
-                : undefined,
-            failedLookupLocations: failedLookupLocations
-        };
     }
     ts.resolveTypeReferenceDirective = resolveTypeReferenceDirective;
     function getAutomaticTypeDirectiveNames(options, host) {
@@ -19101,15 +19015,15 @@ var ts;
         return result;
     }
     ts.resolveModuleName = resolveModuleName;
-    function tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, loader, failedLookupLocations, supportedExtensions, state) {
+    function tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, loader, failedLookupLocations, state) {
         if (moduleHasNonRelativeName(moduleName)) {
-            return tryLoadModuleUsingBaseUrl(moduleName, loader, failedLookupLocations, supportedExtensions, state);
+            return tryLoadModuleUsingBaseUrl(extensions, moduleName, loader, failedLookupLocations, state);
         }
         else {
-            return tryLoadModuleUsingRootDirs(moduleName, containingDirectory, loader, failedLookupLocations, supportedExtensions, state);
+            return tryLoadModuleUsingRootDirs(extensions, moduleName, containingDirectory, loader, failedLookupLocations, state);
         }
     }
-    function tryLoadModuleUsingRootDirs(moduleName, containingDirectory, loader, failedLookupLocations, supportedExtensions, state) {
+    function tryLoadModuleUsingRootDirs(extensions, moduleName, containingDirectory, loader, failedLookupLocations, state) {
         if (!state.compilerOptions.rootDirs) {
             return undefined;
         }
@@ -19143,7 +19057,7 @@ var ts;
             if (state.traceEnabled) {
                 trace(state.host, ts.Diagnostics.Loading_0_from_the_root_dir_1_candidate_location_2, suffix, matchedNormalizedPrefix, candidate);
             }
-            var resolvedFileName = loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(containingDirectory, state.host), state);
+            var resolvedFileName = loader(extensions, candidate, failedLookupLocations, !directoryProbablyExists(containingDirectory, state.host), state);
             if (resolvedFileName) {
                 return resolvedFileName;
             }
@@ -19160,7 +19074,7 @@ var ts;
                     trace(state.host, ts.Diagnostics.Loading_0_from_the_root_dir_1_candidate_location_2, suffix, rootDir, candidate_1);
                 }
                 var baseDirectory = ts.getDirectoryPath(candidate_1);
-                var resolvedFileName_1 = loader(candidate_1, supportedExtensions, failedLookupLocations, !directoryProbablyExists(baseDirectory, state.host), state);
+                var resolvedFileName_1 = loader(extensions, candidate_1, failedLookupLocations, !directoryProbablyExists(baseDirectory, state.host), state);
                 if (resolvedFileName_1) {
                     return resolvedFileName_1;
                 }
@@ -19171,7 +19085,7 @@ var ts;
         }
         return undefined;
     }
-    function tryLoadModuleUsingBaseUrl(moduleName, loader, failedLookupLocations, supportedExtensions, state) {
+    function tryLoadModuleUsingBaseUrl(extensions, moduleName, loader, failedLookupLocations, state) {
         if (!state.compilerOptions.baseUrl) {
             return undefined;
         }
@@ -19186,77 +19100,87 @@ var ts;
             matchedPattern = ts.matchPatternOrExact(ts.getOwnKeys(state.compilerOptions.paths), moduleName);
         }
         if (matchedPattern) {
-            var matchedStar = typeof matchedPattern === "string" ? undefined : ts.matchedText(matchedPattern, moduleName);
+            var matchedStar_1 = typeof matchedPattern === "string" ? undefined : ts.matchedText(matchedPattern, moduleName);
             var matchedPatternText = typeof matchedPattern === "string" ? matchedPattern : ts.patternText(matchedPattern);
             if (state.traceEnabled) {
                 trace(state.host, ts.Diagnostics.Module_name_0_matched_pattern_1, moduleName, matchedPatternText);
             }
-            for (var _i = 0, _a = state.compilerOptions.paths[matchedPatternText]; _i < _a.length; _i++) {
-                var subst = _a[_i];
-                var path = matchedStar ? subst.replace("*", matchedStar) : subst;
+            return ts.forEach(state.compilerOptions.paths[matchedPatternText], function (subst) {
+                var path = matchedStar_1 ? subst.replace("*", matchedStar_1) : subst;
                 var candidate = ts.normalizePath(ts.combinePaths(state.compilerOptions.baseUrl, path));
                 if (state.traceEnabled) {
                     trace(state.host, ts.Diagnostics.Trying_substitution_0_candidate_module_location_Colon_1, subst, path);
                 }
-                var resolvedFileName = loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
-                if (resolvedFileName) {
-                    return resolvedFileName;
+                var tsExtension = ts.tryGetExtensionFromPath(candidate);
+                if (tsExtension !== undefined) {
+                    var path_1 = tryFile(candidate, failedLookupLocations, false, state);
+                    return path_1 && { path: path_1, extension: tsExtension };
                 }
-            }
-            return undefined;
+                return loader(extensions, candidate, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
+            });
         }
         else {
             var candidate = ts.normalizePath(ts.combinePaths(state.compilerOptions.baseUrl, moduleName));
             if (state.traceEnabled) {
                 trace(state.host, ts.Diagnostics.Resolving_module_name_0_relative_to_base_url_1_2, moduleName, state.compilerOptions.baseUrl, candidate);
             }
-            return loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
+            return loader(extensions, candidate, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
         }
     }
     function nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host) {
         var containingDirectory = ts.getDirectoryPath(containingFile);
-        var supportedExtensions = ts.getSupportedExtensions(compilerOptions);
         var traceEnabled = isTraceEnabled(compilerOptions, host);
         var failedLookupLocations = [];
-        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, skipTsx: false };
-        var resolvedFileName = tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, nodeLoadModuleByRelativeName, failedLookupLocations, supportedExtensions, state);
-        var isExternalLibraryImport = false;
-        if (!resolvedFileName) {
+        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled };
+        var result = tryResolve(0) || tryResolve(1);
+        if (result) {
+            var resolved = result.resolved, isExternalLibraryImport = result.isExternalLibraryImport;
+            return createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations);
+        }
+        return { resolvedModule: undefined, failedLookupLocations: failedLookupLocations };
+        function tryResolve(extensions) {
+            var resolved = tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, nodeLoadModuleByRelativeName, failedLookupLocations, state);
+            if (resolved) {
+                return { resolved: resolved, isExternalLibraryImport: false };
+            }
             if (moduleHasNonRelativeName(moduleName)) {
                 if (traceEnabled) {
                     trace(host, ts.Diagnostics.Loading_module_0_from_node_modules_folder, moduleName);
                 }
-                resolvedFileName = loadModuleFromNodeModules(moduleName, containingDirectory, failedLookupLocations, state, false);
-                isExternalLibraryImport = resolvedFileName !== undefined;
+                var resolved_1 = loadModuleFromNodeModules(extensions, moduleName, containingDirectory, failedLookupLocations, state);
+                return resolved_1 && { resolved: { path: realpath(resolved_1.path, host, traceEnabled), extension: resolved_1.extension }, isExternalLibraryImport: true };
             }
             else {
                 var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
-                resolvedFileName = nodeLoadModuleByRelativeName(candidate, supportedExtensions, failedLookupLocations, false, state);
+                var resolved_2 = nodeLoadModuleByRelativeName(extensions, candidate, failedLookupLocations, false, state);
+                return resolved_2 && { resolved: resolved_2, isExternalLibraryImport: false };
             }
         }
-        if (resolvedFileName && host.realpath) {
-            var originalFileName = resolvedFileName;
-            resolvedFileName = ts.normalizePath(host.realpath(resolvedFileName));
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Resolving_real_path_for_0_result_1, originalFileName, resolvedFileName);
-            }
-        }
-        return createResolvedModule(resolvedFileName, isExternalLibraryImport, failedLookupLocations);
     }
     ts.nodeModuleNameResolver = nodeModuleNameResolver;
-    function nodeLoadModuleByRelativeName(candidate, supportedExtensions, failedLookupLocations, onlyRecordFailures, state) {
+    function realpath(path, host, traceEnabled) {
+        if (!host.realpath) {
+            return path;
+        }
+        var real = ts.normalizePath(host.realpath(path));
+        if (traceEnabled) {
+            trace(host, ts.Diagnostics.Resolving_real_path_for_0_result_1, path, real);
+        }
+        return real;
+    }
+    function nodeLoadModuleByRelativeName(extensions, candidate, failedLookupLocations, onlyRecordFailures, state) {
         if (state.traceEnabled) {
             trace(state.host, ts.Diagnostics.Loading_module_as_file_Slash_folder_candidate_module_location_0, candidate);
         }
-        var resolvedFileName = !ts.pathEndsWithDirectorySeparator(candidate) && loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, onlyRecordFailures, state);
-        return resolvedFileName || loadNodeModuleFromDirectory(supportedExtensions, candidate, failedLookupLocations, onlyRecordFailures, state);
+        var resolvedFromFile = !ts.pathEndsWithDirectorySeparator(candidate) && loadModuleFromFile(extensions, candidate, failedLookupLocations, onlyRecordFailures, state);
+        return resolvedFromFile || loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, onlyRecordFailures, state);
     }
     function directoryProbablyExists(directoryName, host) {
         return !host.directoryExists || host.directoryExists(directoryName);
     }
     ts.directoryProbablyExists = directoryProbablyExists;
-    function loadModuleFromFile(candidate, extensions, failedLookupLocation, onlyRecordFailures, state) {
-        var resolvedByAddingExtension = tryAddingExtensions(candidate, extensions, failedLookupLocation, onlyRecordFailures, state);
+    function loadModuleFromFile(extensions, candidate, failedLookupLocations, onlyRecordFailures, state) {
+        var resolvedByAddingExtension = tryAddingExtensions(candidate, extensions, failedLookupLocations, onlyRecordFailures, state);
         if (resolvedByAddingExtension) {
             return resolvedByAddingExtension;
         }
@@ -19266,21 +19190,30 @@ var ts;
                 var extension = candidate.substring(extensionless.length);
                 trace(state.host, ts.Diagnostics.File_name_0_has_a_1_extension_stripping_it, candidate, extension);
             }
-            return tryAddingExtensions(extensionless, extensions, failedLookupLocation, onlyRecordFailures, state);
+            return tryAddingExtensions(extensionless, extensions, failedLookupLocations, onlyRecordFailures, state);
         }
     }
-    function tryAddingExtensions(candidate, extensions, failedLookupLocation, onlyRecordFailures, state) {
+    function tryAddingExtensions(candidate, extensions, failedLookupLocations, onlyRecordFailures, state) {
         if (!onlyRecordFailures) {
             var directory = ts.getDirectoryPath(candidate);
             if (directory) {
                 onlyRecordFailures = !directoryProbablyExists(directory, state.host);
             }
         }
-        return ts.forEach(extensions, function (ext) {
-            return !(state.skipTsx && ts.isJsxOrTsxExtension(ext)) && tryFile(candidate + ext, failedLookupLocation, onlyRecordFailures, state);
-        });
+        switch (extensions) {
+            case 2:
+                return tryExtension(".d.ts", ts.Extension.Dts);
+            case 0:
+                return tryExtension(".ts", ts.Extension.Ts) || tryExtension(".tsx", ts.Extension.Tsx) || tryExtension(".d.ts", ts.Extension.Dts);
+            case 1:
+                return tryExtension(".js", ts.Extension.Js) || tryExtension(".jsx", ts.Extension.Jsx);
+        }
+        function tryExtension(ext, extension) {
+            var path = tryFile(candidate + ext, failedLookupLocations, onlyRecordFailures, state);
+            return path && { path: path, extension: extension };
+        }
     }
-    function tryFile(fileName, failedLookupLocation, onlyRecordFailures, state) {
+    function tryFile(fileName, failedLookupLocations, onlyRecordFailures, state) {
         if (!onlyRecordFailures && state.host.fileExists(fileName)) {
             if (state.traceEnabled) {
                 trace(state.host, ts.Diagnostics.File_0_exist_use_it_as_a_name_resolution_result, fileName);
@@ -19291,29 +19224,32 @@ var ts;
             if (state.traceEnabled) {
                 trace(state.host, ts.Diagnostics.File_0_does_not_exist, fileName);
             }
-            failedLookupLocation.push(fileName);
+            failedLookupLocations.push(fileName);
             return undefined;
         }
     }
-    function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocation, onlyRecordFailures, state) {
+    function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, onlyRecordFailures, state) {
         var packageJsonPath = pathToPackageJson(candidate);
         var directoryExists = !onlyRecordFailures && directoryProbablyExists(candidate, state.host);
         if (directoryExists && state.host.fileExists(packageJsonPath)) {
             if (state.traceEnabled) {
                 trace(state.host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath);
             }
-            var typesFile = tryReadTypesSection(packageJsonPath, candidate, state);
+            var typesFile = tryReadTypesSection(extensions, packageJsonPath, candidate, state);
             if (typesFile) {
                 var onlyRecordFailures_1 = !directoryProbablyExists(ts.getDirectoryPath(typesFile), state.host);
-                var result = tryFile(typesFile, failedLookupLocation, onlyRecordFailures_1, state) ||
-                    tryAddingExtensions(typesFile, extensions, failedLookupLocation, onlyRecordFailures_1, state);
-                if (result) {
-                    return result;
+                var fromFile = tryFile(typesFile, failedLookupLocations, onlyRecordFailures_1, state);
+                if (fromFile) {
+                    return resolvedFromAnyFile(fromFile);
+                }
+                var x = tryAddingExtensions(typesFile, 0, failedLookupLocations, onlyRecordFailures_1, state);
+                if (x) {
+                    return x;
                 }
             }
             else {
                 if (state.traceEnabled) {
-                    trace(state.host, ts.Diagnostics.package_json_does_not_have_types_field);
+                    trace(state.host, ts.Diagnostics.package_json_does_not_have_a_types_or_main_field);
                 }
             }
         }
@@ -19321,95 +19257,96 @@ var ts;
             if (state.traceEnabled) {
                 trace(state.host, ts.Diagnostics.File_0_does_not_exist, packageJsonPath);
             }
-            failedLookupLocation.push(packageJsonPath);
+            failedLookupLocations.push(packageJsonPath);
         }
-        return loadModuleFromFile(ts.combinePaths(candidate, "index"), extensions, failedLookupLocation, !directoryExists, state);
+        return loadModuleFromFile(extensions, ts.combinePaths(candidate, "index"), failedLookupLocations, !directoryExists, state);
     }
     function pathToPackageJson(directory) {
         return ts.combinePaths(directory, "package.json");
     }
-    function loadModuleFromNodeModulesFolder(moduleName, directory, failedLookupLocations, state) {
+    function loadModuleFromNodeModulesFolder(extensions, moduleName, directory, failedLookupLocations, state) {
         var nodeModulesFolder = ts.combinePaths(directory, "node_modules");
         var nodeModulesFolderExists = directoryProbablyExists(nodeModulesFolder, state.host);
         var candidate = ts.normalizePath(ts.combinePaths(nodeModulesFolder, moduleName));
-        var supportedExtensions = ts.getSupportedExtensions(state.compilerOptions);
-        var result = loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, !nodeModulesFolderExists, state);
-        if (result) {
-            return result;
-        }
-        result = loadNodeModuleFromDirectory(supportedExtensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state);
-        if (result) {
-            return result;
-        }
+        return loadModuleFromFile(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state) ||
+            loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state);
     }
-    function loadModuleFromNodeModules(moduleName, directory, failedLookupLocations, state, checkOneLevel) {
-        return loadModuleFromNodeModulesWorker(moduleName, directory, failedLookupLocations, state, checkOneLevel, false);
+    function loadModuleFromNodeModules(extensions, moduleName, directory, failedLookupLocations, state) {
+        return loadModuleFromNodeModulesWorker(extensions, moduleName, directory, failedLookupLocations, state, false);
     }
-    ts.loadModuleFromNodeModules = loadModuleFromNodeModules;
     function loadModuleFromNodeModulesAtTypes(moduleName, directory, failedLookupLocations, state) {
-        return loadModuleFromNodeModulesWorker(moduleName, directory, failedLookupLocations, state, false, true);
+        return loadModuleFromNodeModulesWorker(2, moduleName, directory, failedLookupLocations, state, true);
     }
-    function loadModuleFromNodeModulesWorker(moduleName, directory, failedLookupLocations, state, checkOneLevel, typesOnly) {
-        directory = ts.normalizeSlashes(directory);
-        while (true) {
-            var baseName = ts.getBaseFileName(directory);
-            if (baseName !== "node_modules") {
-                var packageResult = void 0;
-                if (!typesOnly) {
-                    packageResult = loadModuleFromNodeModulesFolder(moduleName, directory, failedLookupLocations, state);
-                    if (packageResult && ts.hasTypeScriptFileExtension(packageResult)) {
-                        return packageResult;
-                    }
-                }
-                var typesResult = loadModuleFromNodeModulesFolder(ts.combinePaths("@types", moduleName), directory, failedLookupLocations, state);
-                if (typesResult || packageResult) {
-                    return typesResult || packageResult;
-                }
+    function loadModuleFromNodeModulesWorker(extensions, moduleName, directory, failedLookupLocations, state, typesOnly) {
+        return forEachAncestorDirectory(ts.normalizeSlashes(directory), function (ancestorDirectory) {
+            if (ts.getBaseFileName(ancestorDirectory) !== "node_modules") {
+                return loadModuleFromNodeModulesOneLevel(extensions, moduleName, ancestorDirectory, failedLookupLocations, state, typesOnly);
             }
-            var parentPath = ts.getDirectoryPath(directory);
-            if (parentPath === directory || checkOneLevel) {
-                break;
-            }
-            directory = parentPath;
+        });
+    }
+    function loadModuleFromNodeModulesOneLevel(extensions, moduleName, directory, failedLookupLocations, state, typesOnly) {
+        if (typesOnly === void 0) { typesOnly = false; }
+        var packageResult = typesOnly ? undefined : loadModuleFromNodeModulesFolder(extensions, moduleName, directory, failedLookupLocations, state);
+        if (packageResult) {
+            return packageResult;
+        }
+        if (extensions !== 1) {
+            return loadModuleFromNodeModulesFolder(2, ts.combinePaths("@types", moduleName), directory, failedLookupLocations, state);
         }
-        return undefined;
     }
     function classicNameResolver(moduleName, containingFile, compilerOptions, host) {
         var traceEnabled = isTraceEnabled(compilerOptions, host);
-        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, skipTsx: !compilerOptions.jsx };
+        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled };
         var failedLookupLocations = [];
-        var supportedExtensions = ts.getSupportedExtensions(compilerOptions);
         var containingDirectory = ts.getDirectoryPath(containingFile);
-        var resolvedFileName = tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, loadModuleFromFile, failedLookupLocations, supportedExtensions, state);
-        if (resolvedFileName) {
-            return createResolvedModule(resolvedFileName, false, failedLookupLocations);
+        var resolved = tryResolve(0) || tryResolve(1);
+        return createResolvedModuleWithFailedLookupLocations(resolved, false, failedLookupLocations);
+        function tryResolve(extensions) {
+            var resolvedUsingSettings = tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, loadModuleFromFile, failedLookupLocations, state);
+            if (resolvedUsingSettings) {
+                return resolvedUsingSettings;
+            }
+            if (moduleHasNonRelativeName(moduleName)) {
+                var resolved_3 = forEachAncestorDirectory(containingDirectory, function (directory) {
+                    var searchName = ts.normalizePath(ts.combinePaths(directory, moduleName));
+                    return loadModuleFromFile(extensions, searchName, failedLookupLocations, false, state);
+                });
+                if (resolved_3) {
+                    return resolved_3;
+                }
+                if (extensions === 0) {
+                    return loadModuleFromNodeModulesAtTypes(moduleName, containingDirectory, failedLookupLocations, state);
+                }
+            }
+            else {
+                var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
+                return loadModuleFromFile(extensions, candidate, failedLookupLocations, false, state);
+            }
         }
-        var referencedSourceFile;
-        if (moduleHasNonRelativeName(moduleName)) {
-            referencedSourceFile = referencedSourceFile = loadModuleFromAncestorDirectories(moduleName, containingDirectory, supportedExtensions, failedLookupLocations, state) ||
-                loadModuleFromNodeModulesAtTypes(moduleName, containingDirectory, failedLookupLocations, state);
-        }
-        else {
-            var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
-            referencedSourceFile = loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, false, state);
-        }
-        return referencedSourceFile
-            ? { resolvedModule: { resolvedFileName: referencedSourceFile }, failedLookupLocations: failedLookupLocations }
-            : { resolvedModule: undefined, failedLookupLocations: failedLookupLocations };
     }
     ts.classicNameResolver = classicNameResolver;
-    function loadModuleFromAncestorDirectories(moduleName, containingDirectory, supportedExtensions, failedLookupLocations, state) {
+    function loadModuleFromGlobalCache(moduleName, projectName, compilerOptions, host, globalCache) {
+        var traceEnabled = isTraceEnabled(compilerOptions, host);
+        if (traceEnabled) {
+            trace(host, ts.Diagnostics.Auto_discovery_for_typings_is_enabled_in_project_0_Running_extra_resolution_pass_for_module_1_using_cache_location_2, projectName, moduleName, globalCache);
+        }
+        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled };
+        var failedLookupLocations = [];
+        var resolved = loadModuleFromNodeModulesOneLevel(2, moduleName, globalCache, failedLookupLocations, state);
+        return createResolvedModuleWithFailedLookupLocations(resolved, true, failedLookupLocations);
+    }
+    ts.loadModuleFromGlobalCache = loadModuleFromGlobalCache;
+    function forEachAncestorDirectory(directory, callback) {
         while (true) {
-            var searchName = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
-            var referencedSourceFile = loadModuleFromFile(searchName, supportedExtensions, failedLookupLocations, false, state);
-            if (referencedSourceFile) {
-                return referencedSourceFile;
+            var result = callback(directory);
+            if (result !== undefined) {
+                return result;
             }
-            var parentPath = ts.getDirectoryPath(containingDirectory);
-            if (parentPath === containingDirectory) {
+            var parentPath = ts.getDirectoryPath(directory);
+            if (parentPath === directory) {
                 return undefined;
             }
-            containingDirectory = parentPath;
+            directory = parentPath;
         }
     }
 })(ts || (ts = {}));
@@ -19499,7 +19436,10 @@ var ts;
             getAmbientModules: getAmbientModules,
             getJsxElementAttributesType: getJsxElementAttributesType,
             getJsxIntrinsicTagNames: getJsxIntrinsicTagNames,
-            isOptionalParameter: isOptionalParameter
+            isOptionalParameter: isOptionalParameter,
+            tryFindAmbientModuleWithoutAugmentations: function (moduleName) {
+                return tryFindAmbientModule(moduleName, false);
+            }
         };
         var tupleTypes = [];
         var unionTypes = ts.createMap();
@@ -19513,9 +19453,9 @@ var ts;
         var autoType = createIntrinsicType(1, "any");
         var unknownType = createIntrinsicType(1, "unknown");
         var undefinedType = createIntrinsicType(2048, "undefined");
-        var undefinedWideningType = strictNullChecks ? undefinedType : createIntrinsicType(2048 | 33554432, "undefined");
+        var undefinedWideningType = strictNullChecks ? undefinedType : createIntrinsicType(2048 | 2097152, "undefined");
         var nullType = createIntrinsicType(4096, "null");
-        var nullWideningType = strictNullChecks ? nullType : createIntrinsicType(4096 | 33554432, "null");
+        var nullWideningType = strictNullChecks ? nullType : createIntrinsicType(4096 | 2097152, "null");
         var stringType = createIntrinsicType(2, "string");
         var numberType = createIntrinsicType(4, "number");
         var trueType = createIntrinsicType(128, "true");
@@ -19525,11 +19465,15 @@ var ts;
         var voidType = createIntrinsicType(1024, "void");
         var neverType = createIntrinsicType(8192, "never");
         var silentNeverType = createIntrinsicType(8192, "never");
+        var stringOrNumberType = getUnionType([stringType, numberType]);
         var emptyObjectType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
+        var emptyTypeLiteralSymbol = createSymbol(2048 | 67108864, "__type");
+        emptyTypeLiteralSymbol.members = ts.createMap();
+        var emptyTypeLiteralType = createAnonymousType(emptyTypeLiteralSymbol, emptySymbols, emptyArray, emptyArray, undefined, undefined);
         var emptyGenericType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
         emptyGenericType.instantiations = ts.createMap();
         var anyFunctionType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
-        anyFunctionType.flags |= 134217728;
+        anyFunctionType.flags |= 8388608;
         var noConstraintType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
         var anySignature = createSignature(undefined, undefined, undefined, emptyArray, anyType, undefined, 0, false, false);
         var unknownSignature = createSignature(undefined, undefined, undefined, emptyArray, unknownType, undefined, 0, false, false);
@@ -19591,66 +19535,6 @@ var ts;
         var potentialThisCollisions = [];
         var awaitedTypeStack = [];
         var diagnostics = ts.createDiagnosticCollection();
-        var TypeFacts;
-        (function (TypeFacts) {
-            TypeFacts[TypeFacts["None"] = 0] = "None";
-            TypeFacts[TypeFacts["TypeofEQString"] = 1] = "TypeofEQString";
-            TypeFacts[TypeFacts["TypeofEQNumber"] = 2] = "TypeofEQNumber";
-            TypeFacts[TypeFacts["TypeofEQBoolean"] = 4] = "TypeofEQBoolean";
-            TypeFacts[TypeFacts["TypeofEQSymbol"] = 8] = "TypeofEQSymbol";
-            TypeFacts[TypeFacts["TypeofEQObject"] = 16] = "TypeofEQObject";
-            TypeFacts[TypeFacts["TypeofEQFunction"] = 32] = "TypeofEQFunction";
-            TypeFacts[TypeFacts["TypeofEQHostObject"] = 64] = "TypeofEQHostObject";
-            TypeFacts[TypeFacts["TypeofNEString"] = 128] = "TypeofNEString";
-            TypeFacts[TypeFacts["TypeofNENumber"] = 256] = "TypeofNENumber";
-            TypeFacts[TypeFacts["TypeofNEBoolean"] = 512] = "TypeofNEBoolean";
-            TypeFacts[TypeFacts["TypeofNESymbol"] = 1024] = "TypeofNESymbol";
-            TypeFacts[TypeFacts["TypeofNEObject"] = 2048] = "TypeofNEObject";
-            TypeFacts[TypeFacts["TypeofNEFunction"] = 4096] = "TypeofNEFunction";
-            TypeFacts[TypeFacts["TypeofNEHostObject"] = 8192] = "TypeofNEHostObject";
-            TypeFacts[TypeFacts["EQUndefined"] = 16384] = "EQUndefined";
-            TypeFacts[TypeFacts["EQNull"] = 32768] = "EQNull";
-            TypeFacts[TypeFacts["EQUndefinedOrNull"] = 65536] = "EQUndefinedOrNull";
-            TypeFacts[TypeFacts["NEUndefined"] = 131072] = "NEUndefined";
-            TypeFacts[TypeFacts["NENull"] = 262144] = "NENull";
-            TypeFacts[TypeFacts["NEUndefinedOrNull"] = 524288] = "NEUndefinedOrNull";
-            TypeFacts[TypeFacts["Truthy"] = 1048576] = "Truthy";
-            TypeFacts[TypeFacts["Falsy"] = 2097152] = "Falsy";
-            TypeFacts[TypeFacts["Discriminatable"] = 4194304] = "Discriminatable";
-            TypeFacts[TypeFacts["All"] = 8388607] = "All";
-            TypeFacts[TypeFacts["BaseStringStrictFacts"] = 933633] = "BaseStringStrictFacts";
-            TypeFacts[TypeFacts["BaseStringFacts"] = 3145473] = "BaseStringFacts";
-            TypeFacts[TypeFacts["StringStrictFacts"] = 4079361] = "StringStrictFacts";
-            TypeFacts[TypeFacts["StringFacts"] = 4194049] = "StringFacts";
-            TypeFacts[TypeFacts["EmptyStringStrictFacts"] = 3030785] = "EmptyStringStrictFacts";
-            TypeFacts[TypeFacts["EmptyStringFacts"] = 3145473] = "EmptyStringFacts";
-            TypeFacts[TypeFacts["NonEmptyStringStrictFacts"] = 1982209] = "NonEmptyStringStrictFacts";
-            TypeFacts[TypeFacts["NonEmptyStringFacts"] = 4194049] = "NonEmptyStringFacts";
-            TypeFacts[TypeFacts["BaseNumberStrictFacts"] = 933506] = "BaseNumberStrictFacts";
-            TypeFacts[TypeFacts["BaseNumberFacts"] = 3145346] = "BaseNumberFacts";
-            TypeFacts[TypeFacts["NumberStrictFacts"] = 4079234] = "NumberStrictFacts";
-            TypeFacts[TypeFacts["NumberFacts"] = 4193922] = "NumberFacts";
-            TypeFacts[TypeFacts["ZeroStrictFacts"] = 3030658] = "ZeroStrictFacts";
-            TypeFacts[TypeFacts["ZeroFacts"] = 3145346] = "ZeroFacts";
-            TypeFacts[TypeFacts["NonZeroStrictFacts"] = 1982082] = "NonZeroStrictFacts";
-            TypeFacts[TypeFacts["NonZeroFacts"] = 4193922] = "NonZeroFacts";
-            TypeFacts[TypeFacts["BaseBooleanStrictFacts"] = 933252] = "BaseBooleanStrictFacts";
-            TypeFacts[TypeFacts["BaseBooleanFacts"] = 3145092] = "BaseBooleanFacts";
-            TypeFacts[TypeFacts["BooleanStrictFacts"] = 4078980] = "BooleanStrictFacts";
-            TypeFacts[TypeFacts["BooleanFacts"] = 4193668] = "BooleanFacts";
-            TypeFacts[TypeFacts["FalseStrictFacts"] = 3030404] = "FalseStrictFacts";
-            TypeFacts[TypeFacts["FalseFacts"] = 3145092] = "FalseFacts";
-            TypeFacts[TypeFacts["TrueStrictFacts"] = 1981828] = "TrueStrictFacts";
-            TypeFacts[TypeFacts["TrueFacts"] = 4193668] = "TrueFacts";
-            TypeFacts[TypeFacts["SymbolStrictFacts"] = 1981320] = "SymbolStrictFacts";
-            TypeFacts[TypeFacts["SymbolFacts"] = 4193160] = "SymbolFacts";
-            TypeFacts[TypeFacts["ObjectStrictFacts"] = 6166480] = "ObjectStrictFacts";
-            TypeFacts[TypeFacts["ObjectFacts"] = 8378320] = "ObjectFacts";
-            TypeFacts[TypeFacts["FunctionStrictFacts"] = 6164448] = "FunctionStrictFacts";
-            TypeFacts[TypeFacts["FunctionFacts"] = 8376288] = "FunctionFacts";
-            TypeFacts[TypeFacts["UndefinedFacts"] = 2457472] = "UndefinedFacts";
-            TypeFacts[TypeFacts["NullFacts"] = 2340752] = "NullFacts";
-        })(TypeFacts || (TypeFacts = {}));
         var typeofEQFacts = ts.createMap({
             "string": 1,
             "number": 2,
@@ -19677,6 +19561,8 @@ var ts;
             "undefined": undefinedType
         });
         var jsxElementType;
+        var _jsxNamespace;
+        var _jsxFactoryEntity;
         var jsxTypes = ts.createMap();
         var JsxNames = {
             JSX: "JSX",
@@ -19693,17 +19579,25 @@ var ts;
         var identityRelation = ts.createMap();
         var enumRelation = ts.createMap();
         var _displayBuilder;
-        var TypeSystemPropertyName;
-        (function (TypeSystemPropertyName) {
-            TypeSystemPropertyName[TypeSystemPropertyName["Type"] = 0] = "Type";
-            TypeSystemPropertyName[TypeSystemPropertyName["ResolvedBaseConstructorType"] = 1] = "ResolvedBaseConstructorType";
-            TypeSystemPropertyName[TypeSystemPropertyName["DeclaredType"] = 2] = "DeclaredType";
-            TypeSystemPropertyName[TypeSystemPropertyName["ResolvedReturnType"] = 3] = "ResolvedReturnType";
-        })(TypeSystemPropertyName || (TypeSystemPropertyName = {}));
         var builtinGlobals = ts.createMap();
         builtinGlobals[undefinedSymbol.name] = undefinedSymbol;
         initializeTypeChecker();
         return checker;
+        function getJsxNamespace() {
+            if (_jsxNamespace === undefined) {
+                _jsxNamespace = "React";
+                if (compilerOptions.jsxFactory) {
+                    _jsxFactoryEntity = ts.parseIsolatedEntityName(compilerOptions.jsxFactory, languageVersion);
+                    if (_jsxFactoryEntity) {
+                        _jsxNamespace = getFirstIdentifier(_jsxFactoryEntity).text;
+                    }
+                }
+                else if (compilerOptions.reactNamespace) {
+                    _jsxNamespace = compilerOptions.reactNamespace;
+                }
+            }
+            return _jsxNamespace;
+        }
         function getEmitResolver(sourceFile, cancellationToken) {
             getDiagnostics(sourceFile, cancellationToken);
             return emitResolver;
@@ -19784,7 +19678,7 @@ var ts;
                 target.flags |= source.flags;
                 if (source.valueDeclaration &&
                     (!target.valueDeclaration ||
-                        (target.valueDeclaration.kind === 226 && source.valueDeclaration.kind !== 226))) {
+                        (target.valueDeclaration.kind === 230 && source.valueDeclaration.kind !== 230))) {
                     target.valueDeclaration = source.valueDeclaration;
                 }
                 ts.forEach(source.declarations, function (node) {
@@ -19840,7 +19734,7 @@ var ts;
                 var moduleNotFoundError = !ts.isInAmbientContext(moduleName.parent.parent)
                     ? ts.Diagnostics.Invalid_module_name_in_augmentation_module_0_cannot_be_found
                     : undefined;
-                var mainModule = resolveExternalModuleNameWorker(moduleName, moduleName, moduleNotFoundError);
+                var mainModule = resolveExternalModuleNameWorker(moduleName, moduleName, moduleNotFoundError, true);
                 if (!mainModule) {
                     return;
                 }
@@ -19877,8 +19771,11 @@ var ts;
             var nodeId = getNodeId(node);
             return nodeLinks[nodeId] || (nodeLinks[nodeId] = { flags: 0 });
         }
+        function getObjectFlags(type) {
+            return type.flags & 32768 ? type.objectFlags : 0;
+        }
         function isGlobalSourceFile(node) {
-            return node.kind === 256 && !ts.isExternalOrCommonJsModule(node);
+            return node.kind === 261 && !ts.isExternalOrCommonJsModule(node);
         }
         function getSymbol(symbols, name, meaning) {
             if (meaning) {
@@ -19915,36 +19812,39 @@ var ts;
                     (!compilerOptions.outFile && !compilerOptions.out)) {
                     return true;
                 }
+                if (isUsedInFunctionOrNonStaticProperty(usage)) {
+                    return true;
+                }
                 var sourceFiles = host.getSourceFiles();
                 return ts.indexOf(sourceFiles, declarationFile) <= ts.indexOf(sourceFiles, useFile);
             }
             if (declaration.pos <= usage.pos) {
-                return declaration.kind !== 219 ||
+                return declaration.kind !== 223 ||
                     !isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage);
             }
-            return isUsedInFunctionOrNonStaticProperty(declaration, usage);
+            var container = ts.getEnclosingBlockScopeContainer(declaration);
+            return isUsedInFunctionOrNonStaticProperty(usage, container);
             function isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage) {
                 var container = ts.getEnclosingBlockScopeContainer(declaration);
                 switch (declaration.parent.parent.kind) {
-                    case 201:
-                    case 207:
-                    case 209:
+                    case 205:
+                    case 211:
+                    case 213:
                         if (isSameScopeDescendentOf(usage, declaration, container)) {
                             return true;
                         }
                         break;
                 }
                 switch (declaration.parent.parent.kind) {
-                    case 208:
-                    case 209:
+                    case 212:
+                    case 213:
                         if (isSameScopeDescendentOf(usage, declaration.parent.parent.expression, container)) {
                             return true;
                         }
                 }
                 return false;
             }
-            function isUsedInFunctionOrNonStaticProperty(declaration, usage) {
-                var container = ts.getEnclosingBlockScopeContainer(declaration);
+            function isUsedInFunctionOrNonStaticProperty(usage, container) {
                 var current = usage;
                 while (current) {
                     if (current === container) {
@@ -19954,7 +19854,7 @@ var ts;
                         return true;
                     }
                     var initializerOfNonStaticProperty = current.parent &&
-                        current.parent.kind === 146 &&
+                        current.parent.kind === 147 &&
                         (ts.getModifierFlags(current.parent) & 32) === 0 &&
                         current.parent.initializer === current;
                     if (initializerOfNonStaticProperty) {
@@ -19977,18 +19877,18 @@ var ts;
                     if (result = getSymbol(location.locals, name, meaning)) {
                         var useResult = true;
                         if (ts.isFunctionLike(location) && lastLocation && lastLocation !== location.body) {
-                            if (meaning & result.flags & 793064 && lastLocation.kind !== 273) {
+                            if (meaning & result.flags & 793064 && lastLocation.kind !== 278) {
                                 useResult = result.flags & 262144
                                     ? lastLocation === location.type ||
-                                        lastLocation.kind === 143 ||
-                                        lastLocation.kind === 142
+                                        lastLocation.kind === 144 ||
+                                        lastLocation.kind === 143
                                     : false;
                             }
                             if (meaning & 107455 && result.flags & 1) {
                                 useResult =
-                                    lastLocation.kind === 143 ||
+                                    lastLocation.kind === 144 ||
                                         (lastLocation === location.type &&
-                                            result.valueDeclaration.kind === 143);
+                                            result.valueDeclaration.kind === 144);
                             }
                         }
                         if (useResult) {
@@ -20000,13 +19900,13 @@ var ts;
                     }
                 }
                 switch (location.kind) {
-                    case 256:
+                    case 261:
                         if (!ts.isExternalOrCommonJsModule(location))
                             break;
                         isInExternalModule = true;
-                    case 226:
+                    case 230:
                         var moduleExports = getSymbolOfNode(location).exports;
-                        if (location.kind === 256 || ts.isAmbientModule(location)) {
+                        if (location.kind === 261 || ts.isAmbientModule(location)) {
                             if (result = moduleExports["default"]) {
                                 var localSymbol = ts.getLocalSymbolForExportDefault(result);
                                 if (localSymbol && (result.flags & meaning) && localSymbol.name === name) {
@@ -20016,7 +19916,7 @@ var ts;
                             }
                             if (moduleExports[name] &&
                                 moduleExports[name].flags === 8388608 &&
-                                ts.getDeclarationOfKind(moduleExports[name], 239)) {
+                                ts.getDeclarationOfKind(moduleExports[name], 243)) {
                                 break;
                             }
                         }
@@ -20024,13 +19924,13 @@ var ts;
                             break loop;
                         }
                         break;
-                    case 225:
+                    case 229:
                         if (result = getSymbol(getSymbolOfNode(location).exports, name, meaning & 8)) {
                             break loop;
                         }
                         break;
+                    case 147:
                     case 146:
-                    case 145:
                         if (ts.isClassLike(location.parent) && !(ts.getModifierFlags(location) & 32)) {
                             var ctor = findConstructorDeclaration(location.parent);
                             if (ctor && ctor.locals) {
@@ -20040,9 +19940,9 @@ var ts;
                             }
                         }
                         break;
-                    case 222:
-                    case 193:
-                    case 223:
+                    case 226:
+                    case 197:
+                    case 227:
                         if (result = getSymbol(getSymbolOfNode(location).members, name, meaning & 793064)) {
                             if (lastLocation && ts.getModifierFlags(lastLocation) & 32) {
                                 error(errorLocation, ts.Diagnostics.Static_members_cannot_reference_class_type_parameters);
@@ -20050,7 +19950,7 @@ var ts;
                             }
                             break loop;
                         }
-                        if (location.kind === 193 && meaning & 32) {
+                        if (location.kind === 197 && meaning & 32) {
                             var className = location.name;
                             if (className && name === className.text) {
                                 result = location.symbol;
@@ -20058,28 +19958,28 @@ var ts;
                             }
                         }
                         break;
-                    case 141:
+                    case 142:
                         grandparent = location.parent.parent;
-                        if (ts.isClassLike(grandparent) || grandparent.kind === 223) {
+                        if (ts.isClassLike(grandparent) || grandparent.kind === 227) {
                             if (result = getSymbol(getSymbolOfNode(grandparent).members, name, meaning & 793064)) {
                                 error(errorLocation, ts.Diagnostics.A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type);
                                 return undefined;
                             }
                         }
                         break;
-                    case 148:
-                    case 147:
                     case 149:
+                    case 148:
                     case 150:
                     case 151:
-                    case 221:
-                    case 181:
+                    case 152:
+                    case 225:
+                    case 185:
                         if (meaning & 3 && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
                         }
                         break;
-                    case 180:
+                    case 184:
                         if (meaning & 3 && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
@@ -20092,8 +19992,8 @@ var ts;
                             }
                         }
                         break;
-                    case 144:
-                        if (location.parent && location.parent.kind === 143) {
+                    case 145:
+                        if (location.parent && location.parent.kind === 144) {
                             location = location.parent;
                         }
                         if (location.parent && ts.isClassElement(location.parent)) {
@@ -20135,7 +20035,7 @@ var ts;
                 }
                 if (result && isInExternalModule && (meaning & 107455) === 107455) {
                     var decls = result.declarations;
-                    if (decls && decls.length === 1 && decls[0].kind === 229) {
+                    if (decls && decls.length === 1 && decls[0].kind === 233) {
                         error(errorLocation, ts.Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead, name);
                     }
                 }
@@ -20182,9 +20082,9 @@ var ts;
         function getEntityNameForExtendingInterface(node) {
             switch (node.kind) {
                 case 70:
-                case 173:
+                case 177:
                     return node.parent ? getEntityNameForExtendingInterface(node.parent) : undefined;
-                case 195:
+                case 199:
                     ts.Debug.assert(ts.isEntityNameExpression(node.expression));
                     return node.expression;
                 default:
@@ -20205,7 +20105,7 @@ var ts;
             ts.Debug.assert((result.flags & 2) !== 0);
             var declaration = ts.forEach(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) ? d : undefined; });
             ts.Debug.assert(declaration !== undefined, "Block-scoped variable declaration is undefined");
-            if (!ts.isInAmbientContext(declaration) && !isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 219), errorLocation)) {
+            if (!ts.isInAmbientContext(declaration) && !isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 223), errorLocation)) {
                 error(errorLocation, ts.Diagnostics.Block_scoped_variable_0_used_before_its_declaration, ts.declarationNameToString(declaration.name));
             }
         }
@@ -20222,10 +20122,10 @@ var ts;
         }
         function getAnyImportSyntax(node) {
             if (ts.isAliasSymbolDeclaration(node)) {
-                if (node.kind === 230) {
+                if (node.kind === 234) {
                     return node;
                 }
-                while (node && node.kind !== 231) {
+                while (node && node.kind !== 235) {
                     node = node.parent;
                 }
                 return node;
@@ -20235,7 +20135,7 @@ var ts;
             return ts.forEach(symbol.declarations, function (d) { return ts.isAliasSymbolDeclaration(d) ? d : undefined; });
         }
         function getTargetOfImportEqualsDeclaration(node) {
-            if (node.moduleReference.kind === 241) {
+            if (node.moduleReference.kind === 245) {
                 return resolveExternalModuleSymbol(resolveExternalModuleName(node, ts.getExternalModuleImportEqualsDeclarationExpression(node)));
             }
             return getSymbolOfPartOfRightHandSideOfImportEquals(node.moduleReference);
@@ -20296,28 +20196,28 @@ var ts;
             var moduleSymbol = resolveExternalModuleName(node, node.moduleSpecifier);
             var targetSymbol = resolveESModuleSymbol(moduleSymbol, node.moduleSpecifier);
             if (targetSymbol) {
-                var name_13 = specifier.propertyName || specifier.name;
-                if (name_13.text) {
+                var name_17 = specifier.propertyName || specifier.name;
+                if (name_17.text) {
                     if (ts.isShorthandAmbientModuleSymbol(moduleSymbol)) {
                         return moduleSymbol;
                     }
                     var symbolFromVariable = void 0;
                     if (moduleSymbol && moduleSymbol.exports && moduleSymbol.exports["export="]) {
-                        symbolFromVariable = getPropertyOfType(getTypeOfSymbol(targetSymbol), name_13.text);
+                        symbolFromVariable = getPropertyOfType(getTypeOfSymbol(targetSymbol), name_17.text);
                     }
                     else {
-                        symbolFromVariable = getPropertyOfVariable(targetSymbol, name_13.text);
+                        symbolFromVariable = getPropertyOfVariable(targetSymbol, name_17.text);
                     }
                     symbolFromVariable = resolveSymbol(symbolFromVariable);
-                    var symbolFromModule = getExportOfModule(targetSymbol, name_13.text);
-                    if (!symbolFromModule && allowSyntheticDefaultImports && name_13.text === "default") {
+                    var symbolFromModule = getExportOfModule(targetSymbol, name_17.text);
+                    if (!symbolFromModule && allowSyntheticDefaultImports && name_17.text === "default") {
                         symbolFromModule = resolveExternalModuleSymbol(moduleSymbol) || resolveSymbol(moduleSymbol);
                     }
                     var symbol = symbolFromModule && symbolFromVariable ?
                         combineValueAndTypeSymbols(symbolFromVariable, symbolFromModule) :
                         symbolFromModule || symbolFromVariable;
                     if (!symbol) {
-                        error(name_13, ts.Diagnostics.Module_0_has_no_exported_member_1, getFullyQualifiedName(moduleSymbol), ts.declarationNameToString(name_13));
+                        error(name_17, ts.Diagnostics.Module_0_has_no_exported_member_1, getFullyQualifiedName(moduleSymbol), ts.declarationNameToString(name_17));
                     }
                     return symbol;
                 }
@@ -20339,19 +20239,19 @@ var ts;
         }
         function getTargetOfAliasDeclaration(node) {
             switch (node.kind) {
-                case 230:
+                case 234:
                     return getTargetOfImportEqualsDeclaration(node);
-                case 232:
-                    return getTargetOfImportClause(node);
-                case 233:
-                    return getTargetOfNamespaceImport(node);
-                case 235:
-                    return getTargetOfImportSpecifier(node);
-                case 239:
-                    return getTargetOfExportSpecifier(node);
                 case 236:
+                    return getTargetOfImportClause(node);
+                case 237:
+                    return getTargetOfNamespaceImport(node);
+                case 239:
+                    return getTargetOfImportSpecifier(node);
+                case 243:
+                    return getTargetOfExportSpecifier(node);
+                case 240:
                     return getTargetOfExportAssignment(node);
-                case 229:
+                case 233:
                     return getTargetOfNamespaceExportDeclaration(node);
             }
         }
@@ -20395,10 +20295,10 @@ var ts;
                 links.referenced = true;
                 var node = getDeclarationOfAliasSymbol(symbol);
                 ts.Debug.assert(!!node);
-                if (node.kind === 236) {
+                if (node.kind === 240) {
                     checkExpressionCached(node.expression);
                 }
-                else if (node.kind === 239) {
+                else if (node.kind === 243) {
                     checkExpressionCached(node.propertyName || node.name);
                 }
                 else if (ts.isInternalModuleImportEqualsDeclaration(node)) {
@@ -20410,11 +20310,11 @@ var ts;
             if (entityName.kind === 70 && ts.isRightSideOfQualifiedNameOrPropertyAccess(entityName)) {
                 entityName = entityName.parent;
             }
-            if (entityName.kind === 70 || entityName.parent.kind === 140) {
+            if (entityName.kind === 70 || entityName.parent.kind === 141) {
                 return resolveEntityName(entityName, 1920, false, dontResolveAlias);
             }
             else {
-                ts.Debug.assert(entityName.parent.kind === 230);
+                ts.Debug.assert(entityName.parent.kind === 234);
                 return resolveEntityName(entityName, 107455 | 793064 | 1920, false, dontResolveAlias);
             }
         }
@@ -20433,9 +20333,9 @@ var ts;
                     return undefined;
                 }
             }
-            else if (name.kind === 140 || name.kind === 173) {
-                var left = name.kind === 140 ? name.left : name.expression;
-                var right = name.kind === 140 ? name.right : name.name;
+            else if (name.kind === 141 || name.kind === 177) {
+                var left = name.kind === 141 ? name.left : name.expression;
+                var right = name.kind === 141 ? name.right : name.name;
                 var namespace = resolveEntityName(left, 1920, ignoreErrors, false, location);
                 if (!namespace || ts.nodeIsMissing(right)) {
                     return undefined;
@@ -20460,27 +20360,28 @@ var ts;
         function resolveExternalModuleName(location, moduleReferenceExpression) {
             return resolveExternalModuleNameWorker(location, moduleReferenceExpression, ts.Diagnostics.Cannot_find_module_0);
         }
-        function resolveExternalModuleNameWorker(location, moduleReferenceExpression, moduleNotFoundError) {
+        function resolveExternalModuleNameWorker(location, moduleReferenceExpression, moduleNotFoundError, isForAugmentation) {
+            if (isForAugmentation === void 0) { isForAugmentation = false; }
             if (moduleReferenceExpression.kind !== 9) {
                 return;
             }
             var moduleReferenceLiteral = moduleReferenceExpression;
-            return resolveExternalModule(location, moduleReferenceLiteral.text, moduleNotFoundError, moduleReferenceLiteral);
+            return resolveExternalModule(location, moduleReferenceLiteral.text, moduleNotFoundError, moduleReferenceLiteral, isForAugmentation);
         }
-        function resolveExternalModule(location, moduleReference, moduleNotFoundError, errorNode) {
+        function resolveExternalModule(location, moduleReference, moduleNotFoundError, errorNode, isForAugmentation) {
+            if (isForAugmentation === void 0) { isForAugmentation = false; }
             var moduleName = ts.escapeIdentifier(moduleReference);
             if (moduleName === undefined) {
                 return;
             }
-            var isRelative = ts.isExternalModuleNameRelative(moduleName);
-            if (!isRelative) {
-                var symbol = getSymbol(globals, '"' + moduleName + '"', 512);
-                if (symbol) {
-                    return getMergedSymbol(symbol);
-                }
+            var ambientModule = tryFindAmbientModule(moduleName, true);
+            if (ambientModule) {
+                return ambientModule;
             }
+            var isRelative = ts.isExternalModuleNameRelative(moduleName);
             var resolvedModule = ts.getResolvedModule(ts.getSourceFileOfNode(location), moduleReference);
-            var sourceFile = resolvedModule && host.getSourceFile(resolvedModule.resolvedFileName);
+            var resolutionDiagnostic = resolvedModule && ts.getResolutionDiagnostic(compilerOptions, resolvedModule);
+            var sourceFile = resolvedModule && !resolutionDiagnostic && host.getSourceFile(resolvedModule.resolvedFileName);
             if (sourceFile) {
                 if (sourceFile.symbol) {
                     return getMergedSymbol(sourceFile.symbol);
@@ -20496,14 +20397,30 @@ var ts;
                     return getMergedSymbol(pattern.symbol);
                 }
             }
+            if (!isRelative && resolvedModule && !ts.extensionIsTypeScript(resolvedModule.extension)) {
+                if (isForAugmentation) {
+                    ts.Debug.assert(!!moduleNotFoundError);
+                    var diag = ts.Diagnostics.Invalid_module_name_in_augmentation_Module_0_resolves_to_an_untyped_module_at_1_which_cannot_be_augmented;
+                    error(errorNode, diag, moduleName, resolvedModule.resolvedFileName);
+                }
+                else if (compilerOptions.noImplicitAny && moduleNotFoundError) {
+                    error(errorNode, ts.Diagnostics.Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type, moduleReference, resolvedModule.resolvedFileName);
+                }
+                return undefined;
+            }
             if (moduleNotFoundError) {
-                var tsExtension = ts.tryExtractTypeScriptExtension(moduleName);
-                if (tsExtension) {
-                    var diag = ts.Diagnostics.An_import_path_cannot_end_with_a_0_extension_Consider_importing_1_instead;
-                    error(errorNode, diag, tsExtension, ts.removeExtension(moduleName, tsExtension));
+                if (resolutionDiagnostic) {
+                    error(errorNode, resolutionDiagnostic, moduleName, resolvedModule.resolvedFileName);
                 }
                 else {
-                    error(errorNode, moduleNotFoundError, moduleName);
+                    var tsExtension = ts.tryExtractTypeScriptExtension(moduleName);
+                    if (tsExtension) {
+                        var diag = ts.Diagnostics.An_import_path_cannot_end_with_a_0_extension_Consider_importing_1_instead;
+                        error(errorNode, diag, tsExtension, ts.removeExtension(moduleName, tsExtension));
+                    }
+                    else {
+                        error(errorNode, moduleNotFoundError, moduleName);
+                    }
                 }
             }
             return undefined;
@@ -20618,7 +20535,7 @@ var ts;
             var members = node.members;
             for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
                 var member = members_1[_i];
-                if (member.kind === 149 && ts.nodeIsPresent(member.body)) {
+                if (member.kind === 150 && ts.nodeIsPresent(member.body)) {
                     return member;
                 }
             }
@@ -20640,8 +20557,9 @@ var ts;
             type.intrinsicName = "boolean";
             return type;
         }
-        function createObjectType(kind, symbol) {
-            var type = createType(kind);
+        function createObjectType(objectFlags, symbol) {
+            var type = createType(32768);
+            type.objectFlags = objectFlags;
             type.symbol = symbol;
             return type;
         }
@@ -20665,7 +20583,7 @@ var ts;
             }
             return result || emptyArray;
         }
-        function setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
+        function setStructuredTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
             type.members = members;
             type.properties = getNamedMembers(members);
             type.callSignatures = callSignatures;
@@ -20677,7 +20595,7 @@ var ts;
             return type;
         }
         function createAnonymousType(symbol, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
-            return setObjectTypeMembers(createObjectType(2097152, symbol), members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+            return setStructuredTypeMembers(createObjectType(16, symbol), members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function forEachSymbolTableInScope(enclosingDeclaration, callback) {
             var result;
@@ -20688,11 +20606,11 @@ var ts;
                     }
                 }
                 switch (location_1.kind) {
-                    case 256:
+                    case 261:
                         if (!ts.isExternalOrCommonJsModule(location_1)) {
                             break;
                         }
-                    case 226:
+                    case 230:
                         if (result = callback(getSymbolOfNode(location_1).exports)) {
                             return result;
                         }
@@ -20725,7 +20643,7 @@ var ts;
                 return ts.forEachProperty(symbols, function (symbolFromSymbolTable) {
                     if (symbolFromSymbolTable.flags & 8388608
                         && symbolFromSymbolTable.name !== "export="
-                        && !ts.getDeclarationOfKind(symbolFromSymbolTable, 239)) {
+                        && !ts.getDeclarationOfKind(symbolFromSymbolTable, 243)) {
                         if (!useOnlyExternalAliasing ||
                             ts.forEach(symbolFromSymbolTable.declarations, ts.isExternalModuleImportEqualsDeclaration)) {
                             var resolvedImportedSymbol = resolveAlias(symbolFromSymbolTable);
@@ -20756,7 +20674,7 @@ var ts;
                 if (symbolFromSymbolTable === symbol) {
                     return true;
                 }
-                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 8388608 && !ts.getDeclarationOfKind(symbolFromSymbolTable, 239)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
+                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 8388608 && !ts.getDeclarationOfKind(symbolFromSymbolTable, 243)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
                 if (symbolFromSymbolTable.flags & meaning) {
                     qualify = true;
                     return true;
@@ -20770,10 +20688,10 @@ var ts;
                 for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
                     switch (declaration.kind) {
-                        case 146:
-                        case 148:
-                        case 150:
+                        case 147:
+                        case 149:
                         case 151:
+                        case 152:
                             continue;
                         default:
                             return false;
@@ -20829,7 +20747,7 @@ var ts;
             }
         }
         function hasExternalModuleSymbol(declaration) {
-            return ts.isAmbientModule(declaration) || (declaration.kind === 256 && ts.isExternalOrCommonJsModule(declaration));
+            return ts.isAmbientModule(declaration) || (declaration.kind === 261 && ts.isExternalOrCommonJsModule(declaration));
         }
         function hasVisibleDeclarations(symbol, shouldComputeAliasToMakeVisible) {
             var aliasesToMakeVisible;
@@ -20863,11 +20781,11 @@ var ts;
         }
         function isEntityNameVisible(entityName, enclosingDeclaration) {
             var meaning;
-            if (entityName.parent.kind === 159 || ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
+            if (entityName.parent.kind === 160 || ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
                 meaning = 107455 | 1048576;
             }
-            else if (entityName.kind === 140 || entityName.kind === 173 ||
-                entityName.parent.kind === 230) {
+            else if (entityName.kind === 141 || entityName.kind === 177 ||
+                entityName.parent.kind === 234) {
                 meaning = 1920;
             }
             else {
@@ -20959,10 +20877,10 @@ var ts;
         function getTypeAliasForTypeLiteral(type) {
             if (type.symbol && type.symbol.flags & 2048) {
                 var node = type.symbol.declarations[0].parent;
-                while (node.kind === 165) {
+                while (node.kind === 166) {
                     node = node.parent;
                 }
-                if (node.kind === 224) {
+                if (node.kind === 228) {
                     return getSymbolOfNode(node);
                 }
             }
@@ -20970,7 +20888,7 @@ var ts;
         }
         function isTopLevelInExternalModuleAugmentation(node) {
             return node && node.parent &&
-                node.parent.kind === 227 &&
+                node.parent.kind === 231 &&
                 ts.isExternalModuleAugmentation(node.parent.parent);
         }
         function literalTypeToString(type) {
@@ -20984,10 +20902,10 @@ var ts;
                         return ts.declarationNameToString(declaration.name);
                     }
                     switch (declaration.kind) {
-                        case 193:
+                        case 197:
                             return "(Anonymous class)";
-                        case 180:
-                        case 181:
+                        case 184:
+                        case 185:
                             return "(Anonymous function)";
                     }
                 }
@@ -21039,9 +20957,9 @@ var ts;
                     var accessibleSymbolChain = getAccessibleSymbolChain(symbol, enclosingDeclaration, meaning, !!(flags & 2));
                     if (!accessibleSymbolChain ||
                         needsQualification(accessibleSymbolChain[0], enclosingDeclaration, accessibleSymbolChain.length === 1 ? meaning : getQualifiedLeftMeaning(meaning))) {
-                        var parent_8 = getParentOfSymbol(accessibleSymbolChain ? accessibleSymbolChain[0] : symbol);
-                        if (parent_8) {
-                            walkSymbol(parent_8, getQualifiedLeftMeaning(meaning), false);
+                        var parent_6 = getParentOfSymbol(accessibleSymbolChain ? accessibleSymbolChain[0] : symbol);
+                        if (parent_6) {
+                            walkSymbol(parent_6, getQualifiedLeftMeaning(meaning), false);
                         }
                     }
                     if (accessibleSymbolChain) {
@@ -21082,7 +21000,7 @@ var ts;
                         }
                         writer.writeKeyword("this");
                     }
-                    else if (type.flags & 131072) {
+                    else if (getObjectFlags(type) & 4) {
                         writeTypeReference(type, nextFlags);
                     }
                     else if (type.flags & 256) {
@@ -21090,23 +21008,34 @@ var ts;
                         writePunctuation(writer, 22);
                         appendSymbolNameOnly(type.symbol, writer);
                     }
-                    else if (type.flags & (32768 | 65536 | 16 | 16384)) {
+                    else if (getObjectFlags(type) & 3 || type.flags & (16 | 16384)) {
                         buildSymbolDisplay(type.symbol, writer, enclosingDeclaration, 793064, 0, nextFlags);
                     }
-                    else if (!(flags & 512) && ((type.flags & 2097152 && !type.target) || type.flags & 1572864) && type.aliasSymbol &&
+                    else if (!(flags & 512) && type.aliasSymbol &&
                         isSymbolAccessible(type.aliasSymbol, enclosingDeclaration, 793064, false).accessibility === 0) {
                         var typeArguments = type.aliasTypeArguments;
                         writeSymbolTypeReference(type.aliasSymbol, typeArguments, 0, typeArguments ? typeArguments.length : 0, nextFlags);
                     }
-                    else if (type.flags & 1572864) {
+                    else if (type.flags & 196608) {
                         writeUnionOrIntersectionType(type, nextFlags);
                     }
-                    else if (type.flags & 2097152) {
+                    else if (getObjectFlags(type) & (16 | 32)) {
                         writeAnonymousType(type, nextFlags);
                     }
                     else if (type.flags & 96) {
                         writer.writeStringLiteral(literalTypeToString(type));
                     }
+                    else if (type.flags & 262144) {
+                        writer.writeKeyword("keyof");
+                        writeSpace(writer);
+                        writeType(type.type, 64);
+                    }
+                    else if (type.flags & 524288) {
+                        writeType(type.objectType, 64);
+                        writePunctuation(writer, 20);
+                        writeType(type.indexType, 0);
+                        writePunctuation(writer, 21);
+                    }
                     else {
                         writePunctuation(writer, 16);
                         writeSpace(writer);
@@ -21151,7 +21080,7 @@ var ts;
                         writePunctuation(writer, 20);
                         writePunctuation(writer, 21);
                     }
-                    else if (type.target.flags & 262144) {
+                    else if (type.target.objectFlags & 8) {
                         writePunctuation(writer, 20);
                         writeTypeList(type.typeArguments.slice(0, getTypeReferenceArity(type)), 25);
                         writePunctuation(writer, 21);
@@ -21163,12 +21092,12 @@ var ts;
                             var length_1 = outerTypeParameters.length;
                             while (i < length_1) {
                                 var start = i;
-                                var parent_9 = getParentSymbolOfTypeParameter(outerTypeParameters[i]);
+                                var parent_7 = getParentSymbolOfTypeParameter(outerTypeParameters[i]);
                                 do {
                                     i++;
-                                } while (i < length_1 && getParentSymbolOfTypeParameter(outerTypeParameters[i]) === parent_9);
+                                } while (i < length_1 && getParentSymbolOfTypeParameter(outerTypeParameters[i]) === parent_7);
                                 if (!ts.rangeEquals(outerTypeParameters, typeArguments, start, i)) {
-                                    writeSymbolTypeReference(parent_9, typeArguments, start, i, flags);
+                                    writeSymbolTypeReference(parent_7, typeArguments, start, i, flags);
                                     writePunctuation(writer, 22);
                                 }
                             }
@@ -21181,7 +21110,7 @@ var ts;
                     if (flags & 64) {
                         writePunctuation(writer, 18);
                     }
-                    if (type.flags & 524288) {
+                    if (type.flags & 65536) {
                         writeTypeList(formatUnionTypes(type.types), 48);
                     }
                     else {
@@ -21227,7 +21156,7 @@ var ts;
                         var isNonLocalFunctionSymbol = !!(symbol.flags & 16) &&
                             (symbol.parent ||
                                 ts.forEach(symbol.declarations, function (declaration) {
-                                    return declaration.parent.kind === 256 || declaration.parent.kind === 227;
+                                    return declaration.parent.kind === 261 || declaration.parent.kind === 231;
                                 }));
                         if (isStaticMethodSymbol || isNonLocalFunctionSymbol) {
                             return !!(flags & 2) ||
@@ -21243,7 +21172,7 @@ var ts;
                 function writeIndexSignature(info, keyword) {
                     if (info) {
                         if (info.isReadonly) {
-                            writeKeyword(writer, 129);
+                            writeKeyword(writer, 130);
                             writeSpace(writer);
                         }
                         writePunctuation(writer, 20);
@@ -21261,7 +21190,7 @@ var ts;
                 }
                 function writePropertyWithModifiers(prop) {
                     if (isReadonlySymbol(prop)) {
-                        writeKeyword(writer, 129);
+                        writeKeyword(writer, 130);
                         writeSpace(writer);
                     }
                     buildSymbolDisplay(prop, writer);
@@ -21281,6 +21210,12 @@ var ts;
                     return false;
                 }
                 function writeLiteralType(type, flags) {
+                    if (type.objectFlags & 32) {
+                        if (getConstraintTypeFromMappedType(type).flags & (16384 | 262144)) {
+                            writeMappedType(type);
+                            return;
+                        }
+                    }
                     var resolved = resolveStructuredTypeMembers(type);
                     if (!resolved.properties.length && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
                         if (!resolved.callSignatures.length && !resolved.constructSignatures.length) {
@@ -21317,6 +21252,12 @@ var ts;
                     writePunctuation(writer, 16);
                     writer.writeLine();
                     writer.increaseIndent();
+                    writeObjectLiteralType(resolved);
+                    writer.decreaseIndent();
+                    writePunctuation(writer, 17);
+                    inObjectTypeLiteral = saveInObjectTypeLiteral;
+                }
+                function writeObjectLiteralType(resolved) {
                     for (var _i = 0, _a = resolved.callSignatures; _i < _a.length; _i++) {
                         var signature = _a[_i];
                         buildSignatureDisplay(signature, writer, enclosingDeclaration, globalFlagsToPass, undefined, symbolStack);
@@ -21329,8 +21270,8 @@ var ts;
                         writePunctuation(writer, 24);
                         writer.writeLine();
                     }
-                    writeIndexSignature(resolved.stringIndexInfo, 133);
-                    writeIndexSignature(resolved.numberIndexInfo, 131);
+                    writeIndexSignature(resolved.stringIndexInfo, 134);
+                    writeIndexSignature(resolved.numberIndexInfo, 132);
                     for (var _d = 0, _e = resolved.properties; _d < _e.length; _d++) {
                         var p = _e[_d];
                         var t = getTypeOfSymbol(p);
@@ -21353,9 +21294,32 @@ var ts;
                             writer.writeLine();
                         }
                     }
+                }
+                function writeMappedType(type) {
+                    writePunctuation(writer, 16);
+                    writer.writeLine();
+                    writer.increaseIndent();
+                    if (type.declaration.readonlyToken) {
+                        writeKeyword(writer, 130);
+                        writeSpace(writer);
+                    }
+                    writePunctuation(writer, 20);
+                    appendSymbolNameOnly(getTypeParameterFromMappedType(type).symbol, writer);
+                    writeSpace(writer);
+                    writeKeyword(writer, 91);
+                    writeSpace(writer);
+                    writeType(getConstraintTypeFromMappedType(type), 0);
+                    writePunctuation(writer, 21);
+                    if (type.declaration.questionToken) {
+                        writePunctuation(writer, 54);
+                    }
+                    writePunctuation(writer, 55);
+                    writeSpace(writer);
+                    writeType(getTemplateTypeFromMappedType(type), 0);
+                    writePunctuation(writer, 24);
+                    writer.writeLine();
                     writer.decreaseIndent();
                     writePunctuation(writer, 17);
-                    inObjectTypeLiteral = saveInObjectTypeLiteral;
                 }
             }
             function buildTypeParameterDisplayFromSymbol(symbol, writer, enclosingDeclaration, flags) {
@@ -21393,12 +21357,12 @@ var ts;
                 buildTypeDisplay(getTypeOfSymbol(p), writer, enclosingDeclaration, flags, symbolStack);
             }
             function buildBindingPatternDisplay(bindingPattern, writer, enclosingDeclaration, flags, symbolStack) {
-                if (bindingPattern.kind === 168) {
+                if (bindingPattern.kind === 172) {
                     writePunctuation(writer, 16);
                     buildDisplayForCommaSeparatedList(bindingPattern.elements, writer, function (e) { return buildBindingElementDisplay(e, writer, enclosingDeclaration, flags, symbolStack); });
                     writePunctuation(writer, 17);
                 }
-                else if (bindingPattern.kind === 169) {
+                else if (bindingPattern.kind === 173) {
                     writePunctuation(writer, 20);
                     var elements = bindingPattern.elements;
                     buildDisplayForCommaSeparatedList(elements, writer, function (e) { return buildBindingElementDisplay(e, writer, enclosingDeclaration, flags, symbolStack); });
@@ -21412,7 +21376,7 @@ var ts;
                 if (ts.isOmittedExpression(bindingElement)) {
                     return;
                 }
-                ts.Debug.assert(bindingElement.kind === 170);
+                ts.Debug.assert(bindingElement.kind === 174);
                 if (bindingElement.propertyName) {
                     writer.writeSymbol(ts.getTextOfNode(bindingElement.propertyName), bindingElement.symbol);
                     writePunctuation(writer, 55);
@@ -21540,63 +21504,63 @@ var ts;
             return false;
             function determineIfDeclarationIsVisible() {
                 switch (node.kind) {
-                    case 170:
+                    case 174:
                         return isDeclarationVisible(node.parent.parent);
-                    case 219:
+                    case 223:
                         if (ts.isBindingPattern(node.name) &&
                             !node.name.elements.length) {
                             return false;
                         }
-                    case 226:
-                    case 222:
-                    case 223:
-                    case 224:
-                    case 221:
-                    case 225:
                     case 230:
+                    case 226:
+                    case 227:
+                    case 228:
+                    case 225:
+                    case 229:
+                    case 234:
                         if (ts.isExternalModuleAugmentation(node)) {
                             return true;
                         }
-                        var parent_10 = getDeclarationContainer(node);
+                        var parent_8 = getDeclarationContainer(node);
                         if (!(ts.getCombinedModifierFlags(node) & 1) &&
-                            !(node.kind !== 230 && parent_10.kind !== 256 && ts.isInAmbientContext(parent_10))) {
-                            return isGlobalSourceFile(parent_10);
+                            !(node.kind !== 234 && parent_8.kind !== 261 && ts.isInAmbientContext(parent_8))) {
+                            return isGlobalSourceFile(parent_8);
                         }
-                        return isDeclarationVisible(parent_10);
-                    case 146:
-                    case 145:
-                    case 150:
-                    case 151:
-                    case 148:
+                        return isDeclarationVisible(parent_8);
                     case 147:
+                    case 146:
+                    case 151:
+                    case 152:
+                    case 149:
+                    case 148:
                         if (ts.getModifierFlags(node) & (8 | 16)) {
                             return false;
                         }
-                    case 149:
-                    case 153:
-                    case 152:
+                    case 150:
                     case 154:
-                    case 143:
-                    case 227:
-                    case 157:
+                    case 153:
+                    case 155:
+                    case 144:
+                    case 231:
                     case 158:
-                    case 160:
-                    case 156:
+                    case 159:
                     case 161:
+                    case 157:
                     case 162:
                     case 163:
                     case 164:
                     case 165:
+                    case 166:
                         return isDeclarationVisible(node.parent);
-                    case 232:
-                    case 233:
-                    case 235:
-                        return false;
-                    case 142:
-                    case 256:
-                    case 229:
-                        return true;
                     case 236:
+                    case 237:
+                    case 239:
+                        return false;
+                    case 143:
+                    case 261:
+                    case 233:
+                        return true;
+                    case 240:
                         return false;
                     default:
                         return false;
@@ -21605,10 +21569,10 @@ var ts;
         }
         function collectLinkedAliases(node) {
             var exportSymbol;
-            if (node.parent && node.parent.kind === 236) {
+            if (node.parent && node.parent.kind === 240) {
                 exportSymbol = resolveName(node.parent, node.text, 107455 | 793064 | 1920 | 8388608, ts.Diagnostics.Cannot_find_name_0, node);
             }
-            else if (node.parent.kind === 239) {
+            else if (node.parent.kind === 243) {
                 var exportSpecifier = node.parent;
                 exportSymbol = exportSpecifier.parent.parent.moduleSpecifier ?
                     getExternalModuleMember(exportSpecifier.parent.parent, exportSpecifier) :
@@ -21670,7 +21634,6 @@ var ts;
                 return getSymbolLinks(target).declaredType;
             }
             if (propertyName === 1) {
-                ts.Debug.assert(!!(target.flags & 32768));
                 return target.resolvedBaseConstructorType;
             }
             if (propertyName === 3) {
@@ -21687,12 +21650,12 @@ var ts;
             node = ts.getRootDeclaration(node);
             while (node) {
                 switch (node.kind) {
-                    case 219:
-                    case 220:
-                    case 235:
-                    case 234:
-                    case 233:
-                    case 232:
+                    case 223:
+                    case 224:
+                    case 239:
+                    case 238:
+                    case 237:
+                    case 236:
                         node = node.parent;
                         break;
                     default:
@@ -21718,22 +21681,30 @@ var ts;
             var symbol = getSymbolOfNode(node);
             return symbol && getSymbolLinks(symbol).type || getTypeForVariableLikeDeclaration(node, false);
         }
-        function getTextOfPropertyName(name) {
-            switch (name.kind) {
-                case 70:
-                    return name.text;
-                case 9:
-                case 8:
-                    return name.text;
-                case 141:
-                    if (ts.isStringOrNumericLiteral(name.expression.kind)) {
-                        return name.expression.text;
-                    }
-            }
-            return undefined;
-        }
         function isComputedNonLiteralName(name) {
-            return name.kind === 141 && !ts.isStringOrNumericLiteral(name.expression.kind);
+            return name.kind === 142 && !ts.isStringOrNumericLiteral(name.expression.kind);
+        }
+        function getRestType(source, properties, symbol) {
+            ts.Debug.assert(!!(source.flags & 32768), "Rest types only support object types right now.");
+            var members = ts.createMap();
+            var names = ts.createMap();
+            for (var _i = 0, properties_2 = properties; _i < properties_2.length; _i++) {
+                var name_18 = properties_2[_i];
+                names[ts.getTextOfPropertyName(name_18)] = true;
+            }
+            for (var _a = 0, _b = getPropertiesOfType(source); _a < _b.length; _a++) {
+                var prop = _b[_a];
+                var inNamesToRemove = prop.name in names;
+                var isPrivate = getDeclarationModifierFlagsFromSymbol(prop) & (8 | 16);
+                var isMethod = prop.flags & 8192;
+                var isSetOnlyAccessor = prop.flags & 65536 && !(prop.flags & 32768);
+                if (!inNamesToRemove && !isPrivate && !isMethod && !isSetOnlyAccessor) {
+                    members[prop.name] = prop;
+                }
+            }
+            var stringIndexInfo = getIndexInfoOfType(source, 0);
+            var numberIndexInfo = getIndexInfoOfType(source, 1);
+            return createAnonymousType(symbol, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
         }
         function getTypeForBindingElement(declaration) {
             var pattern = declaration.parent;
@@ -21748,26 +21719,45 @@ var ts;
                 return parentType;
             }
             var type;
-            if (pattern.kind === 168) {
-                var name_14 = declaration.propertyName || declaration.name;
-                if (isComputedNonLiteralName(name_14)) {
-                    return anyType;
+            if (pattern.kind === 172) {
+                if (declaration.dotDotDotToken) {
+                    if (!(parentType.flags & 32768)) {
+                        error(declaration, ts.Diagnostics.Rest_types_may_only_be_created_from_object_types);
+                        return unknownType;
+                    }
+                    var literalMembers = [];
+                    for (var _i = 0, _a = pattern.elements; _i < _a.length; _i++) {
+                        var element = _a[_i];
+                        if (element.kind !== 198 && !element.dotDotDotToken) {
+                            literalMembers.push(element.propertyName || element.name);
+                        }
+                    }
+                    type = getRestType(parentType, literalMembers, declaration.symbol);
                 }
-                if (declaration.initializer) {
-                    getContextualType(declaration.initializer);
-                }
-                var text = getTextOfPropertyName(name_14);
-                type = getTypeOfPropertyOfType(parentType, text) ||
-                    isNumericLiteralName(text) && getIndexTypeOfType(parentType, 1) ||
-                    getIndexTypeOfType(parentType, 0);
-                if (!type) {
-                    error(name_14, ts.Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(parentType), ts.declarationNameToString(name_14));
-                    return unknownType;
+                else {
+                    var name_19 = declaration.propertyName || declaration.name;
+                    if (isComputedNonLiteralName(name_19)) {
+                        return anyType;
+                    }
+                    if (declaration.initializer) {
+                        getContextualType(declaration.initializer);
+                    }
+                    var text = ts.getTextOfPropertyName(name_19);
+                    type = getTypeOfPropertyOfType(parentType, text) ||
+                        isNumericLiteralName(text) && getIndexTypeOfType(parentType, 1) ||
+                        getIndexTypeOfType(parentType, 0);
+                    if (!type) {
+                        error(name_19, ts.Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(parentType), ts.declarationNameToString(name_19));
+                        return unknownType;
+                    }
                 }
             }
             else {
                 var elementType = checkIteratedTypeOrElementType(parentType, pattern, false);
-                if (!declaration.dotDotDotToken) {
+                if (declaration.dotDotDotToken) {
+                    type = createArrayType(elementType);
+                }
+                else {
                     var propName = "" + ts.indexOf(pattern.elements, declaration);
                     type = isTupleLikeType(parentType)
                         ? getTypeOfPropertyOfType(parentType, propName)
@@ -21782,9 +21772,6 @@ var ts;
                         return unknownType;
                     }
                 }
-                else {
-                    type = createArrayType(elementType);
-                }
             }
             if (strictNullChecks && declaration.initializer && !(getFalsyFlags(checkExpressionCached(declaration.initializer)) & 2048)) {
                 type = getTypeWithFacts(type, 131072);
@@ -21804,15 +21791,15 @@ var ts;
             if (typeTag && typeTag.typeExpression) {
                 return typeTag.typeExpression.type;
             }
-            if (declaration.kind === 219 &&
-                declaration.parent.kind === 220 &&
-                declaration.parent.parent.kind === 201) {
+            if (declaration.kind === 223 &&
+                declaration.parent.kind === 224 &&
+                declaration.parent.parent.kind === 205) {
                 var annotation = ts.getJSDocTypeTag(declaration.parent.parent);
                 if (annotation && annotation.typeExpression) {
                     return annotation.typeExpression.type;
                 }
             }
-            else if (declaration.kind === 143) {
+            else if (declaration.kind === 144) {
                 var paramTag = ts.getCorrespondingJSDocParameterTag(declaration);
                 if (paramTag && paramTag.typeExpression) {
                     return paramTag.typeExpression.type;
@@ -21826,22 +21813,22 @@ var ts;
         }
         function isEmptyArrayLiteral(node) {
             var expr = ts.skipParentheses(node);
-            return expr.kind === 171 && expr.elements.length === 0;
+            return expr.kind === 175 && expr.elements.length === 0;
         }
         function addOptionality(type, optional) {
             return strictNullChecks && optional ? includeFalsyTypes(type, 2048) : type;
         }
         function getTypeForVariableLikeDeclaration(declaration, includeOptionality) {
-            if (declaration.flags & 1048576) {
+            if (declaration.flags & 2097152) {
                 var type = getTypeForVariableLikeDeclarationFromJSDocComment(declaration);
                 if (type && type !== unknownType) {
                     return type;
                 }
             }
-            if (declaration.parent.parent.kind === 208) {
+            if (declaration.parent.parent.kind === 212) {
                 return stringType;
             }
-            if (declaration.parent.parent.kind === 209) {
+            if (declaration.parent.parent.kind === 213) {
                 return checkRightHandSideOfForOf(declaration.parent.parent.expression) || anyType;
             }
             if (ts.isBindingPattern(declaration.parent)) {
@@ -21850,7 +21837,7 @@ var ts;
             if (declaration.type) {
                 return addOptionality(getTypeFromTypeNode(declaration.type), declaration.questionToken && includeOptionality);
             }
-            if (declaration.kind === 219 && !ts.isBindingPattern(declaration.name) &&
+            if (declaration.kind === 223 && !ts.isBindingPattern(declaration.name) &&
                 !(ts.getCombinedModifierFlags(declaration) & 1) && !ts.isInAmbientContext(declaration)) {
                 if (!(ts.getCombinedNodeFlags(declaration) & 2) && (!declaration.initializer || isNullOrUndefined(declaration.initializer))) {
                     return autoType;
@@ -21859,10 +21846,10 @@ var ts;
                     return autoArrayType;
                 }
             }
-            if (declaration.kind === 143) {
+            if (declaration.kind === 144) {
                 var func = declaration.parent;
-                if (func.kind === 151 && !ts.hasDynamicName(func)) {
-                    var getter = ts.getDeclarationOfKind(declaration.parent.symbol, 150);
+                if (func.kind === 152 && !ts.hasDynamicName(func)) {
+                    var getter = ts.getDeclarationOfKind(declaration.parent.symbol, 151);
                     if (getter) {
                         var getterSignature = getSignatureFromDeclaration(getter);
                         var thisParameter = getAccessorThisParameter(func);
@@ -21888,7 +21875,7 @@ var ts;
                 var type = checkDeclarationInitializer(declaration);
                 return addOptionality(type, declaration.questionToken && includeOptionality);
             }
-            if (declaration.kind === 254) {
+            if (declaration.kind === 258) {
                 return checkIdentifier(declaration.name);
             }
             if (ts.isBindingPattern(declaration.name)) {
@@ -21913,11 +21900,11 @@ var ts;
             var hasComputedProperties = false;
             ts.forEach(pattern.elements, function (e) {
                 var name = e.propertyName || e.name;
-                if (isComputedNonLiteralName(name)) {
+                if (isComputedNonLiteralName(name) || e.dotDotDotToken) {
                     hasComputedProperties = true;
                     return;
                 }
-                var text = getTextOfPropertyName(name);
+                var text = ts.getTextOfPropertyName(name);
                 var flags = 4 | 67108864 | (e.initializer ? 536870912 : 0);
                 var symbol = createSymbol(flags, text);
                 symbol.type = getTypeFromBindingElement(e, includePatternInType, reportErrors);
@@ -21929,7 +21916,7 @@ var ts;
                 result.pattern = pattern;
             }
             if (hasComputedProperties) {
-                result.isObjectLiteralPatternWithComputedProperties = true;
+                result.objectFlags |= 512;
             }
             return result;
         }
@@ -21948,7 +21935,7 @@ var ts;
             return result;
         }
         function getTypeFromBindingPattern(pattern, includePatternInType, reportErrors) {
-            return pattern.kind === 168
+            return pattern.kind === 172
                 ? getTypeFromObjectBindingPattern(pattern, includePatternInType, reportErrors)
                 : getTypeFromArrayBindingPattern(pattern, includePatternInType, reportErrors);
         }
@@ -21958,7 +21945,7 @@ var ts;
                 if (reportErrors) {
                     reportErrorsFromWidening(declaration, type);
                 }
-                if (declaration.kind === 253) {
+                if (declaration.kind === 257) {
                     return type;
                 }
                 return getWidenedType(type);
@@ -21973,7 +21960,7 @@ var ts;
         }
         function declarationBelongsToPrivateAmbientMember(declaration) {
             var root = ts.getRootDeclaration(declaration);
-            var memberDeclaration = root.kind === 143 ? root.parent : root;
+            var memberDeclaration = root.kind === 144 ? root.parent : root;
             return isPrivateWithinAmbient(memberDeclaration);
         }
         function getTypeOfVariableOrParameterOrProperty(symbol) {
@@ -21983,28 +21970,28 @@ var ts;
                     return links.type = getTypeOfPrototypeProperty(symbol);
                 }
                 var declaration = symbol.valueDeclaration;
-                if (declaration.parent.kind === 252) {
+                if (ts.isCatchClauseVariableDeclarationOrBindingElement(declaration)) {
                     return links.type = anyType;
                 }
-                if (declaration.kind === 236) {
+                if (declaration.kind === 240) {
                     return links.type = checkExpression(declaration.expression);
                 }
-                if (declaration.flags & 1048576 && declaration.kind === 280 && declaration.typeExpression) {
+                if (declaration.flags & 2097152 && declaration.kind === 285 && declaration.typeExpression) {
                     return links.type = getTypeFromTypeNode(declaration.typeExpression.type);
                 }
                 if (!pushTypeResolution(symbol, 0)) {
                     return unknownType;
                 }
                 var type = void 0;
-                if (declaration.kind === 188 ||
-                    declaration.kind === 173 && declaration.parent.kind === 188) {
-                    if (declaration.flags & 1048576) {
+                if (declaration.kind === 192 ||
+                    declaration.kind === 177 && declaration.parent.kind === 192) {
+                    if (declaration.flags & 2097152) {
                         var typeTag = ts.getJSDocTypeTag(declaration.parent);
                         if (typeTag && typeTag.typeExpression) {
                             return links.type = getTypeFromTypeNode(typeTag.typeExpression.type);
                         }
                     }
-                    var declaredTypes = ts.map(symbol.declarations, function (decl) { return decl.kind === 188 ?
+                    var declaredTypes = ts.map(symbol.declarations, function (decl) { return decl.kind === 192 ?
                         checkExpressionCached(decl.right) :
                         checkExpressionCached(decl.parent.right); });
                     type = getUnionType(declaredTypes, true);
@@ -22030,7 +22017,7 @@ var ts;
         }
         function getAnnotatedAccessorType(accessor) {
             if (accessor) {
-                if (accessor.kind === 150) {
+                if (accessor.kind === 151) {
                     return accessor.type && getTypeFromTypeNode(accessor.type);
                 }
                 else {
@@ -22050,9 +22037,9 @@ var ts;
         function getTypeOfAccessors(symbol) {
             var links = getSymbolLinks(symbol);
             if (!links.type) {
-                var getter = ts.getDeclarationOfKind(symbol, 150);
-                var setter = ts.getDeclarationOfKind(symbol, 151);
-                if (getter && getter.flags & 1048576) {
+                var getter = ts.getDeclarationOfKind(symbol, 151);
+                var setter = ts.getDeclarationOfKind(symbol, 152);
+                if (getter && getter.flags & 2097152) {
                     var jsDocType = getTypeForVariableLikeDeclarationFromJSDocComment(getter);
                     if (jsDocType) {
                         return links.type = jsDocType;
@@ -22092,7 +22079,7 @@ var ts;
                 if (!popTypeResolution()) {
                     type = anyType;
                     if (compilerOptions.noImplicitAny) {
-                        var getter_1 = ts.getDeclarationOfKind(symbol, 150);
+                        var getter_1 = ts.getDeclarationOfKind(symbol, 151);
                         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));
                     }
                 }
@@ -22103,11 +22090,11 @@ var ts;
         function getTypeOfFuncClassEnumModule(symbol) {
             var links = getSymbolLinks(symbol);
             if (!links.type) {
-                if (symbol.valueDeclaration.kind === 226 && ts.isShorthandAmbientModuleSymbol(symbol)) {
+                if (symbol.flags & 1536 && ts.isShorthandAmbientModuleSymbol(symbol)) {
                     links.type = anyType;
                 }
                 else {
-                    var type = createObjectType(2097152, symbol);
+                    var type = createObjectType(16, symbol);
                     links.type = strictNullChecks && symbol.flags & 536870912 ?
                         includeFalsyTypes(type, 2048) : type;
                 }
@@ -22160,7 +22147,7 @@ var ts;
             return unknownType;
         }
         function getTargetType(type) {
-            return type.flags & 131072 ? type.target : type;
+            return getObjectFlags(type) & 4 ? type.target : type;
         }
         function hasBaseType(type, checkBase) {
             return check(type);
@@ -22188,9 +22175,9 @@ var ts;
                 if (!node) {
                     return typeParameters;
                 }
-                if (node.kind === 222 || node.kind === 193 ||
-                    node.kind === 221 || node.kind === 180 ||
-                    node.kind === 148 || node.kind === 181) {
+                if (node.kind === 226 || node.kind === 197 ||
+                    node.kind === 225 || node.kind === 184 ||
+                    node.kind === 149 || node.kind === 185) {
                     var declarations = node.typeParameters;
                     if (declarations) {
                         return appendTypeParameters(appendOuterTypeParameters(typeParameters, node), declarations);
@@ -22199,15 +22186,15 @@ var ts;
             }
         }
         function getOuterTypeParametersOfClassOrInterface(symbol) {
-            var declaration = symbol.flags & 32 ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 223);
+            var declaration = symbol.flags & 32 ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 227);
             return appendOuterTypeParameters(undefined, declaration);
         }
         function getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol) {
             var result;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var node = _a[_i];
-                if (node.kind === 223 || node.kind === 222 ||
-                    node.kind === 193 || node.kind === 224) {
+                if (node.kind === 227 || node.kind === 226 ||
+                    node.kind === 197 || node.kind === 228) {
                     var declaration = node;
                     if (declaration.typeParameters) {
                         result = appendTypeParameters(result, declaration.typeParameters);
@@ -22220,7 +22207,7 @@ var ts;
             return ts.concatenate(getOuterTypeParametersOfClassOrInterface(symbol), getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol));
         }
         function isConstructorType(type) {
-            return type.flags & 2588672 && getSignaturesOfType(type, 1).length > 0;
+            return type.flags & 32768 && getSignaturesOfType(type, 1).length > 0;
         }
         function getBaseTypeNodeOfClass(type) {
             return ts.getClassExtendsHeritageClauseElement(type.symbol.valueDeclaration);
@@ -22232,7 +22219,7 @@ var ts;
         function getInstantiatedConstructorsForTypeArguments(type, typeArgumentNodes) {
             var signatures = getConstructorsForTypeArguments(type, typeArgumentNodes);
             if (typeArgumentNodes) {
-                var typeArguments_1 = ts.map(typeArgumentNodes, getTypeFromTypeNodeNoAlias);
+                var typeArguments_1 = ts.map(typeArgumentNodes, getTypeFromTypeNode);
                 signatures = ts.map(signatures, function (sig) { return getSignatureInstantiation(sig, typeArguments_1); });
             }
             return signatures;
@@ -22247,7 +22234,7 @@ var ts;
                     return unknownType;
                 }
                 var baseConstructorType = checkExpression(baseTypeNode.expression);
-                if (baseConstructorType.flags & 2588672) {
+                if (baseConstructorType.flags & 32768) {
                     resolveStructuredTypeMembers(baseConstructorType);
                 }
                 if (!popTypeResolution()) {
@@ -22264,7 +22251,7 @@ var ts;
         }
         function getBaseTypes(type) {
             if (!type.resolvedBaseTypes) {
-                if (type.flags & 262144) {
+                if (type.objectFlags & 8) {
                     type.resolvedBaseTypes = [createArrayType(getUnionType(type.typeParameters))];
                 }
                 else if (type.symbol.flags & (32 | 64)) {
@@ -22284,7 +22271,7 @@ var ts;
         function resolveBaseTypesOfClass(type) {
             type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray;
             var baseConstructorType = getBaseConstructorTypeOfClass(type);
-            if (!(baseConstructorType.flags & 2588672)) {
+            if (!(baseConstructorType.flags & 32768)) {
                 return;
             }
             var baseTypeNode = getBaseTypeNodeOfClass(type);
@@ -22305,7 +22292,7 @@ var ts;
             if (baseType === unknownType) {
                 return;
             }
-            if (!(getTargetType(baseType).flags & (32768 | 65536))) {
+            if (!(getObjectFlags(getTargetType(baseType)) & 3)) {
                 error(baseTypeNode.expression, ts.Diagnostics.Base_constructor_return_type_0_is_not_a_class_or_interface_type, typeToString(baseType));
                 return;
             }
@@ -22333,12 +22320,12 @@ var ts;
             type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray;
             for (var _i = 0, _a = type.symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 223 && ts.getInterfaceBaseTypeNodes(declaration)) {
+                if (declaration.kind === 227 && ts.getInterfaceBaseTypeNodes(declaration)) {
                     for (var _b = 0, _c = ts.getInterfaceBaseTypeNodes(declaration); _b < _c.length; _b++) {
                         var node = _c[_b];
                         var baseType = getTypeFromTypeNode(node);
                         if (baseType !== unknownType) {
-                            if (getTargetType(baseType).flags & (32768 | 65536)) {
+                            if (getObjectFlags(getTargetType(baseType)) & 3) {
                                 if (type !== baseType && !hasBaseType(baseType, type)) {
                                     if (type.resolvedBaseTypes === emptyArray) {
                                         type.resolvedBaseTypes = [baseType];
@@ -22362,7 +22349,7 @@ var ts;
         function isIndependentInterface(symbol) {
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 223) {
+                if (declaration.kind === 227) {
                     if (declaration.flags & 64) {
                         return false;
                     }
@@ -22385,12 +22372,12 @@ var ts;
         function getDeclaredTypeOfClassOrInterface(symbol) {
             var links = getSymbolLinks(symbol);
             if (!links.declaredType) {
-                var kind = symbol.flags & 32 ? 32768 : 65536;
+                var kind = symbol.flags & 32 ? 1 : 2;
                 var type = links.declaredType = createObjectType(kind, symbol);
                 var outerTypeParameters = getOuterTypeParametersOfClassOrInterface(symbol);
                 var localTypeParameters = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol);
-                if (outerTypeParameters || localTypeParameters || kind === 32768 || !isIndependentInterface(symbol)) {
-                    type.flags |= 131072;
+                if (outerTypeParameters || localTypeParameters || kind === 1 || !isIndependentInterface(symbol)) {
+                    type.objectFlags |= 4;
                     type.typeParameters = ts.concatenate(outerTypeParameters, localTypeParameters);
                     type.outerTypeParameters = outerTypeParameters;
                     type.localTypeParameters = localTypeParameters;
@@ -22412,8 +22399,7 @@ var ts;
                 if (!pushTypeResolution(symbol, 2)) {
                     return unknownType;
                 }
-                var typeParameters = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol);
-                var declaration = ts.getDeclarationOfKind(symbol, 279);
+                var declaration = ts.getDeclarationOfKind(symbol, 284);
                 var type = void 0;
                 if (declaration) {
                     if (declaration.jsDocTypeLiteral) {
@@ -22424,14 +22410,15 @@ var ts;
                     }
                 }
                 else {
-                    declaration = ts.getDeclarationOfKind(symbol, 224);
-                    type = getTypeFromTypeNode(declaration.type, symbol, typeParameters);
+                    declaration = ts.getDeclarationOfKind(symbol, 228);
+                    type = getTypeFromTypeNode(declaration.type);
                 }
                 if (popTypeResolution()) {
-                    links.typeParameters = typeParameters;
+                    var typeParameters = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol);
                     if (typeParameters) {
+                        links.typeParameters = typeParameters;
                         links.instantiations = ts.createMap();
-                        links.instantiations[getTypeListId(links.typeParameters)] = type;
+                        links.instantiations[getTypeListId(typeParameters)] = type;
                     }
                 }
                 else {
@@ -22448,14 +22435,14 @@ var ts;
                 return !ts.isInAmbientContext(member);
             }
             return expr.kind === 8 ||
-                expr.kind === 186 && expr.operator === 37 &&
+                expr.kind === 190 && expr.operator === 37 &&
                     expr.operand.kind === 8 ||
                 expr.kind === 70 && !!symbol.exports[expr.text];
         }
         function enumHasLiteralMembers(symbol) {
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 225) {
+                if (declaration.kind === 229) {
                     for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) {
                         var member = _c[_b];
                         if (!isLiteralEnumMember(symbol, member)) {
@@ -22483,7 +22470,7 @@ var ts;
                     var memberTypes = ts.createMap();
                     for (var _i = 0, _a = enumType.symbol.declarations; _i < _a.length; _i++) {
                         var declaration = _a[_i];
-                        if (declaration.kind === 225) {
+                        if (declaration.kind === 229) {
                             computeEnumMemberValues(declaration);
                             for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) {
                                 var member = _c[_b];
@@ -22498,7 +22485,7 @@ var ts;
                     }
                     enumType.memberTypes = memberTypes;
                     if (memberTypeList.length > 1) {
-                        enumType.flags |= 524288;
+                        enumType.flags |= 65536;
                         enumType.types = memberTypeList;
                         unionTypes[getTypeListId(memberTypeList)] = enumType;
                     }
@@ -22510,7 +22497,7 @@ var ts;
             var links = getSymbolLinks(symbol);
             if (!links.declaredType) {
                 var enumType = getDeclaredTypeOfEnum(getParentOfSymbol(symbol));
-                links.declaredType = enumType.flags & 524288 ?
+                links.declaredType = enumType.flags & 65536 ?
                     enumType.memberTypes[getEnumMemberValue(symbol.valueDeclaration)] :
                     enumType;
             }
@@ -22521,7 +22508,7 @@ var ts;
             if (!links.declaredType) {
                 var type = createType(16384);
                 type.symbol = symbol;
-                if (!ts.getDeclarationOfKind(symbol, 142).constraint) {
+                if (!ts.getDeclarationOfKind(symbol, 143).constraint) {
                     type.constraint = noConstraintType;
                 }
                 links.declaredType = type;
@@ -22571,19 +22558,19 @@ var ts;
         function isIndependentType(node) {
             switch (node.kind) {
                 case 118:
-                case 133:
-                case 131:
-                case 121:
                 case 134:
+                case 132:
+                case 121:
+                case 135:
                 case 104:
-                case 136:
+                case 137:
                 case 94:
-                case 128:
-                case 167:
+                case 129:
+                case 171:
                     return true;
-                case 161:
+                case 162:
                     return isIndependentType(node.elementType);
-                case 156:
+                case 157:
                     return isIndependentTypeReference(node);
             }
             return false;
@@ -22592,7 +22579,7 @@ var ts;
             return node.type && isIndependentType(node.type) || !node.type && !node.initializer;
         }
         function isIndependentFunctionLikeDeclaration(node) {
-            if (node.kind !== 149 && (!node.type || !isIndependentType(node.type))) {
+            if (node.kind !== 150 && (!node.type || !isIndependentType(node.type))) {
                 return false;
             }
             for (var _i = 0, _a = node.parameters; _i < _a.length; _i++) {
@@ -22608,12 +22595,12 @@ var ts;
                 var declaration = symbol.declarations[0];
                 if (declaration) {
                     switch (declaration.kind) {
-                        case 146:
-                        case 145:
-                            return isIndependentVariableLikeDeclaration(declaration);
-                        case 148:
                         case 147:
+                        case 146:
+                            return isIndependentVariableLikeDeclaration(declaration);
                         case 149:
+                        case 148:
+                        case 150:
                             return isIndependentFunctionLikeDeclaration(declaration);
                     }
                 }
@@ -22656,7 +22643,7 @@ var ts;
             return type;
         }
         function getTypeWithThisArgument(type, thisArgument) {
-            if (type.flags & 131072) {
+            if (getObjectFlags(type) & 4) {
                 return createTypeReference(type.target, ts.concatenate(type.typeArguments, [thisArgument || type.target.thisType]));
             }
             return type;
@@ -22679,8 +22666,8 @@ var ts;
             else {
                 mapper = createTypeMapper(typeParameters, typeArguments);
                 members = createInstantiatedSymbolTable(source.declaredProperties, mapper, typeParameters.length === 1);
-                callSignatures = instantiateList(source.declaredCallSignatures, mapper, instantiateSignature);
-                constructSignatures = instantiateList(source.declaredConstructSignatures, mapper, instantiateSignature);
+                callSignatures = instantiateSignatures(source.declaredCallSignatures, mapper);
+                constructSignatures = instantiateSignatures(source.declaredConstructSignatures, mapper);
                 stringIndexInfo = instantiateIndexInfo(source.declaredStringIndexInfo, mapper);
                 numberIndexInfo = instantiateIndexInfo(source.declaredNumberIndexInfo, mapper);
             }
@@ -22700,7 +22687,7 @@ var ts;
                     numberIndexInfo = numberIndexInfo || getIndexInfoOfType(instantiatedBaseType, 1);
                 }
             }
-            setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+            setStructuredTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function resolveClassOrInterfaceMembers(type) {
             resolveObjectTypeMembers(type, resolveDeclaredMembers(type), emptyArray, emptyArray);
@@ -22735,14 +22722,14 @@ var ts;
                 return [createSignature(undefined, classType.localTypeParameters, undefined, emptyArray, classType, undefined, 0, false, false)];
             }
             var baseTypeNode = getBaseTypeNodeOfClass(classType);
-            var typeArguments = ts.map(baseTypeNode.typeArguments, getTypeFromTypeNodeNoAlias);
+            var typeArguments = ts.map(baseTypeNode.typeArguments, getTypeFromTypeNode);
             var typeArgCount = typeArguments ? typeArguments.length : 0;
             var result = [];
             for (var _i = 0, baseSignatures_1 = baseSignatures; _i < baseSignatures_1.length; _i++) {
                 var baseSig = baseSignatures_1[_i];
                 var typeParamCount = baseSig.typeParameters ? baseSig.typeParameters.length : 0;
                 if (typeParamCount === typeArgCount) {
-                    var sig = typeParamCount ? getSignatureInstantiation(baseSig, typeArguments) : cloneSignature(baseSig);
+                    var sig = typeParamCount ? createSignatureInstantiation(baseSig, typeArguments) : cloneSignature(baseSig);
                     sig.typeParameters = classType.localTypeParameters;
                     sig.resolvedReturnType = classType;
                     result.push(sig);
@@ -22827,7 +22814,7 @@ var ts;
             var constructSignatures = getUnionSignatures(type.types, 1);
             var stringIndexInfo = getUnionIndexInfo(type.types, 0);
             var numberIndexInfo = getUnionIndexInfo(type.types, 1);
-            setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+            setStructuredTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function intersectTypes(type1, type2) {
             return !type1 ? type2 : !type2 ? type1 : getIntersectionType([type1, type2]);
@@ -22835,6 +22822,9 @@ var ts;
         function intersectIndexInfos(info1, info2) {
             return !info1 ? info2 : !info2 ? info1 : createIndexInfo(getIntersectionType([info1.type, info2.type]), info1.isReadonly && info2.isReadonly);
         }
+        function unionSpreadIndexInfos(info1, info2) {
+            return info1 && info2 && createIndexInfo(getUnionType([info1.type, info2.type]), info1.isReadonly || info2.isReadonly);
+        }
         function resolveIntersectionTypeMembers(type) {
             var callSignatures = emptyArray;
             var constructSignatures = emptyArray;
@@ -22847,17 +22837,17 @@ var ts;
                 stringIndexInfo = intersectIndexInfos(stringIndexInfo, getIndexInfoOfType(t, 0));
                 numberIndexInfo = intersectIndexInfos(numberIndexInfo, getIndexInfoOfType(t, 1));
             }
-            setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+            setStructuredTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function resolveAnonymousTypeMembers(type) {
             var symbol = type.symbol;
             if (type.target) {
                 var members = createInstantiatedSymbolTable(getPropertiesOfObjectType(type.target), type.mapper, false);
-                var callSignatures = instantiateList(getSignaturesOfType(type.target, 0), type.mapper, instantiateSignature);
-                var constructSignatures = instantiateList(getSignaturesOfType(type.target, 1), type.mapper, instantiateSignature);
+                var callSignatures = instantiateSignatures(getSignaturesOfType(type.target, 0), type.mapper);
+                var constructSignatures = instantiateSignatures(getSignaturesOfType(type.target, 1), type.mapper);
                 var stringIndexInfo = instantiateIndexInfo(getIndexInfoOfType(type.target, 0), type.mapper);
                 var numberIndexInfo = instantiateIndexInfo(getIndexInfoOfType(type.target, 1), type.mapper);
-                setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+                setStructuredTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
             }
             else if (symbol.flags & 2048) {
                 var members = symbol.members;
@@ -22865,7 +22855,7 @@ var ts;
                 var constructSignatures = getSignaturesOfSymbol(members["__new"]);
                 var stringIndexInfo = getIndexInfoOfSymbol(symbol, 0);
                 var numberIndexInfo = getIndexInfoOfSymbol(symbol, 1);
-                setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+                setStructuredTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
             }
             else {
                 var members = emptySymbols;
@@ -22880,46 +22870,106 @@ var ts;
                         constructSignatures = getDefaultConstructSignatures(classType);
                     }
                     var baseConstructorType = getBaseConstructorTypeOfClass(classType);
-                    if (baseConstructorType.flags & 2588672) {
+                    if (baseConstructorType.flags & 32768) {
                         members = createSymbolTable(getNamedMembers(members));
                         addInheritedMembers(members, getPropertiesOfObjectType(baseConstructorType));
                     }
                 }
                 var numberIndexInfo = symbol.flags & 384 ? enumNumberIndexInfo : undefined;
-                setObjectTypeMembers(type, members, emptyArray, constructSignatures, undefined, numberIndexInfo);
+                setStructuredTypeMembers(type, members, emptyArray, constructSignatures, undefined, numberIndexInfo);
                 if (symbol.flags & (16 | 8192)) {
                     type.callSignatures = getSignaturesOfSymbol(symbol);
                 }
             }
         }
+        function resolveMappedTypeMembers(type) {
+            var members = ts.createMap();
+            var stringIndexInfo;
+            var numberIndexInfo;
+            var typeParameter = getTypeParameterFromMappedType(type);
+            var constraintType = getConstraintTypeFromMappedType(type);
+            var templateType = getTemplateTypeFromMappedType(type);
+            var isReadonly = !!type.declaration.readonlyToken;
+            var isOptional = !!type.declaration.questionToken;
+            var keyType = constraintType.flags & 16384 ? getApparentType(constraintType) : constraintType;
+            var iterationType = keyType.flags & 262144 ? getIndexType(getApparentType(keyType.type)) : keyType;
+            forEachType(iterationType, function (t) {
+                var iterationMapper = createUnaryTypeMapper(typeParameter, t);
+                var templateMapper = type.mapper ? combineTypeMappers(type.mapper, iterationMapper) : iterationMapper;
+                var propType = instantiateType(templateType, templateMapper);
+                if (t.flags & (32 | 64 | 256)) {
+                    var propName = t.text;
+                    var prop = createSymbol(4 | 67108864 | (isOptional ? 536870912 : 0), propName);
+                    prop.type = addOptionality(propType, isOptional);
+                    prop.isReadonly = isReadonly;
+                    members[propName] = prop;
+                }
+                else if (t.flags & 2) {
+                    stringIndexInfo = createIndexInfo(propType, isReadonly);
+                }
+                else if (t.flags & 4) {
+                    numberIndexInfo = createIndexInfo(propType, isReadonly);
+                }
+            });
+            if (stringIndexInfo && numberIndexInfo && isTypeIdenticalTo(stringIndexInfo.type, numberIndexInfo.type)) {
+                numberIndexInfo = undefined;
+            }
+            setStructuredTypeMembers(type, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
+        }
+        function getTypeParameterFromMappedType(type) {
+            return type.typeParameter ||
+                (type.typeParameter = getDeclaredTypeOfTypeParameter(getSymbolOfNode(type.declaration.typeParameter)));
+        }
+        function getConstraintTypeFromMappedType(type) {
+            return type.constraintType ||
+                (type.constraintType = instantiateType(getConstraintOfTypeParameter(getTypeParameterFromMappedType(type)), type.mapper || identityMapper) || unknownType);
+        }
+        function getTemplateTypeFromMappedType(type) {
+            return type.templateType ||
+                (type.templateType = type.declaration.type ?
+                    instantiateType(getTypeFromTypeNode(type.declaration.type), type.mapper || identityMapper) :
+                    unknownType);
+        }
+        function isGenericMappedType(type) {
+            if (getObjectFlags(type) & 32) {
+                var constraintType = getConstraintTypeFromMappedType(type);
+                return !!(constraintType.flags & (16384 | 262144));
+            }
+            return false;
+        }
         function resolveStructuredTypeMembers(type) {
             if (!type.members) {
-                if (type.flags & 131072) {
-                    resolveTypeReferenceMembers(type);
+                if (type.flags & 32768) {
+                    if (type.objectFlags & 4) {
+                        resolveTypeReferenceMembers(type);
+                    }
+                    else if (type.objectFlags & 3) {
+                        resolveClassOrInterfaceMembers(type);
+                    }
+                    else if (type.objectFlags & 16) {
+                        resolveAnonymousTypeMembers(type);
+                    }
+                    else if (type.objectFlags & 32) {
+                        resolveMappedTypeMembers(type);
+                    }
                 }
-                else if (type.flags & (32768 | 65536)) {
-                    resolveClassOrInterfaceMembers(type);
-                }
-                else if (type.flags & 2097152) {
-                    resolveAnonymousTypeMembers(type);
-                }
-                else if (type.flags & 524288) {
+                else if (type.flags & 65536) {
                     resolveUnionTypeMembers(type);
                 }
-                else if (type.flags & 1048576) {
+                else if (type.flags & 131072) {
                     resolveIntersectionTypeMembers(type);
                 }
             }
             return type;
         }
         function getPropertiesOfObjectType(type) {
-            if (type.flags & 2588672) {
+            if (type.flags & 32768) {
                 return resolveStructuredTypeMembers(type).properties;
             }
             return emptyArray;
         }
         function getPropertyOfObjectType(type, name) {
-            if (type.flags & 2588672) {
+            if (type.flags & 32768) {
                 var resolved = resolveStructuredTypeMembers(type);
                 var symbol = resolved.members[name];
                 if (symbol && symbolIsValue(symbol)) {
@@ -22934,7 +22984,7 @@ var ts;
                     var prop = _c[_b];
                     getUnionOrIntersectionProperty(type, prop.name);
                 }
-                if (type.flags & 524288) {
+                if (type.flags & 65536) {
                     break;
                 }
             }
@@ -22953,7 +23003,9 @@ var ts;
         }
         function getPropertiesOfType(type) {
             type = getApparentType(type);
-            return type.flags & 1572864 ? getPropertiesOfUnionOrIntersectionType(type) : getPropertiesOfObjectType(type);
+            return type.flags & 196608 ?
+                getPropertiesOfUnionOrIntersectionType(type) :
+                getPropertiesOfObjectType(type);
         }
         function getApparentTypeOfTypeParameter(type) {
             if (!type.resolvedApparentType) {
@@ -22966,27 +23018,18 @@ var ts;
             return type.resolvedApparentType;
         }
         function getApparentType(type) {
-            if (type.flags & 16384) {
-                type = getApparentTypeOfTypeParameter(type);
-            }
-            if (type.flags & 34) {
-                type = globalStringType;
-            }
-            else if (type.flags & 340) {
-                type = globalNumberType;
-            }
-            else if (type.flags & 136) {
-                type = globalBooleanType;
-            }
-            else if (type.flags & 512) {
-                type = getGlobalESSymbolType();
-            }
-            return type;
+            var t = type.flags & 16384 ? getApparentTypeOfTypeParameter(type) : type;
+            return t.flags & 34 ? globalStringType :
+                t.flags & 340 ? globalNumberType :
+                    t.flags & 136 ? globalBooleanType :
+                        t.flags & 512 ? getGlobalESSymbolType() :
+                            t.flags & 262144 ? stringOrNumberType :
+                                t;
         }
         function createUnionOrIntersectionProperty(containingType, name) {
             var types = containingType.types;
             var props;
-            var commonFlags = (containingType.flags & 1048576) ? 536870912 : 0;
+            var commonFlags = (containingType.flags & 131072) ? 536870912 : 0;
             var isReadonly = false;
             var isPartial = false;
             for (var _i = 0, types_2 = types; _i < types_2.length; _i++) {
@@ -23006,7 +23049,7 @@ var ts;
                             isReadonly = true;
                         }
                     }
-                    else if (containingType.flags & 524288) {
+                    else if (containingType.flags & 65536) {
                         isPartial = true;
                     }
                 }
@@ -23041,7 +23084,7 @@ var ts;
             result.isPartial = isPartial;
             result.declarations = declarations;
             result.isReadonly = isReadonly;
-            result.type = containingType.flags & 524288 ? getUnionType(propTypes) : getIntersectionType(propTypes);
+            result.type = containingType.flags & 65536 ? getUnionType(propTypes) : getIntersectionType(propTypes);
             return result;
         }
         function getUnionOrIntersectionProperty(type, name) {
@@ -23061,7 +23104,7 @@ var ts;
         }
         function getPropertyOfType(type, name) {
             type = getApparentType(type);
-            if (type.flags & 2588672) {
+            if (type.flags & 32768) {
                 var resolved = resolveStructuredTypeMembers(type);
                 var symbol = resolved.members[name];
                 if (symbol && symbolIsValue(symbol)) {
@@ -23075,13 +23118,13 @@ var ts;
                 }
                 return getPropertyOfObjectType(globalObjectType, name);
             }
-            if (type.flags & 1572864) {
+            if (type.flags & 196608) {
                 return getPropertyOfUnionOrIntersectionType(type, name);
             }
             return undefined;
         }
         function getSignaturesOfStructuredType(type, kind) {
-            if (type.flags & 4161536) {
+            if (type.flags & 229376) {
                 var resolved = resolveStructuredTypeMembers(type);
                 return kind === 0 ? resolved.callSignatures : resolved.constructSignatures;
             }
@@ -23091,7 +23134,7 @@ var ts;
             return getSignaturesOfStructuredType(getApparentType(type), kind);
         }
         function getIndexInfoOfStructuredType(type, kind) {
-            if (type.flags & 4161536) {
+            if (type.flags & 229376) {
                 var resolved = resolveStructuredTypeMembers(type);
                 return kind === 0 ? resolved.stringIndexInfo : resolved.numberIndexInfo;
             }
@@ -23122,7 +23165,7 @@ var ts;
             return undefined;
         }
         function getTypeParametersFromJSDocTemplate(declaration) {
-            if (declaration.flags & 1048576) {
+            if (declaration.flags & 2097152) {
                 var templateTag = ts.getJSDocTemplateTag(declaration);
                 if (templateTag) {
                     return getTypeParametersFromDeclaration(templateTag.typeParameters);
@@ -23150,8 +23193,8 @@ var ts;
             return result;
         }
         function isJSDocOptionalParameter(node) {
-            if (node.flags & 1048576) {
-                if (node.type && node.type.kind === 268) {
+            if (node.flags & 2097152) {
+                if (node.type && node.type.kind === 273) {
                     return true;
                 }
                 var paramTag = ts.getCorrespondingJSDocParameterTag(node);
@@ -23160,11 +23203,18 @@ var ts;
                         return true;
                     }
                     if (paramTag.typeExpression) {
-                        return paramTag.typeExpression.type.kind === 268;
+                        return paramTag.typeExpression.type.kind === 273;
                     }
                 }
             }
         }
+        function tryFindAmbientModule(moduleName, withAugmentations) {
+            if (ts.isExternalModuleNameRelative(moduleName)) {
+                return undefined;
+            }
+            var symbol = getSymbol(globals, "\"" + moduleName + "\"", 512);
+            return symbol && withAugmentations ? getMergedSymbol(symbol) : symbol;
+        }
         function isOptionalParameter(node) {
             if (ts.hasQuestionToken(node) || isJSDocOptionalParameter(node)) {
                 return true;
@@ -23218,7 +23268,7 @@ var ts;
                     else {
                         parameters.push(paramSymbol);
                     }
-                    if (param.type && param.type.kind === 167) {
+                    if (param.type && param.type.kind === 171) {
                         hasLiteralTypes = true;
                     }
                     if (param.initializer || param.questionToken || param.dotDotDotToken || isJSDocOptionalParameter(param)) {
@@ -23230,10 +23280,10 @@ var ts;
                         minArgumentCount = -1;
                     }
                 }
-                if ((declaration.kind === 150 || declaration.kind === 151) &&
+                if ((declaration.kind === 151 || declaration.kind === 152) &&
                     !ts.hasDynamicName(declaration) &&
                     (!hasThisParameter || !thisParameter)) {
-                    var otherKind = declaration.kind === 150 ? 151 : 150;
+                    var otherKind = declaration.kind === 151 ? 152 : 151;
                     var other = ts.getDeclarationOfKind(declaration.symbol, otherKind);
                     if (other) {
                         thisParameter = getAnnotatedAccessorThisParameter(other);
@@ -23245,14 +23295,14 @@ var ts;
                 if (isJSConstructSignature) {
                     minArgumentCount--;
                 }
-                var classType = declaration.kind === 149 ?
+                var classType = declaration.kind === 150 ?
                     getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol))
                     : undefined;
                 var typeParameters = classType ? classType.localTypeParameters :
                     declaration.typeParameters ? getTypeParametersFromDeclaration(declaration.typeParameters) :
                         getTypeParametersFromJSDocTemplate(declaration);
                 var returnType = getSignatureReturnTypeFromDeclaration(declaration, isJSConstructSignature, classType);
-                var typePredicate = declaration.type && declaration.type.kind === 155 ?
+                var typePredicate = declaration.type && declaration.type.kind === 156 ?
                     createTypePredicateFromTypePredicateNode(declaration.type) :
                     undefined;
                 links.resolvedSignature = createSignature(declaration, typeParameters, thisParameter, parameters, returnType, typePredicate, minArgumentCount, ts.hasRestParameter(declaration), hasLiteralTypes);
@@ -23269,14 +23319,14 @@ var ts;
             else if (declaration.type) {
                 return getTypeFromTypeNode(declaration.type);
             }
-            if (declaration.flags & 1048576) {
+            if (declaration.flags & 2097152) {
                 var type = getReturnTypeFromJSDocComment(declaration);
                 if (type && type !== unknownType) {
                     return type;
                 }
             }
-            if (declaration.kind === 150 && !ts.hasDynamicName(declaration)) {
-                var setter = ts.getDeclarationOfKind(declaration.symbol, 151);
+            if (declaration.kind === 151 && !ts.hasDynamicName(declaration)) {
+                var setter = ts.getDeclarationOfKind(declaration.symbol, 152);
                 return getAnnotatedAccessorType(setter);
             }
             if (ts.nodeIsMissing(declaration.body)) {
@@ -23290,20 +23340,20 @@ var ts;
             for (var i = 0, len = symbol.declarations.length; i < len; i++) {
                 var node = symbol.declarations[i];
                 switch (node.kind) {
-                    case 157:
                     case 158:
-                    case 221:
-                    case 148:
-                    case 147:
+                    case 159:
+                    case 225:
                     case 149:
-                    case 152:
+                    case 148:
+                    case 150:
                     case 153:
                     case 154:
-                    case 150:
+                    case 155:
                     case 151:
-                    case 180:
-                    case 181:
-                    case 269:
+                    case 152:
+                    case 184:
+                    case 185:
+                    case 274:
                         if (i > 0 && node.body) {
                             var previous = symbol.declarations[i - 1];
                             if (node.parent === previous.parent && node.kind === previous.kind && node.pos === previous.end) {
@@ -23364,13 +23414,18 @@ var ts;
         function getRestTypeOfSignature(signature) {
             if (signature.hasRestParameter) {
                 var type = getTypeOfSymbol(ts.lastOrUndefined(signature.parameters));
-                if (type.flags & 131072 && type.target === globalArrayType) {
+                if (getObjectFlags(type) & 4 && type.target === globalArrayType) {
                     return type.typeArguments[0];
                 }
             }
             return anyType;
         }
         function getSignatureInstantiation(signature, typeArguments) {
+            var instantiations = signature.instantiations || (signature.instantiations = ts.createMap());
+            var id = getTypeListId(typeArguments);
+            return instantiations[id] || (instantiations[id] = createSignatureInstantiation(signature, typeArguments));
+        }
+        function createSignatureInstantiation(signature, typeArguments) {
             return instantiateSignature(signature, createTypeMapper(signature.typeParameters, typeArguments), true);
         }
         function getErasedSignature(signature) {
@@ -23383,8 +23438,8 @@ var ts;
         }
         function getOrCreateTypeFromSignature(signature) {
             if (!signature.isolatedSignatureType) {
-                var isConstructor = signature.declaration.kind === 149 || signature.declaration.kind === 153;
-                var type = createObjectType(2097152);
+                var isConstructor = signature.declaration.kind === 150 || signature.declaration.kind === 154;
+                var type = createObjectType(16);
                 type.members = emptySymbols;
                 type.properties = emptyArray;
                 type.callSignatures = !isConstructor ? [signature] : emptyArray;
@@ -23397,7 +23452,7 @@ var ts;
             return symbol.members["__index"];
         }
         function getIndexDeclarationOfSymbol(symbol, kind) {
-            var syntaxKind = kind === 1 ? 131 : 133;
+            var syntaxKind = kind === 1 ? 132 : 134;
             var indexSymbol = getIndexSymbol(symbol);
             if (indexSymbol) {
                 for (var _i = 0, _a = indexSymbol.declarations; _i < _a.length; _i++) {
@@ -23424,7 +23479,7 @@ var ts;
             return undefined;
         }
         function getConstraintDeclaration(type) {
-            return ts.getDeclarationOfKind(type.symbol, 142).constraint;
+            return ts.getDeclarationOfKind(type.symbol, 143).constraint;
         }
         function hasConstraintReferenceTo(type, target) {
             var checked;
@@ -23457,7 +23512,7 @@ var ts;
             return typeParameter.constraint === noConstraintType ? undefined : typeParameter.constraint;
         }
         function getParentSymbolOfTypeParameter(typeParameter) {
-            return getSymbolOfNode(ts.getDeclarationOfKind(typeParameter.symbol, 142).parent);
+            return getSymbolOfNode(ts.getDeclarationOfKind(typeParameter.symbol, 143).parent);
         }
         function getTypeListId(types) {
             var result = "";
@@ -23490,22 +23545,23 @@ var ts;
                     result |= type.flags;
                 }
             }
-            return result & 234881024;
+            return result & 14680064;
         }
         function createTypeReference(target, typeArguments) {
             var id = getTypeListId(typeArguments);
             var type = target.instantiations[id];
             if (!type) {
-                var propagatedFlags = typeArguments ? getPropagatingFlagsOfTypes(typeArguments, 0) : 0;
-                var flags = 131072 | propagatedFlags;
-                type = target.instantiations[id] = createObjectType(flags, target.symbol);
+                type = target.instantiations[id] = createObjectType(4, target.symbol);
+                type.flags |= typeArguments ? getPropagatingFlagsOfTypes(typeArguments, 0) : 0;
                 type.target = target;
                 type.typeArguments = typeArguments;
             }
             return type;
         }
         function cloneTypeReference(source) {
-            var type = createObjectType(source.flags, source.symbol);
+            var type = createType(source.flags);
+            type.symbol = source.symbol;
+            type.objectFlags = source.objectFlags;
             type.target = source.target;
             type.typeArguments = source.typeArguments;
             return type;
@@ -23521,7 +23577,7 @@ var ts;
                     error(node, ts.Diagnostics.Generic_type_0_requires_1_type_argument_s, typeToString(type, undefined, 1), typeParameters.length);
                     return unknownType;
                 }
-                return createTypeReference(type, ts.concatenate(type.outerTypeParameters, ts.map(node.typeArguments, getTypeFromTypeNodeNoAlias)));
+                return createTypeReference(type, ts.concatenate(type.outerTypeParameters, ts.map(node.typeArguments, getTypeFromTypeNode)));
             }
             if (node.typeArguments) {
                 error(node, ts.Diagnostics.Type_0_is_not_generic, typeToString(type));
@@ -23529,18 +23585,23 @@ var ts;
             }
             return type;
         }
-        function getTypeFromTypeAliasReference(node, symbol) {
+        function getTypeAliasInstantiation(symbol, typeArguments) {
             var type = getDeclaredTypeOfSymbol(symbol);
             var links = getSymbolLinks(symbol);
             var typeParameters = links.typeParameters;
+            var id = getTypeListId(typeArguments);
+            return links.instantiations[id] || (links.instantiations[id] = instantiateTypeNoAlias(type, createTypeMapper(typeParameters, typeArguments)));
+        }
+        function getTypeFromTypeAliasReference(node, symbol) {
+            var type = getDeclaredTypeOfSymbol(symbol);
+            var typeParameters = getSymbolLinks(symbol).typeParameters;
             if (typeParameters) {
                 if (!node.typeArguments || node.typeArguments.length !== typeParameters.length) {
                     error(node, ts.Diagnostics.Generic_type_0_requires_1_type_argument_s, symbolToString(symbol), typeParameters.length);
                     return unknownType;
                 }
-                var typeArguments = ts.map(node.typeArguments, getTypeFromTypeNodeNoAlias);
-                var id = getTypeListId(typeArguments);
-                return links.instantiations[id] || (links.instantiations[id] = instantiateType(type, createTypeMapper(typeParameters, typeArguments)));
+                var typeArguments = ts.map(node.typeArguments, getTypeFromTypeNode);
+                return getTypeAliasInstantiation(symbol, typeArguments);
             }
             if (node.typeArguments) {
                 error(node, ts.Diagnostics.Type_0_is_not_generic, symbolToString(symbol));
@@ -23557,11 +23618,11 @@ var ts;
         }
         function getTypeReferenceName(node) {
             switch (node.kind) {
-                case 156:
+                case 157:
                     return node.typeName;
-                case 267:
+                case 272:
                     return node.name;
-                case 195:
+                case 199:
                     var expr = node.expression;
                     if (ts.isEntityNameExpression(expr)) {
                         return expr;
@@ -23585,7 +23646,7 @@ var ts;
             if (symbol.flags & 524288) {
                 return getTypeFromTypeAliasReference(node, symbol);
             }
-            if (symbol.flags & 107455 && node.kind === 267) {
+            if (symbol.flags & 107455 && node.kind === 272) {
                 return getTypeOfSymbol(symbol);
             }
             return getTypeFromNonGenericTypeReference(node, symbol);
@@ -23595,13 +23656,13 @@ var ts;
             if (!links.resolvedType) {
                 var symbol = void 0;
                 var type = void 0;
-                if (node.kind === 267) {
+                if (node.kind === 272) {
                     var typeReferenceName = getTypeReferenceName(node);
                     symbol = resolveTypeReferenceName(typeReferenceName);
                     type = getTypeReferenceType(node, symbol);
                 }
                 else {
-                    var typeNameOrExpression = node.kind === 156
+                    var typeNameOrExpression = node.kind === 157
                         ? node.typeName
                         : ts.isEntityNameExpression(node.expression)
                             ? node.expression
@@ -23630,9 +23691,9 @@ var ts;
                 for (var _i = 0, declarations_3 = declarations; _i < declarations_3.length; _i++) {
                     var declaration = declarations_3[_i];
                     switch (declaration.kind) {
-                        case 222:
-                        case 223:
-                        case 225:
+                        case 226:
+                        case 227:
+                        case 229:
                             return declaration;
                     }
                 }
@@ -23641,7 +23702,7 @@ var ts;
                 return arity ? emptyGenericType : emptyObjectType;
             }
             var type = getDeclaredTypeOfSymbol(symbol);
-            if (!(type.flags & 2588672)) {
+            if (!(type.flags & 32768)) {
                 error(getTypeDeclaration(symbol), ts.Diagnostics.Global_type_0_must_be_a_class_or_interface_type, symbol.name);
                 return arity ? emptyGenericType : emptyObjectType;
             }
@@ -23704,7 +23765,7 @@ var ts;
                 property.type = typeParameter;
                 properties.push(property);
             }
-            var type = createObjectType(262144 | 131072);
+            var type = createObjectType(8 | 4);
             type.typeParameters = typeParameters;
             type.outerTypeParameters = undefined;
             type.localTypeParameters = typeParameters;
@@ -23731,7 +23792,7 @@ var ts;
         function getTypeFromTupleTypeNode(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
-                links.resolvedType = createTupleType(ts.map(node.elementTypes, getTypeFromTypeNodeNoAlias));
+                links.resolvedType = createTupleType(ts.map(node.elementTypes, getTypeFromTypeNode));
             }
             return links.resolvedType;
         }
@@ -23759,7 +23820,7 @@ var ts;
         }
         function addTypeToUnion(typeSet, type) {
             var flags = type.flags;
-            if (flags & 524288) {
+            if (flags & 65536) {
                 addTypesToUnion(typeSet, type.types);
             }
             else if (flags & 1) {
@@ -23770,7 +23831,7 @@ var ts;
                     typeSet.containsUndefined = true;
                 if (flags & 4096)
                     typeSet.containsNull = true;
-                if (!(flags & 33554432))
+                if (!(flags & 2097152))
                     typeSet.containsNonWideningType = true;
             }
             else if (!(flags & 8192)) {
@@ -23783,7 +23844,8 @@ var ts;
                 var len = typeSet.length;
                 var index = len && type.id > typeSet[len - 1].id ? ~len : binarySearchTypes(typeSet, type);
                 if (index < 0) {
-                    if (!(flags & 2097152 && type.symbol && type.symbol.flags & (16 | 8192) && containsIdenticalType(typeSet, type))) {
+                    if (!(flags & 32768 && type.objectFlags & 16 &&
+                        type.symbol && type.symbol.flags & (16 | 8192) && containsIdenticalType(typeSet, type))) {
                         typeSet.splice(~index, 0, type);
                     }
                 }
@@ -23845,7 +23907,7 @@ var ts;
                 var t = types[i];
                 var remove = t.flags & 32 && types.containsString ||
                     t.flags & 64 && types.containsNumber ||
-                    t.flags & 96 && t.flags & 16777216 && containsType(types, t.regularType);
+                    t.flags & 96 && t.flags & 1048576 && containsType(types, t.regularType);
                 if (remove) {
                     ts.orderedRemoveItemAt(types, i);
                 }
@@ -23887,22 +23949,22 @@ var ts;
             var type = unionTypes[id];
             if (!type) {
                 var propagatedFlags = getPropagatingFlagsOfTypes(types, 6144);
-                type = unionTypes[id] = createObjectType(524288 | propagatedFlags);
+                type = unionTypes[id] = createType(65536 | propagatedFlags);
                 type.types = types;
                 type.aliasSymbol = aliasSymbol;
                 type.aliasTypeArguments = aliasTypeArguments;
             }
             return type;
         }
-        function getTypeFromUnionTypeNode(node, aliasSymbol, aliasTypeArguments) {
+        function getTypeFromUnionTypeNode(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
-                links.resolvedType = getUnionType(ts.map(node.types, getTypeFromTypeNodeNoAlias), false, aliasSymbol, aliasTypeArguments);
+                links.resolvedType = getUnionType(ts.map(node.types, getTypeFromTypeNode), false, getAliasSymbolForTypeNode(node), getAliasTypeArgumentsForTypeNode(node));
             }
             return links.resolvedType;
         }
         function addTypeToIntersection(typeSet, type) {
-            if (type.flags & 1048576) {
+            if (type.flags & 131072) {
                 addTypesToIntersection(typeSet, type.types);
             }
             else if (type.flags & 1) {
@@ -23922,6 +23984,17 @@ var ts;
             if (types.length === 0) {
                 return emptyObjectType;
             }
+            var _loop_2 = function (i) {
+                var type_1 = types[i];
+                if (type_1.flags & 65536) {
+                    return { value: getUnionType(ts.map(type_1.types, function (t) { return getIntersectionType(ts.replaceElement(types, i, t)); }), false, aliasSymbol, aliasTypeArguments) };
+                }
+            };
+            for (var i = 0; i < types.length; i++) {
+                var state_2 = _loop_2(i);
+                if (typeof state_2 === "object")
+                    return state_2.value;
+            }
             var typeSet = [];
             addTypesToIntersection(typeSet, types);
             if (typeSet.containsAny) {
@@ -23934,39 +24007,248 @@ var ts;
             var type = intersectionTypes[id];
             if (!type) {
                 var propagatedFlags = getPropagatingFlagsOfTypes(typeSet, 6144);
-                type = intersectionTypes[id] = createObjectType(1048576 | propagatedFlags);
+                type = intersectionTypes[id] = createType(131072 | propagatedFlags);
                 type.types = typeSet;
                 type.aliasSymbol = aliasSymbol;
                 type.aliasTypeArguments = aliasTypeArguments;
             }
             return type;
         }
-        function getTypeFromIntersectionTypeNode(node, aliasSymbol, aliasTypeArguments) {
+        function getTypeFromIntersectionTypeNode(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
-                links.resolvedType = getIntersectionType(ts.map(node.types, getTypeFromTypeNodeNoAlias), aliasSymbol, aliasTypeArguments);
+                links.resolvedType = getIntersectionType(ts.map(node.types, getTypeFromTypeNode), getAliasSymbolForTypeNode(node), getAliasTypeArgumentsForTypeNode(node));
             }
             return links.resolvedType;
         }
-        function getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node, aliasSymbol, aliasTypeArguments) {
+        function getIndexTypeForTypeParameter(type) {
+            if (!type.resolvedIndexType) {
+                type.resolvedIndexType = createType(262144);
+                type.resolvedIndexType.type = type;
+            }
+            return type.resolvedIndexType;
+        }
+        function getLiteralTypeFromPropertyName(prop) {
+            return getDeclarationModifierFlagsFromSymbol(prop) & 24 || ts.startsWith(prop.name, "__@") ?
+                neverType :
+                getLiteralTypeForText(32, ts.unescapeIdentifier(prop.name));
+        }
+        function getLiteralTypeFromPropertyNames(type) {
+            return getUnionType(ts.map(getPropertiesOfType(type), getLiteralTypeFromPropertyName));
+        }
+        function getIndexType(type) {
+            return type.flags & 16384 ? getIndexTypeForTypeParameter(type) :
+                type.flags & 1 || getIndexInfoOfType(type, 0) ? stringOrNumberType :
+                    getIndexInfoOfType(type, 1) ? getUnionType([numberType, getLiteralTypeFromPropertyNames(type)]) :
+                        getLiteralTypeFromPropertyNames(type);
+        }
+        function getTypeFromTypeOperatorNode(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
-                var type = createObjectType(2097152, node.symbol);
-                type.aliasSymbol = aliasSymbol;
-                type.aliasTypeArguments = aliasTypeArguments;
+                links.resolvedType = getIndexType(getTypeFromTypeNode(node.type));
+            }
+            return links.resolvedType;
+        }
+        function createIndexedAccessType(objectType, indexType) {
+            var type = createType(524288);
+            type.objectType = objectType;
+            type.indexType = indexType;
+            return type;
+        }
+        function getIndexedAccessTypeForTypeParameter(objectType, indexType) {
+            var indexedAccessTypes = indexType.resolvedIndexedAccessTypes || (indexType.resolvedIndexedAccessTypes = []);
+            return indexedAccessTypes[objectType.id] || (indexedAccessTypes[objectType.id] = createIndexedAccessType(objectType, indexType));
+        }
+        function getPropertyTypeForIndexType(objectType, indexType, accessNode, cacheSymbol) {
+            var accessExpression = accessNode && accessNode.kind === 178 ? accessNode : undefined;
+            var propName = indexType.flags & (32 | 64 | 256) ?
+                indexType.text :
+                accessExpression && checkThatExpressionIsProperSymbolReference(accessExpression.argumentExpression, indexType, false) ?
+                    ts.getPropertyNameForKnownSymbolName(accessExpression.argumentExpression.name.text) :
+                    undefined;
+            if (propName) {
+                var prop = getPropertyOfType(objectType, propName);
+                if (prop) {
+                    if (accessExpression) {
+                        if (ts.isAssignmentTarget(accessExpression) && (isReferenceToReadonlyEntity(accessExpression, prop) || isReferenceThroughNamespaceImport(accessExpression))) {
+                            error(accessExpression.argumentExpression, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_constant_or_a_read_only_property, symbolToString(prop));
+                            return unknownType;
+                        }
+                        if (cacheSymbol) {
+                            getNodeLinks(accessNode).resolvedSymbol = prop;
+                        }
+                    }
+                    return getTypeOfSymbol(prop);
+                }
+            }
+            if (isTypeAnyOrAllConstituentTypesHaveKind(indexType, 34 | 340 | 512)) {
+                if (isTypeAny(objectType)) {
+                    return anyType;
+                }
+                var indexInfo = isTypeAnyOrAllConstituentTypesHaveKind(indexType, 340) && getIndexInfoOfType(objectType, 1) ||
+                    getIndexInfoOfType(objectType, 0) ||
+                    undefined;
+                if (indexInfo) {
+                    if (accessExpression && ts.isAssignmentTarget(accessExpression) && indexInfo.isReadonly) {
+                        error(accessExpression, ts.Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
+                        return unknownType;
+                    }
+                    return indexInfo.type;
+                }
+                if (accessExpression && !isConstEnumObjectType(objectType)) {
+                    if (compilerOptions.noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors) {
+                        if (getIndexTypeOfType(objectType, 1)) {
+                            error(accessExpression.argumentExpression, ts.Diagnostics.Element_implicitly_has_an_any_type_because_index_expression_is_not_of_type_number);
+                        }
+                        else {
+                            error(accessExpression, ts.Diagnostics.Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature, typeToString(objectType));
+                        }
+                    }
+                    return anyType;
+                }
+            }
+            if (accessNode) {
+                var indexNode = accessNode.kind === 178 ? accessNode.argumentExpression : accessNode.indexType;
+                if (indexType.flags & (32 | 64)) {
+                    error(indexNode, ts.Diagnostics.Property_0_does_not_exist_on_type_1, indexType.text, typeToString(objectType));
+                }
+                else if (indexType.flags & (2 | 4)) {
+                    error(indexNode, ts.Diagnostics.Type_0_has_no_matching_index_signature_for_type_1, typeToString(objectType), typeToString(indexType));
+                }
+                else {
+                    error(indexNode, ts.Diagnostics.Type_0_cannot_be_used_as_an_index_type, typeToString(indexType));
+                }
+            }
+            return unknownType;
+        }
+        function getIndexedAccessType(objectType, indexType, accessNode) {
+            if (indexType.flags & 16384) {
+                if (accessNode && !isTypeAssignableTo(getConstraintOfTypeParameter(indexType) || emptyObjectType, getIndexType(objectType))) {
+                    error(accessNode, ts.Diagnostics.Type_0_is_not_constrained_to_keyof_1, typeToString(indexType), typeToString(objectType));
+                    return unknownType;
+                }
+                return getIndexedAccessTypeForTypeParameter(objectType, indexType);
+            }
+            var apparentType = getApparentType(objectType);
+            if (indexType.flags & 65536 && !(indexType.flags & 8190)) {
+                var propTypes = [];
+                for (var _i = 0, _a = indexType.types; _i < _a.length; _i++) {
+                    var t = _a[_i];
+                    var propType = getPropertyTypeForIndexType(apparentType, t, accessNode, false);
+                    if (propType === unknownType) {
+                        return unknownType;
+                    }
+                    propTypes.push(propType);
+                }
+                return getUnionType(propTypes);
+            }
+            return getPropertyTypeForIndexType(apparentType, indexType, accessNode, true);
+        }
+        function getTypeFromIndexedAccessTypeNode(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                links.resolvedType = getIndexedAccessType(getTypeFromTypeNode(node.objectType), getTypeFromTypeNode(node.indexType), node);
+            }
+            return links.resolvedType;
+        }
+        function getTypeFromMappedTypeNode(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                var type = createObjectType(32, node.symbol);
+                type.declaration = node;
+                type.aliasSymbol = getAliasSymbolForTypeNode(node);
+                type.aliasTypeArguments = getAliasTypeArgumentsForTypeNode(node);
                 links.resolvedType = type;
             }
             return links.resolvedType;
         }
+        function getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                var aliasSymbol = getAliasSymbolForTypeNode(node);
+                if (ts.isEmpty(node.symbol.members) && !aliasSymbol) {
+                    links.resolvedType = emptyTypeLiteralType;
+                }
+                else {
+                    var type = createObjectType(16, node.symbol);
+                    type.aliasSymbol = aliasSymbol;
+                    type.aliasTypeArguments = getAliasTypeArgumentsForTypeNode(node);
+                    links.resolvedType = type;
+                }
+            }
+            return links.resolvedType;
+        }
+        function getAliasSymbolForTypeNode(node) {
+            return node.parent.kind === 228 ? getSymbolOfNode(node.parent) : undefined;
+        }
+        function getAliasTypeArgumentsForTypeNode(node) {
+            var symbol = getAliasSymbolForTypeNode(node);
+            return symbol ? getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol) : undefined;
+        }
+        function getSpreadType(left, right, isFromObjectLiteral) {
+            ts.Debug.assert(!!(left.flags & (32768 | 1)) && !!(right.flags & (32768 | 1)), "Only object types may be spread.");
+            if (left.flags & 1 || right.flags & 1) {
+                return anyType;
+            }
+            var members = ts.createMap();
+            var skippedPrivateMembers = ts.createMap();
+            var stringIndexInfo;
+            var numberIndexInfo;
+            if (left === emptyObjectType) {
+                stringIndexInfo = getIndexInfoOfType(right, 0);
+                numberIndexInfo = getIndexInfoOfType(right, 1);
+            }
+            else {
+                stringIndexInfo = unionSpreadIndexInfos(getIndexInfoOfType(left, 0), getIndexInfoOfType(right, 0));
+                numberIndexInfo = unionSpreadIndexInfos(getIndexInfoOfType(left, 1), getIndexInfoOfType(right, 1));
+            }
+            for (var _i = 0, _a = getPropertiesOfType(right); _i < _a.length; _i++) {
+                var rightProp = _a[_i];
+                var isOwnProperty = !(rightProp.flags & 8192) || isFromObjectLiteral;
+                var isSetterWithoutGetter = rightProp.flags & 65536 && !(rightProp.flags & 32768);
+                if (getDeclarationModifierFlagsFromSymbol(rightProp) & (8 | 16)) {
+                    skippedPrivateMembers[rightProp.name] = true;
+                }
+                else if (isOwnProperty && !isSetterWithoutGetter) {
+                    members[rightProp.name] = rightProp;
+                }
+            }
+            for (var _b = 0, _c = getPropertiesOfType(left); _b < _c.length; _b++) {
+                var leftProp = _c[_b];
+                if (leftProp.flags & 65536 && !(leftProp.flags & 32768)
+                    || leftProp.name in skippedPrivateMembers) {
+                    continue;
+                }
+                if (leftProp.name in members) {
+                    var rightProp = members[leftProp.name];
+                    var rightType = getTypeOfSymbol(rightProp);
+                    if (maybeTypeOfKind(rightType, 2048) || rightProp.flags & 536870912) {
+                        var declarations = ts.concatenate(leftProp.declarations, rightProp.declarations);
+                        var flags = 4 | 67108864 | (leftProp.flags & 536870912);
+                        var result = createSymbol(flags, leftProp.name);
+                        result.type = getUnionType([getTypeOfSymbol(leftProp), getTypeWithFacts(rightType, 131072)]);
+                        result.leftSpread = leftProp;
+                        result.rightSpread = rightProp;
+                        result.declarations = declarations;
+                        result.isReadonly = isReadonlySymbol(leftProp) || isReadonlySymbol(rightProp);
+                        members[leftProp.name] = result;
+                    }
+                }
+                else {
+                    members[leftProp.name] = leftProp;
+                }
+            }
+            return createAnonymousType(undefined, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
+        }
         function createLiteralType(flags, text) {
             var type = createType(flags);
             type.text = text;
             return type;
         }
         function getFreshTypeOfLiteralType(type) {
-            if (type.flags & 96 && !(type.flags & 16777216)) {
+            if (type.flags & 96 && !(type.flags & 1048576)) {
                 if (!type.freshType) {
-                    var freshType = createLiteralType(type.flags | 16777216, type.text);
+                    var freshType = createLiteralType(type.flags | 1048576, type.text);
                     freshType.regularType = type;
                     type.freshType = freshType;
                 }
@@ -23975,7 +24257,7 @@ var ts;
             return type;
         }
         function getRegularTypeOfLiteralType(type) {
-            return type.flags & 96 && type.flags & 16777216 ? type.regularType : type;
+            return type.flags & 96 && type.flags & 1048576 ? type.regularType : type;
         }
         function getLiteralTypeForText(flags, text) {
             var map = flags & 32 ? stringLiteralTypes : numericLiteralTypes;
@@ -23999,7 +24281,7 @@ var ts;
         function getTypeFromJSDocTupleType(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
-                var types = ts.map(node.types, getTypeFromTypeNodeNoAlias);
+                var types = ts.map(node.types, getTypeFromTypeNode);
                 links.resolvedType = createTupleType(types);
             }
             return links.resolvedType;
@@ -24007,9 +24289,9 @@ var ts;
         function getThisType(node) {
             var container = ts.getThisContainer(node, false);
             var parent = container && container.parent;
-            if (parent && (ts.isClassLike(parent) || parent.kind === 223)) {
+            if (parent && (ts.isClassLike(parent) || parent.kind === 227)) {
                 if (!(ts.getModifierFlags(container) & 32) &&
-                    (container.kind !== 149 || ts.isNodeDescendantOf(node, container.body))) {
+                    (container.kind !== 150 || ts.isNodeDescendantOf(node, container.body))) {
                     return getDeclaredTypeOfClassOrInterface(getSymbolOfNode(parent)).thisType;
                 }
             }
@@ -24023,85 +24305,88 @@ var ts;
             }
             return links.resolvedType;
         }
-        function getTypeFromTypeNodeNoAlias(type) {
-            return getTypeFromTypeNode(type, undefined, undefined);
-        }
-        function getTypeFromTypeNode(node, aliasSymbol, aliasTypeArguments) {
+        function getTypeFromTypeNode(node) {
             switch (node.kind) {
                 case 118:
-                case 258:
-                case 259:
+                case 263:
+                case 264:
                     return anyType;
-                case 133:
+                case 134:
                     return stringType;
-                case 131:
+                case 132:
                     return numberType;
                 case 121:
                     return booleanType;
-                case 134:
+                case 135:
                     return esSymbolType;
                 case 104:
                     return voidType;
-                case 136:
+                case 137:
                     return undefinedType;
                 case 94:
                     return nullType;
-                case 128:
+                case 129:
                     return neverType;
-                case 283:
+                case 288:
                     return nullType;
-                case 284:
+                case 289:
                     return undefinedType;
-                case 285:
+                case 290:
                     return neverType;
-                case 166:
+                case 167:
                 case 98:
                     return getTypeFromThisTypeNode(node);
-                case 167:
+                case 171:
                     return getTypeFromLiteralTypeNode(node);
-                case 282:
+                case 287:
                     return getTypeFromLiteralTypeNode(node.literal);
-                case 156:
-                case 267:
-                    return getTypeFromTypeReference(node);
-                case 155:
-                    return booleanType;
-                case 195:
-                    return getTypeFromTypeReference(node);
-                case 159:
-                    return getTypeFromTypeQueryNode(node);
-                case 161:
-                case 260:
-                    return getTypeFromArrayTypeNode(node);
-                case 162:
-                    return getTypeFromTupleTypeNode(node);
-                case 163:
-                case 261:
-                    return getTypeFromUnionTypeNode(node, aliasSymbol, aliasTypeArguments);
-                case 164:
-                    return getTypeFromIntersectionTypeNode(node, aliasSymbol, aliasTypeArguments);
-                case 165:
-                case 263:
-                case 264:
-                case 271:
-                case 272:
-                case 268:
-                    return getTypeFromTypeNode(node.type);
-                case 265:
-                    return getTypeFromTypeNode(node.literal);
                 case 157:
-                case 158:
+                case 272:
+                    return getTypeFromTypeReference(node);
+                case 156:
+                    return booleanType;
+                case 199:
+                    return getTypeFromTypeReference(node);
                 case 160:
-                case 281:
+                    return getTypeFromTypeQueryNode(node);
+                case 162:
+                case 265:
+                    return getTypeFromArrayTypeNode(node);
+                case 163:
+                    return getTypeFromTupleTypeNode(node);
+                case 164:
+                case 266:
+                    return getTypeFromUnionTypeNode(node);
+                case 165:
+                    return getTypeFromIntersectionTypeNode(node);
+                case 166:
+                case 268:
                 case 269:
-                    return getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node, aliasSymbol, aliasTypeArguments);
+                case 276:
+                case 277:
+                case 273:
+                    return getTypeFromTypeNode(node.type);
+                case 270:
+                    return getTypeFromTypeNode(node.literal);
+                case 158:
+                case 159:
+                case 161:
+                case 286:
+                case 274:
+                    return getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node);
+                case 168:
+                    return getTypeFromTypeOperatorNode(node);
+                case 169:
+                    return getTypeFromIndexedAccessTypeNode(node);
+                case 170:
+                    return getTypeFromMappedTypeNode(node);
                 case 70:
-                case 140:
+                case 141:
                     var symbol = getSymbolAtLocation(node);
                     return symbol && getDeclaredTypeOfSymbol(symbol);
-                case 262:
+                case 267:
                     return getTypeFromJSDocTupleType(node);
-                case 270:
+                case 275:
                     return getTypeFromJSDocVariadicType(node);
                 default:
                     return unknownType;
@@ -24118,6 +24403,16 @@ var ts;
             }
             return items;
         }
+        function instantiateTypes(types, mapper) {
+            return instantiateList(types, mapper, instantiateType);
+        }
+        function instantiateSignatures(signatures, mapper) {
+            return instantiateList(signatures, mapper, instantiateSignature);
+        }
+        function instantiateCached(type, mapper, instantiator) {
+            var instantiations = mapper.instantiations || (mapper.instantiations = []);
+            return instantiations[type.id] || (instantiations[type.id] = instantiator(type, mapper));
+        }
         function createUnaryTypeMapper(source, target) {
             return function (t) { return t === source ? target : t; };
         }
@@ -24140,7 +24435,6 @@ var ts;
                 count == 2 ? createBinaryTypeMapper(sources[0], targets ? targets[0] : anyType, sources[1], targets ? targets[1] : anyType) :
                     createArrayTypeMapper(sources, targets);
             mapper.mappedTypes = sources;
-            mapper.targetTypes = targets;
             return mapper;
         }
         function createTypeEraser(sources) {
@@ -24230,45 +24524,46 @@ var ts;
             return result;
         }
         function instantiateAnonymousType(type, mapper) {
-            if (mapper.instantiations) {
-                var cachedType = mapper.instantiations[type.id];
-                if (cachedType) {
-                    return cachedType;
-                }
-            }
-            else {
-                mapper.instantiations = [];
-            }
-            var result = createObjectType(2097152 | 4194304, type.symbol);
-            result.target = type;
-            result.mapper = mapper;
+            var result = createObjectType(16 | 64, type.symbol);
+            result.target = type.objectFlags & 64 ? type.target : type;
+            result.mapper = type.objectFlags & 64 ? combineTypeMappers(type.mapper, mapper) : mapper;
             result.aliasSymbol = type.aliasSymbol;
-            result.aliasTypeArguments = mapper.targetTypes;
-            mapper.instantiations[type.id] = result;
+            result.aliasTypeArguments = instantiateTypes(type.aliasTypeArguments, mapper);
+            return result;
+        }
+        function instantiateMappedType(type, mapper) {
+            var result = createObjectType(32 | 64, type.symbol);
+            result.declaration = type.declaration;
+            result.mapper = type.mapper ? combineTypeMappers(type.mapper, mapper) : mapper;
+            result.aliasSymbol = type.aliasSymbol;
+            result.aliasTypeArguments = instantiateTypes(type.aliasTypeArguments, mapper);
             return result;
         }
         function isSymbolInScopeOfMappedTypeParameter(symbol, mapper) {
+            if (!(symbol.declarations && symbol.declarations.length)) {
+                return false;
+            }
             var mappedTypes = mapper.mappedTypes;
             var node = symbol.declarations[0].parent;
             while (node) {
                 switch (node.kind) {
-                    case 157:
                     case 158:
-                    case 221:
-                    case 148:
-                    case 147:
+                    case 159:
+                    case 225:
                     case 149:
-                    case 152:
+                    case 148:
+                    case 150:
                     case 153:
                     case 154:
-                    case 150:
+                    case 155:
                     case 151:
-                    case 180:
-                    case 181:
-                    case 222:
-                    case 193:
-                    case 223:
-                    case 224:
+                    case 152:
+                    case 184:
+                    case 185:
+                    case 226:
+                    case 197:
+                    case 227:
+                    case 228:
                         var declaration = node;
                         if (declaration.typeParameters) {
                             for (var _i = 0, _a = declaration.typeParameters; _i < _a.length; _i++) {
@@ -24278,69 +24573,97 @@ var ts;
                                 }
                             }
                         }
-                        if (ts.isClassLike(node) || node.kind === 223) {
+                        if (ts.isClassLike(node) || node.kind === 227) {
                             var thisType = getDeclaredTypeOfClassOrInterface(getSymbolOfNode(node)).thisType;
                             if (thisType && ts.contains(mappedTypes, thisType)) {
                                 return true;
                             }
                         }
                         break;
-                    case 226:
-                    case 256:
+                    case 230:
+                    case 261:
                         return false;
                 }
                 node = node.parent;
             }
             return false;
         }
+        function isTopLevelTypeAlias(symbol) {
+            if (symbol.declarations && symbol.declarations.length) {
+                var parentKind = symbol.declarations[0].parent.kind;
+                return parentKind === 261 || parentKind === 231;
+            }
+            return false;
+        }
         function instantiateType(type, mapper) {
             if (type && mapper !== identityMapper) {
-                if (type.flags & 16384) {
-                    return mapper(type);
+                if (type.aliasSymbol && isTopLevelTypeAlias(type.aliasSymbol)) {
+                    if (type.aliasTypeArguments) {
+                        return getTypeAliasInstantiation(type.aliasSymbol, instantiateTypes(type.aliasTypeArguments, mapper));
+                    }
+                    return type;
                 }
-                if (type.flags & 2097152) {
+                return instantiateTypeNoAlias(type, mapper);
+            }
+            return type;
+        }
+        function instantiateTypeNoAlias(type, mapper) {
+            if (type.flags & 16384) {
+                return mapper(type);
+            }
+            if (type.flags & 32768) {
+                if (type.objectFlags & 16) {
                     return type.symbol &&
                         type.symbol.flags & (16 | 8192 | 32 | 2048 | 4096) &&
-                        (type.flags & 4194304 || isSymbolInScopeOfMappedTypeParameter(type.symbol, mapper)) ?
-                        instantiateAnonymousType(type, mapper) : type;
+                        (type.objectFlags & 64 || isSymbolInScopeOfMappedTypeParameter(type.symbol, mapper)) ?
+                        instantiateCached(type, mapper, instantiateAnonymousType) : type;
                 }
-                if (type.flags & 131072) {
-                    return createTypeReference(type.target, instantiateList(type.typeArguments, mapper, instantiateType));
+                if (type.objectFlags & 32) {
+                    return instantiateCached(type, mapper, instantiateMappedType);
                 }
-                if (type.flags & 524288 && !(type.flags & 8190)) {
-                    return getUnionType(instantiateList(type.types, mapper, instantiateType), false, type.aliasSymbol, mapper.targetTypes);
-                }
-                if (type.flags & 1048576) {
-                    return getIntersectionType(instantiateList(type.types, mapper, instantiateType), type.aliasSymbol, mapper.targetTypes);
+                if (type.objectFlags & 4) {
+                    return createTypeReference(type.target, instantiateTypes(type.typeArguments, mapper));
                 }
             }
+            if (type.flags & 65536 && !(type.flags & 8190)) {
+                return getUnionType(instantiateTypes(type.types, mapper), false, type.aliasSymbol, instantiateTypes(type.aliasTypeArguments, mapper));
+            }
+            if (type.flags & 131072) {
+                return getIntersectionType(instantiateTypes(type.types, mapper), type.aliasSymbol, instantiateTypes(type.aliasTypeArguments, mapper));
+            }
+            if (type.flags & 262144) {
+                return getIndexType(instantiateType(type.type, mapper));
+            }
+            if (type.flags & 524288) {
+                return getIndexedAccessType(instantiateType(type.objectType, mapper), instantiateType(type.indexType, mapper));
+            }
             return type;
         }
         function instantiateIndexInfo(info, mapper) {
             return info && createIndexInfo(instantiateType(info.type, mapper), info.isReadonly, info.declaration);
         }
         function isContextSensitive(node) {
-            ts.Debug.assert(node.kind !== 148 || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 149 || ts.isObjectLiteralMethod(node));
             switch (node.kind) {
-                case 180:
-                case 181:
+                case 184:
+                case 185:
                     return isContextSensitiveFunctionLikeDeclaration(node);
-                case 172:
+                case 176:
                     return ts.forEach(node.properties, isContextSensitive);
-                case 171:
+                case 175:
                     return ts.forEach(node.elements, isContextSensitive);
-                case 189:
+                case 193:
                     return isContextSensitive(node.whenTrue) ||
                         isContextSensitive(node.whenFalse);
-                case 188:
+                case 192:
                     return node.operatorToken.kind === 53 &&
                         (isContextSensitive(node.left) || isContextSensitive(node.right));
-                case 253:
+                case 257:
                     return isContextSensitive(node.initializer);
+                case 149:
                 case 148:
-                case 147:
                     return isContextSensitiveFunctionLikeDeclaration(node);
-                case 179:
+                case 183:
                     return isContextSensitive(node.expression);
             }
             return false;
@@ -24352,7 +24675,7 @@ var ts;
             if (ts.forEach(node.parameters, function (p) { return !p.type; })) {
                 return true;
             }
-            if (node.kind === 181) {
+            if (node.kind === 185) {
                 return false;
             }
             var parameter = ts.firstOrUndefined(node.parameters);
@@ -24362,10 +24685,10 @@ var ts;
             return (isFunctionExpressionOrArrowFunction(func) || ts.isObjectLiteralMethod(func)) && isContextSensitiveFunctionLikeDeclaration(func);
         }
         function getTypeWithoutSignatures(type) {
-            if (type.flags & 2588672) {
+            if (type.flags & 32768) {
                 var resolved = resolveStructuredTypeMembers(type);
                 if (resolved.constructSignatures.length) {
-                    var result = createObjectType(2097152, type.symbol);
+                    var result = createObjectType(16, type.symbol);
                     result.members = resolved.members;
                     result.properties = resolved.properties;
                     result.callSignatures = emptyArray;
@@ -24544,7 +24867,7 @@ var ts;
             }
             if (source.symbol.name !== target.symbol.name ||
                 !(source.symbol.flags & 256) || !(target.symbol.flags & 256) ||
-                (source.flags & 524288) !== (target.flags & 524288)) {
+                (source.flags & 65536) !== (target.flags & 65536)) {
                 return enumRelation[id] = false;
             }
             var targetEnumType = getTypeOfSymbol(target.symbol);
@@ -24601,23 +24924,23 @@ var ts;
             return false;
         }
         function isTypeRelatedTo(source, target, relation) {
-            if (source.flags & 96 && source.flags & 16777216) {
+            if (source.flags & 96 && source.flags & 1048576) {
                 source = source.regularType;
             }
-            if (target.flags & 96 && target.flags & 16777216) {
+            if (target.flags & 96 && target.flags & 1048576) {
                 target = target.regularType;
             }
             if (source === target || relation !== identityRelation && isSimpleTypeRelatedTo(source, target, relation)) {
                 return true;
             }
-            if (source.flags & 2588672 && target.flags & 2588672) {
+            if (source.flags & 32768 && target.flags & 32768) {
                 var id = relation !== identityRelation || source.id < target.id ? source.id + "," + target.id : target.id + "," + source.id;
                 var related = relation[id];
                 if (related !== undefined) {
                     return related === 1;
                 }
             }
-            if (source.flags & 4177920 || target.flags & 4177920) {
+            if (source.flags & 507904 || target.flags & 507904) {
                 return checkTypeRelatedTo(source, target, relation, undefined, undefined, undefined);
             }
             return false;
@@ -24654,9 +24977,15 @@ var ts;
                     targetType = typeToString(target, undefined, 128);
                 }
                 if (!message) {
-                    message = relation === comparableRelation ?
-                        ts.Diagnostics.Type_0_is_not_comparable_to_type_1 :
-                        ts.Diagnostics.Type_0_is_not_assignable_to_type_1;
+                    if (relation === comparableRelation) {
+                        message = ts.Diagnostics.Type_0_is_not_comparable_to_type_1;
+                    }
+                    else if (sourceType === targetType) {
+                        message = ts.Diagnostics.Type_0_is_not_assignable_to_type_1_Two_different_types_with_this_name_exist_but_they_are_unrelated;
+                    }
+                    else {
+                        message = ts.Diagnostics.Type_0_is_not_assignable_to_type_1;
+                    }
                 }
                 reportError(message, sourceType, targetType);
             }
@@ -24672,10 +25001,10 @@ var ts;
             }
             function isRelatedTo(source, target, reportErrors, headMessage) {
                 var result;
-                if (source.flags & 96 && source.flags & 16777216) {
+                if (source.flags & 96 && source.flags & 1048576) {
                     source = source.regularType;
                 }
-                if (target.flags & 96 && target.flags & 16777216) {
+                if (target.flags & 96 && target.flags & 1048576) {
                     target = target.regularType;
                 }
                 if (source === target)
@@ -24685,19 +25014,24 @@ var ts;
                 }
                 if (isSimpleTypeRelatedTo(source, target, relation, reportErrors ? reportError : undefined))
                     return -1;
-                if (source.flags & 8388608 && source.flags & 16777216) {
+                if (source.flags & 262144) {
+                    if (maybeTypeOfKind(target, 2) && maybeTypeOfKind(target, 4)) {
+                        return -1;
+                    }
+                }
+                if (getObjectFlags(source) & 128 && source.flags & 1048576) {
                     if (hasExcessProperties(source, target, reportErrors)) {
                         if (reportErrors) {
                             reportRelationError(headMessage, source, target);
                         }
                         return 0;
                     }
-                    if (target.flags & 1572864) {
+                    if (target.flags & 196608) {
                         source = getRegularTypeOfObjectLiteral(source);
                     }
                 }
                 var saveErrorInfo = errorInfo;
-                if (source.flags & 524288) {
+                if (source.flags & 65536) {
                     if (relation === comparableRelation) {
                         result = someTypeRelatedToType(source, target, reportErrors && !(source.flags & 8190));
                     }
@@ -24708,20 +25042,38 @@ var ts;
                         return result;
                     }
                 }
-                else if (target.flags & 1048576) {
-                    result = typeRelatedToEachType(source, target, reportErrors);
-                    if (result) {
+                else if (target.flags & 65536) {
+                    if (result = typeRelatedToSomeType(source, target, reportErrors && !(source.flags & 8190) && !(target.flags & 8190))) {
                         return result;
                     }
                 }
-                else {
-                    if (source.flags & 1048576) {
-                        if (result = someTypeRelatedToType(source, target, false)) {
+                else if (target.flags & 131072) {
+                    if (result = typeRelatedToEachType(source, target, reportErrors)) {
+                        return result;
+                    }
+                }
+                else if (source.flags & 131072) {
+                    if (result = someTypeRelatedToType(source, target, false)) {
+                        return result;
+                    }
+                }
+                if (target.flags & 16384) {
+                    var constraint = getConstraintOfTypeParameter(target);
+                    if (constraint && constraint.flags & 262144) {
+                        if (result = isRelatedTo(source, constraint, reportErrors)) {
                             return result;
                         }
                     }
-                    if (target.flags & 524288) {
-                        if (result = typeRelatedToSomeType(source, target, reportErrors && !(source.flags & 8190) && !(target.flags & 8190))) {
+                }
+                else if (target.flags & 262144) {
+                    if (source.flags & 262144) {
+                        if (result = isRelatedTo(target.type, source.type, false)) {
+                            return result;
+                        }
+                    }
+                    var constraint = getConstraintOfTypeParameter(target.type);
+                    if (constraint) {
+                        if (result = isRelatedTo(source, getIndexType(constraint), reportErrors)) {
                             return result;
                         }
                     }
@@ -24739,25 +25091,35 @@ var ts;
                     }
                 }
                 else {
-                    if (source.flags & 131072 && target.flags & 131072 && source.target === target.target) {
+                    if (getObjectFlags(source) & 4 && getObjectFlags(target) & 4 && source.target === target.target) {
                         if (result = typeArgumentsRelatedTo(source, target, reportErrors)) {
                             return result;
                         }
                     }
-                    var apparentSource = getApparentType(source);
-                    if (apparentSource.flags & (2588672 | 1048576) && target.flags & 2588672) {
-                        var reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo && !(source.flags & 8190);
-                        if (result = objectTypeRelatedTo(apparentSource, source, target, reportStructuralErrors)) {
-                            errorInfo = saveErrorInfo;
-                            return result;
+                    if (isGenericMappedType(target)) {
+                        if (isGenericMappedType(source)) {
+                            if ((result = isRelatedTo(getConstraintTypeFromMappedType(target), getConstraintTypeFromMappedType(source), reportErrors)) &&
+                                (result = isRelatedTo(getTemplateTypeFromMappedType(source), getTemplateTypeFromMappedType(target), reportErrors))) {
+                                return result;
+                            }
+                        }
+                    }
+                    else {
+                        var apparentSource = getApparentType(source);
+                        if (apparentSource.flags & (32768 | 131072) && target.flags & 32768) {
+                            var reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo && !(source.flags & 8190);
+                            if (result = objectTypeRelatedTo(apparentSource, source, target, reportStructuralErrors)) {
+                                errorInfo = saveErrorInfo;
+                                return result;
+                            }
                         }
                     }
                 }
                 if (reportErrors) {
-                    if (source.flags & 2588672 && target.flags & 8190) {
+                    if (source.flags & 32768 && target.flags & 8190) {
                         tryElaborateErrorsForPrimitivesAndObjects(source, target);
                     }
-                    else if (source.symbol && source.flags & 2588672 && globalObjectType === source) {
+                    else if (source.symbol && source.flags & 32768 && globalObjectType === source) {
                         reportError(ts.Diagnostics.The_Object_type_is_assignable_to_very_few_other_types_Did_you_mean_to_use_the_any_type_instead);
                     }
                     reportRelationError(headMessage, source, target);
@@ -24766,16 +25128,16 @@ var ts;
             }
             function isIdenticalTo(source, target) {
                 var result;
-                if (source.flags & 2588672 && target.flags & 2588672) {
-                    if (source.flags & 131072 && target.flags & 131072 && source.target === target.target) {
+                if (source.flags & 32768 && target.flags & 32768) {
+                    if (getObjectFlags(source) & 4 && getObjectFlags(target) & 4 && source.target === target.target) {
                         if (result = typeArgumentsRelatedTo(source, target, false)) {
                             return result;
                         }
                     }
                     return objectTypeRelatedTo(source, source, target, false);
                 }
-                if (source.flags & 524288 && target.flags & 524288 ||
-                    source.flags & 1048576 && target.flags & 1048576) {
+                if (source.flags & 65536 && target.flags & 65536 ||
+                    source.flags & 131072 && target.flags & 131072) {
                     if (result = eachTypeRelatedToSomeType(source, target)) {
                         if (result &= eachTypeRelatedToSomeType(target, source)) {
                             return result;
@@ -24785,7 +25147,7 @@ var ts;
                 return 0;
             }
             function isKnownProperty(type, name) {
-                if (type.flags & 2588672) {
+                if (type.flags & 32768) {
                     var resolved = resolveStructuredTypeMembers(type);
                     if ((relation === assignableRelation || relation === comparableRelation) && (type === globalObjectType || isEmptyObjectType(resolved)) ||
                         resolved.stringIndexInfo ||
@@ -24794,7 +25156,7 @@ var ts;
                         return true;
                     }
                 }
-                else if (type.flags & 1572864) {
+                else if (type.flags & 196608) {
                     for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                         var t = _a[_i];
                         if (isKnownProperty(t, name)) {
@@ -24812,8 +25174,7 @@ var ts;
                     !t.numberIndexInfo;
             }
             function hasExcessProperties(source, target, reportErrors) {
-                if (maybeTypeOfKind(target, 2588672) &&
-                    (!(target.flags & 2588672) || !target.isObjectLiteralPatternWithComputedProperties)) {
+                if (maybeTypeOfKind(target, 32768) && !(getObjectFlags(target) & 512)) {
                     for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
                         var prop = _a[_i];
                         if (!isKnownProperty(target, prop.name)) {
@@ -24843,7 +25204,7 @@ var ts;
             }
             function typeRelatedToSomeType(source, target, reportErrors) {
                 var targetTypes = target.types;
-                if (target.flags & 524288 && containsType(targetTypes, source)) {
+                if (target.flags & 65536 && containsType(targetTypes, source)) {
                     return -1;
                 }
                 var len = targetTypes.length;
@@ -24870,7 +25231,7 @@ var ts;
             }
             function someTypeRelatedToType(source, target, reportErrors) {
                 var sourceTypes = source.types;
-                if (source.flags & 524288 && containsType(sourceTypes, target)) {
+                if (source.flags & 65536 && containsType(sourceTypes, target)) {
                     return -1;
                 }
                 var len = sourceTypes.length;
@@ -24990,9 +25351,9 @@ var ts;
                 }
                 var result = -1;
                 var properties = getPropertiesOfObjectType(target);
-                var requireOptionalProperties = relation === subtypeRelation && !(source.flags & 8388608);
-                for (var _i = 0, properties_2 = properties; _i < properties_2.length; _i++) {
-                    var targetProp = properties_2[_i];
+                var requireOptionalProperties = relation === subtypeRelation && !(getObjectFlags(source) & 128);
+                for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
+                    var targetProp = properties_3[_i];
                     var sourceProp = getPropertyOfType(source, targetProp.name);
                     if (sourceProp !== targetProp) {
                         if (!sourceProp) {
@@ -25044,7 +25405,7 @@ var ts;
                                 return 0;
                             }
                             result &= related;
-                            if (sourceProp.flags & 536870912 && !(targetProp.flags & 536870912)) {
+                            if (relation !== comparableRelation && sourceProp.flags & 536870912 && !(targetProp.flags & 536870912)) {
                                 if (reportErrors) {
                                     reportError(ts.Diagnostics.Property_0_is_optional_in_type_1_but_required_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
                                 }
@@ -25056,7 +25417,7 @@ var ts;
                 return result;
             }
             function propertiesIdenticalTo(source, target) {
-                if (!(source.flags & 2588672 && target.flags & 2588672)) {
+                if (!(source.flags & 32768 && target.flags & 32768)) {
                     return 0;
                 }
                 var sourceProperties = getPropertiesOfObjectType(source);
@@ -25228,7 +25589,7 @@ var ts;
             }
         }
         function isAbstractConstructorType(type) {
-            if (type.flags & 2097152) {
+            if (getObjectFlags(type) & 16) {
                 var symbol = type.symbol;
                 if (symbol && symbol.flags & 32) {
                     var declaration = getClassLikeDeclarationOfSymbol(symbol);
@@ -25240,12 +25601,12 @@ var ts;
             return false;
         }
         function isDeeplyNestedGeneric(type, stack, depth) {
-            if (type.flags & (131072 | 4194304) && depth >= 5) {
+            if (getObjectFlags(type) & (4 | 64) && depth >= 5) {
                 var symbol = type.symbol;
                 var count = 0;
                 for (var i = 0; i < depth; i++) {
                     var t = stack[i];
-                    if (t.flags & (131072 | 4194304) && t.symbol === symbol) {
+                    if (getObjectFlags(t) & (4 | 64) && t.symbol === symbol) {
                         count++;
                         if (count >= 5)
                             return true;
@@ -25403,10 +25764,10 @@ var ts;
             checkTypeSubtypeOf(bestSupertypeDownfallType, bestSupertype, errorLocation, ts.Diagnostics.Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0, errorMessageChainHead);
         }
         function isArrayType(type) {
-            return type.flags & 131072 && type.target === globalArrayType;
+            return getObjectFlags(type) & 4 && type.target === globalArrayType;
         }
         function isArrayLikeType(type) {
-            return type.flags & 131072 && (type.target === globalArrayType || type.target === globalReadonlyArrayType) ||
+            return getObjectFlags(type) & 4 && (type.target === globalArrayType || type.target === globalReadonlyArrayType) ||
                 !(type.flags & 6144) && isTypeAssignableTo(type, anyReadonlyArrayType);
         }
         function isTupleLikeType(type) {
@@ -25417,7 +25778,7 @@ var ts;
         }
         function isLiteralType(type) {
             return type.flags & 8 ? true :
-                type.flags & 524288 ? type.flags & 16 ? true : !ts.forEach(type.types, function (t) { return !isUnitType(t); }) :
+                type.flags & 65536 ? type.flags & 16 ? true : !ts.forEach(type.types, function (t) { return !isUnitType(t); }) :
                     isUnitType(type);
         }
         function getBaseTypeOfLiteralType(type) {
@@ -25425,19 +25786,19 @@ var ts;
                 type.flags & 64 ? numberType :
                     type.flags & 128 ? booleanType :
                         type.flags & 256 ? type.baseType :
-                            type.flags & 524288 && !(type.flags & 16) ? getUnionType(ts.sameMap(type.types, getBaseTypeOfLiteralType)) :
+                            type.flags & 65536 && !(type.flags & 16) ? getUnionType(ts.sameMap(type.types, getBaseTypeOfLiteralType)) :
                                 type;
         }
         function getWidenedLiteralType(type) {
-            return type.flags & 32 && type.flags & 16777216 ? stringType :
-                type.flags & 64 && type.flags & 16777216 ? numberType :
+            return type.flags & 32 && type.flags & 1048576 ? stringType :
+                type.flags & 64 && type.flags & 1048576 ? numberType :
                     type.flags & 128 ? booleanType :
                         type.flags & 256 ? type.baseType :
-                            type.flags & 524288 && !(type.flags & 16) ? getUnionType(ts.sameMap(type.types, getWidenedLiteralType)) :
+                            type.flags & 65536 && !(type.flags & 16) ? getUnionType(ts.sameMap(type.types, getWidenedLiteralType)) :
                                 type;
         }
         function isTupleType(type) {
-            return !!(type.flags & 131072 && type.target.flags & 262144);
+            return !!(getObjectFlags(type) & 4 && type.target.objectFlags & 8);
         }
         function getFalsyFlagsOfTypes(types) {
             var result = 0;
@@ -25448,7 +25809,7 @@ var ts;
             return result;
         }
         function getFalsyFlags(type) {
-            return type.flags & 524288 ? getFalsyFlagsOfTypes(type.types) :
+            return type.flags & 65536 ? getFalsyFlagsOfTypes(type.types) :
                 type.flags & 32 ? type.text === "" ? 32 : 0 :
                     type.flags & 64 ? type.text === "0" ? 64 : 0 :
                         type.flags & 128 ? type === falseType ? 128 : 0 :
@@ -25509,7 +25870,7 @@ var ts;
             return members;
         }
         function getRegularTypeOfObjectLiteral(type) {
-            if (!(type.flags & 8388608 && type.flags & 16777216)) {
+            if (!(getObjectFlags(type) & 128 && type.flags & 1048576)) {
                 return type;
             }
             var regularType = type.regularType;
@@ -25519,7 +25880,8 @@ var ts;
             var resolved = type;
             var members = transformTypeOfMembers(type, getRegularTypeOfObjectLiteral);
             var regularNew = createAnonymousType(resolved.symbol, members, resolved.callSignatures, resolved.constructSignatures, resolved.stringIndexInfo, resolved.numberIndexInfo);
-            regularNew.flags = resolved.flags & ~16777216;
+            regularNew.flags = resolved.flags & ~1048576;
+            regularNew.objectFlags |= 128;
             type.regularType = regularNew;
             return regularNew;
         }
@@ -25536,14 +25898,14 @@ var ts;
             return type.flags & 6144 ? type : getWidenedType(type);
         }
         function getWidenedType(type) {
-            if (type.flags & 100663296) {
+            if (type.flags & 6291456) {
                 if (type.flags & 6144) {
                     return anyType;
                 }
-                if (type.flags & 8388608) {
+                if (getObjectFlags(type) & 128) {
                     return getWidenedTypeOfObjectLiteral(type);
                 }
-                if (type.flags & 524288) {
+                if (type.flags & 65536) {
                     return getUnionType(ts.sameMap(type.types, getWidenedConstituentType));
                 }
                 if (isArrayType(type) || isTupleType(type)) {
@@ -25554,7 +25916,7 @@ var ts;
         }
         function reportWideningErrorsInType(type) {
             var errorReported = false;
-            if (type.flags & 524288) {
+            if (type.flags & 65536) {
                 for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                     var t = _a[_i];
                     if (reportWideningErrorsInType(t)) {
@@ -25570,11 +25932,11 @@ var ts;
                     }
                 }
             }
-            if (type.flags & 8388608) {
+            if (getObjectFlags(type) & 128) {
                 for (var _d = 0, _e = getPropertiesOfObjectType(type); _d < _e.length; _d++) {
                     var p = _e[_d];
                     var t = getTypeOfSymbol(p);
-                    if (t.flags & 33554432) {
+                    if (t.flags & 2097152) {
                         if (!reportWideningErrorsInType(t)) {
                             error(p.valueDeclaration, ts.Diagnostics.Object_literal_s_property_0_implicitly_has_an_1_type, p.name, typeToString(getWidenedType(t)));
                         }
@@ -25588,25 +25950,25 @@ var ts;
             var typeAsString = typeToString(getWidenedType(type));
             var diagnostic;
             switch (declaration.kind) {
+                case 147:
                 case 146:
-                case 145:
                     diagnostic = ts.Diagnostics.Member_0_implicitly_has_an_1_type;
                     break;
-                case 143:
+                case 144:
                     diagnostic = declaration.dotDotDotToken ?
                         ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type :
                         ts.Diagnostics.Parameter_0_implicitly_has_an_1_type;
                     break;
-                case 170:
+                case 174:
                     diagnostic = ts.Diagnostics.Binding_element_0_implicitly_has_an_1_type;
                     break;
-                case 221:
+                case 225:
+                case 149:
                 case 148:
-                case 147:
-                case 150:
                 case 151:
-                case 180:
-                case 181:
+                case 152:
+                case 184:
+                case 185:
                     if (!declaration.name) {
                         error(declaration, ts.Diagnostics.Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
                         return;
@@ -25619,7 +25981,7 @@ var ts;
             error(declaration, diagnostic, ts.declarationNameToString(declaration.name), typeAsString);
         }
         function reportErrorsFromWidening(declaration, type) {
-            if (produceDiagnostics && compilerOptions.noImplicitAny && type.flags & 33554432) {
+            if (produceDiagnostics && compilerOptions.noImplicitAny && type.flags & 2097152) {
                 if (!reportWideningErrorsInType(type)) {
                     reportImplicitAnyError(declaration, type);
                 }
@@ -25663,10 +26025,12 @@ var ts;
             };
         }
         function couldContainTypeParameters(type) {
+            var objectFlags = getObjectFlags(type);
             return !!(type.flags & 16384 ||
-                type.flags & 131072 && ts.forEach(type.typeArguments, couldContainTypeParameters) ||
-                type.flags & 2097152 && type.symbol && type.symbol.flags & (8192 | 2048 | 32) ||
-                type.flags & 1572864 && couldUnionOrIntersectionContainTypeParameters(type));
+                objectFlags & 4 && ts.forEach(type.typeArguments, couldContainTypeParameters) ||
+                objectFlags & 16 && type.symbol && type.symbol.flags & (8192 | 2048 | 32) ||
+                objectFlags & 32 ||
+                type.flags & 196608 && couldUnionOrIntersectionContainTypeParameters(type));
         }
         function couldUnionOrIntersectionContainTypeParameters(type) {
             if (type.couldContainTypeParameters === undefined) {
@@ -25675,7 +26039,7 @@ var ts;
             return type.couldContainTypeParameters;
         }
         function isTypeParameterAtTopLevel(type, typeParameter) {
-            return type === typeParameter || type.flags & 1572864 && ts.forEach(type.types, function (t) { return isTypeParameterAtTopLevel(t, typeParameter); });
+            return type === typeParameter || type.flags & 196608 && ts.forEach(type.types, function (t) { return isTypeParameterAtTopLevel(t, typeParameter); });
         }
         function inferTypes(context, originalSource, originalTarget) {
             var typeParameters = context.signature.typeParameters;
@@ -25697,8 +26061,16 @@ var ts;
                 if (!couldContainTypeParameters(target)) {
                     return;
                 }
-                if (source.flags & 524288 && target.flags & 524288 && !(source.flags & 16 && target.flags & 16) ||
-                    source.flags & 1048576 && target.flags & 1048576) {
+                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]);
+                    }
+                    return;
+                }
+                if (source.flags & 65536 && target.flags & 65536 && !(source.flags & 16 && target.flags & 16) ||
+                    source.flags & 131072 && target.flags & 131072) {
                     if (source === target) {
                         for (var _i = 0, _a = source.types; _i < _a.length; _i++) {
                             var t = _a[_i];
@@ -25726,7 +26098,7 @@ var ts;
                     }
                 }
                 if (target.flags & 16384) {
-                    if (source.flags & 134217728) {
+                    if (source.flags & 8388608) {
                         return;
                     }
                     for (var i = 0; i < typeParameters.length; i++) {
@@ -25747,7 +26119,7 @@ var ts;
                         }
                     }
                 }
-                else if (source.flags & 131072 && target.flags & 131072 && source.target === target.target) {
+                else if (getObjectFlags(source) & 4 && getObjectFlags(target) & 4 && source.target === target.target) {
                     var sourceTypes = source.typeArguments || emptyArray;
                     var targetTypes = target.typeArguments || emptyArray;
                     var count = sourceTypes.length < targetTypes.length ? sourceTypes.length : targetTypes.length;
@@ -25755,7 +26127,7 @@ var ts;
                         inferFromTypes(sourceTypes[i], targetTypes[i]);
                     }
                 }
-                else if (target.flags & 1572864) {
+                else if (target.flags & 196608) {
                     var targetTypes = target.types;
                     var typeParameterCount = 0;
                     var typeParameter = void 0;
@@ -25775,7 +26147,7 @@ var ts;
                         inferiority--;
                     }
                 }
-                else if (source.flags & 1572864) {
+                else if (source.flags & 196608) {
                     var sourceTypes = source.types;
                     for (var _e = 0, sourceTypes_3 = sourceTypes; _e < sourceTypes_3.length; _e++) {
                         var sourceType = sourceTypes_3[_e];
@@ -25783,8 +26155,21 @@ var ts;
                     }
                 }
                 else {
+                    if (getObjectFlags(target) & 32) {
+                        var constraintType = getConstraintTypeFromMappedType(target);
+                        if (getObjectFlags(source) & 32) {
+                            inferFromTypes(getConstraintTypeFromMappedType(source), constraintType);
+                            inferFromTypes(getTemplateTypeFromMappedType(source), getTemplateTypeFromMappedType(target));
+                            return;
+                        }
+                        if (constraintType.flags & 16384) {
+                            inferFromTypes(getIndexType(source), constraintType);
+                            inferFromTypes(getUnionType(ts.map(getPropertiesOfType(source), getTypeOfSymbol)), getTemplateTypeFromMappedType(target));
+                            return;
+                        }
+                    }
                     source = getApparentType(source);
-                    if (source.flags & 2588672) {
+                    if (source.flags & 32768) {
                         if (isInProcess(source, target)) {
                             return;
                         }
@@ -25813,8 +26198,8 @@ var ts;
             }
             function inferFromProperties(source, target) {
                 var properties = getPropertiesOfObjectType(target);
-                for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
-                    var targetProp = properties_3[_i];
+                for (var _i = 0, properties_4 = properties; _i < properties_4.length; _i++) {
+                    var targetProp = properties_4[_i];
                     var sourceProp = getPropertyOfObjectType(source, targetProp.name);
                     if (sourceProp) {
                         inferFromTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp));
@@ -25880,7 +26265,7 @@ var ts;
                     reducedTypes.push(t);
                 }
             }
-            return type.flags & 524288 ? getUnionType(reducedTypes) : getIntersectionType(reducedTypes);
+            return type.flags & 65536 ? getUnionType(reducedTypes) : getIntersectionType(reducedTypes);
         }
         function getInferenceCandidates(context, index) {
             var inferences = context.inferences[index];
@@ -25888,7 +26273,7 @@ var ts;
         }
         function hasPrimitiveConstraint(type) {
             var constraint = getConstraintOfTypeParameter(type);
-            return constraint && maybeTypeOfKind(constraint, 8190);
+            return constraint && maybeTypeOfKind(constraint, 8190 | 262144);
         }
         function getInferredType(context, index) {
             var inferredType = context.inferredTypes[index];
@@ -25941,10 +26326,10 @@ var ts;
         function isInTypeQuery(node) {
             while (node) {
                 switch (node.kind) {
-                    case 159:
+                    case 160:
                         return true;
                     case 70:
-                    case 140:
+                    case 141:
                         node = node.parent;
                         continue;
                     default:
@@ -25961,7 +26346,7 @@ var ts;
             if (node.kind === 98) {
                 return "0";
             }
-            if (node.kind === 173) {
+            if (node.kind === 177) {
                 var key = getFlowCacheKey(node.expression);
                 return key && key + "." + node.name.text;
             }
@@ -25972,7 +26357,7 @@ var ts;
                 case 70:
                 case 98:
                     return node;
-                case 173:
+                case 177:
                     return getLeftmostIdentifierOrThis(node.expression);
             }
             return undefined;
@@ -25981,19 +26366,19 @@ var ts;
             switch (source.kind) {
                 case 70:
                     return target.kind === 70 && getResolvedSymbol(source) === getResolvedSymbol(target) ||
-                        (target.kind === 219 || target.kind === 170) &&
+                        (target.kind === 223 || target.kind === 174) &&
                             getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(source)) === getSymbolOfNode(target);
                 case 98:
                     return target.kind === 98;
-                case 173:
-                    return target.kind === 173 &&
+                case 177:
+                    return target.kind === 177 &&
                         source.name.text === target.name.text &&
                         isMatchingReference(source.expression, target.expression);
             }
             return false;
         }
         function containsMatchingReference(source, target) {
-            while (source.kind === 173) {
+            while (source.kind === 177) {
                 source = source.expression;
                 if (isMatchingReference(source, target)) {
                     return true;
@@ -26002,7 +26387,7 @@ var ts;
             return false;
         }
         function containsMatchingReferenceDiscriminant(source, target) {
-            return target.kind === 173 &&
+            return target.kind === 177 &&
                 containsMatchingReference(source, target.expression) &&
                 isDiscriminantProperty(getDeclaredTypeOfReference(target.expression), target.name.text);
         }
@@ -26010,14 +26395,14 @@ var ts;
             if (expr.kind === 70) {
                 return getTypeOfSymbol(getResolvedSymbol(expr));
             }
-            if (expr.kind === 173) {
+            if (expr.kind === 177) {
                 var type = getDeclaredTypeOfReference(expr.expression);
                 return type && getTypeOfPropertyOfType(type, expr.name.text);
             }
             return undefined;
         }
         function isDiscriminantProperty(type, name) {
-            if (type && type.flags & 524288) {
+            if (type && type.flags & 65536) {
                 var prop = getUnionOrIntersectionProperty(type, name);
                 if (prop && prop.flags & 268435456) {
                     if (prop.isDiscriminantProperty === undefined) {
@@ -26040,7 +26425,7 @@ var ts;
                     }
                 }
             }
-            if (callExpression.expression.kind === 173 &&
+            if (callExpression.expression.kind === 177 &&
                 isOrContainsMatchingReference(reference, callExpression.expression.expression)) {
                 return true;
             }
@@ -26054,7 +26439,7 @@ var ts;
             return flow.id;
         }
         function typeMaybeAssignableTo(source, target) {
-            if (!(source.flags & 524288)) {
+            if (!(source.flags & 65536)) {
                 return isTypeAssignableTo(source, target);
             }
             for (var _i = 0, _a = source.types; _i < _a.length; _i++) {
@@ -26117,7 +26502,7 @@ var ts;
                     type === falseType ? 3030404 : 1981828 :
                     type === falseType ? 3145092 : 4193668;
             }
-            if (flags & 2588672) {
+            if (flags & 32768) {
                 return isFunctionObjectType(type) ?
                     strictNullChecks ? 6164448 : 8376288 :
                     strictNullChecks ? 6166480 : 8378320;
@@ -26135,7 +26520,7 @@ var ts;
                 var constraint = getConstraintOfTypeParameter(type);
                 return getTypeFacts(constraint || emptyObjectType);
             }
-            if (flags & 1572864) {
+            if (flags & 196608) {
                 return getTypeFactsOfTypes(type.types);
             }
             return 8388607;
@@ -26151,7 +26536,7 @@ var ts;
             return type;
         }
         function getTypeOfDestructuredProperty(type, name) {
-            var text = getTextOfPropertyName(name);
+            var text = ts.getTextOfPropertyName(name);
             return getTypeOfPropertyOfType(type, text) ||
                 isNumericLiteralName(text) && getIndexTypeOfType(type, 1) ||
                 getIndexTypeOfType(type, 0) ||
@@ -26162,19 +26547,19 @@ var ts;
                 checkIteratedTypeOrElementType(type, undefined, false) ||
                 unknownType;
         }
-        function getTypeOfDestructuredSpreadElement(type) {
+        function getTypeOfDestructuredSpreadExpression(type) {
             return createArrayType(checkIteratedTypeOrElementType(type, undefined, false) || unknownType);
         }
         function getAssignedTypeOfBinaryExpression(node) {
-            return node.parent.kind === 171 || node.parent.kind === 253 ?
+            return node.parent.kind === 175 || node.parent.kind === 257 ?
                 getTypeWithDefault(getAssignedType(node), node.right) :
                 checkExpression(node.right);
         }
         function getAssignedTypeOfArrayLiteralElement(node, element) {
             return getTypeOfDestructuredArrayElement(getAssignedType(node), ts.indexOf(node.elements, element));
         }
-        function getAssignedTypeOfSpreadElement(node) {
-            return getTypeOfDestructuredSpreadElement(getAssignedType(node.parent));
+        function getAssignedTypeOfSpreadExpression(node) {
+            return getTypeOfDestructuredSpreadExpression(getAssignedType(node.parent));
         }
         function getAssignedTypeOfPropertyAssignment(node) {
             return getTypeOfDestructuredProperty(getAssignedType(node.parent), node.name);
@@ -26185,21 +26570,21 @@ var ts;
         function getAssignedType(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 208:
+                case 212:
                     return stringType;
-                case 209:
+                case 213:
                     return checkRightHandSideOfForOf(parent.expression) || unknownType;
-                case 188:
-                    return getAssignedTypeOfBinaryExpression(parent);
-                case 182:
-                    return undefinedType;
-                case 171:
-                    return getAssignedTypeOfArrayLiteralElement(parent, node);
                 case 192:
-                    return getAssignedTypeOfSpreadElement(parent);
-                case 253:
+                    return getAssignedTypeOfBinaryExpression(parent);
+                case 186:
+                    return undefinedType;
+                case 175:
+                    return getAssignedTypeOfArrayLiteralElement(parent, node);
+                case 196:
+                    return getAssignedTypeOfSpreadExpression(parent);
+                case 257:
                     return getAssignedTypeOfPropertyAssignment(parent);
-                case 254:
+                case 258:
                     return getAssignedTypeOfShorthandPropertyAssignment(parent);
             }
             return unknownType;
@@ -26207,11 +26592,11 @@ var ts;
         function getInitialTypeOfBindingElement(node) {
             var pattern = node.parent;
             var parentType = getInitialType(pattern.parent);
-            var type = pattern.kind === 168 ?
+            var type = pattern.kind === 172 ?
                 getTypeOfDestructuredProperty(parentType, node.propertyName || node.name) :
                 !node.dotDotDotToken ?
                     getTypeOfDestructuredArrayElement(parentType, ts.indexOf(pattern.elements, node)) :
-                    getTypeOfDestructuredSpreadElement(parentType);
+                    getTypeOfDestructuredSpreadExpression(parentType);
             return getTypeWithDefault(type, node.initializer);
         }
         function getTypeOfInitializer(node) {
@@ -26222,35 +26607,35 @@ var ts;
             if (node.initializer) {
                 return getTypeOfInitializer(node.initializer);
             }
-            if (node.parent.parent.kind === 208) {
+            if (node.parent.parent.kind === 212) {
                 return stringType;
             }
-            if (node.parent.parent.kind === 209) {
+            if (node.parent.parent.kind === 213) {
                 return checkRightHandSideOfForOf(node.parent.parent.expression) || unknownType;
             }
             return unknownType;
         }
         function getInitialType(node) {
-            return node.kind === 219 ?
+            return node.kind === 223 ?
                 getInitialTypeOfVariableDeclaration(node) :
                 getInitialTypeOfBindingElement(node);
         }
         function getInitialOrAssignedType(node) {
-            return node.kind === 219 || node.kind === 170 ?
+            return node.kind === 223 || node.kind === 174 ?
                 getInitialType(node) :
                 getAssignedType(node);
         }
         function isEmptyArrayAssignment(node) {
-            return node.kind === 219 && node.initializer &&
+            return node.kind === 223 && node.initializer &&
                 isEmptyArrayLiteral(node.initializer) ||
-                node.kind !== 170 && node.parent.kind === 188 &&
+                node.kind !== 174 && node.parent.kind === 192 &&
                     isEmptyArrayLiteral(node.parent.right);
         }
         function getReferenceCandidate(node) {
             switch (node.kind) {
-                case 179:
+                case 183:
                     return getReferenceCandidate(node.expression);
-                case 188:
+                case 192:
                     switch (node.operatorToken.kind) {
                         case 57:
                             return getReferenceCandidate(node.left);
@@ -26262,13 +26647,13 @@ var ts;
         }
         function getReferenceRoot(node) {
             var parent = node.parent;
-            return parent.kind === 179 ||
-                parent.kind === 188 && parent.operatorToken.kind === 57 && parent.left === node ||
-                parent.kind === 188 && parent.operatorToken.kind === 25 && parent.right === node ?
+            return parent.kind === 183 ||
+                parent.kind === 192 && parent.operatorToken.kind === 57 && parent.left === node ||
+                parent.kind === 192 && parent.operatorToken.kind === 25 && parent.right === node ?
                 getReferenceRoot(parent) : node;
         }
         function getTypeOfSwitchClause(clause) {
-            if (clause.kind === 249) {
+            if (clause.kind === 253) {
                 var caseType = getRegularTypeOfLiteralType(checkExpression(clause.expression));
                 return isUnitType(caseType) ? caseType : undefined;
             }
@@ -26283,13 +26668,13 @@ var ts;
             return links.switchTypes;
         }
         function eachTypeContainedIn(source, types) {
-            return source.flags & 524288 ? !ts.forEach(source.types, function (t) { return !ts.contains(types, t); }) : ts.contains(types, source);
+            return source.flags & 65536 ? !ts.forEach(source.types, function (t) { return !ts.contains(types, t); }) : ts.contains(types, source);
         }
         function isTypeSubsetOf(source, target) {
-            return source === target || target.flags & 524288 && isTypeSubsetOfUnion(source, target);
+            return source === target || target.flags & 65536 && isTypeSubsetOfUnion(source, target);
         }
         function isTypeSubsetOfUnion(source, target) {
-            if (source.flags & 524288) {
+            if (source.flags & 65536) {
                 for (var _i = 0, _a = source.types; _i < _a.length; _i++) {
                     var t = _a[_i];
                     if (!containsType(target.types, t)) {
@@ -26303,8 +26688,11 @@ var ts;
             }
             return containsType(target.types, source);
         }
+        function forEachType(type, f) {
+            return type.flags & 65536 ? ts.forEach(type.types, f) : f(type);
+        }
         function filterType(type, f) {
-            if (type.flags & 524288) {
+            if (type.flags & 65536) {
                 var types = type.types;
                 var filtered = ts.filter(types, f);
                 return filtered === types ? type : getUnionTypeFromSortedList(filtered);
@@ -26312,7 +26700,7 @@ var ts;
             return f(type) ? type : neverType;
         }
         function mapType(type, f) {
-            return type.flags & 524288 ? getUnionType(ts.map(type.types, f)) : f(type);
+            return type.flags & 65536 ? getUnionType(ts.map(type.types, f)) : f(type);
         }
         function extractTypesOfKind(type, kind) {
             return filterType(type, function (t) { return (t.flags & kind) !== 0; });
@@ -26338,7 +26726,7 @@ var ts;
             return incomplete ? { flags: 0, type: type } : type;
         }
         function createEvolvingArrayType(elementType) {
-            var result = createObjectType(2097152);
+            var result = createObjectType(256);
             result.elementType = elementType;
             return result;
         }
@@ -26349,13 +26737,10 @@ var ts;
             var elementType = getBaseTypeOfLiteralType(checkExpression(node));
             return isTypeSubsetOf(elementType, evolvingArrayType.elementType) ? evolvingArrayType : getEvolvingArrayType(getUnionType([evolvingArrayType.elementType, elementType]));
         }
-        function isEvolvingArrayType(type) {
-            return !!(type.flags & 2097152 && type.elementType);
-        }
         function createFinalArrayType(elementType) {
             return elementType.flags & 8192 ?
                 autoArrayType :
-                createArrayType(elementType.flags & 524288 ?
+                createArrayType(elementType.flags & 65536 ?
                     getUnionType(elementType.types, true) :
                     elementType);
         }
@@ -26363,17 +26748,17 @@ var ts;
             return evolvingArrayType.finalArrayType || (evolvingArrayType.finalArrayType = createFinalArrayType(evolvingArrayType.elementType));
         }
         function finalizeEvolvingArrayType(type) {
-            return isEvolvingArrayType(type) ? getFinalArrayType(type) : type;
+            return getObjectFlags(type) & 256 ? getFinalArrayType(type) : type;
         }
         function getElementTypeOfEvolvingArrayType(type) {
-            return isEvolvingArrayType(type) ? type.elementType : neverType;
+            return getObjectFlags(type) & 256 ? type.elementType : neverType;
         }
         function isEvolvingArrayTypeList(types) {
             var hasEvolvingArrayType = false;
             for (var _i = 0, types_12 = types; _i < types_12.length; _i++) {
                 var t = types_12[_i];
                 if (!(t.flags & 8192)) {
-                    if (!isEvolvingArrayType(t)) {
+                    if (!(getObjectFlags(t) & 256)) {
                         return false;
                     }
                     hasEvolvingArrayType = true;
@@ -26389,20 +26774,40 @@ var ts;
         function isEvolvingArrayOperationTarget(node) {
             var root = getReferenceRoot(node);
             var parent = root.parent;
-            var isLengthPushOrUnshift = parent.kind === 173 && (parent.name.text === "length" ||
-                parent.parent.kind === 175 && ts.isPushOrUnshiftIdentifier(parent.name));
-            var isElementAssignment = parent.kind === 174 &&
+            var isLengthPushOrUnshift = parent.kind === 177 && (parent.name.text === "length" ||
+                parent.parent.kind === 179 && ts.isPushOrUnshiftIdentifier(parent.name));
+            var isElementAssignment = parent.kind === 178 &&
                 parent.expression === root &&
-                parent.parent.kind === 188 &&
+                parent.parent.kind === 192 &&
                 parent.parent.operatorToken.kind === 57 &&
                 parent.parent.left === parent &&
                 !ts.isAssignmentTarget(parent.parent) &&
                 isTypeAnyOrAllConstituentTypesHaveKind(checkExpression(parent.argumentExpression), 340 | 2048);
             return isLengthPushOrUnshift || isElementAssignment;
         }
+        function maybeTypePredicateCall(node) {
+            var links = getNodeLinks(node);
+            if (links.maybeTypePredicate === undefined) {
+                links.maybeTypePredicate = getMaybeTypePredicate(node);
+            }
+            return links.maybeTypePredicate;
+        }
+        function getMaybeTypePredicate(node) {
+            if (node.expression.kind !== 96) {
+                var funcType = checkNonNullExpression(node.expression);
+                if (funcType !== silentNeverType) {
+                    var apparentType = getApparentType(funcType);
+                    if (apparentType !== unknownType) {
+                        var callSignatures = getSignaturesOfType(apparentType, 0);
+                        return !!ts.forEach(callSignatures, function (sig) { return sig.typePredicate; });
+                    }
+                }
+            }
+            return false;
+        }
         function getFlowTypeOfReference(reference, declaredType, assumeInitialized, flowContainer) {
             var key;
-            if (!reference.flowNode || assumeInitialized && !(declaredType.flags & 4178943)) {
+            if (!reference.flowNode || assumeInitialized && !(declaredType.flags & 1033215)) {
                 return declaredType;
             }
             var initialType = assumeInitialized ? declaredType :
@@ -26411,8 +26816,8 @@ var ts;
             var visitedFlowStart = visitedFlowCount;
             var evolvedType = getTypeFromFlowType(getTypeAtFlowNode(reference.flowNode));
             visitedFlowCount = visitedFlowStart;
-            var resultType = isEvolvingArrayType(evolvedType) && isEvolvingArrayOperationTarget(reference) ? anyArrayType : finalizeEvolvingArrayType(evolvedType);
-            if (reference.parent.kind === 197 && getTypeWithFacts(resultType, 524288).flags & 8192) {
+            var resultType = getObjectFlags(evolvedType) & 256 && isEvolvingArrayOperationTarget(reference) ? anyArrayType : finalizeEvolvingArrayType(evolvedType);
+            if (reference.parent.kind === 201 && getTypeWithFacts(resultType, 524288).flags & 8192) {
                 return declaredType;
             }
             return resultType;
@@ -26457,7 +26862,7 @@ var ts;
                     }
                     else if (flow.flags & 2) {
                         var container = flow.container;
-                        if (container && container !== flowContainer && reference.kind !== 173) {
+                        if (container && container !== flowContainer && reference.kind !== 177) {
                             flow = container.flowNode;
                             continue;
                         }
@@ -26477,7 +26882,7 @@ var ts;
             function getTypeAtFlowAssignment(flow) {
                 var node = flow.node;
                 if (isMatchingReference(reference, node)) {
-                    if (node.parent.kind === 186 || node.parent.kind === 187) {
+                    if (ts.getAssignmentTargetKind(node) === 2) {
                         var flowType = getTypeAtFlowNode(flow.antecedent);
                         return createFlowType(getBaseTypeOfLiteralType(getTypeFromFlowType(flowType)), isIncomplete(flowType));
                     }
@@ -26488,7 +26893,7 @@ var ts;
                         var assignedType = getBaseTypeOfLiteralType(getInitialOrAssignedType(node));
                         return isTypeAssignableTo(assignedType, declaredType) ? assignedType : anyArrayType;
                     }
-                    if (declaredType.flags & 524288) {
+                    if (declaredType.flags & 65536) {
                         return getAssignmentReducedType(declaredType, getInitialOrAssignedType(node));
                     }
                     return declaredType;
@@ -26500,15 +26905,15 @@ var ts;
             }
             function getTypeAtFlowArrayMutation(flow) {
                 var node = flow.node;
-                var expr = node.kind === 175 ?
+                var expr = node.kind === 179 ?
                     node.expression.expression :
                     node.left.expression;
                 if (isMatchingReference(reference, getReferenceCandidate(expr))) {
                     var flowType = getTypeAtFlowNode(flow.antecedent);
                     var type = getTypeFromFlowType(flowType);
-                    if (isEvolvingArrayType(type)) {
+                    if (getObjectFlags(type) & 256) {
                         var evolvedType_1 = type;
-                        if (node.kind === 175) {
+                        if (node.kind === 179) {
                             for (var _i = 0, _a = node.arguments; _i < _a.length; _i++) {
                                 var arg = _a[_i];
                                 evolvedType_1 = addEvolvingArrayElementType(evolvedType_1, arg);
@@ -26626,8 +27031,8 @@ var ts;
                 return cache[key] = result;
             }
             function isMatchingReferenceDiscriminant(expr) {
-                return expr.kind === 173 &&
-                    declaredType.flags & 524288 &&
+                return expr.kind === 177 &&
+                    declaredType.flags & 65536 &&
                     isMatchingReference(reference, expr.expression) &&
                     isDiscriminantProperty(declaredType, expr.name.text);
             }
@@ -26660,10 +27065,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 === 183 && right_1.kind === 9) {
+                        if (left_1.kind === 187 && right_1.kind === 9) {
                             return narrowTypeByTypeof(type, left_1, operator_1, right_1, assumeTrue);
                         }
-                        if (right_1.kind === 183 && left_1.kind === 9) {
+                        if (right_1.kind === 187 && left_1.kind === 9) {
                             return narrowTypeByTypeof(type, right_1, operator_1, left_1, assumeTrue);
                         }
                         if (isMatchingReference(reference, left_1)) {
@@ -26709,7 +27114,7 @@ var ts;
                             assumeTrue ? 16384 : 131072;
                     return getTypeWithFacts(type, facts);
                 }
-                if (type.flags & 2589185) {
+                if (type.flags & 33281) {
                     return type;
                 }
                 if (assumeTrue) {
@@ -26733,7 +27138,7 @@ var ts;
                 if (operator === 32 || operator === 34) {
                     assumeTrue = !assumeTrue;
                 }
-                if (assumeTrue && !(type.flags & 524288)) {
+                if (assumeTrue && !(type.flags & 65536)) {
                     var targetType = typeofTypesByName[literal.text];
                     if (targetType && isTypeSubtypeOf(targetType, type)) {
                         return targetType;
@@ -26785,10 +27190,10 @@ var ts;
                 }
                 if (!targetType) {
                     var constructSignatures = void 0;
-                    if (rightType.flags & 65536) {
+                    if (getObjectFlags(rightType) & 2) {
                         constructSignatures = resolveDeclaredMembers(rightType).declaredConstructSignatures;
                     }
-                    else if (rightType.flags & 2097152) {
+                    else if (getObjectFlags(rightType) & 16) {
                         constructSignatures = getSignaturesOfType(rightType, 1);
                     }
                     if (constructSignatures && constructSignatures.length) {
@@ -26804,7 +27209,7 @@ var ts;
                 if (!assumeTrue) {
                     return filterType(type, function (t) { return !isTypeInstanceOf(t, candidate); });
                 }
-                if (type.flags & 524288) {
+                if (type.flags & 65536) {
                     var assignableType = filterType(type, function (t) { return isTypeInstanceOf(t, candidate); });
                     if (!(assignableType.flags & 8192)) {
                         return assignableType;
@@ -26817,7 +27222,7 @@ var ts;
                             getIntersectionType([type, candidate]);
             }
             function narrowTypeByTypePredicate(type, callExpression, assumeTrue) {
-                if (!hasMatchingArgument(callExpression, reference)) {
+                if (!hasMatchingArgument(callExpression, reference) || !maybeTypePredicateCall(callExpression)) {
                     return type;
                 }
                 var signature = getResolvedSignature(callExpression);
@@ -26840,10 +27245,10 @@ var ts;
                     }
                 }
                 else {
-                    var invokedExpression = skipParenthesizedNodes(callExpression.expression);
-                    if (invokedExpression.kind === 174 || invokedExpression.kind === 173) {
+                    var invokedExpression = ts.skipParentheses(callExpression.expression);
+                    if (invokedExpression.kind === 178 || invokedExpression.kind === 177) {
                         var accessExpression = invokedExpression;
-                        var possibleReference = skipParenthesizedNodes(accessExpression.expression);
+                        var possibleReference = ts.skipParentheses(accessExpression.expression);
                         if (isMatchingReference(reference, possibleReference)) {
                             return getNarrowedType(type, predicate.type, assumeTrue);
                         }
@@ -26858,15 +27263,15 @@ var ts;
                 switch (expr.kind) {
                     case 70:
                     case 98:
-                    case 173:
+                    case 177:
                         return narrowTypeByTruthiness(type, expr, assumeTrue);
-                    case 175:
-                        return narrowTypeByTypePredicate(type, expr, assumeTrue);
                     case 179:
+                        return narrowTypeByTypePredicate(type, expr, assumeTrue);
+                    case 183:
                         return narrowType(type, expr.expression, assumeTrue);
-                    case 188:
+                    case 192:
                         return narrowTypeByBinaryExpression(type, expr, assumeTrue);
-                    case 186:
+                    case 190:
                         if (expr.operator === 50) {
                             return narrowType(type, expr.operand, !assumeTrue);
                         }
@@ -26889,19 +27294,13 @@ var ts;
             }
             return getTypeOfSymbol(symbol);
         }
-        function skipParenthesizedNodes(expression) {
-            while (expression.kind === 179) {
-                expression = expression.expression;
-            }
-            return expression;
-        }
         function getControlFlowContainer(node) {
             while (true) {
                 node = node.parent;
                 if (ts.isFunctionLike(node) && !ts.getImmediatelyInvokedFunctionExpression(node) ||
-                    node.kind === 227 ||
-                    node.kind === 256 ||
-                    node.kind === 146) {
+                    node.kind === 231 ||
+                    node.kind === 261 ||
+                    node.kind === 147) {
                     return node;
                 }
             }
@@ -26932,7 +27331,7 @@ var ts;
             if (node.kind === 70) {
                 if (ts.isAssignmentTarget(node)) {
                     var symbol = getResolvedSymbol(node);
-                    if (symbol.valueDeclaration && ts.getRootDeclaration(symbol.valueDeclaration).kind === 143) {
+                    if (symbol.valueDeclaration && ts.getRootDeclaration(symbol.valueDeclaration).kind === 144) {
                         symbol.isAssigned = true;
                     }
                 }
@@ -26946,19 +27345,23 @@ var ts;
         }
         function checkIdentifier(node) {
             var symbol = getResolvedSymbol(node);
+            if (symbol === unknownSymbol) {
+                return unknownType;
+            }
             if (symbol === argumentsSymbol) {
                 var container = ts.getContainingFunction(node);
                 if (languageVersion < 2) {
-                    if (container.kind === 181) {
+                    if (container.kind === 185) {
                         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)) {
                         error(node, ts.Diagnostics.The_arguments_object_cannot_be_referenced_in_an_async_function_or_method_in_ES3_and_ES5_Consider_using_a_standard_function_or_method);
                     }
                 }
-                if (node.flags & 262144) {
+                if (node.flags & 524288) {
                     getNodeLinks(container).flags |= 8192;
                 }
+                return getTypeOfSymbol(symbol);
             }
             if (symbol.flags & 8388608 && !isInTypeQuery(node) && !isConstEnumOrConstEnumOnlyModule(resolveAlias(symbol))) {
                 markAliasSymbolAsReferenced(symbol);
@@ -26967,7 +27370,7 @@ var ts;
             if (localOrExportSymbol.flags & 32) {
                 var declaration_1 = localOrExportSymbol.valueDeclaration;
                 if (languageVersion === 2
-                    && declaration_1.kind === 222
+                    && declaration_1.kind === 226
                     && ts.nodeIsDecorated(declaration_1)) {
                     var container = ts.getContainingClass(node);
                     while (container !== undefined) {
@@ -26979,11 +27382,11 @@ var ts;
                         container = ts.getContainingClass(container);
                     }
                 }
-                else if (declaration_1.kind === 193) {
+                else if (declaration_1.kind === 197) {
                     var container = ts.getThisContainer(node, false);
                     while (container !== undefined) {
                         if (container.parent === declaration_1) {
-                            if (container.kind === 146 && ts.hasModifier(container, 32)) {
+                            if (container.kind === 147 && ts.hasModifier(container, 32)) {
                                 getNodeLinks(declaration_1).flags |= 8388608;
                                 getNodeLinks(node).flags |= 16777216;
                             }
@@ -26998,15 +27401,26 @@ var ts;
             checkNestedBlockScopedBinding(node, symbol);
             var type = getTypeOfSymbol(localOrExportSymbol);
             var declaration = localOrExportSymbol.valueDeclaration;
-            if (!(localOrExportSymbol.flags & 3) || ts.isAssignmentTarget(node) || !declaration) {
+            var assignmentKind = ts.getAssignmentTargetKind(node);
+            if (assignmentKind) {
+                if (!(localOrExportSymbol.flags & 3)) {
+                    error(node, ts.Diagnostics.Cannot_assign_to_0_because_it_is_not_a_variable, symbolToString(symbol));
+                    return unknownType;
+                }
+                if (isReadonlySymbol(localOrExportSymbol)) {
+                    error(node, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_constant_or_a_read_only_property, symbolToString(symbol));
+                    return unknownType;
+                }
+            }
+            if (!(localOrExportSymbol.flags & 3) || assignmentKind === 1 || !declaration) {
                 return type;
             }
-            var isParameter = ts.getRootDeclaration(declaration).kind === 143;
+            var isParameter = ts.getRootDeclaration(declaration).kind === 144;
             var declarationContainer = getControlFlowContainer(declaration);
             var flowContainer = getControlFlowContainer(node);
             var isOuterVariable = flowContainer !== declarationContainer;
-            while (flowContainer !== declarationContainer && (flowContainer.kind === 180 ||
-                flowContainer.kind === 181 || ts.isObjectLiteralOrClassExpressionMethod(flowContainer)) &&
+            while (flowContainer !== declarationContainer && (flowContainer.kind === 184 ||
+                flowContainer.kind === 185 || ts.isObjectLiteralOrClassExpressionMethod(flowContainer)) &&
                 (isConstVariable(localOrExportSymbol) || isParameter && !isParameterAssigned(localOrExportSymbol))) {
                 flowContainer = getControlFlowContainer(flowContainer);
             }
@@ -27027,7 +27441,7 @@ var ts;
                 error(node, ts.Diagnostics.Variable_0_is_used_before_being_assigned, symbolToString(symbol));
                 return type;
             }
-            return flowType;
+            return assignmentKind ? getBaseTypeOfLiteralType(flowType) : flowType;
         }
         function isInsideFunction(node, threshold) {
             var current = node;
@@ -27042,7 +27456,7 @@ var ts;
         function checkNestedBlockScopedBinding(node, symbol) {
             if (languageVersion >= 2 ||
                 (symbol.flags & (2 | 32)) === 0 ||
-                symbol.valueDeclaration.parent.kind === 252) {
+                symbol.valueDeclaration.parent.kind === 256) {
                 return;
             }
             var container = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
@@ -27060,8 +27474,8 @@ var ts;
                 if (usedInFunction) {
                     getNodeLinks(current).flags |= 65536;
                 }
-                if (container.kind === 207 &&
-                    ts.getAncestor(symbol.valueDeclaration, 220).parent === container &&
+                if (container.kind === 211 &&
+                    ts.getAncestor(symbol.valueDeclaration, 224).parent === container &&
                     isAssignedInBodyOfForStatement(node, container)) {
                     getNodeLinks(symbol.valueDeclaration).flags |= 2097152;
                 }
@@ -27073,14 +27487,14 @@ var ts;
         }
         function isAssignedInBodyOfForStatement(node, container) {
             var current = node;
-            while (current.parent.kind === 179) {
+            while (current.parent.kind === 183) {
                 current = current.parent;
             }
             var isAssigned = false;
             if (ts.isAssignmentTarget(current)) {
                 isAssigned = true;
             }
-            else if ((current.parent.kind === 186 || current.parent.kind === 187)) {
+            else if ((current.parent.kind === 190 || current.parent.kind === 191)) {
                 var expr = current.parent;
                 isAssigned = expr.operator === 42 || expr.operator === 43;
             }
@@ -27099,7 +27513,7 @@ var ts;
         }
         function captureLexicalThis(node, container) {
             getNodeLinks(node).flags |= 2;
-            if (container.kind === 146 || container.kind === 149) {
+            if (container.kind === 147 || container.kind === 150) {
                 var classNode = container.parent;
                 getNodeLinks(classNode).flags |= 4;
             }
@@ -27133,7 +27547,7 @@ var ts;
         function checkThisExpression(node) {
             var container = ts.getThisContainer(node, true);
             var needToCaptureLexicalThis = false;
-            if (container.kind === 149) {
+            if (container.kind === 150) {
                 var containingClassDecl = container.parent;
                 var baseTypeNode = ts.getClassExtendsHeritageClauseElement(containingClassDecl);
                 if (baseTypeNode && !classDeclarationExtendsNull(containingClassDecl)) {
@@ -27143,29 +27557,29 @@ var ts;
                     }
                 }
             }
-            if (container.kind === 181) {
+            if (container.kind === 185) {
                 container = ts.getThisContainer(container, false);
                 needToCaptureLexicalThis = (languageVersion < 2);
             }
             switch (container.kind) {
-                case 226:
+                case 230:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_module_or_namespace_body);
                     break;
-                case 225:
+                case 229:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_current_location);
                     break;
-                case 149:
+                case 150:
                     if (isInConstructorArgumentInitializer(node, container)) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_constructor_arguments);
                     }
                     break;
+                case 147:
                 case 146:
-                case 145:
                     if (ts.getModifierFlags(container) & 32) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_static_property_initializer);
                     }
                     break;
-                case 141:
+                case 142:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_computed_property_name);
                     break;
             }
@@ -27174,7 +27588,7 @@ var ts;
             }
             if (ts.isFunctionLike(container) &&
                 (!isInParameterInitializerBeforeContainingFunction(node) || ts.getThisParameter(container))) {
-                if (container.kind === 180 &&
+                if (container.kind === 184 &&
                     ts.isInJavaScriptFile(container.parent) &&
                     ts.getSpecialPropertyAssignmentKind(container.parent) === 3) {
                     var className = container.parent
@@ -27209,27 +27623,27 @@ var ts;
         }
         function getTypeForThisExpressionFromJSDoc(node) {
             var typeTag = ts.getJSDocTypeTag(node);
-            if (typeTag && typeTag.typeExpression && typeTag.typeExpression.type && typeTag.typeExpression.type.kind === 269) {
+            if (typeTag && typeTag.typeExpression && typeTag.typeExpression.type && typeTag.typeExpression.type.kind === 274) {
                 var jsDocFunctionType = typeTag.typeExpression.type;
-                if (jsDocFunctionType.parameters.length > 0 && jsDocFunctionType.parameters[0].type.kind === 272) {
+                if (jsDocFunctionType.parameters.length > 0 && jsDocFunctionType.parameters[0].type.kind === 277) {
                     return getTypeFromTypeNode(jsDocFunctionType.parameters[0].type);
                 }
             }
         }
         function isInConstructorArgumentInitializer(node, constructorDecl) {
             for (var n = node; n && n !== constructorDecl; n = n.parent) {
-                if (n.kind === 143) {
+                if (n.kind === 144) {
                     return true;
                 }
             }
             return false;
         }
         function checkSuperExpression(node) {
-            var isCallExpression = node.parent.kind === 175 && node.parent.expression === node;
+            var isCallExpression = node.parent.kind === 179 && node.parent.expression === node;
             var container = ts.getSuperContainer(node, true);
             var needToCaptureLexicalThis = false;
             if (!isCallExpression) {
-                while (container && container.kind === 181) {
+                while (container && container.kind === 185) {
                     container = ts.getSuperContainer(container, true);
                     needToCaptureLexicalThis = languageVersion < 2;
                 }
@@ -27238,16 +27652,16 @@ var ts;
             var nodeCheckFlag = 0;
             if (!canUseSuperExpression) {
                 var current = node;
-                while (current && current !== container && current.kind !== 141) {
+                while (current && current !== container && current.kind !== 142) {
                     current = current.parent;
                 }
-                if (current && current.kind === 141) {
+                if (current && current.kind === 142) {
                     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 === 172)) {
+                else if (!container || !container.parent || !(ts.isClassLike(container.parent) || container.parent.kind === 176)) {
                     error(node, ts.Diagnostics.super_can_only_be_referenced_in_members_of_derived_classes_or_object_literal_expressions);
                 }
                 else {
@@ -27262,7 +27676,7 @@ var ts;
                 nodeCheckFlag = 256;
             }
             getNodeLinks(node).flags |= nodeCheckFlag;
-            if (container.kind === 148 && ts.getModifierFlags(container) & 256) {
+            if (container.kind === 149 && ts.getModifierFlags(container) & 256) {
                 if (ts.isSuperProperty(node.parent) && ts.isAssignmentTarget(node.parent)) {
                     getNodeLinks(container).flags |= 4096;
                 }
@@ -27273,7 +27687,7 @@ var ts;
             if (needToCaptureLexicalThis) {
                 captureLexicalThis(node.parent, container);
             }
-            if (container.parent.kind === 172) {
+            if (container.parent.kind === 176) {
                 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 unknownType;
@@ -27291,7 +27705,7 @@ var ts;
                 }
                 return unknownType;
             }
-            if (container.kind === 149 && isInConstructorArgumentInitializer(node, container)) {
+            if (container.kind === 150 && isInConstructorArgumentInitializer(node, container)) {
                 error(node, ts.Diagnostics.super_cannot_be_referenced_in_constructor_arguments);
                 return unknownType;
             }
@@ -27303,24 +27717,24 @@ var ts;
                     return false;
                 }
                 if (isCallExpression) {
-                    return container.kind === 149;
+                    return container.kind === 150;
                 }
                 else {
-                    if (ts.isClassLike(container.parent) || container.parent.kind === 172) {
+                    if (ts.isClassLike(container.parent) || container.parent.kind === 176) {
                         if (ts.getModifierFlags(container) & 32) {
-                            return container.kind === 148 ||
-                                container.kind === 147 ||
-                                container.kind === 150 ||
-                                container.kind === 151;
+                            return container.kind === 149 ||
+                                container.kind === 148 ||
+                                container.kind === 151 ||
+                                container.kind === 152;
                         }
                         else {
-                            return container.kind === 148 ||
-                                container.kind === 147 ||
-                                container.kind === 150 ||
+                            return container.kind === 149 ||
+                                container.kind === 148 ||
                                 container.kind === 151 ||
+                                container.kind === 152 ||
+                                container.kind === 147 ||
                                 container.kind === 146 ||
-                                container.kind === 145 ||
-                                container.kind === 149;
+                                container.kind === 150;
                         }
                     }
                 }
@@ -27328,7 +27742,7 @@ var ts;
             }
         }
         function getContextualThisParameterType(func) {
-            if (isContextSensitiveFunctionOrObjectLiteralMethod(func) && func.kind !== 181) {
+            if (isContextSensitiveFunctionOrObjectLiteralMethod(func) && func.kind !== 185) {
                 var contextualSignature = getContextualSignature(func);
                 if (contextualSignature) {
                     var thisParameter = contextualSignature.thisParameter;
@@ -27384,7 +27798,7 @@ var ts;
                 if (declaration.type) {
                     return getTypeFromTypeNode(declaration.type);
                 }
-                if (declaration.kind === 143) {
+                if (declaration.kind === 144) {
                     var type = getContextuallyTypedParameterType(declaration);
                     if (type) {
                         return type;
@@ -27395,11 +27809,11 @@ var ts;
                 }
                 if (ts.isBindingPattern(declaration.parent)) {
                     var parentDeclaration = declaration.parent.parent;
-                    var name_15 = declaration.propertyName || declaration.name;
+                    var name_20 = declaration.propertyName || declaration.name;
                     if (ts.isVariableLike(parentDeclaration) &&
                         parentDeclaration.type &&
-                        !ts.isBindingPattern(name_15)) {
-                        var text = getTextOfPropertyName(name_15);
+                        !ts.isBindingPattern(name_20)) {
+                        var text = ts.getTextOfPropertyName(name_20);
                         if (text) {
                             return getTypeOfPropertyOfType(getTypeFromTypeNode(parentDeclaration.type), text);
                         }
@@ -27436,7 +27850,7 @@ var ts;
         }
         function isInParameterInitializerBeforeContainingFunction(node) {
             while (node.parent && !ts.isFunctionLike(node.parent)) {
-                if (node.parent.kind === 143 && node.parent.initializer === node) {
+                if (node.parent.kind === 144 && node.parent.initializer === node) {
                     return true;
                 }
                 node = node.parent;
@@ -27445,8 +27859,8 @@ var ts;
         }
         function getContextualReturnType(functionDecl) {
             if (functionDecl.type ||
-                functionDecl.kind === 149 ||
-                functionDecl.kind === 150 && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(functionDecl.symbol, 151))) {
+                functionDecl.kind === 150 ||
+                functionDecl.kind === 151 && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(functionDecl.symbol, 152))) {
                 return getReturnTypeOfSignature(getSignatureFromDeclaration(functionDecl));
             }
             var signature = getContextualSignatureForFunctionLikeDeclaration(functionDecl);
@@ -27465,7 +27879,7 @@ var ts;
             return undefined;
         }
         function getContextualTypeForSubstitutionExpression(template, substitutionExpression) {
-            if (template.parent.kind === 177) {
+            if (template.parent.kind === 181) {
                 return getContextualTypeForArgument(template.parent, substitutionExpression);
             }
             return undefined;
@@ -27496,7 +27910,7 @@ var ts;
             return undefined;
         }
         function applyToContextualType(type, mapper) {
-            if (!(type.flags & 524288)) {
+            if (!(type.flags & 65536)) {
                 return mapper(type);
             }
             var types = type.types;
@@ -27521,7 +27935,7 @@ var ts;
         }
         function getTypeOfPropertyOfContextualType(type, name) {
             return applyToContextualType(type, function (t) {
-                var prop = t.flags & 4161536 ? getPropertyOfType(t, name) : undefined;
+                var prop = t.flags & 229376 ? getPropertyOfType(t, name) : undefined;
                 return prop ? getTypeOfSymbol(prop) : undefined;
             });
         }
@@ -27529,7 +27943,7 @@ var ts;
             return applyToContextualType(type, function (t) { return getIndexTypeOfStructuredType(t, kind); });
         }
         function contextualTypeIsTupleLikeType(type) {
-            return !!(type.flags & 524288 ? ts.forEach(type.types, isTupleLikeType) : isTupleLikeType(type));
+            return !!(type.flags & 65536 ? ts.forEach(type.types, isTupleLikeType) : isTupleLikeType(type));
         }
         function getContextualTypeForObjectLiteralMethod(node) {
             ts.Debug.assert(ts.isObjectLiteralMethod(node));
@@ -27573,13 +27987,13 @@ var ts;
             var kind = attribute.kind;
             var jsxElement = attribute.parent;
             var attrsType = getJsxElementAttributesType(jsxElement);
-            if (attribute.kind === 246) {
+            if (attribute.kind === 250) {
                 if (!attrsType || isTypeAny(attrsType)) {
                     return undefined;
                 }
                 return getTypeOfPropertyOfType(attrsType, attribute.name.text);
             }
-            else if (attribute.kind === 247) {
+            else if (attribute.kind === 251) {
                 return attrsType;
             }
             ts.Debug.fail("Expected JsxAttribute or JsxSpreadAttribute, got ts.SyntaxKind[" + kind + "]");
@@ -27597,56 +28011,70 @@ var ts;
             }
             var parent = node.parent;
             switch (parent.kind) {
-                case 219:
-                case 143:
+                case 223:
+                case 144:
+                case 147:
                 case 146:
-                case 145:
-                case 170:
+                case 174:
                     return getContextualTypeForInitializerExpression(node);
-                case 181:
-                case 212:
+                case 185:
+                case 216:
                     return getContextualTypeForReturnExpression(node);
-                case 191:
+                case 195:
                     return getContextualTypeForYieldOperand(parent);
-                case 175:
-                case 176:
-                    return getContextualTypeForArgument(parent, node);
-                case 178:
-                case 196:
-                    return getTypeFromTypeNode(parent.type);
-                case 188:
-                    return getContextualTypeForBinaryOperand(node);
-                case 253:
-                case 254:
-                    return getContextualTypeForObjectLiteralElement(parent);
-                case 171:
-                    return getContextualTypeForElementExpression(node);
-                case 189:
-                    return getContextualTypeForConditionalOperand(node);
-                case 198:
-                    ts.Debug.assert(parent.parent.kind === 190);
-                    return getContextualTypeForSubstitutionExpression(parent.parent, node);
                 case 179:
+                case 180:
+                    return getContextualTypeForArgument(parent, node);
+                case 182:
+                case 200:
+                    return getTypeFromTypeNode(parent.type);
+                case 192:
+                    return getContextualTypeForBinaryOperand(node);
+                case 257:
+                case 258:
+                    return getContextualTypeForObjectLiteralElement(parent);
+                case 175:
+                    return getContextualTypeForElementExpression(node);
+                case 193:
+                    return getContextualTypeForConditionalOperand(node);
+                case 202:
+                    ts.Debug.assert(parent.parent.kind === 194);
+                    return getContextualTypeForSubstitutionExpression(parent.parent, node);
+                case 183:
                     return getContextualType(parent);
-                case 248:
+                case 252:
                     return getContextualType(parent);
-                case 246:
-                case 247:
+                case 250:
+                case 251:
                     return getContextualTypeForJsxAttribute(parent);
             }
             return undefined;
         }
-        function getNonGenericSignature(type) {
+        function getNonGenericSignature(type, node) {
             var signatures = getSignaturesOfStructuredType(type, 0);
             if (signatures.length === 1) {
                 var signature = signatures[0];
-                if (!signature.typeParameters) {
+                if (!signature.typeParameters && !isAritySmaller(signature, node)) {
                     return signature;
                 }
             }
         }
+        function isAritySmaller(signature, target) {
+            var targetParameterCount = 0;
+            for (; targetParameterCount < target.parameters.length; targetParameterCount++) {
+                var param = target.parameters[targetParameterCount];
+                if (param.initializer || param.questionToken || param.dotDotDotToken || isJSDocOptionalParameter(param)) {
+                    break;
+                }
+            }
+            if (target.parameters.length && ts.parameterIsThisKeyword(target.parameters[0])) {
+                targetParameterCount--;
+            }
+            var sourceLength = signature.hasRestParameter ? Number.MAX_VALUE : signature.parameters.length;
+            return sourceLength < targetParameterCount;
+        }
         function isFunctionExpressionOrArrowFunction(node) {
-            return node.kind === 180 || node.kind === 181;
+            return node.kind === 184 || node.kind === 185;
         }
         function getContextualSignatureForFunctionLikeDeclaration(node) {
             return isFunctionExpressionOrArrowFunction(node) || ts.isObjectLiteralMethod(node)
@@ -27659,19 +28087,19 @@ var ts;
                 getApparentTypeOfContextualType(node);
         }
         function getContextualSignature(node) {
-            ts.Debug.assert(node.kind !== 148 || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 149 || ts.isObjectLiteralMethod(node));
             var type = getContextualTypeForFunctionLikeDeclaration(node);
             if (!type) {
                 return undefined;
             }
-            if (!(type.flags & 524288)) {
-                return getNonGenericSignature(type);
+            if (!(type.flags & 65536)) {
+                return getNonGenericSignature(type, node);
             }
             var signatureList;
             var types = type.types;
             for (var _i = 0, types_14 = types; _i < types_14.length; _i++) {
                 var current = types_14[_i];
-                var signature = getNonGenericSignature(current);
+                var signature = getNonGenericSignature(current, node);
                 if (signature) {
                     if (!signatureList) {
                         signatureList = [signature];
@@ -27695,13 +28123,13 @@ var ts;
         function isInferentialContext(mapper) {
             return mapper && mapper.context;
         }
-        function checkSpreadElementExpression(node, contextualMapper) {
+        function checkSpreadExpression(node, contextualMapper) {
             var arrayOrIterableType = checkExpressionCached(node.expression, contextualMapper);
             return checkIteratedTypeOrElementType(arrayOrIterableType, node.expression, false);
         }
         function hasDefaultValue(node) {
-            return (node.kind === 170 && !!node.initializer) ||
-                (node.kind === 188 && node.operatorToken.kind === 57);
+            return (node.kind === 174 && !!node.initializer) ||
+                (node.kind === 192 && node.operatorToken.kind === 57);
         }
         function checkArrayLiteral(node, contextualMapper) {
             var elements = node.elements;
@@ -27710,7 +28138,7 @@ var ts;
             var inDestructuringPattern = ts.isAssignmentTarget(node);
             for (var _i = 0, elements_1 = elements; _i < elements_1.length; _i++) {
                 var e = elements_1[_i];
-                if (inDestructuringPattern && e.kind === 192) {
+                if (inDestructuringPattern && e.kind === 196) {
                     var restArrayType = checkExpression(e.expression, contextualMapper);
                     var restElementType = getIndexTypeOfType(restArrayType, 1) ||
                         (languageVersion >= 2 ? getElementTypeOfIterable(restArrayType, undefined) : undefined);
@@ -27722,7 +28150,7 @@ var ts;
                     var type = checkExpressionForMutableLocation(e, contextualMapper);
                     elementTypes.push(type);
                 }
-                hasSpreadElement = hasSpreadElement || e.kind === 192;
+                hasSpreadElement = hasSpreadElement || e.kind === 196;
             }
             if (!hasSpreadElement) {
                 if (inDestructuringPattern && elementTypes.length) {
@@ -27733,7 +28161,7 @@ var ts;
                 var contextualType = getApparentTypeOfContextualType(node);
                 if (contextualType && contextualTypeIsTupleLikeType(contextualType)) {
                     var pattern = contextualType.pattern;
-                    if (pattern && (pattern.kind === 169 || pattern.kind === 171)) {
+                    if (pattern && (pattern.kind === 173 || pattern.kind === 175)) {
                         var patternElements = pattern.elements;
                         for (var i = elementTypes.length; i < patternElements.length; i++) {
                             var patternElement = patternElements[i];
@@ -27741,7 +28169,7 @@ var ts;
                                 elementTypes.push(contextualType.typeArguments[i]);
                             }
                             else {
-                                if (patternElement.kind !== 194) {
+                                if (patternElement.kind !== 198) {
                                     error(patternElement, ts.Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);
                                 }
                                 elementTypes.push(unknownType);
@@ -27758,7 +28186,7 @@ var ts;
                 strictNullChecks ? neverType : undefinedWideningType);
         }
         function isNumericName(name) {
-            return name.kind === 141 ? isNumericComputedName(name) : isNumericLiteralName(name.text);
+            return name.kind === 142 ? isNumericComputedName(name) : isNumericLiteralName(name.text);
         }
         function isNumericComputedName(name) {
             return isTypeAnyOrAllConstituentTypesHaveKind(checkComputedPropertyName(name), 340);
@@ -27800,9 +28228,11 @@ var ts;
             checkGrammarObjectLiteralExpression(node, inDestructuringPattern);
             var propertiesTable = ts.createMap();
             var propertiesArray = [];
+            var spread = emptyObjectType;
+            var propagatedFlags = 0;
             var contextualType = getApparentTypeOfContextualType(node);
             var contextualTypeHasPattern = contextualType && contextualType.pattern &&
-                (contextualType.pattern.kind === 168 || contextualType.pattern.kind === 172);
+                (contextualType.pattern.kind === 172 || contextualType.pattern.kind === 176);
             var typeFlags = 0;
             var patternWithComputedProperties = false;
             var hasComputedStringProperty = false;
@@ -27810,25 +28240,25 @@ var ts;
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var memberDecl = _a[_i];
                 var member = memberDecl.symbol;
-                if (memberDecl.kind === 253 ||
-                    memberDecl.kind === 254 ||
+                if (memberDecl.kind === 257 ||
+                    memberDecl.kind === 258 ||
                     ts.isObjectLiteralMethod(memberDecl)) {
                     var type = void 0;
-                    if (memberDecl.kind === 253) {
+                    if (memberDecl.kind === 257) {
                         type = checkPropertyAssignment(memberDecl, contextualMapper);
                     }
-                    else if (memberDecl.kind === 148) {
+                    else if (memberDecl.kind === 149) {
                         type = checkObjectLiteralMethod(memberDecl, contextualMapper);
                     }
                     else {
-                        ts.Debug.assert(memberDecl.kind === 254);
+                        ts.Debug.assert(memberDecl.kind === 258);
                         type = checkExpressionForMutableLocation(memberDecl.name, contextualMapper);
                     }
                     typeFlags |= type.flags;
                     var prop = createSymbol(4 | 67108864 | member.flags, member.name);
                     if (inDestructuringPattern) {
-                        var isOptional = (memberDecl.kind === 253 && hasDefaultValue(memberDecl.initializer)) ||
-                            (memberDecl.kind === 254 && memberDecl.objectAssignmentInitializer);
+                        var isOptional = (memberDecl.kind === 257 && hasDefaultValue(memberDecl.initializer)) ||
+                            (memberDecl.kind === 258 && memberDecl.objectAssignmentInitializer);
                         if (isOptional) {
                             prop.flags |= 536870912;
                         }
@@ -27836,8 +28266,7 @@ var ts;
                             patternWithComputedProperties = true;
                         }
                     }
-                    else if (contextualTypeHasPattern &&
-                        !(contextualType.flags & 2588672 && contextualType.isObjectLiteralPatternWithComputedProperties)) {
+                    else if (contextualTypeHasPattern && !(getObjectFlags(contextualType) & 512)) {
                         var impliedProp = getPropertyOfType(contextualType, member.name);
                         if (impliedProp) {
                             prop.flags |= impliedProp.flags & 536870912;
@@ -27855,8 +28284,25 @@ var ts;
                     prop.target = member;
                     member = prop;
                 }
+                else if (memberDecl.kind === 259) {
+                    if (propertiesArray.length > 0) {
+                        spread = getSpreadType(spread, createObjectLiteralType(), true);
+                        propertiesArray = [];
+                        propertiesTable = ts.createMap();
+                        hasComputedStringProperty = false;
+                        hasComputedNumberProperty = false;
+                        typeFlags = 0;
+                    }
+                    var type = checkExpression(memberDecl.expression);
+                    if (!(type.flags & (32768 | 1))) {
+                        error(memberDecl, ts.Diagnostics.Spread_types_may_only_be_created_from_object_types);
+                        return unknownType;
+                    }
+                    spread = getSpreadType(spread, type, false);
+                    continue;
+                }
                 else {
-                    ts.Debug.assert(memberDecl.kind === 150 || memberDecl.kind === 151);
+                    ts.Debug.assert(memberDecl.kind === 151 || memberDecl.kind === 152);
                     checkAccessorDeclaration(memberDecl);
                 }
                 if (ts.hasDynamicName(memberDecl)) {
@@ -27884,18 +28330,33 @@ var ts;
                     }
                 }
             }
-            var stringIndexInfo = hasComputedStringProperty ? getObjectLiteralIndexInfo(node, propertiesArray, 0) : undefined;
-            var numberIndexInfo = hasComputedNumberProperty ? getObjectLiteralIndexInfo(node, propertiesArray, 1) : undefined;
-            var result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
-            var freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : 16777216;
-            result.flags |= 8388608 | 67108864 | freshObjectLiteralFlag | (typeFlags & 234881024);
-            if (patternWithComputedProperties) {
-                result.isObjectLiteralPatternWithComputedProperties = true;
+            if (spread !== emptyObjectType) {
+                if (propertiesArray.length > 0) {
+                    spread = getSpreadType(spread, createObjectLiteralType(), true);
+                }
+                spread.flags |= propagatedFlags;
+                spread.symbol = node.symbol;
+                return spread;
             }
-            if (inDestructuringPattern) {
-                result.pattern = node;
+            return createObjectLiteralType();
+            function createObjectLiteralType() {
+                var stringIndexInfo = hasComputedStringProperty ? getObjectLiteralIndexInfo(node, propertiesArray, 0) : undefined;
+                var numberIndexInfo = hasComputedNumberProperty ? getObjectLiteralIndexInfo(node, propertiesArray, 1) : undefined;
+                var result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
+                var freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : 1048576;
+                result.flags |= 4194304 | freshObjectLiteralFlag | (typeFlags & 14680064);
+                result.objectFlags |= 128;
+                if (patternWithComputedProperties) {
+                    result.objectFlags |= 512;
+                }
+                if (inDestructuringPattern) {
+                    result.pattern = node;
+                }
+                if (!(result.flags & 6144)) {
+                    propagatedFlags |= (result.flags & 14680064);
+                }
+                return result;
             }
-            return result;
         }
         function checkJsxSelfClosingElement(node) {
             checkJsxOpeningLikeElement(node);
@@ -27912,13 +28373,13 @@ var ts;
             for (var _i = 0, _a = node.children; _i < _a.length; _i++) {
                 var child = _a[_i];
                 switch (child.kind) {
-                    case 248:
+                    case 252:
                         checkJsxExpression(child);
                         break;
-                    case 242:
+                    case 246:
                         checkJsxElement(child);
                         break;
-                    case 243:
+                    case 247:
                         checkJsxSelfClosingElement(child);
                         break;
                 }
@@ -27929,7 +28390,7 @@ var ts;
             return name.indexOf("-") < 0;
         }
         function isJsxIntrinsicIdentifier(tagName) {
-            if (tagName.kind === 173 || tagName.kind === 98) {
+            if (tagName.kind === 177 || tagName.kind === 98) {
                 return false;
             }
             else {
@@ -27945,7 +28406,7 @@ var ts;
                 var correspondingPropSymbol = getPropertyOfType(elementAttributesType, node.name.text);
                 correspondingPropType = correspondingPropSymbol && getTypeOfSymbol(correspondingPropSymbol);
                 if (isUnhyphenatedJsxName(node.name.text)) {
-                    var attributeType = getTypeOfPropertyOfType(elementAttributesType, getTextOfPropertyName(node.name)) || getIndexTypeOfType(elementAttributesType, 0);
+                    var attributeType = getTypeOfPropertyOfType(elementAttributesType, ts.getTextOfPropertyName(node.name)) || getIndexTypeOfType(elementAttributesType, 0);
                     if (attributeType) {
                         correspondingPropType = attributeType;
                     }
@@ -28020,7 +28481,7 @@ var ts;
             return links.resolvedSymbol;
         }
         function getJsxElementInstanceType(node, valueType) {
-            ts.Debug.assert(!(valueType.flags & 524288));
+            ts.Debug.assert(!(valueType.flags & 65536));
             if (isTypeAny(valueType)) {
                 return anyType;
             }
@@ -28059,7 +28520,7 @@ var ts;
             if (!elemType) {
                 elemType = checkExpression(node.tagName);
             }
-            if (elemType.flags & 524288) {
+            if (elemType.flags & 65536) {
                 var types = elemType.types;
                 return getUnionType(ts.map(types, function (type) {
                     return getResolvedJsxType(node, type, elemClassType);
@@ -28121,7 +28582,7 @@ var ts;
                 else if (isTypeAny(attributesType) || (attributesType === unknownType)) {
                     return attributesType;
                 }
-                else if (attributesType.flags & 524288) {
+                else if (attributesType.flags & 65536) {
                     error(node.tagName, ts.Diagnostics.JSX_element_attributes_type_0_may_not_be_a_union_type, typeToString(attributesType));
                     return anyType;
                 }
@@ -28198,20 +28659,23 @@ var ts;
             checkGrammarJsxElement(node);
             checkJsxPreconditions(node);
             var reactRefErr = compilerOptions.jsx === 2 ? ts.Diagnostics.Cannot_find_name_0 : undefined;
-            var reactNamespace = compilerOptions.reactNamespace ? compilerOptions.reactNamespace : "React";
+            var reactNamespace = getJsxNamespace();
             var reactSym = resolveName(node.tagName, reactNamespace, 107455, reactRefErr, reactNamespace);
             if (reactSym) {
-                getSymbolLinks(reactSym).referenced = true;
+                reactSym.isReferenced = true;
+                if (reactSym.flags & 8388608 && !isConstEnumOrConstEnumOnlyModule(resolveAlias(reactSym))) {
+                    markAliasSymbolAsReferenced(reactSym);
+                }
             }
             var targetAttributesType = getJsxElementAttributesType(node);
             var nameTable = ts.createMap();
             var sawSpreadedAny = false;
             for (var i = node.attributes.length - 1; i >= 0; i--) {
-                if (node.attributes[i].kind === 246) {
+                if (node.attributes[i].kind === 250) {
                     checkJsxAttribute((node.attributes[i]), targetAttributesType, nameTable);
                 }
                 else {
-                    ts.Debug.assert(node.attributes[i].kind === 247);
+                    ts.Debug.assert(node.attributes[i].kind === 251);
                     var spreadType = checkJsxSpreadAttribute((node.attributes[i]), targetAttributesType, nameTable);
                     if (isTypeAny(spreadType)) {
                         sawSpreadedAny = true;
@@ -28237,7 +28701,7 @@ var ts;
             }
         }
         function getDeclarationKindFromSymbol(s) {
-            return s.valueDeclaration ? s.valueDeclaration.kind : 146;
+            return s.valueDeclaration ? s.valueDeclaration.kind : 147;
         }
         function getDeclarationModifierFlagsFromSymbol(s) {
             return s.valueDeclaration ? ts.getCombinedModifierFlags(s.valueDeclaration) : s.flags & 134217728 ? 4 | 32 : 0;
@@ -28248,11 +28712,11 @@ var ts;
         function checkClassPropertyAccess(node, left, type, prop) {
             var flags = getDeclarationModifierFlagsFromSymbol(prop);
             var declaringClass = getDeclaredTypeOfSymbol(getParentOfSymbol(prop));
-            var errorNode = node.kind === 173 || node.kind === 219 ?
+            var errorNode = node.kind === 177 || node.kind === 223 ?
                 node.name :
                 node.right;
             if (left.kind === 96) {
-                if (languageVersion < 2 && getDeclarationKindFromSymbol(prop) !== 148) {
+                if (languageVersion < 2 && getDeclarationKindFromSymbol(prop) !== 149) {
                     error(errorNode, ts.Diagnostics.Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword);
                     return false;
                 }
@@ -28289,7 +28753,7 @@ var ts;
             if (type.flags & 16384 && type.isThisType) {
                 type = getConstraintOfTypeParameter(type);
             }
-            if (!(getTargetType(type).flags & (32768 | 65536) && hasBaseType(type, enclosingClass))) {
+            if (!(getObjectFlags(getTargetType(type)) & 3 && hasBaseType(type, enclosingClass))) {
                 error(errorNode, ts.Diagnostics.Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1, symbolToString(prop), typeToString(enclosingClass));
                 return false;
             }
@@ -28315,6 +28779,33 @@ var ts;
         function checkQualifiedName(node) {
             return checkPropertyAccessExpressionOrQualifiedName(node, node.left, node.right);
         }
+        function reportNonexistentProperty(propNode, containingType) {
+            var errorInfo;
+            if (containingType.flags & 65536 && !(containingType.flags & 8190)) {
+                for (var _i = 0, _a = containingType.types; _i < _a.length; _i++) {
+                    var subtype = _a[_i];
+                    if (!getPropertyOfType(subtype, propNode.text)) {
+                        errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.declarationNameToString(propNode), typeToString(subtype));
+                        break;
+                    }
+                }
+            }
+            errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.declarationNameToString(propNode), typeToString(containingType));
+            diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(propNode, errorInfo));
+        }
+        function markPropertyAsReferenced(prop) {
+            if (prop &&
+                noUnusedIdentifiers &&
+                (prop.flags & 106500) &&
+                prop.valueDeclaration && (ts.getModifierFlags(prop.valueDeclaration) & 8)) {
+                if (prop.flags & 16777216) {
+                    getSymbolLinks(prop).target.isReferenced = true;
+                }
+                else {
+                    prop.isReferenced = true;
+                }
+            }
+        }
         function checkPropertyAccessExpressionOrQualifiedName(node, left, right) {
             var type = checkNonNullExpression(left);
             if (isTypeAny(type) || type === silentNeverType) {
@@ -28331,44 +28822,29 @@ var ts;
                 }
                 return unknownType;
             }
-            if (noUnusedIdentifiers &&
-                (prop.flags & 106500) &&
-                prop.valueDeclaration && (ts.getModifierFlags(prop.valueDeclaration) & 8)) {
-                if (prop.flags & 16777216) {
-                    getSymbolLinks(prop).target.isReferenced = true;
-                }
-                else {
-                    prop.isReferenced = true;
-                }
-            }
+            markPropertyAsReferenced(prop);
             getNodeLinks(node).resolvedSymbol = prop;
             if (prop.parent && prop.parent.flags & 32) {
                 checkClassPropertyAccess(node, left, apparentType, prop);
             }
             var propType = getTypeOfSymbol(prop);
-            if (node.kind !== 173 || ts.isAssignmentTarget(node) ||
+            var assignmentKind = ts.getAssignmentTargetKind(node);
+            if (assignmentKind) {
+                if (isReferenceToReadonlyEntity(node, prop) || isReferenceThroughNamespaceImport(node)) {
+                    error(right, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_constant_or_a_read_only_property, right.text);
+                    return unknownType;
+                }
+            }
+            if (node.kind !== 177 || assignmentKind === 1 ||
                 !(prop.flags & (3 | 4 | 98304)) &&
-                    !(prop.flags & 8192 && propType.flags & 524288)) {
+                    !(prop.flags & 8192 && propType.flags & 65536)) {
                 return propType;
             }
-            return getFlowTypeOfReference(node, propType, true, undefined);
-            function reportNonexistentProperty(propNode, containingType) {
-                var errorInfo;
-                if (containingType.flags & 524288 && !(containingType.flags & 8190)) {
-                    for (var _i = 0, _a = containingType.types; _i < _a.length; _i++) {
-                        var subtype = _a[_i];
-                        if (!getPropertyOfType(subtype, propNode.text)) {
-                            errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.declarationNameToString(propNode), typeToString(subtype));
-                            break;
-                        }
-                    }
-                }
-                errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.declarationNameToString(propNode), typeToString(containingType));
-                diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(propNode, errorInfo));
-            }
+            var flowType = getFlowTypeOfReference(node, propType, true, undefined);
+            return assignmentKind ? getBaseTypeOfLiteralType(flowType) : flowType;
         }
         function isValidPropertyAccess(node, propertyName) {
-            var left = node.kind === 173
+            var left = node.kind === 177
                 ? node.expression
                 : node.left;
             var type = checkExpression(left);
@@ -28382,7 +28858,7 @@ var ts;
         }
         function getForInVariableSymbol(node) {
             var initializer = node.initializer;
-            if (initializer.kind === 220) {
+            if (initializer.kind === 224) {
                 var variable = initializer.declarations[0];
                 if (variable && !ts.isBindingPattern(variable.name)) {
                     return getSymbolOfNode(variable);
@@ -28397,14 +28873,14 @@ var ts;
             return getIndexTypeOfType(type, 1) && !getIndexTypeOfType(type, 0);
         }
         function isForInVariableForNumericPropertyNames(expr) {
-            var e = skipParenthesizedNodes(expr);
+            var e = ts.skipParentheses(expr);
             if (e.kind === 70) {
                 var symbol = getResolvedSymbol(e);
                 if (symbol.flags & 3) {
                     var child = expr;
                     var node = expr.parent;
                     while (node) {
-                        if (node.kind === 208 &&
+                        if (node.kind === 212 &&
                             child === node.statement &&
                             getForInVariableSymbol(node) === symbol &&
                             hasNumericPropertyNames(checkExpression(node.expression))) {
@@ -28418,9 +28894,11 @@ var ts;
             return false;
         }
         function checkIndexedAccess(node) {
-            if (!node.argumentExpression) {
+            var objectType = checkNonNullExpression(node.expression);
+            var indexExpression = node.argumentExpression;
+            if (!indexExpression) {
                 var sourceFile = ts.getSourceFileOfNode(node);
-                if (node.parent.kind === 176 && node.parent.expression === node) {
+                if (node.parent.kind === 180 && 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);
@@ -28430,71 +28908,17 @@ var ts;
                     var end = node.end;
                     grammarErrorAtPos(sourceFile, start, end - start, ts.Diagnostics.Expression_expected);
                 }
+                return unknownType;
             }
-            var objectType = getApparentType(checkNonNullExpression(node.expression));
-            var indexType = node.argumentExpression ? checkExpression(node.argumentExpression) : unknownType;
+            var indexType = isForInVariableForNumericPropertyNames(indexExpression) ? numberType : checkExpression(indexExpression);
             if (objectType === unknownType || objectType === silentNeverType) {
                 return objectType;
             }
-            var isConstEnum = isConstEnumObjectType(objectType);
-            if (isConstEnum &&
-                (!node.argumentExpression || node.argumentExpression.kind !== 9)) {
-                error(node.argumentExpression, ts.Diagnostics.A_const_enum_member_can_only_be_accessed_using_a_string_literal);
+            if (isConstEnumObjectType(objectType) && indexExpression.kind !== 9) {
+                error(indexExpression, ts.Diagnostics.A_const_enum_member_can_only_be_accessed_using_a_string_literal);
                 return unknownType;
             }
-            if (node.argumentExpression) {
-                var name_16 = getPropertyNameForIndexedAccess(node.argumentExpression, indexType);
-                if (name_16 !== undefined) {
-                    var prop = getPropertyOfType(objectType, name_16);
-                    if (prop) {
-                        getNodeLinks(node).resolvedSymbol = prop;
-                        return getTypeOfSymbol(prop);
-                    }
-                    else if (isConstEnum) {
-                        error(node.argumentExpression, ts.Diagnostics.Property_0_does_not_exist_on_const_enum_1, name_16, symbolToString(objectType.symbol));
-                        return unknownType;
-                    }
-                }
-            }
-            var allowedNullableFlags = strictNullChecks ? 0 : 6144;
-            if (isTypeAnyOrAllConstituentTypesHaveKind(indexType, 34 | 340 | 512 | allowedNullableFlags)) {
-                if (isTypeAnyOrAllConstituentTypesHaveKind(indexType, 340 | allowedNullableFlags) || isForInVariableForNumericPropertyNames(node.argumentExpression)) {
-                    var numberIndexInfo = getIndexInfoOfType(objectType, 1);
-                    if (numberIndexInfo) {
-                        getNodeLinks(node).resolvedIndexInfo = numberIndexInfo;
-                        return numberIndexInfo.type;
-                    }
-                }
-                var stringIndexInfo = getIndexInfoOfType(objectType, 0);
-                if (stringIndexInfo) {
-                    getNodeLinks(node).resolvedIndexInfo = stringIndexInfo;
-                    return stringIndexInfo.type;
-                }
-                if (compilerOptions.noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors && !isTypeAny(objectType)) {
-                    error(node, getIndexTypeOfType(objectType, 1) ?
-                        ts.Diagnostics.Element_implicitly_has_an_any_type_because_index_expression_is_not_of_type_number :
-                        ts.Diagnostics.Index_signature_of_object_type_implicitly_has_an_any_type);
-                }
-                return anyType;
-            }
-            error(node, ts.Diagnostics.An_index_expression_argument_must_be_of_type_string_number_symbol_or_any);
-            return unknownType;
-        }
-        function getPropertyNameForIndexedAccess(indexArgumentExpression, indexArgumentType) {
-            if (indexArgumentExpression.kind === 9 || indexArgumentExpression.kind === 8) {
-                return indexArgumentExpression.text;
-            }
-            if (indexArgumentExpression.kind === 174 || indexArgumentExpression.kind === 173) {
-                var value = getConstantValue(indexArgumentExpression);
-                if (value !== undefined) {
-                    return value.toString();
-                }
-            }
-            if (checkThatExpressionIsProperSymbolReference(indexArgumentExpression, indexArgumentType, false)) {
-                var rightHandSideName = indexArgumentExpression.name.text;
-                return ts.getPropertyNameForKnownSymbolName(rightHandSideName);
-            }
-            return undefined;
+            return getIndexedAccessType(objectType, indexType, node);
         }
         function checkThatExpressionIsProperSymbolReference(expression, expressionType, reportError) {
             if (expressionType === unknownType) {
@@ -28527,10 +28951,10 @@ var ts;
             return true;
         }
         function resolveUntypedCall(node) {
-            if (node.kind === 177) {
+            if (node.kind === 181) {
                 checkExpression(node.template);
             }
-            else if (node.kind !== 144) {
+            else if (node.kind !== 145) {
                 ts.forEach(node.arguments, function (argument) {
                     checkExpression(argument);
                 });
@@ -28552,19 +28976,19 @@ var ts;
             for (var _i = 0, signatures_2 = signatures; _i < signatures_2.length; _i++) {
                 var signature = signatures_2[_i];
                 var symbol = signature.declaration && getSymbolOfNode(signature.declaration);
-                var parent_11 = signature.declaration && signature.declaration.parent;
+                var parent_9 = signature.declaration && signature.declaration.parent;
                 if (!lastSymbol || symbol === lastSymbol) {
-                    if (lastParent && parent_11 === lastParent) {
+                    if (lastParent && parent_9 === lastParent) {
                         index++;
                     }
                     else {
-                        lastParent = parent_11;
+                        lastParent = parent_9;
                         index = cutoffIndex;
                     }
                 }
                 else {
                     index = cutoffIndex = result.length;
-                    lastParent = parent_11;
+                    lastParent = parent_9;
                 }
                 lastSymbol = symbol;
                 if (signature.hasLiteralTypes) {
@@ -28581,7 +29005,7 @@ var ts;
         function getSpreadArgumentIndex(args) {
             for (var i = 0; i < args.length; i++) {
                 var arg = args[i];
-                if (arg && arg.kind === 192) {
+                if (arg && arg.kind === 196) {
                     return i;
                 }
             }
@@ -28594,11 +29018,11 @@ var ts;
             var callIsIncomplete;
             var isDecorator;
             var spreadArgIndex = -1;
-            if (node.kind === 177) {
+            if (node.kind === 181) {
                 var tagExpression = node;
                 argCount = args.length;
                 typeArguments = undefined;
-                if (tagExpression.template.kind === 190) {
+                if (tagExpression.template.kind === 194) {
                     var templateExpression = tagExpression.template;
                     var lastSpan = ts.lastOrUndefined(templateExpression.templateSpans);
                     ts.Debug.assert(lastSpan !== undefined);
@@ -28610,7 +29034,7 @@ var ts;
                     callIsIncomplete = !!templateLiteral.isUnterminated;
                 }
             }
-            else if (node.kind === 144) {
+            else if (node.kind === 145) {
                 isDecorator = true;
                 typeArguments = undefined;
                 argCount = getEffectiveArgumentCount(node, undefined, signature);
@@ -28618,7 +29042,7 @@ var ts;
             else {
                 var callExpression = node;
                 if (!callExpression.arguments) {
-                    ts.Debug.assert(callExpression.kind === 176);
+                    ts.Debug.assert(callExpression.kind === 180);
                     return signature.minArgumentCount === 0;
                 }
                 argCount = signatureHelpTrailingComma ? args.length + 1 : args.length;
@@ -28641,7 +29065,7 @@ var ts;
             return callIsIncomplete || hasEnoughArguments;
         }
         function getSingleCallSignature(type) {
-            if (type.flags & 2588672) {
+            if (type.flags & 32768) {
                 var resolved = resolveStructuredTypeMembers(type);
                 if (resolved.callSignatures.length === 1 && resolved.constructSignatures.length === 0 &&
                     resolved.properties.length === 0 && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
@@ -28677,7 +29101,7 @@ var ts;
             var argCount = getEffectiveArgumentCount(node, args, signature);
             for (var i = 0; i < argCount; i++) {
                 var arg = getEffectiveArgument(node, args, i);
-                if (arg === undefined || arg.kind !== 194) {
+                if (arg === undefined || arg.kind !== 198) {
                     var paramType = getTypeAtPosition(signature, i);
                     var argType = getEffectiveArgumentType(node, i);
                     if (argType === undefined) {
@@ -28724,7 +29148,7 @@ var ts;
         }
         function checkApplicableSignature(node, args, signature, relation, excludeArgument, reportErrors) {
             var thisType = getThisTypeOfSignature(signature);
-            if (thisType && thisType !== voidType && node.kind !== 176) {
+            if (thisType && thisType !== voidType && node.kind !== 180) {
                 var thisArgumentNode = getThisArgumentOfCall(node);
                 var thisArgumentType = thisArgumentNode ? checkExpression(thisArgumentNode) : voidType;
                 var errorNode = reportErrors ? (thisArgumentNode || node) : undefined;
@@ -28737,7 +29161,7 @@ var ts;
             var argCount = getEffectiveArgumentCount(node, args, signature);
             for (var i = 0; i < argCount; i++) {
                 var arg = getEffectiveArgument(node, args, i);
-                if (arg === undefined || arg.kind !== 194) {
+                if (arg === undefined || arg.kind !== 198) {
                     var paramType = getTypeAtPosition(signature, i);
                     var argType = getEffectiveArgumentType(node, i);
                     if (argType === undefined) {
@@ -28752,28 +29176,28 @@ var ts;
             return true;
         }
         function getThisArgumentOfCall(node) {
-            if (node.kind === 175) {
+            if (node.kind === 179) {
                 var callee = node.expression;
-                if (callee.kind === 173) {
+                if (callee.kind === 177) {
                     return callee.expression;
                 }
-                else if (callee.kind === 174) {
+                else if (callee.kind === 178) {
                     return callee.expression;
                 }
             }
         }
         function getEffectiveCallArguments(node) {
             var args;
-            if (node.kind === 177) {
+            if (node.kind === 181) {
                 var template = node.template;
                 args = [undefined];
-                if (template.kind === 190) {
+                if (template.kind === 194) {
                     ts.forEach(template.templateSpans, function (span) {
                         args.push(span.expression);
                     });
                 }
             }
-            else if (node.kind === 144) {
+            else if (node.kind === 145) {
                 return undefined;
             }
             else {
@@ -28782,21 +29206,21 @@ var ts;
             return args;
         }
         function getEffectiveArgumentCount(node, args, signature) {
-            if (node.kind === 144) {
+            if (node.kind === 145) {
                 switch (node.parent.kind) {
-                    case 222:
-                    case 193:
+                    case 226:
+                    case 197:
                         return 1;
-                    case 146:
+                    case 147:
                         return 2;
-                    case 148:
-                    case 150:
+                    case 149:
                     case 151:
+                    case 152:
                         if (languageVersion === 0) {
                             return 2;
                         }
                         return signature.parameters.length >= 3 ? 3 : 2;
-                    case 143:
+                    case 144:
                         return 3;
                 }
             }
@@ -28805,48 +29229,48 @@ var ts;
             }
         }
         function getEffectiveDecoratorFirstArgumentType(node) {
-            if (node.kind === 222) {
+            if (node.kind === 226) {
                 var classSymbol = getSymbolOfNode(node);
                 return getTypeOfSymbol(classSymbol);
             }
-            if (node.kind === 143) {
+            if (node.kind === 144) {
                 node = node.parent;
-                if (node.kind === 149) {
+                if (node.kind === 150) {
                     var classSymbol = getSymbolOfNode(node);
                     return getTypeOfSymbol(classSymbol);
                 }
             }
-            if (node.kind === 146 ||
-                node.kind === 148 ||
-                node.kind === 150 ||
-                node.kind === 151) {
+            if (node.kind === 147 ||
+                node.kind === 149 ||
+                node.kind === 151 ||
+                node.kind === 152) {
                 return getParentTypeOfClassElement(node);
             }
             ts.Debug.fail("Unsupported decorator target.");
             return unknownType;
         }
         function getEffectiveDecoratorSecondArgumentType(node) {
-            if (node.kind === 222) {
+            if (node.kind === 226) {
                 ts.Debug.fail("Class decorators should not have a second synthetic argument.");
                 return unknownType;
             }
-            if (node.kind === 143) {
+            if (node.kind === 144) {
                 node = node.parent;
-                if (node.kind === 149) {
+                if (node.kind === 150) {
                     return anyType;
                 }
             }
-            if (node.kind === 146 ||
-                node.kind === 148 ||
-                node.kind === 150 ||
-                node.kind === 151) {
+            if (node.kind === 147 ||
+                node.kind === 149 ||
+                node.kind === 151 ||
+                node.kind === 152) {
                 var element = node;
                 switch (element.name.kind) {
                     case 70:
                     case 8:
                     case 9:
                         return getLiteralTypeForText(32, element.name.text);
-                    case 141:
+                    case 142:
                         var nameType = checkComputedPropertyName(element.name);
                         if (isTypeOfKind(nameType, 512)) {
                             return nameType;
@@ -28863,20 +29287,20 @@ var ts;
             return unknownType;
         }
         function getEffectiveDecoratorThirdArgumentType(node) {
-            if (node.kind === 222) {
+            if (node.kind === 226) {
                 ts.Debug.fail("Class decorators should not have a third synthetic argument.");
                 return unknownType;
             }
-            if (node.kind === 143) {
+            if (node.kind === 144) {
                 return numberType;
             }
-            if (node.kind === 146) {
+            if (node.kind === 147) {
                 ts.Debug.fail("Property decorators should not have a third synthetic argument.");
                 return unknownType;
             }
-            if (node.kind === 148 ||
-                node.kind === 150 ||
-                node.kind === 151) {
+            if (node.kind === 149 ||
+                node.kind === 151 ||
+                node.kind === 152) {
                 var propertyType = getTypeOfNode(node);
                 return createTypedPropertyDescriptorType(propertyType);
             }
@@ -28897,26 +29321,26 @@ var ts;
             return unknownType;
         }
         function getEffectiveArgumentType(node, argIndex) {
-            if (node.kind === 144) {
+            if (node.kind === 145) {
                 return getEffectiveDecoratorArgumentType(node, argIndex);
             }
-            else if (argIndex === 0 && node.kind === 177) {
+            else if (argIndex === 0 && node.kind === 181) {
                 return getGlobalTemplateStringsArrayType();
             }
             return undefined;
         }
         function getEffectiveArgument(node, args, argIndex) {
-            if (node.kind === 144 ||
-                (argIndex === 0 && node.kind === 177)) {
+            if (node.kind === 145 ||
+                (argIndex === 0 && node.kind === 181)) {
                 return undefined;
             }
             return args[argIndex];
         }
         function getEffectiveArgumentErrorNode(node, argIndex, arg) {
-            if (node.kind === 144) {
+            if (node.kind === 145) {
                 return node.expression;
             }
-            else if (argIndex === 0 && node.kind === 177) {
+            else if (argIndex === 0 && node.kind === 181) {
                 return node.template;
             }
             else {
@@ -28924,8 +29348,8 @@ var ts;
             }
         }
         function resolveCall(node, signatures, candidatesOutArray, headMessage) {
-            var isTaggedTemplate = node.kind === 177;
-            var isDecorator = node.kind === 144;
+            var isTaggedTemplate = node.kind === 181;
+            var isDecorator = node.kind === 145;
             var typeArguments;
             if (!isTaggedTemplate && !isDecorator) {
                 typeArguments = node.typeArguments;
@@ -28955,7 +29379,7 @@ var ts;
             var candidateForTypeArgumentError;
             var resultOfFailedInference;
             var result;
-            var signatureHelpTrailingComma = candidatesOutArray && node.kind === 175 && node.arguments.hasTrailingComma;
+            var signatureHelpTrailingComma = candidatesOutArray && node.kind === 179 && node.arguments.hasTrailingComma;
             if (candidates.length > 1) {
                 result = chooseOverload(candidates, subtypeRelation, signatureHelpTrailingComma);
             }
@@ -28974,7 +29398,7 @@ var ts;
             else if (candidateForTypeArgumentError) {
                 if (!isTaggedTemplate && !isDecorator && typeArguments) {
                     var typeArguments_2 = node.typeArguments;
-                    checkTypeArguments(candidateForTypeArgumentError, typeArguments_2, ts.map(typeArguments_2, getTypeFromTypeNodeNoAlias), true, headMessage);
+                    checkTypeArguments(candidateForTypeArgumentError, typeArguments_2, ts.map(typeArguments_2, getTypeFromTypeNode), true, headMessage);
                 }
                 else {
                     ts.Debug.assert(resultOfFailedInference.failedTypeParameterIndex >= 0);
@@ -28995,7 +29419,7 @@ var ts;
                     var candidate = candidates_1[_i];
                     if (hasCorrectArity(node, args, candidate)) {
                         if (candidate.typeParameters && typeArguments) {
-                            candidate = getSignatureInstantiation(candidate, ts.map(typeArguments, getTypeFromTypeNodeNoAlias));
+                            candidate = getSignatureInstantiation(candidate, ts.map(typeArguments, getTypeFromTypeNode));
                         }
                         return candidate;
                     }
@@ -29027,7 +29451,7 @@ var ts;
                         if (candidate.typeParameters) {
                             var typeArgumentTypes = void 0;
                             if (typeArguments) {
-                                typeArgumentTypes = ts.map(typeArguments, getTypeFromTypeNodeNoAlias);
+                                typeArgumentTypes = ts.map(typeArguments, getTypeFromTypeNode);
                                 typeArgumentsAreValid = checkTypeArguments(candidate, typeArguments, typeArgumentTypes, false);
                             }
                             else {
@@ -29116,7 +29540,7 @@ var ts;
                 return true;
             }
             if (!numCallSignatures && !numConstructSignatures) {
-                if (funcType.flags & 524288) {
+                if (funcType.flags & 65536) {
                     return false;
                 }
                 return isTypeAssignableTo(funcType, globalFunctionType);
@@ -29223,16 +29647,16 @@ var ts;
         }
         function getDiagnosticHeadMessageForDecoratorResolution(node) {
             switch (node.parent.kind) {
-                case 222:
-                case 193:
+                case 226:
+                case 197:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression;
-                case 143:
+                case 144:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression;
-                case 146:
+                case 147:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression;
-                case 148:
-                case 150:
+                case 149:
                 case 151:
+                case 152:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression;
             }
         }
@@ -29259,13 +29683,13 @@ var ts;
         }
         function resolveSignature(node, candidatesOutArray) {
             switch (node.kind) {
-                case 175:
+                case 179:
                     return resolveCallExpression(node, candidatesOutArray);
-                case 176:
+                case 180:
                     return resolveNewExpression(node, candidatesOutArray);
-                case 177:
+                case 181:
                     return resolveTaggedTemplateExpression(node, candidatesOutArray);
-                case 144:
+                case 145:
                     return resolveDecorator(node, candidatesOutArray);
             }
             ts.Debug.fail("Branch in 'resolveSignature' should be unreachable.");
@@ -29297,12 +29721,12 @@ var ts;
             if (node.expression.kind === 96) {
                 return voidType;
             }
-            if (node.kind === 176) {
+            if (node.kind === 180) {
                 var declaration = signature.declaration;
                 if (declaration &&
-                    declaration.kind !== 149 &&
-                    declaration.kind !== 153 &&
-                    declaration.kind !== 158 &&
+                    declaration.kind !== 150 &&
+                    declaration.kind !== 154 &&
+                    declaration.kind !== 159 &&
                     !ts.isJSDocConstructSignature(declaration)) {
                     var funcSymbol = node.expression.kind === 70 ?
                         getResolvedSymbol(node.expression) :
@@ -29316,13 +29740,33 @@ var ts;
                     return anyType;
                 }
             }
-            if (ts.isInJavaScriptFile(node) &&
-                ts.isRequireCall(node, true) &&
-                !resolveName(node.expression, node.expression.text, 107455, undefined, undefined)) {
+            if (ts.isInJavaScriptFile(node) && isCommonJsRequire(node)) {
                 return resolveExternalModuleTypeByLiteral(node.arguments[0]);
             }
             return getReturnTypeOfSignature(signature);
         }
+        function isCommonJsRequire(node) {
+            if (!ts.isRequireCall(node, true)) {
+                return false;
+            }
+            var resolvedRequire = resolveName(node.expression, node.expression.text, 107455, undefined, undefined);
+            if (!resolvedRequire) {
+                return true;
+            }
+            if (resolvedRequire.flags & 8388608) {
+                return false;
+            }
+            var targetDeclarationKind = resolvedRequire.flags & 16
+                ? 225
+                : resolvedRequire.flags & 3
+                    ? 223
+                    : 0;
+            if (targetDeclarationKind !== 0) {
+                var decl = ts.getDeclarationOfKind(resolvedRequire, targetDeclarationKind);
+                return ts.isInAmbientContext(decl);
+            }
+            return false;
+        }
         function checkTaggedTemplateExpression(node) {
             return getReturnTypeOfSignature(getResolvedSignature(node));
         }
@@ -29408,8 +29852,8 @@ var ts;
             if (!links.type) {
                 links.type = instantiateType(contextualType, mapper);
                 if (links.type === emptyObjectType &&
-                    (parameter.valueDeclaration.name.kind === 168 ||
-                        parameter.valueDeclaration.name.kind === 169)) {
+                    (parameter.valueDeclaration.name.kind === 172 ||
+                        parameter.valueDeclaration.name.kind === 173)) {
                     links.type = getTypeFromBindingPattern(parameter.valueDeclaration.name);
                 }
                 assignBindingElementTypes(parameter.valueDeclaration);
@@ -29436,7 +29880,7 @@ var ts;
         function createPromiseReturnType(func, promisedType) {
             var promiseType = createPromiseType(promisedType);
             if (promiseType === emptyObjectType) {
-                error(func, ts.Diagnostics.An_async_function_or_method_must_have_a_valid_awaitable_return_type);
+                error(func, 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);
                 return unknownType;
             }
             return promiseType;
@@ -29448,7 +29892,7 @@ var ts;
             }
             var isAsync = ts.isAsyncFunctionLike(func);
             var type;
-            if (func.body.kind !== 200) {
+            if (func.body.kind !== 204) {
                 type = checkExpressionCached(func.body, contextualMapper);
                 if (isAsync) {
                     type = checkAwaitedType(type, func, ts.Diagnostics.Return_expression_in_async_function_does_not_have_a_valid_callable_then_member);
@@ -29527,7 +29971,7 @@ var ts;
                 return false;
             }
             var lastStatement = ts.lastOrUndefined(func.body.statements);
-            if (lastStatement && lastStatement.kind === 214 && isExhaustiveSwitchStatement(lastStatement)) {
+            if (lastStatement && lastStatement.kind === 218 && isExhaustiveSwitchStatement(lastStatement)) {
                 return false;
             }
             return true;
@@ -29556,7 +30000,7 @@ var ts;
                 }
             });
             if (aggregatedTypes.length === 0 && !hasReturnWithNoExpression && (hasReturnOfTypeNever ||
-                func.kind === 180 || func.kind === 181)) {
+                func.kind === 184 || func.kind === 185)) {
                 return undefined;
             }
             if (strictNullChecks && aggregatedTypes.length && hasReturnWithNoExpression) {
@@ -29573,7 +30017,7 @@ var ts;
             if (returnType && maybeTypeOfKind(returnType, 1 | 1024)) {
                 return;
             }
-            if (ts.nodeIsMissing(func.body) || func.body.kind !== 200 || !functionHasImplicitReturn(func)) {
+            if (ts.nodeIsMissing(func.body) || func.body.kind !== 204 || !functionHasImplicitReturn(func)) {
                 return;
             }
             var hasExplicitReturn = func.flags & 256;
@@ -29600,9 +30044,9 @@ var ts;
             }
         }
         function checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper) {
-            ts.Debug.assert(node.kind !== 148 || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 149 || ts.isObjectLiteralMethod(node));
             var hasGrammarError = checkGrammarFunctionLikeDeclaration(node);
-            if (!hasGrammarError && node.kind === 180) {
+            if (!hasGrammarError && node.kind === 184) {
                 checkGrammarForGenerator(node);
             }
             if (contextualMapper === identityMapper && isContextSensitive(node)) {
@@ -29636,14 +30080,14 @@ var ts;
                     }
                 }
             }
-            if (produceDiagnostics && node.kind !== 148) {
+            if (produceDiagnostics && node.kind !== 149) {
                 checkCollisionWithCapturedSuperVariable(node, node.name);
                 checkCollisionWithCapturedThisVariable(node, node.name);
             }
             return type;
         }
         function checkFunctionExpressionOrObjectLiteralMethodDeferred(node) {
-            ts.Debug.assert(node.kind !== 148 || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 149 || ts.isObjectLiteralMethod(node));
             var isAsync = ts.isAsyncFunctionLike(node);
             var returnOrPromisedType = node.type && (isAsync ? checkAsyncFunctionReturnType(node) : getTypeFromTypeNode(node.type));
             if (!node.asteriskToken) {
@@ -29653,7 +30097,7 @@ var ts;
                 if (!node.type) {
                     getReturnTypeOfSignature(getSignatureFromDeclaration(node));
                 }
-                if (node.body.kind === 200) {
+                if (node.body.kind === 204) {
                     checkSourceElement(node.body);
                 }
                 else {
@@ -29688,10 +30132,10 @@ var ts;
         function isReferenceToReadonlyEntity(expr, symbol) {
             if (isReadonlySymbol(symbol)) {
                 if (symbol.flags & 4 &&
-                    (expr.kind === 173 || expr.kind === 174) &&
+                    (expr.kind === 177 || expr.kind === 178) &&
                     expr.expression.kind === 98) {
                     var func = ts.getContainingFunction(expr);
-                    if (!(func && func.kind === 149))
+                    if (!(func && func.kind === 150))
                         return true;
                     return !(func.parent === symbol.valueDeclaration.parent || func === symbol.valueDeclaration.parent);
                 }
@@ -29700,44 +30144,24 @@ var ts;
             return false;
         }
         function isReferenceThroughNamespaceImport(expr) {
-            if (expr.kind === 173 || expr.kind === 174) {
-                var node = skipParenthesizedNodes(expr.expression);
+            if (expr.kind === 177 || expr.kind === 178) {
+                var node = ts.skipParentheses(expr.expression);
                 if (node.kind === 70) {
                     var symbol = getNodeLinks(node).resolvedSymbol;
                     if (symbol.flags & 8388608) {
                         var declaration = getDeclarationOfAliasSymbol(symbol);
-                        return declaration && declaration.kind === 233;
+                        return declaration && declaration.kind === 237;
                     }
                 }
             }
             return false;
         }
-        function checkReferenceExpression(expr, invalidReferenceMessage, constantVariableMessage) {
-            var node = skipParenthesizedNodes(expr);
-            if (node.kind !== 70 && node.kind !== 173 && node.kind !== 174) {
+        function checkReferenceExpression(expr, invalidReferenceMessage) {
+            var node = ts.skipParentheses(expr);
+            if (node.kind !== 70 && node.kind !== 177 && node.kind !== 178) {
                 error(expr, invalidReferenceMessage);
                 return false;
             }
-            var links = getNodeLinks(node);
-            var symbol = getExportSymbolOfValueSymbolIfExported(links.resolvedSymbol);
-            if (symbol) {
-                if (symbol !== unknownSymbol && symbol !== argumentsSymbol) {
-                    if (node.kind === 70 && !(symbol.flags & 3)) {
-                        error(expr, invalidReferenceMessage);
-                        return false;
-                    }
-                    if (isReferenceToReadonlyEntity(node, symbol) || isReferenceThroughNamespaceImport(node)) {
-                        error(expr, constantVariableMessage);
-                        return false;
-                    }
-                }
-            }
-            else if (node.kind === 174) {
-                if (links.resolvedIndexInfo && links.resolvedIndexInfo.isReadonly) {
-                    error(expr, constantVariableMessage);
-                    return false;
-                }
-            }
             return true;
         }
         function checkDeleteExpression(node) {
@@ -29754,7 +30178,7 @@ var ts;
         }
         function checkAwaitExpression(node) {
             if (produceDiagnostics) {
-                if (!(node.flags & 262144)) {
+                if (!(node.flags & 524288)) {
                     grammarErrorOnFirstToken(node, ts.Diagnostics.await_expression_is_only_allowed_within_an_async_function);
                 }
                 if (isInParameterInitializerBeforeContainingFunction(node)) {
@@ -29789,7 +30213,7 @@ var ts;
                 case 43:
                     var ok = checkArithmeticOperandType(node.operand, getNonNullableType(operandType), ts.Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
                     if (ok) {
-                        checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property);
+                        checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_or_a_property_access);
                     }
                     return numberType;
             }
@@ -29802,7 +30226,7 @@ var ts;
             }
             var ok = checkArithmeticOperandType(node.operand, getNonNullableType(operandType), ts.Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
             if (ok) {
-                checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property);
+                checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_or_a_property_access);
             }
             return numberType;
         }
@@ -29810,7 +30234,7 @@ var ts;
             if (type.flags & kind) {
                 return true;
             }
-            if (type.flags & 1572864) {
+            if (type.flags & 196608) {
                 var types = type.types;
                 for (var _i = 0, types_15 = types; _i < types_15.length; _i++) {
                     var t = types_15[_i];
@@ -29825,7 +30249,7 @@ var ts;
             if (type.flags & kind) {
                 return true;
             }
-            if (type.flags & 524288) {
+            if (type.flags & 65536) {
                 var types = type.types;
                 for (var _i = 0, types_16 = types; _i < types_16.length; _i++) {
                     var t = types_16[_i];
@@ -29835,7 +30259,7 @@ var ts;
                 }
                 return true;
             }
-            if (type.flags & 1048576) {
+            if (type.flags & 131072) {
                 var types = type.types;
                 for (var _a = 0, types_17 = types; _a < types_17.length; _a++) {
                     var t = types_17[_a];
@@ -29847,7 +30271,7 @@ var ts;
             return false;
         }
         function isConstEnumObjectType(type) {
-            return type.flags & (2588672 | 2097152) && type.symbol && isConstEnumSymbol(type.symbol);
+            return getObjectFlags(type) & 16 && type.symbol && isConstEnumSymbol(type.symbol);
         }
         function isConstEnumSymbol(symbol) {
             return (symbol.flags & 128) !== 0;
@@ -29871,36 +30295,36 @@ var ts;
             if (!isTypeAnyOrAllConstituentTypesHaveKind(leftType, 34 | 340 | 512)) {
                 error(left, ts.Diagnostics.The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol);
             }
-            if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, 2588672 | 16384)) {
+            if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, 32768 | 16384)) {
                 error(right, ts.Diagnostics.The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter);
             }
             return booleanType;
         }
         function checkObjectLiteralAssignment(node, sourceType) {
             var properties = node.properties;
-            for (var _i = 0, properties_4 = properties; _i < properties_4.length; _i++) {
-                var p = properties_4[_i];
+            for (var _i = 0, properties_5 = properties; _i < properties_5.length; _i++) {
+                var p = properties_5[_i];
                 checkObjectLiteralDestructuringPropertyAssignment(sourceType, p);
             }
             return sourceType;
         }
         function checkObjectLiteralDestructuringPropertyAssignment(objectLiteralType, property) {
-            if (property.kind === 253 || property.kind === 254) {
-                var name_17 = property.name;
-                if (name_17.kind === 141) {
-                    checkComputedPropertyName(name_17);
+            if (property.kind === 257 || property.kind === 258) {
+                var name_21 = property.name;
+                if (name_21.kind === 142) {
+                    checkComputedPropertyName(name_21);
                 }
-                if (isComputedNonLiteralName(name_17)) {
+                if (isComputedNonLiteralName(name_21)) {
                     return undefined;
                 }
-                var text = getTextOfPropertyName(name_17);
+                var text = ts.getTextOfPropertyName(name_21);
                 var type = isTypeAny(objectLiteralType)
                     ? objectLiteralType
                     : getTypeOfPropertyOfType(objectLiteralType, text) ||
                         isNumericLiteralName(text) && getIndexTypeOfType(objectLiteralType, 1) ||
                         getIndexTypeOfType(objectLiteralType, 0);
                 if (type) {
-                    if (property.kind === 254) {
+                    if (property.kind === 258) {
                         return checkDestructuringAssignment(property, type);
                     }
                     else {
@@ -29908,7 +30332,12 @@ var ts;
                     }
                 }
                 else {
-                    error(name_17, ts.Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(objectLiteralType), ts.declarationNameToString(name_17));
+                    error(name_21, ts.Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(objectLiteralType), ts.declarationNameToString(name_21));
+                }
+            }
+            else if (property.kind === 259) {
+                if (property.expression.kind !== 70) {
+                    error(property.expression, ts.Diagnostics.An_object_rest_element_must_be_an_identifier);
                 }
             }
             else {
@@ -29926,8 +30355,8 @@ var ts;
         function checkArrayLiteralDestructuringElementAssignment(node, sourceType, elementIndex, elementType, contextualMapper) {
             var elements = node.elements;
             var element = elements[elementIndex];
-            if (element.kind !== 194) {
-                if (element.kind !== 192) {
+            if (element.kind !== 198) {
+                if (element.kind !== 196) {
                     var propName = "" + elementIndex;
                     var type = isTypeAny(sourceType)
                         ? sourceType
@@ -29949,11 +30378,11 @@ var ts;
                 }
                 else {
                     if (elementIndex < elements.length - 1) {
-                        error(element, ts.Diagnostics.A_rest_element_must_be_last_in_an_array_destructuring_pattern);
+                        error(element, ts.Diagnostics.A_rest_element_must_be_last_in_a_destructuring_pattern);
                     }
                     else {
                         var restExpression = element.expression;
-                        if (restExpression.kind === 188 && restExpression.operatorToken.kind === 57) {
+                        if (restExpression.kind === 192 && restExpression.operatorToken.kind === 57) {
                             error(restExpression.operatorToken, ts.Diagnostics.A_rest_element_cannot_have_an_initializer);
                         }
                         else {
@@ -29966,7 +30395,7 @@ var ts;
         }
         function checkDestructuringAssignment(exprOrAssignment, sourceType, contextualMapper) {
             var target;
-            if (exprOrAssignment.kind === 254) {
+            if (exprOrAssignment.kind === 258) {
                 var prop = exprOrAssignment;
                 if (prop.objectAssignmentInitializer) {
                     if (strictNullChecks &&
@@ -29980,21 +30409,21 @@ var ts;
             else {
                 target = exprOrAssignment;
             }
-            if (target.kind === 188 && target.operatorToken.kind === 57) {
+            if (target.kind === 192 && target.operatorToken.kind === 57) {
                 checkBinaryExpression(target, contextualMapper);
                 target = target.left;
             }
-            if (target.kind === 172) {
+            if (target.kind === 176) {
                 return checkObjectLiteralAssignment(target, sourceType);
             }
-            if (target.kind === 171) {
+            if (target.kind === 175) {
                 return checkArrayLiteralAssignment(target, sourceType, contextualMapper);
             }
             return checkReferenceAssignment(target, sourceType, contextualMapper);
         }
         function checkReferenceAssignment(target, sourceType, contextualMapper) {
             var targetType = checkExpression(target, contextualMapper);
-            if (checkReferenceExpression(target, ts.Diagnostics.Invalid_left_hand_side_of_assignment_expression, ts.Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property)) {
+            if (checkReferenceExpression(target, ts.Diagnostics.The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access)) {
                 checkTypeAssignableTo(sourceType, targetType, target, undefined);
             }
             return sourceType;
@@ -30005,35 +30434,35 @@ var ts;
                 case 70:
                 case 9:
                 case 11:
-                case 177:
-                case 190:
+                case 181:
+                case 194:
                 case 12:
                 case 8:
                 case 100:
                 case 85:
                 case 94:
-                case 136:
-                case 180:
-                case 193:
-                case 181:
-                case 171:
-                case 172:
-                case 183:
+                case 137:
+                case 184:
                 case 197:
-                case 243:
-                case 242:
+                case 185:
+                case 175:
+                case 176:
+                case 187:
+                case 201:
+                case 247:
+                case 246:
                     return true;
-                case 189:
+                case 193:
                     return isSideEffectFree(node.whenTrue) &&
                         isSideEffectFree(node.whenFalse);
-                case 188:
+                case 192:
                     if (ts.isAssignmentOperator(node.operatorToken.kind)) {
                         return false;
                     }
                     return isSideEffectFree(node.left) &&
                         isSideEffectFree(node.right);
-                case 186:
-                case 187:
+                case 190:
+                case 191:
                     switch (node.operator) {
                         case 50:
                         case 36:
@@ -30042,9 +30471,9 @@ var ts;
                             return true;
                     }
                     return false;
-                case 184:
-                case 178:
-                case 196:
+                case 188:
+                case 182:
+                case 200:
                 default:
                     return false;
             }
@@ -30064,7 +30493,7 @@ var ts;
         }
         function checkBinaryLikeExpression(left, operatorToken, right, contextualMapper, errorNode) {
             var operator = operatorToken.kind;
-            if (operator === 57 && (left.kind === 172 || left.kind === 171)) {
+            if (operator === 57 && (left.kind === 176 || left.kind === 175)) {
                 return checkDestructuringAssignment(left, checkExpression(right, contextualMapper), contextualMapper);
             }
             var leftType = checkExpression(left, contextualMapper);
@@ -30221,8 +30650,7 @@ var ts;
             }
             function checkAssignmentOperator(valueType) {
                 if (produceDiagnostics && operator >= 57 && operator <= 69) {
-                    var ok = checkReferenceExpression(left, ts.Diagnostics.Invalid_left_hand_side_of_assignment_expression, ts.Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property);
-                    if (ok) {
+                    if (checkReferenceExpression(left, ts.Diagnostics.The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access)) {
                         checkTypeAssignableTo(valueType, leftType, left, undefined);
                     }
                 }
@@ -30248,7 +30676,7 @@ var ts;
         }
         function checkYieldExpression(node) {
             if (produceDiagnostics) {
-                if (!(node.flags & 65536) || isYieldExpressionInClass(node)) {
+                if (!(node.flags & 131072) || isYieldExpressionInClass(node)) {
                     grammarErrorOnFirstToken(node, ts.Diagnostics.A_yield_expression_is_only_allowed_in_a_generator_body);
                 }
                 if (isInParameterInitializerBeforeContainingFunction(node)) {
@@ -30322,8 +30750,8 @@ var ts;
             return links.resolvedType;
         }
         function isTypeAssertion(node) {
-            node = skipParenthesizedNodes(node);
-            return node.kind === 178 || node.kind === 196;
+            node = ts.skipParentheses(node);
+            return node.kind === 182 || node.kind === 200;
         }
         function checkDeclarationInitializer(declaration) {
             var type = checkExpressionCached(declaration.initializer);
@@ -30349,14 +30777,14 @@ var ts;
             return isTypeAssertion(node) || isLiteralContextualType(getContextualType(node)) ? type : getWidenedLiteralType(type);
         }
         function checkPropertyAssignment(node, contextualMapper) {
-            if (node.name.kind === 141) {
+            if (node.name.kind === 142) {
                 checkComputedPropertyName(node.name);
             }
             return checkExpressionForMutableLocation(node.initializer, contextualMapper);
         }
         function checkObjectLiteralMethod(node, contextualMapper) {
             checkGrammarMethod(node);
-            if (node.name.kind === 141) {
+            if (node.name.kind === 142) {
                 checkComputedPropertyName(node.name);
             }
             var uninstantiatedType = checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper);
@@ -30379,7 +30807,7 @@ var ts;
         }
         function checkExpression(node, contextualMapper) {
             var type;
-            if (node.kind === 140) {
+            if (node.kind === 141) {
                 type = checkQualifiedName(node);
             }
             else {
@@ -30387,9 +30815,9 @@ var ts;
                 type = instantiateTypeWithSingleGenericCallSignature(node, uninstantiatedType, contextualMapper);
             }
             if (isConstEnumObjectType(type)) {
-                var ok = (node.parent.kind === 173 && node.parent.expression === node) ||
-                    (node.parent.kind === 174 && node.parent.expression === node) ||
-                    ((node.kind === 70 || node.kind === 140) && isInRightSideOfImportOrExportAssignment(node));
+                var ok = (node.parent.kind === 177 && node.parent.expression === node) ||
+                    (node.parent.kind === 178 && node.parent.expression === node) ||
+                    ((node.kind === 70 || node.kind === 141) && isInRightSideOfImportOrExportAssignment(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);
                 }
@@ -30411,66 +30839,66 @@ var ts;
                 case 100:
                 case 85:
                     return checkLiteralExpression(node);
-                case 190:
+                case 194:
                     return checkTemplateExpression(node);
                 case 12:
                     return stringType;
                 case 11:
                     return globalRegExpType;
-                case 171:
-                    return checkArrayLiteral(node, contextualMapper);
-                case 172:
-                    return checkObjectLiteral(node, contextualMapper);
-                case 173:
-                    return checkPropertyAccessExpression(node);
-                case 174:
-                    return checkIndexedAccess(node);
                 case 175:
+                    return checkArrayLiteral(node, contextualMapper);
                 case 176:
-                    return checkCallExpression(node);
+                    return checkObjectLiteral(node, contextualMapper);
                 case 177:
-                    return checkTaggedTemplateExpression(node);
-                case 179:
-                    return checkExpression(node.expression, contextualMapper);
-                case 193:
-                    return checkClassExpression(node);
-                case 180:
-                case 181:
-                    return checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper);
-                case 183:
-                    return checkTypeOfExpression(node);
+                    return checkPropertyAccessExpression(node);
                 case 178:
-                case 196:
-                    return checkAssertion(node);
+                    return checkIndexedAccess(node);
+                case 179:
+                case 180:
+                    return checkCallExpression(node);
+                case 181:
+                    return checkTaggedTemplateExpression(node);
+                case 183:
+                    return checkExpression(node.expression, contextualMapper);
                 case 197:
-                    return checkNonNullAssertion(node);
-                case 182:
-                    return checkDeleteExpression(node);
+                    return checkClassExpression(node);
                 case 184:
-                    return checkVoidExpression(node);
                 case 185:
-                    return checkAwaitExpression(node);
-                case 186:
-                    return checkPrefixUnaryExpression(node);
+                    return checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper);
                 case 187:
-                    return checkPostfixUnaryExpression(node);
+                    return checkTypeOfExpression(node);
+                case 182:
+                case 200:
+                    return checkAssertion(node);
+                case 201:
+                    return checkNonNullAssertion(node);
+                case 186:
+                    return checkDeleteExpression(node);
                 case 188:
-                    return checkBinaryExpression(node, contextualMapper);
+                    return checkVoidExpression(node);
                 case 189:
-                    return checkConditionalExpression(node, contextualMapper);
-                case 192:
-                    return checkSpreadElementExpression(node, contextualMapper);
-                case 194:
-                    return undefinedWideningType;
+                    return checkAwaitExpression(node);
+                case 190:
+                    return checkPrefixUnaryExpression(node);
                 case 191:
+                    return checkPostfixUnaryExpression(node);
+                case 192:
+                    return checkBinaryExpression(node, contextualMapper);
+                case 193:
+                    return checkConditionalExpression(node, contextualMapper);
+                case 196:
+                    return checkSpreadExpression(node, contextualMapper);
+                case 198:
+                    return undefinedWideningType;
+                case 195:
                     return checkYieldExpression(node);
-                case 248:
+                case 252:
                     return checkJsxExpression(node);
-                case 242:
+                case 246:
                     return checkJsxElement(node);
-                case 243:
+                case 247:
                     return checkJsxSelfClosingElement(node);
-                case 244:
+                case 248:
                     ts.Debug.fail("Shouldn't ever directly check a JsxOpeningElement");
             }
             return unknownType;
@@ -30491,7 +30919,7 @@ var ts;
             var func = ts.getContainingFunction(node);
             if (ts.getModifierFlags(node) & 92) {
                 func = ts.getContainingFunction(node);
-                if (!(func.kind === 149 && ts.nodeIsPresent(func.body))) {
+                if (!(func.kind === 150 && ts.nodeIsPresent(func.body))) {
                     error(node, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
                 }
             }
@@ -30502,7 +30930,7 @@ var ts;
                 if (ts.indexOf(func.parameters, node) !== 0) {
                     error(node, ts.Diagnostics.A_this_parameter_must_be_the_first_parameter);
                 }
-                if (func.kind === 149 || func.kind === 153 || func.kind === 158) {
+                if (func.kind === 150 || func.kind === 154 || func.kind === 159) {
                     error(node, ts.Diagnostics.A_constructor_cannot_have_a_this_parameter);
                 }
             }
@@ -30514,9 +30942,9 @@ var ts;
             if (!node.asteriskToken || !node.body) {
                 return false;
             }
-            return node.kind === 148 ||
-                node.kind === 221 ||
-                node.kind === 180;
+            return node.kind === 149 ||
+                node.kind === 225 ||
+                node.kind === 184;
         }
         function getTypePredicateParameterIndex(parameterList, parameter) {
             if (parameterList) {
@@ -30557,9 +30985,9 @@ var ts;
                 else if (parameterName) {
                     var hasReportedError = false;
                     for (var _i = 0, _a = parent.parameters; _i < _a.length; _i++) {
-                        var name_18 = _a[_i].name;
-                        if (ts.isBindingPattern(name_18) &&
-                            checkIfTypePredicateVariableIsDeclaredInBindingPattern(name_18, parameterName, typePredicate.parameterName)) {
+                        var name_22 = _a[_i].name;
+                        if (ts.isBindingPattern(name_22) &&
+                            checkIfTypePredicateVariableIsDeclaredInBindingPattern(name_22, parameterName, typePredicate.parameterName)) {
                             hasReportedError = true;
                             break;
                         }
@@ -30572,16 +31000,16 @@ var ts;
         }
         function getTypePredicateParent(node) {
             switch (node.parent.kind) {
-                case 181:
-                case 152:
-                case 221:
-                case 180:
-                case 157:
+                case 185:
+                case 153:
+                case 225:
+                case 184:
+                case 158:
+                case 149:
                 case 148:
-                case 147:
-                    var parent_12 = node.parent;
-                    if (node === parent_12.type) {
-                        return parent_12;
+                    var parent_10 = node.parent;
+                    if (node === parent_10.type) {
+                        return parent_10;
                     }
             }
         }
@@ -30591,27 +31019,27 @@ var ts;
                 if (ts.isOmittedExpression(element)) {
                     continue;
                 }
-                var name_19 = element.name;
-                if (name_19.kind === 70 &&
-                    name_19.text === predicateVariableName) {
+                var name_23 = element.name;
+                if (name_23.kind === 70 &&
+                    name_23.text === predicateVariableName) {
                     error(predicateVariableNode, ts.Diagnostics.A_type_predicate_cannot_reference_element_0_in_a_binding_pattern, predicateVariableName);
                     return true;
                 }
-                else if (name_19.kind === 169 ||
-                    name_19.kind === 168) {
-                    if (checkIfTypePredicateVariableIsDeclaredInBindingPattern(name_19, predicateVariableNode, predicateVariableName)) {
+                else if (name_23.kind === 173 ||
+                    name_23.kind === 172) {
+                    if (checkIfTypePredicateVariableIsDeclaredInBindingPattern(name_23, predicateVariableNode, predicateVariableName)) {
                         return true;
                     }
                 }
             }
         }
         function checkSignatureDeclaration(node) {
-            if (node.kind === 154) {
+            if (node.kind === 155) {
                 checkGrammarIndexSignature(node);
             }
-            else if (node.kind === 157 || node.kind === 221 || node.kind === 158 ||
-                node.kind === 152 || node.kind === 149 ||
-                node.kind === 153) {
+            else if (node.kind === 158 || node.kind === 225 || node.kind === 159 ||
+                node.kind === 153 || node.kind === 150 ||
+                node.kind === 154) {
                 checkGrammarFunctionLikeDeclaration(node);
             }
             checkTypeParameters(node.typeParameters);
@@ -30623,10 +31051,10 @@ var ts;
                 checkCollisionWithArgumentsInGeneratedCode(node);
                 if (compilerOptions.noImplicitAny && !node.type) {
                     switch (node.kind) {
-                        case 153:
+                        case 154:
                             error(node, ts.Diagnostics.Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
-                        case 152:
+                        case 153:
                             error(node, ts.Diagnostics.Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
                     }
@@ -30653,17 +31081,11 @@ var ts;
             }
         }
         function checkClassForDuplicateDeclarations(node) {
-            var Accessor;
-            (function (Accessor) {
-                Accessor[Accessor["Getter"] = 1] = "Getter";
-                Accessor[Accessor["Setter"] = 2] = "Setter";
-                Accessor[Accessor["Property"] = 3] = "Property";
-            })(Accessor || (Accessor = {}));
             var instanceNames = ts.createMap();
             var staticNames = ts.createMap();
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                if (member.kind === 149) {
+                if (member.kind === 150) {
                     for (var _b = 0, _c = member.parameters; _b < _c.length; _b++) {
                         var param = _c[_b];
                         if (ts.isParameterPropertyDeclaration(param)) {
@@ -30677,13 +31099,13 @@ var ts;
                     var memberName = member.name && ts.getPropertyNameForPropertyNameNode(member.name);
                     if (memberName) {
                         switch (member.kind) {
-                            case 150:
+                            case 151:
                                 addName(names, member.name, memberName, 1);
                                 break;
-                            case 151:
+                            case 152:
                                 addName(names, member.name, memberName, 2);
                                 break;
-                            case 146:
+                            case 147:
                                 addName(names, member.name, memberName, 3);
                                 break;
                         }
@@ -30709,7 +31131,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 == 145) {
+                if (member.kind == 146) {
                     var memberName = void 0;
                     switch (member.name.kind) {
                         case 9:
@@ -30731,7 +31153,7 @@ var ts;
             }
         }
         function checkTypeForDuplicateIndexSignatures(node) {
-            if (node.kind === 223) {
+            if (node.kind === 227) {
                 var nodeSymbol = getSymbolOfNode(node);
                 if (nodeSymbol.declarations.length > 0 && nodeSymbol.declarations[0] !== node) {
                     return;
@@ -30746,7 +31168,7 @@ var ts;
                     var declaration = decl;
                     if (declaration.parameters.length === 1 && declaration.parameters[0].type) {
                         switch (declaration.parameters[0].type.kind) {
-                            case 133:
+                            case 134:
                                 if (!seenStringIndexer) {
                                     seenStringIndexer = true;
                                 }
@@ -30754,7 +31176,7 @@ var ts;
                                     error(declaration, ts.Diagnostics.Duplicate_string_index_signature);
                                 }
                                 break;
-                            case 131:
+                            case 132:
                                 if (!seenNumericIndexer) {
                                     seenNumericIndexer = true;
                                 }
@@ -30813,12 +31235,12 @@ var ts;
                 if (n.kind === 98) {
                     error(n, ts.Diagnostics.this_cannot_be_referenced_in_current_location);
                 }
-                else if (n.kind !== 180 && n.kind !== 221) {
+                else if (n.kind !== 184 && n.kind !== 225) {
                     ts.forEachChild(n, markThisReferencesAsErrors);
                 }
             }
             function isInstancePropertyWithInitializer(n) {
-                return n.kind === 146 &&
+                return n.kind === 147 &&
                     !(ts.getModifierFlags(n) & 32) &&
                     !!n.initializer;
             }
@@ -30838,7 +31260,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 === 203 && ts.isSuperCall(statement.expression)) {
+                            if (statement.kind === 207 && ts.isSuperCall(statement.expression)) {
                                 superCallStatement = statement;
                                 break;
                             }
@@ -30861,18 +31283,18 @@ var ts;
                 checkGrammarFunctionLikeDeclaration(node) || checkGrammarAccessor(node) || checkGrammarComputedPropertyName(node.name);
                 checkDecorators(node);
                 checkSignatureDeclaration(node);
-                if (node.kind === 150) {
+                if (node.kind === 151) {
                     if (!ts.isInAmbientContext(node) && 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 === 141) {
+                if (node.name.kind === 142) {
                     checkComputedPropertyName(node.name);
                 }
                 if (!ts.hasDynamicName(node)) {
-                    var otherKind = node.kind === 150 ? 151 : 150;
+                    var otherKind = node.kind === 151 ? 152 : 151;
                     var otherAccessor = ts.getDeclarationOfKind(node.symbol, otherKind);
                     if (otherAccessor) {
                         if ((ts.getModifierFlags(node) & 28) !== (ts.getModifierFlags(otherAccessor) & 28)) {
@@ -30886,11 +31308,11 @@ var ts;
                     }
                 }
                 var returnType = getTypeOfAccessors(getSymbolOfNode(node));
-                if (node.kind === 150) {
+                if (node.kind === 151) {
                     checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnType);
                 }
             }
-            if (node.parent.kind !== 172) {
+            if (node.parent.kind !== 176) {
                 checkSourceElement(node.body);
                 registerForUnusedIdentifiersCheck(node);
             }
@@ -30920,7 +31342,7 @@ var ts;
                 var constraint = getConstraintOfTypeParameter(typeParameters[i]);
                 if (constraint) {
                     if (!typeArguments) {
-                        typeArguments = ts.map(typeArgumentNodes, getTypeFromTypeNodeNoAlias);
+                        typeArguments = ts.map(typeArgumentNodes, getTypeFromTypeNode);
                         mapper = createTypeMapper(typeParameters, typeArguments);
                     }
                     var typeArgument = typeArguments[i];
@@ -30971,14 +31393,25 @@ var ts;
         function checkUnionOrIntersectionType(node) {
             ts.forEach(node.types, checkSourceElement);
         }
+        function checkIndexedAccessType(node) {
+            getTypeFromIndexedAccessTypeNode(node);
+        }
+        function checkMappedType(node) {
+            checkSourceElement(node.typeParameter);
+            checkSourceElement(node.type);
+            var type = getTypeFromMappedTypeNode(node);
+            var constraintType = getConstraintTypeFromMappedType(type);
+            var keyType = constraintType.flags & 16384 ? getApparentTypeOfTypeParameter(constraintType) : constraintType;
+            checkTypeAssignableTo(keyType, stringOrNumberType, node.typeParameter.constraint);
+        }
         function isPrivateWithinAmbient(node) {
             return (ts.getModifierFlags(node) & 8) && ts.isInAmbientContext(node);
         }
         function getEffectiveDeclarationFlags(n, flagsToCheck) {
             var flags = ts.getCombinedModifierFlags(n);
-            if (n.parent.kind !== 223 &&
-                n.parent.kind !== 222 &&
-                n.parent.kind !== 193 &&
+            if (n.parent.kind !== 227 &&
+                n.parent.kind !== 226 &&
+                n.parent.kind !== 197 &&
                 ts.isInAmbientContext(n)) {
                 if (!(flags & 2)) {
                     flags |= 1;
@@ -31055,7 +31488,7 @@ var ts;
                     if (subsequentNode.kind === node.kind) {
                         var errorNode_1 = subsequentNode.name || subsequentNode;
                         if (node.name && subsequentNode.name && node.name.text === subsequentNode.name.text) {
-                            var reportError = (node.kind === 148 || node.kind === 147) &&
+                            var reportError = (node.kind === 149 || node.kind === 148) &&
                                 (ts.getModifierFlags(node) & 32) !== (ts.getModifierFlags(subsequentNode) & 32);
                             if (reportError) {
                                 var diagnostic = ts.getModifierFlags(node) & 32 ? ts.Diagnostics.Function_overload_must_be_static : ts.Diagnostics.Function_overload_must_not_be_static;
@@ -31088,11 +31521,11 @@ var ts;
                 var current = declarations_4[_i];
                 var node = current;
                 var inAmbientContext = ts.isInAmbientContext(node);
-                var inAmbientContextOrInterface = node.parent.kind === 223 || node.parent.kind === 160 || inAmbientContext;
+                var inAmbientContextOrInterface = node.parent.kind === 227 || node.parent.kind === 161 || inAmbientContext;
                 if (inAmbientContextOrInterface) {
                     previousDeclaration = undefined;
                 }
-                if (node.kind === 221 || node.kind === 148 || node.kind === 147 || node.kind === 149) {
+                if (node.kind === 225 || node.kind === 149 || node.kind === 148 || node.kind === 150) {
                     var currentNodeFlags = getEffectiveDeclarationFlags(node, flagsToCheck);
                     someNodeFlags |= currentNodeFlags;
                     allNodeFlags &= currentNodeFlags;
@@ -31203,16 +31636,16 @@ var ts;
             }
             function getDeclarationSpaces(d) {
                 switch (d.kind) {
-                    case 223:
+                    case 227:
                         return 2097152;
-                    case 226:
+                    case 230:
                         return ts.isAmbientModule(d) || ts.getModuleInstanceState(d) !== 0
                             ? 4194304 | 1048576
                             : 4194304;
-                    case 222:
-                    case 225:
+                    case 226:
+                    case 229:
                         return 2097152 | 1048576;
-                    case 230:
+                    case 234:
                         var result_2 = 0;
                         var target = resolveAlias(getSymbolOfNode(d));
                         ts.forEach(target.declarations, function (d) { result_2 |= getDeclarationSpaces(d); });
@@ -31239,7 +31672,7 @@ var ts;
             if (isTypeAny(promise)) {
                 return undefined;
             }
-            if (promise.flags & 131072) {
+            if (getObjectFlags(promise) & 4) {
                 if (promise.target === tryGetGlobalPromiseType()
                     || promise.target === getGlobalPromiseLikeType()) {
                     return promise.typeArguments[0];
@@ -31276,7 +31709,7 @@ var ts;
         function checkAwaitedType(type, location, message) {
             return checkAwaitedTypeWorker(type);
             function checkAwaitedTypeWorker(type) {
-                if (type.flags & 524288) {
+                if (type.flags & 65536) {
                     var types = [];
                     for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                         var constituentType = _a[_i];
@@ -31304,51 +31737,50 @@ var ts;
                 }
             }
         }
-        function checkCorrectPromiseType(returnType, location, diagnostic, typeName) {
-            if (returnType === unknownType) {
-                return unknownType;
-            }
-            var globalPromiseType = getGlobalPromiseType();
-            if (globalPromiseType === emptyGenericType
-                || globalPromiseType === getTargetType(returnType)) {
-                return checkAwaitedType(returnType, location, ts.Diagnostics.An_async_function_or_method_must_have_a_valid_awaitable_return_type);
-            }
-            error(location, diagnostic, typeName);
-            return unknownType;
-        }
         function checkAsyncFunctionReturnType(node) {
+            var returnType = getTypeFromTypeNode(node.type);
             if (languageVersion >= 2) {
-                var returnType = getTypeFromTypeNode(node.type);
-                return checkCorrectPromiseType(returnType, node.type, ts.Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type);
+                if (returnType === unknownType) {
+                    return unknownType;
+                }
+                var globalPromiseType = getGlobalPromiseType();
+                if (globalPromiseType !== emptyGenericType && globalPromiseType !== getTargetType(returnType)) {
+                    error(node.type, ts.Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type);
+                    return unknownType;
+                }
             }
-            var globalPromiseConstructorLikeType = getGlobalPromiseConstructorLikeType();
-            if (globalPromiseConstructorLikeType === emptyObjectType) {
-                return unknownType;
+            else {
+                markTypeNodeAsReferenced(node.type);
+                if (returnType === unknownType) {
+                    return unknownType;
+                }
+                var promiseConstructorName = ts.getEntityNameFromTypeNode(node.type);
+                if (promiseConstructorName === undefined) {
+                    error(node.type, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, typeToString(returnType));
+                    return unknownType;
+                }
+                var promiseConstructorSymbol = resolveEntityName(promiseConstructorName, 107455, true);
+                var promiseConstructorType = promiseConstructorSymbol ? getTypeOfSymbol(promiseConstructorSymbol) : unknownType;
+                if (promiseConstructorType === unknownType) {
+                    error(node.type, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, ts.entityNameToString(promiseConstructorName));
+                    return unknownType;
+                }
+                var globalPromiseConstructorLikeType = getGlobalPromiseConstructorLikeType();
+                if (globalPromiseConstructorLikeType === emptyObjectType) {
+                    error(node.type, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, ts.entityNameToString(promiseConstructorName));
+                    return unknownType;
+                }
+                if (!checkTypeAssignableTo(promiseConstructorType, globalPromiseConstructorLikeType, node.type, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value)) {
+                    return unknownType;
+                }
+                var rootName = promiseConstructorName && getFirstIdentifier(promiseConstructorName);
+                var collidingSymbol = getSymbol(node.locals, rootName.text, 107455);
+                if (collidingSymbol) {
+                    error(collidingSymbol.valueDeclaration, ts.Diagnostics.Duplicate_identifier_0_Compiler_uses_declaration_1_to_support_async_functions, rootName.text, ts.entityNameToString(promiseConstructorName));
+                    return unknownType;
+                }
             }
-            var promiseType = getTypeFromTypeNode(node.type);
-            if (promiseType === unknownType && compilerOptions.isolatedModules) {
-                return unknownType;
-            }
-            var promiseConstructor = getNodeLinks(node.type).resolvedSymbol;
-            if (!promiseConstructor || !symbolIsValue(promiseConstructor)) {
-                var typeName = promiseConstructor
-                    ? symbolToString(promiseConstructor)
-                    : typeToString(promiseType);
-                return checkCorrectPromiseType(promiseType, node.type, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type, typeName);
-            }
-            checkReturnTypeAnnotationAsExpression(node);
-            var promiseConstructorType = getTypeOfSymbol(promiseConstructor);
-            if (!checkTypeAssignableTo(promiseConstructorType, globalPromiseConstructorLikeType, node.type, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type)) {
-                return unknownType;
-            }
-            var promiseName = ts.getEntityNameFromTypeNode(node.type);
-            var promiseNameOrNamespaceRoot = getFirstIdentifier(promiseName);
-            var rootSymbol = getSymbol(node.locals, promiseNameOrNamespaceRoot.text, 107455);
-            if (rootSymbol) {
-                error(rootSymbol.valueDeclaration, ts.Diagnostics.Duplicate_identifier_0_Compiler_uses_declaration_1_to_support_async_functions, promiseNameOrNamespaceRoot.text, getFullyQualifiedName(promiseConstructor));
-                return unknownType;
-            }
-            return checkAwaitedType(promiseType, node, ts.Diagnostics.An_async_function_or_method_must_have_a_valid_awaitable_return_type);
+            return checkAwaitedType(returnType, node, ts.Diagnostics.An_async_function_or_method_must_have_a_valid_awaitable_return_type);
         }
         function checkDecorator(node) {
             var signature = getResolvedSignature(node);
@@ -31360,22 +31792,22 @@ var ts;
             var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
             var errorInfo;
             switch (node.parent.kind) {
-                case 222:
+                case 226:
                     var classSymbol = getSymbolOfNode(node.parent);
                     var classConstructorType = getTypeOfSymbol(classSymbol);
                     expectedReturnType = getUnionType([classConstructorType, voidType]);
                     break;
-                case 143:
+                case 144:
                     expectedReturnType = voidType;
                     errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any);
                     break;
-                case 146:
+                case 147:
                     expectedReturnType = voidType;
                     errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.The_return_type_of_a_property_decorator_function_must_be_either_void_or_any);
                     break;
-                case 148:
-                case 150:
+                case 149:
                 case 151:
+                case 152:
                     var methodType = getTypeOfNode(node.parent);
                     var descriptorType = createTypedPropertyDescriptorType(methodType);
                     expectedReturnType = getUnionType([descriptorType, voidType]);
@@ -31383,29 +31815,15 @@ var ts;
             }
             checkTypeAssignableTo(returnType, expectedReturnType, node, headMessage, errorInfo);
         }
-        function checkTypeNodeAsExpression(node) {
-            if (node && node.kind === 156) {
-                var root = getFirstIdentifier(node.typeName);
-                var meaning = root.parent.kind === 156 ? 793064 : 1920;
-                var rootSymbol = resolveName(root, root.text, meaning | 8388608, undefined, undefined);
-                if (rootSymbol && rootSymbol.flags & 8388608) {
-                    var aliasTarget = resolveAlias(rootSymbol);
-                    if (aliasTarget.flags & 107455 && !isConstEnumOrConstEnumOnlyModule(resolveAlias(rootSymbol))) {
-                        markAliasSymbolAsReferenced(rootSymbol);
-                    }
-                }
-            }
-        }
-        function checkTypeAnnotationAsExpression(node) {
-            checkTypeNodeAsExpression(node.type);
-        }
-        function checkReturnTypeAnnotationAsExpression(node) {
-            checkTypeNodeAsExpression(node.type);
-        }
-        function checkParameterTypeAnnotationsAsExpressions(node) {
-            for (var _i = 0, _a = node.parameters; _i < _a.length; _i++) {
-                var parameter = _a[_i];
-                checkTypeAnnotationAsExpression(parameter);
+        function markTypeNodeAsReferenced(node) {
+            var typeName = node && ts.getEntityNameFromTypeNode(node);
+            var rootName = typeName && getFirstIdentifier(typeName);
+            var rootSymbol = rootName && resolveName(rootName, rootName.text, (typeName.kind === 70 ? 793064 : 1920) | 8388608, undefined, undefined);
+            if (rootSymbol
+                && rootSymbol.flags & 8388608
+                && symbolIsValue(rootSymbol)
+                && !isConstEnumOrConstEnumOnlyModule(resolveAlias(rootSymbol))) {
+                markAliasSymbolAsReferenced(rootSymbol);
             }
         }
         function checkDecorators(node) {
@@ -31420,21 +31838,27 @@ var ts;
             }
             if (compilerOptions.emitDecoratorMetadata) {
                 switch (node.kind) {
-                    case 222:
+                    case 226:
                         var constructor = ts.getFirstConstructorWithBody(node);
                         if (constructor) {
-                            checkParameterTypeAnnotationsAsExpressions(constructor);
+                            for (var _i = 0, _a = constructor.parameters; _i < _a.length; _i++) {
+                                var parameter = _a[_i];
+                                markTypeNodeAsReferenced(parameter.type);
+                            }
                         }
                         break;
-                    case 148:
-                    case 150:
+                    case 149:
                     case 151:
-                        checkParameterTypeAnnotationsAsExpressions(node);
-                        checkReturnTypeAnnotationAsExpression(node);
+                    case 152:
+                        for (var _b = 0, _c = node.parameters; _b < _c.length; _b++) {
+                            var parameter = _c[_b];
+                            markTypeNodeAsReferenced(parameter.type);
+                        }
+                        markTypeNodeAsReferenced(node.type);
                         break;
-                    case 146:
-                    case 143:
-                        checkTypeAnnotationAsExpression(node);
+                    case 147:
+                    case 144:
+                        markTypeNodeAsReferenced(node.type);
                         break;
                 }
             }
@@ -31453,7 +31877,7 @@ var ts;
             checkDecorators(node);
             checkSignatureDeclaration(node);
             var isAsync = ts.isAsyncFunctionLike(node);
-            if (node.name && node.name.kind === 141) {
+            if (node.name && node.name.kind === 142) {
                 checkComputedPropertyName(node.name);
             }
             if (!ts.hasDynamicName(node)) {
@@ -31495,43 +31919,43 @@ var ts;
                 for (var _i = 0, deferredUnusedIdentifierNodes_1 = deferredUnusedIdentifierNodes; _i < deferredUnusedIdentifierNodes_1.length; _i++) {
                     var node = deferredUnusedIdentifierNodes_1[_i];
                     switch (node.kind) {
-                        case 256:
-                        case 226:
+                        case 261:
+                        case 230:
                             checkUnusedModuleMembers(node);
                             break;
-                        case 222:
-                        case 193:
+                        case 226:
+                        case 197:
                             checkUnusedClassMembers(node);
                             checkUnusedTypeParameters(node);
                             break;
-                        case 223:
+                        case 227:
                             checkUnusedTypeParameters(node);
                             break;
-                        case 200:
-                        case 228:
-                        case 207:
-                        case 208:
-                        case 209:
+                        case 204:
+                        case 232:
+                        case 211:
+                        case 212:
+                        case 213:
                             checkUnusedLocalsAndParameters(node);
                             break;
-                        case 149:
-                        case 180:
-                        case 221:
-                        case 181:
-                        case 148:
                         case 150:
+                        case 184:
+                        case 225:
+                        case 185:
+                        case 149:
                         case 151:
+                        case 152:
                             if (node.body) {
                                 checkUnusedLocalsAndParameters(node);
                             }
                             checkUnusedTypeParameters(node);
                             break;
-                        case 147:
-                        case 152:
+                        case 148:
                         case 153:
                         case 154:
-                        case 157:
+                        case 155:
                         case 158:
+                        case 159:
                             checkUnusedTypeParameters(node);
                             break;
                     }
@@ -31540,43 +31964,57 @@ var ts;
             }
         }
         function checkUnusedLocalsAndParameters(node) {
-            if (node.parent.kind !== 223 && noUnusedIdentifiers && !ts.isInAmbientContext(node)) {
-                var _loop_1 = function (key) {
+            if (node.parent.kind !== 227 && noUnusedIdentifiers && !ts.isInAmbientContext(node)) {
+                var _loop_3 = function (key) {
                     var local = node.locals[key];
                     if (!local.isReferenced) {
-                        if (local.valueDeclaration && local.valueDeclaration.kind === 143) {
-                            var parameter = local.valueDeclaration;
+                        if (local.valueDeclaration && ts.getRootDeclaration(local.valueDeclaration).kind === 144) {
+                            var parameter = ts.getRootDeclaration(local.valueDeclaration);
                             if (compilerOptions.noUnusedParameters &&
                                 !ts.isParameterPropertyDeclaration(parameter) &&
                                 !ts.parameterIsThisKeyword(parameter) &&
-                                !parameterNameStartsWithUnderscore(parameter)) {
+                                !parameterNameStartsWithUnderscore(local.valueDeclaration.name)) {
                                 error(local.valueDeclaration.name, ts.Diagnostics._0_is_declared_but_never_used, local.name);
                             }
                         }
                         else if (compilerOptions.noUnusedLocals) {
-                            ts.forEach(local.declarations, function (d) { return error(d.name || d, ts.Diagnostics._0_is_declared_but_never_used, local.name); });
+                            ts.forEach(local.declarations, function (d) { return errorUnusedLocal(d.name || d, local.name); });
                         }
                     }
                 };
                 for (var key in node.locals) {
-                    _loop_1(key);
+                    _loop_3(key);
                 }
             }
         }
-        function parameterNameStartsWithUnderscore(parameter) {
-            return parameter.name && parameter.name.kind === 70 && parameter.name.text.charCodeAt(0) === 95;
+        function errorUnusedLocal(node, name) {
+            if (isIdentifierThatStartsWithUnderScore(node)) {
+                var declaration = ts.getRootDeclaration(node.parent);
+                if (declaration.kind === 223 &&
+                    (declaration.parent.parent.kind === 212 ||
+                        declaration.parent.parent.kind === 213)) {
+                    return;
+                }
+            }
+            error(node, ts.Diagnostics._0_is_declared_but_never_used, name);
+        }
+        function parameterNameStartsWithUnderscore(parameterName) {
+            return parameterName && isIdentifierThatStartsWithUnderScore(parameterName);
+        }
+        function isIdentifierThatStartsWithUnderScore(node) {
+            return node.kind === 70 && node.text.charCodeAt(0) === 95;
         }
         function checkUnusedClassMembers(node) {
             if (compilerOptions.noUnusedLocals && !ts.isInAmbientContext(node)) {
                 if (node.members) {
                     for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                         var member = _a[_i];
-                        if (member.kind === 148 || member.kind === 146) {
+                        if (member.kind === 149 || member.kind === 147) {
                             if (!member.symbol.isReferenced && ts.getModifierFlags(member) & 8) {
                                 error(member.name, ts.Diagnostics._0_is_declared_but_never_used, member.symbol.name);
                             }
                         }
-                        else if (member.kind === 149) {
+                        else if (member.kind === 150) {
                             for (var _b = 0, _c = member.parameters; _b < _c.length; _b++) {
                                 var parameter = _c[_b];
                                 if (!parameter.symbol.isReferenced && ts.getModifierFlags(parameter) & 8) {
@@ -31621,7 +32059,7 @@ var ts;
             }
         }
         function checkBlock(node) {
-            if (node.kind === 200) {
+            if (node.kind === 204) {
                 checkGrammarStatementInAmbientContext(node);
             }
             ts.forEach(node.statements, checkSourceElement);
@@ -31643,19 +32081,19 @@ var ts;
             if (!(identifier && identifier.text === name)) {
                 return false;
             }
-            if (node.kind === 146 ||
-                node.kind === 145 ||
+            if (node.kind === 147 ||
+                node.kind === 146 ||
+                node.kind === 149 ||
                 node.kind === 148 ||
-                node.kind === 147 ||
-                node.kind === 150 ||
-                node.kind === 151) {
+                node.kind === 151 ||
+                node.kind === 152) {
                 return false;
             }
             if (ts.isInAmbientContext(node)) {
                 return false;
             }
             var root = ts.getRootDeclaration(node);
-            if (root.kind === 143 && ts.nodeIsMissing(root.parent.body)) {
+            if (root.kind === 144 && ts.nodeIsMissing(root.parent.body)) {
                 return false;
             }
             return true;
@@ -31706,11 +32144,11 @@ var ts;
             if (!needCollisionCheckForIdentifier(node, name, "require") && !needCollisionCheckForIdentifier(node, name, "exports")) {
                 return;
             }
-            if (node.kind === 226 && ts.getModuleInstanceState(node) !== 1) {
+            if (node.kind === 230 && ts.getModuleInstanceState(node) !== 1) {
                 return;
             }
             var parent = getDeclarationContainer(node);
-            if (parent.kind === 256 && ts.isExternalOrCommonJsModule(parent)) {
+            if (parent.kind === 261 && 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));
             }
         }
@@ -31718,11 +32156,11 @@ var ts;
             if (!needCollisionCheckForIdentifier(node, name, "Promise")) {
                 return;
             }
-            if (node.kind === 226 && ts.getModuleInstanceState(node) !== 1) {
+            if (node.kind === 230 && ts.getModuleInstanceState(node) !== 1) {
                 return;
             }
             var parent = getDeclarationContainer(node);
-            if (parent.kind === 256 && ts.isExternalOrCommonJsModule(parent) && parent.flags & 8192) {
+            if (parent.kind === 261 && ts.isExternalOrCommonJsModule(parent) && parent.flags & 8192) {
                 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));
             }
         }
@@ -31730,7 +32168,7 @@ var ts;
             if ((ts.getCombinedNodeFlags(node) & 3) !== 0 || ts.isParameterDeclaration(node)) {
                 return;
             }
-            if (node.kind === 219 && !node.initializer) {
+            if (node.kind === 223 && !node.initializer) {
                 return;
             }
             var symbol = getSymbolOfNode(node);
@@ -31740,25 +32178,25 @@ var ts;
                     localDeclarationSymbol !== symbol &&
                     localDeclarationSymbol.flags & 2) {
                     if (getDeclarationNodeFlagsFromSymbol(localDeclarationSymbol) & 3) {
-                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 220);
-                        var container = varDeclList.parent.kind === 201 && varDeclList.parent.parent
+                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 224);
+                        var container = varDeclList.parent.kind === 205 && varDeclList.parent.parent
                             ? varDeclList.parent.parent
                             : undefined;
                         var namesShareScope = container &&
-                            (container.kind === 200 && ts.isFunctionLike(container.parent) ||
-                                container.kind === 227 ||
-                                container.kind === 226 ||
-                                container.kind === 256);
+                            (container.kind === 204 && ts.isFunctionLike(container.parent) ||
+                                container.kind === 231 ||
+                                container.kind === 230 ||
+                                container.kind === 261);
                         if (!namesShareScope) {
-                            var name_20 = symbolToString(localDeclarationSymbol);
-                            error(node, ts.Diagnostics.Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1, name_20, name_20);
+                            var name_24 = symbolToString(localDeclarationSymbol);
+                            error(node, ts.Diagnostics.Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1, name_24, name_24);
                         }
                     }
                 }
             }
         }
         function checkParameterInitializer(node) {
-            if (ts.getRootDeclaration(node).kind !== 143) {
+            if (ts.getRootDeclaration(node).kind !== 144) {
                 return;
             }
             var func = ts.getContainingFunction(node);
@@ -31767,7 +32205,7 @@ var ts;
                 if (ts.isTypeNode(n) || ts.isDeclarationName(n)) {
                     return;
                 }
-                if (n.kind === 173) {
+                if (n.kind === 177) {
                     return visit(n.expression);
                 }
                 else if (n.kind === 70) {
@@ -31781,7 +32219,7 @@ var ts;
                     }
                     var enclosingContainer = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
                     if (enclosingContainer === func) {
-                        if (symbol.valueDeclaration.kind === 143) {
+                        if (symbol.valueDeclaration.kind === 144) {
                             if (symbol.valueDeclaration.pos < node.pos) {
                                 return;
                             }
@@ -31790,7 +32228,7 @@ var ts;
                                 if (ts.isFunctionLike(current.parent)) {
                                     return;
                                 }
-                                if (current.parent.kind === 146 &&
+                                if (current.parent.kind === 147 &&
                                     !(ts.hasModifier(current.parent, 32)) &&
                                     ts.isClassLike(current.parent.parent)) {
                                     return;
@@ -31812,33 +32250,34 @@ var ts;
         function checkVariableLikeDeclaration(node) {
             checkDecorators(node);
             checkSourceElement(node.type);
-            if (node.name.kind === 141) {
+            if (node.name.kind === 142) {
                 checkComputedPropertyName(node.name);
                 if (node.initializer) {
                     checkExpressionCached(node.initializer);
                 }
             }
-            if (node.kind === 170) {
-                if (node.propertyName && node.propertyName.kind === 141) {
+            if (node.kind === 174) {
+                if (node.propertyName && node.propertyName.kind === 142) {
                     checkComputedPropertyName(node.propertyName);
                 }
-                var parent_13 = node.parent.parent;
-                var parentType = getTypeForBindingElementParent(parent_13);
-                var name_21 = node.propertyName || node.name;
-                var property = getPropertyOfType(parentType, getTextOfPropertyName(name_21));
-                if (parent_13.initializer && property && getParentOfSymbol(property)) {
-                    checkClassPropertyAccess(parent_13, parent_13.initializer, parentType, property);
+                var parent_11 = node.parent.parent;
+                var parentType = getTypeForBindingElementParent(parent_11);
+                var name_25 = node.propertyName || node.name;
+                var property = getPropertyOfType(parentType, ts.getTextOfPropertyName(name_25));
+                markPropertyAsReferenced(property);
+                if (parent_11.initializer && property && getParentOfSymbol(property)) {
+                    checkClassPropertyAccess(parent_11, parent_11.initializer, parentType, property);
                 }
             }
             if (ts.isBindingPattern(node.name)) {
                 ts.forEach(node.name.elements, checkSourceElement);
             }
-            if (node.initializer && ts.getRootDeclaration(node).kind === 143 && ts.nodeIsMissing(ts.getContainingFunction(node).body)) {
+            if (node.initializer && ts.getRootDeclaration(node).kind === 144 && 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 !== 208) {
+                if (node.initializer && node.parent.parent.kind !== 212) {
                     checkTypeAssignableTo(checkExpressionCached(node.initializer), getWidenedTypeForVariableLikeDeclaration(node), node, undefined);
                     checkParameterInitializer(node);
                 }
@@ -31847,7 +32286,7 @@ var ts;
             var symbol = getSymbolOfNode(node);
             var type = convertAutoToAny(getTypeOfVariableOrParameterOrProperty(symbol));
             if (node === symbol.valueDeclaration) {
-                if (node.initializer && node.parent.parent.kind !== 208) {
+                if (node.initializer && node.parent.parent.kind !== 212) {
                     checkTypeAssignableTo(checkExpressionCached(node.initializer), type, node, undefined);
                     checkParameterInitializer(node);
                 }
@@ -31865,9 +32304,9 @@ var ts;
                     error(node.name, ts.Diagnostics.All_declarations_of_0_must_have_identical_modifiers, ts.declarationNameToString(node.name));
                 }
             }
-            if (node.kind !== 146 && node.kind !== 145) {
+            if (node.kind !== 147 && node.kind !== 146) {
                 checkExportsOnMergedDeclarations(node);
-                if (node.kind === 219 || node.kind === 170) {
+                if (node.kind === 223 || node.kind === 174) {
                     checkVarDeclaredNamesNotShadowed(node);
                 }
                 checkCollisionWithCapturedSuperVariable(node, node.name);
@@ -31877,8 +32316,8 @@ var ts;
             }
         }
         function areDeclarationFlagsIdentical(left, right) {
-            if ((left.kind === 143 && right.kind === 219) ||
-                (left.kind === 219 && right.kind === 143)) {
+            if ((left.kind === 144 && right.kind === 223) ||
+                (left.kind === 223 && right.kind === 144)) {
                 return true;
             }
             if (ts.hasQuestionToken(left) !== ts.hasQuestionToken(right)) {
@@ -31905,7 +32344,7 @@ var ts;
             ts.forEach(node.declarationList.declarations, checkSourceElement);
         }
         function checkGrammarDisallowedModifiersOnObjectLiteralExpressionMethod(node) {
-            if (node.modifiers && node.parent.kind === 172) {
+            if (node.modifiers && node.parent.kind === 176) {
                 if (ts.isAsyncFunctionLike(node)) {
                     if (node.modifiers.length > 1) {
                         return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
@@ -31924,7 +32363,7 @@ var ts;
             checkGrammarStatementInAmbientContext(node);
             checkExpression(node.expression);
             checkSourceElement(node.thenStatement);
-            if (node.thenStatement.kind === 202) {
+            if (node.thenStatement.kind === 206) {
                 error(node.thenStatement, ts.Diagnostics.The_body_of_an_if_statement_cannot_be_the_empty_statement);
             }
             checkSourceElement(node.elseStatement);
@@ -31941,12 +32380,12 @@ var ts;
         }
         function checkForStatement(node) {
             if (!checkGrammarStatementInAmbientContext(node)) {
-                if (node.initializer && node.initializer.kind === 220) {
+                if (node.initializer && node.initializer.kind === 224) {
                     checkGrammarVariableDeclarationList(node.initializer);
                 }
             }
             if (node.initializer) {
-                if (node.initializer.kind === 220) {
+                if (node.initializer.kind === 224) {
                     ts.forEach(node.initializer.declarations, checkVariableDeclaration);
                 }
                 else {
@@ -31964,18 +32403,18 @@ var ts;
         }
         function checkForOfStatement(node) {
             checkGrammarForInOrForOfStatement(node);
-            if (node.initializer.kind === 220) {
+            if (node.initializer.kind === 224) {
                 checkForInOrForOfVariableDeclaration(node);
             }
             else {
                 var varExpr = node.initializer;
                 var iteratedType = checkRightHandSideOfForOf(node.expression);
-                if (varExpr.kind === 171 || varExpr.kind === 172) {
+                if (varExpr.kind === 175 || varExpr.kind === 176) {
                     checkDestructuringAssignment(varExpr, iteratedType || unknownType);
                 }
                 else {
                     var leftType = checkExpression(varExpr);
-                    checkReferenceExpression(varExpr, ts.Diagnostics.Invalid_left_hand_side_in_for_of_statement, ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_be_a_constant_or_a_read_only_property);
+                    checkReferenceExpression(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_must_be_a_variable_or_a_property_access);
                     if (iteratedType) {
                         checkTypeAssignableTo(iteratedType, leftType, varExpr, undefined);
                     }
@@ -31988,7 +32427,7 @@ var ts;
         }
         function checkForInStatement(node) {
             checkGrammarForInOrForOfStatement(node);
-            if (node.initializer.kind === 220) {
+            if (node.initializer.kind === 224) {
                 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);
@@ -31998,18 +32437,18 @@ var ts;
             else {
                 var varExpr = node.initializer;
                 var leftType = checkExpression(varExpr);
-                if (varExpr.kind === 171 || varExpr.kind === 172) {
+                if (varExpr.kind === 175 || varExpr.kind === 176) {
                     error(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
                 }
                 else if (!isTypeAnyOrAllConstituentTypesHaveKind(leftType, 34)) {
                     error(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any);
                 }
                 else {
-                    checkReferenceExpression(varExpr, ts.Diagnostics.Invalid_left_hand_side_in_for_in_statement, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_constant_or_a_read_only_property);
+                    checkReferenceExpression(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_must_be_a_variable_or_a_property_access);
                 }
             }
             var rightType = checkNonNullExpression(node.expression);
-            if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, 2588672 | 16384)) {
+            if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, 32768 | 16384)) {
                 error(node.expression, ts.Diagnostics.The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter);
             }
             checkSourceElement(node.statement);
@@ -32062,7 +32501,7 @@ var ts;
             }
             var typeAsIterable = type;
             if (!typeAsIterable.iterableElementType) {
-                if ((type.flags & 131072) && type.target === getGlobalIterableType()) {
+                if ((getObjectFlags(type) & 4) && type.target === getGlobalIterableType()) {
                     typeAsIterable.iterableElementType = type.typeArguments[0];
                 }
                 else {
@@ -32088,7 +32527,7 @@ var ts;
             }
             var typeAsIterator = type;
             if (!typeAsIterator.iteratorElementType) {
-                if ((type.flags & 131072) && type.target === getGlobalIteratorType()) {
+                if ((getObjectFlags(type) & 4) && type.target === getGlobalIteratorType()) {
                     typeAsIterator.iteratorElementType = type.typeArguments[0];
                 }
                 else {
@@ -32123,7 +32562,7 @@ var ts;
             if (isTypeAny(type)) {
                 return undefined;
             }
-            if ((type.flags & 131072) && type.target === getGlobalIterableIteratorType()) {
+            if ((getObjectFlags(type) & 4) && type.target === getGlobalIterableIteratorType()) {
                 return type.typeArguments[0];
             }
             return getElementTypeOfIterable(type, undefined) ||
@@ -32132,8 +32571,12 @@ var ts;
         function checkElementTypeOfArrayOrString(arrayOrStringType, errorNode) {
             ts.Debug.assert(languageVersion < 2);
             var arrayType = arrayOrStringType;
-            if (arrayOrStringType.flags & 524288) {
-                arrayType = getUnionType(ts.filter(arrayOrStringType.types, function (t) { return !(t.flags & 34); }), true);
+            if (arrayOrStringType.flags & 65536) {
+                var arrayTypes = arrayOrStringType.types;
+                var filteredTypes = ts.filter(arrayTypes, function (t) { return !(t.flags & 34); });
+                if (filteredTypes !== arrayTypes) {
+                    arrayType = getUnionType(filteredTypes, true);
+                }
             }
             else if (arrayOrStringType.flags & 34) {
                 arrayType = neverType;
@@ -32171,7 +32614,7 @@ var ts;
             checkGrammarStatementInAmbientContext(node) || checkGrammarBreakOrContinueStatement(node);
         }
         function isGetAccessorWithAnnotatedSetAccessor(node) {
-            return !!(node.kind === 150 && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(node.symbol, 151)));
+            return !!(node.kind === 151 && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(node.symbol, 152)));
         }
         function isUnwrappedReturnTypeVoidOrAny(func, returnType) {
             var unwrappedReturnType = ts.isAsyncFunctionLike(func) ? getPromisedType(returnType) : returnType;
@@ -32193,12 +32636,12 @@ var ts;
                     if (func.asteriskToken) {
                         return;
                     }
-                    if (func.kind === 151) {
+                    if (func.kind === 152) {
                         if (node.expression) {
                             error(node.expression, ts.Diagnostics.Setters_cannot_return_a_value);
                         }
                     }
-                    else if (func.kind === 149) {
+                    else if (func.kind === 150) {
                         if (node.expression && !checkTypeAssignableTo(exprType, returnType, node.expression)) {
                             error(node.expression, ts.Diagnostics.Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class);
                         }
@@ -32216,14 +32659,14 @@ var ts;
                         }
                     }
                 }
-                else if (func.kind !== 149 && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(func, returnType)) {
+                else if (func.kind !== 150 && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(func, returnType)) {
                     error(node, ts.Diagnostics.Not_all_code_paths_return_a_value);
                 }
             }
         }
         function checkWithStatement(node) {
             if (!checkGrammarStatementInAmbientContext(node)) {
-                if (node.flags & 262144) {
+                if (node.flags & 524288) {
                     grammarErrorOnFirstToken(node, ts.Diagnostics.with_statements_are_not_allowed_in_an_async_function_block);
                 }
             }
@@ -32240,8 +32683,9 @@ var ts;
             var firstDefaultClause;
             var hasDuplicateDefaultClause = false;
             var expressionType = checkExpression(node.expression);
+            var expressionIsLiteral = isLiteralType(expressionType);
             ts.forEach(node.caseBlock.clauses, function (clause) {
-                if (clause.kind === 250 && !hasDuplicateDefaultClause) {
+                if (clause.kind === 254 && !hasDuplicateDefaultClause) {
                     if (firstDefaultClause === undefined) {
                         firstDefaultClause = clause;
                     }
@@ -32253,11 +32697,17 @@ var ts;
                         hasDuplicateDefaultClause = true;
                     }
                 }
-                if (produceDiagnostics && clause.kind === 249) {
+                if (produceDiagnostics && clause.kind === 253) {
                     var caseClause = clause;
                     var caseType = checkExpression(caseClause.expression);
-                    if (!isTypeEqualityComparableTo(expressionType, caseType)) {
-                        checkTypeComparableTo(caseType, expressionType, caseClause.expression, undefined);
+                    var caseIsLiteral = isLiteralType(caseType);
+                    var comparedExpressionType = expressionType;
+                    if (!caseIsLiteral || !expressionIsLiteral) {
+                        caseType = caseIsLiteral ? getBaseTypeOfLiteralType(caseType) : caseType;
+                        comparedExpressionType = getBaseTypeOfLiteralType(expressionType);
+                    }
+                    if (!isTypeEqualityComparableTo(comparedExpressionType, caseType)) {
+                        checkTypeComparableTo(caseType, comparedExpressionType, caseClause.expression, undefined);
                     }
                 }
                 ts.forEach(clause.statements, checkSourceElement);
@@ -32273,7 +32723,7 @@ var ts;
                     if (ts.isFunctionLike(current)) {
                         break;
                     }
-                    if (current.kind === 215 && current.label.text === node.label.text) {
+                    if (current.kind === 219 && current.label.text === node.label.text) {
                         var sourceFile = ts.getSourceFileOfNode(node);
                         grammarErrorOnNode(node.label, ts.Diagnostics.Duplicate_label_0, ts.getTextOfNodeFromSourceText(sourceFile.text, node.label));
                         break;
@@ -32299,22 +32749,20 @@ var ts;
             var catchClause = node.catchClause;
             if (catchClause) {
                 if (catchClause.variableDeclaration) {
-                    if (catchClause.variableDeclaration.name.kind !== 70) {
-                        grammarErrorOnFirstToken(catchClause.variableDeclaration.name, ts.Diagnostics.Catch_clause_variable_name_must_be_an_identifier);
-                    }
-                    else if (catchClause.variableDeclaration.type) {
+                    if (catchClause.variableDeclaration.type) {
                         grammarErrorOnFirstToken(catchClause.variableDeclaration.type, ts.Diagnostics.Catch_clause_variable_cannot_have_a_type_annotation);
                     }
                     else if (catchClause.variableDeclaration.initializer) {
                         grammarErrorOnFirstToken(catchClause.variableDeclaration.initializer, ts.Diagnostics.Catch_clause_variable_cannot_have_an_initializer);
                     }
                     else {
-                        var identifierName = catchClause.variableDeclaration.name.text;
-                        var locals = catchClause.block.locals;
-                        if (locals) {
-                            var localSymbol = locals[identifierName];
-                            if (localSymbol && (localSymbol.flags & 2) !== 0) {
-                                grammarErrorOnNode(localSymbol.valueDeclaration, ts.Diagnostics.Cannot_redeclare_identifier_0_in_catch_clause, identifierName);
+                        var blockLocals = catchClause.block.locals;
+                        if (blockLocals) {
+                            for (var caughtName in catchClause.locals) {
+                                var blockLocal = blockLocals[caughtName];
+                                if (blockLocal && (blockLocal.flags & 2) !== 0) {
+                                    grammarErrorOnNode(blockLocal.valueDeclaration, ts.Diagnostics.Cannot_redeclare_identifier_0_in_catch_clause, caughtName);
+                                }
                             }
                         }
                     }
@@ -32336,7 +32784,7 @@ var ts;
                     checkIndexConstraintForProperty(prop, propType, type, declaredStringIndexer, stringIndexType, 0);
                     checkIndexConstraintForProperty(prop, propType, type, declaredNumberIndexer, numberIndexType, 1);
                 });
-                if (type.flags & 32768 && ts.isClassLike(type.symbol.valueDeclaration)) {
+                if (getObjectFlags(type) & 1 && ts.isClassLike(type.symbol.valueDeclaration)) {
                     var classDeclaration = type.symbol.valueDeclaration;
                     for (var _i = 0, _a = classDeclaration.members; _i < _a.length; _i++) {
                         var member = _a[_i];
@@ -32351,7 +32799,7 @@ var ts;
             var errorNode;
             if (stringIndexType && numberIndexType) {
                 errorNode = declaredNumberIndexer || declaredStringIndexer;
-                if (!errorNode && (type.flags & 65536)) {
+                if (!errorNode && (getObjectFlags(type) & 2)) {
                     var someBaseTypeHasBothIndexers = ts.forEach(getBaseTypes(type), function (base) { return getIndexTypeOfType(base, 0) && getIndexTypeOfType(base, 1); });
                     errorNode = someBaseTypeHasBothIndexers ? undefined : type.symbol.declarations[0];
                 }
@@ -32367,13 +32815,13 @@ var ts;
                     return;
                 }
                 var errorNode;
-                if (prop.valueDeclaration.name.kind === 141 || prop.parent === containingType.symbol) {
+                if (prop.valueDeclaration.name.kind === 142 || prop.parent === containingType.symbol) {
                     errorNode = prop.valueDeclaration;
                 }
                 else if (indexDeclaration) {
                     errorNode = indexDeclaration;
                 }
-                else if (containingType.flags & 65536) {
+                else if (getObjectFlags(containingType) & 2) {
                     var someBaseClassHasBothPropertyAndIndexer = ts.forEach(getBaseTypes(containingType), function (base) { return getPropertyOfObjectType(base, prop.name) && getIndexTypeOfType(base, indexKind); });
                     errorNode = someBaseClassHasBothPropertyAndIndexer ? undefined : containingType.symbol.declarations[0];
                 }
@@ -32418,7 +32866,7 @@ var ts;
             var firstDecl;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 222 || declaration.kind === 223) {
+                if (declaration.kind === 226 || declaration.kind === 227) {
                     if (!firstDecl) {
                         firstDecl = declaration;
                     }
@@ -32481,7 +32929,9 @@ var ts;
                     }
                     checkTypeAssignableTo(typeWithThis, getTypeWithThisArgument(baseType_1, type.thisType), node.name || node, ts.Diagnostics.Class_0_incorrectly_extends_base_class_1);
                     checkTypeAssignableTo(staticType, getTypeWithoutSignatures(staticBaseType), node.name || node, ts.Diagnostics.Class_static_side_0_incorrectly_extends_base_class_static_side_1);
-                    if (baseType_1.symbol.valueDeclaration && !ts.isInAmbientContext(baseType_1.symbol.valueDeclaration)) {
+                    if (baseType_1.symbol.valueDeclaration &&
+                        !ts.isInAmbientContext(baseType_1.symbol.valueDeclaration) &&
+                        baseType_1.symbol.valueDeclaration.kind === 226) {
                         if (!isBlockScopedNameDeclaredBeforeUse(baseType_1.symbol.valueDeclaration, node)) {
                             error(baseTypeNode, ts.Diagnostics.A_class_must_be_declared_after_its_base_class);
                         }
@@ -32506,8 +32956,8 @@ var ts;
                     if (produceDiagnostics) {
                         var t = getTypeFromTypeNode(typeRefNode);
                         if (t !== unknownType) {
-                            var declaredType = (t.flags & 131072) ? t.target : t;
-                            if (declaredType.flags & (32768 | 65536)) {
+                            var declaredType = getObjectFlags(t) & 4 ? t.target : t;
+                            if (getObjectFlags(declaredType) & 3) {
                                 checkTypeAssignableTo(typeWithThis, getTypeWithThisArgument(t, type.thisType), node.name || node, ts.Diagnostics.Class_0_incorrectly_implements_interface_1);
                             }
                             else {
@@ -32529,7 +32979,7 @@ var ts;
                 if (declaration && ts.getModifierFlags(declaration) & 8) {
                     var typeClassDeclaration = getClassLikeDeclarationOfSymbol(type.symbol);
                     if (!isNodeWithinClass(node, typeClassDeclaration)) {
-                        error(node, ts.Diagnostics.Cannot_extend_a_class_0_Class_constructor_is_marked_as_private, node.expression.text);
+                        error(node, ts.Diagnostics.Cannot_extend_a_class_0_Class_constructor_is_marked_as_private, getFullyQualifiedName(type.symbol));
                     }
                 }
             }
@@ -32555,7 +33005,7 @@ var ts;
                     if (derived === base) {
                         var derivedClassDecl = getClassLikeDeclarationOfSymbol(type.symbol);
                         if (baseDeclarationFlags & 128 && (!derivedClassDecl || !(ts.getModifierFlags(derivedClassDecl) & 128))) {
-                            if (derivedClassDecl.kind === 193) {
+                            if (derivedClassDecl.kind === 197) {
                                 error(derivedClassDecl, ts.Diagnostics.Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1, symbolToString(baseProperty), typeToString(baseType));
                             }
                             else {
@@ -32599,7 +33049,7 @@ var ts;
             }
         }
         function isAccessor(kind) {
-            return kind === 150 || kind === 151;
+            return kind === 151 || kind === 152;
         }
         function areTypeParametersIdentical(list1, list2) {
             if (!list1 && !list2) {
@@ -32637,8 +33087,8 @@ var ts;
             for (var _i = 0, baseTypes_2 = baseTypes; _i < baseTypes_2.length; _i++) {
                 var base = baseTypes_2[_i];
                 var properties = getPropertiesOfObjectType(getTypeWithThisArgument(base, type.thisType));
-                for (var _a = 0, properties_5 = properties; _a < properties_5.length; _a++) {
-                    var prop = properties_5[_a];
+                for (var _a = 0, properties_6 = properties; _a < properties_6.length; _a++) {
+                    var prop = properties_6[_a];
                     var existing = seen[prop.name];
                     if (!existing) {
                         seen[prop.name] = { prop: prop, containingType: base };
@@ -32666,7 +33116,7 @@ var ts;
                 checkExportsOnMergedDeclarations(node);
                 var symbol = getSymbolOfNode(node);
                 checkTypeParameterListsIdentical(node, symbol);
-                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 223);
+                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 227);
                 if (node === firstInterfaceDecl) {
                     var type = getDeclaredTypeOfSymbol(symbol);
                     var typeWithThis = getTypeWithThisArgument(type);
@@ -32695,6 +33145,7 @@ var ts;
         function checkTypeAliasDeclaration(node) {
             checkGrammarDecorators(node) || checkGrammarModifiers(node);
             checkTypeNameIsReserved(node.name, ts.Diagnostics.Type_alias_name_cannot_be_0);
+            checkTypeParameters(node.typeParameters);
             checkSourceElement(node.type);
         }
         function computeEnumMemberValues(node) {
@@ -32711,7 +33162,7 @@ var ts;
                         error(member.name, ts.Diagnostics.Computed_property_names_are_not_allowed_in_enums);
                     }
                     else {
-                        var text = getTextOfPropertyName(member.name);
+                        var text = ts.getTextOfPropertyName(member.name);
                         if (isNumericLiteralName(text) && !isInfinityOrNaNString(text)) {
                             error(member.name, ts.Diagnostics.An_enum_member_cannot_have_a_numeric_name);
                         }
@@ -32761,7 +33212,7 @@ var ts;
                 return value;
                 function evalConstant(e) {
                     switch (e.kind) {
-                        case 186:
+                        case 190:
                             var value_1 = evalConstant(e.operand);
                             if (value_1 === undefined) {
                                 return undefined;
@@ -32772,7 +33223,7 @@ var ts;
                                 case 51: return ~value_1;
                             }
                             return undefined;
-                        case 188:
+                        case 192:
                             var left = evalConstant(e.left);
                             if (left === undefined) {
                                 return undefined;
@@ -32797,11 +33248,11 @@ var ts;
                             return undefined;
                         case 8:
                             return +e.text;
-                        case 179:
+                        case 183:
                             return evalConstant(e.expression);
                         case 70:
-                        case 174:
-                        case 173:
+                        case 178:
+                        case 177:
                             var member = initializer.parent;
                             var currentType = getTypeOfSymbol(getSymbolOfNode(member.parent));
                             var enumType_1;
@@ -32812,7 +33263,7 @@ var ts;
                             }
                             else {
                                 var expression = void 0;
-                                if (e.kind === 174) {
+                                if (e.kind === 178) {
                                     if (e.argumentExpression === undefined ||
                                         e.argumentExpression.kind !== 9) {
                                         return undefined;
@@ -32829,7 +33280,7 @@ var ts;
                                     if (current.kind === 70) {
                                         break;
                                     }
-                                    else if (current.kind === 173) {
+                                    else if (current.kind === 177) {
                                         current = current.expression;
                                     }
                                     else {
@@ -32889,7 +33340,7 @@ var ts;
                 }
                 var seenEnumMissingInitialInitializer_1 = false;
                 ts.forEach(enumSymbol.declarations, function (declaration) {
-                    if (declaration.kind !== 225) {
+                    if (declaration.kind !== 229) {
                         return false;
                     }
                     var enumDeclaration = declaration;
@@ -32912,8 +33363,8 @@ var ts;
             var declarations = symbol.declarations;
             for (var _i = 0, declarations_5 = declarations; _i < declarations_5.length; _i++) {
                 var declaration = declarations_5[_i];
-                if ((declaration.kind === 222 ||
-                    (declaration.kind === 221 && ts.nodeIsPresent(declaration.body))) &&
+                if ((declaration.kind === 226 ||
+                    (declaration.kind === 225 && ts.nodeIsPresent(declaration.body))) &&
                     !ts.isInAmbientContext(declaration)) {
                     return declaration;
                 }
@@ -32972,7 +33423,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, 222);
+                    var mergedClass = ts.getDeclarationOfKind(symbol, 226);
                     if (mergedClass &&
                         inSameLexicalScope(node, mergedClass)) {
                         getNodeLinks(node).flags |= 32768;
@@ -33015,36 +33466,36 @@ var ts;
         }
         function checkModuleAugmentationElement(node, isGlobalAugmentation) {
             switch (node.kind) {
-                case 201:
+                case 205:
                     for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
                         var decl = _a[_i];
                         checkModuleAugmentationElement(decl, isGlobalAugmentation);
                     }
                     break;
-                case 236:
-                case 237:
+                case 240:
+                case 241:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Exports_and_export_assignments_are_not_permitted_in_module_augmentations);
                     break;
-                case 230:
-                case 231:
+                case 234:
+                case 235:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_module);
                     break;
-                case 170:
-                case 219:
-                    var name_22 = node.name;
-                    if (ts.isBindingPattern(name_22)) {
-                        for (var _b = 0, _c = name_22.elements; _b < _c.length; _b++) {
+                case 174:
+                case 223:
+                    var name_26 = node.name;
+                    if (ts.isBindingPattern(name_26)) {
+                        for (var _b = 0, _c = name_26.elements; _b < _c.length; _b++) {
                             var el = _c[_b];
                             checkModuleAugmentationElement(el, isGlobalAugmentation);
                         }
                         break;
                     }
-                case 222:
-                case 225:
-                case 221:
-                case 223:
                 case 226:
-                case 224:
+                case 229:
+                case 225:
+                case 227:
+                case 230:
+                case 228:
                     if (isGlobalAugmentation) {
                         return;
                     }
@@ -33062,12 +33513,12 @@ var ts;
             switch (node.kind) {
                 case 70:
                     return node;
-                case 140:
+                case 141:
                     do {
                         node = node.left;
                     } while (node.kind !== 70);
                     return node;
-                case 173:
+                case 177:
                     do {
                         node = node.expression;
                     } while (node.kind !== 70);
@@ -33080,9 +33531,9 @@ var ts;
                 error(moduleName, ts.Diagnostics.String_literal_expected);
                 return false;
             }
-            var inAmbientExternalModule = node.parent.kind === 227 && ts.isAmbientModule(node.parent.parent);
-            if (node.parent.kind !== 256 && !inAmbientExternalModule) {
-                error(moduleName, node.kind === 237 ?
+            var inAmbientExternalModule = node.parent.kind === 231 && ts.isAmbientModule(node.parent.parent);
+            if (node.parent.kind !== 261 && !inAmbientExternalModule) {
+                error(moduleName, node.kind === 241 ?
                     ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace :
                     ts.Diagnostics.Import_declarations_in_a_namespace_cannot_reference_a_module);
                 return false;
@@ -33103,7 +33554,7 @@ var ts;
                     (symbol.flags & 793064 ? 793064 : 0) |
                     (symbol.flags & 1920 ? 1920 : 0);
                 if (target.flags & excludedMeanings) {
-                    var message = node.kind === 239 ?
+                    var message = node.kind === 243 ?
                         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));
@@ -33130,7 +33581,7 @@ var ts;
                         checkImportBinding(importClause);
                     }
                     if (importClause.namedBindings) {
-                        if (importClause.namedBindings.kind === 233) {
+                        if (importClause.namedBindings.kind === 237) {
                             checkImportBinding(importClause.namedBindings);
                         }
                         else {
@@ -33181,8 +33632,8 @@ var ts;
             if (!node.moduleSpecifier || checkExternalImportOrExportDeclaration(node)) {
                 if (node.exportClause) {
                     ts.forEach(node.exportClause.elements, checkExportSpecifier);
-                    var inAmbientExternalModule = node.parent.kind === 227 && ts.isAmbientModule(node.parent.parent);
-                    if (node.parent.kind !== 256 && !inAmbientExternalModule) {
+                    var inAmbientExternalModule = node.parent.kind === 231 && ts.isAmbientModule(node.parent.parent);
+                    if (node.parent.kind !== 261 && !inAmbientExternalModule) {
                         error(node, ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace);
                     }
                 }
@@ -33195,7 +33646,7 @@ var ts;
             }
         }
         function checkGrammarModuleElementContext(node, errorMessage) {
-            var isInAppropriateContext = node.parent.kind === 256 || node.parent.kind === 227 || node.parent.kind === 226;
+            var isInAppropriateContext = node.parent.kind === 261 || node.parent.kind === 231 || node.parent.kind === 230;
             if (!isInAppropriateContext) {
                 grammarErrorOnFirstToken(node, errorMessage);
             }
@@ -33218,8 +33669,8 @@ var ts;
             if (checkGrammarModuleElementContext(node, ts.Diagnostics.An_export_assignment_can_only_be_used_in_a_module)) {
                 return;
             }
-            var container = node.parent.kind === 256 ? node.parent : node.parent.parent;
-            if (container.kind === 226 && !ts.isAmbientModule(container)) {
+            var container = node.parent.kind === 261 ? node.parent : node.parent.parent;
+            if (container.kind === 230 && !ts.isAmbientModule(container)) {
                 error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_namespace);
                 return;
             }
@@ -33286,7 +33737,7 @@ var ts;
                 links.exportsChecked = true;
             }
             function isNotOverload(declaration) {
-                return (declaration.kind !== 221 && declaration.kind !== 148) ||
+                return (declaration.kind !== 225 && declaration.kind !== 149) ||
                     !!declaration.body;
             }
         }
@@ -33297,118 +33748,123 @@ var ts;
             var kind = node.kind;
             if (cancellationToken) {
                 switch (kind) {
+                    case 230:
                     case 226:
-                    case 222:
-                    case 223:
-                    case 221:
+                    case 227:
+                    case 225:
                         cancellationToken.throwIfCancellationRequested();
                 }
             }
             switch (kind) {
-                case 142:
-                    return checkTypeParameter(node);
                 case 143:
+                    return checkTypeParameter(node);
+                case 144:
                     return checkParameter(node);
+                case 147:
                 case 146:
-                case 145:
                     return checkPropertyDeclaration(node);
-                case 157:
                 case 158:
-                case 152:
+                case 159:
                 case 153:
-                    return checkSignatureDeclaration(node);
                 case 154:
                     return checkSignatureDeclaration(node);
-                case 148:
-                case 147:
-                    return checkMethodDeclaration(node);
-                case 149:
-                    return checkConstructorDeclaration(node);
-                case 150:
-                case 151:
-                    return checkAccessorDeclaration(node);
-                case 156:
-                    return checkTypeReferenceNode(node);
                 case 155:
+                    return checkSignatureDeclaration(node);
+                case 149:
+                case 148:
+                    return checkMethodDeclaration(node);
+                case 150:
+                    return checkConstructorDeclaration(node);
+                case 151:
+                case 152:
+                    return checkAccessorDeclaration(node);
+                case 157:
+                    return checkTypeReferenceNode(node);
+                case 156:
                     return checkTypePredicate(node);
-                case 159:
-                    return checkTypeQuery(node);
                 case 160:
-                    return checkTypeLiteral(node);
+                    return checkTypeQuery(node);
                 case 161:
-                    return checkArrayType(node);
+                    return checkTypeLiteral(node);
                 case 162:
-                    return checkTupleType(node);
+                    return checkArrayType(node);
                 case 163:
+                    return checkTupleType(node);
                 case 164:
-                    return checkUnionOrIntersectionType(node);
                 case 165:
+                    return checkUnionOrIntersectionType(node);
+                case 166:
+                case 168:
                     return checkSourceElement(node.type);
-                case 221:
-                    return checkFunctionDeclaration(node);
-                case 200:
-                case 227:
-                    return checkBlock(node);
-                case 201:
-                    return checkVariableStatement(node);
-                case 203:
-                    return checkExpressionStatement(node);
-                case 204:
-                    return checkIfStatement(node);
-                case 205:
-                    return checkDoStatement(node);
-                case 206:
-                    return checkWhileStatement(node);
-                case 207:
-                    return checkForStatement(node);
-                case 208:
-                    return checkForInStatement(node);
-                case 209:
-                    return checkForOfStatement(node);
-                case 210:
-                case 211:
-                    return checkBreakOrContinueStatement(node);
-                case 212:
-                    return checkReturnStatement(node);
-                case 213:
-                    return checkWithStatement(node);
-                case 214:
-                    return checkSwitchStatement(node);
-                case 215:
-                    return checkLabeledStatement(node);
-                case 216:
-                    return checkThrowStatement(node);
-                case 217:
-                    return checkTryStatement(node);
-                case 219:
-                    return checkVariableDeclaration(node);
+                case 169:
+                    return checkIndexedAccessType(node);
                 case 170:
-                    return checkBindingElement(node);
-                case 222:
-                    return checkClassDeclaration(node);
-                case 223:
-                    return checkInterfaceDeclaration(node);
-                case 224:
-                    return checkTypeAliasDeclaration(node);
+                    return checkMappedType(node);
                 case 225:
-                    return checkEnumDeclaration(node);
-                case 226:
-                    return checkModuleDeclaration(node);
+                    return checkFunctionDeclaration(node);
+                case 204:
                 case 231:
-                    return checkImportDeclaration(node);
-                case 230:
-                    return checkImportEqualsDeclaration(node);
-                case 237:
-                    return checkExportDeclaration(node);
-                case 236:
-                    return checkExportAssignment(node);
-                case 202:
-                    checkGrammarStatementInAmbientContext(node);
-                    return;
+                    return checkBlock(node);
+                case 205:
+                    return checkVariableStatement(node);
+                case 207:
+                    return checkExpressionStatement(node);
+                case 208:
+                    return checkIfStatement(node);
+                case 209:
+                    return checkDoStatement(node);
+                case 210:
+                    return checkWhileStatement(node);
+                case 211:
+                    return checkForStatement(node);
+                case 212:
+                    return checkForInStatement(node);
+                case 213:
+                    return checkForOfStatement(node);
+                case 214:
+                case 215:
+                    return checkBreakOrContinueStatement(node);
+                case 216:
+                    return checkReturnStatement(node);
+                case 217:
+                    return checkWithStatement(node);
                 case 218:
+                    return checkSwitchStatement(node);
+                case 219:
+                    return checkLabeledStatement(node);
+                case 220:
+                    return checkThrowStatement(node);
+                case 221:
+                    return checkTryStatement(node);
+                case 223:
+                    return checkVariableDeclaration(node);
+                case 174:
+                    return checkBindingElement(node);
+                case 226:
+                    return checkClassDeclaration(node);
+                case 227:
+                    return checkInterfaceDeclaration(node);
+                case 228:
+                    return checkTypeAliasDeclaration(node);
+                case 229:
+                    return checkEnumDeclaration(node);
+                case 230:
+                    return checkModuleDeclaration(node);
+                case 235:
+                    return checkImportDeclaration(node);
+                case 234:
+                    return checkImportEqualsDeclaration(node);
+                case 241:
+                    return checkExportDeclaration(node);
+                case 240:
+                    return checkExportAssignment(node);
+                case 206:
                     checkGrammarStatementInAmbientContext(node);
                     return;
-                case 240:
+                case 222:
+                    checkGrammarStatementInAmbientContext(node);
+                    return;
+                case 244:
                     return checkMissingDeclaration(node);
             }
         }
@@ -33421,17 +33877,17 @@ var ts;
             for (var _i = 0, deferredNodes_1 = deferredNodes; _i < deferredNodes_1.length; _i++) {
                 var node = deferredNodes_1[_i];
                 switch (node.kind) {
-                    case 180:
-                    case 181:
+                    case 184:
+                    case 185:
+                    case 149:
                     case 148:
-                    case 147:
                         checkFunctionExpressionOrObjectLiteralMethodDeferred(node);
                         break;
-                    case 150:
                     case 151:
+                    case 152:
                         checkAccessorDeferred(node);
                         break;
-                    case 193:
+                    case 197:
                         checkClassExpressionDeferred(node);
                         break;
                 }
@@ -33485,8 +33941,19 @@ var ts;
         function getDiagnosticsWorker(sourceFile) {
             throwIfNonDiagnosticsProducing();
             if (sourceFile) {
+                var previousGlobalDiagnostics = diagnostics.getGlobalDiagnostics();
+                var previousGlobalDiagnosticsSize = previousGlobalDiagnostics.length;
                 checkSourceFile(sourceFile);
-                return diagnostics.getDiagnostics(sourceFile.fileName);
+                var semanticDiagnostics = diagnostics.getDiagnostics(sourceFile.fileName);
+                var currentGlobalDiagnostics = diagnostics.getGlobalDiagnostics();
+                if (currentGlobalDiagnostics !== previousGlobalDiagnostics) {
+                    var deferredGlobalDiagnostics = ts.relativeComplement(previousGlobalDiagnostics, currentGlobalDiagnostics, ts.compareDiagnostics);
+                    return ts.concatenate(deferredGlobalDiagnostics, semanticDiagnostics);
+                }
+                else if (previousGlobalDiagnosticsSize === 0 && currentGlobalDiagnostics.length > 0) {
+                    return ts.concatenate(currentGlobalDiagnostics, semanticDiagnostics);
+                }
+                return semanticDiagnostics;
             }
             ts.forEach(host.getSourceFiles(), checkSourceFile);
             return diagnostics.getDiagnostics();
@@ -33503,7 +33970,7 @@ var ts;
         function isInsideWithStatementBody(node) {
             if (node) {
                 while (node.parent) {
-                    if (node.parent.kind === 213 && node.parent.statement === node) {
+                    if (node.parent.kind === 217 && node.parent.statement === node) {
                         return true;
                     }
                     node = node.parent;
@@ -33525,28 +33992,28 @@ var ts;
                         copySymbols(location.locals, meaning);
                     }
                     switch (location.kind) {
-                        case 256:
+                        case 261:
                             if (!ts.isExternalOrCommonJsModule(location)) {
                                 break;
                             }
-                        case 226:
+                        case 230:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 8914931);
                             break;
-                        case 225:
+                        case 229:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 8);
                             break;
-                        case 193:
+                        case 197:
                             var className = location.name;
                             if (className) {
                                 copySymbol(location.symbol, meaning);
                             }
-                        case 222:
-                        case 223:
+                        case 226:
+                        case 227:
                             if (!(memberFlags & 32)) {
                                 copySymbols(getSymbolOfNode(location).members, meaning & 793064);
                             }
                             break;
-                        case 180:
+                        case 184:
                             var funcName = location.name;
                             if (funcName) {
                                 copySymbol(location.symbol, meaning);
@@ -33585,27 +34052,27 @@ var ts;
         }
         function isTypeDeclaration(node) {
             switch (node.kind) {
-                case 142:
-                case 222:
-                case 223:
-                case 224:
-                case 225:
+                case 143:
+                case 226:
+                case 227:
+                case 228:
+                case 229:
                     return true;
             }
         }
         function isTypeReferenceIdentifier(entityName) {
             var node = entityName;
-            while (node.parent && node.parent.kind === 140) {
+            while (node.parent && node.parent.kind === 141) {
                 node = node.parent;
             }
-            return node.parent && (node.parent.kind === 156 || node.parent.kind === 267);
+            return node.parent && (node.parent.kind === 157 || node.parent.kind === 272);
         }
         function isHeritageClauseElementIdentifier(entityName) {
             var node = entityName;
-            while (node.parent && node.parent.kind === 173) {
+            while (node.parent && node.parent.kind === 177) {
                 node = node.parent;
             }
-            return node.parent && node.parent.kind === 195;
+            return node.parent && node.parent.kind === 199;
         }
         function forEachEnclosingClass(node, callback) {
             var result;
@@ -33622,13 +34089,13 @@ var ts;
             return !!forEachEnclosingClass(node, function (n) { return n === classDeclaration; });
         }
         function getLeftSideOfImportEqualsOrExportAssignment(nodeOnRightSide) {
-            while (nodeOnRightSide.parent.kind === 140) {
+            while (nodeOnRightSide.parent.kind === 141) {
                 nodeOnRightSide = nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 230) {
+            if (nodeOnRightSide.parent.kind === 234) {
                 return nodeOnRightSide.parent.moduleReference === nodeOnRightSide && nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 236) {
+            if (nodeOnRightSide.parent.kind === 240) {
                 return nodeOnRightSide.parent.expression === nodeOnRightSide && nodeOnRightSide.parent;
             }
             return undefined;
@@ -33640,7 +34107,7 @@ var ts;
             if (ts.isDeclarationName(entityName)) {
                 return getSymbolOfNode(entityName.parent);
             }
-            if (ts.isInJavaScriptFile(entityName) && entityName.parent.kind === 173) {
+            if (ts.isInJavaScriptFile(entityName) && entityName.parent.kind === 177) {
                 var specialPropertyAssignmentKind = ts.getSpecialPropertyAssignmentKind(entityName.parent.parent);
                 switch (specialPropertyAssignmentKind) {
                     case 1:
@@ -33652,11 +34119,11 @@ var ts;
                     default:
                 }
             }
-            if (entityName.parent.kind === 236 && ts.isEntityNameExpression(entityName)) {
+            if (entityName.parent.kind === 240 && ts.isEntityNameExpression(entityName)) {
                 return resolveEntityName(entityName, 107455 | 793064 | 1920 | 8388608);
             }
-            if (entityName.kind !== 173 && isInRightSideOfImportOrExportAssignment(entityName)) {
-                var importEqualsDeclaration = ts.getAncestor(entityName, 230);
+            if (entityName.kind !== 177 && isInRightSideOfImportOrExportAssignment(entityName)) {
+                var importEqualsDeclaration = ts.getAncestor(entityName, 234);
                 ts.Debug.assert(importEqualsDeclaration !== undefined);
                 return getSymbolOfPartOfRightHandSideOfImportEquals(entityName, true);
             }
@@ -33665,7 +34132,7 @@ var ts;
             }
             if (isHeritageClauseElementIdentifier(entityName)) {
                 var meaning = 0;
-                if (entityName.parent.kind === 195) {
+                if (entityName.parent.kind === 199) {
                     meaning = 793064;
                     if (ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
                         meaning |= 107455;
@@ -33687,14 +34154,14 @@ var ts;
                     }
                     return resolveEntityName(entityName, 107455, false, true);
                 }
-                else if (entityName.kind === 173) {
+                else if (entityName.kind === 177) {
                     var symbol = getNodeLinks(entityName).resolvedSymbol;
                     if (!symbol) {
                         checkPropertyAccessExpression(entityName);
                     }
                     return getNodeLinks(entityName).resolvedSymbol;
                 }
-                else if (entityName.kind === 140) {
+                else if (entityName.kind === 141) {
                     var symbol = getNodeLinks(entityName).resolvedSymbol;
                     if (!symbol) {
                         checkQualifiedName(entityName);
@@ -33703,19 +34170,19 @@ var ts;
                 }
             }
             else if (isTypeReferenceIdentifier(entityName)) {
-                var meaning = (entityName.parent.kind === 156 || entityName.parent.kind === 267) ? 793064 : 1920;
+                var meaning = (entityName.parent.kind === 157 || entityName.parent.kind === 272) ? 793064 : 1920;
                 return resolveEntityName(entityName, meaning, false, true);
             }
-            else if (entityName.parent.kind === 246) {
+            else if (entityName.parent.kind === 250) {
                 return getJsxAttributePropertySymbol(entityName.parent);
             }
-            if (entityName.parent.kind === 155) {
+            if (entityName.parent.kind === 156) {
                 return resolveEntityName(entityName, 1);
             }
             return undefined;
         }
         function getSymbolAtLocation(node) {
-            if (node.kind === 256) {
+            if (node.kind === 261) {
                 return ts.isExternalModule(node) ? getMergedSymbol(node.symbol) : undefined;
             }
             if (isInsideWithStatementBody(node)) {
@@ -33731,8 +34198,8 @@ var ts;
                 if (isInRightSideOfImportOrExportAssignment(node)) {
                     return getSymbolOfEntityNameOrPropertyAccessExpression(node);
                 }
-                else if (node.parent.kind === 170 &&
-                    node.parent.parent.kind === 168 &&
+                else if (node.parent.kind === 174 &&
+                    node.parent.parent.kind === 172 &&
                     node === node.parent.propertyName) {
                     var typeOfPattern = getTypeOfNode(node.parent.parent);
                     var propertyDeclaration = typeOfPattern && getPropertyOfType(typeOfPattern, node.text);
@@ -33743,8 +34210,8 @@ var ts;
             }
             switch (node.kind) {
                 case 70:
-                case 173:
-                case 140:
+                case 177:
+                case 141:
                     return getSymbolOfEntityNameOrPropertyAccessExpression(node);
                 case 98:
                     var container = ts.getThisContainer(node, false);
@@ -33757,18 +34224,18 @@ var ts;
                 case 96:
                     var type = ts.isPartOfExpression(node) ? checkExpression(node) : getTypeFromTypeNode(node);
                     return type.symbol;
-                case 166:
+                case 167:
                     return getTypeFromTypeNode(node).symbol;
                 case 122:
                     var constructorDeclaration = node.parent;
-                    if (constructorDeclaration && constructorDeclaration.kind === 149) {
+                    if (constructorDeclaration && constructorDeclaration.kind === 150) {
                         return constructorDeclaration.parent.symbol;
                     }
                     return undefined;
                 case 9:
                     if ((ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) &&
                         ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) ||
-                        ((node.parent.kind === 231 || node.parent.kind === 237) &&
+                        ((node.parent.kind === 235 || node.parent.kind === 241) &&
                             node.parent.moduleSpecifier === node)) {
                         return resolveExternalModuleName(node, node);
                     }
@@ -33776,7 +34243,7 @@ var ts;
                         return resolveExternalModuleName(node, node);
                     }
                 case 8:
-                    if (node.parent.kind === 174 && node.parent.argumentExpression === node) {
+                    if (node.parent.kind === 178 && node.parent.argumentExpression === node) {
                         var objectType = checkExpression(node.parent.expression);
                         if (objectType === unknownType)
                             return undefined;
@@ -33790,7 +34257,7 @@ var ts;
             return undefined;
         }
         function getShorthandAssignmentValueSymbol(location) {
-            if (location && location.kind === 254) {
+            if (location && location.kind === 258) {
                 return resolveEntityName(location.name, 107455 | 8388608);
             }
             return undefined;
@@ -33840,20 +34307,20 @@ var ts;
             return unknownType;
         }
         function getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr) {
-            ts.Debug.assert(expr.kind === 172 || expr.kind === 171);
-            if (expr.parent.kind === 209) {
+            ts.Debug.assert(expr.kind === 176 || expr.kind === 175);
+            if (expr.parent.kind === 213) {
                 var iteratedType = checkRightHandSideOfForOf(expr.parent.expression);
                 return checkDestructuringAssignment(expr, iteratedType || unknownType);
             }
-            if (expr.parent.kind === 188) {
+            if (expr.parent.kind === 192) {
                 var iteratedType = checkExpression(expr.parent.right);
                 return checkDestructuringAssignment(expr, iteratedType || unknownType);
             }
-            if (expr.parent.kind === 253) {
+            if (expr.parent.kind === 257) {
                 var typeOfParentObjectLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr.parent.parent);
                 return checkObjectLiteralDestructuringPropertyAssignment(typeOfParentObjectLiteral || unknownType, expr.parent);
             }
-            ts.Debug.assert(expr.parent.kind === 171);
+            ts.Debug.assert(expr.parent.kind === 175);
             var typeOfArrayLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr.parent);
             var elementType = checkIteratedTypeOrElementType(typeOfArrayLiteral || unknownType, expr.parent, false) || unknownType;
             return checkArrayLiteralDestructuringElementAssignment(expr.parent, typeOfArrayLiteral, ts.indexOf(expr.parent.elements, expr), elementType || unknownType);
@@ -33889,9 +34356,9 @@ var ts;
         function getRootSymbols(symbol) {
             if (symbol.flags & 268435456) {
                 var symbols_3 = [];
-                var name_23 = symbol.name;
+                var name_27 = symbol.name;
                 ts.forEach(getSymbolLinks(symbol).containingType.types, function (t) {
-                    var symbol = getPropertyOfType(t, name_23);
+                    var symbol = getPropertyOfType(t, name_27);
                     if (symbol) {
                         symbols_3.push(symbol);
                     }
@@ -33899,6 +34366,10 @@ var ts;
                 return symbols_3;
             }
             else if (symbol.flags & 67108864) {
+                if (symbol.leftSpread) {
+                    var links = symbol;
+                    return [links.leftSpread, links.rightSpread];
+                }
                 var target = void 0;
                 var next = symbol;
                 while (next = getSymbolLinks(next).target) {
@@ -33956,7 +34427,7 @@ var ts;
                     }
                     var parentSymbol = getParentOfSymbol(symbol);
                     if (parentSymbol) {
-                        if (parentSymbol.flags & 512 && parentSymbol.valueDeclaration.kind === 256) {
+                        if (parentSymbol.flags & 512 && parentSymbol.valueDeclaration.kind === 261) {
                             var symbolFile = parentSymbol.valueDeclaration;
                             var referenceFile = ts.getSourceFileOfNode(node);
                             var symbolIsUmdExport = symbolFile !== referenceFile;
@@ -33994,7 +34465,7 @@ var ts;
                         else if (nodeLinks_1.flags & 131072) {
                             var isDeclaredInLoop = nodeLinks_1.flags & 262144;
                             var inLoopInitializer = ts.isIterationStatement(container, false);
-                            var inLoopBodyBlock = container.kind === 200 && ts.isIterationStatement(container.parent, false);
+                            var inLoopBodyBlock = container.kind === 204 && ts.isIterationStatement(container.parent, false);
                             links.isDeclarationWithCollidingName = !ts.isBlockScopedContainerTopLevel(container) && (!isDeclaredInLoop || (!inLoopInitializer && !inLoopBodyBlock));
                         }
                         else {
@@ -34034,16 +34505,16 @@ var ts;
                 return true;
             }
             switch (node.kind) {
-                case 230:
-                case 232:
-                case 233:
-                case 235:
-                case 239:
-                    return isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol);
+                case 234:
+                case 236:
                 case 237:
+                case 239:
+                case 243:
+                    return isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol);
+                case 241:
                     var exportClause = node.exportClause;
                     return exportClause && ts.forEach(exportClause.elements, isValueAliasDeclaration);
-                case 236:
+                case 240:
                     return node.expression
                         && node.expression.kind === 70
                         ? isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol)
@@ -34053,7 +34524,7 @@ var ts;
         }
         function isTopLevelValueImportEqualsWithEntityName(node) {
             node = ts.getParseTreeNode(node, ts.isImportEqualsDeclaration);
-            if (node === undefined || node.parent.kind !== 256 || !ts.isInternalModuleImportEqualsDeclaration(node)) {
+            if (node === undefined || node.parent.kind !== 261 || !ts.isInternalModuleImportEqualsDeclaration(node)) {
                 return false;
             }
             var isValue = isAliasResolvedToValue(getSymbolOfNode(node));
@@ -34104,7 +34575,7 @@ var ts;
             return getNodeLinks(node).enumMemberValue;
         }
         function getConstantValue(node) {
-            if (node.kind === 255) {
+            if (node.kind === 260) {
                 return getEnumMemberValue(node);
             }
             var symbol = getNodeLinks(node).resolvedSymbol;
@@ -34116,7 +34587,7 @@ var ts;
             return undefined;
         }
         function isFunctionType(type) {
-            return type.flags & 2588672 && getSignaturesOfType(type, 0).length > 0;
+            return type.flags & 32768 && getSignaturesOfType(type, 0).length > 0;
         }
         function getTypeReferenceSerializationKind(typeName, location) {
             var valueSymbol = resolveEntityName(typeName, 107455, true, false, location);
@@ -34198,9 +34669,9 @@ var ts;
             }
             var location = reference;
             if (startInDeclarationContainer) {
-                var parent_14 = reference.parent;
-                if (ts.isDeclaration(parent_14) && reference === parent_14.name) {
-                    location = getDeclarationContainer(parent_14);
+                var parent_12 = reference.parent;
+                if (ts.isDeclaration(parent_12) && reference === parent_12.name) {
+                    location = getDeclarationContainer(parent_12);
                 }
             }
             return resolveName(location, reference.text, 107455 | 1048576 | 8388608, undefined, undefined);
@@ -34220,7 +34691,7 @@ var ts;
         function isLiteralConstDeclaration(node) {
             if (ts.isConst(node)) {
                 var type = getTypeOfSymbol(getSymbolOfNode(node));
-                return !!(type.flags & 96 && type.flags & 16777216);
+                return !!(type.flags & 96 && type.flags & 1048576);
             }
             return false;
         }
@@ -34271,13 +34742,14 @@ var ts;
                 getTypeReferenceDirectivesForEntityName: getTypeReferenceDirectivesForEntityName,
                 getTypeReferenceDirectivesForSymbol: getTypeReferenceDirectivesForSymbol,
                 isLiteralConstDeclaration: isLiteralConstDeclaration,
-                writeLiteralConstValue: writeLiteralConstValue
+                writeLiteralConstValue: writeLiteralConstValue,
+                getJsxFactoryEntity: function () { return _jsxFactoryEntity; }
             };
             function getTypeReferenceDirectivesForEntityName(node) {
                 if (!fileToDirective) {
                     return undefined;
                 }
-                var meaning = (node.kind === 173) || (node.kind === 70 && isInTypeQuery(node))
+                var meaning = (node.kind === 177) || (node.kind === 70 && isInTypeQuery(node))
                     ? 107455 | 1048576
                     : 793064 | 1920;
                 var symbol = resolveEntityName(node, meaning, true);
@@ -34299,6 +34771,9 @@ var ts;
                         if (typeReferenceDirective) {
                             (typeReferenceDirectives || (typeReferenceDirectives = [])).push(typeReferenceDirective);
                         }
+                        else {
+                            return undefined;
+                        }
                     }
                 }
                 return typeReferenceDirectives;
@@ -34309,15 +34784,15 @@ var ts;
                 }
                 var current = symbol;
                 while (true) {
-                    var parent_15 = getParentOfSymbol(current);
-                    if (parent_15) {
-                        current = parent_15;
+                    var parent_13 = getParentOfSymbol(current);
+                    if (parent_13) {
+                        current = parent_13;
                     }
                     else {
                         break;
                     }
                 }
-                if (current.valueDeclaration && current.valueDeclaration.kind === 256 && current.flags & 512) {
+                if (current.valueDeclaration && current.valueDeclaration.kind === 261 && current.flags & 512) {
                     return false;
                 }
                 for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
@@ -34336,7 +34811,7 @@ var ts;
             if (!moduleSymbol) {
                 return undefined;
             }
-            return ts.getDeclarationOfKind(moduleSymbol, 256);
+            return ts.getDeclarationOfKind(moduleSymbol, 261);
         }
         function initializeTypeChecker() {
             for (var _i = 0, _a = host.getSourceFiles(); _i < _a.length; _i++) {
@@ -34366,7 +34841,7 @@ var ts;
                     }
                 }
                 if ((compilerOptions.isolatedModules || ts.isExternalModule(file)) && !file.isDeclarationFile) {
-                    var fileRequestedExternalEmitHelpers = file.flags & 31744;
+                    var fileRequestedExternalEmitHelpers = file.flags & 64512;
                     if (fileRequestedExternalEmitHelpers) {
                         requestedExternalEmitHelpers |= fileRequestedExternalEmitHelpers;
                         if (firstFileRequestingExternalHelpers === undefined) {
@@ -34435,9 +34910,13 @@ var ts;
                     if (requestedExternalEmitHelpers & 1024 && languageVersion < 2) {
                         verifyHelperSymbol(exports, "__extends", 107455);
                     }
-                    if (requestedExternalEmitHelpers & 16384 && compilerOptions.jsx !== 1) {
+                    if (requestedExternalEmitHelpers & 16384 &&
+                        (languageVersion < 5 || compilerOptions.jsx === 2)) {
                         verifyHelperSymbol(exports, "__assign", 107455);
                     }
+                    if (languageVersion < 5 && requestedExternalEmitHelpers & 32768) {
+                        verifyHelperSymbol(exports, "__rest", 107455);
+                    }
                     if (requestedExternalEmitHelpers & 2048) {
                         verifyHelperSymbol(exports, "__decorate", 107455);
                         if (compilerOptions.emitDecoratorMetadata) {
@@ -34472,7 +34951,7 @@ var ts;
         function createThenableType() {
             var thenPropertySymbol = createSymbol(67108864 | 4, "then");
             getSymbolLinks(thenPropertySymbol).type = globalFunctionType;
-            var thenableType = createObjectType(2097152);
+            var thenableType = createObjectType(16);
             thenableType.properties = [thenPropertySymbol];
             thenableType.members = createSymbolTable(thenableType.properties);
             thenableType.callSignatures = [];
@@ -34484,14 +34963,14 @@ var ts;
                 return false;
             }
             if (!ts.nodeCanBeDecorated(node)) {
-                if (node.kind === 148 && !ts.nodeIsPresent(node.body)) {
+                if (node.kind === 149 && !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 === 150 || node.kind === 151) {
+            else if (node.kind === 151 || node.kind === 152) {
                 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);
@@ -34508,17 +34987,17 @@ var ts;
             var flags = 0;
             for (var _i = 0, _a = node.modifiers; _i < _a.length; _i++) {
                 var modifier = _a[_i];
-                if (modifier.kind !== 129) {
-                    if (node.kind === 145 || node.kind === 147) {
+                if (modifier.kind !== 130) {
+                    if (node.kind === 146 || node.kind === 148) {
                         return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_type_member, ts.tokenToString(modifier.kind));
                     }
-                    if (node.kind === 154) {
+                    if (node.kind === 155) {
                         return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_an_index_signature, ts.tokenToString(modifier.kind));
                     }
                 }
                 switch (modifier.kind) {
                     case 75:
-                        if (node.kind !== 225 && node.parent.kind === 222) {
+                        if (node.kind !== 229 && node.parent.kind === 226) {
                             return grammarErrorOnNode(node, ts.Diagnostics.A_class_member_cannot_have_the_0_keyword, ts.tokenToString(75));
                         }
                         break;
@@ -34544,7 +35023,7 @@ var ts;
                         else if (flags & 256) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "async");
                         }
-                        else if (node.parent.kind === 227 || node.parent.kind === 256) {
+                        else if (node.parent.kind === 231 || node.parent.kind === 261) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, text);
                         }
                         else if (flags & 128) {
@@ -34567,10 +35046,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 === 227 || node.parent.kind === 256) {
+                        else if (node.parent.kind === 231 || node.parent.kind === 261) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, "static");
                         }
-                        else if (node.kind === 143) {
+                        else if (node.kind === 144) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "static");
                         }
                         else if (flags & 128) {
@@ -34579,11 +35058,11 @@ var ts;
                         flags |= 32;
                         lastStatic = modifier;
                         break;
-                    case 129:
+                    case 130:
                         if (flags & 64) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "readonly");
                         }
-                        else if (node.kind !== 146 && node.kind !== 145 && node.kind !== 154 && node.kind !== 143) {
+                        else if (node.kind !== 147 && node.kind !== 146 && node.kind !== 155 && node.kind !== 144) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature);
                         }
                         flags |= 64;
@@ -34602,10 +35081,10 @@ var ts;
                         else if (flags & 256) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "async");
                         }
-                        else if (node.parent.kind === 222) {
+                        else if (node.parent.kind === 226) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "export");
                         }
-                        else if (node.kind === 143) {
+                        else if (node.kind === 144) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "export");
                         }
                         flags |= 1;
@@ -34617,13 +35096,13 @@ var ts;
                         else if (flags & 256) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
-                        else if (node.parent.kind === 222) {
+                        else if (node.parent.kind === 226) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "declare");
                         }
-                        else if (node.kind === 143) {
+                        else if (node.kind === 144) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "declare");
                         }
-                        else if (ts.isInAmbientContext(node.parent) && node.parent.kind === 227) {
+                        else if (ts.isInAmbientContext(node.parent) && node.parent.kind === 231) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.A_declare_modifier_cannot_be_used_in_an_already_ambient_context);
                         }
                         flags |= 2;
@@ -34633,14 +35112,14 @@ var ts;
                         if (flags & 128) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "abstract");
                         }
-                        if (node.kind !== 222) {
-                            if (node.kind !== 148 &&
-                                node.kind !== 146 &&
-                                node.kind !== 150 &&
-                                node.kind !== 151) {
+                        if (node.kind !== 226) {
+                            if (node.kind !== 149 &&
+                                node.kind !== 147 &&
+                                node.kind !== 151 &&
+                                node.kind !== 152) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration);
                             }
-                            if (!(node.parent.kind === 222 && ts.getModifierFlags(node.parent) & 128)) {
+                            if (!(node.parent.kind === 226 && ts.getModifierFlags(node.parent) & 128)) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.Abstract_methods_can_only_appear_within_an_abstract_class);
                             }
                             if (flags & 32) {
@@ -34659,7 +35138,7 @@ var ts;
                         else if (flags & 2 || ts.isInAmbientContext(node.parent)) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
-                        else if (node.kind === 143) {
+                        else if (node.kind === 144) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "async");
                         }
                         flags |= 256;
@@ -34667,7 +35146,7 @@ var ts;
                         break;
                 }
             }
-            if (node.kind === 149) {
+            if (node.kind === 150) {
                 if (flags & 32) {
                     return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "static");
                 }
@@ -34682,13 +35161,13 @@ var ts;
                 }
                 return;
             }
-            else if ((node.kind === 231 || node.kind === 230) && flags & 2) {
+            else if ((node.kind === 235 || node.kind === 234) && flags & 2) {
                 return grammarErrorOnNode(lastDeclare, ts.Diagnostics.A_0_modifier_cannot_be_used_with_an_import_declaration, "declare");
             }
-            else if (node.kind === 143 && (flags & 92) && ts.isBindingPattern(node.name)) {
+            else if (node.kind === 144 && (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 === 143 && (flags & 92) && node.dotDotDotToken) {
+            else if (node.kind === 144 && (flags & 92) && node.dotDotDotToken) {
                 return grammarErrorOnNode(node, ts.Diagnostics.A_parameter_property_cannot_be_declared_using_a_rest_parameter);
             }
             if (flags & 256) {
@@ -34704,37 +35183,37 @@ var ts;
         }
         function shouldReportBadModifier(node) {
             switch (node.kind) {
-                case 150:
                 case 151:
-                case 149:
-                case 146:
-                case 145:
-                case 148:
+                case 152:
+                case 150:
                 case 147:
-                case 154:
-                case 226:
-                case 231:
+                case 146:
+                case 149:
+                case 148:
+                case 155:
                 case 230:
-                case 237:
-                case 236:
-                case 180:
-                case 181:
-                case 143:
+                case 235:
+                case 234:
+                case 241:
+                case 240:
+                case 184:
+                case 185:
+                case 144:
                     return false;
                 default:
-                    if (node.parent.kind === 227 || node.parent.kind === 256) {
+                    if (node.parent.kind === 231 || node.parent.kind === 261) {
                         return false;
                     }
                     switch (node.kind) {
-                        case 221:
-                            return nodeHasAnyModifiersExcept(node, 119);
-                        case 222:
-                            return nodeHasAnyModifiersExcept(node, 116);
-                        case 223:
-                        case 201:
-                        case 224:
-                            return true;
                         case 225:
+                            return nodeHasAnyModifiersExcept(node, 119);
+                        case 226:
+                            return nodeHasAnyModifiersExcept(node, 116);
+                        case 227:
+                        case 205:
+                        case 228:
+                            return true;
+                        case 229:
                             return nodeHasAnyModifiersExcept(node, 75);
                         default:
                             ts.Debug.fail();
@@ -34747,10 +35226,10 @@ var ts;
         }
         function checkGrammarAsyncModifier(node, asyncModifier) {
             switch (node.kind) {
-                case 148:
-                case 221:
-                case 180:
-                case 181:
+                case 149:
+                case 225:
+                case 184:
+                case 185:
                     if (!node.asteriskToken) {
                         return false;
                     }
@@ -34812,7 +35291,7 @@ var ts;
                 checkGrammarParameterList(node.parameters) || checkGrammarArrowFunction(node, file);
         }
         function checkGrammarArrowFunction(node, file) {
-            if (node.kind === 181) {
+            if (node.kind === 185) {
                 var arrowFunction = node;
                 var startLine = ts.getLineAndCharacterOfPosition(file, arrowFunction.equalsGreaterThanToken.pos).line;
                 var endLine = ts.getLineAndCharacterOfPosition(file, arrowFunction.equalsGreaterThanToken.end).line;
@@ -34847,7 +35326,7 @@ var ts;
             if (!parameter.type) {
                 return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_must_have_a_type_annotation);
             }
-            if (parameter.type.kind !== 133 && parameter.type.kind !== 131) {
+            if (parameter.type.kind !== 134 && parameter.type.kind !== 132) {
                 return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_must_be_string_or_number);
             }
             if (!node.type) {
@@ -34874,7 +35353,7 @@ var ts;
                 var sourceFile = ts.getSourceFileOfNode(node);
                 for (var _i = 0, args_4 = args; _i < args_4.length; _i++) {
                     var arg = args_4[_i];
-                    if (arg.kind === 194) {
+                    if (arg.kind === 198) {
                         return grammarErrorAtPos(sourceFile, arg.pos, 0, ts.Diagnostics.Argument_expression_expected);
                     }
                 }
@@ -34944,19 +35423,19 @@ var ts;
             return false;
         }
         function checkGrammarComputedPropertyName(node) {
-            if (node.kind !== 141) {
+            if (node.kind !== 142) {
                 return false;
             }
             var computedPropertyName = node;
-            if (computedPropertyName.expression.kind === 188 && computedPropertyName.expression.operatorToken.kind === 25) {
+            if (computedPropertyName.expression.kind === 192 && computedPropertyName.expression.operatorToken.kind === 25) {
                 return grammarErrorOnNode(computedPropertyName.expression, ts.Diagnostics.A_comma_expression_is_not_allowed_in_a_computed_property_name);
             }
         }
         function checkGrammarForGenerator(node) {
             if (node.asteriskToken) {
-                ts.Debug.assert(node.kind === 221 ||
-                    node.kind === 180 ||
-                    node.kind === 148);
+                ts.Debug.assert(node.kind === 225 ||
+                    node.kind === 184 ||
+                    node.kind === 149);
                 if (ts.isInAmbientContext(node)) {
                     return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.Generators_are_not_allowed_in_an_ambient_context);
                 }
@@ -34981,42 +35460,45 @@ var ts;
             var GetOrSetAccessor = GetAccessor | SetAccessor;
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var prop = _a[_i];
-                var name_24 = prop.name;
-                if (name_24.kind === 141) {
-                    checkGrammarComputedPropertyName(name_24);
+                if (prop.kind === 259) {
+                    continue;
                 }
-                if (prop.kind === 254 && !inDestructuring && prop.objectAssignmentInitializer) {
+                var name_28 = prop.name;
+                if (name_28.kind === 142) {
+                    checkGrammarComputedPropertyName(name_28);
+                }
+                if (prop.kind === 258 && !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 !== 119 || prop.kind !== 148) {
+                        if (mod.kind !== 119 || prop.kind !== 149) {
                             grammarErrorOnNode(mod, ts.Diagnostics._0_modifier_cannot_be_used_here, ts.getTextOfNode(mod));
                         }
                     }
                 }
                 var currentKind = void 0;
-                if (prop.kind === 253 || prop.kind === 254) {
+                if (prop.kind === 257 || prop.kind === 258) {
                     checkGrammarForInvalidQuestionMark(prop.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional);
-                    if (name_24.kind === 8) {
-                        checkGrammarNumericLiteral(name_24);
+                    if (name_28.kind === 8) {
+                        checkGrammarNumericLiteral(name_28);
                     }
                     currentKind = Property;
                 }
-                else if (prop.kind === 148) {
+                else if (prop.kind === 149) {
                     currentKind = Property;
                 }
-                else if (prop.kind === 150) {
+                else if (prop.kind === 151) {
                     currentKind = GetAccessor;
                 }
-                else if (prop.kind === 151) {
+                else if (prop.kind === 152) {
                     currentKind = SetAccessor;
                 }
                 else {
                     ts.Debug.fail("Unexpected syntax kind:" + prop.kind);
                 }
-                var effectiveName = ts.getPropertyNameForPropertyNameNode(name_24);
+                var effectiveName = ts.getPropertyNameForPropertyNameNode(name_28);
                 if (effectiveName === undefined) {
                     continue;
                 }
@@ -35026,18 +35508,18 @@ var ts;
                 else {
                     var existingKind = seen[effectiveName];
                     if (currentKind === Property && existingKind === Property) {
-                        grammarErrorOnNode(name_24, ts.Diagnostics.Duplicate_identifier_0, ts.getTextOfNode(name_24));
+                        grammarErrorOnNode(name_28, ts.Diagnostics.Duplicate_identifier_0, ts.getTextOfNode(name_28));
                     }
                     else if ((currentKind & GetOrSetAccessor) && (existingKind & GetOrSetAccessor)) {
                         if (existingKind !== GetOrSetAccessor && currentKind !== existingKind) {
                             seen[effectiveName] = currentKind | existingKind;
                         }
                         else {
-                            return grammarErrorOnNode(name_24, ts.Diagnostics.An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name);
+                            return grammarErrorOnNode(name_28, ts.Diagnostics.An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name);
                         }
                     }
                     else {
-                        return grammarErrorOnNode(name_24, ts.Diagnostics.An_object_literal_cannot_have_property_and_accessor_with_the_same_name);
+                        return grammarErrorOnNode(name_28, ts.Diagnostics.An_object_literal_cannot_have_property_and_accessor_with_the_same_name);
                     }
                 }
             }
@@ -35046,19 +35528,19 @@ var ts;
             var seen = ts.createMap();
             for (var _i = 0, _a = node.attributes; _i < _a.length; _i++) {
                 var attr = _a[_i];
-                if (attr.kind === 247) {
+                if (attr.kind === 251) {
                     continue;
                 }
                 var jsxAttr = attr;
-                var name_25 = jsxAttr.name;
-                if (!seen[name_25.text]) {
-                    seen[name_25.text] = true;
+                var name_29 = jsxAttr.name;
+                if (!seen[name_29.text]) {
+                    seen[name_29.text] = true;
                 }
                 else {
-                    return grammarErrorOnNode(name_25, ts.Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name);
+                    return grammarErrorOnNode(name_29, ts.Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name);
                 }
                 var initializer = jsxAttr.initializer;
-                if (initializer && initializer.kind === 248 && !initializer.expression) {
+                if (initializer && initializer.kind === 252 && !initializer.expression) {
                     return grammarErrorOnNode(jsxAttr.initializer, ts.Diagnostics.JSX_attributes_must_only_be_assigned_a_non_empty_expression);
                 }
             }
@@ -35067,7 +35549,7 @@ var ts;
             if (checkGrammarStatementInAmbientContext(forInOrOfStatement)) {
                 return true;
             }
-            if (forInOrOfStatement.initializer.kind === 220) {
+            if (forInOrOfStatement.initializer.kind === 224) {
                 var variableList = forInOrOfStatement.initializer;
                 if (!checkGrammarVariableDeclarationList(variableList)) {
                     var declarations = variableList.declarations;
@@ -35075,20 +35557,20 @@ var ts;
                         return false;
                     }
                     if (declarations.length > 1) {
-                        var diagnostic = forInOrOfStatement.kind === 208
+                        var diagnostic = forInOrOfStatement.kind === 212
                             ? 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 === 208
+                        var diagnostic = forInOrOfStatement.kind === 212
                             ? 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 === 208
+                        var diagnostic = forInOrOfStatement.kind === 212
                             ? 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);
@@ -35112,11 +35594,11 @@ var ts;
                 return grammarErrorOnNode(accessor.name, ts.Diagnostics.An_accessor_cannot_have_type_parameters);
             }
             else if (!doesAccessorHaveCorrectParameterCount(accessor)) {
-                return grammarErrorOnNode(accessor.name, kind === 150 ?
+                return grammarErrorOnNode(accessor.name, kind === 151 ?
                     ts.Diagnostics.A_get_accessor_cannot_have_parameters :
                     ts.Diagnostics.A_set_accessor_must_have_exactly_one_parameter);
             }
-            else if (kind === 151) {
+            else if (kind === 152) {
                 if (accessor.type) {
                     return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_set_accessor_cannot_have_a_return_type_annotation);
                 }
@@ -35135,10 +35617,10 @@ var ts;
             }
         }
         function doesAccessorHaveCorrectParameterCount(accessor) {
-            return getAccessorThisParameter(accessor) || accessor.parameters.length === (accessor.kind === 150 ? 0 : 1);
+            return getAccessorThisParameter(accessor) || accessor.parameters.length === (accessor.kind === 151 ? 0 : 1);
         }
         function getAccessorThisParameter(accessor) {
-            if (accessor.parameters.length === (accessor.kind === 150 ? 1 : 2)) {
+            if (accessor.parameters.length === (accessor.kind === 151 ? 1 : 2)) {
                 return ts.getThisParameter(accessor);
             }
         }
@@ -35153,7 +35635,7 @@ var ts;
                 checkGrammarForGenerator(node)) {
                 return true;
             }
-            if (node.parent.kind === 172) {
+            if (node.parent.kind === 176) {
                 if (checkGrammarForInvalidQuestionMark(node.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional)) {
                     return true;
                 }
@@ -35169,10 +35651,10 @@ var ts;
                     return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_method_overload_must_directly_refer_to_a_built_in_symbol);
                 }
             }
-            else if (node.parent.kind === 223) {
+            else if (node.parent.kind === 227) {
                 return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol);
             }
-            else if (node.parent.kind === 160) {
+            else if (node.parent.kind === 161) {
                 return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol);
             }
         }
@@ -35183,9 +35665,9 @@ var ts;
                     return grammarErrorOnNode(node, ts.Diagnostics.Jump_target_cannot_cross_function_boundary);
                 }
                 switch (current.kind) {
-                    case 215:
+                    case 219:
                         if (node.label && current.label.text === node.label.text) {
-                            var isMisplacedContinueLabel = node.kind === 210
+                            var isMisplacedContinueLabel = node.kind === 214
                                 && !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);
@@ -35193,8 +35675,8 @@ var ts;
                             return false;
                         }
                         break;
-                    case 214:
-                        if (node.kind === 211 && !node.label) {
+                    case 218:
+                        if (node.kind === 215 && !node.label) {
                             return false;
                         }
                         break;
@@ -35207,13 +35689,13 @@ var ts;
                 current = current.parent;
             }
             if (node.label) {
-                var message = node.kind === 211
+                var message = node.kind === 215
                     ? 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 === 211
+                var message = node.kind === 215
                     ? 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);
@@ -35223,9 +35705,9 @@ var ts;
             if (node.dotDotDotToken) {
                 var elements = node.parent.elements;
                 if (node !== ts.lastOrUndefined(elements)) {
-                    return grammarErrorOnNode(node, ts.Diagnostics.A_rest_element_must_be_last_in_an_array_destructuring_pattern);
+                    return grammarErrorOnNode(node, ts.Diagnostics.A_rest_element_must_be_last_in_a_destructuring_pattern);
                 }
-                if (node.name.kind === 169 || node.name.kind === 168) {
+                if (node.name.kind === 173 || node.name.kind === 172) {
                     return grammarErrorOnNode(node.name, ts.Diagnostics.A_rest_element_cannot_contain_a_binding_pattern);
                 }
                 if (node.initializer) {
@@ -35235,11 +35717,11 @@ var ts;
         }
         function isStringOrNumberLiteralExpression(expr) {
             return expr.kind === 9 || expr.kind === 8 ||
-                expr.kind === 186 && expr.operator === 37 &&
+                expr.kind === 190 && expr.operator === 37 &&
                     expr.operand.kind === 8;
         }
         function checkGrammarVariableDeclaration(node) {
-            if (node.parent.parent.kind !== 208 && node.parent.parent.kind !== 209) {
+            if (node.parent.parent.kind !== 212 && node.parent.parent.kind !== 213) {
                 if (ts.isInAmbientContext(node)) {
                     if (node.initializer) {
                         if (ts.isConst(node) && !node.type) {
@@ -35296,15 +35778,15 @@ var ts;
         }
         function allowLetAndConstDeclarations(parent) {
             switch (parent.kind) {
-                case 204:
-                case 205:
-                case 206:
-                case 213:
-                case 207:
                 case 208:
                 case 209:
+                case 210:
+                case 217:
+                case 211:
+                case 212:
+                case 213:
                     return false;
-                case 215:
+                case 219:
                     return allowLetAndConstDeclarations(parent.parent);
             }
             return true;
@@ -35359,7 +35841,7 @@ var ts;
                     return true;
                 }
             }
-            else if (node.parent.kind === 223) {
+            else if (node.parent.kind === 227) {
                 if (checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol)) {
                     return true;
                 }
@@ -35367,7 +35849,7 @@ var ts;
                     return grammarErrorOnNode(node.initializer, ts.Diagnostics.An_interface_property_cannot_have_an_initializer);
                 }
             }
-            else if (node.parent.kind === 160) {
+            else if (node.parent.kind === 161) {
                 if (checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol)) {
                     return true;
                 }
@@ -35380,13 +35862,13 @@ var ts;
             }
         }
         function checkGrammarTopLevelElementForRequiredDeclareModifier(node) {
-            if (node.kind === 223 ||
-                node.kind === 224 ||
-                node.kind === 231 ||
-                node.kind === 230 ||
-                node.kind === 237 ||
-                node.kind === 236 ||
-                node.kind === 229 ||
+            if (node.kind === 227 ||
+                node.kind === 228 ||
+                node.kind === 235 ||
+                node.kind === 234 ||
+                node.kind === 241 ||
+                node.kind === 240 ||
+                node.kind === 233 ||
                 ts.getModifierFlags(node) & (2 | 1 | 512)) {
                 return false;
             }
@@ -35395,7 +35877,7 @@ var ts;
         function checkGrammarTopLevelElementsForRequiredDeclareModifier(file) {
             for (var _i = 0, _a = file.statements; _i < _a.length; _i++) {
                 var decl = _a[_i];
-                if (ts.isDeclaration(decl) || decl.kind === 201) {
+                if (ts.isDeclaration(decl) || decl.kind === 205) {
                     if (checkGrammarTopLevelElementForRequiredDeclareModifier(decl)) {
                         return true;
                     }
@@ -35414,7 +35896,7 @@ 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 === 200 || node.parent.kind === 227 || node.parent.kind === 256) {
+                if (node.parent.kind === 204 || node.parent.kind === 231 || node.parent.kind === 261) {
                     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);
@@ -35453,49 +35935,49 @@ var ts;
 (function (ts) {
     ;
     var nodeEdgeTraversalMap = ts.createMap((_a = {},
-        _a[140] = [
+        _a[141] = [
             { name: "left", test: ts.isEntityName },
             { name: "right", test: ts.isIdentifier }
         ],
-        _a[144] = [
+        _a[145] = [
             { name: "expression", test: ts.isLeftHandSideExpression }
         ],
-        _a[178] = [
+        _a[182] = [
             { name: "type", test: ts.isTypeNode },
             { name: "expression", test: ts.isUnaryExpression }
         ],
-        _a[196] = [
+        _a[200] = [
             { name: "expression", test: ts.isExpression },
             { name: "type", test: ts.isTypeNode }
         ],
-        _a[197] = [
+        _a[201] = [
             { name: "expression", test: ts.isLeftHandSideExpression }
         ],
-        _a[225] = [
+        _a[229] = [
             { name: "decorators", test: ts.isDecorator },
             { name: "modifiers", test: ts.isModifier },
             { name: "name", test: ts.isIdentifier },
             { name: "members", test: ts.isEnumMember }
         ],
-        _a[226] = [
+        _a[230] = [
             { name: "decorators", test: ts.isDecorator },
             { name: "modifiers", test: ts.isModifier },
             { name: "name", test: ts.isModuleName },
             { name: "body", test: ts.isModuleBody }
         ],
-        _a[227] = [
+        _a[231] = [
             { name: "statements", test: ts.isStatement }
         ],
-        _a[230] = [
+        _a[234] = [
             { name: "decorators", test: ts.isDecorator },
             { name: "modifiers", test: ts.isModifier },
             { name: "name", test: ts.isIdentifier },
             { name: "moduleReference", test: ts.isModuleReference }
         ],
-        _a[241] = [
+        _a[245] = [
             { name: "expression", test: ts.isExpression, optional: true }
         ],
-        _a[255] = [
+        _a[260] = [
             { name: "name", test: ts.isPropertyName },
             { name: "initializer", test: ts.isExpression, optional: true, parenthesize: ts.parenthesizeExpressionForList }
         ],
@@ -35508,41 +35990,41 @@ var ts;
             return initial;
         }
         var kind = node.kind;
-        if ((kind > 0 && kind <= 139)) {
+        if ((kind > 0 && kind <= 140)) {
             return initial;
         }
-        if ((kind >= 155 && kind <= 167)) {
+        if ((kind >= 156 && kind <= 171)) {
             return initial;
         }
         var result = initial;
         switch (node.kind) {
-            case 199:
-            case 202:
-            case 194:
-            case 218:
-            case 287:
+            case 203:
+            case 206:
+            case 198:
+            case 222:
+            case 292:
                 break;
-            case 141:
+            case 142:
                 result = reduceNode(node.expression, f, result);
                 break;
-            case 143:
-                result = ts.reduceLeft(node.decorators, f, result);
-                result = ts.reduceLeft(node.modifiers, f, result);
-                result = reduceNode(node.name, f, result);
-                result = reduceNode(node.type, f, result);
-                result = reduceNode(node.initializer, f, result);
-                break;
             case 144:
-                result = reduceNode(node.expression, f, result);
-                break;
-            case 146:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.type, f, result);
                 result = reduceNode(node.initializer, f, result);
                 break;
-            case 148:
+            case 145:
+                result = reduceNode(node.expression, f, result);
+                break;
+            case 147:
+                result = ts.reduceLeft(node.decorators, f, result);
+                result = ts.reduceLeft(node.modifiers, f, result);
+                result = reduceNode(node.name, f, result);
+                result = reduceNode(node.type, f, result);
+                result = reduceNode(node.initializer, f, result);
+                break;
+            case 149:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
@@ -35551,17 +36033,9 @@ var ts;
                 result = reduceNode(node.type, f, result);
                 result = reduceNode(node.body, f, result);
                 break;
-            case 149:
-                result = ts.reduceLeft(node.modifiers, f, result);
-                result = ts.reduceLeft(node.parameters, f, result);
-                result = reduceNode(node.body, f, result);
-                break;
             case 150:
-                result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
-                result = reduceNode(node.name, f, result);
                 result = ts.reduceLeft(node.parameters, f, result);
-                result = reduceNode(node.type, f, result);
                 result = reduceNode(node.body, f, result);
                 break;
             case 151:
@@ -35569,46 +36043,54 @@ var ts;
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
                 result = ts.reduceLeft(node.parameters, f, result);
+                result = reduceNode(node.type, f, result);
                 result = reduceNode(node.body, f, result);
                 break;
-            case 168:
-            case 169:
+            case 152:
+                result = ts.reduceLeft(node.decorators, f, result);
+                result = ts.reduceLeft(node.modifiers, f, result);
+                result = reduceNode(node.name, f, result);
+                result = ts.reduceLeft(node.parameters, f, result);
+                result = reduceNode(node.body, f, result);
+                break;
+            case 172:
+            case 173:
                 result = ts.reduceLeft(node.elements, f, result);
                 break;
-            case 170:
+            case 174:
                 result = reduceNode(node.propertyName, f, result);
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.initializer, f, result);
                 break;
-            case 171:
+            case 175:
                 result = ts.reduceLeft(node.elements, f, result);
                 break;
-            case 172:
+            case 176:
                 result = ts.reduceLeft(node.properties, f, result);
                 break;
-            case 173:
+            case 177:
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.name, f, result);
                 break;
-            case 174:
+            case 178:
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.argumentExpression, f, result);
                 break;
-            case 175:
+            case 179:
                 result = reduceNode(node.expression, f, result);
                 result = ts.reduceLeft(node.typeArguments, f, result);
                 result = ts.reduceLeft(node.arguments, f, result);
                 break;
-            case 176:
+            case 180:
                 result = reduceNode(node.expression, f, result);
                 result = ts.reduceLeft(node.typeArguments, f, result);
                 result = ts.reduceLeft(node.arguments, f, result);
                 break;
-            case 177:
+            case 181:
                 result = reduceNode(node.tag, f, result);
                 result = reduceNode(node.template, f, result);
                 break;
-            case 180:
+            case 184:
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
                 result = ts.reduceLeft(node.typeParameters, f, result);
@@ -35616,117 +36098,117 @@ var ts;
                 result = reduceNode(node.type, f, result);
                 result = reduceNode(node.body, f, result);
                 break;
-            case 181:
+            case 185:
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = ts.reduceLeft(node.typeParameters, f, result);
                 result = ts.reduceLeft(node.parameters, f, result);
                 result = reduceNode(node.type, f, result);
                 result = reduceNode(node.body, f, result);
                 break;
-            case 179:
-            case 182:
             case 183:
-            case 184:
-            case 185:
-            case 191:
-            case 192:
-            case 197:
-                result = reduceNode(node.expression, f, result);
-                break;
             case 186:
             case 187:
+            case 188:
+            case 189:
+            case 195:
+            case 196:
+            case 201:
+                result = reduceNode(node.expression, f, result);
+                break;
+            case 190:
+            case 191:
                 result = reduceNode(node.operand, f, result);
                 break;
-            case 188:
+            case 192:
                 result = reduceNode(node.left, f, result);
                 result = reduceNode(node.right, f, result);
                 break;
-            case 189:
+            case 193:
                 result = reduceNode(node.condition, f, result);
                 result = reduceNode(node.whenTrue, f, result);
                 result = reduceNode(node.whenFalse, f, result);
                 break;
-            case 190:
+            case 194:
                 result = reduceNode(node.head, f, result);
                 result = ts.reduceLeft(node.templateSpans, f, result);
                 break;
-            case 193:
+            case 197:
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
                 result = ts.reduceLeft(node.typeParameters, f, result);
                 result = ts.reduceLeft(node.heritageClauses, f, result);
                 result = ts.reduceLeft(node.members, f, result);
                 break;
-            case 195:
+            case 199:
                 result = reduceNode(node.expression, f, result);
                 result = ts.reduceLeft(node.typeArguments, f, result);
                 break;
-            case 198:
+            case 202:
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.literal, f, result);
                 break;
-            case 200:
+            case 204:
                 result = ts.reduceLeft(node.statements, f, result);
                 break;
-            case 201:
+            case 205:
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.declarationList, f, result);
                 break;
-            case 203:
+            case 207:
                 result = reduceNode(node.expression, f, result);
                 break;
-            case 204:
+            case 208:
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.thenStatement, f, result);
                 result = reduceNode(node.elseStatement, f, result);
                 break;
-            case 205:
+            case 209:
                 result = reduceNode(node.statement, f, result);
                 result = reduceNode(node.expression, f, result);
                 break;
-            case 206:
-            case 213:
+            case 210:
+            case 217:
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.statement, f, result);
                 break;
-            case 207:
+            case 211:
                 result = reduceNode(node.initializer, f, result);
                 result = reduceNode(node.condition, f, result);
                 result = reduceNode(node.incrementor, f, result);
                 result = reduceNode(node.statement, f, result);
                 break;
-            case 208:
-            case 209:
+            case 212:
+            case 213:
                 result = reduceNode(node.initializer, f, result);
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.statement, f, result);
                 break;
-            case 212:
             case 216:
+            case 220:
                 result = reduceNode(node.expression, f, result);
                 break;
-            case 214:
+            case 218:
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.caseBlock, f, result);
                 break;
-            case 215:
+            case 219:
                 result = reduceNode(node.label, f, result);
                 result = reduceNode(node.statement, f, result);
                 break;
-            case 217:
+            case 221:
                 result = reduceNode(node.tryBlock, f, result);
                 result = reduceNode(node.catchClause, f, result);
                 result = reduceNode(node.finallyBlock, f, result);
                 break;
-            case 219:
+            case 223:
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.type, f, result);
                 result = reduceNode(node.initializer, f, result);
                 break;
-            case 220:
+            case 224:
                 result = ts.reduceLeft(node.declarations, f, result);
                 break;
-            case 221:
+            case 225:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
@@ -35735,7 +36217,7 @@ var ts;
                 result = reduceNode(node.type, f, result);
                 result = reduceNode(node.body, f, result);
                 break;
-            case 222:
+            case 226:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
@@ -35743,89 +36225,92 @@ var ts;
                 result = ts.reduceLeft(node.heritageClauses, f, result);
                 result = ts.reduceLeft(node.members, f, result);
                 break;
-            case 228:
+            case 232:
                 result = ts.reduceLeft(node.clauses, f, result);
                 break;
-            case 231:
+            case 235:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.importClause, f, result);
                 result = reduceNode(node.moduleSpecifier, f, result);
                 break;
-            case 232:
+            case 236:
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.namedBindings, f, result);
                 break;
-            case 233:
+            case 237:
                 result = reduceNode(node.name, f, result);
                 break;
-            case 234:
             case 238:
+            case 242:
                 result = ts.reduceLeft(node.elements, f, result);
                 break;
-            case 235:
             case 239:
+            case 243:
                 result = reduceNode(node.propertyName, f, result);
                 result = reduceNode(node.name, f, result);
                 break;
-            case 236:
+            case 240:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.expression, f, result);
                 break;
-            case 237:
+            case 241:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.exportClause, f, result);
                 result = reduceNode(node.moduleSpecifier, f, result);
                 break;
-            case 242:
+            case 246:
                 result = reduceNode(node.openingElement, f, result);
                 result = ts.reduceLeft(node.children, f, result);
                 result = reduceNode(node.closingElement, f, result);
                 break;
-            case 243:
-            case 244:
+            case 247:
+            case 248:
                 result = reduceNode(node.tagName, f, result);
                 result = ts.reduceLeft(node.attributes, f, result);
                 break;
-            case 245:
+            case 249:
                 result = reduceNode(node.tagName, f, result);
                 break;
-            case 246:
+            case 250:
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.initializer, f, result);
                 break;
-            case 247:
-                result = reduceNode(node.expression, f, result);
-                break;
-            case 248:
-                result = reduceNode(node.expression, f, result);
-                break;
-            case 249:
-                result = reduceNode(node.expression, f, result);
-            case 250:
-                result = ts.reduceLeft(node.statements, f, result);
-                break;
             case 251:
-                result = ts.reduceLeft(node.types, f, result);
+                result = reduceNode(node.expression, f, result);
                 break;
             case 252:
+                result = reduceNode(node.expression, f, result);
+                break;
+            case 253:
+                result = reduceNode(node.expression, f, result);
+            case 254:
+                result = ts.reduceLeft(node.statements, f, result);
+                break;
+            case 255:
+                result = ts.reduceLeft(node.types, f, result);
+                break;
+            case 256:
                 result = reduceNode(node.variableDeclaration, f, result);
                 result = reduceNode(node.block, f, result);
                 break;
-            case 253:
+            case 257:
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.initializer, f, result);
                 break;
-            case 254:
+            case 258:
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.objectAssignmentInitializer, f, result);
                 break;
-            case 256:
+            case 259:
+                result = reduceNode(node.expression, f, result);
+                break;
+            case 261:
                 result = ts.reduceLeft(node.statements, f, result);
                 break;
-            case 288:
+            case 293:
                 result = reduceNode(node.expression, f, result);
                 break;
             default:
@@ -35850,6 +36335,7 @@ var ts;
         if (node === undefined) {
             return undefined;
         }
+        aggregateTransformFlags(node);
         var visited = visitor(node);
         if (visited === node) {
             return node;
@@ -35892,6 +36378,7 @@ var ts;
         }
         for (var i = 0; i < count; i++) {
             var node = nodes[i + start];
+            aggregateTransformFlags(node);
             var visited = node !== undefined ? visitor(node) : undefined;
             if (updated !== undefined || visited === undefined || visited !== node) {
                 if (updated === undefined) {
@@ -35928,178 +36415,180 @@ var ts;
             return undefined;
         }
         var kind = node.kind;
-        if ((kind > 0 && kind <= 139)) {
+        if ((kind > 0 && kind <= 140)) {
             return node;
         }
-        if ((kind >= 155 && kind <= 167)) {
+        if ((kind >= 156 && kind <= 171)) {
             return node;
         }
         switch (node.kind) {
-            case 199:
-            case 202:
-            case 194:
-            case 218:
-                return node;
-            case 141:
-                return ts.updateComputedPropertyName(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 143:
-                return ts.updateParameterDeclaration(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.type, visitor, ts.isTypeNode, true), visitNode(node.initializer, visitor, ts.isExpression, true));
-            case 146:
-                return ts.updateProperty(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.type, visitor, ts.isTypeNode, true), visitNode(node.initializer, visitor, ts.isExpression, true));
-            case 148:
-                return ts.updateMethod(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
-            case 149:
-                return ts.updateConstructor(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
-            case 150:
-                return ts.updateGetAccessor(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
-            case 151:
-                return ts.updateSetAccessor(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
-            case 168:
-                return ts.updateObjectBindingPattern(node, visitNodes(node.elements, visitor, ts.isBindingElement));
-            case 169:
-                return ts.updateArrayBindingPattern(node, visitNodes(node.elements, visitor, ts.isArrayBindingElement));
-            case 170:
-                return ts.updateBindingElement(node, visitNode(node.propertyName, visitor, ts.isPropertyName, true), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.initializer, visitor, ts.isExpression, true));
-            case 171:
-                return ts.updateArrayLiteral(node, visitNodes(node.elements, visitor, ts.isExpression));
-            case 172:
-                return ts.updateObjectLiteral(node, visitNodes(node.properties, visitor, ts.isObjectLiteralElementLike));
-            case 173:
-                return ts.updatePropertyAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.name, visitor, ts.isIdentifier));
-            case 174:
-                return ts.updateElementAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.argumentExpression, visitor, ts.isExpression));
-            case 175:
-                return ts.updateCall(node, visitNode(node.expression, visitor, ts.isExpression), visitNodes(node.typeArguments, visitor, ts.isTypeNode), visitNodes(node.arguments, visitor, ts.isExpression));
-            case 176:
-                return ts.updateNew(node, visitNode(node.expression, visitor, ts.isExpression), visitNodes(node.typeArguments, visitor, ts.isTypeNode), visitNodes(node.arguments, visitor, ts.isExpression));
-            case 177:
-                return ts.updateTaggedTemplate(node, visitNode(node.tag, visitor, ts.isExpression), visitNode(node.template, visitor, ts.isTemplateLiteral));
-            case 179:
-                return ts.updateParen(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 180:
-                return ts.updateFunctionExpression(node, visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
-            case 181:
-                return ts.updateArrowFunction(node, visitNodes(node.modifiers, visitor, ts.isModifier), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isConciseBody, true), context.endLexicalEnvironment()));
-            case 182:
-                return ts.updateDelete(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 183:
-                return ts.updateTypeOf(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 184:
-                return ts.updateVoid(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 185:
-                return ts.updateAwait(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 188:
-                return ts.updateBinary(node, visitNode(node.left, visitor, ts.isExpression), visitNode(node.right, visitor, ts.isExpression));
-            case 186:
-                return ts.updatePrefix(node, visitNode(node.operand, visitor, ts.isExpression));
-            case 187:
-                return ts.updatePostfix(node, visitNode(node.operand, visitor, ts.isExpression));
-            case 189:
-                return ts.updateConditional(node, visitNode(node.condition, visitor, ts.isExpression), visitNode(node.whenTrue, visitor, ts.isExpression), visitNode(node.whenFalse, visitor, ts.isExpression));
-            case 190:
-                return ts.updateTemplateExpression(node, visitNode(node.head, visitor, ts.isTemplateHead), visitNodes(node.templateSpans, visitor, ts.isTemplateSpan));
-            case 191:
-                return ts.updateYield(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 192:
-                return ts.updateSpread(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 193:
-                return ts.updateClassExpression(node, visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier, true), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), visitNodes(node.members, visitor, ts.isClassElement));
-            case 195:
-                return ts.updateExpressionWithTypeArguments(node, visitNodes(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.expression, visitor, ts.isExpression));
-            case 198:
-                return ts.updateTemplateSpan(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.literal, visitor, ts.isTemplateMiddleOrTemplateTail));
-            case 200:
-                return ts.updateBlock(node, visitNodes(node.statements, visitor, ts.isStatement));
-            case 201:
-                return ts.updateVariableStatement(node, visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.declarationList, visitor, ts.isVariableDeclarationList));
             case 203:
-                return ts.updateStatement(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 204:
-                return ts.updateIf(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.thenStatement, visitor, ts.isStatement, false, liftToBlock), visitNode(node.elseStatement, visitor, ts.isStatement, true, liftToBlock));
-            case 205:
-                return ts.updateDo(node, visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock), visitNode(node.expression, visitor, ts.isExpression));
             case 206:
-                return ts.updateWhile(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock));
-            case 207:
-                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, false, liftToBlock));
-            case 208:
-                return ts.updateForIn(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock));
-            case 209:
-                return ts.updateForOf(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock));
-            case 210:
-                return ts.updateContinue(node, visitNode(node.label, visitor, ts.isIdentifier, true));
-            case 211:
-                return ts.updateBreak(node, visitNode(node.label, visitor, ts.isIdentifier, true));
-            case 212:
-                return ts.updateReturn(node, visitNode(node.expression, visitor, ts.isExpression, true));
-            case 213:
-                return ts.updateWith(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock));
-            case 214:
-                return ts.updateSwitch(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.caseBlock, visitor, ts.isCaseBlock));
-            case 215:
-                return ts.updateLabel(node, visitNode(node.label, visitor, ts.isIdentifier), visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock));
-            case 216:
-                return ts.updateThrow(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 217:
-                return ts.updateTry(node, visitNode(node.tryBlock, visitor, ts.isBlock), visitNode(node.catchClause, visitor, ts.isCatchClause, true), visitNode(node.finallyBlock, visitor, ts.isBlock, true));
-            case 219:
-                return ts.updateVariableDeclaration(node, visitNode(node.name, visitor, ts.isBindingName), visitNode(node.type, visitor, ts.isTypeNode, true), visitNode(node.initializer, visitor, ts.isExpression, true));
-            case 220:
-                return ts.updateVariableDeclarationList(node, visitNodes(node.declarations, visitor, ts.isVariableDeclaration));
-            case 221:
-                return ts.updateFunctionDeclaration(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
+            case 198:
             case 222:
+                return node;
+            case 142:
+                return ts.updateComputedPropertyName(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 144:
+                return ts.updateParameter(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.type, visitor, ts.isTypeNode, true), visitNode(node.initializer, visitor, ts.isExpression, true));
+            case 147:
+                return ts.updateProperty(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.type, visitor, ts.isTypeNode, true), visitNode(node.initializer, visitor, ts.isExpression, true));
+            case 149:
+                return ts.updateMethod(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
+            case 150:
+                return ts.updateConstructor(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
+            case 151:
+                return ts.updateGetAccessor(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
+            case 152:
+                return ts.updateSetAccessor(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
+            case 172:
+                return ts.updateObjectBindingPattern(node, visitNodes(node.elements, visitor, ts.isBindingElement));
+            case 173:
+                return ts.updateArrayBindingPattern(node, visitNodes(node.elements, visitor, ts.isArrayBindingElement));
+            case 174:
+                return ts.updateBindingElement(node, visitNode(node.propertyName, visitor, ts.isPropertyName, true), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.initializer, visitor, ts.isExpression, true));
+            case 175:
+                return ts.updateArrayLiteral(node, visitNodes(node.elements, visitor, ts.isExpression));
+            case 176:
+                return ts.updateObjectLiteral(node, visitNodes(node.properties, visitor, ts.isObjectLiteralElementLike));
+            case 177:
+                return ts.updatePropertyAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.name, visitor, ts.isIdentifier));
+            case 178:
+                return ts.updateElementAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.argumentExpression, visitor, ts.isExpression));
+            case 179:
+                return ts.updateCall(node, visitNode(node.expression, visitor, ts.isExpression), visitNodes(node.typeArguments, visitor, ts.isTypeNode), visitNodes(node.arguments, visitor, ts.isExpression));
+            case 180:
+                return ts.updateNew(node, visitNode(node.expression, visitor, ts.isExpression), visitNodes(node.typeArguments, visitor, ts.isTypeNode), visitNodes(node.arguments, visitor, ts.isExpression));
+            case 181:
+                return ts.updateTaggedTemplate(node, visitNode(node.tag, visitor, ts.isExpression), visitNode(node.template, visitor, ts.isTemplateLiteral));
+            case 183:
+                return ts.updateParen(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 184:
+                return ts.updateFunctionExpression(node, visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
+            case 185:
+                return ts.updateArrowFunction(node, visitNodes(node.modifiers, visitor, ts.isModifier), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isConciseBody, true), context.endLexicalEnvironment()));
+            case 186:
+                return ts.updateDelete(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 187:
+                return ts.updateTypeOf(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 188:
+                return ts.updateVoid(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 189:
+                return ts.updateAwait(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 192:
+                return ts.updateBinary(node, visitNode(node.left, visitor, ts.isExpression), visitNode(node.right, visitor, ts.isExpression));
+            case 190:
+                return ts.updatePrefix(node, visitNode(node.operand, visitor, ts.isExpression));
+            case 191:
+                return ts.updatePostfix(node, visitNode(node.operand, visitor, ts.isExpression));
+            case 193:
+                return ts.updateConditional(node, visitNode(node.condition, visitor, ts.isExpression), visitNode(node.whenTrue, visitor, ts.isExpression), visitNode(node.whenFalse, visitor, ts.isExpression));
+            case 194:
+                return ts.updateTemplateExpression(node, visitNode(node.head, visitor, ts.isTemplateHead), visitNodes(node.templateSpans, visitor, ts.isTemplateSpan));
+            case 195:
+                return ts.updateYield(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 196:
+                return ts.updateSpread(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 197:
+                return ts.updateClassExpression(node, visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier, true), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), visitNodes(node.members, visitor, ts.isClassElement));
+            case 199:
+                return ts.updateExpressionWithTypeArguments(node, visitNodes(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.expression, visitor, ts.isExpression));
+            case 202:
+                return ts.updateTemplateSpan(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.literal, visitor, ts.isTemplateMiddleOrTemplateTail));
+            case 204:
+                return ts.updateBlock(node, visitNodes(node.statements, visitor, ts.isStatement));
+            case 205:
+                return ts.updateVariableStatement(node, visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.declarationList, visitor, ts.isVariableDeclarationList));
+            case 207:
+                return ts.updateStatement(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 208:
+                return ts.updateIf(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.thenStatement, visitor, ts.isStatement, false, liftToBlock), visitNode(node.elseStatement, visitor, ts.isStatement, true, liftToBlock));
+            case 209:
+                return ts.updateDo(node, visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock), visitNode(node.expression, visitor, ts.isExpression));
+            case 210:
+                return ts.updateWhile(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock));
+            case 211:
+                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, false, liftToBlock));
+            case 212:
+                return ts.updateForIn(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock));
+            case 213:
+                return ts.updateForOf(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock));
+            case 214:
+                return ts.updateContinue(node, visitNode(node.label, visitor, ts.isIdentifier, true));
+            case 215:
+                return ts.updateBreak(node, visitNode(node.label, visitor, ts.isIdentifier, true));
+            case 216:
+                return ts.updateReturn(node, visitNode(node.expression, visitor, ts.isExpression, true));
+            case 217:
+                return ts.updateWith(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock));
+            case 218:
+                return ts.updateSwitch(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.caseBlock, visitor, ts.isCaseBlock));
+            case 219:
+                return ts.updateLabel(node, visitNode(node.label, visitor, ts.isIdentifier), visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock));
+            case 220:
+                return ts.updateThrow(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 221:
+                return ts.updateTry(node, visitNode(node.tryBlock, visitor, ts.isBlock), visitNode(node.catchClause, visitor, ts.isCatchClause, true), visitNode(node.finallyBlock, visitor, ts.isBlock, true));
+            case 223:
+                return ts.updateVariableDeclaration(node, visitNode(node.name, visitor, ts.isBindingName), visitNode(node.type, visitor, ts.isTypeNode, true), visitNode(node.initializer, visitor, ts.isExpression, true));
+            case 224:
+                return ts.updateVariableDeclarationList(node, visitNodes(node.declarations, visitor, ts.isVariableDeclaration));
+            case 225:
+                return ts.updateFunctionDeclaration(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
+            case 226:
                 return ts.updateClassDeclaration(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier, true), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), visitNodes(node.members, visitor, ts.isClassElement));
-            case 228:
-                return ts.updateCaseBlock(node, visitNodes(node.clauses, visitor, ts.isCaseOrDefaultClause));
-            case 231:
-                return ts.updateImportDeclaration(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.importClause, visitor, ts.isImportClause, true), visitNode(node.moduleSpecifier, visitor, ts.isExpression));
             case 232:
-                return ts.updateImportClause(node, visitNode(node.name, visitor, ts.isIdentifier, true), visitNode(node.namedBindings, visitor, ts.isNamedImportBindings, true));
-            case 233:
-                return ts.updateNamespaceImport(node, visitNode(node.name, visitor, ts.isIdentifier));
-            case 234:
-                return ts.updateNamedImports(node, visitNodes(node.elements, visitor, ts.isImportSpecifier));
+                return ts.updateCaseBlock(node, visitNodes(node.clauses, visitor, ts.isCaseOrDefaultClause));
             case 235:
-                return ts.updateImportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier, true), visitNode(node.name, visitor, ts.isIdentifier));
+                return ts.updateImportDeclaration(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.importClause, visitor, ts.isImportClause, true), visitNode(node.moduleSpecifier, visitor, ts.isExpression));
             case 236:
-                return ts.updateExportAssignment(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.expression, visitor, ts.isExpression));
+                return ts.updateImportClause(node, visitNode(node.name, visitor, ts.isIdentifier, true), visitNode(node.namedBindings, visitor, ts.isNamedImportBindings, true));
             case 237:
-                return ts.updateExportDeclaration(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.exportClause, visitor, ts.isNamedExports, true), visitNode(node.moduleSpecifier, visitor, ts.isExpression, true));
+                return ts.updateNamespaceImport(node, visitNode(node.name, visitor, ts.isIdentifier));
             case 238:
-                return ts.updateNamedExports(node, visitNodes(node.elements, visitor, ts.isExportSpecifier));
+                return ts.updateNamedImports(node, visitNodes(node.elements, visitor, ts.isImportSpecifier));
             case 239:
-                return ts.updateExportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier, true), visitNode(node.name, visitor, ts.isIdentifier));
+                return ts.updateImportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier, true), visitNode(node.name, visitor, ts.isIdentifier));
+            case 240:
+                return ts.updateExportAssignment(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.expression, visitor, ts.isExpression));
+            case 241:
+                return ts.updateExportDeclaration(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.exportClause, visitor, ts.isNamedExports, true), visitNode(node.moduleSpecifier, visitor, ts.isExpression, true));
             case 242:
-                return ts.updateJsxElement(node, visitNode(node.openingElement, visitor, ts.isJsxOpeningElement), visitNodes(node.children, visitor, ts.isJsxChild), visitNode(node.closingElement, visitor, ts.isJsxClosingElement));
+                return ts.updateNamedExports(node, visitNodes(node.elements, visitor, ts.isExportSpecifier));
             case 243:
-                return ts.updateJsxSelfClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), visitNodes(node.attributes, visitor, ts.isJsxAttributeLike));
-            case 244:
-                return ts.updateJsxOpeningElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), visitNodes(node.attributes, visitor, ts.isJsxAttributeLike));
-            case 245:
-                return ts.updateJsxClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression));
+                return ts.updateExportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier, true), visitNode(node.name, visitor, ts.isIdentifier));
             case 246:
-                return ts.updateJsxAttribute(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.initializer, visitor, ts.isStringLiteralOrJsxExpression));
+                return ts.updateJsxElement(node, visitNode(node.openingElement, visitor, ts.isJsxOpeningElement), visitNodes(node.children, visitor, ts.isJsxChild), visitNode(node.closingElement, visitor, ts.isJsxClosingElement));
             case 247:
-                return ts.updateJsxSpreadAttribute(node, visitNode(node.expression, visitor, ts.isExpression));
+                return ts.updateJsxSelfClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), visitNodes(node.attributes, visitor, ts.isJsxAttributeLike));
             case 248:
-                return ts.updateJsxExpression(node, visitNode(node.expression, visitor, ts.isExpression));
+                return ts.updateJsxOpeningElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), visitNodes(node.attributes, visitor, ts.isJsxAttributeLike));
             case 249:
-                return ts.updateCaseClause(node, visitNode(node.expression, visitor, ts.isExpression), visitNodes(node.statements, visitor, ts.isStatement));
+                return ts.updateJsxClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression));
             case 250:
-                return ts.updateDefaultClause(node, visitNodes(node.statements, visitor, ts.isStatement));
+                return ts.updateJsxAttribute(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.initializer, visitor, ts.isStringLiteralOrJsxExpression));
             case 251:
-                return ts.updateHeritageClause(node, visitNodes(node.types, visitor, ts.isExpressionWithTypeArguments));
+                return ts.updateJsxSpreadAttribute(node, visitNode(node.expression, visitor, ts.isExpression));
             case 252:
-                return ts.updateCatchClause(node, visitNode(node.variableDeclaration, visitor, ts.isVariableDeclaration), visitNode(node.block, visitor, ts.isBlock));
+                return ts.updateJsxExpression(node, visitNode(node.expression, visitor, ts.isExpression));
             case 253:
-                return ts.updatePropertyAssignment(node, visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.initializer, visitor, ts.isExpression));
+                return ts.updateCaseClause(node, visitNode(node.expression, visitor, ts.isExpression), visitNodes(node.statements, visitor, ts.isStatement));
             case 254:
-                return ts.updateShorthandPropertyAssignment(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.objectAssignmentInitializer, visitor, ts.isExpression));
+                return ts.updateDefaultClause(node, visitNodes(node.statements, visitor, ts.isStatement));
+            case 255:
+                return ts.updateHeritageClause(node, visitNodes(node.types, visitor, ts.isExpressionWithTypeArguments));
             case 256:
+                return ts.updateCatchClause(node, visitNode(node.variableDeclaration, visitor, ts.isVariableDeclaration), visitNode(node.block, visitor, ts.isBlock));
+            case 257:
+                return ts.updatePropertyAssignment(node, visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.initializer, visitor, ts.isExpression));
+            case 258:
+                return ts.updateShorthandPropertyAssignment(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.objectAssignmentInitializer, visitor, ts.isExpression));
+            case 259:
+                return ts.updateSpreadAssignment(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 261:
                 context.startLexicalEnvironment();
                 return ts.updateSourceFileNode(node, ts.createNodeArray(ts.concatenate(visitNodes(node.statements, visitor, ts.isStatement), context.endLexicalEnvironment()), node.statements));
-            case 288:
+            case 293:
                 return ts.updatePartiallyEmittedExpression(node, visitNode(node.expression, visitor, ts.isExpression));
             default:
                 var updated = void 0;
@@ -36158,7 +36647,7 @@ var ts;
             return 0;
         }
         else if (node.transformFlags & 536870912) {
-            return node.transformFlags & ~getTransformFlagsSubtreeExclusions(node.kind);
+            return node.transformFlags & ~ts.getTransformFlagsSubtreeExclusions(node.kind);
         }
         else {
             var subtreeFlags = aggregateTransformFlagsForSubtree(node);
@@ -36174,68 +36663,17 @@ var ts;
     function aggregateTransformFlagsForChildNode(transformFlags, child) {
         return transformFlags | aggregateTransformFlagsForNode(child);
     }
-    function getTransformFlagsSubtreeExclusions(kind) {
-        if (kind >= 155 && kind <= 167) {
-            return -3;
-        }
-        switch (kind) {
-            case 175:
-            case 176:
-            case 171:
-                return 537922901;
-            case 226:
-                return 574729557;
-            case 143:
-                return 545262933;
-            case 181:
-                return 592227669;
-            case 180:
-            case 221:
-                return 592293205;
-            case 220:
-                return 545262933;
-            case 222:
-            case 193:
-                return 539749717;
-            case 149:
-                return 591760725;
-            case 148:
-            case 150:
-            case 151:
-                return 591760725;
-            case 118:
-            case 131:
-            case 128:
-            case 133:
-            case 121:
-            case 134:
-            case 104:
-            case 142:
-            case 145:
-            case 147:
-            case 152:
-            case 153:
-            case 154:
-            case 223:
-            case 224:
-                return -3;
-            case 172:
-                return 539110741;
-            default:
-                return 536874325;
-        }
-    }
     var Debug;
     (function (Debug) {
         Debug.failNotOptional = Debug.shouldAssert(1)
             ? function (message) { return Debug.assert(false, message || "Node not optional."); }
-            : function () { };
+            : ts.noop;
         Debug.failBadSyntaxKind = Debug.shouldAssert(1)
             ? function (node, message) { return Debug.assert(false, message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " was unexpected."; }); }
-            : function () { };
+            : 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 '" + getFunctionName(test) + "'."; }); }
-            : function () { };
+            : ts.noop;
         function getFunctionName(func) {
             if (typeof func !== "function") {
                 return "";
@@ -36254,7 +36692,7 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    function flattenDestructuringAssignment(context, node, needsValue, recordTempVariable, visitor) {
+    function flattenDestructuringAssignment(context, node, needsValue, recordTempVariable, visitor, transformRest) {
         if (ts.isEmptyObjectLiteralOrArrayLiteral(node.left)) {
             var right = node.right;
             if (ts.isDestructuringAssignment(right)) {
@@ -36273,7 +36711,7 @@ var ts;
         else if (ts.nodeIsSynthesized(node)) {
             location = value;
         }
-        flattenDestructuring(node, value, location, emitAssignment, emitTempVariableAssignment, visitor);
+        flattenDestructuring(node, value, location, emitAssignment, emitTempVariableAssignment, recordTempVariable, emitRestAssignment, transformRest, visitor);
         if (needsValue) {
             expressions.push(value);
         }
@@ -36291,11 +36729,14 @@ var ts;
             emitAssignment(name, value, location);
             return name;
         }
+        function emitRestAssignment(elements, value, location) {
+            emitAssignment(ts.createObjectLiteral(elements), value, location);
+        }
     }
     ts.flattenDestructuringAssignment = flattenDestructuringAssignment;
-    function flattenParameterDestructuring(node, value, visitor) {
+    function flattenParameterDestructuring(node, value, visitor, transformRest) {
         var declarations = [];
-        flattenDestructuring(node, value, node, emitAssignment, emitTempVariableAssignment, visitor);
+        flattenDestructuring(node, value, node, emitAssignment, emitTempVariableAssignment, ts.noop, emitRestAssignment, transformRest, visitor);
         return declarations;
         function emitAssignment(name, value, location) {
             var declaration = ts.createVariableDeclaration(name, undefined, value, location);
@@ -36308,12 +36749,15 @@ var ts;
             emitAssignment(name, value, location);
             return name;
         }
+        function emitRestAssignment(elements, value, location) {
+            emitAssignment(ts.createObjectBindingPattern(elements), value, location);
+        }
     }
     ts.flattenParameterDestructuring = flattenParameterDestructuring;
-    function flattenVariableDestructuring(node, value, visitor, recordTempVariable) {
+    function flattenVariableDestructuring(node, value, visitor, recordTempVariable, transformRest) {
         var declarations = [];
         var pendingAssignments;
-        flattenDestructuring(node, value, node, emitAssignment, emitTempVariableAssignment, visitor);
+        flattenDestructuring(node, value, node, emitAssignment, emitTempVariableAssignment, recordTempVariable, emitRestAssignment, transformRest, visitor);
         return declarations;
         function emitAssignment(name, value, location, original) {
             if (pendingAssignments) {
@@ -36343,33 +36787,39 @@ var ts;
             }
             return name;
         }
+        function emitRestAssignment(elements, value, location, original) {
+            emitAssignment(ts.createObjectBindingPattern(elements), value, location, original);
+        }
     }
     ts.flattenVariableDestructuring = flattenVariableDestructuring;
-    function flattenVariableDestructuringToExpression(node, recordTempVariable, nameSubstitution, visitor) {
+    function flattenVariableDestructuringToExpression(node, recordTempVariable, createAssignmentCallback, visitor) {
         var pendingAssignments = [];
-        flattenDestructuring(node, undefined, node, emitAssignment, emitTempVariableAssignment, visitor);
+        flattenDestructuring(node, undefined, node, emitAssignment, emitTempVariableAssignment, ts.noop, emitRestAssignment, false, visitor);
         var expression = ts.inlineExpressions(pendingAssignments);
         ts.aggregateTransformFlags(expression);
         return expression;
         function emitAssignment(name, value, location, original) {
-            var left = nameSubstitution && nameSubstitution(name) || name;
-            emitPendingAssignment(left, value, location, original);
+            var expression = createAssignmentCallback
+                ? createAssignmentCallback(name.kind === 70 ? name : emitTempVariableAssignment(name, location), value, location)
+                : ts.createAssignment(name, value, location);
+            emitPendingAssignment(expression, original);
         }
         function emitTempVariableAssignment(value, location) {
             var name = ts.createTempVariable(recordTempVariable);
-            emitPendingAssignment(name, value, location, undefined);
+            emitPendingAssignment(ts.createAssignment(name, value, location), undefined);
             return name;
         }
-        function emitPendingAssignment(name, value, location, original) {
-            var expression = ts.createAssignment(name, value, location);
+        function emitRestAssignment(elements, value, location, original) {
+            emitAssignment(ts.createObjectLiteral(elements), value, location, original);
+        }
+        function emitPendingAssignment(expression, original) {
             expression.original = original;
             ts.setEmitFlags(expression, 2048);
             pendingAssignments.push(expression);
-            return expression;
         }
     }
     ts.flattenVariableDestructuringToExpression = flattenVariableDestructuringToExpression;
-    function flattenDestructuring(root, value, location, emitAssignment, emitTempVariableAssignment, visitor) {
+    function flattenDestructuring(root, value, location, emitAssignment, emitTempVariableAssignment, recordTempVariable, emitRestAssignment, transformRest, visitor) {
         if (value && visitor) {
             value = ts.visitNode(value, visitor, ts.isExpression);
         }
@@ -36400,17 +36850,17 @@ var ts;
             else {
                 target = bindingTarget;
             }
-            if (target.kind === 172) {
+            if (target.kind === 176) {
                 emitObjectLiteralAssignment(target, value, location);
             }
-            else if (target.kind === 171) {
+            else if (target.kind === 175) {
                 emitArrayLiteralAssignment(target, value, location);
             }
             else {
-                var name_26 = ts.getMutableClone(target);
-                ts.setSourceMapRange(name_26, target);
-                ts.setCommentRange(name_26, target);
-                emitAssignment(name_26, value, location, undefined);
+                var name_30 = ts.getMutableClone(target);
+                ts.setSourceMapRange(name_30, target);
+                ts.setCommentRange(name_30, target);
+                emitAssignment(name_30, value, location, undefined);
             }
         }
         function emitObjectLiteralAssignment(target, value, location) {
@@ -36418,16 +36868,79 @@ var ts;
             if (properties.length !== 1) {
                 value = ensureIdentifier(value, true, location, emitTempVariableAssignment);
             }
-            for (var _i = 0, properties_6 = properties; _i < properties_6.length; _i++) {
-                var p = properties_6[_i];
-                if (p.kind === 253 || p.kind === 254) {
-                    var propName = p.name;
-                    var target_1 = p.kind === 254 ? p : p.initializer || propName;
-                    emitDestructuringAssignment(target_1, createDestructuringPropertyAccess(value, propName), p);
+            var bindingElements = [];
+            for (var i = 0; i < properties.length; i++) {
+                var p = properties[i];
+                if (p.kind === 257 || p.kind === 258) {
+                    if (!transformRest ||
+                        p.transformFlags & 8388608 ||
+                        (p.kind === 257 && p.initializer.transformFlags & 8388608)) {
+                        if (bindingElements.length) {
+                            emitRestAssignment(bindingElements, value, location, target);
+                            bindingElements = [];
+                        }
+                        var propName = p.name;
+                        var bindingTarget = p.kind === 258 ? p : p.initializer || propName;
+                        emitDestructuringAssignment(bindingTarget, createDestructuringPropertyAccess(value, propName), p);
+                    }
+                    else {
+                        bindingElements.push(p);
+                    }
                 }
+                else if (i === properties.length - 1 &&
+                    p.kind === 259 &&
+                    p.expression.kind === 70) {
+                    if (bindingElements.length) {
+                        emitRestAssignment(bindingElements, value, location, target);
+                        bindingElements = [];
+                    }
+                    var propName = p.expression;
+                    var restCall = createRestCall(value, target.properties, function (p) { return p.name; }, target);
+                    emitDestructuringAssignment(propName, restCall, p);
+                }
+            }
+            if (bindingElements.length) {
+                emitRestAssignment(bindingElements, value, location, target);
+                bindingElements = [];
             }
         }
         function emitArrayLiteralAssignment(target, value, location) {
+            if (transformRest) {
+                emitESNextArrayLiteralAssignment(target, value, location);
+            }
+            else {
+                emitES2015ArrayLiteralAssignment(target, value, location);
+            }
+        }
+        function emitESNextArrayLiteralAssignment(target, value, location) {
+            var elements = target.elements;
+            var numElements = elements.length;
+            if (numElements !== 1) {
+                value = ensureIdentifier(value, true, location, emitTempVariableAssignment);
+            }
+            var expressions = [];
+            var spreadContainingExpressions = [];
+            for (var i = 0; i < numElements; i++) {
+                var e = elements[i];
+                if (e.kind === 198) {
+                    continue;
+                }
+                if (e.transformFlags & 8388608 && i < numElements - 1) {
+                    var tmp = ts.createTempVariable(recordTempVariable);
+                    spreadContainingExpressions.push([e, tmp]);
+                    expressions.push(tmp);
+                }
+                else {
+                    expressions.push(e);
+                }
+            }
+            emitAssignment(ts.updateArrayLiteral(target, expressions), value, undefined, undefined);
+            for (var _i = 0, spreadContainingExpressions_1 = spreadContainingExpressions; _i < spreadContainingExpressions_1.length; _i++) {
+                var _a = spreadContainingExpressions_1[_i], e = _a[0], tmp = _a[1];
+                emitDestructuringAssignment(e, tmp, e);
+            }
+        }
+        function emitES2015ArrayLiteralAssignment(target, value, location) {
             var elements = target.elements;
             var numElements = elements.length;
             if (numElements !== 1) {
@@ -36435,8 +36948,8 @@ var ts;
             }
             for (var i = 0; i < numElements; i++) {
                 var e = elements[i];
-                if (e.kind !== 194) {
-                    if (e.kind !== 192) {
+                if (e.kind !== 198) {
+                    if (e.kind !== 196) {
                         emitDestructuringAssignment(e, ts.createElementAccess(value, ts.createLiteral(i)), e);
                     }
                     else if (i === numElements - 1) {
@@ -36445,42 +36958,130 @@ var ts;
                 }
             }
         }
+        function createRestCall(value, elements, getPropertyName, location) {
+            var propertyNames = [];
+            for (var i = 0; i < elements.length - 1; i++) {
+                if (ts.isOmittedExpression(elements[i])) {
+                    continue;
+                }
+                var str = ts.createSynthesizedNode(9);
+                str.pos = location.pos;
+                str.end = location.end;
+                str.text = ts.getTextOfPropertyName(getPropertyName(elements[i]));
+                propertyNames.push(str);
+            }
+            var args = ts.createSynthesizedNodeArray([value, ts.createArrayLiteral(propertyNames, location)]);
+            return ts.createCall(ts.createIdentifier("__rest"), undefined, args);
+        }
         function emitBindingElement(target, value) {
             var initializer = visitor ? ts.visitNode(target.initializer, visitor, ts.isExpression) : target.initializer;
-            if (initializer) {
+            if (transformRest) {
+                value = value || initializer;
+            }
+            else if (initializer) {
                 value = value ? createDefaultValueCheck(value, initializer, target) : initializer;
             }
             else if (!value) {
                 value = ts.createVoidZero();
             }
             var name = target.name;
-            if (ts.isBindingPattern(name)) {
-                var elements = name.elements;
-                var numElements = elements.length;
+            if (!ts.isBindingPattern(name)) {
+                emitAssignment(name, value, target, target);
+            }
+            else {
+                var numElements = name.elements.length;
                 if (numElements !== 1) {
                     value = ensureIdentifier(value, numElements !== 0, target, emitTempVariableAssignment);
                 }
-                for (var i = 0; i < numElements; i++) {
-                    var element = elements[i];
-                    if (ts.isOmittedExpression(element)) {
-                        continue;
-                    }
-                    else if (name.kind === 168) {
-                        var propName = element.propertyName || element.name;
-                        emitBindingElement(element, createDestructuringPropertyAccess(value, propName));
-                    }
-                    else {
-                        if (!element.dotDotDotToken) {
-                            emitBindingElement(element, ts.createElementAccess(value, i));
-                        }
-                        else if (i === numElements - 1) {
-                            emitBindingElement(element, ts.createArraySlice(value, i));
-                        }
-                    }
+                if (name.kind === 173) {
+                    emitArrayBindingElement(name, value);
+                }
+                else {
+                    emitObjectBindingElement(target, value);
                 }
             }
+        }
+        function emitArrayBindingElement(name, value) {
+            if (transformRest) {
+                emitESNextArrayBindingElement(name, value);
+            }
             else {
-                emitAssignment(name, value, target, target);
+                emitES2015ArrayBindingElement(name, value);
+            }
+        }
+        function emitES2015ArrayBindingElement(name, value) {
+            var elements = name.elements;
+            var numElements = elements.length;
+            for (var i = 0; i < numElements; i++) {
+                var element = elements[i];
+                if (ts.isOmittedExpression(element)) {
+                    continue;
+                }
+                if (!element.dotDotDotToken) {
+                    emitBindingElement(element, ts.createElementAccess(value, i));
+                }
+                else if (i === numElements - 1) {
+                    emitBindingElement(element, ts.createArraySlice(value, i));
+                }
+            }
+        }
+        function emitESNextArrayBindingElement(name, value) {
+            var elements = name.elements;
+            var numElements = elements.length;
+            var bindingElements = [];
+            var spreadContainingElements = [];
+            for (var i = 0; i < numElements; i++) {
+                var element = elements[i];
+                if (ts.isOmittedExpression(element)) {
+                    continue;
+                }
+                if (element.transformFlags & 8388608 && i < numElements - 1) {
+                    spreadContainingElements.push(element);
+                    bindingElements.push(ts.createBindingElement(undefined, undefined, ts.getGeneratedNameForNode(element), undefined, value));
+                }
+                else {
+                    bindingElements.push(element);
+                }
+            }
+            emitAssignment(ts.updateArrayBindingPattern(name, bindingElements), value, undefined, undefined);
+            for (var _i = 0, spreadContainingElements_1 = spreadContainingElements; _i < spreadContainingElements_1.length; _i++) {
+                var element = spreadContainingElements_1[_i];
+                emitBindingElement(element, ts.getGeneratedNameForNode(element));
+            }
+        }
+        function emitObjectBindingElement(target, value) {
+            var name = target.name;
+            var elements = name.elements;
+            var numElements = elements.length;
+            var bindingElements = [];
+            for (var i = 0; i < numElements; i++) {
+                var element = elements[i];
+                if (ts.isOmittedExpression(element)) {
+                    continue;
+                }
+                if (i === numElements - 1 && element.dotDotDotToken) {
+                    if (bindingElements.length) {
+                        emitRestAssignment(bindingElements, value, target, target);
+                        bindingElements = [];
+                    }
+                    var restCall = createRestCall(value, name.elements, function (element) { return element.propertyName || element.name; }, name);
+                    emitBindingElement(element, restCall);
+                }
+                else if (transformRest && !(element.transformFlags & 8388608)) {
+                    bindingElements.push(element);
+                }
+                else {
+                    if (bindingElements.length) {
+                        emitRestAssignment(bindingElements, value, target, target);
+                        bindingElements = [];
+                    }
+                    var propName = element.propertyName || element.name;
+                    emitBindingElement(element, createDestructuringPropertyAccess(value, propName));
+                }
+            }
+            if (bindingElements.length) {
+                emitRestAssignment(bindingElements, value, target, target);
+                bindingElements = [];
             }
         }
         function createDefaultValueCheck(value, defaultValue, location) {
@@ -36523,12 +37124,6 @@ var ts;
 var ts;
 (function (ts) {
     var USE_NEW_TYPE_METADATA_FORMAT = false;
-    var TypeScriptSubstitutionFlags;
-    (function (TypeScriptSubstitutionFlags) {
-        TypeScriptSubstitutionFlags[TypeScriptSubstitutionFlags["ClassAliases"] = 1] = "ClassAliases";
-        TypeScriptSubstitutionFlags[TypeScriptSubstitutionFlags["NamespaceExports"] = 2] = "NamespaceExports";
-        TypeScriptSubstitutionFlags[TypeScriptSubstitutionFlags["NonQualifiedEnumMembers"] = 8] = "NonQualifiedEnumMembers";
-    })(TypeScriptSubstitutionFlags || (TypeScriptSubstitutionFlags = {}));
     function transformTypeScript(context) {
         var startLexicalEnvironment = context.startLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration;
         var resolver = context.getEmitResolver();
@@ -36539,14 +37134,14 @@ var ts;
         var previousOnSubstituteNode = context.onSubstituteNode;
         context.onEmitNode = onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
-        context.enableSubstitution(173);
-        context.enableSubstitution(174);
+        context.enableSubstitution(177);
+        context.enableSubstitution(178);
         var currentSourceFile;
         var currentNamespace;
         var currentNamespaceContainerName;
         var currentScope;
         var currentScopeFirstDeclarationsOfName;
-        var currentSourceFileExternalHelpersModuleName;
+        var currentExternalHelpersModuleName;
         var enabledSubstitutions;
         var classAliases;
         var applicableSubstitutions;
@@ -36572,7 +37167,7 @@ var ts;
             return saveStateAndInvoke(node, visitorWorker);
         }
         function visitorWorker(node) {
-            if (node.kind === 256) {
+            if (node.kind === 261) {
                 return visitSourceFile(node);
             }
             else if (node.transformFlags & 1) {
@@ -36588,13 +37183,13 @@ var ts;
         }
         function sourceElementVisitorWorker(node) {
             switch (node.kind) {
-                case 231:
+                case 235:
                     return visitImportDeclaration(node);
-                case 230:
+                case 234:
                     return visitImportEqualsDeclaration(node);
-                case 236:
+                case 240:
                     return visitExportAssignment(node);
-                case 237:
+                case 241:
                     return visitExportDeclaration(node);
                 default:
                     return visitorWorker(node);
@@ -36604,11 +37199,11 @@ var ts;
             return saveStateAndInvoke(node, namespaceElementVisitorWorker);
         }
         function namespaceElementVisitorWorker(node) {
-            if (node.kind === 237 ||
-                node.kind === 231 ||
-                node.kind === 232 ||
-                (node.kind === 230 &&
-                    node.moduleReference.kind === 241)) {
+            if (node.kind === 241 ||
+                node.kind === 235 ||
+                node.kind === 236 ||
+                (node.kind === 234 &&
+                    node.moduleReference.kind === 245)) {
                 return undefined;
             }
             else if (node.transformFlags & 1 || ts.hasModifier(node, 1)) {
@@ -36624,21 +37219,30 @@ var ts;
         }
         function classElementVisitorWorker(node) {
             switch (node.kind) {
-                case 149:
-                    return undefined;
-                case 146:
-                case 154:
                 case 150:
+                    return undefined;
+                case 147:
+                case 155:
                 case 151:
-                case 148:
+                case 152:
+                case 149:
                     return visitorWorker(node);
-                case 199:
+                case 203:
                     return node;
                 default:
                     ts.Debug.failBadSyntaxKind(node);
                     return undefined;
             }
         }
+        function modifierVisitor(node) {
+            if (ts.modifierToFlag(node.kind) & 2270) {
+                return undefined;
+            }
+            else if (currentNamespace && node.kind === 83) {
+                return undefined;
+            }
+            return node;
+        }
         function visitTypeScript(node) {
             if (ts.hasModifier(node, 2) && ts.isStatement(node)) {
                 return ts.createNotEmittedStatement(node);
@@ -36653,78 +37257,81 @@ var ts;
                 case 116:
                 case 75:
                 case 123:
-                case 129:
-                case 161:
+                case 130:
                 case 162:
-                case 160:
-                case 155:
-                case 142:
+                case 163:
+                case 161:
+                case 156:
+                case 143:
                 case 118:
                 case 121:
-                case 133:
-                case 131:
-                case 128:
-                case 104:
                 case 134:
-                case 158:
-                case 157:
+                case 132:
+                case 129:
+                case 104:
+                case 135:
                 case 159:
-                case 156:
-                case 163:
+                case 158:
+                case 160:
+                case 157:
                 case 164:
                 case 165:
                 case 166:
                 case 167:
-                case 154:
-                case 144:
-                case 224:
-                case 146:
-                case 149:
-                    return visitConstructor(node);
-                case 223:
-                    return ts.createNotEmittedStatement(node);
-                case 222:
-                    return visitClassDeclaration(node);
-                case 193:
-                    return visitClassExpression(node);
-                case 251:
-                    return visitHeritageClause(node);
-                case 195:
-                    return visitExpressionWithTypeArguments(node);
-                case 148:
-                    return visitMethodDeclaration(node);
+                case 168:
+                case 169:
+                case 170:
+                case 171:
+                case 155:
+                case 145:
+                case 228:
+                case 147:
                 case 150:
-                    return visitGetAccessor(node);
-                case 151:
-                    return visitSetAccessor(node);
-                case 221:
-                    return visitFunctionDeclaration(node);
-                case 180:
-                    return visitFunctionExpression(node);
-                case 181:
-                    return visitArrowFunction(node);
-                case 143:
-                    return visitParameter(node);
-                case 179:
-                    return visitParenthesizedExpression(node);
-                case 178:
-                case 196:
-                    return visitAssertionExpression(node);
-                case 175:
-                    return visitCallExpression(node);
-                case 176:
-                    return visitNewExpression(node);
-                case 197:
-                    return visitNonNullExpression(node);
-                case 225:
-                    return visitEnumDeclaration(node);
-                case 201:
-                    return visitVariableStatement(node);
-                case 219:
-                    return visitVariableDeclaration(node);
+                    return visitConstructor(node);
+                case 227:
+                    return ts.createNotEmittedStatement(node);
                 case 226:
-                    return visitModuleDeclaration(node);
+                    return visitClassDeclaration(node);
+                case 197:
+                    return visitClassExpression(node);
+                case 255:
+                    return visitHeritageClause(node);
+                case 199:
+                    return visitExpressionWithTypeArguments(node);
+                case 149:
+                    return visitMethodDeclaration(node);
+                case 151:
+                    return visitGetAccessor(node);
+                case 152:
+                    return visitSetAccessor(node);
+                case 225:
+                    return visitFunctionDeclaration(node);
+                case 184:
+                    return visitFunctionExpression(node);
+                case 185:
+                    return visitArrowFunction(node);
+                case 144:
+                    return visitParameter(node);
+                case 183:
+                    return visitParenthesizedExpression(node);
+                case 182:
+                case 200:
+                    return visitAssertionExpression(node);
+                case 179:
+                    return visitCallExpression(node);
+                case 180:
+                    return visitNewExpression(node);
+                case 201:
+                    return visitNonNullExpression(node);
+                case 229:
+                    return visitEnumDeclaration(node);
+                case 205:
+                    return visitVariableStatement(node);
+                case 223:
+                    return visitVariableDeclaration(node);
                 case 230:
+                    return visitModuleDeclaration(node);
+                case 234:
                     return visitImportEqualsDeclaration(node);
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -36733,15 +37340,15 @@ var ts;
         }
         function onBeforeVisitNode(node) {
             switch (node.kind) {
-                case 256:
-                case 228:
-                case 227:
-                case 200:
+                case 261:
+                case 232:
+                case 231:
+                case 204:
                     currentScope = node;
                     currentScopeFirstDeclarationsOfName = undefined;
                     break;
-                case 222:
-                case 221:
+                case 226:
+                case 225:
                     if (ts.hasModifier(node, 2)) {
                         break;
                     }
@@ -36751,10 +37358,11 @@ var ts;
         }
         function visitSourceFile(node) {
             currentSourceFile = node;
-            if (compilerOptions.alwaysStrict) {
+            if (compilerOptions.alwaysStrict &&
+                !(ts.isExternalModule(node) && (compilerOptions.target >= 2 || compilerOptions.module === ts.ModuleKind.ES2015))) {
                 node = ts.ensureUseStrict(node);
             }
-            if (node.flags & 31744
+            if (node.flags & 64512
                 && compilerOptions.importHelpers
                 && (ts.isExternalModule(node) || compilerOptions.isolatedModules)) {
                 startLexicalEnvironment();
@@ -36765,10 +37373,10 @@ var ts;
                 externalHelpersModuleImport.parent = node;
                 externalHelpersModuleImport.flags &= ~8;
                 statements.push(externalHelpersModuleImport);
-                currentSourceFileExternalHelpersModuleName = externalHelpersModuleName;
+                currentExternalHelpersModuleName = externalHelpersModuleName;
                 ts.addRange(statements, ts.visitNodes(node.statements, sourceElementVisitor, ts.isStatement, statementOffset));
                 ts.addRange(statements, endLexicalEnvironment());
-                currentSourceFileExternalHelpersModuleName = undefined;
+                currentExternalHelpersModuleName = undefined;
                 node = ts.updateSourceFileNode(node, ts.createNodeArray(statements, node.statements));
                 node.externalHelpersModuleName = externalHelpersModuleName;
             }
@@ -36795,66 +37403,59 @@ var ts;
             var staticProperties = getInitializedProperties(node, true);
             var hasExtendsClause = ts.getClassExtendsHeritageClauseElement(node) !== undefined;
             var isDecoratedClass = shouldEmitDecorateCallForClass(node);
-            var classAlias;
             var name = node.name;
             if (!name && staticProperties.length > 0) {
                 name = ts.getGeneratedNameForNode(node);
             }
-            var statements = [];
-            if (!isDecoratedClass) {
-                var classDeclaration = ts.createClassDeclaration(undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), name, undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, hasExtendsClause), node);
-                ts.setOriginalNode(classDeclaration, node);
-                if (staticProperties.length > 0) {
-                    ts.setEmitFlags(classDeclaration, 1024 | ts.getEmitFlags(classDeclaration));
-                }
-                statements.push(classDeclaration);
-            }
-            else {
-                classAlias = addClassDeclarationHeadWithDecorators(statements, node, name, hasExtendsClause);
-            }
+            var classStatement = isDecoratedClass
+                ? createClassDeclarationHeadWithDecorators(node, name, hasExtendsClause)
+                : createClassDeclarationHeadWithoutDecorators(node, name, hasExtendsClause, staticProperties.length > 0);
+            var statements = [classStatement];
             if (staticProperties.length) {
-                addInitializedPropertyStatements(statements, staticProperties, getLocalName(node, true));
+                addInitializedPropertyStatements(statements, staticProperties, ts.getLocalName(node));
             }
             addClassElementDecorationStatements(statements, node, false);
             addClassElementDecorationStatements(statements, node, true);
-            addConstructorDecorationStatement(statements, node, classAlias);
+            addConstructorDecorationStatement(statements, node);
             if (isNamespaceExport(node)) {
                 addExportMemberAssignment(statements, node);
             }
             else if (isDecoratedClass) {
                 if (isDefaultExternalModuleExport(node)) {
-                    statements.push(ts.createExportAssignment(undefined, undefined, false, getLocalName(node)));
+                    statements.push(ts.createExportDefault(ts.getLocalName(node, false, true)));
                 }
                 else if (isNamedExternalModuleExport(node)) {
-                    statements.push(createExternalModuleExport(name));
+                    statements.push(ts.createExternalModuleExport(ts.getLocalName(node, false, true)));
                 }
             }
-            return statements;
+            if (statements.length > 1) {
+                statements.push(ts.createEndOfDeclarationMarker(node));
+                ts.setEmitFlags(classStatement, ts.getEmitFlags(classStatement) | 33554432);
+            }
+            return ts.singleOrMany(statements);
         }
-        function addClassDeclarationHeadWithDecorators(statements, node, name, hasExtendsClause) {
+        function createClassDeclarationHeadWithoutDecorators(node, name, hasExtendsClause, hasStaticProperties) {
+            var classDeclaration = ts.createClassDeclaration(undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), name, undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, hasExtendsClause), node);
+            var emitFlags = ts.getEmitFlags(node);
+            if (hasStaticProperties) {
+                emitFlags |= 1024;
+            }
+            ts.setOriginalNode(classDeclaration, node);
+            ts.setEmitFlags(classDeclaration, emitFlags);
+            return classDeclaration;
+        }
+        function createClassDeclarationHeadWithDecorators(node, name, hasExtendsClause) {
             var location = ts.moveRangePastDecorators(node);
-            var classExpression = ts.setOriginalNode(ts.createClassExpression(undefined, name, undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, hasExtendsClause), location), node);
-            if (!name) {
-                name = ts.getGeneratedNameForNode(node);
-            }
-            var classAlias;
-            if (resolver.getNodeCheckFlags(node) & 8388608) {
-                enableSubstitutionForClassAliases();
-                classAlias = ts.createUniqueName(node.name && !ts.isGeneratedIdentifier(node.name) ? node.name.text : "default");
-                classAliases[ts.getOriginalNodeId(node)] = classAlias;
-            }
-            var declaredName = getDeclarationName(node, true);
-            var transformedClassExpression = ts.createVariableStatement(undefined, ts.createLetDeclarationList([
-                ts.createVariableDeclaration(classAlias || declaredName, undefined, classExpression)
-            ]), location);
-            ts.setCommentRange(transformedClassExpression, node);
-            statements.push(ts.setOriginalNode(transformedClassExpression, node));
-            if (classAlias) {
-                statements.push(ts.setOriginalNode(ts.createVariableStatement(undefined, ts.createLetDeclarationList([
-                    ts.createVariableDeclaration(declaredName, undefined, classAlias)
-                ]), location), node));
-            }
-            return classAlias;
+            var classAlias = getClassAliasIfNeeded(node);
+            var declName = ts.getLocalName(node, false, true);
+            var heritageClauses = ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause);
+            var members = transformClassMembers(node, hasExtendsClause);
+            var classExpression = ts.createClassExpression(undefined, name, undefined, heritageClauses, members, location);
+            ts.setOriginalNode(classExpression, node);
+            var statement = ts.createLetStatement(declName, classAlias ? ts.createAssignment(classAlias, classExpression) : classExpression, location);
+            ts.setOriginalNode(statement, node);
+            ts.setCommentRange(statement, node);
+            return statement;
         }
         function visitClassExpression(node) {
             var staticProperties = getInitializedProperties(node, true);
@@ -36887,7 +37488,7 @@ var ts;
         }
         function transformConstructor(node, hasExtendsClause) {
             var hasInstancePropertyWithInitializer = ts.forEach(node.members, isInstanceInitializedProperty);
-            var hasParameterPropertyAssignments = node.transformFlags & 524288;
+            var hasParameterPropertyAssignments = node.transformFlags & 4194304;
             var constructor = ts.getFirstConstructorWithBody(node);
             if (!hasInstancePropertyWithInitializer && !hasParameterPropertyAssignments) {
                 return ts.visitEachChild(constructor, visitor, context);
@@ -36929,7 +37530,7 @@ var ts;
                     return index;
                 }
                 var statement = statements[index];
-                if (statement.kind === 203 && ts.isSuperCall(statement.expression)) {
+                if (statement.kind === 207 && ts.isSuperCall(statement.expression)) {
                     result.push(ts.visitNode(statement, visitor, ts.isStatement));
                     return index + 1;
                 }
@@ -36963,7 +37564,7 @@ var ts;
             return isInitializedProperty(member, false);
         }
         function isInitializedProperty(member, isStatic) {
-            return member.kind === 146
+            return member.kind === 147
                 && isStatic === ts.hasModifier(member, 32)
                 && member.initializer !== undefined;
         }
@@ -37036,12 +37637,12 @@ var ts;
         }
         function getAllDecoratorsOfClassElement(node, member) {
             switch (member.kind) {
-                case 150:
                 case 151:
+                case 152:
                     return getAllDecoratorsOfAccessors(node, member);
-                case 148:
+                case 149:
                     return getAllDecoratorsOfMethod(member);
-                case 146:
+                case 147:
                     return getAllDecoratorsOfProperty(member);
                 default:
                     return undefined;
@@ -37119,37 +37720,33 @@ var ts;
             var prefix = getClassMemberPrefix(node, member);
             var memberName = getExpressionForPropertyName(member, true);
             var descriptor = languageVersion > 0
-                ? member.kind === 146
+                ? member.kind === 147
                     ? ts.createVoidZero()
                     : ts.createNull()
                 : undefined;
-            var helper = ts.createDecorateHelper(currentSourceFileExternalHelpersModuleName, decoratorExpressions, prefix, memberName, descriptor, ts.moveRangePastDecorators(member));
+            var helper = ts.createDecorateHelper(currentExternalHelpersModuleName, decoratorExpressions, prefix, memberName, descriptor, ts.moveRangePastDecorators(member));
             ts.setEmitFlags(helper, 49152);
             return helper;
         }
-        function addConstructorDecorationStatement(statements, node, decoratedClassAlias) {
-            var expression = generateConstructorDecorationExpression(node, decoratedClassAlias);
+        function addConstructorDecorationStatement(statements, node) {
+            var expression = generateConstructorDecorationExpression(node);
             if (expression) {
                 statements.push(ts.setOriginalNode(ts.createStatement(expression), node));
             }
         }
-        function generateConstructorDecorationExpression(node, decoratedClassAlias) {
+        function generateConstructorDecorationExpression(node) {
             var allDecorators = getAllDecoratorsOfConstructor(node);
             var decoratorExpressions = transformAllDecoratorsOfDeclaration(node, allDecorators);
             if (!decoratorExpressions) {
                 return undefined;
             }
-            if (decoratedClassAlias) {
-                var expression = ts.createAssignment(decoratedClassAlias, ts.createDecorateHelper(currentSourceFileExternalHelpersModuleName, decoratorExpressions, getDeclarationName(node)));
-                var result = ts.createAssignment(getDeclarationName(node), expression, ts.moveRangePastDecorators(node));
-                ts.setEmitFlags(result, 49152);
-                return result;
-            }
-            else {
-                var result = ts.createAssignment(getDeclarationName(node), ts.createDecorateHelper(currentSourceFileExternalHelpersModuleName, decoratorExpressions, getDeclarationName(node)), ts.moveRangePastDecorators(node));
-                ts.setEmitFlags(result, 49152);
-                return result;
-            }
+            var classAlias = classAliases && classAliases[ts.getOriginalNodeId(node)];
+            var localName = ts.getLocalName(node, false, true);
+            var decorate = ts.createDecorateHelper(currentExternalHelpersModuleName, decoratorExpressions, localName);
+            var expression = ts.createAssignment(localName, classAlias ? ts.createAssignment(classAlias, decorate) : decorate);
+            ts.setEmitFlags(expression, 49152);
+            ts.setSourceMapRange(expression, ts.moveRangePastDecorators(node));
+            return expression;
         }
         function transformDecorator(decorator) {
             return ts.visitNode(decorator.expression, visitor, ts.isExpression);
@@ -37160,7 +37757,7 @@ var ts;
                 expressions = [];
                 for (var _i = 0, decorators_1 = decorators; _i < decorators_1.length; _i++) {
                     var decorator = decorators_1[_i];
-                    var helper = ts.createParamHelper(currentSourceFileExternalHelpersModuleName, transformDecorator(decorator), parameterOffset, decorator.expression);
+                    var helper = ts.createParamHelper(currentExternalHelpersModuleName, transformDecorator(decorator), parameterOffset, decorator.expression);
                     ts.setEmitFlags(helper, 49152);
                     expressions.push(helper);
                 }
@@ -37178,13 +37775,13 @@ var ts;
         function addOldTypeMetadata(node, decoratorExpressions) {
             if (compilerOptions.emitDecoratorMetadata) {
                 if (shouldAddTypeMetadata(node)) {
-                    decoratorExpressions.push(ts.createMetadataHelper(currentSourceFileExternalHelpersModuleName, "design:type", serializeTypeOfNode(node)));
+                    decoratorExpressions.push(ts.createMetadataHelper(currentExternalHelpersModuleName, "design:type", serializeTypeOfNode(node)));
                 }
                 if (shouldAddParamTypesMetadata(node)) {
-                    decoratorExpressions.push(ts.createMetadataHelper(currentSourceFileExternalHelpersModuleName, "design:paramtypes", serializeParameterTypesOfNode(node)));
+                    decoratorExpressions.push(ts.createMetadataHelper(currentExternalHelpersModuleName, "design:paramtypes", serializeParameterTypesOfNode(node)));
                 }
                 if (shouldAddReturnTypeMetadata(node)) {
-                    decoratorExpressions.push(ts.createMetadataHelper(currentSourceFileExternalHelpersModuleName, "design:returntype", serializeReturnTypeOfNode(node)));
+                    decoratorExpressions.push(ts.createMetadataHelper(currentExternalHelpersModuleName, "design:returntype", serializeReturnTypeOfNode(node)));
                 }
             }
         }
@@ -37192,58 +37789,58 @@ var ts;
             if (compilerOptions.emitDecoratorMetadata) {
                 var properties = void 0;
                 if (shouldAddTypeMetadata(node)) {
-                    (properties || (properties = [])).push(ts.createPropertyAssignment("type", ts.createArrowFunction(undefined, undefined, [], undefined, undefined, serializeTypeOfNode(node))));
+                    (properties || (properties = [])).push(ts.createPropertyAssignment("type", ts.createArrowFunction(undefined, undefined, [], undefined, ts.createToken(35), serializeTypeOfNode(node))));
                 }
                 if (shouldAddParamTypesMetadata(node)) {
-                    (properties || (properties = [])).push(ts.createPropertyAssignment("paramTypes", ts.createArrowFunction(undefined, undefined, [], undefined, undefined, serializeParameterTypesOfNode(node))));
+                    (properties || (properties = [])).push(ts.createPropertyAssignment("paramTypes", ts.createArrowFunction(undefined, undefined, [], undefined, ts.createToken(35), serializeParameterTypesOfNode(node))));
                 }
                 if (shouldAddReturnTypeMetadata(node)) {
-                    (properties || (properties = [])).push(ts.createPropertyAssignment("returnType", ts.createArrowFunction(undefined, undefined, [], undefined, undefined, serializeReturnTypeOfNode(node))));
+                    (properties || (properties = [])).push(ts.createPropertyAssignment("returnType", ts.createArrowFunction(undefined, undefined, [], undefined, ts.createToken(35), serializeReturnTypeOfNode(node))));
                 }
                 if (properties) {
-                    decoratorExpressions.push(ts.createMetadataHelper(currentSourceFileExternalHelpersModuleName, "design:typeinfo", ts.createObjectLiteral(properties, undefined, true)));
+                    decoratorExpressions.push(ts.createMetadataHelper(currentExternalHelpersModuleName, "design:typeinfo", ts.createObjectLiteral(properties, undefined, true)));
                 }
             }
         }
         function shouldAddTypeMetadata(node) {
             var kind = node.kind;
-            return kind === 148
-                || kind === 150
+            return kind === 149
                 || kind === 151
-                || kind === 146;
+                || kind === 152
+                || kind === 147;
         }
         function shouldAddReturnTypeMetadata(node) {
-            return node.kind === 148;
+            return node.kind === 149;
         }
         function shouldAddParamTypesMetadata(node) {
             var kind = node.kind;
-            return kind === 222
-                || kind === 193
-                || kind === 148
-                || kind === 150
-                || kind === 151;
+            return kind === 226
+                || kind === 197
+                || kind === 149
+                || kind === 151
+                || kind === 152;
         }
         function serializeTypeOfNode(node) {
             switch (node.kind) {
-                case 146:
-                case 143:
-                case 150:
-                    return serializeTypeNode(node.type);
+                case 147:
+                case 144:
                 case 151:
+                    return serializeTypeNode(node.type);
+                case 152:
                     return serializeTypeNode(ts.getSetAccessorTypeAnnotationNode(node));
-                case 222:
-                case 193:
-                case 148:
+                case 226:
+                case 197:
+                case 149:
                     return ts.createIdentifier("Function");
                 default:
                     return ts.createVoidZero();
             }
         }
         function getRestParameterElementType(node) {
-            if (node && node.kind === 161) {
+            if (node && node.kind === 162) {
                 return node.elementType;
             }
-            else if (node && node.kind === 156) {
+            else if (node && node.kind === 157) {
                 return ts.singleOrUndefined(node.typeArguments);
             }
             else {
@@ -37291,20 +37888,20 @@ var ts;
             switch (node.kind) {
                 case 104:
                     return ts.createVoidZero();
-                case 165:
+                case 166:
                     return serializeTypeNode(node.type);
-                case 157:
                 case 158:
+                case 159:
                     return ts.createIdentifier("Function");
-                case 161:
                 case 162:
+                case 163:
                     return ts.createIdentifier("Array");
-                case 155:
+                case 156:
                 case 121:
                     return ts.createIdentifier("Boolean");
-                case 133:
+                case 134:
                     return ts.createIdentifier("String");
-                case 167:
+                case 171:
                     switch (node.literal.kind) {
                         case 9:
                             return ts.createIdentifier("String");
@@ -37318,16 +37915,16 @@ var ts;
                             break;
                     }
                     break;
-                case 131:
+                case 132:
                     return ts.createIdentifier("Number");
-                case 134:
+                case 135:
                     return languageVersion < 2
                         ? getGlobalSymbolNameWithFallback()
                         : ts.createIdentifier("Symbol");
-                case 156:
+                case 157:
                     return serializeTypeReferenceNode(node);
+                case 165:
                 case 164:
-                case 163:
                     {
                         var unionOrIntersection = node;
                         var serializedUnion = void 0;
@@ -37351,10 +37948,13 @@ var ts;
                             return serializedUnion;
                         }
                     }
-                case 159:
                 case 160:
+                case 168:
+                case 169:
+                case 170:
+                case 161:
                 case 118:
-                case 166:
+                case 167:
                     break;
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -37396,15 +37996,15 @@ var ts;
         function serializeEntityNameAsExpression(node, useFallback) {
             switch (node.kind) {
                 case 70:
-                    var name_27 = ts.getMutableClone(node);
-                    name_27.flags &= ~8;
-                    name_27.original = undefined;
-                    name_27.parent = currentScope;
+                    var name_31 = ts.getMutableClone(node);
+                    name_31.flags &= ~8;
+                    name_31.original = undefined;
+                    name_31.parent = currentScope;
                     if (useFallback) {
-                        return ts.createLogicalAnd(ts.createStrictInequality(ts.createTypeOf(name_27), ts.createLiteral("undefined")), name_27);
+                        return ts.createLogicalAnd(ts.createStrictInequality(ts.createTypeOf(name_31), ts.createLiteral("undefined")), name_31);
                     }
-                    return name_27;
-                case 140:
+                    return name_31;
+                case 141:
                     return serializeQualifiedNameAsExpression(node, useFallback);
             }
         }
@@ -37478,7 +38078,7 @@ var ts;
             if (!shouldEmitFunctionLikeDeclaration(node)) {
                 return undefined;
             }
-            var method = ts.createMethod(undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.asteriskToken, visitPropertyNameOfClassElement(node), undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, transformFunctionBody(node), node);
+            var method = ts.createMethod(undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, visitPropertyNameOfClassElement(node), undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, transformFunctionBody(node), node);
             ts.setCommentRange(method, node);
             ts.setSourceMapRange(method, ts.moveRangePastDecorators(node));
             ts.setOriginalNode(method, node);
@@ -37491,27 +38091,27 @@ var ts;
             if (!shouldEmitAccessorDeclaration(node)) {
                 return undefined;
             }
-            var accessor = ts.createGetAccessor(undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), visitPropertyNameOfClassElement(node), ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, node.body ? ts.visitEachChild(node.body, visitor, context) : ts.createBlock([]), node);
+            var accessor = ts.createGetAccessor(undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), visitPropertyNameOfClassElement(node), ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, node.body ? ts.visitEachChild(node.body, visitor, context) : ts.createBlock([]), node);
+            ts.setOriginalNode(accessor, node);
             ts.setCommentRange(accessor, node);
             ts.setSourceMapRange(accessor, ts.moveRangePastDecorators(node));
-            ts.setOriginalNode(accessor, node);
             return accessor;
         }
         function visitSetAccessor(node) {
             if (!shouldEmitAccessorDeclaration(node)) {
                 return undefined;
             }
-            var accessor = ts.createSetAccessor(undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), visitPropertyNameOfClassElement(node), ts.visitNodes(node.parameters, visitor, ts.isParameter), node.body ? ts.visitEachChild(node.body, visitor, context) : ts.createBlock([]), node);
+            var accessor = ts.createSetAccessor(undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), visitPropertyNameOfClassElement(node), ts.visitNodes(node.parameters, visitor, ts.isParameter), node.body ? ts.visitEachChild(node.body, visitor, context) : ts.createBlock([]), node);
+            ts.setOriginalNode(accessor, node);
             ts.setCommentRange(accessor, node);
             ts.setSourceMapRange(accessor, ts.moveRangePastDecorators(node));
-            ts.setOriginalNode(accessor, node);
             return accessor;
         }
         function visitFunctionDeclaration(node) {
             if (!shouldEmitFunctionLikeDeclaration(node)) {
                 return ts.createNotEmittedStatement(node);
             }
-            var func = ts.createFunctionDeclaration(undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.asteriskToken, node.name, undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, transformFunctionBody(node), node);
+            var func = ts.createFunctionDeclaration(undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, node.name, undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, transformFunctionBody(node), node);
             ts.setOriginalNode(func, node);
             if (isNamespaceExport(node)) {
                 var statements = [func];
@@ -37524,12 +38124,12 @@ var ts;
             if (ts.nodeIsMissing(node.body)) {
                 return ts.createOmittedExpression();
             }
-            var func = ts.createFunctionExpression(ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.asteriskToken, node.name, undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, transformFunctionBody(node), node);
+            var func = ts.createFunctionExpression(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, node.name, undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, transformFunctionBody(node), node);
             ts.setOriginalNode(func, node);
             return func;
         }
         function visitArrowFunction(node) {
-            var func = ts.createArrowFunction(ts.visitNodes(node.modifiers, visitor, ts.isModifier), undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, node.equalsGreaterThanToken, transformConciseBody(node), node);
+            var func = ts.createArrowFunction(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, node.equalsGreaterThanToken, transformConciseBody(node), node);
             ts.setOriginalNode(func, node);
             return func;
         }
@@ -37576,7 +38176,7 @@ var ts;
             if (ts.parameterIsThisKeyword(node)) {
                 return undefined;
             }
-            var parameter = ts.createParameterDeclaration(undefined, undefined, node.dotDotDotToken, ts.visitNode(node.name, visitor, ts.isBindingName), undefined, undefined, ts.visitNode(node.initializer, visitor, ts.isExpression), ts.moveRangePastModifiers(node));
+            var parameter = ts.createParameter(undefined, undefined, node.dotDotDotToken, ts.visitNode(node.name, visitor, ts.isBindingName), undefined, undefined, ts.visitNode(node.initializer, visitor, ts.isExpression), ts.moveRangePastModifiers(node));
             ts.setOriginalNode(parameter, node);
             ts.setCommentRange(parameter, node);
             ts.setSourceMapRange(parameter, ts.moveRangePastModifiers(node));
@@ -37598,7 +38198,7 @@ var ts;
         function transformInitializedVariable(node) {
             var name = node.name;
             if (ts.isBindingPattern(name)) {
-                return ts.flattenVariableDestructuringToExpression(node, hoistVariableDeclaration, getNamespaceMemberNameWithSourceMapsAndWithoutComments, visitor);
+                return ts.flattenVariableDestructuringToExpression(node, hoistVariableDeclaration, createNamespaceExportExpression, visitor);
             }
             else {
                 return ts.createAssignment(getNamespaceMemberNameWithSourceMapsAndWithoutComments(name), ts.visitNode(node.initializer, visitor, ts.isExpression), node);
@@ -37634,39 +38234,32 @@ var ts;
                 || compilerOptions.preserveConstEnums
                 || compilerOptions.isolatedModules;
         }
-        function shouldEmitVarForEnumDeclaration(node) {
-            return isFirstEmittedDeclarationInScope(node)
-                && (!ts.hasModifier(node, 1)
-                    || isES6ExportedDeclaration(node));
-        }
-        function addVarForEnumExportedFromNamespace(statements, node) {
-            var statement = ts.createVariableStatement(undefined, [ts.createVariableDeclaration(getDeclarationName(node), undefined, getExportName(node))]);
-            ts.setSourceMapRange(statement, node);
-            statements.push(statement);
-        }
         function visitEnumDeclaration(node) {
             if (!shouldEmitEnumDeclaration(node)) {
                 return undefined;
             }
             var statements = [];
             var emitFlags = 64;
-            recordEmittedDeclarationInScope(node);
-            if (shouldEmitVarForEnumDeclaration(node)) {
-                addVarForEnumOrModuleDeclaration(statements, node);
+            if (addVarForEnumOrModuleDeclaration(statements, node)) {
                 if (moduleKind !== ts.ModuleKind.System || currentScope !== currentSourceFile) {
                     emitFlags |= 16384;
                 }
             }
             var parameterName = getNamespaceParameterName(node);
             var containerName = getNamespaceContainerName(node);
-            var exportName = getExportName(node);
-            var enumStatement = ts.createStatement(ts.createCall(ts.createFunctionExpression(undefined, undefined, undefined, undefined, [ts.createParameter(parameterName)], undefined, transformEnumBody(node, containerName)), undefined, [ts.createLogicalOr(exportName, ts.createAssignment(exportName, ts.createObjectLiteral()))]), node);
+            var exportName = ts.hasModifier(node, 1)
+                ? ts.getExternalModuleOrNamespaceExportName(currentNamespaceContainerName, node, false, true)
+                : ts.getLocalName(node, false, true);
+            var moduleArg = ts.createLogicalOr(exportName, ts.createAssignment(exportName, ts.createObjectLiteral()));
+            if (hasNamespaceQualifiedExportName(node)) {
+                var localName = ts.getLocalName(node, false, true);
+                moduleArg = ts.createAssignment(localName, moduleArg);
+            }
+            var enumStatement = ts.createStatement(ts.createCall(ts.createFunctionExpression(undefined, undefined, undefined, undefined, [ts.createParameter(undefined, undefined, undefined, parameterName)], undefined, transformEnumBody(node, containerName)), undefined, [moduleArg]), node);
             ts.setOriginalNode(enumStatement, node);
             ts.setEmitFlags(enumStatement, emitFlags);
             statements.push(enumStatement);
-            if (isNamespaceExport(node)) {
-                addVarForEnumExportedFromNamespace(statements, node);
-            }
+            statements.push(ts.createEndOfDeclarationMarker(node));
             return statements;
         }
         function transformEnumBody(node, localName) {
@@ -37701,9 +38294,11 @@ var ts;
         function shouldEmitModuleDeclaration(node) {
             return ts.isInstantiatedModule(node, compilerOptions.preserveConstEnums || compilerOptions.isolatedModules);
         }
-        function isES6ExportedDeclaration(node) {
-            return isExternalModuleExport(node)
-                && moduleKind === ts.ModuleKind.ES2015;
+        function hasNamespaceQualifiedExportName(node) {
+            return isNamespaceExport(node)
+                || (isExternalModuleExport(node)
+                    && moduleKind !== ts.ModuleKind.ES2015
+                    && moduleKind !== ts.ModuleKind.System);
         }
         function recordEmittedDeclarationInScope(node) {
             var name = node.symbol && node.symbol.name;
@@ -37718,32 +38313,37 @@ var ts;
         }
         function isFirstEmittedDeclarationInScope(node) {
             if (currentScopeFirstDeclarationsOfName) {
-                var name_28 = node.symbol && node.symbol.name;
-                if (name_28) {
-                    return currentScopeFirstDeclarationsOfName[name_28] === node;
+                var name_32 = node.symbol && node.symbol.name;
+                if (name_32) {
+                    return currentScopeFirstDeclarationsOfName[name_32] === node;
                 }
             }
             return false;
         }
-        function shouldEmitVarForModuleDeclaration(node) {
-            return isFirstEmittedDeclarationInScope(node);
-        }
         function addVarForEnumOrModuleDeclaration(statements, node) {
-            var statement = ts.createVariableStatement(isES6ExportedDeclaration(node)
-                ? ts.visitNodes(node.modifiers, visitor, ts.isModifier)
-                : undefined, [
-                ts.createVariableDeclaration(getDeclarationName(node, false, true))
+            var statement = ts.createVariableStatement(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), [
+                ts.createVariableDeclaration(ts.getLocalName(node, false, true))
             ]);
             ts.setOriginalNode(statement, node);
-            if (node.kind === 225) {
-                ts.setSourceMapRange(statement.declarationList, node);
+            recordEmittedDeclarationInScope(node);
+            if (isFirstEmittedDeclarationInScope(node)) {
+                if (node.kind === 229) {
+                    ts.setSourceMapRange(statement.declarationList, node);
+                }
+                else {
+                    ts.setSourceMapRange(statement, node);
+                }
+                ts.setCommentRange(statement, node);
+                ts.setEmitFlags(statement, 32768 | 33554432);
+                statements.push(statement);
+                return true;
             }
             else {
-                ts.setSourceMapRange(statement, node);
+                var mergeMarker = ts.createMergeDeclarationMarker(statement);
+                ts.setEmitFlags(mergeMarker, 49152 | 33554432);
+                statements.push(mergeMarker);
+                return false;
             }
-            ts.setCommentRange(statement, node);
-            ts.setEmitFlags(statement, 32768);
-            statements.push(statement);
         }
         function visitModuleDeclaration(node) {
             if (!shouldEmitModuleDeclaration(node)) {
@@ -37753,25 +38353,26 @@ var ts;
             enableSubstitutionForNamespaceExports();
             var statements = [];
             var emitFlags = 64;
-            recordEmittedDeclarationInScope(node);
-            if (shouldEmitVarForModuleDeclaration(node)) {
-                addVarForEnumOrModuleDeclaration(statements, node);
+            if (addVarForEnumOrModuleDeclaration(statements, node)) {
                 if (moduleKind !== ts.ModuleKind.System || currentScope !== currentSourceFile) {
                     emitFlags |= 16384;
                 }
             }
             var parameterName = getNamespaceParameterName(node);
             var containerName = getNamespaceContainerName(node);
-            var exportName = getExportName(node);
+            var exportName = ts.hasModifier(node, 1)
+                ? ts.getExternalModuleOrNamespaceExportName(currentNamespaceContainerName, node, false, true)
+                : ts.getLocalName(node, false, true);
             var moduleArg = ts.createLogicalOr(exportName, ts.createAssignment(exportName, ts.createObjectLiteral()));
-            if (ts.hasModifier(node, 1) && !isES6ExportedDeclaration(node)) {
-                var localName = getLocalName(node);
+            if (hasNamespaceQualifiedExportName(node)) {
+                var localName = ts.getLocalName(node, false, true);
                 moduleArg = ts.createAssignment(localName, moduleArg);
             }
-            var moduleStatement = ts.createStatement(ts.createCall(ts.createFunctionExpression(undefined, undefined, undefined, undefined, [ts.createParameter(parameterName)], undefined, transformModuleBody(node, containerName)), undefined, [moduleArg]), node);
+            var moduleStatement = ts.createStatement(ts.createCall(ts.createFunctionExpression(undefined, undefined, undefined, undefined, [ts.createParameter(undefined, undefined, undefined, parameterName)], undefined, transformModuleBody(node, containerName)), undefined, [moduleArg]), node);
             ts.setOriginalNode(moduleStatement, node);
             ts.setEmitFlags(moduleStatement, emitFlags);
             statements.push(moduleStatement);
+            statements.push(ts.createEndOfDeclarationMarker(node));
             return statements;
         }
         function transformModuleBody(node, namespaceLocalName) {
@@ -37786,7 +38387,7 @@ var ts;
             var statementsLocation;
             var blockLocation;
             var body = node.body;
-            if (body.kind === 227) {
+            if (body.kind === 231) {
                 ts.addRange(statements, ts.visitNodes(body.statements, namespaceElementVisitor, ts.isStatement));
                 statementsLocation = body.statements;
                 blockLocation = body;
@@ -37809,13 +38410,13 @@ var ts;
             currentNamespace = savedCurrentNamespace;
             currentScopeFirstDeclarationsOfName = savedCurrentScopeFirstDeclarationsOfName;
             var block = ts.createBlock(ts.createNodeArray(statements, statementsLocation), blockLocation, true);
-            if (body.kind !== 227) {
+            if (body.kind !== 231) {
                 ts.setEmitFlags(block, ts.getEmitFlags(block) | 49152);
             }
             return block;
         }
         function getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration) {
-            if (moduleDeclaration.body.kind === 226) {
+            if (moduleDeclaration.body.kind === 230) {
                 var recursiveInnerModule = getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration.body);
                 return recursiveInnerModule || moduleDeclaration.body;
             }
@@ -37835,7 +38436,7 @@ var ts;
             return (name || namedBindings) ? ts.updateImportClause(node, name, namedBindings) : undefined;
         }
         function visitNamedImportBindings(node) {
-            if (node.kind === 233) {
+            if (node.kind === 237) {
                 return resolver.isReferencedAliasDeclaration(node) ? node : undefined;
             }
             else {
@@ -37887,8 +38488,8 @@ var ts;
             var moduleReference = ts.createExpressionFromEntityName(node.moduleReference);
             ts.setEmitFlags(moduleReference, 49152 | 65536);
             if (isNamedExternalModuleExport(node) || !isNamespaceExport(node)) {
-                return ts.setOriginalNode(ts.createVariableStatement(ts.visitNodes(node.modifiers, visitor, ts.isModifier), ts.createVariableDeclarationList([
-                    ts.createVariableDeclaration(node.name, undefined, moduleReference)
+                return ts.setOriginalNode(ts.createVariableStatement(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), ts.createVariableDeclarationList([
+                    ts.setOriginalNode(ts.createVariableDeclaration(node.name, undefined, moduleReference), node)
                 ]), node), node);
             }
             else {
@@ -37913,36 +38514,20 @@ var ts;
             return ts.createStatement(expression, undefined);
         }
         function addExportMemberAssignment(statements, node) {
-            var expression = ts.createAssignment(getExportName(node), getLocalName(node, true));
+            var expression = ts.createAssignment(ts.getExternalModuleOrNamespaceExportName(currentNamespaceContainerName, node, false, true), ts.getLocalName(node));
             ts.setSourceMapRange(expression, ts.createRange(node.name.pos, node.end));
             var statement = ts.createStatement(expression);
             ts.setSourceMapRange(statement, ts.createRange(-1, node.end));
             statements.push(statement);
         }
         function createNamespaceExport(exportName, exportValue, location) {
-            return ts.createStatement(ts.createAssignment(getNamespaceMemberName(exportName, false, true), exportValue), location);
+            return ts.createStatement(ts.createAssignment(ts.getNamespaceMemberName(currentNamespaceContainerName, exportName, false, true), exportValue), location);
         }
-        function createExternalModuleExport(exportName) {
-            return ts.createExportDeclaration(undefined, undefined, ts.createNamedExports([
-                ts.createExportSpecifier(exportName)
-            ]));
-        }
-        function getNamespaceMemberName(name, allowComments, allowSourceMaps) {
-            var qualifiedName = ts.createPropertyAccess(currentNamespaceContainerName, ts.getSynthesizedClone(name), name);
-            var emitFlags;
-            if (!allowComments) {
-                emitFlags |= 49152;
-            }
-            if (!allowSourceMaps) {
-                emitFlags |= 1536;
-            }
-            if (emitFlags) {
-                ts.setEmitFlags(qualifiedName, emitFlags);
-            }
-            return qualifiedName;
+        function createNamespaceExportExpression(exportName, exportValue, location) {
+            return ts.createAssignment(getNamespaceMemberNameWithSourceMapsAndWithoutComments(exportName), exportValue, location);
         }
         function getNamespaceMemberNameWithSourceMapsAndWithoutComments(name) {
-            return getNamespaceMemberName(name, false, true);
+            return ts.getNamespaceMemberName(currentNamespaceContainerName, name, false, true);
         }
         function getNamespaceParameterName(node) {
             var name = ts.getGeneratedNameForNode(node);
@@ -37952,40 +38537,21 @@ var ts;
         function getNamespaceContainerName(node) {
             return ts.getGeneratedNameForNode(node);
         }
-        function getLocalName(node, noSourceMaps, allowComments) {
-            return getDeclarationName(node, allowComments, !noSourceMaps, 262144);
-        }
-        function getExportName(node, noSourceMaps, allowComments) {
-            if (isNamespaceExport(node)) {
-                return getNamespaceMemberName(getDeclarationName(node), allowComments, !noSourceMaps);
-            }
-            return getDeclarationName(node, allowComments, !noSourceMaps, 131072);
-        }
-        function getDeclarationName(node, allowComments, allowSourceMaps, emitFlags) {
-            if (node.name) {
-                var name_29 = ts.getMutableClone(node.name);
-                emitFlags |= ts.getEmitFlags(node.name);
-                if (!allowSourceMaps) {
-                    emitFlags |= 1536;
-                }
-                if (!allowComments) {
-                    emitFlags |= 49152;
-                }
-                if (emitFlags) {
-                    ts.setEmitFlags(name_29, emitFlags);
-                }
-                return name_29;
-            }
-            else {
-                return ts.getGeneratedNameForNode(node);
+        function getClassAliasIfNeeded(node) {
+            if (resolver.getNodeCheckFlags(node) & 8388608) {
+                enableSubstitutionForClassAliases();
+                var classAlias = ts.createUniqueName(node.name && !ts.isGeneratedIdentifier(node.name) ? node.name.text : "default");
+                classAliases[ts.getOriginalNodeId(node)] = classAlias;
+                hoistVariableDeclaration(classAlias);
+                return classAlias;
             }
         }
         function getClassPrototype(node) {
-            return ts.createPropertyAccess(getDeclarationName(node), "prototype");
+            return ts.createPropertyAccess(ts.getDeclarationName(node), "prototype");
         }
         function getClassMemberPrefix(node, member) {
             return ts.hasModifier(member, 32)
-                ? getDeclarationName(node)
+                ? ts.getDeclarationName(node)
                 : getClassPrototype(node);
         }
         function enableSubstitutionForNonQualifiedEnumMembers() {
@@ -38005,15 +38571,15 @@ var ts;
             if ((enabledSubstitutions & 2) === 0) {
                 enabledSubstitutions |= 2;
                 context.enableSubstitution(70);
-                context.enableSubstitution(254);
-                context.enableEmitNotification(226);
+                context.enableSubstitution(258);
+                context.enableEmitNotification(230);
             }
         }
         function isTransformedModuleDeclaration(node) {
-            return ts.getOriginalNode(node).kind === 226;
+            return ts.getOriginalNode(node).kind === 230;
         }
         function isTransformedEnumDeclaration(node) {
-            return ts.getOriginalNode(node).kind === 225;
+            return ts.getOriginalNode(node).kind === 229;
         }
         function onEmitNode(emitContext, node, emitCallback) {
             var savedApplicableSubstitutions = applicableSubstitutions;
@@ -38038,14 +38604,14 @@ var ts;
         }
         function substituteShorthandPropertyAssignment(node) {
             if (enabledSubstitutions & 2) {
-                var name_30 = node.name;
-                var exportedName = trySubstituteNamespaceExportedName(name_30);
+                var name_33 = node.name;
+                var exportedName = trySubstituteNamespaceExportedName(name_33);
                 if (exportedName) {
                     if (node.objectAssignmentInitializer) {
                         var initializer = ts.createAssignment(exportedName, node.objectAssignmentInitializer);
-                        return ts.createPropertyAssignment(name_30, initializer, node);
+                        return ts.createPropertyAssignment(name_33, initializer, node);
                     }
-                    return ts.createPropertyAssignment(name_30, exportedName, node);
+                    return ts.createPropertyAssignment(name_33, exportedName, node);
                 }
             }
             return node;
@@ -38054,9 +38620,9 @@ var ts;
             switch (node.kind) {
                 case 70:
                     return substituteExpressionIdentifier(node);
-                case 173:
+                case 177:
                     return substitutePropertyAccessExpression(node);
-                case 174:
+                case 178:
                     return substituteElementAccessExpression(node);
             }
             return node;
@@ -38084,11 +38650,11 @@ var ts;
             return undefined;
         }
         function trySubstituteNamespaceExportedName(node) {
-            if (enabledSubstitutions & applicableSubstitutions && (ts.getEmitFlags(node) & 262144) === 0) {
+            if (enabledSubstitutions & applicableSubstitutions && !ts.isLocalName(node)) {
                 var container = resolver.getReferencedExportContainer(node, false);
-                if (container) {
-                    var substitute = (applicableSubstitutions & 2 && container.kind === 226) ||
-                        (applicableSubstitutions & 8 && container.kind === 225);
+                if (container && container.kind !== 261) {
+                    var substitute = (applicableSubstitutions & 2 && container.kind === 230) ||
+                        (applicableSubstitutions & 8 && container.kind === 229);
                     if (substitute) {
                         return ts.createPropertyAccess(ts.getGeneratedNameForNode(container), node, node);
                     }
@@ -38159,11 +38725,11 @@ var ts;
         }
         function visitorWorker(node) {
             switch (node.kind) {
-                case 242:
+                case 246:
                     return visitJsxElement(node, false);
-                case 243:
+                case 247:
                     return visitJsxSelfClosingElement(node, false);
-                case 248:
+                case 252:
                     return visitJsxExpression(node);
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -38174,11 +38740,11 @@ var ts;
             switch (node.kind) {
                 case 10:
                     return visitJsxText(node);
-                case 248:
+                case 252:
                     return visitJsxExpression(node);
-                case 242:
+                case 246:
                     return visitJsxElement(node, true);
-                case 243:
+                case 247:
                     return visitJsxSelfClosingElement(node, true);
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -38208,7 +38774,7 @@ var ts;
                 objectProperties = ts.singleOrUndefined(segments)
                     || ts.createAssignHelper(currentSourceFile.externalHelpersModuleName, segments);
             }
-            var element = ts.createReactCreateElement(compilerOptions.reactNamespace, tagName, objectProperties, ts.filter(ts.map(children, transformJsxChildToExpression), ts.isDefined), node, location);
+            var element = ts.createExpressionForJsxElement(context.getEmitResolver().getJsxFactoryEntity(), compilerOptions.reactNamespace, tagName, objectProperties, ts.filter(ts.map(children, transformJsxChildToExpression), ts.isDefined), node, location);
             if (isChild) {
                 ts.startOnNewLine(element);
             }
@@ -38230,7 +38796,7 @@ var ts;
                 var decoded = tryDecodeEntities(node.text);
                 return decoded ? ts.createLiteral(decoded, node) : node;
             }
-            else if (node.kind === 248) {
+            else if (node.kind === 252) {
                 return visitJsxExpression(node);
             }
             else {
@@ -38295,16 +38861,16 @@ var ts;
             return decoded === text ? undefined : decoded;
         }
         function getTagName(node) {
-            if (node.kind === 242) {
+            if (node.kind === 246) {
                 return getTagName(node.openingElement);
             }
             else {
-                var name_31 = node.tagName;
-                if (ts.isIdentifier(name_31) && ts.isIntrinsicJsxName(name_31.text)) {
-                    return ts.createLiteral(name_31.text);
+                var name_34 = node.tagName;
+                if (ts.isIdentifier(name_34) && ts.isIntrinsicJsxName(name_34.text)) {
+                    return ts.createLiteral(name_34.text);
                 }
                 else {
-                    return ts.createExpressionFromEntityName(name_31);
+                    return ts.createExpressionFromEntityName(name_34);
                 }
             }
         }
@@ -38581,12 +39147,165 @@ var ts;
     }
 })(ts || (ts = {}));
 var ts;
+(function (ts) {
+    function transformESNext(context) {
+        var hoistVariableDeclaration = context.hoistVariableDeclaration;
+        var currentSourceFile;
+        return transformSourceFile;
+        function transformSourceFile(node) {
+            currentSourceFile = node;
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function visitor(node) {
+            if (node.transformFlags & 16) {
+                return visitorWorker(node);
+            }
+            else if (node.transformFlags & 32) {
+                return ts.visitEachChild(node, visitor, context);
+            }
+            else {
+                return node;
+            }
+        }
+        function visitorWorker(node) {
+            switch (node.kind) {
+                case 176:
+                    return visitObjectLiteralExpression(node);
+                case 192:
+                    return visitBinaryExpression(node);
+                case 223:
+                    return visitVariableDeclaration(node);
+                case 213:
+                    return visitForOfStatement(node);
+                case 172:
+                case 173:
+                    return node;
+                case 225:
+                    return visitFunctionDeclaration(node);
+                case 184:
+                    return visitFunctionExpression(node);
+                case 185:
+                    return visitArrowFunction(node);
+                case 144:
+                    return visitParameter(node);
+                default:
+                    ts.Debug.failBadSyntaxKind(node);
+                    return ts.visitEachChild(node, visitor, context);
+            }
+        }
+        function chunkObjectLiteralElements(elements) {
+            var chunkObject;
+            var objects = [];
+            for (var _i = 0, elements_3 = elements; _i < elements_3.length; _i++) {
+                var e = elements_3[_i];
+                if (e.kind === 259) {
+                    if (chunkObject) {
+                        objects.push(ts.createObjectLiteral(chunkObject));
+                        chunkObject = undefined;
+                    }
+                    var target = e.expression;
+                    objects.push(ts.visitNode(target, visitor, ts.isExpression));
+                }
+                else {
+                    if (!chunkObject) {
+                        chunkObject = [];
+                    }
+                    if (e.kind === 257) {
+                        var p = e;
+                        chunkObject.push(ts.createPropertyAssignment(p.name, ts.visitNode(p.initializer, visitor, ts.isExpression)));
+                    }
+                    else {
+                        chunkObject.push(e);
+                    }
+                }
+            }
+            if (chunkObject) {
+                objects.push(ts.createObjectLiteral(chunkObject));
+            }
+            return objects;
+        }
+        function visitObjectLiteralExpression(node) {
+            var objects = chunkObjectLiteralElements(node.properties);
+            if (objects.length && objects[0].kind !== 176) {
+                objects.unshift(ts.createObjectLiteral());
+            }
+            return ts.createCall(ts.createIdentifier("__assign"), undefined, objects);
+        }
+        function visitBinaryExpression(node) {
+            if (ts.isDestructuringAssignment(node) && node.left.transformFlags & 48) {
+                return ts.flattenDestructuringAssignment(context, node, true, hoistVariableDeclaration, visitor, true);
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function visitVariableDeclaration(node) {
+            if (ts.isBindingPattern(node.name) && node.name.transformFlags & 48) {
+                var result = ts.flattenVariableDestructuring(node, undefined, visitor, undefined, true);
+                return result;
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function visitForOfStatement(node) {
+            var initializer = node.initializer;
+            if (!isRestBindingPattern(initializer) && !isRestAssignment(initializer)) {
+                return ts.visitEachChild(node, visitor, context);
+            }
+            return ts.convertForOf(node, undefined, visitor, ts.noop, context, true);
+        }
+        function isRestBindingPattern(initializer) {
+            if (ts.isVariableDeclarationList(initializer)) {
+                var declaration = ts.firstOrUndefined(initializer.declarations);
+                return declaration && declaration.name &&
+                    declaration.name.kind === 172 &&
+                    !!(declaration.name.transformFlags & 8388608);
+            }
+            return false;
+        }
+        function isRestAssignment(initializer) {
+            return initializer.kind === 176 &&
+                initializer.transformFlags & 8388608;
+        }
+        function visitParameter(node) {
+            if (isObjectRestParameter(node)) {
+                return ts.setOriginalNode(ts.createParameter(undefined, undefined, undefined, ts.getGeneratedNameForNode(node), undefined, undefined, node.initializer, node), node);
+            }
+            else {
+                return node;
+            }
+        }
+        function isObjectRestParameter(node) {
+            return node.name &&
+                node.name.kind === 172 &&
+                !!(node.name.transformFlags & 8388608);
+        }
+        function visitFunctionDeclaration(node) {
+            var hasRest = ts.forEach(node.parameters, isObjectRestParameter);
+            var body = hasRest ?
+                ts.transformFunctionBody(node, visitor, currentSourceFile, context, ts.noop, true) :
+                ts.visitEachChild(node.body, visitor, context);
+            return ts.setOriginalNode(ts.createFunctionDeclaration(undefined, node.modifiers, node.asteriskToken, node.name, undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, body, node), node);
+        }
+        function visitArrowFunction(node) {
+            var hasRest = ts.forEach(node.parameters, isObjectRestParameter);
+            var body = hasRest ?
+                ts.transformFunctionBody(node, visitor, currentSourceFile, context, ts.noop, true) :
+                ts.visitEachChild(node.body, visitor, context);
+            var func = ts.setOriginalNode(ts.createArrowFunction(undefined, undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, node.equalsGreaterThanToken, body, node), node);
+            ts.setEmitFlags(func, 256);
+            return func;
+        }
+        function visitFunctionExpression(node) {
+            var hasRest = ts.forEach(node.parameters, isObjectRestParameter);
+            var body = hasRest ?
+                ts.transformFunctionBody(node, visitor, currentSourceFile, context, ts.noop, true) :
+                ts.visitEachChild(node.body, visitor, context);
+            return ts.setOriginalNode(ts.createFunctionExpression(undefined, node.asteriskToken, name, undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, body, node), node);
+        }
+    }
+    ts.transformESNext = transformESNext;
+})(ts || (ts = {}));
+var ts;
 (function (ts) {
     function transformES2017(context) {
-        var ES2017SubstitutionFlags;
-        (function (ES2017SubstitutionFlags) {
-            ES2017SubstitutionFlags[ES2017SubstitutionFlags["AsyncMethodsWithSuper"] = 1] = "AsyncMethodsWithSuper";
-        })(ES2017SubstitutionFlags || (ES2017SubstitutionFlags = {}));
         var startLexicalEnvironment = context.startLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment;
         var resolver = context.getEmitResolver();
         var compilerOptions = context.getCompilerOptions();
@@ -38609,10 +39328,10 @@ var ts;
             return ts.visitEachChild(node, visitor, context);
         }
         function visitor(node) {
-            if (node.transformFlags & 16) {
+            if (node.transformFlags & 64) {
                 return visitorWorker(node);
             }
-            else if (node.transformFlags & 32) {
+            else if (node.transformFlags & 128) {
                 return ts.visitEachChild(node, visitor, context);
             }
             return node;
@@ -38621,15 +39340,15 @@ var ts;
             switch (node.kind) {
                 case 119:
                     return undefined;
-                case 185:
+                case 189:
                     return visitAwaitExpression(node);
-                case 148:
+                case 149:
                     return visitMethodDeclaration(node);
-                case 221:
+                case 225:
                     return visitFunctionDeclaration(node);
-                case 180:
+                case 184:
                     return visitFunctionExpression(node);
-                case 181:
+                case 185:
                     return visitArrowFunction(node);
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -38694,9 +39413,10 @@ var ts;
             return ts.mergeFunctionBodyLexicalEnvironment(visited, declarations);
         }
         function transformAsyncFunctionBody(node) {
-            var nodeType = node.original ? node.original.type : node.type;
+            var original = ts.getOriginalNode(node, ts.isFunctionLike);
+            var nodeType = original.type;
             var promiseConstructor = languageVersion < 2 ? getPromiseConstructor(nodeType) : undefined;
-            var isArrowFunction = node.kind === 181;
+            var isArrowFunction = node.kind === 185;
             var hasLexicalArguments = (resolver.getNodeCheckFlags(node) & 8192) !== 0;
             if (!isArrowFunction) {
                 var statements = [];
@@ -38739,12 +39459,14 @@ var ts;
             }
         }
         function getPromiseConstructor(type) {
-            var typeName = ts.getEntityNameFromTypeNode(type);
-            if (typeName && ts.isEntityName(typeName)) {
-                var serializationKind = resolver.getTypeReferenceSerializationKind(typeName);
-                if (serializationKind === ts.TypeReferenceSerializationKind.TypeWithConstructSignatureAndValue
-                    || serializationKind === ts.TypeReferenceSerializationKind.Unknown) {
-                    return typeName;
+            if (type) {
+                var typeName = ts.getEntityNameFromTypeNode(type);
+                if (typeName && ts.isEntityName(typeName)) {
+                    var serializationKind = resolver.getTypeReferenceSerializationKind(typeName);
+                    if (serializationKind === ts.TypeReferenceSerializationKind.TypeWithConstructSignatureAndValue
+                        || serializationKind === ts.TypeReferenceSerializationKind.Unknown) {
+                        return typeName;
+                    }
                 }
             }
             return undefined;
@@ -38752,23 +39474,23 @@ var ts;
         function enableSubstitutionForAsyncMethodsWithSuper() {
             if ((enabledSubstitutions & 1) === 0) {
                 enabledSubstitutions |= 1;
-                context.enableSubstitution(175);
-                context.enableSubstitution(173);
-                context.enableSubstitution(174);
-                context.enableEmitNotification(222);
-                context.enableEmitNotification(148);
-                context.enableEmitNotification(150);
-                context.enableEmitNotification(151);
+                context.enableSubstitution(179);
+                context.enableSubstitution(177);
+                context.enableSubstitution(178);
+                context.enableEmitNotification(226);
                 context.enableEmitNotification(149);
+                context.enableEmitNotification(151);
+                context.enableEmitNotification(152);
+                context.enableEmitNotification(150);
             }
         }
         function substituteExpression(node) {
             switch (node.kind) {
-                case 173:
+                case 177:
                     return substitutePropertyAccessExpression(node);
-                case 174:
+                case 178:
                     return substituteElementAccessExpression(node);
-                case 175:
+                case 179:
                     if (enabledSubstitutions & 1) {
                         return substituteCallExpression(node);
                     }
@@ -38811,11 +39533,11 @@ var ts;
         }
         function isSuperContainer(node) {
             var kind = node.kind;
-            return kind === 222
-                || kind === 149
-                || kind === 148
+            return kind === 226
                 || kind === 150
-                || kind === 151;
+                || kind === 149
+                || kind === 151
+                || kind === 152;
         }
         function onEmitNode(emitContext, node, emitCallback) {
             var savedApplicableSubstitutions = applicableSubstitutions;
@@ -38861,10 +39583,10 @@ var ts;
             return ts.visitEachChild(node, visitor, context);
         }
         function visitor(node) {
-            if (node.transformFlags & 64) {
+            if (node.transformFlags & 256) {
                 return visitorWorker(node);
             }
-            else if (node.transformFlags & 128) {
+            else if (node.transformFlags & 512) {
                 return ts.visitEachChild(node, visitor, context);
             }
             else {
@@ -38873,7 +39595,7 @@ var ts;
         }
         function visitorWorker(node) {
             switch (node.kind) {
-                case 188:
+                case 192:
                     return visitBinaryExpression(node);
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -38916,28 +39638,6 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    var ES2015SubstitutionFlags;
-    (function (ES2015SubstitutionFlags) {
-        ES2015SubstitutionFlags[ES2015SubstitutionFlags["CapturedThis"] = 1] = "CapturedThis";
-        ES2015SubstitutionFlags[ES2015SubstitutionFlags["BlockScopedBindings"] = 2] = "BlockScopedBindings";
-    })(ES2015SubstitutionFlags || (ES2015SubstitutionFlags = {}));
-    var CopyDirection;
-    (function (CopyDirection) {
-        CopyDirection[CopyDirection["ToOriginal"] = 0] = "ToOriginal";
-        CopyDirection[CopyDirection["ToOutParameter"] = 1] = "ToOutParameter";
-    })(CopyDirection || (CopyDirection = {}));
-    var Jump;
-    (function (Jump) {
-        Jump[Jump["Break"] = 2] = "Break";
-        Jump[Jump["Continue"] = 4] = "Continue";
-        Jump[Jump["Return"] = 8] = "Return";
-    })(Jump || (Jump = {}));
-    var SuperCaptureResult;
-    (function (SuperCaptureResult) {
-        SuperCaptureResult[SuperCaptureResult["NoReplacement"] = 0] = "NoReplacement";
-        SuperCaptureResult[SuperCaptureResult["ReplaceSuperCapture"] = 1] = "ReplaceSuperCapture";
-        SuperCaptureResult[SuperCaptureResult["ReplaceWithReturn"] = 2] = "ReplaceWithReturn";
-    })(SuperCaptureResult || (SuperCaptureResult = {}));
     function transformES2015(context) {
         var startLexicalEnvironment = context.startLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration;
         var resolver = context.getEmitResolver();
@@ -38955,6 +39655,7 @@ var ts;
         var enclosingFunction;
         var enclosingNonArrowFunction;
         var enclosingNonAsyncFunctionBody;
+        var isInConstructorWithCapturedSuper;
         var convertedLoopState;
         var enabledSubstitutions;
         return transformSourceFile;
@@ -38984,11 +39685,14 @@ var ts;
             var savedCurrentParent = currentParent;
             var savedCurrentNode = currentNode;
             var savedConvertedLoopState = convertedLoopState;
+            var savedIsInConstructorWithCapturedSuper = isInConstructorWithCapturedSuper;
             if (ts.nodeStartsNewLexicalEnvironment(node)) {
+                isInConstructorWithCapturedSuper = false;
                 convertedLoopState = undefined;
             }
             onBeforeVisitNode(node);
             var visited = f(node);
+            isInConstructorWithCapturedSuper = savedIsInConstructorWithCapturedSuper;
             convertedLoopState = savedConvertedLoopState;
             enclosingFunction = savedEnclosingFunction;
             enclosingNonArrowFunction = savedEnclosingNonArrowFunction;
@@ -39000,16 +39704,25 @@ var ts;
             currentNode = savedCurrentNode;
             return visited;
         }
+        function returnCapturedThis(node) {
+            return ts.setOriginalNode(ts.createReturn(ts.createIdentifier("_this")), node);
+        }
+        function isReturnVoidStatementInConstructorWithCapturedSuper(node) {
+            return isInConstructorWithCapturedSuper && node.kind === 216 && !node.expression;
+        }
         function shouldCheckNode(node) {
-            return (node.transformFlags & 256) !== 0 ||
-                node.kind === 215 ||
+            return (node.transformFlags & 1024) !== 0 ||
+                node.kind === 219 ||
                 (ts.isIterationStatement(node, false) && shouldConvertIterationStatementBody(node));
         }
         function visitorWorker(node) {
-            if (shouldCheckNode(node)) {
+            if (isReturnVoidStatementInConstructorWithCapturedSuper(node)) {
+                return returnCapturedThis(node);
+            }
+            else if (shouldCheckNode(node)) {
                 return visitJavaScript(node);
             }
-            else if (node.transformFlags & 512) {
+            else if (node.transformFlags & 2048 || (isInConstructorWithCapturedSuper && !ts.isExpression(node))) {
                 return ts.visitEachChild(node, visitor, context);
             }
             else {
@@ -39028,14 +39741,15 @@ var ts;
         }
         function visitNodesInConvertedLoop(node) {
             switch (node.kind) {
-                case 212:
+                case 216:
+                    node = isReturnVoidStatementInConstructorWithCapturedSuper(node) ? returnCapturedThis(node) : node;
                     return visitReturnStatement(node);
-                case 201:
+                case 205:
                     return visitVariableStatement(node);
-                case 214:
+                case 218:
                     return visitSwitchStatement(node);
-                case 211:
-                case 210:
+                case 215:
+                case 214:
                     return visitBreakOrContinueStatement(node);
                 case 98:
                     return visitThisKeyword(node);
@@ -39047,74 +39761,76 @@ var ts;
         }
         function visitJavaScript(node) {
             switch (node.kind) {
-                case 83:
-                    return node;
-                case 222:
+                case 114:
+                    return undefined;
+                case 226:
                     return visitClassDeclaration(node);
-                case 193:
+                case 197:
                     return visitClassExpression(node);
-                case 143:
+                case 144:
                     return visitParameter(node);
-                case 221:
+                case 225:
                     return visitFunctionDeclaration(node);
-                case 181:
+                case 185:
                     return visitArrowFunction(node);
-                case 180:
+                case 184:
                     return visitFunctionExpression(node);
-                case 219:
+                case 223:
                     return visitVariableDeclaration(node);
                 case 70:
                     return visitIdentifier(node);
-                case 220:
+                case 224:
                     return visitVariableDeclarationList(node);
-                case 215:
+                case 219:
                     return visitLabeledStatement(node);
-                case 205:
-                    return visitDoStatement(node);
-                case 206:
-                    return visitWhileStatement(node);
-                case 207:
-                    return visitForStatement(node);
-                case 208:
-                    return visitForInStatement(node);
                 case 209:
+                    return visitDoStatement(node);
+                case 210:
+                    return visitWhileStatement(node);
+                case 211:
+                    return visitForStatement(node);
+                case 212:
+                    return visitForInStatement(node);
+                case 213:
                     return visitForOfStatement(node);
-                case 203:
+                case 207:
                     return visitExpressionStatement(node);
-                case 172:
-                    return visitObjectLiteralExpression(node);
-                case 254:
-                    return visitShorthandPropertyAssignment(node);
-                case 171:
-                    return visitArrayLiteralExpression(node);
-                case 175:
-                    return visitCallExpression(node);
                 case 176:
-                    return visitNewExpression(node);
+                    return visitObjectLiteralExpression(node);
+                case 256:
+                    return visitCatchClause(node);
+                case 258:
+                    return visitShorthandPropertyAssignment(node);
+                case 175:
+                    return visitArrayLiteralExpression(node);
                 case 179:
+                    return visitCallExpression(node);
+                case 180:
+                    return visitNewExpression(node);
+                case 183:
                     return visitParenthesizedExpression(node, true);
-                case 188:
+                case 192:
                     return visitBinaryExpression(node, true);
                 case 12:
                 case 13:
                 case 14:
                 case 15:
                     return visitTemplateLiteral(node);
-                case 177:
+                case 181:
                     return visitTaggedTemplateExpression(node);
-                case 190:
+                case 194:
                     return visitTemplateExpression(node);
-                case 191:
+                case 195:
                     return visitYieldExpression(node);
                 case 96:
                     return visitSuperKeyword();
-                case 191:
+                case 195:
                     return ts.visitEachChild(node, visitor, context);
-                case 148:
+                case 149:
                     return visitMethodDeclaration(node);
-                case 256:
+                case 261:
                     return visitSourceFileNode(node);
-                case 201:
+                case 205:
                     return visitVariableStatement(node);
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -39129,7 +39845,7 @@ var ts;
                 }
                 if (ts.isFunctionLike(currentNode)) {
                     enclosingFunction = currentNode;
-                    if (currentNode.kind !== 181) {
+                    if (currentNode.kind !== 185) {
                         enclosingNonArrowFunction = currentNode;
                         if (!(ts.getEmitFlags(currentNode) & 2097152)) {
                             enclosingNonAsyncFunctionBody = currentNode;
@@ -39137,14 +39853,14 @@ var ts;
                     }
                 }
                 switch (currentNode.kind) {
-                    case 201:
+                    case 205:
                         enclosingVariableStatement = currentNode;
                         break;
-                    case 220:
-                    case 219:
-                    case 170:
-                    case 168:
-                    case 169:
+                    case 224:
+                    case 223:
+                    case 174:
+                    case 172:
+                    case 173:
                         break;
                     default:
                         enclosingVariableStatement = undefined;
@@ -39172,7 +39888,7 @@ var ts;
         }
         function visitThisKeyword(node) {
             ts.Debug.assert(convertedLoopState !== undefined);
-            if (enclosingFunction && enclosingFunction.kind === 181) {
+            if (enclosingFunction && enclosingFunction.kind === 185) {
                 convertedLoopState.containsLexicalThis = true;
                 return node;
             }
@@ -39192,13 +39908,13 @@ var ts;
         }
         function visitBreakOrContinueStatement(node) {
             if (convertedLoopState) {
-                var jump = node.kind === 211 ? 2 : 4;
+                var jump = node.kind === 215 ? 2 : 4;
                 var canUseBreakOrContinue = (node.label && convertedLoopState.labels && convertedLoopState.labels[node.label.text]) ||
                     (!node.label && (convertedLoopState.allowedNonLabeledJumps & jump));
                 if (!canUseBreakOrContinue) {
                     var labelMarker = void 0;
                     if (!node.label) {
-                        if (node.kind === 211) {
+                        if (node.kind === 215) {
                             convertedLoopState.nonLocalJumps |= 2;
                             labelMarker = "break";
                         }
@@ -39208,7 +39924,7 @@ var ts;
                         }
                     }
                     else {
-                        if (node.kind === 211) {
+                        if (node.kind === 215) {
                             labelMarker = "break-" + node.label.text;
                             setLabeledJump(convertedLoopState, true, node.label.text, labelMarker);
                         }
@@ -39238,26 +39954,26 @@ var ts;
             return ts.visitEachChild(node, visitor, context);
         }
         function visitClassDeclaration(node) {
-            var modifierFlags = ts.getModifierFlags(node);
-            var isExported = modifierFlags & 1;
-            var isDefault = modifierFlags & 512;
-            var modifiers = isExported && !isDefault
-                ? ts.filter(node.modifiers, isExportModifier)
-                : undefined;
-            var statement = ts.createVariableStatement(modifiers, ts.createVariableDeclarationList([
-                ts.createVariableDeclaration(getDeclarationName(node, true), undefined, transformClassLikeDeclarationToExpression(node))
-            ]), node);
+            var variable = ts.createVariableDeclaration(ts.getLocalName(node, true), undefined, transformClassLikeDeclarationToExpression(node));
+            ts.setOriginalNode(variable, node);
+            var statements = [];
+            var statement = ts.createVariableStatement(undefined, ts.createVariableDeclarationList([variable]), node);
             ts.setOriginalNode(statement, node);
             ts.startOnNewLine(statement);
-            if (isExported && isDefault) {
-                var statements = [statement];
-                statements.push(ts.createExportAssignment(undefined, undefined, false, getDeclarationName(node, false)));
-                return statements;
+            statements.push(statement);
+            if (ts.hasModifier(node, 1)) {
+                var exportStatement = ts.hasModifier(node, 512)
+                    ? ts.createExportDefault(ts.getLocalName(node))
+                    : ts.createExternalModuleExport(ts.getLocalName(node));
+                ts.setOriginalNode(exportStatement, statement);
+                statements.push(exportStatement);
             }
-            return statement;
-        }
-        function isExportModifier(node) {
-            return node.kind === 83;
+            var emitFlags = ts.getEmitFlags(node);
+            if ((emitFlags & 33554432) === 0) {
+                statements.push(ts.createEndOfDeclarationMarker(node));
+                ts.setEmitFlags(statement, emitFlags | 33554432);
+            }
+            return ts.singleOrMany(statements);
         }
         function visitClassExpression(node) {
             return transformClassLikeDeclarationToExpression(node);
@@ -39267,7 +39983,7 @@ var ts;
                 enableSubstitutionsForBlockScopedBindings();
             }
             var extendsClauseElement = ts.getClassExtendsHeritageClauseElement(node);
-            var classFunction = ts.createFunctionExpression(undefined, undefined, undefined, undefined, extendsClauseElement ? [ts.createParameter("_super")] : [], undefined, transformClassBody(node, extendsClauseElement));
+            var classFunction = ts.createFunctionExpression(undefined, undefined, undefined, undefined, extendsClauseElement ? [ts.createParameter(undefined, undefined, undefined, "_super")] : [], undefined, transformClassBody(node, extendsClauseElement));
             if (ts.getEmitFlags(node) & 524288) {
                 ts.setEmitFlags(classFunction, 524288);
             }
@@ -39288,7 +40004,7 @@ var ts;
             addConstructor(statements, node, extendsClauseElement);
             addClassMembers(statements, node);
             var closingBraceLocation = ts.createTokenRange(ts.skipTrivia(currentText, node.members.end), 17);
-            var localName = getLocalName(node);
+            var localName = ts.getLocalName(node);
             var outer = ts.createPartiallyEmittedExpression(localName);
             outer.end = closingBraceLocation.end;
             ts.setEmitFlags(outer, 49152);
@@ -39303,13 +40019,13 @@ var ts;
         }
         function addExtendsHelperIfNeeded(statements, node, extendsClauseElement) {
             if (extendsClauseElement) {
-                statements.push(ts.createStatement(ts.createExtendsHelper(currentSourceFile.externalHelpersModuleName, getDeclarationName(node)), extendsClauseElement));
+                statements.push(ts.createStatement(ts.createExtendsHelper(currentSourceFile.externalHelpersModuleName, ts.getLocalName(node)), extendsClauseElement));
             }
         }
         function addConstructor(statements, node, extendsClauseElement) {
             var constructor = ts.getFirstConstructorWithBody(node);
             var hasSynthesizedSuper = hasSynthesizedDefaultSuperCall(constructor, extendsClauseElement !== undefined);
-            var constructorFunction = ts.createFunctionDeclaration(undefined, undefined, undefined, getDeclarationName(node), undefined, transformConstructorParameters(constructor, hasSynthesizedSuper), undefined, transformConstructorBody(constructor, node, extendsClauseElement, hasSynthesizedSuper), constructor || node);
+            var constructorFunction = ts.createFunctionDeclaration(undefined, undefined, undefined, ts.getDeclarationName(node), undefined, transformConstructorParameters(constructor, hasSynthesizedSuper), undefined, transformConstructorBody(constructor, node, extendsClauseElement, hasSynthesizedSuper), constructor || node);
             if (extendsClauseElement) {
                 ts.setEmitFlags(constructorFunction, 256);
             }
@@ -39332,8 +40048,8 @@ var ts;
                 statementOffset = ts.addPrologueDirectives(statements, constructor.body.statements, false, visitor);
             }
             if (constructor) {
-                addDefaultValueAssignmentsIfNeeded(statements, constructor);
-                addRestParameterIfNeeded(statements, constructor, hasSynthesizedSuper);
+                ts.addDefaultValueAssignmentsIfNeeded(statements, constructor, visitor, false);
+                ts.addRestParameterIfNeeded(statements, constructor, hasSynthesizedSuper);
                 ts.Debug.assert(statementOffset >= 0, "statementOffset not initialized correctly!");
             }
             var superCaptureStatus = declareOrCaptureOrReturnThisForConstructorIfNeeded(statements, constructor, !!extendsClauseElement, hasSynthesizedSuper, statementOffset);
@@ -39341,7 +40057,10 @@ var ts;
                 statementOffset++;
             }
             if (constructor) {
-                var body = saveStateAndInvoke(constructor, function (constructor) { return ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, statementOffset); });
+                var body = saveStateAndInvoke(constructor, function (constructor) {
+                    isInConstructorWithCapturedSuper = superCaptureStatus === 1;
+                    return ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, statementOffset);
+                });
                 ts.addRange(statements, body);
             }
             if (extendsClauseElement
@@ -39357,17 +40076,17 @@ var ts;
             return block;
         }
         function isSufficientlyCoveredByReturnStatements(statement) {
-            if (statement.kind === 212) {
+            if (statement.kind === 216) {
                 return true;
             }
-            else if (statement.kind === 204) {
+            else if (statement.kind === 208) {
                 var ifStatement = statement;
                 if (ifStatement.elseStatement) {
                     return isSufficientlyCoveredByReturnStatements(ifStatement.thenStatement) &&
                         isSufficientlyCoveredByReturnStatements(ifStatement.elseStatement);
                 }
             }
-            else if (statement.kind === 200) {
+            else if (statement.kind === 204) {
                 var lastStatement = ts.lastOrUndefined(statement.statements);
                 if (lastStatement && isSufficientlyCoveredByReturnStatements(lastStatement)) {
                     return true;
@@ -39378,7 +40097,7 @@ var ts;
         function declareOrCaptureOrReturnThisForConstructorIfNeeded(statements, ctor, hasExtendsClause, hasSynthesizedSuper, statementOffset) {
             if (!hasExtendsClause) {
                 if (ctor) {
-                    addCaptureThisForNodeIfNeeded(statements, ctor);
+                    ts.addCaptureThisForNodeIfNeeded(statements, ctor, enableSubstitutionsForCapturedThis);
                 }
                 return 0;
             }
@@ -39387,7 +40106,7 @@ var ts;
                 return 2;
             }
             if (hasSynthesizedSuper) {
-                captureThisForNode(statements, ctor, createDefaultSuperCallOrThis());
+                ts.captureThisForNode(statements, ctor, createDefaultSuperCallOrThis());
                 enableSubstitutionsForCapturedThis();
                 return 1;
             }
@@ -39396,7 +40115,7 @@ var ts;
             var ctorStatements = ctor.body.statements;
             if (statementOffset < ctorStatements.length) {
                 firstStatement = ctorStatements[statementOffset];
-                if (firstStatement.kind === 203 && ts.isSuperCall(firstStatement.expression)) {
+                if (firstStatement.kind === 207 && ts.isSuperCall(firstStatement.expression)) {
                     var superCall = firstStatement.expression;
                     superCallExpression = ts.setOriginalNode(saveStateAndInvoke(superCall, visitImmediateSuperCallInBody), superCall);
                 }
@@ -39405,7 +40124,7 @@ var ts;
                 statements.push(ts.createReturn(superCallExpression));
                 return 2;
             }
-            captureThisForNode(statements, ctor, superCallExpression, firstStatement);
+            ts.captureThisForNode(statements, ctor, superCallExpression, enableSubstitutionsForCapturedThis, firstStatement);
             if (superCallExpression) {
                 return 1;
             }
@@ -39422,111 +40141,33 @@ var ts;
                 return undefined;
             }
             else if (ts.isBindingPattern(node.name)) {
-                return ts.setOriginalNode(ts.createParameter(ts.getGeneratedNameForNode(node), undefined, node), node);
+                return ts.setOriginalNode(ts.createParameter(undefined, undefined, undefined, ts.getGeneratedNameForNode(node), undefined, undefined, undefined, node), node);
             }
             else if (node.initializer) {
-                return ts.setOriginalNode(ts.createParameter(node.name, undefined, node), node);
+                return ts.setOriginalNode(ts.createParameter(undefined, undefined, undefined, node.name, undefined, undefined, undefined, node), node);
             }
             else {
                 return node;
             }
         }
-        function shouldAddDefaultValueAssignments(node) {
-            return (node.transformFlags & 262144) !== 0;
-        }
-        function addDefaultValueAssignmentsIfNeeded(statements, node) {
-            if (!shouldAddDefaultValueAssignments(node)) {
-                return;
-            }
-            for (var _i = 0, _a = node.parameters; _i < _a.length; _i++) {
-                var parameter = _a[_i];
-                var name_32 = parameter.name, initializer = parameter.initializer, dotDotDotToken = parameter.dotDotDotToken;
-                if (dotDotDotToken) {
-                    continue;
-                }
-                if (ts.isBindingPattern(name_32)) {
-                    addDefaultValueAssignmentForBindingPattern(statements, parameter, name_32, initializer);
-                }
-                else if (initializer) {
-                    addDefaultValueAssignmentForInitializer(statements, parameter, name_32, initializer);
-                }
-            }
-        }
-        function addDefaultValueAssignmentForBindingPattern(statements, parameter, name, initializer) {
-            var temp = ts.getGeneratedNameForNode(parameter);
-            if (name.elements.length > 0) {
-                statements.push(ts.setEmitFlags(ts.createVariableStatement(undefined, ts.createVariableDeclarationList(ts.flattenParameterDestructuring(parameter, temp, visitor))), 8388608));
-            }
-            else if (initializer) {
-                statements.push(ts.setEmitFlags(ts.createStatement(ts.createAssignment(temp, ts.visitNode(initializer, visitor, ts.isExpression))), 8388608));
-            }
-        }
-        function addDefaultValueAssignmentForInitializer(statements, parameter, name, initializer) {
-            initializer = ts.visitNode(initializer, visitor, ts.isExpression);
-            var statement = ts.createIf(ts.createStrictEquality(ts.getSynthesizedClone(name), ts.createVoidZero()), ts.setEmitFlags(ts.createBlock([
-                ts.createStatement(ts.createAssignment(ts.setEmitFlags(ts.getMutableClone(name), 1536), ts.setEmitFlags(initializer, 1536 | ts.getEmitFlags(initializer)), parameter))
-            ], parameter), 32 | 1024 | 12288), undefined, parameter);
-            statement.startsOnNewLine = true;
-            ts.setEmitFlags(statement, 12288 | 1024 | 8388608);
-            statements.push(statement);
-        }
-        function shouldAddRestParameter(node, inConstructorWithSynthesizedSuper) {
-            return node && node.dotDotDotToken && node.name.kind === 70 && !inConstructorWithSynthesizedSuper;
-        }
-        function addRestParameterIfNeeded(statements, node, inConstructorWithSynthesizedSuper) {
-            var parameter = ts.lastOrUndefined(node.parameters);
-            if (!shouldAddRestParameter(parameter, inConstructorWithSynthesizedSuper)) {
-                return;
-            }
-            var declarationName = ts.getMutableClone(parameter.name);
-            ts.setEmitFlags(declarationName, 1536);
-            var expressionName = ts.getSynthesizedClone(parameter.name);
-            var restIndex = node.parameters.length - 1;
-            var temp = ts.createLoopVariable();
-            statements.push(ts.setEmitFlags(ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
-                ts.createVariableDeclaration(declarationName, undefined, ts.createArrayLiteral([]))
-            ]), parameter), 8388608));
-            var forStatement = ts.createFor(ts.createVariableDeclarationList([
-                ts.createVariableDeclaration(temp, undefined, ts.createLiteral(restIndex))
-            ], parameter), ts.createLessThan(temp, ts.createPropertyAccess(ts.createIdentifier("arguments"), "length"), parameter), ts.createPostfixIncrement(temp, parameter), ts.createBlock([
-                ts.startOnNewLine(ts.createStatement(ts.createAssignment(ts.createElementAccess(expressionName, ts.createSubtract(temp, ts.createLiteral(restIndex))), ts.createElementAccess(ts.createIdentifier("arguments"), temp)), parameter))
-            ]));
-            ts.setEmitFlags(forStatement, 8388608);
-            ts.startOnNewLine(forStatement);
-            statements.push(forStatement);
-        }
-        function addCaptureThisForNodeIfNeeded(statements, node) {
-            if (node.transformFlags & 65536 && node.kind !== 181) {
-                captureThisForNode(statements, node, ts.createThis());
-            }
-        }
-        function captureThisForNode(statements, node, initializer, originalStatement) {
-            enableSubstitutionsForCapturedThis();
-            var captureThisStatement = ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
-                ts.createVariableDeclaration("_this", undefined, initializer)
-            ]), originalStatement);
-            ts.setEmitFlags(captureThisStatement, 49152 | 8388608);
-            ts.setSourceMapRange(captureThisStatement, node);
-            statements.push(captureThisStatement);
-        }
         function addClassMembers(statements, node) {
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
                 switch (member.kind) {
-                    case 199:
+                    case 203:
                         statements.push(transformSemicolonClassElementToStatement(member));
                         break;
-                    case 148:
+                    case 149:
                         statements.push(transformClassMethodDeclarationToStatement(getClassMemberPrefix(node, member), member));
                         break;
-                    case 150:
                     case 151:
+                    case 152:
                         var accessors = ts.getAllAccessorDeclarations(node.members, member);
                         if (member === accessors.firstAccessor) {
                             statements.push(transformAccessorsToStatement(getClassMemberPrefix(node, member), accessors));
                         }
                         break;
-                    case 149:
+                    case 150:
                         break;
                     default:
                         ts.Debug.failBadSyntaxKind(node);
@@ -39591,7 +40232,7 @@ var ts;
             return call;
         }
         function visitArrowFunction(node) {
-            if (node.transformFlags & 32768) {
+            if (node.transformFlags & 262144) {
                 enableSubstitutionsForCapturedThis();
             }
             var func = transformFunctionLikeToExpression(node, node, undefined);
@@ -39602,80 +40243,22 @@ var ts;
             return transformFunctionLikeToExpression(node, node, node.name);
         }
         function visitFunctionDeclaration(node) {
-            return ts.setOriginalNode(ts.createFunctionDeclaration(undefined, node.modifiers, node.asteriskToken, node.name, undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, transformFunctionBody(node), node), node);
+            return ts.setOriginalNode(ts.createFunctionDeclaration(undefined, node.modifiers, node.asteriskToken, node.name, undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, ts.transformFunctionBody(node, visitor, currentSourceFile, context, enableSubstitutionsForCapturedThis), node), node);
         }
         function transformFunctionLikeToExpression(node, location, name) {
             var savedContainingNonArrowFunction = enclosingNonArrowFunction;
-            if (node.kind !== 181) {
+            if (node.kind !== 185) {
                 enclosingNonArrowFunction = node;
             }
-            var expression = ts.setOriginalNode(ts.createFunctionExpression(undefined, node.asteriskToken, name, undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, saveStateAndInvoke(node, transformFunctionBody), location), node);
+            var expression = ts.setOriginalNode(ts.createFunctionExpression(undefined, node.asteriskToken, name, undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, saveStateAndInvoke(node, function (node) { return ts.transformFunctionBody(node, visitor, currentSourceFile, context, enableSubstitutionsForCapturedThis); }), location), node);
             enclosingNonArrowFunction = savedContainingNonArrowFunction;
             return expression;
         }
-        function transformFunctionBody(node) {
-            var multiLine = false;
-            var singleLine = false;
-            var statementsLocation;
-            var closeBraceLocation;
-            var statements = [];
-            var body = node.body;
-            var statementOffset;
-            startLexicalEnvironment();
-            if (ts.isBlock(body)) {
-                statementOffset = ts.addPrologueDirectives(statements, body.statements, false, visitor);
-            }
-            addCaptureThisForNodeIfNeeded(statements, node);
-            addDefaultValueAssignmentsIfNeeded(statements, node);
-            addRestParameterIfNeeded(statements, node, false);
-            if (!multiLine && statements.length > 0) {
-                multiLine = true;
-            }
-            if (ts.isBlock(body)) {
-                statementsLocation = body.statements;
-                ts.addRange(statements, ts.visitNodes(body.statements, visitor, ts.isStatement, statementOffset));
-                if (!multiLine && body.multiLine) {
-                    multiLine = true;
-                }
-            }
-            else {
-                ts.Debug.assert(node.kind === 181);
-                statementsLocation = ts.moveRangeEnd(body, -1);
-                var equalsGreaterThanToken = node.equalsGreaterThanToken;
-                if (!ts.nodeIsSynthesized(equalsGreaterThanToken) && !ts.nodeIsSynthesized(body)) {
-                    if (ts.rangeEndIsOnSameLineAsRangeStart(equalsGreaterThanToken, body, currentSourceFile)) {
-                        singleLine = true;
-                    }
-                    else {
-                        multiLine = true;
-                    }
-                }
-                var expression = ts.visitNode(body, visitor, ts.isExpression);
-                var returnStatement = ts.createReturn(expression, body);
-                ts.setEmitFlags(returnStatement, 12288 | 1024 | 32768);
-                statements.push(returnStatement);
-                closeBraceLocation = body;
-            }
-            var lexicalEnvironment = endLexicalEnvironment();
-            ts.addRange(statements, lexicalEnvironment);
-            if (!multiLine && lexicalEnvironment && lexicalEnvironment.length) {
-                multiLine = true;
-            }
-            var block = ts.createBlock(ts.createNodeArray(statements, statementsLocation), node.body, multiLine);
-            if (!multiLine && singleLine) {
-                ts.setEmitFlags(block, 32);
-            }
-            if (closeBraceLocation) {
-                ts.setTokenSourceMapRange(block, 17, closeBraceLocation);
-            }
-            ts.setOriginalNode(block, node.body);
-            return block;
-        }
         function visitExpressionStatement(node) {
             switch (node.expression.kind) {
-                case 179:
+                case 183:
                     return ts.updateStatement(node, visitParenthesizedExpression(node.expression, false));
-                case 188:
+                case 192:
                     return ts.updateStatement(node, visitBinaryExpression(node.expression, false));
             }
             return ts.visitEachChild(node, visitor, context);
@@ -39683,9 +40266,9 @@ var ts;
         function visitParenthesizedExpression(node, needsDestructuringValue) {
             if (needsDestructuringValue) {
                 switch (node.expression.kind) {
-                    case 179:
+                    case 183:
                         return ts.createParen(visitParenthesizedExpression(node.expression, true), node);
-                    case 188:
+                    case 192:
                         return ts.createParen(visitBinaryExpression(node.expression, true), node);
                 }
             }
@@ -39731,7 +40314,7 @@ var ts;
             var declarationList = ts.createVariableDeclarationList(declarations, node);
             ts.setOriginalNode(declarationList, node);
             ts.setCommentRange(declarationList, node);
-            if (node.transformFlags & 8388608
+            if (node.transformFlags & 67108864
                 && (ts.isBindingPattern(node.declarations[0].name)
                     || ts.isBindingPattern(ts.lastOrUndefined(node.declarations).name))) {
                 var firstDeclaration = ts.firstOrUndefined(declarations);
@@ -39750,8 +40333,8 @@ var ts;
                     && ts.isBlock(enclosingBlockScopeContainer)
                     && ts.isIterationStatement(enclosingBlockScopeContainerParent, false));
             var emitExplicitInitializer = !emittedAsTopLevel
-                && enclosingBlockScopeContainer.kind !== 208
-                && enclosingBlockScopeContainer.kind !== 209
+                && enclosingBlockScopeContainer.kind !== 212
+                && enclosingBlockScopeContainer.kind !== 213
                 && (!resolver.isDeclarationWithCollidingName(node)
                     || (isDeclaredInLoop
                         && !isCapturedInFunction
@@ -39813,68 +40396,7 @@ var ts;
             return convertIterationStatementBodyIfNecessary(node, convertForOfToFor);
         }
         function convertForOfToFor(node, convertedLoopBodyStatements) {
-            var expression = ts.visitNode(node.expression, visitor, ts.isExpression);
-            var initializer = node.initializer;
-            var statements = [];
-            var counter = ts.createLoopVariable();
-            var rhsReference = expression.kind === 70
-                ? ts.createUniqueName(expression.text)
-                : ts.createTempVariable(undefined);
-            if (ts.isVariableDeclarationList(initializer)) {
-                if (initializer.flags & 3) {
-                    enableSubstitutionsForBlockScopedBindings();
-                }
-                var firstOriginalDeclaration = ts.firstOrUndefined(initializer.declarations);
-                if (firstOriginalDeclaration && ts.isBindingPattern(firstOriginalDeclaration.name)) {
-                    var declarations = ts.flattenVariableDestructuring(firstOriginalDeclaration, ts.createElementAccess(rhsReference, counter), visitor);
-                    var declarationList = ts.createVariableDeclarationList(declarations, initializer);
-                    ts.setOriginalNode(declarationList, initializer);
-                    var firstDeclaration = declarations[0];
-                    var lastDeclaration = ts.lastOrUndefined(declarations);
-                    ts.setSourceMapRange(declarationList, ts.createRange(firstDeclaration.pos, lastDeclaration.end));
-                    statements.push(ts.createVariableStatement(undefined, declarationList));
-                }
-                else {
-                    statements.push(ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
-                        ts.createVariableDeclaration(firstOriginalDeclaration ? firstOriginalDeclaration.name : ts.createTempVariable(undefined), undefined, ts.createElementAccess(rhsReference, counter))
-                    ], ts.moveRangePos(initializer, -1)), ts.moveRangeEnd(initializer, -1)));
-                }
-            }
-            else {
-                var assignment = ts.createAssignment(initializer, ts.createElementAccess(rhsReference, counter));
-                if (ts.isDestructuringAssignment(assignment)) {
-                    statements.push(ts.createStatement(ts.flattenDestructuringAssignment(context, assignment, false, hoistVariableDeclaration, visitor)));
-                }
-                else {
-                    assignment.end = initializer.end;
-                    statements.push(ts.createStatement(assignment, ts.moveRangeEnd(initializer, -1)));
-                }
-            }
-            var bodyLocation;
-            var statementsLocation;
-            if (convertedLoopBodyStatements) {
-                ts.addRange(statements, convertedLoopBodyStatements);
-            }
-            else {
-                var statement = ts.visitNode(node.statement, visitor, ts.isStatement);
-                if (ts.isBlock(statement)) {
-                    ts.addRange(statements, statement.statements);
-                    bodyLocation = statement;
-                    statementsLocation = statement.statements;
-                }
-                else {
-                    statements.push(statement);
-                }
-            }
-            ts.setEmitFlags(expression, 1536 | ts.getEmitFlags(expression));
-            var body = ts.createBlock(ts.createNodeArray(statements, statementsLocation), bodyLocation);
-            ts.setEmitFlags(body, 1536 | 12288);
-            var forStatement = ts.createFor(ts.createVariableDeclarationList([
-                ts.createVariableDeclaration(counter, undefined, ts.createLiteral(0), ts.moveRangePos(node.expression, -1)),
-                ts.createVariableDeclaration(rhsReference, undefined, expression, node.expression)
-            ], node.expression), ts.createLessThan(counter, ts.createPropertyAccess(rhsReference, "length"), node.expression), ts.createPostfixIncrement(counter, node.expression), body, node);
-            ts.setEmitFlags(forStatement, 8192);
-            return forStatement;
+            return ts.convertForOf(node, convertedLoopBodyStatements, visitor, enableSubstitutionsForBlockScopedBindings, context, false);
         }
         function visitObjectLiteralExpression(node) {
             var properties = node.properties;
@@ -39882,8 +40404,8 @@ var ts;
             var numInitialProperties = numProperties;
             for (var i = 0; i < numProperties; i++) {
                 var property = properties[i];
-                if (property.transformFlags & 16777216
-                    || property.name.kind === 141) {
+                if (property.transformFlags & 134217728
+                    || property.name.kind === 142) {
                     numInitialProperties = i;
                     break;
                 }
@@ -39938,11 +40460,11 @@ var ts;
             var functionName = ts.createUniqueName("_loop");
             var loopInitializer;
             switch (node.kind) {
-                case 207:
-                case 208:
-                case 209:
+                case 211:
+                case 212:
+                case 213:
                     var initializer = node.initializer;
-                    if (initializer && initializer.kind === 220) {
+                    if (initializer && initializer.kind === 224) {
                         loopInitializer = initializer;
                     }
                     break;
@@ -39981,7 +40503,7 @@ var ts;
             }
             var isAsyncBlockContainingAwait = enclosingNonArrowFunction
                 && (ts.getEmitFlags(enclosingNonArrowFunction) & 2097152) !== 0
-                && (node.statement.transformFlags & 16777216) !== 0;
+                && (node.statement.transformFlags & 134217728) !== 0;
             var loopBodyFlags = 0;
             if (currentState.containsLexicalThis) {
                 loopBodyFlags |= 256;
@@ -39989,9 +40511,9 @@ var ts;
             if (isAsyncBlockContainingAwait) {
                 loopBodyFlags |= 2097152;
             }
-            var convertedLoopVariable = ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
+            var convertedLoopVariable = ts.createVariableStatement(undefined, ts.setEmitFlags(ts.createVariableDeclarationList([
                 ts.createVariableDeclaration(functionName, undefined, ts.setEmitFlags(ts.createFunctionExpression(undefined, isAsyncBlockContainingAwait ? ts.createToken(38) : undefined, undefined, undefined, loopParameters, undefined, loopBody), loopBodyFlags))
-            ]));
+            ]), 16777216));
             var statements = [convertedLoopVariable];
             var extraVariableDeclarations;
             if (currentState.argumentsName) {
@@ -40049,7 +40571,7 @@ var ts;
                 loop.transformFlags = 0;
                 ts.aggregateTransformFlags(loop);
             }
-            statements.push(currentParent.kind === 215
+            statements.push(currentParent.kind === 219
                 ? ts.createLabel(currentParent.label, loop)
                 : loop);
             return statements;
@@ -40148,7 +40670,7 @@ var ts;
                 }
             }
             else {
-                loopParameters.push(ts.createParameter(name));
+                loopParameters.push(ts.createParameter(undefined, undefined, undefined, name));
                 if (resolver.getNodeCheckFlags(decl) & 2097152) {
                     var outParamName = ts.createUniqueName("out_" + name.text);
                     loopOutParameters.push({ originalName: name, outParamName: outParamName });
@@ -40161,20 +40683,20 @@ var ts;
             for (var i = start; i < numProperties; i++) {
                 var property = properties[i];
                 switch (property.kind) {
-                    case 150:
                     case 151:
+                    case 152:
                         var accessors = ts.getAllAccessorDeclarations(node.properties, property);
                         if (property === accessors.firstAccessor) {
                             expressions.push(transformAccessorsToExpression(receiver, accessors, node.multiLine));
                         }
                         break;
-                    case 253:
+                    case 257:
                         expressions.push(transformPropertyAssignmentToExpression(property, receiver, node.multiLine));
                         break;
-                    case 254:
+                    case 258:
                         expressions.push(transformShorthandPropertyAssignmentToExpression(property, receiver, node.multiLine));
                         break;
-                    case 148:
+                    case 149:
                         expressions.push(transformObjectLiteralMethodDeclarationToExpression(property, receiver, node.multiLine));
                         break;
                     default:
@@ -40204,6 +40726,19 @@ var ts;
             }
             return expression;
         }
+        function visitCatchClause(node) {
+            ts.Debug.assert(ts.isBindingPattern(node.variableDeclaration.name));
+            var temp = ts.createTempVariable(undefined);
+            var newVariableDeclaration = ts.createVariableDeclaration(temp, undefined, undefined, node.variableDeclaration);
+            var vars = ts.flattenVariableDestructuring(node.variableDeclaration, temp, visitor);
+            var list = ts.createVariableDeclarationList(vars, node.variableDeclaration, node.variableDeclaration.flags);
+            var destructure = ts.createVariableStatement(undefined, list);
+            return ts.updateCatchClause(node, newVariableDeclaration, addStatementToStartOfBlock(node.block, destructure));
+        }
+        function addStatementToStartOfBlock(block, statement) {
+            var transformedStatements = ts.visitNodes(block.statements, visitor, ts.isStatement);
+            return ts.updateBlock(block, [statement].concat(transformedStatements));
+        }
         function visitMethodDeclaration(node) {
             ts.Debug.assert(!ts.isComputedPropertyName(node.name));
             var functionExpression = transformFunctionLikeToExpression(node, ts.moveRangePos(node, -1), undefined);
@@ -40231,7 +40766,7 @@ var ts;
                 ts.setEmitFlags(thisArg, 128);
             }
             var resultingCall;
-            if (node.transformFlags & 1048576) {
+            if (node.transformFlags & 8388608) {
                 resultingCall = ts.createFunctionApply(ts.visitNode(target, visitor, ts.isExpression), ts.visitNode(thisArg, visitor, ts.isExpression), transformAndSpreadElements(node.arguments, false, false, false));
             }
             else {
@@ -40248,35 +40783,35 @@ var ts;
             return resultingCall;
         }
         function visitNewExpression(node) {
-            ts.Debug.assert((node.transformFlags & 1048576) !== 0);
+            ts.Debug.assert((node.transformFlags & 8388608) !== 0);
             var _a = ts.createCallBinding(ts.createPropertyAccess(node.expression, "bind"), hoistVariableDeclaration), target = _a.target, thisArg = _a.thisArg;
             return ts.createNew(ts.createFunctionApply(ts.visitNode(target, visitor, ts.isExpression), thisArg, transformAndSpreadElements(ts.createNodeArray([ts.createVoidZero()].concat(node.arguments)), false, false, false)), undefined, []);
         }
         function transformAndSpreadElements(elements, needsUniqueCopy, multiLine, hasTrailingComma) {
             var numElements = elements.length;
-            var segments = ts.flatten(ts.spanMap(elements, partitionSpreadElement, function (partition, visitPartition, _start, end) {
+            var segments = ts.flatten(ts.spanMap(elements, partitionSpread, function (partition, visitPartition, _start, end) {
                 return visitPartition(partition, multiLine, hasTrailingComma && end === numElements);
             }));
             if (segments.length === 1) {
                 var firstElement = elements[0];
-                return needsUniqueCopy && ts.isSpreadElementExpression(firstElement) && firstElement.expression.kind !== 171
+                return needsUniqueCopy && ts.isSpreadExpression(firstElement) && firstElement.expression.kind !== 175
                     ? ts.createArraySlice(segments[0])
                     : segments[0];
             }
             return ts.createArrayConcat(segments.shift(), segments);
         }
-        function partitionSpreadElement(node) {
-            return ts.isSpreadElementExpression(node)
-                ? visitSpanOfSpreadElements
-                : visitSpanOfNonSpreadElements;
+        function partitionSpread(node) {
+            return ts.isSpreadExpression(node)
+                ? visitSpanOfSpreads
+                : visitSpanOfNonSpreads;
         }
-        function visitSpanOfSpreadElements(chunk) {
-            return ts.map(chunk, visitExpressionOfSpreadElement);
+        function visitSpanOfSpreads(chunk) {
+            return ts.map(chunk, visitExpressionOfSpread);
         }
-        function visitSpanOfNonSpreadElements(chunk, multiLine, hasTrailingComma) {
+        function visitSpanOfNonSpreads(chunk, multiLine, hasTrailingComma) {
             return ts.createArrayLiteral(ts.visitNodes(ts.createNodeArray(chunk, undefined, hasTrailingComma), visitor, ts.isExpression), undefined, multiLine);
         }
-        function visitExpressionOfSpreadElement(node) {
+        function visitExpressionOfSpread(node) {
             return ts.visitNode(node.expression, visitor, ts.isExpression);
         }
         function visitTemplateLiteral(node) {
@@ -40349,7 +40884,7 @@ var ts;
             return enclosingNonAsyncFunctionBody
                 && ts.isClassElement(enclosingNonAsyncFunctionBody)
                 && !ts.hasModifier(enclosingNonAsyncFunctionBody, 32)
-                && currentParent.kind !== 175
+                && currentParent.kind !== 179
                 ? ts.createPropertyAccess(ts.createIdentifier("_super"), "prototype")
                 : ts.createIdentifier("_super");
         }
@@ -40358,7 +40893,7 @@ var ts;
             var statements = [];
             startLexicalEnvironment();
             ts.addRange(statements, prologue);
-            addCaptureThisForNodeIfNeeded(statements, node);
+            ts.addCaptureThisForNodeIfNeeded(statements, node, enableSubstitutionsForCapturedThis);
             ts.addRange(statements, ts.visitNodes(ts.createNodeArray(remaining), visitor, ts.isStatement));
             ts.addRange(statements, endLexicalEnvironment());
             var clone = ts.getMutableClone(node);
@@ -40383,13 +40918,13 @@ var ts;
             if ((enabledSubstitutions & 1) === 0) {
                 enabledSubstitutions |= 1;
                 context.enableSubstitution(98);
-                context.enableEmitNotification(149);
-                context.enableEmitNotification(148);
                 context.enableEmitNotification(150);
+                context.enableEmitNotification(149);
                 context.enableEmitNotification(151);
-                context.enableEmitNotification(181);
-                context.enableEmitNotification(180);
-                context.enableEmitNotification(221);
+                context.enableEmitNotification(152);
+                context.enableEmitNotification(185);
+                context.enableEmitNotification(184);
+                context.enableEmitNotification(225);
             }
         }
         function onSubstituteNode(emitContext, node) {
@@ -40414,10 +40949,10 @@ var ts;
         function isNameOfDeclarationWithCollidingName(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 170:
-                case 222:
-                case 225:
-                case 219:
+                case 174:
+                case 226:
+                case 229:
+                case 223:
                     return parent.name === node
                         && resolver.isDeclarationWithCollidingName(parent);
             }
@@ -40449,28 +40984,8 @@ var ts;
             }
             return node;
         }
-        function getLocalName(node, allowComments, allowSourceMaps) {
-            return getDeclarationName(node, allowComments, allowSourceMaps, 262144);
-        }
-        function getDeclarationName(node, allowComments, allowSourceMaps, emitFlags) {
-            if (node.name && !ts.isGeneratedIdentifier(node.name)) {
-                var name_33 = ts.getMutableClone(node.name);
-                emitFlags |= ts.getEmitFlags(node.name);
-                if (!allowSourceMaps) {
-                    emitFlags |= 1536;
-                }
-                if (!allowComments) {
-                    emitFlags |= 49152;
-                }
-                if (emitFlags) {
-                    ts.setEmitFlags(name_33, emitFlags);
-                }
-                return name_33;
-            }
-            return ts.getGeneratedNameForNode(node);
-        }
         function getClassMemberPrefix(node, member) {
-            var expression = getLocalName(node);
+            var expression = ts.getLocalName(node);
             return ts.hasModifier(member, 32) ? expression : ts.createPropertyAccess(expression, "prototype");
         }
         function hasSynthesizedDefaultSuperCall(constructor, hasExtendsClause) {
@@ -40482,11 +40997,11 @@ var ts;
                 return false;
             }
             var statement = ts.firstOrUndefined(constructor.body.statements);
-            if (!statement || !ts.nodeIsSynthesized(statement) || statement.kind !== 203) {
+            if (!statement || !ts.nodeIsSynthesized(statement) || statement.kind !== 207) {
                 return false;
             }
             var statementExpression = statement.expression;
-            if (!ts.nodeIsSynthesized(statementExpression) || statementExpression.kind !== 175) {
+            if (!ts.nodeIsSynthesized(statementExpression) || statementExpression.kind !== 179) {
                 return false;
             }
             var callTarget = statementExpression.expression;
@@ -40494,7 +41009,7 @@ var ts;
                 return false;
             }
             var callArgument = ts.singleOrUndefined(statementExpression.arguments);
-            if (!callArgument || !ts.nodeIsSynthesized(callArgument) || callArgument.kind !== 192) {
+            if (!callArgument || !ts.nodeIsSynthesized(callArgument) || callArgument.kind !== 196) {
                 return false;
             }
             var expression = callArgument.expression;
@@ -40505,51 +41020,6 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    var OpCode;
-    (function (OpCode) {
-        OpCode[OpCode["Nop"] = 0] = "Nop";
-        OpCode[OpCode["Statement"] = 1] = "Statement";
-        OpCode[OpCode["Assign"] = 2] = "Assign";
-        OpCode[OpCode["Break"] = 3] = "Break";
-        OpCode[OpCode["BreakWhenTrue"] = 4] = "BreakWhenTrue";
-        OpCode[OpCode["BreakWhenFalse"] = 5] = "BreakWhenFalse";
-        OpCode[OpCode["Yield"] = 6] = "Yield";
-        OpCode[OpCode["YieldStar"] = 7] = "YieldStar";
-        OpCode[OpCode["Return"] = 8] = "Return";
-        OpCode[OpCode["Throw"] = 9] = "Throw";
-        OpCode[OpCode["Endfinally"] = 10] = "Endfinally";
-    })(OpCode || (OpCode = {}));
-    var BlockAction;
-    (function (BlockAction) {
-        BlockAction[BlockAction["Open"] = 0] = "Open";
-        BlockAction[BlockAction["Close"] = 1] = "Close";
-    })(BlockAction || (BlockAction = {}));
-    var CodeBlockKind;
-    (function (CodeBlockKind) {
-        CodeBlockKind[CodeBlockKind["Exception"] = 0] = "Exception";
-        CodeBlockKind[CodeBlockKind["With"] = 1] = "With";
-        CodeBlockKind[CodeBlockKind["Switch"] = 2] = "Switch";
-        CodeBlockKind[CodeBlockKind["Loop"] = 3] = "Loop";
-        CodeBlockKind[CodeBlockKind["Labeled"] = 4] = "Labeled";
-    })(CodeBlockKind || (CodeBlockKind = {}));
-    var ExceptionBlockState;
-    (function (ExceptionBlockState) {
-        ExceptionBlockState[ExceptionBlockState["Try"] = 0] = "Try";
-        ExceptionBlockState[ExceptionBlockState["Catch"] = 1] = "Catch";
-        ExceptionBlockState[ExceptionBlockState["Finally"] = 2] = "Finally";
-        ExceptionBlockState[ExceptionBlockState["Done"] = 3] = "Done";
-    })(ExceptionBlockState || (ExceptionBlockState = {}));
-    var Instruction;
-    (function (Instruction) {
-        Instruction[Instruction["Next"] = 0] = "Next";
-        Instruction[Instruction["Throw"] = 1] = "Throw";
-        Instruction[Instruction["Return"] = 2] = "Return";
-        Instruction[Instruction["Break"] = 3] = "Break";
-        Instruction[Instruction["Yield"] = 4] = "Yield";
-        Instruction[Instruction["YieldStar"] = 5] = "YieldStar";
-        Instruction[Instruction["Catch"] = 6] = "Catch";
-        Instruction[Instruction["Endfinally"] = 7] = "Endfinally";
-    })(Instruction || (Instruction = {}));
     var instructionNames = ts.createMap((_a = {},
         _a[2] = "return",
         _a[3] = "break",
@@ -40595,7 +41065,7 @@ var ts;
             if (ts.isDeclarationFile(node)) {
                 return node;
             }
-            if (node.transformFlags & 4096) {
+            if (node.transformFlags & 8192) {
                 currentSourceFile = node;
                 node = ts.visitEachChild(node, visitor, context);
                 currentSourceFile = undefined;
@@ -40610,10 +41080,10 @@ var ts;
             else if (inGeneratorFunctionBody) {
                 return visitJavaScriptInGeneratorFunctionBody(node);
             }
-            else if (transformFlags & 2048) {
+            else if (transformFlags & 4096) {
                 return visitGenerator(node);
             }
-            else if (transformFlags & 4096) {
+            else if (transformFlags & 8192) {
                 return ts.visitEachChild(node, visitor, context);
             }
             else {
@@ -40622,13 +41092,13 @@ var ts;
         }
         function visitJavaScriptInStatementContainingYield(node) {
             switch (node.kind) {
-                case 205:
+                case 209:
                     return visitDoStatement(node);
-                case 206:
+                case 210:
                     return visitWhileStatement(node);
-                case 214:
+                case 218:
                     return visitSwitchStatement(node);
-                case 215:
+                case 219:
                     return visitLabeledStatement(node);
                 default:
                     return visitJavaScriptInGeneratorFunctionBody(node);
@@ -40636,30 +41106,30 @@ var ts;
         }
         function visitJavaScriptInGeneratorFunctionBody(node) {
             switch (node.kind) {
-                case 221:
+                case 225:
                     return visitFunctionDeclaration(node);
-                case 180:
+                case 184:
                     return visitFunctionExpression(node);
-                case 150:
                 case 151:
+                case 152:
                     return visitAccessorDeclaration(node);
-                case 201:
+                case 205:
                     return visitVariableStatement(node);
-                case 207:
-                    return visitForStatement(node);
-                case 208:
-                    return visitForInStatement(node);
                 case 211:
-                    return visitBreakStatement(node);
-                case 210:
-                    return visitContinueStatement(node);
+                    return visitForStatement(node);
                 case 212:
+                    return visitForInStatement(node);
+                case 215:
+                    return visitBreakStatement(node);
+                case 214:
+                    return visitContinueStatement(node);
+                case 216:
                     return visitReturnStatement(node);
                 default:
-                    if (node.transformFlags & 16777216) {
+                    if (node.transformFlags & 134217728) {
                         return visitJavaScriptContainingYield(node);
                     }
-                    else if (node.transformFlags & (4096 | 33554432)) {
+                    else if (node.transformFlags & (8192 | 268435456)) {
                         return ts.visitEachChild(node, visitor, context);
                     }
                     else {
@@ -40669,21 +41139,21 @@ var ts;
         }
         function visitJavaScriptContainingYield(node) {
             switch (node.kind) {
-                case 188:
+                case 192:
                     return visitBinaryExpression(node);
-                case 189:
+                case 193:
                     return visitConditionalExpression(node);
-                case 191:
+                case 195:
                     return visitYieldExpression(node);
-                case 171:
-                    return visitArrayLiteralExpression(node);
-                case 172:
-                    return visitObjectLiteralExpression(node);
-                case 174:
-                    return visitElementAccessExpression(node);
                 case 175:
-                    return visitCallExpression(node);
+                    return visitArrayLiteralExpression(node);
                 case 176:
+                    return visitObjectLiteralExpression(node);
+                case 178:
+                    return visitElementAccessExpression(node);
+                case 179:
+                    return visitCallExpression(node);
+                case 180:
                     return visitNewExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -40691,9 +41161,9 @@ var ts;
         }
         function visitGenerator(node) {
             switch (node.kind) {
-                case 221:
+                case 225:
                     return visitFunctionDeclaration(node);
-                case 180:
+                case 184:
                     return visitFunctionExpression(node);
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -40796,7 +41266,7 @@ var ts;
             return ts.createBlock(statements, body, body.multiLine);
         }
         function visitVariableStatement(node) {
-            if (node.transformFlags & 16777216) {
+            if (node.transformFlags & 134217728) {
                 transformAndEmitVariableDeclarationList(node.declarationList);
                 return undefined;
             }
@@ -40850,10 +41320,10 @@ var ts;
             if (containsYield(right)) {
                 var target = void 0;
                 switch (left.kind) {
-                    case 173:
+                    case 177:
                         target = ts.updatePropertyAccess(left, cacheExpression(ts.visitNode(left.expression, visitor, ts.isLeftHandSideExpression)), left.name);
                         break;
-                    case 174:
+                    case 178:
                         target = ts.updateElementAccess(left, cacheExpression(ts.visitNode(left.expression, visitor, ts.isLeftHandSideExpression)), cacheExpression(ts.visitNode(left.argumentExpression, visitor, ts.isExpression)));
                         break;
                     default:
@@ -41045,35 +41515,35 @@ var ts;
         }
         function transformAndEmitStatementWorker(node) {
             switch (node.kind) {
-                case 200:
-                    return transformAndEmitBlock(node);
-                case 203:
-                    return transformAndEmitExpressionStatement(node);
                 case 204:
-                    return transformAndEmitIfStatement(node);
-                case 205:
-                    return transformAndEmitDoStatement(node);
-                case 206:
-                    return transformAndEmitWhileStatement(node);
+                    return transformAndEmitBlock(node);
                 case 207:
-                    return transformAndEmitForStatement(node);
+                    return transformAndEmitExpressionStatement(node);
                 case 208:
-                    return transformAndEmitForInStatement(node);
+                    return transformAndEmitIfStatement(node);
+                case 209:
+                    return transformAndEmitDoStatement(node);
                 case 210:
-                    return transformAndEmitContinueStatement(node);
+                    return transformAndEmitWhileStatement(node);
                 case 211:
-                    return transformAndEmitBreakStatement(node);
+                    return transformAndEmitForStatement(node);
                 case 212:
-                    return transformAndEmitReturnStatement(node);
-                case 213:
-                    return transformAndEmitWithStatement(node);
+                    return transformAndEmitForInStatement(node);
                 case 214:
-                    return transformAndEmitSwitchStatement(node);
+                    return transformAndEmitContinueStatement(node);
                 case 215:
-                    return transformAndEmitLabeledStatement(node);
+                    return transformAndEmitBreakStatement(node);
                 case 216:
-                    return transformAndEmitThrowStatement(node);
+                    return transformAndEmitReturnStatement(node);
                 case 217:
+                    return transformAndEmitWithStatement(node);
+                case 218:
+                    return transformAndEmitSwitchStatement(node);
+                case 219:
+                    return transformAndEmitLabeledStatement(node);
+                case 220:
+                    return transformAndEmitThrowStatement(node);
+                case 221:
                     return transformAndEmitTryStatement(node);
                 default:
                     return emitStatement(ts.visitNode(node, visitor, ts.isStatement, true));
@@ -41357,7 +41827,7 @@ var ts;
                 for (var i = 0; i < numClauses; i++) {
                     var clause = caseBlock.clauses[i];
                     clauseLabels.push(defineLabel());
-                    if (clause.kind === 250 && defaultClauseIndex === -1) {
+                    if (clause.kind === 254 && defaultClauseIndex === -1) {
                         defaultClauseIndex = i;
                     }
                 }
@@ -41367,7 +41837,7 @@ var ts;
                     var defaultClausesSkipped = 0;
                     for (var i = clausesWritten; i < numClauses; i++) {
                         var clause = caseBlock.clauses[i];
-                        if (clause.kind === 249) {
+                        if (clause.kind === 253) {
                             var caseClause = clause;
                             if (containsYield(caseClause.expression) && pendingClauses.length > 0) {
                                 break;
@@ -41458,7 +41928,7 @@ var ts;
             }
         }
         function containsYield(node) {
-            return node && (node.transformFlags & 16777216) !== 0;
+            return node && (node.transformFlags & 134217728) !== 0;
         }
         function countInitialNodesWithoutYield(nodes) {
             var numNodes = nodes.length;
@@ -41488,9 +41958,9 @@ var ts;
                 if (ts.isIdentifier(original) && original.parent) {
                     var declaration = resolver.getReferencedValueDeclaration(original);
                     if (declaration) {
-                        var name_34 = ts.getProperty(renamedCatchVariableDeclarations, String(ts.getOriginalNodeId(declaration)));
-                        if (name_34) {
-                            var clone_8 = ts.getMutableClone(name_34);
+                        var name_35 = ts.getProperty(renamedCatchVariableDeclarations, String(ts.getOriginalNodeId(declaration)));
+                        if (name_35) {
+                            var clone_8 = ts.getMutableClone(name_35);
                             ts.setSourceMapRange(clone_8, node);
                             ts.setCommentRange(clone_8, node);
                             return clone_8;
@@ -41789,7 +42259,7 @@ var ts;
                 if (labelExpressions === undefined) {
                     labelExpressions = [];
                 }
-                var expression = ts.createSynthesizedNode(8);
+                var expression = ts.createLiteral(-1);
                 if (labelExpressions[label] === undefined) {
                     labelExpressions[label] = [expression];
                 }
@@ -41798,7 +42268,7 @@ var ts;
                 }
                 return expression;
             }
-            return ts.createNode(194);
+            return ts.createOmittedExpression();
         }
         function createInstruction(instruction) {
             var literal = ts.createLiteral(instruction);
@@ -41886,7 +42356,7 @@ var ts;
             var buildResult = buildStatements();
             return ts.createCall(ts.createHelperName(currentSourceFile.externalHelpersModuleName, "__generator"), undefined, [
                 ts.createThis(),
-                ts.setEmitFlags(ts.createFunctionExpression(undefined, undefined, undefined, undefined, [ts.createParameter(state)], undefined, ts.createBlock(buildResult, undefined, buildResult.length > 0)), 4194304)
+                ts.setEmitFlags(ts.createFunctionExpression(undefined, undefined, undefined, undefined, [ts.createParameter(undefined, undefined, undefined, state)], undefined, ts.createBlock(buildResult, undefined, buildResult.length > 0)), 4194304)
             ]);
         }
         function buildStatements() {
@@ -42157,8 +42627,8 @@ var ts;
     function transformES5(context) {
         var previousOnSubstituteNode = context.onSubstituteNode;
         context.onSubstituteNode = onSubstituteNode;
-        context.enableSubstitution(173);
-        context.enableSubstitution(253);
+        context.enableSubstitution(177);
+        context.enableSubstitution(257);
         return transformSourceFile;
         function transformSourceFile(node) {
             return node;
@@ -42198,6 +42668,841 @@ var ts;
     ts.transformES5 = transformES5;
 })(ts || (ts = {}));
 var ts;
+(function (ts) {
+    function transformES2015Module(context) {
+        var compilerOptions = context.getCompilerOptions();
+        return transformSourceFile;
+        function transformSourceFile(node) {
+            if (ts.isDeclarationFile(node)) {
+                return node;
+            }
+            if (ts.isExternalModule(node) || compilerOptions.isolatedModules) {
+                return ts.visitEachChild(node, visitor, context);
+            }
+            return node;
+        }
+        function visitor(node) {
+            switch (node.kind) {
+                case 234:
+                    return undefined;
+                case 240:
+                    return visitExportAssignment(node);
+            }
+            return node;
+        }
+        function visitExportAssignment(node) {
+            return node.isExportEquals ? undefined : node;
+        }
+    }
+    ts.transformES2015Module = transformES2015Module;
+})(ts || (ts = {}));
+var ts;
+(function (ts) {
+    function transformSystemModule(context) {
+        var startLexicalEnvironment = context.startLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration;
+        var compilerOptions = context.getCompilerOptions();
+        var resolver = context.getEmitResolver();
+        var host = context.getEmitHost();
+        var previousOnSubstituteNode = context.onSubstituteNode;
+        var previousOnEmitNode = context.onEmitNode;
+        context.onSubstituteNode = onSubstituteNode;
+        context.onEmitNode = onEmitNode;
+        context.enableSubstitution(70);
+        context.enableSubstitution(192);
+        context.enableSubstitution(190);
+        context.enableSubstitution(191);
+        context.enableEmitNotification(261);
+        var moduleInfoMap = ts.createMap();
+        var deferredExports = ts.createMap();
+        var exportFunctionsMap = ts.createMap();
+        var noSubstitutionMap = ts.createMap();
+        var currentSourceFile;
+        var moduleInfo;
+        var exportFunction;
+        var contextObject;
+        var hoistedStatements;
+        var enclosingBlockScopedContainer;
+        var noSubstitution;
+        return transformSourceFile;
+        function transformSourceFile(node) {
+            if (ts.isDeclarationFile(node)
+                || !(ts.isExternalModule(node)
+                    || compilerOptions.isolatedModules)) {
+                return node;
+            }
+            var id = ts.getOriginalNodeId(node);
+            currentSourceFile = node;
+            enclosingBlockScopedContainer = node;
+            moduleInfo = moduleInfoMap[id] = ts.collectExternalModuleInfo(node, resolver);
+            exportFunction = exportFunctionsMap[id] = ts.createUniqueName("exports");
+            contextObject = ts.createUniqueName("context");
+            var dependencyGroups = collectDependencyGroups(moduleInfo.externalImports);
+            var moduleBodyFunction = ts.createFunctionExpression(undefined, undefined, undefined, undefined, [
+                ts.createParameter(undefined, undefined, undefined, exportFunction),
+                ts.createParameter(undefined, undefined, undefined, contextObject)
+            ], undefined, createSystemModuleBody(node, dependencyGroups));
+            var moduleName = ts.tryGetModuleNameFromFile(node, host, compilerOptions);
+            var dependencies = ts.createArrayLiteral(ts.map(dependencyGroups, function (dependencyGroup) { return dependencyGroup.name; }));
+            var updated = ts.updateSourceFileNode(node, ts.createNodeArray([
+                ts.createStatement(ts.createCall(ts.createPropertyAccess(ts.createIdentifier("System"), "register"), undefined, moduleName
+                    ? [moduleName, dependencies, moduleBodyFunction]
+                    : [dependencies, moduleBodyFunction]))
+            ], node.statements));
+            ts.setEmitFlags(updated, ts.getEmitFlags(node) & ~1);
+            if (noSubstitution) {
+                noSubstitutionMap[id] = noSubstitution;
+                noSubstitution = undefined;
+            }
+            currentSourceFile = undefined;
+            moduleInfo = undefined;
+            exportFunction = undefined;
+            contextObject = undefined;
+            hoistedStatements = undefined;
+            enclosingBlockScopedContainer = undefined;
+            return ts.aggregateTransformFlags(updated);
+        }
+        function collectDependencyGroups(externalImports) {
+            var groupIndices = ts.createMap();
+            var dependencyGroups = [];
+            for (var i = 0; i < externalImports.length; i++) {
+                var externalImport = externalImports[i];
+                var externalModuleName = ts.getExternalModuleNameLiteral(externalImport, currentSourceFile, host, resolver, compilerOptions);
+                var text = externalModuleName.text;
+                if (ts.hasProperty(groupIndices, text)) {
+                    var groupIndex = groupIndices[text];
+                    dependencyGroups[groupIndex].externalImports.push(externalImport);
+                }
+                else {
+                    groupIndices[text] = dependencyGroups.length;
+                    dependencyGroups.push({
+                        name: externalModuleName,
+                        externalImports: [externalImport]
+                    });
+                }
+            }
+            return dependencyGroups;
+        }
+        function createSystemModuleBody(node, dependencyGroups) {
+            var statements = [];
+            startLexicalEnvironment();
+            var statementOffset = ts.addPrologueDirectives(statements, node.statements, !compilerOptions.noImplicitUseStrict, sourceElementVisitor);
+            statements.push(ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
+                ts.createVariableDeclaration("__moduleName", undefined, ts.createLogicalAnd(contextObject, ts.createPropertyAccess(contextObject, "id")))
+            ])));
+            var executeStatements = ts.visitNodes(node.statements, sourceElementVisitor, ts.isStatement, statementOffset);
+            ts.addRange(statements, hoistedStatements);
+            ts.addRange(statements, endLexicalEnvironment());
+            var exportStarFunction = addExportStarIfNeeded(statements);
+            statements.push(ts.createReturn(ts.setMultiLine(ts.createObjectLiteral([
+                ts.createPropertyAssignment("setters", createSettersArray(exportStarFunction, dependencyGroups)),
+                ts.createPropertyAssignment("execute", ts.createFunctionExpression(undefined, undefined, undefined, undefined, [], undefined, ts.createBlock(executeStatements, undefined, true)))
+            ]), true)));
+            var body = ts.createBlock(statements, undefined, true);
+            ts.setEmitFlags(body, 1);
+            return body;
+        }
+        function addExportStarIfNeeded(statements) {
+            if (!moduleInfo.hasExportStarsToExportValues) {
+                return;
+            }
+            if (!moduleInfo.exportedNames && ts.isEmpty(moduleInfo.exportSpecifiers)) {
+                var hasExportDeclarationWithExportClause = false;
+                for (var _i = 0, _a = moduleInfo.externalImports; _i < _a.length; _i++) {
+                    var externalImport = _a[_i];
+                    if (externalImport.kind === 241 && externalImport.exportClause) {
+                        hasExportDeclarationWithExportClause = true;
+                        break;
+                    }
+                }
+                if (!hasExportDeclarationWithExportClause) {
+                    var exportStarFunction_1 = createExportStarFunction(undefined);
+                    statements.push(exportStarFunction_1);
+                    return exportStarFunction_1.name;
+                }
+            }
+            var exportedNames = [];
+            if (moduleInfo.exportedNames) {
+                for (var _b = 0, _c = moduleInfo.exportedNames; _b < _c.length; _b++) {
+                    var exportedLocalName = _c[_b];
+                    if (exportedLocalName.text === "default") {
+                        continue;
+                    }
+                    exportedNames.push(ts.createPropertyAssignment(ts.createLiteral(exportedLocalName), ts.createLiteral(true)));
+                }
+            }
+            for (var _d = 0, _e = moduleInfo.externalImports; _d < _e.length; _d++) {
+                var externalImport = _e[_d];
+                if (externalImport.kind !== 241) {
+                    continue;
+                }
+                var exportDecl = externalImport;
+                if (!exportDecl.exportClause) {
+                    continue;
+                }
+                for (var _f = 0, _g = exportDecl.exportClause.elements; _f < _g.length; _f++) {
+                    var element = _g[_f];
+                    exportedNames.push(ts.createPropertyAssignment(ts.createLiteral((element.name || element.propertyName).text), ts.createLiteral(true)));
+                }
+            }
+            var exportedNamesStorageRef = ts.createUniqueName("exportedNames");
+            statements.push(ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
+                ts.createVariableDeclaration(exportedNamesStorageRef, undefined, ts.createObjectLiteral(exportedNames, undefined, true))
+            ])));
+            var exportStarFunction = createExportStarFunction(exportedNamesStorageRef);
+            statements.push(exportStarFunction);
+            return exportStarFunction.name;
+        }
+        function createExportStarFunction(localNames) {
+            var exportStarFunction = ts.createUniqueName("exportStar");
+            var m = ts.createIdentifier("m");
+            var n = ts.createIdentifier("n");
+            var exports = ts.createIdentifier("exports");
+            var condition = ts.createStrictInequality(n, ts.createLiteral("default"));
+            if (localNames) {
+                condition = ts.createLogicalAnd(condition, ts.createLogicalNot(ts.createHasOwnProperty(localNames, n)));
+            }
+            return ts.createFunctionDeclaration(undefined, undefined, undefined, exportStarFunction, undefined, [ts.createParameter(undefined, undefined, undefined, m)], undefined, ts.createBlock([
+                ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
+                    ts.createVariableDeclaration(exports, undefined, ts.createObjectLiteral([]))
+                ])),
+                ts.createForIn(ts.createVariableDeclarationList([
+                    ts.createVariableDeclaration(n, undefined)
+                ]), m, ts.createBlock([
+                    ts.setEmitFlags(ts.createIf(condition, ts.createStatement(ts.createAssignment(ts.createElementAccess(exports, n), ts.createElementAccess(m, n)))), 32)
+                ])),
+                ts.createStatement(ts.createCall(exportFunction, undefined, [exports]))
+            ], undefined, true));
+        }
+        function createSettersArray(exportStarFunction, dependencyGroups) {
+            var setters = [];
+            for (var _i = 0, dependencyGroups_1 = dependencyGroups; _i < dependencyGroups_1.length; _i++) {
+                var group = dependencyGroups_1[_i];
+                var localName = ts.forEach(group.externalImports, function (i) { return ts.getLocalNameForExternalImport(i, currentSourceFile); });
+                var parameterName = localName ? ts.getGeneratedNameForNode(localName) : ts.createUniqueName("");
+                var statements = [];
+                for (var _a = 0, _b = group.externalImports; _a < _b.length; _a++) {
+                    var entry = _b[_a];
+                    var importVariableName = ts.getLocalNameForExternalImport(entry, currentSourceFile);
+                    switch (entry.kind) {
+                        case 235:
+                            if (!entry.importClause) {
+                                break;
+                            }
+                        case 234:
+                            ts.Debug.assert(importVariableName !== undefined);
+                            statements.push(ts.createStatement(ts.createAssignment(importVariableName, parameterName)));
+                            break;
+                        case 241:
+                            ts.Debug.assert(importVariableName !== undefined);
+                            if (entry.exportClause) {
+                                var properties = [];
+                                for (var _c = 0, _d = entry.exportClause.elements; _c < _d.length; _c++) {
+                                    var e = _d[_c];
+                                    properties.push(ts.createPropertyAssignment(ts.createLiteral(e.name.text), ts.createElementAccess(parameterName, ts.createLiteral((e.propertyName || e.name).text))));
+                                }
+                                statements.push(ts.createStatement(ts.createCall(exportFunction, undefined, [ts.createObjectLiteral(properties, undefined, true)])));
+                            }
+                            else {
+                                statements.push(ts.createStatement(ts.createCall(exportStarFunction, undefined, [parameterName])));
+                            }
+                            break;
+                    }
+                }
+                setters.push(ts.createFunctionExpression(undefined, undefined, undefined, undefined, [ts.createParameter(undefined, undefined, undefined, parameterName)], undefined, ts.createBlock(statements, undefined, true)));
+            }
+            return ts.createArrayLiteral(setters, undefined, true);
+        }
+        function sourceElementVisitor(node) {
+            switch (node.kind) {
+                case 235:
+                    return visitImportDeclaration(node);
+                case 234:
+                    return visitImportEqualsDeclaration(node);
+                case 241:
+                    return undefined;
+                case 240:
+                    return visitExportAssignment(node);
+                default:
+                    return nestedElementVisitor(node);
+            }
+        }
+        function visitImportDeclaration(node) {
+            var statements;
+            if (node.importClause) {
+                hoistVariableDeclaration(ts.getLocalNameForExternalImport(node, currentSourceFile));
+            }
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfImportDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfImportDeclaration(statements, node);
+            }
+            return ts.singleOrMany(statements);
+        }
+        function visitImportEqualsDeclaration(node) {
+            ts.Debug.assert(ts.isExternalModuleImportEqualsDeclaration(node), "import= for internal module references should be handled in an earlier transformer.");
+            var statements;
+            hoistVariableDeclaration(ts.getLocalNameForExternalImport(node, currentSourceFile));
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfImportEqualsDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfImportEqualsDeclaration(statements, node);
+            }
+            return ts.singleOrMany(statements);
+        }
+        function visitExportAssignment(node) {
+            if (node.isExportEquals) {
+                return undefined;
+            }
+            var expression = ts.visitNode(node.expression, destructuringVisitor, ts.isExpression);
+            var original = node.original;
+            if (original && hasAssociatedEndOfDeclarationMarker(original)) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportStatement(deferredExports[id], ts.createIdentifier("default"), expression, true);
+            }
+            else {
+                return createExportStatement(ts.createIdentifier("default"), expression, true);
+            }
+        }
+        function visitFunctionDeclaration(node) {
+            if (ts.hasModifier(node, 1)) {
+                hoistedStatements = ts.append(hoistedStatements, ts.updateFunctionDeclaration(node, node.decorators, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), ts.getDeclarationName(node, true, true), undefined, ts.visitNodes(node.parameters, destructuringVisitor, ts.isParameterDeclaration), undefined, ts.visitNode(node.body, destructuringVisitor, ts.isBlock)));
+            }
+            else {
+                hoistedStatements = ts.append(hoistedStatements, node);
+            }
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfHoistedDeclaration(deferredExports[id], node);
+            }
+            else {
+                hoistedStatements = appendExportsOfHoistedDeclaration(hoistedStatements, node);
+            }
+            return undefined;
+        }
+        function visitClassDeclaration(node) {
+            var statements;
+            var name = ts.getLocalName(node);
+            hoistVariableDeclaration(name);
+            statements = ts.append(statements, ts.createStatement(ts.createAssignment(name, ts.createClassExpression(undefined, node.name, undefined, ts.visitNodes(node.heritageClauses, destructuringVisitor, ts.isHeritageClause), ts.visitNodes(node.members, destructuringVisitor, ts.isClassElement), node)), node));
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfHoistedDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfHoistedDeclaration(statements, node);
+            }
+            return ts.singleOrMany(statements);
+        }
+        function visitVariableStatement(node) {
+            if (!shouldHoistVariableDeclarationList(node.declarationList)) {
+                return ts.visitNode(node, destructuringVisitor, ts.isStatement);
+            }
+            var expressions;
+            var isExportedDeclaration = ts.hasModifier(node, 1);
+            var isMarkedDeclaration = hasAssociatedEndOfDeclarationMarker(node);
+            for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
+                var variable = _a[_i];
+                if (variable.initializer) {
+                    expressions = ts.append(expressions, transformInitializedVariable(variable, isExportedDeclaration && !isMarkedDeclaration));
+                }
+                else {
+                    hoistBindingElement(variable);
+                }
+            }
+            var statements;
+            if (expressions) {
+                statements = ts.append(statements, ts.createStatement(ts.inlineExpressions(expressions), node));
+            }
+            if (isMarkedDeclaration) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node, isExportedDeclaration);
+            }
+            else {
+                statements = appendExportsOfVariableStatement(statements, node, false);
+            }
+            return ts.singleOrMany(statements);
+        }
+        function hoistBindingElement(node) {
+            if (ts.isBindingPattern(node.name)) {
+                for (var _i = 0, _a = node.name.elements; _i < _a.length; _i++) {
+                    var element = _a[_i];
+                    if (!ts.isOmittedExpression(element)) {
+                        hoistBindingElement(element);
+                    }
+                }
+            }
+            else {
+                hoistVariableDeclaration(ts.getSynthesizedClone(node.name));
+            }
+        }
+        function shouldHoistVariableDeclarationList(node) {
+            return (ts.getEmitFlags(node) & 16777216) === 0
+                && (enclosingBlockScopedContainer.kind === 261
+                    || (ts.getOriginalNode(node).flags & 3) === 0);
+        }
+        function transformInitializedVariable(node, isExportedDeclaration) {
+            var createAssignment = isExportedDeclaration ? createExportedVariableAssignment : createNonExportedVariableAssignment;
+            return ts.isBindingPattern(node.name)
+                ? ts.flattenVariableDestructuringToExpression(node, hoistVariableDeclaration, createAssignment, destructuringVisitor)
+                : createAssignment(node.name, ts.visitNode(node.initializer, destructuringVisitor, ts.isExpression));
+        }
+        function createExportedVariableAssignment(name, value, location) {
+            return createVariableAssignment(name, value, location, true);
+        }
+        function createNonExportedVariableAssignment(name, value, location) {
+            return createVariableAssignment(name, value, location, false);
+        }
+        function createVariableAssignment(name, value, location, isExportedDeclaration) {
+            hoistVariableDeclaration(ts.getSynthesizedClone(name));
+            return isExportedDeclaration
+                ? createExportExpression(name, preventSubstitution(ts.createAssignment(name, value, location)))
+                : preventSubstitution(ts.createAssignment(name, value, location));
+        }
+        function visitMergeDeclarationMarker(node) {
+            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 205) {
+                var id = ts.getOriginalNodeId(node);
+                var isExportedDeclaration = ts.hasModifier(node.original, 1);
+                deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node.original, isExportedDeclaration);
+            }
+            return node;
+        }
+        function hasAssociatedEndOfDeclarationMarker(node) {
+            return (ts.getEmitFlags(node) & 33554432) !== 0;
+        }
+        function visitEndOfDeclarationMarker(node) {
+            var id = ts.getOriginalNodeId(node);
+            var statements = deferredExports[id];
+            if (statements) {
+                delete deferredExports[id];
+                return ts.append(statements, node);
+            }
+            return node;
+        }
+        function appendExportsOfImportDeclaration(statements, decl) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            var importClause = decl.importClause;
+            if (!importClause) {
+                return statements;
+            }
+            if (importClause.name) {
+                statements = appendExportsOfDeclaration(statements, importClause);
+            }
+            var namedBindings = importClause.namedBindings;
+            if (namedBindings) {
+                switch (namedBindings.kind) {
+                    case 237:
+                        statements = appendExportsOfDeclaration(statements, namedBindings);
+                        break;
+                    case 238:
+                        for (var _i = 0, _a = namedBindings.elements; _i < _a.length; _i++) {
+                            var importBinding = _a[_i];
+                            statements = appendExportsOfDeclaration(statements, importBinding);
+                        }
+                        break;
+                }
+            }
+            return statements;
+        }
+        function appendExportsOfImportEqualsDeclaration(statements, decl) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            return appendExportsOfDeclaration(statements, decl);
+        }
+        function appendExportsOfVariableStatement(statements, node, exportSelf) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
+                var decl = _a[_i];
+                if (decl.initializer || exportSelf) {
+                    statements = appendExportsOfBindingElement(statements, decl, exportSelf);
+                }
+            }
+            return statements;
+        }
+        function appendExportsOfBindingElement(statements, decl, exportSelf) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            if (ts.isBindingPattern(decl.name)) {
+                for (var _i = 0, _a = decl.name.elements; _i < _a.length; _i++) {
+                    var element = _a[_i];
+                    if (!ts.isOmittedExpression(element)) {
+                        statements = appendExportsOfBindingElement(statements, element, exportSelf);
+                    }
+                }
+            }
+            else if (!ts.isGeneratedIdentifier(decl.name)) {
+                var excludeName = void 0;
+                if (exportSelf) {
+                    statements = appendExportStatement(statements, decl.name, ts.getLocalName(decl));
+                    excludeName = decl.name.text;
+                }
+                statements = appendExportsOfDeclaration(statements, decl, excludeName);
+            }
+            return statements;
+        }
+        function appendExportsOfHoistedDeclaration(statements, decl) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            var excludeName;
+            if (ts.hasModifier(decl, 1)) {
+                var exportName = ts.hasModifier(decl, 512) ? ts.createLiteral("default") : decl.name;
+                statements = appendExportStatement(statements, exportName, ts.getLocalName(decl));
+                excludeName = exportName.text;
+            }
+            if (decl.name) {
+                statements = appendExportsOfDeclaration(statements, decl, excludeName);
+            }
+            return statements;
+        }
+        function appendExportsOfDeclaration(statements, decl, excludeName) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            var name = ts.getDeclarationName(decl);
+            var exportSpecifiers = moduleInfo.exportSpecifiers[name.text];
+            if (exportSpecifiers) {
+                for (var _i = 0, exportSpecifiers_1 = exportSpecifiers; _i < exportSpecifiers_1.length; _i++) {
+                    var exportSpecifier = exportSpecifiers_1[_i];
+                    if (exportSpecifier.name.text !== excludeName) {
+                        statements = appendExportStatement(statements, exportSpecifier.name, name);
+                    }
+                }
+            }
+            return statements;
+        }
+        function appendExportStatement(statements, exportName, expression, allowComments) {
+            statements = ts.append(statements, createExportStatement(exportName, expression, allowComments));
+            return statements;
+        }
+        function createExportStatement(name, value, allowComments) {
+            var statement = ts.createStatement(createExportExpression(name, value));
+            ts.startOnNewLine(statement);
+            if (!allowComments) {
+                ts.setEmitFlags(statement, 49152);
+            }
+            return statement;
+        }
+        function createExportExpression(name, value) {
+            var exportName = ts.isIdentifier(name) ? ts.createLiteral(name) : name;
+            return ts.createCall(exportFunction, undefined, [exportName, value]);
+        }
+        function nestedElementVisitor(node) {
+            switch (node.kind) {
+                case 205:
+                    return visitVariableStatement(node);
+                case 225:
+                    return visitFunctionDeclaration(node);
+                case 226:
+                    return visitClassDeclaration(node);
+                case 211:
+                    return visitForStatement(node);
+                case 212:
+                    return visitForInStatement(node);
+                case 213:
+                    return visitForOfStatement(node);
+                case 209:
+                    return visitDoStatement(node);
+                case 210:
+                    return visitWhileStatement(node);
+                case 219:
+                    return visitLabeledStatement(node);
+                case 217:
+                    return visitWithStatement(node);
+                case 218:
+                    return visitSwitchStatement(node);
+                case 232:
+                    return visitCaseBlock(node);
+                case 253:
+                    return visitCaseClause(node);
+                case 254:
+                    return visitDefaultClause(node);
+                case 221:
+                    return visitTryStatement(node);
+                case 256:
+                    return visitCatchClause(node);
+                case 204:
+                    return visitBlock(node);
+                case 294:
+                    return visitMergeDeclarationMarker(node);
+                case 295:
+                    return visitEndOfDeclarationMarker(node);
+                default:
+                    return destructuringVisitor(node);
+            }
+        }
+        function visitForStatement(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.updateFor(node, visitForInitializer(node.initializer), ts.visitNode(node.condition, destructuringVisitor, ts.isExpression, true), ts.visitNode(node.incrementor, destructuringVisitor, ts.isExpression, true), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement));
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        function visitForInStatement(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.updateForIn(node, visitForInitializer(node.initializer), ts.visitNode(node.expression, destructuringVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, false, ts.liftToBlock));
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        function visitForOfStatement(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.updateForOf(node, visitForInitializer(node.initializer), ts.visitNode(node.expression, destructuringVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, false, ts.liftToBlock));
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        function shouldHoistForInitializer(node) {
+            return ts.isVariableDeclarationList(node)
+                && shouldHoistVariableDeclarationList(node);
+        }
+        function visitForInitializer(node) {
+            if (shouldHoistForInitializer(node)) {
+                var expressions = void 0;
+                for (var _i = 0, _a = node.declarations; _i < _a.length; _i++) {
+                    var variable = _a[_i];
+                    expressions = ts.append(expressions, transformInitializedVariable(variable, false));
+                }
+                return expressions ? ts.inlineExpressions(expressions) : ts.createOmittedExpression();
+            }
+            else {
+                return ts.visitEachChild(node, nestedElementVisitor, context);
+            }
+        }
+        function visitDoStatement(node) {
+            return ts.updateDo(node, ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, false, ts.liftToBlock), ts.visitNode(node.expression, destructuringVisitor, ts.isExpression));
+        }
+        function visitWhileStatement(node) {
+            return ts.updateWhile(node, ts.visitNode(node.expression, destructuringVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, false, ts.liftToBlock));
+        }
+        function visitLabeledStatement(node) {
+            return ts.updateLabel(node, node.label, ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, false, ts.liftToBlock));
+        }
+        function visitWithStatement(node) {
+            return ts.updateWith(node, ts.visitNode(node.expression, destructuringVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, false, ts.liftToBlock));
+        }
+        function visitSwitchStatement(node) {
+            return ts.updateSwitch(node, ts.visitNode(node.expression, destructuringVisitor, ts.isExpression), ts.visitNode(node.caseBlock, nestedElementVisitor, ts.isCaseBlock));
+        }
+        function visitCaseBlock(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.updateCaseBlock(node, ts.visitNodes(node.clauses, nestedElementVisitor, ts.isCaseOrDefaultClause));
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        function visitCaseClause(node) {
+            return ts.updateCaseClause(node, ts.visitNode(node.expression, destructuringVisitor, ts.isExpression), ts.visitNodes(node.statements, nestedElementVisitor, ts.isStatement));
+        }
+        function visitDefaultClause(node) {
+            return ts.visitEachChild(node, nestedElementVisitor, context);
+        }
+        function visitTryStatement(node) {
+            return ts.visitEachChild(node, nestedElementVisitor, context);
+        }
+        function visitCatchClause(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.updateCatchClause(node, node.variableDeclaration, ts.visitNode(node.block, nestedElementVisitor, ts.isBlock));
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        function visitBlock(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.visitEachChild(node, nestedElementVisitor, context);
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        function destructuringVisitor(node) {
+            if (node.transformFlags & 16384
+                && node.kind === 192) {
+                return visitDestructuringAssignment(node);
+            }
+            else if (node.transformFlags & 32768) {
+                return ts.visitEachChild(node, destructuringVisitor, context);
+            }
+            else {
+                return node;
+            }
+        }
+        function visitDestructuringAssignment(node) {
+            if (hasExportedReferenceInDestructuringTarget(node.left)) {
+                return ts.flattenDestructuringAssignment(context, node, true, hoistVariableDeclaration, destructuringVisitor);
+            }
+            return ts.visitEachChild(node, destructuringVisitor, context);
+        }
+        function hasExportedReferenceInDestructuringTarget(node) {
+            if (ts.isAssignmentExpression(node)) {
+                return hasExportedReferenceInDestructuringTarget(node.left);
+            }
+            else if (ts.isSpreadExpression(node)) {
+                return hasExportedReferenceInDestructuringTarget(node.expression);
+            }
+            else if (ts.isObjectLiteralExpression(node)) {
+                return ts.some(node.properties, hasExportedReferenceInDestructuringTarget);
+            }
+            else if (ts.isArrayLiteralExpression(node)) {
+                return ts.some(node.elements, hasExportedReferenceInDestructuringTarget);
+            }
+            else if (ts.isShorthandPropertyAssignment(node)) {
+                return hasExportedReferenceInDestructuringTarget(node.name);
+            }
+            else if (ts.isPropertyAssignment(node)) {
+                return hasExportedReferenceInDestructuringTarget(node.initializer);
+            }
+            else if (ts.isIdentifier(node)) {
+                var container = resolver.getReferencedExportContainer(node);
+                return container !== undefined && container.kind === 261;
+            }
+            else {
+                return false;
+            }
+        }
+        function modifierVisitor(node) {
+            switch (node.kind) {
+                case 83:
+                case 78:
+                    return undefined;
+            }
+            return node;
+        }
+        function onEmitNode(emitContext, node, emitCallback) {
+            if (node.kind === 261) {
+                var id = ts.getOriginalNodeId(node);
+                currentSourceFile = node;
+                moduleInfo = moduleInfoMap[id];
+                exportFunction = exportFunctionsMap[id];
+                noSubstitution = noSubstitutionMap[id];
+                if (noSubstitution) {
+                    delete noSubstitutionMap[id];
+                }
+                previousOnEmitNode(emitContext, node, emitCallback);
+                currentSourceFile = undefined;
+                moduleInfo = undefined;
+                exportFunction = undefined;
+                noSubstitution = undefined;
+            }
+            else {
+                previousOnEmitNode(emitContext, node, emitCallback);
+            }
+        }
+        function onSubstituteNode(emitContext, node) {
+            node = previousOnSubstituteNode(emitContext, node);
+            if (isSubstitutionPrevented(node)) {
+                return node;
+            }
+            if (emitContext === 1) {
+                return substituteExpression(node);
+            }
+            return node;
+        }
+        function substituteExpression(node) {
+            switch (node.kind) {
+                case 70:
+                    return substituteExpressionIdentifier(node);
+                case 192:
+                    return substituteBinaryExpression(node);
+                case 190:
+                case 191:
+                    return substituteUnaryExpression(node);
+            }
+            return node;
+        }
+        function substituteExpressionIdentifier(node) {
+            if (!ts.isGeneratedIdentifier(node) && !ts.isLocalName(node)) {
+                var importDeclaration = resolver.getReferencedImportDeclaration(node);
+                if (importDeclaration) {
+                    if (ts.isImportClause(importDeclaration)) {
+                        return ts.createPropertyAccess(ts.getGeneratedNameForNode(importDeclaration.parent), ts.createIdentifier("default"), node);
+                    }
+                    else if (ts.isImportSpecifier(importDeclaration)) {
+                        return ts.createPropertyAccess(ts.getGeneratedNameForNode(importDeclaration.parent.parent.parent), ts.getSynthesizedClone(importDeclaration.propertyName || importDeclaration.name), node);
+                    }
+                }
+            }
+            return node;
+        }
+        function substituteBinaryExpression(node) {
+            if (ts.isAssignmentOperator(node.operatorToken.kind)
+                && ts.isIdentifier(node.left)
+                && !ts.isGeneratedIdentifier(node.left)
+                && !ts.isLocalName(node.left)
+                && !ts.isDeclarationNameOfEnumOrNamespace(node.left)) {
+                var exportedNames = getExports(node.left);
+                if (exportedNames) {
+                    var expression = node;
+                    for (var _i = 0, exportedNames_1 = exportedNames; _i < exportedNames_1.length; _i++) {
+                        var exportName = exportedNames_1[_i];
+                        expression = createExportExpression(exportName, preventSubstitution(expression));
+                    }
+                    return expression;
+                }
+            }
+            return node;
+        }
+        function substituteUnaryExpression(node) {
+            if ((node.operator === 42 || node.operator === 43)
+                && ts.isIdentifier(node.operand)
+                && !ts.isGeneratedIdentifier(node.operand)
+                && !ts.isLocalName(node.operand)
+                && !ts.isDeclarationNameOfEnumOrNamespace(node.operand)) {
+                var exportedNames = getExports(node.operand);
+                if (exportedNames) {
+                    var expression = node.kind === 191
+                        ? ts.createPrefix(node.operator, node.operand, node)
+                        : node;
+                    for (var _i = 0, exportedNames_2 = exportedNames; _i < exportedNames_2.length; _i++) {
+                        var exportName = exportedNames_2[_i];
+                        expression = createExportExpression(exportName, preventSubstitution(expression));
+                    }
+                    if (node.kind === 191) {
+                        expression = node.operator === 42
+                            ? ts.createSubtract(preventSubstitution(expression), ts.createLiteral(1))
+                            : ts.createAdd(preventSubstitution(expression), ts.createLiteral(1));
+                    }
+                    return expression;
+                }
+            }
+            return node;
+        }
+        function getExports(name) {
+            var exportedNames;
+            if (!ts.isGeneratedIdentifier(name)) {
+                var valueDeclaration = resolver.getReferencedImportDeclaration(name)
+                    || resolver.getReferencedValueDeclaration(name);
+                if (valueDeclaration) {
+                    var exportContainer = resolver.getReferencedExportContainer(name, false);
+                    if (exportContainer && exportContainer.kind === 261) {
+                        exportedNames = ts.append(exportedNames, ts.getDeclarationName(valueDeclaration));
+                    }
+                    exportedNames = ts.addRange(exportedNames, moduleInfo && moduleInfo.exportedBindings[ts.getOriginalNodeId(valueDeclaration)]);
+                }
+            }
+            return exportedNames;
+        }
+        function preventSubstitution(node) {
+            if (noSubstitution === undefined)
+                noSubstitution = ts.createMap();
+            noSubstitution[ts.getNodeId(node)] = true;
+            return node;
+        }
+        function isSubstitutionPrevented(node) {
+            return noSubstitution && node.id && noSubstitution[node.id];
+        }
+    }
+    ts.transformSystemModule = transformSystemModule;
+})(ts || (ts = {}));
+var ts;
 (function (ts) {
     function transformModule(context) {
         var transformModuleDelegates = ts.createMap((_a = {},
@@ -42217,48 +43522,40 @@ var ts;
         context.onSubstituteNode = onSubstituteNode;
         context.onEmitNode = onEmitNode;
         context.enableSubstitution(70);
-        context.enableSubstitution(188);
-        context.enableSubstitution(186);
-        context.enableSubstitution(187);
-        context.enableSubstitution(254);
-        context.enableEmitNotification(256);
+        context.enableSubstitution(192);
+        context.enableSubstitution(190);
+        context.enableSubstitution(191);
+        context.enableSubstitution(258);
+        context.enableEmitNotification(261);
+        var moduleInfoMap = ts.createMap();
+        var deferredExports = ts.createMap();
         var currentSourceFile;
-        var externalImports;
-        var exportSpecifiers;
-        var exportEquals;
-        var bindingNameExportSpecifiersMap;
-        var bindingNameExportSpecifiersForFileMap = ts.createMap();
-        var hasExportStarsToExportValues;
+        var currentModuleInfo;
+        var noSubstitution;
         return transformSourceFile;
         function transformSourceFile(node) {
-            if (ts.isDeclarationFile(node)) {
+            if (ts.isDeclarationFile(node)
+                || !(ts.isExternalModule(node)
+                    || compilerOptions.isolatedModules)) {
                 return node;
             }
-            if (ts.isExternalModule(node) || compilerOptions.isolatedModules) {
-                currentSourceFile = node;
-                (_a = ts.collectExternalModuleInfo(node), externalImports = _a.externalImports, exportSpecifiers = _a.exportSpecifiers, exportEquals = _a.exportEquals, hasExportStarsToExportValues = _a.hasExportStarsToExportValues, _a);
-                var transformModule_1 = transformModuleDelegates[moduleKind] || transformModuleDelegates[ts.ModuleKind.None];
-                var updated = transformModule_1(node);
-                ts.aggregateTransformFlags(updated);
-                currentSourceFile = undefined;
-                externalImports = undefined;
-                exportSpecifiers = undefined;
-                exportEquals = undefined;
-                hasExportStarsToExportValues = false;
-                return updated;
-            }
-            return node;
-            var _a;
+            currentSourceFile = node;
+            currentModuleInfo = moduleInfoMap[ts.getOriginalNodeId(node)] = ts.collectExternalModuleInfo(node, resolver);
+            var transformModule = transformModuleDelegates[moduleKind] || transformModuleDelegates[ts.ModuleKind.None];
+            var updated = transformModule(node);
+            currentSourceFile = undefined;
+            currentModuleInfo = undefined;
+            return ts.aggregateTransformFlags(updated);
         }
         function transformCommonJSModule(node) {
             startLexicalEnvironment();
             var statements = [];
-            var statementOffset = ts.addPrologueDirectives(statements, node.statements, !compilerOptions.noImplicitUseStrict, visitor);
-            ts.addRange(statements, ts.visitNodes(node.statements, visitor, ts.isStatement, statementOffset));
+            var statementOffset = ts.addPrologueDirectives(statements, node.statements, !compilerOptions.noImplicitUseStrict, sourceElementVisitor);
+            ts.addRange(statements, ts.visitNodes(node.statements, sourceElementVisitor, ts.isStatement, statementOffset));
             ts.addRange(statements, endLexicalEnvironment());
             addExportEqualsIfNeeded(statements, false);
-            var updated = updateSourceFile(node, statements);
-            if (hasExportStarsToExportValues) {
+            var updated = ts.updateSourceFileNode(node, ts.createNodeArray(statements, node.statements));
+            if (currentModuleInfo.hasExportStarsToExportValues) {
                 ts.setEmitFlags(updated, 2 | ts.getEmitFlags(node));
             }
             return updated;
@@ -42275,77 +43572,105 @@ var ts;
         }
         function transformAsynchronousModule(node, define, moduleName, includeNonAmdDependencies) {
             var _a = collectAsynchronousDependencies(node, includeNonAmdDependencies), aliasedModuleNames = _a.aliasedModuleNames, unaliasedModuleNames = _a.unaliasedModuleNames, importAliasNames = _a.importAliasNames;
-            return updateSourceFile(node, [
+            return ts.updateSourceFileNode(node, ts.createNodeArray([
                 ts.createStatement(ts.createCall(define, undefined, (moduleName ? [moduleName] : []).concat([
                     ts.createArrayLiteral([
                         ts.createLiteral("require"),
                         ts.createLiteral("exports")
                     ].concat(aliasedModuleNames, unaliasedModuleNames)),
                     ts.createFunctionExpression(undefined, undefined, undefined, undefined, [
-                        ts.createParameter("require"),
-                        ts.createParameter("exports")
+                        ts.createParameter(undefined, undefined, undefined, "require"),
+                        ts.createParameter(undefined, undefined, undefined, "exports")
                     ].concat(importAliasNames), undefined, transformAsynchronousModuleBody(node))
                 ])))
-            ]);
+            ], node.statements));
+        }
+        function collectAsynchronousDependencies(node, includeNonAmdDependencies) {
+            var aliasedModuleNames = [];
+            var unaliasedModuleNames = [];
+            var importAliasNames = [];
+            for (var _i = 0, _a = node.amdDependencies; _i < _a.length; _i++) {
+                var amdDependency = _a[_i];
+                if (amdDependency.name) {
+                    aliasedModuleNames.push(ts.createLiteral(amdDependency.path));
+                    importAliasNames.push(ts.createParameter(undefined, undefined, undefined, amdDependency.name));
+                }
+                else {
+                    unaliasedModuleNames.push(ts.createLiteral(amdDependency.path));
+                }
+            }
+            for (var _b = 0, _c = currentModuleInfo.externalImports; _b < _c.length; _b++) {
+                var importNode = _c[_b];
+                var externalModuleName = ts.getExternalModuleNameLiteral(importNode, currentSourceFile, host, resolver, compilerOptions);
+                var importAliasName = ts.getLocalNameForExternalImport(importNode, currentSourceFile);
+                if (includeNonAmdDependencies && importAliasName) {
+                    ts.setEmitFlags(importAliasName, 128);
+                    aliasedModuleNames.push(externalModuleName);
+                    importAliasNames.push(ts.createParameter(undefined, undefined, undefined, importAliasName));
+                }
+                else {
+                    unaliasedModuleNames.push(externalModuleName);
+                }
+            }
+            return { aliasedModuleNames: aliasedModuleNames, unaliasedModuleNames: unaliasedModuleNames, importAliasNames: importAliasNames };
         }
         function transformAsynchronousModuleBody(node) {
             startLexicalEnvironment();
             var statements = [];
-            var statementOffset = ts.addPrologueDirectives(statements, node.statements, !compilerOptions.noImplicitUseStrict, visitor);
-            ts.addRange(statements, ts.visitNodes(node.statements, visitor, ts.isStatement, statementOffset));
+            var statementOffset = ts.addPrologueDirectives(statements, node.statements, !compilerOptions.noImplicitUseStrict, sourceElementVisitor);
+            ts.addRange(statements, ts.visitNodes(node.statements, sourceElementVisitor, ts.isStatement, statementOffset));
             ts.addRange(statements, endLexicalEnvironment());
             addExportEqualsIfNeeded(statements, true);
             var body = ts.createBlock(statements, undefined, true);
-            if (hasExportStarsToExportValues) {
+            if (currentModuleInfo.hasExportStarsToExportValues) {
                 ts.setEmitFlags(body, 2);
             }
             return body;
         }
         function addExportEqualsIfNeeded(statements, emitAsReturn) {
-            if (exportEquals) {
+            if (currentModuleInfo.exportEquals) {
                 if (emitAsReturn) {
-                    var statement = ts.createReturn(exportEquals.expression, exportEquals);
+                    var statement = ts.createReturn(currentModuleInfo.exportEquals.expression, currentModuleInfo.exportEquals);
                     ts.setEmitFlags(statement, 12288 | 49152);
                     statements.push(statement);
                 }
                 else {
-                    var statement = ts.createStatement(ts.createAssignment(ts.createPropertyAccess(ts.createIdentifier("module"), "exports"), exportEquals.expression), exportEquals);
+                    var statement = ts.createStatement(ts.createAssignment(ts.createPropertyAccess(ts.createIdentifier("module"), "exports"), currentModuleInfo.exportEquals.expression), currentModuleInfo.exportEquals);
                     ts.setEmitFlags(statement, 49152);
                     statements.push(statement);
                 }
             }
         }
-        function visitor(node) {
+        function sourceElementVisitor(node) {
             switch (node.kind) {
-                case 231:
+                case 235:
                     return visitImportDeclaration(node);
-                case 230:
+                case 234:
                     return visitImportEqualsDeclaration(node);
-                case 237:
+                case 241:
                     return visitExportDeclaration(node);
-                case 236:
+                case 240:
                     return visitExportAssignment(node);
-                case 201:
+                case 205:
                     return visitVariableStatement(node);
-                case 221:
+                case 225:
                     return visitFunctionDeclaration(node);
-                case 222:
+                case 226:
                     return visitClassDeclaration(node);
-                case 203:
-                    return visitExpressionStatement(node);
+                case 294:
+                    return visitMergeDeclarationMarker(node);
+                case 295:
+                    return visitEndOfDeclarationMarker(node);
                 default:
                     return node;
             }
         }
         function visitImportDeclaration(node) {
-            if (!ts.contains(externalImports, node)) {
-                return undefined;
-            }
-            var statements = [];
+            var statements;
             var namespaceDeclaration = ts.getNamespaceDeclarationNode(node);
             if (moduleKind !== ts.ModuleKind.AMD) {
                 if (!node.importClause) {
-                    statements.push(ts.createStatement(createRequireCall(node), node));
+                    return ts.createStatement(createRequireCall(node), node);
                 }
                 else {
                     var variables = [];
@@ -42358,43 +43683,60 @@ var ts;
                             variables.push(ts.createVariableDeclaration(ts.getSynthesizedClone(namespaceDeclaration.name), undefined, ts.getGeneratedNameForNode(node)));
                         }
                     }
-                    statements.push(ts.createVariableStatement(undefined, ts.createConstDeclarationList(variables), node));
+                    statements = ts.append(statements, ts.createVariableStatement(undefined, ts.createVariableDeclarationList(variables, undefined, languageVersion >= 2 ? 2 : 0), node));
                 }
             }
             else if (namespaceDeclaration && ts.isDefaultImport(node)) {
-                statements.push(ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
+                statements = ts.append(statements, ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
                     ts.createVariableDeclaration(ts.getSynthesizedClone(namespaceDeclaration.name), undefined, ts.getGeneratedNameForNode(node), node)
-                ])));
+                ], undefined, languageVersion >= 2 ? 2 : 0)));
+            }
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfImportDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfImportDeclaration(statements, node);
             }
-            addExportImportAssignments(statements, node);
             return ts.singleOrMany(statements);
         }
-        function visitImportEqualsDeclaration(node) {
-            if (!ts.contains(externalImports, node)) {
-                return undefined;
+        function createRequireCall(importNode) {
+            var moduleName = ts.getExternalModuleNameLiteral(importNode, currentSourceFile, host, resolver, compilerOptions);
+            var args = [];
+            if (moduleName) {
+                args.push(moduleName);
             }
-            ts.setEmitFlags(node.name, 128);
-            var statements = [];
+            return ts.createCall(ts.createIdentifier("require"), undefined, args);
+        }
+        function visitImportEqualsDeclaration(node) {
+            ts.Debug.assert(ts.isExternalModuleImportEqualsDeclaration(node), "import= for internal module references should be handled in an earlier transformer.");
+            var statements;
             if (moduleKind !== ts.ModuleKind.AMD) {
                 if (ts.hasModifier(node, 1)) {
-                    statements.push(ts.createStatement(createExportAssignment(node.name, createRequireCall(node)), node));
+                    statements = ts.append(statements, ts.createStatement(createExportExpression(node.name, createRequireCall(node)), node));
                 }
                 else {
-                    statements.push(ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
+                    statements = ts.append(statements, ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
                         ts.createVariableDeclaration(ts.getSynthesizedClone(node.name), undefined, createRequireCall(node))
                     ], undefined, languageVersion >= 2 ? 2 : 0), node));
                 }
             }
             else {
                 if (ts.hasModifier(node, 1)) {
-                    statements.push(ts.createStatement(createExportAssignment(node.name, node.name), node));
+                    statements = ts.append(statements, ts.createStatement(createExportExpression(ts.getExportName(node), ts.getLocalName(node)), node));
                 }
             }
-            addExportImportAssignments(statements, node);
-            return statements;
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfImportEqualsDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfImportEqualsDeclaration(statements, node);
+            }
+            return ts.singleOrMany(statements);
         }
         function visitExportDeclaration(node) {
-            if (!ts.contains(externalImports, node)) {
+            if (!node.moduleSpecifier) {
                 return undefined;
             }
             var generatedName = ts.getGeneratedNameForNode(node);
@@ -42408,7 +43750,7 @@ var ts;
                 for (var _i = 0, _a = node.exportClause.elements; _i < _a.length; _i++) {
                     var specifier = _a[_i];
                     var exportedValue = ts.createPropertyAccess(generatedName, specifier.propertyName || specifier.name);
-                    statements.push(ts.createStatement(createExportAssignment(specifier.name, exportedValue), specifier));
+                    statements.push(ts.createStatement(createExportExpression(ts.getExportName(specifier), exportedValue), specifier));
                 }
                 return ts.singleOrMany(statements);
             }
@@ -42424,195 +43766,248 @@ var ts;
             if (node.isExportEquals) {
                 return undefined;
             }
-            var statements = [];
-            addExportDefault(statements, node.expression, node);
-            return statements;
-        }
-        function addExportDefault(statements, expression, location) {
-            tryAddExportDefaultCompat(statements);
-            statements.push(ts.createStatement(createExportAssignment(ts.createIdentifier("default"), expression), location));
-        }
-        function tryAddExportDefaultCompat(statements) {
-            var original = ts.getOriginalNode(currentSourceFile);
-            ts.Debug.assert(original.kind === 256);
-            if (!original.symbol.exports["___esModule"]) {
-                if (languageVersion === 0) {
-                    statements.push(ts.createStatement(createExportAssignment(ts.createIdentifier("__esModule"), ts.createLiteral(true))));
-                }
-                else {
-                    statements.push(ts.createStatement(ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Object"), "defineProperty"), undefined, [
-                        ts.createIdentifier("exports"),
-                        ts.createLiteral("__esModule"),
-                        ts.createObjectLiteral([
-                            ts.createPropertyAssignment("value", ts.createLiteral(true))
-                        ])
-                    ])));
-                }
-            }
-        }
-        function addExportImportAssignments(statements, node) {
-            if (ts.isImportEqualsDeclaration(node)) {
-                addExportMemberAssignments(statements, node.name);
+            var statements;
+            var original = node.original;
+            if (original && hasAssociatedEndOfDeclarationMarker(original)) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportStatement(deferredExports[id], ts.createIdentifier("default"), node.expression, node, true);
             }
             else {
-                var names = ts.reduceEachChild(node, collectExportMembers, []);
-                for (var _i = 0, names_1 = names; _i < names_1.length; _i++) {
-                    var name_35 = names_1[_i];
-                    addExportMemberAssignments(statements, name_35);
-                }
-            }
-        }
-        function collectExportMembers(names, node) {
-            if (ts.isAliasSymbolDeclaration(node) && ts.isDeclaration(node)) {
-                var name_36 = node.name;
-                if (ts.isIdentifier(name_36)) {
-                    names.push(name_36);
-                }
-            }
-            return ts.reduceEachChild(node, collectExportMembers, names);
-        }
-        function addExportMemberAssignments(statements, name) {
-            if (!exportEquals && exportSpecifiers && ts.hasProperty(exportSpecifiers, name.text)) {
-                for (var _i = 0, _a = exportSpecifiers[name.text]; _i < _a.length; _i++) {
-                    var specifier = _a[_i];
-                    statements.push(ts.startOnNewLine(ts.createStatement(createExportAssignment(specifier.name, name), specifier.name)));
-                }
-            }
-        }
-        function addExportMemberAssignment(statements, node) {
-            if (ts.hasModifier(node, 512)) {
-                addExportDefault(statements, getDeclarationName(node), node);
-            }
-            else {
-                statements.push(createExportStatement(node.name, ts.setEmitFlags(ts.getSynthesizedClone(node.name), 262144), node));
-            }
-        }
-        function visitVariableStatement(node) {
-            var originalKind = ts.getOriginalNode(node).kind;
-            if (originalKind === 226 ||
-                originalKind === 225 ||
-                originalKind === 222) {
-                if (!ts.hasModifier(node, 1)) {
-                    return node;
-                }
-                return ts.setOriginalNode(ts.createVariableStatement(undefined, node.declarationList), node);
-            }
-            var resultStatements = [];
-            if (ts.hasModifier(node, 1)) {
-                var variables = ts.getInitializedVariables(node.declarationList);
-                if (variables.length > 0) {
-                    var inlineAssignments = ts.createStatement(ts.inlineExpressions(ts.map(variables, transformInitializedVariable)), node);
-                    resultStatements.push(inlineAssignments);
-                }
-            }
-            else {
-                resultStatements.push(node);
-            }
-            for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
-                var decl = _a[_i];
-                addExportMemberAssignmentsForBindingName(resultStatements, decl.name);
-            }
-            return resultStatements;
-        }
-        function addExportMemberAssignmentsForBindingName(resultStatements, name) {
-            if (ts.isBindingPattern(name)) {
-                for (var _i = 0, _a = name.elements; _i < _a.length; _i++) {
-                    var element = _a[_i];
-                    if (!ts.isOmittedExpression(element)) {
-                        addExportMemberAssignmentsForBindingName(resultStatements, element.name);
-                    }
-                }
-            }
-            else {
-                if (!exportEquals && exportSpecifiers && ts.hasProperty(exportSpecifiers, name.text)) {
-                    var sourceFileId = ts.getOriginalNodeId(currentSourceFile);
-                    if (!bindingNameExportSpecifiersForFileMap[sourceFileId]) {
-                        bindingNameExportSpecifiersForFileMap[sourceFileId] = ts.createMap();
-                    }
-                    bindingNameExportSpecifiersForFileMap[sourceFileId][name.text] = exportSpecifiers[name.text];
-                    addExportMemberAssignments(resultStatements, name);
-                }
-            }
-        }
-        function transformInitializedVariable(node) {
-            var name = node.name;
-            if (ts.isBindingPattern(name)) {
-                return ts.flattenVariableDestructuringToExpression(node, hoistVariableDeclaration, getModuleMemberName, visitor);
-            }
-            else {
-                return ts.createAssignment(getModuleMemberName(name), ts.visitNode(node.initializer, visitor, ts.isExpression));
+                statements = appendExportStatement(statements, ts.createIdentifier("default"), node.expression, node, true);
             }
+            return ts.singleOrMany(statements);
         }
         function visitFunctionDeclaration(node) {
-            var statements = [];
-            var name = node.name || ts.getGeneratedNameForNode(node);
+            var statements;
             if (ts.hasModifier(node, 1)) {
-                var isAsync = ts.hasModifier(node, 256);
-                statements.push(ts.setOriginalNode(ts.createFunctionDeclaration(undefined, isAsync ? [ts.createNode(119)] : undefined, node.asteriskToken, name, undefined, node.parameters, undefined, node.body, node), node));
-                addExportMemberAssignment(statements, node);
+                statements = ts.append(statements, ts.setOriginalNode(ts.createFunctionDeclaration(undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, ts.getDeclarationName(node, true, true), undefined, node.parameters, undefined, node.body, node), node));
             }
             else {
-                statements.push(node);
+                statements = ts.append(statements, node);
             }
-            if (node.name) {
-                addExportMemberAssignments(statements, node.name);
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfHoistedDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfHoistedDeclaration(statements, node);
             }
             return ts.singleOrMany(statements);
         }
         function visitClassDeclaration(node) {
-            var statements = [];
-            var name = node.name || ts.getGeneratedNameForNode(node);
+            var statements;
             if (ts.hasModifier(node, 1)) {
-                statements.push(ts.setOriginalNode(ts.createClassDeclaration(undefined, undefined, name, undefined, node.heritageClauses, node.members, node), node));
-                addExportMemberAssignment(statements, node);
+                statements = ts.append(statements, ts.setOriginalNode(ts.createClassDeclaration(undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), ts.getDeclarationName(node, true, true), undefined, node.heritageClauses, node.members, node), node));
             }
             else {
-                statements.push(node);
+                statements = ts.append(statements, node);
             }
-            if (node.name && !(node.decorators && node.decorators.length)) {
-                addExportMemberAssignments(statements, node.name);
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfHoistedDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfHoistedDeclaration(statements, node);
             }
             return ts.singleOrMany(statements);
         }
-        function visitExpressionStatement(node) {
-            var original = ts.getOriginalNode(node);
-            var origKind = original.kind;
-            if (origKind === 225 || origKind === 226) {
-                return visitExpressionStatementForEnumOrNamespaceDeclaration(node, original);
-            }
-            else if (origKind === 222) {
-                var classDecl = original;
-                if (classDecl.name) {
-                    var statements = [node];
-                    addExportMemberAssignments(statements, classDecl.name);
-                    return statements;
+        function visitVariableStatement(node) {
+            var statements;
+            var variables;
+            var expressions;
+            if (ts.hasModifier(node, 1)) {
+                var modifiers = void 0;
+                for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
+                    var variable = _a[_i];
+                    if (ts.isIdentifier(variable.name) && ts.isLocalName(variable.name)) {
+                        if (!modifiers) {
+                            modifiers = ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier);
+                        }
+                        variables = ts.append(variables, variable);
+                    }
+                    else if (variable.initializer) {
+                        expressions = ts.append(expressions, transformInitializedVariable(variable));
+                    }
                 }
+                if (variables) {
+                    statements = ts.append(statements, ts.updateVariableStatement(node, modifiers, ts.updateVariableDeclarationList(node.declarationList, variables)));
+                }
+                if (expressions) {
+                    statements = ts.append(statements, ts.createStatement(ts.inlineExpressions(expressions), node));
+                }
+            }
+            else {
+                statements = ts.append(statements, node);
+            }
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfVariableStatement(statements, node);
+            }
+            return ts.singleOrMany(statements);
+        }
+        function transformInitializedVariable(node) {
+            if (ts.isBindingPattern(node.name)) {
+                return ts.flattenVariableDestructuringToExpression(node, hoistVariableDeclaration, createExportExpression);
+            }
+            else {
+                return ts.createAssignment(ts.createPropertyAccess(ts.createIdentifier("exports"), node.name, node.name), node.initializer);
+            }
+        }
+        function visitMergeDeclarationMarker(node) {
+            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 205) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node.original);
             }
             return node;
         }
-        function visitExpressionStatementForEnumOrNamespaceDeclaration(node, original) {
-            var statements = [node];
-            if (ts.hasModifier(original, 1) &&
-                original.kind === 225 &&
-                ts.isFirstDeclarationOfKind(original, 225)) {
-                addVarForExportedEnumOrNamespaceDeclaration(statements, original);
+        function hasAssociatedEndOfDeclarationMarker(node) {
+            return (ts.getEmitFlags(node) & 33554432) !== 0;
+        }
+        function visitEndOfDeclarationMarker(node) {
+            var id = ts.getOriginalNodeId(node);
+            var statements = deferredExports[id];
+            if (statements) {
+                delete deferredExports[id];
+                return ts.append(statements, node);
+            }
+            return node;
+        }
+        function appendExportsOfImportDeclaration(statements, decl) {
+            if (currentModuleInfo.exportEquals) {
+                return statements;
+            }
+            var importClause = decl.importClause;
+            if (!importClause) {
+                return statements;
+            }
+            if (importClause.name) {
+                statements = appendExportsOfDeclaration(statements, importClause);
+            }
+            var namedBindings = importClause.namedBindings;
+            if (namedBindings) {
+                switch (namedBindings.kind) {
+                    case 237:
+                        statements = appendExportsOfDeclaration(statements, namedBindings);
+                        break;
+                    case 238:
+                        for (var _i = 0, _a = namedBindings.elements; _i < _a.length; _i++) {
+                            var importBinding = _a[_i];
+                            statements = appendExportsOfDeclaration(statements, importBinding);
+                        }
+                        break;
+                }
             }
-            addExportMemberAssignments(statements, original.name);
             return statements;
         }
-        function addVarForExportedEnumOrNamespaceDeclaration(statements, node) {
-            var transformedStatement = ts.createVariableStatement(undefined, [ts.createVariableDeclaration(getDeclarationName(node), undefined, ts.createPropertyAccess(ts.createIdentifier("exports"), getDeclarationName(node)))], node);
-            ts.setEmitFlags(transformedStatement, 49152);
-            statements.push(transformedStatement);
+        function appendExportsOfImportEqualsDeclaration(statements, decl) {
+            if (currentModuleInfo.exportEquals) {
+                return statements;
+            }
+            return appendExportsOfDeclaration(statements, decl);
         }
-        function getDeclarationName(node) {
-            return node.name ? ts.getSynthesizedClone(node.name) : ts.getGeneratedNameForNode(node);
+        function appendExportsOfVariableStatement(statements, node) {
+            if (currentModuleInfo.exportEquals) {
+                return statements;
+            }
+            for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
+                var decl = _a[_i];
+                statements = appendExportsOfBindingElement(statements, decl);
+            }
+            return statements;
+        }
+        function appendExportsOfBindingElement(statements, decl) {
+            if (currentModuleInfo.exportEquals) {
+                return statements;
+            }
+            if (ts.isBindingPattern(decl.name)) {
+                for (var _i = 0, _a = decl.name.elements; _i < _a.length; _i++) {
+                    var element = _a[_i];
+                    if (!ts.isOmittedExpression(element)) {
+                        statements = appendExportsOfBindingElement(statements, element);
+                    }
+                }
+            }
+            else if (!ts.isGeneratedIdentifier(decl.name)) {
+                statements = appendExportsOfDeclaration(statements, decl);
+            }
+            return statements;
+        }
+        function appendExportsOfHoistedDeclaration(statements, decl) {
+            if (currentModuleInfo.exportEquals) {
+                return statements;
+            }
+            if (ts.hasModifier(decl, 1)) {
+                var exportName = ts.hasModifier(decl, 512) ? ts.createIdentifier("default") : decl.name;
+                statements = appendExportStatement(statements, exportName, ts.getLocalName(decl), decl);
+            }
+            if (decl.name) {
+                statements = appendExportsOfDeclaration(statements, decl);
+            }
+            return statements;
+        }
+        function appendExportsOfDeclaration(statements, decl) {
+            var name = ts.getDeclarationName(decl);
+            var exportSpecifiers = currentModuleInfo.exportSpecifiers[name.text];
+            if (exportSpecifiers) {
+                for (var _i = 0, exportSpecifiers_2 = exportSpecifiers; _i < exportSpecifiers_2.length; _i++) {
+                    var exportSpecifier = exportSpecifiers_2[_i];
+                    statements = appendExportStatement(statements, exportSpecifier.name, name, exportSpecifier.name);
+                }
+            }
+            return statements;
+        }
+        function appendExportStatement(statements, exportName, expression, location, allowComments) {
+            if (exportName.text === "default") {
+                var sourceFile = ts.getOriginalNode(currentSourceFile, ts.isSourceFile);
+                if (sourceFile && !sourceFile.symbol.exports["___esModule"]) {
+                    if (languageVersion === 0) {
+                        statements = ts.append(statements, ts.createStatement(createExportExpression(ts.createIdentifier("__esModule"), ts.createLiteral(true))));
+                    }
+                    else {
+                        statements = ts.append(statements, ts.createStatement(ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Object"), "defineProperty"), undefined, [
+                            ts.createIdentifier("exports"),
+                            ts.createLiteral("__esModule"),
+                            ts.createObjectLiteral([
+                                ts.createPropertyAssignment("value", ts.createLiteral(true))
+                            ])
+                        ])));
+                    }
+                }
+            }
+            statements = ts.append(statements, createExportStatement(exportName, expression, location, allowComments));
+            return statements;
+        }
+        function createExportStatement(name, value, location, allowComments) {
+            var statement = ts.createStatement(createExportExpression(name, value), location);
+            ts.startOnNewLine(statement);
+            if (!allowComments) {
+                ts.setEmitFlags(statement, 49152);
+            }
+            return statement;
+        }
+        function createExportExpression(name, value, location) {
+            return ts.createAssignment(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.getSynthesizedClone(name)), value, location);
+        }
+        function modifierVisitor(node) {
+            switch (node.kind) {
+                case 83:
+                case 78:
+                    return undefined;
+            }
+            return node;
         }
         function onEmitNode(emitContext, node, emitCallback) {
-            if (node.kind === 256) {
-                bindingNameExportSpecifiersMap = bindingNameExportSpecifiersForFileMap[ts.getOriginalNodeId(node)];
+            if (node.kind === 261) {
+                currentSourceFile = node;
+                currentModuleInfo = moduleInfoMap[ts.getOriginalNodeId(currentSourceFile)];
+                noSubstitution = ts.createMap();
                 previousOnEmitNode(emitContext, node, emitCallback);
-                bindingNameExportSpecifiersMap = undefined;
+                currentSourceFile = undefined;
+                currentModuleInfo = undefined;
+                noSubstitution = undefined;
             }
             else {
                 previousOnEmitNode(emitContext, node, emitCallback);
@@ -42620,6 +44015,9 @@ var ts;
         }
         function onSubstituteNode(emitContext, node) {
             node = previousOnSubstituteNode(emitContext, node);
+            if (node.id && noSubstitution[node.id]) {
+                return node;
+            }
             if (emitContext === 1) {
                 return substituteExpression(node);
             }
@@ -42644,946 +44042,88 @@ var ts;
             switch (node.kind) {
                 case 70:
                     return substituteExpressionIdentifier(node);
-                case 188:
+                case 192:
                     return substituteBinaryExpression(node);
-                case 187:
-                case 186:
+                case 191:
+                case 190:
                     return substituteUnaryExpression(node);
             }
             return node;
         }
         function substituteExpressionIdentifier(node) {
-            return trySubstituteExportedName(node)
-                || trySubstituteImportedName(node)
-                || node;
+            if (!ts.isGeneratedIdentifier(node) && !ts.isLocalName(node)) {
+                var exportContainer = resolver.getReferencedExportContainer(node, ts.isExportName(node));
+                if (exportContainer && exportContainer.kind === 261) {
+                    return ts.createPropertyAccess(ts.createIdentifier("exports"), ts.getSynthesizedClone(node), node);
+                }
+                var importDeclaration = resolver.getReferencedImportDeclaration(node);
+                if (importDeclaration) {
+                    if (ts.isImportClause(importDeclaration)) {
+                        return ts.createPropertyAccess(ts.getGeneratedNameForNode(importDeclaration.parent), ts.createIdentifier("default"), node);
+                    }
+                    else if (ts.isImportSpecifier(importDeclaration)) {
+                        var name_36 = importDeclaration.propertyName || importDeclaration.name;
+                        return ts.createPropertyAccess(ts.getGeneratedNameForNode(importDeclaration.parent.parent.parent), ts.getSynthesizedClone(name_36), node);
+                    }
+                }
+            }
+            return node;
         }
         function substituteBinaryExpression(node) {
-            var left = node.left;
-            if (ts.isIdentifier(left) && ts.isAssignmentOperator(node.operatorToken.kind)) {
-                if (bindingNameExportSpecifiersMap && ts.hasProperty(bindingNameExportSpecifiersMap, left.text)) {
-                    ts.setEmitFlags(node, 128);
-                    var nestedExportAssignment = void 0;
-                    for (var _i = 0, _a = bindingNameExportSpecifiersMap[left.text]; _i < _a.length; _i++) {
-                        var specifier = _a[_i];
-                        nestedExportAssignment = nestedExportAssignment ?
-                            createExportAssignment(specifier.name, nestedExportAssignment) :
-                            createExportAssignment(specifier.name, node);
+            if (ts.isAssignmentOperator(node.operatorToken.kind)
+                && ts.isIdentifier(node.left)
+                && !ts.isGeneratedIdentifier(node.left)
+                && !ts.isLocalName(node.left)
+                && !ts.isDeclarationNameOfEnumOrNamespace(node.left)) {
+                var exportedNames = getExports(node.left);
+                if (exportedNames) {
+                    var expression = node;
+                    for (var _i = 0, exportedNames_3 = exportedNames; _i < exportedNames_3.length; _i++) {
+                        var exportName = exportedNames_3[_i];
+                        noSubstitution[ts.getNodeId(expression)] = true;
+                        expression = createExportExpression(exportName, expression, node);
                     }
-                    return nestedExportAssignment;
+                    return expression;
                 }
             }
             return node;
         }
         function substituteUnaryExpression(node) {
-            var operator = node.operator;
-            var operand = node.operand;
-            if (ts.isIdentifier(operand) && bindingNameExportSpecifiersForFileMap) {
-                if (bindingNameExportSpecifiersMap && ts.hasProperty(bindingNameExportSpecifiersMap, operand.text)) {
-                    ts.setEmitFlags(node, 128);
-                    var transformedUnaryExpression = void 0;
-                    if (node.kind === 187) {
-                        transformedUnaryExpression = ts.createBinary(operand, ts.createToken(operator === 42 ? 58 : 59), ts.createLiteral(1), node);
-                        ts.setEmitFlags(transformedUnaryExpression, 128);
+            if ((node.operator === 42 || node.operator === 43)
+                && ts.isIdentifier(node.operand)
+                && !ts.isGeneratedIdentifier(node.operand)
+                && !ts.isLocalName(node.operand)
+                && !ts.isDeclarationNameOfEnumOrNamespace(node.operand)) {
+                var exportedNames = getExports(node.operand);
+                if (exportedNames) {
+                    var expression = node.kind === 191
+                        ? ts.createBinary(node.operand, ts.createToken(node.operator === 42 ? 58 : 59), ts.createLiteral(1), node)
+                        : node;
+                    for (var _i = 0, exportedNames_4 = exportedNames; _i < exportedNames_4.length; _i++) {
+                        var exportName = exportedNames_4[_i];
+                        noSubstitution[ts.getNodeId(expression)] = true;
+                        expression = createExportExpression(exportName, expression);
                     }
-                    var nestedExportAssignment = void 0;
-                    for (var _i = 0, _a = bindingNameExportSpecifiersMap[operand.text]; _i < _a.length; _i++) {
-                        var specifier = _a[_i];
-                        nestedExportAssignment = nestedExportAssignment ?
-                            createExportAssignment(specifier.name, nestedExportAssignment) :
-                            createExportAssignment(specifier.name, transformedUnaryExpression || node);
-                    }
-                    return nestedExportAssignment;
+                    return expression;
                 }
             }
             return node;
         }
-        function trySubstituteExportedName(node) {
-            var emitFlags = ts.getEmitFlags(node);
-            if ((emitFlags & 262144) === 0) {
-                var container = resolver.getReferencedExportContainer(node, (emitFlags & 131072) !== 0);
-                if (container) {
-                    if (container.kind === 256) {
-                        return ts.createPropertyAccess(ts.createIdentifier("exports"), ts.getSynthesizedClone(node), node);
-                    }
+        function getExports(name) {
+            if (!ts.isGeneratedIdentifier(name)) {
+                var valueDeclaration = resolver.getReferencedImportDeclaration(name)
+                    || resolver.getReferencedValueDeclaration(name);
+                if (valueDeclaration) {
+                    return currentModuleInfo
+                        && currentModuleInfo.exportedBindings[ts.getOriginalNodeId(valueDeclaration)];
                 }
             }
-            return undefined;
-        }
-        function trySubstituteImportedName(node) {
-            if ((ts.getEmitFlags(node) & 262144) === 0) {
-                var declaration = resolver.getReferencedImportDeclaration(node);
-                if (declaration) {
-                    if (ts.isImportClause(declaration)) {
-                        return ts.createPropertyAccess(ts.getGeneratedNameForNode(declaration.parent), ts.createIdentifier("default"), node);
-                    }
-                    else if (ts.isImportSpecifier(declaration)) {
-                        var name_37 = declaration.propertyName || declaration.name;
-                        return ts.createPropertyAccess(ts.getGeneratedNameForNode(declaration.parent.parent.parent), ts.getSynthesizedClone(name_37), node);
-                    }
-                }
-            }
-            return undefined;
-        }
-        function getModuleMemberName(name) {
-            return ts.createPropertyAccess(ts.createIdentifier("exports"), name, name);
-        }
-        function createRequireCall(importNode) {
-            var moduleName = ts.getExternalModuleNameLiteral(importNode, currentSourceFile, host, resolver, compilerOptions);
-            var args = [];
-            if (ts.isDefined(moduleName)) {
-                args.push(moduleName);
-            }
-            return ts.createCall(ts.createIdentifier("require"), undefined, args);
-        }
-        function createExportStatement(name, value, location) {
-            var statement = ts.createStatement(createExportAssignment(name, value));
-            statement.startsOnNewLine = true;
-            if (location) {
-                ts.setSourceMapRange(statement, location);
-            }
-            return statement;
-        }
-        function createExportAssignment(name, value) {
-            return ts.createAssignment(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.getSynthesizedClone(name)), value);
-        }
-        function collectAsynchronousDependencies(node, includeNonAmdDependencies) {
-            var aliasedModuleNames = [];
-            var unaliasedModuleNames = [];
-            var importAliasNames = [];
-            for (var _i = 0, _a = node.amdDependencies; _i < _a.length; _i++) {
-                var amdDependency = _a[_i];
-                if (amdDependency.name) {
-                    aliasedModuleNames.push(ts.createLiteral(amdDependency.path));
-                    importAliasNames.push(ts.createParameter(amdDependency.name));
-                }
-                else {
-                    unaliasedModuleNames.push(ts.createLiteral(amdDependency.path));
-                }
-            }
-            for (var _b = 0, externalImports_1 = externalImports; _b < externalImports_1.length; _b++) {
-                var importNode = externalImports_1[_b];
-                var externalModuleName = ts.getExternalModuleNameLiteral(importNode, currentSourceFile, host, resolver, compilerOptions);
-                var importAliasName = ts.getLocalNameForExternalImport(importNode, currentSourceFile);
-                if (includeNonAmdDependencies && importAliasName) {
-                    ts.setEmitFlags(importAliasName, 128);
-                    aliasedModuleNames.push(externalModuleName);
-                    importAliasNames.push(ts.createParameter(importAliasName));
-                }
-                else {
-                    unaliasedModuleNames.push(externalModuleName);
-                }
-            }
-            return { aliasedModuleNames: aliasedModuleNames, unaliasedModuleNames: unaliasedModuleNames, importAliasNames: importAliasNames };
-        }
-        function updateSourceFile(node, statements) {
-            var updated = ts.getMutableClone(node);
-            updated.statements = ts.createNodeArray(statements, node.statements);
-            return updated;
         }
         var _a;
     }
     ts.transformModule = transformModule;
 })(ts || (ts = {}));
 var ts;
-(function (ts) {
-    function transformSystemModule(context) {
-        var startLexicalEnvironment = context.startLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration, hoistFunctionDeclaration = context.hoistFunctionDeclaration;
-        var compilerOptions = context.getCompilerOptions();
-        var resolver = context.getEmitResolver();
-        var host = context.getEmitHost();
-        var previousOnSubstituteNode = context.onSubstituteNode;
-        var previousOnEmitNode = context.onEmitNode;
-        context.onSubstituteNode = onSubstituteNode;
-        context.onEmitNode = onEmitNode;
-        context.enableSubstitution(70);
-        context.enableSubstitution(188);
-        context.enableSubstitution(186);
-        context.enableSubstitution(187);
-        context.enableEmitNotification(256);
-        var exportFunctionForFileMap = [];
-        var currentSourceFile;
-        var externalImports;
-        var exportSpecifiers;
-        var exportEquals;
-        var hasExportStarsToExportValues;
-        var exportFunctionForFile;
-        var contextObjectForFile;
-        var exportedLocalNames;
-        var exportedFunctionDeclarations;
-        var enclosingBlockScopedContainer;
-        var currentParent;
-        var currentNode;
-        return transformSourceFile;
-        function transformSourceFile(node) {
-            if (ts.isDeclarationFile(node)) {
-                return node;
-            }
-            if (ts.isExternalModule(node) || compilerOptions.isolatedModules) {
-                currentSourceFile = node;
-                currentNode = node;
-                var updated = transformSystemModuleWorker(node);
-                ts.aggregateTransformFlags(updated);
-                currentSourceFile = undefined;
-                externalImports = undefined;
-                exportSpecifiers = undefined;
-                exportEquals = undefined;
-                hasExportStarsToExportValues = false;
-                exportFunctionForFile = undefined;
-                contextObjectForFile = undefined;
-                exportedLocalNames = undefined;
-                exportedFunctionDeclarations = undefined;
-                return updated;
-            }
-            return node;
-        }
-        function transformSystemModuleWorker(node) {
-            ts.Debug.assert(!exportFunctionForFile);
-            (_a = ts.collectExternalModuleInfo(node), externalImports = _a.externalImports, exportSpecifiers = _a.exportSpecifiers, exportEquals = _a.exportEquals, hasExportStarsToExportValues = _a.hasExportStarsToExportValues, _a);
-            exportFunctionForFile = ts.createUniqueName("exports");
-            contextObjectForFile = ts.createUniqueName("context");
-            exportFunctionForFileMap[ts.getOriginalNodeId(node)] = exportFunctionForFile;
-            var dependencyGroups = collectDependencyGroups(externalImports);
-            var statements = [];
-            addSystemModuleBody(statements, node, dependencyGroups);
-            var moduleName = ts.tryGetModuleNameFromFile(node, host, compilerOptions);
-            var dependencies = ts.createArrayLiteral(ts.map(dependencyGroups, getNameOfDependencyGroup));
-            var body = ts.createFunctionExpression(undefined, undefined, undefined, undefined, [
-                ts.createParameter(exportFunctionForFile),
-                ts.createParameter(contextObjectForFile)
-            ], undefined, ts.setEmitFlags(ts.createBlock(statements, undefined, true), 1));
-            return updateSourceFile(node, [
-                ts.createStatement(ts.createCall(ts.createPropertyAccess(ts.createIdentifier("System"), "register"), undefined, moduleName
-                    ? [moduleName, dependencies, body]
-                    : [dependencies, body]))
-            ], ~1 & ts.getEmitFlags(node));
-            var _a;
-        }
-        function addSystemModuleBody(statements, node, dependencyGroups) {
-            startLexicalEnvironment();
-            var statementOffset = ts.addPrologueDirectives(statements, node.statements, !compilerOptions.noImplicitUseStrict, visitSourceElement);
-            statements.push(ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
-                ts.createVariableDeclaration("__moduleName", undefined, ts.createLogicalAnd(contextObjectForFile, ts.createPropertyAccess(contextObjectForFile, "id")))
-            ])));
-            var executeStatements = ts.visitNodes(node.statements, visitSourceElement, ts.isStatement, statementOffset);
-            ts.addRange(statements, endLexicalEnvironment());
-            ts.addRange(statements, exportedFunctionDeclarations);
-            var exportStarFunction = addExportStarIfNeeded(statements);
-            statements.push(ts.createReturn(ts.setMultiLine(ts.createObjectLiteral([
-                ts.createPropertyAssignment("setters", generateSetters(exportStarFunction, dependencyGroups)),
-                ts.createPropertyAssignment("execute", ts.createFunctionExpression(undefined, undefined, undefined, undefined, [], undefined, ts.createBlock(executeStatements, undefined, true)))
-            ]), true)));
-        }
-        function addExportStarIfNeeded(statements) {
-            if (!hasExportStarsToExportValues) {
-                return;
-            }
-            if (!exportedLocalNames && ts.isEmpty(exportSpecifiers)) {
-                var hasExportDeclarationWithExportClause = false;
-                for (var _i = 0, externalImports_2 = externalImports; _i < externalImports_2.length; _i++) {
-                    var externalImport = externalImports_2[_i];
-                    if (externalImport.kind === 237 && externalImport.exportClause) {
-                        hasExportDeclarationWithExportClause = true;
-                        break;
-                    }
-                }
-                if (!hasExportDeclarationWithExportClause) {
-                    return addExportStarFunction(statements, undefined);
-                }
-            }
-            var exportedNames = [];
-            if (exportedLocalNames) {
-                for (var _a = 0, exportedLocalNames_1 = exportedLocalNames; _a < exportedLocalNames_1.length; _a++) {
-                    var exportedLocalName = exportedLocalNames_1[_a];
-                    exportedNames.push(ts.createPropertyAssignment(ts.createLiteral(exportedLocalName.text), ts.createLiteral(true)));
-                }
-            }
-            for (var _b = 0, externalImports_3 = externalImports; _b < externalImports_3.length; _b++) {
-                var externalImport = externalImports_3[_b];
-                if (externalImport.kind !== 237) {
-                    continue;
-                }
-                var exportDecl = externalImport;
-                if (!exportDecl.exportClause) {
-                    continue;
-                }
-                for (var _c = 0, _d = exportDecl.exportClause.elements; _c < _d.length; _c++) {
-                    var element = _d[_c];
-                    exportedNames.push(ts.createPropertyAssignment(ts.createLiteral((element.name || element.propertyName).text), ts.createLiteral(true)));
-                }
-            }
-            var exportedNamesStorageRef = ts.createUniqueName("exportedNames");
-            statements.push(ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
-                ts.createVariableDeclaration(exportedNamesStorageRef, undefined, ts.createObjectLiteral(exportedNames, undefined, true))
-            ])));
-            return addExportStarFunction(statements, exportedNamesStorageRef);
-        }
-        function generateSetters(exportStarFunction, dependencyGroups) {
-            var setters = [];
-            for (var _i = 0, dependencyGroups_1 = dependencyGroups; _i < dependencyGroups_1.length; _i++) {
-                var group = dependencyGroups_1[_i];
-                var localName = ts.forEach(group.externalImports, function (i) { return ts.getLocalNameForExternalImport(i, currentSourceFile); });
-                var parameterName = localName ? ts.getGeneratedNameForNode(localName) : ts.createUniqueName("");
-                var statements = [];
-                for (var _a = 0, _b = group.externalImports; _a < _b.length; _a++) {
-                    var entry = _b[_a];
-                    var importVariableName = ts.getLocalNameForExternalImport(entry, currentSourceFile);
-                    switch (entry.kind) {
-                        case 231:
-                            if (!entry.importClause) {
-                                break;
-                            }
-                        case 230:
-                            ts.Debug.assert(importVariableName !== undefined);
-                            statements.push(ts.createStatement(ts.createAssignment(importVariableName, parameterName)));
-                            break;
-                        case 237:
-                            ts.Debug.assert(importVariableName !== undefined);
-                            if (entry.exportClause) {
-                                var properties = [];
-                                for (var _c = 0, _d = entry.exportClause.elements; _c < _d.length; _c++) {
-                                    var e = _d[_c];
-                                    properties.push(ts.createPropertyAssignment(ts.createLiteral(e.name.text), ts.createElementAccess(parameterName, ts.createLiteral((e.propertyName || e.name).text))));
-                                }
-                                statements.push(ts.createStatement(ts.createCall(exportFunctionForFile, undefined, [ts.createObjectLiteral(properties, undefined, true)])));
-                            }
-                            else {
-                                statements.push(ts.createStatement(ts.createCall(exportStarFunction, undefined, [parameterName])));
-                            }
-                            break;
-                    }
-                }
-                setters.push(ts.createFunctionExpression(undefined, undefined, undefined, undefined, [ts.createParameter(parameterName)], undefined, ts.createBlock(statements, undefined, true)));
-            }
-            return ts.createArrayLiteral(setters, undefined, true);
-        }
-        function visitSourceElement(node) {
-            switch (node.kind) {
-                case 231:
-                    return visitImportDeclaration(node);
-                case 230:
-                    return visitImportEqualsDeclaration(node);
-                case 237:
-                    return visitExportDeclaration(node);
-                case 236:
-                    return visitExportAssignment(node);
-                default:
-                    return visitNestedNode(node);
-            }
-        }
-        function visitNestedNode(node) {
-            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
-            var savedCurrentParent = currentParent;
-            var savedCurrentNode = currentNode;
-            var currentGrandparent = currentParent;
-            currentParent = currentNode;
-            currentNode = node;
-            if (currentParent && ts.isBlockScope(currentParent, currentGrandparent)) {
-                enclosingBlockScopedContainer = currentParent;
-            }
-            var result = visitNestedNodeWorker(node);
-            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
-            currentParent = savedCurrentParent;
-            currentNode = savedCurrentNode;
-            return result;
-        }
-        function visitNestedNodeWorker(node) {
-            switch (node.kind) {
-                case 201:
-                    return visitVariableStatement(node);
-                case 221:
-                    return visitFunctionDeclaration(node);
-                case 222:
-                    return visitClassDeclaration(node);
-                case 207:
-                    return visitForStatement(node);
-                case 208:
-                    return visitForInStatement(node);
-                case 209:
-                    return visitForOfStatement(node);
-                case 205:
-                    return visitDoStatement(node);
-                case 206:
-                    return visitWhileStatement(node);
-                case 215:
-                    return visitLabeledStatement(node);
-                case 213:
-                    return visitWithStatement(node);
-                case 214:
-                    return visitSwitchStatement(node);
-                case 228:
-                    return visitCaseBlock(node);
-                case 249:
-                    return visitCaseClause(node);
-                case 250:
-                    return visitDefaultClause(node);
-                case 217:
-                    return visitTryStatement(node);
-                case 252:
-                    return visitCatchClause(node);
-                case 200:
-                    return visitBlock(node);
-                case 203:
-                    return visitExpressionStatement(node);
-                default:
-                    return node;
-            }
-        }
-        function visitImportDeclaration(node) {
-            if (node.importClause && ts.contains(externalImports, node)) {
-                hoistVariableDeclaration(ts.getLocalNameForExternalImport(node, currentSourceFile));
-            }
-            return undefined;
-        }
-        function visitImportEqualsDeclaration(node) {
-            if (ts.contains(externalImports, node)) {
-                hoistVariableDeclaration(ts.getLocalNameForExternalImport(node, currentSourceFile));
-            }
-            return undefined;
-        }
-        function visitExportDeclaration(node) {
-            if (!node.moduleSpecifier) {
-                var statements = [];
-                ts.addRange(statements, ts.map(node.exportClause.elements, visitExportSpecifier));
-                return statements;
-            }
-            return undefined;
-        }
-        function visitExportSpecifier(specifier) {
-            recordExportName(specifier.name);
-            return createExportStatement(specifier.name, specifier.propertyName || specifier.name);
-        }
-        function visitExportAssignment(node) {
-            if (node.isExportEquals) {
-                return undefined;
-            }
-            return createExportStatement(ts.createLiteral("default"), node.expression);
-        }
-        function visitVariableStatement(node) {
-            var shouldHoist = ((ts.getCombinedNodeFlags(ts.getOriginalNode(node.declarationList)) & 3) == 0) ||
-                enclosingBlockScopedContainer.kind === 256;
-            if (!shouldHoist) {
-                return node;
-            }
-            var isExported = ts.hasModifier(node, 1);
-            var expressions = [];
-            for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
-                var variable = _a[_i];
-                var visited = transformVariable(variable, isExported);
-                if (visited) {
-                    expressions.push(visited);
-                }
-            }
-            if (expressions.length) {
-                return ts.createStatement(ts.inlineExpressions(expressions), node);
-            }
-            return undefined;
-        }
-        function transformVariable(node, isExported) {
-            hoistBindingElement(node, isExported);
-            if (!node.initializer) {
-                return;
-            }
-            var name = node.name;
-            if (ts.isIdentifier(name)) {
-                return ts.createAssignment(name, node.initializer);
-            }
-            else {
-                return ts.flattenVariableDestructuringToExpression(node, hoistVariableDeclaration);
-            }
-        }
-        function visitFunctionDeclaration(node) {
-            if (ts.hasModifier(node, 1)) {
-                var name_38 = node.name || ts.getGeneratedNameForNode(node);
-                var isAsync = ts.hasModifier(node, 256);
-                var newNode = ts.createFunctionDeclaration(undefined, isAsync ? [ts.createNode(119)] : undefined, node.asteriskToken, name_38, undefined, node.parameters, undefined, node.body, node);
-                recordExportedFunctionDeclaration(node);
-                if (!ts.hasModifier(node, 512)) {
-                    recordExportName(name_38);
-                }
-                ts.setOriginalNode(newNode, node);
-                node = newNode;
-            }
-            hoistFunctionDeclaration(node);
-            return undefined;
-        }
-        function visitExpressionStatement(node) {
-            var originalNode = ts.getOriginalNode(node);
-            if ((originalNode.kind === 226 || originalNode.kind === 225) && ts.hasModifier(originalNode, 1)) {
-                var name_39 = getDeclarationName(originalNode);
-                if (originalNode.kind === 225) {
-                    hoistVariableDeclaration(name_39);
-                }
-                return [
-                    node,
-                    createExportStatement(name_39, name_39)
-                ];
-            }
-            return node;
-        }
-        function visitClassDeclaration(node) {
-            var name = getDeclarationName(node);
-            hoistVariableDeclaration(name);
-            var statements = [];
-            statements.push(ts.createStatement(ts.createAssignment(name, ts.createClassExpression(undefined, node.name, undefined, node.heritageClauses, node.members, node)), node));
-            if (ts.hasModifier(node, 1)) {
-                if (!ts.hasModifier(node, 512)) {
-                    recordExportName(name);
-                }
-                statements.push(createDeclarationExport(node));
-            }
-            return statements;
-        }
-        function shouldHoistLoopInitializer(node) {
-            return ts.isVariableDeclarationList(node) && (ts.getCombinedNodeFlags(node) & 3) === 0;
-        }
-        function visitForStatement(node) {
-            var initializer = node.initializer;
-            if (shouldHoistLoopInitializer(initializer)) {
-                var expressions = [];
-                for (var _i = 0, _a = initializer.declarations; _i < _a.length; _i++) {
-                    var variable = _a[_i];
-                    var visited = transformVariable(variable, false);
-                    if (visited) {
-                        expressions.push(visited);
-                    }
-                }
-                ;
-                return ts.createFor(expressions.length
-                    ? ts.inlineExpressions(expressions)
-                    : ts.createSynthesizedNode(194), node.condition, node.incrementor, ts.visitNode(node.statement, visitNestedNode, ts.isStatement), node);
-            }
-            else {
-                return ts.visitEachChild(node, visitNestedNode, context);
-            }
-        }
-        function transformForBinding(node) {
-            var firstDeclaration = ts.firstOrUndefined(node.declarations);
-            hoistBindingElement(firstDeclaration, false);
-            var name = firstDeclaration.name;
-            return ts.isIdentifier(name)
-                ? name
-                : ts.flattenVariableDestructuringToExpression(firstDeclaration, hoistVariableDeclaration);
-        }
-        function visitForInStatement(node) {
-            var initializer = node.initializer;
-            if (shouldHoistLoopInitializer(initializer)) {
-                var updated = ts.getMutableClone(node);
-                updated.initializer = transformForBinding(initializer);
-                updated.statement = ts.visitNode(node.statement, visitNestedNode, ts.isStatement, false, ts.liftToBlock);
-                return updated;
-            }
-            else {
-                return ts.visitEachChild(node, visitNestedNode, context);
-            }
-        }
-        function visitForOfStatement(node) {
-            var initializer = node.initializer;
-            if (shouldHoistLoopInitializer(initializer)) {
-                var updated = ts.getMutableClone(node);
-                updated.initializer = transformForBinding(initializer);
-                updated.statement = ts.visitNode(node.statement, visitNestedNode, ts.isStatement, false, ts.liftToBlock);
-                return updated;
-            }
-            else {
-                return ts.visitEachChild(node, visitNestedNode, context);
-            }
-        }
-        function visitDoStatement(node) {
-            var statement = ts.visitNode(node.statement, visitNestedNode, ts.isStatement, false, ts.liftToBlock);
-            if (statement !== node.statement) {
-                var updated = ts.getMutableClone(node);
-                updated.statement = statement;
-                return updated;
-            }
-            return node;
-        }
-        function visitWhileStatement(node) {
-            var statement = ts.visitNode(node.statement, visitNestedNode, ts.isStatement, false, ts.liftToBlock);
-            if (statement !== node.statement) {
-                var updated = ts.getMutableClone(node);
-                updated.statement = statement;
-                return updated;
-            }
-            return node;
-        }
-        function visitLabeledStatement(node) {
-            var statement = ts.visitNode(node.statement, visitNestedNode, ts.isStatement, false, ts.liftToBlock);
-            if (statement !== node.statement) {
-                var updated = ts.getMutableClone(node);
-                updated.statement = statement;
-                return updated;
-            }
-            return node;
-        }
-        function visitWithStatement(node) {
-            var statement = ts.visitNode(node.statement, visitNestedNode, ts.isStatement, false, ts.liftToBlock);
-            if (statement !== node.statement) {
-                var updated = ts.getMutableClone(node);
-                updated.statement = statement;
-                return updated;
-            }
-            return node;
-        }
-        function visitSwitchStatement(node) {
-            var caseBlock = ts.visitNode(node.caseBlock, visitNestedNode, ts.isCaseBlock);
-            if (caseBlock !== node.caseBlock) {
-                var updated = ts.getMutableClone(node);
-                updated.caseBlock = caseBlock;
-                return updated;
-            }
-            return node;
-        }
-        function visitCaseBlock(node) {
-            var clauses = ts.visitNodes(node.clauses, visitNestedNode, ts.isCaseOrDefaultClause);
-            if (clauses !== node.clauses) {
-                var updated = ts.getMutableClone(node);
-                updated.clauses = clauses;
-                return updated;
-            }
-            return node;
-        }
-        function visitCaseClause(node) {
-            var statements = ts.visitNodes(node.statements, visitNestedNode, ts.isStatement);
-            if (statements !== node.statements) {
-                var updated = ts.getMutableClone(node);
-                updated.statements = statements;
-                return updated;
-            }
-            return node;
-        }
-        function visitDefaultClause(node) {
-            return ts.visitEachChild(node, visitNestedNode, context);
-        }
-        function visitTryStatement(node) {
-            return ts.visitEachChild(node, visitNestedNode, context);
-        }
-        function visitCatchClause(node) {
-            var block = ts.visitNode(node.block, visitNestedNode, ts.isBlock);
-            if (block !== node.block) {
-                var updated = ts.getMutableClone(node);
-                updated.block = block;
-                return updated;
-            }
-            return node;
-        }
-        function visitBlock(node) {
-            return ts.visitEachChild(node, visitNestedNode, context);
-        }
-        function onEmitNode(emitContext, node, emitCallback) {
-            if (node.kind === 256) {
-                exportFunctionForFile = exportFunctionForFileMap[ts.getOriginalNodeId(node)];
-                previousOnEmitNode(emitContext, node, emitCallback);
-                exportFunctionForFile = undefined;
-            }
-            else {
-                previousOnEmitNode(emitContext, node, emitCallback);
-            }
-        }
-        function onSubstituteNode(emitContext, node) {
-            node = previousOnSubstituteNode(emitContext, node);
-            if (emitContext === 1) {
-                return substituteExpression(node);
-            }
-            return node;
-        }
-        function substituteExpression(node) {
-            switch (node.kind) {
-                case 70:
-                    return substituteExpressionIdentifier(node);
-                case 188:
-                    return substituteBinaryExpression(node);
-                case 186:
-                case 187:
-                    return substituteUnaryExpression(node);
-            }
-            return node;
-        }
-        function substituteExpressionIdentifier(node) {
-            var importDeclaration = resolver.getReferencedImportDeclaration(node);
-            if (importDeclaration) {
-                var importBinding = createImportBinding(importDeclaration);
-                if (importBinding) {
-                    return importBinding;
-                }
-            }
-            return node;
-        }
-        function substituteBinaryExpression(node) {
-            if (ts.isAssignmentOperator(node.operatorToken.kind)) {
-                return substituteAssignmentExpression(node);
-            }
-            return node;
-        }
-        function substituteAssignmentExpression(node) {
-            ts.setEmitFlags(node, 128);
-            var left = node.left;
-            switch (left.kind) {
-                case 70:
-                    var exportDeclaration = resolver.getReferencedExportContainer(left);
-                    if (exportDeclaration) {
-                        return createExportExpression(left, node);
-                    }
-                    break;
-                case 172:
-                case 171:
-                    if (hasExportedReferenceInDestructuringPattern(left)) {
-                        return substituteDestructuring(node);
-                    }
-                    break;
-            }
-            return node;
-        }
-        function isExportedBinding(name) {
-            var container = resolver.getReferencedExportContainer(name);
-            return container && container.kind === 256;
-        }
-        function hasExportedReferenceInDestructuringPattern(node) {
-            switch (node.kind) {
-                case 70:
-                    return isExportedBinding(node);
-                case 172:
-                    for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
-                        var property = _a[_i];
-                        if (hasExportedReferenceInObjectDestructuringElement(property)) {
-                            return true;
-                        }
-                    }
-                    break;
-                case 171:
-                    for (var _b = 0, _c = node.elements; _b < _c.length; _b++) {
-                        var element = _c[_b];
-                        if (hasExportedReferenceInArrayDestructuringElement(element)) {
-                            return true;
-                        }
-                    }
-                    break;
-            }
-            return false;
-        }
-        function hasExportedReferenceInObjectDestructuringElement(node) {
-            if (ts.isShorthandPropertyAssignment(node)) {
-                return isExportedBinding(node.name);
-            }
-            else if (ts.isPropertyAssignment(node)) {
-                return hasExportedReferenceInDestructuringElement(node.initializer);
-            }
-            else {
-                return false;
-            }
-        }
-        function hasExportedReferenceInArrayDestructuringElement(node) {
-            if (ts.isSpreadElementExpression(node)) {
-                var expression = node.expression;
-                return ts.isIdentifier(expression) && isExportedBinding(expression);
-            }
-            else {
-                return hasExportedReferenceInDestructuringElement(node);
-            }
-        }
-        function hasExportedReferenceInDestructuringElement(node) {
-            if (ts.isBinaryExpression(node)) {
-                var left = node.left;
-                return node.operatorToken.kind === 57
-                    && isDestructuringPattern(left)
-                    && hasExportedReferenceInDestructuringPattern(left);
-            }
-            else if (ts.isIdentifier(node)) {
-                return isExportedBinding(node);
-            }
-            else if (ts.isSpreadElementExpression(node)) {
-                var expression = node.expression;
-                return ts.isIdentifier(expression) && isExportedBinding(expression);
-            }
-            else if (isDestructuringPattern(node)) {
-                return hasExportedReferenceInDestructuringPattern(node);
-            }
-            else {
-                return false;
-            }
-        }
-        function isDestructuringPattern(node) {
-            var kind = node.kind;
-            return kind === 70
-                || kind === 172
-                || kind === 171;
-        }
-        function substituteDestructuring(node) {
-            return ts.flattenDestructuringAssignment(context, node, true, hoistVariableDeclaration);
-        }
-        function substituteUnaryExpression(node) {
-            var operand = node.operand;
-            var operator = node.operator;
-            var substitute = ts.isIdentifier(operand) &&
-                (node.kind === 187 ||
-                    (node.kind === 186 && (operator === 42 || operator === 43)));
-            if (substitute) {
-                var exportDeclaration = resolver.getReferencedExportContainer(operand);
-                if (exportDeclaration) {
-                    var expr = ts.createPrefix(node.operator, operand, node);
-                    ts.setEmitFlags(expr, 128);
-                    var call = createExportExpression(operand, expr);
-                    if (node.kind === 186) {
-                        return call;
-                    }
-                    else {
-                        return operator === 42
-                            ? ts.createSubtract(call, ts.createLiteral(1))
-                            : ts.createAdd(call, ts.createLiteral(1));
-                    }
-                }
-            }
-            return node;
-        }
-        function getDeclarationName(node) {
-            return node.name ? ts.getSynthesizedClone(node.name) : ts.getGeneratedNameForNode(node);
-        }
-        function addExportStarFunction(statements, localNames) {
-            var exportStarFunction = ts.createUniqueName("exportStar");
-            var m = ts.createIdentifier("m");
-            var n = ts.createIdentifier("n");
-            var exports = ts.createIdentifier("exports");
-            var condition = ts.createStrictInequality(n, ts.createLiteral("default"));
-            if (localNames) {
-                condition = ts.createLogicalAnd(condition, ts.createLogicalNot(ts.createHasOwnProperty(localNames, n)));
-            }
-            statements.push(ts.createFunctionDeclaration(undefined, undefined, undefined, exportStarFunction, undefined, [ts.createParameter(m)], undefined, ts.createBlock([
-                ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
-                    ts.createVariableDeclaration(exports, undefined, ts.createObjectLiteral([]))
-                ])),
-                ts.createForIn(ts.createVariableDeclarationList([
-                    ts.createVariableDeclaration(n, undefined)
-                ]), m, ts.createBlock([
-                    ts.setEmitFlags(ts.createIf(condition, ts.createStatement(ts.createAssignment(ts.createElementAccess(exports, n), ts.createElementAccess(m, n)))), 32)
-                ])),
-                ts.createStatement(ts.createCall(exportFunctionForFile, undefined, [exports]))
-            ], undefined, true)));
-            return exportStarFunction;
-        }
-        function createExportExpression(name, value) {
-            var exportName = ts.isIdentifier(name) ? ts.createLiteral(name.text) : name;
-            return ts.createCall(exportFunctionForFile, undefined, [exportName, value]);
-        }
-        function createExportStatement(name, value) {
-            return ts.createStatement(createExportExpression(name, value));
-        }
-        function createDeclarationExport(node) {
-            var declarationName = getDeclarationName(node);
-            var exportName = ts.hasModifier(node, 512) ? ts.createLiteral("default") : declarationName;
-            return createExportStatement(exportName, declarationName);
-        }
-        function createImportBinding(importDeclaration) {
-            var importAlias;
-            var name;
-            if (ts.isImportClause(importDeclaration)) {
-                importAlias = ts.getGeneratedNameForNode(importDeclaration.parent);
-                name = ts.createIdentifier("default");
-            }
-            else if (ts.isImportSpecifier(importDeclaration)) {
-                importAlias = ts.getGeneratedNameForNode(importDeclaration.parent.parent.parent);
-                name = importDeclaration.propertyName || importDeclaration.name;
-            }
-            else {
-                return undefined;
-            }
-            return ts.createPropertyAccess(importAlias, ts.getSynthesizedClone(name));
-        }
-        function collectDependencyGroups(externalImports) {
-            var groupIndices = ts.createMap();
-            var dependencyGroups = [];
-            for (var i = 0; i < externalImports.length; i++) {
-                var externalImport = externalImports[i];
-                var externalModuleName = ts.getExternalModuleNameLiteral(externalImport, currentSourceFile, host, resolver, compilerOptions);
-                var text = externalModuleName.text;
-                if (ts.hasProperty(groupIndices, text)) {
-                    var groupIndex = groupIndices[text];
-                    dependencyGroups[groupIndex].externalImports.push(externalImport);
-                    continue;
-                }
-                else {
-                    groupIndices[text] = dependencyGroups.length;
-                    dependencyGroups.push({
-                        name: externalModuleName,
-                        externalImports: [externalImport]
-                    });
-                }
-            }
-            return dependencyGroups;
-        }
-        function getNameOfDependencyGroup(dependencyGroup) {
-            return dependencyGroup.name;
-        }
-        function recordExportName(name) {
-            if (!exportedLocalNames) {
-                exportedLocalNames = [];
-            }
-            exportedLocalNames.push(name);
-        }
-        function recordExportedFunctionDeclaration(node) {
-            if (!exportedFunctionDeclarations) {
-                exportedFunctionDeclarations = [];
-            }
-            exportedFunctionDeclarations.push(createDeclarationExport(node));
-        }
-        function hoistBindingElement(node, isExported) {
-            if (ts.isOmittedExpression(node)) {
-                return;
-            }
-            var name = node.name;
-            if (ts.isIdentifier(name)) {
-                hoistVariableDeclaration(ts.getSynthesizedClone(name));
-                if (isExported) {
-                    recordExportName(name);
-                }
-            }
-            else if (ts.isBindingPattern(name)) {
-                ts.forEach(name.elements, isExported ? hoistExportedBindingElement : hoistNonExportedBindingElement);
-            }
-        }
-        function hoistExportedBindingElement(node) {
-            hoistBindingElement(node, true);
-        }
-        function hoistNonExportedBindingElement(node) {
-            hoistBindingElement(node, false);
-        }
-        function updateSourceFile(node, statements, nodeEmitFlags) {
-            var updated = ts.getMutableClone(node);
-            updated.statements = ts.createNodeArray(statements, node.statements);
-            ts.setEmitFlags(updated, nodeEmitFlags);
-            return updated;
-        }
-    }
-    ts.transformSystemModule = transformSystemModule;
-})(ts || (ts = {}));
-var ts;
-(function (ts) {
-    function transformES2015Module(context) {
-        var compilerOptions = context.getCompilerOptions();
-        return transformSourceFile;
-        function transformSourceFile(node) {
-            if (ts.isDeclarationFile(node)) {
-                return node;
-            }
-            if (ts.isExternalModule(node) || compilerOptions.isolatedModules) {
-                return ts.visitEachChild(node, visitor, context);
-            }
-            return node;
-        }
-        function visitor(node) {
-            switch (node.kind) {
-                case 230:
-                    return undefined;
-                case 236:
-                    return visitExportAssignment(node);
-            }
-            return node;
-        }
-        function visitExportAssignment(node) {
-            return node.isExportEquals ? undefined : node;
-        }
-    }
-    ts.transformES2015Module = transformES2015Module;
-})(ts || (ts = {}));
-var ts;
 (function (ts) {
     var moduleTransformerMap = ts.createMap((_a = {},
         _a[ts.ModuleKind.ES2015] = ts.transformES2015Module,
@@ -43593,21 +44133,18 @@ var ts;
         _a[ts.ModuleKind.UMD] = ts.transformModule,
         _a[ts.ModuleKind.None] = ts.transformModule,
         _a));
-    var SyntaxKindFeatureFlags;
-    (function (SyntaxKindFeatureFlags) {
-        SyntaxKindFeatureFlags[SyntaxKindFeatureFlags["Substitution"] = 1] = "Substitution";
-        SyntaxKindFeatureFlags[SyntaxKindFeatureFlags["EmitNotifications"] = 2] = "EmitNotifications";
-    })(SyntaxKindFeatureFlags || (SyntaxKindFeatureFlags = {}));
     function getTransformers(compilerOptions) {
         var jsx = compilerOptions.jsx;
         var languageVersion = ts.getEmitScriptTarget(compilerOptions);
         var moduleKind = ts.getEmitModuleKind(compilerOptions);
         var transformers = [];
         transformers.push(ts.transformTypeScript);
-        transformers.push(moduleTransformerMap[moduleKind] || moduleTransformerMap[ts.ModuleKind.None]);
         if (jsx === 2) {
             transformers.push(ts.transformJsx);
         }
+        if (languageVersion < 5) {
+            transformers.push(ts.transformESNext);
+        }
         if (languageVersion < 4) {
             transformers.push(ts.transformES2017);
         }
@@ -43618,6 +44155,7 @@ var ts;
             transformers.push(ts.transformES2015);
             transformers.push(ts.transformGenerators);
         }
+        transformers.push(moduleTransformerMap[moduleKind] || moduleTransformerMap[ts.ModuleKind.None]);
         if (languageVersion < 1) {
             transformers.push(ts.transformES5);
         }
@@ -43627,7 +44165,7 @@ var ts;
     function transformFiles(resolver, host, sourceFiles, transformers) {
         var lexicalEnvironmentVariableDeclarationsStack = [];
         var lexicalEnvironmentFunctionDeclarationsStack = [];
-        var enabledSyntaxKindFeatures = new Array(289);
+        var enabledSyntaxKindFeatures = new Array(296);
         var lexicalEnvironmentStackOffset = 0;
         var hoistedVariableDeclarations;
         var hoistedFunctionDeclarations;
@@ -43914,7 +44452,7 @@ var ts;
                 var emitNode = node.emitNode;
                 var emitFlags = emitNode && emitNode.flags;
                 var _a = emitNode && emitNode.sourceMapRange || node, pos = _a.pos, end = _a.end;
-                if (node.kind !== 287
+                if (node.kind !== 292
                     && (emitFlags & 512) === 0
                     && pos >= 0) {
                     emitPos(ts.skipTrivia(currentSourceText, pos));
@@ -43927,7 +44465,7 @@ var ts;
                 else {
                     emitCallback(emitContext, node);
                 }
-                if (node.kind !== 287
+                if (node.kind !== 292
                     && (emitFlags & 1024) === 0
                     && end >= 0) {
                     emitPos(end);
@@ -44071,7 +44609,7 @@ var ts;
                     if (extendedDiagnostics) {
                         ts.performance.mark("preEmitNodeWithComment");
                     }
-                    var isEmittedNode = node.kind !== 287;
+                    var isEmittedNode = node.kind !== 292;
                     var skipLeadingComments = pos < 0 || (emitFlags & 16384) !== 0;
                     var skipTrailingComments = end < 0 || (emitFlags & 32768) !== 0;
                     if (!skipLeadingComments) {
@@ -44085,7 +44623,7 @@ var ts;
                     }
                     if (!skipTrailingComments) {
                         containerEnd = end;
-                        if (node.kind === 220) {
+                        if (node.kind === 224) {
                             declarationListContainerEnd = end;
                         }
                     }
@@ -44313,7 +44851,7 @@ var ts;
         var isCurrentFileExternalModule;
         var reportedDeclarationError = false;
         var errorNameNode;
-        var emitJsDocComments = compilerOptions.removeComments ? function () { } : writeJsDocComments;
+        var emitJsDocComments = compilerOptions.removeComments ? ts.noop : writeJsDocComments;
         var emit = compilerOptions.stripInternal ? stripInternal : emitNode;
         var noDeclare;
         var moduleElementDeclarationEmitInfo = [];
@@ -44357,7 +44895,7 @@ var ts;
                 var oldWriter = writer;
                 ts.forEach(moduleElementDeclarationEmitInfo, function (aliasEmitInfo) {
                     if (aliasEmitInfo.isVisible && !aliasEmitInfo.asynchronousOutput) {
-                        ts.Debug.assert(aliasEmitInfo.node.kind === 231);
+                        ts.Debug.assert(aliasEmitInfo.node.kind === 235);
                         createAndSetNewTextWriterWithSymbolWriter();
                         ts.Debug.assert(aliasEmitInfo.indent === 0 || (aliasEmitInfo.indent === 1 && isBundledEmit));
                         for (var i = 0; i < aliasEmitInfo.indent; i++) {
@@ -44428,10 +44966,10 @@ var ts;
             var oldWriter = writer;
             ts.forEach(nodes, function (declaration) {
                 var nodeToCheck;
-                if (declaration.kind === 219) {
+                if (declaration.kind === 223) {
                     nodeToCheck = declaration.parent.parent;
                 }
-                else if (declaration.kind === 234 || declaration.kind === 235 || declaration.kind === 232) {
+                else if (declaration.kind === 238 || declaration.kind === 239 || declaration.kind === 236) {
                     ts.Debug.fail("We should be getting ImportDeclaration instead to write");
                 }
                 else {
@@ -44442,7 +44980,7 @@ var ts;
                     moduleElementEmitInfo = ts.forEach(asynchronousSubModuleDeclarationEmitInfo, function (declEmitInfo) { return declEmitInfo.node === nodeToCheck ? declEmitInfo : undefined; });
                 }
                 if (moduleElementEmitInfo) {
-                    if (moduleElementEmitInfo.node.kind === 231) {
+                    if (moduleElementEmitInfo.node.kind === 235) {
                         moduleElementEmitInfo.isVisible = true;
                     }
                     else {
@@ -44450,12 +44988,12 @@ var ts;
                         for (var declarationIndent = moduleElementEmitInfo.indent; declarationIndent; declarationIndent--) {
                             increaseIndent();
                         }
-                        if (nodeToCheck.kind === 226) {
+                        if (nodeToCheck.kind === 230) {
                             ts.Debug.assert(asynchronousSubModuleDeclarationEmitInfo === undefined);
                             asynchronousSubModuleDeclarationEmitInfo = [];
                         }
                         writeModuleElement(nodeToCheck);
-                        if (nodeToCheck.kind === 226) {
+                        if (nodeToCheck.kind === 230) {
                             moduleElementEmitInfo.subModuleElementDeclarationEmitInfo = asynchronousSubModuleDeclarationEmitInfo;
                             asynchronousSubModuleDeclarationEmitInfo = undefined;
                         }
@@ -44568,43 +45106,49 @@ var ts;
         function emitType(type) {
             switch (type.kind) {
                 case 118:
-                case 133:
-                case 131:
-                case 121:
                 case 134:
+                case 132:
+                case 121:
+                case 135:
                 case 104:
-                case 136:
+                case 137:
                 case 94:
-                case 128:
-                case 166:
+                case 129:
                 case 167:
+                case 171:
                     return writeTextOfNode(currentText, type);
-                case 195:
+                case 199:
                     return emitExpressionWithTypeArguments(type);
-                case 156:
-                    return emitTypeReference(type);
-                case 159:
-                    return emitTypeQuery(type);
-                case 161:
-                    return emitArrayType(type);
-                case 162:
-                    return emitTupleType(type);
-                case 163:
-                    return emitUnionType(type);
-                case 164:
-                    return emitIntersectionType(type);
-                case 165:
-                    return emitParenType(type);
                 case 157:
-                case 158:
-                    return emitSignatureDeclarationWithJsDocComments(type);
+                    return emitTypeReference(type);
                 case 160:
+                    return emitTypeQuery(type);
+                case 162:
+                    return emitArrayType(type);
+                case 163:
+                    return emitTupleType(type);
+                case 164:
+                    return emitUnionType(type);
+                case 165:
+                    return emitIntersectionType(type);
+                case 166:
+                    return emitParenType(type);
+                case 168:
+                    return emitTypeOperator(type);
+                case 169:
+                    return emitIndexedAccessType(type);
+                case 170:
+                    return emitMappedType(type);
+                case 158:
+                case 159:
+                    return emitSignatureDeclarationWithJsDocComments(type);
+                case 161:
                     return emitTypeLiteral(type);
                 case 70:
                     return emitEntityName(type);
-                case 140:
+                case 141:
                     return emitEntityName(type);
-                case 155:
+                case 156:
                     return emitTypePredicate(type);
             }
             function writeEntityName(entityName) {
@@ -44612,22 +45156,22 @@ var ts;
                     writeTextOfNode(currentText, entityName);
                 }
                 else {
-                    var left = entityName.kind === 140 ? entityName.left : entityName.expression;
-                    var right = entityName.kind === 140 ? entityName.right : entityName.name;
+                    var left = entityName.kind === 141 ? entityName.left : entityName.expression;
+                    var right = entityName.kind === 141 ? entityName.right : entityName.name;
                     writeEntityName(left);
                     write(".");
                     writeTextOfNode(currentText, right);
                 }
             }
             function emitEntityName(entityName) {
-                var visibilityResult = resolver.isEntityNameVisible(entityName, entityName.parent.kind === 230 ? entityName.parent : enclosingDeclaration);
+                var visibilityResult = resolver.isEntityNameVisible(entityName, entityName.parent.kind === 234 ? entityName.parent : enclosingDeclaration);
                 handleSymbolAccessibilityError(visibilityResult);
                 recordTypeReferenceDirectivesIfNecessary(resolver.getTypeReferenceDirectivesForEntityName(entityName));
                 writeEntityName(entityName);
             }
             function emitExpressionWithTypeArguments(node) {
                 if (ts.isEntityNameExpression(node.expression)) {
-                    ts.Debug.assert(node.expression.kind === 70 || node.expression.kind === 173);
+                    ts.Debug.assert(node.expression.kind === 70 || node.expression.kind === 177);
                     emitEntityName(node.expression);
                     if (node.typeArguments) {
                         write("<");
@@ -44673,6 +45217,42 @@ var ts;
                 emitType(type.type);
                 write(")");
             }
+            function emitTypeOperator(type) {
+                write(ts.tokenToString(type.operator));
+                write(" ");
+                emitType(type.type);
+            }
+            function emitIndexedAccessType(node) {
+                emitType(node.objectType);
+                write("[");
+                emitType(node.indexType);
+                write("]");
+            }
+            function emitMappedType(node) {
+                var prevEnclosingDeclaration = enclosingDeclaration;
+                enclosingDeclaration = node;
+                write("{");
+                writeLine();
+                increaseIndent();
+                if (node.readonlyToken) {
+                    write("readonly ");
+                }
+                write("[");
+                writeEntityName(node.typeParameter.name);
+                write(" in ");
+                emitType(node.typeParameter.constraint);
+                write("]");
+                if (node.questionToken) {
+                    write("?");
+                }
+                write(": ");
+                emitType(node.type);
+                write(";");
+                writeLine();
+                decreaseIndent();
+                write("}");
+                enclosingDeclaration = prevEnclosingDeclaration;
+            }
             function emitTypeLiteral(type) {
                 write("{");
                 if (type.members.length) {
@@ -44701,9 +45281,9 @@ var ts;
             var count = 0;
             while (true) {
                 count++;
-                var name_40 = baseName + "_" + count;
-                if (!(name_40 in currentIdentifiers)) {
-                    return name_40;
+                var name_37 = baseName + "_" + count;
+                if (!(name_37 in currentIdentifiers)) {
+                    return name_37;
                 }
             }
         }
@@ -44747,10 +45327,10 @@ var ts;
             if (isModuleElementVisible) {
                 writeModuleElement(node);
             }
-            else if (node.kind === 230 ||
-                (node.parent.kind === 256 && isCurrentFileExternalModule)) {
+            else if (node.kind === 234 ||
+                (node.parent.kind === 261 && isCurrentFileExternalModule)) {
                 var isVisible = void 0;
-                if (asynchronousSubModuleDeclarationEmitInfo && node.parent.kind !== 256) {
+                if (asynchronousSubModuleDeclarationEmitInfo && node.parent.kind !== 261) {
                     asynchronousSubModuleDeclarationEmitInfo.push({
                         node: node,
                         outputPos: writer.getTextPos(),
@@ -44759,7 +45339,7 @@ var ts;
                     });
                 }
                 else {
-                    if (node.kind === 231) {
+                    if (node.kind === 235) {
                         var importDeclaration = node;
                         if (importDeclaration.importClause) {
                             isVisible = (importDeclaration.importClause.name && resolver.isDeclarationVisible(importDeclaration.importClause)) ||
@@ -44777,30 +45357,30 @@ var ts;
         }
         function writeModuleElement(node) {
             switch (node.kind) {
-                case 221:
-                    return writeFunctionDeclaration(node);
-                case 201:
-                    return writeVariableStatement(node);
-                case 223:
-                    return writeInterfaceDeclaration(node);
-                case 222:
-                    return writeClassDeclaration(node);
-                case 224:
-                    return writeTypeAliasDeclaration(node);
                 case 225:
-                    return writeEnumDeclaration(node);
+                    return writeFunctionDeclaration(node);
+                case 205:
+                    return writeVariableStatement(node);
+                case 227:
+                    return writeInterfaceDeclaration(node);
                 case 226:
-                    return writeModuleDeclaration(node);
+                    return writeClassDeclaration(node);
+                case 228:
+                    return writeTypeAliasDeclaration(node);
+                case 229:
+                    return writeEnumDeclaration(node);
                 case 230:
+                    return writeModuleDeclaration(node);
+                case 234:
                     return writeImportEqualsDeclaration(node);
-                case 231:
+                case 235:
                     return writeImportDeclaration(node);
                 default:
                     ts.Debug.fail("Unknown symbol kind");
             }
         }
         function emitModuleElementDeclarationFlags(node) {
-            if (node.parent.kind === 256) {
+            if (node.parent.kind === 261) {
                 var modifiers = ts.getModifierFlags(node);
                 if (modifiers & 1) {
                     write("export ");
@@ -44808,7 +45388,7 @@ var ts;
                 if (modifiers & 512) {
                     write("default ");
                 }
-                else if (node.kind !== 223 && !noDeclare) {
+                else if (node.kind !== 227 && !noDeclare) {
                     write("declare ");
                 }
             }
@@ -44858,7 +45438,7 @@ var ts;
         }
         function isVisibleNamedBinding(namedBindings) {
             if (namedBindings) {
-                if (namedBindings.kind === 233) {
+                if (namedBindings.kind === 237) {
                     return resolver.isDeclarationVisible(namedBindings);
                 }
                 else {
@@ -44881,7 +45461,7 @@ var ts;
                     if (currentWriterPos !== writer.getTextPos()) {
                         write(", ");
                     }
-                    if (node.importClause.namedBindings.kind === 233) {
+                    if (node.importClause.namedBindings.kind === 237) {
                         write("* as ");
                         writeTextOfNode(currentText, node.importClause.namedBindings.name);
                     }
@@ -44898,13 +45478,13 @@ var ts;
             writer.writeLine();
         }
         function emitExternalModuleSpecifier(parent) {
-            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || parent.kind !== 226;
+            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || parent.kind !== 230;
             var moduleSpecifier;
-            if (parent.kind === 230) {
+            if (parent.kind === 234) {
                 var node = parent;
                 moduleSpecifier = ts.getExternalModuleImportEqualsDeclarationExpression(node);
             }
-            else if (parent.kind === 226) {
+            else if (parent.kind === 230) {
                 moduleSpecifier = parent.name;
             }
             else {
@@ -44972,7 +45552,7 @@ var ts;
                     writeTextOfNode(currentText, node.name);
                 }
             }
-            while (node.body && node.body.kind !== 227) {
+            while (node.body && node.body.kind !== 231) {
                 node = node.body;
                 write(".");
                 writeTextOfNode(currentText, node.name);
@@ -45042,7 +45622,7 @@ var ts;
             writeLine();
         }
         function isPrivateMethodTypeParameter(node) {
-            return node.parent.kind === 148 && ts.hasModifier(node.parent, 8);
+            return node.parent.kind === 149 && ts.hasModifier(node.parent, 8);
         }
         function emitTypeParameters(typeParameters) {
             function emitTypeParameter(node) {
@@ -45052,15 +45632,15 @@ var ts;
                 writeTextOfNode(currentText, node.name);
                 if (node.constraint && !isPrivateMethodTypeParameter(node)) {
                     write(" extends ");
-                    if (node.parent.kind === 157 ||
-                        node.parent.kind === 158 ||
-                        (node.parent.parent && node.parent.parent.kind === 160)) {
-                        ts.Debug.assert(node.parent.kind === 148 ||
-                            node.parent.kind === 147 ||
-                            node.parent.kind === 157 ||
+                    if (node.parent.kind === 158 ||
+                        node.parent.kind === 159 ||
+                        (node.parent.parent && node.parent.parent.kind === 161)) {
+                        ts.Debug.assert(node.parent.kind === 149 ||
+                            node.parent.kind === 148 ||
                             node.parent.kind === 158 ||
-                            node.parent.kind === 152 ||
-                            node.parent.kind === 153);
+                            node.parent.kind === 159 ||
+                            node.parent.kind === 153 ||
+                            node.parent.kind === 154);
                         emitType(node.constraint);
                     }
                     else {
@@ -45070,31 +45650,31 @@ var ts;
                 function getTypeParameterConstraintVisibilityError() {
                     var diagnosticMessage;
                     switch (node.parent.kind) {
-                        case 222:
+                        case 226:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_class_has_or_is_using_private_name_1;
                             break;
-                        case 223:
+                        case 227:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1;
                             break;
-                        case 153:
+                        case 154:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
                             break;
-                        case 152:
+                        case 153:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
                             break;
+                        case 149:
                         case 148:
-                        case 147:
                             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 === 222) {
+                            else if (node.parent.parent.kind === 226) {
                                 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 221:
+                        case 225:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_function_has_or_is_using_private_name_1;
                             break;
                         default:
@@ -45131,7 +45711,7 @@ var ts;
                 }
                 function getHeritageClauseVisibilityError() {
                     var diagnosticMessage;
-                    if (node.parent.parent.kind === 222) {
+                    if (node.parent.parent.kind === 226) {
                         diagnosticMessage = isImplementsList ?
                             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;
@@ -45211,17 +45791,17 @@ var ts;
             writeLine();
         }
         function emitVariableDeclaration(node) {
-            if (node.kind !== 219 || resolver.isDeclarationVisible(node)) {
+            if (node.kind !== 223 || resolver.isDeclarationVisible(node)) {
                 if (ts.isBindingPattern(node.name)) {
                     emitBindingPattern(node.name);
                 }
                 else {
                     writeTextOfNode(currentText, node.name);
-                    if ((node.kind === 146 || node.kind === 145 ||
-                        (node.kind === 143 && !ts.isParameterPropertyDeclaration(node))) && ts.hasQuestionToken(node)) {
+                    if ((node.kind === 147 || node.kind === 146 ||
+                        (node.kind === 144 && !ts.isParameterPropertyDeclaration(node))) && ts.hasQuestionToken(node)) {
                         write("?");
                     }
-                    if ((node.kind === 146 || node.kind === 145) && node.parent.kind === 160) {
+                    if ((node.kind === 147 || node.kind === 146) && node.parent.kind === 161) {
                         emitTypeOfVariableDeclarationFromTypeLiteral(node);
                     }
                     else if (resolver.isLiteralConstDeclaration(node)) {
@@ -45234,14 +45814,14 @@ var ts;
                 }
             }
             function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
-                if (node.kind === 219) {
+                if (node.kind === 223) {
                     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 === 146 || node.kind === 145) {
+                else if (node.kind === 147 || node.kind === 146) {
                     if (ts.hasModifier(node, 32)) {
                         return symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 ?
@@ -45249,7 +45829,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 === 222) {
+                    else if (node.parent.kind === 226) {
                         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 :
@@ -45275,7 +45855,7 @@ var ts;
                 var elements = [];
                 for (var _i = 0, _a = bindingPattern.elements; _i < _a.length; _i++) {
                     var element = _a[_i];
-                    if (element.kind !== 194) {
+                    if (element.kind !== 198) {
                         elements.push(element);
                     }
                 }
@@ -45341,7 +45921,7 @@ var ts;
                     accessorWithTypeAnnotation = node;
                     var type = getTypeAnnotationFromAccessor(node);
                     if (!type) {
-                        var anotherAccessor = node.kind === 150 ? accessors.setAccessor : accessors.getAccessor;
+                        var anotherAccessor = node.kind === 151 ? accessors.setAccessor : accessors.getAccessor;
                         type = getTypeAnnotationFromAccessor(anotherAccessor);
                         if (type) {
                             accessorWithTypeAnnotation = anotherAccessor;
@@ -45354,7 +45934,7 @@ var ts;
             }
             function getTypeAnnotationFromAccessor(accessor) {
                 if (accessor) {
-                    return accessor.kind === 150
+                    return accessor.kind === 151
                         ? accessor.type
                         : accessor.parameters.length > 0
                             ? accessor.parameters[0].type
@@ -45363,7 +45943,7 @@ var ts;
             }
             function getAccessorDeclarationTypeVisibilityError(symbolAccessibilityResult) {
                 var diagnosticMessage;
-                if (accessorWithTypeAnnotation.kind === 151) {
+                if (accessorWithTypeAnnotation.kind === 152) {
                     if (ts.hasModifier(accessorWithTypeAnnotation.parent, 32)) {
                         diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
@@ -45409,17 +45989,17 @@ var ts;
             }
             if (!resolver.isImplementationOfOverload(node)) {
                 emitJsDocComments(node);
-                if (node.kind === 221) {
+                if (node.kind === 225) {
                     emitModuleElementDeclarationFlags(node);
                 }
-                else if (node.kind === 148 || node.kind === 149) {
+                else if (node.kind === 149 || node.kind === 150) {
                     emitClassMemberDeclarationFlags(ts.getModifierFlags(node));
                 }
-                if (node.kind === 221) {
+                if (node.kind === 225) {
                     write("function ");
                     writeTextOfNode(currentText, node.name);
                 }
-                else if (node.kind === 149) {
+                else if (node.kind === 150) {
                     write("constructor");
                 }
                 else {
@@ -45439,15 +46019,15 @@ var ts;
             var prevEnclosingDeclaration = enclosingDeclaration;
             enclosingDeclaration = node;
             var closeParenthesizedFunctionType = false;
-            if (node.kind === 154) {
+            if (node.kind === 155) {
                 emitClassMemberDeclarationFlags(ts.getModifierFlags(node));
                 write("[");
             }
             else {
-                if (node.kind === 153 || node.kind === 158) {
+                if (node.kind === 154 || node.kind === 159) {
                     write("new ");
                 }
-                else if (node.kind === 157) {
+                else if (node.kind === 158) {
                     var currentOutput = writer.getText();
                     if (node.typeParameters && currentOutput.charAt(currentOutput.length - 1) === "<") {
                         closeParenthesizedFunctionType = true;
@@ -45458,20 +46038,20 @@ var ts;
                 write("(");
             }
             emitCommaList(node.parameters, emitParameterDeclaration);
-            if (node.kind === 154) {
+            if (node.kind === 155) {
                 write("]");
             }
             else {
                 write(")");
             }
-            var isFunctionTypeOrConstructorType = node.kind === 157 || node.kind === 158;
-            if (isFunctionTypeOrConstructorType || node.parent.kind === 160) {
+            var isFunctionTypeOrConstructorType = node.kind === 158 || node.kind === 159;
+            if (isFunctionTypeOrConstructorType || node.parent.kind === 161) {
                 if (node.type) {
                     write(isFunctionTypeOrConstructorType ? " => " : ": ");
                     emitType(node.type);
                 }
             }
-            else if (node.kind !== 149 && !ts.hasModifier(node, 8)) {
+            else if (node.kind !== 150 && !ts.hasModifier(node, 8)) {
                 writeReturnTypeAtSignature(node, getReturnTypeVisibilityError);
             }
             enclosingDeclaration = prevEnclosingDeclaration;
@@ -45485,23 +46065,23 @@ var ts;
             function getReturnTypeVisibilityError(symbolAccessibilityResult) {
                 var diagnosticMessage;
                 switch (node.kind) {
-                    case 153:
+                    case 154:
                         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 152:
+                    case 153:
                         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 154:
+                    case 155:
                         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 149:
                     case 148:
-                    case 147:
                         if (ts.hasModifier(node, 32)) {
                             diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                                 symbolAccessibilityResult.accessibility === 2 ?
@@ -45509,7 +46089,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 === 222) {
+                        else if (node.parent.kind === 226) {
                             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 :
@@ -45522,7 +46102,7 @@ var ts;
                                 ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0;
                         }
                         break;
-                    case 221:
+                    case 225:
                         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 :
@@ -45554,9 +46134,9 @@ var ts;
                 write("?");
             }
             decreaseIndent();
-            if (node.parent.kind === 157 ||
-                node.parent.kind === 158 ||
-                node.parent.parent.kind === 160) {
+            if (node.parent.kind === 158 ||
+                node.parent.kind === 159 ||
+                node.parent.parent.kind === 161) {
                 emitTypeOfVariableDeclarationFromTypeLiteral(node);
             }
             else if (!ts.hasModifier(node.parent, 8)) {
@@ -45572,22 +46152,22 @@ var ts;
             }
             function getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
                 switch (node.parent.kind) {
-                    case 149:
+                    case 150:
                         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 153:
+                    case 154:
                         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 152:
+                    case 153:
                         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 149:
                     case 148:
-                    case 147:
                         if (ts.hasModifier(node.parent, 32)) {
                             return symbolAccessibilityResult.errorModuleName ?
                                 symbolAccessibilityResult.accessibility === 2 ?
@@ -45595,7 +46175,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 === 222) {
+                        else if (node.parent.parent.kind === 226) {
                             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 :
@@ -45607,7 +46187,7 @@ 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 221:
+                    case 225:
                         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 :
@@ -45618,12 +46198,12 @@ var ts;
                 }
             }
             function emitBindingPattern(bindingPattern) {
-                if (bindingPattern.kind === 168) {
+                if (bindingPattern.kind === 172) {
                     write("{");
                     emitCommaList(bindingPattern.elements, emitBindingElement);
                     write("}");
                 }
-                else if (bindingPattern.kind === 169) {
+                else if (bindingPattern.kind === 173) {
                     write("[");
                     var elements = bindingPattern.elements;
                     emitCommaList(elements, emitBindingElement);
@@ -45634,10 +46214,10 @@ var ts;
                 }
             }
             function emitBindingElement(bindingElement) {
-                if (bindingElement.kind === 194) {
+                if (bindingElement.kind === 198) {
                     write(" ");
                 }
-                else if (bindingElement.kind === 170) {
+                else if (bindingElement.kind === 174) {
                     if (bindingElement.propertyName) {
                         writeTextOfNode(currentText, bindingElement.propertyName);
                         write(": ");
@@ -45659,39 +46239,39 @@ var ts;
         }
         function emitNode(node) {
             switch (node.kind) {
-                case 221:
-                case 226:
-                case 230:
-                case 223:
-                case 222:
-                case 224:
                 case 225:
+                case 230:
+                case 234:
+                case 227:
+                case 226:
+                case 228:
+                case 229:
                     return emitModuleElement(node, isModuleElementVisible(node));
-                case 201:
+                case 205:
                     return emitModuleElement(node, isVariableStatementVisible(node));
-                case 231:
+                case 235:
                     return emitModuleElement(node, !node.importClause);
-                case 237:
+                case 241:
                     return emitExportDeclaration(node);
+                case 150:
                 case 149:
                 case 148:
-                case 147:
                     return writeFunctionDeclaration(node);
-                case 153:
-                case 152:
                 case 154:
+                case 153:
+                case 155:
                     return emitSignatureDeclarationWithJsDocComments(node);
-                case 150:
                 case 151:
+                case 152:
                     return emitAccessorDeclaration(node);
+                case 147:
                 case 146:
-                case 145:
                     return emitPropertyDeclaration(node);
-                case 255:
+                case 260:
                     return emitEnumMemberDeclaration(node);
-                case 236:
+                case 240:
                     return emitExportAssignment(node);
-                case 256:
+                case 261:
                     return emitSourceFile(node);
             }
         }
@@ -45746,12 +46326,6 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    var TempFlags;
-    (function (TempFlags) {
-        TempFlags[TempFlags["Auto"] = 0] = "Auto";
-        TempFlags[TempFlags["CountMask"] = 268435455] = "CountMask";
-        TempFlags[TempFlags["_i"] = 268435456] = "_i";
-    })(TempFlags || (TempFlags = {}));
     var id = function (s) { return s; };
     var nullTransformers = [function (_) { return id; }];
     function emitFiles(resolver, host, targetSourceFile, emitOnlyDtsFiles) {
@@ -45759,6 +46333,7 @@ var ts;
         var brackets = createBracketsMap();
         var extendsHelper = "\nvar __extends = (this && this.__extends) || function (d, b) {\n    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];\n    function __() { this.constructor = d; }\n    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());\n};";
         var assignHelper = "\nvar __assign = (this && this.__assign) || Object.assign || function(t) {\n    for (var s, i = 1, n = arguments.length; i < n; i++) {\n        s = arguments[i];\n        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))\n            t[p] = s[p];\n    }\n    return t;\n};";
+        var restHelper = "\nvar __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))\n        t[p] = s[p];\n    return t;\n};";
         var decorateHelper = "\nvar __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {\n    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;\n    if (typeof Reflect === \"object\" && typeof Reflect.decorate === \"function\") r = Reflect.decorate(decorators, target, key, desc);\n    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;\n    return c > 3 && r && Object.defineProperty(target, key, r), r;\n};";
         var metadataHelper = "\nvar __metadata = (this && this.__metadata) || function (k, v) {\n    if (typeof Reflect === \"object\" && typeof Reflect.metadata === \"function\") return Reflect.metadata(k, v);\n};";
         var paramHelper = "\nvar __param = (this && this.__param) || function (paramIndex, decorator) {\n    return function (target, key) { decorator(target, key, paramIndex); }\n};";
@@ -45791,6 +46366,7 @@ var ts;
         var currentFileIdentifiers;
         var extendsEmitted;
         var assignEmitted;
+        var restEmitted;
         var decorateEmitted;
         var paramEmitted;
         var awaiterEmitted;
@@ -45924,7 +46500,7 @@ var ts;
         function pipelineEmitInSourceFileContext(node) {
             var kind = node.kind;
             switch (kind) {
-                case 256:
+                case 261:
                     return emitSourceFile(node);
             }
         }
@@ -45962,7 +46538,6 @@ var ts;
                 case 123:
                 case 124:
                 case 125:
-                case 126:
                 case 127:
                 case 128:
                 case 129:
@@ -45976,182 +46551,191 @@ var ts;
                 case 137:
                 case 138:
                 case 139:
+                case 140:
                     writeTokenText(kind);
                     return;
-                case 140:
-                    return emitQualifiedName(node);
                 case 141:
-                    return emitComputedPropertyName(node);
+                    return emitQualifiedName(node);
                 case 142:
-                    return emitTypeParameter(node);
+                    return emitComputedPropertyName(node);
                 case 143:
-                    return emitParameter(node);
+                    return emitTypeParameter(node);
                 case 144:
-                    return emitDecorator(node);
+                    return emitParameter(node);
                 case 145:
-                    return emitPropertySignature(node);
+                    return emitDecorator(node);
                 case 146:
-                    return emitPropertyDeclaration(node);
+                    return emitPropertySignature(node);
                 case 147:
-                    return emitMethodSignature(node);
+                    return emitPropertyDeclaration(node);
                 case 148:
-                    return emitMethodDeclaration(node);
+                    return emitMethodSignature(node);
                 case 149:
-                    return emitConstructor(node);
+                    return emitMethodDeclaration(node);
                 case 150:
+                    return emitConstructor(node);
                 case 151:
-                    return emitAccessorDeclaration(node);
                 case 152:
-                    return emitCallSignature(node);
+                    return emitAccessorDeclaration(node);
                 case 153:
-                    return emitConstructSignature(node);
+                    return emitCallSignature(node);
                 case 154:
-                    return emitIndexSignature(node);
+                    return emitConstructSignature(node);
                 case 155:
-                    return emitTypePredicate(node);
+                    return emitIndexSignature(node);
                 case 156:
-                    return emitTypeReference(node);
+                    return emitTypePredicate(node);
                 case 157:
-                    return emitFunctionType(node);
+                    return emitTypeReference(node);
                 case 158:
-                    return emitConstructorType(node);
+                    return emitFunctionType(node);
                 case 159:
-                    return emitTypeQuery(node);
+                    return emitConstructorType(node);
                 case 160:
-                    return emitTypeLiteral(node);
+                    return emitTypeQuery(node);
                 case 161:
-                    return emitArrayType(node);
+                    return emitTypeLiteral(node);
                 case 162:
-                    return emitTupleType(node);
+                    return emitArrayType(node);
                 case 163:
-                    return emitUnionType(node);
+                    return emitTupleType(node);
                 case 164:
-                    return emitIntersectionType(node);
+                    return emitUnionType(node);
                 case 165:
-                    return emitParenthesizedType(node);
-                case 195:
-                    return emitExpressionWithTypeArguments(node);
+                    return emitIntersectionType(node);
                 case 166:
-                    return emitThisType();
-                case 167:
-                    return emitLiteralType(node);
-                case 168:
-                    return emitObjectBindingPattern(node);
-                case 169:
-                    return emitArrayBindingPattern(node);
-                case 170:
-                    return emitBindingElement(node);
-                case 198:
-                    return emitTemplateSpan(node);
+                    return emitParenthesizedType(node);
                 case 199:
-                    return emitSemicolonClassElement();
-                case 200:
-                    return emitBlock(node);
-                case 201:
-                    return emitVariableStatement(node);
+                    return emitExpressionWithTypeArguments(node);
+                case 167:
+                    return emitThisType();
+                case 168:
+                    return emitTypeOperator(node);
+                case 169:
+                    return emitIndexedAccessType(node);
+                case 170:
+                    return emitMappedType(node);
+                case 171:
+                    return emitLiteralType(node);
+                case 172:
+                    return emitObjectBindingPattern(node);
+                case 173:
+                    return emitArrayBindingPattern(node);
+                case 174:
+                    return emitBindingElement(node);
                 case 202:
-                    return emitEmptyStatement();
+                    return emitTemplateSpan(node);
                 case 203:
-                    return emitExpressionStatement(node);
+                    return emitSemicolonClassElement();
                 case 204:
-                    return emitIfStatement(node);
+                    return emitBlock(node);
                 case 205:
-                    return emitDoStatement(node);
+                    return emitVariableStatement(node);
                 case 206:
-                    return emitWhileStatement(node);
+                    return emitEmptyStatement();
                 case 207:
-                    return emitForStatement(node);
+                    return emitExpressionStatement(node);
                 case 208:
-                    return emitForInStatement(node);
+                    return emitIfStatement(node);
                 case 209:
-                    return emitForOfStatement(node);
+                    return emitDoStatement(node);
                 case 210:
-                    return emitContinueStatement(node);
+                    return emitWhileStatement(node);
                 case 211:
-                    return emitBreakStatement(node);
+                    return emitForStatement(node);
                 case 212:
-                    return emitReturnStatement(node);
+                    return emitForInStatement(node);
                 case 213:
-                    return emitWithStatement(node);
+                    return emitForOfStatement(node);
                 case 214:
-                    return emitSwitchStatement(node);
+                    return emitContinueStatement(node);
                 case 215:
-                    return emitLabeledStatement(node);
+                    return emitBreakStatement(node);
                 case 216:
-                    return emitThrowStatement(node);
+                    return emitReturnStatement(node);
                 case 217:
-                    return emitTryStatement(node);
+                    return emitWithStatement(node);
                 case 218:
-                    return emitDebuggerStatement(node);
+                    return emitSwitchStatement(node);
                 case 219:
-                    return emitVariableDeclaration(node);
+                    return emitLabeledStatement(node);
                 case 220:
-                    return emitVariableDeclarationList(node);
+                    return emitThrowStatement(node);
                 case 221:
-                    return emitFunctionDeclaration(node);
+                    return emitTryStatement(node);
                 case 222:
-                    return emitClassDeclaration(node);
+                    return emitDebuggerStatement(node);
                 case 223:
-                    return emitInterfaceDeclaration(node);
+                    return emitVariableDeclaration(node);
                 case 224:
-                    return emitTypeAliasDeclaration(node);
+                    return emitVariableDeclarationList(node);
                 case 225:
-                    return emitEnumDeclaration(node);
+                    return emitFunctionDeclaration(node);
                 case 226:
-                    return emitModuleDeclaration(node);
+                    return emitClassDeclaration(node);
                 case 227:
-                    return emitModuleBlock(node);
+                    return emitInterfaceDeclaration(node);
                 case 228:
-                    return emitCaseBlock(node);
+                    return emitTypeAliasDeclaration(node);
+                case 229:
+                    return emitEnumDeclaration(node);
                 case 230:
-                    return emitImportEqualsDeclaration(node);
+                    return emitModuleDeclaration(node);
                 case 231:
-                    return emitImportDeclaration(node);
+                    return emitModuleBlock(node);
                 case 232:
-                    return emitImportClause(node);
-                case 233:
-                    return emitNamespaceImport(node);
+                    return emitCaseBlock(node);
                 case 234:
-                    return emitNamedImports(node);
+                    return emitImportEqualsDeclaration(node);
                 case 235:
-                    return emitImportSpecifier(node);
+                    return emitImportDeclaration(node);
                 case 236:
-                    return emitExportAssignment(node);
+                    return emitImportClause(node);
                 case 237:
-                    return emitExportDeclaration(node);
+                    return emitNamespaceImport(node);
                 case 238:
-                    return emitNamedExports(node);
+                    return emitNamedImports(node);
                 case 239:
-                    return emitExportSpecifier(node);
+                    return emitImportSpecifier(node);
                 case 240:
-                    return;
+                    return emitExportAssignment(node);
                 case 241:
+                    return emitExportDeclaration(node);
+                case 242:
+                    return emitNamedExports(node);
+                case 243:
+                    return emitExportSpecifier(node);
+                case 244:
+                    return;
+                case 245:
                     return emitExternalModuleReference(node);
                 case 10:
                     return emitJsxText(node);
-                case 244:
-                    return emitJsxOpeningElement(node);
-                case 245:
-                    return emitJsxClosingElement(node);
-                case 246:
-                    return emitJsxAttribute(node);
-                case 247:
-                    return emitJsxSpreadAttribute(node);
                 case 248:
-                    return emitJsxExpression(node);
+                    return emitJsxOpeningElement(node);
                 case 249:
-                    return emitCaseClause(node);
+                    return emitJsxClosingElement(node);
                 case 250:
-                    return emitDefaultClause(node);
+                    return emitJsxAttribute(node);
                 case 251:
-                    return emitHeritageClause(node);
+                    return emitJsxSpreadAttribute(node);
                 case 252:
-                    return emitCatchClause(node);
+                    return emitJsxExpression(node);
                 case 253:
-                    return emitPropertyAssignment(node);
+                    return emitCaseClause(node);
                 case 254:
-                    return emitShorthandPropertyAssignment(node);
+                    return emitDefaultClause(node);
                 case 255:
+                    return emitHeritageClause(node);
+                case 256:
+                    return emitCatchClause(node);
+                case 257:
+                    return emitPropertyAssignment(node);
+                case 258:
+                    return emitShorthandPropertyAssignment(node);
+                case 259:
+                    return emitSpreadAssignment(node);
+                case 260:
                     return emitEnumMember(node);
             }
             if (ts.isExpression(node)) {
@@ -46176,63 +46760,63 @@ var ts;
                 case 98:
                     writeTokenText(kind);
                     return;
-                case 171:
-                    return emitArrayLiteralExpression(node);
-                case 172:
-                    return emitObjectLiteralExpression(node);
-                case 173:
-                    return emitPropertyAccessExpression(node);
-                case 174:
-                    return emitElementAccessExpression(node);
                 case 175:
-                    return emitCallExpression(node);
+                    return emitArrayLiteralExpression(node);
                 case 176:
-                    return emitNewExpression(node);
+                    return emitObjectLiteralExpression(node);
                 case 177:
-                    return emitTaggedTemplateExpression(node);
+                    return emitPropertyAccessExpression(node);
                 case 178:
-                    return emitTypeAssertionExpression(node);
+                    return emitElementAccessExpression(node);
                 case 179:
-                    return emitParenthesizedExpression(node);
+                    return emitCallExpression(node);
                 case 180:
-                    return emitFunctionExpression(node);
+                    return emitNewExpression(node);
                 case 181:
-                    return emitArrowFunction(node);
+                    return emitTaggedTemplateExpression(node);
                 case 182:
-                    return emitDeleteExpression(node);
+                    return emitTypeAssertionExpression(node);
                 case 183:
-                    return emitTypeOfExpression(node);
+                    return emitParenthesizedExpression(node);
                 case 184:
-                    return emitVoidExpression(node);
+                    return emitFunctionExpression(node);
                 case 185:
-                    return emitAwaitExpression(node);
+                    return emitArrowFunction(node);
                 case 186:
-                    return emitPrefixUnaryExpression(node);
+                    return emitDeleteExpression(node);
                 case 187:
-                    return emitPostfixUnaryExpression(node);
+                    return emitTypeOfExpression(node);
                 case 188:
-                    return emitBinaryExpression(node);
+                    return emitVoidExpression(node);
                 case 189:
-                    return emitConditionalExpression(node);
+                    return emitAwaitExpression(node);
                 case 190:
-                    return emitTemplateExpression(node);
+                    return emitPrefixUnaryExpression(node);
                 case 191:
-                    return emitYieldExpression(node);
+                    return emitPostfixUnaryExpression(node);
                 case 192:
-                    return emitSpreadElementExpression(node);
+                    return emitBinaryExpression(node);
                 case 193:
-                    return emitClassExpression(node);
+                    return emitConditionalExpression(node);
                 case 194:
-                    return;
+                    return emitTemplateExpression(node);
+                case 195:
+                    return emitYieldExpression(node);
                 case 196:
-                    return emitAsExpression(node);
+                    return emitSpreadExpression(node);
                 case 197:
+                    return emitClassExpression(node);
+                case 198:
+                    return;
+                case 200:
+                    return emitAsExpression(node);
+                case 201:
                     return emitNonNullExpression(node);
-                case 242:
+                case 246:
                     return emitJsxElement(node);
-                case 243:
+                case 247:
                     return emitJsxSelfClosingElement(node);
-                case 288:
+                case 293:
                     return emitPartiallyEmittedExpression(node);
             }
         }
@@ -46336,7 +46920,7 @@ var ts;
         function emitAccessorDeclaration(node) {
             emitDecorators(node, node.decorators);
             emitModifiers(node, node.modifiers);
-            write(node.kind === 150 ? "get " : "set ");
+            write(node.kind === 151 ? "get " : "set ");
             emit(node.name);
             emitSignatureAndBody(node, emitSignatureHead);
         }
@@ -46421,6 +47005,39 @@ var ts;
         function emitThisType() {
             write("this");
         }
+        function emitTypeOperator(node) {
+            writeTokenText(node.operator);
+            write(" ");
+            emit(node.type);
+        }
+        function emitIndexedAccessType(node) {
+            emit(node.objectType);
+            write("[");
+            emit(node.indexType);
+            write("]");
+        }
+        function emitMappedType(node) {
+            write("{");
+            writeLine();
+            increaseIndent();
+            if (node.readonlyToken) {
+                write("readonly ");
+            }
+            write("[");
+            emit(node.typeParameter.name);
+            write(" in ");
+            emit(node.typeParameter.constraint);
+            write("]");
+            if (node.questionToken) {
+                write("?");
+            }
+            write(": ");
+            emit(node.type);
+            write(";");
+            writeLine();
+            decreaseIndent();
+            write("}");
+        }
         function emitLiteralType(node) {
             emitExpression(node.literal);
         }
@@ -46584,7 +47201,7 @@ var ts;
         }
         function shouldEmitWhitespaceBeforeOperand(node) {
             var operand = node.operand;
-            return operand.kind === 186
+            return operand.kind === 190
                 && ((node.operator === 36 && (operand.operator === 36 || operand.operator === 42))
                     || (node.operator === 37 && (operand.operator === 37 || operand.operator === 43)));
         }
@@ -46628,7 +47245,7 @@ var ts;
             write(node.asteriskToken ? "yield*" : "yield");
             emitExpressionWithPrefix(" ", node.expression);
         }
-        function emitSpreadElementExpression(node) {
+        function emitSpreadExpression(node) {
             write("...");
             emitExpression(node.expression);
         }
@@ -46696,7 +47313,7 @@ var ts;
             if (node.elseStatement) {
                 writeLine();
                 writeToken(81, node.thenStatement.end, node);
-                if (node.elseStatement.kind === 204) {
+                if (node.elseStatement.kind === 208) {
                     write(" ");
                     emit(node.elseStatement);
                 }
@@ -46758,7 +47375,7 @@ var ts;
         }
         function emitForBinding(node) {
             if (node !== undefined) {
-                if (node.kind === 220) {
+                if (node.kind === 224) {
                     emit(node);
                 }
                 else {
@@ -46987,7 +47604,7 @@ var ts;
             write(node.flags & 16 ? "namespace " : "module ");
             emit(node.name);
             var body = node.body;
-            while (body.kind === 226) {
+            while (body.kind === 230) {
                 write(".");
                 emit(body.name);
                 body = body.body;
@@ -47206,6 +47823,12 @@ var ts;
                 emitExpression(node.objectAssignmentInitializer);
             }
         }
+        function emitSpreadAssignment(node) {
+            if (node.expression) {
+                write("...");
+                emitExpression(node.expression);
+            }
+        }
         function emitEnumMember(node) {
             emit(node.name);
             emitExpressionWithPrefix(" = ", node.initializer);
@@ -47275,10 +47898,17 @@ var ts;
                 extendsEmitted = true;
                 helpersEmitted = true;
             }
-            if (compilerOptions.jsx !== 1 && !assignEmitted && (node.flags & 16384)) {
+            if ((languageVersion < 5 || currentSourceFile.scriptKind === 2 || currentSourceFile.scriptKind === 4) &&
+                compilerOptions.jsx !== 1 &&
+                !assignEmitted &&
+                node.flags & 16384) {
                 writeLines(assignHelper);
                 assignEmitted = true;
             }
+            if (languageVersion < 5 && !restEmitted && node.flags & 32768) {
+                writeLines(restHelper);
+                restEmitted = true;
+            }
             if (!decorateEmitted && node.flags & 2048) {
                 writeLines(decorateHelper);
                 if (compilerOptions.emitDecoratorMetadata) {
@@ -47601,7 +48231,7 @@ var ts;
                 && !ts.rangeEndIsOnSameLineAsRangeStart(node1, node2, currentSourceFile);
         }
         function skipSynthesizedParentheses(node) {
-            while (node.kind === 179 && ts.nodeIsSynthesized(node)) {
+            while (node.kind === 183 && ts.nodeIsSynthesized(node)) {
                 node = node.expression;
             }
             return node;
@@ -47658,21 +48288,21 @@ var ts;
         }
         function makeTempVariableName(flags) {
             if (flags && !(tempFlags & flags)) {
-                var name_41 = flags === 268435456 ? "_i" : "_n";
-                if (isUniqueName(name_41)) {
+                var name_38 = flags === 268435456 ? "_i" : "_n";
+                if (isUniqueName(name_38)) {
                     tempFlags |= flags;
-                    return name_41;
+                    return name_38;
                 }
             }
             while (true) {
                 var count = tempFlags & 268435455;
                 tempFlags++;
                 if (count !== 8 && count !== 13) {
-                    var name_42 = count < 26
+                    var name_39 = count < 26
                         ? "_" + String.fromCharCode(97 + count)
                         : "_" + (count - 26);
-                    if (isUniqueName(name_42)) {
-                        return name_42;
+                    if (isUniqueName(name_39)) {
+                        return name_39;
                     }
                 }
             }
@@ -47710,17 +48340,17 @@ var ts;
             switch (node.kind) {
                 case 70:
                     return makeUniqueName(getTextOfNode(node));
-                case 226:
-                case 225:
+                case 230:
+                case 229:
                     return generateNameForModuleOrEnum(node);
-                case 231:
-                case 237:
+                case 235:
+                case 241:
                     return generateNameForImportOrExportDeclaration(node);
-                case 221:
-                case 222:
-                case 236:
+                case 225:
+                case 226:
+                case 240:
                     return generateNameForExportDefault();
-                case 193:
+                case 197:
                     return generateNameForClassExpression();
                 default:
                     return makeTempVariableName(0);
@@ -47790,72 +48420,10 @@ var ts;
         }
     }
     ts.emitFiles = emitFiles;
-    var ListFormat;
-    (function (ListFormat) {
-        ListFormat[ListFormat["None"] = 0] = "None";
-        ListFormat[ListFormat["SingleLine"] = 0] = "SingleLine";
-        ListFormat[ListFormat["MultiLine"] = 1] = "MultiLine";
-        ListFormat[ListFormat["PreserveLines"] = 2] = "PreserveLines";
-        ListFormat[ListFormat["LinesMask"] = 3] = "LinesMask";
-        ListFormat[ListFormat["NotDelimited"] = 0] = "NotDelimited";
-        ListFormat[ListFormat["BarDelimited"] = 4] = "BarDelimited";
-        ListFormat[ListFormat["AmpersandDelimited"] = 8] = "AmpersandDelimited";
-        ListFormat[ListFormat["CommaDelimited"] = 16] = "CommaDelimited";
-        ListFormat[ListFormat["DelimitersMask"] = 28] = "DelimitersMask";
-        ListFormat[ListFormat["AllowTrailingComma"] = 32] = "AllowTrailingComma";
-        ListFormat[ListFormat["Indented"] = 64] = "Indented";
-        ListFormat[ListFormat["SpaceBetweenBraces"] = 128] = "SpaceBetweenBraces";
-        ListFormat[ListFormat["SpaceBetweenSiblings"] = 256] = "SpaceBetweenSiblings";
-        ListFormat[ListFormat["Braces"] = 512] = "Braces";
-        ListFormat[ListFormat["Parenthesis"] = 1024] = "Parenthesis";
-        ListFormat[ListFormat["AngleBrackets"] = 2048] = "AngleBrackets";
-        ListFormat[ListFormat["SquareBrackets"] = 4096] = "SquareBrackets";
-        ListFormat[ListFormat["BracketsMask"] = 7680] = "BracketsMask";
-        ListFormat[ListFormat["OptionalIfUndefined"] = 8192] = "OptionalIfUndefined";
-        ListFormat[ListFormat["OptionalIfEmpty"] = 16384] = "OptionalIfEmpty";
-        ListFormat[ListFormat["Optional"] = 24576] = "Optional";
-        ListFormat[ListFormat["PreferNewLine"] = 32768] = "PreferNewLine";
-        ListFormat[ListFormat["NoTrailingNewLine"] = 65536] = "NoTrailingNewLine";
-        ListFormat[ListFormat["NoInterveningComments"] = 131072] = "NoInterveningComments";
-        ListFormat[ListFormat["Modifiers"] = 256] = "Modifiers";
-        ListFormat[ListFormat["HeritageClauses"] = 256] = "HeritageClauses";
-        ListFormat[ListFormat["TypeLiteralMembers"] = 65] = "TypeLiteralMembers";
-        ListFormat[ListFormat["TupleTypeElements"] = 336] = "TupleTypeElements";
-        ListFormat[ListFormat["UnionTypeConstituents"] = 260] = "UnionTypeConstituents";
-        ListFormat[ListFormat["IntersectionTypeConstituents"] = 264] = "IntersectionTypeConstituents";
-        ListFormat[ListFormat["ObjectBindingPatternElements"] = 432] = "ObjectBindingPatternElements";
-        ListFormat[ListFormat["ArrayBindingPatternElements"] = 304] = "ArrayBindingPatternElements";
-        ListFormat[ListFormat["ObjectLiteralExpressionProperties"] = 978] = "ObjectLiteralExpressionProperties";
-        ListFormat[ListFormat["ArrayLiteralExpressionElements"] = 4466] = "ArrayLiteralExpressionElements";
-        ListFormat[ListFormat["CallExpressionArguments"] = 1296] = "CallExpressionArguments";
-        ListFormat[ListFormat["NewExpressionArguments"] = 9488] = "NewExpressionArguments";
-        ListFormat[ListFormat["TemplateExpressionSpans"] = 131072] = "TemplateExpressionSpans";
-        ListFormat[ListFormat["SingleLineBlockStatements"] = 384] = "SingleLineBlockStatements";
-        ListFormat[ListFormat["MultiLineBlockStatements"] = 65] = "MultiLineBlockStatements";
-        ListFormat[ListFormat["VariableDeclarationList"] = 272] = "VariableDeclarationList";
-        ListFormat[ListFormat["SingleLineFunctionBodyStatements"] = 384] = "SingleLineFunctionBodyStatements";
-        ListFormat[ListFormat["MultiLineFunctionBodyStatements"] = 1] = "MultiLineFunctionBodyStatements";
-        ListFormat[ListFormat["ClassHeritageClauses"] = 256] = "ClassHeritageClauses";
-        ListFormat[ListFormat["ClassMembers"] = 65] = "ClassMembers";
-        ListFormat[ListFormat["InterfaceMembers"] = 65] = "InterfaceMembers";
-        ListFormat[ListFormat["EnumMembers"] = 81] = "EnumMembers";
-        ListFormat[ListFormat["CaseBlockClauses"] = 65] = "CaseBlockClauses";
-        ListFormat[ListFormat["NamedImportsOrExportsElements"] = 432] = "NamedImportsOrExportsElements";
-        ListFormat[ListFormat["JsxElementChildren"] = 131072] = "JsxElementChildren";
-        ListFormat[ListFormat["JsxElementAttributes"] = 131328] = "JsxElementAttributes";
-        ListFormat[ListFormat["CaseOrDefaultClauseStatements"] = 81985] = "CaseOrDefaultClauseStatements";
-        ListFormat[ListFormat["HeritageClauseTypes"] = 272] = "HeritageClauseTypes";
-        ListFormat[ListFormat["SourceFileStatements"] = 65537] = "SourceFileStatements";
-        ListFormat[ListFormat["Decorators"] = 24577] = "Decorators";
-        ListFormat[ListFormat["TypeArguments"] = 26960] = "TypeArguments";
-        ListFormat[ListFormat["TypeParameters"] = 26960] = "TypeParameters";
-        ListFormat[ListFormat["Parameters"] = 1360] = "Parameters";
-        ListFormat[ListFormat["IndexSignatureParameters"] = 4432] = "IndexSignatureParameters";
-    })(ListFormat || (ListFormat = {}));
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    ts.version = "2.1.0";
+    ts.version = "2.2.0";
     var emptyArray = [];
     function findConfigFile(searchPath, fileExists, configName) {
         if (configName === void 0) { configName = "tsconfig.json"; }
@@ -48070,11 +48638,11 @@ var ts;
         }
         var resolutions = [];
         var cache = ts.createMap();
-        for (var _i = 0, names_2 = names; _i < names_2.length; _i++) {
-            var name_43 = names_2[_i];
-            var result = name_43 in cache
-                ? cache[name_43]
-                : cache[name_43] = loader(name_43, containingFile);
+        for (var _i = 0, names_1 = names; _i < names_1.length; _i++) {
+            var name_40 = names_1[_i];
+            var result = name_40 in cache
+                ? cache[name_40]
+                : cache[name_40] = loader(name_40, containingFile);
             resolutions.push(result);
         }
         return resolutions;
@@ -48088,7 +48656,7 @@ var ts;
         var classifiableNames;
         var resolvedTypeReferenceDirectives = ts.createMap();
         var fileProcessingDiagnostics = ts.createDiagnosticCollection();
-        var maxNodeModulesJsDepth = typeof options.maxNodeModuleJsDepth === "number" ? options.maxNodeModuleJsDepth : 0;
+        var maxNodeModuleJsDepth = typeof options.maxNodeModuleJsDepth === "number" ? options.maxNodeModuleJsDepth : 0;
         var currentNodeModulesDepth = 0;
         var modulesWithElidedImports = ts.createMap();
         var sourceFilesFoundSearchingNodeModules = ts.createMap();
@@ -48101,7 +48669,14 @@ var ts;
         var hasEmitBlockingDiagnostics = ts.createFileMap(getCanonicalFileName);
         var resolveModuleNamesWorker;
         if (host.resolveModuleNames) {
-            resolveModuleNamesWorker = function (moduleNames, containingFile) { return host.resolveModuleNames(moduleNames, containingFile); };
+            resolveModuleNamesWorker = function (moduleNames, containingFile) { return host.resolveModuleNames(moduleNames, containingFile).map(function (resolved) {
+                if (!resolved || resolved.extension !== undefined) {
+                    return resolved;
+                }
+                var withExtension = ts.clone(resolved);
+                withExtension.extension = ts.extensionFromPath(resolved.resolvedFileName);
+                return withExtension;
+            }); };
         }
         else {
             var loader_1 = function (moduleName, containingFile) { return ts.resolveModuleName(moduleName, containingFile, options, host).resolvedModule; };
@@ -48163,6 +48738,7 @@ var ts;
             getTypeCount: function () { return getDiagnosticsProducingTypeChecker().getTypeCount(); },
             getFileProcessingDiagnostics: function () { return fileProcessingDiagnostics; },
             getResolvedTypeReferenceDirectives: function () { return resolvedTypeReferenceDirectives; },
+            isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
             dropDiagnosticsProducingTypeChecker: dropDiagnosticsProducingTypeChecker
         };
         verifyCompilerOptions();
@@ -48170,12 +48746,13 @@ var ts;
         ts.performance.measure("Program", "beforeProgram", "afterProgram");
         return program;
         function getCommonSourceDirectory() {
-            if (typeof commonSourceDirectory === "undefined") {
-                if (options.rootDir && checkSourceFilesBelongToPath(files, options.rootDir)) {
+            if (commonSourceDirectory === undefined) {
+                var emittedFiles = ts.filterSourceFilesInDirectory(files, isSourceFileFromExternalLibrary);
+                if (options.rootDir && checkSourceFilesBelongToPath(emittedFiles, options.rootDir)) {
                     commonSourceDirectory = ts.getNormalizedAbsolutePath(options.rootDir, currentDirectory);
                 }
                 else {
-                    commonSourceDirectory = computeCommonSourceDirectory(files);
+                    commonSourceDirectory = computeCommonSourceDirectory(emittedFiles);
                 }
                 if (commonSourceDirectory && commonSourceDirectory[commonSourceDirectory.length - 1] !== ts.directorySeparator) {
                     commonSourceDirectory += ts.directorySeparator;
@@ -48194,26 +48771,85 @@ var ts;
             }
             return classifiableNames;
         }
+        function resolveModuleNamesReusingOldState(moduleNames, containingFile, file, oldProgramState) {
+            if (!oldProgramState && !file.ambientModuleNames.length) {
+                return resolveModuleNamesWorker(moduleNames, containingFile);
+            }
+            var unknownModuleNames;
+            var result;
+            var predictedToResolveToAmbientModuleMarker = {};
+            for (var i = 0; i < moduleNames.length; i++) {
+                var moduleName = moduleNames[i];
+                var isKnownToResolveToAmbientModule = false;
+                if (ts.contains(file.ambientModuleNames, moduleName)) {
+                    isKnownToResolveToAmbientModule = true;
+                    if (ts.isTraceEnabled(options, host)) {
+                        ts.trace(host, ts.Diagnostics.Module_0_was_resolved_as_locally_declared_ambient_module_in_file_1, moduleName, containingFile);
+                    }
+                }
+                else {
+                    isKnownToResolveToAmbientModule = checkModuleNameResolvedToAmbientModuleInNonModifiedFile(moduleName, oldProgramState);
+                }
+                if (isKnownToResolveToAmbientModule) {
+                    if (!unknownModuleNames) {
+                        result = new Array(moduleNames.length);
+                        unknownModuleNames = moduleNames.slice(0, i);
+                    }
+                    result[i] = predictedToResolveToAmbientModuleMarker;
+                }
+                else if (unknownModuleNames) {
+                    unknownModuleNames.push(moduleName);
+                }
+            }
+            if (!unknownModuleNames) {
+                return resolveModuleNamesWorker(moduleNames, containingFile);
+            }
+            var resolutions = unknownModuleNames.length
+                ? resolveModuleNamesWorker(unknownModuleNames, containingFile)
+                : emptyArray;
+            var j = 0;
+            for (var i = 0; i < result.length; i++) {
+                if (result[i] == predictedToResolveToAmbientModuleMarker) {
+                    result[i] = undefined;
+                }
+                else {
+                    result[i] = resolutions[j];
+                    j++;
+                }
+            }
+            ts.Debug.assert(j === resolutions.length);
+            return result;
+            function checkModuleNameResolvedToAmbientModuleInNonModifiedFile(moduleName, oldProgramState) {
+                if (!oldProgramState) {
+                    return false;
+                }
+                var resolutionToFile = ts.getResolvedModule(oldProgramState.file, moduleName);
+                if (resolutionToFile) {
+                    return false;
+                }
+                var ambientModule = oldProgram.getTypeChecker().tryFindAmbientModuleWithoutAugmentations(moduleName);
+                if (!(ambientModule && ambientModule.declarations)) {
+                    return false;
+                }
+                var firstUnmodifiedFile = ts.forEach(ambientModule.declarations, function (d) {
+                    var f = ts.getSourceFileOfNode(d);
+                    return !ts.contains(oldProgramState.modifiedFilePaths, f.path) && f;
+                });
+                if (!firstUnmodifiedFile) {
+                    return false;
+                }
+                if (ts.isTraceEnabled(options, host)) {
+                    ts.trace(host, ts.Diagnostics.Module_0_was_resolved_as_ambient_module_declared_in_1_since_this_file_was_not_modified, moduleName, firstUnmodifiedFile.fileName);
+                }
+                return true;
+            }
+        }
         function tryReuseStructureFromOldProgram() {
             if (!oldProgram) {
                 return false;
             }
             var oldOptions = oldProgram.getCompilerOptions();
-            if ((oldOptions.module !== options.module) ||
-                (oldOptions.moduleResolution !== options.moduleResolution) ||
-                (oldOptions.noResolve !== options.noResolve) ||
-                (oldOptions.target !== options.target) ||
-                (oldOptions.noLib !== options.noLib) ||
-                (oldOptions.jsx !== options.jsx) ||
-                (oldOptions.allowJs !== options.allowJs) ||
-                (oldOptions.rootDir !== options.rootDir) ||
-                (oldOptions.configFilePath !== options.configFilePath) ||
-                (oldOptions.baseUrl !== options.baseUrl) ||
-                (oldOptions.maxNodeModuleJsDepth !== options.maxNodeModuleJsDepth) ||
-                !ts.arrayIsEqualTo(oldOptions.lib, options.lib) ||
-                !ts.arrayIsEqualTo(oldOptions.typeRoots, oldOptions.typeRoots) ||
-                !ts.arrayIsEqualTo(oldOptions.rootDirs, options.rootDirs) ||
-                !ts.equalOwnProperties(oldOptions.paths, options.paths)) {
+            if (ts.changesAffectModuleResolution(oldOptions, options)) {
                 return false;
             }
             ts.Debug.assert(!oldProgram.structureIsReused);
@@ -48254,40 +48890,44 @@ var ts;
                     if (!ts.arrayIsEqualTo(oldSourceFile.typeReferenceDirectives, newSourceFile.typeReferenceDirectives, fileReferenceIsEqualTo)) {
                         return false;
                     }
-                    var newSourceFilePath = ts.getNormalizedAbsolutePath(newSourceFile.fileName, currentDirectory);
-                    if (resolveModuleNamesWorker) {
-                        var moduleNames = ts.map(ts.concatenate(newSourceFile.imports, newSourceFile.moduleAugmentations), getTextOfLiteral);
-                        var resolutions = resolveModuleNamesWorker(moduleNames, newSourceFilePath);
-                        var resolutionsChanged = ts.hasChangesInResolutions(moduleNames, resolutions, oldSourceFile.resolvedModules, ts.moduleResolutionIsEqualTo);
-                        if (resolutionsChanged) {
-                            return false;
-                        }
-                    }
-                    if (resolveTypeReferenceDirectiveNamesWorker) {
-                        var typesReferenceDirectives = ts.map(newSourceFile.typeReferenceDirectives, function (x) { return x.fileName; });
-                        var resolutions = resolveTypeReferenceDirectiveNamesWorker(typesReferenceDirectives, newSourceFilePath);
-                        var resolutionsChanged = ts.hasChangesInResolutions(typesReferenceDirectives, resolutions, oldSourceFile.resolvedTypeReferenceDirectiveNames, ts.typeDirectiveIsEqualTo);
-                        if (resolutionsChanged) {
-                            return false;
-                        }
-                    }
-                    newSourceFile.resolvedModules = oldSourceFile.resolvedModules;
-                    newSourceFile.resolvedTypeReferenceDirectiveNames = oldSourceFile.resolvedTypeReferenceDirectiveNames;
-                    modifiedSourceFiles.push(newSourceFile);
+                    modifiedSourceFiles.push({ oldFile: oldSourceFile, newFile: newSourceFile });
                 }
                 else {
                     newSourceFile = oldSourceFile;
                 }
                 newSourceFiles.push(newSourceFile);
             }
+            var modifiedFilePaths = modifiedSourceFiles.map(function (f) { return f.newFile.path; });
+            for (var _b = 0, modifiedSourceFiles_1 = modifiedSourceFiles; _b < modifiedSourceFiles_1.length; _b++) {
+                var _c = modifiedSourceFiles_1[_b], oldSourceFile = _c.oldFile, newSourceFile = _c.newFile;
+                var newSourceFilePath = ts.getNormalizedAbsolutePath(newSourceFile.fileName, currentDirectory);
+                if (resolveModuleNamesWorker) {
+                    var moduleNames = ts.map(ts.concatenate(newSourceFile.imports, newSourceFile.moduleAugmentations), getTextOfLiteral);
+                    var resolutions = resolveModuleNamesReusingOldState(moduleNames, newSourceFilePath, newSourceFile, { file: oldSourceFile, program: oldProgram, modifiedFilePaths: modifiedFilePaths });
+                    var resolutionsChanged = ts.hasChangesInResolutions(moduleNames, resolutions, oldSourceFile.resolvedModules, ts.moduleResolutionIsEqualTo);
+                    if (resolutionsChanged) {
+                        return false;
+                    }
+                }
+                if (resolveTypeReferenceDirectiveNamesWorker) {
+                    var typesReferenceDirectives = ts.map(newSourceFile.typeReferenceDirectives, function (x) { return x.fileName; });
+                    var resolutions = resolveTypeReferenceDirectiveNamesWorker(typesReferenceDirectives, newSourceFilePath);
+                    var resolutionsChanged = ts.hasChangesInResolutions(typesReferenceDirectives, resolutions, oldSourceFile.resolvedTypeReferenceDirectiveNames, ts.typeDirectiveIsEqualTo);
+                    if (resolutionsChanged) {
+                        return false;
+                    }
+                }
+                newSourceFile.resolvedModules = oldSourceFile.resolvedModules;
+                newSourceFile.resolvedTypeReferenceDirectiveNames = oldSourceFile.resolvedTypeReferenceDirectiveNames;
+            }
             for (var i = 0, len = newSourceFiles.length; i < len; i++) {
                 filesByName.set(filePaths[i], newSourceFiles[i]);
             }
             files = newSourceFiles;
             fileProcessingDiagnostics = oldProgram.getFileProcessingDiagnostics();
-            for (var _b = 0, modifiedSourceFiles_1 = modifiedSourceFiles; _b < modifiedSourceFiles_1.length; _b++) {
-                var modifiedFile = modifiedSourceFiles_1[_b];
-                fileProcessingDiagnostics.reattachFileDiagnostics(modifiedFile);
+            for (var _d = 0, modifiedSourceFiles_2 = modifiedSourceFiles; _d < modifiedSourceFiles_2.length; _d++) {
+                var modifiedFile = modifiedSourceFiles_2[_d];
+                fileProcessingDiagnostics.reattachFileDiagnostics(modifiedFile.newFile);
             }
             resolvedTypeReferenceDirectives = oldProgram.getResolvedTypeReferenceDirectives();
             oldProgram.structureIsReused = true;
@@ -48303,11 +48943,14 @@ var ts;
                 getSourceFile: program.getSourceFile,
                 getSourceFileByPath: program.getSourceFileByPath,
                 getSourceFiles: program.getSourceFiles,
-                isSourceFileFromExternalLibrary: function (file) { return !!sourceFilesFoundSearchingNodeModules[file.path]; },
+                isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
                 writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }),
                 isEmitBlocked: isEmitBlocked,
             };
         }
+        function isSourceFileFromExternalLibrary(file) {
+            return sourceFilesFoundSearchingNodeModules[file.path];
+        }
         function getDiagnosticsProducingTypeChecker() {
             return diagnosticsProducingTypeChecker || (diagnosticsProducingTypeChecker = ts.createTypeChecker(program, true));
         }
@@ -48384,6 +49027,12 @@ var ts;
             }
         }
         function getSyntacticDiagnosticsForFile(sourceFile) {
+            if (ts.isSourceFileJavaScript(sourceFile)) {
+                if (!sourceFile.additionalSyntacticDiagnostics) {
+                    sourceFile.additionalSyntacticDiagnostics = getJavaScriptSyntacticDiagnosticsForFile(sourceFile);
+                }
+                return ts.concatenate(sourceFile.additionalSyntacticDiagnostics, sourceFile.parseDiagnostics);
+            }
             return sourceFile.parseDiagnostics;
         }
         function runWithCancellationToken(func) {
@@ -48403,183 +49052,170 @@ var ts;
                 var typeChecker = getDiagnosticsProducingTypeChecker();
                 ts.Debug.assert(!!sourceFile.bindDiagnostics);
                 var bindDiagnostics = sourceFile.bindDiagnostics;
-                var checkDiagnostics = ts.isSourceFileJavaScript(sourceFile) ?
-                    getJavaScriptSemanticDiagnosticsForFile(sourceFile) :
-                    typeChecker.getDiagnostics(sourceFile, cancellationToken);
+                var checkDiagnostics = ts.isSourceFileJavaScript(sourceFile) ? [] : typeChecker.getDiagnostics(sourceFile, cancellationToken);
                 var fileProcessingDiagnosticsInFile = fileProcessingDiagnostics.getDiagnostics(sourceFile.fileName);
                 var programDiagnosticsInFile = programDiagnostics.getDiagnostics(sourceFile.fileName);
                 return bindDiagnostics.concat(checkDiagnostics, fileProcessingDiagnosticsInFile, programDiagnosticsInFile);
             });
         }
-        function getJavaScriptSemanticDiagnosticsForFile(sourceFile) {
+        function getJavaScriptSyntacticDiagnosticsForFile(sourceFile) {
             return runWithCancellationToken(function () {
                 var diagnostics = [];
+                var parent = sourceFile;
                 walk(sourceFile);
                 return diagnostics;
                 function walk(node) {
-                    if (!node) {
-                        return false;
-                    }
-                    switch (node.kind) {
-                        case 230:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.import_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 236:
-                            if (node.isExportEquals) {
-                                diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.export_can_only_be_used_in_a_ts_file));
-                                return true;
-                            }
-                            break;
-                        case 222:
-                            var classDeclaration = node;
-                            if (checkModifiers(classDeclaration.modifiers) ||
-                                checkTypeParameters(classDeclaration.typeParameters)) {
-                                return true;
-                            }
-                            break;
-                        case 251:
-                            var heritageClause = node;
-                            if (heritageClause.token === 107) {
-                                diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.implements_clauses_can_only_be_used_in_a_ts_file));
-                                return true;
-                            }
-                            break;
-                        case 223:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.interface_declarations_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 226:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.module_declarations_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 224:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.type_aliases_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 148:
+                    switch (parent.kind) {
+                        case 144:
                         case 147:
+                            if (parent.questionToken === node) {
+                                diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, "?"));
+                                return;
+                            }
                         case 149:
+                        case 148:
                         case 150:
                         case 151:
-                        case 180:
-                        case 221:
-                        case 181:
-                        case 221:
-                            var functionDeclaration = node;
-                            if (checkModifiers(functionDeclaration.modifiers) ||
-                                checkTypeParameters(functionDeclaration.typeParameters) ||
-                                checkTypeAnnotation(functionDeclaration.type)) {
-                                return true;
+                        case 152:
+                        case 184:
+                        case 225:
+                        case 185:
+                        case 225:
+                        case 223:
+                            if (parent.type === node) {
+                                diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.types_can_only_be_used_in_a_ts_file));
+                                return;
+                            }
+                    }
+                    switch (node.kind) {
+                        case 234:
+                            diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.import_can_only_be_used_in_a_ts_file));
+                            return;
+                        case 240:
+                            if (node.isExportEquals) {
+                                diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.export_can_only_be_used_in_a_ts_file));
+                                return;
                             }
                             break;
-                        case 201:
-                            var variableStatement = node;
-                            if (checkModifiers(variableStatement.modifiers)) {
-                                return true;
+                        case 255:
+                            var heritageClause = node;
+                            if (heritageClause.token === 107) {
+                                diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.implements_clauses_can_only_be_used_in_a_ts_file));
+                                return;
                             }
                             break;
-                        case 219:
-                            var variableDeclaration = node;
-                            if (checkTypeAnnotation(variableDeclaration.type)) {
-                                return true;
+                        case 227:
+                            diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.interface_declarations_can_only_be_used_in_a_ts_file));
+                            return;
+                        case 230:
+                            diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.module_declarations_can_only_be_used_in_a_ts_file));
+                            return;
+                        case 228:
+                            diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.type_aliases_can_only_be_used_in_a_ts_file));
+                            return;
+                        case 229:
+                            diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.enum_declarations_can_only_be_used_in_a_ts_file));
+                            return;
+                        case 182:
+                            var typeAssertionExpression = node;
+                            diagnostics.push(createDiagnosticForNode(typeAssertionExpression.type, ts.Diagnostics.type_assertion_expressions_can_only_be_used_in_a_ts_file));
+                            return;
+                    }
+                    var prevParent = parent;
+                    parent = node;
+                    ts.forEachChild(node, walk, walkArray);
+                    parent = prevParent;
+                }
+                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));
+                    }
+                    switch (parent.kind) {
+                        case 226:
+                        case 149:
+                        case 148:
+                        case 150:
+                        case 151:
+                        case 152:
+                        case 184:
+                        case 225:
+                        case 185:
+                        case 225:
+                            if (nodes === parent.typeParameters) {
+                                diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.type_parameter_declarations_can_only_be_used_in_a_ts_file));
+                                return;
+                            }
+                        case 205:
+                            if (nodes === parent.modifiers) {
+                                return checkModifiers(nodes, parent.kind === 205);
                             }
                             break;
-                        case 175:
-                        case 176:
-                            var expression = node;
-                            if (expression.typeArguments && expression.typeArguments.length > 0) {
-                                var start = expression.typeArguments.pos;
-                                diagnostics.push(ts.createFileDiagnostic(sourceFile, start, expression.typeArguments.end - start, ts.Diagnostics.type_arguments_can_only_be_used_in_a_ts_file));
-                                return true;
-                            }
-                            break;
-                        case 143:
-                            var parameter = node;
-                            if (parameter.modifiers) {
-                                var start = parameter.modifiers.pos;
-                                diagnostics.push(ts.createFileDiagnostic(sourceFile, start, parameter.modifiers.end - start, ts.Diagnostics.parameter_modifiers_can_only_be_used_in_a_ts_file));
-                                return true;
-                            }
-                            if (parameter.questionToken) {
-                                diagnostics.push(ts.createDiagnosticForNode(parameter.questionToken, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, "?"));
-                                return true;
-                            }
-                            if (parameter.type) {
-                                diagnostics.push(ts.createDiagnosticForNode(parameter.type, ts.Diagnostics.types_can_only_be_used_in_a_ts_file));
-                                return true;
-                            }
-                            break;
-                        case 146:
-                            var propertyDeclaration = node;
-                            if (propertyDeclaration.modifiers) {
-                                for (var _i = 0, _a = propertyDeclaration.modifiers; _i < _a.length; _i++) {
+                        case 147:
+                            if (nodes === parent.modifiers) {
+                                for (var _i = 0, _a = nodes; _i < _a.length; _i++) {
                                     var modifier = _a[_i];
                                     if (modifier.kind !== 114) {
-                                        diagnostics.push(ts.createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
-                                        return true;
+                                        diagnostics.push(createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
                                     }
                                 }
-                            }
-                            if (checkTypeAnnotation(node.type)) {
-                                return true;
+                                return;
                             }
                             break;
-                        case 225:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.enum_declarations_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 178:
-                            var typeAssertionExpression = node;
-                            diagnostics.push(ts.createDiagnosticForNode(typeAssertionExpression.type, ts.Diagnostics.type_assertion_expressions_can_only_be_used_in_a_ts_file));
-                            return true;
                         case 144:
-                            if (!options.experimentalDecorators) {
-                                diagnostics.push(ts.createDiagnosticForNode(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));
+                            if (nodes === parent.modifiers) {
+                                diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.parameter_modifiers_can_only_be_used_in_a_ts_file));
+                                return;
                             }
-                            return true;
-                    }
-                    return ts.forEachChild(node, walk);
-                }
-                function checkTypeParameters(typeParameters) {
-                    if (typeParameters) {
-                        var start = typeParameters.pos;
-                        diagnostics.push(ts.createFileDiagnostic(sourceFile, start, typeParameters.end - start, ts.Diagnostics.type_parameter_declarations_can_only_be_used_in_a_ts_file));
-                        return true;
-                    }
-                    return false;
-                }
-                function checkTypeAnnotation(type) {
-                    if (type) {
-                        diagnostics.push(ts.createDiagnosticForNode(type, ts.Diagnostics.types_can_only_be_used_in_a_ts_file));
-                        return true;
-                    }
-                    return false;
-                }
-                function checkModifiers(modifiers) {
-                    if (modifiers) {
-                        for (var _i = 0, modifiers_1 = modifiers; _i < modifiers_1.length; _i++) {
-                            var modifier = modifiers_1[_i];
-                            switch (modifier.kind) {
-                                case 113:
-                                case 111:
-                                case 112:
-                                case 129:
-                                case 123:
-                                    diagnostics.push(ts.createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
-                                    return true;
-                                case 114:
-                                case 83:
-                                case 75:
-                                case 78:
-                                case 116:
+                            break;
+                        case 179:
+                        case 180:
+                        case 199:
+                            if (nodes === parent.typeArguments) {
+                                diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.type_arguments_can_only_be_used_in_a_ts_file));
+                                return;
                             }
+                            break;
+                    }
+                    for (var _b = 0, nodes_4 = nodes; _b < nodes_4.length; _b++) {
+                        var node = nodes_4[_b];
+                        walk(node);
+                    }
+                }
+                function checkModifiers(modifiers, isConstValid) {
+                    for (var _i = 0, modifiers_1 = modifiers; _i < modifiers_1.length; _i++) {
+                        var modifier = modifiers_1[_i];
+                        switch (modifier.kind) {
+                            case 75:
+                                if (isConstValid) {
+                                    continue;
+                                }
+                            case 113:
+                            case 111:
+                            case 112:
+                            case 130:
+                            case 123:
+                            case 116:
+                                diagnostics.push(createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
+                                break;
+                            case 114:
+                            case 83:
+                            case 78:
                         }
                     }
-                    return false;
+                }
+                function createDiagnosticForNodeArray(nodes, message, arg0, arg1, arg2) {
+                    var start = nodes.pos;
+                    return ts.createFileDiagnostic(sourceFile, start, nodes.end - start, message, arg0, arg1, arg2);
+                }
+                function createDiagnosticForNode(node, message, arg0, arg1, arg2) {
+                    return ts.createDiagnosticForNodeInSourceFile(sourceFile, node, message, arg0, arg1, arg2);
                 }
             });
         }
         function getDeclarationDiagnosticsWorker(sourceFile, cancellationToken) {
             return runWithCancellationToken(function () {
                 var resolver = getDiagnosticsProducingTypeChecker().getEmitResolver(sourceFile, cancellationToken);
-                var writeFile = function () { };
-                return ts.getDeclarationDiagnostics(getEmitHost(writeFile), resolver, sourceFile);
+                return ts.getDeclarationDiagnostics(getEmitHost(ts.noop), resolver, sourceFile);
             });
         }
         function getDeclarationDiagnosticsForFile(sourceFile, cancellationToken) {
@@ -48596,9 +49232,6 @@ var ts;
             ts.addRange(allDiagnostics, getDiagnosticsProducingTypeChecker().getGlobalDiagnostics());
             return ts.sortAndDeduplicateDiagnostics(allDiagnostics);
         }
-        function hasExtension(fileName) {
-            return ts.getBaseFileName(fileName).indexOf(".") >= 0;
-        }
         function processRootFile(fileName, isDefaultLib) {
             processSourceFile(ts.normalizePath(fileName), isDefaultLib);
         }
@@ -48617,14 +49250,18 @@ var ts;
             }
             var isJavaScriptFile = ts.isSourceFileJavaScript(file);
             var isExternalModuleFile = ts.isExternalModule(file);
+            var isDtsFile = ts.isDeclarationFile(file);
             var imports;
             var moduleAugmentations;
+            var ambientModules;
             if (options.importHelpers
                 && (options.isolatedModules || isExternalModuleFile)
                 && !file.isDeclarationFile) {
-                var externalHelpersModuleReference = ts.createNode(9);
+                var externalHelpersModuleReference = ts.createSynthesizedNode(9);
                 externalHelpersModuleReference.text = ts.externalHelpersModuleNameText;
-                externalHelpersModuleReference.parent = file;
+                var importDecl = ts.createSynthesizedNode(235);
+                importDecl.parent = file;
+                externalHelpersModuleReference.parent = importDecl;
                 imports = [externalHelpersModuleReference];
             }
             for (var _i = 0, _a = file.statements; _i < _a.length; _i++) {
@@ -48636,12 +49273,13 @@ var ts;
             }
             file.imports = imports || emptyArray;
             file.moduleAugmentations = moduleAugmentations || emptyArray;
+            file.ambientModuleNames = ambientModules || emptyArray;
             return;
             function collectModuleReferences(node, inAmbientModule) {
                 switch (node.kind) {
-                    case 231:
-                    case 230:
-                    case 237:
+                    case 235:
+                    case 234:
+                    case 241:
                         var moduleNameExpr = ts.getExternalModuleName(node);
                         if (!moduleNameExpr || moduleNameExpr.kind !== 9) {
                             break;
@@ -48653,13 +49291,16 @@ var ts;
                             (imports || (imports = [])).push(moduleNameExpr);
                         }
                         break;
-                    case 226:
+                    case 230:
                         if (ts.isAmbientModule(node) && (inAmbientModule || ts.hasModifier(node, 2) || ts.isDeclarationFile(file))) {
                             var moduleName = node.name;
                             if (isExternalModuleFile || (inAmbientModule && !ts.isExternalModuleNameRelative(moduleName.text))) {
                                 (moduleAugmentations || (moduleAugmentations = [])).push(moduleName);
                             }
                             else if (!inAmbientModule) {
+                                if (isDtsFile) {
+                                    (ambientModules || (ambientModules = [])).push(moduleName.text);
+                                }
                                 var body = node.body;
                                 if (body) {
                                     for (var _i = 0, _a = body.statements; _i < _a.length; _i++) {
@@ -48683,7 +49324,7 @@ var ts;
         function processSourceFile(fileName, isDefaultLib, refFile, refPos, refEnd) {
             var diagnosticArgument;
             var diagnostic;
-            if (hasExtension(fileName)) {
+            if (ts.hasExtension(fileName)) {
                 if (!options.allowNonTsExtensions && !ts.forEach(supportedExtensions, function (extension) { return ts.fileExtensionIs(host.getCanonicalFileName(fileName), extension); })) {
                     diagnostic = ts.Diagnostics.File_0_has_unsupported_extension_The_only_supported_extensions_are_1;
                     diagnosticArgument = [fileName, "'" + supportedExtensions.join("', '") + "'"];
@@ -48744,7 +49385,7 @@ var ts;
                     processImportedModules(file_1);
                 }
                 else if (file_1 && modulesWithElidedImports[file_1.path]) {
-                    if (currentNodeModulesDepth < maxNodeModulesJsDepth) {
+                    if (currentNodeModulesDepth < maxNodeModuleJsDepth) {
                         modulesWithElidedImports[file_1.path] = false;
                         processImportedModules(file_1);
                     }
@@ -48816,9 +49457,11 @@ var ts;
                 }
                 else {
                     if (previousResolution) {
-                        var otherFileText = host.readFile(resolvedTypeReferenceDirective.resolvedFileName);
-                        if (otherFileText !== getSourceFile(previousResolution.resolvedFileName).text) {
-                            fileProcessingDiagnostics.add(createDiagnostic(refFile, refPos, refEnd, ts.Diagnostics.Conflicting_definitions_for_0_found_at_1_and_2_Consider_installing_a_specific_version_of_this_library_to_resolve_the_conflict, typeReferenceDirective, resolvedTypeReferenceDirective.resolvedFileName, previousResolution.resolvedFileName));
+                        if (resolvedTypeReferenceDirective.resolvedFileName !== previousResolution.resolvedFileName) {
+                            var otherFileText = host.readFile(resolvedTypeReferenceDirective.resolvedFileName);
+                            if (otherFileText !== getSourceFile(previousResolution.resolvedFileName).text) {
+                                fileProcessingDiagnostics.add(createDiagnostic(refFile, refPos, refEnd, ts.Diagnostics.Conflicting_definitions_for_0_found_at_1_and_2_Consider_installing_a_specific_version_of_this_library_to_resolve_the_conflict, typeReferenceDirective, resolvedTypeReferenceDirective.resolvedFileName, previousResolution.resolvedFileName));
+                            }
                         }
                         saveResolution = false;
                     }
@@ -48853,23 +49496,31 @@ var ts;
             collectExternalModuleReferences(file);
             if (file.imports.length || file.moduleAugmentations.length) {
                 file.resolvedModules = ts.createMap();
-                var moduleNames = ts.map(ts.concatenate(file.imports, file.moduleAugmentations), getTextOfLiteral);
-                var resolutions = resolveModuleNamesWorker(moduleNames, ts.getNormalizedAbsolutePath(file.fileName, currentDirectory));
+                var nonGlobalAugmentation = ts.filter(file.moduleAugmentations, function (moduleAugmentation) { return moduleAugmentation.kind === 9; });
+                var moduleNames = ts.map(ts.concatenate(file.imports, nonGlobalAugmentation), getTextOfLiteral);
+                var resolutions = resolveModuleNamesReusingOldState(moduleNames, ts.getNormalizedAbsolutePath(file.fileName, currentDirectory), file);
+                ts.Debug.assert(resolutions.length === moduleNames.length);
                 for (var i = 0; i < moduleNames.length; i++) {
                     var resolution = resolutions[i];
                     ts.setResolvedModule(file, moduleNames[i], resolution);
-                    var isFromNodeModulesSearch = resolution && resolution.isExternalLibraryImport;
-                    var isJsFileFromNodeModules = isFromNodeModulesSearch && ts.hasJavaScriptFileExtension(resolution.resolvedFileName);
+                    if (!resolution) {
+                        continue;
+                    }
+                    var isFromNodeModulesSearch = resolution.isExternalLibraryImport;
+                    var isJsFileFromNodeModules = isFromNodeModulesSearch && !ts.extensionIsTypeScript(resolution.extension);
+                    var resolvedFileName = resolution.resolvedFileName;
                     if (isFromNodeModulesSearch) {
                         currentNodeModulesDepth++;
                     }
-                    var elideImport = isJsFileFromNodeModules && currentNodeModulesDepth > maxNodeModulesJsDepth;
-                    var shouldAddFile = resolution && !options.noResolve && i < file.imports.length && !elideImport;
+                    var elideImport = isJsFileFromNodeModules && currentNodeModulesDepth > maxNodeModuleJsDepth;
+                    var shouldAddFile = resolvedFileName && !getResolutionDiagnostic(options, resolution) && !options.noResolve && i < file.imports.length && !elideImport;
                     if (elideImport) {
                         modulesWithElidedImports[file.path] = true;
                     }
                     else if (shouldAddFile) {
-                        findSourceFile(resolution.resolvedFileName, ts.toPath(resolution.resolvedFileName, currentDirectory, getCanonicalFileName), false, file, ts.skipTrivia(file.text, file.imports[i].pos), file.imports[i].end);
+                        var path = ts.toPath(resolvedFileName, currentDirectory, getCanonicalFileName);
+                        var pos = ts.skipTrivia(file.text, file.imports[i].pos);
+                        findSourceFile(resolvedFileName, path, false, file, pos, file.imports[i].end);
                     }
                     if (isFromNodeModulesSearch) {
                         currentNodeModulesDepth--;
@@ -48879,7 +49530,6 @@ var ts;
             else {
                 file.resolvedModules = undefined;
             }
-            return;
         }
         function computeCommonSourceDirectory(sourceFiles) {
             var fileNames = [];
@@ -49033,7 +49683,15 @@ var ts;
                 !options.experimentalDecorators) {
                 programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "emitDecoratorMetadata", "experimentalDecorators"));
             }
-            if (options.reactNamespace && !ts.isIdentifierText(options.reactNamespace, languageVersion)) {
+            if (options.jsxFactory) {
+                if (options.reactNamespace) {
+                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "reactNamespace", "jsxFactory"));
+                }
+                if (!ts.parseIsolatedEntityName(options.jsxFactory, languageVersion)) {
+                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Invalid_value_for_jsxFactory_0_is_not_a_valid_identifier_or_qualified_name, options.jsxFactory));
+                }
+            }
+            else if (options.reactNamespace && !ts.isIdentifierText(options.reactNamespace, languageVersion)) {
                 programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Invalid_value_for_reactNamespace_0_is_not_a_valid_identifier, options.reactNamespace));
             }
             if (!options.noEmit && !options.suppressOutputPathCheck) {
@@ -49048,10 +49706,15 @@ var ts;
                 if (emitFileName) {
                     var emitFilePath = ts.toPath(emitFileName, currentDirectory, getCanonicalFileName);
                     if (filesByName.contains(emitFilePath)) {
-                        createEmitBlockingDiagnostics(emitFileName, ts.Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file);
+                        var chain_1;
+                        if (!options.configFilePath) {
+                            chain_1 = 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_1 = ts.chainDiagnosticMessages(chain_1, ts.Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
+                        blockEmittingOfFile(emitFileName, ts.createCompilerDiagnosticFromMessageChain(chain_1));
                     }
                     if (emitFilesSeen.contains(emitFilePath)) {
-                        createEmitBlockingDiagnostics(emitFileName, ts.Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files);
+                        blockEmittingOfFile(emitFileName, ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files, emitFileName));
                     }
                     else {
                         emitFilesSeen.set(emitFilePath, true);
@@ -49059,12 +49722,33 @@ var ts;
                 }
             }
         }
-        function createEmitBlockingDiagnostics(emitFileName, message) {
+        function blockEmittingOfFile(emitFileName, diag) {
             hasEmitBlockingDiagnostics.set(ts.toPath(emitFileName, currentDirectory, getCanonicalFileName), true);
-            programDiagnostics.add(ts.createCompilerDiagnostic(message, emitFileName));
+            programDiagnostics.add(diag);
         }
     }
     ts.createProgram = createProgram;
+    function getResolutionDiagnostic(options, _a) {
+        var extension = _a.extension;
+        switch (extension) {
+            case ts.Extension.Ts:
+            case ts.Extension.Dts:
+                return undefined;
+            case ts.Extension.Tsx:
+                return needJsx();
+            case ts.Extension.Jsx:
+                return needJsx() || needAllowJs();
+            case ts.Extension.Js:
+                return needAllowJs();
+        }
+        function needJsx() {
+            return options.jsx ? undefined : ts.Diagnostics.Module_0_was_resolved_to_1_but_jsx_is_not_set;
+        }
+        function needAllowJs() {
+            return options.allowJs ? undefined : ts.Diagnostics.Module_0_was_resolved_to_1_but_allowJs_is_not_set;
+        }
+    }
+    ts.getResolutionDiagnostic = getResolutionDiagnostic;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -49138,6 +49822,11 @@ var ts;
             type: "string",
             description: ts.Diagnostics.Specify_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit
         },
+        {
+            name: "jsxFactory",
+            type: "string",
+            description: ts.Diagnostics.Specify_the_JSX_factory_function_to_use_when_targeting_react_JSX_emit_e_g_React_createElement_or_h
+        },
         {
             name: "listFiles",
             type: "boolean",
@@ -49325,6 +50014,7 @@ var ts;
                 "es2015": 2,
                 "es2016": 3,
                 "es2017": 4,
+                "esnext": 5,
             }),
             description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015,
             paramType: ts.Diagnostics.VERSION,
@@ -49481,7 +50171,8 @@ var ts;
                     "es2015.symbol.wellknown": "lib.es2015.symbol.wellknown.d.ts",
                     "es2016.array.include": "lib.es2016.array.include.d.ts",
                     "es2017.object": "lib.es2017.object.d.ts",
-                    "es2017.sharedmemory": "lib.es2017.sharedmemory.d.ts"
+                    "es2017.sharedmemory": "lib.es2017.sharedmemory.d.ts",
+                    "es2017.string": "lib.es2017.string.d.ts",
                 }),
             },
             description: ts.Diagnostics.Specify_library_files_to_be_included_in_the_compilation_Colon
@@ -49626,7 +50317,11 @@ var ts;
                                     i++;
                                     break;
                                 case "boolean":
-                                    options[opt.name] = true;
+                                    var optValue = args[i];
+                                    options[opt.name] = optValue !== "false";
+                                    if (optValue === "false" || optValue === "true") {
+                                        i++;
+                                    }
                                     break;
                                 case "string":
                                     options[opt.name] = args[i] || "";
@@ -49744,9 +50439,9 @@ var ts;
         function serializeCompilerOptions(options) {
             var result = ts.createMap();
             var optionsNameMap = getOptionNameMap().optionNameMap;
-            for (var name_44 in options) {
-                if (ts.hasProperty(options, name_44)) {
-                    switch (name_44) {
+            for (var name_41 in options) {
+                if (ts.hasProperty(options, name_41)) {
+                    switch (name_41) {
                         case "init":
                         case "watch":
                         case "version":
@@ -49754,12 +50449,12 @@ var ts;
                         case "project":
                             break;
                         default:
-                            var value = options[name_44];
-                            var optionDefinition = optionsNameMap[name_44.toLowerCase()];
+                            var value = options[name_41];
+                            var optionDefinition = optionsNameMap[name_41.toLowerCase()];
                             if (optionDefinition) {
                                 var customTypeMap = getCustomTypeMapOfCommandLineOption(optionDefinition);
                                 if (!customTypeMap) {
-                                    result[name_44] = value;
+                                    result[name_41] = value;
                                 }
                                 else {
                                     if (optionDefinition.type === "list") {
@@ -49768,10 +50463,10 @@ var ts;
                                             var element = _a[_i];
                                             convertedValue.push(getNameOfCompilerOptionValue(element, customTypeMap));
                                         }
-                                        result[name_44] = convertedValue;
+                                        result[name_41] = convertedValue;
                                     }
                                     else {
-                                        result[name_44] = getNameOfCompilerOptionValue(value, customTypeMap);
+                                        result[name_41] = getNameOfCompilerOptionValue(value, customTypeMap);
                                     }
                                 }
                             }
@@ -49885,6 +50580,9 @@ var ts;
             if (ts.hasProperty(json, "files")) {
                 if (ts.isArray(json["files"])) {
                     fileNames = json["files"];
+                    if (fileNames.length === 0) {
+                        errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.The_files_list_in_config_file_0_is_empty, configFileName || "tsconfig.json"));
+                    }
                 }
                 else {
                     errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "files", "Array"));
@@ -49921,7 +50619,11 @@ var ts;
             if (fileNames === undefined && includeSpecs === undefined) {
                 includeSpecs = ["**/*"];
             }
-            return matchFileNames(fileNames, includeSpecs, excludeSpecs, basePath, options, host, errors);
+            var result = matchFileNames(fileNames, includeSpecs, excludeSpecs, basePath, options, host, errors);
+            if (result.fileNames.length === 0 && !ts.hasProperty(json, "files") && resolutionStack.length === 0) {
+                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2, configFileName || "tsconfig.json", JSON.stringify(includeSpecs || []), JSON.stringify(excludeSpecs || [])));
+            }
+            return result;
         }
         var _b;
     }
@@ -49957,9 +50659,7 @@ var ts;
         return options;
     }
     function convertTypingOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName) {
-        var options = ts.getBaseFileName(configFileName) === "jsconfig.json"
-            ? { enableAutoDiscovery: true, include: [], exclude: [] }
-            : { enableAutoDiscovery: false, include: [], exclude: [] };
+        var options = { enableAutoDiscovery: ts.getBaseFileName(configFileName) === "jsconfig.json", include: [], exclude: [] };
         convertOptionsFromJson(ts.typingOptionDeclarations, jsonOptions, basePath, options, ts.Diagnostics.Unknown_typing_option_0, errors);
         return options;
     }
@@ -50090,14 +50790,13 @@ var ts;
             var recursiveKeys = [];
             for (var _i = 0, include_1 = include; _i < include_1.length; _i++) {
                 var file = include_1[_i];
-                var name_45 = ts.normalizePath(ts.combinePaths(path, file));
-                if (excludeRegex && excludeRegex.test(name_45)) {
+                var spec = ts.normalizePath(ts.combinePaths(path, file));
+                if (excludeRegex && excludeRegex.test(spec)) {
                     continue;
                 }
-                var match = wildcardDirectoryPattern.exec(name_45);
+                var match = getWildcardDirectoryFromSpec(spec, useCaseSensitiveFileNames);
                 if (match) {
-                    var key = useCaseSensitiveFileNames ? match[0] : match[0].toLowerCase();
-                    var flags = watchRecursivePattern.test(name_45) ? 1 : 0;
+                    var key = match.key, flags = match.flags;
                     var existingFlags = wildcardDirectories[key];
                     if (existingFlags === undefined || existingFlags < flags) {
                         wildcardDirectories[key] = flags;
@@ -50118,6 +50817,19 @@ var ts;
         }
         return wildcardDirectories;
     }
+    function getWildcardDirectoryFromSpec(spec, useCaseSensitiveFileNames) {
+        var match = wildcardDirectoryPattern.exec(spec);
+        if (match) {
+            return {
+                key: useCaseSensitiveFileNames ? match[0] : match[0].toLowerCase(),
+                flags: watchRecursivePattern.test(spec) ? 1 : 0
+            };
+        }
+        if (ts.isImplicitGlob(spec)) {
+            return { key: spec, flags: 1 };
+        }
+        return undefined;
+    }
     function hasFileWithHigherPriorityExtension(file, literalFiles, wildcardFiles, extensions, keyMapper) {
         var extensionPriority = ts.getExtensionPriority(file, extensions);
         var adjustedExtensionPriority = ts.adjustExtensionPriority(extensionPriority);
@@ -50539,10 +51251,13 @@ var ts;
             startTimerForHandlingDirectoryChanges();
         }
         function startTimerForHandlingDirectoryChanges() {
-            if (timerHandleForDirectoryChanges) {
-                clearTimeout(timerHandleForDirectoryChanges);
+            if (!ts.sys.setTimeout || !ts.sys.clearTimeout) {
+                return;
             }
-            timerHandleForDirectoryChanges = setTimeout(directoryChangeHandler, 250);
+            if (timerHandleForDirectoryChanges) {
+                ts.sys.clearTimeout(timerHandleForDirectoryChanges);
+            }
+            timerHandleForDirectoryChanges = ts.sys.setTimeout(directoryChangeHandler, 250);
         }
         function directoryChangeHandler() {
             var parsedCommandLine = parseConfigFile();
@@ -50554,10 +51269,13 @@ var ts;
             }
         }
         function startTimerForRecompilation() {
-            if (timerHandleForRecompilation) {
-                clearTimeout(timerHandleForRecompilation);
+            if (!ts.sys.setTimeout || !ts.sys.clearTimeout) {
+                return;
             }
-            timerHandleForRecompilation = setTimeout(recompile, 250);
+            if (timerHandleForRecompilation) {
+                ts.sys.clearTimeout(timerHandleForRecompilation);
+            }
+            timerHandleForRecompilation = ts.sys.setTimeout(recompile, 250);
         }
         function recompile() {
             timerHandleForRecompilation = undefined;
@@ -50636,17 +51354,17 @@ var ts;
             var nameSize = 0;
             var valueSize = 0;
             for (var _i = 0, statistics_1 = statistics; _i < statistics_1.length; _i++) {
-                var _a = statistics_1[_i], name_46 = _a.name, value = _a.value;
-                if (name_46.length > nameSize) {
-                    nameSize = name_46.length;
+                var _a = statistics_1[_i], name_42 = _a.name, value = _a.value;
+                if (name_42.length > nameSize) {
+                    nameSize = name_42.length;
                 }
                 if (value.length > valueSize) {
                     valueSize = value.length;
                 }
             }
             for (var _b = 0, statistics_2 = statistics; _b < statistics_2.length; _b++) {
-                var _c = statistics_2[_b], name_47 = _c.name, value = _c.value;
-                ts.sys.write(padRight(name_47 + ":", nameSize + 2) + padLeft(value.toString(), valueSize) + ts.sys.newLine);
+                var _c = statistics_2[_b], name_43 = _c.name, value = _c.value;
+                ts.sys.write(padRight(name_43 + ":", nameSize + 2) + padLeft(value.toString(), valueSize) + ts.sys.newLine);
             }
         }
         function reportStatisticalValue(name, value) {
@@ -50765,5 +51483,3 @@ if (ts.sys.tryEnableSourceMapsForHost && /^development$/i.test(ts.sys.getEnviron
     ts.sys.tryEnableSourceMapsForHost();
 }
 ts.executeCommandLine(ts.sys.args);
-
-//# sourceMappingURL=tsc.js.map
diff --git a/lib/tsserver.js b/lib/tsserver.js
index be6578b0762..a426c38658c 100644
--- a/lib/tsserver.js
+++ b/lib/tsserver.js
@@ -20,462 +20,19 @@ var __extends = (this && this.__extends) || function (d, b) {
 };
 var ts;
 (function (ts) {
-    (function (SyntaxKind) {
-        SyntaxKind[SyntaxKind["Unknown"] = 0] = "Unknown";
-        SyntaxKind[SyntaxKind["EndOfFileToken"] = 1] = "EndOfFileToken";
-        SyntaxKind[SyntaxKind["SingleLineCommentTrivia"] = 2] = "SingleLineCommentTrivia";
-        SyntaxKind[SyntaxKind["MultiLineCommentTrivia"] = 3] = "MultiLineCommentTrivia";
-        SyntaxKind[SyntaxKind["NewLineTrivia"] = 4] = "NewLineTrivia";
-        SyntaxKind[SyntaxKind["WhitespaceTrivia"] = 5] = "WhitespaceTrivia";
-        SyntaxKind[SyntaxKind["ShebangTrivia"] = 6] = "ShebangTrivia";
-        SyntaxKind[SyntaxKind["ConflictMarkerTrivia"] = 7] = "ConflictMarkerTrivia";
-        SyntaxKind[SyntaxKind["NumericLiteral"] = 8] = "NumericLiteral";
-        SyntaxKind[SyntaxKind["StringLiteral"] = 9] = "StringLiteral";
-        SyntaxKind[SyntaxKind["JsxText"] = 10] = "JsxText";
-        SyntaxKind[SyntaxKind["RegularExpressionLiteral"] = 11] = "RegularExpressionLiteral";
-        SyntaxKind[SyntaxKind["NoSubstitutionTemplateLiteral"] = 12] = "NoSubstitutionTemplateLiteral";
-        SyntaxKind[SyntaxKind["TemplateHead"] = 13] = "TemplateHead";
-        SyntaxKind[SyntaxKind["TemplateMiddle"] = 14] = "TemplateMiddle";
-        SyntaxKind[SyntaxKind["TemplateTail"] = 15] = "TemplateTail";
-        SyntaxKind[SyntaxKind["OpenBraceToken"] = 16] = "OpenBraceToken";
-        SyntaxKind[SyntaxKind["CloseBraceToken"] = 17] = "CloseBraceToken";
-        SyntaxKind[SyntaxKind["OpenParenToken"] = 18] = "OpenParenToken";
-        SyntaxKind[SyntaxKind["CloseParenToken"] = 19] = "CloseParenToken";
-        SyntaxKind[SyntaxKind["OpenBracketToken"] = 20] = "OpenBracketToken";
-        SyntaxKind[SyntaxKind["CloseBracketToken"] = 21] = "CloseBracketToken";
-        SyntaxKind[SyntaxKind["DotToken"] = 22] = "DotToken";
-        SyntaxKind[SyntaxKind["DotDotDotToken"] = 23] = "DotDotDotToken";
-        SyntaxKind[SyntaxKind["SemicolonToken"] = 24] = "SemicolonToken";
-        SyntaxKind[SyntaxKind["CommaToken"] = 25] = "CommaToken";
-        SyntaxKind[SyntaxKind["LessThanToken"] = 26] = "LessThanToken";
-        SyntaxKind[SyntaxKind["LessThanSlashToken"] = 27] = "LessThanSlashToken";
-        SyntaxKind[SyntaxKind["GreaterThanToken"] = 28] = "GreaterThanToken";
-        SyntaxKind[SyntaxKind["LessThanEqualsToken"] = 29] = "LessThanEqualsToken";
-        SyntaxKind[SyntaxKind["GreaterThanEqualsToken"] = 30] = "GreaterThanEqualsToken";
-        SyntaxKind[SyntaxKind["EqualsEqualsToken"] = 31] = "EqualsEqualsToken";
-        SyntaxKind[SyntaxKind["ExclamationEqualsToken"] = 32] = "ExclamationEqualsToken";
-        SyntaxKind[SyntaxKind["EqualsEqualsEqualsToken"] = 33] = "EqualsEqualsEqualsToken";
-        SyntaxKind[SyntaxKind["ExclamationEqualsEqualsToken"] = 34] = "ExclamationEqualsEqualsToken";
-        SyntaxKind[SyntaxKind["EqualsGreaterThanToken"] = 35] = "EqualsGreaterThanToken";
-        SyntaxKind[SyntaxKind["PlusToken"] = 36] = "PlusToken";
-        SyntaxKind[SyntaxKind["MinusToken"] = 37] = "MinusToken";
-        SyntaxKind[SyntaxKind["AsteriskToken"] = 38] = "AsteriskToken";
-        SyntaxKind[SyntaxKind["AsteriskAsteriskToken"] = 39] = "AsteriskAsteriskToken";
-        SyntaxKind[SyntaxKind["SlashToken"] = 40] = "SlashToken";
-        SyntaxKind[SyntaxKind["PercentToken"] = 41] = "PercentToken";
-        SyntaxKind[SyntaxKind["PlusPlusToken"] = 42] = "PlusPlusToken";
-        SyntaxKind[SyntaxKind["MinusMinusToken"] = 43] = "MinusMinusToken";
-        SyntaxKind[SyntaxKind["LessThanLessThanToken"] = 44] = "LessThanLessThanToken";
-        SyntaxKind[SyntaxKind["GreaterThanGreaterThanToken"] = 45] = "GreaterThanGreaterThanToken";
-        SyntaxKind[SyntaxKind["GreaterThanGreaterThanGreaterThanToken"] = 46] = "GreaterThanGreaterThanGreaterThanToken";
-        SyntaxKind[SyntaxKind["AmpersandToken"] = 47] = "AmpersandToken";
-        SyntaxKind[SyntaxKind["BarToken"] = 48] = "BarToken";
-        SyntaxKind[SyntaxKind["CaretToken"] = 49] = "CaretToken";
-        SyntaxKind[SyntaxKind["ExclamationToken"] = 50] = "ExclamationToken";
-        SyntaxKind[SyntaxKind["TildeToken"] = 51] = "TildeToken";
-        SyntaxKind[SyntaxKind["AmpersandAmpersandToken"] = 52] = "AmpersandAmpersandToken";
-        SyntaxKind[SyntaxKind["BarBarToken"] = 53] = "BarBarToken";
-        SyntaxKind[SyntaxKind["QuestionToken"] = 54] = "QuestionToken";
-        SyntaxKind[SyntaxKind["ColonToken"] = 55] = "ColonToken";
-        SyntaxKind[SyntaxKind["AtToken"] = 56] = "AtToken";
-        SyntaxKind[SyntaxKind["EqualsToken"] = 57] = "EqualsToken";
-        SyntaxKind[SyntaxKind["PlusEqualsToken"] = 58] = "PlusEqualsToken";
-        SyntaxKind[SyntaxKind["MinusEqualsToken"] = 59] = "MinusEqualsToken";
-        SyntaxKind[SyntaxKind["AsteriskEqualsToken"] = 60] = "AsteriskEqualsToken";
-        SyntaxKind[SyntaxKind["AsteriskAsteriskEqualsToken"] = 61] = "AsteriskAsteriskEqualsToken";
-        SyntaxKind[SyntaxKind["SlashEqualsToken"] = 62] = "SlashEqualsToken";
-        SyntaxKind[SyntaxKind["PercentEqualsToken"] = 63] = "PercentEqualsToken";
-        SyntaxKind[SyntaxKind["LessThanLessThanEqualsToken"] = 64] = "LessThanLessThanEqualsToken";
-        SyntaxKind[SyntaxKind["GreaterThanGreaterThanEqualsToken"] = 65] = "GreaterThanGreaterThanEqualsToken";
-        SyntaxKind[SyntaxKind["GreaterThanGreaterThanGreaterThanEqualsToken"] = 66] = "GreaterThanGreaterThanGreaterThanEqualsToken";
-        SyntaxKind[SyntaxKind["AmpersandEqualsToken"] = 67] = "AmpersandEqualsToken";
-        SyntaxKind[SyntaxKind["BarEqualsToken"] = 68] = "BarEqualsToken";
-        SyntaxKind[SyntaxKind["CaretEqualsToken"] = 69] = "CaretEqualsToken";
-        SyntaxKind[SyntaxKind["Identifier"] = 70] = "Identifier";
-        SyntaxKind[SyntaxKind["BreakKeyword"] = 71] = "BreakKeyword";
-        SyntaxKind[SyntaxKind["CaseKeyword"] = 72] = "CaseKeyword";
-        SyntaxKind[SyntaxKind["CatchKeyword"] = 73] = "CatchKeyword";
-        SyntaxKind[SyntaxKind["ClassKeyword"] = 74] = "ClassKeyword";
-        SyntaxKind[SyntaxKind["ConstKeyword"] = 75] = "ConstKeyword";
-        SyntaxKind[SyntaxKind["ContinueKeyword"] = 76] = "ContinueKeyword";
-        SyntaxKind[SyntaxKind["DebuggerKeyword"] = 77] = "DebuggerKeyword";
-        SyntaxKind[SyntaxKind["DefaultKeyword"] = 78] = "DefaultKeyword";
-        SyntaxKind[SyntaxKind["DeleteKeyword"] = 79] = "DeleteKeyword";
-        SyntaxKind[SyntaxKind["DoKeyword"] = 80] = "DoKeyword";
-        SyntaxKind[SyntaxKind["ElseKeyword"] = 81] = "ElseKeyword";
-        SyntaxKind[SyntaxKind["EnumKeyword"] = 82] = "EnumKeyword";
-        SyntaxKind[SyntaxKind["ExportKeyword"] = 83] = "ExportKeyword";
-        SyntaxKind[SyntaxKind["ExtendsKeyword"] = 84] = "ExtendsKeyword";
-        SyntaxKind[SyntaxKind["FalseKeyword"] = 85] = "FalseKeyword";
-        SyntaxKind[SyntaxKind["FinallyKeyword"] = 86] = "FinallyKeyword";
-        SyntaxKind[SyntaxKind["ForKeyword"] = 87] = "ForKeyword";
-        SyntaxKind[SyntaxKind["FunctionKeyword"] = 88] = "FunctionKeyword";
-        SyntaxKind[SyntaxKind["IfKeyword"] = 89] = "IfKeyword";
-        SyntaxKind[SyntaxKind["ImportKeyword"] = 90] = "ImportKeyword";
-        SyntaxKind[SyntaxKind["InKeyword"] = 91] = "InKeyword";
-        SyntaxKind[SyntaxKind["InstanceOfKeyword"] = 92] = "InstanceOfKeyword";
-        SyntaxKind[SyntaxKind["NewKeyword"] = 93] = "NewKeyword";
-        SyntaxKind[SyntaxKind["NullKeyword"] = 94] = "NullKeyword";
-        SyntaxKind[SyntaxKind["ReturnKeyword"] = 95] = "ReturnKeyword";
-        SyntaxKind[SyntaxKind["SuperKeyword"] = 96] = "SuperKeyword";
-        SyntaxKind[SyntaxKind["SwitchKeyword"] = 97] = "SwitchKeyword";
-        SyntaxKind[SyntaxKind["ThisKeyword"] = 98] = "ThisKeyword";
-        SyntaxKind[SyntaxKind["ThrowKeyword"] = 99] = "ThrowKeyword";
-        SyntaxKind[SyntaxKind["TrueKeyword"] = 100] = "TrueKeyword";
-        SyntaxKind[SyntaxKind["TryKeyword"] = 101] = "TryKeyword";
-        SyntaxKind[SyntaxKind["TypeOfKeyword"] = 102] = "TypeOfKeyword";
-        SyntaxKind[SyntaxKind["VarKeyword"] = 103] = "VarKeyword";
-        SyntaxKind[SyntaxKind["VoidKeyword"] = 104] = "VoidKeyword";
-        SyntaxKind[SyntaxKind["WhileKeyword"] = 105] = "WhileKeyword";
-        SyntaxKind[SyntaxKind["WithKeyword"] = 106] = "WithKeyword";
-        SyntaxKind[SyntaxKind["ImplementsKeyword"] = 107] = "ImplementsKeyword";
-        SyntaxKind[SyntaxKind["InterfaceKeyword"] = 108] = "InterfaceKeyword";
-        SyntaxKind[SyntaxKind["LetKeyword"] = 109] = "LetKeyword";
-        SyntaxKind[SyntaxKind["PackageKeyword"] = 110] = "PackageKeyword";
-        SyntaxKind[SyntaxKind["PrivateKeyword"] = 111] = "PrivateKeyword";
-        SyntaxKind[SyntaxKind["ProtectedKeyword"] = 112] = "ProtectedKeyword";
-        SyntaxKind[SyntaxKind["PublicKeyword"] = 113] = "PublicKeyword";
-        SyntaxKind[SyntaxKind["StaticKeyword"] = 114] = "StaticKeyword";
-        SyntaxKind[SyntaxKind["YieldKeyword"] = 115] = "YieldKeyword";
-        SyntaxKind[SyntaxKind["AbstractKeyword"] = 116] = "AbstractKeyword";
-        SyntaxKind[SyntaxKind["AsKeyword"] = 117] = "AsKeyword";
-        SyntaxKind[SyntaxKind["AnyKeyword"] = 118] = "AnyKeyword";
-        SyntaxKind[SyntaxKind["AsyncKeyword"] = 119] = "AsyncKeyword";
-        SyntaxKind[SyntaxKind["AwaitKeyword"] = 120] = "AwaitKeyword";
-        SyntaxKind[SyntaxKind["BooleanKeyword"] = 121] = "BooleanKeyword";
-        SyntaxKind[SyntaxKind["ConstructorKeyword"] = 122] = "ConstructorKeyword";
-        SyntaxKind[SyntaxKind["DeclareKeyword"] = 123] = "DeclareKeyword";
-        SyntaxKind[SyntaxKind["GetKeyword"] = 124] = "GetKeyword";
-        SyntaxKind[SyntaxKind["IsKeyword"] = 125] = "IsKeyword";
-        SyntaxKind[SyntaxKind["ModuleKeyword"] = 126] = "ModuleKeyword";
-        SyntaxKind[SyntaxKind["NamespaceKeyword"] = 127] = "NamespaceKeyword";
-        SyntaxKind[SyntaxKind["NeverKeyword"] = 128] = "NeverKeyword";
-        SyntaxKind[SyntaxKind["ReadonlyKeyword"] = 129] = "ReadonlyKeyword";
-        SyntaxKind[SyntaxKind["RequireKeyword"] = 130] = "RequireKeyword";
-        SyntaxKind[SyntaxKind["NumberKeyword"] = 131] = "NumberKeyword";
-        SyntaxKind[SyntaxKind["SetKeyword"] = 132] = "SetKeyword";
-        SyntaxKind[SyntaxKind["StringKeyword"] = 133] = "StringKeyword";
-        SyntaxKind[SyntaxKind["SymbolKeyword"] = 134] = "SymbolKeyword";
-        SyntaxKind[SyntaxKind["TypeKeyword"] = 135] = "TypeKeyword";
-        SyntaxKind[SyntaxKind["UndefinedKeyword"] = 136] = "UndefinedKeyword";
-        SyntaxKind[SyntaxKind["FromKeyword"] = 137] = "FromKeyword";
-        SyntaxKind[SyntaxKind["GlobalKeyword"] = 138] = "GlobalKeyword";
-        SyntaxKind[SyntaxKind["OfKeyword"] = 139] = "OfKeyword";
-        SyntaxKind[SyntaxKind["QualifiedName"] = 140] = "QualifiedName";
-        SyntaxKind[SyntaxKind["ComputedPropertyName"] = 141] = "ComputedPropertyName";
-        SyntaxKind[SyntaxKind["TypeParameter"] = 142] = "TypeParameter";
-        SyntaxKind[SyntaxKind["Parameter"] = 143] = "Parameter";
-        SyntaxKind[SyntaxKind["Decorator"] = 144] = "Decorator";
-        SyntaxKind[SyntaxKind["PropertySignature"] = 145] = "PropertySignature";
-        SyntaxKind[SyntaxKind["PropertyDeclaration"] = 146] = "PropertyDeclaration";
-        SyntaxKind[SyntaxKind["MethodSignature"] = 147] = "MethodSignature";
-        SyntaxKind[SyntaxKind["MethodDeclaration"] = 148] = "MethodDeclaration";
-        SyntaxKind[SyntaxKind["Constructor"] = 149] = "Constructor";
-        SyntaxKind[SyntaxKind["GetAccessor"] = 150] = "GetAccessor";
-        SyntaxKind[SyntaxKind["SetAccessor"] = 151] = "SetAccessor";
-        SyntaxKind[SyntaxKind["CallSignature"] = 152] = "CallSignature";
-        SyntaxKind[SyntaxKind["ConstructSignature"] = 153] = "ConstructSignature";
-        SyntaxKind[SyntaxKind["IndexSignature"] = 154] = "IndexSignature";
-        SyntaxKind[SyntaxKind["TypePredicate"] = 155] = "TypePredicate";
-        SyntaxKind[SyntaxKind["TypeReference"] = 156] = "TypeReference";
-        SyntaxKind[SyntaxKind["FunctionType"] = 157] = "FunctionType";
-        SyntaxKind[SyntaxKind["ConstructorType"] = 158] = "ConstructorType";
-        SyntaxKind[SyntaxKind["TypeQuery"] = 159] = "TypeQuery";
-        SyntaxKind[SyntaxKind["TypeLiteral"] = 160] = "TypeLiteral";
-        SyntaxKind[SyntaxKind["ArrayType"] = 161] = "ArrayType";
-        SyntaxKind[SyntaxKind["TupleType"] = 162] = "TupleType";
-        SyntaxKind[SyntaxKind["UnionType"] = 163] = "UnionType";
-        SyntaxKind[SyntaxKind["IntersectionType"] = 164] = "IntersectionType";
-        SyntaxKind[SyntaxKind["ParenthesizedType"] = 165] = "ParenthesizedType";
-        SyntaxKind[SyntaxKind["ThisType"] = 166] = "ThisType";
-        SyntaxKind[SyntaxKind["LiteralType"] = 167] = "LiteralType";
-        SyntaxKind[SyntaxKind["ObjectBindingPattern"] = 168] = "ObjectBindingPattern";
-        SyntaxKind[SyntaxKind["ArrayBindingPattern"] = 169] = "ArrayBindingPattern";
-        SyntaxKind[SyntaxKind["BindingElement"] = 170] = "BindingElement";
-        SyntaxKind[SyntaxKind["ArrayLiteralExpression"] = 171] = "ArrayLiteralExpression";
-        SyntaxKind[SyntaxKind["ObjectLiteralExpression"] = 172] = "ObjectLiteralExpression";
-        SyntaxKind[SyntaxKind["PropertyAccessExpression"] = 173] = "PropertyAccessExpression";
-        SyntaxKind[SyntaxKind["ElementAccessExpression"] = 174] = "ElementAccessExpression";
-        SyntaxKind[SyntaxKind["CallExpression"] = 175] = "CallExpression";
-        SyntaxKind[SyntaxKind["NewExpression"] = 176] = "NewExpression";
-        SyntaxKind[SyntaxKind["TaggedTemplateExpression"] = 177] = "TaggedTemplateExpression";
-        SyntaxKind[SyntaxKind["TypeAssertionExpression"] = 178] = "TypeAssertionExpression";
-        SyntaxKind[SyntaxKind["ParenthesizedExpression"] = 179] = "ParenthesizedExpression";
-        SyntaxKind[SyntaxKind["FunctionExpression"] = 180] = "FunctionExpression";
-        SyntaxKind[SyntaxKind["ArrowFunction"] = 181] = "ArrowFunction";
-        SyntaxKind[SyntaxKind["DeleteExpression"] = 182] = "DeleteExpression";
-        SyntaxKind[SyntaxKind["TypeOfExpression"] = 183] = "TypeOfExpression";
-        SyntaxKind[SyntaxKind["VoidExpression"] = 184] = "VoidExpression";
-        SyntaxKind[SyntaxKind["AwaitExpression"] = 185] = "AwaitExpression";
-        SyntaxKind[SyntaxKind["PrefixUnaryExpression"] = 186] = "PrefixUnaryExpression";
-        SyntaxKind[SyntaxKind["PostfixUnaryExpression"] = 187] = "PostfixUnaryExpression";
-        SyntaxKind[SyntaxKind["BinaryExpression"] = 188] = "BinaryExpression";
-        SyntaxKind[SyntaxKind["ConditionalExpression"] = 189] = "ConditionalExpression";
-        SyntaxKind[SyntaxKind["TemplateExpression"] = 190] = "TemplateExpression";
-        SyntaxKind[SyntaxKind["YieldExpression"] = 191] = "YieldExpression";
-        SyntaxKind[SyntaxKind["SpreadElementExpression"] = 192] = "SpreadElementExpression";
-        SyntaxKind[SyntaxKind["ClassExpression"] = 193] = "ClassExpression";
-        SyntaxKind[SyntaxKind["OmittedExpression"] = 194] = "OmittedExpression";
-        SyntaxKind[SyntaxKind["ExpressionWithTypeArguments"] = 195] = "ExpressionWithTypeArguments";
-        SyntaxKind[SyntaxKind["AsExpression"] = 196] = "AsExpression";
-        SyntaxKind[SyntaxKind["NonNullExpression"] = 197] = "NonNullExpression";
-        SyntaxKind[SyntaxKind["TemplateSpan"] = 198] = "TemplateSpan";
-        SyntaxKind[SyntaxKind["SemicolonClassElement"] = 199] = "SemicolonClassElement";
-        SyntaxKind[SyntaxKind["Block"] = 200] = "Block";
-        SyntaxKind[SyntaxKind["VariableStatement"] = 201] = "VariableStatement";
-        SyntaxKind[SyntaxKind["EmptyStatement"] = 202] = "EmptyStatement";
-        SyntaxKind[SyntaxKind["ExpressionStatement"] = 203] = "ExpressionStatement";
-        SyntaxKind[SyntaxKind["IfStatement"] = 204] = "IfStatement";
-        SyntaxKind[SyntaxKind["DoStatement"] = 205] = "DoStatement";
-        SyntaxKind[SyntaxKind["WhileStatement"] = 206] = "WhileStatement";
-        SyntaxKind[SyntaxKind["ForStatement"] = 207] = "ForStatement";
-        SyntaxKind[SyntaxKind["ForInStatement"] = 208] = "ForInStatement";
-        SyntaxKind[SyntaxKind["ForOfStatement"] = 209] = "ForOfStatement";
-        SyntaxKind[SyntaxKind["ContinueStatement"] = 210] = "ContinueStatement";
-        SyntaxKind[SyntaxKind["BreakStatement"] = 211] = "BreakStatement";
-        SyntaxKind[SyntaxKind["ReturnStatement"] = 212] = "ReturnStatement";
-        SyntaxKind[SyntaxKind["WithStatement"] = 213] = "WithStatement";
-        SyntaxKind[SyntaxKind["SwitchStatement"] = 214] = "SwitchStatement";
-        SyntaxKind[SyntaxKind["LabeledStatement"] = 215] = "LabeledStatement";
-        SyntaxKind[SyntaxKind["ThrowStatement"] = 216] = "ThrowStatement";
-        SyntaxKind[SyntaxKind["TryStatement"] = 217] = "TryStatement";
-        SyntaxKind[SyntaxKind["DebuggerStatement"] = 218] = "DebuggerStatement";
-        SyntaxKind[SyntaxKind["VariableDeclaration"] = 219] = "VariableDeclaration";
-        SyntaxKind[SyntaxKind["VariableDeclarationList"] = 220] = "VariableDeclarationList";
-        SyntaxKind[SyntaxKind["FunctionDeclaration"] = 221] = "FunctionDeclaration";
-        SyntaxKind[SyntaxKind["ClassDeclaration"] = 222] = "ClassDeclaration";
-        SyntaxKind[SyntaxKind["InterfaceDeclaration"] = 223] = "InterfaceDeclaration";
-        SyntaxKind[SyntaxKind["TypeAliasDeclaration"] = 224] = "TypeAliasDeclaration";
-        SyntaxKind[SyntaxKind["EnumDeclaration"] = 225] = "EnumDeclaration";
-        SyntaxKind[SyntaxKind["ModuleDeclaration"] = 226] = "ModuleDeclaration";
-        SyntaxKind[SyntaxKind["ModuleBlock"] = 227] = "ModuleBlock";
-        SyntaxKind[SyntaxKind["CaseBlock"] = 228] = "CaseBlock";
-        SyntaxKind[SyntaxKind["NamespaceExportDeclaration"] = 229] = "NamespaceExportDeclaration";
-        SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 230] = "ImportEqualsDeclaration";
-        SyntaxKind[SyntaxKind["ImportDeclaration"] = 231] = "ImportDeclaration";
-        SyntaxKind[SyntaxKind["ImportClause"] = 232] = "ImportClause";
-        SyntaxKind[SyntaxKind["NamespaceImport"] = 233] = "NamespaceImport";
-        SyntaxKind[SyntaxKind["NamedImports"] = 234] = "NamedImports";
-        SyntaxKind[SyntaxKind["ImportSpecifier"] = 235] = "ImportSpecifier";
-        SyntaxKind[SyntaxKind["ExportAssignment"] = 236] = "ExportAssignment";
-        SyntaxKind[SyntaxKind["ExportDeclaration"] = 237] = "ExportDeclaration";
-        SyntaxKind[SyntaxKind["NamedExports"] = 238] = "NamedExports";
-        SyntaxKind[SyntaxKind["ExportSpecifier"] = 239] = "ExportSpecifier";
-        SyntaxKind[SyntaxKind["MissingDeclaration"] = 240] = "MissingDeclaration";
-        SyntaxKind[SyntaxKind["ExternalModuleReference"] = 241] = "ExternalModuleReference";
-        SyntaxKind[SyntaxKind["JsxElement"] = 242] = "JsxElement";
-        SyntaxKind[SyntaxKind["JsxSelfClosingElement"] = 243] = "JsxSelfClosingElement";
-        SyntaxKind[SyntaxKind["JsxOpeningElement"] = 244] = "JsxOpeningElement";
-        SyntaxKind[SyntaxKind["JsxClosingElement"] = 245] = "JsxClosingElement";
-        SyntaxKind[SyntaxKind["JsxAttribute"] = 246] = "JsxAttribute";
-        SyntaxKind[SyntaxKind["JsxSpreadAttribute"] = 247] = "JsxSpreadAttribute";
-        SyntaxKind[SyntaxKind["JsxExpression"] = 248] = "JsxExpression";
-        SyntaxKind[SyntaxKind["CaseClause"] = 249] = "CaseClause";
-        SyntaxKind[SyntaxKind["DefaultClause"] = 250] = "DefaultClause";
-        SyntaxKind[SyntaxKind["HeritageClause"] = 251] = "HeritageClause";
-        SyntaxKind[SyntaxKind["CatchClause"] = 252] = "CatchClause";
-        SyntaxKind[SyntaxKind["PropertyAssignment"] = 253] = "PropertyAssignment";
-        SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 254] = "ShorthandPropertyAssignment";
-        SyntaxKind[SyntaxKind["EnumMember"] = 255] = "EnumMember";
-        SyntaxKind[SyntaxKind["SourceFile"] = 256] = "SourceFile";
-        SyntaxKind[SyntaxKind["JSDocTypeExpression"] = 257] = "JSDocTypeExpression";
-        SyntaxKind[SyntaxKind["JSDocAllType"] = 258] = "JSDocAllType";
-        SyntaxKind[SyntaxKind["JSDocUnknownType"] = 259] = "JSDocUnknownType";
-        SyntaxKind[SyntaxKind["JSDocArrayType"] = 260] = "JSDocArrayType";
-        SyntaxKind[SyntaxKind["JSDocUnionType"] = 261] = "JSDocUnionType";
-        SyntaxKind[SyntaxKind["JSDocTupleType"] = 262] = "JSDocTupleType";
-        SyntaxKind[SyntaxKind["JSDocNullableType"] = 263] = "JSDocNullableType";
-        SyntaxKind[SyntaxKind["JSDocNonNullableType"] = 264] = "JSDocNonNullableType";
-        SyntaxKind[SyntaxKind["JSDocRecordType"] = 265] = "JSDocRecordType";
-        SyntaxKind[SyntaxKind["JSDocRecordMember"] = 266] = "JSDocRecordMember";
-        SyntaxKind[SyntaxKind["JSDocTypeReference"] = 267] = "JSDocTypeReference";
-        SyntaxKind[SyntaxKind["JSDocOptionalType"] = 268] = "JSDocOptionalType";
-        SyntaxKind[SyntaxKind["JSDocFunctionType"] = 269] = "JSDocFunctionType";
-        SyntaxKind[SyntaxKind["JSDocVariadicType"] = 270] = "JSDocVariadicType";
-        SyntaxKind[SyntaxKind["JSDocConstructorType"] = 271] = "JSDocConstructorType";
-        SyntaxKind[SyntaxKind["JSDocThisType"] = 272] = "JSDocThisType";
-        SyntaxKind[SyntaxKind["JSDocComment"] = 273] = "JSDocComment";
-        SyntaxKind[SyntaxKind["JSDocTag"] = 274] = "JSDocTag";
-        SyntaxKind[SyntaxKind["JSDocParameterTag"] = 275] = "JSDocParameterTag";
-        SyntaxKind[SyntaxKind["JSDocReturnTag"] = 276] = "JSDocReturnTag";
-        SyntaxKind[SyntaxKind["JSDocTypeTag"] = 277] = "JSDocTypeTag";
-        SyntaxKind[SyntaxKind["JSDocTemplateTag"] = 278] = "JSDocTemplateTag";
-        SyntaxKind[SyntaxKind["JSDocTypedefTag"] = 279] = "JSDocTypedefTag";
-        SyntaxKind[SyntaxKind["JSDocPropertyTag"] = 280] = "JSDocPropertyTag";
-        SyntaxKind[SyntaxKind["JSDocTypeLiteral"] = 281] = "JSDocTypeLiteral";
-        SyntaxKind[SyntaxKind["JSDocLiteralType"] = 282] = "JSDocLiteralType";
-        SyntaxKind[SyntaxKind["JSDocNullKeyword"] = 283] = "JSDocNullKeyword";
-        SyntaxKind[SyntaxKind["JSDocUndefinedKeyword"] = 284] = "JSDocUndefinedKeyword";
-        SyntaxKind[SyntaxKind["JSDocNeverKeyword"] = 285] = "JSDocNeverKeyword";
-        SyntaxKind[SyntaxKind["SyntaxList"] = 286] = "SyntaxList";
-        SyntaxKind[SyntaxKind["NotEmittedStatement"] = 287] = "NotEmittedStatement";
-        SyntaxKind[SyntaxKind["PartiallyEmittedExpression"] = 288] = "PartiallyEmittedExpression";
-        SyntaxKind[SyntaxKind["Count"] = 289] = "Count";
-        SyntaxKind[SyntaxKind["FirstAssignment"] = 57] = "FirstAssignment";
-        SyntaxKind[SyntaxKind["LastAssignment"] = 69] = "LastAssignment";
-        SyntaxKind[SyntaxKind["FirstCompoundAssignment"] = 58] = "FirstCompoundAssignment";
-        SyntaxKind[SyntaxKind["LastCompoundAssignment"] = 69] = "LastCompoundAssignment";
-        SyntaxKind[SyntaxKind["FirstReservedWord"] = 71] = "FirstReservedWord";
-        SyntaxKind[SyntaxKind["LastReservedWord"] = 106] = "LastReservedWord";
-        SyntaxKind[SyntaxKind["FirstKeyword"] = 71] = "FirstKeyword";
-        SyntaxKind[SyntaxKind["LastKeyword"] = 139] = "LastKeyword";
-        SyntaxKind[SyntaxKind["FirstFutureReservedWord"] = 107] = "FirstFutureReservedWord";
-        SyntaxKind[SyntaxKind["LastFutureReservedWord"] = 115] = "LastFutureReservedWord";
-        SyntaxKind[SyntaxKind["FirstTypeNode"] = 155] = "FirstTypeNode";
-        SyntaxKind[SyntaxKind["LastTypeNode"] = 167] = "LastTypeNode";
-        SyntaxKind[SyntaxKind["FirstPunctuation"] = 16] = "FirstPunctuation";
-        SyntaxKind[SyntaxKind["LastPunctuation"] = 69] = "LastPunctuation";
-        SyntaxKind[SyntaxKind["FirstToken"] = 0] = "FirstToken";
-        SyntaxKind[SyntaxKind["LastToken"] = 139] = "LastToken";
-        SyntaxKind[SyntaxKind["FirstTriviaToken"] = 2] = "FirstTriviaToken";
-        SyntaxKind[SyntaxKind["LastTriviaToken"] = 7] = "LastTriviaToken";
-        SyntaxKind[SyntaxKind["FirstLiteralToken"] = 8] = "FirstLiteralToken";
-        SyntaxKind[SyntaxKind["LastLiteralToken"] = 12] = "LastLiteralToken";
-        SyntaxKind[SyntaxKind["FirstTemplateToken"] = 12] = "FirstTemplateToken";
-        SyntaxKind[SyntaxKind["LastTemplateToken"] = 15] = "LastTemplateToken";
-        SyntaxKind[SyntaxKind["FirstBinaryOperator"] = 26] = "FirstBinaryOperator";
-        SyntaxKind[SyntaxKind["LastBinaryOperator"] = 69] = "LastBinaryOperator";
-        SyntaxKind[SyntaxKind["FirstNode"] = 140] = "FirstNode";
-        SyntaxKind[SyntaxKind["FirstJSDocNode"] = 257] = "FirstJSDocNode";
-        SyntaxKind[SyntaxKind["LastJSDocNode"] = 282] = "LastJSDocNode";
-        SyntaxKind[SyntaxKind["FirstJSDocTagNode"] = 273] = "FirstJSDocTagNode";
-        SyntaxKind[SyntaxKind["LastJSDocTagNode"] = 285] = "LastJSDocTagNode";
-    })(ts.SyntaxKind || (ts.SyntaxKind = {}));
-    var SyntaxKind = ts.SyntaxKind;
-    (function (NodeFlags) {
-        NodeFlags[NodeFlags["None"] = 0] = "None";
-        NodeFlags[NodeFlags["Let"] = 1] = "Let";
-        NodeFlags[NodeFlags["Const"] = 2] = "Const";
-        NodeFlags[NodeFlags["NestedNamespace"] = 4] = "NestedNamespace";
-        NodeFlags[NodeFlags["Synthesized"] = 8] = "Synthesized";
-        NodeFlags[NodeFlags["Namespace"] = 16] = "Namespace";
-        NodeFlags[NodeFlags["ExportContext"] = 32] = "ExportContext";
-        NodeFlags[NodeFlags["ContainsThis"] = 64] = "ContainsThis";
-        NodeFlags[NodeFlags["HasImplicitReturn"] = 128] = "HasImplicitReturn";
-        NodeFlags[NodeFlags["HasExplicitReturn"] = 256] = "HasExplicitReturn";
-        NodeFlags[NodeFlags["GlobalAugmentation"] = 512] = "GlobalAugmentation";
-        NodeFlags[NodeFlags["HasClassExtends"] = 1024] = "HasClassExtends";
-        NodeFlags[NodeFlags["HasDecorators"] = 2048] = "HasDecorators";
-        NodeFlags[NodeFlags["HasParamDecorators"] = 4096] = "HasParamDecorators";
-        NodeFlags[NodeFlags["HasAsyncFunctions"] = 8192] = "HasAsyncFunctions";
-        NodeFlags[NodeFlags["HasJsxSpreadAttributes"] = 16384] = "HasJsxSpreadAttributes";
-        NodeFlags[NodeFlags["DisallowInContext"] = 32768] = "DisallowInContext";
-        NodeFlags[NodeFlags["YieldContext"] = 65536] = "YieldContext";
-        NodeFlags[NodeFlags["DecoratorContext"] = 131072] = "DecoratorContext";
-        NodeFlags[NodeFlags["AwaitContext"] = 262144] = "AwaitContext";
-        NodeFlags[NodeFlags["ThisNodeHasError"] = 524288] = "ThisNodeHasError";
-        NodeFlags[NodeFlags["JavaScriptFile"] = 1048576] = "JavaScriptFile";
-        NodeFlags[NodeFlags["ThisNodeOrAnySubNodesHasError"] = 2097152] = "ThisNodeOrAnySubNodesHasError";
-        NodeFlags[NodeFlags["HasAggregatedChildData"] = 4194304] = "HasAggregatedChildData";
-        NodeFlags[NodeFlags["BlockScoped"] = 3] = "BlockScoped";
-        NodeFlags[NodeFlags["ReachabilityCheckFlags"] = 384] = "ReachabilityCheckFlags";
-        NodeFlags[NodeFlags["EmitHelperFlags"] = 31744] = "EmitHelperFlags";
-        NodeFlags[NodeFlags["ReachabilityAndEmitFlags"] = 32128] = "ReachabilityAndEmitFlags";
-        NodeFlags[NodeFlags["ContextFlags"] = 1540096] = "ContextFlags";
-        NodeFlags[NodeFlags["TypeExcludesFlags"] = 327680] = "TypeExcludesFlags";
-    })(ts.NodeFlags || (ts.NodeFlags = {}));
-    var NodeFlags = ts.NodeFlags;
-    (function (ModifierFlags) {
-        ModifierFlags[ModifierFlags["None"] = 0] = "None";
-        ModifierFlags[ModifierFlags["Export"] = 1] = "Export";
-        ModifierFlags[ModifierFlags["Ambient"] = 2] = "Ambient";
-        ModifierFlags[ModifierFlags["Public"] = 4] = "Public";
-        ModifierFlags[ModifierFlags["Private"] = 8] = "Private";
-        ModifierFlags[ModifierFlags["Protected"] = 16] = "Protected";
-        ModifierFlags[ModifierFlags["Static"] = 32] = "Static";
-        ModifierFlags[ModifierFlags["Readonly"] = 64] = "Readonly";
-        ModifierFlags[ModifierFlags["Abstract"] = 128] = "Abstract";
-        ModifierFlags[ModifierFlags["Async"] = 256] = "Async";
-        ModifierFlags[ModifierFlags["Default"] = 512] = "Default";
-        ModifierFlags[ModifierFlags["Const"] = 2048] = "Const";
-        ModifierFlags[ModifierFlags["HasComputedFlags"] = 536870912] = "HasComputedFlags";
-        ModifierFlags[ModifierFlags["AccessibilityModifier"] = 28] = "AccessibilityModifier";
-        ModifierFlags[ModifierFlags["ParameterPropertyModifier"] = 92] = "ParameterPropertyModifier";
-        ModifierFlags[ModifierFlags["NonPublicAccessibilityModifier"] = 24] = "NonPublicAccessibilityModifier";
-        ModifierFlags[ModifierFlags["TypeScriptModifier"] = 2270] = "TypeScriptModifier";
-    })(ts.ModifierFlags || (ts.ModifierFlags = {}));
-    var ModifierFlags = ts.ModifierFlags;
-    (function (JsxFlags) {
-        JsxFlags[JsxFlags["None"] = 0] = "None";
-        JsxFlags[JsxFlags["IntrinsicNamedElement"] = 1] = "IntrinsicNamedElement";
-        JsxFlags[JsxFlags["IntrinsicIndexedElement"] = 2] = "IntrinsicIndexedElement";
-        JsxFlags[JsxFlags["IntrinsicElement"] = 3] = "IntrinsicElement";
-    })(ts.JsxFlags || (ts.JsxFlags = {}));
-    var JsxFlags = ts.JsxFlags;
-    (function (RelationComparisonResult) {
-        RelationComparisonResult[RelationComparisonResult["Succeeded"] = 1] = "Succeeded";
-        RelationComparisonResult[RelationComparisonResult["Failed"] = 2] = "Failed";
-        RelationComparisonResult[RelationComparisonResult["FailedAndReported"] = 3] = "FailedAndReported";
-    })(ts.RelationComparisonResult || (ts.RelationComparisonResult = {}));
-    var RelationComparisonResult = ts.RelationComparisonResult;
-    (function (GeneratedIdentifierKind) {
-        GeneratedIdentifierKind[GeneratedIdentifierKind["None"] = 0] = "None";
-        GeneratedIdentifierKind[GeneratedIdentifierKind["Auto"] = 1] = "Auto";
-        GeneratedIdentifierKind[GeneratedIdentifierKind["Loop"] = 2] = "Loop";
-        GeneratedIdentifierKind[GeneratedIdentifierKind["Unique"] = 3] = "Unique";
-        GeneratedIdentifierKind[GeneratedIdentifierKind["Node"] = 4] = "Node";
-    })(ts.GeneratedIdentifierKind || (ts.GeneratedIdentifierKind = {}));
-    var GeneratedIdentifierKind = ts.GeneratedIdentifierKind;
-    (function (FlowFlags) {
-        FlowFlags[FlowFlags["Unreachable"] = 1] = "Unreachable";
-        FlowFlags[FlowFlags["Start"] = 2] = "Start";
-        FlowFlags[FlowFlags["BranchLabel"] = 4] = "BranchLabel";
-        FlowFlags[FlowFlags["LoopLabel"] = 8] = "LoopLabel";
-        FlowFlags[FlowFlags["Assignment"] = 16] = "Assignment";
-        FlowFlags[FlowFlags["TrueCondition"] = 32] = "TrueCondition";
-        FlowFlags[FlowFlags["FalseCondition"] = 64] = "FalseCondition";
-        FlowFlags[FlowFlags["SwitchClause"] = 128] = "SwitchClause";
-        FlowFlags[FlowFlags["ArrayMutation"] = 256] = "ArrayMutation";
-        FlowFlags[FlowFlags["Referenced"] = 512] = "Referenced";
-        FlowFlags[FlowFlags["Shared"] = 1024] = "Shared";
-        FlowFlags[FlowFlags["Label"] = 12] = "Label";
-        FlowFlags[FlowFlags["Condition"] = 96] = "Condition";
-    })(ts.FlowFlags || (ts.FlowFlags = {}));
-    var FlowFlags = ts.FlowFlags;
     var OperationCanceledException = (function () {
         function OperationCanceledException() {
         }
         return OperationCanceledException;
     }());
     ts.OperationCanceledException = OperationCanceledException;
+    var ExitStatus;
     (function (ExitStatus) {
         ExitStatus[ExitStatus["Success"] = 0] = "Success";
         ExitStatus[ExitStatus["DiagnosticsPresent_OutputsSkipped"] = 1] = "DiagnosticsPresent_OutputsSkipped";
         ExitStatus[ExitStatus["DiagnosticsPresent_OutputsGenerated"] = 2] = "DiagnosticsPresent_OutputsGenerated";
-    })(ts.ExitStatus || (ts.ExitStatus = {}));
-    var ExitStatus = ts.ExitStatus;
-    (function (TypeFormatFlags) {
-        TypeFormatFlags[TypeFormatFlags["None"] = 0] = "None";
-        TypeFormatFlags[TypeFormatFlags["WriteArrayAsGenericType"] = 1] = "WriteArrayAsGenericType";
-        TypeFormatFlags[TypeFormatFlags["UseTypeOfFunction"] = 2] = "UseTypeOfFunction";
-        TypeFormatFlags[TypeFormatFlags["NoTruncation"] = 4] = "NoTruncation";
-        TypeFormatFlags[TypeFormatFlags["WriteArrowStyleSignature"] = 8] = "WriteArrowStyleSignature";
-        TypeFormatFlags[TypeFormatFlags["WriteOwnNameForAnyLike"] = 16] = "WriteOwnNameForAnyLike";
-        TypeFormatFlags[TypeFormatFlags["WriteTypeArgumentsOfSignature"] = 32] = "WriteTypeArgumentsOfSignature";
-        TypeFormatFlags[TypeFormatFlags["InElementType"] = 64] = "InElementType";
-        TypeFormatFlags[TypeFormatFlags["UseFullyQualifiedType"] = 128] = "UseFullyQualifiedType";
-        TypeFormatFlags[TypeFormatFlags["InFirstTypeArgument"] = 256] = "InFirstTypeArgument";
-        TypeFormatFlags[TypeFormatFlags["InTypeAlias"] = 512] = "InTypeAlias";
-        TypeFormatFlags[TypeFormatFlags["UseTypeAliasValue"] = 1024] = "UseTypeAliasValue";
-    })(ts.TypeFormatFlags || (ts.TypeFormatFlags = {}));
-    var TypeFormatFlags = ts.TypeFormatFlags;
-    (function (SymbolFormatFlags) {
-        SymbolFormatFlags[SymbolFormatFlags["None"] = 0] = "None";
-        SymbolFormatFlags[SymbolFormatFlags["WriteTypeParametersOrArguments"] = 1] = "WriteTypeParametersOrArguments";
-        SymbolFormatFlags[SymbolFormatFlags["UseOnlyExternalAliasing"] = 2] = "UseOnlyExternalAliasing";
-    })(ts.SymbolFormatFlags || (ts.SymbolFormatFlags = {}));
-    var SymbolFormatFlags = ts.SymbolFormatFlags;
-    (function (SymbolAccessibility) {
-        SymbolAccessibility[SymbolAccessibility["Accessible"] = 0] = "Accessible";
-        SymbolAccessibility[SymbolAccessibility["NotAccessible"] = 1] = "NotAccessible";
-        SymbolAccessibility[SymbolAccessibility["CannotBeNamed"] = 2] = "CannotBeNamed";
-    })(ts.SymbolAccessibility || (ts.SymbolAccessibility = {}));
-    var SymbolAccessibility = ts.SymbolAccessibility;
-    (function (TypePredicateKind) {
-        TypePredicateKind[TypePredicateKind["This"] = 0] = "This";
-        TypePredicateKind[TypePredicateKind["Identifier"] = 1] = "Identifier";
-    })(ts.TypePredicateKind || (ts.TypePredicateKind = {}));
-    var TypePredicateKind = ts.TypePredicateKind;
+    })(ExitStatus = ts.ExitStatus || (ts.ExitStatus = {}));
+    var TypeReferenceSerializationKind;
     (function (TypeReferenceSerializationKind) {
         TypeReferenceSerializationKind[TypeReferenceSerializationKind["Unknown"] = 0] = "Unknown";
         TypeReferenceSerializationKind[TypeReferenceSerializationKind["TypeWithConstructSignatureAndValue"] = 1] = "TypeWithConstructSignatureAndValue";
@@ -488,179 +45,19 @@ var ts;
         TypeReferenceSerializationKind[TypeReferenceSerializationKind["Promise"] = 8] = "Promise";
         TypeReferenceSerializationKind[TypeReferenceSerializationKind["TypeWithCallSignature"] = 9] = "TypeWithCallSignature";
         TypeReferenceSerializationKind[TypeReferenceSerializationKind["ObjectType"] = 10] = "ObjectType";
-    })(ts.TypeReferenceSerializationKind || (ts.TypeReferenceSerializationKind = {}));
-    var TypeReferenceSerializationKind = ts.TypeReferenceSerializationKind;
-    (function (SymbolFlags) {
-        SymbolFlags[SymbolFlags["None"] = 0] = "None";
-        SymbolFlags[SymbolFlags["FunctionScopedVariable"] = 1] = "FunctionScopedVariable";
-        SymbolFlags[SymbolFlags["BlockScopedVariable"] = 2] = "BlockScopedVariable";
-        SymbolFlags[SymbolFlags["Property"] = 4] = "Property";
-        SymbolFlags[SymbolFlags["EnumMember"] = 8] = "EnumMember";
-        SymbolFlags[SymbolFlags["Function"] = 16] = "Function";
-        SymbolFlags[SymbolFlags["Class"] = 32] = "Class";
-        SymbolFlags[SymbolFlags["Interface"] = 64] = "Interface";
-        SymbolFlags[SymbolFlags["ConstEnum"] = 128] = "ConstEnum";
-        SymbolFlags[SymbolFlags["RegularEnum"] = 256] = "RegularEnum";
-        SymbolFlags[SymbolFlags["ValueModule"] = 512] = "ValueModule";
-        SymbolFlags[SymbolFlags["NamespaceModule"] = 1024] = "NamespaceModule";
-        SymbolFlags[SymbolFlags["TypeLiteral"] = 2048] = "TypeLiteral";
-        SymbolFlags[SymbolFlags["ObjectLiteral"] = 4096] = "ObjectLiteral";
-        SymbolFlags[SymbolFlags["Method"] = 8192] = "Method";
-        SymbolFlags[SymbolFlags["Constructor"] = 16384] = "Constructor";
-        SymbolFlags[SymbolFlags["GetAccessor"] = 32768] = "GetAccessor";
-        SymbolFlags[SymbolFlags["SetAccessor"] = 65536] = "SetAccessor";
-        SymbolFlags[SymbolFlags["Signature"] = 131072] = "Signature";
-        SymbolFlags[SymbolFlags["TypeParameter"] = 262144] = "TypeParameter";
-        SymbolFlags[SymbolFlags["TypeAlias"] = 524288] = "TypeAlias";
-        SymbolFlags[SymbolFlags["ExportValue"] = 1048576] = "ExportValue";
-        SymbolFlags[SymbolFlags["ExportType"] = 2097152] = "ExportType";
-        SymbolFlags[SymbolFlags["ExportNamespace"] = 4194304] = "ExportNamespace";
-        SymbolFlags[SymbolFlags["Alias"] = 8388608] = "Alias";
-        SymbolFlags[SymbolFlags["Instantiated"] = 16777216] = "Instantiated";
-        SymbolFlags[SymbolFlags["Merged"] = 33554432] = "Merged";
-        SymbolFlags[SymbolFlags["Transient"] = 67108864] = "Transient";
-        SymbolFlags[SymbolFlags["Prototype"] = 134217728] = "Prototype";
-        SymbolFlags[SymbolFlags["SyntheticProperty"] = 268435456] = "SyntheticProperty";
-        SymbolFlags[SymbolFlags["Optional"] = 536870912] = "Optional";
-        SymbolFlags[SymbolFlags["ExportStar"] = 1073741824] = "ExportStar";
-        SymbolFlags[SymbolFlags["Enum"] = 384] = "Enum";
-        SymbolFlags[SymbolFlags["Variable"] = 3] = "Variable";
-        SymbolFlags[SymbolFlags["Value"] = 107455] = "Value";
-        SymbolFlags[SymbolFlags["Type"] = 793064] = "Type";
-        SymbolFlags[SymbolFlags["Namespace"] = 1920] = "Namespace";
-        SymbolFlags[SymbolFlags["Module"] = 1536] = "Module";
-        SymbolFlags[SymbolFlags["Accessor"] = 98304] = "Accessor";
-        SymbolFlags[SymbolFlags["FunctionScopedVariableExcludes"] = 107454] = "FunctionScopedVariableExcludes";
-        SymbolFlags[SymbolFlags["BlockScopedVariableExcludes"] = 107455] = "BlockScopedVariableExcludes";
-        SymbolFlags[SymbolFlags["ParameterExcludes"] = 107455] = "ParameterExcludes";
-        SymbolFlags[SymbolFlags["PropertyExcludes"] = 0] = "PropertyExcludes";
-        SymbolFlags[SymbolFlags["EnumMemberExcludes"] = 900095] = "EnumMemberExcludes";
-        SymbolFlags[SymbolFlags["FunctionExcludes"] = 106927] = "FunctionExcludes";
-        SymbolFlags[SymbolFlags["ClassExcludes"] = 899519] = "ClassExcludes";
-        SymbolFlags[SymbolFlags["InterfaceExcludes"] = 792968] = "InterfaceExcludes";
-        SymbolFlags[SymbolFlags["RegularEnumExcludes"] = 899327] = "RegularEnumExcludes";
-        SymbolFlags[SymbolFlags["ConstEnumExcludes"] = 899967] = "ConstEnumExcludes";
-        SymbolFlags[SymbolFlags["ValueModuleExcludes"] = 106639] = "ValueModuleExcludes";
-        SymbolFlags[SymbolFlags["NamespaceModuleExcludes"] = 0] = "NamespaceModuleExcludes";
-        SymbolFlags[SymbolFlags["MethodExcludes"] = 99263] = "MethodExcludes";
-        SymbolFlags[SymbolFlags["GetAccessorExcludes"] = 41919] = "GetAccessorExcludes";
-        SymbolFlags[SymbolFlags["SetAccessorExcludes"] = 74687] = "SetAccessorExcludes";
-        SymbolFlags[SymbolFlags["TypeParameterExcludes"] = 530920] = "TypeParameterExcludes";
-        SymbolFlags[SymbolFlags["TypeAliasExcludes"] = 793064] = "TypeAliasExcludes";
-        SymbolFlags[SymbolFlags["AliasExcludes"] = 8388608] = "AliasExcludes";
-        SymbolFlags[SymbolFlags["ModuleMember"] = 8914931] = "ModuleMember";
-        SymbolFlags[SymbolFlags["ExportHasLocal"] = 944] = "ExportHasLocal";
-        SymbolFlags[SymbolFlags["HasExports"] = 1952] = "HasExports";
-        SymbolFlags[SymbolFlags["HasMembers"] = 6240] = "HasMembers";
-        SymbolFlags[SymbolFlags["BlockScoped"] = 418] = "BlockScoped";
-        SymbolFlags[SymbolFlags["PropertyOrAccessor"] = 98308] = "PropertyOrAccessor";
-        SymbolFlags[SymbolFlags["Export"] = 7340032] = "Export";
-        SymbolFlags[SymbolFlags["ClassMember"] = 106500] = "ClassMember";
-        SymbolFlags[SymbolFlags["Classifiable"] = 788448] = "Classifiable";
-    })(ts.SymbolFlags || (ts.SymbolFlags = {}));
-    var SymbolFlags = ts.SymbolFlags;
-    (function (NodeCheckFlags) {
-        NodeCheckFlags[NodeCheckFlags["TypeChecked"] = 1] = "TypeChecked";
-        NodeCheckFlags[NodeCheckFlags["LexicalThis"] = 2] = "LexicalThis";
-        NodeCheckFlags[NodeCheckFlags["CaptureThis"] = 4] = "CaptureThis";
-        NodeCheckFlags[NodeCheckFlags["SuperInstance"] = 256] = "SuperInstance";
-        NodeCheckFlags[NodeCheckFlags["SuperStatic"] = 512] = "SuperStatic";
-        NodeCheckFlags[NodeCheckFlags["ContextChecked"] = 1024] = "ContextChecked";
-        NodeCheckFlags[NodeCheckFlags["AsyncMethodWithSuper"] = 2048] = "AsyncMethodWithSuper";
-        NodeCheckFlags[NodeCheckFlags["AsyncMethodWithSuperBinding"] = 4096] = "AsyncMethodWithSuperBinding";
-        NodeCheckFlags[NodeCheckFlags["CaptureArguments"] = 8192] = "CaptureArguments";
-        NodeCheckFlags[NodeCheckFlags["EnumValuesComputed"] = 16384] = "EnumValuesComputed";
-        NodeCheckFlags[NodeCheckFlags["LexicalModuleMergesWithClass"] = 32768] = "LexicalModuleMergesWithClass";
-        NodeCheckFlags[NodeCheckFlags["LoopWithCapturedBlockScopedBinding"] = 65536] = "LoopWithCapturedBlockScopedBinding";
-        NodeCheckFlags[NodeCheckFlags["CapturedBlockScopedBinding"] = 131072] = "CapturedBlockScopedBinding";
-        NodeCheckFlags[NodeCheckFlags["BlockScopedBindingInLoop"] = 262144] = "BlockScopedBindingInLoop";
-        NodeCheckFlags[NodeCheckFlags["ClassWithBodyScopedClassBinding"] = 524288] = "ClassWithBodyScopedClassBinding";
-        NodeCheckFlags[NodeCheckFlags["BodyScopedClassBinding"] = 1048576] = "BodyScopedClassBinding";
-        NodeCheckFlags[NodeCheckFlags["NeedsLoopOutParameter"] = 2097152] = "NeedsLoopOutParameter";
-        NodeCheckFlags[NodeCheckFlags["AssignmentsMarked"] = 4194304] = "AssignmentsMarked";
-        NodeCheckFlags[NodeCheckFlags["ClassWithConstructorReference"] = 8388608] = "ClassWithConstructorReference";
-        NodeCheckFlags[NodeCheckFlags["ConstructorReferenceInClass"] = 16777216] = "ConstructorReferenceInClass";
-    })(ts.NodeCheckFlags || (ts.NodeCheckFlags = {}));
-    var NodeCheckFlags = ts.NodeCheckFlags;
-    (function (TypeFlags) {
-        TypeFlags[TypeFlags["Any"] = 1] = "Any";
-        TypeFlags[TypeFlags["String"] = 2] = "String";
-        TypeFlags[TypeFlags["Number"] = 4] = "Number";
-        TypeFlags[TypeFlags["Boolean"] = 8] = "Boolean";
-        TypeFlags[TypeFlags["Enum"] = 16] = "Enum";
-        TypeFlags[TypeFlags["StringLiteral"] = 32] = "StringLiteral";
-        TypeFlags[TypeFlags["NumberLiteral"] = 64] = "NumberLiteral";
-        TypeFlags[TypeFlags["BooleanLiteral"] = 128] = "BooleanLiteral";
-        TypeFlags[TypeFlags["EnumLiteral"] = 256] = "EnumLiteral";
-        TypeFlags[TypeFlags["ESSymbol"] = 512] = "ESSymbol";
-        TypeFlags[TypeFlags["Void"] = 1024] = "Void";
-        TypeFlags[TypeFlags["Undefined"] = 2048] = "Undefined";
-        TypeFlags[TypeFlags["Null"] = 4096] = "Null";
-        TypeFlags[TypeFlags["Never"] = 8192] = "Never";
-        TypeFlags[TypeFlags["TypeParameter"] = 16384] = "TypeParameter";
-        TypeFlags[TypeFlags["Class"] = 32768] = "Class";
-        TypeFlags[TypeFlags["Interface"] = 65536] = "Interface";
-        TypeFlags[TypeFlags["Reference"] = 131072] = "Reference";
-        TypeFlags[TypeFlags["Tuple"] = 262144] = "Tuple";
-        TypeFlags[TypeFlags["Union"] = 524288] = "Union";
-        TypeFlags[TypeFlags["Intersection"] = 1048576] = "Intersection";
-        TypeFlags[TypeFlags["Anonymous"] = 2097152] = "Anonymous";
-        TypeFlags[TypeFlags["Instantiated"] = 4194304] = "Instantiated";
-        TypeFlags[TypeFlags["ObjectLiteral"] = 8388608] = "ObjectLiteral";
-        TypeFlags[TypeFlags["FreshLiteral"] = 16777216] = "FreshLiteral";
-        TypeFlags[TypeFlags["ContainsWideningType"] = 33554432] = "ContainsWideningType";
-        TypeFlags[TypeFlags["ContainsObjectLiteral"] = 67108864] = "ContainsObjectLiteral";
-        TypeFlags[TypeFlags["ContainsAnyFunctionType"] = 134217728] = "ContainsAnyFunctionType";
-        TypeFlags[TypeFlags["Nullable"] = 6144] = "Nullable";
-        TypeFlags[TypeFlags["Literal"] = 480] = "Literal";
-        TypeFlags[TypeFlags["StringOrNumberLiteral"] = 96] = "StringOrNumberLiteral";
-        TypeFlags[TypeFlags["DefinitelyFalsy"] = 7392] = "DefinitelyFalsy";
-        TypeFlags[TypeFlags["PossiblyFalsy"] = 7406] = "PossiblyFalsy";
-        TypeFlags[TypeFlags["Intrinsic"] = 16015] = "Intrinsic";
-        TypeFlags[TypeFlags["Primitive"] = 8190] = "Primitive";
-        TypeFlags[TypeFlags["StringLike"] = 34] = "StringLike";
-        TypeFlags[TypeFlags["NumberLike"] = 340] = "NumberLike";
-        TypeFlags[TypeFlags["BooleanLike"] = 136] = "BooleanLike";
-        TypeFlags[TypeFlags["EnumLike"] = 272] = "EnumLike";
-        TypeFlags[TypeFlags["ObjectType"] = 2588672] = "ObjectType";
-        TypeFlags[TypeFlags["UnionOrIntersection"] = 1572864] = "UnionOrIntersection";
-        TypeFlags[TypeFlags["StructuredType"] = 4161536] = "StructuredType";
-        TypeFlags[TypeFlags["StructuredOrTypeParameter"] = 4177920] = "StructuredOrTypeParameter";
-        TypeFlags[TypeFlags["Narrowable"] = 4178943] = "Narrowable";
-        TypeFlags[TypeFlags["NotUnionOrUnit"] = 2589185] = "NotUnionOrUnit";
-        TypeFlags[TypeFlags["RequiresWidening"] = 100663296] = "RequiresWidening";
-        TypeFlags[TypeFlags["PropagatingFlags"] = 234881024] = "PropagatingFlags";
-    })(ts.TypeFlags || (ts.TypeFlags = {}));
-    var TypeFlags = ts.TypeFlags;
-    (function (SignatureKind) {
-        SignatureKind[SignatureKind["Call"] = 0] = "Call";
-        SignatureKind[SignatureKind["Construct"] = 1] = "Construct";
-    })(ts.SignatureKind || (ts.SignatureKind = {}));
-    var SignatureKind = ts.SignatureKind;
-    (function (IndexKind) {
-        IndexKind[IndexKind["String"] = 0] = "String";
-        IndexKind[IndexKind["Number"] = 1] = "Number";
-    })(ts.IndexKind || (ts.IndexKind = {}));
-    var IndexKind = ts.IndexKind;
-    (function (SpecialPropertyAssignmentKind) {
-        SpecialPropertyAssignmentKind[SpecialPropertyAssignmentKind["None"] = 0] = "None";
-        SpecialPropertyAssignmentKind[SpecialPropertyAssignmentKind["ExportsProperty"] = 1] = "ExportsProperty";
-        SpecialPropertyAssignmentKind[SpecialPropertyAssignmentKind["ModuleExports"] = 2] = "ModuleExports";
-        SpecialPropertyAssignmentKind[SpecialPropertyAssignmentKind["PrototypeProperty"] = 3] = "PrototypeProperty";
-        SpecialPropertyAssignmentKind[SpecialPropertyAssignmentKind["ThisProperty"] = 4] = "ThisProperty";
-    })(ts.SpecialPropertyAssignmentKind || (ts.SpecialPropertyAssignmentKind = {}));
-    var SpecialPropertyAssignmentKind = ts.SpecialPropertyAssignmentKind;
+    })(TypeReferenceSerializationKind = ts.TypeReferenceSerializationKind || (ts.TypeReferenceSerializationKind = {}));
+    var DiagnosticCategory;
     (function (DiagnosticCategory) {
         DiagnosticCategory[DiagnosticCategory["Warning"] = 0] = "Warning";
         DiagnosticCategory[DiagnosticCategory["Error"] = 1] = "Error";
         DiagnosticCategory[DiagnosticCategory["Message"] = 2] = "Message";
-    })(ts.DiagnosticCategory || (ts.DiagnosticCategory = {}));
-    var DiagnosticCategory = ts.DiagnosticCategory;
+    })(DiagnosticCategory = ts.DiagnosticCategory || (ts.DiagnosticCategory = {}));
+    var ModuleResolutionKind;
     (function (ModuleResolutionKind) {
         ModuleResolutionKind[ModuleResolutionKind["Classic"] = 1] = "Classic";
         ModuleResolutionKind[ModuleResolutionKind["NodeJs"] = 2] = "NodeJs";
-    })(ts.ModuleResolutionKind || (ts.ModuleResolutionKind = {}));
-    var ModuleResolutionKind = ts.ModuleResolutionKind;
+    })(ModuleResolutionKind = ts.ModuleResolutionKind || (ts.ModuleResolutionKind = {}));
+    var ModuleKind;
     (function (ModuleKind) {
         ModuleKind[ModuleKind["None"] = 0] = "None";
         ModuleKind[ModuleKind["CommonJS"] = 1] = "CommonJS";
@@ -668,266 +65,16 @@ var ts;
         ModuleKind[ModuleKind["UMD"] = 3] = "UMD";
         ModuleKind[ModuleKind["System"] = 4] = "System";
         ModuleKind[ModuleKind["ES2015"] = 5] = "ES2015";
-    })(ts.ModuleKind || (ts.ModuleKind = {}));
-    var ModuleKind = ts.ModuleKind;
-    (function (JsxEmit) {
-        JsxEmit[JsxEmit["None"] = 0] = "None";
-        JsxEmit[JsxEmit["Preserve"] = 1] = "Preserve";
-        JsxEmit[JsxEmit["React"] = 2] = "React";
-    })(ts.JsxEmit || (ts.JsxEmit = {}));
-    var JsxEmit = ts.JsxEmit;
-    (function (NewLineKind) {
-        NewLineKind[NewLineKind["CarriageReturnLineFeed"] = 0] = "CarriageReturnLineFeed";
-        NewLineKind[NewLineKind["LineFeed"] = 1] = "LineFeed";
-    })(ts.NewLineKind || (ts.NewLineKind = {}));
-    var NewLineKind = ts.NewLineKind;
-    (function (ScriptKind) {
-        ScriptKind[ScriptKind["Unknown"] = 0] = "Unknown";
-        ScriptKind[ScriptKind["JS"] = 1] = "JS";
-        ScriptKind[ScriptKind["JSX"] = 2] = "JSX";
-        ScriptKind[ScriptKind["TS"] = 3] = "TS";
-        ScriptKind[ScriptKind["TSX"] = 4] = "TSX";
-    })(ts.ScriptKind || (ts.ScriptKind = {}));
-    var ScriptKind = ts.ScriptKind;
-    (function (ScriptTarget) {
-        ScriptTarget[ScriptTarget["ES3"] = 0] = "ES3";
-        ScriptTarget[ScriptTarget["ES5"] = 1] = "ES5";
-        ScriptTarget[ScriptTarget["ES2015"] = 2] = "ES2015";
-        ScriptTarget[ScriptTarget["ES2016"] = 3] = "ES2016";
-        ScriptTarget[ScriptTarget["ES2017"] = 4] = "ES2017";
-        ScriptTarget[ScriptTarget["Latest"] = 4] = "Latest";
-    })(ts.ScriptTarget || (ts.ScriptTarget = {}));
-    var ScriptTarget = ts.ScriptTarget;
-    (function (LanguageVariant) {
-        LanguageVariant[LanguageVariant["Standard"] = 0] = "Standard";
-        LanguageVariant[LanguageVariant["JSX"] = 1] = "JSX";
-    })(ts.LanguageVariant || (ts.LanguageVariant = {}));
-    var LanguageVariant = ts.LanguageVariant;
-    (function (DiagnosticStyle) {
-        DiagnosticStyle[DiagnosticStyle["Simple"] = 0] = "Simple";
-        DiagnosticStyle[DiagnosticStyle["Pretty"] = 1] = "Pretty";
-    })(ts.DiagnosticStyle || (ts.DiagnosticStyle = {}));
-    var DiagnosticStyle = ts.DiagnosticStyle;
-    (function (WatchDirectoryFlags) {
-        WatchDirectoryFlags[WatchDirectoryFlags["None"] = 0] = "None";
-        WatchDirectoryFlags[WatchDirectoryFlags["Recursive"] = 1] = "Recursive";
-    })(ts.WatchDirectoryFlags || (ts.WatchDirectoryFlags = {}));
-    var WatchDirectoryFlags = ts.WatchDirectoryFlags;
-    (function (CharacterCodes) {
-        CharacterCodes[CharacterCodes["nullCharacter"] = 0] = "nullCharacter";
-        CharacterCodes[CharacterCodes["maxAsciiCharacter"] = 127] = "maxAsciiCharacter";
-        CharacterCodes[CharacterCodes["lineFeed"] = 10] = "lineFeed";
-        CharacterCodes[CharacterCodes["carriageReturn"] = 13] = "carriageReturn";
-        CharacterCodes[CharacterCodes["lineSeparator"] = 8232] = "lineSeparator";
-        CharacterCodes[CharacterCodes["paragraphSeparator"] = 8233] = "paragraphSeparator";
-        CharacterCodes[CharacterCodes["nextLine"] = 133] = "nextLine";
-        CharacterCodes[CharacterCodes["space"] = 32] = "space";
-        CharacterCodes[CharacterCodes["nonBreakingSpace"] = 160] = "nonBreakingSpace";
-        CharacterCodes[CharacterCodes["enQuad"] = 8192] = "enQuad";
-        CharacterCodes[CharacterCodes["emQuad"] = 8193] = "emQuad";
-        CharacterCodes[CharacterCodes["enSpace"] = 8194] = "enSpace";
-        CharacterCodes[CharacterCodes["emSpace"] = 8195] = "emSpace";
-        CharacterCodes[CharacterCodes["threePerEmSpace"] = 8196] = "threePerEmSpace";
-        CharacterCodes[CharacterCodes["fourPerEmSpace"] = 8197] = "fourPerEmSpace";
-        CharacterCodes[CharacterCodes["sixPerEmSpace"] = 8198] = "sixPerEmSpace";
-        CharacterCodes[CharacterCodes["figureSpace"] = 8199] = "figureSpace";
-        CharacterCodes[CharacterCodes["punctuationSpace"] = 8200] = "punctuationSpace";
-        CharacterCodes[CharacterCodes["thinSpace"] = 8201] = "thinSpace";
-        CharacterCodes[CharacterCodes["hairSpace"] = 8202] = "hairSpace";
-        CharacterCodes[CharacterCodes["zeroWidthSpace"] = 8203] = "zeroWidthSpace";
-        CharacterCodes[CharacterCodes["narrowNoBreakSpace"] = 8239] = "narrowNoBreakSpace";
-        CharacterCodes[CharacterCodes["ideographicSpace"] = 12288] = "ideographicSpace";
-        CharacterCodes[CharacterCodes["mathematicalSpace"] = 8287] = "mathematicalSpace";
-        CharacterCodes[CharacterCodes["ogham"] = 5760] = "ogham";
-        CharacterCodes[CharacterCodes["_"] = 95] = "_";
-        CharacterCodes[CharacterCodes["$"] = 36] = "$";
-        CharacterCodes[CharacterCodes["_0"] = 48] = "_0";
-        CharacterCodes[CharacterCodes["_1"] = 49] = "_1";
-        CharacterCodes[CharacterCodes["_2"] = 50] = "_2";
-        CharacterCodes[CharacterCodes["_3"] = 51] = "_3";
-        CharacterCodes[CharacterCodes["_4"] = 52] = "_4";
-        CharacterCodes[CharacterCodes["_5"] = 53] = "_5";
-        CharacterCodes[CharacterCodes["_6"] = 54] = "_6";
-        CharacterCodes[CharacterCodes["_7"] = 55] = "_7";
-        CharacterCodes[CharacterCodes["_8"] = 56] = "_8";
-        CharacterCodes[CharacterCodes["_9"] = 57] = "_9";
-        CharacterCodes[CharacterCodes["a"] = 97] = "a";
-        CharacterCodes[CharacterCodes["b"] = 98] = "b";
-        CharacterCodes[CharacterCodes["c"] = 99] = "c";
-        CharacterCodes[CharacterCodes["d"] = 100] = "d";
-        CharacterCodes[CharacterCodes["e"] = 101] = "e";
-        CharacterCodes[CharacterCodes["f"] = 102] = "f";
-        CharacterCodes[CharacterCodes["g"] = 103] = "g";
-        CharacterCodes[CharacterCodes["h"] = 104] = "h";
-        CharacterCodes[CharacterCodes["i"] = 105] = "i";
-        CharacterCodes[CharacterCodes["j"] = 106] = "j";
-        CharacterCodes[CharacterCodes["k"] = 107] = "k";
-        CharacterCodes[CharacterCodes["l"] = 108] = "l";
-        CharacterCodes[CharacterCodes["m"] = 109] = "m";
-        CharacterCodes[CharacterCodes["n"] = 110] = "n";
-        CharacterCodes[CharacterCodes["o"] = 111] = "o";
-        CharacterCodes[CharacterCodes["p"] = 112] = "p";
-        CharacterCodes[CharacterCodes["q"] = 113] = "q";
-        CharacterCodes[CharacterCodes["r"] = 114] = "r";
-        CharacterCodes[CharacterCodes["s"] = 115] = "s";
-        CharacterCodes[CharacterCodes["t"] = 116] = "t";
-        CharacterCodes[CharacterCodes["u"] = 117] = "u";
-        CharacterCodes[CharacterCodes["v"] = 118] = "v";
-        CharacterCodes[CharacterCodes["w"] = 119] = "w";
-        CharacterCodes[CharacterCodes["x"] = 120] = "x";
-        CharacterCodes[CharacterCodes["y"] = 121] = "y";
-        CharacterCodes[CharacterCodes["z"] = 122] = "z";
-        CharacterCodes[CharacterCodes["A"] = 65] = "A";
-        CharacterCodes[CharacterCodes["B"] = 66] = "B";
-        CharacterCodes[CharacterCodes["C"] = 67] = "C";
-        CharacterCodes[CharacterCodes["D"] = 68] = "D";
-        CharacterCodes[CharacterCodes["E"] = 69] = "E";
-        CharacterCodes[CharacterCodes["F"] = 70] = "F";
-        CharacterCodes[CharacterCodes["G"] = 71] = "G";
-        CharacterCodes[CharacterCodes["H"] = 72] = "H";
-        CharacterCodes[CharacterCodes["I"] = 73] = "I";
-        CharacterCodes[CharacterCodes["J"] = 74] = "J";
-        CharacterCodes[CharacterCodes["K"] = 75] = "K";
-        CharacterCodes[CharacterCodes["L"] = 76] = "L";
-        CharacterCodes[CharacterCodes["M"] = 77] = "M";
-        CharacterCodes[CharacterCodes["N"] = 78] = "N";
-        CharacterCodes[CharacterCodes["O"] = 79] = "O";
-        CharacterCodes[CharacterCodes["P"] = 80] = "P";
-        CharacterCodes[CharacterCodes["Q"] = 81] = "Q";
-        CharacterCodes[CharacterCodes["R"] = 82] = "R";
-        CharacterCodes[CharacterCodes["S"] = 83] = "S";
-        CharacterCodes[CharacterCodes["T"] = 84] = "T";
-        CharacterCodes[CharacterCodes["U"] = 85] = "U";
-        CharacterCodes[CharacterCodes["V"] = 86] = "V";
-        CharacterCodes[CharacterCodes["W"] = 87] = "W";
-        CharacterCodes[CharacterCodes["X"] = 88] = "X";
-        CharacterCodes[CharacterCodes["Y"] = 89] = "Y";
-        CharacterCodes[CharacterCodes["Z"] = 90] = "Z";
-        CharacterCodes[CharacterCodes["ampersand"] = 38] = "ampersand";
-        CharacterCodes[CharacterCodes["asterisk"] = 42] = "asterisk";
-        CharacterCodes[CharacterCodes["at"] = 64] = "at";
-        CharacterCodes[CharacterCodes["backslash"] = 92] = "backslash";
-        CharacterCodes[CharacterCodes["backtick"] = 96] = "backtick";
-        CharacterCodes[CharacterCodes["bar"] = 124] = "bar";
-        CharacterCodes[CharacterCodes["caret"] = 94] = "caret";
-        CharacterCodes[CharacterCodes["closeBrace"] = 125] = "closeBrace";
-        CharacterCodes[CharacterCodes["closeBracket"] = 93] = "closeBracket";
-        CharacterCodes[CharacterCodes["closeParen"] = 41] = "closeParen";
-        CharacterCodes[CharacterCodes["colon"] = 58] = "colon";
-        CharacterCodes[CharacterCodes["comma"] = 44] = "comma";
-        CharacterCodes[CharacterCodes["dot"] = 46] = "dot";
-        CharacterCodes[CharacterCodes["doubleQuote"] = 34] = "doubleQuote";
-        CharacterCodes[CharacterCodes["equals"] = 61] = "equals";
-        CharacterCodes[CharacterCodes["exclamation"] = 33] = "exclamation";
-        CharacterCodes[CharacterCodes["greaterThan"] = 62] = "greaterThan";
-        CharacterCodes[CharacterCodes["hash"] = 35] = "hash";
-        CharacterCodes[CharacterCodes["lessThan"] = 60] = "lessThan";
-        CharacterCodes[CharacterCodes["minus"] = 45] = "minus";
-        CharacterCodes[CharacterCodes["openBrace"] = 123] = "openBrace";
-        CharacterCodes[CharacterCodes["openBracket"] = 91] = "openBracket";
-        CharacterCodes[CharacterCodes["openParen"] = 40] = "openParen";
-        CharacterCodes[CharacterCodes["percent"] = 37] = "percent";
-        CharacterCodes[CharacterCodes["plus"] = 43] = "plus";
-        CharacterCodes[CharacterCodes["question"] = 63] = "question";
-        CharacterCodes[CharacterCodes["semicolon"] = 59] = "semicolon";
-        CharacterCodes[CharacterCodes["singleQuote"] = 39] = "singleQuote";
-        CharacterCodes[CharacterCodes["slash"] = 47] = "slash";
-        CharacterCodes[CharacterCodes["tilde"] = 126] = "tilde";
-        CharacterCodes[CharacterCodes["backspace"] = 8] = "backspace";
-        CharacterCodes[CharacterCodes["formFeed"] = 12] = "formFeed";
-        CharacterCodes[CharacterCodes["byteOrderMark"] = 65279] = "byteOrderMark";
-        CharacterCodes[CharacterCodes["tab"] = 9] = "tab";
-        CharacterCodes[CharacterCodes["verticalTab"] = 11] = "verticalTab";
-    })(ts.CharacterCodes || (ts.CharacterCodes = {}));
-    var CharacterCodes = ts.CharacterCodes;
-    (function (TransformFlags) {
-        TransformFlags[TransformFlags["None"] = 0] = "None";
-        TransformFlags[TransformFlags["TypeScript"] = 1] = "TypeScript";
-        TransformFlags[TransformFlags["ContainsTypeScript"] = 2] = "ContainsTypeScript";
-        TransformFlags[TransformFlags["Jsx"] = 4] = "Jsx";
-        TransformFlags[TransformFlags["ContainsJsx"] = 8] = "ContainsJsx";
-        TransformFlags[TransformFlags["ES2017"] = 16] = "ES2017";
-        TransformFlags[TransformFlags["ContainsES2017"] = 32] = "ContainsES2017";
-        TransformFlags[TransformFlags["ES2016"] = 64] = "ES2016";
-        TransformFlags[TransformFlags["ContainsES2016"] = 128] = "ContainsES2016";
-        TransformFlags[TransformFlags["ES2015"] = 256] = "ES2015";
-        TransformFlags[TransformFlags["ContainsES2015"] = 512] = "ContainsES2015";
-        TransformFlags[TransformFlags["DestructuringAssignment"] = 1024] = "DestructuringAssignment";
-        TransformFlags[TransformFlags["Generator"] = 2048] = "Generator";
-        TransformFlags[TransformFlags["ContainsGenerator"] = 4096] = "ContainsGenerator";
-        TransformFlags[TransformFlags["ContainsDecorators"] = 8192] = "ContainsDecorators";
-        TransformFlags[TransformFlags["ContainsPropertyInitializer"] = 16384] = "ContainsPropertyInitializer";
-        TransformFlags[TransformFlags["ContainsLexicalThis"] = 32768] = "ContainsLexicalThis";
-        TransformFlags[TransformFlags["ContainsCapturedLexicalThis"] = 65536] = "ContainsCapturedLexicalThis";
-        TransformFlags[TransformFlags["ContainsLexicalThisInComputedPropertyName"] = 131072] = "ContainsLexicalThisInComputedPropertyName";
-        TransformFlags[TransformFlags["ContainsDefaultValueAssignments"] = 262144] = "ContainsDefaultValueAssignments";
-        TransformFlags[TransformFlags["ContainsParameterPropertyAssignments"] = 524288] = "ContainsParameterPropertyAssignments";
-        TransformFlags[TransformFlags["ContainsSpreadElementExpression"] = 1048576] = "ContainsSpreadElementExpression";
-        TransformFlags[TransformFlags["ContainsComputedPropertyName"] = 2097152] = "ContainsComputedPropertyName";
-        TransformFlags[TransformFlags["ContainsBlockScopedBinding"] = 4194304] = "ContainsBlockScopedBinding";
-        TransformFlags[TransformFlags["ContainsBindingPattern"] = 8388608] = "ContainsBindingPattern";
-        TransformFlags[TransformFlags["ContainsYield"] = 16777216] = "ContainsYield";
-        TransformFlags[TransformFlags["ContainsHoistedDeclarationOrCompletion"] = 33554432] = "ContainsHoistedDeclarationOrCompletion";
-        TransformFlags[TransformFlags["HasComputedFlags"] = 536870912] = "HasComputedFlags";
-        TransformFlags[TransformFlags["AssertTypeScript"] = 3] = "AssertTypeScript";
-        TransformFlags[TransformFlags["AssertJsx"] = 12] = "AssertJsx";
-        TransformFlags[TransformFlags["AssertES2017"] = 48] = "AssertES2017";
-        TransformFlags[TransformFlags["AssertES2016"] = 192] = "AssertES2016";
-        TransformFlags[TransformFlags["AssertES2015"] = 768] = "AssertES2015";
-        TransformFlags[TransformFlags["AssertGenerator"] = 6144] = "AssertGenerator";
-        TransformFlags[TransformFlags["NodeExcludes"] = 536874325] = "NodeExcludes";
-        TransformFlags[TransformFlags["ArrowFunctionExcludes"] = 592227669] = "ArrowFunctionExcludes";
-        TransformFlags[TransformFlags["FunctionExcludes"] = 592293205] = "FunctionExcludes";
-        TransformFlags[TransformFlags["ConstructorExcludes"] = 591760725] = "ConstructorExcludes";
-        TransformFlags[TransformFlags["MethodOrAccessorExcludes"] = 591760725] = "MethodOrAccessorExcludes";
-        TransformFlags[TransformFlags["ClassExcludes"] = 539749717] = "ClassExcludes";
-        TransformFlags[TransformFlags["ModuleExcludes"] = 574729557] = "ModuleExcludes";
-        TransformFlags[TransformFlags["TypeExcludes"] = -3] = "TypeExcludes";
-        TransformFlags[TransformFlags["ObjectLiteralExcludes"] = 539110741] = "ObjectLiteralExcludes";
-        TransformFlags[TransformFlags["ArrayLiteralOrCallOrNewExcludes"] = 537922901] = "ArrayLiteralOrCallOrNewExcludes";
-        TransformFlags[TransformFlags["VariableDeclarationListExcludes"] = 545262933] = "VariableDeclarationListExcludes";
-        TransformFlags[TransformFlags["ParameterExcludes"] = 545262933] = "ParameterExcludes";
-        TransformFlags[TransformFlags["TypeScriptClassSyntaxMask"] = 548864] = "TypeScriptClassSyntaxMask";
-        TransformFlags[TransformFlags["ES2015FunctionSyntaxMask"] = 327680] = "ES2015FunctionSyntaxMask";
-    })(ts.TransformFlags || (ts.TransformFlags = {}));
-    var TransformFlags = ts.TransformFlags;
-    (function (EmitFlags) {
-        EmitFlags[EmitFlags["EmitEmitHelpers"] = 1] = "EmitEmitHelpers";
-        EmitFlags[EmitFlags["EmitExportStar"] = 2] = "EmitExportStar";
-        EmitFlags[EmitFlags["EmitSuperHelper"] = 4] = "EmitSuperHelper";
-        EmitFlags[EmitFlags["EmitAdvancedSuperHelper"] = 8] = "EmitAdvancedSuperHelper";
-        EmitFlags[EmitFlags["UMDDefine"] = 16] = "UMDDefine";
-        EmitFlags[EmitFlags["SingleLine"] = 32] = "SingleLine";
-        EmitFlags[EmitFlags["AdviseOnEmitNode"] = 64] = "AdviseOnEmitNode";
-        EmitFlags[EmitFlags["NoSubstitution"] = 128] = "NoSubstitution";
-        EmitFlags[EmitFlags["CapturesThis"] = 256] = "CapturesThis";
-        EmitFlags[EmitFlags["NoLeadingSourceMap"] = 512] = "NoLeadingSourceMap";
-        EmitFlags[EmitFlags["NoTrailingSourceMap"] = 1024] = "NoTrailingSourceMap";
-        EmitFlags[EmitFlags["NoSourceMap"] = 1536] = "NoSourceMap";
-        EmitFlags[EmitFlags["NoNestedSourceMaps"] = 2048] = "NoNestedSourceMaps";
-        EmitFlags[EmitFlags["NoTokenLeadingSourceMaps"] = 4096] = "NoTokenLeadingSourceMaps";
-        EmitFlags[EmitFlags["NoTokenTrailingSourceMaps"] = 8192] = "NoTokenTrailingSourceMaps";
-        EmitFlags[EmitFlags["NoTokenSourceMaps"] = 12288] = "NoTokenSourceMaps";
-        EmitFlags[EmitFlags["NoLeadingComments"] = 16384] = "NoLeadingComments";
-        EmitFlags[EmitFlags["NoTrailingComments"] = 32768] = "NoTrailingComments";
-        EmitFlags[EmitFlags["NoComments"] = 49152] = "NoComments";
-        EmitFlags[EmitFlags["NoNestedComments"] = 65536] = "NoNestedComments";
-        EmitFlags[EmitFlags["ExportName"] = 131072] = "ExportName";
-        EmitFlags[EmitFlags["LocalName"] = 262144] = "LocalName";
-        EmitFlags[EmitFlags["Indented"] = 524288] = "Indented";
-        EmitFlags[EmitFlags["NoIndentation"] = 1048576] = "NoIndentation";
-        EmitFlags[EmitFlags["AsyncFunctionBody"] = 2097152] = "AsyncFunctionBody";
-        EmitFlags[EmitFlags["ReuseTempVariableScope"] = 4194304] = "ReuseTempVariableScope";
-        EmitFlags[EmitFlags["CustomPrologue"] = 8388608] = "CustomPrologue";
-    })(ts.EmitFlags || (ts.EmitFlags = {}));
-    var EmitFlags = ts.EmitFlags;
-    (function (EmitContext) {
-        EmitContext[EmitContext["SourceFile"] = 0] = "SourceFile";
-        EmitContext[EmitContext["Expression"] = 1] = "Expression";
-        EmitContext[EmitContext["IdentifierName"] = 2] = "IdentifierName";
-        EmitContext[EmitContext["Unspecified"] = 3] = "Unspecified";
-    })(ts.EmitContext || (ts.EmitContext = {}));
-    var EmitContext = ts.EmitContext;
+    })(ModuleKind = ts.ModuleKind || (ts.ModuleKind = {}));
+    var Extension;
+    (function (Extension) {
+        Extension[Extension["Ts"] = 0] = "Ts";
+        Extension[Extension["Tsx"] = 1] = "Tsx";
+        Extension[Extension["Dts"] = 2] = "Dts";
+        Extension[Extension["Js"] = 3] = "Js";
+        Extension[Extension["Jsx"] = 4] = "Jsx";
+        Extension[Extension["LastTypeScriptExtension"] = 2] = "LastTypeScriptExtension";
+    })(Extension = ts.Extension || (ts.Extension = {}));
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -990,12 +137,6 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    (function (Ternary) {
-        Ternary[Ternary["False"] = 0] = "False";
-        Ternary[Ternary["Maybe"] = 1] = "Maybe";
-        Ternary[Ternary["True"] = -1] = "True";
-    })(ts.Ternary || (ts.Ternary = {}));
-    var Ternary = ts.Ternary;
     var createObject = Object.create;
     ts.collator = typeof Intl === "object" && typeof Intl.Collator === "function" ? new Intl.Collator() : undefined;
     function createMap(template) {
@@ -1060,12 +201,6 @@ var ts;
         return getCanonicalFileName(nonCanonicalizedPath);
     }
     ts.toPath = toPath;
-    (function (Comparison) {
-        Comparison[Comparison["LessThan"] = -1] = "LessThan";
-        Comparison[Comparison["EqualTo"] = 0] = "EqualTo";
-        Comparison[Comparison["GreaterThan"] = 1] = "GreaterThan";
-    })(ts.Comparison || (ts.Comparison = {}));
-    var Comparison = ts.Comparison;
     function forEach(array, callback) {
         if (array) {
             for (var i = 0, len = array.length; i < len; i++) {
@@ -1078,6 +213,13 @@ var ts;
         return undefined;
     }
     ts.forEach = forEach;
+    function zipWith(arrayA, arrayB, callback) {
+        Debug.assert(arrayA.length === arrayB.length);
+        for (var i = 0; i < arrayA.length; i++) {
+            callback(arrayA[i], arrayB[i], i);
+        }
+    }
+    ts.zipWith = zipWith;
     function every(array, callback) {
         if (array) {
             for (var i = 0, len = array.length; i < len; i++) {
@@ -1337,20 +479,25 @@ var ts;
     ts.mapObject = mapObject;
     function some(array, predicate) {
         if (array) {
-            for (var _i = 0, array_5 = array; _i < array_5.length; _i++) {
-                var v = array_5[_i];
-                if (!predicate || predicate(v)) {
-                    return true;
+            if (predicate) {
+                for (var _i = 0, array_5 = array; _i < array_5.length; _i++) {
+                    var v = array_5[_i];
+                    if (predicate(v)) {
+                        return true;
+                    }
                 }
             }
+            else {
+                return array.length > 0;
+            }
         }
         return false;
     }
     ts.some = some;
     function concatenate(array1, array2) {
-        if (!array2 || !array2.length)
+        if (!some(array2))
             return array1;
-        if (!array1 || !array1.length)
+        if (!some(array1))
             return array2;
         return array1.concat(array2);
     }
@@ -1373,6 +520,41 @@ var ts;
         return result;
     }
     ts.deduplicate = deduplicate;
+    function arrayIsEqualTo(array1, array2, equaler) {
+        if (!array1 || !array2) {
+            return array1 === array2;
+        }
+        if (array1.length !== array2.length) {
+            return false;
+        }
+        for (var i = 0; i < array1.length; i++) {
+            var equals = equaler ? equaler(array1[i], array2[i]) : array1[i] === array2[i];
+            if (!equals) {
+                return false;
+            }
+        }
+        return true;
+    }
+    ts.arrayIsEqualTo = arrayIsEqualTo;
+    function changesAffectModuleResolution(oldOptions, newOptions) {
+        return !oldOptions ||
+            (oldOptions.module !== newOptions.module) ||
+            (oldOptions.moduleResolution !== newOptions.moduleResolution) ||
+            (oldOptions.noResolve !== newOptions.noResolve) ||
+            (oldOptions.target !== newOptions.target) ||
+            (oldOptions.noLib !== newOptions.noLib) ||
+            (oldOptions.jsx !== newOptions.jsx) ||
+            (oldOptions.allowJs !== newOptions.allowJs) ||
+            (oldOptions.rootDir !== newOptions.rootDir) ||
+            (oldOptions.configFilePath !== newOptions.configFilePath) ||
+            (oldOptions.baseUrl !== newOptions.baseUrl) ||
+            (oldOptions.maxNodeModuleJsDepth !== newOptions.maxNodeModuleJsDepth) ||
+            !arrayIsEqualTo(oldOptions.lib, newOptions.lib) ||
+            !arrayIsEqualTo(oldOptions.typeRoots, newOptions.typeRoots) ||
+            !arrayIsEqualTo(oldOptions.rootDirs, newOptions.rootDirs) ||
+            !equalOwnProperties(oldOptions.paths, newOptions.paths);
+    }
+    ts.changesAffectModuleResolution = changesAffectModuleResolution;
     function compact(array) {
         var result;
         if (array) {
@@ -1391,6 +573,26 @@ var ts;
         return result || array;
     }
     ts.compact = compact;
+    function relativeComplement(arrayA, arrayB, comparer, offsetA, offsetB) {
+        if (comparer === void 0) { comparer = compareValues; }
+        if (offsetA === void 0) { offsetA = 0; }
+        if (offsetB === void 0) { offsetB = 0; }
+        if (!arrayB || !arrayA || arrayB.length === 0 || arrayA.length === 0)
+            return arrayB;
+        var result = [];
+        outer: for (; offsetB < arrayB.length; offsetB++) {
+            inner: for (; offsetA < arrayA.length; offsetA++) {
+                switch (comparer(arrayB[offsetB], arrayA[offsetA])) {
+                    case -1: break inner;
+                    case 0: continue outer;
+                    case 1: continue inner;
+                }
+            }
+            result.push(arrayB[offsetB]);
+        }
+        return result;
+    }
+    ts.relativeComplement = relativeComplement;
     function sum(array, prop) {
         var result = 0;
         for (var _i = 0, array_7 = array; _i < array_7.length; _i++) {
@@ -1400,15 +602,23 @@ var ts;
         return result;
     }
     ts.sum = sum;
+    function append(to, value) {
+        if (value === undefined)
+            return to;
+        if (to === undefined)
+            to = [];
+        to.push(value);
+        return to;
+    }
+    ts.append = append;
     function addRange(to, from) {
-        if (to && from) {
-            for (var _i = 0, from_1 = from; _i < from_1.length; _i++) {
-                var v = from_1[_i];
-                if (v !== undefined) {
-                    to.push(v);
-                }
-            }
+        if (from === undefined)
+            return to;
+        for (var _i = 0, from_1 = from; _i < from_1.length; _i++) {
+            var v = from_1[_i];
+            to = append(to, v);
         }
+        return to;
     }
     ts.addRange = addRange;
     function rangeEquals(array1, array2, pos, end) {
@@ -1427,6 +637,12 @@ var ts;
             : undefined;
     }
     ts.firstOrUndefined = firstOrUndefined;
+    function lastOrUndefined(array) {
+        return array && array.length > 0
+            ? array[array.length - 1]
+            : undefined;
+    }
+    ts.lastOrUndefined = lastOrUndefined;
     function singleOrUndefined(array) {
         return array && array.length === 1
             ? array[0]
@@ -1439,17 +655,17 @@ var ts;
             : array;
     }
     ts.singleOrMany = singleOrMany;
-    function lastOrUndefined(array) {
-        return array && array.length > 0
-            ? array[array.length - 1]
-            : undefined;
+    function replaceElement(array, index, value) {
+        var result = array.slice(0);
+        result[index] = value;
+        return result;
     }
-    ts.lastOrUndefined = lastOrUndefined;
-    function binarySearch(array, value, comparer) {
+    ts.replaceElement = replaceElement;
+    function binarySearch(array, value, comparer, offset) {
         if (!array || array.length === 0) {
             return -1;
         }
-        var low = 0;
+        var low = offset || 0;
         var high = array.length - 1;
         comparer = comparer !== undefined
             ? comparer
@@ -1683,6 +899,12 @@ var ts;
         return Array.isArray ? Array.isArray(value) : value instanceof Array;
     }
     ts.isArray = isArray;
+    function noop() { }
+    ts.noop = noop;
+    function notImplemented() {
+        throw new Error("Not implemented");
+    }
+    ts.notImplemented = notImplemented;
     function memoize(callback) {
         var value;
         return function () {
@@ -1798,6 +1020,17 @@ var ts;
         };
     }
     ts.createCompilerDiagnostic = createCompilerDiagnostic;
+    function createCompilerDiagnosticFromMessageChain(chain) {
+        return {
+            file: undefined,
+            start: undefined,
+            length: undefined,
+            code: chain.code,
+            category: chain.category,
+            messageText: chain.next ? chain : chain.messageText
+        };
+    }
+    ts.createCompilerDiagnosticFromMessageChain = createCompilerDiagnosticFromMessageChain;
     function chainDiagnosticMessages(details, message) {
         var text = getLocaleSpecificMessage(message);
         if (arguments.length > 2) {
@@ -2190,6 +1423,10 @@ var ts;
         return expectedPos >= 0 && str.indexOf(suffix, expectedPos) === expectedPos;
     }
     ts.endsWith = endsWith;
+    function hasExtension(fileName) {
+        return getBaseFileName(fileName).indexOf(".") >= 0;
+    }
+    ts.hasExtension = hasExtension;
     function fileExtensionIs(path, extension) {
         return path.length > extension.length && endsWith(path, extension);
     }
@@ -2217,68 +1454,83 @@ var ts;
         var doubleAsteriskRegexFragment = usage === "exclude" ? "(/.+?)?" : "(/[^/.][^/]*)*?";
         var pattern = "";
         var hasWrittenSubpattern = false;
-        spec: for (var _i = 0, specs_1 = specs; _i < specs_1.length; _i++) {
+        for (var _i = 0, specs_1 = specs; _i < specs_1.length; _i++) {
             var spec = specs_1[_i];
             if (!spec) {
                 continue;
             }
-            var subpattern = "";
-            var hasRecursiveDirectoryWildcard = false;
-            var hasWrittenComponent = false;
-            var components = getNormalizedPathComponents(spec, basePath);
-            if (usage !== "exclude" && components[components.length - 1] === "**") {
-                continue spec;
-            }
-            components[0] = removeTrailingDirectorySeparator(components[0]);
-            var optionalCount = 0;
-            for (var _a = 0, components_1 = components; _a < components_1.length; _a++) {
-                var component = components_1[_a];
-                if (component === "**") {
-                    if (hasRecursiveDirectoryWildcard) {
-                        continue spec;
-                    }
-                    subpattern += doubleAsteriskRegexFragment;
-                    hasRecursiveDirectoryWildcard = true;
-                    hasWrittenComponent = true;
-                }
-                else {
-                    if (usage === "directories") {
-                        subpattern += "(";
-                        optionalCount++;
-                    }
-                    if (hasWrittenComponent) {
-                        subpattern += ts.directorySeparator;
-                    }
-                    if (usage !== "exclude") {
-                        if (component.charCodeAt(0) === 42) {
-                            subpattern += "([^./]" + singleAsteriskRegexFragment + ")?";
-                            component = component.substr(1);
-                        }
-                        else if (component.charCodeAt(0) === 63) {
-                            subpattern += "[^./]";
-                            component = component.substr(1);
-                        }
-                    }
-                    subpattern += component.replace(reservedCharacterPattern, replaceWildcardCharacter);
-                    hasWrittenComponent = true;
-                }
-            }
-            while (optionalCount > 0) {
-                subpattern += ")?";
-                optionalCount--;
+            var subPattern = getSubPatternFromSpec(spec, basePath, usage, singleAsteriskRegexFragment, doubleAsteriskRegexFragment, replaceWildcardCharacter);
+            if (subPattern === undefined) {
+                continue;
             }
             if (hasWrittenSubpattern) {
                 pattern += "|";
             }
-            pattern += "(" + subpattern + ")";
+            pattern += "(" + subPattern + ")";
             hasWrittenSubpattern = true;
         }
         if (!pattern) {
             return undefined;
         }
-        return "^(" + pattern + (usage === "exclude" ? ")($|/)" : ")$");
+        var terminator = usage === "exclude" ? "($|/)" : "$";
+        return "^(" + pattern + ")" + terminator;
     }
     ts.getRegularExpressionForWildcard = getRegularExpressionForWildcard;
+    function isImplicitGlob(lastPathComponent) {
+        return !/[.*?]/.test(lastPathComponent);
+    }
+    ts.isImplicitGlob = isImplicitGlob;
+    function getSubPatternFromSpec(spec, basePath, usage, singleAsteriskRegexFragment, doubleAsteriskRegexFragment, replaceWildcardCharacter) {
+        var subpattern = "";
+        var hasRecursiveDirectoryWildcard = false;
+        var hasWrittenComponent = false;
+        var components = getNormalizedPathComponents(spec, basePath);
+        var lastComponent = lastOrUndefined(components);
+        if (usage !== "exclude" && lastComponent === "**") {
+            return undefined;
+        }
+        components[0] = removeTrailingDirectorySeparator(components[0]);
+        if (isImplicitGlob(lastComponent)) {
+            components.push("**", "*");
+        }
+        var optionalCount = 0;
+        for (var _i = 0, components_1 = components; _i < components_1.length; _i++) {
+            var component = components_1[_i];
+            if (component === "**") {
+                if (hasRecursiveDirectoryWildcard) {
+                    return undefined;
+                }
+                subpattern += doubleAsteriskRegexFragment;
+                hasRecursiveDirectoryWildcard = true;
+            }
+            else {
+                if (usage === "directories") {
+                    subpattern += "(";
+                    optionalCount++;
+                }
+                if (hasWrittenComponent) {
+                    subpattern += ts.directorySeparator;
+                }
+                if (usage !== "exclude") {
+                    if (component.charCodeAt(0) === 42) {
+                        subpattern += "([^./]" + singleAsteriskRegexFragment + ")?";
+                        component = component.substr(1);
+                    }
+                    else if (component.charCodeAt(0) === 63) {
+                        subpattern += "[^./]";
+                        component = component.substr(1);
+                    }
+                }
+                subpattern += component.replace(reservedCharacterPattern, replaceWildcardCharacter);
+            }
+            hasWrittenComponent = true;
+        }
+        while (optionalCount > 0) {
+            subpattern += ")?";
+            optionalCount--;
+        }
+        return subpattern;
+    }
     function replaceWildCardCharacterFiles(match) {
         return replaceWildcardCharacter(match, singleAsteriskRegexFragmentFiles);
     }
@@ -2345,25 +1597,30 @@ var ts;
             for (var _i = 0, includes_1 = includes; _i < includes_1.length; _i++) {
                 var include = includes_1[_i];
                 var absolute = isRootedDiskPath(include) ? include : normalizePath(combinePaths(path, include));
-                var wildcardOffset = indexOfAnyCharCode(absolute, wildcardCharCodes);
-                var includeBasePath = wildcardOffset < 0
-                    ? removeTrailingDirectorySeparator(getDirectoryPath(absolute))
-                    : absolute.substring(0, absolute.lastIndexOf(ts.directorySeparator, wildcardOffset));
-                includeBasePaths.push(includeBasePath);
+                includeBasePaths.push(getIncludeBasePath(absolute));
             }
             includeBasePaths.sort(useCaseSensitiveFileNames ? compareStrings : compareStringsCaseInsensitive);
-            include: for (var i = 0; i < includeBasePaths.length; i++) {
-                var includeBasePath = includeBasePaths[i];
-                for (var j = 0; j < basePaths.length; j++) {
-                    if (containsPath(basePaths[j], includeBasePath, path, !useCaseSensitiveFileNames)) {
-                        continue include;
-                    }
+            var _loop_1 = function (includeBasePath) {
+                if (ts.every(basePaths, function (basePath) { return !containsPath(basePath, includeBasePath, path, !useCaseSensitiveFileNames); })) {
+                    basePaths.push(includeBasePath);
                 }
-                basePaths.push(includeBasePath);
+            };
+            for (var _a = 0, includeBasePaths_1 = includeBasePaths; _a < includeBasePaths_1.length; _a++) {
+                var includeBasePath = includeBasePaths_1[_a];
+                _loop_1(includeBasePath);
             }
         }
         return basePaths;
     }
+    function getIncludeBasePath(absolute) {
+        var wildcardOffset = indexOfAnyCharCode(absolute, wildcardCharCodes);
+        if (wildcardOffset < 0) {
+            return !hasExtension(absolute)
+                ? absolute
+                : removeTrailingDirectorySeparator(getDirectoryPath(absolute));
+        }
+        return absolute.substring(0, absolute.lastIndexOf(ts.directorySeparator, wildcardOffset));
+    }
     function ensureScriptKind(fileName, scriptKind) {
         return (scriptKind || getScriptKindFromFileName(fileName)) || 3;
     }
@@ -2413,14 +1670,6 @@ var ts;
         return false;
     }
     ts.isSupportedSourceFileName = isSupportedSourceFileName;
-    (function (ExtensionPriority) {
-        ExtensionPriority[ExtensionPriority["TypeScriptFiles"] = 0] = "TypeScriptFiles";
-        ExtensionPriority[ExtensionPriority["DeclarationAndJavaScriptFiles"] = 2] = "DeclarationAndJavaScriptFiles";
-        ExtensionPriority[ExtensionPriority["Limit"] = 5] = "Limit";
-        ExtensionPriority[ExtensionPriority["Highest"] = 0] = "Highest";
-        ExtensionPriority[ExtensionPriority["Lowest"] = 2] = "Lowest";
-    })(ts.ExtensionPriority || (ts.ExtensionPriority = {}));
-    var ExtensionPriority = ts.ExtensionPriority;
     function getExtensionPriority(path, supportedExtensions) {
         for (var i = supportedExtensions.length - 1; i >= 0; i--) {
             if (fileExtensionIs(path, supportedExtensions[i])) {
@@ -2471,10 +1720,6 @@ var ts;
         return path.substring(0, path.length - extension.length);
     }
     ts.removeExtension = removeExtension;
-    function isJsxOrTsxExtension(ext) {
-        return ext === ".jsx" || ext === ".tsx";
-    }
-    ts.isJsxOrTsxExtension = isJsxOrTsxExtension;
     function changeExtension(path, newExtension) {
         return (removeFileExtension(path) + newExtension);
     }
@@ -2509,13 +1754,6 @@ var ts;
         getTypeConstructor: function () { return Type; },
         getSignatureConstructor: function () { return Signature; }
     };
-    (function (AssertionLevel) {
-        AssertionLevel[AssertionLevel["None"] = 0] = "None";
-        AssertionLevel[AssertionLevel["Normal"] = 1] = "Normal";
-        AssertionLevel[AssertionLevel["Aggressive"] = 2] = "Aggressive";
-        AssertionLevel[AssertionLevel["VeryAggressive"] = 3] = "VeryAggressive";
-    })(ts.AssertionLevel || (ts.AssertionLevel = {}));
-    var AssertionLevel = ts.AssertionLevel;
     var Debug;
     (function (Debug) {
         Debug.currentAssertionLevel = 0;
@@ -2627,6 +1865,36 @@ var ts;
         return !(pos >= 0);
     }
     ts.positionIsSynthesized = positionIsSynthesized;
+    function extensionIsTypeScript(ext) {
+        return ext <= ts.Extension.LastTypeScriptExtension;
+    }
+    ts.extensionIsTypeScript = extensionIsTypeScript;
+    function extensionFromPath(path) {
+        var ext = tryGetExtensionFromPath(path);
+        if (ext !== undefined) {
+            return ext;
+        }
+        Debug.fail("File " + path + " has unknown extension.");
+    }
+    ts.extensionFromPath = extensionFromPath;
+    function tryGetExtensionFromPath(path) {
+        if (fileExtensionIs(path, ".d.ts")) {
+            return ts.Extension.Dts;
+        }
+        if (fileExtensionIs(path, ".ts")) {
+            return ts.Extension.Ts;
+        }
+        if (fileExtensionIs(path, ".tsx")) {
+            return ts.Extension.Tsx;
+        }
+        if (fileExtensionIs(path, ".js")) {
+            return ts.Extension.Js;
+        }
+        if (fileExtensionIs(path, ".jsx")) {
+            return ts.Extension.Jsx;
+        }
+    }
+    ts.tryGetExtensionFromPath = tryGetExtensionFromPath;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -2900,11 +2168,6 @@ var ts;
             function readDirectory(path, extensions, excludes, includes) {
                 return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), getAccessibleFileSystemEntries);
             }
-            var FileSystemEntryKind;
-            (function (FileSystemEntryKind) {
-                FileSystemEntryKind[FileSystemEntryKind["File"] = 0] = "File";
-                FileSystemEntryKind[FileSystemEntryKind["Directory"] = 1] = "Directory";
-            })(FileSystemEntryKind || (FileSystemEntryKind = {}));
             function fileSystemEntryExists(path, entryKind) {
                 try {
                     var stat = _fs.statSync(path);
@@ -2926,6 +2189,7 @@ var ts;
             function getDirectories(path) {
                 return ts.filter(_fs.readdirSync(path), function (dir) { return fileSystemEntryExists(ts.combinePaths(path, dir), 1); });
             }
+            var noOpFileWatcher = { close: ts.noop };
             var nodeSystem = {
                 args: process.argv.slice(2),
                 newLine: _os.EOL,
@@ -2935,7 +2199,7 @@ var ts;
                 },
                 readFile: readFile,
                 writeFile: writeFile,
-                watchFile: function (fileName, callback) {
+                watchFile: function (fileName, callback, pollingInterval) {
                     if (useNonPollingWatchers) {
                         var watchedFile_1 = watchedFileSet.addFile(fileName, callback);
                         return {
@@ -2943,7 +2207,7 @@ var ts;
                         };
                     }
                     else {
-                        _fs.watchFile(fileName, { persistent: true, interval: 250 }, fileChanged);
+                        _fs.watchFile(fileName, { persistent: true, interval: pollingInterval || 250 }, fileChanged);
                         return {
                             close: function () { return _fs.unwatchFile(fileName, fileChanged); }
                         };
@@ -2958,7 +2222,7 @@ var ts;
                 watchDirectory: function (directoryName, callback, recursive) {
                     var options;
                     if (!directoryExists(directoryName)) {
-                        return;
+                        return noOpFileWatcher;
                     }
                     if (isNode4OrLater() && (process.platform === "win32" || process.platform === "darwin")) {
                         options = { persistent: true, recursive: !!recursive };
@@ -3035,7 +2299,9 @@ var ts;
                     }
                     catch (e) {
                     }
-                }
+                },
+                setTimeout: setTimeout,
+                clearTimeout: clearTimeout
             };
             return nodeSystem;
         }
@@ -3153,7 +2419,7 @@ var ts;
         A_set_accessor_parameter_cannot_have_an_initializer: { code: 1052, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_parameter_cannot_have_an_initializer_1052", message: "A 'set' accessor parameter cannot have an initializer." },
         A_set_accessor_cannot_have_rest_parameter: { code: 1053, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_cannot_have_rest_parameter_1053", message: "A 'set' accessor cannot have rest parameter." },
         A_get_accessor_cannot_have_parameters: { code: 1054, category: ts.DiagnosticCategory.Error, key: "A_get_accessor_cannot_have_parameters_1054", message: "A 'get' accessor cannot have parameters." },
-        Type_0_is_not_a_valid_async_function_return_type: { code: 1055, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_a_valid_async_function_return_type_1055", message: "Type '{0}' is not a valid async function return type." },
+        Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value: { code: 1055, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Prom_1055", message: "Type '{0}' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value." },
         Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher: { code: 1056, category: ts.DiagnosticCategory.Error, key: "Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher_1056", message: "Accessors are only available when targeting ECMAScript 5 and higher." },
         An_async_function_or_method_must_have_a_valid_awaitable_return_type: { code: 1057, category: ts.DiagnosticCategory.Error, key: "An_async_function_or_method_must_have_a_valid_awaitable_return_type_1057", message: "An async function or method must have a valid awaitable return type." },
         Operand_for_await_does_not_have_a_valid_callable_then_member: { code: 1058, category: ts.DiagnosticCategory.Error, key: "Operand_for_await_does_not_have_a_valid_callable_then_member_1058", message: "Operand for 'await' does not have a valid callable 'then' member." },
@@ -3263,7 +2529,6 @@ var ts;
         Module_0_has_no_default_export: { code: 1192, category: ts.DiagnosticCategory.Error, key: "Module_0_has_no_default_export_1192", message: "Module '{0}' has no default export." },
         An_export_declaration_cannot_have_modifiers: { code: 1193, category: ts.DiagnosticCategory.Error, key: "An_export_declaration_cannot_have_modifiers_1193", message: "An export declaration cannot have modifiers." },
         Export_declarations_are_not_permitted_in_a_namespace: { code: 1194, category: ts.DiagnosticCategory.Error, key: "Export_declarations_are_not_permitted_in_a_namespace_1194", message: "Export declarations are not permitted in a namespace." },
-        Catch_clause_variable_name_must_be_an_identifier: { code: 1195, category: ts.DiagnosticCategory.Error, key: "Catch_clause_variable_name_must_be_an_identifier_1195", message: "Catch clause variable name must be an identifier." },
         Catch_clause_variable_cannot_have_a_type_annotation: { code: 1196, category: ts.DiagnosticCategory.Error, key: "Catch_clause_variable_cannot_have_a_type_annotation_1196", message: "Catch clause variable cannot have a type annotation." },
         Catch_clause_variable_cannot_have_an_initializer: { code: 1197, category: ts.DiagnosticCategory.Error, key: "Catch_clause_variable_cannot_have_an_initializer_1197", message: "Catch clause variable cannot have an initializer." },
         An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive: { code: 1198, category: ts.DiagnosticCategory.Error, key: "An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive_1198", message: "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive." },
@@ -3381,14 +2646,14 @@ var ts;
         Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1: { code: 2353, category: ts.DiagnosticCategory.Error, key: "Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1_2353", message: "Object literal may only specify known properties, and '{0}' does not exist in type '{1}'." },
         A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value: { code: 2355, category: ts.DiagnosticCategory.Error, key: "A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value_2355", message: "A function whose declared type is neither 'void' nor 'any' must return a value." },
         An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type: { code: 2356, category: ts.DiagnosticCategory.Error, key: "An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type_2356", message: "An arithmetic operand must be of type 'any', 'number' or an enum type." },
-        The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer: { code: 2357, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer_2357", message: "The operand of an increment or decrement operator must be a variable, property or indexer." },
+        The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_or_a_property_access: { code: 2357, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_or_a_property_access_2357", message: "The operand of an increment or decrement operator must be a variable or a property access." },
         The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2358, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_paramete_2358", message: "The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter." },
         The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_Function_interface_type: { code: 2359, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_F_2359", message: "The right-hand side of an 'instanceof' expression must be of type 'any' or of a type assignable to the 'Function' interface type." },
         The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol: { code: 2360, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol_2360", message: "The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'." },
         The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2361, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter_2361", message: "The right-hand side of an 'in' expression must be of type 'any', an object type or a type parameter" },
         The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2362, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type_2362", message: "The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
         The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2363, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type_2363", message: "The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
-        Invalid_left_hand_side_of_assignment_expression: { code: 2364, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_of_assignment_expression_2364", message: "Invalid left-hand side of assignment expression." },
+        The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access: { code: 2364, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access_2364", message: "The left-hand side of an assignment expression must be a variable or a property access." },
         Operator_0_cannot_be_applied_to_types_1_and_2: { code: 2365, category: ts.DiagnosticCategory.Error, key: "Operator_0_cannot_be_applied_to_types_1_and_2_2365", message: "Operator '{0}' cannot be applied to types '{1}' and '{2}'." },
         Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined: { code: 2366, category: ts.DiagnosticCategory.Error, key: "Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined_2366", message: "Function lacks ending return statement and return type does not include 'undefined'." },
         Type_parameter_name_cannot_be_0: { code: 2368, category: ts.DiagnosticCategory.Error, key: "Type_parameter_name_cannot_be_0_2368", message: "Type parameter name cannot be '{0}'" },
@@ -3428,7 +2693,7 @@ var ts;
         Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2: { code: 2403, category: ts.DiagnosticCategory.Error, key: "Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_t_2403", message: "Subsequent variable declarations must have the same type.  Variable '{0}' must be of type '{1}', but here has type '{2}'." },
         The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation: { code: 2404, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation_2404", message: "The left-hand side of a 'for...in' statement cannot use a type annotation." },
         The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any: { code: 2405, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any_2405", message: "The left-hand side of a 'for...in' statement must be of type 'string' or 'any'." },
-        Invalid_left_hand_side_in_for_in_statement: { code: 2406, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_in_for_in_statement_2406", message: "Invalid left-hand side in 'for...in' statement." },
+        The_left_hand_side_of_a_for_in_statement_must_be_a_variable_or_a_property_access: { code: 2406, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_must_be_a_variable_or_a_property_access_2406", message: "The left-hand side of a 'for...in' statement must be a variable or a property access." },
         The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2407, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter_2407", message: "The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter." },
         Setters_cannot_return_a_value: { code: 2408, category: ts.DiagnosticCategory.Error, key: "Setters_cannot_return_a_value_2408", message: "Setters cannot return a value." },
         Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class: { code: 2409, category: ts.DiagnosticCategory.Error, key: "Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class_2409", message: "Return type of constructor signature must be assignable to the instance type of the class" },
@@ -3466,8 +2731,6 @@ var ts;
         Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1: { code: 2446, category: ts.DiagnosticCategory.Error, key: "Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1_2446", message: "Property '{0}' is protected and only accessible through an instance of class '{1}'." },
         The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead: { code: 2447, category: ts.DiagnosticCategory.Error, key: "The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead_2447", message: "The '{0}' operator is not allowed for boolean types. Consider using '{1}' instead." },
         Block_scoped_variable_0_used_before_its_declaration: { code: 2448, category: ts.DiagnosticCategory.Error, key: "Block_scoped_variable_0_used_before_its_declaration_2448", message: "Block-scoped variable '{0}' used before its declaration." },
-        The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property: { code: 2449, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property_2449", message: "The operand of an increment or decrement operator cannot be a constant or a read-only property." },
-        Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property: { code: 2450, category: ts.DiagnosticCategory.Error, key: "Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property_2450", message: "Left-hand side of assignment expression cannot be a constant or a read-only property." },
         Cannot_redeclare_block_scoped_variable_0: { code: 2451, category: ts.DiagnosticCategory.Error, key: "Cannot_redeclare_block_scoped_variable_0_2451", message: "Cannot redeclare block-scoped variable '{0}'." },
         An_enum_member_cannot_have_a_numeric_name: { code: 2452, category: ts.DiagnosticCategory.Error, key: "An_enum_member_cannot_have_a_numeric_name_2452", message: "An enum member cannot have a numeric name." },
         The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_type_arguments_explicitly: { code: 2453, category: ts.DiagnosticCategory.Error, key: "The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_typ_2453", message: "The type argument for type parameter '{0}' cannot be inferred from the usage. Consider specifying the type arguments explicitly." },
@@ -3479,7 +2742,7 @@ var ts;
         Type_0_has_no_property_1_and_no_string_index_signature: { code: 2459, category: ts.DiagnosticCategory.Error, key: "Type_0_has_no_property_1_and_no_string_index_signature_2459", message: "Type '{0}' has no property '{1}' and no string index signature." },
         Type_0_has_no_property_1: { code: 2460, category: ts.DiagnosticCategory.Error, key: "Type_0_has_no_property_1_2460", message: "Type '{0}' has no property '{1}'." },
         Type_0_is_not_an_array_type: { code: 2461, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_an_array_type_2461", message: "Type '{0}' is not an array type." },
-        A_rest_element_must_be_last_in_an_array_destructuring_pattern: { code: 2462, category: ts.DiagnosticCategory.Error, key: "A_rest_element_must_be_last_in_an_array_destructuring_pattern_2462", message: "A rest element must be last in an array destructuring pattern" },
+        A_rest_element_must_be_last_in_a_destructuring_pattern: { code: 2462, category: ts.DiagnosticCategory.Error, key: "A_rest_element_must_be_last_in_a_destructuring_pattern_2462", message: "A rest element must be last in a destructuring pattern" },
         A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature: { code: 2463, category: ts.DiagnosticCategory.Error, key: "A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature_2463", message: "A binding pattern parameter cannot be optional in an implementation signature." },
         A_computed_property_name_must_be_of_type_string_number_symbol_or_any: { code: 2464, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_must_be_of_type_string_number_symbol_or_any_2464", message: "A computed property name must be of type 'string', 'number', 'symbol', or 'any'." },
         this_cannot_be_referenced_in_a_computed_property_name: { code: 2465, category: ts.DiagnosticCategory.Error, key: "this_cannot_be_referenced_in_a_computed_property_name_2465", message: "'this' cannot be referenced in a computed property name." },
@@ -3501,9 +2764,7 @@ var ts;
         Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1: { code: 2481, category: ts.DiagnosticCategory.Error, key: "Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1_2481", message: "Cannot initialize outer scoped variable '{0}' in the same scope as block scoped declaration '{1}'." },
         The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation: { code: 2483, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation_2483", message: "The left-hand side of a 'for...of' statement cannot use a type annotation." },
         Export_declaration_conflicts_with_exported_declaration_of_0: { code: 2484, category: ts.DiagnosticCategory.Error, key: "Export_declaration_conflicts_with_exported_declaration_of_0_2484", message: "Export declaration conflicts with exported declaration of '{0}'" },
-        The_left_hand_side_of_a_for_of_statement_cannot_be_a_constant_or_a_read_only_property: { code: 2485, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_cannot_be_a_constant_or_a_read_only_property_2485", message: "The left-hand side of a 'for...of' statement cannot be a constant or a read-only property." },
-        The_left_hand_side_of_a_for_in_statement_cannot_be_a_constant_or_a_read_only_property: { code: 2486, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_be_a_constant_or_a_read_only_property_2486", message: "The left-hand side of a 'for...in' statement cannot be a constant or a read-only property." },
-        Invalid_left_hand_side_in_for_of_statement: { code: 2487, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_in_for_of_statement_2487", message: "Invalid left-hand side in 'for...of' statement." },
+        The_left_hand_side_of_a_for_of_statement_must_be_a_variable_or_a_property_access: { code: 2487, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_must_be_a_variable_or_a_property_access_2487", message: "The left-hand side of a 'for...of' statement must be a variable or a property access." },
         Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator: { code: 2488, category: ts.DiagnosticCategory.Error, key: "Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator_2488", message: "Type must have a '[Symbol.iterator]()' method that returns an iterator." },
         An_iterator_must_have_a_next_method: { code: 2489, category: ts.DiagnosticCategory.Error, key: "An_iterator_must_have_a_next_method_2489", message: "An iterator must have a 'next()' method." },
         The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: { code: 2490, category: ts.DiagnosticCategory.Error, key: "The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property_2490", message: "The type returned by the 'next()' method of an iterator must have a 'value' property." },
@@ -3550,6 +2811,13 @@ var ts;
         Object_is_possibly_null_or_undefined: { code: 2533, category: ts.DiagnosticCategory.Error, key: "Object_is_possibly_null_or_undefined_2533", message: "Object is possibly 'null' or 'undefined'." },
         A_function_returning_never_cannot_have_a_reachable_end_point: { code: 2534, category: ts.DiagnosticCategory.Error, key: "A_function_returning_never_cannot_have_a_reachable_end_point_2534", message: "A function returning 'never' cannot have a reachable end point." },
         Enum_type_0_has_members_with_initializers_that_are_not_literals: { code: 2535, category: ts.DiagnosticCategory.Error, key: "Enum_type_0_has_members_with_initializers_that_are_not_literals_2535", message: "Enum type '{0}' has members with initializers that are not literals." },
+        Type_0_is_not_constrained_to_keyof_1: { code: 2536, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_constrained_to_keyof_1_2536", message: "Type '{0}' is not constrained to 'keyof {1}'." },
+        Type_0_has_no_matching_index_signature_for_type_1: { code: 2537, category: ts.DiagnosticCategory.Error, key: "Type_0_has_no_matching_index_signature_for_type_1_2537", message: "Type '{0}' has no matching index signature for type '{1}'." },
+        Type_0_cannot_be_used_as_an_index_type: { code: 2538, category: ts.DiagnosticCategory.Error, key: "Type_0_cannot_be_used_as_an_index_type_2538", message: "Type '{0}' cannot be used as an index type." },
+        Cannot_assign_to_0_because_it_is_not_a_variable: { code: 2539, category: ts.DiagnosticCategory.Error, key: "Cannot_assign_to_0_because_it_is_not_a_variable_2539", message: "Cannot assign to '{0}' because it is not a variable." },
+        Cannot_assign_to_0_because_it_is_a_constant_or_a_read_only_property: { code: 2540, category: ts.DiagnosticCategory.Error, key: "Cannot_assign_to_0_because_it_is_a_constant_or_a_read_only_property_2540", message: "Cannot assign to '{0}' because it is a constant or a read-only property." },
+        The_target_of_an_assignment_must_be_a_variable_or_a_property_access: { code: 2541, category: ts.DiagnosticCategory.Error, key: "The_target_of_an_assignment_must_be_a_variable_or_a_property_access_2541", message: "The target of an assignment must be a variable or a property access." },
+        Index_signature_in_type_0_only_permits_reading: { code: 2542, category: ts.DiagnosticCategory.Error, key: "Index_signature_in_type_0_only_permits_reading_2542", message: "Index signature in type '{0}' only permits reading." },
         JSX_element_attributes_type_0_may_not_be_a_union_type: { code: 2600, category: ts.DiagnosticCategory.Error, key: "JSX_element_attributes_type_0_may_not_be_a_union_type_2600", message: "JSX element attributes type '{0}' may not be a union type." },
         The_return_type_of_a_JSX_element_constructor_must_return_an_object_type: { code: 2601, category: ts.DiagnosticCategory.Error, key: "The_return_type_of_a_JSX_element_constructor_must_return_an_object_type_2601", message: "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: { code: 2602, category: ts.DiagnosticCategory.Error, key: "JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist_2602", message: "JSX element implicitly has type 'any' because the global type 'JSX.Element' does not exist." },
@@ -3573,6 +2841,7 @@ var ts;
         Cannot_find_name_0_Did_you_mean_the_static_member_1_0: { code: 2662, category: ts.DiagnosticCategory.Error, key: "Cannot_find_name_0_Did_you_mean_the_static_member_1_0_2662", message: "Cannot find name '{0}'. Did you mean the static member '{1}.{0}'?" },
         Cannot_find_name_0_Did_you_mean_the_instance_member_this_0: { code: 2663, category: ts.DiagnosticCategory.Error, key: "Cannot_find_name_0_Did_you_mean_the_instance_member_this_0_2663", message: "Cannot find name '{0}'. Did you mean the instance member 'this.{0}'?" },
         Invalid_module_name_in_augmentation_module_0_cannot_be_found: { code: 2664, category: ts.DiagnosticCategory.Error, key: "Invalid_module_name_in_augmentation_module_0_cannot_be_found_2664", message: "Invalid module name in augmentation, module '{0}' cannot be found." },
+        Invalid_module_name_in_augmentation_Module_0_resolves_to_an_untyped_module_at_1_which_cannot_be_augmented: { code: 2665, category: ts.DiagnosticCategory.Error, key: "Invalid_module_name_in_augmentation_Module_0_resolves_to_an_untyped_module_at_1_which_cannot_be_augm_2665", message: "Invalid module name in augmentation. Module '{0}' resolves to an untyped module at '{1}', which cannot be augmented." },
         Exports_and_export_assignments_are_not_permitted_in_module_augmentations: { code: 2666, category: ts.DiagnosticCategory.Error, key: "Exports_and_export_assignments_are_not_permitted_in_module_augmentations_2666", message: "Exports and export assignments are not permitted in module augmentations." },
         Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_module: { code: 2667, category: ts.DiagnosticCategory.Error, key: "Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_mod_2667", message: "Imports are not permitted in module augmentations. Consider moving them to the enclosing external module." },
         export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always_visible: { code: 2668, category: ts.DiagnosticCategory.Error, key: "export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always__2668", message: "'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible." },
@@ -3604,6 +2873,10 @@ var ts;
         Namespace_0_has_no_exported_member_1: { code: 2694, category: ts.DiagnosticCategory.Error, key: "Namespace_0_has_no_exported_member_1_2694", message: "Namespace '{0}' has no exported member '{1}'." },
         Left_side_of_comma_operator_is_unused_and_has_no_side_effects: { code: 2695, category: ts.DiagnosticCategory.Error, key: "Left_side_of_comma_operator_is_unused_and_has_no_side_effects_2695", message: "Left side of comma operator is unused and has no side effects." },
         The_Object_type_is_assignable_to_very_few_other_types_Did_you_mean_to_use_the_any_type_instead: { code: 2696, category: ts.DiagnosticCategory.Error, key: "The_Object_type_is_assignable_to_very_few_other_types_Did_you_mean_to_use_the_any_type_instead_2696", message: "The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?" },
+        An_async_function_or_method_must_return_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES2015_in_your_lib_option: { code: 2697, category: ts.DiagnosticCategory.Error, key: "An_async_function_or_method_must_return_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_in_2697", message: "An async function or method must return a 'Promise'. Make sure you have a declaration for 'Promise' or include 'ES2015' in your `--lib` option." },
+        Spread_types_may_only_be_created_from_object_types: { code: 2698, category: ts.DiagnosticCategory.Error, key: "Spread_types_may_only_be_created_from_object_types_2698", message: "Spread types may only be created from object types." },
+        Rest_types_may_only_be_created_from_object_types: { code: 2700, category: ts.DiagnosticCategory.Error, key: "Rest_types_may_only_be_created_from_object_types_2700", message: "Rest types may only be created from object types." },
+        An_object_rest_element_must_be_an_identifier: { code: 2701, category: ts.DiagnosticCategory.Error, key: "An_object_rest_element_must_be_an_identifier_2701", message: "An object rest element must be an identifier." },
         Import_declaration_0_is_using_private_name_1: { code: 4000, category: ts.DiagnosticCategory.Error, key: "Import_declaration_0_is_using_private_name_1_4000", message: "Import declaration '{0}' is using private name '{1}'." },
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", message: "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: { code: 4004, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", message: "Type parameter '{0}' of exported interface has or is using private name '{1}'." },
@@ -3703,6 +2976,7 @@ var ts;
         Substitution_0_for_pattern_1_has_incorrect_type_expected_string_got_2: { code: 5064, category: ts.DiagnosticCategory.Error, key: "Substitution_0_for_pattern_1_has_incorrect_type_expected_string_got_2_5064", message: "Substitution '{0}' for pattern '{1}' has incorrect type, expected 'string', got '{2}'." },
         File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0: { code: 5065, category: ts.DiagnosticCategory.Error, key: "File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildca_5065", message: "File specification cannot contain a parent directory ('..') that appears after a recursive directory wildcard ('**'): '{0}'." },
         Substitutions_for_pattern_0_shouldn_t_be_an_empty_array: { code: 5066, category: ts.DiagnosticCategory.Error, key: "Substitutions_for_pattern_0_shouldn_t_be_an_empty_array_5066", message: "Substitutions for pattern '{0}' shouldn't be an empty array." },
+        Invalid_value_for_jsxFactory_0_is_not_a_valid_identifier_or_qualified_name: { code: 5067, category: ts.DiagnosticCategory.Error, key: "Invalid_value_for_jsxFactory_0_is_not_a_valid_identifier_or_qualified_name_5067", message: "Invalid value for 'jsxFactory'. '{0}' is not a valid identifier or qualified-name." },
         Concatenate_and_emit_output_to_single_file: { code: 6001, category: ts.DiagnosticCategory.Message, key: "Concatenate_and_emit_output_to_single_file_6001", message: "Concatenate and emit output to single file." },
         Generates_corresponding_d_ts_file: { code: 6002, category: ts.DiagnosticCategory.Message, key: "Generates_corresponding_d_ts_file_6002", message: "Generates corresponding '.d.ts' file." },
         Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations: { code: 6003, category: ts.DiagnosticCategory.Message, key: "Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations_6003", message: "Specify the location where debugger should locate map files instead of generated locations." },
@@ -3786,7 +3060,7 @@ var ts;
         File_0_exist_use_it_as_a_name_resolution_result: { code: 6097, category: ts.DiagnosticCategory.Message, key: "File_0_exist_use_it_as_a_name_resolution_result_6097", message: "File '{0}' exist - use it as a name resolution result." },
         Loading_module_0_from_node_modules_folder: { code: 6098, category: ts.DiagnosticCategory.Message, key: "Loading_module_0_from_node_modules_folder_6098", message: "Loading module '{0}' from 'node_modules' folder." },
         Found_package_json_at_0: { code: 6099, category: ts.DiagnosticCategory.Message, key: "Found_package_json_at_0_6099", message: "Found 'package.json' at '{0}'." },
-        package_json_does_not_have_types_field: { code: 6100, category: ts.DiagnosticCategory.Message, key: "package_json_does_not_have_types_field_6100", message: "'package.json' does not have 'types' field." },
+        package_json_does_not_have_a_types_or_main_field: { code: 6100, category: ts.DiagnosticCategory.Message, key: "package_json_does_not_have_a_types_or_main_field_6100", message: "'package.json' does not have a 'types' or 'main' field." },
         package_json_has_0_field_1_that_references_2: { code: 6101, category: ts.DiagnosticCategory.Message, key: "package_json_has_0_field_1_that_references_2_6101", message: "'package.json' has '{0}' field '{1}' that references '{2}'." },
         Allow_javascript_files_to_be_compiled: { code: 6102, category: ts.DiagnosticCategory.Message, key: "Allow_javascript_files_to_be_compiled_6102", message: "Allow javascript files to be compiled." },
         Option_0_should_have_array_of_strings_as_a_value: { code: 6103, category: ts.DiagnosticCategory.Error, key: "Option_0_should_have_array_of_strings_as_a_value_6103", message: "Option '{0}' should have array of strings as a value." },
@@ -3823,11 +3097,16 @@ var ts;
         Report_errors_on_unused_locals: { code: 6134, category: ts.DiagnosticCategory.Message, key: "Report_errors_on_unused_locals_6134", message: "Report errors on unused locals." },
         Report_errors_on_unused_parameters: { code: 6135, category: ts.DiagnosticCategory.Message, key: "Report_errors_on_unused_parameters_6135", message: "Report errors on unused parameters." },
         The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files: { code: 6136, category: ts.DiagnosticCategory.Message, key: "The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files_6136", message: "The maximum dependency depth to search under node_modules and load JavaScript files" },
-        No_types_specified_in_package_json_but_allowJs_is_set_so_returning_main_value_of_0: { code: 6137, category: ts.DiagnosticCategory.Message, key: "No_types_specified_in_package_json_but_allowJs_is_set_so_returning_main_value_of_0_6137", message: "No types specified in 'package.json' but 'allowJs' is set, so returning 'main' value of '{0}'" },
+        No_types_specified_in_package_json_so_returning_main_value_of_0: { code: 6137, category: ts.DiagnosticCategory.Message, key: "No_types_specified_in_package_json_so_returning_main_value_of_0_6137", message: "No types specified in 'package.json', so returning 'main' value of '{0}'" },
         Property_0_is_declared_but_never_used: { code: 6138, category: ts.DiagnosticCategory.Error, key: "Property_0_is_declared_but_never_used_6138", message: "Property '{0}' is declared but never used." },
         Import_emit_helpers_from_tslib: { code: 6139, category: ts.DiagnosticCategory.Message, key: "Import_emit_helpers_from_tslib_6139", message: "Import emit helpers from 'tslib'." },
         Auto_discovery_for_typings_is_enabled_in_project_0_Running_extra_resolution_pass_for_module_1_using_cache_location_2: { code: 6140, category: ts.DiagnosticCategory.Error, key: "Auto_discovery_for_typings_is_enabled_in_project_0_Running_extra_resolution_pass_for_module_1_using__6140", message: "Auto discovery for typings is enabled in project '{0}'. Running extra resolution pass for module '{1}' using cache location '{2}'." },
         Parse_in_strict_mode_and_emit_use_strict_for_each_source_file: { code: 6141, category: ts.DiagnosticCategory.Message, key: "Parse_in_strict_mode_and_emit_use_strict_for_each_source_file_6141", message: "Parse in strict mode and emit \"use strict\" for each source file" },
+        Module_0_was_resolved_to_1_but_jsx_is_not_set: { code: 6142, category: ts.DiagnosticCategory.Error, key: "Module_0_was_resolved_to_1_but_jsx_is_not_set_6142", message: "Module '{0}' was resolved to '{1}', but '--jsx' is not set." },
+        Module_0_was_resolved_to_1_but_allowJs_is_not_set: { code: 6143, category: ts.DiagnosticCategory.Error, key: "Module_0_was_resolved_to_1_but_allowJs_is_not_set_6143", message: "Module '{0}' was resolved to '{1}', but '--allowJs' is not set." },
+        Module_0_was_resolved_as_locally_declared_ambient_module_in_file_1: { code: 6144, category: ts.DiagnosticCategory.Message, key: "Module_0_was_resolved_as_locally_declared_ambient_module_in_file_1_6144", message: "Module '{0}' was resolved as locally declared ambient module in file '{1}'." },
+        Module_0_was_resolved_as_ambient_module_declared_in_1_since_this_file_was_not_modified: { code: 6145, category: ts.DiagnosticCategory.Message, key: "Module_0_was_resolved_as_ambient_module_declared_in_1_since_this_file_was_not_modified_6145", message: "Module '{0}' was resolved as ambient module declared in '{1}' since this file was not modified." },
+        Specify_the_JSX_factory_function_to_use_when_targeting_react_JSX_emit_e_g_React_createElement_or_h: { code: 6146, category: ts.DiagnosticCategory.Message, key: "Specify_the_JSX_factory_function_to_use_when_targeting_react_JSX_emit_e_g_React_createElement_or_h_6146", message: "Specify the JSX factory function to use when targeting 'react' JSX emit, e.g. 'React.createElement' or 'h'." },
         Variable_0_implicitly_has_an_1_type: { code: 7005, category: ts.DiagnosticCategory.Error, key: "Variable_0_implicitly_has_an_1_type_7005", message: "Variable '{0}' implicitly has an '{1}' type." },
         Parameter_0_implicitly_has_an_1_type: { code: 7006, category: ts.DiagnosticCategory.Error, key: "Parameter_0_implicitly_has_an_1_type_7006", message: "Parameter '{0}' implicitly has an '{1}' type." },
         Member_0_implicitly_has_an_1_type: { code: 7008, category: ts.DiagnosticCategory.Error, key: "Member_0_implicitly_has_an_1_type_7008", message: "Member '{0}' implicitly has an '{1}' type." },
@@ -3836,7 +3115,8 @@ var ts;
         Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type: { code: 7011, category: ts.DiagnosticCategory.Error, key: "Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type_7011", message: "Function expression, which lacks return-type annotation, implicitly has an '{0}' return type." },
         Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7013, category: ts.DiagnosticCategory.Error, key: "Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type_7013", message: "Construct signature, which lacks return-type annotation, implicitly has an 'any' return type." },
         Element_implicitly_has_an_any_type_because_index_expression_is_not_of_type_number: { code: 7015, category: ts.DiagnosticCategory.Error, key: "Element_implicitly_has_an_any_type_because_index_expression_is_not_of_type_number_7015", message: "Element implicitly has an 'any' type because index expression is not of type 'number'." },
-        Index_signature_of_object_type_implicitly_has_an_any_type: { code: 7017, category: ts.DiagnosticCategory.Error, key: "Index_signature_of_object_type_implicitly_has_an_any_type_7017", message: "Index signature of object type implicitly has an 'any' type." },
+        Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type: { code: 7016, category: ts.DiagnosticCategory.Error, key: "Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type_7016", message: "Could not find a declaration file for module '{0}'. '{1}' implicitly has an 'any' type." },
+        Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature: { code: 7017, category: ts.DiagnosticCategory.Error, key: "Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_7017", message: "Element implicitly has an 'any' type because type '{0}' has no index signature." },
         Object_literal_s_property_0_implicitly_has_an_1_type: { code: 7018, category: ts.DiagnosticCategory.Error, key: "Object_literal_s_property_0_implicitly_has_an_1_type_7018", message: "Object literal's property '{0}' implicitly has an '{1}' type." },
         Rest_parameter_0_implicitly_has_an_any_type: { code: 7019, category: ts.DiagnosticCategory.Error, key: "Rest_parameter_0_implicitly_has_an_any_type_7019", message: "Rest parameter '{0}' implicitly has an 'any[]' type." },
         Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7020, category: ts.DiagnosticCategory.Error, key: "Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type_7020", message: "Call signature, which lacks return-type annotation, implicitly has an 'any' return type." },
@@ -3883,6 +3163,8 @@ var ts;
         Unknown_typing_option_0: { code: 17010, category: ts.DiagnosticCategory.Error, key: "Unknown_typing_option_0_17010", message: "Unknown typing option '{0}'." },
         Circularity_detected_while_resolving_configuration_Colon_0: { code: 18000, category: ts.DiagnosticCategory.Error, key: "Circularity_detected_while_resolving_configuration_Colon_0_18000", message: "Circularity detected while resolving configuration: {0}" },
         The_path_in_an_extends_options_must_be_relative_or_rooted: { code: 18001, category: ts.DiagnosticCategory.Error, key: "The_path_in_an_extends_options_must_be_relative_or_rooted_18001", message: "The path in an 'extends' options must be relative or rooted." },
+        The_files_list_in_config_file_0_is_empty: { code: 18002, category: ts.DiagnosticCategory.Error, key: "The_files_list_in_config_file_0_is_empty_18002", message: "The 'files' list in config file '{0}' is empty." },
+        No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2: { code: 18003, category: ts.DiagnosticCategory.Error, key: "No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2_18003", message: "No inputs were found in config file '{0}'. Specified 'include' paths were '{1}' and 'exclude' paths were '{2}'." },
         Add_missing_super_call: { code: 90001, category: ts.DiagnosticCategory.Message, key: "Add_missing_super_call_90001", message: "Add missing 'super()' call." },
         Make_super_call_the_first_statement_in_the_constructor: { code: 90002, category: ts.DiagnosticCategory.Message, key: "Make_super_call_the_first_statement_in_the_constructor_90002", message: "Make 'super()' call the first statement in the constructor." },
         Change_extends_to_implements: { code: 90003, category: ts.DiagnosticCategory.Message, key: "Change_extends_to_implements_90003", message: "Change 'extends' to 'implements'" },
@@ -3890,4175 +3172,11 @@ var ts;
         Implement_interface_on_reference: { code: 90005, category: ts.DiagnosticCategory.Message, key: "Implement_interface_on_reference_90005", message: "Implement interface on reference" },
         Implement_interface_on_class: { code: 90006, category: ts.DiagnosticCategory.Message, key: "Implement_interface_on_class_90006", message: "Implement interface on class" },
         Implement_inherited_abstract_class: { code: 90007, category: ts.DiagnosticCategory.Message, key: "Implement_inherited_abstract_class_90007", message: "Implement inherited abstract class" },
+        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: { code: 90009, category: ts.DiagnosticCategory.Error, key: "Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript__90009", message: "Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig" },
+        Type_0_is_not_assignable_to_type_1_Two_different_types_with_this_name_exist_but_they_are_unrelated: { code: 90010, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_assignable_to_type_1_Two_different_types_with_this_name_exist_but_they_are_unrelated_90010", message: "Type '{0}' is not assignable to type '{1}'. Two different types with this name exist, but they are unrelated." },
     };
 })(ts || (ts = {}));
 var ts;
-(function (ts) {
-    function trace(host) {
-        host.trace(ts.formatMessage.apply(undefined, arguments));
-    }
-    ts.trace = trace;
-    function isTraceEnabled(compilerOptions, host) {
-        return compilerOptions.traceResolution && host.trace !== undefined;
-    }
-    ts.isTraceEnabled = isTraceEnabled;
-    function createResolvedModule(resolvedFileName, isExternalLibraryImport, failedLookupLocations) {
-        return { resolvedModule: resolvedFileName ? { resolvedFileName: resolvedFileName, isExternalLibraryImport: isExternalLibraryImport } : undefined, failedLookupLocations: failedLookupLocations };
-    }
-    ts.createResolvedModule = createResolvedModule;
-    function moduleHasNonRelativeName(moduleName) {
-        return !(ts.isRootedDiskPath(moduleName) || ts.isExternalModuleNameRelative(moduleName));
-    }
-    function tryReadTypesSection(packageJsonPath, baseDirectory, state) {
-        var jsonContent = readJson(packageJsonPath, state.host);
-        function tryReadFromField(fieldName) {
-            if (ts.hasProperty(jsonContent, fieldName)) {
-                var typesFile = jsonContent[fieldName];
-                if (typeof typesFile === "string") {
-                    var typesFilePath_1 = ts.normalizePath(ts.combinePaths(baseDirectory, typesFile));
-                    if (state.traceEnabled) {
-                        trace(state.host, ts.Diagnostics.package_json_has_0_field_1_that_references_2, fieldName, typesFile, typesFilePath_1);
-                    }
-                    return typesFilePath_1;
-                }
-                else {
-                    if (state.traceEnabled) {
-                        trace(state.host, ts.Diagnostics.Expected_type_of_0_field_in_package_json_to_be_string_got_1, fieldName, typeof typesFile);
-                    }
-                }
-            }
-        }
-        var typesFilePath = tryReadFromField("typings") || tryReadFromField("types");
-        if (typesFilePath) {
-            return typesFilePath;
-        }
-        if (state.compilerOptions.allowJs && jsonContent.main && typeof jsonContent.main === "string") {
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.No_types_specified_in_package_json_but_allowJs_is_set_so_returning_main_value_of_0, jsonContent.main);
-            }
-            var mainFilePath = ts.normalizePath(ts.combinePaths(baseDirectory, jsonContent.main));
-            return mainFilePath;
-        }
-        return undefined;
-    }
-    function readJson(path, host) {
-        try {
-            var jsonText = host.readFile(path);
-            return jsonText ? JSON.parse(jsonText) : {};
-        }
-        catch (e) {
-            return {};
-        }
-    }
-    var typeReferenceExtensions = [".d.ts"];
-    function getEffectiveTypeRoots(options, host) {
-        if (options.typeRoots) {
-            return options.typeRoots;
-        }
-        var currentDirectory;
-        if (options.configFilePath) {
-            currentDirectory = ts.getDirectoryPath(options.configFilePath);
-        }
-        else if (host.getCurrentDirectory) {
-            currentDirectory = host.getCurrentDirectory();
-        }
-        return currentDirectory !== undefined && getDefaultTypeRoots(currentDirectory, host);
-    }
-    ts.getEffectiveTypeRoots = getEffectiveTypeRoots;
-    function getDefaultTypeRoots(currentDirectory, host) {
-        if (!host.directoryExists) {
-            return [ts.combinePaths(currentDirectory, nodeModulesAtTypes)];
-        }
-        var typeRoots;
-        while (true) {
-            var atTypes = ts.combinePaths(currentDirectory, nodeModulesAtTypes);
-            if (host.directoryExists(atTypes)) {
-                (typeRoots || (typeRoots = [])).push(atTypes);
-            }
-            var parent_1 = ts.getDirectoryPath(currentDirectory);
-            if (parent_1 === currentDirectory) {
-                break;
-            }
-            currentDirectory = parent_1;
-        }
-        return typeRoots;
-    }
-    var nodeModulesAtTypes = ts.combinePaths("node_modules", "@types");
-    function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFile, options, host) {
-        var traceEnabled = isTraceEnabled(options, host);
-        var moduleResolutionState = {
-            compilerOptions: options,
-            host: host,
-            skipTsx: true,
-            traceEnabled: traceEnabled
-        };
-        var typeRoots = getEffectiveTypeRoots(options, host);
-        if (traceEnabled) {
-            if (containingFile === undefined) {
-                if (typeRoots === undefined) {
-                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_not_set_root_directory_not_set, typeReferenceDirectiveName);
-                }
-                else {
-                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_not_set_root_directory_1, typeReferenceDirectiveName, typeRoots);
-                }
-            }
-            else {
-                if (typeRoots === undefined) {
-                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_1_root_directory_not_set, typeReferenceDirectiveName, containingFile);
-                }
-                else {
-                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_1_root_directory_2, typeReferenceDirectiveName, containingFile, typeRoots);
-                }
-            }
-        }
-        var failedLookupLocations = [];
-        if (typeRoots && typeRoots.length) {
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Resolving_with_primary_search_path_0, typeRoots.join(", "));
-            }
-            var primarySearchPaths = typeRoots;
-            for (var _i = 0, primarySearchPaths_1 = primarySearchPaths; _i < primarySearchPaths_1.length; _i++) {
-                var typeRoot = primarySearchPaths_1[_i];
-                var candidate = ts.combinePaths(typeRoot, typeReferenceDirectiveName);
-                var candidateDirectory = ts.getDirectoryPath(candidate);
-                var resolvedFile_1 = loadNodeModuleFromDirectory(typeReferenceExtensions, candidate, failedLookupLocations, !directoryProbablyExists(candidateDirectory, host), moduleResolutionState);
-                if (resolvedFile_1) {
-                    if (traceEnabled) {
-                        trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFile_1, true);
-                    }
-                    return {
-                        resolvedTypeReferenceDirective: { primary: true, resolvedFileName: resolvedFile_1 },
-                        failedLookupLocations: failedLookupLocations
-                    };
-                }
-            }
-        }
-        else {
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Root_directory_cannot_be_determined_skipping_primary_search_paths);
-            }
-        }
-        var resolvedFile;
-        var initialLocationForSecondaryLookup;
-        if (containingFile) {
-            initialLocationForSecondaryLookup = ts.getDirectoryPath(containingFile);
-        }
-        if (initialLocationForSecondaryLookup !== undefined) {
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Looking_up_in_node_modules_folder_initial_location_0, initialLocationForSecondaryLookup);
-            }
-            resolvedFile = loadModuleFromNodeModules(typeReferenceDirectiveName, initialLocationForSecondaryLookup, failedLookupLocations, moduleResolutionState, false);
-            if (traceEnabled) {
-                if (resolvedFile) {
-                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFile, false);
-                }
-                else {
-                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_not_resolved, typeReferenceDirectiveName);
-                }
-            }
-        }
-        else {
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_modules_folder);
-            }
-        }
-        return {
-            resolvedTypeReferenceDirective: resolvedFile
-                ? { primary: false, resolvedFileName: resolvedFile }
-                : undefined,
-            failedLookupLocations: failedLookupLocations
-        };
-    }
-    ts.resolveTypeReferenceDirective = resolveTypeReferenceDirective;
-    function getAutomaticTypeDirectiveNames(options, host) {
-        if (options.types) {
-            return options.types;
-        }
-        var result = [];
-        if (host.directoryExists && host.getDirectories) {
-            var typeRoots = getEffectiveTypeRoots(options, host);
-            if (typeRoots) {
-                for (var _i = 0, typeRoots_1 = typeRoots; _i < typeRoots_1.length; _i++) {
-                    var root = typeRoots_1[_i];
-                    if (host.directoryExists(root)) {
-                        for (var _a = 0, _b = host.getDirectories(root); _a < _b.length; _a++) {
-                            var typeDirectivePath = _b[_a];
-                            var normalized = ts.normalizePath(typeDirectivePath);
-                            var packageJsonPath = pathToPackageJson(ts.combinePaths(root, normalized));
-                            var isNotNeededPackage = host.fileExists(packageJsonPath) && readJson(packageJsonPath, host).typings === null;
-                            if (!isNotNeededPackage) {
-                                result.push(ts.getBaseFileName(normalized));
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return result;
-    }
-    ts.getAutomaticTypeDirectiveNames = getAutomaticTypeDirectiveNames;
-    function resolveModuleName(moduleName, containingFile, compilerOptions, host) {
-        var traceEnabled = isTraceEnabled(compilerOptions, host);
-        if (traceEnabled) {
-            trace(host, ts.Diagnostics.Resolving_module_0_from_1, moduleName, containingFile);
-        }
-        var moduleResolution = compilerOptions.moduleResolution;
-        if (moduleResolution === undefined) {
-            moduleResolution = ts.getEmitModuleKind(compilerOptions) === ts.ModuleKind.CommonJS ? ts.ModuleResolutionKind.NodeJs : ts.ModuleResolutionKind.Classic;
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Module_resolution_kind_is_not_specified_using_0, ts.ModuleResolutionKind[moduleResolution]);
-            }
-        }
-        else {
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Explicitly_specified_module_resolution_kind_Colon_0, ts.ModuleResolutionKind[moduleResolution]);
-            }
-        }
-        var result;
-        switch (moduleResolution) {
-            case ts.ModuleResolutionKind.NodeJs:
-                result = nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host);
-                break;
-            case ts.ModuleResolutionKind.Classic:
-                result = classicNameResolver(moduleName, containingFile, compilerOptions, host);
-                break;
-        }
-        if (traceEnabled) {
-            if (result.resolvedModule) {
-                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);
-            }
-        }
-        return result;
-    }
-    ts.resolveModuleName = resolveModuleName;
-    function tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, loader, failedLookupLocations, supportedExtensions, state) {
-        if (moduleHasNonRelativeName(moduleName)) {
-            return tryLoadModuleUsingBaseUrl(moduleName, loader, failedLookupLocations, supportedExtensions, state);
-        }
-        else {
-            return tryLoadModuleUsingRootDirs(moduleName, containingDirectory, loader, failedLookupLocations, supportedExtensions, state);
-        }
-    }
-    function tryLoadModuleUsingRootDirs(moduleName, containingDirectory, loader, failedLookupLocations, supportedExtensions, state) {
-        if (!state.compilerOptions.rootDirs) {
-            return undefined;
-        }
-        if (state.traceEnabled) {
-            trace(state.host, ts.Diagnostics.rootDirs_option_is_set_using_it_to_resolve_relative_module_name_0, moduleName);
-        }
-        var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
-        var matchedRootDir;
-        var matchedNormalizedPrefix;
-        for (var _i = 0, _a = state.compilerOptions.rootDirs; _i < _a.length; _i++) {
-            var rootDir = _a[_i];
-            var normalizedRoot = ts.normalizePath(rootDir);
-            if (!ts.endsWith(normalizedRoot, ts.directorySeparator)) {
-                normalizedRoot += ts.directorySeparator;
-            }
-            var isLongestMatchingPrefix = ts.startsWith(candidate, normalizedRoot) &&
-                (matchedNormalizedPrefix === undefined || matchedNormalizedPrefix.length < normalizedRoot.length);
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.Checking_if_0_is_the_longest_matching_prefix_for_1_2, normalizedRoot, candidate, isLongestMatchingPrefix);
-            }
-            if (isLongestMatchingPrefix) {
-                matchedNormalizedPrefix = normalizedRoot;
-                matchedRootDir = rootDir;
-            }
-        }
-        if (matchedNormalizedPrefix) {
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.Longest_matching_prefix_for_0_is_1, candidate, matchedNormalizedPrefix);
-            }
-            var suffix = candidate.substr(matchedNormalizedPrefix.length);
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.Loading_0_from_the_root_dir_1_candidate_location_2, suffix, matchedNormalizedPrefix, candidate);
-            }
-            var resolvedFileName = loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(containingDirectory, state.host), state);
-            if (resolvedFileName) {
-                return resolvedFileName;
-            }
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.Trying_other_entries_in_rootDirs);
-            }
-            for (var _b = 0, _c = state.compilerOptions.rootDirs; _b < _c.length; _b++) {
-                var rootDir = _c[_b];
-                if (rootDir === matchedRootDir) {
-                    continue;
-                }
-                var candidate_1 = ts.combinePaths(ts.normalizePath(rootDir), suffix);
-                if (state.traceEnabled) {
-                    trace(state.host, ts.Diagnostics.Loading_0_from_the_root_dir_1_candidate_location_2, suffix, rootDir, candidate_1);
-                }
-                var baseDirectory = ts.getDirectoryPath(candidate_1);
-                var resolvedFileName_1 = loader(candidate_1, supportedExtensions, failedLookupLocations, !directoryProbablyExists(baseDirectory, state.host), state);
-                if (resolvedFileName_1) {
-                    return resolvedFileName_1;
-                }
-            }
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.Module_resolution_using_rootDirs_has_failed);
-            }
-        }
-        return undefined;
-    }
-    function tryLoadModuleUsingBaseUrl(moduleName, loader, failedLookupLocations, supportedExtensions, state) {
-        if (!state.compilerOptions.baseUrl) {
-            return undefined;
-        }
-        if (state.traceEnabled) {
-            trace(state.host, ts.Diagnostics.baseUrl_option_is_set_to_0_using_this_value_to_resolve_non_relative_module_name_1, state.compilerOptions.baseUrl, moduleName);
-        }
-        var matchedPattern = undefined;
-        if (state.compilerOptions.paths) {
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.paths_option_is_specified_looking_for_a_pattern_to_match_module_name_0, moduleName);
-            }
-            matchedPattern = ts.matchPatternOrExact(ts.getOwnKeys(state.compilerOptions.paths), moduleName);
-        }
-        if (matchedPattern) {
-            var matchedStar = typeof matchedPattern === "string" ? undefined : ts.matchedText(matchedPattern, moduleName);
-            var matchedPatternText = typeof matchedPattern === "string" ? matchedPattern : ts.patternText(matchedPattern);
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.Module_name_0_matched_pattern_1, moduleName, matchedPatternText);
-            }
-            for (var _i = 0, _a = state.compilerOptions.paths[matchedPatternText]; _i < _a.length; _i++) {
-                var subst = _a[_i];
-                var path = matchedStar ? subst.replace("*", matchedStar) : subst;
-                var candidate = ts.normalizePath(ts.combinePaths(state.compilerOptions.baseUrl, path));
-                if (state.traceEnabled) {
-                    trace(state.host, ts.Diagnostics.Trying_substitution_0_candidate_module_location_Colon_1, subst, path);
-                }
-                var resolvedFileName = loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
-                if (resolvedFileName) {
-                    return resolvedFileName;
-                }
-            }
-            return undefined;
-        }
-        else {
-            var candidate = ts.normalizePath(ts.combinePaths(state.compilerOptions.baseUrl, moduleName));
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.Resolving_module_name_0_relative_to_base_url_1_2, moduleName, state.compilerOptions.baseUrl, candidate);
-            }
-            return loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
-        }
-    }
-    function nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host) {
-        var containingDirectory = ts.getDirectoryPath(containingFile);
-        var supportedExtensions = ts.getSupportedExtensions(compilerOptions);
-        var traceEnabled = isTraceEnabled(compilerOptions, host);
-        var failedLookupLocations = [];
-        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, skipTsx: false };
-        var resolvedFileName = tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, nodeLoadModuleByRelativeName, failedLookupLocations, supportedExtensions, state);
-        var isExternalLibraryImport = false;
-        if (!resolvedFileName) {
-            if (moduleHasNonRelativeName(moduleName)) {
-                if (traceEnabled) {
-                    trace(host, ts.Diagnostics.Loading_module_0_from_node_modules_folder, moduleName);
-                }
-                resolvedFileName = loadModuleFromNodeModules(moduleName, containingDirectory, failedLookupLocations, state, false);
-                isExternalLibraryImport = resolvedFileName !== undefined;
-            }
-            else {
-                var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
-                resolvedFileName = nodeLoadModuleByRelativeName(candidate, supportedExtensions, failedLookupLocations, false, state);
-            }
-        }
-        if (resolvedFileName && host.realpath) {
-            var originalFileName = resolvedFileName;
-            resolvedFileName = ts.normalizePath(host.realpath(resolvedFileName));
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Resolving_real_path_for_0_result_1, originalFileName, resolvedFileName);
-            }
-        }
-        return createResolvedModule(resolvedFileName, isExternalLibraryImport, failedLookupLocations);
-    }
-    ts.nodeModuleNameResolver = nodeModuleNameResolver;
-    function nodeLoadModuleByRelativeName(candidate, supportedExtensions, failedLookupLocations, onlyRecordFailures, state) {
-        if (state.traceEnabled) {
-            trace(state.host, ts.Diagnostics.Loading_module_as_file_Slash_folder_candidate_module_location_0, candidate);
-        }
-        var resolvedFileName = !ts.pathEndsWithDirectorySeparator(candidate) && loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, onlyRecordFailures, state);
-        return resolvedFileName || loadNodeModuleFromDirectory(supportedExtensions, candidate, failedLookupLocations, onlyRecordFailures, state);
-    }
-    function directoryProbablyExists(directoryName, host) {
-        return !host.directoryExists || host.directoryExists(directoryName);
-    }
-    ts.directoryProbablyExists = directoryProbablyExists;
-    function loadModuleFromFile(candidate, extensions, failedLookupLocation, onlyRecordFailures, state) {
-        var resolvedByAddingExtension = tryAddingExtensions(candidate, extensions, failedLookupLocation, onlyRecordFailures, state);
-        if (resolvedByAddingExtension) {
-            return resolvedByAddingExtension;
-        }
-        if (ts.hasJavaScriptFileExtension(candidate)) {
-            var extensionless = ts.removeFileExtension(candidate);
-            if (state.traceEnabled) {
-                var extension = candidate.substring(extensionless.length);
-                trace(state.host, ts.Diagnostics.File_name_0_has_a_1_extension_stripping_it, candidate, extension);
-            }
-            return tryAddingExtensions(extensionless, extensions, failedLookupLocation, onlyRecordFailures, state);
-        }
-    }
-    function tryAddingExtensions(candidate, extensions, failedLookupLocation, onlyRecordFailures, state) {
-        if (!onlyRecordFailures) {
-            var directory = ts.getDirectoryPath(candidate);
-            if (directory) {
-                onlyRecordFailures = !directoryProbablyExists(directory, state.host);
-            }
-        }
-        return ts.forEach(extensions, function (ext) {
-            return !(state.skipTsx && ts.isJsxOrTsxExtension(ext)) && tryFile(candidate + ext, failedLookupLocation, onlyRecordFailures, state);
-        });
-    }
-    function tryFile(fileName, failedLookupLocation, onlyRecordFailures, state) {
-        if (!onlyRecordFailures && state.host.fileExists(fileName)) {
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.File_0_exist_use_it_as_a_name_resolution_result, fileName);
-            }
-            return fileName;
-        }
-        else {
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.File_0_does_not_exist, fileName);
-            }
-            failedLookupLocation.push(fileName);
-            return undefined;
-        }
-    }
-    function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocation, onlyRecordFailures, state) {
-        var packageJsonPath = pathToPackageJson(candidate);
-        var directoryExists = !onlyRecordFailures && directoryProbablyExists(candidate, state.host);
-        if (directoryExists && state.host.fileExists(packageJsonPath)) {
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath);
-            }
-            var typesFile = tryReadTypesSection(packageJsonPath, candidate, state);
-            if (typesFile) {
-                var onlyRecordFailures_1 = !directoryProbablyExists(ts.getDirectoryPath(typesFile), state.host);
-                var result = tryFile(typesFile, failedLookupLocation, onlyRecordFailures_1, state) ||
-                    tryAddingExtensions(typesFile, extensions, failedLookupLocation, onlyRecordFailures_1, state);
-                if (result) {
-                    return result;
-                }
-            }
-            else {
-                if (state.traceEnabled) {
-                    trace(state.host, ts.Diagnostics.package_json_does_not_have_types_field);
-                }
-            }
-        }
-        else {
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.File_0_does_not_exist, packageJsonPath);
-            }
-            failedLookupLocation.push(packageJsonPath);
-        }
-        return loadModuleFromFile(ts.combinePaths(candidate, "index"), extensions, failedLookupLocation, !directoryExists, state);
-    }
-    function pathToPackageJson(directory) {
-        return ts.combinePaths(directory, "package.json");
-    }
-    function loadModuleFromNodeModulesFolder(moduleName, directory, failedLookupLocations, state) {
-        var nodeModulesFolder = ts.combinePaths(directory, "node_modules");
-        var nodeModulesFolderExists = directoryProbablyExists(nodeModulesFolder, state.host);
-        var candidate = ts.normalizePath(ts.combinePaths(nodeModulesFolder, moduleName));
-        var supportedExtensions = ts.getSupportedExtensions(state.compilerOptions);
-        var result = loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, !nodeModulesFolderExists, state);
-        if (result) {
-            return result;
-        }
-        result = loadNodeModuleFromDirectory(supportedExtensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state);
-        if (result) {
-            return result;
-        }
-    }
-    function loadModuleFromNodeModules(moduleName, directory, failedLookupLocations, state, checkOneLevel) {
-        return loadModuleFromNodeModulesWorker(moduleName, directory, failedLookupLocations, state, checkOneLevel, false);
-    }
-    ts.loadModuleFromNodeModules = loadModuleFromNodeModules;
-    function loadModuleFromNodeModulesAtTypes(moduleName, directory, failedLookupLocations, state) {
-        return loadModuleFromNodeModulesWorker(moduleName, directory, failedLookupLocations, state, false, true);
-    }
-    function loadModuleFromNodeModulesWorker(moduleName, directory, failedLookupLocations, state, checkOneLevel, typesOnly) {
-        directory = ts.normalizeSlashes(directory);
-        while (true) {
-            var baseName = ts.getBaseFileName(directory);
-            if (baseName !== "node_modules") {
-                var packageResult = void 0;
-                if (!typesOnly) {
-                    packageResult = loadModuleFromNodeModulesFolder(moduleName, directory, failedLookupLocations, state);
-                    if (packageResult && ts.hasTypeScriptFileExtension(packageResult)) {
-                        return packageResult;
-                    }
-                }
-                var typesResult = loadModuleFromNodeModulesFolder(ts.combinePaths("@types", moduleName), directory, failedLookupLocations, state);
-                if (typesResult || packageResult) {
-                    return typesResult || packageResult;
-                }
-            }
-            var parentPath = ts.getDirectoryPath(directory);
-            if (parentPath === directory || checkOneLevel) {
-                break;
-            }
-            directory = parentPath;
-        }
-        return undefined;
-    }
-    function classicNameResolver(moduleName, containingFile, compilerOptions, host) {
-        var traceEnabled = isTraceEnabled(compilerOptions, host);
-        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, skipTsx: !compilerOptions.jsx };
-        var failedLookupLocations = [];
-        var supportedExtensions = ts.getSupportedExtensions(compilerOptions);
-        var containingDirectory = ts.getDirectoryPath(containingFile);
-        var resolvedFileName = tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, loadModuleFromFile, failedLookupLocations, supportedExtensions, state);
-        if (resolvedFileName) {
-            return createResolvedModule(resolvedFileName, false, failedLookupLocations);
-        }
-        var referencedSourceFile;
-        if (moduleHasNonRelativeName(moduleName)) {
-            referencedSourceFile = referencedSourceFile = loadModuleFromAncestorDirectories(moduleName, containingDirectory, supportedExtensions, failedLookupLocations, state) ||
-                loadModuleFromNodeModulesAtTypes(moduleName, containingDirectory, failedLookupLocations, state);
-        }
-        else {
-            var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
-            referencedSourceFile = loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, false, state);
-        }
-        return referencedSourceFile
-            ? { resolvedModule: { resolvedFileName: referencedSourceFile }, failedLookupLocations: failedLookupLocations }
-            : { resolvedModule: undefined, failedLookupLocations: failedLookupLocations };
-    }
-    ts.classicNameResolver = classicNameResolver;
-    function loadModuleFromAncestorDirectories(moduleName, containingDirectory, supportedExtensions, failedLookupLocations, state) {
-        while (true) {
-            var searchName = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
-            var referencedSourceFile = loadModuleFromFile(searchName, supportedExtensions, failedLookupLocations, false, state);
-            if (referencedSourceFile) {
-                return referencedSourceFile;
-            }
-            var parentPath = ts.getDirectoryPath(containingDirectory);
-            if (parentPath === containingDirectory) {
-                return undefined;
-            }
-            containingDirectory = parentPath;
-        }
-    }
-})(ts || (ts = {}));
-var ts;
-(function (ts) {
-    ts.externalHelpersModuleNameText = "tslib";
-    function getDeclarationOfKind(symbol, kind) {
-        var declarations = symbol.declarations;
-        if (declarations) {
-            for (var _i = 0, declarations_1 = declarations; _i < declarations_1.length; _i++) {
-                var declaration = declarations_1[_i];
-                if (declaration.kind === kind) {
-                    return declaration;
-                }
-            }
-        }
-        return undefined;
-    }
-    ts.getDeclarationOfKind = getDeclarationOfKind;
-    var stringWriters = [];
-    function getSingleLineStringWriter() {
-        if (stringWriters.length === 0) {
-            var str_1 = "";
-            var writeText = function (text) { return str_1 += text; };
-            return {
-                string: function () { return str_1; },
-                writeKeyword: writeText,
-                writeOperator: writeText,
-                writePunctuation: writeText,
-                writeSpace: writeText,
-                writeStringLiteral: writeText,
-                writeParameter: writeText,
-                writeSymbol: writeText,
-                writeLine: function () { return str_1 += " "; },
-                increaseIndent: function () { },
-                decreaseIndent: function () { },
-                clear: function () { return str_1 = ""; },
-                trackSymbol: function () { },
-                reportInaccessibleThisError: function () { }
-            };
-        }
-        return stringWriters.pop();
-    }
-    ts.getSingleLineStringWriter = getSingleLineStringWriter;
-    function releaseStringWriter(writer) {
-        writer.clear();
-        stringWriters.push(writer);
-    }
-    ts.releaseStringWriter = releaseStringWriter;
-    function getFullWidth(node) {
-        return node.end - node.pos;
-    }
-    ts.getFullWidth = getFullWidth;
-    function arrayIsEqualTo(array1, array2, equaler) {
-        if (!array1 || !array2) {
-            return array1 === array2;
-        }
-        if (array1.length !== array2.length) {
-            return false;
-        }
-        for (var i = 0; i < array1.length; i++) {
-            var equals = equaler ? equaler(array1[i], array2[i]) : array1[i] === array2[i];
-            if (!equals) {
-                return false;
-            }
-        }
-        return true;
-    }
-    ts.arrayIsEqualTo = arrayIsEqualTo;
-    function hasResolvedModule(sourceFile, moduleNameText) {
-        return !!(sourceFile && sourceFile.resolvedModules && sourceFile.resolvedModules[moduleNameText]);
-    }
-    ts.hasResolvedModule = hasResolvedModule;
-    function getResolvedModule(sourceFile, moduleNameText) {
-        return hasResolvedModule(sourceFile, moduleNameText) ? sourceFile.resolvedModules[moduleNameText] : undefined;
-    }
-    ts.getResolvedModule = getResolvedModule;
-    function setResolvedModule(sourceFile, moduleNameText, resolvedModule) {
-        if (!sourceFile.resolvedModules) {
-            sourceFile.resolvedModules = ts.createMap();
-        }
-        sourceFile.resolvedModules[moduleNameText] = resolvedModule;
-    }
-    ts.setResolvedModule = setResolvedModule;
-    function setResolvedTypeReferenceDirective(sourceFile, typeReferenceDirectiveName, resolvedTypeReferenceDirective) {
-        if (!sourceFile.resolvedTypeReferenceDirectiveNames) {
-            sourceFile.resolvedTypeReferenceDirectiveNames = ts.createMap();
-        }
-        sourceFile.resolvedTypeReferenceDirectiveNames[typeReferenceDirectiveName] = resolvedTypeReferenceDirective;
-    }
-    ts.setResolvedTypeReferenceDirective = setResolvedTypeReferenceDirective;
-    function moduleResolutionIsEqualTo(oldResolution, newResolution) {
-        return oldResolution.resolvedFileName === newResolution.resolvedFileName && oldResolution.isExternalLibraryImport === newResolution.isExternalLibraryImport;
-    }
-    ts.moduleResolutionIsEqualTo = moduleResolutionIsEqualTo;
-    function typeDirectiveIsEqualTo(oldResolution, newResolution) {
-        return oldResolution.resolvedFileName === newResolution.resolvedFileName && oldResolution.primary === newResolution.primary;
-    }
-    ts.typeDirectiveIsEqualTo = typeDirectiveIsEqualTo;
-    function hasChangesInResolutions(names, newResolutions, oldResolutions, comparer) {
-        if (names.length !== newResolutions.length) {
-            return false;
-        }
-        for (var i = 0; i < names.length; i++) {
-            var newResolution = newResolutions[i];
-            var oldResolution = oldResolutions && oldResolutions[names[i]];
-            var changed = oldResolution
-                ? !newResolution || !comparer(oldResolution, newResolution)
-                : newResolution;
-            if (changed) {
-                return true;
-            }
-        }
-        return false;
-    }
-    ts.hasChangesInResolutions = hasChangesInResolutions;
-    function containsParseError(node) {
-        aggregateChildData(node);
-        return (node.flags & 2097152) !== 0;
-    }
-    ts.containsParseError = containsParseError;
-    function aggregateChildData(node) {
-        if (!(node.flags & 4194304)) {
-            var thisNodeOrAnySubNodesHasError = ((node.flags & 524288) !== 0) ||
-                ts.forEachChild(node, containsParseError);
-            if (thisNodeOrAnySubNodesHasError) {
-                node.flags |= 2097152;
-            }
-            node.flags |= 4194304;
-        }
-    }
-    function getSourceFileOfNode(node) {
-        while (node && node.kind !== 256) {
-            node = node.parent;
-        }
-        return node;
-    }
-    ts.getSourceFileOfNode = getSourceFileOfNode;
-    function isStatementWithLocals(node) {
-        switch (node.kind) {
-            case 200:
-            case 228:
-            case 207:
-            case 208:
-            case 209:
-                return true;
-        }
-        return false;
-    }
-    ts.isStatementWithLocals = isStatementWithLocals;
-    function getStartPositionOfLine(line, sourceFile) {
-        ts.Debug.assert(line >= 0);
-        return ts.getLineStarts(sourceFile)[line];
-    }
-    ts.getStartPositionOfLine = getStartPositionOfLine;
-    function nodePosToString(node) {
-        var file = getSourceFileOfNode(node);
-        var loc = ts.getLineAndCharacterOfPosition(file, node.pos);
-        return file.fileName + "(" + (loc.line + 1) + "," + (loc.character + 1) + ")";
-    }
-    ts.nodePosToString = nodePosToString;
-    function getStartPosOfNode(node) {
-        return node.pos;
-    }
-    ts.getStartPosOfNode = getStartPosOfNode;
-    function isDefined(value) {
-        return value !== undefined;
-    }
-    ts.isDefined = isDefined;
-    function getEndLinePosition(line, sourceFile) {
-        ts.Debug.assert(line >= 0);
-        var lineStarts = ts.getLineStarts(sourceFile);
-        var lineIndex = line;
-        var sourceText = sourceFile.text;
-        if (lineIndex + 1 === lineStarts.length) {
-            return sourceText.length - 1;
-        }
-        else {
-            var start = lineStarts[lineIndex];
-            var pos = lineStarts[lineIndex + 1] - 1;
-            ts.Debug.assert(ts.isLineBreak(sourceText.charCodeAt(pos)));
-            while (start <= pos && ts.isLineBreak(sourceText.charCodeAt(pos))) {
-                pos--;
-            }
-            return pos;
-        }
-    }
-    ts.getEndLinePosition = getEndLinePosition;
-    function nodeIsMissing(node) {
-        if (node === undefined) {
-            return true;
-        }
-        return node.pos === node.end && node.pos >= 0 && node.kind !== 1;
-    }
-    ts.nodeIsMissing = nodeIsMissing;
-    function nodeIsPresent(node) {
-        return !nodeIsMissing(node);
-    }
-    ts.nodeIsPresent = nodeIsPresent;
-    function getTokenPosOfNode(node, sourceFile, includeJsDocComment) {
-        if (nodeIsMissing(node)) {
-            return node.pos;
-        }
-        if (isJSDocNode(node)) {
-            return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos, false, true);
-        }
-        if (includeJsDocComment && node.jsDocComments && node.jsDocComments.length > 0) {
-            return getTokenPosOfNode(node.jsDocComments[0]);
-        }
-        if (node.kind === 286 && node._children.length > 0) {
-            return getTokenPosOfNode(node._children[0], sourceFile, includeJsDocComment);
-        }
-        return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos);
-    }
-    ts.getTokenPosOfNode = getTokenPosOfNode;
-    function isJSDocNode(node) {
-        return node.kind >= 257 && node.kind <= 282;
-    }
-    ts.isJSDocNode = isJSDocNode;
-    function isJSDocTag(node) {
-        return node.kind >= 273 && node.kind <= 285;
-    }
-    ts.isJSDocTag = isJSDocTag;
-    function getNonDecoratorTokenPosOfNode(node, sourceFile) {
-        if (nodeIsMissing(node) || !node.decorators) {
-            return getTokenPosOfNode(node, sourceFile);
-        }
-        return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.decorators.end);
-    }
-    ts.getNonDecoratorTokenPosOfNode = getNonDecoratorTokenPosOfNode;
-    function getSourceTextOfNodeFromSourceFile(sourceFile, node, includeTrivia) {
-        if (includeTrivia === void 0) { includeTrivia = false; }
-        if (nodeIsMissing(node)) {
-            return "";
-        }
-        var text = sourceFile.text;
-        return text.substring(includeTrivia ? node.pos : ts.skipTrivia(text, node.pos), node.end);
-    }
-    ts.getSourceTextOfNodeFromSourceFile = getSourceTextOfNodeFromSourceFile;
-    function getTextOfNodeFromSourceText(sourceText, node) {
-        if (nodeIsMissing(node)) {
-            return "";
-        }
-        return sourceText.substring(ts.skipTrivia(sourceText, node.pos), node.end);
-    }
-    ts.getTextOfNodeFromSourceText = getTextOfNodeFromSourceText;
-    function getTextOfNode(node, includeTrivia) {
-        if (includeTrivia === void 0) { includeTrivia = false; }
-        return getSourceTextOfNodeFromSourceFile(getSourceFileOfNode(node), node, includeTrivia);
-    }
-    ts.getTextOfNode = getTextOfNode;
-    function getLiteralText(node, sourceFile, languageVersion) {
-        if (languageVersion < 2 && (isTemplateLiteralKind(node.kind) || node.hasExtendedUnicodeEscape)) {
-            return getQuotedEscapedLiteralText('"', node.text, '"');
-        }
-        if (!nodeIsSynthesized(node) && node.parent) {
-            var text = getSourceTextOfNodeFromSourceFile(sourceFile, node);
-            if (languageVersion < 2 && isBinaryOrOctalIntegerLiteral(node, text)) {
-                return node.text;
-            }
-            return text;
-        }
-        switch (node.kind) {
-            case 9:
-                return getQuotedEscapedLiteralText('"', node.text, '"');
-            case 12:
-                return getQuotedEscapedLiteralText("`", node.text, "`");
-            case 13:
-                return getQuotedEscapedLiteralText("`", node.text, "${");
-            case 14:
-                return getQuotedEscapedLiteralText("}", node.text, "${");
-            case 15:
-                return getQuotedEscapedLiteralText("}", node.text, "`");
-            case 8:
-                return node.text;
-        }
-        ts.Debug.fail("Literal kind '" + node.kind + "' not accounted for.");
-    }
-    ts.getLiteralText = getLiteralText;
-    function isBinaryOrOctalIntegerLiteral(node, text) {
-        if (node.kind === 8 && text.length > 1) {
-            switch (text.charCodeAt(1)) {
-                case 98:
-                case 66:
-                case 111:
-                case 79:
-                    return true;
-            }
-        }
-        return false;
-    }
-    ts.isBinaryOrOctalIntegerLiteral = isBinaryOrOctalIntegerLiteral;
-    function getQuotedEscapedLiteralText(leftQuote, text, rightQuote) {
-        return leftQuote + escapeNonAsciiCharacters(escapeString(text)) + rightQuote;
-    }
-    function escapeIdentifier(identifier) {
-        return identifier.length >= 2 && identifier.charCodeAt(0) === 95 && identifier.charCodeAt(1) === 95 ? "_" + identifier : identifier;
-    }
-    ts.escapeIdentifier = escapeIdentifier;
-    function unescapeIdentifier(identifier) {
-        return identifier.length >= 3 && identifier.charCodeAt(0) === 95 && identifier.charCodeAt(1) === 95 && identifier.charCodeAt(2) === 95 ? identifier.substr(1) : identifier;
-    }
-    ts.unescapeIdentifier = unescapeIdentifier;
-    function makeIdentifierFromModuleName(moduleName) {
-        return ts.getBaseFileName(moduleName).replace(/^(\d)/, "_$1").replace(/\W/g, "_");
-    }
-    ts.makeIdentifierFromModuleName = makeIdentifierFromModuleName;
-    function isBlockOrCatchScoped(declaration) {
-        return (ts.getCombinedNodeFlags(declaration) & 3) !== 0 ||
-            isCatchClauseVariableDeclaration(declaration);
-    }
-    ts.isBlockOrCatchScoped = isBlockOrCatchScoped;
-    function isAmbientModule(node) {
-        return node && node.kind === 226 &&
-            (node.name.kind === 9 || isGlobalScopeAugmentation(node));
-    }
-    ts.isAmbientModule = isAmbientModule;
-    function isShorthandAmbientModuleSymbol(moduleSymbol) {
-        return isShorthandAmbientModule(moduleSymbol.valueDeclaration);
-    }
-    ts.isShorthandAmbientModuleSymbol = isShorthandAmbientModuleSymbol;
-    function isShorthandAmbientModule(node) {
-        return node.kind === 226 && (!node.body);
-    }
-    function isBlockScopedContainerTopLevel(node) {
-        return node.kind === 256 ||
-            node.kind === 226 ||
-            isFunctionLike(node);
-    }
-    ts.isBlockScopedContainerTopLevel = isBlockScopedContainerTopLevel;
-    function isGlobalScopeAugmentation(module) {
-        return !!(module.flags & 512);
-    }
-    ts.isGlobalScopeAugmentation = isGlobalScopeAugmentation;
-    function isExternalModuleAugmentation(node) {
-        if (!node || !isAmbientModule(node)) {
-            return false;
-        }
-        switch (node.parent.kind) {
-            case 256:
-                return ts.isExternalModule(node.parent);
-            case 227:
-                return isAmbientModule(node.parent.parent) && !ts.isExternalModule(node.parent.parent.parent);
-        }
-        return false;
-    }
-    ts.isExternalModuleAugmentation = isExternalModuleAugmentation;
-    function isBlockScope(node, parentNode) {
-        switch (node.kind) {
-            case 256:
-            case 228:
-            case 252:
-            case 226:
-            case 207:
-            case 208:
-            case 209:
-            case 149:
-            case 148:
-            case 150:
-            case 151:
-            case 221:
-            case 180:
-            case 181:
-                return true;
-            case 200:
-                return parentNode && !isFunctionLike(parentNode);
-        }
-        return false;
-    }
-    ts.isBlockScope = isBlockScope;
-    function getEnclosingBlockScopeContainer(node) {
-        var current = node.parent;
-        while (current) {
-            if (isBlockScope(current, current.parent)) {
-                return current;
-            }
-            current = current.parent;
-        }
-    }
-    ts.getEnclosingBlockScopeContainer = getEnclosingBlockScopeContainer;
-    function isCatchClauseVariableDeclaration(declaration) {
-        return declaration &&
-            declaration.kind === 219 &&
-            declaration.parent &&
-            declaration.parent.kind === 252;
-    }
-    ts.isCatchClauseVariableDeclaration = isCatchClauseVariableDeclaration;
-    function declarationNameToString(name) {
-        return getFullWidth(name) === 0 ? "(Missing)" : getTextOfNode(name);
-    }
-    ts.declarationNameToString = declarationNameToString;
-    function createDiagnosticForNode(node, message, arg0, arg1, arg2) {
-        var sourceFile = getSourceFileOfNode(node);
-        var span = getErrorSpanForNode(sourceFile, node);
-        return ts.createFileDiagnostic(sourceFile, span.start, span.length, message, arg0, arg1, arg2);
-    }
-    ts.createDiagnosticForNode = createDiagnosticForNode;
-    function createDiagnosticForNodeFromMessageChain(node, messageChain) {
-        var sourceFile = getSourceFileOfNode(node);
-        var span = getErrorSpanForNode(sourceFile, node);
-        return {
-            file: sourceFile,
-            start: span.start,
-            length: span.length,
-            code: messageChain.code,
-            category: messageChain.category,
-            messageText: messageChain.next ? messageChain : messageChain.messageText
-        };
-    }
-    ts.createDiagnosticForNodeFromMessageChain = createDiagnosticForNodeFromMessageChain;
-    function getSpanOfTokenAtPosition(sourceFile, pos) {
-        var scanner = ts.createScanner(sourceFile.languageVersion, true, sourceFile.languageVariant, sourceFile.text, undefined, pos);
-        scanner.scan();
-        var start = scanner.getTokenPos();
-        return ts.createTextSpanFromBounds(start, scanner.getTextPos());
-    }
-    ts.getSpanOfTokenAtPosition = getSpanOfTokenAtPosition;
-    function getErrorSpanForArrowFunction(sourceFile, node) {
-        var pos = ts.skipTrivia(sourceFile.text, node.pos);
-        if (node.body && node.body.kind === 200) {
-            var startLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.pos).line;
-            var endLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.end).line;
-            if (startLine < endLine) {
-                return ts.createTextSpan(pos, getEndLinePosition(startLine, sourceFile) - pos + 1);
-            }
-        }
-        return ts.createTextSpanFromBounds(pos, node.end);
-    }
-    function getErrorSpanForNode(sourceFile, node) {
-        var errorNode = node;
-        switch (node.kind) {
-            case 256:
-                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 219:
-            case 170:
-            case 222:
-            case 193:
-            case 223:
-            case 226:
-            case 225:
-            case 255:
-            case 221:
-            case 180:
-            case 148:
-            case 150:
-            case 151:
-            case 224:
-                errorNode = node.name;
-                break;
-            case 181:
-                return getErrorSpanForArrowFunction(sourceFile, node);
-        }
-        if (errorNode === undefined) {
-            return getSpanOfTokenAtPosition(sourceFile, node.pos);
-        }
-        var pos = nodeIsMissing(errorNode)
-            ? errorNode.pos
-            : ts.skipTrivia(sourceFile.text, errorNode.pos);
-        return ts.createTextSpanFromBounds(pos, errorNode.end);
-    }
-    ts.getErrorSpanForNode = getErrorSpanForNode;
-    function isExternalOrCommonJsModule(file) {
-        return (file.externalModuleIndicator || file.commonJsModuleIndicator) !== undefined;
-    }
-    ts.isExternalOrCommonJsModule = isExternalOrCommonJsModule;
-    function isDeclarationFile(file) {
-        return file.isDeclarationFile;
-    }
-    ts.isDeclarationFile = isDeclarationFile;
-    function isConstEnumDeclaration(node) {
-        return node.kind === 225 && isConst(node);
-    }
-    ts.isConstEnumDeclaration = isConstEnumDeclaration;
-    function isConst(node) {
-        return !!(ts.getCombinedNodeFlags(node) & 2)
-            || !!(ts.getCombinedModifierFlags(node) & 2048);
-    }
-    ts.isConst = isConst;
-    function isLet(node) {
-        return !!(ts.getCombinedNodeFlags(node) & 1);
-    }
-    ts.isLet = isLet;
-    function isSuperCall(n) {
-        return n.kind === 175 && n.expression.kind === 96;
-    }
-    ts.isSuperCall = isSuperCall;
-    function isPrologueDirective(node) {
-        return node.kind === 203 && node.expression.kind === 9;
-    }
-    ts.isPrologueDirective = isPrologueDirective;
-    function getLeadingCommentRangesOfNode(node, sourceFileOfNode) {
-        return ts.getLeadingCommentRanges(sourceFileOfNode.text, node.pos);
-    }
-    ts.getLeadingCommentRangesOfNode = getLeadingCommentRangesOfNode;
-    function getLeadingCommentRangesOfNodeFromText(node, text) {
-        return ts.getLeadingCommentRanges(text, node.pos);
-    }
-    ts.getLeadingCommentRangesOfNodeFromText = getLeadingCommentRangesOfNodeFromText;
-    function getJsDocComments(node, sourceFileOfNode) {
-        return getJsDocCommentsFromText(node, sourceFileOfNode.text);
-    }
-    ts.getJsDocComments = getJsDocComments;
-    function getJsDocCommentsFromText(node, text) {
-        var commentRanges = (node.kind === 143 ||
-            node.kind === 142 ||
-            node.kind === 180 ||
-            node.kind === 181) ?
-            ts.concatenate(ts.getTrailingCommentRanges(text, node.pos), ts.getLeadingCommentRanges(text, node.pos)) :
-            getLeadingCommentRangesOfNodeFromText(node, text);
-        return ts.filter(commentRanges, isJsDocComment);
-        function isJsDocComment(comment) {
-            return text.charCodeAt(comment.pos + 1) === 42 &&
-                text.charCodeAt(comment.pos + 2) === 42 &&
-                text.charCodeAt(comment.pos + 3) !== 47;
-        }
-    }
-    ts.getJsDocCommentsFromText = getJsDocCommentsFromText;
-    ts.fullTripleSlashReferencePathRegEx = /^(\/\/\/\s*<reference\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
-    ts.fullTripleSlashReferenceTypeReferenceDirectiveRegEx = /^(\/\/\/\s*<reference\s+types\s*=\s*)('|")(.+?)\2.*?\/>/;
-    ts.fullTripleSlashAMDReferencePathRegEx = /^(\/\/\/\s*<amd-dependency\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
-    function isPartOfTypeNode(node) {
-        if (155 <= node.kind && node.kind <= 167) {
-            return true;
-        }
-        switch (node.kind) {
-            case 118:
-            case 131:
-            case 133:
-            case 121:
-            case 134:
-            case 136:
-            case 128:
-                return true;
-            case 104:
-                return node.parent.kind !== 184;
-            case 195:
-                return !isExpressionWithTypeArgumentsInClassExtendsClause(node);
-            case 70:
-                if (node.parent.kind === 140 && node.parent.right === node) {
-                    node = node.parent;
-                }
-                else if (node.parent.kind === 173 && node.parent.name === node) {
-                    node = node.parent;
-                }
-                ts.Debug.assert(node.kind === 70 || node.kind === 140 || node.kind === 173, "'node' was expected to be a qualified name, identifier or property access in 'isPartOfTypeNode'.");
-            case 140:
-            case 173:
-            case 98:
-                var parent_2 = node.parent;
-                if (parent_2.kind === 159) {
-                    return false;
-                }
-                if (155 <= parent_2.kind && parent_2.kind <= 167) {
-                    return true;
-                }
-                switch (parent_2.kind) {
-                    case 195:
-                        return !isExpressionWithTypeArgumentsInClassExtendsClause(parent_2);
-                    case 142:
-                        return node === parent_2.constraint;
-                    case 146:
-                    case 145:
-                    case 143:
-                    case 219:
-                        return node === parent_2.type;
-                    case 221:
-                    case 180:
-                    case 181:
-                    case 149:
-                    case 148:
-                    case 147:
-                    case 150:
-                    case 151:
-                        return node === parent_2.type;
-                    case 152:
-                    case 153:
-                    case 154:
-                        return node === parent_2.type;
-                    case 178:
-                        return node === parent_2.type;
-                    case 175:
-                    case 176:
-                        return parent_2.typeArguments && ts.indexOf(parent_2.typeArguments, node) >= 0;
-                    case 177:
-                        return false;
-                }
-        }
-        return false;
-    }
-    ts.isPartOfTypeNode = isPartOfTypeNode;
-    function forEachReturnStatement(body, visitor) {
-        return traverse(body);
-        function traverse(node) {
-            switch (node.kind) {
-                case 212:
-                    return visitor(node);
-                case 228:
-                case 200:
-                case 204:
-                case 205:
-                case 206:
-                case 207:
-                case 208:
-                case 209:
-                case 213:
-                case 214:
-                case 249:
-                case 250:
-                case 215:
-                case 217:
-                case 252:
-                    return ts.forEachChild(node, traverse);
-            }
-        }
-    }
-    ts.forEachReturnStatement = forEachReturnStatement;
-    function forEachYieldExpression(body, visitor) {
-        return traverse(body);
-        function traverse(node) {
-            switch (node.kind) {
-                case 191:
-                    visitor(node);
-                    var operand = node.expression;
-                    if (operand) {
-                        traverse(operand);
-                    }
-                case 225:
-                case 223:
-                case 226:
-                case 224:
-                case 222:
-                case 193:
-                    return;
-                default:
-                    if (isFunctionLike(node)) {
-                        var name_4 = node.name;
-                        if (name_4 && name_4.kind === 141) {
-                            traverse(name_4.expression);
-                            return;
-                        }
-                    }
-                    else if (!isPartOfTypeNode(node)) {
-                        ts.forEachChild(node, traverse);
-                    }
-            }
-        }
-    }
-    ts.forEachYieldExpression = forEachYieldExpression;
-    function isVariableLike(node) {
-        if (node) {
-            switch (node.kind) {
-                case 170:
-                case 255:
-                case 143:
-                case 253:
-                case 146:
-                case 145:
-                case 254:
-                case 219:
-                    return true;
-            }
-        }
-        return false;
-    }
-    ts.isVariableLike = isVariableLike;
-    function isAccessor(node) {
-        return node && (node.kind === 150 || node.kind === 151);
-    }
-    ts.isAccessor = isAccessor;
-    function isClassLike(node) {
-        return node && (node.kind === 222 || node.kind === 193);
-    }
-    ts.isClassLike = isClassLike;
-    function isFunctionLike(node) {
-        return node && isFunctionLikeKind(node.kind);
-    }
-    ts.isFunctionLike = isFunctionLike;
-    function isFunctionLikeKind(kind) {
-        switch (kind) {
-            case 149:
-            case 180:
-            case 221:
-            case 181:
-            case 148:
-            case 147:
-            case 150:
-            case 151:
-            case 152:
-            case 153:
-            case 154:
-            case 157:
-            case 158:
-                return true;
-        }
-        return false;
-    }
-    ts.isFunctionLikeKind = isFunctionLikeKind;
-    function introducesArgumentsExoticObject(node) {
-        switch (node.kind) {
-            case 148:
-            case 147:
-            case 149:
-            case 150:
-            case 151:
-            case 221:
-            case 180:
-                return true;
-        }
-        return false;
-    }
-    ts.introducesArgumentsExoticObject = introducesArgumentsExoticObject;
-    function isIterationStatement(node, lookInLabeledStatements) {
-        switch (node.kind) {
-            case 207:
-            case 208:
-            case 209:
-            case 205:
-            case 206:
-                return true;
-            case 215:
-                return lookInLabeledStatements && isIterationStatement(node.statement, lookInLabeledStatements);
-        }
-        return false;
-    }
-    ts.isIterationStatement = isIterationStatement;
-    function isFunctionBlock(node) {
-        return node && node.kind === 200 && isFunctionLike(node.parent);
-    }
-    ts.isFunctionBlock = isFunctionBlock;
-    function isObjectLiteralMethod(node) {
-        return node && node.kind === 148 && node.parent.kind === 172;
-    }
-    ts.isObjectLiteralMethod = isObjectLiteralMethod;
-    function isObjectLiteralOrClassExpressionMethod(node) {
-        return node.kind === 148 &&
-            (node.parent.kind === 172 ||
-                node.parent.kind === 193);
-    }
-    ts.isObjectLiteralOrClassExpressionMethod = isObjectLiteralOrClassExpressionMethod;
-    function isIdentifierTypePredicate(predicate) {
-        return predicate && predicate.kind === 1;
-    }
-    ts.isIdentifierTypePredicate = isIdentifierTypePredicate;
-    function isThisTypePredicate(predicate) {
-        return predicate && predicate.kind === 0;
-    }
-    ts.isThisTypePredicate = isThisTypePredicate;
-    function getContainingFunction(node) {
-        while (true) {
-            node = node.parent;
-            if (!node || isFunctionLike(node)) {
-                return node;
-            }
-        }
-    }
-    ts.getContainingFunction = getContainingFunction;
-    function getContainingClass(node) {
-        while (true) {
-            node = node.parent;
-            if (!node || isClassLike(node)) {
-                return node;
-            }
-        }
-    }
-    ts.getContainingClass = getContainingClass;
-    function getThisContainer(node, includeArrowFunctions) {
-        while (true) {
-            node = node.parent;
-            if (!node) {
-                return undefined;
-            }
-            switch (node.kind) {
-                case 141:
-                    if (isClassLike(node.parent.parent)) {
-                        return node;
-                    }
-                    node = node.parent;
-                    break;
-                case 144:
-                    if (node.parent.kind === 143 && isClassElement(node.parent.parent)) {
-                        node = node.parent.parent;
-                    }
-                    else if (isClassElement(node.parent)) {
-                        node = node.parent;
-                    }
-                    break;
-                case 181:
-                    if (!includeArrowFunctions) {
-                        continue;
-                    }
-                case 221:
-                case 180:
-                case 226:
-                case 146:
-                case 145:
-                case 148:
-                case 147:
-                case 149:
-                case 150:
-                case 151:
-                case 152:
-                case 153:
-                case 154:
-                case 225:
-                case 256:
-                    return node;
-            }
-        }
-    }
-    ts.getThisContainer = getThisContainer;
-    function getSuperContainer(node, stopOnFunctions) {
-        while (true) {
-            node = node.parent;
-            if (!node) {
-                return node;
-            }
-            switch (node.kind) {
-                case 141:
-                    node = node.parent;
-                    break;
-                case 221:
-                case 180:
-                case 181:
-                    if (!stopOnFunctions) {
-                        continue;
-                    }
-                case 146:
-                case 145:
-                case 148:
-                case 147:
-                case 149:
-                case 150:
-                case 151:
-                    return node;
-                case 144:
-                    if (node.parent.kind === 143 && isClassElement(node.parent.parent)) {
-                        node = node.parent.parent;
-                    }
-                    else if (isClassElement(node.parent)) {
-                        node = node.parent;
-                    }
-                    break;
-            }
-        }
-    }
-    ts.getSuperContainer = getSuperContainer;
-    function getImmediatelyInvokedFunctionExpression(func) {
-        if (func.kind === 180 || func.kind === 181) {
-            var prev = func;
-            var parent_3 = func.parent;
-            while (parent_3.kind === 179) {
-                prev = parent_3;
-                parent_3 = parent_3.parent;
-            }
-            if (parent_3.kind === 175 && parent_3.expression === prev) {
-                return parent_3;
-            }
-        }
-    }
-    ts.getImmediatelyInvokedFunctionExpression = getImmediatelyInvokedFunctionExpression;
-    function isSuperProperty(node) {
-        var kind = node.kind;
-        return (kind === 173 || kind === 174)
-            && node.expression.kind === 96;
-    }
-    ts.isSuperProperty = isSuperProperty;
-    function getEntityNameFromTypeNode(node) {
-        if (node) {
-            switch (node.kind) {
-                case 156:
-                    return node.typeName;
-                case 195:
-                    ts.Debug.assert(isEntityNameExpression(node.expression));
-                    return node.expression;
-                case 70:
-                case 140:
-                    return node;
-            }
-        }
-        return undefined;
-    }
-    ts.getEntityNameFromTypeNode = getEntityNameFromTypeNode;
-    function isCallLikeExpression(node) {
-        switch (node.kind) {
-            case 175:
-            case 176:
-            case 177:
-            case 144:
-                return true;
-            default:
-                return false;
-        }
-    }
-    ts.isCallLikeExpression = isCallLikeExpression;
-    function getInvokedExpression(node) {
-        if (node.kind === 177) {
-            return node.tag;
-        }
-        return node.expression;
-    }
-    ts.getInvokedExpression = getInvokedExpression;
-    function nodeCanBeDecorated(node) {
-        switch (node.kind) {
-            case 222:
-                return true;
-            case 146:
-                return node.parent.kind === 222;
-            case 150:
-            case 151:
-            case 148:
-                return node.body !== undefined
-                    && node.parent.kind === 222;
-            case 143:
-                return node.parent.body !== undefined
-                    && (node.parent.kind === 149
-                        || node.parent.kind === 148
-                        || node.parent.kind === 151)
-                    && node.parent.parent.kind === 222;
-        }
-        return false;
-    }
-    ts.nodeCanBeDecorated = nodeCanBeDecorated;
-    function nodeIsDecorated(node) {
-        return node.decorators !== undefined
-            && nodeCanBeDecorated(node);
-    }
-    ts.nodeIsDecorated = nodeIsDecorated;
-    function nodeOrChildIsDecorated(node) {
-        return nodeIsDecorated(node) || childIsDecorated(node);
-    }
-    ts.nodeOrChildIsDecorated = nodeOrChildIsDecorated;
-    function childIsDecorated(node) {
-        switch (node.kind) {
-            case 222:
-                return ts.forEach(node.members, nodeOrChildIsDecorated);
-            case 148:
-            case 151:
-                return ts.forEach(node.parameters, nodeIsDecorated);
-        }
-    }
-    ts.childIsDecorated = childIsDecorated;
-    function isJSXTagName(node) {
-        var parent = node.parent;
-        if (parent.kind === 244 ||
-            parent.kind === 243 ||
-            parent.kind === 245) {
-            return parent.tagName === node;
-        }
-        return false;
-    }
-    ts.isJSXTagName = isJSXTagName;
-    function isPartOfExpression(node) {
-        switch (node.kind) {
-            case 98:
-            case 96:
-            case 94:
-            case 100:
-            case 85:
-            case 11:
-            case 171:
-            case 172:
-            case 173:
-            case 174:
-            case 175:
-            case 176:
-            case 177:
-            case 196:
-            case 178:
-            case 197:
-            case 179:
-            case 180:
-            case 193:
-            case 181:
-            case 184:
-            case 182:
-            case 183:
-            case 186:
-            case 187:
-            case 188:
-            case 189:
-            case 192:
-            case 190:
-            case 12:
-            case 194:
-            case 242:
-            case 243:
-            case 191:
-            case 185:
-                return true;
-            case 140:
-                while (node.parent.kind === 140) {
-                    node = node.parent;
-                }
-                return node.parent.kind === 159 || isJSXTagName(node);
-            case 70:
-                if (node.parent.kind === 159 || isJSXTagName(node)) {
-                    return true;
-                }
-            case 8:
-            case 9:
-            case 98:
-                var parent_4 = node.parent;
-                switch (parent_4.kind) {
-                    case 219:
-                    case 143:
-                    case 146:
-                    case 145:
-                    case 255:
-                    case 253:
-                    case 170:
-                        return parent_4.initializer === node;
-                    case 203:
-                    case 204:
-                    case 205:
-                    case 206:
-                    case 212:
-                    case 213:
-                    case 214:
-                    case 249:
-                    case 216:
-                    case 214:
-                        return parent_4.expression === node;
-                    case 207:
-                        var forStatement = parent_4;
-                        return (forStatement.initializer === node && forStatement.initializer.kind !== 220) ||
-                            forStatement.condition === node ||
-                            forStatement.incrementor === node;
-                    case 208:
-                    case 209:
-                        var forInStatement = parent_4;
-                        return (forInStatement.initializer === node && forInStatement.initializer.kind !== 220) ||
-                            forInStatement.expression === node;
-                    case 178:
-                    case 196:
-                        return node === parent_4.expression;
-                    case 198:
-                        return node === parent_4.expression;
-                    case 141:
-                        return node === parent_4.expression;
-                    case 144:
-                    case 248:
-                    case 247:
-                        return true;
-                    case 195:
-                        return parent_4.expression === node && isExpressionWithTypeArgumentsInClassExtendsClause(parent_4);
-                    default:
-                        if (isPartOfExpression(parent_4)) {
-                            return true;
-                        }
-                }
-        }
-        return false;
-    }
-    ts.isPartOfExpression = isPartOfExpression;
-    function isInstantiatedModule(node, preserveConstEnums) {
-        var moduleState = ts.getModuleInstanceState(node);
-        return moduleState === 1 ||
-            (preserveConstEnums && moduleState === 2);
-    }
-    ts.isInstantiatedModule = isInstantiatedModule;
-    function isExternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 230 && node.moduleReference.kind === 241;
-    }
-    ts.isExternalModuleImportEqualsDeclaration = isExternalModuleImportEqualsDeclaration;
-    function getExternalModuleImportEqualsDeclarationExpression(node) {
-        ts.Debug.assert(isExternalModuleImportEqualsDeclaration(node));
-        return node.moduleReference.expression;
-    }
-    ts.getExternalModuleImportEqualsDeclarationExpression = getExternalModuleImportEqualsDeclarationExpression;
-    function isInternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 230 && node.moduleReference.kind !== 241;
-    }
-    ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration;
-    function isSourceFileJavaScript(file) {
-        return isInJavaScriptFile(file);
-    }
-    ts.isSourceFileJavaScript = isSourceFileJavaScript;
-    function isInJavaScriptFile(node) {
-        return node && !!(node.flags & 1048576);
-    }
-    ts.isInJavaScriptFile = isInJavaScriptFile;
-    function isRequireCall(expression, checkArgumentIsStringLiteral) {
-        var isRequire = expression.kind === 175 &&
-            expression.expression.kind === 70 &&
-            expression.expression.text === "require" &&
-            expression.arguments.length === 1;
-        return isRequire && (!checkArgumentIsStringLiteral || expression.arguments[0].kind === 9);
-    }
-    ts.isRequireCall = isRequireCall;
-    function isSingleOrDoubleQuote(charCode) {
-        return charCode === 39 || charCode === 34;
-    }
-    ts.isSingleOrDoubleQuote = isSingleOrDoubleQuote;
-    function isDeclarationOfFunctionExpression(s) {
-        if (s.valueDeclaration && s.valueDeclaration.kind === 219) {
-            var declaration = s.valueDeclaration;
-            return declaration.initializer && declaration.initializer.kind === 180;
-        }
-        return false;
-    }
-    ts.isDeclarationOfFunctionExpression = isDeclarationOfFunctionExpression;
-    function getSpecialPropertyAssignmentKind(expression) {
-        if (!isInJavaScriptFile(expression)) {
-            return 0;
-        }
-        if (expression.kind !== 188) {
-            return 0;
-        }
-        var expr = expression;
-        if (expr.operatorToken.kind !== 57 || expr.left.kind !== 173) {
-            return 0;
-        }
-        var lhs = expr.left;
-        if (lhs.expression.kind === 70) {
-            var lhsId = lhs.expression;
-            if (lhsId.text === "exports") {
-                return 1;
-            }
-            else if (lhsId.text === "module" && lhs.name.text === "exports") {
-                return 2;
-            }
-        }
-        else if (lhs.expression.kind === 98) {
-            return 4;
-        }
-        else if (lhs.expression.kind === 173) {
-            var innerPropertyAccess = lhs.expression;
-            if (innerPropertyAccess.expression.kind === 70) {
-                var innerPropertyAccessIdentifier = innerPropertyAccess.expression;
-                if (innerPropertyAccessIdentifier.text === "module" && innerPropertyAccess.name.text === "exports") {
-                    return 1;
-                }
-                if (innerPropertyAccess.name.text === "prototype") {
-                    return 3;
-                }
-            }
-        }
-        return 0;
-    }
-    ts.getSpecialPropertyAssignmentKind = getSpecialPropertyAssignmentKind;
-    function getExternalModuleName(node) {
-        if (node.kind === 231) {
-            return node.moduleSpecifier;
-        }
-        if (node.kind === 230) {
-            var reference = node.moduleReference;
-            if (reference.kind === 241) {
-                return reference.expression;
-            }
-        }
-        if (node.kind === 237) {
-            return node.moduleSpecifier;
-        }
-        if (node.kind === 226 && node.name.kind === 9) {
-            return node.name;
-        }
-    }
-    ts.getExternalModuleName = getExternalModuleName;
-    function getNamespaceDeclarationNode(node) {
-        if (node.kind === 230) {
-            return node;
-        }
-        var importClause = node.importClause;
-        if (importClause && importClause.namedBindings && importClause.namedBindings.kind === 233) {
-            return importClause.namedBindings;
-        }
-    }
-    ts.getNamespaceDeclarationNode = getNamespaceDeclarationNode;
-    function isDefaultImport(node) {
-        return node.kind === 231
-            && node.importClause
-            && !!node.importClause.name;
-    }
-    ts.isDefaultImport = isDefaultImport;
-    function hasQuestionToken(node) {
-        if (node) {
-            switch (node.kind) {
-                case 143:
-                case 148:
-                case 147:
-                case 254:
-                case 253:
-                case 146:
-                case 145:
-                    return node.questionToken !== undefined;
-            }
-        }
-        return false;
-    }
-    ts.hasQuestionToken = hasQuestionToken;
-    function isJSDocConstructSignature(node) {
-        return node.kind === 269 &&
-            node.parameters.length > 0 &&
-            node.parameters[0].type.kind === 271;
-    }
-    ts.isJSDocConstructSignature = isJSDocConstructSignature;
-    function getJSDocTag(node, kind, checkParentVariableStatement) {
-        if (!node) {
-            return undefined;
-        }
-        var jsDocTags = getJSDocTags(node, checkParentVariableStatement);
-        if (!jsDocTags) {
-            return undefined;
-        }
-        for (var _i = 0, jsDocTags_1 = jsDocTags; _i < jsDocTags_1.length; _i++) {
-            var tag = jsDocTags_1[_i];
-            if (tag.kind === kind) {
-                return tag;
-            }
-        }
-    }
-    function append(previous, additional) {
-        if (additional) {
-            if (!previous) {
-                previous = [];
-            }
-            for (var _i = 0, additional_1 = additional; _i < additional_1.length; _i++) {
-                var x = additional_1[_i];
-                previous.push(x);
-            }
-        }
-        return previous;
-    }
-    function getJSDocComments(node, checkParentVariableStatement) {
-        return getJSDocs(node, checkParentVariableStatement, function (docs) { return ts.map(docs, function (doc) { return doc.comment; }); }, function (tags) { return ts.map(tags, function (tag) { return tag.comment; }); });
-    }
-    ts.getJSDocComments = getJSDocComments;
-    function getJSDocTags(node, checkParentVariableStatement) {
-        return getJSDocs(node, checkParentVariableStatement, function (docs) {
-            var result = [];
-            for (var _i = 0, docs_1 = docs; _i < docs_1.length; _i++) {
-                var doc = docs_1[_i];
-                if (doc.tags) {
-                    result.push.apply(result, doc.tags);
-                }
-            }
-            return result;
-        }, function (tags) { return tags; });
-    }
-    function getJSDocs(node, checkParentVariableStatement, getDocs, getTags) {
-        var result = undefined;
-        if (checkParentVariableStatement) {
-            var isInitializerOfVariableDeclarationInStatement = isVariableLike(node.parent) &&
-                (node.parent).initializer === node &&
-                node.parent.parent.parent.kind === 201;
-            var isVariableOfVariableDeclarationStatement = isVariableLike(node) &&
-                node.parent.parent.kind === 201;
-            var variableStatementNode = isInitializerOfVariableDeclarationInStatement ? node.parent.parent.parent :
-                isVariableOfVariableDeclarationStatement ? node.parent.parent :
-                    undefined;
-            if (variableStatementNode) {
-                result = append(result, getJSDocs(variableStatementNode, checkParentVariableStatement, getDocs, getTags));
-            }
-            if (node.kind === 226 &&
-                node.parent && node.parent.kind === 226) {
-                result = append(result, getJSDocs(node.parent, checkParentVariableStatement, getDocs, getTags));
-            }
-            var parent_5 = node.parent;
-            var isSourceOfAssignmentExpressionStatement = parent_5 && parent_5.parent &&
-                parent_5.kind === 188 &&
-                parent_5.operatorToken.kind === 57 &&
-                parent_5.parent.kind === 203;
-            if (isSourceOfAssignmentExpressionStatement) {
-                result = append(result, getJSDocs(parent_5.parent, checkParentVariableStatement, getDocs, getTags));
-            }
-            var isPropertyAssignmentExpression = parent_5 && parent_5.kind === 253;
-            if (isPropertyAssignmentExpression) {
-                result = append(result, getJSDocs(parent_5, checkParentVariableStatement, getDocs, getTags));
-            }
-            if (node.kind === 143) {
-                var paramTags = getJSDocParameterTag(node, checkParentVariableStatement);
-                if (paramTags) {
-                    result = append(result, getTags(paramTags));
-                }
-            }
-        }
-        if (isVariableLike(node) && node.initializer) {
-            result = append(result, getJSDocs(node.initializer, false, getDocs, getTags));
-        }
-        if (node.jsDocComments) {
-            if (result) {
-                result = append(result, getDocs(node.jsDocComments));
-            }
-            else {
-                return getDocs(node.jsDocComments);
-            }
-        }
-        return result;
-    }
-    function getJSDocParameterTag(param, checkParentVariableStatement) {
-        var func = param.parent;
-        var tags = getJSDocTags(func, checkParentVariableStatement);
-        if (!param.name) {
-            var i = func.parameters.indexOf(param);
-            var paramTags = ts.filter(tags, function (tag) { return tag.kind === 275; });
-            if (paramTags && 0 <= i && i < paramTags.length) {
-                return [paramTags[i]];
-            }
-        }
-        else if (param.name.kind === 70) {
-            var name_5 = param.name.text;
-            var paramTags = ts.filter(tags, function (tag) { return tag.kind === 275 && tag.parameterName.text === name_5; });
-            if (paramTags) {
-                return paramTags;
-            }
-        }
-        else {
-            return undefined;
-        }
-    }
-    function getJSDocTypeTag(node) {
-        return getJSDocTag(node, 277, false);
-    }
-    ts.getJSDocTypeTag = getJSDocTypeTag;
-    function getJSDocReturnTag(node) {
-        return getJSDocTag(node, 276, true);
-    }
-    ts.getJSDocReturnTag = getJSDocReturnTag;
-    function getJSDocTemplateTag(node) {
-        return getJSDocTag(node, 278, false);
-    }
-    ts.getJSDocTemplateTag = getJSDocTemplateTag;
-    function getCorrespondingJSDocParameterTag(parameter) {
-        if (parameter.name && parameter.name.kind === 70) {
-            var parameterName = parameter.name.text;
-            var jsDocTags = getJSDocTags(parameter.parent, true);
-            if (!jsDocTags) {
-                return undefined;
-            }
-            for (var _i = 0, jsDocTags_2 = jsDocTags; _i < jsDocTags_2.length; _i++) {
-                var tag = jsDocTags_2[_i];
-                if (tag.kind === 275) {
-                    var parameterTag = tag;
-                    if (parameterTag.parameterName.text === parameterName) {
-                        return parameterTag;
-                    }
-                }
-            }
-        }
-        return undefined;
-    }
-    ts.getCorrespondingJSDocParameterTag = getCorrespondingJSDocParameterTag;
-    function hasRestParameter(s) {
-        return isRestParameter(ts.lastOrUndefined(s.parameters));
-    }
-    ts.hasRestParameter = hasRestParameter;
-    function hasDeclaredRestParameter(s) {
-        return isDeclaredRestParam(ts.lastOrUndefined(s.parameters));
-    }
-    ts.hasDeclaredRestParameter = hasDeclaredRestParameter;
-    function isRestParameter(node) {
-        if (node && (node.flags & 1048576)) {
-            if (node.type && node.type.kind === 270) {
-                return true;
-            }
-            var paramTag = getCorrespondingJSDocParameterTag(node);
-            if (paramTag && paramTag.typeExpression) {
-                return paramTag.typeExpression.type.kind === 270;
-            }
-        }
-        return isDeclaredRestParam(node);
-    }
-    ts.isRestParameter = isRestParameter;
-    function isDeclaredRestParam(node) {
-        return node && node.dotDotDotToken !== undefined;
-    }
-    ts.isDeclaredRestParam = isDeclaredRestParam;
-    function isAssignmentTarget(node) {
-        while (node.parent.kind === 179) {
-            node = node.parent;
-        }
-        while (true) {
-            var parent_6 = node.parent;
-            if (parent_6.kind === 171 || parent_6.kind === 192) {
-                node = parent_6;
-                continue;
-            }
-            if (parent_6.kind === 253 || parent_6.kind === 254) {
-                node = parent_6.parent;
-                continue;
-            }
-            return parent_6.kind === 188 &&
-                isAssignmentOperator(parent_6.operatorToken.kind) &&
-                parent_6.left === node ||
-                (parent_6.kind === 208 || parent_6.kind === 209) &&
-                    parent_6.initializer === node;
-        }
-    }
-    ts.isAssignmentTarget = isAssignmentTarget;
-    function isNodeDescendantOf(node, ancestor) {
-        while (node) {
-            if (node === ancestor)
-                return true;
-            node = node.parent;
-        }
-        return false;
-    }
-    ts.isNodeDescendantOf = isNodeDescendantOf;
-    function isInAmbientContext(node) {
-        while (node) {
-            if (hasModifier(node, 2) || (node.kind === 256 && node.isDeclarationFile)) {
-                return true;
-            }
-            node = node.parent;
-        }
-        return false;
-    }
-    ts.isInAmbientContext = isInAmbientContext;
-    function isDeclarationName(name) {
-        if (name.kind !== 70 && name.kind !== 9 && name.kind !== 8) {
-            return false;
-        }
-        var parent = name.parent;
-        if (parent.kind === 235 || parent.kind === 239) {
-            if (parent.propertyName) {
-                return true;
-            }
-        }
-        if (isDeclaration(parent)) {
-            return parent.name === name;
-        }
-        return false;
-    }
-    ts.isDeclarationName = isDeclarationName;
-    function isLiteralComputedPropertyDeclarationName(node) {
-        return (node.kind === 9 || node.kind === 8) &&
-            node.parent.kind === 141 &&
-            isDeclaration(node.parent.parent);
-    }
-    ts.isLiteralComputedPropertyDeclarationName = isLiteralComputedPropertyDeclarationName;
-    function isIdentifierName(node) {
-        var parent = node.parent;
-        switch (parent.kind) {
-            case 146:
-            case 145:
-            case 148:
-            case 147:
-            case 150:
-            case 151:
-            case 255:
-            case 253:
-            case 173:
-                return parent.name === node;
-            case 140:
-                if (parent.right === node) {
-                    while (parent.kind === 140) {
-                        parent = parent.parent;
-                    }
-                    return parent.kind === 159;
-                }
-                return false;
-            case 170:
-            case 235:
-                return parent.propertyName === node;
-            case 239:
-                return true;
-        }
-        return false;
-    }
-    ts.isIdentifierName = isIdentifierName;
-    function isAliasSymbolDeclaration(node) {
-        return node.kind === 230 ||
-            node.kind === 229 ||
-            node.kind === 232 && !!node.name ||
-            node.kind === 233 ||
-            node.kind === 235 ||
-            node.kind === 239 ||
-            node.kind === 236 && exportAssignmentIsAlias(node);
-    }
-    ts.isAliasSymbolDeclaration = isAliasSymbolDeclaration;
-    function exportAssignmentIsAlias(node) {
-        return isEntityNameExpression(node.expression);
-    }
-    ts.exportAssignmentIsAlias = exportAssignmentIsAlias;
-    function getClassExtendsHeritageClauseElement(node) {
-        var heritageClause = getHeritageClause(node.heritageClauses, 84);
-        return heritageClause && heritageClause.types.length > 0 ? heritageClause.types[0] : undefined;
-    }
-    ts.getClassExtendsHeritageClauseElement = getClassExtendsHeritageClauseElement;
-    function getClassImplementsHeritageClauseElements(node) {
-        var heritageClause = getHeritageClause(node.heritageClauses, 107);
-        return heritageClause ? heritageClause.types : undefined;
-    }
-    ts.getClassImplementsHeritageClauseElements = getClassImplementsHeritageClauseElements;
-    function getInterfaceBaseTypeNodes(node) {
-        var heritageClause = getHeritageClause(node.heritageClauses, 84);
-        return heritageClause ? heritageClause.types : undefined;
-    }
-    ts.getInterfaceBaseTypeNodes = getInterfaceBaseTypeNodes;
-    function getHeritageClause(clauses, kind) {
-        if (clauses) {
-            for (var _i = 0, clauses_1 = clauses; _i < clauses_1.length; _i++) {
-                var clause = clauses_1[_i];
-                if (clause.token === kind) {
-                    return clause;
-                }
-            }
-        }
-        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) {
-                return node;
-            }
-            node = node.parent;
-        }
-        return undefined;
-    }
-    ts.getAncestor = getAncestor;
-    function getFileReferenceFromReferencePath(comment, commentRange) {
-        var simpleReferenceRegEx = /^\/\/\/\s*<reference\s+/gim;
-        var isNoDefaultLibRegEx = /^(\/\/\/\s*<reference\s+no-default-lib\s*=\s*)('|")(.+?)\2\s*\/>/gim;
-        if (simpleReferenceRegEx.test(comment)) {
-            if (isNoDefaultLibRegEx.test(comment)) {
-                return {
-                    isNoDefaultLib: true
-                };
-            }
-            else {
-                var refMatchResult = ts.fullTripleSlashReferencePathRegEx.exec(comment);
-                var refLibResult = !refMatchResult && ts.fullTripleSlashReferenceTypeReferenceDirectiveRegEx.exec(comment);
-                if (refMatchResult || refLibResult) {
-                    var start = commentRange.pos;
-                    var end = commentRange.end;
-                    return {
-                        fileReference: {
-                            pos: start,
-                            end: end,
-                            fileName: (refMatchResult || refLibResult)[3]
-                        },
-                        isNoDefaultLib: false,
-                        isTypeReferenceDirective: !!refLibResult
-                    };
-                }
-                return {
-                    diagnosticMessage: ts.Diagnostics.Invalid_reference_directive_syntax,
-                    isNoDefaultLib: false
-                };
-            }
-        }
-        return undefined;
-    }
-    ts.getFileReferenceFromReferencePath = getFileReferenceFromReferencePath;
-    function isKeyword(token) {
-        return 71 <= token && token <= 139;
-    }
-    ts.isKeyword = isKeyword;
-    function isTrivia(token) {
-        return 2 <= token && token <= 7;
-    }
-    ts.isTrivia = isTrivia;
-    function isAsyncFunctionLike(node) {
-        return isFunctionLike(node) && hasModifier(node, 256) && !isAccessor(node);
-    }
-    ts.isAsyncFunctionLike = isAsyncFunctionLike;
-    function isStringOrNumericLiteral(kind) {
-        return kind === 9 || kind === 8;
-    }
-    ts.isStringOrNumericLiteral = isStringOrNumericLiteral;
-    function hasDynamicName(declaration) {
-        return declaration.name && isDynamicName(declaration.name);
-    }
-    ts.hasDynamicName = hasDynamicName;
-    function isDynamicName(name) {
-        return name.kind === 141 &&
-            !isStringOrNumericLiteral(name.expression.kind) &&
-            !isWellKnownSymbolSyntactically(name.expression);
-    }
-    ts.isDynamicName = isDynamicName;
-    function isWellKnownSymbolSyntactically(node) {
-        return isPropertyAccessExpression(node) && isESSymbolIdentifier(node.expression);
-    }
-    ts.isWellKnownSymbolSyntactically = isWellKnownSymbolSyntactically;
-    function getPropertyNameForPropertyNameNode(name) {
-        if (name.kind === 70 || name.kind === 9 || name.kind === 8 || name.kind === 143) {
-            return name.text;
-        }
-        if (name.kind === 141) {
-            var nameExpression = name.expression;
-            if (isWellKnownSymbolSyntactically(nameExpression)) {
-                var rightHandSideName = nameExpression.name.text;
-                return getPropertyNameForKnownSymbolName(rightHandSideName);
-            }
-            else if (nameExpression.kind === 9 || nameExpression.kind === 8) {
-                return nameExpression.text;
-            }
-        }
-        return undefined;
-    }
-    ts.getPropertyNameForPropertyNameNode = getPropertyNameForPropertyNameNode;
-    function getPropertyNameForKnownSymbolName(symbolName) {
-        return "__@" + symbolName;
-    }
-    ts.getPropertyNameForKnownSymbolName = getPropertyNameForKnownSymbolName;
-    function isESSymbolIdentifier(node) {
-        return node.kind === 70 && node.text === "Symbol";
-    }
-    ts.isESSymbolIdentifier = isESSymbolIdentifier;
-    function isPushOrUnshiftIdentifier(node) {
-        return node.text === "push" || node.text === "unshift";
-    }
-    ts.isPushOrUnshiftIdentifier = isPushOrUnshiftIdentifier;
-    function isModifierKind(token) {
-        switch (token) {
-            case 116:
-            case 119:
-            case 75:
-            case 123:
-            case 78:
-            case 83:
-            case 113:
-            case 111:
-            case 112:
-            case 129:
-            case 114:
-                return true;
-        }
-        return false;
-    }
-    ts.isModifierKind = isModifierKind;
-    function isParameterDeclaration(node) {
-        var root = getRootDeclaration(node);
-        return root.kind === 143;
-    }
-    ts.isParameterDeclaration = isParameterDeclaration;
-    function getRootDeclaration(node) {
-        while (node.kind === 170) {
-            node = node.parent.parent;
-        }
-        return node;
-    }
-    ts.getRootDeclaration = getRootDeclaration;
-    function nodeStartsNewLexicalEnvironment(node) {
-        var kind = node.kind;
-        return kind === 149
-            || kind === 180
-            || kind === 221
-            || kind === 181
-            || kind === 148
-            || kind === 150
-            || kind === 151
-            || kind === 226
-            || kind === 256;
-    }
-    ts.nodeStartsNewLexicalEnvironment = nodeStartsNewLexicalEnvironment;
-    function nodeIsSynthesized(node) {
-        return ts.positionIsSynthesized(node.pos)
-            || ts.positionIsSynthesized(node.end);
-    }
-    ts.nodeIsSynthesized = nodeIsSynthesized;
-    function getOriginalNode(node) {
-        if (node) {
-            while (node.original !== undefined) {
-                node = node.original;
-            }
-        }
-        return node;
-    }
-    ts.getOriginalNode = getOriginalNode;
-    function isParseTreeNode(node) {
-        return (node.flags & 8) === 0;
-    }
-    ts.isParseTreeNode = isParseTreeNode;
-    function getParseTreeNode(node, nodeTest) {
-        if (isParseTreeNode(node)) {
-            return node;
-        }
-        node = getOriginalNode(node);
-        if (isParseTreeNode(node) && (!nodeTest || nodeTest(node))) {
-            return node;
-        }
-        return undefined;
-    }
-    ts.getParseTreeNode = getParseTreeNode;
-    function getOriginalSourceFiles(sourceFiles) {
-        var originalSourceFiles = [];
-        for (var _i = 0, sourceFiles_1 = sourceFiles; _i < sourceFiles_1.length; _i++) {
-            var sourceFile = sourceFiles_1[_i];
-            var originalSourceFile = getParseTreeNode(sourceFile, isSourceFile);
-            if (originalSourceFile) {
-                originalSourceFiles.push(originalSourceFile);
-            }
-        }
-        return originalSourceFiles;
-    }
-    ts.getOriginalSourceFiles = getOriginalSourceFiles;
-    function getOriginalNodeId(node) {
-        node = getOriginalNode(node);
-        return node ? ts.getNodeId(node) : 0;
-    }
-    ts.getOriginalNodeId = getOriginalNodeId;
-    (function (Associativity) {
-        Associativity[Associativity["Left"] = 0] = "Left";
-        Associativity[Associativity["Right"] = 1] = "Right";
-    })(ts.Associativity || (ts.Associativity = {}));
-    var Associativity = ts.Associativity;
-    function getExpressionAssociativity(expression) {
-        var operator = getOperator(expression);
-        var hasArguments = expression.kind === 176 && expression.arguments !== undefined;
-        return getOperatorAssociativity(expression.kind, operator, hasArguments);
-    }
-    ts.getExpressionAssociativity = getExpressionAssociativity;
-    function getOperatorAssociativity(kind, operator, hasArguments) {
-        switch (kind) {
-            case 176:
-                return hasArguments ? 0 : 1;
-            case 186:
-            case 183:
-            case 184:
-            case 182:
-            case 185:
-            case 189:
-            case 191:
-                return 1;
-            case 188:
-                switch (operator) {
-                    case 39:
-                    case 57:
-                    case 58:
-                    case 59:
-                    case 61:
-                    case 60:
-                    case 62:
-                    case 63:
-                    case 64:
-                    case 65:
-                    case 66:
-                    case 67:
-                    case 69:
-                    case 68:
-                        return 1;
-                }
-        }
-        return 0;
-    }
-    ts.getOperatorAssociativity = getOperatorAssociativity;
-    function getExpressionPrecedence(expression) {
-        var operator = getOperator(expression);
-        var hasArguments = expression.kind === 176 && expression.arguments !== undefined;
-        return getOperatorPrecedence(expression.kind, operator, hasArguments);
-    }
-    ts.getExpressionPrecedence = getExpressionPrecedence;
-    function getOperator(expression) {
-        if (expression.kind === 188) {
-            return expression.operatorToken.kind;
-        }
-        else if (expression.kind === 186 || expression.kind === 187) {
-            return expression.operator;
-        }
-        else {
-            return expression.kind;
-        }
-    }
-    ts.getOperator = getOperator;
-    function getOperatorPrecedence(nodeKind, operatorKind, hasArguments) {
-        switch (nodeKind) {
-            case 98:
-            case 96:
-            case 70:
-            case 94:
-            case 100:
-            case 85:
-            case 8:
-            case 9:
-            case 171:
-            case 172:
-            case 180:
-            case 181:
-            case 193:
-            case 242:
-            case 243:
-            case 11:
-            case 12:
-            case 190:
-            case 179:
-            case 194:
-                return 19;
-            case 177:
-            case 173:
-            case 174:
-                return 18;
-            case 176:
-                return hasArguments ? 18 : 17;
-            case 175:
-                return 17;
-            case 187:
-                return 16;
-            case 186:
-            case 183:
-            case 184:
-            case 182:
-            case 185:
-                return 15;
-            case 188:
-                switch (operatorKind) {
-                    case 50:
-                    case 51:
-                        return 15;
-                    case 39:
-                    case 38:
-                    case 40:
-                    case 41:
-                        return 14;
-                    case 36:
-                    case 37:
-                        return 13;
-                    case 44:
-                    case 45:
-                    case 46:
-                        return 12;
-                    case 26:
-                    case 29:
-                    case 28:
-                    case 30:
-                    case 91:
-                    case 92:
-                        return 11;
-                    case 31:
-                    case 33:
-                    case 32:
-                    case 34:
-                        return 10;
-                    case 47:
-                        return 9;
-                    case 49:
-                        return 8;
-                    case 48:
-                        return 7;
-                    case 52:
-                        return 6;
-                    case 53:
-                        return 5;
-                    case 57:
-                    case 58:
-                    case 59:
-                    case 61:
-                    case 60:
-                    case 62:
-                    case 63:
-                    case 64:
-                    case 65:
-                    case 66:
-                    case 67:
-                    case 69:
-                    case 68:
-                        return 3;
-                    case 25:
-                        return 0;
-                    default:
-                        return -1;
-                }
-            case 189:
-                return 4;
-            case 191:
-                return 2;
-            case 192:
-                return 1;
-            default:
-                return -1;
-        }
-    }
-    ts.getOperatorPrecedence = getOperatorPrecedence;
-    function createDiagnosticCollection() {
-        var nonFileDiagnostics = [];
-        var fileDiagnostics = ts.createMap();
-        var diagnosticsModified = false;
-        var modificationCount = 0;
-        return {
-            add: add,
-            getGlobalDiagnostics: getGlobalDiagnostics,
-            getDiagnostics: getDiagnostics,
-            getModificationCount: getModificationCount,
-            reattachFileDiagnostics: reattachFileDiagnostics
-        };
-        function getModificationCount() {
-            return modificationCount;
-        }
-        function reattachFileDiagnostics(newFile) {
-            if (!ts.hasProperty(fileDiagnostics, newFile.fileName)) {
-                return;
-            }
-            for (var _i = 0, _a = fileDiagnostics[newFile.fileName]; _i < _a.length; _i++) {
-                var diagnostic = _a[_i];
-                diagnostic.file = newFile;
-            }
-        }
-        function add(diagnostic) {
-            var diagnostics;
-            if (diagnostic.file) {
-                diagnostics = fileDiagnostics[diagnostic.file.fileName];
-                if (!diagnostics) {
-                    diagnostics = [];
-                    fileDiagnostics[diagnostic.file.fileName] = diagnostics;
-                }
-            }
-            else {
-                diagnostics = nonFileDiagnostics;
-            }
-            diagnostics.push(diagnostic);
-            diagnosticsModified = true;
-            modificationCount++;
-        }
-        function getGlobalDiagnostics() {
-            sortAndDeduplicate();
-            return nonFileDiagnostics;
-        }
-        function getDiagnostics(fileName) {
-            sortAndDeduplicate();
-            if (fileName) {
-                return fileDiagnostics[fileName] || [];
-            }
-            var allDiagnostics = [];
-            function pushDiagnostic(d) {
-                allDiagnostics.push(d);
-            }
-            ts.forEach(nonFileDiagnostics, pushDiagnostic);
-            for (var key in fileDiagnostics) {
-                ts.forEach(fileDiagnostics[key], pushDiagnostic);
-            }
-            return ts.sortAndDeduplicateDiagnostics(allDiagnostics);
-        }
-        function sortAndDeduplicate() {
-            if (!diagnosticsModified) {
-                return;
-            }
-            diagnosticsModified = false;
-            nonFileDiagnostics = ts.sortAndDeduplicateDiagnostics(nonFileDiagnostics);
-            for (var key in fileDiagnostics) {
-                fileDiagnostics[key] = ts.sortAndDeduplicateDiagnostics(fileDiagnostics[key]);
-            }
-        }
-    }
-    ts.createDiagnosticCollection = createDiagnosticCollection;
-    var escapedCharsRegExp = /[\\\"\u0000-\u001f\t\v\f\b\r\n\u2028\u2029\u0085]/g;
-    var escapedCharsMap = ts.createMap({
-        "\0": "\\0",
-        "\t": "\\t",
-        "\v": "\\v",
-        "\f": "\\f",
-        "\b": "\\b",
-        "\r": "\\r",
-        "\n": "\\n",
-        "\\": "\\\\",
-        "\"": "\\\"",
-        "\u2028": "\\u2028",
-        "\u2029": "\\u2029",
-        "\u0085": "\\u0085"
-    });
-    function escapeString(s) {
-        s = escapedCharsRegExp.test(s) ? s.replace(escapedCharsRegExp, getReplacement) : s;
-        return s;
-        function getReplacement(c) {
-            return escapedCharsMap[c] || get16BitUnicodeEscapeSequence(c.charCodeAt(0));
-        }
-    }
-    ts.escapeString = escapeString;
-    function isIntrinsicJsxName(name) {
-        var ch = name.substr(0, 1);
-        return ch.toLowerCase() === ch;
-    }
-    ts.isIntrinsicJsxName = isIntrinsicJsxName;
-    function get16BitUnicodeEscapeSequence(charCode) {
-        var hexCharCode = charCode.toString(16).toUpperCase();
-        var paddedHexCode = ("0000" + hexCharCode).slice(-4);
-        return "\\u" + paddedHexCode;
-    }
-    var nonAsciiCharacters = /[^\u0000-\u007F]/g;
-    function escapeNonAsciiCharacters(s) {
-        return nonAsciiCharacters.test(s) ?
-            s.replace(nonAsciiCharacters, function (c) { return get16BitUnicodeEscapeSequence(c.charCodeAt(0)); }) :
-            s;
-    }
-    ts.escapeNonAsciiCharacters = escapeNonAsciiCharacters;
-    var indentStrings = ["", "    "];
-    function getIndentString(level) {
-        if (indentStrings[level] === undefined) {
-            indentStrings[level] = getIndentString(level - 1) + indentStrings[1];
-        }
-        return indentStrings[level];
-    }
-    ts.getIndentString = getIndentString;
-    function getIndentSize() {
-        return indentStrings[1].length;
-    }
-    ts.getIndentSize = getIndentSize;
-    function createTextWriter(newLine) {
-        var output;
-        var indent;
-        var lineStart;
-        var lineCount;
-        var linePos;
-        function write(s) {
-            if (s && s.length) {
-                if (lineStart) {
-                    output += getIndentString(indent);
-                    lineStart = false;
-                }
-                output += s;
-            }
-        }
-        function reset() {
-            output = "";
-            indent = 0;
-            lineStart = true;
-            lineCount = 0;
-            linePos = 0;
-        }
-        function rawWrite(s) {
-            if (s !== undefined) {
-                if (lineStart) {
-                    lineStart = false;
-                }
-                output += s;
-            }
-        }
-        function writeLiteral(s) {
-            if (s && s.length) {
-                write(s);
-                var lineStartsOfS = ts.computeLineStarts(s);
-                if (lineStartsOfS.length > 1) {
-                    lineCount = lineCount + lineStartsOfS.length - 1;
-                    linePos = output.length - s.length + ts.lastOrUndefined(lineStartsOfS);
-                }
-            }
-        }
-        function writeLine() {
-            if (!lineStart) {
-                output += newLine;
-                lineCount++;
-                linePos = output.length;
-                lineStart = true;
-            }
-        }
-        function writeTextOfNode(text, node) {
-            write(getTextOfNodeFromSourceText(text, node));
-        }
-        reset();
-        return {
-            write: write,
-            rawWrite: rawWrite,
-            writeTextOfNode: writeTextOfNode,
-            writeLiteral: writeLiteral,
-            writeLine: writeLine,
-            increaseIndent: function () { indent++; },
-            decreaseIndent: function () { indent--; },
-            getIndent: function () { return indent; },
-            getTextPos: function () { return output.length; },
-            getLine: function () { return lineCount + 1; },
-            getColumn: function () { return lineStart ? indent * getIndentSize() + 1 : output.length - linePos + 1; },
-            getText: function () { return output; },
-            isAtStartOfLine: function () { return lineStart; },
-            reset: reset
-        };
-    }
-    ts.createTextWriter = createTextWriter;
-    function getResolvedExternalModuleName(host, file) {
-        return file.moduleName || getExternalModuleNameFromPath(host, file.fileName);
-    }
-    ts.getResolvedExternalModuleName = getResolvedExternalModuleName;
-    function getExternalModuleNameFromDeclaration(host, resolver, declaration) {
-        var file = resolver.getExternalModuleFileFromDeclaration(declaration);
-        if (!file || isDeclarationFile(file)) {
-            return undefined;
-        }
-        return getResolvedExternalModuleName(host, file);
-    }
-    ts.getExternalModuleNameFromDeclaration = getExternalModuleNameFromDeclaration;
-    function getExternalModuleNameFromPath(host, fileName) {
-        var getCanonicalFileName = function (f) { return host.getCanonicalFileName(f); };
-        var dir = ts.toPath(host.getCommonSourceDirectory(), host.getCurrentDirectory(), getCanonicalFileName);
-        var filePath = ts.getNormalizedAbsolutePath(fileName, host.getCurrentDirectory());
-        var relativePath = ts.getRelativePathToDirectoryOrUrl(dir, filePath, dir, getCanonicalFileName, false);
-        return ts.removeFileExtension(relativePath);
-    }
-    ts.getExternalModuleNameFromPath = getExternalModuleNameFromPath;
-    function getOwnEmitOutputFilePath(sourceFile, host, extension) {
-        var compilerOptions = host.getCompilerOptions();
-        var emitOutputFilePathWithoutExtension;
-        if (compilerOptions.outDir) {
-            emitOutputFilePathWithoutExtension = ts.removeFileExtension(getSourceFilePathInNewDir(sourceFile, host, compilerOptions.outDir));
-        }
-        else {
-            emitOutputFilePathWithoutExtension = ts.removeFileExtension(sourceFile.fileName);
-        }
-        return emitOutputFilePathWithoutExtension + extension;
-    }
-    ts.getOwnEmitOutputFilePath = getOwnEmitOutputFilePath;
-    function getDeclarationEmitOutputFilePath(sourceFile, host) {
-        var options = host.getCompilerOptions();
-        var outputDir = options.declarationDir || options.outDir;
-        var path = outputDir
-            ? getSourceFilePathInNewDir(sourceFile, host, outputDir)
-            : sourceFile.fileName;
-        return ts.removeFileExtension(path) + ".d.ts";
-    }
-    ts.getDeclarationEmitOutputFilePath = getDeclarationEmitOutputFilePath;
-    function getSourceFilesToEmit(host, targetSourceFile) {
-        var options = host.getCompilerOptions();
-        if (options.outFile || options.out) {
-            var moduleKind = ts.getEmitModuleKind(options);
-            var moduleEmitEnabled = moduleKind === ts.ModuleKind.AMD || moduleKind === ts.ModuleKind.System;
-            var sourceFiles = host.getSourceFiles();
-            return ts.filter(sourceFiles, moduleEmitEnabled ? isNonDeclarationFile : isBundleEmitNonExternalModule);
-        }
-        else {
-            var sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
-            return ts.filter(sourceFiles, isNonDeclarationFile);
-        }
-    }
-    ts.getSourceFilesToEmit = getSourceFilesToEmit;
-    function isNonDeclarationFile(sourceFile) {
-        return !isDeclarationFile(sourceFile);
-    }
-    function isBundleEmitNonExternalModule(sourceFile) {
-        return !isDeclarationFile(sourceFile) && !ts.isExternalModule(sourceFile);
-    }
-    function forEachTransformedEmitFile(host, sourceFiles, action, emitOnlyDtsFiles) {
-        var options = host.getCompilerOptions();
-        if (options.outFile || options.out) {
-            onBundledEmit(sourceFiles);
-        }
-        else {
-            for (var _i = 0, sourceFiles_2 = sourceFiles; _i < sourceFiles_2.length; _i++) {
-                var sourceFile = sourceFiles_2[_i];
-                if (!isDeclarationFile(sourceFile) && !host.isSourceFileFromExternalLibrary(sourceFile)) {
-                    onSingleFileEmit(host, sourceFile);
-                }
-            }
-        }
-        function onSingleFileEmit(host, sourceFile) {
-            var extension = ".js";
-            if (options.jsx === 1) {
-                if (isSourceFileJavaScript(sourceFile)) {
-                    if (ts.fileExtensionIs(sourceFile.fileName, ".jsx")) {
-                        extension = ".jsx";
-                    }
-                }
-                else if (sourceFile.languageVariant === 1) {
-                    extension = ".jsx";
-                }
-            }
-            var jsFilePath = getOwnEmitOutputFilePath(sourceFile, host, extension);
-            var sourceMapFilePath = getSourceMapFilePath(jsFilePath, options);
-            var declarationFilePath = !isSourceFileJavaScript(sourceFile) && (options.declaration || emitOnlyDtsFiles) ? getDeclarationEmitOutputFilePath(sourceFile, host) : undefined;
-            action(jsFilePath, sourceMapFilePath, declarationFilePath, [sourceFile], false);
-        }
-        function onBundledEmit(sourceFiles) {
-            if (sourceFiles.length) {
-                var jsFilePath = options.outFile || options.out;
-                var sourceMapFilePath = getSourceMapFilePath(jsFilePath, options);
-                var declarationFilePath = options.declaration ? ts.removeFileExtension(jsFilePath) + ".d.ts" : undefined;
-                action(jsFilePath, sourceMapFilePath, declarationFilePath, sourceFiles, true);
-            }
-        }
-    }
-    ts.forEachTransformedEmitFile = forEachTransformedEmitFile;
-    function getSourceMapFilePath(jsFilePath, options) {
-        return options.sourceMap ? jsFilePath + ".map" : undefined;
-    }
-    function forEachExpectedEmitFile(host, action, targetSourceFile, emitOnlyDtsFiles) {
-        var options = host.getCompilerOptions();
-        if (options.outFile || options.out) {
-            onBundledEmit(host);
-        }
-        else {
-            var sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
-            for (var _i = 0, sourceFiles_3 = sourceFiles; _i < sourceFiles_3.length; _i++) {
-                var sourceFile = sourceFiles_3[_i];
-                if (!isDeclarationFile(sourceFile) && !host.isSourceFileFromExternalLibrary(sourceFile)) {
-                    onSingleFileEmit(host, sourceFile);
-                }
-            }
-        }
-        function onSingleFileEmit(host, sourceFile) {
-            var extension = ".js";
-            if (options.jsx === 1) {
-                if (isSourceFileJavaScript(sourceFile)) {
-                    if (ts.fileExtensionIs(sourceFile.fileName, ".jsx")) {
-                        extension = ".jsx";
-                    }
-                }
-                else if (sourceFile.languageVariant === 1) {
-                    extension = ".jsx";
-                }
-            }
-            var jsFilePath = getOwnEmitOutputFilePath(sourceFile, host, extension);
-            var declarationFilePath = !isSourceFileJavaScript(sourceFile) && (emitOnlyDtsFiles || options.declaration) ? getDeclarationEmitOutputFilePath(sourceFile, host) : undefined;
-            var emitFileNames = {
-                jsFilePath: jsFilePath,
-                sourceMapFilePath: getSourceMapFilePath(jsFilePath, options),
-                declarationFilePath: declarationFilePath
-            };
-            action(emitFileNames, [sourceFile], false, emitOnlyDtsFiles);
-        }
-        function onBundledEmit(host) {
-            var bundledSources = ts.filter(host.getSourceFiles(), function (sourceFile) { return !isDeclarationFile(sourceFile) &&
-                !host.isSourceFileFromExternalLibrary(sourceFile) &&
-                (!ts.isExternalModule(sourceFile) ||
-                    !!ts.getEmitModuleKind(options)); });
-            if (bundledSources.length) {
-                var jsFilePath = options.outFile || options.out;
-                var emitFileNames = {
-                    jsFilePath: jsFilePath,
-                    sourceMapFilePath: getSourceMapFilePath(jsFilePath, options),
-                    declarationFilePath: options.declaration ? ts.removeFileExtension(jsFilePath) + ".d.ts" : undefined
-                };
-                action(emitFileNames, bundledSources, true, emitOnlyDtsFiles);
-            }
-        }
-    }
-    ts.forEachExpectedEmitFile = forEachExpectedEmitFile;
-    function getSourceFilePathInNewDir(sourceFile, host, newDirPath) {
-        var sourceFilePath = ts.getNormalizedAbsolutePath(sourceFile.fileName, host.getCurrentDirectory());
-        var commonSourceDirectory = host.getCommonSourceDirectory();
-        var isSourceFileInCommonSourceDirectory = host.getCanonicalFileName(sourceFilePath).indexOf(host.getCanonicalFileName(commonSourceDirectory)) === 0;
-        sourceFilePath = isSourceFileInCommonSourceDirectory ? sourceFilePath.substring(commonSourceDirectory.length) : sourceFilePath;
-        return ts.combinePaths(newDirPath, sourceFilePath);
-    }
-    ts.getSourceFilePathInNewDir = getSourceFilePathInNewDir;
-    function writeFile(host, diagnostics, fileName, data, writeByteOrderMark, sourceFiles) {
-        host.writeFile(fileName, data, writeByteOrderMark, function (hostErrorMessage) {
-            diagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Could_not_write_file_0_Colon_1, fileName, hostErrorMessage));
-        }, sourceFiles);
-    }
-    ts.writeFile = writeFile;
-    function getLineOfLocalPosition(currentSourceFile, pos) {
-        return ts.getLineAndCharacterOfPosition(currentSourceFile, pos).line;
-    }
-    ts.getLineOfLocalPosition = getLineOfLocalPosition;
-    function getLineOfLocalPositionFromLineMap(lineMap, pos) {
-        return ts.computeLineAndCharacterOfPosition(lineMap, pos).line;
-    }
-    ts.getLineOfLocalPositionFromLineMap = getLineOfLocalPositionFromLineMap;
-    function getFirstConstructorWithBody(node) {
-        return ts.forEach(node.members, function (member) {
-            if (member.kind === 149 && nodeIsPresent(member.body)) {
-                return member;
-            }
-        });
-    }
-    ts.getFirstConstructorWithBody = getFirstConstructorWithBody;
-    function getSetAccessorTypeAnnotationNode(accessor) {
-        if (accessor && accessor.parameters.length > 0) {
-            var hasThis = accessor.parameters.length === 2 && parameterIsThisKeyword(accessor.parameters[0]);
-            return accessor.parameters[hasThis ? 1 : 0].type;
-        }
-    }
-    ts.getSetAccessorTypeAnnotationNode = getSetAccessorTypeAnnotationNode;
-    function getThisParameter(signature) {
-        if (signature.parameters.length) {
-            var thisParameter = signature.parameters[0];
-            if (parameterIsThisKeyword(thisParameter)) {
-                return thisParameter;
-            }
-        }
-    }
-    ts.getThisParameter = getThisParameter;
-    function parameterIsThisKeyword(parameter) {
-        return isThisIdentifier(parameter.name);
-    }
-    ts.parameterIsThisKeyword = parameterIsThisKeyword;
-    function isThisIdentifier(node) {
-        return node && node.kind === 70 && identifierIsThisKeyword(node);
-    }
-    ts.isThisIdentifier = isThisIdentifier;
-    function identifierIsThisKeyword(id) {
-        return id.originalKeywordKind === 98;
-    }
-    ts.identifierIsThisKeyword = identifierIsThisKeyword;
-    function getAllAccessorDeclarations(declarations, accessor) {
-        var firstAccessor;
-        var secondAccessor;
-        var getAccessor;
-        var setAccessor;
-        if (hasDynamicName(accessor)) {
-            firstAccessor = accessor;
-            if (accessor.kind === 150) {
-                getAccessor = accessor;
-            }
-            else if (accessor.kind === 151) {
-                setAccessor = accessor;
-            }
-            else {
-                ts.Debug.fail("Accessor has wrong kind");
-            }
-        }
-        else {
-            ts.forEach(declarations, function (member) {
-                if ((member.kind === 150 || member.kind === 151)
-                    && hasModifier(member, 32) === hasModifier(accessor, 32)) {
-                    var memberName = getPropertyNameForPropertyNameNode(member.name);
-                    var accessorName = getPropertyNameForPropertyNameNode(accessor.name);
-                    if (memberName === accessorName) {
-                        if (!firstAccessor) {
-                            firstAccessor = member;
-                        }
-                        else if (!secondAccessor) {
-                            secondAccessor = member;
-                        }
-                        if (member.kind === 150 && !getAccessor) {
-                            getAccessor = member;
-                        }
-                        if (member.kind === 151 && !setAccessor) {
-                            setAccessor = member;
-                        }
-                    }
-                }
-            });
-        }
-        return {
-            firstAccessor: firstAccessor,
-            secondAccessor: secondAccessor,
-            getAccessor: getAccessor,
-            setAccessor: setAccessor
-        };
-    }
-    ts.getAllAccessorDeclarations = getAllAccessorDeclarations;
-    function emitNewLineBeforeLeadingComments(lineMap, writer, node, leadingComments) {
-        emitNewLineBeforeLeadingCommentsOfPosition(lineMap, writer, node.pos, leadingComments);
-    }
-    ts.emitNewLineBeforeLeadingComments = emitNewLineBeforeLeadingComments;
-    function emitNewLineBeforeLeadingCommentsOfPosition(lineMap, writer, pos, leadingComments) {
-        if (leadingComments && leadingComments.length && pos !== leadingComments[0].pos &&
-            getLineOfLocalPositionFromLineMap(lineMap, pos) !== getLineOfLocalPositionFromLineMap(lineMap, leadingComments[0].pos)) {
-            writer.writeLine();
-        }
-    }
-    ts.emitNewLineBeforeLeadingCommentsOfPosition = emitNewLineBeforeLeadingCommentsOfPosition;
-    function emitNewLineBeforeLeadingCommentOfPosition(lineMap, writer, pos, commentPos) {
-        if (pos !== commentPos &&
-            getLineOfLocalPositionFromLineMap(lineMap, pos) !== getLineOfLocalPositionFromLineMap(lineMap, commentPos)) {
-            writer.writeLine();
-        }
-    }
-    ts.emitNewLineBeforeLeadingCommentOfPosition = emitNewLineBeforeLeadingCommentOfPosition;
-    function emitComments(text, lineMap, writer, comments, leadingSeparator, trailingSeparator, newLine, writeComment) {
-        if (comments && comments.length > 0) {
-            if (leadingSeparator) {
-                writer.write(" ");
-            }
-            var emitInterveningSeparator = false;
-            for (var _i = 0, comments_1 = comments; _i < comments_1.length; _i++) {
-                var comment = comments_1[_i];
-                if (emitInterveningSeparator) {
-                    writer.write(" ");
-                    emitInterveningSeparator = false;
-                }
-                writeComment(text, lineMap, writer, comment.pos, comment.end, newLine);
-                if (comment.hasTrailingNewLine) {
-                    writer.writeLine();
-                }
-                else {
-                    emitInterveningSeparator = true;
-                }
-            }
-            if (emitInterveningSeparator && trailingSeparator) {
-                writer.write(" ");
-            }
-        }
-    }
-    ts.emitComments = emitComments;
-    function emitDetachedComments(text, lineMap, writer, writeComment, node, newLine, removeComments) {
-        var leadingComments;
-        var currentDetachedCommentInfo;
-        if (removeComments) {
-            if (node.pos === 0) {
-                leadingComments = ts.filter(ts.getLeadingCommentRanges(text, node.pos), isPinnedComment);
-            }
-        }
-        else {
-            leadingComments = ts.getLeadingCommentRanges(text, node.pos);
-        }
-        if (leadingComments) {
-            var detachedComments = [];
-            var lastComment = void 0;
-            for (var _i = 0, leadingComments_1 = leadingComments; _i < leadingComments_1.length; _i++) {
-                var comment = leadingComments_1[_i];
-                if (lastComment) {
-                    var lastCommentLine = getLineOfLocalPositionFromLineMap(lineMap, lastComment.end);
-                    var commentLine = getLineOfLocalPositionFromLineMap(lineMap, comment.pos);
-                    if (commentLine >= lastCommentLine + 2) {
-                        break;
-                    }
-                }
-                detachedComments.push(comment);
-                lastComment = comment;
-            }
-            if (detachedComments.length) {
-                var lastCommentLine = getLineOfLocalPositionFromLineMap(lineMap, ts.lastOrUndefined(detachedComments).end);
-                var nodeLine = getLineOfLocalPositionFromLineMap(lineMap, ts.skipTrivia(text, node.pos));
-                if (nodeLine >= lastCommentLine + 2) {
-                    emitNewLineBeforeLeadingComments(lineMap, writer, node, leadingComments);
-                    emitComments(text, lineMap, writer, detachedComments, false, true, newLine, writeComment);
-                    currentDetachedCommentInfo = { nodePos: node.pos, detachedCommentEndPos: ts.lastOrUndefined(detachedComments).end };
-                }
-            }
-        }
-        return currentDetachedCommentInfo;
-        function isPinnedComment(comment) {
-            return text.charCodeAt(comment.pos + 1) === 42 &&
-                text.charCodeAt(comment.pos + 2) === 33;
-        }
-    }
-    ts.emitDetachedComments = emitDetachedComments;
-    function writeCommentRange(text, lineMap, writer, commentPos, commentEnd, newLine) {
-        if (text.charCodeAt(commentPos + 1) === 42) {
-            var firstCommentLineAndCharacter = ts.computeLineAndCharacterOfPosition(lineMap, commentPos);
-            var lineCount = lineMap.length;
-            var firstCommentLineIndent = void 0;
-            for (var pos = commentPos, currentLine = firstCommentLineAndCharacter.line; pos < commentEnd; currentLine++) {
-                var nextLineStart = (currentLine + 1) === lineCount
-                    ? text.length + 1
-                    : lineMap[currentLine + 1];
-                if (pos !== commentPos) {
-                    if (firstCommentLineIndent === undefined) {
-                        firstCommentLineIndent = calculateIndent(text, lineMap[firstCommentLineAndCharacter.line], commentPos);
-                    }
-                    var currentWriterIndentSpacing = writer.getIndent() * getIndentSize();
-                    var spacesToEmit = currentWriterIndentSpacing - firstCommentLineIndent + calculateIndent(text, pos, nextLineStart);
-                    if (spacesToEmit > 0) {
-                        var numberOfSingleSpacesToEmit = spacesToEmit % getIndentSize();
-                        var indentSizeSpaceString = getIndentString((spacesToEmit - numberOfSingleSpacesToEmit) / getIndentSize());
-                        writer.rawWrite(indentSizeSpaceString);
-                        while (numberOfSingleSpacesToEmit) {
-                            writer.rawWrite(" ");
-                            numberOfSingleSpacesToEmit--;
-                        }
-                    }
-                    else {
-                        writer.rawWrite("");
-                    }
-                }
-                writeTrimmedCurrentLine(text, commentEnd, writer, newLine, pos, nextLineStart);
-                pos = nextLineStart;
-            }
-        }
-        else {
-            writer.write(text.substring(commentPos, commentEnd));
-        }
-    }
-    ts.writeCommentRange = writeCommentRange;
-    function writeTrimmedCurrentLine(text, commentEnd, writer, newLine, pos, nextLineStart) {
-        var end = Math.min(commentEnd, nextLineStart - 1);
-        var currentLineText = text.substring(pos, end).replace(/^\s+|\s+$/g, "");
-        if (currentLineText) {
-            writer.write(currentLineText);
-            if (end !== commentEnd) {
-                writer.writeLine();
-            }
-        }
-        else {
-            writer.writeLiteral(newLine);
-        }
-    }
-    function calculateIndent(text, pos, end) {
-        var currentLineIndent = 0;
-        for (; pos < end && ts.isWhiteSpaceSingleLine(text.charCodeAt(pos)); pos++) {
-            if (text.charCodeAt(pos) === 9) {
-                currentLineIndent += getIndentSize() - (currentLineIndent % getIndentSize());
-            }
-            else {
-                currentLineIndent++;
-            }
-        }
-        return currentLineIndent;
-    }
-    function hasModifiers(node) {
-        return getModifierFlags(node) !== 0;
-    }
-    ts.hasModifiers = hasModifiers;
-    function hasModifier(node, flags) {
-        return (getModifierFlags(node) & flags) !== 0;
-    }
-    ts.hasModifier = hasModifier;
-    function getModifierFlags(node) {
-        if (node.modifierFlagsCache & 536870912) {
-            return node.modifierFlagsCache & ~536870912;
-        }
-        var flags = 0;
-        if (node.modifiers) {
-            for (var _i = 0, _a = node.modifiers; _i < _a.length; _i++) {
-                var modifier = _a[_i];
-                flags |= modifierToFlag(modifier.kind);
-            }
-        }
-        if (node.flags & 4) {
-            flags |= 1;
-        }
-        node.modifierFlagsCache = flags | 536870912;
-        return flags;
-    }
-    ts.getModifierFlags = getModifierFlags;
-    function modifierToFlag(token) {
-        switch (token) {
-            case 114: return 32;
-            case 113: return 4;
-            case 112: return 16;
-            case 111: return 8;
-            case 116: return 128;
-            case 83: return 1;
-            case 123: return 2;
-            case 75: return 2048;
-            case 78: return 512;
-            case 119: return 256;
-            case 129: return 64;
-        }
-        return 0;
-    }
-    ts.modifierToFlag = modifierToFlag;
-    function isLogicalOperator(token) {
-        return token === 53
-            || token === 52
-            || token === 50;
-    }
-    ts.isLogicalOperator = isLogicalOperator;
-    function isAssignmentOperator(token) {
-        return token >= 57 && token <= 69;
-    }
-    ts.isAssignmentOperator = isAssignmentOperator;
-    function tryGetClassExtendingExpressionWithTypeArguments(node) {
-        if (node.kind === 195 &&
-            node.parent.token === 84 &&
-            isClassLike(node.parent.parent)) {
-            return node.parent.parent;
-        }
-    }
-    ts.tryGetClassExtendingExpressionWithTypeArguments = tryGetClassExtendingExpressionWithTypeArguments;
-    function isDestructuringAssignment(node) {
-        if (isBinaryExpression(node)) {
-            if (node.operatorToken.kind === 57) {
-                var kind = node.left.kind;
-                return kind === 172
-                    || kind === 171;
-            }
-        }
-        return false;
-    }
-    ts.isDestructuringAssignment = isDestructuringAssignment;
-    function isSupportedExpressionWithTypeArguments(node) {
-        return isSupportedExpressionWithTypeArgumentsRest(node.expression);
-    }
-    ts.isSupportedExpressionWithTypeArguments = isSupportedExpressionWithTypeArguments;
-    function isSupportedExpressionWithTypeArgumentsRest(node) {
-        if (node.kind === 70) {
-            return true;
-        }
-        else if (isPropertyAccessExpression(node)) {
-            return isSupportedExpressionWithTypeArgumentsRest(node.expression);
-        }
-        else {
-            return false;
-        }
-    }
-    function isExpressionWithTypeArgumentsInClassExtendsClause(node) {
-        return tryGetClassExtendingExpressionWithTypeArguments(node) !== undefined;
-    }
-    ts.isExpressionWithTypeArgumentsInClassExtendsClause = isExpressionWithTypeArgumentsInClassExtendsClause;
-    function isEntityNameExpression(node) {
-        return node.kind === 70 ||
-            node.kind === 173 && isEntityNameExpression(node.expression);
-    }
-    ts.isEntityNameExpression = isEntityNameExpression;
-    function isRightSideOfQualifiedNameOrPropertyAccess(node) {
-        return (node.parent.kind === 140 && node.parent.right === node) ||
-            (node.parent.kind === 173 && node.parent.name === node);
-    }
-    ts.isRightSideOfQualifiedNameOrPropertyAccess = isRightSideOfQualifiedNameOrPropertyAccess;
-    function isEmptyObjectLiteralOrArrayLiteral(expression) {
-        var kind = expression.kind;
-        if (kind === 172) {
-            return expression.properties.length === 0;
-        }
-        if (kind === 171) {
-            return expression.elements.length === 0;
-        }
-        return false;
-    }
-    ts.isEmptyObjectLiteralOrArrayLiteral = isEmptyObjectLiteralOrArrayLiteral;
-    function getLocalSymbolForExportDefault(symbol) {
-        return symbol && symbol.valueDeclaration && hasModifier(symbol.valueDeclaration, 512) ? symbol.valueDeclaration.localSymbol : undefined;
-    }
-    ts.getLocalSymbolForExportDefault = getLocalSymbolForExportDefault;
-    function tryExtractTypeScriptExtension(fileName) {
-        return ts.find(ts.supportedTypescriptExtensionsForExtractExtension, function (extension) { return ts.fileExtensionIs(fileName, extension); });
-    }
-    ts.tryExtractTypeScriptExtension = tryExtractTypeScriptExtension;
-    function getExpandedCharCodes(input) {
-        var output = [];
-        var length = input.length;
-        for (var i = 0; i < length; i++) {
-            var charCode = input.charCodeAt(i);
-            if (charCode < 0x80) {
-                output.push(charCode);
-            }
-            else if (charCode < 0x800) {
-                output.push((charCode >> 6) | 192);
-                output.push((charCode & 63) | 128);
-            }
-            else if (charCode < 0x10000) {
-                output.push((charCode >> 12) | 224);
-                output.push(((charCode >> 6) & 63) | 128);
-                output.push((charCode & 63) | 128);
-            }
-            else if (charCode < 0x20000) {
-                output.push((charCode >> 18) | 240);
-                output.push(((charCode >> 12) & 63) | 128);
-                output.push(((charCode >> 6) & 63) | 128);
-                output.push((charCode & 63) | 128);
-            }
-            else {
-                ts.Debug.assert(false, "Unexpected code point");
-            }
-        }
-        return output;
-    }
-    ts.stringify = typeof JSON !== "undefined" && JSON.stringify
-        ? JSON.stringify
-        : stringifyFallback;
-    function stringifyFallback(value) {
-        return value === undefined ? undefined : stringifyValue(value);
-    }
-    function stringifyValue(value) {
-        return typeof value === "string" ? "\"" + escapeString(value) + "\""
-            : typeof value === "number" ? isFinite(value) ? String(value) : "null"
-                : typeof value === "boolean" ? value ? "true" : "false"
-                    : typeof value === "object" && value ? ts.isArray(value) ? cycleCheck(stringifyArray, value) : cycleCheck(stringifyObject, value)
-                        : "null";
-    }
-    function cycleCheck(cb, value) {
-        ts.Debug.assert(!value.hasOwnProperty("__cycle"), "Converting circular structure to JSON");
-        value.__cycle = true;
-        var result = cb(value);
-        delete value.__cycle;
-        return result;
-    }
-    function stringifyArray(value) {
-        return "[" + ts.reduceLeft(value, stringifyElement, "") + "]";
-    }
-    function stringifyElement(memo, value) {
-        return (memo ? memo + "," : memo) + stringifyValue(value);
-    }
-    function stringifyObject(value) {
-        return "{" + ts.reduceOwnProperties(value, stringifyProperty, "") + "}";
-    }
-    function stringifyProperty(memo, value, key) {
-        return value === undefined || typeof value === "function" || key === "__cycle" ? memo
-            : (memo ? memo + "," : memo) + ("\"" + escapeString(key) + "\":" + stringifyValue(value));
-    }
-    var base64Digits = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
-    function convertToBase64(input) {
-        var result = "";
-        var charCodes = getExpandedCharCodes(input);
-        var i = 0;
-        var length = charCodes.length;
-        var byte1, byte2, byte3, byte4;
-        while (i < length) {
-            byte1 = charCodes[i] >> 2;
-            byte2 = (charCodes[i] & 3) << 4 | charCodes[i + 1] >> 4;
-            byte3 = (charCodes[i + 1] & 15) << 2 | charCodes[i + 2] >> 6;
-            byte4 = charCodes[i + 2] & 63;
-            if (i + 1 >= length) {
-                byte3 = byte4 = 64;
-            }
-            else if (i + 2 >= length) {
-                byte4 = 64;
-            }
-            result += base64Digits.charAt(byte1) + base64Digits.charAt(byte2) + base64Digits.charAt(byte3) + base64Digits.charAt(byte4);
-            i += 3;
-        }
-        return result;
-    }
-    ts.convertToBase64 = convertToBase64;
-    var carriageReturnLineFeed = "\r\n";
-    var lineFeed = "\n";
-    function getNewLineCharacter(options) {
-        if (options.newLine === 0) {
-            return carriageReturnLineFeed;
-        }
-        else if (options.newLine === 1) {
-            return lineFeed;
-        }
-        else if (ts.sys) {
-            return ts.sys.newLine;
-        }
-        return carriageReturnLineFeed;
-    }
-    ts.getNewLineCharacter = getNewLineCharacter;
-    function isSimpleExpression(node) {
-        return isSimpleExpressionWorker(node, 0);
-    }
-    ts.isSimpleExpression = isSimpleExpression;
-    function isSimpleExpressionWorker(node, depth) {
-        if (depth <= 5) {
-            var kind = node.kind;
-            if (kind === 9
-                || kind === 8
-                || kind === 11
-                || kind === 12
-                || kind === 70
-                || kind === 98
-                || kind === 96
-                || kind === 100
-                || kind === 85
-                || kind === 94) {
-                return true;
-            }
-            else if (kind === 173) {
-                return isSimpleExpressionWorker(node.expression, depth + 1);
-            }
-            else if (kind === 174) {
-                return isSimpleExpressionWorker(node.expression, depth + 1)
-                    && isSimpleExpressionWorker(node.argumentExpression, depth + 1);
-            }
-            else if (kind === 186
-                || kind === 187) {
-                return isSimpleExpressionWorker(node.operand, depth + 1);
-            }
-            else if (kind === 188) {
-                return node.operatorToken.kind !== 39
-                    && isSimpleExpressionWorker(node.left, depth + 1)
-                    && isSimpleExpressionWorker(node.right, depth + 1);
-            }
-            else if (kind === 189) {
-                return isSimpleExpressionWorker(node.condition, depth + 1)
-                    && isSimpleExpressionWorker(node.whenTrue, depth + 1)
-                    && isSimpleExpressionWorker(node.whenFalse, depth + 1);
-            }
-            else if (kind === 184
-                || kind === 183
-                || kind === 182) {
-                return isSimpleExpressionWorker(node.expression, depth + 1);
-            }
-            else if (kind === 171) {
-                return node.elements.length === 0;
-            }
-            else if (kind === 172) {
-                return node.properties.length === 0;
-            }
-            else if (kind === 175) {
-                if (!isSimpleExpressionWorker(node.expression, depth + 1)) {
-                    return false;
-                }
-                for (var _i = 0, _a = node.arguments; _i < _a.length; _i++) {
-                    var argument = _a[_i];
-                    if (!isSimpleExpressionWorker(argument, depth + 1)) {
-                        return false;
-                    }
-                }
-                return true;
-            }
-        }
-        return false;
-    }
-    var syntaxKindCache = ts.createMap();
-    function formatSyntaxKind(kind) {
-        var syntaxKindEnum = ts.SyntaxKind;
-        if (syntaxKindEnum) {
-            if (syntaxKindCache[kind]) {
-                return syntaxKindCache[kind];
-            }
-            for (var name_6 in syntaxKindEnum) {
-                if (syntaxKindEnum[name_6] === kind) {
-                    return syntaxKindCache[kind] = kind.toString() + " (" + name_6 + ")";
-                }
-            }
-        }
-        else {
-            return kind.toString();
-        }
-    }
-    ts.formatSyntaxKind = formatSyntaxKind;
-    function movePos(pos, value) {
-        return ts.positionIsSynthesized(pos) ? -1 : pos + value;
-    }
-    ts.movePos = movePos;
-    function createRange(pos, end) {
-        return { pos: pos, end: end };
-    }
-    ts.createRange = createRange;
-    function moveRangeEnd(range, end) {
-        return createRange(range.pos, end);
-    }
-    ts.moveRangeEnd = moveRangeEnd;
-    function moveRangePos(range, pos) {
-        return createRange(pos, range.end);
-    }
-    ts.moveRangePos = moveRangePos;
-    function moveRangePastDecorators(node) {
-        return node.decorators && node.decorators.length > 0
-            ? moveRangePos(node, node.decorators.end)
-            : node;
-    }
-    ts.moveRangePastDecorators = moveRangePastDecorators;
-    function moveRangePastModifiers(node) {
-        return node.modifiers && node.modifiers.length > 0
-            ? moveRangePos(node, node.modifiers.end)
-            : moveRangePastDecorators(node);
-    }
-    ts.moveRangePastModifiers = moveRangePastModifiers;
-    function isCollapsedRange(range) {
-        return range.pos === range.end;
-    }
-    ts.isCollapsedRange = isCollapsedRange;
-    function collapseRangeToStart(range) {
-        return isCollapsedRange(range) ? range : moveRangeEnd(range, range.pos);
-    }
-    ts.collapseRangeToStart = collapseRangeToStart;
-    function collapseRangeToEnd(range) {
-        return isCollapsedRange(range) ? range : moveRangePos(range, range.end);
-    }
-    ts.collapseRangeToEnd = collapseRangeToEnd;
-    function createTokenRange(pos, token) {
-        return createRange(pos, pos + ts.tokenToString(token).length);
-    }
-    ts.createTokenRange = createTokenRange;
-    function rangeIsOnSingleLine(range, sourceFile) {
-        return rangeStartIsOnSameLineAsRangeEnd(range, range, sourceFile);
-    }
-    ts.rangeIsOnSingleLine = rangeIsOnSingleLine;
-    function rangeStartPositionsAreOnSameLine(range1, range2, sourceFile) {
-        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile), getStartPositionOfRange(range2, sourceFile), sourceFile);
-    }
-    ts.rangeStartPositionsAreOnSameLine = rangeStartPositionsAreOnSameLine;
-    function rangeEndPositionsAreOnSameLine(range1, range2, sourceFile) {
-        return positionsAreOnSameLine(range1.end, range2.end, sourceFile);
-    }
-    ts.rangeEndPositionsAreOnSameLine = rangeEndPositionsAreOnSameLine;
-    function rangeStartIsOnSameLineAsRangeEnd(range1, range2, sourceFile) {
-        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile), range2.end, sourceFile);
-    }
-    ts.rangeStartIsOnSameLineAsRangeEnd = rangeStartIsOnSameLineAsRangeEnd;
-    function rangeEndIsOnSameLineAsRangeStart(range1, range2, sourceFile) {
-        return positionsAreOnSameLine(range1.end, getStartPositionOfRange(range2, sourceFile), sourceFile);
-    }
-    ts.rangeEndIsOnSameLineAsRangeStart = rangeEndIsOnSameLineAsRangeStart;
-    function positionsAreOnSameLine(pos1, pos2, sourceFile) {
-        return pos1 === pos2 ||
-            getLineOfLocalPosition(sourceFile, pos1) === getLineOfLocalPosition(sourceFile, pos2);
-    }
-    ts.positionsAreOnSameLine = positionsAreOnSameLine;
-    function getStartPositionOfRange(range, sourceFile) {
-        return ts.positionIsSynthesized(range.pos) ? -1 : ts.skipTrivia(sourceFile.text, range.pos);
-    }
-    ts.getStartPositionOfRange = getStartPositionOfRange;
-    function collectExternalModuleInfo(sourceFile) {
-        var externalImports = [];
-        var exportSpecifiers = ts.createMap();
-        var exportEquals = undefined;
-        var hasExportStarsToExportValues = false;
-        for (var _i = 0, _a = sourceFile.statements; _i < _a.length; _i++) {
-            var node = _a[_i];
-            switch (node.kind) {
-                case 231:
-                    externalImports.push(node);
-                    break;
-                case 230:
-                    if (node.moduleReference.kind === 241) {
-                        externalImports.push(node);
-                    }
-                    break;
-                case 237:
-                    if (node.moduleSpecifier) {
-                        if (!node.exportClause) {
-                            externalImports.push(node);
-                            hasExportStarsToExportValues = true;
-                        }
-                        else {
-                            externalImports.push(node);
-                        }
-                    }
-                    else {
-                        for (var _b = 0, _c = node.exportClause.elements; _b < _c.length; _b++) {
-                            var specifier = _c[_b];
-                            var name_7 = (specifier.propertyName || specifier.name).text;
-                            (exportSpecifiers[name_7] || (exportSpecifiers[name_7] = [])).push(specifier);
-                        }
-                    }
-                    break;
-                case 236:
-                    if (node.isExportEquals && !exportEquals) {
-                        exportEquals = node;
-                    }
-                    break;
-            }
-        }
-        return { externalImports: externalImports, exportSpecifiers: exportSpecifiers, exportEquals: exportEquals, hasExportStarsToExportValues: hasExportStarsToExportValues };
-    }
-    ts.collectExternalModuleInfo = collectExternalModuleInfo;
-    function getInitializedVariables(node) {
-        return ts.filter(node.declarations, isInitializedVariable);
-    }
-    ts.getInitializedVariables = getInitializedVariables;
-    function isInitializedVariable(node) {
-        return node.initializer !== undefined;
-    }
-    function isMergedWithClass(node) {
-        if (node.symbol) {
-            for (var _i = 0, _a = node.symbol.declarations; _i < _a.length; _i++) {
-                var declaration = _a[_i];
-                if (declaration.kind === 222 && declaration !== node) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-    ts.isMergedWithClass = isMergedWithClass;
-    function isFirstDeclarationOfKind(node, kind) {
-        return node.symbol && getDeclarationOfKind(node.symbol, kind) === node;
-    }
-    ts.isFirstDeclarationOfKind = isFirstDeclarationOfKind;
-    function isNodeArray(array) {
-        return array.hasOwnProperty("pos")
-            && array.hasOwnProperty("end");
-    }
-    ts.isNodeArray = isNodeArray;
-    function isNoSubstitutionTemplateLiteral(node) {
-        return node.kind === 12;
-    }
-    ts.isNoSubstitutionTemplateLiteral = isNoSubstitutionTemplateLiteral;
-    function isLiteralKind(kind) {
-        return 8 <= kind && kind <= 12;
-    }
-    ts.isLiteralKind = isLiteralKind;
-    function isTextualLiteralKind(kind) {
-        return kind === 9 || kind === 12;
-    }
-    ts.isTextualLiteralKind = isTextualLiteralKind;
-    function isLiteralExpression(node) {
-        return isLiteralKind(node.kind);
-    }
-    ts.isLiteralExpression = isLiteralExpression;
-    function isTemplateLiteralKind(kind) {
-        return 12 <= kind && kind <= 15;
-    }
-    ts.isTemplateLiteralKind = isTemplateLiteralKind;
-    function isTemplateHead(node) {
-        return node.kind === 13;
-    }
-    ts.isTemplateHead = isTemplateHead;
-    function isTemplateMiddleOrTemplateTail(node) {
-        var kind = node.kind;
-        return kind === 14
-            || kind === 15;
-    }
-    ts.isTemplateMiddleOrTemplateTail = isTemplateMiddleOrTemplateTail;
-    function isIdentifier(node) {
-        return node.kind === 70;
-    }
-    ts.isIdentifier = isIdentifier;
-    function isGeneratedIdentifier(node) {
-        return isIdentifier(node) && node.autoGenerateKind > 0;
-    }
-    ts.isGeneratedIdentifier = isGeneratedIdentifier;
-    function isModifier(node) {
-        return isModifierKind(node.kind);
-    }
-    ts.isModifier = isModifier;
-    function isQualifiedName(node) {
-        return node.kind === 140;
-    }
-    ts.isQualifiedName = isQualifiedName;
-    function isComputedPropertyName(node) {
-        return node.kind === 141;
-    }
-    ts.isComputedPropertyName = isComputedPropertyName;
-    function isEntityName(node) {
-        var kind = node.kind;
-        return kind === 140
-            || kind === 70;
-    }
-    ts.isEntityName = isEntityName;
-    function isPropertyName(node) {
-        var kind = node.kind;
-        return kind === 70
-            || kind === 9
-            || kind === 8
-            || kind === 141;
-    }
-    ts.isPropertyName = isPropertyName;
-    function isModuleName(node) {
-        var kind = node.kind;
-        return kind === 70
-            || kind === 9;
-    }
-    ts.isModuleName = isModuleName;
-    function isBindingName(node) {
-        var kind = node.kind;
-        return kind === 70
-            || kind === 168
-            || kind === 169;
-    }
-    ts.isBindingName = isBindingName;
-    function isTypeParameter(node) {
-        return node.kind === 142;
-    }
-    ts.isTypeParameter = isTypeParameter;
-    function isParameter(node) {
-        return node.kind === 143;
-    }
-    ts.isParameter = isParameter;
-    function isDecorator(node) {
-        return node.kind === 144;
-    }
-    ts.isDecorator = isDecorator;
-    function isMethodDeclaration(node) {
-        return node.kind === 148;
-    }
-    ts.isMethodDeclaration = isMethodDeclaration;
-    function isClassElement(node) {
-        var kind = node.kind;
-        return kind === 149
-            || kind === 146
-            || kind === 148
-            || kind === 150
-            || kind === 151
-            || kind === 154
-            || kind === 199;
-    }
-    ts.isClassElement = isClassElement;
-    function isObjectLiteralElementLike(node) {
-        var kind = node.kind;
-        return kind === 253
-            || kind === 254
-            || kind === 148
-            || kind === 150
-            || kind === 151
-            || kind === 240;
-    }
-    ts.isObjectLiteralElementLike = isObjectLiteralElementLike;
-    function isTypeNodeKind(kind) {
-        return (kind >= 155 && kind <= 167)
-            || kind === 118
-            || kind === 131
-            || kind === 121
-            || kind === 133
-            || kind === 134
-            || kind === 104
-            || kind === 128
-            || kind === 195;
-    }
-    function isTypeNode(node) {
-        return isTypeNodeKind(node.kind);
-    }
-    ts.isTypeNode = isTypeNode;
-    function isBindingPattern(node) {
-        if (node) {
-            var kind = node.kind;
-            return kind === 169
-                || kind === 168;
-        }
-        return false;
-    }
-    ts.isBindingPattern = isBindingPattern;
-    function isBindingElement(node) {
-        return node.kind === 170;
-    }
-    ts.isBindingElement = isBindingElement;
-    function isArrayBindingElement(node) {
-        var kind = node.kind;
-        return kind === 170
-            || kind === 194;
-    }
-    ts.isArrayBindingElement = isArrayBindingElement;
-    function isPropertyAccessExpression(node) {
-        return node.kind === 173;
-    }
-    ts.isPropertyAccessExpression = isPropertyAccessExpression;
-    function isElementAccessExpression(node) {
-        return node.kind === 174;
-    }
-    ts.isElementAccessExpression = isElementAccessExpression;
-    function isBinaryExpression(node) {
-        return node.kind === 188;
-    }
-    ts.isBinaryExpression = isBinaryExpression;
-    function isConditionalExpression(node) {
-        return node.kind === 189;
-    }
-    ts.isConditionalExpression = isConditionalExpression;
-    function isCallExpression(node) {
-        return node.kind === 175;
-    }
-    ts.isCallExpression = isCallExpression;
-    function isTemplateLiteral(node) {
-        var kind = node.kind;
-        return kind === 190
-            || kind === 12;
-    }
-    ts.isTemplateLiteral = isTemplateLiteral;
-    function isSpreadElementExpression(node) {
-        return node.kind === 192;
-    }
-    ts.isSpreadElementExpression = isSpreadElementExpression;
-    function isExpressionWithTypeArguments(node) {
-        return node.kind === 195;
-    }
-    ts.isExpressionWithTypeArguments = isExpressionWithTypeArguments;
-    function isLeftHandSideExpressionKind(kind) {
-        return kind === 173
-            || kind === 174
-            || kind === 176
-            || kind === 175
-            || kind === 242
-            || kind === 243
-            || kind === 177
-            || kind === 171
-            || kind === 179
-            || kind === 172
-            || kind === 193
-            || kind === 180
-            || kind === 70
-            || kind === 11
-            || kind === 8
-            || kind === 9
-            || kind === 12
-            || kind === 190
-            || kind === 85
-            || kind === 94
-            || kind === 98
-            || kind === 100
-            || kind === 96
-            || kind === 197;
-    }
-    function isLeftHandSideExpression(node) {
-        return isLeftHandSideExpressionKind(ts.skipPartiallyEmittedExpressions(node).kind);
-    }
-    ts.isLeftHandSideExpression = isLeftHandSideExpression;
-    function isUnaryExpressionKind(kind) {
-        return kind === 186
-            || kind === 187
-            || kind === 182
-            || kind === 183
-            || kind === 184
-            || kind === 185
-            || kind === 178
-            || isLeftHandSideExpressionKind(kind);
-    }
-    function isUnaryExpression(node) {
-        return isUnaryExpressionKind(ts.skipPartiallyEmittedExpressions(node).kind);
-    }
-    ts.isUnaryExpression = isUnaryExpression;
-    function isExpressionKind(kind) {
-        return kind === 189
-            || kind === 191
-            || kind === 181
-            || kind === 188
-            || kind === 192
-            || kind === 196
-            || kind === 194
-            || isUnaryExpressionKind(kind);
-    }
-    function isExpression(node) {
-        return isExpressionKind(ts.skipPartiallyEmittedExpressions(node).kind);
-    }
-    ts.isExpression = isExpression;
-    function isAssertionExpression(node) {
-        var kind = node.kind;
-        return kind === 178
-            || kind === 196;
-    }
-    ts.isAssertionExpression = isAssertionExpression;
-    function isPartiallyEmittedExpression(node) {
-        return node.kind === 288;
-    }
-    ts.isPartiallyEmittedExpression = isPartiallyEmittedExpression;
-    function isNotEmittedStatement(node) {
-        return node.kind === 287;
-    }
-    ts.isNotEmittedStatement = isNotEmittedStatement;
-    function isNotEmittedOrPartiallyEmittedNode(node) {
-        return isNotEmittedStatement(node)
-            || isPartiallyEmittedExpression(node);
-    }
-    ts.isNotEmittedOrPartiallyEmittedNode = isNotEmittedOrPartiallyEmittedNode;
-    function isOmittedExpression(node) {
-        return node.kind === 194;
-    }
-    ts.isOmittedExpression = isOmittedExpression;
-    function isTemplateSpan(node) {
-        return node.kind === 198;
-    }
-    ts.isTemplateSpan = isTemplateSpan;
-    function isBlock(node) {
-        return node.kind === 200;
-    }
-    ts.isBlock = isBlock;
-    function isConciseBody(node) {
-        return isBlock(node)
-            || isExpression(node);
-    }
-    ts.isConciseBody = isConciseBody;
-    function isFunctionBody(node) {
-        return isBlock(node);
-    }
-    ts.isFunctionBody = isFunctionBody;
-    function isForInitializer(node) {
-        return isVariableDeclarationList(node)
-            || isExpression(node);
-    }
-    ts.isForInitializer = isForInitializer;
-    function isVariableDeclaration(node) {
-        return node.kind === 219;
-    }
-    ts.isVariableDeclaration = isVariableDeclaration;
-    function isVariableDeclarationList(node) {
-        return node.kind === 220;
-    }
-    ts.isVariableDeclarationList = isVariableDeclarationList;
-    function isCaseBlock(node) {
-        return node.kind === 228;
-    }
-    ts.isCaseBlock = isCaseBlock;
-    function isModuleBody(node) {
-        var kind = node.kind;
-        return kind === 227
-            || kind === 226;
-    }
-    ts.isModuleBody = isModuleBody;
-    function isImportEqualsDeclaration(node) {
-        return node.kind === 230;
-    }
-    ts.isImportEqualsDeclaration = isImportEqualsDeclaration;
-    function isImportClause(node) {
-        return node.kind === 232;
-    }
-    ts.isImportClause = isImportClause;
-    function isNamedImportBindings(node) {
-        var kind = node.kind;
-        return kind === 234
-            || kind === 233;
-    }
-    ts.isNamedImportBindings = isNamedImportBindings;
-    function isImportSpecifier(node) {
-        return node.kind === 235;
-    }
-    ts.isImportSpecifier = isImportSpecifier;
-    function isNamedExports(node) {
-        return node.kind === 238;
-    }
-    ts.isNamedExports = isNamedExports;
-    function isExportSpecifier(node) {
-        return node.kind === 239;
-    }
-    ts.isExportSpecifier = isExportSpecifier;
-    function isModuleOrEnumDeclaration(node) {
-        return node.kind === 226 || node.kind === 225;
-    }
-    ts.isModuleOrEnumDeclaration = isModuleOrEnumDeclaration;
-    function isDeclarationKind(kind) {
-        return kind === 181
-            || kind === 170
-            || kind === 222
-            || kind === 193
-            || kind === 149
-            || kind === 225
-            || kind === 255
-            || kind === 239
-            || kind === 221
-            || kind === 180
-            || kind === 150
-            || kind === 232
-            || kind === 230
-            || kind === 235
-            || kind === 223
-            || kind === 148
-            || kind === 147
-            || kind === 226
-            || kind === 229
-            || kind === 233
-            || kind === 143
-            || kind === 253
-            || kind === 146
-            || kind === 145
-            || kind === 151
-            || kind === 254
-            || kind === 224
-            || kind === 142
-            || kind === 219
-            || kind === 279;
-    }
-    function isDeclarationStatementKind(kind) {
-        return kind === 221
-            || kind === 240
-            || kind === 222
-            || kind === 223
-            || kind === 224
-            || kind === 225
-            || kind === 226
-            || kind === 231
-            || kind === 230
-            || kind === 237
-            || kind === 236
-            || kind === 229;
-    }
-    function isStatementKindButNotDeclarationKind(kind) {
-        return kind === 211
-            || kind === 210
-            || kind === 218
-            || kind === 205
-            || kind === 203
-            || kind === 202
-            || kind === 208
-            || kind === 209
-            || kind === 207
-            || kind === 204
-            || kind === 215
-            || kind === 212
-            || kind === 214
-            || kind === 216
-            || kind === 217
-            || kind === 201
-            || kind === 206
-            || kind === 213
-            || kind === 287;
-    }
-    function isDeclaration(node) {
-        return isDeclarationKind(node.kind);
-    }
-    ts.isDeclaration = isDeclaration;
-    function isDeclarationStatement(node) {
-        return isDeclarationStatementKind(node.kind);
-    }
-    ts.isDeclarationStatement = isDeclarationStatement;
-    function isStatementButNotDeclaration(node) {
-        return isStatementKindButNotDeclarationKind(node.kind);
-    }
-    ts.isStatementButNotDeclaration = isStatementButNotDeclaration;
-    function isStatement(node) {
-        var kind = node.kind;
-        return isStatementKindButNotDeclarationKind(kind)
-            || isDeclarationStatementKind(kind)
-            || kind === 200;
-    }
-    ts.isStatement = isStatement;
-    function isModuleReference(node) {
-        var kind = node.kind;
-        return kind === 241
-            || kind === 140
-            || kind === 70;
-    }
-    ts.isModuleReference = isModuleReference;
-    function isJsxOpeningElement(node) {
-        return node.kind === 244;
-    }
-    ts.isJsxOpeningElement = isJsxOpeningElement;
-    function isJsxClosingElement(node) {
-        return node.kind === 245;
-    }
-    ts.isJsxClosingElement = isJsxClosingElement;
-    function isJsxTagNameExpression(node) {
-        var kind = node.kind;
-        return kind === 98
-            || kind === 70
-            || kind === 173;
-    }
-    ts.isJsxTagNameExpression = isJsxTagNameExpression;
-    function isJsxChild(node) {
-        var kind = node.kind;
-        return kind === 242
-            || kind === 248
-            || kind === 243
-            || kind === 10;
-    }
-    ts.isJsxChild = isJsxChild;
-    function isJsxAttributeLike(node) {
-        var kind = node.kind;
-        return kind === 246
-            || kind === 247;
-    }
-    ts.isJsxAttributeLike = isJsxAttributeLike;
-    function isJsxSpreadAttribute(node) {
-        return node.kind === 247;
-    }
-    ts.isJsxSpreadAttribute = isJsxSpreadAttribute;
-    function isJsxAttribute(node) {
-        return node.kind === 246;
-    }
-    ts.isJsxAttribute = isJsxAttribute;
-    function isStringLiteralOrJsxExpression(node) {
-        var kind = node.kind;
-        return kind === 9
-            || kind === 248;
-    }
-    ts.isStringLiteralOrJsxExpression = isStringLiteralOrJsxExpression;
-    function isCaseOrDefaultClause(node) {
-        var kind = node.kind;
-        return kind === 249
-            || kind === 250;
-    }
-    ts.isCaseOrDefaultClause = isCaseOrDefaultClause;
-    function isHeritageClause(node) {
-        return node.kind === 251;
-    }
-    ts.isHeritageClause = isHeritageClause;
-    function isCatchClause(node) {
-        return node.kind === 252;
-    }
-    ts.isCatchClause = isCatchClause;
-    function isPropertyAssignment(node) {
-        return node.kind === 253;
-    }
-    ts.isPropertyAssignment = isPropertyAssignment;
-    function isShorthandPropertyAssignment(node) {
-        return node.kind === 254;
-    }
-    ts.isShorthandPropertyAssignment = isShorthandPropertyAssignment;
-    function isEnumMember(node) {
-        return node.kind === 255;
-    }
-    ts.isEnumMember = isEnumMember;
-    function isSourceFile(node) {
-        return node.kind === 256;
-    }
-    ts.isSourceFile = isSourceFile;
-    function isWatchSet(options) {
-        return options.watch && options.hasOwnProperty("watch");
-    }
-    ts.isWatchSet = isWatchSet;
-})(ts || (ts = {}));
-(function (ts) {
-    function getDefaultLibFileName(options) {
-        switch (options.target) {
-            case 4:
-                return "lib.es2017.d.ts";
-            case 3:
-                return "lib.es2016.d.ts";
-            case 2:
-                return "lib.es6.d.ts";
-            default:
-                return "lib.d.ts";
-        }
-    }
-    ts.getDefaultLibFileName = getDefaultLibFileName;
-    function textSpanEnd(span) {
-        return span.start + span.length;
-    }
-    ts.textSpanEnd = textSpanEnd;
-    function textSpanIsEmpty(span) {
-        return span.length === 0;
-    }
-    ts.textSpanIsEmpty = textSpanIsEmpty;
-    function textSpanContainsPosition(span, position) {
-        return position >= span.start && position < textSpanEnd(span);
-    }
-    ts.textSpanContainsPosition = textSpanContainsPosition;
-    function textSpanContainsTextSpan(span, other) {
-        return other.start >= span.start && textSpanEnd(other) <= textSpanEnd(span);
-    }
-    ts.textSpanContainsTextSpan = textSpanContainsTextSpan;
-    function textSpanOverlapsWith(span, other) {
-        var overlapStart = Math.max(span.start, other.start);
-        var overlapEnd = Math.min(textSpanEnd(span), textSpanEnd(other));
-        return overlapStart < overlapEnd;
-    }
-    ts.textSpanOverlapsWith = textSpanOverlapsWith;
-    function textSpanOverlap(span1, span2) {
-        var overlapStart = Math.max(span1.start, span2.start);
-        var overlapEnd = Math.min(textSpanEnd(span1), textSpanEnd(span2));
-        if (overlapStart < overlapEnd) {
-            return createTextSpanFromBounds(overlapStart, overlapEnd);
-        }
-        return undefined;
-    }
-    ts.textSpanOverlap = textSpanOverlap;
-    function textSpanIntersectsWithTextSpan(span, other) {
-        return other.start <= textSpanEnd(span) && textSpanEnd(other) >= span.start;
-    }
-    ts.textSpanIntersectsWithTextSpan = textSpanIntersectsWithTextSpan;
-    function textSpanIntersectsWith(span, start, length) {
-        var end = start + length;
-        return start <= textSpanEnd(span) && end >= span.start;
-    }
-    ts.textSpanIntersectsWith = textSpanIntersectsWith;
-    function decodedTextSpanIntersectsWith(start1, length1, start2, length2) {
-        var end1 = start1 + length1;
-        var end2 = start2 + length2;
-        return start2 <= end1 && end2 >= start1;
-    }
-    ts.decodedTextSpanIntersectsWith = decodedTextSpanIntersectsWith;
-    function textSpanIntersectsWithPosition(span, position) {
-        return position <= textSpanEnd(span) && position >= span.start;
-    }
-    ts.textSpanIntersectsWithPosition = textSpanIntersectsWithPosition;
-    function textSpanIntersection(span1, span2) {
-        var intersectStart = Math.max(span1.start, span2.start);
-        var intersectEnd = Math.min(textSpanEnd(span1), textSpanEnd(span2));
-        if (intersectStart <= intersectEnd) {
-            return createTextSpanFromBounds(intersectStart, intersectEnd);
-        }
-        return undefined;
-    }
-    ts.textSpanIntersection = textSpanIntersection;
-    function createTextSpan(start, length) {
-        if (start < 0) {
-            throw new Error("start < 0");
-        }
-        if (length < 0) {
-            throw new Error("length < 0");
-        }
-        return { start: start, length: length };
-    }
-    ts.createTextSpan = createTextSpan;
-    function createTextSpanFromBounds(start, end) {
-        return createTextSpan(start, end - start);
-    }
-    ts.createTextSpanFromBounds = createTextSpanFromBounds;
-    function textChangeRangeNewSpan(range) {
-        return createTextSpan(range.span.start, range.newLength);
-    }
-    ts.textChangeRangeNewSpan = textChangeRangeNewSpan;
-    function textChangeRangeIsUnchanged(range) {
-        return textSpanIsEmpty(range.span) && range.newLength === 0;
-    }
-    ts.textChangeRangeIsUnchanged = textChangeRangeIsUnchanged;
-    function createTextChangeRange(span, newLength) {
-        if (newLength < 0) {
-            throw new Error("newLength < 0");
-        }
-        return { span: span, newLength: newLength };
-    }
-    ts.createTextChangeRange = createTextChangeRange;
-    ts.unchangedTextChangeRange = createTextChangeRange(createTextSpan(0, 0), 0);
-    function collapseTextChangeRangesAcrossMultipleVersions(changes) {
-        if (changes.length === 0) {
-            return ts.unchangedTextChangeRange;
-        }
-        if (changes.length === 1) {
-            return changes[0];
-        }
-        var change0 = changes[0];
-        var oldStartN = change0.span.start;
-        var oldEndN = textSpanEnd(change0.span);
-        var newEndN = oldStartN + change0.newLength;
-        for (var i = 1; i < changes.length; i++) {
-            var nextChange = changes[i];
-            var oldStart1 = oldStartN;
-            var oldEnd1 = oldEndN;
-            var newEnd1 = newEndN;
-            var oldStart2 = nextChange.span.start;
-            var oldEnd2 = textSpanEnd(nextChange.span);
-            var newEnd2 = oldStart2 + nextChange.newLength;
-            oldStartN = Math.min(oldStart1, oldStart2);
-            oldEndN = Math.max(oldEnd1, oldEnd1 + (oldEnd2 - newEnd1));
-            newEndN = Math.max(newEnd2, newEnd2 + (newEnd1 - oldEnd2));
-        }
-        return createTextChangeRange(createTextSpanFromBounds(oldStartN, oldEndN), newEndN - oldStartN);
-    }
-    ts.collapseTextChangeRangesAcrossMultipleVersions = collapseTextChangeRangesAcrossMultipleVersions;
-    function getTypeParameterOwner(d) {
-        if (d && d.kind === 142) {
-            for (var current = d; current; current = current.parent) {
-                if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 223) {
-                    return current;
-                }
-            }
-        }
-    }
-    ts.getTypeParameterOwner = getTypeParameterOwner;
-    function isParameterPropertyDeclaration(node) {
-        return ts.hasModifier(node, 92) && node.parent.kind === 149 && ts.isClassLike(node.parent.parent);
-    }
-    ts.isParameterPropertyDeclaration = isParameterPropertyDeclaration;
-    function walkUpBindingElementsAndPatterns(node) {
-        while (node && (node.kind === 170 || ts.isBindingPattern(node))) {
-            node = node.parent;
-        }
-        return node;
-    }
-    function getCombinedModifierFlags(node) {
-        node = walkUpBindingElementsAndPatterns(node);
-        var flags = ts.getModifierFlags(node);
-        if (node.kind === 219) {
-            node = node.parent;
-        }
-        if (node && node.kind === 220) {
-            flags |= ts.getModifierFlags(node);
-            node = node.parent;
-        }
-        if (node && node.kind === 201) {
-            flags |= ts.getModifierFlags(node);
-        }
-        return flags;
-    }
-    ts.getCombinedModifierFlags = getCombinedModifierFlags;
-    function getCombinedNodeFlags(node) {
-        node = walkUpBindingElementsAndPatterns(node);
-        var flags = node.flags;
-        if (node.kind === 219) {
-            node = node.parent;
-        }
-        if (node && node.kind === 220) {
-            flags |= node.flags;
-            node = node.parent;
-        }
-        if (node && node.kind === 201) {
-            flags |= node.flags;
-        }
-        return flags;
-    }
-    ts.getCombinedNodeFlags = getCombinedNodeFlags;
-})(ts || (ts = {}));
-var ts;
 (function (ts) {
     function tokenIsIdentifierOrKeyword(token) {
         return token >= 70;
@@ -8088,7 +3206,7 @@ var ts;
         "false": 85,
         "finally": 86,
         "for": 87,
-        "from": 137,
+        "from": 138,
         "function": 88,
         "get": 124,
         "if": 89,
@@ -8098,34 +3216,35 @@ var ts;
         "instanceof": 92,
         "interface": 108,
         "is": 125,
+        "keyof": 126,
         "let": 109,
-        "module": 126,
-        "namespace": 127,
-        "never": 128,
+        "module": 127,
+        "namespace": 128,
+        "never": 129,
         "new": 93,
         "null": 94,
-        "number": 131,
+        "number": 132,
         "package": 110,
         "private": 111,
         "protected": 112,
         "public": 113,
-        "readonly": 129,
-        "require": 130,
-        "global": 138,
+        "readonly": 130,
+        "require": 131,
+        "global": 139,
         "return": 95,
-        "set": 132,
+        "set": 133,
         "static": 114,
-        "string": 133,
+        "string": 134,
         "super": 96,
         "switch": 97,
-        "symbol": 134,
+        "symbol": 135,
         "this": 98,
         "throw": 99,
         "true": 100,
         "try": 101,
-        "type": 135,
+        "type": 136,
         "typeof": 102,
-        "undefined": 136,
+        "undefined": 137,
         "var": 103,
         "void": 104,
         "while": 105,
@@ -8133,7 +3252,7 @@ var ts;
         "yield": 115,
         "async": 119,
         "await": 120,
-        "of": 139,
+        "of": 140,
         "{": 16,
         "}": 17,
         "(": 18,
@@ -8228,8 +3347,8 @@ var ts;
     }
     function makeReverseMap(source) {
         var result = [];
-        for (var name_8 in source) {
-            result[source[name_8]] = name_8;
+        for (var name_4 in source) {
+            result[source[name_4]] = name_4;
         }
         return result;
     }
@@ -9516,10 +4635,13 @@ var ts;
                 case 44:
                     pos++;
                     return token = 25;
+                case 46:
+                    pos++;
+                    return token = 22;
             }
-            if (isIdentifierStart(ch, 4)) {
+            if (isIdentifierStart(ch, 5)) {
                 pos++;
-                while (isIdentifierPart(text.charCodeAt(pos), 4) && pos < end) {
+                while (isIdentifierPart(text.charCodeAt(pos), 5) && pos < end) {
                     pos++;
                 }
                 return token = 70;
@@ -9607,11 +4729,5885 @@ var ts;
     ts.createScanner = createScanner;
 })(ts || (ts = {}));
 var ts;
+(function (ts) {
+    ts.compileOnSaveCommandLineOption = { name: "compileOnSave", type: "boolean" };
+    ts.optionDeclarations = [
+        {
+            name: "charset",
+            type: "string",
+        },
+        ts.compileOnSaveCommandLineOption,
+        {
+            name: "declaration",
+            shortName: "d",
+            type: "boolean",
+            description: ts.Diagnostics.Generates_corresponding_d_ts_file,
+        },
+        {
+            name: "declarationDir",
+            type: "string",
+            isFilePath: true,
+            paramType: ts.Diagnostics.DIRECTORY,
+        },
+        {
+            name: "diagnostics",
+            type: "boolean",
+        },
+        {
+            name: "extendedDiagnostics",
+            type: "boolean",
+            experimental: true
+        },
+        {
+            name: "emitBOM",
+            type: "boolean"
+        },
+        {
+            name: "help",
+            shortName: "h",
+            type: "boolean",
+            description: ts.Diagnostics.Print_this_message,
+        },
+        {
+            name: "help",
+            shortName: "?",
+            type: "boolean"
+        },
+        {
+            name: "init",
+            type: "boolean",
+            description: ts.Diagnostics.Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file,
+        },
+        {
+            name: "inlineSourceMap",
+            type: "boolean",
+        },
+        {
+            name: "inlineSources",
+            type: "boolean",
+        },
+        {
+            name: "jsx",
+            type: ts.createMap({
+                "preserve": 1,
+                "react": 2
+            }),
+            paramType: ts.Diagnostics.KIND,
+            description: ts.Diagnostics.Specify_JSX_code_generation_Colon_preserve_or_react,
+        },
+        {
+            name: "reactNamespace",
+            type: "string",
+            description: ts.Diagnostics.Specify_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit
+        },
+        {
+            name: "jsxFactory",
+            type: "string",
+            description: ts.Diagnostics.Specify_the_JSX_factory_function_to_use_when_targeting_react_JSX_emit_e_g_React_createElement_or_h
+        },
+        {
+            name: "listFiles",
+            type: "boolean",
+        },
+        {
+            name: "locale",
+            type: "string",
+        },
+        {
+            name: "mapRoot",
+            type: "string",
+            isFilePath: true,
+            description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations,
+            paramType: ts.Diagnostics.LOCATION,
+        },
+        {
+            name: "module",
+            shortName: "m",
+            type: ts.createMap({
+                "none": ts.ModuleKind.None,
+                "commonjs": ts.ModuleKind.CommonJS,
+                "amd": ts.ModuleKind.AMD,
+                "system": ts.ModuleKind.System,
+                "umd": ts.ModuleKind.UMD,
+                "es6": ts.ModuleKind.ES2015,
+                "es2015": ts.ModuleKind.ES2015,
+            }),
+            description: ts.Diagnostics.Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015,
+            paramType: ts.Diagnostics.KIND,
+        },
+        {
+            name: "newLine",
+            type: ts.createMap({
+                "crlf": 0,
+                "lf": 1
+            }),
+            description: ts.Diagnostics.Specify_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix,
+            paramType: ts.Diagnostics.NEWLINE,
+        },
+        {
+            name: "noEmit",
+            type: "boolean",
+            description: ts.Diagnostics.Do_not_emit_outputs,
+        },
+        {
+            name: "noEmitHelpers",
+            type: "boolean"
+        },
+        {
+            name: "noEmitOnError",
+            type: "boolean",
+            description: ts.Diagnostics.Do_not_emit_outputs_if_any_errors_were_reported,
+        },
+        {
+            name: "noErrorTruncation",
+            type: "boolean"
+        },
+        {
+            name: "noImplicitAny",
+            type: "boolean",
+            description: ts.Diagnostics.Raise_error_on_expressions_and_declarations_with_an_implied_any_type,
+        },
+        {
+            name: "noImplicitThis",
+            type: "boolean",
+            description: ts.Diagnostics.Raise_error_on_this_expressions_with_an_implied_any_type,
+        },
+        {
+            name: "noUnusedLocals",
+            type: "boolean",
+            description: ts.Diagnostics.Report_errors_on_unused_locals,
+        },
+        {
+            name: "noUnusedParameters",
+            type: "boolean",
+            description: ts.Diagnostics.Report_errors_on_unused_parameters,
+        },
+        {
+            name: "noLib",
+            type: "boolean",
+        },
+        {
+            name: "noResolve",
+            type: "boolean",
+        },
+        {
+            name: "skipDefaultLibCheck",
+            type: "boolean",
+        },
+        {
+            name: "skipLibCheck",
+            type: "boolean",
+            description: ts.Diagnostics.Skip_type_checking_of_declaration_files,
+        },
+        {
+            name: "out",
+            type: "string",
+            isFilePath: false,
+            paramType: ts.Diagnostics.FILE,
+        },
+        {
+            name: "outFile",
+            type: "string",
+            isFilePath: true,
+            description: ts.Diagnostics.Concatenate_and_emit_output_to_single_file,
+            paramType: ts.Diagnostics.FILE,
+        },
+        {
+            name: "outDir",
+            type: "string",
+            isFilePath: true,
+            description: ts.Diagnostics.Redirect_output_structure_to_the_directory,
+            paramType: ts.Diagnostics.DIRECTORY,
+        },
+        {
+            name: "preserveConstEnums",
+            type: "boolean",
+            description: ts.Diagnostics.Do_not_erase_const_enum_declarations_in_generated_code
+        },
+        {
+            name: "pretty",
+            description: ts.Diagnostics.Stylize_errors_and_messages_using_color_and_context_experimental,
+            type: "boolean"
+        },
+        {
+            name: "project",
+            shortName: "p",
+            type: "string",
+            isFilePath: true,
+            description: ts.Diagnostics.Compile_the_project_in_the_given_directory,
+            paramType: ts.Diagnostics.DIRECTORY
+        },
+        {
+            name: "removeComments",
+            type: "boolean",
+            description: ts.Diagnostics.Do_not_emit_comments_to_output,
+        },
+        {
+            name: "rootDir",
+            type: "string",
+            isFilePath: true,
+            paramType: ts.Diagnostics.LOCATION,
+            description: ts.Diagnostics.Specify_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir,
+        },
+        {
+            name: "isolatedModules",
+            type: "boolean",
+        },
+        {
+            name: "sourceMap",
+            type: "boolean",
+            description: ts.Diagnostics.Generates_corresponding_map_file,
+        },
+        {
+            name: "sourceRoot",
+            type: "string",
+            isFilePath: true,
+            description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations,
+            paramType: ts.Diagnostics.LOCATION,
+        },
+        {
+            name: "suppressExcessPropertyErrors",
+            type: "boolean",
+            description: ts.Diagnostics.Suppress_excess_property_checks_for_object_literals,
+            experimental: true
+        },
+        {
+            name: "suppressImplicitAnyIndexErrors",
+            type: "boolean",
+            description: ts.Diagnostics.Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures,
+        },
+        {
+            name: "stripInternal",
+            type: "boolean",
+            description: ts.Diagnostics.Do_not_emit_declarations_for_code_that_has_an_internal_annotation,
+            experimental: true
+        },
+        {
+            name: "target",
+            shortName: "t",
+            type: ts.createMap({
+                "es3": 0,
+                "es5": 1,
+                "es6": 2,
+                "es2015": 2,
+                "es2016": 3,
+                "es2017": 4,
+                "esnext": 5,
+            }),
+            description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015,
+            paramType: ts.Diagnostics.VERSION,
+        },
+        {
+            name: "version",
+            shortName: "v",
+            type: "boolean",
+            description: ts.Diagnostics.Print_the_compiler_s_version,
+        },
+        {
+            name: "watch",
+            shortName: "w",
+            type: "boolean",
+            description: ts.Diagnostics.Watch_input_files,
+        },
+        {
+            name: "experimentalDecorators",
+            type: "boolean",
+            description: ts.Diagnostics.Enables_experimental_support_for_ES7_decorators
+        },
+        {
+            name: "emitDecoratorMetadata",
+            type: "boolean",
+            experimental: true,
+            description: ts.Diagnostics.Enables_experimental_support_for_emitting_type_metadata_for_decorators
+        },
+        {
+            name: "moduleResolution",
+            type: ts.createMap({
+                "node": ts.ModuleResolutionKind.NodeJs,
+                "classic": ts.ModuleResolutionKind.Classic,
+            }),
+            description: ts.Diagnostics.Specify_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6,
+            paramType: ts.Diagnostics.STRATEGY,
+        },
+        {
+            name: "allowUnusedLabels",
+            type: "boolean",
+            description: ts.Diagnostics.Do_not_report_errors_on_unused_labels
+        },
+        {
+            name: "noImplicitReturns",
+            type: "boolean",
+            description: ts.Diagnostics.Report_error_when_not_all_code_paths_in_function_return_a_value
+        },
+        {
+            name: "noFallthroughCasesInSwitch",
+            type: "boolean",
+            description: ts.Diagnostics.Report_errors_for_fallthrough_cases_in_switch_statement
+        },
+        {
+            name: "allowUnreachableCode",
+            type: "boolean",
+            description: ts.Diagnostics.Do_not_report_errors_on_unreachable_code
+        },
+        {
+            name: "forceConsistentCasingInFileNames",
+            type: "boolean",
+            description: ts.Diagnostics.Disallow_inconsistently_cased_references_to_the_same_file
+        },
+        {
+            name: "baseUrl",
+            type: "string",
+            isFilePath: true,
+            description: ts.Diagnostics.Base_directory_to_resolve_non_absolute_module_names
+        },
+        {
+            name: "paths",
+            type: "object",
+            isTSConfigOnly: true
+        },
+        {
+            name: "rootDirs",
+            type: "list",
+            isTSConfigOnly: true,
+            element: {
+                name: "rootDirs",
+                type: "string",
+                isFilePath: true
+            }
+        },
+        {
+            name: "typeRoots",
+            type: "list",
+            element: {
+                name: "typeRoots",
+                type: "string",
+                isFilePath: true
+            }
+        },
+        {
+            name: "types",
+            type: "list",
+            element: {
+                name: "types",
+                type: "string"
+            },
+            description: ts.Diagnostics.Type_declaration_files_to_be_included_in_compilation
+        },
+        {
+            name: "traceResolution",
+            type: "boolean",
+            description: ts.Diagnostics.Enable_tracing_of_the_name_resolution_process
+        },
+        {
+            name: "allowJs",
+            type: "boolean",
+            description: ts.Diagnostics.Allow_javascript_files_to_be_compiled
+        },
+        {
+            name: "allowSyntheticDefaultImports",
+            type: "boolean",
+            description: ts.Diagnostics.Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typechecking
+        },
+        {
+            name: "noImplicitUseStrict",
+            type: "boolean",
+            description: ts.Diagnostics.Do_not_emit_use_strict_directives_in_module_output
+        },
+        {
+            name: "maxNodeModuleJsDepth",
+            type: "number",
+            description: ts.Diagnostics.The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files
+        },
+        {
+            name: "listEmittedFiles",
+            type: "boolean"
+        },
+        {
+            name: "lib",
+            type: "list",
+            element: {
+                name: "lib",
+                type: ts.createMap({
+                    "es5": "lib.es5.d.ts",
+                    "es6": "lib.es2015.d.ts",
+                    "es2015": "lib.es2015.d.ts",
+                    "es7": "lib.es2016.d.ts",
+                    "es2016": "lib.es2016.d.ts",
+                    "es2017": "lib.es2017.d.ts",
+                    "dom": "lib.dom.d.ts",
+                    "dom.iterable": "lib.dom.iterable.d.ts",
+                    "webworker": "lib.webworker.d.ts",
+                    "scripthost": "lib.scripthost.d.ts",
+                    "es2015.core": "lib.es2015.core.d.ts",
+                    "es2015.collection": "lib.es2015.collection.d.ts",
+                    "es2015.generator": "lib.es2015.generator.d.ts",
+                    "es2015.iterable": "lib.es2015.iterable.d.ts",
+                    "es2015.promise": "lib.es2015.promise.d.ts",
+                    "es2015.proxy": "lib.es2015.proxy.d.ts",
+                    "es2015.reflect": "lib.es2015.reflect.d.ts",
+                    "es2015.symbol": "lib.es2015.symbol.d.ts",
+                    "es2015.symbol.wellknown": "lib.es2015.symbol.wellknown.d.ts",
+                    "es2016.array.include": "lib.es2016.array.include.d.ts",
+                    "es2017.object": "lib.es2017.object.d.ts",
+                    "es2017.sharedmemory": "lib.es2017.sharedmemory.d.ts",
+                    "es2017.string": "lib.es2017.string.d.ts",
+                }),
+            },
+            description: ts.Diagnostics.Specify_library_files_to_be_included_in_the_compilation_Colon
+        },
+        {
+            name: "disableSizeLimit",
+            type: "boolean"
+        },
+        {
+            name: "strictNullChecks",
+            type: "boolean",
+            description: ts.Diagnostics.Enable_strict_null_checks
+        },
+        {
+            name: "importHelpers",
+            type: "boolean",
+            description: ts.Diagnostics.Import_emit_helpers_from_tslib
+        },
+        {
+            name: "alwaysStrict",
+            type: "boolean",
+            description: ts.Diagnostics.Parse_in_strict_mode_and_emit_use_strict_for_each_source_file
+        }
+    ];
+    ts.typingOptionDeclarations = [
+        {
+            name: "enableAutoDiscovery",
+            type: "boolean",
+        },
+        {
+            name: "include",
+            type: "list",
+            element: {
+                name: "include",
+                type: "string"
+            }
+        },
+        {
+            name: "exclude",
+            type: "list",
+            element: {
+                name: "exclude",
+                type: "string"
+            }
+        }
+    ];
+    ts.defaultInitCompilerOptions = {
+        module: ts.ModuleKind.CommonJS,
+        target: 1,
+        noImplicitAny: false,
+        sourceMap: false,
+    };
+    var optionNameMapCache;
+    function getOptionNameMap() {
+        if (optionNameMapCache) {
+            return optionNameMapCache;
+        }
+        var optionNameMap = ts.createMap();
+        var shortOptionNames = ts.createMap();
+        ts.forEach(ts.optionDeclarations, function (option) {
+            optionNameMap[option.name.toLowerCase()] = option;
+            if (option.shortName) {
+                shortOptionNames[option.shortName] = option.name;
+            }
+        });
+        optionNameMapCache = { optionNameMap: optionNameMap, shortOptionNames: shortOptionNames };
+        return optionNameMapCache;
+    }
+    ts.getOptionNameMap = getOptionNameMap;
+    function createCompilerDiagnosticForInvalidCustomType(opt) {
+        var namesOfType = Object.keys(opt.type).map(function (key) { return "'" + key + "'"; }).join(", ");
+        return ts.createCompilerDiagnostic(ts.Diagnostics.Argument_for_0_option_must_be_Colon_1, "--" + opt.name, namesOfType);
+    }
+    ts.createCompilerDiagnosticForInvalidCustomType = createCompilerDiagnosticForInvalidCustomType;
+    function parseCustomTypeOption(opt, value, errors) {
+        var key = trimString((value || "")).toLowerCase();
+        var map = opt.type;
+        if (key in map) {
+            return map[key];
+        }
+        else {
+            errors.push(createCompilerDiagnosticForInvalidCustomType(opt));
+        }
+    }
+    ts.parseCustomTypeOption = parseCustomTypeOption;
+    function parseListTypeOption(opt, value, errors) {
+        if (value === void 0) { value = ""; }
+        value = trimString(value);
+        if (ts.startsWith(value, "-")) {
+            return undefined;
+        }
+        if (value === "") {
+            return [];
+        }
+        var values = value.split(",");
+        switch (opt.element.type) {
+            case "number":
+                return ts.map(values, parseInt);
+            case "string":
+                return ts.map(values, function (v) { return v || ""; });
+            default:
+                return ts.filter(ts.map(values, function (v) { return parseCustomTypeOption(opt.element, v, errors); }), function (v) { return !!v; });
+        }
+    }
+    ts.parseListTypeOption = parseListTypeOption;
+    function parseCommandLine(commandLine, readFile) {
+        var options = {};
+        var fileNames = [];
+        var errors = [];
+        var _a = getOptionNameMap(), optionNameMap = _a.optionNameMap, shortOptionNames = _a.shortOptionNames;
+        parseStrings(commandLine);
+        return {
+            options: options,
+            fileNames: fileNames,
+            errors: errors
+        };
+        function parseStrings(args) {
+            var i = 0;
+            while (i < args.length) {
+                var s = args[i];
+                i++;
+                if (s.charCodeAt(0) === 64) {
+                    parseResponseFile(s.slice(1));
+                }
+                else if (s.charCodeAt(0) === 45) {
+                    s = s.slice(s.charCodeAt(1) === 45 ? 2 : 1).toLowerCase();
+                    if (s in shortOptionNames) {
+                        s = shortOptionNames[s];
+                    }
+                    if (s in optionNameMap) {
+                        var opt = optionNameMap[s];
+                        if (opt.isTSConfigOnly) {
+                            errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_can_only_be_specified_in_tsconfig_json_file, opt.name));
+                        }
+                        else {
+                            if (!args[i] && opt.type !== "boolean") {
+                                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_expects_an_argument, opt.name));
+                            }
+                            switch (opt.type) {
+                                case "number":
+                                    options[opt.name] = parseInt(args[i]);
+                                    i++;
+                                    break;
+                                case "boolean":
+                                    var optValue = args[i];
+                                    options[opt.name] = optValue !== "false";
+                                    if (optValue === "false" || optValue === "true") {
+                                        i++;
+                                    }
+                                    break;
+                                case "string":
+                                    options[opt.name] = args[i] || "";
+                                    i++;
+                                    break;
+                                case "list":
+                                    var result = parseListTypeOption(opt, args[i], errors);
+                                    options[opt.name] = result || [];
+                                    if (result) {
+                                        i++;
+                                    }
+                                    break;
+                                default:
+                                    options[opt.name] = parseCustomTypeOption(opt, args[i], errors);
+                                    i++;
+                                    break;
+                            }
+                        }
+                    }
+                    else {
+                        errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unknown_compiler_option_0, s));
+                    }
+                }
+                else {
+                    fileNames.push(s);
+                }
+            }
+        }
+        function parseResponseFile(fileName) {
+            var text = readFile ? readFile(fileName) : ts.sys.readFile(fileName);
+            if (!text) {
+                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.File_0_not_found, fileName));
+                return;
+            }
+            var args = [];
+            var pos = 0;
+            while (true) {
+                while (pos < text.length && text.charCodeAt(pos) <= 32)
+                    pos++;
+                if (pos >= text.length)
+                    break;
+                var start = pos;
+                if (text.charCodeAt(start) === 34) {
+                    pos++;
+                    while (pos < text.length && text.charCodeAt(pos) !== 34)
+                        pos++;
+                    if (pos < text.length) {
+                        args.push(text.substring(start + 1, pos));
+                        pos++;
+                    }
+                    else {
+                        errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unterminated_quoted_string_in_response_file_0, fileName));
+                    }
+                }
+                else {
+                    while (text.charCodeAt(pos) > 32)
+                        pos++;
+                    args.push(text.substring(start, pos));
+                }
+            }
+            parseStrings(args);
+        }
+    }
+    ts.parseCommandLine = parseCommandLine;
+    function readConfigFile(fileName, readFile) {
+        var text = "";
+        try {
+            text = readFile(fileName);
+        }
+        catch (e) {
+            return { error: ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_read_file_0_Colon_1, fileName, e.message) };
+        }
+        return parseConfigFileTextToJson(fileName, text);
+    }
+    ts.readConfigFile = readConfigFile;
+    function parseConfigFileTextToJson(fileName, jsonText, stripComments) {
+        if (stripComments === void 0) { stripComments = true; }
+        try {
+            var jsonTextToParse = stripComments ? removeComments(jsonText) : jsonText;
+            return { config: /\S/.test(jsonTextToParse) ? JSON.parse(jsonTextToParse) : {} };
+        }
+        catch (e) {
+            return { error: ts.createCompilerDiagnostic(ts.Diagnostics.Failed_to_parse_file_0_Colon_1, fileName, e.message) };
+        }
+    }
+    ts.parseConfigFileTextToJson = parseConfigFileTextToJson;
+    function generateTSConfig(options, fileNames) {
+        var compilerOptions = ts.extend(options, ts.defaultInitCompilerOptions);
+        var configurations = {
+            compilerOptions: serializeCompilerOptions(compilerOptions)
+        };
+        if (fileNames && fileNames.length) {
+            configurations.files = fileNames;
+        }
+        return configurations;
+        function getCustomTypeMapOfCommandLineOption(optionDefinition) {
+            if (optionDefinition.type === "string" || optionDefinition.type === "number" || optionDefinition.type === "boolean") {
+                return undefined;
+            }
+            else if (optionDefinition.type === "list") {
+                return getCustomTypeMapOfCommandLineOption(optionDefinition.element);
+            }
+            else {
+                return optionDefinition.type;
+            }
+        }
+        function getNameOfCompilerOptionValue(value, customTypeMap) {
+            for (var key in customTypeMap) {
+                if (customTypeMap[key] === value) {
+                    return key;
+                }
+            }
+            return undefined;
+        }
+        function serializeCompilerOptions(options) {
+            var result = ts.createMap();
+            var optionsNameMap = getOptionNameMap().optionNameMap;
+            for (var name_5 in options) {
+                if (ts.hasProperty(options, name_5)) {
+                    switch (name_5) {
+                        case "init":
+                        case "watch":
+                        case "version":
+                        case "help":
+                        case "project":
+                            break;
+                        default:
+                            var value = options[name_5];
+                            var optionDefinition = optionsNameMap[name_5.toLowerCase()];
+                            if (optionDefinition) {
+                                var customTypeMap = getCustomTypeMapOfCommandLineOption(optionDefinition);
+                                if (!customTypeMap) {
+                                    result[name_5] = value;
+                                }
+                                else {
+                                    if (optionDefinition.type === "list") {
+                                        var convertedValue = [];
+                                        for (var _i = 0, _a = value; _i < _a.length; _i++) {
+                                            var element = _a[_i];
+                                            convertedValue.push(getNameOfCompilerOptionValue(element, customTypeMap));
+                                        }
+                                        result[name_5] = convertedValue;
+                                    }
+                                    else {
+                                        result[name_5] = getNameOfCompilerOptionValue(value, customTypeMap);
+                                    }
+                                }
+                            }
+                            break;
+                    }
+                }
+            }
+            return result;
+        }
+    }
+    ts.generateTSConfig = generateTSConfig;
+    function removeComments(jsonText) {
+        var output = "";
+        var scanner = ts.createScanner(1, false, 0, jsonText);
+        var token;
+        while ((token = scanner.scan()) !== 1) {
+            switch (token) {
+                case 2:
+                case 3:
+                    output += scanner.getTokenText().replace(/\S/g, " ");
+                    break;
+                default:
+                    output += scanner.getTokenText();
+                    break;
+            }
+        }
+        return output;
+    }
+    function parseJsonConfigFileContent(json, host, basePath, existingOptions, configFileName, resolutionStack) {
+        if (existingOptions === void 0) { existingOptions = {}; }
+        if (resolutionStack === void 0) { resolutionStack = []; }
+        var errors = [];
+        var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames);
+        var resolvedPath = ts.toPath(configFileName || "", basePath, getCanonicalFileName);
+        if (resolutionStack.indexOf(resolvedPath) >= 0) {
+            return {
+                options: {},
+                fileNames: [],
+                typingOptions: {},
+                raw: json,
+                errors: [ts.createCompilerDiagnostic(ts.Diagnostics.Circularity_detected_while_resolving_configuration_Colon_0, resolutionStack.concat([resolvedPath]).join(" -> "))],
+                wildcardDirectories: {}
+            };
+        }
+        var options = convertCompilerOptionsFromJsonWorker(json["compilerOptions"], basePath, errors, configFileName);
+        var typingOptions = convertTypingOptionsFromJsonWorker(json["typingOptions"], basePath, errors, configFileName);
+        if (json["extends"]) {
+            var _a = [undefined, undefined, undefined, {}], include = _a[0], exclude = _a[1], files = _a[2], baseOptions = _a[3];
+            if (typeof json["extends"] === "string") {
+                _b = (tryExtendsName(json["extends"]) || [include, exclude, files, baseOptions]), include = _b[0], exclude = _b[1], files = _b[2], baseOptions = _b[3];
+            }
+            else {
+                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "extends", "string"));
+            }
+            if (include && !json["include"]) {
+                json["include"] = include;
+            }
+            if (exclude && !json["exclude"]) {
+                json["exclude"] = exclude;
+            }
+            if (files && !json["files"]) {
+                json["files"] = files;
+            }
+            options = ts.assign({}, baseOptions, options);
+        }
+        options = ts.extend(existingOptions, options);
+        options.configFilePath = configFileName;
+        var _c = getFileNames(errors), fileNames = _c.fileNames, wildcardDirectories = _c.wildcardDirectories;
+        var compileOnSave = convertCompileOnSaveOptionFromJson(json, basePath, errors);
+        return {
+            options: options,
+            fileNames: fileNames,
+            typingOptions: typingOptions,
+            raw: json,
+            errors: errors,
+            wildcardDirectories: wildcardDirectories,
+            compileOnSave: compileOnSave
+        };
+        function tryExtendsName(extendedConfig) {
+            if (!(ts.isRootedDiskPath(extendedConfig) || ts.startsWith(ts.normalizeSlashes(extendedConfig), "./") || ts.startsWith(ts.normalizeSlashes(extendedConfig), "../"))) {
+                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.The_path_in_an_extends_options_must_be_relative_or_rooted));
+                return;
+            }
+            var extendedConfigPath = ts.toPath(extendedConfig, basePath, getCanonicalFileName);
+            if (!host.fileExists(extendedConfigPath) && !ts.endsWith(extendedConfigPath, ".json")) {
+                extendedConfigPath = extendedConfigPath + ".json";
+                if (!host.fileExists(extendedConfigPath)) {
+                    errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.File_0_does_not_exist, extendedConfig));
+                    return;
+                }
+            }
+            var extendedResult = readConfigFile(extendedConfigPath, function (path) { return host.readFile(path); });
+            if (extendedResult.error) {
+                errors.push(extendedResult.error);
+                return;
+            }
+            var extendedDirname = ts.getDirectoryPath(extendedConfigPath);
+            var relativeDifference = ts.convertToRelativePath(extendedDirname, basePath, getCanonicalFileName);
+            var updatePath = function (path) { return ts.isRootedDiskPath(path) ? path : ts.combinePaths(relativeDifference, path); };
+            var result = parseJsonConfigFileContent(extendedResult.config, host, extendedDirname, undefined, ts.getBaseFileName(extendedConfigPath), resolutionStack.concat([resolvedPath]));
+            errors.push.apply(errors, result.errors);
+            var _a = ts.map(["include", "exclude", "files"], function (key) {
+                if (!json[key] && extendedResult.config[key]) {
+                    return ts.map(extendedResult.config[key], updatePath);
+                }
+            }), include = _a[0], exclude = _a[1], files = _a[2];
+            return [include, exclude, files, result.options];
+        }
+        function getFileNames(errors) {
+            var fileNames;
+            if (ts.hasProperty(json, "files")) {
+                if (ts.isArray(json["files"])) {
+                    fileNames = json["files"];
+                    if (fileNames.length === 0) {
+                        errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.The_files_list_in_config_file_0_is_empty, configFileName || "tsconfig.json"));
+                    }
+                }
+                else {
+                    errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "files", "Array"));
+                }
+            }
+            var includeSpecs;
+            if (ts.hasProperty(json, "include")) {
+                if (ts.isArray(json["include"])) {
+                    includeSpecs = json["include"];
+                }
+                else {
+                    errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "include", "Array"));
+                }
+            }
+            var excludeSpecs;
+            if (ts.hasProperty(json, "exclude")) {
+                if (ts.isArray(json["exclude"])) {
+                    excludeSpecs = json["exclude"];
+                }
+                else {
+                    errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "exclude", "Array"));
+                }
+            }
+            else if (ts.hasProperty(json, "excludes")) {
+                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unknown_option_excludes_Did_you_mean_exclude));
+            }
+            else {
+                excludeSpecs = ["node_modules", "bower_components", "jspm_packages"];
+                var outDir = json["compilerOptions"] && json["compilerOptions"]["outDir"];
+                if (outDir) {
+                    excludeSpecs.push(outDir);
+                }
+            }
+            if (fileNames === undefined && includeSpecs === undefined) {
+                includeSpecs = ["**/*"];
+            }
+            var result = matchFileNames(fileNames, includeSpecs, excludeSpecs, basePath, options, host, errors);
+            if (result.fileNames.length === 0 && !ts.hasProperty(json, "files") && resolutionStack.length === 0) {
+                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2, configFileName || "tsconfig.json", JSON.stringify(includeSpecs || []), JSON.stringify(excludeSpecs || [])));
+            }
+            return result;
+        }
+        var _b;
+    }
+    ts.parseJsonConfigFileContent = parseJsonConfigFileContent;
+    function convertCompileOnSaveOptionFromJson(jsonOption, basePath, errors) {
+        if (!ts.hasProperty(jsonOption, ts.compileOnSaveCommandLineOption.name)) {
+            return false;
+        }
+        var result = convertJsonOption(ts.compileOnSaveCommandLineOption, jsonOption["compileOnSave"], basePath, errors);
+        if (typeof result === "boolean" && result) {
+            return result;
+        }
+        return false;
+    }
+    ts.convertCompileOnSaveOptionFromJson = convertCompileOnSaveOptionFromJson;
+    function convertCompilerOptionsFromJson(jsonOptions, basePath, configFileName) {
+        var errors = [];
+        var options = convertCompilerOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName);
+        return { options: options, errors: errors };
+    }
+    ts.convertCompilerOptionsFromJson = convertCompilerOptionsFromJson;
+    function convertTypingOptionsFromJson(jsonOptions, basePath, configFileName) {
+        var errors = [];
+        var options = convertTypingOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName);
+        return { options: options, errors: errors };
+    }
+    ts.convertTypingOptionsFromJson = convertTypingOptionsFromJson;
+    function convertCompilerOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName) {
+        var options = ts.getBaseFileName(configFileName) === "jsconfig.json"
+            ? { allowJs: true, maxNodeModuleJsDepth: 2, allowSyntheticDefaultImports: true, skipLibCheck: true }
+            : {};
+        convertOptionsFromJson(ts.optionDeclarations, jsonOptions, basePath, options, ts.Diagnostics.Unknown_compiler_option_0, errors);
+        return options;
+    }
+    function convertTypingOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName) {
+        var options = { enableAutoDiscovery: ts.getBaseFileName(configFileName) === "jsconfig.json", include: [], exclude: [] };
+        convertOptionsFromJson(ts.typingOptionDeclarations, jsonOptions, basePath, options, ts.Diagnostics.Unknown_typing_option_0, errors);
+        return options;
+    }
+    function convertOptionsFromJson(optionDeclarations, jsonOptions, basePath, defaultOptions, diagnosticMessage, errors) {
+        if (!jsonOptions) {
+            return;
+        }
+        var optionNameMap = ts.arrayToMap(optionDeclarations, function (opt) { return opt.name; });
+        for (var id in jsonOptions) {
+            if (id in optionNameMap) {
+                var opt = optionNameMap[id];
+                defaultOptions[opt.name] = convertJsonOption(opt, jsonOptions[id], basePath, errors);
+            }
+            else {
+                errors.push(ts.createCompilerDiagnostic(diagnosticMessage, id));
+            }
+        }
+    }
+    function convertJsonOption(opt, value, basePath, errors) {
+        var optType = opt.type;
+        var expectedType = typeof optType === "string" ? optType : "string";
+        if (optType === "list" && ts.isArray(value)) {
+            return convertJsonOptionOfListType(opt, value, basePath, errors);
+        }
+        else if (typeof value === expectedType) {
+            if (typeof optType !== "string") {
+                return convertJsonOptionOfCustomType(opt, value, errors);
+            }
+            else {
+                if (opt.isFilePath) {
+                    value = ts.normalizePath(ts.combinePaths(basePath, value));
+                    if (value === "") {
+                        value = ".";
+                    }
+                }
+            }
+            return value;
+        }
+        else {
+            errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, opt.name, expectedType));
+        }
+    }
+    function convertJsonOptionOfCustomType(opt, value, errors) {
+        var key = value.toLowerCase();
+        if (key in opt.type) {
+            return opt.type[key];
+        }
+        else {
+            errors.push(createCompilerDiagnosticForInvalidCustomType(opt));
+        }
+    }
+    function convertJsonOptionOfListType(option, values, basePath, errors) {
+        return ts.filter(ts.map(values, function (v) { return convertJsonOption(option.element, v, basePath, errors); }), function (v) { return !!v; });
+    }
+    function trimString(s) {
+        return typeof s.trim === "function" ? s.trim() : s.replace(/^[\s]+|[\s]+$/g, "");
+    }
+    var invalidTrailingRecursionPattern = /(^|\/)\*\*\/?$/;
+    var invalidMultipleRecursionPatterns = /(^|\/)\*\*\/(.*\/)?\*\*($|\/)/;
+    var invalidDotDotAfterRecursiveWildcardPattern = /(^|\/)\*\*\/(.*\/)?\.\.($|\/)/;
+    var watchRecursivePattern = /\/[^/]*?[*?][^/]*\//;
+    var wildcardDirectoryPattern = /^[^*?]*(?=\/[^/]*[*?])/;
+    function matchFileNames(fileNames, include, exclude, basePath, options, host, errors) {
+        basePath = ts.normalizePath(basePath);
+        var keyMapper = host.useCaseSensitiveFileNames ? caseSensitiveKeyMapper : caseInsensitiveKeyMapper;
+        var literalFileMap = ts.createMap();
+        var wildcardFileMap = ts.createMap();
+        if (include) {
+            include = validateSpecs(include, errors, false);
+        }
+        if (exclude) {
+            exclude = validateSpecs(exclude, errors, true);
+        }
+        var wildcardDirectories = getWildcardDirectories(include, exclude, basePath, host.useCaseSensitiveFileNames);
+        var supportedExtensions = ts.getSupportedExtensions(options);
+        if (fileNames) {
+            for (var _i = 0, fileNames_1 = fileNames; _i < fileNames_1.length; _i++) {
+                var fileName = fileNames_1[_i];
+                var file = ts.combinePaths(basePath, fileName);
+                literalFileMap[keyMapper(file)] = file;
+            }
+        }
+        if (include && include.length > 0) {
+            for (var _a = 0, _b = host.readDirectory(basePath, supportedExtensions, exclude, include); _a < _b.length; _a++) {
+                var file = _b[_a];
+                if (hasFileWithHigherPriorityExtension(file, literalFileMap, wildcardFileMap, supportedExtensions, keyMapper)) {
+                    continue;
+                }
+                removeWildcardFilesWithLowerPriorityExtension(file, wildcardFileMap, supportedExtensions, keyMapper);
+                var key = keyMapper(file);
+                if (!(key in literalFileMap) && !(key in wildcardFileMap)) {
+                    wildcardFileMap[key] = file;
+                }
+            }
+        }
+        var literalFiles = ts.reduceProperties(literalFileMap, addFileToOutput, []);
+        var wildcardFiles = ts.reduceProperties(wildcardFileMap, addFileToOutput, []);
+        wildcardFiles.sort(host.useCaseSensitiveFileNames ? ts.compareStrings : ts.compareStringsCaseInsensitive);
+        return {
+            fileNames: literalFiles.concat(wildcardFiles),
+            wildcardDirectories: wildcardDirectories
+        };
+    }
+    function validateSpecs(specs, errors, allowTrailingRecursion) {
+        var validSpecs = [];
+        for (var _i = 0, specs_2 = specs; _i < specs_2.length; _i++) {
+            var spec = specs_2[_i];
+            if (!allowTrailingRecursion && invalidTrailingRecursionPattern.test(spec)) {
+                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0, spec));
+            }
+            else if (invalidMultipleRecursionPatterns.test(spec)) {
+                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.File_specification_cannot_contain_multiple_recursive_directory_wildcards_Asterisk_Asterisk_Colon_0, spec));
+            }
+            else if (invalidDotDotAfterRecursiveWildcardPattern.test(spec)) {
+                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0, spec));
+            }
+            else {
+                validSpecs.push(spec);
+            }
+        }
+        return validSpecs;
+    }
+    function getWildcardDirectories(include, exclude, path, useCaseSensitiveFileNames) {
+        var rawExcludeRegex = ts.getRegularExpressionForWildcard(exclude, path, "exclude");
+        var excludeRegex = rawExcludeRegex && new RegExp(rawExcludeRegex, useCaseSensitiveFileNames ? "" : "i");
+        var wildcardDirectories = ts.createMap();
+        if (include !== undefined) {
+            var recursiveKeys = [];
+            for (var _i = 0, include_1 = include; _i < include_1.length; _i++) {
+                var file = include_1[_i];
+                var spec = ts.normalizePath(ts.combinePaths(path, file));
+                if (excludeRegex && excludeRegex.test(spec)) {
+                    continue;
+                }
+                var match = getWildcardDirectoryFromSpec(spec, useCaseSensitiveFileNames);
+                if (match) {
+                    var key = match.key, flags = match.flags;
+                    var existingFlags = wildcardDirectories[key];
+                    if (existingFlags === undefined || existingFlags < flags) {
+                        wildcardDirectories[key] = flags;
+                        if (flags === 1) {
+                            recursiveKeys.push(key);
+                        }
+                    }
+                }
+            }
+            for (var key in wildcardDirectories) {
+                for (var _a = 0, recursiveKeys_1 = recursiveKeys; _a < recursiveKeys_1.length; _a++) {
+                    var recursiveKey = recursiveKeys_1[_a];
+                    if (key !== recursiveKey && ts.containsPath(recursiveKey, key, path, !useCaseSensitiveFileNames)) {
+                        delete wildcardDirectories[key];
+                    }
+                }
+            }
+        }
+        return wildcardDirectories;
+    }
+    function getWildcardDirectoryFromSpec(spec, useCaseSensitiveFileNames) {
+        var match = wildcardDirectoryPattern.exec(spec);
+        if (match) {
+            return {
+                key: useCaseSensitiveFileNames ? match[0] : match[0].toLowerCase(),
+                flags: watchRecursivePattern.test(spec) ? 1 : 0
+            };
+        }
+        if (ts.isImplicitGlob(spec)) {
+            return { key: spec, flags: 1 };
+        }
+        return undefined;
+    }
+    function hasFileWithHigherPriorityExtension(file, literalFiles, wildcardFiles, extensions, keyMapper) {
+        var extensionPriority = ts.getExtensionPriority(file, extensions);
+        var adjustedExtensionPriority = ts.adjustExtensionPriority(extensionPriority);
+        for (var i = 0; i < adjustedExtensionPriority; i++) {
+            var higherPriorityExtension = extensions[i];
+            var higherPriorityPath = keyMapper(ts.changeExtension(file, higherPriorityExtension));
+            if (higherPriorityPath in literalFiles || higherPriorityPath in wildcardFiles) {
+                return true;
+            }
+        }
+        return false;
+    }
+    function removeWildcardFilesWithLowerPriorityExtension(file, wildcardFiles, extensions, keyMapper) {
+        var extensionPriority = ts.getExtensionPriority(file, extensions);
+        var nextExtensionPriority = ts.getNextLowestExtensionPriority(extensionPriority);
+        for (var i = nextExtensionPriority; i < extensions.length; i++) {
+            var lowerPriorityExtension = extensions[i];
+            var lowerPriorityPath = keyMapper(ts.changeExtension(file, lowerPriorityExtension));
+            delete wildcardFiles[lowerPriorityPath];
+        }
+    }
+    function addFileToOutput(output, file) {
+        output.push(file);
+        return output;
+    }
+    function caseSensitiveKeyMapper(key) {
+        return key;
+    }
+    function caseInsensitiveKeyMapper(key) {
+        return key.toLowerCase();
+    }
+})(ts || (ts = {}));
+var ts;
+(function (ts) {
+    var JsTyping;
+    (function (JsTyping) {
+        ;
+        ;
+        var safeList;
+        var EmptySafeList = ts.createMap();
+        JsTyping.nodeCoreModuleList = [
+            "buffer", "querystring", "events", "http", "cluster",
+            "zlib", "os", "https", "punycode", "repl", "readline",
+            "vm", "child_process", "url", "dns", "net",
+            "dgram", "fs", "path", "string_decoder", "tls",
+            "crypto", "stream", "util", "assert", "tty", "domain",
+            "constants", "process", "v8", "timers", "console"
+        ];
+        var nodeCoreModules = ts.arrayToMap(JsTyping.nodeCoreModuleList, function (x) { return x; });
+        function discoverTypings(host, fileNames, projectRootPath, safeListPath, packageNameToTypingLocation, typingOptions, unresolvedImports) {
+            var inferredTypings = ts.createMap();
+            if (!typingOptions || !typingOptions.enableAutoDiscovery) {
+                return { cachedTypingPaths: [], newTypingNames: [], filesToWatch: [] };
+            }
+            fileNames = ts.filter(ts.map(fileNames, ts.normalizePath), function (f) {
+                var kind = ts.ensureScriptKind(f, ts.getScriptKindFromFileName(f));
+                return kind === 1 || kind === 2;
+            });
+            if (!safeList) {
+                var result = ts.readConfigFile(safeListPath, function (path) { return host.readFile(path); });
+                safeList = result.config ? ts.createMap(result.config) : EmptySafeList;
+            }
+            var filesToWatch = [];
+            var searchDirs = [];
+            var exclude = [];
+            mergeTypings(typingOptions.include);
+            exclude = typingOptions.exclude || [];
+            var possibleSearchDirs = ts.map(fileNames, ts.getDirectoryPath);
+            if (projectRootPath) {
+                possibleSearchDirs.push(projectRootPath);
+            }
+            searchDirs = ts.deduplicate(possibleSearchDirs);
+            for (var _i = 0, searchDirs_1 = searchDirs; _i < searchDirs_1.length; _i++) {
+                var searchDir = searchDirs_1[_i];
+                var packageJsonPath = ts.combinePaths(searchDir, "package.json");
+                getTypingNamesFromJson(packageJsonPath, filesToWatch);
+                var bowerJsonPath = ts.combinePaths(searchDir, "bower.json");
+                getTypingNamesFromJson(bowerJsonPath, filesToWatch);
+                var nodeModulesPath = ts.combinePaths(searchDir, "node_modules");
+                getTypingNamesFromNodeModuleFolder(nodeModulesPath);
+            }
+            getTypingNamesFromSourceFileNames(fileNames);
+            if (unresolvedImports) {
+                for (var _a = 0, unresolvedImports_1 = unresolvedImports; _a < unresolvedImports_1.length; _a++) {
+                    var moduleId = unresolvedImports_1[_a];
+                    var typingName = moduleId in nodeCoreModules ? "node" : moduleId;
+                    if (!(typingName in inferredTypings)) {
+                        inferredTypings[typingName] = undefined;
+                    }
+                }
+            }
+            for (var name_6 in packageNameToTypingLocation) {
+                if (name_6 in inferredTypings && !inferredTypings[name_6]) {
+                    inferredTypings[name_6] = packageNameToTypingLocation[name_6];
+                }
+            }
+            for (var _b = 0, exclude_1 = exclude; _b < exclude_1.length; _b++) {
+                var excludeTypingName = exclude_1[_b];
+                delete inferredTypings[excludeTypingName];
+            }
+            var newTypingNames = [];
+            var cachedTypingPaths = [];
+            for (var typing in inferredTypings) {
+                if (inferredTypings[typing] !== undefined) {
+                    cachedTypingPaths.push(inferredTypings[typing]);
+                }
+                else {
+                    newTypingNames.push(typing);
+                }
+            }
+            return { cachedTypingPaths: cachedTypingPaths, newTypingNames: newTypingNames, filesToWatch: filesToWatch };
+            function mergeTypings(typingNames) {
+                if (!typingNames) {
+                    return;
+                }
+                for (var _i = 0, typingNames_1 = typingNames; _i < typingNames_1.length; _i++) {
+                    var typing = typingNames_1[_i];
+                    if (!(typing in inferredTypings)) {
+                        inferredTypings[typing] = undefined;
+                    }
+                }
+            }
+            function getTypingNamesFromJson(jsonPath, filesToWatch) {
+                if (host.fileExists(jsonPath)) {
+                    filesToWatch.push(jsonPath);
+                }
+                var result = ts.readConfigFile(jsonPath, function (path) { return host.readFile(path); });
+                if (result.config) {
+                    var jsonConfig = result.config;
+                    if (jsonConfig.dependencies) {
+                        mergeTypings(ts.getOwnKeys(jsonConfig.dependencies));
+                    }
+                    if (jsonConfig.devDependencies) {
+                        mergeTypings(ts.getOwnKeys(jsonConfig.devDependencies));
+                    }
+                    if (jsonConfig.optionalDependencies) {
+                        mergeTypings(ts.getOwnKeys(jsonConfig.optionalDependencies));
+                    }
+                    if (jsonConfig.peerDependencies) {
+                        mergeTypings(ts.getOwnKeys(jsonConfig.peerDependencies));
+                    }
+                }
+            }
+            function getTypingNamesFromSourceFileNames(fileNames) {
+                var jsFileNames = ts.filter(fileNames, ts.hasJavaScriptFileExtension);
+                var inferredTypingNames = ts.map(jsFileNames, function (f) { return ts.removeFileExtension(ts.getBaseFileName(f.toLowerCase())); });
+                var cleanedTypingNames = ts.map(inferredTypingNames, function (f) { return f.replace(/((?:\.|-)min(?=\.|$))|((?:-|\.)\d+)/g, ""); });
+                if (safeList !== EmptySafeList) {
+                    mergeTypings(ts.filter(cleanedTypingNames, function (f) { return f in safeList; }));
+                }
+                var hasJsxFile = ts.forEach(fileNames, function (f) { return ts.ensureScriptKind(f, ts.getScriptKindFromFileName(f)) === 2; });
+                if (hasJsxFile) {
+                    mergeTypings(["react"]);
+                }
+            }
+            function getTypingNamesFromNodeModuleFolder(nodeModulesPath) {
+                if (!host.directoryExists(nodeModulesPath)) {
+                    return;
+                }
+                var typingNames = [];
+                var fileNames = host.readDirectory(nodeModulesPath, [".json"], undefined, undefined, 2);
+                for (var _i = 0, fileNames_2 = fileNames; _i < fileNames_2.length; _i++) {
+                    var fileName = fileNames_2[_i];
+                    var normalizedFileName = ts.normalizePath(fileName);
+                    if (ts.getBaseFileName(normalizedFileName) !== "package.json") {
+                        continue;
+                    }
+                    var result = ts.readConfigFile(normalizedFileName, function (path) { return host.readFile(path); });
+                    if (!result.config) {
+                        continue;
+                    }
+                    var packageJson = result.config;
+                    if (packageJson._requiredBy &&
+                        ts.filter(packageJson._requiredBy, function (r) { return r[0] === "#" || r === "/"; }).length === 0) {
+                        continue;
+                    }
+                    if (!packageJson.name) {
+                        continue;
+                    }
+                    if (packageJson.typings) {
+                        var absolutePath = ts.getNormalizedAbsolutePath(packageJson.typings, ts.getDirectoryPath(normalizedFileName));
+                        inferredTypings[packageJson.name] = absolutePath;
+                    }
+                    else {
+                        typingNames.push(packageJson.name);
+                    }
+                }
+                mergeTypings(typingNames);
+            }
+        }
+        JsTyping.discoverTypings = discoverTypings;
+    })(JsTyping = ts.JsTyping || (ts.JsTyping = {}));
+})(ts || (ts = {}));
+var ts;
+(function (ts) {
+    var server;
+    (function (server) {
+        server.ActionSet = "action::set";
+        server.ActionInvalidate = "action::invalidate";
+        server.EventInstall = "event::install";
+        var Arguments;
+        (function (Arguments) {
+            Arguments.GlobalCacheLocation = "--globalTypingsCacheLocation";
+            Arguments.LogFile = "--logFile";
+            Arguments.EnableTelemetry = "--enableTelemetry";
+        })(Arguments = server.Arguments || (server.Arguments = {}));
+        function hasArgument(argumentName) {
+            return ts.sys.args.indexOf(argumentName) >= 0;
+        }
+        server.hasArgument = hasArgument;
+        function findArgument(argumentName) {
+            var index = ts.sys.args.indexOf(argumentName);
+            return index >= 0 && index < ts.sys.args.length - 1
+                ? ts.sys.args[index + 1]
+                : undefined;
+        }
+        server.findArgument = findArgument;
+    })(server = ts.server || (ts.server = {}));
+})(ts || (ts = {}));
+var ts;
+(function (ts) {
+    var server;
+    (function (server) {
+        var LogLevel;
+        (function (LogLevel) {
+            LogLevel[LogLevel["terse"] = 0] = "terse";
+            LogLevel[LogLevel["normal"] = 1] = "normal";
+            LogLevel[LogLevel["requestTime"] = 2] = "requestTime";
+            LogLevel[LogLevel["verbose"] = 3] = "verbose";
+        })(LogLevel = server.LogLevel || (server.LogLevel = {}));
+        server.emptyArray = [];
+        var Msg;
+        (function (Msg) {
+            Msg.Err = "Err";
+            Msg.Info = "Info";
+            Msg.Perf = "Perf";
+        })(Msg = server.Msg || (server.Msg = {}));
+        function getProjectRootPath(project) {
+            switch (project.projectKind) {
+                case server.ProjectKind.Configured:
+                    return ts.getDirectoryPath(project.getProjectName());
+                case server.ProjectKind.Inferred:
+                    return "";
+                case server.ProjectKind.External:
+                    var projectName = ts.normalizeSlashes(project.getProjectName());
+                    return project.projectService.host.fileExists(projectName) ? ts.getDirectoryPath(projectName) : projectName;
+            }
+        }
+        function createInstallTypingsRequest(project, typingOptions, unresolvedImports, cachePath) {
+            return {
+                projectName: project.getProjectName(),
+                fileNames: project.getFileNames(true),
+                compilerOptions: project.getCompilerOptions(),
+                typingOptions: typingOptions,
+                unresolvedImports: unresolvedImports,
+                projectRootPath: getProjectRootPath(project),
+                cachePath: cachePath,
+                kind: "discover"
+            };
+        }
+        server.createInstallTypingsRequest = createInstallTypingsRequest;
+        var Errors;
+        (function (Errors) {
+            function ThrowNoProject() {
+                throw new Error("No Project.");
+            }
+            Errors.ThrowNoProject = ThrowNoProject;
+            function ThrowProjectLanguageServiceDisabled() {
+                throw new Error("The project's language service is disabled.");
+            }
+            Errors.ThrowProjectLanguageServiceDisabled = ThrowProjectLanguageServiceDisabled;
+            function ThrowProjectDoesNotContainDocument(fileName, project) {
+                throw new Error("Project '" + project.getProjectName() + "' does not contain document '" + fileName + "'");
+            }
+            Errors.ThrowProjectDoesNotContainDocument = ThrowProjectDoesNotContainDocument;
+        })(Errors = server.Errors || (server.Errors = {}));
+        function getDefaultFormatCodeSettings(host) {
+            return {
+                indentSize: 4,
+                tabSize: 4,
+                newLineCharacter: host.newLine || "\n",
+                convertTabsToSpaces: true,
+                indentStyle: ts.IndentStyle.Smart,
+                insertSpaceAfterCommaDelimiter: true,
+                insertSpaceAfterSemicolonInForStatements: true,
+                insertSpaceBeforeAndAfterBinaryOperators: true,
+                insertSpaceAfterKeywordsInControlFlowStatements: true,
+                insertSpaceAfterFunctionKeywordForAnonymousFunctions: false,
+                insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: false,
+                insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: false,
+                insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces: false,
+                insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces: false,
+                placeOpenBraceOnNewLineForFunctions: false,
+                placeOpenBraceOnNewLineForControlBlocks: false,
+            };
+        }
+        server.getDefaultFormatCodeSettings = getDefaultFormatCodeSettings;
+        function mergeMaps(target, source) {
+            for (var key in source) {
+                if (ts.hasProperty(source, key)) {
+                    target[key] = source[key];
+                }
+            }
+        }
+        server.mergeMaps = mergeMaps;
+        function removeItemFromSet(items, itemToRemove) {
+            if (items.length === 0) {
+                return;
+            }
+            var index = items.indexOf(itemToRemove);
+            if (index < 0) {
+                return;
+            }
+            if (index === items.length - 1) {
+                items.pop();
+            }
+            else {
+                items[index] = items.pop();
+            }
+        }
+        server.removeItemFromSet = removeItemFromSet;
+        function toNormalizedPath(fileName) {
+            return ts.normalizePath(fileName);
+        }
+        server.toNormalizedPath = toNormalizedPath;
+        function normalizedPathToPath(normalizedPath, currentDirectory, getCanonicalFileName) {
+            var f = ts.isRootedDiskPath(normalizedPath) ? normalizedPath : ts.getNormalizedAbsolutePath(normalizedPath, currentDirectory);
+            return getCanonicalFileName(f);
+        }
+        server.normalizedPathToPath = normalizedPathToPath;
+        function asNormalizedPath(fileName) {
+            return fileName;
+        }
+        server.asNormalizedPath = asNormalizedPath;
+        function createNormalizedPathMap() {
+            var map = Object.create(null);
+            return {
+                get: function (path) {
+                    return map[path];
+                },
+                set: function (path, value) {
+                    map[path] = value;
+                },
+                contains: function (path) {
+                    return ts.hasProperty(map, path);
+                },
+                remove: function (path) {
+                    delete map[path];
+                }
+            };
+        }
+        server.createNormalizedPathMap = createNormalizedPathMap;
+        function throwLanguageServiceIsDisabledError() {
+            throw new Error("LanguageService is disabled");
+        }
+        server.nullLanguageService = {
+            cleanupSemanticCache: throwLanguageServiceIsDisabledError,
+            getSyntacticDiagnostics: throwLanguageServiceIsDisabledError,
+            getSemanticDiagnostics: throwLanguageServiceIsDisabledError,
+            getCompilerOptionsDiagnostics: throwLanguageServiceIsDisabledError,
+            getSyntacticClassifications: throwLanguageServiceIsDisabledError,
+            getEncodedSyntacticClassifications: throwLanguageServiceIsDisabledError,
+            getSemanticClassifications: throwLanguageServiceIsDisabledError,
+            getEncodedSemanticClassifications: throwLanguageServiceIsDisabledError,
+            getCompletionsAtPosition: throwLanguageServiceIsDisabledError,
+            findReferences: throwLanguageServiceIsDisabledError,
+            getCompletionEntryDetails: throwLanguageServiceIsDisabledError,
+            getQuickInfoAtPosition: throwLanguageServiceIsDisabledError,
+            findRenameLocations: throwLanguageServiceIsDisabledError,
+            getNameOrDottedNameSpan: throwLanguageServiceIsDisabledError,
+            getBreakpointStatementAtPosition: throwLanguageServiceIsDisabledError,
+            getBraceMatchingAtPosition: throwLanguageServiceIsDisabledError,
+            getSignatureHelpItems: throwLanguageServiceIsDisabledError,
+            getDefinitionAtPosition: throwLanguageServiceIsDisabledError,
+            getRenameInfo: throwLanguageServiceIsDisabledError,
+            getTypeDefinitionAtPosition: throwLanguageServiceIsDisabledError,
+            getReferencesAtPosition: throwLanguageServiceIsDisabledError,
+            getDocumentHighlights: throwLanguageServiceIsDisabledError,
+            getOccurrencesAtPosition: throwLanguageServiceIsDisabledError,
+            getNavigateToItems: throwLanguageServiceIsDisabledError,
+            getNavigationBarItems: throwLanguageServiceIsDisabledError,
+            getNavigationTree: throwLanguageServiceIsDisabledError,
+            getOutliningSpans: throwLanguageServiceIsDisabledError,
+            getTodoComments: throwLanguageServiceIsDisabledError,
+            getIndentationAtPosition: throwLanguageServiceIsDisabledError,
+            getFormattingEditsForRange: throwLanguageServiceIsDisabledError,
+            getFormattingEditsForDocument: throwLanguageServiceIsDisabledError,
+            getFormattingEditsAfterKeystroke: throwLanguageServiceIsDisabledError,
+            getDocCommentTemplateAtPosition: throwLanguageServiceIsDisabledError,
+            isValidBraceCompletionAtPosition: throwLanguageServiceIsDisabledError,
+            getEmitOutput: throwLanguageServiceIsDisabledError,
+            getProgram: throwLanguageServiceIsDisabledError,
+            getNonBoundSourceFile: throwLanguageServiceIsDisabledError,
+            dispose: throwLanguageServiceIsDisabledError,
+            getCompletionEntrySymbol: throwLanguageServiceIsDisabledError,
+            getImplementationAtPosition: throwLanguageServiceIsDisabledError,
+            getSourceFile: throwLanguageServiceIsDisabledError,
+            getCodeFixesAtPosition: throwLanguageServiceIsDisabledError
+        };
+        server.nullLanguageServiceHost = {
+            setCompilationSettings: function () { return undefined; },
+            notifyFileRemoved: function () { return undefined; },
+            startRecordingFilesWithChangedResolutions: function () { return undefined; },
+            finishRecordingFilesWithChangedResolutions: function () { return undefined; }
+        };
+        function isInferredProjectName(name) {
+            return /dev\/null\/inferredProject\d+\*/.test(name);
+        }
+        server.isInferredProjectName = isInferredProjectName;
+        function makeInferredProjectName(counter) {
+            return "/dev/null/inferredProject" + counter + "*";
+        }
+        server.makeInferredProjectName = makeInferredProjectName;
+        function toSortedReadonlyArray(arr) {
+            arr.sort();
+            return arr;
+        }
+        server.toSortedReadonlyArray = toSortedReadonlyArray;
+        var ThrottledOperations = (function () {
+            function ThrottledOperations(host) {
+                this.host = host;
+                this.pendingTimeouts = ts.createMap();
+            }
+            ThrottledOperations.prototype.schedule = function (operationId, delay, cb) {
+                if (ts.hasProperty(this.pendingTimeouts, operationId)) {
+                    this.host.clearTimeout(this.pendingTimeouts[operationId]);
+                }
+                this.pendingTimeouts[operationId] = this.host.setTimeout(ThrottledOperations.run, delay, this, operationId, cb);
+            };
+            ThrottledOperations.run = function (self, operationId, cb) {
+                delete self.pendingTimeouts[operationId];
+                cb();
+            };
+            return ThrottledOperations;
+        }());
+        server.ThrottledOperations = ThrottledOperations;
+        var GcTimer = (function () {
+            function GcTimer(host, delay, logger) {
+                this.host = host;
+                this.delay = delay;
+                this.logger = logger;
+            }
+            GcTimer.prototype.scheduleCollect = function () {
+                if (!this.host.gc || this.timerId != undefined) {
+                    return;
+                }
+                this.timerId = this.host.setTimeout(GcTimer.run, this.delay, this);
+            };
+            GcTimer.run = function (self) {
+                self.timerId = undefined;
+                var log = self.logger.hasLevel(LogLevel.requestTime);
+                var before = log && self.host.getMemoryUsage();
+                self.host.gc();
+                if (log) {
+                    var after = self.host.getMemoryUsage();
+                    self.logger.perftrc("GC::before " + before + ", after " + after);
+                }
+            };
+            return GcTimer;
+        }());
+        server.GcTimer = GcTimer;
+    })(server = ts.server || (ts.server = {}));
+})(ts || (ts = {}));
+var ts;
+(function (ts) {
+    function trace(host) {
+        host.trace(ts.formatMessage.apply(undefined, arguments));
+    }
+    ts.trace = trace;
+    function isTraceEnabled(compilerOptions, host) {
+        return compilerOptions.traceResolution && host.trace !== undefined;
+    }
+    ts.isTraceEnabled = isTraceEnabled;
+    function resolvedTypeScriptOnly(resolved) {
+        if (!resolved) {
+            return undefined;
+        }
+        ts.Debug.assert(ts.extensionIsTypeScript(resolved.extension));
+        return resolved.path;
+    }
+    function resolvedFromAnyFile(path) {
+        return { path: path, extension: ts.extensionFromPath(path) };
+    }
+    function resolvedModuleFromResolved(_a, isExternalLibraryImport) {
+        var path = _a.path, extension = _a.extension;
+        return { resolvedFileName: path, extension: extension, isExternalLibraryImport: isExternalLibraryImport };
+    }
+    function createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations) {
+        return { resolvedModule: resolved && resolvedModuleFromResolved(resolved, isExternalLibraryImport), failedLookupLocations: failedLookupLocations };
+    }
+    function moduleHasNonRelativeName(moduleName) {
+        return !(ts.isRootedDiskPath(moduleName) || ts.isExternalModuleNameRelative(moduleName));
+    }
+    function tryReadTypesSection(extensions, packageJsonPath, baseDirectory, state) {
+        var jsonContent = readJson(packageJsonPath, state.host);
+        switch (extensions) {
+            case 2:
+            case 0:
+                return tryReadFromField("typings") || tryReadFromField("types");
+            case 1:
+                if (typeof jsonContent.main === "string") {
+                    if (state.traceEnabled) {
+                        trace(state.host, ts.Diagnostics.No_types_specified_in_package_json_so_returning_main_value_of_0, jsonContent.main);
+                    }
+                    return ts.normalizePath(ts.combinePaths(baseDirectory, jsonContent.main));
+                }
+                return undefined;
+        }
+        function tryReadFromField(fieldName) {
+            if (ts.hasProperty(jsonContent, fieldName)) {
+                var typesFile = jsonContent[fieldName];
+                if (typeof typesFile === "string") {
+                    var typesFilePath = ts.normalizePath(ts.combinePaths(baseDirectory, typesFile));
+                    if (state.traceEnabled) {
+                        trace(state.host, ts.Diagnostics.package_json_has_0_field_1_that_references_2, fieldName, typesFile, typesFilePath);
+                    }
+                    return typesFilePath;
+                }
+                else {
+                    if (state.traceEnabled) {
+                        trace(state.host, ts.Diagnostics.Expected_type_of_0_field_in_package_json_to_be_string_got_1, fieldName, typeof typesFile);
+                    }
+                }
+            }
+        }
+    }
+    function readJson(path, host) {
+        try {
+            var jsonText = host.readFile(path);
+            return jsonText ? JSON.parse(jsonText) : {};
+        }
+        catch (e) {
+            return {};
+        }
+    }
+    function getEffectiveTypeRoots(options, host) {
+        if (options.typeRoots) {
+            return options.typeRoots;
+        }
+        var currentDirectory;
+        if (options.configFilePath) {
+            currentDirectory = ts.getDirectoryPath(options.configFilePath);
+        }
+        else if (host.getCurrentDirectory) {
+            currentDirectory = host.getCurrentDirectory();
+        }
+        if (currentDirectory !== undefined) {
+            return getDefaultTypeRoots(currentDirectory, host);
+        }
+    }
+    ts.getEffectiveTypeRoots = getEffectiveTypeRoots;
+    function getDefaultTypeRoots(currentDirectory, host) {
+        if (!host.directoryExists) {
+            return [ts.combinePaths(currentDirectory, nodeModulesAtTypes)];
+        }
+        var typeRoots;
+        forEachAncestorDirectory(currentDirectory, function (directory) {
+            var atTypes = ts.combinePaths(directory, nodeModulesAtTypes);
+            if (host.directoryExists(atTypes)) {
+                (typeRoots || (typeRoots = [])).push(atTypes);
+            }
+        });
+        return typeRoots;
+    }
+    var nodeModulesAtTypes = ts.combinePaths("node_modules", "@types");
+    function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFile, options, host) {
+        var traceEnabled = isTraceEnabled(options, host);
+        var moduleResolutionState = {
+            compilerOptions: options,
+            host: host,
+            traceEnabled: traceEnabled
+        };
+        var typeRoots = getEffectiveTypeRoots(options, host);
+        if (traceEnabled) {
+            if (containingFile === undefined) {
+                if (typeRoots === undefined) {
+                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_not_set_root_directory_not_set, typeReferenceDirectiveName);
+                }
+                else {
+                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_not_set_root_directory_1, typeReferenceDirectiveName, typeRoots);
+                }
+            }
+            else {
+                if (typeRoots === undefined) {
+                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_1_root_directory_not_set, typeReferenceDirectiveName, containingFile);
+                }
+                else {
+                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_1_root_directory_2, typeReferenceDirectiveName, containingFile, typeRoots);
+                }
+            }
+        }
+        var failedLookupLocations = [];
+        var resolved = primaryLookup();
+        var primary = true;
+        if (!resolved) {
+            resolved = secondaryLookup();
+            primary = false;
+        }
+        var resolvedTypeReferenceDirective;
+        if (resolved) {
+            resolved = realpath(resolved, host, traceEnabled);
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolved, primary);
+            }
+            resolvedTypeReferenceDirective = { primary: primary, resolvedFileName: resolved };
+        }
+        return { resolvedTypeReferenceDirective: resolvedTypeReferenceDirective, failedLookupLocations: failedLookupLocations };
+        function primaryLookup() {
+            if (typeRoots && typeRoots.length) {
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Resolving_with_primary_search_path_0, typeRoots.join(", "));
+                }
+                return ts.forEach(typeRoots, function (typeRoot) {
+                    var candidate = ts.combinePaths(typeRoot, typeReferenceDirectiveName);
+                    var candidateDirectory = ts.getDirectoryPath(candidate);
+                    return resolvedTypeScriptOnly(loadNodeModuleFromDirectory(2, candidate, failedLookupLocations, !directoryProbablyExists(candidateDirectory, host), moduleResolutionState));
+                });
+            }
+            else {
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Root_directory_cannot_be_determined_skipping_primary_search_paths);
+                }
+            }
+        }
+        function secondaryLookup() {
+            var resolvedFile;
+            var initialLocationForSecondaryLookup = containingFile && ts.getDirectoryPath(containingFile);
+            if (initialLocationForSecondaryLookup !== undefined) {
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Looking_up_in_node_modules_folder_initial_location_0, initialLocationForSecondaryLookup);
+                }
+                resolvedFile = resolvedTypeScriptOnly(loadModuleFromNodeModules(2, typeReferenceDirectiveName, initialLocationForSecondaryLookup, failedLookupLocations, moduleResolutionState));
+                if (!resolvedFile && traceEnabled) {
+                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_not_resolved, typeReferenceDirectiveName);
+                }
+                return resolvedFile;
+            }
+            else {
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_modules_folder);
+                }
+            }
+        }
+    }
+    ts.resolveTypeReferenceDirective = resolveTypeReferenceDirective;
+    function getAutomaticTypeDirectiveNames(options, host) {
+        if (options.types) {
+            return options.types;
+        }
+        var result = [];
+        if (host.directoryExists && host.getDirectories) {
+            var typeRoots = getEffectiveTypeRoots(options, host);
+            if (typeRoots) {
+                for (var _i = 0, typeRoots_1 = typeRoots; _i < typeRoots_1.length; _i++) {
+                    var root = typeRoots_1[_i];
+                    if (host.directoryExists(root)) {
+                        for (var _a = 0, _b = host.getDirectories(root); _a < _b.length; _a++) {
+                            var typeDirectivePath = _b[_a];
+                            var normalized = ts.normalizePath(typeDirectivePath);
+                            var packageJsonPath = pathToPackageJson(ts.combinePaths(root, normalized));
+                            var isNotNeededPackage = host.fileExists(packageJsonPath) && readJson(packageJsonPath, host).typings === null;
+                            if (!isNotNeededPackage) {
+                                result.push(ts.getBaseFileName(normalized));
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return result;
+    }
+    ts.getAutomaticTypeDirectiveNames = getAutomaticTypeDirectiveNames;
+    function resolveModuleName(moduleName, containingFile, compilerOptions, host) {
+        var traceEnabled = isTraceEnabled(compilerOptions, host);
+        if (traceEnabled) {
+            trace(host, ts.Diagnostics.Resolving_module_0_from_1, moduleName, containingFile);
+        }
+        var moduleResolution = compilerOptions.moduleResolution;
+        if (moduleResolution === undefined) {
+            moduleResolution = ts.getEmitModuleKind(compilerOptions) === ts.ModuleKind.CommonJS ? ts.ModuleResolutionKind.NodeJs : ts.ModuleResolutionKind.Classic;
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Module_resolution_kind_is_not_specified_using_0, ts.ModuleResolutionKind[moduleResolution]);
+            }
+        }
+        else {
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Explicitly_specified_module_resolution_kind_Colon_0, ts.ModuleResolutionKind[moduleResolution]);
+            }
+        }
+        var result;
+        switch (moduleResolution) {
+            case ts.ModuleResolutionKind.NodeJs:
+                result = nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host);
+                break;
+            case ts.ModuleResolutionKind.Classic:
+                result = classicNameResolver(moduleName, containingFile, compilerOptions, host);
+                break;
+        }
+        if (traceEnabled) {
+            if (result.resolvedModule) {
+                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);
+            }
+        }
+        return result;
+    }
+    ts.resolveModuleName = resolveModuleName;
+    function tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, loader, failedLookupLocations, state) {
+        if (moduleHasNonRelativeName(moduleName)) {
+            return tryLoadModuleUsingBaseUrl(extensions, moduleName, loader, failedLookupLocations, state);
+        }
+        else {
+            return tryLoadModuleUsingRootDirs(extensions, moduleName, containingDirectory, loader, failedLookupLocations, state);
+        }
+    }
+    function tryLoadModuleUsingRootDirs(extensions, moduleName, containingDirectory, loader, failedLookupLocations, state) {
+        if (!state.compilerOptions.rootDirs) {
+            return undefined;
+        }
+        if (state.traceEnabled) {
+            trace(state.host, ts.Diagnostics.rootDirs_option_is_set_using_it_to_resolve_relative_module_name_0, moduleName);
+        }
+        var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
+        var matchedRootDir;
+        var matchedNormalizedPrefix;
+        for (var _i = 0, _a = state.compilerOptions.rootDirs; _i < _a.length; _i++) {
+            var rootDir = _a[_i];
+            var normalizedRoot = ts.normalizePath(rootDir);
+            if (!ts.endsWith(normalizedRoot, ts.directorySeparator)) {
+                normalizedRoot += ts.directorySeparator;
+            }
+            var isLongestMatchingPrefix = ts.startsWith(candidate, normalizedRoot) &&
+                (matchedNormalizedPrefix === undefined || matchedNormalizedPrefix.length < normalizedRoot.length);
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Checking_if_0_is_the_longest_matching_prefix_for_1_2, normalizedRoot, candidate, isLongestMatchingPrefix);
+            }
+            if (isLongestMatchingPrefix) {
+                matchedNormalizedPrefix = normalizedRoot;
+                matchedRootDir = rootDir;
+            }
+        }
+        if (matchedNormalizedPrefix) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Longest_matching_prefix_for_0_is_1, candidate, matchedNormalizedPrefix);
+            }
+            var suffix = candidate.substr(matchedNormalizedPrefix.length);
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Loading_0_from_the_root_dir_1_candidate_location_2, suffix, matchedNormalizedPrefix, candidate);
+            }
+            var resolvedFileName = loader(extensions, candidate, failedLookupLocations, !directoryProbablyExists(containingDirectory, state.host), state);
+            if (resolvedFileName) {
+                return resolvedFileName;
+            }
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Trying_other_entries_in_rootDirs);
+            }
+            for (var _b = 0, _c = state.compilerOptions.rootDirs; _b < _c.length; _b++) {
+                var rootDir = _c[_b];
+                if (rootDir === matchedRootDir) {
+                    continue;
+                }
+                var candidate_1 = ts.combinePaths(ts.normalizePath(rootDir), suffix);
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.Loading_0_from_the_root_dir_1_candidate_location_2, suffix, rootDir, candidate_1);
+                }
+                var baseDirectory = ts.getDirectoryPath(candidate_1);
+                var resolvedFileName_1 = loader(extensions, candidate_1, failedLookupLocations, !directoryProbablyExists(baseDirectory, state.host), state);
+                if (resolvedFileName_1) {
+                    return resolvedFileName_1;
+                }
+            }
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Module_resolution_using_rootDirs_has_failed);
+            }
+        }
+        return undefined;
+    }
+    function tryLoadModuleUsingBaseUrl(extensions, moduleName, loader, failedLookupLocations, state) {
+        if (!state.compilerOptions.baseUrl) {
+            return undefined;
+        }
+        if (state.traceEnabled) {
+            trace(state.host, ts.Diagnostics.baseUrl_option_is_set_to_0_using_this_value_to_resolve_non_relative_module_name_1, state.compilerOptions.baseUrl, moduleName);
+        }
+        var matchedPattern = undefined;
+        if (state.compilerOptions.paths) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.paths_option_is_specified_looking_for_a_pattern_to_match_module_name_0, moduleName);
+            }
+            matchedPattern = ts.matchPatternOrExact(ts.getOwnKeys(state.compilerOptions.paths), moduleName);
+        }
+        if (matchedPattern) {
+            var matchedStar_1 = typeof matchedPattern === "string" ? undefined : ts.matchedText(matchedPattern, moduleName);
+            var matchedPatternText = typeof matchedPattern === "string" ? matchedPattern : ts.patternText(matchedPattern);
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Module_name_0_matched_pattern_1, moduleName, matchedPatternText);
+            }
+            return ts.forEach(state.compilerOptions.paths[matchedPatternText], function (subst) {
+                var path = matchedStar_1 ? subst.replace("*", matchedStar_1) : subst;
+                var candidate = ts.normalizePath(ts.combinePaths(state.compilerOptions.baseUrl, path));
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.Trying_substitution_0_candidate_module_location_Colon_1, subst, path);
+                }
+                var tsExtension = ts.tryGetExtensionFromPath(candidate);
+                if (tsExtension !== undefined) {
+                    var path_1 = tryFile(candidate, failedLookupLocations, false, state);
+                    return path_1 && { path: path_1, extension: tsExtension };
+                }
+                return loader(extensions, candidate, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
+            });
+        }
+        else {
+            var candidate = ts.normalizePath(ts.combinePaths(state.compilerOptions.baseUrl, moduleName));
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Resolving_module_name_0_relative_to_base_url_1_2, moduleName, state.compilerOptions.baseUrl, candidate);
+            }
+            return loader(extensions, candidate, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
+        }
+    }
+    function nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host) {
+        var containingDirectory = ts.getDirectoryPath(containingFile);
+        var traceEnabled = isTraceEnabled(compilerOptions, host);
+        var failedLookupLocations = [];
+        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled };
+        var result = tryResolve(0) || tryResolve(1);
+        if (result) {
+            var resolved = result.resolved, isExternalLibraryImport = result.isExternalLibraryImport;
+            return createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations);
+        }
+        return { resolvedModule: undefined, failedLookupLocations: failedLookupLocations };
+        function tryResolve(extensions) {
+            var resolved = tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, nodeLoadModuleByRelativeName, failedLookupLocations, state);
+            if (resolved) {
+                return { resolved: resolved, isExternalLibraryImport: false };
+            }
+            if (moduleHasNonRelativeName(moduleName)) {
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Loading_module_0_from_node_modules_folder, moduleName);
+                }
+                var resolved_1 = loadModuleFromNodeModules(extensions, moduleName, containingDirectory, failedLookupLocations, state);
+                return resolved_1 && { resolved: { path: realpath(resolved_1.path, host, traceEnabled), extension: resolved_1.extension }, isExternalLibraryImport: true };
+            }
+            else {
+                var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
+                var resolved_2 = nodeLoadModuleByRelativeName(extensions, candidate, failedLookupLocations, false, state);
+                return resolved_2 && { resolved: resolved_2, isExternalLibraryImport: false };
+            }
+        }
+    }
+    ts.nodeModuleNameResolver = nodeModuleNameResolver;
+    function realpath(path, host, traceEnabled) {
+        if (!host.realpath) {
+            return path;
+        }
+        var real = ts.normalizePath(host.realpath(path));
+        if (traceEnabled) {
+            trace(host, ts.Diagnostics.Resolving_real_path_for_0_result_1, path, real);
+        }
+        return real;
+    }
+    function nodeLoadModuleByRelativeName(extensions, candidate, failedLookupLocations, onlyRecordFailures, state) {
+        if (state.traceEnabled) {
+            trace(state.host, ts.Diagnostics.Loading_module_as_file_Slash_folder_candidate_module_location_0, candidate);
+        }
+        var resolvedFromFile = !ts.pathEndsWithDirectorySeparator(candidate) && loadModuleFromFile(extensions, candidate, failedLookupLocations, onlyRecordFailures, state);
+        return resolvedFromFile || loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, onlyRecordFailures, state);
+    }
+    function directoryProbablyExists(directoryName, host) {
+        return !host.directoryExists || host.directoryExists(directoryName);
+    }
+    ts.directoryProbablyExists = directoryProbablyExists;
+    function loadModuleFromFile(extensions, candidate, failedLookupLocations, onlyRecordFailures, state) {
+        var resolvedByAddingExtension = tryAddingExtensions(candidate, extensions, failedLookupLocations, onlyRecordFailures, state);
+        if (resolvedByAddingExtension) {
+            return resolvedByAddingExtension;
+        }
+        if (ts.hasJavaScriptFileExtension(candidate)) {
+            var extensionless = ts.removeFileExtension(candidate);
+            if (state.traceEnabled) {
+                var extension = candidate.substring(extensionless.length);
+                trace(state.host, ts.Diagnostics.File_name_0_has_a_1_extension_stripping_it, candidate, extension);
+            }
+            return tryAddingExtensions(extensionless, extensions, failedLookupLocations, onlyRecordFailures, state);
+        }
+    }
+    function tryAddingExtensions(candidate, extensions, failedLookupLocations, onlyRecordFailures, state) {
+        if (!onlyRecordFailures) {
+            var directory = ts.getDirectoryPath(candidate);
+            if (directory) {
+                onlyRecordFailures = !directoryProbablyExists(directory, state.host);
+            }
+        }
+        switch (extensions) {
+            case 2:
+                return tryExtension(".d.ts", ts.Extension.Dts);
+            case 0:
+                return tryExtension(".ts", ts.Extension.Ts) || tryExtension(".tsx", ts.Extension.Tsx) || tryExtension(".d.ts", ts.Extension.Dts);
+            case 1:
+                return tryExtension(".js", ts.Extension.Js) || tryExtension(".jsx", ts.Extension.Jsx);
+        }
+        function tryExtension(ext, extension) {
+            var path = tryFile(candidate + ext, failedLookupLocations, onlyRecordFailures, state);
+            return path && { path: path, extension: extension };
+        }
+    }
+    function tryFile(fileName, failedLookupLocations, onlyRecordFailures, state) {
+        if (!onlyRecordFailures && state.host.fileExists(fileName)) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.File_0_exist_use_it_as_a_name_resolution_result, fileName);
+            }
+            return fileName;
+        }
+        else {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.File_0_does_not_exist, fileName);
+            }
+            failedLookupLocations.push(fileName);
+            return undefined;
+        }
+    }
+    function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, onlyRecordFailures, state) {
+        var packageJsonPath = pathToPackageJson(candidate);
+        var directoryExists = !onlyRecordFailures && directoryProbablyExists(candidate, state.host);
+        if (directoryExists && state.host.fileExists(packageJsonPath)) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath);
+            }
+            var typesFile = tryReadTypesSection(extensions, packageJsonPath, candidate, state);
+            if (typesFile) {
+                var onlyRecordFailures_1 = !directoryProbablyExists(ts.getDirectoryPath(typesFile), state.host);
+                var fromFile = tryFile(typesFile, failedLookupLocations, onlyRecordFailures_1, state);
+                if (fromFile) {
+                    return resolvedFromAnyFile(fromFile);
+                }
+                var x = tryAddingExtensions(typesFile, 0, failedLookupLocations, onlyRecordFailures_1, state);
+                if (x) {
+                    return x;
+                }
+            }
+            else {
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.package_json_does_not_have_a_types_or_main_field);
+                }
+            }
+        }
+        else {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.File_0_does_not_exist, packageJsonPath);
+            }
+            failedLookupLocations.push(packageJsonPath);
+        }
+        return loadModuleFromFile(extensions, ts.combinePaths(candidate, "index"), failedLookupLocations, !directoryExists, state);
+    }
+    function pathToPackageJson(directory) {
+        return ts.combinePaths(directory, "package.json");
+    }
+    function loadModuleFromNodeModulesFolder(extensions, moduleName, directory, failedLookupLocations, state) {
+        var nodeModulesFolder = ts.combinePaths(directory, "node_modules");
+        var nodeModulesFolderExists = directoryProbablyExists(nodeModulesFolder, state.host);
+        var candidate = ts.normalizePath(ts.combinePaths(nodeModulesFolder, moduleName));
+        return loadModuleFromFile(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state) ||
+            loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state);
+    }
+    function loadModuleFromNodeModules(extensions, moduleName, directory, failedLookupLocations, state) {
+        return loadModuleFromNodeModulesWorker(extensions, moduleName, directory, failedLookupLocations, state, false);
+    }
+    function loadModuleFromNodeModulesAtTypes(moduleName, directory, failedLookupLocations, state) {
+        return loadModuleFromNodeModulesWorker(2, moduleName, directory, failedLookupLocations, state, true);
+    }
+    function loadModuleFromNodeModulesWorker(extensions, moduleName, directory, failedLookupLocations, state, typesOnly) {
+        return forEachAncestorDirectory(ts.normalizeSlashes(directory), function (ancestorDirectory) {
+            if (ts.getBaseFileName(ancestorDirectory) !== "node_modules") {
+                return loadModuleFromNodeModulesOneLevel(extensions, moduleName, ancestorDirectory, failedLookupLocations, state, typesOnly);
+            }
+        });
+    }
+    function loadModuleFromNodeModulesOneLevel(extensions, moduleName, directory, failedLookupLocations, state, typesOnly) {
+        if (typesOnly === void 0) { typesOnly = false; }
+        var packageResult = typesOnly ? undefined : loadModuleFromNodeModulesFolder(extensions, moduleName, directory, failedLookupLocations, state);
+        if (packageResult) {
+            return packageResult;
+        }
+        if (extensions !== 1) {
+            return loadModuleFromNodeModulesFolder(2, ts.combinePaths("@types", moduleName), directory, failedLookupLocations, state);
+        }
+    }
+    function classicNameResolver(moduleName, containingFile, compilerOptions, host) {
+        var traceEnabled = isTraceEnabled(compilerOptions, host);
+        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled };
+        var failedLookupLocations = [];
+        var containingDirectory = ts.getDirectoryPath(containingFile);
+        var resolved = tryResolve(0) || tryResolve(1);
+        return createResolvedModuleWithFailedLookupLocations(resolved, false, failedLookupLocations);
+        function tryResolve(extensions) {
+            var resolvedUsingSettings = tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, loadModuleFromFile, failedLookupLocations, state);
+            if (resolvedUsingSettings) {
+                return resolvedUsingSettings;
+            }
+            if (moduleHasNonRelativeName(moduleName)) {
+                var resolved_3 = forEachAncestorDirectory(containingDirectory, function (directory) {
+                    var searchName = ts.normalizePath(ts.combinePaths(directory, moduleName));
+                    return loadModuleFromFile(extensions, searchName, failedLookupLocations, false, state);
+                });
+                if (resolved_3) {
+                    return resolved_3;
+                }
+                if (extensions === 0) {
+                    return loadModuleFromNodeModulesAtTypes(moduleName, containingDirectory, failedLookupLocations, state);
+                }
+            }
+            else {
+                var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
+                return loadModuleFromFile(extensions, candidate, failedLookupLocations, false, state);
+            }
+        }
+    }
+    ts.classicNameResolver = classicNameResolver;
+    function loadModuleFromGlobalCache(moduleName, projectName, compilerOptions, host, globalCache) {
+        var traceEnabled = isTraceEnabled(compilerOptions, host);
+        if (traceEnabled) {
+            trace(host, ts.Diagnostics.Auto_discovery_for_typings_is_enabled_in_project_0_Running_extra_resolution_pass_for_module_1_using_cache_location_2, projectName, moduleName, globalCache);
+        }
+        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled };
+        var failedLookupLocations = [];
+        var resolved = loadModuleFromNodeModulesOneLevel(2, moduleName, globalCache, failedLookupLocations, state);
+        return createResolvedModuleWithFailedLookupLocations(resolved, true, failedLookupLocations);
+    }
+    ts.loadModuleFromGlobalCache = loadModuleFromGlobalCache;
+    function forEachAncestorDirectory(directory, callback) {
+        while (true) {
+            var result = callback(directory);
+            if (result !== undefined) {
+                return result;
+            }
+            var parentPath = ts.getDirectoryPath(directory);
+            if (parentPath === directory) {
+                return undefined;
+            }
+            directory = parentPath;
+        }
+    }
+})(ts || (ts = {}));
+var ts;
+(function (ts) {
+    ts.externalHelpersModuleNameText = "tslib";
+    function getDeclarationOfKind(symbol, kind) {
+        var declarations = symbol.declarations;
+        if (declarations) {
+            for (var _i = 0, declarations_1 = declarations; _i < declarations_1.length; _i++) {
+                var declaration = declarations_1[_i];
+                if (declaration.kind === kind) {
+                    return declaration;
+                }
+            }
+        }
+        return undefined;
+    }
+    ts.getDeclarationOfKind = getDeclarationOfKind;
+    var stringWriters = [];
+    function getSingleLineStringWriter() {
+        if (stringWriters.length === 0) {
+            var str_1 = "";
+            var writeText = function (text) { return str_1 += text; };
+            return {
+                string: function () { return str_1; },
+                writeKeyword: writeText,
+                writeOperator: writeText,
+                writePunctuation: writeText,
+                writeSpace: writeText,
+                writeStringLiteral: writeText,
+                writeParameter: writeText,
+                writeSymbol: writeText,
+                writeLine: function () { return str_1 += " "; },
+                increaseIndent: ts.noop,
+                decreaseIndent: ts.noop,
+                clear: function () { return str_1 = ""; },
+                trackSymbol: ts.noop,
+                reportInaccessibleThisError: ts.noop
+            };
+        }
+        return stringWriters.pop();
+    }
+    ts.getSingleLineStringWriter = getSingleLineStringWriter;
+    function releaseStringWriter(writer) {
+        writer.clear();
+        stringWriters.push(writer);
+    }
+    ts.releaseStringWriter = releaseStringWriter;
+    function getFullWidth(node) {
+        return node.end - node.pos;
+    }
+    ts.getFullWidth = getFullWidth;
+    function hasResolvedModule(sourceFile, moduleNameText) {
+        return !!(sourceFile && sourceFile.resolvedModules && sourceFile.resolvedModules[moduleNameText]);
+    }
+    ts.hasResolvedModule = hasResolvedModule;
+    function getResolvedModule(sourceFile, moduleNameText) {
+        return hasResolvedModule(sourceFile, moduleNameText) ? sourceFile.resolvedModules[moduleNameText] : undefined;
+    }
+    ts.getResolvedModule = getResolvedModule;
+    function setResolvedModule(sourceFile, moduleNameText, resolvedModule) {
+        if (!sourceFile.resolvedModules) {
+            sourceFile.resolvedModules = ts.createMap();
+        }
+        sourceFile.resolvedModules[moduleNameText] = resolvedModule;
+    }
+    ts.setResolvedModule = setResolvedModule;
+    function setResolvedTypeReferenceDirective(sourceFile, typeReferenceDirectiveName, resolvedTypeReferenceDirective) {
+        if (!sourceFile.resolvedTypeReferenceDirectiveNames) {
+            sourceFile.resolvedTypeReferenceDirectiveNames = ts.createMap();
+        }
+        sourceFile.resolvedTypeReferenceDirectiveNames[typeReferenceDirectiveName] = resolvedTypeReferenceDirective;
+    }
+    ts.setResolvedTypeReferenceDirective = setResolvedTypeReferenceDirective;
+    function moduleResolutionIsEqualTo(oldResolution, newResolution) {
+        return oldResolution.isExternalLibraryImport === newResolution.isExternalLibraryImport &&
+            oldResolution.extension === newResolution.extension &&
+            oldResolution.resolvedFileName === newResolution.resolvedFileName;
+    }
+    ts.moduleResolutionIsEqualTo = moduleResolutionIsEqualTo;
+    function typeDirectiveIsEqualTo(oldResolution, newResolution) {
+        return oldResolution.resolvedFileName === newResolution.resolvedFileName && oldResolution.primary === newResolution.primary;
+    }
+    ts.typeDirectiveIsEqualTo = typeDirectiveIsEqualTo;
+    function hasChangesInResolutions(names, newResolutions, oldResolutions, comparer) {
+        if (names.length !== newResolutions.length) {
+            return false;
+        }
+        for (var i = 0; i < names.length; i++) {
+            var newResolution = newResolutions[i];
+            var oldResolution = oldResolutions && oldResolutions[names[i]];
+            var changed = oldResolution
+                ? !newResolution || !comparer(oldResolution, newResolution)
+                : newResolution;
+            if (changed) {
+                return true;
+            }
+        }
+        return false;
+    }
+    ts.hasChangesInResolutions = hasChangesInResolutions;
+    function containsParseError(node) {
+        aggregateChildData(node);
+        return (node.flags & 4194304) !== 0;
+    }
+    ts.containsParseError = containsParseError;
+    function aggregateChildData(node) {
+        if (!(node.flags & 8388608)) {
+            var thisNodeOrAnySubNodesHasError = ((node.flags & 1048576) !== 0) ||
+                ts.forEachChild(node, containsParseError);
+            if (thisNodeOrAnySubNodesHasError) {
+                node.flags |= 4194304;
+            }
+            node.flags |= 8388608;
+        }
+    }
+    function getSourceFileOfNode(node) {
+        while (node && node.kind !== 261) {
+            node = node.parent;
+        }
+        return node;
+    }
+    ts.getSourceFileOfNode = getSourceFileOfNode;
+    function isStatementWithLocals(node) {
+        switch (node.kind) {
+            case 204:
+            case 232:
+            case 211:
+            case 212:
+            case 213:
+                return true;
+        }
+        return false;
+    }
+    ts.isStatementWithLocals = isStatementWithLocals;
+    function getStartPositionOfLine(line, sourceFile) {
+        ts.Debug.assert(line >= 0);
+        return ts.getLineStarts(sourceFile)[line];
+    }
+    ts.getStartPositionOfLine = getStartPositionOfLine;
+    function nodePosToString(node) {
+        var file = getSourceFileOfNode(node);
+        var loc = ts.getLineAndCharacterOfPosition(file, node.pos);
+        return file.fileName + "(" + (loc.line + 1) + "," + (loc.character + 1) + ")";
+    }
+    ts.nodePosToString = nodePosToString;
+    function getStartPosOfNode(node) {
+        return node.pos;
+    }
+    ts.getStartPosOfNode = getStartPosOfNode;
+    function isDefined(value) {
+        return value !== undefined;
+    }
+    ts.isDefined = isDefined;
+    function getEndLinePosition(line, sourceFile) {
+        ts.Debug.assert(line >= 0);
+        var lineStarts = ts.getLineStarts(sourceFile);
+        var lineIndex = line;
+        var sourceText = sourceFile.text;
+        if (lineIndex + 1 === lineStarts.length) {
+            return sourceText.length - 1;
+        }
+        else {
+            var start = lineStarts[lineIndex];
+            var pos = lineStarts[lineIndex + 1] - 1;
+            ts.Debug.assert(ts.isLineBreak(sourceText.charCodeAt(pos)));
+            while (start <= pos && ts.isLineBreak(sourceText.charCodeAt(pos))) {
+                pos--;
+            }
+            return pos;
+        }
+    }
+    ts.getEndLinePosition = getEndLinePosition;
+    function nodeIsMissing(node) {
+        if (node === undefined) {
+            return true;
+        }
+        return node.pos === node.end && node.pos >= 0 && node.kind !== 1;
+    }
+    ts.nodeIsMissing = nodeIsMissing;
+    function nodeIsPresent(node) {
+        return !nodeIsMissing(node);
+    }
+    ts.nodeIsPresent = nodeIsPresent;
+    function getTokenPosOfNode(node, sourceFile, includeJsDocComment) {
+        if (nodeIsMissing(node)) {
+            return node.pos;
+        }
+        if (isJSDocNode(node)) {
+            return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos, false, true);
+        }
+        if (includeJsDocComment && node.jsDocComments && node.jsDocComments.length > 0) {
+            return getTokenPosOfNode(node.jsDocComments[0]);
+        }
+        if (node.kind === 291 && node._children.length > 0) {
+            return getTokenPosOfNode(node._children[0], sourceFile, includeJsDocComment);
+        }
+        return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos);
+    }
+    ts.getTokenPosOfNode = getTokenPosOfNode;
+    function isJSDocNode(node) {
+        return node.kind >= 262 && node.kind <= 287;
+    }
+    ts.isJSDocNode = isJSDocNode;
+    function isJSDocTag(node) {
+        return node.kind >= 278 && node.kind <= 290;
+    }
+    ts.isJSDocTag = isJSDocTag;
+    function getNonDecoratorTokenPosOfNode(node, sourceFile) {
+        if (nodeIsMissing(node) || !node.decorators) {
+            return getTokenPosOfNode(node, sourceFile);
+        }
+        return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.decorators.end);
+    }
+    ts.getNonDecoratorTokenPosOfNode = getNonDecoratorTokenPosOfNode;
+    function getSourceTextOfNodeFromSourceFile(sourceFile, node, includeTrivia) {
+        if (includeTrivia === void 0) { includeTrivia = false; }
+        if (nodeIsMissing(node)) {
+            return "";
+        }
+        var text = sourceFile.text;
+        return text.substring(includeTrivia ? node.pos : ts.skipTrivia(text, node.pos), node.end);
+    }
+    ts.getSourceTextOfNodeFromSourceFile = getSourceTextOfNodeFromSourceFile;
+    function getTextOfNodeFromSourceText(sourceText, node) {
+        if (nodeIsMissing(node)) {
+            return "";
+        }
+        return sourceText.substring(ts.skipTrivia(sourceText, node.pos), node.end);
+    }
+    ts.getTextOfNodeFromSourceText = getTextOfNodeFromSourceText;
+    function getTextOfNode(node, includeTrivia) {
+        if (includeTrivia === void 0) { includeTrivia = false; }
+        return getSourceTextOfNodeFromSourceFile(getSourceFileOfNode(node), node, includeTrivia);
+    }
+    ts.getTextOfNode = getTextOfNode;
+    function getLiteralText(node, sourceFile, languageVersion) {
+        if (languageVersion < 2 && (isTemplateLiteralKind(node.kind) || node.hasExtendedUnicodeEscape)) {
+            return getQuotedEscapedLiteralText('"', node.text, '"');
+        }
+        if (!nodeIsSynthesized(node) && node.parent) {
+            var text = getSourceTextOfNodeFromSourceFile(sourceFile, node);
+            if (languageVersion < 2 && isBinaryOrOctalIntegerLiteral(node, text)) {
+                return node.text;
+            }
+            return text;
+        }
+        switch (node.kind) {
+            case 9:
+                return getQuotedEscapedLiteralText('"', node.text, '"');
+            case 12:
+                return getQuotedEscapedLiteralText("`", node.text, "`");
+            case 13:
+                return getQuotedEscapedLiteralText("`", node.text, "${");
+            case 14:
+                return getQuotedEscapedLiteralText("}", node.text, "${");
+            case 15:
+                return getQuotedEscapedLiteralText("}", node.text, "`");
+            case 8:
+                return node.text;
+        }
+        ts.Debug.fail("Literal kind '" + node.kind + "' not accounted for.");
+    }
+    ts.getLiteralText = getLiteralText;
+    function isBinaryOrOctalIntegerLiteral(node, text) {
+        if (node.kind === 8 && text.length > 1) {
+            switch (text.charCodeAt(1)) {
+                case 98:
+                case 66:
+                case 111:
+                case 79:
+                    return true;
+            }
+        }
+        return false;
+    }
+    ts.isBinaryOrOctalIntegerLiteral = isBinaryOrOctalIntegerLiteral;
+    function getQuotedEscapedLiteralText(leftQuote, text, rightQuote) {
+        return leftQuote + escapeNonAsciiCharacters(escapeString(text)) + rightQuote;
+    }
+    function escapeIdentifier(identifier) {
+        return identifier.length >= 2 && identifier.charCodeAt(0) === 95 && identifier.charCodeAt(1) === 95 ? "_" + identifier : identifier;
+    }
+    ts.escapeIdentifier = escapeIdentifier;
+    function unescapeIdentifier(identifier) {
+        return identifier.length >= 3 && identifier.charCodeAt(0) === 95 && identifier.charCodeAt(1) === 95 && identifier.charCodeAt(2) === 95 ? identifier.substr(1) : identifier;
+    }
+    ts.unescapeIdentifier = unescapeIdentifier;
+    function makeIdentifierFromModuleName(moduleName) {
+        return ts.getBaseFileName(moduleName).replace(/^(\d)/, "_$1").replace(/\W/g, "_");
+    }
+    ts.makeIdentifierFromModuleName = makeIdentifierFromModuleName;
+    function isBlockOrCatchScoped(declaration) {
+        return (ts.getCombinedNodeFlags(declaration) & 3) !== 0 ||
+            isCatchClauseVariableDeclarationOrBindingElement(declaration);
+    }
+    ts.isBlockOrCatchScoped = isBlockOrCatchScoped;
+    function isCatchClauseVariableDeclarationOrBindingElement(declaration) {
+        var node = getRootDeclaration(declaration);
+        return node.kind === 223 && node.parent.kind === 256;
+    }
+    ts.isCatchClauseVariableDeclarationOrBindingElement = isCatchClauseVariableDeclarationOrBindingElement;
+    function isAmbientModule(node) {
+        return node && node.kind === 230 &&
+            (node.name.kind === 9 || isGlobalScopeAugmentation(node));
+    }
+    ts.isAmbientModule = isAmbientModule;
+    function isShorthandAmbientModuleSymbol(moduleSymbol) {
+        return isShorthandAmbientModule(moduleSymbol.valueDeclaration);
+    }
+    ts.isShorthandAmbientModuleSymbol = isShorthandAmbientModuleSymbol;
+    function isShorthandAmbientModule(node) {
+        return node.kind === 230 && (!node.body);
+    }
+    function isBlockScopedContainerTopLevel(node) {
+        return node.kind === 261 ||
+            node.kind === 230 ||
+            isFunctionLike(node);
+    }
+    ts.isBlockScopedContainerTopLevel = isBlockScopedContainerTopLevel;
+    function isGlobalScopeAugmentation(module) {
+        return !!(module.flags & 512);
+    }
+    ts.isGlobalScopeAugmentation = isGlobalScopeAugmentation;
+    function isExternalModuleAugmentation(node) {
+        if (!node || !isAmbientModule(node)) {
+            return false;
+        }
+        switch (node.parent.kind) {
+            case 261:
+                return ts.isExternalModule(node.parent);
+            case 231:
+                return isAmbientModule(node.parent.parent) && !ts.isExternalModule(node.parent.parent.parent);
+        }
+        return false;
+    }
+    ts.isExternalModuleAugmentation = isExternalModuleAugmentation;
+    function isBlockScope(node, parentNode) {
+        switch (node.kind) {
+            case 261:
+            case 232:
+            case 256:
+            case 230:
+            case 211:
+            case 212:
+            case 213:
+            case 150:
+            case 149:
+            case 151:
+            case 152:
+            case 225:
+            case 184:
+            case 185:
+                return true;
+            case 204:
+                return parentNode && !isFunctionLike(parentNode);
+        }
+        return false;
+    }
+    ts.isBlockScope = isBlockScope;
+    function getEnclosingBlockScopeContainer(node) {
+        var current = node.parent;
+        while (current) {
+            if (isBlockScope(current, current.parent)) {
+                return current;
+            }
+            current = current.parent;
+        }
+    }
+    ts.getEnclosingBlockScopeContainer = getEnclosingBlockScopeContainer;
+    function declarationNameToString(name) {
+        return getFullWidth(name) === 0 ? "(Missing)" : getTextOfNode(name);
+    }
+    ts.declarationNameToString = declarationNameToString;
+    function getTextOfPropertyName(name) {
+        switch (name.kind) {
+            case 70:
+                return name.text;
+            case 9:
+            case 8:
+                return name.text;
+            case 142:
+                if (isStringOrNumericLiteral(name.expression.kind)) {
+                    return name.expression.text;
+                }
+        }
+        return undefined;
+    }
+    ts.getTextOfPropertyName = getTextOfPropertyName;
+    function entityNameToString(name) {
+        switch (name.kind) {
+            case 70:
+                return getFullWidth(name) === 0 ? unescapeIdentifier(name.text) : getTextOfNode(name);
+            case 141:
+                return entityNameToString(name.left) + "." + entityNameToString(name.right);
+            case 177:
+                return entityNameToString(name.expression) + "." + entityNameToString(name.name);
+        }
+    }
+    ts.entityNameToString = entityNameToString;
+    function createDiagnosticForNode(node, message, arg0, arg1, arg2) {
+        var sourceFile = getSourceFileOfNode(node);
+        return createDiagnosticForNodeInSourceFile(sourceFile, node, message, arg0, arg1, arg2);
+    }
+    ts.createDiagnosticForNode = createDiagnosticForNode;
+    function createDiagnosticForNodeInSourceFile(sourceFile, node, message, arg0, arg1, arg2) {
+        var span = getErrorSpanForNode(sourceFile, node);
+        return ts.createFileDiagnostic(sourceFile, span.start, span.length, message, arg0, arg1, arg2);
+    }
+    ts.createDiagnosticForNodeInSourceFile = createDiagnosticForNodeInSourceFile;
+    function createDiagnosticForNodeFromMessageChain(node, messageChain) {
+        var sourceFile = getSourceFileOfNode(node);
+        var span = getErrorSpanForNode(sourceFile, node);
+        return {
+            file: sourceFile,
+            start: span.start,
+            length: span.length,
+            code: messageChain.code,
+            category: messageChain.category,
+            messageText: messageChain.next ? messageChain : messageChain.messageText
+        };
+    }
+    ts.createDiagnosticForNodeFromMessageChain = createDiagnosticForNodeFromMessageChain;
+    function getSpanOfTokenAtPosition(sourceFile, pos) {
+        var scanner = ts.createScanner(sourceFile.languageVersion, true, sourceFile.languageVariant, sourceFile.text, undefined, pos);
+        scanner.scan();
+        var start = scanner.getTokenPos();
+        return ts.createTextSpanFromBounds(start, scanner.getTextPos());
+    }
+    ts.getSpanOfTokenAtPosition = getSpanOfTokenAtPosition;
+    function getErrorSpanForArrowFunction(sourceFile, node) {
+        var pos = ts.skipTrivia(sourceFile.text, node.pos);
+        if (node.body && node.body.kind === 204) {
+            var startLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.pos).line;
+            var endLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.end).line;
+            if (startLine < endLine) {
+                return ts.createTextSpan(pos, getEndLinePosition(startLine, sourceFile) - pos + 1);
+            }
+        }
+        return ts.createTextSpanFromBounds(pos, node.end);
+    }
+    function getErrorSpanForNode(sourceFile, node) {
+        var errorNode = node;
+        switch (node.kind) {
+            case 261:
+                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 223:
+            case 174:
+            case 226:
+            case 197:
+            case 227:
+            case 230:
+            case 229:
+            case 260:
+            case 225:
+            case 184:
+            case 149:
+            case 151:
+            case 152:
+            case 228:
+                errorNode = node.name;
+                break;
+            case 185:
+                return getErrorSpanForArrowFunction(sourceFile, node);
+        }
+        if (errorNode === undefined) {
+            return getSpanOfTokenAtPosition(sourceFile, node.pos);
+        }
+        var pos = nodeIsMissing(errorNode)
+            ? errorNode.pos
+            : ts.skipTrivia(sourceFile.text, errorNode.pos);
+        return ts.createTextSpanFromBounds(pos, errorNode.end);
+    }
+    ts.getErrorSpanForNode = getErrorSpanForNode;
+    function isExternalOrCommonJsModule(file) {
+        return (file.externalModuleIndicator || file.commonJsModuleIndicator) !== undefined;
+    }
+    ts.isExternalOrCommonJsModule = isExternalOrCommonJsModule;
+    function isDeclarationFile(file) {
+        return file.isDeclarationFile;
+    }
+    ts.isDeclarationFile = isDeclarationFile;
+    function isConstEnumDeclaration(node) {
+        return node.kind === 229 && isConst(node);
+    }
+    ts.isConstEnumDeclaration = isConstEnumDeclaration;
+    function isConst(node) {
+        return !!(ts.getCombinedNodeFlags(node) & 2)
+            || !!(ts.getCombinedModifierFlags(node) & 2048);
+    }
+    ts.isConst = isConst;
+    function isLet(node) {
+        return !!(ts.getCombinedNodeFlags(node) & 1);
+    }
+    ts.isLet = isLet;
+    function isSuperCall(n) {
+        return n.kind === 179 && n.expression.kind === 96;
+    }
+    ts.isSuperCall = isSuperCall;
+    function isPrologueDirective(node) {
+        return node.kind === 207 && node.expression.kind === 9;
+    }
+    ts.isPrologueDirective = isPrologueDirective;
+    function getLeadingCommentRangesOfNode(node, sourceFileOfNode) {
+        return ts.getLeadingCommentRanges(sourceFileOfNode.text, node.pos);
+    }
+    ts.getLeadingCommentRangesOfNode = getLeadingCommentRangesOfNode;
+    function getLeadingCommentRangesOfNodeFromText(node, text) {
+        return ts.getLeadingCommentRanges(text, node.pos);
+    }
+    ts.getLeadingCommentRangesOfNodeFromText = getLeadingCommentRangesOfNodeFromText;
+    function getJsDocComments(node, sourceFileOfNode) {
+        return getJsDocCommentsFromText(node, sourceFileOfNode.text);
+    }
+    ts.getJsDocComments = getJsDocComments;
+    function getJsDocCommentsFromText(node, text) {
+        var commentRanges = (node.kind === 144 ||
+            node.kind === 143 ||
+            node.kind === 184 ||
+            node.kind === 185) ?
+            ts.concatenate(ts.getTrailingCommentRanges(text, node.pos), ts.getLeadingCommentRanges(text, node.pos)) :
+            getLeadingCommentRangesOfNodeFromText(node, text);
+        return ts.filter(commentRanges, isJsDocComment);
+        function isJsDocComment(comment) {
+            return text.charCodeAt(comment.pos + 1) === 42 &&
+                text.charCodeAt(comment.pos + 2) === 42 &&
+                text.charCodeAt(comment.pos + 3) !== 47;
+        }
+    }
+    ts.getJsDocCommentsFromText = getJsDocCommentsFromText;
+    ts.fullTripleSlashReferencePathRegEx = /^(\/\/\/\s*<reference\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
+    ts.fullTripleSlashReferenceTypeReferenceDirectiveRegEx = /^(\/\/\/\s*<reference\s+types\s*=\s*)('|")(.+?)\2.*?\/>/;
+    ts.fullTripleSlashAMDReferencePathRegEx = /^(\/\/\/\s*<amd-dependency\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
+    function isPartOfTypeNode(node) {
+        if (156 <= node.kind && node.kind <= 171) {
+            return true;
+        }
+        switch (node.kind) {
+            case 118:
+            case 132:
+            case 134:
+            case 121:
+            case 135:
+            case 137:
+            case 129:
+                return true;
+            case 104:
+                return node.parent.kind !== 188;
+            case 199:
+                return !isExpressionWithTypeArgumentsInClassExtendsClause(node);
+            case 70:
+                if (node.parent.kind === 141 && node.parent.right === node) {
+                    node = node.parent;
+                }
+                else if (node.parent.kind === 177 && node.parent.name === node) {
+                    node = node.parent;
+                }
+                ts.Debug.assert(node.kind === 70 || node.kind === 141 || node.kind === 177, "'node' was expected to be a qualified name, identifier or property access in 'isPartOfTypeNode'.");
+            case 141:
+            case 177:
+            case 98:
+                var parent_1 = node.parent;
+                if (parent_1.kind === 160) {
+                    return false;
+                }
+                if (156 <= parent_1.kind && parent_1.kind <= 171) {
+                    return true;
+                }
+                switch (parent_1.kind) {
+                    case 199:
+                        return !isExpressionWithTypeArgumentsInClassExtendsClause(parent_1);
+                    case 143:
+                        return node === parent_1.constraint;
+                    case 147:
+                    case 146:
+                    case 144:
+                    case 223:
+                        return node === parent_1.type;
+                    case 225:
+                    case 184:
+                    case 185:
+                    case 150:
+                    case 149:
+                    case 148:
+                    case 151:
+                    case 152:
+                        return node === parent_1.type;
+                    case 153:
+                    case 154:
+                    case 155:
+                        return node === parent_1.type;
+                    case 182:
+                        return node === parent_1.type;
+                    case 179:
+                    case 180:
+                        return parent_1.typeArguments && ts.indexOf(parent_1.typeArguments, node) >= 0;
+                    case 181:
+                        return false;
+                }
+        }
+        return false;
+    }
+    ts.isPartOfTypeNode = isPartOfTypeNode;
+    function forEachReturnStatement(body, visitor) {
+        return traverse(body);
+        function traverse(node) {
+            switch (node.kind) {
+                case 216:
+                    return visitor(node);
+                case 232:
+                case 204:
+                case 208:
+                case 209:
+                case 210:
+                case 211:
+                case 212:
+                case 213:
+                case 217:
+                case 218:
+                case 253:
+                case 254:
+                case 219:
+                case 221:
+                case 256:
+                    return ts.forEachChild(node, traverse);
+            }
+        }
+    }
+    ts.forEachReturnStatement = forEachReturnStatement;
+    function forEachYieldExpression(body, visitor) {
+        return traverse(body);
+        function traverse(node) {
+            switch (node.kind) {
+                case 195:
+                    visitor(node);
+                    var operand = node.expression;
+                    if (operand) {
+                        traverse(operand);
+                    }
+                case 229:
+                case 227:
+                case 230:
+                case 228:
+                case 226:
+                case 197:
+                    return;
+                default:
+                    if (isFunctionLike(node)) {
+                        var name_7 = node.name;
+                        if (name_7 && name_7.kind === 142) {
+                            traverse(name_7.expression);
+                            return;
+                        }
+                    }
+                    else if (!isPartOfTypeNode(node)) {
+                        ts.forEachChild(node, traverse);
+                    }
+            }
+        }
+    }
+    ts.forEachYieldExpression = forEachYieldExpression;
+    function isVariableLike(node) {
+        if (node) {
+            switch (node.kind) {
+                case 174:
+                case 260:
+                case 144:
+                case 257:
+                case 147:
+                case 146:
+                case 258:
+                case 223:
+                    return true;
+            }
+        }
+        return false;
+    }
+    ts.isVariableLike = isVariableLike;
+    function isAccessor(node) {
+        return node && (node.kind === 151 || node.kind === 152);
+    }
+    ts.isAccessor = isAccessor;
+    function isClassLike(node) {
+        return node && (node.kind === 226 || node.kind === 197);
+    }
+    ts.isClassLike = isClassLike;
+    function isFunctionLike(node) {
+        return node && isFunctionLikeKind(node.kind);
+    }
+    ts.isFunctionLike = isFunctionLike;
+    function isFunctionLikeKind(kind) {
+        switch (kind) {
+            case 150:
+            case 184:
+            case 225:
+            case 185:
+            case 149:
+            case 148:
+            case 151:
+            case 152:
+            case 153:
+            case 154:
+            case 155:
+            case 158:
+            case 159:
+                return true;
+        }
+        return false;
+    }
+    ts.isFunctionLikeKind = isFunctionLikeKind;
+    function introducesArgumentsExoticObject(node) {
+        switch (node.kind) {
+            case 149:
+            case 148:
+            case 150:
+            case 151:
+            case 152:
+            case 225:
+            case 184:
+                return true;
+        }
+        return false;
+    }
+    ts.introducesArgumentsExoticObject = introducesArgumentsExoticObject;
+    function isIterationStatement(node, lookInLabeledStatements) {
+        switch (node.kind) {
+            case 211:
+            case 212:
+            case 213:
+            case 209:
+            case 210:
+                return true;
+            case 219:
+                return lookInLabeledStatements && isIterationStatement(node.statement, lookInLabeledStatements);
+        }
+        return false;
+    }
+    ts.isIterationStatement = isIterationStatement;
+    function isFunctionBlock(node) {
+        return node && node.kind === 204 && isFunctionLike(node.parent);
+    }
+    ts.isFunctionBlock = isFunctionBlock;
+    function isObjectLiteralMethod(node) {
+        return node && node.kind === 149 && node.parent.kind === 176;
+    }
+    ts.isObjectLiteralMethod = isObjectLiteralMethod;
+    function isObjectLiteralOrClassExpressionMethod(node) {
+        return node.kind === 149 &&
+            (node.parent.kind === 176 ||
+                node.parent.kind === 197);
+    }
+    ts.isObjectLiteralOrClassExpressionMethod = isObjectLiteralOrClassExpressionMethod;
+    function isIdentifierTypePredicate(predicate) {
+        return predicate && predicate.kind === 1;
+    }
+    ts.isIdentifierTypePredicate = isIdentifierTypePredicate;
+    function isThisTypePredicate(predicate) {
+        return predicate && predicate.kind === 0;
+    }
+    ts.isThisTypePredicate = isThisTypePredicate;
+    function getContainingFunction(node) {
+        while (true) {
+            node = node.parent;
+            if (!node || isFunctionLike(node)) {
+                return node;
+            }
+        }
+    }
+    ts.getContainingFunction = getContainingFunction;
+    function getContainingClass(node) {
+        while (true) {
+            node = node.parent;
+            if (!node || isClassLike(node)) {
+                return node;
+            }
+        }
+    }
+    ts.getContainingClass = getContainingClass;
+    function getThisContainer(node, includeArrowFunctions) {
+        while (true) {
+            node = node.parent;
+            if (!node) {
+                return undefined;
+            }
+            switch (node.kind) {
+                case 142:
+                    if (isClassLike(node.parent.parent)) {
+                        return node;
+                    }
+                    node = node.parent;
+                    break;
+                case 145:
+                    if (node.parent.kind === 144 && isClassElement(node.parent.parent)) {
+                        node = node.parent.parent;
+                    }
+                    else if (isClassElement(node.parent)) {
+                        node = node.parent;
+                    }
+                    break;
+                case 185:
+                    if (!includeArrowFunctions) {
+                        continue;
+                    }
+                case 225:
+                case 184:
+                case 230:
+                case 147:
+                case 146:
+                case 149:
+                case 148:
+                case 150:
+                case 151:
+                case 152:
+                case 153:
+                case 154:
+                case 155:
+                case 229:
+                case 261:
+                    return node;
+            }
+        }
+    }
+    ts.getThisContainer = getThisContainer;
+    function getSuperContainer(node, stopOnFunctions) {
+        while (true) {
+            node = node.parent;
+            if (!node) {
+                return node;
+            }
+            switch (node.kind) {
+                case 142:
+                    node = node.parent;
+                    break;
+                case 225:
+                case 184:
+                case 185:
+                    if (!stopOnFunctions) {
+                        continue;
+                    }
+                case 147:
+                case 146:
+                case 149:
+                case 148:
+                case 150:
+                case 151:
+                case 152:
+                    return node;
+                case 145:
+                    if (node.parent.kind === 144 && isClassElement(node.parent.parent)) {
+                        node = node.parent.parent;
+                    }
+                    else if (isClassElement(node.parent)) {
+                        node = node.parent;
+                    }
+                    break;
+            }
+        }
+    }
+    ts.getSuperContainer = getSuperContainer;
+    function getImmediatelyInvokedFunctionExpression(func) {
+        if (func.kind === 184 || func.kind === 185) {
+            var prev = func;
+            var parent_2 = func.parent;
+            while (parent_2.kind === 183) {
+                prev = parent_2;
+                parent_2 = parent_2.parent;
+            }
+            if (parent_2.kind === 179 && parent_2.expression === prev) {
+                return parent_2;
+            }
+        }
+    }
+    ts.getImmediatelyInvokedFunctionExpression = getImmediatelyInvokedFunctionExpression;
+    function isSuperProperty(node) {
+        var kind = node.kind;
+        return (kind === 177 || kind === 178)
+            && node.expression.kind === 96;
+    }
+    ts.isSuperProperty = isSuperProperty;
+    function getEntityNameFromTypeNode(node) {
+        switch (node.kind) {
+            case 157:
+            case 272:
+                return node.typeName;
+            case 199:
+                return isEntityNameExpression(node.expression)
+                    ? node.expression
+                    : undefined;
+            case 70:
+            case 141:
+                return node;
+        }
+        return undefined;
+    }
+    ts.getEntityNameFromTypeNode = getEntityNameFromTypeNode;
+    function isCallLikeExpression(node) {
+        switch (node.kind) {
+            case 179:
+            case 180:
+            case 181:
+            case 145:
+                return true;
+            default:
+                return false;
+        }
+    }
+    ts.isCallLikeExpression = isCallLikeExpression;
+    function getInvokedExpression(node) {
+        if (node.kind === 181) {
+            return node.tag;
+        }
+        return node.expression;
+    }
+    ts.getInvokedExpression = getInvokedExpression;
+    function nodeCanBeDecorated(node) {
+        switch (node.kind) {
+            case 226:
+                return true;
+            case 147:
+                return node.parent.kind === 226;
+            case 151:
+            case 152:
+            case 149:
+                return node.body !== undefined
+                    && node.parent.kind === 226;
+            case 144:
+                return node.parent.body !== undefined
+                    && (node.parent.kind === 150
+                        || node.parent.kind === 149
+                        || node.parent.kind === 152)
+                    && node.parent.parent.kind === 226;
+        }
+        return false;
+    }
+    ts.nodeCanBeDecorated = nodeCanBeDecorated;
+    function nodeIsDecorated(node) {
+        return node.decorators !== undefined
+            && nodeCanBeDecorated(node);
+    }
+    ts.nodeIsDecorated = nodeIsDecorated;
+    function nodeOrChildIsDecorated(node) {
+        return nodeIsDecorated(node) || childIsDecorated(node);
+    }
+    ts.nodeOrChildIsDecorated = nodeOrChildIsDecorated;
+    function childIsDecorated(node) {
+        switch (node.kind) {
+            case 226:
+                return ts.forEach(node.members, nodeOrChildIsDecorated);
+            case 149:
+            case 152:
+                return ts.forEach(node.parameters, nodeIsDecorated);
+        }
+    }
+    ts.childIsDecorated = childIsDecorated;
+    function isJSXTagName(node) {
+        var parent = node.parent;
+        if (parent.kind === 248 ||
+            parent.kind === 247 ||
+            parent.kind === 249) {
+            return parent.tagName === node;
+        }
+        return false;
+    }
+    ts.isJSXTagName = isJSXTagName;
+    function isPartOfExpression(node) {
+        switch (node.kind) {
+            case 98:
+            case 96:
+            case 94:
+            case 100:
+            case 85:
+            case 11:
+            case 175:
+            case 176:
+            case 177:
+            case 178:
+            case 179:
+            case 180:
+            case 181:
+            case 200:
+            case 182:
+            case 201:
+            case 183:
+            case 184:
+            case 197:
+            case 185:
+            case 188:
+            case 186:
+            case 187:
+            case 190:
+            case 191:
+            case 192:
+            case 193:
+            case 196:
+            case 194:
+            case 12:
+            case 198:
+            case 246:
+            case 247:
+            case 195:
+            case 189:
+                return true;
+            case 141:
+                while (node.parent.kind === 141) {
+                    node = node.parent;
+                }
+                return node.parent.kind === 160 || isJSXTagName(node);
+            case 70:
+                if (node.parent.kind === 160 || isJSXTagName(node)) {
+                    return true;
+                }
+            case 8:
+            case 9:
+            case 98:
+                var parent_3 = node.parent;
+                switch (parent_3.kind) {
+                    case 223:
+                    case 144:
+                    case 147:
+                    case 146:
+                    case 260:
+                    case 257:
+                    case 174:
+                        return parent_3.initializer === node;
+                    case 207:
+                    case 208:
+                    case 209:
+                    case 210:
+                    case 216:
+                    case 217:
+                    case 218:
+                    case 253:
+                    case 220:
+                    case 218:
+                        return parent_3.expression === node;
+                    case 211:
+                        var forStatement = parent_3;
+                        return (forStatement.initializer === node && forStatement.initializer.kind !== 224) ||
+                            forStatement.condition === node ||
+                            forStatement.incrementor === node;
+                    case 212:
+                    case 213:
+                        var forInStatement = parent_3;
+                        return (forInStatement.initializer === node && forInStatement.initializer.kind !== 224) ||
+                            forInStatement.expression === node;
+                    case 182:
+                    case 200:
+                        return node === parent_3.expression;
+                    case 202:
+                        return node === parent_3.expression;
+                    case 142:
+                        return node === parent_3.expression;
+                    case 145:
+                    case 252:
+                    case 251:
+                        return true;
+                    case 199:
+                        return parent_3.expression === node && isExpressionWithTypeArgumentsInClassExtendsClause(parent_3);
+                    default:
+                        if (isPartOfExpression(parent_3)) {
+                            return true;
+                        }
+                }
+        }
+        return false;
+    }
+    ts.isPartOfExpression = isPartOfExpression;
+    function isInstantiatedModule(node, preserveConstEnums) {
+        var moduleState = ts.getModuleInstanceState(node);
+        return moduleState === 1 ||
+            (preserveConstEnums && moduleState === 2);
+    }
+    ts.isInstantiatedModule = isInstantiatedModule;
+    function isExternalModuleImportEqualsDeclaration(node) {
+        return node.kind === 234 && node.moduleReference.kind === 245;
+    }
+    ts.isExternalModuleImportEqualsDeclaration = isExternalModuleImportEqualsDeclaration;
+    function getExternalModuleImportEqualsDeclarationExpression(node) {
+        ts.Debug.assert(isExternalModuleImportEqualsDeclaration(node));
+        return node.moduleReference.expression;
+    }
+    ts.getExternalModuleImportEqualsDeclarationExpression = getExternalModuleImportEqualsDeclarationExpression;
+    function isInternalModuleImportEqualsDeclaration(node) {
+        return node.kind === 234 && node.moduleReference.kind !== 245;
+    }
+    ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration;
+    function isSourceFileJavaScript(file) {
+        return isInJavaScriptFile(file);
+    }
+    ts.isSourceFileJavaScript = isSourceFileJavaScript;
+    function isInJavaScriptFile(node) {
+        return node && !!(node.flags & 2097152);
+    }
+    ts.isInJavaScriptFile = isInJavaScriptFile;
+    function isRequireCall(expression, checkArgumentIsStringLiteral) {
+        var isRequire = expression.kind === 179 &&
+            expression.expression.kind === 70 &&
+            expression.expression.text === "require" &&
+            expression.arguments.length === 1;
+        return isRequire && (!checkArgumentIsStringLiteral || expression.arguments[0].kind === 9);
+    }
+    ts.isRequireCall = isRequireCall;
+    function isSingleOrDoubleQuote(charCode) {
+        return charCode === 39 || charCode === 34;
+    }
+    ts.isSingleOrDoubleQuote = isSingleOrDoubleQuote;
+    function isDeclarationOfFunctionExpression(s) {
+        if (s.valueDeclaration && s.valueDeclaration.kind === 223) {
+            var declaration = s.valueDeclaration;
+            return declaration.initializer && declaration.initializer.kind === 184;
+        }
+        return false;
+    }
+    ts.isDeclarationOfFunctionExpression = isDeclarationOfFunctionExpression;
+    function getSpecialPropertyAssignmentKind(expression) {
+        if (!isInJavaScriptFile(expression)) {
+            return 0;
+        }
+        if (expression.kind !== 192) {
+            return 0;
+        }
+        var expr = expression;
+        if (expr.operatorToken.kind !== 57 || expr.left.kind !== 177) {
+            return 0;
+        }
+        var lhs = expr.left;
+        if (lhs.expression.kind === 70) {
+            var lhsId = lhs.expression;
+            if (lhsId.text === "exports") {
+                return 1;
+            }
+            else if (lhsId.text === "module" && lhs.name.text === "exports") {
+                return 2;
+            }
+        }
+        else if (lhs.expression.kind === 98) {
+            return 4;
+        }
+        else if (lhs.expression.kind === 177) {
+            var innerPropertyAccess = lhs.expression;
+            if (innerPropertyAccess.expression.kind === 70) {
+                var innerPropertyAccessIdentifier = innerPropertyAccess.expression;
+                if (innerPropertyAccessIdentifier.text === "module" && innerPropertyAccess.name.text === "exports") {
+                    return 1;
+                }
+                if (innerPropertyAccess.name.text === "prototype") {
+                    return 3;
+                }
+            }
+        }
+        return 0;
+    }
+    ts.getSpecialPropertyAssignmentKind = getSpecialPropertyAssignmentKind;
+    function getExternalModuleName(node) {
+        if (node.kind === 235) {
+            return node.moduleSpecifier;
+        }
+        if (node.kind === 234) {
+            var reference = node.moduleReference;
+            if (reference.kind === 245) {
+                return reference.expression;
+            }
+        }
+        if (node.kind === 241) {
+            return node.moduleSpecifier;
+        }
+        if (node.kind === 230 && node.name.kind === 9) {
+            return node.name;
+        }
+    }
+    ts.getExternalModuleName = getExternalModuleName;
+    function getNamespaceDeclarationNode(node) {
+        if (node.kind === 234) {
+            return node;
+        }
+        var importClause = node.importClause;
+        if (importClause && importClause.namedBindings && importClause.namedBindings.kind === 237) {
+            return importClause.namedBindings;
+        }
+    }
+    ts.getNamespaceDeclarationNode = getNamespaceDeclarationNode;
+    function isDefaultImport(node) {
+        return node.kind === 235
+            && node.importClause
+            && !!node.importClause.name;
+    }
+    ts.isDefaultImport = isDefaultImport;
+    function hasQuestionToken(node) {
+        if (node) {
+            switch (node.kind) {
+                case 144:
+                case 149:
+                case 148:
+                case 258:
+                case 257:
+                case 147:
+                case 146:
+                    return node.questionToken !== undefined;
+            }
+        }
+        return false;
+    }
+    ts.hasQuestionToken = hasQuestionToken;
+    function isJSDocConstructSignature(node) {
+        return node.kind === 274 &&
+            node.parameters.length > 0 &&
+            node.parameters[0].type.kind === 276;
+    }
+    ts.isJSDocConstructSignature = isJSDocConstructSignature;
+    function getJSDocTag(node, kind, checkParentVariableStatement) {
+        if (!node) {
+            return undefined;
+        }
+        var jsDocTags = getJSDocTags(node, checkParentVariableStatement);
+        if (!jsDocTags) {
+            return undefined;
+        }
+        for (var _i = 0, jsDocTags_1 = jsDocTags; _i < jsDocTags_1.length; _i++) {
+            var tag = jsDocTags_1[_i];
+            if (tag.kind === kind) {
+                return tag;
+            }
+        }
+    }
+    function append(previous, additional) {
+        if (additional) {
+            if (!previous) {
+                previous = [];
+            }
+            for (var _i = 0, additional_1 = additional; _i < additional_1.length; _i++) {
+                var x = additional_1[_i];
+                previous.push(x);
+            }
+        }
+        return previous;
+    }
+    function getJSDocComments(node, checkParentVariableStatement) {
+        return getJSDocs(node, checkParentVariableStatement, function (docs) { return ts.map(docs, function (doc) { return doc.comment; }); }, function (tags) { return ts.map(tags, function (tag) { return tag.comment; }); });
+    }
+    ts.getJSDocComments = getJSDocComments;
+    function getJSDocTags(node, checkParentVariableStatement) {
+        return getJSDocs(node, checkParentVariableStatement, function (docs) {
+            var result = [];
+            for (var _i = 0, docs_1 = docs; _i < docs_1.length; _i++) {
+                var doc = docs_1[_i];
+                if (doc.tags) {
+                    result.push.apply(result, doc.tags);
+                }
+            }
+            return result;
+        }, function (tags) { return tags; });
+    }
+    function getJSDocs(node, checkParentVariableStatement, getDocs, getTags) {
+        var result = undefined;
+        if (checkParentVariableStatement) {
+            var isInitializerOfVariableDeclarationInStatement = isVariableLike(node.parent) &&
+                (node.parent).initializer === node &&
+                node.parent.parent.parent.kind === 205;
+            var isVariableOfVariableDeclarationStatement = isVariableLike(node) &&
+                node.parent.parent.kind === 205;
+            var variableStatementNode = isInitializerOfVariableDeclarationInStatement ? node.parent.parent.parent :
+                isVariableOfVariableDeclarationStatement ? node.parent.parent :
+                    undefined;
+            if (variableStatementNode) {
+                result = append(result, getJSDocs(variableStatementNode, checkParentVariableStatement, getDocs, getTags));
+            }
+            if (node.kind === 230 &&
+                node.parent && node.parent.kind === 230) {
+                result = append(result, getJSDocs(node.parent, checkParentVariableStatement, getDocs, getTags));
+            }
+            var parent_4 = node.parent;
+            var isSourceOfAssignmentExpressionStatement = parent_4 && parent_4.parent &&
+                parent_4.kind === 192 &&
+                parent_4.operatorToken.kind === 57 &&
+                parent_4.parent.kind === 207;
+            if (isSourceOfAssignmentExpressionStatement) {
+                result = append(result, getJSDocs(parent_4.parent, checkParentVariableStatement, getDocs, getTags));
+            }
+            var isPropertyAssignmentExpression = parent_4 && parent_4.kind === 257;
+            if (isPropertyAssignmentExpression) {
+                result = append(result, getJSDocs(parent_4, checkParentVariableStatement, getDocs, getTags));
+            }
+            if (node.kind === 144) {
+                var paramTags = getJSDocParameterTag(node, checkParentVariableStatement);
+                if (paramTags) {
+                    result = append(result, getTags(paramTags));
+                }
+            }
+        }
+        if (isVariableLike(node) && node.initializer) {
+            result = append(result, getJSDocs(node.initializer, false, getDocs, getTags));
+        }
+        if (node.jsDocComments) {
+            if (result) {
+                result = append(result, getDocs(node.jsDocComments));
+            }
+            else {
+                return getDocs(node.jsDocComments);
+            }
+        }
+        return result;
+    }
+    function getJSDocParameterTag(param, checkParentVariableStatement) {
+        var func = param.parent;
+        var tags = getJSDocTags(func, checkParentVariableStatement);
+        if (!param.name) {
+            var i = func.parameters.indexOf(param);
+            var paramTags = ts.filter(tags, function (tag) { return tag.kind === 280; });
+            if (paramTags && 0 <= i && i < paramTags.length) {
+                return [paramTags[i]];
+            }
+        }
+        else if (param.name.kind === 70) {
+            var name_8 = param.name.text;
+            var paramTags = ts.filter(tags, function (tag) { return tag.kind === 280 && tag.parameterName.text === name_8; });
+            if (paramTags) {
+                return paramTags;
+            }
+        }
+        else {
+            return undefined;
+        }
+    }
+    function getJSDocTypeTag(node) {
+        return getJSDocTag(node, 282, false);
+    }
+    ts.getJSDocTypeTag = getJSDocTypeTag;
+    function getJSDocReturnTag(node) {
+        return getJSDocTag(node, 281, true);
+    }
+    ts.getJSDocReturnTag = getJSDocReturnTag;
+    function getJSDocTemplateTag(node) {
+        return getJSDocTag(node, 283, false);
+    }
+    ts.getJSDocTemplateTag = getJSDocTemplateTag;
+    function getCorrespondingJSDocParameterTag(parameter) {
+        if (parameter.name && parameter.name.kind === 70) {
+            var parameterName = parameter.name.text;
+            var jsDocTags = getJSDocTags(parameter.parent, true);
+            if (!jsDocTags) {
+                return undefined;
+            }
+            for (var _i = 0, jsDocTags_2 = jsDocTags; _i < jsDocTags_2.length; _i++) {
+                var tag = jsDocTags_2[_i];
+                if (tag.kind === 280) {
+                    var parameterTag = tag;
+                    if (parameterTag.parameterName.text === parameterName) {
+                        return parameterTag;
+                    }
+                }
+            }
+        }
+        return undefined;
+    }
+    ts.getCorrespondingJSDocParameterTag = getCorrespondingJSDocParameterTag;
+    function hasRestParameter(s) {
+        return isRestParameter(ts.lastOrUndefined(s.parameters));
+    }
+    ts.hasRestParameter = hasRestParameter;
+    function hasDeclaredRestParameter(s) {
+        return isDeclaredRestParam(ts.lastOrUndefined(s.parameters));
+    }
+    ts.hasDeclaredRestParameter = hasDeclaredRestParameter;
+    function isRestParameter(node) {
+        if (node && (node.flags & 2097152)) {
+            if (node.type && node.type.kind === 275) {
+                return true;
+            }
+            var paramTag = getCorrespondingJSDocParameterTag(node);
+            if (paramTag && paramTag.typeExpression) {
+                return paramTag.typeExpression.type.kind === 275;
+            }
+        }
+        return isDeclaredRestParam(node);
+    }
+    ts.isRestParameter = isRestParameter;
+    function isDeclaredRestParam(node) {
+        return node && node.dotDotDotToken !== undefined;
+    }
+    ts.isDeclaredRestParam = isDeclaredRestParam;
+    function getAssignmentTargetKind(node) {
+        var parent = node.parent;
+        while (true) {
+            switch (parent.kind) {
+                case 192:
+                    var binaryOperator = parent.operatorToken.kind;
+                    return isAssignmentOperator(binaryOperator) && parent.left === node ?
+                        binaryOperator === 57 ? 1 : 2 :
+                        0;
+                case 190:
+                case 191:
+                    var unaryOperator = parent.operator;
+                    return unaryOperator === 42 || unaryOperator === 43 ? 2 : 0;
+                case 212:
+                case 213:
+                    return parent.initializer === node ? 1 : 0;
+                case 183:
+                case 175:
+                case 196:
+                    node = parent;
+                    break;
+                case 258:
+                    if (parent.name !== node) {
+                        return 0;
+                    }
+                case 257:
+                    node = parent.parent;
+                    break;
+                default:
+                    return 0;
+            }
+            parent = node.parent;
+        }
+    }
+    ts.getAssignmentTargetKind = getAssignmentTargetKind;
+    function isAssignmentTarget(node) {
+        return getAssignmentTargetKind(node) !== 0;
+    }
+    ts.isAssignmentTarget = isAssignmentTarget;
+    function isNodeDescendantOf(node, ancestor) {
+        while (node) {
+            if (node === ancestor)
+                return true;
+            node = node.parent;
+        }
+        return false;
+    }
+    ts.isNodeDescendantOf = isNodeDescendantOf;
+    function isInAmbientContext(node) {
+        while (node) {
+            if (hasModifier(node, 2) || (node.kind === 261 && node.isDeclarationFile)) {
+                return true;
+            }
+            node = node.parent;
+        }
+        return false;
+    }
+    ts.isInAmbientContext = isInAmbientContext;
+    function isDeclarationName(name) {
+        if (name.kind !== 70 && name.kind !== 9 && name.kind !== 8) {
+            return false;
+        }
+        var parent = name.parent;
+        if (parent.kind === 239 || parent.kind === 243) {
+            if (parent.propertyName) {
+                return true;
+            }
+        }
+        if (isDeclaration(parent)) {
+            return parent.name === name;
+        }
+        return false;
+    }
+    ts.isDeclarationName = isDeclarationName;
+    function isLiteralComputedPropertyDeclarationName(node) {
+        return (node.kind === 9 || node.kind === 8) &&
+            node.parent.kind === 142 &&
+            isDeclaration(node.parent.parent);
+    }
+    ts.isLiteralComputedPropertyDeclarationName = isLiteralComputedPropertyDeclarationName;
+    function isIdentifierName(node) {
+        var parent = node.parent;
+        switch (parent.kind) {
+            case 147:
+            case 146:
+            case 149:
+            case 148:
+            case 151:
+            case 152:
+            case 260:
+            case 257:
+            case 177:
+                return parent.name === node;
+            case 141:
+                if (parent.right === node) {
+                    while (parent.kind === 141) {
+                        parent = parent.parent;
+                    }
+                    return parent.kind === 160;
+                }
+                return false;
+            case 174:
+            case 239:
+                return parent.propertyName === node;
+            case 243:
+                return true;
+        }
+        return false;
+    }
+    ts.isIdentifierName = isIdentifierName;
+    function isAliasSymbolDeclaration(node) {
+        return node.kind === 234 ||
+            node.kind === 233 ||
+            node.kind === 236 && !!node.name ||
+            node.kind === 237 ||
+            node.kind === 239 ||
+            node.kind === 243 ||
+            node.kind === 240 && exportAssignmentIsAlias(node);
+    }
+    ts.isAliasSymbolDeclaration = isAliasSymbolDeclaration;
+    function exportAssignmentIsAlias(node) {
+        return isEntityNameExpression(node.expression);
+    }
+    ts.exportAssignmentIsAlias = exportAssignmentIsAlias;
+    function getClassExtendsHeritageClauseElement(node) {
+        var heritageClause = getHeritageClause(node.heritageClauses, 84);
+        return heritageClause && heritageClause.types.length > 0 ? heritageClause.types[0] : undefined;
+    }
+    ts.getClassExtendsHeritageClauseElement = getClassExtendsHeritageClauseElement;
+    function getClassImplementsHeritageClauseElements(node) {
+        var heritageClause = getHeritageClause(node.heritageClauses, 107);
+        return heritageClause ? heritageClause.types : undefined;
+    }
+    ts.getClassImplementsHeritageClauseElements = getClassImplementsHeritageClauseElements;
+    function getInterfaceBaseTypeNodes(node) {
+        var heritageClause = getHeritageClause(node.heritageClauses, 84);
+        return heritageClause ? heritageClause.types : undefined;
+    }
+    ts.getInterfaceBaseTypeNodes = getInterfaceBaseTypeNodes;
+    function getHeritageClause(clauses, kind) {
+        if (clauses) {
+            for (var _i = 0, clauses_1 = clauses; _i < clauses_1.length; _i++) {
+                var clause = clauses_1[_i];
+                if (clause.token === kind) {
+                    return clause;
+                }
+            }
+        }
+        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) {
+                return node;
+            }
+            node = node.parent;
+        }
+        return undefined;
+    }
+    ts.getAncestor = getAncestor;
+    function getFileReferenceFromReferencePath(comment, commentRange) {
+        var simpleReferenceRegEx = /^\/\/\/\s*<reference\s+/gim;
+        var isNoDefaultLibRegEx = /^(\/\/\/\s*<reference\s+no-default-lib\s*=\s*)('|")(.+?)\2\s*\/>/gim;
+        if (simpleReferenceRegEx.test(comment)) {
+            if (isNoDefaultLibRegEx.test(comment)) {
+                return {
+                    isNoDefaultLib: true
+                };
+            }
+            else {
+                var refMatchResult = ts.fullTripleSlashReferencePathRegEx.exec(comment);
+                var refLibResult = !refMatchResult && ts.fullTripleSlashReferenceTypeReferenceDirectiveRegEx.exec(comment);
+                if (refMatchResult || refLibResult) {
+                    var start = commentRange.pos;
+                    var end = commentRange.end;
+                    return {
+                        fileReference: {
+                            pos: start,
+                            end: end,
+                            fileName: (refMatchResult || refLibResult)[3]
+                        },
+                        isNoDefaultLib: false,
+                        isTypeReferenceDirective: !!refLibResult
+                    };
+                }
+                return {
+                    diagnosticMessage: ts.Diagnostics.Invalid_reference_directive_syntax,
+                    isNoDefaultLib: false
+                };
+            }
+        }
+        return undefined;
+    }
+    ts.getFileReferenceFromReferencePath = getFileReferenceFromReferencePath;
+    function isKeyword(token) {
+        return 71 <= token && token <= 140;
+    }
+    ts.isKeyword = isKeyword;
+    function isTrivia(token) {
+        return 2 <= token && token <= 7;
+    }
+    ts.isTrivia = isTrivia;
+    function isAsyncFunctionLike(node) {
+        return isFunctionLike(node) && hasModifier(node, 256) && !isAccessor(node);
+    }
+    ts.isAsyncFunctionLike = isAsyncFunctionLike;
+    function isStringOrNumericLiteral(kind) {
+        return kind === 9 || kind === 8;
+    }
+    ts.isStringOrNumericLiteral = isStringOrNumericLiteral;
+    function hasDynamicName(declaration) {
+        return declaration.name && isDynamicName(declaration.name);
+    }
+    ts.hasDynamicName = hasDynamicName;
+    function isDynamicName(name) {
+        return name.kind === 142 &&
+            !isStringOrNumericLiteral(name.expression.kind) &&
+            !isWellKnownSymbolSyntactically(name.expression);
+    }
+    ts.isDynamicName = isDynamicName;
+    function isWellKnownSymbolSyntactically(node) {
+        return isPropertyAccessExpression(node) && isESSymbolIdentifier(node.expression);
+    }
+    ts.isWellKnownSymbolSyntactically = isWellKnownSymbolSyntactically;
+    function getPropertyNameForPropertyNameNode(name) {
+        if (name.kind === 70 || name.kind === 9 || name.kind === 8 || name.kind === 144) {
+            return name.text;
+        }
+        if (name.kind === 142) {
+            var nameExpression = name.expression;
+            if (isWellKnownSymbolSyntactically(nameExpression)) {
+                var rightHandSideName = nameExpression.name.text;
+                return getPropertyNameForKnownSymbolName(rightHandSideName);
+            }
+            else if (nameExpression.kind === 9 || nameExpression.kind === 8) {
+                return nameExpression.text;
+            }
+        }
+        return undefined;
+    }
+    ts.getPropertyNameForPropertyNameNode = getPropertyNameForPropertyNameNode;
+    function getPropertyNameForKnownSymbolName(symbolName) {
+        return "__@" + symbolName;
+    }
+    ts.getPropertyNameForKnownSymbolName = getPropertyNameForKnownSymbolName;
+    function isESSymbolIdentifier(node) {
+        return node.kind === 70 && node.text === "Symbol";
+    }
+    ts.isESSymbolIdentifier = isESSymbolIdentifier;
+    function isPushOrUnshiftIdentifier(node) {
+        return node.text === "push" || node.text === "unshift";
+    }
+    ts.isPushOrUnshiftIdentifier = isPushOrUnshiftIdentifier;
+    function isModifierKind(token) {
+        switch (token) {
+            case 116:
+            case 119:
+            case 75:
+            case 123:
+            case 78:
+            case 83:
+            case 113:
+            case 111:
+            case 112:
+            case 130:
+            case 114:
+                return true;
+        }
+        return false;
+    }
+    ts.isModifierKind = isModifierKind;
+    function isParameterDeclaration(node) {
+        var root = getRootDeclaration(node);
+        return root.kind === 144;
+    }
+    ts.isParameterDeclaration = isParameterDeclaration;
+    function getRootDeclaration(node) {
+        while (node.kind === 174) {
+            node = node.parent.parent;
+        }
+        return node;
+    }
+    ts.getRootDeclaration = getRootDeclaration;
+    function nodeStartsNewLexicalEnvironment(node) {
+        var kind = node.kind;
+        return kind === 150
+            || kind === 184
+            || kind === 225
+            || kind === 185
+            || kind === 149
+            || kind === 151
+            || kind === 152
+            || kind === 230
+            || kind === 261;
+    }
+    ts.nodeStartsNewLexicalEnvironment = nodeStartsNewLexicalEnvironment;
+    function nodeIsSynthesized(node) {
+        return ts.positionIsSynthesized(node.pos)
+            || ts.positionIsSynthesized(node.end);
+    }
+    ts.nodeIsSynthesized = nodeIsSynthesized;
+    function getOriginalNode(node, nodeTest) {
+        if (node) {
+            while (node.original !== undefined) {
+                node = node.original;
+            }
+        }
+        return !nodeTest || nodeTest(node) ? node : undefined;
+    }
+    ts.getOriginalNode = getOriginalNode;
+    function isParseTreeNode(node) {
+        return (node.flags & 8) === 0;
+    }
+    ts.isParseTreeNode = isParseTreeNode;
+    function getParseTreeNode(node, nodeTest) {
+        if (isParseTreeNode(node)) {
+            return node;
+        }
+        node = getOriginalNode(node);
+        if (isParseTreeNode(node) && (!nodeTest || nodeTest(node))) {
+            return node;
+        }
+        return undefined;
+    }
+    ts.getParseTreeNode = getParseTreeNode;
+    function getOriginalSourceFiles(sourceFiles) {
+        var originalSourceFiles = [];
+        for (var _i = 0, sourceFiles_1 = sourceFiles; _i < sourceFiles_1.length; _i++) {
+            var sourceFile = sourceFiles_1[_i];
+            var originalSourceFile = getParseTreeNode(sourceFile, isSourceFile);
+            if (originalSourceFile) {
+                originalSourceFiles.push(originalSourceFile);
+            }
+        }
+        return originalSourceFiles;
+    }
+    ts.getOriginalSourceFiles = getOriginalSourceFiles;
+    function getOriginalNodeId(node) {
+        node = getOriginalNode(node);
+        return node ? ts.getNodeId(node) : 0;
+    }
+    ts.getOriginalNodeId = getOriginalNodeId;
+    function getExpressionAssociativity(expression) {
+        var operator = getOperator(expression);
+        var hasArguments = expression.kind === 180 && expression.arguments !== undefined;
+        return getOperatorAssociativity(expression.kind, operator, hasArguments);
+    }
+    ts.getExpressionAssociativity = getExpressionAssociativity;
+    function getOperatorAssociativity(kind, operator, hasArguments) {
+        switch (kind) {
+            case 180:
+                return hasArguments ? 0 : 1;
+            case 190:
+            case 187:
+            case 188:
+            case 186:
+            case 189:
+            case 193:
+            case 195:
+                return 1;
+            case 192:
+                switch (operator) {
+                    case 39:
+                    case 57:
+                    case 58:
+                    case 59:
+                    case 61:
+                    case 60:
+                    case 62:
+                    case 63:
+                    case 64:
+                    case 65:
+                    case 66:
+                    case 67:
+                    case 69:
+                    case 68:
+                        return 1;
+                }
+        }
+        return 0;
+    }
+    ts.getOperatorAssociativity = getOperatorAssociativity;
+    function getExpressionPrecedence(expression) {
+        var operator = getOperator(expression);
+        var hasArguments = expression.kind === 180 && expression.arguments !== undefined;
+        return getOperatorPrecedence(expression.kind, operator, hasArguments);
+    }
+    ts.getExpressionPrecedence = getExpressionPrecedence;
+    function getOperator(expression) {
+        if (expression.kind === 192) {
+            return expression.operatorToken.kind;
+        }
+        else if (expression.kind === 190 || expression.kind === 191) {
+            return expression.operator;
+        }
+        else {
+            return expression.kind;
+        }
+    }
+    ts.getOperator = getOperator;
+    function getOperatorPrecedence(nodeKind, operatorKind, hasArguments) {
+        switch (nodeKind) {
+            case 98:
+            case 96:
+            case 70:
+            case 94:
+            case 100:
+            case 85:
+            case 8:
+            case 9:
+            case 175:
+            case 176:
+            case 184:
+            case 185:
+            case 197:
+            case 246:
+            case 247:
+            case 11:
+            case 12:
+            case 194:
+            case 183:
+            case 198:
+                return 19;
+            case 181:
+            case 177:
+            case 178:
+                return 18;
+            case 180:
+                return hasArguments ? 18 : 17;
+            case 179:
+                return 17;
+            case 191:
+                return 16;
+            case 190:
+            case 187:
+            case 188:
+            case 186:
+            case 189:
+                return 15;
+            case 192:
+                switch (operatorKind) {
+                    case 50:
+                    case 51:
+                        return 15;
+                    case 39:
+                    case 38:
+                    case 40:
+                    case 41:
+                        return 14;
+                    case 36:
+                    case 37:
+                        return 13;
+                    case 44:
+                    case 45:
+                    case 46:
+                        return 12;
+                    case 26:
+                    case 29:
+                    case 28:
+                    case 30:
+                    case 91:
+                    case 92:
+                        return 11;
+                    case 31:
+                    case 33:
+                    case 32:
+                    case 34:
+                        return 10;
+                    case 47:
+                        return 9;
+                    case 49:
+                        return 8;
+                    case 48:
+                        return 7;
+                    case 52:
+                        return 6;
+                    case 53:
+                        return 5;
+                    case 57:
+                    case 58:
+                    case 59:
+                    case 61:
+                    case 60:
+                    case 62:
+                    case 63:
+                    case 64:
+                    case 65:
+                    case 66:
+                    case 67:
+                    case 69:
+                    case 68:
+                        return 3;
+                    case 25:
+                        return 0;
+                    default:
+                        return -1;
+                }
+            case 193:
+                return 4;
+            case 195:
+                return 2;
+            case 196:
+                return 1;
+            default:
+                return -1;
+        }
+    }
+    ts.getOperatorPrecedence = getOperatorPrecedence;
+    function createDiagnosticCollection() {
+        var nonFileDiagnostics = [];
+        var fileDiagnostics = ts.createMap();
+        var diagnosticsModified = false;
+        var modificationCount = 0;
+        return {
+            add: add,
+            getGlobalDiagnostics: getGlobalDiagnostics,
+            getDiagnostics: getDiagnostics,
+            getModificationCount: getModificationCount,
+            reattachFileDiagnostics: reattachFileDiagnostics
+        };
+        function getModificationCount() {
+            return modificationCount;
+        }
+        function reattachFileDiagnostics(newFile) {
+            if (!ts.hasProperty(fileDiagnostics, newFile.fileName)) {
+                return;
+            }
+            for (var _i = 0, _a = fileDiagnostics[newFile.fileName]; _i < _a.length; _i++) {
+                var diagnostic = _a[_i];
+                diagnostic.file = newFile;
+            }
+        }
+        function add(diagnostic) {
+            var diagnostics;
+            if (diagnostic.file) {
+                diagnostics = fileDiagnostics[diagnostic.file.fileName];
+                if (!diagnostics) {
+                    diagnostics = [];
+                    fileDiagnostics[diagnostic.file.fileName] = diagnostics;
+                }
+            }
+            else {
+                diagnostics = nonFileDiagnostics;
+            }
+            diagnostics.push(diagnostic);
+            diagnosticsModified = true;
+            modificationCount++;
+        }
+        function getGlobalDiagnostics() {
+            sortAndDeduplicate();
+            return nonFileDiagnostics;
+        }
+        function getDiagnostics(fileName) {
+            sortAndDeduplicate();
+            if (fileName) {
+                return fileDiagnostics[fileName] || [];
+            }
+            var allDiagnostics = [];
+            function pushDiagnostic(d) {
+                allDiagnostics.push(d);
+            }
+            ts.forEach(nonFileDiagnostics, pushDiagnostic);
+            for (var key in fileDiagnostics) {
+                ts.forEach(fileDiagnostics[key], pushDiagnostic);
+            }
+            return ts.sortAndDeduplicateDiagnostics(allDiagnostics);
+        }
+        function sortAndDeduplicate() {
+            if (!diagnosticsModified) {
+                return;
+            }
+            diagnosticsModified = false;
+            nonFileDiagnostics = ts.sortAndDeduplicateDiagnostics(nonFileDiagnostics);
+            for (var key in fileDiagnostics) {
+                fileDiagnostics[key] = ts.sortAndDeduplicateDiagnostics(fileDiagnostics[key]);
+            }
+        }
+    }
+    ts.createDiagnosticCollection = createDiagnosticCollection;
+    var escapedCharsRegExp = /[\\\"\u0000-\u001f\t\v\f\b\r\n\u2028\u2029\u0085]/g;
+    var escapedCharsMap = ts.createMap({
+        "\0": "\\0",
+        "\t": "\\t",
+        "\v": "\\v",
+        "\f": "\\f",
+        "\b": "\\b",
+        "\r": "\\r",
+        "\n": "\\n",
+        "\\": "\\\\",
+        "\"": "\\\"",
+        "\u2028": "\\u2028",
+        "\u2029": "\\u2029",
+        "\u0085": "\\u0085"
+    });
+    function escapeString(s) {
+        s = escapedCharsRegExp.test(s) ? s.replace(escapedCharsRegExp, getReplacement) : s;
+        return s;
+        function getReplacement(c) {
+            return escapedCharsMap[c] || get16BitUnicodeEscapeSequence(c.charCodeAt(0));
+        }
+    }
+    ts.escapeString = escapeString;
+    function isIntrinsicJsxName(name) {
+        var ch = name.substr(0, 1);
+        return ch.toLowerCase() === ch;
+    }
+    ts.isIntrinsicJsxName = isIntrinsicJsxName;
+    function get16BitUnicodeEscapeSequence(charCode) {
+        var hexCharCode = charCode.toString(16).toUpperCase();
+        var paddedHexCode = ("0000" + hexCharCode).slice(-4);
+        return "\\u" + paddedHexCode;
+    }
+    var nonAsciiCharacters = /[^\u0000-\u007F]/g;
+    function escapeNonAsciiCharacters(s) {
+        return nonAsciiCharacters.test(s) ?
+            s.replace(nonAsciiCharacters, function (c) { return get16BitUnicodeEscapeSequence(c.charCodeAt(0)); }) :
+            s;
+    }
+    ts.escapeNonAsciiCharacters = escapeNonAsciiCharacters;
+    var indentStrings = ["", "    "];
+    function getIndentString(level) {
+        if (indentStrings[level] === undefined) {
+            indentStrings[level] = getIndentString(level - 1) + indentStrings[1];
+        }
+        return indentStrings[level];
+    }
+    ts.getIndentString = getIndentString;
+    function getIndentSize() {
+        return indentStrings[1].length;
+    }
+    ts.getIndentSize = getIndentSize;
+    function createTextWriter(newLine) {
+        var output;
+        var indent;
+        var lineStart;
+        var lineCount;
+        var linePos;
+        function write(s) {
+            if (s && s.length) {
+                if (lineStart) {
+                    output += getIndentString(indent);
+                    lineStart = false;
+                }
+                output += s;
+            }
+        }
+        function reset() {
+            output = "";
+            indent = 0;
+            lineStart = true;
+            lineCount = 0;
+            linePos = 0;
+        }
+        function rawWrite(s) {
+            if (s !== undefined) {
+                if (lineStart) {
+                    lineStart = false;
+                }
+                output += s;
+            }
+        }
+        function writeLiteral(s) {
+            if (s && s.length) {
+                write(s);
+                var lineStartsOfS = ts.computeLineStarts(s);
+                if (lineStartsOfS.length > 1) {
+                    lineCount = lineCount + lineStartsOfS.length - 1;
+                    linePos = output.length - s.length + ts.lastOrUndefined(lineStartsOfS);
+                }
+            }
+        }
+        function writeLine() {
+            if (!lineStart) {
+                output += newLine;
+                lineCount++;
+                linePos = output.length;
+                lineStart = true;
+            }
+        }
+        function writeTextOfNode(text, node) {
+            write(getTextOfNodeFromSourceText(text, node));
+        }
+        reset();
+        return {
+            write: write,
+            rawWrite: rawWrite,
+            writeTextOfNode: writeTextOfNode,
+            writeLiteral: writeLiteral,
+            writeLine: writeLine,
+            increaseIndent: function () { indent++; },
+            decreaseIndent: function () { indent--; },
+            getIndent: function () { return indent; },
+            getTextPos: function () { return output.length; },
+            getLine: function () { return lineCount + 1; },
+            getColumn: function () { return lineStart ? indent * getIndentSize() + 1 : output.length - linePos + 1; },
+            getText: function () { return output; },
+            isAtStartOfLine: function () { return lineStart; },
+            reset: reset
+        };
+    }
+    ts.createTextWriter = createTextWriter;
+    function getResolvedExternalModuleName(host, file) {
+        return file.moduleName || getExternalModuleNameFromPath(host, file.fileName);
+    }
+    ts.getResolvedExternalModuleName = getResolvedExternalModuleName;
+    function getExternalModuleNameFromDeclaration(host, resolver, declaration) {
+        var file = resolver.getExternalModuleFileFromDeclaration(declaration);
+        if (!file || isDeclarationFile(file)) {
+            return undefined;
+        }
+        return getResolvedExternalModuleName(host, file);
+    }
+    ts.getExternalModuleNameFromDeclaration = getExternalModuleNameFromDeclaration;
+    function getExternalModuleNameFromPath(host, fileName) {
+        var getCanonicalFileName = function (f) { return host.getCanonicalFileName(f); };
+        var dir = ts.toPath(host.getCommonSourceDirectory(), host.getCurrentDirectory(), getCanonicalFileName);
+        var filePath = ts.getNormalizedAbsolutePath(fileName, host.getCurrentDirectory());
+        var relativePath = ts.getRelativePathToDirectoryOrUrl(dir, filePath, dir, getCanonicalFileName, false);
+        return ts.removeFileExtension(relativePath);
+    }
+    ts.getExternalModuleNameFromPath = getExternalModuleNameFromPath;
+    function getOwnEmitOutputFilePath(sourceFile, host, extension) {
+        var compilerOptions = host.getCompilerOptions();
+        var emitOutputFilePathWithoutExtension;
+        if (compilerOptions.outDir) {
+            emitOutputFilePathWithoutExtension = ts.removeFileExtension(getSourceFilePathInNewDir(sourceFile, host, compilerOptions.outDir));
+        }
+        else {
+            emitOutputFilePathWithoutExtension = ts.removeFileExtension(sourceFile.fileName);
+        }
+        return emitOutputFilePathWithoutExtension + extension;
+    }
+    ts.getOwnEmitOutputFilePath = getOwnEmitOutputFilePath;
+    function getDeclarationEmitOutputFilePath(sourceFile, host) {
+        var options = host.getCompilerOptions();
+        var outputDir = options.declarationDir || options.outDir;
+        var path = outputDir
+            ? getSourceFilePathInNewDir(sourceFile, host, outputDir)
+            : sourceFile.fileName;
+        return ts.removeFileExtension(path) + ".d.ts";
+    }
+    ts.getDeclarationEmitOutputFilePath = getDeclarationEmitOutputFilePath;
+    function getSourceFilesToEmit(host, targetSourceFile) {
+        var options = host.getCompilerOptions();
+        if (options.outFile || options.out) {
+            var moduleKind = ts.getEmitModuleKind(options);
+            var moduleEmitEnabled = moduleKind === ts.ModuleKind.AMD || moduleKind === ts.ModuleKind.System;
+            var sourceFiles = getAllEmittableSourceFiles();
+            return ts.filter(sourceFiles, moduleEmitEnabled ? isNonDeclarationFile : isBundleEmitNonExternalModule);
+        }
+        else {
+            var sourceFiles = targetSourceFile === undefined ? getAllEmittableSourceFiles() : [targetSourceFile];
+            return filterSourceFilesInDirectory(sourceFiles, function (file) { return host.isSourceFileFromExternalLibrary(file); });
+        }
+        function getAllEmittableSourceFiles() {
+            return options.noEmitForJsFiles ? ts.filter(host.getSourceFiles(), function (sourceFile) { return !isSourceFileJavaScript(sourceFile); }) : host.getSourceFiles();
+        }
+    }
+    ts.getSourceFilesToEmit = getSourceFilesToEmit;
+    function filterSourceFilesInDirectory(sourceFiles, isSourceFileFromExternalLibrary) {
+        return ts.filter(sourceFiles, function (file) { return shouldEmitInDirectory(file, isSourceFileFromExternalLibrary); });
+    }
+    ts.filterSourceFilesInDirectory = filterSourceFilesInDirectory;
+    function isNonDeclarationFile(sourceFile) {
+        return !isDeclarationFile(sourceFile);
+    }
+    function shouldEmitInDirectory(sourceFile, isSourceFileFromExternalLibrary) {
+        return isNonDeclarationFile(sourceFile) && !isSourceFileFromExternalLibrary(sourceFile);
+    }
+    function isBundleEmitNonExternalModule(sourceFile) {
+        return isNonDeclarationFile(sourceFile) && !ts.isExternalModule(sourceFile);
+    }
+    function forEachTransformedEmitFile(host, sourceFiles, action, emitOnlyDtsFiles) {
+        var options = host.getCompilerOptions();
+        if (options.outFile || options.out) {
+            onBundledEmit(sourceFiles);
+        }
+        else {
+            for (var _i = 0, sourceFiles_2 = sourceFiles; _i < sourceFiles_2.length; _i++) {
+                var sourceFile = sourceFiles_2[_i];
+                if (!isDeclarationFile(sourceFile) && !host.isSourceFileFromExternalLibrary(sourceFile)) {
+                    onSingleFileEmit(host, sourceFile);
+                }
+            }
+        }
+        function onSingleFileEmit(host, sourceFile) {
+            var extension = ".js";
+            if (options.jsx === 1) {
+                if (isSourceFileJavaScript(sourceFile)) {
+                    if (ts.fileExtensionIs(sourceFile.fileName, ".jsx")) {
+                        extension = ".jsx";
+                    }
+                }
+                else if (sourceFile.languageVariant === 1) {
+                    extension = ".jsx";
+                }
+            }
+            var jsFilePath = getOwnEmitOutputFilePath(sourceFile, host, extension);
+            var sourceMapFilePath = getSourceMapFilePath(jsFilePath, options);
+            var declarationFilePath = !isSourceFileJavaScript(sourceFile) && (options.declaration || emitOnlyDtsFiles) ? getDeclarationEmitOutputFilePath(sourceFile, host) : undefined;
+            action(jsFilePath, sourceMapFilePath, declarationFilePath, [sourceFile], false);
+        }
+        function onBundledEmit(sourceFiles) {
+            if (sourceFiles.length) {
+                var jsFilePath = options.outFile || options.out;
+                var sourceMapFilePath = getSourceMapFilePath(jsFilePath, options);
+                var declarationFilePath = options.declaration ? ts.removeFileExtension(jsFilePath) + ".d.ts" : undefined;
+                action(jsFilePath, sourceMapFilePath, declarationFilePath, sourceFiles, true);
+            }
+        }
+    }
+    ts.forEachTransformedEmitFile = forEachTransformedEmitFile;
+    function getSourceMapFilePath(jsFilePath, options) {
+        return options.sourceMap ? jsFilePath + ".map" : undefined;
+    }
+    function forEachExpectedEmitFile(host, action, targetSourceFile, emitOnlyDtsFiles) {
+        var options = host.getCompilerOptions();
+        if (options.outFile || options.out) {
+            onBundledEmit(host);
+        }
+        else {
+            var sourceFiles = targetSourceFile === undefined ? getSourceFilesToEmit(host) : [targetSourceFile];
+            for (var _i = 0, sourceFiles_3 = sourceFiles; _i < sourceFiles_3.length; _i++) {
+                var sourceFile = sourceFiles_3[_i];
+                if (shouldEmitInDirectory(sourceFile, function (file) { return host.isSourceFileFromExternalLibrary(file); })) {
+                    onSingleFileEmit(host, sourceFile);
+                }
+            }
+        }
+        function onSingleFileEmit(host, sourceFile) {
+            var extension = ".js";
+            if (options.jsx === 1) {
+                if (isSourceFileJavaScript(sourceFile)) {
+                    if (ts.fileExtensionIs(sourceFile.fileName, ".jsx")) {
+                        extension = ".jsx";
+                    }
+                }
+                else if (sourceFile.languageVariant === 1) {
+                    extension = ".jsx";
+                }
+            }
+            var jsFilePath = getOwnEmitOutputFilePath(sourceFile, host, extension);
+            var declarationFilePath = !isSourceFileJavaScript(sourceFile) && (emitOnlyDtsFiles || options.declaration) ? getDeclarationEmitOutputFilePath(sourceFile, host) : undefined;
+            var emitFileNames = {
+                jsFilePath: jsFilePath,
+                sourceMapFilePath: getSourceMapFilePath(jsFilePath, options),
+                declarationFilePath: declarationFilePath
+            };
+            action(emitFileNames, [sourceFile], false, emitOnlyDtsFiles);
+        }
+        function onBundledEmit(host) {
+            var bundledSources = ts.filter(getSourceFilesToEmit(host), function (sourceFile) { return !isDeclarationFile(sourceFile) &&
+                !host.isSourceFileFromExternalLibrary(sourceFile) &&
+                (!ts.isExternalModule(sourceFile) ||
+                    !!ts.getEmitModuleKind(options)); });
+            if (bundledSources.length) {
+                var jsFilePath = options.outFile || options.out;
+                var emitFileNames = {
+                    jsFilePath: jsFilePath,
+                    sourceMapFilePath: getSourceMapFilePath(jsFilePath, options),
+                    declarationFilePath: options.declaration ? ts.removeFileExtension(jsFilePath) + ".d.ts" : undefined
+                };
+                action(emitFileNames, bundledSources, true, emitOnlyDtsFiles);
+            }
+        }
+    }
+    ts.forEachExpectedEmitFile = forEachExpectedEmitFile;
+    function getSourceFilePathInNewDir(sourceFile, host, newDirPath) {
+        var sourceFilePath = ts.getNormalizedAbsolutePath(sourceFile.fileName, host.getCurrentDirectory());
+        var commonSourceDirectory = host.getCommonSourceDirectory();
+        var isSourceFileInCommonSourceDirectory = host.getCanonicalFileName(sourceFilePath).indexOf(host.getCanonicalFileName(commonSourceDirectory)) === 0;
+        sourceFilePath = isSourceFileInCommonSourceDirectory ? sourceFilePath.substring(commonSourceDirectory.length) : sourceFilePath;
+        return ts.combinePaths(newDirPath, sourceFilePath);
+    }
+    ts.getSourceFilePathInNewDir = getSourceFilePathInNewDir;
+    function writeFile(host, diagnostics, fileName, data, writeByteOrderMark, sourceFiles) {
+        host.writeFile(fileName, data, writeByteOrderMark, function (hostErrorMessage) {
+            diagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Could_not_write_file_0_Colon_1, fileName, hostErrorMessage));
+        }, sourceFiles);
+    }
+    ts.writeFile = writeFile;
+    function getLineOfLocalPosition(currentSourceFile, pos) {
+        return ts.getLineAndCharacterOfPosition(currentSourceFile, pos).line;
+    }
+    ts.getLineOfLocalPosition = getLineOfLocalPosition;
+    function getLineOfLocalPositionFromLineMap(lineMap, pos) {
+        return ts.computeLineAndCharacterOfPosition(lineMap, pos).line;
+    }
+    ts.getLineOfLocalPositionFromLineMap = getLineOfLocalPositionFromLineMap;
+    function getFirstConstructorWithBody(node) {
+        return ts.forEach(node.members, function (member) {
+            if (member.kind === 150 && nodeIsPresent(member.body)) {
+                return member;
+            }
+        });
+    }
+    ts.getFirstConstructorWithBody = getFirstConstructorWithBody;
+    function getSetAccessorTypeAnnotationNode(accessor) {
+        if (accessor && accessor.parameters.length > 0) {
+            var hasThis = accessor.parameters.length === 2 && parameterIsThisKeyword(accessor.parameters[0]);
+            return accessor.parameters[hasThis ? 1 : 0].type;
+        }
+    }
+    ts.getSetAccessorTypeAnnotationNode = getSetAccessorTypeAnnotationNode;
+    function getThisParameter(signature) {
+        if (signature.parameters.length) {
+            var thisParameter = signature.parameters[0];
+            if (parameterIsThisKeyword(thisParameter)) {
+                return thisParameter;
+            }
+        }
+    }
+    ts.getThisParameter = getThisParameter;
+    function parameterIsThisKeyword(parameter) {
+        return isThisIdentifier(parameter.name);
+    }
+    ts.parameterIsThisKeyword = parameterIsThisKeyword;
+    function isThisIdentifier(node) {
+        return node && node.kind === 70 && identifierIsThisKeyword(node);
+    }
+    ts.isThisIdentifier = isThisIdentifier;
+    function identifierIsThisKeyword(id) {
+        return id.originalKeywordKind === 98;
+    }
+    ts.identifierIsThisKeyword = identifierIsThisKeyword;
+    function getAllAccessorDeclarations(declarations, accessor) {
+        var firstAccessor;
+        var secondAccessor;
+        var getAccessor;
+        var setAccessor;
+        if (hasDynamicName(accessor)) {
+            firstAccessor = accessor;
+            if (accessor.kind === 151) {
+                getAccessor = accessor;
+            }
+            else if (accessor.kind === 152) {
+                setAccessor = accessor;
+            }
+            else {
+                ts.Debug.fail("Accessor has wrong kind");
+            }
+        }
+        else {
+            ts.forEach(declarations, function (member) {
+                if ((member.kind === 151 || member.kind === 152)
+                    && hasModifier(member, 32) === hasModifier(accessor, 32)) {
+                    var memberName = getPropertyNameForPropertyNameNode(member.name);
+                    var accessorName = getPropertyNameForPropertyNameNode(accessor.name);
+                    if (memberName === accessorName) {
+                        if (!firstAccessor) {
+                            firstAccessor = member;
+                        }
+                        else if (!secondAccessor) {
+                            secondAccessor = member;
+                        }
+                        if (member.kind === 151 && !getAccessor) {
+                            getAccessor = member;
+                        }
+                        if (member.kind === 152 && !setAccessor) {
+                            setAccessor = member;
+                        }
+                    }
+                }
+            });
+        }
+        return {
+            firstAccessor: firstAccessor,
+            secondAccessor: secondAccessor,
+            getAccessor: getAccessor,
+            setAccessor: setAccessor
+        };
+    }
+    ts.getAllAccessorDeclarations = getAllAccessorDeclarations;
+    function emitNewLineBeforeLeadingComments(lineMap, writer, node, leadingComments) {
+        emitNewLineBeforeLeadingCommentsOfPosition(lineMap, writer, node.pos, leadingComments);
+    }
+    ts.emitNewLineBeforeLeadingComments = emitNewLineBeforeLeadingComments;
+    function emitNewLineBeforeLeadingCommentsOfPosition(lineMap, writer, pos, leadingComments) {
+        if (leadingComments && leadingComments.length && pos !== leadingComments[0].pos &&
+            getLineOfLocalPositionFromLineMap(lineMap, pos) !== getLineOfLocalPositionFromLineMap(lineMap, leadingComments[0].pos)) {
+            writer.writeLine();
+        }
+    }
+    ts.emitNewLineBeforeLeadingCommentsOfPosition = emitNewLineBeforeLeadingCommentsOfPosition;
+    function emitNewLineBeforeLeadingCommentOfPosition(lineMap, writer, pos, commentPos) {
+        if (pos !== commentPos &&
+            getLineOfLocalPositionFromLineMap(lineMap, pos) !== getLineOfLocalPositionFromLineMap(lineMap, commentPos)) {
+            writer.writeLine();
+        }
+    }
+    ts.emitNewLineBeforeLeadingCommentOfPosition = emitNewLineBeforeLeadingCommentOfPosition;
+    function emitComments(text, lineMap, writer, comments, leadingSeparator, trailingSeparator, newLine, writeComment) {
+        if (comments && comments.length > 0) {
+            if (leadingSeparator) {
+                writer.write(" ");
+            }
+            var emitInterveningSeparator = false;
+            for (var _i = 0, comments_1 = comments; _i < comments_1.length; _i++) {
+                var comment = comments_1[_i];
+                if (emitInterveningSeparator) {
+                    writer.write(" ");
+                    emitInterveningSeparator = false;
+                }
+                writeComment(text, lineMap, writer, comment.pos, comment.end, newLine);
+                if (comment.hasTrailingNewLine) {
+                    writer.writeLine();
+                }
+                else {
+                    emitInterveningSeparator = true;
+                }
+            }
+            if (emitInterveningSeparator && trailingSeparator) {
+                writer.write(" ");
+            }
+        }
+    }
+    ts.emitComments = emitComments;
+    function emitDetachedComments(text, lineMap, writer, writeComment, node, newLine, removeComments) {
+        var leadingComments;
+        var currentDetachedCommentInfo;
+        if (removeComments) {
+            if (node.pos === 0) {
+                leadingComments = ts.filter(ts.getLeadingCommentRanges(text, node.pos), isPinnedComment);
+            }
+        }
+        else {
+            leadingComments = ts.getLeadingCommentRanges(text, node.pos);
+        }
+        if (leadingComments) {
+            var detachedComments = [];
+            var lastComment = void 0;
+            for (var _i = 0, leadingComments_1 = leadingComments; _i < leadingComments_1.length; _i++) {
+                var comment = leadingComments_1[_i];
+                if (lastComment) {
+                    var lastCommentLine = getLineOfLocalPositionFromLineMap(lineMap, lastComment.end);
+                    var commentLine = getLineOfLocalPositionFromLineMap(lineMap, comment.pos);
+                    if (commentLine >= lastCommentLine + 2) {
+                        break;
+                    }
+                }
+                detachedComments.push(comment);
+                lastComment = comment;
+            }
+            if (detachedComments.length) {
+                var lastCommentLine = getLineOfLocalPositionFromLineMap(lineMap, ts.lastOrUndefined(detachedComments).end);
+                var nodeLine = getLineOfLocalPositionFromLineMap(lineMap, ts.skipTrivia(text, node.pos));
+                if (nodeLine >= lastCommentLine + 2) {
+                    emitNewLineBeforeLeadingComments(lineMap, writer, node, leadingComments);
+                    emitComments(text, lineMap, writer, detachedComments, false, true, newLine, writeComment);
+                    currentDetachedCommentInfo = { nodePos: node.pos, detachedCommentEndPos: ts.lastOrUndefined(detachedComments).end };
+                }
+            }
+        }
+        return currentDetachedCommentInfo;
+        function isPinnedComment(comment) {
+            return text.charCodeAt(comment.pos + 1) === 42 &&
+                text.charCodeAt(comment.pos + 2) === 33;
+        }
+    }
+    ts.emitDetachedComments = emitDetachedComments;
+    function writeCommentRange(text, lineMap, writer, commentPos, commentEnd, newLine) {
+        if (text.charCodeAt(commentPos + 1) === 42) {
+            var firstCommentLineAndCharacter = ts.computeLineAndCharacterOfPosition(lineMap, commentPos);
+            var lineCount = lineMap.length;
+            var firstCommentLineIndent = void 0;
+            for (var pos = commentPos, currentLine = firstCommentLineAndCharacter.line; pos < commentEnd; currentLine++) {
+                var nextLineStart = (currentLine + 1) === lineCount
+                    ? text.length + 1
+                    : lineMap[currentLine + 1];
+                if (pos !== commentPos) {
+                    if (firstCommentLineIndent === undefined) {
+                        firstCommentLineIndent = calculateIndent(text, lineMap[firstCommentLineAndCharacter.line], commentPos);
+                    }
+                    var currentWriterIndentSpacing = writer.getIndent() * getIndentSize();
+                    var spacesToEmit = currentWriterIndentSpacing - firstCommentLineIndent + calculateIndent(text, pos, nextLineStart);
+                    if (spacesToEmit > 0) {
+                        var numberOfSingleSpacesToEmit = spacesToEmit % getIndentSize();
+                        var indentSizeSpaceString = getIndentString((spacesToEmit - numberOfSingleSpacesToEmit) / getIndentSize());
+                        writer.rawWrite(indentSizeSpaceString);
+                        while (numberOfSingleSpacesToEmit) {
+                            writer.rawWrite(" ");
+                            numberOfSingleSpacesToEmit--;
+                        }
+                    }
+                    else {
+                        writer.rawWrite("");
+                    }
+                }
+                writeTrimmedCurrentLine(text, commentEnd, writer, newLine, pos, nextLineStart);
+                pos = nextLineStart;
+            }
+        }
+        else {
+            writer.write(text.substring(commentPos, commentEnd));
+        }
+    }
+    ts.writeCommentRange = writeCommentRange;
+    function writeTrimmedCurrentLine(text, commentEnd, writer, newLine, pos, nextLineStart) {
+        var end = Math.min(commentEnd, nextLineStart - 1);
+        var currentLineText = text.substring(pos, end).replace(/^\s+|\s+$/g, "");
+        if (currentLineText) {
+            writer.write(currentLineText);
+            if (end !== commentEnd) {
+                writer.writeLine();
+            }
+        }
+        else {
+            writer.writeLiteral(newLine);
+        }
+    }
+    function calculateIndent(text, pos, end) {
+        var currentLineIndent = 0;
+        for (; pos < end && ts.isWhiteSpaceSingleLine(text.charCodeAt(pos)); pos++) {
+            if (text.charCodeAt(pos) === 9) {
+                currentLineIndent += getIndentSize() - (currentLineIndent % getIndentSize());
+            }
+            else {
+                currentLineIndent++;
+            }
+        }
+        return currentLineIndent;
+    }
+    function hasModifiers(node) {
+        return getModifierFlags(node) !== 0;
+    }
+    ts.hasModifiers = hasModifiers;
+    function hasModifier(node, flags) {
+        return (getModifierFlags(node) & flags) !== 0;
+    }
+    ts.hasModifier = hasModifier;
+    function getModifierFlags(node) {
+        if (node.modifierFlagsCache & 536870912) {
+            return node.modifierFlagsCache & ~536870912;
+        }
+        var flags = 0;
+        if (node.modifiers) {
+            for (var _i = 0, _a = node.modifiers; _i < _a.length; _i++) {
+                var modifier = _a[_i];
+                flags |= modifierToFlag(modifier.kind);
+            }
+        }
+        if (node.flags & 4 || (node.kind === 70 && node.isInJSDocNamespace)) {
+            flags |= 1;
+        }
+        node.modifierFlagsCache = flags | 536870912;
+        return flags;
+    }
+    ts.getModifierFlags = getModifierFlags;
+    function modifierToFlag(token) {
+        switch (token) {
+            case 114: return 32;
+            case 113: return 4;
+            case 112: return 16;
+            case 111: return 8;
+            case 116: return 128;
+            case 83: return 1;
+            case 123: return 2;
+            case 75: return 2048;
+            case 78: return 512;
+            case 119: return 256;
+            case 130: return 64;
+        }
+        return 0;
+    }
+    ts.modifierToFlag = modifierToFlag;
+    function isLogicalOperator(token) {
+        return token === 53
+            || token === 52
+            || token === 50;
+    }
+    ts.isLogicalOperator = isLogicalOperator;
+    function isAssignmentOperator(token) {
+        return token >= 57 && token <= 69;
+    }
+    ts.isAssignmentOperator = isAssignmentOperator;
+    function tryGetClassExtendingExpressionWithTypeArguments(node) {
+        if (node.kind === 199 &&
+            node.parent.token === 84 &&
+            isClassLike(node.parent.parent)) {
+            return node.parent.parent;
+        }
+    }
+    ts.tryGetClassExtendingExpressionWithTypeArguments = tryGetClassExtendingExpressionWithTypeArguments;
+    function isAssignmentExpression(node) {
+        return isBinaryExpression(node)
+            && isAssignmentOperator(node.operatorToken.kind)
+            && isLeftHandSideExpression(node.left);
+    }
+    ts.isAssignmentExpression = isAssignmentExpression;
+    function isDestructuringAssignment(node) {
+        if (isBinaryExpression(node)) {
+            if (node.operatorToken.kind === 57) {
+                var kind = node.left.kind;
+                return kind === 176
+                    || kind === 175;
+            }
+        }
+        return false;
+    }
+    ts.isDestructuringAssignment = isDestructuringAssignment;
+    function isSupportedExpressionWithTypeArguments(node) {
+        return isSupportedExpressionWithTypeArgumentsRest(node.expression);
+    }
+    ts.isSupportedExpressionWithTypeArguments = isSupportedExpressionWithTypeArguments;
+    function isSupportedExpressionWithTypeArgumentsRest(node) {
+        if (node.kind === 70) {
+            return true;
+        }
+        else if (isPropertyAccessExpression(node)) {
+            return isSupportedExpressionWithTypeArgumentsRest(node.expression);
+        }
+        else {
+            return false;
+        }
+    }
+    function isExpressionWithTypeArgumentsInClassExtendsClause(node) {
+        return tryGetClassExtendingExpressionWithTypeArguments(node) !== undefined;
+    }
+    ts.isExpressionWithTypeArgumentsInClassExtendsClause = isExpressionWithTypeArgumentsInClassExtendsClause;
+    function isEntityNameExpression(node) {
+        return node.kind === 70 ||
+            node.kind === 177 && isEntityNameExpression(node.expression);
+    }
+    ts.isEntityNameExpression = isEntityNameExpression;
+    function isRightSideOfQualifiedNameOrPropertyAccess(node) {
+        return (node.parent.kind === 141 && node.parent.right === node) ||
+            (node.parent.kind === 177 && node.parent.name === node);
+    }
+    ts.isRightSideOfQualifiedNameOrPropertyAccess = isRightSideOfQualifiedNameOrPropertyAccess;
+    function isEmptyObjectLiteralOrArrayLiteral(expression) {
+        var kind = expression.kind;
+        if (kind === 176) {
+            return expression.properties.length === 0;
+        }
+        if (kind === 175) {
+            return expression.elements.length === 0;
+        }
+        return false;
+    }
+    ts.isEmptyObjectLiteralOrArrayLiteral = isEmptyObjectLiteralOrArrayLiteral;
+    function getLocalSymbolForExportDefault(symbol) {
+        return symbol && symbol.valueDeclaration && hasModifier(symbol.valueDeclaration, 512) ? symbol.valueDeclaration.localSymbol : undefined;
+    }
+    ts.getLocalSymbolForExportDefault = getLocalSymbolForExportDefault;
+    function tryExtractTypeScriptExtension(fileName) {
+        return ts.find(ts.supportedTypescriptExtensionsForExtractExtension, function (extension) { return ts.fileExtensionIs(fileName, extension); });
+    }
+    ts.tryExtractTypeScriptExtension = tryExtractTypeScriptExtension;
+    function getExpandedCharCodes(input) {
+        var output = [];
+        var length = input.length;
+        for (var i = 0; i < length; i++) {
+            var charCode = input.charCodeAt(i);
+            if (charCode < 0x80) {
+                output.push(charCode);
+            }
+            else if (charCode < 0x800) {
+                output.push((charCode >> 6) | 192);
+                output.push((charCode & 63) | 128);
+            }
+            else if (charCode < 0x10000) {
+                output.push((charCode >> 12) | 224);
+                output.push(((charCode >> 6) & 63) | 128);
+                output.push((charCode & 63) | 128);
+            }
+            else if (charCode < 0x20000) {
+                output.push((charCode >> 18) | 240);
+                output.push(((charCode >> 12) & 63) | 128);
+                output.push(((charCode >> 6) & 63) | 128);
+                output.push((charCode & 63) | 128);
+            }
+            else {
+                ts.Debug.assert(false, "Unexpected code point");
+            }
+        }
+        return output;
+    }
+    ts.stringify = typeof JSON !== "undefined" && JSON.stringify
+        ? JSON.stringify
+        : stringifyFallback;
+    function stringifyFallback(value) {
+        return value === undefined ? undefined : stringifyValue(value);
+    }
+    function stringifyValue(value) {
+        return typeof value === "string" ? "\"" + escapeString(value) + "\""
+            : typeof value === "number" ? isFinite(value) ? String(value) : "null"
+                : typeof value === "boolean" ? value ? "true" : "false"
+                    : typeof value === "object" && value ? ts.isArray(value) ? cycleCheck(stringifyArray, value) : cycleCheck(stringifyObject, value)
+                        : "null";
+    }
+    function cycleCheck(cb, value) {
+        ts.Debug.assert(!value.hasOwnProperty("__cycle"), "Converting circular structure to JSON");
+        value.__cycle = true;
+        var result = cb(value);
+        delete value.__cycle;
+        return result;
+    }
+    function stringifyArray(value) {
+        return "[" + ts.reduceLeft(value, stringifyElement, "") + "]";
+    }
+    function stringifyElement(memo, value) {
+        return (memo ? memo + "," : memo) + stringifyValue(value);
+    }
+    function stringifyObject(value) {
+        return "{" + ts.reduceOwnProperties(value, stringifyProperty, "") + "}";
+    }
+    function stringifyProperty(memo, value, key) {
+        return value === undefined || typeof value === "function" || key === "__cycle" ? memo
+            : (memo ? memo + "," : memo) + ("\"" + escapeString(key) + "\":" + stringifyValue(value));
+    }
+    var base64Digits = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+    function convertToBase64(input) {
+        var result = "";
+        var charCodes = getExpandedCharCodes(input);
+        var i = 0;
+        var length = charCodes.length;
+        var byte1, byte2, byte3, byte4;
+        while (i < length) {
+            byte1 = charCodes[i] >> 2;
+            byte2 = (charCodes[i] & 3) << 4 | charCodes[i + 1] >> 4;
+            byte3 = (charCodes[i + 1] & 15) << 2 | charCodes[i + 2] >> 6;
+            byte4 = charCodes[i + 2] & 63;
+            if (i + 1 >= length) {
+                byte3 = byte4 = 64;
+            }
+            else if (i + 2 >= length) {
+                byte4 = 64;
+            }
+            result += base64Digits.charAt(byte1) + base64Digits.charAt(byte2) + base64Digits.charAt(byte3) + base64Digits.charAt(byte4);
+            i += 3;
+        }
+        return result;
+    }
+    ts.convertToBase64 = convertToBase64;
+    var carriageReturnLineFeed = "\r\n";
+    var lineFeed = "\n";
+    function getNewLineCharacter(options) {
+        if (options.newLine === 0) {
+            return carriageReturnLineFeed;
+        }
+        else if (options.newLine === 1) {
+            return lineFeed;
+        }
+        else if (ts.sys) {
+            return ts.sys.newLine;
+        }
+        return carriageReturnLineFeed;
+    }
+    ts.getNewLineCharacter = getNewLineCharacter;
+    function isSimpleExpression(node) {
+        return isSimpleExpressionWorker(node, 0);
+    }
+    ts.isSimpleExpression = isSimpleExpression;
+    function isSimpleExpressionWorker(node, depth) {
+        if (depth <= 5) {
+            var kind = node.kind;
+            if (kind === 9
+                || kind === 8
+                || kind === 11
+                || kind === 12
+                || kind === 70
+                || kind === 98
+                || kind === 96
+                || kind === 100
+                || kind === 85
+                || kind === 94) {
+                return true;
+            }
+            else if (kind === 177) {
+                return isSimpleExpressionWorker(node.expression, depth + 1);
+            }
+            else if (kind === 178) {
+                return isSimpleExpressionWorker(node.expression, depth + 1)
+                    && isSimpleExpressionWorker(node.argumentExpression, depth + 1);
+            }
+            else if (kind === 190
+                || kind === 191) {
+                return isSimpleExpressionWorker(node.operand, depth + 1);
+            }
+            else if (kind === 192) {
+                return node.operatorToken.kind !== 39
+                    && isSimpleExpressionWorker(node.left, depth + 1)
+                    && isSimpleExpressionWorker(node.right, depth + 1);
+            }
+            else if (kind === 193) {
+                return isSimpleExpressionWorker(node.condition, depth + 1)
+                    && isSimpleExpressionWorker(node.whenTrue, depth + 1)
+                    && isSimpleExpressionWorker(node.whenFalse, depth + 1);
+            }
+            else if (kind === 188
+                || kind === 187
+                || kind === 186) {
+                return isSimpleExpressionWorker(node.expression, depth + 1);
+            }
+            else if (kind === 175) {
+                return node.elements.length === 0;
+            }
+            else if (kind === 176) {
+                return node.properties.length === 0;
+            }
+            else if (kind === 179) {
+                if (!isSimpleExpressionWorker(node.expression, depth + 1)) {
+                    return false;
+                }
+                for (var _i = 0, _a = node.arguments; _i < _a.length; _i++) {
+                    var argument = _a[_i];
+                    if (!isSimpleExpressionWorker(argument, depth + 1)) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+        }
+        return false;
+    }
+    var syntaxKindCache = ts.createMap();
+    function formatSyntaxKind(kind) {
+        var syntaxKindEnum = ts.SyntaxKind;
+        if (syntaxKindEnum) {
+            if (syntaxKindCache[kind]) {
+                return syntaxKindCache[kind];
+            }
+            for (var name_9 in syntaxKindEnum) {
+                if (syntaxKindEnum[name_9] === kind) {
+                    return syntaxKindCache[kind] = kind.toString() + " (" + name_9 + ")";
+                }
+            }
+        }
+        else {
+            return kind.toString();
+        }
+    }
+    ts.formatSyntaxKind = formatSyntaxKind;
+    function movePos(pos, value) {
+        return ts.positionIsSynthesized(pos) ? -1 : pos + value;
+    }
+    ts.movePos = movePos;
+    function createRange(pos, end) {
+        return { pos: pos, end: end };
+    }
+    ts.createRange = createRange;
+    function moveRangeEnd(range, end) {
+        return createRange(range.pos, end);
+    }
+    ts.moveRangeEnd = moveRangeEnd;
+    function moveRangePos(range, pos) {
+        return createRange(pos, range.end);
+    }
+    ts.moveRangePos = moveRangePos;
+    function moveRangePastDecorators(node) {
+        return node.decorators && node.decorators.length > 0
+            ? moveRangePos(node, node.decorators.end)
+            : node;
+    }
+    ts.moveRangePastDecorators = moveRangePastDecorators;
+    function moveRangePastModifiers(node) {
+        return node.modifiers && node.modifiers.length > 0
+            ? moveRangePos(node, node.modifiers.end)
+            : moveRangePastDecorators(node);
+    }
+    ts.moveRangePastModifiers = moveRangePastModifiers;
+    function isCollapsedRange(range) {
+        return range.pos === range.end;
+    }
+    ts.isCollapsedRange = isCollapsedRange;
+    function collapseRangeToStart(range) {
+        return isCollapsedRange(range) ? range : moveRangeEnd(range, range.pos);
+    }
+    ts.collapseRangeToStart = collapseRangeToStart;
+    function collapseRangeToEnd(range) {
+        return isCollapsedRange(range) ? range : moveRangePos(range, range.end);
+    }
+    ts.collapseRangeToEnd = collapseRangeToEnd;
+    function createTokenRange(pos, token) {
+        return createRange(pos, pos + ts.tokenToString(token).length);
+    }
+    ts.createTokenRange = createTokenRange;
+    function rangeIsOnSingleLine(range, sourceFile) {
+        return rangeStartIsOnSameLineAsRangeEnd(range, range, sourceFile);
+    }
+    ts.rangeIsOnSingleLine = rangeIsOnSingleLine;
+    function rangeStartPositionsAreOnSameLine(range1, range2, sourceFile) {
+        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile), getStartPositionOfRange(range2, sourceFile), sourceFile);
+    }
+    ts.rangeStartPositionsAreOnSameLine = rangeStartPositionsAreOnSameLine;
+    function rangeEndPositionsAreOnSameLine(range1, range2, sourceFile) {
+        return positionsAreOnSameLine(range1.end, range2.end, sourceFile);
+    }
+    ts.rangeEndPositionsAreOnSameLine = rangeEndPositionsAreOnSameLine;
+    function rangeStartIsOnSameLineAsRangeEnd(range1, range2, sourceFile) {
+        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile), range2.end, sourceFile);
+    }
+    ts.rangeStartIsOnSameLineAsRangeEnd = rangeStartIsOnSameLineAsRangeEnd;
+    function rangeEndIsOnSameLineAsRangeStart(range1, range2, sourceFile) {
+        return positionsAreOnSameLine(range1.end, getStartPositionOfRange(range2, sourceFile), sourceFile);
+    }
+    ts.rangeEndIsOnSameLineAsRangeStart = rangeEndIsOnSameLineAsRangeStart;
+    function positionsAreOnSameLine(pos1, pos2, sourceFile) {
+        return pos1 === pos2 ||
+            getLineOfLocalPosition(sourceFile, pos1) === getLineOfLocalPosition(sourceFile, pos2);
+    }
+    ts.positionsAreOnSameLine = positionsAreOnSameLine;
+    function getStartPositionOfRange(range, sourceFile) {
+        return ts.positionIsSynthesized(range.pos) ? -1 : ts.skipTrivia(sourceFile.text, range.pos);
+    }
+    ts.getStartPositionOfRange = getStartPositionOfRange;
+    function collectExternalModuleInfo(sourceFile, resolver) {
+        var externalImports = [];
+        var exportSpecifiers = ts.createMap();
+        var exportedBindings = ts.createMap();
+        var uniqueExports = ts.createMap();
+        var hasExportDefault = false;
+        var exportEquals = undefined;
+        var hasExportStarsToExportValues = false;
+        for (var _i = 0, _a = sourceFile.statements; _i < _a.length; _i++) {
+            var node = _a[_i];
+            switch (node.kind) {
+                case 235:
+                    externalImports.push(node);
+                    break;
+                case 234:
+                    if (node.moduleReference.kind === 245) {
+                        externalImports.push(node);
+                    }
+                    break;
+                case 241:
+                    if (node.moduleSpecifier) {
+                        if (!node.exportClause) {
+                            externalImports.push(node);
+                            hasExportStarsToExportValues = true;
+                        }
+                        else {
+                            externalImports.push(node);
+                        }
+                    }
+                    else {
+                        for (var _b = 0, _c = node.exportClause.elements; _b < _c.length; _b++) {
+                            var specifier = _c[_b];
+                            if (!uniqueExports[specifier.name.text]) {
+                                var name_10 = specifier.propertyName || specifier.name;
+                                ts.multiMapAdd(exportSpecifiers, name_10.text, specifier);
+                                var decl = resolver.getReferencedImportDeclaration(name_10)
+                                    || resolver.getReferencedValueDeclaration(name_10);
+                                if (decl) {
+                                    ts.multiMapAdd(exportedBindings, getOriginalNodeId(decl), specifier.name);
+                                }
+                                uniqueExports[specifier.name.text] = specifier.name;
+                            }
+                        }
+                    }
+                    break;
+                case 240:
+                    if (node.isExportEquals && !exportEquals) {
+                        exportEquals = node;
+                    }
+                    break;
+                case 205:
+                    if (hasModifier(node, 1)) {
+                        for (var _d = 0, _e = node.declarationList.declarations; _d < _e.length; _d++) {
+                            var decl = _e[_d];
+                            collectExportedVariableInfo(decl, uniqueExports);
+                        }
+                    }
+                    break;
+                case 225:
+                    if (hasModifier(node, 1)) {
+                        if (hasModifier(node, 512)) {
+                            if (!hasExportDefault) {
+                                ts.multiMapAdd(exportedBindings, getOriginalNodeId(node), ts.getDeclarationName(node));
+                                hasExportDefault = true;
+                            }
+                        }
+                        else {
+                            var name_11 = node.name;
+                            if (!uniqueExports[name_11.text]) {
+                                ts.multiMapAdd(exportedBindings, getOriginalNodeId(node), name_11);
+                                uniqueExports[name_11.text] = name_11;
+                            }
+                        }
+                    }
+                    break;
+                case 226:
+                    if (hasModifier(node, 1)) {
+                        if (hasModifier(node, 512)) {
+                            if (!hasExportDefault) {
+                                ts.multiMapAdd(exportedBindings, getOriginalNodeId(node), ts.getDeclarationName(node));
+                                hasExportDefault = true;
+                            }
+                        }
+                        else {
+                            var name_12 = node.name;
+                            if (!uniqueExports[name_12.text]) {
+                                ts.multiMapAdd(exportedBindings, getOriginalNodeId(node), name_12);
+                                uniqueExports[name_12.text] = name_12;
+                            }
+                        }
+                    }
+                    break;
+            }
+        }
+        var exportedNames;
+        for (var key in uniqueExports) {
+            exportedNames = ts.append(exportedNames, uniqueExports[key]);
+        }
+        return { externalImports: externalImports, exportSpecifiers: exportSpecifiers, exportEquals: exportEquals, hasExportStarsToExportValues: hasExportStarsToExportValues, exportedBindings: exportedBindings, exportedNames: exportedNames };
+    }
+    ts.collectExternalModuleInfo = collectExternalModuleInfo;
+    function collectExportedVariableInfo(decl, uniqueExports) {
+        if (isBindingPattern(decl.name)) {
+            for (var _i = 0, _a = decl.name.elements; _i < _a.length; _i++) {
+                var element = _a[_i];
+                if (!isOmittedExpression(element)) {
+                    collectExportedVariableInfo(element, uniqueExports);
+                }
+            }
+        }
+        else if (!isGeneratedIdentifier(decl.name)) {
+            if (!uniqueExports[decl.name.text]) {
+                uniqueExports[decl.name.text] = decl.name;
+            }
+        }
+    }
+    function isDeclarationNameOfEnumOrNamespace(node) {
+        var parseNode = getParseTreeNode(node);
+        if (parseNode) {
+            switch (parseNode.parent.kind) {
+                case 229:
+                case 230:
+                    return parseNode === parseNode.parent.name;
+            }
+        }
+        return false;
+    }
+    ts.isDeclarationNameOfEnumOrNamespace = isDeclarationNameOfEnumOrNamespace;
+    function getInitializedVariables(node) {
+        return ts.filter(node.declarations, isInitializedVariable);
+    }
+    ts.getInitializedVariables = getInitializedVariables;
+    function isInitializedVariable(node) {
+        return node.initializer !== undefined;
+    }
+    function isMergedWithClass(node) {
+        if (node.symbol) {
+            for (var _i = 0, _a = node.symbol.declarations; _i < _a.length; _i++) {
+                var declaration = _a[_i];
+                if (declaration.kind === 226 && declaration !== node) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+    ts.isMergedWithClass = isMergedWithClass;
+    function isFirstDeclarationOfKind(node, kind) {
+        return node.symbol && getDeclarationOfKind(node.symbol, kind) === node;
+    }
+    ts.isFirstDeclarationOfKind = isFirstDeclarationOfKind;
+    function isNodeArray(array) {
+        return array.hasOwnProperty("pos")
+            && array.hasOwnProperty("end");
+    }
+    ts.isNodeArray = isNodeArray;
+    function isNoSubstitutionTemplateLiteral(node) {
+        return node.kind === 12;
+    }
+    ts.isNoSubstitutionTemplateLiteral = isNoSubstitutionTemplateLiteral;
+    function isLiteralKind(kind) {
+        return 8 <= kind && kind <= 12;
+    }
+    ts.isLiteralKind = isLiteralKind;
+    function isTextualLiteralKind(kind) {
+        return kind === 9 || kind === 12;
+    }
+    ts.isTextualLiteralKind = isTextualLiteralKind;
+    function isLiteralExpression(node) {
+        return isLiteralKind(node.kind);
+    }
+    ts.isLiteralExpression = isLiteralExpression;
+    function isTemplateLiteralKind(kind) {
+        return 12 <= kind && kind <= 15;
+    }
+    ts.isTemplateLiteralKind = isTemplateLiteralKind;
+    function isTemplateHead(node) {
+        return node.kind === 13;
+    }
+    ts.isTemplateHead = isTemplateHead;
+    function isTemplateMiddleOrTemplateTail(node) {
+        var kind = node.kind;
+        return kind === 14
+            || kind === 15;
+    }
+    ts.isTemplateMiddleOrTemplateTail = isTemplateMiddleOrTemplateTail;
+    function isIdentifier(node) {
+        return node.kind === 70;
+    }
+    ts.isIdentifier = isIdentifier;
+    function isGeneratedIdentifier(node) {
+        return isIdentifier(node) && node.autoGenerateKind > 0;
+    }
+    ts.isGeneratedIdentifier = isGeneratedIdentifier;
+    function isModifier(node) {
+        return isModifierKind(node.kind);
+    }
+    ts.isModifier = isModifier;
+    function isQualifiedName(node) {
+        return node.kind === 141;
+    }
+    ts.isQualifiedName = isQualifiedName;
+    function isComputedPropertyName(node) {
+        return node.kind === 142;
+    }
+    ts.isComputedPropertyName = isComputedPropertyName;
+    function isEntityName(node) {
+        var kind = node.kind;
+        return kind === 141
+            || kind === 70;
+    }
+    ts.isEntityName = isEntityName;
+    function isPropertyName(node) {
+        var kind = node.kind;
+        return kind === 70
+            || kind === 9
+            || kind === 8
+            || kind === 142;
+    }
+    ts.isPropertyName = isPropertyName;
+    function isModuleName(node) {
+        var kind = node.kind;
+        return kind === 70
+            || kind === 9;
+    }
+    ts.isModuleName = isModuleName;
+    function isBindingName(node) {
+        var kind = node.kind;
+        return kind === 70
+            || kind === 172
+            || kind === 173;
+    }
+    ts.isBindingName = isBindingName;
+    function isTypeParameter(node) {
+        return node.kind === 143;
+    }
+    ts.isTypeParameter = isTypeParameter;
+    function isParameter(node) {
+        return node.kind === 144;
+    }
+    ts.isParameter = isParameter;
+    function isDecorator(node) {
+        return node.kind === 145;
+    }
+    ts.isDecorator = isDecorator;
+    function isMethodDeclaration(node) {
+        return node.kind === 149;
+    }
+    ts.isMethodDeclaration = isMethodDeclaration;
+    function isClassElement(node) {
+        var kind = node.kind;
+        return kind === 150
+            || kind === 147
+            || kind === 149
+            || kind === 151
+            || kind === 152
+            || kind === 155
+            || kind === 203;
+    }
+    ts.isClassElement = isClassElement;
+    function isObjectLiteralElementLike(node) {
+        var kind = node.kind;
+        return kind === 257
+            || kind === 258
+            || kind === 259
+            || kind === 149
+            || kind === 151
+            || kind === 152
+            || kind === 244;
+    }
+    ts.isObjectLiteralElementLike = isObjectLiteralElementLike;
+    function isTypeNodeKind(kind) {
+        return (kind >= 156 && kind <= 171)
+            || kind === 118
+            || kind === 132
+            || kind === 121
+            || kind === 134
+            || kind === 135
+            || kind === 104
+            || kind === 129
+            || kind === 199;
+    }
+    function isTypeNode(node) {
+        return isTypeNodeKind(node.kind);
+    }
+    ts.isTypeNode = isTypeNode;
+    function isBindingPattern(node) {
+        if (node) {
+            var kind = node.kind;
+            return kind === 173
+                || kind === 172;
+        }
+        return false;
+    }
+    ts.isBindingPattern = isBindingPattern;
+    function isBindingElement(node) {
+        return node.kind === 174;
+    }
+    ts.isBindingElement = isBindingElement;
+    function isArrayBindingElement(node) {
+        var kind = node.kind;
+        return kind === 174
+            || kind === 198;
+    }
+    ts.isArrayBindingElement = isArrayBindingElement;
+    function isArrayLiteralExpression(node) {
+        return node.kind === 175;
+    }
+    ts.isArrayLiteralExpression = isArrayLiteralExpression;
+    function isObjectLiteralExpression(node) {
+        return node.kind === 176;
+    }
+    ts.isObjectLiteralExpression = isObjectLiteralExpression;
+    function isPropertyAccessExpression(node) {
+        return node.kind === 177;
+    }
+    ts.isPropertyAccessExpression = isPropertyAccessExpression;
+    function isElementAccessExpression(node) {
+        return node.kind === 178;
+    }
+    ts.isElementAccessExpression = isElementAccessExpression;
+    function isBinaryExpression(node) {
+        return node.kind === 192;
+    }
+    ts.isBinaryExpression = isBinaryExpression;
+    function isConditionalExpression(node) {
+        return node.kind === 193;
+    }
+    ts.isConditionalExpression = isConditionalExpression;
+    function isCallExpression(node) {
+        return node.kind === 179;
+    }
+    ts.isCallExpression = isCallExpression;
+    function isTemplateLiteral(node) {
+        var kind = node.kind;
+        return kind === 194
+            || kind === 12;
+    }
+    ts.isTemplateLiteral = isTemplateLiteral;
+    function isSpreadExpression(node) {
+        return node.kind === 196;
+    }
+    ts.isSpreadExpression = isSpreadExpression;
+    function isExpressionWithTypeArguments(node) {
+        return node.kind === 199;
+    }
+    ts.isExpressionWithTypeArguments = isExpressionWithTypeArguments;
+    function isLeftHandSideExpressionKind(kind) {
+        return kind === 177
+            || kind === 178
+            || kind === 180
+            || kind === 179
+            || kind === 246
+            || kind === 247
+            || kind === 181
+            || kind === 175
+            || kind === 183
+            || kind === 176
+            || kind === 197
+            || kind === 184
+            || kind === 70
+            || kind === 11
+            || kind === 8
+            || kind === 9
+            || kind === 12
+            || kind === 194
+            || kind === 85
+            || kind === 94
+            || kind === 98
+            || kind === 100
+            || kind === 96
+            || kind === 201;
+    }
+    function isLeftHandSideExpression(node) {
+        return isLeftHandSideExpressionKind(ts.skipPartiallyEmittedExpressions(node).kind);
+    }
+    ts.isLeftHandSideExpression = isLeftHandSideExpression;
+    function isUnaryExpressionKind(kind) {
+        return kind === 190
+            || kind === 191
+            || kind === 186
+            || kind === 187
+            || kind === 188
+            || kind === 189
+            || kind === 182
+            || isLeftHandSideExpressionKind(kind);
+    }
+    function isUnaryExpression(node) {
+        return isUnaryExpressionKind(ts.skipPartiallyEmittedExpressions(node).kind);
+    }
+    ts.isUnaryExpression = isUnaryExpression;
+    function isExpressionKind(kind) {
+        return kind === 193
+            || kind === 195
+            || kind === 185
+            || kind === 192
+            || kind === 196
+            || kind === 200
+            || kind === 198
+            || isUnaryExpressionKind(kind);
+    }
+    function isExpression(node) {
+        return isExpressionKind(ts.skipPartiallyEmittedExpressions(node).kind);
+    }
+    ts.isExpression = isExpression;
+    function isAssertionExpression(node) {
+        var kind = node.kind;
+        return kind === 182
+            || kind === 200;
+    }
+    ts.isAssertionExpression = isAssertionExpression;
+    function isPartiallyEmittedExpression(node) {
+        return node.kind === 293;
+    }
+    ts.isPartiallyEmittedExpression = isPartiallyEmittedExpression;
+    function isNotEmittedStatement(node) {
+        return node.kind === 292;
+    }
+    ts.isNotEmittedStatement = isNotEmittedStatement;
+    function isNotEmittedOrPartiallyEmittedNode(node) {
+        return isNotEmittedStatement(node)
+            || isPartiallyEmittedExpression(node);
+    }
+    ts.isNotEmittedOrPartiallyEmittedNode = isNotEmittedOrPartiallyEmittedNode;
+    function isOmittedExpression(node) {
+        return node.kind === 198;
+    }
+    ts.isOmittedExpression = isOmittedExpression;
+    function isTemplateSpan(node) {
+        return node.kind === 202;
+    }
+    ts.isTemplateSpan = isTemplateSpan;
+    function isBlock(node) {
+        return node.kind === 204;
+    }
+    ts.isBlock = isBlock;
+    function isConciseBody(node) {
+        return isBlock(node)
+            || isExpression(node);
+    }
+    ts.isConciseBody = isConciseBody;
+    function isFunctionBody(node) {
+        return isBlock(node);
+    }
+    ts.isFunctionBody = isFunctionBody;
+    function isForInitializer(node) {
+        return isVariableDeclarationList(node)
+            || isExpression(node);
+    }
+    ts.isForInitializer = isForInitializer;
+    function isVariableDeclaration(node) {
+        return node.kind === 223;
+    }
+    ts.isVariableDeclaration = isVariableDeclaration;
+    function isVariableDeclarationList(node) {
+        return node.kind === 224;
+    }
+    ts.isVariableDeclarationList = isVariableDeclarationList;
+    function isCaseBlock(node) {
+        return node.kind === 232;
+    }
+    ts.isCaseBlock = isCaseBlock;
+    function isModuleBody(node) {
+        var kind = node.kind;
+        return kind === 231
+            || kind === 230;
+    }
+    ts.isModuleBody = isModuleBody;
+    function isImportEqualsDeclaration(node) {
+        return node.kind === 234;
+    }
+    ts.isImportEqualsDeclaration = isImportEqualsDeclaration;
+    function isImportClause(node) {
+        return node.kind === 236;
+    }
+    ts.isImportClause = isImportClause;
+    function isNamedImportBindings(node) {
+        var kind = node.kind;
+        return kind === 238
+            || kind === 237;
+    }
+    ts.isNamedImportBindings = isNamedImportBindings;
+    function isImportSpecifier(node) {
+        return node.kind === 239;
+    }
+    ts.isImportSpecifier = isImportSpecifier;
+    function isNamedExports(node) {
+        return node.kind === 242;
+    }
+    ts.isNamedExports = isNamedExports;
+    function isExportSpecifier(node) {
+        return node.kind === 243;
+    }
+    ts.isExportSpecifier = isExportSpecifier;
+    function isModuleOrEnumDeclaration(node) {
+        return node.kind === 230 || node.kind === 229;
+    }
+    ts.isModuleOrEnumDeclaration = isModuleOrEnumDeclaration;
+    function isDeclarationKind(kind) {
+        return kind === 185
+            || kind === 174
+            || kind === 226
+            || kind === 197
+            || kind === 150
+            || kind === 229
+            || kind === 260
+            || kind === 243
+            || kind === 225
+            || kind === 184
+            || kind === 151
+            || kind === 236
+            || kind === 234
+            || kind === 239
+            || kind === 227
+            || kind === 149
+            || kind === 148
+            || kind === 230
+            || kind === 233
+            || kind === 237
+            || kind === 144
+            || kind === 257
+            || kind === 147
+            || kind === 146
+            || kind === 152
+            || kind === 258
+            || kind === 228
+            || kind === 143
+            || kind === 223
+            || kind === 284;
+    }
+    function isDeclarationStatementKind(kind) {
+        return kind === 225
+            || kind === 244
+            || kind === 226
+            || kind === 227
+            || kind === 228
+            || kind === 229
+            || kind === 230
+            || kind === 235
+            || kind === 234
+            || kind === 241
+            || kind === 240
+            || kind === 233;
+    }
+    function isStatementKindButNotDeclarationKind(kind) {
+        return kind === 215
+            || kind === 214
+            || kind === 222
+            || kind === 209
+            || kind === 207
+            || kind === 206
+            || kind === 212
+            || kind === 213
+            || kind === 211
+            || kind === 208
+            || kind === 219
+            || kind === 216
+            || kind === 218
+            || kind === 220
+            || kind === 221
+            || kind === 205
+            || kind === 210
+            || kind === 217
+            || kind === 292
+            || kind === 295
+            || kind === 294;
+    }
+    function isDeclaration(node) {
+        return isDeclarationKind(node.kind);
+    }
+    ts.isDeclaration = isDeclaration;
+    function isDeclarationStatement(node) {
+        return isDeclarationStatementKind(node.kind);
+    }
+    ts.isDeclarationStatement = isDeclarationStatement;
+    function isStatementButNotDeclaration(node) {
+        return isStatementKindButNotDeclarationKind(node.kind);
+    }
+    ts.isStatementButNotDeclaration = isStatementButNotDeclaration;
+    function isStatement(node) {
+        var kind = node.kind;
+        return isStatementKindButNotDeclarationKind(kind)
+            || isDeclarationStatementKind(kind)
+            || kind === 204;
+    }
+    ts.isStatement = isStatement;
+    function isModuleReference(node) {
+        var kind = node.kind;
+        return kind === 245
+            || kind === 141
+            || kind === 70;
+    }
+    ts.isModuleReference = isModuleReference;
+    function isJsxOpeningElement(node) {
+        return node.kind === 248;
+    }
+    ts.isJsxOpeningElement = isJsxOpeningElement;
+    function isJsxClosingElement(node) {
+        return node.kind === 249;
+    }
+    ts.isJsxClosingElement = isJsxClosingElement;
+    function isJsxTagNameExpression(node) {
+        var kind = node.kind;
+        return kind === 98
+            || kind === 70
+            || kind === 177;
+    }
+    ts.isJsxTagNameExpression = isJsxTagNameExpression;
+    function isJsxChild(node) {
+        var kind = node.kind;
+        return kind === 246
+            || kind === 252
+            || kind === 247
+            || kind === 10;
+    }
+    ts.isJsxChild = isJsxChild;
+    function isJsxAttributeLike(node) {
+        var kind = node.kind;
+        return kind === 250
+            || kind === 251;
+    }
+    ts.isJsxAttributeLike = isJsxAttributeLike;
+    function isJsxSpreadAttribute(node) {
+        return node.kind === 251;
+    }
+    ts.isJsxSpreadAttribute = isJsxSpreadAttribute;
+    function isJsxAttribute(node) {
+        return node.kind === 250;
+    }
+    ts.isJsxAttribute = isJsxAttribute;
+    function isStringLiteralOrJsxExpression(node) {
+        var kind = node.kind;
+        return kind === 9
+            || kind === 252;
+    }
+    ts.isStringLiteralOrJsxExpression = isStringLiteralOrJsxExpression;
+    function isCaseOrDefaultClause(node) {
+        var kind = node.kind;
+        return kind === 253
+            || kind === 254;
+    }
+    ts.isCaseOrDefaultClause = isCaseOrDefaultClause;
+    function isHeritageClause(node) {
+        return node.kind === 255;
+    }
+    ts.isHeritageClause = isHeritageClause;
+    function isCatchClause(node) {
+        return node.kind === 256;
+    }
+    ts.isCatchClause = isCatchClause;
+    function isPropertyAssignment(node) {
+        return node.kind === 257;
+    }
+    ts.isPropertyAssignment = isPropertyAssignment;
+    function isShorthandPropertyAssignment(node) {
+        return node.kind === 258;
+    }
+    ts.isShorthandPropertyAssignment = isShorthandPropertyAssignment;
+    function isEnumMember(node) {
+        return node.kind === 260;
+    }
+    ts.isEnumMember = isEnumMember;
+    function isSourceFile(node) {
+        return node.kind === 261;
+    }
+    ts.isSourceFile = isSourceFile;
+    function isWatchSet(options) {
+        return options.watch && options.hasOwnProperty("watch");
+    }
+    ts.isWatchSet = isWatchSet;
+})(ts || (ts = {}));
+(function (ts) {
+    function getDefaultLibFileName(options) {
+        switch (options.target) {
+            case 5:
+            case 4:
+                return "lib.es2017.d.ts";
+            case 3:
+                return "lib.es2016.d.ts";
+            case 2:
+                return "lib.es6.d.ts";
+            default:
+                return "lib.d.ts";
+        }
+    }
+    ts.getDefaultLibFileName = getDefaultLibFileName;
+    function textSpanEnd(span) {
+        return span.start + span.length;
+    }
+    ts.textSpanEnd = textSpanEnd;
+    function textSpanIsEmpty(span) {
+        return span.length === 0;
+    }
+    ts.textSpanIsEmpty = textSpanIsEmpty;
+    function textSpanContainsPosition(span, position) {
+        return position >= span.start && position < textSpanEnd(span);
+    }
+    ts.textSpanContainsPosition = textSpanContainsPosition;
+    function textSpanContainsTextSpan(span, other) {
+        return other.start >= span.start && textSpanEnd(other) <= textSpanEnd(span);
+    }
+    ts.textSpanContainsTextSpan = textSpanContainsTextSpan;
+    function textSpanOverlapsWith(span, other) {
+        var overlapStart = Math.max(span.start, other.start);
+        var overlapEnd = Math.min(textSpanEnd(span), textSpanEnd(other));
+        return overlapStart < overlapEnd;
+    }
+    ts.textSpanOverlapsWith = textSpanOverlapsWith;
+    function textSpanOverlap(span1, span2) {
+        var overlapStart = Math.max(span1.start, span2.start);
+        var overlapEnd = Math.min(textSpanEnd(span1), textSpanEnd(span2));
+        if (overlapStart < overlapEnd) {
+            return createTextSpanFromBounds(overlapStart, overlapEnd);
+        }
+        return undefined;
+    }
+    ts.textSpanOverlap = textSpanOverlap;
+    function textSpanIntersectsWithTextSpan(span, other) {
+        return other.start <= textSpanEnd(span) && textSpanEnd(other) >= span.start;
+    }
+    ts.textSpanIntersectsWithTextSpan = textSpanIntersectsWithTextSpan;
+    function textSpanIntersectsWith(span, start, length) {
+        var end = start + length;
+        return start <= textSpanEnd(span) && end >= span.start;
+    }
+    ts.textSpanIntersectsWith = textSpanIntersectsWith;
+    function decodedTextSpanIntersectsWith(start1, length1, start2, length2) {
+        var end1 = start1 + length1;
+        var end2 = start2 + length2;
+        return start2 <= end1 && end2 >= start1;
+    }
+    ts.decodedTextSpanIntersectsWith = decodedTextSpanIntersectsWith;
+    function textSpanIntersectsWithPosition(span, position) {
+        return position <= textSpanEnd(span) && position >= span.start;
+    }
+    ts.textSpanIntersectsWithPosition = textSpanIntersectsWithPosition;
+    function textSpanIntersection(span1, span2) {
+        var intersectStart = Math.max(span1.start, span2.start);
+        var intersectEnd = Math.min(textSpanEnd(span1), textSpanEnd(span2));
+        if (intersectStart <= intersectEnd) {
+            return createTextSpanFromBounds(intersectStart, intersectEnd);
+        }
+        return undefined;
+    }
+    ts.textSpanIntersection = textSpanIntersection;
+    function createTextSpan(start, length) {
+        if (start < 0) {
+            throw new Error("start < 0");
+        }
+        if (length < 0) {
+            throw new Error("length < 0");
+        }
+        return { start: start, length: length };
+    }
+    ts.createTextSpan = createTextSpan;
+    function createTextSpanFromBounds(start, end) {
+        return createTextSpan(start, end - start);
+    }
+    ts.createTextSpanFromBounds = createTextSpanFromBounds;
+    function textChangeRangeNewSpan(range) {
+        return createTextSpan(range.span.start, range.newLength);
+    }
+    ts.textChangeRangeNewSpan = textChangeRangeNewSpan;
+    function textChangeRangeIsUnchanged(range) {
+        return textSpanIsEmpty(range.span) && range.newLength === 0;
+    }
+    ts.textChangeRangeIsUnchanged = textChangeRangeIsUnchanged;
+    function createTextChangeRange(span, newLength) {
+        if (newLength < 0) {
+            throw new Error("newLength < 0");
+        }
+        return { span: span, newLength: newLength };
+    }
+    ts.createTextChangeRange = createTextChangeRange;
+    ts.unchangedTextChangeRange = createTextChangeRange(createTextSpan(0, 0), 0);
+    function collapseTextChangeRangesAcrossMultipleVersions(changes) {
+        if (changes.length === 0) {
+            return ts.unchangedTextChangeRange;
+        }
+        if (changes.length === 1) {
+            return changes[0];
+        }
+        var change0 = changes[0];
+        var oldStartN = change0.span.start;
+        var oldEndN = textSpanEnd(change0.span);
+        var newEndN = oldStartN + change0.newLength;
+        for (var i = 1; i < changes.length; i++) {
+            var nextChange = changes[i];
+            var oldStart1 = oldStartN;
+            var oldEnd1 = oldEndN;
+            var newEnd1 = newEndN;
+            var oldStart2 = nextChange.span.start;
+            var oldEnd2 = textSpanEnd(nextChange.span);
+            var newEnd2 = oldStart2 + nextChange.newLength;
+            oldStartN = Math.min(oldStart1, oldStart2);
+            oldEndN = Math.max(oldEnd1, oldEnd1 + (oldEnd2 - newEnd1));
+            newEndN = Math.max(newEnd2, newEnd2 + (newEnd1 - oldEnd2));
+        }
+        return createTextChangeRange(createTextSpanFromBounds(oldStartN, oldEndN), newEndN - oldStartN);
+    }
+    ts.collapseTextChangeRangesAcrossMultipleVersions = collapseTextChangeRangesAcrossMultipleVersions;
+    function getTypeParameterOwner(d) {
+        if (d && d.kind === 143) {
+            for (var current = d; current; current = current.parent) {
+                if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 227) {
+                    return current;
+                }
+            }
+        }
+    }
+    ts.getTypeParameterOwner = getTypeParameterOwner;
+    function isParameterPropertyDeclaration(node) {
+        return ts.hasModifier(node, 92) && node.parent.kind === 150 && ts.isClassLike(node.parent.parent);
+    }
+    ts.isParameterPropertyDeclaration = isParameterPropertyDeclaration;
+    function walkUpBindingElementsAndPatterns(node) {
+        while (node && (node.kind === 174 || ts.isBindingPattern(node))) {
+            node = node.parent;
+        }
+        return node;
+    }
+    function getCombinedModifierFlags(node) {
+        node = walkUpBindingElementsAndPatterns(node);
+        var flags = ts.getModifierFlags(node);
+        if (node.kind === 223) {
+            node = node.parent;
+        }
+        if (node && node.kind === 224) {
+            flags |= ts.getModifierFlags(node);
+            node = node.parent;
+        }
+        if (node && node.kind === 205) {
+            flags |= ts.getModifierFlags(node);
+        }
+        return flags;
+    }
+    ts.getCombinedModifierFlags = getCombinedModifierFlags;
+    function getCombinedNodeFlags(node) {
+        node = walkUpBindingElementsAndPatterns(node);
+        var flags = node.flags;
+        if (node.kind === 223) {
+            node = node.parent;
+        }
+        if (node && node.kind === 224) {
+            flags |= node.flags;
+            node = node.parent;
+        }
+        if (node && node.kind === 205) {
+            flags |= node.flags;
+        }
+        return flags;
+    }
+    ts.getCombinedNodeFlags = getCombinedNodeFlags;
+})(ts || (ts = {}));
+var ts;
 (function (ts) {
     var NodeConstructor;
     var SourceFileConstructor;
     function createNode(kind, location, flags) {
-        var ConstructorForKind = kind === 256
+        var ConstructorForKind = kind === 261
             ? (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))
             : (NodeConstructor || (NodeConstructor = ts.objectAllocator.getNodeConstructor()));
         var node = location
@@ -9781,7 +10777,7 @@ var ts;
     }
     ts.createNull = createNull;
     function createComputedPropertyName(expression, location) {
-        var node = createNode(141, location);
+        var node = createNode(142, location);
         node.expression = expression;
         return node;
     }
@@ -9793,12 +10789,8 @@ var ts;
         return node;
     }
     ts.updateComputedPropertyName = updateComputedPropertyName;
-    function createParameter(name, initializer, location) {
-        return createParameterDeclaration(undefined, undefined, undefined, name, undefined, undefined, initializer, location);
-    }
-    ts.createParameter = createParameter;
-    function createParameterDeclaration(decorators, modifiers, dotDotDotToken, name, questionToken, type, initializer, location, flags) {
-        var node = createNode(143, location, flags);
+    function createParameter(decorators, modifiers, dotDotDotToken, name, questionToken, type, initializer, location, flags) {
+        var node = createNode(144, location, flags);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.dotDotDotToken = dotDotDotToken;
@@ -9808,16 +10800,16 @@ var ts;
         node.initializer = initializer ? parenthesizeExpressionForList(initializer) : undefined;
         return node;
     }
-    ts.createParameterDeclaration = createParameterDeclaration;
-    function updateParameterDeclaration(node, decorators, modifiers, name, type, initializer) {
+    ts.createParameter = createParameter;
+    function updateParameter(node, decorators, modifiers, name, type, initializer) {
         if (node.decorators !== decorators || node.modifiers !== modifiers || node.name !== name || node.type !== type || node.initializer !== initializer) {
-            return updateNode(createParameterDeclaration(decorators, modifiers, node.dotDotDotToken, name, node.questionToken, type, initializer, node, node.flags), node);
+            return updateNode(createParameter(decorators, modifiers, node.dotDotDotToken, name, node.questionToken, type, initializer, node, node.flags), node);
         }
         return node;
     }
-    ts.updateParameterDeclaration = updateParameterDeclaration;
+    ts.updateParameter = updateParameter;
     function createProperty(decorators, modifiers, name, questionToken, type, initializer, location) {
-        var node = createNode(146, location);
+        var node = createNode(147, location);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
@@ -9835,7 +10827,7 @@ var ts;
     }
     ts.updateProperty = updateProperty;
     function createMethod(decorators, modifiers, asteriskToken, name, typeParameters, parameters, type, body, location, flags) {
-        var node = createNode(148, location, flags);
+        var node = createNode(149, location, flags);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.asteriskToken = asteriskToken;
@@ -9855,7 +10847,7 @@ var ts;
     }
     ts.updateMethod = updateMethod;
     function createConstructor(decorators, modifiers, parameters, body, location, flags) {
-        var node = createNode(149, location, flags);
+        var node = createNode(150, location, flags);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.typeParameters = undefined;
@@ -9873,7 +10865,7 @@ var ts;
     }
     ts.updateConstructor = updateConstructor;
     function createGetAccessor(decorators, modifiers, name, parameters, type, body, location, flags) {
-        var node = createNode(150, location, flags);
+        var node = createNode(151, location, flags);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
@@ -9892,7 +10884,7 @@ var ts;
     }
     ts.updateGetAccessor = updateGetAccessor;
     function createSetAccessor(decorators, modifiers, name, parameters, body, location, flags) {
-        var node = createNode(151, location, flags);
+        var node = createNode(152, location, flags);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
@@ -9910,7 +10902,7 @@ var ts;
     }
     ts.updateSetAccessor = updateSetAccessor;
     function createObjectBindingPattern(elements, location) {
-        var node = createNode(168, location);
+        var node = createNode(172, location);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -9923,7 +10915,7 @@ var ts;
     }
     ts.updateObjectBindingPattern = updateObjectBindingPattern;
     function createArrayBindingPattern(elements, location) {
-        var node = createNode(169, location);
+        var node = createNode(173, location);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -9936,7 +10928,7 @@ var ts;
     }
     ts.updateArrayBindingPattern = updateArrayBindingPattern;
     function createBindingElement(propertyName, dotDotDotToken, name, initializer, location) {
-        var node = createNode(170, location);
+        var node = createNode(174, location);
         node.propertyName = typeof propertyName === "string" ? createIdentifier(propertyName) : propertyName;
         node.dotDotDotToken = dotDotDotToken;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
@@ -9952,7 +10944,7 @@ var ts;
     }
     ts.updateBindingElement = updateBindingElement;
     function createArrayLiteral(elements, location, multiLine) {
-        var node = createNode(171, location);
+        var node = createNode(175, location);
         node.elements = parenthesizeListElements(createNodeArray(elements));
         if (multiLine) {
             node.multiLine = true;
@@ -9968,7 +10960,7 @@ var ts;
     }
     ts.updateArrayLiteral = updateArrayLiteral;
     function createObjectLiteral(properties, location, multiLine) {
-        var node = createNode(172, location);
+        var node = createNode(176, location);
         node.properties = createNodeArray(properties);
         if (multiLine) {
             node.multiLine = true;
@@ -9984,7 +10976,7 @@ var ts;
     }
     ts.updateObjectLiteral = updateObjectLiteral;
     function createPropertyAccess(expression, name, location, flags) {
-        var node = createNode(173, location, flags);
+        var node = createNode(177, location, flags);
         node.expression = parenthesizeForAccess(expression);
         (node.emitNode || (node.emitNode = {})).flags |= 1048576;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
@@ -10001,7 +10993,7 @@ var ts;
     }
     ts.updatePropertyAccess = updatePropertyAccess;
     function createElementAccess(expression, index, location) {
-        var node = createNode(174, location);
+        var node = createNode(178, location);
         node.expression = parenthesizeForAccess(expression);
         node.argumentExpression = typeof index === "number" ? createLiteral(index) : index;
         return node;
@@ -10015,7 +11007,7 @@ var ts;
     }
     ts.updateElementAccess = updateElementAccess;
     function createCall(expression, typeArguments, argumentsArray, location, flags) {
-        var node = createNode(175, location, flags);
+        var node = createNode(179, location, flags);
         node.expression = parenthesizeForAccess(expression);
         if (typeArguments) {
             node.typeArguments = createNodeArray(typeArguments);
@@ -10032,7 +11024,7 @@ var ts;
     }
     ts.updateCall = updateCall;
     function createNew(expression, typeArguments, argumentsArray, location, flags) {
-        var node = createNode(176, location, flags);
+        var node = createNode(180, location, flags);
         node.expression = parenthesizeForNew(expression);
         node.typeArguments = typeArguments ? createNodeArray(typeArguments) : undefined;
         node.arguments = argumentsArray ? parenthesizeListElements(createNodeArray(argumentsArray)) : undefined;
@@ -10047,7 +11039,7 @@ var ts;
     }
     ts.updateNew = updateNew;
     function createTaggedTemplate(tag, template, location) {
-        var node = createNode(177, location);
+        var node = createNode(181, location);
         node.tag = parenthesizeForAccess(tag);
         node.template = template;
         return node;
@@ -10061,7 +11053,7 @@ var ts;
     }
     ts.updateTaggedTemplate = updateTaggedTemplate;
     function createParen(expression, location) {
-        var node = createNode(179, location);
+        var node = createNode(183, location);
         node.expression = expression;
         return node;
     }
@@ -10074,7 +11066,7 @@ var ts;
     }
     ts.updateParen = updateParen;
     function createFunctionExpression(modifiers, asteriskToken, name, typeParameters, parameters, type, body, location, flags) {
-        var node = createNode(180, location, flags);
+        var node = createNode(184, location, flags);
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.asteriskToken = asteriskToken;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
@@ -10093,7 +11085,7 @@ var ts;
     }
     ts.updateFunctionExpression = updateFunctionExpression;
     function createArrowFunction(modifiers, typeParameters, parameters, type, equalsGreaterThanToken, body, location, flags) {
-        var node = createNode(181, location, flags);
+        var node = createNode(185, location, flags);
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.typeParameters = typeParameters ? createNodeArray(typeParameters) : undefined;
         node.parameters = createNodeArray(parameters);
@@ -10111,7 +11103,7 @@ var ts;
     }
     ts.updateArrowFunction = updateArrowFunction;
     function createDelete(expression, location) {
-        var node = createNode(182, location);
+        var node = createNode(186, location);
         node.expression = parenthesizePrefixOperand(expression);
         return node;
     }
@@ -10124,7 +11116,7 @@ var ts;
     }
     ts.updateDelete = updateDelete;
     function createTypeOf(expression, location) {
-        var node = createNode(183, location);
+        var node = createNode(187, location);
         node.expression = parenthesizePrefixOperand(expression);
         return node;
     }
@@ -10137,7 +11129,7 @@ var ts;
     }
     ts.updateTypeOf = updateTypeOf;
     function createVoid(expression, location) {
-        var node = createNode(184, location);
+        var node = createNode(188, location);
         node.expression = parenthesizePrefixOperand(expression);
         return node;
     }
@@ -10150,7 +11142,7 @@ var ts;
     }
     ts.updateVoid = updateVoid;
     function createAwait(expression, location) {
-        var node = createNode(185, location);
+        var node = createNode(189, location);
         node.expression = parenthesizePrefixOperand(expression);
         return node;
     }
@@ -10163,7 +11155,7 @@ var ts;
     }
     ts.updateAwait = updateAwait;
     function createPrefix(operator, operand, location) {
-        var node = createNode(186, location);
+        var node = createNode(190, location);
         node.operator = operator;
         node.operand = parenthesizePrefixOperand(operand);
         return node;
@@ -10177,7 +11169,7 @@ var ts;
     }
     ts.updatePrefix = updatePrefix;
     function createPostfix(operand, operator, location) {
-        var node = createNode(187, location);
+        var node = createNode(191, location);
         node.operand = parenthesizePostfixOperand(operand);
         node.operator = operator;
         return node;
@@ -10193,7 +11185,7 @@ var ts;
     function createBinary(left, operator, right, location) {
         var operatorToken = typeof operator === "number" ? createToken(operator) : operator;
         var operatorKind = operatorToken.kind;
-        var node = createNode(188, location);
+        var node = createNode(192, location);
         node.left = parenthesizeBinaryOperand(operatorKind, left, true, undefined);
         node.operatorToken = operatorToken;
         node.right = parenthesizeBinaryOperand(operatorKind, right, false, node.left);
@@ -10208,7 +11200,7 @@ var ts;
     }
     ts.updateBinary = updateBinary;
     function createConditional(condition, questionToken, whenTrue, colonToken, whenFalse, location) {
-        var node = createNode(189, location);
+        var node = createNode(193, location);
         node.condition = condition;
         node.questionToken = questionToken;
         node.whenTrue = whenTrue;
@@ -10225,7 +11217,7 @@ var ts;
     }
     ts.updateConditional = updateConditional;
     function createTemplateExpression(head, templateSpans, location) {
-        var node = createNode(190, location);
+        var node = createNode(194, location);
         node.head = head;
         node.templateSpans = createNodeArray(templateSpans);
         return node;
@@ -10239,7 +11231,7 @@ var ts;
     }
     ts.updateTemplateExpression = updateTemplateExpression;
     function createYield(asteriskToken, expression, location) {
-        var node = createNode(191, location);
+        var node = createNode(195, location);
         node.asteriskToken = asteriskToken;
         node.expression = expression;
         return node;
@@ -10253,7 +11245,7 @@ var ts;
     }
     ts.updateYield = updateYield;
     function createSpread(expression, location) {
-        var node = createNode(192, location);
+        var node = createNode(196, location);
         node.expression = parenthesizeExpressionForList(expression);
         return node;
     }
@@ -10266,7 +11258,7 @@ var ts;
     }
     ts.updateSpread = updateSpread;
     function createClassExpression(modifiers, name, typeParameters, heritageClauses, members, location) {
-        var node = createNode(193, location);
+        var node = createNode(197, location);
         node.decorators = undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.name = name;
@@ -10284,12 +11276,12 @@ var ts;
     }
     ts.updateClassExpression = updateClassExpression;
     function createOmittedExpression(location) {
-        var node = createNode(194, location);
+        var node = createNode(198, location);
         return node;
     }
     ts.createOmittedExpression = createOmittedExpression;
     function createExpressionWithTypeArguments(typeArguments, expression, location) {
-        var node = createNode(195, location);
+        var node = createNode(199, location);
         node.typeArguments = typeArguments ? createNodeArray(typeArguments) : undefined;
         node.expression = parenthesizeForAccess(expression);
         return node;
@@ -10303,7 +11295,7 @@ var ts;
     }
     ts.updateExpressionWithTypeArguments = updateExpressionWithTypeArguments;
     function createTemplateSpan(expression, literal, location) {
-        var node = createNode(198, location);
+        var node = createNode(202, location);
         node.expression = expression;
         node.literal = literal;
         return node;
@@ -10317,7 +11309,7 @@ var ts;
     }
     ts.updateTemplateSpan = updateTemplateSpan;
     function createBlock(statements, location, multiLine, flags) {
-        var block = createNode(200, location, flags);
+        var block = createNode(204, location, flags);
         block.statements = createNodeArray(statements);
         if (multiLine) {
             block.multiLine = true;
@@ -10333,7 +11325,7 @@ var ts;
     }
     ts.updateBlock = updateBlock;
     function createVariableStatement(modifiers, declarationList, location, flags) {
-        var node = createNode(201, location, flags);
+        var node = createNode(205, location, flags);
         node.decorators = undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.declarationList = ts.isArray(declarationList) ? createVariableDeclarationList(declarationList) : declarationList;
@@ -10348,7 +11340,7 @@ var ts;
     }
     ts.updateVariableStatement = updateVariableStatement;
     function createVariableDeclarationList(declarations, location, flags) {
-        var node = createNode(220, location, flags);
+        var node = createNode(224, location, flags);
         node.declarations = createNodeArray(declarations);
         return node;
     }
@@ -10361,7 +11353,7 @@ var ts;
     }
     ts.updateVariableDeclarationList = updateVariableDeclarationList;
     function createVariableDeclaration(name, type, initializer, location, flags) {
-        var node = createNode(219, location, flags);
+        var node = createNode(223, location, flags);
         node.name = typeof name === "string" ? createIdentifier(name) : name;
         node.type = type;
         node.initializer = initializer !== undefined ? parenthesizeExpressionForList(initializer) : undefined;
@@ -10376,11 +11368,11 @@ var ts;
     }
     ts.updateVariableDeclaration = updateVariableDeclaration;
     function createEmptyStatement(location) {
-        return createNode(202, location);
+        return createNode(206, location);
     }
     ts.createEmptyStatement = createEmptyStatement;
     function createStatement(expression, location, flags) {
-        var node = createNode(203, location, flags);
+        var node = createNode(207, location, flags);
         node.expression = parenthesizeExpressionForExpressionStatement(expression);
         return node;
     }
@@ -10393,7 +11385,7 @@ var ts;
     }
     ts.updateStatement = updateStatement;
     function createIf(expression, thenStatement, elseStatement, location) {
-        var node = createNode(204, location);
+        var node = createNode(208, location);
         node.expression = expression;
         node.thenStatement = thenStatement;
         node.elseStatement = elseStatement;
@@ -10408,7 +11400,7 @@ var ts;
     }
     ts.updateIf = updateIf;
     function createDo(statement, expression, location) {
-        var node = createNode(205, location);
+        var node = createNode(209, location);
         node.statement = statement;
         node.expression = expression;
         return node;
@@ -10422,7 +11414,7 @@ var ts;
     }
     ts.updateDo = updateDo;
     function createWhile(expression, statement, location) {
-        var node = createNode(206, location);
+        var node = createNode(210, location);
         node.expression = expression;
         node.statement = statement;
         return node;
@@ -10436,7 +11428,7 @@ var ts;
     }
     ts.updateWhile = updateWhile;
     function createFor(initializer, condition, incrementor, statement, location) {
-        var node = createNode(207, location, undefined);
+        var node = createNode(211, location, undefined);
         node.initializer = initializer;
         node.condition = condition;
         node.incrementor = incrementor;
@@ -10452,7 +11444,7 @@ var ts;
     }
     ts.updateFor = updateFor;
     function createForIn(initializer, expression, statement, location) {
-        var node = createNode(208, location);
+        var node = createNode(212, location);
         node.initializer = initializer;
         node.expression = expression;
         node.statement = statement;
@@ -10467,7 +11459,7 @@ var ts;
     }
     ts.updateForIn = updateForIn;
     function createForOf(initializer, expression, statement, location) {
-        var node = createNode(209, location);
+        var node = createNode(213, location);
         node.initializer = initializer;
         node.expression = expression;
         node.statement = statement;
@@ -10482,7 +11474,7 @@ var ts;
     }
     ts.updateForOf = updateForOf;
     function createContinue(label, location) {
-        var node = createNode(210, location);
+        var node = createNode(214, location);
         if (label) {
             node.label = label;
         }
@@ -10497,7 +11489,7 @@ var ts;
     }
     ts.updateContinue = updateContinue;
     function createBreak(label, location) {
-        var node = createNode(211, location);
+        var node = createNode(215, location);
         if (label) {
             node.label = label;
         }
@@ -10512,7 +11504,7 @@ var ts;
     }
     ts.updateBreak = updateBreak;
     function createReturn(expression, location) {
-        var node = createNode(212, location);
+        var node = createNode(216, location);
         node.expression = expression;
         return node;
     }
@@ -10525,7 +11517,7 @@ var ts;
     }
     ts.updateReturn = updateReturn;
     function createWith(expression, statement, location) {
-        var node = createNode(213, location);
+        var node = createNode(217, location);
         node.expression = expression;
         node.statement = statement;
         return node;
@@ -10539,7 +11531,7 @@ var ts;
     }
     ts.updateWith = updateWith;
     function createSwitch(expression, caseBlock, location) {
-        var node = createNode(214, location);
+        var node = createNode(218, location);
         node.expression = parenthesizeExpressionForList(expression);
         node.caseBlock = caseBlock;
         return node;
@@ -10553,7 +11545,7 @@ var ts;
     }
     ts.updateSwitch = updateSwitch;
     function createLabel(label, statement, location) {
-        var node = createNode(215, location);
+        var node = createNode(219, location);
         node.label = typeof label === "string" ? createIdentifier(label) : label;
         node.statement = statement;
         return node;
@@ -10567,7 +11559,7 @@ var ts;
     }
     ts.updateLabel = updateLabel;
     function createThrow(expression, location) {
-        var node = createNode(216, location);
+        var node = createNode(220, location);
         node.expression = expression;
         return node;
     }
@@ -10580,7 +11572,7 @@ var ts;
     }
     ts.updateThrow = updateThrow;
     function createTry(tryBlock, catchClause, finallyBlock, location) {
-        var node = createNode(217, location);
+        var node = createNode(221, location);
         node.tryBlock = tryBlock;
         node.catchClause = catchClause;
         node.finallyBlock = finallyBlock;
@@ -10595,7 +11587,7 @@ var ts;
     }
     ts.updateTry = updateTry;
     function createCaseBlock(clauses, location) {
-        var node = createNode(228, location);
+        var node = createNode(232, location);
         node.clauses = createNodeArray(clauses);
         return node;
     }
@@ -10608,7 +11600,7 @@ var ts;
     }
     ts.updateCaseBlock = updateCaseBlock;
     function createFunctionDeclaration(decorators, modifiers, asteriskToken, name, typeParameters, parameters, type, body, location, flags) {
-        var node = createNode(221, location, flags);
+        var node = createNode(225, location, flags);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.asteriskToken = asteriskToken;
@@ -10628,7 +11620,7 @@ var ts;
     }
     ts.updateFunctionDeclaration = updateFunctionDeclaration;
     function createClassDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members, location) {
-        var node = createNode(222, location);
+        var node = createNode(226, location);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.name = name;
@@ -10646,7 +11638,7 @@ var ts;
     }
     ts.updateClassDeclaration = updateClassDeclaration;
     function createImportDeclaration(decorators, modifiers, importClause, moduleSpecifier, location) {
-        var node = createNode(231, location);
+        var node = createNode(235, location);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.importClause = importClause;
@@ -10662,7 +11654,7 @@ var ts;
     }
     ts.updateImportDeclaration = updateImportDeclaration;
     function createImportClause(name, namedBindings, location) {
-        var node = createNode(232, location);
+        var node = createNode(236, location);
         node.name = name;
         node.namedBindings = namedBindings;
         return node;
@@ -10676,7 +11668,7 @@ var ts;
     }
     ts.updateImportClause = updateImportClause;
     function createNamespaceImport(name, location) {
-        var node = createNode(233, location);
+        var node = createNode(237, location);
         node.name = name;
         return node;
     }
@@ -10689,7 +11681,7 @@ var ts;
     }
     ts.updateNamespaceImport = updateNamespaceImport;
     function createNamedImports(elements, location) {
-        var node = createNode(234, location);
+        var node = createNode(238, location);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -10702,7 +11694,7 @@ var ts;
     }
     ts.updateNamedImports = updateNamedImports;
     function createImportSpecifier(propertyName, name, location) {
-        var node = createNode(235, location);
+        var node = createNode(239, location);
         node.propertyName = propertyName;
         node.name = name;
         return node;
@@ -10716,7 +11708,7 @@ var ts;
     }
     ts.updateImportSpecifier = updateImportSpecifier;
     function createExportAssignment(decorators, modifiers, isExportEquals, expression, location) {
-        var node = createNode(236, location);
+        var node = createNode(240, location);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.isExportEquals = isExportEquals;
@@ -10732,7 +11724,7 @@ var ts;
     }
     ts.updateExportAssignment = updateExportAssignment;
     function createExportDeclaration(decorators, modifiers, exportClause, moduleSpecifier, location) {
-        var node = createNode(237, location);
+        var node = createNode(241, location);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.exportClause = exportClause;
@@ -10748,7 +11740,7 @@ var ts;
     }
     ts.updateExportDeclaration = updateExportDeclaration;
     function createNamedExports(elements, location) {
-        var node = createNode(238, location);
+        var node = createNode(242, location);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -10761,7 +11753,7 @@ var ts;
     }
     ts.updateNamedExports = updateNamedExports;
     function createExportSpecifier(name, propertyName, location) {
-        var node = createNode(239, location);
+        var node = createNode(243, location);
         node.name = typeof name === "string" ? createIdentifier(name) : name;
         node.propertyName = typeof propertyName === "string" ? createIdentifier(propertyName) : propertyName;
         return node;
@@ -10775,7 +11767,7 @@ var ts;
     }
     ts.updateExportSpecifier = updateExportSpecifier;
     function createJsxElement(openingElement, children, closingElement, location) {
-        var node = createNode(242, location);
+        var node = createNode(246, location);
         node.openingElement = openingElement;
         node.children = createNodeArray(children);
         node.closingElement = closingElement;
@@ -10790,7 +11782,7 @@ var ts;
     }
     ts.updateJsxElement = updateJsxElement;
     function createJsxSelfClosingElement(tagName, attributes, location) {
-        var node = createNode(243, location);
+        var node = createNode(247, location);
         node.tagName = tagName;
         node.attributes = createNodeArray(attributes);
         return node;
@@ -10804,7 +11796,7 @@ var ts;
     }
     ts.updateJsxSelfClosingElement = updateJsxSelfClosingElement;
     function createJsxOpeningElement(tagName, attributes, location) {
-        var node = createNode(244, location);
+        var node = createNode(248, location);
         node.tagName = tagName;
         node.attributes = createNodeArray(attributes);
         return node;
@@ -10818,7 +11810,7 @@ var ts;
     }
     ts.updateJsxOpeningElement = updateJsxOpeningElement;
     function createJsxClosingElement(tagName, location) {
-        var node = createNode(245, location);
+        var node = createNode(249, location);
         node.tagName = tagName;
         return node;
     }
@@ -10831,7 +11823,7 @@ var ts;
     }
     ts.updateJsxClosingElement = updateJsxClosingElement;
     function createJsxAttribute(name, initializer, location) {
-        var node = createNode(246, location);
+        var node = createNode(250, location);
         node.name = name;
         node.initializer = initializer;
         return node;
@@ -10845,7 +11837,7 @@ var ts;
     }
     ts.updateJsxAttribute = updateJsxAttribute;
     function createJsxSpreadAttribute(expression, location) {
-        var node = createNode(247, location);
+        var node = createNode(251, location);
         node.expression = expression;
         return node;
     }
@@ -10858,7 +11850,7 @@ var ts;
     }
     ts.updateJsxSpreadAttribute = updateJsxSpreadAttribute;
     function createJsxExpression(expression, location) {
-        var node = createNode(248, location);
+        var node = createNode(252, location);
         node.expression = expression;
         return node;
     }
@@ -10871,7 +11863,7 @@ var ts;
     }
     ts.updateJsxExpression = updateJsxExpression;
     function createHeritageClause(token, types, location) {
-        var node = createNode(251, location);
+        var node = createNode(255, location);
         node.token = token;
         node.types = createNodeArray(types);
         return node;
@@ -10885,7 +11877,7 @@ var ts;
     }
     ts.updateHeritageClause = updateHeritageClause;
     function createCaseClause(expression, statements, location) {
-        var node = createNode(249, location);
+        var node = createNode(253, location);
         node.expression = parenthesizeExpressionForList(expression);
         node.statements = createNodeArray(statements);
         return node;
@@ -10899,7 +11891,7 @@ var ts;
     }
     ts.updateCaseClause = updateCaseClause;
     function createDefaultClause(statements, location) {
-        var node = createNode(250, location);
+        var node = createNode(254, location);
         node.statements = createNodeArray(statements);
         return node;
     }
@@ -10912,7 +11904,7 @@ var ts;
     }
     ts.updateDefaultClause = updateDefaultClause;
     function createCatchClause(variableDeclaration, block, location) {
-        var node = createNode(252, location);
+        var node = createNode(256, location);
         node.variableDeclaration = typeof variableDeclaration === "string" ? createVariableDeclaration(variableDeclaration) : variableDeclaration;
         node.block = block;
         return node;
@@ -10926,7 +11918,7 @@ var ts;
     }
     ts.updateCatchClause = updateCatchClause;
     function createPropertyAssignment(name, initializer, location) {
-        var node = createNode(253, location);
+        var node = createNode(257, location);
         node.name = typeof name === "string" ? createIdentifier(name) : name;
         node.questionToken = undefined;
         node.initializer = initializer !== undefined ? parenthesizeExpressionForList(initializer) : undefined;
@@ -10941,12 +11933,18 @@ var ts;
     }
     ts.updatePropertyAssignment = updatePropertyAssignment;
     function createShorthandPropertyAssignment(name, objectAssignmentInitializer, location) {
-        var node = createNode(254, location);
+        var node = createNode(258, location);
         node.name = typeof name === "string" ? createIdentifier(name) : name;
         node.objectAssignmentInitializer = objectAssignmentInitializer !== undefined ? parenthesizeExpressionForList(objectAssignmentInitializer) : undefined;
         return node;
     }
     ts.createShorthandPropertyAssignment = createShorthandPropertyAssignment;
+    function createSpreadAssignment(expression, location) {
+        var node = createNode(259, location);
+        node.expression = expression !== undefined ? parenthesizeExpressionForList(expression) : undefined;
+        return node;
+    }
+    ts.createSpreadAssignment = createSpreadAssignment;
     function updateShorthandPropertyAssignment(node, name, objectAssignmentInitializer) {
         if (node.name !== name || node.objectAssignmentInitializer !== objectAssignmentInitializer) {
             return updateNode(createShorthandPropertyAssignment(name, objectAssignmentInitializer, node), node);
@@ -10954,9 +11952,16 @@ var ts;
         return node;
     }
     ts.updateShorthandPropertyAssignment = updateShorthandPropertyAssignment;
+    function updateSpreadAssignment(node, expression) {
+        if (node.expression !== expression) {
+            return updateNode(createSpreadAssignment(expression, node), node);
+        }
+        return node;
+    }
+    ts.updateSpreadAssignment = updateSpreadAssignment;
     function updateSourceFileNode(node, statements) {
         if (node.statements !== statements) {
-            var updated = createNode(256, node, node.flags);
+            var updated = createNode(261, node, node.flags);
             updated.statements = createNodeArray(statements);
             updated.endOfFileToken = node.endOfFileToken;
             updated.fileName = node.fileName;
@@ -11018,13 +12023,27 @@ var ts;
     }
     ts.updateSourceFileNode = updateSourceFileNode;
     function createNotEmittedStatement(original) {
-        var node = createNode(287, original);
+        var node = createNode(292, original);
         node.original = original;
         return node;
     }
     ts.createNotEmittedStatement = createNotEmittedStatement;
+    function createEndOfDeclarationMarker(original) {
+        var node = createNode(295);
+        node.emitNode = {};
+        node.original = original;
+        return node;
+    }
+    ts.createEndOfDeclarationMarker = createEndOfDeclarationMarker;
+    function createMergeDeclarationMarker(original) {
+        var node = createNode(294);
+        node.emitNode = {};
+        node.original = original;
+        return node;
+    }
+    ts.createMergeDeclarationMarker = createMergeDeclarationMarker;
     function createPartiallyEmittedExpression(expression, original, location) {
-        var node = createNode(288, location || original);
+        var node = createNode(293, location || original);
         node.expression = expression;
         node.original = original;
         return node;
@@ -11096,10 +12115,6 @@ var ts;
         }
     }
     ts.createMemberAccessForPropertyName = createMemberAccessForPropertyName;
-    function createRestParameter(name) {
-        return createParameterDeclaration(undefined, undefined, createToken(23), name, undefined, undefined, undefined);
-    }
-    ts.createRestParameter = createRestParameter;
     function createFunctionCall(func, thisArg, argumentsList, location) {
         return createCall(createPropertyAccess(func, "call"), undefined, [
             thisArg
@@ -11132,10 +12147,23 @@ var ts;
     function createReactNamespace(reactNamespace, parent) {
         var react = createIdentifier(reactNamespace || "React");
         react.flags &= ~8;
-        react.parent = parent;
+        react.parent = ts.getParseTreeNode(parent);
         return react;
     }
-    function createReactCreateElement(reactNamespace, tagName, props, children, parentElement, location) {
+    function createJsxFactoryExpressionFromEntityName(jsxFactory, parent) {
+        if (ts.isQualifiedName(jsxFactory)) {
+            return createPropertyAccess(createJsxFactoryExpressionFromEntityName(jsxFactory.left, parent), setEmitFlags(getMutableClone(jsxFactory.right), 1536));
+        }
+        else {
+            return createReactNamespace(jsxFactory.text, parent);
+        }
+    }
+    function createJsxFactoryExpression(jsxFactoryEntity, reactNamespace, parent) {
+        return jsxFactoryEntity ?
+            createJsxFactoryExpressionFromEntityName(jsxFactoryEntity, parent) :
+            createPropertyAccess(createReactNamespace(reactNamespace, parent), "createElement");
+    }
+    function createExpressionForJsxElement(jsxFactoryEntity, reactNamespace, tagName, props, children, parentElement, location) {
         var argumentsList = [tagName];
         if (props) {
             argumentsList.push(props);
@@ -11155,9 +12183,21 @@ var ts;
                 argumentsList.push(children[0]);
             }
         }
-        return createCall(createPropertyAccess(createReactNamespace(reactNamespace, parentElement), "createElement"), undefined, argumentsList, location);
+        return createCall(createJsxFactoryExpression(jsxFactoryEntity, reactNamespace, parentElement), undefined, argumentsList, location);
     }
-    ts.createReactCreateElement = createReactCreateElement;
+    ts.createExpressionForJsxElement = createExpressionForJsxElement;
+    function createExportDefault(expression) {
+        return createExportAssignment(undefined, undefined, false, expression);
+    }
+    ts.createExportDefault = createExportDefault;
+    function createExternalModuleExport(exportName) {
+        return createExportDeclaration(undefined, undefined, createNamedExports([createExportSpecifier(exportName)]));
+    }
+    ts.createExternalModuleExport = createExternalModuleExport;
+    function createLetStatement(name, initializer, location) {
+        return createVariableStatement(undefined, createLetDeclarationList([createVariableDeclaration(name, undefined, initializer)]), location);
+    }
+    ts.createLetStatement = createLetStatement;
     function createLetDeclarationList(declarations, location) {
         return createVariableDeclarationList(declarations, location, 1);
     }
@@ -11229,13 +12269,13 @@ var ts;
         return createCall(createPropertyAccess(createIdentifier("Object"), "create"), undefined, [prototype]);
     }
     function createGeti(target) {
-        return createArrowFunction(undefined, undefined, [createParameter("name")], undefined, undefined, createElementAccess(target, createIdentifier("name")));
+        return createArrowFunction(undefined, undefined, [createParameter(undefined, undefined, undefined, "name")], undefined, createToken(35), createElementAccess(target, createIdentifier("name")));
     }
     function createSeti(target) {
         return createArrowFunction(undefined, undefined, [
-            createParameter("name"),
-            createParameter("value")
-        ], undefined, undefined, createAssignment(createElementAccess(target, createIdentifier("name")), createIdentifier("value")));
+            createParameter(undefined, undefined, undefined, "name"),
+            createParameter(undefined, undefined, undefined, "value")
+        ], undefined, createToken(35), createAssignment(createElementAccess(target, createIdentifier("name")), createIdentifier("value")));
     }
     function createAdvancedAsyncSuperHelper() {
         var createCache = createVariableStatement(undefined, createConstDeclarationList([
@@ -11244,20 +12284,20 @@ var ts;
         var getter = createGetAccessor(undefined, undefined, "value", [], undefined, createBlock([
             createReturn(createCall(createIdentifier("geti"), undefined, [createIdentifier("name")]))
         ]));
-        var setter = createSetAccessor(undefined, undefined, "value", [createParameter("v")], createBlock([
+        var setter = createSetAccessor(undefined, undefined, "value", [createParameter(undefined, undefined, undefined, "v")], createBlock([
             createStatement(createCall(createIdentifier("seti"), undefined, [
                 createIdentifier("name"),
                 createIdentifier("v")
             ]))
         ]));
-        var getOrCreateAccessorsForName = createReturn(createArrowFunction(undefined, undefined, [createParameter("name")], undefined, undefined, createLogicalOr(createElementAccess(createIdentifier("cache"), createIdentifier("name")), createParen(createAssignment(createElementAccess(createIdentifier("cache"), createIdentifier("name")), createObjectLiteral([
+        var getOrCreateAccessorsForName = createReturn(createArrowFunction(undefined, undefined, [createParameter(undefined, undefined, undefined, "name")], undefined, createToken(35), createLogicalOr(createElementAccess(createIdentifier("cache"), createIdentifier("name")), createParen(createAssignment(createElementAccess(createIdentifier("cache"), createIdentifier("name")), createObjectLiteral([
             getter,
             setter
         ]))))));
         return createVariableStatement(undefined, createConstDeclarationList([
             createVariableDeclaration("_super", undefined, createCall(createParen(createFunctionExpression(undefined, undefined, undefined, undefined, [
-                createParameter("geti"),
-                createParameter("seti")
+                createParameter(undefined, undefined, undefined, "geti"),
+                createParameter(undefined, undefined, undefined, "seti")
             ], undefined, createBlock([
                 createCache,
                 getOrCreateAccessorsForName
@@ -11283,13 +12323,13 @@ var ts;
             case 8:
             case 9:
                 return false;
-            case 171:
+            case 175:
                 var elements = target.elements;
                 if (elements.length === 0) {
                     return false;
                 }
                 return true;
-            case 172:
+            case 176:
                 return target.properties.length > 0;
             default:
                 return true;
@@ -11309,7 +12349,7 @@ var ts;
         }
         else {
             switch (callee.kind) {
-                case 173: {
+                case 177: {
                     if (shouldBeCapturedInTempVariable(callee.expression, cacheIdentifiers)) {
                         thisArg = createTempVariable(recordTempVariable);
                         target = createPropertyAccess(createAssignment(thisArg, callee.expression, callee.expression), callee.name, callee);
@@ -11320,7 +12360,7 @@ var ts;
                     }
                     break;
                 }
-                case 174: {
+                case 178: {
                     if (shouldBeCapturedInTempVariable(callee.expression, cacheIdentifiers)) {
                         thisArg = createTempVariable(recordTempVariable);
                         target = createElementAccess(createAssignment(thisArg, callee.expression, callee.expression), callee.argumentExpression, callee);
@@ -11370,14 +12410,14 @@ var ts;
     ts.createExpressionForPropertyName = createExpressionForPropertyName;
     function createExpressionForObjectLiteralElementLike(node, property, receiver) {
         switch (property.kind) {
-            case 150:
             case 151:
+            case 152:
                 return createExpressionForAccessorDeclaration(node.properties, property, receiver, node.multiLine);
-            case 253:
+            case 257:
                 return createExpressionForPropertyAssignment(property, receiver);
-            case 254:
+            case 258:
                 return createExpressionForShorthandPropertyAssignment(property, receiver);
-            case 148:
+            case 149:
                 return createExpressionForMethodDeclaration(property, receiver);
         }
     }
@@ -11418,6 +12458,59 @@ var ts;
     function createExpressionForMethodDeclaration(method, receiver) {
         return ts.aggregateTransformFlags(setOriginalNode(createAssignment(createMemberAccessForPropertyName(receiver, method.name, method.name), setOriginalNode(createFunctionExpression(method.modifiers, method.asteriskToken, undefined, undefined, method.parameters, undefined, method.body, method), method), method), method));
     }
+    function getLocalName(node, allowComments, allowSourceMaps) {
+        return getName(node, allowComments, allowSourceMaps, 262144);
+    }
+    ts.getLocalName = getLocalName;
+    function isLocalName(node) {
+        return (getEmitFlags(node) & 262144) !== 0;
+    }
+    ts.isLocalName = isLocalName;
+    function getExportName(node, allowComments, allowSourceMaps) {
+        return getName(node, allowComments, allowSourceMaps, 131072);
+    }
+    ts.getExportName = getExportName;
+    function isExportName(node) {
+        return (getEmitFlags(node) & 131072) !== 0;
+    }
+    ts.isExportName = isExportName;
+    function getDeclarationName(node, allowComments, allowSourceMaps) {
+        return getName(node, allowComments, allowSourceMaps);
+    }
+    ts.getDeclarationName = getDeclarationName;
+    function getName(node, allowComments, allowSourceMaps, emitFlags) {
+        if (node.name && ts.isIdentifier(node.name) && !ts.isGeneratedIdentifier(node.name)) {
+            var name_13 = getMutableClone(node.name);
+            emitFlags |= getEmitFlags(node.name);
+            if (!allowSourceMaps)
+                emitFlags |= 1536;
+            if (!allowComments)
+                emitFlags |= 49152;
+            if (emitFlags)
+                setEmitFlags(name_13, emitFlags);
+            return name_13;
+        }
+        return getGeneratedNameForNode(node);
+    }
+    function getExternalModuleOrNamespaceExportName(ns, node, allowComments, allowSourceMaps) {
+        if (ns && ts.hasModifier(node, 1)) {
+            return getNamespaceMemberName(ns, getName(node), allowComments, allowSourceMaps);
+        }
+        return getExportName(node, allowComments, allowSourceMaps);
+    }
+    ts.getExternalModuleOrNamespaceExportName = getExternalModuleOrNamespaceExportName;
+    function getNamespaceMemberName(ns, name, allowComments, allowSourceMaps) {
+        var qualifiedName = createPropertyAccess(ns, ts.nodeIsSynthesized(name) ? name : getSynthesizedClone(name), name);
+        var emitFlags;
+        if (!allowSourceMaps)
+            emitFlags |= 1536;
+        if (!allowComments)
+            emitFlags |= 49152;
+        if (emitFlags)
+            setEmitFlags(qualifiedName, emitFlags);
+        return qualifiedName;
+    }
+    ts.getNamespaceMemberName = getNamespaceMemberName;
     function isUseStrictPrologue(node) {
         return node.expression.text === "use strict";
     }
@@ -11479,7 +12572,7 @@ var ts;
     ts.ensureUseStrict = ensureUseStrict;
     function parenthesizeBinaryOperand(binaryOperator, operand, isLeftSideOfBinary, leftOperand) {
         var skipped = skipPartiallyEmittedExpressions(operand);
-        if (skipped.kind === 179) {
+        if (skipped.kind === 183) {
             return operand;
         }
         return binaryOperandNeedsParentheses(binaryOperator, operand, isLeftSideOfBinary, leftOperand)
@@ -11488,15 +12581,15 @@ var ts;
     }
     ts.parenthesizeBinaryOperand = parenthesizeBinaryOperand;
     function binaryOperandNeedsParentheses(binaryOperator, operand, isLeftSideOfBinary, leftOperand) {
-        var binaryOperatorPrecedence = ts.getOperatorPrecedence(188, binaryOperator);
-        var binaryOperatorAssociativity = ts.getOperatorAssociativity(188, binaryOperator);
+        var binaryOperatorPrecedence = ts.getOperatorPrecedence(192, binaryOperator);
+        var binaryOperatorAssociativity = ts.getOperatorAssociativity(192, binaryOperator);
         var emittedOperand = skipPartiallyEmittedExpressions(operand);
         var operandPrecedence = ts.getExpressionPrecedence(emittedOperand);
         switch (ts.compareValues(operandPrecedence, binaryOperatorPrecedence)) {
             case -1:
                 if (!isLeftSideOfBinary
                     && binaryOperatorAssociativity === 1
-                    && operand.kind === 191) {
+                    && operand.kind === 195) {
                     return false;
                 }
                 return true;
@@ -11535,7 +12628,7 @@ var ts;
         if (ts.isLiteralKind(node.kind)) {
             return node.kind;
         }
-        if (node.kind === 188 && node.operatorToken.kind === 36) {
+        if (node.kind === 192 && node.operatorToken.kind === 36) {
             if (node.cachedLiteralKind !== undefined) {
                 return node.cachedLiteralKind;
             }
@@ -11552,9 +12645,9 @@ var ts;
     function parenthesizeForNew(expression) {
         var emittedExpression = skipPartiallyEmittedExpressions(expression);
         switch (emittedExpression.kind) {
-            case 175:
+            case 179:
                 return createParen(expression);
-            case 176:
+            case 180:
                 return emittedExpression.arguments
                     ? expression
                     : createParen(expression);
@@ -11565,7 +12658,7 @@ var ts;
     function parenthesizeForAccess(expression) {
         var emittedExpression = skipPartiallyEmittedExpressions(expression);
         if (ts.isLeftHandSideExpression(emittedExpression)
-            && (emittedExpression.kind !== 176 || emittedExpression.arguments)
+            && (emittedExpression.kind !== 180 || emittedExpression.arguments)
             && emittedExpression.kind !== 8) {
             return expression;
         }
@@ -11603,7 +12696,7 @@ var ts;
     function parenthesizeExpressionForList(expression) {
         var emittedExpression = skipPartiallyEmittedExpressions(expression);
         var expressionPrecedence = ts.getExpressionPrecedence(emittedExpression);
-        var commaPrecedence = ts.getOperatorPrecedence(188, 25);
+        var commaPrecedence = ts.getOperatorPrecedence(192, 25);
         return expressionPrecedence > commaPrecedence
             ? expression
             : createParen(expression, expression);
@@ -11614,7 +12707,7 @@ var ts;
         if (ts.isCallExpression(emittedExpression)) {
             var callee = emittedExpression.expression;
             var kind = skipPartiallyEmittedExpressions(callee).kind;
-            if (kind === 180 || kind === 181) {
+            if (kind === 184 || kind === 185) {
                 var mutableCall = getMutableClone(emittedExpression);
                 mutableCall.expression = createParen(callee, callee);
                 return recreatePartiallyEmittedExpressions(expression, mutableCall);
@@ -11622,7 +12715,7 @@ var ts;
         }
         else {
             var leftmostExpressionKind = getLeftmostExpression(emittedExpression).kind;
-            if (leftmostExpressionKind === 172 || leftmostExpressionKind === 180) {
+            if (leftmostExpressionKind === 176 || leftmostExpressionKind === 184) {
                 return createParen(expression, expression);
             }
         }
@@ -11640,21 +12733,21 @@ var ts;
     function getLeftmostExpression(node) {
         while (true) {
             switch (node.kind) {
-                case 187:
+                case 191:
                     node = node.operand;
                     continue;
-                case 188:
+                case 192:
                     node = node.left;
                     continue;
-                case 189:
+                case 193:
                     node = node.condition;
                     continue;
-                case 175:
-                case 174:
-                case 173:
+                case 179:
+                case 178:
+                case 177:
                     node = node.expression;
                     continue;
-                case 288:
+                case 293:
                     node = node.expression;
                     continue;
             }
@@ -11663,19 +12756,12 @@ var ts;
     }
     function parenthesizeConciseBody(body) {
         var emittedBody = skipPartiallyEmittedExpressions(body);
-        if (emittedBody.kind === 172) {
+        if (emittedBody.kind === 176) {
             return createParen(body, body);
         }
         return body;
     }
     ts.parenthesizeConciseBody = parenthesizeConciseBody;
-    (function (OuterExpressionKinds) {
-        OuterExpressionKinds[OuterExpressionKinds["Parentheses"] = 1] = "Parentheses";
-        OuterExpressionKinds[OuterExpressionKinds["Assertions"] = 2] = "Assertions";
-        OuterExpressionKinds[OuterExpressionKinds["PartiallyEmittedExpressions"] = 4] = "PartiallyEmittedExpressions";
-        OuterExpressionKinds[OuterExpressionKinds["All"] = 7] = "All";
-    })(ts.OuterExpressionKinds || (ts.OuterExpressionKinds = {}));
-    var OuterExpressionKinds = ts.OuterExpressionKinds;
     function skipOuterExpressions(node, kinds) {
         if (kinds === void 0) { kinds = 7; }
         var previousNode;
@@ -11695,7 +12781,7 @@ var ts;
     }
     ts.skipOuterExpressions = skipOuterExpressions;
     function skipParentheses(node) {
-        while (node.kind === 179) {
+        while (node.kind === 183) {
             node = node.expression;
         }
         return node;
@@ -11709,7 +12795,7 @@ var ts;
     }
     ts.skipAssertions = skipAssertions;
     function skipPartiallyEmittedExpressions(node) {
-        while (node.kind === 288) {
+        while (node.kind === 293) {
             node = node.expression;
         }
         return node;
@@ -11765,7 +12851,7 @@ var ts;
     function getOrCreateEmitNode(node) {
         if (!node.emitNode) {
             if (ts.isParseTreeNode(node)) {
-                if (node.kind === 256) {
+                if (node.kind === 261) {
                     return node.emitNode = { annotatedNodes: [node] };
                 }
                 var sourceFile = ts.getSourceFileOfNode(node);
@@ -11855,13 +12941,13 @@ var ts;
     function getLocalNameForExternalImport(node, sourceFile) {
         var namespaceDeclaration = ts.getNamespaceDeclarationNode(node);
         if (namespaceDeclaration && !ts.isDefaultImport(node)) {
-            var name_9 = namespaceDeclaration.name;
-            return ts.isGeneratedIdentifier(name_9) ? name_9 : createIdentifier(ts.getSourceTextOfNodeFromSourceFile(sourceFile, namespaceDeclaration.name));
+            var name_14 = namespaceDeclaration.name;
+            return ts.isGeneratedIdentifier(name_14) ? name_14 : createIdentifier(ts.getSourceTextOfNodeFromSourceFile(sourceFile, namespaceDeclaration.name));
         }
-        if (node.kind === 231 && node.importClause) {
+        if (node.kind === 235 && node.importClause) {
             return getGeneratedNameForNode(node);
         }
-        if (node.kind === 237 && node.moduleSpecifier) {
+        if (node.kind === 241 && node.moduleSpecifier) {
             return getGeneratedNameForNode(node);
         }
         return undefined;
@@ -11899,6 +12985,221 @@ var ts;
     function tryGetModuleNameFromDeclaration(declaration, host, resolver, compilerOptions) {
         return tryGetModuleNameFromFile(resolver.getExternalModuleFileFromDeclaration(declaration), host, compilerOptions);
     }
+    function transformFunctionBody(node, visitor, currentSourceFile, context, enableSubstitutionsForCapturedThis, convertObjectRest) {
+        var multiLine = false;
+        var singleLine = false;
+        var statementsLocation;
+        var closeBraceLocation;
+        var statements = [];
+        var body = node.body;
+        var statementOffset;
+        context.startLexicalEnvironment();
+        if (ts.isBlock(body)) {
+            statementOffset = addPrologueDirectives(statements, body.statements, false, visitor);
+        }
+        addCaptureThisForNodeIfNeeded(statements, node, enableSubstitutionsForCapturedThis);
+        addDefaultValueAssignmentsIfNeeded(statements, node, visitor, convertObjectRest);
+        addRestParameterIfNeeded(statements, node, false);
+        if (!multiLine && statements.length > 0) {
+            multiLine = true;
+        }
+        if (ts.isBlock(body)) {
+            statementsLocation = body.statements;
+            ts.addRange(statements, ts.visitNodes(body.statements, visitor, ts.isStatement, statementOffset));
+            if (!multiLine && body.multiLine) {
+                multiLine = true;
+            }
+        }
+        else {
+            ts.Debug.assert(node.kind === 185);
+            statementsLocation = ts.moveRangeEnd(body, -1);
+            var equalsGreaterThanToken = node.equalsGreaterThanToken;
+            if (!ts.nodeIsSynthesized(equalsGreaterThanToken) && !ts.nodeIsSynthesized(body)) {
+                if (ts.rangeEndIsOnSameLineAsRangeStart(equalsGreaterThanToken, body, currentSourceFile)) {
+                    singleLine = true;
+                }
+                else {
+                    multiLine = true;
+                }
+            }
+            var expression = ts.visitNode(body, visitor, ts.isExpression);
+            var returnStatement = createReturn(expression, body);
+            setEmitFlags(returnStatement, 12288 | 1024 | 32768);
+            statements.push(returnStatement);
+            closeBraceLocation = body;
+        }
+        var lexicalEnvironment = context.endLexicalEnvironment();
+        ts.addRange(statements, lexicalEnvironment);
+        if (!multiLine && lexicalEnvironment && lexicalEnvironment.length) {
+            multiLine = true;
+        }
+        var block = createBlock(createNodeArray(statements, statementsLocation), node.body, multiLine);
+        if (!multiLine && singleLine) {
+            setEmitFlags(block, 32);
+        }
+        if (closeBraceLocation) {
+            setTokenSourceMapRange(block, 17, closeBraceLocation);
+        }
+        setOriginalNode(block, node.body);
+        return block;
+    }
+    ts.transformFunctionBody = transformFunctionBody;
+    function addCaptureThisForNodeIfNeeded(statements, node, enableSubstitutionsForCapturedThis) {
+        if (node.transformFlags & 524288 && node.kind !== 185) {
+            captureThisForNode(statements, node, createThis(), enableSubstitutionsForCapturedThis);
+        }
+    }
+    ts.addCaptureThisForNodeIfNeeded = addCaptureThisForNodeIfNeeded;
+    function captureThisForNode(statements, node, initializer, enableSubstitutionsForCapturedThis, originalStatement) {
+        enableSubstitutionsForCapturedThis();
+        var captureThisStatement = createVariableStatement(undefined, createVariableDeclarationList([
+            createVariableDeclaration("_this", undefined, initializer)
+        ]), originalStatement);
+        setEmitFlags(captureThisStatement, 49152 | 8388608);
+        setSourceMapRange(captureThisStatement, node);
+        statements.push(captureThisStatement);
+    }
+    ts.captureThisForNode = captureThisForNode;
+    function shouldAddDefaultValueAssignments(node) {
+        return (node.transformFlags & 2097152) !== 0;
+    }
+    function addDefaultValueAssignmentsIfNeeded(statements, node, visitor, convertObjectRest) {
+        if (!shouldAddDefaultValueAssignments(node)) {
+            return;
+        }
+        for (var _i = 0, _a = node.parameters; _i < _a.length; _i++) {
+            var parameter = _a[_i];
+            var name_15 = parameter.name, initializer = parameter.initializer, dotDotDotToken = parameter.dotDotDotToken;
+            if (dotDotDotToken) {
+                continue;
+            }
+            if (ts.isBindingPattern(name_15)) {
+                addDefaultValueAssignmentForBindingPattern(statements, parameter, name_15, initializer, visitor, convertObjectRest);
+            }
+            else if (initializer) {
+                addDefaultValueAssignmentForInitializer(statements, parameter, name_15, initializer, visitor);
+            }
+        }
+    }
+    ts.addDefaultValueAssignmentsIfNeeded = addDefaultValueAssignmentsIfNeeded;
+    function addDefaultValueAssignmentForBindingPattern(statements, parameter, name, initializer, visitor, convertObjectRest) {
+        var temp = getGeneratedNameForNode(parameter);
+        if (name.elements.length > 0) {
+            statements.push(setEmitFlags(createVariableStatement(undefined, createVariableDeclarationList(ts.flattenParameterDestructuring(parameter, temp, visitor, convertObjectRest))), 8388608));
+        }
+        else if (initializer) {
+            statements.push(setEmitFlags(createStatement(createAssignment(temp, ts.visitNode(initializer, visitor, ts.isExpression))), 8388608));
+        }
+    }
+    function addDefaultValueAssignmentForInitializer(statements, parameter, name, initializer, visitor) {
+        initializer = ts.visitNode(initializer, visitor, ts.isExpression);
+        var statement = createIf(createStrictEquality(getSynthesizedClone(name), createVoidZero()), setEmitFlags(createBlock([
+            createStatement(createAssignment(setEmitFlags(getMutableClone(name), 1536), setEmitFlags(initializer, 1536 | getEmitFlags(initializer)), parameter))
+        ], parameter), 32 | 1024 | 12288), undefined, parameter);
+        statement.startsOnNewLine = true;
+        setEmitFlags(statement, 12288 | 1024 | 8388608);
+        statements.push(statement);
+    }
+    function shouldAddRestParameter(node, inConstructorWithSynthesizedSuper) {
+        return node && node.dotDotDotToken && node.name.kind === 70 && !inConstructorWithSynthesizedSuper;
+    }
+    function addRestParameterIfNeeded(statements, node, inConstructorWithSynthesizedSuper) {
+        var parameter = ts.lastOrUndefined(node.parameters);
+        if (!shouldAddRestParameter(parameter, inConstructorWithSynthesizedSuper)) {
+            return;
+        }
+        var declarationName = getMutableClone(parameter.name);
+        setEmitFlags(declarationName, 1536);
+        var expressionName = getSynthesizedClone(parameter.name);
+        var restIndex = node.parameters.length - 1;
+        var temp = createLoopVariable();
+        statements.push(setEmitFlags(createVariableStatement(undefined, createVariableDeclarationList([
+            createVariableDeclaration(declarationName, undefined, createArrayLiteral([]))
+        ]), parameter), 8388608));
+        var forStatement = createFor(createVariableDeclarationList([
+            createVariableDeclaration(temp, undefined, createLiteral(restIndex))
+        ], parameter), createLessThan(temp, createPropertyAccess(createIdentifier("arguments"), "length"), parameter), createPostfixIncrement(temp, parameter), createBlock([
+            startOnNewLine(createStatement(createAssignment(createElementAccess(expressionName, createSubtract(temp, createLiteral(restIndex))), createElementAccess(createIdentifier("arguments"), temp)), parameter))
+        ]));
+        setEmitFlags(forStatement, 8388608);
+        startOnNewLine(forStatement);
+        statements.push(forStatement);
+    }
+    ts.addRestParameterIfNeeded = addRestParameterIfNeeded;
+    function convertForOf(node, convertedLoopBodyStatements, visitor, enableSubstitutionsForBlockScopedBindings, context, convertObjectRest) {
+        var expression = ts.visitNode(node.expression, visitor, ts.isExpression);
+        var initializer = node.initializer;
+        var statements = [];
+        var counter = convertObjectRest ? undefined : createLoopVariable();
+        var rhsReference = expression.kind === 70
+            ? createUniqueName(expression.text)
+            : createTempVariable(undefined);
+        var elementAccess = convertObjectRest ? rhsReference : createElementAccess(rhsReference, counter);
+        if (ts.isVariableDeclarationList(initializer)) {
+            if (initializer.flags & 3) {
+                enableSubstitutionsForBlockScopedBindings();
+            }
+            var firstOriginalDeclaration = ts.firstOrUndefined(initializer.declarations);
+            if (firstOriginalDeclaration && ts.isBindingPattern(firstOriginalDeclaration.name)) {
+                var declarations = ts.flattenVariableDestructuring(firstOriginalDeclaration, elementAccess, visitor, undefined, convertObjectRest);
+                var declarationList = createVariableDeclarationList(declarations, initializer);
+                setOriginalNode(declarationList, initializer);
+                var firstDeclaration = declarations[0];
+                var lastDeclaration = ts.lastOrUndefined(declarations);
+                setSourceMapRange(declarationList, ts.createRange(firstDeclaration.pos, lastDeclaration.end));
+                statements.push(createVariableStatement(undefined, declarationList));
+            }
+            else {
+                statements.push(createVariableStatement(undefined, setOriginalNode(createVariableDeclarationList([
+                    createVariableDeclaration(firstOriginalDeclaration ? firstOriginalDeclaration.name : createTempVariable(undefined), undefined, createElementAccess(rhsReference, counter))
+                ], ts.moveRangePos(initializer, -1)), initializer), ts.moveRangeEnd(initializer, -1)));
+            }
+        }
+        else {
+            var assignment = createAssignment(initializer, elementAccess);
+            if (ts.isDestructuringAssignment(assignment)) {
+                statements.push(createStatement(ts.flattenDestructuringAssignment(context, assignment, false, context.hoistVariableDeclaration, visitor, convertObjectRest)));
+            }
+            else {
+                assignment.end = initializer.end;
+                statements.push(createStatement(assignment, ts.moveRangeEnd(initializer, -1)));
+            }
+        }
+        var bodyLocation;
+        var statementsLocation;
+        if (convertedLoopBodyStatements) {
+            ts.addRange(statements, convertedLoopBodyStatements);
+        }
+        else {
+            var statement = ts.visitNode(node.statement, visitor, ts.isStatement);
+            if (ts.isBlock(statement)) {
+                ts.addRange(statements, statement.statements);
+                bodyLocation = statement;
+                statementsLocation = statement.statements;
+            }
+            else {
+                statements.push(statement);
+            }
+        }
+        setEmitFlags(expression, 1536 | getEmitFlags(expression));
+        var body = createBlock(createNodeArray(statements, statementsLocation), bodyLocation);
+        setEmitFlags(body, 1536 | 12288);
+        var forStatement;
+        if (convertObjectRest) {
+            forStatement = createForOf(createVariableDeclarationList([
+                createVariableDeclaration(rhsReference, undefined, undefined, node.expression)
+            ], node.expression), node.expression, body, node);
+        }
+        else {
+            forStatement = createFor(setEmitFlags(createVariableDeclarationList([
+                createVariableDeclaration(counter, undefined, createLiteral(0), ts.moveRangePos(node.expression, -1)),
+                createVariableDeclaration(rhsReference, undefined, expression, node.expression)
+            ], node.expression), 16777216), createLessThan(counter, createPropertyAccess(rhsReference, "length"), node.expression), createPostfixIncrement(counter, node.expression), body, node);
+        }
+        setEmitFlags(forStatement, 8192);
+        return forStatement;
+    }
+    ts.convertForOf = convertForOf;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -11907,13 +13208,13 @@ var ts;
     var IdentifierConstructor;
     var SourceFileConstructor;
     function createNode(kind, pos, end) {
-        if (kind === 256) {
+        if (kind === 261) {
             return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, pos, end);
         }
         else if (kind === 70) {
             return new (IdentifierConstructor || (IdentifierConstructor = ts.objectAllocator.getIdentifierConstructor()))(kind, pos, end);
         }
-        else if (kind < 140) {
+        else if (kind < 141) {
             return new (TokenConstructor || (TokenConstructor = ts.objectAllocator.getTokenConstructor()))(kind, pos, end);
         }
         else {
@@ -11949,26 +13250,28 @@ var ts;
         var visitNodes = cbNodeArray ? visitNodeArray : visitEachNode;
         var cbNodes = cbNodeArray || cbNode;
         switch (node.kind) {
-            case 140:
+            case 141:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.right);
-            case 142:
+            case 143:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.constraint) ||
                     visitNode(cbNode, node.expression);
-            case 254:
+            case 258:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.equalsToken) ||
                     visitNode(cbNode, node.objectAssignmentInitializer);
-            case 143:
+            case 259:
+                return visitNode(cbNode, node.expression);
+            case 144:
+            case 147:
             case 146:
-            case 145:
-            case 253:
-            case 219:
-            case 170:
+            case 257:
+            case 223:
+            case 174:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.propertyName) ||
@@ -11977,24 +13280,24 @@ var ts;
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 157:
             case 158:
-            case 152:
+            case 159:
             case 153:
             case 154:
+            case 155:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNodes(cbNodes, node.typeParameters) ||
                     visitNodes(cbNodes, node.parameters) ||
                     visitNode(cbNode, node.type);
-            case 148:
-            case 147:
             case 149:
+            case 148:
             case 150:
             case 151:
-            case 180:
-            case 221:
-            case 181:
+            case 152:
+            case 184:
+            case 225:
+            case 185:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.asteriskToken) ||
@@ -12005,308 +13308,318 @@ var ts;
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.equalsGreaterThanToken) ||
                     visitNode(cbNode, node.body);
-            case 156:
+            case 157:
                 return visitNode(cbNode, node.typeName) ||
                     visitNodes(cbNodes, node.typeArguments);
-            case 155:
+            case 156:
                 return visitNode(cbNode, node.parameterName) ||
                     visitNode(cbNode, node.type);
-            case 159:
-                return visitNode(cbNode, node.exprName);
             case 160:
-                return visitNodes(cbNodes, node.members);
+                return visitNode(cbNode, node.exprName);
             case 161:
-                return visitNode(cbNode, node.elementType);
+                return visitNodes(cbNodes, node.members);
             case 162:
-                return visitNodes(cbNodes, node.elementTypes);
+                return visitNode(cbNode, node.elementType);
             case 163:
+                return visitNodes(cbNodes, node.elementTypes);
             case 164:
-                return visitNodes(cbNodes, node.types);
             case 165:
-                return visitNode(cbNode, node.type);
-            case 167:
-                return visitNode(cbNode, node.literal);
+                return visitNodes(cbNodes, node.types);
+            case 166:
             case 168:
+                return visitNode(cbNode, node.type);
             case 169:
-                return visitNodes(cbNodes, node.elements);
+                return visitNode(cbNode, node.objectType) ||
+                    visitNode(cbNode, node.indexType);
+            case 170:
+                return visitNode(cbNode, node.readonlyToken) ||
+                    visitNode(cbNode, node.typeParameter) ||
+                    visitNode(cbNode, node.questionToken) ||
+                    visitNode(cbNode, node.type);
             case 171:
-                return visitNodes(cbNodes, node.elements);
+                return visitNode(cbNode, node.literal);
             case 172:
-                return visitNodes(cbNodes, node.properties);
             case 173:
+                return visitNodes(cbNodes, node.elements);
+            case 175:
+                return visitNodes(cbNodes, node.elements);
+            case 176:
+                return visitNodes(cbNodes, node.properties);
+            case 177:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.name);
-            case 174:
+            case 178:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.argumentExpression);
-            case 175:
-            case 176:
+            case 179:
+            case 180:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNodes, node.typeArguments) ||
                     visitNodes(cbNodes, node.arguments);
-            case 177:
+            case 181:
                 return visitNode(cbNode, node.tag) ||
                     visitNode(cbNode, node.template);
-            case 178:
+            case 182:
                 return visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.expression);
-            case 179:
-                return visitNode(cbNode, node.expression);
-            case 182:
-                return visitNode(cbNode, node.expression);
             case 183:
                 return visitNode(cbNode, node.expression);
-            case 184:
-                return visitNode(cbNode, node.expression);
             case 186:
-                return visitNode(cbNode, node.operand);
-            case 191:
-                return visitNode(cbNode, node.asteriskToken) ||
-                    visitNode(cbNode, node.expression);
-            case 185:
                 return visitNode(cbNode, node.expression);
             case 187:
-                return visitNode(cbNode, node.operand);
+                return visitNode(cbNode, node.expression);
             case 188:
+                return visitNode(cbNode, node.expression);
+            case 190:
+                return visitNode(cbNode, node.operand);
+            case 195:
+                return visitNode(cbNode, node.asteriskToken) ||
+                    visitNode(cbNode, node.expression);
+            case 189:
+                return visitNode(cbNode, node.expression);
+            case 191:
+                return visitNode(cbNode, node.operand);
+            case 192:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.operatorToken) ||
                     visitNode(cbNode, node.right);
-            case 196:
+            case 200:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.type);
-            case 197:
+            case 201:
                 return visitNode(cbNode, node.expression);
-            case 189:
+            case 193:
                 return visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.whenTrue) ||
                     visitNode(cbNode, node.colonToken) ||
                     visitNode(cbNode, node.whenFalse);
-            case 192:
+            case 196:
                 return visitNode(cbNode, node.expression);
-            case 200:
-            case 227:
+            case 204:
+            case 231:
                 return visitNodes(cbNodes, node.statements);
-            case 256:
+            case 261:
                 return visitNodes(cbNodes, node.statements) ||
                     visitNode(cbNode, node.endOfFileToken);
-            case 201:
+            case 205:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.declarationList);
-            case 220:
+            case 224:
                 return visitNodes(cbNodes, node.declarations);
-            case 203:
+            case 207:
                 return visitNode(cbNode, node.expression);
-            case 204:
+            case 208:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.thenStatement) ||
                     visitNode(cbNode, node.elseStatement);
-            case 205:
+            case 209:
                 return visitNode(cbNode, node.statement) ||
                     visitNode(cbNode, node.expression);
-            case 206:
+            case 210:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 207:
+            case 211:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.incrementor) ||
                     visitNode(cbNode, node.statement);
-            case 208:
-                return visitNode(cbNode, node.initializer) ||
-                    visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.statement);
-            case 209:
-                return visitNode(cbNode, node.initializer) ||
-                    visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.statement);
-            case 210:
-            case 211:
-                return visitNode(cbNode, node.label);
             case 212:
-                return visitNode(cbNode, node.expression);
+                return visitNode(cbNode, node.initializer) ||
+                    visitNode(cbNode, node.expression) ||
+                    visitNode(cbNode, node.statement);
             case 213:
-                return visitNode(cbNode, node.expression) ||
+                return visitNode(cbNode, node.initializer) ||
+                    visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
             case 214:
-                return visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.caseBlock);
-            case 228:
-                return visitNodes(cbNodes, node.clauses);
-            case 249:
-                return visitNode(cbNode, node.expression) ||
-                    visitNodes(cbNodes, node.statements);
-            case 250:
-                return visitNodes(cbNodes, node.statements);
             case 215:
-                return visitNode(cbNode, node.label) ||
-                    visitNode(cbNode, node.statement);
+                return visitNode(cbNode, node.label);
             case 216:
                 return visitNode(cbNode, node.expression);
             case 217:
+                return visitNode(cbNode, node.expression) ||
+                    visitNode(cbNode, node.statement);
+            case 218:
+                return visitNode(cbNode, node.expression) ||
+                    visitNode(cbNode, node.caseBlock);
+            case 232:
+                return visitNodes(cbNodes, node.clauses);
+            case 253:
+                return visitNode(cbNode, node.expression) ||
+                    visitNodes(cbNodes, node.statements);
+            case 254:
+                return visitNodes(cbNodes, node.statements);
+            case 219:
+                return visitNode(cbNode, node.label) ||
+                    visitNode(cbNode, node.statement);
+            case 220:
+                return visitNode(cbNode, node.expression);
+            case 221:
                 return visitNode(cbNode, node.tryBlock) ||
                     visitNode(cbNode, node.catchClause) ||
                     visitNode(cbNode, node.finallyBlock);
-            case 252:
+            case 256:
                 return visitNode(cbNode, node.variableDeclaration) ||
                     visitNode(cbNode, node.block);
-            case 144:
+            case 145:
                 return visitNode(cbNode, node.expression);
-            case 222:
-            case 193:
+            case 226:
+            case 197:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNodes, node.typeParameters) ||
                     visitNodes(cbNodes, node.heritageClauses) ||
                     visitNodes(cbNodes, node.members);
-            case 223:
+            case 227:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNodes, node.typeParameters) ||
                     visitNodes(cbNodes, node.heritageClauses) ||
                     visitNodes(cbNodes, node.members);
-            case 224:
+            case 228:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNodes, node.typeParameters) ||
                     visitNode(cbNode, node.type);
-            case 225:
+            case 229:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNodes, node.members);
-            case 255:
+            case 260:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 226:
-                return visitNodes(cbNodes, node.decorators) ||
-                    visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.body);
             case 230:
+                return visitNodes(cbNodes, node.decorators) ||
+                    visitNodes(cbNodes, node.modifiers) ||
+                    visitNode(cbNode, node.name) ||
+                    visitNode(cbNode, node.body);
+            case 234:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.moduleReference);
-            case 231:
+            case 235:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.importClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 232:
+            case 236:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.namedBindings);
-            case 229:
-                return visitNode(cbNode, node.name);
             case 233:
                 return visitNode(cbNode, node.name);
-            case 234:
-            case 238:
-                return visitNodes(cbNodes, node.elements);
             case 237:
+                return visitNode(cbNode, node.name);
+            case 238:
+            case 242:
+                return visitNodes(cbNodes, node.elements);
+            case 241:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.exportClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 235:
             case 239:
+            case 243:
                 return visitNode(cbNode, node.propertyName) ||
                     visitNode(cbNode, node.name);
-            case 236:
+            case 240:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.expression);
-            case 190:
+            case 194:
                 return visitNode(cbNode, node.head) || visitNodes(cbNodes, node.templateSpans);
-            case 198:
+            case 202:
                 return visitNode(cbNode, node.expression) || visitNode(cbNode, node.literal);
-            case 141:
+            case 142:
                 return visitNode(cbNode, node.expression);
-            case 251:
+            case 255:
                 return visitNodes(cbNodes, node.types);
-            case 195:
+            case 199:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNodes, node.typeArguments);
-            case 241:
+            case 245:
                 return visitNode(cbNode, node.expression);
-            case 240:
+            case 244:
                 return visitNodes(cbNodes, node.decorators);
-            case 242:
+            case 246:
                 return visitNode(cbNode, node.openingElement) ||
                     visitNodes(cbNodes, node.children) ||
                     visitNode(cbNode, node.closingElement);
-            case 243:
-            case 244:
+            case 247:
+            case 248:
                 return visitNode(cbNode, node.tagName) ||
                     visitNodes(cbNodes, node.attributes);
-            case 246:
+            case 250:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 247:
+            case 251:
                 return visitNode(cbNode, node.expression);
-            case 248:
+            case 252:
                 return visitNode(cbNode, node.expression);
-            case 245:
+            case 249:
                 return visitNode(cbNode, node.tagName);
-            case 257:
-                return visitNode(cbNode, node.type);
-            case 261:
-                return visitNodes(cbNodes, node.types);
             case 262:
-                return visitNodes(cbNodes, node.types);
-            case 260:
-                return visitNode(cbNode, node.elementType);
-            case 264:
-                return visitNode(cbNode, node.type);
-            case 263:
-                return visitNode(cbNode, node.type);
-            case 265:
-                return visitNode(cbNode, node.literal);
-            case 267:
-                return visitNode(cbNode, node.name) ||
-                    visitNodes(cbNodes, node.typeArguments);
-            case 268:
-                return visitNode(cbNode, node.type);
-            case 269:
-                return visitNodes(cbNodes, node.parameters) ||
-                    visitNode(cbNode, node.type);
-            case 270:
-                return visitNode(cbNode, node.type);
-            case 271:
-                return visitNode(cbNode, node.type);
-            case 272:
                 return visitNode(cbNode, node.type);
             case 266:
+                return visitNodes(cbNodes, node.types);
+            case 267:
+                return visitNodes(cbNodes, node.types);
+            case 265:
+                return visitNode(cbNode, node.elementType);
+            case 269:
+                return visitNode(cbNode, node.type);
+            case 268:
+                return visitNode(cbNode, node.type);
+            case 270:
+                return visitNode(cbNode, node.literal);
+            case 272:
+                return visitNode(cbNode, node.name) ||
+                    visitNodes(cbNodes, node.typeArguments);
+            case 273:
+                return visitNode(cbNode, node.type);
+            case 274:
+                return visitNodes(cbNodes, node.parameters) ||
+                    visitNode(cbNode, node.type);
+            case 275:
+                return visitNode(cbNode, node.type);
+            case 276:
+                return visitNode(cbNode, node.type);
+            case 277:
+                return visitNode(cbNode, node.type);
+            case 271:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.type);
-            case 273:
+            case 278:
                 return visitNodes(cbNodes, node.tags);
-            case 275:
+            case 280:
                 return visitNode(cbNode, node.preParameterName) ||
                     visitNode(cbNode, node.typeExpression) ||
                     visitNode(cbNode, node.postParameterName);
-            case 276:
+            case 281:
                 return visitNode(cbNode, node.typeExpression);
-            case 277:
+            case 282:
                 return visitNode(cbNode, node.typeExpression);
-            case 278:
+            case 283:
                 return visitNodes(cbNodes, node.typeParameters);
-            case 279:
+            case 284:
                 return visitNode(cbNode, node.typeExpression) ||
+                    visitNode(cbNode, node.fullName) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.jsDocTypeLiteral);
-            case 281:
+            case 286:
                 return visitNodes(cbNodes, node.jsDocPropertyTags);
-            case 280:
+            case 285:
                 return visitNode(cbNode, node.typeExpression) ||
                     visitNode(cbNode, node.name);
-            case 288:
+            case 293:
                 return visitNode(cbNode, node.expression);
-            case 282:
+            case 287:
                 return visitNode(cbNode, node.literal);
         }
     }
@@ -12320,6 +13633,10 @@ var ts;
         return result;
     }
     ts.createSourceFile = createSourceFile;
+    function parseIsolatedEntityName(text, languageVersion) {
+        return Parser.parseIsolatedEntityName(text, languageVersion);
+    }
+    ts.parseIsolatedEntityName = parseIsolatedEntityName;
     function isExternalModule(file) {
         return file.externalModuleIndicator !== undefined;
     }
@@ -12342,8 +13659,8 @@ var ts;
     ts.parseJSDocTypeExpressionForTests = parseJSDocTypeExpressionForTests;
     var Parser;
     (function (Parser) {
-        var scanner = ts.createScanner(4, true);
-        var disallowInAndDecoratorContext = 32768 | 131072;
+        var scanner = ts.createScanner(5, true);
+        var disallowInAndDecoratorContext = 65536 | 262144;
         var NodeConstructor;
         var TokenConstructor;
         var IdentifierConstructor;
@@ -12367,6 +13684,15 @@ var ts;
             return result;
         }
         Parser.parseSourceFile = parseSourceFile;
+        function parseIsolatedEntityName(content, languageVersion) {
+            initializeState(content, languageVersion, undefined, 1);
+            nextToken();
+            var entityName = parseEntityName(true);
+            var isInvalid = token() === 1 && !parseDiagnostics.length;
+            clearState();
+            return isInvalid ? entityName : undefined;
+        }
+        Parser.parseIsolatedEntityName = parseIsolatedEntityName;
         function getLanguageVariant(scriptKind) {
             return scriptKind === 4 || scriptKind === 2 || scriptKind === 1 ? 1 : 0;
         }
@@ -12382,7 +13708,7 @@ var ts;
             identifiers = ts.createMap();
             identifierCount = 0;
             nodeCount = 0;
-            contextFlags = scriptKind === 1 || scriptKind === 2 ? 1048576 : 0;
+            contextFlags = scriptKind === 1 || scriptKind === 2 ? 2097152 : 0;
             parseErrorBeforeNextFinishedNode = false;
             scanner.setText(sourceText);
             scanner.setOnError(scanError);
@@ -12457,7 +13783,7 @@ var ts;
         }
         Parser.fixupParentReferences = fixupParentReferences;
         function createSourceFile(fileName, languageVersion, scriptKind) {
-            var sourceFile = new SourceFileConstructor(256, 0, sourceText.length);
+            var sourceFile = new SourceFileConstructor(261, 0, sourceText.length);
             nodeCount++;
             sourceFile.text = sourceText;
             sourceFile.bindDiagnostics = [];
@@ -12477,17 +13803,17 @@ var ts;
             }
         }
         function setDisallowInContext(val) {
-            setContextFlag(val, 32768);
-        }
-        function setYieldContext(val) {
             setContextFlag(val, 65536);
         }
-        function setDecoratorContext(val) {
+        function setYieldContext(val) {
             setContextFlag(val, 131072);
         }
-        function setAwaitContext(val) {
+        function setDecoratorContext(val) {
             setContextFlag(val, 262144);
         }
+        function setAwaitContext(val) {
+            setContextFlag(val, 524288);
+        }
         function doOutsideOfContext(context, func) {
             var contextFlagsToClear = context & contextFlags;
             if (contextFlagsToClear) {
@@ -12509,41 +13835,41 @@ var ts;
             return func();
         }
         function allowInAnd(func) {
-            return doOutsideOfContext(32768, func);
+            return doOutsideOfContext(65536, func);
         }
         function disallowInAnd(func) {
-            return doInsideOfContext(32768, func);
-        }
-        function doInYieldContext(func) {
             return doInsideOfContext(65536, func);
         }
-        function doInDecoratorContext(func) {
+        function doInYieldContext(func) {
             return doInsideOfContext(131072, func);
         }
-        function doInAwaitContext(func) {
+        function doInDecoratorContext(func) {
             return doInsideOfContext(262144, func);
         }
+        function doInAwaitContext(func) {
+            return doInsideOfContext(524288, func);
+        }
         function doOutsideOfAwaitContext(func) {
-            return doOutsideOfContext(262144, func);
+            return doOutsideOfContext(524288, func);
         }
         function doInYieldAndAwaitContext(func) {
-            return doInsideOfContext(65536 | 262144, func);
+            return doInsideOfContext(131072 | 524288, func);
         }
         function inContext(flags) {
             return (contextFlags & flags) !== 0;
         }
         function inYieldContext() {
-            return inContext(65536);
-        }
-        function inDisallowInContext() {
-            return inContext(32768);
-        }
-        function inDecoratorContext() {
             return inContext(131072);
         }
-        function inAwaitContext() {
+        function inDisallowInContext() {
+            return inContext(65536);
+        }
+        function inDecoratorContext() {
             return inContext(262144);
         }
+        function inAwaitContext() {
+            return inContext(524288);
+        }
         function parseErrorAtCurrentToken(message, arg0) {
             var start = scanner.getTokenPos();
             var length = scanner.getTextPos() - start;
@@ -12684,7 +14010,7 @@ var ts;
             if (!(pos >= 0)) {
                 pos = scanner.getStartPos();
             }
-            return kind >= 140 ? new NodeConstructor(kind, pos, pos) :
+            return kind >= 141 ? new NodeConstructor(kind, pos, pos) :
                 kind === 70 ? new IdentifierConstructor(kind, pos, pos) :
                     new TokenConstructor(kind, pos, pos);
         }
@@ -12704,7 +14030,7 @@ var ts;
             }
             if (parseErrorBeforeNextFinishedNode) {
                 parseErrorBeforeNextFinishedNode = false;
-                node.flags |= 524288;
+                node.flags |= 1048576;
             }
             return node;
         }
@@ -12766,7 +14092,7 @@ var ts;
             return token() === 9 || token() === 8 || ts.tokenIsIdentifierOrKeyword(token());
         }
         function parseComputedPropertyName() {
-            var node = createNode(141);
+            var node = createNode(142);
             parseExpected(20);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21);
@@ -12836,9 +14162,11 @@ var ts;
                 case 6:
                     return token() === 20 || isLiteralPropertyName();
                 case 12:
-                    return token() === 20 || token() === 38 || isLiteralPropertyName();
+                    return token() === 20 || token() === 38 || token() === 23 || isLiteralPropertyName();
+                case 17:
+                    return isLiteralPropertyName();
                 case 9:
-                    return token() === 20 || isLiteralPropertyName();
+                    return token() === 20 || token() === 23 || isLiteralPropertyName();
                 case 7:
                     if (token() === 16) {
                         return lookAhead(isValidHeritageClauseObjectLiteral);
@@ -12853,29 +14181,29 @@ var ts;
                     return isIdentifierOrPattern();
                 case 10:
                     return token() === 25 || token() === 23 || isIdentifierOrPattern();
-                case 17:
+                case 18:
                     return isIdentifier();
                 case 11:
                 case 15:
                     return token() === 25 || token() === 23 || isStartOfExpression();
                 case 16:
                     return isStartOfParameter();
-                case 18:
                 case 19:
-                    return token() === 25 || isStartOfType();
                 case 20:
-                    return isHeritageClause();
+                    return token() === 25 || isStartOfType();
                 case 21:
+                    return isHeritageClause();
+                case 22:
                     return ts.tokenIsIdentifierOrKeyword(token());
                 case 13:
                     return ts.tokenIsIdentifierOrKeyword(token()) || token() === 16;
                 case 14:
                     return true;
-                case 22:
                 case 23:
-                case 25:
-                    return JSDocParser.isJSDocType();
                 case 24:
+                case 26:
+                    return JSDocParser.isJSDocType();
+                case 25:
                     return isSimplePropertyName();
             }
             ts.Debug.fail("Non-exhaustive case in 'isListElement'.");
@@ -12919,7 +14247,7 @@ var ts;
                 case 6:
                 case 12:
                 case 9:
-                case 21:
+                case 22:
                     return token() === 17;
                 case 3:
                     return token() === 17 || token() === 72 || token() === 78;
@@ -12927,31 +14255,32 @@ var ts;
                     return token() === 16 || token() === 84 || token() === 107;
                 case 8:
                     return isVariableDeclaratorListTerminator();
-                case 17:
+                case 18:
                     return token() === 28 || token() === 18 || token() === 16 || token() === 84 || token() === 107;
                 case 11:
                     return token() === 19 || token() === 24;
                 case 15:
-                case 19:
+                case 20:
                 case 10:
                     return token() === 21;
                 case 16:
+                case 17:
                     return token() === 19 || token() === 21;
-                case 18:
+                case 19:
                     return token() !== 25;
-                case 20:
+                case 21:
                     return token() === 16 || token() === 17;
                 case 13:
                     return token() === 28 || token() === 40;
                 case 14:
                     return token() === 26 && lookAhead(nextTokenIsSlash);
-                case 22:
-                    return token() === 19 || token() === 55 || token() === 17;
                 case 23:
-                    return token() === 28 || token() === 17;
-                case 25:
-                    return token() === 21 || token() === 17;
+                    return token() === 19 || token() === 55 || token() === 17;
                 case 24:
+                    return token() === 28 || token() === 17;
+                case 26:
+                    return token() === 21 || token() === 17;
+                case 25:
                     return token() === 17;
             }
         }
@@ -12968,7 +14297,7 @@ var ts;
             return false;
         }
         function isInSomeParsingContext() {
-            for (var kind = 0; kind < 26; kind++) {
+            for (var kind = 0; kind < 27; kind++) {
                 if (parsingContext & (1 << kind)) {
                     if (isListElement(kind, true) || isListTerminator(kind)) {
                         return true;
@@ -13019,7 +14348,7 @@ var ts;
             if (ts.containsParseError(node)) {
                 return undefined;
             }
-            var nodeContextFlags = node.flags & 1540096;
+            var nodeContextFlags = node.flags & 3080192;
             if (nodeContextFlags !== contextFlags) {
                 return undefined;
             }
@@ -13051,10 +14380,12 @@ var ts;
                     return isReusableVariableDeclaration(node);
                 case 16:
                     return isReusableParameter(node);
-                case 20:
                 case 17:
-                case 19:
+                    return false;
+                case 21:
                 case 18:
+                case 20:
+                case 19:
                 case 11:
                 case 12:
                 case 7:
@@ -13066,14 +14397,14 @@ var ts;
         function isReusableClassMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 149:
-                    case 154:
                     case 150:
+                    case 155:
                     case 151:
-                    case 146:
-                    case 199:
+                    case 152:
+                    case 147:
+                    case 203:
                         return true;
-                    case 148:
+                    case 149:
                         var methodDeclaration = node;
                         var nameIsConstructor = methodDeclaration.name.kind === 70 &&
                             methodDeclaration.name.originalKeywordKind === 122;
@@ -13085,8 +14416,8 @@ var ts;
         function isReusableSwitchClause(node) {
             if (node) {
                 switch (node.kind) {
-                    case 249:
-                    case 250:
+                    case 253:
+                    case 254:
                         return true;
                 }
             }
@@ -13095,65 +14426,65 @@ var ts;
         function isReusableStatement(node) {
             if (node) {
                 switch (node.kind) {
-                    case 221:
-                    case 201:
-                    case 200:
+                    case 225:
+                    case 205:
                     case 204:
-                    case 203:
+                    case 208:
+                    case 207:
+                    case 220:
                     case 216:
-                    case 212:
+                    case 218:
+                    case 215:
                     case 214:
+                    case 212:
+                    case 213:
                     case 211:
                     case 210:
-                    case 208:
-                    case 209:
-                    case 207:
-                    case 206:
-                    case 213:
-                    case 202:
                     case 217:
-                    case 215:
-                    case 205:
-                    case 218:
-                    case 231:
-                    case 230:
-                    case 237:
-                    case 236:
-                    case 226:
+                    case 206:
+                    case 221:
+                    case 219:
+                    case 209:
                     case 222:
-                    case 223:
-                    case 225:
-                    case 224:
+                    case 235:
+                    case 234:
+                    case 241:
+                    case 240:
+                    case 230:
+                    case 226:
+                    case 227:
+                    case 229:
+                    case 228:
                         return true;
                 }
             }
             return false;
         }
         function isReusableEnumMember(node) {
-            return node.kind === 255;
+            return node.kind === 260;
         }
         function isReusableTypeMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 153:
-                    case 147:
                     case 154:
-                    case 145:
-                    case 152:
+                    case 148:
+                    case 155:
+                    case 146:
+                    case 153:
                         return true;
                 }
             }
             return false;
         }
         function isReusableVariableDeclaration(node) {
-            if (node.kind !== 219) {
+            if (node.kind !== 223) {
                 return false;
             }
             var variableDeclarator = node;
             return variableDeclarator.initializer === undefined;
         }
         function isReusableParameter(node) {
-            if (node.kind !== 143) {
+            if (node.kind !== 144) {
                 return false;
             }
             var parameter = node;
@@ -13173,6 +14504,7 @@ var ts;
                 case 1: return ts.Diagnostics.Declaration_or_statement_expected;
                 case 2: return ts.Diagnostics.case_or_default_expected;
                 case 3: return ts.Diagnostics.Statement_expected;
+                case 17:
                 case 4: return ts.Diagnostics.Property_or_signature_expected;
                 case 5: return ts.Diagnostics.Unexpected_token_A_constructor_method_accessor_or_property_was_expected;
                 case 6: return ts.Diagnostics.Enum_member_expected;
@@ -13184,17 +14516,17 @@ var ts;
                 case 12: return ts.Diagnostics.Property_assignment_expected;
                 case 15: return ts.Diagnostics.Expression_or_comma_expected;
                 case 16: return ts.Diagnostics.Parameter_declaration_expected;
-                case 17: return ts.Diagnostics.Type_parameter_declaration_expected;
-                case 18: return ts.Diagnostics.Type_argument_expected;
-                case 19: return ts.Diagnostics.Type_expected;
-                case 20: return ts.Diagnostics.Unexpected_token_expected;
-                case 21: return ts.Diagnostics.Identifier_expected;
+                case 18: return ts.Diagnostics.Type_parameter_declaration_expected;
+                case 19: return ts.Diagnostics.Type_argument_expected;
+                case 20: return ts.Diagnostics.Type_expected;
+                case 21: return ts.Diagnostics.Unexpected_token_expected;
+                case 22: return ts.Diagnostics.Identifier_expected;
                 case 13: return ts.Diagnostics.Identifier_expected;
                 case 14: return ts.Diagnostics.Identifier_expected;
-                case 22: return ts.Diagnostics.Parameter_declaration_expected;
-                case 23: return ts.Diagnostics.Type_argument_expected;
-                case 25: return ts.Diagnostics.Type_expected;
-                case 24: return ts.Diagnostics.Property_assignment_expected;
+                case 23: return ts.Diagnostics.Parameter_declaration_expected;
+                case 24: return ts.Diagnostics.Type_argument_expected;
+                case 26: return ts.Diagnostics.Type_expected;
+                case 25: return ts.Diagnostics.Property_assignment_expected;
             }
         }
         ;
@@ -13248,7 +14580,7 @@ var ts;
         function parseEntityName(allowReservedWords, diagnosticMessage) {
             var entity = parseIdentifier(diagnosticMessage);
             while (parseOptional(22)) {
-                var node = createNode(140, entity.pos);
+                var node = createNode(141, entity.pos);
                 node.left = entity;
                 node.right = parseRightSideOfDot(allowReservedWords);
                 entity = finishNode(node);
@@ -13265,7 +14597,7 @@ var ts;
             return allowIdentifierNames ? parseIdentifierName() : parseIdentifier();
         }
         function parseTemplateExpression() {
-            var template = createNode(190);
+            var template = createNode(194);
             template.head = parseTemplateHead();
             ts.Debug.assert(template.head.kind === 13, "Template head has wrong token kind");
             var templateSpans = createNodeArray();
@@ -13277,7 +14609,7 @@ var ts;
             return finishNode(template);
         }
         function parseTemplateSpan() {
-            var span = createNode(198);
+            var span = createNode(202);
             span.expression = allowInAnd(parseExpression);
             var literal;
             if (token() === 17) {
@@ -13325,33 +14657,33 @@ var ts;
         }
         function parseTypeReference() {
             var typeName = parseEntityName(false, ts.Diagnostics.Type_expected);
-            var node = createNode(156, typeName.pos);
+            var node = createNode(157, typeName.pos);
             node.typeName = typeName;
             if (!scanner.hasPrecedingLineBreak() && token() === 26) {
-                node.typeArguments = parseBracketedList(18, parseType, 26, 28);
+                node.typeArguments = parseBracketedList(19, parseType, 26, 28);
             }
             return finishNode(node);
         }
         function parseThisTypePredicate(lhs) {
             nextToken();
-            var node = createNode(155, lhs.pos);
+            var node = createNode(156, lhs.pos);
             node.parameterName = lhs;
             node.type = parseType();
             return finishNode(node);
         }
         function parseThisTypeNode() {
-            var node = createNode(166);
+            var node = createNode(167);
             nextToken();
             return finishNode(node);
         }
         function parseTypeQuery() {
-            var node = createNode(159);
+            var node = createNode(160);
             parseExpected(102);
             node.exprName = parseEntityName(true);
             return finishNode(node);
         }
         function parseTypeParameter() {
-            var node = createNode(142);
+            var node = createNode(143);
             node.name = parseIdentifier();
             if (parseOptional(84)) {
                 if (isStartOfType() || !isStartOfExpression()) {
@@ -13365,7 +14697,7 @@ var ts;
         }
         function parseTypeParameters() {
             if (token() === 26) {
-                return parseBracketedList(17, parseTypeParameter, 26, 28);
+                return parseBracketedList(18, parseTypeParameter, 26, 28);
             }
         }
         function parseParameterType() {
@@ -13378,7 +14710,7 @@ var ts;
             return token() === 23 || isIdentifierOrPattern() || ts.isModifierKind(token()) || token() === 56 || token() === 98;
         }
         function parseParameter() {
-            var node = createNode(143);
+            var node = createNode(144);
             if (token() === 98) {
                 node.name = createIdentifier(true, undefined);
                 node.type = parseParameterType();
@@ -13438,7 +14770,7 @@ var ts;
         }
         function parseSignatureMember(kind) {
             var node = createNode(kind);
-            if (kind === 153) {
+            if (kind === 154) {
                 parseExpected(93);
             }
             fillSignature(55, false, false, false, node);
@@ -13478,7 +14810,7 @@ var ts;
             return token() === 55 || token() === 25 || token() === 21;
         }
         function parseIndexSignatureDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(154, fullStart);
+            var node = createNode(155, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             node.parameters = parseBracketedList(16, parseParameter, 20, 21);
@@ -13490,7 +14822,7 @@ var ts;
             var name = parsePropertyName();
             var questionToken = parseOptionalToken(54);
             if (token() === 18 || token() === 26) {
-                var method = createNode(147, fullStart);
+                var method = createNode(148, fullStart);
                 method.modifiers = modifiers;
                 method.name = name;
                 method.questionToken = questionToken;
@@ -13499,7 +14831,7 @@ var ts;
                 return addJSDocComment(finishNode(method));
             }
             else {
-                var property = createNode(145, fullStart);
+                var property = createNode(146, fullStart);
                 property.modifiers = modifiers;
                 property.name = name;
                 property.questionToken = questionToken;
@@ -13539,10 +14871,10 @@ var ts;
         }
         function parseTypeMember() {
             if (token() === 18 || token() === 26) {
-                return parseSignatureMember(152);
+                return parseSignatureMember(153);
             }
             if (token() === 93 && lookAhead(isStartOfConstructSignature)) {
-                return parseSignatureMember(153);
+                return parseSignatureMember(154);
             }
             var fullStart = getNodePos();
             var modifiers = parseModifiers();
@@ -13556,7 +14888,7 @@ var ts;
             return token() === 18 || token() === 26;
         }
         function parseTypeLiteral() {
-            var node = createNode(160);
+            var node = createNode(161);
             node.members = parseObjectTypeMembers();
             return finishNode(node);
         }
@@ -13571,13 +14903,40 @@ var ts;
             }
             return members;
         }
+        function isStartOfMappedType() {
+            nextToken();
+            if (token() === 130) {
+                nextToken();
+            }
+            return token() === 20 && nextTokenIsIdentifier() && nextToken() === 91;
+        }
+        function parseMappedTypeParameter() {
+            var node = createNode(143);
+            node.name = parseIdentifier();
+            parseExpected(91);
+            node.constraint = parseType();
+            return finishNode(node);
+        }
+        function parseMappedType() {
+            var node = createNode(170);
+            parseExpected(16);
+            node.readonlyToken = parseOptionalToken(130);
+            parseExpected(20);
+            node.typeParameter = parseMappedTypeParameter();
+            parseExpected(21);
+            node.questionToken = parseOptionalToken(54);
+            node.type = parseTypeAnnotation();
+            parseSemicolon();
+            parseExpected(17);
+            return finishNode(node);
+        }
         function parseTupleType() {
-            var node = createNode(162);
-            node.elementTypes = parseBracketedList(19, parseType, 20, 21);
+            var node = createNode(163);
+            node.elementTypes = parseBracketedList(20, parseType, 20, 21);
             return finishNode(node);
         }
         function parseParenthesizedType() {
-            var node = createNode(165);
+            var node = createNode(166);
             parseExpected(18);
             node.type = parseType();
             parseExpected(19);
@@ -13585,7 +14944,7 @@ var ts;
         }
         function parseFunctionOrConstructorType(kind) {
             var node = createNode(kind);
-            if (kind === 158) {
+            if (kind === 159) {
                 parseExpected(93);
             }
             fillSignature(35, false, false, false, node);
@@ -13596,7 +14955,7 @@ var ts;
             return token() === 22 ? undefined : node;
         }
         function parseLiteralTypeNode() {
-            var node = createNode(167);
+            var node = createNode(171);
             node.literal = parseSimpleUnaryExpression();
             finishNode(node);
             return node;
@@ -13607,12 +14966,12 @@ var ts;
         function parseNonArrayType() {
             switch (token()) {
                 case 118:
-                case 133:
-                case 131:
-                case 121:
                 case 134:
-                case 136:
-                case 128:
+                case 132:
+                case 121:
+                case 135:
+                case 137:
+                case 129:
                     var node = tryParse(parseKeywordAndNoDot);
                     return node || parseTypeReference();
                 case 9:
@@ -13637,7 +14996,7 @@ var ts;
                 case 102:
                     return parseTypeQuery();
                 case 16:
-                    return parseTypeLiteral();
+                    return lookAhead(isStartOfMappedType) ? parseMappedType() : parseTypeLiteral();
                 case 20:
                     return parseTupleType();
                 case 18:
@@ -13649,16 +15008,16 @@ var ts;
         function isStartOfType() {
             switch (token()) {
                 case 118:
-                case 133:
-                case 131:
-                case 121:
                 case 134:
+                case 132:
+                case 121:
+                case 135:
                 case 104:
-                case 136:
+                case 137:
                 case 94:
                 case 98:
                 case 102:
-                case 128:
+                case 129:
                 case 16:
                 case 20:
                 case 26:
@@ -13683,13 +15042,36 @@ var ts;
         function parseArrayTypeOrHigher() {
             var type = parseNonArrayType();
             while (!scanner.hasPrecedingLineBreak() && parseOptional(20)) {
-                parseExpected(21);
-                var node = createNode(161, type.pos);
-                node.elementType = type;
-                type = finishNode(node);
+                if (isStartOfType()) {
+                    var node = createNode(169, type.pos);
+                    node.objectType = type;
+                    node.indexType = parseType();
+                    parseExpected(21);
+                    type = finishNode(node);
+                }
+                else {
+                    var node = createNode(162, type.pos);
+                    node.elementType = type;
+                    parseExpected(21);
+                    type = finishNode(node);
+                }
             }
             return type;
         }
+        function parseTypeOperator(operator) {
+            var node = createNode(168);
+            parseExpected(operator);
+            node.operator = operator;
+            node.type = parseTypeOperatorOrHigher();
+            return finishNode(node);
+        }
+        function parseTypeOperatorOrHigher() {
+            switch (token()) {
+                case 126:
+                    return parseTypeOperator(126);
+            }
+            return parseArrayTypeOrHigher();
+        }
         function parseUnionOrIntersectionType(kind, parseConstituentType, operator) {
             var type = parseConstituentType();
             if (token() === operator) {
@@ -13705,10 +15087,10 @@ var ts;
             return type;
         }
         function parseIntersectionTypeOrHigher() {
-            return parseUnionOrIntersectionType(164, parseArrayTypeOrHigher, 47);
+            return parseUnionOrIntersectionType(165, parseTypeOperatorOrHigher, 47);
         }
         function parseUnionTypeOrHigher() {
-            return parseUnionOrIntersectionType(163, parseIntersectionTypeOrHigher, 48);
+            return parseUnionOrIntersectionType(164, parseIntersectionTypeOrHigher, 48);
         }
         function isStartOfFunctionType() {
             if (token() === 26) {
@@ -13754,7 +15136,7 @@ var ts;
             var typePredicateVariable = isIdentifier() && tryParse(parseTypePredicatePrefix);
             var type = parseType();
             if (typePredicateVariable) {
-                var node = createNode(155, typePredicateVariable.pos);
+                var node = createNode(156, typePredicateVariable.pos);
                 node.parameterName = typePredicateVariable;
                 node.type = type;
                 return finishNode(node);
@@ -13771,14 +15153,14 @@ var ts;
             }
         }
         function parseType() {
-            return doOutsideOfContext(327680, parseTypeWorker);
+            return doOutsideOfContext(655360, parseTypeWorker);
         }
         function parseTypeWorker() {
             if (isStartOfFunctionType()) {
-                return parseFunctionOrConstructorType(157);
+                return parseFunctionOrConstructorType(158);
             }
             if (token() === 93) {
-                return parseFunctionOrConstructorType(158);
+                return parseFunctionOrConstructorType(159);
             }
             return parseUnionTypeOrHigher();
         }
@@ -13897,7 +15279,7 @@ var ts;
             return !scanner.hasPrecedingLineBreak() && isIdentifier();
         }
         function parseYieldExpression() {
-            var node = createNode(191);
+            var node = createNode(195);
             nextToken();
             if (!scanner.hasPrecedingLineBreak() &&
                 (token() === 38 || isStartOfExpression())) {
@@ -13913,13 +15295,13 @@ var ts;
             ts.Debug.assert(token() === 35, "parseSimpleArrowFunctionExpression should only have been called if we had a =>");
             var node;
             if (asyncModifier) {
-                node = createNode(181, asyncModifier.pos);
+                node = createNode(185, asyncModifier.pos);
                 node.modifiers = asyncModifier;
             }
             else {
-                node = createNode(181, identifier.pos);
+                node = createNode(185, identifier.pos);
             }
-            var parameter = createNode(143, identifier.pos);
+            var parameter = createNode(144, identifier.pos);
             parameter.name = identifier;
             finishNode(parameter);
             node.parameters = createNodeArray([parameter], parameter.pos);
@@ -14053,7 +15435,7 @@ var ts;
             return 0;
         }
         function parseParenthesizedArrowFunctionExpressionHead(allowAmbiguity) {
-            var node = createNode(181);
+            var node = createNode(185);
             node.modifiers = parseModifiersForArrowFunction();
             var isAsync = !!(ts.getModifierFlags(node) & 256);
             fillSignature(55, false, isAsync, !allowAmbiguity, node);
@@ -14085,7 +15467,7 @@ var ts;
             if (!questionToken) {
                 return leftOperand;
             }
-            var node = createNode(189, leftOperand.pos);
+            var node = createNode(193, leftOperand.pos);
             node.condition = leftOperand;
             node.questionToken = questionToken;
             node.whenTrue = doOutsideOfContext(disallowInAndDecoratorContext, parseAssignmentExpressionOrHigher);
@@ -14098,7 +15480,7 @@ var ts;
             return parseBinaryExpressionRest(precedence, leftOperand);
         }
         function isInOrOfKeyword(t) {
-            return t === 91 || t === 139;
+            return t === 91 || t === 140;
         }
         function parseBinaryExpressionRest(precedence, leftOperand) {
             while (true) {
@@ -14176,39 +15558,39 @@ var ts;
             return -1;
         }
         function makeBinaryExpression(left, operatorToken, right) {
-            var node = createNode(188, left.pos);
+            var node = createNode(192, left.pos);
             node.left = left;
             node.operatorToken = operatorToken;
             node.right = right;
             return finishNode(node);
         }
         function makeAsExpression(left, right) {
-            var node = createNode(196, left.pos);
+            var node = createNode(200, left.pos);
             node.expression = left;
             node.type = right;
             return finishNode(node);
         }
         function parsePrefixUnaryExpression() {
-            var node = createNode(186);
+            var node = createNode(190);
             node.operator = token();
             nextToken();
             node.operand = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseDeleteExpression() {
-            var node = createNode(182);
+            var node = createNode(186);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseTypeOfExpression() {
-            var node = createNode(183);
+            var node = createNode(187);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseVoidExpression() {
-            var node = createNode(184);
+            var node = createNode(188);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
@@ -14223,7 +15605,7 @@ var ts;
             return false;
         }
         function parseAwaitExpression() {
-            var node = createNode(185);
+            var node = createNode(189);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
@@ -14239,7 +15621,7 @@ var ts;
             var simpleUnaryExpression = parseSimpleUnaryExpression();
             if (token() === 39) {
                 var start = ts.skipTrivia(sourceText, simpleUnaryExpression.pos);
-                if (simpleUnaryExpression.kind === 178) {
+                if (simpleUnaryExpression.kind === 182) {
                     parseErrorAtPosition(start, simpleUnaryExpression.end - start, 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 {
@@ -14292,7 +15674,7 @@ var ts;
         }
         function parseIncrementExpression() {
             if (token() === 42 || token() === 43) {
-                var node = createNode(186);
+                var node = createNode(190);
                 node.operator = token();
                 nextToken();
                 node.operand = parseLeftHandSideExpressionOrHigher();
@@ -14304,7 +15686,7 @@ var ts;
             var expression = parseLeftHandSideExpressionOrHigher();
             ts.Debug.assert(ts.isLeftHandSideExpression(expression));
             if ((token() === 42 || token() === 43) && !scanner.hasPrecedingLineBreak()) {
-                var node = createNode(187, expression.pos);
+                var node = createNode(191, expression.pos);
                 node.operand = expression;
                 node.operator = token();
                 nextToken();
@@ -14327,7 +15709,7 @@ var ts;
             if (token() === 18 || token() === 22 || token() === 20) {
                 return expression;
             }
-            var node = createNode(173, expression.pos);
+            var node = createNode(177, expression.pos);
             node.expression = expression;
             parseExpectedToken(22, false, ts.Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access);
             node.name = parseRightSideOfDot(true);
@@ -14349,8 +15731,8 @@ var ts;
         function parseJsxElementOrSelfClosingElement(inExpressionContext) {
             var opening = parseJsxOpeningOrSelfClosingElement(inExpressionContext);
             var result;
-            if (opening.kind === 244) {
-                var node = createNode(242, opening.pos);
+            if (opening.kind === 248) {
+                var node = createNode(246, opening.pos);
                 node.openingElement = opening;
                 node.children = parseJsxChildren(node.openingElement.tagName);
                 node.closingElement = parseJsxClosingElement(inExpressionContext);
@@ -14360,14 +15742,14 @@ var ts;
                 result = finishNode(node);
             }
             else {
-                ts.Debug.assert(opening.kind === 243);
+                ts.Debug.assert(opening.kind === 247);
                 result = opening;
             }
             if (inExpressionContext && token() === 26) {
                 var invalidElement = tryParse(function () { return parseJsxElementOrSelfClosingElement(true); });
                 if (invalidElement) {
                     parseErrorAtCurrentToken(ts.Diagnostics.JSX_expressions_must_have_one_parent_element);
-                    var badNode = createNode(188, result.pos);
+                    var badNode = createNode(192, result.pos);
                     badNode.end = invalidElement.end;
                     badNode.left = result;
                     badNode.right = invalidElement;
@@ -14420,7 +15802,7 @@ var ts;
             var attributes = parseList(13, parseJsxAttribute);
             var node;
             if (token() === 28) {
-                node = createNode(244, fullStart);
+                node = createNode(248, fullStart);
                 scanJsxText();
             }
             else {
@@ -14432,7 +15814,7 @@ var ts;
                     parseExpected(28, undefined, false);
                     scanJsxText();
                 }
-                node = createNode(243, fullStart);
+                node = createNode(247, fullStart);
             }
             node.tagName = tagName;
             node.attributes = attributes;
@@ -14443,7 +15825,7 @@ var ts;
             var expression = token() === 98 ?
                 parseTokenNode() : parseIdentifierName();
             while (parseOptional(22)) {
-                var propertyAccess = createNode(173, expression.pos);
+                var propertyAccess = createNode(177, expression.pos);
                 propertyAccess.expression = expression;
                 propertyAccess.name = parseRightSideOfDot(true);
                 expression = finishNode(propertyAccess);
@@ -14451,7 +15833,7 @@ var ts;
             return expression;
         }
         function parseJsxExpression(inExpressionContext) {
-            var node = createNode(248);
+            var node = createNode(252);
             parseExpected(16);
             if (token() !== 17) {
                 node.expression = parseAssignmentExpressionOrHigher();
@@ -14470,7 +15852,7 @@ var ts;
                 return parseJsxSpreadAttribute();
             }
             scanJsxIdentifier();
-            var node = createNode(246);
+            var node = createNode(250);
             node.name = parseIdentifierName();
             if (token() === 57) {
                 switch (scanJsxAttributeValue()) {
@@ -14485,7 +15867,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxSpreadAttribute() {
-            var node = createNode(247);
+            var node = createNode(251);
             parseExpected(16);
             parseExpected(23);
             node.expression = parseExpression();
@@ -14493,7 +15875,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxClosingElement(inExpressionContext) {
-            var node = createNode(245);
+            var node = createNode(249);
             parseExpected(27);
             node.tagName = parseJsxElementName();
             if (inExpressionContext) {
@@ -14506,7 +15888,7 @@ var ts;
             return finishNode(node);
         }
         function parseTypeAssertion() {
-            var node = createNode(178);
+            var node = createNode(182);
             parseExpected(26);
             node.type = parseType();
             parseExpected(28);
@@ -14517,7 +15899,7 @@ var ts;
             while (true) {
                 var dotToken = parseOptionalToken(22);
                 if (dotToken) {
-                    var propertyAccess = createNode(173, expression.pos);
+                    var propertyAccess = createNode(177, expression.pos);
                     propertyAccess.expression = expression;
                     propertyAccess.name = parseRightSideOfDot(true);
                     expression = finishNode(propertyAccess);
@@ -14525,13 +15907,13 @@ var ts;
                 }
                 if (token() === 50 && !scanner.hasPrecedingLineBreak()) {
                     nextToken();
-                    var nonNullExpression = createNode(197, expression.pos);
+                    var nonNullExpression = createNode(201, expression.pos);
                     nonNullExpression.expression = expression;
                     expression = finishNode(nonNullExpression);
                     continue;
                 }
                 if (!inDecoratorContext() && parseOptional(20)) {
-                    var indexedAccess = createNode(174, expression.pos);
+                    var indexedAccess = createNode(178, expression.pos);
                     indexedAccess.expression = expression;
                     if (token() !== 21) {
                         indexedAccess.argumentExpression = allowInAnd(parseExpression);
@@ -14545,7 +15927,7 @@ var ts;
                     continue;
                 }
                 if (token() === 12 || token() === 13) {
-                    var tagExpression = createNode(177, expression.pos);
+                    var tagExpression = createNode(181, expression.pos);
                     tagExpression.tag = expression;
                     tagExpression.template = token() === 12
                         ? parseLiteralNode()
@@ -14564,7 +15946,7 @@ var ts;
                     if (!typeArguments) {
                         return expression;
                     }
-                    var callExpr = createNode(175, expression.pos);
+                    var callExpr = createNode(179, expression.pos);
                     callExpr.expression = expression;
                     callExpr.typeArguments = typeArguments;
                     callExpr.arguments = parseArgumentList();
@@ -14572,7 +15954,7 @@ var ts;
                     continue;
                 }
                 else if (token() === 18) {
-                    var callExpr = createNode(175, expression.pos);
+                    var callExpr = createNode(179, expression.pos);
                     callExpr.expression = expression;
                     callExpr.arguments = parseArgumentList();
                     expression = finishNode(callExpr);
@@ -14591,7 +15973,7 @@ var ts;
             if (!parseOptional(26)) {
                 return undefined;
             }
-            var typeArguments = parseDelimitedList(18, parseType);
+            var typeArguments = parseDelimitedList(19, parseType);
             if (!parseExpected(28)) {
                 return undefined;
             }
@@ -14667,28 +16049,28 @@ var ts;
             return parseIdentifier(ts.Diagnostics.Expression_expected);
         }
         function parseParenthesizedExpression() {
-            var node = createNode(179);
+            var node = createNode(183);
             parseExpected(18);
             node.expression = allowInAnd(parseExpression);
             parseExpected(19);
             return finishNode(node);
         }
         function parseSpreadElement() {
-            var node = createNode(192);
+            var node = createNode(196);
             parseExpected(23);
             node.expression = parseAssignmentExpressionOrHigher();
             return finishNode(node);
         }
         function parseArgumentOrArrayLiteralElement() {
             return token() === 23 ? parseSpreadElement() :
-                token() === 25 ? createNode(194) :
+                token() === 25 ? createNode(198) :
                     parseAssignmentExpressionOrHigher();
         }
         function parseArgumentExpression() {
             return doOutsideOfContext(disallowInAndDecoratorContext, parseArgumentOrArrayLiteralElement);
         }
         function parseArrayLiteralExpression() {
-            var node = createNode(171);
+            var node = createNode(175);
             parseExpected(20);
             if (scanner.hasPrecedingLineBreak()) {
                 node.multiLine = true;
@@ -14699,15 +16081,21 @@ var ts;
         }
         function tryParseAccessorDeclaration(fullStart, decorators, modifiers) {
             if (parseContextualModifier(124)) {
-                return parseAccessorDeclaration(150, fullStart, decorators, modifiers);
-            }
-            else if (parseContextualModifier(132)) {
                 return parseAccessorDeclaration(151, fullStart, decorators, modifiers);
             }
+            else if (parseContextualModifier(133)) {
+                return parseAccessorDeclaration(152, fullStart, decorators, modifiers);
+            }
             return undefined;
         }
         function parseObjectLiteralElement() {
             var fullStart = scanner.getStartPos();
+            var dotDotDotToken = parseOptionalToken(23);
+            if (dotDotDotToken) {
+                var spreadElement = createNode(259, fullStart);
+                spreadElement.expression = parseAssignmentExpressionOrHigher();
+                return addJSDocComment(finishNode(spreadElement));
+            }
             var decorators = parseDecorators();
             var modifiers = parseModifiers();
             var accessor = tryParseAccessorDeclaration(fullStart, decorators, modifiers);
@@ -14723,7 +16111,7 @@ var ts;
             }
             var isShorthandPropertyAssignment = tokenIsIdentifier && (token() === 25 || token() === 17 || token() === 57);
             if (isShorthandPropertyAssignment) {
-                var shorthandDeclaration = createNode(254, fullStart);
+                var shorthandDeclaration = createNode(258, fullStart);
                 shorthandDeclaration.name = propertyName;
                 shorthandDeclaration.questionToken = questionToken;
                 var equalsToken = parseOptionalToken(57);
@@ -14734,7 +16122,7 @@ var ts;
                 return addJSDocComment(finishNode(shorthandDeclaration));
             }
             else {
-                var propertyAssignment = createNode(253, fullStart);
+                var propertyAssignment = createNode(257, fullStart);
                 propertyAssignment.modifiers = modifiers;
                 propertyAssignment.name = propertyName;
                 propertyAssignment.questionToken = questionToken;
@@ -14744,7 +16132,7 @@ var ts;
             }
         }
         function parseObjectLiteralExpression() {
-            var node = createNode(172);
+            var node = createNode(176);
             parseExpected(16);
             if (scanner.hasPrecedingLineBreak()) {
                 node.multiLine = true;
@@ -14758,7 +16146,7 @@ var ts;
             if (saveDecoratorContext) {
                 setDecoratorContext(false);
             }
-            var node = createNode(180);
+            var node = createNode(184);
             node.modifiers = parseModifiers();
             parseExpected(88);
             node.asteriskToken = parseOptionalToken(38);
@@ -14780,7 +16168,7 @@ var ts;
             return isIdentifier() ? parseIdentifier() : undefined;
         }
         function parseNewExpression() {
-            var node = createNode(176);
+            var node = createNode(180);
             parseExpected(93);
             node.expression = parseMemberExpressionOrHigher();
             node.typeArguments = tryParse(parseTypeArgumentsInExpression);
@@ -14790,7 +16178,7 @@ var ts;
             return finishNode(node);
         }
         function parseBlock(ignoreMissingOpenBrace, diagnosticMessage) {
-            var node = createNode(200);
+            var node = createNode(204);
             if (parseExpected(16, diagnosticMessage) || ignoreMissingOpenBrace) {
                 if (scanner.hasPrecedingLineBreak()) {
                     node.multiLine = true;
@@ -14821,12 +16209,12 @@ var ts;
             return block;
         }
         function parseEmptyStatement() {
-            var node = createNode(202);
+            var node = createNode(206);
             parseExpected(24);
             return finishNode(node);
         }
         function parseIfStatement() {
-            var node = createNode(204);
+            var node = createNode(208);
             parseExpected(89);
             parseExpected(18);
             node.expression = allowInAnd(parseExpression);
@@ -14836,7 +16224,7 @@ var ts;
             return finishNode(node);
         }
         function parseDoStatement() {
-            var node = createNode(205);
+            var node = createNode(209);
             parseExpected(80);
             node.statement = parseStatement();
             parseExpected(105);
@@ -14847,7 +16235,7 @@ var ts;
             return finishNode(node);
         }
         function parseWhileStatement() {
-            var node = createNode(206);
+            var node = createNode(210);
             parseExpected(105);
             parseExpected(18);
             node.expression = allowInAnd(parseExpression);
@@ -14870,21 +16258,21 @@ var ts;
             }
             var forOrForInOrForOfStatement;
             if (parseOptional(91)) {
-                var forInStatement = createNode(208, pos);
+                var forInStatement = createNode(212, pos);
                 forInStatement.initializer = initializer;
                 forInStatement.expression = allowInAnd(parseExpression);
                 parseExpected(19);
                 forOrForInOrForOfStatement = forInStatement;
             }
-            else if (parseOptional(139)) {
-                var forOfStatement = createNode(209, pos);
+            else if (parseOptional(140)) {
+                var forOfStatement = createNode(213, pos);
                 forOfStatement.initializer = initializer;
                 forOfStatement.expression = allowInAnd(parseAssignmentExpressionOrHigher);
                 parseExpected(19);
                 forOrForInOrForOfStatement = forOfStatement;
             }
             else {
-                var forStatement = createNode(207, pos);
+                var forStatement = createNode(211, pos);
                 forStatement.initializer = initializer;
                 parseExpected(24);
                 if (token() !== 24 && token() !== 19) {
@@ -14902,7 +16290,7 @@ var ts;
         }
         function parseBreakOrContinueStatement(kind) {
             var node = createNode(kind);
-            parseExpected(kind === 211 ? 71 : 76);
+            parseExpected(kind === 215 ? 71 : 76);
             if (!canParseSemicolon()) {
                 node.label = parseIdentifier();
             }
@@ -14910,7 +16298,7 @@ var ts;
             return finishNode(node);
         }
         function parseReturnStatement() {
-            var node = createNode(212);
+            var node = createNode(216);
             parseExpected(95);
             if (!canParseSemicolon()) {
                 node.expression = allowInAnd(parseExpression);
@@ -14919,7 +16307,7 @@ var ts;
             return finishNode(node);
         }
         function parseWithStatement() {
-            var node = createNode(213);
+            var node = createNode(217);
             parseExpected(106);
             parseExpected(18);
             node.expression = allowInAnd(parseExpression);
@@ -14928,7 +16316,7 @@ var ts;
             return finishNode(node);
         }
         function parseCaseClause() {
-            var node = createNode(249);
+            var node = createNode(253);
             parseExpected(72);
             node.expression = allowInAnd(parseExpression);
             parseExpected(55);
@@ -14936,7 +16324,7 @@ var ts;
             return finishNode(node);
         }
         function parseDefaultClause() {
-            var node = createNode(250);
+            var node = createNode(254);
             parseExpected(78);
             parseExpected(55);
             node.statements = parseList(3, parseStatement);
@@ -14946,12 +16334,12 @@ var ts;
             return token() === 72 ? parseCaseClause() : parseDefaultClause();
         }
         function parseSwitchStatement() {
-            var node = createNode(214);
+            var node = createNode(218);
             parseExpected(97);
             parseExpected(18);
             node.expression = allowInAnd(parseExpression);
             parseExpected(19);
-            var caseBlock = createNode(228, scanner.getStartPos());
+            var caseBlock = createNode(232, scanner.getStartPos());
             parseExpected(16);
             caseBlock.clauses = parseList(2, parseCaseOrDefaultClause);
             parseExpected(17);
@@ -14959,14 +16347,14 @@ var ts;
             return finishNode(node);
         }
         function parseThrowStatement() {
-            var node = createNode(216);
+            var node = createNode(220);
             parseExpected(99);
             node.expression = scanner.hasPrecedingLineBreak() ? undefined : allowInAnd(parseExpression);
             parseSemicolon();
             return finishNode(node);
         }
         function parseTryStatement() {
-            var node = createNode(217);
+            var node = createNode(221);
             parseExpected(101);
             node.tryBlock = parseBlock(false);
             node.catchClause = token() === 73 ? parseCatchClause() : undefined;
@@ -14977,7 +16365,7 @@ var ts;
             return finishNode(node);
         }
         function parseCatchClause() {
-            var result = createNode(252);
+            var result = createNode(256);
             parseExpected(73);
             if (parseExpected(18)) {
                 result.variableDeclaration = parseVariableDeclaration();
@@ -14987,7 +16375,7 @@ var ts;
             return finishNode(result);
         }
         function parseDebuggerStatement() {
-            var node = createNode(218);
+            var node = createNode(222);
             parseExpected(77);
             parseSemicolon();
             return finishNode(node);
@@ -14996,13 +16384,13 @@ var ts;
             var fullStart = scanner.getStartPos();
             var expression = allowInAnd(parseExpression);
             if (expression.kind === 70 && parseOptional(55)) {
-                var labeledStatement = createNode(215, fullStart);
+                var labeledStatement = createNode(219, fullStart);
                 labeledStatement.label = expression;
                 labeledStatement.statement = parseStatement();
                 return addJSDocComment(finishNode(labeledStatement));
             }
             else {
-                var expressionStatement = createNode(203, fullStart);
+                var expressionStatement = createNode(207, fullStart);
                 expressionStatement.expression = expression;
                 parseSemicolon();
                 return addJSDocComment(finishNode(expressionStatement));
@@ -15031,10 +16419,10 @@ var ts;
                     case 82:
                         return true;
                     case 108:
-                    case 135:
+                    case 136:
                         return nextTokenIsIdentifierOnSameLine();
-                    case 126:
                     case 127:
+                    case 128:
                         return nextTokenIsIdentifierOrStringLiteralOnSameLine();
                     case 116:
                     case 119:
@@ -15042,13 +16430,13 @@ var ts;
                     case 111:
                     case 112:
                     case 113:
-                    case 129:
+                    case 130:
                         nextToken();
                         if (scanner.hasPrecedingLineBreak()) {
                             return false;
                         }
                         continue;
-                    case 138:
+                    case 139:
                         nextToken();
                         return token() === 16 || token() === 70 || token() === 83;
                     case 90:
@@ -15106,16 +16494,16 @@ var ts;
                 case 119:
                 case 123:
                 case 108:
-                case 126:
                 case 127:
-                case 135:
-                case 138:
+                case 128:
+                case 136:
+                case 139:
                     return true;
                 case 113:
                 case 111:
                 case 112:
                 case 114:
-                case 129:
+                case 130:
                     return isStartOfDeclaration() || !lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine);
                 default:
                     return isStartOfExpression();
@@ -15154,9 +16542,9 @@ var ts;
                 case 87:
                     return parseForOrForInOrForOfStatement();
                 case 76:
-                    return parseBreakOrContinueStatement(210);
+                    return parseBreakOrContinueStatement(214);
                 case 71:
-                    return parseBreakOrContinueStatement(211);
+                    return parseBreakOrContinueStatement(215);
                 case 95:
                     return parseReturnStatement();
                 case 106:
@@ -15175,9 +16563,9 @@ var ts;
                     return parseDeclaration();
                 case 119:
                 case 108:
-                case 135:
-                case 126:
+                case 136:
                 case 127:
+                case 128:
                 case 123:
                 case 75:
                 case 82:
@@ -15188,8 +16576,8 @@ var ts;
                 case 113:
                 case 116:
                 case 114:
-                case 129:
-                case 138:
+                case 130:
+                case 139:
                     if (isStartOfDeclaration()) {
                         return parseDeclaration();
                     }
@@ -15212,13 +16600,13 @@ var ts;
                     return parseClassDeclaration(fullStart, decorators, modifiers);
                 case 108:
                     return parseInterfaceDeclaration(fullStart, decorators, modifiers);
-                case 135:
+                case 136:
                     return parseTypeAliasDeclaration(fullStart, decorators, modifiers);
                 case 82:
                     return parseEnumDeclaration(fullStart, decorators, modifiers);
-                case 138:
-                case 126:
+                case 139:
                 case 127:
+                case 128:
                     return parseModuleDeclaration(fullStart, decorators, modifiers);
                 case 90:
                     return parseImportDeclarationOrImportEqualsDeclaration(fullStart, decorators, modifiers);
@@ -15235,7 +16623,7 @@ var ts;
                     }
                 default:
                     if (decorators || modifiers) {
-                        var node = createMissingNode(240, true, ts.Diagnostics.Declaration_expected);
+                        var node = createMissingNode(244, true, ts.Diagnostics.Declaration_expected);
                         node.pos = fullStart;
                         node.decorators = decorators;
                         node.modifiers = modifiers;
@@ -15256,16 +16644,17 @@ var ts;
         }
         function parseArrayBindingElement() {
             if (token() === 25) {
-                return createNode(194);
+                return createNode(198);
             }
-            var node = createNode(170);
+            var node = createNode(174);
             node.dotDotDotToken = parseOptionalToken(23);
             node.name = parseIdentifierOrPattern();
             node.initializer = parseBindingElementInitializer(false);
             return finishNode(node);
         }
         function parseObjectBindingElement() {
-            var node = createNode(170);
+            var node = createNode(174);
+            node.dotDotDotToken = parseOptionalToken(23);
             var tokenIsIdentifier = isIdentifier();
             var propertyName = parsePropertyName();
             if (tokenIsIdentifier && token() !== 55) {
@@ -15280,14 +16669,14 @@ var ts;
             return finishNode(node);
         }
         function parseObjectBindingPattern() {
-            var node = createNode(168);
+            var node = createNode(172);
             parseExpected(16);
             node.elements = parseDelimitedList(9, parseObjectBindingElement);
             parseExpected(17);
             return finishNode(node);
         }
         function parseArrayBindingPattern() {
-            var node = createNode(169);
+            var node = createNode(173);
             parseExpected(20);
             node.elements = parseDelimitedList(10, parseArrayBindingElement);
             parseExpected(21);
@@ -15306,7 +16695,7 @@ var ts;
             return parseIdentifier();
         }
         function parseVariableDeclaration() {
-            var node = createNode(219);
+            var node = createNode(223);
             node.name = parseIdentifierOrPattern();
             node.type = parseTypeAnnotation();
             if (!isInOrOfKeyword(token())) {
@@ -15315,7 +16704,7 @@ var ts;
             return finishNode(node);
         }
         function parseVariableDeclarationList(inForStatementInitializer) {
-            var node = createNode(220);
+            var node = createNode(224);
             switch (token()) {
                 case 103:
                     break;
@@ -15329,7 +16718,7 @@ var ts;
                     ts.Debug.fail();
             }
             nextToken();
-            if (token() === 139 && lookAhead(canFollowContextualOfKeyword)) {
+            if (token() === 140 && lookAhead(canFollowContextualOfKeyword)) {
                 node.declarations = createMissingList();
             }
             else {
@@ -15344,7 +16733,7 @@ var ts;
             return nextTokenIsIdentifier() && nextToken() === 19;
         }
         function parseVariableStatement(fullStart, decorators, modifiers) {
-            var node = createNode(201, fullStart);
+            var node = createNode(205, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             node.declarationList = parseVariableDeclarationList(false);
@@ -15352,7 +16741,7 @@ var ts;
             return addJSDocComment(finishNode(node));
         }
         function parseFunctionDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(221, fullStart);
+            var node = createNode(225, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             parseExpected(88);
@@ -15365,7 +16754,7 @@ var ts;
             return addJSDocComment(finishNode(node));
         }
         function parseConstructorDeclaration(pos, decorators, modifiers) {
-            var node = createNode(149, pos);
+            var node = createNode(150, pos);
             node.decorators = decorators;
             node.modifiers = modifiers;
             parseExpected(122);
@@ -15374,7 +16763,7 @@ var ts;
             return addJSDocComment(finishNode(node));
         }
         function parseMethodDeclaration(fullStart, decorators, modifiers, asteriskToken, name, questionToken, diagnosticMessage) {
-            var method = createNode(148, fullStart);
+            var method = createNode(149, fullStart);
             method.decorators = decorators;
             method.modifiers = modifiers;
             method.asteriskToken = asteriskToken;
@@ -15387,7 +16776,7 @@ var ts;
             return addJSDocComment(finishNode(method));
         }
         function parsePropertyDeclaration(fullStart, decorators, modifiers, name, questionToken) {
-            var property = createNode(146, fullStart);
+            var property = createNode(147, fullStart);
             property.decorators = decorators;
             property.modifiers = modifiers;
             property.name = name;
@@ -15395,7 +16784,7 @@ var ts;
             property.type = parseTypeAnnotation();
             property.initializer = ts.hasModifier(property, 32)
                 ? allowInAnd(parseNonParameterInitializer)
-                : doOutsideOfContext(65536 | 32768, parseNonParameterInitializer);
+                : doOutsideOfContext(131072 | 65536, parseNonParameterInitializer);
             parseSemicolon();
             return addJSDocComment(finishNode(property));
         }
@@ -15428,7 +16817,7 @@ var ts;
                 case 111:
                 case 112:
                 case 114:
-                case 129:
+                case 130:
                     return true;
                 default:
                     return false;
@@ -15457,7 +16846,7 @@ var ts;
                 return true;
             }
             if (idToken !== undefined) {
-                if (!ts.isKeyword(idToken) || idToken === 132 || idToken === 124) {
+                if (!ts.isKeyword(idToken) || idToken === 133 || idToken === 124) {
                     return true;
                 }
                 switch (token()) {
@@ -15480,7 +16869,7 @@ var ts;
                 if (!parseOptional(56)) {
                     break;
                 }
-                var decorator = createNode(144, decoratorStart);
+                var decorator = createNode(145, decoratorStart);
                 decorator.expression = doInDecoratorContext(parseLeftHandSideExpressionOrHigher);
                 finishNode(decorator);
                 if (!decorators) {
@@ -15537,7 +16926,7 @@ var ts;
         }
         function parseClassElement() {
             if (token() === 24) {
-                var result = createNode(199);
+                var result = createNode(203);
                 nextToken();
                 return finishNode(result);
             }
@@ -15562,16 +16951,16 @@ var ts;
                 return parsePropertyOrMethodDeclaration(fullStart, decorators, modifiers);
             }
             if (decorators || modifiers) {
-                var name_10 = createMissingNode(70, true, ts.Diagnostics.Declaration_expected);
-                return parsePropertyDeclaration(fullStart, decorators, modifiers, name_10, undefined);
+                var name_16 = createMissingNode(70, true, ts.Diagnostics.Declaration_expected);
+                return parsePropertyDeclaration(fullStart, decorators, modifiers, name_16, undefined);
             }
             ts.Debug.fail("Should not have attempted to parse class member declaration.");
         }
         function parseClassExpression() {
-            return parseClassDeclarationOrExpression(scanner.getStartPos(), undefined, undefined, 193);
+            return parseClassDeclarationOrExpression(scanner.getStartPos(), undefined, undefined, 197);
         }
         function parseClassDeclaration(fullStart, decorators, modifiers) {
-            return parseClassDeclarationOrExpression(fullStart, decorators, modifiers, 222);
+            return parseClassDeclarationOrExpression(fullStart, decorators, modifiers, 226);
         }
         function parseClassDeclarationOrExpression(fullStart, decorators, modifiers, kind) {
             var node = createNode(kind, fullStart);
@@ -15600,13 +16989,13 @@ var ts;
         }
         function parseHeritageClauses() {
             if (isHeritageClause()) {
-                return parseList(20, parseHeritageClause);
+                return parseList(21, parseHeritageClause);
             }
             return undefined;
         }
         function parseHeritageClause() {
             if (token() === 84 || token() === 107) {
-                var node = createNode(251);
+                var node = createNode(255);
                 node.token = token();
                 nextToken();
                 node.types = parseDelimitedList(7, parseExpressionWithTypeArguments);
@@ -15615,10 +17004,10 @@ var ts;
             return undefined;
         }
         function parseExpressionWithTypeArguments() {
-            var node = createNode(195);
+            var node = createNode(199);
             node.expression = parseLeftHandSideExpressionOrHigher();
             if (token() === 26) {
-                node.typeArguments = parseBracketedList(18, parseType, 26, 28);
+                node.typeArguments = parseBracketedList(19, parseType, 26, 28);
             }
             return finishNode(node);
         }
@@ -15629,7 +17018,7 @@ var ts;
             return parseList(5, parseClassElement);
         }
         function parseInterfaceDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(223, fullStart);
+            var node = createNode(227, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             parseExpected(108);
@@ -15640,10 +17029,10 @@ var ts;
             return addJSDocComment(finishNode(node));
         }
         function parseTypeAliasDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(224, fullStart);
+            var node = createNode(228, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
-            parseExpected(135);
+            parseExpected(136);
             node.name = parseIdentifier();
             node.typeParameters = parseTypeParameters();
             parseExpected(57);
@@ -15652,13 +17041,13 @@ var ts;
             return addJSDocComment(finishNode(node));
         }
         function parseEnumMember() {
-            var node = createNode(255, scanner.getStartPos());
+            var node = createNode(260, scanner.getStartPos());
             node.name = parsePropertyName();
             node.initializer = allowInAnd(parseNonParameterInitializer);
             return addJSDocComment(finishNode(node));
         }
         function parseEnumDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(225, fullStart);
+            var node = createNode(229, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             parseExpected(82);
@@ -15673,7 +17062,7 @@ var ts;
             return addJSDocComment(finishNode(node));
         }
         function parseModuleBlock() {
-            var node = createNode(227, scanner.getStartPos());
+            var node = createNode(231, scanner.getStartPos());
             if (parseExpected(16)) {
                 node.statements = parseList(1, parseStatement);
                 parseExpected(17);
@@ -15684,7 +17073,7 @@ var ts;
             return finishNode(node);
         }
         function parseModuleOrNamespaceDeclaration(fullStart, decorators, modifiers, flags) {
-            var node = createNode(226, fullStart);
+            var node = createNode(230, fullStart);
             var namespaceFlag = flags & 16;
             node.decorators = decorators;
             node.modifiers = modifiers;
@@ -15696,10 +17085,10 @@ var ts;
             return addJSDocComment(finishNode(node));
         }
         function parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(226, fullStart);
+            var node = createNode(230, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
-            if (token() === 138) {
+            if (token() === 139) {
                 node.name = parseIdentifier();
                 node.flags |= 512;
             }
@@ -15716,14 +17105,14 @@ var ts;
         }
         function parseModuleDeclaration(fullStart, decorators, modifiers) {
             var flags = 0;
-            if (token() === 138) {
+            if (token() === 139) {
                 return parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers);
             }
-            else if (parseOptional(127)) {
+            else if (parseOptional(128)) {
                 flags |= 16;
             }
             else {
-                parseExpected(126);
+                parseExpected(127);
                 if (token() === 9) {
                     return parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers);
                 }
@@ -15731,7 +17120,7 @@ var ts;
             return parseModuleOrNamespaceDeclaration(fullStart, decorators, modifiers, flags);
         }
         function isExternalModuleReference() {
-            return token() === 130 &&
+            return token() === 131 &&
                 lookAhead(nextTokenIsOpenParen);
         }
         function nextTokenIsOpenParen() {
@@ -15741,13 +17130,13 @@ var ts;
             return nextToken() === 40;
         }
         function parseNamespaceExportDeclaration(fullStart, decorators, modifiers) {
-            var exportDeclaration = createNode(229, fullStart);
+            var exportDeclaration = createNode(233, fullStart);
             exportDeclaration.decorators = decorators;
             exportDeclaration.modifiers = modifiers;
             parseExpected(117);
-            parseExpected(127);
+            parseExpected(128);
             exportDeclaration.name = parseIdentifier();
-            parseExpected(24);
+            parseSemicolon();
             return finishNode(exportDeclaration);
         }
         function parseImportDeclarationOrImportEqualsDeclaration(fullStart, decorators, modifiers) {
@@ -15756,8 +17145,8 @@ var ts;
             var identifier;
             if (isIdentifier()) {
                 identifier = parseIdentifier();
-                if (token() !== 25 && token() !== 137) {
-                    var importEqualsDeclaration = createNode(230, fullStart);
+                if (token() !== 25 && token() !== 138) {
+                    var importEqualsDeclaration = createNode(234, fullStart);
                     importEqualsDeclaration.decorators = decorators;
                     importEqualsDeclaration.modifiers = modifiers;
                     importEqualsDeclaration.name = identifier;
@@ -15767,27 +17156,27 @@ var ts;
                     return addJSDocComment(finishNode(importEqualsDeclaration));
                 }
             }
-            var importDeclaration = createNode(231, fullStart);
+            var importDeclaration = createNode(235, fullStart);
             importDeclaration.decorators = decorators;
             importDeclaration.modifiers = modifiers;
             if (identifier ||
                 token() === 38 ||
                 token() === 16) {
                 importDeclaration.importClause = parseImportClause(identifier, afterImportPos);
-                parseExpected(137);
+                parseExpected(138);
             }
             importDeclaration.moduleSpecifier = parseModuleSpecifier();
             parseSemicolon();
             return finishNode(importDeclaration);
         }
         function parseImportClause(identifier, fullStart) {
-            var importClause = createNode(232, fullStart);
+            var importClause = createNode(236, fullStart);
             if (identifier) {
                 importClause.name = identifier;
             }
             if (!importClause.name ||
                 parseOptional(25)) {
-                importClause.namedBindings = token() === 38 ? parseNamespaceImport() : parseNamedImportsOrExports(234);
+                importClause.namedBindings = token() === 38 ? parseNamespaceImport() : parseNamedImportsOrExports(238);
             }
             return finishNode(importClause);
         }
@@ -15797,8 +17186,8 @@ var ts;
                 : parseEntityName(false);
         }
         function parseExternalModuleReference() {
-            var node = createNode(241);
-            parseExpected(130);
+            var node = createNode(245);
+            parseExpected(131);
             parseExpected(18);
             node.expression = parseModuleSpecifier();
             parseExpected(19);
@@ -15815,7 +17204,7 @@ var ts;
             }
         }
         function parseNamespaceImport() {
-            var namespaceImport = createNode(233);
+            var namespaceImport = createNode(237);
             parseExpected(38);
             parseExpected(117);
             namespaceImport.name = parseIdentifier();
@@ -15823,14 +17212,14 @@ var ts;
         }
         function parseNamedImportsOrExports(kind) {
             var node = createNode(kind);
-            node.elements = parseBracketedList(21, kind === 234 ? parseImportSpecifier : parseExportSpecifier, 16, 17);
+            node.elements = parseBracketedList(22, kind === 238 ? parseImportSpecifier : parseExportSpecifier, 16, 17);
             return finishNode(node);
         }
         function parseExportSpecifier() {
-            return parseImportOrExportSpecifier(239);
+            return parseImportOrExportSpecifier(243);
         }
         function parseImportSpecifier() {
-            return parseImportOrExportSpecifier(235);
+            return parseImportOrExportSpecifier(239);
         }
         function parseImportOrExportSpecifier(kind) {
             var node = createNode(kind);
@@ -15849,23 +17238,23 @@ var ts;
             else {
                 node.name = identifierName;
             }
-            if (kind === 235 && checkIdentifierIsKeyword) {
+            if (kind === 239 && checkIdentifierIsKeyword) {
                 parseErrorAtPosition(checkIdentifierStart, checkIdentifierEnd - checkIdentifierStart, ts.Diagnostics.Identifier_expected);
             }
             return finishNode(node);
         }
         function parseExportDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(237, fullStart);
+            var node = createNode(241, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             if (parseOptional(38)) {
-                parseExpected(137);
+                parseExpected(138);
                 node.moduleSpecifier = parseModuleSpecifier();
             }
             else {
-                node.exportClause = parseNamedImportsOrExports(238);
-                if (token() === 137 || (token() === 9 && !scanner.hasPrecedingLineBreak())) {
-                    parseExpected(137);
+                node.exportClause = parseNamedImportsOrExports(242);
+                if (token() === 138 || (token() === 9 && !scanner.hasPrecedingLineBreak())) {
+                    parseExpected(138);
                     node.moduleSpecifier = parseModuleSpecifier();
                 }
             }
@@ -15873,7 +17262,7 @@ var ts;
             return finishNode(node);
         }
         function parseExportAssignment(fullStart, decorators, modifiers) {
-            var node = createNode(236, fullStart);
+            var node = createNode(240, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             if (parseOptional(57)) {
@@ -15952,50 +17341,14 @@ var ts;
         function setExternalModuleIndicator(sourceFile) {
             sourceFile.externalModuleIndicator = ts.forEach(sourceFile.statements, function (node) {
                 return ts.hasModifier(node, 1)
-                    || node.kind === 230 && node.moduleReference.kind === 241
-                    || node.kind === 231
-                    || node.kind === 236
-                    || node.kind === 237
+                    || node.kind === 234 && node.moduleReference.kind === 245
+                    || node.kind === 235
+                    || node.kind === 240
+                    || node.kind === 241
                     ? node
                     : undefined;
             });
         }
-        var ParsingContext;
-        (function (ParsingContext) {
-            ParsingContext[ParsingContext["SourceElements"] = 0] = "SourceElements";
-            ParsingContext[ParsingContext["BlockStatements"] = 1] = "BlockStatements";
-            ParsingContext[ParsingContext["SwitchClauses"] = 2] = "SwitchClauses";
-            ParsingContext[ParsingContext["SwitchClauseStatements"] = 3] = "SwitchClauseStatements";
-            ParsingContext[ParsingContext["TypeMembers"] = 4] = "TypeMembers";
-            ParsingContext[ParsingContext["ClassMembers"] = 5] = "ClassMembers";
-            ParsingContext[ParsingContext["EnumMembers"] = 6] = "EnumMembers";
-            ParsingContext[ParsingContext["HeritageClauseElement"] = 7] = "HeritageClauseElement";
-            ParsingContext[ParsingContext["VariableDeclarations"] = 8] = "VariableDeclarations";
-            ParsingContext[ParsingContext["ObjectBindingElements"] = 9] = "ObjectBindingElements";
-            ParsingContext[ParsingContext["ArrayBindingElements"] = 10] = "ArrayBindingElements";
-            ParsingContext[ParsingContext["ArgumentExpressions"] = 11] = "ArgumentExpressions";
-            ParsingContext[ParsingContext["ObjectLiteralMembers"] = 12] = "ObjectLiteralMembers";
-            ParsingContext[ParsingContext["JsxAttributes"] = 13] = "JsxAttributes";
-            ParsingContext[ParsingContext["JsxChildren"] = 14] = "JsxChildren";
-            ParsingContext[ParsingContext["ArrayLiteralMembers"] = 15] = "ArrayLiteralMembers";
-            ParsingContext[ParsingContext["Parameters"] = 16] = "Parameters";
-            ParsingContext[ParsingContext["TypeParameters"] = 17] = "TypeParameters";
-            ParsingContext[ParsingContext["TypeArguments"] = 18] = "TypeArguments";
-            ParsingContext[ParsingContext["TupleElementTypes"] = 19] = "TupleElementTypes";
-            ParsingContext[ParsingContext["HeritageClauses"] = 20] = "HeritageClauses";
-            ParsingContext[ParsingContext["ImportOrExportSpecifiers"] = 21] = "ImportOrExportSpecifiers";
-            ParsingContext[ParsingContext["JSDocFunctionParameters"] = 22] = "JSDocFunctionParameters";
-            ParsingContext[ParsingContext["JSDocTypeArguments"] = 23] = "JSDocTypeArguments";
-            ParsingContext[ParsingContext["JSDocRecordMembers"] = 24] = "JSDocRecordMembers";
-            ParsingContext[ParsingContext["JSDocTupleTypes"] = 25] = "JSDocTupleTypes";
-            ParsingContext[ParsingContext["Count"] = 26] = "Count";
-        })(ParsingContext || (ParsingContext = {}));
-        var Tristate;
-        (function (Tristate) {
-            Tristate[Tristate["False"] = 0] = "False";
-            Tristate[Tristate["True"] = 1] = "True";
-            Tristate[Tristate["Unknown"] = 2] = "Unknown";
-        })(Tristate || (Tristate = {}));
         var JSDocParser;
         (function (JSDocParser) {
             function isJSDocType() {
@@ -16016,8 +17369,8 @@ var ts;
             }
             JSDocParser.isJSDocType = isJSDocType;
             function parseJSDocTypeExpressionForTests(content, start, length) {
-                initializeState(content, 4, undefined, 1);
-                sourceFile = createSourceFile("file.js", 4, 1);
+                initializeState(content, 5, undefined, 1);
+                sourceFile = createSourceFile("file.js", 5, 1);
                 scanner.setText(content, start, length);
                 currentToken = scanner.scan();
                 var jsDocTypeExpression = parseJSDocTypeExpression();
@@ -16027,7 +17380,7 @@ var ts;
             }
             JSDocParser.parseJSDocTypeExpressionForTests = parseJSDocTypeExpressionForTests;
             function parseJSDocTypeExpression() {
-                var result = createNode(257, scanner.getTokenPos());
+                var result = createNode(262, scanner.getTokenPos());
                 parseExpected(16);
                 result.type = parseJSDocTopLevelType();
                 parseExpected(17);
@@ -16038,12 +17391,12 @@ var ts;
             function parseJSDocTopLevelType() {
                 var type = parseJSDocType();
                 if (token() === 48) {
-                    var unionType = createNode(261, type.pos);
+                    var unionType = createNode(266, type.pos);
                     unionType.types = parseJSDocTypeList(type);
                     type = finishNode(unionType);
                 }
                 if (token() === 57) {
-                    var optionalType = createNode(268, type.pos);
+                    var optionalType = createNode(273, type.pos);
                     nextToken();
                     optionalType.type = type;
                     type = finishNode(optionalType);
@@ -16054,20 +17407,20 @@ var ts;
                 var type = parseBasicTypeExpression();
                 while (true) {
                     if (token() === 20) {
-                        var arrayType = createNode(260, type.pos);
+                        var arrayType = createNode(265, type.pos);
                         arrayType.elementType = type;
                         nextToken();
                         parseExpected(21);
                         type = finishNode(arrayType);
                     }
                     else if (token() === 54) {
-                        var nullableType = createNode(263, type.pos);
+                        var nullableType = createNode(268, type.pos);
                         nullableType.type = type;
                         nextToken();
                         type = finishNode(nullableType);
                     }
                     else if (token() === 50) {
-                        var nonNullableType = createNode(264, type.pos);
+                        var nonNullableType = createNode(269, type.pos);
                         nonNullableType.type = type;
                         nextToken();
                         type = finishNode(nonNullableType);
@@ -16101,14 +17454,14 @@ var ts;
                     case 98:
                         return parseJSDocThisType();
                     case 118:
-                    case 133:
-                    case 131:
-                    case 121:
                     case 134:
+                    case 132:
+                    case 121:
+                    case 135:
                     case 104:
                     case 94:
-                    case 136:
-                    case 128:
+                    case 137:
+                    case 129:
                         return parseTokenNode();
                     case 9:
                     case 8:
@@ -16119,30 +17472,30 @@ var ts;
                 return parseJSDocTypeReference();
             }
             function parseJSDocThisType() {
-                var result = createNode(272);
+                var result = createNode(277);
                 nextToken();
                 parseExpected(55);
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocConstructorType() {
-                var result = createNode(271);
+                var result = createNode(276);
                 nextToken();
                 parseExpected(55);
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocVariadicType() {
-                var result = createNode(270);
+                var result = createNode(275);
                 nextToken();
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocFunctionType() {
-                var result = createNode(269);
+                var result = createNode(274);
                 nextToken();
                 parseExpected(18);
-                result.parameters = parseDelimitedList(22, parseJSDocParameter);
+                result.parameters = parseDelimitedList(23, parseJSDocParameter);
                 checkForTrailingComma(result.parameters);
                 parseExpected(19);
                 if (token() === 55) {
@@ -16152,7 +17505,7 @@ var ts;
                 return finishNode(result);
             }
             function parseJSDocParameter() {
-                var parameter = createNode(143);
+                var parameter = createNode(144);
                 parameter.type = parseJSDocType();
                 if (parseOptional(57)) {
                     parameter.questionToken = createNode(57);
@@ -16160,7 +17513,7 @@ var ts;
                 return finishNode(parameter);
             }
             function parseJSDocTypeReference() {
-                var result = createNode(267);
+                var result = createNode(272);
                 result.name = parseSimplePropertyName();
                 if (token() === 26) {
                     result.typeArguments = parseTypeArguments();
@@ -16180,7 +17533,7 @@ var ts;
             }
             function parseTypeArguments() {
                 nextToken();
-                var typeArguments = parseDelimitedList(23, parseJSDocType);
+                var typeArguments = parseDelimitedList(24, parseJSDocType);
                 checkForTrailingComma(typeArguments);
                 checkForEmptyTypeArgumentList(typeArguments);
                 parseExpected(28);
@@ -16194,26 +17547,26 @@ var ts;
                 }
             }
             function parseQualifiedName(left) {
-                var result = createNode(140, left.pos);
+                var result = createNode(141, left.pos);
                 result.left = left;
                 result.right = parseIdentifierName();
                 return finishNode(result);
             }
             function parseJSDocRecordType() {
-                var result = createNode(265);
+                var result = createNode(270);
                 result.literal = parseTypeLiteral();
                 return finishNode(result);
             }
             function parseJSDocNonNullableType() {
-                var result = createNode(264);
+                var result = createNode(269);
                 nextToken();
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocTupleType() {
-                var result = createNode(262);
+                var result = createNode(267);
                 nextToken();
-                result.types = parseDelimitedList(25, parseJSDocType);
+                result.types = parseDelimitedList(26, parseJSDocType);
                 checkForTrailingComma(result.types);
                 parseExpected(21);
                 return finishNode(result);
@@ -16225,7 +17578,7 @@ var ts;
                 }
             }
             function parseJSDocUnionType() {
-                var result = createNode(261);
+                var result = createNode(266);
                 nextToken();
                 result.types = parseJSDocTypeList(parseJSDocType());
                 parseExpected(19);
@@ -16241,12 +17594,12 @@ var ts;
                 return types;
             }
             function parseJSDocAllType() {
-                var result = createNode(258);
+                var result = createNode(263);
                 nextToken();
                 return finishNode(result);
             }
             function parseJSDocLiteralType() {
-                var result = createNode(282);
+                var result = createNode(287);
                 result.literal = parseLiteralTypeNode();
                 return finishNode(result);
             }
@@ -16259,17 +17612,17 @@ var ts;
                     token() === 28 ||
                     token() === 57 ||
                     token() === 48) {
-                    var result = createNode(259, pos);
+                    var result = createNode(264, pos);
                     return finishNode(result);
                 }
                 else {
-                    var result = createNode(263, pos);
+                    var result = createNode(268, pos);
                     result.type = parseJSDocType();
                     return finishNode(result);
                 }
             }
             function parseIsolatedJSDocComment(content, start, length) {
-                initializeState(content, 4, undefined, 1);
+                initializeState(content, 5, undefined, 1);
                 sourceFile = { languageVariant: 0, text: content };
                 var jsDoc = parseJSDocCommentWorker(start, length);
                 var diagnostics = parseDiagnostics;
@@ -16291,12 +17644,6 @@ var ts;
                 return comment;
             }
             JSDocParser.parseJSDocComment = parseJSDocComment;
-            var JSDocState;
-            (function (JSDocState) {
-                JSDocState[JSDocState["BeginningOfLine"] = 0] = "BeginningOfLine";
-                JSDocState[JSDocState["SawAsterisk"] = 1] = "SawAsterisk";
-                JSDocState[JSDocState["SavingComments"] = 2] = "SavingComments";
-            })(JSDocState || (JSDocState = {}));
             function parseJSDocCommentWorker(start, length) {
                 var content = sourceText;
                 start = start || 0;
@@ -16329,6 +17676,7 @@ var ts;
                     }
                     if (token() === 4) {
                         state = 0;
+                        indent = 0;
                         nextJSDocToken();
                     }
                     while (token() !== 1) {
@@ -16408,7 +17756,7 @@ var ts;
                         content.charCodeAt(start + 3) !== 42;
                 }
                 function createJSDocComment() {
-                    var result = createNode(273, start);
+                    var result = createNode(278, start);
                     result.tags = tags;
                     result.comment = comments.length ? comments.join("") : undefined;
                     return finishNode(result, end);
@@ -16515,7 +17863,7 @@ var ts;
                     return comments;
                 }
                 function parseUnknownTag(atToken, tagName) {
-                    var result = createNode(274, atToken.pos);
+                    var result = createNode(279, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     return finishNode(result);
@@ -16570,7 +17918,7 @@ var ts;
                     if (!typeExpression) {
                         typeExpression = tryParseTypeExpression();
                     }
-                    var result = createNode(275, atToken.pos);
+                    var result = createNode(280, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.preParameterName = preName;
@@ -16581,20 +17929,20 @@ var ts;
                     return finishNode(result);
                 }
                 function parseReturnTag(atToken, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 276; })) {
+                    if (ts.forEach(tags, function (t) { return t.kind === 281; })) {
                         parseErrorAtPosition(tagName.pos, scanner.getTokenPos() - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
                     }
-                    var result = createNode(276, atToken.pos);
+                    var result = createNode(281, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.typeExpression = tryParseTypeExpression();
                     return finishNode(result);
                 }
                 function parseTypeTag(atToken, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 277; })) {
+                    if (ts.forEach(tags, function (t) { return t.kind === 282; })) {
                         parseErrorAtPosition(tagName.pos, scanner.getTokenPos() - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
                     }
-                    var result = createNode(277, atToken.pos);
+                    var result = createNode(282, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.typeExpression = tryParseTypeExpression();
@@ -16609,7 +17957,7 @@ var ts;
                         parseErrorAtPosition(scanner.getStartPos(), 0, ts.Diagnostics.Identifier_expected);
                         return undefined;
                     }
-                    var result = createNode(280, atToken.pos);
+                    var result = createNode(285, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.name = name;
@@ -16619,18 +17967,25 @@ var ts;
                 function parseTypedefTag(atToken, tagName) {
                     var typeExpression = tryParseTypeExpression();
                     skipWhitespace();
-                    var typedefTag = createNode(279, atToken.pos);
+                    var typedefTag = createNode(284, atToken.pos);
                     typedefTag.atToken = atToken;
                     typedefTag.tagName = tagName;
-                    typedefTag.name = parseJSDocIdentifierName();
+                    typedefTag.fullName = parseJSDocTypeNameWithNamespace(0);
+                    if (typedefTag.fullName) {
+                        var rightNode = typedefTag.fullName;
+                        while (rightNode.kind !== 70) {
+                            rightNode = rightNode.body;
+                        }
+                        typedefTag.name = rightNode;
+                    }
                     typedefTag.typeExpression = typeExpression;
                     skipWhitespace();
                     if (typeExpression) {
-                        if (typeExpression.type.kind === 267) {
+                        if (typeExpression.type.kind === 272) {
                             var jsDocTypeReference = typeExpression.type;
                             if (jsDocTypeReference.name.kind === 70) {
-                                var name_11 = jsDocTypeReference.name;
-                                if (name_11.text === "Object") {
+                                var name_17 = jsDocTypeReference.name;
+                                if (name_17.text === "Object") {
                                     typedefTag.jsDocTypeLiteral = scanChildTags();
                                 }
                             }
@@ -16644,7 +17999,7 @@ var ts;
                     }
                     return finishNode(typedefTag);
                     function scanChildTags() {
-                        var jsDocTypeLiteral = createNode(281, scanner.getStartPos());
+                        var jsDocTypeLiteral = createNode(286, scanner.getStartPos());
                         var resumePos = scanner.getStartPos();
                         var canParseTag = true;
                         var seenAsterisk = false;
@@ -16681,6 +18036,21 @@ var ts;
                         scanner.setTextPos(resumePos);
                         return finishNode(jsDocTypeLiteral);
                     }
+                    function parseJSDocTypeNameWithNamespace(flags) {
+                        var pos = scanner.getTokenPos();
+                        var typeNameOrNamespaceName = parseJSDocIdentifierName();
+                        if (typeNameOrNamespaceName && parseOptional(22)) {
+                            var jsDocNamespaceNode = createNode(230, pos);
+                            jsDocNamespaceNode.flags |= flags;
+                            jsDocNamespaceNode.name = typeNameOrNamespaceName;
+                            jsDocNamespaceNode.body = parseJSDocTypeNameWithNamespace(4);
+                            return jsDocNamespaceNode;
+                        }
+                        if (typeNameOrNamespaceName && flags & 4) {
+                            typeNameOrNamespaceName.isInJSDocNamespace = true;
+                        }
+                        return typeNameOrNamespaceName;
+                    }
                 }
                 function tryParseChildTag(parentTag) {
                     ts.Debug.assert(token() === 56);
@@ -16701,29 +18071,32 @@ var ts;
                             return true;
                         case "prop":
                         case "property":
-                            if (!parentTag.jsDocPropertyTags) {
-                                parentTag.jsDocPropertyTags = [];
-                            }
                             var propertyTag = parsePropertyTag(atToken, tagName);
-                            parentTag.jsDocPropertyTags.push(propertyTag);
-                            return true;
+                            if (propertyTag) {
+                                if (!parentTag.jsDocPropertyTags) {
+                                    parentTag.jsDocPropertyTags = [];
+                                }
+                                parentTag.jsDocPropertyTags.push(propertyTag);
+                                return true;
+                            }
+                            return false;
                     }
                     return false;
                 }
                 function parseTemplateTag(atToken, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 278; })) {
+                    if (ts.forEach(tags, function (t) { return t.kind === 283; })) {
                         parseErrorAtPosition(tagName.pos, scanner.getTokenPos() - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
                     }
                     var typeParameters = createNodeArray();
                     while (true) {
-                        var name_12 = parseJSDocIdentifierName();
+                        var name_18 = parseJSDocIdentifierName();
                         skipWhitespace();
-                        if (!name_12) {
+                        if (!name_18) {
                             parseErrorAtPosition(scanner.getStartPos(), 0, ts.Diagnostics.Identifier_expected);
                             return undefined;
                         }
-                        var typeParameter = createNode(142, name_12.pos);
-                        typeParameter.name = name_12;
+                        var typeParameter = createNode(143, name_18.pos);
+                        typeParameter.name = name_18;
                         finishNode(typeParameter);
                         typeParameters.push(typeParameter);
                         if (token() === 25) {
@@ -16734,7 +18107,7 @@ var ts;
                             break;
                         }
                     }
-                    var result = createNode(278, atToken.pos);
+                    var result = createNode(283, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.typeParameters = typeParameters;
@@ -17048,31 +18421,21 @@ var ts;
                 }
             }
         }
-        var InvalidPosition;
-        (function (InvalidPosition) {
-            InvalidPosition[InvalidPosition["Value"] = -1] = "Value";
-        })(InvalidPosition || (InvalidPosition = {}));
     })(IncrementalParser || (IncrementalParser = {}));
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    (function (ModuleInstanceState) {
-        ModuleInstanceState[ModuleInstanceState["NonInstantiated"] = 0] = "NonInstantiated";
-        ModuleInstanceState[ModuleInstanceState["Instantiated"] = 1] = "Instantiated";
-        ModuleInstanceState[ModuleInstanceState["ConstEnumOnly"] = 2] = "ConstEnumOnly";
-    })(ts.ModuleInstanceState || (ts.ModuleInstanceState = {}));
-    var ModuleInstanceState = ts.ModuleInstanceState;
     function getModuleInstanceState(node) {
-        if (node.kind === 223 || node.kind === 224) {
+        if (node.kind === 227 || node.kind === 228) {
             return 0;
         }
         else if (ts.isConstEnumDeclaration(node)) {
             return 2;
         }
-        else if ((node.kind === 231 || node.kind === 230) && !(ts.hasModifier(node, 1))) {
+        else if ((node.kind === 235 || node.kind === 234) && !(ts.hasModifier(node, 1))) {
             return 0;
         }
-        else if (node.kind === 227) {
+        else if (node.kind === 231) {
             var state_1 = 0;
             ts.forEachChild(node, function (n) {
                 switch (getModuleInstanceState(n)) {
@@ -17088,27 +18451,18 @@ var ts;
             });
             return state_1;
         }
-        else if (node.kind === 226) {
+        else if (node.kind === 230) {
             var body = node.body;
             return body ? getModuleInstanceState(body) : 1;
         }
+        else if (node.kind === 70 && node.isInJSDocNamespace) {
+            return 0;
+        }
         else {
             return 1;
         }
     }
     ts.getModuleInstanceState = getModuleInstanceState;
-    var ContainerFlags;
-    (function (ContainerFlags) {
-        ContainerFlags[ContainerFlags["None"] = 0] = "None";
-        ContainerFlags[ContainerFlags["IsContainer"] = 1] = "IsContainer";
-        ContainerFlags[ContainerFlags["IsBlockScopedContainer"] = 2] = "IsBlockScopedContainer";
-        ContainerFlags[ContainerFlags["IsControlFlowContainer"] = 4] = "IsControlFlowContainer";
-        ContainerFlags[ContainerFlags["IsFunctionLike"] = 8] = "IsFunctionLike";
-        ContainerFlags[ContainerFlags["IsFunctionExpression"] = 16] = "IsFunctionExpression";
-        ContainerFlags[ContainerFlags["HasLocals"] = 32] = "HasLocals";
-        ContainerFlags[ContainerFlags["IsInterface"] = 64] = "IsInterface";
-        ContainerFlags[ContainerFlags["IsObjectLiteralOrClassExpressionMethod"] = 128] = "IsObjectLiteralOrClassExpressionMethod";
-    })(ContainerFlags || (ContainerFlags = {}));
     var binder = createBinder();
     function bindSourceFile(file, options) {
         ts.performance.mark("beforeBind");
@@ -17206,7 +18560,7 @@ var ts;
             if (symbolFlags & 107455) {
                 var valueDeclaration = symbol.valueDeclaration;
                 if (!valueDeclaration ||
-                    (valueDeclaration.kind !== node.kind && valueDeclaration.kind === 226)) {
+                    (valueDeclaration.kind !== node.kind && valueDeclaration.kind === 230)) {
                     symbol.valueDeclaration = node;
                 }
             }
@@ -17216,7 +18570,7 @@ var ts;
                 if (ts.isAmbientModule(node)) {
                     return ts.isGlobalScopeAugmentation(node) ? "__global" : "\"" + node.name.text + "\"";
                 }
-                if (node.name.kind === 141) {
+                if (node.name.kind === 142) {
                     var nameExpression = node.name.expression;
                     if (ts.isStringOrNumericLiteral(nameExpression.kind)) {
                         return nameExpression.text;
@@ -17227,21 +18581,21 @@ var ts;
                 return node.name.text;
             }
             switch (node.kind) {
-                case 149:
+                case 150:
                     return "__constructor";
-                case 157:
-                case 152:
-                    return "__call";
                 case 158:
                 case 153:
-                    return "__new";
+                    return "__call";
+                case 159:
                 case 154:
+                    return "__new";
+                case 155:
                     return "__index";
-                case 237:
+                case 241:
                     return "__export";
-                case 236:
+                case 240:
                     return node.isExportEquals ? "export=" : "default";
-                case 188:
+                case 192:
                     switch (ts.getSpecialPropertyAssignmentKind(node)) {
                         case 2:
                             return "export=";
@@ -17253,20 +18607,20 @@ var ts;
                     }
                     ts.Debug.fail("Unknown binary declaration kind");
                     break;
-                case 221:
-                case 222:
+                case 225:
+                case 226:
                     return ts.hasModifier(node, 512) ? "default" : undefined;
-                case 269:
+                case 274:
                     return ts.isJSDocConstructSignature(node) ? "__new" : "__call";
-                case 143:
-                    ts.Debug.assert(node.parent.kind === 269);
+                case 144:
+                    ts.Debug.assert(node.parent.kind === 274);
                     var functionType = node.parent;
                     var index = ts.indexOf(functionType.parameters, node);
                     return "arg" + index;
-                case 279:
+                case 284:
                     var parentNode = node.parent && node.parent.parent;
                     var nameFromParentNode = void 0;
-                    if (parentNode && parentNode.kind === 201) {
+                    if (parentNode && parentNode.kind === 205) {
                         if (parentNode.declarationList.declarations.length > 0) {
                             var nameIdentifier = parentNode.declarationList.declarations[0].name;
                             if (nameIdentifier.kind === 70) {
@@ -17310,7 +18664,7 @@ var ts;
                             }
                             else {
                                 if (symbol.declarations && symbol.declarations.length &&
-                                    (isDefaultExport || (node.kind === 236 && !node.isExportEquals))) {
+                                    (isDefaultExport || (node.kind === 240 && !node.isExportEquals))) {
                                     message_1 = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
                                 }
                             }
@@ -17330,7 +18684,7 @@ var ts;
         function declareModuleMember(node, symbolFlags, symbolExcludes) {
             var hasExportModifier = ts.getCombinedModifierFlags(node) & 1;
             if (symbolFlags & 8388608) {
-                if (node.kind === 239 || (node.kind === 230 && hasExportModifier)) {
+                if (node.kind === 243 || (node.kind === 234 && hasExportModifier)) {
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
                 }
                 else {
@@ -17338,7 +18692,11 @@ var ts;
                 }
             }
             else {
-                if (!ts.isAmbientModule(node) && (hasExportModifier || container.flags & 32)) {
+                var isJSDocTypedefInJSDocNamespace = node.kind === 284 &&
+                    node.name &&
+                    node.name.kind === 70 &&
+                    node.name.isInJSDocNamespace;
+                if ((!ts.isAmbientModule(node) && (hasExportModifier || container.flags & 32)) || isJSDocTypedefInJSDocNamespace) {
                     var exportKind = (symbolFlags & 107455 ? 1048576 : 0) |
                         (symbolFlags & 793064 ? 2097152 : 0) |
                         (symbolFlags & 1920 ? 4194304 : 0);
@@ -17373,7 +18731,7 @@ var ts;
                 var saveReturnTarget = currentReturnTarget;
                 var saveActiveLabels = activeLabels;
                 var saveHasExplicitReturn = hasExplicitReturn;
-                var isIIFE = containerFlags & 16 && !!ts.getImmediatelyInvokedFunctionExpression(node);
+                var isIIFE = containerFlags & 16 && !ts.hasModifier(node, 256) && !!ts.getImmediatelyInvokedFunctionExpression(node);
                 if (isIIFE) {
                     currentReturnTarget = createBranchLabel();
                 }
@@ -17389,13 +18747,13 @@ var ts;
                 activeLabels = undefined;
                 hasExplicitReturn = false;
                 bindChildren(node);
-                node.flags &= ~32128;
+                node.flags &= ~64896;
                 if (!(currentFlow.flags & 1) && containerFlags & 8 && ts.nodeIsPresent(node.body)) {
                     node.flags |= 128;
                     if (hasExplicitReturn)
                         node.flags |= 256;
                 }
-                if (node.kind === 256) {
+                if (node.kind === 261) {
                     node.flags |= emitFlags;
                 }
                 if (isIIFE) {
@@ -17430,6 +18788,7 @@ var ts;
                 skipTransformFlagAggregation = true;
                 bindChildrenWorker(node);
                 skipTransformFlagAggregation = false;
+                subtreeTransformFlags |= node.transformFlags & ~getTransformFlagsSubtreeExclusions(node.kind);
             }
             else {
                 var savedSubtreeTransformFlags = subtreeTransformFlags;
@@ -17447,64 +18806,64 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 206:
+                case 210:
                     bindWhileStatement(node);
                     break;
-                case 205:
+                case 209:
                     bindDoStatement(node);
                     break;
-                case 207:
+                case 211:
                     bindForStatement(node);
                     break;
-                case 208:
-                case 209:
+                case 212:
+                case 213:
                     bindForInOrForOfStatement(node);
                     break;
-                case 204:
+                case 208:
                     bindIfStatement(node);
                     break;
-                case 212:
                 case 216:
+                case 220:
                     bindReturnOrThrow(node);
                     break;
-                case 211:
-                case 210:
+                case 215:
+                case 214:
                     bindBreakOrContinueStatement(node);
                     break;
-                case 217:
+                case 221:
                     bindTryStatement(node);
                     break;
-                case 214:
+                case 218:
                     bindSwitchStatement(node);
                     break;
-                case 228:
+                case 232:
                     bindCaseBlock(node);
                     break;
-                case 249:
+                case 253:
                     bindCaseClause(node);
                     break;
-                case 215:
+                case 219:
                     bindLabeledStatement(node);
                     break;
-                case 186:
+                case 190:
                     bindPrefixUnaryExpressionFlow(node);
                     break;
-                case 187:
+                case 191:
                     bindPostfixUnaryExpressionFlow(node);
                     break;
-                case 188:
+                case 192:
                     bindBinaryExpressionFlow(node);
                     break;
-                case 182:
+                case 186:
                     bindDeleteExpressionFlow(node);
                     break;
-                case 189:
+                case 193:
                     bindConditionalExpressionFlow(node);
                     break;
-                case 219:
+                case 223:
                     bindVariableDeclarationFlow(node);
                     break;
-                case 175:
+                case 179:
                     bindCallExpressionFlow(node);
                     break;
                 default:
@@ -17516,15 +18875,15 @@ var ts;
             switch (expr.kind) {
                 case 70:
                 case 98:
-                case 173:
+                case 177:
                     return isNarrowableReference(expr);
-                case 175:
-                    return hasNarrowableArgument(expr);
                 case 179:
+                    return hasNarrowableArgument(expr);
+                case 183:
                     return isNarrowingExpression(expr.expression);
-                case 188:
+                case 192:
                     return isNarrowingBinaryExpression(expr);
-                case 186:
+                case 190:
                     return expr.operator === 50 && isNarrowingExpression(expr.operand);
             }
             return false;
@@ -17532,7 +18891,7 @@ var ts;
         function isNarrowableReference(expr) {
             return expr.kind === 70 ||
                 expr.kind === 98 ||
-                expr.kind === 173 && isNarrowableReference(expr.expression);
+                expr.kind === 177 && isNarrowableReference(expr.expression);
         }
         function hasNarrowableArgument(expr) {
             if (expr.arguments) {
@@ -17543,14 +18902,14 @@ var ts;
                     }
                 }
             }
-            if (expr.expression.kind === 173 &&
+            if (expr.expression.kind === 177 &&
                 isNarrowableReference(expr.expression.expression)) {
                 return true;
             }
             return false;
         }
         function isNarrowingTypeofOperands(expr1, expr2) {
-            return expr1.kind === 183 && isNarrowableOperand(expr1.expression) && expr2.kind === 9;
+            return expr1.kind === 187 && isNarrowableOperand(expr1.expression) && expr2.kind === 9;
         }
         function isNarrowingBinaryExpression(expr) {
             switch (expr.operatorToken.kind) {
@@ -17571,9 +18930,9 @@ var ts;
         }
         function isNarrowableOperand(expr) {
             switch (expr.kind) {
-                case 179:
+                case 183:
                     return isNarrowableOperand(expr.expression);
-                case 188:
+                case 192:
                     switch (expr.operatorToken.kind) {
                         case 57:
                             return isNarrowableOperand(expr.left);
@@ -17667,33 +19026,33 @@ var ts;
         function isStatementCondition(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 204:
-                case 206:
-                case 205:
+                case 208:
+                case 210:
+                case 209:
                     return parent.expression === node;
-                case 207:
-                case 189:
+                case 211:
+                case 193:
                     return parent.condition === node;
             }
             return false;
         }
         function isLogicalExpression(node) {
             while (true) {
-                if (node.kind === 179) {
+                if (node.kind === 183) {
                     node = node.expression;
                 }
-                else if (node.kind === 186 && node.operator === 50) {
+                else if (node.kind === 190 && node.operator === 50) {
                     node = node.operand;
                 }
                 else {
-                    return node.kind === 188 && (node.operatorToken.kind === 52 ||
+                    return node.kind === 192 && (node.operatorToken.kind === 52 ||
                         node.operatorToken.kind === 53);
                 }
             }
         }
         function isTopLevelLogicalExpression(node) {
-            while (node.parent.kind === 179 ||
-                node.parent.kind === 186 &&
+            while (node.parent.kind === 183 ||
+                node.parent.kind === 190 &&
                     node.parent.operator === 50) {
                 node = node.parent;
             }
@@ -17735,8 +19094,11 @@ var ts;
         }
         function bindDoStatement(node) {
             var preDoLabel = createLoopLabel();
-            var preConditionLabel = createBranchLabel();
-            var postDoLabel = createBranchLabel();
+            var enclosingLabeledStatement = node.parent.kind === 219
+                ? ts.lastOrUndefined(activeLabels)
+                : undefined;
+            var preConditionLabel = enclosingLabeledStatement ? enclosingLabeledStatement.continueTarget : createBranchLabel();
+            var postDoLabel = enclosingLabeledStatement ? enclosingLabeledStatement.breakTarget : createBranchLabel();
             addAntecedent(preDoLabel, currentFlow);
             currentFlow = preDoLabel;
             bindIterativeStatement(node.statement, postDoLabel, preConditionLabel);
@@ -17767,7 +19129,7 @@ var ts;
             bind(node.expression);
             addAntecedent(postLoopLabel, currentFlow);
             bind(node.initializer);
-            if (node.initializer.kind !== 220) {
+            if (node.initializer.kind !== 224) {
                 bindAssignmentTargetFlow(node.initializer);
             }
             bindIterativeStatement(node.statement, postLoopLabel, preLoopLabel);
@@ -17789,7 +19151,7 @@ var ts;
         }
         function bindReturnOrThrow(node) {
             bind(node.expression);
-            if (node.kind === 212) {
+            if (node.kind === 216) {
                 hasExplicitReturn = true;
                 if (currentReturnTarget) {
                     addAntecedent(currentReturnTarget, currentFlow);
@@ -17809,7 +19171,7 @@ var ts;
             return undefined;
         }
         function bindbreakOrContinueFlow(node, breakTarget, continueTarget) {
-            var flowLabel = node.kind === 211 ? breakTarget : continueTarget;
+            var flowLabel = node.kind === 215 ? breakTarget : continueTarget;
             if (flowLabel) {
                 addAntecedent(flowLabel, currentFlow);
                 currentFlow = unreachableFlow;
@@ -17866,7 +19228,7 @@ var ts;
             preSwitchCaseFlow = currentFlow;
             bind(node.caseBlock);
             addAntecedent(postSwitchLabel, currentFlow);
-            var hasDefault = ts.forEach(node.caseBlock.clauses, function (c) { return c.kind === 250; });
+            var hasDefault = ts.forEach(node.caseBlock.clauses, function (c) { return c.kind === 254; });
             node.possiblyExhaustive = !hasDefault && !postSwitchLabel.antecedents;
             if (!hasDefault) {
                 addAntecedent(postSwitchLabel, createFlowSwitchClause(preSwitchCaseFlow, node, 0, 0));
@@ -17927,11 +19289,13 @@ var ts;
             if (!activeLabel.referenced && !options.allowUnusedLabels) {
                 file.bindDiagnostics.push(ts.createDiagnosticForNode(node.label, ts.Diagnostics.Unused_label));
             }
-            addAntecedent(postStatementLabel, currentFlow);
-            currentFlow = finishFlowLabel(postStatementLabel);
+            if (!node.statement || node.statement.kind !== 209) {
+                addAntecedent(postStatementLabel, currentFlow);
+                currentFlow = finishFlowLabel(postStatementLabel);
+            }
         }
         function bindDestructuringTargetFlow(node) {
-            if (node.kind === 188 && node.operatorToken.kind === 57) {
+            if (node.kind === 192 && node.operatorToken.kind === 57) {
                 bindAssignmentTargetFlow(node.left);
             }
             else {
@@ -17942,10 +19306,10 @@ var ts;
             if (isNarrowableReference(node)) {
                 currentFlow = createFlowAssignment(currentFlow, node);
             }
-            else if (node.kind === 171) {
+            else if (node.kind === 175) {
                 for (var _i = 0, _a = node.elements; _i < _a.length; _i++) {
                     var e = _a[_i];
-                    if (e.kind === 192) {
+                    if (e.kind === 196) {
                         bindAssignmentTargetFlow(e.expression);
                     }
                     else {
@@ -17953,15 +19317,18 @@ var ts;
                     }
                 }
             }
-            else if (node.kind === 172) {
+            else if (node.kind === 176) {
                 for (var _b = 0, _c = node.properties; _b < _c.length; _b++) {
                     var p = _c[_b];
-                    if (p.kind === 253) {
+                    if (p.kind === 257) {
                         bindDestructuringTargetFlow(p.initializer);
                     }
-                    else if (p.kind === 254) {
+                    else if (p.kind === 258) {
                         bindAssignmentTargetFlow(p.name);
                     }
+                    else if (p.kind === 259) {
+                        bindAssignmentTargetFlow(p.expression);
+                    }
                 }
             }
         }
@@ -18013,9 +19380,9 @@ var ts;
             }
             else {
                 ts.forEachChild(node, bind);
-                if (operator === 57 && !ts.isAssignmentTarget(node)) {
+                if (ts.isAssignmentOperator(operator) && !ts.isAssignmentTarget(node)) {
                     bindAssignmentTargetFlow(node.left);
-                    if (node.left.kind === 174) {
+                    if (operator === 57 && node.left.kind === 178) {
                         var elementAccess = node.left;
                         if (isNarrowableOperand(elementAccess.expression)) {
                             currentFlow = createFlowArrayMutation(currentFlow, node);
@@ -18026,7 +19393,7 @@ var ts;
         }
         function bindDeleteExpressionFlow(node) {
             ts.forEachChild(node, bind);
-            if (node.expression.kind === 173) {
+            if (node.expression.kind === 177) {
                 bindAssignmentTargetFlow(node.expression);
             }
         }
@@ -18036,9 +19403,11 @@ var ts;
             var postExpressionLabel = createBranchLabel();
             bindCondition(node.condition, trueLabel, falseLabel);
             currentFlow = finishFlowLabel(trueLabel);
+            bind(node.questionToken);
             bind(node.whenTrue);
             addAntecedent(postExpressionLabel, currentFlow);
             currentFlow = finishFlowLabel(falseLabel);
+            bind(node.colonToken);
             bind(node.whenFalse);
             addAntecedent(postExpressionLabel, currentFlow);
             currentFlow = finishFlowLabel(postExpressionLabel);
@@ -18057,16 +19426,16 @@ var ts;
         }
         function bindVariableDeclarationFlow(node) {
             ts.forEachChild(node, bind);
-            if (node.initializer || node.parent.parent.kind === 208 || node.parent.parent.kind === 209) {
+            if (node.initializer || node.parent.parent.kind === 212 || node.parent.parent.kind === 213) {
                 bindInitializedVariableFlow(node);
             }
         }
         function bindCallExpressionFlow(node) {
             var expr = node.expression;
-            while (expr.kind === 179) {
+            while (expr.kind === 183) {
                 expr = expr.expression;
             }
-            if (expr.kind === 180 || expr.kind === 181) {
+            if (expr.kind === 184 || expr.kind === 185) {
                 ts.forEach(node.typeArguments, bind);
                 ts.forEach(node.arguments, bind);
                 bind(node.expression);
@@ -18074,7 +19443,7 @@ var ts;
             else {
                 ts.forEachChild(node, bind);
             }
-            if (node.expression.kind === 173) {
+            if (node.expression.kind === 177) {
                 var propertyAccess = node.expression;
                 if (isNarrowableOperand(propertyAccess.expression) && ts.isPushOrUnshiftIdentifier(propertyAccess.name)) {
                     currentFlow = createFlowArrayMutation(currentFlow, node);
@@ -18083,51 +19452,52 @@ var ts;
         }
         function getContainerFlags(node) {
             switch (node.kind) {
-                case 193:
-                case 222:
-                case 225:
-                case 172:
-                case 160:
-                case 281:
-                case 265:
-                    return 1;
-                case 223:
-                    return 1 | 64;
-                case 269:
+                case 197:
                 case 226:
-                case 224:
+                case 229:
+                case 176:
+                case 161:
+                case 286:
+                case 270:
+                    return 1;
+                case 227:
+                    return 1 | 64;
+                case 274:
+                case 230:
+                case 228:
+                case 170:
                     return 1 | 32;
-                case 256:
+                case 261:
                     return 1 | 4 | 32;
-                case 148:
+                case 149:
                     if (ts.isObjectLiteralOrClassExpressionMethod(node)) {
                         return 1 | 4 | 32 | 8 | 128;
                     }
-                case 149:
-                case 221:
-                case 147:
                 case 150:
+                case 225:
+                case 148:
                 case 151:
                 case 152:
                 case 153:
                 case 154:
-                case 157:
+                case 155:
                 case 158:
+                case 159:
                     return 1 | 4 | 32 | 8;
-                case 180:
-                case 181:
+                case 184:
+                case 185:
                     return 1 | 4 | 32 | 8 | 16;
-                case 227:
+                case 231:
                     return 4;
-                case 146:
+                case 147:
                     return node.initializer ? 4 : 0;
-                case 252:
-                case 207:
-                case 208:
-                case 209:
-                case 228:
+                case 256:
+                case 211:
+                case 212:
+                case 213:
+                case 232:
                     return 2;
-                case 200:
+                case 204:
                     return ts.isFunctionLike(node.parent) ? 0 : 2;
             }
             return 0;
@@ -18143,36 +19513,37 @@ var ts;
         }
         function declareSymbolAndAddToSymbolTableWorker(node, symbolFlags, symbolExcludes) {
             switch (container.kind) {
-                case 226:
+                case 230:
                     return declareModuleMember(node, symbolFlags, symbolExcludes);
-                case 256:
+                case 261:
                     return declareSourceFileMember(node, symbolFlags, symbolExcludes);
-                case 193:
-                case 222:
+                case 197:
+                case 226:
                     return declareClassMember(node, symbolFlags, symbolExcludes);
-                case 225:
+                case 229:
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
-                case 160:
-                case 172:
-                case 223:
-                case 265:
-                case 281:
+                case 161:
+                case 176:
+                case 227:
+                case 270:
+                case 286:
                     return declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
-                case 157:
                 case 158:
-                case 152:
+                case 159:
                 case 153:
                 case 154:
-                case 148:
-                case 147:
+                case 155:
                 case 149:
+                case 148:
                 case 150:
                 case 151:
-                case 221:
-                case 180:
-                case 181:
-                case 269:
-                case 224:
+                case 152:
+                case 225:
+                case 184:
+                case 185:
+                case 274:
+                case 228:
+                case 170:
                     return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes);
             }
         }
@@ -18187,11 +19558,11 @@ var ts;
                 : declareSymbol(file.locals, undefined, node, symbolFlags, symbolExcludes);
         }
         function hasExportDeclarations(node) {
-            var body = node.kind === 256 ? node : node.body;
-            if (body && (body.kind === 256 || body.kind === 227)) {
+            var body = node.kind === 261 ? node : node.body;
+            if (body && (body.kind === 261 || body.kind === 231)) {
                 for (var _i = 0, _a = body.statements; _i < _a.length; _i++) {
                     var stat = _a[_i];
-                    if (stat.kind === 237 || stat.kind === 236) {
+                    if (stat.kind === 241 || stat.kind === 240) {
                         return true;
                     }
                 }
@@ -18263,20 +19634,15 @@ var ts;
             typeLiteralSymbol.members[symbol.name] = symbol;
         }
         function bindObjectLiteralExpression(node) {
-            var ElementKind;
-            (function (ElementKind) {
-                ElementKind[ElementKind["Property"] = 1] = "Property";
-                ElementKind[ElementKind["Accessor"] = 2] = "Accessor";
-            })(ElementKind || (ElementKind = {}));
             if (inStrictMode) {
                 var seen = ts.createMap();
                 for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                     var prop = _a[_i];
-                    if (prop.name.kind !== 70) {
+                    if (prop.kind === 259 || prop.name.kind !== 70) {
                         continue;
                     }
                     var identifier = prop.name;
-                    var currentKind = prop.kind === 253 || prop.kind === 254 || prop.kind === 148
+                    var currentKind = prop.kind === 257 || prop.kind === 258 || prop.kind === 149
                         ? 1
                         : 2;
                     var existingKind = seen[identifier.text];
@@ -18298,10 +19664,10 @@ var ts;
         }
         function bindBlockScopedDeclaration(node, symbolFlags, symbolExcludes) {
             switch (blockScopeContainer.kind) {
-                case 226:
+                case 230:
                     declareModuleMember(node, symbolFlags, symbolExcludes);
                     break;
-                case 256:
+                case 261:
                     if (ts.isExternalModule(container)) {
                         declareModuleMember(node, symbolFlags, symbolExcludes);
                         break;
@@ -18391,8 +19757,8 @@ var ts;
         }
         function checkStrictModeFunctionDeclaration(node) {
             if (languageVersion < 2) {
-                if (blockScopeContainer.kind !== 256 &&
-                    blockScopeContainer.kind !== 226 &&
+                if (blockScopeContainer.kind !== 261 &&
+                    blockScopeContainer.kind !== 230 &&
                     !ts.isFunctionLike(blockScopeContainer)) {
                     var errorSpan = ts.getErrorSpanForNode(file, node);
                     file.bindDiagnostics.push(ts.createFileDiagnostic(file, errorSpan.start, errorSpan.length, getStrictModeBlockScopeFunctionDeclarationMessage(node)));
@@ -18435,7 +19801,7 @@ var ts;
             node.parent = parent;
             var saveInStrictMode = inStrictMode;
             bindWorker(node);
-            if (node.kind > 139) {
+            if (node.kind > 140) {
                 var saveParent = parent;
                 parent = node;
                 var containerFlags = getContainerFlags(node);
@@ -18473,17 +19839,25 @@ var ts;
         function bindWorker(node) {
             switch (node.kind) {
                 case 70:
+                    if (node.isInJSDocNamespace) {
+                        var parentNode = node.parent;
+                        while (parentNode && parentNode.kind !== 284) {
+                            parentNode = parentNode.parent;
+                        }
+                        bindBlockScopedDeclaration(parentNode, 524288, 793064);
+                        break;
+                    }
                 case 98:
-                    if (currentFlow && (ts.isExpression(node) || parent.kind === 254)) {
+                    if (currentFlow && (ts.isExpression(node) || parent.kind === 258)) {
                         node.flowNode = currentFlow;
                     }
                     return checkStrictModeIdentifier(node);
-                case 173:
+                case 177:
                     if (currentFlow && isNarrowableReference(node)) {
                         node.flowNode = currentFlow;
                     }
                     break;
-                case 188:
+                case 192:
                     if (ts.isInJavaScriptFile(node)) {
                         var specialKind = ts.getSpecialPropertyAssignmentKind(node);
                         switch (specialKind) {
@@ -18506,111 +19880,132 @@ var ts;
                         }
                     }
                     return checkStrictModeBinaryExpression(node);
-                case 252:
+                case 256:
                     return checkStrictModeCatchClause(node);
-                case 182:
+                case 186:
                     return checkStrictModeDeleteExpression(node);
                 case 8:
                     return checkStrictModeNumericLiteral(node);
-                case 187:
+                case 191:
                     return checkStrictModePostfixUnaryExpression(node);
-                case 186:
+                case 190:
                     return checkStrictModePrefixUnaryExpression(node);
-                case 213:
+                case 217:
                     return checkStrictModeWithStatement(node);
-                case 166:
+                case 167:
                     seenThisKeyword = true;
                     return;
-                case 155:
+                case 156:
                     return checkTypePredicate(node);
-                case 142:
-                    return declareSymbolAndAddToSymbolTable(node, 262144, 530920);
                 case 143:
+                    return declareSymbolAndAddToSymbolTable(node, 262144, 530920);
+                case 144:
                     return bindParameter(node);
-                case 219:
-                case 170:
+                case 223:
+                case 174:
+                    if (node.dotDotDotToken && node.parent.kind === 172) {
+                        emitFlags |= 32768;
+                    }
                     return bindVariableDeclarationOrBindingElement(node);
+                case 147:
                 case 146:
-                case 145:
-                case 266:
+                case 271:
                     return bindPropertyOrMethodOrAccessor(node, 4 | (node.questionToken ? 536870912 : 0), 0);
-                case 280:
+                case 285:
                     return bindJSDocProperty(node);
-                case 253:
-                case 254:
+                case 257:
+                case 258:
                     return bindPropertyOrMethodOrAccessor(node, 4, 0);
-                case 255:
+                case 260:
                     return bindPropertyOrMethodOrAccessor(node, 8, 900095);
-                case 247:
-                    emitFlags |= 16384;
+                case 259:
+                case 251:
+                    var root = container;
+                    var hasRest = false;
+                    while (root.parent) {
+                        if (root.kind === 176 &&
+                            root.parent.kind === 192 &&
+                            root.parent.operatorToken.kind === 57 &&
+                            root.parent.left === root) {
+                            hasRest = true;
+                            break;
+                        }
+                        root = root.parent;
+                    }
+                    emitFlags |= hasRest ? 32768 : 16384;
                     return;
-                case 152:
                 case 153:
                 case 154:
+                case 155:
                     return declareSymbolAndAddToSymbolTable(node, 131072, 0);
-                case 148:
-                case 147:
-                    return bindPropertyOrMethodOrAccessor(node, 8192 | (node.questionToken ? 536870912 : 0), ts.isObjectLiteralMethod(node) ? 0 : 99263);
-                case 221:
-                    return bindFunctionDeclaration(node);
                 case 149:
-                    return declareSymbolAndAddToSymbolTable(node, 16384, 0);
+                case 148:
+                    return bindPropertyOrMethodOrAccessor(node, 8192 | (node.questionToken ? 536870912 : 0), ts.isObjectLiteralMethod(node) ? 0 : 99263);
+                case 225:
+                    return bindFunctionDeclaration(node);
                 case 150:
-                    return bindPropertyOrMethodOrAccessor(node, 32768, 41919);
+                    return declareSymbolAndAddToSymbolTable(node, 16384, 0);
                 case 151:
+                    return bindPropertyOrMethodOrAccessor(node, 32768, 41919);
+                case 152:
                     return bindPropertyOrMethodOrAccessor(node, 65536, 74687);
-                case 157:
                 case 158:
-                case 269:
+                case 159:
+                case 274:
                     return bindFunctionOrConstructorType(node);
-                case 160:
-                case 281:
-                case 265:
+                case 161:
+                case 170:
+                case 286:
+                case 270:
                     return bindAnonymousDeclaration(node, 2048, "__type");
-                case 172:
+                case 176:
                     return bindObjectLiteralExpression(node);
-                case 180:
-                case 181:
+                case 184:
+                case 185:
                     return bindFunctionExpression(node);
-                case 175:
+                case 179:
                     if (ts.isInJavaScriptFile(node)) {
                         bindCallExpression(node);
                     }
                     break;
-                case 193:
-                case 222:
+                case 197:
+                case 226:
                     inStrictMode = true;
                     return bindClassLikeDeclaration(node);
-                case 223:
+                case 227:
                     return bindBlockScopedDeclaration(node, 64, 792968);
-                case 279:
-                case 224:
+                case 284:
+                    if (!node.fullName || node.fullName.kind === 70) {
+                        return bindBlockScopedDeclaration(node, 524288, 793064);
+                    }
+                    break;
+                case 228:
                     return bindBlockScopedDeclaration(node, 524288, 793064);
-                case 225:
-                    return bindEnumDeclaration(node);
-                case 226:
-                    return bindModuleDeclaration(node);
-                case 230:
-                case 233:
-                case 235:
-                case 239:
-                    return declareSymbolAndAddToSymbolTable(node, 8388608, 8388608);
                 case 229:
-                    return bindNamespaceExportDeclaration(node);
-                case 232:
-                    return bindImportClause(node);
+                    return bindEnumDeclaration(node);
+                case 230:
+                    return bindModuleDeclaration(node);
+                case 234:
                 case 237:
-                    return bindExportDeclaration(node);
+                case 239:
+                case 243:
+                    return declareSymbolAndAddToSymbolTable(node, 8388608, 8388608);
+                case 233:
+                    return bindNamespaceExportDeclaration(node);
                 case 236:
+                    return bindImportClause(node);
+                case 241:
+                    return bindExportDeclaration(node);
+                case 240:
                     return bindExportAssignment(node);
-                case 256:
+                case 261:
                     updateStrictModeStatementList(node.statements);
                     return bindSourceFileIfExternalModule();
-                case 200:
+                case 204:
                     if (!ts.isFunctionLike(node.parent)) {
                         return;
                     }
-                case 227:
+                case 231:
                     return updateStrictModeStatementList(node.statements);
             }
         }
@@ -18619,7 +20014,7 @@ var ts;
             if (parameterName && parameterName.kind === 70) {
                 checkStrictModeIdentifier(parameterName);
             }
-            if (parameterName && parameterName.kind === 166) {
+            if (parameterName && parameterName.kind === 167) {
                 seenThisKeyword = true;
             }
             bind(type);
@@ -18638,7 +20033,7 @@ var ts;
                 bindAnonymousDeclaration(node, 8388608, getDeclarationName(node));
             }
             else {
-                var flags = node.kind === 236 && ts.exportAssignmentIsAlias(node)
+                var flags = node.kind === 240 && ts.exportAssignmentIsAlias(node)
                     ? 8388608
                     : 4;
                 declareSymbol(container.symbol.exports, container.symbol, node, flags, 4 | 8388608 | 32 | 16);
@@ -18648,17 +20043,17 @@ var ts;
             if (node.modifiers && node.modifiers.length) {
                 file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Modifiers_cannot_appear_here));
             }
-            if (node.parent.kind !== 256) {
+            if (node.parent.kind !== 261) {
                 file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Global_module_exports_may_only_appear_at_top_level));
                 return;
             }
             else {
-                var parent_7 = node.parent;
-                if (!ts.isExternalModule(parent_7)) {
+                var parent_5 = node.parent;
+                if (!ts.isExternalModule(parent_5)) {
                     file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Global_module_exports_may_only_appear_in_module_files));
                     return;
                 }
-                if (!parent_7.isDeclarationFile) {
+                if (!parent_5.isDeclarationFile) {
                     file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Global_module_exports_may_only_appear_in_declaration_files));
                     return;
                 }
@@ -18697,11 +20092,11 @@ var ts;
         }
         function bindThisPropertyAssignment(node) {
             ts.Debug.assert(ts.isInJavaScriptFile(node));
-            if (container.kind === 221 || container.kind === 180) {
+            if (container.kind === 225 || container.kind === 184) {
                 container.symbol.members = container.symbol.members || ts.createMap();
                 declareSymbol(container.symbol.members, container.symbol, node, 4, 0 & ~4);
             }
-            else if (container.kind === 149) {
+            else if (container.kind === 150) {
                 var saveContainer = container;
                 container = container.parent;
                 var symbol = bindPropertyOrMethodOrAccessor(node, 4, 0);
@@ -18741,7 +20136,7 @@ var ts;
                     emitFlags |= 2048;
                 }
             }
-            if (node.kind === 222) {
+            if (node.kind === 226) {
                 bindBlockScopedDeclaration(node, 32, 899519);
             }
             else {
@@ -18859,15 +20254,15 @@ var ts;
                 return false;
             }
             if (currentFlow === unreachableFlow) {
-                var reportError = (ts.isStatementButNotDeclaration(node) && node.kind !== 202) ||
-                    node.kind === 222 ||
-                    (node.kind === 226 && shouldReportErrorOnModuleDeclaration(node)) ||
-                    (node.kind === 225 && (!ts.isConstEnumDeclaration(node) || options.preserveConstEnums));
+                var reportError = (ts.isStatementButNotDeclaration(node) && node.kind !== 206) ||
+                    node.kind === 226 ||
+                    (node.kind === 230 && shouldReportErrorOnModuleDeclaration(node)) ||
+                    (node.kind === 229 && (!ts.isConstEnumDeclaration(node) || options.preserveConstEnums));
                 if (reportError) {
                     currentFlow = reportedUnreachableFlow;
                     var reportUnreachableCode = !options.allowUnreachableCode &&
                         !ts.isInAmbientContext(node) &&
-                        (node.kind !== 201 ||
+                        (node.kind !== 205 ||
                             ts.getCombinedNodeFlags(node.declarationList) & 3 ||
                             ts.forEach(node.declarationList.declarations, function (d) { return d.initializer; }));
                     if (reportUnreachableCode) {
@@ -18881,54 +20276,56 @@ var ts;
     function computeTransformFlagsForNode(node, subtreeFlags) {
         var kind = node.kind;
         switch (kind) {
-            case 175:
-                return computeCallExpression(node, subtreeFlags);
-            case 176:
-                return computeNewExpression(node, subtreeFlags);
-            case 226:
-                return computeModuleDeclaration(node, subtreeFlags);
             case 179:
-                return computeParenthesizedExpression(node, subtreeFlags);
-            case 188:
-                return computeBinaryExpression(node, subtreeFlags);
-            case 203:
-                return computeExpressionStatement(node, subtreeFlags);
-            case 143:
-                return computeParameter(node, subtreeFlags);
-            case 181:
-                return computeArrowFunction(node, subtreeFlags);
+                return computeCallExpression(node, subtreeFlags);
             case 180:
-                return computeFunctionExpression(node, subtreeFlags);
-            case 221:
-                return computeFunctionDeclaration(node, subtreeFlags);
-            case 219:
-                return computeVariableDeclaration(node, subtreeFlags);
-            case 220:
-                return computeVariableDeclarationList(node, subtreeFlags);
-            case 201:
-                return computeVariableStatement(node, subtreeFlags);
-            case 215:
-                return computeLabeledStatement(node, subtreeFlags);
-            case 222:
-                return computeClassDeclaration(node, subtreeFlags);
-            case 193:
-                return computeClassExpression(node, subtreeFlags);
-            case 251:
-                return computeHeritageClause(node, subtreeFlags);
-            case 195:
-                return computeExpressionWithTypeArguments(node, subtreeFlags);
-            case 149:
-                return computeConstructor(node, subtreeFlags);
-            case 146:
-                return computePropertyDeclaration(node, subtreeFlags);
-            case 148:
-                return computeMethod(node, subtreeFlags);
-            case 150:
-            case 151:
-                return computeAccessor(node, subtreeFlags);
+                return computeNewExpression(node, subtreeFlags);
             case 230:
+                return computeModuleDeclaration(node, subtreeFlags);
+            case 183:
+                return computeParenthesizedExpression(node, subtreeFlags);
+            case 192:
+                return computeBinaryExpression(node, subtreeFlags);
+            case 207:
+                return computeExpressionStatement(node, subtreeFlags);
+            case 144:
+                return computeParameter(node, subtreeFlags);
+            case 185:
+                return computeArrowFunction(node, subtreeFlags);
+            case 184:
+                return computeFunctionExpression(node, subtreeFlags);
+            case 225:
+                return computeFunctionDeclaration(node, subtreeFlags);
+            case 223:
+                return computeVariableDeclaration(node, subtreeFlags);
+            case 224:
+                return computeVariableDeclarationList(node, subtreeFlags);
+            case 205:
+                return computeVariableStatement(node, subtreeFlags);
+            case 219:
+                return computeLabeledStatement(node, subtreeFlags);
+            case 226:
+                return computeClassDeclaration(node, subtreeFlags);
+            case 197:
+                return computeClassExpression(node, subtreeFlags);
+            case 255:
+                return computeHeritageClause(node, subtreeFlags);
+            case 256:
+                return computeCatchClause(node, subtreeFlags);
+            case 199:
+                return computeExpressionWithTypeArguments(node, subtreeFlags);
+            case 150:
+                return computeConstructor(node, subtreeFlags);
+            case 147:
+                return computePropertyDeclaration(node, subtreeFlags);
+            case 149:
+                return computeMethod(node, subtreeFlags);
+            case 151:
+            case 152:
+                return computeAccessor(node, subtreeFlags);
+            case 234:
                 return computeImportEquals(node, subtreeFlags);
-            case 173:
+            case 177:
                 return computePropertyAccess(node, subtreeFlags);
             default:
                 return computeOther(node, kind, subtreeFlags);
@@ -18942,19 +20339,19 @@ var ts;
         if (node.typeArguments) {
             transformFlags |= 3;
         }
-        if (subtreeFlags & 1048576
+        if (subtreeFlags & 8388608
             || isSuperOrSuperProperty(expression, expressionKind)) {
-            transformFlags |= 768;
+            transformFlags |= 3072;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~537922901;
+        return transformFlags & ~545281365;
     }
     function isSuperOrSuperProperty(node, kind) {
         switch (kind) {
             case 96:
                 return true;
-            case 173:
-            case 174:
+            case 177:
+            case 178:
                 var expression = node.expression;
                 var expressionKind = expression.kind;
                 return expressionKind === 96;
@@ -18966,27 +20363,28 @@ var ts;
         if (node.typeArguments) {
             transformFlags |= 3;
         }
-        if (subtreeFlags & 1048576) {
-            transformFlags |= 768;
+        if (subtreeFlags & 8388608) {
+            transformFlags |= 3072;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~537922901;
+        return transformFlags & ~545281365;
     }
     function computeBinaryExpression(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         var operatorTokenKind = node.operatorToken.kind;
         var leftKind = node.left.kind;
-        if (operatorTokenKind === 57
-            && (leftKind === 172
-                || leftKind === 171)) {
-            transformFlags |= 768 | 1024;
+        if (operatorTokenKind === 57 && leftKind === 176) {
+            transformFlags |= 48 | 3072 | 49152;
+        }
+        else if (operatorTokenKind === 57 && leftKind === 175) {
+            transformFlags |= 3072 | 49152;
         }
         else if (operatorTokenKind === 39
             || operatorTokenKind === 61) {
-            transformFlags |= 192;
+            transformFlags |= 768;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~536874325;
+        return transformFlags & ~536892757;
     }
     function computeParameter(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
@@ -18996,33 +20394,36 @@ var ts;
         var dotDotDotToken = node.dotDotDotToken;
         if (node.questionToken
             || node.type
-            || subtreeFlags & 8192
+            || subtreeFlags & 65536
             || ts.isThisIdentifier(name)) {
             transformFlags |= 3;
         }
         if (modifierFlags & 92) {
-            transformFlags |= 3 | 524288;
+            transformFlags |= 3 | 4194304;
         }
-        if (subtreeFlags & 8388608 || initializer || dotDotDotToken) {
-            transformFlags |= 768 | 262144;
+        if (subtreeFlags & 8388608) {
+            transformFlags |= 48;
+        }
+        if (subtreeFlags & 67108864 || initializer || dotDotDotToken) {
+            transformFlags |= 3072 | 2097152;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~545262933;
+        return transformFlags & ~604001621;
     }
     function computeParenthesizedExpression(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         var expression = node.expression;
         var expressionKind = expression.kind;
         var expressionTransformFlags = expression.transformFlags;
-        if (expressionKind === 196
-            || expressionKind === 178) {
+        if (expressionKind === 200
+            || expressionKind === 182) {
             transformFlags |= 3;
         }
-        if (expressionTransformFlags & 1024) {
-            transformFlags |= 1024;
+        if (expressionTransformFlags & 16384) {
+            transformFlags |= 16384;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~536874325;
+        return transformFlags & ~536892757;
     }
     function computeClassDeclaration(node, subtreeFlags) {
         var transformFlags;
@@ -19031,36 +20432,35 @@ var ts;
             transformFlags = 3;
         }
         else {
-            transformFlags = subtreeFlags | 768;
-            if ((subtreeFlags & 548864)
-                || (modifierFlags & 1)
+            transformFlags = subtreeFlags | 3072;
+            if ((subtreeFlags & 4390912)
                 || node.typeParameters) {
                 transformFlags |= 3;
             }
-            if (subtreeFlags & 131072) {
-                transformFlags |= 32768;
+            if (subtreeFlags & 1048576) {
+                transformFlags |= 262144;
             }
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~539749717;
+        return transformFlags & ~559895893;
     }
     function computeClassExpression(node, subtreeFlags) {
-        var transformFlags = subtreeFlags | 768;
-        if (subtreeFlags & 548864
+        var transformFlags = subtreeFlags | 3072;
+        if (subtreeFlags & 4390912
             || node.typeParameters) {
             transformFlags |= 3;
         }
-        if (subtreeFlags & 131072) {
-            transformFlags |= 32768;
+        if (subtreeFlags & 1048576) {
+            transformFlags |= 262144;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~539749717;
+        return transformFlags & ~559895893;
     }
     function computeHeritageClause(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         switch (node.token) {
             case 84:
-                transformFlags |= 768;
+                transformFlags |= 3072;
                 break;
             case 107:
                 transformFlags |= 3;
@@ -19070,15 +20470,23 @@ var ts;
                 break;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~536874325;
+        return transformFlags & ~536892757;
+    }
+    function computeCatchClause(node, subtreeFlags) {
+        var transformFlags = subtreeFlags;
+        if (node.variableDeclaration && ts.isBindingPattern(node.variableDeclaration.name)) {
+            transformFlags |= 3072;
+        }
+        node.transformFlags = transformFlags | 536870912;
+        return transformFlags & ~536892757;
     }
     function computeExpressionWithTypeArguments(node, subtreeFlags) {
-        var transformFlags = subtreeFlags | 768;
+        var transformFlags = subtreeFlags | 3072;
         if (node.typeArguments) {
             transformFlags |= 3;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~536874325;
+        return transformFlags & ~536892757;
     }
     function computeConstructor(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
@@ -19087,10 +20495,10 @@ var ts;
             transformFlags |= 3;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~591760725;
+        return transformFlags & ~975983957;
     }
     function computeMethod(node, subtreeFlags) {
-        var transformFlags = subtreeFlags | 768;
+        var transformFlags = subtreeFlags | 3072;
         if (node.decorators
             || ts.hasModifier(node, 2270)
             || node.typeParameters
@@ -19099,13 +20507,13 @@ var ts;
             transformFlags |= 3;
         }
         if (ts.hasModifier(node, 256)) {
-            transformFlags |= 48;
+            transformFlags |= 192;
         }
         if (node.asteriskToken && ts.getEmitFlags(node) & 2097152) {
-            transformFlags |= 6144;
+            transformFlags |= 12288;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~591760725;
+        return transformFlags & ~975983957;
     }
     function computeAccessor(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
@@ -19116,15 +20524,15 @@ var ts;
             transformFlags |= 3;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~591760725;
+        return transformFlags & ~975983957;
     }
     function computePropertyDeclaration(node, subtreeFlags) {
         var transformFlags = subtreeFlags | 3;
         if (node.initializer) {
-            transformFlags |= 16384;
+            transformFlags |= 131072;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~536874325;
+        return transformFlags & ~536892757;
     }
     function computeFunctionDeclaration(node, subtreeFlags) {
         var transformFlags;
@@ -19134,27 +20542,27 @@ var ts;
             transformFlags = 3;
         }
         else {
-            transformFlags = subtreeFlags | 33554432;
-            if (modifierFlags & 1) {
-                transformFlags |= 3 | 768;
-            }
+            transformFlags = subtreeFlags | 268435456;
             if (modifierFlags & 2270
                 || node.typeParameters
                 || node.type) {
                 transformFlags |= 3;
             }
             if (modifierFlags & 256) {
+                transformFlags |= 192;
+            }
+            if (subtreeFlags & 8388608) {
                 transformFlags |= 48;
             }
-            if (subtreeFlags & 327680) {
-                transformFlags |= 768;
+            if (subtreeFlags & 2621440) {
+                transformFlags |= 3072;
             }
             if (node.asteriskToken && ts.getEmitFlags(node) & 2097152) {
-                transformFlags |= 6144;
+                transformFlags |= 12288;
             }
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~592293205;
+        return transformFlags & ~980243797;
     }
     function computeFunctionExpression(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
@@ -19164,54 +20572,63 @@ var ts;
             transformFlags |= 3;
         }
         if (ts.hasModifier(node, 256)) {
+            transformFlags |= 192;
+        }
+        if (subtreeFlags & 8388608) {
             transformFlags |= 48;
         }
-        if (subtreeFlags & 327680) {
-            transformFlags |= 768;
+        if (subtreeFlags & 2621440) {
+            transformFlags |= 3072;
         }
         if (node.asteriskToken && ts.getEmitFlags(node) & 2097152) {
-            transformFlags |= 6144;
+            transformFlags |= 12288;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~592293205;
+        return transformFlags & ~980243797;
     }
     function computeArrowFunction(node, subtreeFlags) {
-        var transformFlags = subtreeFlags | 768;
+        var transformFlags = subtreeFlags | 3072;
         if (ts.hasModifier(node, 2270)
             || node.typeParameters
             || node.type) {
             transformFlags |= 3;
         }
         if (ts.hasModifier(node, 256)) {
+            transformFlags |= 192;
+        }
+        if (subtreeFlags & 8388608) {
             transformFlags |= 48;
         }
-        if (subtreeFlags & 32768) {
-            transformFlags |= 65536;
+        if (subtreeFlags & 262144) {
+            transformFlags |= 524288;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~592227669;
+        return transformFlags & ~979719509;
     }
     function computePropertyAccess(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         var expression = node.expression;
         var expressionKind = expression.kind;
         if (expressionKind === 96) {
-            transformFlags |= 32768;
+            transformFlags |= 262144;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~536874325;
+        return transformFlags & ~536892757;
     }
     function computeVariableDeclaration(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         var nameKind = node.name.kind;
-        if (nameKind === 168 || nameKind === 169) {
-            transformFlags |= 768 | 8388608;
+        if (nameKind === 172) {
+            transformFlags |= 48 | 3072 | 67108864;
+        }
+        else if (nameKind === 173) {
+            transformFlags |= 3072 | 67108864;
         }
         if (node.type) {
             transformFlags |= 3;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~536874325;
+        return transformFlags & ~536892757;
     }
     function computeVariableStatement(node, subtreeFlags) {
         var transformFlags;
@@ -19222,24 +20639,21 @@ var ts;
         }
         else {
             transformFlags = subtreeFlags;
-            if (modifierFlags & 1) {
-                transformFlags |= 768 | 3;
-            }
-            if (declarationListTransformFlags & 8388608) {
-                transformFlags |= 768;
+            if (declarationListTransformFlags & 67108864) {
+                transformFlags |= 3072;
             }
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~536874325;
+        return transformFlags & ~536892757;
     }
     function computeLabeledStatement(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
-        if (subtreeFlags & 4194304
+        if (subtreeFlags & 33554432
             && ts.isIterationStatement(node, true)) {
-            transformFlags |= 768;
+            transformFlags |= 3072;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~536874325;
+        return transformFlags & ~536892757;
     }
     function computeImportEquals(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
@@ -19247,15 +20661,15 @@ var ts;
             transformFlags |= 3;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~536874325;
+        return transformFlags & ~536892757;
     }
     function computeExpressionStatement(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
-        if (node.expression.transformFlags & 1024) {
-            transformFlags |= 768;
+        if (node.expression.transformFlags & 16384) {
+            transformFlags |= 3072;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~536874325;
+        return transformFlags & ~536892757;
     }
     function computeModuleDeclaration(node, subtreeFlags) {
         var transformFlags = 3;
@@ -19264,26 +20678,26 @@ var ts;
             transformFlags |= subtreeFlags;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~574729557;
+        return transformFlags & ~839734613;
     }
     function computeVariableDeclarationList(node, subtreeFlags) {
-        var transformFlags = subtreeFlags | 33554432;
-        if (subtreeFlags & 8388608) {
-            transformFlags |= 768;
+        var transformFlags = subtreeFlags | 268435456;
+        if (subtreeFlags & 67108864) {
+            transformFlags |= 3072;
         }
         if (node.flags & 3) {
-            transformFlags |= 768 | 4194304;
+            transformFlags |= 3072 | 33554432;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~545262933;
+        return transformFlags & ~604001621;
     }
     function computeOther(node, kind, subtreeFlags) {
         var transformFlags = subtreeFlags;
-        var excludeFlags = 536874325;
+        var excludeFlags = 536892757;
         switch (kind) {
             case 119:
-            case 185:
-                transformFlags |= 48;
+            case 189:
+                transformFlags |= 192;
                 break;
             case 113:
             case 111:
@@ -19291,52 +20705,49 @@ var ts;
             case 116:
             case 123:
             case 75:
-            case 225:
-            case 255:
-            case 178:
-            case 196:
-            case 197:
-            case 129:
+            case 229:
+            case 260:
+            case 182:
+            case 200:
+            case 201:
+            case 130:
                 transformFlags |= 3;
                 break;
-            case 242:
-            case 243:
-            case 244:
-            case 10:
-            case 245:
             case 246:
             case 247:
             case 248:
+            case 10:
+            case 249:
+            case 250:
+            case 251:
+            case 252:
                 transformFlags |= 12;
                 break;
-            case 83:
-                transformFlags |= 768 | 3;
-                break;
-            case 78:
+            case 213:
+                transformFlags |= 48;
             case 12:
             case 13:
             case 14:
             case 15:
-            case 190:
-            case 177:
-            case 254:
-            case 209:
-                transformFlags |= 768;
+            case 194:
+            case 181:
+            case 258:
+            case 114:
+                transformFlags |= 3072;
                 break;
-            case 191:
-                transformFlags |= 768 | 16777216;
+            case 195:
+                transformFlags |= 3072 | 134217728;
                 break;
             case 118:
-            case 131:
-            case 128:
-            case 133:
-            case 121:
+            case 132:
+            case 129:
             case 134:
+            case 121:
+            case 135:
             case 104:
-            case 142:
-            case 145:
-            case 147:
-            case 152:
+            case 143:
+            case 146:
+            case 148:
             case 153:
             case 154:
             case 155:
@@ -19350,73 +20761,142 @@ var ts;
             case 163:
             case 164:
             case 165:
-            case 223:
-            case 224:
             case 166:
+            case 227:
+            case 228:
             case 167:
+            case 168:
+            case 169:
+            case 170:
+            case 171:
                 transformFlags = 3;
                 excludeFlags = -3;
                 break;
-            case 141:
-                transformFlags |= 2097152;
-                if (subtreeFlags & 32768) {
-                    transformFlags |= 131072;
+            case 142:
+                transformFlags |= 16777216;
+                if (subtreeFlags & 262144) {
+                    transformFlags |= 1048576;
                 }
                 break;
-            case 192:
-                transformFlags |= 1048576;
+            case 196:
+            case 259:
+                transformFlags |= 8388608;
                 break;
+            case 174:
+                if (node.dotDotDotToken) {
+                    transformFlags |= 8388608;
+                }
             case 96:
-                transformFlags |= 768;
+                transformFlags |= 3072;
                 break;
             case 98:
-                transformFlags |= 32768;
-                break;
-            case 168:
-            case 169:
-                transformFlags |= 768 | 8388608;
-                break;
-            case 144:
-                transformFlags |= 3 | 8192;
+                transformFlags |= 262144;
                 break;
             case 172:
-                excludeFlags = 539110741;
-                if (subtreeFlags & 2097152) {
-                    transformFlags |= 768;
+            case 173:
+                if (subtreeFlags & 8388608) {
+                    transformFlags |= 48 | 67108864;
                 }
-                if (subtreeFlags & 131072) {
-                    transformFlags |= 32768;
+                else {
+                    transformFlags |= 3072 | 67108864;
                 }
                 break;
-            case 171:
+            case 145:
+                transformFlags |= 3 | 65536;
+                break;
             case 176:
-                excludeFlags = 537922901;
+                excludeFlags = 554784085;
+                if (subtreeFlags & 16777216) {
+                    transformFlags |= 3072;
+                }
                 if (subtreeFlags & 1048576) {
-                    transformFlags |= 768;
+                    transformFlags |= 262144;
+                }
+                if (subtreeFlags & 8388608) {
+                    transformFlags |= 48;
                 }
                 break;
-            case 205:
-            case 206:
-            case 207:
-            case 208:
-                if (subtreeFlags & 4194304) {
-                    transformFlags |= 768;
+            case 175:
+            case 180:
+                excludeFlags = 545281365;
+                if (subtreeFlags & 8388608) {
+                    transformFlags |= 3072;
                 }
                 break;
-            case 256:
-                if (subtreeFlags & 65536) {
-                    transformFlags |= 768;
-                }
-                break;
-            case 212:
+            case 209:
             case 210:
             case 211:
-                transformFlags |= 33554432;
+            case 212:
+                if (subtreeFlags & 33554432) {
+                    transformFlags |= 3072;
+                }
+                break;
+            case 261:
+                if (subtreeFlags & 524288) {
+                    transformFlags |= 3072;
+                }
+                break;
+            case 216:
+            case 214:
+            case 215:
+                transformFlags |= 268435456;
                 break;
         }
         node.transformFlags = transformFlags | 536870912;
         return transformFlags & ~excludeFlags;
     }
+    function getTransformFlagsSubtreeExclusions(kind) {
+        if (kind >= 156 && kind <= 171) {
+            return -3;
+        }
+        switch (kind) {
+            case 179:
+            case 180:
+            case 175:
+                return 545281365;
+            case 230:
+                return 839734613;
+            case 144:
+                return 604001621;
+            case 185:
+                return 979719509;
+            case 184:
+            case 225:
+                return 980243797;
+            case 224:
+                return 604001621;
+            case 226:
+            case 197:
+                return 559895893;
+            case 150:
+                return 975983957;
+            case 149:
+            case 151:
+            case 152:
+                return 975983957;
+            case 118:
+            case 132:
+            case 129:
+            case 134:
+            case 121:
+            case 135:
+            case 104:
+            case 143:
+            case 146:
+            case 148:
+            case 153:
+            case 154:
+            case 155:
+            case 227:
+            case 228:
+                return -3;
+            case 176:
+                return 554784085;
+            default:
+                return 536892757;
+        }
+    }
+    ts.getTransformFlagsSubtreeExclusions = getTransformFlagsSubtreeExclusions;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -19504,7 +20984,10 @@ var ts;
             getAmbientModules: getAmbientModules,
             getJsxElementAttributesType: getJsxElementAttributesType,
             getJsxIntrinsicTagNames: getJsxIntrinsicTagNames,
-            isOptionalParameter: isOptionalParameter
+            isOptionalParameter: isOptionalParameter,
+            tryFindAmbientModuleWithoutAugmentations: function (moduleName) {
+                return tryFindAmbientModule(moduleName, false);
+            }
         };
         var tupleTypes = [];
         var unionTypes = ts.createMap();
@@ -19518,9 +21001,9 @@ var ts;
         var autoType = createIntrinsicType(1, "any");
         var unknownType = createIntrinsicType(1, "unknown");
         var undefinedType = createIntrinsicType(2048, "undefined");
-        var undefinedWideningType = strictNullChecks ? undefinedType : createIntrinsicType(2048 | 33554432, "undefined");
+        var undefinedWideningType = strictNullChecks ? undefinedType : createIntrinsicType(2048 | 2097152, "undefined");
         var nullType = createIntrinsicType(4096, "null");
-        var nullWideningType = strictNullChecks ? nullType : createIntrinsicType(4096 | 33554432, "null");
+        var nullWideningType = strictNullChecks ? nullType : createIntrinsicType(4096 | 2097152, "null");
         var stringType = createIntrinsicType(2, "string");
         var numberType = createIntrinsicType(4, "number");
         var trueType = createIntrinsicType(128, "true");
@@ -19530,11 +21013,15 @@ var ts;
         var voidType = createIntrinsicType(1024, "void");
         var neverType = createIntrinsicType(8192, "never");
         var silentNeverType = createIntrinsicType(8192, "never");
+        var stringOrNumberType = getUnionType([stringType, numberType]);
         var emptyObjectType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
+        var emptyTypeLiteralSymbol = createSymbol(2048 | 67108864, "__type");
+        emptyTypeLiteralSymbol.members = ts.createMap();
+        var emptyTypeLiteralType = createAnonymousType(emptyTypeLiteralSymbol, emptySymbols, emptyArray, emptyArray, undefined, undefined);
         var emptyGenericType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
         emptyGenericType.instantiations = ts.createMap();
         var anyFunctionType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
-        anyFunctionType.flags |= 134217728;
+        anyFunctionType.flags |= 8388608;
         var noConstraintType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
         var anySignature = createSignature(undefined, undefined, undefined, emptyArray, anyType, undefined, 0, false, false);
         var unknownSignature = createSignature(undefined, undefined, undefined, emptyArray, unknownType, undefined, 0, false, false);
@@ -19596,66 +21083,6 @@ var ts;
         var potentialThisCollisions = [];
         var awaitedTypeStack = [];
         var diagnostics = ts.createDiagnosticCollection();
-        var TypeFacts;
-        (function (TypeFacts) {
-            TypeFacts[TypeFacts["None"] = 0] = "None";
-            TypeFacts[TypeFacts["TypeofEQString"] = 1] = "TypeofEQString";
-            TypeFacts[TypeFacts["TypeofEQNumber"] = 2] = "TypeofEQNumber";
-            TypeFacts[TypeFacts["TypeofEQBoolean"] = 4] = "TypeofEQBoolean";
-            TypeFacts[TypeFacts["TypeofEQSymbol"] = 8] = "TypeofEQSymbol";
-            TypeFacts[TypeFacts["TypeofEQObject"] = 16] = "TypeofEQObject";
-            TypeFacts[TypeFacts["TypeofEQFunction"] = 32] = "TypeofEQFunction";
-            TypeFacts[TypeFacts["TypeofEQHostObject"] = 64] = "TypeofEQHostObject";
-            TypeFacts[TypeFacts["TypeofNEString"] = 128] = "TypeofNEString";
-            TypeFacts[TypeFacts["TypeofNENumber"] = 256] = "TypeofNENumber";
-            TypeFacts[TypeFacts["TypeofNEBoolean"] = 512] = "TypeofNEBoolean";
-            TypeFacts[TypeFacts["TypeofNESymbol"] = 1024] = "TypeofNESymbol";
-            TypeFacts[TypeFacts["TypeofNEObject"] = 2048] = "TypeofNEObject";
-            TypeFacts[TypeFacts["TypeofNEFunction"] = 4096] = "TypeofNEFunction";
-            TypeFacts[TypeFacts["TypeofNEHostObject"] = 8192] = "TypeofNEHostObject";
-            TypeFacts[TypeFacts["EQUndefined"] = 16384] = "EQUndefined";
-            TypeFacts[TypeFacts["EQNull"] = 32768] = "EQNull";
-            TypeFacts[TypeFacts["EQUndefinedOrNull"] = 65536] = "EQUndefinedOrNull";
-            TypeFacts[TypeFacts["NEUndefined"] = 131072] = "NEUndefined";
-            TypeFacts[TypeFacts["NENull"] = 262144] = "NENull";
-            TypeFacts[TypeFacts["NEUndefinedOrNull"] = 524288] = "NEUndefinedOrNull";
-            TypeFacts[TypeFacts["Truthy"] = 1048576] = "Truthy";
-            TypeFacts[TypeFacts["Falsy"] = 2097152] = "Falsy";
-            TypeFacts[TypeFacts["Discriminatable"] = 4194304] = "Discriminatable";
-            TypeFacts[TypeFacts["All"] = 8388607] = "All";
-            TypeFacts[TypeFacts["BaseStringStrictFacts"] = 933633] = "BaseStringStrictFacts";
-            TypeFacts[TypeFacts["BaseStringFacts"] = 3145473] = "BaseStringFacts";
-            TypeFacts[TypeFacts["StringStrictFacts"] = 4079361] = "StringStrictFacts";
-            TypeFacts[TypeFacts["StringFacts"] = 4194049] = "StringFacts";
-            TypeFacts[TypeFacts["EmptyStringStrictFacts"] = 3030785] = "EmptyStringStrictFacts";
-            TypeFacts[TypeFacts["EmptyStringFacts"] = 3145473] = "EmptyStringFacts";
-            TypeFacts[TypeFacts["NonEmptyStringStrictFacts"] = 1982209] = "NonEmptyStringStrictFacts";
-            TypeFacts[TypeFacts["NonEmptyStringFacts"] = 4194049] = "NonEmptyStringFacts";
-            TypeFacts[TypeFacts["BaseNumberStrictFacts"] = 933506] = "BaseNumberStrictFacts";
-            TypeFacts[TypeFacts["BaseNumberFacts"] = 3145346] = "BaseNumberFacts";
-            TypeFacts[TypeFacts["NumberStrictFacts"] = 4079234] = "NumberStrictFacts";
-            TypeFacts[TypeFacts["NumberFacts"] = 4193922] = "NumberFacts";
-            TypeFacts[TypeFacts["ZeroStrictFacts"] = 3030658] = "ZeroStrictFacts";
-            TypeFacts[TypeFacts["ZeroFacts"] = 3145346] = "ZeroFacts";
-            TypeFacts[TypeFacts["NonZeroStrictFacts"] = 1982082] = "NonZeroStrictFacts";
-            TypeFacts[TypeFacts["NonZeroFacts"] = 4193922] = "NonZeroFacts";
-            TypeFacts[TypeFacts["BaseBooleanStrictFacts"] = 933252] = "BaseBooleanStrictFacts";
-            TypeFacts[TypeFacts["BaseBooleanFacts"] = 3145092] = "BaseBooleanFacts";
-            TypeFacts[TypeFacts["BooleanStrictFacts"] = 4078980] = "BooleanStrictFacts";
-            TypeFacts[TypeFacts["BooleanFacts"] = 4193668] = "BooleanFacts";
-            TypeFacts[TypeFacts["FalseStrictFacts"] = 3030404] = "FalseStrictFacts";
-            TypeFacts[TypeFacts["FalseFacts"] = 3145092] = "FalseFacts";
-            TypeFacts[TypeFacts["TrueStrictFacts"] = 1981828] = "TrueStrictFacts";
-            TypeFacts[TypeFacts["TrueFacts"] = 4193668] = "TrueFacts";
-            TypeFacts[TypeFacts["SymbolStrictFacts"] = 1981320] = "SymbolStrictFacts";
-            TypeFacts[TypeFacts["SymbolFacts"] = 4193160] = "SymbolFacts";
-            TypeFacts[TypeFacts["ObjectStrictFacts"] = 6166480] = "ObjectStrictFacts";
-            TypeFacts[TypeFacts["ObjectFacts"] = 8378320] = "ObjectFacts";
-            TypeFacts[TypeFacts["FunctionStrictFacts"] = 6164448] = "FunctionStrictFacts";
-            TypeFacts[TypeFacts["FunctionFacts"] = 8376288] = "FunctionFacts";
-            TypeFacts[TypeFacts["UndefinedFacts"] = 2457472] = "UndefinedFacts";
-            TypeFacts[TypeFacts["NullFacts"] = 2340752] = "NullFacts";
-        })(TypeFacts || (TypeFacts = {}));
         var typeofEQFacts = ts.createMap({
             "string": 1,
             "number": 2,
@@ -19682,6 +21109,8 @@ var ts;
             "undefined": undefinedType
         });
         var jsxElementType;
+        var _jsxNamespace;
+        var _jsxFactoryEntity;
         var jsxTypes = ts.createMap();
         var JsxNames = {
             JSX: "JSX",
@@ -19698,17 +21127,25 @@ var ts;
         var identityRelation = ts.createMap();
         var enumRelation = ts.createMap();
         var _displayBuilder;
-        var TypeSystemPropertyName;
-        (function (TypeSystemPropertyName) {
-            TypeSystemPropertyName[TypeSystemPropertyName["Type"] = 0] = "Type";
-            TypeSystemPropertyName[TypeSystemPropertyName["ResolvedBaseConstructorType"] = 1] = "ResolvedBaseConstructorType";
-            TypeSystemPropertyName[TypeSystemPropertyName["DeclaredType"] = 2] = "DeclaredType";
-            TypeSystemPropertyName[TypeSystemPropertyName["ResolvedReturnType"] = 3] = "ResolvedReturnType";
-        })(TypeSystemPropertyName || (TypeSystemPropertyName = {}));
         var builtinGlobals = ts.createMap();
         builtinGlobals[undefinedSymbol.name] = undefinedSymbol;
         initializeTypeChecker();
         return checker;
+        function getJsxNamespace() {
+            if (_jsxNamespace === undefined) {
+                _jsxNamespace = "React";
+                if (compilerOptions.jsxFactory) {
+                    _jsxFactoryEntity = ts.parseIsolatedEntityName(compilerOptions.jsxFactory, languageVersion);
+                    if (_jsxFactoryEntity) {
+                        _jsxNamespace = getFirstIdentifier(_jsxFactoryEntity).text;
+                    }
+                }
+                else if (compilerOptions.reactNamespace) {
+                    _jsxNamespace = compilerOptions.reactNamespace;
+                }
+            }
+            return _jsxNamespace;
+        }
         function getEmitResolver(sourceFile, cancellationToken) {
             getDiagnostics(sourceFile, cancellationToken);
             return emitResolver;
@@ -19789,7 +21226,7 @@ var ts;
                 target.flags |= source.flags;
                 if (source.valueDeclaration &&
                     (!target.valueDeclaration ||
-                        (target.valueDeclaration.kind === 226 && source.valueDeclaration.kind !== 226))) {
+                        (target.valueDeclaration.kind === 230 && source.valueDeclaration.kind !== 230))) {
                     target.valueDeclaration = source.valueDeclaration;
                 }
                 ts.forEach(source.declarations, function (node) {
@@ -19845,7 +21282,7 @@ var ts;
                 var moduleNotFoundError = !ts.isInAmbientContext(moduleName.parent.parent)
                     ? ts.Diagnostics.Invalid_module_name_in_augmentation_module_0_cannot_be_found
                     : undefined;
-                var mainModule = resolveExternalModuleNameWorker(moduleName, moduleName, moduleNotFoundError);
+                var mainModule = resolveExternalModuleNameWorker(moduleName, moduleName, moduleNotFoundError, true);
                 if (!mainModule) {
                     return;
                 }
@@ -19882,8 +21319,11 @@ var ts;
             var nodeId = getNodeId(node);
             return nodeLinks[nodeId] || (nodeLinks[nodeId] = { flags: 0 });
         }
+        function getObjectFlags(type) {
+            return type.flags & 32768 ? type.objectFlags : 0;
+        }
         function isGlobalSourceFile(node) {
-            return node.kind === 256 && !ts.isExternalOrCommonJsModule(node);
+            return node.kind === 261 && !ts.isExternalOrCommonJsModule(node);
         }
         function getSymbol(symbols, name, meaning) {
             if (meaning) {
@@ -19920,36 +21360,39 @@ var ts;
                     (!compilerOptions.outFile && !compilerOptions.out)) {
                     return true;
                 }
+                if (isUsedInFunctionOrNonStaticProperty(usage)) {
+                    return true;
+                }
                 var sourceFiles = host.getSourceFiles();
                 return ts.indexOf(sourceFiles, declarationFile) <= ts.indexOf(sourceFiles, useFile);
             }
             if (declaration.pos <= usage.pos) {
-                return declaration.kind !== 219 ||
+                return declaration.kind !== 223 ||
                     !isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage);
             }
-            return isUsedInFunctionOrNonStaticProperty(declaration, usage);
+            var container = ts.getEnclosingBlockScopeContainer(declaration);
+            return isUsedInFunctionOrNonStaticProperty(usage, container);
             function isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage) {
                 var container = ts.getEnclosingBlockScopeContainer(declaration);
                 switch (declaration.parent.parent.kind) {
-                    case 201:
-                    case 207:
-                    case 209:
+                    case 205:
+                    case 211:
+                    case 213:
                         if (isSameScopeDescendentOf(usage, declaration, container)) {
                             return true;
                         }
                         break;
                 }
                 switch (declaration.parent.parent.kind) {
-                    case 208:
-                    case 209:
+                    case 212:
+                    case 213:
                         if (isSameScopeDescendentOf(usage, declaration.parent.parent.expression, container)) {
                             return true;
                         }
                 }
                 return false;
             }
-            function isUsedInFunctionOrNonStaticProperty(declaration, usage) {
-                var container = ts.getEnclosingBlockScopeContainer(declaration);
+            function isUsedInFunctionOrNonStaticProperty(usage, container) {
                 var current = usage;
                 while (current) {
                     if (current === container) {
@@ -19959,7 +21402,7 @@ var ts;
                         return true;
                     }
                     var initializerOfNonStaticProperty = current.parent &&
-                        current.parent.kind === 146 &&
+                        current.parent.kind === 147 &&
                         (ts.getModifierFlags(current.parent) & 32) === 0 &&
                         current.parent.initializer === current;
                     if (initializerOfNonStaticProperty) {
@@ -19982,18 +21425,18 @@ var ts;
                     if (result = getSymbol(location.locals, name, meaning)) {
                         var useResult = true;
                         if (ts.isFunctionLike(location) && lastLocation && lastLocation !== location.body) {
-                            if (meaning & result.flags & 793064 && lastLocation.kind !== 273) {
+                            if (meaning & result.flags & 793064 && lastLocation.kind !== 278) {
                                 useResult = result.flags & 262144
                                     ? lastLocation === location.type ||
-                                        lastLocation.kind === 143 ||
-                                        lastLocation.kind === 142
+                                        lastLocation.kind === 144 ||
+                                        lastLocation.kind === 143
                                     : false;
                             }
                             if (meaning & 107455 && result.flags & 1) {
                                 useResult =
-                                    lastLocation.kind === 143 ||
+                                    lastLocation.kind === 144 ||
                                         (lastLocation === location.type &&
-                                            result.valueDeclaration.kind === 143);
+                                            result.valueDeclaration.kind === 144);
                             }
                         }
                         if (useResult) {
@@ -20005,13 +21448,13 @@ var ts;
                     }
                 }
                 switch (location.kind) {
-                    case 256:
+                    case 261:
                         if (!ts.isExternalOrCommonJsModule(location))
                             break;
                         isInExternalModule = true;
-                    case 226:
+                    case 230:
                         var moduleExports = getSymbolOfNode(location).exports;
-                        if (location.kind === 256 || ts.isAmbientModule(location)) {
+                        if (location.kind === 261 || ts.isAmbientModule(location)) {
                             if (result = moduleExports["default"]) {
                                 var localSymbol = ts.getLocalSymbolForExportDefault(result);
                                 if (localSymbol && (result.flags & meaning) && localSymbol.name === name) {
@@ -20021,7 +21464,7 @@ var ts;
                             }
                             if (moduleExports[name] &&
                                 moduleExports[name].flags === 8388608 &&
-                                ts.getDeclarationOfKind(moduleExports[name], 239)) {
+                                ts.getDeclarationOfKind(moduleExports[name], 243)) {
                                 break;
                             }
                         }
@@ -20029,13 +21472,13 @@ var ts;
                             break loop;
                         }
                         break;
-                    case 225:
+                    case 229:
                         if (result = getSymbol(getSymbolOfNode(location).exports, name, meaning & 8)) {
                             break loop;
                         }
                         break;
+                    case 147:
                     case 146:
-                    case 145:
                         if (ts.isClassLike(location.parent) && !(ts.getModifierFlags(location) & 32)) {
                             var ctor = findConstructorDeclaration(location.parent);
                             if (ctor && ctor.locals) {
@@ -20045,9 +21488,9 @@ var ts;
                             }
                         }
                         break;
-                    case 222:
-                    case 193:
-                    case 223:
+                    case 226:
+                    case 197:
+                    case 227:
                         if (result = getSymbol(getSymbolOfNode(location).members, name, meaning & 793064)) {
                             if (lastLocation && ts.getModifierFlags(lastLocation) & 32) {
                                 error(errorLocation, ts.Diagnostics.Static_members_cannot_reference_class_type_parameters);
@@ -20055,7 +21498,7 @@ var ts;
                             }
                             break loop;
                         }
-                        if (location.kind === 193 && meaning & 32) {
+                        if (location.kind === 197 && meaning & 32) {
                             var className = location.name;
                             if (className && name === className.text) {
                                 result = location.symbol;
@@ -20063,28 +21506,28 @@ var ts;
                             }
                         }
                         break;
-                    case 141:
+                    case 142:
                         grandparent = location.parent.parent;
-                        if (ts.isClassLike(grandparent) || grandparent.kind === 223) {
+                        if (ts.isClassLike(grandparent) || grandparent.kind === 227) {
                             if (result = getSymbol(getSymbolOfNode(grandparent).members, name, meaning & 793064)) {
                                 error(errorLocation, ts.Diagnostics.A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type);
                                 return undefined;
                             }
                         }
                         break;
-                    case 148:
-                    case 147:
                     case 149:
+                    case 148:
                     case 150:
                     case 151:
-                    case 221:
-                    case 181:
+                    case 152:
+                    case 225:
+                    case 185:
                         if (meaning & 3 && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
                         }
                         break;
-                    case 180:
+                    case 184:
                         if (meaning & 3 && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
@@ -20097,8 +21540,8 @@ var ts;
                             }
                         }
                         break;
-                    case 144:
-                        if (location.parent && location.parent.kind === 143) {
+                    case 145:
+                        if (location.parent && location.parent.kind === 144) {
                             location = location.parent;
                         }
                         if (location.parent && ts.isClassElement(location.parent)) {
@@ -20140,7 +21583,7 @@ var ts;
                 }
                 if (result && isInExternalModule && (meaning & 107455) === 107455) {
                     var decls = result.declarations;
-                    if (decls && decls.length === 1 && decls[0].kind === 229) {
+                    if (decls && decls.length === 1 && decls[0].kind === 233) {
                         error(errorLocation, ts.Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead, name);
                     }
                 }
@@ -20187,9 +21630,9 @@ var ts;
         function getEntityNameForExtendingInterface(node) {
             switch (node.kind) {
                 case 70:
-                case 173:
+                case 177:
                     return node.parent ? getEntityNameForExtendingInterface(node.parent) : undefined;
-                case 195:
+                case 199:
                     ts.Debug.assert(ts.isEntityNameExpression(node.expression));
                     return node.expression;
                 default:
@@ -20210,7 +21653,7 @@ var ts;
             ts.Debug.assert((result.flags & 2) !== 0);
             var declaration = ts.forEach(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) ? d : undefined; });
             ts.Debug.assert(declaration !== undefined, "Block-scoped variable declaration is undefined");
-            if (!ts.isInAmbientContext(declaration) && !isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 219), errorLocation)) {
+            if (!ts.isInAmbientContext(declaration) && !isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 223), errorLocation)) {
                 error(errorLocation, ts.Diagnostics.Block_scoped_variable_0_used_before_its_declaration, ts.declarationNameToString(declaration.name));
             }
         }
@@ -20227,10 +21670,10 @@ var ts;
         }
         function getAnyImportSyntax(node) {
             if (ts.isAliasSymbolDeclaration(node)) {
-                if (node.kind === 230) {
+                if (node.kind === 234) {
                     return node;
                 }
-                while (node && node.kind !== 231) {
+                while (node && node.kind !== 235) {
                     node = node.parent;
                 }
                 return node;
@@ -20240,7 +21683,7 @@ var ts;
             return ts.forEach(symbol.declarations, function (d) { return ts.isAliasSymbolDeclaration(d) ? d : undefined; });
         }
         function getTargetOfImportEqualsDeclaration(node) {
-            if (node.moduleReference.kind === 241) {
+            if (node.moduleReference.kind === 245) {
                 return resolveExternalModuleSymbol(resolveExternalModuleName(node, ts.getExternalModuleImportEqualsDeclarationExpression(node)));
             }
             return getSymbolOfPartOfRightHandSideOfImportEquals(node.moduleReference);
@@ -20301,28 +21744,28 @@ var ts;
             var moduleSymbol = resolveExternalModuleName(node, node.moduleSpecifier);
             var targetSymbol = resolveESModuleSymbol(moduleSymbol, node.moduleSpecifier);
             if (targetSymbol) {
-                var name_13 = specifier.propertyName || specifier.name;
-                if (name_13.text) {
+                var name_19 = specifier.propertyName || specifier.name;
+                if (name_19.text) {
                     if (ts.isShorthandAmbientModuleSymbol(moduleSymbol)) {
                         return moduleSymbol;
                     }
                     var symbolFromVariable = void 0;
                     if (moduleSymbol && moduleSymbol.exports && moduleSymbol.exports["export="]) {
-                        symbolFromVariable = getPropertyOfType(getTypeOfSymbol(targetSymbol), name_13.text);
+                        symbolFromVariable = getPropertyOfType(getTypeOfSymbol(targetSymbol), name_19.text);
                     }
                     else {
-                        symbolFromVariable = getPropertyOfVariable(targetSymbol, name_13.text);
+                        symbolFromVariable = getPropertyOfVariable(targetSymbol, name_19.text);
                     }
                     symbolFromVariable = resolveSymbol(symbolFromVariable);
-                    var symbolFromModule = getExportOfModule(targetSymbol, name_13.text);
-                    if (!symbolFromModule && allowSyntheticDefaultImports && name_13.text === "default") {
+                    var symbolFromModule = getExportOfModule(targetSymbol, name_19.text);
+                    if (!symbolFromModule && allowSyntheticDefaultImports && name_19.text === "default") {
                         symbolFromModule = resolveExternalModuleSymbol(moduleSymbol) || resolveSymbol(moduleSymbol);
                     }
                     var symbol = symbolFromModule && symbolFromVariable ?
                         combineValueAndTypeSymbols(symbolFromVariable, symbolFromModule) :
                         symbolFromModule || symbolFromVariable;
                     if (!symbol) {
-                        error(name_13, ts.Diagnostics.Module_0_has_no_exported_member_1, getFullyQualifiedName(moduleSymbol), ts.declarationNameToString(name_13));
+                        error(name_19, ts.Diagnostics.Module_0_has_no_exported_member_1, getFullyQualifiedName(moduleSymbol), ts.declarationNameToString(name_19));
                     }
                     return symbol;
                 }
@@ -20344,19 +21787,19 @@ var ts;
         }
         function getTargetOfAliasDeclaration(node) {
             switch (node.kind) {
-                case 230:
+                case 234:
                     return getTargetOfImportEqualsDeclaration(node);
-                case 232:
-                    return getTargetOfImportClause(node);
-                case 233:
-                    return getTargetOfNamespaceImport(node);
-                case 235:
-                    return getTargetOfImportSpecifier(node);
-                case 239:
-                    return getTargetOfExportSpecifier(node);
                 case 236:
+                    return getTargetOfImportClause(node);
+                case 237:
+                    return getTargetOfNamespaceImport(node);
+                case 239:
+                    return getTargetOfImportSpecifier(node);
+                case 243:
+                    return getTargetOfExportSpecifier(node);
+                case 240:
                     return getTargetOfExportAssignment(node);
-                case 229:
+                case 233:
                     return getTargetOfNamespaceExportDeclaration(node);
             }
         }
@@ -20400,10 +21843,10 @@ var ts;
                 links.referenced = true;
                 var node = getDeclarationOfAliasSymbol(symbol);
                 ts.Debug.assert(!!node);
-                if (node.kind === 236) {
+                if (node.kind === 240) {
                     checkExpressionCached(node.expression);
                 }
-                else if (node.kind === 239) {
+                else if (node.kind === 243) {
                     checkExpressionCached(node.propertyName || node.name);
                 }
                 else if (ts.isInternalModuleImportEqualsDeclaration(node)) {
@@ -20415,11 +21858,11 @@ var ts;
             if (entityName.kind === 70 && ts.isRightSideOfQualifiedNameOrPropertyAccess(entityName)) {
                 entityName = entityName.parent;
             }
-            if (entityName.kind === 70 || entityName.parent.kind === 140) {
+            if (entityName.kind === 70 || entityName.parent.kind === 141) {
                 return resolveEntityName(entityName, 1920, false, dontResolveAlias);
             }
             else {
-                ts.Debug.assert(entityName.parent.kind === 230);
+                ts.Debug.assert(entityName.parent.kind === 234);
                 return resolveEntityName(entityName, 107455 | 793064 | 1920, false, dontResolveAlias);
             }
         }
@@ -20438,9 +21881,9 @@ var ts;
                     return undefined;
                 }
             }
-            else if (name.kind === 140 || name.kind === 173) {
-                var left = name.kind === 140 ? name.left : name.expression;
-                var right = name.kind === 140 ? name.right : name.name;
+            else if (name.kind === 141 || name.kind === 177) {
+                var left = name.kind === 141 ? name.left : name.expression;
+                var right = name.kind === 141 ? name.right : name.name;
                 var namespace = resolveEntityName(left, 1920, ignoreErrors, false, location);
                 if (!namespace || ts.nodeIsMissing(right)) {
                     return undefined;
@@ -20465,27 +21908,28 @@ var ts;
         function resolveExternalModuleName(location, moduleReferenceExpression) {
             return resolveExternalModuleNameWorker(location, moduleReferenceExpression, ts.Diagnostics.Cannot_find_module_0);
         }
-        function resolveExternalModuleNameWorker(location, moduleReferenceExpression, moduleNotFoundError) {
+        function resolveExternalModuleNameWorker(location, moduleReferenceExpression, moduleNotFoundError, isForAugmentation) {
+            if (isForAugmentation === void 0) { isForAugmentation = false; }
             if (moduleReferenceExpression.kind !== 9) {
                 return;
             }
             var moduleReferenceLiteral = moduleReferenceExpression;
-            return resolveExternalModule(location, moduleReferenceLiteral.text, moduleNotFoundError, moduleReferenceLiteral);
+            return resolveExternalModule(location, moduleReferenceLiteral.text, moduleNotFoundError, moduleReferenceLiteral, isForAugmentation);
         }
-        function resolveExternalModule(location, moduleReference, moduleNotFoundError, errorNode) {
+        function resolveExternalModule(location, moduleReference, moduleNotFoundError, errorNode, isForAugmentation) {
+            if (isForAugmentation === void 0) { isForAugmentation = false; }
             var moduleName = ts.escapeIdentifier(moduleReference);
             if (moduleName === undefined) {
                 return;
             }
-            var isRelative = ts.isExternalModuleNameRelative(moduleName);
-            if (!isRelative) {
-                var symbol = getSymbol(globals, '"' + moduleName + '"', 512);
-                if (symbol) {
-                    return getMergedSymbol(symbol);
-                }
+            var ambientModule = tryFindAmbientModule(moduleName, true);
+            if (ambientModule) {
+                return ambientModule;
             }
+            var isRelative = ts.isExternalModuleNameRelative(moduleName);
             var resolvedModule = ts.getResolvedModule(ts.getSourceFileOfNode(location), moduleReference);
-            var sourceFile = resolvedModule && host.getSourceFile(resolvedModule.resolvedFileName);
+            var resolutionDiagnostic = resolvedModule && ts.getResolutionDiagnostic(compilerOptions, resolvedModule);
+            var sourceFile = resolvedModule && !resolutionDiagnostic && host.getSourceFile(resolvedModule.resolvedFileName);
             if (sourceFile) {
                 if (sourceFile.symbol) {
                     return getMergedSymbol(sourceFile.symbol);
@@ -20501,14 +21945,30 @@ var ts;
                     return getMergedSymbol(pattern.symbol);
                 }
             }
+            if (!isRelative && resolvedModule && !ts.extensionIsTypeScript(resolvedModule.extension)) {
+                if (isForAugmentation) {
+                    ts.Debug.assert(!!moduleNotFoundError);
+                    var diag = ts.Diagnostics.Invalid_module_name_in_augmentation_Module_0_resolves_to_an_untyped_module_at_1_which_cannot_be_augmented;
+                    error(errorNode, diag, moduleName, resolvedModule.resolvedFileName);
+                }
+                else if (compilerOptions.noImplicitAny && moduleNotFoundError) {
+                    error(errorNode, ts.Diagnostics.Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type, moduleReference, resolvedModule.resolvedFileName);
+                }
+                return undefined;
+            }
             if (moduleNotFoundError) {
-                var tsExtension = ts.tryExtractTypeScriptExtension(moduleName);
-                if (tsExtension) {
-                    var diag = ts.Diagnostics.An_import_path_cannot_end_with_a_0_extension_Consider_importing_1_instead;
-                    error(errorNode, diag, tsExtension, ts.removeExtension(moduleName, tsExtension));
+                if (resolutionDiagnostic) {
+                    error(errorNode, resolutionDiagnostic, moduleName, resolvedModule.resolvedFileName);
                 }
                 else {
-                    error(errorNode, moduleNotFoundError, moduleName);
+                    var tsExtension = ts.tryExtractTypeScriptExtension(moduleName);
+                    if (tsExtension) {
+                        var diag = ts.Diagnostics.An_import_path_cannot_end_with_a_0_extension_Consider_importing_1_instead;
+                        error(errorNode, diag, tsExtension, ts.removeExtension(moduleName, tsExtension));
+                    }
+                    else {
+                        error(errorNode, moduleNotFoundError, moduleName);
+                    }
                 }
             }
             return undefined;
@@ -20623,7 +22083,7 @@ var ts;
             var members = node.members;
             for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
                 var member = members_1[_i];
-                if (member.kind === 149 && ts.nodeIsPresent(member.body)) {
+                if (member.kind === 150 && ts.nodeIsPresent(member.body)) {
                     return member;
                 }
             }
@@ -20645,8 +22105,9 @@ var ts;
             type.intrinsicName = "boolean";
             return type;
         }
-        function createObjectType(kind, symbol) {
-            var type = createType(kind);
+        function createObjectType(objectFlags, symbol) {
+            var type = createType(32768);
+            type.objectFlags = objectFlags;
             type.symbol = symbol;
             return type;
         }
@@ -20670,7 +22131,7 @@ var ts;
             }
             return result || emptyArray;
         }
-        function setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
+        function setStructuredTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
             type.members = members;
             type.properties = getNamedMembers(members);
             type.callSignatures = callSignatures;
@@ -20682,7 +22143,7 @@ var ts;
             return type;
         }
         function createAnonymousType(symbol, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
-            return setObjectTypeMembers(createObjectType(2097152, symbol), members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+            return setStructuredTypeMembers(createObjectType(16, symbol), members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function forEachSymbolTableInScope(enclosingDeclaration, callback) {
             var result;
@@ -20693,11 +22154,11 @@ var ts;
                     }
                 }
                 switch (location_1.kind) {
-                    case 256:
+                    case 261:
                         if (!ts.isExternalOrCommonJsModule(location_1)) {
                             break;
                         }
-                    case 226:
+                    case 230:
                         if (result = callback(getSymbolOfNode(location_1).exports)) {
                             return result;
                         }
@@ -20730,7 +22191,7 @@ var ts;
                 return ts.forEachProperty(symbols, function (symbolFromSymbolTable) {
                     if (symbolFromSymbolTable.flags & 8388608
                         && symbolFromSymbolTable.name !== "export="
-                        && !ts.getDeclarationOfKind(symbolFromSymbolTable, 239)) {
+                        && !ts.getDeclarationOfKind(symbolFromSymbolTable, 243)) {
                         if (!useOnlyExternalAliasing ||
                             ts.forEach(symbolFromSymbolTable.declarations, ts.isExternalModuleImportEqualsDeclaration)) {
                             var resolvedImportedSymbol = resolveAlias(symbolFromSymbolTable);
@@ -20761,7 +22222,7 @@ var ts;
                 if (symbolFromSymbolTable === symbol) {
                     return true;
                 }
-                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 8388608 && !ts.getDeclarationOfKind(symbolFromSymbolTable, 239)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
+                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 8388608 && !ts.getDeclarationOfKind(symbolFromSymbolTable, 243)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
                 if (symbolFromSymbolTable.flags & meaning) {
                     qualify = true;
                     return true;
@@ -20775,10 +22236,10 @@ var ts;
                 for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
                     switch (declaration.kind) {
-                        case 146:
-                        case 148:
-                        case 150:
+                        case 147:
+                        case 149:
                         case 151:
+                        case 152:
                             continue;
                         default:
                             return false;
@@ -20834,7 +22295,7 @@ var ts;
             }
         }
         function hasExternalModuleSymbol(declaration) {
-            return ts.isAmbientModule(declaration) || (declaration.kind === 256 && ts.isExternalOrCommonJsModule(declaration));
+            return ts.isAmbientModule(declaration) || (declaration.kind === 261 && ts.isExternalOrCommonJsModule(declaration));
         }
         function hasVisibleDeclarations(symbol, shouldComputeAliasToMakeVisible) {
             var aliasesToMakeVisible;
@@ -20868,11 +22329,11 @@ var ts;
         }
         function isEntityNameVisible(entityName, enclosingDeclaration) {
             var meaning;
-            if (entityName.parent.kind === 159 || ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
+            if (entityName.parent.kind === 160 || ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
                 meaning = 107455 | 1048576;
             }
-            else if (entityName.kind === 140 || entityName.kind === 173 ||
-                entityName.parent.kind === 230) {
+            else if (entityName.kind === 141 || entityName.kind === 177 ||
+                entityName.parent.kind === 234) {
                 meaning = 1920;
             }
             else {
@@ -20964,10 +22425,10 @@ var ts;
         function getTypeAliasForTypeLiteral(type) {
             if (type.symbol && type.symbol.flags & 2048) {
                 var node = type.symbol.declarations[0].parent;
-                while (node.kind === 165) {
+                while (node.kind === 166) {
                     node = node.parent;
                 }
-                if (node.kind === 224) {
+                if (node.kind === 228) {
                     return getSymbolOfNode(node);
                 }
             }
@@ -20975,7 +22436,7 @@ var ts;
         }
         function isTopLevelInExternalModuleAugmentation(node) {
             return node && node.parent &&
-                node.parent.kind === 227 &&
+                node.parent.kind === 231 &&
                 ts.isExternalModuleAugmentation(node.parent.parent);
         }
         function literalTypeToString(type) {
@@ -20989,10 +22450,10 @@ var ts;
                         return ts.declarationNameToString(declaration.name);
                     }
                     switch (declaration.kind) {
-                        case 193:
+                        case 197:
                             return "(Anonymous class)";
-                        case 180:
-                        case 181:
+                        case 184:
+                        case 185:
                             return "(Anonymous function)";
                     }
                 }
@@ -21044,9 +22505,9 @@ var ts;
                     var accessibleSymbolChain = getAccessibleSymbolChain(symbol, enclosingDeclaration, meaning, !!(flags & 2));
                     if (!accessibleSymbolChain ||
                         needsQualification(accessibleSymbolChain[0], enclosingDeclaration, accessibleSymbolChain.length === 1 ? meaning : getQualifiedLeftMeaning(meaning))) {
-                        var parent_8 = getParentOfSymbol(accessibleSymbolChain ? accessibleSymbolChain[0] : symbol);
-                        if (parent_8) {
-                            walkSymbol(parent_8, getQualifiedLeftMeaning(meaning), false);
+                        var parent_6 = getParentOfSymbol(accessibleSymbolChain ? accessibleSymbolChain[0] : symbol);
+                        if (parent_6) {
+                            walkSymbol(parent_6, getQualifiedLeftMeaning(meaning), false);
                         }
                     }
                     if (accessibleSymbolChain) {
@@ -21087,7 +22548,7 @@ var ts;
                         }
                         writer.writeKeyword("this");
                     }
-                    else if (type.flags & 131072) {
+                    else if (getObjectFlags(type) & 4) {
                         writeTypeReference(type, nextFlags);
                     }
                     else if (type.flags & 256) {
@@ -21095,23 +22556,34 @@ var ts;
                         writePunctuation(writer, 22);
                         appendSymbolNameOnly(type.symbol, writer);
                     }
-                    else if (type.flags & (32768 | 65536 | 16 | 16384)) {
+                    else if (getObjectFlags(type) & 3 || type.flags & (16 | 16384)) {
                         buildSymbolDisplay(type.symbol, writer, enclosingDeclaration, 793064, 0, nextFlags);
                     }
-                    else if (!(flags & 512) && ((type.flags & 2097152 && !type.target) || type.flags & 1572864) && type.aliasSymbol &&
+                    else if (!(flags & 512) && type.aliasSymbol &&
                         isSymbolAccessible(type.aliasSymbol, enclosingDeclaration, 793064, false).accessibility === 0) {
                         var typeArguments = type.aliasTypeArguments;
                         writeSymbolTypeReference(type.aliasSymbol, typeArguments, 0, typeArguments ? typeArguments.length : 0, nextFlags);
                     }
-                    else if (type.flags & 1572864) {
+                    else if (type.flags & 196608) {
                         writeUnionOrIntersectionType(type, nextFlags);
                     }
-                    else if (type.flags & 2097152) {
+                    else if (getObjectFlags(type) & (16 | 32)) {
                         writeAnonymousType(type, nextFlags);
                     }
                     else if (type.flags & 96) {
                         writer.writeStringLiteral(literalTypeToString(type));
                     }
+                    else if (type.flags & 262144) {
+                        writer.writeKeyword("keyof");
+                        writeSpace(writer);
+                        writeType(type.type, 64);
+                    }
+                    else if (type.flags & 524288) {
+                        writeType(type.objectType, 64);
+                        writePunctuation(writer, 20);
+                        writeType(type.indexType, 0);
+                        writePunctuation(writer, 21);
+                    }
                     else {
                         writePunctuation(writer, 16);
                         writeSpace(writer);
@@ -21156,7 +22628,7 @@ var ts;
                         writePunctuation(writer, 20);
                         writePunctuation(writer, 21);
                     }
-                    else if (type.target.flags & 262144) {
+                    else if (type.target.objectFlags & 8) {
                         writePunctuation(writer, 20);
                         writeTypeList(type.typeArguments.slice(0, getTypeReferenceArity(type)), 25);
                         writePunctuation(writer, 21);
@@ -21168,12 +22640,12 @@ var ts;
                             var length_1 = outerTypeParameters.length;
                             while (i < length_1) {
                                 var start = i;
-                                var parent_9 = getParentSymbolOfTypeParameter(outerTypeParameters[i]);
+                                var parent_7 = getParentSymbolOfTypeParameter(outerTypeParameters[i]);
                                 do {
                                     i++;
-                                } while (i < length_1 && getParentSymbolOfTypeParameter(outerTypeParameters[i]) === parent_9);
+                                } while (i < length_1 && getParentSymbolOfTypeParameter(outerTypeParameters[i]) === parent_7);
                                 if (!ts.rangeEquals(outerTypeParameters, typeArguments, start, i)) {
-                                    writeSymbolTypeReference(parent_9, typeArguments, start, i, flags);
+                                    writeSymbolTypeReference(parent_7, typeArguments, start, i, flags);
                                     writePunctuation(writer, 22);
                                 }
                             }
@@ -21186,7 +22658,7 @@ var ts;
                     if (flags & 64) {
                         writePunctuation(writer, 18);
                     }
-                    if (type.flags & 524288) {
+                    if (type.flags & 65536) {
                         writeTypeList(formatUnionTypes(type.types), 48);
                     }
                     else {
@@ -21232,7 +22704,7 @@ var ts;
                         var isNonLocalFunctionSymbol = !!(symbol.flags & 16) &&
                             (symbol.parent ||
                                 ts.forEach(symbol.declarations, function (declaration) {
-                                    return declaration.parent.kind === 256 || declaration.parent.kind === 227;
+                                    return declaration.parent.kind === 261 || declaration.parent.kind === 231;
                                 }));
                         if (isStaticMethodSymbol || isNonLocalFunctionSymbol) {
                             return !!(flags & 2) ||
@@ -21248,7 +22720,7 @@ var ts;
                 function writeIndexSignature(info, keyword) {
                     if (info) {
                         if (info.isReadonly) {
-                            writeKeyword(writer, 129);
+                            writeKeyword(writer, 130);
                             writeSpace(writer);
                         }
                         writePunctuation(writer, 20);
@@ -21266,7 +22738,7 @@ var ts;
                 }
                 function writePropertyWithModifiers(prop) {
                     if (isReadonlySymbol(prop)) {
-                        writeKeyword(writer, 129);
+                        writeKeyword(writer, 130);
                         writeSpace(writer);
                     }
                     buildSymbolDisplay(prop, writer);
@@ -21286,6 +22758,12 @@ var ts;
                     return false;
                 }
                 function writeLiteralType(type, flags) {
+                    if (type.objectFlags & 32) {
+                        if (getConstraintTypeFromMappedType(type).flags & (16384 | 262144)) {
+                            writeMappedType(type);
+                            return;
+                        }
+                    }
                     var resolved = resolveStructuredTypeMembers(type);
                     if (!resolved.properties.length && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
                         if (!resolved.callSignatures.length && !resolved.constructSignatures.length) {
@@ -21322,6 +22800,12 @@ var ts;
                     writePunctuation(writer, 16);
                     writer.writeLine();
                     writer.increaseIndent();
+                    writeObjectLiteralType(resolved);
+                    writer.decreaseIndent();
+                    writePunctuation(writer, 17);
+                    inObjectTypeLiteral = saveInObjectTypeLiteral;
+                }
+                function writeObjectLiteralType(resolved) {
                     for (var _i = 0, _a = resolved.callSignatures; _i < _a.length; _i++) {
                         var signature = _a[_i];
                         buildSignatureDisplay(signature, writer, enclosingDeclaration, globalFlagsToPass, undefined, symbolStack);
@@ -21334,8 +22818,8 @@ var ts;
                         writePunctuation(writer, 24);
                         writer.writeLine();
                     }
-                    writeIndexSignature(resolved.stringIndexInfo, 133);
-                    writeIndexSignature(resolved.numberIndexInfo, 131);
+                    writeIndexSignature(resolved.stringIndexInfo, 134);
+                    writeIndexSignature(resolved.numberIndexInfo, 132);
                     for (var _d = 0, _e = resolved.properties; _d < _e.length; _d++) {
                         var p = _e[_d];
                         var t = getTypeOfSymbol(p);
@@ -21358,9 +22842,32 @@ var ts;
                             writer.writeLine();
                         }
                     }
+                }
+                function writeMappedType(type) {
+                    writePunctuation(writer, 16);
+                    writer.writeLine();
+                    writer.increaseIndent();
+                    if (type.declaration.readonlyToken) {
+                        writeKeyword(writer, 130);
+                        writeSpace(writer);
+                    }
+                    writePunctuation(writer, 20);
+                    appendSymbolNameOnly(getTypeParameterFromMappedType(type).symbol, writer);
+                    writeSpace(writer);
+                    writeKeyword(writer, 91);
+                    writeSpace(writer);
+                    writeType(getConstraintTypeFromMappedType(type), 0);
+                    writePunctuation(writer, 21);
+                    if (type.declaration.questionToken) {
+                        writePunctuation(writer, 54);
+                    }
+                    writePunctuation(writer, 55);
+                    writeSpace(writer);
+                    writeType(getTemplateTypeFromMappedType(type), 0);
+                    writePunctuation(writer, 24);
+                    writer.writeLine();
                     writer.decreaseIndent();
                     writePunctuation(writer, 17);
-                    inObjectTypeLiteral = saveInObjectTypeLiteral;
                 }
             }
             function buildTypeParameterDisplayFromSymbol(symbol, writer, enclosingDeclaration, flags) {
@@ -21398,12 +22905,12 @@ var ts;
                 buildTypeDisplay(getTypeOfSymbol(p), writer, enclosingDeclaration, flags, symbolStack);
             }
             function buildBindingPatternDisplay(bindingPattern, writer, enclosingDeclaration, flags, symbolStack) {
-                if (bindingPattern.kind === 168) {
+                if (bindingPattern.kind === 172) {
                     writePunctuation(writer, 16);
                     buildDisplayForCommaSeparatedList(bindingPattern.elements, writer, function (e) { return buildBindingElementDisplay(e, writer, enclosingDeclaration, flags, symbolStack); });
                     writePunctuation(writer, 17);
                 }
-                else if (bindingPattern.kind === 169) {
+                else if (bindingPattern.kind === 173) {
                     writePunctuation(writer, 20);
                     var elements = bindingPattern.elements;
                     buildDisplayForCommaSeparatedList(elements, writer, function (e) { return buildBindingElementDisplay(e, writer, enclosingDeclaration, flags, symbolStack); });
@@ -21417,7 +22924,7 @@ var ts;
                 if (ts.isOmittedExpression(bindingElement)) {
                     return;
                 }
-                ts.Debug.assert(bindingElement.kind === 170);
+                ts.Debug.assert(bindingElement.kind === 174);
                 if (bindingElement.propertyName) {
                     writer.writeSymbol(ts.getTextOfNode(bindingElement.propertyName), bindingElement.symbol);
                     writePunctuation(writer, 55);
@@ -21545,63 +23052,63 @@ var ts;
             return false;
             function determineIfDeclarationIsVisible() {
                 switch (node.kind) {
-                    case 170:
+                    case 174:
                         return isDeclarationVisible(node.parent.parent);
-                    case 219:
+                    case 223:
                         if (ts.isBindingPattern(node.name) &&
                             !node.name.elements.length) {
                             return false;
                         }
-                    case 226:
-                    case 222:
-                    case 223:
-                    case 224:
-                    case 221:
-                    case 225:
                     case 230:
+                    case 226:
+                    case 227:
+                    case 228:
+                    case 225:
+                    case 229:
+                    case 234:
                         if (ts.isExternalModuleAugmentation(node)) {
                             return true;
                         }
-                        var parent_10 = getDeclarationContainer(node);
+                        var parent_8 = getDeclarationContainer(node);
                         if (!(ts.getCombinedModifierFlags(node) & 1) &&
-                            !(node.kind !== 230 && parent_10.kind !== 256 && ts.isInAmbientContext(parent_10))) {
-                            return isGlobalSourceFile(parent_10);
+                            !(node.kind !== 234 && parent_8.kind !== 261 && ts.isInAmbientContext(parent_8))) {
+                            return isGlobalSourceFile(parent_8);
                         }
-                        return isDeclarationVisible(parent_10);
-                    case 146:
-                    case 145:
-                    case 150:
-                    case 151:
-                    case 148:
+                        return isDeclarationVisible(parent_8);
                     case 147:
+                    case 146:
+                    case 151:
+                    case 152:
+                    case 149:
+                    case 148:
                         if (ts.getModifierFlags(node) & (8 | 16)) {
                             return false;
                         }
-                    case 149:
-                    case 153:
-                    case 152:
+                    case 150:
                     case 154:
-                    case 143:
-                    case 227:
-                    case 157:
+                    case 153:
+                    case 155:
+                    case 144:
+                    case 231:
                     case 158:
-                    case 160:
-                    case 156:
+                    case 159:
                     case 161:
+                    case 157:
                     case 162:
                     case 163:
                     case 164:
                     case 165:
+                    case 166:
                         return isDeclarationVisible(node.parent);
-                    case 232:
-                    case 233:
-                    case 235:
-                        return false;
-                    case 142:
-                    case 256:
-                    case 229:
-                        return true;
                     case 236:
+                    case 237:
+                    case 239:
+                        return false;
+                    case 143:
+                    case 261:
+                    case 233:
+                        return true;
+                    case 240:
                         return false;
                     default:
                         return false;
@@ -21610,10 +23117,10 @@ var ts;
         }
         function collectLinkedAliases(node) {
             var exportSymbol;
-            if (node.parent && node.parent.kind === 236) {
+            if (node.parent && node.parent.kind === 240) {
                 exportSymbol = resolveName(node.parent, node.text, 107455 | 793064 | 1920 | 8388608, ts.Diagnostics.Cannot_find_name_0, node);
             }
-            else if (node.parent.kind === 239) {
+            else if (node.parent.kind === 243) {
                 var exportSpecifier = node.parent;
                 exportSymbol = exportSpecifier.parent.parent.moduleSpecifier ?
                     getExternalModuleMember(exportSpecifier.parent.parent, exportSpecifier) :
@@ -21675,7 +23182,6 @@ var ts;
                 return getSymbolLinks(target).declaredType;
             }
             if (propertyName === 1) {
-                ts.Debug.assert(!!(target.flags & 32768));
                 return target.resolvedBaseConstructorType;
             }
             if (propertyName === 3) {
@@ -21692,12 +23198,12 @@ var ts;
             node = ts.getRootDeclaration(node);
             while (node) {
                 switch (node.kind) {
-                    case 219:
-                    case 220:
-                    case 235:
-                    case 234:
-                    case 233:
-                    case 232:
+                    case 223:
+                    case 224:
+                    case 239:
+                    case 238:
+                    case 237:
+                    case 236:
                         node = node.parent;
                         break;
                     default:
@@ -21723,22 +23229,30 @@ var ts;
             var symbol = getSymbolOfNode(node);
             return symbol && getSymbolLinks(symbol).type || getTypeForVariableLikeDeclaration(node, false);
         }
-        function getTextOfPropertyName(name) {
-            switch (name.kind) {
-                case 70:
-                    return name.text;
-                case 9:
-                case 8:
-                    return name.text;
-                case 141:
-                    if (ts.isStringOrNumericLiteral(name.expression.kind)) {
-                        return name.expression.text;
-                    }
-            }
-            return undefined;
-        }
         function isComputedNonLiteralName(name) {
-            return name.kind === 141 && !ts.isStringOrNumericLiteral(name.expression.kind);
+            return name.kind === 142 && !ts.isStringOrNumericLiteral(name.expression.kind);
+        }
+        function getRestType(source, properties, symbol) {
+            ts.Debug.assert(!!(source.flags & 32768), "Rest types only support object types right now.");
+            var members = ts.createMap();
+            var names = ts.createMap();
+            for (var _i = 0, properties_2 = properties; _i < properties_2.length; _i++) {
+                var name_20 = properties_2[_i];
+                names[ts.getTextOfPropertyName(name_20)] = true;
+            }
+            for (var _a = 0, _b = getPropertiesOfType(source); _a < _b.length; _a++) {
+                var prop = _b[_a];
+                var inNamesToRemove = prop.name in names;
+                var isPrivate = getDeclarationModifierFlagsFromSymbol(prop) & (8 | 16);
+                var isMethod = prop.flags & 8192;
+                var isSetOnlyAccessor = prop.flags & 65536 && !(prop.flags & 32768);
+                if (!inNamesToRemove && !isPrivate && !isMethod && !isSetOnlyAccessor) {
+                    members[prop.name] = prop;
+                }
+            }
+            var stringIndexInfo = getIndexInfoOfType(source, 0);
+            var numberIndexInfo = getIndexInfoOfType(source, 1);
+            return createAnonymousType(symbol, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
         }
         function getTypeForBindingElement(declaration) {
             var pattern = declaration.parent;
@@ -21753,26 +23267,45 @@ var ts;
                 return parentType;
             }
             var type;
-            if (pattern.kind === 168) {
-                var name_14 = declaration.propertyName || declaration.name;
-                if (isComputedNonLiteralName(name_14)) {
-                    return anyType;
+            if (pattern.kind === 172) {
+                if (declaration.dotDotDotToken) {
+                    if (!(parentType.flags & 32768)) {
+                        error(declaration, ts.Diagnostics.Rest_types_may_only_be_created_from_object_types);
+                        return unknownType;
+                    }
+                    var literalMembers = [];
+                    for (var _i = 0, _a = pattern.elements; _i < _a.length; _i++) {
+                        var element = _a[_i];
+                        if (element.kind !== 198 && !element.dotDotDotToken) {
+                            literalMembers.push(element.propertyName || element.name);
+                        }
+                    }
+                    type = getRestType(parentType, literalMembers, declaration.symbol);
                 }
-                if (declaration.initializer) {
-                    getContextualType(declaration.initializer);
-                }
-                var text = getTextOfPropertyName(name_14);
-                type = getTypeOfPropertyOfType(parentType, text) ||
-                    isNumericLiteralName(text) && getIndexTypeOfType(parentType, 1) ||
-                    getIndexTypeOfType(parentType, 0);
-                if (!type) {
-                    error(name_14, ts.Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(parentType), ts.declarationNameToString(name_14));
-                    return unknownType;
+                else {
+                    var name_21 = declaration.propertyName || declaration.name;
+                    if (isComputedNonLiteralName(name_21)) {
+                        return anyType;
+                    }
+                    if (declaration.initializer) {
+                        getContextualType(declaration.initializer);
+                    }
+                    var text = ts.getTextOfPropertyName(name_21);
+                    type = getTypeOfPropertyOfType(parentType, text) ||
+                        isNumericLiteralName(text) && getIndexTypeOfType(parentType, 1) ||
+                        getIndexTypeOfType(parentType, 0);
+                    if (!type) {
+                        error(name_21, ts.Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(parentType), ts.declarationNameToString(name_21));
+                        return unknownType;
+                    }
                 }
             }
             else {
                 var elementType = checkIteratedTypeOrElementType(parentType, pattern, false);
-                if (!declaration.dotDotDotToken) {
+                if (declaration.dotDotDotToken) {
+                    type = createArrayType(elementType);
+                }
+                else {
                     var propName = "" + ts.indexOf(pattern.elements, declaration);
                     type = isTupleLikeType(parentType)
                         ? getTypeOfPropertyOfType(parentType, propName)
@@ -21787,9 +23320,6 @@ var ts;
                         return unknownType;
                     }
                 }
-                else {
-                    type = createArrayType(elementType);
-                }
             }
             if (strictNullChecks && declaration.initializer && !(getFalsyFlags(checkExpressionCached(declaration.initializer)) & 2048)) {
                 type = getTypeWithFacts(type, 131072);
@@ -21809,15 +23339,15 @@ var ts;
             if (typeTag && typeTag.typeExpression) {
                 return typeTag.typeExpression.type;
             }
-            if (declaration.kind === 219 &&
-                declaration.parent.kind === 220 &&
-                declaration.parent.parent.kind === 201) {
+            if (declaration.kind === 223 &&
+                declaration.parent.kind === 224 &&
+                declaration.parent.parent.kind === 205) {
                 var annotation = ts.getJSDocTypeTag(declaration.parent.parent);
                 if (annotation && annotation.typeExpression) {
                     return annotation.typeExpression.type;
                 }
             }
-            else if (declaration.kind === 143) {
+            else if (declaration.kind === 144) {
                 var paramTag = ts.getCorrespondingJSDocParameterTag(declaration);
                 if (paramTag && paramTag.typeExpression) {
                     return paramTag.typeExpression.type;
@@ -21831,22 +23361,22 @@ var ts;
         }
         function isEmptyArrayLiteral(node) {
             var expr = ts.skipParentheses(node);
-            return expr.kind === 171 && expr.elements.length === 0;
+            return expr.kind === 175 && expr.elements.length === 0;
         }
         function addOptionality(type, optional) {
             return strictNullChecks && optional ? includeFalsyTypes(type, 2048) : type;
         }
         function getTypeForVariableLikeDeclaration(declaration, includeOptionality) {
-            if (declaration.flags & 1048576) {
+            if (declaration.flags & 2097152) {
                 var type = getTypeForVariableLikeDeclarationFromJSDocComment(declaration);
                 if (type && type !== unknownType) {
                     return type;
                 }
             }
-            if (declaration.parent.parent.kind === 208) {
+            if (declaration.parent.parent.kind === 212) {
                 return stringType;
             }
-            if (declaration.parent.parent.kind === 209) {
+            if (declaration.parent.parent.kind === 213) {
                 return checkRightHandSideOfForOf(declaration.parent.parent.expression) || anyType;
             }
             if (ts.isBindingPattern(declaration.parent)) {
@@ -21855,7 +23385,7 @@ var ts;
             if (declaration.type) {
                 return addOptionality(getTypeFromTypeNode(declaration.type), declaration.questionToken && includeOptionality);
             }
-            if (declaration.kind === 219 && !ts.isBindingPattern(declaration.name) &&
+            if (declaration.kind === 223 && !ts.isBindingPattern(declaration.name) &&
                 !(ts.getCombinedModifierFlags(declaration) & 1) && !ts.isInAmbientContext(declaration)) {
                 if (!(ts.getCombinedNodeFlags(declaration) & 2) && (!declaration.initializer || isNullOrUndefined(declaration.initializer))) {
                     return autoType;
@@ -21864,10 +23394,10 @@ var ts;
                     return autoArrayType;
                 }
             }
-            if (declaration.kind === 143) {
+            if (declaration.kind === 144) {
                 var func = declaration.parent;
-                if (func.kind === 151 && !ts.hasDynamicName(func)) {
-                    var getter = ts.getDeclarationOfKind(declaration.parent.symbol, 150);
+                if (func.kind === 152 && !ts.hasDynamicName(func)) {
+                    var getter = ts.getDeclarationOfKind(declaration.parent.symbol, 151);
                     if (getter) {
                         var getterSignature = getSignatureFromDeclaration(getter);
                         var thisParameter = getAccessorThisParameter(func);
@@ -21893,7 +23423,7 @@ var ts;
                 var type = checkDeclarationInitializer(declaration);
                 return addOptionality(type, declaration.questionToken && includeOptionality);
             }
-            if (declaration.kind === 254) {
+            if (declaration.kind === 258) {
                 return checkIdentifier(declaration.name);
             }
             if (ts.isBindingPattern(declaration.name)) {
@@ -21918,11 +23448,11 @@ var ts;
             var hasComputedProperties = false;
             ts.forEach(pattern.elements, function (e) {
                 var name = e.propertyName || e.name;
-                if (isComputedNonLiteralName(name)) {
+                if (isComputedNonLiteralName(name) || e.dotDotDotToken) {
                     hasComputedProperties = true;
                     return;
                 }
-                var text = getTextOfPropertyName(name);
+                var text = ts.getTextOfPropertyName(name);
                 var flags = 4 | 67108864 | (e.initializer ? 536870912 : 0);
                 var symbol = createSymbol(flags, text);
                 symbol.type = getTypeFromBindingElement(e, includePatternInType, reportErrors);
@@ -21934,7 +23464,7 @@ var ts;
                 result.pattern = pattern;
             }
             if (hasComputedProperties) {
-                result.isObjectLiteralPatternWithComputedProperties = true;
+                result.objectFlags |= 512;
             }
             return result;
         }
@@ -21953,7 +23483,7 @@ var ts;
             return result;
         }
         function getTypeFromBindingPattern(pattern, includePatternInType, reportErrors) {
-            return pattern.kind === 168
+            return pattern.kind === 172
                 ? getTypeFromObjectBindingPattern(pattern, includePatternInType, reportErrors)
                 : getTypeFromArrayBindingPattern(pattern, includePatternInType, reportErrors);
         }
@@ -21963,7 +23493,7 @@ var ts;
                 if (reportErrors) {
                     reportErrorsFromWidening(declaration, type);
                 }
-                if (declaration.kind === 253) {
+                if (declaration.kind === 257) {
                     return type;
                 }
                 return getWidenedType(type);
@@ -21978,7 +23508,7 @@ var ts;
         }
         function declarationBelongsToPrivateAmbientMember(declaration) {
             var root = ts.getRootDeclaration(declaration);
-            var memberDeclaration = root.kind === 143 ? root.parent : root;
+            var memberDeclaration = root.kind === 144 ? root.parent : root;
             return isPrivateWithinAmbient(memberDeclaration);
         }
         function getTypeOfVariableOrParameterOrProperty(symbol) {
@@ -21988,28 +23518,28 @@ var ts;
                     return links.type = getTypeOfPrototypeProperty(symbol);
                 }
                 var declaration = symbol.valueDeclaration;
-                if (declaration.parent.kind === 252) {
+                if (ts.isCatchClauseVariableDeclarationOrBindingElement(declaration)) {
                     return links.type = anyType;
                 }
-                if (declaration.kind === 236) {
+                if (declaration.kind === 240) {
                     return links.type = checkExpression(declaration.expression);
                 }
-                if (declaration.flags & 1048576 && declaration.kind === 280 && declaration.typeExpression) {
+                if (declaration.flags & 2097152 && declaration.kind === 285 && declaration.typeExpression) {
                     return links.type = getTypeFromTypeNode(declaration.typeExpression.type);
                 }
                 if (!pushTypeResolution(symbol, 0)) {
                     return unknownType;
                 }
                 var type = void 0;
-                if (declaration.kind === 188 ||
-                    declaration.kind === 173 && declaration.parent.kind === 188) {
-                    if (declaration.flags & 1048576) {
+                if (declaration.kind === 192 ||
+                    declaration.kind === 177 && declaration.parent.kind === 192) {
+                    if (declaration.flags & 2097152) {
                         var typeTag = ts.getJSDocTypeTag(declaration.parent);
                         if (typeTag && typeTag.typeExpression) {
                             return links.type = getTypeFromTypeNode(typeTag.typeExpression.type);
                         }
                     }
-                    var declaredTypes = ts.map(symbol.declarations, function (decl) { return decl.kind === 188 ?
+                    var declaredTypes = ts.map(symbol.declarations, function (decl) { return decl.kind === 192 ?
                         checkExpressionCached(decl.right) :
                         checkExpressionCached(decl.parent.right); });
                     type = getUnionType(declaredTypes, true);
@@ -22035,7 +23565,7 @@ var ts;
         }
         function getAnnotatedAccessorType(accessor) {
             if (accessor) {
-                if (accessor.kind === 150) {
+                if (accessor.kind === 151) {
                     return accessor.type && getTypeFromTypeNode(accessor.type);
                 }
                 else {
@@ -22055,9 +23585,9 @@ var ts;
         function getTypeOfAccessors(symbol) {
             var links = getSymbolLinks(symbol);
             if (!links.type) {
-                var getter = ts.getDeclarationOfKind(symbol, 150);
-                var setter = ts.getDeclarationOfKind(symbol, 151);
-                if (getter && getter.flags & 1048576) {
+                var getter = ts.getDeclarationOfKind(symbol, 151);
+                var setter = ts.getDeclarationOfKind(symbol, 152);
+                if (getter && getter.flags & 2097152) {
                     var jsDocType = getTypeForVariableLikeDeclarationFromJSDocComment(getter);
                     if (jsDocType) {
                         return links.type = jsDocType;
@@ -22097,7 +23627,7 @@ var ts;
                 if (!popTypeResolution()) {
                     type = anyType;
                     if (compilerOptions.noImplicitAny) {
-                        var getter_1 = ts.getDeclarationOfKind(symbol, 150);
+                        var getter_1 = ts.getDeclarationOfKind(symbol, 151);
                         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));
                     }
                 }
@@ -22108,11 +23638,11 @@ var ts;
         function getTypeOfFuncClassEnumModule(symbol) {
             var links = getSymbolLinks(symbol);
             if (!links.type) {
-                if (symbol.valueDeclaration.kind === 226 && ts.isShorthandAmbientModuleSymbol(symbol)) {
+                if (symbol.flags & 1536 && ts.isShorthandAmbientModuleSymbol(symbol)) {
                     links.type = anyType;
                 }
                 else {
-                    var type = createObjectType(2097152, symbol);
+                    var type = createObjectType(16, symbol);
                     links.type = strictNullChecks && symbol.flags & 536870912 ?
                         includeFalsyTypes(type, 2048) : type;
                 }
@@ -22165,7 +23695,7 @@ var ts;
             return unknownType;
         }
         function getTargetType(type) {
-            return type.flags & 131072 ? type.target : type;
+            return getObjectFlags(type) & 4 ? type.target : type;
         }
         function hasBaseType(type, checkBase) {
             return check(type);
@@ -22193,9 +23723,9 @@ var ts;
                 if (!node) {
                     return typeParameters;
                 }
-                if (node.kind === 222 || node.kind === 193 ||
-                    node.kind === 221 || node.kind === 180 ||
-                    node.kind === 148 || node.kind === 181) {
+                if (node.kind === 226 || node.kind === 197 ||
+                    node.kind === 225 || node.kind === 184 ||
+                    node.kind === 149 || node.kind === 185) {
                     var declarations = node.typeParameters;
                     if (declarations) {
                         return appendTypeParameters(appendOuterTypeParameters(typeParameters, node), declarations);
@@ -22204,15 +23734,15 @@ var ts;
             }
         }
         function getOuterTypeParametersOfClassOrInterface(symbol) {
-            var declaration = symbol.flags & 32 ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 223);
+            var declaration = symbol.flags & 32 ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 227);
             return appendOuterTypeParameters(undefined, declaration);
         }
         function getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol) {
             var result;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var node = _a[_i];
-                if (node.kind === 223 || node.kind === 222 ||
-                    node.kind === 193 || node.kind === 224) {
+                if (node.kind === 227 || node.kind === 226 ||
+                    node.kind === 197 || node.kind === 228) {
                     var declaration = node;
                     if (declaration.typeParameters) {
                         result = appendTypeParameters(result, declaration.typeParameters);
@@ -22225,7 +23755,7 @@ var ts;
             return ts.concatenate(getOuterTypeParametersOfClassOrInterface(symbol), getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol));
         }
         function isConstructorType(type) {
-            return type.flags & 2588672 && getSignaturesOfType(type, 1).length > 0;
+            return type.flags & 32768 && getSignaturesOfType(type, 1).length > 0;
         }
         function getBaseTypeNodeOfClass(type) {
             return ts.getClassExtendsHeritageClauseElement(type.symbol.valueDeclaration);
@@ -22237,7 +23767,7 @@ var ts;
         function getInstantiatedConstructorsForTypeArguments(type, typeArgumentNodes) {
             var signatures = getConstructorsForTypeArguments(type, typeArgumentNodes);
             if (typeArgumentNodes) {
-                var typeArguments_1 = ts.map(typeArgumentNodes, getTypeFromTypeNodeNoAlias);
+                var typeArguments_1 = ts.map(typeArgumentNodes, getTypeFromTypeNode);
                 signatures = ts.map(signatures, function (sig) { return getSignatureInstantiation(sig, typeArguments_1); });
             }
             return signatures;
@@ -22252,7 +23782,7 @@ var ts;
                     return unknownType;
                 }
                 var baseConstructorType = checkExpression(baseTypeNode.expression);
-                if (baseConstructorType.flags & 2588672) {
+                if (baseConstructorType.flags & 32768) {
                     resolveStructuredTypeMembers(baseConstructorType);
                 }
                 if (!popTypeResolution()) {
@@ -22269,7 +23799,7 @@ var ts;
         }
         function getBaseTypes(type) {
             if (!type.resolvedBaseTypes) {
-                if (type.flags & 262144) {
+                if (type.objectFlags & 8) {
                     type.resolvedBaseTypes = [createArrayType(getUnionType(type.typeParameters))];
                 }
                 else if (type.symbol.flags & (32 | 64)) {
@@ -22289,7 +23819,7 @@ var ts;
         function resolveBaseTypesOfClass(type) {
             type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray;
             var baseConstructorType = getBaseConstructorTypeOfClass(type);
-            if (!(baseConstructorType.flags & 2588672)) {
+            if (!(baseConstructorType.flags & 32768)) {
                 return;
             }
             var baseTypeNode = getBaseTypeNodeOfClass(type);
@@ -22310,7 +23840,7 @@ var ts;
             if (baseType === unknownType) {
                 return;
             }
-            if (!(getTargetType(baseType).flags & (32768 | 65536))) {
+            if (!(getObjectFlags(getTargetType(baseType)) & 3)) {
                 error(baseTypeNode.expression, ts.Diagnostics.Base_constructor_return_type_0_is_not_a_class_or_interface_type, typeToString(baseType));
                 return;
             }
@@ -22338,12 +23868,12 @@ var ts;
             type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray;
             for (var _i = 0, _a = type.symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 223 && ts.getInterfaceBaseTypeNodes(declaration)) {
+                if (declaration.kind === 227 && ts.getInterfaceBaseTypeNodes(declaration)) {
                     for (var _b = 0, _c = ts.getInterfaceBaseTypeNodes(declaration); _b < _c.length; _b++) {
                         var node = _c[_b];
                         var baseType = getTypeFromTypeNode(node);
                         if (baseType !== unknownType) {
-                            if (getTargetType(baseType).flags & (32768 | 65536)) {
+                            if (getObjectFlags(getTargetType(baseType)) & 3) {
                                 if (type !== baseType && !hasBaseType(baseType, type)) {
                                     if (type.resolvedBaseTypes === emptyArray) {
                                         type.resolvedBaseTypes = [baseType];
@@ -22367,7 +23897,7 @@ var ts;
         function isIndependentInterface(symbol) {
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 223) {
+                if (declaration.kind === 227) {
                     if (declaration.flags & 64) {
                         return false;
                     }
@@ -22390,12 +23920,12 @@ var ts;
         function getDeclaredTypeOfClassOrInterface(symbol) {
             var links = getSymbolLinks(symbol);
             if (!links.declaredType) {
-                var kind = symbol.flags & 32 ? 32768 : 65536;
+                var kind = symbol.flags & 32 ? 1 : 2;
                 var type = links.declaredType = createObjectType(kind, symbol);
                 var outerTypeParameters = getOuterTypeParametersOfClassOrInterface(symbol);
                 var localTypeParameters = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol);
-                if (outerTypeParameters || localTypeParameters || kind === 32768 || !isIndependentInterface(symbol)) {
-                    type.flags |= 131072;
+                if (outerTypeParameters || localTypeParameters || kind === 1 || !isIndependentInterface(symbol)) {
+                    type.objectFlags |= 4;
                     type.typeParameters = ts.concatenate(outerTypeParameters, localTypeParameters);
                     type.outerTypeParameters = outerTypeParameters;
                     type.localTypeParameters = localTypeParameters;
@@ -22417,8 +23947,7 @@ var ts;
                 if (!pushTypeResolution(symbol, 2)) {
                     return unknownType;
                 }
-                var typeParameters = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol);
-                var declaration = ts.getDeclarationOfKind(symbol, 279);
+                var declaration = ts.getDeclarationOfKind(symbol, 284);
                 var type = void 0;
                 if (declaration) {
                     if (declaration.jsDocTypeLiteral) {
@@ -22429,14 +23958,15 @@ var ts;
                     }
                 }
                 else {
-                    declaration = ts.getDeclarationOfKind(symbol, 224);
-                    type = getTypeFromTypeNode(declaration.type, symbol, typeParameters);
+                    declaration = ts.getDeclarationOfKind(symbol, 228);
+                    type = getTypeFromTypeNode(declaration.type);
                 }
                 if (popTypeResolution()) {
-                    links.typeParameters = typeParameters;
+                    var typeParameters = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol);
                     if (typeParameters) {
+                        links.typeParameters = typeParameters;
                         links.instantiations = ts.createMap();
-                        links.instantiations[getTypeListId(links.typeParameters)] = type;
+                        links.instantiations[getTypeListId(typeParameters)] = type;
                     }
                 }
                 else {
@@ -22453,14 +23983,14 @@ var ts;
                 return !ts.isInAmbientContext(member);
             }
             return expr.kind === 8 ||
-                expr.kind === 186 && expr.operator === 37 &&
+                expr.kind === 190 && expr.operator === 37 &&
                     expr.operand.kind === 8 ||
                 expr.kind === 70 && !!symbol.exports[expr.text];
         }
         function enumHasLiteralMembers(symbol) {
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 225) {
+                if (declaration.kind === 229) {
                     for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) {
                         var member = _c[_b];
                         if (!isLiteralEnumMember(symbol, member)) {
@@ -22488,7 +24018,7 @@ var ts;
                     var memberTypes = ts.createMap();
                     for (var _i = 0, _a = enumType.symbol.declarations; _i < _a.length; _i++) {
                         var declaration = _a[_i];
-                        if (declaration.kind === 225) {
+                        if (declaration.kind === 229) {
                             computeEnumMemberValues(declaration);
                             for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) {
                                 var member = _c[_b];
@@ -22503,7 +24033,7 @@ var ts;
                     }
                     enumType.memberTypes = memberTypes;
                     if (memberTypeList.length > 1) {
-                        enumType.flags |= 524288;
+                        enumType.flags |= 65536;
                         enumType.types = memberTypeList;
                         unionTypes[getTypeListId(memberTypeList)] = enumType;
                     }
@@ -22515,7 +24045,7 @@ var ts;
             var links = getSymbolLinks(symbol);
             if (!links.declaredType) {
                 var enumType = getDeclaredTypeOfEnum(getParentOfSymbol(symbol));
-                links.declaredType = enumType.flags & 524288 ?
+                links.declaredType = enumType.flags & 65536 ?
                     enumType.memberTypes[getEnumMemberValue(symbol.valueDeclaration)] :
                     enumType;
             }
@@ -22526,7 +24056,7 @@ var ts;
             if (!links.declaredType) {
                 var type = createType(16384);
                 type.symbol = symbol;
-                if (!ts.getDeclarationOfKind(symbol, 142).constraint) {
+                if (!ts.getDeclarationOfKind(symbol, 143).constraint) {
                     type.constraint = noConstraintType;
                 }
                 links.declaredType = type;
@@ -22576,19 +24106,19 @@ var ts;
         function isIndependentType(node) {
             switch (node.kind) {
                 case 118:
-                case 133:
-                case 131:
-                case 121:
                 case 134:
+                case 132:
+                case 121:
+                case 135:
                 case 104:
-                case 136:
+                case 137:
                 case 94:
-                case 128:
-                case 167:
+                case 129:
+                case 171:
                     return true;
-                case 161:
+                case 162:
                     return isIndependentType(node.elementType);
-                case 156:
+                case 157:
                     return isIndependentTypeReference(node);
             }
             return false;
@@ -22597,7 +24127,7 @@ var ts;
             return node.type && isIndependentType(node.type) || !node.type && !node.initializer;
         }
         function isIndependentFunctionLikeDeclaration(node) {
-            if (node.kind !== 149 && (!node.type || !isIndependentType(node.type))) {
+            if (node.kind !== 150 && (!node.type || !isIndependentType(node.type))) {
                 return false;
             }
             for (var _i = 0, _a = node.parameters; _i < _a.length; _i++) {
@@ -22613,12 +24143,12 @@ var ts;
                 var declaration = symbol.declarations[0];
                 if (declaration) {
                     switch (declaration.kind) {
-                        case 146:
-                        case 145:
-                            return isIndependentVariableLikeDeclaration(declaration);
-                        case 148:
                         case 147:
+                        case 146:
+                            return isIndependentVariableLikeDeclaration(declaration);
                         case 149:
+                        case 148:
+                        case 150:
                             return isIndependentFunctionLikeDeclaration(declaration);
                     }
                 }
@@ -22661,7 +24191,7 @@ var ts;
             return type;
         }
         function getTypeWithThisArgument(type, thisArgument) {
-            if (type.flags & 131072) {
+            if (getObjectFlags(type) & 4) {
                 return createTypeReference(type.target, ts.concatenate(type.typeArguments, [thisArgument || type.target.thisType]));
             }
             return type;
@@ -22684,8 +24214,8 @@ var ts;
             else {
                 mapper = createTypeMapper(typeParameters, typeArguments);
                 members = createInstantiatedSymbolTable(source.declaredProperties, mapper, typeParameters.length === 1);
-                callSignatures = instantiateList(source.declaredCallSignatures, mapper, instantiateSignature);
-                constructSignatures = instantiateList(source.declaredConstructSignatures, mapper, instantiateSignature);
+                callSignatures = instantiateSignatures(source.declaredCallSignatures, mapper);
+                constructSignatures = instantiateSignatures(source.declaredConstructSignatures, mapper);
                 stringIndexInfo = instantiateIndexInfo(source.declaredStringIndexInfo, mapper);
                 numberIndexInfo = instantiateIndexInfo(source.declaredNumberIndexInfo, mapper);
             }
@@ -22705,7 +24235,7 @@ var ts;
                     numberIndexInfo = numberIndexInfo || getIndexInfoOfType(instantiatedBaseType, 1);
                 }
             }
-            setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+            setStructuredTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function resolveClassOrInterfaceMembers(type) {
             resolveObjectTypeMembers(type, resolveDeclaredMembers(type), emptyArray, emptyArray);
@@ -22740,14 +24270,14 @@ var ts;
                 return [createSignature(undefined, classType.localTypeParameters, undefined, emptyArray, classType, undefined, 0, false, false)];
             }
             var baseTypeNode = getBaseTypeNodeOfClass(classType);
-            var typeArguments = ts.map(baseTypeNode.typeArguments, getTypeFromTypeNodeNoAlias);
+            var typeArguments = ts.map(baseTypeNode.typeArguments, getTypeFromTypeNode);
             var typeArgCount = typeArguments ? typeArguments.length : 0;
             var result = [];
             for (var _i = 0, baseSignatures_1 = baseSignatures; _i < baseSignatures_1.length; _i++) {
                 var baseSig = baseSignatures_1[_i];
                 var typeParamCount = baseSig.typeParameters ? baseSig.typeParameters.length : 0;
                 if (typeParamCount === typeArgCount) {
-                    var sig = typeParamCount ? getSignatureInstantiation(baseSig, typeArguments) : cloneSignature(baseSig);
+                    var sig = typeParamCount ? createSignatureInstantiation(baseSig, typeArguments) : cloneSignature(baseSig);
                     sig.typeParameters = classType.localTypeParameters;
                     sig.resolvedReturnType = classType;
                     result.push(sig);
@@ -22832,7 +24362,7 @@ var ts;
             var constructSignatures = getUnionSignatures(type.types, 1);
             var stringIndexInfo = getUnionIndexInfo(type.types, 0);
             var numberIndexInfo = getUnionIndexInfo(type.types, 1);
-            setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+            setStructuredTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function intersectTypes(type1, type2) {
             return !type1 ? type2 : !type2 ? type1 : getIntersectionType([type1, type2]);
@@ -22840,6 +24370,9 @@ var ts;
         function intersectIndexInfos(info1, info2) {
             return !info1 ? info2 : !info2 ? info1 : createIndexInfo(getIntersectionType([info1.type, info2.type]), info1.isReadonly && info2.isReadonly);
         }
+        function unionSpreadIndexInfos(info1, info2) {
+            return info1 && info2 && createIndexInfo(getUnionType([info1.type, info2.type]), info1.isReadonly || info2.isReadonly);
+        }
         function resolveIntersectionTypeMembers(type) {
             var callSignatures = emptyArray;
             var constructSignatures = emptyArray;
@@ -22852,17 +24385,17 @@ var ts;
                 stringIndexInfo = intersectIndexInfos(stringIndexInfo, getIndexInfoOfType(t, 0));
                 numberIndexInfo = intersectIndexInfos(numberIndexInfo, getIndexInfoOfType(t, 1));
             }
-            setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+            setStructuredTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function resolveAnonymousTypeMembers(type) {
             var symbol = type.symbol;
             if (type.target) {
                 var members = createInstantiatedSymbolTable(getPropertiesOfObjectType(type.target), type.mapper, false);
-                var callSignatures = instantiateList(getSignaturesOfType(type.target, 0), type.mapper, instantiateSignature);
-                var constructSignatures = instantiateList(getSignaturesOfType(type.target, 1), type.mapper, instantiateSignature);
+                var callSignatures = instantiateSignatures(getSignaturesOfType(type.target, 0), type.mapper);
+                var constructSignatures = instantiateSignatures(getSignaturesOfType(type.target, 1), type.mapper);
                 var stringIndexInfo = instantiateIndexInfo(getIndexInfoOfType(type.target, 0), type.mapper);
                 var numberIndexInfo = instantiateIndexInfo(getIndexInfoOfType(type.target, 1), type.mapper);
-                setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+                setStructuredTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
             }
             else if (symbol.flags & 2048) {
                 var members = symbol.members;
@@ -22870,7 +24403,7 @@ var ts;
                 var constructSignatures = getSignaturesOfSymbol(members["__new"]);
                 var stringIndexInfo = getIndexInfoOfSymbol(symbol, 0);
                 var numberIndexInfo = getIndexInfoOfSymbol(symbol, 1);
-                setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+                setStructuredTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
             }
             else {
                 var members = emptySymbols;
@@ -22885,46 +24418,106 @@ var ts;
                         constructSignatures = getDefaultConstructSignatures(classType);
                     }
                     var baseConstructorType = getBaseConstructorTypeOfClass(classType);
-                    if (baseConstructorType.flags & 2588672) {
+                    if (baseConstructorType.flags & 32768) {
                         members = createSymbolTable(getNamedMembers(members));
                         addInheritedMembers(members, getPropertiesOfObjectType(baseConstructorType));
                     }
                 }
                 var numberIndexInfo = symbol.flags & 384 ? enumNumberIndexInfo : undefined;
-                setObjectTypeMembers(type, members, emptyArray, constructSignatures, undefined, numberIndexInfo);
+                setStructuredTypeMembers(type, members, emptyArray, constructSignatures, undefined, numberIndexInfo);
                 if (symbol.flags & (16 | 8192)) {
                     type.callSignatures = getSignaturesOfSymbol(symbol);
                 }
             }
         }
+        function resolveMappedTypeMembers(type) {
+            var members = ts.createMap();
+            var stringIndexInfo;
+            var numberIndexInfo;
+            var typeParameter = getTypeParameterFromMappedType(type);
+            var constraintType = getConstraintTypeFromMappedType(type);
+            var templateType = getTemplateTypeFromMappedType(type);
+            var isReadonly = !!type.declaration.readonlyToken;
+            var isOptional = !!type.declaration.questionToken;
+            var keyType = constraintType.flags & 16384 ? getApparentType(constraintType) : constraintType;
+            var iterationType = keyType.flags & 262144 ? getIndexType(getApparentType(keyType.type)) : keyType;
+            forEachType(iterationType, function (t) {
+                var iterationMapper = createUnaryTypeMapper(typeParameter, t);
+                var templateMapper = type.mapper ? combineTypeMappers(type.mapper, iterationMapper) : iterationMapper;
+                var propType = instantiateType(templateType, templateMapper);
+                if (t.flags & (32 | 64 | 256)) {
+                    var propName = t.text;
+                    var prop = createSymbol(4 | 67108864 | (isOptional ? 536870912 : 0), propName);
+                    prop.type = addOptionality(propType, isOptional);
+                    prop.isReadonly = isReadonly;
+                    members[propName] = prop;
+                }
+                else if (t.flags & 2) {
+                    stringIndexInfo = createIndexInfo(propType, isReadonly);
+                }
+                else if (t.flags & 4) {
+                    numberIndexInfo = createIndexInfo(propType, isReadonly);
+                }
+            });
+            if (stringIndexInfo && numberIndexInfo && isTypeIdenticalTo(stringIndexInfo.type, numberIndexInfo.type)) {
+                numberIndexInfo = undefined;
+            }
+            setStructuredTypeMembers(type, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
+        }
+        function getTypeParameterFromMappedType(type) {
+            return type.typeParameter ||
+                (type.typeParameter = getDeclaredTypeOfTypeParameter(getSymbolOfNode(type.declaration.typeParameter)));
+        }
+        function getConstraintTypeFromMappedType(type) {
+            return type.constraintType ||
+                (type.constraintType = instantiateType(getConstraintOfTypeParameter(getTypeParameterFromMappedType(type)), type.mapper || identityMapper) || unknownType);
+        }
+        function getTemplateTypeFromMappedType(type) {
+            return type.templateType ||
+                (type.templateType = type.declaration.type ?
+                    instantiateType(getTypeFromTypeNode(type.declaration.type), type.mapper || identityMapper) :
+                    unknownType);
+        }
+        function isGenericMappedType(type) {
+            if (getObjectFlags(type) & 32) {
+                var constraintType = getConstraintTypeFromMappedType(type);
+                return !!(constraintType.flags & (16384 | 262144));
+            }
+            return false;
+        }
         function resolveStructuredTypeMembers(type) {
             if (!type.members) {
-                if (type.flags & 131072) {
-                    resolveTypeReferenceMembers(type);
+                if (type.flags & 32768) {
+                    if (type.objectFlags & 4) {
+                        resolveTypeReferenceMembers(type);
+                    }
+                    else if (type.objectFlags & 3) {
+                        resolveClassOrInterfaceMembers(type);
+                    }
+                    else if (type.objectFlags & 16) {
+                        resolveAnonymousTypeMembers(type);
+                    }
+                    else if (type.objectFlags & 32) {
+                        resolveMappedTypeMembers(type);
+                    }
                 }
-                else if (type.flags & (32768 | 65536)) {
-                    resolveClassOrInterfaceMembers(type);
-                }
-                else if (type.flags & 2097152) {
-                    resolveAnonymousTypeMembers(type);
-                }
-                else if (type.flags & 524288) {
+                else if (type.flags & 65536) {
                     resolveUnionTypeMembers(type);
                 }
-                else if (type.flags & 1048576) {
+                else if (type.flags & 131072) {
                     resolveIntersectionTypeMembers(type);
                 }
             }
             return type;
         }
         function getPropertiesOfObjectType(type) {
-            if (type.flags & 2588672) {
+            if (type.flags & 32768) {
                 return resolveStructuredTypeMembers(type).properties;
             }
             return emptyArray;
         }
         function getPropertyOfObjectType(type, name) {
-            if (type.flags & 2588672) {
+            if (type.flags & 32768) {
                 var resolved = resolveStructuredTypeMembers(type);
                 var symbol = resolved.members[name];
                 if (symbol && symbolIsValue(symbol)) {
@@ -22939,7 +24532,7 @@ var ts;
                     var prop = _c[_b];
                     getUnionOrIntersectionProperty(type, prop.name);
                 }
-                if (type.flags & 524288) {
+                if (type.flags & 65536) {
                     break;
                 }
             }
@@ -22958,7 +24551,9 @@ var ts;
         }
         function getPropertiesOfType(type) {
             type = getApparentType(type);
-            return type.flags & 1572864 ? getPropertiesOfUnionOrIntersectionType(type) : getPropertiesOfObjectType(type);
+            return type.flags & 196608 ?
+                getPropertiesOfUnionOrIntersectionType(type) :
+                getPropertiesOfObjectType(type);
         }
         function getApparentTypeOfTypeParameter(type) {
             if (!type.resolvedApparentType) {
@@ -22971,27 +24566,18 @@ var ts;
             return type.resolvedApparentType;
         }
         function getApparentType(type) {
-            if (type.flags & 16384) {
-                type = getApparentTypeOfTypeParameter(type);
-            }
-            if (type.flags & 34) {
-                type = globalStringType;
-            }
-            else if (type.flags & 340) {
-                type = globalNumberType;
-            }
-            else if (type.flags & 136) {
-                type = globalBooleanType;
-            }
-            else if (type.flags & 512) {
-                type = getGlobalESSymbolType();
-            }
-            return type;
+            var t = type.flags & 16384 ? getApparentTypeOfTypeParameter(type) : type;
+            return t.flags & 34 ? globalStringType :
+                t.flags & 340 ? globalNumberType :
+                    t.flags & 136 ? globalBooleanType :
+                        t.flags & 512 ? getGlobalESSymbolType() :
+                            t.flags & 262144 ? stringOrNumberType :
+                                t;
         }
         function createUnionOrIntersectionProperty(containingType, name) {
             var types = containingType.types;
             var props;
-            var commonFlags = (containingType.flags & 1048576) ? 536870912 : 0;
+            var commonFlags = (containingType.flags & 131072) ? 536870912 : 0;
             var isReadonly = false;
             var isPartial = false;
             for (var _i = 0, types_2 = types; _i < types_2.length; _i++) {
@@ -23011,7 +24597,7 @@ var ts;
                             isReadonly = true;
                         }
                     }
-                    else if (containingType.flags & 524288) {
+                    else if (containingType.flags & 65536) {
                         isPartial = true;
                     }
                 }
@@ -23046,7 +24632,7 @@ var ts;
             result.isPartial = isPartial;
             result.declarations = declarations;
             result.isReadonly = isReadonly;
-            result.type = containingType.flags & 524288 ? getUnionType(propTypes) : getIntersectionType(propTypes);
+            result.type = containingType.flags & 65536 ? getUnionType(propTypes) : getIntersectionType(propTypes);
             return result;
         }
         function getUnionOrIntersectionProperty(type, name) {
@@ -23066,7 +24652,7 @@ var ts;
         }
         function getPropertyOfType(type, name) {
             type = getApparentType(type);
-            if (type.flags & 2588672) {
+            if (type.flags & 32768) {
                 var resolved = resolveStructuredTypeMembers(type);
                 var symbol = resolved.members[name];
                 if (symbol && symbolIsValue(symbol)) {
@@ -23080,13 +24666,13 @@ var ts;
                 }
                 return getPropertyOfObjectType(globalObjectType, name);
             }
-            if (type.flags & 1572864) {
+            if (type.flags & 196608) {
                 return getPropertyOfUnionOrIntersectionType(type, name);
             }
             return undefined;
         }
         function getSignaturesOfStructuredType(type, kind) {
-            if (type.flags & 4161536) {
+            if (type.flags & 229376) {
                 var resolved = resolveStructuredTypeMembers(type);
                 return kind === 0 ? resolved.callSignatures : resolved.constructSignatures;
             }
@@ -23096,7 +24682,7 @@ var ts;
             return getSignaturesOfStructuredType(getApparentType(type), kind);
         }
         function getIndexInfoOfStructuredType(type, kind) {
-            if (type.flags & 4161536) {
+            if (type.flags & 229376) {
                 var resolved = resolveStructuredTypeMembers(type);
                 return kind === 0 ? resolved.stringIndexInfo : resolved.numberIndexInfo;
             }
@@ -23127,7 +24713,7 @@ var ts;
             return undefined;
         }
         function getTypeParametersFromJSDocTemplate(declaration) {
-            if (declaration.flags & 1048576) {
+            if (declaration.flags & 2097152) {
                 var templateTag = ts.getJSDocTemplateTag(declaration);
                 if (templateTag) {
                     return getTypeParametersFromDeclaration(templateTag.typeParameters);
@@ -23155,8 +24741,8 @@ var ts;
             return result;
         }
         function isJSDocOptionalParameter(node) {
-            if (node.flags & 1048576) {
-                if (node.type && node.type.kind === 268) {
+            if (node.flags & 2097152) {
+                if (node.type && node.type.kind === 273) {
                     return true;
                 }
                 var paramTag = ts.getCorrespondingJSDocParameterTag(node);
@@ -23165,11 +24751,18 @@ var ts;
                         return true;
                     }
                     if (paramTag.typeExpression) {
-                        return paramTag.typeExpression.type.kind === 268;
+                        return paramTag.typeExpression.type.kind === 273;
                     }
                 }
             }
         }
+        function tryFindAmbientModule(moduleName, withAugmentations) {
+            if (ts.isExternalModuleNameRelative(moduleName)) {
+                return undefined;
+            }
+            var symbol = getSymbol(globals, "\"" + moduleName + "\"", 512);
+            return symbol && withAugmentations ? getMergedSymbol(symbol) : symbol;
+        }
         function isOptionalParameter(node) {
             if (ts.hasQuestionToken(node) || isJSDocOptionalParameter(node)) {
                 return true;
@@ -23223,7 +24816,7 @@ var ts;
                     else {
                         parameters.push(paramSymbol);
                     }
-                    if (param.type && param.type.kind === 167) {
+                    if (param.type && param.type.kind === 171) {
                         hasLiteralTypes = true;
                     }
                     if (param.initializer || param.questionToken || param.dotDotDotToken || isJSDocOptionalParameter(param)) {
@@ -23235,10 +24828,10 @@ var ts;
                         minArgumentCount = -1;
                     }
                 }
-                if ((declaration.kind === 150 || declaration.kind === 151) &&
+                if ((declaration.kind === 151 || declaration.kind === 152) &&
                     !ts.hasDynamicName(declaration) &&
                     (!hasThisParameter || !thisParameter)) {
-                    var otherKind = declaration.kind === 150 ? 151 : 150;
+                    var otherKind = declaration.kind === 151 ? 152 : 151;
                     var other = ts.getDeclarationOfKind(declaration.symbol, otherKind);
                     if (other) {
                         thisParameter = getAnnotatedAccessorThisParameter(other);
@@ -23250,14 +24843,14 @@ var ts;
                 if (isJSConstructSignature) {
                     minArgumentCount--;
                 }
-                var classType = declaration.kind === 149 ?
+                var classType = declaration.kind === 150 ?
                     getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol))
                     : undefined;
                 var typeParameters = classType ? classType.localTypeParameters :
                     declaration.typeParameters ? getTypeParametersFromDeclaration(declaration.typeParameters) :
                         getTypeParametersFromJSDocTemplate(declaration);
                 var returnType = getSignatureReturnTypeFromDeclaration(declaration, isJSConstructSignature, classType);
-                var typePredicate = declaration.type && declaration.type.kind === 155 ?
+                var typePredicate = declaration.type && declaration.type.kind === 156 ?
                     createTypePredicateFromTypePredicateNode(declaration.type) :
                     undefined;
                 links.resolvedSignature = createSignature(declaration, typeParameters, thisParameter, parameters, returnType, typePredicate, minArgumentCount, ts.hasRestParameter(declaration), hasLiteralTypes);
@@ -23274,14 +24867,14 @@ var ts;
             else if (declaration.type) {
                 return getTypeFromTypeNode(declaration.type);
             }
-            if (declaration.flags & 1048576) {
+            if (declaration.flags & 2097152) {
                 var type = getReturnTypeFromJSDocComment(declaration);
                 if (type && type !== unknownType) {
                     return type;
                 }
             }
-            if (declaration.kind === 150 && !ts.hasDynamicName(declaration)) {
-                var setter = ts.getDeclarationOfKind(declaration.symbol, 151);
+            if (declaration.kind === 151 && !ts.hasDynamicName(declaration)) {
+                var setter = ts.getDeclarationOfKind(declaration.symbol, 152);
                 return getAnnotatedAccessorType(setter);
             }
             if (ts.nodeIsMissing(declaration.body)) {
@@ -23295,20 +24888,20 @@ var ts;
             for (var i = 0, len = symbol.declarations.length; i < len; i++) {
                 var node = symbol.declarations[i];
                 switch (node.kind) {
-                    case 157:
                     case 158:
-                    case 221:
-                    case 148:
-                    case 147:
+                    case 159:
+                    case 225:
                     case 149:
-                    case 152:
+                    case 148:
+                    case 150:
                     case 153:
                     case 154:
-                    case 150:
+                    case 155:
                     case 151:
-                    case 180:
-                    case 181:
-                    case 269:
+                    case 152:
+                    case 184:
+                    case 185:
+                    case 274:
                         if (i > 0 && node.body) {
                             var previous = symbol.declarations[i - 1];
                             if (node.parent === previous.parent && node.kind === previous.kind && node.pos === previous.end) {
@@ -23369,13 +24962,18 @@ var ts;
         function getRestTypeOfSignature(signature) {
             if (signature.hasRestParameter) {
                 var type = getTypeOfSymbol(ts.lastOrUndefined(signature.parameters));
-                if (type.flags & 131072 && type.target === globalArrayType) {
+                if (getObjectFlags(type) & 4 && type.target === globalArrayType) {
                     return type.typeArguments[0];
                 }
             }
             return anyType;
         }
         function getSignatureInstantiation(signature, typeArguments) {
+            var instantiations = signature.instantiations || (signature.instantiations = ts.createMap());
+            var id = getTypeListId(typeArguments);
+            return instantiations[id] || (instantiations[id] = createSignatureInstantiation(signature, typeArguments));
+        }
+        function createSignatureInstantiation(signature, typeArguments) {
             return instantiateSignature(signature, createTypeMapper(signature.typeParameters, typeArguments), true);
         }
         function getErasedSignature(signature) {
@@ -23388,8 +24986,8 @@ var ts;
         }
         function getOrCreateTypeFromSignature(signature) {
             if (!signature.isolatedSignatureType) {
-                var isConstructor = signature.declaration.kind === 149 || signature.declaration.kind === 153;
-                var type = createObjectType(2097152);
+                var isConstructor = signature.declaration.kind === 150 || signature.declaration.kind === 154;
+                var type = createObjectType(16);
                 type.members = emptySymbols;
                 type.properties = emptyArray;
                 type.callSignatures = !isConstructor ? [signature] : emptyArray;
@@ -23402,7 +25000,7 @@ var ts;
             return symbol.members["__index"];
         }
         function getIndexDeclarationOfSymbol(symbol, kind) {
-            var syntaxKind = kind === 1 ? 131 : 133;
+            var syntaxKind = kind === 1 ? 132 : 134;
             var indexSymbol = getIndexSymbol(symbol);
             if (indexSymbol) {
                 for (var _i = 0, _a = indexSymbol.declarations; _i < _a.length; _i++) {
@@ -23429,7 +25027,7 @@ var ts;
             return undefined;
         }
         function getConstraintDeclaration(type) {
-            return ts.getDeclarationOfKind(type.symbol, 142).constraint;
+            return ts.getDeclarationOfKind(type.symbol, 143).constraint;
         }
         function hasConstraintReferenceTo(type, target) {
             var checked;
@@ -23462,7 +25060,7 @@ var ts;
             return typeParameter.constraint === noConstraintType ? undefined : typeParameter.constraint;
         }
         function getParentSymbolOfTypeParameter(typeParameter) {
-            return getSymbolOfNode(ts.getDeclarationOfKind(typeParameter.symbol, 142).parent);
+            return getSymbolOfNode(ts.getDeclarationOfKind(typeParameter.symbol, 143).parent);
         }
         function getTypeListId(types) {
             var result = "";
@@ -23495,22 +25093,23 @@ var ts;
                     result |= type.flags;
                 }
             }
-            return result & 234881024;
+            return result & 14680064;
         }
         function createTypeReference(target, typeArguments) {
             var id = getTypeListId(typeArguments);
             var type = target.instantiations[id];
             if (!type) {
-                var propagatedFlags = typeArguments ? getPropagatingFlagsOfTypes(typeArguments, 0) : 0;
-                var flags = 131072 | propagatedFlags;
-                type = target.instantiations[id] = createObjectType(flags, target.symbol);
+                type = target.instantiations[id] = createObjectType(4, target.symbol);
+                type.flags |= typeArguments ? getPropagatingFlagsOfTypes(typeArguments, 0) : 0;
                 type.target = target;
                 type.typeArguments = typeArguments;
             }
             return type;
         }
         function cloneTypeReference(source) {
-            var type = createObjectType(source.flags, source.symbol);
+            var type = createType(source.flags);
+            type.symbol = source.symbol;
+            type.objectFlags = source.objectFlags;
             type.target = source.target;
             type.typeArguments = source.typeArguments;
             return type;
@@ -23526,7 +25125,7 @@ var ts;
                     error(node, ts.Diagnostics.Generic_type_0_requires_1_type_argument_s, typeToString(type, undefined, 1), typeParameters.length);
                     return unknownType;
                 }
-                return createTypeReference(type, ts.concatenate(type.outerTypeParameters, ts.map(node.typeArguments, getTypeFromTypeNodeNoAlias)));
+                return createTypeReference(type, ts.concatenate(type.outerTypeParameters, ts.map(node.typeArguments, getTypeFromTypeNode)));
             }
             if (node.typeArguments) {
                 error(node, ts.Diagnostics.Type_0_is_not_generic, typeToString(type));
@@ -23534,18 +25133,23 @@ var ts;
             }
             return type;
         }
-        function getTypeFromTypeAliasReference(node, symbol) {
+        function getTypeAliasInstantiation(symbol, typeArguments) {
             var type = getDeclaredTypeOfSymbol(symbol);
             var links = getSymbolLinks(symbol);
             var typeParameters = links.typeParameters;
+            var id = getTypeListId(typeArguments);
+            return links.instantiations[id] || (links.instantiations[id] = instantiateTypeNoAlias(type, createTypeMapper(typeParameters, typeArguments)));
+        }
+        function getTypeFromTypeAliasReference(node, symbol) {
+            var type = getDeclaredTypeOfSymbol(symbol);
+            var typeParameters = getSymbolLinks(symbol).typeParameters;
             if (typeParameters) {
                 if (!node.typeArguments || node.typeArguments.length !== typeParameters.length) {
                     error(node, ts.Diagnostics.Generic_type_0_requires_1_type_argument_s, symbolToString(symbol), typeParameters.length);
                     return unknownType;
                 }
-                var typeArguments = ts.map(node.typeArguments, getTypeFromTypeNodeNoAlias);
-                var id = getTypeListId(typeArguments);
-                return links.instantiations[id] || (links.instantiations[id] = instantiateType(type, createTypeMapper(typeParameters, typeArguments)));
+                var typeArguments = ts.map(node.typeArguments, getTypeFromTypeNode);
+                return getTypeAliasInstantiation(symbol, typeArguments);
             }
             if (node.typeArguments) {
                 error(node, ts.Diagnostics.Type_0_is_not_generic, symbolToString(symbol));
@@ -23562,11 +25166,11 @@ var ts;
         }
         function getTypeReferenceName(node) {
             switch (node.kind) {
-                case 156:
+                case 157:
                     return node.typeName;
-                case 267:
+                case 272:
                     return node.name;
-                case 195:
+                case 199:
                     var expr = node.expression;
                     if (ts.isEntityNameExpression(expr)) {
                         return expr;
@@ -23590,7 +25194,7 @@ var ts;
             if (symbol.flags & 524288) {
                 return getTypeFromTypeAliasReference(node, symbol);
             }
-            if (symbol.flags & 107455 && node.kind === 267) {
+            if (symbol.flags & 107455 && node.kind === 272) {
                 return getTypeOfSymbol(symbol);
             }
             return getTypeFromNonGenericTypeReference(node, symbol);
@@ -23600,13 +25204,13 @@ var ts;
             if (!links.resolvedType) {
                 var symbol = void 0;
                 var type = void 0;
-                if (node.kind === 267) {
+                if (node.kind === 272) {
                     var typeReferenceName = getTypeReferenceName(node);
                     symbol = resolveTypeReferenceName(typeReferenceName);
                     type = getTypeReferenceType(node, symbol);
                 }
                 else {
-                    var typeNameOrExpression = node.kind === 156
+                    var typeNameOrExpression = node.kind === 157
                         ? node.typeName
                         : ts.isEntityNameExpression(node.expression)
                             ? node.expression
@@ -23635,9 +25239,9 @@ var ts;
                 for (var _i = 0, declarations_3 = declarations; _i < declarations_3.length; _i++) {
                     var declaration = declarations_3[_i];
                     switch (declaration.kind) {
-                        case 222:
-                        case 223:
-                        case 225:
+                        case 226:
+                        case 227:
+                        case 229:
                             return declaration;
                     }
                 }
@@ -23646,7 +25250,7 @@ var ts;
                 return arity ? emptyGenericType : emptyObjectType;
             }
             var type = getDeclaredTypeOfSymbol(symbol);
-            if (!(type.flags & 2588672)) {
+            if (!(type.flags & 32768)) {
                 error(getTypeDeclaration(symbol), ts.Diagnostics.Global_type_0_must_be_a_class_or_interface_type, symbol.name);
                 return arity ? emptyGenericType : emptyObjectType;
             }
@@ -23709,7 +25313,7 @@ var ts;
                 property.type = typeParameter;
                 properties.push(property);
             }
-            var type = createObjectType(262144 | 131072);
+            var type = createObjectType(8 | 4);
             type.typeParameters = typeParameters;
             type.outerTypeParameters = undefined;
             type.localTypeParameters = typeParameters;
@@ -23736,7 +25340,7 @@ var ts;
         function getTypeFromTupleTypeNode(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
-                links.resolvedType = createTupleType(ts.map(node.elementTypes, getTypeFromTypeNodeNoAlias));
+                links.resolvedType = createTupleType(ts.map(node.elementTypes, getTypeFromTypeNode));
             }
             return links.resolvedType;
         }
@@ -23764,7 +25368,7 @@ var ts;
         }
         function addTypeToUnion(typeSet, type) {
             var flags = type.flags;
-            if (flags & 524288) {
+            if (flags & 65536) {
                 addTypesToUnion(typeSet, type.types);
             }
             else if (flags & 1) {
@@ -23775,7 +25379,7 @@ var ts;
                     typeSet.containsUndefined = true;
                 if (flags & 4096)
                     typeSet.containsNull = true;
-                if (!(flags & 33554432))
+                if (!(flags & 2097152))
                     typeSet.containsNonWideningType = true;
             }
             else if (!(flags & 8192)) {
@@ -23788,7 +25392,8 @@ var ts;
                 var len = typeSet.length;
                 var index = len && type.id > typeSet[len - 1].id ? ~len : binarySearchTypes(typeSet, type);
                 if (index < 0) {
-                    if (!(flags & 2097152 && type.symbol && type.symbol.flags & (16 | 8192) && containsIdenticalType(typeSet, type))) {
+                    if (!(flags & 32768 && type.objectFlags & 16 &&
+                        type.symbol && type.symbol.flags & (16 | 8192) && containsIdenticalType(typeSet, type))) {
                         typeSet.splice(~index, 0, type);
                     }
                 }
@@ -23850,7 +25455,7 @@ var ts;
                 var t = types[i];
                 var remove = t.flags & 32 && types.containsString ||
                     t.flags & 64 && types.containsNumber ||
-                    t.flags & 96 && t.flags & 16777216 && containsType(types, t.regularType);
+                    t.flags & 96 && t.flags & 1048576 && containsType(types, t.regularType);
                 if (remove) {
                     ts.orderedRemoveItemAt(types, i);
                 }
@@ -23892,22 +25497,22 @@ var ts;
             var type = unionTypes[id];
             if (!type) {
                 var propagatedFlags = getPropagatingFlagsOfTypes(types, 6144);
-                type = unionTypes[id] = createObjectType(524288 | propagatedFlags);
+                type = unionTypes[id] = createType(65536 | propagatedFlags);
                 type.types = types;
                 type.aliasSymbol = aliasSymbol;
                 type.aliasTypeArguments = aliasTypeArguments;
             }
             return type;
         }
-        function getTypeFromUnionTypeNode(node, aliasSymbol, aliasTypeArguments) {
+        function getTypeFromUnionTypeNode(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
-                links.resolvedType = getUnionType(ts.map(node.types, getTypeFromTypeNodeNoAlias), false, aliasSymbol, aliasTypeArguments);
+                links.resolvedType = getUnionType(ts.map(node.types, getTypeFromTypeNode), false, getAliasSymbolForTypeNode(node), getAliasTypeArgumentsForTypeNode(node));
             }
             return links.resolvedType;
         }
         function addTypeToIntersection(typeSet, type) {
-            if (type.flags & 1048576) {
+            if (type.flags & 131072) {
                 addTypesToIntersection(typeSet, type.types);
             }
             else if (type.flags & 1) {
@@ -23927,6 +25532,17 @@ var ts;
             if (types.length === 0) {
                 return emptyObjectType;
             }
+            var _loop_2 = function (i) {
+                var type_1 = types[i];
+                if (type_1.flags & 65536) {
+                    return { value: getUnionType(ts.map(type_1.types, function (t) { return getIntersectionType(ts.replaceElement(types, i, t)); }), false, aliasSymbol, aliasTypeArguments) };
+                }
+            };
+            for (var i = 0; i < types.length; i++) {
+                var state_2 = _loop_2(i);
+                if (typeof state_2 === "object")
+                    return state_2.value;
+            }
             var typeSet = [];
             addTypesToIntersection(typeSet, types);
             if (typeSet.containsAny) {
@@ -23939,39 +25555,248 @@ var ts;
             var type = intersectionTypes[id];
             if (!type) {
                 var propagatedFlags = getPropagatingFlagsOfTypes(typeSet, 6144);
-                type = intersectionTypes[id] = createObjectType(1048576 | propagatedFlags);
+                type = intersectionTypes[id] = createType(131072 | propagatedFlags);
                 type.types = typeSet;
                 type.aliasSymbol = aliasSymbol;
                 type.aliasTypeArguments = aliasTypeArguments;
             }
             return type;
         }
-        function getTypeFromIntersectionTypeNode(node, aliasSymbol, aliasTypeArguments) {
+        function getTypeFromIntersectionTypeNode(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
-                links.resolvedType = getIntersectionType(ts.map(node.types, getTypeFromTypeNodeNoAlias), aliasSymbol, aliasTypeArguments);
+                links.resolvedType = getIntersectionType(ts.map(node.types, getTypeFromTypeNode), getAliasSymbolForTypeNode(node), getAliasTypeArgumentsForTypeNode(node));
             }
             return links.resolvedType;
         }
-        function getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node, aliasSymbol, aliasTypeArguments) {
+        function getIndexTypeForTypeParameter(type) {
+            if (!type.resolvedIndexType) {
+                type.resolvedIndexType = createType(262144);
+                type.resolvedIndexType.type = type;
+            }
+            return type.resolvedIndexType;
+        }
+        function getLiteralTypeFromPropertyName(prop) {
+            return getDeclarationModifierFlagsFromSymbol(prop) & 24 || ts.startsWith(prop.name, "__@") ?
+                neverType :
+                getLiteralTypeForText(32, ts.unescapeIdentifier(prop.name));
+        }
+        function getLiteralTypeFromPropertyNames(type) {
+            return getUnionType(ts.map(getPropertiesOfType(type), getLiteralTypeFromPropertyName));
+        }
+        function getIndexType(type) {
+            return type.flags & 16384 ? getIndexTypeForTypeParameter(type) :
+                type.flags & 1 || getIndexInfoOfType(type, 0) ? stringOrNumberType :
+                    getIndexInfoOfType(type, 1) ? getUnionType([numberType, getLiteralTypeFromPropertyNames(type)]) :
+                        getLiteralTypeFromPropertyNames(type);
+        }
+        function getTypeFromTypeOperatorNode(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
-                var type = createObjectType(2097152, node.symbol);
-                type.aliasSymbol = aliasSymbol;
-                type.aliasTypeArguments = aliasTypeArguments;
+                links.resolvedType = getIndexType(getTypeFromTypeNode(node.type));
+            }
+            return links.resolvedType;
+        }
+        function createIndexedAccessType(objectType, indexType) {
+            var type = createType(524288);
+            type.objectType = objectType;
+            type.indexType = indexType;
+            return type;
+        }
+        function getIndexedAccessTypeForTypeParameter(objectType, indexType) {
+            var indexedAccessTypes = indexType.resolvedIndexedAccessTypes || (indexType.resolvedIndexedAccessTypes = []);
+            return indexedAccessTypes[objectType.id] || (indexedAccessTypes[objectType.id] = createIndexedAccessType(objectType, indexType));
+        }
+        function getPropertyTypeForIndexType(objectType, indexType, accessNode, cacheSymbol) {
+            var accessExpression = accessNode && accessNode.kind === 178 ? accessNode : undefined;
+            var propName = indexType.flags & (32 | 64 | 256) ?
+                indexType.text :
+                accessExpression && checkThatExpressionIsProperSymbolReference(accessExpression.argumentExpression, indexType, false) ?
+                    ts.getPropertyNameForKnownSymbolName(accessExpression.argumentExpression.name.text) :
+                    undefined;
+            if (propName) {
+                var prop = getPropertyOfType(objectType, propName);
+                if (prop) {
+                    if (accessExpression) {
+                        if (ts.isAssignmentTarget(accessExpression) && (isReferenceToReadonlyEntity(accessExpression, prop) || isReferenceThroughNamespaceImport(accessExpression))) {
+                            error(accessExpression.argumentExpression, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_constant_or_a_read_only_property, symbolToString(prop));
+                            return unknownType;
+                        }
+                        if (cacheSymbol) {
+                            getNodeLinks(accessNode).resolvedSymbol = prop;
+                        }
+                    }
+                    return getTypeOfSymbol(prop);
+                }
+            }
+            if (isTypeAnyOrAllConstituentTypesHaveKind(indexType, 34 | 340 | 512)) {
+                if (isTypeAny(objectType)) {
+                    return anyType;
+                }
+                var indexInfo = isTypeAnyOrAllConstituentTypesHaveKind(indexType, 340) && getIndexInfoOfType(objectType, 1) ||
+                    getIndexInfoOfType(objectType, 0) ||
+                    undefined;
+                if (indexInfo) {
+                    if (accessExpression && ts.isAssignmentTarget(accessExpression) && indexInfo.isReadonly) {
+                        error(accessExpression, ts.Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
+                        return unknownType;
+                    }
+                    return indexInfo.type;
+                }
+                if (accessExpression && !isConstEnumObjectType(objectType)) {
+                    if (compilerOptions.noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors) {
+                        if (getIndexTypeOfType(objectType, 1)) {
+                            error(accessExpression.argumentExpression, ts.Diagnostics.Element_implicitly_has_an_any_type_because_index_expression_is_not_of_type_number);
+                        }
+                        else {
+                            error(accessExpression, ts.Diagnostics.Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature, typeToString(objectType));
+                        }
+                    }
+                    return anyType;
+                }
+            }
+            if (accessNode) {
+                var indexNode = accessNode.kind === 178 ? accessNode.argumentExpression : accessNode.indexType;
+                if (indexType.flags & (32 | 64)) {
+                    error(indexNode, ts.Diagnostics.Property_0_does_not_exist_on_type_1, indexType.text, typeToString(objectType));
+                }
+                else if (indexType.flags & (2 | 4)) {
+                    error(indexNode, ts.Diagnostics.Type_0_has_no_matching_index_signature_for_type_1, typeToString(objectType), typeToString(indexType));
+                }
+                else {
+                    error(indexNode, ts.Diagnostics.Type_0_cannot_be_used_as_an_index_type, typeToString(indexType));
+                }
+            }
+            return unknownType;
+        }
+        function getIndexedAccessType(objectType, indexType, accessNode) {
+            if (indexType.flags & 16384) {
+                if (accessNode && !isTypeAssignableTo(getConstraintOfTypeParameter(indexType) || emptyObjectType, getIndexType(objectType))) {
+                    error(accessNode, ts.Diagnostics.Type_0_is_not_constrained_to_keyof_1, typeToString(indexType), typeToString(objectType));
+                    return unknownType;
+                }
+                return getIndexedAccessTypeForTypeParameter(objectType, indexType);
+            }
+            var apparentType = getApparentType(objectType);
+            if (indexType.flags & 65536 && !(indexType.flags & 8190)) {
+                var propTypes = [];
+                for (var _i = 0, _a = indexType.types; _i < _a.length; _i++) {
+                    var t = _a[_i];
+                    var propType = getPropertyTypeForIndexType(apparentType, t, accessNode, false);
+                    if (propType === unknownType) {
+                        return unknownType;
+                    }
+                    propTypes.push(propType);
+                }
+                return getUnionType(propTypes);
+            }
+            return getPropertyTypeForIndexType(apparentType, indexType, accessNode, true);
+        }
+        function getTypeFromIndexedAccessTypeNode(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                links.resolvedType = getIndexedAccessType(getTypeFromTypeNode(node.objectType), getTypeFromTypeNode(node.indexType), node);
+            }
+            return links.resolvedType;
+        }
+        function getTypeFromMappedTypeNode(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                var type = createObjectType(32, node.symbol);
+                type.declaration = node;
+                type.aliasSymbol = getAliasSymbolForTypeNode(node);
+                type.aliasTypeArguments = getAliasTypeArgumentsForTypeNode(node);
                 links.resolvedType = type;
             }
             return links.resolvedType;
         }
+        function getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                var aliasSymbol = getAliasSymbolForTypeNode(node);
+                if (ts.isEmpty(node.symbol.members) && !aliasSymbol) {
+                    links.resolvedType = emptyTypeLiteralType;
+                }
+                else {
+                    var type = createObjectType(16, node.symbol);
+                    type.aliasSymbol = aliasSymbol;
+                    type.aliasTypeArguments = getAliasTypeArgumentsForTypeNode(node);
+                    links.resolvedType = type;
+                }
+            }
+            return links.resolvedType;
+        }
+        function getAliasSymbolForTypeNode(node) {
+            return node.parent.kind === 228 ? getSymbolOfNode(node.parent) : undefined;
+        }
+        function getAliasTypeArgumentsForTypeNode(node) {
+            var symbol = getAliasSymbolForTypeNode(node);
+            return symbol ? getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol) : undefined;
+        }
+        function getSpreadType(left, right, isFromObjectLiteral) {
+            ts.Debug.assert(!!(left.flags & (32768 | 1)) && !!(right.flags & (32768 | 1)), "Only object types may be spread.");
+            if (left.flags & 1 || right.flags & 1) {
+                return anyType;
+            }
+            var members = ts.createMap();
+            var skippedPrivateMembers = ts.createMap();
+            var stringIndexInfo;
+            var numberIndexInfo;
+            if (left === emptyObjectType) {
+                stringIndexInfo = getIndexInfoOfType(right, 0);
+                numberIndexInfo = getIndexInfoOfType(right, 1);
+            }
+            else {
+                stringIndexInfo = unionSpreadIndexInfos(getIndexInfoOfType(left, 0), getIndexInfoOfType(right, 0));
+                numberIndexInfo = unionSpreadIndexInfos(getIndexInfoOfType(left, 1), getIndexInfoOfType(right, 1));
+            }
+            for (var _i = 0, _a = getPropertiesOfType(right); _i < _a.length; _i++) {
+                var rightProp = _a[_i];
+                var isOwnProperty = !(rightProp.flags & 8192) || isFromObjectLiteral;
+                var isSetterWithoutGetter = rightProp.flags & 65536 && !(rightProp.flags & 32768);
+                if (getDeclarationModifierFlagsFromSymbol(rightProp) & (8 | 16)) {
+                    skippedPrivateMembers[rightProp.name] = true;
+                }
+                else if (isOwnProperty && !isSetterWithoutGetter) {
+                    members[rightProp.name] = rightProp;
+                }
+            }
+            for (var _b = 0, _c = getPropertiesOfType(left); _b < _c.length; _b++) {
+                var leftProp = _c[_b];
+                if (leftProp.flags & 65536 && !(leftProp.flags & 32768)
+                    || leftProp.name in skippedPrivateMembers) {
+                    continue;
+                }
+                if (leftProp.name in members) {
+                    var rightProp = members[leftProp.name];
+                    var rightType = getTypeOfSymbol(rightProp);
+                    if (maybeTypeOfKind(rightType, 2048) || rightProp.flags & 536870912) {
+                        var declarations = ts.concatenate(leftProp.declarations, rightProp.declarations);
+                        var flags = 4 | 67108864 | (leftProp.flags & 536870912);
+                        var result = createSymbol(flags, leftProp.name);
+                        result.type = getUnionType([getTypeOfSymbol(leftProp), getTypeWithFacts(rightType, 131072)]);
+                        result.leftSpread = leftProp;
+                        result.rightSpread = rightProp;
+                        result.declarations = declarations;
+                        result.isReadonly = isReadonlySymbol(leftProp) || isReadonlySymbol(rightProp);
+                        members[leftProp.name] = result;
+                    }
+                }
+                else {
+                    members[leftProp.name] = leftProp;
+                }
+            }
+            return createAnonymousType(undefined, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
+        }
         function createLiteralType(flags, text) {
             var type = createType(flags);
             type.text = text;
             return type;
         }
         function getFreshTypeOfLiteralType(type) {
-            if (type.flags & 96 && !(type.flags & 16777216)) {
+            if (type.flags & 96 && !(type.flags & 1048576)) {
                 if (!type.freshType) {
-                    var freshType = createLiteralType(type.flags | 16777216, type.text);
+                    var freshType = createLiteralType(type.flags | 1048576, type.text);
                     freshType.regularType = type;
                     type.freshType = freshType;
                 }
@@ -23980,7 +25805,7 @@ var ts;
             return type;
         }
         function getRegularTypeOfLiteralType(type) {
-            return type.flags & 96 && type.flags & 16777216 ? type.regularType : type;
+            return type.flags & 96 && type.flags & 1048576 ? type.regularType : type;
         }
         function getLiteralTypeForText(flags, text) {
             var map = flags & 32 ? stringLiteralTypes : numericLiteralTypes;
@@ -24004,7 +25829,7 @@ var ts;
         function getTypeFromJSDocTupleType(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
-                var types = ts.map(node.types, getTypeFromTypeNodeNoAlias);
+                var types = ts.map(node.types, getTypeFromTypeNode);
                 links.resolvedType = createTupleType(types);
             }
             return links.resolvedType;
@@ -24012,9 +25837,9 @@ var ts;
         function getThisType(node) {
             var container = ts.getThisContainer(node, false);
             var parent = container && container.parent;
-            if (parent && (ts.isClassLike(parent) || parent.kind === 223)) {
+            if (parent && (ts.isClassLike(parent) || parent.kind === 227)) {
                 if (!(ts.getModifierFlags(container) & 32) &&
-                    (container.kind !== 149 || ts.isNodeDescendantOf(node, container.body))) {
+                    (container.kind !== 150 || ts.isNodeDescendantOf(node, container.body))) {
                     return getDeclaredTypeOfClassOrInterface(getSymbolOfNode(parent)).thisType;
                 }
             }
@@ -24028,85 +25853,88 @@ var ts;
             }
             return links.resolvedType;
         }
-        function getTypeFromTypeNodeNoAlias(type) {
-            return getTypeFromTypeNode(type, undefined, undefined);
-        }
-        function getTypeFromTypeNode(node, aliasSymbol, aliasTypeArguments) {
+        function getTypeFromTypeNode(node) {
             switch (node.kind) {
                 case 118:
-                case 258:
-                case 259:
+                case 263:
+                case 264:
                     return anyType;
-                case 133:
+                case 134:
                     return stringType;
-                case 131:
+                case 132:
                     return numberType;
                 case 121:
                     return booleanType;
-                case 134:
+                case 135:
                     return esSymbolType;
                 case 104:
                     return voidType;
-                case 136:
+                case 137:
                     return undefinedType;
                 case 94:
                     return nullType;
-                case 128:
+                case 129:
                     return neverType;
-                case 283:
+                case 288:
                     return nullType;
-                case 284:
+                case 289:
                     return undefinedType;
-                case 285:
+                case 290:
                     return neverType;
-                case 166:
+                case 167:
                 case 98:
                     return getTypeFromThisTypeNode(node);
-                case 167:
+                case 171:
                     return getTypeFromLiteralTypeNode(node);
-                case 282:
+                case 287:
                     return getTypeFromLiteralTypeNode(node.literal);
-                case 156:
-                case 267:
-                    return getTypeFromTypeReference(node);
-                case 155:
-                    return booleanType;
-                case 195:
-                    return getTypeFromTypeReference(node);
-                case 159:
-                    return getTypeFromTypeQueryNode(node);
-                case 161:
-                case 260:
-                    return getTypeFromArrayTypeNode(node);
-                case 162:
-                    return getTypeFromTupleTypeNode(node);
-                case 163:
-                case 261:
-                    return getTypeFromUnionTypeNode(node, aliasSymbol, aliasTypeArguments);
-                case 164:
-                    return getTypeFromIntersectionTypeNode(node, aliasSymbol, aliasTypeArguments);
-                case 165:
-                case 263:
-                case 264:
-                case 271:
-                case 272:
-                case 268:
-                    return getTypeFromTypeNode(node.type);
-                case 265:
-                    return getTypeFromTypeNode(node.literal);
                 case 157:
-                case 158:
+                case 272:
+                    return getTypeFromTypeReference(node);
+                case 156:
+                    return booleanType;
+                case 199:
+                    return getTypeFromTypeReference(node);
                 case 160:
-                case 281:
+                    return getTypeFromTypeQueryNode(node);
+                case 162:
+                case 265:
+                    return getTypeFromArrayTypeNode(node);
+                case 163:
+                    return getTypeFromTupleTypeNode(node);
+                case 164:
+                case 266:
+                    return getTypeFromUnionTypeNode(node);
+                case 165:
+                    return getTypeFromIntersectionTypeNode(node);
+                case 166:
+                case 268:
                 case 269:
-                    return getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node, aliasSymbol, aliasTypeArguments);
+                case 276:
+                case 277:
+                case 273:
+                    return getTypeFromTypeNode(node.type);
+                case 270:
+                    return getTypeFromTypeNode(node.literal);
+                case 158:
+                case 159:
+                case 161:
+                case 286:
+                case 274:
+                    return getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node);
+                case 168:
+                    return getTypeFromTypeOperatorNode(node);
+                case 169:
+                    return getTypeFromIndexedAccessTypeNode(node);
+                case 170:
+                    return getTypeFromMappedTypeNode(node);
                 case 70:
-                case 140:
+                case 141:
                     var symbol = getSymbolAtLocation(node);
                     return symbol && getDeclaredTypeOfSymbol(symbol);
-                case 262:
+                case 267:
                     return getTypeFromJSDocTupleType(node);
-                case 270:
+                case 275:
                     return getTypeFromJSDocVariadicType(node);
                 default:
                     return unknownType;
@@ -24123,6 +25951,16 @@ var ts;
             }
             return items;
         }
+        function instantiateTypes(types, mapper) {
+            return instantiateList(types, mapper, instantiateType);
+        }
+        function instantiateSignatures(signatures, mapper) {
+            return instantiateList(signatures, mapper, instantiateSignature);
+        }
+        function instantiateCached(type, mapper, instantiator) {
+            var instantiations = mapper.instantiations || (mapper.instantiations = []);
+            return instantiations[type.id] || (instantiations[type.id] = instantiator(type, mapper));
+        }
         function createUnaryTypeMapper(source, target) {
             return function (t) { return t === source ? target : t; };
         }
@@ -24145,7 +25983,6 @@ var ts;
                 count == 2 ? createBinaryTypeMapper(sources[0], targets ? targets[0] : anyType, sources[1], targets ? targets[1] : anyType) :
                     createArrayTypeMapper(sources, targets);
             mapper.mappedTypes = sources;
-            mapper.targetTypes = targets;
             return mapper;
         }
         function createTypeEraser(sources) {
@@ -24235,45 +26072,46 @@ var ts;
             return result;
         }
         function instantiateAnonymousType(type, mapper) {
-            if (mapper.instantiations) {
-                var cachedType = mapper.instantiations[type.id];
-                if (cachedType) {
-                    return cachedType;
-                }
-            }
-            else {
-                mapper.instantiations = [];
-            }
-            var result = createObjectType(2097152 | 4194304, type.symbol);
-            result.target = type;
-            result.mapper = mapper;
+            var result = createObjectType(16 | 64, type.symbol);
+            result.target = type.objectFlags & 64 ? type.target : type;
+            result.mapper = type.objectFlags & 64 ? combineTypeMappers(type.mapper, mapper) : mapper;
             result.aliasSymbol = type.aliasSymbol;
-            result.aliasTypeArguments = mapper.targetTypes;
-            mapper.instantiations[type.id] = result;
+            result.aliasTypeArguments = instantiateTypes(type.aliasTypeArguments, mapper);
+            return result;
+        }
+        function instantiateMappedType(type, mapper) {
+            var result = createObjectType(32 | 64, type.symbol);
+            result.declaration = type.declaration;
+            result.mapper = type.mapper ? combineTypeMappers(type.mapper, mapper) : mapper;
+            result.aliasSymbol = type.aliasSymbol;
+            result.aliasTypeArguments = instantiateTypes(type.aliasTypeArguments, mapper);
             return result;
         }
         function isSymbolInScopeOfMappedTypeParameter(symbol, mapper) {
+            if (!(symbol.declarations && symbol.declarations.length)) {
+                return false;
+            }
             var mappedTypes = mapper.mappedTypes;
             var node = symbol.declarations[0].parent;
             while (node) {
                 switch (node.kind) {
-                    case 157:
                     case 158:
-                    case 221:
-                    case 148:
-                    case 147:
+                    case 159:
+                    case 225:
                     case 149:
-                    case 152:
+                    case 148:
+                    case 150:
                     case 153:
                     case 154:
-                    case 150:
+                    case 155:
                     case 151:
-                    case 180:
-                    case 181:
-                    case 222:
-                    case 193:
-                    case 223:
-                    case 224:
+                    case 152:
+                    case 184:
+                    case 185:
+                    case 226:
+                    case 197:
+                    case 227:
+                    case 228:
                         var declaration = node;
                         if (declaration.typeParameters) {
                             for (var _i = 0, _a = declaration.typeParameters; _i < _a.length; _i++) {
@@ -24283,69 +26121,97 @@ var ts;
                                 }
                             }
                         }
-                        if (ts.isClassLike(node) || node.kind === 223) {
+                        if (ts.isClassLike(node) || node.kind === 227) {
                             var thisType = getDeclaredTypeOfClassOrInterface(getSymbolOfNode(node)).thisType;
                             if (thisType && ts.contains(mappedTypes, thisType)) {
                                 return true;
                             }
                         }
                         break;
-                    case 226:
-                    case 256:
+                    case 230:
+                    case 261:
                         return false;
                 }
                 node = node.parent;
             }
             return false;
         }
+        function isTopLevelTypeAlias(symbol) {
+            if (symbol.declarations && symbol.declarations.length) {
+                var parentKind = symbol.declarations[0].parent.kind;
+                return parentKind === 261 || parentKind === 231;
+            }
+            return false;
+        }
         function instantiateType(type, mapper) {
             if (type && mapper !== identityMapper) {
-                if (type.flags & 16384) {
-                    return mapper(type);
+                if (type.aliasSymbol && isTopLevelTypeAlias(type.aliasSymbol)) {
+                    if (type.aliasTypeArguments) {
+                        return getTypeAliasInstantiation(type.aliasSymbol, instantiateTypes(type.aliasTypeArguments, mapper));
+                    }
+                    return type;
                 }
-                if (type.flags & 2097152) {
+                return instantiateTypeNoAlias(type, mapper);
+            }
+            return type;
+        }
+        function instantiateTypeNoAlias(type, mapper) {
+            if (type.flags & 16384) {
+                return mapper(type);
+            }
+            if (type.flags & 32768) {
+                if (type.objectFlags & 16) {
                     return type.symbol &&
                         type.symbol.flags & (16 | 8192 | 32 | 2048 | 4096) &&
-                        (type.flags & 4194304 || isSymbolInScopeOfMappedTypeParameter(type.symbol, mapper)) ?
-                        instantiateAnonymousType(type, mapper) : type;
+                        (type.objectFlags & 64 || isSymbolInScopeOfMappedTypeParameter(type.symbol, mapper)) ?
+                        instantiateCached(type, mapper, instantiateAnonymousType) : type;
                 }
-                if (type.flags & 131072) {
-                    return createTypeReference(type.target, instantiateList(type.typeArguments, mapper, instantiateType));
+                if (type.objectFlags & 32) {
+                    return instantiateCached(type, mapper, instantiateMappedType);
                 }
-                if (type.flags & 524288 && !(type.flags & 8190)) {
-                    return getUnionType(instantiateList(type.types, mapper, instantiateType), false, type.aliasSymbol, mapper.targetTypes);
-                }
-                if (type.flags & 1048576) {
-                    return getIntersectionType(instantiateList(type.types, mapper, instantiateType), type.aliasSymbol, mapper.targetTypes);
+                if (type.objectFlags & 4) {
+                    return createTypeReference(type.target, instantiateTypes(type.typeArguments, mapper));
                 }
             }
+            if (type.flags & 65536 && !(type.flags & 8190)) {
+                return getUnionType(instantiateTypes(type.types, mapper), false, type.aliasSymbol, instantiateTypes(type.aliasTypeArguments, mapper));
+            }
+            if (type.flags & 131072) {
+                return getIntersectionType(instantiateTypes(type.types, mapper), type.aliasSymbol, instantiateTypes(type.aliasTypeArguments, mapper));
+            }
+            if (type.flags & 262144) {
+                return getIndexType(instantiateType(type.type, mapper));
+            }
+            if (type.flags & 524288) {
+                return getIndexedAccessType(instantiateType(type.objectType, mapper), instantiateType(type.indexType, mapper));
+            }
             return type;
         }
         function instantiateIndexInfo(info, mapper) {
             return info && createIndexInfo(instantiateType(info.type, mapper), info.isReadonly, info.declaration);
         }
         function isContextSensitive(node) {
-            ts.Debug.assert(node.kind !== 148 || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 149 || ts.isObjectLiteralMethod(node));
             switch (node.kind) {
-                case 180:
-                case 181:
+                case 184:
+                case 185:
                     return isContextSensitiveFunctionLikeDeclaration(node);
-                case 172:
+                case 176:
                     return ts.forEach(node.properties, isContextSensitive);
-                case 171:
+                case 175:
                     return ts.forEach(node.elements, isContextSensitive);
-                case 189:
+                case 193:
                     return isContextSensitive(node.whenTrue) ||
                         isContextSensitive(node.whenFalse);
-                case 188:
+                case 192:
                     return node.operatorToken.kind === 53 &&
                         (isContextSensitive(node.left) || isContextSensitive(node.right));
-                case 253:
+                case 257:
                     return isContextSensitive(node.initializer);
+                case 149:
                 case 148:
-                case 147:
                     return isContextSensitiveFunctionLikeDeclaration(node);
-                case 179:
+                case 183:
                     return isContextSensitive(node.expression);
             }
             return false;
@@ -24357,7 +26223,7 @@ var ts;
             if (ts.forEach(node.parameters, function (p) { return !p.type; })) {
                 return true;
             }
-            if (node.kind === 181) {
+            if (node.kind === 185) {
                 return false;
             }
             var parameter = ts.firstOrUndefined(node.parameters);
@@ -24367,10 +26233,10 @@ var ts;
             return (isFunctionExpressionOrArrowFunction(func) || ts.isObjectLiteralMethod(func)) && isContextSensitiveFunctionLikeDeclaration(func);
         }
         function getTypeWithoutSignatures(type) {
-            if (type.flags & 2588672) {
+            if (type.flags & 32768) {
                 var resolved = resolveStructuredTypeMembers(type);
                 if (resolved.constructSignatures.length) {
-                    var result = createObjectType(2097152, type.symbol);
+                    var result = createObjectType(16, type.symbol);
                     result.members = resolved.members;
                     result.properties = resolved.properties;
                     result.callSignatures = emptyArray;
@@ -24549,7 +26415,7 @@ var ts;
             }
             if (source.symbol.name !== target.symbol.name ||
                 !(source.symbol.flags & 256) || !(target.symbol.flags & 256) ||
-                (source.flags & 524288) !== (target.flags & 524288)) {
+                (source.flags & 65536) !== (target.flags & 65536)) {
                 return enumRelation[id] = false;
             }
             var targetEnumType = getTypeOfSymbol(target.symbol);
@@ -24606,23 +26472,23 @@ var ts;
             return false;
         }
         function isTypeRelatedTo(source, target, relation) {
-            if (source.flags & 96 && source.flags & 16777216) {
+            if (source.flags & 96 && source.flags & 1048576) {
                 source = source.regularType;
             }
-            if (target.flags & 96 && target.flags & 16777216) {
+            if (target.flags & 96 && target.flags & 1048576) {
                 target = target.regularType;
             }
             if (source === target || relation !== identityRelation && isSimpleTypeRelatedTo(source, target, relation)) {
                 return true;
             }
-            if (source.flags & 2588672 && target.flags & 2588672) {
+            if (source.flags & 32768 && target.flags & 32768) {
                 var id = relation !== identityRelation || source.id < target.id ? source.id + "," + target.id : target.id + "," + source.id;
                 var related = relation[id];
                 if (related !== undefined) {
                     return related === 1;
                 }
             }
-            if (source.flags & 4177920 || target.flags & 4177920) {
+            if (source.flags & 507904 || target.flags & 507904) {
                 return checkTypeRelatedTo(source, target, relation, undefined, undefined, undefined);
             }
             return false;
@@ -24659,9 +26525,15 @@ var ts;
                     targetType = typeToString(target, undefined, 128);
                 }
                 if (!message) {
-                    message = relation === comparableRelation ?
-                        ts.Diagnostics.Type_0_is_not_comparable_to_type_1 :
-                        ts.Diagnostics.Type_0_is_not_assignable_to_type_1;
+                    if (relation === comparableRelation) {
+                        message = ts.Diagnostics.Type_0_is_not_comparable_to_type_1;
+                    }
+                    else if (sourceType === targetType) {
+                        message = ts.Diagnostics.Type_0_is_not_assignable_to_type_1_Two_different_types_with_this_name_exist_but_they_are_unrelated;
+                    }
+                    else {
+                        message = ts.Diagnostics.Type_0_is_not_assignable_to_type_1;
+                    }
                 }
                 reportError(message, sourceType, targetType);
             }
@@ -24677,10 +26549,10 @@ var ts;
             }
             function isRelatedTo(source, target, reportErrors, headMessage) {
                 var result;
-                if (source.flags & 96 && source.flags & 16777216) {
+                if (source.flags & 96 && source.flags & 1048576) {
                     source = source.regularType;
                 }
-                if (target.flags & 96 && target.flags & 16777216) {
+                if (target.flags & 96 && target.flags & 1048576) {
                     target = target.regularType;
                 }
                 if (source === target)
@@ -24690,19 +26562,24 @@ var ts;
                 }
                 if (isSimpleTypeRelatedTo(source, target, relation, reportErrors ? reportError : undefined))
                     return -1;
-                if (source.flags & 8388608 && source.flags & 16777216) {
+                if (source.flags & 262144) {
+                    if (maybeTypeOfKind(target, 2) && maybeTypeOfKind(target, 4)) {
+                        return -1;
+                    }
+                }
+                if (getObjectFlags(source) & 128 && source.flags & 1048576) {
                     if (hasExcessProperties(source, target, reportErrors)) {
                         if (reportErrors) {
                             reportRelationError(headMessage, source, target);
                         }
                         return 0;
                     }
-                    if (target.flags & 1572864) {
+                    if (target.flags & 196608) {
                         source = getRegularTypeOfObjectLiteral(source);
                     }
                 }
                 var saveErrorInfo = errorInfo;
-                if (source.flags & 524288) {
+                if (source.flags & 65536) {
                     if (relation === comparableRelation) {
                         result = someTypeRelatedToType(source, target, reportErrors && !(source.flags & 8190));
                     }
@@ -24713,20 +26590,38 @@ var ts;
                         return result;
                     }
                 }
-                else if (target.flags & 1048576) {
-                    result = typeRelatedToEachType(source, target, reportErrors);
-                    if (result) {
+                else if (target.flags & 65536) {
+                    if (result = typeRelatedToSomeType(source, target, reportErrors && !(source.flags & 8190) && !(target.flags & 8190))) {
                         return result;
                     }
                 }
-                else {
-                    if (source.flags & 1048576) {
-                        if (result = someTypeRelatedToType(source, target, false)) {
+                else if (target.flags & 131072) {
+                    if (result = typeRelatedToEachType(source, target, reportErrors)) {
+                        return result;
+                    }
+                }
+                else if (source.flags & 131072) {
+                    if (result = someTypeRelatedToType(source, target, false)) {
+                        return result;
+                    }
+                }
+                if (target.flags & 16384) {
+                    var constraint = getConstraintOfTypeParameter(target);
+                    if (constraint && constraint.flags & 262144) {
+                        if (result = isRelatedTo(source, constraint, reportErrors)) {
                             return result;
                         }
                     }
-                    if (target.flags & 524288) {
-                        if (result = typeRelatedToSomeType(source, target, reportErrors && !(source.flags & 8190) && !(target.flags & 8190))) {
+                }
+                else if (target.flags & 262144) {
+                    if (source.flags & 262144) {
+                        if (result = isRelatedTo(target.type, source.type, false)) {
+                            return result;
+                        }
+                    }
+                    var constraint = getConstraintOfTypeParameter(target.type);
+                    if (constraint) {
+                        if (result = isRelatedTo(source, getIndexType(constraint), reportErrors)) {
                             return result;
                         }
                     }
@@ -24744,25 +26639,35 @@ var ts;
                     }
                 }
                 else {
-                    if (source.flags & 131072 && target.flags & 131072 && source.target === target.target) {
+                    if (getObjectFlags(source) & 4 && getObjectFlags(target) & 4 && source.target === target.target) {
                         if (result = typeArgumentsRelatedTo(source, target, reportErrors)) {
                             return result;
                         }
                     }
-                    var apparentSource = getApparentType(source);
-                    if (apparentSource.flags & (2588672 | 1048576) && target.flags & 2588672) {
-                        var reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo && !(source.flags & 8190);
-                        if (result = objectTypeRelatedTo(apparentSource, source, target, reportStructuralErrors)) {
-                            errorInfo = saveErrorInfo;
-                            return result;
+                    if (isGenericMappedType(target)) {
+                        if (isGenericMappedType(source)) {
+                            if ((result = isRelatedTo(getConstraintTypeFromMappedType(target), getConstraintTypeFromMappedType(source), reportErrors)) &&
+                                (result = isRelatedTo(getTemplateTypeFromMappedType(source), getTemplateTypeFromMappedType(target), reportErrors))) {
+                                return result;
+                            }
+                        }
+                    }
+                    else {
+                        var apparentSource = getApparentType(source);
+                        if (apparentSource.flags & (32768 | 131072) && target.flags & 32768) {
+                            var reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo && !(source.flags & 8190);
+                            if (result = objectTypeRelatedTo(apparentSource, source, target, reportStructuralErrors)) {
+                                errorInfo = saveErrorInfo;
+                                return result;
+                            }
                         }
                     }
                 }
                 if (reportErrors) {
-                    if (source.flags & 2588672 && target.flags & 8190) {
+                    if (source.flags & 32768 && target.flags & 8190) {
                         tryElaborateErrorsForPrimitivesAndObjects(source, target);
                     }
-                    else if (source.symbol && source.flags & 2588672 && globalObjectType === source) {
+                    else if (source.symbol && source.flags & 32768 && globalObjectType === source) {
                         reportError(ts.Diagnostics.The_Object_type_is_assignable_to_very_few_other_types_Did_you_mean_to_use_the_any_type_instead);
                     }
                     reportRelationError(headMessage, source, target);
@@ -24771,16 +26676,16 @@ var ts;
             }
             function isIdenticalTo(source, target) {
                 var result;
-                if (source.flags & 2588672 && target.flags & 2588672) {
-                    if (source.flags & 131072 && target.flags & 131072 && source.target === target.target) {
+                if (source.flags & 32768 && target.flags & 32768) {
+                    if (getObjectFlags(source) & 4 && getObjectFlags(target) & 4 && source.target === target.target) {
                         if (result = typeArgumentsRelatedTo(source, target, false)) {
                             return result;
                         }
                     }
                     return objectTypeRelatedTo(source, source, target, false);
                 }
-                if (source.flags & 524288 && target.flags & 524288 ||
-                    source.flags & 1048576 && target.flags & 1048576) {
+                if (source.flags & 65536 && target.flags & 65536 ||
+                    source.flags & 131072 && target.flags & 131072) {
                     if (result = eachTypeRelatedToSomeType(source, target)) {
                         if (result &= eachTypeRelatedToSomeType(target, source)) {
                             return result;
@@ -24790,7 +26695,7 @@ var ts;
                 return 0;
             }
             function isKnownProperty(type, name) {
-                if (type.flags & 2588672) {
+                if (type.flags & 32768) {
                     var resolved = resolveStructuredTypeMembers(type);
                     if ((relation === assignableRelation || relation === comparableRelation) && (type === globalObjectType || isEmptyObjectType(resolved)) ||
                         resolved.stringIndexInfo ||
@@ -24799,7 +26704,7 @@ var ts;
                         return true;
                     }
                 }
-                else if (type.flags & 1572864) {
+                else if (type.flags & 196608) {
                     for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                         var t = _a[_i];
                         if (isKnownProperty(t, name)) {
@@ -24817,8 +26722,7 @@ var ts;
                     !t.numberIndexInfo;
             }
             function hasExcessProperties(source, target, reportErrors) {
-                if (maybeTypeOfKind(target, 2588672) &&
-                    (!(target.flags & 2588672) || !target.isObjectLiteralPatternWithComputedProperties)) {
+                if (maybeTypeOfKind(target, 32768) && !(getObjectFlags(target) & 512)) {
                     for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
                         var prop = _a[_i];
                         if (!isKnownProperty(target, prop.name)) {
@@ -24848,7 +26752,7 @@ var ts;
             }
             function typeRelatedToSomeType(source, target, reportErrors) {
                 var targetTypes = target.types;
-                if (target.flags & 524288 && containsType(targetTypes, source)) {
+                if (target.flags & 65536 && containsType(targetTypes, source)) {
                     return -1;
                 }
                 var len = targetTypes.length;
@@ -24875,7 +26779,7 @@ var ts;
             }
             function someTypeRelatedToType(source, target, reportErrors) {
                 var sourceTypes = source.types;
-                if (source.flags & 524288 && containsType(sourceTypes, target)) {
+                if (source.flags & 65536 && containsType(sourceTypes, target)) {
                     return -1;
                 }
                 var len = sourceTypes.length;
@@ -24995,9 +26899,9 @@ var ts;
                 }
                 var result = -1;
                 var properties = getPropertiesOfObjectType(target);
-                var requireOptionalProperties = relation === subtypeRelation && !(source.flags & 8388608);
-                for (var _i = 0, properties_2 = properties; _i < properties_2.length; _i++) {
-                    var targetProp = properties_2[_i];
+                var requireOptionalProperties = relation === subtypeRelation && !(getObjectFlags(source) & 128);
+                for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
+                    var targetProp = properties_3[_i];
                     var sourceProp = getPropertyOfType(source, targetProp.name);
                     if (sourceProp !== targetProp) {
                         if (!sourceProp) {
@@ -25049,7 +26953,7 @@ var ts;
                                 return 0;
                             }
                             result &= related;
-                            if (sourceProp.flags & 536870912 && !(targetProp.flags & 536870912)) {
+                            if (relation !== comparableRelation && sourceProp.flags & 536870912 && !(targetProp.flags & 536870912)) {
                                 if (reportErrors) {
                                     reportError(ts.Diagnostics.Property_0_is_optional_in_type_1_but_required_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
                                 }
@@ -25061,7 +26965,7 @@ var ts;
                 return result;
             }
             function propertiesIdenticalTo(source, target) {
-                if (!(source.flags & 2588672 && target.flags & 2588672)) {
+                if (!(source.flags & 32768 && target.flags & 32768)) {
                     return 0;
                 }
                 var sourceProperties = getPropertiesOfObjectType(source);
@@ -25233,7 +27137,7 @@ var ts;
             }
         }
         function isAbstractConstructorType(type) {
-            if (type.flags & 2097152) {
+            if (getObjectFlags(type) & 16) {
                 var symbol = type.symbol;
                 if (symbol && symbol.flags & 32) {
                     var declaration = getClassLikeDeclarationOfSymbol(symbol);
@@ -25245,12 +27149,12 @@ var ts;
             return false;
         }
         function isDeeplyNestedGeneric(type, stack, depth) {
-            if (type.flags & (131072 | 4194304) && depth >= 5) {
+            if (getObjectFlags(type) & (4 | 64) && depth >= 5) {
                 var symbol = type.symbol;
                 var count = 0;
                 for (var i = 0; i < depth; i++) {
                     var t = stack[i];
-                    if (t.flags & (131072 | 4194304) && t.symbol === symbol) {
+                    if (getObjectFlags(t) & (4 | 64) && t.symbol === symbol) {
                         count++;
                         if (count >= 5)
                             return true;
@@ -25408,10 +27312,10 @@ var ts;
             checkTypeSubtypeOf(bestSupertypeDownfallType, bestSupertype, errorLocation, ts.Diagnostics.Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0, errorMessageChainHead);
         }
         function isArrayType(type) {
-            return type.flags & 131072 && type.target === globalArrayType;
+            return getObjectFlags(type) & 4 && type.target === globalArrayType;
         }
         function isArrayLikeType(type) {
-            return type.flags & 131072 && (type.target === globalArrayType || type.target === globalReadonlyArrayType) ||
+            return getObjectFlags(type) & 4 && (type.target === globalArrayType || type.target === globalReadonlyArrayType) ||
                 !(type.flags & 6144) && isTypeAssignableTo(type, anyReadonlyArrayType);
         }
         function isTupleLikeType(type) {
@@ -25422,7 +27326,7 @@ var ts;
         }
         function isLiteralType(type) {
             return type.flags & 8 ? true :
-                type.flags & 524288 ? type.flags & 16 ? true : !ts.forEach(type.types, function (t) { return !isUnitType(t); }) :
+                type.flags & 65536 ? type.flags & 16 ? true : !ts.forEach(type.types, function (t) { return !isUnitType(t); }) :
                     isUnitType(type);
         }
         function getBaseTypeOfLiteralType(type) {
@@ -25430,19 +27334,19 @@ var ts;
                 type.flags & 64 ? numberType :
                     type.flags & 128 ? booleanType :
                         type.flags & 256 ? type.baseType :
-                            type.flags & 524288 && !(type.flags & 16) ? getUnionType(ts.sameMap(type.types, getBaseTypeOfLiteralType)) :
+                            type.flags & 65536 && !(type.flags & 16) ? getUnionType(ts.sameMap(type.types, getBaseTypeOfLiteralType)) :
                                 type;
         }
         function getWidenedLiteralType(type) {
-            return type.flags & 32 && type.flags & 16777216 ? stringType :
-                type.flags & 64 && type.flags & 16777216 ? numberType :
+            return type.flags & 32 && type.flags & 1048576 ? stringType :
+                type.flags & 64 && type.flags & 1048576 ? numberType :
                     type.flags & 128 ? booleanType :
                         type.flags & 256 ? type.baseType :
-                            type.flags & 524288 && !(type.flags & 16) ? getUnionType(ts.sameMap(type.types, getWidenedLiteralType)) :
+                            type.flags & 65536 && !(type.flags & 16) ? getUnionType(ts.sameMap(type.types, getWidenedLiteralType)) :
                                 type;
         }
         function isTupleType(type) {
-            return !!(type.flags & 131072 && type.target.flags & 262144);
+            return !!(getObjectFlags(type) & 4 && type.target.objectFlags & 8);
         }
         function getFalsyFlagsOfTypes(types) {
             var result = 0;
@@ -25453,7 +27357,7 @@ var ts;
             return result;
         }
         function getFalsyFlags(type) {
-            return type.flags & 524288 ? getFalsyFlagsOfTypes(type.types) :
+            return type.flags & 65536 ? getFalsyFlagsOfTypes(type.types) :
                 type.flags & 32 ? type.text === "" ? 32 : 0 :
                     type.flags & 64 ? type.text === "0" ? 64 : 0 :
                         type.flags & 128 ? type === falseType ? 128 : 0 :
@@ -25514,7 +27418,7 @@ var ts;
             return members;
         }
         function getRegularTypeOfObjectLiteral(type) {
-            if (!(type.flags & 8388608 && type.flags & 16777216)) {
+            if (!(getObjectFlags(type) & 128 && type.flags & 1048576)) {
                 return type;
             }
             var regularType = type.regularType;
@@ -25524,7 +27428,8 @@ var ts;
             var resolved = type;
             var members = transformTypeOfMembers(type, getRegularTypeOfObjectLiteral);
             var regularNew = createAnonymousType(resolved.symbol, members, resolved.callSignatures, resolved.constructSignatures, resolved.stringIndexInfo, resolved.numberIndexInfo);
-            regularNew.flags = resolved.flags & ~16777216;
+            regularNew.flags = resolved.flags & ~1048576;
+            regularNew.objectFlags |= 128;
             type.regularType = regularNew;
             return regularNew;
         }
@@ -25541,14 +27446,14 @@ var ts;
             return type.flags & 6144 ? type : getWidenedType(type);
         }
         function getWidenedType(type) {
-            if (type.flags & 100663296) {
+            if (type.flags & 6291456) {
                 if (type.flags & 6144) {
                     return anyType;
                 }
-                if (type.flags & 8388608) {
+                if (getObjectFlags(type) & 128) {
                     return getWidenedTypeOfObjectLiteral(type);
                 }
-                if (type.flags & 524288) {
+                if (type.flags & 65536) {
                     return getUnionType(ts.sameMap(type.types, getWidenedConstituentType));
                 }
                 if (isArrayType(type) || isTupleType(type)) {
@@ -25559,7 +27464,7 @@ var ts;
         }
         function reportWideningErrorsInType(type) {
             var errorReported = false;
-            if (type.flags & 524288) {
+            if (type.flags & 65536) {
                 for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                     var t = _a[_i];
                     if (reportWideningErrorsInType(t)) {
@@ -25575,11 +27480,11 @@ var ts;
                     }
                 }
             }
-            if (type.flags & 8388608) {
+            if (getObjectFlags(type) & 128) {
                 for (var _d = 0, _e = getPropertiesOfObjectType(type); _d < _e.length; _d++) {
                     var p = _e[_d];
                     var t = getTypeOfSymbol(p);
-                    if (t.flags & 33554432) {
+                    if (t.flags & 2097152) {
                         if (!reportWideningErrorsInType(t)) {
                             error(p.valueDeclaration, ts.Diagnostics.Object_literal_s_property_0_implicitly_has_an_1_type, p.name, typeToString(getWidenedType(t)));
                         }
@@ -25593,25 +27498,25 @@ var ts;
             var typeAsString = typeToString(getWidenedType(type));
             var diagnostic;
             switch (declaration.kind) {
+                case 147:
                 case 146:
-                case 145:
                     diagnostic = ts.Diagnostics.Member_0_implicitly_has_an_1_type;
                     break;
-                case 143:
+                case 144:
                     diagnostic = declaration.dotDotDotToken ?
                         ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type :
                         ts.Diagnostics.Parameter_0_implicitly_has_an_1_type;
                     break;
-                case 170:
+                case 174:
                     diagnostic = ts.Diagnostics.Binding_element_0_implicitly_has_an_1_type;
                     break;
-                case 221:
+                case 225:
+                case 149:
                 case 148:
-                case 147:
-                case 150:
                 case 151:
-                case 180:
-                case 181:
+                case 152:
+                case 184:
+                case 185:
                     if (!declaration.name) {
                         error(declaration, ts.Diagnostics.Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
                         return;
@@ -25624,7 +27529,7 @@ var ts;
             error(declaration, diagnostic, ts.declarationNameToString(declaration.name), typeAsString);
         }
         function reportErrorsFromWidening(declaration, type) {
-            if (produceDiagnostics && compilerOptions.noImplicitAny && type.flags & 33554432) {
+            if (produceDiagnostics && compilerOptions.noImplicitAny && type.flags & 2097152) {
                 if (!reportWideningErrorsInType(type)) {
                     reportImplicitAnyError(declaration, type);
                 }
@@ -25668,10 +27573,12 @@ var ts;
             };
         }
         function couldContainTypeParameters(type) {
+            var objectFlags = getObjectFlags(type);
             return !!(type.flags & 16384 ||
-                type.flags & 131072 && ts.forEach(type.typeArguments, couldContainTypeParameters) ||
-                type.flags & 2097152 && type.symbol && type.symbol.flags & (8192 | 2048 | 32) ||
-                type.flags & 1572864 && couldUnionOrIntersectionContainTypeParameters(type));
+                objectFlags & 4 && ts.forEach(type.typeArguments, couldContainTypeParameters) ||
+                objectFlags & 16 && type.symbol && type.symbol.flags & (8192 | 2048 | 32) ||
+                objectFlags & 32 ||
+                type.flags & 196608 && couldUnionOrIntersectionContainTypeParameters(type));
         }
         function couldUnionOrIntersectionContainTypeParameters(type) {
             if (type.couldContainTypeParameters === undefined) {
@@ -25680,7 +27587,7 @@ var ts;
             return type.couldContainTypeParameters;
         }
         function isTypeParameterAtTopLevel(type, typeParameter) {
-            return type === typeParameter || type.flags & 1572864 && ts.forEach(type.types, function (t) { return isTypeParameterAtTopLevel(t, typeParameter); });
+            return type === typeParameter || type.flags & 196608 && ts.forEach(type.types, function (t) { return isTypeParameterAtTopLevel(t, typeParameter); });
         }
         function inferTypes(context, originalSource, originalTarget) {
             var typeParameters = context.signature.typeParameters;
@@ -25702,8 +27609,16 @@ var ts;
                 if (!couldContainTypeParameters(target)) {
                     return;
                 }
-                if (source.flags & 524288 && target.flags & 524288 && !(source.flags & 16 && target.flags & 16) ||
-                    source.flags & 1048576 && target.flags & 1048576) {
+                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]);
+                    }
+                    return;
+                }
+                if (source.flags & 65536 && target.flags & 65536 && !(source.flags & 16 && target.flags & 16) ||
+                    source.flags & 131072 && target.flags & 131072) {
                     if (source === target) {
                         for (var _i = 0, _a = source.types; _i < _a.length; _i++) {
                             var t = _a[_i];
@@ -25731,7 +27646,7 @@ var ts;
                     }
                 }
                 if (target.flags & 16384) {
-                    if (source.flags & 134217728) {
+                    if (source.flags & 8388608) {
                         return;
                     }
                     for (var i = 0; i < typeParameters.length; i++) {
@@ -25752,7 +27667,7 @@ var ts;
                         }
                     }
                 }
-                else if (source.flags & 131072 && target.flags & 131072 && source.target === target.target) {
+                else if (getObjectFlags(source) & 4 && getObjectFlags(target) & 4 && source.target === target.target) {
                     var sourceTypes = source.typeArguments || emptyArray;
                     var targetTypes = target.typeArguments || emptyArray;
                     var count = sourceTypes.length < targetTypes.length ? sourceTypes.length : targetTypes.length;
@@ -25760,7 +27675,7 @@ var ts;
                         inferFromTypes(sourceTypes[i], targetTypes[i]);
                     }
                 }
-                else if (target.flags & 1572864) {
+                else if (target.flags & 196608) {
                     var targetTypes = target.types;
                     var typeParameterCount = 0;
                     var typeParameter = void 0;
@@ -25780,7 +27695,7 @@ var ts;
                         inferiority--;
                     }
                 }
-                else if (source.flags & 1572864) {
+                else if (source.flags & 196608) {
                     var sourceTypes = source.types;
                     for (var _e = 0, sourceTypes_3 = sourceTypes; _e < sourceTypes_3.length; _e++) {
                         var sourceType = sourceTypes_3[_e];
@@ -25788,8 +27703,21 @@ var ts;
                     }
                 }
                 else {
+                    if (getObjectFlags(target) & 32) {
+                        var constraintType = getConstraintTypeFromMappedType(target);
+                        if (getObjectFlags(source) & 32) {
+                            inferFromTypes(getConstraintTypeFromMappedType(source), constraintType);
+                            inferFromTypes(getTemplateTypeFromMappedType(source), getTemplateTypeFromMappedType(target));
+                            return;
+                        }
+                        if (constraintType.flags & 16384) {
+                            inferFromTypes(getIndexType(source), constraintType);
+                            inferFromTypes(getUnionType(ts.map(getPropertiesOfType(source), getTypeOfSymbol)), getTemplateTypeFromMappedType(target));
+                            return;
+                        }
+                    }
                     source = getApparentType(source);
-                    if (source.flags & 2588672) {
+                    if (source.flags & 32768) {
                         if (isInProcess(source, target)) {
                             return;
                         }
@@ -25818,8 +27746,8 @@ var ts;
             }
             function inferFromProperties(source, target) {
                 var properties = getPropertiesOfObjectType(target);
-                for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
-                    var targetProp = properties_3[_i];
+                for (var _i = 0, properties_4 = properties; _i < properties_4.length; _i++) {
+                    var targetProp = properties_4[_i];
                     var sourceProp = getPropertyOfObjectType(source, targetProp.name);
                     if (sourceProp) {
                         inferFromTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp));
@@ -25885,7 +27813,7 @@ var ts;
                     reducedTypes.push(t);
                 }
             }
-            return type.flags & 524288 ? getUnionType(reducedTypes) : getIntersectionType(reducedTypes);
+            return type.flags & 65536 ? getUnionType(reducedTypes) : getIntersectionType(reducedTypes);
         }
         function getInferenceCandidates(context, index) {
             var inferences = context.inferences[index];
@@ -25893,7 +27821,7 @@ var ts;
         }
         function hasPrimitiveConstraint(type) {
             var constraint = getConstraintOfTypeParameter(type);
-            return constraint && maybeTypeOfKind(constraint, 8190);
+            return constraint && maybeTypeOfKind(constraint, 8190 | 262144);
         }
         function getInferredType(context, index) {
             var inferredType = context.inferredTypes[index];
@@ -25946,10 +27874,10 @@ var ts;
         function isInTypeQuery(node) {
             while (node) {
                 switch (node.kind) {
-                    case 159:
+                    case 160:
                         return true;
                     case 70:
-                    case 140:
+                    case 141:
                         node = node.parent;
                         continue;
                     default:
@@ -25966,7 +27894,7 @@ var ts;
             if (node.kind === 98) {
                 return "0";
             }
-            if (node.kind === 173) {
+            if (node.kind === 177) {
                 var key = getFlowCacheKey(node.expression);
                 return key && key + "." + node.name.text;
             }
@@ -25977,7 +27905,7 @@ var ts;
                 case 70:
                 case 98:
                     return node;
-                case 173:
+                case 177:
                     return getLeftmostIdentifierOrThis(node.expression);
             }
             return undefined;
@@ -25986,19 +27914,19 @@ var ts;
             switch (source.kind) {
                 case 70:
                     return target.kind === 70 && getResolvedSymbol(source) === getResolvedSymbol(target) ||
-                        (target.kind === 219 || target.kind === 170) &&
+                        (target.kind === 223 || target.kind === 174) &&
                             getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(source)) === getSymbolOfNode(target);
                 case 98:
                     return target.kind === 98;
-                case 173:
-                    return target.kind === 173 &&
+                case 177:
+                    return target.kind === 177 &&
                         source.name.text === target.name.text &&
                         isMatchingReference(source.expression, target.expression);
             }
             return false;
         }
         function containsMatchingReference(source, target) {
-            while (source.kind === 173) {
+            while (source.kind === 177) {
                 source = source.expression;
                 if (isMatchingReference(source, target)) {
                     return true;
@@ -26007,7 +27935,7 @@ var ts;
             return false;
         }
         function containsMatchingReferenceDiscriminant(source, target) {
-            return target.kind === 173 &&
+            return target.kind === 177 &&
                 containsMatchingReference(source, target.expression) &&
                 isDiscriminantProperty(getDeclaredTypeOfReference(target.expression), target.name.text);
         }
@@ -26015,14 +27943,14 @@ var ts;
             if (expr.kind === 70) {
                 return getTypeOfSymbol(getResolvedSymbol(expr));
             }
-            if (expr.kind === 173) {
+            if (expr.kind === 177) {
                 var type = getDeclaredTypeOfReference(expr.expression);
                 return type && getTypeOfPropertyOfType(type, expr.name.text);
             }
             return undefined;
         }
         function isDiscriminantProperty(type, name) {
-            if (type && type.flags & 524288) {
+            if (type && type.flags & 65536) {
                 var prop = getUnionOrIntersectionProperty(type, name);
                 if (prop && prop.flags & 268435456) {
                     if (prop.isDiscriminantProperty === undefined) {
@@ -26045,7 +27973,7 @@ var ts;
                     }
                 }
             }
-            if (callExpression.expression.kind === 173 &&
+            if (callExpression.expression.kind === 177 &&
                 isOrContainsMatchingReference(reference, callExpression.expression.expression)) {
                 return true;
             }
@@ -26059,7 +27987,7 @@ var ts;
             return flow.id;
         }
         function typeMaybeAssignableTo(source, target) {
-            if (!(source.flags & 524288)) {
+            if (!(source.flags & 65536)) {
                 return isTypeAssignableTo(source, target);
             }
             for (var _i = 0, _a = source.types; _i < _a.length; _i++) {
@@ -26122,7 +28050,7 @@ var ts;
                     type === falseType ? 3030404 : 1981828 :
                     type === falseType ? 3145092 : 4193668;
             }
-            if (flags & 2588672) {
+            if (flags & 32768) {
                 return isFunctionObjectType(type) ?
                     strictNullChecks ? 6164448 : 8376288 :
                     strictNullChecks ? 6166480 : 8378320;
@@ -26140,7 +28068,7 @@ var ts;
                 var constraint = getConstraintOfTypeParameter(type);
                 return getTypeFacts(constraint || emptyObjectType);
             }
-            if (flags & 1572864) {
+            if (flags & 196608) {
                 return getTypeFactsOfTypes(type.types);
             }
             return 8388607;
@@ -26156,7 +28084,7 @@ var ts;
             return type;
         }
         function getTypeOfDestructuredProperty(type, name) {
-            var text = getTextOfPropertyName(name);
+            var text = ts.getTextOfPropertyName(name);
             return getTypeOfPropertyOfType(type, text) ||
                 isNumericLiteralName(text) && getIndexTypeOfType(type, 1) ||
                 getIndexTypeOfType(type, 0) ||
@@ -26167,19 +28095,19 @@ var ts;
                 checkIteratedTypeOrElementType(type, undefined, false) ||
                 unknownType;
         }
-        function getTypeOfDestructuredSpreadElement(type) {
+        function getTypeOfDestructuredSpreadExpression(type) {
             return createArrayType(checkIteratedTypeOrElementType(type, undefined, false) || unknownType);
         }
         function getAssignedTypeOfBinaryExpression(node) {
-            return node.parent.kind === 171 || node.parent.kind === 253 ?
+            return node.parent.kind === 175 || node.parent.kind === 257 ?
                 getTypeWithDefault(getAssignedType(node), node.right) :
                 checkExpression(node.right);
         }
         function getAssignedTypeOfArrayLiteralElement(node, element) {
             return getTypeOfDestructuredArrayElement(getAssignedType(node), ts.indexOf(node.elements, element));
         }
-        function getAssignedTypeOfSpreadElement(node) {
-            return getTypeOfDestructuredSpreadElement(getAssignedType(node.parent));
+        function getAssignedTypeOfSpreadExpression(node) {
+            return getTypeOfDestructuredSpreadExpression(getAssignedType(node.parent));
         }
         function getAssignedTypeOfPropertyAssignment(node) {
             return getTypeOfDestructuredProperty(getAssignedType(node.parent), node.name);
@@ -26190,21 +28118,21 @@ var ts;
         function getAssignedType(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 208:
+                case 212:
                     return stringType;
-                case 209:
+                case 213:
                     return checkRightHandSideOfForOf(parent.expression) || unknownType;
-                case 188:
-                    return getAssignedTypeOfBinaryExpression(parent);
-                case 182:
-                    return undefinedType;
-                case 171:
-                    return getAssignedTypeOfArrayLiteralElement(parent, node);
                 case 192:
-                    return getAssignedTypeOfSpreadElement(parent);
-                case 253:
+                    return getAssignedTypeOfBinaryExpression(parent);
+                case 186:
+                    return undefinedType;
+                case 175:
+                    return getAssignedTypeOfArrayLiteralElement(parent, node);
+                case 196:
+                    return getAssignedTypeOfSpreadExpression(parent);
+                case 257:
                     return getAssignedTypeOfPropertyAssignment(parent);
-                case 254:
+                case 258:
                     return getAssignedTypeOfShorthandPropertyAssignment(parent);
             }
             return unknownType;
@@ -26212,11 +28140,11 @@ var ts;
         function getInitialTypeOfBindingElement(node) {
             var pattern = node.parent;
             var parentType = getInitialType(pattern.parent);
-            var type = pattern.kind === 168 ?
+            var type = pattern.kind === 172 ?
                 getTypeOfDestructuredProperty(parentType, node.propertyName || node.name) :
                 !node.dotDotDotToken ?
                     getTypeOfDestructuredArrayElement(parentType, ts.indexOf(pattern.elements, node)) :
-                    getTypeOfDestructuredSpreadElement(parentType);
+                    getTypeOfDestructuredSpreadExpression(parentType);
             return getTypeWithDefault(type, node.initializer);
         }
         function getTypeOfInitializer(node) {
@@ -26227,35 +28155,35 @@ var ts;
             if (node.initializer) {
                 return getTypeOfInitializer(node.initializer);
             }
-            if (node.parent.parent.kind === 208) {
+            if (node.parent.parent.kind === 212) {
                 return stringType;
             }
-            if (node.parent.parent.kind === 209) {
+            if (node.parent.parent.kind === 213) {
                 return checkRightHandSideOfForOf(node.parent.parent.expression) || unknownType;
             }
             return unknownType;
         }
         function getInitialType(node) {
-            return node.kind === 219 ?
+            return node.kind === 223 ?
                 getInitialTypeOfVariableDeclaration(node) :
                 getInitialTypeOfBindingElement(node);
         }
         function getInitialOrAssignedType(node) {
-            return node.kind === 219 || node.kind === 170 ?
+            return node.kind === 223 || node.kind === 174 ?
                 getInitialType(node) :
                 getAssignedType(node);
         }
         function isEmptyArrayAssignment(node) {
-            return node.kind === 219 && node.initializer &&
+            return node.kind === 223 && node.initializer &&
                 isEmptyArrayLiteral(node.initializer) ||
-                node.kind !== 170 && node.parent.kind === 188 &&
+                node.kind !== 174 && node.parent.kind === 192 &&
                     isEmptyArrayLiteral(node.parent.right);
         }
         function getReferenceCandidate(node) {
             switch (node.kind) {
-                case 179:
+                case 183:
                     return getReferenceCandidate(node.expression);
-                case 188:
+                case 192:
                     switch (node.operatorToken.kind) {
                         case 57:
                             return getReferenceCandidate(node.left);
@@ -26267,13 +28195,13 @@ var ts;
         }
         function getReferenceRoot(node) {
             var parent = node.parent;
-            return parent.kind === 179 ||
-                parent.kind === 188 && parent.operatorToken.kind === 57 && parent.left === node ||
-                parent.kind === 188 && parent.operatorToken.kind === 25 && parent.right === node ?
+            return parent.kind === 183 ||
+                parent.kind === 192 && parent.operatorToken.kind === 57 && parent.left === node ||
+                parent.kind === 192 && parent.operatorToken.kind === 25 && parent.right === node ?
                 getReferenceRoot(parent) : node;
         }
         function getTypeOfSwitchClause(clause) {
-            if (clause.kind === 249) {
+            if (clause.kind === 253) {
                 var caseType = getRegularTypeOfLiteralType(checkExpression(clause.expression));
                 return isUnitType(caseType) ? caseType : undefined;
             }
@@ -26288,13 +28216,13 @@ var ts;
             return links.switchTypes;
         }
         function eachTypeContainedIn(source, types) {
-            return source.flags & 524288 ? !ts.forEach(source.types, function (t) { return !ts.contains(types, t); }) : ts.contains(types, source);
+            return source.flags & 65536 ? !ts.forEach(source.types, function (t) { return !ts.contains(types, t); }) : ts.contains(types, source);
         }
         function isTypeSubsetOf(source, target) {
-            return source === target || target.flags & 524288 && isTypeSubsetOfUnion(source, target);
+            return source === target || target.flags & 65536 && isTypeSubsetOfUnion(source, target);
         }
         function isTypeSubsetOfUnion(source, target) {
-            if (source.flags & 524288) {
+            if (source.flags & 65536) {
                 for (var _i = 0, _a = source.types; _i < _a.length; _i++) {
                     var t = _a[_i];
                     if (!containsType(target.types, t)) {
@@ -26308,8 +28236,11 @@ var ts;
             }
             return containsType(target.types, source);
         }
+        function forEachType(type, f) {
+            return type.flags & 65536 ? ts.forEach(type.types, f) : f(type);
+        }
         function filterType(type, f) {
-            if (type.flags & 524288) {
+            if (type.flags & 65536) {
                 var types = type.types;
                 var filtered = ts.filter(types, f);
                 return filtered === types ? type : getUnionTypeFromSortedList(filtered);
@@ -26317,7 +28248,7 @@ var ts;
             return f(type) ? type : neverType;
         }
         function mapType(type, f) {
-            return type.flags & 524288 ? getUnionType(ts.map(type.types, f)) : f(type);
+            return type.flags & 65536 ? getUnionType(ts.map(type.types, f)) : f(type);
         }
         function extractTypesOfKind(type, kind) {
             return filterType(type, function (t) { return (t.flags & kind) !== 0; });
@@ -26343,7 +28274,7 @@ var ts;
             return incomplete ? { flags: 0, type: type } : type;
         }
         function createEvolvingArrayType(elementType) {
-            var result = createObjectType(2097152);
+            var result = createObjectType(256);
             result.elementType = elementType;
             return result;
         }
@@ -26354,13 +28285,10 @@ var ts;
             var elementType = getBaseTypeOfLiteralType(checkExpression(node));
             return isTypeSubsetOf(elementType, evolvingArrayType.elementType) ? evolvingArrayType : getEvolvingArrayType(getUnionType([evolvingArrayType.elementType, elementType]));
         }
-        function isEvolvingArrayType(type) {
-            return !!(type.flags & 2097152 && type.elementType);
-        }
         function createFinalArrayType(elementType) {
             return elementType.flags & 8192 ?
                 autoArrayType :
-                createArrayType(elementType.flags & 524288 ?
+                createArrayType(elementType.flags & 65536 ?
                     getUnionType(elementType.types, true) :
                     elementType);
         }
@@ -26368,17 +28296,17 @@ var ts;
             return evolvingArrayType.finalArrayType || (evolvingArrayType.finalArrayType = createFinalArrayType(evolvingArrayType.elementType));
         }
         function finalizeEvolvingArrayType(type) {
-            return isEvolvingArrayType(type) ? getFinalArrayType(type) : type;
+            return getObjectFlags(type) & 256 ? getFinalArrayType(type) : type;
         }
         function getElementTypeOfEvolvingArrayType(type) {
-            return isEvolvingArrayType(type) ? type.elementType : neverType;
+            return getObjectFlags(type) & 256 ? type.elementType : neverType;
         }
         function isEvolvingArrayTypeList(types) {
             var hasEvolvingArrayType = false;
             for (var _i = 0, types_12 = types; _i < types_12.length; _i++) {
                 var t = types_12[_i];
                 if (!(t.flags & 8192)) {
-                    if (!isEvolvingArrayType(t)) {
+                    if (!(getObjectFlags(t) & 256)) {
                         return false;
                     }
                     hasEvolvingArrayType = true;
@@ -26394,20 +28322,40 @@ var ts;
         function isEvolvingArrayOperationTarget(node) {
             var root = getReferenceRoot(node);
             var parent = root.parent;
-            var isLengthPushOrUnshift = parent.kind === 173 && (parent.name.text === "length" ||
-                parent.parent.kind === 175 && ts.isPushOrUnshiftIdentifier(parent.name));
-            var isElementAssignment = parent.kind === 174 &&
+            var isLengthPushOrUnshift = parent.kind === 177 && (parent.name.text === "length" ||
+                parent.parent.kind === 179 && ts.isPushOrUnshiftIdentifier(parent.name));
+            var isElementAssignment = parent.kind === 178 &&
                 parent.expression === root &&
-                parent.parent.kind === 188 &&
+                parent.parent.kind === 192 &&
                 parent.parent.operatorToken.kind === 57 &&
                 parent.parent.left === parent &&
                 !ts.isAssignmentTarget(parent.parent) &&
                 isTypeAnyOrAllConstituentTypesHaveKind(checkExpression(parent.argumentExpression), 340 | 2048);
             return isLengthPushOrUnshift || isElementAssignment;
         }
+        function maybeTypePredicateCall(node) {
+            var links = getNodeLinks(node);
+            if (links.maybeTypePredicate === undefined) {
+                links.maybeTypePredicate = getMaybeTypePredicate(node);
+            }
+            return links.maybeTypePredicate;
+        }
+        function getMaybeTypePredicate(node) {
+            if (node.expression.kind !== 96) {
+                var funcType = checkNonNullExpression(node.expression);
+                if (funcType !== silentNeverType) {
+                    var apparentType = getApparentType(funcType);
+                    if (apparentType !== unknownType) {
+                        var callSignatures = getSignaturesOfType(apparentType, 0);
+                        return !!ts.forEach(callSignatures, function (sig) { return sig.typePredicate; });
+                    }
+                }
+            }
+            return false;
+        }
         function getFlowTypeOfReference(reference, declaredType, assumeInitialized, flowContainer) {
             var key;
-            if (!reference.flowNode || assumeInitialized && !(declaredType.flags & 4178943)) {
+            if (!reference.flowNode || assumeInitialized && !(declaredType.flags & 1033215)) {
                 return declaredType;
             }
             var initialType = assumeInitialized ? declaredType :
@@ -26416,8 +28364,8 @@ var ts;
             var visitedFlowStart = visitedFlowCount;
             var evolvedType = getTypeFromFlowType(getTypeAtFlowNode(reference.flowNode));
             visitedFlowCount = visitedFlowStart;
-            var resultType = isEvolvingArrayType(evolvedType) && isEvolvingArrayOperationTarget(reference) ? anyArrayType : finalizeEvolvingArrayType(evolvedType);
-            if (reference.parent.kind === 197 && getTypeWithFacts(resultType, 524288).flags & 8192) {
+            var resultType = getObjectFlags(evolvedType) & 256 && isEvolvingArrayOperationTarget(reference) ? anyArrayType : finalizeEvolvingArrayType(evolvedType);
+            if (reference.parent.kind === 201 && getTypeWithFacts(resultType, 524288).flags & 8192) {
                 return declaredType;
             }
             return resultType;
@@ -26462,7 +28410,7 @@ var ts;
                     }
                     else if (flow.flags & 2) {
                         var container = flow.container;
-                        if (container && container !== flowContainer && reference.kind !== 173) {
+                        if (container && container !== flowContainer && reference.kind !== 177) {
                             flow = container.flowNode;
                             continue;
                         }
@@ -26482,7 +28430,7 @@ var ts;
             function getTypeAtFlowAssignment(flow) {
                 var node = flow.node;
                 if (isMatchingReference(reference, node)) {
-                    if (node.parent.kind === 186 || node.parent.kind === 187) {
+                    if (ts.getAssignmentTargetKind(node) === 2) {
                         var flowType = getTypeAtFlowNode(flow.antecedent);
                         return createFlowType(getBaseTypeOfLiteralType(getTypeFromFlowType(flowType)), isIncomplete(flowType));
                     }
@@ -26493,7 +28441,7 @@ var ts;
                         var assignedType = getBaseTypeOfLiteralType(getInitialOrAssignedType(node));
                         return isTypeAssignableTo(assignedType, declaredType) ? assignedType : anyArrayType;
                     }
-                    if (declaredType.flags & 524288) {
+                    if (declaredType.flags & 65536) {
                         return getAssignmentReducedType(declaredType, getInitialOrAssignedType(node));
                     }
                     return declaredType;
@@ -26505,15 +28453,15 @@ var ts;
             }
             function getTypeAtFlowArrayMutation(flow) {
                 var node = flow.node;
-                var expr = node.kind === 175 ?
+                var expr = node.kind === 179 ?
                     node.expression.expression :
                     node.left.expression;
                 if (isMatchingReference(reference, getReferenceCandidate(expr))) {
                     var flowType = getTypeAtFlowNode(flow.antecedent);
                     var type = getTypeFromFlowType(flowType);
-                    if (isEvolvingArrayType(type)) {
+                    if (getObjectFlags(type) & 256) {
                         var evolvedType_1 = type;
-                        if (node.kind === 175) {
+                        if (node.kind === 179) {
                             for (var _i = 0, _a = node.arguments; _i < _a.length; _i++) {
                                 var arg = _a[_i];
                                 evolvedType_1 = addEvolvingArrayElementType(evolvedType_1, arg);
@@ -26631,8 +28579,8 @@ var ts;
                 return cache[key] = result;
             }
             function isMatchingReferenceDiscriminant(expr) {
-                return expr.kind === 173 &&
-                    declaredType.flags & 524288 &&
+                return expr.kind === 177 &&
+                    declaredType.flags & 65536 &&
                     isMatchingReference(reference, expr.expression) &&
                     isDiscriminantProperty(declaredType, expr.name.text);
             }
@@ -26665,10 +28613,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 === 183 && right_1.kind === 9) {
+                        if (left_1.kind === 187 && right_1.kind === 9) {
                             return narrowTypeByTypeof(type, left_1, operator_1, right_1, assumeTrue);
                         }
-                        if (right_1.kind === 183 && left_1.kind === 9) {
+                        if (right_1.kind === 187 && left_1.kind === 9) {
                             return narrowTypeByTypeof(type, right_1, operator_1, left_1, assumeTrue);
                         }
                         if (isMatchingReference(reference, left_1)) {
@@ -26714,7 +28662,7 @@ var ts;
                             assumeTrue ? 16384 : 131072;
                     return getTypeWithFacts(type, facts);
                 }
-                if (type.flags & 2589185) {
+                if (type.flags & 33281) {
                     return type;
                 }
                 if (assumeTrue) {
@@ -26738,7 +28686,7 @@ var ts;
                 if (operator === 32 || operator === 34) {
                     assumeTrue = !assumeTrue;
                 }
-                if (assumeTrue && !(type.flags & 524288)) {
+                if (assumeTrue && !(type.flags & 65536)) {
                     var targetType = typeofTypesByName[literal.text];
                     if (targetType && isTypeSubtypeOf(targetType, type)) {
                         return targetType;
@@ -26790,10 +28738,10 @@ var ts;
                 }
                 if (!targetType) {
                     var constructSignatures = void 0;
-                    if (rightType.flags & 65536) {
+                    if (getObjectFlags(rightType) & 2) {
                         constructSignatures = resolveDeclaredMembers(rightType).declaredConstructSignatures;
                     }
-                    else if (rightType.flags & 2097152) {
+                    else if (getObjectFlags(rightType) & 16) {
                         constructSignatures = getSignaturesOfType(rightType, 1);
                     }
                     if (constructSignatures && constructSignatures.length) {
@@ -26809,7 +28757,7 @@ var ts;
                 if (!assumeTrue) {
                     return filterType(type, function (t) { return !isTypeInstanceOf(t, candidate); });
                 }
-                if (type.flags & 524288) {
+                if (type.flags & 65536) {
                     var assignableType = filterType(type, function (t) { return isTypeInstanceOf(t, candidate); });
                     if (!(assignableType.flags & 8192)) {
                         return assignableType;
@@ -26822,7 +28770,7 @@ var ts;
                             getIntersectionType([type, candidate]);
             }
             function narrowTypeByTypePredicate(type, callExpression, assumeTrue) {
-                if (!hasMatchingArgument(callExpression, reference)) {
+                if (!hasMatchingArgument(callExpression, reference) || !maybeTypePredicateCall(callExpression)) {
                     return type;
                 }
                 var signature = getResolvedSignature(callExpression);
@@ -26845,10 +28793,10 @@ var ts;
                     }
                 }
                 else {
-                    var invokedExpression = skipParenthesizedNodes(callExpression.expression);
-                    if (invokedExpression.kind === 174 || invokedExpression.kind === 173) {
+                    var invokedExpression = ts.skipParentheses(callExpression.expression);
+                    if (invokedExpression.kind === 178 || invokedExpression.kind === 177) {
                         var accessExpression = invokedExpression;
-                        var possibleReference = skipParenthesizedNodes(accessExpression.expression);
+                        var possibleReference = ts.skipParentheses(accessExpression.expression);
                         if (isMatchingReference(reference, possibleReference)) {
                             return getNarrowedType(type, predicate.type, assumeTrue);
                         }
@@ -26863,15 +28811,15 @@ var ts;
                 switch (expr.kind) {
                     case 70:
                     case 98:
-                    case 173:
+                    case 177:
                         return narrowTypeByTruthiness(type, expr, assumeTrue);
-                    case 175:
-                        return narrowTypeByTypePredicate(type, expr, assumeTrue);
                     case 179:
+                        return narrowTypeByTypePredicate(type, expr, assumeTrue);
+                    case 183:
                         return narrowType(type, expr.expression, assumeTrue);
-                    case 188:
+                    case 192:
                         return narrowTypeByBinaryExpression(type, expr, assumeTrue);
-                    case 186:
+                    case 190:
                         if (expr.operator === 50) {
                             return narrowType(type, expr.operand, !assumeTrue);
                         }
@@ -26894,19 +28842,13 @@ var ts;
             }
             return getTypeOfSymbol(symbol);
         }
-        function skipParenthesizedNodes(expression) {
-            while (expression.kind === 179) {
-                expression = expression.expression;
-            }
-            return expression;
-        }
         function getControlFlowContainer(node) {
             while (true) {
                 node = node.parent;
                 if (ts.isFunctionLike(node) && !ts.getImmediatelyInvokedFunctionExpression(node) ||
-                    node.kind === 227 ||
-                    node.kind === 256 ||
-                    node.kind === 146) {
+                    node.kind === 231 ||
+                    node.kind === 261 ||
+                    node.kind === 147) {
                     return node;
                 }
             }
@@ -26937,7 +28879,7 @@ var ts;
             if (node.kind === 70) {
                 if (ts.isAssignmentTarget(node)) {
                     var symbol = getResolvedSymbol(node);
-                    if (symbol.valueDeclaration && ts.getRootDeclaration(symbol.valueDeclaration).kind === 143) {
+                    if (symbol.valueDeclaration && ts.getRootDeclaration(symbol.valueDeclaration).kind === 144) {
                         symbol.isAssigned = true;
                     }
                 }
@@ -26951,19 +28893,23 @@ var ts;
         }
         function checkIdentifier(node) {
             var symbol = getResolvedSymbol(node);
+            if (symbol === unknownSymbol) {
+                return unknownType;
+            }
             if (symbol === argumentsSymbol) {
                 var container = ts.getContainingFunction(node);
                 if (languageVersion < 2) {
-                    if (container.kind === 181) {
+                    if (container.kind === 185) {
                         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)) {
                         error(node, ts.Diagnostics.The_arguments_object_cannot_be_referenced_in_an_async_function_or_method_in_ES3_and_ES5_Consider_using_a_standard_function_or_method);
                     }
                 }
-                if (node.flags & 262144) {
+                if (node.flags & 524288) {
                     getNodeLinks(container).flags |= 8192;
                 }
+                return getTypeOfSymbol(symbol);
             }
             if (symbol.flags & 8388608 && !isInTypeQuery(node) && !isConstEnumOrConstEnumOnlyModule(resolveAlias(symbol))) {
                 markAliasSymbolAsReferenced(symbol);
@@ -26972,7 +28918,7 @@ var ts;
             if (localOrExportSymbol.flags & 32) {
                 var declaration_1 = localOrExportSymbol.valueDeclaration;
                 if (languageVersion === 2
-                    && declaration_1.kind === 222
+                    && declaration_1.kind === 226
                     && ts.nodeIsDecorated(declaration_1)) {
                     var container = ts.getContainingClass(node);
                     while (container !== undefined) {
@@ -26984,11 +28930,11 @@ var ts;
                         container = ts.getContainingClass(container);
                     }
                 }
-                else if (declaration_1.kind === 193) {
+                else if (declaration_1.kind === 197) {
                     var container = ts.getThisContainer(node, false);
                     while (container !== undefined) {
                         if (container.parent === declaration_1) {
-                            if (container.kind === 146 && ts.hasModifier(container, 32)) {
+                            if (container.kind === 147 && ts.hasModifier(container, 32)) {
                                 getNodeLinks(declaration_1).flags |= 8388608;
                                 getNodeLinks(node).flags |= 16777216;
                             }
@@ -27003,15 +28949,26 @@ var ts;
             checkNestedBlockScopedBinding(node, symbol);
             var type = getTypeOfSymbol(localOrExportSymbol);
             var declaration = localOrExportSymbol.valueDeclaration;
-            if (!(localOrExportSymbol.flags & 3) || ts.isAssignmentTarget(node) || !declaration) {
+            var assignmentKind = ts.getAssignmentTargetKind(node);
+            if (assignmentKind) {
+                if (!(localOrExportSymbol.flags & 3)) {
+                    error(node, ts.Diagnostics.Cannot_assign_to_0_because_it_is_not_a_variable, symbolToString(symbol));
+                    return unknownType;
+                }
+                if (isReadonlySymbol(localOrExportSymbol)) {
+                    error(node, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_constant_or_a_read_only_property, symbolToString(symbol));
+                    return unknownType;
+                }
+            }
+            if (!(localOrExportSymbol.flags & 3) || assignmentKind === 1 || !declaration) {
                 return type;
             }
-            var isParameter = ts.getRootDeclaration(declaration).kind === 143;
+            var isParameter = ts.getRootDeclaration(declaration).kind === 144;
             var declarationContainer = getControlFlowContainer(declaration);
             var flowContainer = getControlFlowContainer(node);
             var isOuterVariable = flowContainer !== declarationContainer;
-            while (flowContainer !== declarationContainer && (flowContainer.kind === 180 ||
-                flowContainer.kind === 181 || ts.isObjectLiteralOrClassExpressionMethod(flowContainer)) &&
+            while (flowContainer !== declarationContainer && (flowContainer.kind === 184 ||
+                flowContainer.kind === 185 || ts.isObjectLiteralOrClassExpressionMethod(flowContainer)) &&
                 (isConstVariable(localOrExportSymbol) || isParameter && !isParameterAssigned(localOrExportSymbol))) {
                 flowContainer = getControlFlowContainer(flowContainer);
             }
@@ -27032,7 +28989,7 @@ var ts;
                 error(node, ts.Diagnostics.Variable_0_is_used_before_being_assigned, symbolToString(symbol));
                 return type;
             }
-            return flowType;
+            return assignmentKind ? getBaseTypeOfLiteralType(flowType) : flowType;
         }
         function isInsideFunction(node, threshold) {
             var current = node;
@@ -27047,7 +29004,7 @@ var ts;
         function checkNestedBlockScopedBinding(node, symbol) {
             if (languageVersion >= 2 ||
                 (symbol.flags & (2 | 32)) === 0 ||
-                symbol.valueDeclaration.parent.kind === 252) {
+                symbol.valueDeclaration.parent.kind === 256) {
                 return;
             }
             var container = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
@@ -27065,8 +29022,8 @@ var ts;
                 if (usedInFunction) {
                     getNodeLinks(current).flags |= 65536;
                 }
-                if (container.kind === 207 &&
-                    ts.getAncestor(symbol.valueDeclaration, 220).parent === container &&
+                if (container.kind === 211 &&
+                    ts.getAncestor(symbol.valueDeclaration, 224).parent === container &&
                     isAssignedInBodyOfForStatement(node, container)) {
                     getNodeLinks(symbol.valueDeclaration).flags |= 2097152;
                 }
@@ -27078,14 +29035,14 @@ var ts;
         }
         function isAssignedInBodyOfForStatement(node, container) {
             var current = node;
-            while (current.parent.kind === 179) {
+            while (current.parent.kind === 183) {
                 current = current.parent;
             }
             var isAssigned = false;
             if (ts.isAssignmentTarget(current)) {
                 isAssigned = true;
             }
-            else if ((current.parent.kind === 186 || current.parent.kind === 187)) {
+            else if ((current.parent.kind === 190 || current.parent.kind === 191)) {
                 var expr = current.parent;
                 isAssigned = expr.operator === 42 || expr.operator === 43;
             }
@@ -27104,7 +29061,7 @@ var ts;
         }
         function captureLexicalThis(node, container) {
             getNodeLinks(node).flags |= 2;
-            if (container.kind === 146 || container.kind === 149) {
+            if (container.kind === 147 || container.kind === 150) {
                 var classNode = container.parent;
                 getNodeLinks(classNode).flags |= 4;
             }
@@ -27138,7 +29095,7 @@ var ts;
         function checkThisExpression(node) {
             var container = ts.getThisContainer(node, true);
             var needToCaptureLexicalThis = false;
-            if (container.kind === 149) {
+            if (container.kind === 150) {
                 var containingClassDecl = container.parent;
                 var baseTypeNode = ts.getClassExtendsHeritageClauseElement(containingClassDecl);
                 if (baseTypeNode && !classDeclarationExtendsNull(containingClassDecl)) {
@@ -27148,29 +29105,29 @@ var ts;
                     }
                 }
             }
-            if (container.kind === 181) {
+            if (container.kind === 185) {
                 container = ts.getThisContainer(container, false);
                 needToCaptureLexicalThis = (languageVersion < 2);
             }
             switch (container.kind) {
-                case 226:
+                case 230:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_module_or_namespace_body);
                     break;
-                case 225:
+                case 229:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_current_location);
                     break;
-                case 149:
+                case 150:
                     if (isInConstructorArgumentInitializer(node, container)) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_constructor_arguments);
                     }
                     break;
+                case 147:
                 case 146:
-                case 145:
                     if (ts.getModifierFlags(container) & 32) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_static_property_initializer);
                     }
                     break;
-                case 141:
+                case 142:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_computed_property_name);
                     break;
             }
@@ -27179,7 +29136,7 @@ var ts;
             }
             if (ts.isFunctionLike(container) &&
                 (!isInParameterInitializerBeforeContainingFunction(node) || ts.getThisParameter(container))) {
-                if (container.kind === 180 &&
+                if (container.kind === 184 &&
                     ts.isInJavaScriptFile(container.parent) &&
                     ts.getSpecialPropertyAssignmentKind(container.parent) === 3) {
                     var className = container.parent
@@ -27214,27 +29171,27 @@ var ts;
         }
         function getTypeForThisExpressionFromJSDoc(node) {
             var typeTag = ts.getJSDocTypeTag(node);
-            if (typeTag && typeTag.typeExpression && typeTag.typeExpression.type && typeTag.typeExpression.type.kind === 269) {
+            if (typeTag && typeTag.typeExpression && typeTag.typeExpression.type && typeTag.typeExpression.type.kind === 274) {
                 var jsDocFunctionType = typeTag.typeExpression.type;
-                if (jsDocFunctionType.parameters.length > 0 && jsDocFunctionType.parameters[0].type.kind === 272) {
+                if (jsDocFunctionType.parameters.length > 0 && jsDocFunctionType.parameters[0].type.kind === 277) {
                     return getTypeFromTypeNode(jsDocFunctionType.parameters[0].type);
                 }
             }
         }
         function isInConstructorArgumentInitializer(node, constructorDecl) {
             for (var n = node; n && n !== constructorDecl; n = n.parent) {
-                if (n.kind === 143) {
+                if (n.kind === 144) {
                     return true;
                 }
             }
             return false;
         }
         function checkSuperExpression(node) {
-            var isCallExpression = node.parent.kind === 175 && node.parent.expression === node;
+            var isCallExpression = node.parent.kind === 179 && node.parent.expression === node;
             var container = ts.getSuperContainer(node, true);
             var needToCaptureLexicalThis = false;
             if (!isCallExpression) {
-                while (container && container.kind === 181) {
+                while (container && container.kind === 185) {
                     container = ts.getSuperContainer(container, true);
                     needToCaptureLexicalThis = languageVersion < 2;
                 }
@@ -27243,16 +29200,16 @@ var ts;
             var nodeCheckFlag = 0;
             if (!canUseSuperExpression) {
                 var current = node;
-                while (current && current !== container && current.kind !== 141) {
+                while (current && current !== container && current.kind !== 142) {
                     current = current.parent;
                 }
-                if (current && current.kind === 141) {
+                if (current && current.kind === 142) {
                     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 === 172)) {
+                else if (!container || !container.parent || !(ts.isClassLike(container.parent) || container.parent.kind === 176)) {
                     error(node, ts.Diagnostics.super_can_only_be_referenced_in_members_of_derived_classes_or_object_literal_expressions);
                 }
                 else {
@@ -27267,7 +29224,7 @@ var ts;
                 nodeCheckFlag = 256;
             }
             getNodeLinks(node).flags |= nodeCheckFlag;
-            if (container.kind === 148 && ts.getModifierFlags(container) & 256) {
+            if (container.kind === 149 && ts.getModifierFlags(container) & 256) {
                 if (ts.isSuperProperty(node.parent) && ts.isAssignmentTarget(node.parent)) {
                     getNodeLinks(container).flags |= 4096;
                 }
@@ -27278,7 +29235,7 @@ var ts;
             if (needToCaptureLexicalThis) {
                 captureLexicalThis(node.parent, container);
             }
-            if (container.parent.kind === 172) {
+            if (container.parent.kind === 176) {
                 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 unknownType;
@@ -27296,7 +29253,7 @@ var ts;
                 }
                 return unknownType;
             }
-            if (container.kind === 149 && isInConstructorArgumentInitializer(node, container)) {
+            if (container.kind === 150 && isInConstructorArgumentInitializer(node, container)) {
                 error(node, ts.Diagnostics.super_cannot_be_referenced_in_constructor_arguments);
                 return unknownType;
             }
@@ -27308,24 +29265,24 @@ var ts;
                     return false;
                 }
                 if (isCallExpression) {
-                    return container.kind === 149;
+                    return container.kind === 150;
                 }
                 else {
-                    if (ts.isClassLike(container.parent) || container.parent.kind === 172) {
+                    if (ts.isClassLike(container.parent) || container.parent.kind === 176) {
                         if (ts.getModifierFlags(container) & 32) {
-                            return container.kind === 148 ||
-                                container.kind === 147 ||
-                                container.kind === 150 ||
-                                container.kind === 151;
+                            return container.kind === 149 ||
+                                container.kind === 148 ||
+                                container.kind === 151 ||
+                                container.kind === 152;
                         }
                         else {
-                            return container.kind === 148 ||
-                                container.kind === 147 ||
-                                container.kind === 150 ||
+                            return container.kind === 149 ||
+                                container.kind === 148 ||
                                 container.kind === 151 ||
+                                container.kind === 152 ||
+                                container.kind === 147 ||
                                 container.kind === 146 ||
-                                container.kind === 145 ||
-                                container.kind === 149;
+                                container.kind === 150;
                         }
                     }
                 }
@@ -27333,7 +29290,7 @@ var ts;
             }
         }
         function getContextualThisParameterType(func) {
-            if (isContextSensitiveFunctionOrObjectLiteralMethod(func) && func.kind !== 181) {
+            if (isContextSensitiveFunctionOrObjectLiteralMethod(func) && func.kind !== 185) {
                 var contextualSignature = getContextualSignature(func);
                 if (contextualSignature) {
                     var thisParameter = contextualSignature.thisParameter;
@@ -27389,7 +29346,7 @@ var ts;
                 if (declaration.type) {
                     return getTypeFromTypeNode(declaration.type);
                 }
-                if (declaration.kind === 143) {
+                if (declaration.kind === 144) {
                     var type = getContextuallyTypedParameterType(declaration);
                     if (type) {
                         return type;
@@ -27400,11 +29357,11 @@ var ts;
                 }
                 if (ts.isBindingPattern(declaration.parent)) {
                     var parentDeclaration = declaration.parent.parent;
-                    var name_15 = declaration.propertyName || declaration.name;
+                    var name_22 = declaration.propertyName || declaration.name;
                     if (ts.isVariableLike(parentDeclaration) &&
                         parentDeclaration.type &&
-                        !ts.isBindingPattern(name_15)) {
-                        var text = getTextOfPropertyName(name_15);
+                        !ts.isBindingPattern(name_22)) {
+                        var text = ts.getTextOfPropertyName(name_22);
                         if (text) {
                             return getTypeOfPropertyOfType(getTypeFromTypeNode(parentDeclaration.type), text);
                         }
@@ -27441,7 +29398,7 @@ var ts;
         }
         function isInParameterInitializerBeforeContainingFunction(node) {
             while (node.parent && !ts.isFunctionLike(node.parent)) {
-                if (node.parent.kind === 143 && node.parent.initializer === node) {
+                if (node.parent.kind === 144 && node.parent.initializer === node) {
                     return true;
                 }
                 node = node.parent;
@@ -27450,8 +29407,8 @@ var ts;
         }
         function getContextualReturnType(functionDecl) {
             if (functionDecl.type ||
-                functionDecl.kind === 149 ||
-                functionDecl.kind === 150 && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(functionDecl.symbol, 151))) {
+                functionDecl.kind === 150 ||
+                functionDecl.kind === 151 && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(functionDecl.symbol, 152))) {
                 return getReturnTypeOfSignature(getSignatureFromDeclaration(functionDecl));
             }
             var signature = getContextualSignatureForFunctionLikeDeclaration(functionDecl);
@@ -27470,7 +29427,7 @@ var ts;
             return undefined;
         }
         function getContextualTypeForSubstitutionExpression(template, substitutionExpression) {
-            if (template.parent.kind === 177) {
+            if (template.parent.kind === 181) {
                 return getContextualTypeForArgument(template.parent, substitutionExpression);
             }
             return undefined;
@@ -27501,7 +29458,7 @@ var ts;
             return undefined;
         }
         function applyToContextualType(type, mapper) {
-            if (!(type.flags & 524288)) {
+            if (!(type.flags & 65536)) {
                 return mapper(type);
             }
             var types = type.types;
@@ -27526,7 +29483,7 @@ var ts;
         }
         function getTypeOfPropertyOfContextualType(type, name) {
             return applyToContextualType(type, function (t) {
-                var prop = t.flags & 4161536 ? getPropertyOfType(t, name) : undefined;
+                var prop = t.flags & 229376 ? getPropertyOfType(t, name) : undefined;
                 return prop ? getTypeOfSymbol(prop) : undefined;
             });
         }
@@ -27534,7 +29491,7 @@ var ts;
             return applyToContextualType(type, function (t) { return getIndexTypeOfStructuredType(t, kind); });
         }
         function contextualTypeIsTupleLikeType(type) {
-            return !!(type.flags & 524288 ? ts.forEach(type.types, isTupleLikeType) : isTupleLikeType(type));
+            return !!(type.flags & 65536 ? ts.forEach(type.types, isTupleLikeType) : isTupleLikeType(type));
         }
         function getContextualTypeForObjectLiteralMethod(node) {
             ts.Debug.assert(ts.isObjectLiteralMethod(node));
@@ -27578,13 +29535,13 @@ var ts;
             var kind = attribute.kind;
             var jsxElement = attribute.parent;
             var attrsType = getJsxElementAttributesType(jsxElement);
-            if (attribute.kind === 246) {
+            if (attribute.kind === 250) {
                 if (!attrsType || isTypeAny(attrsType)) {
                     return undefined;
                 }
                 return getTypeOfPropertyOfType(attrsType, attribute.name.text);
             }
-            else if (attribute.kind === 247) {
+            else if (attribute.kind === 251) {
                 return attrsType;
             }
             ts.Debug.fail("Expected JsxAttribute or JsxSpreadAttribute, got ts.SyntaxKind[" + kind + "]");
@@ -27602,56 +29559,70 @@ var ts;
             }
             var parent = node.parent;
             switch (parent.kind) {
-                case 219:
-                case 143:
+                case 223:
+                case 144:
+                case 147:
                 case 146:
-                case 145:
-                case 170:
+                case 174:
                     return getContextualTypeForInitializerExpression(node);
-                case 181:
-                case 212:
+                case 185:
+                case 216:
                     return getContextualTypeForReturnExpression(node);
-                case 191:
+                case 195:
                     return getContextualTypeForYieldOperand(parent);
-                case 175:
-                case 176:
-                    return getContextualTypeForArgument(parent, node);
-                case 178:
-                case 196:
-                    return getTypeFromTypeNode(parent.type);
-                case 188:
-                    return getContextualTypeForBinaryOperand(node);
-                case 253:
-                case 254:
-                    return getContextualTypeForObjectLiteralElement(parent);
-                case 171:
-                    return getContextualTypeForElementExpression(node);
-                case 189:
-                    return getContextualTypeForConditionalOperand(node);
-                case 198:
-                    ts.Debug.assert(parent.parent.kind === 190);
-                    return getContextualTypeForSubstitutionExpression(parent.parent, node);
                 case 179:
+                case 180:
+                    return getContextualTypeForArgument(parent, node);
+                case 182:
+                case 200:
+                    return getTypeFromTypeNode(parent.type);
+                case 192:
+                    return getContextualTypeForBinaryOperand(node);
+                case 257:
+                case 258:
+                    return getContextualTypeForObjectLiteralElement(parent);
+                case 175:
+                    return getContextualTypeForElementExpression(node);
+                case 193:
+                    return getContextualTypeForConditionalOperand(node);
+                case 202:
+                    ts.Debug.assert(parent.parent.kind === 194);
+                    return getContextualTypeForSubstitutionExpression(parent.parent, node);
+                case 183:
                     return getContextualType(parent);
-                case 248:
+                case 252:
                     return getContextualType(parent);
-                case 246:
-                case 247:
+                case 250:
+                case 251:
                     return getContextualTypeForJsxAttribute(parent);
             }
             return undefined;
         }
-        function getNonGenericSignature(type) {
+        function getNonGenericSignature(type, node) {
             var signatures = getSignaturesOfStructuredType(type, 0);
             if (signatures.length === 1) {
                 var signature = signatures[0];
-                if (!signature.typeParameters) {
+                if (!signature.typeParameters && !isAritySmaller(signature, node)) {
                     return signature;
                 }
             }
         }
+        function isAritySmaller(signature, target) {
+            var targetParameterCount = 0;
+            for (; targetParameterCount < target.parameters.length; targetParameterCount++) {
+                var param = target.parameters[targetParameterCount];
+                if (param.initializer || param.questionToken || param.dotDotDotToken || isJSDocOptionalParameter(param)) {
+                    break;
+                }
+            }
+            if (target.parameters.length && ts.parameterIsThisKeyword(target.parameters[0])) {
+                targetParameterCount--;
+            }
+            var sourceLength = signature.hasRestParameter ? Number.MAX_VALUE : signature.parameters.length;
+            return sourceLength < targetParameterCount;
+        }
         function isFunctionExpressionOrArrowFunction(node) {
-            return node.kind === 180 || node.kind === 181;
+            return node.kind === 184 || node.kind === 185;
         }
         function getContextualSignatureForFunctionLikeDeclaration(node) {
             return isFunctionExpressionOrArrowFunction(node) || ts.isObjectLiteralMethod(node)
@@ -27664,19 +29635,19 @@ var ts;
                 getApparentTypeOfContextualType(node);
         }
         function getContextualSignature(node) {
-            ts.Debug.assert(node.kind !== 148 || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 149 || ts.isObjectLiteralMethod(node));
             var type = getContextualTypeForFunctionLikeDeclaration(node);
             if (!type) {
                 return undefined;
             }
-            if (!(type.flags & 524288)) {
-                return getNonGenericSignature(type);
+            if (!(type.flags & 65536)) {
+                return getNonGenericSignature(type, node);
             }
             var signatureList;
             var types = type.types;
             for (var _i = 0, types_14 = types; _i < types_14.length; _i++) {
                 var current = types_14[_i];
-                var signature = getNonGenericSignature(current);
+                var signature = getNonGenericSignature(current, node);
                 if (signature) {
                     if (!signatureList) {
                         signatureList = [signature];
@@ -27700,13 +29671,13 @@ var ts;
         function isInferentialContext(mapper) {
             return mapper && mapper.context;
         }
-        function checkSpreadElementExpression(node, contextualMapper) {
+        function checkSpreadExpression(node, contextualMapper) {
             var arrayOrIterableType = checkExpressionCached(node.expression, contextualMapper);
             return checkIteratedTypeOrElementType(arrayOrIterableType, node.expression, false);
         }
         function hasDefaultValue(node) {
-            return (node.kind === 170 && !!node.initializer) ||
-                (node.kind === 188 && node.operatorToken.kind === 57);
+            return (node.kind === 174 && !!node.initializer) ||
+                (node.kind === 192 && node.operatorToken.kind === 57);
         }
         function checkArrayLiteral(node, contextualMapper) {
             var elements = node.elements;
@@ -27715,7 +29686,7 @@ var ts;
             var inDestructuringPattern = ts.isAssignmentTarget(node);
             for (var _i = 0, elements_1 = elements; _i < elements_1.length; _i++) {
                 var e = elements_1[_i];
-                if (inDestructuringPattern && e.kind === 192) {
+                if (inDestructuringPattern && e.kind === 196) {
                     var restArrayType = checkExpression(e.expression, contextualMapper);
                     var restElementType = getIndexTypeOfType(restArrayType, 1) ||
                         (languageVersion >= 2 ? getElementTypeOfIterable(restArrayType, undefined) : undefined);
@@ -27727,7 +29698,7 @@ var ts;
                     var type = checkExpressionForMutableLocation(e, contextualMapper);
                     elementTypes.push(type);
                 }
-                hasSpreadElement = hasSpreadElement || e.kind === 192;
+                hasSpreadElement = hasSpreadElement || e.kind === 196;
             }
             if (!hasSpreadElement) {
                 if (inDestructuringPattern && elementTypes.length) {
@@ -27738,7 +29709,7 @@ var ts;
                 var contextualType = getApparentTypeOfContextualType(node);
                 if (contextualType && contextualTypeIsTupleLikeType(contextualType)) {
                     var pattern = contextualType.pattern;
-                    if (pattern && (pattern.kind === 169 || pattern.kind === 171)) {
+                    if (pattern && (pattern.kind === 173 || pattern.kind === 175)) {
                         var patternElements = pattern.elements;
                         for (var i = elementTypes.length; i < patternElements.length; i++) {
                             var patternElement = patternElements[i];
@@ -27746,7 +29717,7 @@ var ts;
                                 elementTypes.push(contextualType.typeArguments[i]);
                             }
                             else {
-                                if (patternElement.kind !== 194) {
+                                if (patternElement.kind !== 198) {
                                     error(patternElement, ts.Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);
                                 }
                                 elementTypes.push(unknownType);
@@ -27763,7 +29734,7 @@ var ts;
                 strictNullChecks ? neverType : undefinedWideningType);
         }
         function isNumericName(name) {
-            return name.kind === 141 ? isNumericComputedName(name) : isNumericLiteralName(name.text);
+            return name.kind === 142 ? isNumericComputedName(name) : isNumericLiteralName(name.text);
         }
         function isNumericComputedName(name) {
             return isTypeAnyOrAllConstituentTypesHaveKind(checkComputedPropertyName(name), 340);
@@ -27805,9 +29776,11 @@ var ts;
             checkGrammarObjectLiteralExpression(node, inDestructuringPattern);
             var propertiesTable = ts.createMap();
             var propertiesArray = [];
+            var spread = emptyObjectType;
+            var propagatedFlags = 0;
             var contextualType = getApparentTypeOfContextualType(node);
             var contextualTypeHasPattern = contextualType && contextualType.pattern &&
-                (contextualType.pattern.kind === 168 || contextualType.pattern.kind === 172);
+                (contextualType.pattern.kind === 172 || contextualType.pattern.kind === 176);
             var typeFlags = 0;
             var patternWithComputedProperties = false;
             var hasComputedStringProperty = false;
@@ -27815,25 +29788,25 @@ var ts;
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var memberDecl = _a[_i];
                 var member = memberDecl.symbol;
-                if (memberDecl.kind === 253 ||
-                    memberDecl.kind === 254 ||
+                if (memberDecl.kind === 257 ||
+                    memberDecl.kind === 258 ||
                     ts.isObjectLiteralMethod(memberDecl)) {
                     var type = void 0;
-                    if (memberDecl.kind === 253) {
+                    if (memberDecl.kind === 257) {
                         type = checkPropertyAssignment(memberDecl, contextualMapper);
                     }
-                    else if (memberDecl.kind === 148) {
+                    else if (memberDecl.kind === 149) {
                         type = checkObjectLiteralMethod(memberDecl, contextualMapper);
                     }
                     else {
-                        ts.Debug.assert(memberDecl.kind === 254);
+                        ts.Debug.assert(memberDecl.kind === 258);
                         type = checkExpressionForMutableLocation(memberDecl.name, contextualMapper);
                     }
                     typeFlags |= type.flags;
                     var prop = createSymbol(4 | 67108864 | member.flags, member.name);
                     if (inDestructuringPattern) {
-                        var isOptional = (memberDecl.kind === 253 && hasDefaultValue(memberDecl.initializer)) ||
-                            (memberDecl.kind === 254 && memberDecl.objectAssignmentInitializer);
+                        var isOptional = (memberDecl.kind === 257 && hasDefaultValue(memberDecl.initializer)) ||
+                            (memberDecl.kind === 258 && memberDecl.objectAssignmentInitializer);
                         if (isOptional) {
                             prop.flags |= 536870912;
                         }
@@ -27841,8 +29814,7 @@ var ts;
                             patternWithComputedProperties = true;
                         }
                     }
-                    else if (contextualTypeHasPattern &&
-                        !(contextualType.flags & 2588672 && contextualType.isObjectLiteralPatternWithComputedProperties)) {
+                    else if (contextualTypeHasPattern && !(getObjectFlags(contextualType) & 512)) {
                         var impliedProp = getPropertyOfType(contextualType, member.name);
                         if (impliedProp) {
                             prop.flags |= impliedProp.flags & 536870912;
@@ -27860,8 +29832,25 @@ var ts;
                     prop.target = member;
                     member = prop;
                 }
+                else if (memberDecl.kind === 259) {
+                    if (propertiesArray.length > 0) {
+                        spread = getSpreadType(spread, createObjectLiteralType(), true);
+                        propertiesArray = [];
+                        propertiesTable = ts.createMap();
+                        hasComputedStringProperty = false;
+                        hasComputedNumberProperty = false;
+                        typeFlags = 0;
+                    }
+                    var type = checkExpression(memberDecl.expression);
+                    if (!(type.flags & (32768 | 1))) {
+                        error(memberDecl, ts.Diagnostics.Spread_types_may_only_be_created_from_object_types);
+                        return unknownType;
+                    }
+                    spread = getSpreadType(spread, type, false);
+                    continue;
+                }
                 else {
-                    ts.Debug.assert(memberDecl.kind === 150 || memberDecl.kind === 151);
+                    ts.Debug.assert(memberDecl.kind === 151 || memberDecl.kind === 152);
                     checkAccessorDeclaration(memberDecl);
                 }
                 if (ts.hasDynamicName(memberDecl)) {
@@ -27889,18 +29878,33 @@ var ts;
                     }
                 }
             }
-            var stringIndexInfo = hasComputedStringProperty ? getObjectLiteralIndexInfo(node, propertiesArray, 0) : undefined;
-            var numberIndexInfo = hasComputedNumberProperty ? getObjectLiteralIndexInfo(node, propertiesArray, 1) : undefined;
-            var result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
-            var freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : 16777216;
-            result.flags |= 8388608 | 67108864 | freshObjectLiteralFlag | (typeFlags & 234881024);
-            if (patternWithComputedProperties) {
-                result.isObjectLiteralPatternWithComputedProperties = true;
+            if (spread !== emptyObjectType) {
+                if (propertiesArray.length > 0) {
+                    spread = getSpreadType(spread, createObjectLiteralType(), true);
+                }
+                spread.flags |= propagatedFlags;
+                spread.symbol = node.symbol;
+                return spread;
             }
-            if (inDestructuringPattern) {
-                result.pattern = node;
+            return createObjectLiteralType();
+            function createObjectLiteralType() {
+                var stringIndexInfo = hasComputedStringProperty ? getObjectLiteralIndexInfo(node, propertiesArray, 0) : undefined;
+                var numberIndexInfo = hasComputedNumberProperty ? getObjectLiteralIndexInfo(node, propertiesArray, 1) : undefined;
+                var result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
+                var freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : 1048576;
+                result.flags |= 4194304 | freshObjectLiteralFlag | (typeFlags & 14680064);
+                result.objectFlags |= 128;
+                if (patternWithComputedProperties) {
+                    result.objectFlags |= 512;
+                }
+                if (inDestructuringPattern) {
+                    result.pattern = node;
+                }
+                if (!(result.flags & 6144)) {
+                    propagatedFlags |= (result.flags & 14680064);
+                }
+                return result;
             }
-            return result;
         }
         function checkJsxSelfClosingElement(node) {
             checkJsxOpeningLikeElement(node);
@@ -27917,13 +29921,13 @@ var ts;
             for (var _i = 0, _a = node.children; _i < _a.length; _i++) {
                 var child = _a[_i];
                 switch (child.kind) {
-                    case 248:
+                    case 252:
                         checkJsxExpression(child);
                         break;
-                    case 242:
+                    case 246:
                         checkJsxElement(child);
                         break;
-                    case 243:
+                    case 247:
                         checkJsxSelfClosingElement(child);
                         break;
                 }
@@ -27934,7 +29938,7 @@ var ts;
             return name.indexOf("-") < 0;
         }
         function isJsxIntrinsicIdentifier(tagName) {
-            if (tagName.kind === 173 || tagName.kind === 98) {
+            if (tagName.kind === 177 || tagName.kind === 98) {
                 return false;
             }
             else {
@@ -27950,7 +29954,7 @@ var ts;
                 var correspondingPropSymbol = getPropertyOfType(elementAttributesType, node.name.text);
                 correspondingPropType = correspondingPropSymbol && getTypeOfSymbol(correspondingPropSymbol);
                 if (isUnhyphenatedJsxName(node.name.text)) {
-                    var attributeType = getTypeOfPropertyOfType(elementAttributesType, getTextOfPropertyName(node.name)) || getIndexTypeOfType(elementAttributesType, 0);
+                    var attributeType = getTypeOfPropertyOfType(elementAttributesType, ts.getTextOfPropertyName(node.name)) || getIndexTypeOfType(elementAttributesType, 0);
                     if (attributeType) {
                         correspondingPropType = attributeType;
                     }
@@ -28025,7 +30029,7 @@ var ts;
             return links.resolvedSymbol;
         }
         function getJsxElementInstanceType(node, valueType) {
-            ts.Debug.assert(!(valueType.flags & 524288));
+            ts.Debug.assert(!(valueType.flags & 65536));
             if (isTypeAny(valueType)) {
                 return anyType;
             }
@@ -28064,7 +30068,7 @@ var ts;
             if (!elemType) {
                 elemType = checkExpression(node.tagName);
             }
-            if (elemType.flags & 524288) {
+            if (elemType.flags & 65536) {
                 var types = elemType.types;
                 return getUnionType(ts.map(types, function (type) {
                     return getResolvedJsxType(node, type, elemClassType);
@@ -28126,7 +30130,7 @@ var ts;
                 else if (isTypeAny(attributesType) || (attributesType === unknownType)) {
                     return attributesType;
                 }
-                else if (attributesType.flags & 524288) {
+                else if (attributesType.flags & 65536) {
                     error(node.tagName, ts.Diagnostics.JSX_element_attributes_type_0_may_not_be_a_union_type, typeToString(attributesType));
                     return anyType;
                 }
@@ -28203,20 +30207,23 @@ var ts;
             checkGrammarJsxElement(node);
             checkJsxPreconditions(node);
             var reactRefErr = compilerOptions.jsx === 2 ? ts.Diagnostics.Cannot_find_name_0 : undefined;
-            var reactNamespace = compilerOptions.reactNamespace ? compilerOptions.reactNamespace : "React";
+            var reactNamespace = getJsxNamespace();
             var reactSym = resolveName(node.tagName, reactNamespace, 107455, reactRefErr, reactNamespace);
             if (reactSym) {
-                getSymbolLinks(reactSym).referenced = true;
+                reactSym.isReferenced = true;
+                if (reactSym.flags & 8388608 && !isConstEnumOrConstEnumOnlyModule(resolveAlias(reactSym))) {
+                    markAliasSymbolAsReferenced(reactSym);
+                }
             }
             var targetAttributesType = getJsxElementAttributesType(node);
             var nameTable = ts.createMap();
             var sawSpreadedAny = false;
             for (var i = node.attributes.length - 1; i >= 0; i--) {
-                if (node.attributes[i].kind === 246) {
+                if (node.attributes[i].kind === 250) {
                     checkJsxAttribute((node.attributes[i]), targetAttributesType, nameTable);
                 }
                 else {
-                    ts.Debug.assert(node.attributes[i].kind === 247);
+                    ts.Debug.assert(node.attributes[i].kind === 251);
                     var spreadType = checkJsxSpreadAttribute((node.attributes[i]), targetAttributesType, nameTable);
                     if (isTypeAny(spreadType)) {
                         sawSpreadedAny = true;
@@ -28242,7 +30249,7 @@ var ts;
             }
         }
         function getDeclarationKindFromSymbol(s) {
-            return s.valueDeclaration ? s.valueDeclaration.kind : 146;
+            return s.valueDeclaration ? s.valueDeclaration.kind : 147;
         }
         function getDeclarationModifierFlagsFromSymbol(s) {
             return s.valueDeclaration ? ts.getCombinedModifierFlags(s.valueDeclaration) : s.flags & 134217728 ? 4 | 32 : 0;
@@ -28253,11 +30260,11 @@ var ts;
         function checkClassPropertyAccess(node, left, type, prop) {
             var flags = getDeclarationModifierFlagsFromSymbol(prop);
             var declaringClass = getDeclaredTypeOfSymbol(getParentOfSymbol(prop));
-            var errorNode = node.kind === 173 || node.kind === 219 ?
+            var errorNode = node.kind === 177 || node.kind === 223 ?
                 node.name :
                 node.right;
             if (left.kind === 96) {
-                if (languageVersion < 2 && getDeclarationKindFromSymbol(prop) !== 148) {
+                if (languageVersion < 2 && getDeclarationKindFromSymbol(prop) !== 149) {
                     error(errorNode, ts.Diagnostics.Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword);
                     return false;
                 }
@@ -28294,7 +30301,7 @@ var ts;
             if (type.flags & 16384 && type.isThisType) {
                 type = getConstraintOfTypeParameter(type);
             }
-            if (!(getTargetType(type).flags & (32768 | 65536) && hasBaseType(type, enclosingClass))) {
+            if (!(getObjectFlags(getTargetType(type)) & 3 && hasBaseType(type, enclosingClass))) {
                 error(errorNode, ts.Diagnostics.Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1, symbolToString(prop), typeToString(enclosingClass));
                 return false;
             }
@@ -28320,6 +30327,33 @@ var ts;
         function checkQualifiedName(node) {
             return checkPropertyAccessExpressionOrQualifiedName(node, node.left, node.right);
         }
+        function reportNonexistentProperty(propNode, containingType) {
+            var errorInfo;
+            if (containingType.flags & 65536 && !(containingType.flags & 8190)) {
+                for (var _i = 0, _a = containingType.types; _i < _a.length; _i++) {
+                    var subtype = _a[_i];
+                    if (!getPropertyOfType(subtype, propNode.text)) {
+                        errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.declarationNameToString(propNode), typeToString(subtype));
+                        break;
+                    }
+                }
+            }
+            errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.declarationNameToString(propNode), typeToString(containingType));
+            diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(propNode, errorInfo));
+        }
+        function markPropertyAsReferenced(prop) {
+            if (prop &&
+                noUnusedIdentifiers &&
+                (prop.flags & 106500) &&
+                prop.valueDeclaration && (ts.getModifierFlags(prop.valueDeclaration) & 8)) {
+                if (prop.flags & 16777216) {
+                    getSymbolLinks(prop).target.isReferenced = true;
+                }
+                else {
+                    prop.isReferenced = true;
+                }
+            }
+        }
         function checkPropertyAccessExpressionOrQualifiedName(node, left, right) {
             var type = checkNonNullExpression(left);
             if (isTypeAny(type) || type === silentNeverType) {
@@ -28336,44 +30370,29 @@ var ts;
                 }
                 return unknownType;
             }
-            if (noUnusedIdentifiers &&
-                (prop.flags & 106500) &&
-                prop.valueDeclaration && (ts.getModifierFlags(prop.valueDeclaration) & 8)) {
-                if (prop.flags & 16777216) {
-                    getSymbolLinks(prop).target.isReferenced = true;
-                }
-                else {
-                    prop.isReferenced = true;
-                }
-            }
+            markPropertyAsReferenced(prop);
             getNodeLinks(node).resolvedSymbol = prop;
             if (prop.parent && prop.parent.flags & 32) {
                 checkClassPropertyAccess(node, left, apparentType, prop);
             }
             var propType = getTypeOfSymbol(prop);
-            if (node.kind !== 173 || ts.isAssignmentTarget(node) ||
+            var assignmentKind = ts.getAssignmentTargetKind(node);
+            if (assignmentKind) {
+                if (isReferenceToReadonlyEntity(node, prop) || isReferenceThroughNamespaceImport(node)) {
+                    error(right, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_constant_or_a_read_only_property, right.text);
+                    return unknownType;
+                }
+            }
+            if (node.kind !== 177 || assignmentKind === 1 ||
                 !(prop.flags & (3 | 4 | 98304)) &&
-                    !(prop.flags & 8192 && propType.flags & 524288)) {
+                    !(prop.flags & 8192 && propType.flags & 65536)) {
                 return propType;
             }
-            return getFlowTypeOfReference(node, propType, true, undefined);
-            function reportNonexistentProperty(propNode, containingType) {
-                var errorInfo;
-                if (containingType.flags & 524288 && !(containingType.flags & 8190)) {
-                    for (var _i = 0, _a = containingType.types; _i < _a.length; _i++) {
-                        var subtype = _a[_i];
-                        if (!getPropertyOfType(subtype, propNode.text)) {
-                            errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.declarationNameToString(propNode), typeToString(subtype));
-                            break;
-                        }
-                    }
-                }
-                errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.declarationNameToString(propNode), typeToString(containingType));
-                diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(propNode, errorInfo));
-            }
+            var flowType = getFlowTypeOfReference(node, propType, true, undefined);
+            return assignmentKind ? getBaseTypeOfLiteralType(flowType) : flowType;
         }
         function isValidPropertyAccess(node, propertyName) {
-            var left = node.kind === 173
+            var left = node.kind === 177
                 ? node.expression
                 : node.left;
             var type = checkExpression(left);
@@ -28387,7 +30406,7 @@ var ts;
         }
         function getForInVariableSymbol(node) {
             var initializer = node.initializer;
-            if (initializer.kind === 220) {
+            if (initializer.kind === 224) {
                 var variable = initializer.declarations[0];
                 if (variable && !ts.isBindingPattern(variable.name)) {
                     return getSymbolOfNode(variable);
@@ -28402,14 +30421,14 @@ var ts;
             return getIndexTypeOfType(type, 1) && !getIndexTypeOfType(type, 0);
         }
         function isForInVariableForNumericPropertyNames(expr) {
-            var e = skipParenthesizedNodes(expr);
+            var e = ts.skipParentheses(expr);
             if (e.kind === 70) {
                 var symbol = getResolvedSymbol(e);
                 if (symbol.flags & 3) {
                     var child = expr;
                     var node = expr.parent;
                     while (node) {
-                        if (node.kind === 208 &&
+                        if (node.kind === 212 &&
                             child === node.statement &&
                             getForInVariableSymbol(node) === symbol &&
                             hasNumericPropertyNames(checkExpression(node.expression))) {
@@ -28423,9 +30442,11 @@ var ts;
             return false;
         }
         function checkIndexedAccess(node) {
-            if (!node.argumentExpression) {
+            var objectType = checkNonNullExpression(node.expression);
+            var indexExpression = node.argumentExpression;
+            if (!indexExpression) {
                 var sourceFile = ts.getSourceFileOfNode(node);
-                if (node.parent.kind === 176 && node.parent.expression === node) {
+                if (node.parent.kind === 180 && 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);
@@ -28435,71 +30456,17 @@ var ts;
                     var end = node.end;
                     grammarErrorAtPos(sourceFile, start, end - start, ts.Diagnostics.Expression_expected);
                 }
+                return unknownType;
             }
-            var objectType = getApparentType(checkNonNullExpression(node.expression));
-            var indexType = node.argumentExpression ? checkExpression(node.argumentExpression) : unknownType;
+            var indexType = isForInVariableForNumericPropertyNames(indexExpression) ? numberType : checkExpression(indexExpression);
             if (objectType === unknownType || objectType === silentNeverType) {
                 return objectType;
             }
-            var isConstEnum = isConstEnumObjectType(objectType);
-            if (isConstEnum &&
-                (!node.argumentExpression || node.argumentExpression.kind !== 9)) {
-                error(node.argumentExpression, ts.Diagnostics.A_const_enum_member_can_only_be_accessed_using_a_string_literal);
+            if (isConstEnumObjectType(objectType) && indexExpression.kind !== 9) {
+                error(indexExpression, ts.Diagnostics.A_const_enum_member_can_only_be_accessed_using_a_string_literal);
                 return unknownType;
             }
-            if (node.argumentExpression) {
-                var name_16 = getPropertyNameForIndexedAccess(node.argumentExpression, indexType);
-                if (name_16 !== undefined) {
-                    var prop = getPropertyOfType(objectType, name_16);
-                    if (prop) {
-                        getNodeLinks(node).resolvedSymbol = prop;
-                        return getTypeOfSymbol(prop);
-                    }
-                    else if (isConstEnum) {
-                        error(node.argumentExpression, ts.Diagnostics.Property_0_does_not_exist_on_const_enum_1, name_16, symbolToString(objectType.symbol));
-                        return unknownType;
-                    }
-                }
-            }
-            var allowedNullableFlags = strictNullChecks ? 0 : 6144;
-            if (isTypeAnyOrAllConstituentTypesHaveKind(indexType, 34 | 340 | 512 | allowedNullableFlags)) {
-                if (isTypeAnyOrAllConstituentTypesHaveKind(indexType, 340 | allowedNullableFlags) || isForInVariableForNumericPropertyNames(node.argumentExpression)) {
-                    var numberIndexInfo = getIndexInfoOfType(objectType, 1);
-                    if (numberIndexInfo) {
-                        getNodeLinks(node).resolvedIndexInfo = numberIndexInfo;
-                        return numberIndexInfo.type;
-                    }
-                }
-                var stringIndexInfo = getIndexInfoOfType(objectType, 0);
-                if (stringIndexInfo) {
-                    getNodeLinks(node).resolvedIndexInfo = stringIndexInfo;
-                    return stringIndexInfo.type;
-                }
-                if (compilerOptions.noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors && !isTypeAny(objectType)) {
-                    error(node, getIndexTypeOfType(objectType, 1) ?
-                        ts.Diagnostics.Element_implicitly_has_an_any_type_because_index_expression_is_not_of_type_number :
-                        ts.Diagnostics.Index_signature_of_object_type_implicitly_has_an_any_type);
-                }
-                return anyType;
-            }
-            error(node, ts.Diagnostics.An_index_expression_argument_must_be_of_type_string_number_symbol_or_any);
-            return unknownType;
-        }
-        function getPropertyNameForIndexedAccess(indexArgumentExpression, indexArgumentType) {
-            if (indexArgumentExpression.kind === 9 || indexArgumentExpression.kind === 8) {
-                return indexArgumentExpression.text;
-            }
-            if (indexArgumentExpression.kind === 174 || indexArgumentExpression.kind === 173) {
-                var value = getConstantValue(indexArgumentExpression);
-                if (value !== undefined) {
-                    return value.toString();
-                }
-            }
-            if (checkThatExpressionIsProperSymbolReference(indexArgumentExpression, indexArgumentType, false)) {
-                var rightHandSideName = indexArgumentExpression.name.text;
-                return ts.getPropertyNameForKnownSymbolName(rightHandSideName);
-            }
-            return undefined;
+            return getIndexedAccessType(objectType, indexType, node);
         }
         function checkThatExpressionIsProperSymbolReference(expression, expressionType, reportError) {
             if (expressionType === unknownType) {
@@ -28532,10 +30499,10 @@ var ts;
             return true;
         }
         function resolveUntypedCall(node) {
-            if (node.kind === 177) {
+            if (node.kind === 181) {
                 checkExpression(node.template);
             }
-            else if (node.kind !== 144) {
+            else if (node.kind !== 145) {
                 ts.forEach(node.arguments, function (argument) {
                     checkExpression(argument);
                 });
@@ -28557,19 +30524,19 @@ var ts;
             for (var _i = 0, signatures_2 = signatures; _i < signatures_2.length; _i++) {
                 var signature = signatures_2[_i];
                 var symbol = signature.declaration && getSymbolOfNode(signature.declaration);
-                var parent_11 = signature.declaration && signature.declaration.parent;
+                var parent_9 = signature.declaration && signature.declaration.parent;
                 if (!lastSymbol || symbol === lastSymbol) {
-                    if (lastParent && parent_11 === lastParent) {
+                    if (lastParent && parent_9 === lastParent) {
                         index++;
                     }
                     else {
-                        lastParent = parent_11;
+                        lastParent = parent_9;
                         index = cutoffIndex;
                     }
                 }
                 else {
                     index = cutoffIndex = result.length;
-                    lastParent = parent_11;
+                    lastParent = parent_9;
                 }
                 lastSymbol = symbol;
                 if (signature.hasLiteralTypes) {
@@ -28586,7 +30553,7 @@ var ts;
         function getSpreadArgumentIndex(args) {
             for (var i = 0; i < args.length; i++) {
                 var arg = args[i];
-                if (arg && arg.kind === 192) {
+                if (arg && arg.kind === 196) {
                     return i;
                 }
             }
@@ -28599,11 +30566,11 @@ var ts;
             var callIsIncomplete;
             var isDecorator;
             var spreadArgIndex = -1;
-            if (node.kind === 177) {
+            if (node.kind === 181) {
                 var tagExpression = node;
                 argCount = args.length;
                 typeArguments = undefined;
-                if (tagExpression.template.kind === 190) {
+                if (tagExpression.template.kind === 194) {
                     var templateExpression = tagExpression.template;
                     var lastSpan = ts.lastOrUndefined(templateExpression.templateSpans);
                     ts.Debug.assert(lastSpan !== undefined);
@@ -28615,7 +30582,7 @@ var ts;
                     callIsIncomplete = !!templateLiteral.isUnterminated;
                 }
             }
-            else if (node.kind === 144) {
+            else if (node.kind === 145) {
                 isDecorator = true;
                 typeArguments = undefined;
                 argCount = getEffectiveArgumentCount(node, undefined, signature);
@@ -28623,7 +30590,7 @@ var ts;
             else {
                 var callExpression = node;
                 if (!callExpression.arguments) {
-                    ts.Debug.assert(callExpression.kind === 176);
+                    ts.Debug.assert(callExpression.kind === 180);
                     return signature.minArgumentCount === 0;
                 }
                 argCount = signatureHelpTrailingComma ? args.length + 1 : args.length;
@@ -28646,7 +30613,7 @@ var ts;
             return callIsIncomplete || hasEnoughArguments;
         }
         function getSingleCallSignature(type) {
-            if (type.flags & 2588672) {
+            if (type.flags & 32768) {
                 var resolved = resolveStructuredTypeMembers(type);
                 if (resolved.callSignatures.length === 1 && resolved.constructSignatures.length === 0 &&
                     resolved.properties.length === 0 && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
@@ -28682,7 +30649,7 @@ var ts;
             var argCount = getEffectiveArgumentCount(node, args, signature);
             for (var i = 0; i < argCount; i++) {
                 var arg = getEffectiveArgument(node, args, i);
-                if (arg === undefined || arg.kind !== 194) {
+                if (arg === undefined || arg.kind !== 198) {
                     var paramType = getTypeAtPosition(signature, i);
                     var argType = getEffectiveArgumentType(node, i);
                     if (argType === undefined) {
@@ -28729,7 +30696,7 @@ var ts;
         }
         function checkApplicableSignature(node, args, signature, relation, excludeArgument, reportErrors) {
             var thisType = getThisTypeOfSignature(signature);
-            if (thisType && thisType !== voidType && node.kind !== 176) {
+            if (thisType && thisType !== voidType && node.kind !== 180) {
                 var thisArgumentNode = getThisArgumentOfCall(node);
                 var thisArgumentType = thisArgumentNode ? checkExpression(thisArgumentNode) : voidType;
                 var errorNode = reportErrors ? (thisArgumentNode || node) : undefined;
@@ -28742,7 +30709,7 @@ var ts;
             var argCount = getEffectiveArgumentCount(node, args, signature);
             for (var i = 0; i < argCount; i++) {
                 var arg = getEffectiveArgument(node, args, i);
-                if (arg === undefined || arg.kind !== 194) {
+                if (arg === undefined || arg.kind !== 198) {
                     var paramType = getTypeAtPosition(signature, i);
                     var argType = getEffectiveArgumentType(node, i);
                     if (argType === undefined) {
@@ -28757,28 +30724,28 @@ var ts;
             return true;
         }
         function getThisArgumentOfCall(node) {
-            if (node.kind === 175) {
+            if (node.kind === 179) {
                 var callee = node.expression;
-                if (callee.kind === 173) {
+                if (callee.kind === 177) {
                     return callee.expression;
                 }
-                else if (callee.kind === 174) {
+                else if (callee.kind === 178) {
                     return callee.expression;
                 }
             }
         }
         function getEffectiveCallArguments(node) {
             var args;
-            if (node.kind === 177) {
+            if (node.kind === 181) {
                 var template = node.template;
                 args = [undefined];
-                if (template.kind === 190) {
+                if (template.kind === 194) {
                     ts.forEach(template.templateSpans, function (span) {
                         args.push(span.expression);
                     });
                 }
             }
-            else if (node.kind === 144) {
+            else if (node.kind === 145) {
                 return undefined;
             }
             else {
@@ -28787,21 +30754,21 @@ var ts;
             return args;
         }
         function getEffectiveArgumentCount(node, args, signature) {
-            if (node.kind === 144) {
+            if (node.kind === 145) {
                 switch (node.parent.kind) {
-                    case 222:
-                    case 193:
+                    case 226:
+                    case 197:
                         return 1;
-                    case 146:
+                    case 147:
                         return 2;
-                    case 148:
-                    case 150:
+                    case 149:
                     case 151:
+                    case 152:
                         if (languageVersion === 0) {
                             return 2;
                         }
                         return signature.parameters.length >= 3 ? 3 : 2;
-                    case 143:
+                    case 144:
                         return 3;
                 }
             }
@@ -28810,48 +30777,48 @@ var ts;
             }
         }
         function getEffectiveDecoratorFirstArgumentType(node) {
-            if (node.kind === 222) {
+            if (node.kind === 226) {
                 var classSymbol = getSymbolOfNode(node);
                 return getTypeOfSymbol(classSymbol);
             }
-            if (node.kind === 143) {
+            if (node.kind === 144) {
                 node = node.parent;
-                if (node.kind === 149) {
+                if (node.kind === 150) {
                     var classSymbol = getSymbolOfNode(node);
                     return getTypeOfSymbol(classSymbol);
                 }
             }
-            if (node.kind === 146 ||
-                node.kind === 148 ||
-                node.kind === 150 ||
-                node.kind === 151) {
+            if (node.kind === 147 ||
+                node.kind === 149 ||
+                node.kind === 151 ||
+                node.kind === 152) {
                 return getParentTypeOfClassElement(node);
             }
             ts.Debug.fail("Unsupported decorator target.");
             return unknownType;
         }
         function getEffectiveDecoratorSecondArgumentType(node) {
-            if (node.kind === 222) {
+            if (node.kind === 226) {
                 ts.Debug.fail("Class decorators should not have a second synthetic argument.");
                 return unknownType;
             }
-            if (node.kind === 143) {
+            if (node.kind === 144) {
                 node = node.parent;
-                if (node.kind === 149) {
+                if (node.kind === 150) {
                     return anyType;
                 }
             }
-            if (node.kind === 146 ||
-                node.kind === 148 ||
-                node.kind === 150 ||
-                node.kind === 151) {
+            if (node.kind === 147 ||
+                node.kind === 149 ||
+                node.kind === 151 ||
+                node.kind === 152) {
                 var element = node;
                 switch (element.name.kind) {
                     case 70:
                     case 8:
                     case 9:
                         return getLiteralTypeForText(32, element.name.text);
-                    case 141:
+                    case 142:
                         var nameType = checkComputedPropertyName(element.name);
                         if (isTypeOfKind(nameType, 512)) {
                             return nameType;
@@ -28868,20 +30835,20 @@ var ts;
             return unknownType;
         }
         function getEffectiveDecoratorThirdArgumentType(node) {
-            if (node.kind === 222) {
+            if (node.kind === 226) {
                 ts.Debug.fail("Class decorators should not have a third synthetic argument.");
                 return unknownType;
             }
-            if (node.kind === 143) {
+            if (node.kind === 144) {
                 return numberType;
             }
-            if (node.kind === 146) {
+            if (node.kind === 147) {
                 ts.Debug.fail("Property decorators should not have a third synthetic argument.");
                 return unknownType;
             }
-            if (node.kind === 148 ||
-                node.kind === 150 ||
-                node.kind === 151) {
+            if (node.kind === 149 ||
+                node.kind === 151 ||
+                node.kind === 152) {
                 var propertyType = getTypeOfNode(node);
                 return createTypedPropertyDescriptorType(propertyType);
             }
@@ -28902,26 +30869,26 @@ var ts;
             return unknownType;
         }
         function getEffectiveArgumentType(node, argIndex) {
-            if (node.kind === 144) {
+            if (node.kind === 145) {
                 return getEffectiveDecoratorArgumentType(node, argIndex);
             }
-            else if (argIndex === 0 && node.kind === 177) {
+            else if (argIndex === 0 && node.kind === 181) {
                 return getGlobalTemplateStringsArrayType();
             }
             return undefined;
         }
         function getEffectiveArgument(node, args, argIndex) {
-            if (node.kind === 144 ||
-                (argIndex === 0 && node.kind === 177)) {
+            if (node.kind === 145 ||
+                (argIndex === 0 && node.kind === 181)) {
                 return undefined;
             }
             return args[argIndex];
         }
         function getEffectiveArgumentErrorNode(node, argIndex, arg) {
-            if (node.kind === 144) {
+            if (node.kind === 145) {
                 return node.expression;
             }
-            else if (argIndex === 0 && node.kind === 177) {
+            else if (argIndex === 0 && node.kind === 181) {
                 return node.template;
             }
             else {
@@ -28929,8 +30896,8 @@ var ts;
             }
         }
         function resolveCall(node, signatures, candidatesOutArray, headMessage) {
-            var isTaggedTemplate = node.kind === 177;
-            var isDecorator = node.kind === 144;
+            var isTaggedTemplate = node.kind === 181;
+            var isDecorator = node.kind === 145;
             var typeArguments;
             if (!isTaggedTemplate && !isDecorator) {
                 typeArguments = node.typeArguments;
@@ -28960,7 +30927,7 @@ var ts;
             var candidateForTypeArgumentError;
             var resultOfFailedInference;
             var result;
-            var signatureHelpTrailingComma = candidatesOutArray && node.kind === 175 && node.arguments.hasTrailingComma;
+            var signatureHelpTrailingComma = candidatesOutArray && node.kind === 179 && node.arguments.hasTrailingComma;
             if (candidates.length > 1) {
                 result = chooseOverload(candidates, subtypeRelation, signatureHelpTrailingComma);
             }
@@ -28979,7 +30946,7 @@ var ts;
             else if (candidateForTypeArgumentError) {
                 if (!isTaggedTemplate && !isDecorator && typeArguments) {
                     var typeArguments_2 = node.typeArguments;
-                    checkTypeArguments(candidateForTypeArgumentError, typeArguments_2, ts.map(typeArguments_2, getTypeFromTypeNodeNoAlias), true, headMessage);
+                    checkTypeArguments(candidateForTypeArgumentError, typeArguments_2, ts.map(typeArguments_2, getTypeFromTypeNode), true, headMessage);
                 }
                 else {
                     ts.Debug.assert(resultOfFailedInference.failedTypeParameterIndex >= 0);
@@ -29000,7 +30967,7 @@ var ts;
                     var candidate = candidates_1[_i];
                     if (hasCorrectArity(node, args, candidate)) {
                         if (candidate.typeParameters && typeArguments) {
-                            candidate = getSignatureInstantiation(candidate, ts.map(typeArguments, getTypeFromTypeNodeNoAlias));
+                            candidate = getSignatureInstantiation(candidate, ts.map(typeArguments, getTypeFromTypeNode));
                         }
                         return candidate;
                     }
@@ -29032,7 +30999,7 @@ var ts;
                         if (candidate.typeParameters) {
                             var typeArgumentTypes = void 0;
                             if (typeArguments) {
-                                typeArgumentTypes = ts.map(typeArguments, getTypeFromTypeNodeNoAlias);
+                                typeArgumentTypes = ts.map(typeArguments, getTypeFromTypeNode);
                                 typeArgumentsAreValid = checkTypeArguments(candidate, typeArguments, typeArgumentTypes, false);
                             }
                             else {
@@ -29121,7 +31088,7 @@ var ts;
                 return true;
             }
             if (!numCallSignatures && !numConstructSignatures) {
-                if (funcType.flags & 524288) {
+                if (funcType.flags & 65536) {
                     return false;
                 }
                 return isTypeAssignableTo(funcType, globalFunctionType);
@@ -29228,16 +31195,16 @@ var ts;
         }
         function getDiagnosticHeadMessageForDecoratorResolution(node) {
             switch (node.parent.kind) {
-                case 222:
-                case 193:
+                case 226:
+                case 197:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression;
-                case 143:
+                case 144:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression;
-                case 146:
+                case 147:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression;
-                case 148:
-                case 150:
+                case 149:
                 case 151:
+                case 152:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression;
             }
         }
@@ -29264,13 +31231,13 @@ var ts;
         }
         function resolveSignature(node, candidatesOutArray) {
             switch (node.kind) {
-                case 175:
+                case 179:
                     return resolveCallExpression(node, candidatesOutArray);
-                case 176:
+                case 180:
                     return resolveNewExpression(node, candidatesOutArray);
-                case 177:
+                case 181:
                     return resolveTaggedTemplateExpression(node, candidatesOutArray);
-                case 144:
+                case 145:
                     return resolveDecorator(node, candidatesOutArray);
             }
             ts.Debug.fail("Branch in 'resolveSignature' should be unreachable.");
@@ -29302,12 +31269,12 @@ var ts;
             if (node.expression.kind === 96) {
                 return voidType;
             }
-            if (node.kind === 176) {
+            if (node.kind === 180) {
                 var declaration = signature.declaration;
                 if (declaration &&
-                    declaration.kind !== 149 &&
-                    declaration.kind !== 153 &&
-                    declaration.kind !== 158 &&
+                    declaration.kind !== 150 &&
+                    declaration.kind !== 154 &&
+                    declaration.kind !== 159 &&
                     !ts.isJSDocConstructSignature(declaration)) {
                     var funcSymbol = node.expression.kind === 70 ?
                         getResolvedSymbol(node.expression) :
@@ -29321,13 +31288,33 @@ var ts;
                     return anyType;
                 }
             }
-            if (ts.isInJavaScriptFile(node) &&
-                ts.isRequireCall(node, true) &&
-                !resolveName(node.expression, node.expression.text, 107455, undefined, undefined)) {
+            if (ts.isInJavaScriptFile(node) && isCommonJsRequire(node)) {
                 return resolveExternalModuleTypeByLiteral(node.arguments[0]);
             }
             return getReturnTypeOfSignature(signature);
         }
+        function isCommonJsRequire(node) {
+            if (!ts.isRequireCall(node, true)) {
+                return false;
+            }
+            var resolvedRequire = resolveName(node.expression, node.expression.text, 107455, undefined, undefined);
+            if (!resolvedRequire) {
+                return true;
+            }
+            if (resolvedRequire.flags & 8388608) {
+                return false;
+            }
+            var targetDeclarationKind = resolvedRequire.flags & 16
+                ? 225
+                : resolvedRequire.flags & 3
+                    ? 223
+                    : 0;
+            if (targetDeclarationKind !== 0) {
+                var decl = ts.getDeclarationOfKind(resolvedRequire, targetDeclarationKind);
+                return ts.isInAmbientContext(decl);
+            }
+            return false;
+        }
         function checkTaggedTemplateExpression(node) {
             return getReturnTypeOfSignature(getResolvedSignature(node));
         }
@@ -29413,8 +31400,8 @@ var ts;
             if (!links.type) {
                 links.type = instantiateType(contextualType, mapper);
                 if (links.type === emptyObjectType &&
-                    (parameter.valueDeclaration.name.kind === 168 ||
-                        parameter.valueDeclaration.name.kind === 169)) {
+                    (parameter.valueDeclaration.name.kind === 172 ||
+                        parameter.valueDeclaration.name.kind === 173)) {
                     links.type = getTypeFromBindingPattern(parameter.valueDeclaration.name);
                 }
                 assignBindingElementTypes(parameter.valueDeclaration);
@@ -29441,7 +31428,7 @@ var ts;
         function createPromiseReturnType(func, promisedType) {
             var promiseType = createPromiseType(promisedType);
             if (promiseType === emptyObjectType) {
-                error(func, ts.Diagnostics.An_async_function_or_method_must_have_a_valid_awaitable_return_type);
+                error(func, 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);
                 return unknownType;
             }
             return promiseType;
@@ -29453,7 +31440,7 @@ var ts;
             }
             var isAsync = ts.isAsyncFunctionLike(func);
             var type;
-            if (func.body.kind !== 200) {
+            if (func.body.kind !== 204) {
                 type = checkExpressionCached(func.body, contextualMapper);
                 if (isAsync) {
                     type = checkAwaitedType(type, func, ts.Diagnostics.Return_expression_in_async_function_does_not_have_a_valid_callable_then_member);
@@ -29532,7 +31519,7 @@ var ts;
                 return false;
             }
             var lastStatement = ts.lastOrUndefined(func.body.statements);
-            if (lastStatement && lastStatement.kind === 214 && isExhaustiveSwitchStatement(lastStatement)) {
+            if (lastStatement && lastStatement.kind === 218 && isExhaustiveSwitchStatement(lastStatement)) {
                 return false;
             }
             return true;
@@ -29561,7 +31548,7 @@ var ts;
                 }
             });
             if (aggregatedTypes.length === 0 && !hasReturnWithNoExpression && (hasReturnOfTypeNever ||
-                func.kind === 180 || func.kind === 181)) {
+                func.kind === 184 || func.kind === 185)) {
                 return undefined;
             }
             if (strictNullChecks && aggregatedTypes.length && hasReturnWithNoExpression) {
@@ -29578,7 +31565,7 @@ var ts;
             if (returnType && maybeTypeOfKind(returnType, 1 | 1024)) {
                 return;
             }
-            if (ts.nodeIsMissing(func.body) || func.body.kind !== 200 || !functionHasImplicitReturn(func)) {
+            if (ts.nodeIsMissing(func.body) || func.body.kind !== 204 || !functionHasImplicitReturn(func)) {
                 return;
             }
             var hasExplicitReturn = func.flags & 256;
@@ -29605,9 +31592,9 @@ var ts;
             }
         }
         function checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper) {
-            ts.Debug.assert(node.kind !== 148 || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 149 || ts.isObjectLiteralMethod(node));
             var hasGrammarError = checkGrammarFunctionLikeDeclaration(node);
-            if (!hasGrammarError && node.kind === 180) {
+            if (!hasGrammarError && node.kind === 184) {
                 checkGrammarForGenerator(node);
             }
             if (contextualMapper === identityMapper && isContextSensitive(node)) {
@@ -29641,14 +31628,14 @@ var ts;
                     }
                 }
             }
-            if (produceDiagnostics && node.kind !== 148) {
+            if (produceDiagnostics && node.kind !== 149) {
                 checkCollisionWithCapturedSuperVariable(node, node.name);
                 checkCollisionWithCapturedThisVariable(node, node.name);
             }
             return type;
         }
         function checkFunctionExpressionOrObjectLiteralMethodDeferred(node) {
-            ts.Debug.assert(node.kind !== 148 || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 149 || ts.isObjectLiteralMethod(node));
             var isAsync = ts.isAsyncFunctionLike(node);
             var returnOrPromisedType = node.type && (isAsync ? checkAsyncFunctionReturnType(node) : getTypeFromTypeNode(node.type));
             if (!node.asteriskToken) {
@@ -29658,7 +31645,7 @@ var ts;
                 if (!node.type) {
                     getReturnTypeOfSignature(getSignatureFromDeclaration(node));
                 }
-                if (node.body.kind === 200) {
+                if (node.body.kind === 204) {
                     checkSourceElement(node.body);
                 }
                 else {
@@ -29693,10 +31680,10 @@ var ts;
         function isReferenceToReadonlyEntity(expr, symbol) {
             if (isReadonlySymbol(symbol)) {
                 if (symbol.flags & 4 &&
-                    (expr.kind === 173 || expr.kind === 174) &&
+                    (expr.kind === 177 || expr.kind === 178) &&
                     expr.expression.kind === 98) {
                     var func = ts.getContainingFunction(expr);
-                    if (!(func && func.kind === 149))
+                    if (!(func && func.kind === 150))
                         return true;
                     return !(func.parent === symbol.valueDeclaration.parent || func === symbol.valueDeclaration.parent);
                 }
@@ -29705,44 +31692,24 @@ var ts;
             return false;
         }
         function isReferenceThroughNamespaceImport(expr) {
-            if (expr.kind === 173 || expr.kind === 174) {
-                var node = skipParenthesizedNodes(expr.expression);
+            if (expr.kind === 177 || expr.kind === 178) {
+                var node = ts.skipParentheses(expr.expression);
                 if (node.kind === 70) {
                     var symbol = getNodeLinks(node).resolvedSymbol;
                     if (symbol.flags & 8388608) {
                         var declaration = getDeclarationOfAliasSymbol(symbol);
-                        return declaration && declaration.kind === 233;
+                        return declaration && declaration.kind === 237;
                     }
                 }
             }
             return false;
         }
-        function checkReferenceExpression(expr, invalidReferenceMessage, constantVariableMessage) {
-            var node = skipParenthesizedNodes(expr);
-            if (node.kind !== 70 && node.kind !== 173 && node.kind !== 174) {
+        function checkReferenceExpression(expr, invalidReferenceMessage) {
+            var node = ts.skipParentheses(expr);
+            if (node.kind !== 70 && node.kind !== 177 && node.kind !== 178) {
                 error(expr, invalidReferenceMessage);
                 return false;
             }
-            var links = getNodeLinks(node);
-            var symbol = getExportSymbolOfValueSymbolIfExported(links.resolvedSymbol);
-            if (symbol) {
-                if (symbol !== unknownSymbol && symbol !== argumentsSymbol) {
-                    if (node.kind === 70 && !(symbol.flags & 3)) {
-                        error(expr, invalidReferenceMessage);
-                        return false;
-                    }
-                    if (isReferenceToReadonlyEntity(node, symbol) || isReferenceThroughNamespaceImport(node)) {
-                        error(expr, constantVariableMessage);
-                        return false;
-                    }
-                }
-            }
-            else if (node.kind === 174) {
-                if (links.resolvedIndexInfo && links.resolvedIndexInfo.isReadonly) {
-                    error(expr, constantVariableMessage);
-                    return false;
-                }
-            }
             return true;
         }
         function checkDeleteExpression(node) {
@@ -29759,7 +31726,7 @@ var ts;
         }
         function checkAwaitExpression(node) {
             if (produceDiagnostics) {
-                if (!(node.flags & 262144)) {
+                if (!(node.flags & 524288)) {
                     grammarErrorOnFirstToken(node, ts.Diagnostics.await_expression_is_only_allowed_within_an_async_function);
                 }
                 if (isInParameterInitializerBeforeContainingFunction(node)) {
@@ -29794,7 +31761,7 @@ var ts;
                 case 43:
                     var ok = checkArithmeticOperandType(node.operand, getNonNullableType(operandType), ts.Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
                     if (ok) {
-                        checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property);
+                        checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_or_a_property_access);
                     }
                     return numberType;
             }
@@ -29807,7 +31774,7 @@ var ts;
             }
             var ok = checkArithmeticOperandType(node.operand, getNonNullableType(operandType), ts.Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
             if (ok) {
-                checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property);
+                checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_or_a_property_access);
             }
             return numberType;
         }
@@ -29815,7 +31782,7 @@ var ts;
             if (type.flags & kind) {
                 return true;
             }
-            if (type.flags & 1572864) {
+            if (type.flags & 196608) {
                 var types = type.types;
                 for (var _i = 0, types_15 = types; _i < types_15.length; _i++) {
                     var t = types_15[_i];
@@ -29830,7 +31797,7 @@ var ts;
             if (type.flags & kind) {
                 return true;
             }
-            if (type.flags & 524288) {
+            if (type.flags & 65536) {
                 var types = type.types;
                 for (var _i = 0, types_16 = types; _i < types_16.length; _i++) {
                     var t = types_16[_i];
@@ -29840,7 +31807,7 @@ var ts;
                 }
                 return true;
             }
-            if (type.flags & 1048576) {
+            if (type.flags & 131072) {
                 var types = type.types;
                 for (var _a = 0, types_17 = types; _a < types_17.length; _a++) {
                     var t = types_17[_a];
@@ -29852,7 +31819,7 @@ var ts;
             return false;
         }
         function isConstEnumObjectType(type) {
-            return type.flags & (2588672 | 2097152) && type.symbol && isConstEnumSymbol(type.symbol);
+            return getObjectFlags(type) & 16 && type.symbol && isConstEnumSymbol(type.symbol);
         }
         function isConstEnumSymbol(symbol) {
             return (symbol.flags & 128) !== 0;
@@ -29876,36 +31843,36 @@ var ts;
             if (!isTypeAnyOrAllConstituentTypesHaveKind(leftType, 34 | 340 | 512)) {
                 error(left, ts.Diagnostics.The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol);
             }
-            if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, 2588672 | 16384)) {
+            if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, 32768 | 16384)) {
                 error(right, ts.Diagnostics.The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter);
             }
             return booleanType;
         }
         function checkObjectLiteralAssignment(node, sourceType) {
             var properties = node.properties;
-            for (var _i = 0, properties_4 = properties; _i < properties_4.length; _i++) {
-                var p = properties_4[_i];
+            for (var _i = 0, properties_5 = properties; _i < properties_5.length; _i++) {
+                var p = properties_5[_i];
                 checkObjectLiteralDestructuringPropertyAssignment(sourceType, p);
             }
             return sourceType;
         }
         function checkObjectLiteralDestructuringPropertyAssignment(objectLiteralType, property) {
-            if (property.kind === 253 || property.kind === 254) {
-                var name_17 = property.name;
-                if (name_17.kind === 141) {
-                    checkComputedPropertyName(name_17);
+            if (property.kind === 257 || property.kind === 258) {
+                var name_23 = property.name;
+                if (name_23.kind === 142) {
+                    checkComputedPropertyName(name_23);
                 }
-                if (isComputedNonLiteralName(name_17)) {
+                if (isComputedNonLiteralName(name_23)) {
                     return undefined;
                 }
-                var text = getTextOfPropertyName(name_17);
+                var text = ts.getTextOfPropertyName(name_23);
                 var type = isTypeAny(objectLiteralType)
                     ? objectLiteralType
                     : getTypeOfPropertyOfType(objectLiteralType, text) ||
                         isNumericLiteralName(text) && getIndexTypeOfType(objectLiteralType, 1) ||
                         getIndexTypeOfType(objectLiteralType, 0);
                 if (type) {
-                    if (property.kind === 254) {
+                    if (property.kind === 258) {
                         return checkDestructuringAssignment(property, type);
                     }
                     else {
@@ -29913,7 +31880,12 @@ var ts;
                     }
                 }
                 else {
-                    error(name_17, ts.Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(objectLiteralType), ts.declarationNameToString(name_17));
+                    error(name_23, ts.Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(objectLiteralType), ts.declarationNameToString(name_23));
+                }
+            }
+            else if (property.kind === 259) {
+                if (property.expression.kind !== 70) {
+                    error(property.expression, ts.Diagnostics.An_object_rest_element_must_be_an_identifier);
                 }
             }
             else {
@@ -29931,8 +31903,8 @@ var ts;
         function checkArrayLiteralDestructuringElementAssignment(node, sourceType, elementIndex, elementType, contextualMapper) {
             var elements = node.elements;
             var element = elements[elementIndex];
-            if (element.kind !== 194) {
-                if (element.kind !== 192) {
+            if (element.kind !== 198) {
+                if (element.kind !== 196) {
                     var propName = "" + elementIndex;
                     var type = isTypeAny(sourceType)
                         ? sourceType
@@ -29954,11 +31926,11 @@ var ts;
                 }
                 else {
                     if (elementIndex < elements.length - 1) {
-                        error(element, ts.Diagnostics.A_rest_element_must_be_last_in_an_array_destructuring_pattern);
+                        error(element, ts.Diagnostics.A_rest_element_must_be_last_in_a_destructuring_pattern);
                     }
                     else {
                         var restExpression = element.expression;
-                        if (restExpression.kind === 188 && restExpression.operatorToken.kind === 57) {
+                        if (restExpression.kind === 192 && restExpression.operatorToken.kind === 57) {
                             error(restExpression.operatorToken, ts.Diagnostics.A_rest_element_cannot_have_an_initializer);
                         }
                         else {
@@ -29971,7 +31943,7 @@ var ts;
         }
         function checkDestructuringAssignment(exprOrAssignment, sourceType, contextualMapper) {
             var target;
-            if (exprOrAssignment.kind === 254) {
+            if (exprOrAssignment.kind === 258) {
                 var prop = exprOrAssignment;
                 if (prop.objectAssignmentInitializer) {
                     if (strictNullChecks &&
@@ -29985,21 +31957,21 @@ var ts;
             else {
                 target = exprOrAssignment;
             }
-            if (target.kind === 188 && target.operatorToken.kind === 57) {
+            if (target.kind === 192 && target.operatorToken.kind === 57) {
                 checkBinaryExpression(target, contextualMapper);
                 target = target.left;
             }
-            if (target.kind === 172) {
+            if (target.kind === 176) {
                 return checkObjectLiteralAssignment(target, sourceType);
             }
-            if (target.kind === 171) {
+            if (target.kind === 175) {
                 return checkArrayLiteralAssignment(target, sourceType, contextualMapper);
             }
             return checkReferenceAssignment(target, sourceType, contextualMapper);
         }
         function checkReferenceAssignment(target, sourceType, contextualMapper) {
             var targetType = checkExpression(target, contextualMapper);
-            if (checkReferenceExpression(target, ts.Diagnostics.Invalid_left_hand_side_of_assignment_expression, ts.Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property)) {
+            if (checkReferenceExpression(target, ts.Diagnostics.The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access)) {
                 checkTypeAssignableTo(sourceType, targetType, target, undefined);
             }
             return sourceType;
@@ -30010,35 +31982,35 @@ var ts;
                 case 70:
                 case 9:
                 case 11:
-                case 177:
-                case 190:
+                case 181:
+                case 194:
                 case 12:
                 case 8:
                 case 100:
                 case 85:
                 case 94:
-                case 136:
-                case 180:
-                case 193:
-                case 181:
-                case 171:
-                case 172:
-                case 183:
+                case 137:
+                case 184:
                 case 197:
-                case 243:
-                case 242:
+                case 185:
+                case 175:
+                case 176:
+                case 187:
+                case 201:
+                case 247:
+                case 246:
                     return true;
-                case 189:
+                case 193:
                     return isSideEffectFree(node.whenTrue) &&
                         isSideEffectFree(node.whenFalse);
-                case 188:
+                case 192:
                     if (ts.isAssignmentOperator(node.operatorToken.kind)) {
                         return false;
                     }
                     return isSideEffectFree(node.left) &&
                         isSideEffectFree(node.right);
-                case 186:
-                case 187:
+                case 190:
+                case 191:
                     switch (node.operator) {
                         case 50:
                         case 36:
@@ -30047,9 +32019,9 @@ var ts;
                             return true;
                     }
                     return false;
-                case 184:
-                case 178:
-                case 196:
+                case 188:
+                case 182:
+                case 200:
                 default:
                     return false;
             }
@@ -30069,7 +32041,7 @@ var ts;
         }
         function checkBinaryLikeExpression(left, operatorToken, right, contextualMapper, errorNode) {
             var operator = operatorToken.kind;
-            if (operator === 57 && (left.kind === 172 || left.kind === 171)) {
+            if (operator === 57 && (left.kind === 176 || left.kind === 175)) {
                 return checkDestructuringAssignment(left, checkExpression(right, contextualMapper), contextualMapper);
             }
             var leftType = checkExpression(left, contextualMapper);
@@ -30226,8 +32198,7 @@ var ts;
             }
             function checkAssignmentOperator(valueType) {
                 if (produceDiagnostics && operator >= 57 && operator <= 69) {
-                    var ok = checkReferenceExpression(left, ts.Diagnostics.Invalid_left_hand_side_of_assignment_expression, ts.Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property);
-                    if (ok) {
+                    if (checkReferenceExpression(left, ts.Diagnostics.The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access)) {
                         checkTypeAssignableTo(valueType, leftType, left, undefined);
                     }
                 }
@@ -30253,7 +32224,7 @@ var ts;
         }
         function checkYieldExpression(node) {
             if (produceDiagnostics) {
-                if (!(node.flags & 65536) || isYieldExpressionInClass(node)) {
+                if (!(node.flags & 131072) || isYieldExpressionInClass(node)) {
                     grammarErrorOnFirstToken(node, ts.Diagnostics.A_yield_expression_is_only_allowed_in_a_generator_body);
                 }
                 if (isInParameterInitializerBeforeContainingFunction(node)) {
@@ -30327,8 +32298,8 @@ var ts;
             return links.resolvedType;
         }
         function isTypeAssertion(node) {
-            node = skipParenthesizedNodes(node);
-            return node.kind === 178 || node.kind === 196;
+            node = ts.skipParentheses(node);
+            return node.kind === 182 || node.kind === 200;
         }
         function checkDeclarationInitializer(declaration) {
             var type = checkExpressionCached(declaration.initializer);
@@ -30354,14 +32325,14 @@ var ts;
             return isTypeAssertion(node) || isLiteralContextualType(getContextualType(node)) ? type : getWidenedLiteralType(type);
         }
         function checkPropertyAssignment(node, contextualMapper) {
-            if (node.name.kind === 141) {
+            if (node.name.kind === 142) {
                 checkComputedPropertyName(node.name);
             }
             return checkExpressionForMutableLocation(node.initializer, contextualMapper);
         }
         function checkObjectLiteralMethod(node, contextualMapper) {
             checkGrammarMethod(node);
-            if (node.name.kind === 141) {
+            if (node.name.kind === 142) {
                 checkComputedPropertyName(node.name);
             }
             var uninstantiatedType = checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper);
@@ -30384,7 +32355,7 @@ var ts;
         }
         function checkExpression(node, contextualMapper) {
             var type;
-            if (node.kind === 140) {
+            if (node.kind === 141) {
                 type = checkQualifiedName(node);
             }
             else {
@@ -30392,9 +32363,9 @@ var ts;
                 type = instantiateTypeWithSingleGenericCallSignature(node, uninstantiatedType, contextualMapper);
             }
             if (isConstEnumObjectType(type)) {
-                var ok = (node.parent.kind === 173 && node.parent.expression === node) ||
-                    (node.parent.kind === 174 && node.parent.expression === node) ||
-                    ((node.kind === 70 || node.kind === 140) && isInRightSideOfImportOrExportAssignment(node));
+                var ok = (node.parent.kind === 177 && node.parent.expression === node) ||
+                    (node.parent.kind === 178 && node.parent.expression === node) ||
+                    ((node.kind === 70 || node.kind === 141) && isInRightSideOfImportOrExportAssignment(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);
                 }
@@ -30416,66 +32387,66 @@ var ts;
                 case 100:
                 case 85:
                     return checkLiteralExpression(node);
-                case 190:
+                case 194:
                     return checkTemplateExpression(node);
                 case 12:
                     return stringType;
                 case 11:
                     return globalRegExpType;
-                case 171:
-                    return checkArrayLiteral(node, contextualMapper);
-                case 172:
-                    return checkObjectLiteral(node, contextualMapper);
-                case 173:
-                    return checkPropertyAccessExpression(node);
-                case 174:
-                    return checkIndexedAccess(node);
                 case 175:
+                    return checkArrayLiteral(node, contextualMapper);
                 case 176:
-                    return checkCallExpression(node);
+                    return checkObjectLiteral(node, contextualMapper);
                 case 177:
-                    return checkTaggedTemplateExpression(node);
-                case 179:
-                    return checkExpression(node.expression, contextualMapper);
-                case 193:
-                    return checkClassExpression(node);
-                case 180:
-                case 181:
-                    return checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper);
-                case 183:
-                    return checkTypeOfExpression(node);
+                    return checkPropertyAccessExpression(node);
                 case 178:
-                case 196:
-                    return checkAssertion(node);
+                    return checkIndexedAccess(node);
+                case 179:
+                case 180:
+                    return checkCallExpression(node);
+                case 181:
+                    return checkTaggedTemplateExpression(node);
+                case 183:
+                    return checkExpression(node.expression, contextualMapper);
                 case 197:
-                    return checkNonNullAssertion(node);
-                case 182:
-                    return checkDeleteExpression(node);
+                    return checkClassExpression(node);
                 case 184:
-                    return checkVoidExpression(node);
                 case 185:
-                    return checkAwaitExpression(node);
-                case 186:
-                    return checkPrefixUnaryExpression(node);
+                    return checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper);
                 case 187:
-                    return checkPostfixUnaryExpression(node);
+                    return checkTypeOfExpression(node);
+                case 182:
+                case 200:
+                    return checkAssertion(node);
+                case 201:
+                    return checkNonNullAssertion(node);
+                case 186:
+                    return checkDeleteExpression(node);
                 case 188:
-                    return checkBinaryExpression(node, contextualMapper);
+                    return checkVoidExpression(node);
                 case 189:
-                    return checkConditionalExpression(node, contextualMapper);
-                case 192:
-                    return checkSpreadElementExpression(node, contextualMapper);
-                case 194:
-                    return undefinedWideningType;
+                    return checkAwaitExpression(node);
+                case 190:
+                    return checkPrefixUnaryExpression(node);
                 case 191:
+                    return checkPostfixUnaryExpression(node);
+                case 192:
+                    return checkBinaryExpression(node, contextualMapper);
+                case 193:
+                    return checkConditionalExpression(node, contextualMapper);
+                case 196:
+                    return checkSpreadExpression(node, contextualMapper);
+                case 198:
+                    return undefinedWideningType;
+                case 195:
                     return checkYieldExpression(node);
-                case 248:
+                case 252:
                     return checkJsxExpression(node);
-                case 242:
+                case 246:
                     return checkJsxElement(node);
-                case 243:
+                case 247:
                     return checkJsxSelfClosingElement(node);
-                case 244:
+                case 248:
                     ts.Debug.fail("Shouldn't ever directly check a JsxOpeningElement");
             }
             return unknownType;
@@ -30496,7 +32467,7 @@ var ts;
             var func = ts.getContainingFunction(node);
             if (ts.getModifierFlags(node) & 92) {
                 func = ts.getContainingFunction(node);
-                if (!(func.kind === 149 && ts.nodeIsPresent(func.body))) {
+                if (!(func.kind === 150 && ts.nodeIsPresent(func.body))) {
                     error(node, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
                 }
             }
@@ -30507,7 +32478,7 @@ var ts;
                 if (ts.indexOf(func.parameters, node) !== 0) {
                     error(node, ts.Diagnostics.A_this_parameter_must_be_the_first_parameter);
                 }
-                if (func.kind === 149 || func.kind === 153 || func.kind === 158) {
+                if (func.kind === 150 || func.kind === 154 || func.kind === 159) {
                     error(node, ts.Diagnostics.A_constructor_cannot_have_a_this_parameter);
                 }
             }
@@ -30519,9 +32490,9 @@ var ts;
             if (!node.asteriskToken || !node.body) {
                 return false;
             }
-            return node.kind === 148 ||
-                node.kind === 221 ||
-                node.kind === 180;
+            return node.kind === 149 ||
+                node.kind === 225 ||
+                node.kind === 184;
         }
         function getTypePredicateParameterIndex(parameterList, parameter) {
             if (parameterList) {
@@ -30562,9 +32533,9 @@ var ts;
                 else if (parameterName) {
                     var hasReportedError = false;
                     for (var _i = 0, _a = parent.parameters; _i < _a.length; _i++) {
-                        var name_18 = _a[_i].name;
-                        if (ts.isBindingPattern(name_18) &&
-                            checkIfTypePredicateVariableIsDeclaredInBindingPattern(name_18, parameterName, typePredicate.parameterName)) {
+                        var name_24 = _a[_i].name;
+                        if (ts.isBindingPattern(name_24) &&
+                            checkIfTypePredicateVariableIsDeclaredInBindingPattern(name_24, parameterName, typePredicate.parameterName)) {
                             hasReportedError = true;
                             break;
                         }
@@ -30577,16 +32548,16 @@ var ts;
         }
         function getTypePredicateParent(node) {
             switch (node.parent.kind) {
-                case 181:
-                case 152:
-                case 221:
-                case 180:
-                case 157:
+                case 185:
+                case 153:
+                case 225:
+                case 184:
+                case 158:
+                case 149:
                 case 148:
-                case 147:
-                    var parent_12 = node.parent;
-                    if (node === parent_12.type) {
-                        return parent_12;
+                    var parent_10 = node.parent;
+                    if (node === parent_10.type) {
+                        return parent_10;
                     }
             }
         }
@@ -30596,27 +32567,27 @@ var ts;
                 if (ts.isOmittedExpression(element)) {
                     continue;
                 }
-                var name_19 = element.name;
-                if (name_19.kind === 70 &&
-                    name_19.text === predicateVariableName) {
+                var name_25 = element.name;
+                if (name_25.kind === 70 &&
+                    name_25.text === predicateVariableName) {
                     error(predicateVariableNode, ts.Diagnostics.A_type_predicate_cannot_reference_element_0_in_a_binding_pattern, predicateVariableName);
                     return true;
                 }
-                else if (name_19.kind === 169 ||
-                    name_19.kind === 168) {
-                    if (checkIfTypePredicateVariableIsDeclaredInBindingPattern(name_19, predicateVariableNode, predicateVariableName)) {
+                else if (name_25.kind === 173 ||
+                    name_25.kind === 172) {
+                    if (checkIfTypePredicateVariableIsDeclaredInBindingPattern(name_25, predicateVariableNode, predicateVariableName)) {
                         return true;
                     }
                 }
             }
         }
         function checkSignatureDeclaration(node) {
-            if (node.kind === 154) {
+            if (node.kind === 155) {
                 checkGrammarIndexSignature(node);
             }
-            else if (node.kind === 157 || node.kind === 221 || node.kind === 158 ||
-                node.kind === 152 || node.kind === 149 ||
-                node.kind === 153) {
+            else if (node.kind === 158 || node.kind === 225 || node.kind === 159 ||
+                node.kind === 153 || node.kind === 150 ||
+                node.kind === 154) {
                 checkGrammarFunctionLikeDeclaration(node);
             }
             checkTypeParameters(node.typeParameters);
@@ -30628,10 +32599,10 @@ var ts;
                 checkCollisionWithArgumentsInGeneratedCode(node);
                 if (compilerOptions.noImplicitAny && !node.type) {
                     switch (node.kind) {
-                        case 153:
+                        case 154:
                             error(node, ts.Diagnostics.Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
-                        case 152:
+                        case 153:
                             error(node, ts.Diagnostics.Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
                     }
@@ -30658,17 +32629,11 @@ var ts;
             }
         }
         function checkClassForDuplicateDeclarations(node) {
-            var Accessor;
-            (function (Accessor) {
-                Accessor[Accessor["Getter"] = 1] = "Getter";
-                Accessor[Accessor["Setter"] = 2] = "Setter";
-                Accessor[Accessor["Property"] = 3] = "Property";
-            })(Accessor || (Accessor = {}));
             var instanceNames = ts.createMap();
             var staticNames = ts.createMap();
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                if (member.kind === 149) {
+                if (member.kind === 150) {
                     for (var _b = 0, _c = member.parameters; _b < _c.length; _b++) {
                         var param = _c[_b];
                         if (ts.isParameterPropertyDeclaration(param)) {
@@ -30682,13 +32647,13 @@ var ts;
                     var memberName = member.name && ts.getPropertyNameForPropertyNameNode(member.name);
                     if (memberName) {
                         switch (member.kind) {
-                            case 150:
+                            case 151:
                                 addName(names, member.name, memberName, 1);
                                 break;
-                            case 151:
+                            case 152:
                                 addName(names, member.name, memberName, 2);
                                 break;
-                            case 146:
+                            case 147:
                                 addName(names, member.name, memberName, 3);
                                 break;
                         }
@@ -30714,7 +32679,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 == 145) {
+                if (member.kind == 146) {
                     var memberName = void 0;
                     switch (member.name.kind) {
                         case 9:
@@ -30736,7 +32701,7 @@ var ts;
             }
         }
         function checkTypeForDuplicateIndexSignatures(node) {
-            if (node.kind === 223) {
+            if (node.kind === 227) {
                 var nodeSymbol = getSymbolOfNode(node);
                 if (nodeSymbol.declarations.length > 0 && nodeSymbol.declarations[0] !== node) {
                     return;
@@ -30751,7 +32716,7 @@ var ts;
                     var declaration = decl;
                     if (declaration.parameters.length === 1 && declaration.parameters[0].type) {
                         switch (declaration.parameters[0].type.kind) {
-                            case 133:
+                            case 134:
                                 if (!seenStringIndexer) {
                                     seenStringIndexer = true;
                                 }
@@ -30759,7 +32724,7 @@ var ts;
                                     error(declaration, ts.Diagnostics.Duplicate_string_index_signature);
                                 }
                                 break;
-                            case 131:
+                            case 132:
                                 if (!seenNumericIndexer) {
                                     seenNumericIndexer = true;
                                 }
@@ -30818,12 +32783,12 @@ var ts;
                 if (n.kind === 98) {
                     error(n, ts.Diagnostics.this_cannot_be_referenced_in_current_location);
                 }
-                else if (n.kind !== 180 && n.kind !== 221) {
+                else if (n.kind !== 184 && n.kind !== 225) {
                     ts.forEachChild(n, markThisReferencesAsErrors);
                 }
             }
             function isInstancePropertyWithInitializer(n) {
-                return n.kind === 146 &&
+                return n.kind === 147 &&
                     !(ts.getModifierFlags(n) & 32) &&
                     !!n.initializer;
             }
@@ -30843,7 +32808,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 === 203 && ts.isSuperCall(statement.expression)) {
+                            if (statement.kind === 207 && ts.isSuperCall(statement.expression)) {
                                 superCallStatement = statement;
                                 break;
                             }
@@ -30866,18 +32831,18 @@ var ts;
                 checkGrammarFunctionLikeDeclaration(node) || checkGrammarAccessor(node) || checkGrammarComputedPropertyName(node.name);
                 checkDecorators(node);
                 checkSignatureDeclaration(node);
-                if (node.kind === 150) {
+                if (node.kind === 151) {
                     if (!ts.isInAmbientContext(node) && 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 === 141) {
+                if (node.name.kind === 142) {
                     checkComputedPropertyName(node.name);
                 }
                 if (!ts.hasDynamicName(node)) {
-                    var otherKind = node.kind === 150 ? 151 : 150;
+                    var otherKind = node.kind === 151 ? 152 : 151;
                     var otherAccessor = ts.getDeclarationOfKind(node.symbol, otherKind);
                     if (otherAccessor) {
                         if ((ts.getModifierFlags(node) & 28) !== (ts.getModifierFlags(otherAccessor) & 28)) {
@@ -30891,11 +32856,11 @@ var ts;
                     }
                 }
                 var returnType = getTypeOfAccessors(getSymbolOfNode(node));
-                if (node.kind === 150) {
+                if (node.kind === 151) {
                     checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnType);
                 }
             }
-            if (node.parent.kind !== 172) {
+            if (node.parent.kind !== 176) {
                 checkSourceElement(node.body);
                 registerForUnusedIdentifiersCheck(node);
             }
@@ -30925,7 +32890,7 @@ var ts;
                 var constraint = getConstraintOfTypeParameter(typeParameters[i]);
                 if (constraint) {
                     if (!typeArguments) {
-                        typeArguments = ts.map(typeArgumentNodes, getTypeFromTypeNodeNoAlias);
+                        typeArguments = ts.map(typeArgumentNodes, getTypeFromTypeNode);
                         mapper = createTypeMapper(typeParameters, typeArguments);
                     }
                     var typeArgument = typeArguments[i];
@@ -30976,14 +32941,25 @@ var ts;
         function checkUnionOrIntersectionType(node) {
             ts.forEach(node.types, checkSourceElement);
         }
+        function checkIndexedAccessType(node) {
+            getTypeFromIndexedAccessTypeNode(node);
+        }
+        function checkMappedType(node) {
+            checkSourceElement(node.typeParameter);
+            checkSourceElement(node.type);
+            var type = getTypeFromMappedTypeNode(node);
+            var constraintType = getConstraintTypeFromMappedType(type);
+            var keyType = constraintType.flags & 16384 ? getApparentTypeOfTypeParameter(constraintType) : constraintType;
+            checkTypeAssignableTo(keyType, stringOrNumberType, node.typeParameter.constraint);
+        }
         function isPrivateWithinAmbient(node) {
             return (ts.getModifierFlags(node) & 8) && ts.isInAmbientContext(node);
         }
         function getEffectiveDeclarationFlags(n, flagsToCheck) {
             var flags = ts.getCombinedModifierFlags(n);
-            if (n.parent.kind !== 223 &&
-                n.parent.kind !== 222 &&
-                n.parent.kind !== 193 &&
+            if (n.parent.kind !== 227 &&
+                n.parent.kind !== 226 &&
+                n.parent.kind !== 197 &&
                 ts.isInAmbientContext(n)) {
                 if (!(flags & 2)) {
                     flags |= 1;
@@ -31060,7 +33036,7 @@ var ts;
                     if (subsequentNode.kind === node.kind) {
                         var errorNode_1 = subsequentNode.name || subsequentNode;
                         if (node.name && subsequentNode.name && node.name.text === subsequentNode.name.text) {
-                            var reportError = (node.kind === 148 || node.kind === 147) &&
+                            var reportError = (node.kind === 149 || node.kind === 148) &&
                                 (ts.getModifierFlags(node) & 32) !== (ts.getModifierFlags(subsequentNode) & 32);
                             if (reportError) {
                                 var diagnostic = ts.getModifierFlags(node) & 32 ? ts.Diagnostics.Function_overload_must_be_static : ts.Diagnostics.Function_overload_must_not_be_static;
@@ -31093,11 +33069,11 @@ var ts;
                 var current = declarations_4[_i];
                 var node = current;
                 var inAmbientContext = ts.isInAmbientContext(node);
-                var inAmbientContextOrInterface = node.parent.kind === 223 || node.parent.kind === 160 || inAmbientContext;
+                var inAmbientContextOrInterface = node.parent.kind === 227 || node.parent.kind === 161 || inAmbientContext;
                 if (inAmbientContextOrInterface) {
                     previousDeclaration = undefined;
                 }
-                if (node.kind === 221 || node.kind === 148 || node.kind === 147 || node.kind === 149) {
+                if (node.kind === 225 || node.kind === 149 || node.kind === 148 || node.kind === 150) {
                     var currentNodeFlags = getEffectiveDeclarationFlags(node, flagsToCheck);
                     someNodeFlags |= currentNodeFlags;
                     allNodeFlags &= currentNodeFlags;
@@ -31208,16 +33184,16 @@ var ts;
             }
             function getDeclarationSpaces(d) {
                 switch (d.kind) {
-                    case 223:
+                    case 227:
                         return 2097152;
-                    case 226:
+                    case 230:
                         return ts.isAmbientModule(d) || ts.getModuleInstanceState(d) !== 0
                             ? 4194304 | 1048576
                             : 4194304;
-                    case 222:
-                    case 225:
+                    case 226:
+                    case 229:
                         return 2097152 | 1048576;
-                    case 230:
+                    case 234:
                         var result_2 = 0;
                         var target = resolveAlias(getSymbolOfNode(d));
                         ts.forEach(target.declarations, function (d) { result_2 |= getDeclarationSpaces(d); });
@@ -31244,7 +33220,7 @@ var ts;
             if (isTypeAny(promise)) {
                 return undefined;
             }
-            if (promise.flags & 131072) {
+            if (getObjectFlags(promise) & 4) {
                 if (promise.target === tryGetGlobalPromiseType()
                     || promise.target === getGlobalPromiseLikeType()) {
                     return promise.typeArguments[0];
@@ -31281,7 +33257,7 @@ var ts;
         function checkAwaitedType(type, location, message) {
             return checkAwaitedTypeWorker(type);
             function checkAwaitedTypeWorker(type) {
-                if (type.flags & 524288) {
+                if (type.flags & 65536) {
                     var types = [];
                     for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                         var constituentType = _a[_i];
@@ -31309,51 +33285,50 @@ var ts;
                 }
             }
         }
-        function checkCorrectPromiseType(returnType, location, diagnostic, typeName) {
-            if (returnType === unknownType) {
-                return unknownType;
-            }
-            var globalPromiseType = getGlobalPromiseType();
-            if (globalPromiseType === emptyGenericType
-                || globalPromiseType === getTargetType(returnType)) {
-                return checkAwaitedType(returnType, location, ts.Diagnostics.An_async_function_or_method_must_have_a_valid_awaitable_return_type);
-            }
-            error(location, diagnostic, typeName);
-            return unknownType;
-        }
         function checkAsyncFunctionReturnType(node) {
+            var returnType = getTypeFromTypeNode(node.type);
             if (languageVersion >= 2) {
-                var returnType = getTypeFromTypeNode(node.type);
-                return checkCorrectPromiseType(returnType, node.type, ts.Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type);
+                if (returnType === unknownType) {
+                    return unknownType;
+                }
+                var globalPromiseType = getGlobalPromiseType();
+                if (globalPromiseType !== emptyGenericType && globalPromiseType !== getTargetType(returnType)) {
+                    error(node.type, ts.Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type);
+                    return unknownType;
+                }
             }
-            var globalPromiseConstructorLikeType = getGlobalPromiseConstructorLikeType();
-            if (globalPromiseConstructorLikeType === emptyObjectType) {
-                return unknownType;
+            else {
+                markTypeNodeAsReferenced(node.type);
+                if (returnType === unknownType) {
+                    return unknownType;
+                }
+                var promiseConstructorName = ts.getEntityNameFromTypeNode(node.type);
+                if (promiseConstructorName === undefined) {
+                    error(node.type, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, typeToString(returnType));
+                    return unknownType;
+                }
+                var promiseConstructorSymbol = resolveEntityName(promiseConstructorName, 107455, true);
+                var promiseConstructorType = promiseConstructorSymbol ? getTypeOfSymbol(promiseConstructorSymbol) : unknownType;
+                if (promiseConstructorType === unknownType) {
+                    error(node.type, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, ts.entityNameToString(promiseConstructorName));
+                    return unknownType;
+                }
+                var globalPromiseConstructorLikeType = getGlobalPromiseConstructorLikeType();
+                if (globalPromiseConstructorLikeType === emptyObjectType) {
+                    error(node.type, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, ts.entityNameToString(promiseConstructorName));
+                    return unknownType;
+                }
+                if (!checkTypeAssignableTo(promiseConstructorType, globalPromiseConstructorLikeType, node.type, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value)) {
+                    return unknownType;
+                }
+                var rootName = promiseConstructorName && getFirstIdentifier(promiseConstructorName);
+                var collidingSymbol = getSymbol(node.locals, rootName.text, 107455);
+                if (collidingSymbol) {
+                    error(collidingSymbol.valueDeclaration, ts.Diagnostics.Duplicate_identifier_0_Compiler_uses_declaration_1_to_support_async_functions, rootName.text, ts.entityNameToString(promiseConstructorName));
+                    return unknownType;
+                }
             }
-            var promiseType = getTypeFromTypeNode(node.type);
-            if (promiseType === unknownType && compilerOptions.isolatedModules) {
-                return unknownType;
-            }
-            var promiseConstructor = getNodeLinks(node.type).resolvedSymbol;
-            if (!promiseConstructor || !symbolIsValue(promiseConstructor)) {
-                var typeName = promiseConstructor
-                    ? symbolToString(promiseConstructor)
-                    : typeToString(promiseType);
-                return checkCorrectPromiseType(promiseType, node.type, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type, typeName);
-            }
-            checkReturnTypeAnnotationAsExpression(node);
-            var promiseConstructorType = getTypeOfSymbol(promiseConstructor);
-            if (!checkTypeAssignableTo(promiseConstructorType, globalPromiseConstructorLikeType, node.type, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type)) {
-                return unknownType;
-            }
-            var promiseName = ts.getEntityNameFromTypeNode(node.type);
-            var promiseNameOrNamespaceRoot = getFirstIdentifier(promiseName);
-            var rootSymbol = getSymbol(node.locals, promiseNameOrNamespaceRoot.text, 107455);
-            if (rootSymbol) {
-                error(rootSymbol.valueDeclaration, ts.Diagnostics.Duplicate_identifier_0_Compiler_uses_declaration_1_to_support_async_functions, promiseNameOrNamespaceRoot.text, getFullyQualifiedName(promiseConstructor));
-                return unknownType;
-            }
-            return checkAwaitedType(promiseType, node, ts.Diagnostics.An_async_function_or_method_must_have_a_valid_awaitable_return_type);
+            return checkAwaitedType(returnType, node, ts.Diagnostics.An_async_function_or_method_must_have_a_valid_awaitable_return_type);
         }
         function checkDecorator(node) {
             var signature = getResolvedSignature(node);
@@ -31365,22 +33340,22 @@ var ts;
             var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
             var errorInfo;
             switch (node.parent.kind) {
-                case 222:
+                case 226:
                     var classSymbol = getSymbolOfNode(node.parent);
                     var classConstructorType = getTypeOfSymbol(classSymbol);
                     expectedReturnType = getUnionType([classConstructorType, voidType]);
                     break;
-                case 143:
+                case 144:
                     expectedReturnType = voidType;
                     errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any);
                     break;
-                case 146:
+                case 147:
                     expectedReturnType = voidType;
                     errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.The_return_type_of_a_property_decorator_function_must_be_either_void_or_any);
                     break;
-                case 148:
-                case 150:
+                case 149:
                 case 151:
+                case 152:
                     var methodType = getTypeOfNode(node.parent);
                     var descriptorType = createTypedPropertyDescriptorType(methodType);
                     expectedReturnType = getUnionType([descriptorType, voidType]);
@@ -31388,29 +33363,15 @@ var ts;
             }
             checkTypeAssignableTo(returnType, expectedReturnType, node, headMessage, errorInfo);
         }
-        function checkTypeNodeAsExpression(node) {
-            if (node && node.kind === 156) {
-                var root = getFirstIdentifier(node.typeName);
-                var meaning = root.parent.kind === 156 ? 793064 : 1920;
-                var rootSymbol = resolveName(root, root.text, meaning | 8388608, undefined, undefined);
-                if (rootSymbol && rootSymbol.flags & 8388608) {
-                    var aliasTarget = resolveAlias(rootSymbol);
-                    if (aliasTarget.flags & 107455 && !isConstEnumOrConstEnumOnlyModule(resolveAlias(rootSymbol))) {
-                        markAliasSymbolAsReferenced(rootSymbol);
-                    }
-                }
-            }
-        }
-        function checkTypeAnnotationAsExpression(node) {
-            checkTypeNodeAsExpression(node.type);
-        }
-        function checkReturnTypeAnnotationAsExpression(node) {
-            checkTypeNodeAsExpression(node.type);
-        }
-        function checkParameterTypeAnnotationsAsExpressions(node) {
-            for (var _i = 0, _a = node.parameters; _i < _a.length; _i++) {
-                var parameter = _a[_i];
-                checkTypeAnnotationAsExpression(parameter);
+        function markTypeNodeAsReferenced(node) {
+            var typeName = node && ts.getEntityNameFromTypeNode(node);
+            var rootName = typeName && getFirstIdentifier(typeName);
+            var rootSymbol = rootName && resolveName(rootName, rootName.text, (typeName.kind === 70 ? 793064 : 1920) | 8388608, undefined, undefined);
+            if (rootSymbol
+                && rootSymbol.flags & 8388608
+                && symbolIsValue(rootSymbol)
+                && !isConstEnumOrConstEnumOnlyModule(resolveAlias(rootSymbol))) {
+                markAliasSymbolAsReferenced(rootSymbol);
             }
         }
         function checkDecorators(node) {
@@ -31425,21 +33386,27 @@ var ts;
             }
             if (compilerOptions.emitDecoratorMetadata) {
                 switch (node.kind) {
-                    case 222:
+                    case 226:
                         var constructor = ts.getFirstConstructorWithBody(node);
                         if (constructor) {
-                            checkParameterTypeAnnotationsAsExpressions(constructor);
+                            for (var _i = 0, _a = constructor.parameters; _i < _a.length; _i++) {
+                                var parameter = _a[_i];
+                                markTypeNodeAsReferenced(parameter.type);
+                            }
                         }
                         break;
-                    case 148:
-                    case 150:
+                    case 149:
                     case 151:
-                        checkParameterTypeAnnotationsAsExpressions(node);
-                        checkReturnTypeAnnotationAsExpression(node);
+                    case 152:
+                        for (var _b = 0, _c = node.parameters; _b < _c.length; _b++) {
+                            var parameter = _c[_b];
+                            markTypeNodeAsReferenced(parameter.type);
+                        }
+                        markTypeNodeAsReferenced(node.type);
                         break;
-                    case 146:
-                    case 143:
-                        checkTypeAnnotationAsExpression(node);
+                    case 147:
+                    case 144:
+                        markTypeNodeAsReferenced(node.type);
                         break;
                 }
             }
@@ -31458,7 +33425,7 @@ var ts;
             checkDecorators(node);
             checkSignatureDeclaration(node);
             var isAsync = ts.isAsyncFunctionLike(node);
-            if (node.name && node.name.kind === 141) {
+            if (node.name && node.name.kind === 142) {
                 checkComputedPropertyName(node.name);
             }
             if (!ts.hasDynamicName(node)) {
@@ -31500,43 +33467,43 @@ var ts;
                 for (var _i = 0, deferredUnusedIdentifierNodes_1 = deferredUnusedIdentifierNodes; _i < deferredUnusedIdentifierNodes_1.length; _i++) {
                     var node = deferredUnusedIdentifierNodes_1[_i];
                     switch (node.kind) {
-                        case 256:
-                        case 226:
+                        case 261:
+                        case 230:
                             checkUnusedModuleMembers(node);
                             break;
-                        case 222:
-                        case 193:
+                        case 226:
+                        case 197:
                             checkUnusedClassMembers(node);
                             checkUnusedTypeParameters(node);
                             break;
-                        case 223:
+                        case 227:
                             checkUnusedTypeParameters(node);
                             break;
-                        case 200:
-                        case 228:
-                        case 207:
-                        case 208:
-                        case 209:
+                        case 204:
+                        case 232:
+                        case 211:
+                        case 212:
+                        case 213:
                             checkUnusedLocalsAndParameters(node);
                             break;
-                        case 149:
-                        case 180:
-                        case 221:
-                        case 181:
-                        case 148:
                         case 150:
+                        case 184:
+                        case 225:
+                        case 185:
+                        case 149:
                         case 151:
+                        case 152:
                             if (node.body) {
                                 checkUnusedLocalsAndParameters(node);
                             }
                             checkUnusedTypeParameters(node);
                             break;
-                        case 147:
-                        case 152:
+                        case 148:
                         case 153:
                         case 154:
-                        case 157:
+                        case 155:
                         case 158:
+                        case 159:
                             checkUnusedTypeParameters(node);
                             break;
                     }
@@ -31545,43 +33512,57 @@ var ts;
             }
         }
         function checkUnusedLocalsAndParameters(node) {
-            if (node.parent.kind !== 223 && noUnusedIdentifiers && !ts.isInAmbientContext(node)) {
-                var _loop_1 = function (key) {
+            if (node.parent.kind !== 227 && noUnusedIdentifiers && !ts.isInAmbientContext(node)) {
+                var _loop_3 = function (key) {
                     var local = node.locals[key];
                     if (!local.isReferenced) {
-                        if (local.valueDeclaration && local.valueDeclaration.kind === 143) {
-                            var parameter = local.valueDeclaration;
+                        if (local.valueDeclaration && ts.getRootDeclaration(local.valueDeclaration).kind === 144) {
+                            var parameter = ts.getRootDeclaration(local.valueDeclaration);
                             if (compilerOptions.noUnusedParameters &&
                                 !ts.isParameterPropertyDeclaration(parameter) &&
                                 !ts.parameterIsThisKeyword(parameter) &&
-                                !parameterNameStartsWithUnderscore(parameter)) {
+                                !parameterNameStartsWithUnderscore(local.valueDeclaration.name)) {
                                 error(local.valueDeclaration.name, ts.Diagnostics._0_is_declared_but_never_used, local.name);
                             }
                         }
                         else if (compilerOptions.noUnusedLocals) {
-                            ts.forEach(local.declarations, function (d) { return error(d.name || d, ts.Diagnostics._0_is_declared_but_never_used, local.name); });
+                            ts.forEach(local.declarations, function (d) { return errorUnusedLocal(d.name || d, local.name); });
                         }
                     }
                 };
                 for (var key in node.locals) {
-                    _loop_1(key);
+                    _loop_3(key);
                 }
             }
         }
-        function parameterNameStartsWithUnderscore(parameter) {
-            return parameter.name && parameter.name.kind === 70 && parameter.name.text.charCodeAt(0) === 95;
+        function errorUnusedLocal(node, name) {
+            if (isIdentifierThatStartsWithUnderScore(node)) {
+                var declaration = ts.getRootDeclaration(node.parent);
+                if (declaration.kind === 223 &&
+                    (declaration.parent.parent.kind === 212 ||
+                        declaration.parent.parent.kind === 213)) {
+                    return;
+                }
+            }
+            error(node, ts.Diagnostics._0_is_declared_but_never_used, name);
+        }
+        function parameterNameStartsWithUnderscore(parameterName) {
+            return parameterName && isIdentifierThatStartsWithUnderScore(parameterName);
+        }
+        function isIdentifierThatStartsWithUnderScore(node) {
+            return node.kind === 70 && node.text.charCodeAt(0) === 95;
         }
         function checkUnusedClassMembers(node) {
             if (compilerOptions.noUnusedLocals && !ts.isInAmbientContext(node)) {
                 if (node.members) {
                     for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                         var member = _a[_i];
-                        if (member.kind === 148 || member.kind === 146) {
+                        if (member.kind === 149 || member.kind === 147) {
                             if (!member.symbol.isReferenced && ts.getModifierFlags(member) & 8) {
                                 error(member.name, ts.Diagnostics._0_is_declared_but_never_used, member.symbol.name);
                             }
                         }
-                        else if (member.kind === 149) {
+                        else if (member.kind === 150) {
                             for (var _b = 0, _c = member.parameters; _b < _c.length; _b++) {
                                 var parameter = _c[_b];
                                 if (!parameter.symbol.isReferenced && ts.getModifierFlags(parameter) & 8) {
@@ -31626,7 +33607,7 @@ var ts;
             }
         }
         function checkBlock(node) {
-            if (node.kind === 200) {
+            if (node.kind === 204) {
                 checkGrammarStatementInAmbientContext(node);
             }
             ts.forEach(node.statements, checkSourceElement);
@@ -31648,19 +33629,19 @@ var ts;
             if (!(identifier && identifier.text === name)) {
                 return false;
             }
-            if (node.kind === 146 ||
-                node.kind === 145 ||
+            if (node.kind === 147 ||
+                node.kind === 146 ||
+                node.kind === 149 ||
                 node.kind === 148 ||
-                node.kind === 147 ||
-                node.kind === 150 ||
-                node.kind === 151) {
+                node.kind === 151 ||
+                node.kind === 152) {
                 return false;
             }
             if (ts.isInAmbientContext(node)) {
                 return false;
             }
             var root = ts.getRootDeclaration(node);
-            if (root.kind === 143 && ts.nodeIsMissing(root.parent.body)) {
+            if (root.kind === 144 && ts.nodeIsMissing(root.parent.body)) {
                 return false;
             }
             return true;
@@ -31711,11 +33692,11 @@ var ts;
             if (!needCollisionCheckForIdentifier(node, name, "require") && !needCollisionCheckForIdentifier(node, name, "exports")) {
                 return;
             }
-            if (node.kind === 226 && ts.getModuleInstanceState(node) !== 1) {
+            if (node.kind === 230 && ts.getModuleInstanceState(node) !== 1) {
                 return;
             }
             var parent = getDeclarationContainer(node);
-            if (parent.kind === 256 && ts.isExternalOrCommonJsModule(parent)) {
+            if (parent.kind === 261 && 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));
             }
         }
@@ -31723,11 +33704,11 @@ var ts;
             if (!needCollisionCheckForIdentifier(node, name, "Promise")) {
                 return;
             }
-            if (node.kind === 226 && ts.getModuleInstanceState(node) !== 1) {
+            if (node.kind === 230 && ts.getModuleInstanceState(node) !== 1) {
                 return;
             }
             var parent = getDeclarationContainer(node);
-            if (parent.kind === 256 && ts.isExternalOrCommonJsModule(parent) && parent.flags & 8192) {
+            if (parent.kind === 261 && ts.isExternalOrCommonJsModule(parent) && parent.flags & 8192) {
                 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));
             }
         }
@@ -31735,7 +33716,7 @@ var ts;
             if ((ts.getCombinedNodeFlags(node) & 3) !== 0 || ts.isParameterDeclaration(node)) {
                 return;
             }
-            if (node.kind === 219 && !node.initializer) {
+            if (node.kind === 223 && !node.initializer) {
                 return;
             }
             var symbol = getSymbolOfNode(node);
@@ -31745,25 +33726,25 @@ var ts;
                     localDeclarationSymbol !== symbol &&
                     localDeclarationSymbol.flags & 2) {
                     if (getDeclarationNodeFlagsFromSymbol(localDeclarationSymbol) & 3) {
-                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 220);
-                        var container = varDeclList.parent.kind === 201 && varDeclList.parent.parent
+                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 224);
+                        var container = varDeclList.parent.kind === 205 && varDeclList.parent.parent
                             ? varDeclList.parent.parent
                             : undefined;
                         var namesShareScope = container &&
-                            (container.kind === 200 && ts.isFunctionLike(container.parent) ||
-                                container.kind === 227 ||
-                                container.kind === 226 ||
-                                container.kind === 256);
+                            (container.kind === 204 && ts.isFunctionLike(container.parent) ||
+                                container.kind === 231 ||
+                                container.kind === 230 ||
+                                container.kind === 261);
                         if (!namesShareScope) {
-                            var name_20 = symbolToString(localDeclarationSymbol);
-                            error(node, ts.Diagnostics.Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1, name_20, name_20);
+                            var name_26 = symbolToString(localDeclarationSymbol);
+                            error(node, ts.Diagnostics.Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1, name_26, name_26);
                         }
                     }
                 }
             }
         }
         function checkParameterInitializer(node) {
-            if (ts.getRootDeclaration(node).kind !== 143) {
+            if (ts.getRootDeclaration(node).kind !== 144) {
                 return;
             }
             var func = ts.getContainingFunction(node);
@@ -31772,7 +33753,7 @@ var ts;
                 if (ts.isTypeNode(n) || ts.isDeclarationName(n)) {
                     return;
                 }
-                if (n.kind === 173) {
+                if (n.kind === 177) {
                     return visit(n.expression);
                 }
                 else if (n.kind === 70) {
@@ -31786,7 +33767,7 @@ var ts;
                     }
                     var enclosingContainer = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
                     if (enclosingContainer === func) {
-                        if (symbol.valueDeclaration.kind === 143) {
+                        if (symbol.valueDeclaration.kind === 144) {
                             if (symbol.valueDeclaration.pos < node.pos) {
                                 return;
                             }
@@ -31795,7 +33776,7 @@ var ts;
                                 if (ts.isFunctionLike(current.parent)) {
                                     return;
                                 }
-                                if (current.parent.kind === 146 &&
+                                if (current.parent.kind === 147 &&
                                     !(ts.hasModifier(current.parent, 32)) &&
                                     ts.isClassLike(current.parent.parent)) {
                                     return;
@@ -31817,33 +33798,34 @@ var ts;
         function checkVariableLikeDeclaration(node) {
             checkDecorators(node);
             checkSourceElement(node.type);
-            if (node.name.kind === 141) {
+            if (node.name.kind === 142) {
                 checkComputedPropertyName(node.name);
                 if (node.initializer) {
                     checkExpressionCached(node.initializer);
                 }
             }
-            if (node.kind === 170) {
-                if (node.propertyName && node.propertyName.kind === 141) {
+            if (node.kind === 174) {
+                if (node.propertyName && node.propertyName.kind === 142) {
                     checkComputedPropertyName(node.propertyName);
                 }
-                var parent_13 = node.parent.parent;
-                var parentType = getTypeForBindingElementParent(parent_13);
-                var name_21 = node.propertyName || node.name;
-                var property = getPropertyOfType(parentType, getTextOfPropertyName(name_21));
-                if (parent_13.initializer && property && getParentOfSymbol(property)) {
-                    checkClassPropertyAccess(parent_13, parent_13.initializer, parentType, property);
+                var parent_11 = node.parent.parent;
+                var parentType = getTypeForBindingElementParent(parent_11);
+                var name_27 = node.propertyName || node.name;
+                var property = getPropertyOfType(parentType, ts.getTextOfPropertyName(name_27));
+                markPropertyAsReferenced(property);
+                if (parent_11.initializer && property && getParentOfSymbol(property)) {
+                    checkClassPropertyAccess(parent_11, parent_11.initializer, parentType, property);
                 }
             }
             if (ts.isBindingPattern(node.name)) {
                 ts.forEach(node.name.elements, checkSourceElement);
             }
-            if (node.initializer && ts.getRootDeclaration(node).kind === 143 && ts.nodeIsMissing(ts.getContainingFunction(node).body)) {
+            if (node.initializer && ts.getRootDeclaration(node).kind === 144 && 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 !== 208) {
+                if (node.initializer && node.parent.parent.kind !== 212) {
                     checkTypeAssignableTo(checkExpressionCached(node.initializer), getWidenedTypeForVariableLikeDeclaration(node), node, undefined);
                     checkParameterInitializer(node);
                 }
@@ -31852,7 +33834,7 @@ var ts;
             var symbol = getSymbolOfNode(node);
             var type = convertAutoToAny(getTypeOfVariableOrParameterOrProperty(symbol));
             if (node === symbol.valueDeclaration) {
-                if (node.initializer && node.parent.parent.kind !== 208) {
+                if (node.initializer && node.parent.parent.kind !== 212) {
                     checkTypeAssignableTo(checkExpressionCached(node.initializer), type, node, undefined);
                     checkParameterInitializer(node);
                 }
@@ -31870,9 +33852,9 @@ var ts;
                     error(node.name, ts.Diagnostics.All_declarations_of_0_must_have_identical_modifiers, ts.declarationNameToString(node.name));
                 }
             }
-            if (node.kind !== 146 && node.kind !== 145) {
+            if (node.kind !== 147 && node.kind !== 146) {
                 checkExportsOnMergedDeclarations(node);
-                if (node.kind === 219 || node.kind === 170) {
+                if (node.kind === 223 || node.kind === 174) {
                     checkVarDeclaredNamesNotShadowed(node);
                 }
                 checkCollisionWithCapturedSuperVariable(node, node.name);
@@ -31882,8 +33864,8 @@ var ts;
             }
         }
         function areDeclarationFlagsIdentical(left, right) {
-            if ((left.kind === 143 && right.kind === 219) ||
-                (left.kind === 219 && right.kind === 143)) {
+            if ((left.kind === 144 && right.kind === 223) ||
+                (left.kind === 223 && right.kind === 144)) {
                 return true;
             }
             if (ts.hasQuestionToken(left) !== ts.hasQuestionToken(right)) {
@@ -31910,7 +33892,7 @@ var ts;
             ts.forEach(node.declarationList.declarations, checkSourceElement);
         }
         function checkGrammarDisallowedModifiersOnObjectLiteralExpressionMethod(node) {
-            if (node.modifiers && node.parent.kind === 172) {
+            if (node.modifiers && node.parent.kind === 176) {
                 if (ts.isAsyncFunctionLike(node)) {
                     if (node.modifiers.length > 1) {
                         return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
@@ -31929,7 +33911,7 @@ var ts;
             checkGrammarStatementInAmbientContext(node);
             checkExpression(node.expression);
             checkSourceElement(node.thenStatement);
-            if (node.thenStatement.kind === 202) {
+            if (node.thenStatement.kind === 206) {
                 error(node.thenStatement, ts.Diagnostics.The_body_of_an_if_statement_cannot_be_the_empty_statement);
             }
             checkSourceElement(node.elseStatement);
@@ -31946,12 +33928,12 @@ var ts;
         }
         function checkForStatement(node) {
             if (!checkGrammarStatementInAmbientContext(node)) {
-                if (node.initializer && node.initializer.kind === 220) {
+                if (node.initializer && node.initializer.kind === 224) {
                     checkGrammarVariableDeclarationList(node.initializer);
                 }
             }
             if (node.initializer) {
-                if (node.initializer.kind === 220) {
+                if (node.initializer.kind === 224) {
                     ts.forEach(node.initializer.declarations, checkVariableDeclaration);
                 }
                 else {
@@ -31969,18 +33951,18 @@ var ts;
         }
         function checkForOfStatement(node) {
             checkGrammarForInOrForOfStatement(node);
-            if (node.initializer.kind === 220) {
+            if (node.initializer.kind === 224) {
                 checkForInOrForOfVariableDeclaration(node);
             }
             else {
                 var varExpr = node.initializer;
                 var iteratedType = checkRightHandSideOfForOf(node.expression);
-                if (varExpr.kind === 171 || varExpr.kind === 172) {
+                if (varExpr.kind === 175 || varExpr.kind === 176) {
                     checkDestructuringAssignment(varExpr, iteratedType || unknownType);
                 }
                 else {
                     var leftType = checkExpression(varExpr);
-                    checkReferenceExpression(varExpr, ts.Diagnostics.Invalid_left_hand_side_in_for_of_statement, ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_be_a_constant_or_a_read_only_property);
+                    checkReferenceExpression(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_must_be_a_variable_or_a_property_access);
                     if (iteratedType) {
                         checkTypeAssignableTo(iteratedType, leftType, varExpr, undefined);
                     }
@@ -31993,7 +33975,7 @@ var ts;
         }
         function checkForInStatement(node) {
             checkGrammarForInOrForOfStatement(node);
-            if (node.initializer.kind === 220) {
+            if (node.initializer.kind === 224) {
                 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);
@@ -32003,18 +33985,18 @@ var ts;
             else {
                 var varExpr = node.initializer;
                 var leftType = checkExpression(varExpr);
-                if (varExpr.kind === 171 || varExpr.kind === 172) {
+                if (varExpr.kind === 175 || varExpr.kind === 176) {
                     error(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
                 }
                 else if (!isTypeAnyOrAllConstituentTypesHaveKind(leftType, 34)) {
                     error(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any);
                 }
                 else {
-                    checkReferenceExpression(varExpr, ts.Diagnostics.Invalid_left_hand_side_in_for_in_statement, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_constant_or_a_read_only_property);
+                    checkReferenceExpression(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_must_be_a_variable_or_a_property_access);
                 }
             }
             var rightType = checkNonNullExpression(node.expression);
-            if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, 2588672 | 16384)) {
+            if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, 32768 | 16384)) {
                 error(node.expression, ts.Diagnostics.The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter);
             }
             checkSourceElement(node.statement);
@@ -32067,7 +34049,7 @@ var ts;
             }
             var typeAsIterable = type;
             if (!typeAsIterable.iterableElementType) {
-                if ((type.flags & 131072) && type.target === getGlobalIterableType()) {
+                if ((getObjectFlags(type) & 4) && type.target === getGlobalIterableType()) {
                     typeAsIterable.iterableElementType = type.typeArguments[0];
                 }
                 else {
@@ -32093,7 +34075,7 @@ var ts;
             }
             var typeAsIterator = type;
             if (!typeAsIterator.iteratorElementType) {
-                if ((type.flags & 131072) && type.target === getGlobalIteratorType()) {
+                if ((getObjectFlags(type) & 4) && type.target === getGlobalIteratorType()) {
                     typeAsIterator.iteratorElementType = type.typeArguments[0];
                 }
                 else {
@@ -32128,7 +34110,7 @@ var ts;
             if (isTypeAny(type)) {
                 return undefined;
             }
-            if ((type.flags & 131072) && type.target === getGlobalIterableIteratorType()) {
+            if ((getObjectFlags(type) & 4) && type.target === getGlobalIterableIteratorType()) {
                 return type.typeArguments[0];
             }
             return getElementTypeOfIterable(type, undefined) ||
@@ -32137,8 +34119,12 @@ var ts;
         function checkElementTypeOfArrayOrString(arrayOrStringType, errorNode) {
             ts.Debug.assert(languageVersion < 2);
             var arrayType = arrayOrStringType;
-            if (arrayOrStringType.flags & 524288) {
-                arrayType = getUnionType(ts.filter(arrayOrStringType.types, function (t) { return !(t.flags & 34); }), true);
+            if (arrayOrStringType.flags & 65536) {
+                var arrayTypes = arrayOrStringType.types;
+                var filteredTypes = ts.filter(arrayTypes, function (t) { return !(t.flags & 34); });
+                if (filteredTypes !== arrayTypes) {
+                    arrayType = getUnionType(filteredTypes, true);
+                }
             }
             else if (arrayOrStringType.flags & 34) {
                 arrayType = neverType;
@@ -32176,7 +34162,7 @@ var ts;
             checkGrammarStatementInAmbientContext(node) || checkGrammarBreakOrContinueStatement(node);
         }
         function isGetAccessorWithAnnotatedSetAccessor(node) {
-            return !!(node.kind === 150 && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(node.symbol, 151)));
+            return !!(node.kind === 151 && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(node.symbol, 152)));
         }
         function isUnwrappedReturnTypeVoidOrAny(func, returnType) {
             var unwrappedReturnType = ts.isAsyncFunctionLike(func) ? getPromisedType(returnType) : returnType;
@@ -32198,12 +34184,12 @@ var ts;
                     if (func.asteriskToken) {
                         return;
                     }
-                    if (func.kind === 151) {
+                    if (func.kind === 152) {
                         if (node.expression) {
                             error(node.expression, ts.Diagnostics.Setters_cannot_return_a_value);
                         }
                     }
-                    else if (func.kind === 149) {
+                    else if (func.kind === 150) {
                         if (node.expression && !checkTypeAssignableTo(exprType, returnType, node.expression)) {
                             error(node.expression, ts.Diagnostics.Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class);
                         }
@@ -32221,14 +34207,14 @@ var ts;
                         }
                     }
                 }
-                else if (func.kind !== 149 && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(func, returnType)) {
+                else if (func.kind !== 150 && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(func, returnType)) {
                     error(node, ts.Diagnostics.Not_all_code_paths_return_a_value);
                 }
             }
         }
         function checkWithStatement(node) {
             if (!checkGrammarStatementInAmbientContext(node)) {
-                if (node.flags & 262144) {
+                if (node.flags & 524288) {
                     grammarErrorOnFirstToken(node, ts.Diagnostics.with_statements_are_not_allowed_in_an_async_function_block);
                 }
             }
@@ -32245,8 +34231,9 @@ var ts;
             var firstDefaultClause;
             var hasDuplicateDefaultClause = false;
             var expressionType = checkExpression(node.expression);
+            var expressionIsLiteral = isLiteralType(expressionType);
             ts.forEach(node.caseBlock.clauses, function (clause) {
-                if (clause.kind === 250 && !hasDuplicateDefaultClause) {
+                if (clause.kind === 254 && !hasDuplicateDefaultClause) {
                     if (firstDefaultClause === undefined) {
                         firstDefaultClause = clause;
                     }
@@ -32258,11 +34245,17 @@ var ts;
                         hasDuplicateDefaultClause = true;
                     }
                 }
-                if (produceDiagnostics && clause.kind === 249) {
+                if (produceDiagnostics && clause.kind === 253) {
                     var caseClause = clause;
                     var caseType = checkExpression(caseClause.expression);
-                    if (!isTypeEqualityComparableTo(expressionType, caseType)) {
-                        checkTypeComparableTo(caseType, expressionType, caseClause.expression, undefined);
+                    var caseIsLiteral = isLiteralType(caseType);
+                    var comparedExpressionType = expressionType;
+                    if (!caseIsLiteral || !expressionIsLiteral) {
+                        caseType = caseIsLiteral ? getBaseTypeOfLiteralType(caseType) : caseType;
+                        comparedExpressionType = getBaseTypeOfLiteralType(expressionType);
+                    }
+                    if (!isTypeEqualityComparableTo(comparedExpressionType, caseType)) {
+                        checkTypeComparableTo(caseType, comparedExpressionType, caseClause.expression, undefined);
                     }
                 }
                 ts.forEach(clause.statements, checkSourceElement);
@@ -32278,7 +34271,7 @@ var ts;
                     if (ts.isFunctionLike(current)) {
                         break;
                     }
-                    if (current.kind === 215 && current.label.text === node.label.text) {
+                    if (current.kind === 219 && current.label.text === node.label.text) {
                         var sourceFile = ts.getSourceFileOfNode(node);
                         grammarErrorOnNode(node.label, ts.Diagnostics.Duplicate_label_0, ts.getTextOfNodeFromSourceText(sourceFile.text, node.label));
                         break;
@@ -32304,22 +34297,20 @@ var ts;
             var catchClause = node.catchClause;
             if (catchClause) {
                 if (catchClause.variableDeclaration) {
-                    if (catchClause.variableDeclaration.name.kind !== 70) {
-                        grammarErrorOnFirstToken(catchClause.variableDeclaration.name, ts.Diagnostics.Catch_clause_variable_name_must_be_an_identifier);
-                    }
-                    else if (catchClause.variableDeclaration.type) {
+                    if (catchClause.variableDeclaration.type) {
                         grammarErrorOnFirstToken(catchClause.variableDeclaration.type, ts.Diagnostics.Catch_clause_variable_cannot_have_a_type_annotation);
                     }
                     else if (catchClause.variableDeclaration.initializer) {
                         grammarErrorOnFirstToken(catchClause.variableDeclaration.initializer, ts.Diagnostics.Catch_clause_variable_cannot_have_an_initializer);
                     }
                     else {
-                        var identifierName = catchClause.variableDeclaration.name.text;
-                        var locals = catchClause.block.locals;
-                        if (locals) {
-                            var localSymbol = locals[identifierName];
-                            if (localSymbol && (localSymbol.flags & 2) !== 0) {
-                                grammarErrorOnNode(localSymbol.valueDeclaration, ts.Diagnostics.Cannot_redeclare_identifier_0_in_catch_clause, identifierName);
+                        var blockLocals = catchClause.block.locals;
+                        if (blockLocals) {
+                            for (var caughtName in catchClause.locals) {
+                                var blockLocal = blockLocals[caughtName];
+                                if (blockLocal && (blockLocal.flags & 2) !== 0) {
+                                    grammarErrorOnNode(blockLocal.valueDeclaration, ts.Diagnostics.Cannot_redeclare_identifier_0_in_catch_clause, caughtName);
+                                }
                             }
                         }
                     }
@@ -32341,7 +34332,7 @@ var ts;
                     checkIndexConstraintForProperty(prop, propType, type, declaredStringIndexer, stringIndexType, 0);
                     checkIndexConstraintForProperty(prop, propType, type, declaredNumberIndexer, numberIndexType, 1);
                 });
-                if (type.flags & 32768 && ts.isClassLike(type.symbol.valueDeclaration)) {
+                if (getObjectFlags(type) & 1 && ts.isClassLike(type.symbol.valueDeclaration)) {
                     var classDeclaration = type.symbol.valueDeclaration;
                     for (var _i = 0, _a = classDeclaration.members; _i < _a.length; _i++) {
                         var member = _a[_i];
@@ -32356,7 +34347,7 @@ var ts;
             var errorNode;
             if (stringIndexType && numberIndexType) {
                 errorNode = declaredNumberIndexer || declaredStringIndexer;
-                if (!errorNode && (type.flags & 65536)) {
+                if (!errorNode && (getObjectFlags(type) & 2)) {
                     var someBaseTypeHasBothIndexers = ts.forEach(getBaseTypes(type), function (base) { return getIndexTypeOfType(base, 0) && getIndexTypeOfType(base, 1); });
                     errorNode = someBaseTypeHasBothIndexers ? undefined : type.symbol.declarations[0];
                 }
@@ -32372,13 +34363,13 @@ var ts;
                     return;
                 }
                 var errorNode;
-                if (prop.valueDeclaration.name.kind === 141 || prop.parent === containingType.symbol) {
+                if (prop.valueDeclaration.name.kind === 142 || prop.parent === containingType.symbol) {
                     errorNode = prop.valueDeclaration;
                 }
                 else if (indexDeclaration) {
                     errorNode = indexDeclaration;
                 }
-                else if (containingType.flags & 65536) {
+                else if (getObjectFlags(containingType) & 2) {
                     var someBaseClassHasBothPropertyAndIndexer = ts.forEach(getBaseTypes(containingType), function (base) { return getPropertyOfObjectType(base, prop.name) && getIndexTypeOfType(base, indexKind); });
                     errorNode = someBaseClassHasBothPropertyAndIndexer ? undefined : containingType.symbol.declarations[0];
                 }
@@ -32423,7 +34414,7 @@ var ts;
             var firstDecl;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 222 || declaration.kind === 223) {
+                if (declaration.kind === 226 || declaration.kind === 227) {
                     if (!firstDecl) {
                         firstDecl = declaration;
                     }
@@ -32486,7 +34477,9 @@ var ts;
                     }
                     checkTypeAssignableTo(typeWithThis, getTypeWithThisArgument(baseType_1, type.thisType), node.name || node, ts.Diagnostics.Class_0_incorrectly_extends_base_class_1);
                     checkTypeAssignableTo(staticType, getTypeWithoutSignatures(staticBaseType), node.name || node, ts.Diagnostics.Class_static_side_0_incorrectly_extends_base_class_static_side_1);
-                    if (baseType_1.symbol.valueDeclaration && !ts.isInAmbientContext(baseType_1.symbol.valueDeclaration)) {
+                    if (baseType_1.symbol.valueDeclaration &&
+                        !ts.isInAmbientContext(baseType_1.symbol.valueDeclaration) &&
+                        baseType_1.symbol.valueDeclaration.kind === 226) {
                         if (!isBlockScopedNameDeclaredBeforeUse(baseType_1.symbol.valueDeclaration, node)) {
                             error(baseTypeNode, ts.Diagnostics.A_class_must_be_declared_after_its_base_class);
                         }
@@ -32511,8 +34504,8 @@ var ts;
                     if (produceDiagnostics) {
                         var t = getTypeFromTypeNode(typeRefNode);
                         if (t !== unknownType) {
-                            var declaredType = (t.flags & 131072) ? t.target : t;
-                            if (declaredType.flags & (32768 | 65536)) {
+                            var declaredType = getObjectFlags(t) & 4 ? t.target : t;
+                            if (getObjectFlags(declaredType) & 3) {
                                 checkTypeAssignableTo(typeWithThis, getTypeWithThisArgument(t, type.thisType), node.name || node, ts.Diagnostics.Class_0_incorrectly_implements_interface_1);
                             }
                             else {
@@ -32534,7 +34527,7 @@ var ts;
                 if (declaration && ts.getModifierFlags(declaration) & 8) {
                     var typeClassDeclaration = getClassLikeDeclarationOfSymbol(type.symbol);
                     if (!isNodeWithinClass(node, typeClassDeclaration)) {
-                        error(node, ts.Diagnostics.Cannot_extend_a_class_0_Class_constructor_is_marked_as_private, node.expression.text);
+                        error(node, ts.Diagnostics.Cannot_extend_a_class_0_Class_constructor_is_marked_as_private, getFullyQualifiedName(type.symbol));
                     }
                 }
             }
@@ -32560,7 +34553,7 @@ var ts;
                     if (derived === base) {
                         var derivedClassDecl = getClassLikeDeclarationOfSymbol(type.symbol);
                         if (baseDeclarationFlags & 128 && (!derivedClassDecl || !(ts.getModifierFlags(derivedClassDecl) & 128))) {
-                            if (derivedClassDecl.kind === 193) {
+                            if (derivedClassDecl.kind === 197) {
                                 error(derivedClassDecl, ts.Diagnostics.Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1, symbolToString(baseProperty), typeToString(baseType));
                             }
                             else {
@@ -32604,7 +34597,7 @@ var ts;
             }
         }
         function isAccessor(kind) {
-            return kind === 150 || kind === 151;
+            return kind === 151 || kind === 152;
         }
         function areTypeParametersIdentical(list1, list2) {
             if (!list1 && !list2) {
@@ -32642,8 +34635,8 @@ var ts;
             for (var _i = 0, baseTypes_2 = baseTypes; _i < baseTypes_2.length; _i++) {
                 var base = baseTypes_2[_i];
                 var properties = getPropertiesOfObjectType(getTypeWithThisArgument(base, type.thisType));
-                for (var _a = 0, properties_5 = properties; _a < properties_5.length; _a++) {
-                    var prop = properties_5[_a];
+                for (var _a = 0, properties_6 = properties; _a < properties_6.length; _a++) {
+                    var prop = properties_6[_a];
                     var existing = seen[prop.name];
                     if (!existing) {
                         seen[prop.name] = { prop: prop, containingType: base };
@@ -32671,7 +34664,7 @@ var ts;
                 checkExportsOnMergedDeclarations(node);
                 var symbol = getSymbolOfNode(node);
                 checkTypeParameterListsIdentical(node, symbol);
-                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 223);
+                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 227);
                 if (node === firstInterfaceDecl) {
                     var type = getDeclaredTypeOfSymbol(symbol);
                     var typeWithThis = getTypeWithThisArgument(type);
@@ -32700,6 +34693,7 @@ var ts;
         function checkTypeAliasDeclaration(node) {
             checkGrammarDecorators(node) || checkGrammarModifiers(node);
             checkTypeNameIsReserved(node.name, ts.Diagnostics.Type_alias_name_cannot_be_0);
+            checkTypeParameters(node.typeParameters);
             checkSourceElement(node.type);
         }
         function computeEnumMemberValues(node) {
@@ -32716,7 +34710,7 @@ var ts;
                         error(member.name, ts.Diagnostics.Computed_property_names_are_not_allowed_in_enums);
                     }
                     else {
-                        var text = getTextOfPropertyName(member.name);
+                        var text = ts.getTextOfPropertyName(member.name);
                         if (isNumericLiteralName(text) && !isInfinityOrNaNString(text)) {
                             error(member.name, ts.Diagnostics.An_enum_member_cannot_have_a_numeric_name);
                         }
@@ -32766,7 +34760,7 @@ var ts;
                 return value;
                 function evalConstant(e) {
                     switch (e.kind) {
-                        case 186:
+                        case 190:
                             var value_1 = evalConstant(e.operand);
                             if (value_1 === undefined) {
                                 return undefined;
@@ -32777,7 +34771,7 @@ var ts;
                                 case 51: return ~value_1;
                             }
                             return undefined;
-                        case 188:
+                        case 192:
                             var left = evalConstant(e.left);
                             if (left === undefined) {
                                 return undefined;
@@ -32802,11 +34796,11 @@ var ts;
                             return undefined;
                         case 8:
                             return +e.text;
-                        case 179:
+                        case 183:
                             return evalConstant(e.expression);
                         case 70:
-                        case 174:
-                        case 173:
+                        case 178:
+                        case 177:
                             var member = initializer.parent;
                             var currentType = getTypeOfSymbol(getSymbolOfNode(member.parent));
                             var enumType_1;
@@ -32817,7 +34811,7 @@ var ts;
                             }
                             else {
                                 var expression = void 0;
-                                if (e.kind === 174) {
+                                if (e.kind === 178) {
                                     if (e.argumentExpression === undefined ||
                                         e.argumentExpression.kind !== 9) {
                                         return undefined;
@@ -32834,7 +34828,7 @@ var ts;
                                     if (current.kind === 70) {
                                         break;
                                     }
-                                    else if (current.kind === 173) {
+                                    else if (current.kind === 177) {
                                         current = current.expression;
                                     }
                                     else {
@@ -32894,7 +34888,7 @@ var ts;
                 }
                 var seenEnumMissingInitialInitializer_1 = false;
                 ts.forEach(enumSymbol.declarations, function (declaration) {
-                    if (declaration.kind !== 225) {
+                    if (declaration.kind !== 229) {
                         return false;
                     }
                     var enumDeclaration = declaration;
@@ -32917,8 +34911,8 @@ var ts;
             var declarations = symbol.declarations;
             for (var _i = 0, declarations_5 = declarations; _i < declarations_5.length; _i++) {
                 var declaration = declarations_5[_i];
-                if ((declaration.kind === 222 ||
-                    (declaration.kind === 221 && ts.nodeIsPresent(declaration.body))) &&
+                if ((declaration.kind === 226 ||
+                    (declaration.kind === 225 && ts.nodeIsPresent(declaration.body))) &&
                     !ts.isInAmbientContext(declaration)) {
                     return declaration;
                 }
@@ -32977,7 +34971,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, 222);
+                    var mergedClass = ts.getDeclarationOfKind(symbol, 226);
                     if (mergedClass &&
                         inSameLexicalScope(node, mergedClass)) {
                         getNodeLinks(node).flags |= 32768;
@@ -33020,36 +35014,36 @@ var ts;
         }
         function checkModuleAugmentationElement(node, isGlobalAugmentation) {
             switch (node.kind) {
-                case 201:
+                case 205:
                     for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
                         var decl = _a[_i];
                         checkModuleAugmentationElement(decl, isGlobalAugmentation);
                     }
                     break;
-                case 236:
-                case 237:
+                case 240:
+                case 241:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Exports_and_export_assignments_are_not_permitted_in_module_augmentations);
                     break;
-                case 230:
-                case 231:
+                case 234:
+                case 235:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_module);
                     break;
-                case 170:
-                case 219:
-                    var name_22 = node.name;
-                    if (ts.isBindingPattern(name_22)) {
-                        for (var _b = 0, _c = name_22.elements; _b < _c.length; _b++) {
+                case 174:
+                case 223:
+                    var name_28 = node.name;
+                    if (ts.isBindingPattern(name_28)) {
+                        for (var _b = 0, _c = name_28.elements; _b < _c.length; _b++) {
                             var el = _c[_b];
                             checkModuleAugmentationElement(el, isGlobalAugmentation);
                         }
                         break;
                     }
-                case 222:
-                case 225:
-                case 221:
-                case 223:
                 case 226:
-                case 224:
+                case 229:
+                case 225:
+                case 227:
+                case 230:
+                case 228:
                     if (isGlobalAugmentation) {
                         return;
                     }
@@ -33067,12 +35061,12 @@ var ts;
             switch (node.kind) {
                 case 70:
                     return node;
-                case 140:
+                case 141:
                     do {
                         node = node.left;
                     } while (node.kind !== 70);
                     return node;
-                case 173:
+                case 177:
                     do {
                         node = node.expression;
                     } while (node.kind !== 70);
@@ -33085,9 +35079,9 @@ var ts;
                 error(moduleName, ts.Diagnostics.String_literal_expected);
                 return false;
             }
-            var inAmbientExternalModule = node.parent.kind === 227 && ts.isAmbientModule(node.parent.parent);
-            if (node.parent.kind !== 256 && !inAmbientExternalModule) {
-                error(moduleName, node.kind === 237 ?
+            var inAmbientExternalModule = node.parent.kind === 231 && ts.isAmbientModule(node.parent.parent);
+            if (node.parent.kind !== 261 && !inAmbientExternalModule) {
+                error(moduleName, node.kind === 241 ?
                     ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace :
                     ts.Diagnostics.Import_declarations_in_a_namespace_cannot_reference_a_module);
                 return false;
@@ -33108,7 +35102,7 @@ var ts;
                     (symbol.flags & 793064 ? 793064 : 0) |
                     (symbol.flags & 1920 ? 1920 : 0);
                 if (target.flags & excludedMeanings) {
-                    var message = node.kind === 239 ?
+                    var message = node.kind === 243 ?
                         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));
@@ -33135,7 +35129,7 @@ var ts;
                         checkImportBinding(importClause);
                     }
                     if (importClause.namedBindings) {
-                        if (importClause.namedBindings.kind === 233) {
+                        if (importClause.namedBindings.kind === 237) {
                             checkImportBinding(importClause.namedBindings);
                         }
                         else {
@@ -33186,8 +35180,8 @@ var ts;
             if (!node.moduleSpecifier || checkExternalImportOrExportDeclaration(node)) {
                 if (node.exportClause) {
                     ts.forEach(node.exportClause.elements, checkExportSpecifier);
-                    var inAmbientExternalModule = node.parent.kind === 227 && ts.isAmbientModule(node.parent.parent);
-                    if (node.parent.kind !== 256 && !inAmbientExternalModule) {
+                    var inAmbientExternalModule = node.parent.kind === 231 && ts.isAmbientModule(node.parent.parent);
+                    if (node.parent.kind !== 261 && !inAmbientExternalModule) {
                         error(node, ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace);
                     }
                 }
@@ -33200,7 +35194,7 @@ var ts;
             }
         }
         function checkGrammarModuleElementContext(node, errorMessage) {
-            var isInAppropriateContext = node.parent.kind === 256 || node.parent.kind === 227 || node.parent.kind === 226;
+            var isInAppropriateContext = node.parent.kind === 261 || node.parent.kind === 231 || node.parent.kind === 230;
             if (!isInAppropriateContext) {
                 grammarErrorOnFirstToken(node, errorMessage);
             }
@@ -33223,8 +35217,8 @@ var ts;
             if (checkGrammarModuleElementContext(node, ts.Diagnostics.An_export_assignment_can_only_be_used_in_a_module)) {
                 return;
             }
-            var container = node.parent.kind === 256 ? node.parent : node.parent.parent;
-            if (container.kind === 226 && !ts.isAmbientModule(container)) {
+            var container = node.parent.kind === 261 ? node.parent : node.parent.parent;
+            if (container.kind === 230 && !ts.isAmbientModule(container)) {
                 error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_namespace);
                 return;
             }
@@ -33291,7 +35285,7 @@ var ts;
                 links.exportsChecked = true;
             }
             function isNotOverload(declaration) {
-                return (declaration.kind !== 221 && declaration.kind !== 148) ||
+                return (declaration.kind !== 225 && declaration.kind !== 149) ||
                     !!declaration.body;
             }
         }
@@ -33302,118 +35296,123 @@ var ts;
             var kind = node.kind;
             if (cancellationToken) {
                 switch (kind) {
+                    case 230:
                     case 226:
-                    case 222:
-                    case 223:
-                    case 221:
+                    case 227:
+                    case 225:
                         cancellationToken.throwIfCancellationRequested();
                 }
             }
             switch (kind) {
-                case 142:
-                    return checkTypeParameter(node);
                 case 143:
+                    return checkTypeParameter(node);
+                case 144:
                     return checkParameter(node);
+                case 147:
                 case 146:
-                case 145:
                     return checkPropertyDeclaration(node);
-                case 157:
                 case 158:
-                case 152:
+                case 159:
                 case 153:
-                    return checkSignatureDeclaration(node);
                 case 154:
                     return checkSignatureDeclaration(node);
-                case 148:
-                case 147:
-                    return checkMethodDeclaration(node);
-                case 149:
-                    return checkConstructorDeclaration(node);
-                case 150:
-                case 151:
-                    return checkAccessorDeclaration(node);
-                case 156:
-                    return checkTypeReferenceNode(node);
                 case 155:
+                    return checkSignatureDeclaration(node);
+                case 149:
+                case 148:
+                    return checkMethodDeclaration(node);
+                case 150:
+                    return checkConstructorDeclaration(node);
+                case 151:
+                case 152:
+                    return checkAccessorDeclaration(node);
+                case 157:
+                    return checkTypeReferenceNode(node);
+                case 156:
                     return checkTypePredicate(node);
-                case 159:
-                    return checkTypeQuery(node);
                 case 160:
-                    return checkTypeLiteral(node);
+                    return checkTypeQuery(node);
                 case 161:
-                    return checkArrayType(node);
+                    return checkTypeLiteral(node);
                 case 162:
-                    return checkTupleType(node);
+                    return checkArrayType(node);
                 case 163:
+                    return checkTupleType(node);
                 case 164:
-                    return checkUnionOrIntersectionType(node);
                 case 165:
+                    return checkUnionOrIntersectionType(node);
+                case 166:
+                case 168:
                     return checkSourceElement(node.type);
-                case 221:
-                    return checkFunctionDeclaration(node);
-                case 200:
-                case 227:
-                    return checkBlock(node);
-                case 201:
-                    return checkVariableStatement(node);
-                case 203:
-                    return checkExpressionStatement(node);
-                case 204:
-                    return checkIfStatement(node);
-                case 205:
-                    return checkDoStatement(node);
-                case 206:
-                    return checkWhileStatement(node);
-                case 207:
-                    return checkForStatement(node);
-                case 208:
-                    return checkForInStatement(node);
-                case 209:
-                    return checkForOfStatement(node);
-                case 210:
-                case 211:
-                    return checkBreakOrContinueStatement(node);
-                case 212:
-                    return checkReturnStatement(node);
-                case 213:
-                    return checkWithStatement(node);
-                case 214:
-                    return checkSwitchStatement(node);
-                case 215:
-                    return checkLabeledStatement(node);
-                case 216:
-                    return checkThrowStatement(node);
-                case 217:
-                    return checkTryStatement(node);
-                case 219:
-                    return checkVariableDeclaration(node);
+                case 169:
+                    return checkIndexedAccessType(node);
                 case 170:
-                    return checkBindingElement(node);
-                case 222:
-                    return checkClassDeclaration(node);
-                case 223:
-                    return checkInterfaceDeclaration(node);
-                case 224:
-                    return checkTypeAliasDeclaration(node);
+                    return checkMappedType(node);
                 case 225:
-                    return checkEnumDeclaration(node);
-                case 226:
-                    return checkModuleDeclaration(node);
+                    return checkFunctionDeclaration(node);
+                case 204:
                 case 231:
-                    return checkImportDeclaration(node);
-                case 230:
-                    return checkImportEqualsDeclaration(node);
-                case 237:
-                    return checkExportDeclaration(node);
-                case 236:
-                    return checkExportAssignment(node);
-                case 202:
-                    checkGrammarStatementInAmbientContext(node);
-                    return;
+                    return checkBlock(node);
+                case 205:
+                    return checkVariableStatement(node);
+                case 207:
+                    return checkExpressionStatement(node);
+                case 208:
+                    return checkIfStatement(node);
+                case 209:
+                    return checkDoStatement(node);
+                case 210:
+                    return checkWhileStatement(node);
+                case 211:
+                    return checkForStatement(node);
+                case 212:
+                    return checkForInStatement(node);
+                case 213:
+                    return checkForOfStatement(node);
+                case 214:
+                case 215:
+                    return checkBreakOrContinueStatement(node);
+                case 216:
+                    return checkReturnStatement(node);
+                case 217:
+                    return checkWithStatement(node);
                 case 218:
+                    return checkSwitchStatement(node);
+                case 219:
+                    return checkLabeledStatement(node);
+                case 220:
+                    return checkThrowStatement(node);
+                case 221:
+                    return checkTryStatement(node);
+                case 223:
+                    return checkVariableDeclaration(node);
+                case 174:
+                    return checkBindingElement(node);
+                case 226:
+                    return checkClassDeclaration(node);
+                case 227:
+                    return checkInterfaceDeclaration(node);
+                case 228:
+                    return checkTypeAliasDeclaration(node);
+                case 229:
+                    return checkEnumDeclaration(node);
+                case 230:
+                    return checkModuleDeclaration(node);
+                case 235:
+                    return checkImportDeclaration(node);
+                case 234:
+                    return checkImportEqualsDeclaration(node);
+                case 241:
+                    return checkExportDeclaration(node);
+                case 240:
+                    return checkExportAssignment(node);
+                case 206:
                     checkGrammarStatementInAmbientContext(node);
                     return;
-                case 240:
+                case 222:
+                    checkGrammarStatementInAmbientContext(node);
+                    return;
+                case 244:
                     return checkMissingDeclaration(node);
             }
         }
@@ -33426,17 +35425,17 @@ var ts;
             for (var _i = 0, deferredNodes_1 = deferredNodes; _i < deferredNodes_1.length; _i++) {
                 var node = deferredNodes_1[_i];
                 switch (node.kind) {
-                    case 180:
-                    case 181:
+                    case 184:
+                    case 185:
+                    case 149:
                     case 148:
-                    case 147:
                         checkFunctionExpressionOrObjectLiteralMethodDeferred(node);
                         break;
-                    case 150:
                     case 151:
+                    case 152:
                         checkAccessorDeferred(node);
                         break;
-                    case 193:
+                    case 197:
                         checkClassExpressionDeferred(node);
                         break;
                 }
@@ -33490,8 +35489,19 @@ var ts;
         function getDiagnosticsWorker(sourceFile) {
             throwIfNonDiagnosticsProducing();
             if (sourceFile) {
+                var previousGlobalDiagnostics = diagnostics.getGlobalDiagnostics();
+                var previousGlobalDiagnosticsSize = previousGlobalDiagnostics.length;
                 checkSourceFile(sourceFile);
-                return diagnostics.getDiagnostics(sourceFile.fileName);
+                var semanticDiagnostics = diagnostics.getDiagnostics(sourceFile.fileName);
+                var currentGlobalDiagnostics = diagnostics.getGlobalDiagnostics();
+                if (currentGlobalDiagnostics !== previousGlobalDiagnostics) {
+                    var deferredGlobalDiagnostics = ts.relativeComplement(previousGlobalDiagnostics, currentGlobalDiagnostics, ts.compareDiagnostics);
+                    return ts.concatenate(deferredGlobalDiagnostics, semanticDiagnostics);
+                }
+                else if (previousGlobalDiagnosticsSize === 0 && currentGlobalDiagnostics.length > 0) {
+                    return ts.concatenate(currentGlobalDiagnostics, semanticDiagnostics);
+                }
+                return semanticDiagnostics;
             }
             ts.forEach(host.getSourceFiles(), checkSourceFile);
             return diagnostics.getDiagnostics();
@@ -33508,7 +35518,7 @@ var ts;
         function isInsideWithStatementBody(node) {
             if (node) {
                 while (node.parent) {
-                    if (node.parent.kind === 213 && node.parent.statement === node) {
+                    if (node.parent.kind === 217 && node.parent.statement === node) {
                         return true;
                     }
                     node = node.parent;
@@ -33530,28 +35540,28 @@ var ts;
                         copySymbols(location.locals, meaning);
                     }
                     switch (location.kind) {
-                        case 256:
+                        case 261:
                             if (!ts.isExternalOrCommonJsModule(location)) {
                                 break;
                             }
-                        case 226:
+                        case 230:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 8914931);
                             break;
-                        case 225:
+                        case 229:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 8);
                             break;
-                        case 193:
+                        case 197:
                             var className = location.name;
                             if (className) {
                                 copySymbol(location.symbol, meaning);
                             }
-                        case 222:
-                        case 223:
+                        case 226:
+                        case 227:
                             if (!(memberFlags & 32)) {
                                 copySymbols(getSymbolOfNode(location).members, meaning & 793064);
                             }
                             break;
-                        case 180:
+                        case 184:
                             var funcName = location.name;
                             if (funcName) {
                                 copySymbol(location.symbol, meaning);
@@ -33590,27 +35600,27 @@ var ts;
         }
         function isTypeDeclaration(node) {
             switch (node.kind) {
-                case 142:
-                case 222:
-                case 223:
-                case 224:
-                case 225:
+                case 143:
+                case 226:
+                case 227:
+                case 228:
+                case 229:
                     return true;
             }
         }
         function isTypeReferenceIdentifier(entityName) {
             var node = entityName;
-            while (node.parent && node.parent.kind === 140) {
+            while (node.parent && node.parent.kind === 141) {
                 node = node.parent;
             }
-            return node.parent && (node.parent.kind === 156 || node.parent.kind === 267);
+            return node.parent && (node.parent.kind === 157 || node.parent.kind === 272);
         }
         function isHeritageClauseElementIdentifier(entityName) {
             var node = entityName;
-            while (node.parent && node.parent.kind === 173) {
+            while (node.parent && node.parent.kind === 177) {
                 node = node.parent;
             }
-            return node.parent && node.parent.kind === 195;
+            return node.parent && node.parent.kind === 199;
         }
         function forEachEnclosingClass(node, callback) {
             var result;
@@ -33627,13 +35637,13 @@ var ts;
             return !!forEachEnclosingClass(node, function (n) { return n === classDeclaration; });
         }
         function getLeftSideOfImportEqualsOrExportAssignment(nodeOnRightSide) {
-            while (nodeOnRightSide.parent.kind === 140) {
+            while (nodeOnRightSide.parent.kind === 141) {
                 nodeOnRightSide = nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 230) {
+            if (nodeOnRightSide.parent.kind === 234) {
                 return nodeOnRightSide.parent.moduleReference === nodeOnRightSide && nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 236) {
+            if (nodeOnRightSide.parent.kind === 240) {
                 return nodeOnRightSide.parent.expression === nodeOnRightSide && nodeOnRightSide.parent;
             }
             return undefined;
@@ -33645,7 +35655,7 @@ var ts;
             if (ts.isDeclarationName(entityName)) {
                 return getSymbolOfNode(entityName.parent);
             }
-            if (ts.isInJavaScriptFile(entityName) && entityName.parent.kind === 173) {
+            if (ts.isInJavaScriptFile(entityName) && entityName.parent.kind === 177) {
                 var specialPropertyAssignmentKind = ts.getSpecialPropertyAssignmentKind(entityName.parent.parent);
                 switch (specialPropertyAssignmentKind) {
                     case 1:
@@ -33657,11 +35667,11 @@ var ts;
                     default:
                 }
             }
-            if (entityName.parent.kind === 236 && ts.isEntityNameExpression(entityName)) {
+            if (entityName.parent.kind === 240 && ts.isEntityNameExpression(entityName)) {
                 return resolveEntityName(entityName, 107455 | 793064 | 1920 | 8388608);
             }
-            if (entityName.kind !== 173 && isInRightSideOfImportOrExportAssignment(entityName)) {
-                var importEqualsDeclaration = ts.getAncestor(entityName, 230);
+            if (entityName.kind !== 177 && isInRightSideOfImportOrExportAssignment(entityName)) {
+                var importEqualsDeclaration = ts.getAncestor(entityName, 234);
                 ts.Debug.assert(importEqualsDeclaration !== undefined);
                 return getSymbolOfPartOfRightHandSideOfImportEquals(entityName, true);
             }
@@ -33670,7 +35680,7 @@ var ts;
             }
             if (isHeritageClauseElementIdentifier(entityName)) {
                 var meaning = 0;
-                if (entityName.parent.kind === 195) {
+                if (entityName.parent.kind === 199) {
                     meaning = 793064;
                     if (ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
                         meaning |= 107455;
@@ -33692,14 +35702,14 @@ var ts;
                     }
                     return resolveEntityName(entityName, 107455, false, true);
                 }
-                else if (entityName.kind === 173) {
+                else if (entityName.kind === 177) {
                     var symbol = getNodeLinks(entityName).resolvedSymbol;
                     if (!symbol) {
                         checkPropertyAccessExpression(entityName);
                     }
                     return getNodeLinks(entityName).resolvedSymbol;
                 }
-                else if (entityName.kind === 140) {
+                else if (entityName.kind === 141) {
                     var symbol = getNodeLinks(entityName).resolvedSymbol;
                     if (!symbol) {
                         checkQualifiedName(entityName);
@@ -33708,19 +35718,19 @@ var ts;
                 }
             }
             else if (isTypeReferenceIdentifier(entityName)) {
-                var meaning = (entityName.parent.kind === 156 || entityName.parent.kind === 267) ? 793064 : 1920;
+                var meaning = (entityName.parent.kind === 157 || entityName.parent.kind === 272) ? 793064 : 1920;
                 return resolveEntityName(entityName, meaning, false, true);
             }
-            else if (entityName.parent.kind === 246) {
+            else if (entityName.parent.kind === 250) {
                 return getJsxAttributePropertySymbol(entityName.parent);
             }
-            if (entityName.parent.kind === 155) {
+            if (entityName.parent.kind === 156) {
                 return resolveEntityName(entityName, 1);
             }
             return undefined;
         }
         function getSymbolAtLocation(node) {
-            if (node.kind === 256) {
+            if (node.kind === 261) {
                 return ts.isExternalModule(node) ? getMergedSymbol(node.symbol) : undefined;
             }
             if (isInsideWithStatementBody(node)) {
@@ -33736,8 +35746,8 @@ var ts;
                 if (isInRightSideOfImportOrExportAssignment(node)) {
                     return getSymbolOfEntityNameOrPropertyAccessExpression(node);
                 }
-                else if (node.parent.kind === 170 &&
-                    node.parent.parent.kind === 168 &&
+                else if (node.parent.kind === 174 &&
+                    node.parent.parent.kind === 172 &&
                     node === node.parent.propertyName) {
                     var typeOfPattern = getTypeOfNode(node.parent.parent);
                     var propertyDeclaration = typeOfPattern && getPropertyOfType(typeOfPattern, node.text);
@@ -33748,8 +35758,8 @@ var ts;
             }
             switch (node.kind) {
                 case 70:
-                case 173:
-                case 140:
+                case 177:
+                case 141:
                     return getSymbolOfEntityNameOrPropertyAccessExpression(node);
                 case 98:
                     var container = ts.getThisContainer(node, false);
@@ -33762,18 +35772,18 @@ var ts;
                 case 96:
                     var type = ts.isPartOfExpression(node) ? checkExpression(node) : getTypeFromTypeNode(node);
                     return type.symbol;
-                case 166:
+                case 167:
                     return getTypeFromTypeNode(node).symbol;
                 case 122:
                     var constructorDeclaration = node.parent;
-                    if (constructorDeclaration && constructorDeclaration.kind === 149) {
+                    if (constructorDeclaration && constructorDeclaration.kind === 150) {
                         return constructorDeclaration.parent.symbol;
                     }
                     return undefined;
                 case 9:
                     if ((ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) &&
                         ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) ||
-                        ((node.parent.kind === 231 || node.parent.kind === 237) &&
+                        ((node.parent.kind === 235 || node.parent.kind === 241) &&
                             node.parent.moduleSpecifier === node)) {
                         return resolveExternalModuleName(node, node);
                     }
@@ -33781,7 +35791,7 @@ var ts;
                         return resolveExternalModuleName(node, node);
                     }
                 case 8:
-                    if (node.parent.kind === 174 && node.parent.argumentExpression === node) {
+                    if (node.parent.kind === 178 && node.parent.argumentExpression === node) {
                         var objectType = checkExpression(node.parent.expression);
                         if (objectType === unknownType)
                             return undefined;
@@ -33795,7 +35805,7 @@ var ts;
             return undefined;
         }
         function getShorthandAssignmentValueSymbol(location) {
-            if (location && location.kind === 254) {
+            if (location && location.kind === 258) {
                 return resolveEntityName(location.name, 107455 | 8388608);
             }
             return undefined;
@@ -33845,20 +35855,20 @@ var ts;
             return unknownType;
         }
         function getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr) {
-            ts.Debug.assert(expr.kind === 172 || expr.kind === 171);
-            if (expr.parent.kind === 209) {
+            ts.Debug.assert(expr.kind === 176 || expr.kind === 175);
+            if (expr.parent.kind === 213) {
                 var iteratedType = checkRightHandSideOfForOf(expr.parent.expression);
                 return checkDestructuringAssignment(expr, iteratedType || unknownType);
             }
-            if (expr.parent.kind === 188) {
+            if (expr.parent.kind === 192) {
                 var iteratedType = checkExpression(expr.parent.right);
                 return checkDestructuringAssignment(expr, iteratedType || unknownType);
             }
-            if (expr.parent.kind === 253) {
+            if (expr.parent.kind === 257) {
                 var typeOfParentObjectLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr.parent.parent);
                 return checkObjectLiteralDestructuringPropertyAssignment(typeOfParentObjectLiteral || unknownType, expr.parent);
             }
-            ts.Debug.assert(expr.parent.kind === 171);
+            ts.Debug.assert(expr.parent.kind === 175);
             var typeOfArrayLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr.parent);
             var elementType = checkIteratedTypeOrElementType(typeOfArrayLiteral || unknownType, expr.parent, false) || unknownType;
             return checkArrayLiteralDestructuringElementAssignment(expr.parent, typeOfArrayLiteral, ts.indexOf(expr.parent.elements, expr), elementType || unknownType);
@@ -33894,9 +35904,9 @@ var ts;
         function getRootSymbols(symbol) {
             if (symbol.flags & 268435456) {
                 var symbols_3 = [];
-                var name_23 = symbol.name;
+                var name_29 = symbol.name;
                 ts.forEach(getSymbolLinks(symbol).containingType.types, function (t) {
-                    var symbol = getPropertyOfType(t, name_23);
+                    var symbol = getPropertyOfType(t, name_29);
                     if (symbol) {
                         symbols_3.push(symbol);
                     }
@@ -33904,6 +35914,10 @@ var ts;
                 return symbols_3;
             }
             else if (symbol.flags & 67108864) {
+                if (symbol.leftSpread) {
+                    var links = symbol;
+                    return [links.leftSpread, links.rightSpread];
+                }
                 var target = void 0;
                 var next = symbol;
                 while (next = getSymbolLinks(next).target) {
@@ -33961,7 +35975,7 @@ var ts;
                     }
                     var parentSymbol = getParentOfSymbol(symbol);
                     if (parentSymbol) {
-                        if (parentSymbol.flags & 512 && parentSymbol.valueDeclaration.kind === 256) {
+                        if (parentSymbol.flags & 512 && parentSymbol.valueDeclaration.kind === 261) {
                             var symbolFile = parentSymbol.valueDeclaration;
                             var referenceFile = ts.getSourceFileOfNode(node);
                             var symbolIsUmdExport = symbolFile !== referenceFile;
@@ -33999,7 +36013,7 @@ var ts;
                         else if (nodeLinks_1.flags & 131072) {
                             var isDeclaredInLoop = nodeLinks_1.flags & 262144;
                             var inLoopInitializer = ts.isIterationStatement(container, false);
-                            var inLoopBodyBlock = container.kind === 200 && ts.isIterationStatement(container.parent, false);
+                            var inLoopBodyBlock = container.kind === 204 && ts.isIterationStatement(container.parent, false);
                             links.isDeclarationWithCollidingName = !ts.isBlockScopedContainerTopLevel(container) && (!isDeclaredInLoop || (!inLoopInitializer && !inLoopBodyBlock));
                         }
                         else {
@@ -34039,16 +36053,16 @@ var ts;
                 return true;
             }
             switch (node.kind) {
-                case 230:
-                case 232:
-                case 233:
-                case 235:
-                case 239:
-                    return isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol);
+                case 234:
+                case 236:
                 case 237:
+                case 239:
+                case 243:
+                    return isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol);
+                case 241:
                     var exportClause = node.exportClause;
                     return exportClause && ts.forEach(exportClause.elements, isValueAliasDeclaration);
-                case 236:
+                case 240:
                     return node.expression
                         && node.expression.kind === 70
                         ? isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol)
@@ -34058,7 +36072,7 @@ var ts;
         }
         function isTopLevelValueImportEqualsWithEntityName(node) {
             node = ts.getParseTreeNode(node, ts.isImportEqualsDeclaration);
-            if (node === undefined || node.parent.kind !== 256 || !ts.isInternalModuleImportEqualsDeclaration(node)) {
+            if (node === undefined || node.parent.kind !== 261 || !ts.isInternalModuleImportEqualsDeclaration(node)) {
                 return false;
             }
             var isValue = isAliasResolvedToValue(getSymbolOfNode(node));
@@ -34109,7 +36123,7 @@ var ts;
             return getNodeLinks(node).enumMemberValue;
         }
         function getConstantValue(node) {
-            if (node.kind === 255) {
+            if (node.kind === 260) {
                 return getEnumMemberValue(node);
             }
             var symbol = getNodeLinks(node).resolvedSymbol;
@@ -34121,7 +36135,7 @@ var ts;
             return undefined;
         }
         function isFunctionType(type) {
-            return type.flags & 2588672 && getSignaturesOfType(type, 0).length > 0;
+            return type.flags & 32768 && getSignaturesOfType(type, 0).length > 0;
         }
         function getTypeReferenceSerializationKind(typeName, location) {
             var valueSymbol = resolveEntityName(typeName, 107455, true, false, location);
@@ -34203,9 +36217,9 @@ var ts;
             }
             var location = reference;
             if (startInDeclarationContainer) {
-                var parent_14 = reference.parent;
-                if (ts.isDeclaration(parent_14) && reference === parent_14.name) {
-                    location = getDeclarationContainer(parent_14);
+                var parent_12 = reference.parent;
+                if (ts.isDeclaration(parent_12) && reference === parent_12.name) {
+                    location = getDeclarationContainer(parent_12);
                 }
             }
             return resolveName(location, reference.text, 107455 | 1048576 | 8388608, undefined, undefined);
@@ -34225,7 +36239,7 @@ var ts;
         function isLiteralConstDeclaration(node) {
             if (ts.isConst(node)) {
                 var type = getTypeOfSymbol(getSymbolOfNode(node));
-                return !!(type.flags & 96 && type.flags & 16777216);
+                return !!(type.flags & 96 && type.flags & 1048576);
             }
             return false;
         }
@@ -34276,13 +36290,14 @@ var ts;
                 getTypeReferenceDirectivesForEntityName: getTypeReferenceDirectivesForEntityName,
                 getTypeReferenceDirectivesForSymbol: getTypeReferenceDirectivesForSymbol,
                 isLiteralConstDeclaration: isLiteralConstDeclaration,
-                writeLiteralConstValue: writeLiteralConstValue
+                writeLiteralConstValue: writeLiteralConstValue,
+                getJsxFactoryEntity: function () { return _jsxFactoryEntity; }
             };
             function getTypeReferenceDirectivesForEntityName(node) {
                 if (!fileToDirective) {
                     return undefined;
                 }
-                var meaning = (node.kind === 173) || (node.kind === 70 && isInTypeQuery(node))
+                var meaning = (node.kind === 177) || (node.kind === 70 && isInTypeQuery(node))
                     ? 107455 | 1048576
                     : 793064 | 1920;
                 var symbol = resolveEntityName(node, meaning, true);
@@ -34304,6 +36319,9 @@ var ts;
                         if (typeReferenceDirective) {
                             (typeReferenceDirectives || (typeReferenceDirectives = [])).push(typeReferenceDirective);
                         }
+                        else {
+                            return undefined;
+                        }
                     }
                 }
                 return typeReferenceDirectives;
@@ -34314,15 +36332,15 @@ var ts;
                 }
                 var current = symbol;
                 while (true) {
-                    var parent_15 = getParentOfSymbol(current);
-                    if (parent_15) {
-                        current = parent_15;
+                    var parent_13 = getParentOfSymbol(current);
+                    if (parent_13) {
+                        current = parent_13;
                     }
                     else {
                         break;
                     }
                 }
-                if (current.valueDeclaration && current.valueDeclaration.kind === 256 && current.flags & 512) {
+                if (current.valueDeclaration && current.valueDeclaration.kind === 261 && current.flags & 512) {
                     return false;
                 }
                 for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
@@ -34341,7 +36359,7 @@ var ts;
             if (!moduleSymbol) {
                 return undefined;
             }
-            return ts.getDeclarationOfKind(moduleSymbol, 256);
+            return ts.getDeclarationOfKind(moduleSymbol, 261);
         }
         function initializeTypeChecker() {
             for (var _i = 0, _a = host.getSourceFiles(); _i < _a.length; _i++) {
@@ -34371,7 +36389,7 @@ var ts;
                     }
                 }
                 if ((compilerOptions.isolatedModules || ts.isExternalModule(file)) && !file.isDeclarationFile) {
-                    var fileRequestedExternalEmitHelpers = file.flags & 31744;
+                    var fileRequestedExternalEmitHelpers = file.flags & 64512;
                     if (fileRequestedExternalEmitHelpers) {
                         requestedExternalEmitHelpers |= fileRequestedExternalEmitHelpers;
                         if (firstFileRequestingExternalHelpers === undefined) {
@@ -34440,9 +36458,13 @@ var ts;
                     if (requestedExternalEmitHelpers & 1024 && languageVersion < 2) {
                         verifyHelperSymbol(exports_2, "__extends", 107455);
                     }
-                    if (requestedExternalEmitHelpers & 16384 && compilerOptions.jsx !== 1) {
+                    if (requestedExternalEmitHelpers & 16384 &&
+                        (languageVersion < 5 || compilerOptions.jsx === 2)) {
                         verifyHelperSymbol(exports_2, "__assign", 107455);
                     }
+                    if (languageVersion < 5 && requestedExternalEmitHelpers & 32768) {
+                        verifyHelperSymbol(exports_2, "__rest", 107455);
+                    }
                     if (requestedExternalEmitHelpers & 2048) {
                         verifyHelperSymbol(exports_2, "__decorate", 107455);
                         if (compilerOptions.emitDecoratorMetadata) {
@@ -34477,7 +36499,7 @@ var ts;
         function createThenableType() {
             var thenPropertySymbol = createSymbol(67108864 | 4, "then");
             getSymbolLinks(thenPropertySymbol).type = globalFunctionType;
-            var thenableType = createObjectType(2097152);
+            var thenableType = createObjectType(16);
             thenableType.properties = [thenPropertySymbol];
             thenableType.members = createSymbolTable(thenableType.properties);
             thenableType.callSignatures = [];
@@ -34489,14 +36511,14 @@ var ts;
                 return false;
             }
             if (!ts.nodeCanBeDecorated(node)) {
-                if (node.kind === 148 && !ts.nodeIsPresent(node.body)) {
+                if (node.kind === 149 && !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 === 150 || node.kind === 151) {
+            else if (node.kind === 151 || node.kind === 152) {
                 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);
@@ -34513,17 +36535,17 @@ var ts;
             var flags = 0;
             for (var _i = 0, _a = node.modifiers; _i < _a.length; _i++) {
                 var modifier = _a[_i];
-                if (modifier.kind !== 129) {
-                    if (node.kind === 145 || node.kind === 147) {
+                if (modifier.kind !== 130) {
+                    if (node.kind === 146 || node.kind === 148) {
                         return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_type_member, ts.tokenToString(modifier.kind));
                     }
-                    if (node.kind === 154) {
+                    if (node.kind === 155) {
                         return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_an_index_signature, ts.tokenToString(modifier.kind));
                     }
                 }
                 switch (modifier.kind) {
                     case 75:
-                        if (node.kind !== 225 && node.parent.kind === 222) {
+                        if (node.kind !== 229 && node.parent.kind === 226) {
                             return grammarErrorOnNode(node, ts.Diagnostics.A_class_member_cannot_have_the_0_keyword, ts.tokenToString(75));
                         }
                         break;
@@ -34549,7 +36571,7 @@ var ts;
                         else if (flags & 256) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "async");
                         }
-                        else if (node.parent.kind === 227 || node.parent.kind === 256) {
+                        else if (node.parent.kind === 231 || node.parent.kind === 261) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, text);
                         }
                         else if (flags & 128) {
@@ -34572,10 +36594,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 === 227 || node.parent.kind === 256) {
+                        else if (node.parent.kind === 231 || node.parent.kind === 261) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, "static");
                         }
-                        else if (node.kind === 143) {
+                        else if (node.kind === 144) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "static");
                         }
                         else if (flags & 128) {
@@ -34584,11 +36606,11 @@ var ts;
                         flags |= 32;
                         lastStatic = modifier;
                         break;
-                    case 129:
+                    case 130:
                         if (flags & 64) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "readonly");
                         }
-                        else if (node.kind !== 146 && node.kind !== 145 && node.kind !== 154 && node.kind !== 143) {
+                        else if (node.kind !== 147 && node.kind !== 146 && node.kind !== 155 && node.kind !== 144) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature);
                         }
                         flags |= 64;
@@ -34607,10 +36629,10 @@ var ts;
                         else if (flags & 256) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "async");
                         }
-                        else if (node.parent.kind === 222) {
+                        else if (node.parent.kind === 226) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "export");
                         }
-                        else if (node.kind === 143) {
+                        else if (node.kind === 144) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "export");
                         }
                         flags |= 1;
@@ -34622,13 +36644,13 @@ var ts;
                         else if (flags & 256) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
-                        else if (node.parent.kind === 222) {
+                        else if (node.parent.kind === 226) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "declare");
                         }
-                        else if (node.kind === 143) {
+                        else if (node.kind === 144) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "declare");
                         }
-                        else if (ts.isInAmbientContext(node.parent) && node.parent.kind === 227) {
+                        else if (ts.isInAmbientContext(node.parent) && node.parent.kind === 231) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.A_declare_modifier_cannot_be_used_in_an_already_ambient_context);
                         }
                         flags |= 2;
@@ -34638,14 +36660,14 @@ var ts;
                         if (flags & 128) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "abstract");
                         }
-                        if (node.kind !== 222) {
-                            if (node.kind !== 148 &&
-                                node.kind !== 146 &&
-                                node.kind !== 150 &&
-                                node.kind !== 151) {
+                        if (node.kind !== 226) {
+                            if (node.kind !== 149 &&
+                                node.kind !== 147 &&
+                                node.kind !== 151 &&
+                                node.kind !== 152) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration);
                             }
-                            if (!(node.parent.kind === 222 && ts.getModifierFlags(node.parent) & 128)) {
+                            if (!(node.parent.kind === 226 && ts.getModifierFlags(node.parent) & 128)) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.Abstract_methods_can_only_appear_within_an_abstract_class);
                             }
                             if (flags & 32) {
@@ -34664,7 +36686,7 @@ var ts;
                         else if (flags & 2 || ts.isInAmbientContext(node.parent)) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
-                        else if (node.kind === 143) {
+                        else if (node.kind === 144) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "async");
                         }
                         flags |= 256;
@@ -34672,7 +36694,7 @@ var ts;
                         break;
                 }
             }
-            if (node.kind === 149) {
+            if (node.kind === 150) {
                 if (flags & 32) {
                     return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "static");
                 }
@@ -34687,13 +36709,13 @@ var ts;
                 }
                 return;
             }
-            else if ((node.kind === 231 || node.kind === 230) && flags & 2) {
+            else if ((node.kind === 235 || node.kind === 234) && flags & 2) {
                 return grammarErrorOnNode(lastDeclare, ts.Diagnostics.A_0_modifier_cannot_be_used_with_an_import_declaration, "declare");
             }
-            else if (node.kind === 143 && (flags & 92) && ts.isBindingPattern(node.name)) {
+            else if (node.kind === 144 && (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 === 143 && (flags & 92) && node.dotDotDotToken) {
+            else if (node.kind === 144 && (flags & 92) && node.dotDotDotToken) {
                 return grammarErrorOnNode(node, ts.Diagnostics.A_parameter_property_cannot_be_declared_using_a_rest_parameter);
             }
             if (flags & 256) {
@@ -34709,37 +36731,37 @@ var ts;
         }
         function shouldReportBadModifier(node) {
             switch (node.kind) {
-                case 150:
                 case 151:
-                case 149:
-                case 146:
-                case 145:
-                case 148:
+                case 152:
+                case 150:
                 case 147:
-                case 154:
-                case 226:
-                case 231:
+                case 146:
+                case 149:
+                case 148:
+                case 155:
                 case 230:
-                case 237:
-                case 236:
-                case 180:
-                case 181:
-                case 143:
+                case 235:
+                case 234:
+                case 241:
+                case 240:
+                case 184:
+                case 185:
+                case 144:
                     return false;
                 default:
-                    if (node.parent.kind === 227 || node.parent.kind === 256) {
+                    if (node.parent.kind === 231 || node.parent.kind === 261) {
                         return false;
                     }
                     switch (node.kind) {
-                        case 221:
-                            return nodeHasAnyModifiersExcept(node, 119);
-                        case 222:
-                            return nodeHasAnyModifiersExcept(node, 116);
-                        case 223:
-                        case 201:
-                        case 224:
-                            return true;
                         case 225:
+                            return nodeHasAnyModifiersExcept(node, 119);
+                        case 226:
+                            return nodeHasAnyModifiersExcept(node, 116);
+                        case 227:
+                        case 205:
+                        case 228:
+                            return true;
+                        case 229:
                             return nodeHasAnyModifiersExcept(node, 75);
                         default:
                             ts.Debug.fail();
@@ -34752,10 +36774,10 @@ var ts;
         }
         function checkGrammarAsyncModifier(node, asyncModifier) {
             switch (node.kind) {
-                case 148:
-                case 221:
-                case 180:
-                case 181:
+                case 149:
+                case 225:
+                case 184:
+                case 185:
                     if (!node.asteriskToken) {
                         return false;
                     }
@@ -34817,7 +36839,7 @@ var ts;
                 checkGrammarParameterList(node.parameters) || checkGrammarArrowFunction(node, file);
         }
         function checkGrammarArrowFunction(node, file) {
-            if (node.kind === 181) {
+            if (node.kind === 185) {
                 var arrowFunction = node;
                 var startLine = ts.getLineAndCharacterOfPosition(file, arrowFunction.equalsGreaterThanToken.pos).line;
                 var endLine = ts.getLineAndCharacterOfPosition(file, arrowFunction.equalsGreaterThanToken.end).line;
@@ -34852,7 +36874,7 @@ var ts;
             if (!parameter.type) {
                 return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_must_have_a_type_annotation);
             }
-            if (parameter.type.kind !== 133 && parameter.type.kind !== 131) {
+            if (parameter.type.kind !== 134 && parameter.type.kind !== 132) {
                 return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_must_be_string_or_number);
             }
             if (!node.type) {
@@ -34879,7 +36901,7 @@ var ts;
                 var sourceFile = ts.getSourceFileOfNode(node);
                 for (var _i = 0, args_4 = args; _i < args_4.length; _i++) {
                     var arg = args_4[_i];
-                    if (arg.kind === 194) {
+                    if (arg.kind === 198) {
                         return grammarErrorAtPos(sourceFile, arg.pos, 0, ts.Diagnostics.Argument_expression_expected);
                     }
                 }
@@ -34949,19 +36971,19 @@ var ts;
             return false;
         }
         function checkGrammarComputedPropertyName(node) {
-            if (node.kind !== 141) {
+            if (node.kind !== 142) {
                 return false;
             }
             var computedPropertyName = node;
-            if (computedPropertyName.expression.kind === 188 && computedPropertyName.expression.operatorToken.kind === 25) {
+            if (computedPropertyName.expression.kind === 192 && computedPropertyName.expression.operatorToken.kind === 25) {
                 return grammarErrorOnNode(computedPropertyName.expression, ts.Diagnostics.A_comma_expression_is_not_allowed_in_a_computed_property_name);
             }
         }
         function checkGrammarForGenerator(node) {
             if (node.asteriskToken) {
-                ts.Debug.assert(node.kind === 221 ||
-                    node.kind === 180 ||
-                    node.kind === 148);
+                ts.Debug.assert(node.kind === 225 ||
+                    node.kind === 184 ||
+                    node.kind === 149);
                 if (ts.isInAmbientContext(node)) {
                     return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.Generators_are_not_allowed_in_an_ambient_context);
                 }
@@ -34986,42 +37008,45 @@ var ts;
             var GetOrSetAccessor = GetAccessor | SetAccessor;
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var prop = _a[_i];
-                var name_24 = prop.name;
-                if (name_24.kind === 141) {
-                    checkGrammarComputedPropertyName(name_24);
+                if (prop.kind === 259) {
+                    continue;
                 }
-                if (prop.kind === 254 && !inDestructuring && prop.objectAssignmentInitializer) {
+                var name_30 = prop.name;
+                if (name_30.kind === 142) {
+                    checkGrammarComputedPropertyName(name_30);
+                }
+                if (prop.kind === 258 && !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 !== 119 || prop.kind !== 148) {
+                        if (mod.kind !== 119 || prop.kind !== 149) {
                             grammarErrorOnNode(mod, ts.Diagnostics._0_modifier_cannot_be_used_here, ts.getTextOfNode(mod));
                         }
                     }
                 }
                 var currentKind = void 0;
-                if (prop.kind === 253 || prop.kind === 254) {
+                if (prop.kind === 257 || prop.kind === 258) {
                     checkGrammarForInvalidQuestionMark(prop.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional);
-                    if (name_24.kind === 8) {
-                        checkGrammarNumericLiteral(name_24);
+                    if (name_30.kind === 8) {
+                        checkGrammarNumericLiteral(name_30);
                     }
                     currentKind = Property;
                 }
-                else if (prop.kind === 148) {
+                else if (prop.kind === 149) {
                     currentKind = Property;
                 }
-                else if (prop.kind === 150) {
+                else if (prop.kind === 151) {
                     currentKind = GetAccessor;
                 }
-                else if (prop.kind === 151) {
+                else if (prop.kind === 152) {
                     currentKind = SetAccessor;
                 }
                 else {
                     ts.Debug.fail("Unexpected syntax kind:" + prop.kind);
                 }
-                var effectiveName = ts.getPropertyNameForPropertyNameNode(name_24);
+                var effectiveName = ts.getPropertyNameForPropertyNameNode(name_30);
                 if (effectiveName === undefined) {
                     continue;
                 }
@@ -35031,18 +37056,18 @@ var ts;
                 else {
                     var existingKind = seen[effectiveName];
                     if (currentKind === Property && existingKind === Property) {
-                        grammarErrorOnNode(name_24, ts.Diagnostics.Duplicate_identifier_0, ts.getTextOfNode(name_24));
+                        grammarErrorOnNode(name_30, ts.Diagnostics.Duplicate_identifier_0, ts.getTextOfNode(name_30));
                     }
                     else if ((currentKind & GetOrSetAccessor) && (existingKind & GetOrSetAccessor)) {
                         if (existingKind !== GetOrSetAccessor && currentKind !== existingKind) {
                             seen[effectiveName] = currentKind | existingKind;
                         }
                         else {
-                            return grammarErrorOnNode(name_24, ts.Diagnostics.An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name);
+                            return grammarErrorOnNode(name_30, ts.Diagnostics.An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name);
                         }
                     }
                     else {
-                        return grammarErrorOnNode(name_24, ts.Diagnostics.An_object_literal_cannot_have_property_and_accessor_with_the_same_name);
+                        return grammarErrorOnNode(name_30, ts.Diagnostics.An_object_literal_cannot_have_property_and_accessor_with_the_same_name);
                     }
                 }
             }
@@ -35051,19 +37076,19 @@ var ts;
             var seen = ts.createMap();
             for (var _i = 0, _a = node.attributes; _i < _a.length; _i++) {
                 var attr = _a[_i];
-                if (attr.kind === 247) {
+                if (attr.kind === 251) {
                     continue;
                 }
                 var jsxAttr = attr;
-                var name_25 = jsxAttr.name;
-                if (!seen[name_25.text]) {
-                    seen[name_25.text] = true;
+                var name_31 = jsxAttr.name;
+                if (!seen[name_31.text]) {
+                    seen[name_31.text] = true;
                 }
                 else {
-                    return grammarErrorOnNode(name_25, ts.Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name);
+                    return grammarErrorOnNode(name_31, ts.Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name);
                 }
                 var initializer = jsxAttr.initializer;
-                if (initializer && initializer.kind === 248 && !initializer.expression) {
+                if (initializer && initializer.kind === 252 && !initializer.expression) {
                     return grammarErrorOnNode(jsxAttr.initializer, ts.Diagnostics.JSX_attributes_must_only_be_assigned_a_non_empty_expression);
                 }
             }
@@ -35072,7 +37097,7 @@ var ts;
             if (checkGrammarStatementInAmbientContext(forInOrOfStatement)) {
                 return true;
             }
-            if (forInOrOfStatement.initializer.kind === 220) {
+            if (forInOrOfStatement.initializer.kind === 224) {
                 var variableList = forInOrOfStatement.initializer;
                 if (!checkGrammarVariableDeclarationList(variableList)) {
                     var declarations = variableList.declarations;
@@ -35080,20 +37105,20 @@ var ts;
                         return false;
                     }
                     if (declarations.length > 1) {
-                        var diagnostic = forInOrOfStatement.kind === 208
+                        var diagnostic = forInOrOfStatement.kind === 212
                             ? 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 === 208
+                        var diagnostic = forInOrOfStatement.kind === 212
                             ? 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 === 208
+                        var diagnostic = forInOrOfStatement.kind === 212
                             ? 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);
@@ -35117,11 +37142,11 @@ var ts;
                 return grammarErrorOnNode(accessor.name, ts.Diagnostics.An_accessor_cannot_have_type_parameters);
             }
             else if (!doesAccessorHaveCorrectParameterCount(accessor)) {
-                return grammarErrorOnNode(accessor.name, kind === 150 ?
+                return grammarErrorOnNode(accessor.name, kind === 151 ?
                     ts.Diagnostics.A_get_accessor_cannot_have_parameters :
                     ts.Diagnostics.A_set_accessor_must_have_exactly_one_parameter);
             }
-            else if (kind === 151) {
+            else if (kind === 152) {
                 if (accessor.type) {
                     return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_set_accessor_cannot_have_a_return_type_annotation);
                 }
@@ -35140,10 +37165,10 @@ var ts;
             }
         }
         function doesAccessorHaveCorrectParameterCount(accessor) {
-            return getAccessorThisParameter(accessor) || accessor.parameters.length === (accessor.kind === 150 ? 0 : 1);
+            return getAccessorThisParameter(accessor) || accessor.parameters.length === (accessor.kind === 151 ? 0 : 1);
         }
         function getAccessorThisParameter(accessor) {
-            if (accessor.parameters.length === (accessor.kind === 150 ? 1 : 2)) {
+            if (accessor.parameters.length === (accessor.kind === 151 ? 1 : 2)) {
                 return ts.getThisParameter(accessor);
             }
         }
@@ -35158,7 +37183,7 @@ var ts;
                 checkGrammarForGenerator(node)) {
                 return true;
             }
-            if (node.parent.kind === 172) {
+            if (node.parent.kind === 176) {
                 if (checkGrammarForInvalidQuestionMark(node.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional)) {
                     return true;
                 }
@@ -35174,10 +37199,10 @@ var ts;
                     return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_method_overload_must_directly_refer_to_a_built_in_symbol);
                 }
             }
-            else if (node.parent.kind === 223) {
+            else if (node.parent.kind === 227) {
                 return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol);
             }
-            else if (node.parent.kind === 160) {
+            else if (node.parent.kind === 161) {
                 return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol);
             }
         }
@@ -35188,9 +37213,9 @@ var ts;
                     return grammarErrorOnNode(node, ts.Diagnostics.Jump_target_cannot_cross_function_boundary);
                 }
                 switch (current.kind) {
-                    case 215:
+                    case 219:
                         if (node.label && current.label.text === node.label.text) {
-                            var isMisplacedContinueLabel = node.kind === 210
+                            var isMisplacedContinueLabel = node.kind === 214
                                 && !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);
@@ -35198,8 +37223,8 @@ var ts;
                             return false;
                         }
                         break;
-                    case 214:
-                        if (node.kind === 211 && !node.label) {
+                    case 218:
+                        if (node.kind === 215 && !node.label) {
                             return false;
                         }
                         break;
@@ -35212,13 +37237,13 @@ var ts;
                 current = current.parent;
             }
             if (node.label) {
-                var message = node.kind === 211
+                var message = node.kind === 215
                     ? 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 === 211
+                var message = node.kind === 215
                     ? 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);
@@ -35228,9 +37253,9 @@ var ts;
             if (node.dotDotDotToken) {
                 var elements = node.parent.elements;
                 if (node !== ts.lastOrUndefined(elements)) {
-                    return grammarErrorOnNode(node, ts.Diagnostics.A_rest_element_must_be_last_in_an_array_destructuring_pattern);
+                    return grammarErrorOnNode(node, ts.Diagnostics.A_rest_element_must_be_last_in_a_destructuring_pattern);
                 }
-                if (node.name.kind === 169 || node.name.kind === 168) {
+                if (node.name.kind === 173 || node.name.kind === 172) {
                     return grammarErrorOnNode(node.name, ts.Diagnostics.A_rest_element_cannot_contain_a_binding_pattern);
                 }
                 if (node.initializer) {
@@ -35240,11 +37265,11 @@ var ts;
         }
         function isStringOrNumberLiteralExpression(expr) {
             return expr.kind === 9 || expr.kind === 8 ||
-                expr.kind === 186 && expr.operator === 37 &&
+                expr.kind === 190 && expr.operator === 37 &&
                     expr.operand.kind === 8;
         }
         function checkGrammarVariableDeclaration(node) {
-            if (node.parent.parent.kind !== 208 && node.parent.parent.kind !== 209) {
+            if (node.parent.parent.kind !== 212 && node.parent.parent.kind !== 213) {
                 if (ts.isInAmbientContext(node)) {
                     if (node.initializer) {
                         if (ts.isConst(node) && !node.type) {
@@ -35301,15 +37326,15 @@ var ts;
         }
         function allowLetAndConstDeclarations(parent) {
             switch (parent.kind) {
-                case 204:
-                case 205:
-                case 206:
-                case 213:
-                case 207:
                 case 208:
                 case 209:
+                case 210:
+                case 217:
+                case 211:
+                case 212:
+                case 213:
                     return false;
-                case 215:
+                case 219:
                     return allowLetAndConstDeclarations(parent.parent);
             }
             return true;
@@ -35364,7 +37389,7 @@ var ts;
                     return true;
                 }
             }
-            else if (node.parent.kind === 223) {
+            else if (node.parent.kind === 227) {
                 if (checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol)) {
                     return true;
                 }
@@ -35372,7 +37397,7 @@ var ts;
                     return grammarErrorOnNode(node.initializer, ts.Diagnostics.An_interface_property_cannot_have_an_initializer);
                 }
             }
-            else if (node.parent.kind === 160) {
+            else if (node.parent.kind === 161) {
                 if (checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol)) {
                     return true;
                 }
@@ -35385,13 +37410,13 @@ var ts;
             }
         }
         function checkGrammarTopLevelElementForRequiredDeclareModifier(node) {
-            if (node.kind === 223 ||
-                node.kind === 224 ||
-                node.kind === 231 ||
-                node.kind === 230 ||
-                node.kind === 237 ||
-                node.kind === 236 ||
-                node.kind === 229 ||
+            if (node.kind === 227 ||
+                node.kind === 228 ||
+                node.kind === 235 ||
+                node.kind === 234 ||
+                node.kind === 241 ||
+                node.kind === 240 ||
+                node.kind === 233 ||
                 ts.getModifierFlags(node) & (2 | 1 | 512)) {
                 return false;
             }
@@ -35400,7 +37425,7 @@ var ts;
         function checkGrammarTopLevelElementsForRequiredDeclareModifier(file) {
             for (var _i = 0, _a = file.statements; _i < _a.length; _i++) {
                 var decl = _a[_i];
-                if (ts.isDeclaration(decl) || decl.kind === 201) {
+                if (ts.isDeclaration(decl) || decl.kind === 205) {
                     if (checkGrammarTopLevelElementForRequiredDeclareModifier(decl)) {
                         return true;
                     }
@@ -35419,7 +37444,7 @@ 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 === 200 || node.parent.kind === 227 || node.parent.kind === 256) {
+                if (node.parent.kind === 204 || node.parent.kind === 231 || node.parent.kind === 261) {
                     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);
@@ -35458,49 +37483,49 @@ var ts;
 (function (ts) {
     ;
     var nodeEdgeTraversalMap = ts.createMap((_a = {},
-        _a[140] = [
+        _a[141] = [
             { name: "left", test: ts.isEntityName },
             { name: "right", test: ts.isIdentifier }
         ],
-        _a[144] = [
+        _a[145] = [
             { name: "expression", test: ts.isLeftHandSideExpression }
         ],
-        _a[178] = [
+        _a[182] = [
             { name: "type", test: ts.isTypeNode },
             { name: "expression", test: ts.isUnaryExpression }
         ],
-        _a[196] = [
+        _a[200] = [
             { name: "expression", test: ts.isExpression },
             { name: "type", test: ts.isTypeNode }
         ],
-        _a[197] = [
+        _a[201] = [
             { name: "expression", test: ts.isLeftHandSideExpression }
         ],
-        _a[225] = [
+        _a[229] = [
             { name: "decorators", test: ts.isDecorator },
             { name: "modifiers", test: ts.isModifier },
             { name: "name", test: ts.isIdentifier },
             { name: "members", test: ts.isEnumMember }
         ],
-        _a[226] = [
+        _a[230] = [
             { name: "decorators", test: ts.isDecorator },
             { name: "modifiers", test: ts.isModifier },
             { name: "name", test: ts.isModuleName },
             { name: "body", test: ts.isModuleBody }
         ],
-        _a[227] = [
+        _a[231] = [
             { name: "statements", test: ts.isStatement }
         ],
-        _a[230] = [
+        _a[234] = [
             { name: "decorators", test: ts.isDecorator },
             { name: "modifiers", test: ts.isModifier },
             { name: "name", test: ts.isIdentifier },
             { name: "moduleReference", test: ts.isModuleReference }
         ],
-        _a[241] = [
+        _a[245] = [
             { name: "expression", test: ts.isExpression, optional: true }
         ],
-        _a[255] = [
+        _a[260] = [
             { name: "name", test: ts.isPropertyName },
             { name: "initializer", test: ts.isExpression, optional: true, parenthesize: ts.parenthesizeExpressionForList }
         ],
@@ -35513,41 +37538,41 @@ var ts;
             return initial;
         }
         var kind = node.kind;
-        if ((kind > 0 && kind <= 139)) {
+        if ((kind > 0 && kind <= 140)) {
             return initial;
         }
-        if ((kind >= 155 && kind <= 167)) {
+        if ((kind >= 156 && kind <= 171)) {
             return initial;
         }
         var result = initial;
         switch (node.kind) {
-            case 199:
-            case 202:
-            case 194:
-            case 218:
-            case 287:
+            case 203:
+            case 206:
+            case 198:
+            case 222:
+            case 292:
                 break;
-            case 141:
+            case 142:
                 result = reduceNode(node.expression, f, result);
                 break;
-            case 143:
-                result = ts.reduceLeft(node.decorators, f, result);
-                result = ts.reduceLeft(node.modifiers, f, result);
-                result = reduceNode(node.name, f, result);
-                result = reduceNode(node.type, f, result);
-                result = reduceNode(node.initializer, f, result);
-                break;
             case 144:
-                result = reduceNode(node.expression, f, result);
-                break;
-            case 146:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.type, f, result);
                 result = reduceNode(node.initializer, f, result);
                 break;
-            case 148:
+            case 145:
+                result = reduceNode(node.expression, f, result);
+                break;
+            case 147:
+                result = ts.reduceLeft(node.decorators, f, result);
+                result = ts.reduceLeft(node.modifiers, f, result);
+                result = reduceNode(node.name, f, result);
+                result = reduceNode(node.type, f, result);
+                result = reduceNode(node.initializer, f, result);
+                break;
+            case 149:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
@@ -35556,17 +37581,9 @@ var ts;
                 result = reduceNode(node.type, f, result);
                 result = reduceNode(node.body, f, result);
                 break;
-            case 149:
-                result = ts.reduceLeft(node.modifiers, f, result);
-                result = ts.reduceLeft(node.parameters, f, result);
-                result = reduceNode(node.body, f, result);
-                break;
             case 150:
-                result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
-                result = reduceNode(node.name, f, result);
                 result = ts.reduceLeft(node.parameters, f, result);
-                result = reduceNode(node.type, f, result);
                 result = reduceNode(node.body, f, result);
                 break;
             case 151:
@@ -35574,46 +37591,54 @@ var ts;
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
                 result = ts.reduceLeft(node.parameters, f, result);
+                result = reduceNode(node.type, f, result);
                 result = reduceNode(node.body, f, result);
                 break;
-            case 168:
-            case 169:
+            case 152:
+                result = ts.reduceLeft(node.decorators, f, result);
+                result = ts.reduceLeft(node.modifiers, f, result);
+                result = reduceNode(node.name, f, result);
+                result = ts.reduceLeft(node.parameters, f, result);
+                result = reduceNode(node.body, f, result);
+                break;
+            case 172:
+            case 173:
                 result = ts.reduceLeft(node.elements, f, result);
                 break;
-            case 170:
+            case 174:
                 result = reduceNode(node.propertyName, f, result);
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.initializer, f, result);
                 break;
-            case 171:
+            case 175:
                 result = ts.reduceLeft(node.elements, f, result);
                 break;
-            case 172:
+            case 176:
                 result = ts.reduceLeft(node.properties, f, result);
                 break;
-            case 173:
+            case 177:
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.name, f, result);
                 break;
-            case 174:
+            case 178:
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.argumentExpression, f, result);
                 break;
-            case 175:
+            case 179:
                 result = reduceNode(node.expression, f, result);
                 result = ts.reduceLeft(node.typeArguments, f, result);
                 result = ts.reduceLeft(node.arguments, f, result);
                 break;
-            case 176:
+            case 180:
                 result = reduceNode(node.expression, f, result);
                 result = ts.reduceLeft(node.typeArguments, f, result);
                 result = ts.reduceLeft(node.arguments, f, result);
                 break;
-            case 177:
+            case 181:
                 result = reduceNode(node.tag, f, result);
                 result = reduceNode(node.template, f, result);
                 break;
-            case 180:
+            case 184:
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
                 result = ts.reduceLeft(node.typeParameters, f, result);
@@ -35621,117 +37646,117 @@ var ts;
                 result = reduceNode(node.type, f, result);
                 result = reduceNode(node.body, f, result);
                 break;
-            case 181:
+            case 185:
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = ts.reduceLeft(node.typeParameters, f, result);
                 result = ts.reduceLeft(node.parameters, f, result);
                 result = reduceNode(node.type, f, result);
                 result = reduceNode(node.body, f, result);
                 break;
-            case 179:
-            case 182:
             case 183:
-            case 184:
-            case 185:
-            case 191:
-            case 192:
-            case 197:
-                result = reduceNode(node.expression, f, result);
-                break;
             case 186:
             case 187:
+            case 188:
+            case 189:
+            case 195:
+            case 196:
+            case 201:
+                result = reduceNode(node.expression, f, result);
+                break;
+            case 190:
+            case 191:
                 result = reduceNode(node.operand, f, result);
                 break;
-            case 188:
+            case 192:
                 result = reduceNode(node.left, f, result);
                 result = reduceNode(node.right, f, result);
                 break;
-            case 189:
+            case 193:
                 result = reduceNode(node.condition, f, result);
                 result = reduceNode(node.whenTrue, f, result);
                 result = reduceNode(node.whenFalse, f, result);
                 break;
-            case 190:
+            case 194:
                 result = reduceNode(node.head, f, result);
                 result = ts.reduceLeft(node.templateSpans, f, result);
                 break;
-            case 193:
+            case 197:
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
                 result = ts.reduceLeft(node.typeParameters, f, result);
                 result = ts.reduceLeft(node.heritageClauses, f, result);
                 result = ts.reduceLeft(node.members, f, result);
                 break;
-            case 195:
+            case 199:
                 result = reduceNode(node.expression, f, result);
                 result = ts.reduceLeft(node.typeArguments, f, result);
                 break;
-            case 198:
+            case 202:
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.literal, f, result);
                 break;
-            case 200:
+            case 204:
                 result = ts.reduceLeft(node.statements, f, result);
                 break;
-            case 201:
+            case 205:
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.declarationList, f, result);
                 break;
-            case 203:
+            case 207:
                 result = reduceNode(node.expression, f, result);
                 break;
-            case 204:
+            case 208:
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.thenStatement, f, result);
                 result = reduceNode(node.elseStatement, f, result);
                 break;
-            case 205:
+            case 209:
                 result = reduceNode(node.statement, f, result);
                 result = reduceNode(node.expression, f, result);
                 break;
-            case 206:
-            case 213:
+            case 210:
+            case 217:
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.statement, f, result);
                 break;
-            case 207:
+            case 211:
                 result = reduceNode(node.initializer, f, result);
                 result = reduceNode(node.condition, f, result);
                 result = reduceNode(node.incrementor, f, result);
                 result = reduceNode(node.statement, f, result);
                 break;
-            case 208:
-            case 209:
+            case 212:
+            case 213:
                 result = reduceNode(node.initializer, f, result);
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.statement, f, result);
                 break;
-            case 212:
             case 216:
+            case 220:
                 result = reduceNode(node.expression, f, result);
                 break;
-            case 214:
+            case 218:
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.caseBlock, f, result);
                 break;
-            case 215:
+            case 219:
                 result = reduceNode(node.label, f, result);
                 result = reduceNode(node.statement, f, result);
                 break;
-            case 217:
+            case 221:
                 result = reduceNode(node.tryBlock, f, result);
                 result = reduceNode(node.catchClause, f, result);
                 result = reduceNode(node.finallyBlock, f, result);
                 break;
-            case 219:
+            case 223:
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.type, f, result);
                 result = reduceNode(node.initializer, f, result);
                 break;
-            case 220:
+            case 224:
                 result = ts.reduceLeft(node.declarations, f, result);
                 break;
-            case 221:
+            case 225:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
@@ -35740,7 +37765,7 @@ var ts;
                 result = reduceNode(node.type, f, result);
                 result = reduceNode(node.body, f, result);
                 break;
-            case 222:
+            case 226:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
@@ -35748,89 +37773,92 @@ var ts;
                 result = ts.reduceLeft(node.heritageClauses, f, result);
                 result = ts.reduceLeft(node.members, f, result);
                 break;
-            case 228:
+            case 232:
                 result = ts.reduceLeft(node.clauses, f, result);
                 break;
-            case 231:
+            case 235:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.importClause, f, result);
                 result = reduceNode(node.moduleSpecifier, f, result);
                 break;
-            case 232:
+            case 236:
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.namedBindings, f, result);
                 break;
-            case 233:
+            case 237:
                 result = reduceNode(node.name, f, result);
                 break;
-            case 234:
             case 238:
+            case 242:
                 result = ts.reduceLeft(node.elements, f, result);
                 break;
-            case 235:
             case 239:
+            case 243:
                 result = reduceNode(node.propertyName, f, result);
                 result = reduceNode(node.name, f, result);
                 break;
-            case 236:
+            case 240:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.expression, f, result);
                 break;
-            case 237:
+            case 241:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.exportClause, f, result);
                 result = reduceNode(node.moduleSpecifier, f, result);
                 break;
-            case 242:
+            case 246:
                 result = reduceNode(node.openingElement, f, result);
                 result = ts.reduceLeft(node.children, f, result);
                 result = reduceNode(node.closingElement, f, result);
                 break;
-            case 243:
-            case 244:
+            case 247:
+            case 248:
                 result = reduceNode(node.tagName, f, result);
                 result = ts.reduceLeft(node.attributes, f, result);
                 break;
-            case 245:
+            case 249:
                 result = reduceNode(node.tagName, f, result);
                 break;
-            case 246:
+            case 250:
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.initializer, f, result);
                 break;
-            case 247:
-                result = reduceNode(node.expression, f, result);
-                break;
-            case 248:
-                result = reduceNode(node.expression, f, result);
-                break;
-            case 249:
-                result = reduceNode(node.expression, f, result);
-            case 250:
-                result = ts.reduceLeft(node.statements, f, result);
-                break;
             case 251:
-                result = ts.reduceLeft(node.types, f, result);
+                result = reduceNode(node.expression, f, result);
                 break;
             case 252:
+                result = reduceNode(node.expression, f, result);
+                break;
+            case 253:
+                result = reduceNode(node.expression, f, result);
+            case 254:
+                result = ts.reduceLeft(node.statements, f, result);
+                break;
+            case 255:
+                result = ts.reduceLeft(node.types, f, result);
+                break;
+            case 256:
                 result = reduceNode(node.variableDeclaration, f, result);
                 result = reduceNode(node.block, f, result);
                 break;
-            case 253:
+            case 257:
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.initializer, f, result);
                 break;
-            case 254:
+            case 258:
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.objectAssignmentInitializer, f, result);
                 break;
-            case 256:
+            case 259:
+                result = reduceNode(node.expression, f, result);
+                break;
+            case 261:
                 result = ts.reduceLeft(node.statements, f, result);
                 break;
-            case 288:
+            case 293:
                 result = reduceNode(node.expression, f, result);
                 break;
             default:
@@ -35855,6 +37883,7 @@ var ts;
         if (node === undefined) {
             return undefined;
         }
+        aggregateTransformFlags(node);
         var visited = visitor(node);
         if (visited === node) {
             return node;
@@ -35897,6 +37926,7 @@ var ts;
         }
         for (var i = 0; i < count; i++) {
             var node = nodes[i + start];
+            aggregateTransformFlags(node);
             var visited = node !== undefined ? visitor(node) : undefined;
             if (updated !== undefined || visited === undefined || visited !== node) {
                 if (updated === undefined) {
@@ -35933,178 +37963,180 @@ var ts;
             return undefined;
         }
         var kind = node.kind;
-        if ((kind > 0 && kind <= 139)) {
+        if ((kind > 0 && kind <= 140)) {
             return node;
         }
-        if ((kind >= 155 && kind <= 167)) {
+        if ((kind >= 156 && kind <= 171)) {
             return node;
         }
         switch (node.kind) {
-            case 199:
-            case 202:
-            case 194:
-            case 218:
-                return node;
-            case 141:
-                return ts.updateComputedPropertyName(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 143:
-                return ts.updateParameterDeclaration(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.type, visitor, ts.isTypeNode, true), visitNode(node.initializer, visitor, ts.isExpression, true));
-            case 146:
-                return ts.updateProperty(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.type, visitor, ts.isTypeNode, true), visitNode(node.initializer, visitor, ts.isExpression, true));
-            case 148:
-                return ts.updateMethod(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
-            case 149:
-                return ts.updateConstructor(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
-            case 150:
-                return ts.updateGetAccessor(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
-            case 151:
-                return ts.updateSetAccessor(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
-            case 168:
-                return ts.updateObjectBindingPattern(node, visitNodes(node.elements, visitor, ts.isBindingElement));
-            case 169:
-                return ts.updateArrayBindingPattern(node, visitNodes(node.elements, visitor, ts.isArrayBindingElement));
-            case 170:
-                return ts.updateBindingElement(node, visitNode(node.propertyName, visitor, ts.isPropertyName, true), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.initializer, visitor, ts.isExpression, true));
-            case 171:
-                return ts.updateArrayLiteral(node, visitNodes(node.elements, visitor, ts.isExpression));
-            case 172:
-                return ts.updateObjectLiteral(node, visitNodes(node.properties, visitor, ts.isObjectLiteralElementLike));
-            case 173:
-                return ts.updatePropertyAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.name, visitor, ts.isIdentifier));
-            case 174:
-                return ts.updateElementAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.argumentExpression, visitor, ts.isExpression));
-            case 175:
-                return ts.updateCall(node, visitNode(node.expression, visitor, ts.isExpression), visitNodes(node.typeArguments, visitor, ts.isTypeNode), visitNodes(node.arguments, visitor, ts.isExpression));
-            case 176:
-                return ts.updateNew(node, visitNode(node.expression, visitor, ts.isExpression), visitNodes(node.typeArguments, visitor, ts.isTypeNode), visitNodes(node.arguments, visitor, ts.isExpression));
-            case 177:
-                return ts.updateTaggedTemplate(node, visitNode(node.tag, visitor, ts.isExpression), visitNode(node.template, visitor, ts.isTemplateLiteral));
-            case 179:
-                return ts.updateParen(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 180:
-                return ts.updateFunctionExpression(node, visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
-            case 181:
-                return ts.updateArrowFunction(node, visitNodes(node.modifiers, visitor, ts.isModifier), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isConciseBody, true), context.endLexicalEnvironment()));
-            case 182:
-                return ts.updateDelete(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 183:
-                return ts.updateTypeOf(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 184:
-                return ts.updateVoid(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 185:
-                return ts.updateAwait(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 188:
-                return ts.updateBinary(node, visitNode(node.left, visitor, ts.isExpression), visitNode(node.right, visitor, ts.isExpression));
-            case 186:
-                return ts.updatePrefix(node, visitNode(node.operand, visitor, ts.isExpression));
-            case 187:
-                return ts.updatePostfix(node, visitNode(node.operand, visitor, ts.isExpression));
-            case 189:
-                return ts.updateConditional(node, visitNode(node.condition, visitor, ts.isExpression), visitNode(node.whenTrue, visitor, ts.isExpression), visitNode(node.whenFalse, visitor, ts.isExpression));
-            case 190:
-                return ts.updateTemplateExpression(node, visitNode(node.head, visitor, ts.isTemplateHead), visitNodes(node.templateSpans, visitor, ts.isTemplateSpan));
-            case 191:
-                return ts.updateYield(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 192:
-                return ts.updateSpread(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 193:
-                return ts.updateClassExpression(node, visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier, true), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), visitNodes(node.members, visitor, ts.isClassElement));
-            case 195:
-                return ts.updateExpressionWithTypeArguments(node, visitNodes(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.expression, visitor, ts.isExpression));
-            case 198:
-                return ts.updateTemplateSpan(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.literal, visitor, ts.isTemplateMiddleOrTemplateTail));
-            case 200:
-                return ts.updateBlock(node, visitNodes(node.statements, visitor, ts.isStatement));
-            case 201:
-                return ts.updateVariableStatement(node, visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.declarationList, visitor, ts.isVariableDeclarationList));
             case 203:
-                return ts.updateStatement(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 204:
-                return ts.updateIf(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.thenStatement, visitor, ts.isStatement, false, liftToBlock), visitNode(node.elseStatement, visitor, ts.isStatement, true, liftToBlock));
-            case 205:
-                return ts.updateDo(node, visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock), visitNode(node.expression, visitor, ts.isExpression));
             case 206:
-                return ts.updateWhile(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock));
-            case 207:
-                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, false, liftToBlock));
-            case 208:
-                return ts.updateForIn(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock));
-            case 209:
-                return ts.updateForOf(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock));
-            case 210:
-                return ts.updateContinue(node, visitNode(node.label, visitor, ts.isIdentifier, true));
-            case 211:
-                return ts.updateBreak(node, visitNode(node.label, visitor, ts.isIdentifier, true));
-            case 212:
-                return ts.updateReturn(node, visitNode(node.expression, visitor, ts.isExpression, true));
-            case 213:
-                return ts.updateWith(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock));
-            case 214:
-                return ts.updateSwitch(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.caseBlock, visitor, ts.isCaseBlock));
-            case 215:
-                return ts.updateLabel(node, visitNode(node.label, visitor, ts.isIdentifier), visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock));
-            case 216:
-                return ts.updateThrow(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 217:
-                return ts.updateTry(node, visitNode(node.tryBlock, visitor, ts.isBlock), visitNode(node.catchClause, visitor, ts.isCatchClause, true), visitNode(node.finallyBlock, visitor, ts.isBlock, true));
-            case 219:
-                return ts.updateVariableDeclaration(node, visitNode(node.name, visitor, ts.isBindingName), visitNode(node.type, visitor, ts.isTypeNode, true), visitNode(node.initializer, visitor, ts.isExpression, true));
-            case 220:
-                return ts.updateVariableDeclarationList(node, visitNodes(node.declarations, visitor, ts.isVariableDeclaration));
-            case 221:
-                return ts.updateFunctionDeclaration(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
+            case 198:
             case 222:
+                return node;
+            case 142:
+                return ts.updateComputedPropertyName(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 144:
+                return ts.updateParameter(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.type, visitor, ts.isTypeNode, true), visitNode(node.initializer, visitor, ts.isExpression, true));
+            case 147:
+                return ts.updateProperty(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.type, visitor, ts.isTypeNode, true), visitNode(node.initializer, visitor, ts.isExpression, true));
+            case 149:
+                return ts.updateMethod(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
+            case 150:
+                return ts.updateConstructor(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
+            case 151:
+                return ts.updateGetAccessor(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
+            case 152:
+                return ts.updateSetAccessor(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
+            case 172:
+                return ts.updateObjectBindingPattern(node, visitNodes(node.elements, visitor, ts.isBindingElement));
+            case 173:
+                return ts.updateArrayBindingPattern(node, visitNodes(node.elements, visitor, ts.isArrayBindingElement));
+            case 174:
+                return ts.updateBindingElement(node, visitNode(node.propertyName, visitor, ts.isPropertyName, true), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.initializer, visitor, ts.isExpression, true));
+            case 175:
+                return ts.updateArrayLiteral(node, visitNodes(node.elements, visitor, ts.isExpression));
+            case 176:
+                return ts.updateObjectLiteral(node, visitNodes(node.properties, visitor, ts.isObjectLiteralElementLike));
+            case 177:
+                return ts.updatePropertyAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.name, visitor, ts.isIdentifier));
+            case 178:
+                return ts.updateElementAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.argumentExpression, visitor, ts.isExpression));
+            case 179:
+                return ts.updateCall(node, visitNode(node.expression, visitor, ts.isExpression), visitNodes(node.typeArguments, visitor, ts.isTypeNode), visitNodes(node.arguments, visitor, ts.isExpression));
+            case 180:
+                return ts.updateNew(node, visitNode(node.expression, visitor, ts.isExpression), visitNodes(node.typeArguments, visitor, ts.isTypeNode), visitNodes(node.arguments, visitor, ts.isExpression));
+            case 181:
+                return ts.updateTaggedTemplate(node, visitNode(node.tag, visitor, ts.isExpression), visitNode(node.template, visitor, ts.isTemplateLiteral));
+            case 183:
+                return ts.updateParen(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 184:
+                return ts.updateFunctionExpression(node, visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
+            case 185:
+                return ts.updateArrowFunction(node, visitNodes(node.modifiers, visitor, ts.isModifier), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isConciseBody, true), context.endLexicalEnvironment()));
+            case 186:
+                return ts.updateDelete(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 187:
+                return ts.updateTypeOf(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 188:
+                return ts.updateVoid(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 189:
+                return ts.updateAwait(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 192:
+                return ts.updateBinary(node, visitNode(node.left, visitor, ts.isExpression), visitNode(node.right, visitor, ts.isExpression));
+            case 190:
+                return ts.updatePrefix(node, visitNode(node.operand, visitor, ts.isExpression));
+            case 191:
+                return ts.updatePostfix(node, visitNode(node.operand, visitor, ts.isExpression));
+            case 193:
+                return ts.updateConditional(node, visitNode(node.condition, visitor, ts.isExpression), visitNode(node.whenTrue, visitor, ts.isExpression), visitNode(node.whenFalse, visitor, ts.isExpression));
+            case 194:
+                return ts.updateTemplateExpression(node, visitNode(node.head, visitor, ts.isTemplateHead), visitNodes(node.templateSpans, visitor, ts.isTemplateSpan));
+            case 195:
+                return ts.updateYield(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 196:
+                return ts.updateSpread(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 197:
+                return ts.updateClassExpression(node, visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier, true), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), visitNodes(node.members, visitor, ts.isClassElement));
+            case 199:
+                return ts.updateExpressionWithTypeArguments(node, visitNodes(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.expression, visitor, ts.isExpression));
+            case 202:
+                return ts.updateTemplateSpan(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.literal, visitor, ts.isTemplateMiddleOrTemplateTail));
+            case 204:
+                return ts.updateBlock(node, visitNodes(node.statements, visitor, ts.isStatement));
+            case 205:
+                return ts.updateVariableStatement(node, visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.declarationList, visitor, ts.isVariableDeclarationList));
+            case 207:
+                return ts.updateStatement(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 208:
+                return ts.updateIf(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.thenStatement, visitor, ts.isStatement, false, liftToBlock), visitNode(node.elseStatement, visitor, ts.isStatement, true, liftToBlock));
+            case 209:
+                return ts.updateDo(node, visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock), visitNode(node.expression, visitor, ts.isExpression));
+            case 210:
+                return ts.updateWhile(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock));
+            case 211:
+                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, false, liftToBlock));
+            case 212:
+                return ts.updateForIn(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock));
+            case 213:
+                return ts.updateForOf(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock));
+            case 214:
+                return ts.updateContinue(node, visitNode(node.label, visitor, ts.isIdentifier, true));
+            case 215:
+                return ts.updateBreak(node, visitNode(node.label, visitor, ts.isIdentifier, true));
+            case 216:
+                return ts.updateReturn(node, visitNode(node.expression, visitor, ts.isExpression, true));
+            case 217:
+                return ts.updateWith(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock));
+            case 218:
+                return ts.updateSwitch(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.caseBlock, visitor, ts.isCaseBlock));
+            case 219:
+                return ts.updateLabel(node, visitNode(node.label, visitor, ts.isIdentifier), visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock));
+            case 220:
+                return ts.updateThrow(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 221:
+                return ts.updateTry(node, visitNode(node.tryBlock, visitor, ts.isBlock), visitNode(node.catchClause, visitor, ts.isCatchClause, true), visitNode(node.finallyBlock, visitor, ts.isBlock, true));
+            case 223:
+                return ts.updateVariableDeclaration(node, visitNode(node.name, visitor, ts.isBindingName), visitNode(node.type, visitor, ts.isTypeNode, true), visitNode(node.initializer, visitor, ts.isExpression, true));
+            case 224:
+                return ts.updateVariableDeclarationList(node, visitNodes(node.declarations, visitor, ts.isVariableDeclaration));
+            case 225:
+                return ts.updateFunctionDeclaration(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
+            case 226:
                 return ts.updateClassDeclaration(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier, true), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), visitNodes(node.members, visitor, ts.isClassElement));
-            case 228:
-                return ts.updateCaseBlock(node, visitNodes(node.clauses, visitor, ts.isCaseOrDefaultClause));
-            case 231:
-                return ts.updateImportDeclaration(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.importClause, visitor, ts.isImportClause, true), visitNode(node.moduleSpecifier, visitor, ts.isExpression));
             case 232:
-                return ts.updateImportClause(node, visitNode(node.name, visitor, ts.isIdentifier, true), visitNode(node.namedBindings, visitor, ts.isNamedImportBindings, true));
-            case 233:
-                return ts.updateNamespaceImport(node, visitNode(node.name, visitor, ts.isIdentifier));
-            case 234:
-                return ts.updateNamedImports(node, visitNodes(node.elements, visitor, ts.isImportSpecifier));
+                return ts.updateCaseBlock(node, visitNodes(node.clauses, visitor, ts.isCaseOrDefaultClause));
             case 235:
-                return ts.updateImportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier, true), visitNode(node.name, visitor, ts.isIdentifier));
+                return ts.updateImportDeclaration(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.importClause, visitor, ts.isImportClause, true), visitNode(node.moduleSpecifier, visitor, ts.isExpression));
             case 236:
-                return ts.updateExportAssignment(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.expression, visitor, ts.isExpression));
+                return ts.updateImportClause(node, visitNode(node.name, visitor, ts.isIdentifier, true), visitNode(node.namedBindings, visitor, ts.isNamedImportBindings, true));
             case 237:
-                return ts.updateExportDeclaration(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.exportClause, visitor, ts.isNamedExports, true), visitNode(node.moduleSpecifier, visitor, ts.isExpression, true));
+                return ts.updateNamespaceImport(node, visitNode(node.name, visitor, ts.isIdentifier));
             case 238:
-                return ts.updateNamedExports(node, visitNodes(node.elements, visitor, ts.isExportSpecifier));
+                return ts.updateNamedImports(node, visitNodes(node.elements, visitor, ts.isImportSpecifier));
             case 239:
-                return ts.updateExportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier, true), visitNode(node.name, visitor, ts.isIdentifier));
+                return ts.updateImportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier, true), visitNode(node.name, visitor, ts.isIdentifier));
+            case 240:
+                return ts.updateExportAssignment(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.expression, visitor, ts.isExpression));
+            case 241:
+                return ts.updateExportDeclaration(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.exportClause, visitor, ts.isNamedExports, true), visitNode(node.moduleSpecifier, visitor, ts.isExpression, true));
             case 242:
-                return ts.updateJsxElement(node, visitNode(node.openingElement, visitor, ts.isJsxOpeningElement), visitNodes(node.children, visitor, ts.isJsxChild), visitNode(node.closingElement, visitor, ts.isJsxClosingElement));
+                return ts.updateNamedExports(node, visitNodes(node.elements, visitor, ts.isExportSpecifier));
             case 243:
-                return ts.updateJsxSelfClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), visitNodes(node.attributes, visitor, ts.isJsxAttributeLike));
-            case 244:
-                return ts.updateJsxOpeningElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), visitNodes(node.attributes, visitor, ts.isJsxAttributeLike));
-            case 245:
-                return ts.updateJsxClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression));
+                return ts.updateExportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier, true), visitNode(node.name, visitor, ts.isIdentifier));
             case 246:
-                return ts.updateJsxAttribute(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.initializer, visitor, ts.isStringLiteralOrJsxExpression));
+                return ts.updateJsxElement(node, visitNode(node.openingElement, visitor, ts.isJsxOpeningElement), visitNodes(node.children, visitor, ts.isJsxChild), visitNode(node.closingElement, visitor, ts.isJsxClosingElement));
             case 247:
-                return ts.updateJsxSpreadAttribute(node, visitNode(node.expression, visitor, ts.isExpression));
+                return ts.updateJsxSelfClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), visitNodes(node.attributes, visitor, ts.isJsxAttributeLike));
             case 248:
-                return ts.updateJsxExpression(node, visitNode(node.expression, visitor, ts.isExpression));
+                return ts.updateJsxOpeningElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), visitNodes(node.attributes, visitor, ts.isJsxAttributeLike));
             case 249:
-                return ts.updateCaseClause(node, visitNode(node.expression, visitor, ts.isExpression), visitNodes(node.statements, visitor, ts.isStatement));
+                return ts.updateJsxClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression));
             case 250:
-                return ts.updateDefaultClause(node, visitNodes(node.statements, visitor, ts.isStatement));
+                return ts.updateJsxAttribute(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.initializer, visitor, ts.isStringLiteralOrJsxExpression));
             case 251:
-                return ts.updateHeritageClause(node, visitNodes(node.types, visitor, ts.isExpressionWithTypeArguments));
+                return ts.updateJsxSpreadAttribute(node, visitNode(node.expression, visitor, ts.isExpression));
             case 252:
-                return ts.updateCatchClause(node, visitNode(node.variableDeclaration, visitor, ts.isVariableDeclaration), visitNode(node.block, visitor, ts.isBlock));
+                return ts.updateJsxExpression(node, visitNode(node.expression, visitor, ts.isExpression));
             case 253:
-                return ts.updatePropertyAssignment(node, visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.initializer, visitor, ts.isExpression));
+                return ts.updateCaseClause(node, visitNode(node.expression, visitor, ts.isExpression), visitNodes(node.statements, visitor, ts.isStatement));
             case 254:
-                return ts.updateShorthandPropertyAssignment(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.objectAssignmentInitializer, visitor, ts.isExpression));
+                return ts.updateDefaultClause(node, visitNodes(node.statements, visitor, ts.isStatement));
+            case 255:
+                return ts.updateHeritageClause(node, visitNodes(node.types, visitor, ts.isExpressionWithTypeArguments));
             case 256:
+                return ts.updateCatchClause(node, visitNode(node.variableDeclaration, visitor, ts.isVariableDeclaration), visitNode(node.block, visitor, ts.isBlock));
+            case 257:
+                return ts.updatePropertyAssignment(node, visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.initializer, visitor, ts.isExpression));
+            case 258:
+                return ts.updateShorthandPropertyAssignment(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.objectAssignmentInitializer, visitor, ts.isExpression));
+            case 259:
+                return ts.updateSpreadAssignment(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 261:
                 context.startLexicalEnvironment();
                 return ts.updateSourceFileNode(node, ts.createNodeArray(ts.concatenate(visitNodes(node.statements, visitor, ts.isStatement), context.endLexicalEnvironment()), node.statements));
-            case 288:
+            case 293:
                 return ts.updatePartiallyEmittedExpression(node, visitNode(node.expression, visitor, ts.isExpression));
             default:
                 var updated = void 0;
@@ -36163,7 +38195,7 @@ var ts;
             return 0;
         }
         else if (node.transformFlags & 536870912) {
-            return node.transformFlags & ~getTransformFlagsSubtreeExclusions(node.kind);
+            return node.transformFlags & ~ts.getTransformFlagsSubtreeExclusions(node.kind);
         }
         else {
             var subtreeFlags = aggregateTransformFlagsForSubtree(node);
@@ -36179,68 +38211,17 @@ var ts;
     function aggregateTransformFlagsForChildNode(transformFlags, child) {
         return transformFlags | aggregateTransformFlagsForNode(child);
     }
-    function getTransformFlagsSubtreeExclusions(kind) {
-        if (kind >= 155 && kind <= 167) {
-            return -3;
-        }
-        switch (kind) {
-            case 175:
-            case 176:
-            case 171:
-                return 537922901;
-            case 226:
-                return 574729557;
-            case 143:
-                return 545262933;
-            case 181:
-                return 592227669;
-            case 180:
-            case 221:
-                return 592293205;
-            case 220:
-                return 545262933;
-            case 222:
-            case 193:
-                return 539749717;
-            case 149:
-                return 591760725;
-            case 148:
-            case 150:
-            case 151:
-                return 591760725;
-            case 118:
-            case 131:
-            case 128:
-            case 133:
-            case 121:
-            case 134:
-            case 104:
-            case 142:
-            case 145:
-            case 147:
-            case 152:
-            case 153:
-            case 154:
-            case 223:
-            case 224:
-                return -3;
-            case 172:
-                return 539110741;
-            default:
-                return 536874325;
-        }
-    }
     var Debug;
     (function (Debug) {
         Debug.failNotOptional = Debug.shouldAssert(1)
             ? function (message) { return Debug.assert(false, message || "Node not optional."); }
-            : function () { };
+            : ts.noop;
         Debug.failBadSyntaxKind = Debug.shouldAssert(1)
             ? function (node, message) { return Debug.assert(false, message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " was unexpected."; }); }
-            : function () { };
+            : 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 '" + getFunctionName(test) + "'."; }); }
-            : function () { };
+            : ts.noop;
         function getFunctionName(func) {
             if (typeof func !== "function") {
                 return "";
@@ -36259,7 +38240,7 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    function flattenDestructuringAssignment(context, node, needsValue, recordTempVariable, visitor) {
+    function flattenDestructuringAssignment(context, node, needsValue, recordTempVariable, visitor, transformRest) {
         if (ts.isEmptyObjectLiteralOrArrayLiteral(node.left)) {
             var right = node.right;
             if (ts.isDestructuringAssignment(right)) {
@@ -36278,7 +38259,7 @@ var ts;
         else if (ts.nodeIsSynthesized(node)) {
             location = value;
         }
-        flattenDestructuring(node, value, location, emitAssignment, emitTempVariableAssignment, visitor);
+        flattenDestructuring(node, value, location, emitAssignment, emitTempVariableAssignment, recordTempVariable, emitRestAssignment, transformRest, visitor);
         if (needsValue) {
             expressions.push(value);
         }
@@ -36296,11 +38277,14 @@ var ts;
             emitAssignment(name, value, location);
             return name;
         }
+        function emitRestAssignment(elements, value, location) {
+            emitAssignment(ts.createObjectLiteral(elements), value, location);
+        }
     }
     ts.flattenDestructuringAssignment = flattenDestructuringAssignment;
-    function flattenParameterDestructuring(node, value, visitor) {
+    function flattenParameterDestructuring(node, value, visitor, transformRest) {
         var declarations = [];
-        flattenDestructuring(node, value, node, emitAssignment, emitTempVariableAssignment, visitor);
+        flattenDestructuring(node, value, node, emitAssignment, emitTempVariableAssignment, ts.noop, emitRestAssignment, transformRest, visitor);
         return declarations;
         function emitAssignment(name, value, location) {
             var declaration = ts.createVariableDeclaration(name, undefined, value, location);
@@ -36313,12 +38297,15 @@ var ts;
             emitAssignment(name, value, location);
             return name;
         }
+        function emitRestAssignment(elements, value, location) {
+            emitAssignment(ts.createObjectBindingPattern(elements), value, location);
+        }
     }
     ts.flattenParameterDestructuring = flattenParameterDestructuring;
-    function flattenVariableDestructuring(node, value, visitor, recordTempVariable) {
+    function flattenVariableDestructuring(node, value, visitor, recordTempVariable, transformRest) {
         var declarations = [];
         var pendingAssignments;
-        flattenDestructuring(node, value, node, emitAssignment, emitTempVariableAssignment, visitor);
+        flattenDestructuring(node, value, node, emitAssignment, emitTempVariableAssignment, recordTempVariable, emitRestAssignment, transformRest, visitor);
         return declarations;
         function emitAssignment(name, value, location, original) {
             if (pendingAssignments) {
@@ -36348,33 +38335,39 @@ var ts;
             }
             return name;
         }
+        function emitRestAssignment(elements, value, location, original) {
+            emitAssignment(ts.createObjectBindingPattern(elements), value, location, original);
+        }
     }
     ts.flattenVariableDestructuring = flattenVariableDestructuring;
-    function flattenVariableDestructuringToExpression(node, recordTempVariable, nameSubstitution, visitor) {
+    function flattenVariableDestructuringToExpression(node, recordTempVariable, createAssignmentCallback, visitor) {
         var pendingAssignments = [];
-        flattenDestructuring(node, undefined, node, emitAssignment, emitTempVariableAssignment, visitor);
+        flattenDestructuring(node, undefined, node, emitAssignment, emitTempVariableAssignment, ts.noop, emitRestAssignment, false, visitor);
         var expression = ts.inlineExpressions(pendingAssignments);
         ts.aggregateTransformFlags(expression);
         return expression;
         function emitAssignment(name, value, location, original) {
-            var left = nameSubstitution && nameSubstitution(name) || name;
-            emitPendingAssignment(left, value, location, original);
+            var expression = createAssignmentCallback
+                ? createAssignmentCallback(name.kind === 70 ? name : emitTempVariableAssignment(name, location), value, location)
+                : ts.createAssignment(name, value, location);
+            emitPendingAssignment(expression, original);
         }
         function emitTempVariableAssignment(value, location) {
             var name = ts.createTempVariable(recordTempVariable);
-            emitPendingAssignment(name, value, location, undefined);
+            emitPendingAssignment(ts.createAssignment(name, value, location), undefined);
             return name;
         }
-        function emitPendingAssignment(name, value, location, original) {
-            var expression = ts.createAssignment(name, value, location);
+        function emitRestAssignment(elements, value, location, original) {
+            emitAssignment(ts.createObjectLiteral(elements), value, location, original);
+        }
+        function emitPendingAssignment(expression, original) {
             expression.original = original;
             ts.setEmitFlags(expression, 2048);
             pendingAssignments.push(expression);
-            return expression;
         }
     }
     ts.flattenVariableDestructuringToExpression = flattenVariableDestructuringToExpression;
-    function flattenDestructuring(root, value, location, emitAssignment, emitTempVariableAssignment, visitor) {
+    function flattenDestructuring(root, value, location, emitAssignment, emitTempVariableAssignment, recordTempVariable, emitRestAssignment, transformRest, visitor) {
         if (value && visitor) {
             value = ts.visitNode(value, visitor, ts.isExpression);
         }
@@ -36405,17 +38398,17 @@ var ts;
             else {
                 target = bindingTarget;
             }
-            if (target.kind === 172) {
+            if (target.kind === 176) {
                 emitObjectLiteralAssignment(target, value, location);
             }
-            else if (target.kind === 171) {
+            else if (target.kind === 175) {
                 emitArrayLiteralAssignment(target, value, location);
             }
             else {
-                var name_26 = ts.getMutableClone(target);
-                ts.setSourceMapRange(name_26, target);
-                ts.setCommentRange(name_26, target);
-                emitAssignment(name_26, value, location, undefined);
+                var name_32 = ts.getMutableClone(target);
+                ts.setSourceMapRange(name_32, target);
+                ts.setCommentRange(name_32, target);
+                emitAssignment(name_32, value, location, undefined);
             }
         }
         function emitObjectLiteralAssignment(target, value, location) {
@@ -36423,16 +38416,79 @@ var ts;
             if (properties.length !== 1) {
                 value = ensureIdentifier(value, true, location, emitTempVariableAssignment);
             }
-            for (var _i = 0, properties_6 = properties; _i < properties_6.length; _i++) {
-                var p = properties_6[_i];
-                if (p.kind === 253 || p.kind === 254) {
-                    var propName = p.name;
-                    var target_1 = p.kind === 254 ? p : p.initializer || propName;
-                    emitDestructuringAssignment(target_1, createDestructuringPropertyAccess(value, propName), p);
+            var bindingElements = [];
+            for (var i = 0; i < properties.length; i++) {
+                var p = properties[i];
+                if (p.kind === 257 || p.kind === 258) {
+                    if (!transformRest ||
+                        p.transformFlags & 8388608 ||
+                        (p.kind === 257 && p.initializer.transformFlags & 8388608)) {
+                        if (bindingElements.length) {
+                            emitRestAssignment(bindingElements, value, location, target);
+                            bindingElements = [];
+                        }
+                        var propName = p.name;
+                        var bindingTarget = p.kind === 258 ? p : p.initializer || propName;
+                        emitDestructuringAssignment(bindingTarget, createDestructuringPropertyAccess(value, propName), p);
+                    }
+                    else {
+                        bindingElements.push(p);
+                    }
                 }
+                else if (i === properties.length - 1 &&
+                    p.kind === 259 &&
+                    p.expression.kind === 70) {
+                    if (bindingElements.length) {
+                        emitRestAssignment(bindingElements, value, location, target);
+                        bindingElements = [];
+                    }
+                    var propName = p.expression;
+                    var restCall = createRestCall(value, target.properties, function (p) { return p.name; }, target);
+                    emitDestructuringAssignment(propName, restCall, p);
+                }
+            }
+            if (bindingElements.length) {
+                emitRestAssignment(bindingElements, value, location, target);
+                bindingElements = [];
             }
         }
         function emitArrayLiteralAssignment(target, value, location) {
+            if (transformRest) {
+                emitESNextArrayLiteralAssignment(target, value, location);
+            }
+            else {
+                emitES2015ArrayLiteralAssignment(target, value, location);
+            }
+        }
+        function emitESNextArrayLiteralAssignment(target, value, location) {
+            var elements = target.elements;
+            var numElements = elements.length;
+            if (numElements !== 1) {
+                value = ensureIdentifier(value, true, location, emitTempVariableAssignment);
+            }
+            var expressions = [];
+            var spreadContainingExpressions = [];
+            for (var i = 0; i < numElements; i++) {
+                var e = elements[i];
+                if (e.kind === 198) {
+                    continue;
+                }
+                if (e.transformFlags & 8388608 && i < numElements - 1) {
+                    var tmp = ts.createTempVariable(recordTempVariable);
+                    spreadContainingExpressions.push([e, tmp]);
+                    expressions.push(tmp);
+                }
+                else {
+                    expressions.push(e);
+                }
+            }
+            emitAssignment(ts.updateArrayLiteral(target, expressions), value, undefined, undefined);
+            for (var _i = 0, spreadContainingExpressions_1 = spreadContainingExpressions; _i < spreadContainingExpressions_1.length; _i++) {
+                var _a = spreadContainingExpressions_1[_i], e = _a[0], tmp = _a[1];
+                emitDestructuringAssignment(e, tmp, e);
+            }
+        }
+        function emitES2015ArrayLiteralAssignment(target, value, location) {
             var elements = target.elements;
             var numElements = elements.length;
             if (numElements !== 1) {
@@ -36440,8 +38496,8 @@ var ts;
             }
             for (var i = 0; i < numElements; i++) {
                 var e = elements[i];
-                if (e.kind !== 194) {
-                    if (e.kind !== 192) {
+                if (e.kind !== 198) {
+                    if (e.kind !== 196) {
                         emitDestructuringAssignment(e, ts.createElementAccess(value, ts.createLiteral(i)), e);
                     }
                     else if (i === numElements - 1) {
@@ -36450,42 +38506,130 @@ var ts;
                 }
             }
         }
+        function createRestCall(value, elements, getPropertyName, location) {
+            var propertyNames = [];
+            for (var i = 0; i < elements.length - 1; i++) {
+                if (ts.isOmittedExpression(elements[i])) {
+                    continue;
+                }
+                var str = ts.createSynthesizedNode(9);
+                str.pos = location.pos;
+                str.end = location.end;
+                str.text = ts.getTextOfPropertyName(getPropertyName(elements[i]));
+                propertyNames.push(str);
+            }
+            var args = ts.createSynthesizedNodeArray([value, ts.createArrayLiteral(propertyNames, location)]);
+            return ts.createCall(ts.createIdentifier("__rest"), undefined, args);
+        }
         function emitBindingElement(target, value) {
             var initializer = visitor ? ts.visitNode(target.initializer, visitor, ts.isExpression) : target.initializer;
-            if (initializer) {
+            if (transformRest) {
+                value = value || initializer;
+            }
+            else if (initializer) {
                 value = value ? createDefaultValueCheck(value, initializer, target) : initializer;
             }
             else if (!value) {
                 value = ts.createVoidZero();
             }
             var name = target.name;
-            if (ts.isBindingPattern(name)) {
-                var elements = name.elements;
-                var numElements = elements.length;
+            if (!ts.isBindingPattern(name)) {
+                emitAssignment(name, value, target, target);
+            }
+            else {
+                var numElements = name.elements.length;
                 if (numElements !== 1) {
                     value = ensureIdentifier(value, numElements !== 0, target, emitTempVariableAssignment);
                 }
-                for (var i = 0; i < numElements; i++) {
-                    var element = elements[i];
-                    if (ts.isOmittedExpression(element)) {
-                        continue;
-                    }
-                    else if (name.kind === 168) {
-                        var propName = element.propertyName || element.name;
-                        emitBindingElement(element, createDestructuringPropertyAccess(value, propName));
-                    }
-                    else {
-                        if (!element.dotDotDotToken) {
-                            emitBindingElement(element, ts.createElementAccess(value, i));
-                        }
-                        else if (i === numElements - 1) {
-                            emitBindingElement(element, ts.createArraySlice(value, i));
-                        }
-                    }
+                if (name.kind === 173) {
+                    emitArrayBindingElement(name, value);
+                }
+                else {
+                    emitObjectBindingElement(target, value);
                 }
             }
+        }
+        function emitArrayBindingElement(name, value) {
+            if (transformRest) {
+                emitESNextArrayBindingElement(name, value);
+            }
             else {
-                emitAssignment(name, value, target, target);
+                emitES2015ArrayBindingElement(name, value);
+            }
+        }
+        function emitES2015ArrayBindingElement(name, value) {
+            var elements = name.elements;
+            var numElements = elements.length;
+            for (var i = 0; i < numElements; i++) {
+                var element = elements[i];
+                if (ts.isOmittedExpression(element)) {
+                    continue;
+                }
+                if (!element.dotDotDotToken) {
+                    emitBindingElement(element, ts.createElementAccess(value, i));
+                }
+                else if (i === numElements - 1) {
+                    emitBindingElement(element, ts.createArraySlice(value, i));
+                }
+            }
+        }
+        function emitESNextArrayBindingElement(name, value) {
+            var elements = name.elements;
+            var numElements = elements.length;
+            var bindingElements = [];
+            var spreadContainingElements = [];
+            for (var i = 0; i < numElements; i++) {
+                var element = elements[i];
+                if (ts.isOmittedExpression(element)) {
+                    continue;
+                }
+                if (element.transformFlags & 8388608 && i < numElements - 1) {
+                    spreadContainingElements.push(element);
+                    bindingElements.push(ts.createBindingElement(undefined, undefined, ts.getGeneratedNameForNode(element), undefined, value));
+                }
+                else {
+                    bindingElements.push(element);
+                }
+            }
+            emitAssignment(ts.updateArrayBindingPattern(name, bindingElements), value, undefined, undefined);
+            for (var _i = 0, spreadContainingElements_1 = spreadContainingElements; _i < spreadContainingElements_1.length; _i++) {
+                var element = spreadContainingElements_1[_i];
+                emitBindingElement(element, ts.getGeneratedNameForNode(element));
+            }
+        }
+        function emitObjectBindingElement(target, value) {
+            var name = target.name;
+            var elements = name.elements;
+            var numElements = elements.length;
+            var bindingElements = [];
+            for (var i = 0; i < numElements; i++) {
+                var element = elements[i];
+                if (ts.isOmittedExpression(element)) {
+                    continue;
+                }
+                if (i === numElements - 1 && element.dotDotDotToken) {
+                    if (bindingElements.length) {
+                        emitRestAssignment(bindingElements, value, target, target);
+                        bindingElements = [];
+                    }
+                    var restCall = createRestCall(value, name.elements, function (element) { return element.propertyName || element.name; }, name);
+                    emitBindingElement(element, restCall);
+                }
+                else if (transformRest && !(element.transformFlags & 8388608)) {
+                    bindingElements.push(element);
+                }
+                else {
+                    if (bindingElements.length) {
+                        emitRestAssignment(bindingElements, value, target, target);
+                        bindingElements = [];
+                    }
+                    var propName = element.propertyName || element.name;
+                    emitBindingElement(element, createDestructuringPropertyAccess(value, propName));
+                }
+            }
+            if (bindingElements.length) {
+                emitRestAssignment(bindingElements, value, target, target);
+                bindingElements = [];
             }
         }
         function createDefaultValueCheck(value, defaultValue, location) {
@@ -36528,12 +38672,6 @@ var ts;
 var ts;
 (function (ts) {
     var USE_NEW_TYPE_METADATA_FORMAT = false;
-    var TypeScriptSubstitutionFlags;
-    (function (TypeScriptSubstitutionFlags) {
-        TypeScriptSubstitutionFlags[TypeScriptSubstitutionFlags["ClassAliases"] = 1] = "ClassAliases";
-        TypeScriptSubstitutionFlags[TypeScriptSubstitutionFlags["NamespaceExports"] = 2] = "NamespaceExports";
-        TypeScriptSubstitutionFlags[TypeScriptSubstitutionFlags["NonQualifiedEnumMembers"] = 8] = "NonQualifiedEnumMembers";
-    })(TypeScriptSubstitutionFlags || (TypeScriptSubstitutionFlags = {}));
     function transformTypeScript(context) {
         var startLexicalEnvironment = context.startLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration;
         var resolver = context.getEmitResolver();
@@ -36544,14 +38682,14 @@ var ts;
         var previousOnSubstituteNode = context.onSubstituteNode;
         context.onEmitNode = onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
-        context.enableSubstitution(173);
-        context.enableSubstitution(174);
+        context.enableSubstitution(177);
+        context.enableSubstitution(178);
         var currentSourceFile;
         var currentNamespace;
         var currentNamespaceContainerName;
         var currentScope;
         var currentScopeFirstDeclarationsOfName;
-        var currentSourceFileExternalHelpersModuleName;
+        var currentExternalHelpersModuleName;
         var enabledSubstitutions;
         var classAliases;
         var applicableSubstitutions;
@@ -36577,7 +38715,7 @@ var ts;
             return saveStateAndInvoke(node, visitorWorker);
         }
         function visitorWorker(node) {
-            if (node.kind === 256) {
+            if (node.kind === 261) {
                 return visitSourceFile(node);
             }
             else if (node.transformFlags & 1) {
@@ -36593,13 +38731,13 @@ var ts;
         }
         function sourceElementVisitorWorker(node) {
             switch (node.kind) {
-                case 231:
+                case 235:
                     return visitImportDeclaration(node);
-                case 230:
+                case 234:
                     return visitImportEqualsDeclaration(node);
-                case 236:
+                case 240:
                     return visitExportAssignment(node);
-                case 237:
+                case 241:
                     return visitExportDeclaration(node);
                 default:
                     return visitorWorker(node);
@@ -36609,11 +38747,11 @@ var ts;
             return saveStateAndInvoke(node, namespaceElementVisitorWorker);
         }
         function namespaceElementVisitorWorker(node) {
-            if (node.kind === 237 ||
-                node.kind === 231 ||
-                node.kind === 232 ||
-                (node.kind === 230 &&
-                    node.moduleReference.kind === 241)) {
+            if (node.kind === 241 ||
+                node.kind === 235 ||
+                node.kind === 236 ||
+                (node.kind === 234 &&
+                    node.moduleReference.kind === 245)) {
                 return undefined;
             }
             else if (node.transformFlags & 1 || ts.hasModifier(node, 1)) {
@@ -36629,21 +38767,30 @@ var ts;
         }
         function classElementVisitorWorker(node) {
             switch (node.kind) {
-                case 149:
-                    return undefined;
-                case 146:
-                case 154:
                 case 150:
+                    return undefined;
+                case 147:
+                case 155:
                 case 151:
-                case 148:
+                case 152:
+                case 149:
                     return visitorWorker(node);
-                case 199:
+                case 203:
                     return node;
                 default:
                     ts.Debug.failBadSyntaxKind(node);
                     return undefined;
             }
         }
+        function modifierVisitor(node) {
+            if (ts.modifierToFlag(node.kind) & 2270) {
+                return undefined;
+            }
+            else if (currentNamespace && node.kind === 83) {
+                return undefined;
+            }
+            return node;
+        }
         function visitTypeScript(node) {
             if (ts.hasModifier(node, 2) && ts.isStatement(node)) {
                 return ts.createNotEmittedStatement(node);
@@ -36658,78 +38805,81 @@ var ts;
                 case 116:
                 case 75:
                 case 123:
-                case 129:
-                case 161:
+                case 130:
                 case 162:
-                case 160:
-                case 155:
-                case 142:
+                case 163:
+                case 161:
+                case 156:
+                case 143:
                 case 118:
                 case 121:
-                case 133:
-                case 131:
-                case 128:
-                case 104:
                 case 134:
-                case 158:
-                case 157:
+                case 132:
+                case 129:
+                case 104:
+                case 135:
                 case 159:
-                case 156:
-                case 163:
+                case 158:
+                case 160:
+                case 157:
                 case 164:
                 case 165:
                 case 166:
                 case 167:
-                case 154:
-                case 144:
-                case 224:
-                case 146:
-                case 149:
-                    return visitConstructor(node);
-                case 223:
-                    return ts.createNotEmittedStatement(node);
-                case 222:
-                    return visitClassDeclaration(node);
-                case 193:
-                    return visitClassExpression(node);
-                case 251:
-                    return visitHeritageClause(node);
-                case 195:
-                    return visitExpressionWithTypeArguments(node);
-                case 148:
-                    return visitMethodDeclaration(node);
+                case 168:
+                case 169:
+                case 170:
+                case 171:
+                case 155:
+                case 145:
+                case 228:
+                case 147:
                 case 150:
-                    return visitGetAccessor(node);
-                case 151:
-                    return visitSetAccessor(node);
-                case 221:
-                    return visitFunctionDeclaration(node);
-                case 180:
-                    return visitFunctionExpression(node);
-                case 181:
-                    return visitArrowFunction(node);
-                case 143:
-                    return visitParameter(node);
-                case 179:
-                    return visitParenthesizedExpression(node);
-                case 178:
-                case 196:
-                    return visitAssertionExpression(node);
-                case 175:
-                    return visitCallExpression(node);
-                case 176:
-                    return visitNewExpression(node);
-                case 197:
-                    return visitNonNullExpression(node);
-                case 225:
-                    return visitEnumDeclaration(node);
-                case 201:
-                    return visitVariableStatement(node);
-                case 219:
-                    return visitVariableDeclaration(node);
+                    return visitConstructor(node);
+                case 227:
+                    return ts.createNotEmittedStatement(node);
                 case 226:
-                    return visitModuleDeclaration(node);
+                    return visitClassDeclaration(node);
+                case 197:
+                    return visitClassExpression(node);
+                case 255:
+                    return visitHeritageClause(node);
+                case 199:
+                    return visitExpressionWithTypeArguments(node);
+                case 149:
+                    return visitMethodDeclaration(node);
+                case 151:
+                    return visitGetAccessor(node);
+                case 152:
+                    return visitSetAccessor(node);
+                case 225:
+                    return visitFunctionDeclaration(node);
+                case 184:
+                    return visitFunctionExpression(node);
+                case 185:
+                    return visitArrowFunction(node);
+                case 144:
+                    return visitParameter(node);
+                case 183:
+                    return visitParenthesizedExpression(node);
+                case 182:
+                case 200:
+                    return visitAssertionExpression(node);
+                case 179:
+                    return visitCallExpression(node);
+                case 180:
+                    return visitNewExpression(node);
+                case 201:
+                    return visitNonNullExpression(node);
+                case 229:
+                    return visitEnumDeclaration(node);
+                case 205:
+                    return visitVariableStatement(node);
+                case 223:
+                    return visitVariableDeclaration(node);
                 case 230:
+                    return visitModuleDeclaration(node);
+                case 234:
                     return visitImportEqualsDeclaration(node);
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -36738,15 +38888,15 @@ var ts;
         }
         function onBeforeVisitNode(node) {
             switch (node.kind) {
-                case 256:
-                case 228:
-                case 227:
-                case 200:
+                case 261:
+                case 232:
+                case 231:
+                case 204:
                     currentScope = node;
                     currentScopeFirstDeclarationsOfName = undefined;
                     break;
-                case 222:
-                case 221:
+                case 226:
+                case 225:
                     if (ts.hasModifier(node, 2)) {
                         break;
                     }
@@ -36756,10 +38906,11 @@ var ts;
         }
         function visitSourceFile(node) {
             currentSourceFile = node;
-            if (compilerOptions.alwaysStrict) {
+            if (compilerOptions.alwaysStrict &&
+                !(ts.isExternalModule(node) && (compilerOptions.target >= 2 || compilerOptions.module === ts.ModuleKind.ES2015))) {
                 node = ts.ensureUseStrict(node);
             }
-            if (node.flags & 31744
+            if (node.flags & 64512
                 && compilerOptions.importHelpers
                 && (ts.isExternalModule(node) || compilerOptions.isolatedModules)) {
                 startLexicalEnvironment();
@@ -36770,10 +38921,10 @@ var ts;
                 externalHelpersModuleImport.parent = node;
                 externalHelpersModuleImport.flags &= ~8;
                 statements.push(externalHelpersModuleImport);
-                currentSourceFileExternalHelpersModuleName = externalHelpersModuleName;
+                currentExternalHelpersModuleName = externalHelpersModuleName;
                 ts.addRange(statements, ts.visitNodes(node.statements, sourceElementVisitor, ts.isStatement, statementOffset));
                 ts.addRange(statements, endLexicalEnvironment());
-                currentSourceFileExternalHelpersModuleName = undefined;
+                currentExternalHelpersModuleName = undefined;
                 node = ts.updateSourceFileNode(node, ts.createNodeArray(statements, node.statements));
                 node.externalHelpersModuleName = externalHelpersModuleName;
             }
@@ -36800,66 +38951,59 @@ var ts;
             var staticProperties = getInitializedProperties(node, true);
             var hasExtendsClause = ts.getClassExtendsHeritageClauseElement(node) !== undefined;
             var isDecoratedClass = shouldEmitDecorateCallForClass(node);
-            var classAlias;
             var name = node.name;
             if (!name && staticProperties.length > 0) {
                 name = ts.getGeneratedNameForNode(node);
             }
-            var statements = [];
-            if (!isDecoratedClass) {
-                var classDeclaration = ts.createClassDeclaration(undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), name, undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, hasExtendsClause), node);
-                ts.setOriginalNode(classDeclaration, node);
-                if (staticProperties.length > 0) {
-                    ts.setEmitFlags(classDeclaration, 1024 | ts.getEmitFlags(classDeclaration));
-                }
-                statements.push(classDeclaration);
-            }
-            else {
-                classAlias = addClassDeclarationHeadWithDecorators(statements, node, name, hasExtendsClause);
-            }
+            var classStatement = isDecoratedClass
+                ? createClassDeclarationHeadWithDecorators(node, name, hasExtendsClause)
+                : createClassDeclarationHeadWithoutDecorators(node, name, hasExtendsClause, staticProperties.length > 0);
+            var statements = [classStatement];
             if (staticProperties.length) {
-                addInitializedPropertyStatements(statements, staticProperties, getLocalName(node, true));
+                addInitializedPropertyStatements(statements, staticProperties, ts.getLocalName(node));
             }
             addClassElementDecorationStatements(statements, node, false);
             addClassElementDecorationStatements(statements, node, true);
-            addConstructorDecorationStatement(statements, node, classAlias);
+            addConstructorDecorationStatement(statements, node);
             if (isNamespaceExport(node)) {
                 addExportMemberAssignment(statements, node);
             }
             else if (isDecoratedClass) {
                 if (isDefaultExternalModuleExport(node)) {
-                    statements.push(ts.createExportAssignment(undefined, undefined, false, getLocalName(node)));
+                    statements.push(ts.createExportDefault(ts.getLocalName(node, false, true)));
                 }
                 else if (isNamedExternalModuleExport(node)) {
-                    statements.push(createExternalModuleExport(name));
+                    statements.push(ts.createExternalModuleExport(ts.getLocalName(node, false, true)));
                 }
             }
-            return statements;
+            if (statements.length > 1) {
+                statements.push(ts.createEndOfDeclarationMarker(node));
+                ts.setEmitFlags(classStatement, ts.getEmitFlags(classStatement) | 33554432);
+            }
+            return ts.singleOrMany(statements);
         }
-        function addClassDeclarationHeadWithDecorators(statements, node, name, hasExtendsClause) {
+        function createClassDeclarationHeadWithoutDecorators(node, name, hasExtendsClause, hasStaticProperties) {
+            var classDeclaration = ts.createClassDeclaration(undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), name, undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, hasExtendsClause), node);
+            var emitFlags = ts.getEmitFlags(node);
+            if (hasStaticProperties) {
+                emitFlags |= 1024;
+            }
+            ts.setOriginalNode(classDeclaration, node);
+            ts.setEmitFlags(classDeclaration, emitFlags);
+            return classDeclaration;
+        }
+        function createClassDeclarationHeadWithDecorators(node, name, hasExtendsClause) {
             var location = ts.moveRangePastDecorators(node);
-            var classExpression = ts.setOriginalNode(ts.createClassExpression(undefined, name, undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, hasExtendsClause), location), node);
-            if (!name) {
-                name = ts.getGeneratedNameForNode(node);
-            }
-            var classAlias;
-            if (resolver.getNodeCheckFlags(node) & 8388608) {
-                enableSubstitutionForClassAliases();
-                classAlias = ts.createUniqueName(node.name && !ts.isGeneratedIdentifier(node.name) ? node.name.text : "default");
-                classAliases[ts.getOriginalNodeId(node)] = classAlias;
-            }
-            var declaredName = getDeclarationName(node, true);
-            var transformedClassExpression = ts.createVariableStatement(undefined, ts.createLetDeclarationList([
-                ts.createVariableDeclaration(classAlias || declaredName, undefined, classExpression)
-            ]), location);
-            ts.setCommentRange(transformedClassExpression, node);
-            statements.push(ts.setOriginalNode(transformedClassExpression, node));
-            if (classAlias) {
-                statements.push(ts.setOriginalNode(ts.createVariableStatement(undefined, ts.createLetDeclarationList([
-                    ts.createVariableDeclaration(declaredName, undefined, classAlias)
-                ]), location), node));
-            }
-            return classAlias;
+            var classAlias = getClassAliasIfNeeded(node);
+            var declName = ts.getLocalName(node, false, true);
+            var heritageClauses = ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause);
+            var members = transformClassMembers(node, hasExtendsClause);
+            var classExpression = ts.createClassExpression(undefined, name, undefined, heritageClauses, members, location);
+            ts.setOriginalNode(classExpression, node);
+            var statement = ts.createLetStatement(declName, classAlias ? ts.createAssignment(classAlias, classExpression) : classExpression, location);
+            ts.setOriginalNode(statement, node);
+            ts.setCommentRange(statement, node);
+            return statement;
         }
         function visitClassExpression(node) {
             var staticProperties = getInitializedProperties(node, true);
@@ -36892,7 +39036,7 @@ var ts;
         }
         function transformConstructor(node, hasExtendsClause) {
             var hasInstancePropertyWithInitializer = ts.forEach(node.members, isInstanceInitializedProperty);
-            var hasParameterPropertyAssignments = node.transformFlags & 524288;
+            var hasParameterPropertyAssignments = node.transformFlags & 4194304;
             var constructor = ts.getFirstConstructorWithBody(node);
             if (!hasInstancePropertyWithInitializer && !hasParameterPropertyAssignments) {
                 return ts.visitEachChild(constructor, visitor, context);
@@ -36934,7 +39078,7 @@ var ts;
                     return index;
                 }
                 var statement = statements[index];
-                if (statement.kind === 203 && ts.isSuperCall(statement.expression)) {
+                if (statement.kind === 207 && ts.isSuperCall(statement.expression)) {
                     result.push(ts.visitNode(statement, visitor, ts.isStatement));
                     return index + 1;
                 }
@@ -36968,7 +39112,7 @@ var ts;
             return isInitializedProperty(member, false);
         }
         function isInitializedProperty(member, isStatic) {
-            return member.kind === 146
+            return member.kind === 147
                 && isStatic === ts.hasModifier(member, 32)
                 && member.initializer !== undefined;
         }
@@ -37041,12 +39185,12 @@ var ts;
         }
         function getAllDecoratorsOfClassElement(node, member) {
             switch (member.kind) {
-                case 150:
                 case 151:
+                case 152:
                     return getAllDecoratorsOfAccessors(node, member);
-                case 148:
+                case 149:
                     return getAllDecoratorsOfMethod(member);
-                case 146:
+                case 147:
                     return getAllDecoratorsOfProperty(member);
                 default:
                     return undefined;
@@ -37124,37 +39268,33 @@ var ts;
             var prefix = getClassMemberPrefix(node, member);
             var memberName = getExpressionForPropertyName(member, true);
             var descriptor = languageVersion > 0
-                ? member.kind === 146
+                ? member.kind === 147
                     ? ts.createVoidZero()
                     : ts.createNull()
                 : undefined;
-            var helper = ts.createDecorateHelper(currentSourceFileExternalHelpersModuleName, decoratorExpressions, prefix, memberName, descriptor, ts.moveRangePastDecorators(member));
+            var helper = ts.createDecorateHelper(currentExternalHelpersModuleName, decoratorExpressions, prefix, memberName, descriptor, ts.moveRangePastDecorators(member));
             ts.setEmitFlags(helper, 49152);
             return helper;
         }
-        function addConstructorDecorationStatement(statements, node, decoratedClassAlias) {
-            var expression = generateConstructorDecorationExpression(node, decoratedClassAlias);
+        function addConstructorDecorationStatement(statements, node) {
+            var expression = generateConstructorDecorationExpression(node);
             if (expression) {
                 statements.push(ts.setOriginalNode(ts.createStatement(expression), node));
             }
         }
-        function generateConstructorDecorationExpression(node, decoratedClassAlias) {
+        function generateConstructorDecorationExpression(node) {
             var allDecorators = getAllDecoratorsOfConstructor(node);
             var decoratorExpressions = transformAllDecoratorsOfDeclaration(node, allDecorators);
             if (!decoratorExpressions) {
                 return undefined;
             }
-            if (decoratedClassAlias) {
-                var expression = ts.createAssignment(decoratedClassAlias, ts.createDecorateHelper(currentSourceFileExternalHelpersModuleName, decoratorExpressions, getDeclarationName(node)));
-                var result = ts.createAssignment(getDeclarationName(node), expression, ts.moveRangePastDecorators(node));
-                ts.setEmitFlags(result, 49152);
-                return result;
-            }
-            else {
-                var result = ts.createAssignment(getDeclarationName(node), ts.createDecorateHelper(currentSourceFileExternalHelpersModuleName, decoratorExpressions, getDeclarationName(node)), ts.moveRangePastDecorators(node));
-                ts.setEmitFlags(result, 49152);
-                return result;
-            }
+            var classAlias = classAliases && classAliases[ts.getOriginalNodeId(node)];
+            var localName = ts.getLocalName(node, false, true);
+            var decorate = ts.createDecorateHelper(currentExternalHelpersModuleName, decoratorExpressions, localName);
+            var expression = ts.createAssignment(localName, classAlias ? ts.createAssignment(classAlias, decorate) : decorate);
+            ts.setEmitFlags(expression, 49152);
+            ts.setSourceMapRange(expression, ts.moveRangePastDecorators(node));
+            return expression;
         }
         function transformDecorator(decorator) {
             return ts.visitNode(decorator.expression, visitor, ts.isExpression);
@@ -37165,7 +39305,7 @@ var ts;
                 expressions = [];
                 for (var _i = 0, decorators_1 = decorators; _i < decorators_1.length; _i++) {
                     var decorator = decorators_1[_i];
-                    var helper = ts.createParamHelper(currentSourceFileExternalHelpersModuleName, transformDecorator(decorator), parameterOffset, decorator.expression);
+                    var helper = ts.createParamHelper(currentExternalHelpersModuleName, transformDecorator(decorator), parameterOffset, decorator.expression);
                     ts.setEmitFlags(helper, 49152);
                     expressions.push(helper);
                 }
@@ -37183,13 +39323,13 @@ var ts;
         function addOldTypeMetadata(node, decoratorExpressions) {
             if (compilerOptions.emitDecoratorMetadata) {
                 if (shouldAddTypeMetadata(node)) {
-                    decoratorExpressions.push(ts.createMetadataHelper(currentSourceFileExternalHelpersModuleName, "design:type", serializeTypeOfNode(node)));
+                    decoratorExpressions.push(ts.createMetadataHelper(currentExternalHelpersModuleName, "design:type", serializeTypeOfNode(node)));
                 }
                 if (shouldAddParamTypesMetadata(node)) {
-                    decoratorExpressions.push(ts.createMetadataHelper(currentSourceFileExternalHelpersModuleName, "design:paramtypes", serializeParameterTypesOfNode(node)));
+                    decoratorExpressions.push(ts.createMetadataHelper(currentExternalHelpersModuleName, "design:paramtypes", serializeParameterTypesOfNode(node)));
                 }
                 if (shouldAddReturnTypeMetadata(node)) {
-                    decoratorExpressions.push(ts.createMetadataHelper(currentSourceFileExternalHelpersModuleName, "design:returntype", serializeReturnTypeOfNode(node)));
+                    decoratorExpressions.push(ts.createMetadataHelper(currentExternalHelpersModuleName, "design:returntype", serializeReturnTypeOfNode(node)));
                 }
             }
         }
@@ -37197,58 +39337,58 @@ var ts;
             if (compilerOptions.emitDecoratorMetadata) {
                 var properties = void 0;
                 if (shouldAddTypeMetadata(node)) {
-                    (properties || (properties = [])).push(ts.createPropertyAssignment("type", ts.createArrowFunction(undefined, undefined, [], undefined, undefined, serializeTypeOfNode(node))));
+                    (properties || (properties = [])).push(ts.createPropertyAssignment("type", ts.createArrowFunction(undefined, undefined, [], undefined, ts.createToken(35), serializeTypeOfNode(node))));
                 }
                 if (shouldAddParamTypesMetadata(node)) {
-                    (properties || (properties = [])).push(ts.createPropertyAssignment("paramTypes", ts.createArrowFunction(undefined, undefined, [], undefined, undefined, serializeParameterTypesOfNode(node))));
+                    (properties || (properties = [])).push(ts.createPropertyAssignment("paramTypes", ts.createArrowFunction(undefined, undefined, [], undefined, ts.createToken(35), serializeParameterTypesOfNode(node))));
                 }
                 if (shouldAddReturnTypeMetadata(node)) {
-                    (properties || (properties = [])).push(ts.createPropertyAssignment("returnType", ts.createArrowFunction(undefined, undefined, [], undefined, undefined, serializeReturnTypeOfNode(node))));
+                    (properties || (properties = [])).push(ts.createPropertyAssignment("returnType", ts.createArrowFunction(undefined, undefined, [], undefined, ts.createToken(35), serializeReturnTypeOfNode(node))));
                 }
                 if (properties) {
-                    decoratorExpressions.push(ts.createMetadataHelper(currentSourceFileExternalHelpersModuleName, "design:typeinfo", ts.createObjectLiteral(properties, undefined, true)));
+                    decoratorExpressions.push(ts.createMetadataHelper(currentExternalHelpersModuleName, "design:typeinfo", ts.createObjectLiteral(properties, undefined, true)));
                 }
             }
         }
         function shouldAddTypeMetadata(node) {
             var kind = node.kind;
-            return kind === 148
-                || kind === 150
+            return kind === 149
                 || kind === 151
-                || kind === 146;
+                || kind === 152
+                || kind === 147;
         }
         function shouldAddReturnTypeMetadata(node) {
-            return node.kind === 148;
+            return node.kind === 149;
         }
         function shouldAddParamTypesMetadata(node) {
             var kind = node.kind;
-            return kind === 222
-                || kind === 193
-                || kind === 148
-                || kind === 150
-                || kind === 151;
+            return kind === 226
+                || kind === 197
+                || kind === 149
+                || kind === 151
+                || kind === 152;
         }
         function serializeTypeOfNode(node) {
             switch (node.kind) {
-                case 146:
-                case 143:
-                case 150:
-                    return serializeTypeNode(node.type);
+                case 147:
+                case 144:
                 case 151:
+                    return serializeTypeNode(node.type);
+                case 152:
                     return serializeTypeNode(ts.getSetAccessorTypeAnnotationNode(node));
-                case 222:
-                case 193:
-                case 148:
+                case 226:
+                case 197:
+                case 149:
                     return ts.createIdentifier("Function");
                 default:
                     return ts.createVoidZero();
             }
         }
         function getRestParameterElementType(node) {
-            if (node && node.kind === 161) {
+            if (node && node.kind === 162) {
                 return node.elementType;
             }
-            else if (node && node.kind === 156) {
+            else if (node && node.kind === 157) {
                 return ts.singleOrUndefined(node.typeArguments);
             }
             else {
@@ -37296,20 +39436,20 @@ var ts;
             switch (node.kind) {
                 case 104:
                     return ts.createVoidZero();
-                case 165:
+                case 166:
                     return serializeTypeNode(node.type);
-                case 157:
                 case 158:
+                case 159:
                     return ts.createIdentifier("Function");
-                case 161:
                 case 162:
+                case 163:
                     return ts.createIdentifier("Array");
-                case 155:
+                case 156:
                 case 121:
                     return ts.createIdentifier("Boolean");
-                case 133:
+                case 134:
                     return ts.createIdentifier("String");
-                case 167:
+                case 171:
                     switch (node.literal.kind) {
                         case 9:
                             return ts.createIdentifier("String");
@@ -37323,16 +39463,16 @@ var ts;
                             break;
                     }
                     break;
-                case 131:
+                case 132:
                     return ts.createIdentifier("Number");
-                case 134:
+                case 135:
                     return languageVersion < 2
                         ? getGlobalSymbolNameWithFallback()
                         : ts.createIdentifier("Symbol");
-                case 156:
+                case 157:
                     return serializeTypeReferenceNode(node);
+                case 165:
                 case 164:
-                case 163:
                     {
                         var unionOrIntersection = node;
                         var serializedUnion = void 0;
@@ -37356,10 +39496,13 @@ var ts;
                             return serializedUnion;
                         }
                     }
-                case 159:
                 case 160:
+                case 168:
+                case 169:
+                case 170:
+                case 161:
                 case 118:
-                case 166:
+                case 167:
                     break;
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -37401,15 +39544,15 @@ var ts;
         function serializeEntityNameAsExpression(node, useFallback) {
             switch (node.kind) {
                 case 70:
-                    var name_27 = ts.getMutableClone(node);
-                    name_27.flags &= ~8;
-                    name_27.original = undefined;
-                    name_27.parent = currentScope;
+                    var name_33 = ts.getMutableClone(node);
+                    name_33.flags &= ~8;
+                    name_33.original = undefined;
+                    name_33.parent = currentScope;
                     if (useFallback) {
-                        return ts.createLogicalAnd(ts.createStrictInequality(ts.createTypeOf(name_27), ts.createLiteral("undefined")), name_27);
+                        return ts.createLogicalAnd(ts.createStrictInequality(ts.createTypeOf(name_33), ts.createLiteral("undefined")), name_33);
                     }
-                    return name_27;
-                case 140:
+                    return name_33;
+                case 141:
                     return serializeQualifiedNameAsExpression(node, useFallback);
             }
         }
@@ -37483,7 +39626,7 @@ var ts;
             if (!shouldEmitFunctionLikeDeclaration(node)) {
                 return undefined;
             }
-            var method = ts.createMethod(undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.asteriskToken, visitPropertyNameOfClassElement(node), undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, transformFunctionBody(node), node);
+            var method = ts.createMethod(undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, visitPropertyNameOfClassElement(node), undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, transformFunctionBody(node), node);
             ts.setCommentRange(method, node);
             ts.setSourceMapRange(method, ts.moveRangePastDecorators(node));
             ts.setOriginalNode(method, node);
@@ -37496,27 +39639,27 @@ var ts;
             if (!shouldEmitAccessorDeclaration(node)) {
                 return undefined;
             }
-            var accessor = ts.createGetAccessor(undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), visitPropertyNameOfClassElement(node), ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, node.body ? ts.visitEachChild(node.body, visitor, context) : ts.createBlock([]), node);
+            var accessor = ts.createGetAccessor(undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), visitPropertyNameOfClassElement(node), ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, node.body ? ts.visitEachChild(node.body, visitor, context) : ts.createBlock([]), node);
+            ts.setOriginalNode(accessor, node);
             ts.setCommentRange(accessor, node);
             ts.setSourceMapRange(accessor, ts.moveRangePastDecorators(node));
-            ts.setOriginalNode(accessor, node);
             return accessor;
         }
         function visitSetAccessor(node) {
             if (!shouldEmitAccessorDeclaration(node)) {
                 return undefined;
             }
-            var accessor = ts.createSetAccessor(undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), visitPropertyNameOfClassElement(node), ts.visitNodes(node.parameters, visitor, ts.isParameter), node.body ? ts.visitEachChild(node.body, visitor, context) : ts.createBlock([]), node);
+            var accessor = ts.createSetAccessor(undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), visitPropertyNameOfClassElement(node), ts.visitNodes(node.parameters, visitor, ts.isParameter), node.body ? ts.visitEachChild(node.body, visitor, context) : ts.createBlock([]), node);
+            ts.setOriginalNode(accessor, node);
             ts.setCommentRange(accessor, node);
             ts.setSourceMapRange(accessor, ts.moveRangePastDecorators(node));
-            ts.setOriginalNode(accessor, node);
             return accessor;
         }
         function visitFunctionDeclaration(node) {
             if (!shouldEmitFunctionLikeDeclaration(node)) {
                 return ts.createNotEmittedStatement(node);
             }
-            var func = ts.createFunctionDeclaration(undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.asteriskToken, node.name, undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, transformFunctionBody(node), node);
+            var func = ts.createFunctionDeclaration(undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, node.name, undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, transformFunctionBody(node), node);
             ts.setOriginalNode(func, node);
             if (isNamespaceExport(node)) {
                 var statements = [func];
@@ -37529,12 +39672,12 @@ var ts;
             if (ts.nodeIsMissing(node.body)) {
                 return ts.createOmittedExpression();
             }
-            var func = ts.createFunctionExpression(ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.asteriskToken, node.name, undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, transformFunctionBody(node), node);
+            var func = ts.createFunctionExpression(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, node.name, undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, transformFunctionBody(node), node);
             ts.setOriginalNode(func, node);
             return func;
         }
         function visitArrowFunction(node) {
-            var func = ts.createArrowFunction(ts.visitNodes(node.modifiers, visitor, ts.isModifier), undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, node.equalsGreaterThanToken, transformConciseBody(node), node);
+            var func = ts.createArrowFunction(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, node.equalsGreaterThanToken, transformConciseBody(node), node);
             ts.setOriginalNode(func, node);
             return func;
         }
@@ -37581,7 +39724,7 @@ var ts;
             if (ts.parameterIsThisKeyword(node)) {
                 return undefined;
             }
-            var parameter = ts.createParameterDeclaration(undefined, undefined, node.dotDotDotToken, ts.visitNode(node.name, visitor, ts.isBindingName), undefined, undefined, ts.visitNode(node.initializer, visitor, ts.isExpression), ts.moveRangePastModifiers(node));
+            var parameter = ts.createParameter(undefined, undefined, node.dotDotDotToken, ts.visitNode(node.name, visitor, ts.isBindingName), undefined, undefined, ts.visitNode(node.initializer, visitor, ts.isExpression), ts.moveRangePastModifiers(node));
             ts.setOriginalNode(parameter, node);
             ts.setCommentRange(parameter, node);
             ts.setSourceMapRange(parameter, ts.moveRangePastModifiers(node));
@@ -37603,7 +39746,7 @@ var ts;
         function transformInitializedVariable(node) {
             var name = node.name;
             if (ts.isBindingPattern(name)) {
-                return ts.flattenVariableDestructuringToExpression(node, hoistVariableDeclaration, getNamespaceMemberNameWithSourceMapsAndWithoutComments, visitor);
+                return ts.flattenVariableDestructuringToExpression(node, hoistVariableDeclaration, createNamespaceExportExpression, visitor);
             }
             else {
                 return ts.createAssignment(getNamespaceMemberNameWithSourceMapsAndWithoutComments(name), ts.visitNode(node.initializer, visitor, ts.isExpression), node);
@@ -37639,39 +39782,32 @@ var ts;
                 || compilerOptions.preserveConstEnums
                 || compilerOptions.isolatedModules;
         }
-        function shouldEmitVarForEnumDeclaration(node) {
-            return isFirstEmittedDeclarationInScope(node)
-                && (!ts.hasModifier(node, 1)
-                    || isES6ExportedDeclaration(node));
-        }
-        function addVarForEnumExportedFromNamespace(statements, node) {
-            var statement = ts.createVariableStatement(undefined, [ts.createVariableDeclaration(getDeclarationName(node), undefined, getExportName(node))]);
-            ts.setSourceMapRange(statement, node);
-            statements.push(statement);
-        }
         function visitEnumDeclaration(node) {
             if (!shouldEmitEnumDeclaration(node)) {
                 return undefined;
             }
             var statements = [];
             var emitFlags = 64;
-            recordEmittedDeclarationInScope(node);
-            if (shouldEmitVarForEnumDeclaration(node)) {
-                addVarForEnumOrModuleDeclaration(statements, node);
+            if (addVarForEnumOrModuleDeclaration(statements, node)) {
                 if (moduleKind !== ts.ModuleKind.System || currentScope !== currentSourceFile) {
                     emitFlags |= 16384;
                 }
             }
             var parameterName = getNamespaceParameterName(node);
             var containerName = getNamespaceContainerName(node);
-            var exportName = getExportName(node);
-            var enumStatement = ts.createStatement(ts.createCall(ts.createFunctionExpression(undefined, undefined, undefined, undefined, [ts.createParameter(parameterName)], undefined, transformEnumBody(node, containerName)), undefined, [ts.createLogicalOr(exportName, ts.createAssignment(exportName, ts.createObjectLiteral()))]), node);
+            var exportName = ts.hasModifier(node, 1)
+                ? ts.getExternalModuleOrNamespaceExportName(currentNamespaceContainerName, node, false, true)
+                : ts.getLocalName(node, false, true);
+            var moduleArg = ts.createLogicalOr(exportName, ts.createAssignment(exportName, ts.createObjectLiteral()));
+            if (hasNamespaceQualifiedExportName(node)) {
+                var localName = ts.getLocalName(node, false, true);
+                moduleArg = ts.createAssignment(localName, moduleArg);
+            }
+            var enumStatement = ts.createStatement(ts.createCall(ts.createFunctionExpression(undefined, undefined, undefined, undefined, [ts.createParameter(undefined, undefined, undefined, parameterName)], undefined, transformEnumBody(node, containerName)), undefined, [moduleArg]), node);
             ts.setOriginalNode(enumStatement, node);
             ts.setEmitFlags(enumStatement, emitFlags);
             statements.push(enumStatement);
-            if (isNamespaceExport(node)) {
-                addVarForEnumExportedFromNamespace(statements, node);
-            }
+            statements.push(ts.createEndOfDeclarationMarker(node));
             return statements;
         }
         function transformEnumBody(node, localName) {
@@ -37706,9 +39842,11 @@ var ts;
         function shouldEmitModuleDeclaration(node) {
             return ts.isInstantiatedModule(node, compilerOptions.preserveConstEnums || compilerOptions.isolatedModules);
         }
-        function isES6ExportedDeclaration(node) {
-            return isExternalModuleExport(node)
-                && moduleKind === ts.ModuleKind.ES2015;
+        function hasNamespaceQualifiedExportName(node) {
+            return isNamespaceExport(node)
+                || (isExternalModuleExport(node)
+                    && moduleKind !== ts.ModuleKind.ES2015
+                    && moduleKind !== ts.ModuleKind.System);
         }
         function recordEmittedDeclarationInScope(node) {
             var name = node.symbol && node.symbol.name;
@@ -37723,32 +39861,37 @@ var ts;
         }
         function isFirstEmittedDeclarationInScope(node) {
             if (currentScopeFirstDeclarationsOfName) {
-                var name_28 = node.symbol && node.symbol.name;
-                if (name_28) {
-                    return currentScopeFirstDeclarationsOfName[name_28] === node;
+                var name_34 = node.symbol && node.symbol.name;
+                if (name_34) {
+                    return currentScopeFirstDeclarationsOfName[name_34] === node;
                 }
             }
             return false;
         }
-        function shouldEmitVarForModuleDeclaration(node) {
-            return isFirstEmittedDeclarationInScope(node);
-        }
         function addVarForEnumOrModuleDeclaration(statements, node) {
-            var statement = ts.createVariableStatement(isES6ExportedDeclaration(node)
-                ? ts.visitNodes(node.modifiers, visitor, ts.isModifier)
-                : undefined, [
-                ts.createVariableDeclaration(getDeclarationName(node, false, true))
+            var statement = ts.createVariableStatement(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), [
+                ts.createVariableDeclaration(ts.getLocalName(node, false, true))
             ]);
             ts.setOriginalNode(statement, node);
-            if (node.kind === 225) {
-                ts.setSourceMapRange(statement.declarationList, node);
+            recordEmittedDeclarationInScope(node);
+            if (isFirstEmittedDeclarationInScope(node)) {
+                if (node.kind === 229) {
+                    ts.setSourceMapRange(statement.declarationList, node);
+                }
+                else {
+                    ts.setSourceMapRange(statement, node);
+                }
+                ts.setCommentRange(statement, node);
+                ts.setEmitFlags(statement, 32768 | 33554432);
+                statements.push(statement);
+                return true;
             }
             else {
-                ts.setSourceMapRange(statement, node);
+                var mergeMarker = ts.createMergeDeclarationMarker(statement);
+                ts.setEmitFlags(mergeMarker, 49152 | 33554432);
+                statements.push(mergeMarker);
+                return false;
             }
-            ts.setCommentRange(statement, node);
-            ts.setEmitFlags(statement, 32768);
-            statements.push(statement);
         }
         function visitModuleDeclaration(node) {
             if (!shouldEmitModuleDeclaration(node)) {
@@ -37758,25 +39901,26 @@ var ts;
             enableSubstitutionForNamespaceExports();
             var statements = [];
             var emitFlags = 64;
-            recordEmittedDeclarationInScope(node);
-            if (shouldEmitVarForModuleDeclaration(node)) {
-                addVarForEnumOrModuleDeclaration(statements, node);
+            if (addVarForEnumOrModuleDeclaration(statements, node)) {
                 if (moduleKind !== ts.ModuleKind.System || currentScope !== currentSourceFile) {
                     emitFlags |= 16384;
                 }
             }
             var parameterName = getNamespaceParameterName(node);
             var containerName = getNamespaceContainerName(node);
-            var exportName = getExportName(node);
+            var exportName = ts.hasModifier(node, 1)
+                ? ts.getExternalModuleOrNamespaceExportName(currentNamespaceContainerName, node, false, true)
+                : ts.getLocalName(node, false, true);
             var moduleArg = ts.createLogicalOr(exportName, ts.createAssignment(exportName, ts.createObjectLiteral()));
-            if (ts.hasModifier(node, 1) && !isES6ExportedDeclaration(node)) {
-                var localName = getLocalName(node);
+            if (hasNamespaceQualifiedExportName(node)) {
+                var localName = ts.getLocalName(node, false, true);
                 moduleArg = ts.createAssignment(localName, moduleArg);
             }
-            var moduleStatement = ts.createStatement(ts.createCall(ts.createFunctionExpression(undefined, undefined, undefined, undefined, [ts.createParameter(parameterName)], undefined, transformModuleBody(node, containerName)), undefined, [moduleArg]), node);
+            var moduleStatement = ts.createStatement(ts.createCall(ts.createFunctionExpression(undefined, undefined, undefined, undefined, [ts.createParameter(undefined, undefined, undefined, parameterName)], undefined, transformModuleBody(node, containerName)), undefined, [moduleArg]), node);
             ts.setOriginalNode(moduleStatement, node);
             ts.setEmitFlags(moduleStatement, emitFlags);
             statements.push(moduleStatement);
+            statements.push(ts.createEndOfDeclarationMarker(node));
             return statements;
         }
         function transformModuleBody(node, namespaceLocalName) {
@@ -37791,7 +39935,7 @@ var ts;
             var statementsLocation;
             var blockLocation;
             var body = node.body;
-            if (body.kind === 227) {
+            if (body.kind === 231) {
                 ts.addRange(statements, ts.visitNodes(body.statements, namespaceElementVisitor, ts.isStatement));
                 statementsLocation = body.statements;
                 blockLocation = body;
@@ -37814,13 +39958,13 @@ var ts;
             currentNamespace = savedCurrentNamespace;
             currentScopeFirstDeclarationsOfName = savedCurrentScopeFirstDeclarationsOfName;
             var block = ts.createBlock(ts.createNodeArray(statements, statementsLocation), blockLocation, true);
-            if (body.kind !== 227) {
+            if (body.kind !== 231) {
                 ts.setEmitFlags(block, ts.getEmitFlags(block) | 49152);
             }
             return block;
         }
         function getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration) {
-            if (moduleDeclaration.body.kind === 226) {
+            if (moduleDeclaration.body.kind === 230) {
                 var recursiveInnerModule = getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration.body);
                 return recursiveInnerModule || moduleDeclaration.body;
             }
@@ -37840,7 +39984,7 @@ var ts;
             return (name || namedBindings) ? ts.updateImportClause(node, name, namedBindings) : undefined;
         }
         function visitNamedImportBindings(node) {
-            if (node.kind === 233) {
+            if (node.kind === 237) {
                 return resolver.isReferencedAliasDeclaration(node) ? node : undefined;
             }
             else {
@@ -37892,8 +40036,8 @@ var ts;
             var moduleReference = ts.createExpressionFromEntityName(node.moduleReference);
             ts.setEmitFlags(moduleReference, 49152 | 65536);
             if (isNamedExternalModuleExport(node) || !isNamespaceExport(node)) {
-                return ts.setOriginalNode(ts.createVariableStatement(ts.visitNodes(node.modifiers, visitor, ts.isModifier), ts.createVariableDeclarationList([
-                    ts.createVariableDeclaration(node.name, undefined, moduleReference)
+                return ts.setOriginalNode(ts.createVariableStatement(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), ts.createVariableDeclarationList([
+                    ts.setOriginalNode(ts.createVariableDeclaration(node.name, undefined, moduleReference), node)
                 ]), node), node);
             }
             else {
@@ -37918,36 +40062,20 @@ var ts;
             return ts.createStatement(expression, undefined);
         }
         function addExportMemberAssignment(statements, node) {
-            var expression = ts.createAssignment(getExportName(node), getLocalName(node, true));
+            var expression = ts.createAssignment(ts.getExternalModuleOrNamespaceExportName(currentNamespaceContainerName, node, false, true), ts.getLocalName(node));
             ts.setSourceMapRange(expression, ts.createRange(node.name.pos, node.end));
             var statement = ts.createStatement(expression);
             ts.setSourceMapRange(statement, ts.createRange(-1, node.end));
             statements.push(statement);
         }
         function createNamespaceExport(exportName, exportValue, location) {
-            return ts.createStatement(ts.createAssignment(getNamespaceMemberName(exportName, false, true), exportValue), location);
+            return ts.createStatement(ts.createAssignment(ts.getNamespaceMemberName(currentNamespaceContainerName, exportName, false, true), exportValue), location);
         }
-        function createExternalModuleExport(exportName) {
-            return ts.createExportDeclaration(undefined, undefined, ts.createNamedExports([
-                ts.createExportSpecifier(exportName)
-            ]));
-        }
-        function getNamespaceMemberName(name, allowComments, allowSourceMaps) {
-            var qualifiedName = ts.createPropertyAccess(currentNamespaceContainerName, ts.getSynthesizedClone(name), name);
-            var emitFlags;
-            if (!allowComments) {
-                emitFlags |= 49152;
-            }
-            if (!allowSourceMaps) {
-                emitFlags |= 1536;
-            }
-            if (emitFlags) {
-                ts.setEmitFlags(qualifiedName, emitFlags);
-            }
-            return qualifiedName;
+        function createNamespaceExportExpression(exportName, exportValue, location) {
+            return ts.createAssignment(getNamespaceMemberNameWithSourceMapsAndWithoutComments(exportName), exportValue, location);
         }
         function getNamespaceMemberNameWithSourceMapsAndWithoutComments(name) {
-            return getNamespaceMemberName(name, false, true);
+            return ts.getNamespaceMemberName(currentNamespaceContainerName, name, false, true);
         }
         function getNamespaceParameterName(node) {
             var name = ts.getGeneratedNameForNode(node);
@@ -37957,40 +40085,21 @@ var ts;
         function getNamespaceContainerName(node) {
             return ts.getGeneratedNameForNode(node);
         }
-        function getLocalName(node, noSourceMaps, allowComments) {
-            return getDeclarationName(node, allowComments, !noSourceMaps, 262144);
-        }
-        function getExportName(node, noSourceMaps, allowComments) {
-            if (isNamespaceExport(node)) {
-                return getNamespaceMemberName(getDeclarationName(node), allowComments, !noSourceMaps);
-            }
-            return getDeclarationName(node, allowComments, !noSourceMaps, 131072);
-        }
-        function getDeclarationName(node, allowComments, allowSourceMaps, emitFlags) {
-            if (node.name) {
-                var name_29 = ts.getMutableClone(node.name);
-                emitFlags |= ts.getEmitFlags(node.name);
-                if (!allowSourceMaps) {
-                    emitFlags |= 1536;
-                }
-                if (!allowComments) {
-                    emitFlags |= 49152;
-                }
-                if (emitFlags) {
-                    ts.setEmitFlags(name_29, emitFlags);
-                }
-                return name_29;
-            }
-            else {
-                return ts.getGeneratedNameForNode(node);
+        function getClassAliasIfNeeded(node) {
+            if (resolver.getNodeCheckFlags(node) & 8388608) {
+                enableSubstitutionForClassAliases();
+                var classAlias = ts.createUniqueName(node.name && !ts.isGeneratedIdentifier(node.name) ? node.name.text : "default");
+                classAliases[ts.getOriginalNodeId(node)] = classAlias;
+                hoistVariableDeclaration(classAlias);
+                return classAlias;
             }
         }
         function getClassPrototype(node) {
-            return ts.createPropertyAccess(getDeclarationName(node), "prototype");
+            return ts.createPropertyAccess(ts.getDeclarationName(node), "prototype");
         }
         function getClassMemberPrefix(node, member) {
             return ts.hasModifier(member, 32)
-                ? getDeclarationName(node)
+                ? ts.getDeclarationName(node)
                 : getClassPrototype(node);
         }
         function enableSubstitutionForNonQualifiedEnumMembers() {
@@ -38010,15 +40119,15 @@ var ts;
             if ((enabledSubstitutions & 2) === 0) {
                 enabledSubstitutions |= 2;
                 context.enableSubstitution(70);
-                context.enableSubstitution(254);
-                context.enableEmitNotification(226);
+                context.enableSubstitution(258);
+                context.enableEmitNotification(230);
             }
         }
         function isTransformedModuleDeclaration(node) {
-            return ts.getOriginalNode(node).kind === 226;
+            return ts.getOriginalNode(node).kind === 230;
         }
         function isTransformedEnumDeclaration(node) {
-            return ts.getOriginalNode(node).kind === 225;
+            return ts.getOriginalNode(node).kind === 229;
         }
         function onEmitNode(emitContext, node, emitCallback) {
             var savedApplicableSubstitutions = applicableSubstitutions;
@@ -38043,14 +40152,14 @@ var ts;
         }
         function substituteShorthandPropertyAssignment(node) {
             if (enabledSubstitutions & 2) {
-                var name_30 = node.name;
-                var exportedName = trySubstituteNamespaceExportedName(name_30);
+                var name_35 = node.name;
+                var exportedName = trySubstituteNamespaceExportedName(name_35);
                 if (exportedName) {
                     if (node.objectAssignmentInitializer) {
                         var initializer = ts.createAssignment(exportedName, node.objectAssignmentInitializer);
-                        return ts.createPropertyAssignment(name_30, initializer, node);
+                        return ts.createPropertyAssignment(name_35, initializer, node);
                     }
-                    return ts.createPropertyAssignment(name_30, exportedName, node);
+                    return ts.createPropertyAssignment(name_35, exportedName, node);
                 }
             }
             return node;
@@ -38059,9 +40168,9 @@ var ts;
             switch (node.kind) {
                 case 70:
                     return substituteExpressionIdentifier(node);
-                case 173:
+                case 177:
                     return substitutePropertyAccessExpression(node);
-                case 174:
+                case 178:
                     return substituteElementAccessExpression(node);
             }
             return node;
@@ -38089,11 +40198,11 @@ var ts;
             return undefined;
         }
         function trySubstituteNamespaceExportedName(node) {
-            if (enabledSubstitutions & applicableSubstitutions && (ts.getEmitFlags(node) & 262144) === 0) {
+            if (enabledSubstitutions & applicableSubstitutions && !ts.isLocalName(node)) {
                 var container = resolver.getReferencedExportContainer(node, false);
-                if (container) {
-                    var substitute = (applicableSubstitutions & 2 && container.kind === 226) ||
-                        (applicableSubstitutions & 8 && container.kind === 225);
+                if (container && container.kind !== 261) {
+                    var substitute = (applicableSubstitutions & 2 && container.kind === 230) ||
+                        (applicableSubstitutions & 8 && container.kind === 229);
                     if (substitute) {
                         return ts.createPropertyAccess(ts.getGeneratedNameForNode(container), node, node);
                     }
@@ -38164,11 +40273,11 @@ var ts;
         }
         function visitorWorker(node) {
             switch (node.kind) {
-                case 242:
+                case 246:
                     return visitJsxElement(node, false);
-                case 243:
+                case 247:
                     return visitJsxSelfClosingElement(node, false);
-                case 248:
+                case 252:
                     return visitJsxExpression(node);
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -38179,11 +40288,11 @@ var ts;
             switch (node.kind) {
                 case 10:
                     return visitJsxText(node);
-                case 248:
+                case 252:
                     return visitJsxExpression(node);
-                case 242:
+                case 246:
                     return visitJsxElement(node, true);
-                case 243:
+                case 247:
                     return visitJsxSelfClosingElement(node, true);
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -38213,7 +40322,7 @@ var ts;
                 objectProperties = ts.singleOrUndefined(segments)
                     || ts.createAssignHelper(currentSourceFile.externalHelpersModuleName, segments);
             }
-            var element = ts.createReactCreateElement(compilerOptions.reactNamespace, tagName, objectProperties, ts.filter(ts.map(children, transformJsxChildToExpression), ts.isDefined), node, location);
+            var element = ts.createExpressionForJsxElement(context.getEmitResolver().getJsxFactoryEntity(), compilerOptions.reactNamespace, tagName, objectProperties, ts.filter(ts.map(children, transformJsxChildToExpression), ts.isDefined), node, location);
             if (isChild) {
                 ts.startOnNewLine(element);
             }
@@ -38235,7 +40344,7 @@ var ts;
                 var decoded = tryDecodeEntities(node.text);
                 return decoded ? ts.createLiteral(decoded, node) : node;
             }
-            else if (node.kind === 248) {
+            else if (node.kind === 252) {
                 return visitJsxExpression(node);
             }
             else {
@@ -38300,16 +40409,16 @@ var ts;
             return decoded === text ? undefined : decoded;
         }
         function getTagName(node) {
-            if (node.kind === 242) {
+            if (node.kind === 246) {
                 return getTagName(node.openingElement);
             }
             else {
-                var name_31 = node.tagName;
-                if (ts.isIdentifier(name_31) && ts.isIntrinsicJsxName(name_31.text)) {
-                    return ts.createLiteral(name_31.text);
+                var name_36 = node.tagName;
+                if (ts.isIdentifier(name_36) && ts.isIntrinsicJsxName(name_36.text)) {
+                    return ts.createLiteral(name_36.text);
                 }
                 else {
-                    return ts.createExpressionFromEntityName(name_31);
+                    return ts.createExpressionFromEntityName(name_36);
                 }
             }
         }
@@ -38586,12 +40695,165 @@ var ts;
     }
 })(ts || (ts = {}));
 var ts;
+(function (ts) {
+    function transformESNext(context) {
+        var hoistVariableDeclaration = context.hoistVariableDeclaration;
+        var currentSourceFile;
+        return transformSourceFile;
+        function transformSourceFile(node) {
+            currentSourceFile = node;
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function visitor(node) {
+            if (node.transformFlags & 16) {
+                return visitorWorker(node);
+            }
+            else if (node.transformFlags & 32) {
+                return ts.visitEachChild(node, visitor, context);
+            }
+            else {
+                return node;
+            }
+        }
+        function visitorWorker(node) {
+            switch (node.kind) {
+                case 176:
+                    return visitObjectLiteralExpression(node);
+                case 192:
+                    return visitBinaryExpression(node);
+                case 223:
+                    return visitVariableDeclaration(node);
+                case 213:
+                    return visitForOfStatement(node);
+                case 172:
+                case 173:
+                    return node;
+                case 225:
+                    return visitFunctionDeclaration(node);
+                case 184:
+                    return visitFunctionExpression(node);
+                case 185:
+                    return visitArrowFunction(node);
+                case 144:
+                    return visitParameter(node);
+                default:
+                    ts.Debug.failBadSyntaxKind(node);
+                    return ts.visitEachChild(node, visitor, context);
+            }
+        }
+        function chunkObjectLiteralElements(elements) {
+            var chunkObject;
+            var objects = [];
+            for (var _i = 0, elements_3 = elements; _i < elements_3.length; _i++) {
+                var e = elements_3[_i];
+                if (e.kind === 259) {
+                    if (chunkObject) {
+                        objects.push(ts.createObjectLiteral(chunkObject));
+                        chunkObject = undefined;
+                    }
+                    var target = e.expression;
+                    objects.push(ts.visitNode(target, visitor, ts.isExpression));
+                }
+                else {
+                    if (!chunkObject) {
+                        chunkObject = [];
+                    }
+                    if (e.kind === 257) {
+                        var p = e;
+                        chunkObject.push(ts.createPropertyAssignment(p.name, ts.visitNode(p.initializer, visitor, ts.isExpression)));
+                    }
+                    else {
+                        chunkObject.push(e);
+                    }
+                }
+            }
+            if (chunkObject) {
+                objects.push(ts.createObjectLiteral(chunkObject));
+            }
+            return objects;
+        }
+        function visitObjectLiteralExpression(node) {
+            var objects = chunkObjectLiteralElements(node.properties);
+            if (objects.length && objects[0].kind !== 176) {
+                objects.unshift(ts.createObjectLiteral());
+            }
+            return ts.createCall(ts.createIdentifier("__assign"), undefined, objects);
+        }
+        function visitBinaryExpression(node) {
+            if (ts.isDestructuringAssignment(node) && node.left.transformFlags & 48) {
+                return ts.flattenDestructuringAssignment(context, node, true, hoistVariableDeclaration, visitor, true);
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function visitVariableDeclaration(node) {
+            if (ts.isBindingPattern(node.name) && node.name.transformFlags & 48) {
+                var result = ts.flattenVariableDestructuring(node, undefined, visitor, undefined, true);
+                return result;
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function visitForOfStatement(node) {
+            var initializer = node.initializer;
+            if (!isRestBindingPattern(initializer) && !isRestAssignment(initializer)) {
+                return ts.visitEachChild(node, visitor, context);
+            }
+            return ts.convertForOf(node, undefined, visitor, ts.noop, context, true);
+        }
+        function isRestBindingPattern(initializer) {
+            if (ts.isVariableDeclarationList(initializer)) {
+                var declaration = ts.firstOrUndefined(initializer.declarations);
+                return declaration && declaration.name &&
+                    declaration.name.kind === 172 &&
+                    !!(declaration.name.transformFlags & 8388608);
+            }
+            return false;
+        }
+        function isRestAssignment(initializer) {
+            return initializer.kind === 176 &&
+                initializer.transformFlags & 8388608;
+        }
+        function visitParameter(node) {
+            if (isObjectRestParameter(node)) {
+                return ts.setOriginalNode(ts.createParameter(undefined, undefined, undefined, ts.getGeneratedNameForNode(node), undefined, undefined, node.initializer, node), node);
+            }
+            else {
+                return node;
+            }
+        }
+        function isObjectRestParameter(node) {
+            return node.name &&
+                node.name.kind === 172 &&
+                !!(node.name.transformFlags & 8388608);
+        }
+        function visitFunctionDeclaration(node) {
+            var hasRest = ts.forEach(node.parameters, isObjectRestParameter);
+            var body = hasRest ?
+                ts.transformFunctionBody(node, visitor, currentSourceFile, context, ts.noop, true) :
+                ts.visitEachChild(node.body, visitor, context);
+            return ts.setOriginalNode(ts.createFunctionDeclaration(undefined, node.modifiers, node.asteriskToken, node.name, undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, body, node), node);
+        }
+        function visitArrowFunction(node) {
+            var hasRest = ts.forEach(node.parameters, isObjectRestParameter);
+            var body = hasRest ?
+                ts.transformFunctionBody(node, visitor, currentSourceFile, context, ts.noop, true) :
+                ts.visitEachChild(node.body, visitor, context);
+            var func = ts.setOriginalNode(ts.createArrowFunction(undefined, undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, node.equalsGreaterThanToken, body, node), node);
+            ts.setEmitFlags(func, 256);
+            return func;
+        }
+        function visitFunctionExpression(node) {
+            var hasRest = ts.forEach(node.parameters, isObjectRestParameter);
+            var body = hasRest ?
+                ts.transformFunctionBody(node, visitor, currentSourceFile, context, ts.noop, true) :
+                ts.visitEachChild(node.body, visitor, context);
+            return ts.setOriginalNode(ts.createFunctionExpression(undefined, node.asteriskToken, name, undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, body, node), node);
+        }
+    }
+    ts.transformESNext = transformESNext;
+})(ts || (ts = {}));
+var ts;
 (function (ts) {
     function transformES2017(context) {
-        var ES2017SubstitutionFlags;
-        (function (ES2017SubstitutionFlags) {
-            ES2017SubstitutionFlags[ES2017SubstitutionFlags["AsyncMethodsWithSuper"] = 1] = "AsyncMethodsWithSuper";
-        })(ES2017SubstitutionFlags || (ES2017SubstitutionFlags = {}));
         var startLexicalEnvironment = context.startLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment;
         var resolver = context.getEmitResolver();
         var compilerOptions = context.getCompilerOptions();
@@ -38614,10 +40876,10 @@ var ts;
             return ts.visitEachChild(node, visitor, context);
         }
         function visitor(node) {
-            if (node.transformFlags & 16) {
+            if (node.transformFlags & 64) {
                 return visitorWorker(node);
             }
-            else if (node.transformFlags & 32) {
+            else if (node.transformFlags & 128) {
                 return ts.visitEachChild(node, visitor, context);
             }
             return node;
@@ -38626,15 +40888,15 @@ var ts;
             switch (node.kind) {
                 case 119:
                     return undefined;
-                case 185:
+                case 189:
                     return visitAwaitExpression(node);
-                case 148:
+                case 149:
                     return visitMethodDeclaration(node);
-                case 221:
+                case 225:
                     return visitFunctionDeclaration(node);
-                case 180:
+                case 184:
                     return visitFunctionExpression(node);
-                case 181:
+                case 185:
                     return visitArrowFunction(node);
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -38699,9 +40961,10 @@ var ts;
             return ts.mergeFunctionBodyLexicalEnvironment(visited, declarations);
         }
         function transformAsyncFunctionBody(node) {
-            var nodeType = node.original ? node.original.type : node.type;
+            var original = ts.getOriginalNode(node, ts.isFunctionLike);
+            var nodeType = original.type;
             var promiseConstructor = languageVersion < 2 ? getPromiseConstructor(nodeType) : undefined;
-            var isArrowFunction = node.kind === 181;
+            var isArrowFunction = node.kind === 185;
             var hasLexicalArguments = (resolver.getNodeCheckFlags(node) & 8192) !== 0;
             if (!isArrowFunction) {
                 var statements = [];
@@ -38744,12 +41007,14 @@ var ts;
             }
         }
         function getPromiseConstructor(type) {
-            var typeName = ts.getEntityNameFromTypeNode(type);
-            if (typeName && ts.isEntityName(typeName)) {
-                var serializationKind = resolver.getTypeReferenceSerializationKind(typeName);
-                if (serializationKind === ts.TypeReferenceSerializationKind.TypeWithConstructSignatureAndValue
-                    || serializationKind === ts.TypeReferenceSerializationKind.Unknown) {
-                    return typeName;
+            if (type) {
+                var typeName = ts.getEntityNameFromTypeNode(type);
+                if (typeName && ts.isEntityName(typeName)) {
+                    var serializationKind = resolver.getTypeReferenceSerializationKind(typeName);
+                    if (serializationKind === ts.TypeReferenceSerializationKind.TypeWithConstructSignatureAndValue
+                        || serializationKind === ts.TypeReferenceSerializationKind.Unknown) {
+                        return typeName;
+                    }
                 }
             }
             return undefined;
@@ -38757,23 +41022,23 @@ var ts;
         function enableSubstitutionForAsyncMethodsWithSuper() {
             if ((enabledSubstitutions & 1) === 0) {
                 enabledSubstitutions |= 1;
-                context.enableSubstitution(175);
-                context.enableSubstitution(173);
-                context.enableSubstitution(174);
-                context.enableEmitNotification(222);
-                context.enableEmitNotification(148);
-                context.enableEmitNotification(150);
-                context.enableEmitNotification(151);
+                context.enableSubstitution(179);
+                context.enableSubstitution(177);
+                context.enableSubstitution(178);
+                context.enableEmitNotification(226);
                 context.enableEmitNotification(149);
+                context.enableEmitNotification(151);
+                context.enableEmitNotification(152);
+                context.enableEmitNotification(150);
             }
         }
         function substituteExpression(node) {
             switch (node.kind) {
-                case 173:
+                case 177:
                     return substitutePropertyAccessExpression(node);
-                case 174:
+                case 178:
                     return substituteElementAccessExpression(node);
-                case 175:
+                case 179:
                     if (enabledSubstitutions & 1) {
                         return substituteCallExpression(node);
                     }
@@ -38816,11 +41081,11 @@ var ts;
         }
         function isSuperContainer(node) {
             var kind = node.kind;
-            return kind === 222
-                || kind === 149
-                || kind === 148
+            return kind === 226
                 || kind === 150
-                || kind === 151;
+                || kind === 149
+                || kind === 151
+                || kind === 152;
         }
         function onEmitNode(emitContext, node, emitCallback) {
             var savedApplicableSubstitutions = applicableSubstitutions;
@@ -38866,10 +41131,10 @@ var ts;
             return ts.visitEachChild(node, visitor, context);
         }
         function visitor(node) {
-            if (node.transformFlags & 64) {
+            if (node.transformFlags & 256) {
                 return visitorWorker(node);
             }
-            else if (node.transformFlags & 128) {
+            else if (node.transformFlags & 512) {
                 return ts.visitEachChild(node, visitor, context);
             }
             else {
@@ -38878,7 +41143,7 @@ var ts;
         }
         function visitorWorker(node) {
             switch (node.kind) {
-                case 188:
+                case 192:
                     return visitBinaryExpression(node);
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -38921,28 +41186,6 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    var ES2015SubstitutionFlags;
-    (function (ES2015SubstitutionFlags) {
-        ES2015SubstitutionFlags[ES2015SubstitutionFlags["CapturedThis"] = 1] = "CapturedThis";
-        ES2015SubstitutionFlags[ES2015SubstitutionFlags["BlockScopedBindings"] = 2] = "BlockScopedBindings";
-    })(ES2015SubstitutionFlags || (ES2015SubstitutionFlags = {}));
-    var CopyDirection;
-    (function (CopyDirection) {
-        CopyDirection[CopyDirection["ToOriginal"] = 0] = "ToOriginal";
-        CopyDirection[CopyDirection["ToOutParameter"] = 1] = "ToOutParameter";
-    })(CopyDirection || (CopyDirection = {}));
-    var Jump;
-    (function (Jump) {
-        Jump[Jump["Break"] = 2] = "Break";
-        Jump[Jump["Continue"] = 4] = "Continue";
-        Jump[Jump["Return"] = 8] = "Return";
-    })(Jump || (Jump = {}));
-    var SuperCaptureResult;
-    (function (SuperCaptureResult) {
-        SuperCaptureResult[SuperCaptureResult["NoReplacement"] = 0] = "NoReplacement";
-        SuperCaptureResult[SuperCaptureResult["ReplaceSuperCapture"] = 1] = "ReplaceSuperCapture";
-        SuperCaptureResult[SuperCaptureResult["ReplaceWithReturn"] = 2] = "ReplaceWithReturn";
-    })(SuperCaptureResult || (SuperCaptureResult = {}));
     function transformES2015(context) {
         var startLexicalEnvironment = context.startLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration;
         var resolver = context.getEmitResolver();
@@ -38960,6 +41203,7 @@ var ts;
         var enclosingFunction;
         var enclosingNonArrowFunction;
         var enclosingNonAsyncFunctionBody;
+        var isInConstructorWithCapturedSuper;
         var convertedLoopState;
         var enabledSubstitutions;
         return transformSourceFile;
@@ -38989,11 +41233,14 @@ var ts;
             var savedCurrentParent = currentParent;
             var savedCurrentNode = currentNode;
             var savedConvertedLoopState = convertedLoopState;
+            var savedIsInConstructorWithCapturedSuper = isInConstructorWithCapturedSuper;
             if (ts.nodeStartsNewLexicalEnvironment(node)) {
+                isInConstructorWithCapturedSuper = false;
                 convertedLoopState = undefined;
             }
             onBeforeVisitNode(node);
             var visited = f(node);
+            isInConstructorWithCapturedSuper = savedIsInConstructorWithCapturedSuper;
             convertedLoopState = savedConvertedLoopState;
             enclosingFunction = savedEnclosingFunction;
             enclosingNonArrowFunction = savedEnclosingNonArrowFunction;
@@ -39005,16 +41252,25 @@ var ts;
             currentNode = savedCurrentNode;
             return visited;
         }
+        function returnCapturedThis(node) {
+            return ts.setOriginalNode(ts.createReturn(ts.createIdentifier("_this")), node);
+        }
+        function isReturnVoidStatementInConstructorWithCapturedSuper(node) {
+            return isInConstructorWithCapturedSuper && node.kind === 216 && !node.expression;
+        }
         function shouldCheckNode(node) {
-            return (node.transformFlags & 256) !== 0 ||
-                node.kind === 215 ||
+            return (node.transformFlags & 1024) !== 0 ||
+                node.kind === 219 ||
                 (ts.isIterationStatement(node, false) && shouldConvertIterationStatementBody(node));
         }
         function visitorWorker(node) {
-            if (shouldCheckNode(node)) {
+            if (isReturnVoidStatementInConstructorWithCapturedSuper(node)) {
+                return returnCapturedThis(node);
+            }
+            else if (shouldCheckNode(node)) {
                 return visitJavaScript(node);
             }
-            else if (node.transformFlags & 512) {
+            else if (node.transformFlags & 2048 || (isInConstructorWithCapturedSuper && !ts.isExpression(node))) {
                 return ts.visitEachChild(node, visitor, context);
             }
             else {
@@ -39033,14 +41289,15 @@ var ts;
         }
         function visitNodesInConvertedLoop(node) {
             switch (node.kind) {
-                case 212:
+                case 216:
+                    node = isReturnVoidStatementInConstructorWithCapturedSuper(node) ? returnCapturedThis(node) : node;
                     return visitReturnStatement(node);
-                case 201:
+                case 205:
                     return visitVariableStatement(node);
-                case 214:
+                case 218:
                     return visitSwitchStatement(node);
-                case 211:
-                case 210:
+                case 215:
+                case 214:
                     return visitBreakOrContinueStatement(node);
                 case 98:
                     return visitThisKeyword(node);
@@ -39052,74 +41309,76 @@ var ts;
         }
         function visitJavaScript(node) {
             switch (node.kind) {
-                case 83:
-                    return node;
-                case 222:
+                case 114:
+                    return undefined;
+                case 226:
                     return visitClassDeclaration(node);
-                case 193:
+                case 197:
                     return visitClassExpression(node);
-                case 143:
+                case 144:
                     return visitParameter(node);
-                case 221:
+                case 225:
                     return visitFunctionDeclaration(node);
-                case 181:
+                case 185:
                     return visitArrowFunction(node);
-                case 180:
+                case 184:
                     return visitFunctionExpression(node);
-                case 219:
+                case 223:
                     return visitVariableDeclaration(node);
                 case 70:
                     return visitIdentifier(node);
-                case 220:
+                case 224:
                     return visitVariableDeclarationList(node);
-                case 215:
+                case 219:
                     return visitLabeledStatement(node);
-                case 205:
-                    return visitDoStatement(node);
-                case 206:
-                    return visitWhileStatement(node);
-                case 207:
-                    return visitForStatement(node);
-                case 208:
-                    return visitForInStatement(node);
                 case 209:
+                    return visitDoStatement(node);
+                case 210:
+                    return visitWhileStatement(node);
+                case 211:
+                    return visitForStatement(node);
+                case 212:
+                    return visitForInStatement(node);
+                case 213:
                     return visitForOfStatement(node);
-                case 203:
+                case 207:
                     return visitExpressionStatement(node);
-                case 172:
-                    return visitObjectLiteralExpression(node);
-                case 254:
-                    return visitShorthandPropertyAssignment(node);
-                case 171:
-                    return visitArrayLiteralExpression(node);
-                case 175:
-                    return visitCallExpression(node);
                 case 176:
-                    return visitNewExpression(node);
+                    return visitObjectLiteralExpression(node);
+                case 256:
+                    return visitCatchClause(node);
+                case 258:
+                    return visitShorthandPropertyAssignment(node);
+                case 175:
+                    return visitArrayLiteralExpression(node);
                 case 179:
+                    return visitCallExpression(node);
+                case 180:
+                    return visitNewExpression(node);
+                case 183:
                     return visitParenthesizedExpression(node, true);
-                case 188:
+                case 192:
                     return visitBinaryExpression(node, true);
                 case 12:
                 case 13:
                 case 14:
                 case 15:
                     return visitTemplateLiteral(node);
-                case 177:
+                case 181:
                     return visitTaggedTemplateExpression(node);
-                case 190:
+                case 194:
                     return visitTemplateExpression(node);
-                case 191:
+                case 195:
                     return visitYieldExpression(node);
                 case 96:
                     return visitSuperKeyword();
-                case 191:
+                case 195:
                     return ts.visitEachChild(node, visitor, context);
-                case 148:
+                case 149:
                     return visitMethodDeclaration(node);
-                case 256:
+                case 261:
                     return visitSourceFileNode(node);
-                case 201:
+                case 205:
                     return visitVariableStatement(node);
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -39134,7 +41393,7 @@ var ts;
                 }
                 if (ts.isFunctionLike(currentNode)) {
                     enclosingFunction = currentNode;
-                    if (currentNode.kind !== 181) {
+                    if (currentNode.kind !== 185) {
                         enclosingNonArrowFunction = currentNode;
                         if (!(ts.getEmitFlags(currentNode) & 2097152)) {
                             enclosingNonAsyncFunctionBody = currentNode;
@@ -39142,14 +41401,14 @@ var ts;
                     }
                 }
                 switch (currentNode.kind) {
-                    case 201:
+                    case 205:
                         enclosingVariableStatement = currentNode;
                         break;
-                    case 220:
-                    case 219:
-                    case 170:
-                    case 168:
-                    case 169:
+                    case 224:
+                    case 223:
+                    case 174:
+                    case 172:
+                    case 173:
                         break;
                     default:
                         enclosingVariableStatement = undefined;
@@ -39177,7 +41436,7 @@ var ts;
         }
         function visitThisKeyword(node) {
             ts.Debug.assert(convertedLoopState !== undefined);
-            if (enclosingFunction && enclosingFunction.kind === 181) {
+            if (enclosingFunction && enclosingFunction.kind === 185) {
                 convertedLoopState.containsLexicalThis = true;
                 return node;
             }
@@ -39197,13 +41456,13 @@ var ts;
         }
         function visitBreakOrContinueStatement(node) {
             if (convertedLoopState) {
-                var jump = node.kind === 211 ? 2 : 4;
+                var jump = node.kind === 215 ? 2 : 4;
                 var canUseBreakOrContinue = (node.label && convertedLoopState.labels && convertedLoopState.labels[node.label.text]) ||
                     (!node.label && (convertedLoopState.allowedNonLabeledJumps & jump));
                 if (!canUseBreakOrContinue) {
                     var labelMarker = void 0;
                     if (!node.label) {
-                        if (node.kind === 211) {
+                        if (node.kind === 215) {
                             convertedLoopState.nonLocalJumps |= 2;
                             labelMarker = "break";
                         }
@@ -39213,7 +41472,7 @@ var ts;
                         }
                     }
                     else {
-                        if (node.kind === 211) {
+                        if (node.kind === 215) {
                             labelMarker = "break-" + node.label.text;
                             setLabeledJump(convertedLoopState, true, node.label.text, labelMarker);
                         }
@@ -39243,26 +41502,26 @@ var ts;
             return ts.visitEachChild(node, visitor, context);
         }
         function visitClassDeclaration(node) {
-            var modifierFlags = ts.getModifierFlags(node);
-            var isExported = modifierFlags & 1;
-            var isDefault = modifierFlags & 512;
-            var modifiers = isExported && !isDefault
-                ? ts.filter(node.modifiers, isExportModifier)
-                : undefined;
-            var statement = ts.createVariableStatement(modifiers, ts.createVariableDeclarationList([
-                ts.createVariableDeclaration(getDeclarationName(node, true), undefined, transformClassLikeDeclarationToExpression(node))
-            ]), node);
+            var variable = ts.createVariableDeclaration(ts.getLocalName(node, true), undefined, transformClassLikeDeclarationToExpression(node));
+            ts.setOriginalNode(variable, node);
+            var statements = [];
+            var statement = ts.createVariableStatement(undefined, ts.createVariableDeclarationList([variable]), node);
             ts.setOriginalNode(statement, node);
             ts.startOnNewLine(statement);
-            if (isExported && isDefault) {
-                var statements = [statement];
-                statements.push(ts.createExportAssignment(undefined, undefined, false, getDeclarationName(node, false)));
-                return statements;
+            statements.push(statement);
+            if (ts.hasModifier(node, 1)) {
+                var exportStatement = ts.hasModifier(node, 512)
+                    ? ts.createExportDefault(ts.getLocalName(node))
+                    : ts.createExternalModuleExport(ts.getLocalName(node));
+                ts.setOriginalNode(exportStatement, statement);
+                statements.push(exportStatement);
             }
-            return statement;
-        }
-        function isExportModifier(node) {
-            return node.kind === 83;
+            var emitFlags = ts.getEmitFlags(node);
+            if ((emitFlags & 33554432) === 0) {
+                statements.push(ts.createEndOfDeclarationMarker(node));
+                ts.setEmitFlags(statement, emitFlags | 33554432);
+            }
+            return ts.singleOrMany(statements);
         }
         function visitClassExpression(node) {
             return transformClassLikeDeclarationToExpression(node);
@@ -39272,7 +41531,7 @@ var ts;
                 enableSubstitutionsForBlockScopedBindings();
             }
             var extendsClauseElement = ts.getClassExtendsHeritageClauseElement(node);
-            var classFunction = ts.createFunctionExpression(undefined, undefined, undefined, undefined, extendsClauseElement ? [ts.createParameter("_super")] : [], undefined, transformClassBody(node, extendsClauseElement));
+            var classFunction = ts.createFunctionExpression(undefined, undefined, undefined, undefined, extendsClauseElement ? [ts.createParameter(undefined, undefined, undefined, "_super")] : [], undefined, transformClassBody(node, extendsClauseElement));
             if (ts.getEmitFlags(node) & 524288) {
                 ts.setEmitFlags(classFunction, 524288);
             }
@@ -39293,7 +41552,7 @@ var ts;
             addConstructor(statements, node, extendsClauseElement);
             addClassMembers(statements, node);
             var closingBraceLocation = ts.createTokenRange(ts.skipTrivia(currentText, node.members.end), 17);
-            var localName = getLocalName(node);
+            var localName = ts.getLocalName(node);
             var outer = ts.createPartiallyEmittedExpression(localName);
             outer.end = closingBraceLocation.end;
             ts.setEmitFlags(outer, 49152);
@@ -39308,13 +41567,13 @@ var ts;
         }
         function addExtendsHelperIfNeeded(statements, node, extendsClauseElement) {
             if (extendsClauseElement) {
-                statements.push(ts.createStatement(ts.createExtendsHelper(currentSourceFile.externalHelpersModuleName, getDeclarationName(node)), extendsClauseElement));
+                statements.push(ts.createStatement(ts.createExtendsHelper(currentSourceFile.externalHelpersModuleName, ts.getLocalName(node)), extendsClauseElement));
             }
         }
         function addConstructor(statements, node, extendsClauseElement) {
             var constructor = ts.getFirstConstructorWithBody(node);
             var hasSynthesizedSuper = hasSynthesizedDefaultSuperCall(constructor, extendsClauseElement !== undefined);
-            var constructorFunction = ts.createFunctionDeclaration(undefined, undefined, undefined, getDeclarationName(node), undefined, transformConstructorParameters(constructor, hasSynthesizedSuper), undefined, transformConstructorBody(constructor, node, extendsClauseElement, hasSynthesizedSuper), constructor || node);
+            var constructorFunction = ts.createFunctionDeclaration(undefined, undefined, undefined, ts.getDeclarationName(node), undefined, transformConstructorParameters(constructor, hasSynthesizedSuper), undefined, transformConstructorBody(constructor, node, extendsClauseElement, hasSynthesizedSuper), constructor || node);
             if (extendsClauseElement) {
                 ts.setEmitFlags(constructorFunction, 256);
             }
@@ -39337,8 +41596,8 @@ var ts;
                 statementOffset = ts.addPrologueDirectives(statements, constructor.body.statements, false, visitor);
             }
             if (constructor) {
-                addDefaultValueAssignmentsIfNeeded(statements, constructor);
-                addRestParameterIfNeeded(statements, constructor, hasSynthesizedSuper);
+                ts.addDefaultValueAssignmentsIfNeeded(statements, constructor, visitor, false);
+                ts.addRestParameterIfNeeded(statements, constructor, hasSynthesizedSuper);
                 ts.Debug.assert(statementOffset >= 0, "statementOffset not initialized correctly!");
             }
             var superCaptureStatus = declareOrCaptureOrReturnThisForConstructorIfNeeded(statements, constructor, !!extendsClauseElement, hasSynthesizedSuper, statementOffset);
@@ -39346,7 +41605,10 @@ var ts;
                 statementOffset++;
             }
             if (constructor) {
-                var body = saveStateAndInvoke(constructor, function (constructor) { return ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, statementOffset); });
+                var body = saveStateAndInvoke(constructor, function (constructor) {
+                    isInConstructorWithCapturedSuper = superCaptureStatus === 1;
+                    return ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, statementOffset);
+                });
                 ts.addRange(statements, body);
             }
             if (extendsClauseElement
@@ -39362,17 +41624,17 @@ var ts;
             return block;
         }
         function isSufficientlyCoveredByReturnStatements(statement) {
-            if (statement.kind === 212) {
+            if (statement.kind === 216) {
                 return true;
             }
-            else if (statement.kind === 204) {
+            else if (statement.kind === 208) {
                 var ifStatement = statement;
                 if (ifStatement.elseStatement) {
                     return isSufficientlyCoveredByReturnStatements(ifStatement.thenStatement) &&
                         isSufficientlyCoveredByReturnStatements(ifStatement.elseStatement);
                 }
             }
-            else if (statement.kind === 200) {
+            else if (statement.kind === 204) {
                 var lastStatement = ts.lastOrUndefined(statement.statements);
                 if (lastStatement && isSufficientlyCoveredByReturnStatements(lastStatement)) {
                     return true;
@@ -39383,7 +41645,7 @@ var ts;
         function declareOrCaptureOrReturnThisForConstructorIfNeeded(statements, ctor, hasExtendsClause, hasSynthesizedSuper, statementOffset) {
             if (!hasExtendsClause) {
                 if (ctor) {
-                    addCaptureThisForNodeIfNeeded(statements, ctor);
+                    ts.addCaptureThisForNodeIfNeeded(statements, ctor, enableSubstitutionsForCapturedThis);
                 }
                 return 0;
             }
@@ -39392,7 +41654,7 @@ var ts;
                 return 2;
             }
             if (hasSynthesizedSuper) {
-                captureThisForNode(statements, ctor, createDefaultSuperCallOrThis());
+                ts.captureThisForNode(statements, ctor, createDefaultSuperCallOrThis());
                 enableSubstitutionsForCapturedThis();
                 return 1;
             }
@@ -39401,7 +41663,7 @@ var ts;
             var ctorStatements = ctor.body.statements;
             if (statementOffset < ctorStatements.length) {
                 firstStatement = ctorStatements[statementOffset];
-                if (firstStatement.kind === 203 && ts.isSuperCall(firstStatement.expression)) {
+                if (firstStatement.kind === 207 && ts.isSuperCall(firstStatement.expression)) {
                     var superCall = firstStatement.expression;
                     superCallExpression = ts.setOriginalNode(saveStateAndInvoke(superCall, visitImmediateSuperCallInBody), superCall);
                 }
@@ -39410,7 +41672,7 @@ var ts;
                 statements.push(ts.createReturn(superCallExpression));
                 return 2;
             }
-            captureThisForNode(statements, ctor, superCallExpression, firstStatement);
+            ts.captureThisForNode(statements, ctor, superCallExpression, enableSubstitutionsForCapturedThis, firstStatement);
             if (superCallExpression) {
                 return 1;
             }
@@ -39427,111 +41689,33 @@ var ts;
                 return undefined;
             }
             else if (ts.isBindingPattern(node.name)) {
-                return ts.setOriginalNode(ts.createParameter(ts.getGeneratedNameForNode(node), undefined, node), node);
+                return ts.setOriginalNode(ts.createParameter(undefined, undefined, undefined, ts.getGeneratedNameForNode(node), undefined, undefined, undefined, node), node);
             }
             else if (node.initializer) {
-                return ts.setOriginalNode(ts.createParameter(node.name, undefined, node), node);
+                return ts.setOriginalNode(ts.createParameter(undefined, undefined, undefined, node.name, undefined, undefined, undefined, node), node);
             }
             else {
                 return node;
             }
         }
-        function shouldAddDefaultValueAssignments(node) {
-            return (node.transformFlags & 262144) !== 0;
-        }
-        function addDefaultValueAssignmentsIfNeeded(statements, node) {
-            if (!shouldAddDefaultValueAssignments(node)) {
-                return;
-            }
-            for (var _i = 0, _a = node.parameters; _i < _a.length; _i++) {
-                var parameter = _a[_i];
-                var name_32 = parameter.name, initializer = parameter.initializer, dotDotDotToken = parameter.dotDotDotToken;
-                if (dotDotDotToken) {
-                    continue;
-                }
-                if (ts.isBindingPattern(name_32)) {
-                    addDefaultValueAssignmentForBindingPattern(statements, parameter, name_32, initializer);
-                }
-                else if (initializer) {
-                    addDefaultValueAssignmentForInitializer(statements, parameter, name_32, initializer);
-                }
-            }
-        }
-        function addDefaultValueAssignmentForBindingPattern(statements, parameter, name, initializer) {
-            var temp = ts.getGeneratedNameForNode(parameter);
-            if (name.elements.length > 0) {
-                statements.push(ts.setEmitFlags(ts.createVariableStatement(undefined, ts.createVariableDeclarationList(ts.flattenParameterDestructuring(parameter, temp, visitor))), 8388608));
-            }
-            else if (initializer) {
-                statements.push(ts.setEmitFlags(ts.createStatement(ts.createAssignment(temp, ts.visitNode(initializer, visitor, ts.isExpression))), 8388608));
-            }
-        }
-        function addDefaultValueAssignmentForInitializer(statements, parameter, name, initializer) {
-            initializer = ts.visitNode(initializer, visitor, ts.isExpression);
-            var statement = ts.createIf(ts.createStrictEquality(ts.getSynthesizedClone(name), ts.createVoidZero()), ts.setEmitFlags(ts.createBlock([
-                ts.createStatement(ts.createAssignment(ts.setEmitFlags(ts.getMutableClone(name), 1536), ts.setEmitFlags(initializer, 1536 | ts.getEmitFlags(initializer)), parameter))
-            ], parameter), 32 | 1024 | 12288), undefined, parameter);
-            statement.startsOnNewLine = true;
-            ts.setEmitFlags(statement, 12288 | 1024 | 8388608);
-            statements.push(statement);
-        }
-        function shouldAddRestParameter(node, inConstructorWithSynthesizedSuper) {
-            return node && node.dotDotDotToken && node.name.kind === 70 && !inConstructorWithSynthesizedSuper;
-        }
-        function addRestParameterIfNeeded(statements, node, inConstructorWithSynthesizedSuper) {
-            var parameter = ts.lastOrUndefined(node.parameters);
-            if (!shouldAddRestParameter(parameter, inConstructorWithSynthesizedSuper)) {
-                return;
-            }
-            var declarationName = ts.getMutableClone(parameter.name);
-            ts.setEmitFlags(declarationName, 1536);
-            var expressionName = ts.getSynthesizedClone(parameter.name);
-            var restIndex = node.parameters.length - 1;
-            var temp = ts.createLoopVariable();
-            statements.push(ts.setEmitFlags(ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
-                ts.createVariableDeclaration(declarationName, undefined, ts.createArrayLiteral([]))
-            ]), parameter), 8388608));
-            var forStatement = ts.createFor(ts.createVariableDeclarationList([
-                ts.createVariableDeclaration(temp, undefined, ts.createLiteral(restIndex))
-            ], parameter), ts.createLessThan(temp, ts.createPropertyAccess(ts.createIdentifier("arguments"), "length"), parameter), ts.createPostfixIncrement(temp, parameter), ts.createBlock([
-                ts.startOnNewLine(ts.createStatement(ts.createAssignment(ts.createElementAccess(expressionName, ts.createSubtract(temp, ts.createLiteral(restIndex))), ts.createElementAccess(ts.createIdentifier("arguments"), temp)), parameter))
-            ]));
-            ts.setEmitFlags(forStatement, 8388608);
-            ts.startOnNewLine(forStatement);
-            statements.push(forStatement);
-        }
-        function addCaptureThisForNodeIfNeeded(statements, node) {
-            if (node.transformFlags & 65536 && node.kind !== 181) {
-                captureThisForNode(statements, node, ts.createThis());
-            }
-        }
-        function captureThisForNode(statements, node, initializer, originalStatement) {
-            enableSubstitutionsForCapturedThis();
-            var captureThisStatement = ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
-                ts.createVariableDeclaration("_this", undefined, initializer)
-            ]), originalStatement);
-            ts.setEmitFlags(captureThisStatement, 49152 | 8388608);
-            ts.setSourceMapRange(captureThisStatement, node);
-            statements.push(captureThisStatement);
-        }
         function addClassMembers(statements, node) {
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
                 switch (member.kind) {
-                    case 199:
+                    case 203:
                         statements.push(transformSemicolonClassElementToStatement(member));
                         break;
-                    case 148:
+                    case 149:
                         statements.push(transformClassMethodDeclarationToStatement(getClassMemberPrefix(node, member), member));
                         break;
-                    case 150:
                     case 151:
+                    case 152:
                         var accessors = ts.getAllAccessorDeclarations(node.members, member);
                         if (member === accessors.firstAccessor) {
                             statements.push(transformAccessorsToStatement(getClassMemberPrefix(node, member), accessors));
                         }
                         break;
-                    case 149:
+                    case 150:
                         break;
                     default:
                         ts.Debug.failBadSyntaxKind(node);
@@ -39596,7 +41780,7 @@ var ts;
             return call;
         }
         function visitArrowFunction(node) {
-            if (node.transformFlags & 32768) {
+            if (node.transformFlags & 262144) {
                 enableSubstitutionsForCapturedThis();
             }
             var func = transformFunctionLikeToExpression(node, node, undefined);
@@ -39607,80 +41791,22 @@ var ts;
             return transformFunctionLikeToExpression(node, node, node.name);
         }
         function visitFunctionDeclaration(node) {
-            return ts.setOriginalNode(ts.createFunctionDeclaration(undefined, node.modifiers, node.asteriskToken, node.name, undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, transformFunctionBody(node), node), node);
+            return ts.setOriginalNode(ts.createFunctionDeclaration(undefined, node.modifiers, node.asteriskToken, node.name, undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, ts.transformFunctionBody(node, visitor, currentSourceFile, context, enableSubstitutionsForCapturedThis), node), node);
         }
         function transformFunctionLikeToExpression(node, location, name) {
             var savedContainingNonArrowFunction = enclosingNonArrowFunction;
-            if (node.kind !== 181) {
+            if (node.kind !== 185) {
                 enclosingNonArrowFunction = node;
             }
-            var expression = ts.setOriginalNode(ts.createFunctionExpression(undefined, node.asteriskToken, name, undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, saveStateAndInvoke(node, transformFunctionBody), location), node);
+            var expression = ts.setOriginalNode(ts.createFunctionExpression(undefined, node.asteriskToken, name, undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, saveStateAndInvoke(node, function (node) { return ts.transformFunctionBody(node, visitor, currentSourceFile, context, enableSubstitutionsForCapturedThis); }), location), node);
             enclosingNonArrowFunction = savedContainingNonArrowFunction;
             return expression;
         }
-        function transformFunctionBody(node) {
-            var multiLine = false;
-            var singleLine = false;
-            var statementsLocation;
-            var closeBraceLocation;
-            var statements = [];
-            var body = node.body;
-            var statementOffset;
-            startLexicalEnvironment();
-            if (ts.isBlock(body)) {
-                statementOffset = ts.addPrologueDirectives(statements, body.statements, false, visitor);
-            }
-            addCaptureThisForNodeIfNeeded(statements, node);
-            addDefaultValueAssignmentsIfNeeded(statements, node);
-            addRestParameterIfNeeded(statements, node, false);
-            if (!multiLine && statements.length > 0) {
-                multiLine = true;
-            }
-            if (ts.isBlock(body)) {
-                statementsLocation = body.statements;
-                ts.addRange(statements, ts.visitNodes(body.statements, visitor, ts.isStatement, statementOffset));
-                if (!multiLine && body.multiLine) {
-                    multiLine = true;
-                }
-            }
-            else {
-                ts.Debug.assert(node.kind === 181);
-                statementsLocation = ts.moveRangeEnd(body, -1);
-                var equalsGreaterThanToken = node.equalsGreaterThanToken;
-                if (!ts.nodeIsSynthesized(equalsGreaterThanToken) && !ts.nodeIsSynthesized(body)) {
-                    if (ts.rangeEndIsOnSameLineAsRangeStart(equalsGreaterThanToken, body, currentSourceFile)) {
-                        singleLine = true;
-                    }
-                    else {
-                        multiLine = true;
-                    }
-                }
-                var expression = ts.visitNode(body, visitor, ts.isExpression);
-                var returnStatement = ts.createReturn(expression, body);
-                ts.setEmitFlags(returnStatement, 12288 | 1024 | 32768);
-                statements.push(returnStatement);
-                closeBraceLocation = body;
-            }
-            var lexicalEnvironment = endLexicalEnvironment();
-            ts.addRange(statements, lexicalEnvironment);
-            if (!multiLine && lexicalEnvironment && lexicalEnvironment.length) {
-                multiLine = true;
-            }
-            var block = ts.createBlock(ts.createNodeArray(statements, statementsLocation), node.body, multiLine);
-            if (!multiLine && singleLine) {
-                ts.setEmitFlags(block, 32);
-            }
-            if (closeBraceLocation) {
-                ts.setTokenSourceMapRange(block, 17, closeBraceLocation);
-            }
-            ts.setOriginalNode(block, node.body);
-            return block;
-        }
         function visitExpressionStatement(node) {
             switch (node.expression.kind) {
-                case 179:
+                case 183:
                     return ts.updateStatement(node, visitParenthesizedExpression(node.expression, false));
-                case 188:
+                case 192:
                     return ts.updateStatement(node, visitBinaryExpression(node.expression, false));
             }
             return ts.visitEachChild(node, visitor, context);
@@ -39688,9 +41814,9 @@ var ts;
         function visitParenthesizedExpression(node, needsDestructuringValue) {
             if (needsDestructuringValue) {
                 switch (node.expression.kind) {
-                    case 179:
+                    case 183:
                         return ts.createParen(visitParenthesizedExpression(node.expression, true), node);
-                    case 188:
+                    case 192:
                         return ts.createParen(visitBinaryExpression(node.expression, true), node);
                 }
             }
@@ -39736,7 +41862,7 @@ var ts;
             var declarationList = ts.createVariableDeclarationList(declarations, node);
             ts.setOriginalNode(declarationList, node);
             ts.setCommentRange(declarationList, node);
-            if (node.transformFlags & 8388608
+            if (node.transformFlags & 67108864
                 && (ts.isBindingPattern(node.declarations[0].name)
                     || ts.isBindingPattern(ts.lastOrUndefined(node.declarations).name))) {
                 var firstDeclaration = ts.firstOrUndefined(declarations);
@@ -39755,8 +41881,8 @@ var ts;
                     && ts.isBlock(enclosingBlockScopeContainer)
                     && ts.isIterationStatement(enclosingBlockScopeContainerParent, false));
             var emitExplicitInitializer = !emittedAsTopLevel
-                && enclosingBlockScopeContainer.kind !== 208
-                && enclosingBlockScopeContainer.kind !== 209
+                && enclosingBlockScopeContainer.kind !== 212
+                && enclosingBlockScopeContainer.kind !== 213
                 && (!resolver.isDeclarationWithCollidingName(node)
                     || (isDeclaredInLoop
                         && !isCapturedInFunction
@@ -39818,68 +41944,7 @@ var ts;
             return convertIterationStatementBodyIfNecessary(node, convertForOfToFor);
         }
         function convertForOfToFor(node, convertedLoopBodyStatements) {
-            var expression = ts.visitNode(node.expression, visitor, ts.isExpression);
-            var initializer = node.initializer;
-            var statements = [];
-            var counter = ts.createLoopVariable();
-            var rhsReference = expression.kind === 70
-                ? ts.createUniqueName(expression.text)
-                : ts.createTempVariable(undefined);
-            if (ts.isVariableDeclarationList(initializer)) {
-                if (initializer.flags & 3) {
-                    enableSubstitutionsForBlockScopedBindings();
-                }
-                var firstOriginalDeclaration = ts.firstOrUndefined(initializer.declarations);
-                if (firstOriginalDeclaration && ts.isBindingPattern(firstOriginalDeclaration.name)) {
-                    var declarations = ts.flattenVariableDestructuring(firstOriginalDeclaration, ts.createElementAccess(rhsReference, counter), visitor);
-                    var declarationList = ts.createVariableDeclarationList(declarations, initializer);
-                    ts.setOriginalNode(declarationList, initializer);
-                    var firstDeclaration = declarations[0];
-                    var lastDeclaration = ts.lastOrUndefined(declarations);
-                    ts.setSourceMapRange(declarationList, ts.createRange(firstDeclaration.pos, lastDeclaration.end));
-                    statements.push(ts.createVariableStatement(undefined, declarationList));
-                }
-                else {
-                    statements.push(ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
-                        ts.createVariableDeclaration(firstOriginalDeclaration ? firstOriginalDeclaration.name : ts.createTempVariable(undefined), undefined, ts.createElementAccess(rhsReference, counter))
-                    ], ts.moveRangePos(initializer, -1)), ts.moveRangeEnd(initializer, -1)));
-                }
-            }
-            else {
-                var assignment = ts.createAssignment(initializer, ts.createElementAccess(rhsReference, counter));
-                if (ts.isDestructuringAssignment(assignment)) {
-                    statements.push(ts.createStatement(ts.flattenDestructuringAssignment(context, assignment, false, hoistVariableDeclaration, visitor)));
-                }
-                else {
-                    assignment.end = initializer.end;
-                    statements.push(ts.createStatement(assignment, ts.moveRangeEnd(initializer, -1)));
-                }
-            }
-            var bodyLocation;
-            var statementsLocation;
-            if (convertedLoopBodyStatements) {
-                ts.addRange(statements, convertedLoopBodyStatements);
-            }
-            else {
-                var statement = ts.visitNode(node.statement, visitor, ts.isStatement);
-                if (ts.isBlock(statement)) {
-                    ts.addRange(statements, statement.statements);
-                    bodyLocation = statement;
-                    statementsLocation = statement.statements;
-                }
-                else {
-                    statements.push(statement);
-                }
-            }
-            ts.setEmitFlags(expression, 1536 | ts.getEmitFlags(expression));
-            var body = ts.createBlock(ts.createNodeArray(statements, statementsLocation), bodyLocation);
-            ts.setEmitFlags(body, 1536 | 12288);
-            var forStatement = ts.createFor(ts.createVariableDeclarationList([
-                ts.createVariableDeclaration(counter, undefined, ts.createLiteral(0), ts.moveRangePos(node.expression, -1)),
-                ts.createVariableDeclaration(rhsReference, undefined, expression, node.expression)
-            ], node.expression), ts.createLessThan(counter, ts.createPropertyAccess(rhsReference, "length"), node.expression), ts.createPostfixIncrement(counter, node.expression), body, node);
-            ts.setEmitFlags(forStatement, 8192);
-            return forStatement;
+            return ts.convertForOf(node, convertedLoopBodyStatements, visitor, enableSubstitutionsForBlockScopedBindings, context, false);
         }
         function visitObjectLiteralExpression(node) {
             var properties = node.properties;
@@ -39887,8 +41952,8 @@ var ts;
             var numInitialProperties = numProperties;
             for (var i = 0; i < numProperties; i++) {
                 var property = properties[i];
-                if (property.transformFlags & 16777216
-                    || property.name.kind === 141) {
+                if (property.transformFlags & 134217728
+                    || property.name.kind === 142) {
                     numInitialProperties = i;
                     break;
                 }
@@ -39943,11 +42008,11 @@ var ts;
             var functionName = ts.createUniqueName("_loop");
             var loopInitializer;
             switch (node.kind) {
-                case 207:
-                case 208:
-                case 209:
+                case 211:
+                case 212:
+                case 213:
                     var initializer = node.initializer;
-                    if (initializer && initializer.kind === 220) {
+                    if (initializer && initializer.kind === 224) {
                         loopInitializer = initializer;
                     }
                     break;
@@ -39986,7 +42051,7 @@ var ts;
             }
             var isAsyncBlockContainingAwait = enclosingNonArrowFunction
                 && (ts.getEmitFlags(enclosingNonArrowFunction) & 2097152) !== 0
-                && (node.statement.transformFlags & 16777216) !== 0;
+                && (node.statement.transformFlags & 134217728) !== 0;
             var loopBodyFlags = 0;
             if (currentState.containsLexicalThis) {
                 loopBodyFlags |= 256;
@@ -39994,9 +42059,9 @@ var ts;
             if (isAsyncBlockContainingAwait) {
                 loopBodyFlags |= 2097152;
             }
-            var convertedLoopVariable = ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
+            var convertedLoopVariable = ts.createVariableStatement(undefined, ts.setEmitFlags(ts.createVariableDeclarationList([
                 ts.createVariableDeclaration(functionName, undefined, ts.setEmitFlags(ts.createFunctionExpression(undefined, isAsyncBlockContainingAwait ? ts.createToken(38) : undefined, undefined, undefined, loopParameters, undefined, loopBody), loopBodyFlags))
-            ]));
+            ]), 16777216));
             var statements = [convertedLoopVariable];
             var extraVariableDeclarations;
             if (currentState.argumentsName) {
@@ -40054,7 +42119,7 @@ var ts;
                 loop.transformFlags = 0;
                 ts.aggregateTransformFlags(loop);
             }
-            statements.push(currentParent.kind === 215
+            statements.push(currentParent.kind === 219
                 ? ts.createLabel(currentParent.label, loop)
                 : loop);
             return statements;
@@ -40153,7 +42218,7 @@ var ts;
                 }
             }
             else {
-                loopParameters.push(ts.createParameter(name));
+                loopParameters.push(ts.createParameter(undefined, undefined, undefined, name));
                 if (resolver.getNodeCheckFlags(decl) & 2097152) {
                     var outParamName = ts.createUniqueName("out_" + name.text);
                     loopOutParameters.push({ originalName: name, outParamName: outParamName });
@@ -40166,20 +42231,20 @@ var ts;
             for (var i = start; i < numProperties; i++) {
                 var property = properties[i];
                 switch (property.kind) {
-                    case 150:
                     case 151:
+                    case 152:
                         var accessors = ts.getAllAccessorDeclarations(node.properties, property);
                         if (property === accessors.firstAccessor) {
                             expressions.push(transformAccessorsToExpression(receiver, accessors, node.multiLine));
                         }
                         break;
-                    case 253:
+                    case 257:
                         expressions.push(transformPropertyAssignmentToExpression(property, receiver, node.multiLine));
                         break;
-                    case 254:
+                    case 258:
                         expressions.push(transformShorthandPropertyAssignmentToExpression(property, receiver, node.multiLine));
                         break;
-                    case 148:
+                    case 149:
                         expressions.push(transformObjectLiteralMethodDeclarationToExpression(property, receiver, node.multiLine));
                         break;
                     default:
@@ -40209,6 +42274,19 @@ var ts;
             }
             return expression;
         }
+        function visitCatchClause(node) {
+            ts.Debug.assert(ts.isBindingPattern(node.variableDeclaration.name));
+            var temp = ts.createTempVariable(undefined);
+            var newVariableDeclaration = ts.createVariableDeclaration(temp, undefined, undefined, node.variableDeclaration);
+            var vars = ts.flattenVariableDestructuring(node.variableDeclaration, temp, visitor);
+            var list = ts.createVariableDeclarationList(vars, node.variableDeclaration, node.variableDeclaration.flags);
+            var destructure = ts.createVariableStatement(undefined, list);
+            return ts.updateCatchClause(node, newVariableDeclaration, addStatementToStartOfBlock(node.block, destructure));
+        }
+        function addStatementToStartOfBlock(block, statement) {
+            var transformedStatements = ts.visitNodes(block.statements, visitor, ts.isStatement);
+            return ts.updateBlock(block, [statement].concat(transformedStatements));
+        }
         function visitMethodDeclaration(node) {
             ts.Debug.assert(!ts.isComputedPropertyName(node.name));
             var functionExpression = transformFunctionLikeToExpression(node, ts.moveRangePos(node, -1), undefined);
@@ -40236,7 +42314,7 @@ var ts;
                 ts.setEmitFlags(thisArg, 128);
             }
             var resultingCall;
-            if (node.transformFlags & 1048576) {
+            if (node.transformFlags & 8388608) {
                 resultingCall = ts.createFunctionApply(ts.visitNode(target, visitor, ts.isExpression), ts.visitNode(thisArg, visitor, ts.isExpression), transformAndSpreadElements(node.arguments, false, false, false));
             }
             else {
@@ -40253,35 +42331,35 @@ var ts;
             return resultingCall;
         }
         function visitNewExpression(node) {
-            ts.Debug.assert((node.transformFlags & 1048576) !== 0);
+            ts.Debug.assert((node.transformFlags & 8388608) !== 0);
             var _a = ts.createCallBinding(ts.createPropertyAccess(node.expression, "bind"), hoistVariableDeclaration), target = _a.target, thisArg = _a.thisArg;
             return ts.createNew(ts.createFunctionApply(ts.visitNode(target, visitor, ts.isExpression), thisArg, transformAndSpreadElements(ts.createNodeArray([ts.createVoidZero()].concat(node.arguments)), false, false, false)), undefined, []);
         }
         function transformAndSpreadElements(elements, needsUniqueCopy, multiLine, hasTrailingComma) {
             var numElements = elements.length;
-            var segments = ts.flatten(ts.spanMap(elements, partitionSpreadElement, function (partition, visitPartition, _start, end) {
+            var segments = ts.flatten(ts.spanMap(elements, partitionSpread, function (partition, visitPartition, _start, end) {
                 return visitPartition(partition, multiLine, hasTrailingComma && end === numElements);
             }));
             if (segments.length === 1) {
                 var firstElement = elements[0];
-                return needsUniqueCopy && ts.isSpreadElementExpression(firstElement) && firstElement.expression.kind !== 171
+                return needsUniqueCopy && ts.isSpreadExpression(firstElement) && firstElement.expression.kind !== 175
                     ? ts.createArraySlice(segments[0])
                     : segments[0];
             }
             return ts.createArrayConcat(segments.shift(), segments);
         }
-        function partitionSpreadElement(node) {
-            return ts.isSpreadElementExpression(node)
-                ? visitSpanOfSpreadElements
-                : visitSpanOfNonSpreadElements;
+        function partitionSpread(node) {
+            return ts.isSpreadExpression(node)
+                ? visitSpanOfSpreads
+                : visitSpanOfNonSpreads;
         }
-        function visitSpanOfSpreadElements(chunk) {
-            return ts.map(chunk, visitExpressionOfSpreadElement);
+        function visitSpanOfSpreads(chunk) {
+            return ts.map(chunk, visitExpressionOfSpread);
         }
-        function visitSpanOfNonSpreadElements(chunk, multiLine, hasTrailingComma) {
+        function visitSpanOfNonSpreads(chunk, multiLine, hasTrailingComma) {
             return ts.createArrayLiteral(ts.visitNodes(ts.createNodeArray(chunk, undefined, hasTrailingComma), visitor, ts.isExpression), undefined, multiLine);
         }
-        function visitExpressionOfSpreadElement(node) {
+        function visitExpressionOfSpread(node) {
             return ts.visitNode(node.expression, visitor, ts.isExpression);
         }
         function visitTemplateLiteral(node) {
@@ -40354,7 +42432,7 @@ var ts;
             return enclosingNonAsyncFunctionBody
                 && ts.isClassElement(enclosingNonAsyncFunctionBody)
                 && !ts.hasModifier(enclosingNonAsyncFunctionBody, 32)
-                && currentParent.kind !== 175
+                && currentParent.kind !== 179
                 ? ts.createPropertyAccess(ts.createIdentifier("_super"), "prototype")
                 : ts.createIdentifier("_super");
         }
@@ -40363,7 +42441,7 @@ var ts;
             var statements = [];
             startLexicalEnvironment();
             ts.addRange(statements, prologue);
-            addCaptureThisForNodeIfNeeded(statements, node);
+            ts.addCaptureThisForNodeIfNeeded(statements, node, enableSubstitutionsForCapturedThis);
             ts.addRange(statements, ts.visitNodes(ts.createNodeArray(remaining), visitor, ts.isStatement));
             ts.addRange(statements, endLexicalEnvironment());
             var clone = ts.getMutableClone(node);
@@ -40388,13 +42466,13 @@ var ts;
             if ((enabledSubstitutions & 1) === 0) {
                 enabledSubstitutions |= 1;
                 context.enableSubstitution(98);
-                context.enableEmitNotification(149);
-                context.enableEmitNotification(148);
                 context.enableEmitNotification(150);
+                context.enableEmitNotification(149);
                 context.enableEmitNotification(151);
-                context.enableEmitNotification(181);
-                context.enableEmitNotification(180);
-                context.enableEmitNotification(221);
+                context.enableEmitNotification(152);
+                context.enableEmitNotification(185);
+                context.enableEmitNotification(184);
+                context.enableEmitNotification(225);
             }
         }
         function onSubstituteNode(emitContext, node) {
@@ -40419,10 +42497,10 @@ var ts;
         function isNameOfDeclarationWithCollidingName(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 170:
-                case 222:
-                case 225:
-                case 219:
+                case 174:
+                case 226:
+                case 229:
+                case 223:
                     return parent.name === node
                         && resolver.isDeclarationWithCollidingName(parent);
             }
@@ -40454,28 +42532,8 @@ var ts;
             }
             return node;
         }
-        function getLocalName(node, allowComments, allowSourceMaps) {
-            return getDeclarationName(node, allowComments, allowSourceMaps, 262144);
-        }
-        function getDeclarationName(node, allowComments, allowSourceMaps, emitFlags) {
-            if (node.name && !ts.isGeneratedIdentifier(node.name)) {
-                var name_33 = ts.getMutableClone(node.name);
-                emitFlags |= ts.getEmitFlags(node.name);
-                if (!allowSourceMaps) {
-                    emitFlags |= 1536;
-                }
-                if (!allowComments) {
-                    emitFlags |= 49152;
-                }
-                if (emitFlags) {
-                    ts.setEmitFlags(name_33, emitFlags);
-                }
-                return name_33;
-            }
-            return ts.getGeneratedNameForNode(node);
-        }
         function getClassMemberPrefix(node, member) {
-            var expression = getLocalName(node);
+            var expression = ts.getLocalName(node);
             return ts.hasModifier(member, 32) ? expression : ts.createPropertyAccess(expression, "prototype");
         }
         function hasSynthesizedDefaultSuperCall(constructor, hasExtendsClause) {
@@ -40487,11 +42545,11 @@ var ts;
                 return false;
             }
             var statement = ts.firstOrUndefined(constructor.body.statements);
-            if (!statement || !ts.nodeIsSynthesized(statement) || statement.kind !== 203) {
+            if (!statement || !ts.nodeIsSynthesized(statement) || statement.kind !== 207) {
                 return false;
             }
             var statementExpression = statement.expression;
-            if (!ts.nodeIsSynthesized(statementExpression) || statementExpression.kind !== 175) {
+            if (!ts.nodeIsSynthesized(statementExpression) || statementExpression.kind !== 179) {
                 return false;
             }
             var callTarget = statementExpression.expression;
@@ -40499,7 +42557,7 @@ var ts;
                 return false;
             }
             var callArgument = ts.singleOrUndefined(statementExpression.arguments);
-            if (!callArgument || !ts.nodeIsSynthesized(callArgument) || callArgument.kind !== 192) {
+            if (!callArgument || !ts.nodeIsSynthesized(callArgument) || callArgument.kind !== 196) {
                 return false;
             }
             var expression = callArgument.expression;
@@ -40510,51 +42568,6 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    var OpCode;
-    (function (OpCode) {
-        OpCode[OpCode["Nop"] = 0] = "Nop";
-        OpCode[OpCode["Statement"] = 1] = "Statement";
-        OpCode[OpCode["Assign"] = 2] = "Assign";
-        OpCode[OpCode["Break"] = 3] = "Break";
-        OpCode[OpCode["BreakWhenTrue"] = 4] = "BreakWhenTrue";
-        OpCode[OpCode["BreakWhenFalse"] = 5] = "BreakWhenFalse";
-        OpCode[OpCode["Yield"] = 6] = "Yield";
-        OpCode[OpCode["YieldStar"] = 7] = "YieldStar";
-        OpCode[OpCode["Return"] = 8] = "Return";
-        OpCode[OpCode["Throw"] = 9] = "Throw";
-        OpCode[OpCode["Endfinally"] = 10] = "Endfinally";
-    })(OpCode || (OpCode = {}));
-    var BlockAction;
-    (function (BlockAction) {
-        BlockAction[BlockAction["Open"] = 0] = "Open";
-        BlockAction[BlockAction["Close"] = 1] = "Close";
-    })(BlockAction || (BlockAction = {}));
-    var CodeBlockKind;
-    (function (CodeBlockKind) {
-        CodeBlockKind[CodeBlockKind["Exception"] = 0] = "Exception";
-        CodeBlockKind[CodeBlockKind["With"] = 1] = "With";
-        CodeBlockKind[CodeBlockKind["Switch"] = 2] = "Switch";
-        CodeBlockKind[CodeBlockKind["Loop"] = 3] = "Loop";
-        CodeBlockKind[CodeBlockKind["Labeled"] = 4] = "Labeled";
-    })(CodeBlockKind || (CodeBlockKind = {}));
-    var ExceptionBlockState;
-    (function (ExceptionBlockState) {
-        ExceptionBlockState[ExceptionBlockState["Try"] = 0] = "Try";
-        ExceptionBlockState[ExceptionBlockState["Catch"] = 1] = "Catch";
-        ExceptionBlockState[ExceptionBlockState["Finally"] = 2] = "Finally";
-        ExceptionBlockState[ExceptionBlockState["Done"] = 3] = "Done";
-    })(ExceptionBlockState || (ExceptionBlockState = {}));
-    var Instruction;
-    (function (Instruction) {
-        Instruction[Instruction["Next"] = 0] = "Next";
-        Instruction[Instruction["Throw"] = 1] = "Throw";
-        Instruction[Instruction["Return"] = 2] = "Return";
-        Instruction[Instruction["Break"] = 3] = "Break";
-        Instruction[Instruction["Yield"] = 4] = "Yield";
-        Instruction[Instruction["YieldStar"] = 5] = "YieldStar";
-        Instruction[Instruction["Catch"] = 6] = "Catch";
-        Instruction[Instruction["Endfinally"] = 7] = "Endfinally";
-    })(Instruction || (Instruction = {}));
     var instructionNames = ts.createMap((_a = {},
         _a[2] = "return",
         _a[3] = "break",
@@ -40600,7 +42613,7 @@ var ts;
             if (ts.isDeclarationFile(node)) {
                 return node;
             }
-            if (node.transformFlags & 4096) {
+            if (node.transformFlags & 8192) {
                 currentSourceFile = node;
                 node = ts.visitEachChild(node, visitor, context);
                 currentSourceFile = undefined;
@@ -40615,10 +42628,10 @@ var ts;
             else if (inGeneratorFunctionBody) {
                 return visitJavaScriptInGeneratorFunctionBody(node);
             }
-            else if (transformFlags & 2048) {
+            else if (transformFlags & 4096) {
                 return visitGenerator(node);
             }
-            else if (transformFlags & 4096) {
+            else if (transformFlags & 8192) {
                 return ts.visitEachChild(node, visitor, context);
             }
             else {
@@ -40627,13 +42640,13 @@ var ts;
         }
         function visitJavaScriptInStatementContainingYield(node) {
             switch (node.kind) {
-                case 205:
+                case 209:
                     return visitDoStatement(node);
-                case 206:
+                case 210:
                     return visitWhileStatement(node);
-                case 214:
+                case 218:
                     return visitSwitchStatement(node);
-                case 215:
+                case 219:
                     return visitLabeledStatement(node);
                 default:
                     return visitJavaScriptInGeneratorFunctionBody(node);
@@ -40641,30 +42654,30 @@ var ts;
         }
         function visitJavaScriptInGeneratorFunctionBody(node) {
             switch (node.kind) {
-                case 221:
+                case 225:
                     return visitFunctionDeclaration(node);
-                case 180:
+                case 184:
                     return visitFunctionExpression(node);
-                case 150:
                 case 151:
+                case 152:
                     return visitAccessorDeclaration(node);
-                case 201:
+                case 205:
                     return visitVariableStatement(node);
-                case 207:
-                    return visitForStatement(node);
-                case 208:
-                    return visitForInStatement(node);
                 case 211:
-                    return visitBreakStatement(node);
-                case 210:
-                    return visitContinueStatement(node);
+                    return visitForStatement(node);
                 case 212:
+                    return visitForInStatement(node);
+                case 215:
+                    return visitBreakStatement(node);
+                case 214:
+                    return visitContinueStatement(node);
+                case 216:
                     return visitReturnStatement(node);
                 default:
-                    if (node.transformFlags & 16777216) {
+                    if (node.transformFlags & 134217728) {
                         return visitJavaScriptContainingYield(node);
                     }
-                    else if (node.transformFlags & (4096 | 33554432)) {
+                    else if (node.transformFlags & (8192 | 268435456)) {
                         return ts.visitEachChild(node, visitor, context);
                     }
                     else {
@@ -40674,21 +42687,21 @@ var ts;
         }
         function visitJavaScriptContainingYield(node) {
             switch (node.kind) {
-                case 188:
+                case 192:
                     return visitBinaryExpression(node);
-                case 189:
+                case 193:
                     return visitConditionalExpression(node);
-                case 191:
+                case 195:
                     return visitYieldExpression(node);
-                case 171:
-                    return visitArrayLiteralExpression(node);
-                case 172:
-                    return visitObjectLiteralExpression(node);
-                case 174:
-                    return visitElementAccessExpression(node);
                 case 175:
-                    return visitCallExpression(node);
+                    return visitArrayLiteralExpression(node);
                 case 176:
+                    return visitObjectLiteralExpression(node);
+                case 178:
+                    return visitElementAccessExpression(node);
+                case 179:
+                    return visitCallExpression(node);
+                case 180:
                     return visitNewExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -40696,9 +42709,9 @@ var ts;
         }
         function visitGenerator(node) {
             switch (node.kind) {
-                case 221:
+                case 225:
                     return visitFunctionDeclaration(node);
-                case 180:
+                case 184:
                     return visitFunctionExpression(node);
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -40801,7 +42814,7 @@ var ts;
             return ts.createBlock(statements, body, body.multiLine);
         }
         function visitVariableStatement(node) {
-            if (node.transformFlags & 16777216) {
+            if (node.transformFlags & 134217728) {
                 transformAndEmitVariableDeclarationList(node.declarationList);
                 return undefined;
             }
@@ -40855,10 +42868,10 @@ var ts;
             if (containsYield(right)) {
                 var target = void 0;
                 switch (left.kind) {
-                    case 173:
+                    case 177:
                         target = ts.updatePropertyAccess(left, cacheExpression(ts.visitNode(left.expression, visitor, ts.isLeftHandSideExpression)), left.name);
                         break;
-                    case 174:
+                    case 178:
                         target = ts.updateElementAccess(left, cacheExpression(ts.visitNode(left.expression, visitor, ts.isLeftHandSideExpression)), cacheExpression(ts.visitNode(left.argumentExpression, visitor, ts.isExpression)));
                         break;
                     default:
@@ -41050,35 +43063,35 @@ var ts;
         }
         function transformAndEmitStatementWorker(node) {
             switch (node.kind) {
-                case 200:
-                    return transformAndEmitBlock(node);
-                case 203:
-                    return transformAndEmitExpressionStatement(node);
                 case 204:
-                    return transformAndEmitIfStatement(node);
-                case 205:
-                    return transformAndEmitDoStatement(node);
-                case 206:
-                    return transformAndEmitWhileStatement(node);
+                    return transformAndEmitBlock(node);
                 case 207:
-                    return transformAndEmitForStatement(node);
+                    return transformAndEmitExpressionStatement(node);
                 case 208:
-                    return transformAndEmitForInStatement(node);
+                    return transformAndEmitIfStatement(node);
+                case 209:
+                    return transformAndEmitDoStatement(node);
                 case 210:
-                    return transformAndEmitContinueStatement(node);
+                    return transformAndEmitWhileStatement(node);
                 case 211:
-                    return transformAndEmitBreakStatement(node);
+                    return transformAndEmitForStatement(node);
                 case 212:
-                    return transformAndEmitReturnStatement(node);
-                case 213:
-                    return transformAndEmitWithStatement(node);
+                    return transformAndEmitForInStatement(node);
                 case 214:
-                    return transformAndEmitSwitchStatement(node);
+                    return transformAndEmitContinueStatement(node);
                 case 215:
-                    return transformAndEmitLabeledStatement(node);
+                    return transformAndEmitBreakStatement(node);
                 case 216:
-                    return transformAndEmitThrowStatement(node);
+                    return transformAndEmitReturnStatement(node);
                 case 217:
+                    return transformAndEmitWithStatement(node);
+                case 218:
+                    return transformAndEmitSwitchStatement(node);
+                case 219:
+                    return transformAndEmitLabeledStatement(node);
+                case 220:
+                    return transformAndEmitThrowStatement(node);
+                case 221:
                     return transformAndEmitTryStatement(node);
                 default:
                     return emitStatement(ts.visitNode(node, visitor, ts.isStatement, true));
@@ -41362,7 +43375,7 @@ var ts;
                 for (var i = 0; i < numClauses; i++) {
                     var clause = caseBlock.clauses[i];
                     clauseLabels.push(defineLabel());
-                    if (clause.kind === 250 && defaultClauseIndex === -1) {
+                    if (clause.kind === 254 && defaultClauseIndex === -1) {
                         defaultClauseIndex = i;
                     }
                 }
@@ -41372,7 +43385,7 @@ var ts;
                     var defaultClausesSkipped = 0;
                     for (var i = clausesWritten; i < numClauses; i++) {
                         var clause = caseBlock.clauses[i];
-                        if (clause.kind === 249) {
+                        if (clause.kind === 253) {
                             var caseClause = clause;
                             if (containsYield(caseClause.expression) && pendingClauses.length > 0) {
                                 break;
@@ -41463,7 +43476,7 @@ var ts;
             }
         }
         function containsYield(node) {
-            return node && (node.transformFlags & 16777216) !== 0;
+            return node && (node.transformFlags & 134217728) !== 0;
         }
         function countInitialNodesWithoutYield(nodes) {
             var numNodes = nodes.length;
@@ -41493,9 +43506,9 @@ var ts;
                 if (ts.isIdentifier(original) && original.parent) {
                     var declaration = resolver.getReferencedValueDeclaration(original);
                     if (declaration) {
-                        var name_34 = ts.getProperty(renamedCatchVariableDeclarations, String(ts.getOriginalNodeId(declaration)));
-                        if (name_34) {
-                            var clone_8 = ts.getMutableClone(name_34);
+                        var name_37 = ts.getProperty(renamedCatchVariableDeclarations, String(ts.getOriginalNodeId(declaration)));
+                        if (name_37) {
+                            var clone_8 = ts.getMutableClone(name_37);
                             ts.setSourceMapRange(clone_8, node);
                             ts.setCommentRange(clone_8, node);
                             return clone_8;
@@ -41794,7 +43807,7 @@ var ts;
                 if (labelExpressions === undefined) {
                     labelExpressions = [];
                 }
-                var expression = ts.createSynthesizedNode(8);
+                var expression = ts.createLiteral(-1);
                 if (labelExpressions[label] === undefined) {
                     labelExpressions[label] = [expression];
                 }
@@ -41803,7 +43816,7 @@ var ts;
                 }
                 return expression;
             }
-            return ts.createNode(194);
+            return ts.createOmittedExpression();
         }
         function createInstruction(instruction) {
             var literal = ts.createLiteral(instruction);
@@ -41891,7 +43904,7 @@ var ts;
             var buildResult = buildStatements();
             return ts.createCall(ts.createHelperName(currentSourceFile.externalHelpersModuleName, "__generator"), undefined, [
                 ts.createThis(),
-                ts.setEmitFlags(ts.createFunctionExpression(undefined, undefined, undefined, undefined, [ts.createParameter(state)], undefined, ts.createBlock(buildResult, undefined, buildResult.length > 0)), 4194304)
+                ts.setEmitFlags(ts.createFunctionExpression(undefined, undefined, undefined, undefined, [ts.createParameter(undefined, undefined, undefined, state)], undefined, ts.createBlock(buildResult, undefined, buildResult.length > 0)), 4194304)
             ]);
         }
         function buildStatements() {
@@ -42162,8 +44175,8 @@ var ts;
     function transformES5(context) {
         var previousOnSubstituteNode = context.onSubstituteNode;
         context.onSubstituteNode = onSubstituteNode;
-        context.enableSubstitution(173);
-        context.enableSubstitution(253);
+        context.enableSubstitution(177);
+        context.enableSubstitution(257);
         return transformSourceFile;
         function transformSourceFile(node) {
             return node;
@@ -42222,48 +44235,40 @@ var ts;
         context.onSubstituteNode = onSubstituteNode;
         context.onEmitNode = onEmitNode;
         context.enableSubstitution(70);
-        context.enableSubstitution(188);
-        context.enableSubstitution(186);
-        context.enableSubstitution(187);
-        context.enableSubstitution(254);
-        context.enableEmitNotification(256);
+        context.enableSubstitution(192);
+        context.enableSubstitution(190);
+        context.enableSubstitution(191);
+        context.enableSubstitution(258);
+        context.enableEmitNotification(261);
+        var moduleInfoMap = ts.createMap();
+        var deferredExports = ts.createMap();
         var currentSourceFile;
-        var externalImports;
-        var exportSpecifiers;
-        var exportEquals;
-        var bindingNameExportSpecifiersMap;
-        var bindingNameExportSpecifiersForFileMap = ts.createMap();
-        var hasExportStarsToExportValues;
+        var currentModuleInfo;
+        var noSubstitution;
         return transformSourceFile;
         function transformSourceFile(node) {
-            if (ts.isDeclarationFile(node)) {
+            if (ts.isDeclarationFile(node)
+                || !(ts.isExternalModule(node)
+                    || compilerOptions.isolatedModules)) {
                 return node;
             }
-            if (ts.isExternalModule(node) || compilerOptions.isolatedModules) {
-                currentSourceFile = node;
-                (_a = ts.collectExternalModuleInfo(node), externalImports = _a.externalImports, exportSpecifiers = _a.exportSpecifiers, exportEquals = _a.exportEquals, hasExportStarsToExportValues = _a.hasExportStarsToExportValues, _a);
-                var transformModule_1 = transformModuleDelegates[moduleKind] || transformModuleDelegates[ts.ModuleKind.None];
-                var updated = transformModule_1(node);
-                ts.aggregateTransformFlags(updated);
-                currentSourceFile = undefined;
-                externalImports = undefined;
-                exportSpecifiers = undefined;
-                exportEquals = undefined;
-                hasExportStarsToExportValues = false;
-                return updated;
-            }
-            return node;
-            var _a;
+            currentSourceFile = node;
+            currentModuleInfo = moduleInfoMap[ts.getOriginalNodeId(node)] = ts.collectExternalModuleInfo(node, resolver);
+            var transformModule = transformModuleDelegates[moduleKind] || transformModuleDelegates[ts.ModuleKind.None];
+            var updated = transformModule(node);
+            currentSourceFile = undefined;
+            currentModuleInfo = undefined;
+            return ts.aggregateTransformFlags(updated);
         }
         function transformCommonJSModule(node) {
             startLexicalEnvironment();
             var statements = [];
-            var statementOffset = ts.addPrologueDirectives(statements, node.statements, !compilerOptions.noImplicitUseStrict, visitor);
-            ts.addRange(statements, ts.visitNodes(node.statements, visitor, ts.isStatement, statementOffset));
+            var statementOffset = ts.addPrologueDirectives(statements, node.statements, !compilerOptions.noImplicitUseStrict, sourceElementVisitor);
+            ts.addRange(statements, ts.visitNodes(node.statements, sourceElementVisitor, ts.isStatement, statementOffset));
             ts.addRange(statements, endLexicalEnvironment());
             addExportEqualsIfNeeded(statements, false);
-            var updated = updateSourceFile(node, statements);
-            if (hasExportStarsToExportValues) {
+            var updated = ts.updateSourceFileNode(node, ts.createNodeArray(statements, node.statements));
+            if (currentModuleInfo.hasExportStarsToExportValues) {
                 ts.setEmitFlags(updated, 2 | ts.getEmitFlags(node));
             }
             return updated;
@@ -42280,77 +44285,105 @@ var ts;
         }
         function transformAsynchronousModule(node, define, moduleName, includeNonAmdDependencies) {
             var _a = collectAsynchronousDependencies(node, includeNonAmdDependencies), aliasedModuleNames = _a.aliasedModuleNames, unaliasedModuleNames = _a.unaliasedModuleNames, importAliasNames = _a.importAliasNames;
-            return updateSourceFile(node, [
+            return ts.updateSourceFileNode(node, ts.createNodeArray([
                 ts.createStatement(ts.createCall(define, undefined, (moduleName ? [moduleName] : []).concat([
                     ts.createArrayLiteral([
                         ts.createLiteral("require"),
                         ts.createLiteral("exports")
                     ].concat(aliasedModuleNames, unaliasedModuleNames)),
                     ts.createFunctionExpression(undefined, undefined, undefined, undefined, [
-                        ts.createParameter("require"),
-                        ts.createParameter("exports")
+                        ts.createParameter(undefined, undefined, undefined, "require"),
+                        ts.createParameter(undefined, undefined, undefined, "exports")
                     ].concat(importAliasNames), undefined, transformAsynchronousModuleBody(node))
                 ])))
-            ]);
+            ], node.statements));
+        }
+        function collectAsynchronousDependencies(node, includeNonAmdDependencies) {
+            var aliasedModuleNames = [];
+            var unaliasedModuleNames = [];
+            var importAliasNames = [];
+            for (var _i = 0, _a = node.amdDependencies; _i < _a.length; _i++) {
+                var amdDependency = _a[_i];
+                if (amdDependency.name) {
+                    aliasedModuleNames.push(ts.createLiteral(amdDependency.path));
+                    importAliasNames.push(ts.createParameter(undefined, undefined, undefined, amdDependency.name));
+                }
+                else {
+                    unaliasedModuleNames.push(ts.createLiteral(amdDependency.path));
+                }
+            }
+            for (var _b = 0, _c = currentModuleInfo.externalImports; _b < _c.length; _b++) {
+                var importNode = _c[_b];
+                var externalModuleName = ts.getExternalModuleNameLiteral(importNode, currentSourceFile, host, resolver, compilerOptions);
+                var importAliasName = ts.getLocalNameForExternalImport(importNode, currentSourceFile);
+                if (includeNonAmdDependencies && importAliasName) {
+                    ts.setEmitFlags(importAliasName, 128);
+                    aliasedModuleNames.push(externalModuleName);
+                    importAliasNames.push(ts.createParameter(undefined, undefined, undefined, importAliasName));
+                }
+                else {
+                    unaliasedModuleNames.push(externalModuleName);
+                }
+            }
+            return { aliasedModuleNames: aliasedModuleNames, unaliasedModuleNames: unaliasedModuleNames, importAliasNames: importAliasNames };
         }
         function transformAsynchronousModuleBody(node) {
             startLexicalEnvironment();
             var statements = [];
-            var statementOffset = ts.addPrologueDirectives(statements, node.statements, !compilerOptions.noImplicitUseStrict, visitor);
-            ts.addRange(statements, ts.visitNodes(node.statements, visitor, ts.isStatement, statementOffset));
+            var statementOffset = ts.addPrologueDirectives(statements, node.statements, !compilerOptions.noImplicitUseStrict, sourceElementVisitor);
+            ts.addRange(statements, ts.visitNodes(node.statements, sourceElementVisitor, ts.isStatement, statementOffset));
             ts.addRange(statements, endLexicalEnvironment());
             addExportEqualsIfNeeded(statements, true);
             var body = ts.createBlock(statements, undefined, true);
-            if (hasExportStarsToExportValues) {
+            if (currentModuleInfo.hasExportStarsToExportValues) {
                 ts.setEmitFlags(body, 2);
             }
             return body;
         }
         function addExportEqualsIfNeeded(statements, emitAsReturn) {
-            if (exportEquals) {
+            if (currentModuleInfo.exportEquals) {
                 if (emitAsReturn) {
-                    var statement = ts.createReturn(exportEquals.expression, exportEquals);
+                    var statement = ts.createReturn(currentModuleInfo.exportEquals.expression, currentModuleInfo.exportEquals);
                     ts.setEmitFlags(statement, 12288 | 49152);
                     statements.push(statement);
                 }
                 else {
-                    var statement = ts.createStatement(ts.createAssignment(ts.createPropertyAccess(ts.createIdentifier("module"), "exports"), exportEquals.expression), exportEquals);
+                    var statement = ts.createStatement(ts.createAssignment(ts.createPropertyAccess(ts.createIdentifier("module"), "exports"), currentModuleInfo.exportEquals.expression), currentModuleInfo.exportEquals);
                     ts.setEmitFlags(statement, 49152);
                     statements.push(statement);
                 }
             }
         }
-        function visitor(node) {
+        function sourceElementVisitor(node) {
             switch (node.kind) {
-                case 231:
+                case 235:
                     return visitImportDeclaration(node);
-                case 230:
+                case 234:
                     return visitImportEqualsDeclaration(node);
-                case 237:
+                case 241:
                     return visitExportDeclaration(node);
-                case 236:
+                case 240:
                     return visitExportAssignment(node);
-                case 201:
+                case 205:
                     return visitVariableStatement(node);
-                case 221:
+                case 225:
                     return visitFunctionDeclaration(node);
-                case 222:
+                case 226:
                     return visitClassDeclaration(node);
-                case 203:
-                    return visitExpressionStatement(node);
+                case 294:
+                    return visitMergeDeclarationMarker(node);
+                case 295:
+                    return visitEndOfDeclarationMarker(node);
                 default:
                     return node;
             }
         }
         function visitImportDeclaration(node) {
-            if (!ts.contains(externalImports, node)) {
-                return undefined;
-            }
-            var statements = [];
+            var statements;
             var namespaceDeclaration = ts.getNamespaceDeclarationNode(node);
             if (moduleKind !== ts.ModuleKind.AMD) {
                 if (!node.importClause) {
-                    statements.push(ts.createStatement(createRequireCall(node), node));
+                    return ts.createStatement(createRequireCall(node), node);
                 }
                 else {
                     var variables = [];
@@ -42363,43 +44396,60 @@ var ts;
                             variables.push(ts.createVariableDeclaration(ts.getSynthesizedClone(namespaceDeclaration.name), undefined, ts.getGeneratedNameForNode(node)));
                         }
                     }
-                    statements.push(ts.createVariableStatement(undefined, ts.createConstDeclarationList(variables), node));
+                    statements = ts.append(statements, ts.createVariableStatement(undefined, ts.createVariableDeclarationList(variables, undefined, languageVersion >= 2 ? 2 : 0), node));
                 }
             }
             else if (namespaceDeclaration && ts.isDefaultImport(node)) {
-                statements.push(ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
+                statements = ts.append(statements, ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
                     ts.createVariableDeclaration(ts.getSynthesizedClone(namespaceDeclaration.name), undefined, ts.getGeneratedNameForNode(node), node)
-                ])));
+                ], undefined, languageVersion >= 2 ? 2 : 0)));
+            }
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfImportDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfImportDeclaration(statements, node);
             }
-            addExportImportAssignments(statements, node);
             return ts.singleOrMany(statements);
         }
-        function visitImportEqualsDeclaration(node) {
-            if (!ts.contains(externalImports, node)) {
-                return undefined;
+        function createRequireCall(importNode) {
+            var moduleName = ts.getExternalModuleNameLiteral(importNode, currentSourceFile, host, resolver, compilerOptions);
+            var args = [];
+            if (moduleName) {
+                args.push(moduleName);
             }
-            ts.setEmitFlags(node.name, 128);
-            var statements = [];
+            return ts.createCall(ts.createIdentifier("require"), undefined, args);
+        }
+        function visitImportEqualsDeclaration(node) {
+            ts.Debug.assert(ts.isExternalModuleImportEqualsDeclaration(node), "import= for internal module references should be handled in an earlier transformer.");
+            var statements;
             if (moduleKind !== ts.ModuleKind.AMD) {
                 if (ts.hasModifier(node, 1)) {
-                    statements.push(ts.createStatement(createExportAssignment(node.name, createRequireCall(node)), node));
+                    statements = ts.append(statements, ts.createStatement(createExportExpression(node.name, createRequireCall(node)), node));
                 }
                 else {
-                    statements.push(ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
+                    statements = ts.append(statements, ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
                         ts.createVariableDeclaration(ts.getSynthesizedClone(node.name), undefined, createRequireCall(node))
                     ], undefined, languageVersion >= 2 ? 2 : 0), node));
                 }
             }
             else {
                 if (ts.hasModifier(node, 1)) {
-                    statements.push(ts.createStatement(createExportAssignment(node.name, node.name), node));
+                    statements = ts.append(statements, ts.createStatement(createExportExpression(ts.getExportName(node), ts.getLocalName(node)), node));
                 }
             }
-            addExportImportAssignments(statements, node);
-            return statements;
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfImportEqualsDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfImportEqualsDeclaration(statements, node);
+            }
+            return ts.singleOrMany(statements);
         }
         function visitExportDeclaration(node) {
-            if (!ts.contains(externalImports, node)) {
+            if (!node.moduleSpecifier) {
                 return undefined;
             }
             var generatedName = ts.getGeneratedNameForNode(node);
@@ -42413,7 +44463,7 @@ var ts;
                 for (var _i = 0, _a = node.exportClause.elements; _i < _a.length; _i++) {
                     var specifier = _a[_i];
                     var exportedValue = ts.createPropertyAccess(generatedName, specifier.propertyName || specifier.name);
-                    statements.push(ts.createStatement(createExportAssignment(specifier.name, exportedValue), specifier));
+                    statements.push(ts.createStatement(createExportExpression(ts.getExportName(specifier), exportedValue), specifier));
                 }
                 return ts.singleOrMany(statements);
             }
@@ -42429,195 +44479,248 @@ var ts;
             if (node.isExportEquals) {
                 return undefined;
             }
-            var statements = [];
-            addExportDefault(statements, node.expression, node);
-            return statements;
-        }
-        function addExportDefault(statements, expression, location) {
-            tryAddExportDefaultCompat(statements);
-            statements.push(ts.createStatement(createExportAssignment(ts.createIdentifier("default"), expression), location));
-        }
-        function tryAddExportDefaultCompat(statements) {
-            var original = ts.getOriginalNode(currentSourceFile);
-            ts.Debug.assert(original.kind === 256);
-            if (!original.symbol.exports["___esModule"]) {
-                if (languageVersion === 0) {
-                    statements.push(ts.createStatement(createExportAssignment(ts.createIdentifier("__esModule"), ts.createLiteral(true))));
-                }
-                else {
-                    statements.push(ts.createStatement(ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Object"), "defineProperty"), undefined, [
-                        ts.createIdentifier("exports"),
-                        ts.createLiteral("__esModule"),
-                        ts.createObjectLiteral([
-                            ts.createPropertyAssignment("value", ts.createLiteral(true))
-                        ])
-                    ])));
-                }
-            }
-        }
-        function addExportImportAssignments(statements, node) {
-            if (ts.isImportEqualsDeclaration(node)) {
-                addExportMemberAssignments(statements, node.name);
+            var statements;
+            var original = node.original;
+            if (original && hasAssociatedEndOfDeclarationMarker(original)) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportStatement(deferredExports[id], ts.createIdentifier("default"), node.expression, node, true);
             }
             else {
-                var names = ts.reduceEachChild(node, collectExportMembers, []);
-                for (var _i = 0, names_1 = names; _i < names_1.length; _i++) {
-                    var name_35 = names_1[_i];
-                    addExportMemberAssignments(statements, name_35);
-                }
-            }
-        }
-        function collectExportMembers(names, node) {
-            if (ts.isAliasSymbolDeclaration(node) && ts.isDeclaration(node)) {
-                var name_36 = node.name;
-                if (ts.isIdentifier(name_36)) {
-                    names.push(name_36);
-                }
-            }
-            return ts.reduceEachChild(node, collectExportMembers, names);
-        }
-        function addExportMemberAssignments(statements, name) {
-            if (!exportEquals && exportSpecifiers && ts.hasProperty(exportSpecifiers, name.text)) {
-                for (var _i = 0, _a = exportSpecifiers[name.text]; _i < _a.length; _i++) {
-                    var specifier = _a[_i];
-                    statements.push(ts.startOnNewLine(ts.createStatement(createExportAssignment(specifier.name, name), specifier.name)));
-                }
-            }
-        }
-        function addExportMemberAssignment(statements, node) {
-            if (ts.hasModifier(node, 512)) {
-                addExportDefault(statements, getDeclarationName(node), node);
-            }
-            else {
-                statements.push(createExportStatement(node.name, ts.setEmitFlags(ts.getSynthesizedClone(node.name), 262144), node));
-            }
-        }
-        function visitVariableStatement(node) {
-            var originalKind = ts.getOriginalNode(node).kind;
-            if (originalKind === 226 ||
-                originalKind === 225 ||
-                originalKind === 222) {
-                if (!ts.hasModifier(node, 1)) {
-                    return node;
-                }
-                return ts.setOriginalNode(ts.createVariableStatement(undefined, node.declarationList), node);
-            }
-            var resultStatements = [];
-            if (ts.hasModifier(node, 1)) {
-                var variables = ts.getInitializedVariables(node.declarationList);
-                if (variables.length > 0) {
-                    var inlineAssignments = ts.createStatement(ts.inlineExpressions(ts.map(variables, transformInitializedVariable)), node);
-                    resultStatements.push(inlineAssignments);
-                }
-            }
-            else {
-                resultStatements.push(node);
-            }
-            for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
-                var decl = _a[_i];
-                addExportMemberAssignmentsForBindingName(resultStatements, decl.name);
-            }
-            return resultStatements;
-        }
-        function addExportMemberAssignmentsForBindingName(resultStatements, name) {
-            if (ts.isBindingPattern(name)) {
-                for (var _i = 0, _a = name.elements; _i < _a.length; _i++) {
-                    var element = _a[_i];
-                    if (!ts.isOmittedExpression(element)) {
-                        addExportMemberAssignmentsForBindingName(resultStatements, element.name);
-                    }
-                }
-            }
-            else {
-                if (!exportEquals && exportSpecifiers && ts.hasProperty(exportSpecifiers, name.text)) {
-                    var sourceFileId = ts.getOriginalNodeId(currentSourceFile);
-                    if (!bindingNameExportSpecifiersForFileMap[sourceFileId]) {
-                        bindingNameExportSpecifiersForFileMap[sourceFileId] = ts.createMap();
-                    }
-                    bindingNameExportSpecifiersForFileMap[sourceFileId][name.text] = exportSpecifiers[name.text];
-                    addExportMemberAssignments(resultStatements, name);
-                }
-            }
-        }
-        function transformInitializedVariable(node) {
-            var name = node.name;
-            if (ts.isBindingPattern(name)) {
-                return ts.flattenVariableDestructuringToExpression(node, hoistVariableDeclaration, getModuleMemberName, visitor);
-            }
-            else {
-                return ts.createAssignment(getModuleMemberName(name), ts.visitNode(node.initializer, visitor, ts.isExpression));
+                statements = appendExportStatement(statements, ts.createIdentifier("default"), node.expression, node, true);
             }
+            return ts.singleOrMany(statements);
         }
         function visitFunctionDeclaration(node) {
-            var statements = [];
-            var name = node.name || ts.getGeneratedNameForNode(node);
+            var statements;
             if (ts.hasModifier(node, 1)) {
-                var isAsync = ts.hasModifier(node, 256);
-                statements.push(ts.setOriginalNode(ts.createFunctionDeclaration(undefined, isAsync ? [ts.createNode(119)] : undefined, node.asteriskToken, name, undefined, node.parameters, undefined, node.body, node), node));
-                addExportMemberAssignment(statements, node);
+                statements = ts.append(statements, ts.setOriginalNode(ts.createFunctionDeclaration(undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, ts.getDeclarationName(node, true, true), undefined, node.parameters, undefined, node.body, node), node));
             }
             else {
-                statements.push(node);
+                statements = ts.append(statements, node);
             }
-            if (node.name) {
-                addExportMemberAssignments(statements, node.name);
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfHoistedDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfHoistedDeclaration(statements, node);
             }
             return ts.singleOrMany(statements);
         }
         function visitClassDeclaration(node) {
-            var statements = [];
-            var name = node.name || ts.getGeneratedNameForNode(node);
+            var statements;
             if (ts.hasModifier(node, 1)) {
-                statements.push(ts.setOriginalNode(ts.createClassDeclaration(undefined, undefined, name, undefined, node.heritageClauses, node.members, node), node));
-                addExportMemberAssignment(statements, node);
+                statements = ts.append(statements, ts.setOriginalNode(ts.createClassDeclaration(undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), ts.getDeclarationName(node, true, true), undefined, node.heritageClauses, node.members, node), node));
             }
             else {
-                statements.push(node);
+                statements = ts.append(statements, node);
             }
-            if (node.name && !(node.decorators && node.decorators.length)) {
-                addExportMemberAssignments(statements, node.name);
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfHoistedDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfHoistedDeclaration(statements, node);
             }
             return ts.singleOrMany(statements);
         }
-        function visitExpressionStatement(node) {
-            var original = ts.getOriginalNode(node);
-            var origKind = original.kind;
-            if (origKind === 225 || origKind === 226) {
-                return visitExpressionStatementForEnumOrNamespaceDeclaration(node, original);
-            }
-            else if (origKind === 222) {
-                var classDecl = original;
-                if (classDecl.name) {
-                    var statements = [node];
-                    addExportMemberAssignments(statements, classDecl.name);
-                    return statements;
+        function visitVariableStatement(node) {
+            var statements;
+            var variables;
+            var expressions;
+            if (ts.hasModifier(node, 1)) {
+                var modifiers = void 0;
+                for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
+                    var variable = _a[_i];
+                    if (ts.isIdentifier(variable.name) && ts.isLocalName(variable.name)) {
+                        if (!modifiers) {
+                            modifiers = ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier);
+                        }
+                        variables = ts.append(variables, variable);
+                    }
+                    else if (variable.initializer) {
+                        expressions = ts.append(expressions, transformInitializedVariable(variable));
+                    }
                 }
+                if (variables) {
+                    statements = ts.append(statements, ts.updateVariableStatement(node, modifiers, ts.updateVariableDeclarationList(node.declarationList, variables)));
+                }
+                if (expressions) {
+                    statements = ts.append(statements, ts.createStatement(ts.inlineExpressions(expressions), node));
+                }
+            }
+            else {
+                statements = ts.append(statements, node);
+            }
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfVariableStatement(statements, node);
+            }
+            return ts.singleOrMany(statements);
+        }
+        function transformInitializedVariable(node) {
+            if (ts.isBindingPattern(node.name)) {
+                return ts.flattenVariableDestructuringToExpression(node, hoistVariableDeclaration, createExportExpression);
+            }
+            else {
+                return ts.createAssignment(ts.createPropertyAccess(ts.createIdentifier("exports"), node.name, node.name), node.initializer);
+            }
+        }
+        function visitMergeDeclarationMarker(node) {
+            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 205) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node.original);
             }
             return node;
         }
-        function visitExpressionStatementForEnumOrNamespaceDeclaration(node, original) {
-            var statements = [node];
-            if (ts.hasModifier(original, 1) &&
-                original.kind === 225 &&
-                ts.isFirstDeclarationOfKind(original, 225)) {
-                addVarForExportedEnumOrNamespaceDeclaration(statements, original);
+        function hasAssociatedEndOfDeclarationMarker(node) {
+            return (ts.getEmitFlags(node) & 33554432) !== 0;
+        }
+        function visitEndOfDeclarationMarker(node) {
+            var id = ts.getOriginalNodeId(node);
+            var statements = deferredExports[id];
+            if (statements) {
+                delete deferredExports[id];
+                return ts.append(statements, node);
+            }
+            return node;
+        }
+        function appendExportsOfImportDeclaration(statements, decl) {
+            if (currentModuleInfo.exportEquals) {
+                return statements;
+            }
+            var importClause = decl.importClause;
+            if (!importClause) {
+                return statements;
+            }
+            if (importClause.name) {
+                statements = appendExportsOfDeclaration(statements, importClause);
+            }
+            var namedBindings = importClause.namedBindings;
+            if (namedBindings) {
+                switch (namedBindings.kind) {
+                    case 237:
+                        statements = appendExportsOfDeclaration(statements, namedBindings);
+                        break;
+                    case 238:
+                        for (var _i = 0, _a = namedBindings.elements; _i < _a.length; _i++) {
+                            var importBinding = _a[_i];
+                            statements = appendExportsOfDeclaration(statements, importBinding);
+                        }
+                        break;
+                }
             }
-            addExportMemberAssignments(statements, original.name);
             return statements;
         }
-        function addVarForExportedEnumOrNamespaceDeclaration(statements, node) {
-            var transformedStatement = ts.createVariableStatement(undefined, [ts.createVariableDeclaration(getDeclarationName(node), undefined, ts.createPropertyAccess(ts.createIdentifier("exports"), getDeclarationName(node)))], node);
-            ts.setEmitFlags(transformedStatement, 49152);
-            statements.push(transformedStatement);
+        function appendExportsOfImportEqualsDeclaration(statements, decl) {
+            if (currentModuleInfo.exportEquals) {
+                return statements;
+            }
+            return appendExportsOfDeclaration(statements, decl);
         }
-        function getDeclarationName(node) {
-            return node.name ? ts.getSynthesizedClone(node.name) : ts.getGeneratedNameForNode(node);
+        function appendExportsOfVariableStatement(statements, node) {
+            if (currentModuleInfo.exportEquals) {
+                return statements;
+            }
+            for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
+                var decl = _a[_i];
+                statements = appendExportsOfBindingElement(statements, decl);
+            }
+            return statements;
+        }
+        function appendExportsOfBindingElement(statements, decl) {
+            if (currentModuleInfo.exportEquals) {
+                return statements;
+            }
+            if (ts.isBindingPattern(decl.name)) {
+                for (var _i = 0, _a = decl.name.elements; _i < _a.length; _i++) {
+                    var element = _a[_i];
+                    if (!ts.isOmittedExpression(element)) {
+                        statements = appendExportsOfBindingElement(statements, element);
+                    }
+                }
+            }
+            else if (!ts.isGeneratedIdentifier(decl.name)) {
+                statements = appendExportsOfDeclaration(statements, decl);
+            }
+            return statements;
+        }
+        function appendExportsOfHoistedDeclaration(statements, decl) {
+            if (currentModuleInfo.exportEquals) {
+                return statements;
+            }
+            if (ts.hasModifier(decl, 1)) {
+                var exportName = ts.hasModifier(decl, 512) ? ts.createIdentifier("default") : decl.name;
+                statements = appendExportStatement(statements, exportName, ts.getLocalName(decl), decl);
+            }
+            if (decl.name) {
+                statements = appendExportsOfDeclaration(statements, decl);
+            }
+            return statements;
+        }
+        function appendExportsOfDeclaration(statements, decl) {
+            var name = ts.getDeclarationName(decl);
+            var exportSpecifiers = currentModuleInfo.exportSpecifiers[name.text];
+            if (exportSpecifiers) {
+                for (var _i = 0, exportSpecifiers_1 = exportSpecifiers; _i < exportSpecifiers_1.length; _i++) {
+                    var exportSpecifier = exportSpecifiers_1[_i];
+                    statements = appendExportStatement(statements, exportSpecifier.name, name, exportSpecifier.name);
+                }
+            }
+            return statements;
+        }
+        function appendExportStatement(statements, exportName, expression, location, allowComments) {
+            if (exportName.text === "default") {
+                var sourceFile = ts.getOriginalNode(currentSourceFile, ts.isSourceFile);
+                if (sourceFile && !sourceFile.symbol.exports["___esModule"]) {
+                    if (languageVersion === 0) {
+                        statements = ts.append(statements, ts.createStatement(createExportExpression(ts.createIdentifier("__esModule"), ts.createLiteral(true))));
+                    }
+                    else {
+                        statements = ts.append(statements, ts.createStatement(ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Object"), "defineProperty"), undefined, [
+                            ts.createIdentifier("exports"),
+                            ts.createLiteral("__esModule"),
+                            ts.createObjectLiteral([
+                                ts.createPropertyAssignment("value", ts.createLiteral(true))
+                            ])
+                        ])));
+                    }
+                }
+            }
+            statements = ts.append(statements, createExportStatement(exportName, expression, location, allowComments));
+            return statements;
+        }
+        function createExportStatement(name, value, location, allowComments) {
+            var statement = ts.createStatement(createExportExpression(name, value), location);
+            ts.startOnNewLine(statement);
+            if (!allowComments) {
+                ts.setEmitFlags(statement, 49152);
+            }
+            return statement;
+        }
+        function createExportExpression(name, value, location) {
+            return ts.createAssignment(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.getSynthesizedClone(name)), value, location);
+        }
+        function modifierVisitor(node) {
+            switch (node.kind) {
+                case 83:
+                case 78:
+                    return undefined;
+            }
+            return node;
         }
         function onEmitNode(emitContext, node, emitCallback) {
-            if (node.kind === 256) {
-                bindingNameExportSpecifiersMap = bindingNameExportSpecifiersForFileMap[ts.getOriginalNodeId(node)];
+            if (node.kind === 261) {
+                currentSourceFile = node;
+                currentModuleInfo = moduleInfoMap[ts.getOriginalNodeId(currentSourceFile)];
+                noSubstitution = ts.createMap();
                 previousOnEmitNode(emitContext, node, emitCallback);
-                bindingNameExportSpecifiersMap = undefined;
+                currentSourceFile = undefined;
+                currentModuleInfo = undefined;
+                noSubstitution = undefined;
             }
             else {
                 previousOnEmitNode(emitContext, node, emitCallback);
@@ -42625,6 +44728,9 @@ var ts;
         }
         function onSubstituteNode(emitContext, node) {
             node = previousOnSubstituteNode(emitContext, node);
+            if (node.id && noSubstitution[node.id]) {
+                return node;
+            }
             if (emitContext === 1) {
                 return substituteExpression(node);
             }
@@ -42649,141 +44755,82 @@ var ts;
             switch (node.kind) {
                 case 70:
                     return substituteExpressionIdentifier(node);
-                case 188:
+                case 192:
                     return substituteBinaryExpression(node);
-                case 187:
-                case 186:
+                case 191:
+                case 190:
                     return substituteUnaryExpression(node);
             }
             return node;
         }
         function substituteExpressionIdentifier(node) {
-            return trySubstituteExportedName(node)
-                || trySubstituteImportedName(node)
-                || node;
+            if (!ts.isGeneratedIdentifier(node) && !ts.isLocalName(node)) {
+                var exportContainer = resolver.getReferencedExportContainer(node, ts.isExportName(node));
+                if (exportContainer && exportContainer.kind === 261) {
+                    return ts.createPropertyAccess(ts.createIdentifier("exports"), ts.getSynthesizedClone(node), node);
+                }
+                var importDeclaration = resolver.getReferencedImportDeclaration(node);
+                if (importDeclaration) {
+                    if (ts.isImportClause(importDeclaration)) {
+                        return ts.createPropertyAccess(ts.getGeneratedNameForNode(importDeclaration.parent), ts.createIdentifier("default"), node);
+                    }
+                    else if (ts.isImportSpecifier(importDeclaration)) {
+                        var name_38 = importDeclaration.propertyName || importDeclaration.name;
+                        return ts.createPropertyAccess(ts.getGeneratedNameForNode(importDeclaration.parent.parent.parent), ts.getSynthesizedClone(name_38), node);
+                    }
+                }
+            }
+            return node;
         }
         function substituteBinaryExpression(node) {
-            var left = node.left;
-            if (ts.isIdentifier(left) && ts.isAssignmentOperator(node.operatorToken.kind)) {
-                if (bindingNameExportSpecifiersMap && ts.hasProperty(bindingNameExportSpecifiersMap, left.text)) {
-                    ts.setEmitFlags(node, 128);
-                    var nestedExportAssignment = void 0;
-                    for (var _i = 0, _a = bindingNameExportSpecifiersMap[left.text]; _i < _a.length; _i++) {
-                        var specifier = _a[_i];
-                        nestedExportAssignment = nestedExportAssignment ?
-                            createExportAssignment(specifier.name, nestedExportAssignment) :
-                            createExportAssignment(specifier.name, node);
+            if (ts.isAssignmentOperator(node.operatorToken.kind)
+                && ts.isIdentifier(node.left)
+                && !ts.isGeneratedIdentifier(node.left)
+                && !ts.isLocalName(node.left)
+                && !ts.isDeclarationNameOfEnumOrNamespace(node.left)) {
+                var exportedNames = getExports(node.left);
+                if (exportedNames) {
+                    var expression = node;
+                    for (var _i = 0, exportedNames_1 = exportedNames; _i < exportedNames_1.length; _i++) {
+                        var exportName = exportedNames_1[_i];
+                        noSubstitution[ts.getNodeId(expression)] = true;
+                        expression = createExportExpression(exportName, expression, node);
                     }
-                    return nestedExportAssignment;
+                    return expression;
                 }
             }
             return node;
         }
         function substituteUnaryExpression(node) {
-            var operator = node.operator;
-            var operand = node.operand;
-            if (ts.isIdentifier(operand) && bindingNameExportSpecifiersForFileMap) {
-                if (bindingNameExportSpecifiersMap && ts.hasProperty(bindingNameExportSpecifiersMap, operand.text)) {
-                    ts.setEmitFlags(node, 128);
-                    var transformedUnaryExpression = void 0;
-                    if (node.kind === 187) {
-                        transformedUnaryExpression = ts.createBinary(operand, ts.createToken(operator === 42 ? 58 : 59), ts.createLiteral(1), node);
-                        ts.setEmitFlags(transformedUnaryExpression, 128);
+            if ((node.operator === 42 || node.operator === 43)
+                && ts.isIdentifier(node.operand)
+                && !ts.isGeneratedIdentifier(node.operand)
+                && !ts.isLocalName(node.operand)
+                && !ts.isDeclarationNameOfEnumOrNamespace(node.operand)) {
+                var exportedNames = getExports(node.operand);
+                if (exportedNames) {
+                    var expression = node.kind === 191
+                        ? ts.createBinary(node.operand, ts.createToken(node.operator === 42 ? 58 : 59), ts.createLiteral(1), node)
+                        : node;
+                    for (var _i = 0, exportedNames_2 = exportedNames; _i < exportedNames_2.length; _i++) {
+                        var exportName = exportedNames_2[_i];
+                        noSubstitution[ts.getNodeId(expression)] = true;
+                        expression = createExportExpression(exportName, expression);
                     }
-                    var nestedExportAssignment = void 0;
-                    for (var _i = 0, _a = bindingNameExportSpecifiersMap[operand.text]; _i < _a.length; _i++) {
-                        var specifier = _a[_i];
-                        nestedExportAssignment = nestedExportAssignment ?
-                            createExportAssignment(specifier.name, nestedExportAssignment) :
-                            createExportAssignment(specifier.name, transformedUnaryExpression || node);
-                    }
-                    return nestedExportAssignment;
+                    return expression;
                 }
             }
             return node;
         }
-        function trySubstituteExportedName(node) {
-            var emitFlags = ts.getEmitFlags(node);
-            if ((emitFlags & 262144) === 0) {
-                var container = resolver.getReferencedExportContainer(node, (emitFlags & 131072) !== 0);
-                if (container) {
-                    if (container.kind === 256) {
-                        return ts.createPropertyAccess(ts.createIdentifier("exports"), ts.getSynthesizedClone(node), node);
-                    }
+        function getExports(name) {
+            if (!ts.isGeneratedIdentifier(name)) {
+                var valueDeclaration = resolver.getReferencedImportDeclaration(name)
+                    || resolver.getReferencedValueDeclaration(name);
+                if (valueDeclaration) {
+                    return currentModuleInfo
+                        && currentModuleInfo.exportedBindings[ts.getOriginalNodeId(valueDeclaration)];
                 }
             }
-            return undefined;
-        }
-        function trySubstituteImportedName(node) {
-            if ((ts.getEmitFlags(node) & 262144) === 0) {
-                var declaration = resolver.getReferencedImportDeclaration(node);
-                if (declaration) {
-                    if (ts.isImportClause(declaration)) {
-                        return ts.createPropertyAccess(ts.getGeneratedNameForNode(declaration.parent), ts.createIdentifier("default"), node);
-                    }
-                    else if (ts.isImportSpecifier(declaration)) {
-                        var name_37 = declaration.propertyName || declaration.name;
-                        return ts.createPropertyAccess(ts.getGeneratedNameForNode(declaration.parent.parent.parent), ts.getSynthesizedClone(name_37), node);
-                    }
-                }
-            }
-            return undefined;
-        }
-        function getModuleMemberName(name) {
-            return ts.createPropertyAccess(ts.createIdentifier("exports"), name, name);
-        }
-        function createRequireCall(importNode) {
-            var moduleName = ts.getExternalModuleNameLiteral(importNode, currentSourceFile, host, resolver, compilerOptions);
-            var args = [];
-            if (ts.isDefined(moduleName)) {
-                args.push(moduleName);
-            }
-            return ts.createCall(ts.createIdentifier("require"), undefined, args);
-        }
-        function createExportStatement(name, value, location) {
-            var statement = ts.createStatement(createExportAssignment(name, value));
-            statement.startsOnNewLine = true;
-            if (location) {
-                ts.setSourceMapRange(statement, location);
-            }
-            return statement;
-        }
-        function createExportAssignment(name, value) {
-            return ts.createAssignment(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.getSynthesizedClone(name)), value);
-        }
-        function collectAsynchronousDependencies(node, includeNonAmdDependencies) {
-            var aliasedModuleNames = [];
-            var unaliasedModuleNames = [];
-            var importAliasNames = [];
-            for (var _i = 0, _a = node.amdDependencies; _i < _a.length; _i++) {
-                var amdDependency = _a[_i];
-                if (amdDependency.name) {
-                    aliasedModuleNames.push(ts.createLiteral(amdDependency.path));
-                    importAliasNames.push(ts.createParameter(amdDependency.name));
-                }
-                else {
-                    unaliasedModuleNames.push(ts.createLiteral(amdDependency.path));
-                }
-            }
-            for (var _b = 0, externalImports_1 = externalImports; _b < externalImports_1.length; _b++) {
-                var importNode = externalImports_1[_b];
-                var externalModuleName = ts.getExternalModuleNameLiteral(importNode, currentSourceFile, host, resolver, compilerOptions);
-                var importAliasName = ts.getLocalNameForExternalImport(importNode, currentSourceFile);
-                if (includeNonAmdDependencies && importAliasName) {
-                    ts.setEmitFlags(importAliasName, 128);
-                    aliasedModuleNames.push(externalModuleName);
-                    importAliasNames.push(ts.createParameter(importAliasName));
-                }
-                else {
-                    unaliasedModuleNames.push(externalModuleName);
-                }
-            }
-            return { aliasedModuleNames: aliasedModuleNames, unaliasedModuleNames: unaliasedModuleNames, importAliasNames: importAliasNames };
-        }
-        function updateSourceFile(node, statements) {
-            var updated = ts.getMutableClone(node);
-            updated.statements = ts.createNodeArray(statements, node.statements);
-            return updated;
         }
         var _a;
     }
@@ -42792,7 +44839,7 @@ var ts;
 var ts;
 (function (ts) {
     function transformSystemModule(context) {
-        var startLexicalEnvironment = context.startLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration, hoistFunctionDeclaration = context.hoistFunctionDeclaration;
+        var startLexicalEnvironment = context.startLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration;
         var compilerOptions = context.getCompilerOptions();
         var resolver = context.getEmitResolver();
         var host = context.getEmitHost();
@@ -42801,696 +44848,58 @@ var ts;
         context.onSubstituteNode = onSubstituteNode;
         context.onEmitNode = onEmitNode;
         context.enableSubstitution(70);
-        context.enableSubstitution(188);
-        context.enableSubstitution(186);
-        context.enableSubstitution(187);
-        context.enableEmitNotification(256);
-        var exportFunctionForFileMap = [];
+        context.enableSubstitution(192);
+        context.enableSubstitution(190);
+        context.enableSubstitution(191);
+        context.enableEmitNotification(261);
+        var moduleInfoMap = ts.createMap();
+        var deferredExports = ts.createMap();
+        var exportFunctionsMap = ts.createMap();
+        var noSubstitutionMap = ts.createMap();
         var currentSourceFile;
-        var externalImports;
-        var exportSpecifiers;
-        var exportEquals;
-        var hasExportStarsToExportValues;
-        var exportFunctionForFile;
-        var contextObjectForFile;
-        var exportedLocalNames;
-        var exportedFunctionDeclarations;
+        var moduleInfo;
+        var exportFunction;
+        var contextObject;
+        var hoistedStatements;
         var enclosingBlockScopedContainer;
-        var currentParent;
-        var currentNode;
+        var noSubstitution;
         return transformSourceFile;
         function transformSourceFile(node) {
-            if (ts.isDeclarationFile(node)) {
+            if (ts.isDeclarationFile(node)
+                || !(ts.isExternalModule(node)
+                    || compilerOptions.isolatedModules)) {
                 return node;
             }
-            if (ts.isExternalModule(node) || compilerOptions.isolatedModules) {
-                currentSourceFile = node;
-                currentNode = node;
-                var updated = transformSystemModuleWorker(node);
-                ts.aggregateTransformFlags(updated);
-                currentSourceFile = undefined;
-                externalImports = undefined;
-                exportSpecifiers = undefined;
-                exportEquals = undefined;
-                hasExportStarsToExportValues = false;
-                exportFunctionForFile = undefined;
-                contextObjectForFile = undefined;
-                exportedLocalNames = undefined;
-                exportedFunctionDeclarations = undefined;
-                return updated;
-            }
-            return node;
-        }
-        function transformSystemModuleWorker(node) {
-            ts.Debug.assert(!exportFunctionForFile);
-            (_a = ts.collectExternalModuleInfo(node), externalImports = _a.externalImports, exportSpecifiers = _a.exportSpecifiers, exportEquals = _a.exportEquals, hasExportStarsToExportValues = _a.hasExportStarsToExportValues, _a);
-            exportFunctionForFile = ts.createUniqueName("exports");
-            contextObjectForFile = ts.createUniqueName("context");
-            exportFunctionForFileMap[ts.getOriginalNodeId(node)] = exportFunctionForFile;
-            var dependencyGroups = collectDependencyGroups(externalImports);
-            var statements = [];
-            addSystemModuleBody(statements, node, dependencyGroups);
+            var id = ts.getOriginalNodeId(node);
+            currentSourceFile = node;
+            enclosingBlockScopedContainer = node;
+            moduleInfo = moduleInfoMap[id] = ts.collectExternalModuleInfo(node, resolver);
+            exportFunction = exportFunctionsMap[id] = ts.createUniqueName("exports");
+            contextObject = ts.createUniqueName("context");
+            var dependencyGroups = collectDependencyGroups(moduleInfo.externalImports);
+            var moduleBodyFunction = ts.createFunctionExpression(undefined, undefined, undefined, undefined, [
+                ts.createParameter(undefined, undefined, undefined, exportFunction),
+                ts.createParameter(undefined, undefined, undefined, contextObject)
+            ], undefined, createSystemModuleBody(node, dependencyGroups));
             var moduleName = ts.tryGetModuleNameFromFile(node, host, compilerOptions);
-            var dependencies = ts.createArrayLiteral(ts.map(dependencyGroups, getNameOfDependencyGroup));
-            var body = ts.createFunctionExpression(undefined, undefined, undefined, undefined, [
-                ts.createParameter(exportFunctionForFile),
-                ts.createParameter(contextObjectForFile)
-            ], undefined, ts.setEmitFlags(ts.createBlock(statements, undefined, true), 1));
-            return updateSourceFile(node, [
+            var dependencies = ts.createArrayLiteral(ts.map(dependencyGroups, function (dependencyGroup) { return dependencyGroup.name; }));
+            var updated = ts.updateSourceFileNode(node, ts.createNodeArray([
                 ts.createStatement(ts.createCall(ts.createPropertyAccess(ts.createIdentifier("System"), "register"), undefined, moduleName
-                    ? [moduleName, dependencies, body]
-                    : [dependencies, body]))
-            ], ~1 & ts.getEmitFlags(node));
-            var _a;
-        }
-        function addSystemModuleBody(statements, node, dependencyGroups) {
-            startLexicalEnvironment();
-            var statementOffset = ts.addPrologueDirectives(statements, node.statements, !compilerOptions.noImplicitUseStrict, visitSourceElement);
-            statements.push(ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
-                ts.createVariableDeclaration("__moduleName", undefined, ts.createLogicalAnd(contextObjectForFile, ts.createPropertyAccess(contextObjectForFile, "id")))
-            ])));
-            var executeStatements = ts.visitNodes(node.statements, visitSourceElement, ts.isStatement, statementOffset);
-            ts.addRange(statements, endLexicalEnvironment());
-            ts.addRange(statements, exportedFunctionDeclarations);
-            var exportStarFunction = addExportStarIfNeeded(statements);
-            statements.push(ts.createReturn(ts.setMultiLine(ts.createObjectLiteral([
-                ts.createPropertyAssignment("setters", generateSetters(exportStarFunction, dependencyGroups)),
-                ts.createPropertyAssignment("execute", ts.createFunctionExpression(undefined, undefined, undefined, undefined, [], undefined, ts.createBlock(executeStatements, undefined, true)))
-            ]), true)));
-        }
-        function addExportStarIfNeeded(statements) {
-            if (!hasExportStarsToExportValues) {
-                return;
+                    ? [moduleName, dependencies, moduleBodyFunction]
+                    : [dependencies, moduleBodyFunction]))
+            ], node.statements));
+            ts.setEmitFlags(updated, ts.getEmitFlags(node) & ~1);
+            if (noSubstitution) {
+                noSubstitutionMap[id] = noSubstitution;
+                noSubstitution = undefined;
             }
-            if (!exportedLocalNames && ts.isEmpty(exportSpecifiers)) {
-                var hasExportDeclarationWithExportClause = false;
-                for (var _i = 0, externalImports_2 = externalImports; _i < externalImports_2.length; _i++) {
-                    var externalImport = externalImports_2[_i];
-                    if (externalImport.kind === 237 && externalImport.exportClause) {
-                        hasExportDeclarationWithExportClause = true;
-                        break;
-                    }
-                }
-                if (!hasExportDeclarationWithExportClause) {
-                    return addExportStarFunction(statements, undefined);
-                }
-            }
-            var exportedNames = [];
-            if (exportedLocalNames) {
-                for (var _a = 0, exportedLocalNames_1 = exportedLocalNames; _a < exportedLocalNames_1.length; _a++) {
-                    var exportedLocalName = exportedLocalNames_1[_a];
-                    exportedNames.push(ts.createPropertyAssignment(ts.createLiteral(exportedLocalName.text), ts.createLiteral(true)));
-                }
-            }
-            for (var _b = 0, externalImports_3 = externalImports; _b < externalImports_3.length; _b++) {
-                var externalImport = externalImports_3[_b];
-                if (externalImport.kind !== 237) {
-                    continue;
-                }
-                var exportDecl = externalImport;
-                if (!exportDecl.exportClause) {
-                    continue;
-                }
-                for (var _c = 0, _d = exportDecl.exportClause.elements; _c < _d.length; _c++) {
-                    var element = _d[_c];
-                    exportedNames.push(ts.createPropertyAssignment(ts.createLiteral((element.name || element.propertyName).text), ts.createLiteral(true)));
-                }
-            }
-            var exportedNamesStorageRef = ts.createUniqueName("exportedNames");
-            statements.push(ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
-                ts.createVariableDeclaration(exportedNamesStorageRef, undefined, ts.createObjectLiteral(exportedNames, undefined, true))
-            ])));
-            return addExportStarFunction(statements, exportedNamesStorageRef);
-        }
-        function generateSetters(exportStarFunction, dependencyGroups) {
-            var setters = [];
-            for (var _i = 0, dependencyGroups_1 = dependencyGroups; _i < dependencyGroups_1.length; _i++) {
-                var group = dependencyGroups_1[_i];
-                var localName = ts.forEach(group.externalImports, function (i) { return ts.getLocalNameForExternalImport(i, currentSourceFile); });
-                var parameterName = localName ? ts.getGeneratedNameForNode(localName) : ts.createUniqueName("");
-                var statements = [];
-                for (var _a = 0, _b = group.externalImports; _a < _b.length; _a++) {
-                    var entry = _b[_a];
-                    var importVariableName = ts.getLocalNameForExternalImport(entry, currentSourceFile);
-                    switch (entry.kind) {
-                        case 231:
-                            if (!entry.importClause) {
-                                break;
-                            }
-                        case 230:
-                            ts.Debug.assert(importVariableName !== undefined);
-                            statements.push(ts.createStatement(ts.createAssignment(importVariableName, parameterName)));
-                            break;
-                        case 237:
-                            ts.Debug.assert(importVariableName !== undefined);
-                            if (entry.exportClause) {
-                                var properties = [];
-                                for (var _c = 0, _d = entry.exportClause.elements; _c < _d.length; _c++) {
-                                    var e = _d[_c];
-                                    properties.push(ts.createPropertyAssignment(ts.createLiteral(e.name.text), ts.createElementAccess(parameterName, ts.createLiteral((e.propertyName || e.name).text))));
-                                }
-                                statements.push(ts.createStatement(ts.createCall(exportFunctionForFile, undefined, [ts.createObjectLiteral(properties, undefined, true)])));
-                            }
-                            else {
-                                statements.push(ts.createStatement(ts.createCall(exportStarFunction, undefined, [parameterName])));
-                            }
-                            break;
-                    }
-                }
-                setters.push(ts.createFunctionExpression(undefined, undefined, undefined, undefined, [ts.createParameter(parameterName)], undefined, ts.createBlock(statements, undefined, true)));
-            }
-            return ts.createArrayLiteral(setters, undefined, true);
-        }
-        function visitSourceElement(node) {
-            switch (node.kind) {
-                case 231:
-                    return visitImportDeclaration(node);
-                case 230:
-                    return visitImportEqualsDeclaration(node);
-                case 237:
-                    return visitExportDeclaration(node);
-                case 236:
-                    return visitExportAssignment(node);
-                default:
-                    return visitNestedNode(node);
-            }
-        }
-        function visitNestedNode(node) {
-            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
-            var savedCurrentParent = currentParent;
-            var savedCurrentNode = currentNode;
-            var currentGrandparent = currentParent;
-            currentParent = currentNode;
-            currentNode = node;
-            if (currentParent && ts.isBlockScope(currentParent, currentGrandparent)) {
-                enclosingBlockScopedContainer = currentParent;
-            }
-            var result = visitNestedNodeWorker(node);
-            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
-            currentParent = savedCurrentParent;
-            currentNode = savedCurrentNode;
-            return result;
-        }
-        function visitNestedNodeWorker(node) {
-            switch (node.kind) {
-                case 201:
-                    return visitVariableStatement(node);
-                case 221:
-                    return visitFunctionDeclaration(node);
-                case 222:
-                    return visitClassDeclaration(node);
-                case 207:
-                    return visitForStatement(node);
-                case 208:
-                    return visitForInStatement(node);
-                case 209:
-                    return visitForOfStatement(node);
-                case 205:
-                    return visitDoStatement(node);
-                case 206:
-                    return visitWhileStatement(node);
-                case 215:
-                    return visitLabeledStatement(node);
-                case 213:
-                    return visitWithStatement(node);
-                case 214:
-                    return visitSwitchStatement(node);
-                case 228:
-                    return visitCaseBlock(node);
-                case 249:
-                    return visitCaseClause(node);
-                case 250:
-                    return visitDefaultClause(node);
-                case 217:
-                    return visitTryStatement(node);
-                case 252:
-                    return visitCatchClause(node);
-                case 200:
-                    return visitBlock(node);
-                case 203:
-                    return visitExpressionStatement(node);
-                default:
-                    return node;
-            }
-        }
-        function visitImportDeclaration(node) {
-            if (node.importClause && ts.contains(externalImports, node)) {
-                hoistVariableDeclaration(ts.getLocalNameForExternalImport(node, currentSourceFile));
-            }
-            return undefined;
-        }
-        function visitImportEqualsDeclaration(node) {
-            if (ts.contains(externalImports, node)) {
-                hoistVariableDeclaration(ts.getLocalNameForExternalImport(node, currentSourceFile));
-            }
-            return undefined;
-        }
-        function visitExportDeclaration(node) {
-            if (!node.moduleSpecifier) {
-                var statements = [];
-                ts.addRange(statements, ts.map(node.exportClause.elements, visitExportSpecifier));
-                return statements;
-            }
-            return undefined;
-        }
-        function visitExportSpecifier(specifier) {
-            recordExportName(specifier.name);
-            return createExportStatement(specifier.name, specifier.propertyName || specifier.name);
-        }
-        function visitExportAssignment(node) {
-            if (node.isExportEquals) {
-                return undefined;
-            }
-            return createExportStatement(ts.createLiteral("default"), node.expression);
-        }
-        function visitVariableStatement(node) {
-            var shouldHoist = ((ts.getCombinedNodeFlags(ts.getOriginalNode(node.declarationList)) & 3) == 0) ||
-                enclosingBlockScopedContainer.kind === 256;
-            if (!shouldHoist) {
-                return node;
-            }
-            var isExported = ts.hasModifier(node, 1);
-            var expressions = [];
-            for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
-                var variable = _a[_i];
-                var visited = transformVariable(variable, isExported);
-                if (visited) {
-                    expressions.push(visited);
-                }
-            }
-            if (expressions.length) {
-                return ts.createStatement(ts.inlineExpressions(expressions), node);
-            }
-            return undefined;
-        }
-        function transformVariable(node, isExported) {
-            hoistBindingElement(node, isExported);
-            if (!node.initializer) {
-                return;
-            }
-            var name = node.name;
-            if (ts.isIdentifier(name)) {
-                return ts.createAssignment(name, node.initializer);
-            }
-            else {
-                return ts.flattenVariableDestructuringToExpression(node, hoistVariableDeclaration);
-            }
-        }
-        function visitFunctionDeclaration(node) {
-            if (ts.hasModifier(node, 1)) {
-                var name_38 = node.name || ts.getGeneratedNameForNode(node);
-                var isAsync = ts.hasModifier(node, 256);
-                var newNode = ts.createFunctionDeclaration(undefined, isAsync ? [ts.createNode(119)] : undefined, node.asteriskToken, name_38, undefined, node.parameters, undefined, node.body, node);
-                recordExportedFunctionDeclaration(node);
-                if (!ts.hasModifier(node, 512)) {
-                    recordExportName(name_38);
-                }
-                ts.setOriginalNode(newNode, node);
-                node = newNode;
-            }
-            hoistFunctionDeclaration(node);
-            return undefined;
-        }
-        function visitExpressionStatement(node) {
-            var originalNode = ts.getOriginalNode(node);
-            if ((originalNode.kind === 226 || originalNode.kind === 225) && ts.hasModifier(originalNode, 1)) {
-                var name_39 = getDeclarationName(originalNode);
-                if (originalNode.kind === 225) {
-                    hoistVariableDeclaration(name_39);
-                }
-                return [
-                    node,
-                    createExportStatement(name_39, name_39)
-                ];
-            }
-            return node;
-        }
-        function visitClassDeclaration(node) {
-            var name = getDeclarationName(node);
-            hoistVariableDeclaration(name);
-            var statements = [];
-            statements.push(ts.createStatement(ts.createAssignment(name, ts.createClassExpression(undefined, node.name, undefined, node.heritageClauses, node.members, node)), node));
-            if (ts.hasModifier(node, 1)) {
-                if (!ts.hasModifier(node, 512)) {
-                    recordExportName(name);
-                }
-                statements.push(createDeclarationExport(node));
-            }
-            return statements;
-        }
-        function shouldHoistLoopInitializer(node) {
-            return ts.isVariableDeclarationList(node) && (ts.getCombinedNodeFlags(node) & 3) === 0;
-        }
-        function visitForStatement(node) {
-            var initializer = node.initializer;
-            if (shouldHoistLoopInitializer(initializer)) {
-                var expressions = [];
-                for (var _i = 0, _a = initializer.declarations; _i < _a.length; _i++) {
-                    var variable = _a[_i];
-                    var visited = transformVariable(variable, false);
-                    if (visited) {
-                        expressions.push(visited);
-                    }
-                }
-                ;
-                return ts.createFor(expressions.length
-                    ? ts.inlineExpressions(expressions)
-                    : ts.createSynthesizedNode(194), node.condition, node.incrementor, ts.visitNode(node.statement, visitNestedNode, ts.isStatement), node);
-            }
-            else {
-                return ts.visitEachChild(node, visitNestedNode, context);
-            }
-        }
-        function transformForBinding(node) {
-            var firstDeclaration = ts.firstOrUndefined(node.declarations);
-            hoistBindingElement(firstDeclaration, false);
-            var name = firstDeclaration.name;
-            return ts.isIdentifier(name)
-                ? name
-                : ts.flattenVariableDestructuringToExpression(firstDeclaration, hoistVariableDeclaration);
-        }
-        function visitForInStatement(node) {
-            var initializer = node.initializer;
-            if (shouldHoistLoopInitializer(initializer)) {
-                var updated = ts.getMutableClone(node);
-                updated.initializer = transformForBinding(initializer);
-                updated.statement = ts.visitNode(node.statement, visitNestedNode, ts.isStatement, false, ts.liftToBlock);
-                return updated;
-            }
-            else {
-                return ts.visitEachChild(node, visitNestedNode, context);
-            }
-        }
-        function visitForOfStatement(node) {
-            var initializer = node.initializer;
-            if (shouldHoistLoopInitializer(initializer)) {
-                var updated = ts.getMutableClone(node);
-                updated.initializer = transformForBinding(initializer);
-                updated.statement = ts.visitNode(node.statement, visitNestedNode, ts.isStatement, false, ts.liftToBlock);
-                return updated;
-            }
-            else {
-                return ts.visitEachChild(node, visitNestedNode, context);
-            }
-        }
-        function visitDoStatement(node) {
-            var statement = ts.visitNode(node.statement, visitNestedNode, ts.isStatement, false, ts.liftToBlock);
-            if (statement !== node.statement) {
-                var updated = ts.getMutableClone(node);
-                updated.statement = statement;
-                return updated;
-            }
-            return node;
-        }
-        function visitWhileStatement(node) {
-            var statement = ts.visitNode(node.statement, visitNestedNode, ts.isStatement, false, ts.liftToBlock);
-            if (statement !== node.statement) {
-                var updated = ts.getMutableClone(node);
-                updated.statement = statement;
-                return updated;
-            }
-            return node;
-        }
-        function visitLabeledStatement(node) {
-            var statement = ts.visitNode(node.statement, visitNestedNode, ts.isStatement, false, ts.liftToBlock);
-            if (statement !== node.statement) {
-                var updated = ts.getMutableClone(node);
-                updated.statement = statement;
-                return updated;
-            }
-            return node;
-        }
-        function visitWithStatement(node) {
-            var statement = ts.visitNode(node.statement, visitNestedNode, ts.isStatement, false, ts.liftToBlock);
-            if (statement !== node.statement) {
-                var updated = ts.getMutableClone(node);
-                updated.statement = statement;
-                return updated;
-            }
-            return node;
-        }
-        function visitSwitchStatement(node) {
-            var caseBlock = ts.visitNode(node.caseBlock, visitNestedNode, ts.isCaseBlock);
-            if (caseBlock !== node.caseBlock) {
-                var updated = ts.getMutableClone(node);
-                updated.caseBlock = caseBlock;
-                return updated;
-            }
-            return node;
-        }
-        function visitCaseBlock(node) {
-            var clauses = ts.visitNodes(node.clauses, visitNestedNode, ts.isCaseOrDefaultClause);
-            if (clauses !== node.clauses) {
-                var updated = ts.getMutableClone(node);
-                updated.clauses = clauses;
-                return updated;
-            }
-            return node;
-        }
-        function visitCaseClause(node) {
-            var statements = ts.visitNodes(node.statements, visitNestedNode, ts.isStatement);
-            if (statements !== node.statements) {
-                var updated = ts.getMutableClone(node);
-                updated.statements = statements;
-                return updated;
-            }
-            return node;
-        }
-        function visitDefaultClause(node) {
-            return ts.visitEachChild(node, visitNestedNode, context);
-        }
-        function visitTryStatement(node) {
-            return ts.visitEachChild(node, visitNestedNode, context);
-        }
-        function visitCatchClause(node) {
-            var block = ts.visitNode(node.block, visitNestedNode, ts.isBlock);
-            if (block !== node.block) {
-                var updated = ts.getMutableClone(node);
-                updated.block = block;
-                return updated;
-            }
-            return node;
-        }
-        function visitBlock(node) {
-            return ts.visitEachChild(node, visitNestedNode, context);
-        }
-        function onEmitNode(emitContext, node, emitCallback) {
-            if (node.kind === 256) {
-                exportFunctionForFile = exportFunctionForFileMap[ts.getOriginalNodeId(node)];
-                previousOnEmitNode(emitContext, node, emitCallback);
-                exportFunctionForFile = undefined;
-            }
-            else {
-                previousOnEmitNode(emitContext, node, emitCallback);
-            }
-        }
-        function onSubstituteNode(emitContext, node) {
-            node = previousOnSubstituteNode(emitContext, node);
-            if (emitContext === 1) {
-                return substituteExpression(node);
-            }
-            return node;
-        }
-        function substituteExpression(node) {
-            switch (node.kind) {
-                case 70:
-                    return substituteExpressionIdentifier(node);
-                case 188:
-                    return substituteBinaryExpression(node);
-                case 186:
-                case 187:
-                    return substituteUnaryExpression(node);
-            }
-            return node;
-        }
-        function substituteExpressionIdentifier(node) {
-            var importDeclaration = resolver.getReferencedImportDeclaration(node);
-            if (importDeclaration) {
-                var importBinding = createImportBinding(importDeclaration);
-                if (importBinding) {
-                    return importBinding;
-                }
-            }
-            return node;
-        }
-        function substituteBinaryExpression(node) {
-            if (ts.isAssignmentOperator(node.operatorToken.kind)) {
-                return substituteAssignmentExpression(node);
-            }
-            return node;
-        }
-        function substituteAssignmentExpression(node) {
-            ts.setEmitFlags(node, 128);
-            var left = node.left;
-            switch (left.kind) {
-                case 70:
-                    var exportDeclaration = resolver.getReferencedExportContainer(left);
-                    if (exportDeclaration) {
-                        return createExportExpression(left, node);
-                    }
-                    break;
-                case 172:
-                case 171:
-                    if (hasExportedReferenceInDestructuringPattern(left)) {
-                        return substituteDestructuring(node);
-                    }
-                    break;
-            }
-            return node;
-        }
-        function isExportedBinding(name) {
-            var container = resolver.getReferencedExportContainer(name);
-            return container && container.kind === 256;
-        }
-        function hasExportedReferenceInDestructuringPattern(node) {
-            switch (node.kind) {
-                case 70:
-                    return isExportedBinding(node);
-                case 172:
-                    for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
-                        var property = _a[_i];
-                        if (hasExportedReferenceInObjectDestructuringElement(property)) {
-                            return true;
-                        }
-                    }
-                    break;
-                case 171:
-                    for (var _b = 0, _c = node.elements; _b < _c.length; _b++) {
-                        var element = _c[_b];
-                        if (hasExportedReferenceInArrayDestructuringElement(element)) {
-                            return true;
-                        }
-                    }
-                    break;
-            }
-            return false;
-        }
-        function hasExportedReferenceInObjectDestructuringElement(node) {
-            if (ts.isShorthandPropertyAssignment(node)) {
-                return isExportedBinding(node.name);
-            }
-            else if (ts.isPropertyAssignment(node)) {
-                return hasExportedReferenceInDestructuringElement(node.initializer);
-            }
-            else {
-                return false;
-            }
-        }
-        function hasExportedReferenceInArrayDestructuringElement(node) {
-            if (ts.isSpreadElementExpression(node)) {
-                var expression = node.expression;
-                return ts.isIdentifier(expression) && isExportedBinding(expression);
-            }
-            else {
-                return hasExportedReferenceInDestructuringElement(node);
-            }
-        }
-        function hasExportedReferenceInDestructuringElement(node) {
-            if (ts.isBinaryExpression(node)) {
-                var left = node.left;
-                return node.operatorToken.kind === 57
-                    && isDestructuringPattern(left)
-                    && hasExportedReferenceInDestructuringPattern(left);
-            }
-            else if (ts.isIdentifier(node)) {
-                return isExportedBinding(node);
-            }
-            else if (ts.isSpreadElementExpression(node)) {
-                var expression = node.expression;
-                return ts.isIdentifier(expression) && isExportedBinding(expression);
-            }
-            else if (isDestructuringPattern(node)) {
-                return hasExportedReferenceInDestructuringPattern(node);
-            }
-            else {
-                return false;
-            }
-        }
-        function isDestructuringPattern(node) {
-            var kind = node.kind;
-            return kind === 70
-                || kind === 172
-                || kind === 171;
-        }
-        function substituteDestructuring(node) {
-            return ts.flattenDestructuringAssignment(context, node, true, hoistVariableDeclaration);
-        }
-        function substituteUnaryExpression(node) {
-            var operand = node.operand;
-            var operator = node.operator;
-            var substitute = ts.isIdentifier(operand) &&
-                (node.kind === 187 ||
-                    (node.kind === 186 && (operator === 42 || operator === 43)));
-            if (substitute) {
-                var exportDeclaration = resolver.getReferencedExportContainer(operand);
-                if (exportDeclaration) {
-                    var expr = ts.createPrefix(node.operator, operand, node);
-                    ts.setEmitFlags(expr, 128);
-                    var call = createExportExpression(operand, expr);
-                    if (node.kind === 186) {
-                        return call;
-                    }
-                    else {
-                        return operator === 42
-                            ? ts.createSubtract(call, ts.createLiteral(1))
-                            : ts.createAdd(call, ts.createLiteral(1));
-                    }
-                }
-            }
-            return node;
-        }
-        function getDeclarationName(node) {
-            return node.name ? ts.getSynthesizedClone(node.name) : ts.getGeneratedNameForNode(node);
-        }
-        function addExportStarFunction(statements, localNames) {
-            var exportStarFunction = ts.createUniqueName("exportStar");
-            var m = ts.createIdentifier("m");
-            var n = ts.createIdentifier("n");
-            var exports = ts.createIdentifier("exports");
-            var condition = ts.createStrictInequality(n, ts.createLiteral("default"));
-            if (localNames) {
-                condition = ts.createLogicalAnd(condition, ts.createLogicalNot(ts.createHasOwnProperty(localNames, n)));
-            }
-            statements.push(ts.createFunctionDeclaration(undefined, undefined, undefined, exportStarFunction, undefined, [ts.createParameter(m)], undefined, ts.createBlock([
-                ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
-                    ts.createVariableDeclaration(exports, undefined, ts.createObjectLiteral([]))
-                ])),
-                ts.createForIn(ts.createVariableDeclarationList([
-                    ts.createVariableDeclaration(n, undefined)
-                ]), m, ts.createBlock([
-                    ts.setEmitFlags(ts.createIf(condition, ts.createStatement(ts.createAssignment(ts.createElementAccess(exports, n), ts.createElementAccess(m, n)))), 32)
-                ])),
-                ts.createStatement(ts.createCall(exportFunctionForFile, undefined, [exports]))
-            ], undefined, true)));
-            return exportStarFunction;
-        }
-        function createExportExpression(name, value) {
-            var exportName = ts.isIdentifier(name) ? ts.createLiteral(name.text) : name;
-            return ts.createCall(exportFunctionForFile, undefined, [exportName, value]);
-        }
-        function createExportStatement(name, value) {
-            return ts.createStatement(createExportExpression(name, value));
-        }
-        function createDeclarationExport(node) {
-            var declarationName = getDeclarationName(node);
-            var exportName = ts.hasModifier(node, 512) ? ts.createLiteral("default") : declarationName;
-            return createExportStatement(exportName, declarationName);
-        }
-        function createImportBinding(importDeclaration) {
-            var importAlias;
-            var name;
-            if (ts.isImportClause(importDeclaration)) {
-                importAlias = ts.getGeneratedNameForNode(importDeclaration.parent);
-                name = ts.createIdentifier("default");
-            }
-            else if (ts.isImportSpecifier(importDeclaration)) {
-                importAlias = ts.getGeneratedNameForNode(importDeclaration.parent.parent.parent);
-                name = importDeclaration.propertyName || importDeclaration.name;
-            }
-            else {
-                return undefined;
-            }
-            return ts.createPropertyAccess(importAlias, ts.getSynthesizedClone(name));
+            currentSourceFile = undefined;
+            moduleInfo = undefined;
+            exportFunction = undefined;
+            contextObject = undefined;
+            hoistedStatements = undefined;
+            enclosingBlockScopedContainer = undefined;
+            return ts.aggregateTransformFlags(updated);
         }
         function collectDependencyGroups(externalImports) {
             var groupIndices = ts.createMap();
@@ -43502,7 +44911,6 @@ var ts;
                 if (ts.hasProperty(groupIndices, text)) {
                     var groupIndex = groupIndices[text];
                     dependencyGroups[groupIndex].externalImports.push(externalImport);
-                    continue;
                 }
                 else {
                     groupIndices[text] = dependencyGroups.length;
@@ -43514,47 +44922,722 @@ var ts;
             }
             return dependencyGroups;
         }
-        function getNameOfDependencyGroup(dependencyGroup) {
-            return dependencyGroup.name;
+        function createSystemModuleBody(node, dependencyGroups) {
+            var statements = [];
+            startLexicalEnvironment();
+            var statementOffset = ts.addPrologueDirectives(statements, node.statements, !compilerOptions.noImplicitUseStrict, sourceElementVisitor);
+            statements.push(ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
+                ts.createVariableDeclaration("__moduleName", undefined, ts.createLogicalAnd(contextObject, ts.createPropertyAccess(contextObject, "id")))
+            ])));
+            var executeStatements = ts.visitNodes(node.statements, sourceElementVisitor, ts.isStatement, statementOffset);
+            ts.addRange(statements, hoistedStatements);
+            ts.addRange(statements, endLexicalEnvironment());
+            var exportStarFunction = addExportStarIfNeeded(statements);
+            statements.push(ts.createReturn(ts.setMultiLine(ts.createObjectLiteral([
+                ts.createPropertyAssignment("setters", createSettersArray(exportStarFunction, dependencyGroups)),
+                ts.createPropertyAssignment("execute", ts.createFunctionExpression(undefined, undefined, undefined, undefined, [], undefined, ts.createBlock(executeStatements, undefined, true)))
+            ]), true)));
+            var body = ts.createBlock(statements, undefined, true);
+            ts.setEmitFlags(body, 1);
+            return body;
         }
-        function recordExportName(name) {
-            if (!exportedLocalNames) {
-                exportedLocalNames = [];
-            }
-            exportedLocalNames.push(name);
-        }
-        function recordExportedFunctionDeclaration(node) {
-            if (!exportedFunctionDeclarations) {
-                exportedFunctionDeclarations = [];
-            }
-            exportedFunctionDeclarations.push(createDeclarationExport(node));
-        }
-        function hoistBindingElement(node, isExported) {
-            if (ts.isOmittedExpression(node)) {
+        function addExportStarIfNeeded(statements) {
+            if (!moduleInfo.hasExportStarsToExportValues) {
                 return;
             }
-            var name = node.name;
-            if (ts.isIdentifier(name)) {
-                hoistVariableDeclaration(ts.getSynthesizedClone(name));
-                if (isExported) {
-                    recordExportName(name);
+            if (!moduleInfo.exportedNames && ts.isEmpty(moduleInfo.exportSpecifiers)) {
+                var hasExportDeclarationWithExportClause = false;
+                for (var _i = 0, _a = moduleInfo.externalImports; _i < _a.length; _i++) {
+                    var externalImport = _a[_i];
+                    if (externalImport.kind === 241 && externalImport.exportClause) {
+                        hasExportDeclarationWithExportClause = true;
+                        break;
+                    }
+                }
+                if (!hasExportDeclarationWithExportClause) {
+                    var exportStarFunction_1 = createExportStarFunction(undefined);
+                    statements.push(exportStarFunction_1);
+                    return exportStarFunction_1.name;
                 }
             }
-            else if (ts.isBindingPattern(name)) {
-                ts.forEach(name.elements, isExported ? hoistExportedBindingElement : hoistNonExportedBindingElement);
+            var exportedNames = [];
+            if (moduleInfo.exportedNames) {
+                for (var _b = 0, _c = moduleInfo.exportedNames; _b < _c.length; _b++) {
+                    var exportedLocalName = _c[_b];
+                    if (exportedLocalName.text === "default") {
+                        continue;
+                    }
+                    exportedNames.push(ts.createPropertyAssignment(ts.createLiteral(exportedLocalName), ts.createLiteral(true)));
+                }
+            }
+            for (var _d = 0, _e = moduleInfo.externalImports; _d < _e.length; _d++) {
+                var externalImport = _e[_d];
+                if (externalImport.kind !== 241) {
+                    continue;
+                }
+                var exportDecl = externalImport;
+                if (!exportDecl.exportClause) {
+                    continue;
+                }
+                for (var _f = 0, _g = exportDecl.exportClause.elements; _f < _g.length; _f++) {
+                    var element = _g[_f];
+                    exportedNames.push(ts.createPropertyAssignment(ts.createLiteral((element.name || element.propertyName).text), ts.createLiteral(true)));
+                }
+            }
+            var exportedNamesStorageRef = ts.createUniqueName("exportedNames");
+            statements.push(ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
+                ts.createVariableDeclaration(exportedNamesStorageRef, undefined, ts.createObjectLiteral(exportedNames, undefined, true))
+            ])));
+            var exportStarFunction = createExportStarFunction(exportedNamesStorageRef);
+            statements.push(exportStarFunction);
+            return exportStarFunction.name;
+        }
+        function createExportStarFunction(localNames) {
+            var exportStarFunction = ts.createUniqueName("exportStar");
+            var m = ts.createIdentifier("m");
+            var n = ts.createIdentifier("n");
+            var exports = ts.createIdentifier("exports");
+            var condition = ts.createStrictInequality(n, ts.createLiteral("default"));
+            if (localNames) {
+                condition = ts.createLogicalAnd(condition, ts.createLogicalNot(ts.createHasOwnProperty(localNames, n)));
+            }
+            return ts.createFunctionDeclaration(undefined, undefined, undefined, exportStarFunction, undefined, [ts.createParameter(undefined, undefined, undefined, m)], undefined, ts.createBlock([
+                ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
+                    ts.createVariableDeclaration(exports, undefined, ts.createObjectLiteral([]))
+                ])),
+                ts.createForIn(ts.createVariableDeclarationList([
+                    ts.createVariableDeclaration(n, undefined)
+                ]), m, ts.createBlock([
+                    ts.setEmitFlags(ts.createIf(condition, ts.createStatement(ts.createAssignment(ts.createElementAccess(exports, n), ts.createElementAccess(m, n)))), 32)
+                ])),
+                ts.createStatement(ts.createCall(exportFunction, undefined, [exports]))
+            ], undefined, true));
+        }
+        function createSettersArray(exportStarFunction, dependencyGroups) {
+            var setters = [];
+            for (var _i = 0, dependencyGroups_1 = dependencyGroups; _i < dependencyGroups_1.length; _i++) {
+                var group = dependencyGroups_1[_i];
+                var localName = ts.forEach(group.externalImports, function (i) { return ts.getLocalNameForExternalImport(i, currentSourceFile); });
+                var parameterName = localName ? ts.getGeneratedNameForNode(localName) : ts.createUniqueName("");
+                var statements = [];
+                for (var _a = 0, _b = group.externalImports; _a < _b.length; _a++) {
+                    var entry = _b[_a];
+                    var importVariableName = ts.getLocalNameForExternalImport(entry, currentSourceFile);
+                    switch (entry.kind) {
+                        case 235:
+                            if (!entry.importClause) {
+                                break;
+                            }
+                        case 234:
+                            ts.Debug.assert(importVariableName !== undefined);
+                            statements.push(ts.createStatement(ts.createAssignment(importVariableName, parameterName)));
+                            break;
+                        case 241:
+                            ts.Debug.assert(importVariableName !== undefined);
+                            if (entry.exportClause) {
+                                var properties = [];
+                                for (var _c = 0, _d = entry.exportClause.elements; _c < _d.length; _c++) {
+                                    var e = _d[_c];
+                                    properties.push(ts.createPropertyAssignment(ts.createLiteral(e.name.text), ts.createElementAccess(parameterName, ts.createLiteral((e.propertyName || e.name).text))));
+                                }
+                                statements.push(ts.createStatement(ts.createCall(exportFunction, undefined, [ts.createObjectLiteral(properties, undefined, true)])));
+                            }
+                            else {
+                                statements.push(ts.createStatement(ts.createCall(exportStarFunction, undefined, [parameterName])));
+                            }
+                            break;
+                    }
+                }
+                setters.push(ts.createFunctionExpression(undefined, undefined, undefined, undefined, [ts.createParameter(undefined, undefined, undefined, parameterName)], undefined, ts.createBlock(statements, undefined, true)));
+            }
+            return ts.createArrayLiteral(setters, undefined, true);
+        }
+        function sourceElementVisitor(node) {
+            switch (node.kind) {
+                case 235:
+                    return visitImportDeclaration(node);
+                case 234:
+                    return visitImportEqualsDeclaration(node);
+                case 241:
+                    return undefined;
+                case 240:
+                    return visitExportAssignment(node);
+                default:
+                    return nestedElementVisitor(node);
             }
         }
-        function hoistExportedBindingElement(node) {
-            hoistBindingElement(node, true);
+        function visitImportDeclaration(node) {
+            var statements;
+            if (node.importClause) {
+                hoistVariableDeclaration(ts.getLocalNameForExternalImport(node, currentSourceFile));
+            }
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfImportDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfImportDeclaration(statements, node);
+            }
+            return ts.singleOrMany(statements);
         }
-        function hoistNonExportedBindingElement(node) {
-            hoistBindingElement(node, false);
+        function visitImportEqualsDeclaration(node) {
+            ts.Debug.assert(ts.isExternalModuleImportEqualsDeclaration(node), "import= for internal module references should be handled in an earlier transformer.");
+            var statements;
+            hoistVariableDeclaration(ts.getLocalNameForExternalImport(node, currentSourceFile));
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfImportEqualsDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfImportEqualsDeclaration(statements, node);
+            }
+            return ts.singleOrMany(statements);
         }
-        function updateSourceFile(node, statements, nodeEmitFlags) {
-            var updated = ts.getMutableClone(node);
-            updated.statements = ts.createNodeArray(statements, node.statements);
-            ts.setEmitFlags(updated, nodeEmitFlags);
-            return updated;
+        function visitExportAssignment(node) {
+            if (node.isExportEquals) {
+                return undefined;
+            }
+            var expression = ts.visitNode(node.expression, destructuringVisitor, ts.isExpression);
+            var original = node.original;
+            if (original && hasAssociatedEndOfDeclarationMarker(original)) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportStatement(deferredExports[id], ts.createIdentifier("default"), expression, true);
+            }
+            else {
+                return createExportStatement(ts.createIdentifier("default"), expression, true);
+            }
+        }
+        function visitFunctionDeclaration(node) {
+            if (ts.hasModifier(node, 1)) {
+                hoistedStatements = ts.append(hoistedStatements, ts.updateFunctionDeclaration(node, node.decorators, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), ts.getDeclarationName(node, true, true), undefined, ts.visitNodes(node.parameters, destructuringVisitor, ts.isParameterDeclaration), undefined, ts.visitNode(node.body, destructuringVisitor, ts.isBlock)));
+            }
+            else {
+                hoistedStatements = ts.append(hoistedStatements, node);
+            }
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfHoistedDeclaration(deferredExports[id], node);
+            }
+            else {
+                hoistedStatements = appendExportsOfHoistedDeclaration(hoistedStatements, node);
+            }
+            return undefined;
+        }
+        function visitClassDeclaration(node) {
+            var statements;
+            var name = ts.getLocalName(node);
+            hoistVariableDeclaration(name);
+            statements = ts.append(statements, ts.createStatement(ts.createAssignment(name, ts.createClassExpression(undefined, node.name, undefined, ts.visitNodes(node.heritageClauses, destructuringVisitor, ts.isHeritageClause), ts.visitNodes(node.members, destructuringVisitor, ts.isClassElement), node)), node));
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfHoistedDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfHoistedDeclaration(statements, node);
+            }
+            return ts.singleOrMany(statements);
+        }
+        function visitVariableStatement(node) {
+            if (!shouldHoistVariableDeclarationList(node.declarationList)) {
+                return ts.visitNode(node, destructuringVisitor, ts.isStatement);
+            }
+            var expressions;
+            var isExportedDeclaration = ts.hasModifier(node, 1);
+            var isMarkedDeclaration = hasAssociatedEndOfDeclarationMarker(node);
+            for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
+                var variable = _a[_i];
+                if (variable.initializer) {
+                    expressions = ts.append(expressions, transformInitializedVariable(variable, isExportedDeclaration && !isMarkedDeclaration));
+                }
+                else {
+                    hoistBindingElement(variable);
+                }
+            }
+            var statements;
+            if (expressions) {
+                statements = ts.append(statements, ts.createStatement(ts.inlineExpressions(expressions), node));
+            }
+            if (isMarkedDeclaration) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node, isExportedDeclaration);
+            }
+            else {
+                statements = appendExportsOfVariableStatement(statements, node, false);
+            }
+            return ts.singleOrMany(statements);
+        }
+        function hoistBindingElement(node) {
+            if (ts.isBindingPattern(node.name)) {
+                for (var _i = 0, _a = node.name.elements; _i < _a.length; _i++) {
+                    var element = _a[_i];
+                    if (!ts.isOmittedExpression(element)) {
+                        hoistBindingElement(element);
+                    }
+                }
+            }
+            else {
+                hoistVariableDeclaration(ts.getSynthesizedClone(node.name));
+            }
+        }
+        function shouldHoistVariableDeclarationList(node) {
+            return (ts.getEmitFlags(node) & 16777216) === 0
+                && (enclosingBlockScopedContainer.kind === 261
+                    || (ts.getOriginalNode(node).flags & 3) === 0);
+        }
+        function transformInitializedVariable(node, isExportedDeclaration) {
+            var createAssignment = isExportedDeclaration ? createExportedVariableAssignment : createNonExportedVariableAssignment;
+            return ts.isBindingPattern(node.name)
+                ? ts.flattenVariableDestructuringToExpression(node, hoistVariableDeclaration, createAssignment, destructuringVisitor)
+                : createAssignment(node.name, ts.visitNode(node.initializer, destructuringVisitor, ts.isExpression));
+        }
+        function createExportedVariableAssignment(name, value, location) {
+            return createVariableAssignment(name, value, location, true);
+        }
+        function createNonExportedVariableAssignment(name, value, location) {
+            return createVariableAssignment(name, value, location, false);
+        }
+        function createVariableAssignment(name, value, location, isExportedDeclaration) {
+            hoistVariableDeclaration(ts.getSynthesizedClone(name));
+            return isExportedDeclaration
+                ? createExportExpression(name, preventSubstitution(ts.createAssignment(name, value, location)))
+                : preventSubstitution(ts.createAssignment(name, value, location));
+        }
+        function visitMergeDeclarationMarker(node) {
+            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 205) {
+                var id = ts.getOriginalNodeId(node);
+                var isExportedDeclaration = ts.hasModifier(node.original, 1);
+                deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node.original, isExportedDeclaration);
+            }
+            return node;
+        }
+        function hasAssociatedEndOfDeclarationMarker(node) {
+            return (ts.getEmitFlags(node) & 33554432) !== 0;
+        }
+        function visitEndOfDeclarationMarker(node) {
+            var id = ts.getOriginalNodeId(node);
+            var statements = deferredExports[id];
+            if (statements) {
+                delete deferredExports[id];
+                return ts.append(statements, node);
+            }
+            return node;
+        }
+        function appendExportsOfImportDeclaration(statements, decl) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            var importClause = decl.importClause;
+            if (!importClause) {
+                return statements;
+            }
+            if (importClause.name) {
+                statements = appendExportsOfDeclaration(statements, importClause);
+            }
+            var namedBindings = importClause.namedBindings;
+            if (namedBindings) {
+                switch (namedBindings.kind) {
+                    case 237:
+                        statements = appendExportsOfDeclaration(statements, namedBindings);
+                        break;
+                    case 238:
+                        for (var _i = 0, _a = namedBindings.elements; _i < _a.length; _i++) {
+                            var importBinding = _a[_i];
+                            statements = appendExportsOfDeclaration(statements, importBinding);
+                        }
+                        break;
+                }
+            }
+            return statements;
+        }
+        function appendExportsOfImportEqualsDeclaration(statements, decl) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            return appendExportsOfDeclaration(statements, decl);
+        }
+        function appendExportsOfVariableStatement(statements, node, exportSelf) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
+                var decl = _a[_i];
+                if (decl.initializer || exportSelf) {
+                    statements = appendExportsOfBindingElement(statements, decl, exportSelf);
+                }
+            }
+            return statements;
+        }
+        function appendExportsOfBindingElement(statements, decl, exportSelf) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            if (ts.isBindingPattern(decl.name)) {
+                for (var _i = 0, _a = decl.name.elements; _i < _a.length; _i++) {
+                    var element = _a[_i];
+                    if (!ts.isOmittedExpression(element)) {
+                        statements = appendExportsOfBindingElement(statements, element, exportSelf);
+                    }
+                }
+            }
+            else if (!ts.isGeneratedIdentifier(decl.name)) {
+                var excludeName = void 0;
+                if (exportSelf) {
+                    statements = appendExportStatement(statements, decl.name, ts.getLocalName(decl));
+                    excludeName = decl.name.text;
+                }
+                statements = appendExportsOfDeclaration(statements, decl, excludeName);
+            }
+            return statements;
+        }
+        function appendExportsOfHoistedDeclaration(statements, decl) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            var excludeName;
+            if (ts.hasModifier(decl, 1)) {
+                var exportName = ts.hasModifier(decl, 512) ? ts.createLiteral("default") : decl.name;
+                statements = appendExportStatement(statements, exportName, ts.getLocalName(decl));
+                excludeName = exportName.text;
+            }
+            if (decl.name) {
+                statements = appendExportsOfDeclaration(statements, decl, excludeName);
+            }
+            return statements;
+        }
+        function appendExportsOfDeclaration(statements, decl, excludeName) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            var name = ts.getDeclarationName(decl);
+            var exportSpecifiers = moduleInfo.exportSpecifiers[name.text];
+            if (exportSpecifiers) {
+                for (var _i = 0, exportSpecifiers_2 = exportSpecifiers; _i < exportSpecifiers_2.length; _i++) {
+                    var exportSpecifier = exportSpecifiers_2[_i];
+                    if (exportSpecifier.name.text !== excludeName) {
+                        statements = appendExportStatement(statements, exportSpecifier.name, name);
+                    }
+                }
+            }
+            return statements;
+        }
+        function appendExportStatement(statements, exportName, expression, allowComments) {
+            statements = ts.append(statements, createExportStatement(exportName, expression, allowComments));
+            return statements;
+        }
+        function createExportStatement(name, value, allowComments) {
+            var statement = ts.createStatement(createExportExpression(name, value));
+            ts.startOnNewLine(statement);
+            if (!allowComments) {
+                ts.setEmitFlags(statement, 49152);
+            }
+            return statement;
+        }
+        function createExportExpression(name, value) {
+            var exportName = ts.isIdentifier(name) ? ts.createLiteral(name) : name;
+            return ts.createCall(exportFunction, undefined, [exportName, value]);
+        }
+        function nestedElementVisitor(node) {
+            switch (node.kind) {
+                case 205:
+                    return visitVariableStatement(node);
+                case 225:
+                    return visitFunctionDeclaration(node);
+                case 226:
+                    return visitClassDeclaration(node);
+                case 211:
+                    return visitForStatement(node);
+                case 212:
+                    return visitForInStatement(node);
+                case 213:
+                    return visitForOfStatement(node);
+                case 209:
+                    return visitDoStatement(node);
+                case 210:
+                    return visitWhileStatement(node);
+                case 219:
+                    return visitLabeledStatement(node);
+                case 217:
+                    return visitWithStatement(node);
+                case 218:
+                    return visitSwitchStatement(node);
+                case 232:
+                    return visitCaseBlock(node);
+                case 253:
+                    return visitCaseClause(node);
+                case 254:
+                    return visitDefaultClause(node);
+                case 221:
+                    return visitTryStatement(node);
+                case 256:
+                    return visitCatchClause(node);
+                case 204:
+                    return visitBlock(node);
+                case 294:
+                    return visitMergeDeclarationMarker(node);
+                case 295:
+                    return visitEndOfDeclarationMarker(node);
+                default:
+                    return destructuringVisitor(node);
+            }
+        }
+        function visitForStatement(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.updateFor(node, visitForInitializer(node.initializer), ts.visitNode(node.condition, destructuringVisitor, ts.isExpression, true), ts.visitNode(node.incrementor, destructuringVisitor, ts.isExpression, true), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement));
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        function visitForInStatement(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.updateForIn(node, visitForInitializer(node.initializer), ts.visitNode(node.expression, destructuringVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, false, ts.liftToBlock));
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        function visitForOfStatement(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.updateForOf(node, visitForInitializer(node.initializer), ts.visitNode(node.expression, destructuringVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, false, ts.liftToBlock));
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        function shouldHoistForInitializer(node) {
+            return ts.isVariableDeclarationList(node)
+                && shouldHoistVariableDeclarationList(node);
+        }
+        function visitForInitializer(node) {
+            if (shouldHoistForInitializer(node)) {
+                var expressions = void 0;
+                for (var _i = 0, _a = node.declarations; _i < _a.length; _i++) {
+                    var variable = _a[_i];
+                    expressions = ts.append(expressions, transformInitializedVariable(variable, false));
+                }
+                return expressions ? ts.inlineExpressions(expressions) : ts.createOmittedExpression();
+            }
+            else {
+                return ts.visitEachChild(node, nestedElementVisitor, context);
+            }
+        }
+        function visitDoStatement(node) {
+            return ts.updateDo(node, ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, false, ts.liftToBlock), ts.visitNode(node.expression, destructuringVisitor, ts.isExpression));
+        }
+        function visitWhileStatement(node) {
+            return ts.updateWhile(node, ts.visitNode(node.expression, destructuringVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, false, ts.liftToBlock));
+        }
+        function visitLabeledStatement(node) {
+            return ts.updateLabel(node, node.label, ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, false, ts.liftToBlock));
+        }
+        function visitWithStatement(node) {
+            return ts.updateWith(node, ts.visitNode(node.expression, destructuringVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, false, ts.liftToBlock));
+        }
+        function visitSwitchStatement(node) {
+            return ts.updateSwitch(node, ts.visitNode(node.expression, destructuringVisitor, ts.isExpression), ts.visitNode(node.caseBlock, nestedElementVisitor, ts.isCaseBlock));
+        }
+        function visitCaseBlock(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.updateCaseBlock(node, ts.visitNodes(node.clauses, nestedElementVisitor, ts.isCaseOrDefaultClause));
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        function visitCaseClause(node) {
+            return ts.updateCaseClause(node, ts.visitNode(node.expression, destructuringVisitor, ts.isExpression), ts.visitNodes(node.statements, nestedElementVisitor, ts.isStatement));
+        }
+        function visitDefaultClause(node) {
+            return ts.visitEachChild(node, nestedElementVisitor, context);
+        }
+        function visitTryStatement(node) {
+            return ts.visitEachChild(node, nestedElementVisitor, context);
+        }
+        function visitCatchClause(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.updateCatchClause(node, node.variableDeclaration, ts.visitNode(node.block, nestedElementVisitor, ts.isBlock));
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        function visitBlock(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.visitEachChild(node, nestedElementVisitor, context);
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        function destructuringVisitor(node) {
+            if (node.transformFlags & 16384
+                && node.kind === 192) {
+                return visitDestructuringAssignment(node);
+            }
+            else if (node.transformFlags & 32768) {
+                return ts.visitEachChild(node, destructuringVisitor, context);
+            }
+            else {
+                return node;
+            }
+        }
+        function visitDestructuringAssignment(node) {
+            if (hasExportedReferenceInDestructuringTarget(node.left)) {
+                return ts.flattenDestructuringAssignment(context, node, true, hoistVariableDeclaration, destructuringVisitor);
+            }
+            return ts.visitEachChild(node, destructuringVisitor, context);
+        }
+        function hasExportedReferenceInDestructuringTarget(node) {
+            if (ts.isAssignmentExpression(node)) {
+                return hasExportedReferenceInDestructuringTarget(node.left);
+            }
+            else if (ts.isSpreadExpression(node)) {
+                return hasExportedReferenceInDestructuringTarget(node.expression);
+            }
+            else if (ts.isObjectLiteralExpression(node)) {
+                return ts.some(node.properties, hasExportedReferenceInDestructuringTarget);
+            }
+            else if (ts.isArrayLiteralExpression(node)) {
+                return ts.some(node.elements, hasExportedReferenceInDestructuringTarget);
+            }
+            else if (ts.isShorthandPropertyAssignment(node)) {
+                return hasExportedReferenceInDestructuringTarget(node.name);
+            }
+            else if (ts.isPropertyAssignment(node)) {
+                return hasExportedReferenceInDestructuringTarget(node.initializer);
+            }
+            else if (ts.isIdentifier(node)) {
+                var container = resolver.getReferencedExportContainer(node);
+                return container !== undefined && container.kind === 261;
+            }
+            else {
+                return false;
+            }
+        }
+        function modifierVisitor(node) {
+            switch (node.kind) {
+                case 83:
+                case 78:
+                    return undefined;
+            }
+            return node;
+        }
+        function onEmitNode(emitContext, node, emitCallback) {
+            if (node.kind === 261) {
+                var id = ts.getOriginalNodeId(node);
+                currentSourceFile = node;
+                moduleInfo = moduleInfoMap[id];
+                exportFunction = exportFunctionsMap[id];
+                noSubstitution = noSubstitutionMap[id];
+                if (noSubstitution) {
+                    delete noSubstitutionMap[id];
+                }
+                previousOnEmitNode(emitContext, node, emitCallback);
+                currentSourceFile = undefined;
+                moduleInfo = undefined;
+                exportFunction = undefined;
+                noSubstitution = undefined;
+            }
+            else {
+                previousOnEmitNode(emitContext, node, emitCallback);
+            }
+        }
+        function onSubstituteNode(emitContext, node) {
+            node = previousOnSubstituteNode(emitContext, node);
+            if (isSubstitutionPrevented(node)) {
+                return node;
+            }
+            if (emitContext === 1) {
+                return substituteExpression(node);
+            }
+            return node;
+        }
+        function substituteExpression(node) {
+            switch (node.kind) {
+                case 70:
+                    return substituteExpressionIdentifier(node);
+                case 192:
+                    return substituteBinaryExpression(node);
+                case 190:
+                case 191:
+                    return substituteUnaryExpression(node);
+            }
+            return node;
+        }
+        function substituteExpressionIdentifier(node) {
+            if (!ts.isGeneratedIdentifier(node) && !ts.isLocalName(node)) {
+                var importDeclaration = resolver.getReferencedImportDeclaration(node);
+                if (importDeclaration) {
+                    if (ts.isImportClause(importDeclaration)) {
+                        return ts.createPropertyAccess(ts.getGeneratedNameForNode(importDeclaration.parent), ts.createIdentifier("default"), node);
+                    }
+                    else if (ts.isImportSpecifier(importDeclaration)) {
+                        return ts.createPropertyAccess(ts.getGeneratedNameForNode(importDeclaration.parent.parent.parent), ts.getSynthesizedClone(importDeclaration.propertyName || importDeclaration.name), node);
+                    }
+                }
+            }
+            return node;
+        }
+        function substituteBinaryExpression(node) {
+            if (ts.isAssignmentOperator(node.operatorToken.kind)
+                && ts.isIdentifier(node.left)
+                && !ts.isGeneratedIdentifier(node.left)
+                && !ts.isLocalName(node.left)
+                && !ts.isDeclarationNameOfEnumOrNamespace(node.left)) {
+                var exportedNames = getExports(node.left);
+                if (exportedNames) {
+                    var expression = node;
+                    for (var _i = 0, exportedNames_3 = exportedNames; _i < exportedNames_3.length; _i++) {
+                        var exportName = exportedNames_3[_i];
+                        expression = createExportExpression(exportName, preventSubstitution(expression));
+                    }
+                    return expression;
+                }
+            }
+            return node;
+        }
+        function substituteUnaryExpression(node) {
+            if ((node.operator === 42 || node.operator === 43)
+                && ts.isIdentifier(node.operand)
+                && !ts.isGeneratedIdentifier(node.operand)
+                && !ts.isLocalName(node.operand)
+                && !ts.isDeclarationNameOfEnumOrNamespace(node.operand)) {
+                var exportedNames = getExports(node.operand);
+                if (exportedNames) {
+                    var expression = node.kind === 191
+                        ? ts.createPrefix(node.operator, node.operand, node)
+                        : node;
+                    for (var _i = 0, exportedNames_4 = exportedNames; _i < exportedNames_4.length; _i++) {
+                        var exportName = exportedNames_4[_i];
+                        expression = createExportExpression(exportName, preventSubstitution(expression));
+                    }
+                    if (node.kind === 191) {
+                        expression = node.operator === 42
+                            ? ts.createSubtract(preventSubstitution(expression), ts.createLiteral(1))
+                            : ts.createAdd(preventSubstitution(expression), ts.createLiteral(1));
+                    }
+                    return expression;
+                }
+            }
+            return node;
+        }
+        function getExports(name) {
+            var exportedNames;
+            if (!ts.isGeneratedIdentifier(name)) {
+                var valueDeclaration = resolver.getReferencedImportDeclaration(name)
+                    || resolver.getReferencedValueDeclaration(name);
+                if (valueDeclaration) {
+                    var exportContainer = resolver.getReferencedExportContainer(name, false);
+                    if (exportContainer && exportContainer.kind === 261) {
+                        exportedNames = ts.append(exportedNames, ts.getDeclarationName(valueDeclaration));
+                    }
+                    exportedNames = ts.addRange(exportedNames, moduleInfo && moduleInfo.exportedBindings[ts.getOriginalNodeId(valueDeclaration)]);
+                }
+            }
+            return exportedNames;
+        }
+        function preventSubstitution(node) {
+            if (noSubstitution === undefined)
+                noSubstitution = ts.createMap();
+            noSubstitution[ts.getNodeId(node)] = true;
+            return node;
+        }
+        function isSubstitutionPrevented(node) {
+            return noSubstitution && node.id && noSubstitution[node.id];
         }
     }
     ts.transformSystemModule = transformSystemModule;
@@ -43575,9 +45658,9 @@ var ts;
         }
         function visitor(node) {
             switch (node.kind) {
-                case 230:
+                case 234:
                     return undefined;
-                case 236:
+                case 240:
                     return visitExportAssignment(node);
             }
             return node;
@@ -43598,21 +45681,18 @@ var ts;
         _a[ts.ModuleKind.UMD] = ts.transformModule,
         _a[ts.ModuleKind.None] = ts.transformModule,
         _a));
-    var SyntaxKindFeatureFlags;
-    (function (SyntaxKindFeatureFlags) {
-        SyntaxKindFeatureFlags[SyntaxKindFeatureFlags["Substitution"] = 1] = "Substitution";
-        SyntaxKindFeatureFlags[SyntaxKindFeatureFlags["EmitNotifications"] = 2] = "EmitNotifications";
-    })(SyntaxKindFeatureFlags || (SyntaxKindFeatureFlags = {}));
     function getTransformers(compilerOptions) {
         var jsx = compilerOptions.jsx;
         var languageVersion = ts.getEmitScriptTarget(compilerOptions);
         var moduleKind = ts.getEmitModuleKind(compilerOptions);
         var transformers = [];
         transformers.push(ts.transformTypeScript);
-        transformers.push(moduleTransformerMap[moduleKind] || moduleTransformerMap[ts.ModuleKind.None]);
         if (jsx === 2) {
             transformers.push(ts.transformJsx);
         }
+        if (languageVersion < 5) {
+            transformers.push(ts.transformESNext);
+        }
         if (languageVersion < 4) {
             transformers.push(ts.transformES2017);
         }
@@ -43623,6 +45703,7 @@ var ts;
             transformers.push(ts.transformES2015);
             transformers.push(ts.transformGenerators);
         }
+        transformers.push(moduleTransformerMap[moduleKind] || moduleTransformerMap[ts.ModuleKind.None]);
         if (languageVersion < 1) {
             transformers.push(ts.transformES5);
         }
@@ -43632,7 +45713,7 @@ var ts;
     function transformFiles(resolver, host, sourceFiles, transformers) {
         var lexicalEnvironmentVariableDeclarationsStack = [];
         var lexicalEnvironmentFunctionDeclarationsStack = [];
-        var enabledSyntaxKindFeatures = new Array(289);
+        var enabledSyntaxKindFeatures = new Array(296);
         var lexicalEnvironmentStackOffset = 0;
         var hoistedVariableDeclarations;
         var hoistedFunctionDeclarations;
@@ -43785,7 +45866,7 @@ var ts;
         var isCurrentFileExternalModule;
         var reportedDeclarationError = false;
         var errorNameNode;
-        var emitJsDocComments = compilerOptions.removeComments ? function () { } : writeJsDocComments;
+        var emitJsDocComments = compilerOptions.removeComments ? ts.noop : writeJsDocComments;
         var emit = compilerOptions.stripInternal ? stripInternal : emitNode;
         var noDeclare;
         var moduleElementDeclarationEmitInfo = [];
@@ -43829,7 +45910,7 @@ var ts;
                 var oldWriter = writer;
                 ts.forEach(moduleElementDeclarationEmitInfo, function (aliasEmitInfo) {
                     if (aliasEmitInfo.isVisible && !aliasEmitInfo.asynchronousOutput) {
-                        ts.Debug.assert(aliasEmitInfo.node.kind === 231);
+                        ts.Debug.assert(aliasEmitInfo.node.kind === 235);
                         createAndSetNewTextWriterWithSymbolWriter();
                         ts.Debug.assert(aliasEmitInfo.indent === 0 || (aliasEmitInfo.indent === 1 && isBundledEmit));
                         for (var i = 0; i < aliasEmitInfo.indent; i++) {
@@ -43900,10 +45981,10 @@ var ts;
             var oldWriter = writer;
             ts.forEach(nodes, function (declaration) {
                 var nodeToCheck;
-                if (declaration.kind === 219) {
+                if (declaration.kind === 223) {
                     nodeToCheck = declaration.parent.parent;
                 }
-                else if (declaration.kind === 234 || declaration.kind === 235 || declaration.kind === 232) {
+                else if (declaration.kind === 238 || declaration.kind === 239 || declaration.kind === 236) {
                     ts.Debug.fail("We should be getting ImportDeclaration instead to write");
                 }
                 else {
@@ -43914,7 +45995,7 @@ var ts;
                     moduleElementEmitInfo = ts.forEach(asynchronousSubModuleDeclarationEmitInfo, function (declEmitInfo) { return declEmitInfo.node === nodeToCheck ? declEmitInfo : undefined; });
                 }
                 if (moduleElementEmitInfo) {
-                    if (moduleElementEmitInfo.node.kind === 231) {
+                    if (moduleElementEmitInfo.node.kind === 235) {
                         moduleElementEmitInfo.isVisible = true;
                     }
                     else {
@@ -43922,12 +46003,12 @@ var ts;
                         for (var declarationIndent = moduleElementEmitInfo.indent; declarationIndent; declarationIndent--) {
                             increaseIndent();
                         }
-                        if (nodeToCheck.kind === 226) {
+                        if (nodeToCheck.kind === 230) {
                             ts.Debug.assert(asynchronousSubModuleDeclarationEmitInfo === undefined);
                             asynchronousSubModuleDeclarationEmitInfo = [];
                         }
                         writeModuleElement(nodeToCheck);
-                        if (nodeToCheck.kind === 226) {
+                        if (nodeToCheck.kind === 230) {
                             moduleElementEmitInfo.subModuleElementDeclarationEmitInfo = asynchronousSubModuleDeclarationEmitInfo;
                             asynchronousSubModuleDeclarationEmitInfo = undefined;
                         }
@@ -44040,43 +46121,49 @@ var ts;
         function emitType(type) {
             switch (type.kind) {
                 case 118:
-                case 133:
-                case 131:
-                case 121:
                 case 134:
+                case 132:
+                case 121:
+                case 135:
                 case 104:
-                case 136:
+                case 137:
                 case 94:
-                case 128:
-                case 166:
+                case 129:
                 case 167:
+                case 171:
                     return writeTextOfNode(currentText, type);
-                case 195:
+                case 199:
                     return emitExpressionWithTypeArguments(type);
-                case 156:
-                    return emitTypeReference(type);
-                case 159:
-                    return emitTypeQuery(type);
-                case 161:
-                    return emitArrayType(type);
-                case 162:
-                    return emitTupleType(type);
-                case 163:
-                    return emitUnionType(type);
-                case 164:
-                    return emitIntersectionType(type);
-                case 165:
-                    return emitParenType(type);
                 case 157:
-                case 158:
-                    return emitSignatureDeclarationWithJsDocComments(type);
+                    return emitTypeReference(type);
                 case 160:
+                    return emitTypeQuery(type);
+                case 162:
+                    return emitArrayType(type);
+                case 163:
+                    return emitTupleType(type);
+                case 164:
+                    return emitUnionType(type);
+                case 165:
+                    return emitIntersectionType(type);
+                case 166:
+                    return emitParenType(type);
+                case 168:
+                    return emitTypeOperator(type);
+                case 169:
+                    return emitIndexedAccessType(type);
+                case 170:
+                    return emitMappedType(type);
+                case 158:
+                case 159:
+                    return emitSignatureDeclarationWithJsDocComments(type);
+                case 161:
                     return emitTypeLiteral(type);
                 case 70:
                     return emitEntityName(type);
-                case 140:
+                case 141:
                     return emitEntityName(type);
-                case 155:
+                case 156:
                     return emitTypePredicate(type);
             }
             function writeEntityName(entityName) {
@@ -44084,22 +46171,22 @@ var ts;
                     writeTextOfNode(currentText, entityName);
                 }
                 else {
-                    var left = entityName.kind === 140 ? entityName.left : entityName.expression;
-                    var right = entityName.kind === 140 ? entityName.right : entityName.name;
+                    var left = entityName.kind === 141 ? entityName.left : entityName.expression;
+                    var right = entityName.kind === 141 ? entityName.right : entityName.name;
                     writeEntityName(left);
                     write(".");
                     writeTextOfNode(currentText, right);
                 }
             }
             function emitEntityName(entityName) {
-                var visibilityResult = resolver.isEntityNameVisible(entityName, entityName.parent.kind === 230 ? entityName.parent : enclosingDeclaration);
+                var visibilityResult = resolver.isEntityNameVisible(entityName, entityName.parent.kind === 234 ? entityName.parent : enclosingDeclaration);
                 handleSymbolAccessibilityError(visibilityResult);
                 recordTypeReferenceDirectivesIfNecessary(resolver.getTypeReferenceDirectivesForEntityName(entityName));
                 writeEntityName(entityName);
             }
             function emitExpressionWithTypeArguments(node) {
                 if (ts.isEntityNameExpression(node.expression)) {
-                    ts.Debug.assert(node.expression.kind === 70 || node.expression.kind === 173);
+                    ts.Debug.assert(node.expression.kind === 70 || node.expression.kind === 177);
                     emitEntityName(node.expression);
                     if (node.typeArguments) {
                         write("<");
@@ -44145,6 +46232,42 @@ var ts;
                 emitType(type.type);
                 write(")");
             }
+            function emitTypeOperator(type) {
+                write(ts.tokenToString(type.operator));
+                write(" ");
+                emitType(type.type);
+            }
+            function emitIndexedAccessType(node) {
+                emitType(node.objectType);
+                write("[");
+                emitType(node.indexType);
+                write("]");
+            }
+            function emitMappedType(node) {
+                var prevEnclosingDeclaration = enclosingDeclaration;
+                enclosingDeclaration = node;
+                write("{");
+                writeLine();
+                increaseIndent();
+                if (node.readonlyToken) {
+                    write("readonly ");
+                }
+                write("[");
+                writeEntityName(node.typeParameter.name);
+                write(" in ");
+                emitType(node.typeParameter.constraint);
+                write("]");
+                if (node.questionToken) {
+                    write("?");
+                }
+                write(": ");
+                emitType(node.type);
+                write(";");
+                writeLine();
+                decreaseIndent();
+                write("}");
+                enclosingDeclaration = prevEnclosingDeclaration;
+            }
             function emitTypeLiteral(type) {
                 write("{");
                 if (type.members.length) {
@@ -44173,9 +46296,9 @@ var ts;
             var count = 0;
             while (true) {
                 count++;
-                var name_40 = baseName + "_" + count;
-                if (!(name_40 in currentIdentifiers)) {
-                    return name_40;
+                var name_39 = baseName + "_" + count;
+                if (!(name_39 in currentIdentifiers)) {
+                    return name_39;
                 }
             }
         }
@@ -44219,10 +46342,10 @@ var ts;
             if (isModuleElementVisible) {
                 writeModuleElement(node);
             }
-            else if (node.kind === 230 ||
-                (node.parent.kind === 256 && isCurrentFileExternalModule)) {
+            else if (node.kind === 234 ||
+                (node.parent.kind === 261 && isCurrentFileExternalModule)) {
                 var isVisible = void 0;
-                if (asynchronousSubModuleDeclarationEmitInfo && node.parent.kind !== 256) {
+                if (asynchronousSubModuleDeclarationEmitInfo && node.parent.kind !== 261) {
                     asynchronousSubModuleDeclarationEmitInfo.push({
                         node: node,
                         outputPos: writer.getTextPos(),
@@ -44231,7 +46354,7 @@ var ts;
                     });
                 }
                 else {
-                    if (node.kind === 231) {
+                    if (node.kind === 235) {
                         var importDeclaration = node;
                         if (importDeclaration.importClause) {
                             isVisible = (importDeclaration.importClause.name && resolver.isDeclarationVisible(importDeclaration.importClause)) ||
@@ -44249,30 +46372,30 @@ var ts;
         }
         function writeModuleElement(node) {
             switch (node.kind) {
-                case 221:
-                    return writeFunctionDeclaration(node);
-                case 201:
-                    return writeVariableStatement(node);
-                case 223:
-                    return writeInterfaceDeclaration(node);
-                case 222:
-                    return writeClassDeclaration(node);
-                case 224:
-                    return writeTypeAliasDeclaration(node);
                 case 225:
-                    return writeEnumDeclaration(node);
+                    return writeFunctionDeclaration(node);
+                case 205:
+                    return writeVariableStatement(node);
+                case 227:
+                    return writeInterfaceDeclaration(node);
                 case 226:
-                    return writeModuleDeclaration(node);
+                    return writeClassDeclaration(node);
+                case 228:
+                    return writeTypeAliasDeclaration(node);
+                case 229:
+                    return writeEnumDeclaration(node);
                 case 230:
+                    return writeModuleDeclaration(node);
+                case 234:
                     return writeImportEqualsDeclaration(node);
-                case 231:
+                case 235:
                     return writeImportDeclaration(node);
                 default:
                     ts.Debug.fail("Unknown symbol kind");
             }
         }
         function emitModuleElementDeclarationFlags(node) {
-            if (node.parent.kind === 256) {
+            if (node.parent.kind === 261) {
                 var modifiers = ts.getModifierFlags(node);
                 if (modifiers & 1) {
                     write("export ");
@@ -44280,7 +46403,7 @@ var ts;
                 if (modifiers & 512) {
                     write("default ");
                 }
-                else if (node.kind !== 223 && !noDeclare) {
+                else if (node.kind !== 227 && !noDeclare) {
                     write("declare ");
                 }
             }
@@ -44330,7 +46453,7 @@ var ts;
         }
         function isVisibleNamedBinding(namedBindings) {
             if (namedBindings) {
-                if (namedBindings.kind === 233) {
+                if (namedBindings.kind === 237) {
                     return resolver.isDeclarationVisible(namedBindings);
                 }
                 else {
@@ -44353,7 +46476,7 @@ var ts;
                     if (currentWriterPos !== writer.getTextPos()) {
                         write(", ");
                     }
-                    if (node.importClause.namedBindings.kind === 233) {
+                    if (node.importClause.namedBindings.kind === 237) {
                         write("* as ");
                         writeTextOfNode(currentText, node.importClause.namedBindings.name);
                     }
@@ -44370,13 +46493,13 @@ var ts;
             writer.writeLine();
         }
         function emitExternalModuleSpecifier(parent) {
-            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || parent.kind !== 226;
+            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || parent.kind !== 230;
             var moduleSpecifier;
-            if (parent.kind === 230) {
+            if (parent.kind === 234) {
                 var node = parent;
                 moduleSpecifier = ts.getExternalModuleImportEqualsDeclarationExpression(node);
             }
-            else if (parent.kind === 226) {
+            else if (parent.kind === 230) {
                 moduleSpecifier = parent.name;
             }
             else {
@@ -44444,7 +46567,7 @@ var ts;
                     writeTextOfNode(currentText, node.name);
                 }
             }
-            while (node.body && node.body.kind !== 227) {
+            while (node.body && node.body.kind !== 231) {
                 node = node.body;
                 write(".");
                 writeTextOfNode(currentText, node.name);
@@ -44514,7 +46637,7 @@ var ts;
             writeLine();
         }
         function isPrivateMethodTypeParameter(node) {
-            return node.parent.kind === 148 && ts.hasModifier(node.parent, 8);
+            return node.parent.kind === 149 && ts.hasModifier(node.parent, 8);
         }
         function emitTypeParameters(typeParameters) {
             function emitTypeParameter(node) {
@@ -44524,15 +46647,15 @@ var ts;
                 writeTextOfNode(currentText, node.name);
                 if (node.constraint && !isPrivateMethodTypeParameter(node)) {
                     write(" extends ");
-                    if (node.parent.kind === 157 ||
-                        node.parent.kind === 158 ||
-                        (node.parent.parent && node.parent.parent.kind === 160)) {
-                        ts.Debug.assert(node.parent.kind === 148 ||
-                            node.parent.kind === 147 ||
-                            node.parent.kind === 157 ||
+                    if (node.parent.kind === 158 ||
+                        node.parent.kind === 159 ||
+                        (node.parent.parent && node.parent.parent.kind === 161)) {
+                        ts.Debug.assert(node.parent.kind === 149 ||
+                            node.parent.kind === 148 ||
                             node.parent.kind === 158 ||
-                            node.parent.kind === 152 ||
-                            node.parent.kind === 153);
+                            node.parent.kind === 159 ||
+                            node.parent.kind === 153 ||
+                            node.parent.kind === 154);
                         emitType(node.constraint);
                     }
                     else {
@@ -44542,31 +46665,31 @@ var ts;
                 function getTypeParameterConstraintVisibilityError() {
                     var diagnosticMessage;
                     switch (node.parent.kind) {
-                        case 222:
+                        case 226:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_class_has_or_is_using_private_name_1;
                             break;
-                        case 223:
+                        case 227:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1;
                             break;
-                        case 153:
+                        case 154:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
                             break;
-                        case 152:
+                        case 153:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
                             break;
+                        case 149:
                         case 148:
-                        case 147:
                             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 === 222) {
+                            else if (node.parent.parent.kind === 226) {
                                 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 221:
+                        case 225:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_function_has_or_is_using_private_name_1;
                             break;
                         default:
@@ -44603,7 +46726,7 @@ var ts;
                 }
                 function getHeritageClauseVisibilityError() {
                     var diagnosticMessage;
-                    if (node.parent.parent.kind === 222) {
+                    if (node.parent.parent.kind === 226) {
                         diagnosticMessage = isImplementsList ?
                             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;
@@ -44683,17 +46806,17 @@ var ts;
             writeLine();
         }
         function emitVariableDeclaration(node) {
-            if (node.kind !== 219 || resolver.isDeclarationVisible(node)) {
+            if (node.kind !== 223 || resolver.isDeclarationVisible(node)) {
                 if (ts.isBindingPattern(node.name)) {
                     emitBindingPattern(node.name);
                 }
                 else {
                     writeTextOfNode(currentText, node.name);
-                    if ((node.kind === 146 || node.kind === 145 ||
-                        (node.kind === 143 && !ts.isParameterPropertyDeclaration(node))) && ts.hasQuestionToken(node)) {
+                    if ((node.kind === 147 || node.kind === 146 ||
+                        (node.kind === 144 && !ts.isParameterPropertyDeclaration(node))) && ts.hasQuestionToken(node)) {
                         write("?");
                     }
-                    if ((node.kind === 146 || node.kind === 145) && node.parent.kind === 160) {
+                    if ((node.kind === 147 || node.kind === 146) && node.parent.kind === 161) {
                         emitTypeOfVariableDeclarationFromTypeLiteral(node);
                     }
                     else if (resolver.isLiteralConstDeclaration(node)) {
@@ -44706,14 +46829,14 @@ var ts;
                 }
             }
             function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
-                if (node.kind === 219) {
+                if (node.kind === 223) {
                     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 === 146 || node.kind === 145) {
+                else if (node.kind === 147 || node.kind === 146) {
                     if (ts.hasModifier(node, 32)) {
                         return symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 ?
@@ -44721,7 +46844,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 === 222) {
+                    else if (node.parent.kind === 226) {
                         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 :
@@ -44747,7 +46870,7 @@ var ts;
                 var elements = [];
                 for (var _i = 0, _a = bindingPattern.elements; _i < _a.length; _i++) {
                     var element = _a[_i];
-                    if (element.kind !== 194) {
+                    if (element.kind !== 198) {
                         elements.push(element);
                     }
                 }
@@ -44813,7 +46936,7 @@ var ts;
                     accessorWithTypeAnnotation = node;
                     var type = getTypeAnnotationFromAccessor(node);
                     if (!type) {
-                        var anotherAccessor = node.kind === 150 ? accessors.setAccessor : accessors.getAccessor;
+                        var anotherAccessor = node.kind === 151 ? accessors.setAccessor : accessors.getAccessor;
                         type = getTypeAnnotationFromAccessor(anotherAccessor);
                         if (type) {
                             accessorWithTypeAnnotation = anotherAccessor;
@@ -44826,7 +46949,7 @@ var ts;
             }
             function getTypeAnnotationFromAccessor(accessor) {
                 if (accessor) {
-                    return accessor.kind === 150
+                    return accessor.kind === 151
                         ? accessor.type
                         : accessor.parameters.length > 0
                             ? accessor.parameters[0].type
@@ -44835,7 +46958,7 @@ var ts;
             }
             function getAccessorDeclarationTypeVisibilityError(symbolAccessibilityResult) {
                 var diagnosticMessage;
-                if (accessorWithTypeAnnotation.kind === 151) {
+                if (accessorWithTypeAnnotation.kind === 152) {
                     if (ts.hasModifier(accessorWithTypeAnnotation.parent, 32)) {
                         diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
@@ -44881,17 +47004,17 @@ var ts;
             }
             if (!resolver.isImplementationOfOverload(node)) {
                 emitJsDocComments(node);
-                if (node.kind === 221) {
+                if (node.kind === 225) {
                     emitModuleElementDeclarationFlags(node);
                 }
-                else if (node.kind === 148 || node.kind === 149) {
+                else if (node.kind === 149 || node.kind === 150) {
                     emitClassMemberDeclarationFlags(ts.getModifierFlags(node));
                 }
-                if (node.kind === 221) {
+                if (node.kind === 225) {
                     write("function ");
                     writeTextOfNode(currentText, node.name);
                 }
-                else if (node.kind === 149) {
+                else if (node.kind === 150) {
                     write("constructor");
                 }
                 else {
@@ -44911,15 +47034,15 @@ var ts;
             var prevEnclosingDeclaration = enclosingDeclaration;
             enclosingDeclaration = node;
             var closeParenthesizedFunctionType = false;
-            if (node.kind === 154) {
+            if (node.kind === 155) {
                 emitClassMemberDeclarationFlags(ts.getModifierFlags(node));
                 write("[");
             }
             else {
-                if (node.kind === 153 || node.kind === 158) {
+                if (node.kind === 154 || node.kind === 159) {
                     write("new ");
                 }
-                else if (node.kind === 157) {
+                else if (node.kind === 158) {
                     var currentOutput = writer.getText();
                     if (node.typeParameters && currentOutput.charAt(currentOutput.length - 1) === "<") {
                         closeParenthesizedFunctionType = true;
@@ -44930,20 +47053,20 @@ var ts;
                 write("(");
             }
             emitCommaList(node.parameters, emitParameterDeclaration);
-            if (node.kind === 154) {
+            if (node.kind === 155) {
                 write("]");
             }
             else {
                 write(")");
             }
-            var isFunctionTypeOrConstructorType = node.kind === 157 || node.kind === 158;
-            if (isFunctionTypeOrConstructorType || node.parent.kind === 160) {
+            var isFunctionTypeOrConstructorType = node.kind === 158 || node.kind === 159;
+            if (isFunctionTypeOrConstructorType || node.parent.kind === 161) {
                 if (node.type) {
                     write(isFunctionTypeOrConstructorType ? " => " : ": ");
                     emitType(node.type);
                 }
             }
-            else if (node.kind !== 149 && !ts.hasModifier(node, 8)) {
+            else if (node.kind !== 150 && !ts.hasModifier(node, 8)) {
                 writeReturnTypeAtSignature(node, getReturnTypeVisibilityError);
             }
             enclosingDeclaration = prevEnclosingDeclaration;
@@ -44957,23 +47080,23 @@ var ts;
             function getReturnTypeVisibilityError(symbolAccessibilityResult) {
                 var diagnosticMessage;
                 switch (node.kind) {
-                    case 153:
+                    case 154:
                         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 152:
+                    case 153:
                         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 154:
+                    case 155:
                         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 149:
                     case 148:
-                    case 147:
                         if (ts.hasModifier(node, 32)) {
                             diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                                 symbolAccessibilityResult.accessibility === 2 ?
@@ -44981,7 +47104,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 === 222) {
+                        else if (node.parent.kind === 226) {
                             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 :
@@ -44994,7 +47117,7 @@ var ts;
                                 ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0;
                         }
                         break;
-                    case 221:
+                    case 225:
                         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 :
@@ -45026,9 +47149,9 @@ var ts;
                 write("?");
             }
             decreaseIndent();
-            if (node.parent.kind === 157 ||
-                node.parent.kind === 158 ||
-                node.parent.parent.kind === 160) {
+            if (node.parent.kind === 158 ||
+                node.parent.kind === 159 ||
+                node.parent.parent.kind === 161) {
                 emitTypeOfVariableDeclarationFromTypeLiteral(node);
             }
             else if (!ts.hasModifier(node.parent, 8)) {
@@ -45044,22 +47167,22 @@ var ts;
             }
             function getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
                 switch (node.parent.kind) {
-                    case 149:
+                    case 150:
                         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 153:
+                    case 154:
                         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 152:
+                    case 153:
                         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 149:
                     case 148:
-                    case 147:
                         if (ts.hasModifier(node.parent, 32)) {
                             return symbolAccessibilityResult.errorModuleName ?
                                 symbolAccessibilityResult.accessibility === 2 ?
@@ -45067,7 +47190,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 === 222) {
+                        else if (node.parent.parent.kind === 226) {
                             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 :
@@ -45079,7 +47202,7 @@ 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 221:
+                    case 225:
                         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 :
@@ -45090,12 +47213,12 @@ var ts;
                 }
             }
             function emitBindingPattern(bindingPattern) {
-                if (bindingPattern.kind === 168) {
+                if (bindingPattern.kind === 172) {
                     write("{");
                     emitCommaList(bindingPattern.elements, emitBindingElement);
                     write("}");
                 }
-                else if (bindingPattern.kind === 169) {
+                else if (bindingPattern.kind === 173) {
                     write("[");
                     var elements = bindingPattern.elements;
                     emitCommaList(elements, emitBindingElement);
@@ -45106,10 +47229,10 @@ var ts;
                 }
             }
             function emitBindingElement(bindingElement) {
-                if (bindingElement.kind === 194) {
+                if (bindingElement.kind === 198) {
                     write(" ");
                 }
-                else if (bindingElement.kind === 170) {
+                else if (bindingElement.kind === 174) {
                     if (bindingElement.propertyName) {
                         writeTextOfNode(currentText, bindingElement.propertyName);
                         write(": ");
@@ -45131,39 +47254,39 @@ var ts;
         }
         function emitNode(node) {
             switch (node.kind) {
-                case 221:
-                case 226:
-                case 230:
-                case 223:
-                case 222:
-                case 224:
                 case 225:
+                case 230:
+                case 234:
+                case 227:
+                case 226:
+                case 228:
+                case 229:
                     return emitModuleElement(node, isModuleElementVisible(node));
-                case 201:
+                case 205:
                     return emitModuleElement(node, isVariableStatementVisible(node));
-                case 231:
+                case 235:
                     return emitModuleElement(node, !node.importClause);
-                case 237:
+                case 241:
                     return emitExportDeclaration(node);
+                case 150:
                 case 149:
                 case 148:
-                case 147:
                     return writeFunctionDeclaration(node);
-                case 153:
-                case 152:
                 case 154:
+                case 153:
+                case 155:
                     return emitSignatureDeclarationWithJsDocComments(node);
-                case 150:
                 case 151:
+                case 152:
                     return emitAccessorDeclaration(node);
+                case 147:
                 case 146:
-                case 145:
                     return emitPropertyDeclaration(node);
-                case 255:
+                case 260:
                     return emitEnumMemberDeclaration(node);
-                case 236:
+                case 240:
                     return emitExportAssignment(node);
-                case 256:
+                case 261:
                     return emitSourceFile(node);
             }
         }
@@ -45380,7 +47503,7 @@ var ts;
                 var emitNode = node.emitNode;
                 var emitFlags = emitNode && emitNode.flags;
                 var _a = emitNode && emitNode.sourceMapRange || node, pos = _a.pos, end = _a.end;
-                if (node.kind !== 287
+                if (node.kind !== 292
                     && (emitFlags & 512) === 0
                     && pos >= 0) {
                     emitPos(ts.skipTrivia(currentSourceText, pos));
@@ -45393,7 +47516,7 @@ var ts;
                 else {
                     emitCallback(emitContext, node);
                 }
-                if (node.kind !== 287
+                if (node.kind !== 292
                     && (emitFlags & 1024) === 0
                     && end >= 0) {
                     emitPos(end);
@@ -45537,7 +47660,7 @@ var ts;
                     if (extendedDiagnostics) {
                         ts.performance.mark("preEmitNodeWithComment");
                     }
-                    var isEmittedNode = node.kind !== 287;
+                    var isEmittedNode = node.kind !== 292;
                     var skipLeadingComments = pos < 0 || (emitFlags & 16384) !== 0;
                     var skipTrailingComments = end < 0 || (emitFlags & 32768) !== 0;
                     if (!skipLeadingComments) {
@@ -45551,7 +47674,7 @@ var ts;
                     }
                     if (!skipTrailingComments) {
                         containerEnd = end;
-                        if (node.kind === 220) {
+                        if (node.kind === 224) {
                             declarationListContainerEnd = end;
                         }
                     }
@@ -45751,12 +47874,6 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    var TempFlags;
-    (function (TempFlags) {
-        TempFlags[TempFlags["Auto"] = 0] = "Auto";
-        TempFlags[TempFlags["CountMask"] = 268435455] = "CountMask";
-        TempFlags[TempFlags["_i"] = 268435456] = "_i";
-    })(TempFlags || (TempFlags = {}));
     var id = function (s) { return s; };
     var nullTransformers = [function (_) { return id; }];
     function emitFiles(resolver, host, targetSourceFile, emitOnlyDtsFiles) {
@@ -45764,6 +47881,7 @@ var ts;
         var brackets = createBracketsMap();
         var extendsHelper = "\nvar __extends = (this && this.__extends) || function (d, b) {\n    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];\n    function __() { this.constructor = d; }\n    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());\n};";
         var assignHelper = "\nvar __assign = (this && this.__assign) || Object.assign || function(t) {\n    for (var s, i = 1, n = arguments.length; i < n; i++) {\n        s = arguments[i];\n        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))\n            t[p] = s[p];\n    }\n    return t;\n};";
+        var restHelper = "\nvar __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))\n        t[p] = s[p];\n    return t;\n};";
         var decorateHelper = "\nvar __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {\n    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;\n    if (typeof Reflect === \"object\" && typeof Reflect.decorate === \"function\") r = Reflect.decorate(decorators, target, key, desc);\n    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;\n    return c > 3 && r && Object.defineProperty(target, key, r), r;\n};";
         var metadataHelper = "\nvar __metadata = (this && this.__metadata) || function (k, v) {\n    if (typeof Reflect === \"object\" && typeof Reflect.metadata === \"function\") return Reflect.metadata(k, v);\n};";
         var paramHelper = "\nvar __param = (this && this.__param) || function (paramIndex, decorator) {\n    return function (target, key) { decorator(target, key, paramIndex); }\n};";
@@ -45796,6 +47914,7 @@ var ts;
         var currentFileIdentifiers;
         var extendsEmitted;
         var assignEmitted;
+        var restEmitted;
         var decorateEmitted;
         var paramEmitted;
         var awaiterEmitted;
@@ -45929,7 +48048,7 @@ var ts;
         function pipelineEmitInSourceFileContext(node) {
             var kind = node.kind;
             switch (kind) {
-                case 256:
+                case 261:
                     return emitSourceFile(node);
             }
         }
@@ -45967,7 +48086,6 @@ var ts;
                 case 123:
                 case 124:
                 case 125:
-                case 126:
                 case 127:
                 case 128:
                 case 129:
@@ -45981,182 +48099,191 @@ var ts;
                 case 137:
                 case 138:
                 case 139:
+                case 140:
                     writeTokenText(kind);
                     return;
-                case 140:
-                    return emitQualifiedName(node);
                 case 141:
-                    return emitComputedPropertyName(node);
+                    return emitQualifiedName(node);
                 case 142:
-                    return emitTypeParameter(node);
+                    return emitComputedPropertyName(node);
                 case 143:
-                    return emitParameter(node);
+                    return emitTypeParameter(node);
                 case 144:
-                    return emitDecorator(node);
+                    return emitParameter(node);
                 case 145:
-                    return emitPropertySignature(node);
+                    return emitDecorator(node);
                 case 146:
-                    return emitPropertyDeclaration(node);
+                    return emitPropertySignature(node);
                 case 147:
-                    return emitMethodSignature(node);
+                    return emitPropertyDeclaration(node);
                 case 148:
-                    return emitMethodDeclaration(node);
+                    return emitMethodSignature(node);
                 case 149:
-                    return emitConstructor(node);
+                    return emitMethodDeclaration(node);
                 case 150:
+                    return emitConstructor(node);
                 case 151:
-                    return emitAccessorDeclaration(node);
                 case 152:
-                    return emitCallSignature(node);
+                    return emitAccessorDeclaration(node);
                 case 153:
-                    return emitConstructSignature(node);
+                    return emitCallSignature(node);
                 case 154:
-                    return emitIndexSignature(node);
+                    return emitConstructSignature(node);
                 case 155:
-                    return emitTypePredicate(node);
+                    return emitIndexSignature(node);
                 case 156:
-                    return emitTypeReference(node);
+                    return emitTypePredicate(node);
                 case 157:
-                    return emitFunctionType(node);
+                    return emitTypeReference(node);
                 case 158:
-                    return emitConstructorType(node);
+                    return emitFunctionType(node);
                 case 159:
-                    return emitTypeQuery(node);
+                    return emitConstructorType(node);
                 case 160:
-                    return emitTypeLiteral(node);
+                    return emitTypeQuery(node);
                 case 161:
-                    return emitArrayType(node);
+                    return emitTypeLiteral(node);
                 case 162:
-                    return emitTupleType(node);
+                    return emitArrayType(node);
                 case 163:
-                    return emitUnionType(node);
+                    return emitTupleType(node);
                 case 164:
-                    return emitIntersectionType(node);
+                    return emitUnionType(node);
                 case 165:
-                    return emitParenthesizedType(node);
-                case 195:
-                    return emitExpressionWithTypeArguments(node);
+                    return emitIntersectionType(node);
                 case 166:
-                    return emitThisType();
-                case 167:
-                    return emitLiteralType(node);
-                case 168:
-                    return emitObjectBindingPattern(node);
-                case 169:
-                    return emitArrayBindingPattern(node);
-                case 170:
-                    return emitBindingElement(node);
-                case 198:
-                    return emitTemplateSpan(node);
+                    return emitParenthesizedType(node);
                 case 199:
-                    return emitSemicolonClassElement();
-                case 200:
-                    return emitBlock(node);
-                case 201:
-                    return emitVariableStatement(node);
+                    return emitExpressionWithTypeArguments(node);
+                case 167:
+                    return emitThisType();
+                case 168:
+                    return emitTypeOperator(node);
+                case 169:
+                    return emitIndexedAccessType(node);
+                case 170:
+                    return emitMappedType(node);
+                case 171:
+                    return emitLiteralType(node);
+                case 172:
+                    return emitObjectBindingPattern(node);
+                case 173:
+                    return emitArrayBindingPattern(node);
+                case 174:
+                    return emitBindingElement(node);
                 case 202:
-                    return emitEmptyStatement();
+                    return emitTemplateSpan(node);
                 case 203:
-                    return emitExpressionStatement(node);
+                    return emitSemicolonClassElement();
                 case 204:
-                    return emitIfStatement(node);
+                    return emitBlock(node);
                 case 205:
-                    return emitDoStatement(node);
+                    return emitVariableStatement(node);
                 case 206:
-                    return emitWhileStatement(node);
+                    return emitEmptyStatement();
                 case 207:
-                    return emitForStatement(node);
+                    return emitExpressionStatement(node);
                 case 208:
-                    return emitForInStatement(node);
+                    return emitIfStatement(node);
                 case 209:
-                    return emitForOfStatement(node);
+                    return emitDoStatement(node);
                 case 210:
-                    return emitContinueStatement(node);
+                    return emitWhileStatement(node);
                 case 211:
-                    return emitBreakStatement(node);
+                    return emitForStatement(node);
                 case 212:
-                    return emitReturnStatement(node);
+                    return emitForInStatement(node);
                 case 213:
-                    return emitWithStatement(node);
+                    return emitForOfStatement(node);
                 case 214:
-                    return emitSwitchStatement(node);
+                    return emitContinueStatement(node);
                 case 215:
-                    return emitLabeledStatement(node);
+                    return emitBreakStatement(node);
                 case 216:
-                    return emitThrowStatement(node);
+                    return emitReturnStatement(node);
                 case 217:
-                    return emitTryStatement(node);
+                    return emitWithStatement(node);
                 case 218:
-                    return emitDebuggerStatement(node);
+                    return emitSwitchStatement(node);
                 case 219:
-                    return emitVariableDeclaration(node);
+                    return emitLabeledStatement(node);
                 case 220:
-                    return emitVariableDeclarationList(node);
+                    return emitThrowStatement(node);
                 case 221:
-                    return emitFunctionDeclaration(node);
+                    return emitTryStatement(node);
                 case 222:
-                    return emitClassDeclaration(node);
+                    return emitDebuggerStatement(node);
                 case 223:
-                    return emitInterfaceDeclaration(node);
+                    return emitVariableDeclaration(node);
                 case 224:
-                    return emitTypeAliasDeclaration(node);
+                    return emitVariableDeclarationList(node);
                 case 225:
-                    return emitEnumDeclaration(node);
+                    return emitFunctionDeclaration(node);
                 case 226:
-                    return emitModuleDeclaration(node);
+                    return emitClassDeclaration(node);
                 case 227:
-                    return emitModuleBlock(node);
+                    return emitInterfaceDeclaration(node);
                 case 228:
-                    return emitCaseBlock(node);
+                    return emitTypeAliasDeclaration(node);
+                case 229:
+                    return emitEnumDeclaration(node);
                 case 230:
-                    return emitImportEqualsDeclaration(node);
+                    return emitModuleDeclaration(node);
                 case 231:
-                    return emitImportDeclaration(node);
+                    return emitModuleBlock(node);
                 case 232:
-                    return emitImportClause(node);
-                case 233:
-                    return emitNamespaceImport(node);
+                    return emitCaseBlock(node);
                 case 234:
-                    return emitNamedImports(node);
+                    return emitImportEqualsDeclaration(node);
                 case 235:
-                    return emitImportSpecifier(node);
+                    return emitImportDeclaration(node);
                 case 236:
-                    return emitExportAssignment(node);
+                    return emitImportClause(node);
                 case 237:
-                    return emitExportDeclaration(node);
+                    return emitNamespaceImport(node);
                 case 238:
-                    return emitNamedExports(node);
+                    return emitNamedImports(node);
                 case 239:
-                    return emitExportSpecifier(node);
+                    return emitImportSpecifier(node);
                 case 240:
-                    return;
+                    return emitExportAssignment(node);
                 case 241:
+                    return emitExportDeclaration(node);
+                case 242:
+                    return emitNamedExports(node);
+                case 243:
+                    return emitExportSpecifier(node);
+                case 244:
+                    return;
+                case 245:
                     return emitExternalModuleReference(node);
                 case 10:
                     return emitJsxText(node);
-                case 244:
-                    return emitJsxOpeningElement(node);
-                case 245:
-                    return emitJsxClosingElement(node);
-                case 246:
-                    return emitJsxAttribute(node);
-                case 247:
-                    return emitJsxSpreadAttribute(node);
                 case 248:
-                    return emitJsxExpression(node);
+                    return emitJsxOpeningElement(node);
                 case 249:
-                    return emitCaseClause(node);
+                    return emitJsxClosingElement(node);
                 case 250:
-                    return emitDefaultClause(node);
+                    return emitJsxAttribute(node);
                 case 251:
-                    return emitHeritageClause(node);
+                    return emitJsxSpreadAttribute(node);
                 case 252:
-                    return emitCatchClause(node);
+                    return emitJsxExpression(node);
                 case 253:
-                    return emitPropertyAssignment(node);
+                    return emitCaseClause(node);
                 case 254:
-                    return emitShorthandPropertyAssignment(node);
+                    return emitDefaultClause(node);
                 case 255:
+                    return emitHeritageClause(node);
+                case 256:
+                    return emitCatchClause(node);
+                case 257:
+                    return emitPropertyAssignment(node);
+                case 258:
+                    return emitShorthandPropertyAssignment(node);
+                case 259:
+                    return emitSpreadAssignment(node);
+                case 260:
                     return emitEnumMember(node);
             }
             if (ts.isExpression(node)) {
@@ -46181,63 +48308,63 @@ var ts;
                 case 98:
                     writeTokenText(kind);
                     return;
-                case 171:
-                    return emitArrayLiteralExpression(node);
-                case 172:
-                    return emitObjectLiteralExpression(node);
-                case 173:
-                    return emitPropertyAccessExpression(node);
-                case 174:
-                    return emitElementAccessExpression(node);
                 case 175:
-                    return emitCallExpression(node);
+                    return emitArrayLiteralExpression(node);
                 case 176:
-                    return emitNewExpression(node);
+                    return emitObjectLiteralExpression(node);
                 case 177:
-                    return emitTaggedTemplateExpression(node);
+                    return emitPropertyAccessExpression(node);
                 case 178:
-                    return emitTypeAssertionExpression(node);
+                    return emitElementAccessExpression(node);
                 case 179:
-                    return emitParenthesizedExpression(node);
+                    return emitCallExpression(node);
                 case 180:
-                    return emitFunctionExpression(node);
+                    return emitNewExpression(node);
                 case 181:
-                    return emitArrowFunction(node);
+                    return emitTaggedTemplateExpression(node);
                 case 182:
-                    return emitDeleteExpression(node);
+                    return emitTypeAssertionExpression(node);
                 case 183:
-                    return emitTypeOfExpression(node);
+                    return emitParenthesizedExpression(node);
                 case 184:
-                    return emitVoidExpression(node);
+                    return emitFunctionExpression(node);
                 case 185:
-                    return emitAwaitExpression(node);
+                    return emitArrowFunction(node);
                 case 186:
-                    return emitPrefixUnaryExpression(node);
+                    return emitDeleteExpression(node);
                 case 187:
-                    return emitPostfixUnaryExpression(node);
+                    return emitTypeOfExpression(node);
                 case 188:
-                    return emitBinaryExpression(node);
+                    return emitVoidExpression(node);
                 case 189:
-                    return emitConditionalExpression(node);
+                    return emitAwaitExpression(node);
                 case 190:
-                    return emitTemplateExpression(node);
+                    return emitPrefixUnaryExpression(node);
                 case 191:
-                    return emitYieldExpression(node);
+                    return emitPostfixUnaryExpression(node);
                 case 192:
-                    return emitSpreadElementExpression(node);
+                    return emitBinaryExpression(node);
                 case 193:
-                    return emitClassExpression(node);
+                    return emitConditionalExpression(node);
                 case 194:
-                    return;
+                    return emitTemplateExpression(node);
+                case 195:
+                    return emitYieldExpression(node);
                 case 196:
-                    return emitAsExpression(node);
+                    return emitSpreadExpression(node);
                 case 197:
+                    return emitClassExpression(node);
+                case 198:
+                    return;
+                case 200:
+                    return emitAsExpression(node);
+                case 201:
                     return emitNonNullExpression(node);
-                case 242:
+                case 246:
                     return emitJsxElement(node);
-                case 243:
+                case 247:
                     return emitJsxSelfClosingElement(node);
-                case 288:
+                case 293:
                     return emitPartiallyEmittedExpression(node);
             }
         }
@@ -46341,7 +48468,7 @@ var ts;
         function emitAccessorDeclaration(node) {
             emitDecorators(node, node.decorators);
             emitModifiers(node, node.modifiers);
-            write(node.kind === 150 ? "get " : "set ");
+            write(node.kind === 151 ? "get " : "set ");
             emit(node.name);
             emitSignatureAndBody(node, emitSignatureHead);
         }
@@ -46426,6 +48553,39 @@ var ts;
         function emitThisType() {
             write("this");
         }
+        function emitTypeOperator(node) {
+            writeTokenText(node.operator);
+            write(" ");
+            emit(node.type);
+        }
+        function emitIndexedAccessType(node) {
+            emit(node.objectType);
+            write("[");
+            emit(node.indexType);
+            write("]");
+        }
+        function emitMappedType(node) {
+            write("{");
+            writeLine();
+            increaseIndent();
+            if (node.readonlyToken) {
+                write("readonly ");
+            }
+            write("[");
+            emit(node.typeParameter.name);
+            write(" in ");
+            emit(node.typeParameter.constraint);
+            write("]");
+            if (node.questionToken) {
+                write("?");
+            }
+            write(": ");
+            emit(node.type);
+            write(";");
+            writeLine();
+            decreaseIndent();
+            write("}");
+        }
         function emitLiteralType(node) {
             emitExpression(node.literal);
         }
@@ -46589,7 +48749,7 @@ var ts;
         }
         function shouldEmitWhitespaceBeforeOperand(node) {
             var operand = node.operand;
-            return operand.kind === 186
+            return operand.kind === 190
                 && ((node.operator === 36 && (operand.operator === 36 || operand.operator === 42))
                     || (node.operator === 37 && (operand.operator === 37 || operand.operator === 43)));
         }
@@ -46633,7 +48793,7 @@ var ts;
             write(node.asteriskToken ? "yield*" : "yield");
             emitExpressionWithPrefix(" ", node.expression);
         }
-        function emitSpreadElementExpression(node) {
+        function emitSpreadExpression(node) {
             write("...");
             emitExpression(node.expression);
         }
@@ -46701,7 +48861,7 @@ var ts;
             if (node.elseStatement) {
                 writeLine();
                 writeToken(81, node.thenStatement.end, node);
-                if (node.elseStatement.kind === 204) {
+                if (node.elseStatement.kind === 208) {
                     write(" ");
                     emit(node.elseStatement);
                 }
@@ -46763,7 +48923,7 @@ var ts;
         }
         function emitForBinding(node) {
             if (node !== undefined) {
-                if (node.kind === 220) {
+                if (node.kind === 224) {
                     emit(node);
                 }
                 else {
@@ -46992,7 +49152,7 @@ var ts;
             write(node.flags & 16 ? "namespace " : "module ");
             emit(node.name);
             var body = node.body;
-            while (body.kind === 226) {
+            while (body.kind === 230) {
                 write(".");
                 emit(body.name);
                 body = body.body;
@@ -47211,6 +49371,12 @@ var ts;
                 emitExpression(node.objectAssignmentInitializer);
             }
         }
+        function emitSpreadAssignment(node) {
+            if (node.expression) {
+                write("...");
+                emitExpression(node.expression);
+            }
+        }
         function emitEnumMember(node) {
             emit(node.name);
             emitExpressionWithPrefix(" = ", node.initializer);
@@ -47280,10 +49446,17 @@ var ts;
                 extendsEmitted = true;
                 helpersEmitted = true;
             }
-            if (compilerOptions.jsx !== 1 && !assignEmitted && (node.flags & 16384)) {
+            if ((languageVersion < 5 || currentSourceFile.scriptKind === 2 || currentSourceFile.scriptKind === 4) &&
+                compilerOptions.jsx !== 1 &&
+                !assignEmitted &&
+                node.flags & 16384) {
                 writeLines(assignHelper);
                 assignEmitted = true;
             }
+            if (languageVersion < 5 && !restEmitted && node.flags & 32768) {
+                writeLines(restHelper);
+                restEmitted = true;
+            }
             if (!decorateEmitted && node.flags & 2048) {
                 writeLines(decorateHelper);
                 if (compilerOptions.emitDecoratorMetadata) {
@@ -47606,7 +49779,7 @@ var ts;
                 && !ts.rangeEndIsOnSameLineAsRangeStart(node1, node2, currentSourceFile);
         }
         function skipSynthesizedParentheses(node) {
-            while (node.kind === 179 && ts.nodeIsSynthesized(node)) {
+            while (node.kind === 183 && ts.nodeIsSynthesized(node)) {
                 node = node.expression;
             }
             return node;
@@ -47663,21 +49836,21 @@ var ts;
         }
         function makeTempVariableName(flags) {
             if (flags && !(tempFlags & flags)) {
-                var name_41 = flags === 268435456 ? "_i" : "_n";
-                if (isUniqueName(name_41)) {
+                var name_40 = flags === 268435456 ? "_i" : "_n";
+                if (isUniqueName(name_40)) {
                     tempFlags |= flags;
-                    return name_41;
+                    return name_40;
                 }
             }
             while (true) {
                 var count = tempFlags & 268435455;
                 tempFlags++;
                 if (count !== 8 && count !== 13) {
-                    var name_42 = count < 26
+                    var name_41 = count < 26
                         ? "_" + String.fromCharCode(97 + count)
                         : "_" + (count - 26);
-                    if (isUniqueName(name_42)) {
-                        return name_42;
+                    if (isUniqueName(name_41)) {
+                        return name_41;
                     }
                 }
             }
@@ -47715,17 +49888,17 @@ var ts;
             switch (node.kind) {
                 case 70:
                     return makeUniqueName(getTextOfNode(node));
-                case 226:
-                case 225:
+                case 230:
+                case 229:
                     return generateNameForModuleOrEnum(node);
-                case 231:
-                case 237:
+                case 235:
+                case 241:
                     return generateNameForImportOrExportDeclaration(node);
-                case 221:
-                case 222:
-                case 236:
+                case 225:
+                case 226:
+                case 240:
                     return generateNameForExportDefault();
-                case 193:
+                case 197:
                     return generateNameForClassExpression();
                 default:
                     return makeTempVariableName(0);
@@ -47795,72 +49968,10 @@ var ts;
         }
     }
     ts.emitFiles = emitFiles;
-    var ListFormat;
-    (function (ListFormat) {
-        ListFormat[ListFormat["None"] = 0] = "None";
-        ListFormat[ListFormat["SingleLine"] = 0] = "SingleLine";
-        ListFormat[ListFormat["MultiLine"] = 1] = "MultiLine";
-        ListFormat[ListFormat["PreserveLines"] = 2] = "PreserveLines";
-        ListFormat[ListFormat["LinesMask"] = 3] = "LinesMask";
-        ListFormat[ListFormat["NotDelimited"] = 0] = "NotDelimited";
-        ListFormat[ListFormat["BarDelimited"] = 4] = "BarDelimited";
-        ListFormat[ListFormat["AmpersandDelimited"] = 8] = "AmpersandDelimited";
-        ListFormat[ListFormat["CommaDelimited"] = 16] = "CommaDelimited";
-        ListFormat[ListFormat["DelimitersMask"] = 28] = "DelimitersMask";
-        ListFormat[ListFormat["AllowTrailingComma"] = 32] = "AllowTrailingComma";
-        ListFormat[ListFormat["Indented"] = 64] = "Indented";
-        ListFormat[ListFormat["SpaceBetweenBraces"] = 128] = "SpaceBetweenBraces";
-        ListFormat[ListFormat["SpaceBetweenSiblings"] = 256] = "SpaceBetweenSiblings";
-        ListFormat[ListFormat["Braces"] = 512] = "Braces";
-        ListFormat[ListFormat["Parenthesis"] = 1024] = "Parenthesis";
-        ListFormat[ListFormat["AngleBrackets"] = 2048] = "AngleBrackets";
-        ListFormat[ListFormat["SquareBrackets"] = 4096] = "SquareBrackets";
-        ListFormat[ListFormat["BracketsMask"] = 7680] = "BracketsMask";
-        ListFormat[ListFormat["OptionalIfUndefined"] = 8192] = "OptionalIfUndefined";
-        ListFormat[ListFormat["OptionalIfEmpty"] = 16384] = "OptionalIfEmpty";
-        ListFormat[ListFormat["Optional"] = 24576] = "Optional";
-        ListFormat[ListFormat["PreferNewLine"] = 32768] = "PreferNewLine";
-        ListFormat[ListFormat["NoTrailingNewLine"] = 65536] = "NoTrailingNewLine";
-        ListFormat[ListFormat["NoInterveningComments"] = 131072] = "NoInterveningComments";
-        ListFormat[ListFormat["Modifiers"] = 256] = "Modifiers";
-        ListFormat[ListFormat["HeritageClauses"] = 256] = "HeritageClauses";
-        ListFormat[ListFormat["TypeLiteralMembers"] = 65] = "TypeLiteralMembers";
-        ListFormat[ListFormat["TupleTypeElements"] = 336] = "TupleTypeElements";
-        ListFormat[ListFormat["UnionTypeConstituents"] = 260] = "UnionTypeConstituents";
-        ListFormat[ListFormat["IntersectionTypeConstituents"] = 264] = "IntersectionTypeConstituents";
-        ListFormat[ListFormat["ObjectBindingPatternElements"] = 432] = "ObjectBindingPatternElements";
-        ListFormat[ListFormat["ArrayBindingPatternElements"] = 304] = "ArrayBindingPatternElements";
-        ListFormat[ListFormat["ObjectLiteralExpressionProperties"] = 978] = "ObjectLiteralExpressionProperties";
-        ListFormat[ListFormat["ArrayLiteralExpressionElements"] = 4466] = "ArrayLiteralExpressionElements";
-        ListFormat[ListFormat["CallExpressionArguments"] = 1296] = "CallExpressionArguments";
-        ListFormat[ListFormat["NewExpressionArguments"] = 9488] = "NewExpressionArguments";
-        ListFormat[ListFormat["TemplateExpressionSpans"] = 131072] = "TemplateExpressionSpans";
-        ListFormat[ListFormat["SingleLineBlockStatements"] = 384] = "SingleLineBlockStatements";
-        ListFormat[ListFormat["MultiLineBlockStatements"] = 65] = "MultiLineBlockStatements";
-        ListFormat[ListFormat["VariableDeclarationList"] = 272] = "VariableDeclarationList";
-        ListFormat[ListFormat["SingleLineFunctionBodyStatements"] = 384] = "SingleLineFunctionBodyStatements";
-        ListFormat[ListFormat["MultiLineFunctionBodyStatements"] = 1] = "MultiLineFunctionBodyStatements";
-        ListFormat[ListFormat["ClassHeritageClauses"] = 256] = "ClassHeritageClauses";
-        ListFormat[ListFormat["ClassMembers"] = 65] = "ClassMembers";
-        ListFormat[ListFormat["InterfaceMembers"] = 65] = "InterfaceMembers";
-        ListFormat[ListFormat["EnumMembers"] = 81] = "EnumMembers";
-        ListFormat[ListFormat["CaseBlockClauses"] = 65] = "CaseBlockClauses";
-        ListFormat[ListFormat["NamedImportsOrExportsElements"] = 432] = "NamedImportsOrExportsElements";
-        ListFormat[ListFormat["JsxElementChildren"] = 131072] = "JsxElementChildren";
-        ListFormat[ListFormat["JsxElementAttributes"] = 131328] = "JsxElementAttributes";
-        ListFormat[ListFormat["CaseOrDefaultClauseStatements"] = 81985] = "CaseOrDefaultClauseStatements";
-        ListFormat[ListFormat["HeritageClauseTypes"] = 272] = "HeritageClauseTypes";
-        ListFormat[ListFormat["SourceFileStatements"] = 65537] = "SourceFileStatements";
-        ListFormat[ListFormat["Decorators"] = 24577] = "Decorators";
-        ListFormat[ListFormat["TypeArguments"] = 26960] = "TypeArguments";
-        ListFormat[ListFormat["TypeParameters"] = 26960] = "TypeParameters";
-        ListFormat[ListFormat["Parameters"] = 1360] = "Parameters";
-        ListFormat[ListFormat["IndexSignatureParameters"] = 4432] = "IndexSignatureParameters";
-    })(ListFormat || (ListFormat = {}));
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    ts.version = "2.1.0";
+    ts.version = "2.2.0";
     var emptyArray = [];
     function findConfigFile(searchPath, fileExists, configName) {
         if (configName === void 0) { configName = "tsconfig.json"; }
@@ -48075,11 +50186,11 @@ var ts;
         }
         var resolutions = [];
         var cache = ts.createMap();
-        for (var _i = 0, names_2 = names; _i < names_2.length; _i++) {
-            var name_43 = names_2[_i];
-            var result = name_43 in cache
-                ? cache[name_43]
-                : cache[name_43] = loader(name_43, containingFile);
+        for (var _i = 0, names_1 = names; _i < names_1.length; _i++) {
+            var name_42 = names_1[_i];
+            var result = name_42 in cache
+                ? cache[name_42]
+                : cache[name_42] = loader(name_42, containingFile);
             resolutions.push(result);
         }
         return resolutions;
@@ -48093,7 +50204,7 @@ var ts;
         var classifiableNames;
         var resolvedTypeReferenceDirectives = ts.createMap();
         var fileProcessingDiagnostics = ts.createDiagnosticCollection();
-        var maxNodeModulesJsDepth = typeof options.maxNodeModuleJsDepth === "number" ? options.maxNodeModuleJsDepth : 0;
+        var maxNodeModuleJsDepth = typeof options.maxNodeModuleJsDepth === "number" ? options.maxNodeModuleJsDepth : 0;
         var currentNodeModulesDepth = 0;
         var modulesWithElidedImports = ts.createMap();
         var sourceFilesFoundSearchingNodeModules = ts.createMap();
@@ -48106,7 +50217,14 @@ var ts;
         var hasEmitBlockingDiagnostics = ts.createFileMap(getCanonicalFileName);
         var resolveModuleNamesWorker;
         if (host.resolveModuleNames) {
-            resolveModuleNamesWorker = function (moduleNames, containingFile) { return host.resolveModuleNames(moduleNames, containingFile); };
+            resolveModuleNamesWorker = function (moduleNames, containingFile) { return host.resolveModuleNames(moduleNames, containingFile).map(function (resolved) {
+                if (!resolved || resolved.extension !== undefined) {
+                    return resolved;
+                }
+                var withExtension = ts.clone(resolved);
+                withExtension.extension = ts.extensionFromPath(resolved.resolvedFileName);
+                return withExtension;
+            }); };
         }
         else {
             var loader_1 = function (moduleName, containingFile) { return ts.resolveModuleName(moduleName, containingFile, options, host).resolvedModule; };
@@ -48168,6 +50286,7 @@ var ts;
             getTypeCount: function () { return getDiagnosticsProducingTypeChecker().getTypeCount(); },
             getFileProcessingDiagnostics: function () { return fileProcessingDiagnostics; },
             getResolvedTypeReferenceDirectives: function () { return resolvedTypeReferenceDirectives; },
+            isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
             dropDiagnosticsProducingTypeChecker: dropDiagnosticsProducingTypeChecker
         };
         verifyCompilerOptions();
@@ -48175,12 +50294,13 @@ var ts;
         ts.performance.measure("Program", "beforeProgram", "afterProgram");
         return program;
         function getCommonSourceDirectory() {
-            if (typeof commonSourceDirectory === "undefined") {
-                if (options.rootDir && checkSourceFilesBelongToPath(files, options.rootDir)) {
+            if (commonSourceDirectory === undefined) {
+                var emittedFiles = ts.filterSourceFilesInDirectory(files, isSourceFileFromExternalLibrary);
+                if (options.rootDir && checkSourceFilesBelongToPath(emittedFiles, options.rootDir)) {
                     commonSourceDirectory = ts.getNormalizedAbsolutePath(options.rootDir, currentDirectory);
                 }
                 else {
-                    commonSourceDirectory = computeCommonSourceDirectory(files);
+                    commonSourceDirectory = computeCommonSourceDirectory(emittedFiles);
                 }
                 if (commonSourceDirectory && commonSourceDirectory[commonSourceDirectory.length - 1] !== ts.directorySeparator) {
                     commonSourceDirectory += ts.directorySeparator;
@@ -48199,26 +50319,85 @@ var ts;
             }
             return classifiableNames;
         }
+        function resolveModuleNamesReusingOldState(moduleNames, containingFile, file, oldProgramState) {
+            if (!oldProgramState && !file.ambientModuleNames.length) {
+                return resolveModuleNamesWorker(moduleNames, containingFile);
+            }
+            var unknownModuleNames;
+            var result;
+            var predictedToResolveToAmbientModuleMarker = {};
+            for (var i = 0; i < moduleNames.length; i++) {
+                var moduleName = moduleNames[i];
+                var isKnownToResolveToAmbientModule = false;
+                if (ts.contains(file.ambientModuleNames, moduleName)) {
+                    isKnownToResolveToAmbientModule = true;
+                    if (ts.isTraceEnabled(options, host)) {
+                        ts.trace(host, ts.Diagnostics.Module_0_was_resolved_as_locally_declared_ambient_module_in_file_1, moduleName, containingFile);
+                    }
+                }
+                else {
+                    isKnownToResolveToAmbientModule = checkModuleNameResolvedToAmbientModuleInNonModifiedFile(moduleName, oldProgramState);
+                }
+                if (isKnownToResolveToAmbientModule) {
+                    if (!unknownModuleNames) {
+                        result = new Array(moduleNames.length);
+                        unknownModuleNames = moduleNames.slice(0, i);
+                    }
+                    result[i] = predictedToResolveToAmbientModuleMarker;
+                }
+                else if (unknownModuleNames) {
+                    unknownModuleNames.push(moduleName);
+                }
+            }
+            if (!unknownModuleNames) {
+                return resolveModuleNamesWorker(moduleNames, containingFile);
+            }
+            var resolutions = unknownModuleNames.length
+                ? resolveModuleNamesWorker(unknownModuleNames, containingFile)
+                : emptyArray;
+            var j = 0;
+            for (var i = 0; i < result.length; i++) {
+                if (result[i] == predictedToResolveToAmbientModuleMarker) {
+                    result[i] = undefined;
+                }
+                else {
+                    result[i] = resolutions[j];
+                    j++;
+                }
+            }
+            ts.Debug.assert(j === resolutions.length);
+            return result;
+            function checkModuleNameResolvedToAmbientModuleInNonModifiedFile(moduleName, oldProgramState) {
+                if (!oldProgramState) {
+                    return false;
+                }
+                var resolutionToFile = ts.getResolvedModule(oldProgramState.file, moduleName);
+                if (resolutionToFile) {
+                    return false;
+                }
+                var ambientModule = oldProgram.getTypeChecker().tryFindAmbientModuleWithoutAugmentations(moduleName);
+                if (!(ambientModule && ambientModule.declarations)) {
+                    return false;
+                }
+                var firstUnmodifiedFile = ts.forEach(ambientModule.declarations, function (d) {
+                    var f = ts.getSourceFileOfNode(d);
+                    return !ts.contains(oldProgramState.modifiedFilePaths, f.path) && f;
+                });
+                if (!firstUnmodifiedFile) {
+                    return false;
+                }
+                if (ts.isTraceEnabled(options, host)) {
+                    ts.trace(host, ts.Diagnostics.Module_0_was_resolved_as_ambient_module_declared_in_1_since_this_file_was_not_modified, moduleName, firstUnmodifiedFile.fileName);
+                }
+                return true;
+            }
+        }
         function tryReuseStructureFromOldProgram() {
             if (!oldProgram) {
                 return false;
             }
             var oldOptions = oldProgram.getCompilerOptions();
-            if ((oldOptions.module !== options.module) ||
-                (oldOptions.moduleResolution !== options.moduleResolution) ||
-                (oldOptions.noResolve !== options.noResolve) ||
-                (oldOptions.target !== options.target) ||
-                (oldOptions.noLib !== options.noLib) ||
-                (oldOptions.jsx !== options.jsx) ||
-                (oldOptions.allowJs !== options.allowJs) ||
-                (oldOptions.rootDir !== options.rootDir) ||
-                (oldOptions.configFilePath !== options.configFilePath) ||
-                (oldOptions.baseUrl !== options.baseUrl) ||
-                (oldOptions.maxNodeModuleJsDepth !== options.maxNodeModuleJsDepth) ||
-                !ts.arrayIsEqualTo(oldOptions.lib, options.lib) ||
-                !ts.arrayIsEqualTo(oldOptions.typeRoots, oldOptions.typeRoots) ||
-                !ts.arrayIsEqualTo(oldOptions.rootDirs, options.rootDirs) ||
-                !ts.equalOwnProperties(oldOptions.paths, options.paths)) {
+            if (ts.changesAffectModuleResolution(oldOptions, options)) {
                 return false;
             }
             ts.Debug.assert(!oldProgram.structureIsReused);
@@ -48259,40 +50438,44 @@ var ts;
                     if (!ts.arrayIsEqualTo(oldSourceFile.typeReferenceDirectives, newSourceFile.typeReferenceDirectives, fileReferenceIsEqualTo)) {
                         return false;
                     }
-                    var newSourceFilePath = ts.getNormalizedAbsolutePath(newSourceFile.fileName, currentDirectory);
-                    if (resolveModuleNamesWorker) {
-                        var moduleNames = ts.map(ts.concatenate(newSourceFile.imports, newSourceFile.moduleAugmentations), getTextOfLiteral);
-                        var resolutions = resolveModuleNamesWorker(moduleNames, newSourceFilePath);
-                        var resolutionsChanged = ts.hasChangesInResolutions(moduleNames, resolutions, oldSourceFile.resolvedModules, ts.moduleResolutionIsEqualTo);
-                        if (resolutionsChanged) {
-                            return false;
-                        }
-                    }
-                    if (resolveTypeReferenceDirectiveNamesWorker) {
-                        var typesReferenceDirectives = ts.map(newSourceFile.typeReferenceDirectives, function (x) { return x.fileName; });
-                        var resolutions = resolveTypeReferenceDirectiveNamesWorker(typesReferenceDirectives, newSourceFilePath);
-                        var resolutionsChanged = ts.hasChangesInResolutions(typesReferenceDirectives, resolutions, oldSourceFile.resolvedTypeReferenceDirectiveNames, ts.typeDirectiveIsEqualTo);
-                        if (resolutionsChanged) {
-                            return false;
-                        }
-                    }
-                    newSourceFile.resolvedModules = oldSourceFile.resolvedModules;
-                    newSourceFile.resolvedTypeReferenceDirectiveNames = oldSourceFile.resolvedTypeReferenceDirectiveNames;
-                    modifiedSourceFiles.push(newSourceFile);
+                    modifiedSourceFiles.push({ oldFile: oldSourceFile, newFile: newSourceFile });
                 }
                 else {
                     newSourceFile = oldSourceFile;
                 }
                 newSourceFiles.push(newSourceFile);
             }
+            var modifiedFilePaths = modifiedSourceFiles.map(function (f) { return f.newFile.path; });
+            for (var _b = 0, modifiedSourceFiles_1 = modifiedSourceFiles; _b < modifiedSourceFiles_1.length; _b++) {
+                var _c = modifiedSourceFiles_1[_b], oldSourceFile = _c.oldFile, newSourceFile = _c.newFile;
+                var newSourceFilePath = ts.getNormalizedAbsolutePath(newSourceFile.fileName, currentDirectory);
+                if (resolveModuleNamesWorker) {
+                    var moduleNames = ts.map(ts.concatenate(newSourceFile.imports, newSourceFile.moduleAugmentations), getTextOfLiteral);
+                    var resolutions = resolveModuleNamesReusingOldState(moduleNames, newSourceFilePath, newSourceFile, { file: oldSourceFile, program: oldProgram, modifiedFilePaths: modifiedFilePaths });
+                    var resolutionsChanged = ts.hasChangesInResolutions(moduleNames, resolutions, oldSourceFile.resolvedModules, ts.moduleResolutionIsEqualTo);
+                    if (resolutionsChanged) {
+                        return false;
+                    }
+                }
+                if (resolveTypeReferenceDirectiveNamesWorker) {
+                    var typesReferenceDirectives = ts.map(newSourceFile.typeReferenceDirectives, function (x) { return x.fileName; });
+                    var resolutions = resolveTypeReferenceDirectiveNamesWorker(typesReferenceDirectives, newSourceFilePath);
+                    var resolutionsChanged = ts.hasChangesInResolutions(typesReferenceDirectives, resolutions, oldSourceFile.resolvedTypeReferenceDirectiveNames, ts.typeDirectiveIsEqualTo);
+                    if (resolutionsChanged) {
+                        return false;
+                    }
+                }
+                newSourceFile.resolvedModules = oldSourceFile.resolvedModules;
+                newSourceFile.resolvedTypeReferenceDirectiveNames = oldSourceFile.resolvedTypeReferenceDirectiveNames;
+            }
             for (var i = 0, len = newSourceFiles.length; i < len; i++) {
                 filesByName.set(filePaths[i], newSourceFiles[i]);
             }
             files = newSourceFiles;
             fileProcessingDiagnostics = oldProgram.getFileProcessingDiagnostics();
-            for (var _b = 0, modifiedSourceFiles_1 = modifiedSourceFiles; _b < modifiedSourceFiles_1.length; _b++) {
-                var modifiedFile = modifiedSourceFiles_1[_b];
-                fileProcessingDiagnostics.reattachFileDiagnostics(modifiedFile);
+            for (var _d = 0, modifiedSourceFiles_2 = modifiedSourceFiles; _d < modifiedSourceFiles_2.length; _d++) {
+                var modifiedFile = modifiedSourceFiles_2[_d];
+                fileProcessingDiagnostics.reattachFileDiagnostics(modifiedFile.newFile);
             }
             resolvedTypeReferenceDirectives = oldProgram.getResolvedTypeReferenceDirectives();
             oldProgram.structureIsReused = true;
@@ -48308,11 +50491,14 @@ var ts;
                 getSourceFile: program.getSourceFile,
                 getSourceFileByPath: program.getSourceFileByPath,
                 getSourceFiles: program.getSourceFiles,
-                isSourceFileFromExternalLibrary: function (file) { return !!sourceFilesFoundSearchingNodeModules[file.path]; },
+                isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
                 writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }),
                 isEmitBlocked: isEmitBlocked,
             };
         }
+        function isSourceFileFromExternalLibrary(file) {
+            return sourceFilesFoundSearchingNodeModules[file.path];
+        }
         function getDiagnosticsProducingTypeChecker() {
             return diagnosticsProducingTypeChecker || (diagnosticsProducingTypeChecker = ts.createTypeChecker(program, true));
         }
@@ -48389,6 +50575,12 @@ var ts;
             }
         }
         function getSyntacticDiagnosticsForFile(sourceFile) {
+            if (ts.isSourceFileJavaScript(sourceFile)) {
+                if (!sourceFile.additionalSyntacticDiagnostics) {
+                    sourceFile.additionalSyntacticDiagnostics = getJavaScriptSyntacticDiagnosticsForFile(sourceFile);
+                }
+                return ts.concatenate(sourceFile.additionalSyntacticDiagnostics, sourceFile.parseDiagnostics);
+            }
             return sourceFile.parseDiagnostics;
         }
         function runWithCancellationToken(func) {
@@ -48408,183 +50600,170 @@ var ts;
                 var typeChecker = getDiagnosticsProducingTypeChecker();
                 ts.Debug.assert(!!sourceFile.bindDiagnostics);
                 var bindDiagnostics = sourceFile.bindDiagnostics;
-                var checkDiagnostics = ts.isSourceFileJavaScript(sourceFile) ?
-                    getJavaScriptSemanticDiagnosticsForFile(sourceFile) :
-                    typeChecker.getDiagnostics(sourceFile, cancellationToken);
+                var checkDiagnostics = ts.isSourceFileJavaScript(sourceFile) ? [] : typeChecker.getDiagnostics(sourceFile, cancellationToken);
                 var fileProcessingDiagnosticsInFile = fileProcessingDiagnostics.getDiagnostics(sourceFile.fileName);
                 var programDiagnosticsInFile = programDiagnostics.getDiagnostics(sourceFile.fileName);
                 return bindDiagnostics.concat(checkDiagnostics, fileProcessingDiagnosticsInFile, programDiagnosticsInFile);
             });
         }
-        function getJavaScriptSemanticDiagnosticsForFile(sourceFile) {
+        function getJavaScriptSyntacticDiagnosticsForFile(sourceFile) {
             return runWithCancellationToken(function () {
                 var diagnostics = [];
+                var parent = sourceFile;
                 walk(sourceFile);
                 return diagnostics;
                 function walk(node) {
-                    if (!node) {
-                        return false;
-                    }
-                    switch (node.kind) {
-                        case 230:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.import_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 236:
-                            if (node.isExportEquals) {
-                                diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.export_can_only_be_used_in_a_ts_file));
-                                return true;
-                            }
-                            break;
-                        case 222:
-                            var classDeclaration = node;
-                            if (checkModifiers(classDeclaration.modifiers) ||
-                                checkTypeParameters(classDeclaration.typeParameters)) {
-                                return true;
-                            }
-                            break;
-                        case 251:
-                            var heritageClause = node;
-                            if (heritageClause.token === 107) {
-                                diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.implements_clauses_can_only_be_used_in_a_ts_file));
-                                return true;
-                            }
-                            break;
-                        case 223:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.interface_declarations_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 226:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.module_declarations_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 224:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.type_aliases_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 148:
+                    switch (parent.kind) {
+                        case 144:
                         case 147:
+                            if (parent.questionToken === node) {
+                                diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, "?"));
+                                return;
+                            }
                         case 149:
+                        case 148:
                         case 150:
                         case 151:
-                        case 180:
-                        case 221:
-                        case 181:
-                        case 221:
-                            var functionDeclaration = node;
-                            if (checkModifiers(functionDeclaration.modifiers) ||
-                                checkTypeParameters(functionDeclaration.typeParameters) ||
-                                checkTypeAnnotation(functionDeclaration.type)) {
-                                return true;
+                        case 152:
+                        case 184:
+                        case 225:
+                        case 185:
+                        case 225:
+                        case 223:
+                            if (parent.type === node) {
+                                diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.types_can_only_be_used_in_a_ts_file));
+                                return;
+                            }
+                    }
+                    switch (node.kind) {
+                        case 234:
+                            diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.import_can_only_be_used_in_a_ts_file));
+                            return;
+                        case 240:
+                            if (node.isExportEquals) {
+                                diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.export_can_only_be_used_in_a_ts_file));
+                                return;
                             }
                             break;
-                        case 201:
-                            var variableStatement = node;
-                            if (checkModifiers(variableStatement.modifiers)) {
-                                return true;
+                        case 255:
+                            var heritageClause = node;
+                            if (heritageClause.token === 107) {
+                                diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.implements_clauses_can_only_be_used_in_a_ts_file));
+                                return;
                             }
                             break;
-                        case 219:
-                            var variableDeclaration = node;
-                            if (checkTypeAnnotation(variableDeclaration.type)) {
-                                return true;
+                        case 227:
+                            diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.interface_declarations_can_only_be_used_in_a_ts_file));
+                            return;
+                        case 230:
+                            diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.module_declarations_can_only_be_used_in_a_ts_file));
+                            return;
+                        case 228:
+                            diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.type_aliases_can_only_be_used_in_a_ts_file));
+                            return;
+                        case 229:
+                            diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.enum_declarations_can_only_be_used_in_a_ts_file));
+                            return;
+                        case 182:
+                            var typeAssertionExpression = node;
+                            diagnostics.push(createDiagnosticForNode(typeAssertionExpression.type, ts.Diagnostics.type_assertion_expressions_can_only_be_used_in_a_ts_file));
+                            return;
+                    }
+                    var prevParent = parent;
+                    parent = node;
+                    ts.forEachChild(node, walk, walkArray);
+                    parent = prevParent;
+                }
+                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));
+                    }
+                    switch (parent.kind) {
+                        case 226:
+                        case 149:
+                        case 148:
+                        case 150:
+                        case 151:
+                        case 152:
+                        case 184:
+                        case 225:
+                        case 185:
+                        case 225:
+                            if (nodes === parent.typeParameters) {
+                                diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.type_parameter_declarations_can_only_be_used_in_a_ts_file));
+                                return;
+                            }
+                        case 205:
+                            if (nodes === parent.modifiers) {
+                                return checkModifiers(nodes, parent.kind === 205);
                             }
                             break;
-                        case 175:
-                        case 176:
-                            var expression = node;
-                            if (expression.typeArguments && expression.typeArguments.length > 0) {
-                                var start = expression.typeArguments.pos;
-                                diagnostics.push(ts.createFileDiagnostic(sourceFile, start, expression.typeArguments.end - start, ts.Diagnostics.type_arguments_can_only_be_used_in_a_ts_file));
-                                return true;
-                            }
-                            break;
-                        case 143:
-                            var parameter = node;
-                            if (parameter.modifiers) {
-                                var start = parameter.modifiers.pos;
-                                diagnostics.push(ts.createFileDiagnostic(sourceFile, start, parameter.modifiers.end - start, ts.Diagnostics.parameter_modifiers_can_only_be_used_in_a_ts_file));
-                                return true;
-                            }
-                            if (parameter.questionToken) {
-                                diagnostics.push(ts.createDiagnosticForNode(parameter.questionToken, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, "?"));
-                                return true;
-                            }
-                            if (parameter.type) {
-                                diagnostics.push(ts.createDiagnosticForNode(parameter.type, ts.Diagnostics.types_can_only_be_used_in_a_ts_file));
-                                return true;
-                            }
-                            break;
-                        case 146:
-                            var propertyDeclaration = node;
-                            if (propertyDeclaration.modifiers) {
-                                for (var _i = 0, _a = propertyDeclaration.modifiers; _i < _a.length; _i++) {
+                        case 147:
+                            if (nodes === parent.modifiers) {
+                                for (var _i = 0, _a = nodes; _i < _a.length; _i++) {
                                     var modifier = _a[_i];
                                     if (modifier.kind !== 114) {
-                                        diagnostics.push(ts.createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
-                                        return true;
+                                        diagnostics.push(createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
                                     }
                                 }
-                            }
-                            if (checkTypeAnnotation(node.type)) {
-                                return true;
+                                return;
                             }
                             break;
-                        case 225:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.enum_declarations_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 178:
-                            var typeAssertionExpression = node;
-                            diagnostics.push(ts.createDiagnosticForNode(typeAssertionExpression.type, ts.Diagnostics.type_assertion_expressions_can_only_be_used_in_a_ts_file));
-                            return true;
                         case 144:
-                            if (!options.experimentalDecorators) {
-                                diagnostics.push(ts.createDiagnosticForNode(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));
+                            if (nodes === parent.modifiers) {
+                                diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.parameter_modifiers_can_only_be_used_in_a_ts_file));
+                                return;
                             }
-                            return true;
-                    }
-                    return ts.forEachChild(node, walk);
-                }
-                function checkTypeParameters(typeParameters) {
-                    if (typeParameters) {
-                        var start = typeParameters.pos;
-                        diagnostics.push(ts.createFileDiagnostic(sourceFile, start, typeParameters.end - start, ts.Diagnostics.type_parameter_declarations_can_only_be_used_in_a_ts_file));
-                        return true;
-                    }
-                    return false;
-                }
-                function checkTypeAnnotation(type) {
-                    if (type) {
-                        diagnostics.push(ts.createDiagnosticForNode(type, ts.Diagnostics.types_can_only_be_used_in_a_ts_file));
-                        return true;
-                    }
-                    return false;
-                }
-                function checkModifiers(modifiers) {
-                    if (modifiers) {
-                        for (var _i = 0, modifiers_1 = modifiers; _i < modifiers_1.length; _i++) {
-                            var modifier = modifiers_1[_i];
-                            switch (modifier.kind) {
-                                case 113:
-                                case 111:
-                                case 112:
-                                case 129:
-                                case 123:
-                                    diagnostics.push(ts.createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
-                                    return true;
-                                case 114:
-                                case 83:
-                                case 75:
-                                case 78:
-                                case 116:
+                            break;
+                        case 179:
+                        case 180:
+                        case 199:
+                            if (nodes === parent.typeArguments) {
+                                diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.type_arguments_can_only_be_used_in_a_ts_file));
+                                return;
                             }
+                            break;
+                    }
+                    for (var _b = 0, nodes_4 = nodes; _b < nodes_4.length; _b++) {
+                        var node = nodes_4[_b];
+                        walk(node);
+                    }
+                }
+                function checkModifiers(modifiers, isConstValid) {
+                    for (var _i = 0, modifiers_1 = modifiers; _i < modifiers_1.length; _i++) {
+                        var modifier = modifiers_1[_i];
+                        switch (modifier.kind) {
+                            case 75:
+                                if (isConstValid) {
+                                    continue;
+                                }
+                            case 113:
+                            case 111:
+                            case 112:
+                            case 130:
+                            case 123:
+                            case 116:
+                                diagnostics.push(createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
+                                break;
+                            case 114:
+                            case 83:
+                            case 78:
                         }
                     }
-                    return false;
+                }
+                function createDiagnosticForNodeArray(nodes, message, arg0, arg1, arg2) {
+                    var start = nodes.pos;
+                    return ts.createFileDiagnostic(sourceFile, start, nodes.end - start, message, arg0, arg1, arg2);
+                }
+                function createDiagnosticForNode(node, message, arg0, arg1, arg2) {
+                    return ts.createDiagnosticForNodeInSourceFile(sourceFile, node, message, arg0, arg1, arg2);
                 }
             });
         }
         function getDeclarationDiagnosticsWorker(sourceFile, cancellationToken) {
             return runWithCancellationToken(function () {
                 var resolver = getDiagnosticsProducingTypeChecker().getEmitResolver(sourceFile, cancellationToken);
-                var writeFile = function () { };
-                return ts.getDeclarationDiagnostics(getEmitHost(writeFile), resolver, sourceFile);
+                return ts.getDeclarationDiagnostics(getEmitHost(ts.noop), resolver, sourceFile);
             });
         }
         function getDeclarationDiagnosticsForFile(sourceFile, cancellationToken) {
@@ -48601,9 +50780,6 @@ var ts;
             ts.addRange(allDiagnostics, getDiagnosticsProducingTypeChecker().getGlobalDiagnostics());
             return ts.sortAndDeduplicateDiagnostics(allDiagnostics);
         }
-        function hasExtension(fileName) {
-            return ts.getBaseFileName(fileName).indexOf(".") >= 0;
-        }
         function processRootFile(fileName, isDefaultLib) {
             processSourceFile(ts.normalizePath(fileName), isDefaultLib);
         }
@@ -48622,14 +50798,18 @@ var ts;
             }
             var isJavaScriptFile = ts.isSourceFileJavaScript(file);
             var isExternalModuleFile = ts.isExternalModule(file);
+            var isDtsFile = ts.isDeclarationFile(file);
             var imports;
             var moduleAugmentations;
+            var ambientModules;
             if (options.importHelpers
                 && (options.isolatedModules || isExternalModuleFile)
                 && !file.isDeclarationFile) {
-                var externalHelpersModuleReference = ts.createNode(9);
+                var externalHelpersModuleReference = ts.createSynthesizedNode(9);
                 externalHelpersModuleReference.text = ts.externalHelpersModuleNameText;
-                externalHelpersModuleReference.parent = file;
+                var importDecl = ts.createSynthesizedNode(235);
+                importDecl.parent = file;
+                externalHelpersModuleReference.parent = importDecl;
                 imports = [externalHelpersModuleReference];
             }
             for (var _i = 0, _a = file.statements; _i < _a.length; _i++) {
@@ -48641,12 +50821,13 @@ var ts;
             }
             file.imports = imports || emptyArray;
             file.moduleAugmentations = moduleAugmentations || emptyArray;
+            file.ambientModuleNames = ambientModules || emptyArray;
             return;
             function collectModuleReferences(node, inAmbientModule) {
                 switch (node.kind) {
-                    case 231:
-                    case 230:
-                    case 237:
+                    case 235:
+                    case 234:
+                    case 241:
                         var moduleNameExpr = ts.getExternalModuleName(node);
                         if (!moduleNameExpr || moduleNameExpr.kind !== 9) {
                             break;
@@ -48658,13 +50839,16 @@ var ts;
                             (imports || (imports = [])).push(moduleNameExpr);
                         }
                         break;
-                    case 226:
+                    case 230:
                         if (ts.isAmbientModule(node) && (inAmbientModule || ts.hasModifier(node, 2) || ts.isDeclarationFile(file))) {
                             var moduleName = node.name;
                             if (isExternalModuleFile || (inAmbientModule && !ts.isExternalModuleNameRelative(moduleName.text))) {
                                 (moduleAugmentations || (moduleAugmentations = [])).push(moduleName);
                             }
                             else if (!inAmbientModule) {
+                                if (isDtsFile) {
+                                    (ambientModules || (ambientModules = [])).push(moduleName.text);
+                                }
                                 var body = node.body;
                                 if (body) {
                                     for (var _i = 0, _a = body.statements; _i < _a.length; _i++) {
@@ -48688,7 +50872,7 @@ var ts;
         function processSourceFile(fileName, isDefaultLib, refFile, refPos, refEnd) {
             var diagnosticArgument;
             var diagnostic;
-            if (hasExtension(fileName)) {
+            if (ts.hasExtension(fileName)) {
                 if (!options.allowNonTsExtensions && !ts.forEach(supportedExtensions, function (extension) { return ts.fileExtensionIs(host.getCanonicalFileName(fileName), extension); })) {
                     diagnostic = ts.Diagnostics.File_0_has_unsupported_extension_The_only_supported_extensions_are_1;
                     diagnosticArgument = [fileName, "'" + supportedExtensions.join("', '") + "'"];
@@ -48749,7 +50933,7 @@ var ts;
                     processImportedModules(file_1);
                 }
                 else if (file_1 && modulesWithElidedImports[file_1.path]) {
-                    if (currentNodeModulesDepth < maxNodeModulesJsDepth) {
+                    if (currentNodeModulesDepth < maxNodeModuleJsDepth) {
                         modulesWithElidedImports[file_1.path] = false;
                         processImportedModules(file_1);
                     }
@@ -48821,9 +51005,11 @@ var ts;
                 }
                 else {
                     if (previousResolution) {
-                        var otherFileText = host.readFile(resolvedTypeReferenceDirective.resolvedFileName);
-                        if (otherFileText !== getSourceFile(previousResolution.resolvedFileName).text) {
-                            fileProcessingDiagnostics.add(createDiagnostic(refFile, refPos, refEnd, ts.Diagnostics.Conflicting_definitions_for_0_found_at_1_and_2_Consider_installing_a_specific_version_of_this_library_to_resolve_the_conflict, typeReferenceDirective, resolvedTypeReferenceDirective.resolvedFileName, previousResolution.resolvedFileName));
+                        if (resolvedTypeReferenceDirective.resolvedFileName !== previousResolution.resolvedFileName) {
+                            var otherFileText = host.readFile(resolvedTypeReferenceDirective.resolvedFileName);
+                            if (otherFileText !== getSourceFile(previousResolution.resolvedFileName).text) {
+                                fileProcessingDiagnostics.add(createDiagnostic(refFile, refPos, refEnd, ts.Diagnostics.Conflicting_definitions_for_0_found_at_1_and_2_Consider_installing_a_specific_version_of_this_library_to_resolve_the_conflict, typeReferenceDirective, resolvedTypeReferenceDirective.resolvedFileName, previousResolution.resolvedFileName));
+                            }
                         }
                         saveResolution = false;
                     }
@@ -48858,23 +51044,31 @@ var ts;
             collectExternalModuleReferences(file);
             if (file.imports.length || file.moduleAugmentations.length) {
                 file.resolvedModules = ts.createMap();
-                var moduleNames = ts.map(ts.concatenate(file.imports, file.moduleAugmentations), getTextOfLiteral);
-                var resolutions = resolveModuleNamesWorker(moduleNames, ts.getNormalizedAbsolutePath(file.fileName, currentDirectory));
+                var nonGlobalAugmentation = ts.filter(file.moduleAugmentations, function (moduleAugmentation) { return moduleAugmentation.kind === 9; });
+                var moduleNames = ts.map(ts.concatenate(file.imports, nonGlobalAugmentation), getTextOfLiteral);
+                var resolutions = resolveModuleNamesReusingOldState(moduleNames, ts.getNormalizedAbsolutePath(file.fileName, currentDirectory), file);
+                ts.Debug.assert(resolutions.length === moduleNames.length);
                 for (var i = 0; i < moduleNames.length; i++) {
                     var resolution = resolutions[i];
                     ts.setResolvedModule(file, moduleNames[i], resolution);
-                    var isFromNodeModulesSearch = resolution && resolution.isExternalLibraryImport;
-                    var isJsFileFromNodeModules = isFromNodeModulesSearch && ts.hasJavaScriptFileExtension(resolution.resolvedFileName);
+                    if (!resolution) {
+                        continue;
+                    }
+                    var isFromNodeModulesSearch = resolution.isExternalLibraryImport;
+                    var isJsFileFromNodeModules = isFromNodeModulesSearch && !ts.extensionIsTypeScript(resolution.extension);
+                    var resolvedFileName = resolution.resolvedFileName;
                     if (isFromNodeModulesSearch) {
                         currentNodeModulesDepth++;
                     }
-                    var elideImport = isJsFileFromNodeModules && currentNodeModulesDepth > maxNodeModulesJsDepth;
-                    var shouldAddFile = resolution && !options.noResolve && i < file.imports.length && !elideImport;
+                    var elideImport = isJsFileFromNodeModules && currentNodeModulesDepth > maxNodeModuleJsDepth;
+                    var shouldAddFile = resolvedFileName && !getResolutionDiagnostic(options, resolution) && !options.noResolve && i < file.imports.length && !elideImport;
                     if (elideImport) {
                         modulesWithElidedImports[file.path] = true;
                     }
                     else if (shouldAddFile) {
-                        findSourceFile(resolution.resolvedFileName, ts.toPath(resolution.resolvedFileName, currentDirectory, getCanonicalFileName), false, file, ts.skipTrivia(file.text, file.imports[i].pos), file.imports[i].end);
+                        var path = ts.toPath(resolvedFileName, currentDirectory, getCanonicalFileName);
+                        var pos = ts.skipTrivia(file.text, file.imports[i].pos);
+                        findSourceFile(resolvedFileName, path, false, file, pos, file.imports[i].end);
                     }
                     if (isFromNodeModulesSearch) {
                         currentNodeModulesDepth--;
@@ -48884,7 +51078,6 @@ var ts;
             else {
                 file.resolvedModules = undefined;
             }
-            return;
         }
         function computeCommonSourceDirectory(sourceFiles) {
             var fileNames = [];
@@ -49038,7 +51231,15 @@ var ts;
                 !options.experimentalDecorators) {
                 programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "emitDecoratorMetadata", "experimentalDecorators"));
             }
-            if (options.reactNamespace && !ts.isIdentifierText(options.reactNamespace, languageVersion)) {
+            if (options.jsxFactory) {
+                if (options.reactNamespace) {
+                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "reactNamespace", "jsxFactory"));
+                }
+                if (!ts.parseIsolatedEntityName(options.jsxFactory, languageVersion)) {
+                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Invalid_value_for_jsxFactory_0_is_not_a_valid_identifier_or_qualified_name, options.jsxFactory));
+                }
+            }
+            else if (options.reactNamespace && !ts.isIdentifierText(options.reactNamespace, languageVersion)) {
                 programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Invalid_value_for_reactNamespace_0_is_not_a_valid_identifier, options.reactNamespace));
             }
             if (!options.noEmit && !options.suppressOutputPathCheck) {
@@ -49053,10 +51254,15 @@ var ts;
                 if (emitFileName) {
                     var emitFilePath = ts.toPath(emitFileName, currentDirectory, getCanonicalFileName);
                     if (filesByName.contains(emitFilePath)) {
-                        createEmitBlockingDiagnostics(emitFileName, ts.Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file);
+                        var chain_1;
+                        if (!options.configFilePath) {
+                            chain_1 = 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_1 = ts.chainDiagnosticMessages(chain_1, ts.Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
+                        blockEmittingOfFile(emitFileName, ts.createCompilerDiagnosticFromMessageChain(chain_1));
                     }
                     if (emitFilesSeen.contains(emitFilePath)) {
-                        createEmitBlockingDiagnostics(emitFileName, ts.Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files);
+                        blockEmittingOfFile(emitFileName, ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files, emitFileName));
                     }
                     else {
                         emitFilesSeen.set(emitFilePath, true);
@@ -49064,1096 +51270,33 @@ var ts;
                 }
             }
         }
-        function createEmitBlockingDiagnostics(emitFileName, message) {
+        function blockEmittingOfFile(emitFileName, diag) {
             hasEmitBlockingDiagnostics.set(ts.toPath(emitFileName, currentDirectory, getCanonicalFileName), true);
-            programDiagnostics.add(ts.createCompilerDiagnostic(message, emitFileName));
+            programDiagnostics.add(diag);
         }
     }
     ts.createProgram = createProgram;
-})(ts || (ts = {}));
-var ts;
-(function (ts) {
-    ts.compileOnSaveCommandLineOption = { name: "compileOnSave", type: "boolean" };
-    ts.optionDeclarations = [
-        {
-            name: "charset",
-            type: "string",
-        },
-        ts.compileOnSaveCommandLineOption,
-        {
-            name: "declaration",
-            shortName: "d",
-            type: "boolean",
-            description: ts.Diagnostics.Generates_corresponding_d_ts_file,
-        },
-        {
-            name: "declarationDir",
-            type: "string",
-            isFilePath: true,
-            paramType: ts.Diagnostics.DIRECTORY,
-        },
-        {
-            name: "diagnostics",
-            type: "boolean",
-        },
-        {
-            name: "extendedDiagnostics",
-            type: "boolean",
-            experimental: true
-        },
-        {
-            name: "emitBOM",
-            type: "boolean"
-        },
-        {
-            name: "help",
-            shortName: "h",
-            type: "boolean",
-            description: ts.Diagnostics.Print_this_message,
-        },
-        {
-            name: "help",
-            shortName: "?",
-            type: "boolean"
-        },
-        {
-            name: "init",
-            type: "boolean",
-            description: ts.Diagnostics.Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file,
-        },
-        {
-            name: "inlineSourceMap",
-            type: "boolean",
-        },
-        {
-            name: "inlineSources",
-            type: "boolean",
-        },
-        {
-            name: "jsx",
-            type: ts.createMap({
-                "preserve": 1,
-                "react": 2
-            }),
-            paramType: ts.Diagnostics.KIND,
-            description: ts.Diagnostics.Specify_JSX_code_generation_Colon_preserve_or_react,
-        },
-        {
-            name: "reactNamespace",
-            type: "string",
-            description: ts.Diagnostics.Specify_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit
-        },
-        {
-            name: "listFiles",
-            type: "boolean",
-        },
-        {
-            name: "locale",
-            type: "string",
-        },
-        {
-            name: "mapRoot",
-            type: "string",
-            isFilePath: true,
-            description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations,
-            paramType: ts.Diagnostics.LOCATION,
-        },
-        {
-            name: "module",
-            shortName: "m",
-            type: ts.createMap({
-                "none": ts.ModuleKind.None,
-                "commonjs": ts.ModuleKind.CommonJS,
-                "amd": ts.ModuleKind.AMD,
-                "system": ts.ModuleKind.System,
-                "umd": ts.ModuleKind.UMD,
-                "es6": ts.ModuleKind.ES2015,
-                "es2015": ts.ModuleKind.ES2015,
-            }),
-            description: ts.Diagnostics.Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015,
-            paramType: ts.Diagnostics.KIND,
-        },
-        {
-            name: "newLine",
-            type: ts.createMap({
-                "crlf": 0,
-                "lf": 1
-            }),
-            description: ts.Diagnostics.Specify_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix,
-            paramType: ts.Diagnostics.NEWLINE,
-        },
-        {
-            name: "noEmit",
-            type: "boolean",
-            description: ts.Diagnostics.Do_not_emit_outputs,
-        },
-        {
-            name: "noEmitHelpers",
-            type: "boolean"
-        },
-        {
-            name: "noEmitOnError",
-            type: "boolean",
-            description: ts.Diagnostics.Do_not_emit_outputs_if_any_errors_were_reported,
-        },
-        {
-            name: "noErrorTruncation",
-            type: "boolean"
-        },
-        {
-            name: "noImplicitAny",
-            type: "boolean",
-            description: ts.Diagnostics.Raise_error_on_expressions_and_declarations_with_an_implied_any_type,
-        },
-        {
-            name: "noImplicitThis",
-            type: "boolean",
-            description: ts.Diagnostics.Raise_error_on_this_expressions_with_an_implied_any_type,
-        },
-        {
-            name: "noUnusedLocals",
-            type: "boolean",
-            description: ts.Diagnostics.Report_errors_on_unused_locals,
-        },
-        {
-            name: "noUnusedParameters",
-            type: "boolean",
-            description: ts.Diagnostics.Report_errors_on_unused_parameters,
-        },
-        {
-            name: "noLib",
-            type: "boolean",
-        },
-        {
-            name: "noResolve",
-            type: "boolean",
-        },
-        {
-            name: "skipDefaultLibCheck",
-            type: "boolean",
-        },
-        {
-            name: "skipLibCheck",
-            type: "boolean",
-            description: ts.Diagnostics.Skip_type_checking_of_declaration_files,
-        },
-        {
-            name: "out",
-            type: "string",
-            isFilePath: false,
-            paramType: ts.Diagnostics.FILE,
-        },
-        {
-            name: "outFile",
-            type: "string",
-            isFilePath: true,
-            description: ts.Diagnostics.Concatenate_and_emit_output_to_single_file,
-            paramType: ts.Diagnostics.FILE,
-        },
-        {
-            name: "outDir",
-            type: "string",
-            isFilePath: true,
-            description: ts.Diagnostics.Redirect_output_structure_to_the_directory,
-            paramType: ts.Diagnostics.DIRECTORY,
-        },
-        {
-            name: "preserveConstEnums",
-            type: "boolean",
-            description: ts.Diagnostics.Do_not_erase_const_enum_declarations_in_generated_code
-        },
-        {
-            name: "pretty",
-            description: ts.Diagnostics.Stylize_errors_and_messages_using_color_and_context_experimental,
-            type: "boolean"
-        },
-        {
-            name: "project",
-            shortName: "p",
-            type: "string",
-            isFilePath: true,
-            description: ts.Diagnostics.Compile_the_project_in_the_given_directory,
-            paramType: ts.Diagnostics.DIRECTORY
-        },
-        {
-            name: "removeComments",
-            type: "boolean",
-            description: ts.Diagnostics.Do_not_emit_comments_to_output,
-        },
-        {
-            name: "rootDir",
-            type: "string",
-            isFilePath: true,
-            paramType: ts.Diagnostics.LOCATION,
-            description: ts.Diagnostics.Specify_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir,
-        },
-        {
-            name: "isolatedModules",
-            type: "boolean",
-        },
-        {
-            name: "sourceMap",
-            type: "boolean",
-            description: ts.Diagnostics.Generates_corresponding_map_file,
-        },
-        {
-            name: "sourceRoot",
-            type: "string",
-            isFilePath: true,
-            description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations,
-            paramType: ts.Diagnostics.LOCATION,
-        },
-        {
-            name: "suppressExcessPropertyErrors",
-            type: "boolean",
-            description: ts.Diagnostics.Suppress_excess_property_checks_for_object_literals,
-            experimental: true
-        },
-        {
-            name: "suppressImplicitAnyIndexErrors",
-            type: "boolean",
-            description: ts.Diagnostics.Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures,
-        },
-        {
-            name: "stripInternal",
-            type: "boolean",
-            description: ts.Diagnostics.Do_not_emit_declarations_for_code_that_has_an_internal_annotation,
-            experimental: true
-        },
-        {
-            name: "target",
-            shortName: "t",
-            type: ts.createMap({
-                "es3": 0,
-                "es5": 1,
-                "es6": 2,
-                "es2015": 2,
-                "es2016": 3,
-                "es2017": 4,
-            }),
-            description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015,
-            paramType: ts.Diagnostics.VERSION,
-        },
-        {
-            name: "version",
-            shortName: "v",
-            type: "boolean",
-            description: ts.Diagnostics.Print_the_compiler_s_version,
-        },
-        {
-            name: "watch",
-            shortName: "w",
-            type: "boolean",
-            description: ts.Diagnostics.Watch_input_files,
-        },
-        {
-            name: "experimentalDecorators",
-            type: "boolean",
-            description: ts.Diagnostics.Enables_experimental_support_for_ES7_decorators
-        },
-        {
-            name: "emitDecoratorMetadata",
-            type: "boolean",
-            experimental: true,
-            description: ts.Diagnostics.Enables_experimental_support_for_emitting_type_metadata_for_decorators
-        },
-        {
-            name: "moduleResolution",
-            type: ts.createMap({
-                "node": ts.ModuleResolutionKind.NodeJs,
-                "classic": ts.ModuleResolutionKind.Classic,
-            }),
-            description: ts.Diagnostics.Specify_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6,
-            paramType: ts.Diagnostics.STRATEGY,
-        },
-        {
-            name: "allowUnusedLabels",
-            type: "boolean",
-            description: ts.Diagnostics.Do_not_report_errors_on_unused_labels
-        },
-        {
-            name: "noImplicitReturns",
-            type: "boolean",
-            description: ts.Diagnostics.Report_error_when_not_all_code_paths_in_function_return_a_value
-        },
-        {
-            name: "noFallthroughCasesInSwitch",
-            type: "boolean",
-            description: ts.Diagnostics.Report_errors_for_fallthrough_cases_in_switch_statement
-        },
-        {
-            name: "allowUnreachableCode",
-            type: "boolean",
-            description: ts.Diagnostics.Do_not_report_errors_on_unreachable_code
-        },
-        {
-            name: "forceConsistentCasingInFileNames",
-            type: "boolean",
-            description: ts.Diagnostics.Disallow_inconsistently_cased_references_to_the_same_file
-        },
-        {
-            name: "baseUrl",
-            type: "string",
-            isFilePath: true,
-            description: ts.Diagnostics.Base_directory_to_resolve_non_absolute_module_names
-        },
-        {
-            name: "paths",
-            type: "object",
-            isTSConfigOnly: true
-        },
-        {
-            name: "rootDirs",
-            type: "list",
-            isTSConfigOnly: true,
-            element: {
-                name: "rootDirs",
-                type: "string",
-                isFilePath: true
-            }
-        },
-        {
-            name: "typeRoots",
-            type: "list",
-            element: {
-                name: "typeRoots",
-                type: "string",
-                isFilePath: true
-            }
-        },
-        {
-            name: "types",
-            type: "list",
-            element: {
-                name: "types",
-                type: "string"
-            },
-            description: ts.Diagnostics.Type_declaration_files_to_be_included_in_compilation
-        },
-        {
-            name: "traceResolution",
-            type: "boolean",
-            description: ts.Diagnostics.Enable_tracing_of_the_name_resolution_process
-        },
-        {
-            name: "allowJs",
-            type: "boolean",
-            description: ts.Diagnostics.Allow_javascript_files_to_be_compiled
-        },
-        {
-            name: "allowSyntheticDefaultImports",
-            type: "boolean",
-            description: ts.Diagnostics.Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typechecking
-        },
-        {
-            name: "noImplicitUseStrict",
-            type: "boolean",
-            description: ts.Diagnostics.Do_not_emit_use_strict_directives_in_module_output
-        },
-        {
-            name: "maxNodeModuleJsDepth",
-            type: "number",
-            description: ts.Diagnostics.The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files
-        },
-        {
-            name: "listEmittedFiles",
-            type: "boolean"
-        },
-        {
-            name: "lib",
-            type: "list",
-            element: {
-                name: "lib",
-                type: ts.createMap({
-                    "es5": "lib.es5.d.ts",
-                    "es6": "lib.es2015.d.ts",
-                    "es2015": "lib.es2015.d.ts",
-                    "es7": "lib.es2016.d.ts",
-                    "es2016": "lib.es2016.d.ts",
-                    "es2017": "lib.es2017.d.ts",
-                    "dom": "lib.dom.d.ts",
-                    "dom.iterable": "lib.dom.iterable.d.ts",
-                    "webworker": "lib.webworker.d.ts",
-                    "scripthost": "lib.scripthost.d.ts",
-                    "es2015.core": "lib.es2015.core.d.ts",
-                    "es2015.collection": "lib.es2015.collection.d.ts",
-                    "es2015.generator": "lib.es2015.generator.d.ts",
-                    "es2015.iterable": "lib.es2015.iterable.d.ts",
-                    "es2015.promise": "lib.es2015.promise.d.ts",
-                    "es2015.proxy": "lib.es2015.proxy.d.ts",
-                    "es2015.reflect": "lib.es2015.reflect.d.ts",
-                    "es2015.symbol": "lib.es2015.symbol.d.ts",
-                    "es2015.symbol.wellknown": "lib.es2015.symbol.wellknown.d.ts",
-                    "es2016.array.include": "lib.es2016.array.include.d.ts",
-                    "es2017.object": "lib.es2017.object.d.ts",
-                    "es2017.sharedmemory": "lib.es2017.sharedmemory.d.ts"
-                }),
-            },
-            description: ts.Diagnostics.Specify_library_files_to_be_included_in_the_compilation_Colon
-        },
-        {
-            name: "disableSizeLimit",
-            type: "boolean"
-        },
-        {
-            name: "strictNullChecks",
-            type: "boolean",
-            description: ts.Diagnostics.Enable_strict_null_checks
-        },
-        {
-            name: "importHelpers",
-            type: "boolean",
-            description: ts.Diagnostics.Import_emit_helpers_from_tslib
-        },
-        {
-            name: "alwaysStrict",
-            type: "boolean",
-            description: ts.Diagnostics.Parse_in_strict_mode_and_emit_use_strict_for_each_source_file
-        }
-    ];
-    ts.typingOptionDeclarations = [
-        {
-            name: "enableAutoDiscovery",
-            type: "boolean",
-        },
-        {
-            name: "include",
-            type: "list",
-            element: {
-                name: "include",
-                type: "string"
-            }
-        },
-        {
-            name: "exclude",
-            type: "list",
-            element: {
-                name: "exclude",
-                type: "string"
-            }
-        }
-    ];
-    ts.defaultInitCompilerOptions = {
-        module: ts.ModuleKind.CommonJS,
-        target: 1,
-        noImplicitAny: false,
-        sourceMap: false,
-    };
-    var optionNameMapCache;
-    function getOptionNameMap() {
-        if (optionNameMapCache) {
-            return optionNameMapCache;
-        }
-        var optionNameMap = ts.createMap();
-        var shortOptionNames = ts.createMap();
-        ts.forEach(ts.optionDeclarations, function (option) {
-            optionNameMap[option.name.toLowerCase()] = option;
-            if (option.shortName) {
-                shortOptionNames[option.shortName] = option.name;
-            }
-        });
-        optionNameMapCache = { optionNameMap: optionNameMap, shortOptionNames: shortOptionNames };
-        return optionNameMapCache;
-    }
-    ts.getOptionNameMap = getOptionNameMap;
-    function createCompilerDiagnosticForInvalidCustomType(opt) {
-        var namesOfType = Object.keys(opt.type).map(function (key) { return "'" + key + "'"; }).join(", ");
-        return ts.createCompilerDiagnostic(ts.Diagnostics.Argument_for_0_option_must_be_Colon_1, "--" + opt.name, namesOfType);
-    }
-    ts.createCompilerDiagnosticForInvalidCustomType = createCompilerDiagnosticForInvalidCustomType;
-    function parseCustomTypeOption(opt, value, errors) {
-        var key = trimString((value || "")).toLowerCase();
-        var map = opt.type;
-        if (key in map) {
-            return map[key];
-        }
-        else {
-            errors.push(createCompilerDiagnosticForInvalidCustomType(opt));
-        }
-    }
-    ts.parseCustomTypeOption = parseCustomTypeOption;
-    function parseListTypeOption(opt, value, errors) {
-        if (value === void 0) { value = ""; }
-        value = trimString(value);
-        if (ts.startsWith(value, "-")) {
-            return undefined;
-        }
-        if (value === "") {
-            return [];
-        }
-        var values = value.split(",");
-        switch (opt.element.type) {
-            case "number":
-                return ts.map(values, parseInt);
-            case "string":
-                return ts.map(values, function (v) { return v || ""; });
-            default:
-                return ts.filter(ts.map(values, function (v) { return parseCustomTypeOption(opt.element, v, errors); }), function (v) { return !!v; });
-        }
-    }
-    ts.parseListTypeOption = parseListTypeOption;
-    function parseCommandLine(commandLine, readFile) {
-        var options = {};
-        var fileNames = [];
-        var errors = [];
-        var _a = getOptionNameMap(), optionNameMap = _a.optionNameMap, shortOptionNames = _a.shortOptionNames;
-        parseStrings(commandLine);
-        return {
-            options: options,
-            fileNames: fileNames,
-            errors: errors
-        };
-        function parseStrings(args) {
-            var i = 0;
-            while (i < args.length) {
-                var s = args[i];
-                i++;
-                if (s.charCodeAt(0) === 64) {
-                    parseResponseFile(s.slice(1));
-                }
-                else if (s.charCodeAt(0) === 45) {
-                    s = s.slice(s.charCodeAt(1) === 45 ? 2 : 1).toLowerCase();
-                    if (s in shortOptionNames) {
-                        s = shortOptionNames[s];
-                    }
-                    if (s in optionNameMap) {
-                        var opt = optionNameMap[s];
-                        if (opt.isTSConfigOnly) {
-                            errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_can_only_be_specified_in_tsconfig_json_file, opt.name));
-                        }
-                        else {
-                            if (!args[i] && opt.type !== "boolean") {
-                                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_expects_an_argument, opt.name));
-                            }
-                            switch (opt.type) {
-                                case "number":
-                                    options[opt.name] = parseInt(args[i]);
-                                    i++;
-                                    break;
-                                case "boolean":
-                                    options[opt.name] = true;
-                                    break;
-                                case "string":
-                                    options[opt.name] = args[i] || "";
-                                    i++;
-                                    break;
-                                case "list":
-                                    var result = parseListTypeOption(opt, args[i], errors);
-                                    options[opt.name] = result || [];
-                                    if (result) {
-                                        i++;
-                                    }
-                                    break;
-                                default:
-                                    options[opt.name] = parseCustomTypeOption(opt, args[i], errors);
-                                    i++;
-                                    break;
-                            }
-                        }
-                    }
-                    else {
-                        errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unknown_compiler_option_0, s));
-                    }
-                }
-                else {
-                    fileNames.push(s);
-                }
-            }
-        }
-        function parseResponseFile(fileName) {
-            var text = readFile ? readFile(fileName) : ts.sys.readFile(fileName);
-            if (!text) {
-                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.File_0_not_found, fileName));
-                return;
-            }
-            var args = [];
-            var pos = 0;
-            while (true) {
-                while (pos < text.length && text.charCodeAt(pos) <= 32)
-                    pos++;
-                if (pos >= text.length)
-                    break;
-                var start = pos;
-                if (text.charCodeAt(start) === 34) {
-                    pos++;
-                    while (pos < text.length && text.charCodeAt(pos) !== 34)
-                        pos++;
-                    if (pos < text.length) {
-                        args.push(text.substring(start + 1, pos));
-                        pos++;
-                    }
-                    else {
-                        errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unterminated_quoted_string_in_response_file_0, fileName));
-                    }
-                }
-                else {
-                    while (text.charCodeAt(pos) > 32)
-                        pos++;
-                    args.push(text.substring(start, pos));
-                }
-            }
-            parseStrings(args);
-        }
-    }
-    ts.parseCommandLine = parseCommandLine;
-    function readConfigFile(fileName, readFile) {
-        var text = "";
-        try {
-            text = readFile(fileName);
-        }
-        catch (e) {
-            return { error: ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_read_file_0_Colon_1, fileName, e.message) };
-        }
-        return parseConfigFileTextToJson(fileName, text);
-    }
-    ts.readConfigFile = readConfigFile;
-    function parseConfigFileTextToJson(fileName, jsonText, stripComments) {
-        if (stripComments === void 0) { stripComments = true; }
-        try {
-            var jsonTextToParse = stripComments ? removeComments(jsonText) : jsonText;
-            return { config: /\S/.test(jsonTextToParse) ? JSON.parse(jsonTextToParse) : {} };
-        }
-        catch (e) {
-            return { error: ts.createCompilerDiagnostic(ts.Diagnostics.Failed_to_parse_file_0_Colon_1, fileName, e.message) };
-        }
-    }
-    ts.parseConfigFileTextToJson = parseConfigFileTextToJson;
-    function generateTSConfig(options, fileNames) {
-        var compilerOptions = ts.extend(options, ts.defaultInitCompilerOptions);
-        var configurations = {
-            compilerOptions: serializeCompilerOptions(compilerOptions)
-        };
-        if (fileNames && fileNames.length) {
-            configurations.files = fileNames;
-        }
-        return configurations;
-        function getCustomTypeMapOfCommandLineOption(optionDefinition) {
-            if (optionDefinition.type === "string" || optionDefinition.type === "number" || optionDefinition.type === "boolean") {
+    function getResolutionDiagnostic(options, _a) {
+        var extension = _a.extension;
+        switch (extension) {
+            case ts.Extension.Ts:
+            case ts.Extension.Dts:
                 return undefined;
-            }
-            else if (optionDefinition.type === "list") {
-                return getCustomTypeMapOfCommandLineOption(optionDefinition.element);
-            }
-            else {
-                return optionDefinition.type;
-            }
+            case ts.Extension.Tsx:
+                return needJsx();
+            case ts.Extension.Jsx:
+                return needJsx() || needAllowJs();
+            case ts.Extension.Js:
+                return needAllowJs();
         }
-        function getNameOfCompilerOptionValue(value, customTypeMap) {
-            for (var key in customTypeMap) {
-                if (customTypeMap[key] === value) {
-                    return key;
-                }
-            }
-            return undefined;
+        function needJsx() {
+            return options.jsx ? undefined : ts.Diagnostics.Module_0_was_resolved_to_1_but_jsx_is_not_set;
         }
-        function serializeCompilerOptions(options) {
-            var result = ts.createMap();
-            var optionsNameMap = getOptionNameMap().optionNameMap;
-            for (var name_44 in options) {
-                if (ts.hasProperty(options, name_44)) {
-                    switch (name_44) {
-                        case "init":
-                        case "watch":
-                        case "version":
-                        case "help":
-                        case "project":
-                            break;
-                        default:
-                            var value = options[name_44];
-                            var optionDefinition = optionsNameMap[name_44.toLowerCase()];
-                            if (optionDefinition) {
-                                var customTypeMap = getCustomTypeMapOfCommandLineOption(optionDefinition);
-                                if (!customTypeMap) {
-                                    result[name_44] = value;
-                                }
-                                else {
-                                    if (optionDefinition.type === "list") {
-                                        var convertedValue = [];
-                                        for (var _i = 0, _a = value; _i < _a.length; _i++) {
-                                            var element = _a[_i];
-                                            convertedValue.push(getNameOfCompilerOptionValue(element, customTypeMap));
-                                        }
-                                        result[name_44] = convertedValue;
-                                    }
-                                    else {
-                                        result[name_44] = getNameOfCompilerOptionValue(value, customTypeMap);
-                                    }
-                                }
-                            }
-                            break;
-                    }
-                }
-            }
-            return result;
+        function needAllowJs() {
+            return options.allowJs ? undefined : ts.Diagnostics.Module_0_was_resolved_to_1_but_allowJs_is_not_set;
         }
     }
-    ts.generateTSConfig = generateTSConfig;
-    function removeComments(jsonText) {
-        var output = "";
-        var scanner = ts.createScanner(1, false, 0, jsonText);
-        var token;
-        while ((token = scanner.scan()) !== 1) {
-            switch (token) {
-                case 2:
-                case 3:
-                    output += scanner.getTokenText().replace(/\S/g, " ");
-                    break;
-                default:
-                    output += scanner.getTokenText();
-                    break;
-            }
-        }
-        return output;
-    }
-    function parseJsonConfigFileContent(json, host, basePath, existingOptions, configFileName, resolutionStack) {
-        if (existingOptions === void 0) { existingOptions = {}; }
-        if (resolutionStack === void 0) { resolutionStack = []; }
-        var errors = [];
-        var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames);
-        var resolvedPath = ts.toPath(configFileName || "", basePath, getCanonicalFileName);
-        if (resolutionStack.indexOf(resolvedPath) >= 0) {
-            return {
-                options: {},
-                fileNames: [],
-                typingOptions: {},
-                raw: json,
-                errors: [ts.createCompilerDiagnostic(ts.Diagnostics.Circularity_detected_while_resolving_configuration_Colon_0, resolutionStack.concat([resolvedPath]).join(" -> "))],
-                wildcardDirectories: {}
-            };
-        }
-        var options = convertCompilerOptionsFromJsonWorker(json["compilerOptions"], basePath, errors, configFileName);
-        var typingOptions = convertTypingOptionsFromJsonWorker(json["typingOptions"], basePath, errors, configFileName);
-        if (json["extends"]) {
-            var _a = [undefined, undefined, undefined, {}], include = _a[0], exclude = _a[1], files = _a[2], baseOptions = _a[3];
-            if (typeof json["extends"] === "string") {
-                _b = (tryExtendsName(json["extends"]) || [include, exclude, files, baseOptions]), include = _b[0], exclude = _b[1], files = _b[2], baseOptions = _b[3];
-            }
-            else {
-                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "extends", "string"));
-            }
-            if (include && !json["include"]) {
-                json["include"] = include;
-            }
-            if (exclude && !json["exclude"]) {
-                json["exclude"] = exclude;
-            }
-            if (files && !json["files"]) {
-                json["files"] = files;
-            }
-            options = ts.assign({}, baseOptions, options);
-        }
-        options = ts.extend(existingOptions, options);
-        options.configFilePath = configFileName;
-        var _c = getFileNames(errors), fileNames = _c.fileNames, wildcardDirectories = _c.wildcardDirectories;
-        var compileOnSave = convertCompileOnSaveOptionFromJson(json, basePath, errors);
-        return {
-            options: options,
-            fileNames: fileNames,
-            typingOptions: typingOptions,
-            raw: json,
-            errors: errors,
-            wildcardDirectories: wildcardDirectories,
-            compileOnSave: compileOnSave
-        };
-        function tryExtendsName(extendedConfig) {
-            if (!(ts.isRootedDiskPath(extendedConfig) || ts.startsWith(ts.normalizeSlashes(extendedConfig), "./") || ts.startsWith(ts.normalizeSlashes(extendedConfig), "../"))) {
-                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.The_path_in_an_extends_options_must_be_relative_or_rooted));
-                return;
-            }
-            var extendedConfigPath = ts.toPath(extendedConfig, basePath, getCanonicalFileName);
-            if (!host.fileExists(extendedConfigPath) && !ts.endsWith(extendedConfigPath, ".json")) {
-                extendedConfigPath = extendedConfigPath + ".json";
-                if (!host.fileExists(extendedConfigPath)) {
-                    errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.File_0_does_not_exist, extendedConfig));
-                    return;
-                }
-            }
-            var extendedResult = readConfigFile(extendedConfigPath, function (path) { return host.readFile(path); });
-            if (extendedResult.error) {
-                errors.push(extendedResult.error);
-                return;
-            }
-            var extendedDirname = ts.getDirectoryPath(extendedConfigPath);
-            var relativeDifference = ts.convertToRelativePath(extendedDirname, basePath, getCanonicalFileName);
-            var updatePath = function (path) { return ts.isRootedDiskPath(path) ? path : ts.combinePaths(relativeDifference, path); };
-            var result = parseJsonConfigFileContent(extendedResult.config, host, extendedDirname, undefined, ts.getBaseFileName(extendedConfigPath), resolutionStack.concat([resolvedPath]));
-            errors.push.apply(errors, result.errors);
-            var _a = ts.map(["include", "exclude", "files"], function (key) {
-                if (!json[key] && extendedResult.config[key]) {
-                    return ts.map(extendedResult.config[key], updatePath);
-                }
-            }), include = _a[0], exclude = _a[1], files = _a[2];
-            return [include, exclude, files, result.options];
-        }
-        function getFileNames(errors) {
-            var fileNames;
-            if (ts.hasProperty(json, "files")) {
-                if (ts.isArray(json["files"])) {
-                    fileNames = json["files"];
-                }
-                else {
-                    errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "files", "Array"));
-                }
-            }
-            var includeSpecs;
-            if (ts.hasProperty(json, "include")) {
-                if (ts.isArray(json["include"])) {
-                    includeSpecs = json["include"];
-                }
-                else {
-                    errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "include", "Array"));
-                }
-            }
-            var excludeSpecs;
-            if (ts.hasProperty(json, "exclude")) {
-                if (ts.isArray(json["exclude"])) {
-                    excludeSpecs = json["exclude"];
-                }
-                else {
-                    errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "exclude", "Array"));
-                }
-            }
-            else if (ts.hasProperty(json, "excludes")) {
-                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unknown_option_excludes_Did_you_mean_exclude));
-            }
-            else {
-                excludeSpecs = ["node_modules", "bower_components", "jspm_packages"];
-                var outDir = json["compilerOptions"] && json["compilerOptions"]["outDir"];
-                if (outDir) {
-                    excludeSpecs.push(outDir);
-                }
-            }
-            if (fileNames === undefined && includeSpecs === undefined) {
-                includeSpecs = ["**/*"];
-            }
-            return matchFileNames(fileNames, includeSpecs, excludeSpecs, basePath, options, host, errors);
-        }
-        var _b;
-    }
-    ts.parseJsonConfigFileContent = parseJsonConfigFileContent;
-    function convertCompileOnSaveOptionFromJson(jsonOption, basePath, errors) {
-        if (!ts.hasProperty(jsonOption, ts.compileOnSaveCommandLineOption.name)) {
-            return false;
-        }
-        var result = convertJsonOption(ts.compileOnSaveCommandLineOption, jsonOption["compileOnSave"], basePath, errors);
-        if (typeof result === "boolean" && result) {
-            return result;
-        }
-        return false;
-    }
-    ts.convertCompileOnSaveOptionFromJson = convertCompileOnSaveOptionFromJson;
-    function convertCompilerOptionsFromJson(jsonOptions, basePath, configFileName) {
-        var errors = [];
-        var options = convertCompilerOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName);
-        return { options: options, errors: errors };
-    }
-    ts.convertCompilerOptionsFromJson = convertCompilerOptionsFromJson;
-    function convertTypingOptionsFromJson(jsonOptions, basePath, configFileName) {
-        var errors = [];
-        var options = convertTypingOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName);
-        return { options: options, errors: errors };
-    }
-    ts.convertTypingOptionsFromJson = convertTypingOptionsFromJson;
-    function convertCompilerOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName) {
-        var options = ts.getBaseFileName(configFileName) === "jsconfig.json"
-            ? { allowJs: true, maxNodeModuleJsDepth: 2, allowSyntheticDefaultImports: true, skipLibCheck: true }
-            : {};
-        convertOptionsFromJson(ts.optionDeclarations, jsonOptions, basePath, options, ts.Diagnostics.Unknown_compiler_option_0, errors);
-        return options;
-    }
-    function convertTypingOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName) {
-        var options = ts.getBaseFileName(configFileName) === "jsconfig.json"
-            ? { enableAutoDiscovery: true, include: [], exclude: [] }
-            : { enableAutoDiscovery: false, include: [], exclude: [] };
-        convertOptionsFromJson(ts.typingOptionDeclarations, jsonOptions, basePath, options, ts.Diagnostics.Unknown_typing_option_0, errors);
-        return options;
-    }
-    function convertOptionsFromJson(optionDeclarations, jsonOptions, basePath, defaultOptions, diagnosticMessage, errors) {
-        if (!jsonOptions) {
-            return;
-        }
-        var optionNameMap = ts.arrayToMap(optionDeclarations, function (opt) { return opt.name; });
-        for (var id in jsonOptions) {
-            if (id in optionNameMap) {
-                var opt = optionNameMap[id];
-                defaultOptions[opt.name] = convertJsonOption(opt, jsonOptions[id], basePath, errors);
-            }
-            else {
-                errors.push(ts.createCompilerDiagnostic(diagnosticMessage, id));
-            }
-        }
-    }
-    function convertJsonOption(opt, value, basePath, errors) {
-        var optType = opt.type;
-        var expectedType = typeof optType === "string" ? optType : "string";
-        if (optType === "list" && ts.isArray(value)) {
-            return convertJsonOptionOfListType(opt, value, basePath, errors);
-        }
-        else if (typeof value === expectedType) {
-            if (typeof optType !== "string") {
-                return convertJsonOptionOfCustomType(opt, value, errors);
-            }
-            else {
-                if (opt.isFilePath) {
-                    value = ts.normalizePath(ts.combinePaths(basePath, value));
-                    if (value === "") {
-                        value = ".";
-                    }
-                }
-            }
-            return value;
-        }
-        else {
-            errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, opt.name, expectedType));
-        }
-    }
-    function convertJsonOptionOfCustomType(opt, value, errors) {
-        var key = value.toLowerCase();
-        if (key in opt.type) {
-            return opt.type[key];
-        }
-        else {
-            errors.push(createCompilerDiagnosticForInvalidCustomType(opt));
-        }
-    }
-    function convertJsonOptionOfListType(option, values, basePath, errors) {
-        return ts.filter(ts.map(values, function (v) { return convertJsonOption(option.element, v, basePath, errors); }), function (v) { return !!v; });
-    }
-    function trimString(s) {
-        return typeof s.trim === "function" ? s.trim() : s.replace(/^[\s]+|[\s]+$/g, "");
-    }
-    var invalidTrailingRecursionPattern = /(^|\/)\*\*\/?$/;
-    var invalidMultipleRecursionPatterns = /(^|\/)\*\*\/(.*\/)?\*\*($|\/)/;
-    var invalidDotDotAfterRecursiveWildcardPattern = /(^|\/)\*\*\/(.*\/)?\.\.($|\/)/;
-    var watchRecursivePattern = /\/[^/]*?[*?][^/]*\//;
-    var wildcardDirectoryPattern = /^[^*?]*(?=\/[^/]*[*?])/;
-    function matchFileNames(fileNames, include, exclude, basePath, options, host, errors) {
-        basePath = ts.normalizePath(basePath);
-        var keyMapper = host.useCaseSensitiveFileNames ? caseSensitiveKeyMapper : caseInsensitiveKeyMapper;
-        var literalFileMap = ts.createMap();
-        var wildcardFileMap = ts.createMap();
-        if (include) {
-            include = validateSpecs(include, errors, false);
-        }
-        if (exclude) {
-            exclude = validateSpecs(exclude, errors, true);
-        }
-        var wildcardDirectories = getWildcardDirectories(include, exclude, basePath, host.useCaseSensitiveFileNames);
-        var supportedExtensions = ts.getSupportedExtensions(options);
-        if (fileNames) {
-            for (var _i = 0, fileNames_1 = fileNames; _i < fileNames_1.length; _i++) {
-                var fileName = fileNames_1[_i];
-                var file = ts.combinePaths(basePath, fileName);
-                literalFileMap[keyMapper(file)] = file;
-            }
-        }
-        if (include && include.length > 0) {
-            for (var _a = 0, _b = host.readDirectory(basePath, supportedExtensions, exclude, include); _a < _b.length; _a++) {
-                var file = _b[_a];
-                if (hasFileWithHigherPriorityExtension(file, literalFileMap, wildcardFileMap, supportedExtensions, keyMapper)) {
-                    continue;
-                }
-                removeWildcardFilesWithLowerPriorityExtension(file, wildcardFileMap, supportedExtensions, keyMapper);
-                var key = keyMapper(file);
-                if (!(key in literalFileMap) && !(key in wildcardFileMap)) {
-                    wildcardFileMap[key] = file;
-                }
-            }
-        }
-        var literalFiles = ts.reduceProperties(literalFileMap, addFileToOutput, []);
-        var wildcardFiles = ts.reduceProperties(wildcardFileMap, addFileToOutput, []);
-        wildcardFiles.sort(host.useCaseSensitiveFileNames ? ts.compareStrings : ts.compareStringsCaseInsensitive);
-        return {
-            fileNames: literalFiles.concat(wildcardFiles),
-            wildcardDirectories: wildcardDirectories
-        };
-    }
-    function validateSpecs(specs, errors, allowTrailingRecursion) {
-        var validSpecs = [];
-        for (var _i = 0, specs_2 = specs; _i < specs_2.length; _i++) {
-            var spec = specs_2[_i];
-            if (!allowTrailingRecursion && invalidTrailingRecursionPattern.test(spec)) {
-                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0, spec));
-            }
-            else if (invalidMultipleRecursionPatterns.test(spec)) {
-                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.File_specification_cannot_contain_multiple_recursive_directory_wildcards_Asterisk_Asterisk_Colon_0, spec));
-            }
-            else if (invalidDotDotAfterRecursiveWildcardPattern.test(spec)) {
-                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0, spec));
-            }
-            else {
-                validSpecs.push(spec);
-            }
-        }
-        return validSpecs;
-    }
-    function getWildcardDirectories(include, exclude, path, useCaseSensitiveFileNames) {
-        var rawExcludeRegex = ts.getRegularExpressionForWildcard(exclude, path, "exclude");
-        var excludeRegex = rawExcludeRegex && new RegExp(rawExcludeRegex, useCaseSensitiveFileNames ? "" : "i");
-        var wildcardDirectories = ts.createMap();
-        if (include !== undefined) {
-            var recursiveKeys = [];
-            for (var _i = 0, include_1 = include; _i < include_1.length; _i++) {
-                var file = include_1[_i];
-                var name_45 = ts.normalizePath(ts.combinePaths(path, file));
-                if (excludeRegex && excludeRegex.test(name_45)) {
-                    continue;
-                }
-                var match = wildcardDirectoryPattern.exec(name_45);
-                if (match) {
-                    var key = useCaseSensitiveFileNames ? match[0] : match[0].toLowerCase();
-                    var flags = watchRecursivePattern.test(name_45) ? 1 : 0;
-                    var existingFlags = wildcardDirectories[key];
-                    if (existingFlags === undefined || existingFlags < flags) {
-                        wildcardDirectories[key] = flags;
-                        if (flags === 1) {
-                            recursiveKeys.push(key);
-                        }
-                    }
-                }
-            }
-            for (var key in wildcardDirectories) {
-                for (var _a = 0, recursiveKeys_1 = recursiveKeys; _a < recursiveKeys_1.length; _a++) {
-                    var recursiveKey = recursiveKeys_1[_a];
-                    if (key !== recursiveKey && ts.containsPath(recursiveKey, key, path, !useCaseSensitiveFileNames)) {
-                        delete wildcardDirectories[key];
-                    }
-                }
-            }
-        }
-        return wildcardDirectories;
-    }
-    function hasFileWithHigherPriorityExtension(file, literalFiles, wildcardFiles, extensions, keyMapper) {
-        var extensionPriority = ts.getExtensionPriority(file, extensions);
-        var adjustedExtensionPriority = ts.adjustExtensionPriority(extensionPriority);
-        for (var i = 0; i < adjustedExtensionPriority; i++) {
-            var higherPriorityExtension = extensions[i];
-            var higherPriorityPath = keyMapper(ts.changeExtension(file, higherPriorityExtension));
-            if (higherPriorityPath in literalFiles || higherPriorityPath in wildcardFiles) {
-                return true;
-            }
-        }
-        return false;
-    }
-    function removeWildcardFilesWithLowerPriorityExtension(file, wildcardFiles, extensions, keyMapper) {
-        var extensionPriority = ts.getExtensionPriority(file, extensions);
-        var nextExtensionPriority = ts.getNextLowestExtensionPriority(extensionPriority);
-        for (var i = nextExtensionPriority; i < extensions.length; i++) {
-            var lowerPriorityExtension = extensions[i];
-            var lowerPriorityPath = keyMapper(ts.changeExtension(file, lowerPriorityExtension));
-            delete wildcardFiles[lowerPriorityPath];
-        }
-    }
-    function addFileToOutput(output, file) {
-        output.push(file);
-        return output;
-    }
-    function caseSensitiveKeyMapper(key) {
-        return key;
-    }
-    function caseInsensitiveKeyMapper(key) {
-        return key.toLowerCase();
-    }
+    ts.getResolutionDiagnostic = getResolutionDiagnostic;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -50192,12 +51335,13 @@ var ts;
         HighlightSpanKind.reference = "reference";
         HighlightSpanKind.writtenReference = "writtenReference";
     })(HighlightSpanKind = ts.HighlightSpanKind || (ts.HighlightSpanKind = {}));
+    var IndentStyle;
     (function (IndentStyle) {
         IndentStyle[IndentStyle["None"] = 0] = "None";
         IndentStyle[IndentStyle["Block"] = 1] = "Block";
         IndentStyle[IndentStyle["Smart"] = 2] = "Smart";
-    })(ts.IndentStyle || (ts.IndentStyle = {}));
-    var IndentStyle = ts.IndentStyle;
+    })(IndentStyle = ts.IndentStyle || (ts.IndentStyle = {}));
+    var SymbolDisplayPartKind;
     (function (SymbolDisplayPartKind) {
         SymbolDisplayPartKind[SymbolDisplayPartKind["aliasName"] = 0] = "aliasName";
         SymbolDisplayPartKind[SymbolDisplayPartKind["className"] = 1] = "className";
@@ -50221,24 +51365,8 @@ var ts;
         SymbolDisplayPartKind[SymbolDisplayPartKind["enumMemberName"] = 19] = "enumMemberName";
         SymbolDisplayPartKind[SymbolDisplayPartKind["functionName"] = 20] = "functionName";
         SymbolDisplayPartKind[SymbolDisplayPartKind["regularExpressionLiteral"] = 21] = "regularExpressionLiteral";
-    })(ts.SymbolDisplayPartKind || (ts.SymbolDisplayPartKind = {}));
-    var SymbolDisplayPartKind = ts.SymbolDisplayPartKind;
-    (function (OutputFileType) {
-        OutputFileType[OutputFileType["JavaScript"] = 0] = "JavaScript";
-        OutputFileType[OutputFileType["SourceMap"] = 1] = "SourceMap";
-        OutputFileType[OutputFileType["Declaration"] = 2] = "Declaration";
-    })(ts.OutputFileType || (ts.OutputFileType = {}));
-    var OutputFileType = ts.OutputFileType;
-    (function (EndOfLineState) {
-        EndOfLineState[EndOfLineState["None"] = 0] = "None";
-        EndOfLineState[EndOfLineState["InMultiLineCommentTrivia"] = 1] = "InMultiLineCommentTrivia";
-        EndOfLineState[EndOfLineState["InSingleQuoteStringLiteral"] = 2] = "InSingleQuoteStringLiteral";
-        EndOfLineState[EndOfLineState["InDoubleQuoteStringLiteral"] = 3] = "InDoubleQuoteStringLiteral";
-        EndOfLineState[EndOfLineState["InTemplateHeadOrNoSubstitutionTemplate"] = 4] = "InTemplateHeadOrNoSubstitutionTemplate";
-        EndOfLineState[EndOfLineState["InTemplateMiddleOrTail"] = 5] = "InTemplateMiddleOrTail";
-        EndOfLineState[EndOfLineState["InTemplateSubstitutionPosition"] = 6] = "InTemplateSubstitutionPosition";
-    })(ts.EndOfLineState || (ts.EndOfLineState = {}));
-    var EndOfLineState = ts.EndOfLineState;
+    })(SymbolDisplayPartKind = ts.SymbolDisplayPartKind || (ts.SymbolDisplayPartKind = {}));
+    var TokenClass;
     (function (TokenClass) {
         TokenClass[TokenClass["Punctuation"] = 0] = "Punctuation";
         TokenClass[TokenClass["Keyword"] = 1] = "Keyword";
@@ -50249,8 +51377,7 @@ var ts;
         TokenClass[TokenClass["NumberLiteral"] = 6] = "NumberLiteral";
         TokenClass[TokenClass["StringLiteral"] = 7] = "StringLiteral";
         TokenClass[TokenClass["RegExpLiteral"] = 8] = "RegExpLiteral";
-    })(ts.TokenClass || (ts.TokenClass = {}));
-    var TokenClass = ts.TokenClass;
+    })(TokenClass = ts.TokenClass || (ts.TokenClass = {}));
     var ScriptElementKind;
     (function (ScriptElementKind) {
         ScriptElementKind.unknown = "";
@@ -50326,75 +51453,40 @@ var ts;
     ClassificationTypeNames.jsxText = "jsx text";
     ClassificationTypeNames.jsxAttributeStringLiteralValue = "jsx attribute string literal value";
     ts.ClassificationTypeNames = ClassificationTypeNames;
-    (function (ClassificationType) {
-        ClassificationType[ClassificationType["comment"] = 1] = "comment";
-        ClassificationType[ClassificationType["identifier"] = 2] = "identifier";
-        ClassificationType[ClassificationType["keyword"] = 3] = "keyword";
-        ClassificationType[ClassificationType["numericLiteral"] = 4] = "numericLiteral";
-        ClassificationType[ClassificationType["operator"] = 5] = "operator";
-        ClassificationType[ClassificationType["stringLiteral"] = 6] = "stringLiteral";
-        ClassificationType[ClassificationType["regularExpressionLiteral"] = 7] = "regularExpressionLiteral";
-        ClassificationType[ClassificationType["whiteSpace"] = 8] = "whiteSpace";
-        ClassificationType[ClassificationType["text"] = 9] = "text";
-        ClassificationType[ClassificationType["punctuation"] = 10] = "punctuation";
-        ClassificationType[ClassificationType["className"] = 11] = "className";
-        ClassificationType[ClassificationType["enumName"] = 12] = "enumName";
-        ClassificationType[ClassificationType["interfaceName"] = 13] = "interfaceName";
-        ClassificationType[ClassificationType["moduleName"] = 14] = "moduleName";
-        ClassificationType[ClassificationType["typeParameterName"] = 15] = "typeParameterName";
-        ClassificationType[ClassificationType["typeAliasName"] = 16] = "typeAliasName";
-        ClassificationType[ClassificationType["parameterName"] = 17] = "parameterName";
-        ClassificationType[ClassificationType["docCommentTagName"] = 18] = "docCommentTagName";
-        ClassificationType[ClassificationType["jsxOpenTagName"] = 19] = "jsxOpenTagName";
-        ClassificationType[ClassificationType["jsxCloseTagName"] = 20] = "jsxCloseTagName";
-        ClassificationType[ClassificationType["jsxSelfClosingTagName"] = 21] = "jsxSelfClosingTagName";
-        ClassificationType[ClassificationType["jsxAttribute"] = 22] = "jsxAttribute";
-        ClassificationType[ClassificationType["jsxText"] = 23] = "jsxText";
-        ClassificationType[ClassificationType["jsxAttributeStringLiteralValue"] = 24] = "jsxAttributeStringLiteralValue";
-    })(ts.ClassificationType || (ts.ClassificationType = {}));
-    var ClassificationType = ts.ClassificationType;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    ts.scanner = ts.createScanner(4, true);
+    ts.scanner = ts.createScanner(5, true);
     ts.emptyArray = [];
-    (function (SemanticMeaning) {
-        SemanticMeaning[SemanticMeaning["None"] = 0] = "None";
-        SemanticMeaning[SemanticMeaning["Value"] = 1] = "Value";
-        SemanticMeaning[SemanticMeaning["Type"] = 2] = "Type";
-        SemanticMeaning[SemanticMeaning["Namespace"] = 4] = "Namespace";
-        SemanticMeaning[SemanticMeaning["All"] = 7] = "All";
-    })(ts.SemanticMeaning || (ts.SemanticMeaning = {}));
-    var SemanticMeaning = ts.SemanticMeaning;
     function getMeaningFromDeclaration(node) {
         switch (node.kind) {
-            case 143:
-            case 219:
-            case 170:
-            case 146:
-            case 145:
-            case 253:
-            case 254:
-            case 255:
-            case 148:
+            case 144:
+            case 223:
+            case 174:
             case 147:
+            case 146:
+            case 257:
+            case 258:
+            case 260:
             case 149:
+            case 148:
             case 150:
             case 151:
-            case 221:
-            case 180:
-            case 181:
-            case 252:
-                return 1;
-            case 142:
-            case 223:
-            case 224:
-            case 160:
-                return 2;
-            case 222:
+            case 152:
             case 225:
-                return 1 | 2;
+            case 184:
+            case 185:
+            case 256:
+                return 1;
+            case 143:
+            case 227:
+            case 228:
+            case 161:
+                return 2;
             case 226:
+            case 229:
+                return 1 | 2;
+            case 230:
                 if (ts.isAmbientModule(node)) {
                     return 4 | 1;
                 }
@@ -50404,21 +51496,21 @@ var ts;
                 else {
                     return 4;
                 }
+            case 238:
+            case 239:
             case 234:
             case 235:
-            case 230:
-            case 231:
-            case 236:
-            case 237:
+            case 240:
+            case 241:
                 return 1 | 2 | 4;
-            case 256:
+            case 261:
                 return 4 | 1;
         }
         return 1 | 2 | 4;
     }
     ts.getMeaningFromDeclaration = getMeaningFromDeclaration;
     function getMeaningFromLocation(node) {
-        if (node.parent.kind === 236) {
+        if (node.parent.kind === 240) {
             return 1 | 2 | 4;
         }
         else if (isInRightSideOfImport(node)) {
@@ -50440,15 +51532,15 @@ var ts;
     ts.getMeaningFromLocation = getMeaningFromLocation;
     function getMeaningFromRightHandSideOfImportEquals(node) {
         ts.Debug.assert(node.kind === 70);
-        if (node.parent.kind === 140 &&
+        if (node.parent.kind === 141 &&
             node.parent.right === node &&
-            node.parent.parent.kind === 230) {
+            node.parent.parent.kind === 234) {
             return 1 | 2 | 4;
         }
         return 4;
     }
     function isInRightSideOfImport(node) {
-        while (node.parent.kind === 140) {
+        while (node.parent.kind === 141) {
             node = node.parent;
         }
         return ts.isInternalModuleImportEqualsDeclaration(node.parent) && node.parent.moduleReference === node;
@@ -50459,27 +51551,27 @@ var ts;
     function isQualifiedNameNamespaceReference(node) {
         var root = node;
         var isLastClause = true;
-        if (root.parent.kind === 140) {
-            while (root.parent && root.parent.kind === 140) {
+        if (root.parent.kind === 141) {
+            while (root.parent && root.parent.kind === 141) {
                 root = root.parent;
             }
             isLastClause = root.right === node;
         }
-        return root.parent.kind === 156 && !isLastClause;
+        return root.parent.kind === 157 && !isLastClause;
     }
     function isPropertyAccessNamespaceReference(node) {
         var root = node;
         var isLastClause = true;
-        if (root.parent.kind === 173) {
-            while (root.parent && root.parent.kind === 173) {
+        if (root.parent.kind === 177) {
+            while (root.parent && root.parent.kind === 177) {
                 root = root.parent;
             }
             isLastClause = root.name === node;
         }
-        if (!isLastClause && root.parent.kind === 195 && root.parent.parent.kind === 251) {
+        if (!isLastClause && root.parent.kind === 199 && root.parent.parent.kind === 255) {
             var decl = root.parent.parent.parent;
-            return (decl.kind === 222 && root.parent.parent.token === 107) ||
-                (decl.kind === 223 && root.parent.parent.token === 84);
+            return (decl.kind === 226 && root.parent.parent.token === 107) ||
+                (decl.kind === 227 && root.parent.parent.token === 84);
         }
         return false;
     }
@@ -50487,17 +51579,17 @@ var ts;
         if (ts.isRightSideOfQualifiedNameOrPropertyAccess(node)) {
             node = node.parent;
         }
-        return node.parent.kind === 156 ||
-            (node.parent.kind === 195 && !ts.isExpressionWithTypeArgumentsInClassExtendsClause(node.parent)) ||
+        return node.parent.kind === 157 ||
+            (node.parent.kind === 199 && !ts.isExpressionWithTypeArgumentsInClassExtendsClause(node.parent)) ||
             (node.kind === 98 && !ts.isPartOfExpression(node)) ||
-            node.kind === 166;
+            node.kind === 167;
     }
     function isCallExpressionTarget(node) {
-        return isCallOrNewExpressionTarget(node, 175);
+        return isCallOrNewExpressionTarget(node, 179);
     }
     ts.isCallExpressionTarget = isCallExpressionTarget;
     function isNewExpressionTarget(node) {
-        return isCallOrNewExpressionTarget(node, 176);
+        return isCallOrNewExpressionTarget(node, 180);
     }
     ts.isNewExpressionTarget = isNewExpressionTarget;
     function isCallOrNewExpressionTarget(node, kind) {
@@ -50510,7 +51602,7 @@ var ts;
     ts.climbPastPropertyAccess = climbPastPropertyAccess;
     function getTargetLabel(referenceNode, labelName) {
         while (referenceNode) {
-            if (referenceNode.kind === 215 && referenceNode.label.text === labelName) {
+            if (referenceNode.kind === 219 && referenceNode.label.text === labelName) {
                 return referenceNode.label;
             }
             referenceNode = referenceNode.parent;
@@ -50520,13 +51612,13 @@ var ts;
     ts.getTargetLabel = getTargetLabel;
     function isJumpStatementTarget(node) {
         return node.kind === 70 &&
-            (node.parent.kind === 211 || node.parent.kind === 210) &&
+            (node.parent.kind === 215 || node.parent.kind === 214) &&
             node.parent.label === node;
     }
     ts.isJumpStatementTarget = isJumpStatementTarget;
     function isLabelOfLabeledStatement(node) {
         return node.kind === 70 &&
-            node.parent.kind === 215 &&
+            node.parent.kind === 219 &&
             node.parent.label === node;
     }
     function isLabelName(node) {
@@ -50534,15 +51626,15 @@ var ts;
     }
     ts.isLabelName = isLabelName;
     function isRightSideOfQualifiedName(node) {
-        return node.parent.kind === 140 && node.parent.right === node;
+        return node.parent.kind === 141 && node.parent.right === node;
     }
     ts.isRightSideOfQualifiedName = isRightSideOfQualifiedName;
     function isRightSideOfPropertyAccess(node) {
-        return node && node.parent && node.parent.kind === 173 && node.parent.name === node;
+        return node && node.parent && node.parent.kind === 177 && node.parent.name === node;
     }
     ts.isRightSideOfPropertyAccess = isRightSideOfPropertyAccess;
     function isNameOfModuleDeclaration(node) {
-        return node.parent.kind === 226 && node.parent.name === node;
+        return node.parent.kind === 230 && node.parent.name === node;
     }
     ts.isNameOfModuleDeclaration = isNameOfModuleDeclaration;
     function isNameOfFunctionDeclaration(node) {
@@ -50553,19 +51645,19 @@ var ts;
     function isLiteralNameOfPropertyDeclarationOrIndexAccess(node) {
         if (node.kind === 9 || node.kind === 8) {
             switch (node.parent.kind) {
-                case 146:
-                case 145:
-                case 253:
-                case 255:
-                case 148:
                 case 147:
-                case 150:
+                case 146:
+                case 257:
+                case 260:
+                case 149:
+                case 148:
                 case 151:
-                case 226:
+                case 152:
+                case 230:
                     return node.parent.name === node;
-                case 174:
+                case 178:
                     return node.parent.argumentExpression === node;
-                case 141:
+                case 142:
                     return true;
             }
         }
@@ -50609,17 +51701,17 @@ var ts;
                 return undefined;
             }
             switch (node.kind) {
-                case 256:
+                case 261:
+                case 149:
                 case 148:
-                case 147:
-                case 221:
-                case 180:
-                case 150:
-                case 151:
-                case 222:
-                case 223:
                 case 225:
+                case 184:
+                case 151:
+                case 152:
                 case 226:
+                case 227:
+                case 229:
+                case 230:
                     return node;
             }
         }
@@ -50627,46 +51719,46 @@ var ts;
     ts.getContainerNode = getContainerNode;
     function getNodeKind(node) {
         switch (node.kind) {
-            case 256:
+            case 261:
                 return ts.isExternalModule(node) ? ts.ScriptElementKind.moduleElement : ts.ScriptElementKind.scriptElement;
-            case 226:
-                return ts.ScriptElementKind.moduleElement;
-            case 222:
-            case 193:
-                return ts.ScriptElementKind.classElement;
-            case 223: return ts.ScriptElementKind.interfaceElement;
-            case 224: return ts.ScriptElementKind.typeElement;
-            case 225: return ts.ScriptElementKind.enumElement;
-            case 219:
-                return getKindOfVariableDeclaration(node);
-            case 170:
-                return getKindOfVariableDeclaration(ts.getRootDeclaration(node));
-            case 181:
-            case 221:
-            case 180:
-                return ts.ScriptElementKind.functionElement;
-            case 150: return ts.ScriptElementKind.memberGetAccessorElement;
-            case 151: return ts.ScriptElementKind.memberSetAccessorElement;
-            case 148:
-            case 147:
-                return ts.ScriptElementKind.memberFunctionElement;
-            case 146:
-            case 145:
-                return ts.ScriptElementKind.memberVariableElement;
-            case 154: return ts.ScriptElementKind.indexSignatureElement;
-            case 153: return ts.ScriptElementKind.constructSignatureElement;
-            case 152: return ts.ScriptElementKind.callSignatureElement;
-            case 149: return ts.ScriptElementKind.constructorImplementationElement;
-            case 142: return ts.ScriptElementKind.typeParameterElement;
-            case 255: return ts.ScriptElementKind.enumMemberElement;
-            case 143: return ts.hasModifier(node, 92) ? ts.ScriptElementKind.memberVariableElement : ts.ScriptElementKind.parameterElement;
             case 230:
-            case 235:
-            case 232:
+                return ts.ScriptElementKind.moduleElement;
+            case 226:
+            case 197:
+                return ts.ScriptElementKind.classElement;
+            case 227: return ts.ScriptElementKind.interfaceElement;
+            case 228: return ts.ScriptElementKind.typeElement;
+            case 229: return ts.ScriptElementKind.enumElement;
+            case 223:
+                return getKindOfVariableDeclaration(node);
+            case 174:
+                return getKindOfVariableDeclaration(ts.getRootDeclaration(node));
+            case 185:
+            case 225:
+            case 184:
+                return ts.ScriptElementKind.functionElement;
+            case 151: return ts.ScriptElementKind.memberGetAccessorElement;
+            case 152: return ts.ScriptElementKind.memberSetAccessorElement;
+            case 149:
+            case 148:
+                return ts.ScriptElementKind.memberFunctionElement;
+            case 147:
+            case 146:
+                return ts.ScriptElementKind.memberVariableElement;
+            case 155: return ts.ScriptElementKind.indexSignatureElement;
+            case 154: return ts.ScriptElementKind.constructSignatureElement;
+            case 153: return ts.ScriptElementKind.callSignatureElement;
+            case 150: return ts.ScriptElementKind.constructorImplementationElement;
+            case 143: return ts.ScriptElementKind.typeParameterElement;
+            case 260: return ts.ScriptElementKind.enumMemberElement;
+            case 144: return ts.hasModifier(node, 92) ? ts.ScriptElementKind.memberVariableElement : ts.ScriptElementKind.parameterElement;
+            case 234:
             case 239:
-            case 233:
+            case 236:
+            case 243:
+            case 237:
                 return ts.ScriptElementKind.alias;
-            case 279:
+            case 284:
                 return ts.ScriptElementKind.typeElement;
             default:
                 return ts.ScriptElementKind.unknown;
@@ -50681,7 +51773,7 @@ var ts;
     }
     ts.getNodeKind = getNodeKind;
     function getStringLiteralTypeForNode(node, typeChecker) {
-        var searchNode = node.parent.kind === 167 ? node.parent : node;
+        var searchNode = node.parent.kind === 171 ? node.parent : node;
         var type = typeChecker.getTypeAtLocation(searchNode);
         if (type && type.flags & 32) {
             return type;
@@ -50694,7 +51786,7 @@ var ts;
             case 98:
                 return true;
             case 70:
-                return ts.identifierIsThisKeyword(node) && node.parent.kind === 143;
+                return ts.identifierIsThisKeyword(node) && node.parent.kind === 144;
             default:
                 return false;
         }
@@ -50738,41 +51830,41 @@ var ts;
             return false;
         }
         switch (n.kind) {
-            case 222:
-            case 223:
-            case 225:
-            case 172:
-            case 168:
-            case 160:
-            case 200:
+            case 226:
             case 227:
-            case 228:
-            case 234:
-            case 238:
-                return nodeEndsWith(n, 17, sourceFile);
-            case 252:
-                return isCompletedNode(n.block, sourceFile);
+            case 229:
             case 176:
+            case 172:
+            case 161:
+            case 204:
+            case 231:
+            case 232:
+            case 238:
+            case 242:
+                return nodeEndsWith(n, 17, sourceFile);
+            case 256:
+                return isCompletedNode(n.block, sourceFile);
+            case 180:
                 if (!n.arguments) {
                     return true;
                 }
-            case 175:
             case 179:
-            case 165:
+            case 183:
+            case 166:
                 return nodeEndsWith(n, 19, sourceFile);
-            case 157:
             case 158:
+            case 159:
                 return isCompletedNode(n.type, sourceFile);
-            case 149:
             case 150:
             case 151:
-            case 221:
-            case 180:
-            case 148:
-            case 147:
-            case 153:
             case 152:
-            case 181:
+            case 225:
+            case 184:
+            case 149:
+            case 148:
+            case 154:
+            case 153:
+            case 185:
                 if (n.body) {
                     return isCompletedNode(n.body, sourceFile);
                 }
@@ -50780,65 +51872,65 @@ var ts;
                     return isCompletedNode(n.type, sourceFile);
                 }
                 return hasChildOfKind(n, 19, sourceFile);
-            case 226:
+            case 230:
                 return n.body && isCompletedNode(n.body, sourceFile);
-            case 204:
+            case 208:
                 if (n.elseStatement) {
                     return isCompletedNode(n.elseStatement, sourceFile);
                 }
                 return isCompletedNode(n.thenStatement, sourceFile);
-            case 203:
+            case 207:
                 return isCompletedNode(n.expression, sourceFile) ||
                     hasChildOfKind(n, 24);
-            case 171:
-            case 169:
-            case 174:
-            case 141:
-            case 162:
+            case 175:
+            case 173:
+            case 178:
+            case 142:
+            case 163:
                 return nodeEndsWith(n, 21, sourceFile);
-            case 154:
+            case 155:
                 if (n.type) {
                     return isCompletedNode(n.type, sourceFile);
                 }
                 return hasChildOfKind(n, 21, sourceFile);
-            case 249:
-            case 250:
+            case 253:
+            case 254:
                 return false;
-            case 207:
-            case 208:
-            case 209:
-            case 206:
+            case 211:
+            case 212:
+            case 213:
+            case 210:
                 return isCompletedNode(n.statement, sourceFile);
-            case 205:
+            case 209:
                 var hasWhileKeyword = findChildOfKind(n, 105, sourceFile);
                 if (hasWhileKeyword) {
                     return nodeEndsWith(n, 19, sourceFile);
                 }
                 return isCompletedNode(n.statement, sourceFile);
-            case 159:
+            case 160:
                 return isCompletedNode(n.exprName, sourceFile);
-            case 183:
-            case 182:
-            case 184:
-            case 191:
-            case 192:
+            case 187:
+            case 186:
+            case 188:
+            case 195:
+            case 196:
                 var unaryWordExpression = n;
                 return isCompletedNode(unaryWordExpression.expression, sourceFile);
-            case 177:
+            case 181:
                 return isCompletedNode(n.template, sourceFile);
-            case 190:
+            case 194:
                 var lastSpan = ts.lastOrUndefined(n.templateSpans);
                 return isCompletedNode(lastSpan, sourceFile);
-            case 198:
+            case 202:
                 return ts.nodeIsPresent(n.literal);
-            case 237:
-            case 231:
+            case 241:
+            case 235:
                 return ts.nodeIsPresent(n.moduleSpecifier);
-            case 186:
+            case 190:
                 return isCompletedNode(n.operand, sourceFile);
-            case 188:
+            case 192:
                 return isCompletedNode(n.right, sourceFile);
-            case 189:
+            case 193:
                 return isCompletedNode(n.whenFalse, sourceFile);
             default:
                 return true;
@@ -50881,7 +51973,7 @@ var ts;
     ts.findChildOfKind = findChildOfKind;
     function findContainingList(node) {
         var syntaxList = ts.forEach(node.parent.getChildren(), function (c) {
-            if (c.kind === 286 && c.pos <= node.pos && c.end >= node.end) {
+            if (c.kind === 291 && c.pos <= node.pos && c.end >= node.end) {
                 return c;
             }
         });
@@ -51016,7 +52108,7 @@ var ts;
                     }
                 }
             }
-            ts.Debug.assert(startNode !== undefined || n.kind === 256);
+            ts.Debug.assert(startNode !== undefined || n.kind === 261);
             if (children.length) {
                 var candidate = findRightmostChildNodeWithTokens(children, children.length);
                 return candidate && findRightmostToken(candidate);
@@ -51061,13 +52153,13 @@ var ts;
         if (token.kind === 26 && token.parent.kind === 10) {
             return true;
         }
-        if (token.kind === 26 && token.parent.kind === 248) {
+        if (token.kind === 26 && token.parent.kind === 252) {
             return true;
         }
-        if (token && token.kind === 17 && token.parent.kind === 248) {
+        if (token && token.kind === 17 && token.parent.kind === 252) {
             return true;
         }
-        if (token.kind === 26 && token.parent.kind === 245) {
+        if (token.kind === 26 && token.parent.kind === 249) {
             return true;
         }
         return false;
@@ -51158,17 +52250,17 @@ var ts;
     }
     ts.getNodeModifiers = getNodeModifiers;
     function getTypeArgumentOrTypeParameterList(node) {
-        if (node.kind === 156 || node.kind === 175) {
+        if (node.kind === 157 || node.kind === 179) {
             return node.typeArguments;
         }
-        if (ts.isFunctionLike(node) || node.kind === 222 || node.kind === 223) {
+        if (ts.isFunctionLike(node) || node.kind === 226 || node.kind === 227) {
             return node.typeParameters;
         }
         return undefined;
     }
     ts.getTypeArgumentOrTypeParameterList = getTypeArgumentOrTypeParameterList;
     function isToken(n) {
-        return n.kind >= 0 && n.kind <= 139;
+        return n.kind >= 0 && n.kind <= 140;
     }
     ts.isToken = isToken;
     function isWord(kind) {
@@ -51227,18 +52319,18 @@ var ts;
     }
     ts.compareDataObjects = compareDataObjects;
     function isArrayLiteralOrObjectLiteralDestructuringPattern(node) {
-        if (node.kind === 171 ||
-            node.kind === 172) {
-            if (node.parent.kind === 188 &&
+        if (node.kind === 175 ||
+            node.kind === 176) {
+            if (node.parent.kind === 192 &&
                 node.parent.left === node &&
                 node.parent.operatorToken.kind === 57) {
                 return true;
             }
-            if (node.parent.kind === 209 &&
+            if (node.parent.kind === 213 &&
                 node.parent.initializer === node) {
                 return true;
             }
-            if (isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.kind === 253 ? node.parent.parent : node.parent)) {
+            if (isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.kind === 257 ? node.parent.parent : node.parent)) {
                 return true;
             }
         }
@@ -51269,7 +52361,7 @@ var ts;
 })(ts || (ts = {}));
 (function (ts) {
     function isFirstDeclarationOfSymbolParameter(symbol) {
-        return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === 143;
+        return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === 144;
     }
     ts.isFirstDeclarationOfSymbolParameter = isFirstDeclarationOfSymbolParameter;
     var displayPartWriter = getDisplayPartWriter();
@@ -51291,8 +52383,8 @@ var ts;
             increaseIndent: function () { indent++; },
             decreaseIndent: function () { indent--; },
             clear: resetWriter,
-            trackSymbol: function () { },
-            reportInaccessibleThisError: function () { }
+            trackSymbol: ts.noop,
+            reportInaccessibleThisError: ts.noop
         };
         function writeIndent() {
             if (lineStart) {
@@ -51444,7 +52536,7 @@ var ts;
             return location.getText();
         }
         else if (ts.isStringOrNumericLiteral(location.kind) &&
-            location.parent.kind === 141) {
+            location.parent.kind === 142) {
             return location.text;
         }
         var localExportDefaultSymbol = ts.getLocalSymbolForExportDefault(symbol);
@@ -51454,7 +52546,7 @@ var ts;
     ts.getDeclaredName = getDeclaredName;
     function isImportOrExportSpecifierName(location) {
         return location.parent &&
-            (location.parent.kind === 235 || location.parent.kind === 239) &&
+            (location.parent.kind === 239 || location.parent.kind === 243) &&
             location.parent.propertyName === location;
     }
     ts.isImportOrExportSpecifierName = isImportOrExportSpecifierName;
@@ -51559,89 +52651,89 @@ var ts;
             function spanInNode(node) {
                 if (node) {
                     switch (node.kind) {
-                        case 201:
+                        case 205:
                             return spanInVariableDeclaration(node.declarationList.declarations[0]);
-                        case 219:
-                        case 146:
-                        case 145:
-                            return spanInVariableDeclaration(node);
-                        case 143:
-                            return spanInParameterDeclaration(node);
-                        case 221:
-                        case 148:
+                        case 223:
                         case 147:
-                        case 150:
-                        case 151:
+                        case 146:
+                            return spanInVariableDeclaration(node);
+                        case 144:
+                            return spanInParameterDeclaration(node);
+                        case 225:
                         case 149:
-                        case 180:
-                        case 181:
+                        case 148:
+                        case 151:
+                        case 152:
+                        case 150:
+                        case 184:
+                        case 185:
                             return spanInFunctionDeclaration(node);
-                        case 200:
+                        case 204:
                             if (ts.isFunctionBlock(node)) {
                                 return spanInFunctionBlock(node);
                             }
-                        case 227:
+                        case 231:
                             return spanInBlock(node);
-                        case 252:
+                        case 256:
                             return spanInBlock(node.block);
-                        case 203:
-                            return textSpan(node.expression);
-                        case 212:
-                            return textSpan(node.getChildAt(0), node.expression);
-                        case 206:
-                            return textSpanEndingAtNextToken(node, node.expression);
-                        case 205:
-                            return spanInNode(node.statement);
-                        case 218:
-                            return textSpan(node.getChildAt(0));
-                        case 204:
-                            return textSpanEndingAtNextToken(node, node.expression);
-                        case 215:
-                            return spanInNode(node.statement);
-                        case 211:
-                        case 210:
-                            return textSpan(node.getChildAt(0), node.label);
                         case 207:
-                            return spanInForStatement(node);
-                        case 208:
+                            return textSpan(node.expression);
+                        case 216:
+                            return textSpan(node.getChildAt(0), node.expression);
+                        case 210:
                             return textSpanEndingAtNextToken(node, node.expression);
                         case 209:
-                            return spanInInitializerOfForLike(node);
-                        case 214:
+                            return spanInNode(node.statement);
+                        case 222:
+                            return textSpan(node.getChildAt(0));
+                        case 208:
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 249:
-                        case 250:
+                        case 219:
+                            return spanInNode(node.statement);
+                        case 215:
+                        case 214:
+                            return textSpan(node.getChildAt(0), node.label);
+                        case 211:
+                            return spanInForStatement(node);
+                        case 212:
+                            return textSpanEndingAtNextToken(node, node.expression);
+                        case 213:
+                            return spanInInitializerOfForLike(node);
+                        case 218:
+                            return textSpanEndingAtNextToken(node, node.expression);
+                        case 253:
+                        case 254:
                             return spanInNode(node.statements[0]);
-                        case 217:
+                        case 221:
                             return spanInBlock(node.tryBlock);
-                        case 216:
+                        case 220:
                             return textSpan(node, node.expression);
-                        case 236:
+                        case 240:
                             return textSpan(node, node.expression);
-                        case 230:
+                        case 234:
                             return textSpan(node, node.moduleReference);
-                        case 231:
+                        case 235:
                             return textSpan(node, node.moduleSpecifier);
-                        case 237:
+                        case 241:
                             return textSpan(node, node.moduleSpecifier);
-                        case 226:
+                        case 230:
                             if (ts.getModuleInstanceState(node) !== 1) {
                                 return undefined;
                             }
-                        case 222:
-                        case 225:
-                        case 255:
-                        case 170:
+                        case 226:
+                        case 229:
+                        case 260:
+                        case 174:
                             return textSpan(node);
-                        case 213:
+                        case 217:
                             return spanInNode(node.statement);
-                        case 144:
+                        case 145:
                             return spanInNodeArray(node.parent.decorators);
-                        case 168:
-                        case 169:
+                        case 172:
+                        case 173:
                             return spanInBindingPattern(node);
-                        case 223:
-                        case 224:
+                        case 227:
+                        case 228:
                             return undefined;
                         case 24:
                         case 1:
@@ -51669,20 +52761,20 @@ var ts;
                         case 73:
                         case 86:
                             return spanInNextNode(node);
-                        case 139:
+                        case 140:
                             return spanInOfKeyword(node);
                         default:
                             if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node)) {
                                 return spanInArrayLiteralOrObjectLiteralDestructuringPattern(node);
                             }
                             if ((node.kind === 70 ||
-                                node.kind == 192 ||
-                                node.kind === 253 ||
-                                node.kind === 254) &&
+                                node.kind == 196 ||
+                                node.kind === 257 ||
+                                node.kind === 258) &&
                                 ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent)) {
                                 return textSpan(node);
                             }
-                            if (node.kind === 188) {
+                            if (node.kind === 192) {
                                 var binaryExpression = node;
                                 if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(binaryExpression.left)) {
                                     return spanInArrayLiteralOrObjectLiteralDestructuringPattern(binaryExpression.left);
@@ -51697,38 +52789,38 @@ var ts;
                             }
                             if (ts.isPartOfExpression(node)) {
                                 switch (node.parent.kind) {
-                                    case 205:
-                                        return spanInPreviousNode(node);
-                                    case 144:
-                                        return spanInNode(node.parent);
-                                    case 207:
                                     case 209:
+                                        return spanInPreviousNode(node);
+                                    case 145:
+                                        return spanInNode(node.parent);
+                                    case 211:
+                                    case 213:
                                         return textSpan(node);
-                                    case 188:
+                                    case 192:
                                         if (node.parent.operatorToken.kind === 25) {
                                             return textSpan(node);
                                         }
                                         break;
-                                    case 181:
+                                    case 185:
                                         if (node.parent.body === node) {
                                             return textSpan(node);
                                         }
                                         break;
                                 }
                             }
-                            if (node.parent.kind === 253 &&
+                            if (node.parent.kind === 257 &&
                                 node.parent.name === node &&
                                 !ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.parent)) {
                                 return spanInNode(node.parent.initializer);
                             }
-                            if (node.parent.kind === 178 && node.parent.type === node) {
+                            if (node.parent.kind === 182 && node.parent.type === node) {
                                 return spanInNextNode(node.parent.type);
                             }
                             if (ts.isFunctionLike(node.parent) && node.parent.type === node) {
                                 return spanInPreviousNode(node);
                             }
-                            if ((node.parent.kind === 219 ||
-                                node.parent.kind === 143)) {
+                            if ((node.parent.kind === 223 ||
+                                node.parent.kind === 144)) {
                                 var paramOrVarDecl = node.parent;
                                 if (paramOrVarDecl.initializer === node ||
                                     paramOrVarDecl.type === node ||
@@ -51736,7 +52828,7 @@ var ts;
                                     return spanInPreviousNode(node);
                                 }
                             }
-                            if (node.parent.kind === 188) {
+                            if (node.parent.kind === 192) {
                                 var binaryExpression = node.parent;
                                 if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(binaryExpression.left) &&
                                     (binaryExpression.right === node ||
@@ -51757,7 +52849,7 @@ var ts;
                     }
                 }
                 function spanInVariableDeclaration(variableDeclaration) {
-                    if (variableDeclaration.parent.parent.kind === 208) {
+                    if (variableDeclaration.parent.parent.kind === 212) {
                         return spanInNode(variableDeclaration.parent.parent);
                     }
                     if (ts.isBindingPattern(variableDeclaration.name)) {
@@ -51765,7 +52857,7 @@ var ts;
                     }
                     if (variableDeclaration.initializer ||
                         ts.hasModifier(variableDeclaration, 1) ||
-                        variableDeclaration.parent.parent.kind === 209) {
+                        variableDeclaration.parent.parent.kind === 213) {
                         return textSpanFromVariableDeclaration(variableDeclaration);
                     }
                     var declarations = variableDeclaration.parent.declarations;
@@ -51797,7 +52889,7 @@ var ts;
                 }
                 function canFunctionHaveSpanInWholeDeclaration(functionDeclaration) {
                     return ts.hasModifier(functionDeclaration, 1) ||
-                        (functionDeclaration.parent.kind === 222 && functionDeclaration.kind !== 149);
+                        (functionDeclaration.parent.kind === 226 && functionDeclaration.kind !== 150);
                 }
                 function spanInFunctionDeclaration(functionDeclaration) {
                     if (!functionDeclaration.body) {
@@ -51817,22 +52909,22 @@ var ts;
                 }
                 function spanInBlock(block) {
                     switch (block.parent.kind) {
-                        case 226:
+                        case 230:
                             if (ts.getModuleInstanceState(block.parent) !== 1) {
                                 return undefined;
                             }
-                        case 206:
-                        case 204:
+                        case 210:
                         case 208:
+                        case 212:
                             return spanInNodeIfStartsOnSameLine(block.parent, block.statements[0]);
-                        case 207:
-                        case 209:
+                        case 211:
+                        case 213:
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(block.pos, sourceFile, block.parent), block.statements[0]);
                     }
                     return spanInNode(block.statements[0]);
                 }
                 function spanInInitializerOfForLike(forLikeStatement) {
-                    if (forLikeStatement.initializer.kind === 220) {
+                    if (forLikeStatement.initializer.kind === 224) {
                         var variableDeclarationList = forLikeStatement.initializer;
                         if (variableDeclarationList.declarations.length > 0) {
                             return spanInNode(variableDeclarationList.declarations[0]);
@@ -51854,62 +52946,62 @@ var ts;
                     }
                 }
                 function spanInBindingPattern(bindingPattern) {
-                    var firstBindingElement = ts.forEach(bindingPattern.elements, function (element) { return element.kind !== 194 ? element : undefined; });
+                    var firstBindingElement = ts.forEach(bindingPattern.elements, function (element) { return element.kind !== 198 ? element : undefined; });
                     if (firstBindingElement) {
                         return spanInNode(firstBindingElement);
                     }
-                    if (bindingPattern.parent.kind === 170) {
+                    if (bindingPattern.parent.kind === 174) {
                         return textSpan(bindingPattern.parent);
                     }
                     return textSpanFromVariableDeclaration(bindingPattern.parent);
                 }
                 function spanInArrayLiteralOrObjectLiteralDestructuringPattern(node) {
-                    ts.Debug.assert(node.kind !== 169 && node.kind !== 168);
-                    var elements = node.kind === 171 ?
+                    ts.Debug.assert(node.kind !== 173 && node.kind !== 172);
+                    var elements = node.kind === 175 ?
                         node.elements :
                         node.properties;
-                    var firstBindingElement = ts.forEach(elements, function (element) { return element.kind !== 194 ? element : undefined; });
+                    var firstBindingElement = ts.forEach(elements, function (element) { return element.kind !== 198 ? element : undefined; });
                     if (firstBindingElement) {
                         return spanInNode(firstBindingElement);
                     }
-                    return textSpan(node.parent.kind === 188 ? node.parent : node);
+                    return textSpan(node.parent.kind === 192 ? node.parent : node);
                 }
                 function spanInOpenBraceToken(node) {
                     switch (node.parent.kind) {
-                        case 225:
+                        case 229:
                             var enumDeclaration = node.parent;
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), enumDeclaration.members.length ? enumDeclaration.members[0] : enumDeclaration.getLastToken(sourceFile));
-                        case 222:
+                        case 226:
                             var classDeclaration = node.parent;
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), classDeclaration.members.length ? classDeclaration.members[0] : classDeclaration.getLastToken(sourceFile));
-                        case 228:
+                        case 232:
                             return spanInNodeIfStartsOnSameLine(node.parent.parent, node.parent.clauses[0]);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInCloseBraceToken(node) {
                     switch (node.parent.kind) {
-                        case 227:
+                        case 231:
                             if (ts.getModuleInstanceState(node.parent.parent) !== 1) {
                                 return undefined;
                             }
-                        case 225:
-                        case 222:
+                        case 229:
+                        case 226:
                             return textSpan(node);
-                        case 200:
+                        case 204:
                             if (ts.isFunctionBlock(node.parent)) {
                                 return textSpan(node);
                             }
-                        case 252:
+                        case 256:
                             return spanInNode(ts.lastOrUndefined(node.parent.statements));
-                        case 228:
+                        case 232:
                             var caseBlock = node.parent;
                             var lastClause = ts.lastOrUndefined(caseBlock.clauses);
                             if (lastClause) {
                                 return spanInNode(ts.lastOrUndefined(lastClause.statements));
                             }
                             return undefined;
-                        case 168:
+                        case 172:
                             var bindingPattern = node.parent;
                             return spanInNode(ts.lastOrUndefined(bindingPattern.elements) || bindingPattern);
                         default:
@@ -51922,7 +53014,7 @@ var ts;
                 }
                 function spanInCloseBracketToken(node) {
                     switch (node.parent.kind) {
-                        case 169:
+                        case 173:
                             var bindingPattern = node.parent;
                             return textSpan(ts.lastOrUndefined(bindingPattern.elements) || bindingPattern);
                         default:
@@ -51934,33 +53026,33 @@ var ts;
                     }
                 }
                 function spanInOpenParenToken(node) {
-                    if (node.parent.kind === 205 ||
-                        node.parent.kind === 175 ||
-                        node.parent.kind === 176) {
+                    if (node.parent.kind === 209 ||
+                        node.parent.kind === 179 ||
+                        node.parent.kind === 180) {
                         return spanInPreviousNode(node);
                     }
-                    if (node.parent.kind === 179) {
+                    if (node.parent.kind === 183) {
                         return spanInNextNode(node);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInCloseParenToken(node) {
                     switch (node.parent.kind) {
-                        case 180:
-                        case 221:
-                        case 181:
-                        case 148:
-                        case 147:
-                        case 150:
-                        case 151:
+                        case 184:
+                        case 225:
+                        case 185:
                         case 149:
-                        case 206:
-                        case 205:
-                        case 207:
+                        case 148:
+                        case 151:
+                        case 152:
+                        case 150:
+                        case 210:
                         case 209:
-                        case 175:
-                        case 176:
+                        case 211:
+                        case 213:
                         case 179:
+                        case 180:
+                        case 183:
                             return spanInPreviousNode(node);
                         default:
                             return spanInNode(node.parent);
@@ -51968,26 +53060,26 @@ var ts;
                 }
                 function spanInColonToken(node) {
                     if (ts.isFunctionLike(node.parent) ||
-                        node.parent.kind === 253 ||
-                        node.parent.kind === 143) {
+                        node.parent.kind === 257 ||
+                        node.parent.kind === 144) {
                         return spanInPreviousNode(node);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInGreaterThanOrLessThanToken(node) {
-                    if (node.parent.kind === 178) {
+                    if (node.parent.kind === 182) {
                         return spanInNextNode(node);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInWhileKeyword(node) {
-                    if (node.parent.kind === 205) {
+                    if (node.parent.kind === 209) {
                         return textSpanEndingAtNextToken(node, node.parent.expression);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInOfKeyword(node) {
-                    if (node.parent.kind === 209) {
+                    if (node.parent.kind === 213) {
                         return spanInNextNode(node);
                     }
                     return spanInNode(node.parent);
@@ -52000,7 +53092,7 @@ var ts;
 var ts;
 (function (ts) {
     function createClassifier() {
-        var scanner = ts.createScanner(4, false);
+        var scanner = ts.createScanner(5, false);
         var noRegexTable = [];
         noRegexTable[70] = true;
         noRegexTable[9] = true;
@@ -52018,7 +53110,7 @@ var ts;
         function canFollow(keyword1, keyword2) {
             if (ts.isAccessibilityModifier(keyword1)) {
                 if (keyword2 === 124 ||
-                    keyword2 === 132 ||
+                    keyword2 === 133 ||
                     keyword2 === 122 ||
                     keyword2 === 114) {
                     return true;
@@ -52134,10 +53226,10 @@ var ts;
                         angleBracketStack--;
                     }
                     else if (token === 118 ||
-                        token === 133 ||
-                        token === 131 ||
+                        token === 134 ||
+                        token === 132 ||
                         token === 121 ||
-                        token === 134) {
+                        token === 135) {
                         if (angleBracketStack > 0 && !syntacticClassifierAbsent) {
                             token = 70;
                         }
@@ -52292,7 +53384,7 @@ var ts;
             }
         }
         function isKeyword(token) {
-            return token >= 71 && token <= 139;
+            return token >= 71 && token <= 140;
         }
         function classFromKind(token) {
             if (isKeyword(token)) {
@@ -52338,10 +53430,10 @@ var ts;
     ts.getSemanticClassifications = getSemanticClassifications;
     function checkForClassificationCancellation(cancellationToken, kind) {
         switch (kind) {
+            case 230:
             case 226:
-            case 222:
-            case 223:
-            case 221:
+            case 227:
+            case 225:
                 cancellationToken.throwIfCancellationRequested();
         }
     }
@@ -52385,7 +53477,7 @@ var ts;
             return undefined;
             function hasValueSideModule(symbol) {
                 return ts.forEach(symbol.declarations, function (declaration) {
-                    return declaration.kind === 226 &&
+                    return declaration.kind === 230 &&
                         ts.getModuleInstanceState(declaration) === 1;
                 });
             }
@@ -52457,8 +53549,8 @@ var ts;
     function getEncodedSyntacticClassifications(cancellationToken, sourceFile, span) {
         var spanStart = span.start;
         var spanLength = span.length;
-        var triviaScanner = ts.createScanner(4, false, sourceFile.languageVariant, sourceFile.text);
-        var mergeConflictScanner = ts.createScanner(4, false, sourceFile.languageVariant, sourceFile.text);
+        var triviaScanner = ts.createScanner(5, false, sourceFile.languageVariant, sourceFile.text);
+        var mergeConflictScanner = ts.createScanner(5, false, sourceFile.languageVariant, sourceFile.text);
         var result = [];
         processElement(sourceFile);
         return { spans: result, endOfLineState: 0 };
@@ -52526,16 +53618,16 @@ var ts;
                     pushClassification(tag.tagName.pos, tag.tagName.end - tag.tagName.pos, 18);
                     pos = tag.tagName.end;
                     switch (tag.kind) {
-                        case 275:
+                        case 280:
                             processJSDocParameterTag(tag);
                             break;
-                        case 278:
+                        case 283:
                             processJSDocTemplateTag(tag);
                             break;
-                        case 277:
+                        case 282:
                             processElement(tag.typeExpression);
                             break;
-                        case 276:
+                        case 281:
                             processElement(tag.typeExpression);
                             break;
                     }
@@ -52616,22 +53708,22 @@ var ts;
         }
         function tryClassifyJsxElementName(token) {
             switch (token.parent && token.parent.kind) {
-                case 244:
+                case 248:
                     if (token.parent.tagName === token) {
                         return 19;
                     }
                     break;
-                case 245:
+                case 249:
                     if (token.parent.tagName === token) {
                         return 20;
                     }
                     break;
-                case 243:
+                case 247:
                     if (token.parent.tagName === token) {
                         return 21;
                     }
                     break;
-                case 246:
+                case 250:
                     if (token.parent.name === token) {
                         return 22;
                     }
@@ -52651,17 +53743,17 @@ var ts;
             if (ts.isPunctuation(tokenKind)) {
                 if (token) {
                     if (tokenKind === 57) {
-                        if (token.parent.kind === 219 ||
-                            token.parent.kind === 146 ||
-                            token.parent.kind === 143 ||
-                            token.parent.kind === 246) {
+                        if (token.parent.kind === 223 ||
+                            token.parent.kind === 147 ||
+                            token.parent.kind === 144 ||
+                            token.parent.kind === 250) {
                             return 5;
                         }
                     }
-                    if (token.parent.kind === 188 ||
-                        token.parent.kind === 186 ||
-                        token.parent.kind === 187 ||
-                        token.parent.kind === 189) {
+                    if (token.parent.kind === 192 ||
+                        token.parent.kind === 190 ||
+                        token.parent.kind === 191 ||
+                        token.parent.kind === 193) {
                         return 5;
                     }
                 }
@@ -52671,7 +53763,7 @@ var ts;
                 return 4;
             }
             else if (tokenKind === 9) {
-                return token.parent.kind === 246 ? 24 : 6;
+                return token.parent.kind === 250 ? 24 : 6;
             }
             else if (tokenKind === 11) {
                 return 6;
@@ -52685,32 +53777,32 @@ var ts;
             else if (tokenKind === 70) {
                 if (token) {
                     switch (token.parent.kind) {
-                        case 222:
+                        case 226:
                             if (token.parent.name === token) {
                                 return 11;
                             }
                             return;
-                        case 142:
+                        case 143:
                             if (token.parent.name === token) {
                                 return 15;
                             }
                             return;
-                        case 223:
+                        case 227:
                             if (token.parent.name === token) {
                                 return 13;
                             }
                             return;
-                        case 225:
+                        case 229:
                             if (token.parent.name === token) {
                                 return 12;
                             }
                             return;
-                        case 226:
+                        case 230:
                             if (token.parent.name === token) {
                                 return 14;
                             }
                             return;
-                        case 143:
+                        case 144:
                             if (token.parent.name === token) {
                                 return ts.isThisIdentifier(token) ? 3 : 17;
                             }
@@ -52765,7 +53857,7 @@ var ts;
             else {
                 if (!symbols || symbols.length === 0) {
                     if (sourceFile.languageVariant === 1 &&
-                        location.parent && location.parent.kind === 245) {
+                        location.parent && location.parent.kind === 249) {
                         var tagName = location.parent.parent.openingElement.tagName;
                         entries.push({
                             name: tagName.text,
@@ -52787,13 +53879,13 @@ var ts;
             function getJavaScriptCompletionEntries(sourceFile, position, uniqueNames) {
                 var entries = [];
                 var nameTable = ts.getNameTable(sourceFile);
-                for (var name_46 in nameTable) {
-                    if (nameTable[name_46] === position) {
+                for (var name_43 in nameTable) {
+                    if (nameTable[name_43] === position) {
                         continue;
                     }
-                    if (!uniqueNames[name_46]) {
-                        uniqueNames[name_46] = name_46;
-                        var displayName = getCompletionEntryDisplayName(ts.unescapeIdentifier(name_46), compilerOptions.target, true);
+                    if (!uniqueNames[name_43]) {
+                        uniqueNames[name_43] = name_43;
+                        var displayName = getCompletionEntryDisplayName(ts.unescapeIdentifier(name_43), compilerOptions.target, true);
                         if (displayName) {
                             var entry = {
                                 name: displayName,
@@ -52843,15 +53935,15 @@ var ts;
                 if (!node || node.kind !== 9) {
                     return undefined;
                 }
-                if (node.parent.kind === 253 &&
-                    node.parent.parent.kind === 172 &&
+                if (node.parent.kind === 257 &&
+                    node.parent.parent.kind === 176 &&
                     node.parent.name === node) {
                     return getStringLiteralCompletionEntriesFromPropertyAssignment(node.parent);
                 }
                 else if (ts.isElementAccessExpression(node.parent) && node.parent.argumentExpression === node) {
                     return getStringLiteralCompletionEntriesFromElementAccess(node.parent);
                 }
-                else if (node.parent.kind === 231 || ts.isExpressionOfExternalModuleImportEqualsDeclaration(node) || ts.isRequireCall(node.parent, false)) {
+                else if (node.parent.kind === 235 || ts.isExpressionOfExternalModuleImportEqualsDeclaration(node) || ts.isRequireCall(node.parent, false)) {
                     return getStringLiteralCompletionEntriesFromModuleNames(node);
                 }
                 else {
@@ -52914,7 +54006,7 @@ var ts;
                 if (!type) {
                     return;
                 }
-                if (type.flags & 524288) {
+                if (type.flags & 65536) {
                     ts.forEach(type.types, function (t) { return addStringLiteralCompletionsFromType(t, result); });
                 }
                 else {
@@ -53215,11 +54307,11 @@ var ts;
                     if (currentConfigPath) {
                         paths.push(currentConfigPath);
                         currentDir = ts.getDirectoryPath(currentConfigPath);
-                        var parent_16 = ts.getDirectoryPath(currentDir);
-                        if (currentDir === parent_16) {
+                        var parent_14 = ts.getDirectoryPath(currentDir);
+                        if (currentDir === parent_14) {
                             break;
                         }
-                        currentDir = parent_16;
+                        currentDir = parent_14;
                     }
                     else {
                         break;
@@ -53351,9 +54443,9 @@ var ts;
                         isJsDocTagName = true;
                     }
                     switch (tag.kind) {
-                        case 277:
-                        case 275:
-                        case 276:
+                        case 282:
+                        case 280:
+                        case 281:
                             var tagWithExpression = tag;
                             if (tagWithExpression.typeExpression) {
                                 insideJsDocTagExpression = tagWithExpression.typeExpression.pos < position && position < tagWithExpression.typeExpression.end;
@@ -53388,13 +54480,13 @@ var ts;
                     log("Returning an empty list because completion was requested in an invalid position.");
                     return undefined;
                 }
-                var parent_17 = contextToken.parent, kind = contextToken.kind;
+                var parent_15 = contextToken.parent, kind = contextToken.kind;
                 if (kind === 22) {
-                    if (parent_17.kind === 173) {
+                    if (parent_15.kind === 177) {
                         node = contextToken.parent.expression;
                         isRightOfDot = true;
                     }
-                    else if (parent_17.kind === 140) {
+                    else if (parent_15.kind === 141) {
                         node = contextToken.parent.left;
                         isRightOfDot = true;
                     }
@@ -53407,7 +54499,7 @@ var ts;
                         isRightOfOpenTag = true;
                         location = contextToken;
                     }
-                    else if (kind === 40 && contextToken.parent.kind === 245) {
+                    else if (kind === 40 && contextToken.parent.kind === 249) {
                         isStartingCloseTag = true;
                         location = contextToken;
                     }
@@ -53452,7 +54544,7 @@ var ts;
                 isGlobalCompletion = false;
                 isMemberCompletion = true;
                 isNewIdentifierLocation = false;
-                if (node.kind === 70 || node.kind === 140 || node.kind === 173) {
+                if (node.kind === 70 || node.kind === 141 || node.kind === 177) {
                     var symbol = typeChecker.getSymbolAtLocation(node);
                     if (symbol && symbol.flags & 8388608) {
                         symbol = typeChecker.getAliasedSymbol(symbol);
@@ -53477,7 +54569,7 @@ var ts;
                             symbols.push(symbol);
                         }
                     }
-                    if (isJavaScriptFile && type.flags & 524288) {
+                    if (isJavaScriptFile && type.flags & 65536) {
                         var unionType = type;
                         for (var _b = 0, _c = unionType.types; _b < _c.length; _b++) {
                             var elementType = _c[_b];
@@ -53498,7 +54590,7 @@ var ts;
                 }
                 if (jsxContainer = tryGetContainingJsxElement(contextToken)) {
                     var attrsType = void 0;
-                    if ((jsxContainer.kind === 243) || (jsxContainer.kind === 244)) {
+                    if ((jsxContainer.kind === 247) || (jsxContainer.kind === 248)) {
                         attrsType = typeChecker.getJsxElementAttributesType(jsxContainer);
                         if (attrsType) {
                             symbols = filterJsxAttributes(typeChecker.getPropertiesOfType(attrsType), jsxContainer.attributes);
@@ -53519,9 +54611,9 @@ var ts;
                 var scopeNode = getScopeNode(contextToken, adjustedPosition, sourceFile) || sourceFile;
                 if (scopeNode) {
                     isGlobalCompletion =
-                        scopeNode.kind === 256 ||
-                            scopeNode.kind === 190 ||
-                            scopeNode.kind === 248 ||
+                        scopeNode.kind === 261 ||
+                            scopeNode.kind === 194 ||
+                            scopeNode.kind === 252 ||
                             ts.isStatement(scopeNode);
                 }
                 var symbolMeanings = 793064 | 107455 | 1920 | 8388608;
@@ -53549,11 +54641,11 @@ var ts;
                     return true;
                 }
                 if (contextToken.kind === 28 && contextToken.parent) {
-                    if (contextToken.parent.kind === 244) {
+                    if (contextToken.parent.kind === 248) {
                         return true;
                     }
-                    if (contextToken.parent.kind === 245 || contextToken.parent.kind === 243) {
-                        return contextToken.parent.parent && contextToken.parent.parent.kind === 242;
+                    if (contextToken.parent.kind === 249 || contextToken.parent.kind === 247) {
+                        return contextToken.parent.parent && contextToken.parent.parent.kind === 246;
                     }
                 }
                 return false;
@@ -53563,40 +54655,40 @@ var ts;
                     var containingNodeKind = previousToken.parent.kind;
                     switch (previousToken.kind) {
                         case 25:
-                            return containingNodeKind === 175
-                                || containingNodeKind === 149
-                                || containingNodeKind === 176
-                                || containingNodeKind === 171
-                                || containingNodeKind === 188
-                                || containingNodeKind === 157;
+                            return containingNodeKind === 179
+                                || containingNodeKind === 150
+                                || containingNodeKind === 180
+                                || containingNodeKind === 175
+                                || containingNodeKind === 192
+                                || containingNodeKind === 158;
                         case 18:
-                            return containingNodeKind === 175
-                                || containingNodeKind === 149
-                                || containingNodeKind === 176
-                                || containingNodeKind === 179
-                                || containingNodeKind === 165;
+                            return containingNodeKind === 179
+                                || containingNodeKind === 150
+                                || containingNodeKind === 180
+                                || containingNodeKind === 183
+                                || containingNodeKind === 166;
                         case 20:
-                            return containingNodeKind === 171
-                                || containingNodeKind === 154
-                                || containingNodeKind === 141;
-                        case 126:
+                            return containingNodeKind === 175
+                                || containingNodeKind === 155
+                                || containingNodeKind === 142;
                         case 127:
+                        case 128:
                             return true;
                         case 22:
-                            return containingNodeKind === 226;
+                            return containingNodeKind === 230;
                         case 16:
-                            return containingNodeKind === 222;
+                            return containingNodeKind === 226;
                         case 57:
-                            return containingNodeKind === 219
-                                || containingNodeKind === 188;
+                            return containingNodeKind === 223
+                                || containingNodeKind === 192;
                         case 13:
-                            return containingNodeKind === 190;
+                            return containingNodeKind === 194;
                         case 14:
-                            return containingNodeKind === 198;
+                            return containingNodeKind === 202;
                         case 113:
                         case 111:
                         case 112:
-                            return containingNodeKind === 146;
+                            return containingNodeKind === 147;
                     }
                     switch (previousToken.getText()) {
                         case "public":
@@ -53627,22 +54719,22 @@ var ts;
                 isMemberCompletion = true;
                 var typeForObject;
                 var existingMembers;
-                if (objectLikeContainer.kind === 172) {
+                if (objectLikeContainer.kind === 176) {
                     isNewIdentifierLocation = true;
                     typeForObject = typeChecker.getContextualType(objectLikeContainer);
                     typeForObject = typeForObject && typeForObject.getNonNullableType();
                     existingMembers = objectLikeContainer.properties;
                 }
-                else if (objectLikeContainer.kind === 168) {
+                else if (objectLikeContainer.kind === 172) {
                     isNewIdentifierLocation = false;
                     var rootDeclaration = ts.getRootDeclaration(objectLikeContainer.parent);
                     if (ts.isVariableLike(rootDeclaration)) {
                         var canGetType = !!(rootDeclaration.initializer || rootDeclaration.type);
-                        if (!canGetType && rootDeclaration.kind === 143) {
+                        if (!canGetType && rootDeclaration.kind === 144) {
                             if (ts.isExpression(rootDeclaration.parent)) {
                                 canGetType = !!typeChecker.getContextualType(rootDeclaration.parent);
                             }
-                            else if (rootDeclaration.parent.kind === 148 || rootDeclaration.parent.kind === 151) {
+                            else if (rootDeclaration.parent.kind === 149 || rootDeclaration.parent.kind === 152) {
                                 canGetType = ts.isExpression(rootDeclaration.parent.parent) && !!typeChecker.getContextualType(rootDeclaration.parent.parent);
                             }
                         }
@@ -53668,9 +54760,9 @@ var ts;
                 return true;
             }
             function tryGetImportOrExportClauseCompletionSymbols(namedImportsOrExports) {
-                var declarationKind = namedImportsOrExports.kind === 234 ?
-                    231 :
-                    237;
+                var declarationKind = namedImportsOrExports.kind === 238 ?
+                    235 :
+                    241;
                 var importOrExportDeclaration = ts.getAncestor(namedImportsOrExports, declarationKind);
                 var moduleSpecifier = importOrExportDeclaration.moduleSpecifier;
                 if (!moduleSpecifier) {
@@ -53691,9 +54783,9 @@ var ts;
                     switch (contextToken.kind) {
                         case 16:
                         case 25:
-                            var parent_18 = contextToken.parent;
-                            if (parent_18 && (parent_18.kind === 172 || parent_18.kind === 168)) {
-                                return parent_18;
+                            var parent_16 = contextToken.parent;
+                            if (parent_16 && (parent_16.kind === 176 || parent_16.kind === 172)) {
+                                return parent_16;
                             }
                             break;
                     }
@@ -53706,8 +54798,8 @@ var ts;
                         case 16:
                         case 25:
                             switch (contextToken.parent.kind) {
-                                case 234:
                                 case 238:
+                                case 242:
                                     return contextToken.parent;
                             }
                     }
@@ -53716,34 +54808,34 @@ var ts;
             }
             function tryGetContainingJsxElement(contextToken) {
                 if (contextToken) {
-                    var parent_19 = contextToken.parent;
+                    var parent_17 = contextToken.parent;
                     switch (contextToken.kind) {
                         case 27:
                         case 40:
                         case 70:
-                        case 246:
-                        case 247:
-                            if (parent_19 && (parent_19.kind === 243 || parent_19.kind === 244)) {
-                                return parent_19;
+                        case 250:
+                        case 251:
+                            if (parent_17 && (parent_17.kind === 247 || parent_17.kind === 248)) {
+                                return parent_17;
                             }
-                            else if (parent_19.kind === 246) {
-                                return parent_19.parent;
+                            else if (parent_17.kind === 250) {
+                                return parent_17.parent;
                             }
                             break;
                         case 9:
-                            if (parent_19 && ((parent_19.kind === 246) || (parent_19.kind === 247))) {
-                                return parent_19.parent;
+                            if (parent_17 && ((parent_17.kind === 250) || (parent_17.kind === 251))) {
+                                return parent_17.parent;
                             }
                             break;
                         case 17:
-                            if (parent_19 &&
-                                parent_19.kind === 248 &&
-                                parent_19.parent &&
-                                (parent_19.parent.kind === 246)) {
-                                return parent_19.parent.parent;
+                            if (parent_17 &&
+                                parent_17.kind === 252 &&
+                                parent_17.parent &&
+                                (parent_17.parent.kind === 250)) {
+                                return parent_17.parent.parent;
                             }
-                            if (parent_19 && parent_19.kind === 247) {
-                                return parent_19.parent;
+                            if (parent_17 && parent_17.kind === 251) {
+                                return parent_17.parent;
                             }
                             break;
                     }
@@ -53752,16 +54844,16 @@ var ts;
             }
             function isFunction(kind) {
                 switch (kind) {
-                    case 180:
-                    case 181:
-                    case 221:
+                    case 184:
+                    case 185:
+                    case 225:
+                    case 149:
                     case 148:
-                    case 147:
-                    case 150:
                     case 151:
                     case 152:
                     case 153:
                     case 154:
+                    case 155:
                         return true;
                 }
                 return false;
@@ -53770,66 +54862,66 @@ var ts;
                 var containingNodeKind = contextToken.parent.kind;
                 switch (contextToken.kind) {
                     case 25:
-                        return containingNodeKind === 219 ||
-                            containingNodeKind === 220 ||
-                            containingNodeKind === 201 ||
-                            containingNodeKind === 225 ||
+                        return containingNodeKind === 223 ||
+                            containingNodeKind === 224 ||
+                            containingNodeKind === 205 ||
+                            containingNodeKind === 229 ||
                             isFunction(containingNodeKind) ||
-                            containingNodeKind === 222 ||
-                            containingNodeKind === 193 ||
-                            containingNodeKind === 223 ||
-                            containingNodeKind === 169 ||
-                            containingNodeKind === 224;
+                            containingNodeKind === 226 ||
+                            containingNodeKind === 197 ||
+                            containingNodeKind === 227 ||
+                            containingNodeKind === 173 ||
+                            containingNodeKind === 228;
                     case 22:
-                        return containingNodeKind === 169;
+                        return containingNodeKind === 173;
                     case 55:
-                        return containingNodeKind === 170;
+                        return containingNodeKind === 174;
                     case 20:
-                        return containingNodeKind === 169;
+                        return containingNodeKind === 173;
                     case 18:
-                        return containingNodeKind === 252 ||
+                        return containingNodeKind === 256 ||
                             isFunction(containingNodeKind);
                     case 16:
-                        return containingNodeKind === 225 ||
-                            containingNodeKind === 223 ||
-                            containingNodeKind === 160;
+                        return containingNodeKind === 229 ||
+                            containingNodeKind === 227 ||
+                            containingNodeKind === 161;
                     case 24:
-                        return containingNodeKind === 145 &&
+                        return containingNodeKind === 146 &&
                             contextToken.parent && contextToken.parent.parent &&
-                            (contextToken.parent.parent.kind === 223 ||
-                                contextToken.parent.parent.kind === 160);
+                            (contextToken.parent.parent.kind === 227 ||
+                                contextToken.parent.parent.kind === 161);
                     case 26:
-                        return containingNodeKind === 222 ||
-                            containingNodeKind === 193 ||
-                            containingNodeKind === 223 ||
-                            containingNodeKind === 224 ||
+                        return containingNodeKind === 226 ||
+                            containingNodeKind === 197 ||
+                            containingNodeKind === 227 ||
+                            containingNodeKind === 228 ||
                             isFunction(containingNodeKind);
                     case 114:
-                        return containingNodeKind === 146;
+                        return containingNodeKind === 147;
                     case 23:
-                        return containingNodeKind === 143 ||
+                        return containingNodeKind === 144 ||
                             (contextToken.parent && contextToken.parent.parent &&
-                                contextToken.parent.parent.kind === 169);
+                                contextToken.parent.parent.kind === 173);
                     case 113:
                     case 111:
                     case 112:
-                        return containingNodeKind === 143;
+                        return containingNodeKind === 144;
                     case 117:
-                        return containingNodeKind === 235 ||
-                            containingNodeKind === 239 ||
-                            containingNodeKind === 233;
+                        return containingNodeKind === 239 ||
+                            containingNodeKind === 243 ||
+                            containingNodeKind === 237;
                     case 74:
                     case 82:
                     case 108:
                     case 88:
                     case 103:
                     case 124:
-                    case 132:
+                    case 133:
                     case 90:
                     case 109:
                     case 75:
                     case 115:
-                    case 135:
+                    case 136:
                         return true;
                 }
                 switch (contextToken.getText()) {
@@ -53866,8 +54958,8 @@ var ts;
                     if (element.getStart() <= position && position <= element.getEnd()) {
                         continue;
                     }
-                    var name_47 = element.propertyName || element.name;
-                    existingImportsOrExports[name_47.text] = true;
+                    var name_44 = element.propertyName || element.name;
+                    existingImportsOrExports[name_44.text] = true;
                 }
                 if (!ts.someProperties(existingImportsOrExports)) {
                     return ts.filter(exportsOfModule, function (e) { return e.name !== "default"; });
@@ -53881,17 +54973,19 @@ var ts;
                 var existingMemberNames = ts.createMap();
                 for (var _i = 0, existingMembers_1 = existingMembers; _i < existingMembers_1.length; _i++) {
                     var m = existingMembers_1[_i];
-                    if (m.kind !== 253 &&
-                        m.kind !== 254 &&
-                        m.kind !== 170 &&
-                        m.kind !== 148) {
+                    if (m.kind !== 257 &&
+                        m.kind !== 258 &&
+                        m.kind !== 174 &&
+                        m.kind !== 149 &&
+                        m.kind !== 151 &&
+                        m.kind !== 152) {
                         continue;
                     }
                     if (m.getStart() <= position && position <= m.getEnd()) {
                         continue;
                     }
                     var existingName = void 0;
-                    if (m.kind === 170 && m.propertyName) {
+                    if (m.kind === 174 && m.propertyName) {
                         if (m.propertyName.kind === 70) {
                             existingName = m.propertyName.text;
                         }
@@ -53910,7 +55004,7 @@ var ts;
                     if (attr.getStart() <= position && position <= attr.getEnd()) {
                         continue;
                     }
-                    if (attr.kind === 246) {
+                    if (attr.kind === 250) {
                         seenNames[attr.name.text] = true;
                     }
                 }
@@ -53943,7 +55037,7 @@ var ts;
             return name;
         }
         var keywordCompletions = [];
-        for (var i = 71; i <= 139; i++) {
+        for (var i = 71; i <= 140; i++) {
             keywordCompletions.push({
                 name: ts.tokenToString(i),
                 kind: ts.ScriptElementKind.keyword,
@@ -54007,7 +55101,7 @@ var ts;
             function getSemanticDocumentHighlights(node) {
                 if (node.kind === 70 ||
                     node.kind === 98 ||
-                    node.kind === 166 ||
+                    node.kind === 167 ||
                     node.kind === 96 ||
                     node.kind === 9 ||
                     ts.isLiteralNameOfPropertyDeclarationOrIndexAccess(node)) {
@@ -54059,75 +55153,75 @@ var ts;
                         switch (node.kind) {
                             case 89:
                             case 81:
-                                if (hasKind(node.parent, 204)) {
+                                if (hasKind(node.parent, 208)) {
                                     return getIfElseOccurrences(node.parent);
                                 }
                                 break;
                             case 95:
-                                if (hasKind(node.parent, 212)) {
+                                if (hasKind(node.parent, 216)) {
                                     return getReturnOccurrences(node.parent);
                                 }
                                 break;
                             case 99:
-                                if (hasKind(node.parent, 216)) {
+                                if (hasKind(node.parent, 220)) {
                                     return getThrowOccurrences(node.parent);
                                 }
                                 break;
                             case 73:
-                                if (hasKind(parent(parent(node)), 217)) {
+                                if (hasKind(parent(parent(node)), 221)) {
                                     return getTryCatchFinallyOccurrences(node.parent.parent);
                                 }
                                 break;
                             case 101:
                             case 86:
-                                if (hasKind(parent(node), 217)) {
+                                if (hasKind(parent(node), 221)) {
                                     return getTryCatchFinallyOccurrences(node.parent);
                                 }
                                 break;
                             case 97:
-                                if (hasKind(node.parent, 214)) {
+                                if (hasKind(node.parent, 218)) {
                                     return getSwitchCaseDefaultOccurrences(node.parent);
                                 }
                                 break;
                             case 72:
                             case 78:
-                                if (hasKind(parent(parent(parent(node))), 214)) {
+                                if (hasKind(parent(parent(parent(node))), 218)) {
                                     return getSwitchCaseDefaultOccurrences(node.parent.parent.parent);
                                 }
                                 break;
                             case 71:
                             case 76:
-                                if (hasKind(node.parent, 211) || hasKind(node.parent, 210)) {
+                                if (hasKind(node.parent, 215) || hasKind(node.parent, 214)) {
                                     return getBreakOrContinueStatementOccurrences(node.parent);
                                 }
                                 break;
                             case 87:
-                                if (hasKind(node.parent, 207) ||
-                                    hasKind(node.parent, 208) ||
-                                    hasKind(node.parent, 209)) {
+                                if (hasKind(node.parent, 211) ||
+                                    hasKind(node.parent, 212) ||
+                                    hasKind(node.parent, 213)) {
                                     return getLoopBreakContinueOccurrences(node.parent);
                                 }
                                 break;
                             case 105:
                             case 80:
-                                if (hasKind(node.parent, 206) || hasKind(node.parent, 205)) {
+                                if (hasKind(node.parent, 210) || hasKind(node.parent, 209)) {
                                     return getLoopBreakContinueOccurrences(node.parent);
                                 }
                                 break;
                             case 122:
-                                if (hasKind(node.parent, 149)) {
+                                if (hasKind(node.parent, 150)) {
                                     return getConstructorOccurrences(node.parent);
                                 }
                                 break;
                             case 124:
-                            case 132:
-                                if (hasKind(node.parent, 150) || hasKind(node.parent, 151)) {
+                            case 133:
+                                if (hasKind(node.parent, 151) || hasKind(node.parent, 152)) {
                                     return getGetAndSetOccurrences(node.parent);
                                 }
                                 break;
                             default:
                                 if (ts.isModifierKind(node.kind) && node.parent &&
-                                    (ts.isDeclaration(node.parent) || node.parent.kind === 201)) {
+                                    (ts.isDeclaration(node.parent) || node.parent.kind === 205)) {
                                     return getModifierOccurrences(node.kind, node.parent);
                                 }
                         }
@@ -54139,10 +55233,10 @@ var ts;
                     aggregate(node);
                     return statementAccumulator;
                     function aggregate(node) {
-                        if (node.kind === 216) {
+                        if (node.kind === 220) {
                             statementAccumulator.push(node);
                         }
-                        else if (node.kind === 217) {
+                        else if (node.kind === 221) {
                             var tryStatement = node;
                             if (tryStatement.catchClause) {
                                 aggregate(tryStatement.catchClause);
@@ -54162,17 +55256,17 @@ var ts;
                 function getThrowStatementOwner(throwStatement) {
                     var child = throwStatement;
                     while (child.parent) {
-                        var parent_20 = child.parent;
-                        if (ts.isFunctionBlock(parent_20) || parent_20.kind === 256) {
-                            return parent_20;
+                        var parent_18 = child.parent;
+                        if (ts.isFunctionBlock(parent_18) || parent_18.kind === 261) {
+                            return parent_18;
                         }
-                        if (parent_20.kind === 217) {
-                            var tryStatement = parent_20;
+                        if (parent_18.kind === 221) {
+                            var tryStatement = parent_18;
                             if (tryStatement.tryBlock === child && tryStatement.catchClause) {
                                 return child;
                             }
                         }
-                        child = parent_20;
+                        child = parent_18;
                     }
                     return undefined;
                 }
@@ -54181,7 +55275,7 @@ var ts;
                     aggregate(node);
                     return statementAccumulator;
                     function aggregate(node) {
-                        if (node.kind === 211 || node.kind === 210) {
+                        if (node.kind === 215 || node.kind === 214) {
                             statementAccumulator.push(node);
                         }
                         else if (!ts.isFunctionLike(node)) {
@@ -54196,15 +55290,15 @@ var ts;
                 function getBreakOrContinueOwner(statement) {
                     for (var node_1 = statement.parent; node_1; node_1 = node_1.parent) {
                         switch (node_1.kind) {
-                            case 214:
-                                if (statement.kind === 210) {
+                            case 218:
+                                if (statement.kind === 214) {
                                     continue;
                                 }
-                            case 207:
-                            case 208:
+                            case 211:
+                            case 212:
+                            case 213:
+                            case 210:
                             case 209:
-                            case 206:
-                            case 205:
                                 if (!statement.label || isLabeledBy(node_1, statement.label.text)) {
                                     return node_1;
                                 }
@@ -54221,24 +55315,24 @@ var ts;
                 function getModifierOccurrences(modifier, declaration) {
                     var container = declaration.parent;
                     if (ts.isAccessibilityModifier(modifier)) {
-                        if (!(container.kind === 222 ||
-                            container.kind === 193 ||
-                            (declaration.kind === 143 && hasKind(container, 149)))) {
+                        if (!(container.kind === 226 ||
+                            container.kind === 197 ||
+                            (declaration.kind === 144 && hasKind(container, 150)))) {
                             return undefined;
                         }
                     }
                     else if (modifier === 114) {
-                        if (!(container.kind === 222 || container.kind === 193)) {
+                        if (!(container.kind === 226 || container.kind === 197)) {
                             return undefined;
                         }
                     }
                     else if (modifier === 83 || modifier === 123) {
-                        if (!(container.kind === 227 || container.kind === 256)) {
+                        if (!(container.kind === 231 || container.kind === 261)) {
                             return undefined;
                         }
                     }
                     else if (modifier === 116) {
-                        if (!(container.kind === 222 || declaration.kind === 222)) {
+                        if (!(container.kind === 226 || declaration.kind === 226)) {
                             return undefined;
                         }
                     }
@@ -54249,8 +55343,8 @@ var ts;
                     var modifierFlag = getFlagFromModifier(modifier);
                     var nodes;
                     switch (container.kind) {
-                        case 227:
-                        case 256:
+                        case 231:
+                        case 261:
                             if (modifierFlag & 128) {
                                 nodes = declaration.members.concat(declaration);
                             }
@@ -54258,15 +55352,15 @@ var ts;
                                 nodes = container.statements;
                             }
                             break;
-                        case 149:
+                        case 150:
                             nodes = container.parameters.concat(container.parent.members);
                             break;
-                        case 222:
-                        case 193:
+                        case 226:
+                        case 197:
                             nodes = container.members;
                             if (modifierFlag & 28) {
                                 var constructor = ts.forEach(container.members, function (member) {
-                                    return member.kind === 149 && member;
+                                    return member.kind === 150 && member;
                                 });
                                 if (constructor) {
                                     nodes = nodes.concat(constructor.parameters);
@@ -54319,13 +55413,13 @@ var ts;
                 }
                 function getGetAndSetOccurrences(accessorDeclaration) {
                     var keywords = [];
-                    tryPushAccessorKeyword(accessorDeclaration.symbol, 150);
                     tryPushAccessorKeyword(accessorDeclaration.symbol, 151);
+                    tryPushAccessorKeyword(accessorDeclaration.symbol, 152);
                     return ts.map(keywords, getHighlightSpanForNode);
                     function tryPushAccessorKeyword(accessorSymbol, accessorKind) {
                         var accessor = ts.getDeclarationOfKind(accessorSymbol, accessorKind);
                         if (accessor) {
-                            ts.forEach(accessor.getChildren(), function (child) { return pushKeywordIf(keywords, child, 124, 132); });
+                            ts.forEach(accessor.getChildren(), function (child) { return pushKeywordIf(keywords, child, 124, 133); });
                         }
                     }
                 }
@@ -54342,7 +55436,7 @@ var ts;
                 function getLoopBreakContinueOccurrences(loopNode) {
                     var keywords = [];
                     if (pushKeywordIf(keywords, loopNode.getFirstToken(), 87, 105, 80)) {
-                        if (loopNode.kind === 205) {
+                        if (loopNode.kind === 209) {
                             var loopTokens = loopNode.getChildren();
                             for (var i = loopTokens.length - 1; i >= 0; i--) {
                                 if (pushKeywordIf(keywords, loopTokens[i], 105)) {
@@ -54363,13 +55457,13 @@ var ts;
                     var owner = getBreakOrContinueOwner(breakOrContinueStatement);
                     if (owner) {
                         switch (owner.kind) {
-                            case 207:
-                            case 208:
+                            case 211:
+                            case 212:
+                            case 213:
                             case 209:
-                            case 205:
-                            case 206:
+                            case 210:
                                 return getLoopBreakContinueOccurrences(owner);
-                            case 214:
+                            case 218:
                                 return getSwitchCaseDefaultOccurrences(owner);
                         }
                     }
@@ -54419,7 +55513,7 @@ var ts;
                 }
                 function getReturnOccurrences(returnStatement) {
                     var func = ts.getContainingFunction(returnStatement);
-                    if (!(func && hasKind(func.body, 200))) {
+                    if (!(func && hasKind(func.body, 204))) {
                         return undefined;
                     }
                     var keywords = [];
@@ -54433,7 +55527,7 @@ var ts;
                 }
                 function getIfElseOccurrences(ifStatement) {
                     var keywords = [];
-                    while (hasKind(ifStatement.parent, 204) && ifStatement.parent.elseStatement === ifStatement) {
+                    while (hasKind(ifStatement.parent, 208) && ifStatement.parent.elseStatement === ifStatement) {
                         ifStatement = ifStatement.parent;
                     }
                     while (ifStatement) {
@@ -54444,7 +55538,7 @@ var ts;
                                 break;
                             }
                         }
-                        if (!hasKind(ifStatement.elseStatement, 204)) {
+                        if (!hasKind(ifStatement.elseStatement, 208)) {
                             break;
                         }
                         ifStatement = ifStatement.elseStatement;
@@ -54479,7 +55573,7 @@ var ts;
         }
         DocumentHighlights.getDocumentHighlights = getDocumentHighlights;
         function isLabeledBy(node, labelName) {
-            for (var owner = node.parent; owner.kind === 215; owner = owner.parent) {
+            for (var owner = node.parent; owner.kind === 219; owner = owner.parent) {
                 if (owner.label.text === labelName) {
                     return true;
                 }
@@ -54683,16 +55777,16 @@ var ts;
             }
             function getAliasSymbolForPropertyNameSymbol(symbol, location) {
                 if (symbol.flags & 8388608) {
-                    var defaultImport = ts.getDeclarationOfKind(symbol, 232);
+                    var defaultImport = ts.getDeclarationOfKind(symbol, 236);
                     if (defaultImport) {
                         return typeChecker.getAliasedSymbol(symbol);
                     }
-                    var importOrExportSpecifier = ts.forEach(symbol.declarations, function (declaration) { return (declaration.kind === 235 ||
-                        declaration.kind === 239) ? declaration : undefined; });
+                    var importOrExportSpecifier = ts.forEach(symbol.declarations, function (declaration) { return (declaration.kind === 239 ||
+                        declaration.kind === 243) ? declaration : undefined; });
                     if (importOrExportSpecifier &&
                         (!importOrExportSpecifier.propertyName ||
                             importOrExportSpecifier.propertyName === location)) {
-                        return importOrExportSpecifier.kind === 235 ?
+                        return importOrExportSpecifier.kind === 239 ?
                             typeChecker.getAliasedSymbol(symbol) :
                             typeChecker.getExportSpecifierLocalTargetSymbol(importOrExportSpecifier);
                     }
@@ -54707,14 +55801,14 @@ var ts;
                     typeChecker.getPropertySymbolOfDestructuringAssignment(location);
             }
             function isObjectBindingPatternElementWithoutPropertyName(symbol) {
-                var bindingElement = ts.getDeclarationOfKind(symbol, 170);
+                var bindingElement = ts.getDeclarationOfKind(symbol, 174);
                 return bindingElement &&
-                    bindingElement.parent.kind === 168 &&
+                    bindingElement.parent.kind === 172 &&
                     !bindingElement.propertyName;
             }
             function getPropertySymbolOfObjectBindingPatternWithoutPropertyName(symbol) {
                 if (isObjectBindingPatternElementWithoutPropertyName(symbol)) {
-                    var bindingElement = ts.getDeclarationOfKind(symbol, 170);
+                    var bindingElement = ts.getDeclarationOfKind(symbol, 174);
                     var typeOfPattern = typeChecker.getTypeAtLocation(bindingElement.parent);
                     return typeOfPattern && typeChecker.getPropertyOfType(typeOfPattern, bindingElement.name.text);
                 }
@@ -54730,13 +55824,13 @@ var ts;
             }
             function getSymbolScope(symbol) {
                 var valueDeclaration = symbol.valueDeclaration;
-                if (valueDeclaration && (valueDeclaration.kind === 180 || valueDeclaration.kind === 193)) {
+                if (valueDeclaration && (valueDeclaration.kind === 184 || valueDeclaration.kind === 197)) {
                     return valueDeclaration;
                 }
                 if (symbol.flags & (4 | 8192)) {
                     var privateDeclaration = ts.forEach(symbol.getDeclarations(), function (d) { return (ts.getModifierFlags(d) & 8) ? d : undefined; });
                     if (privateDeclaration) {
-                        return ts.getAncestor(privateDeclaration, 222);
+                        return ts.getAncestor(privateDeclaration, 226);
                     }
                 }
                 if (symbol.flags & 8388608) {
@@ -54760,7 +55854,7 @@ var ts;
                         if (scope && scope !== container) {
                             return undefined;
                         }
-                        if (container.kind === 256 && !ts.isExternalModule(container)) {
+                        if (container.kind === 261 && !ts.isExternalModule(container)) {
                             return undefined;
                         }
                         scope = container;
@@ -54782,8 +55876,8 @@ var ts;
                     if (position > end)
                         break;
                     var endPosition = position + symbolNameLength;
-                    if ((position === 0 || !ts.isIdentifierPart(text.charCodeAt(position - 1), 4)) &&
-                        (endPosition === sourceLength || !ts.isIdentifierPart(text.charCodeAt(endPosition), 4))) {
+                    if ((position === 0 || !ts.isIdentifierPart(text.charCodeAt(position - 1), 5)) &&
+                        (endPosition === sourceLength || !ts.isIdentifierPart(text.charCodeAt(endPosition), 5))) {
                         positions.push(position);
                     }
                     position = text.indexOf(symbolName, position + symbolNameLength + 1);
@@ -54893,7 +55987,7 @@ var ts;
                                 if (localParentType.symbol && localParentType.symbol.flags & (32 | 64) && localParentType.symbol !== searchSymbol.parent) {
                                     return [localParentType.symbol];
                                 }
-                                else if (localParentType.flags & 1572864) {
+                                else if (localParentType.flags & 196608) {
                                     return getSymbolsForClassAndInterfaceComponents(localParentType);
                                 }
                             }
@@ -54927,14 +56021,14 @@ var ts;
                     var result = [];
                     for (var _i = 0, _a = classSymbol.members["__constructor"].declarations; _i < _a.length; _i++) {
                         var decl = _a[_i];
-                        ts.Debug.assert(decl.kind === 149);
+                        ts.Debug.assert(decl.kind === 150);
                         var ctrKeyword = decl.getChildAt(0);
                         ts.Debug.assert(ctrKeyword.kind === 122);
                         result.push(ctrKeyword);
                     }
                     ts.forEachProperty(classSymbol.exports, function (member) {
                         var decl = member.valueDeclaration;
-                        if (decl && decl.kind === 148) {
+                        if (decl && decl.kind === 149) {
                             var body = decl.body;
                             if (body) {
                                 forEachDescendantOfKind(body, 98, function (thisKeyword) {
@@ -54956,7 +56050,7 @@ var ts;
                     var result = [];
                     for (var _i = 0, _a = ctr.declarations; _i < _a.length; _i++) {
                         var decl = _a[_i];
-                        ts.Debug.assert(decl.kind === 149);
+                        ts.Debug.assert(decl.kind === 150);
                         var body = decl.body;
                         if (body) {
                             forEachDescendantOfKind(body, 96, function (node) {
@@ -54997,7 +56091,7 @@ var ts;
                     result.push(getReferenceEntryFromNode(refNode.parent));
                 }
                 else if (refNode.kind === 70) {
-                    if (refNode.parent.kind === 254) {
+                    if (refNode.parent.kind === 258) {
                         getReferenceEntriesForShorthandPropertyAssignment(refNode, typeChecker, result);
                     }
                     var containingClass = getContainingClassIfInHeritageClause(refNode);
@@ -55007,24 +56101,24 @@ var ts;
                     }
                     var containingTypeReference = getContainingTypeReference(refNode);
                     if (containingTypeReference) {
-                        var parent_21 = containingTypeReference.parent;
-                        if (ts.isVariableLike(parent_21) && parent_21.type === containingTypeReference && parent_21.initializer && isImplementationExpression(parent_21.initializer)) {
-                            maybeAdd(getReferenceEntryFromNode(parent_21.initializer));
+                        var parent_19 = containingTypeReference.parent;
+                        if (ts.isVariableLike(parent_19) && parent_19.type === containingTypeReference && parent_19.initializer && isImplementationExpression(parent_19.initializer)) {
+                            maybeAdd(getReferenceEntryFromNode(parent_19.initializer));
                         }
-                        else if (ts.isFunctionLike(parent_21) && parent_21.type === containingTypeReference && parent_21.body) {
-                            if (parent_21.body.kind === 200) {
-                                ts.forEachReturnStatement(parent_21.body, function (returnStatement) {
+                        else if (ts.isFunctionLike(parent_19) && parent_19.type === containingTypeReference && parent_19.body) {
+                            if (parent_19.body.kind === 204) {
+                                ts.forEachReturnStatement(parent_19.body, function (returnStatement) {
                                     if (returnStatement.expression && isImplementationExpression(returnStatement.expression)) {
                                         maybeAdd(getReferenceEntryFromNode(returnStatement.expression));
                                     }
                                 });
                             }
-                            else if (isImplementationExpression(parent_21.body)) {
-                                maybeAdd(getReferenceEntryFromNode(parent_21.body));
+                            else if (isImplementationExpression(parent_19.body)) {
+                                maybeAdd(getReferenceEntryFromNode(parent_19.body));
                             }
                         }
-                        else if (ts.isAssertionExpression(parent_21) && isImplementationExpression(parent_21.expression)) {
-                            maybeAdd(getReferenceEntryFromNode(parent_21.expression));
+                        else if (ts.isAssertionExpression(parent_19) && isImplementationExpression(parent_19.expression)) {
+                            maybeAdd(getReferenceEntryFromNode(parent_19.expression));
                         }
                     }
                 }
@@ -55041,7 +56135,7 @@ var ts;
                     if (componentType.symbol && componentType.symbol.getFlags() & (32 | 64)) {
                         result.push(componentType.symbol);
                     }
-                    if (componentType.getFlags() & 1572864) {
+                    if (componentType.getFlags() & 196608) {
                         getSymbolsForClassAndInterfaceComponents(componentType, result);
                     }
                 }
@@ -55059,26 +56153,26 @@ var ts;
             }
             function getContainingClassIfInHeritageClause(node) {
                 if (node && node.parent) {
-                    if (node.kind === 195
-                        && node.parent.kind === 251
+                    if (node.kind === 199
+                        && node.parent.kind === 255
                         && ts.isClassLike(node.parent.parent)) {
                         return node.parent.parent;
                     }
-                    else if (node.kind === 70 || node.kind === 173) {
+                    else if (node.kind === 70 || node.kind === 177) {
                         return getContainingClassIfInHeritageClause(node.parent);
                     }
                 }
                 return undefined;
             }
             function isImplementationExpression(node) {
-                if (node.kind === 179) {
+                if (node.kind === 183) {
                     return isImplementationExpression(node.expression);
                 }
-                return node.kind === 181 ||
-                    node.kind === 180 ||
-                    node.kind === 172 ||
-                    node.kind === 193 ||
-                    node.kind === 171;
+                return node.kind === 185 ||
+                    node.kind === 184 ||
+                    node.kind === 176 ||
+                    node.kind === 197 ||
+                    node.kind === 175;
             }
             function explicitlyInheritsFrom(child, parent, cachedResults) {
                 var parentIsInterface = parent.getFlags() & 64;
@@ -55107,7 +56201,7 @@ var ts;
                             }
                             return searchTypeReference(ts.getClassExtendsHeritageClauseElement(declaration));
                         }
-                        else if (declaration.kind === 223) {
+                        else if (declaration.kind === 227) {
                             if (parentIsInterface) {
                                 return ts.forEach(ts.getInterfaceBaseTypeNodes(declaration), searchTypeReference);
                             }
@@ -55134,13 +56228,13 @@ var ts;
                 }
                 var staticFlag = 32;
                 switch (searchSpaceNode.kind) {
-                    case 146:
-                    case 145:
-                    case 148:
                     case 147:
+                    case 146:
                     case 149:
+                    case 148:
                     case 150:
                     case 151:
+                    case 152:
                         staticFlag &= ts.getModifierFlags(searchSpaceNode);
                         searchSpaceNode = searchSpaceNode.parent;
                         break;
@@ -55168,32 +56262,32 @@ var ts;
                 var searchSpaceNode = ts.getThisContainer(thisOrSuperKeyword, false);
                 var staticFlag = 32;
                 switch (searchSpaceNode.kind) {
+                    case 149:
                     case 148:
-                    case 147:
                         if (ts.isObjectLiteralMethod(searchSpaceNode)) {
                             break;
                         }
+                    case 147:
                     case 146:
-                    case 145:
-                    case 149:
                     case 150:
                     case 151:
+                    case 152:
                         staticFlag &= ts.getModifierFlags(searchSpaceNode);
                         searchSpaceNode = searchSpaceNode.parent;
                         break;
-                    case 256:
+                    case 261:
                         if (ts.isExternalModule(searchSpaceNode)) {
                             return undefined;
                         }
-                    case 221:
-                    case 180:
+                    case 225:
+                    case 184:
                         break;
                     default:
                         return undefined;
                 }
                 var references = [];
                 var possiblePositions;
-                if (searchSpaceNode.kind === 256) {
+                if (searchSpaceNode.kind === 261) {
                     ts.forEach(sourceFiles, function (sourceFile) {
                         possiblePositions = getPossibleSymbolReferencePositions(sourceFile, "this", sourceFile.getStart(), sourceFile.getEnd());
                         getThisReferencesInFile(sourceFile, sourceFile, possiblePositions, references);
@@ -55227,26 +56321,26 @@ var ts;
                         }
                         var container = ts.getThisContainer(node, false);
                         switch (searchSpaceNode.kind) {
-                            case 180:
-                            case 221:
+                            case 184:
+                            case 225:
                                 if (searchSpaceNode.symbol === container.symbol) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
+                            case 149:
                             case 148:
-                            case 147:
                                 if (ts.isObjectLiteralMethod(searchSpaceNode) && searchSpaceNode.symbol === container.symbol) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
-                            case 193:
-                            case 222:
+                            case 197:
+                            case 226:
                                 if (container.parent && searchSpaceNode.symbol === container.parent.symbol && (ts.getModifierFlags(container) & 32) === staticFlag) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
-                            case 256:
-                                if (container.kind === 256 && !ts.isExternalModule(container)) {
+                            case 261:
+                                if (container.kind === 261 && !ts.isExternalModule(container)) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
@@ -55285,8 +56379,8 @@ var ts;
                         if (!node_2 || node_2.kind !== 9) {
                             return;
                         }
-                        var type_1 = ts.getStringLiteralTypeForNode(node_2, typeChecker);
-                        if (type_1 === searchType) {
+                        var type_2 = ts.getStringLiteralTypeForNode(node_2, typeChecker);
+                        if (type_2 === searchType) {
                             references.push(getReferenceEntryFromNode(node_2));
                         }
                     }
@@ -55295,7 +56389,7 @@ var ts;
             function populateSearchSymbolSet(symbol, location) {
                 var result = [symbol];
                 var containingObjectLiteralElement = getContainingObjectLiteralElement(location);
-                if (containingObjectLiteralElement && containingObjectLiteralElement.kind !== 254) {
+                if (containingObjectLiteralElement && containingObjectLiteralElement.kind !== 258) {
                     var propertySymbol = getPropertySymbolOfDestructuringAssignment(location);
                     if (propertySymbol) {
                         result.push(propertySymbol);
@@ -55314,7 +56408,7 @@ var ts;
                         result.push(shorthandValueSymbol);
                     }
                 }
-                if (symbol.valueDeclaration && symbol.valueDeclaration.kind === 143 &&
+                if (symbol.valueDeclaration && symbol.valueDeclaration.kind === 144 &&
                     ts.isParameterPropertyDeclaration(symbol.valueDeclaration)) {
                     result = result.concat(typeChecker.getSymbolsOfParameterPropertyDeclaration(symbol.valueDeclaration, symbol.name));
                 }
@@ -55345,7 +56439,7 @@ var ts;
                             getPropertySymbolFromTypeReference(ts.getClassExtendsHeritageClauseElement(declaration));
                             ts.forEach(ts.getClassImplementsHeritageClauseElements(declaration), getPropertySymbolFromTypeReference);
                         }
-                        else if (declaration.kind === 223) {
+                        else if (declaration.kind === 227) {
                             ts.forEach(ts.getInterfaceBaseTypeNodes(declaration), getPropertySymbolFromTypeReference);
                         }
                     });
@@ -55408,7 +56502,7 @@ var ts;
                 });
             }
             function getNameFromObjectLiteralElement(node) {
-                if (node.name.kind === 141) {
+                if (node.name.kind === 142) {
                     var nameExpression = node.name.expression;
                     if (ts.isStringOrNumericLiteral(nameExpression.kind)) {
                         return nameExpression.text;
@@ -55427,7 +56521,7 @@ var ts;
                     if (symbol_2) {
                         result_4.push(symbol_2);
                     }
-                    if (contextualType.flags & 524288) {
+                    if (contextualType.flags & 65536) {
                         ts.forEach(contextualType.types, function (t) {
                             var symbol = t.getProperty(name);
                             if (symbol) {
@@ -55477,7 +56571,7 @@ var ts;
                 if (node.initializer) {
                     return true;
                 }
-                else if (node.kind === 219) {
+                else if (node.kind === 223) {
                     var parentStatement = getParentStatementOfVariableDeclaration(node);
                     return parentStatement && ts.hasModifier(parentStatement, 2);
                 }
@@ -55487,18 +56581,18 @@ var ts;
             }
             else {
                 switch (node.kind) {
-                    case 222:
-                    case 193:
-                    case 225:
                     case 226:
+                    case 197:
+                    case 229:
+                    case 230:
                         return true;
                 }
             }
             return false;
         }
         function getParentStatementOfVariableDeclaration(node) {
-            if (node.parent && node.parent.parent && node.parent.parent.kind === 201) {
-                ts.Debug.assert(node.parent.kind === 220);
+            if (node.parent && node.parent.parent && node.parent.parent.kind === 205) {
+                ts.Debug.assert(node.parent.kind === 224);
                 return node.parent.parent;
             }
         }
@@ -55536,10 +56630,10 @@ var ts;
             }
             var parent = node.parent;
             if (parent) {
-                if (parent.kind === 187 || parent.kind === 186) {
+                if (parent.kind === 191 || parent.kind === 190) {
                     return true;
                 }
-                else if (parent.kind === 188 && parent.left === node) {
+                else if (parent.kind === 192 && parent.left === node) {
                     var operator = parent.operatorToken.kind;
                     return 57 <= operator && operator <= 69;
                 }
@@ -55558,7 +56652,7 @@ var ts;
             switch (node.kind) {
                 case 9:
                 case 8:
-                    if (node.parent.kind === 141) {
+                    if (node.parent.kind === 142) {
                         return isObjectLiteralPropertyDeclaration(node.parent.parent) ? node.parent.parent : undefined;
                     }
                 case 70:
@@ -55568,11 +56662,11 @@ var ts;
         }
         function isObjectLiteralPropertyDeclaration(node) {
             switch (node.kind) {
-                case 253:
-                case 254:
-                case 148:
-                case 150:
+                case 257:
+                case 258:
+                case 149:
                 case 151:
+                case 152:
                     return true;
             }
             return false;
@@ -55631,11 +56725,11 @@ var ts;
                 var declaration = symbol.declarations[0];
                 if (node.kind === 70 &&
                     (node.parent === declaration ||
-                        (declaration.kind === 235 && declaration.parent && declaration.parent.kind === 234))) {
+                        (declaration.kind === 239 && declaration.parent && declaration.parent.kind === 238))) {
                     symbol = typeChecker.getAliasedSymbol(symbol);
                 }
             }
-            if (node.parent.kind === 254) {
+            if (node.parent.kind === 258) {
                 var shorthandSymbol = typeChecker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration);
                 if (!shorthandSymbol) {
                     return [];
@@ -55662,7 +56756,7 @@ var ts;
             if (!type) {
                 return undefined;
             }
-            if (type.flags & 524288 && !(type.flags & 16)) {
+            if (type.flags & 65536 && !(type.flags & 16)) {
                 var result_5 = [];
                 ts.forEach(type.types, function (t) {
                     if (t.symbol) {
@@ -55712,8 +56806,8 @@ var ts;
                 var declarations = [];
                 var definition;
                 ts.forEach(signatureDeclarations, function (d) {
-                    if ((selectConstructors && d.kind === 149) ||
-                        (!selectConstructors && (d.kind === 221 || d.kind === 148 || d.kind === 147))) {
+                    if ((selectConstructors && d.kind === 150) ||
+                        (!selectConstructors && (d.kind === 225 || d.kind === 149 || d.kind === 148))) {
                         declarations.push(d);
                         if (d.body)
                             definition = d;
@@ -55789,7 +56883,7 @@ var ts;
     var GoToImplementation;
     (function (GoToImplementation) {
         function getImplementationAtPosition(typeChecker, cancellationToken, sourceFiles, node) {
-            if (node.parent.kind === 254) {
+            if (node.parent.kind === 258) {
                 var result = [];
                 ts.FindAllReferences.getReferenceEntriesForShorthandPropertyAssignment(node, typeChecker, result);
                 return result.length > 0 ? result : undefined;
@@ -55914,16 +57008,16 @@ var ts;
             var commentOwner;
             findOwner: for (commentOwner = tokenAtPos; commentOwner; commentOwner = commentOwner.parent) {
                 switch (commentOwner.kind) {
-                    case 221:
-                    case 148:
+                    case 225:
                     case 149:
-                    case 222:
-                    case 201:
-                        break findOwner;
-                    case 256:
-                        return undefined;
+                    case 150:
                     case 226:
-                        if (commentOwner.parent.kind === 226) {
+                    case 205:
+                        break findOwner;
+                    case 261:
+                        return undefined;
+                    case 230:
+                        if (commentOwner.parent.kind === 230) {
                             return undefined;
                         }
                         break findOwner;
@@ -55957,7 +57051,7 @@ var ts;
             if (ts.isFunctionLike(commentOwner)) {
                 return commentOwner.parameters;
             }
-            if (commentOwner.kind === 201) {
+            if (commentOwner.kind === 205) {
                 var varStatement = commentOwner;
                 var varDeclarations = varStatement.declarationList.declarations;
                 if (varDeclarations.length === 1 && varDeclarations[0].initializer) {
@@ -55967,17 +57061,17 @@ var ts;
             return ts.emptyArray;
         }
         function getParametersFromRightHandSideOfAssignment(rightHandSide) {
-            while (rightHandSide.kind === 179) {
+            while (rightHandSide.kind === 183) {
                 rightHandSide = rightHandSide.expression;
             }
             switch (rightHandSide.kind) {
-                case 180:
-                case 181:
+                case 184:
+                case 185:
                     return rightHandSide.parameters;
-                case 193:
+                case 197:
                     for (var _i = 0, _a = rightHandSide.members; _i < _a.length; _i++) {
                         var member = _a[_i];
-                        if (member.kind === 149) {
+                        if (member.kind === 150) {
                             return member.parameters;
                         }
                     }
@@ -55988,147 +57082,6 @@ var ts;
     })(JsDoc = ts.JsDoc || (ts.JsDoc = {}));
 })(ts || (ts = {}));
 var ts;
-(function (ts) {
-    var JsTyping;
-    (function (JsTyping) {
-        ;
-        ;
-        var safeList;
-        var EmptySafeList = ts.createMap();
-        function discoverTypings(host, fileNames, projectRootPath, safeListPath, packageNameToTypingLocation, typingOptions) {
-            var inferredTypings = ts.createMap();
-            if (!typingOptions || !typingOptions.enableAutoDiscovery) {
-                return { cachedTypingPaths: [], newTypingNames: [], filesToWatch: [] };
-            }
-            fileNames = ts.filter(ts.map(fileNames, ts.normalizePath), function (f) {
-                var kind = ts.ensureScriptKind(f, ts.getScriptKindFromFileName(f));
-                return kind === 1 || kind === 2;
-            });
-            if (!safeList) {
-                var result = ts.readConfigFile(safeListPath, function (path) { return host.readFile(path); });
-                safeList = result.config ? ts.createMap(result.config) : EmptySafeList;
-            }
-            var filesToWatch = [];
-            var searchDirs = [];
-            var exclude = [];
-            mergeTypings(typingOptions.include);
-            exclude = typingOptions.exclude || [];
-            var possibleSearchDirs = ts.map(fileNames, ts.getDirectoryPath);
-            if (projectRootPath !== undefined) {
-                possibleSearchDirs.push(projectRootPath);
-            }
-            searchDirs = ts.deduplicate(possibleSearchDirs);
-            for (var _i = 0, searchDirs_1 = searchDirs; _i < searchDirs_1.length; _i++) {
-                var searchDir = searchDirs_1[_i];
-                var packageJsonPath = ts.combinePaths(searchDir, "package.json");
-                getTypingNamesFromJson(packageJsonPath, filesToWatch);
-                var bowerJsonPath = ts.combinePaths(searchDir, "bower.json");
-                getTypingNamesFromJson(bowerJsonPath, filesToWatch);
-                var nodeModulesPath = ts.combinePaths(searchDir, "node_modules");
-                getTypingNamesFromNodeModuleFolder(nodeModulesPath);
-            }
-            getTypingNamesFromSourceFileNames(fileNames);
-            for (var name_48 in packageNameToTypingLocation) {
-                if (name_48 in inferredTypings && !inferredTypings[name_48]) {
-                    inferredTypings[name_48] = packageNameToTypingLocation[name_48];
-                }
-            }
-            for (var _a = 0, exclude_1 = exclude; _a < exclude_1.length; _a++) {
-                var excludeTypingName = exclude_1[_a];
-                delete inferredTypings[excludeTypingName];
-            }
-            var newTypingNames = [];
-            var cachedTypingPaths = [];
-            for (var typing in inferredTypings) {
-                if (inferredTypings[typing] !== undefined) {
-                    cachedTypingPaths.push(inferredTypings[typing]);
-                }
-                else {
-                    newTypingNames.push(typing);
-                }
-            }
-            return { cachedTypingPaths: cachedTypingPaths, newTypingNames: newTypingNames, filesToWatch: filesToWatch };
-            function mergeTypings(typingNames) {
-                if (!typingNames) {
-                    return;
-                }
-                for (var _i = 0, typingNames_1 = typingNames; _i < typingNames_1.length; _i++) {
-                    var typing = typingNames_1[_i];
-                    if (!(typing in inferredTypings)) {
-                        inferredTypings[typing] = undefined;
-                    }
-                }
-            }
-            function getTypingNamesFromJson(jsonPath, filesToWatch) {
-                var result = ts.readConfigFile(jsonPath, function (path) { return host.readFile(path); });
-                if (result.config) {
-                    var jsonConfig = result.config;
-                    filesToWatch.push(jsonPath);
-                    if (jsonConfig.dependencies) {
-                        mergeTypings(ts.getOwnKeys(jsonConfig.dependencies));
-                    }
-                    if (jsonConfig.devDependencies) {
-                        mergeTypings(ts.getOwnKeys(jsonConfig.devDependencies));
-                    }
-                    if (jsonConfig.optionalDependencies) {
-                        mergeTypings(ts.getOwnKeys(jsonConfig.optionalDependencies));
-                    }
-                    if (jsonConfig.peerDependencies) {
-                        mergeTypings(ts.getOwnKeys(jsonConfig.peerDependencies));
-                    }
-                }
-            }
-            function getTypingNamesFromSourceFileNames(fileNames) {
-                var jsFileNames = ts.filter(fileNames, ts.hasJavaScriptFileExtension);
-                var inferredTypingNames = ts.map(jsFileNames, function (f) { return ts.removeFileExtension(ts.getBaseFileName(f.toLowerCase())); });
-                var cleanedTypingNames = ts.map(inferredTypingNames, function (f) { return f.replace(/((?:\.|-)min(?=\.|$))|((?:-|\.)\d+)/g, ""); });
-                if (safeList !== EmptySafeList) {
-                    mergeTypings(ts.filter(cleanedTypingNames, function (f) { return f in safeList; }));
-                }
-                var hasJsxFile = ts.forEach(fileNames, function (f) { return ts.ensureScriptKind(f, ts.getScriptKindFromFileName(f)) === 2; });
-                if (hasJsxFile) {
-                    mergeTypings(["react"]);
-                }
-            }
-            function getTypingNamesFromNodeModuleFolder(nodeModulesPath) {
-                if (!host.directoryExists(nodeModulesPath)) {
-                    return;
-                }
-                var typingNames = [];
-                var fileNames = host.readDirectory(nodeModulesPath, [".json"], undefined, undefined, 2);
-                for (var _i = 0, fileNames_2 = fileNames; _i < fileNames_2.length; _i++) {
-                    var fileName = fileNames_2[_i];
-                    var normalizedFileName = ts.normalizePath(fileName);
-                    if (ts.getBaseFileName(normalizedFileName) !== "package.json") {
-                        continue;
-                    }
-                    var result = ts.readConfigFile(normalizedFileName, function (path) { return host.readFile(path); });
-                    if (!result.config) {
-                        continue;
-                    }
-                    var packageJson = result.config;
-                    if (packageJson._requiredBy &&
-                        ts.filter(packageJson._requiredBy, function (r) { return r[0] === "#" || r === "/"; }).length === 0) {
-                        continue;
-                    }
-                    if (!packageJson.name) {
-                        continue;
-                    }
-                    if (packageJson.typings) {
-                        var absolutePath = ts.getNormalizedAbsolutePath(packageJson.typings, ts.getDirectoryPath(normalizedFileName));
-                        inferredTypings[packageJson.name] = absolutePath;
-                    }
-                    else {
-                        typingNames.push(packageJson.name);
-                    }
-                }
-                mergeTypings(typingNames);
-            }
-        }
-        JsTyping.discoverTypings = discoverTypings;
-    })(JsTyping = ts.JsTyping || (ts.JsTyping = {}));
-})(ts || (ts = {}));
-var ts;
 (function (ts) {
     var NavigateTo;
     (function (NavigateTo) {
@@ -56141,10 +57094,10 @@ var ts;
                     return;
                 }
                 var nameToDeclarations = sourceFile.getNamedDeclarations();
-                for (var name_49 in nameToDeclarations) {
-                    var declarations = nameToDeclarations[name_49];
+                for (var name_45 in nameToDeclarations) {
+                    var declarations = nameToDeclarations[name_45];
                     if (declarations) {
-                        var matches = patternMatcher.getMatchesForLastSegmentOfPattern(name_49);
+                        var matches = patternMatcher.getMatchesForLastSegmentOfPattern(name_45);
                         if (!matches) {
                             continue;
                         }
@@ -56155,21 +57108,21 @@ var ts;
                                 if (!containers) {
                                     return undefined;
                                 }
-                                matches = patternMatcher.getMatches(containers, name_49);
+                                matches = patternMatcher.getMatches(containers, name_45);
                                 if (!matches) {
                                     continue;
                                 }
                             }
                             var fileName = sourceFile.fileName;
                             var matchKind = bestMatchKind(matches);
-                            rawItems.push({ name: name_49, fileName: fileName, matchKind: matchKind, isCaseSensitive: allMatchesAreCaseSensitive(matches), declaration: declaration });
+                            rawItems.push({ name: name_45, fileName: fileName, matchKind: matchKind, isCaseSensitive: allMatchesAreCaseSensitive(matches), declaration: declaration });
                         }
                     }
                 }
             });
             rawItems = ts.filter(rawItems, function (item) {
                 var decl = item.declaration;
-                if (decl.kind === 232 || decl.kind === 235 || decl.kind === 230) {
+                if (decl.kind === 236 || decl.kind === 239 || decl.kind === 234) {
                     var importer = checker.getSymbolAtLocation(decl.name);
                     var imported = checker.getAliasedSymbol(importer);
                     return importer.name !== imported.name;
@@ -56210,7 +57163,7 @@ var ts;
                     if (text !== undefined) {
                         containers.unshift(text);
                     }
-                    else if (declaration.name.kind === 141) {
+                    else if (declaration.name.kind === 142) {
                         return tryAddComputedPropertyName(declaration.name.expression, containers, true);
                     }
                     else {
@@ -56227,7 +57180,7 @@ var ts;
                     }
                     return true;
                 }
-                if (expression.kind === 173) {
+                if (expression.kind === 177) {
                     var propertyAccess = expression;
                     if (includeLastPortion) {
                         containers.unshift(propertyAccess.name.text);
@@ -56238,7 +57191,7 @@ var ts;
             }
             function getContainers(declaration) {
                 var containers = [];
-                if (declaration.name.kind === 141) {
+                if (declaration.name.kind === 142) {
                     if (!tryAddComputedPropertyName(declaration.name.expression, containers, false)) {
                         return undefined;
                     }
@@ -56370,7 +57323,7 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 149:
+                case 150:
                     var ctr = node;
                     addNodeWithRecursiveChild(ctr, ctr.body);
                     for (var _i = 0, _a = ctr.parameters; _i < _a.length; _i++) {
@@ -56380,28 +57333,28 @@ var ts;
                         }
                     }
                     break;
-                case 148:
-                case 150:
+                case 149:
                 case 151:
-                case 147:
+                case 152:
+                case 148:
                     if (!ts.hasDynamicName(node)) {
                         addNodeWithRecursiveChild(node, node.body);
                     }
                     break;
+                case 147:
                 case 146:
-                case 145:
                     if (!ts.hasDynamicName(node)) {
                         addLeafNode(node);
                     }
                     break;
-                case 232:
+                case 236:
                     var importClause = node;
                     if (importClause.name) {
                         addLeafNode(importClause);
                     }
                     var namedBindings = importClause.namedBindings;
                     if (namedBindings) {
-                        if (namedBindings.kind === 233) {
+                        if (namedBindings.kind === 237) {
                             addLeafNode(namedBindings);
                         }
                         else {
@@ -56412,12 +57365,12 @@ var ts;
                         }
                     }
                     break;
-                case 170:
-                case 219:
+                case 174:
+                case 223:
                     var decl = node;
-                    var name_50 = decl.name;
-                    if (ts.isBindingPattern(name_50)) {
-                        addChildrenRecursively(name_50);
+                    var name_46 = decl.name;
+                    if (ts.isBindingPattern(name_46)) {
+                        addChildrenRecursively(name_46);
                     }
                     else if (decl.initializer && isFunctionOrClassExpression(decl.initializer)) {
                         addChildrenRecursively(decl.initializer);
@@ -56426,12 +57379,12 @@ var ts;
                         addNodeWithRecursiveChild(decl, decl.initializer);
                     }
                     break;
-                case 181:
-                case 221:
-                case 180:
+                case 185:
+                case 225:
+                case 184:
                     addNodeWithRecursiveChild(node, node.body);
                     break;
-                case 225:
+                case 229:
                     startNode(node);
                     for (var _d = 0, _e = node.members; _d < _e.length; _d++) {
                         var member = _e[_d];
@@ -56441,9 +57394,9 @@ var ts;
                     }
                     endNode();
                     break;
-                case 222:
-                case 193:
-                case 223:
+                case 226:
+                case 197:
+                case 227:
                     startNode(node);
                     for (var _f = 0, _g = node.members; _f < _g.length; _f++) {
                         var member = _g[_f];
@@ -56451,21 +57404,21 @@ var ts;
                     }
                     endNode();
                     break;
-                case 226:
+                case 230:
                     addNodeWithRecursiveChild(node, getInteriorModule(node).body);
                     break;
-                case 239:
-                case 230:
-                case 154:
-                case 152:
+                case 243:
+                case 234:
+                case 155:
                 case 153:
-                case 224:
+                case 154:
+                case 228:
                     addLeafNode(node);
                     break;
                 default:
                     ts.forEach(node.jsDocComments, function (jsDocComment) {
                         ts.forEach(jsDocComment.tags, function (tag) {
-                            if (tag.kind === 279) {
+                            if (tag.kind === 284) {
                                 addLeafNode(tag);
                             }
                         });
@@ -56513,12 +57466,12 @@ var ts;
                 }
             });
             function shouldReallyMerge(a, b) {
-                return a.kind === b.kind && (a.kind !== 226 || areSameModule(a, b));
+                return a.kind === b.kind && (a.kind !== 230 || areSameModule(a, b));
                 function areSameModule(a, b) {
                     if (a.body.kind !== b.body.kind) {
                         return false;
                     }
-                    if (a.body.kind !== 226) {
+                    if (a.body.kind !== 230) {
                         return true;
                     }
                     return areSameModule(a.body, b.body);
@@ -56569,7 +57522,7 @@ var ts;
             return a.length - b.length;
         };
         function tryGetName(node) {
-            if (node.kind === 226) {
+            if (node.kind === 230) {
                 return getModuleName(node);
             }
             var decl = node;
@@ -56577,18 +57530,18 @@ var ts;
                 return ts.getPropertyNameForPropertyNameNode(decl.name);
             }
             switch (node.kind) {
-                case 180:
-                case 181:
-                case 193:
+                case 184:
+                case 185:
+                case 197:
                     return getFunctionOrClassName(node);
-                case 279:
+                case 284:
                     return getJSDocTypedefTagName(node);
                 default:
                     return undefined;
             }
         }
         function getItemName(node) {
-            if (node.kind === 226) {
+            if (node.kind === 230) {
                 return getModuleName(node);
             }
             var name = node.name;
@@ -56599,29 +57552,29 @@ var ts;
                 }
             }
             switch (node.kind) {
-                case 256:
+                case 261:
                     var sourceFile = node;
                     return ts.isExternalModule(sourceFile)
                         ? "\"" + ts.escapeString(ts.getBaseFileName(ts.removeFileExtension(ts.normalizePath(sourceFile.fileName)))) + "\""
                         : "<global>";
-                case 181:
-                case 221:
-                case 180:
-                case 222:
-                case 193:
+                case 185:
+                case 225:
+                case 184:
+                case 226:
+                case 197:
                     if (ts.getModifierFlags(node) & 512) {
                         return "default";
                     }
                     return getFunctionOrClassName(node);
-                case 149:
+                case 150:
                     return "constructor";
-                case 153:
-                    return "new()";
-                case 152:
-                    return "()";
                 case 154:
+                    return "new()";
+                case 153:
+                    return "()";
+                case 155:
                     return "[]";
-                case 279:
+                case 284:
                     return getJSDocTypedefTagName(node);
                 default:
                     return "<unknown>";
@@ -56633,7 +57586,7 @@ var ts;
             }
             else {
                 var parentNode = node.parent && node.parent.parent;
-                if (parentNode && parentNode.kind === 201) {
+                if (parentNode && parentNode.kind === 205) {
                     if (parentNode.declarationList.declarations.length > 0) {
                         var nameIdentifier = parentNode.declarationList.declarations[0].name;
                         if (nameIdentifier.kind === 70) {
@@ -56661,24 +57614,24 @@ var ts;
             return topLevel;
             function isTopLevel(item) {
                 switch (navigationBarNodeKind(item)) {
-                    case 222:
-                    case 193:
-                    case 225:
-                    case 223:
                     case 226:
-                    case 256:
-                    case 224:
-                    case 279:
+                    case 197:
+                    case 229:
+                    case 227:
+                    case 230:
+                    case 261:
+                    case 228:
+                    case 284:
                         return true;
-                    case 149:
-                    case 148:
                     case 150:
+                    case 149:
                     case 151:
-                    case 219:
+                    case 152:
+                    case 223:
                         return hasSomeImportantChild(item);
-                    case 181:
-                    case 221:
-                    case 180:
+                    case 185:
+                    case 225:
+                    case 184:
                         return isTopLevelFunctionDeclaration(item);
                     default:
                         return false;
@@ -56688,10 +57641,10 @@ var ts;
                         return false;
                     }
                     switch (navigationBarNodeKind(item.parent)) {
-                        case 227:
-                        case 256:
-                        case 148:
+                        case 231:
+                        case 261:
                         case 149:
+                        case 150:
                             return true;
                         default:
                             return hasSomeImportantChild(item);
@@ -56700,7 +57653,7 @@ var ts;
                 function hasSomeImportantChild(item) {
                     return ts.forEach(item.children, function (child) {
                         var childKind = navigationBarNodeKind(child);
-                        return childKind !== 219 && childKind !== 170;
+                        return childKind !== 223 && childKind !== 174;
                     });
                 }
             }
@@ -56755,20 +57708,20 @@ var ts;
             }
             var result = [];
             result.push(moduleDeclaration.name.text);
-            while (moduleDeclaration.body && moduleDeclaration.body.kind === 226) {
+            while (moduleDeclaration.body && moduleDeclaration.body.kind === 230) {
                 moduleDeclaration = moduleDeclaration.body;
                 result.push(moduleDeclaration.name.text);
             }
             return result.join(".");
         }
         function getInteriorModule(decl) {
-            return decl.body.kind === 226 ? getInteriorModule(decl.body) : decl;
+            return decl.body.kind === 230 ? getInteriorModule(decl.body) : decl;
         }
         function isComputedProperty(member) {
-            return !member.name || member.name.kind === 141;
+            return !member.name || member.name.kind === 142;
         }
         function getNodeSpan(node) {
-            return node.kind === 256
+            return node.kind === 261
                 ? ts.createTextSpanFromBounds(node.getFullStart(), node.getEnd())
                 : ts.createTextSpanFromBounds(node.getStart(curSourceFile), node.getEnd());
         }
@@ -56776,14 +57729,14 @@ var ts;
             if (node.name && ts.getFullWidth(node.name) > 0) {
                 return ts.declarationNameToString(node.name);
             }
-            else if (node.parent.kind === 219) {
+            else if (node.parent.kind === 223) {
                 return ts.declarationNameToString(node.parent.name);
             }
-            else if (node.parent.kind === 188 &&
+            else if (node.parent.kind === 192 &&
                 node.parent.operatorToken.kind === 57) {
-                return nodeText(node.parent.left);
+                return nodeText(node.parent.left).replace(whiteSpaceRegex, "");
             }
-            else if (node.parent.kind === 253 && node.parent.name) {
+            else if (node.parent.kind === 257 && node.parent.name) {
                 return nodeText(node.parent.name);
             }
             else if (ts.getModifierFlags(node) & 512) {
@@ -56794,8 +57747,9 @@ var ts;
             }
         }
         function isFunctionOrClassExpression(node) {
-            return node.kind === 180 || node.kind === 181 || node.kind === 193;
+            return node.kind === 184 || node.kind === 185 || node.kind === 197;
         }
+        var whiteSpaceRegex = /\s+/g;
     })(NavigationBar = ts.NavigationBar || (ts.NavigationBar = {}));
 })(ts || (ts = {}));
 var ts;
@@ -56866,7 +57820,7 @@ var ts;
                 }
             }
             function autoCollapse(node) {
-                return ts.isFunctionBlock(node) && node.parent.kind !== 181;
+                return ts.isFunctionBlock(node) && node.parent.kind !== 185;
             }
             var depth = 0;
             var maxDepth = 20;
@@ -56878,26 +57832,26 @@ var ts;
                     addOutliningForLeadingCommentsForNode(n);
                 }
                 switch (n.kind) {
-                    case 200:
+                    case 204:
                         if (!ts.isFunctionBlock(n)) {
-                            var parent_22 = n.parent;
+                            var parent_20 = n.parent;
                             var openBrace = ts.findChildOfKind(n, 16, sourceFile);
                             var closeBrace = ts.findChildOfKind(n, 17, sourceFile);
-                            if (parent_22.kind === 205 ||
-                                parent_22.kind === 208 ||
-                                parent_22.kind === 209 ||
-                                parent_22.kind === 207 ||
-                                parent_22.kind === 204 ||
-                                parent_22.kind === 206 ||
-                                parent_22.kind === 213 ||
-                                parent_22.kind === 252) {
-                                addOutliningSpan(parent_22, openBrace, closeBrace, autoCollapse(n));
+                            if (parent_20.kind === 209 ||
+                                parent_20.kind === 212 ||
+                                parent_20.kind === 213 ||
+                                parent_20.kind === 211 ||
+                                parent_20.kind === 208 ||
+                                parent_20.kind === 210 ||
+                                parent_20.kind === 217 ||
+                                parent_20.kind === 256) {
+                                addOutliningSpan(parent_20, openBrace, closeBrace, autoCollapse(n));
                                 break;
                             }
-                            if (parent_22.kind === 217) {
-                                var tryStatement = parent_22;
+                            if (parent_20.kind === 221) {
+                                var tryStatement = parent_20;
                                 if (tryStatement.tryBlock === n) {
-                                    addOutliningSpan(parent_22, openBrace, closeBrace, autoCollapse(n));
+                                    addOutliningSpan(parent_20, openBrace, closeBrace, autoCollapse(n));
                                     break;
                                 }
                                 else if (tryStatement.finallyBlock === n) {
@@ -56917,23 +57871,23 @@ var ts;
                             });
                             break;
                         }
-                    case 227: {
+                    case 231: {
                         var openBrace = ts.findChildOfKind(n, 16, sourceFile);
                         var closeBrace = ts.findChildOfKind(n, 17, sourceFile);
                         addOutliningSpan(n.parent, openBrace, closeBrace, autoCollapse(n));
                         break;
                     }
-                    case 222:
-                    case 223:
-                    case 225:
-                    case 172:
-                    case 228: {
+                    case 226:
+                    case 227:
+                    case 229:
+                    case 176:
+                    case 232: {
                         var openBrace = ts.findChildOfKind(n, 16, sourceFile);
                         var closeBrace = ts.findChildOfKind(n, 17, sourceFile);
                         addOutliningSpan(n, openBrace, closeBrace, autoCollapse(n));
                         break;
                     }
-                    case 171:
+                    case 175:
                         var openBracket = ts.findChildOfKind(n, 20, sourceFile);
                         var closeBracket = ts.findChildOfKind(n, 21, sourceFile);
                         addOutliningSpan(n, openBracket, closeBracket, autoCollapse(n));
@@ -56951,13 +57905,13 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
+    var PatternMatchKind;
     (function (PatternMatchKind) {
         PatternMatchKind[PatternMatchKind["exact"] = 0] = "exact";
         PatternMatchKind[PatternMatchKind["prefix"] = 1] = "prefix";
         PatternMatchKind[PatternMatchKind["substring"] = 2] = "substring";
         PatternMatchKind[PatternMatchKind["camelCase"] = 3] = "camelCase";
-    })(ts.PatternMatchKind || (ts.PatternMatchKind = {}));
-    var PatternMatchKind = ts.PatternMatchKind;
+    })(PatternMatchKind = ts.PatternMatchKind || (ts.PatternMatchKind = {}));
     function createPatternMatch(kind, punctuationStripped, isCaseSensitive, camelCaseWeight) {
         return {
             kind: kind,
@@ -57178,7 +58132,7 @@ var ts;
         if (ch >= 65 && ch <= 90) {
             return true;
         }
-        if (ch < 127 || !ts.isUnicodeIdentifierStart(ch, 4)) {
+        if (ch < 127 || !ts.isUnicodeIdentifierStart(ch, 5)) {
             return false;
         }
         var str = String.fromCharCode(ch);
@@ -57188,7 +58142,7 @@ var ts;
         if (ch >= 97 && ch <= 122) {
             return true;
         }
-        if (ch < 127 || !ts.isUnicodeIdentifierStart(ch, 4)) {
+        if (ch < 127 || !ts.isUnicodeIdentifierStart(ch, 5)) {
             return false;
         }
         var str = String.fromCharCode(ch);
@@ -57424,7 +58378,7 @@ var ts;
             var token = ts.scanner.getToken();
             if (token === 123) {
                 token = nextToken();
-                if (token === 126) {
+                if (token === 127) {
                     token = nextToken();
                     if (token === 9) {
                         recordAmbientExternalModule();
@@ -57445,7 +58399,7 @@ var ts;
                 else {
                     if (token === 70 || ts.isKeyword(token)) {
                         token = nextToken();
-                        if (token === 137) {
+                        if (token === 138) {
                             token = nextToken();
                             if (token === 9) {
                                 recordModuleName();
@@ -57471,7 +58425,7 @@ var ts;
                         }
                         if (token === 17) {
                             token = nextToken();
-                            if (token === 137) {
+                            if (token === 138) {
                                 token = nextToken();
                                 if (token === 9) {
                                     recordModuleName();
@@ -57485,7 +58439,7 @@ var ts;
                             token = nextToken();
                             if (token === 70 || ts.isKeyword(token)) {
                                 token = nextToken();
-                                if (token === 137) {
+                                if (token === 138) {
                                     token = nextToken();
                                     if (token === 9) {
                                         recordModuleName();
@@ -57511,7 +58465,7 @@ var ts;
                     }
                     if (token === 17) {
                         token = nextToken();
-                        if (token === 137) {
+                        if (token === 138) {
                             token = nextToken();
                             if (token === 9) {
                                 recordModuleName();
@@ -57521,7 +58475,7 @@ var ts;
                 }
                 else if (token === 38) {
                     token = nextToken();
-                    if (token === 137) {
+                    if (token === 138) {
                         token = nextToken();
                         if (token === 9) {
                             recordModuleName();
@@ -57545,7 +58499,7 @@ var ts;
         }
         function tryConsumeRequireCall(skipCurrentToken) {
             var token = skipCurrentToken ? nextToken() : ts.scanner.getToken();
-            if (token === 130) {
+            if (token === 131) {
                 token = nextToken();
                 if (token === 18) {
                     token = nextToken();
@@ -57739,12 +58693,6 @@ var ts;
     var SignatureHelp;
     (function (SignatureHelp) {
         var emptyArray = [];
-        (function (ArgumentListKind) {
-            ArgumentListKind[ArgumentListKind["TypeArguments"] = 0] = "TypeArguments";
-            ArgumentListKind[ArgumentListKind["CallArguments"] = 1] = "CallArguments";
-            ArgumentListKind[ArgumentListKind["TaggedTemplateArguments"] = 2] = "TaggedTemplateArguments";
-        })(SignatureHelp.ArgumentListKind || (SignatureHelp.ArgumentListKind = {}));
-        var ArgumentListKind = SignatureHelp.ArgumentListKind;
         function getSignatureHelpItems(program, sourceFile, position, cancellationToken) {
             var typeChecker = program.getTypeChecker();
             var startingToken = ts.findTokenOnLeftOfPosition(sourceFile, position);
@@ -57770,14 +58718,14 @@ var ts;
         }
         SignatureHelp.getSignatureHelpItems = getSignatureHelpItems;
         function createJavaScriptSignatureHelpItems(argumentInfo, program) {
-            if (argumentInfo.invocation.kind !== 175) {
+            if (argumentInfo.invocation.kind !== 179) {
                 return undefined;
             }
             var callExpression = argumentInfo.invocation;
             var expression = callExpression.expression;
             var name = expression.kind === 70
                 ? expression
-                : expression.kind === 173
+                : expression.kind === 177
                     ? expression.name
                     : undefined;
             if (!name || !name.text) {
@@ -57806,7 +58754,7 @@ var ts;
             }
         }
         function getImmediatelyContainingArgumentInfo(node, position, sourceFile) {
-            if (node.parent.kind === 175 || node.parent.kind === 176) {
+            if (node.parent.kind === 179 || node.parent.kind === 180) {
                 var callExpression = node.parent;
                 if (node.kind === 26 ||
                     node.kind === 18) {
@@ -57838,23 +58786,23 @@ var ts;
                 }
                 return undefined;
             }
-            else if (node.kind === 12 && node.parent.kind === 177) {
+            else if (node.kind === 12 && node.parent.kind === 181) {
                 if (ts.isInsideTemplateLiteral(node, position)) {
                     return getArgumentListInfoForTemplate(node.parent, 0, sourceFile);
                 }
             }
-            else if (node.kind === 13 && node.parent.parent.kind === 177) {
+            else if (node.kind === 13 && node.parent.parent.kind === 181) {
                 var templateExpression = node.parent;
                 var tagExpression = templateExpression.parent;
-                ts.Debug.assert(templateExpression.kind === 190);
+                ts.Debug.assert(templateExpression.kind === 194);
                 var argumentIndex = ts.isInsideTemplateLiteral(node, position) ? 0 : 1;
                 return getArgumentListInfoForTemplate(tagExpression, argumentIndex, sourceFile);
             }
-            else if (node.parent.kind === 198 && node.parent.parent.parent.kind === 177) {
+            else if (node.parent.kind === 202 && node.parent.parent.parent.kind === 181) {
                 var templateSpan = node.parent;
                 var templateExpression = templateSpan.parent;
                 var tagExpression = templateExpression.parent;
-                ts.Debug.assert(templateExpression.kind === 190);
+                ts.Debug.assert(templateExpression.kind === 194);
                 if (node.kind === 15 && !ts.isInsideTemplateLiteral(node, position)) {
                     return undefined;
                 }
@@ -57918,7 +58866,7 @@ var ts;
             var template = taggedTemplate.template;
             var applicableSpanStart = template.getStart();
             var applicableSpanEnd = template.getEnd();
-            if (template.kind === 190) {
+            if (template.kind === 194) {
                 var lastSpan = ts.lastOrUndefined(template.templateSpans);
                 if (lastSpan.literal.getFullWidth() === 0) {
                     applicableSpanEnd = ts.skipTrivia(sourceFile.text, applicableSpanEnd, false);
@@ -57927,7 +58875,7 @@ var ts;
             return ts.createTextSpan(applicableSpanStart, applicableSpanEnd - applicableSpanStart);
         }
         function getContainingArgumentInfo(node, position, sourceFile) {
-            for (var n = node; n.kind !== 256; n = n.parent) {
+            for (var n = node; n.kind !== 261; n = n.parent) {
                 if (ts.isFunctionBlock(n)) {
                     return undefined;
                 }
@@ -57977,7 +58925,9 @@ var ts;
                 if (callTargetDisplayParts) {
                     ts.addRange(prefixDisplayParts, callTargetDisplayParts);
                 }
+                var isVariadic;
                 if (isTypeParameterList) {
+                    isVariadic = false;
                     prefixDisplayParts.push(ts.punctuationPart(26));
                     var typeParameters = candidateSignature.typeParameters;
                     signatureHelpParameters = typeParameters && typeParameters.length > 0 ? ts.map(typeParameters, createSignatureHelpParameterForTypeParameter) : emptyArray;
@@ -57988,6 +58938,7 @@ var ts;
                     ts.addRange(suffixDisplayParts, parameterParts);
                 }
                 else {
+                    isVariadic = candidateSignature.hasRestParameter;
                     var typeParameterParts = ts.mapToDisplayParts(function (writer) {
                         return typeChecker.getSymbolDisplayBuilder().buildDisplayForTypeParametersAndDelimiters(candidateSignature.typeParameters, writer, invocation);
                     });
@@ -58002,7 +58953,7 @@ var ts;
                 });
                 ts.addRange(suffixDisplayParts, returnTypeParts);
                 return {
-                    isVariadic: candidateSignature.hasRestParameter,
+                    isVariadic: isVariadic,
                     prefixDisplayParts: prefixDisplayParts,
                     suffixDisplayParts: suffixDisplayParts,
                     separatorDisplayParts: [ts.punctuationPart(25), ts.spacePart()],
@@ -58056,7 +59007,7 @@ var ts;
         function getSymbolKind(typeChecker, symbol, location) {
             var flags = symbol.getFlags();
             if (flags & 32)
-                return ts.getDeclarationOfKind(symbol, 193) ?
+                return ts.getDeclarationOfKind(symbol, 197) ?
                     ts.ScriptElementKind.localClassElement : ts.ScriptElementKind.classElement;
             if (flags & 384)
                 return ts.ScriptElementKind.enumElement;
@@ -58156,14 +59107,14 @@ var ts;
                 var signature = void 0;
                 type = isThisExpression ? typeChecker.getTypeAtLocation(location) : typeChecker.getTypeOfSymbolAtLocation(symbol, location);
                 if (type) {
-                    if (location.parent && location.parent.kind === 173) {
+                    if (location.parent && location.parent.kind === 177) {
                         var right = location.parent.name;
                         if (right === location || (right && right.getFullWidth() === 0)) {
                             location = location.parent;
                         }
                     }
                     var callExpression = void 0;
-                    if (location.kind === 175 || location.kind === 176) {
+                    if (location.kind === 179 || location.kind === 180) {
                         callExpression = location;
                     }
                     else if (ts.isCallExpressionTarget(location) || ts.isNewExpressionTarget(location)) {
@@ -58175,7 +59126,7 @@ var ts;
                         if (!signature && candidateSignatures.length) {
                             signature = candidateSignatures[0];
                         }
-                        var useConstructSignatures = callExpression.kind === 176 || callExpression.expression.kind === 96;
+                        var useConstructSignatures = callExpression.kind === 180 || callExpression.expression.kind === 96;
                         var allSignatures = useConstructSignatures ? type.getConstructSignatures() : type.getCallSignatures();
                         if (!ts.contains(allSignatures, signature.target) && !ts.contains(allSignatures, signature)) {
                             signature = allSignatures.length ? allSignatures[0] : undefined;
@@ -58211,7 +59162,7 @@ var ts;
                                         displayParts.push(ts.keywordPart(93));
                                         displayParts.push(ts.spacePart());
                                     }
-                                    if (!(type.flags & 2097152) && type.symbol) {
+                                    if (!(type.flags & 32768 && type.objectFlags & 16) && type.symbol) {
                                         ts.addRange(displayParts, ts.symbolToDisplayParts(typeChecker, type.symbol, enclosingDeclaration, undefined, 1));
                                     }
                                     addSignatureDisplayParts(signature, allSignatures, 8);
@@ -58223,21 +59174,21 @@ var ts;
                         }
                     }
                     else if ((ts.isNameOfFunctionDeclaration(location) && !(symbol.flags & 98304)) ||
-                        (location.kind === 122 && location.parent.kind === 149)) {
+                        (location.kind === 122 && location.parent.kind === 150)) {
                         var functionDeclaration = location.parent;
-                        var allSignatures = functionDeclaration.kind === 149 ? type.getNonNullableType().getConstructSignatures() : type.getNonNullableType().getCallSignatures();
+                        var allSignatures = functionDeclaration.kind === 150 ? type.getNonNullableType().getConstructSignatures() : type.getNonNullableType().getCallSignatures();
                         if (!typeChecker.isImplementationOfOverload(functionDeclaration)) {
                             signature = typeChecker.getSignatureFromDeclaration(functionDeclaration);
                         }
                         else {
                             signature = allSignatures[0];
                         }
-                        if (functionDeclaration.kind === 149) {
+                        if (functionDeclaration.kind === 150) {
                             symbolKind = ts.ScriptElementKind.constructorImplementationElement;
                             addPrefixForAnyFunctionOrVar(type.symbol, symbolKind);
                         }
                         else {
-                            addPrefixForAnyFunctionOrVar(functionDeclaration.kind === 152 &&
+                            addPrefixForAnyFunctionOrVar(functionDeclaration.kind === 153 &&
                                 !(type.symbol.flags & 2048 || type.symbol.flags & 4096) ? type.symbol : symbol, symbolKind);
                         }
                         addSignatureDisplayParts(signature, allSignatures);
@@ -58246,7 +59197,7 @@ var ts;
                 }
             }
             if (symbolFlags & 32 && !hasAddedSymbolInfo && !isThisExpression) {
-                if (ts.getDeclarationOfKind(symbol, 193)) {
+                if (ts.getDeclarationOfKind(symbol, 197)) {
                     pushTypePart(ts.ScriptElementKind.localClassElement);
                 }
                 else {
@@ -58265,7 +59216,7 @@ var ts;
             }
             if (symbolFlags & 524288) {
                 addNewLineIfDisplayPartsExist();
-                displayParts.push(ts.keywordPart(135));
+                displayParts.push(ts.keywordPart(136));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 writeTypeParametersOfSymbol(symbol, sourceFile);
@@ -58286,9 +59237,9 @@ var ts;
             }
             if (symbolFlags & 1536) {
                 addNewLineIfDisplayPartsExist();
-                var declaration = ts.getDeclarationOfKind(symbol, 226);
+                var declaration = ts.getDeclarationOfKind(symbol, 230);
                 var isNamespace = declaration && declaration.name && declaration.name.kind === 70;
-                displayParts.push(ts.keywordPart(isNamespace ? 127 : 126));
+                displayParts.push(ts.keywordPart(isNamespace ? 128 : 127));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
             }
@@ -58299,31 +59250,31 @@ var ts;
                 displayParts.push(ts.punctuationPart(19));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
-                displayParts.push(ts.spacePart());
-                displayParts.push(ts.keywordPart(91));
-                displayParts.push(ts.spacePart());
                 if (symbol.parent) {
+                    addInPrefix();
                     addFullSymbolName(symbol.parent, enclosingDeclaration);
                     writeTypeParametersOfSymbol(symbol.parent, enclosingDeclaration);
                 }
                 else {
-                    var declaration = ts.getDeclarationOfKind(symbol, 142);
+                    var declaration = ts.getDeclarationOfKind(symbol, 143);
                     ts.Debug.assert(declaration !== undefined);
                     declaration = declaration.parent;
                     if (declaration) {
                         if (ts.isFunctionLikeKind(declaration.kind)) {
+                            addInPrefix();
                             var signature = typeChecker.getSignatureFromDeclaration(declaration);
-                            if (declaration.kind === 153) {
+                            if (declaration.kind === 154) {
                                 displayParts.push(ts.keywordPart(93));
                                 displayParts.push(ts.spacePart());
                             }
-                            else if (declaration.kind !== 152 && declaration.name) {
+                            else if (declaration.kind !== 153 && declaration.name) {
                                 addFullSymbolName(declaration.symbol);
                             }
                             ts.addRange(displayParts, ts.signatureToDisplayParts(typeChecker, signature, sourceFile, 32));
                         }
-                        else {
-                            displayParts.push(ts.keywordPart(135));
+                        else if (declaration.kind === 228) {
+                            addInPrefix();
+                            displayParts.push(ts.keywordPart(136));
                             displayParts.push(ts.spacePart());
                             addFullSymbolName(declaration.symbol);
                             writeTypeParametersOfSymbol(declaration.symbol, sourceFile);
@@ -58334,7 +59285,7 @@ var ts;
             if (symbolFlags & 8) {
                 addPrefixForAnyFunctionOrVar(symbol, "enum member");
                 var declaration = symbol.declarations[0];
-                if (declaration.kind === 255) {
+                if (declaration.kind === 260) {
                     var constantValue = typeChecker.getConstantValue(declaration);
                     if (constantValue !== undefined) {
                         displayParts.push(ts.spacePart());
@@ -58346,10 +59297,10 @@ var ts;
             }
             if (symbolFlags & 8388608) {
                 addNewLineIfDisplayPartsExist();
-                if (symbol.declarations[0].kind === 229) {
+                if (symbol.declarations[0].kind === 233) {
                     displayParts.push(ts.keywordPart(83));
                     displayParts.push(ts.spacePart());
-                    displayParts.push(ts.keywordPart(127));
+                    displayParts.push(ts.keywordPart(128));
                 }
                 else {
                     displayParts.push(ts.keywordPart(90));
@@ -58357,13 +59308,13 @@ var ts;
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 ts.forEach(symbol.declarations, function (declaration) {
-                    if (declaration.kind === 230) {
+                    if (declaration.kind === 234) {
                         var importEqualsDeclaration = declaration;
                         if (ts.isExternalModuleImportEqualsDeclaration(importEqualsDeclaration)) {
                             displayParts.push(ts.spacePart());
                             displayParts.push(ts.operatorPart(57));
                             displayParts.push(ts.spacePart());
-                            displayParts.push(ts.keywordPart(130));
+                            displayParts.push(ts.keywordPart(131));
                             displayParts.push(ts.punctuationPart(18));
                             displayParts.push(ts.displayPart(ts.getTextOfNode(ts.getExternalModuleImportEqualsDeclarationExpression(importEqualsDeclaration)), ts.SymbolDisplayPartKind.stringLiteral));
                             displayParts.push(ts.punctuationPart(19));
@@ -58425,10 +59376,10 @@ var ts;
             if (!documentation) {
                 documentation = symbol.getDocumentationComment();
                 if (documentation.length === 0 && symbol.flags & 4) {
-                    if (symbol.parent && ts.forEach(symbol.parent.declarations, function (declaration) { return declaration.kind === 256; })) {
+                    if (symbol.parent && ts.forEach(symbol.parent.declarations, function (declaration) { return declaration.kind === 261; })) {
                         for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                             var declaration = _a[_i];
-                            if (!declaration.parent || declaration.parent.kind !== 188) {
+                            if (!declaration.parent || declaration.parent.kind !== 192) {
                                 continue;
                             }
                             var rhsSymbol = typeChecker.getSymbolAtLocation(declaration.parent.right);
@@ -58449,6 +59400,11 @@ var ts;
                     displayParts.push(ts.lineBreakPart());
                 }
             }
+            function addInPrefix() {
+                displayParts.push(ts.spacePart());
+                displayParts.push(ts.keywordPart(91));
+                displayParts.push(ts.spacePart());
+            }
             function addFullSymbolName(symbol, enclosingDeclaration) {
                 var fullSymbolDisplayParts = ts.symbolToDisplayParts(typeChecker, symbol, enclosingDeclaration || sourceFile, undefined, 1 | 2);
                 ts.addRange(displayParts, fullSymbolDisplayParts);
@@ -58503,14 +59459,14 @@ var ts;
                 return false;
             }
             return ts.forEach(symbol.declarations, function (declaration) {
-                if (declaration.kind === 180) {
+                if (declaration.kind === 184) {
                     return true;
                 }
-                if (declaration.kind !== 219 && declaration.kind !== 221) {
+                if (declaration.kind !== 223 && declaration.kind !== 225) {
                     return false;
                 }
-                for (var parent_23 = declaration.parent; !ts.isFunctionBlock(parent_23); parent_23 = parent_23.parent) {
-                    if (parent_23.kind === 256 || parent_23.kind === 227) {
+                for (var parent_21 = declaration.parent; !ts.isFunctionBlock(parent_21); parent_21 = parent_21.parent) {
+                    if (parent_21.kind === 261 || parent_21.kind === 231) {
                         return false;
                     }
                 }
@@ -58594,7 +59550,7 @@ var ts;
             return typeof o.type === "object" && !ts.forEachProperty(o.type, function (v) { return typeof v !== "number"; });
         });
         options = ts.clone(options);
-        var _loop_2 = function (opt) {
+        var _loop_4 = function (opt) {
             if (!ts.hasProperty(options, opt.name)) {
                 return "continue";
             }
@@ -58610,7 +59566,7 @@ var ts;
         };
         for (var _i = 0, commandLineOptionsStringToEnum_1 = commandLineOptionsStringToEnum; _i < commandLineOptionsStringToEnum_1.length; _i++) {
             var opt = commandLineOptionsStringToEnum_1[_i];
-            _loop_2(opt);
+            _loop_4(opt);
         }
         return options;
     }
@@ -58619,18 +59575,9 @@ var ts;
 (function (ts) {
     var formatting;
     (function (formatting) {
-        var standardScanner = ts.createScanner(4, false, 0);
-        var jsxScanner = ts.createScanner(4, false, 1);
+        var standardScanner = ts.createScanner(5, false, 0);
+        var jsxScanner = ts.createScanner(5, false, 1);
         var scanner;
-        var ScanAction;
-        (function (ScanAction) {
-            ScanAction[ScanAction["Scan"] = 0] = "Scan";
-            ScanAction[ScanAction["RescanGreaterThanToken"] = 1] = "RescanGreaterThanToken";
-            ScanAction[ScanAction["RescanSlashToken"] = 2] = "RescanSlashToken";
-            ScanAction[ScanAction["RescanTemplateToken"] = 3] = "RescanTemplateToken";
-            ScanAction[ScanAction["RescanJsxIdentifier"] = 4] = "RescanJsxIdentifier";
-            ScanAction[ScanAction["RescanJsxText"] = 5] = "RescanJsxText";
-        })(ScanAction || (ScanAction = {}));
         function getFormattingScanner(sourceFile, startPos, endPos) {
             ts.Debug.assert(scanner === undefined, "Scanner should be undefined");
             scanner = sourceFile.languageVariant === 1 ? jsxScanner : standardScanner;
@@ -58710,10 +59657,10 @@ var ts;
             function shouldRescanJsxIdentifier(node) {
                 if (node.parent) {
                     switch (node.parent.kind) {
-                        case 246:
-                        case 244:
-                        case 245:
-                        case 243:
+                        case 250:
+                        case 248:
+                        case 249:
+                        case 247:
                             return node.kind === 70;
                     }
                 }
@@ -58924,20 +59871,6 @@ var ts;
     })(formatting = ts.formatting || (ts.formatting = {}));
 })(ts || (ts = {}));
 var ts;
-(function (ts) {
-    var formatting;
-    (function (formatting) {
-        (function (FormattingRequestKind) {
-            FormattingRequestKind[FormattingRequestKind["FormatDocument"] = 0] = "FormatDocument";
-            FormattingRequestKind[FormattingRequestKind["FormatSelection"] = 1] = "FormatSelection";
-            FormattingRequestKind[FormattingRequestKind["FormatOnEnter"] = 2] = "FormatOnEnter";
-            FormattingRequestKind[FormattingRequestKind["FormatOnSemicolon"] = 3] = "FormatOnSemicolon";
-            FormattingRequestKind[FormattingRequestKind["FormatOnClosingCurlyBrace"] = 4] = "FormatOnClosingCurlyBrace";
-        })(formatting.FormattingRequestKind || (formatting.FormattingRequestKind = {}));
-        var FormattingRequestKind = formatting.FormattingRequestKind;
-    })(formatting = ts.formatting || (ts.formatting = {}));
-})(ts || (ts = {}));
-var ts;
 (function (ts) {
     var formatting;
     (function (formatting) {
@@ -58959,19 +59892,6 @@ var ts;
     })(formatting = ts.formatting || (ts.formatting = {}));
 })(ts || (ts = {}));
 var ts;
-(function (ts) {
-    var formatting;
-    (function (formatting) {
-        (function (RuleAction) {
-            RuleAction[RuleAction["Ignore"] = 1] = "Ignore";
-            RuleAction[RuleAction["Space"] = 2] = "Space";
-            RuleAction[RuleAction["NewLine"] = 4] = "NewLine";
-            RuleAction[RuleAction["Delete"] = 8] = "Delete";
-        })(formatting.RuleAction || (formatting.RuleAction = {}));
-        var RuleAction = formatting.RuleAction;
-    })(formatting = ts.formatting || (ts.formatting = {}));
-})(ts || (ts = {}));
-var ts;
 (function (ts) {
     var formatting;
     (function (formatting) {
@@ -59002,17 +59922,6 @@ var ts;
     })(formatting = ts.formatting || (ts.formatting = {}));
 })(ts || (ts = {}));
 var ts;
-(function (ts) {
-    var formatting;
-    (function (formatting) {
-        (function (RuleFlags) {
-            RuleFlags[RuleFlags["None"] = 0] = "None";
-            RuleFlags[RuleFlags["CanDeleteNewLines"] = 1] = "CanDeleteNewLines";
-        })(formatting.RuleFlags || (formatting.RuleFlags = {}));
-        var RuleFlags = formatting.RuleFlags;
-    })(formatting = ts.formatting || (ts.formatting = {}));
-})(ts || (ts = {}));
-var ts;
 (function (ts) {
     var formatting;
     (function (formatting) {
@@ -59126,13 +60035,13 @@ var ts;
                 this.NoSpaceBetweenReturnAndSemicolon = new formatting.Rule(formatting.RuleDescriptor.create1(95, 24), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
                 this.SpaceBetweenStatements = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([19, 80, 81, 72]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNonJsxElementContext, Rules.IsNotForContext), 2));
                 this.SpaceAfterTryFinally = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([101, 86]), 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2));
-                this.SpaceAfterGetSetInMember = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([124, 132]), 70), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2));
+                this.SpaceAfterGetSetInMember = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([124, 133]), 70), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2));
                 this.SpaceBeforeBinaryKeywordOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryKeywordOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2));
                 this.SpaceAfterBinaryKeywordOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.BinaryKeywordOperators, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2));
                 this.NoSpaceAfterConstructor = new formatting.Rule(formatting.RuleDescriptor.create1(122, 18), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
-                this.NoSpaceAfterModuleImport = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([126, 130]), 18), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
-                this.SpaceAfterCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([116, 74, 123, 78, 82, 83, 84, 124, 107, 90, 108, 126, 127, 111, 113, 112, 132, 114, 135, 137]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2));
-                this.SpaceBeforeCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([84, 107, 137])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2));
+                this.NoSpaceAfterModuleImport = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([127, 131]), 18), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
+                this.SpaceAfterCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([116, 74, 123, 78, 82, 83, 84, 124, 107, 90, 108, 127, 128, 111, 113, 112, 133, 114, 136, 138]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2));
+                this.SpaceBeforeCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([84, 107, 138])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2));
                 this.SpaceAfterModuleName = new formatting.Rule(formatting.RuleDescriptor.create1(9, 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsModuleDeclContext), 2));
                 this.SpaceBeforeArrow = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 35), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2));
                 this.SpaceAfterArrow = new formatting.Rule(formatting.RuleDescriptor.create3(35, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2));
@@ -59146,7 +60055,7 @@ var ts;
                 this.NoSpaceBetweenEmptyInterfaceBraceBrackets = new formatting.Rule(formatting.RuleDescriptor.create1(16, 17), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsObjectTypeContext), 8));
                 this.SpaceBeforeAt = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 56), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2));
                 this.NoSpaceAfterAt = new formatting.Rule(formatting.RuleDescriptor.create3(56, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
-                this.SpaceAfterDecorator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([116, 70, 83, 78, 74, 114, 113, 111, 112, 124, 132, 20, 38])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsEndOfDecoratorContextOnSameLine), 2));
+                this.SpaceAfterDecorator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([116, 70, 83, 78, 74, 114, 113, 111, 112, 124, 133, 20, 38])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsEndOfDecoratorContextOnSameLine), 2));
                 this.NoSpaceBetweenFunctionKeywordAndStar = new formatting.Rule(formatting.RuleDescriptor.create1(88, 38), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclarationOrFunctionExpressionContext), 8));
                 this.SpaceAfterStarInGeneratorDeclaration = new formatting.Rule(formatting.RuleDescriptor.create3(38, formatting.Shared.TokenRange.FromTokens([70, 18])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclarationOrFunctionExpressionContext), 2));
                 this.NoSpaceBetweenYieldKeywordAndStar = new formatting.Rule(formatting.RuleDescriptor.create1(115, 38), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsYieldOrYieldStarWithOperand), 8));
@@ -59251,43 +60160,43 @@ var ts;
             }
             Rules.prototype.getRuleName = function (rule) {
                 var o = this;
-                for (var name_51 in o) {
-                    if (o[name_51] === rule) {
-                        return name_51;
+                for (var name_47 in o) {
+                    if (o[name_47] === rule) {
+                        return name_47;
                     }
                 }
                 throw new Error("Unknown rule");
             };
             Rules.IsForContext = function (context) {
-                return context.contextNode.kind === 207;
+                return context.contextNode.kind === 211;
             };
             Rules.IsNotForContext = function (context) {
                 return !Rules.IsForContext(context);
             };
             Rules.IsBinaryOpContext = function (context) {
                 switch (context.contextNode.kind) {
-                    case 188:
-                    case 189:
-                    case 196:
+                    case 192:
+                    case 193:
+                    case 200:
+                    case 243:
                     case 239:
-                    case 235:
-                    case 155:
-                    case 163:
+                    case 156:
                     case 164:
+                    case 165:
                         return true;
-                    case 170:
-                    case 224:
-                    case 230:
-                    case 219:
-                    case 143:
-                    case 255:
+                    case 174:
+                    case 228:
+                    case 234:
+                    case 223:
+                    case 144:
+                    case 260:
+                    case 147:
                     case 146:
-                    case 145:
                         return context.currentTokenSpan.kind === 57 || context.nextTokenSpan.kind === 57;
-                    case 208:
+                    case 212:
                         return context.currentTokenSpan.kind === 91 || context.nextTokenSpan.kind === 91;
-                    case 209:
-                        return context.currentTokenSpan.kind === 139 || context.nextTokenSpan.kind === 139;
+                    case 213:
+                        return context.currentTokenSpan.kind === 140 || context.nextTokenSpan.kind === 140;
                 }
                 return false;
             };
@@ -59295,7 +60204,7 @@ var ts;
                 return !Rules.IsBinaryOpContext(context);
             };
             Rules.IsConditionalOperatorContext = function (context) {
-                return context.contextNode.kind === 189;
+                return context.contextNode.kind === 193;
             };
             Rules.IsSameLineTokenOrBeforeMultilineBlockContext = function (context) {
                 return context.TokensAreOnSameLine() || Rules.IsBeforeMultilineBlockContext(context);
@@ -59320,90 +60229,90 @@ var ts;
                     return true;
                 }
                 switch (node.kind) {
-                    case 200:
-                    case 228:
-                    case 172:
-                    case 227:
+                    case 204:
+                    case 232:
+                    case 176:
+                    case 231:
                         return true;
                 }
                 return false;
             };
             Rules.IsFunctionDeclContext = function (context) {
                 switch (context.contextNode.kind) {
-                    case 221:
+                    case 225:
+                    case 149:
                     case 148:
-                    case 147:
-                    case 150:
                     case 151:
                     case 152:
-                    case 180:
-                    case 149:
-                    case 181:
-                    case 223:
+                    case 153:
+                    case 184:
+                    case 150:
+                    case 185:
+                    case 227:
                         return true;
                 }
                 return false;
             };
             Rules.IsFunctionDeclarationOrFunctionExpressionContext = function (context) {
-                return context.contextNode.kind === 221 || context.contextNode.kind === 180;
+                return context.contextNode.kind === 225 || context.contextNode.kind === 184;
             };
             Rules.IsTypeScriptDeclWithBlockContext = function (context) {
                 return Rules.NodeIsTypeScriptDeclWithBlockContext(context.contextNode);
             };
             Rules.NodeIsTypeScriptDeclWithBlockContext = function (node) {
                 switch (node.kind) {
-                    case 222:
-                    case 193:
-                    case 223:
-                    case 225:
-                    case 160:
                     case 226:
-                    case 237:
+                    case 197:
+                    case 227:
+                    case 229:
+                    case 161:
+                    case 230:
+                    case 241:
+                    case 242:
+                    case 235:
                     case 238:
-                    case 231:
-                    case 234:
                         return true;
                 }
                 return false;
             };
             Rules.IsAfterCodeBlockContext = function (context) {
                 switch (context.currentTokenParent.kind) {
-                    case 222:
                     case 226:
-                    case 225:
-                    case 200:
-                    case 252:
-                    case 227:
-                    case 214:
+                    case 230:
+                    case 229:
+                    case 204:
+                    case 256:
+                    case 231:
+                    case 218:
                         return true;
                 }
                 return false;
             };
             Rules.IsControlDeclContext = function (context) {
                 switch (context.contextNode.kind) {
-                    case 204:
-                    case 214:
-                    case 207:
                     case 208:
-                    case 209:
-                    case 206:
-                    case 217:
-                    case 205:
+                    case 218:
+                    case 211:
+                    case 212:
                     case 213:
-                    case 252:
+                    case 210:
+                    case 221:
+                    case 209:
+                    case 217:
+                    case 256:
                         return true;
                     default:
                         return false;
                 }
             };
             Rules.IsObjectContext = function (context) {
-                return context.contextNode.kind === 172;
+                return context.contextNode.kind === 176;
             };
             Rules.IsFunctionCallContext = function (context) {
-                return context.contextNode.kind === 175;
+                return context.contextNode.kind === 179;
             };
             Rules.IsNewContext = function (context) {
-                return context.contextNode.kind === 176;
+                return context.contextNode.kind === 180;
             };
             Rules.IsFunctionCallOrNewContext = function (context) {
                 return Rules.IsFunctionCallContext(context) || Rules.IsNewContext(context);
@@ -59415,25 +60324,25 @@ var ts;
                 return context.nextTokenSpan.kind !== 21;
             };
             Rules.IsArrowFunctionContext = function (context) {
-                return context.contextNode.kind === 181;
+                return context.contextNode.kind === 185;
             };
             Rules.IsNonJsxSameLineTokenContext = function (context) {
                 return context.TokensAreOnSameLine() && context.contextNode.kind !== 10;
             };
             Rules.IsNonJsxElementContext = function (context) {
-                return context.contextNode.kind !== 242;
+                return context.contextNode.kind !== 246;
             };
             Rules.IsJsxExpressionContext = function (context) {
-                return context.contextNode.kind === 248;
+                return context.contextNode.kind === 252;
             };
             Rules.IsNextTokenParentJsxAttribute = function (context) {
-                return context.nextTokenParent.kind === 246;
+                return context.nextTokenParent.kind === 250;
             };
             Rules.IsJsxAttributeContext = function (context) {
-                return context.contextNode.kind === 246;
+                return context.contextNode.kind === 250;
             };
             Rules.IsJsxSelfClosingElementContext = function (context) {
-                return context.contextNode.kind === 243;
+                return context.contextNode.kind === 247;
             };
             Rules.IsNotBeforeBlockInFunctionDeclarationContext = function (context) {
                 return !Rules.IsFunctionDeclContext(context) && !Rules.IsBeforeBlockContext(context);
@@ -59448,41 +60357,41 @@ var ts;
                 while (ts.isPartOfExpression(node)) {
                     node = node.parent;
                 }
-                return node.kind === 144;
+                return node.kind === 145;
             };
             Rules.IsStartOfVariableDeclarationList = function (context) {
-                return context.currentTokenParent.kind === 220 &&
+                return context.currentTokenParent.kind === 224 &&
                     context.currentTokenParent.getStart(context.sourceFile) === context.currentTokenSpan.pos;
             };
             Rules.IsNotFormatOnEnter = function (context) {
                 return context.formattingRequestKind !== 2;
             };
             Rules.IsModuleDeclContext = function (context) {
-                return context.contextNode.kind === 226;
+                return context.contextNode.kind === 230;
             };
             Rules.IsObjectTypeContext = function (context) {
-                return context.contextNode.kind === 160;
+                return context.contextNode.kind === 161;
             };
             Rules.IsTypeArgumentOrParameterOrAssertion = function (token, parent) {
                 if (token.kind !== 26 && token.kind !== 28) {
                     return false;
                 }
                 switch (parent.kind) {
-                    case 156:
-                    case 178:
-                    case 222:
-                    case 193:
-                    case 223:
-                    case 221:
-                    case 180:
-                    case 181:
+                    case 157:
+                    case 182:
+                    case 226:
+                    case 197:
+                    case 227:
+                    case 225:
+                    case 184:
+                    case 185:
+                    case 149:
                     case 148:
-                    case 147:
-                    case 152:
                     case 153:
-                    case 175:
-                    case 176:
-                    case 195:
+                    case 154:
+                    case 179:
+                    case 180:
+                    case 199:
                         return true;
                     default:
                         return false;
@@ -59493,13 +60402,13 @@ var ts;
                     Rules.IsTypeArgumentOrParameterOrAssertion(context.nextTokenSpan, context.nextTokenParent);
             };
             Rules.IsTypeAssertionContext = function (context) {
-                return context.contextNode.kind === 178;
+                return context.contextNode.kind === 182;
             };
             Rules.IsVoidOpContext = function (context) {
-                return context.currentTokenSpan.kind === 104 && context.currentTokenParent.kind === 184;
+                return context.currentTokenSpan.kind === 104 && context.currentTokenParent.kind === 188;
             };
             Rules.IsYieldOrYieldStarWithOperand = function (context) {
-                return context.contextNode.kind === 191 && context.contextNode.expression !== undefined;
+                return context.contextNode.kind === 195 && context.contextNode.expression !== undefined;
             };
             return Rules;
         }());
@@ -59521,7 +60430,7 @@ var ts;
                 return result;
             };
             RulesMap.prototype.Initialize = function (rules) {
-                this.mapRowLength = 139 + 1;
+                this.mapRowLength = 140 + 1;
                 this.map = new Array(this.mapRowLength * this.mapRowLength);
                 var rulesBucketConstructionStateList = new Array(this.map.length);
                 this.FillRules(rules, rulesBucketConstructionStateList);
@@ -59534,7 +60443,7 @@ var ts;
                 });
             };
             RulesMap.prototype.GetRuleBucketIndex = function (row, column) {
-                ts.Debug.assert(row <= 139 && column <= 139, "Must compute formatting context from tokens");
+                ts.Debug.assert(row <= 140 && column <= 140, "Must compute formatting context from tokens");
                 var rulesBucketIndex = (row * this.mapRowLength) + column;
                 return rulesBucketIndex;
             };
@@ -59571,6 +60480,7 @@ var ts;
         formatting.RulesMap = RulesMap;
         var MaskBitSize = 5;
         var Mask = 0x1f;
+        var RulesPosition;
         (function (RulesPosition) {
             RulesPosition[RulesPosition["IgnoreRulesSpecific"] = 0] = "IgnoreRulesSpecific";
             RulesPosition[RulesPosition["IgnoreRulesAny"] = MaskBitSize * 1] = "IgnoreRulesAny";
@@ -59578,8 +60488,7 @@ var ts;
             RulesPosition[RulesPosition["ContextRulesAny"] = MaskBitSize * 3] = "ContextRulesAny";
             RulesPosition[RulesPosition["NoContextRulesSpecific"] = MaskBitSize * 4] = "NoContextRulesSpecific";
             RulesPosition[RulesPosition["NoContextRulesAny"] = MaskBitSize * 5] = "NoContextRulesAny";
-        })(formatting.RulesPosition || (formatting.RulesPosition = {}));
-        var RulesPosition = formatting.RulesPosition;
+        })(RulesPosition = formatting.RulesPosition || (formatting.RulesPosition = {}));
         var RulesBucketConstructionState = (function () {
             function RulesBucketConstructionState() {
                 this.rulesInsertionIndexBitmap = 0;
@@ -59698,7 +60607,7 @@ var ts;
                 }
                 TokenAllAccess.prototype.GetTokens = function () {
                     var result = [];
-                    for (var token = 0; token <= 139; token++) {
+                    for (var token = 0; token <= 140; token++) {
                         result.push(token);
                     }
                     return result;
@@ -59742,9 +60651,9 @@ var ts;
             }());
             TokenRange.Any = TokenRange.AllTokens();
             TokenRange.AnyIncludingMultilineComments = TokenRange.FromTokens(TokenRange.Any.GetTokens().concat([3]));
-            TokenRange.Keywords = TokenRange.FromRange(71, 139);
+            TokenRange.Keywords = TokenRange.FromRange(71, 140);
             TokenRange.BinaryOperators = TokenRange.FromRange(26, 69);
-            TokenRange.BinaryKeywordOperators = TokenRange.FromTokens([91, 92, 139, 117, 125]);
+            TokenRange.BinaryKeywordOperators = TokenRange.FromTokens([91, 92, 140, 117, 125]);
             TokenRange.UnaryPrefixOperators = TokenRange.FromTokens([42, 43, 51, 50]);
             TokenRange.UnaryPrefixExpressions = TokenRange.FromTokens([8, 70, 18, 20, 16, 98, 93]);
             TokenRange.UnaryPreincrementExpressions = TokenRange.FromTokens([70, 18, 98, 93]);
@@ -59752,7 +60661,7 @@ var ts;
             TokenRange.UnaryPredecrementExpressions = TokenRange.FromTokens([70, 18, 98, 93]);
             TokenRange.UnaryPostdecrementExpressions = TokenRange.FromTokens([70, 19, 21, 93]);
             TokenRange.Comments = TokenRange.FromTokens([2, 3]);
-            TokenRange.TypeNames = TokenRange.FromTokens([70, 131, 133, 121, 134, 104, 118]);
+            TokenRange.TypeNames = TokenRange.FromTokens([70, 132, 134, 121, 135, 104, 118]);
             Shared.TokenRange = TokenRange;
         })(Shared = formatting.Shared || (formatting.Shared = {}));
     })(formatting = ts.formatting || (ts.formatting = {}));
@@ -59888,10 +60797,6 @@ var ts;
 (function (ts) {
     var formatting;
     (function (formatting) {
-        var Constants;
-        (function (Constants) {
-            Constants[Constants["Unknown"] = -1] = "Unknown";
-        })(Constants || (Constants = {}));
         function formatOnEnter(position, sourceFile, rulesProvider, options) {
             var line = sourceFile.getLineAndCharacterOfPosition(position).line;
             if (line === 0) {
@@ -59964,17 +60869,17 @@ var ts;
         }
         function isListElement(parent, node) {
             switch (parent.kind) {
-                case 222:
-                case 223:
-                    return ts.rangeContainsRange(parent.members, node);
                 case 226:
-                    var body = parent.body;
-                    return body && body.kind === 227 && ts.rangeContainsRange(body.statements, node);
-                case 256:
-                case 200:
                 case 227:
+                    return ts.rangeContainsRange(parent.members, node);
+                case 230:
+                    var body = parent.body;
+                    return body && body.kind === 231 && ts.rangeContainsRange(body.statements, node);
+                case 261:
+                case 204:
+                case 231:
                     return ts.rangeContainsRange(parent.statements, node);
-                case 252:
+                case 256:
                     return ts.rangeContainsRange(parent.block.statements, node);
             }
             return false;
@@ -60130,18 +61035,18 @@ var ts;
                     return node.modifiers[0].kind;
                 }
                 switch (node.kind) {
-                    case 222: return 74;
-                    case 223: return 108;
-                    case 221: return 88;
-                    case 225: return 225;
-                    case 150: return 124;
-                    case 151: return 132;
-                    case 148:
+                    case 226: return 74;
+                    case 227: return 108;
+                    case 225: return 88;
+                    case 229: return 229;
+                    case 151: return 124;
+                    case 152: return 133;
+                    case 149:
                         if (node.asteriskToken) {
                             return 38;
                         }
-                    case 146:
-                    case 143:
+                    case 147:
+                    case 144:
                         return node.name.kind;
                 }
             }
@@ -60257,11 +61162,11 @@ var ts;
                         consumeTokenAndAdvanceScanner(tokenInfo, node, parentDynamicIndentation, child);
                         return inheritedIndentation;
                     }
-                    var effectiveParentStartLine = child.kind === 144 ? childStartLine : undecoratedParentStartLine;
+                    var effectiveParentStartLine = child.kind === 145 ? childStartLine : undecoratedParentStartLine;
                     var childIndentation = computeIndentation(child, childStartLine, childIndentationAmount, node, parentDynamicIndentation, effectiveParentStartLine);
                     processNode(child, childContextNode, childStartLine, undecoratedChildStartLine, childIndentation.indentation, childIndentation.delta);
                     childContextNode = node;
-                    if (isFirstListItem && parent.kind === 171 && inheritedIndentation === -1) {
+                    if (isFirstListItem && parent.kind === 175 && inheritedIndentation === -1) {
                         inheritedIndentation = childIndentation.indentation;
                     }
                     return inheritedIndentation;
@@ -60565,12 +61470,12 @@ var ts;
         }
         function getOpenTokenForList(node, list) {
             switch (node.kind) {
+                case 150:
+                case 225:
+                case 184:
                 case 149:
-                case 221:
-                case 180:
                 case 148:
-                case 147:
-                case 181:
+                case 185:
                     if (node.typeParameters === list) {
                         return 26;
                     }
@@ -60578,8 +61483,8 @@ var ts;
                         return 18;
                     }
                     break;
-                case 175:
-                case 176:
+                case 179:
+                case 180:
                     if (node.typeArguments === list) {
                         return 26;
                     }
@@ -60587,7 +61492,7 @@ var ts;
                         return 18;
                     }
                     break;
-                case 156:
+                case 157:
                     if (node.typeArguments === list) {
                         return 26;
                     }
@@ -60660,10 +61565,6 @@ var ts;
     (function (formatting) {
         var SmartIndenter;
         (function (SmartIndenter) {
-            var Value;
-            (function (Value) {
-                Value[Value["Unknown"] = -1] = "Unknown";
-            })(Value || (Value = {}));
             function getIndentation(position, sourceFile, options) {
                 if (position > sourceFile.text.length) {
                     return getBaseIndentation(options);
@@ -60692,7 +61593,7 @@ var ts;
                     var lineStart = ts.getLineStartPositionForPosition(current_1, sourceFile);
                     return SmartIndenter.findFirstNonWhitespaceColumn(lineStart, current_1, sourceFile, options);
                 }
-                if (precedingToken.kind === 25 && precedingToken.parent.kind !== 188) {
+                if (precedingToken.kind === 25 && precedingToken.parent.kind !== 192) {
                     var actualIndentation = getActualIndentationForListItemBeforeComma(precedingToken, sourceFile, options);
                     if (actualIndentation !== -1) {
                         return actualIndentation;
@@ -60794,7 +61695,7 @@ var ts;
             }
             function getActualIndentationForNode(current, parent, currentLineAndChar, parentAndChildShareLine, sourceFile, options) {
                 var useActualIndentation = (ts.isDeclaration(current) || ts.isStatementButNotDeclaration(current)) &&
-                    (parent.kind === 256 || !parentAndChildShareLine);
+                    (parent.kind === 261 || !parentAndChildShareLine);
                 if (!useActualIndentation) {
                     return -1;
                 }
@@ -60818,7 +61719,7 @@ var ts;
                 return sourceFile.getLineAndCharacterOfPosition(n.getStart(sourceFile));
             }
             function childStartsOnTheSameLineWithElseInIfStatement(parent, child, childStartLine, sourceFile) {
-                if (parent.kind === 204 && parent.elseStatement === child) {
+                if (parent.kind === 208 && parent.elseStatement === child) {
                     var elseKeyword = ts.findChildOfKind(parent, 81, sourceFile);
                     ts.Debug.assert(elseKeyword !== undefined);
                     var elseKeywordStartLine = getStartLineAndCharacterForNode(elseKeyword, sourceFile).line;
@@ -60830,23 +61731,23 @@ var ts;
             function getContainingList(node, sourceFile) {
                 if (node.parent) {
                     switch (node.parent.kind) {
-                        case 156:
+                        case 157:
                             if (node.parent.typeArguments &&
                                 ts.rangeContainsStartEnd(node.parent.typeArguments, node.getStart(sourceFile), node.getEnd())) {
                                 return node.parent.typeArguments;
                             }
                             break;
-                        case 172:
+                        case 176:
                             return node.parent.properties;
-                        case 171:
+                        case 175:
                             return node.parent.elements;
-                        case 221:
-                        case 180:
-                        case 181:
+                        case 225:
+                        case 184:
+                        case 185:
+                        case 149:
                         case 148:
-                        case 147:
-                        case 152:
-                        case 153: {
+                        case 153:
+                        case 154: {
                             var start = node.getStart(sourceFile);
                             if (node.parent.typeParameters &&
                                 ts.rangeContainsStartEnd(node.parent.typeParameters, start, node.getEnd())) {
@@ -60857,8 +61758,8 @@ var ts;
                             }
                             break;
                         }
-                        case 176:
-                        case 175: {
+                        case 180:
+                        case 179: {
                             var start = node.getStart(sourceFile);
                             if (node.parent.typeArguments &&
                                 ts.rangeContainsStartEnd(node.parent.typeArguments, start, node.getEnd())) {
@@ -60886,8 +61787,8 @@ var ts;
                 if (node.kind === 19) {
                     return -1;
                 }
-                if (node.parent && (node.parent.kind === 175 ||
-                    node.parent.kind === 176) &&
+                if (node.parent && (node.parent.kind === 179 ||
+                    node.parent.kind === 180) &&
                     node.parent.expression !== node) {
                     var fullCallOrNewExpression = node.parent.expression;
                     var startingExpression = getStartingExpression(fullCallOrNewExpression);
@@ -60905,10 +61806,10 @@ var ts;
                 function getStartingExpression(node) {
                     while (true) {
                         switch (node.kind) {
-                            case 175:
-                            case 176:
-                            case 173:
-                            case 174:
+                            case 179:
+                            case 180:
+                            case 177:
+                            case 178:
                                 node = node.expression;
                                 break;
                             default:
@@ -60962,48 +61863,48 @@ var ts;
             SmartIndenter.findFirstNonWhitespaceColumn = findFirstNonWhitespaceColumn;
             function nodeContentIsAlwaysIndented(kind) {
                 switch (kind) {
-                    case 203:
-                    case 222:
-                    case 193:
-                    case 223:
-                    case 225:
-                    case 224:
-                    case 171:
-                    case 200:
+                    case 207:
+                    case 226:
+                    case 197:
                     case 227:
-                    case 172:
-                    case 160:
-                    case 162:
+                    case 229:
                     case 228:
-                    case 250:
-                    case 249:
-                    case 179:
-                    case 173:
                     case 175:
+                    case 204:
+                    case 231:
                     case 176:
-                    case 201:
-                    case 219:
-                    case 236:
-                    case 212:
-                    case 189:
-                    case 169:
-                    case 168:
-                    case 244:
-                    case 243:
-                    case 248:
-                    case 147:
-                    case 152:
-                    case 153:
-                    case 143:
-                    case 157:
-                    case 158:
-                    case 165:
+                    case 161:
+                    case 163:
+                    case 232:
+                    case 254:
+                    case 253:
+                    case 183:
                     case 177:
-                    case 185:
+                    case 179:
+                    case 180:
+                    case 205:
+                    case 223:
+                    case 240:
+                    case 216:
+                    case 193:
+                    case 173:
+                    case 172:
+                    case 248:
+                    case 247:
+                    case 252:
+                    case 148:
+                    case 153:
+                    case 154:
+                    case 144:
+                    case 158:
+                    case 159:
+                    case 166:
+                    case 181:
+                    case 189:
+                    case 242:
                     case 238:
-                    case 234:
+                    case 243:
                     case 239:
-                    case 235:
                         return true;
                 }
                 return false;
@@ -61011,27 +61912,27 @@ var ts;
             function nodeWillIndentChild(parent, child, indentByDefault) {
                 var childKind = child ? child.kind : 0;
                 switch (parent.kind) {
-                    case 205:
-                    case 206:
-                    case 208:
                     case 209:
-                    case 207:
-                    case 204:
-                    case 221:
-                    case 180:
-                    case 148:
-                    case 181:
+                    case 210:
+                    case 212:
+                    case 213:
+                    case 211:
+                    case 208:
+                    case 225:
+                    case 184:
                     case 149:
+                    case 185:
                     case 150:
                     case 151:
-                        return childKind !== 200;
-                    case 237:
-                        return childKind !== 238;
-                    case 231:
-                        return childKind !== 232 ||
-                            (child.namedBindings && child.namedBindings.kind !== 234);
-                    case 242:
-                        return childKind !== 245;
+                    case 152:
+                        return childKind !== 204;
+                    case 241:
+                        return childKind !== 242;
+                    case 235:
+                        return childKind !== 236 ||
+                            (child.namedBindings && child.namedBindings.kind !== 238);
+                    case 246:
+                        return childKind !== 249;
                 }
                 return indentByDefault;
             }
@@ -61112,7 +62013,7 @@ var ts;
                 if (!superCall) {
                     return undefined;
                 }
-                if (superCall.expression && superCall.expression.kind == 175) {
+                if (superCall.expression && superCall.expression.kind == 179) {
                     var arguments_1 = superCall.expression.arguments;
                     for (var i = 0; i < arguments_1.length; i++) {
                         if (arguments_1[i].expression === token) {
@@ -61136,7 +62037,7 @@ var ts;
                         changes: changes
                     }];
                 function findSuperCall(n) {
-                    if (n.kind === 203 && ts.isSuperCall(n.expression)) {
+                    if (n.kind === 207 && ts.isSuperCall(n.expression)) {
                         return n;
                     }
                     if (ts.isFunctionLike(n)) {
@@ -61152,7 +62053,7 @@ var ts;
 (function (ts) {
     ts.servicesVersion = "0.5";
     function createNode(kind, pos, end, parent) {
-        var node = kind >= 140 ? new NodeObject(kind, pos, end) :
+        var node = kind >= 141 ? new NodeObject(kind, pos, end) :
             kind === 70 ? new IdentifierObject(70, pos, end) :
                 new TokenObject(kind, pos, end);
         node.parent = parent;
@@ -61164,7 +62065,6 @@ var ts;
             this.end = end;
             this.flags = 0;
             this.transformFlags = undefined;
-            this.excludeTransformFlags = undefined;
             this.parent = undefined;
             this.kind = kind;
         }
@@ -61211,11 +62111,11 @@ var ts;
             return pos;
         };
         NodeObject.prototype.createSyntaxList = function (nodes) {
-            var list = createNode(286, nodes.pos, nodes.end, this);
+            var list = createNode(291, nodes.pos, nodes.end, this);
             list._children = [];
             var pos = nodes.pos;
-            for (var _i = 0, nodes_4 = nodes; _i < nodes_4.length; _i++) {
-                var node = nodes_4[_i];
+            for (var _i = 0, nodes_5 = nodes; _i < nodes_5.length; _i++) {
+                var node = nodes_5[_i];
                 if (pos < node.pos) {
                     pos = this.addSyntheticNodes(list._children, pos, node.pos);
                 }
@@ -61230,11 +62130,11 @@ var ts;
         NodeObject.prototype.createChildren = function (sourceFile) {
             var _this = this;
             var children;
-            if (this.kind >= 140) {
+            if (this.kind >= 141) {
                 ts.scanner.setText((sourceFile || this.getSourceFile()).text);
                 children = [];
                 var pos_3 = this.pos;
-                var useJSDocScanner_1 = this.kind >= 273 && this.kind <= 285;
+                var useJSDocScanner_1 = this.kind >= 278 && this.kind <= 290;
                 var processNode = function (node) {
                     var isJSDocTagNode = ts.isJSDocTag(node);
                     if (!isJSDocTagNode && pos_3 < node.pos) {
@@ -61288,7 +62188,7 @@ var ts;
                 return undefined;
             }
             var child = children[0];
-            return child.kind < 140 ? child : child.getFirstToken(sourceFile);
+            return child.kind < 141 ? child : child.getFirstToken(sourceFile);
         };
         NodeObject.prototype.getLastToken = function (sourceFile) {
             var children = this.getChildren(sourceFile);
@@ -61296,7 +62196,7 @@ var ts;
             if (!child) {
                 return undefined;
             }
-            return child.kind < 140 ? child : child.getLastToken(sourceFile);
+            return child.kind < 141 ? child : child.getLastToken(sourceFile);
         };
         return NodeObject;
     }());
@@ -61423,7 +62323,7 @@ var ts;
             return this.checker.getIndexTypeOfType(this, 1);
         };
         TypeObject.prototype.getBaseTypes = function () {
-            return this.flags & (32768 | 65536)
+            return this.flags & 32768 && this.objectFlags & (1 | 2)
                 ? this.checker.getBaseTypes(this)
                 : undefined;
         };
@@ -61498,9 +62398,9 @@ var ts;
                     if (result_6 !== undefined) {
                         return result_6;
                     }
-                    if (declaration.name.kind === 141) {
+                    if (declaration.name.kind === 142) {
                         var expr = declaration.name.expression;
-                        if (expr.kind === 173) {
+                        if (expr.kind === 177) {
                             return expr.name.text;
                         }
                         return getTextOfIdentifierOrLiteral(expr);
@@ -61520,10 +62420,10 @@ var ts;
             }
             function visit(node) {
                 switch (node.kind) {
-                    case 221:
-                    case 180:
+                    case 225:
+                    case 184:
+                    case 149:
                     case 148:
-                    case 147:
                         var functionDeclaration = node;
                         var declarationName = getDeclarationName(functionDeclaration);
                         if (declarationName) {
@@ -61540,30 +62440,30 @@ var ts;
                             ts.forEachChild(node, visit);
                         }
                         break;
-                    case 222:
-                    case 193:
-                    case 223:
-                    case 224:
-                    case 225:
                     case 226:
+                    case 197:
+                    case 227:
+                    case 228:
+                    case 229:
                     case 230:
+                    case 234:
+                    case 243:
                     case 239:
-                    case 235:
-                    case 230:
-                    case 232:
-                    case 233:
-                    case 150:
+                    case 234:
+                    case 236:
+                    case 237:
                     case 151:
-                    case 160:
+                    case 152:
+                    case 161:
                         addDeclaration(node);
                         ts.forEachChild(node, visit);
                         break;
-                    case 143:
+                    case 144:
                         if (!ts.hasModifier(node, 92)) {
                             break;
                         }
-                    case 219:
-                    case 170: {
+                    case 223:
+                    case 174: {
                         var decl = node;
                         if (ts.isBindingPattern(decl.name)) {
                             ts.forEachChild(decl.name, visit);
@@ -61572,24 +62472,24 @@ var ts;
                         if (decl.initializer)
                             visit(decl.initializer);
                     }
-                    case 255:
+                    case 260:
+                    case 147:
                     case 146:
-                    case 145:
                         addDeclaration(node);
                         break;
-                    case 237:
+                    case 241:
                         if (node.exportClause) {
                             ts.forEach(node.exportClause.elements, visit);
                         }
                         break;
-                    case 231:
+                    case 235:
                         var importClause = node.importClause;
                         if (importClause) {
                             if (importClause.name) {
                                 addDeclaration(importClause);
                             }
                             if (importClause.namedBindings) {
-                                if (importClause.namedBindings.kind === 233) {
+                                if (importClause.namedBindings.kind === 237) {
                                     addDeclaration(importClause.namedBindings);
                                 }
                                 else {
@@ -61735,7 +62635,7 @@ var ts;
             var version = this.host.getScriptVersion(fileName);
             var sourceFile;
             if (this.currentFileName !== fileName) {
-                sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, 4, version, true, scriptKind);
+                sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, 5, version, true, scriptKind);
             }
             else if (this.currentFileVersion !== version) {
                 var editRange = scriptSnapshot.getChangeRange(this.currentFileScriptSnapshot);
@@ -61888,7 +62788,7 @@ var ts;
                 useCaseSensitiveFileNames: function () { return useCaseSensitivefileNames; },
                 getNewLine: function () { return ts.getNewLineOrDefaultFromHost(host); },
                 getDefaultLibFileName: function (options) { return host.getDefaultLibFileName(options); },
-                writeFile: function () { },
+                writeFile: ts.noop,
                 getCurrentDirectory: function () { return currentDirectory; },
                 fileExists: function (fileName) {
                     return hostCache.getOrCreateEntry(fileName) !== undefined;
@@ -62031,10 +62931,10 @@ var ts;
             if (!symbol || typeChecker.isUnknownSymbol(symbol)) {
                 switch (node.kind) {
                     case 70:
-                    case 173:
-                    case 140:
+                    case 177:
+                    case 141:
                     case 98:
-                    case 166:
+                    case 167:
                     case 96:
                         var type = typeChecker.getTypeAtLocation(node);
                         if (type) {
@@ -62163,15 +63063,15 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 173:
-                case 140:
+                case 177:
+                case 141:
                 case 9:
                 case 85:
                 case 100:
                 case 94:
                 case 96:
                 case 98:
-                case 166:
+                case 167:
                 case 70:
                     break;
                 default:
@@ -62183,7 +63083,7 @@ var ts;
                     nodeForStartPos = nodeForStartPos.parent;
                 }
                 else if (ts.isNameOfModuleDeclaration(nodeForStartPos)) {
-                    if (nodeForStartPos.parent.parent.kind === 226 &&
+                    if (nodeForStartPos.parent.parent.kind === 230 &&
                         nodeForStartPos.parent.parent.body === nodeForStartPos.parent) {
                         nodeForStartPos = nodeForStartPos.parent.parent.name;
                     }
@@ -62479,7 +63379,7 @@ var ts;
                 case 9:
                 case 8:
                     if (ts.isDeclarationName(node) ||
-                        node.parent.kind === 241 ||
+                        node.parent.kind === 245 ||
                         isArgumentOfElementAccessExpression(node) ||
                         ts.isLiteralComputedPropertyDeclarationName(node)) {
                         nameTable[node.text] = nameTable[node.text] === undefined ? node.pos : -1;
@@ -62499,7 +63399,7 @@ var ts;
     function isArgumentOfElementAccessExpression(node) {
         return node &&
             node.parent &&
-            node.parent.kind === 174 &&
+            node.parent.kind === 178 &&
             node.parent.argumentExpression === node;
     }
     function getDefaultLibFilePath(options) {
@@ -62514,933 +63414,6 @@ var ts;
     }
     initializeServices();
 })(ts || (ts = {}));
-var debugObjectHost = (function () { return this; })();
-var ts;
-(function (ts) {
-    function logInternalError(logger, err) {
-        if (logger) {
-            logger.log("*INTERNAL ERROR* - Exception in typescript services: " + err.message);
-        }
-    }
-    var ScriptSnapshotShimAdapter = (function () {
-        function ScriptSnapshotShimAdapter(scriptSnapshotShim) {
-            this.scriptSnapshotShim = scriptSnapshotShim;
-        }
-        ScriptSnapshotShimAdapter.prototype.getText = function (start, end) {
-            return this.scriptSnapshotShim.getText(start, end);
-        };
-        ScriptSnapshotShimAdapter.prototype.getLength = function () {
-            return this.scriptSnapshotShim.getLength();
-        };
-        ScriptSnapshotShimAdapter.prototype.getChangeRange = function (oldSnapshot) {
-            var oldSnapshotShim = oldSnapshot;
-            var encoded = this.scriptSnapshotShim.getChangeRange(oldSnapshotShim.scriptSnapshotShim);
-            if (encoded == null) {
-                return null;
-            }
-            var decoded = JSON.parse(encoded);
-            return ts.createTextChangeRange(ts.createTextSpan(decoded.span.start, decoded.span.length), decoded.newLength);
-        };
-        ScriptSnapshotShimAdapter.prototype.dispose = function () {
-            if ("dispose" in this.scriptSnapshotShim) {
-                this.scriptSnapshotShim.dispose();
-            }
-        };
-        return ScriptSnapshotShimAdapter;
-    }());
-    var LanguageServiceShimHostAdapter = (function () {
-        function LanguageServiceShimHostAdapter(shimHost) {
-            var _this = this;
-            this.shimHost = shimHost;
-            this.loggingEnabled = false;
-            this.tracingEnabled = false;
-            if ("getModuleResolutionsForFile" in this.shimHost) {
-                this.resolveModuleNames = function (moduleNames, containingFile) {
-                    var resolutionsInFile = JSON.parse(_this.shimHost.getModuleResolutionsForFile(containingFile));
-                    return ts.map(moduleNames, function (name) {
-                        var result = ts.getProperty(resolutionsInFile, name);
-                        return result ? { resolvedFileName: result } : undefined;
-                    });
-                };
-            }
-            if ("directoryExists" in this.shimHost) {
-                this.directoryExists = function (directoryName) { return _this.shimHost.directoryExists(directoryName); };
-            }
-            if ("getTypeReferenceDirectiveResolutionsForFile" in this.shimHost) {
-                this.resolveTypeReferenceDirectives = function (typeDirectiveNames, containingFile) {
-                    var typeDirectivesForFile = JSON.parse(_this.shimHost.getTypeReferenceDirectiveResolutionsForFile(containingFile));
-                    return ts.map(typeDirectiveNames, function (name) { return ts.getProperty(typeDirectivesForFile, name); });
-                };
-            }
-        }
-        LanguageServiceShimHostAdapter.prototype.log = function (s) {
-            if (this.loggingEnabled) {
-                this.shimHost.log(s);
-            }
-        };
-        LanguageServiceShimHostAdapter.prototype.trace = function (s) {
-            if (this.tracingEnabled) {
-                this.shimHost.trace(s);
-            }
-        };
-        LanguageServiceShimHostAdapter.prototype.error = function (s) {
-            this.shimHost.error(s);
-        };
-        LanguageServiceShimHostAdapter.prototype.getProjectVersion = function () {
-            if (!this.shimHost.getProjectVersion) {
-                return undefined;
-            }
-            return this.shimHost.getProjectVersion();
-        };
-        LanguageServiceShimHostAdapter.prototype.getTypeRootsVersion = function () {
-            if (!this.shimHost.getTypeRootsVersion) {
-                return 0;
-            }
-            return this.shimHost.getTypeRootsVersion();
-        };
-        LanguageServiceShimHostAdapter.prototype.useCaseSensitiveFileNames = function () {
-            return this.shimHost.useCaseSensitiveFileNames ? this.shimHost.useCaseSensitiveFileNames() : false;
-        };
-        LanguageServiceShimHostAdapter.prototype.getCompilationSettings = function () {
-            var settingsJson = this.shimHost.getCompilationSettings();
-            if (settingsJson == null || settingsJson == "") {
-                throw Error("LanguageServiceShimHostAdapter.getCompilationSettings: empty compilationSettings");
-            }
-            return JSON.parse(settingsJson);
-        };
-        LanguageServiceShimHostAdapter.prototype.getScriptFileNames = function () {
-            var encoded = this.shimHost.getScriptFileNames();
-            return this.files = JSON.parse(encoded);
-        };
-        LanguageServiceShimHostAdapter.prototype.getScriptSnapshot = function (fileName) {
-            var scriptSnapshot = this.shimHost.getScriptSnapshot(fileName);
-            return scriptSnapshot && new ScriptSnapshotShimAdapter(scriptSnapshot);
-        };
-        LanguageServiceShimHostAdapter.prototype.getScriptKind = function (fileName) {
-            if ("getScriptKind" in this.shimHost) {
-                return this.shimHost.getScriptKind(fileName);
-            }
-            else {
-                return 0;
-            }
-        };
-        LanguageServiceShimHostAdapter.prototype.getScriptVersion = function (fileName) {
-            return this.shimHost.getScriptVersion(fileName);
-        };
-        LanguageServiceShimHostAdapter.prototype.getLocalizedDiagnosticMessages = function () {
-            var diagnosticMessagesJson = this.shimHost.getLocalizedDiagnosticMessages();
-            if (diagnosticMessagesJson == null || diagnosticMessagesJson == "") {
-                return null;
-            }
-            try {
-                return JSON.parse(diagnosticMessagesJson);
-            }
-            catch (e) {
-                this.log(e.description || "diagnosticMessages.generated.json has invalid JSON format");
-                return null;
-            }
-        };
-        LanguageServiceShimHostAdapter.prototype.getCancellationToken = function () {
-            var hostCancellationToken = this.shimHost.getCancellationToken();
-            return new ThrottledCancellationToken(hostCancellationToken);
-        };
-        LanguageServiceShimHostAdapter.prototype.getCurrentDirectory = function () {
-            return this.shimHost.getCurrentDirectory();
-        };
-        LanguageServiceShimHostAdapter.prototype.getDirectories = function (path) {
-            return JSON.parse(this.shimHost.getDirectories(path));
-        };
-        LanguageServiceShimHostAdapter.prototype.getDefaultLibFileName = function (options) {
-            return this.shimHost.getDefaultLibFileName(JSON.stringify(options));
-        };
-        LanguageServiceShimHostAdapter.prototype.readDirectory = function (path, extensions, exclude, include, depth) {
-            var pattern = ts.getFileMatcherPatterns(path, exclude, include, this.shimHost.useCaseSensitiveFileNames(), this.shimHost.getCurrentDirectory());
-            return JSON.parse(this.shimHost.readDirectory(path, JSON.stringify(extensions), JSON.stringify(pattern.basePaths), pattern.excludePattern, pattern.includeFilePattern, pattern.includeDirectoryPattern, depth));
-        };
-        LanguageServiceShimHostAdapter.prototype.readFile = function (path, encoding) {
-            return this.shimHost.readFile(path, encoding);
-        };
-        LanguageServiceShimHostAdapter.prototype.fileExists = function (path) {
-            return this.shimHost.fileExists(path);
-        };
-        return LanguageServiceShimHostAdapter;
-    }());
-    ts.LanguageServiceShimHostAdapter = LanguageServiceShimHostAdapter;
-    var ThrottledCancellationToken = (function () {
-        function ThrottledCancellationToken(hostCancellationToken) {
-            this.hostCancellationToken = hostCancellationToken;
-            this.lastCancellationCheckTime = 0;
-        }
-        ThrottledCancellationToken.prototype.isCancellationRequested = function () {
-            var time = ts.timestamp();
-            var duration = Math.abs(time - this.lastCancellationCheckTime);
-            if (duration > 10) {
-                this.lastCancellationCheckTime = time;
-                return this.hostCancellationToken.isCancellationRequested();
-            }
-            return false;
-        };
-        return ThrottledCancellationToken;
-    }());
-    var CoreServicesShimHostAdapter = (function () {
-        function CoreServicesShimHostAdapter(shimHost) {
-            var _this = this;
-            this.shimHost = shimHost;
-            this.useCaseSensitiveFileNames = this.shimHost.useCaseSensitiveFileNames ? this.shimHost.useCaseSensitiveFileNames() : false;
-            if ("directoryExists" in this.shimHost) {
-                this.directoryExists = function (directoryName) { return _this.shimHost.directoryExists(directoryName); };
-            }
-            if ("realpath" in this.shimHost) {
-                this.realpath = function (path) { return _this.shimHost.realpath(path); };
-            }
-        }
-        CoreServicesShimHostAdapter.prototype.readDirectory = function (rootDir, extensions, exclude, include, depth) {
-            try {
-                var pattern = ts.getFileMatcherPatterns(rootDir, exclude, include, this.shimHost.useCaseSensitiveFileNames(), this.shimHost.getCurrentDirectory());
-                return JSON.parse(this.shimHost.readDirectory(rootDir, JSON.stringify(extensions), JSON.stringify(pattern.basePaths), pattern.excludePattern, pattern.includeFilePattern, pattern.includeDirectoryPattern, depth));
-            }
-            catch (e) {
-                var results = [];
-                for (var _i = 0, extensions_2 = extensions; _i < extensions_2.length; _i++) {
-                    var extension = extensions_2[_i];
-                    for (var _a = 0, _b = this.readDirectoryFallback(rootDir, extension, exclude); _a < _b.length; _a++) {
-                        var file = _b[_a];
-                        if (!ts.contains(results, file)) {
-                            results.push(file);
-                        }
-                    }
-                }
-                return results;
-            }
-        };
-        CoreServicesShimHostAdapter.prototype.fileExists = function (fileName) {
-            return this.shimHost.fileExists(fileName);
-        };
-        CoreServicesShimHostAdapter.prototype.readFile = function (fileName) {
-            return this.shimHost.readFile(fileName);
-        };
-        CoreServicesShimHostAdapter.prototype.readDirectoryFallback = function (rootDir, extension, exclude) {
-            return JSON.parse(this.shimHost.readDirectory(rootDir, extension, JSON.stringify(exclude)));
-        };
-        CoreServicesShimHostAdapter.prototype.getDirectories = function (path) {
-            return JSON.parse(this.shimHost.getDirectories(path));
-        };
-        return CoreServicesShimHostAdapter;
-    }());
-    ts.CoreServicesShimHostAdapter = CoreServicesShimHostAdapter;
-    function simpleForwardCall(logger, actionDescription, action, logPerformance) {
-        var start;
-        if (logPerformance) {
-            logger.log(actionDescription);
-            start = ts.timestamp();
-        }
-        var result = action();
-        if (logPerformance) {
-            var end = ts.timestamp();
-            logger.log(actionDescription + " completed in " + (end - start) + " msec");
-            if (typeof result === "string") {
-                var str = result;
-                if (str.length > 128) {
-                    str = str.substring(0, 128) + "...";
-                }
-                logger.log("  result.length=" + str.length + ", result='" + JSON.stringify(str) + "'");
-            }
-        }
-        return result;
-    }
-    function forwardJSONCall(logger, actionDescription, action, logPerformance) {
-        return forwardCall(logger, actionDescription, true, action, logPerformance);
-    }
-    function forwardCall(logger, actionDescription, returnJson, action, logPerformance) {
-        try {
-            var result = simpleForwardCall(logger, actionDescription, action, logPerformance);
-            return returnJson ? JSON.stringify({ result: result }) : result;
-        }
-        catch (err) {
-            if (err instanceof ts.OperationCanceledException) {
-                return JSON.stringify({ canceled: true });
-            }
-            logInternalError(logger, err);
-            err.description = actionDescription;
-            return JSON.stringify({ error: err });
-        }
-    }
-    var ShimBase = (function () {
-        function ShimBase(factory) {
-            this.factory = factory;
-            factory.registerShim(this);
-        }
-        ShimBase.prototype.dispose = function (_dummy) {
-            this.factory.unregisterShim(this);
-        };
-        return ShimBase;
-    }());
-    function realizeDiagnostics(diagnostics, newLine) {
-        return diagnostics.map(function (d) { return realizeDiagnostic(d, newLine); });
-    }
-    ts.realizeDiagnostics = realizeDiagnostics;
-    function realizeDiagnostic(diagnostic, newLine) {
-        return {
-            message: ts.flattenDiagnosticMessageText(diagnostic.messageText, newLine),
-            start: diagnostic.start,
-            length: diagnostic.length,
-            category: ts.DiagnosticCategory[diagnostic.category].toLowerCase(),
-            code: diagnostic.code
-        };
-    }
-    var LanguageServiceShimObject = (function (_super) {
-        __extends(LanguageServiceShimObject, _super);
-        function LanguageServiceShimObject(factory, host, languageService) {
-            var _this = _super.call(this, factory) || this;
-            _this.host = host;
-            _this.languageService = languageService;
-            _this.logPerformance = false;
-            _this.logger = _this.host;
-            return _this;
-        }
-        LanguageServiceShimObject.prototype.forwardJSONCall = function (actionDescription, action) {
-            return forwardJSONCall(this.logger, actionDescription, action, this.logPerformance);
-        };
-        LanguageServiceShimObject.prototype.dispose = function (dummy) {
-            this.logger.log("dispose()");
-            this.languageService.dispose();
-            this.languageService = null;
-            if (debugObjectHost && debugObjectHost.CollectGarbage) {
-                debugObjectHost.CollectGarbage();
-                this.logger.log("CollectGarbage()");
-            }
-            this.logger = null;
-            _super.prototype.dispose.call(this, dummy);
-        };
-        LanguageServiceShimObject.prototype.refresh = function (throwOnError) {
-            this.forwardJSONCall("refresh(" + throwOnError + ")", function () { return null; });
-        };
-        LanguageServiceShimObject.prototype.cleanupSemanticCache = function () {
-            var _this = this;
-            this.forwardJSONCall("cleanupSemanticCache()", function () {
-                _this.languageService.cleanupSemanticCache();
-                return null;
-            });
-        };
-        LanguageServiceShimObject.prototype.realizeDiagnostics = function (diagnostics) {
-            var newLine = ts.getNewLineOrDefaultFromHost(this.host);
-            return ts.realizeDiagnostics(diagnostics, newLine);
-        };
-        LanguageServiceShimObject.prototype.getSyntacticClassifications = function (fileName, start, length) {
-            var _this = this;
-            return this.forwardJSONCall("getSyntacticClassifications('" + fileName + "', " + start + ", " + length + ")", function () { return _this.languageService.getSyntacticClassifications(fileName, ts.createTextSpan(start, length)); });
-        };
-        LanguageServiceShimObject.prototype.getSemanticClassifications = function (fileName, start, length) {
-            var _this = this;
-            return this.forwardJSONCall("getSemanticClassifications('" + fileName + "', " + start + ", " + length + ")", function () { return _this.languageService.getSemanticClassifications(fileName, ts.createTextSpan(start, length)); });
-        };
-        LanguageServiceShimObject.prototype.getEncodedSyntacticClassifications = function (fileName, start, length) {
-            var _this = this;
-            return this.forwardJSONCall("getEncodedSyntacticClassifications('" + fileName + "', " + start + ", " + length + ")", function () { return convertClassifications(_this.languageService.getEncodedSyntacticClassifications(fileName, ts.createTextSpan(start, length))); });
-        };
-        LanguageServiceShimObject.prototype.getEncodedSemanticClassifications = function (fileName, start, length) {
-            var _this = this;
-            return this.forwardJSONCall("getEncodedSemanticClassifications('" + fileName + "', " + start + ", " + length + ")", function () { return convertClassifications(_this.languageService.getEncodedSemanticClassifications(fileName, ts.createTextSpan(start, length))); });
-        };
-        LanguageServiceShimObject.prototype.getSyntacticDiagnostics = function (fileName) {
-            var _this = this;
-            return this.forwardJSONCall("getSyntacticDiagnostics('" + fileName + "')", function () {
-                var diagnostics = _this.languageService.getSyntacticDiagnostics(fileName);
-                return _this.realizeDiagnostics(diagnostics);
-            });
-        };
-        LanguageServiceShimObject.prototype.getSemanticDiagnostics = function (fileName) {
-            var _this = this;
-            return this.forwardJSONCall("getSemanticDiagnostics('" + fileName + "')", function () {
-                var diagnostics = _this.languageService.getSemanticDiagnostics(fileName);
-                return _this.realizeDiagnostics(diagnostics);
-            });
-        };
-        LanguageServiceShimObject.prototype.getCompilerOptionsDiagnostics = function () {
-            var _this = this;
-            return this.forwardJSONCall("getCompilerOptionsDiagnostics()", function () {
-                var diagnostics = _this.languageService.getCompilerOptionsDiagnostics();
-                return _this.realizeDiagnostics(diagnostics);
-            });
-        };
-        LanguageServiceShimObject.prototype.getQuickInfoAtPosition = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getQuickInfoAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getQuickInfoAtPosition(fileName, position); });
-        };
-        LanguageServiceShimObject.prototype.getNameOrDottedNameSpan = function (fileName, startPos, endPos) {
-            var _this = this;
-            return this.forwardJSONCall("getNameOrDottedNameSpan('" + fileName + "', " + startPos + ", " + endPos + ")", function () { return _this.languageService.getNameOrDottedNameSpan(fileName, startPos, endPos); });
-        };
-        LanguageServiceShimObject.prototype.getBreakpointStatementAtPosition = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getBreakpointStatementAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getBreakpointStatementAtPosition(fileName, position); });
-        };
-        LanguageServiceShimObject.prototype.getSignatureHelpItems = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getSignatureHelpItems('" + fileName + "', " + position + ")", function () { return _this.languageService.getSignatureHelpItems(fileName, position); });
-        };
-        LanguageServiceShimObject.prototype.getDefinitionAtPosition = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getDefinitionAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getDefinitionAtPosition(fileName, position); });
-        };
-        LanguageServiceShimObject.prototype.getTypeDefinitionAtPosition = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getTypeDefinitionAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getTypeDefinitionAtPosition(fileName, position); });
-        };
-        LanguageServiceShimObject.prototype.getImplementationAtPosition = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getImplementationAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getImplementationAtPosition(fileName, position); });
-        };
-        LanguageServiceShimObject.prototype.getRenameInfo = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getRenameInfo('" + fileName + "', " + position + ")", function () { return _this.languageService.getRenameInfo(fileName, position); });
-        };
-        LanguageServiceShimObject.prototype.findRenameLocations = function (fileName, position, findInStrings, findInComments) {
-            var _this = this;
-            return this.forwardJSONCall("findRenameLocations('" + fileName + "', " + position + ", " + findInStrings + ", " + findInComments + ")", function () { return _this.languageService.findRenameLocations(fileName, position, findInStrings, findInComments); });
-        };
-        LanguageServiceShimObject.prototype.getBraceMatchingAtPosition = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getBraceMatchingAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getBraceMatchingAtPosition(fileName, position); });
-        };
-        LanguageServiceShimObject.prototype.isValidBraceCompletionAtPosition = function (fileName, position, openingBrace) {
-            var _this = this;
-            return this.forwardJSONCall("isValidBraceCompletionAtPosition('" + fileName + "', " + position + ", " + openingBrace + ")", function () { return _this.languageService.isValidBraceCompletionAtPosition(fileName, position, openingBrace); });
-        };
-        LanguageServiceShimObject.prototype.getIndentationAtPosition = function (fileName, position, options) {
-            var _this = this;
-            return this.forwardJSONCall("getIndentationAtPosition('" + fileName + "', " + position + ")", function () {
-                var localOptions = JSON.parse(options);
-                return _this.languageService.getIndentationAtPosition(fileName, position, localOptions);
-            });
-        };
-        LanguageServiceShimObject.prototype.getReferencesAtPosition = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getReferencesAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getReferencesAtPosition(fileName, position); });
-        };
-        LanguageServiceShimObject.prototype.findReferences = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("findReferences('" + fileName + "', " + position + ")", function () { return _this.languageService.findReferences(fileName, position); });
-        };
-        LanguageServiceShimObject.prototype.getOccurrencesAtPosition = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getOccurrencesAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getOccurrencesAtPosition(fileName, position); });
-        };
-        LanguageServiceShimObject.prototype.getDocumentHighlights = function (fileName, position, filesToSearch) {
-            var _this = this;
-            return this.forwardJSONCall("getDocumentHighlights('" + fileName + "', " + position + ")", function () {
-                var results = _this.languageService.getDocumentHighlights(fileName, position, JSON.parse(filesToSearch));
-                var normalizedName = ts.normalizeSlashes(fileName).toLowerCase();
-                return ts.filter(results, function (r) { return ts.normalizeSlashes(r.fileName).toLowerCase() === normalizedName; });
-            });
-        };
-        LanguageServiceShimObject.prototype.getCompletionsAtPosition = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getCompletionsAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getCompletionsAtPosition(fileName, position); });
-        };
-        LanguageServiceShimObject.prototype.getCompletionEntryDetails = function (fileName, position, entryName) {
-            var _this = this;
-            return this.forwardJSONCall("getCompletionEntryDetails('" + fileName + "', " + position + ", '" + entryName + "')", function () { return _this.languageService.getCompletionEntryDetails(fileName, position, entryName); });
-        };
-        LanguageServiceShimObject.prototype.getFormattingEditsForRange = function (fileName, start, end, options) {
-            var _this = this;
-            return this.forwardJSONCall("getFormattingEditsForRange('" + fileName + "', " + start + ", " + end + ")", function () {
-                var localOptions = JSON.parse(options);
-                return _this.languageService.getFormattingEditsForRange(fileName, start, end, localOptions);
-            });
-        };
-        LanguageServiceShimObject.prototype.getFormattingEditsForDocument = function (fileName, options) {
-            var _this = this;
-            return this.forwardJSONCall("getFormattingEditsForDocument('" + fileName + "')", function () {
-                var localOptions = JSON.parse(options);
-                return _this.languageService.getFormattingEditsForDocument(fileName, localOptions);
-            });
-        };
-        LanguageServiceShimObject.prototype.getFormattingEditsAfterKeystroke = function (fileName, position, key, options) {
-            var _this = this;
-            return this.forwardJSONCall("getFormattingEditsAfterKeystroke('" + fileName + "', " + position + ", '" + key + "')", function () {
-                var localOptions = JSON.parse(options);
-                return _this.languageService.getFormattingEditsAfterKeystroke(fileName, position, key, localOptions);
-            });
-        };
-        LanguageServiceShimObject.prototype.getDocCommentTemplateAtPosition = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getDocCommentTemplateAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getDocCommentTemplateAtPosition(fileName, position); });
-        };
-        LanguageServiceShimObject.prototype.getNavigateToItems = function (searchValue, maxResultCount, fileName) {
-            var _this = this;
-            return this.forwardJSONCall("getNavigateToItems('" + searchValue + "', " + maxResultCount + ", " + fileName + ")", function () { return _this.languageService.getNavigateToItems(searchValue, maxResultCount, fileName); });
-        };
-        LanguageServiceShimObject.prototype.getNavigationBarItems = function (fileName) {
-            var _this = this;
-            return this.forwardJSONCall("getNavigationBarItems('" + fileName + "')", function () { return _this.languageService.getNavigationBarItems(fileName); });
-        };
-        LanguageServiceShimObject.prototype.getNavigationTree = function (fileName) {
-            var _this = this;
-            return this.forwardJSONCall("getNavigationTree('" + fileName + "')", function () { return _this.languageService.getNavigationTree(fileName); });
-        };
-        LanguageServiceShimObject.prototype.getOutliningSpans = function (fileName) {
-            var _this = this;
-            return this.forwardJSONCall("getOutliningSpans('" + fileName + "')", function () { return _this.languageService.getOutliningSpans(fileName); });
-        };
-        LanguageServiceShimObject.prototype.getTodoComments = function (fileName, descriptors) {
-            var _this = this;
-            return this.forwardJSONCall("getTodoComments('" + fileName + "')", function () { return _this.languageService.getTodoComments(fileName, JSON.parse(descriptors)); });
-        };
-        LanguageServiceShimObject.prototype.getEmitOutput = function (fileName) {
-            var _this = this;
-            return this.forwardJSONCall("getEmitOutput('" + fileName + "')", function () { return _this.languageService.getEmitOutput(fileName); });
-        };
-        LanguageServiceShimObject.prototype.getEmitOutputObject = function (fileName) {
-            var _this = this;
-            return forwardCall(this.logger, "getEmitOutput('" + fileName + "')", false, function () { return _this.languageService.getEmitOutput(fileName); }, this.logPerformance);
-        };
-        return LanguageServiceShimObject;
-    }(ShimBase));
-    function convertClassifications(classifications) {
-        return { spans: classifications.spans.join(","), endOfLineState: classifications.endOfLineState };
-    }
-    var ClassifierShimObject = (function (_super) {
-        __extends(ClassifierShimObject, _super);
-        function ClassifierShimObject(factory, logger) {
-            var _this = _super.call(this, factory) || this;
-            _this.logger = logger;
-            _this.logPerformance = false;
-            _this.classifier = ts.createClassifier();
-            return _this;
-        }
-        ClassifierShimObject.prototype.getEncodedLexicalClassifications = function (text, lexState, syntacticClassifierAbsent) {
-            var _this = this;
-            return forwardJSONCall(this.logger, "getEncodedLexicalClassifications", function () { return convertClassifications(_this.classifier.getEncodedLexicalClassifications(text, lexState, syntacticClassifierAbsent)); }, this.logPerformance);
-        };
-        ClassifierShimObject.prototype.getClassificationsForLine = function (text, lexState, classifyKeywordsInGenerics) {
-            var classification = this.classifier.getClassificationsForLine(text, lexState, classifyKeywordsInGenerics);
-            var result = "";
-            for (var _i = 0, _a = classification.entries; _i < _a.length; _i++) {
-                var item = _a[_i];
-                result += item.length + "\n";
-                result += item.classification + "\n";
-            }
-            result += classification.finalLexState;
-            return result;
-        };
-        return ClassifierShimObject;
-    }(ShimBase));
-    var CoreServicesShimObject = (function (_super) {
-        __extends(CoreServicesShimObject, _super);
-        function CoreServicesShimObject(factory, logger, host) {
-            var _this = _super.call(this, factory) || this;
-            _this.logger = logger;
-            _this.host = host;
-            _this.logPerformance = false;
-            return _this;
-        }
-        CoreServicesShimObject.prototype.forwardJSONCall = function (actionDescription, action) {
-            return forwardJSONCall(this.logger, actionDescription, action, this.logPerformance);
-        };
-        CoreServicesShimObject.prototype.resolveModuleName = function (fileName, moduleName, compilerOptionsJson) {
-            var _this = this;
-            return this.forwardJSONCall("resolveModuleName('" + fileName + "')", function () {
-                var compilerOptions = JSON.parse(compilerOptionsJson);
-                var result = ts.resolveModuleName(moduleName, ts.normalizeSlashes(fileName), compilerOptions, _this.host);
-                return {
-                    resolvedFileName: result.resolvedModule ? result.resolvedModule.resolvedFileName : undefined,
-                    failedLookupLocations: result.failedLookupLocations
-                };
-            });
-        };
-        CoreServicesShimObject.prototype.resolveTypeReferenceDirective = function (fileName, typeReferenceDirective, compilerOptionsJson) {
-            var _this = this;
-            return this.forwardJSONCall("resolveTypeReferenceDirective(" + fileName + ")", function () {
-                var compilerOptions = JSON.parse(compilerOptionsJson);
-                var result = ts.resolveTypeReferenceDirective(typeReferenceDirective, ts.normalizeSlashes(fileName), compilerOptions, _this.host);
-                return {
-                    resolvedFileName: result.resolvedTypeReferenceDirective ? result.resolvedTypeReferenceDirective.resolvedFileName : undefined,
-                    primary: result.resolvedTypeReferenceDirective ? result.resolvedTypeReferenceDirective.primary : true,
-                    failedLookupLocations: result.failedLookupLocations
-                };
-            });
-        };
-        CoreServicesShimObject.prototype.getPreProcessedFileInfo = function (fileName, sourceTextSnapshot) {
-            var _this = this;
-            return this.forwardJSONCall("getPreProcessedFileInfo('" + fileName + "')", function () {
-                var result = ts.preProcessFile(sourceTextSnapshot.getText(0, sourceTextSnapshot.getLength()), true, true);
-                return {
-                    referencedFiles: _this.convertFileReferences(result.referencedFiles),
-                    importedFiles: _this.convertFileReferences(result.importedFiles),
-                    ambientExternalModules: result.ambientExternalModules,
-                    isLibFile: result.isLibFile,
-                    typeReferenceDirectives: _this.convertFileReferences(result.typeReferenceDirectives)
-                };
-            });
-        };
-        CoreServicesShimObject.prototype.getAutomaticTypeDirectiveNames = function (compilerOptionsJson) {
-            var _this = this;
-            return this.forwardJSONCall("getAutomaticTypeDirectiveNames('" + compilerOptionsJson + "')", function () {
-                var compilerOptions = JSON.parse(compilerOptionsJson);
-                return ts.getAutomaticTypeDirectiveNames(compilerOptions, _this.host);
-            });
-        };
-        CoreServicesShimObject.prototype.convertFileReferences = function (refs) {
-            if (!refs) {
-                return undefined;
-            }
-            var result = [];
-            for (var _i = 0, refs_2 = refs; _i < refs_2.length; _i++) {
-                var ref = refs_2[_i];
-                result.push({
-                    path: ts.normalizeSlashes(ref.fileName),
-                    position: ref.pos,
-                    length: ref.end - ref.pos
-                });
-            }
-            return result;
-        };
-        CoreServicesShimObject.prototype.getTSConfigFileInfo = function (fileName, sourceTextSnapshot) {
-            var _this = this;
-            return this.forwardJSONCall("getTSConfigFileInfo('" + fileName + "')", function () {
-                var text = sourceTextSnapshot.getText(0, sourceTextSnapshot.getLength());
-                var result = ts.parseConfigFileTextToJson(fileName, text);
-                if (result.error) {
-                    return {
-                        options: {},
-                        typingOptions: {},
-                        files: [],
-                        raw: {},
-                        errors: [realizeDiagnostic(result.error, "\r\n")]
-                    };
-                }
-                var normalizedFileName = ts.normalizeSlashes(fileName);
-                var configFile = ts.parseJsonConfigFileContent(result.config, _this.host, ts.getDirectoryPath(normalizedFileName), {}, normalizedFileName);
-                return {
-                    options: configFile.options,
-                    typingOptions: configFile.typingOptions,
-                    files: configFile.fileNames,
-                    raw: configFile.raw,
-                    errors: realizeDiagnostics(configFile.errors, "\r\n")
-                };
-            });
-        };
-        CoreServicesShimObject.prototype.getDefaultCompilationSettings = function () {
-            return this.forwardJSONCall("getDefaultCompilationSettings()", function () { return ts.getDefaultCompilerOptions(); });
-        };
-        CoreServicesShimObject.prototype.discoverTypings = function (discoverTypingsJson) {
-            var _this = this;
-            var getCanonicalFileName = ts.createGetCanonicalFileName(false);
-            return this.forwardJSONCall("discoverTypings()", function () {
-                var info = JSON.parse(discoverTypingsJson);
-                return ts.JsTyping.discoverTypings(_this.host, info.fileNames, ts.toPath(info.projectRootPath, info.projectRootPath, getCanonicalFileName), ts.toPath(info.safeListPath, info.safeListPath, getCanonicalFileName), info.packageNameToTypingLocation, info.typingOptions);
-            });
-        };
-        return CoreServicesShimObject;
-    }(ShimBase));
-    var TypeScriptServicesFactory = (function () {
-        function TypeScriptServicesFactory() {
-            this._shims = [];
-        }
-        TypeScriptServicesFactory.prototype.getServicesVersion = function () {
-            return ts.servicesVersion;
-        };
-        TypeScriptServicesFactory.prototype.createLanguageServiceShim = function (host) {
-            try {
-                if (this.documentRegistry === undefined) {
-                    this.documentRegistry = ts.createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames(), host.getCurrentDirectory());
-                }
-                var hostAdapter = new LanguageServiceShimHostAdapter(host);
-                var languageService = ts.createLanguageService(hostAdapter, this.documentRegistry);
-                return new LanguageServiceShimObject(this, host, languageService);
-            }
-            catch (err) {
-                logInternalError(host, err);
-                throw err;
-            }
-        };
-        TypeScriptServicesFactory.prototype.createClassifierShim = function (logger) {
-            try {
-                return new ClassifierShimObject(this, logger);
-            }
-            catch (err) {
-                logInternalError(logger, err);
-                throw err;
-            }
-        };
-        TypeScriptServicesFactory.prototype.createCoreServicesShim = function (host) {
-            try {
-                var adapter = new CoreServicesShimHostAdapter(host);
-                return new CoreServicesShimObject(this, host, adapter);
-            }
-            catch (err) {
-                logInternalError(host, err);
-                throw err;
-            }
-        };
-        TypeScriptServicesFactory.prototype.close = function () {
-            this._shims = [];
-            this.documentRegistry = undefined;
-        };
-        TypeScriptServicesFactory.prototype.registerShim = function (shim) {
-            this._shims.push(shim);
-        };
-        TypeScriptServicesFactory.prototype.unregisterShim = function (shim) {
-            for (var i = 0, n = this._shims.length; i < n; i++) {
-                if (this._shims[i] === shim) {
-                    delete this._shims[i];
-                    return;
-                }
-            }
-            throw new Error("Invalid operation");
-        };
-        return TypeScriptServicesFactory;
-    }());
-    ts.TypeScriptServicesFactory = TypeScriptServicesFactory;
-    if (typeof module !== "undefined" && module.exports) {
-        module.exports = ts;
-    }
-})(ts || (ts = {}));
-var TypeScript;
-(function (TypeScript) {
-    var Services;
-    (function (Services) {
-        Services.TypeScriptServicesFactory = ts.TypeScriptServicesFactory;
-    })(Services = TypeScript.Services || (TypeScript.Services = {}));
-})(TypeScript || (TypeScript = {}));
-var toolsVersion = "2.1";
-var ts;
-(function (ts) {
-    var server;
-    (function (server) {
-        (function (LogLevel) {
-            LogLevel[LogLevel["terse"] = 0] = "terse";
-            LogLevel[LogLevel["normal"] = 1] = "normal";
-            LogLevel[LogLevel["requestTime"] = 2] = "requestTime";
-            LogLevel[LogLevel["verbose"] = 3] = "verbose";
-        })(server.LogLevel || (server.LogLevel = {}));
-        var LogLevel = server.LogLevel;
-        server.emptyArray = [];
-        var Msg;
-        (function (Msg) {
-            Msg.Err = "Err";
-            Msg.Info = "Info";
-            Msg.Perf = "Perf";
-        })(Msg = server.Msg || (server.Msg = {}));
-        function getProjectRootPath(project) {
-            switch (project.projectKind) {
-                case server.ProjectKind.Configured:
-                    return ts.getDirectoryPath(project.getProjectName());
-                case server.ProjectKind.Inferred:
-                    return "";
-                case server.ProjectKind.External:
-                    var projectName = ts.normalizeSlashes(project.getProjectName());
-                    return project.projectService.host.fileExists(projectName) ? ts.getDirectoryPath(projectName) : projectName;
-            }
-        }
-        function createInstallTypingsRequest(project, typingOptions, cachePath) {
-            return {
-                projectName: project.getProjectName(),
-                fileNames: project.getFileNames(),
-                compilerOptions: project.getCompilerOptions(),
-                typingOptions: typingOptions,
-                projectRootPath: getProjectRootPath(project),
-                cachePath: cachePath,
-                kind: "discover"
-            };
-        }
-        server.createInstallTypingsRequest = createInstallTypingsRequest;
-        var Errors;
-        (function (Errors) {
-            function ThrowNoProject() {
-                throw new Error("No Project.");
-            }
-            Errors.ThrowNoProject = ThrowNoProject;
-            function ThrowProjectLanguageServiceDisabled() {
-                throw new Error("The project's language service is disabled.");
-            }
-            Errors.ThrowProjectLanguageServiceDisabled = ThrowProjectLanguageServiceDisabled;
-            function ThrowProjectDoesNotContainDocument(fileName, project) {
-                throw new Error("Project '" + project.getProjectName() + "' does not contain document '" + fileName + "'");
-            }
-            Errors.ThrowProjectDoesNotContainDocument = ThrowProjectDoesNotContainDocument;
-        })(Errors = server.Errors || (server.Errors = {}));
-        function getDefaultFormatCodeSettings(host) {
-            return {
-                indentSize: 4,
-                tabSize: 4,
-                newLineCharacter: host.newLine || "\n",
-                convertTabsToSpaces: true,
-                indentStyle: ts.IndentStyle.Smart,
-                insertSpaceAfterCommaDelimiter: true,
-                insertSpaceAfterSemicolonInForStatements: true,
-                insertSpaceBeforeAndAfterBinaryOperators: true,
-                insertSpaceAfterKeywordsInControlFlowStatements: true,
-                insertSpaceAfterFunctionKeywordForAnonymousFunctions: false,
-                insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: false,
-                insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: false,
-                insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces: false,
-                insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces: false,
-                placeOpenBraceOnNewLineForFunctions: false,
-                placeOpenBraceOnNewLineForControlBlocks: false,
-            };
-        }
-        server.getDefaultFormatCodeSettings = getDefaultFormatCodeSettings;
-        function mergeMaps(target, source) {
-            for (var key in source) {
-                if (ts.hasProperty(source, key)) {
-                    target[key] = source[key];
-                }
-            }
-        }
-        server.mergeMaps = mergeMaps;
-        function removeItemFromSet(items, itemToRemove) {
-            if (items.length === 0) {
-                return;
-            }
-            var index = items.indexOf(itemToRemove);
-            if (index < 0) {
-                return;
-            }
-            if (index === items.length - 1) {
-                items.pop();
-            }
-            else {
-                items[index] = items.pop();
-            }
-        }
-        server.removeItemFromSet = removeItemFromSet;
-        function toNormalizedPath(fileName) {
-            return ts.normalizePath(fileName);
-        }
-        server.toNormalizedPath = toNormalizedPath;
-        function normalizedPathToPath(normalizedPath, currentDirectory, getCanonicalFileName) {
-            var f = ts.isRootedDiskPath(normalizedPath) ? normalizedPath : ts.getNormalizedAbsolutePath(normalizedPath, currentDirectory);
-            return getCanonicalFileName(f);
-        }
-        server.normalizedPathToPath = normalizedPathToPath;
-        function asNormalizedPath(fileName) {
-            return fileName;
-        }
-        server.asNormalizedPath = asNormalizedPath;
-        function createNormalizedPathMap() {
-            var map = Object.create(null);
-            return {
-                get: function (path) {
-                    return map[path];
-                },
-                set: function (path, value) {
-                    map[path] = value;
-                },
-                contains: function (path) {
-                    return ts.hasProperty(map, path);
-                },
-                remove: function (path) {
-                    delete map[path];
-                }
-            };
-        }
-        server.createNormalizedPathMap = createNormalizedPathMap;
-        function throwLanguageServiceIsDisabledError() {
-            throw new Error("LanguageService is disabled");
-        }
-        server.nullLanguageService = {
-            cleanupSemanticCache: throwLanguageServiceIsDisabledError,
-            getSyntacticDiagnostics: throwLanguageServiceIsDisabledError,
-            getSemanticDiagnostics: throwLanguageServiceIsDisabledError,
-            getCompilerOptionsDiagnostics: throwLanguageServiceIsDisabledError,
-            getSyntacticClassifications: throwLanguageServiceIsDisabledError,
-            getEncodedSyntacticClassifications: throwLanguageServiceIsDisabledError,
-            getSemanticClassifications: throwLanguageServiceIsDisabledError,
-            getEncodedSemanticClassifications: throwLanguageServiceIsDisabledError,
-            getCompletionsAtPosition: throwLanguageServiceIsDisabledError,
-            findReferences: throwLanguageServiceIsDisabledError,
-            getCompletionEntryDetails: throwLanguageServiceIsDisabledError,
-            getQuickInfoAtPosition: throwLanguageServiceIsDisabledError,
-            findRenameLocations: throwLanguageServiceIsDisabledError,
-            getNameOrDottedNameSpan: throwLanguageServiceIsDisabledError,
-            getBreakpointStatementAtPosition: throwLanguageServiceIsDisabledError,
-            getBraceMatchingAtPosition: throwLanguageServiceIsDisabledError,
-            getSignatureHelpItems: throwLanguageServiceIsDisabledError,
-            getDefinitionAtPosition: throwLanguageServiceIsDisabledError,
-            getRenameInfo: throwLanguageServiceIsDisabledError,
-            getTypeDefinitionAtPosition: throwLanguageServiceIsDisabledError,
-            getReferencesAtPosition: throwLanguageServiceIsDisabledError,
-            getDocumentHighlights: throwLanguageServiceIsDisabledError,
-            getOccurrencesAtPosition: throwLanguageServiceIsDisabledError,
-            getNavigateToItems: throwLanguageServiceIsDisabledError,
-            getNavigationBarItems: throwLanguageServiceIsDisabledError,
-            getNavigationTree: throwLanguageServiceIsDisabledError,
-            getOutliningSpans: throwLanguageServiceIsDisabledError,
-            getTodoComments: throwLanguageServiceIsDisabledError,
-            getIndentationAtPosition: throwLanguageServiceIsDisabledError,
-            getFormattingEditsForRange: throwLanguageServiceIsDisabledError,
-            getFormattingEditsForDocument: throwLanguageServiceIsDisabledError,
-            getFormattingEditsAfterKeystroke: throwLanguageServiceIsDisabledError,
-            getDocCommentTemplateAtPosition: throwLanguageServiceIsDisabledError,
-            isValidBraceCompletionAtPosition: throwLanguageServiceIsDisabledError,
-            getEmitOutput: throwLanguageServiceIsDisabledError,
-            getProgram: throwLanguageServiceIsDisabledError,
-            getNonBoundSourceFile: throwLanguageServiceIsDisabledError,
-            dispose: throwLanguageServiceIsDisabledError,
-            getCompletionEntrySymbol: throwLanguageServiceIsDisabledError,
-            getImplementationAtPosition: throwLanguageServiceIsDisabledError,
-            getSourceFile: throwLanguageServiceIsDisabledError,
-            getCodeFixesAtPosition: throwLanguageServiceIsDisabledError
-        };
-        server.nullLanguageServiceHost = {
-            setCompilationSettings: function () { return undefined; },
-            notifyFileRemoved: function () { return undefined; }
-        };
-        function isInferredProjectName(name) {
-            return /dev\/null\/inferredProject\d+\*/.test(name);
-        }
-        server.isInferredProjectName = isInferredProjectName;
-        function makeInferredProjectName(counter) {
-            return "/dev/null/inferredProject" + counter + "*";
-        }
-        server.makeInferredProjectName = makeInferredProjectName;
-        var ThrottledOperations = (function () {
-            function ThrottledOperations(host) {
-                this.host = host;
-                this.pendingTimeouts = ts.createMap();
-            }
-            ThrottledOperations.prototype.schedule = function (operationId, delay, cb) {
-                if (ts.hasProperty(this.pendingTimeouts, operationId)) {
-                    this.host.clearTimeout(this.pendingTimeouts[operationId]);
-                }
-                this.pendingTimeouts[operationId] = this.host.setTimeout(ThrottledOperations.run, delay, this, operationId, cb);
-            };
-            ThrottledOperations.run = function (self, operationId, cb) {
-                delete self.pendingTimeouts[operationId];
-                cb();
-            };
-            return ThrottledOperations;
-        }());
-        server.ThrottledOperations = ThrottledOperations;
-        var GcTimer = (function () {
-            function GcTimer(host, delay, logger) {
-                this.host = host;
-                this.delay = delay;
-                this.logger = logger;
-            }
-            GcTimer.prototype.scheduleCollect = function () {
-                if (!this.host.gc || this.timerId != undefined) {
-                    return;
-                }
-                this.timerId = this.host.setTimeout(GcTimer.run, this.delay, this);
-            };
-            GcTimer.run = function (self) {
-                self.timerId = undefined;
-                var log = self.logger.hasLevel(LogLevel.requestTime);
-                var before = log && self.host.getMemoryUsage();
-                self.host.gc();
-                if (log) {
-                    var after = self.host.getMemoryUsage();
-                    self.logger.perftrc("GC::before " + before + ", after " + after);
-                }
-            };
-            return GcTimer;
-        }());
-        server.GcTimer = GcTimer;
-    })(server = ts.server || (ts.server = {}));
-})(ts || (ts = {}));
 var ts;
 (function (ts) {
     var server;
@@ -63607,55 +63580,58 @@ var ts;
                 this.host = host;
                 this.project = project;
                 this.cancellationToken = cancellationToken;
-                this.getCanonicalFileName = ts.createGetCanonicalFileName(this.host.useCaseSensitiveFileNames);
                 this.resolvedModuleNames = ts.createFileMap();
                 this.resolvedTypeReferenceDirectives = ts.createFileMap();
+                this.getCanonicalFileName = ts.createGetCanonicalFileName(this.host.useCaseSensitiveFileNames);
                 if (host.trace) {
                     this.trace = function (s) { return host.trace(s); };
                 }
                 this.resolveModuleName = function (moduleName, containingFile, compilerOptions, host) {
+                    var globalCache = _this.project.getTypingOptions().enableAutoDiscovery
+                        ? _this.project.projectService.typingsInstaller.globalTypingsCacheLocation
+                        : undefined;
                     var primaryResult = ts.resolveModuleName(moduleName, containingFile, compilerOptions, host);
-                    if (primaryResult.resolvedModule) {
-                        if (ts.fileExtensionIsAny(primaryResult.resolvedModule.resolvedFileName, ts.supportedTypeScriptExtensions)) {
-                            return primaryResult;
+                    if (!(primaryResult.resolvedModule && ts.extensionIsTypeScript(primaryResult.resolvedModule.extension)) && globalCache !== undefined) {
+                        var _a = ts.loadModuleFromGlobalCache(moduleName, _this.project.getProjectName(), compilerOptions, host, globalCache), resolvedModule = _a.resolvedModule, failedLookupLocations = _a.failedLookupLocations;
+                        if (resolvedModule) {
+                            return { resolvedModule: resolvedModule, failedLookupLocations: primaryResult.failedLookupLocations.concat(failedLookupLocations) };
                         }
                     }
-                    var secondaryLookupFailedLookupLocations = [];
-                    var globalCache = _this.project.projectService.typingsInstaller.globalTypingsCacheLocation;
-                    if (_this.project.getTypingOptions().enableAutoDiscovery && globalCache) {
-                        var traceEnabled = ts.isTraceEnabled(compilerOptions, host);
-                        if (traceEnabled) {
-                            ts.trace(host, ts.Diagnostics.Auto_discovery_for_typings_is_enabled_in_project_0_Running_extra_resolution_pass_for_module_1_using_cache_location_2, _this.project.getProjectName(), moduleName, globalCache);
-                        }
-                        var state = { compilerOptions: compilerOptions, host: host, skipTsx: false, traceEnabled: traceEnabled };
-                        var resolvedName = ts.loadModuleFromNodeModules(moduleName, globalCache, secondaryLookupFailedLookupLocations, state, true);
-                        if (resolvedName) {
-                            return ts.createResolvedModule(resolvedName, true, primaryResult.failedLookupLocations.concat(secondaryLookupFailedLookupLocations));
-                        }
-                    }
-                    if (!primaryResult.resolvedModule && secondaryLookupFailedLookupLocations.length) {
-                        primaryResult.failedLookupLocations = primaryResult.failedLookupLocations.concat(secondaryLookupFailedLookupLocations);
-                    }
                     return primaryResult;
                 };
+                if (this.host.realpath) {
+                    this.realpath = function (path) { return _this.host.realpath(path); };
+                }
             }
-            LSHost.prototype.resolveNamesWithLocalCache = function (names, containingFile, cache, loader, getResult) {
+            LSHost.prototype.startRecordingFilesWithChangedResolutions = function () {
+                this.filesWithChangedSetOfUnresolvedImports = [];
+            };
+            LSHost.prototype.finishRecordingFilesWithChangedResolutions = function () {
+                var collected = this.filesWithChangedSetOfUnresolvedImports;
+                this.filesWithChangedSetOfUnresolvedImports = undefined;
+                return collected;
+            };
+            LSHost.prototype.resolveNamesWithLocalCache = function (names, containingFile, cache, loader, getResult, getResultFileName, logChanges) {
                 var path = ts.toPath(containingFile, this.host.getCurrentDirectory(), this.getCanonicalFileName);
                 var currentResolutionsInFile = cache.get(path);
                 var newResolutions = ts.createMap();
                 var resolvedModules = [];
                 var compilerOptions = this.getCompilationSettings();
                 var lastDeletedFileName = this.project.projectService.lastDeletedFile && this.project.projectService.lastDeletedFile.fileName;
-                for (var _i = 0, names_3 = names; _i < names_3.length; _i++) {
-                    var name_52 = names_3[_i];
-                    var resolution = newResolutions[name_52];
+                for (var _i = 0, names_2 = names; _i < names_2.length; _i++) {
+                    var name_48 = names_2[_i];
+                    var resolution = newResolutions[name_48];
                     if (!resolution) {
-                        var existingResolution = currentResolutionsInFile && currentResolutionsInFile[name_52];
+                        var existingResolution = currentResolutionsInFile && currentResolutionsInFile[name_48];
                         if (moduleResolutionIsValid(existingResolution)) {
                             resolution = existingResolution;
                         }
                         else {
-                            newResolutions[name_52] = resolution = loader(name_52, containingFile, compilerOptions, this);
+                            newResolutions[name_48] = resolution = loader(name_48, containingFile, compilerOptions, this);
+                        }
+                        if (logChanges && this.filesWithChangedSetOfUnresolvedImports && !resolutionIsEqualTo(existingResolution, resolution)) {
+                            this.filesWithChangedSetOfUnresolvedImports.push(path);
+                            logChanges = false;
                         }
                     }
                     ts.Debug.assert(resolution !== undefined);
@@ -63663,16 +63639,30 @@ var ts;
                 }
                 cache.set(path, newResolutions);
                 return resolvedModules;
+                function resolutionIsEqualTo(oldResolution, newResolution) {
+                    if (oldResolution === newResolution) {
+                        return true;
+                    }
+                    if (!oldResolution || !newResolution) {
+                        return false;
+                    }
+                    var oldResult = getResult(oldResolution);
+                    var newResult = getResult(newResolution);
+                    if (oldResult === newResult) {
+                        return true;
+                    }
+                    if (!oldResult || !newResult) {
+                        return false;
+                    }
+                    return getResultFileName(oldResult) === getResultFileName(newResult);
+                }
                 function moduleResolutionIsValid(resolution) {
                     if (!resolution) {
                         return false;
                     }
                     var result = getResult(resolution);
                     if (result) {
-                        if (result.resolvedFileName && result.resolvedFileName === lastDeletedFileName) {
-                            return false;
-                        }
-                        return true;
+                        return getResultFileName(result) !== lastDeletedFileName;
                     }
                     return resolution.failedLookupLocations.length === 0;
                 }
@@ -63690,10 +63680,10 @@ var ts;
                 return this.cancellationToken;
             };
             LSHost.prototype.resolveTypeReferenceDirectives = function (typeDirectiveNames, containingFile) {
-                return this.resolveNamesWithLocalCache(typeDirectiveNames, containingFile, this.resolvedTypeReferenceDirectives, ts.resolveTypeReferenceDirective, function (m) { return m.resolvedTypeReferenceDirective; });
+                return this.resolveNamesWithLocalCache(typeDirectiveNames, containingFile, this.resolvedTypeReferenceDirectives, ts.resolveTypeReferenceDirective, function (m) { return m.resolvedTypeReferenceDirective; }, function (r) { return r.resolvedFileName; }, false);
             };
             LSHost.prototype.resolveModuleNames = function (moduleNames, containingFile) {
-                return this.resolveNamesWithLocalCache(moduleNames, containingFile, this.resolvedModuleNames, this.resolveModuleName, function (m) { return m.resolvedModule; });
+                return this.resolveNamesWithLocalCache(moduleNames, containingFile, this.resolvedModuleNames, this.resolveModuleName, function (m) { return m.resolvedModule; }, function (r) { return r.resolvedFileName; }, true);
             };
             LSHost.prototype.getDefaultLibFileName = function () {
                 var nodeModuleBinDir = ts.getDirectoryPath(ts.normalizePath(this.host.getExecutingFilePath()));
@@ -63745,9 +63735,11 @@ var ts;
                 this.resolvedTypeReferenceDirectives.remove(info.path);
             };
             LSHost.prototype.setCompilationSettings = function (opt) {
+                if (ts.changesAffectModuleResolution(this.compilationSettings, opt)) {
+                    this.resolvedModuleNames.clear();
+                    this.resolvedTypeReferenceDirectives.clear();
+                }
                 this.compilationSettings = opt;
-                this.resolvedModuleNames.clear();
-                this.resolvedTypeReferenceDirectives.clear();
             };
             return LSHost;
         }());
@@ -63759,9 +63751,9 @@ var ts;
     var server;
     (function (server) {
         server.nullTypingsInstaller = {
-            enqueueInstallTypingsRequest: function () { },
-            attach: function () { },
-            onProjectClosed: function () { },
+            enqueueInstallTypingsRequest: ts.noop,
+            attach: ts.noop,
+            onProjectClosed: ts.noop,
             globalTypingsCacheLocation: undefined
         };
         var TypingsCacheEntry = (function () {
@@ -63805,48 +63797,52 @@ var ts;
         function compilerOptionsChanged(opt1, opt2) {
             return opt1.allowJs != opt2.allowJs;
         }
-        function toTypingsArray(arr) {
-            arr.sort();
-            return arr;
+        function unresolvedImportsChanged(imports1, imports2) {
+            if (imports1 === imports2) {
+                return false;
+            }
+            return !ts.arrayIsEqualTo(imports1, imports2);
         }
         var TypingsCache = (function () {
             function TypingsCache(installer) {
                 this.installer = installer;
                 this.perProjectCache = ts.createMap();
             }
-            TypingsCache.prototype.getTypingsForProject = function (project, forceRefresh) {
+            TypingsCache.prototype.getTypingsForProject = function (project, unresolvedImports, forceRefresh) {
                 var typingOptions = project.getTypingOptions();
                 if (!typingOptions || !typingOptions.enableAutoDiscovery) {
                     return server.emptyArray;
                 }
                 var entry = this.perProjectCache[project.getProjectName()];
                 var result = entry ? entry.typings : server.emptyArray;
-                if (forceRefresh || !entry || typingOptionsChanged(typingOptions, entry.typingOptions) || compilerOptionsChanged(project.getCompilerOptions(), entry.compilerOptions)) {
+                if (forceRefresh ||
+                    !entry ||
+                    typingOptionsChanged(typingOptions, entry.typingOptions) ||
+                    compilerOptionsChanged(project.getCompilerOptions(), entry.compilerOptions) ||
+                    unresolvedImportsChanged(unresolvedImports, entry.unresolvedImports)) {
                     this.perProjectCache[project.getProjectName()] = {
                         compilerOptions: project.getCompilerOptions(),
                         typingOptions: typingOptions,
                         typings: result,
+                        unresolvedImports: unresolvedImports,
                         poisoned: true
                     };
-                    this.installer.enqueueInstallTypingsRequest(project, typingOptions);
+                    this.installer.enqueueInstallTypingsRequest(project, typingOptions, unresolvedImports);
                 }
                 return result;
             };
-            TypingsCache.prototype.invalidateCachedTypingsForProject = function (project) {
-                var typingOptions = project.getTypingOptions();
-                if (!typingOptions.enableAutoDiscovery) {
-                    return;
-                }
-                this.installer.enqueueInstallTypingsRequest(project, typingOptions);
-            };
-            TypingsCache.prototype.updateTypingsForProject = function (projectName, compilerOptions, typingOptions, newTypings) {
+            TypingsCache.prototype.updateTypingsForProject = function (projectName, compilerOptions, typingOptions, unresolvedImports, newTypings) {
                 this.perProjectCache[projectName] = {
                     compilerOptions: compilerOptions,
                     typingOptions: typingOptions,
-                    typings: toTypingsArray(newTypings),
+                    typings: server.toSortedReadonlyArray(newTypings),
+                    unresolvedImports: unresolvedImports,
                     poisoned: false
                 };
             };
+            TypingsCache.prototype.deleteTypingsForProject = function (projectName) {
+                delete this.perProjectCache[projectName];
+            };
             TypingsCache.prototype.onProjectClosed = function (project) {
                 delete this.perProjectCache[project.getProjectName()];
                 this.installer.onProjectClosed(project);
@@ -63860,7 +63856,6 @@ var ts;
 (function (ts) {
     var server;
     (function (server) {
-        var crypto = require("crypto");
         function shouldEmitFile(scriptInfo) {
             return !scriptInfo.hasMixedContent;
         }
@@ -63877,16 +63872,14 @@ var ts;
             BuilderFileInfo.prototype.containsOnlyAmbientModules = function (sourceFile) {
                 for (var _i = 0, _a = sourceFile.statements; _i < _a.length; _i++) {
                     var statement = _a[_i];
-                    if (statement.kind !== 226 || statement.name.kind !== 9) {
+                    if (statement.kind !== 230 || statement.name.kind !== 9) {
                         return false;
                     }
                 }
                 return true;
             };
             BuilderFileInfo.prototype.computeHash = function (text) {
-                return crypto.createHash("md5")
-                    .update(text)
-                    .digest("base64");
+                return this.project.projectService.host.createHash(text);
             };
             BuilderFileInfo.prototype.getSourceFile = function () {
                 return this.project.getSourceFile(this.scriptInfo.path);
@@ -64162,12 +64155,12 @@ var ts;
 (function (ts) {
     var server;
     (function (server) {
+        var ProjectKind;
         (function (ProjectKind) {
             ProjectKind[ProjectKind["Inferred"] = 0] = "Inferred";
             ProjectKind[ProjectKind["Configured"] = 1] = "Configured";
             ProjectKind[ProjectKind["External"] = 2] = "External";
-        })(server.ProjectKind || (server.ProjectKind = {}));
-        var ProjectKind = server.ProjectKind;
+        })(ProjectKind = server.ProjectKind || (server.ProjectKind = {}));
         function remove(items, item) {
             var index = items.indexOf(item);
             if (index >= 0) {
@@ -64211,6 +64204,32 @@ var ts;
             return counts.ts === 0 && counts.tsx === 0;
         }
         server.allFilesAreJsOrDts = allFilesAreJsOrDts;
+        var UnresolvedImportsMap = (function () {
+            function UnresolvedImportsMap() {
+                this.perFileMap = ts.createFileMap();
+                this.version = 0;
+            }
+            UnresolvedImportsMap.prototype.clear = function () {
+                this.perFileMap.clear();
+                this.version = 0;
+            };
+            UnresolvedImportsMap.prototype.getVersion = function () {
+                return this.version;
+            };
+            UnresolvedImportsMap.prototype.remove = function (path) {
+                this.perFileMap.remove(path);
+                this.version++;
+            };
+            UnresolvedImportsMap.prototype.get = function (path) {
+                return this.perFileMap.get(path);
+            };
+            UnresolvedImportsMap.prototype.set = function (path, value) {
+                this.perFileMap.set(path, value);
+                this.version++;
+            };
+            return UnresolvedImportsMap;
+        }());
+        server.UnresolvedImportsMap = UnresolvedImportsMap;
         var Project = (function () {
             function Project(projectKind, projectService, documentRegistry, hasExplicitListOfFiles, languageServiceEnabled, compilerOptions, compileOnSaveEnabled) {
                 this.projectKind = projectKind;
@@ -64221,6 +64240,7 @@ var ts;
                 this.compileOnSaveEnabled = compileOnSaveEnabled;
                 this.rootFiles = [];
                 this.rootFilesMap = ts.createFileMap();
+                this.cachedUnresolvedImportsPerFile = new UnresolvedImportsMap();
                 this.lastReportedVersion = 0;
                 this.projectStructureVersion = 0;
                 this.projectStateVersion = 0;
@@ -64233,6 +64253,9 @@ var ts;
                 else if (hasExplicitListOfFiles) {
                     this.compilerOptions.allowNonTsExtensions = true;
                 }
+                if (this.projectKind === ProjectKind.Inferred || this.projectKind === ProjectKind.External) {
+                    this.compilerOptions.noEmitForJsFiles = true;
+                }
                 if (languageServiceEnabled) {
                     this.enableLanguageService();
                 }
@@ -64250,6 +64273,9 @@ var ts;
                 this.updateGraph();
                 return hasOneOrMoreJsAndNoTsFiles(this);
             };
+            Project.prototype.getCachedUnresolvedImportsPerFile_TestOnly = function () {
+                return this.cachedUnresolvedImportsPerFile;
+            };
             Project.prototype.getProjectErrors = function () {
                 return this.projectErrors;
             };
@@ -64356,7 +64382,7 @@ var ts;
                 }
                 return this.getLanguageService().getEmitOutput(info.fileName, emitOnlyDtsFiles);
             };
-            Project.prototype.getFileNames = function () {
+            Project.prototype.getFileNames = function (excludeFilesFromExternalLibraries) {
                 if (!this.program) {
                     return [];
                 }
@@ -64370,8 +64396,15 @@ var ts;
                     }
                     return rootFiles;
                 }
-                var sourceFiles = this.program.getSourceFiles();
-                return sourceFiles.map(function (sourceFile) { return server.asNormalizedPath(sourceFile.fileName); });
+                var result = [];
+                for (var _i = 0, _a = this.program.getSourceFiles(); _i < _a.length; _i++) {
+                    var f = _a[_i];
+                    if (excludeFilesFromExternalLibraries && this.program.isSourceFileFromExternalLibrary(f)) {
+                        continue;
+                    }
+                    result.push(server.asNormalizedPath(f.fileName));
+                }
+                return result;
             };
             Project.prototype.getAllEmittableFiles = function () {
                 if (!this.languageServiceEnabled) {
@@ -64412,6 +64445,7 @@ var ts;
                 if (detachFromProject === void 0) { detachFromProject = true; }
                 this.removeRootFileIfNecessary(info);
                 this.lsHost.notifyFileRemoved(info);
+                this.cachedUnresolvedImportsPerFile.remove(info.path);
                 if (detachFromProject) {
                     info.detachFromProject(this);
                 }
@@ -64420,12 +64454,56 @@ var ts;
             Project.prototype.markAsDirty = function () {
                 this.projectStateVersion++;
             };
+            Project.prototype.extractUnresolvedImportsFromSourceFile = function (file, result) {
+                var cached = this.cachedUnresolvedImportsPerFile.get(file.path);
+                if (cached) {
+                    for (var _i = 0, cached_1 = cached; _i < cached_1.length; _i++) {
+                        var f = cached_1[_i];
+                        result.push(f);
+                    }
+                    return;
+                }
+                var unresolvedImports;
+                if (file.resolvedModules) {
+                    for (var name_49 in file.resolvedModules) {
+                        if (!file.resolvedModules[name_49] && !ts.isExternalModuleNameRelative(name_49)) {
+                            var trimmed = name_49.trim();
+                            var i = trimmed.indexOf("/");
+                            if (i !== -1 && trimmed.charCodeAt(0) === 64) {
+                                i = trimmed.indexOf("/", i + 1);
+                            }
+                            if (i !== -1) {
+                                trimmed = trimmed.substr(0, i);
+                            }
+                            (unresolvedImports || (unresolvedImports = [])).push(trimmed);
+                            result.push(trimmed);
+                        }
+                    }
+                }
+                this.cachedUnresolvedImportsPerFile.set(file.path, unresolvedImports || server.emptyArray);
+            };
             Project.prototype.updateGraph = function () {
                 if (!this.languageServiceEnabled) {
                     return true;
                 }
+                this.lsHost.startRecordingFilesWithChangedResolutions();
                 var hasChanges = this.updateGraphWorker();
-                var cachedTypings = this.projectService.typingsCache.getTypingsForProject(this, hasChanges);
+                var changedFiles = this.lsHost.finishRecordingFilesWithChangedResolutions() || server.emptyArray;
+                for (var _i = 0, changedFiles_1 = changedFiles; _i < changedFiles_1.length; _i++) {
+                    var file = changedFiles_1[_i];
+                    this.cachedUnresolvedImportsPerFile.remove(file);
+                }
+                var unresolvedImports;
+                if (hasChanges || changedFiles.length) {
+                    var result = [];
+                    for (var _a = 0, _b = this.program.getSourceFiles(); _a < _b.length; _a++) {
+                        var sourceFile = _b[_a];
+                        this.extractUnresolvedImportsFromSourceFile(sourceFile, result);
+                    }
+                    this.lastCachedUnresolvedImportsList = server.toSortedReadonlyArray(result);
+                }
+                unresolvedImports = this.lastCachedUnresolvedImportsList;
+                var cachedTypings = this.projectService.typingsCache.getTypingsForProject(this, unresolvedImports, hasChanges);
                 if (this.setTypings(cachedTypings)) {
                     hasChanges = this.updateGraphWorker() || hasChanges;
                 }
@@ -64498,6 +64576,10 @@ var ts;
                         compilerOptions.allowJs = true;
                     }
                     compilerOptions.allowNonTsExtensions = true;
+                    if (ts.changesAffectModuleResolution(this.compilerOptions, compilerOptions)) {
+                        this.cachedUnresolvedImportsPerFile.clear();
+                        this.lastCachedUnresolvedImportsList = undefined;
+                    }
                     this.compilerOptions = compilerOptions;
                     this.lsHost.setCompilationSettings(compilerOptions);
                     this.markAsDirty();
@@ -64606,9 +64688,8 @@ var ts;
         server.Project = Project;
         var InferredProject = (function (_super) {
             __extends(InferredProject, _super);
-            function InferredProject(projectService, documentRegistry, languageServiceEnabled, compilerOptions, compileOnSaveEnabled) {
-                var _this = _super.call(this, ProjectKind.Inferred, projectService, documentRegistry, undefined, languageServiceEnabled, compilerOptions, compileOnSaveEnabled) || this;
-                _this.compileOnSaveEnabled = compileOnSaveEnabled;
+            function InferredProject(projectService, documentRegistry, languageServiceEnabled, compilerOptions) {
+                var _this = _super.call(this, ProjectKind.Inferred, projectService, documentRegistry, undefined, languageServiceEnabled, compilerOptions, false) || this;
                 _this.directoriesWatchedForTsconfig = [];
                 _this.inferredProjectName = server.makeInferredProjectName(InferredProject.NextId);
                 InferredProject.NextId++;
@@ -64938,6 +65019,7 @@ var ts;
                 this.inferredProjects = [];
                 this.configuredProjects = [];
                 this.openFiles = [];
+                ts.Debug.assert(!!host.createHash, "'ServerHost.createHash' is required for ProjectService");
                 this.toCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames);
                 this.directoryWatchers = new DirectoryWatchers(this);
                 this.throttledOperations = new server.ThrottledOperations(host);
@@ -64964,17 +65046,18 @@ var ts;
                     return;
                 }
                 switch (response.kind) {
-                    case "set":
-                        this.typingsCache.updateTypingsForProject(response.projectName, response.compilerOptions, response.typingOptions, response.typings);
-                        project.updateGraph();
+                    case server.ActionSet:
+                        this.typingsCache.updateTypingsForProject(response.projectName, response.compilerOptions, response.typingOptions, response.unresolvedImports, response.typings);
                         break;
-                    case "invalidate":
-                        this.typingsCache.invalidateCachedTypingsForProject(project);
+                    case server.ActionInvalidate:
+                        this.typingsCache.deleteTypingsForProject(response.projectName);
                         break;
                 }
+                project.updateGraph();
             };
             ProjectService.prototype.setCompilerOptionsForInferredProjects = function (projectCompilerOptions) {
                 this.compilerOptionsForInferredProjects = convertCompilerOptions(projectCompilerOptions);
+                this.compilerOptionsForInferredProjects.allowNonTsExtensions = true;
                 this.compileOnSaveForInferredProjects = projectCompilerOptions.compileOnSave;
                 for (var _i = 0, _a = this.inferredProjects; _i < _a.length; _i++) {
                     var proj = _a[_i];
@@ -65525,7 +65608,7 @@ var ts;
                 var useExistingProject = this.useSingleInferredProject && this.inferredProjects.length;
                 var project = useExistingProject
                     ? this.inferredProjects[0]
-                    : new server.InferredProject(this, this.documentRegistry, true, this.compilerOptionsForInferredProjects, this.compileOnSaveForInferredProjects);
+                    : new server.InferredProject(this, this.documentRegistry, true, this.compilerOptionsForInferredProjects);
                 project.addRoot(root);
                 this.directoryWatchers.startWatchingContainingDirectoriesForFile(root.fileName, project, function (fileName) { return _this.onConfigFileAddedForInferredProject(fileName); });
                 project.updateGraph();
@@ -65658,13 +65741,13 @@ var ts;
                 this.printProjects();
             };
             ProjectService.prototype.collectChanges = function (lastKnownProjectVersions, currentProjects, result) {
-                var _loop_3 = function (proj) {
+                var _loop_5 = function (proj) {
                     var knownProject = ts.forEach(lastKnownProjectVersions, function (p) { return p.projectName === proj.getProjectName() && p; });
                     result.push(proj.getChangesSinceVersion(knownProject && knownProject.version));
                 };
                 for (var _i = 0, currentProjects_1 = currentProjects; _i < currentProjects_1.length; _i++) {
                     var proj = currentProjects_1[_i];
-                    _loop_3(proj);
+                    _loop_5(proj);
                 }
             };
             ProjectService.prototype.synchronizeProjectList = function (knownProjects) {
@@ -65686,8 +65769,8 @@ var ts;
                     }
                 }
                 if (changedFiles) {
-                    for (var _a = 0, changedFiles_1 = changedFiles; _a < changedFiles_1.length; _a++) {
-                        var file = changedFiles_1[_a];
+                    for (var _a = 0, changedFiles_2 = changedFiles; _a < changedFiles_2.length; _a++) {
+                        var file = changedFiles_2[_a];
                         var scriptInfo = this.getScriptInfo(file.fileName);
                         ts.Debug.assert(!!scriptInfo);
                         for (var i = file.changes.length - 1; i >= 0; i--) {
@@ -65754,7 +65837,9 @@ var ts;
                     var file = _a[_i];
                     var normalized = server.toNormalizedPath(file.fileName);
                     if (ts.getBaseFileName(normalized) === "tsconfig.json") {
-                        (tsConfigFiles || (tsConfigFiles = [])).push(normalized);
+                        if (this.host.fileExists(normalized)) {
+                            (tsConfigFiles || (tsConfigFiles = [])).push(normalized);
+                        }
                     }
                     else {
                         rootFiles.push(file);
@@ -66887,9 +66972,9 @@ var ts;
                 if (simplifiedResult) {
                     return completions.entries.reduce(function (result, entry) {
                         if (completions.isMemberCompletion || (entry.name.toLowerCase().indexOf(prefix.toLowerCase()) === 0)) {
-                            var name_53 = entry.name, kind = entry.kind, kindModifiers = entry.kindModifiers, sortText = entry.sortText, replacementSpan = entry.replacementSpan;
+                            var name_50 = entry.name, kind = entry.kind, kindModifiers = entry.kindModifiers, sortText = entry.sortText, replacementSpan = entry.replacementSpan;
                             var convertedSpan = replacementSpan ? _this.decorateSpan(replacementSpan, scriptInfo) : undefined;
-                            result.push({ name: name_53, kind: kind, kindModifiers: kindModifiers, sortText: sortText, replacementSpan: convertedSpan });
+                            result.push({ name: name_50, kind: kind, kindModifiers: kindModifiers, sortText: sortText, replacementSpan: convertedSpan });
                         }
                         return result;
                     }, []).sort(function (a, b) { return ts.compareStrings(a.name, b.name); });
@@ -67292,6 +67377,7 @@ var ts;
     var server;
     (function (server) {
         var lineCollectionCapacity = 4;
+        var CharRangeSection;
         (function (CharRangeSection) {
             CharRangeSection[CharRangeSection["PreStart"] = 0] = "PreStart";
             CharRangeSection[CharRangeSection["Start"] = 1] = "Start";
@@ -67299,8 +67385,7 @@ var ts;
             CharRangeSection[CharRangeSection["Mid"] = 3] = "Mid";
             CharRangeSection[CharRangeSection["End"] = 4] = "End";
             CharRangeSection[CharRangeSection["PostEnd"] = 5] = "PostEnd";
-        })(server.CharRangeSection || (server.CharRangeSection = {}));
-        var CharRangeSection = server.CharRangeSection;
+        })(CharRangeSection = server.CharRangeSection || (server.CharRangeSection = {}));
         var BaseLineIndexWalker = (function () {
             function BaseLineIndexWalker() {
                 this.goSubtree = true;
@@ -68144,13 +68229,25 @@ var ts;
             var basePath;
             switch (process.platform) {
                 case "win32":
-                    basePath = process.env.LOCALAPPDATA || process.env.APPDATA || os.homedir();
+                    basePath = process.env.LOCALAPPDATA ||
+                        process.env.APPDATA ||
+                        (os.homedir && os.homedir()) ||
+                        process.env.USERPROFILE ||
+                        (process.env.HOMEDRIVE && process.env.HOMEPATH && ts.normalizeSlashes(process.env.HOMEDRIVE + process.env.HOMEPATH)) ||
+                        os.tmpdir();
                     break;
                 case "linux":
-                    basePath = os.homedir();
+                    basePath = (os.homedir && os.homedir()) ||
+                        process.env.HOME ||
+                        ((process.env.LOGNAME || process.env.USER) && "/home/" + (process.env.LOGNAME || process.env.USER)) ||
+                        os.tmpdir();
                     break;
                 case "darwin":
-                    basePath = ts.combinePaths(os.homedir(), "Library/Application Support/");
+                    var homeDir = (os.homedir && os.homedir()) ||
+                        process.env.HOME ||
+                        ((process.env.LOGNAME || process.env.USER) && "/Users/" + (process.env.LOGNAME || process.env.USER)) ||
+                        os.tmpdir();
+                    basePath = ts.combinePaths(homeDir, "Library/Application Support/");
                     break;
             }
             ts.Debug.assert(basePath !== undefined);
@@ -68235,26 +68332,48 @@ var ts;
             return Logger;
         }());
         var NodeTypingsInstaller = (function () {
-            function NodeTypingsInstaller(logger, eventPort, globalTypingsCacheLocation, newLine) {
+            function NodeTypingsInstaller(telemetryEnabled, logger, host, eventPort, globalTypingsCacheLocation, newLine) {
                 var _this = this;
+                this.telemetryEnabled = telemetryEnabled;
                 this.logger = logger;
                 this.globalTypingsCacheLocation = globalTypingsCacheLocation;
                 this.newLine = newLine;
+                this.installerPidReported = false;
+                this.throttledOperations = new server.ThrottledOperations(host);
                 if (eventPort) {
                     var s_1 = net.connect({ port: eventPort }, function () {
                         _this.socket = s_1;
+                        _this.reportInstallerProcessId();
                     });
                 }
             }
+            NodeTypingsInstaller.prototype.reportInstallerProcessId = function () {
+                if (this.installerPidReported) {
+                    return;
+                }
+                if (this.socket && this.installer) {
+                    this.sendEvent(0, "typingsInstallerPid", { pid: this.installer.pid });
+                    this.installerPidReported = true;
+                }
+            };
+            NodeTypingsInstaller.prototype.sendEvent = function (seq, event, body) {
+                this.socket.write(server.formatMessage({ seq: seq, type: "event", event: event, body: body }, this.logger, Buffer.byteLength, this.newLine), "utf8");
+            };
+            NodeTypingsInstaller.prototype.setTelemetrySender = function (telemetrySender) {
+                this.telemetrySender = telemetrySender;
+            };
             NodeTypingsInstaller.prototype.attach = function (projectService) {
                 var _this = this;
                 this.projectService = projectService;
                 if (this.logger.hasLevel(server.LogLevel.requestTime)) {
                     this.logger.info("Binding...");
                 }
-                var args = ["--globalTypingsCacheLocation", this.globalTypingsCacheLocation];
+                var args = [server.Arguments.GlobalCacheLocation, this.globalTypingsCacheLocation];
+                if (this.telemetryEnabled) {
+                    args.push(server.Arguments.EnableTelemetry);
+                }
                 if (this.logger.loggingEnabled() && this.logger.getLogFileName()) {
-                    args.push("--logFile", ts.combinePaths(ts.getDirectoryPath(ts.normalizeSlashes(this.logger.getLogFileName())), "ti-" + process.pid + ".log"));
+                    args.push(server.Arguments.LogFile, ts.combinePaths(ts.getDirectoryPath(ts.normalizeSlashes(this.logger.getLogFileName())), "ti-" + process.pid + ".log"));
                 }
                 var execArgv = [];
                 {
@@ -68272,6 +68391,7 @@ var ts;
                 }
                 this.installer = childProcess.fork(ts.combinePaths(__dirname, "typingsInstaller.js"), args, { execArgv: execArgv });
                 this.installer.on("message", function (m) { return _this.handleMessage(m); });
+                this.reportInstallerProcessId();
                 process.on("exit", function () {
                     _this.installer.kill();
                 });
@@ -68279,30 +68399,58 @@ var ts;
             NodeTypingsInstaller.prototype.onProjectClosed = function (p) {
                 this.installer.send({ projectName: p.getProjectName(), kind: "closeProject" });
             };
-            NodeTypingsInstaller.prototype.enqueueInstallTypingsRequest = function (project, typingOptions) {
-                var request = server.createInstallTypingsRequest(project, typingOptions);
+            NodeTypingsInstaller.prototype.enqueueInstallTypingsRequest = function (project, typingOptions, unresolvedImports) {
+                var _this = this;
+                var request = server.createInstallTypingsRequest(project, typingOptions, unresolvedImports);
                 if (this.logger.hasLevel(server.LogLevel.verbose)) {
-                    this.logger.info("Sending request: " + JSON.stringify(request));
+                    if (this.logger.hasLevel(server.LogLevel.verbose)) {
+                        this.logger.info("Scheduling throttled operation: " + JSON.stringify(request));
+                    }
                 }
-                this.installer.send(request);
+                this.throttledOperations.schedule(project.getProjectName(), 250, function () {
+                    if (_this.logger.hasLevel(server.LogLevel.verbose)) {
+                        _this.logger.info("Sending request: " + JSON.stringify(request));
+                    }
+                    _this.installer.send(request);
+                });
             };
             NodeTypingsInstaller.prototype.handleMessage = function (response) {
                 if (this.logger.hasLevel(server.LogLevel.verbose)) {
                     this.logger.info("Received response: " + JSON.stringify(response));
                 }
+                if (response.kind === server.EventInstall) {
+                    if (this.telemetrySender) {
+                        var body = {
+                            telemetryEventName: "typingsInstalled",
+                            payload: {
+                                installedPackages: response.packagesToInstall.join(","),
+                                installSuccess: response.installSuccess
+                            }
+                        };
+                        var eventName = "telemetry";
+                        this.telemetrySender.event(body, eventName);
+                    }
+                    return;
+                }
                 this.projectService.updateTypingsForProject(response);
-                if (response.kind == "set" && this.socket) {
-                    this.socket.write(server.formatMessage({ seq: 0, type: "event", message: response }, this.logger, Buffer.byteLength, this.newLine), "utf8");
+                if (response.kind == server.ActionSet && this.socket) {
+                    this.sendEvent(0, "setTypings", response);
                 }
             };
             return NodeTypingsInstaller;
         }());
         var IOSession = (function (_super) {
             __extends(IOSession, _super);
-            function IOSession(host, cancellationToken, installerEventPort, canUseEvents, useSingleInferredProject, disableAutomaticTypingAcquisition, globalTypingsCacheLocation, logger) {
-                return _super.call(this, host, cancellationToken, useSingleInferredProject, disableAutomaticTypingAcquisition
-                    ? server.nullTypingsInstaller
-                    : new NodeTypingsInstaller(logger, installerEventPort, globalTypingsCacheLocation, host.newLine), Buffer.byteLength, process.hrtime, logger, canUseEvents) || this;
+            function IOSession(host, cancellationToken, installerEventPort, canUseEvents, useSingleInferredProject, disableAutomaticTypingAcquisition, globalTypingsCacheLocation, telemetryEnabled, logger) {
+                var _this;
+                var typingsInstaller = disableAutomaticTypingAcquisition
+                    ? undefined
+                    : new NodeTypingsInstaller(telemetryEnabled, logger, host, installerEventPort, globalTypingsCacheLocation, host.newLine);
+                _this = _super.call(this, host, cancellationToken, useSingleInferredProject, typingsInstaller || server.nullTypingsInstaller, Buffer.byteLength, process.hrtime, logger, canUseEvents) || this;
+                if (telemetryEnabled && typingsInstaller) {
+                    typingsInstaller.setTelemetrySender(_this);
+                }
+                return _this;
             }
             IOSession.prototype.exit = function () {
                 this.logger.info("Exiting...");
@@ -68482,17 +68630,16 @@ var ts;
         ;
         var eventPort;
         {
-            var index = sys.args.indexOf("--eventPort");
-            if (index >= 0 && index < sys.args.length - 1) {
-                var v = parseInt(sys.args[index + 1]);
-                if (!isNaN(v)) {
-                    eventPort = v;
-                }
+            var str = server.findArgument("--eventPort");
+            var v = str && parseInt(str);
+            if (!isNaN(v)) {
+                eventPort = v;
             }
         }
-        var useSingleInferredProject = sys.args.indexOf("--useSingleInferredProject") >= 0;
-        var disableAutomaticTypingAcquisition = sys.args.indexOf("--disableAutomaticTypingAcquisition") >= 0;
-        var ioSession = new IOSession(sys, cancellationToken, eventPort, eventPort === undefined, useSingleInferredProject, disableAutomaticTypingAcquisition, getGlobalTypingsCacheLocation(), logger);
+        var useSingleInferredProject = server.hasArgument("--useSingleInferredProject");
+        var disableAutomaticTypingAcquisition = server.hasArgument("--disableAutomaticTypingAcquisition");
+        var telemetryEnabled = server.hasArgument(server.Arguments.EnableTelemetry);
+        var ioSession = new IOSession(sys, cancellationToken, eventPort, eventPort === undefined, useSingleInferredProject, disableAutomaticTypingAcquisition, getGlobalTypingsCacheLocation(), telemetryEnabled, logger);
         process.on("uncaughtException", function (err) {
             ioSession.logError(err, "unknown");
         });
@@ -68500,5 +68647,701 @@ var ts;
         ioSession.listen();
     })(server = ts.server || (ts.server = {}));
 })(ts || (ts = {}));
-
-//# sourceMappingURL=tsserver.js.map
+var debugObjectHost = (function () { return this; })();
+var ts;
+(function (ts) {
+    function logInternalError(logger, err) {
+        if (logger) {
+            logger.log("*INTERNAL ERROR* - Exception in typescript services: " + err.message);
+        }
+    }
+    var ScriptSnapshotShimAdapter = (function () {
+        function ScriptSnapshotShimAdapter(scriptSnapshotShim) {
+            this.scriptSnapshotShim = scriptSnapshotShim;
+        }
+        ScriptSnapshotShimAdapter.prototype.getText = function (start, end) {
+            return this.scriptSnapshotShim.getText(start, end);
+        };
+        ScriptSnapshotShimAdapter.prototype.getLength = function () {
+            return this.scriptSnapshotShim.getLength();
+        };
+        ScriptSnapshotShimAdapter.prototype.getChangeRange = function (oldSnapshot) {
+            var oldSnapshotShim = oldSnapshot;
+            var encoded = this.scriptSnapshotShim.getChangeRange(oldSnapshotShim.scriptSnapshotShim);
+            if (encoded == null) {
+                return null;
+            }
+            var decoded = JSON.parse(encoded);
+            return ts.createTextChangeRange(ts.createTextSpan(decoded.span.start, decoded.span.length), decoded.newLength);
+        };
+        ScriptSnapshotShimAdapter.prototype.dispose = function () {
+            if ("dispose" in this.scriptSnapshotShim) {
+                this.scriptSnapshotShim.dispose();
+            }
+        };
+        return ScriptSnapshotShimAdapter;
+    }());
+    var LanguageServiceShimHostAdapter = (function () {
+        function LanguageServiceShimHostAdapter(shimHost) {
+            var _this = this;
+            this.shimHost = shimHost;
+            this.loggingEnabled = false;
+            this.tracingEnabled = false;
+            if ("getModuleResolutionsForFile" in this.shimHost) {
+                this.resolveModuleNames = function (moduleNames, containingFile) {
+                    var resolutionsInFile = JSON.parse(_this.shimHost.getModuleResolutionsForFile(containingFile));
+                    return ts.map(moduleNames, function (name) {
+                        var result = ts.getProperty(resolutionsInFile, name);
+                        return result ? { resolvedFileName: result, extension: ts.extensionFromPath(result), isExternalLibraryImport: false } : undefined;
+                    });
+                };
+            }
+            if ("directoryExists" in this.shimHost) {
+                this.directoryExists = function (directoryName) { return _this.shimHost.directoryExists(directoryName); };
+            }
+            if ("getTypeReferenceDirectiveResolutionsForFile" in this.shimHost) {
+                this.resolveTypeReferenceDirectives = function (typeDirectiveNames, containingFile) {
+                    var typeDirectivesForFile = JSON.parse(_this.shimHost.getTypeReferenceDirectiveResolutionsForFile(containingFile));
+                    return ts.map(typeDirectiveNames, function (name) { return ts.getProperty(typeDirectivesForFile, name); });
+                };
+            }
+        }
+        LanguageServiceShimHostAdapter.prototype.log = function (s) {
+            if (this.loggingEnabled) {
+                this.shimHost.log(s);
+            }
+        };
+        LanguageServiceShimHostAdapter.prototype.trace = function (s) {
+            if (this.tracingEnabled) {
+                this.shimHost.trace(s);
+            }
+        };
+        LanguageServiceShimHostAdapter.prototype.error = function (s) {
+            this.shimHost.error(s);
+        };
+        LanguageServiceShimHostAdapter.prototype.getProjectVersion = function () {
+            if (!this.shimHost.getProjectVersion) {
+                return undefined;
+            }
+            return this.shimHost.getProjectVersion();
+        };
+        LanguageServiceShimHostAdapter.prototype.getTypeRootsVersion = function () {
+            if (!this.shimHost.getTypeRootsVersion) {
+                return 0;
+            }
+            return this.shimHost.getTypeRootsVersion();
+        };
+        LanguageServiceShimHostAdapter.prototype.useCaseSensitiveFileNames = function () {
+            return this.shimHost.useCaseSensitiveFileNames ? this.shimHost.useCaseSensitiveFileNames() : false;
+        };
+        LanguageServiceShimHostAdapter.prototype.getCompilationSettings = function () {
+            var settingsJson = this.shimHost.getCompilationSettings();
+            if (settingsJson == null || settingsJson == "") {
+                throw Error("LanguageServiceShimHostAdapter.getCompilationSettings: empty compilationSettings");
+            }
+            return JSON.parse(settingsJson);
+        };
+        LanguageServiceShimHostAdapter.prototype.getScriptFileNames = function () {
+            var encoded = this.shimHost.getScriptFileNames();
+            return this.files = JSON.parse(encoded);
+        };
+        LanguageServiceShimHostAdapter.prototype.getScriptSnapshot = function (fileName) {
+            var scriptSnapshot = this.shimHost.getScriptSnapshot(fileName);
+            return scriptSnapshot && new ScriptSnapshotShimAdapter(scriptSnapshot);
+        };
+        LanguageServiceShimHostAdapter.prototype.getScriptKind = function (fileName) {
+            if ("getScriptKind" in this.shimHost) {
+                return this.shimHost.getScriptKind(fileName);
+            }
+            else {
+                return 0;
+            }
+        };
+        LanguageServiceShimHostAdapter.prototype.getScriptVersion = function (fileName) {
+            return this.shimHost.getScriptVersion(fileName);
+        };
+        LanguageServiceShimHostAdapter.prototype.getLocalizedDiagnosticMessages = function () {
+            var diagnosticMessagesJson = this.shimHost.getLocalizedDiagnosticMessages();
+            if (diagnosticMessagesJson == null || diagnosticMessagesJson == "") {
+                return null;
+            }
+            try {
+                return JSON.parse(diagnosticMessagesJson);
+            }
+            catch (e) {
+                this.log(e.description || "diagnosticMessages.generated.json has invalid JSON format");
+                return null;
+            }
+        };
+        LanguageServiceShimHostAdapter.prototype.getCancellationToken = function () {
+            var hostCancellationToken = this.shimHost.getCancellationToken();
+            return new ThrottledCancellationToken(hostCancellationToken);
+        };
+        LanguageServiceShimHostAdapter.prototype.getCurrentDirectory = function () {
+            return this.shimHost.getCurrentDirectory();
+        };
+        LanguageServiceShimHostAdapter.prototype.getDirectories = function (path) {
+            return JSON.parse(this.shimHost.getDirectories(path));
+        };
+        LanguageServiceShimHostAdapter.prototype.getDefaultLibFileName = function (options) {
+            return this.shimHost.getDefaultLibFileName(JSON.stringify(options));
+        };
+        LanguageServiceShimHostAdapter.prototype.readDirectory = function (path, extensions, exclude, include, depth) {
+            var pattern = ts.getFileMatcherPatterns(path, exclude, include, this.shimHost.useCaseSensitiveFileNames(), this.shimHost.getCurrentDirectory());
+            return JSON.parse(this.shimHost.readDirectory(path, JSON.stringify(extensions), JSON.stringify(pattern.basePaths), pattern.excludePattern, pattern.includeFilePattern, pattern.includeDirectoryPattern, depth));
+        };
+        LanguageServiceShimHostAdapter.prototype.readFile = function (path, encoding) {
+            return this.shimHost.readFile(path, encoding);
+        };
+        LanguageServiceShimHostAdapter.prototype.fileExists = function (path) {
+            return this.shimHost.fileExists(path);
+        };
+        return LanguageServiceShimHostAdapter;
+    }());
+    ts.LanguageServiceShimHostAdapter = LanguageServiceShimHostAdapter;
+    var ThrottledCancellationToken = (function () {
+        function ThrottledCancellationToken(hostCancellationToken) {
+            this.hostCancellationToken = hostCancellationToken;
+            this.lastCancellationCheckTime = 0;
+        }
+        ThrottledCancellationToken.prototype.isCancellationRequested = function () {
+            var time = ts.timestamp();
+            var duration = Math.abs(time - this.lastCancellationCheckTime);
+            if (duration > 10) {
+                this.lastCancellationCheckTime = time;
+                return this.hostCancellationToken.isCancellationRequested();
+            }
+            return false;
+        };
+        return ThrottledCancellationToken;
+    }());
+    var CoreServicesShimHostAdapter = (function () {
+        function CoreServicesShimHostAdapter(shimHost) {
+            var _this = this;
+            this.shimHost = shimHost;
+            this.useCaseSensitiveFileNames = this.shimHost.useCaseSensitiveFileNames ? this.shimHost.useCaseSensitiveFileNames() : false;
+            if ("directoryExists" in this.shimHost) {
+                this.directoryExists = function (directoryName) { return _this.shimHost.directoryExists(directoryName); };
+            }
+            if ("realpath" in this.shimHost) {
+                this.realpath = function (path) { return _this.shimHost.realpath(path); };
+            }
+        }
+        CoreServicesShimHostAdapter.prototype.readDirectory = function (rootDir, extensions, exclude, include, depth) {
+            try {
+                var pattern = ts.getFileMatcherPatterns(rootDir, exclude, include, this.shimHost.useCaseSensitiveFileNames(), this.shimHost.getCurrentDirectory());
+                return JSON.parse(this.shimHost.readDirectory(rootDir, JSON.stringify(extensions), JSON.stringify(pattern.basePaths), pattern.excludePattern, pattern.includeFilePattern, pattern.includeDirectoryPattern, depth));
+            }
+            catch (e) {
+                var results = [];
+                for (var _i = 0, extensions_2 = extensions; _i < extensions_2.length; _i++) {
+                    var extension = extensions_2[_i];
+                    for (var _a = 0, _b = this.readDirectoryFallback(rootDir, extension, exclude); _a < _b.length; _a++) {
+                        var file = _b[_a];
+                        if (!ts.contains(results, file)) {
+                            results.push(file);
+                        }
+                    }
+                }
+                return results;
+            }
+        };
+        CoreServicesShimHostAdapter.prototype.fileExists = function (fileName) {
+            return this.shimHost.fileExists(fileName);
+        };
+        CoreServicesShimHostAdapter.prototype.readFile = function (fileName) {
+            return this.shimHost.readFile(fileName);
+        };
+        CoreServicesShimHostAdapter.prototype.readDirectoryFallback = function (rootDir, extension, exclude) {
+            return JSON.parse(this.shimHost.readDirectory(rootDir, extension, JSON.stringify(exclude)));
+        };
+        CoreServicesShimHostAdapter.prototype.getDirectories = function (path) {
+            return JSON.parse(this.shimHost.getDirectories(path));
+        };
+        return CoreServicesShimHostAdapter;
+    }());
+    ts.CoreServicesShimHostAdapter = CoreServicesShimHostAdapter;
+    function simpleForwardCall(logger, actionDescription, action, logPerformance) {
+        var start;
+        if (logPerformance) {
+            logger.log(actionDescription);
+            start = ts.timestamp();
+        }
+        var result = action();
+        if (logPerformance) {
+            var end = ts.timestamp();
+            logger.log(actionDescription + " completed in " + (end - start) + " msec");
+            if (typeof result === "string") {
+                var str = result;
+                if (str.length > 128) {
+                    str = str.substring(0, 128) + "...";
+                }
+                logger.log("  result.length=" + str.length + ", result='" + JSON.stringify(str) + "'");
+            }
+        }
+        return result;
+    }
+    function forwardJSONCall(logger, actionDescription, action, logPerformance) {
+        return forwardCall(logger, actionDescription, true, action, logPerformance);
+    }
+    function forwardCall(logger, actionDescription, returnJson, action, logPerformance) {
+        try {
+            var result = simpleForwardCall(logger, actionDescription, action, logPerformance);
+            return returnJson ? JSON.stringify({ result: result }) : result;
+        }
+        catch (err) {
+            if (err instanceof ts.OperationCanceledException) {
+                return JSON.stringify({ canceled: true });
+            }
+            logInternalError(logger, err);
+            err.description = actionDescription;
+            return JSON.stringify({ error: err });
+        }
+    }
+    var ShimBase = (function () {
+        function ShimBase(factory) {
+            this.factory = factory;
+            factory.registerShim(this);
+        }
+        ShimBase.prototype.dispose = function (_dummy) {
+            this.factory.unregisterShim(this);
+        };
+        return ShimBase;
+    }());
+    function realizeDiagnostics(diagnostics, newLine) {
+        return diagnostics.map(function (d) { return realizeDiagnostic(d, newLine); });
+    }
+    ts.realizeDiagnostics = realizeDiagnostics;
+    function realizeDiagnostic(diagnostic, newLine) {
+        return {
+            message: ts.flattenDiagnosticMessageText(diagnostic.messageText, newLine),
+            start: diagnostic.start,
+            length: diagnostic.length,
+            category: ts.DiagnosticCategory[diagnostic.category].toLowerCase(),
+            code: diagnostic.code
+        };
+    }
+    var LanguageServiceShimObject = (function (_super) {
+        __extends(LanguageServiceShimObject, _super);
+        function LanguageServiceShimObject(factory, host, languageService) {
+            var _this = _super.call(this, factory) || this;
+            _this.host = host;
+            _this.languageService = languageService;
+            _this.logPerformance = false;
+            _this.logger = _this.host;
+            return _this;
+        }
+        LanguageServiceShimObject.prototype.forwardJSONCall = function (actionDescription, action) {
+            return forwardJSONCall(this.logger, actionDescription, action, this.logPerformance);
+        };
+        LanguageServiceShimObject.prototype.dispose = function (dummy) {
+            this.logger.log("dispose()");
+            this.languageService.dispose();
+            this.languageService = null;
+            if (debugObjectHost && debugObjectHost.CollectGarbage) {
+                debugObjectHost.CollectGarbage();
+                this.logger.log("CollectGarbage()");
+            }
+            this.logger = null;
+            _super.prototype.dispose.call(this, dummy);
+        };
+        LanguageServiceShimObject.prototype.refresh = function (throwOnError) {
+            this.forwardJSONCall("refresh(" + throwOnError + ")", function () { return null; });
+        };
+        LanguageServiceShimObject.prototype.cleanupSemanticCache = function () {
+            var _this = this;
+            this.forwardJSONCall("cleanupSemanticCache()", function () {
+                _this.languageService.cleanupSemanticCache();
+                return null;
+            });
+        };
+        LanguageServiceShimObject.prototype.realizeDiagnostics = function (diagnostics) {
+            var newLine = ts.getNewLineOrDefaultFromHost(this.host);
+            return ts.realizeDiagnostics(diagnostics, newLine);
+        };
+        LanguageServiceShimObject.prototype.getSyntacticClassifications = function (fileName, start, length) {
+            var _this = this;
+            return this.forwardJSONCall("getSyntacticClassifications('" + fileName + "', " + start + ", " + length + ")", function () { return _this.languageService.getSyntacticClassifications(fileName, ts.createTextSpan(start, length)); });
+        };
+        LanguageServiceShimObject.prototype.getSemanticClassifications = function (fileName, start, length) {
+            var _this = this;
+            return this.forwardJSONCall("getSemanticClassifications('" + fileName + "', " + start + ", " + length + ")", function () { return _this.languageService.getSemanticClassifications(fileName, ts.createTextSpan(start, length)); });
+        };
+        LanguageServiceShimObject.prototype.getEncodedSyntacticClassifications = function (fileName, start, length) {
+            var _this = this;
+            return this.forwardJSONCall("getEncodedSyntacticClassifications('" + fileName + "', " + start + ", " + length + ")", function () { return convertClassifications(_this.languageService.getEncodedSyntacticClassifications(fileName, ts.createTextSpan(start, length))); });
+        };
+        LanguageServiceShimObject.prototype.getEncodedSemanticClassifications = function (fileName, start, length) {
+            var _this = this;
+            return this.forwardJSONCall("getEncodedSemanticClassifications('" + fileName + "', " + start + ", " + length + ")", function () { return convertClassifications(_this.languageService.getEncodedSemanticClassifications(fileName, ts.createTextSpan(start, length))); });
+        };
+        LanguageServiceShimObject.prototype.getSyntacticDiagnostics = function (fileName) {
+            var _this = this;
+            return this.forwardJSONCall("getSyntacticDiagnostics('" + fileName + "')", function () {
+                var diagnostics = _this.languageService.getSyntacticDiagnostics(fileName);
+                return _this.realizeDiagnostics(diagnostics);
+            });
+        };
+        LanguageServiceShimObject.prototype.getSemanticDiagnostics = function (fileName) {
+            var _this = this;
+            return this.forwardJSONCall("getSemanticDiagnostics('" + fileName + "')", function () {
+                var diagnostics = _this.languageService.getSemanticDiagnostics(fileName);
+                return _this.realizeDiagnostics(diagnostics);
+            });
+        };
+        LanguageServiceShimObject.prototype.getCompilerOptionsDiagnostics = function () {
+            var _this = this;
+            return this.forwardJSONCall("getCompilerOptionsDiagnostics()", function () {
+                var diagnostics = _this.languageService.getCompilerOptionsDiagnostics();
+                return _this.realizeDiagnostics(diagnostics);
+            });
+        };
+        LanguageServiceShimObject.prototype.getQuickInfoAtPosition = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getQuickInfoAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getQuickInfoAtPosition(fileName, position); });
+        };
+        LanguageServiceShimObject.prototype.getNameOrDottedNameSpan = function (fileName, startPos, endPos) {
+            var _this = this;
+            return this.forwardJSONCall("getNameOrDottedNameSpan('" + fileName + "', " + startPos + ", " + endPos + ")", function () { return _this.languageService.getNameOrDottedNameSpan(fileName, startPos, endPos); });
+        };
+        LanguageServiceShimObject.prototype.getBreakpointStatementAtPosition = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getBreakpointStatementAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getBreakpointStatementAtPosition(fileName, position); });
+        };
+        LanguageServiceShimObject.prototype.getSignatureHelpItems = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getSignatureHelpItems('" + fileName + "', " + position + ")", function () { return _this.languageService.getSignatureHelpItems(fileName, position); });
+        };
+        LanguageServiceShimObject.prototype.getDefinitionAtPosition = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getDefinitionAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getDefinitionAtPosition(fileName, position); });
+        };
+        LanguageServiceShimObject.prototype.getTypeDefinitionAtPosition = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getTypeDefinitionAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getTypeDefinitionAtPosition(fileName, position); });
+        };
+        LanguageServiceShimObject.prototype.getImplementationAtPosition = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getImplementationAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getImplementationAtPosition(fileName, position); });
+        };
+        LanguageServiceShimObject.prototype.getRenameInfo = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getRenameInfo('" + fileName + "', " + position + ")", function () { return _this.languageService.getRenameInfo(fileName, position); });
+        };
+        LanguageServiceShimObject.prototype.findRenameLocations = function (fileName, position, findInStrings, findInComments) {
+            var _this = this;
+            return this.forwardJSONCall("findRenameLocations('" + fileName + "', " + position + ", " + findInStrings + ", " + findInComments + ")", function () { return _this.languageService.findRenameLocations(fileName, position, findInStrings, findInComments); });
+        };
+        LanguageServiceShimObject.prototype.getBraceMatchingAtPosition = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getBraceMatchingAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getBraceMatchingAtPosition(fileName, position); });
+        };
+        LanguageServiceShimObject.prototype.isValidBraceCompletionAtPosition = function (fileName, position, openingBrace) {
+            var _this = this;
+            return this.forwardJSONCall("isValidBraceCompletionAtPosition('" + fileName + "', " + position + ", " + openingBrace + ")", function () { return _this.languageService.isValidBraceCompletionAtPosition(fileName, position, openingBrace); });
+        };
+        LanguageServiceShimObject.prototype.getIndentationAtPosition = function (fileName, position, options) {
+            var _this = this;
+            return this.forwardJSONCall("getIndentationAtPosition('" + fileName + "', " + position + ")", function () {
+                var localOptions = JSON.parse(options);
+                return _this.languageService.getIndentationAtPosition(fileName, position, localOptions);
+            });
+        };
+        LanguageServiceShimObject.prototype.getReferencesAtPosition = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getReferencesAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getReferencesAtPosition(fileName, position); });
+        };
+        LanguageServiceShimObject.prototype.findReferences = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("findReferences('" + fileName + "', " + position + ")", function () { return _this.languageService.findReferences(fileName, position); });
+        };
+        LanguageServiceShimObject.prototype.getOccurrencesAtPosition = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getOccurrencesAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getOccurrencesAtPosition(fileName, position); });
+        };
+        LanguageServiceShimObject.prototype.getDocumentHighlights = function (fileName, position, filesToSearch) {
+            var _this = this;
+            return this.forwardJSONCall("getDocumentHighlights('" + fileName + "', " + position + ")", function () {
+                var results = _this.languageService.getDocumentHighlights(fileName, position, JSON.parse(filesToSearch));
+                var normalizedName = ts.normalizeSlashes(fileName).toLowerCase();
+                return ts.filter(results, function (r) { return ts.normalizeSlashes(r.fileName).toLowerCase() === normalizedName; });
+            });
+        };
+        LanguageServiceShimObject.prototype.getCompletionsAtPosition = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getCompletionsAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getCompletionsAtPosition(fileName, position); });
+        };
+        LanguageServiceShimObject.prototype.getCompletionEntryDetails = function (fileName, position, entryName) {
+            var _this = this;
+            return this.forwardJSONCall("getCompletionEntryDetails('" + fileName + "', " + position + ", '" + entryName + "')", function () { return _this.languageService.getCompletionEntryDetails(fileName, position, entryName); });
+        };
+        LanguageServiceShimObject.prototype.getFormattingEditsForRange = function (fileName, start, end, options) {
+            var _this = this;
+            return this.forwardJSONCall("getFormattingEditsForRange('" + fileName + "', " + start + ", " + end + ")", function () {
+                var localOptions = JSON.parse(options);
+                return _this.languageService.getFormattingEditsForRange(fileName, start, end, localOptions);
+            });
+        };
+        LanguageServiceShimObject.prototype.getFormattingEditsForDocument = function (fileName, options) {
+            var _this = this;
+            return this.forwardJSONCall("getFormattingEditsForDocument('" + fileName + "')", function () {
+                var localOptions = JSON.parse(options);
+                return _this.languageService.getFormattingEditsForDocument(fileName, localOptions);
+            });
+        };
+        LanguageServiceShimObject.prototype.getFormattingEditsAfterKeystroke = function (fileName, position, key, options) {
+            var _this = this;
+            return this.forwardJSONCall("getFormattingEditsAfterKeystroke('" + fileName + "', " + position + ", '" + key + "')", function () {
+                var localOptions = JSON.parse(options);
+                return _this.languageService.getFormattingEditsAfterKeystroke(fileName, position, key, localOptions);
+            });
+        };
+        LanguageServiceShimObject.prototype.getDocCommentTemplateAtPosition = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getDocCommentTemplateAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getDocCommentTemplateAtPosition(fileName, position); });
+        };
+        LanguageServiceShimObject.prototype.getNavigateToItems = function (searchValue, maxResultCount, fileName) {
+            var _this = this;
+            return this.forwardJSONCall("getNavigateToItems('" + searchValue + "', " + maxResultCount + ", " + fileName + ")", function () { return _this.languageService.getNavigateToItems(searchValue, maxResultCount, fileName); });
+        };
+        LanguageServiceShimObject.prototype.getNavigationBarItems = function (fileName) {
+            var _this = this;
+            return this.forwardJSONCall("getNavigationBarItems('" + fileName + "')", function () { return _this.languageService.getNavigationBarItems(fileName); });
+        };
+        LanguageServiceShimObject.prototype.getNavigationTree = function (fileName) {
+            var _this = this;
+            return this.forwardJSONCall("getNavigationTree('" + fileName + "')", function () { return _this.languageService.getNavigationTree(fileName); });
+        };
+        LanguageServiceShimObject.prototype.getOutliningSpans = function (fileName) {
+            var _this = this;
+            return this.forwardJSONCall("getOutliningSpans('" + fileName + "')", function () { return _this.languageService.getOutliningSpans(fileName); });
+        };
+        LanguageServiceShimObject.prototype.getTodoComments = function (fileName, descriptors) {
+            var _this = this;
+            return this.forwardJSONCall("getTodoComments('" + fileName + "')", function () { return _this.languageService.getTodoComments(fileName, JSON.parse(descriptors)); });
+        };
+        LanguageServiceShimObject.prototype.getEmitOutput = function (fileName) {
+            var _this = this;
+            return this.forwardJSONCall("getEmitOutput('" + fileName + "')", function () { return _this.languageService.getEmitOutput(fileName); });
+        };
+        LanguageServiceShimObject.prototype.getEmitOutputObject = function (fileName) {
+            var _this = this;
+            return forwardCall(this.logger, "getEmitOutput('" + fileName + "')", false, function () { return _this.languageService.getEmitOutput(fileName); }, this.logPerformance);
+        };
+        return LanguageServiceShimObject;
+    }(ShimBase));
+    function convertClassifications(classifications) {
+        return { spans: classifications.spans.join(","), endOfLineState: classifications.endOfLineState };
+    }
+    var ClassifierShimObject = (function (_super) {
+        __extends(ClassifierShimObject, _super);
+        function ClassifierShimObject(factory, logger) {
+            var _this = _super.call(this, factory) || this;
+            _this.logger = logger;
+            _this.logPerformance = false;
+            _this.classifier = ts.createClassifier();
+            return _this;
+        }
+        ClassifierShimObject.prototype.getEncodedLexicalClassifications = function (text, lexState, syntacticClassifierAbsent) {
+            var _this = this;
+            return forwardJSONCall(this.logger, "getEncodedLexicalClassifications", function () { return convertClassifications(_this.classifier.getEncodedLexicalClassifications(text, lexState, syntacticClassifierAbsent)); }, this.logPerformance);
+        };
+        ClassifierShimObject.prototype.getClassificationsForLine = function (text, lexState, classifyKeywordsInGenerics) {
+            var classification = this.classifier.getClassificationsForLine(text, lexState, classifyKeywordsInGenerics);
+            var result = "";
+            for (var _i = 0, _a = classification.entries; _i < _a.length; _i++) {
+                var item = _a[_i];
+                result += item.length + "\n";
+                result += item.classification + "\n";
+            }
+            result += classification.finalLexState;
+            return result;
+        };
+        return ClassifierShimObject;
+    }(ShimBase));
+    var CoreServicesShimObject = (function (_super) {
+        __extends(CoreServicesShimObject, _super);
+        function CoreServicesShimObject(factory, logger, host) {
+            var _this = _super.call(this, factory) || this;
+            _this.logger = logger;
+            _this.host = host;
+            _this.logPerformance = false;
+            return _this;
+        }
+        CoreServicesShimObject.prototype.forwardJSONCall = function (actionDescription, action) {
+            return forwardJSONCall(this.logger, actionDescription, action, this.logPerformance);
+        };
+        CoreServicesShimObject.prototype.resolveModuleName = function (fileName, moduleName, compilerOptionsJson) {
+            var _this = this;
+            return this.forwardJSONCall("resolveModuleName('" + fileName + "')", function () {
+                var compilerOptions = JSON.parse(compilerOptionsJson);
+                var result = ts.resolveModuleName(moduleName, ts.normalizeSlashes(fileName), compilerOptions, _this.host);
+                var resolvedFileName = result.resolvedModule ? result.resolvedModule.resolvedFileName : undefined;
+                if (resolvedFileName && !compilerOptions.allowJs && ts.fileExtensionIs(resolvedFileName, ".js")) {
+                    return {
+                        resolvedFileName: undefined,
+                        failedLookupLocations: []
+                    };
+                }
+                return {
+                    resolvedFileName: resolvedFileName,
+                    failedLookupLocations: result.failedLookupLocations
+                };
+            });
+        };
+        CoreServicesShimObject.prototype.resolveTypeReferenceDirective = function (fileName, typeReferenceDirective, compilerOptionsJson) {
+            var _this = this;
+            return this.forwardJSONCall("resolveTypeReferenceDirective(" + fileName + ")", function () {
+                var compilerOptions = JSON.parse(compilerOptionsJson);
+                var result = ts.resolveTypeReferenceDirective(typeReferenceDirective, ts.normalizeSlashes(fileName), compilerOptions, _this.host);
+                return {
+                    resolvedFileName: result.resolvedTypeReferenceDirective ? result.resolvedTypeReferenceDirective.resolvedFileName : undefined,
+                    primary: result.resolvedTypeReferenceDirective ? result.resolvedTypeReferenceDirective.primary : true,
+                    failedLookupLocations: result.failedLookupLocations
+                };
+            });
+        };
+        CoreServicesShimObject.prototype.getPreProcessedFileInfo = function (fileName, sourceTextSnapshot) {
+            var _this = this;
+            return this.forwardJSONCall("getPreProcessedFileInfo('" + fileName + "')", function () {
+                var result = ts.preProcessFile(sourceTextSnapshot.getText(0, sourceTextSnapshot.getLength()), true, true);
+                return {
+                    referencedFiles: _this.convertFileReferences(result.referencedFiles),
+                    importedFiles: _this.convertFileReferences(result.importedFiles),
+                    ambientExternalModules: result.ambientExternalModules,
+                    isLibFile: result.isLibFile,
+                    typeReferenceDirectives: _this.convertFileReferences(result.typeReferenceDirectives)
+                };
+            });
+        };
+        CoreServicesShimObject.prototype.getAutomaticTypeDirectiveNames = function (compilerOptionsJson) {
+            var _this = this;
+            return this.forwardJSONCall("getAutomaticTypeDirectiveNames('" + compilerOptionsJson + "')", function () {
+                var compilerOptions = JSON.parse(compilerOptionsJson);
+                return ts.getAutomaticTypeDirectiveNames(compilerOptions, _this.host);
+            });
+        };
+        CoreServicesShimObject.prototype.convertFileReferences = function (refs) {
+            if (!refs) {
+                return undefined;
+            }
+            var result = [];
+            for (var _i = 0, refs_2 = refs; _i < refs_2.length; _i++) {
+                var ref = refs_2[_i];
+                result.push({
+                    path: ts.normalizeSlashes(ref.fileName),
+                    position: ref.pos,
+                    length: ref.end - ref.pos
+                });
+            }
+            return result;
+        };
+        CoreServicesShimObject.prototype.getTSConfigFileInfo = function (fileName, sourceTextSnapshot) {
+            var _this = this;
+            return this.forwardJSONCall("getTSConfigFileInfo('" + fileName + "')", function () {
+                var text = sourceTextSnapshot.getText(0, sourceTextSnapshot.getLength());
+                var result = ts.parseConfigFileTextToJson(fileName, text);
+                if (result.error) {
+                    return {
+                        options: {},
+                        typingOptions: {},
+                        files: [],
+                        raw: {},
+                        errors: [realizeDiagnostic(result.error, "\r\n")]
+                    };
+                }
+                var normalizedFileName = ts.normalizeSlashes(fileName);
+                var configFile = ts.parseJsonConfigFileContent(result.config, _this.host, ts.getDirectoryPath(normalizedFileName), {}, normalizedFileName);
+                return {
+                    options: configFile.options,
+                    typingOptions: configFile.typingOptions,
+                    files: configFile.fileNames,
+                    raw: configFile.raw,
+                    errors: realizeDiagnostics(configFile.errors, "\r\n")
+                };
+            });
+        };
+        CoreServicesShimObject.prototype.getDefaultCompilationSettings = function () {
+            return this.forwardJSONCall("getDefaultCompilationSettings()", function () { return ts.getDefaultCompilerOptions(); });
+        };
+        CoreServicesShimObject.prototype.discoverTypings = function (discoverTypingsJson) {
+            var _this = this;
+            var getCanonicalFileName = ts.createGetCanonicalFileName(false);
+            return this.forwardJSONCall("discoverTypings()", function () {
+                var info = JSON.parse(discoverTypingsJson);
+                return ts.JsTyping.discoverTypings(_this.host, info.fileNames, ts.toPath(info.projectRootPath, info.projectRootPath, getCanonicalFileName), ts.toPath(info.safeListPath, info.safeListPath, getCanonicalFileName), info.packageNameToTypingLocation, info.typingOptions, info.unresolvedImports);
+            });
+        };
+        return CoreServicesShimObject;
+    }(ShimBase));
+    var TypeScriptServicesFactory = (function () {
+        function TypeScriptServicesFactory() {
+            this._shims = [];
+        }
+        TypeScriptServicesFactory.prototype.getServicesVersion = function () {
+            return ts.servicesVersion;
+        };
+        TypeScriptServicesFactory.prototype.createLanguageServiceShim = function (host) {
+            try {
+                if (this.documentRegistry === undefined) {
+                    this.documentRegistry = ts.createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames(), host.getCurrentDirectory());
+                }
+                var hostAdapter = new LanguageServiceShimHostAdapter(host);
+                var languageService = ts.createLanguageService(hostAdapter, this.documentRegistry);
+                return new LanguageServiceShimObject(this, host, languageService);
+            }
+            catch (err) {
+                logInternalError(host, err);
+                throw err;
+            }
+        };
+        TypeScriptServicesFactory.prototype.createClassifierShim = function (logger) {
+            try {
+                return new ClassifierShimObject(this, logger);
+            }
+            catch (err) {
+                logInternalError(logger, err);
+                throw err;
+            }
+        };
+        TypeScriptServicesFactory.prototype.createCoreServicesShim = function (host) {
+            try {
+                var adapter = new CoreServicesShimHostAdapter(host);
+                return new CoreServicesShimObject(this, host, adapter);
+            }
+            catch (err) {
+                logInternalError(host, err);
+                throw err;
+            }
+        };
+        TypeScriptServicesFactory.prototype.close = function () {
+            this._shims = [];
+            this.documentRegistry = undefined;
+        };
+        TypeScriptServicesFactory.prototype.registerShim = function (shim) {
+            this._shims.push(shim);
+        };
+        TypeScriptServicesFactory.prototype.unregisterShim = function (shim) {
+            for (var i = 0, n = this._shims.length; i < n; i++) {
+                if (this._shims[i] === shim) {
+                    delete this._shims[i];
+                    return;
+                }
+            }
+            throw new Error("Invalid operation");
+        };
+        return TypeScriptServicesFactory;
+    }());
+    ts.TypeScriptServicesFactory = TypeScriptServicesFactory;
+    if (typeof module !== "undefined" && module.exports) {
+        module.exports = ts;
+    }
+})(ts || (ts = {}));
+var TypeScript;
+(function (TypeScript) {
+    var Services;
+    (function (Services) {
+        Services.TypeScriptServicesFactory = ts.TypeScriptServicesFactory;
+    })(Services = TypeScript.Services || (TypeScript.Services = {}));
+})(TypeScript || (TypeScript = {}));
+var toolsVersion = "2.2";
diff --git a/lib/tsserverlibrary.d.ts b/lib/tsserverlibrary.d.ts
index 63580ce8dcd..9888241431b 100644
--- a/lib/tsserverlibrary.d.ts
+++ b/lib/tsserverlibrary.d.ts
@@ -1,20 +1,840 @@
-/*! *****************************************************************************
-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 path="../../src/server/types.d.ts" />
-/// <reference types="node" />
+declare namespace ts.server.protocol {
+    namespace CommandTypes {
+        type Brace = "brace";
+        type BraceFull = "brace-full";
+        type BraceCompletion = "braceCompletion";
+        type Change = "change";
+        type Close = "close";
+        type Completions = "completions";
+        type CompletionsFull = "completions-full";
+        type CompletionDetails = "completionEntryDetails";
+        type CompileOnSaveAffectedFileList = "compileOnSaveAffectedFileList";
+        type CompileOnSaveEmitFile = "compileOnSaveEmitFile";
+        type Configure = "configure";
+        type Definition = "definition";
+        type DefinitionFull = "definition-full";
+        type Implementation = "implementation";
+        type ImplementationFull = "implementation-full";
+        type Exit = "exit";
+        type Format = "format";
+        type Formatonkey = "formatonkey";
+        type FormatFull = "format-full";
+        type FormatonkeyFull = "formatonkey-full";
+        type FormatRangeFull = "formatRange-full";
+        type Geterr = "geterr";
+        type GeterrForProject = "geterrForProject";
+        type SemanticDiagnosticsSync = "semanticDiagnosticsSync";
+        type SyntacticDiagnosticsSync = "syntacticDiagnosticsSync";
+        type NavBar = "navbar";
+        type NavBarFull = "navbar-full";
+        type Navto = "navto";
+        type NavtoFull = "navto-full";
+        type NavTree = "navtree";
+        type NavTreeFull = "navtree-full";
+        type Occurrences = "occurrences";
+        type DocumentHighlights = "documentHighlights";
+        type DocumentHighlightsFull = "documentHighlights-full";
+        type Open = "open";
+        type Quickinfo = "quickinfo";
+        type QuickinfoFull = "quickinfo-full";
+        type References = "references";
+        type ReferencesFull = "references-full";
+        type Reload = "reload";
+        type Rename = "rename";
+        type RenameInfoFull = "rename-full";
+        type RenameLocationsFull = "renameLocations-full";
+        type Saveto = "saveto";
+        type SignatureHelp = "signatureHelp";
+        type SignatureHelpFull = "signatureHelp-full";
+        type TypeDefinition = "typeDefinition";
+        type ProjectInfo = "projectInfo";
+        type ReloadProjects = "reloadProjects";
+        type Unknown = "unknown";
+        type OpenExternalProject = "openExternalProject";
+        type OpenExternalProjects = "openExternalProjects";
+        type CloseExternalProject = "closeExternalProject";
+        type SynchronizeProjectList = "synchronizeProjectList";
+        type ApplyChangedToOpenFiles = "applyChangedToOpenFiles";
+        type EncodedSemanticClassificationsFull = "encodedSemanticClassifications-full";
+        type Cleanup = "cleanup";
+        type OutliningSpans = "outliningSpans";
+        type TodoComments = "todoComments";
+        type Indentation = "indentation";
+        type DocCommentTemplate = "docCommentTemplate";
+        type CompilerOptionsDiagnosticsFull = "compilerOptionsDiagnostics-full";
+        type NameOrDottedNameSpan = "nameOrDottedNameSpan";
+        type BreakpointStatement = "breakpointStatement";
+        type CompilerOptionsForInferredProjects = "compilerOptionsForInferredProjects";
+        type GetCodeFixes = "getCodeFixes";
+        type GetCodeFixesFull = "getCodeFixes-full";
+        type GetSupportedCodeFixes = "getSupportedCodeFixes";
+    }
+    interface Message {
+        seq: number;
+        type: "request" | "response" | "event";
+    }
+    interface Request extends Message {
+        command: string;
+        arguments?: any;
+    }
+    interface ReloadProjectsRequest extends Message {
+        command: CommandTypes.ReloadProjects;
+    }
+    interface Event extends Message {
+        event: string;
+        body?: any;
+    }
+    interface Response extends Message {
+        request_seq: number;
+        success: boolean;
+        command: string;
+        message?: string;
+        body?: any;
+    }
+    interface FileRequestArgs {
+        file: string;
+        projectFileName?: string;
+    }
+    interface DocCommentTemplateRequest extends FileLocationRequest {
+        command: CommandTypes.DocCommentTemplate;
+    }
+    interface DocCommandTemplateResponse extends Response {
+        body?: TextInsertion;
+    }
+    interface TodoCommentRequest extends FileRequest {
+        command: CommandTypes.TodoComments;
+        arguments: TodoCommentRequestArgs;
+    }
+    interface TodoCommentRequestArgs extends FileRequestArgs {
+        descriptors: TodoCommentDescriptor[];
+    }
+    interface TodoCommentsResponse extends Response {
+        body?: TodoComment[];
+    }
+    interface OutliningSpansRequest extends FileRequest {
+        command: CommandTypes.OutliningSpans;
+    }
+    interface OutliningSpansResponse extends Response {
+        body?: OutliningSpan[];
+    }
+    interface IndentationRequest extends FileLocationRequest {
+        command: CommandTypes.Indentation;
+        arguments: IndentationRequestArgs;
+    }
+    interface IndentationResponse extends Response {
+        body?: IndentationResult;
+    }
+    interface IndentationResult {
+        position: number;
+        indentation: number;
+    }
+    interface IndentationRequestArgs extends FileLocationRequestArgs {
+        options?: EditorSettings;
+    }
+    interface ProjectInfoRequestArgs extends FileRequestArgs {
+        needFileNameList: boolean;
+    }
+    interface ProjectInfoRequest extends Request {
+        command: CommandTypes.ProjectInfo;
+        arguments: ProjectInfoRequestArgs;
+    }
+    interface CompilerOptionsDiagnosticsRequest extends Request {
+        arguments: CompilerOptionsDiagnosticsRequestArgs;
+    }
+    interface CompilerOptionsDiagnosticsRequestArgs {
+        projectFileName: string;
+    }
+    interface ProjectInfo {
+        configFileName: string;
+        fileNames?: string[];
+        languageServiceDisabled?: boolean;
+    }
+    interface DiagnosticWithLinePosition {
+        message: string;
+        start: number;
+        length: number;
+        startLocation: Location;
+        endLocation: Location;
+        category: string;
+        code: number;
+    }
+    interface ProjectInfoResponse extends Response {
+        body?: ProjectInfo;
+    }
+    interface FileRequest extends Request {
+        arguments: FileRequestArgs;
+    }
+    interface FileLocationRequestArgs extends FileRequestArgs {
+        line: number;
+        offset: number;
+        position?: number;
+    }
+    interface CodeFixRequest extends Request {
+        command: CommandTypes.GetCodeFixes;
+        arguments: CodeFixRequestArgs;
+    }
+    interface CodeFixRequestArgs extends FileRequestArgs {
+        startLine: number;
+        startOffset: number;
+        startPosition?: number;
+        endLine: number;
+        endOffset: number;
+        endPosition?: number;
+        errorCodes?: number[];
+    }
+    interface GetCodeFixesResponse extends Response {
+        body?: CodeAction[];
+    }
+    interface FileLocationRequest extends FileRequest {
+        arguments: FileLocationRequestArgs;
+    }
+    interface GetSupportedCodeFixesRequest extends Request {
+        command: CommandTypes.GetSupportedCodeFixes;
+    }
+    interface GetSupportedCodeFixesResponse extends Response {
+        body?: string[];
+    }
+    interface EncodedSemanticClassificationsRequest extends FileRequest {
+        arguments: EncodedSemanticClassificationsRequestArgs;
+    }
+    interface EncodedSemanticClassificationsRequestArgs extends FileRequestArgs {
+        start: number;
+        length: number;
+    }
+    interface DocumentHighlightsRequestArgs extends FileLocationRequestArgs {
+        filesToSearch: string[];
+    }
+    interface DefinitionRequest extends FileLocationRequest {
+        command: CommandTypes.Definition;
+    }
+    interface TypeDefinitionRequest extends FileLocationRequest {
+        command: CommandTypes.TypeDefinition;
+    }
+    interface ImplementationRequest extends FileLocationRequest {
+        command: CommandTypes.Implementation;
+    }
+    interface Location {
+        line: number;
+        offset: number;
+    }
+    interface TextSpan {
+        start: Location;
+        end: Location;
+    }
+    interface FileSpan extends TextSpan {
+        file: string;
+    }
+    interface DefinitionResponse extends Response {
+        body?: FileSpan[];
+    }
+    interface TypeDefinitionResponse extends Response {
+        body?: FileSpan[];
+    }
+    interface ImplementationResponse extends Response {
+        body?: FileSpan[];
+    }
+    interface BraceCompletionRequest extends FileLocationRequest {
+        command: CommandTypes.BraceCompletion;
+        arguments: BraceCompletionRequestArgs;
+    }
+    interface BraceCompletionRequestArgs extends FileLocationRequestArgs {
+        openingBrace: string;
+    }
+    interface OccurrencesRequest extends FileLocationRequest {
+        command: CommandTypes.Occurrences;
+    }
+    interface OccurrencesResponseItem extends FileSpan {
+        isWriteAccess: boolean;
+    }
+    interface OccurrencesResponse extends Response {
+        body?: OccurrencesResponseItem[];
+    }
+    interface DocumentHighlightsRequest extends FileLocationRequest {
+        command: CommandTypes.DocumentHighlights;
+        arguments: DocumentHighlightsRequestArgs;
+    }
+    interface HighlightSpan extends TextSpan {
+        kind: string;
+    }
+    interface DocumentHighlightsItem {
+        file: string;
+        highlightSpans: HighlightSpan[];
+    }
+    interface DocumentHighlightsResponse extends Response {
+        body?: DocumentHighlightsItem[];
+    }
+    interface ReferencesRequest extends FileLocationRequest {
+        command: CommandTypes.References;
+    }
+    interface ReferencesResponseItem extends FileSpan {
+        lineText: string;
+        isWriteAccess: boolean;
+        isDefinition: boolean;
+    }
+    interface ReferencesResponseBody {
+        refs: ReferencesResponseItem[];
+        symbolName: string;
+        symbolStartOffset: number;
+        symbolDisplayString: string;
+    }
+    interface ReferencesResponse extends Response {
+        body?: ReferencesResponseBody;
+    }
+    interface RenameRequestArgs extends FileLocationRequestArgs {
+        findInComments?: boolean;
+        findInStrings?: boolean;
+    }
+    interface RenameRequest extends FileLocationRequest {
+        command: CommandTypes.Rename;
+        arguments: RenameRequestArgs;
+    }
+    interface RenameInfo {
+        canRename: boolean;
+        localizedErrorMessage?: string;
+        displayName: string;
+        fullDisplayName: string;
+        kind: string;
+        kindModifiers: string;
+    }
+    interface SpanGroup {
+        file: string;
+        locs: TextSpan[];
+    }
+    interface RenameResponseBody {
+        info: RenameInfo;
+        locs: SpanGroup[];
+    }
+    interface RenameResponse extends Response {
+        body?: RenameResponseBody;
+    }
+    interface ExternalFile {
+        fileName: string;
+        scriptKind?: ScriptKindName | ts.ScriptKind;
+        hasMixedContent?: boolean;
+        content?: string;
+    }
+    interface ExternalProject {
+        projectFileName: string;
+        rootFiles: ExternalFile[];
+        options: ExternalProjectCompilerOptions;
+        typingOptions?: TypingOptions;
+    }
+    interface CompileOnSaveMixin {
+        compileOnSave?: boolean;
+    }
+    type ExternalProjectCompilerOptions = CompilerOptions & CompileOnSaveMixin;
+    interface ProjectVersionInfo {
+        projectName: string;
+        isInferred: boolean;
+        version: number;
+        options: ts.CompilerOptions;
+    }
+    interface ProjectChanges {
+        added: string[];
+        removed: string[];
+    }
+    interface ProjectFiles {
+        info?: ProjectVersionInfo;
+        files?: string[];
+        changes?: ProjectChanges;
+    }
+    interface ProjectFilesWithDiagnostics extends ProjectFiles {
+        projectErrors: DiagnosticWithLinePosition[];
+    }
+    interface ChangedOpenFile {
+        fileName: string;
+        changes: ts.TextChange[];
+    }
+    interface ConfigureRequestArguments {
+        hostInfo?: string;
+        file?: string;
+        formatOptions?: FormatCodeSettings;
+    }
+    interface ConfigureRequest extends Request {
+        command: CommandTypes.Configure;
+        arguments: ConfigureRequestArguments;
+    }
+    interface ConfigureResponse extends Response {
+    }
+    interface OpenRequestArgs extends FileRequestArgs {
+        fileContent?: string;
+        scriptKindName?: ScriptKindName;
+    }
+    type ScriptKindName = "TS" | "JS" | "TSX" | "JSX";
+    interface OpenRequest extends Request {
+        command: CommandTypes.Open;
+        arguments: OpenRequestArgs;
+    }
+    interface OpenExternalProjectRequest extends Request {
+        command: CommandTypes.OpenExternalProject;
+        arguments: OpenExternalProjectArgs;
+    }
+    type OpenExternalProjectArgs = ExternalProject;
+    interface OpenExternalProjectsRequest extends Request {
+        command: CommandTypes.OpenExternalProjects;
+        arguments: OpenExternalProjectsArgs;
+    }
+    interface OpenExternalProjectsArgs {
+        projects: ExternalProject[];
+    }
+    interface OpenExternalProjectResponse extends Response {
+    }
+    interface OpenExternalProjectsResponse extends Response {
+    }
+    interface CloseExternalProjectRequest extends Request {
+        command: CommandTypes.CloseExternalProject;
+        arguments: CloseExternalProjectRequestArgs;
+    }
+    interface CloseExternalProjectRequestArgs {
+        projectFileName: string;
+    }
+    interface CloseExternalProjectResponse extends Response {
+    }
+    interface SynchronizeProjectListRequest extends Request {
+        arguments: SynchronizeProjectListRequestArgs;
+    }
+    interface SynchronizeProjectListRequestArgs {
+        knownProjects: protocol.ProjectVersionInfo[];
+    }
+    interface ApplyChangedToOpenFilesRequest extends Request {
+        arguments: ApplyChangedToOpenFilesRequestArgs;
+    }
+    interface ApplyChangedToOpenFilesRequestArgs {
+        openFiles?: ExternalFile[];
+        changedFiles?: ChangedOpenFile[];
+        closedFiles?: string[];
+    }
+    interface SetCompilerOptionsForInferredProjectsRequest extends Request {
+        command: CommandTypes.CompilerOptionsForInferredProjects;
+        arguments: SetCompilerOptionsForInferredProjectsArgs;
+    }
+    interface SetCompilerOptionsForInferredProjectsArgs {
+        options: ExternalProjectCompilerOptions;
+    }
+    interface SetCompilerOptionsForInferredProjectsResponse extends Response {
+    }
+    interface ExitRequest extends Request {
+        command: CommandTypes.Exit;
+    }
+    interface CloseRequest extends FileRequest {
+        command: CommandTypes.Close;
+    }
+    interface CompileOnSaveAffectedFileListRequest extends FileRequest {
+        command: CommandTypes.CompileOnSaveAffectedFileList;
+    }
+    interface CompileOnSaveAffectedFileListSingleProject {
+        projectFileName: string;
+        fileNames: string[];
+    }
+    interface CompileOnSaveAffectedFileListResponse extends Response {
+        body: CompileOnSaveAffectedFileListSingleProject[];
+    }
+    interface CompileOnSaveEmitFileRequest extends FileRequest {
+        command: CommandTypes.CompileOnSaveEmitFile;
+        arguments: CompileOnSaveEmitFileRequestArgs;
+    }
+    interface CompileOnSaveEmitFileRequestArgs extends FileRequestArgs {
+        forced?: boolean;
+    }
+    interface QuickInfoRequest extends FileLocationRequest {
+        command: CommandTypes.Quickinfo;
+    }
+    interface QuickInfoResponseBody {
+        kind: string;
+        kindModifiers: string;
+        start: Location;
+        end: Location;
+        displayString: string;
+        documentation: string;
+    }
+    interface QuickInfoResponse extends Response {
+        body?: QuickInfoResponseBody;
+    }
+    interface FormatRequestArgs extends FileLocationRequestArgs {
+        endLine: number;
+        endOffset: number;
+        endPosition?: number;
+        options?: FormatCodeSettings;
+    }
+    interface FormatRequest extends FileLocationRequest {
+        command: CommandTypes.Format;
+        arguments: FormatRequestArgs;
+    }
+    interface CodeEdit {
+        start: Location;
+        end: Location;
+        newText: string;
+    }
+    interface FileCodeEdits {
+        fileName: string;
+        textChanges: CodeEdit[];
+    }
+    interface CodeFixResponse extends Response {
+        body?: CodeAction[];
+    }
+    interface CodeAction {
+        description: string;
+        changes: FileCodeEdits[];
+    }
+    interface FormatResponse extends Response {
+        body?: CodeEdit[];
+    }
+    interface FormatOnKeyRequestArgs extends FileLocationRequestArgs {
+        key: string;
+        options?: FormatCodeSettings;
+    }
+    interface FormatOnKeyRequest extends FileLocationRequest {
+        command: CommandTypes.Formatonkey;
+        arguments: FormatOnKeyRequestArgs;
+    }
+    interface CompletionsRequestArgs extends FileLocationRequestArgs {
+        prefix?: string;
+    }
+    interface CompletionsRequest extends FileLocationRequest {
+        command: CommandTypes.Completions;
+        arguments: CompletionsRequestArgs;
+    }
+    interface CompletionDetailsRequestArgs extends FileLocationRequestArgs {
+        entryNames: string[];
+    }
+    interface CompletionDetailsRequest extends FileLocationRequest {
+        command: CommandTypes.CompletionDetails;
+        arguments: CompletionDetailsRequestArgs;
+    }
+    interface SymbolDisplayPart {
+        text: string;
+        kind: string;
+    }
+    interface CompletionEntry {
+        name: string;
+        kind: string;
+        kindModifiers: string;
+        sortText: string;
+        replacementSpan?: TextSpan;
+    }
+    interface CompletionEntryDetails {
+        name: string;
+        kind: string;
+        kindModifiers: string;
+        displayParts: SymbolDisplayPart[];
+        documentation: SymbolDisplayPart[];
+    }
+    interface CompletionsResponse extends Response {
+        body?: CompletionEntry[];
+    }
+    interface CompletionDetailsResponse extends Response {
+        body?: CompletionEntryDetails[];
+    }
+    interface SignatureHelpParameter {
+        name: string;
+        documentation: SymbolDisplayPart[];
+        displayParts: SymbolDisplayPart[];
+        isOptional: boolean;
+    }
+    interface SignatureHelpItem {
+        isVariadic: boolean;
+        prefixDisplayParts: SymbolDisplayPart[];
+        suffixDisplayParts: SymbolDisplayPart[];
+        separatorDisplayParts: SymbolDisplayPart[];
+        parameters: SignatureHelpParameter[];
+        documentation: SymbolDisplayPart[];
+    }
+    interface SignatureHelpItems {
+        items: SignatureHelpItem[];
+        applicableSpan: TextSpan;
+        selectedItemIndex: number;
+        argumentIndex: number;
+        argumentCount: number;
+    }
+    interface SignatureHelpRequestArgs extends FileLocationRequestArgs {
+    }
+    interface SignatureHelpRequest extends FileLocationRequest {
+        command: CommandTypes.SignatureHelp;
+        arguments: SignatureHelpRequestArgs;
+    }
+    interface SignatureHelpResponse extends Response {
+        body?: SignatureHelpItems;
+    }
+    interface SemanticDiagnosticsSyncRequest extends FileRequest {
+        command: CommandTypes.SemanticDiagnosticsSync;
+        arguments: SemanticDiagnosticsSyncRequestArgs;
+    }
+    interface SemanticDiagnosticsSyncRequestArgs extends FileRequestArgs {
+        includeLinePosition?: boolean;
+    }
+    interface SemanticDiagnosticsSyncResponse extends Response {
+        body?: Diagnostic[] | DiagnosticWithLinePosition[];
+    }
+    interface SyntacticDiagnosticsSyncRequest extends FileRequest {
+        command: CommandTypes.SyntacticDiagnosticsSync;
+        arguments: SyntacticDiagnosticsSyncRequestArgs;
+    }
+    interface SyntacticDiagnosticsSyncRequestArgs extends FileRequestArgs {
+        includeLinePosition?: boolean;
+    }
+    interface SyntacticDiagnosticsSyncResponse extends Response {
+        body?: Diagnostic[] | DiagnosticWithLinePosition[];
+    }
+    interface GeterrForProjectRequestArgs {
+        file: string;
+        delay: number;
+    }
+    interface GeterrForProjectRequest extends Request {
+        command: CommandTypes.GeterrForProject;
+        arguments: GeterrForProjectRequestArgs;
+    }
+    interface GeterrRequestArgs {
+        files: string[];
+        delay: number;
+    }
+    interface GeterrRequest extends Request {
+        command: CommandTypes.Geterr;
+        arguments: GeterrRequestArgs;
+    }
+    interface Diagnostic {
+        start: Location;
+        end: Location;
+        text: string;
+        code?: number;
+    }
+    interface DiagnosticEventBody {
+        file: string;
+        diagnostics: Diagnostic[];
+    }
+    interface DiagnosticEvent extends Event {
+        body?: DiagnosticEventBody;
+    }
+    interface ConfigFileDiagnosticEventBody {
+        triggerFile: string;
+        configFile: string;
+        diagnostics: Diagnostic[];
+    }
+    interface ConfigFileDiagnosticEvent extends Event {
+        body?: ConfigFileDiagnosticEventBody;
+        event: "configFileDiag";
+    }
+    interface ReloadRequestArgs extends FileRequestArgs {
+        tmpfile: string;
+    }
+    interface ReloadRequest extends FileRequest {
+        command: CommandTypes.Reload;
+        arguments: ReloadRequestArgs;
+    }
+    interface ReloadResponse extends Response {
+    }
+    interface SavetoRequestArgs extends FileRequestArgs {
+        tmpfile: string;
+    }
+    interface SavetoRequest extends FileRequest {
+        command: CommandTypes.Saveto;
+        arguments: SavetoRequestArgs;
+    }
+    interface NavtoRequestArgs extends FileRequestArgs {
+        searchValue: string;
+        maxResultCount?: number;
+        currentFileOnly?: boolean;
+        projectFileName?: string;
+    }
+    interface NavtoRequest extends FileRequest {
+        command: CommandTypes.Navto;
+        arguments: NavtoRequestArgs;
+    }
+    interface NavtoItem {
+        name: string;
+        kind: string;
+        matchKind?: string;
+        isCaseSensitive?: boolean;
+        kindModifiers?: string;
+        file: string;
+        start: Location;
+        end: Location;
+        containerName?: string;
+        containerKind?: string;
+    }
+    interface NavtoResponse extends Response {
+        body?: NavtoItem[];
+    }
+    interface ChangeRequestArgs extends FormatRequestArgs {
+        insertString?: string;
+    }
+    interface ChangeRequest extends FileLocationRequest {
+        command: CommandTypes.Change;
+        arguments: ChangeRequestArgs;
+    }
+    interface BraceResponse extends Response {
+        body?: TextSpan[];
+    }
+    interface BraceRequest extends FileLocationRequest {
+        command: CommandTypes.Brace;
+    }
+    interface NavBarRequest extends FileRequest {
+        command: CommandTypes.NavBar;
+    }
+    interface NavTreeRequest extends FileRequest {
+        command: CommandTypes.NavTree;
+    }
+    interface NavigationBarItem {
+        text: string;
+        kind: string;
+        kindModifiers?: string;
+        spans: TextSpan[];
+        childItems?: NavigationBarItem[];
+        indent: number;
+    }
+    interface NavigationTree {
+        text: string;
+        kind: string;
+        kindModifiers: string;
+        spans: TextSpan[];
+        childItems?: NavigationTree[];
+    }
+    type TelemetryEventName = "telemetry";
+    interface TelemetryEvent extends Event {
+        event: TelemetryEventName;
+        body: TelemetryEventBody;
+    }
+    interface TelemetryEventBody {
+        telemetryEventName: string;
+        payload: any;
+    }
+    type TypingsInstalledTelemetryEventName = "typingsInstalled";
+    interface TypingsInstalledTelemetryEventBody extends TelemetryEventBody {
+        telemetryEventName: TypingsInstalledTelemetryEventName;
+        payload: TypingsInstalledTelemetryEventPayload;
+    }
+    interface TypingsInstalledTelemetryEventPayload {
+        installedPackages: string;
+        installSuccess: boolean;
+    }
+    interface NavBarResponse extends Response {
+        body?: NavigationBarItem[];
+    }
+    interface NavTreeResponse extends Response {
+        body?: NavigationTree;
+    }
+    namespace IndentStyle {
+        type None = "None";
+        type Block = "Block";
+        type Smart = "Smart";
+    }
+    type IndentStyle = IndentStyle.None | IndentStyle.Block | IndentStyle.Smart;
+    interface EditorSettings {
+        baseIndentSize?: number;
+        indentSize?: number;
+        tabSize?: number;
+        newLineCharacter?: string;
+        convertTabsToSpaces?: boolean;
+        indentStyle?: IndentStyle | ts.IndentStyle;
+    }
+    interface FormatCodeSettings extends EditorSettings {
+        insertSpaceAfterCommaDelimiter?: boolean;
+        insertSpaceAfterSemicolonInForStatements?: boolean;
+        insertSpaceBeforeAndAfterBinaryOperators?: boolean;
+        insertSpaceAfterKeywordsInControlFlowStatements?: boolean;
+        insertSpaceAfterFunctionKeywordForAnonymousFunctions?: boolean;
+        insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis?: boolean;
+        insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets?: boolean;
+        insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces?: boolean;
+        insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces?: boolean;
+        placeOpenBraceOnNewLineForFunctions?: boolean;
+        placeOpenBraceOnNewLineForControlBlocks?: boolean;
+    }
+    interface CompilerOptions {
+        allowJs?: boolean;
+        allowSyntheticDefaultImports?: boolean;
+        allowUnreachableCode?: boolean;
+        allowUnusedLabels?: boolean;
+        baseUrl?: string;
+        charset?: string;
+        declaration?: boolean;
+        declarationDir?: string;
+        disableSizeLimit?: boolean;
+        emitBOM?: boolean;
+        emitDecoratorMetadata?: boolean;
+        experimentalDecorators?: boolean;
+        forceConsistentCasingInFileNames?: boolean;
+        inlineSourceMap?: boolean;
+        inlineSources?: boolean;
+        isolatedModules?: boolean;
+        jsx?: JsxEmit | ts.JsxEmit;
+        lib?: string[];
+        locale?: string;
+        mapRoot?: string;
+        maxNodeModuleJsDepth?: number;
+        module?: ModuleKind | ts.ModuleKind;
+        moduleResolution?: ModuleResolutionKind | ts.ModuleResolutionKind;
+        newLine?: NewLineKind | ts.NewLineKind;
+        noEmit?: boolean;
+        noEmitHelpers?: boolean;
+        noEmitOnError?: boolean;
+        noErrorTruncation?: boolean;
+        noFallthroughCasesInSwitch?: boolean;
+        noImplicitAny?: boolean;
+        noImplicitReturns?: boolean;
+        noImplicitThis?: boolean;
+        noUnusedLocals?: boolean;
+        noUnusedParameters?: boolean;
+        noImplicitUseStrict?: boolean;
+        noLib?: boolean;
+        noResolve?: boolean;
+        out?: string;
+        outDir?: string;
+        outFile?: string;
+        paths?: MapLike<string[]>;
+        preserveConstEnums?: boolean;
+        project?: string;
+        reactNamespace?: string;
+        removeComments?: boolean;
+        rootDir?: string;
+        rootDirs?: string[];
+        skipLibCheck?: boolean;
+        skipDefaultLibCheck?: boolean;
+        sourceMap?: boolean;
+        sourceRoot?: string;
+        strictNullChecks?: boolean;
+        suppressExcessPropertyErrors?: boolean;
+        suppressImplicitAnyIndexErrors?: boolean;
+        target?: ScriptTarget | ts.ScriptTarget;
+        traceResolution?: boolean;
+        types?: string[];
+        typeRoots?: string[];
+        [option: string]: CompilerOptionsValue | undefined;
+    }
+    namespace JsxEmit {
+        type None = "None";
+        type Preserve = "Preserve";
+        type React = "React";
+    }
+    type JsxEmit = JsxEmit.None | JsxEmit.Preserve | JsxEmit.React;
+    namespace ModuleKind {
+        type None = "None";
+        type CommonJS = "CommonJS";
+        type AMD = "AMD";
+        type UMD = "UMD";
+        type System = "System";
+        type ES6 = "ES6";
+        type ES2015 = "ES2015";
+    }
+    type ModuleKind = ModuleKind.None | ModuleKind.CommonJS | ModuleKind.AMD | ModuleKind.UMD | ModuleKind.System | ModuleKind.ES6 | ModuleKind.ES2015;
+    namespace ModuleResolutionKind {
+        type Classic = "Classic";
+        type Node = "Node";
+    }
+    type ModuleResolutionKind = ModuleResolutionKind.Classic | ModuleResolutionKind.Node;
+    namespace NewLineKind {
+        type Crlf = "Crlf";
+        type Lf = "Lf";
+    }
+    type NewLineKind = NewLineKind.Crlf | NewLineKind.Lf;
+    namespace ScriptTarget {
+        type ES3 = "ES3";
+        type ES5 = "ES5";
+        type ES6 = "ES6";
+        type ES2015 = "ES2015";
+    }
+    type ScriptTarget = ScriptTarget.ES3 | ScriptTarget.ES5 | ScriptTarget.ES6 | ScriptTarget.ES2015;
+}
 declare namespace ts {
     interface MapLike<T> {
         [index: string]: T;
@@ -165,170 +985,177 @@ declare namespace ts {
         DeclareKeyword = 123,
         GetKeyword = 124,
         IsKeyword = 125,
-        ModuleKeyword = 126,
-        NamespaceKeyword = 127,
-        NeverKeyword = 128,
-        ReadonlyKeyword = 129,
-        RequireKeyword = 130,
-        NumberKeyword = 131,
-        SetKeyword = 132,
-        StringKeyword = 133,
-        SymbolKeyword = 134,
-        TypeKeyword = 135,
-        UndefinedKeyword = 136,
-        FromKeyword = 137,
-        GlobalKeyword = 138,
-        OfKeyword = 139,
-        QualifiedName = 140,
-        ComputedPropertyName = 141,
-        TypeParameter = 142,
-        Parameter = 143,
-        Decorator = 144,
-        PropertySignature = 145,
-        PropertyDeclaration = 146,
-        MethodSignature = 147,
-        MethodDeclaration = 148,
-        Constructor = 149,
-        GetAccessor = 150,
-        SetAccessor = 151,
-        CallSignature = 152,
-        ConstructSignature = 153,
-        IndexSignature = 154,
-        TypePredicate = 155,
-        TypeReference = 156,
-        FunctionType = 157,
-        ConstructorType = 158,
-        TypeQuery = 159,
-        TypeLiteral = 160,
-        ArrayType = 161,
-        TupleType = 162,
-        UnionType = 163,
-        IntersectionType = 164,
-        ParenthesizedType = 165,
-        ThisType = 166,
-        LiteralType = 167,
-        ObjectBindingPattern = 168,
-        ArrayBindingPattern = 169,
-        BindingElement = 170,
-        ArrayLiteralExpression = 171,
-        ObjectLiteralExpression = 172,
-        PropertyAccessExpression = 173,
-        ElementAccessExpression = 174,
-        CallExpression = 175,
-        NewExpression = 176,
-        TaggedTemplateExpression = 177,
-        TypeAssertionExpression = 178,
-        ParenthesizedExpression = 179,
-        FunctionExpression = 180,
-        ArrowFunction = 181,
-        DeleteExpression = 182,
-        TypeOfExpression = 183,
-        VoidExpression = 184,
-        AwaitExpression = 185,
-        PrefixUnaryExpression = 186,
-        PostfixUnaryExpression = 187,
-        BinaryExpression = 188,
-        ConditionalExpression = 189,
-        TemplateExpression = 190,
-        YieldExpression = 191,
-        SpreadElementExpression = 192,
-        ClassExpression = 193,
-        OmittedExpression = 194,
-        ExpressionWithTypeArguments = 195,
-        AsExpression = 196,
-        NonNullExpression = 197,
-        TemplateSpan = 198,
-        SemicolonClassElement = 199,
-        Block = 200,
-        VariableStatement = 201,
-        EmptyStatement = 202,
-        ExpressionStatement = 203,
-        IfStatement = 204,
-        DoStatement = 205,
-        WhileStatement = 206,
-        ForStatement = 207,
-        ForInStatement = 208,
-        ForOfStatement = 209,
-        ContinueStatement = 210,
-        BreakStatement = 211,
-        ReturnStatement = 212,
-        WithStatement = 213,
-        SwitchStatement = 214,
-        LabeledStatement = 215,
-        ThrowStatement = 216,
-        TryStatement = 217,
-        DebuggerStatement = 218,
-        VariableDeclaration = 219,
-        VariableDeclarationList = 220,
-        FunctionDeclaration = 221,
-        ClassDeclaration = 222,
-        InterfaceDeclaration = 223,
-        TypeAliasDeclaration = 224,
-        EnumDeclaration = 225,
-        ModuleDeclaration = 226,
-        ModuleBlock = 227,
-        CaseBlock = 228,
-        NamespaceExportDeclaration = 229,
-        ImportEqualsDeclaration = 230,
-        ImportDeclaration = 231,
-        ImportClause = 232,
-        NamespaceImport = 233,
-        NamedImports = 234,
-        ImportSpecifier = 235,
-        ExportAssignment = 236,
-        ExportDeclaration = 237,
-        NamedExports = 238,
-        ExportSpecifier = 239,
-        MissingDeclaration = 240,
-        ExternalModuleReference = 241,
-        JsxElement = 242,
-        JsxSelfClosingElement = 243,
-        JsxOpeningElement = 244,
-        JsxClosingElement = 245,
-        JsxAttribute = 246,
-        JsxSpreadAttribute = 247,
-        JsxExpression = 248,
-        CaseClause = 249,
-        DefaultClause = 250,
-        HeritageClause = 251,
-        CatchClause = 252,
-        PropertyAssignment = 253,
-        ShorthandPropertyAssignment = 254,
-        EnumMember = 255,
-        SourceFile = 256,
-        JSDocTypeExpression = 257,
-        JSDocAllType = 258,
-        JSDocUnknownType = 259,
-        JSDocArrayType = 260,
-        JSDocUnionType = 261,
-        JSDocTupleType = 262,
-        JSDocNullableType = 263,
-        JSDocNonNullableType = 264,
-        JSDocRecordType = 265,
-        JSDocRecordMember = 266,
-        JSDocTypeReference = 267,
-        JSDocOptionalType = 268,
-        JSDocFunctionType = 269,
-        JSDocVariadicType = 270,
-        JSDocConstructorType = 271,
-        JSDocThisType = 272,
-        JSDocComment = 273,
-        JSDocTag = 274,
-        JSDocParameterTag = 275,
-        JSDocReturnTag = 276,
-        JSDocTypeTag = 277,
-        JSDocTemplateTag = 278,
-        JSDocTypedefTag = 279,
-        JSDocPropertyTag = 280,
-        JSDocTypeLiteral = 281,
-        JSDocLiteralType = 282,
-        JSDocNullKeyword = 283,
-        JSDocUndefinedKeyword = 284,
-        JSDocNeverKeyword = 285,
-        SyntaxList = 286,
-        NotEmittedStatement = 287,
-        PartiallyEmittedExpression = 288,
-        Count = 289,
+        KeyOfKeyword = 126,
+        ModuleKeyword = 127,
+        NamespaceKeyword = 128,
+        NeverKeyword = 129,
+        ReadonlyKeyword = 130,
+        RequireKeyword = 131,
+        NumberKeyword = 132,
+        SetKeyword = 133,
+        StringKeyword = 134,
+        SymbolKeyword = 135,
+        TypeKeyword = 136,
+        UndefinedKeyword = 137,
+        FromKeyword = 138,
+        GlobalKeyword = 139,
+        OfKeyword = 140,
+        QualifiedName = 141,
+        ComputedPropertyName = 142,
+        TypeParameter = 143,
+        Parameter = 144,
+        Decorator = 145,
+        PropertySignature = 146,
+        PropertyDeclaration = 147,
+        MethodSignature = 148,
+        MethodDeclaration = 149,
+        Constructor = 150,
+        GetAccessor = 151,
+        SetAccessor = 152,
+        CallSignature = 153,
+        ConstructSignature = 154,
+        IndexSignature = 155,
+        TypePredicate = 156,
+        TypeReference = 157,
+        FunctionType = 158,
+        ConstructorType = 159,
+        TypeQuery = 160,
+        TypeLiteral = 161,
+        ArrayType = 162,
+        TupleType = 163,
+        UnionType = 164,
+        IntersectionType = 165,
+        ParenthesizedType = 166,
+        ThisType = 167,
+        TypeOperator = 168,
+        IndexedAccessType = 169,
+        MappedType = 170,
+        LiteralType = 171,
+        ObjectBindingPattern = 172,
+        ArrayBindingPattern = 173,
+        BindingElement = 174,
+        ArrayLiteralExpression = 175,
+        ObjectLiteralExpression = 176,
+        PropertyAccessExpression = 177,
+        ElementAccessExpression = 178,
+        CallExpression = 179,
+        NewExpression = 180,
+        TaggedTemplateExpression = 181,
+        TypeAssertionExpression = 182,
+        ParenthesizedExpression = 183,
+        FunctionExpression = 184,
+        ArrowFunction = 185,
+        DeleteExpression = 186,
+        TypeOfExpression = 187,
+        VoidExpression = 188,
+        AwaitExpression = 189,
+        PrefixUnaryExpression = 190,
+        PostfixUnaryExpression = 191,
+        BinaryExpression = 192,
+        ConditionalExpression = 193,
+        TemplateExpression = 194,
+        YieldExpression = 195,
+        SpreadElement = 196,
+        ClassExpression = 197,
+        OmittedExpression = 198,
+        ExpressionWithTypeArguments = 199,
+        AsExpression = 200,
+        NonNullExpression = 201,
+        TemplateSpan = 202,
+        SemicolonClassElement = 203,
+        Block = 204,
+        VariableStatement = 205,
+        EmptyStatement = 206,
+        ExpressionStatement = 207,
+        IfStatement = 208,
+        DoStatement = 209,
+        WhileStatement = 210,
+        ForStatement = 211,
+        ForInStatement = 212,
+        ForOfStatement = 213,
+        ContinueStatement = 214,
+        BreakStatement = 215,
+        ReturnStatement = 216,
+        WithStatement = 217,
+        SwitchStatement = 218,
+        LabeledStatement = 219,
+        ThrowStatement = 220,
+        TryStatement = 221,
+        DebuggerStatement = 222,
+        VariableDeclaration = 223,
+        VariableDeclarationList = 224,
+        FunctionDeclaration = 225,
+        ClassDeclaration = 226,
+        InterfaceDeclaration = 227,
+        TypeAliasDeclaration = 228,
+        EnumDeclaration = 229,
+        ModuleDeclaration = 230,
+        ModuleBlock = 231,
+        CaseBlock = 232,
+        NamespaceExportDeclaration = 233,
+        ImportEqualsDeclaration = 234,
+        ImportDeclaration = 235,
+        ImportClause = 236,
+        NamespaceImport = 237,
+        NamedImports = 238,
+        ImportSpecifier = 239,
+        ExportAssignment = 240,
+        ExportDeclaration = 241,
+        NamedExports = 242,
+        ExportSpecifier = 243,
+        MissingDeclaration = 244,
+        ExternalModuleReference = 245,
+        JsxElement = 246,
+        JsxSelfClosingElement = 247,
+        JsxOpeningElement = 248,
+        JsxClosingElement = 249,
+        JsxAttribute = 250,
+        JsxSpreadAttribute = 251,
+        JsxExpression = 252,
+        CaseClause = 253,
+        DefaultClause = 254,
+        HeritageClause = 255,
+        CatchClause = 256,
+        PropertyAssignment = 257,
+        ShorthandPropertyAssignment = 258,
+        SpreadAssignment = 259,
+        EnumMember = 260,
+        SourceFile = 261,
+        JSDocTypeExpression = 262,
+        JSDocAllType = 263,
+        JSDocUnknownType = 264,
+        JSDocArrayType = 265,
+        JSDocUnionType = 266,
+        JSDocTupleType = 267,
+        JSDocNullableType = 268,
+        JSDocNonNullableType = 269,
+        JSDocRecordType = 270,
+        JSDocRecordMember = 271,
+        JSDocTypeReference = 272,
+        JSDocOptionalType = 273,
+        JSDocFunctionType = 274,
+        JSDocVariadicType = 275,
+        JSDocConstructorType = 276,
+        JSDocThisType = 277,
+        JSDocComment = 278,
+        JSDocTag = 279,
+        JSDocParameterTag = 280,
+        JSDocReturnTag = 281,
+        JSDocTypeTag = 282,
+        JSDocTemplateTag = 283,
+        JSDocTypedefTag = 284,
+        JSDocPropertyTag = 285,
+        JSDocTypeLiteral = 286,
+        JSDocLiteralType = 287,
+        JSDocNullKeyword = 288,
+        JSDocUndefinedKeyword = 289,
+        JSDocNeverKeyword = 290,
+        SyntaxList = 291,
+        NotEmittedStatement = 292,
+        PartiallyEmittedExpression = 293,
+        MergeDeclarationMarker = 294,
+        EndOfDeclarationMarker = 295,
+        Count = 296,
         FirstAssignment = 57,
         LastAssignment = 69,
         FirstCompoundAssignment = 58,
@@ -336,15 +1163,15 @@ declare namespace ts {
         FirstReservedWord = 71,
         LastReservedWord = 106,
         FirstKeyword = 71,
-        LastKeyword = 139,
+        LastKeyword = 140,
         FirstFutureReservedWord = 107,
         LastFutureReservedWord = 115,
-        FirstTypeNode = 155,
-        LastTypeNode = 167,
+        FirstTypeNode = 156,
+        LastTypeNode = 171,
         FirstPunctuation = 16,
         LastPunctuation = 69,
         FirstToken = 0,
-        LastToken = 139,
+        LastToken = 140,
         FirstTriviaToken = 2,
         LastTriviaToken = 7,
         FirstLiteralToken = 8,
@@ -353,11 +1180,11 @@ declare namespace ts {
         LastTemplateToken = 15,
         FirstBinaryOperator = 26,
         LastBinaryOperator = 69,
-        FirstNode = 140,
-        FirstJSDocNode = 257,
-        LastJSDocNode = 282,
-        FirstJSDocTagNode = 273,
-        LastJSDocTagNode = 285,
+        FirstNode = 141,
+        FirstJSDocNode = 262,
+        LastJSDocNode = 287,
+        FirstJSDocTagNode = 278,
+        LastJSDocTagNode = 290,
     }
     const enum NodeFlags {
         None = 0,
@@ -375,21 +1202,22 @@ declare namespace ts {
         HasDecorators = 2048,
         HasParamDecorators = 4096,
         HasAsyncFunctions = 8192,
-        HasJsxSpreadAttributes = 16384,
-        DisallowInContext = 32768,
-        YieldContext = 65536,
-        DecoratorContext = 131072,
-        AwaitContext = 262144,
-        ThisNodeHasError = 524288,
-        JavaScriptFile = 1048576,
-        ThisNodeOrAnySubNodesHasError = 2097152,
-        HasAggregatedChildData = 4194304,
+        HasSpreadAttribute = 16384,
+        HasRestAttribute = 32768,
+        DisallowInContext = 65536,
+        YieldContext = 131072,
+        DecoratorContext = 262144,
+        AwaitContext = 524288,
+        ThisNodeHasError = 1048576,
+        JavaScriptFile = 2097152,
+        ThisNodeOrAnySubNodesHasError = 4194304,
+        HasAggregatedChildData = 8388608,
         BlockScoped = 3,
         ReachabilityCheckFlags = 384,
-        EmitHelperFlags = 31744,
-        ReachabilityAndEmitFlags = 32128,
-        ContextFlags = 1540096,
-        TypeExcludesFlags = 327680,
+        EmitHelperFlags = 64512,
+        ReachabilityAndEmitFlags = 64896,
+        ContextFlags = 3080192,
+        TypeExcludesFlags = 655360,
     }
     const enum ModifierFlags {
         None = 0,
@@ -409,6 +1237,7 @@ declare namespace ts {
         ParameterPropertyModifier = 92,
         NonPublicAccessibilityModifier = 24,
         TypeScriptModifier = 2270,
+        ExportDefault = 513,
     }
     const enum JsxFlags {
         None = 0,
@@ -416,12 +1245,29 @@ declare namespace ts {
         IntrinsicIndexedElement = 2,
         IntrinsicElement = 3,
     }
+    const enum RelationComparisonResult {
+        Succeeded = 1,
+        Failed = 2,
+        FailedAndReported = 3,
+    }
     interface Node extends TextRange {
         kind: SyntaxKind;
         flags: NodeFlags;
+        modifierFlagsCache?: ModifierFlags;
+        transformFlags?: TransformFlags;
         decorators?: NodeArray<Decorator>;
         modifiers?: ModifiersArray;
+        id?: number;
         parent?: Node;
+        original?: Node;
+        startsOnNewLine?: boolean;
+        jsDocComments?: JSDoc[];
+        symbol?: Symbol;
+        locals?: SymbolTable;
+        nextContainer?: Node;
+        localSymbol?: Symbol;
+        flowNode?: FlowNode;
+        emitNode?: EmitNode;
     }
     interface NodeArray<T extends Node> extends Array<T>, TextRange {
         hasTrailingComma?: boolean;
@@ -437,16 +1283,30 @@ declare namespace ts {
     type EqualsGreaterThanToken = Token<SyntaxKind.EqualsGreaterThanToken>;
     type EndOfFileToken = Token<SyntaxKind.EndOfFileToken>;
     type AtToken = Token<SyntaxKind.AtToken>;
+    type ReadonlyToken = Token<SyntaxKind.ReadonlyKeyword>;
     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>;
+    const enum GeneratedIdentifierKind {
+        None = 0,
+        Auto = 1,
+        Loop = 2,
+        Unique = 3,
+        Node = 4,
+    }
     interface Identifier extends PrimaryExpression {
         kind: SyntaxKind.Identifier;
         text: string;
         originalKeywordKind?: SyntaxKind;
+        autoGenerateKind?: GeneratedIdentifierKind;
+        autoGenerateId?: number;
+        isInJSDocNamespace?: boolean;
     }
     interface TransientIdentifier extends Identifier {
         resolvedSymbol: Symbol;
     }
+    interface GeneratedIdentifier extends Identifier {
+        autoGenerateKind: GeneratedIdentifierKind.Auto | GeneratedIdentifierKind.Loop | GeneratedIdentifierKind.Unique | GeneratedIdentifierKind.Node;
+    }
     interface QualifiedName extends Node {
         kind: SyntaxKind.QualifiedName;
         left: EntityName;
@@ -533,7 +1393,7 @@ declare namespace ts {
         _objectLiteralBrandBrand: any;
         name?: PropertyName;
     }
-    type ObjectLiteralElementLike = PropertyAssignment | ShorthandPropertyAssignment | MethodDeclaration | AccessorDeclaration;
+    type ObjectLiteralElementLike = PropertyAssignment | ShorthandPropertyAssignment | MethodDeclaration | AccessorDeclaration | SpreadAssignment;
     interface PropertyAssignment extends ObjectLiteralElement {
         kind: SyntaxKind.PropertyAssignment;
         name: PropertyName;
@@ -547,6 +1407,10 @@ declare namespace ts {
         equalsToken?: Token<SyntaxKind.EqualsToken>;
         objectAssignmentInitializer?: Expression;
     }
+    interface SpreadAssignment extends ObjectLiteralElement {
+        kind: SyntaxKind.SpreadAssignment;
+        expression: Expression;
+    }
     interface VariableLikeDeclaration extends Declaration {
         propertyName?: PropertyName;
         dotDotDotToken?: DotDotDotToken;
@@ -669,12 +1533,30 @@ declare namespace ts {
         kind: SyntaxKind.ParenthesizedType;
         type: TypeNode;
     }
+    interface TypeOperatorNode extends TypeNode {
+        kind: SyntaxKind.TypeOperator;
+        operator: SyntaxKind.KeyOfKeyword;
+        type: TypeNode;
+    }
+    interface IndexedAccessTypeNode extends TypeNode {
+        kind: SyntaxKind.IndexedAccessType;
+        objectType: TypeNode;
+        indexType: TypeNode;
+    }
+    interface MappedTypeNode extends TypeNode, Declaration {
+        kind: SyntaxKind.MappedType;
+        readonlyToken?: ReadonlyToken;
+        typeParameter: TypeParameterDeclaration;
+        questionToken?: QuestionToken;
+        type?: TypeNode;
+    }
     interface LiteralTypeNode extends TypeNode {
         kind: SyntaxKind.LiteralType;
         literal: Expression;
     }
     interface StringLiteral extends LiteralExpression {
         kind: SyntaxKind.StringLiteral;
+        textSourceNode?: Identifier | StringLiteral;
     }
     interface Expression extends Node {
         _expressionBrand: any;
@@ -683,6 +1565,10 @@ declare namespace ts {
     interface OmittedExpression extends Expression {
         kind: SyntaxKind.OmittedExpression;
     }
+    interface PartiallyEmittedExpression extends LeftHandSideExpression {
+        kind: SyntaxKind.PartiallyEmittedExpression;
+        expression: Expression;
+    }
     interface UnaryExpression extends Expression {
         _unaryExpressionBrand: any;
     }
@@ -701,9 +1587,6 @@ declare namespace ts {
         operand: LeftHandSideExpression;
         operator: PostfixUnaryOperator;
     }
-    interface PostfixExpression extends UnaryExpression {
-        _postfixExpressionBrand: any;
-    }
     interface LeftHandSideExpression extends IncrementExpression {
         _leftHandSideExpressionBrand: any;
     }
@@ -772,6 +1655,17 @@ declare namespace ts {
         operatorToken: BinaryOperatorToken;
         right: Expression;
     }
+    interface AssignmentExpression extends BinaryExpression {
+        left: LeftHandSideExpression;
+        operatorToken: Token<SyntaxKind.EqualsToken>;
+    }
+    interface ObjectDestructuringAssignment extends AssignmentExpression {
+        left: ObjectLiteralExpression;
+    }
+    interface ArrayDestructuringAssignment extends AssignmentExpression {
+        left: ArrayLiteralExpression;
+    }
+    type DestructuringAssignment = ObjectDestructuringAssignment | ArrayDestructuringAssignment;
     interface ConditionalExpression extends Expression {
         kind: SyntaxKind.ConditionalExpression;
         condition: Expression;
@@ -796,6 +1690,7 @@ declare namespace ts {
         text: string;
         isUnterminated?: boolean;
         hasExtendedUnicodeEscape?: boolean;
+        isOctalLiteral?: boolean;
     }
     interface LiteralExpression extends LiteralLikeNode, PrimaryExpression {
         _literalExpressionBrand: any;
@@ -837,9 +1732,10 @@ declare namespace ts {
     interface ArrayLiteralExpression extends PrimaryExpression {
         kind: SyntaxKind.ArrayLiteralExpression;
         elements: NodeArray<Expression>;
+        multiLine?: boolean;
     }
-    interface SpreadElementExpression extends Expression {
-        kind: SyntaxKind.SpreadElementExpression;
+    interface SpreadElement extends Expression {
+        kind: SyntaxKind.SpreadElement;
         expression: Expression;
     }
     interface ObjectLiteralExpressionBase<T extends ObjectLiteralElement> extends PrimaryExpression, Declaration {
@@ -847,6 +1743,7 @@ declare namespace ts {
     }
     interface ObjectLiteralExpression extends ObjectLiteralExpressionBase<ObjectLiteralElementLike> {
         kind: SyntaxKind.ObjectLiteralExpression;
+        multiLine?: boolean;
     }
     type EntityNameExpression = Identifier | PropertyAccessEntityNameExpression;
     type EntityNameOrEntityNameExpression = EntityName | EntityNameExpression;
@@ -955,6 +1852,15 @@ declare namespace ts {
     interface Statement extends Node {
         _statementBrand: any;
     }
+    interface NotEmittedStatement extends Statement {
+        kind: SyntaxKind.NotEmittedStatement;
+    }
+    interface EndOfDeclarationMarker extends Statement {
+        kind: SyntaxKind.EndOfDeclarationMarker;
+    }
+    interface MergeDeclarationMarker extends Statement {
+        kind: SyntaxKind.MergeDeclarationMarker;
+    }
     interface EmptyStatement extends Statement {
         kind: SyntaxKind.EmptyStatement;
     }
@@ -969,6 +1875,7 @@ declare namespace ts {
     interface Block extends Statement {
         kind: SyntaxKind.Block;
         statements: NodeArray<Statement>;
+        multiLine?: boolean;
     }
     interface VariableStatement extends Statement {
         kind: SyntaxKind.VariableStatement;
@@ -1126,12 +2033,16 @@ declare namespace ts {
     interface ModuleDeclaration extends DeclarationStatement {
         kind: SyntaxKind.ModuleDeclaration;
         name: Identifier | LiteralExpression;
-        body?: ModuleBlock | NamespaceDeclaration;
+        body?: ModuleBlock | NamespaceDeclaration | JSDocNamespaceDeclaration | Identifier;
     }
     interface NamespaceDeclaration extends ModuleDeclaration {
         name: Identifier;
         body: ModuleBlock | NamespaceDeclaration;
     }
+    interface JSDocNamespaceDeclaration extends ModuleDeclaration {
+        name: Identifier;
+        body: JSDocNamespaceDeclaration | Identifier;
+    }
     interface ModuleBlock extends Node, Statement {
         kind: SyntaxKind.ModuleBlock;
         statements: NodeArray<Statement>;
@@ -1303,6 +2214,7 @@ declare namespace ts {
     }
     interface JSDocTypedefTag extends JSDocTag, Declaration {
         kind: SyntaxKind.JSDocTypedefTag;
+        fullName?: JSDocNamespaceDeclaration | Identifier;
         name?: Identifier;
         typeExpression?: JSDocTypeExpression;
         jsDocTypeLiteral?: JSDocTypeLiteral;
@@ -1390,8 +2302,28 @@ declare namespace ts {
         typeReferenceDirectives: FileReference[];
         languageVariant: LanguageVariant;
         isDeclarationFile: boolean;
+        renamedDependencies?: Map<string>;
         hasNoDefaultLib: boolean;
         languageVersion: ScriptTarget;
+        scriptKind: ScriptKind;
+        externalModuleIndicator: Node;
+        commonJsModuleIndicator: Node;
+        identifiers: Map<string>;
+        nodeCount: number;
+        identifierCount: number;
+        symbolCount: number;
+        parseDiagnostics: Diagnostic[];
+        additionalSyntacticDiagnostics?: Diagnostic[];
+        bindDiagnostics: Diagnostic[];
+        lineMap: number[];
+        classifiableNames?: Map<string>;
+        resolvedModules: Map<ResolvedModuleFull>;
+        resolvedTypeReferenceDirectiveNames: Map<ResolvedTypeReferenceDirective>;
+        imports: LiteralExpression[];
+        moduleAugmentations: LiteralExpression[];
+        patternAmbientModules?: PatternAmbientModule[];
+        ambientModuleNames: string[];
+        externalHelpersModuleName?: Identifier;
     }
     interface ScriptReferenceHost {
         getCompilerOptions(): CompilerOptions;
@@ -1424,6 +2356,18 @@ declare namespace ts {
         getSemanticDiagnostics(sourceFile?: SourceFile, cancellationToken?: CancellationToken): Diagnostic[];
         getDeclarationDiagnostics(sourceFile?: SourceFile, cancellationToken?: CancellationToken): Diagnostic[];
         getTypeChecker(): TypeChecker;
+        getCommonSourceDirectory(): string;
+        getDiagnosticsProducingTypeChecker(): TypeChecker;
+        dropDiagnosticsProducingTypeChecker(): void;
+        getClassifiableNames(): Map<string>;
+        getNodeCount(): number;
+        getIdentifierCount(): number;
+        getSymbolCount(): number;
+        getTypeCount(): number;
+        getFileProcessingDiagnostics(): DiagnosticCollection;
+        getResolvedTypeReferenceDirectives(): Map<ResolvedTypeReferenceDirective>;
+        isSourceFileFromExternalLibrary(file: SourceFile): boolean;
+        structureIsReused?: boolean;
     }
     interface SourceMapSpan {
         emittedLine: number;
@@ -1454,6 +2398,13 @@ declare namespace ts {
         emitSkipped: boolean;
         diagnostics: Diagnostic[];
         emittedFiles: string[];
+        sourceMaps: SourceMapData[];
+    }
+    interface TypeCheckerHost {
+        getCompilerOptions(): CompilerOptions;
+        getSourceFiles(): SourceFile[];
+        getSourceFile(fileName: string): SourceFile;
+        getResolvedTypeReferenceDirectives(): Map<ResolvedTypeReferenceDirective>;
     }
     interface TypeChecker {
         getTypeOfSymbolAtLocation(symbol: Symbol, node: Node): Type;
@@ -1493,6 +2444,14 @@ declare namespace ts {
         getJsxIntrinsicTagNames(): Symbol[];
         isOptionalParameter(node: ParameterDeclaration): boolean;
         getAmbientModules(): Symbol[];
+        tryFindAmbientModuleWithoutAugmentations(moduleName: string): Symbol;
+        getDiagnostics(sourceFile?: SourceFile, cancellationToken?: CancellationToken): Diagnostic[];
+        getGlobalDiagnostics(): Diagnostic[];
+        getEmitResolver(sourceFile?: SourceFile, cancellationToken?: CancellationToken): EmitResolver;
+        getNodeCount(): number;
+        getIdentifierCount(): number;
+        getSymbolCount(): number;
+        getTypeCount(): number;
     }
     interface SymbolDisplayBuilder {
         buildTypeDisplay(type: Type, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
@@ -1540,6 +2499,15 @@ declare namespace ts {
         WriteTypeParametersOrArguments = 1,
         UseOnlyExternalAliasing = 2,
     }
+    const enum SymbolAccessibility {
+        Accessible = 0,
+        NotAccessible = 1,
+        CannotBeNamed = 2,
+    }
+    const enum SyntheticSymbolKind {
+        UnionOrIntersection = 0,
+        Spread = 1,
+    }
     const enum TypePredicateKind {
         This = 0,
         Identifier = 1,
@@ -1557,6 +2525,61 @@ declare namespace ts {
         parameterIndex: number;
     }
     type TypePredicate = IdentifierTypePredicate | ThisTypePredicate;
+    type AnyImportSyntax = ImportDeclaration | ImportEqualsDeclaration;
+    interface SymbolVisibilityResult {
+        accessibility: SymbolAccessibility;
+        aliasesToMakeVisible?: AnyImportSyntax[];
+        errorSymbolName?: string;
+        errorNode?: Node;
+    }
+    interface SymbolAccessibilityResult extends SymbolVisibilityResult {
+        errorModuleName?: string;
+    }
+    enum TypeReferenceSerializationKind {
+        Unknown = 0,
+        TypeWithConstructSignatureAndValue = 1,
+        VoidNullableOrNeverType = 2,
+        NumberLikeType = 3,
+        StringLikeType = 4,
+        BooleanType = 5,
+        ArrayLikeType = 6,
+        ESSymbolType = 7,
+        Promise = 8,
+        TypeWithCallSignature = 9,
+        ObjectType = 10,
+    }
+    interface EmitResolver {
+        hasGlobalName(name: string): boolean;
+        getReferencedExportContainer(node: Identifier, prefixLocals?: boolean): SourceFile | ModuleDeclaration | EnumDeclaration;
+        getReferencedImportDeclaration(node: Identifier): Declaration;
+        getReferencedDeclarationWithCollidingName(node: Identifier): Declaration;
+        isDeclarationWithCollidingName(node: Declaration): boolean;
+        isValueAliasDeclaration(node: Node): boolean;
+        isReferencedAliasDeclaration(node: Node, checkChildren?: boolean): boolean;
+        isTopLevelValueImportEqualsWithEntityName(node: ImportEqualsDeclaration): boolean;
+        getNodeCheckFlags(node: Node): NodeCheckFlags;
+        isDeclarationVisible(node: Declaration): boolean;
+        collectLinkedAliases(node: Identifier): Node[];
+        isImplementationOfOverload(node: FunctionLikeDeclaration): boolean;
+        writeTypeOfDeclaration(declaration: AccessorDeclaration | VariableLikeDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void;
+        writeReturnTypeOfSignatureDeclaration(signatureDeclaration: SignatureDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void;
+        writeTypeOfExpression(expr: Expression, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void;
+        writeBaseConstructorTypeOfClass(node: ClassLikeDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void;
+        isSymbolAccessible(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags, shouldComputeAliasToMarkVisible: boolean): SymbolAccessibilityResult;
+        isEntityNameVisible(entityName: EntityNameOrEntityNameExpression, enclosingDeclaration: Node): SymbolVisibilityResult;
+        getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number;
+        getReferencedValueDeclaration(reference: Identifier): Declaration;
+        getTypeReferenceSerializationKind(typeName: EntityName, location?: Node): TypeReferenceSerializationKind;
+        isOptionalParameter(node: ParameterDeclaration): boolean;
+        moduleExportsSomeValue(moduleReferenceExpression: Expression): boolean;
+        isArgumentsLocalBinding(node: Identifier): boolean;
+        getExternalModuleFileFromDeclaration(declaration: ImportEqualsDeclaration | ImportDeclaration | ExportDeclaration | ModuleDeclaration): SourceFile;
+        getTypeReferenceDirectivesForEntityName(name: EntityNameOrEntityNameExpression): string[];
+        getTypeReferenceDirectivesForSymbol(symbol: Symbol, meaning?: SymbolFlags): string[];
+        isLiteralConstDeclaration(node: VariableDeclaration | PropertyDeclaration | PropertySignature | ParameterDeclaration): boolean;
+        writeLiteralConstValue(node: VariableDeclaration | PropertyDeclaration | PropertySignature | ParameterDeclaration, writer: SymbolWriter): void;
+        getJsxFactoryEntity(): EntityName;
+    }
     const enum SymbolFlags {
         None = 0,
         FunctionScopedVariable = 1,
@@ -1623,6 +2646,7 @@ declare namespace ts {
         PropertyOrAccessor = 98308,
         Export = 7340032,
         ClassMember = 106500,
+        Classifiable = 788448,
     }
     interface Symbol {
         flags: SymbolFlags;
@@ -1632,8 +2656,86 @@ declare namespace ts {
         members?: SymbolTable;
         exports?: SymbolTable;
         globalExports?: SymbolTable;
+        isReadonly?: boolean;
+        id?: number;
+        mergeId?: number;
+        parent?: Symbol;
+        exportSymbol?: Symbol;
+        constEnumOnlyModule?: boolean;
+        isReferenced?: boolean;
+        isReplaceableByMethod?: boolean;
+        isAssigned?: boolean;
+    }
+    interface SymbolLinks {
+        target?: Symbol;
+        type?: Type;
+        declaredType?: Type;
+        typeParameters?: TypeParameter[];
+        inferredClassType?: Type;
+        instantiations?: Map<Type>;
+        mapper?: TypeMapper;
+        referenced?: boolean;
+        containingType?: UnionOrIntersectionType;
+        leftSpread?: Symbol;
+        rightSpread?: Symbol;
+        hasNonUniformType?: boolean;
+        isPartial?: boolean;
+        isDiscriminantProperty?: boolean;
+        resolvedExports?: SymbolTable;
+        exportsChecked?: boolean;
+        isDeclarationWithCollidingName?: boolean;
+        bindingElement?: BindingElement;
+        exportsSomeValue?: boolean;
+    }
+    interface TransientSymbol extends Symbol, SymbolLinks {
     }
     type SymbolTable = Map<Symbol>;
+    interface Pattern {
+        prefix: string;
+        suffix: string;
+    }
+    interface PatternAmbientModule {
+        pattern: Pattern;
+        symbol: Symbol;
+    }
+    const enum NodeCheckFlags {
+        TypeChecked = 1,
+        LexicalThis = 2,
+        CaptureThis = 4,
+        SuperInstance = 256,
+        SuperStatic = 512,
+        ContextChecked = 1024,
+        AsyncMethodWithSuper = 2048,
+        AsyncMethodWithSuperBinding = 4096,
+        CaptureArguments = 8192,
+        EnumValuesComputed = 16384,
+        LexicalModuleMergesWithClass = 32768,
+        LoopWithCapturedBlockScopedBinding = 65536,
+        CapturedBlockScopedBinding = 131072,
+        BlockScopedBindingInLoop = 262144,
+        ClassWithBodyScopedClassBinding = 524288,
+        BodyScopedClassBinding = 1048576,
+        NeedsLoopOutParameter = 2097152,
+        AssignmentsMarked = 4194304,
+        ClassWithConstructorReference = 8388608,
+        ConstructorReferenceInClass = 16777216,
+    }
+    interface NodeLinks {
+        flags?: NodeCheckFlags;
+        resolvedType?: Type;
+        resolvedSignature?: Signature;
+        resolvedSymbol?: Symbol;
+        resolvedIndexInfo?: IndexInfo;
+        maybeTypePredicate?: boolean;
+        enumMemberValue?: number;
+        isVisible?: boolean;
+        hasReportedStatementInAmbientContext?: boolean;
+        jsxFlags?: JsxFlags;
+        resolvedJsxType?: Type;
+        hasSuperCall?: boolean;
+        superCall?: ExpressionStatement;
+        switchTypes?: Type[];
+    }
     const enum TypeFlags {
         Any = 1,
         String = 2,
@@ -1650,36 +2752,46 @@ declare namespace ts {
         Null = 4096,
         Never = 8192,
         TypeParameter = 16384,
-        Class = 32768,
-        Interface = 65536,
-        Reference = 131072,
-        Tuple = 262144,
-        Union = 524288,
-        Intersection = 1048576,
-        Anonymous = 2097152,
-        Instantiated = 4194304,
+        Object = 32768,
+        Union = 65536,
+        Intersection = 131072,
+        Index = 262144,
+        IndexedAccess = 524288,
+        FreshLiteral = 1048576,
+        ContainsWideningType = 2097152,
+        ContainsObjectLiteral = 4194304,
+        ContainsAnyFunctionType = 8388608,
+        Nullable = 6144,
         Literal = 480,
         StringOrNumberLiteral = 96,
+        DefinitelyFalsy = 7392,
         PossiblyFalsy = 7406,
+        Intrinsic = 16015,
+        Primitive = 8190,
         StringLike = 34,
         NumberLike = 340,
         BooleanLike = 136,
         EnumLike = 272,
-        ObjectType = 2588672,
-        UnionOrIntersection = 1572864,
-        StructuredType = 4161536,
-        StructuredOrTypeParameter = 4177920,
-        Narrowable = 4178943,
-        NotUnionOrUnit = 2589185,
+        UnionOrIntersection = 196608,
+        StructuredType = 229376,
+        StructuredOrTypeParameter = 507904,
+        Narrowable = 1033215,
+        NotUnionOrUnit = 33281,
+        RequiresWidening = 6291456,
+        PropagatingFlags = 14680064,
     }
     type DestructuringPattern = BindingPattern | ObjectLiteralExpression | ArrayLiteralExpression;
     interface Type {
         flags: TypeFlags;
+        id: number;
         symbol?: Symbol;
         pattern?: DestructuringPattern;
         aliasSymbol?: Symbol;
         aliasTypeArguments?: Type[];
     }
+    interface IntrinsicType extends Type {
+        intrinsicName: string;
+    }
     interface LiteralType extends Type {
         text: string;
         freshType?: LiteralType;
@@ -1691,14 +2803,29 @@ declare namespace ts {
     interface EnumLiteralType extends LiteralType {
         baseType: EnumType & UnionType;
     }
+    const enum ObjectFlags {
+        Class = 1,
+        Interface = 2,
+        Reference = 4,
+        Tuple = 8,
+        Anonymous = 16,
+        Mapped = 32,
+        Instantiated = 64,
+        ObjectLiteral = 128,
+        EvolvingArray = 256,
+        ObjectLiteralPatternWithComputedProperties = 512,
+        ClassOrInterface = 3,
+    }
     interface ObjectType extends Type {
-        isObjectLiteralPatternWithComputedProperties?: boolean;
+        objectFlags: ObjectFlags;
     }
     interface InterfaceType extends ObjectType {
         typeParameters: TypeParameter[];
         outerTypeParameters: TypeParameter[];
         localTypeParameters: TypeParameter[];
         thisType: TypeParameter;
+        resolvedBaseConstructorType?: Type;
+        resolvedBaseTypes: ObjectType[];
     }
     interface InterfaceTypeWithDeclaredMembers extends InterfaceType {
         declaredProperties: Symbol[];
@@ -1712,16 +2839,63 @@ declare namespace ts {
         typeArguments: Type[];
     }
     interface GenericType extends InterfaceType, TypeReference {
+        instantiations: Map<TypeReference>;
     }
     interface UnionOrIntersectionType extends Type {
         types: Type[];
+        resolvedProperties: SymbolTable;
+        couldContainTypeParameters: boolean;
     }
     interface UnionType extends UnionOrIntersectionType {
     }
     interface IntersectionType extends UnionOrIntersectionType {
     }
+    type StructuredType = ObjectType | UnionType | IntersectionType;
+    interface AnonymousType extends ObjectType {
+        target?: AnonymousType;
+        mapper?: TypeMapper;
+    }
+    interface MappedType extends ObjectType {
+        declaration: MappedTypeNode;
+        typeParameter?: TypeParameter;
+        constraintType?: Type;
+        templateType?: Type;
+        mapper?: TypeMapper;
+    }
+    interface EvolvingArrayType extends ObjectType {
+        elementType: Type;
+        finalArrayType?: Type;
+    }
+    interface ResolvedType extends ObjectType, UnionOrIntersectionType {
+        members: SymbolTable;
+        properties: Symbol[];
+        callSignatures: Signature[];
+        constructSignatures: Signature[];
+        stringIndexInfo?: IndexInfo;
+        numberIndexInfo?: IndexInfo;
+    }
+    interface FreshObjectLiteralType extends ResolvedType {
+        regularType: ResolvedType;
+    }
+    interface IterableOrIteratorType extends ObjectType, UnionType {
+        iterableElementType?: Type;
+        iteratorElementType?: Type;
+    }
     interface TypeParameter extends Type {
         constraint: Type;
+        target?: TypeParameter;
+        mapper?: TypeMapper;
+        resolvedApparentType: Type;
+        resolvedIndexType: IndexType;
+        resolvedIndexedAccessTypes: IndexedAccessType[];
+        isThisType?: boolean;
+    }
+    interface IndexType extends Type {
+        type: TypeParameter;
+    }
+    interface IndexedAccessType extends Type {
+        objectType: Type;
+        indexType: TypeParameter;
     }
     const enum SignatureKind {
         Call = 0,
@@ -1731,6 +2905,18 @@ declare namespace ts {
         declaration: SignatureDeclaration;
         typeParameters: TypeParameter[];
         parameters: Symbol[];
+        thisParameter?: Symbol;
+        resolvedReturnType: Type;
+        minArgumentCount: number;
+        hasRestParameter: boolean;
+        hasLiteralTypes: boolean;
+        target?: Signature;
+        mapper?: TypeMapper;
+        unionSignatures?: Signature[];
+        erasedSignatureCache?: Signature;
+        isolatedSignatureType?: ObjectType;
+        typePredicate?: TypePredicate;
+        instantiations?: Map<Signature>;
     }
     const enum IndexKind {
         String = 0,
@@ -1741,6 +2927,33 @@ declare namespace ts {
         isReadonly: boolean;
         declaration?: SignatureDeclaration;
     }
+    interface TypeMapper {
+        (t: TypeParameter): Type;
+        mappedTypes?: Type[];
+        instantiations?: Type[];
+        context?: InferenceContext;
+    }
+    interface TypeInferences {
+        primary: Type[];
+        secondary: Type[];
+        topLevel: boolean;
+        isFixed: boolean;
+    }
+    interface InferenceContext {
+        signature: Signature;
+        inferUnionTypes: boolean;
+        inferences: TypeInferences[];
+        inferredTypes: Type[];
+        mapper?: TypeMapper;
+        failedTypeParameterIndex?: number;
+    }
+    const enum SpecialPropertyAssignmentKind {
+        None = 0,
+        ExportsProperty = 1,
+        ModuleExports = 2,
+        PrototypeProperty = 3,
+        ThisProperty = 4,
+    }
     interface DiagnosticMessage {
         key: string;
         category: DiagnosticCategory;
@@ -1773,25 +2986,33 @@ declare namespace ts {
     type CompilerOptionsValue = string | number | boolean | (string | number)[] | string[] | MapLike<string[]>;
     interface CompilerOptions {
         allowJs?: boolean;
+        allowNonTsExtensions?: boolean;
         allowSyntheticDefaultImports?: boolean;
         allowUnreachableCode?: boolean;
         allowUnusedLabels?: boolean;
         alwaysStrict?: boolean;
         baseUrl?: string;
         charset?: string;
+        configFilePath?: string;
         declaration?: boolean;
         declarationDir?: string;
+        diagnostics?: boolean;
+        extendedDiagnostics?: boolean;
         disableSizeLimit?: boolean;
         emitBOM?: boolean;
         emitDecoratorMetadata?: boolean;
         experimentalDecorators?: boolean;
         forceConsistentCasingInFileNames?: boolean;
+        help?: boolean;
         importHelpers?: boolean;
+        init?: boolean;
         inlineSourceMap?: boolean;
         inlineSources?: boolean;
         isolatedModules?: boolean;
         jsx?: JsxEmit;
         lib?: string[];
+        listEmittedFiles?: boolean;
+        listFiles?: boolean;
         locale?: string;
         mapRoot?: string;
         maxNodeModuleJsDepth?: number;
@@ -1799,6 +3020,7 @@ declare namespace ts {
         moduleResolution?: ModuleResolutionKind;
         newLine?: NewLineKind;
         noEmit?: boolean;
+        noEmitForJsFiles?: boolean;
         noEmitHelpers?: boolean;
         noEmitOnError?: boolean;
         noErrorTruncation?: boolean;
@@ -1817,7 +3039,9 @@ declare namespace ts {
         paths?: MapLike<string[]>;
         preserveConstEnums?: boolean;
         project?: string;
+        pretty?: DiagnosticStyle;
         reactNamespace?: string;
+        jsxFactory?: string;
         removeComments?: boolean;
         rootDir?: string;
         rootDirs?: string[];
@@ -1826,12 +3050,16 @@ declare namespace ts {
         sourceMap?: boolean;
         sourceRoot?: string;
         strictNullChecks?: boolean;
+        stripInternal?: boolean;
         suppressExcessPropertyErrors?: boolean;
         suppressImplicitAnyIndexErrors?: boolean;
+        suppressOutputPathCheck?: boolean;
         target?: ScriptTarget;
         traceResolution?: boolean;
         types?: string[];
         typeRoots?: string[];
+        version?: boolean;
+        watch?: boolean;
         [option: string]: CompilerOptionsValue | undefined;
     }
     interface TypingOptions {
@@ -1847,6 +3075,7 @@ declare namespace ts {
         packageNameToTypingLocation: Map<string>;
         typingOptions: TypingOptions;
         compilerOptions: CompilerOptions;
+        unresolvedImports: ReadonlyArray<string>;
     }
     enum ModuleKind {
         None = 0,
@@ -1882,12 +3111,17 @@ declare namespace ts {
         ES2015 = 2,
         ES2016 = 3,
         ES2017 = 4,
-        Latest = 4,
+        ESNext = 5,
+        Latest = 5,
     }
     const enum LanguageVariant {
         Standard = 0,
         JSX = 1,
     }
+    const enum DiagnosticStyle {
+        Simple = 0,
+        Pretty = 1,
+    }
     interface ParsedCommandLine {
         options: CompilerOptions;
         typingOptions?: TypingOptions;
@@ -1905,6 +3139,156 @@ declare namespace ts {
         fileNames: string[];
         wildcardDirectories: MapLike<WatchDirectoryFlags>;
     }
+    interface CommandLineOptionBase {
+        name: string;
+        type: "string" | "number" | "boolean" | "object" | "list" | Map<number | string>;
+        isFilePath?: boolean;
+        shortName?: string;
+        description?: DiagnosticMessage;
+        paramType?: DiagnosticMessage;
+        experimental?: boolean;
+        isTSConfigOnly?: boolean;
+    }
+    interface CommandLineOptionOfPrimitiveType extends CommandLineOptionBase {
+        type: "string" | "number" | "boolean";
+    }
+    interface CommandLineOptionOfCustomType extends CommandLineOptionBase {
+        type: Map<number | string>;
+    }
+    interface TsConfigOnlyOption extends CommandLineOptionBase {
+        type: "object";
+    }
+    interface CommandLineOptionOfListType extends CommandLineOptionBase {
+        type: "list";
+        element: CommandLineOptionOfCustomType | CommandLineOptionOfPrimitiveType;
+    }
+    type CommandLineOption = CommandLineOptionOfCustomType | CommandLineOptionOfPrimitiveType | TsConfigOnlyOption | CommandLineOptionOfListType;
+    const enum CharacterCodes {
+        nullCharacter = 0,
+        maxAsciiCharacter = 127,
+        lineFeed = 10,
+        carriageReturn = 13,
+        lineSeparator = 8232,
+        paragraphSeparator = 8233,
+        nextLine = 133,
+        space = 32,
+        nonBreakingSpace = 160,
+        enQuad = 8192,
+        emQuad = 8193,
+        enSpace = 8194,
+        emSpace = 8195,
+        threePerEmSpace = 8196,
+        fourPerEmSpace = 8197,
+        sixPerEmSpace = 8198,
+        figureSpace = 8199,
+        punctuationSpace = 8200,
+        thinSpace = 8201,
+        hairSpace = 8202,
+        zeroWidthSpace = 8203,
+        narrowNoBreakSpace = 8239,
+        ideographicSpace = 12288,
+        mathematicalSpace = 8287,
+        ogham = 5760,
+        _ = 95,
+        $ = 36,
+        _0 = 48,
+        _1 = 49,
+        _2 = 50,
+        _3 = 51,
+        _4 = 52,
+        _5 = 53,
+        _6 = 54,
+        _7 = 55,
+        _8 = 56,
+        _9 = 57,
+        a = 97,
+        b = 98,
+        c = 99,
+        d = 100,
+        e = 101,
+        f = 102,
+        g = 103,
+        h = 104,
+        i = 105,
+        j = 106,
+        k = 107,
+        l = 108,
+        m = 109,
+        n = 110,
+        o = 111,
+        p = 112,
+        q = 113,
+        r = 114,
+        s = 115,
+        t = 116,
+        u = 117,
+        v = 118,
+        w = 119,
+        x = 120,
+        y = 121,
+        z = 122,
+        A = 65,
+        B = 66,
+        C = 67,
+        D = 68,
+        E = 69,
+        F = 70,
+        G = 71,
+        H = 72,
+        I = 73,
+        J = 74,
+        K = 75,
+        L = 76,
+        M = 77,
+        N = 78,
+        O = 79,
+        P = 80,
+        Q = 81,
+        R = 82,
+        S = 83,
+        T = 84,
+        U = 85,
+        V = 86,
+        W = 87,
+        X = 88,
+        Y = 89,
+        Z = 90,
+        ampersand = 38,
+        asterisk = 42,
+        at = 64,
+        backslash = 92,
+        backtick = 96,
+        bar = 124,
+        caret = 94,
+        closeBrace = 125,
+        closeBracket = 93,
+        closeParen = 41,
+        colon = 58,
+        comma = 44,
+        dot = 46,
+        doubleQuote = 34,
+        equals = 61,
+        exclamation = 33,
+        greaterThan = 62,
+        hash = 35,
+        lessThan = 60,
+        minus = 45,
+        openBrace = 123,
+        openBracket = 91,
+        openParen = 40,
+        percent = 37,
+        plus = 43,
+        question = 63,
+        semicolon = 59,
+        singleQuote = 39,
+        slash = 47,
+        tilde = 126,
+        backspace = 8,
+        formFeed = 12,
+        byteOrderMark = 65279,
+        tab = 9,
+        verticalTab = 11,
+    }
     interface ModuleResolutionHost {
         fileExists(fileName: string): boolean;
         readFile(fileName: string): string;
@@ -1918,8 +3302,19 @@ declare namespace ts {
         resolvedFileName: string;
         isExternalLibraryImport?: boolean;
     }
+    interface ResolvedModuleFull extends ResolvedModule {
+        extension: Extension;
+    }
+    enum Extension {
+        Ts = 0,
+        Tsx = 1,
+        Dts = 2,
+        Js = 3,
+        Jsx = 4,
+        LastTypeScriptExtension = 2,
+    }
     interface ResolvedModuleWithFailedLookupLocations {
-        resolvedModule: ResolvedModule;
+        resolvedModule: ResolvedModuleFull | undefined;
         failedLookupLocations: string[];
     }
     interface ResolvedTypeReferenceDirective {
@@ -1946,6 +3341,110 @@ declare namespace ts {
         resolveTypeReferenceDirectives?(typeReferenceDirectiveNames: string[], containingFile: string): ResolvedTypeReferenceDirective[];
         getEnvironmentVariable?(name: string): string;
     }
+    const enum TransformFlags {
+        None = 0,
+        TypeScript = 1,
+        ContainsTypeScript = 2,
+        Jsx = 4,
+        ContainsJsx = 8,
+        ESNext = 16,
+        ContainsESNext = 32,
+        ES2017 = 64,
+        ContainsES2017 = 128,
+        ES2016 = 256,
+        ContainsES2016 = 512,
+        ES2015 = 1024,
+        ContainsES2015 = 2048,
+        Generator = 4096,
+        ContainsGenerator = 8192,
+        DestructuringAssignment = 16384,
+        ContainsDestructuringAssignment = 32768,
+        ContainsDecorators = 65536,
+        ContainsPropertyInitializer = 131072,
+        ContainsLexicalThis = 262144,
+        ContainsCapturedLexicalThis = 524288,
+        ContainsLexicalThisInComputedPropertyName = 1048576,
+        ContainsDefaultValueAssignments = 2097152,
+        ContainsParameterPropertyAssignments = 4194304,
+        ContainsSpreadExpression = 8388608,
+        ContainsComputedPropertyName = 16777216,
+        ContainsBlockScopedBinding = 33554432,
+        ContainsBindingPattern = 67108864,
+        ContainsYield = 134217728,
+        ContainsHoistedDeclarationOrCompletion = 268435456,
+        HasComputedFlags = 536870912,
+        AssertTypeScript = 3,
+        AssertJsx = 12,
+        AssertESNext = 48,
+        AssertES2017 = 192,
+        AssertES2016 = 768,
+        AssertES2015 = 3072,
+        AssertGenerator = 12288,
+        AssertDestructuringAssignment = 49152,
+        NodeExcludes = 536892757,
+        ArrowFunctionExcludes = 979719509,
+        FunctionExcludes = 980243797,
+        ConstructorExcludes = 975983957,
+        MethodOrAccessorExcludes = 975983957,
+        ClassExcludes = 559895893,
+        ModuleExcludes = 839734613,
+        TypeExcludes = -3,
+        ObjectLiteralExcludes = 554784085,
+        ArrayLiteralOrCallOrNewExcludes = 545281365,
+        VariableDeclarationListExcludes = 604001621,
+        ParameterExcludes = 604001621,
+        TypeScriptClassSyntaxMask = 4390912,
+        ES2015FunctionSyntaxMask = 2621440,
+    }
+    interface EmitNode {
+        flags?: EmitFlags;
+        commentRange?: TextRange;
+        sourceMapRange?: TextRange;
+        tokenSourceMapRanges?: Map<TextRange>;
+        annotatedNodes?: Node[];
+        constantValue?: number;
+    }
+    const enum EmitFlags {
+        EmitEmitHelpers = 1,
+        EmitExportStar = 2,
+        EmitSuperHelper = 4,
+        EmitAdvancedSuperHelper = 8,
+        UMDDefine = 16,
+        SingleLine = 32,
+        AdviseOnEmitNode = 64,
+        NoSubstitution = 128,
+        CapturesThis = 256,
+        NoLeadingSourceMap = 512,
+        NoTrailingSourceMap = 1024,
+        NoSourceMap = 1536,
+        NoNestedSourceMaps = 2048,
+        NoTokenLeadingSourceMaps = 4096,
+        NoTokenTrailingSourceMaps = 8192,
+        NoTokenSourceMaps = 12288,
+        NoLeadingComments = 16384,
+        NoTrailingComments = 32768,
+        NoComments = 49152,
+        NoNestedComments = 65536,
+        ExportName = 131072,
+        LocalName = 262144,
+        Indented = 524288,
+        NoIndentation = 1048576,
+        AsyncFunctionBody = 2097152,
+        ReuseTempVariableScope = 4194304,
+        CustomPrologue = 8388608,
+        NoHoisting = 16777216,
+        HasEndOfDeclarationMarker = 33554432,
+    }
+    const enum EmitContext {
+        SourceFile = 0,
+        Expression = 1,
+        IdentifierName = 2,
+        Unspecified = 3,
+    }
+    interface LexicalEnvironment {
+        startLexicalEnvironment(): void;
+        endLexicalEnvironment(): Statement[];
+    }
     interface TextSpan {
         start: number;
         length: number;
@@ -1954,10 +3453,229 @@ declare namespace ts {
         span: TextSpan;
         newLength: number;
     }
+    interface DiagnosticCollection {
+        add(diagnostic: Diagnostic): void;
+        getGlobalDiagnostics(): Diagnostic[];
+        getDiagnostics(fileName?: string): Diagnostic[];
+        getModificationCount(): number;
+        reattachFileDiagnostics(newFile: SourceFile): void;
+    }
     interface SyntaxList extends Node {
         _children: Node[];
     }
 }
+declare namespace ts {
+    const timestamp: () => number;
+}
+declare namespace ts.performance {
+    function mark(markName: string): void;
+    function measure(measureName: string, startMarkName?: string, endMarkName?: string): void;
+    function getCount(markName: string): number;
+    function getDuration(measureName: string): number;
+    function forEachMeasure(cb: (measureName: string, duration: number) => void): void;
+    function enable(): void;
+    function disable(): void;
+}
+declare namespace ts {
+    const enum Ternary {
+        False = 0,
+        Maybe = 1,
+        True = -1,
+    }
+    const collator: {
+        compare(a: string, b: string): number;
+    };
+    function createMap<T>(template?: MapLike<T>): Map<T>;
+    function createFileMap<T>(keyMapper?: (key: string) => string): FileMap<T>;
+    function toPath(fileName: string, basePath: string, getCanonicalFileName: (path: string) => string): Path;
+    const enum Comparison {
+        LessThan = -1,
+        EqualTo = 0,
+        GreaterThan = 1,
+    }
+    function forEach<T, U>(array: T[] | undefined, callback: (element: T, index: number) => U | undefined): U | undefined;
+    function zipWith<T, U>(arrayA: T[], arrayB: U[], callback: (a: T, b: U, index: number) => void): void;
+    function every<T>(array: T[], callback: (element: T, index: number) => boolean): boolean;
+    function find<T>(array: T[], predicate: (element: T, index: number) => boolean): T | undefined;
+    function findMap<T, U>(array: T[], callback: (element: T, index: number) => U | undefined): U;
+    function contains<T>(array: T[], value: T): boolean;
+    function indexOf<T>(array: T[], value: T): number;
+    function indexOfAnyCharCode(text: string, charCodes: number[], start?: number): number;
+    function countWhere<T>(array: T[], predicate: (x: T, i: number) => boolean): number;
+    function filter<T, U extends T>(array: T[], f: (x: T) => x is U): U[];
+    function filter<T>(array: T[], f: (x: T) => boolean): T[];
+    function removeWhere<T>(array: T[], f: (x: T) => boolean): boolean;
+    function filterMutate<T>(array: T[], f: (x: T) => boolean): void;
+    function map<T, U>(array: T[], f: (x: T, i: number) => U): U[];
+    function sameMap<T>(array: T[], f: (x: T, i: number) => T): T[];
+    function flatten<T>(array: (T | T[])[]): T[];
+    function flatMap<T, U>(array: T[], mapfn: (x: T, i: number) => U | U[]): U[];
+    function span<T>(array: T[], f: (x: T, i: number) => boolean): [T[], T[]];
+    function spanMap<T, K, U>(array: T[], keyfn: (x: T, i: number) => K, mapfn: (chunk: T[], key: K, start: number, end: number) => U): U[];
+    function mapObject<T, U>(object: MapLike<T>, f: (key: string, x: T) => [string, U]): MapLike<U>;
+    function some<T>(array: T[], predicate?: (value: T) => boolean): boolean;
+    function concatenate<T>(array1: T[], array2: T[]): T[];
+    function deduplicate<T>(array: T[], areEqual?: (a: T, b: T) => boolean): T[];
+    function arrayIsEqualTo<T>(array1: ReadonlyArray<T>, array2: ReadonlyArray<T>, equaler?: (a: T, b: T) => boolean): boolean;
+    function changesAffectModuleResolution(oldOptions: CompilerOptions, newOptions: CompilerOptions): boolean;
+    function compact<T>(array: T[]): T[];
+    function relativeComplement<T>(arrayA: T[] | undefined, arrayB: T[] | undefined, comparer?: (x: T, y: T) => Comparison, offsetA?: number, offsetB?: number): T[] | undefined;
+    function sum(array: any[], prop: string): number;
+    function append<T>(to: T[] | undefined, value: T | undefined): T[] | undefined;
+    function addRange<T>(to: T[] | undefined, from: T[] | undefined): T[] | undefined;
+    function rangeEquals<T>(array1: T[], array2: T[], pos: number, end: number): boolean;
+    function firstOrUndefined<T>(array: T[]): T;
+    function lastOrUndefined<T>(array: T[]): T;
+    function singleOrUndefined<T>(array: T[]): T;
+    function singleOrMany<T>(array: T[]): T | T[];
+    function replaceElement<T>(array: T[], index: number, value: T): T[];
+    function binarySearch<T>(array: T[], value: T, comparer?: (v1: T, v2: T) => number, offset?: number): number;
+    function reduceLeft<T, U>(array: T[], f: (memo: U, value: T, i: number) => U, initial: U, start?: number, count?: number): U;
+    function reduceLeft<T>(array: T[], f: (memo: T, value: T, i: number) => T): T;
+    function reduceRight<T, U>(array: T[], f: (memo: U, value: T, i: number) => U, initial: U, start?: number, count?: number): U;
+    function reduceRight<T>(array: T[], f: (memo: T, value: T, i: number) => T): T;
+    function hasProperty<T>(map: MapLike<T>, key: string): boolean;
+    function getProperty<T>(map: MapLike<T>, key: string): T | undefined;
+    function getOwnKeys<T>(map: MapLike<T>): string[];
+    function forEachProperty<T, U>(map: Map<T>, callback: (value: T, key: string) => U): U;
+    function someProperties<T>(map: Map<T>, predicate?: (value: T, key: string) => boolean): boolean;
+    function copyProperties<T>(source: Map<T>, target: MapLike<T>): void;
+    function assign<T1 extends MapLike<{}>, T2, T3>(t: T1, arg1: T2, arg2: T3): T1 & T2 & T3;
+    function assign<T1 extends MapLike<{}>, T2>(t: T1, arg1: T2): T1 & T2;
+    function assign<T1 extends MapLike<{}>>(t: T1, ...args: any[]): any;
+    function reduceProperties<T, U>(map: Map<T>, callback: (aggregate: U, value: T, key: string) => U, initial: U): U;
+    function reduceOwnProperties<T, U>(map: MapLike<T>, callback: (aggregate: U, value: T, key: string) => U, initial: U): U;
+    function equalOwnProperties<T>(left: MapLike<T>, right: MapLike<T>, equalityComparer?: (left: T, right: T) => boolean): boolean;
+    function arrayToMap<T>(array: T[], makeKey: (value: T) => string): Map<T>;
+    function arrayToMap<T, U>(array: T[], makeKey: (value: T) => string, makeValue: (value: T) => U): Map<U>;
+    function isEmpty<T>(map: Map<T>): boolean;
+    function cloneMap<T>(map: Map<T>): Map<T>;
+    function clone<T>(object: T): T;
+    function extend<T1, T2>(first: T1, second: T2): T1 & T2;
+    function multiMapAdd<V>(map: Map<V[]>, key: string | number, value: V): V[];
+    function multiMapRemove<V>(map: Map<V[]>, key: string, value: V): void;
+    function isArray(value: any): value is any[];
+    function noop(): void;
+    function notImplemented(): never;
+    function memoize<T>(callback: () => T): () => T;
+    function chain<T, U>(...args: ((t: T) => (u: U) => U)[]): (t: T) => (u: U) => U;
+    function compose<T>(...args: ((t: T) => T)[]): (t: T) => T;
+    let localizedDiagnosticMessages: Map<string>;
+    function getLocaleSpecificMessage(message: DiagnosticMessage): string;
+    function createFileDiagnostic(file: SourceFile, start: number, length: number, message: DiagnosticMessage, ...args: (string | number)[]): Diagnostic;
+    function formatMessage(_dummy: any, message: DiagnosticMessage): string;
+    function createCompilerDiagnostic(message: DiagnosticMessage, ...args: (string | number)[]): Diagnostic;
+    function createCompilerDiagnosticFromMessageChain(chain: DiagnosticMessageChain): Diagnostic;
+    function chainDiagnosticMessages(details: DiagnosticMessageChain, message: DiagnosticMessage, ...args: any[]): DiagnosticMessageChain;
+    function concatenateDiagnosticMessageChains(headChain: DiagnosticMessageChain, tailChain: DiagnosticMessageChain): DiagnosticMessageChain;
+    function compareValues<T>(a: T, b: T): Comparison;
+    function compareStrings(a: string, b: string, ignoreCase?: boolean): Comparison;
+    function compareStringsCaseInsensitive(a: string, b: string): Comparison;
+    function compareDiagnostics(d1: Diagnostic, d2: Diagnostic): Comparison;
+    function sortAndDeduplicateDiagnostics(diagnostics: Diagnostic[]): Diagnostic[];
+    function deduplicateSortedDiagnostics(diagnostics: Diagnostic[]): Diagnostic[];
+    function normalizeSlashes(path: string): string;
+    function getRootLength(path: string): number;
+    const directorySeparator = "/";
+    function normalizePath(path: string): string;
+    function pathEndsWithDirectorySeparator(path: string): boolean;
+    function getDirectoryPath(path: Path): Path;
+    function getDirectoryPath(path: string): string;
+    function isUrl(path: string): boolean;
+    function isExternalModuleNameRelative(moduleName: string): boolean;
+    function getEmitScriptTarget(compilerOptions: CompilerOptions): ScriptTarget;
+    function getEmitModuleKind(compilerOptions: CompilerOptions): ModuleKind;
+    function hasZeroOrOneAsteriskCharacter(str: string): boolean;
+    function isRootedDiskPath(path: string): boolean;
+    function convertToRelativePath(absoluteOrRelativePath: string, basePath: string, getCanonicalFileName: (path: string) => string): string;
+    function getNormalizedPathComponents(path: string, currentDirectory: string): string[];
+    function getNormalizedAbsolutePath(fileName: string, currentDirectory: string): string;
+    function getNormalizedPathFromPathComponents(pathComponents: string[]): string;
+    function getRelativePathToDirectoryOrUrl(directoryPathOrUrl: string, relativeOrAbsolutePath: string, currentDirectory: string, getCanonicalFileName: (fileName: string) => string, isAbsolutePathAnUrl: boolean): string;
+    function getBaseFileName(path: string): string;
+    function combinePaths(path1: string, path2: string): string;
+    function removeTrailingDirectorySeparator(path: string): string;
+    function ensureTrailingDirectorySeparator(path: string): string;
+    function comparePaths(a: string, b: string, currentDirectory: string, ignoreCase?: boolean): Comparison;
+    function containsPath(parent: string, child: string, currentDirectory: string, ignoreCase?: boolean): boolean;
+    function startsWith(str: string, prefix: string): boolean;
+    function endsWith(str: string, suffix: string): boolean;
+    function hasExtension(fileName: string): boolean;
+    function fileExtensionIs(path: string, extension: string): boolean;
+    function fileExtensionIsAny(path: string, extensions: string[]): boolean;
+    function getRegularExpressionForWildcard(specs: string[], basePath: string, usage: "files" | "directories" | "exclude"): string;
+    function isImplicitGlob(lastPathComponent: string): boolean;
+    interface FileSystemEntries {
+        files: string[];
+        directories: string[];
+    }
+    interface FileMatcherPatterns {
+        includeFilePattern: string;
+        includeDirectoryPattern: string;
+        excludePattern: string;
+        basePaths: string[];
+    }
+    function getFileMatcherPatterns(path: string, excludes: string[], includes: string[], useCaseSensitiveFileNames: boolean, currentDirectory: string): FileMatcherPatterns;
+    function matchFiles(path: string, extensions: string[], excludes: string[], includes: string[], useCaseSensitiveFileNames: boolean, currentDirectory: string, getFileSystemEntries: (path: string) => FileSystemEntries): string[];
+    function ensureScriptKind(fileName: string, scriptKind?: ScriptKind): ScriptKind;
+    function getScriptKindFromFileName(fileName: string): ScriptKind;
+    const supportedTypeScriptExtensions: string[];
+    const supportedTypescriptExtensionsForExtractExtension: string[];
+    const supportedJavascriptExtensions: string[];
+    function getSupportedExtensions(options?: CompilerOptions): string[];
+    function hasJavaScriptFileExtension(fileName: string): boolean;
+    function hasTypeScriptFileExtension(fileName: string): boolean;
+    function isSupportedSourceFileName(fileName: string, compilerOptions?: CompilerOptions): boolean;
+    const enum ExtensionPriority {
+        TypeScriptFiles = 0,
+        DeclarationAndJavaScriptFiles = 2,
+        Limit = 5,
+        Highest = 0,
+        Lowest = 2,
+    }
+    function getExtensionPriority(path: string, supportedExtensions: string[]): ExtensionPriority;
+    function adjustExtensionPriority(extensionPriority: ExtensionPriority): ExtensionPriority;
+    function getNextLowestExtensionPriority(extensionPriority: ExtensionPriority): ExtensionPriority;
+    function removeFileExtension(path: string): string;
+    function tryRemoveExtension(path: string, extension: string): string | undefined;
+    function removeExtension(path: string, extension: string): string;
+    function changeExtension<T extends string | Path>(path: T, newExtension: string): T;
+    interface ObjectAllocator {
+        getNodeConstructor(): new (kind: SyntaxKind, pos?: number, end?: number) => Node;
+        getTokenConstructor(): new <TKind extends SyntaxKind>(kind: TKind, pos?: number, end?: number) => Token<TKind>;
+        getIdentifierConstructor(): new (kind: SyntaxKind.Identifier, pos?: number, end?: number) => Identifier;
+        getSourceFileConstructor(): new (kind: SyntaxKind.SourceFile, pos?: number, end?: number) => SourceFile;
+        getSymbolConstructor(): new (flags: SymbolFlags, name: string) => Symbol;
+        getTypeConstructor(): new (checker: TypeChecker, flags: TypeFlags) => Type;
+        getSignatureConstructor(): new (checker: TypeChecker) => Signature;
+    }
+    let objectAllocator: ObjectAllocator;
+    const enum AssertionLevel {
+        None = 0,
+        Normal = 1,
+        Aggressive = 2,
+        VeryAggressive = 3,
+    }
+    namespace Debug {
+        let currentAssertionLevel: AssertionLevel;
+        function shouldAssert(level: AssertionLevel): boolean;
+        function assert(expression: boolean, message?: string, verboseDebugInfo?: () => string): void;
+        function fail(message?: string): void;
+    }
+    function orderedRemoveItemAt<T>(array: T[], index: number): void;
+    function unorderedRemoveItemAt<T>(array: T[], index: number): void;
+    function unorderedRemoveItem<T>(array: T[], item: T): void;
+    function createGetCanonicalFileName(useCaseSensitiveFileNames: boolean): (fileName: string) => string;
+    function matchPatternOrExact(patternStrings: string[], candidate: string): string | Pattern | undefined;
+    function patternText({prefix, suffix}: Pattern): string;
+    function matchedText(pattern: Pattern, candidate: string): string;
+    function findBestPatternMatch<T>(values: T[], getPattern: (value: T) => Pattern, candidate: string): T | undefined;
+    function tryParsePattern(pattern: string): Pattern | undefined;
+    function positionIsSynthesized(pos: number): boolean;
+    function extensionIsTypeScript(ext: Extension): boolean;
+    function extensionFromPath(path: string): Extension;
+    function tryGetExtensionFromPath(path: string): Extension | undefined;
+}
 declare namespace ts {
     type FileWatcherCallback = (fileName: string, removed?: boolean) => void;
     type DirectoryWatcherCallback = (fileName: string) => void;
@@ -1974,7 +3692,7 @@ declare namespace ts {
         readFile(path: string, encoding?: string): string;
         getFileSize?(path: string): number;
         writeFile(path: string, data: string, writeByteOrderMark?: boolean): void;
-        watchFile?(path: string, callback: FileWatcherCallback): FileWatcher;
+        watchFile?(path: string, callback: FileWatcherCallback, pollingInterval?: number): FileWatcher;
         watchDirectory?(path: string, callback: DirectoryWatcherCallback, recursive?: boolean): FileWatcher;
         resolvePath(path: string): string;
         fileExists(path: string): boolean;
@@ -1989,6 +3707,10 @@ declare namespace ts {
         getMemoryUsage?(): number;
         exit(exitCode?: number): void;
         realpath?(path: string): string;
+        getEnvironmentVariable(name: string): string;
+        tryEnableSourceMapsForHost?(): void;
+        setTimeout?(callback: (...args: any[]) => void, ms: number, ...args: any[]): any;
+        clearTimeout?(timeoutId: any): void;
     }
     interface FileWatcher {
         close(): void;
@@ -2000,45 +3722,4790 @@ declare namespace ts {
     let sys: System;
 }
 declare namespace ts {
-    function getEffectiveTypeRoots(options: CompilerOptions, host: {
-        directoryExists?: (directoryName: string) => boolean;
-        getCurrentDirectory?: () => string;
-    }): string[] | undefined;
-    function resolveTypeReferenceDirective(typeReferenceDirectiveName: string, containingFile: string, options: CompilerOptions, host: ModuleResolutionHost): ResolvedTypeReferenceDirectiveWithFailedLookupLocations;
-    function getAutomaticTypeDirectiveNames(options: CompilerOptions, host: ModuleResolutionHost): string[];
-    function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations;
-    function nodeModuleNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations;
-    function classicNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations;
-}
-declare namespace ts {
-    function getDefaultLibFileName(options: CompilerOptions): string;
-    function textSpanEnd(span: TextSpan): number;
-    function textSpanIsEmpty(span: TextSpan): boolean;
-    function textSpanContainsPosition(span: TextSpan, position: number): boolean;
-    function textSpanContainsTextSpan(span: TextSpan, other: TextSpan): boolean;
-    function textSpanOverlapsWith(span: TextSpan, other: TextSpan): boolean;
-    function textSpanOverlap(span1: TextSpan, span2: TextSpan): TextSpan;
-    function textSpanIntersectsWithTextSpan(span: TextSpan, other: TextSpan): boolean;
-    function textSpanIntersectsWith(span: TextSpan, start: number, length: number): boolean;
-    function decodedTextSpanIntersectsWith(start1: number, length1: number, start2: number, length2: number): boolean;
-    function textSpanIntersectsWithPosition(span: TextSpan, position: number): boolean;
-    function textSpanIntersection(span1: TextSpan, span2: TextSpan): TextSpan;
-    function createTextSpan(start: number, length: number): TextSpan;
-    function createTextSpanFromBounds(start: number, end: number): TextSpan;
-    function textChangeRangeNewSpan(range: TextChangeRange): TextSpan;
-    function textChangeRangeIsUnchanged(range: TextChangeRange): boolean;
-    function createTextChangeRange(span: TextSpan, newLength: number): TextChangeRange;
-    let unchangedTextChangeRange: TextChangeRange;
-    function collapseTextChangeRangesAcrossMultipleVersions(changes: TextChangeRange[]): TextChangeRange;
-    function getTypeParameterOwner(d: Declaration): Declaration;
-    function isParameterPropertyDeclaration(node: ParameterDeclaration): boolean;
-    function getCombinedModifierFlags(node: Node): ModifierFlags;
-    function getCombinedNodeFlags(node: Node): NodeFlags;
+    const Diagnostics: {
+        Unterminated_string_literal: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Identifier_expected: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        _0_expected: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_file_cannot_have_a_reference_to_itself: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Trailing_comma_not_allowed: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Asterisk_Slash_expected: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Unexpected_token: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_rest_parameter_must_be_last_in_a_parameter_list: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Parameter_cannot_have_question_mark_and_initializer: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_required_parameter_cannot_follow_an_optional_parameter: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_index_signature_cannot_have_a_rest_parameter: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_index_signature_parameter_cannot_have_an_accessibility_modifier: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_index_signature_parameter_cannot_have_a_question_mark: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_index_signature_parameter_cannot_have_an_initializer: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_index_signature_must_have_a_type_annotation: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_index_signature_parameter_must_have_a_type_annotation: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_index_signature_parameter_type_must_be_string_or_number: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Accessibility_modifier_already_seen: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        _0_modifier_must_precede_1_modifier: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        _0_modifier_already_seen: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        _0_modifier_cannot_appear_on_a_class_element: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        super_must_be_followed_by_an_argument_list_or_member_access: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Only_ambient_modules_can_use_quoted_names: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Statements_are_not_allowed_in_ambient_contexts: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_declare_modifier_cannot_be_used_in_an_already_ambient_context: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Initializers_are_not_allowed_in_ambient_contexts: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        _0_modifier_cannot_be_used_in_an_ambient_context: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        _0_modifier_cannot_be_used_with_a_class_declaration: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        _0_modifier_cannot_be_used_here: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        _0_modifier_cannot_appear_on_a_data_property: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        _0_modifier_cannot_appear_on_a_module_or_namespace_element: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_0_modifier_cannot_be_used_with_an_interface_declaration: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_rest_parameter_cannot_be_optional: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_rest_parameter_cannot_have_an_initializer: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_set_accessor_must_have_exactly_one_parameter: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_set_accessor_cannot_have_an_optional_parameter: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_set_accessor_parameter_cannot_have_an_initializer: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_set_accessor_cannot_have_rest_parameter: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_get_accessor_cannot_have_parameters: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_async_function_or_method_must_have_a_valid_awaitable_return_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Operand_for_await_does_not_have_a_valid_callable_then_member: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Return_expression_in_async_function_does_not_have_a_valid_callable_then_member: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Expression_body_for_async_arrow_function_does_not_have_a_valid_callable_then_member: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Enum_member_must_have_initializer: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        _0_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_export_assignment_cannot_be_used_in_a_namespace: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        In_ambient_enum_declarations_member_initializer_must_be_constant_expression: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Unexpected_token_A_constructor_method_accessor_or_property_was_expected: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        _0_modifier_cannot_appear_on_a_type_member: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        _0_modifier_cannot_appear_on_an_index_signature: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_0_modifier_cannot_be_used_with_an_import_declaration: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Invalid_reference_directive_syntax: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_accessor_cannot_be_declared_in_an_ambient_context: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        _0_modifier_cannot_appear_on_a_constructor_declaration: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        _0_modifier_cannot_appear_on_a_parameter: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_parameters_cannot_appear_on_a_constructor_declaration: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_annotation_cannot_appear_on_a_constructor_declaration: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_accessor_cannot_have_type_parameters: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_set_accessor_cannot_have_a_return_type_annotation: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_index_signature_must_have_exactly_one_parameter: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        _0_list_cannot_be_empty: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_parameter_list_cannot_be_empty: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_argument_list_cannot_be_empty: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Invalid_use_of_0_in_strict_mode: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        with_statements_are_not_allowed_in_strict_mode: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        delete_cannot_be_called_on_an_identifier_in_strict_mode: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Jump_target_cannot_cross_function_boundary: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_return_statement_can_only_be_used_within_a_function_body: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Expression_expected: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_expected: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_default_clause_cannot_appear_more_than_once_in_a_switch_statement: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Duplicate_label_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_object_literal_cannot_have_property_and_accessor_with_the_same_name: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_export_assignment_cannot_have_modifiers: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Octal_literals_are_not_allowed_in_strict_mode: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_tuple_type_element_list_cannot_be_empty: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Variable_declaration_list_cannot_be_empty: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Digit_expected: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Hexadecimal_digit_expected: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Unexpected_end_of_text: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Invalid_character: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Declaration_or_statement_expected: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Statement_expected: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        case_or_default_expected: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Property_or_signature_expected: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Enum_member_expected: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Variable_declaration_expected: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Argument_expression_expected: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Property_assignment_expected: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Expression_or_comma_expected: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Parameter_declaration_expected: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_parameter_declaration_expected: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_argument_expected: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        String_literal_expected: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Line_break_not_permitted_here: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        or_expected: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Declaration_expected: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Import_declarations_in_a_namespace_cannot_reference_a_module: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Cannot_use_imports_exports_or_module_augmentations_when_module_is_none: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        File_name_0_differs_from_already_included_file_name_1_only_in_casing: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        const_declarations_must_be_initialized: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        const_declarations_can_only_be_declared_inside_a_block: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        let_declarations_can_only_be_declared_inside_a_block: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Unterminated_template_literal: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Unterminated_regular_expression_literal: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_object_member_cannot_be_declared_optional: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_yield_expression_is_only_allowed_in_a_generator_body: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Computed_property_names_are_not_allowed_in_enums: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_computed_property_name_in_an_ambient_context_must_directly_refer_to_a_built_in_symbol: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_computed_property_name_in_a_class_property_declaration_must_directly_refer_to_a_built_in_symbol: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_computed_property_name_in_a_method_overload_must_directly_refer_to_a_built_in_symbol: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_comma_expression_is_not_allowed_in_a_computed_property_name: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        extends_clause_already_seen: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        extends_clause_must_precede_implements_clause: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Classes_can_only_extend_a_single_class: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        implements_clause_already_seen: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Interface_declaration_cannot_have_implements_clause: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Binary_digit_expected: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Octal_digit_expected: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Unexpected_token_expected: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Property_destructuring_pattern_expected: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Array_element_destructuring_pattern_expected: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_destructuring_declaration_must_have_an_initializer: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_implementation_cannot_be_declared_in_ambient_contexts: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Modifiers_cannot_appear_here: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Merge_conflict_marker_encountered: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_rest_element_cannot_have_an_initializer: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_parameter_property_may_not_be_declared_using_a_binding_pattern: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_import_declaration_cannot_have_modifiers: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Module_0_has_no_default_export: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_export_declaration_cannot_have_modifiers: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Export_declarations_are_not_permitted_in_a_namespace: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Catch_clause_variable_cannot_have_a_type_annotation: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Catch_clause_variable_cannot_have_an_initializer: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Unterminated_Unicode_escape_sequence: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Line_terminator_not_permitted_before_arrow: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Import_assignment_cannot_be_used_when_targeting_ECMAScript_2015_modules_Consider_using_import_Asterisk_as_ns_from_mod_import_a_from_mod_import_d_from_mod_or_another_module_format_instead: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Export_assignment_cannot_be_used_when_targeting_ECMAScript_2015_modules_Consider_using_export_default_or_another_module_format_instead: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Decorators_are_not_valid_here: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Ambient_const_enums_are_not_allowed_when_the_isolatedModules_flag_is_provided: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_class_declaration_without_the_default_modifier_must_have_a_name: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Identifier_expected_0_is_a_reserved_word_in_strict_mode: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Identifier_expected_0_is_a_reserved_word_in_strict_mode_Class_definitions_are_automatically_in_strict_mode: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Invalid_use_of_0_Modules_are_automatically_in_strict_mode: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Export_assignment_is_not_supported_when_module_flag_is_system: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        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: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Generators_are_only_available_when_targeting_ECMAScript_2015_or_higher: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Generators_are_not_allowed_in_an_ambient_context: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_overload_signature_cannot_be_declared_as_a_generator: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        _0_tag_already_specified: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Signature_0_must_have_a_type_predicate: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Cannot_find_parameter_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_predicate_0_is_not_assignable_to_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Parameter_0_is_not_in_the_same_position_as_parameter_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_type_predicate_cannot_reference_a_rest_parameter: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_type_predicate_cannot_reference_element_0_in_a_binding_pattern: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_export_assignment_can_only_be_used_in_a_module: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_import_declaration_can_only_be_used_in_a_namespace_or_module: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_export_declaration_can_only_be_used_in_a_module: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_ambient_module_declaration_is_only_allowed_at_the_top_level_in_a_file: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_namespace_declaration_is_only_allowed_in_a_namespace_or_module: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_return_type_of_a_property_decorator_function_must_be_either_void_or_any: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        _0_modifier_cannot_be_used_with_1_modifier: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Abstract_methods_can_only_appear_within_an_abstract_class: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Method_0_cannot_have_an_implementation_because_it_is_marked_abstract: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_interface_property_cannot_have_an_initializer: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_type_literal_property_cannot_have_an_initializer: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_class_member_cannot_have_the_0_keyword: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_decorator_can_only_decorate_a_method_implementation_not_an_overload: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Function_declarations_are_not_allowed_inside_blocks_in_strict_mode_when_targeting_ES3_or_ES5: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Function_declarations_are_not_allowed_inside_blocks_in_strict_mode_when_targeting_ES3_or_ES5_Class_definitions_are_automatically_in_strict_mode: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Function_declarations_are_not_allowed_inside_blocks_in_strict_mode_when_targeting_ES3_or_ES5_Modules_are_automatically_in_strict_mode: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        _0_tag_cannot_be_used_independently_as_a_top_level_JSDoc_tag: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_const_initializer_in_an_ambient_context_must_be_a_string_or_numeric_literal: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        with_statements_are_not_allowed_in_an_async_function_block: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        await_expression_is_only_allowed_within_an_async_function: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_body_of_an_if_statement_cannot_be_the_empty_statement: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Global_module_exports_may_only_appear_in_module_files: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Global_module_exports_may_only_appear_in_declaration_files: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Global_module_exports_may_only_appear_at_top_level: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_parameter_property_cannot_be_declared_using_a_rest_parameter: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Duplicate_identifier_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Static_members_cannot_reference_class_type_parameters: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Circular_definition_of_import_alias_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Cannot_find_name_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Module_0_has_no_exported_member_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        File_0_is_not_a_module: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Cannot_find_module_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Module_0_has_already_exported_a_member_named_1_Consider_explicitly_re_exporting_to_resolve_the_ambiguity: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_0_recursively_references_itself_as_a_base_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_class_may_only_extend_another_class: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_interface_may_only_extend_a_class_or_another_interface: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_parameter_0_has_a_circular_constraint: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Generic_type_0_requires_1_type_argument_s: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_0_is_not_generic: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Global_type_0_must_be_a_class_or_interface_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Global_type_0_must_have_1_type_parameter_s: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Cannot_find_global_type_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Named_property_0_of_types_1_and_2_are_not_identical: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Interface_0_cannot_simultaneously_extend_types_1_and_2: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Excessive_stack_depth_comparing_types_0_and_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_0_is_not_assignable_to_type_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Cannot_redeclare_exported_variable_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Property_0_is_missing_in_type_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Property_0_is_private_in_type_1_but_not_in_type_2: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Types_of_property_0_are_incompatible: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Property_0_is_optional_in_type_1_but_required_in_type_2: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Types_of_parameters_0_and_1_are_incompatible: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Index_signature_is_missing_in_type_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Index_signatures_are_incompatible: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        this_cannot_be_referenced_in_a_module_or_namespace_body: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        this_cannot_be_referenced_in_current_location: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        this_cannot_be_referenced_in_constructor_arguments: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        this_cannot_be_referenced_in_a_static_property_initializer: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        super_can_only_be_referenced_in_a_derived_class: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        super_cannot_be_referenced_in_constructor_arguments: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        super_property_access_is_permitted_only_in_a_constructor_member_function_or_member_accessor_of_a_derived_class: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Property_0_does_not_exist_on_type_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Property_0_is_private_and_only_accessible_within_class_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_index_expression_argument_must_be_of_type_string_number_symbol_or_any: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_0_does_not_satisfy_the_constraint_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Argument_of_type_0_is_not_assignable_to_parameter_of_type_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Supplied_parameters_do_not_match_any_signature_of_call_target: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Untyped_function_calls_may_not_accept_type_arguments: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Value_of_type_0_is_not_callable_Did_you_mean_to_include_new: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Only_a_void_function_can_be_called_with_the_new_keyword: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_0_cannot_be_converted_to_type_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_or_a_property_access: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_Function_interface_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Operator_0_cannot_be_applied_to_types_1_and_2: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_parameter_name_cannot_be_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_parameter_property_is_only_allowed_in_a_constructor_implementation: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_rest_parameter_must_be_of_an_array_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Parameter_0_cannot_be_referenced_in_its_initializer: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Duplicate_string_index_signature: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Duplicate_number_index_signature: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_properties_or_has_parameter_properties: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Constructors_for_derived_classes_must_contain_a_super_call: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_get_accessor_must_return_a_value: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Getter_and_setter_accessors_do_not_agree_in_visibility: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        get_and_set_accessor_must_have_the_same_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_signature_with_an_implementation_cannot_use_a_string_literal_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Overload_signatures_must_all_be_exported_or_non_exported: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Overload_signatures_must_all_be_ambient_or_non_ambient: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Overload_signatures_must_all_be_public_private_or_protected: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Overload_signatures_must_all_be_optional_or_required: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Function_overload_must_be_static: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Function_overload_must_not_be_static: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Function_implementation_name_must_be_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Constructor_implementation_is_missing: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Function_implementation_is_missing_or_not_immediately_following_the_declaration: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Multiple_constructor_implementations_are_not_allowed: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Duplicate_function_implementation: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Overload_signature_is_not_compatible_with_function_implementation: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Declaration_name_conflicts_with_built_in_global_identifier_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Expression_resolves_to_super_that_compiler_uses_to_capture_base_class_reference: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_left_hand_side_of_a_for_in_statement_must_be_a_variable_or_a_property_access: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Setters_cannot_return_a_value: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_with_statement_is_not_supported_All_symbols_in_a_with_block_will_have_type_any: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Property_0_of_type_1_is_not_assignable_to_string_index_type_2: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Numeric_index_type_0_is_not_assignable_to_string_index_type_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Class_name_cannot_be_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Class_0_incorrectly_extends_base_class_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Class_static_side_0_incorrectly_extends_base_class_static_side_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Class_0_incorrectly_implements_interface_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_class_may_only_implement_another_class_or_interface: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_accessor: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_property: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_function: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_function: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Interface_name_cannot_be_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        All_declarations_of_0_must_have_identical_type_parameters: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Interface_0_incorrectly_extends_interface_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Enum_name_cannot_be_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enum_element: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_namespace_declaration_cannot_be_in_a_different_file_from_a_class_or_function_with_which_it_is_merged: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_namespace_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Ambient_modules_cannot_be_nested_in_other_modules_or_namespaces: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Ambient_module_declaration_cannot_specify_relative_module_name: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Module_0_is_hidden_by_a_local_declaration_with_the_same_name: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Import_name_cannot_be_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Import_or_export_declaration_in_an_ambient_module_declaration_cannot_reference_module_through_relative_module_name: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Import_declaration_conflicts_with_local_declaration_of_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Types_have_separate_declarations_of_a_private_property_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Property_0_is_protected_in_type_1_but_public_in_type_2: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Block_scoped_variable_0_used_before_its_declaration: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Cannot_redeclare_block_scoped_variable_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_enum_member_cannot_have_a_numeric_name: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_type_arguments_explicitly: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Variable_0_is_used_before_being_assigned: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_alias_0_circularly_references_itself: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_alias_name_cannot_be_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_AMD_module_cannot_have_multiple_name_assignments: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_0_has_no_property_1_and_no_string_index_signature: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_0_has_no_property_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_0_is_not_an_array_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_rest_element_must_be_last_in_a_destructuring_pattern: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_computed_property_name_must_be_of_type_string_number_symbol_or_any: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        this_cannot_be_referenced_in_a_computed_property_name: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        super_cannot_be_referenced_in_a_computed_property_name: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Cannot_find_global_value_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_0_operator_cannot_be_applied_to_type_symbol: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Symbol_reference_does_not_refer_to_the_global_Symbol_constructor_object: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_computed_property_name_of_the_form_0_must_be_of_type_symbol: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Spread_operator_in_new_expressions_is_only_available_when_targeting_ECMAScript_5_and_higher: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Enum_declarations_must_all_be_const_or_non_const: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        In_const_enum_declarations_member_initializer_must_be_constant_expression: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_const_enum_member_can_only_be_accessed_using_a_string_literal: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        const_enum_member_initializer_was_evaluated_to_a_non_finite_value: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        const_enum_member_initializer_was_evaluated_to_disallowed_value_NaN: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Property_0_does_not_exist_on_const_enum_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Export_declaration_conflicts_with_exported_declaration_of_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_left_hand_side_of_a_for_of_statement_must_be_a_variable_or_a_property_access: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_iterator_must_have_a_next_method: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Cannot_redeclare_identifier_0_in_catch_clause: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Using_a_string_in_a_for_of_statement_is_only_supported_in_ECMAScript_5_and_higher: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_0_is_not_an_array_type_or_a_string_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_standard_function_expression: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Module_0_resolves_to_a_non_module_entity_and_cannot_be_imported_using_this_construct: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Module_0_uses_export_and_cannot_be_used_with_export_Asterisk: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_interface_can_only_extend_an_identifier_Slashqualified_name_with_optional_type_arguments: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_class_can_only_implement_an_identifier_Slashqualified_name_with_optional_type_arguments: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_rest_element_cannot_contain_a_binding_pattern: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        _0_is_referenced_directly_or_indirectly_in_its_own_type_annotation: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Cannot_find_namespace_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_generator_cannot_have_a_void_type_annotation: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        _0_is_referenced_directly_or_indirectly_in_its_own_base_expression: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_0_is_not_a_constructor_function_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        No_base_constructor_has_the_specified_number_of_type_arguments: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Base_constructor_return_type_0_is_not_a_class_or_interface_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Base_constructors_must_all_have_the_same_return_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Cannot_create_an_instance_of_the_abstract_class_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Overload_signatures_must_all_be_abstract_or_non_abstract: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Classes_containing_abstract_methods_must_be_marked_abstract: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        All_declarations_of_an_abstract_method_must_be_consecutive: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_this_based_type_guard_is_not_compatible_with_a_parameter_based_type_guard: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Duplicate_identifier_0_Compiler_uses_declaration_1_to_support_async_functions: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Expression_resolves_to_variable_declaration_0_that_compiler_uses_to_support_async_functions: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_arguments_object_cannot_be_referenced_in_an_async_function_or_method_in_ES3_and_ES5_Consider_using_a_standard_function_or_method: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        yield_expressions_cannot_be_used_in_a_parameter_initializer: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        await_expressions_cannot_be_used_in_a_parameter_initializer: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_this_type_is_available_only_in_a_non_static_member_of_a_class_or_interface: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_inferred_type_of_0_references_an_inaccessible_this_type_A_type_annotation_is_necessary: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_module_cannot_have_multiple_default_exports: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_containing_async_functions: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Property_0_is_incompatible_with_index_signature: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Object_is_possibly_null: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Object_is_possibly_undefined: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Object_is_possibly_null_or_undefined: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_function_returning_never_cannot_have_a_reachable_end_point: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Enum_type_0_has_members_with_initializers_that_are_not_literals: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_0_is_not_constrained_to_keyof_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_0_has_no_matching_index_signature_for_type_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_0_cannot_be_used_as_an_index_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Cannot_assign_to_0_because_it_is_not_a_variable: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Cannot_assign_to_0_because_it_is_a_constant_or_a_read_only_property: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_target_of_an_assignment_must_be_a_variable_or_a_property_access: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Index_signature_in_type_0_only_permits_reading: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        JSX_element_attributes_type_0_may_not_be_a_union_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_return_type_of_a_JSX_element_constructor_must_return_an_object_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Property_0_in_type_1_is_not_assignable_to_type_2: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        JSX_element_type_0_does_not_have_any_construct_or_call_signatures: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        JSX_element_type_0_is_not_a_constructor_function_for_JSX_elements: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Property_0_of_JSX_spread_attribute_is_not_assignable_to_target_property: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        JSX_element_class_does_not_support_attributes_because_it_does_not_have_a_0_property: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_global_type_JSX_0_may_not_have_more_than_one_property: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Cannot_emit_namespaced_JSX_elements_in_React: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_members_defined_in_other_enums: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_default_0_declaration_instead: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Exported_external_package_typings_file_cannot_contain_tripleslash_references_Please_contact_the_package_author_to_update_the_package_definition: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_the_package_definition: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        JSX_expressions_must_have_one_parent_element: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_0_provides_no_match_for_the_signature_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        super_is_only_allowed_in_members_of_object_literal_expressions_when_option_target_is_ES2015_or_higher: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        super_can_only_be_referenced_in_members_of_derived_classes_or_object_literal_expressions: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Cannot_export_0_Only_local_declarations_can_be_exported_from_a_module: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Cannot_find_name_0_Did_you_mean_the_static_member_1_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Cannot_find_name_0_Did_you_mean_the_instance_member_this_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Invalid_module_name_in_augmentation_module_0_cannot_be_found: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Invalid_module_name_in_augmentation_Module_0_resolves_to_an_untyped_module_at_1_which_cannot_be_augmented: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Exports_and_export_assignments_are_not_permitted_in_module_augmentations: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_module: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always_visible: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Augmentations_for_the_global_scope_can_only_be_directly_nested_in_external_modules_or_ambient_module_declarations: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Augmentations_for_the_global_scope_should_have_declare_modifier_unless_they_appear_in_already_ambient_context: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Cannot_augment_module_0_because_it_resolves_to_a_non_module_entity: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Cannot_assign_a_0_constructor_type_to_a_1_constructor_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Constructor_of_class_0_is_private_and_only_accessible_within_the_class_declaration: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Constructor_of_class_0_is_protected_and_only_accessible_within_the_class_declaration: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Cannot_extend_a_class_0_Class_constructor_is_marked_as_private: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Accessors_must_both_be_abstract_or_non_abstract: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_type_predicate_s_type_must_be_assignable_to_its_parameter_s_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_0_is_not_comparable_to_type_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_function_that_is_called_with_the_new_keyword_cannot_have_a_this_type_that_is_void: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_this_parameter_must_be_the_first_parameter: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_constructor_cannot_have_a_this_parameter: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        get_and_set_accessor_must_have_the_same_this_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_this_context_of_type_0_is_not_assignable_to_method_s_this_of_type_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_this_types_of_each_signature_are_incompatible: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        _0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        All_declarations_of_0_must_have_identical_modifiers: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Cannot_find_type_definition_file_for_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Cannot_extend_an_interface_0_Did_you_mean_implements: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_class_must_be_declared_after_its_base_class: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_import_path_cannot_end_with_a_0_extension_Consider_importing_1_instead: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        _0_is_a_primitive_but_1_is_a_wrapper_object_Prefer_using_0_when_possible: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        _0_only_refers_to_a_type_but_is_being_used_as_a_value_here: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Namespace_0_has_no_exported_member_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Left_side_of_comma_operator_is_unused_and_has_no_side_effects: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_Object_type_is_assignable_to_very_few_other_types_Did_you_mean_to_use_the_any_type_instead: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_async_function_or_method_must_return_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES2015_in_your_lib_option: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Spread_types_may_only_be_created_from_object_types: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Rest_types_may_only_be_created_from_object_types: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        An_object_rest_element_must_be_an_identifier: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Import_declaration_0_is_using_private_name_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_parameter_0_of_exported_function_has_or_is_using_private_name_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Implements_clause_of_exported_class_0_has_or_is_using_private_name_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Extends_clause_of_exported_class_0_has_or_is_using_private_name_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Extends_clause_of_exported_interface_0_has_or_is_using_private_name_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Exported_variable_0_has_or_is_using_name_1_from_private_module_2: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Exported_variable_0_has_or_is_using_private_name_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Public_static_property_0_of_exported_class_has_or_is_using_private_name_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Public_property_0_of_exported_class_has_or_is_using_private_name_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Property_0_of_exported_interface_has_or_is_using_private_name_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Return_type_of_exported_function_has_or_is_using_private_name_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Parameter_0_of_exported_function_has_or_is_using_private_name_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Exported_type_alias_0_has_or_is_using_private_name_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Default_export_of_the_module_has_or_is_using_private_name_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Conflicting_definitions_for_0_found_at_1_and_2_Consider_installing_a_specific_version_of_this_library_to_resolve_the_conflict: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_current_host_does_not_support_the_0_option: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Cannot_find_the_common_subdirectory_path_for_the_input_files: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        File_specification_cannot_contain_multiple_recursive_directory_wildcards_Asterisk_Asterisk_Colon_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Cannot_read_file_0_Colon_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Unsupported_file_encoding: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Failed_to_parse_file_0_Colon_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Unknown_compiler_option_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Compiler_option_0_requires_a_value_of_type_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Could_not_write_file_0_Colon_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Option_project_cannot_be_mixed_with_source_files_on_a_command_line: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES2015_or_higher: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Option_0_can_only_be_used_when_either_option_inlineSourceMap_or_option_sourceMap_is_provided: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Option_0_cannot_be_specified_without_specifying_option_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Option_0_cannot_be_specified_with_option_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_tsconfig_json_file_is_already_defined_at_Colon_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Cannot_write_file_0_because_it_would_overwrite_input_file: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Cannot_find_a_tsconfig_json_file_at_the_specified_directory_Colon_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_specified_path_does_not_exist_Colon_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Invalid_value_for_reactNamespace_0_is_not_a_valid_identifier: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Option_paths_cannot_be_used_without_specifying_baseUrl_option: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Pattern_0_can_have_at_most_one_Asterisk_character: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Substitution_0_in_pattern_1_in_can_have_at_most_one_Asterisk_character: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Substitutions_for_pattern_0_should_be_an_array: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Substitution_0_for_pattern_1_has_incorrect_type_expected_string_got_2: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Substitutions_for_pattern_0_shouldn_t_be_an_empty_array: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Invalid_value_for_jsxFactory_0_is_not_a_valid_identifier_or_qualified_name: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Concatenate_and_emit_output_to_single_file: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Generates_corresponding_d_ts_file: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Specify_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Watch_input_files: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Redirect_output_structure_to_the_directory: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Do_not_erase_const_enum_declarations_in_generated_code: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Do_not_emit_outputs_if_any_errors_were_reported: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Do_not_emit_comments_to_output: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Do_not_emit_outputs: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typechecking: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Skip_type_checking_of_declaration_files: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Print_this_message: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Print_the_compiler_s_version: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Compile_the_project_in_the_given_directory: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Syntax_Colon_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        options: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        file: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Examples_Colon_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Options_Colon: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Version_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Insert_command_line_options_and_files_from_a_file: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        File_change_detected_Starting_incremental_compilation: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        KIND: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        FILE: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        VERSION: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        LOCATION: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        DIRECTORY: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        STRATEGY: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Compilation_complete_Watching_for_file_changes: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Generates_corresponding_map_file: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Compiler_option_0_expects_an_argument: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Unterminated_quoted_string_in_response_file_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Argument_for_0_option_must_be_Colon_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Unsupported_locale_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Unable_to_open_file_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Corrupted_locale_file_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Raise_error_on_expressions_and_declarations_with_an_implied_any_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        File_0_not_found: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        File_0_has_unsupported_extension_The_only_supported_extensions_are_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Do_not_emit_declarations_for_code_that_has_an_internal_annotation: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Specify_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        File_0_is_not_under_rootDir_1_rootDir_is_expected_to_contain_all_source_files: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Specify_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        NEWLINE: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Option_0_can_only_be_specified_in_tsconfig_json_file: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Enables_experimental_support_for_ES7_decorators: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Enables_experimental_support_for_emitting_type_metadata_for_decorators: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Enables_experimental_support_for_ES7_async_functions: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Specify_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Successfully_created_a_tsconfig_json_file: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Suppress_excess_property_checks_for_object_literals: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Stylize_errors_and_messages_using_color_and_context_experimental: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Do_not_report_errors_on_unused_labels: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Report_error_when_not_all_code_paths_in_function_return_a_value: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Report_errors_for_fallthrough_cases_in_switch_statement: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Do_not_report_errors_on_unreachable_code: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Disallow_inconsistently_cased_references_to_the_same_file: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Specify_library_files_to_be_included_in_the_compilation_Colon: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Specify_JSX_code_generation_Colon_preserve_or_react: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Only_amd_and_system_modules_are_supported_alongside_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Base_directory_to_resolve_non_absolute_module_names: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Specify_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Enable_tracing_of_the_name_resolution_process: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Resolving_module_0_from_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Explicitly_specified_module_resolution_kind_Colon_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Module_resolution_kind_is_not_specified_using_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Module_name_0_was_successfully_resolved_to_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Module_name_0_was_not_resolved: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        paths_option_is_specified_looking_for_a_pattern_to_match_module_name_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Module_name_0_matched_pattern_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Trying_substitution_0_candidate_module_location_Colon_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Resolving_module_name_0_relative_to_base_url_1_2: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Loading_module_as_file_Slash_folder_candidate_module_location_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        File_0_does_not_exist: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        File_0_exist_use_it_as_a_name_resolution_result: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Loading_module_0_from_node_modules_folder: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Found_package_json_at_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        package_json_does_not_have_a_types_or_main_field: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        package_json_has_0_field_1_that_references_2: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Allow_javascript_files_to_be_compiled: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Option_0_should_have_array_of_strings_as_a_value: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Checking_if_0_is_the_longest_matching_prefix_for_1_2: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Expected_type_of_0_field_in_package_json_to_be_string_got_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        baseUrl_option_is_set_to_0_using_this_value_to_resolve_non_relative_module_name_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        rootDirs_option_is_set_using_it_to_resolve_relative_module_name_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Longest_matching_prefix_for_0_is_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Loading_0_from_the_root_dir_1_candidate_location_2: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Trying_other_entries_in_rootDirs: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Module_resolution_using_rootDirs_has_failed: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Do_not_emit_use_strict_directives_in_module_output: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Enable_strict_null_checks: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Unknown_option_excludes_Did_you_mean_exclude: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Raise_error_on_this_expressions_with_an_implied_any_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Resolving_type_reference_directive_0_containing_file_1_root_directory_2: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Resolving_using_primary_search_paths: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Resolving_from_node_modules_folder: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_reference_directive_0_was_not_resolved: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Resolving_with_primary_search_path_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Root_directory_cannot_be_determined_skipping_primary_search_paths: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Resolving_type_reference_directive_0_containing_file_1_root_directory_not_set: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_declaration_files_to_be_included_in_compilation: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Looking_up_in_node_modules_folder_initial_location_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_modules_folder: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Resolving_type_reference_directive_0_containing_file_not_set_root_directory_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Resolving_type_reference_directive_0_containing_file_not_set_root_directory_not_set: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_config_file_0_found_doesn_t_contain_any_source_files: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Resolving_real_path_for_0_result_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Cannot_compile_modules_using_option_0_unless_the_module_flag_is_amd_or_system: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        File_name_0_has_a_1_extension_stripping_it: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        _0_is_declared_but_never_used: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Report_errors_on_unused_locals: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Report_errors_on_unused_parameters: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        No_types_specified_in_package_json_so_returning_main_value_of_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Property_0_is_declared_but_never_used: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Import_emit_helpers_from_tslib: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Auto_discovery_for_typings_is_enabled_in_project_0_Running_extra_resolution_pass_for_module_1_using_cache_location_2: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Parse_in_strict_mode_and_emit_use_strict_for_each_source_file: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Module_0_was_resolved_to_1_but_jsx_is_not_set: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Module_0_was_resolved_to_1_but_allowJs_is_not_set: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Module_0_was_resolved_as_locally_declared_ambient_module_in_file_1: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Module_0_was_resolved_as_ambient_module_declared_in_1_since_this_file_was_not_modified: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Specify_the_JSX_factory_function_to_use_when_targeting_react_JSX_emit_e_g_React_createElement_or_h: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Variable_0_implicitly_has_an_1_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Parameter_0_implicitly_has_an_1_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Member_0_implicitly_has_an_1_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        _0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Element_implicitly_has_an_any_type_because_index_expression_is_not_of_type_number: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Object_literal_s_property_0_implicitly_has_an_1_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Rest_parameter_0_implicitly_has_an_any_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        _0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        _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: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        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: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Unreachable_code_detected: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Unused_label: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Fallthrough_case_in_switch: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Not_all_code_paths_return_a_value: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Binding_element_0_implicitly_has_an_1_type: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Variable_0_implicitly_has_type_1_in_some_locations_where_its_type_cannot_be_determined: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        You_cannot_rename_this_element: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        import_can_only_be_used_in_a_ts_file: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        export_can_only_be_used_in_a_ts_file: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        type_parameter_declarations_can_only_be_used_in_a_ts_file: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        implements_clauses_can_only_be_used_in_a_ts_file: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        interface_declarations_can_only_be_used_in_a_ts_file: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        module_declarations_can_only_be_used_in_a_ts_file: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        type_aliases_can_only_be_used_in_a_ts_file: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        _0_can_only_be_used_in_a_ts_file: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        types_can_only_be_used_in_a_ts_file: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        type_arguments_can_only_be_used_in_a_ts_file: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        parameter_modifiers_can_only_be_used_in_a_ts_file: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        enum_declarations_can_only_be_used_in_a_ts_file: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        type_assertion_expressions_can_only_be_used_in_a_ts_file: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Only_identifiers_Slashqualified_names_with_optional_type_arguments_are_currently_supported_in_a_class_extends_clauses: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        class_expressions_are_not_currently_supported: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        JSX_attributes_must_only_be_assigned_a_non_empty_expression: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        JSX_elements_cannot_have_multiple_attributes_with_the_same_name: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Expected_corresponding_JSX_closing_tag_for_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        JSX_attribute_expected: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Cannot_use_JSX_unless_the_jsx_flag_is_provided: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_constructor_cannot_contain_a_super_call_when_its_class_extends_null: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        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: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        JSX_element_0_has_no_corresponding_closing_tag: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Unknown_typing_option_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Circularity_detected_while_resolving_configuration_Colon_0: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_path_in_an_extends_options_must_be_relative_or_rooted: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        The_files_list_in_config_file_0_is_empty: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Add_missing_super_call: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Make_super_call_the_first_statement_in_the_constructor: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Change_extends_to_implements: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Remove_unused_identifiers: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Implement_interface_on_reference: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Implement_interface_on_class: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Implement_inherited_abstract_class: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        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: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+        Type_0_is_not_assignable_to_type_1_Two_different_types_with_this_name_exist_but_they_are_unrelated: {
+            code: number;
+            category: DiagnosticCategory;
+            key: string;
+            message: string;
+        };
+    };
 }
 declare namespace ts {
     interface ErrorCallback {
         (message: DiagnosticMessage, length: number): void;
     }
+    function tokenIsIdentifierOrKeyword(token: SyntaxKind): boolean;
     interface Scanner {
         getStartPos(): number;
         getToken(): SyntaxKind;
@@ -2070,13 +8537,24 @@ declare namespace ts {
         scanRange<T>(start: number, length: number, callback: () => T): T;
         tryScan<T>(callback: () => T): T;
     }
+    function isUnicodeIdentifierStart(code: number, languageVersion: ScriptTarget): boolean;
     function tokenToString(t: SyntaxKind): string;
+    function stringToToken(s: string): SyntaxKind;
+    function computeLineStarts(text: string): number[];
     function getPositionOfLineAndCharacter(sourceFile: SourceFile, line: number, character: number): number;
+    function computePositionOfLineAndCharacter(lineStarts: number[], line: number, character: number): number;
+    function getLineStarts(sourceFile: SourceFile): number[];
+    function computeLineAndCharacterOfPosition(lineStarts: number[], position: number): {
+        line: number;
+        character: number;
+    };
     function getLineAndCharacterOfPosition(sourceFile: SourceFile, position: number): LineAndCharacter;
     function isWhiteSpace(ch: number): boolean;
     function isWhiteSpaceSingleLine(ch: number): boolean;
     function isLineBreak(ch: number): boolean;
+    function isOctalDigit(ch: number): boolean;
     function couldStartTrivia(text: string, pos: number): boolean;
+    function skipTrivia(text: string, pos: number, stopAfterLineBreak?: boolean, stopAtComments?: boolean): number;
     function forEachLeadingCommentRange<T, U>(text: string, pos: number, cb: (pos: number, end: number, kind: SyntaxKind, hasTrailingNewLine: boolean, state: T) => U, state?: T): U;
     function forEachTrailingCommentRange<T, U>(text: string, pos: number, cb: (pos: number, end: number, kind: SyntaxKind, hasTrailingNewLine: boolean, state: T) => U, state?: T): U;
     function reduceEachLeadingCommentRange<T, U>(text: string, pos: number, cb: (pos: number, end: number, kind: SyntaxKind, hasTrailingNewLine: boolean, state: T, memo: U) => U, state: T, initial: U): U;
@@ -2086,31 +8564,23 @@ declare namespace ts {
     function getShebang(text: string): string;
     function isIdentifierStart(ch: number, languageVersion: ScriptTarget): boolean;
     function isIdentifierPart(ch: number, languageVersion: ScriptTarget): boolean;
+    function isIdentifierText(name: string, languageVersion: ScriptTarget): boolean;
     function createScanner(languageVersion: ScriptTarget, skipTrivia: boolean, languageVariant?: LanguageVariant, text?: string, onError?: ErrorCallback, start?: number, length?: number): Scanner;
 }
 declare namespace ts {
-    function createNode(kind: SyntaxKind, pos?: number, end?: number): Node;
-    function forEachChild<T>(node: Node, cbNode: (node: Node) => T, cbNodeArray?: (nodes: Node[]) => T): T;
-    function createSourceFile(fileName: string, sourceText: string, languageVersion: ScriptTarget, setParentNodes?: boolean, scriptKind?: ScriptKind): SourceFile;
-    function isExternalModule(file: SourceFile): boolean;
-    function updateSourceFile(sourceFile: SourceFile, newText: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile;
-}
-declare namespace ts {
-    const version = "2.1.0";
-    function findConfigFile(searchPath: string, fileExists: (fileName: string) => boolean, configName?: string): string;
-    function resolveTripleslashReference(moduleName: string, containingFile: string): string;
-    function createCompilerHost(options: CompilerOptions, setParentNodes?: boolean): CompilerHost;
-    function getPreEmitDiagnostics(program: Program, sourceFile?: SourceFile, cancellationToken?: CancellationToken): Diagnostic[];
-    interface FormatDiagnosticsHost {
-        getCurrentDirectory(): string;
-        getCanonicalFileName(fileName: string): string;
-        getNewLine(): string;
+    const compileOnSaveCommandLineOption: CommandLineOption;
+    const optionDeclarations: CommandLineOption[];
+    let typingOptionDeclarations: CommandLineOption[];
+    interface OptionNameMap {
+        optionNameMap: Map<CommandLineOption>;
+        shortOptionNames: Map<string>;
     }
-    function formatDiagnostics(diagnostics: Diagnostic[], host: FormatDiagnosticsHost): string;
-    function flattenDiagnosticMessageText(messageText: string | DiagnosticMessageChain, newLine: string): string;
-    function createProgram(rootNames: string[], options: CompilerOptions, host?: CompilerHost, oldProgram?: Program): Program;
-}
-declare namespace ts {
+    const defaultInitCompilerOptions: CompilerOptions;
+    function getOptionNameMap(): OptionNameMap;
+    function createCompilerDiagnosticForInvalidCustomType(opt: CommandLineOptionOfCustomType): Diagnostic;
+    function parseCustomTypeOption(opt: CommandLineOptionOfCustomType, value: string, errors: Diagnostic[]): string | number;
+    function parseListTypeOption(opt: CommandLineOptionOfListType, value: string, errors: Diagnostic[]): (string | number)[] | undefined;
+    function parseCommandLine(commandLine: string[], readFile?: (path: string) => string): ParsedCommandLine;
     function readConfigFile(fileName: string, readFile: (path: string) => string): {
         config?: any;
         error?: Diagnostic;
@@ -2119,6 +8589,9 @@ declare namespace ts {
         config?: any;
         error?: Diagnostic;
     };
+    function generateTSConfig(options: CompilerOptions, fileNames: string[]): {
+        compilerOptions: Map<CompilerOptionsValue>;
+    };
     function parseJsonConfigFileContent(json: any, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string, resolutionStack?: Path[]): ParsedCommandLine;
     function convertCompileOnSaveOptionFromJson(jsonOption: any, basePath: string, errors: Diagnostic[]): boolean;
     function convertCompilerOptionsFromJson(jsonOptions: any, basePath: string, configFileName?: string): {
@@ -2130,6 +8603,996 @@ declare namespace ts {
         errors: Diagnostic[];
     };
 }
+declare namespace ts.JsTyping {
+    interface TypingResolutionHost {
+        directoryExists: (path: string) => boolean;
+        fileExists: (fileName: string) => boolean;
+        readFile: (path: string, encoding?: string) => string;
+        readDirectory: (rootDir: string, extensions: string[], excludes: string[], includes: string[], depth?: number) => string[];
+    }
+    const nodeCoreModuleList: ReadonlyArray<string>;
+    function discoverTypings(host: TypingResolutionHost, fileNames: string[], projectRootPath: Path, safeListPath: Path, packageNameToTypingLocation: Map<string>, typingOptions: TypingOptions, unresolvedImports: ReadonlyArray<string>): {
+        cachedTypingPaths: string[];
+        newTypingNames: string[];
+        filesToWatch: string[];
+    };
+}
+declare namespace ts.server {
+    const ActionSet: ActionSet;
+    const ActionInvalidate: ActionInvalidate;
+    const EventInstall: EventInstall;
+    namespace Arguments {
+        const GlobalCacheLocation = "--globalTypingsCacheLocation";
+        const LogFile = "--logFile";
+        const EnableTelemetry = "--enableTelemetry";
+    }
+    function hasArgument(argumentName: string): boolean;
+    function findArgument(argumentName: string): string;
+}
+declare namespace ts.server {
+    enum LogLevel {
+        terse = 0,
+        normal = 1,
+        requestTime = 2,
+        verbose = 3,
+    }
+    const emptyArray: ReadonlyArray<any>;
+    interface Logger {
+        close(): void;
+        hasLevel(level: LogLevel): boolean;
+        loggingEnabled(): boolean;
+        perftrc(s: string): void;
+        info(s: string): void;
+        startGroup(): void;
+        endGroup(): void;
+        msg(s: string, type?: Msg.Types): void;
+        getLogFileName(): string;
+    }
+    namespace Msg {
+        type Err = "Err";
+        const Err: Err;
+        type Info = "Info";
+        const Info: Info;
+        type Perf = "Perf";
+        const Perf: Perf;
+        type Types = Err | Info | Perf;
+    }
+    function createInstallTypingsRequest(project: Project, typingOptions: TypingOptions, unresolvedImports: SortedReadonlyArray<string>, cachePath?: string): DiscoverTypings;
+    namespace Errors {
+        function ThrowNoProject(): never;
+        function ThrowProjectLanguageServiceDisabled(): never;
+        function ThrowProjectDoesNotContainDocument(fileName: string, project: Project): never;
+    }
+    function getDefaultFormatCodeSettings(host: ServerHost): FormatCodeSettings;
+    function mergeMaps(target: MapLike<any>, source: MapLike<any>): void;
+    function removeItemFromSet<T>(items: T[], itemToRemove: T): void;
+    type NormalizedPath = string & {
+        __normalizedPathTag: any;
+    };
+    function toNormalizedPath(fileName: string): NormalizedPath;
+    function normalizedPathToPath(normalizedPath: NormalizedPath, currentDirectory: string, getCanonicalFileName: (f: string) => string): Path;
+    function asNormalizedPath(fileName: string): NormalizedPath;
+    interface NormalizedPathMap<T> {
+        get(path: NormalizedPath): T;
+        set(path: NormalizedPath, value: T): void;
+        contains(path: NormalizedPath): boolean;
+        remove(path: NormalizedPath): void;
+    }
+    function createNormalizedPathMap<T>(): NormalizedPathMap<T>;
+    const nullLanguageService: LanguageService;
+    interface ServerLanguageServiceHost {
+        setCompilationSettings(options: CompilerOptions): void;
+        notifyFileRemoved(info: ScriptInfo): void;
+        startRecordingFilesWithChangedResolutions(): void;
+        finishRecordingFilesWithChangedResolutions(): Path[];
+    }
+    const nullLanguageServiceHost: ServerLanguageServiceHost;
+    interface ProjectOptions {
+        configHasFilesProperty?: boolean;
+        files?: string[];
+        wildcardDirectories?: Map<WatchDirectoryFlags>;
+        compilerOptions?: CompilerOptions;
+        typingOptions?: TypingOptions;
+        compileOnSave?: boolean;
+    }
+    function isInferredProjectName(name: string): boolean;
+    function makeInferredProjectName(counter: number): string;
+    function toSortedReadonlyArray(arr: string[]): SortedReadonlyArray<string>;
+    class ThrottledOperations {
+        private readonly host;
+        private pendingTimeouts;
+        constructor(host: ServerHost);
+        schedule(operationId: string, delay: number, cb: () => void): void;
+        private static run(self, operationId, cb);
+    }
+    class GcTimer {
+        private readonly host;
+        private readonly delay;
+        private readonly logger;
+        private timerId;
+        constructor(host: ServerHost, delay: number, logger: Logger);
+        scheduleCollect(): void;
+        private static run(self);
+    }
+}
+declare namespace ts {
+    function trace(host: ModuleResolutionHost, message: DiagnosticMessage, ...args: any[]): void;
+    function isTraceEnabled(compilerOptions: CompilerOptions, host: ModuleResolutionHost): boolean;
+    function getEffectiveTypeRoots(options: CompilerOptions, host: {
+        directoryExists?: (directoryName: string) => boolean;
+        getCurrentDirectory?: () => string;
+    }): string[] | undefined;
+    function resolveTypeReferenceDirective(typeReferenceDirectiveName: string, containingFile: string | undefined, options: CompilerOptions, host: ModuleResolutionHost): ResolvedTypeReferenceDirectiveWithFailedLookupLocations;
+    function getAutomaticTypeDirectiveNames(options: CompilerOptions, host: ModuleResolutionHost): string[];
+    function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations;
+    function nodeModuleNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations;
+    function directoryProbablyExists(directoryName: string, host: {
+        directoryExists?: (directoryName: string) => boolean;
+    }): boolean;
+    function classicNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations;
+    function loadModuleFromGlobalCache(moduleName: string, projectName: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, globalCache: string): ResolvedModuleWithFailedLookupLocations;
+}
+declare namespace ts {
+    const externalHelpersModuleNameText = "tslib";
+    interface ReferencePathMatchResult {
+        fileReference?: FileReference;
+        diagnosticMessage?: DiagnosticMessage;
+        isNoDefaultLib?: boolean;
+        isTypeReferenceDirective?: boolean;
+    }
+    function getDeclarationOfKind(symbol: Symbol, kind: SyntaxKind): Declaration;
+    interface StringSymbolWriter extends SymbolWriter {
+        string(): string;
+    }
+    interface EmitHost extends ScriptReferenceHost {
+        getSourceFiles(): SourceFile[];
+        isSourceFileFromExternalLibrary(file: SourceFile): boolean;
+        getCommonSourceDirectory(): string;
+        getCanonicalFileName(fileName: string): string;
+        getNewLine(): string;
+        isEmitBlocked(emitFileName: string): boolean;
+        writeFile: WriteFileCallback;
+    }
+    function getSingleLineStringWriter(): StringSymbolWriter;
+    function releaseStringWriter(writer: StringSymbolWriter): void;
+    function getFullWidth(node: Node): number;
+    function hasResolvedModule(sourceFile: SourceFile, moduleNameText: string): boolean;
+    function getResolvedModule(sourceFile: SourceFile, moduleNameText: string): ResolvedModuleFull;
+    function setResolvedModule(sourceFile: SourceFile, moduleNameText: string, resolvedModule: ResolvedModuleFull): void;
+    function setResolvedTypeReferenceDirective(sourceFile: SourceFile, typeReferenceDirectiveName: string, resolvedTypeReferenceDirective: ResolvedTypeReferenceDirective): void;
+    function moduleResolutionIsEqualTo(oldResolution: ResolvedModuleFull, newResolution: ResolvedModuleFull): boolean;
+    function typeDirectiveIsEqualTo(oldResolution: ResolvedTypeReferenceDirective, newResolution: ResolvedTypeReferenceDirective): boolean;
+    function hasChangesInResolutions<T>(names: string[], newResolutions: T[], oldResolutions: Map<T>, comparer: (oldResolution: T, newResolution: T) => boolean): boolean;
+    function containsParseError(node: Node): boolean;
+    function getSourceFileOfNode(node: Node): SourceFile;
+    function isStatementWithLocals(node: Node): boolean;
+    function getStartPositionOfLine(line: number, sourceFile: SourceFile): number;
+    function nodePosToString(node: Node): string;
+    function getStartPosOfNode(node: Node): number;
+    function isDefined(value: any): boolean;
+    function getEndLinePosition(line: number, sourceFile: SourceFile): number;
+    function nodeIsMissing(node: Node): boolean;
+    function nodeIsPresent(node: Node): boolean;
+    function getTokenPosOfNode(node: Node, sourceFile?: SourceFile, includeJsDocComment?: boolean): number;
+    function isJSDocNode(node: Node): boolean;
+    function isJSDocTag(node: Node): boolean;
+    function getNonDecoratorTokenPosOfNode(node: Node, sourceFile?: SourceFile): number;
+    function getSourceTextOfNodeFromSourceFile(sourceFile: SourceFile, node: Node, includeTrivia?: boolean): string;
+    function getTextOfNodeFromSourceText(sourceText: string, node: Node): string;
+    function getTextOfNode(node: Node, includeTrivia?: boolean): string;
+    function getLiteralText(node: LiteralLikeNode, sourceFile: SourceFile, languageVersion: ScriptTarget): string;
+    function isBinaryOrOctalIntegerLiteral(node: LiteralLikeNode, text: string): boolean;
+    function escapeIdentifier(identifier: string): string;
+    function unescapeIdentifier(identifier: string): string;
+    function makeIdentifierFromModuleName(moduleName: string): string;
+    function isBlockOrCatchScoped(declaration: Declaration): boolean;
+    function isCatchClauseVariableDeclarationOrBindingElement(declaration: Declaration): boolean;
+    function isAmbientModule(node: Node): boolean;
+    function isShorthandAmbientModuleSymbol(moduleSymbol: Symbol): boolean;
+    function isBlockScopedContainerTopLevel(node: Node): boolean;
+    function isGlobalScopeAugmentation(module: ModuleDeclaration): boolean;
+    function isExternalModuleAugmentation(node: Node): boolean;
+    function isBlockScope(node: Node, parentNode: Node): boolean;
+    function getEnclosingBlockScopeContainer(node: Node): Node;
+    function declarationNameToString(name: DeclarationName): string;
+    function getTextOfPropertyName(name: PropertyName): string;
+    function entityNameToString(name: EntityNameOrEntityNameExpression): string;
+    function createDiagnosticForNode(node: Node, message: DiagnosticMessage, arg0?: string | number, arg1?: string | number, arg2?: string | number): Diagnostic;
+    function createDiagnosticForNodeInSourceFile(sourceFile: SourceFile, node: Node, message: DiagnosticMessage, arg0?: string | number, arg1?: string | number, arg2?: string | number): Diagnostic;
+    function createDiagnosticForNodeFromMessageChain(node: Node, messageChain: DiagnosticMessageChain): Diagnostic;
+    function getSpanOfTokenAtPosition(sourceFile: SourceFile, pos: number): TextSpan;
+    function getErrorSpanForNode(sourceFile: SourceFile, node: Node): TextSpan;
+    function isExternalOrCommonJsModule(file: SourceFile): boolean;
+    function isDeclarationFile(file: SourceFile): boolean;
+    function isConstEnumDeclaration(node: Node): boolean;
+    function isConst(node: Node): boolean;
+    function isLet(node: Node): boolean;
+    function isSuperCall(n: Node): n is SuperCall;
+    function isPrologueDirective(node: Node): boolean;
+    function getLeadingCommentRangesOfNode(node: Node, sourceFileOfNode: SourceFile): CommentRange[];
+    function getLeadingCommentRangesOfNodeFromText(node: Node, text: string): CommentRange[];
+    function getJsDocComments(node: Node, sourceFileOfNode: SourceFile): CommentRange[];
+    function getJsDocCommentsFromText(node: Node, text: string): CommentRange[];
+    let fullTripleSlashReferencePathRegEx: RegExp;
+    let fullTripleSlashReferenceTypeReferenceDirectiveRegEx: RegExp;
+    let fullTripleSlashAMDReferencePathRegEx: RegExp;
+    function isPartOfTypeNode(node: Node): boolean;
+    function forEachReturnStatement<T>(body: Block, visitor: (stmt: ReturnStatement) => T): T;
+    function forEachYieldExpression(body: Block, visitor: (expr: YieldExpression) => void): void;
+    function isVariableLike(node: Node): node is VariableLikeDeclaration;
+    function isAccessor(node: Node): node is AccessorDeclaration;
+    function isClassLike(node: Node): node is ClassLikeDeclaration;
+    function isFunctionLike(node: Node): node is FunctionLikeDeclaration;
+    function isFunctionLikeKind(kind: SyntaxKind): boolean;
+    function introducesArgumentsExoticObject(node: Node): boolean;
+    function isIterationStatement(node: Node, lookInLabeledStatements: boolean): node is IterationStatement;
+    function isFunctionBlock(node: Node): boolean;
+    function isObjectLiteralMethod(node: Node): node is MethodDeclaration;
+    function isObjectLiteralOrClassExpressionMethod(node: Node): node is MethodDeclaration;
+    function isIdentifierTypePredicate(predicate: TypePredicate): predicate is IdentifierTypePredicate;
+    function isThisTypePredicate(predicate: TypePredicate): predicate is ThisTypePredicate;
+    function getContainingFunction(node: Node): FunctionLikeDeclaration;
+    function getContainingClass(node: Node): ClassLikeDeclaration;
+    function getThisContainer(node: Node, includeArrowFunctions: boolean): Node;
+    function getSuperContainer(node: Node, stopOnFunctions: boolean): Node;
+    function getImmediatelyInvokedFunctionExpression(func: Node): CallExpression;
+    function isSuperProperty(node: Node): node is SuperProperty;
+    function getEntityNameFromTypeNode(node: TypeNode): EntityNameOrEntityNameExpression;
+    function isCallLikeExpression(node: Node): node is CallLikeExpression;
+    function getInvokedExpression(node: CallLikeExpression): Expression;
+    function nodeCanBeDecorated(node: Node): boolean;
+    function nodeIsDecorated(node: Node): boolean;
+    function nodeOrChildIsDecorated(node: Node): boolean;
+    function childIsDecorated(node: Node): boolean;
+    function isJSXTagName(node: Node): boolean;
+    function isPartOfExpression(node: Node): boolean;
+    function isInstantiatedModule(node: ModuleDeclaration, preserveConstEnums: boolean): boolean;
+    function isExternalModuleImportEqualsDeclaration(node: Node): boolean;
+    function getExternalModuleImportEqualsDeclarationExpression(node: Node): Expression;
+    function isInternalModuleImportEqualsDeclaration(node: Node): node is ImportEqualsDeclaration;
+    function isSourceFileJavaScript(file: SourceFile): boolean;
+    function isInJavaScriptFile(node: Node): boolean;
+    function isRequireCall(expression: Node, checkArgumentIsStringLiteral: boolean): expression is CallExpression;
+    function isSingleOrDoubleQuote(charCode: number): boolean;
+    function isDeclarationOfFunctionExpression(s: Symbol): boolean;
+    function getSpecialPropertyAssignmentKind(expression: Node): SpecialPropertyAssignmentKind;
+    function getExternalModuleName(node: Node): Expression;
+    function getNamespaceDeclarationNode(node: ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration): ImportEqualsDeclaration | NamespaceImport;
+    function isDefaultImport(node: ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration): boolean;
+    function hasQuestionToken(node: Node): boolean;
+    function isJSDocConstructSignature(node: Node): boolean;
+    function getJSDocComments(node: Node, checkParentVariableStatement: boolean): string[];
+    function getJSDocTypeTag(node: Node): JSDocTypeTag;
+    function getJSDocReturnTag(node: Node): JSDocReturnTag;
+    function getJSDocTemplateTag(node: Node): JSDocTemplateTag;
+    function getCorrespondingJSDocParameterTag(parameter: ParameterDeclaration): JSDocParameterTag;
+    function hasRestParameter(s: SignatureDeclaration): boolean;
+    function hasDeclaredRestParameter(s: SignatureDeclaration): boolean;
+    function isRestParameter(node: ParameterDeclaration): boolean;
+    function isDeclaredRestParam(node: ParameterDeclaration): boolean;
+    const enum AssignmentKind {
+        None = 0,
+        Definite = 1,
+        Compound = 2,
+    }
+    function getAssignmentTargetKind(node: Node): AssignmentKind;
+    function isAssignmentTarget(node: Node): boolean;
+    function isNodeDescendantOf(node: Node, ancestor: Node): boolean;
+    function isInAmbientContext(node: Node): boolean;
+    function isDeclarationName(name: Node): boolean;
+    function isLiteralComputedPropertyDeclarationName(node: Node): boolean;
+    function isIdentifierName(node: Identifier): boolean;
+    function isAliasSymbolDeclaration(node: Node): boolean;
+    function exportAssignmentIsAlias(node: ExportAssignment): boolean;
+    function getClassExtendsHeritageClauseElement(node: ClassLikeDeclaration | InterfaceDeclaration): ExpressionWithTypeArguments;
+    function getClassImplementsHeritageClauseElements(node: ClassLikeDeclaration): NodeArray<ExpressionWithTypeArguments>;
+    function getInterfaceBaseTypeNodes(node: InterfaceDeclaration): NodeArray<ExpressionWithTypeArguments>;
+    function getHeritageClause(clauses: NodeArray<HeritageClause>, kind: SyntaxKind): HeritageClause;
+    function tryResolveScriptReference(host: ScriptReferenceHost, sourceFile: SourceFile, reference: FileReference): SourceFile;
+    function getAncestor(node: Node, kind: SyntaxKind): Node;
+    function getFileReferenceFromReferencePath(comment: string, commentRange: CommentRange): ReferencePathMatchResult;
+    function isKeyword(token: SyntaxKind): boolean;
+    function isTrivia(token: SyntaxKind): boolean;
+    function isAsyncFunctionLike(node: Node): boolean;
+    function isStringOrNumericLiteral(kind: SyntaxKind): boolean;
+    function hasDynamicName(declaration: Declaration): boolean;
+    function isDynamicName(name: DeclarationName): boolean;
+    function isWellKnownSymbolSyntactically(node: Expression): boolean;
+    function getPropertyNameForPropertyNameNode(name: DeclarationName): string;
+    function getPropertyNameForKnownSymbolName(symbolName: string): string;
+    function isESSymbolIdentifier(node: Node): boolean;
+    function isPushOrUnshiftIdentifier(node: Identifier): boolean;
+    function isModifierKind(token: SyntaxKind): boolean;
+    function isParameterDeclaration(node: VariableLikeDeclaration): boolean;
+    function getRootDeclaration(node: Node): Node;
+    function nodeStartsNewLexicalEnvironment(node: Node): boolean;
+    function nodeIsSynthesized(node: TextRange): boolean;
+    function getOriginalNode(node: Node): Node;
+    function getOriginalNode<T extends Node>(node: Node, nodeTest: (node: Node) => node is T): T;
+    function isParseTreeNode(node: Node): boolean;
+    function getParseTreeNode(node: Node): Node;
+    function getParseTreeNode<T extends Node>(node: Node, nodeTest?: (node: Node) => node is T): T;
+    function getOriginalSourceFiles(sourceFiles: SourceFile[]): SourceFile[];
+    function getOriginalNodeId(node: Node): number;
+    const enum Associativity {
+        Left = 0,
+        Right = 1,
+    }
+    function getExpressionAssociativity(expression: Expression): Associativity;
+    function getOperatorAssociativity(kind: SyntaxKind, operator: SyntaxKind, hasArguments?: boolean): Associativity;
+    function getExpressionPrecedence(expression: Expression): 0 | 1 | -1 | 2 | 4 | 3 | 16 | 10 | 5 | 6 | 11 | 8 | 19 | 18 | 17 | 15 | 14 | 13 | 12 | 9 | 7;
+    function getOperator(expression: Expression): SyntaxKind.Unknown | SyntaxKind.EndOfFileToken | SyntaxKind.SingleLineCommentTrivia | SyntaxKind.MultiLineCommentTrivia | SyntaxKind.NewLineTrivia | SyntaxKind.WhitespaceTrivia | SyntaxKind.ShebangTrivia | SyntaxKind.ConflictMarkerTrivia | SyntaxKind.NumericLiteral | SyntaxKind.StringLiteral | SyntaxKind.JsxText | SyntaxKind.RegularExpressionLiteral | SyntaxKind.NoSubstitutionTemplateLiteral | SyntaxKind.TemplateHead | SyntaxKind.TemplateMiddle | SyntaxKind.TemplateTail | SyntaxKind.OpenBraceToken | SyntaxKind.CloseBraceToken | SyntaxKind.OpenParenToken | SyntaxKind.CloseParenToken | SyntaxKind.OpenBracketToken | SyntaxKind.CloseBracketToken | SyntaxKind.DotToken | SyntaxKind.DotDotDotToken | SyntaxKind.SemicolonToken | SyntaxKind.CommaToken | SyntaxKind.LessThanToken | SyntaxKind.LessThanSlashToken | SyntaxKind.GreaterThanToken | SyntaxKind.LessThanEqualsToken | SyntaxKind.GreaterThanEqualsToken | SyntaxKind.EqualsEqualsToken | SyntaxKind.ExclamationEqualsToken | SyntaxKind.EqualsEqualsEqualsToken | SyntaxKind.ExclamationEqualsEqualsToken | SyntaxKind.EqualsGreaterThanToken | SyntaxKind.PlusToken | SyntaxKind.MinusToken | SyntaxKind.AsteriskToken | SyntaxKind.AsteriskAsteriskToken | SyntaxKind.SlashToken | SyntaxKind.PercentToken | SyntaxKind.PlusPlusToken | SyntaxKind.MinusMinusToken | SyntaxKind.LessThanLessThanToken | SyntaxKind.GreaterThanGreaterThanToken | SyntaxKind.GreaterThanGreaterThanGreaterThanToken | SyntaxKind.AmpersandToken | SyntaxKind.BarToken | SyntaxKind.CaretToken | SyntaxKind.ExclamationToken | SyntaxKind.TildeToken | SyntaxKind.AmpersandAmpersandToken | SyntaxKind.BarBarToken | SyntaxKind.QuestionToken | SyntaxKind.ColonToken | SyntaxKind.AtToken | SyntaxKind.EqualsToken | SyntaxKind.PlusEqualsToken | SyntaxKind.MinusEqualsToken | SyntaxKind.AsteriskEqualsToken | SyntaxKind.AsteriskAsteriskEqualsToken | SyntaxKind.SlashEqualsToken | SyntaxKind.PercentEqualsToken | SyntaxKind.LessThanLessThanEqualsToken | SyntaxKind.GreaterThanGreaterThanEqualsToken | SyntaxKind.GreaterThanGreaterThanGreaterThanEqualsToken | SyntaxKind.AmpersandEqualsToken | SyntaxKind.BarEqualsToken | SyntaxKind.CaretEqualsToken | SyntaxKind.Identifier | SyntaxKind.BreakKeyword | SyntaxKind.CaseKeyword | SyntaxKind.CatchKeyword | SyntaxKind.ClassKeyword | SyntaxKind.ConstKeyword | SyntaxKind.ContinueKeyword | SyntaxKind.DebuggerKeyword | SyntaxKind.DefaultKeyword | SyntaxKind.DeleteKeyword | SyntaxKind.DoKeyword | SyntaxKind.ElseKeyword | SyntaxKind.EnumKeyword | SyntaxKind.ExportKeyword | SyntaxKind.ExtendsKeyword | SyntaxKind.FalseKeyword | SyntaxKind.FinallyKeyword | SyntaxKind.ForKeyword | SyntaxKind.FunctionKeyword | SyntaxKind.IfKeyword | SyntaxKind.ImportKeyword | SyntaxKind.InKeyword | SyntaxKind.InstanceOfKeyword | SyntaxKind.NewKeyword | SyntaxKind.NullKeyword | SyntaxKind.ReturnKeyword | SyntaxKind.SuperKeyword | SyntaxKind.SwitchKeyword | SyntaxKind.ThisKeyword | SyntaxKind.ThrowKeyword | SyntaxKind.TrueKeyword | SyntaxKind.TryKeyword | SyntaxKind.TypeOfKeyword | SyntaxKind.VarKeyword | SyntaxKind.VoidKeyword | SyntaxKind.WhileKeyword | SyntaxKind.WithKeyword | SyntaxKind.ImplementsKeyword | SyntaxKind.InterfaceKeyword | SyntaxKind.LetKeyword | SyntaxKind.PackageKeyword | SyntaxKind.PrivateKeyword | SyntaxKind.ProtectedKeyword | SyntaxKind.PublicKeyword | SyntaxKind.StaticKeyword | SyntaxKind.YieldKeyword | SyntaxKind.AbstractKeyword | SyntaxKind.AsKeyword | SyntaxKind.AnyKeyword | SyntaxKind.AsyncKeyword | SyntaxKind.AwaitKeyword | SyntaxKind.BooleanKeyword | SyntaxKind.ConstructorKeyword | SyntaxKind.DeclareKeyword | SyntaxKind.GetKeyword | SyntaxKind.IsKeyword | SyntaxKind.KeyOfKeyword | SyntaxKind.ModuleKeyword | SyntaxKind.NamespaceKeyword | SyntaxKind.NeverKeyword | SyntaxKind.ReadonlyKeyword | SyntaxKind.RequireKeyword | SyntaxKind.NumberKeyword | SyntaxKind.SetKeyword | SyntaxKind.StringKeyword | SyntaxKind.SymbolKeyword | SyntaxKind.TypeKeyword | SyntaxKind.UndefinedKeyword | SyntaxKind.FromKeyword | SyntaxKind.GlobalKeyword | SyntaxKind.OfKeyword | SyntaxKind.QualifiedName | SyntaxKind.ComputedPropertyName | SyntaxKind.TypeParameter | SyntaxKind.Parameter | SyntaxKind.Decorator | SyntaxKind.PropertySignature | SyntaxKind.PropertyDeclaration | SyntaxKind.MethodSignature | SyntaxKind.MethodDeclaration | SyntaxKind.Constructor | SyntaxKind.GetAccessor | SyntaxKind.SetAccessor | SyntaxKind.CallSignature | SyntaxKind.ConstructSignature | SyntaxKind.IndexSignature | SyntaxKind.TypePredicate | SyntaxKind.TypeReference | SyntaxKind.FunctionType | SyntaxKind.ConstructorType | SyntaxKind.TypeQuery | SyntaxKind.TypeLiteral | SyntaxKind.ArrayType | SyntaxKind.TupleType | SyntaxKind.UnionType | SyntaxKind.IntersectionType | SyntaxKind.ParenthesizedType | SyntaxKind.ThisType | SyntaxKind.TypeOperator | SyntaxKind.IndexedAccessType | SyntaxKind.MappedType | SyntaxKind.LiteralType | SyntaxKind.ObjectBindingPattern | SyntaxKind.ArrayBindingPattern | SyntaxKind.BindingElement | SyntaxKind.ArrayLiteralExpression | SyntaxKind.ObjectLiteralExpression | SyntaxKind.PropertyAccessExpression | SyntaxKind.ElementAccessExpression | SyntaxKind.CallExpression | SyntaxKind.NewExpression | SyntaxKind.TaggedTemplateExpression | SyntaxKind.TypeAssertionExpression | SyntaxKind.ParenthesizedExpression | SyntaxKind.FunctionExpression | SyntaxKind.ArrowFunction | SyntaxKind.DeleteExpression | SyntaxKind.TypeOfExpression | SyntaxKind.VoidExpression | SyntaxKind.AwaitExpression | SyntaxKind.ConditionalExpression | SyntaxKind.TemplateExpression | SyntaxKind.YieldExpression | SyntaxKind.SpreadElement | SyntaxKind.ClassExpression | SyntaxKind.OmittedExpression | SyntaxKind.ExpressionWithTypeArguments | SyntaxKind.AsExpression | SyntaxKind.NonNullExpression | SyntaxKind.TemplateSpan | SyntaxKind.SemicolonClassElement | SyntaxKind.Block | SyntaxKind.VariableStatement | SyntaxKind.EmptyStatement | SyntaxKind.ExpressionStatement | SyntaxKind.IfStatement | SyntaxKind.DoStatement | SyntaxKind.WhileStatement | SyntaxKind.ForStatement | SyntaxKind.ForInStatement | SyntaxKind.ForOfStatement | SyntaxKind.ContinueStatement | SyntaxKind.BreakStatement | SyntaxKind.ReturnStatement | SyntaxKind.WithStatement | SyntaxKind.SwitchStatement | SyntaxKind.LabeledStatement | SyntaxKind.ThrowStatement | SyntaxKind.TryStatement | SyntaxKind.DebuggerStatement | SyntaxKind.VariableDeclaration | SyntaxKind.VariableDeclarationList | SyntaxKind.FunctionDeclaration | SyntaxKind.ClassDeclaration | SyntaxKind.InterfaceDeclaration | SyntaxKind.TypeAliasDeclaration | SyntaxKind.EnumDeclaration | SyntaxKind.ModuleDeclaration | SyntaxKind.ModuleBlock | SyntaxKind.CaseBlock | SyntaxKind.NamespaceExportDeclaration | SyntaxKind.ImportEqualsDeclaration | SyntaxKind.ImportDeclaration | SyntaxKind.ImportClause | SyntaxKind.NamespaceImport | SyntaxKind.NamedImports | SyntaxKind.ImportSpecifier | SyntaxKind.ExportAssignment | SyntaxKind.ExportDeclaration | SyntaxKind.NamedExports | SyntaxKind.ExportSpecifier | SyntaxKind.MissingDeclaration | SyntaxKind.ExternalModuleReference | SyntaxKind.JsxElement | SyntaxKind.JsxSelfClosingElement | SyntaxKind.JsxOpeningElement | SyntaxKind.JsxClosingElement | SyntaxKind.JsxAttribute | SyntaxKind.JsxSpreadAttribute | SyntaxKind.JsxExpression | SyntaxKind.CaseClause | SyntaxKind.DefaultClause | SyntaxKind.HeritageClause | SyntaxKind.CatchClause | SyntaxKind.PropertyAssignment | SyntaxKind.ShorthandPropertyAssignment | SyntaxKind.SpreadAssignment | SyntaxKind.EnumMember | SyntaxKind.SourceFile | SyntaxKind.JSDocTypeExpression | SyntaxKind.JSDocAllType | SyntaxKind.JSDocUnknownType | SyntaxKind.JSDocArrayType | SyntaxKind.JSDocUnionType | SyntaxKind.JSDocTupleType | SyntaxKind.JSDocNullableType | SyntaxKind.JSDocNonNullableType | SyntaxKind.JSDocRecordType | SyntaxKind.JSDocRecordMember | SyntaxKind.JSDocTypeReference | SyntaxKind.JSDocOptionalType | SyntaxKind.JSDocFunctionType | SyntaxKind.JSDocVariadicType | SyntaxKind.JSDocConstructorType | SyntaxKind.JSDocThisType | SyntaxKind.JSDocComment | SyntaxKind.JSDocTag | SyntaxKind.JSDocParameterTag | SyntaxKind.JSDocReturnTag | SyntaxKind.JSDocTypeTag | SyntaxKind.JSDocTemplateTag | SyntaxKind.JSDocTypedefTag | SyntaxKind.JSDocPropertyTag | SyntaxKind.JSDocTypeLiteral | SyntaxKind.JSDocLiteralType | SyntaxKind.JSDocNullKeyword | SyntaxKind.JSDocUndefinedKeyword | SyntaxKind.JSDocNeverKeyword | SyntaxKind.SyntaxList | SyntaxKind.NotEmittedStatement | SyntaxKind.PartiallyEmittedExpression | SyntaxKind.MergeDeclarationMarker | SyntaxKind.EndOfDeclarationMarker | SyntaxKind.Count;
+    function getOperatorPrecedence(nodeKind: SyntaxKind, operatorKind: SyntaxKind, hasArguments?: boolean): 0 | 1 | -1 | 2 | 4 | 3 | 16 | 10 | 5 | 6 | 11 | 8 | 19 | 18 | 17 | 15 | 14 | 13 | 12 | 9 | 7;
+    function createDiagnosticCollection(): DiagnosticCollection;
+    function escapeString(s: string): string;
+    function isIntrinsicJsxName(name: string): boolean;
+    function escapeNonAsciiCharacters(s: string): string;
+    interface EmitTextWriter {
+        write(s: string): void;
+        writeTextOfNode(text: string, node: Node): void;
+        writeLine(): void;
+        increaseIndent(): void;
+        decreaseIndent(): void;
+        getText(): string;
+        rawWrite(s: string): void;
+        writeLiteral(s: string): void;
+        getTextPos(): number;
+        getLine(): number;
+        getColumn(): number;
+        getIndent(): number;
+        isAtStartOfLine(): boolean;
+        reset(): void;
+    }
+    function getIndentString(level: number): string;
+    function getIndentSize(): number;
+    function createTextWriter(newLine: String): EmitTextWriter;
+    function getResolvedExternalModuleName(host: EmitHost, file: SourceFile): string;
+    function getExternalModuleNameFromDeclaration(host: EmitHost, resolver: EmitResolver, declaration: ImportEqualsDeclaration | ImportDeclaration | ExportDeclaration | ModuleDeclaration): string;
+    function getExternalModuleNameFromPath(host: EmitHost, fileName: string): string;
+    function getOwnEmitOutputFilePath(sourceFile: SourceFile, host: EmitHost, extension: string): string;
+    function getDeclarationEmitOutputFilePath(sourceFile: SourceFile, host: EmitHost): string;
+    interface EmitFileNames {
+        jsFilePath: string;
+        sourceMapFilePath: string;
+        declarationFilePath: string;
+    }
+    function getSourceFilesToEmit(host: EmitHost, targetSourceFile?: SourceFile): SourceFile[];
+    function filterSourceFilesInDirectory(sourceFiles: SourceFile[], isSourceFileFromExternalLibrary: (file: SourceFile) => boolean): SourceFile[];
+    function forEachTransformedEmitFile(host: EmitHost, sourceFiles: SourceFile[], action: (jsFilePath: string, sourceMapFilePath: string, declarationFilePath: string, sourceFiles: SourceFile[], isBundledEmit: boolean) => void, emitOnlyDtsFiles?: boolean): void;
+    function forEachExpectedEmitFile(host: EmitHost, action: (emitFileNames: EmitFileNames, sourceFiles: SourceFile[], isBundledEmit: boolean, emitOnlyDtsFiles: boolean) => void, targetSourceFile?: SourceFile, emitOnlyDtsFiles?: boolean): void;
+    function getSourceFilePathInNewDir(sourceFile: SourceFile, host: EmitHost, newDirPath: string): string;
+    function writeFile(host: EmitHost, diagnostics: DiagnosticCollection, fileName: string, data: string, writeByteOrderMark: boolean, sourceFiles?: SourceFile[]): void;
+    function getLineOfLocalPosition(currentSourceFile: SourceFile, pos: number): number;
+    function getLineOfLocalPositionFromLineMap(lineMap: number[], pos: number): number;
+    function getFirstConstructorWithBody(node: ClassLikeDeclaration): ConstructorDeclaration;
+    function getSetAccessorTypeAnnotationNode(accessor: SetAccessorDeclaration): TypeNode;
+    function getThisParameter(signature: SignatureDeclaration): ParameterDeclaration | undefined;
+    function parameterIsThisKeyword(parameter: ParameterDeclaration): boolean;
+    function isThisIdentifier(node: Node | undefined): boolean;
+    function identifierIsThisKeyword(id: Identifier): boolean;
+    interface AllAccessorDeclarations {
+        firstAccessor: AccessorDeclaration;
+        secondAccessor: AccessorDeclaration;
+        getAccessor: AccessorDeclaration;
+        setAccessor: AccessorDeclaration;
+    }
+    function getAllAccessorDeclarations(declarations: NodeArray<Declaration>, accessor: AccessorDeclaration): AllAccessorDeclarations;
+    function emitNewLineBeforeLeadingComments(lineMap: number[], writer: EmitTextWriter, node: TextRange, leadingComments: CommentRange[]): void;
+    function emitNewLineBeforeLeadingCommentsOfPosition(lineMap: number[], writer: EmitTextWriter, pos: number, leadingComments: CommentRange[]): void;
+    function emitNewLineBeforeLeadingCommentOfPosition(lineMap: number[], writer: EmitTextWriter, pos: number, commentPos: number): void;
+    function emitComments(text: string, lineMap: number[], writer: EmitTextWriter, comments: CommentRange[], leadingSeparator: boolean, trailingSeparator: boolean, newLine: string, writeComment: (text: string, lineMap: number[], writer: EmitTextWriter, commentPos: number, commentEnd: number, newLine: string) => void): void;
+    function emitDetachedComments(text: string, lineMap: number[], writer: EmitTextWriter, writeComment: (text: string, lineMap: number[], writer: EmitTextWriter, commentPos: number, commentEnd: number, newLine: string) => void, node: TextRange, newLine: string, removeComments: boolean): {
+        nodePos: number;
+        detachedCommentEndPos: number;
+    };
+    function writeCommentRange(text: string, lineMap: number[], writer: EmitTextWriter, commentPos: number, commentEnd: number, newLine: string): void;
+    function hasModifiers(node: Node): boolean;
+    function hasModifier(node: Node, flags: ModifierFlags): boolean;
+    function getModifierFlags(node: Node): ModifierFlags;
+    function modifierToFlag(token: SyntaxKind): ModifierFlags;
+    function isLogicalOperator(token: SyntaxKind): boolean;
+    function isAssignmentOperator(token: SyntaxKind): boolean;
+    function tryGetClassExtendingExpressionWithTypeArguments(node: Node): ClassLikeDeclaration | undefined;
+    function isAssignmentExpression(node: Node): node is AssignmentExpression;
+    function isDestructuringAssignment(node: Node): node is DestructuringAssignment;
+    function isSupportedExpressionWithTypeArguments(node: ExpressionWithTypeArguments): boolean;
+    function isExpressionWithTypeArgumentsInClassExtendsClause(node: Node): boolean;
+    function isEntityNameExpression(node: Expression): node is EntityNameExpression;
+    function isRightSideOfQualifiedNameOrPropertyAccess(node: Node): boolean;
+    function isEmptyObjectLiteralOrArrayLiteral(expression: Node): boolean;
+    function getLocalSymbolForExportDefault(symbol: Symbol): Symbol;
+    function tryExtractTypeScriptExtension(fileName: string): string | undefined;
+    const stringify: (value: any) => string;
+    function convertToBase64(input: string): string;
+    function getNewLineCharacter(options: CompilerOptions): string;
+    function isSimpleExpression(node: Expression): boolean;
+    function formatSyntaxKind(kind: SyntaxKind): string;
+    function movePos(pos: number, value: number): number;
+    function createRange(pos: number, end: number): TextRange;
+    function moveRangeEnd(range: TextRange, end: number): TextRange;
+    function moveRangePos(range: TextRange, pos: number): TextRange;
+    function moveRangePastDecorators(node: Node): TextRange;
+    function moveRangePastModifiers(node: Node): TextRange;
+    function isCollapsedRange(range: TextRange): boolean;
+    function collapseRangeToStart(range: TextRange): TextRange;
+    function collapseRangeToEnd(range: TextRange): TextRange;
+    function createTokenRange(pos: number, token: SyntaxKind): TextRange;
+    function rangeIsOnSingleLine(range: TextRange, sourceFile: SourceFile): boolean;
+    function rangeStartPositionsAreOnSameLine(range1: TextRange, range2: TextRange, sourceFile: SourceFile): boolean;
+    function rangeEndPositionsAreOnSameLine(range1: TextRange, range2: TextRange, sourceFile: SourceFile): boolean;
+    function rangeStartIsOnSameLineAsRangeEnd(range1: TextRange, range2: TextRange, sourceFile: SourceFile): boolean;
+    function rangeEndIsOnSameLineAsRangeStart(range1: TextRange, range2: TextRange, sourceFile: SourceFile): boolean;
+    function positionsAreOnSameLine(pos1: number, pos2: number, sourceFile: SourceFile): boolean;
+    function getStartPositionOfRange(range: TextRange, sourceFile: SourceFile): number;
+    interface ExternalModuleInfo {
+        externalImports: (ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration)[];
+        exportSpecifiers: Map<ExportSpecifier[]>;
+        exportedBindings: Map<Identifier[]>;
+        exportedNames: Identifier[];
+        exportEquals: ExportAssignment | undefined;
+        hasExportStarsToExportValues: boolean;
+    }
+    function collectExternalModuleInfo(sourceFile: SourceFile, resolver: EmitResolver): ExternalModuleInfo;
+    function isDeclarationNameOfEnumOrNamespace(node: Identifier): boolean;
+    function getInitializedVariables(node: VariableDeclarationList): VariableDeclaration[];
+    function isMergedWithClass(node: Node): boolean;
+    function isFirstDeclarationOfKind(node: Node, kind: SyntaxKind): boolean;
+    function isNodeArray<T extends Node>(array: T[]): array is NodeArray<T>;
+    function isNoSubstitutionTemplateLiteral(node: Node): node is LiteralExpression;
+    function isLiteralKind(kind: SyntaxKind): boolean;
+    function isTextualLiteralKind(kind: SyntaxKind): boolean;
+    function isLiteralExpression(node: Node): node is LiteralExpression;
+    function isTemplateLiteralKind(kind: SyntaxKind): boolean;
+    function isTemplateHead(node: Node): node is TemplateHead;
+    function isTemplateMiddleOrTemplateTail(node: Node): node is TemplateMiddle | TemplateTail;
+    function isIdentifier(node: Node): node is Identifier;
+    function isGeneratedIdentifier(node: Node): node is GeneratedIdentifier;
+    function isModifier(node: Node): node is Modifier;
+    function isQualifiedName(node: Node): node is QualifiedName;
+    function isComputedPropertyName(node: Node): node is ComputedPropertyName;
+    function isEntityName(node: Node): node is EntityName;
+    function isPropertyName(node: Node): node is PropertyName;
+    function isModuleName(node: Node): node is ModuleName;
+    function isBindingName(node: Node): node is BindingName;
+    function isTypeParameter(node: Node): node is TypeParameterDeclaration;
+    function isParameter(node: Node): node is ParameterDeclaration;
+    function isDecorator(node: Node): node is Decorator;
+    function isMethodDeclaration(node: Node): node is MethodDeclaration;
+    function isClassElement(node: Node): node is ClassElement;
+    function isObjectLiteralElementLike(node: Node): node is ObjectLiteralElementLike;
+    function isTypeNode(node: Node): node is TypeNode;
+    function isBindingPattern(node: Node): node is BindingPattern;
+    function isBindingElement(node: Node): node is BindingElement;
+    function isArrayBindingElement(node: Node): node is ArrayBindingElement;
+    function isArrayLiteralExpression(node: Node): node is ArrayLiteralExpression;
+    function isObjectLiteralExpression(node: Node): node is ObjectLiteralExpression;
+    function isPropertyAccessExpression(node: Node): node is PropertyAccessExpression;
+    function isElementAccessExpression(node: Node): node is ElementAccessExpression;
+    function isBinaryExpression(node: Node): node is BinaryExpression;
+    function isConditionalExpression(node: Node): node is ConditionalExpression;
+    function isCallExpression(node: Node): node is CallExpression;
+    function isTemplateLiteral(node: Node): node is TemplateLiteral;
+    function isSpreadExpression(node: Node): node is SpreadElement;
+    function isExpressionWithTypeArguments(node: Node): node is ExpressionWithTypeArguments;
+    function isLeftHandSideExpression(node: Node): node is LeftHandSideExpression;
+    function isUnaryExpression(node: Node): node is UnaryExpression;
+    function isExpression(node: Node): node is Expression;
+    function isAssertionExpression(node: Node): node is AssertionExpression;
+    function isPartiallyEmittedExpression(node: Node): node is PartiallyEmittedExpression;
+    function isNotEmittedStatement(node: Node): node is NotEmittedStatement;
+    function isNotEmittedOrPartiallyEmittedNode(node: Node): node is NotEmittedStatement | PartiallyEmittedExpression;
+    function isOmittedExpression(node: Node): node is OmittedExpression;
+    function isTemplateSpan(node: Node): node is TemplateSpan;
+    function isBlock(node: Node): node is Block;
+    function isConciseBody(node: Node): node is ConciseBody;
+    function isFunctionBody(node: Node): node is FunctionBody;
+    function isForInitializer(node: Node): node is ForInitializer;
+    function isVariableDeclaration(node: Node): node is VariableDeclaration;
+    function isVariableDeclarationList(node: Node): node is VariableDeclarationList;
+    function isCaseBlock(node: Node): node is CaseBlock;
+    function isModuleBody(node: Node): node is ModuleBody;
+    function isImportEqualsDeclaration(node: Node): node is ImportEqualsDeclaration;
+    function isImportClause(node: Node): node is ImportClause;
+    function isNamedImportBindings(node: Node): node is NamedImportBindings;
+    function isImportSpecifier(node: Node): node is ImportSpecifier;
+    function isNamedExports(node: Node): node is NamedExports;
+    function isExportSpecifier(node: Node): node is ExportSpecifier;
+    function isModuleOrEnumDeclaration(node: Node): node is ModuleDeclaration | EnumDeclaration;
+    function isDeclaration(node: Node): node is Declaration;
+    function isDeclarationStatement(node: Node): node is DeclarationStatement;
+    function isStatementButNotDeclaration(node: Node): node is Statement;
+    function isStatement(node: Node): node is Statement;
+    function isModuleReference(node: Node): node is ModuleReference;
+    function isJsxOpeningElement(node: Node): node is JsxOpeningElement;
+    function isJsxClosingElement(node: Node): node is JsxClosingElement;
+    function isJsxTagNameExpression(node: Node): node is JsxTagNameExpression;
+    function isJsxChild(node: Node): node is JsxChild;
+    function isJsxAttributeLike(node: Node): node is JsxAttributeLike;
+    function isJsxSpreadAttribute(node: Node): node is JsxSpreadAttribute;
+    function isJsxAttribute(node: Node): node is JsxAttribute;
+    function isStringLiteralOrJsxExpression(node: Node): node is StringLiteral | JsxExpression;
+    function isCaseOrDefaultClause(node: Node): node is CaseOrDefaultClause;
+    function isHeritageClause(node: Node): node is HeritageClause;
+    function isCatchClause(node: Node): node is CatchClause;
+    function isPropertyAssignment(node: Node): node is PropertyAssignment;
+    function isShorthandPropertyAssignment(node: Node): node is ShorthandPropertyAssignment;
+    function isEnumMember(node: Node): node is EnumMember;
+    function isSourceFile(node: Node): node is SourceFile;
+    function isWatchSet(options: CompilerOptions): boolean;
+}
+declare namespace ts {
+    function getDefaultLibFileName(options: CompilerOptions): string;
+    function textSpanEnd(span: TextSpan): number;
+    function textSpanIsEmpty(span: TextSpan): boolean;
+    function textSpanContainsPosition(span: TextSpan, position: number): boolean;
+    function textSpanContainsTextSpan(span: TextSpan, other: TextSpan): boolean;
+    function textSpanOverlapsWith(span: TextSpan, other: TextSpan): boolean;
+    function textSpanOverlap(span1: TextSpan, span2: TextSpan): TextSpan;
+    function textSpanIntersectsWithTextSpan(span: TextSpan, other: TextSpan): boolean;
+    function textSpanIntersectsWith(span: TextSpan, start: number, length: number): boolean;
+    function decodedTextSpanIntersectsWith(start1: number, length1: number, start2: number, length2: number): boolean;
+    function textSpanIntersectsWithPosition(span: TextSpan, position: number): boolean;
+    function textSpanIntersection(span1: TextSpan, span2: TextSpan): TextSpan;
+    function createTextSpan(start: number, length: number): TextSpan;
+    function createTextSpanFromBounds(start: number, end: number): TextSpan;
+    function textChangeRangeNewSpan(range: TextChangeRange): TextSpan;
+    function textChangeRangeIsUnchanged(range: TextChangeRange): boolean;
+    function createTextChangeRange(span: TextSpan, newLength: number): TextChangeRange;
+    let unchangedTextChangeRange: TextChangeRange;
+    function collapseTextChangeRangesAcrossMultipleVersions(changes: TextChangeRange[]): TextChangeRange;
+    function getTypeParameterOwner(d: Declaration): Declaration;
+    function isParameterPropertyDeclaration(node: ParameterDeclaration): boolean;
+    function getCombinedModifierFlags(node: Node): ModifierFlags;
+    function getCombinedNodeFlags(node: Node): NodeFlags;
+}
+declare namespace ts {
+    function updateNode<T extends Node>(updated: T, original: T): T;
+    function createNodeArray<T extends Node>(elements?: T[], location?: TextRange, hasTrailingComma?: boolean): NodeArray<T>;
+    function createSynthesizedNode(kind: SyntaxKind, startsOnNewLine?: boolean): Node;
+    function createSynthesizedNodeArray<T extends Node>(elements?: T[]): NodeArray<T>;
+    function getSynthesizedClone<T extends Node>(node: T): T;
+    function getMutableClone<T extends Node>(node: T): T;
+    function createLiteral(textSource: StringLiteral | Identifier, location?: TextRange): StringLiteral;
+    function createLiteral(value: string, location?: TextRange): StringLiteral;
+    function createLiteral(value: number, location?: TextRange): NumericLiteral;
+    function createLiteral(value: boolean, location?: TextRange): BooleanLiteral;
+    function createLiteral(value: string | number | boolean, location?: TextRange): PrimaryExpression;
+    function createIdentifier(text: string, location?: TextRange): Identifier;
+    function createTempVariable(recordTempVariable: ((node: Identifier) => void) | undefined, location?: TextRange): Identifier;
+    function createLoopVariable(location?: TextRange): Identifier;
+    function createUniqueName(text: string, location?: TextRange): Identifier;
+    function getGeneratedNameForNode(node: Node, location?: TextRange): Identifier;
+    function createToken<TKind extends SyntaxKind>(token: TKind): Token<TKind>;
+    function createSuper(): PrimaryExpression;
+    function createThis(location?: TextRange): PrimaryExpression;
+    function createNull(): PrimaryExpression;
+    function createComputedPropertyName(expression: Expression, location?: TextRange): ComputedPropertyName;
+    function updateComputedPropertyName(node: ComputedPropertyName, expression: Expression): ComputedPropertyName;
+    function createParameter(decorators: Decorator[], modifiers: Modifier[], dotDotDotToken: DotDotDotToken, name: string | Identifier | BindingPattern, questionToken?: QuestionToken, type?: TypeNode, initializer?: Expression, location?: TextRange, flags?: NodeFlags): ParameterDeclaration;
+    function updateParameter(node: ParameterDeclaration, decorators: Decorator[], modifiers: Modifier[], name: BindingName, type: TypeNode, initializer: Expression): ParameterDeclaration;
+    function createProperty(decorators: Decorator[], modifiers: Modifier[], name: string | PropertyName, questionToken: QuestionToken, type: TypeNode, initializer: Expression, location?: TextRange): PropertyDeclaration;
+    function updateProperty(node: PropertyDeclaration, decorators: Decorator[], modifiers: Modifier[], name: PropertyName, type: TypeNode, initializer: Expression): PropertyDeclaration;
+    function createMethod(decorators: Decorator[], modifiers: Modifier[], asteriskToken: AsteriskToken, name: string | PropertyName, typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: Block, location?: TextRange, flags?: NodeFlags): MethodDeclaration;
+    function updateMethod(node: MethodDeclaration, decorators: Decorator[], modifiers: Modifier[], name: PropertyName, typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: Block): MethodDeclaration;
+    function createConstructor(decorators: Decorator[], modifiers: Modifier[], parameters: ParameterDeclaration[], body: Block, location?: TextRange, flags?: NodeFlags): ConstructorDeclaration;
+    function updateConstructor(node: ConstructorDeclaration, decorators: Decorator[], modifiers: Modifier[], parameters: ParameterDeclaration[], body: Block): ConstructorDeclaration;
+    function createGetAccessor(decorators: Decorator[], modifiers: Modifier[], name: string | PropertyName, parameters: ParameterDeclaration[], type: TypeNode, body: Block, location?: TextRange, flags?: NodeFlags): GetAccessorDeclaration;
+    function updateGetAccessor(node: GetAccessorDeclaration, decorators: Decorator[], modifiers: Modifier[], name: PropertyName, parameters: ParameterDeclaration[], type: TypeNode, body: Block): GetAccessorDeclaration;
+    function createSetAccessor(decorators: Decorator[], modifiers: Modifier[], name: string | PropertyName, parameters: ParameterDeclaration[], body: Block, location?: TextRange, flags?: NodeFlags): SetAccessorDeclaration;
+    function updateSetAccessor(node: SetAccessorDeclaration, decorators: Decorator[], modifiers: Modifier[], name: PropertyName, parameters: ParameterDeclaration[], body: Block): SetAccessorDeclaration;
+    function createObjectBindingPattern(elements: BindingElement[], location?: TextRange): ObjectBindingPattern;
+    function updateObjectBindingPattern(node: ObjectBindingPattern, elements: BindingElement[]): ObjectBindingPattern;
+    function createArrayBindingPattern(elements: ArrayBindingElement[], location?: TextRange): ArrayBindingPattern;
+    function updateArrayBindingPattern(node: ArrayBindingPattern, elements: ArrayBindingElement[]): ArrayBindingPattern;
+    function createBindingElement(propertyName: string | PropertyName, dotDotDotToken: DotDotDotToken, name: string | BindingName, initializer?: Expression, location?: TextRange): BindingElement;
+    function updateBindingElement(node: BindingElement, propertyName: PropertyName, name: BindingName, initializer: Expression): BindingElement;
+    function createArrayLiteral(elements?: Expression[], location?: TextRange, multiLine?: boolean): ArrayLiteralExpression;
+    function updateArrayLiteral(node: ArrayLiteralExpression, elements: Expression[]): ArrayLiteralExpression;
+    function createObjectLiteral(properties?: ObjectLiteralElementLike[], location?: TextRange, multiLine?: boolean): ObjectLiteralExpression;
+    function updateObjectLiteral(node: ObjectLiteralExpression, properties: ObjectLiteralElementLike[]): ObjectLiteralExpression;
+    function createPropertyAccess(expression: Expression, name: string | Identifier, location?: TextRange, flags?: NodeFlags): PropertyAccessExpression;
+    function updatePropertyAccess(node: PropertyAccessExpression, expression: Expression, name: Identifier): PropertyAccessExpression;
+    function createElementAccess(expression: Expression, index: number | Expression, location?: TextRange): ElementAccessExpression;
+    function updateElementAccess(node: ElementAccessExpression, expression: Expression, argumentExpression: Expression): ElementAccessExpression;
+    function createCall(expression: Expression, typeArguments: TypeNode[], argumentsArray: Expression[], location?: TextRange, flags?: NodeFlags): CallExpression;
+    function updateCall(node: CallExpression, expression: Expression, typeArguments: TypeNode[], argumentsArray: Expression[]): CallExpression;
+    function createNew(expression: Expression, typeArguments: TypeNode[], argumentsArray: Expression[], location?: TextRange, flags?: NodeFlags): NewExpression;
+    function updateNew(node: NewExpression, expression: Expression, typeArguments: TypeNode[], argumentsArray: Expression[]): NewExpression;
+    function createTaggedTemplate(tag: Expression, template: TemplateLiteral, location?: TextRange): TaggedTemplateExpression;
+    function updateTaggedTemplate(node: TaggedTemplateExpression, tag: Expression, template: TemplateLiteral): TaggedTemplateExpression;
+    function createParen(expression: Expression, location?: TextRange): ParenthesizedExpression;
+    function updateParen(node: ParenthesizedExpression, expression: Expression): ParenthesizedExpression;
+    function createFunctionExpression(modifiers: Modifier[], asteriskToken: AsteriskToken, name: string | Identifier, typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: Block, location?: TextRange, flags?: NodeFlags): FunctionExpression;
+    function updateFunctionExpression(node: FunctionExpression, modifiers: Modifier[], name: Identifier, typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: Block): FunctionExpression;
+    function createArrowFunction(modifiers: Modifier[], typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, equalsGreaterThanToken: EqualsGreaterThanToken, body: ConciseBody, location?: TextRange, flags?: NodeFlags): ArrowFunction;
+    function updateArrowFunction(node: ArrowFunction, modifiers: Modifier[], typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: ConciseBody): ArrowFunction;
+    function createDelete(expression: Expression, location?: TextRange): DeleteExpression;
+    function updateDelete(node: DeleteExpression, expression: Expression): Expression;
+    function createTypeOf(expression: Expression, location?: TextRange): TypeOfExpression;
+    function updateTypeOf(node: TypeOfExpression, expression: Expression): Expression;
+    function createVoid(expression: Expression, location?: TextRange): VoidExpression;
+    function updateVoid(node: VoidExpression, expression: Expression): VoidExpression;
+    function createAwait(expression: Expression, location?: TextRange): AwaitExpression;
+    function updateAwait(node: AwaitExpression, expression: Expression): AwaitExpression;
+    function createPrefix(operator: PrefixUnaryOperator, operand: Expression, location?: TextRange): PrefixUnaryExpression;
+    function updatePrefix(node: PrefixUnaryExpression, operand: Expression): PrefixUnaryExpression;
+    function createPostfix(operand: Expression, operator: PostfixUnaryOperator, location?: TextRange): PostfixUnaryExpression;
+    function updatePostfix(node: PostfixUnaryExpression, operand: Expression): PostfixUnaryExpression;
+    function createBinary(left: Expression, operator: BinaryOperator | BinaryOperatorToken, right: Expression, location?: TextRange): BinaryExpression;
+    function updateBinary(node: BinaryExpression, left: Expression, right: Expression): BinaryExpression;
+    function createConditional(condition: Expression, questionToken: QuestionToken, whenTrue: Expression, colonToken: ColonToken, whenFalse: Expression, location?: TextRange): ConditionalExpression;
+    function updateConditional(node: ConditionalExpression, condition: Expression, whenTrue: Expression, whenFalse: Expression): ConditionalExpression;
+    function createTemplateExpression(head: TemplateHead, templateSpans: TemplateSpan[], location?: TextRange): TemplateExpression;
+    function updateTemplateExpression(node: TemplateExpression, head: TemplateHead, templateSpans: TemplateSpan[]): TemplateExpression;
+    function createYield(asteriskToken: AsteriskToken, expression: Expression, location?: TextRange): YieldExpression;
+    function updateYield(node: YieldExpression, expression: Expression): YieldExpression;
+    function createSpread(expression: Expression, location?: TextRange): SpreadElement;
+    function updateSpread(node: SpreadElement, expression: Expression): SpreadElement;
+    function createClassExpression(modifiers: Modifier[], name: Identifier, typeParameters: TypeParameterDeclaration[], heritageClauses: HeritageClause[], members: ClassElement[], location?: TextRange): ClassExpression;
+    function updateClassExpression(node: ClassExpression, modifiers: Modifier[], name: Identifier, typeParameters: TypeParameterDeclaration[], heritageClauses: HeritageClause[], members: ClassElement[]): ClassExpression;
+    function createOmittedExpression(location?: TextRange): OmittedExpression;
+    function createExpressionWithTypeArguments(typeArguments: TypeNode[], expression: Expression, location?: TextRange): ExpressionWithTypeArguments;
+    function updateExpressionWithTypeArguments(node: ExpressionWithTypeArguments, typeArguments: TypeNode[], expression: Expression): ExpressionWithTypeArguments;
+    function createTemplateSpan(expression: Expression, literal: TemplateMiddle | TemplateTail, location?: TextRange): TemplateSpan;
+    function updateTemplateSpan(node: TemplateSpan, expression: Expression, literal: TemplateMiddle | TemplateTail): TemplateSpan;
+    function createBlock(statements: Statement[], location?: TextRange, multiLine?: boolean, flags?: NodeFlags): Block;
+    function updateBlock(node: Block, statements: Statement[]): Block;
+    function createVariableStatement(modifiers: Modifier[], declarationList: VariableDeclarationList | VariableDeclaration[], location?: TextRange, flags?: NodeFlags): VariableStatement;
+    function updateVariableStatement(node: VariableStatement, modifiers: Modifier[], declarationList: VariableDeclarationList): VariableStatement;
+    function createVariableDeclarationList(declarations: VariableDeclaration[], location?: TextRange, flags?: NodeFlags): VariableDeclarationList;
+    function updateVariableDeclarationList(node: VariableDeclarationList, declarations: VariableDeclaration[]): VariableDeclarationList;
+    function createVariableDeclaration(name: string | BindingPattern | Identifier, type?: TypeNode, initializer?: Expression, location?: TextRange, flags?: NodeFlags): VariableDeclaration;
+    function updateVariableDeclaration(node: VariableDeclaration, name: BindingName, type: TypeNode, initializer: Expression): VariableDeclaration;
+    function createEmptyStatement(location: TextRange): EmptyStatement;
+    function createStatement(expression: Expression, location?: TextRange, flags?: NodeFlags): ExpressionStatement;
+    function updateStatement(node: ExpressionStatement, expression: Expression): ExpressionStatement;
+    function createIf(expression: Expression, thenStatement: Statement, elseStatement?: Statement, location?: TextRange): IfStatement;
+    function updateIf(node: IfStatement, expression: Expression, thenStatement: Statement, elseStatement: Statement): IfStatement;
+    function createDo(statement: Statement, expression: Expression, location?: TextRange): DoStatement;
+    function updateDo(node: DoStatement, statement: Statement, expression: Expression): DoStatement;
+    function createWhile(expression: Expression, statement: Statement, location?: TextRange): WhileStatement;
+    function updateWhile(node: WhileStatement, expression: Expression, statement: Statement): WhileStatement;
+    function createFor(initializer: ForInitializer, condition: Expression, incrementor: Expression, statement: Statement, location?: TextRange): ForStatement;
+    function updateFor(node: ForStatement, initializer: ForInitializer, condition: Expression, incrementor: Expression, statement: Statement): ForStatement;
+    function createForIn(initializer: ForInitializer, expression: Expression, statement: Statement, location?: TextRange): ForInStatement;
+    function updateForIn(node: ForInStatement, initializer: ForInitializer, expression: Expression, statement: Statement): ForInStatement;
+    function createForOf(initializer: ForInitializer, expression: Expression, statement: Statement, location?: TextRange): ForOfStatement;
+    function updateForOf(node: ForOfStatement, initializer: ForInitializer, expression: Expression, statement: Statement): ForOfStatement;
+    function createContinue(label?: Identifier, location?: TextRange): ContinueStatement;
+    function updateContinue(node: ContinueStatement, label: Identifier): ContinueStatement;
+    function createBreak(label?: Identifier, location?: TextRange): BreakStatement;
+    function updateBreak(node: BreakStatement, label: Identifier): BreakStatement;
+    function createReturn(expression?: Expression, location?: TextRange): ReturnStatement;
+    function updateReturn(node: ReturnStatement, expression: Expression): ReturnStatement;
+    function createWith(expression: Expression, statement: Statement, location?: TextRange): WithStatement;
+    function updateWith(node: WithStatement, expression: Expression, statement: Statement): WithStatement;
+    function createSwitch(expression: Expression, caseBlock: CaseBlock, location?: TextRange): SwitchStatement;
+    function updateSwitch(node: SwitchStatement, expression: Expression, caseBlock: CaseBlock): SwitchStatement;
+    function createLabel(label: string | Identifier, statement: Statement, location?: TextRange): LabeledStatement;
+    function updateLabel(node: LabeledStatement, label: Identifier, statement: Statement): LabeledStatement;
+    function createThrow(expression: Expression, location?: TextRange): ThrowStatement;
+    function updateThrow(node: ThrowStatement, expression: Expression): ThrowStatement;
+    function createTry(tryBlock: Block, catchClause: CatchClause, finallyBlock: Block, location?: TextRange): TryStatement;
+    function updateTry(node: TryStatement, tryBlock: Block, catchClause: CatchClause, finallyBlock: Block): TryStatement;
+    function createCaseBlock(clauses: CaseOrDefaultClause[], location?: TextRange): CaseBlock;
+    function updateCaseBlock(node: CaseBlock, clauses: CaseOrDefaultClause[]): CaseBlock;
+    function createFunctionDeclaration(decorators: Decorator[], modifiers: Modifier[], asteriskToken: AsteriskToken, name: string | Identifier, typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: Block, location?: TextRange, flags?: NodeFlags): FunctionDeclaration;
+    function updateFunctionDeclaration(node: FunctionDeclaration, decorators: Decorator[], modifiers: Modifier[], name: Identifier, typeParameters: TypeParameterDeclaration[], parameters: ParameterDeclaration[], type: TypeNode, body: Block): FunctionDeclaration;
+    function createClassDeclaration(decorators: Decorator[], modifiers: Modifier[], name: Identifier, typeParameters: TypeParameterDeclaration[], heritageClauses: HeritageClause[], members: ClassElement[], location?: TextRange): ClassDeclaration;
+    function updateClassDeclaration(node: ClassDeclaration, decorators: Decorator[], modifiers: Modifier[], name: Identifier, typeParameters: TypeParameterDeclaration[], heritageClauses: HeritageClause[], members: ClassElement[]): ClassDeclaration;
+    function createImportDeclaration(decorators: Decorator[], modifiers: Modifier[], importClause: ImportClause, moduleSpecifier?: Expression, location?: TextRange): ImportDeclaration;
+    function updateImportDeclaration(node: ImportDeclaration, decorators: Decorator[], modifiers: Modifier[], importClause: ImportClause, moduleSpecifier: Expression): ImportDeclaration;
+    function createImportClause(name: Identifier, namedBindings: NamedImportBindings, location?: TextRange): ImportClause;
+    function updateImportClause(node: ImportClause, name: Identifier, namedBindings: NamedImportBindings): ImportClause;
+    function createNamespaceImport(name: Identifier, location?: TextRange): NamespaceImport;
+    function updateNamespaceImport(node: NamespaceImport, name: Identifier): NamespaceImport;
+    function createNamedImports(elements: ImportSpecifier[], location?: TextRange): NamedImports;
+    function updateNamedImports(node: NamedImports, elements: ImportSpecifier[]): NamedImports;
+    function createImportSpecifier(propertyName: Identifier, name: Identifier, location?: TextRange): ImportSpecifier;
+    function updateImportSpecifier(node: ImportSpecifier, propertyName: Identifier, name: Identifier): ImportSpecifier;
+    function createExportAssignment(decorators: Decorator[], modifiers: Modifier[], isExportEquals: boolean, expression: Expression, location?: TextRange): ExportAssignment;
+    function updateExportAssignment(node: ExportAssignment, decorators: Decorator[], modifiers: Modifier[], expression: Expression): ExportAssignment;
+    function createExportDeclaration(decorators: Decorator[], modifiers: Modifier[], exportClause: NamedExports, moduleSpecifier?: Expression, location?: TextRange): ExportDeclaration;
+    function updateExportDeclaration(node: ExportDeclaration, decorators: Decorator[], modifiers: Modifier[], exportClause: NamedExports, moduleSpecifier: Expression): ExportDeclaration;
+    function createNamedExports(elements: ExportSpecifier[], location?: TextRange): NamedExports;
+    function updateNamedExports(node: NamedExports, elements: ExportSpecifier[]): NamedExports;
+    function createExportSpecifier(name: string | Identifier, propertyName?: string | Identifier, location?: TextRange): ExportSpecifier;
+    function updateExportSpecifier(node: ExportSpecifier, name: Identifier, propertyName: Identifier): ExportSpecifier;
+    function createJsxElement(openingElement: JsxOpeningElement, children: JsxChild[], closingElement: JsxClosingElement, location?: TextRange): JsxElement;
+    function updateJsxElement(node: JsxElement, openingElement: JsxOpeningElement, children: JsxChild[], closingElement: JsxClosingElement): JsxElement;
+    function createJsxSelfClosingElement(tagName: JsxTagNameExpression, attributes: JsxAttributeLike[], location?: TextRange): JsxSelfClosingElement;
+    function updateJsxSelfClosingElement(node: JsxSelfClosingElement, tagName: JsxTagNameExpression, attributes: JsxAttributeLike[]): JsxSelfClosingElement;
+    function createJsxOpeningElement(tagName: JsxTagNameExpression, attributes: JsxAttributeLike[], location?: TextRange): JsxOpeningElement;
+    function updateJsxOpeningElement(node: JsxOpeningElement, tagName: JsxTagNameExpression, attributes: JsxAttributeLike[]): JsxOpeningElement;
+    function createJsxClosingElement(tagName: JsxTagNameExpression, location?: TextRange): JsxClosingElement;
+    function updateJsxClosingElement(node: JsxClosingElement, tagName: JsxTagNameExpression): JsxClosingElement;
+    function createJsxAttribute(name: Identifier, initializer: StringLiteral | JsxExpression, location?: TextRange): JsxAttribute;
+    function updateJsxAttribute(node: JsxAttribute, name: Identifier, initializer: StringLiteral | JsxExpression): JsxAttribute;
+    function createJsxSpreadAttribute(expression: Expression, location?: TextRange): JsxSpreadAttribute;
+    function updateJsxSpreadAttribute(node: JsxSpreadAttribute, expression: Expression): JsxSpreadAttribute;
+    function createJsxExpression(expression: Expression, location?: TextRange): JsxExpression;
+    function updateJsxExpression(node: JsxExpression, expression: Expression): JsxExpression;
+    function createHeritageClause(token: SyntaxKind, types: ExpressionWithTypeArguments[], location?: TextRange): HeritageClause;
+    function updateHeritageClause(node: HeritageClause, types: ExpressionWithTypeArguments[]): HeritageClause;
+    function createCaseClause(expression: Expression, statements: Statement[], location?: TextRange): CaseClause;
+    function updateCaseClause(node: CaseClause, expression: Expression, statements: Statement[]): CaseClause;
+    function createDefaultClause(statements: Statement[], location?: TextRange): DefaultClause;
+    function updateDefaultClause(node: DefaultClause, statements: Statement[]): DefaultClause;
+    function createCatchClause(variableDeclaration: string | VariableDeclaration, block: Block, location?: TextRange): CatchClause;
+    function updateCatchClause(node: CatchClause, variableDeclaration: VariableDeclaration, block: Block): CatchClause;
+    function createPropertyAssignment(name: string | PropertyName, initializer: Expression, location?: TextRange): PropertyAssignment;
+    function updatePropertyAssignment(node: PropertyAssignment, name: PropertyName, initializer: Expression): PropertyAssignment;
+    function createShorthandPropertyAssignment(name: string | Identifier, objectAssignmentInitializer: Expression, location?: TextRange): ShorthandPropertyAssignment;
+    function createSpreadAssignment(expression: Expression, location?: TextRange): SpreadAssignment;
+    function updateShorthandPropertyAssignment(node: ShorthandPropertyAssignment, name: Identifier, objectAssignmentInitializer: Expression): ShorthandPropertyAssignment;
+    function updateSpreadAssignment(node: SpreadAssignment, expression: Expression): SpreadAssignment;
+    function updateSourceFileNode(node: SourceFile, statements: Statement[]): SourceFile;
+    function createNotEmittedStatement(original: Node): NotEmittedStatement;
+    function createEndOfDeclarationMarker(original: Node): EndOfDeclarationMarker;
+    function createMergeDeclarationMarker(original: Node): MergeDeclarationMarker;
+    function createPartiallyEmittedExpression(expression: Expression, original?: Node, location?: TextRange): PartiallyEmittedExpression;
+    function updatePartiallyEmittedExpression(node: PartiallyEmittedExpression, expression: Expression): PartiallyEmittedExpression;
+    function createComma(left: Expression, right: Expression): Expression;
+    function createLessThan(left: Expression, right: Expression, location?: TextRange): Expression;
+    function createAssignment(left: Expression, right: Expression, location?: TextRange): BinaryExpression;
+    function createStrictEquality(left: Expression, right: Expression): BinaryExpression;
+    function createStrictInequality(left: Expression, right: Expression): BinaryExpression;
+    function createAdd(left: Expression, right: Expression): BinaryExpression;
+    function createSubtract(left: Expression, right: Expression): BinaryExpression;
+    function createPostfixIncrement(operand: Expression, location?: TextRange): PostfixUnaryExpression;
+    function createLogicalAnd(left: Expression, right: Expression): BinaryExpression;
+    function createLogicalOr(left: Expression, right: Expression): BinaryExpression;
+    function createLogicalNot(operand: Expression): PrefixUnaryExpression;
+    function createVoidZero(): VoidExpression;
+    function createMemberAccessForPropertyName(target: Expression, memberName: PropertyName, location?: TextRange): MemberExpression;
+    function createFunctionCall(func: Expression, thisArg: Expression, argumentsList: Expression[], location?: TextRange): CallExpression;
+    function createFunctionApply(func: Expression, thisArg: Expression, argumentsExpression: Expression, location?: TextRange): CallExpression;
+    function createArraySlice(array: Expression, start?: number | Expression): CallExpression;
+    function createArrayConcat(array: Expression, values: Expression[]): CallExpression;
+    function createMathPow(left: Expression, right: Expression, location?: TextRange): CallExpression;
+    function createExpressionForJsxElement(jsxFactoryEntity: EntityName, reactNamespace: string, tagName: Expression, props: Expression, children: Expression[], parentElement: JsxOpeningLikeElement, location: TextRange): LeftHandSideExpression;
+    function createExportDefault(expression: Expression): ExportAssignment;
+    function createExternalModuleExport(exportName: Identifier): ExportDeclaration;
+    function createLetStatement(name: Identifier, initializer: Expression, location?: TextRange): VariableStatement;
+    function createLetDeclarationList(declarations: VariableDeclaration[], location?: TextRange): VariableDeclarationList;
+    function createConstDeclarationList(declarations: VariableDeclaration[], location?: TextRange): VariableDeclarationList;
+    function createHelperName(externalHelpersModuleName: Identifier | undefined, name: string): Identifier | PropertyAccessExpression;
+    function createExtendsHelper(externalHelpersModuleName: Identifier | undefined, name: Identifier): CallExpression;
+    function createAssignHelper(externalHelpersModuleName: Identifier | undefined, attributesSegments: Expression[]): CallExpression;
+    function createParamHelper(externalHelpersModuleName: Identifier | undefined, expression: Expression, parameterOffset: number, location?: TextRange): CallExpression;
+    function createMetadataHelper(externalHelpersModuleName: Identifier | undefined, metadataKey: string, metadataValue: Expression): CallExpression;
+    function createDecorateHelper(externalHelpersModuleName: Identifier | undefined, decoratorExpressions: Expression[], target: Expression, memberName?: Expression, descriptor?: Expression, location?: TextRange): CallExpression;
+    function createAwaiterHelper(externalHelpersModuleName: Identifier | undefined, hasLexicalArguments: boolean, promiseConstructor: EntityName | Expression, body: Block): CallExpression;
+    function createHasOwnProperty(target: LeftHandSideExpression, propertyName: Expression): CallExpression;
+    function createAdvancedAsyncSuperHelper(): VariableStatement;
+    function createSimpleAsyncSuperHelper(): VariableStatement;
+    interface CallBinding {
+        target: LeftHandSideExpression;
+        thisArg: Expression;
+    }
+    function createCallBinding(expression: Expression, recordTempVariable: (temp: Identifier) => void, languageVersion?: ScriptTarget, cacheIdentifiers?: boolean): CallBinding;
+    function inlineExpressions(expressions: Expression[]): Expression;
+    function createExpressionFromEntityName(node: EntityName | Expression): Expression;
+    function createExpressionForPropertyName(memberName: PropertyName): Expression;
+    function createExpressionForObjectLiteralElementLike(node: ObjectLiteralExpression, property: ObjectLiteralElementLike, receiver: Expression): Expression;
+    function getLocalName(node: Declaration, allowComments?: boolean, allowSourceMaps?: boolean): Identifier;
+    function isLocalName(node: Identifier): boolean;
+    function getExportName(node: Declaration, allowComments?: boolean, allowSourceMaps?: boolean): Identifier;
+    function isExportName(node: Identifier): boolean;
+    function getDeclarationName(node: Declaration, allowComments?: boolean, allowSourceMaps?: boolean): Identifier;
+    function getExternalModuleOrNamespaceExportName(ns: Identifier | undefined, node: Declaration, allowComments?: boolean, allowSourceMaps?: boolean): Identifier | PropertyAccessExpression;
+    function getNamespaceMemberName(ns: Identifier, name: Identifier, allowComments?: boolean, allowSourceMaps?: boolean): PropertyAccessExpression;
+    function addPrologueDirectives(target: Statement[], source: Statement[], ensureUseStrict?: boolean, visitor?: (node: Node) => VisitResult<Node>): number;
+    function ensureUseStrict(node: SourceFile): SourceFile;
+    function parenthesizeBinaryOperand(binaryOperator: SyntaxKind, operand: Expression, isLeftSideOfBinary: boolean, leftOperand?: Expression): Expression;
+    function parenthesizeForNew(expression: Expression): LeftHandSideExpression;
+    function parenthesizeForAccess(expression: Expression): LeftHandSideExpression;
+    function parenthesizePostfixOperand(operand: Expression): LeftHandSideExpression;
+    function parenthesizePrefixOperand(operand: Expression): UnaryExpression;
+    function parenthesizeExpressionForList(expression: Expression): Expression;
+    function parenthesizeExpressionForExpressionStatement(expression: Expression): Expression;
+    function parenthesizeConciseBody(body: ConciseBody): ConciseBody;
+    const enum OuterExpressionKinds {
+        Parentheses = 1,
+        Assertions = 2,
+        PartiallyEmittedExpressions = 4,
+        All = 7,
+    }
+    function skipOuterExpressions(node: Expression, kinds?: OuterExpressionKinds): Expression;
+    function skipOuterExpressions(node: Node, kinds?: OuterExpressionKinds): Node;
+    function skipParentheses(node: Expression): Expression;
+    function skipParentheses(node: Node): Node;
+    function skipAssertions(node: Expression): Expression;
+    function skipAssertions(node: Node): Node;
+    function skipPartiallyEmittedExpressions(node: Expression): Expression;
+    function skipPartiallyEmittedExpressions(node: Node): Node;
+    function startOnNewLine<T extends Node>(node: T): T;
+    function setOriginalNode<T extends Node>(node: T, original: Node): T;
+    function disposeEmitNodes(sourceFile: SourceFile): void;
+    function getEmitFlags(node: Node): EmitFlags;
+    function setEmitFlags<T extends Node>(node: T, emitFlags: EmitFlags): T;
+    function setSourceMapRange<T extends Node>(node: T, range: TextRange): T;
+    function setTokenSourceMapRange<T extends Node>(node: T, token: SyntaxKind, range: TextRange): T;
+    function setCommentRange<T extends Node>(node: T, range: TextRange): T;
+    function getCommentRange(node: Node): TextRange;
+    function getSourceMapRange(node: Node): TextRange;
+    function getTokenSourceMapRange(node: Node, token: SyntaxKind): TextRange;
+    function getConstantValue(node: PropertyAccessExpression | ElementAccessExpression): number;
+    function setConstantValue(node: PropertyAccessExpression | ElementAccessExpression, value: number): PropertyAccessExpression | ElementAccessExpression;
+    function setTextRange<T extends TextRange>(node: T, location: TextRange): T;
+    function setNodeFlags<T extends Node>(node: T, flags: NodeFlags): T;
+    function setMultiLine<T extends ObjectLiteralExpression | ArrayLiteralExpression | Block>(node: T, multiLine: boolean): T;
+    function setHasTrailingComma<T extends Node>(nodes: NodeArray<T>, hasTrailingComma: boolean): NodeArray<T>;
+    function getLocalNameForExternalImport(node: ImportDeclaration | ExportDeclaration | ImportEqualsDeclaration, sourceFile: SourceFile): Identifier;
+    function getExternalModuleNameLiteral(importNode: ImportDeclaration | ExportDeclaration | ImportEqualsDeclaration, sourceFile: SourceFile, host: EmitHost, resolver: EmitResolver, compilerOptions: CompilerOptions): StringLiteral;
+    function tryGetModuleNameFromFile(file: SourceFile, host: EmitHost, options: CompilerOptions): StringLiteral;
+    function transformFunctionBody(node: FunctionLikeDeclaration, visitor: (node: Node) => VisitResult<Node>, currentSourceFile: SourceFile, context: TransformationContext, enableSubstitutionsForCapturedThis: () => void, convertObjectRest?: boolean): Block;
+    function addCaptureThisForNodeIfNeeded(statements: Statement[], node: Node, enableSubstitutionsForCapturedThis: () => void): void;
+    function captureThisForNode(statements: Statement[], node: Node, initializer: Expression | undefined, enableSubstitutionsForCapturedThis?: () => void, originalStatement?: Statement): void;
+    function addDefaultValueAssignmentsIfNeeded(statements: Statement[], node: FunctionLikeDeclaration, visitor: (node: Node) => VisitResult<Node>, convertObjectRest: boolean): void;
+    function addRestParameterIfNeeded(statements: Statement[], node: FunctionLikeDeclaration, inConstructorWithSynthesizedSuper: boolean): void;
+    function convertForOf(node: ForOfStatement, convertedLoopBodyStatements: Statement[], visitor: (node: Node) => VisitResult<Node>, enableSubstitutionsForBlockScopedBindings: () => void, context: TransformationContext, convertObjectRest?: boolean): ForStatement | ForOfStatement;
+}
+declare namespace ts {
+    function createNode(kind: SyntaxKind, pos?: number, end?: number): Node;
+    function forEachChild<T>(node: Node, cbNode: (node: Node) => T, cbNodeArray?: (nodes: Node[]) => T): T;
+    function createSourceFile(fileName: string, sourceText: string, languageVersion: ScriptTarget, setParentNodes?: boolean, scriptKind?: ScriptKind): SourceFile;
+    function parseIsolatedEntityName(text: string, languageVersion: ScriptTarget): EntityName;
+    function isExternalModule(file: SourceFile): boolean;
+    function updateSourceFile(sourceFile: SourceFile, newText: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile;
+    function parseIsolatedJSDocComment(content: string, start?: number, length?: number): {
+        jsDoc: JSDoc;
+        diagnostics: Diagnostic[];
+    };
+    function parseJSDocTypeExpressionForTests(content: string, start?: number, length?: number): {
+        jsDocTypeExpression: JSDocTypeExpression;
+        diagnostics: Diagnostic[];
+    };
+}
+declare namespace ts {
+    const enum ModuleInstanceState {
+        NonInstantiated = 0,
+        Instantiated = 1,
+        ConstEnumOnly = 2,
+    }
+    function getModuleInstanceState(node: Node): ModuleInstanceState;
+    function bindSourceFile(file: SourceFile, options: CompilerOptions): void;
+    function computeTransformFlagsForNode(node: Node, subtreeFlags: TransformFlags): TransformFlags;
+    function getTransformFlagsSubtreeExclusions(kind: SyntaxKind): TransformFlags;
+}
+declare namespace ts {
+    function getNodeId(node: Node): number;
+    function getSymbolId(symbol: Symbol): number;
+    function createTypeChecker(host: TypeCheckerHost, produceDiagnostics: boolean): TypeChecker;
+}
+declare namespace ts {
+    type VisitResult<T extends Node> = T | T[];
+    function reduceEachChild<T>(node: Node, f: (memo: T, node: Node) => T, initial: T): T;
+    function visitNode<T extends Node>(node: T, visitor: (node: Node) => VisitResult<Node>, test: (node: Node) => boolean, optional?: boolean, lift?: (node: NodeArray<Node>) => T): T;
+    function visitNode<T extends Node>(node: T, visitor: (node: Node) => VisitResult<Node>, test: (node: Node) => boolean, optional: boolean, lift: (node: NodeArray<Node>) => T, parenthesize: (node: Node, parentNode: Node) => Node, parentNode: Node): T;
+    function visitNodes<T extends Node>(nodes: NodeArray<T>, visitor: (node: Node) => VisitResult<Node>, test: (node: Node) => boolean, start?: number, count?: number): NodeArray<T>;
+    function visitNodes<T extends Node>(nodes: NodeArray<T>, visitor: (node: Node) => VisitResult<Node>, test: (node: Node) => boolean, start: number, count: number, parenthesize: (node: Node, parentNode: Node) => Node, parentNode: Node): NodeArray<T>;
+    function visitEachChild<T extends Node>(node: T, visitor: (node: Node) => VisitResult<Node>, context: LexicalEnvironment): T;
+    function mergeFunctionBodyLexicalEnvironment(body: FunctionBody, declarations: Statement[]): FunctionBody;
+    function mergeFunctionBodyLexicalEnvironment(body: ConciseBody, declarations: Statement[]): ConciseBody;
+    function liftToBlock(nodes: Node[]): Statement;
+    function aggregateTransformFlags<T extends Node>(node: T): T;
+    namespace Debug {
+        const failNotOptional: typeof noop;
+        const failBadSyntaxKind: (node: Node, message?: string) => void;
+        const assertNode: (node: Node, test: (node: Node) => boolean, message?: string) => void;
+    }
+}
+declare namespace ts {
+    function flattenDestructuringAssignment(context: TransformationContext, node: BinaryExpression, needsValue: boolean, recordTempVariable: (node: Identifier) => void, visitor?: (node: Node) => VisitResult<Node>, transformRest?: boolean): Expression;
+    function flattenParameterDestructuring(node: ParameterDeclaration, value: Expression, visitor?: (node: Node) => VisitResult<Node>, transformRest?: boolean): VariableDeclaration[];
+    function flattenVariableDestructuring(node: VariableDeclaration, value?: Expression, visitor?: (node: Node) => VisitResult<Node>, recordTempVariable?: (node: Identifier) => void, transformRest?: boolean): VariableDeclaration[];
+    function flattenVariableDestructuringToExpression(node: VariableDeclaration, recordTempVariable: (name: Identifier) => void, createAssignmentCallback?: (name: Identifier, value: Expression, location?: TextRange) => Expression, visitor?: (node: Node) => VisitResult<Node>): Expression;
+}
+declare namespace ts {
+    function transformTypeScript(context: TransformationContext): (node: SourceFile) => SourceFile;
+}
+declare namespace ts {
+    function transformJsx(context: TransformationContext): (node: SourceFile) => SourceFile;
+}
+declare namespace ts {
+    function transformESNext(context: TransformationContext): (node: SourceFile) => SourceFile;
+}
+declare namespace ts {
+    function transformES2017(context: TransformationContext): (node: SourceFile) => SourceFile;
+}
+declare namespace ts {
+    function transformES2016(context: TransformationContext): (node: SourceFile) => SourceFile;
+}
+declare namespace ts {
+    function transformES2015(context: TransformationContext): (node: SourceFile) => SourceFile;
+}
+declare namespace ts {
+    function transformGenerators(context: TransformationContext): (node: SourceFile) => SourceFile;
+}
+declare namespace ts {
+    function transformES5(context: TransformationContext): (node: SourceFile) => SourceFile;
+}
+declare namespace ts {
+    function transformModule(context: TransformationContext): (node: SourceFile) => SourceFile;
+}
+declare namespace ts {
+    function transformSystemModule(context: TransformationContext): (node: SourceFile) => SourceFile;
+}
+declare namespace ts {
+    function transformES2015Module(context: TransformationContext): (node: SourceFile) => SourceFile;
+}
+declare namespace ts {
+    interface TransformationResult {
+        transformed: SourceFile[];
+        emitNodeWithSubstitution(emitContext: EmitContext, node: Node, emitCallback: (emitContext: EmitContext, node: Node) => void): void;
+        emitNodeWithNotification(emitContext: EmitContext, node: Node, emitCallback: (emitContext: EmitContext, node: Node) => void): void;
+    }
+    interface TransformationContext extends LexicalEnvironment {
+        getCompilerOptions(): CompilerOptions;
+        getEmitResolver(): EmitResolver;
+        getEmitHost(): EmitHost;
+        hoistFunctionDeclaration(node: FunctionDeclaration): void;
+        hoistVariableDeclaration(node: Identifier): void;
+        enableSubstitution(kind: SyntaxKind): void;
+        isSubstitutionEnabled(node: Node): boolean;
+        onSubstituteNode?: (emitContext: EmitContext, node: Node) => Node;
+        enableEmitNotification(kind: SyntaxKind): void;
+        isEmitNotificationEnabled(node: Node): boolean;
+        onEmitNode?: (emitContext: EmitContext, node: Node, emitCallback: (emitContext: EmitContext, node: Node) => void) => void;
+    }
+    type Transformer = (context: TransformationContext) => (node: SourceFile) => SourceFile;
+    function getTransformers(compilerOptions: CompilerOptions): Transformer[];
+    function transformFiles(resolver: EmitResolver, host: EmitHost, sourceFiles: SourceFile[], transformers: Transformer[]): TransformationResult;
+}
+declare namespace ts {
+    function getDeclarationDiagnostics(host: EmitHost, resolver: EmitResolver, targetSourceFile: SourceFile): Diagnostic[];
+    function writeDeclarationFile(declarationFilePath: string, sourceFiles: SourceFile[], isBundledEmit: boolean, host: EmitHost, resolver: EmitResolver, emitterDiagnostics: DiagnosticCollection, emitOnlyDtsFiles: boolean): boolean;
+}
+declare namespace ts {
+    interface SourceMapWriter {
+        initialize(filePath: string, sourceMapFilePath: string, sourceFiles: SourceFile[], isBundledEmit: boolean): void;
+        reset(): void;
+        setSourceFile(sourceFile: SourceFile): void;
+        emitPos(pos: number): void;
+        emitNodeWithSourceMap(emitContext: EmitContext, node: Node, emitCallback: (emitContext: EmitContext, node: Node) => void): void;
+        emitTokenWithSourceMap(node: Node, token: SyntaxKind, tokenStartPos: number, emitCallback: (token: SyntaxKind, tokenStartPos: number) => number): number;
+        getText(): string;
+        getSourceMappingURL(): string;
+        getSourceMapData(): SourceMapData;
+    }
+    function createSourceMapWriter(host: EmitHost, writer: EmitTextWriter): SourceMapWriter;
+}
+declare namespace ts {
+    interface CommentWriter {
+        reset(): void;
+        setSourceFile(sourceFile: SourceFile): void;
+        emitNodeWithComments(emitContext: EmitContext, node: Node, emitCallback: (emitContext: EmitContext, node: Node) => void): void;
+        emitBodyWithDetachedComments(node: Node, detachedRange: TextRange, emitCallback: (node: Node) => void): void;
+        emitTrailingCommentsOfPosition(pos: number): void;
+    }
+    function createCommentWriter(host: EmitHost, writer: EmitTextWriter, sourceMap: SourceMapWriter): CommentWriter;
+}
+declare namespace ts {
+    function emitFiles(resolver: EmitResolver, host: EmitHost, targetSourceFile: SourceFile, emitOnlyDtsFiles?: boolean): EmitResult;
+}
+declare namespace ts {
+    const version = "2.2.0";
+    function findConfigFile(searchPath: string, fileExists: (fileName: string) => boolean, configName?: string): string;
+    function resolveTripleslashReference(moduleName: string, containingFile: string): string;
+    function computeCommonSourceDirectoryOfFilenames(fileNames: string[], currentDirectory: string, getCanonicalFileName: (fileName: string) => string): string;
+    function createCompilerHost(options: CompilerOptions, setParentNodes?: boolean): CompilerHost;
+    function getPreEmitDiagnostics(program: Program, sourceFile?: SourceFile, cancellationToken?: CancellationToken): Diagnostic[];
+    interface FormatDiagnosticsHost {
+        getCurrentDirectory(): string;
+        getCanonicalFileName(fileName: string): string;
+        getNewLine(): string;
+    }
+    function formatDiagnostics(diagnostics: Diagnostic[], host: FormatDiagnosticsHost): string;
+    function flattenDiagnosticMessageText(messageText: string | DiagnosticMessageChain, newLine: string): string;
+    function createProgram(rootNames: string[], options: CompilerOptions, host?: CompilerHost, oldProgram?: Program): Program;
+    function getResolutionDiagnostic(options: CompilerOptions, {extension}: ResolvedModuleFull): DiagnosticMessage | undefined;
+}
 declare namespace ts {
     interface Node {
         getSourceFile(): SourceFile;
@@ -2174,6 +9637,10 @@ declare namespace ts {
         getDocumentationComment(): SymbolDisplayPart[];
     }
     interface SourceFile {
+        version: string;
+        scriptSnapshot: IScriptSnapshot;
+        nameTable: Map<number>;
+        getNamedDeclarations(): Map<Declaration[]>;
         getLineAndCharacterOfPosition(pos: number): LineAndCharacter;
         getLineStarts(): number[];
         getPositionOfLineAndCharacter(line: number, character: number): number;
@@ -2263,6 +9730,8 @@ declare namespace ts {
         getCodeFixesAtPosition(fileName: string, start: number, end: number, errorCodes: number[]): CodeAction[];
         getEmitOutput(fileName: string, emitOnlyDtsFiles?: boolean): EmitOutput;
         getProgram(): Program;
+        getNonBoundSourceFile(fileName: string): SourceFile;
+        getSourceFile(fileName: string): SourceFile;
         dispose(): void;
     }
     interface Classifications {
@@ -2654,8 +10123,123 @@ declare namespace ts {
         jsxAttributeStringLiteralValue = 24,
     }
 }
+declare namespace ts {
+    const scanner: Scanner;
+    const emptyArray: any[];
+    const enum SemanticMeaning {
+        None = 0,
+        Value = 1,
+        Type = 2,
+        Namespace = 4,
+        All = 7,
+    }
+    function getMeaningFromDeclaration(node: Node): SemanticMeaning;
+    function getMeaningFromLocation(node: Node): SemanticMeaning;
+    function isCallExpressionTarget(node: Node): boolean;
+    function isNewExpressionTarget(node: Node): boolean;
+    function climbPastPropertyAccess(node: Node): Node;
+    function getTargetLabel(referenceNode: Node, labelName: string): Identifier;
+    function isJumpStatementTarget(node: Node): boolean;
+    function isLabelName(node: Node): boolean;
+    function isRightSideOfQualifiedName(node: Node): boolean;
+    function isRightSideOfPropertyAccess(node: Node): boolean;
+    function isNameOfModuleDeclaration(node: Node): boolean;
+    function isNameOfFunctionDeclaration(node: Node): boolean;
+    function isLiteralNameOfPropertyDeclarationOrIndexAccess(node: Node): boolean;
+    function isExpressionOfExternalModuleImportEqualsDeclaration(node: Node): boolean;
+    function isInsideComment(sourceFile: SourceFile, token: Node, position: number): boolean;
+    function getContainerNode(node: Node): Declaration;
+    function getNodeKind(node: Node): string;
+    function getStringLiteralTypeForNode(node: StringLiteral | LiteralTypeNode, typeChecker: TypeChecker): LiteralType;
+    function isThis(node: Node): boolean;
+    interface ListItemInfo {
+        listItemIndex: number;
+        list: Node;
+    }
+    function getLineStartPositionForPosition(position: number, sourceFile: SourceFile): number;
+    function rangeContainsRange(r1: TextRange, r2: TextRange): boolean;
+    function startEndContainsRange(start: number, end: number, range: TextRange): boolean;
+    function rangeContainsStartEnd(range: TextRange, start: number, end: number): boolean;
+    function rangeOverlapsWithStartEnd(r1: TextRange, start: number, end: number): boolean;
+    function startEndOverlapsWithStartEnd(start1: number, end1: number, start2: number, end2: number): boolean;
+    function positionBelongsToNode(candidate: Node, position: number, sourceFile: SourceFile): boolean;
+    function isCompletedNode(n: Node, sourceFile: SourceFile): boolean;
+    function findListItemInfo(node: Node): ListItemInfo;
+    function hasChildOfKind(n: Node, kind: SyntaxKind, sourceFile?: SourceFile): boolean;
+    function findChildOfKind(n: Node, kind: SyntaxKind, sourceFile?: SourceFile): Node;
+    function findContainingList(node: Node): Node;
+    function getTouchingWord(sourceFile: SourceFile, position: number, includeJsDocComment?: boolean): Node;
+    function getTouchingPropertyName(sourceFile: SourceFile, position: number, includeJsDocComment?: boolean): Node;
+    function getTouchingToken(sourceFile: SourceFile, position: number, includeItemAtEndPosition?: (n: Node) => boolean, includeJsDocComment?: boolean): Node;
+    function getTokenAtPosition(sourceFile: SourceFile, position: number, includeJsDocComment?: boolean): Node;
+    function findTokenOnLeftOfPosition(file: SourceFile, position: number): Node;
+    function findNextToken(previousToken: Node, parent: Node): Node;
+    function findPrecedingToken(position: number, sourceFile: SourceFile, startNode?: Node): Node;
+    function isInString(sourceFile: SourceFile, position: number): boolean;
+    function isInComment(sourceFile: SourceFile, position: number): boolean;
+    function isInsideJsxElementOrAttribute(sourceFile: SourceFile, position: number): boolean;
+    function isInTemplateString(sourceFile: SourceFile, position: number): boolean;
+    function isInCommentHelper(sourceFile: SourceFile, position: number, predicate?: (c: CommentRange) => boolean): boolean;
+    function hasDocComment(sourceFile: SourceFile, position: number): boolean;
+    function getJsDocTagAtPosition(sourceFile: SourceFile, position: number): JSDocTag;
+    function getNodeModifiers(node: Node): string;
+    function getTypeArgumentOrTypeParameterList(node: Node): NodeArray<Node>;
+    function isToken(n: Node): boolean;
+    function isWord(kind: SyntaxKind): boolean;
+    function isComment(kind: SyntaxKind): boolean;
+    function isStringOrRegularExpressionOrTemplateLiteral(kind: SyntaxKind): boolean;
+    function isPunctuation(kind: SyntaxKind): boolean;
+    function isInsideTemplateLiteral(node: LiteralExpression, position: number): boolean;
+    function isAccessibilityModifier(kind: SyntaxKind): boolean;
+    function compareDataObjects(dst: any, src: any): boolean;
+    function isArrayLiteralOrObjectLiteralDestructuringPattern(node: Node): boolean;
+    function hasTrailingDirectorySeparator(path: string): boolean;
+    function isInReferenceComment(sourceFile: SourceFile, position: number): boolean;
+    function isInNonReferenceComment(sourceFile: SourceFile, position: number): boolean;
+}
+declare namespace ts {
+    function isFirstDeclarationOfSymbolParameter(symbol: Symbol): boolean;
+    function symbolPart(text: string, symbol: Symbol): SymbolDisplayPart;
+    function displayPart(text: string, kind: SymbolDisplayPartKind): SymbolDisplayPart;
+    function spacePart(): SymbolDisplayPart;
+    function keywordPart(kind: SyntaxKind): SymbolDisplayPart;
+    function punctuationPart(kind: SyntaxKind): SymbolDisplayPart;
+    function operatorPart(kind: SyntaxKind): SymbolDisplayPart;
+    function textOrKeywordPart(text: string): SymbolDisplayPart;
+    function textPart(text: string): SymbolDisplayPart;
+    function getNewLineOrDefaultFromHost(host: LanguageServiceHost | LanguageServiceShimHost): string;
+    function lineBreakPart(): SymbolDisplayPart;
+    function mapToDisplayParts(writeDisplayParts: (writer: DisplayPartsSymbolWriter) => void): SymbolDisplayPart[];
+    function typeToDisplayParts(typechecker: TypeChecker, type: Type, enclosingDeclaration?: Node, flags?: TypeFormatFlags): SymbolDisplayPart[];
+    function symbolToDisplayParts(typeChecker: TypeChecker, symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags, flags?: SymbolFormatFlags): SymbolDisplayPart[];
+    function signatureToDisplayParts(typechecker: TypeChecker, signature: Signature, enclosingDeclaration?: Node, flags?: TypeFormatFlags): SymbolDisplayPart[];
+    function getDeclaredName(typeChecker: TypeChecker, symbol: Symbol, location: Node): string;
+    function isImportOrExportSpecifierName(location: Node): boolean;
+    function stripQuotes(name: string): string;
+    function scriptKindIs(fileName: string, host: LanguageServiceHost, ...scriptKinds: ScriptKind[]): boolean;
+    function getScriptKind(fileName: string, host?: LanguageServiceHost): ScriptKind;
+    function sanitizeConfigFile(configFileName: string, content: string): {
+        configJsonObject: any;
+        diagnostics: Diagnostic[];
+    };
+}
+declare namespace ts.BreakpointResolver {
+    function spanInSourceFileAtLocation(sourceFile: SourceFile, position: number): TextSpan;
+}
 declare namespace ts {
     function createClassifier(): Classifier;
+    function getSemanticClassifications(typeChecker: TypeChecker, cancellationToken: CancellationToken, sourceFile: SourceFile, classifiableNames: Map<string>, span: TextSpan): ClassifiedSpan[];
+    function getEncodedSemanticClassifications(typeChecker: TypeChecker, cancellationToken: CancellationToken, sourceFile: SourceFile, classifiableNames: Map<string>, span: TextSpan): Classifications;
+    function getSyntacticClassifications(cancellationToken: CancellationToken, sourceFile: SourceFile, span: TextSpan): ClassifiedSpan[];
+    function getEncodedSyntacticClassifications(cancellationToken: CancellationToken, sourceFile: SourceFile, span: TextSpan): Classifications;
+}
+declare namespace ts.Completions {
+    function getCompletionsAtPosition(host: LanguageServiceHost, typeChecker: TypeChecker, log: (message: string) => void, compilerOptions: CompilerOptions, sourceFile: SourceFile, position: number): CompletionInfo;
+    function getCompletionEntryDetails(typeChecker: TypeChecker, log: (message: string) => void, compilerOptions: CompilerOptions, sourceFile: SourceFile, position: number, entryName: string): CompletionEntryDetails;
+    function getCompletionEntrySymbol(typeChecker: TypeChecker, log: (message: string) => void, compilerOptions: CompilerOptions, sourceFile: SourceFile, position: number, entryName: string): Symbol;
+}
+declare namespace ts.DocumentHighlights {
+    function getDocumentHighlights(typeChecker: TypeChecker, cancellationToken: CancellationToken, sourceFile: SourceFile, position: number, sourceFilesToSearch: SourceFile[]): DocumentHighlights[];
 }
 declare namespace ts {
     interface DocumentRegistry {
@@ -2673,9 +10257,88 @@ declare namespace ts {
     };
     function createDocumentRegistry(useCaseSensitiveFileNames?: boolean, currentDirectory?: string): DocumentRegistry;
 }
+declare namespace ts.FindAllReferences {
+    function findReferencedSymbols(typeChecker: TypeChecker, cancellationToken: CancellationToken, sourceFiles: SourceFile[], sourceFile: SourceFile, position: number, findInStrings: boolean, findInComments: boolean): ReferencedSymbol[];
+    function getReferencedSymbolsForNode(typeChecker: TypeChecker, cancellationToken: CancellationToken, node: Node, sourceFiles: SourceFile[], findInStrings: boolean, findInComments: boolean, implementations: boolean): ReferencedSymbol[];
+    function convertReferences(referenceSymbols: ReferencedSymbol[]): ReferenceEntry[];
+    function getReferenceEntriesForShorthandPropertyAssignment(node: Node, typeChecker: TypeChecker, result: ReferenceEntry[]): void;
+    function getReferenceEntryFromNode(node: Node): ReferenceEntry;
+}
+declare namespace ts.GoToDefinition {
+    function getDefinitionAtPosition(program: Program, sourceFile: SourceFile, position: number): DefinitionInfo[];
+    function getTypeDefinitionAtPosition(typeChecker: TypeChecker, sourceFile: SourceFile, position: number): DefinitionInfo[];
+}
+declare namespace ts.GoToImplementation {
+    function getImplementationAtPosition(typeChecker: TypeChecker, cancellationToken: CancellationToken, sourceFiles: SourceFile[], node: Node): ImplementationLocation[];
+}
+declare namespace ts.JsDoc {
+    function getJsDocCommentsFromDeclarations(declarations: Declaration[]): SymbolDisplayPart[];
+    function getAllJsDocCompletionEntries(): CompletionEntry[];
+    function getDocCommentTemplateAtPosition(newLine: string, sourceFile: SourceFile, position: number): TextInsertion;
+}
+declare namespace ts.NavigateTo {
+    function getNavigateToItems(sourceFiles: SourceFile[], checker: TypeChecker, cancellationToken: CancellationToken, searchValue: string, maxResultCount: number, excludeDtsFiles: boolean): NavigateToItem[];
+}
+declare namespace ts.NavigationBar {
+    function getNavigationBarItems(sourceFile: SourceFile): NavigationBarItem[];
+    function getNavigationTree(sourceFile: SourceFile): NavigationTree;
+}
+declare namespace ts.OutliningElementsCollector {
+    function collectElements(sourceFile: SourceFile): OutliningSpan[];
+}
+declare namespace ts {
+    enum PatternMatchKind {
+        exact = 0,
+        prefix = 1,
+        substring = 2,
+        camelCase = 3,
+    }
+    interface PatternMatch {
+        kind: PatternMatchKind;
+        camelCaseWeight?: number;
+        isCaseSensitive: boolean;
+        punctuationStripped: boolean;
+    }
+    interface PatternMatcher {
+        getMatchesForLastSegmentOfPattern(candidate: string): PatternMatch[];
+        getMatches(candidateContainers: string[], candidate: string): PatternMatch[];
+        patternContainsDots: boolean;
+    }
+    function createPatternMatcher(pattern: string): PatternMatcher;
+    function breakIntoCharacterSpans(identifier: string): TextSpan[];
+    function breakIntoWordSpans(identifier: string): TextSpan[];
+}
 declare namespace ts {
     function preProcessFile(sourceText: string, readImportFiles?: boolean, detectJavaScriptImports?: boolean): PreProcessedFileInfo;
 }
+declare namespace ts.Rename {
+    function getRenameInfo(typeChecker: TypeChecker, defaultLibFileName: string, getCanonicalFileName: (fileName: string) => string, sourceFile: SourceFile, position: number): RenameInfo;
+}
+declare namespace ts.SignatureHelp {
+    const enum ArgumentListKind {
+        TypeArguments = 0,
+        CallArguments = 1,
+        TaggedTemplateArguments = 2,
+    }
+    interface ArgumentListInfo {
+        kind: ArgumentListKind;
+        invocation: CallLikeExpression;
+        argumentsSpan: TextSpan;
+        argumentIndex?: number;
+        argumentCount: number;
+    }
+    function getSignatureHelpItems(program: Program, sourceFile: SourceFile, position: number, cancellationToken: CancellationToken): SignatureHelpItems;
+    function getContainingArgumentInfo(node: Node, position: number, sourceFile: SourceFile): ArgumentListInfo;
+}
+declare namespace ts.SymbolDisplay {
+    function getSymbolKind(typeChecker: TypeChecker, symbol: Symbol, location: Node): string;
+    function getSymbolModifiers(symbol: Symbol): string;
+    function getSymbolDisplayPartsDocumentationAndSymbolKind(typeChecker: TypeChecker, symbol: Symbol, sourceFile: SourceFile, enclosingDeclaration: Node, location: Node, semanticMeaning?: SemanticMeaning): {
+        displayParts: SymbolDisplayPart[];
+        documentation: SymbolDisplayPart[];
+        symbolKind: string;
+    };
+}
 declare namespace ts {
     interface TranspileOptions {
         compilerOptions?: CompilerOptions;
@@ -2692,11 +10355,438 @@ 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.formatting {
+    interface FormattingScanner {
+        advance(): void;
+        isOnToken(): boolean;
+        readTokenInfo(n: Node): TokenInfo;
+        getCurrentLeadingTrivia(): TextRangeWithKind[];
+        lastTrailingTriviaWasNewLine(): boolean;
+        skipToEndOf(node: Node): void;
+        close(): void;
+    }
+    function getFormattingScanner(sourceFile: SourceFile, startPos: number, endPos: number): FormattingScanner;
+}
+declare namespace ts.formatting {
+    class FormattingContext {
+        sourceFile: SourceFile;
+        formattingRequestKind: FormattingRequestKind;
+        currentTokenSpan: TextRangeWithKind;
+        nextTokenSpan: TextRangeWithKind;
+        contextNode: Node;
+        currentTokenParent: Node;
+        nextTokenParent: Node;
+        private contextNodeAllOnSameLine;
+        private nextNodeAllOnSameLine;
+        private tokensAreOnSameLine;
+        private contextNodeBlockIsOnOneLine;
+        private nextNodeBlockIsOnOneLine;
+        constructor(sourceFile: SourceFile, formattingRequestKind: FormattingRequestKind);
+        updateContext(currentRange: TextRangeWithKind, currentTokenParent: Node, nextRange: TextRangeWithKind, nextTokenParent: Node, commonParent: Node): void;
+        ContextNodeAllOnSameLine(): boolean;
+        NextNodeAllOnSameLine(): boolean;
+        TokensAreOnSameLine(): boolean;
+        ContextNodeBlockIsOnOneLine(): boolean;
+        NextNodeBlockIsOnOneLine(): boolean;
+        private NodeIsOnOneLine(node);
+        private BlockIsOnOneLine(node);
+    }
+}
+declare namespace ts.formatting {
+    const enum FormattingRequestKind {
+        FormatDocument = 0,
+        FormatSelection = 1,
+        FormatOnEnter = 2,
+        FormatOnSemicolon = 3,
+        FormatOnClosingCurlyBrace = 4,
+    }
+}
+declare namespace ts.formatting {
+    class Rule {
+        Descriptor: RuleDescriptor;
+        Operation: RuleOperation;
+        Flag: RuleFlags;
+        constructor(Descriptor: RuleDescriptor, Operation: RuleOperation, Flag?: RuleFlags);
+        toString(): string;
+    }
+}
+declare namespace ts.formatting {
+    const enum RuleAction {
+        Ignore = 1,
+        Space = 2,
+        NewLine = 4,
+        Delete = 8,
+    }
+}
+declare namespace ts.formatting {
+    class RuleDescriptor {
+        LeftTokenRange: Shared.TokenRange;
+        RightTokenRange: Shared.TokenRange;
+        constructor(LeftTokenRange: Shared.TokenRange, RightTokenRange: Shared.TokenRange);
+        toString(): string;
+        static create1(left: SyntaxKind, right: SyntaxKind): RuleDescriptor;
+        static create2(left: Shared.TokenRange, right: SyntaxKind): RuleDescriptor;
+        static create3(left: SyntaxKind, right: Shared.TokenRange): RuleDescriptor;
+        static create4(left: Shared.TokenRange, right: Shared.TokenRange): RuleDescriptor;
+    }
+}
+declare namespace ts.formatting {
+    const enum RuleFlags {
+        None = 0,
+        CanDeleteNewLines = 1,
+    }
+}
+declare namespace ts.formatting {
+    class RuleOperation {
+        Context: RuleOperationContext;
+        Action: RuleAction;
+        constructor(Context: RuleOperationContext, Action: RuleAction);
+        toString(): string;
+        static create1(action: RuleAction): RuleOperation;
+        static create2(context: RuleOperationContext, action: RuleAction): RuleOperation;
+    }
+}
+declare namespace ts.formatting {
+    class RuleOperationContext {
+        private customContextChecks;
+        constructor(...funcs: {
+            (context: FormattingContext): boolean;
+        }[]);
+        static Any: RuleOperationContext;
+        IsAny(): boolean;
+        InContext(context: FormattingContext): boolean;
+    }
+}
+declare namespace ts.formatting {
+    class Rules {
+        getRuleName(rule: Rule): string;
+        [name: string]: any;
+        IgnoreBeforeComment: Rule;
+        IgnoreAfterLineComment: Rule;
+        NoSpaceBeforeSemicolon: Rule;
+        NoSpaceBeforeColon: Rule;
+        NoSpaceBeforeQuestionMark: Rule;
+        SpaceAfterColon: Rule;
+        SpaceAfterQuestionMarkInConditionalOperator: Rule;
+        NoSpaceAfterQuestionMark: Rule;
+        SpaceAfterSemicolon: Rule;
+        SpaceAfterCloseBrace: Rule;
+        SpaceBetweenCloseBraceAndElse: Rule;
+        SpaceBetweenCloseBraceAndWhile: Rule;
+        NoSpaceAfterCloseBrace: Rule;
+        NoSpaceBeforeDot: Rule;
+        NoSpaceAfterDot: Rule;
+        NoSpaceBeforeOpenBracket: Rule;
+        NoSpaceAfterCloseBracket: Rule;
+        SpaceAfterOpenBrace: Rule;
+        SpaceBeforeCloseBrace: Rule;
+        NoSpaceAfterOpenBrace: Rule;
+        NoSpaceBeforeCloseBrace: Rule;
+        NoSpaceBetweenEmptyBraceBrackets: Rule;
+        NewLineAfterOpenBraceInBlockContext: Rule;
+        NewLineBeforeCloseBraceInBlockContext: Rule;
+        NoSpaceAfterUnaryPrefixOperator: Rule;
+        NoSpaceAfterUnaryPreincrementOperator: Rule;
+        NoSpaceAfterUnaryPredecrementOperator: Rule;
+        NoSpaceBeforeUnaryPostincrementOperator: Rule;
+        NoSpaceBeforeUnaryPostdecrementOperator: Rule;
+        SpaceAfterPostincrementWhenFollowedByAdd: Rule;
+        SpaceAfterAddWhenFollowedByUnaryPlus: Rule;
+        SpaceAfterAddWhenFollowedByPreincrement: Rule;
+        SpaceAfterPostdecrementWhenFollowedBySubtract: Rule;
+        SpaceAfterSubtractWhenFollowedByUnaryMinus: Rule;
+        SpaceAfterSubtractWhenFollowedByPredecrement: Rule;
+        NoSpaceBeforeComma: Rule;
+        SpaceAfterCertainKeywords: Rule;
+        SpaceAfterLetConstInVariableDeclaration: Rule;
+        NoSpaceBeforeOpenParenInFuncCall: Rule;
+        SpaceAfterFunctionInFuncDecl: Rule;
+        NoSpaceBeforeOpenParenInFuncDecl: Rule;
+        SpaceAfterVoidOperator: Rule;
+        NoSpaceBetweenReturnAndSemicolon: Rule;
+        SpaceBetweenStatements: Rule;
+        SpaceAfterTryFinally: Rule;
+        SpaceAfterGetSetInMember: Rule;
+        SpaceBeforeBinaryKeywordOperator: Rule;
+        SpaceAfterBinaryKeywordOperator: Rule;
+        NoSpaceAfterConstructor: Rule;
+        NoSpaceAfterModuleImport: Rule;
+        SpaceAfterCertainTypeScriptKeywords: Rule;
+        SpaceBeforeCertainTypeScriptKeywords: Rule;
+        SpaceAfterModuleName: Rule;
+        SpaceBeforeArrow: Rule;
+        SpaceAfterArrow: Rule;
+        NoSpaceAfterEllipsis: Rule;
+        NoSpaceAfterOptionalParameters: Rule;
+        NoSpaceBeforeOpenAngularBracket: Rule;
+        NoSpaceBetweenCloseParenAndAngularBracket: Rule;
+        NoSpaceAfterOpenAngularBracket: Rule;
+        NoSpaceBeforeCloseAngularBracket: Rule;
+        NoSpaceAfterCloseAngularBracket: Rule;
+        NoSpaceBetweenEmptyInterfaceBraceBrackets: Rule;
+        HighPriorityCommonRules: Rule[];
+        LowPriorityCommonRules: Rule[];
+        SpaceAfterComma: Rule;
+        NoSpaceAfterComma: Rule;
+        SpaceBeforeBinaryOperator: Rule;
+        SpaceAfterBinaryOperator: Rule;
+        NoSpaceBeforeBinaryOperator: Rule;
+        NoSpaceAfterBinaryOperator: Rule;
+        SpaceAfterKeywordInControl: Rule;
+        NoSpaceAfterKeywordInControl: Rule;
+        FunctionOpenBraceLeftTokenRange: Shared.TokenRange;
+        SpaceBeforeOpenBraceInFunction: Rule;
+        NewLineBeforeOpenBraceInFunction: Rule;
+        TypeScriptOpenBraceLeftTokenRange: Shared.TokenRange;
+        SpaceBeforeOpenBraceInTypeScriptDeclWithBlock: Rule;
+        NewLineBeforeOpenBraceInTypeScriptDeclWithBlock: Rule;
+        ControlOpenBraceLeftTokenRange: Shared.TokenRange;
+        SpaceBeforeOpenBraceInControl: Rule;
+        NewLineBeforeOpenBraceInControl: Rule;
+        SpaceAfterSemicolonInFor: Rule;
+        NoSpaceAfterSemicolonInFor: Rule;
+        SpaceAfterOpenParen: Rule;
+        SpaceBeforeCloseParen: Rule;
+        NoSpaceBetweenParens: Rule;
+        NoSpaceAfterOpenParen: Rule;
+        NoSpaceBeforeCloseParen: Rule;
+        SpaceAfterOpenBracket: Rule;
+        SpaceBeforeCloseBracket: Rule;
+        NoSpaceBetweenBrackets: Rule;
+        NoSpaceAfterOpenBracket: Rule;
+        NoSpaceBeforeCloseBracket: Rule;
+        SpaceAfterAnonymousFunctionKeyword: Rule;
+        NoSpaceAfterAnonymousFunctionKeyword: Rule;
+        SpaceBeforeAt: Rule;
+        NoSpaceAfterAt: Rule;
+        SpaceAfterDecorator: Rule;
+        NoSpaceBetweenFunctionKeywordAndStar: Rule;
+        SpaceAfterStarInGeneratorDeclaration: Rule;
+        NoSpaceBetweenYieldKeywordAndStar: Rule;
+        SpaceBetweenYieldOrYieldStarAndOperand: Rule;
+        SpaceBetweenAsyncAndOpenParen: Rule;
+        SpaceBetweenAsyncAndFunctionKeyword: Rule;
+        NoSpaceBetweenTagAndTemplateString: Rule;
+        NoSpaceAfterTemplateHeadAndMiddle: Rule;
+        SpaceAfterTemplateHeadAndMiddle: Rule;
+        NoSpaceBeforeTemplateMiddleAndTail: Rule;
+        SpaceBeforeTemplateMiddleAndTail: Rule;
+        NoSpaceAfterOpenBraceInJsxExpression: Rule;
+        SpaceAfterOpenBraceInJsxExpression: Rule;
+        NoSpaceBeforeCloseBraceInJsxExpression: Rule;
+        SpaceBeforeCloseBraceInJsxExpression: Rule;
+        SpaceBeforeJsxAttribute: Rule;
+        SpaceBeforeSlashInJsxOpeningElement: Rule;
+        NoSpaceBeforeGreaterThanTokenInJsxOpeningElement: Rule;
+        NoSpaceBeforeEqualInJsxAttribute: Rule;
+        NoSpaceAfterEqualInJsxAttribute: Rule;
+        NoSpaceAfterTypeAssertion: Rule;
+        SpaceAfterTypeAssertion: Rule;
+        constructor();
+        static IsForContext(context: FormattingContext): boolean;
+        static IsNotForContext(context: FormattingContext): boolean;
+        static IsBinaryOpContext(context: FormattingContext): boolean;
+        static IsNotBinaryOpContext(context: FormattingContext): boolean;
+        static IsConditionalOperatorContext(context: FormattingContext): boolean;
+        static IsSameLineTokenOrBeforeMultilineBlockContext(context: FormattingContext): boolean;
+        static IsBeforeMultilineBlockContext(context: FormattingContext): boolean;
+        static IsMultilineBlockContext(context: FormattingContext): boolean;
+        static IsSingleLineBlockContext(context: FormattingContext): boolean;
+        static IsBlockContext(context: FormattingContext): boolean;
+        static IsBeforeBlockContext(context: FormattingContext): boolean;
+        static NodeIsBlockContext(node: Node): boolean;
+        static IsFunctionDeclContext(context: FormattingContext): boolean;
+        static IsFunctionDeclarationOrFunctionExpressionContext(context: FormattingContext): boolean;
+        static IsTypeScriptDeclWithBlockContext(context: FormattingContext): boolean;
+        static NodeIsTypeScriptDeclWithBlockContext(node: Node): boolean;
+        static IsAfterCodeBlockContext(context: FormattingContext): boolean;
+        static IsControlDeclContext(context: FormattingContext): boolean;
+        static IsObjectContext(context: FormattingContext): boolean;
+        static IsFunctionCallContext(context: FormattingContext): boolean;
+        static IsNewContext(context: FormattingContext): boolean;
+        static IsFunctionCallOrNewContext(context: FormattingContext): boolean;
+        static IsPreviousTokenNotComma(context: FormattingContext): boolean;
+        static IsNextTokenNotCloseBracket(context: FormattingContext): boolean;
+        static IsArrowFunctionContext(context: FormattingContext): boolean;
+        static IsNonJsxSameLineTokenContext(context: FormattingContext): boolean;
+        static IsNonJsxElementContext(context: FormattingContext): boolean;
+        static IsJsxExpressionContext(context: FormattingContext): boolean;
+        static IsNextTokenParentJsxAttribute(context: FormattingContext): boolean;
+        static IsJsxAttributeContext(context: FormattingContext): boolean;
+        static IsJsxSelfClosingElementContext(context: FormattingContext): boolean;
+        static IsNotBeforeBlockInFunctionDeclarationContext(context: FormattingContext): boolean;
+        static IsEndOfDecoratorContextOnSameLine(context: FormattingContext): boolean;
+        static NodeIsInDecoratorContext(node: Node): boolean;
+        static IsStartOfVariableDeclarationList(context: FormattingContext): boolean;
+        static IsNotFormatOnEnter(context: FormattingContext): boolean;
+        static IsModuleDeclContext(context: FormattingContext): boolean;
+        static IsObjectTypeContext(context: FormattingContext): boolean;
+        static IsTypeArgumentOrParameterOrAssertion(token: TextRangeWithKind, parent: Node): boolean;
+        static IsTypeArgumentOrParameterOrAssertionContext(context: FormattingContext): boolean;
+        static IsTypeAssertionContext(context: FormattingContext): boolean;
+        static IsVoidOpContext(context: FormattingContext): boolean;
+        static IsYieldOrYieldStarWithOperand(context: FormattingContext): boolean;
+    }
+}
+declare namespace ts.formatting {
+    class RulesMap {
+        map: RulesBucket[];
+        mapRowLength: number;
+        constructor();
+        static create(rules: Rule[]): RulesMap;
+        Initialize(rules: Rule[]): RulesBucket[];
+        FillRules(rules: Rule[], rulesBucketConstructionStateList: RulesBucketConstructionState[]): void;
+        private GetRuleBucketIndex(row, column);
+        private FillRule(rule, rulesBucketConstructionStateList);
+        GetRule(context: FormattingContext): Rule;
+    }
+    enum RulesPosition {
+        IgnoreRulesSpecific = 0,
+        IgnoreRulesAny,
+        ContextRulesSpecific,
+        ContextRulesAny,
+        NoContextRulesSpecific,
+        NoContextRulesAny,
+    }
+    class RulesBucketConstructionState {
+        private rulesInsertionIndexBitmap;
+        constructor();
+        GetInsertionIndex(maskPosition: RulesPosition): number;
+        IncreaseInsertionIndex(maskPosition: RulesPosition): void;
+    }
+    class RulesBucket {
+        private rules;
+        constructor();
+        Rules(): Rule[];
+        AddRule(rule: Rule, specificTokens: boolean, constructionState: RulesBucketConstructionState[], rulesBucketIndex: number): void;
+    }
+}
+declare namespace ts.formatting {
+    namespace Shared {
+        interface ITokenAccess {
+            GetTokens(): SyntaxKind[];
+            Contains(token: SyntaxKind): boolean;
+        }
+        class TokenRangeAccess implements ITokenAccess {
+            private tokens;
+            constructor(from: SyntaxKind, to: SyntaxKind, except: SyntaxKind[]);
+            GetTokens(): SyntaxKind[];
+            Contains(token: SyntaxKind): boolean;
+        }
+        class TokenValuesAccess implements ITokenAccess {
+            private tokens;
+            constructor(tks: SyntaxKind[]);
+            GetTokens(): SyntaxKind[];
+            Contains(token: SyntaxKind): boolean;
+        }
+        class TokenSingleValueAccess implements ITokenAccess {
+            token: SyntaxKind;
+            constructor(token: SyntaxKind);
+            GetTokens(): SyntaxKind[];
+            Contains(tokenValue: SyntaxKind): boolean;
+        }
+        class TokenAllAccess implements ITokenAccess {
+            GetTokens(): SyntaxKind[];
+            Contains(): boolean;
+            toString(): string;
+        }
+        class TokenRange {
+            tokenAccess: ITokenAccess;
+            constructor(tokenAccess: ITokenAccess);
+            static FromToken(token: SyntaxKind): TokenRange;
+            static FromTokens(tokens: SyntaxKind[]): TokenRange;
+            static FromRange(f: SyntaxKind, to: SyntaxKind, except?: SyntaxKind[]): TokenRange;
+            static AllTokens(): TokenRange;
+            GetTokens(): SyntaxKind[];
+            Contains(token: SyntaxKind): boolean;
+            toString(): string;
+            static Any: TokenRange;
+            static AnyIncludingMultilineComments: TokenRange;
+            static Keywords: TokenRange;
+            static BinaryOperators: TokenRange;
+            static BinaryKeywordOperators: TokenRange;
+            static UnaryPrefixOperators: TokenRange;
+            static UnaryPrefixExpressions: TokenRange;
+            static UnaryPreincrementExpressions: TokenRange;
+            static UnaryPostincrementExpressions: TokenRange;
+            static UnaryPredecrementExpressions: TokenRange;
+            static UnaryPostdecrementExpressions: TokenRange;
+            static Comments: TokenRange;
+            static TypeNames: TokenRange;
+        }
+    }
+}
+declare namespace ts.formatting {
+    class RulesProvider {
+        private globalRules;
+        private options;
+        private activeRules;
+        private rulesMap;
+        constructor();
+        getRuleName(rule: Rule): string;
+        getRuleByName(name: string): Rule;
+        getRulesMap(): RulesMap;
+        ensureUpToDate(options: ts.FormatCodeSettings): void;
+        private createActiveRules(options);
+    }
+}
+declare namespace ts.formatting {
+    interface TextRangeWithKind extends TextRange {
+        kind: SyntaxKind;
+    }
+    interface TokenInfo {
+        leadingTrivia: TextRangeWithKind[];
+        token: TextRangeWithKind;
+        trailingTrivia: TextRangeWithKind[];
+    }
+    function formatOnEnter(position: number, sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings): TextChange[];
+    function formatOnSemicolon(position: number, sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings): TextChange[];
+    function formatOnClosingCurly(position: number, sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings): TextChange[];
+    function formatDocument(sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings): TextChange[];
+    function formatSelection(start: number, end: number, sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings): TextChange[];
+    function getIndentationString(indentation: number, options: EditorSettings): string;
+}
+declare namespace ts.formatting {
+    namespace SmartIndenter {
+        function getIndentation(position: number, sourceFile: SourceFile, options: EditorSettings): number;
+        function getIndentationForNode(n: Node, ignoreActualIndentationRange: TextRange, sourceFile: SourceFile, options: EditorSettings): number;
+        function getBaseIndentation(options: EditorSettings): number;
+        function childStartsOnTheSameLineWithElseInIfStatement(parent: Node, child: TextRangeWithKind, childStartLine: number, sourceFile: SourceFile): boolean;
+        function findFirstNonWhitespaceCharacterAndColumn(startPos: number, endPos: number, sourceFile: SourceFile, options: EditorSettings): {
+            column: number;
+            character: number;
+        };
+        function findFirstNonWhitespaceColumn(startPos: number, endPos: number, sourceFile: SourceFile, options: EditorSettings): number;
+        function nodeWillIndentChild(parent: TextRangeWithKind, child: TextRangeWithKind, indentByDefault: boolean): boolean;
+        function shouldIndentChildNode(parent: TextRangeWithKind, child?: TextRangeWithKind): boolean;
+    }
+}
+declare namespace ts {
+    interface CodeFix {
+        errorCodes: number[];
+        getCodeActions(context: CodeFixContext): CodeAction[] | undefined;
+    }
+    interface CodeFixContext {
+        errorCode: number;
+        sourceFile: SourceFile;
+        span: TextSpan;
+        program: Program;
+        newLineCharacter: string;
+    }
+    namespace codefix {
+        function registerCodeFix(action: CodeFix): void;
+        function getSupportedErrorCodes(): string[];
+        function getFixes(context: CodeFixContext): CodeAction[];
+    }
+}
+declare namespace ts.codefix {
+}
 declare namespace ts {
     const servicesVersion = "0.5";
     interface DisplayPartsSymbolWriter extends SymbolWriter {
         displayParts(): SymbolDisplayPart[];
     }
+    function toEditorSettings(options: FormatCodeOptions | FormatCodeSettings): FormatCodeSettings;
     function toEditorSettings(options: EditorOptions | EditorSettings): EditorSettings;
     function displayPartsToString(displayParts: SymbolDisplayPart[]): string;
     function getDefaultCompilerOptions(): CompilerOptions;
@@ -2705,840 +10795,9 @@ declare namespace ts {
     let disableIncrementalParsing: boolean;
     function updateLanguageServiceSourceFile(sourceFile: SourceFile, scriptSnapshot: IScriptSnapshot, version: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile;
     function createLanguageService(host: LanguageServiceHost, documentRegistry?: DocumentRegistry): LanguageService;
+    function getNameTable(sourceFile: SourceFile): Map<number>;
     function getDefaultLibFilePath(options: CompilerOptions): string;
 }
-declare namespace ts.server {
-    enum LogLevel {
-        terse = 0,
-        normal = 1,
-        requestTime = 2,
-        verbose = 3,
-    }
-    const emptyArray: ReadonlyArray<any>;
-    interface Logger {
-        close(): void;
-        hasLevel(level: LogLevel): boolean;
-        loggingEnabled(): boolean;
-        perftrc(s: string): void;
-        info(s: string): void;
-        startGroup(): void;
-        endGroup(): void;
-        msg(s: string, type?: Msg.Types): void;
-        getLogFileName(): string;
-    }
-    namespace Msg {
-        type Err = "Err";
-        const Err: Err;
-        type Info = "Info";
-        const Info: Info;
-        type Perf = "Perf";
-        const Perf: Perf;
-        type Types = Err | Info | Perf;
-    }
-    function createInstallTypingsRequest(project: Project, typingOptions: TypingOptions, cachePath?: string): DiscoverTypings;
-    namespace Errors {
-        function ThrowNoProject(): never;
-        function ThrowProjectLanguageServiceDisabled(): never;
-        function ThrowProjectDoesNotContainDocument(fileName: string, project: Project): never;
-    }
-    function getDefaultFormatCodeSettings(host: ServerHost): FormatCodeSettings;
-    function mergeMaps(target: MapLike<any>, source: MapLike<any>): void;
-    function removeItemFromSet<T>(items: T[], itemToRemove: T): void;
-    type NormalizedPath = string & {
-        __normalizedPathTag: any;
-    };
-    function toNormalizedPath(fileName: string): NormalizedPath;
-    function normalizedPathToPath(normalizedPath: NormalizedPath, currentDirectory: string, getCanonicalFileName: (f: string) => string): Path;
-    function asNormalizedPath(fileName: string): NormalizedPath;
-    interface NormalizedPathMap<T> {
-        get(path: NormalizedPath): T;
-        set(path: NormalizedPath, value: T): void;
-        contains(path: NormalizedPath): boolean;
-        remove(path: NormalizedPath): void;
-    }
-    function createNormalizedPathMap<T>(): NormalizedPathMap<T>;
-    const nullLanguageService: LanguageService;
-    interface ServerLanguageServiceHost {
-        setCompilationSettings(options: CompilerOptions): void;
-        notifyFileRemoved(info: ScriptInfo): void;
-    }
-    const nullLanguageServiceHost: ServerLanguageServiceHost;
-    interface ProjectOptions {
-        configHasFilesProperty?: boolean;
-        files?: string[];
-        wildcardDirectories?: Map<WatchDirectoryFlags>;
-        compilerOptions?: CompilerOptions;
-        typingOptions?: TypingOptions;
-        compileOnSave?: boolean;
-    }
-    function isInferredProjectName(name: string): boolean;
-    function makeInferredProjectName(counter: number): string;
-    class ThrottledOperations {
-        private readonly host;
-        private pendingTimeouts;
-        constructor(host: ServerHost);
-        schedule(operationId: string, delay: number, cb: () => void): void;
-        private static run(self, operationId, cb);
-    }
-    class GcTimer {
-        private readonly host;
-        private readonly delay;
-        private readonly logger;
-        private timerId;
-        constructor(host: ServerHost, delay: number, logger: Logger);
-        scheduleCollect(): void;
-        private static run(self);
-    }
-}
-declare namespace ts.server.protocol {
-    namespace CommandTypes {
-        type Brace = "brace";
-        type BraceCompletion = "braceCompletion";
-        type Change = "change";
-        type Close = "close";
-        type Completions = "completions";
-        type CompletionDetails = "completionEntryDetails";
-        type CompileOnSaveAffectedFileList = "compileOnSaveAffectedFileList";
-        type CompileOnSaveEmitFile = "compileOnSaveEmitFile";
-        type Configure = "configure";
-        type Definition = "definition";
-        type Implementation = "implementation";
-        type Exit = "exit";
-        type Format = "format";
-        type Formatonkey = "formatonkey";
-        type Geterr = "geterr";
-        type GeterrForProject = "geterrForProject";
-        type SemanticDiagnosticsSync = "semanticDiagnosticsSync";
-        type SyntacticDiagnosticsSync = "syntacticDiagnosticsSync";
-        type NavBar = "navbar";
-        type Navto = "navto";
-        type NavTree = "navtree";
-        type NavTreeFull = "navtree-full";
-        type Occurrences = "occurrences";
-        type DocumentHighlights = "documentHighlights";
-        type Open = "open";
-        type Quickinfo = "quickinfo";
-        type References = "references";
-        type Reload = "reload";
-        type Rename = "rename";
-        type Saveto = "saveto";
-        type SignatureHelp = "signatureHelp";
-        type TypeDefinition = "typeDefinition";
-        type ProjectInfo = "projectInfo";
-        type ReloadProjects = "reloadProjects";
-        type Unknown = "unknown";
-        type OpenExternalProject = "openExternalProject";
-        type OpenExternalProjects = "openExternalProjects";
-        type CloseExternalProject = "closeExternalProject";
-        type TodoComments = "todoComments";
-        type Indentation = "indentation";
-        type DocCommentTemplate = "docCommentTemplate";
-        type CompilerOptionsForInferredProjects = "compilerOptionsForInferredProjects";
-        type GetCodeFixes = "getCodeFixes";
-        type GetSupportedCodeFixes = "getSupportedCodeFixes";
-    }
-    interface Message {
-        seq: number;
-        type: "request" | "response" | "event";
-    }
-    interface Request extends Message {
-        command: string;
-        arguments?: any;
-    }
-    interface ReloadProjectsRequest extends Message {
-        command: CommandTypes.ReloadProjects;
-    }
-    interface Event extends Message {
-        event: string;
-        body?: any;
-    }
-    interface Response extends Message {
-        request_seq: number;
-        success: boolean;
-        command: string;
-        message?: string;
-        body?: any;
-    }
-    interface FileRequestArgs {
-        file: string;
-        projectFileName?: string;
-    }
-    interface DocCommentTemplateRequest extends FileLocationRequest {
-        command: CommandTypes.DocCommentTemplate;
-    }
-    interface DocCommandTemplateResponse extends Response {
-        body?: TextInsertion;
-    }
-    interface TodoCommentRequest extends FileRequest {
-        command: CommandTypes.TodoComments;
-        arguments: TodoCommentRequestArgs;
-    }
-    interface TodoCommentRequestArgs extends FileRequestArgs {
-        descriptors: TodoCommentDescriptor[];
-    }
-    interface TodoCommentsResponse extends Response {
-        body?: TodoComment[];
-    }
-    interface IndentationRequest extends FileLocationRequest {
-        command: CommandTypes.Indentation;
-        arguments: IndentationRequestArgs;
-    }
-    interface IndentationResponse extends Response {
-        body?: IndentationResult;
-    }
-    interface IndentationResult {
-        position: number;
-        indentation: number;
-    }
-    interface IndentationRequestArgs extends FileLocationRequestArgs {
-        options?: EditorSettings;
-    }
-    interface ProjectInfoRequestArgs extends FileRequestArgs {
-        needFileNameList: boolean;
-    }
-    interface ProjectInfoRequest extends Request {
-        command: CommandTypes.ProjectInfo;
-        arguments: ProjectInfoRequestArgs;
-    }
-    interface CompilerOptionsDiagnosticsRequest extends Request {
-        arguments: CompilerOptionsDiagnosticsRequestArgs;
-    }
-    interface CompilerOptionsDiagnosticsRequestArgs {
-        projectFileName: string;
-    }
-    interface ProjectInfo {
-        configFileName: string;
-        fileNames?: string[];
-        languageServiceDisabled?: boolean;
-    }
-    interface DiagnosticWithLinePosition {
-        message: string;
-        start: number;
-        length: number;
-        startLocation: Location;
-        endLocation: Location;
-        category: string;
-        code: number;
-    }
-    interface ProjectInfoResponse extends Response {
-        body?: ProjectInfo;
-    }
-    interface FileRequest extends Request {
-        arguments: FileRequestArgs;
-    }
-    interface FileLocationRequestArgs extends FileRequestArgs {
-        line: number;
-        offset: number;
-    }
-    interface CodeFixRequest extends Request {
-        command: CommandTypes.GetCodeFixes;
-        arguments: CodeFixRequestArgs;
-    }
-    interface CodeFixRequestArgs extends FileRequestArgs {
-        startLine: number;
-        startOffset: number;
-        endLine: number;
-        endOffset: number;
-        errorCodes?: number[];
-    }
-    interface GetCodeFixesResponse extends Response {
-        body?: CodeAction[];
-    }
-    interface FileLocationRequest extends FileRequest {
-        arguments: FileLocationRequestArgs;
-    }
-    interface GetSupportedCodeFixesRequest extends Request {
-        command: CommandTypes.GetSupportedCodeFixes;
-    }
-    interface GetSupportedCodeFixesResponse extends Response {
-        body?: string[];
-    }
-    interface EncodedSemanticClassificationsRequestArgs extends FileRequestArgs {
-        start: number;
-        length: number;
-    }
-    interface DocumentHighlightsRequestArgs extends FileLocationRequestArgs {
-        filesToSearch: string[];
-    }
-    interface DefinitionRequest extends FileLocationRequest {
-        command: CommandTypes.Definition;
-    }
-    interface TypeDefinitionRequest extends FileLocationRequest {
-        command: CommandTypes.TypeDefinition;
-    }
-    interface ImplementationRequest extends FileLocationRequest {
-        command: CommandTypes.Implementation;
-    }
-    interface Location {
-        line: number;
-        offset: number;
-    }
-    interface TextSpan {
-        start: Location;
-        end: Location;
-    }
-    interface FileSpan extends TextSpan {
-        file: string;
-    }
-    interface DefinitionResponse extends Response {
-        body?: FileSpan[];
-    }
-    interface TypeDefinitionResponse extends Response {
-        body?: FileSpan[];
-    }
-    interface ImplementationResponse extends Response {
-        body?: FileSpan[];
-    }
-    interface BraceCompletionRequest extends FileLocationRequest {
-        command: CommandTypes.BraceCompletion;
-        arguments: BraceCompletionRequestArgs;
-    }
-    interface BraceCompletionRequestArgs extends FileLocationRequestArgs {
-        openingBrace: string;
-    }
-    interface OccurrencesRequest extends FileLocationRequest {
-        command: CommandTypes.Occurrences;
-    }
-    interface OccurrencesResponseItem extends FileSpan {
-        isWriteAccess: boolean;
-    }
-    interface OccurrencesResponse extends Response {
-        body?: OccurrencesResponseItem[];
-    }
-    interface DocumentHighlightsRequest extends FileLocationRequest {
-        command: CommandTypes.DocumentHighlights;
-        arguments: DocumentHighlightsRequestArgs;
-    }
-    interface HighlightSpan extends TextSpan {
-        kind: string;
-    }
-    interface DocumentHighlightsItem {
-        file: string;
-        highlightSpans: HighlightSpan[];
-    }
-    interface DocumentHighlightsResponse extends Response {
-        body?: DocumentHighlightsItem[];
-    }
-    interface ReferencesRequest extends FileLocationRequest {
-        command: CommandTypes.References;
-    }
-    interface ReferencesResponseItem extends FileSpan {
-        lineText: string;
-        isWriteAccess: boolean;
-        isDefinition: boolean;
-    }
-    interface ReferencesResponseBody {
-        refs: ReferencesResponseItem[];
-        symbolName: string;
-        symbolStartOffset: number;
-        symbolDisplayString: string;
-    }
-    interface ReferencesResponse extends Response {
-        body?: ReferencesResponseBody;
-    }
-    interface RenameRequestArgs extends FileLocationRequestArgs {
-        findInComments?: boolean;
-        findInStrings?: boolean;
-    }
-    interface RenameRequest extends FileLocationRequest {
-        command: CommandTypes.Rename;
-        arguments: RenameRequestArgs;
-    }
-    interface RenameInfo {
-        canRename: boolean;
-        localizedErrorMessage?: string;
-        displayName: string;
-        fullDisplayName: string;
-        kind: string;
-        kindModifiers: string;
-    }
-    interface SpanGroup {
-        file: string;
-        locs: TextSpan[];
-    }
-    interface RenameResponseBody {
-        info: RenameInfo;
-        locs: SpanGroup[];
-    }
-    interface RenameResponse extends Response {
-        body?: RenameResponseBody;
-    }
-    interface ExternalFile {
-        fileName: string;
-        scriptKind?: ScriptKindName | ts.ScriptKind;
-        hasMixedContent?: boolean;
-        content?: string;
-    }
-    interface ExternalProject {
-        projectFileName: string;
-        rootFiles: ExternalFile[];
-        options: ExternalProjectCompilerOptions;
-        typingOptions?: TypingOptions;
-    }
-    interface CompileOnSaveMixin {
-        compileOnSave?: boolean;
-    }
-    type ExternalProjectCompilerOptions = CompilerOptions & CompileOnSaveMixin;
-    interface ProjectChanges {
-        added: string[];
-        removed: string[];
-    }
-    interface ConfigureRequestArguments {
-        hostInfo?: string;
-        file?: string;
-        formatOptions?: FormatCodeSettings;
-    }
-    interface ConfigureRequest extends Request {
-        command: CommandTypes.Configure;
-        arguments: ConfigureRequestArguments;
-    }
-    interface ConfigureResponse extends Response {
-    }
-    interface OpenRequestArgs extends FileRequestArgs {
-        fileContent?: string;
-        scriptKindName?: ScriptKindName;
-    }
-    type ScriptKindName = "TS" | "JS" | "TSX" | "JSX";
-    interface OpenRequest extends Request {
-        command: CommandTypes.Open;
-        arguments: OpenRequestArgs;
-    }
-    interface OpenExternalProjectRequest extends Request {
-        command: CommandTypes.OpenExternalProject;
-        arguments: OpenExternalProjectArgs;
-    }
-    type OpenExternalProjectArgs = ExternalProject;
-    interface OpenExternalProjectsRequest extends Request {
-        command: CommandTypes.OpenExternalProjects;
-        arguments: OpenExternalProjectsArgs;
-    }
-    interface OpenExternalProjectsArgs {
-        projects: ExternalProject[];
-    }
-    interface OpenExternalProjectResponse extends Response {
-    }
-    interface OpenExternalProjectsResponse extends Response {
-    }
-    interface CloseExternalProjectRequest extends Request {
-        command: CommandTypes.CloseExternalProject;
-        arguments: CloseExternalProjectRequestArgs;
-    }
-    interface CloseExternalProjectRequestArgs {
-        projectFileName: string;
-    }
-    interface CloseExternalProjectResponse extends Response {
-    }
-    interface SetCompilerOptionsForInferredProjectsRequest extends Request {
-        command: CommandTypes.CompilerOptionsForInferredProjects;
-        arguments: SetCompilerOptionsForInferredProjectsArgs;
-    }
-    interface SetCompilerOptionsForInferredProjectsArgs {
-        options: ExternalProjectCompilerOptions;
-    }
-    interface SetCompilerOptionsForInferredProjectsResponse extends Response {
-    }
-    interface ExitRequest extends Request {
-        command: CommandTypes.Exit;
-    }
-    interface CloseRequest extends FileRequest {
-        command: CommandTypes.Close;
-    }
-    interface CompileOnSaveAffectedFileListRequest extends FileRequest {
-        command: CommandTypes.CompileOnSaveAffectedFileList;
-    }
-    interface CompileOnSaveAffectedFileListSingleProject {
-        projectFileName: string;
-        fileNames: string[];
-    }
-    interface CompileOnSaveAffectedFileListResponse extends Response {
-        body: CompileOnSaveAffectedFileListSingleProject[];
-    }
-    interface CompileOnSaveEmitFileRequest extends FileRequest {
-        command: CommandTypes.CompileOnSaveEmitFile;
-        arguments: CompileOnSaveEmitFileRequestArgs;
-    }
-    interface CompileOnSaveEmitFileRequestArgs extends FileRequestArgs {
-        forced?: boolean;
-    }
-    interface QuickInfoRequest extends FileLocationRequest {
-        command: CommandTypes.Quickinfo;
-    }
-    interface QuickInfoResponseBody {
-        kind: string;
-        kindModifiers: string;
-        start: Location;
-        end: Location;
-        displayString: string;
-        documentation: string;
-    }
-    interface QuickInfoResponse extends Response {
-        body?: QuickInfoResponseBody;
-    }
-    interface FormatRequestArgs extends FileLocationRequestArgs {
-        endLine: number;
-        endOffset: number;
-        options?: FormatCodeSettings;
-    }
-    interface FormatRequest extends FileLocationRequest {
-        command: CommandTypes.Format;
-        arguments: FormatRequestArgs;
-    }
-    interface CodeEdit {
-        start: Location;
-        end: Location;
-        newText: string;
-    }
-    interface FileCodeEdits {
-        fileName: string;
-        textChanges: CodeEdit[];
-    }
-    interface CodeFixResponse extends Response {
-        body?: CodeAction[];
-    }
-    interface CodeAction {
-        description: string;
-        changes: FileCodeEdits[];
-    }
-    interface FormatResponse extends Response {
-        body?: CodeEdit[];
-    }
-    interface FormatOnKeyRequestArgs extends FileLocationRequestArgs {
-        key: string;
-        options?: FormatCodeSettings;
-    }
-    interface FormatOnKeyRequest extends FileLocationRequest {
-        command: CommandTypes.Formatonkey;
-        arguments: FormatOnKeyRequestArgs;
-    }
-    interface CompletionsRequestArgs extends FileLocationRequestArgs {
-        prefix?: string;
-    }
-    interface CompletionsRequest extends FileLocationRequest {
-        command: CommandTypes.Completions;
-        arguments: CompletionsRequestArgs;
-    }
-    interface CompletionDetailsRequestArgs extends FileLocationRequestArgs {
-        entryNames: string[];
-    }
-    interface CompletionDetailsRequest extends FileLocationRequest {
-        command: CommandTypes.CompletionDetails;
-        arguments: CompletionDetailsRequestArgs;
-    }
-    interface SymbolDisplayPart {
-        text: string;
-        kind: string;
-    }
-    interface CompletionEntry {
-        name: string;
-        kind: string;
-        kindModifiers: string;
-        sortText: string;
-        replacementSpan?: TextSpan;
-    }
-    interface CompletionEntryDetails {
-        name: string;
-        kind: string;
-        kindModifiers: string;
-        displayParts: SymbolDisplayPart[];
-        documentation: SymbolDisplayPart[];
-    }
-    interface CompletionsResponse extends Response {
-        body?: CompletionEntry[];
-    }
-    interface CompletionDetailsResponse extends Response {
-        body?: CompletionEntryDetails[];
-    }
-    interface SignatureHelpParameter {
-        name: string;
-        documentation: SymbolDisplayPart[];
-        displayParts: SymbolDisplayPart[];
-        isOptional: boolean;
-    }
-    interface SignatureHelpItem {
-        isVariadic: boolean;
-        prefixDisplayParts: SymbolDisplayPart[];
-        suffixDisplayParts: SymbolDisplayPart[];
-        separatorDisplayParts: SymbolDisplayPart[];
-        parameters: SignatureHelpParameter[];
-        documentation: SymbolDisplayPart[];
-    }
-    interface SignatureHelpItems {
-        items: SignatureHelpItem[];
-        applicableSpan: TextSpan;
-        selectedItemIndex: number;
-        argumentIndex: number;
-        argumentCount: number;
-    }
-    interface SignatureHelpRequestArgs extends FileLocationRequestArgs {
-    }
-    interface SignatureHelpRequest extends FileLocationRequest {
-        command: CommandTypes.SignatureHelp;
-        arguments: SignatureHelpRequestArgs;
-    }
-    interface SignatureHelpResponse extends Response {
-        body?: SignatureHelpItems;
-    }
-    interface SemanticDiagnosticsSyncRequest extends FileRequest {
-        command: CommandTypes.SemanticDiagnosticsSync;
-        arguments: SemanticDiagnosticsSyncRequestArgs;
-    }
-    interface SemanticDiagnosticsSyncRequestArgs extends FileRequestArgs {
-        includeLinePosition?: boolean;
-    }
-    interface SemanticDiagnosticsSyncResponse extends Response {
-        body?: Diagnostic[] | DiagnosticWithLinePosition[];
-    }
-    interface SyntacticDiagnosticsSyncRequest extends FileRequest {
-        command: CommandTypes.SyntacticDiagnosticsSync;
-        arguments: SyntacticDiagnosticsSyncRequestArgs;
-    }
-    interface SyntacticDiagnosticsSyncRequestArgs extends FileRequestArgs {
-        includeLinePosition?: boolean;
-    }
-    interface SyntacticDiagnosticsSyncResponse extends Response {
-        body?: Diagnostic[] | DiagnosticWithLinePosition[];
-    }
-    interface GeterrForProjectRequestArgs {
-        file: string;
-        delay: number;
-    }
-    interface GeterrForProjectRequest extends Request {
-        command: CommandTypes.GeterrForProject;
-        arguments: GeterrForProjectRequestArgs;
-    }
-    interface GeterrRequestArgs {
-        files: string[];
-        delay: number;
-    }
-    interface GeterrRequest extends Request {
-        command: CommandTypes.Geterr;
-        arguments: GeterrRequestArgs;
-    }
-    interface Diagnostic {
-        start: Location;
-        end: Location;
-        text: string;
-        code?: number;
-    }
-    interface DiagnosticEventBody {
-        file: string;
-        diagnostics: Diagnostic[];
-    }
-    interface DiagnosticEvent extends Event {
-        body?: DiagnosticEventBody;
-    }
-    interface ConfigFileDiagnosticEventBody {
-        triggerFile: string;
-        configFile: string;
-        diagnostics: Diagnostic[];
-    }
-    interface ConfigFileDiagnosticEvent extends Event {
-        body?: ConfigFileDiagnosticEventBody;
-        event: "configFileDiag";
-    }
-    interface ReloadRequestArgs extends FileRequestArgs {
-        tmpfile: string;
-    }
-    interface ReloadRequest extends FileRequest {
-        command: CommandTypes.Reload;
-        arguments: ReloadRequestArgs;
-    }
-    interface ReloadResponse extends Response {
-    }
-    interface SavetoRequestArgs extends FileRequestArgs {
-        tmpfile: string;
-    }
-    interface SavetoRequest extends FileRequest {
-        command: CommandTypes.Saveto;
-        arguments: SavetoRequestArgs;
-    }
-    interface NavtoRequestArgs extends FileRequestArgs {
-        searchValue: string;
-        maxResultCount?: number;
-        currentFileOnly?: boolean;
-        projectFileName?: string;
-    }
-    interface NavtoRequest extends FileRequest {
-        command: CommandTypes.Navto;
-        arguments: NavtoRequestArgs;
-    }
-    interface NavtoItem {
-        name: string;
-        kind: string;
-        matchKind?: string;
-        isCaseSensitive?: boolean;
-        kindModifiers?: string;
-        file: string;
-        start: Location;
-        end: Location;
-        containerName?: string;
-        containerKind?: string;
-    }
-    interface NavtoResponse extends Response {
-        body?: NavtoItem[];
-    }
-    interface ChangeRequestArgs extends FormatRequestArgs {
-        insertString?: string;
-    }
-    interface ChangeRequest extends FileLocationRequest {
-        command: CommandTypes.Change;
-        arguments: ChangeRequestArgs;
-    }
-    interface BraceResponse extends Response {
-        body?: TextSpan[];
-    }
-    interface BraceRequest extends FileLocationRequest {
-        command: CommandTypes.Brace;
-    }
-    interface NavBarRequest extends FileRequest {
-        command: CommandTypes.NavBar;
-    }
-    interface NavTreeRequest extends FileRequest {
-        command: CommandTypes.NavTree;
-    }
-    interface NavigationBarItem {
-        text: string;
-        kind: string;
-        kindModifiers?: string;
-        spans: TextSpan[];
-        childItems?: NavigationBarItem[];
-        indent: number;
-    }
-    interface NavigationTree {
-        text: string;
-        kind: string;
-        kindModifiers: string;
-        spans: TextSpan[];
-        childItems?: NavigationTree[];
-    }
-    interface NavBarResponse extends Response {
-        body?: NavigationBarItem[];
-    }
-    interface NavTreeResponse extends Response {
-        body?: NavigationTree;
-    }
-    namespace IndentStyle {
-        type None = "None";
-        type Block = "Block";
-        type Smart = "Smart";
-    }
-    type IndentStyle = IndentStyle.None | IndentStyle.Block | IndentStyle.Smart;
-    interface EditorSettings {
-        baseIndentSize?: number;
-        indentSize?: number;
-        tabSize?: number;
-        newLineCharacter?: string;
-        convertTabsToSpaces?: boolean;
-        indentStyle?: IndentStyle | ts.IndentStyle;
-    }
-    interface FormatCodeSettings extends EditorSettings {
-        insertSpaceAfterCommaDelimiter?: boolean;
-        insertSpaceAfterSemicolonInForStatements?: boolean;
-        insertSpaceBeforeAndAfterBinaryOperators?: boolean;
-        insertSpaceAfterKeywordsInControlFlowStatements?: boolean;
-        insertSpaceAfterFunctionKeywordForAnonymousFunctions?: boolean;
-        insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis?: boolean;
-        insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets?: boolean;
-        insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces?: boolean;
-        insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces?: boolean;
-        placeOpenBraceOnNewLineForFunctions?: boolean;
-        placeOpenBraceOnNewLineForControlBlocks?: boolean;
-    }
-    interface CompilerOptions {
-        allowJs?: boolean;
-        allowSyntheticDefaultImports?: boolean;
-        allowUnreachableCode?: boolean;
-        allowUnusedLabels?: boolean;
-        baseUrl?: string;
-        charset?: string;
-        declaration?: boolean;
-        declarationDir?: string;
-        disableSizeLimit?: boolean;
-        emitBOM?: boolean;
-        emitDecoratorMetadata?: boolean;
-        experimentalDecorators?: boolean;
-        forceConsistentCasingInFileNames?: boolean;
-        inlineSourceMap?: boolean;
-        inlineSources?: boolean;
-        isolatedModules?: boolean;
-        jsx?: JsxEmit | ts.JsxEmit;
-        lib?: string[];
-        locale?: string;
-        mapRoot?: string;
-        maxNodeModuleJsDepth?: number;
-        module?: ModuleKind | ts.ModuleKind;
-        moduleResolution?: ModuleResolutionKind | ts.ModuleResolutionKind;
-        newLine?: NewLineKind | ts.NewLineKind;
-        noEmit?: boolean;
-        noEmitHelpers?: boolean;
-        noEmitOnError?: boolean;
-        noErrorTruncation?: boolean;
-        noFallthroughCasesInSwitch?: boolean;
-        noImplicitAny?: boolean;
-        noImplicitReturns?: boolean;
-        noImplicitThis?: boolean;
-        noUnusedLocals?: boolean;
-        noUnusedParameters?: boolean;
-        noImplicitUseStrict?: boolean;
-        noLib?: boolean;
-        noResolve?: boolean;
-        out?: string;
-        outDir?: string;
-        outFile?: string;
-        paths?: MapLike<string[]>;
-        preserveConstEnums?: boolean;
-        project?: string;
-        reactNamespace?: string;
-        removeComments?: boolean;
-        rootDir?: string;
-        rootDirs?: string[];
-        skipLibCheck?: boolean;
-        skipDefaultLibCheck?: boolean;
-        sourceMap?: boolean;
-        sourceRoot?: string;
-        strictNullChecks?: boolean;
-        suppressExcessPropertyErrors?: boolean;
-        suppressImplicitAnyIndexErrors?: boolean;
-        target?: ScriptTarget | ts.ScriptTarget;
-        traceResolution?: boolean;
-        types?: string[];
-        typeRoots?: string[];
-        [option: string]: CompilerOptionsValue | undefined;
-    }
-    namespace JsxEmit {
-        type None = "None";
-        type Preserve = "Preserve";
-        type React = "React";
-    }
-    type JsxEmit = JsxEmit.None | JsxEmit.Preserve | JsxEmit.React;
-    namespace ModuleKind {
-        type None = "None";
-        type CommonJS = "CommonJS";
-        type AMD = "AMD";
-        type UMD = "UMD";
-        type System = "System";
-        type ES6 = "ES6";
-        type ES2015 = "ES2015";
-    }
-    type ModuleKind = ModuleKind.None | ModuleKind.CommonJS | ModuleKind.AMD | ModuleKind.UMD | ModuleKind.System | ModuleKind.ES6 | ModuleKind.ES2015;
-    namespace ModuleResolutionKind {
-        type Classic = "Classic";
-        type Node = "Node";
-    }
-    type ModuleResolutionKind = ModuleResolutionKind.Classic | ModuleResolutionKind.Node;
-    namespace NewLineKind {
-        type Crlf = "Crlf";
-        type Lf = "Lf";
-    }
-    type NewLineKind = NewLineKind.Crlf | NewLineKind.Lf;
-    namespace ScriptTarget {
-        type ES3 = "ES3";
-        type ES5 = "ES5";
-        type ES6 = "ES6";
-        type ES2015 = "ES2015";
-    }
-    type ScriptTarget = ScriptTarget.ES3 | ScriptTarget.ES5 | ScriptTarget.ES6 | ScriptTarget.ES2015;
-}
 declare namespace ts.server {
     class ScriptInfo {
         private readonly host;
@@ -3583,16 +10842,20 @@ declare namespace ts.server {
         private readonly resolvedModuleNames;
         private readonly resolvedTypeReferenceDirectives;
         private readonly getCanonicalFileName;
+        private filesWithChangedSetOfUnresolvedImports;
         private readonly resolveModuleName;
         readonly trace: (s: string) => void;
+        readonly realpath?: (path: string) => string;
         constructor(host: ServerHost, project: Project, cancellationToken: HostCancellationToken);
-        private resolveNamesWithLocalCache<T, R>(names, containingFile, cache, loader, getResult);
+        startRecordingFilesWithChangedResolutions(): void;
+        finishRecordingFilesWithChangedResolutions(): Path[];
+        private resolveNamesWithLocalCache<T, R>(names, containingFile, cache, loader, getResult, getResultFileName, logChanges);
         getProjectVersion(): string;
         getCompilationSettings(): CompilerOptions;
         useCaseSensitiveFileNames(): boolean;
         getCancellationToken(): HostCancellationToken;
         resolveTypeReferenceDirectives(typeDirectiveNames: string[], containingFile: string): ResolvedTypeReferenceDirective[];
-        resolveModuleNames(moduleNames: string[], containingFile: string): ResolvedModule[];
+        resolveModuleNames(moduleNames: string[], containingFile: string): ResolvedModuleFull[];
         getDefaultLibFileName(): string;
         getScriptSnapshot(filename: string): ts.IScriptSnapshot;
         getScriptFileNames(): string[];
@@ -3612,22 +10875,19 @@ declare namespace ts.server {
 }
 declare namespace ts.server {
     interface ITypingsInstaller {
-        enqueueInstallTypingsRequest(p: Project, typingOptions: TypingOptions): void;
+        enqueueInstallTypingsRequest(p: Project, typingOptions: TypingOptions, unresolvedImports: SortedReadonlyArray<string>): void;
         attach(projectService: ProjectService): void;
         onProjectClosed(p: Project): void;
         readonly globalTypingsCacheLocation: string;
     }
     const nullTypingsInstaller: ITypingsInstaller;
-    interface TypingsArray extends ReadonlyArray<string> {
-        " __typingsArrayBrand": any;
-    }
     class TypingsCache {
         private readonly installer;
         private readonly perProjectCache;
         constructor(installer: ITypingsInstaller);
-        getTypingsForProject(project: Project, forceRefresh: boolean): TypingsArray;
-        invalidateCachedTypingsForProject(project: Project): void;
-        updateTypingsForProject(projectName: string, compilerOptions: CompilerOptions, typingOptions: TypingOptions, newTypings: string[]): void;
+        getTypingsForProject(project: Project, unresolvedImports: SortedReadonlyArray<string>, forceRefresh: boolean): SortedReadonlyArray<string>;
+        updateTypingsForProject(projectName: string, compilerOptions: CompilerOptions, typingOptions: TypingOptions, unresolvedImports: SortedReadonlyArray<string>, newTypings: string[]): void;
+        deleteTypingsForProject(projectName: string): void;
         onProjectClosed(project: Project): void;
     }
 }
@@ -3663,6 +10923,15 @@ declare namespace ts.server {
     interface ProjectFilesWithTSDiagnostics extends protocol.ProjectFiles {
         projectErrors: Diagnostic[];
     }
+    class UnresolvedImportsMap {
+        readonly perFileMap: FileMap<ReadonlyArray<string>>;
+        private version;
+        clear(): void;
+        getVersion(): number;
+        remove(path: Path): void;
+        get(path: Path): ReadonlyArray<string>;
+        set(path: Path, value: ReadonlyArray<string>): void;
+    }
     abstract class Project {
         readonly projectKind: ProjectKind;
         readonly projectService: ProjectService;
@@ -3674,6 +10943,8 @@ declare namespace ts.server {
         private rootFilesMap;
         private lsHost;
         private program;
+        private cachedUnresolvedImportsPerFile;
+        private lastCachedUnresolvedImportsList;
         private languageService;
         builder: Builder;
         private lastReportedFileNames;
@@ -3685,6 +10956,7 @@ declare namespace ts.server {
         typesVersion: number;
         isNonTsProject(): boolean;
         isJsOnlyProject(): boolean;
+        getCachedUnresolvedImportsPerFile_TestOnly(): UnresolvedImportsMap;
         constructor(projectKind: ProjectKind, projectService: ProjectService, documentRegistry: ts.DocumentRegistry, hasExplicitListOfFiles: boolean, languageServiceEnabled: boolean, compilerOptions: CompilerOptions, compileOnSaveEnabled: boolean);
         getProjectErrors(): Diagnostic[];
         getLanguageService(ensureSynchronized?: boolean): LanguageService;
@@ -3705,7 +10977,7 @@ declare namespace ts.server {
         getRootScriptInfos(): ScriptInfo[];
         getScriptInfos(): ScriptInfo[];
         getFileEmitOutput(info: ScriptInfo, emitOnlyDtsFiles: boolean): EmitOutput;
-        getFileNames(): NormalizedPath[];
+        getFileNames(excludeFilesFromExternalLibraries?: boolean): NormalizedPath[];
         getAllEmittableFiles(): string[];
         containsScriptInfo(info: ScriptInfo): boolean;
         containsFile(filename: NormalizedPath, requireOpen?: boolean): boolean;
@@ -3713,6 +10985,7 @@ declare namespace ts.server {
         addRoot(info: ScriptInfo): void;
         removeFile(info: ScriptInfo, detachFromProject?: boolean): void;
         markAsDirty(): void;
+        private extractUnresolvedImportsFromSourceFile(file, result);
         updateGraph(): boolean;
         private setTypings(typings);
         private updateGraphWorker();
@@ -3727,11 +11000,10 @@ declare namespace ts.server {
         private removeRootFileIfNecessary(info);
     }
     class InferredProject extends Project {
-        compileOnSaveEnabled: boolean;
         private static NextId;
         private readonly inferredProjectName;
         directoriesWatchedForTsconfig: string[];
-        constructor(projectService: ProjectService, documentRegistry: ts.DocumentRegistry, languageServiceEnabled: boolean, compilerOptions: CompilerOptions, compileOnSaveEnabled: boolean);
+        constructor(projectService: ProjectService, documentRegistry: ts.DocumentRegistry, languageServiceEnabled: boolean, compilerOptions: CompilerOptions);
         getProjectName(): string;
         getProjectRootPath(): string;
         close(): void;
@@ -3896,6 +11168,9 @@ declare namespace ts.server {
         fileName: NormalizedPath;
         project: Project;
     }
+    interface EventSender {
+        event(payload: any, eventName: string): void;
+    }
     namespace CommandNames {
         const Brace: protocol.CommandTypes.Brace;
         const BraceFull: protocol.CommandTypes.BraceFull;
@@ -3967,7 +11242,7 @@ declare namespace ts.server {
         const GetSupportedCodeFixes: protocol.CommandTypes.GetSupportedCodeFixes;
     }
     function formatMessage<T extends protocol.Message>(msg: T, logger: server.Logger, byteLength: (s: string, encoding: string) => number, newLine: string): string;
-    class Session {
+    class Session implements EventSender {
         private host;
         protected readonly typingsInstaller: ITypingsInstaller;
         private byteLength;
@@ -4193,3 +11468,178 @@ declare namespace ts.server {
         lineCount(): number;
     }
 }
+declare let debugObjectHost: any;
+declare namespace ts {
+    interface ScriptSnapshotShim {
+        getText(start: number, end: number): string;
+        getLength(): number;
+        getChangeRange(oldSnapshot: ScriptSnapshotShim): string;
+        dispose?(): void;
+    }
+    interface Logger {
+        log(s: string): void;
+        trace(s: string): void;
+        error(s: string): void;
+    }
+    interface LanguageServiceShimHost extends Logger {
+        getCompilationSettings(): string;
+        getScriptFileNames(): string;
+        getScriptKind?(fileName: string): ScriptKind;
+        getScriptVersion(fileName: string): string;
+        getScriptSnapshot(fileName: string): ScriptSnapshotShim;
+        getLocalizedDiagnosticMessages(): string;
+        getCancellationToken(): HostCancellationToken;
+        getCurrentDirectory(): string;
+        getDirectories(path: string): string;
+        getDefaultLibFileName(options: string): string;
+        getNewLine?(): string;
+        getProjectVersion?(): string;
+        useCaseSensitiveFileNames?(): boolean;
+        getTypeRootsVersion?(): number;
+        readDirectory(rootDir: string, extension: string, basePaths?: string, excludeEx?: string, includeFileEx?: string, includeDirEx?: string, depth?: number): string;
+        readFile(path: string, encoding?: string): string;
+        fileExists(path: string): boolean;
+        getModuleResolutionsForFile?(fileName: string): string;
+        getTypeReferenceDirectiveResolutionsForFile?(fileName: string): string;
+        directoryExists(directoryName: string): boolean;
+    }
+    interface CoreServicesShimHost extends Logger {
+        directoryExists(directoryName: string): boolean;
+        fileExists(fileName: string): boolean;
+        getCurrentDirectory(): string;
+        getDirectories(path: string): string;
+        readDirectory(rootDir: string, extension: string, basePaths?: string, excludeEx?: string, includeFileEx?: string, includeDirEx?: string, depth?: number): string;
+        readFile(fileName: string): string;
+        realpath?(path: string): string;
+        trace(s: string): void;
+        useCaseSensitiveFileNames?(): boolean;
+    }
+    interface IFileReference {
+        path: string;
+        position: number;
+        length: number;
+    }
+    interface ShimFactory {
+        registerShim(shim: Shim): void;
+        unregisterShim(shim: Shim): void;
+    }
+    interface Shim {
+        dispose(_dummy: any): void;
+    }
+    interface LanguageServiceShim extends Shim {
+        languageService: LanguageService;
+        dispose(_dummy: any): void;
+        refresh(throwOnError: boolean): void;
+        cleanupSemanticCache(): void;
+        getSyntacticDiagnostics(fileName: string): string;
+        getSemanticDiagnostics(fileName: string): string;
+        getCompilerOptionsDiagnostics(): string;
+        getSyntacticClassifications(fileName: string, start: number, length: number): string;
+        getSemanticClassifications(fileName: string, start: number, length: number): string;
+        getEncodedSyntacticClassifications(fileName: string, start: number, length: number): string;
+        getEncodedSemanticClassifications(fileName: string, start: number, length: number): string;
+        getCompletionsAtPosition(fileName: string, position: number): string;
+        getCompletionEntryDetails(fileName: string, position: number, entryName: string): string;
+        getQuickInfoAtPosition(fileName: string, position: number): string;
+        getNameOrDottedNameSpan(fileName: string, startPos: number, endPos: number): string;
+        getBreakpointStatementAtPosition(fileName: string, position: number): string;
+        getSignatureHelpItems(fileName: string, position: number): string;
+        getRenameInfo(fileName: string, position: number): string;
+        findRenameLocations(fileName: string, position: number, findInStrings: boolean, findInComments: boolean): string;
+        getDefinitionAtPosition(fileName: string, position: number): string;
+        getTypeDefinitionAtPosition(fileName: string, position: number): string;
+        getImplementationAtPosition(fileName: string, position: number): string;
+        getReferencesAtPosition(fileName: string, position: number): string;
+        findReferences(fileName: string, position: number): string;
+        getOccurrencesAtPosition(fileName: string, position: number): string;
+        getDocumentHighlights(fileName: string, position: number, filesToSearch: string): string;
+        getNavigateToItems(searchValue: string, maxResultCount?: number, fileName?: string): string;
+        getNavigationBarItems(fileName: string): string;
+        getNavigationTree(fileName: string): string;
+        getOutliningSpans(fileName: string): string;
+        getTodoComments(fileName: string, todoCommentDescriptors: string): string;
+        getBraceMatchingAtPosition(fileName: string, position: number): string;
+        getIndentationAtPosition(fileName: string, position: number, options: string): string;
+        getFormattingEditsForRange(fileName: string, start: number, end: number, options: string): string;
+        getFormattingEditsForDocument(fileName: string, options: string): string;
+        getFormattingEditsAfterKeystroke(fileName: string, position: number, key: string, options: string): string;
+        getDocCommentTemplateAtPosition(fileName: string, position: number): string;
+        isValidBraceCompletionAtPosition(fileName: string, position: number, openingBrace: number): string;
+        getEmitOutput(fileName: string): string;
+        getEmitOutputObject(fileName: string): EmitOutput;
+    }
+    interface ClassifierShim extends Shim {
+        getEncodedLexicalClassifications(text: string, lexState: EndOfLineState, syntacticClassifierAbsent?: boolean): string;
+        getClassificationsForLine(text: string, lexState: EndOfLineState, syntacticClassifierAbsent?: boolean): string;
+    }
+    interface CoreServicesShim extends Shim {
+        getAutomaticTypeDirectiveNames(compilerOptionsJson: string): string;
+        getPreProcessedFileInfo(fileName: string, sourceText: IScriptSnapshot): string;
+        getTSConfigFileInfo(fileName: string, sourceText: IScriptSnapshot): string;
+        getDefaultCompilationSettings(): string;
+        discoverTypings(discoverTypingsJson: string): string;
+    }
+    class LanguageServiceShimHostAdapter implements LanguageServiceHost {
+        private shimHost;
+        private files;
+        private loggingEnabled;
+        private tracingEnabled;
+        resolveModuleNames: (moduleName: string[], containingFile: string) => ResolvedModuleFull[];
+        resolveTypeReferenceDirectives: (typeDirectiveNames: string[], containingFile: string) => ResolvedTypeReferenceDirective[];
+        directoryExists: (directoryName: string) => boolean;
+        constructor(shimHost: LanguageServiceShimHost);
+        log(s: string): void;
+        trace(s: string): void;
+        error(s: string): void;
+        getProjectVersion(): string;
+        getTypeRootsVersion(): number;
+        useCaseSensitiveFileNames(): boolean;
+        getCompilationSettings(): CompilerOptions;
+        getScriptFileNames(): string[];
+        getScriptSnapshot(fileName: string): IScriptSnapshot;
+        getScriptKind(fileName: string): ScriptKind;
+        getScriptVersion(fileName: string): string;
+        getLocalizedDiagnosticMessages(): any;
+        getCancellationToken(): HostCancellationToken;
+        getCurrentDirectory(): string;
+        getDirectories(path: string): string[];
+        getDefaultLibFileName(options: CompilerOptions): string;
+        readDirectory(path: string, extensions?: string[], exclude?: string[], include?: string[], depth?: number): string[];
+        readFile(path: string, encoding?: string): string;
+        fileExists(path: string): boolean;
+    }
+    class CoreServicesShimHostAdapter implements ParseConfigHost, ModuleResolutionHost {
+        private shimHost;
+        directoryExists: (directoryName: string) => boolean;
+        realpath: (path: string) => string;
+        useCaseSensitiveFileNames: boolean;
+        constructor(shimHost: CoreServicesShimHost);
+        readDirectory(rootDir: string, extensions: string[], exclude: string[], include: string[], depth?: number): string[];
+        fileExists(fileName: string): boolean;
+        readFile(fileName: string): string;
+        private readDirectoryFallback(rootDir, extension, exclude);
+        getDirectories(path: string): string[];
+    }
+    function realizeDiagnostics(diagnostics: Diagnostic[], newLine: string): {
+        message: string;
+        start: number;
+        length: number;
+        category: string;
+        code: number;
+    }[];
+    class TypeScriptServicesFactory implements ShimFactory {
+        private _shims;
+        private documentRegistry;
+        getServicesVersion(): string;
+        createLanguageServiceShim(host: LanguageServiceShimHost): LanguageServiceShim;
+        createClassifierShim(logger: Logger): ClassifierShim;
+        createCoreServicesShim(host: CoreServicesShimHost): CoreServicesShim;
+        close(): void;
+        registerShim(shim: Shim): void;
+        unregisterShim(shim: Shim): void;
+    }
+}
+declare namespace TypeScript.Services {
+    const TypeScriptServicesFactory: typeof ts.TypeScriptServicesFactory;
+}
+declare const toolsVersion = "2.2";
diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js
index 0a476fd3ed1..5506c0e0566 100644
--- a/lib/tsserverlibrary.js
+++ b/lib/tsserverlibrary.js
@@ -20,462 +20,19 @@ var __extends = (this && this.__extends) || function (d, b) {
 };
 var ts;
 (function (ts) {
-    (function (SyntaxKind) {
-        SyntaxKind[SyntaxKind["Unknown"] = 0] = "Unknown";
-        SyntaxKind[SyntaxKind["EndOfFileToken"] = 1] = "EndOfFileToken";
-        SyntaxKind[SyntaxKind["SingleLineCommentTrivia"] = 2] = "SingleLineCommentTrivia";
-        SyntaxKind[SyntaxKind["MultiLineCommentTrivia"] = 3] = "MultiLineCommentTrivia";
-        SyntaxKind[SyntaxKind["NewLineTrivia"] = 4] = "NewLineTrivia";
-        SyntaxKind[SyntaxKind["WhitespaceTrivia"] = 5] = "WhitespaceTrivia";
-        SyntaxKind[SyntaxKind["ShebangTrivia"] = 6] = "ShebangTrivia";
-        SyntaxKind[SyntaxKind["ConflictMarkerTrivia"] = 7] = "ConflictMarkerTrivia";
-        SyntaxKind[SyntaxKind["NumericLiteral"] = 8] = "NumericLiteral";
-        SyntaxKind[SyntaxKind["StringLiteral"] = 9] = "StringLiteral";
-        SyntaxKind[SyntaxKind["JsxText"] = 10] = "JsxText";
-        SyntaxKind[SyntaxKind["RegularExpressionLiteral"] = 11] = "RegularExpressionLiteral";
-        SyntaxKind[SyntaxKind["NoSubstitutionTemplateLiteral"] = 12] = "NoSubstitutionTemplateLiteral";
-        SyntaxKind[SyntaxKind["TemplateHead"] = 13] = "TemplateHead";
-        SyntaxKind[SyntaxKind["TemplateMiddle"] = 14] = "TemplateMiddle";
-        SyntaxKind[SyntaxKind["TemplateTail"] = 15] = "TemplateTail";
-        SyntaxKind[SyntaxKind["OpenBraceToken"] = 16] = "OpenBraceToken";
-        SyntaxKind[SyntaxKind["CloseBraceToken"] = 17] = "CloseBraceToken";
-        SyntaxKind[SyntaxKind["OpenParenToken"] = 18] = "OpenParenToken";
-        SyntaxKind[SyntaxKind["CloseParenToken"] = 19] = "CloseParenToken";
-        SyntaxKind[SyntaxKind["OpenBracketToken"] = 20] = "OpenBracketToken";
-        SyntaxKind[SyntaxKind["CloseBracketToken"] = 21] = "CloseBracketToken";
-        SyntaxKind[SyntaxKind["DotToken"] = 22] = "DotToken";
-        SyntaxKind[SyntaxKind["DotDotDotToken"] = 23] = "DotDotDotToken";
-        SyntaxKind[SyntaxKind["SemicolonToken"] = 24] = "SemicolonToken";
-        SyntaxKind[SyntaxKind["CommaToken"] = 25] = "CommaToken";
-        SyntaxKind[SyntaxKind["LessThanToken"] = 26] = "LessThanToken";
-        SyntaxKind[SyntaxKind["LessThanSlashToken"] = 27] = "LessThanSlashToken";
-        SyntaxKind[SyntaxKind["GreaterThanToken"] = 28] = "GreaterThanToken";
-        SyntaxKind[SyntaxKind["LessThanEqualsToken"] = 29] = "LessThanEqualsToken";
-        SyntaxKind[SyntaxKind["GreaterThanEqualsToken"] = 30] = "GreaterThanEqualsToken";
-        SyntaxKind[SyntaxKind["EqualsEqualsToken"] = 31] = "EqualsEqualsToken";
-        SyntaxKind[SyntaxKind["ExclamationEqualsToken"] = 32] = "ExclamationEqualsToken";
-        SyntaxKind[SyntaxKind["EqualsEqualsEqualsToken"] = 33] = "EqualsEqualsEqualsToken";
-        SyntaxKind[SyntaxKind["ExclamationEqualsEqualsToken"] = 34] = "ExclamationEqualsEqualsToken";
-        SyntaxKind[SyntaxKind["EqualsGreaterThanToken"] = 35] = "EqualsGreaterThanToken";
-        SyntaxKind[SyntaxKind["PlusToken"] = 36] = "PlusToken";
-        SyntaxKind[SyntaxKind["MinusToken"] = 37] = "MinusToken";
-        SyntaxKind[SyntaxKind["AsteriskToken"] = 38] = "AsteriskToken";
-        SyntaxKind[SyntaxKind["AsteriskAsteriskToken"] = 39] = "AsteriskAsteriskToken";
-        SyntaxKind[SyntaxKind["SlashToken"] = 40] = "SlashToken";
-        SyntaxKind[SyntaxKind["PercentToken"] = 41] = "PercentToken";
-        SyntaxKind[SyntaxKind["PlusPlusToken"] = 42] = "PlusPlusToken";
-        SyntaxKind[SyntaxKind["MinusMinusToken"] = 43] = "MinusMinusToken";
-        SyntaxKind[SyntaxKind["LessThanLessThanToken"] = 44] = "LessThanLessThanToken";
-        SyntaxKind[SyntaxKind["GreaterThanGreaterThanToken"] = 45] = "GreaterThanGreaterThanToken";
-        SyntaxKind[SyntaxKind["GreaterThanGreaterThanGreaterThanToken"] = 46] = "GreaterThanGreaterThanGreaterThanToken";
-        SyntaxKind[SyntaxKind["AmpersandToken"] = 47] = "AmpersandToken";
-        SyntaxKind[SyntaxKind["BarToken"] = 48] = "BarToken";
-        SyntaxKind[SyntaxKind["CaretToken"] = 49] = "CaretToken";
-        SyntaxKind[SyntaxKind["ExclamationToken"] = 50] = "ExclamationToken";
-        SyntaxKind[SyntaxKind["TildeToken"] = 51] = "TildeToken";
-        SyntaxKind[SyntaxKind["AmpersandAmpersandToken"] = 52] = "AmpersandAmpersandToken";
-        SyntaxKind[SyntaxKind["BarBarToken"] = 53] = "BarBarToken";
-        SyntaxKind[SyntaxKind["QuestionToken"] = 54] = "QuestionToken";
-        SyntaxKind[SyntaxKind["ColonToken"] = 55] = "ColonToken";
-        SyntaxKind[SyntaxKind["AtToken"] = 56] = "AtToken";
-        SyntaxKind[SyntaxKind["EqualsToken"] = 57] = "EqualsToken";
-        SyntaxKind[SyntaxKind["PlusEqualsToken"] = 58] = "PlusEqualsToken";
-        SyntaxKind[SyntaxKind["MinusEqualsToken"] = 59] = "MinusEqualsToken";
-        SyntaxKind[SyntaxKind["AsteriskEqualsToken"] = 60] = "AsteriskEqualsToken";
-        SyntaxKind[SyntaxKind["AsteriskAsteriskEqualsToken"] = 61] = "AsteriskAsteriskEqualsToken";
-        SyntaxKind[SyntaxKind["SlashEqualsToken"] = 62] = "SlashEqualsToken";
-        SyntaxKind[SyntaxKind["PercentEqualsToken"] = 63] = "PercentEqualsToken";
-        SyntaxKind[SyntaxKind["LessThanLessThanEqualsToken"] = 64] = "LessThanLessThanEqualsToken";
-        SyntaxKind[SyntaxKind["GreaterThanGreaterThanEqualsToken"] = 65] = "GreaterThanGreaterThanEqualsToken";
-        SyntaxKind[SyntaxKind["GreaterThanGreaterThanGreaterThanEqualsToken"] = 66] = "GreaterThanGreaterThanGreaterThanEqualsToken";
-        SyntaxKind[SyntaxKind["AmpersandEqualsToken"] = 67] = "AmpersandEqualsToken";
-        SyntaxKind[SyntaxKind["BarEqualsToken"] = 68] = "BarEqualsToken";
-        SyntaxKind[SyntaxKind["CaretEqualsToken"] = 69] = "CaretEqualsToken";
-        SyntaxKind[SyntaxKind["Identifier"] = 70] = "Identifier";
-        SyntaxKind[SyntaxKind["BreakKeyword"] = 71] = "BreakKeyword";
-        SyntaxKind[SyntaxKind["CaseKeyword"] = 72] = "CaseKeyword";
-        SyntaxKind[SyntaxKind["CatchKeyword"] = 73] = "CatchKeyword";
-        SyntaxKind[SyntaxKind["ClassKeyword"] = 74] = "ClassKeyword";
-        SyntaxKind[SyntaxKind["ConstKeyword"] = 75] = "ConstKeyword";
-        SyntaxKind[SyntaxKind["ContinueKeyword"] = 76] = "ContinueKeyword";
-        SyntaxKind[SyntaxKind["DebuggerKeyword"] = 77] = "DebuggerKeyword";
-        SyntaxKind[SyntaxKind["DefaultKeyword"] = 78] = "DefaultKeyword";
-        SyntaxKind[SyntaxKind["DeleteKeyword"] = 79] = "DeleteKeyword";
-        SyntaxKind[SyntaxKind["DoKeyword"] = 80] = "DoKeyword";
-        SyntaxKind[SyntaxKind["ElseKeyword"] = 81] = "ElseKeyword";
-        SyntaxKind[SyntaxKind["EnumKeyword"] = 82] = "EnumKeyword";
-        SyntaxKind[SyntaxKind["ExportKeyword"] = 83] = "ExportKeyword";
-        SyntaxKind[SyntaxKind["ExtendsKeyword"] = 84] = "ExtendsKeyword";
-        SyntaxKind[SyntaxKind["FalseKeyword"] = 85] = "FalseKeyword";
-        SyntaxKind[SyntaxKind["FinallyKeyword"] = 86] = "FinallyKeyword";
-        SyntaxKind[SyntaxKind["ForKeyword"] = 87] = "ForKeyword";
-        SyntaxKind[SyntaxKind["FunctionKeyword"] = 88] = "FunctionKeyword";
-        SyntaxKind[SyntaxKind["IfKeyword"] = 89] = "IfKeyword";
-        SyntaxKind[SyntaxKind["ImportKeyword"] = 90] = "ImportKeyword";
-        SyntaxKind[SyntaxKind["InKeyword"] = 91] = "InKeyword";
-        SyntaxKind[SyntaxKind["InstanceOfKeyword"] = 92] = "InstanceOfKeyword";
-        SyntaxKind[SyntaxKind["NewKeyword"] = 93] = "NewKeyword";
-        SyntaxKind[SyntaxKind["NullKeyword"] = 94] = "NullKeyword";
-        SyntaxKind[SyntaxKind["ReturnKeyword"] = 95] = "ReturnKeyword";
-        SyntaxKind[SyntaxKind["SuperKeyword"] = 96] = "SuperKeyword";
-        SyntaxKind[SyntaxKind["SwitchKeyword"] = 97] = "SwitchKeyword";
-        SyntaxKind[SyntaxKind["ThisKeyword"] = 98] = "ThisKeyword";
-        SyntaxKind[SyntaxKind["ThrowKeyword"] = 99] = "ThrowKeyword";
-        SyntaxKind[SyntaxKind["TrueKeyword"] = 100] = "TrueKeyword";
-        SyntaxKind[SyntaxKind["TryKeyword"] = 101] = "TryKeyword";
-        SyntaxKind[SyntaxKind["TypeOfKeyword"] = 102] = "TypeOfKeyword";
-        SyntaxKind[SyntaxKind["VarKeyword"] = 103] = "VarKeyword";
-        SyntaxKind[SyntaxKind["VoidKeyword"] = 104] = "VoidKeyword";
-        SyntaxKind[SyntaxKind["WhileKeyword"] = 105] = "WhileKeyword";
-        SyntaxKind[SyntaxKind["WithKeyword"] = 106] = "WithKeyword";
-        SyntaxKind[SyntaxKind["ImplementsKeyword"] = 107] = "ImplementsKeyword";
-        SyntaxKind[SyntaxKind["InterfaceKeyword"] = 108] = "InterfaceKeyword";
-        SyntaxKind[SyntaxKind["LetKeyword"] = 109] = "LetKeyword";
-        SyntaxKind[SyntaxKind["PackageKeyword"] = 110] = "PackageKeyword";
-        SyntaxKind[SyntaxKind["PrivateKeyword"] = 111] = "PrivateKeyword";
-        SyntaxKind[SyntaxKind["ProtectedKeyword"] = 112] = "ProtectedKeyword";
-        SyntaxKind[SyntaxKind["PublicKeyword"] = 113] = "PublicKeyword";
-        SyntaxKind[SyntaxKind["StaticKeyword"] = 114] = "StaticKeyword";
-        SyntaxKind[SyntaxKind["YieldKeyword"] = 115] = "YieldKeyword";
-        SyntaxKind[SyntaxKind["AbstractKeyword"] = 116] = "AbstractKeyword";
-        SyntaxKind[SyntaxKind["AsKeyword"] = 117] = "AsKeyword";
-        SyntaxKind[SyntaxKind["AnyKeyword"] = 118] = "AnyKeyword";
-        SyntaxKind[SyntaxKind["AsyncKeyword"] = 119] = "AsyncKeyword";
-        SyntaxKind[SyntaxKind["AwaitKeyword"] = 120] = "AwaitKeyword";
-        SyntaxKind[SyntaxKind["BooleanKeyword"] = 121] = "BooleanKeyword";
-        SyntaxKind[SyntaxKind["ConstructorKeyword"] = 122] = "ConstructorKeyword";
-        SyntaxKind[SyntaxKind["DeclareKeyword"] = 123] = "DeclareKeyword";
-        SyntaxKind[SyntaxKind["GetKeyword"] = 124] = "GetKeyword";
-        SyntaxKind[SyntaxKind["IsKeyword"] = 125] = "IsKeyword";
-        SyntaxKind[SyntaxKind["ModuleKeyword"] = 126] = "ModuleKeyword";
-        SyntaxKind[SyntaxKind["NamespaceKeyword"] = 127] = "NamespaceKeyword";
-        SyntaxKind[SyntaxKind["NeverKeyword"] = 128] = "NeverKeyword";
-        SyntaxKind[SyntaxKind["ReadonlyKeyword"] = 129] = "ReadonlyKeyword";
-        SyntaxKind[SyntaxKind["RequireKeyword"] = 130] = "RequireKeyword";
-        SyntaxKind[SyntaxKind["NumberKeyword"] = 131] = "NumberKeyword";
-        SyntaxKind[SyntaxKind["SetKeyword"] = 132] = "SetKeyword";
-        SyntaxKind[SyntaxKind["StringKeyword"] = 133] = "StringKeyword";
-        SyntaxKind[SyntaxKind["SymbolKeyword"] = 134] = "SymbolKeyword";
-        SyntaxKind[SyntaxKind["TypeKeyword"] = 135] = "TypeKeyword";
-        SyntaxKind[SyntaxKind["UndefinedKeyword"] = 136] = "UndefinedKeyword";
-        SyntaxKind[SyntaxKind["FromKeyword"] = 137] = "FromKeyword";
-        SyntaxKind[SyntaxKind["GlobalKeyword"] = 138] = "GlobalKeyword";
-        SyntaxKind[SyntaxKind["OfKeyword"] = 139] = "OfKeyword";
-        SyntaxKind[SyntaxKind["QualifiedName"] = 140] = "QualifiedName";
-        SyntaxKind[SyntaxKind["ComputedPropertyName"] = 141] = "ComputedPropertyName";
-        SyntaxKind[SyntaxKind["TypeParameter"] = 142] = "TypeParameter";
-        SyntaxKind[SyntaxKind["Parameter"] = 143] = "Parameter";
-        SyntaxKind[SyntaxKind["Decorator"] = 144] = "Decorator";
-        SyntaxKind[SyntaxKind["PropertySignature"] = 145] = "PropertySignature";
-        SyntaxKind[SyntaxKind["PropertyDeclaration"] = 146] = "PropertyDeclaration";
-        SyntaxKind[SyntaxKind["MethodSignature"] = 147] = "MethodSignature";
-        SyntaxKind[SyntaxKind["MethodDeclaration"] = 148] = "MethodDeclaration";
-        SyntaxKind[SyntaxKind["Constructor"] = 149] = "Constructor";
-        SyntaxKind[SyntaxKind["GetAccessor"] = 150] = "GetAccessor";
-        SyntaxKind[SyntaxKind["SetAccessor"] = 151] = "SetAccessor";
-        SyntaxKind[SyntaxKind["CallSignature"] = 152] = "CallSignature";
-        SyntaxKind[SyntaxKind["ConstructSignature"] = 153] = "ConstructSignature";
-        SyntaxKind[SyntaxKind["IndexSignature"] = 154] = "IndexSignature";
-        SyntaxKind[SyntaxKind["TypePredicate"] = 155] = "TypePredicate";
-        SyntaxKind[SyntaxKind["TypeReference"] = 156] = "TypeReference";
-        SyntaxKind[SyntaxKind["FunctionType"] = 157] = "FunctionType";
-        SyntaxKind[SyntaxKind["ConstructorType"] = 158] = "ConstructorType";
-        SyntaxKind[SyntaxKind["TypeQuery"] = 159] = "TypeQuery";
-        SyntaxKind[SyntaxKind["TypeLiteral"] = 160] = "TypeLiteral";
-        SyntaxKind[SyntaxKind["ArrayType"] = 161] = "ArrayType";
-        SyntaxKind[SyntaxKind["TupleType"] = 162] = "TupleType";
-        SyntaxKind[SyntaxKind["UnionType"] = 163] = "UnionType";
-        SyntaxKind[SyntaxKind["IntersectionType"] = 164] = "IntersectionType";
-        SyntaxKind[SyntaxKind["ParenthesizedType"] = 165] = "ParenthesizedType";
-        SyntaxKind[SyntaxKind["ThisType"] = 166] = "ThisType";
-        SyntaxKind[SyntaxKind["LiteralType"] = 167] = "LiteralType";
-        SyntaxKind[SyntaxKind["ObjectBindingPattern"] = 168] = "ObjectBindingPattern";
-        SyntaxKind[SyntaxKind["ArrayBindingPattern"] = 169] = "ArrayBindingPattern";
-        SyntaxKind[SyntaxKind["BindingElement"] = 170] = "BindingElement";
-        SyntaxKind[SyntaxKind["ArrayLiteralExpression"] = 171] = "ArrayLiteralExpression";
-        SyntaxKind[SyntaxKind["ObjectLiteralExpression"] = 172] = "ObjectLiteralExpression";
-        SyntaxKind[SyntaxKind["PropertyAccessExpression"] = 173] = "PropertyAccessExpression";
-        SyntaxKind[SyntaxKind["ElementAccessExpression"] = 174] = "ElementAccessExpression";
-        SyntaxKind[SyntaxKind["CallExpression"] = 175] = "CallExpression";
-        SyntaxKind[SyntaxKind["NewExpression"] = 176] = "NewExpression";
-        SyntaxKind[SyntaxKind["TaggedTemplateExpression"] = 177] = "TaggedTemplateExpression";
-        SyntaxKind[SyntaxKind["TypeAssertionExpression"] = 178] = "TypeAssertionExpression";
-        SyntaxKind[SyntaxKind["ParenthesizedExpression"] = 179] = "ParenthesizedExpression";
-        SyntaxKind[SyntaxKind["FunctionExpression"] = 180] = "FunctionExpression";
-        SyntaxKind[SyntaxKind["ArrowFunction"] = 181] = "ArrowFunction";
-        SyntaxKind[SyntaxKind["DeleteExpression"] = 182] = "DeleteExpression";
-        SyntaxKind[SyntaxKind["TypeOfExpression"] = 183] = "TypeOfExpression";
-        SyntaxKind[SyntaxKind["VoidExpression"] = 184] = "VoidExpression";
-        SyntaxKind[SyntaxKind["AwaitExpression"] = 185] = "AwaitExpression";
-        SyntaxKind[SyntaxKind["PrefixUnaryExpression"] = 186] = "PrefixUnaryExpression";
-        SyntaxKind[SyntaxKind["PostfixUnaryExpression"] = 187] = "PostfixUnaryExpression";
-        SyntaxKind[SyntaxKind["BinaryExpression"] = 188] = "BinaryExpression";
-        SyntaxKind[SyntaxKind["ConditionalExpression"] = 189] = "ConditionalExpression";
-        SyntaxKind[SyntaxKind["TemplateExpression"] = 190] = "TemplateExpression";
-        SyntaxKind[SyntaxKind["YieldExpression"] = 191] = "YieldExpression";
-        SyntaxKind[SyntaxKind["SpreadElementExpression"] = 192] = "SpreadElementExpression";
-        SyntaxKind[SyntaxKind["ClassExpression"] = 193] = "ClassExpression";
-        SyntaxKind[SyntaxKind["OmittedExpression"] = 194] = "OmittedExpression";
-        SyntaxKind[SyntaxKind["ExpressionWithTypeArguments"] = 195] = "ExpressionWithTypeArguments";
-        SyntaxKind[SyntaxKind["AsExpression"] = 196] = "AsExpression";
-        SyntaxKind[SyntaxKind["NonNullExpression"] = 197] = "NonNullExpression";
-        SyntaxKind[SyntaxKind["TemplateSpan"] = 198] = "TemplateSpan";
-        SyntaxKind[SyntaxKind["SemicolonClassElement"] = 199] = "SemicolonClassElement";
-        SyntaxKind[SyntaxKind["Block"] = 200] = "Block";
-        SyntaxKind[SyntaxKind["VariableStatement"] = 201] = "VariableStatement";
-        SyntaxKind[SyntaxKind["EmptyStatement"] = 202] = "EmptyStatement";
-        SyntaxKind[SyntaxKind["ExpressionStatement"] = 203] = "ExpressionStatement";
-        SyntaxKind[SyntaxKind["IfStatement"] = 204] = "IfStatement";
-        SyntaxKind[SyntaxKind["DoStatement"] = 205] = "DoStatement";
-        SyntaxKind[SyntaxKind["WhileStatement"] = 206] = "WhileStatement";
-        SyntaxKind[SyntaxKind["ForStatement"] = 207] = "ForStatement";
-        SyntaxKind[SyntaxKind["ForInStatement"] = 208] = "ForInStatement";
-        SyntaxKind[SyntaxKind["ForOfStatement"] = 209] = "ForOfStatement";
-        SyntaxKind[SyntaxKind["ContinueStatement"] = 210] = "ContinueStatement";
-        SyntaxKind[SyntaxKind["BreakStatement"] = 211] = "BreakStatement";
-        SyntaxKind[SyntaxKind["ReturnStatement"] = 212] = "ReturnStatement";
-        SyntaxKind[SyntaxKind["WithStatement"] = 213] = "WithStatement";
-        SyntaxKind[SyntaxKind["SwitchStatement"] = 214] = "SwitchStatement";
-        SyntaxKind[SyntaxKind["LabeledStatement"] = 215] = "LabeledStatement";
-        SyntaxKind[SyntaxKind["ThrowStatement"] = 216] = "ThrowStatement";
-        SyntaxKind[SyntaxKind["TryStatement"] = 217] = "TryStatement";
-        SyntaxKind[SyntaxKind["DebuggerStatement"] = 218] = "DebuggerStatement";
-        SyntaxKind[SyntaxKind["VariableDeclaration"] = 219] = "VariableDeclaration";
-        SyntaxKind[SyntaxKind["VariableDeclarationList"] = 220] = "VariableDeclarationList";
-        SyntaxKind[SyntaxKind["FunctionDeclaration"] = 221] = "FunctionDeclaration";
-        SyntaxKind[SyntaxKind["ClassDeclaration"] = 222] = "ClassDeclaration";
-        SyntaxKind[SyntaxKind["InterfaceDeclaration"] = 223] = "InterfaceDeclaration";
-        SyntaxKind[SyntaxKind["TypeAliasDeclaration"] = 224] = "TypeAliasDeclaration";
-        SyntaxKind[SyntaxKind["EnumDeclaration"] = 225] = "EnumDeclaration";
-        SyntaxKind[SyntaxKind["ModuleDeclaration"] = 226] = "ModuleDeclaration";
-        SyntaxKind[SyntaxKind["ModuleBlock"] = 227] = "ModuleBlock";
-        SyntaxKind[SyntaxKind["CaseBlock"] = 228] = "CaseBlock";
-        SyntaxKind[SyntaxKind["NamespaceExportDeclaration"] = 229] = "NamespaceExportDeclaration";
-        SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 230] = "ImportEqualsDeclaration";
-        SyntaxKind[SyntaxKind["ImportDeclaration"] = 231] = "ImportDeclaration";
-        SyntaxKind[SyntaxKind["ImportClause"] = 232] = "ImportClause";
-        SyntaxKind[SyntaxKind["NamespaceImport"] = 233] = "NamespaceImport";
-        SyntaxKind[SyntaxKind["NamedImports"] = 234] = "NamedImports";
-        SyntaxKind[SyntaxKind["ImportSpecifier"] = 235] = "ImportSpecifier";
-        SyntaxKind[SyntaxKind["ExportAssignment"] = 236] = "ExportAssignment";
-        SyntaxKind[SyntaxKind["ExportDeclaration"] = 237] = "ExportDeclaration";
-        SyntaxKind[SyntaxKind["NamedExports"] = 238] = "NamedExports";
-        SyntaxKind[SyntaxKind["ExportSpecifier"] = 239] = "ExportSpecifier";
-        SyntaxKind[SyntaxKind["MissingDeclaration"] = 240] = "MissingDeclaration";
-        SyntaxKind[SyntaxKind["ExternalModuleReference"] = 241] = "ExternalModuleReference";
-        SyntaxKind[SyntaxKind["JsxElement"] = 242] = "JsxElement";
-        SyntaxKind[SyntaxKind["JsxSelfClosingElement"] = 243] = "JsxSelfClosingElement";
-        SyntaxKind[SyntaxKind["JsxOpeningElement"] = 244] = "JsxOpeningElement";
-        SyntaxKind[SyntaxKind["JsxClosingElement"] = 245] = "JsxClosingElement";
-        SyntaxKind[SyntaxKind["JsxAttribute"] = 246] = "JsxAttribute";
-        SyntaxKind[SyntaxKind["JsxSpreadAttribute"] = 247] = "JsxSpreadAttribute";
-        SyntaxKind[SyntaxKind["JsxExpression"] = 248] = "JsxExpression";
-        SyntaxKind[SyntaxKind["CaseClause"] = 249] = "CaseClause";
-        SyntaxKind[SyntaxKind["DefaultClause"] = 250] = "DefaultClause";
-        SyntaxKind[SyntaxKind["HeritageClause"] = 251] = "HeritageClause";
-        SyntaxKind[SyntaxKind["CatchClause"] = 252] = "CatchClause";
-        SyntaxKind[SyntaxKind["PropertyAssignment"] = 253] = "PropertyAssignment";
-        SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 254] = "ShorthandPropertyAssignment";
-        SyntaxKind[SyntaxKind["EnumMember"] = 255] = "EnumMember";
-        SyntaxKind[SyntaxKind["SourceFile"] = 256] = "SourceFile";
-        SyntaxKind[SyntaxKind["JSDocTypeExpression"] = 257] = "JSDocTypeExpression";
-        SyntaxKind[SyntaxKind["JSDocAllType"] = 258] = "JSDocAllType";
-        SyntaxKind[SyntaxKind["JSDocUnknownType"] = 259] = "JSDocUnknownType";
-        SyntaxKind[SyntaxKind["JSDocArrayType"] = 260] = "JSDocArrayType";
-        SyntaxKind[SyntaxKind["JSDocUnionType"] = 261] = "JSDocUnionType";
-        SyntaxKind[SyntaxKind["JSDocTupleType"] = 262] = "JSDocTupleType";
-        SyntaxKind[SyntaxKind["JSDocNullableType"] = 263] = "JSDocNullableType";
-        SyntaxKind[SyntaxKind["JSDocNonNullableType"] = 264] = "JSDocNonNullableType";
-        SyntaxKind[SyntaxKind["JSDocRecordType"] = 265] = "JSDocRecordType";
-        SyntaxKind[SyntaxKind["JSDocRecordMember"] = 266] = "JSDocRecordMember";
-        SyntaxKind[SyntaxKind["JSDocTypeReference"] = 267] = "JSDocTypeReference";
-        SyntaxKind[SyntaxKind["JSDocOptionalType"] = 268] = "JSDocOptionalType";
-        SyntaxKind[SyntaxKind["JSDocFunctionType"] = 269] = "JSDocFunctionType";
-        SyntaxKind[SyntaxKind["JSDocVariadicType"] = 270] = "JSDocVariadicType";
-        SyntaxKind[SyntaxKind["JSDocConstructorType"] = 271] = "JSDocConstructorType";
-        SyntaxKind[SyntaxKind["JSDocThisType"] = 272] = "JSDocThisType";
-        SyntaxKind[SyntaxKind["JSDocComment"] = 273] = "JSDocComment";
-        SyntaxKind[SyntaxKind["JSDocTag"] = 274] = "JSDocTag";
-        SyntaxKind[SyntaxKind["JSDocParameterTag"] = 275] = "JSDocParameterTag";
-        SyntaxKind[SyntaxKind["JSDocReturnTag"] = 276] = "JSDocReturnTag";
-        SyntaxKind[SyntaxKind["JSDocTypeTag"] = 277] = "JSDocTypeTag";
-        SyntaxKind[SyntaxKind["JSDocTemplateTag"] = 278] = "JSDocTemplateTag";
-        SyntaxKind[SyntaxKind["JSDocTypedefTag"] = 279] = "JSDocTypedefTag";
-        SyntaxKind[SyntaxKind["JSDocPropertyTag"] = 280] = "JSDocPropertyTag";
-        SyntaxKind[SyntaxKind["JSDocTypeLiteral"] = 281] = "JSDocTypeLiteral";
-        SyntaxKind[SyntaxKind["JSDocLiteralType"] = 282] = "JSDocLiteralType";
-        SyntaxKind[SyntaxKind["JSDocNullKeyword"] = 283] = "JSDocNullKeyword";
-        SyntaxKind[SyntaxKind["JSDocUndefinedKeyword"] = 284] = "JSDocUndefinedKeyword";
-        SyntaxKind[SyntaxKind["JSDocNeverKeyword"] = 285] = "JSDocNeverKeyword";
-        SyntaxKind[SyntaxKind["SyntaxList"] = 286] = "SyntaxList";
-        SyntaxKind[SyntaxKind["NotEmittedStatement"] = 287] = "NotEmittedStatement";
-        SyntaxKind[SyntaxKind["PartiallyEmittedExpression"] = 288] = "PartiallyEmittedExpression";
-        SyntaxKind[SyntaxKind["Count"] = 289] = "Count";
-        SyntaxKind[SyntaxKind["FirstAssignment"] = 57] = "FirstAssignment";
-        SyntaxKind[SyntaxKind["LastAssignment"] = 69] = "LastAssignment";
-        SyntaxKind[SyntaxKind["FirstCompoundAssignment"] = 58] = "FirstCompoundAssignment";
-        SyntaxKind[SyntaxKind["LastCompoundAssignment"] = 69] = "LastCompoundAssignment";
-        SyntaxKind[SyntaxKind["FirstReservedWord"] = 71] = "FirstReservedWord";
-        SyntaxKind[SyntaxKind["LastReservedWord"] = 106] = "LastReservedWord";
-        SyntaxKind[SyntaxKind["FirstKeyword"] = 71] = "FirstKeyword";
-        SyntaxKind[SyntaxKind["LastKeyword"] = 139] = "LastKeyword";
-        SyntaxKind[SyntaxKind["FirstFutureReservedWord"] = 107] = "FirstFutureReservedWord";
-        SyntaxKind[SyntaxKind["LastFutureReservedWord"] = 115] = "LastFutureReservedWord";
-        SyntaxKind[SyntaxKind["FirstTypeNode"] = 155] = "FirstTypeNode";
-        SyntaxKind[SyntaxKind["LastTypeNode"] = 167] = "LastTypeNode";
-        SyntaxKind[SyntaxKind["FirstPunctuation"] = 16] = "FirstPunctuation";
-        SyntaxKind[SyntaxKind["LastPunctuation"] = 69] = "LastPunctuation";
-        SyntaxKind[SyntaxKind["FirstToken"] = 0] = "FirstToken";
-        SyntaxKind[SyntaxKind["LastToken"] = 139] = "LastToken";
-        SyntaxKind[SyntaxKind["FirstTriviaToken"] = 2] = "FirstTriviaToken";
-        SyntaxKind[SyntaxKind["LastTriviaToken"] = 7] = "LastTriviaToken";
-        SyntaxKind[SyntaxKind["FirstLiteralToken"] = 8] = "FirstLiteralToken";
-        SyntaxKind[SyntaxKind["LastLiteralToken"] = 12] = "LastLiteralToken";
-        SyntaxKind[SyntaxKind["FirstTemplateToken"] = 12] = "FirstTemplateToken";
-        SyntaxKind[SyntaxKind["LastTemplateToken"] = 15] = "LastTemplateToken";
-        SyntaxKind[SyntaxKind["FirstBinaryOperator"] = 26] = "FirstBinaryOperator";
-        SyntaxKind[SyntaxKind["LastBinaryOperator"] = 69] = "LastBinaryOperator";
-        SyntaxKind[SyntaxKind["FirstNode"] = 140] = "FirstNode";
-        SyntaxKind[SyntaxKind["FirstJSDocNode"] = 257] = "FirstJSDocNode";
-        SyntaxKind[SyntaxKind["LastJSDocNode"] = 282] = "LastJSDocNode";
-        SyntaxKind[SyntaxKind["FirstJSDocTagNode"] = 273] = "FirstJSDocTagNode";
-        SyntaxKind[SyntaxKind["LastJSDocTagNode"] = 285] = "LastJSDocTagNode";
-    })(ts.SyntaxKind || (ts.SyntaxKind = {}));
-    var SyntaxKind = ts.SyntaxKind;
-    (function (NodeFlags) {
-        NodeFlags[NodeFlags["None"] = 0] = "None";
-        NodeFlags[NodeFlags["Let"] = 1] = "Let";
-        NodeFlags[NodeFlags["Const"] = 2] = "Const";
-        NodeFlags[NodeFlags["NestedNamespace"] = 4] = "NestedNamespace";
-        NodeFlags[NodeFlags["Synthesized"] = 8] = "Synthesized";
-        NodeFlags[NodeFlags["Namespace"] = 16] = "Namespace";
-        NodeFlags[NodeFlags["ExportContext"] = 32] = "ExportContext";
-        NodeFlags[NodeFlags["ContainsThis"] = 64] = "ContainsThis";
-        NodeFlags[NodeFlags["HasImplicitReturn"] = 128] = "HasImplicitReturn";
-        NodeFlags[NodeFlags["HasExplicitReturn"] = 256] = "HasExplicitReturn";
-        NodeFlags[NodeFlags["GlobalAugmentation"] = 512] = "GlobalAugmentation";
-        NodeFlags[NodeFlags["HasClassExtends"] = 1024] = "HasClassExtends";
-        NodeFlags[NodeFlags["HasDecorators"] = 2048] = "HasDecorators";
-        NodeFlags[NodeFlags["HasParamDecorators"] = 4096] = "HasParamDecorators";
-        NodeFlags[NodeFlags["HasAsyncFunctions"] = 8192] = "HasAsyncFunctions";
-        NodeFlags[NodeFlags["HasJsxSpreadAttributes"] = 16384] = "HasJsxSpreadAttributes";
-        NodeFlags[NodeFlags["DisallowInContext"] = 32768] = "DisallowInContext";
-        NodeFlags[NodeFlags["YieldContext"] = 65536] = "YieldContext";
-        NodeFlags[NodeFlags["DecoratorContext"] = 131072] = "DecoratorContext";
-        NodeFlags[NodeFlags["AwaitContext"] = 262144] = "AwaitContext";
-        NodeFlags[NodeFlags["ThisNodeHasError"] = 524288] = "ThisNodeHasError";
-        NodeFlags[NodeFlags["JavaScriptFile"] = 1048576] = "JavaScriptFile";
-        NodeFlags[NodeFlags["ThisNodeOrAnySubNodesHasError"] = 2097152] = "ThisNodeOrAnySubNodesHasError";
-        NodeFlags[NodeFlags["HasAggregatedChildData"] = 4194304] = "HasAggregatedChildData";
-        NodeFlags[NodeFlags["BlockScoped"] = 3] = "BlockScoped";
-        NodeFlags[NodeFlags["ReachabilityCheckFlags"] = 384] = "ReachabilityCheckFlags";
-        NodeFlags[NodeFlags["EmitHelperFlags"] = 31744] = "EmitHelperFlags";
-        NodeFlags[NodeFlags["ReachabilityAndEmitFlags"] = 32128] = "ReachabilityAndEmitFlags";
-        NodeFlags[NodeFlags["ContextFlags"] = 1540096] = "ContextFlags";
-        NodeFlags[NodeFlags["TypeExcludesFlags"] = 327680] = "TypeExcludesFlags";
-    })(ts.NodeFlags || (ts.NodeFlags = {}));
-    var NodeFlags = ts.NodeFlags;
-    (function (ModifierFlags) {
-        ModifierFlags[ModifierFlags["None"] = 0] = "None";
-        ModifierFlags[ModifierFlags["Export"] = 1] = "Export";
-        ModifierFlags[ModifierFlags["Ambient"] = 2] = "Ambient";
-        ModifierFlags[ModifierFlags["Public"] = 4] = "Public";
-        ModifierFlags[ModifierFlags["Private"] = 8] = "Private";
-        ModifierFlags[ModifierFlags["Protected"] = 16] = "Protected";
-        ModifierFlags[ModifierFlags["Static"] = 32] = "Static";
-        ModifierFlags[ModifierFlags["Readonly"] = 64] = "Readonly";
-        ModifierFlags[ModifierFlags["Abstract"] = 128] = "Abstract";
-        ModifierFlags[ModifierFlags["Async"] = 256] = "Async";
-        ModifierFlags[ModifierFlags["Default"] = 512] = "Default";
-        ModifierFlags[ModifierFlags["Const"] = 2048] = "Const";
-        ModifierFlags[ModifierFlags["HasComputedFlags"] = 536870912] = "HasComputedFlags";
-        ModifierFlags[ModifierFlags["AccessibilityModifier"] = 28] = "AccessibilityModifier";
-        ModifierFlags[ModifierFlags["ParameterPropertyModifier"] = 92] = "ParameterPropertyModifier";
-        ModifierFlags[ModifierFlags["NonPublicAccessibilityModifier"] = 24] = "NonPublicAccessibilityModifier";
-        ModifierFlags[ModifierFlags["TypeScriptModifier"] = 2270] = "TypeScriptModifier";
-    })(ts.ModifierFlags || (ts.ModifierFlags = {}));
-    var ModifierFlags = ts.ModifierFlags;
-    (function (JsxFlags) {
-        JsxFlags[JsxFlags["None"] = 0] = "None";
-        JsxFlags[JsxFlags["IntrinsicNamedElement"] = 1] = "IntrinsicNamedElement";
-        JsxFlags[JsxFlags["IntrinsicIndexedElement"] = 2] = "IntrinsicIndexedElement";
-        JsxFlags[JsxFlags["IntrinsicElement"] = 3] = "IntrinsicElement";
-    })(ts.JsxFlags || (ts.JsxFlags = {}));
-    var JsxFlags = ts.JsxFlags;
-    (function (RelationComparisonResult) {
-        RelationComparisonResult[RelationComparisonResult["Succeeded"] = 1] = "Succeeded";
-        RelationComparisonResult[RelationComparisonResult["Failed"] = 2] = "Failed";
-        RelationComparisonResult[RelationComparisonResult["FailedAndReported"] = 3] = "FailedAndReported";
-    })(ts.RelationComparisonResult || (ts.RelationComparisonResult = {}));
-    var RelationComparisonResult = ts.RelationComparisonResult;
-    (function (GeneratedIdentifierKind) {
-        GeneratedIdentifierKind[GeneratedIdentifierKind["None"] = 0] = "None";
-        GeneratedIdentifierKind[GeneratedIdentifierKind["Auto"] = 1] = "Auto";
-        GeneratedIdentifierKind[GeneratedIdentifierKind["Loop"] = 2] = "Loop";
-        GeneratedIdentifierKind[GeneratedIdentifierKind["Unique"] = 3] = "Unique";
-        GeneratedIdentifierKind[GeneratedIdentifierKind["Node"] = 4] = "Node";
-    })(ts.GeneratedIdentifierKind || (ts.GeneratedIdentifierKind = {}));
-    var GeneratedIdentifierKind = ts.GeneratedIdentifierKind;
-    (function (FlowFlags) {
-        FlowFlags[FlowFlags["Unreachable"] = 1] = "Unreachable";
-        FlowFlags[FlowFlags["Start"] = 2] = "Start";
-        FlowFlags[FlowFlags["BranchLabel"] = 4] = "BranchLabel";
-        FlowFlags[FlowFlags["LoopLabel"] = 8] = "LoopLabel";
-        FlowFlags[FlowFlags["Assignment"] = 16] = "Assignment";
-        FlowFlags[FlowFlags["TrueCondition"] = 32] = "TrueCondition";
-        FlowFlags[FlowFlags["FalseCondition"] = 64] = "FalseCondition";
-        FlowFlags[FlowFlags["SwitchClause"] = 128] = "SwitchClause";
-        FlowFlags[FlowFlags["ArrayMutation"] = 256] = "ArrayMutation";
-        FlowFlags[FlowFlags["Referenced"] = 512] = "Referenced";
-        FlowFlags[FlowFlags["Shared"] = 1024] = "Shared";
-        FlowFlags[FlowFlags["Label"] = 12] = "Label";
-        FlowFlags[FlowFlags["Condition"] = 96] = "Condition";
-    })(ts.FlowFlags || (ts.FlowFlags = {}));
-    var FlowFlags = ts.FlowFlags;
     var OperationCanceledException = (function () {
         function OperationCanceledException() {
         }
         return OperationCanceledException;
     }());
     ts.OperationCanceledException = OperationCanceledException;
+    var ExitStatus;
     (function (ExitStatus) {
         ExitStatus[ExitStatus["Success"] = 0] = "Success";
         ExitStatus[ExitStatus["DiagnosticsPresent_OutputsSkipped"] = 1] = "DiagnosticsPresent_OutputsSkipped";
         ExitStatus[ExitStatus["DiagnosticsPresent_OutputsGenerated"] = 2] = "DiagnosticsPresent_OutputsGenerated";
-    })(ts.ExitStatus || (ts.ExitStatus = {}));
-    var ExitStatus = ts.ExitStatus;
-    (function (TypeFormatFlags) {
-        TypeFormatFlags[TypeFormatFlags["None"] = 0] = "None";
-        TypeFormatFlags[TypeFormatFlags["WriteArrayAsGenericType"] = 1] = "WriteArrayAsGenericType";
-        TypeFormatFlags[TypeFormatFlags["UseTypeOfFunction"] = 2] = "UseTypeOfFunction";
-        TypeFormatFlags[TypeFormatFlags["NoTruncation"] = 4] = "NoTruncation";
-        TypeFormatFlags[TypeFormatFlags["WriteArrowStyleSignature"] = 8] = "WriteArrowStyleSignature";
-        TypeFormatFlags[TypeFormatFlags["WriteOwnNameForAnyLike"] = 16] = "WriteOwnNameForAnyLike";
-        TypeFormatFlags[TypeFormatFlags["WriteTypeArgumentsOfSignature"] = 32] = "WriteTypeArgumentsOfSignature";
-        TypeFormatFlags[TypeFormatFlags["InElementType"] = 64] = "InElementType";
-        TypeFormatFlags[TypeFormatFlags["UseFullyQualifiedType"] = 128] = "UseFullyQualifiedType";
-        TypeFormatFlags[TypeFormatFlags["InFirstTypeArgument"] = 256] = "InFirstTypeArgument";
-        TypeFormatFlags[TypeFormatFlags["InTypeAlias"] = 512] = "InTypeAlias";
-        TypeFormatFlags[TypeFormatFlags["UseTypeAliasValue"] = 1024] = "UseTypeAliasValue";
-    })(ts.TypeFormatFlags || (ts.TypeFormatFlags = {}));
-    var TypeFormatFlags = ts.TypeFormatFlags;
-    (function (SymbolFormatFlags) {
-        SymbolFormatFlags[SymbolFormatFlags["None"] = 0] = "None";
-        SymbolFormatFlags[SymbolFormatFlags["WriteTypeParametersOrArguments"] = 1] = "WriteTypeParametersOrArguments";
-        SymbolFormatFlags[SymbolFormatFlags["UseOnlyExternalAliasing"] = 2] = "UseOnlyExternalAliasing";
-    })(ts.SymbolFormatFlags || (ts.SymbolFormatFlags = {}));
-    var SymbolFormatFlags = ts.SymbolFormatFlags;
-    (function (SymbolAccessibility) {
-        SymbolAccessibility[SymbolAccessibility["Accessible"] = 0] = "Accessible";
-        SymbolAccessibility[SymbolAccessibility["NotAccessible"] = 1] = "NotAccessible";
-        SymbolAccessibility[SymbolAccessibility["CannotBeNamed"] = 2] = "CannotBeNamed";
-    })(ts.SymbolAccessibility || (ts.SymbolAccessibility = {}));
-    var SymbolAccessibility = ts.SymbolAccessibility;
-    (function (TypePredicateKind) {
-        TypePredicateKind[TypePredicateKind["This"] = 0] = "This";
-        TypePredicateKind[TypePredicateKind["Identifier"] = 1] = "Identifier";
-    })(ts.TypePredicateKind || (ts.TypePredicateKind = {}));
-    var TypePredicateKind = ts.TypePredicateKind;
+    })(ExitStatus = ts.ExitStatus || (ts.ExitStatus = {}));
+    var TypeReferenceSerializationKind;
     (function (TypeReferenceSerializationKind) {
         TypeReferenceSerializationKind[TypeReferenceSerializationKind["Unknown"] = 0] = "Unknown";
         TypeReferenceSerializationKind[TypeReferenceSerializationKind["TypeWithConstructSignatureAndValue"] = 1] = "TypeWithConstructSignatureAndValue";
@@ -488,179 +45,19 @@ var ts;
         TypeReferenceSerializationKind[TypeReferenceSerializationKind["Promise"] = 8] = "Promise";
         TypeReferenceSerializationKind[TypeReferenceSerializationKind["TypeWithCallSignature"] = 9] = "TypeWithCallSignature";
         TypeReferenceSerializationKind[TypeReferenceSerializationKind["ObjectType"] = 10] = "ObjectType";
-    })(ts.TypeReferenceSerializationKind || (ts.TypeReferenceSerializationKind = {}));
-    var TypeReferenceSerializationKind = ts.TypeReferenceSerializationKind;
-    (function (SymbolFlags) {
-        SymbolFlags[SymbolFlags["None"] = 0] = "None";
-        SymbolFlags[SymbolFlags["FunctionScopedVariable"] = 1] = "FunctionScopedVariable";
-        SymbolFlags[SymbolFlags["BlockScopedVariable"] = 2] = "BlockScopedVariable";
-        SymbolFlags[SymbolFlags["Property"] = 4] = "Property";
-        SymbolFlags[SymbolFlags["EnumMember"] = 8] = "EnumMember";
-        SymbolFlags[SymbolFlags["Function"] = 16] = "Function";
-        SymbolFlags[SymbolFlags["Class"] = 32] = "Class";
-        SymbolFlags[SymbolFlags["Interface"] = 64] = "Interface";
-        SymbolFlags[SymbolFlags["ConstEnum"] = 128] = "ConstEnum";
-        SymbolFlags[SymbolFlags["RegularEnum"] = 256] = "RegularEnum";
-        SymbolFlags[SymbolFlags["ValueModule"] = 512] = "ValueModule";
-        SymbolFlags[SymbolFlags["NamespaceModule"] = 1024] = "NamespaceModule";
-        SymbolFlags[SymbolFlags["TypeLiteral"] = 2048] = "TypeLiteral";
-        SymbolFlags[SymbolFlags["ObjectLiteral"] = 4096] = "ObjectLiteral";
-        SymbolFlags[SymbolFlags["Method"] = 8192] = "Method";
-        SymbolFlags[SymbolFlags["Constructor"] = 16384] = "Constructor";
-        SymbolFlags[SymbolFlags["GetAccessor"] = 32768] = "GetAccessor";
-        SymbolFlags[SymbolFlags["SetAccessor"] = 65536] = "SetAccessor";
-        SymbolFlags[SymbolFlags["Signature"] = 131072] = "Signature";
-        SymbolFlags[SymbolFlags["TypeParameter"] = 262144] = "TypeParameter";
-        SymbolFlags[SymbolFlags["TypeAlias"] = 524288] = "TypeAlias";
-        SymbolFlags[SymbolFlags["ExportValue"] = 1048576] = "ExportValue";
-        SymbolFlags[SymbolFlags["ExportType"] = 2097152] = "ExportType";
-        SymbolFlags[SymbolFlags["ExportNamespace"] = 4194304] = "ExportNamespace";
-        SymbolFlags[SymbolFlags["Alias"] = 8388608] = "Alias";
-        SymbolFlags[SymbolFlags["Instantiated"] = 16777216] = "Instantiated";
-        SymbolFlags[SymbolFlags["Merged"] = 33554432] = "Merged";
-        SymbolFlags[SymbolFlags["Transient"] = 67108864] = "Transient";
-        SymbolFlags[SymbolFlags["Prototype"] = 134217728] = "Prototype";
-        SymbolFlags[SymbolFlags["SyntheticProperty"] = 268435456] = "SyntheticProperty";
-        SymbolFlags[SymbolFlags["Optional"] = 536870912] = "Optional";
-        SymbolFlags[SymbolFlags["ExportStar"] = 1073741824] = "ExportStar";
-        SymbolFlags[SymbolFlags["Enum"] = 384] = "Enum";
-        SymbolFlags[SymbolFlags["Variable"] = 3] = "Variable";
-        SymbolFlags[SymbolFlags["Value"] = 107455] = "Value";
-        SymbolFlags[SymbolFlags["Type"] = 793064] = "Type";
-        SymbolFlags[SymbolFlags["Namespace"] = 1920] = "Namespace";
-        SymbolFlags[SymbolFlags["Module"] = 1536] = "Module";
-        SymbolFlags[SymbolFlags["Accessor"] = 98304] = "Accessor";
-        SymbolFlags[SymbolFlags["FunctionScopedVariableExcludes"] = 107454] = "FunctionScopedVariableExcludes";
-        SymbolFlags[SymbolFlags["BlockScopedVariableExcludes"] = 107455] = "BlockScopedVariableExcludes";
-        SymbolFlags[SymbolFlags["ParameterExcludes"] = 107455] = "ParameterExcludes";
-        SymbolFlags[SymbolFlags["PropertyExcludes"] = 0] = "PropertyExcludes";
-        SymbolFlags[SymbolFlags["EnumMemberExcludes"] = 900095] = "EnumMemberExcludes";
-        SymbolFlags[SymbolFlags["FunctionExcludes"] = 106927] = "FunctionExcludes";
-        SymbolFlags[SymbolFlags["ClassExcludes"] = 899519] = "ClassExcludes";
-        SymbolFlags[SymbolFlags["InterfaceExcludes"] = 792968] = "InterfaceExcludes";
-        SymbolFlags[SymbolFlags["RegularEnumExcludes"] = 899327] = "RegularEnumExcludes";
-        SymbolFlags[SymbolFlags["ConstEnumExcludes"] = 899967] = "ConstEnumExcludes";
-        SymbolFlags[SymbolFlags["ValueModuleExcludes"] = 106639] = "ValueModuleExcludes";
-        SymbolFlags[SymbolFlags["NamespaceModuleExcludes"] = 0] = "NamespaceModuleExcludes";
-        SymbolFlags[SymbolFlags["MethodExcludes"] = 99263] = "MethodExcludes";
-        SymbolFlags[SymbolFlags["GetAccessorExcludes"] = 41919] = "GetAccessorExcludes";
-        SymbolFlags[SymbolFlags["SetAccessorExcludes"] = 74687] = "SetAccessorExcludes";
-        SymbolFlags[SymbolFlags["TypeParameterExcludes"] = 530920] = "TypeParameterExcludes";
-        SymbolFlags[SymbolFlags["TypeAliasExcludes"] = 793064] = "TypeAliasExcludes";
-        SymbolFlags[SymbolFlags["AliasExcludes"] = 8388608] = "AliasExcludes";
-        SymbolFlags[SymbolFlags["ModuleMember"] = 8914931] = "ModuleMember";
-        SymbolFlags[SymbolFlags["ExportHasLocal"] = 944] = "ExportHasLocal";
-        SymbolFlags[SymbolFlags["HasExports"] = 1952] = "HasExports";
-        SymbolFlags[SymbolFlags["HasMembers"] = 6240] = "HasMembers";
-        SymbolFlags[SymbolFlags["BlockScoped"] = 418] = "BlockScoped";
-        SymbolFlags[SymbolFlags["PropertyOrAccessor"] = 98308] = "PropertyOrAccessor";
-        SymbolFlags[SymbolFlags["Export"] = 7340032] = "Export";
-        SymbolFlags[SymbolFlags["ClassMember"] = 106500] = "ClassMember";
-        SymbolFlags[SymbolFlags["Classifiable"] = 788448] = "Classifiable";
-    })(ts.SymbolFlags || (ts.SymbolFlags = {}));
-    var SymbolFlags = ts.SymbolFlags;
-    (function (NodeCheckFlags) {
-        NodeCheckFlags[NodeCheckFlags["TypeChecked"] = 1] = "TypeChecked";
-        NodeCheckFlags[NodeCheckFlags["LexicalThis"] = 2] = "LexicalThis";
-        NodeCheckFlags[NodeCheckFlags["CaptureThis"] = 4] = "CaptureThis";
-        NodeCheckFlags[NodeCheckFlags["SuperInstance"] = 256] = "SuperInstance";
-        NodeCheckFlags[NodeCheckFlags["SuperStatic"] = 512] = "SuperStatic";
-        NodeCheckFlags[NodeCheckFlags["ContextChecked"] = 1024] = "ContextChecked";
-        NodeCheckFlags[NodeCheckFlags["AsyncMethodWithSuper"] = 2048] = "AsyncMethodWithSuper";
-        NodeCheckFlags[NodeCheckFlags["AsyncMethodWithSuperBinding"] = 4096] = "AsyncMethodWithSuperBinding";
-        NodeCheckFlags[NodeCheckFlags["CaptureArguments"] = 8192] = "CaptureArguments";
-        NodeCheckFlags[NodeCheckFlags["EnumValuesComputed"] = 16384] = "EnumValuesComputed";
-        NodeCheckFlags[NodeCheckFlags["LexicalModuleMergesWithClass"] = 32768] = "LexicalModuleMergesWithClass";
-        NodeCheckFlags[NodeCheckFlags["LoopWithCapturedBlockScopedBinding"] = 65536] = "LoopWithCapturedBlockScopedBinding";
-        NodeCheckFlags[NodeCheckFlags["CapturedBlockScopedBinding"] = 131072] = "CapturedBlockScopedBinding";
-        NodeCheckFlags[NodeCheckFlags["BlockScopedBindingInLoop"] = 262144] = "BlockScopedBindingInLoop";
-        NodeCheckFlags[NodeCheckFlags["ClassWithBodyScopedClassBinding"] = 524288] = "ClassWithBodyScopedClassBinding";
-        NodeCheckFlags[NodeCheckFlags["BodyScopedClassBinding"] = 1048576] = "BodyScopedClassBinding";
-        NodeCheckFlags[NodeCheckFlags["NeedsLoopOutParameter"] = 2097152] = "NeedsLoopOutParameter";
-        NodeCheckFlags[NodeCheckFlags["AssignmentsMarked"] = 4194304] = "AssignmentsMarked";
-        NodeCheckFlags[NodeCheckFlags["ClassWithConstructorReference"] = 8388608] = "ClassWithConstructorReference";
-        NodeCheckFlags[NodeCheckFlags["ConstructorReferenceInClass"] = 16777216] = "ConstructorReferenceInClass";
-    })(ts.NodeCheckFlags || (ts.NodeCheckFlags = {}));
-    var NodeCheckFlags = ts.NodeCheckFlags;
-    (function (TypeFlags) {
-        TypeFlags[TypeFlags["Any"] = 1] = "Any";
-        TypeFlags[TypeFlags["String"] = 2] = "String";
-        TypeFlags[TypeFlags["Number"] = 4] = "Number";
-        TypeFlags[TypeFlags["Boolean"] = 8] = "Boolean";
-        TypeFlags[TypeFlags["Enum"] = 16] = "Enum";
-        TypeFlags[TypeFlags["StringLiteral"] = 32] = "StringLiteral";
-        TypeFlags[TypeFlags["NumberLiteral"] = 64] = "NumberLiteral";
-        TypeFlags[TypeFlags["BooleanLiteral"] = 128] = "BooleanLiteral";
-        TypeFlags[TypeFlags["EnumLiteral"] = 256] = "EnumLiteral";
-        TypeFlags[TypeFlags["ESSymbol"] = 512] = "ESSymbol";
-        TypeFlags[TypeFlags["Void"] = 1024] = "Void";
-        TypeFlags[TypeFlags["Undefined"] = 2048] = "Undefined";
-        TypeFlags[TypeFlags["Null"] = 4096] = "Null";
-        TypeFlags[TypeFlags["Never"] = 8192] = "Never";
-        TypeFlags[TypeFlags["TypeParameter"] = 16384] = "TypeParameter";
-        TypeFlags[TypeFlags["Class"] = 32768] = "Class";
-        TypeFlags[TypeFlags["Interface"] = 65536] = "Interface";
-        TypeFlags[TypeFlags["Reference"] = 131072] = "Reference";
-        TypeFlags[TypeFlags["Tuple"] = 262144] = "Tuple";
-        TypeFlags[TypeFlags["Union"] = 524288] = "Union";
-        TypeFlags[TypeFlags["Intersection"] = 1048576] = "Intersection";
-        TypeFlags[TypeFlags["Anonymous"] = 2097152] = "Anonymous";
-        TypeFlags[TypeFlags["Instantiated"] = 4194304] = "Instantiated";
-        TypeFlags[TypeFlags["ObjectLiteral"] = 8388608] = "ObjectLiteral";
-        TypeFlags[TypeFlags["FreshLiteral"] = 16777216] = "FreshLiteral";
-        TypeFlags[TypeFlags["ContainsWideningType"] = 33554432] = "ContainsWideningType";
-        TypeFlags[TypeFlags["ContainsObjectLiteral"] = 67108864] = "ContainsObjectLiteral";
-        TypeFlags[TypeFlags["ContainsAnyFunctionType"] = 134217728] = "ContainsAnyFunctionType";
-        TypeFlags[TypeFlags["Nullable"] = 6144] = "Nullable";
-        TypeFlags[TypeFlags["Literal"] = 480] = "Literal";
-        TypeFlags[TypeFlags["StringOrNumberLiteral"] = 96] = "StringOrNumberLiteral";
-        TypeFlags[TypeFlags["DefinitelyFalsy"] = 7392] = "DefinitelyFalsy";
-        TypeFlags[TypeFlags["PossiblyFalsy"] = 7406] = "PossiblyFalsy";
-        TypeFlags[TypeFlags["Intrinsic"] = 16015] = "Intrinsic";
-        TypeFlags[TypeFlags["Primitive"] = 8190] = "Primitive";
-        TypeFlags[TypeFlags["StringLike"] = 34] = "StringLike";
-        TypeFlags[TypeFlags["NumberLike"] = 340] = "NumberLike";
-        TypeFlags[TypeFlags["BooleanLike"] = 136] = "BooleanLike";
-        TypeFlags[TypeFlags["EnumLike"] = 272] = "EnumLike";
-        TypeFlags[TypeFlags["ObjectType"] = 2588672] = "ObjectType";
-        TypeFlags[TypeFlags["UnionOrIntersection"] = 1572864] = "UnionOrIntersection";
-        TypeFlags[TypeFlags["StructuredType"] = 4161536] = "StructuredType";
-        TypeFlags[TypeFlags["StructuredOrTypeParameter"] = 4177920] = "StructuredOrTypeParameter";
-        TypeFlags[TypeFlags["Narrowable"] = 4178943] = "Narrowable";
-        TypeFlags[TypeFlags["NotUnionOrUnit"] = 2589185] = "NotUnionOrUnit";
-        TypeFlags[TypeFlags["RequiresWidening"] = 100663296] = "RequiresWidening";
-        TypeFlags[TypeFlags["PropagatingFlags"] = 234881024] = "PropagatingFlags";
-    })(ts.TypeFlags || (ts.TypeFlags = {}));
-    var TypeFlags = ts.TypeFlags;
-    (function (SignatureKind) {
-        SignatureKind[SignatureKind["Call"] = 0] = "Call";
-        SignatureKind[SignatureKind["Construct"] = 1] = "Construct";
-    })(ts.SignatureKind || (ts.SignatureKind = {}));
-    var SignatureKind = ts.SignatureKind;
-    (function (IndexKind) {
-        IndexKind[IndexKind["String"] = 0] = "String";
-        IndexKind[IndexKind["Number"] = 1] = "Number";
-    })(ts.IndexKind || (ts.IndexKind = {}));
-    var IndexKind = ts.IndexKind;
-    (function (SpecialPropertyAssignmentKind) {
-        SpecialPropertyAssignmentKind[SpecialPropertyAssignmentKind["None"] = 0] = "None";
-        SpecialPropertyAssignmentKind[SpecialPropertyAssignmentKind["ExportsProperty"] = 1] = "ExportsProperty";
-        SpecialPropertyAssignmentKind[SpecialPropertyAssignmentKind["ModuleExports"] = 2] = "ModuleExports";
-        SpecialPropertyAssignmentKind[SpecialPropertyAssignmentKind["PrototypeProperty"] = 3] = "PrototypeProperty";
-        SpecialPropertyAssignmentKind[SpecialPropertyAssignmentKind["ThisProperty"] = 4] = "ThisProperty";
-    })(ts.SpecialPropertyAssignmentKind || (ts.SpecialPropertyAssignmentKind = {}));
-    var SpecialPropertyAssignmentKind = ts.SpecialPropertyAssignmentKind;
+    })(TypeReferenceSerializationKind = ts.TypeReferenceSerializationKind || (ts.TypeReferenceSerializationKind = {}));
+    var DiagnosticCategory;
     (function (DiagnosticCategory) {
         DiagnosticCategory[DiagnosticCategory["Warning"] = 0] = "Warning";
         DiagnosticCategory[DiagnosticCategory["Error"] = 1] = "Error";
         DiagnosticCategory[DiagnosticCategory["Message"] = 2] = "Message";
-    })(ts.DiagnosticCategory || (ts.DiagnosticCategory = {}));
-    var DiagnosticCategory = ts.DiagnosticCategory;
+    })(DiagnosticCategory = ts.DiagnosticCategory || (ts.DiagnosticCategory = {}));
+    var ModuleResolutionKind;
     (function (ModuleResolutionKind) {
         ModuleResolutionKind[ModuleResolutionKind["Classic"] = 1] = "Classic";
         ModuleResolutionKind[ModuleResolutionKind["NodeJs"] = 2] = "NodeJs";
-    })(ts.ModuleResolutionKind || (ts.ModuleResolutionKind = {}));
-    var ModuleResolutionKind = ts.ModuleResolutionKind;
+    })(ModuleResolutionKind = ts.ModuleResolutionKind || (ts.ModuleResolutionKind = {}));
+    var ModuleKind;
     (function (ModuleKind) {
         ModuleKind[ModuleKind["None"] = 0] = "None";
         ModuleKind[ModuleKind["CommonJS"] = 1] = "CommonJS";
@@ -668,266 +65,16 @@ var ts;
         ModuleKind[ModuleKind["UMD"] = 3] = "UMD";
         ModuleKind[ModuleKind["System"] = 4] = "System";
         ModuleKind[ModuleKind["ES2015"] = 5] = "ES2015";
-    })(ts.ModuleKind || (ts.ModuleKind = {}));
-    var ModuleKind = ts.ModuleKind;
-    (function (JsxEmit) {
-        JsxEmit[JsxEmit["None"] = 0] = "None";
-        JsxEmit[JsxEmit["Preserve"] = 1] = "Preserve";
-        JsxEmit[JsxEmit["React"] = 2] = "React";
-    })(ts.JsxEmit || (ts.JsxEmit = {}));
-    var JsxEmit = ts.JsxEmit;
-    (function (NewLineKind) {
-        NewLineKind[NewLineKind["CarriageReturnLineFeed"] = 0] = "CarriageReturnLineFeed";
-        NewLineKind[NewLineKind["LineFeed"] = 1] = "LineFeed";
-    })(ts.NewLineKind || (ts.NewLineKind = {}));
-    var NewLineKind = ts.NewLineKind;
-    (function (ScriptKind) {
-        ScriptKind[ScriptKind["Unknown"] = 0] = "Unknown";
-        ScriptKind[ScriptKind["JS"] = 1] = "JS";
-        ScriptKind[ScriptKind["JSX"] = 2] = "JSX";
-        ScriptKind[ScriptKind["TS"] = 3] = "TS";
-        ScriptKind[ScriptKind["TSX"] = 4] = "TSX";
-    })(ts.ScriptKind || (ts.ScriptKind = {}));
-    var ScriptKind = ts.ScriptKind;
-    (function (ScriptTarget) {
-        ScriptTarget[ScriptTarget["ES3"] = 0] = "ES3";
-        ScriptTarget[ScriptTarget["ES5"] = 1] = "ES5";
-        ScriptTarget[ScriptTarget["ES2015"] = 2] = "ES2015";
-        ScriptTarget[ScriptTarget["ES2016"] = 3] = "ES2016";
-        ScriptTarget[ScriptTarget["ES2017"] = 4] = "ES2017";
-        ScriptTarget[ScriptTarget["Latest"] = 4] = "Latest";
-    })(ts.ScriptTarget || (ts.ScriptTarget = {}));
-    var ScriptTarget = ts.ScriptTarget;
-    (function (LanguageVariant) {
-        LanguageVariant[LanguageVariant["Standard"] = 0] = "Standard";
-        LanguageVariant[LanguageVariant["JSX"] = 1] = "JSX";
-    })(ts.LanguageVariant || (ts.LanguageVariant = {}));
-    var LanguageVariant = ts.LanguageVariant;
-    (function (DiagnosticStyle) {
-        DiagnosticStyle[DiagnosticStyle["Simple"] = 0] = "Simple";
-        DiagnosticStyle[DiagnosticStyle["Pretty"] = 1] = "Pretty";
-    })(ts.DiagnosticStyle || (ts.DiagnosticStyle = {}));
-    var DiagnosticStyle = ts.DiagnosticStyle;
-    (function (WatchDirectoryFlags) {
-        WatchDirectoryFlags[WatchDirectoryFlags["None"] = 0] = "None";
-        WatchDirectoryFlags[WatchDirectoryFlags["Recursive"] = 1] = "Recursive";
-    })(ts.WatchDirectoryFlags || (ts.WatchDirectoryFlags = {}));
-    var WatchDirectoryFlags = ts.WatchDirectoryFlags;
-    (function (CharacterCodes) {
-        CharacterCodes[CharacterCodes["nullCharacter"] = 0] = "nullCharacter";
-        CharacterCodes[CharacterCodes["maxAsciiCharacter"] = 127] = "maxAsciiCharacter";
-        CharacterCodes[CharacterCodes["lineFeed"] = 10] = "lineFeed";
-        CharacterCodes[CharacterCodes["carriageReturn"] = 13] = "carriageReturn";
-        CharacterCodes[CharacterCodes["lineSeparator"] = 8232] = "lineSeparator";
-        CharacterCodes[CharacterCodes["paragraphSeparator"] = 8233] = "paragraphSeparator";
-        CharacterCodes[CharacterCodes["nextLine"] = 133] = "nextLine";
-        CharacterCodes[CharacterCodes["space"] = 32] = "space";
-        CharacterCodes[CharacterCodes["nonBreakingSpace"] = 160] = "nonBreakingSpace";
-        CharacterCodes[CharacterCodes["enQuad"] = 8192] = "enQuad";
-        CharacterCodes[CharacterCodes["emQuad"] = 8193] = "emQuad";
-        CharacterCodes[CharacterCodes["enSpace"] = 8194] = "enSpace";
-        CharacterCodes[CharacterCodes["emSpace"] = 8195] = "emSpace";
-        CharacterCodes[CharacterCodes["threePerEmSpace"] = 8196] = "threePerEmSpace";
-        CharacterCodes[CharacterCodes["fourPerEmSpace"] = 8197] = "fourPerEmSpace";
-        CharacterCodes[CharacterCodes["sixPerEmSpace"] = 8198] = "sixPerEmSpace";
-        CharacterCodes[CharacterCodes["figureSpace"] = 8199] = "figureSpace";
-        CharacterCodes[CharacterCodes["punctuationSpace"] = 8200] = "punctuationSpace";
-        CharacterCodes[CharacterCodes["thinSpace"] = 8201] = "thinSpace";
-        CharacterCodes[CharacterCodes["hairSpace"] = 8202] = "hairSpace";
-        CharacterCodes[CharacterCodes["zeroWidthSpace"] = 8203] = "zeroWidthSpace";
-        CharacterCodes[CharacterCodes["narrowNoBreakSpace"] = 8239] = "narrowNoBreakSpace";
-        CharacterCodes[CharacterCodes["ideographicSpace"] = 12288] = "ideographicSpace";
-        CharacterCodes[CharacterCodes["mathematicalSpace"] = 8287] = "mathematicalSpace";
-        CharacterCodes[CharacterCodes["ogham"] = 5760] = "ogham";
-        CharacterCodes[CharacterCodes["_"] = 95] = "_";
-        CharacterCodes[CharacterCodes["$"] = 36] = "$";
-        CharacterCodes[CharacterCodes["_0"] = 48] = "_0";
-        CharacterCodes[CharacterCodes["_1"] = 49] = "_1";
-        CharacterCodes[CharacterCodes["_2"] = 50] = "_2";
-        CharacterCodes[CharacterCodes["_3"] = 51] = "_3";
-        CharacterCodes[CharacterCodes["_4"] = 52] = "_4";
-        CharacterCodes[CharacterCodes["_5"] = 53] = "_5";
-        CharacterCodes[CharacterCodes["_6"] = 54] = "_6";
-        CharacterCodes[CharacterCodes["_7"] = 55] = "_7";
-        CharacterCodes[CharacterCodes["_8"] = 56] = "_8";
-        CharacterCodes[CharacterCodes["_9"] = 57] = "_9";
-        CharacterCodes[CharacterCodes["a"] = 97] = "a";
-        CharacterCodes[CharacterCodes["b"] = 98] = "b";
-        CharacterCodes[CharacterCodes["c"] = 99] = "c";
-        CharacterCodes[CharacterCodes["d"] = 100] = "d";
-        CharacterCodes[CharacterCodes["e"] = 101] = "e";
-        CharacterCodes[CharacterCodes["f"] = 102] = "f";
-        CharacterCodes[CharacterCodes["g"] = 103] = "g";
-        CharacterCodes[CharacterCodes["h"] = 104] = "h";
-        CharacterCodes[CharacterCodes["i"] = 105] = "i";
-        CharacterCodes[CharacterCodes["j"] = 106] = "j";
-        CharacterCodes[CharacterCodes["k"] = 107] = "k";
-        CharacterCodes[CharacterCodes["l"] = 108] = "l";
-        CharacterCodes[CharacterCodes["m"] = 109] = "m";
-        CharacterCodes[CharacterCodes["n"] = 110] = "n";
-        CharacterCodes[CharacterCodes["o"] = 111] = "o";
-        CharacterCodes[CharacterCodes["p"] = 112] = "p";
-        CharacterCodes[CharacterCodes["q"] = 113] = "q";
-        CharacterCodes[CharacterCodes["r"] = 114] = "r";
-        CharacterCodes[CharacterCodes["s"] = 115] = "s";
-        CharacterCodes[CharacterCodes["t"] = 116] = "t";
-        CharacterCodes[CharacterCodes["u"] = 117] = "u";
-        CharacterCodes[CharacterCodes["v"] = 118] = "v";
-        CharacterCodes[CharacterCodes["w"] = 119] = "w";
-        CharacterCodes[CharacterCodes["x"] = 120] = "x";
-        CharacterCodes[CharacterCodes["y"] = 121] = "y";
-        CharacterCodes[CharacterCodes["z"] = 122] = "z";
-        CharacterCodes[CharacterCodes["A"] = 65] = "A";
-        CharacterCodes[CharacterCodes["B"] = 66] = "B";
-        CharacterCodes[CharacterCodes["C"] = 67] = "C";
-        CharacterCodes[CharacterCodes["D"] = 68] = "D";
-        CharacterCodes[CharacterCodes["E"] = 69] = "E";
-        CharacterCodes[CharacterCodes["F"] = 70] = "F";
-        CharacterCodes[CharacterCodes["G"] = 71] = "G";
-        CharacterCodes[CharacterCodes["H"] = 72] = "H";
-        CharacterCodes[CharacterCodes["I"] = 73] = "I";
-        CharacterCodes[CharacterCodes["J"] = 74] = "J";
-        CharacterCodes[CharacterCodes["K"] = 75] = "K";
-        CharacterCodes[CharacterCodes["L"] = 76] = "L";
-        CharacterCodes[CharacterCodes["M"] = 77] = "M";
-        CharacterCodes[CharacterCodes["N"] = 78] = "N";
-        CharacterCodes[CharacterCodes["O"] = 79] = "O";
-        CharacterCodes[CharacterCodes["P"] = 80] = "P";
-        CharacterCodes[CharacterCodes["Q"] = 81] = "Q";
-        CharacterCodes[CharacterCodes["R"] = 82] = "R";
-        CharacterCodes[CharacterCodes["S"] = 83] = "S";
-        CharacterCodes[CharacterCodes["T"] = 84] = "T";
-        CharacterCodes[CharacterCodes["U"] = 85] = "U";
-        CharacterCodes[CharacterCodes["V"] = 86] = "V";
-        CharacterCodes[CharacterCodes["W"] = 87] = "W";
-        CharacterCodes[CharacterCodes["X"] = 88] = "X";
-        CharacterCodes[CharacterCodes["Y"] = 89] = "Y";
-        CharacterCodes[CharacterCodes["Z"] = 90] = "Z";
-        CharacterCodes[CharacterCodes["ampersand"] = 38] = "ampersand";
-        CharacterCodes[CharacterCodes["asterisk"] = 42] = "asterisk";
-        CharacterCodes[CharacterCodes["at"] = 64] = "at";
-        CharacterCodes[CharacterCodes["backslash"] = 92] = "backslash";
-        CharacterCodes[CharacterCodes["backtick"] = 96] = "backtick";
-        CharacterCodes[CharacterCodes["bar"] = 124] = "bar";
-        CharacterCodes[CharacterCodes["caret"] = 94] = "caret";
-        CharacterCodes[CharacterCodes["closeBrace"] = 125] = "closeBrace";
-        CharacterCodes[CharacterCodes["closeBracket"] = 93] = "closeBracket";
-        CharacterCodes[CharacterCodes["closeParen"] = 41] = "closeParen";
-        CharacterCodes[CharacterCodes["colon"] = 58] = "colon";
-        CharacterCodes[CharacterCodes["comma"] = 44] = "comma";
-        CharacterCodes[CharacterCodes["dot"] = 46] = "dot";
-        CharacterCodes[CharacterCodes["doubleQuote"] = 34] = "doubleQuote";
-        CharacterCodes[CharacterCodes["equals"] = 61] = "equals";
-        CharacterCodes[CharacterCodes["exclamation"] = 33] = "exclamation";
-        CharacterCodes[CharacterCodes["greaterThan"] = 62] = "greaterThan";
-        CharacterCodes[CharacterCodes["hash"] = 35] = "hash";
-        CharacterCodes[CharacterCodes["lessThan"] = 60] = "lessThan";
-        CharacterCodes[CharacterCodes["minus"] = 45] = "minus";
-        CharacterCodes[CharacterCodes["openBrace"] = 123] = "openBrace";
-        CharacterCodes[CharacterCodes["openBracket"] = 91] = "openBracket";
-        CharacterCodes[CharacterCodes["openParen"] = 40] = "openParen";
-        CharacterCodes[CharacterCodes["percent"] = 37] = "percent";
-        CharacterCodes[CharacterCodes["plus"] = 43] = "plus";
-        CharacterCodes[CharacterCodes["question"] = 63] = "question";
-        CharacterCodes[CharacterCodes["semicolon"] = 59] = "semicolon";
-        CharacterCodes[CharacterCodes["singleQuote"] = 39] = "singleQuote";
-        CharacterCodes[CharacterCodes["slash"] = 47] = "slash";
-        CharacterCodes[CharacterCodes["tilde"] = 126] = "tilde";
-        CharacterCodes[CharacterCodes["backspace"] = 8] = "backspace";
-        CharacterCodes[CharacterCodes["formFeed"] = 12] = "formFeed";
-        CharacterCodes[CharacterCodes["byteOrderMark"] = 65279] = "byteOrderMark";
-        CharacterCodes[CharacterCodes["tab"] = 9] = "tab";
-        CharacterCodes[CharacterCodes["verticalTab"] = 11] = "verticalTab";
-    })(ts.CharacterCodes || (ts.CharacterCodes = {}));
-    var CharacterCodes = ts.CharacterCodes;
-    (function (TransformFlags) {
-        TransformFlags[TransformFlags["None"] = 0] = "None";
-        TransformFlags[TransformFlags["TypeScript"] = 1] = "TypeScript";
-        TransformFlags[TransformFlags["ContainsTypeScript"] = 2] = "ContainsTypeScript";
-        TransformFlags[TransformFlags["Jsx"] = 4] = "Jsx";
-        TransformFlags[TransformFlags["ContainsJsx"] = 8] = "ContainsJsx";
-        TransformFlags[TransformFlags["ES2017"] = 16] = "ES2017";
-        TransformFlags[TransformFlags["ContainsES2017"] = 32] = "ContainsES2017";
-        TransformFlags[TransformFlags["ES2016"] = 64] = "ES2016";
-        TransformFlags[TransformFlags["ContainsES2016"] = 128] = "ContainsES2016";
-        TransformFlags[TransformFlags["ES2015"] = 256] = "ES2015";
-        TransformFlags[TransformFlags["ContainsES2015"] = 512] = "ContainsES2015";
-        TransformFlags[TransformFlags["DestructuringAssignment"] = 1024] = "DestructuringAssignment";
-        TransformFlags[TransformFlags["Generator"] = 2048] = "Generator";
-        TransformFlags[TransformFlags["ContainsGenerator"] = 4096] = "ContainsGenerator";
-        TransformFlags[TransformFlags["ContainsDecorators"] = 8192] = "ContainsDecorators";
-        TransformFlags[TransformFlags["ContainsPropertyInitializer"] = 16384] = "ContainsPropertyInitializer";
-        TransformFlags[TransformFlags["ContainsLexicalThis"] = 32768] = "ContainsLexicalThis";
-        TransformFlags[TransformFlags["ContainsCapturedLexicalThis"] = 65536] = "ContainsCapturedLexicalThis";
-        TransformFlags[TransformFlags["ContainsLexicalThisInComputedPropertyName"] = 131072] = "ContainsLexicalThisInComputedPropertyName";
-        TransformFlags[TransformFlags["ContainsDefaultValueAssignments"] = 262144] = "ContainsDefaultValueAssignments";
-        TransformFlags[TransformFlags["ContainsParameterPropertyAssignments"] = 524288] = "ContainsParameterPropertyAssignments";
-        TransformFlags[TransformFlags["ContainsSpreadElementExpression"] = 1048576] = "ContainsSpreadElementExpression";
-        TransformFlags[TransformFlags["ContainsComputedPropertyName"] = 2097152] = "ContainsComputedPropertyName";
-        TransformFlags[TransformFlags["ContainsBlockScopedBinding"] = 4194304] = "ContainsBlockScopedBinding";
-        TransformFlags[TransformFlags["ContainsBindingPattern"] = 8388608] = "ContainsBindingPattern";
-        TransformFlags[TransformFlags["ContainsYield"] = 16777216] = "ContainsYield";
-        TransformFlags[TransformFlags["ContainsHoistedDeclarationOrCompletion"] = 33554432] = "ContainsHoistedDeclarationOrCompletion";
-        TransformFlags[TransformFlags["HasComputedFlags"] = 536870912] = "HasComputedFlags";
-        TransformFlags[TransformFlags["AssertTypeScript"] = 3] = "AssertTypeScript";
-        TransformFlags[TransformFlags["AssertJsx"] = 12] = "AssertJsx";
-        TransformFlags[TransformFlags["AssertES2017"] = 48] = "AssertES2017";
-        TransformFlags[TransformFlags["AssertES2016"] = 192] = "AssertES2016";
-        TransformFlags[TransformFlags["AssertES2015"] = 768] = "AssertES2015";
-        TransformFlags[TransformFlags["AssertGenerator"] = 6144] = "AssertGenerator";
-        TransformFlags[TransformFlags["NodeExcludes"] = 536874325] = "NodeExcludes";
-        TransformFlags[TransformFlags["ArrowFunctionExcludes"] = 592227669] = "ArrowFunctionExcludes";
-        TransformFlags[TransformFlags["FunctionExcludes"] = 592293205] = "FunctionExcludes";
-        TransformFlags[TransformFlags["ConstructorExcludes"] = 591760725] = "ConstructorExcludes";
-        TransformFlags[TransformFlags["MethodOrAccessorExcludes"] = 591760725] = "MethodOrAccessorExcludes";
-        TransformFlags[TransformFlags["ClassExcludes"] = 539749717] = "ClassExcludes";
-        TransformFlags[TransformFlags["ModuleExcludes"] = 574729557] = "ModuleExcludes";
-        TransformFlags[TransformFlags["TypeExcludes"] = -3] = "TypeExcludes";
-        TransformFlags[TransformFlags["ObjectLiteralExcludes"] = 539110741] = "ObjectLiteralExcludes";
-        TransformFlags[TransformFlags["ArrayLiteralOrCallOrNewExcludes"] = 537922901] = "ArrayLiteralOrCallOrNewExcludes";
-        TransformFlags[TransformFlags["VariableDeclarationListExcludes"] = 545262933] = "VariableDeclarationListExcludes";
-        TransformFlags[TransformFlags["ParameterExcludes"] = 545262933] = "ParameterExcludes";
-        TransformFlags[TransformFlags["TypeScriptClassSyntaxMask"] = 548864] = "TypeScriptClassSyntaxMask";
-        TransformFlags[TransformFlags["ES2015FunctionSyntaxMask"] = 327680] = "ES2015FunctionSyntaxMask";
-    })(ts.TransformFlags || (ts.TransformFlags = {}));
-    var TransformFlags = ts.TransformFlags;
-    (function (EmitFlags) {
-        EmitFlags[EmitFlags["EmitEmitHelpers"] = 1] = "EmitEmitHelpers";
-        EmitFlags[EmitFlags["EmitExportStar"] = 2] = "EmitExportStar";
-        EmitFlags[EmitFlags["EmitSuperHelper"] = 4] = "EmitSuperHelper";
-        EmitFlags[EmitFlags["EmitAdvancedSuperHelper"] = 8] = "EmitAdvancedSuperHelper";
-        EmitFlags[EmitFlags["UMDDefine"] = 16] = "UMDDefine";
-        EmitFlags[EmitFlags["SingleLine"] = 32] = "SingleLine";
-        EmitFlags[EmitFlags["AdviseOnEmitNode"] = 64] = "AdviseOnEmitNode";
-        EmitFlags[EmitFlags["NoSubstitution"] = 128] = "NoSubstitution";
-        EmitFlags[EmitFlags["CapturesThis"] = 256] = "CapturesThis";
-        EmitFlags[EmitFlags["NoLeadingSourceMap"] = 512] = "NoLeadingSourceMap";
-        EmitFlags[EmitFlags["NoTrailingSourceMap"] = 1024] = "NoTrailingSourceMap";
-        EmitFlags[EmitFlags["NoSourceMap"] = 1536] = "NoSourceMap";
-        EmitFlags[EmitFlags["NoNestedSourceMaps"] = 2048] = "NoNestedSourceMaps";
-        EmitFlags[EmitFlags["NoTokenLeadingSourceMaps"] = 4096] = "NoTokenLeadingSourceMaps";
-        EmitFlags[EmitFlags["NoTokenTrailingSourceMaps"] = 8192] = "NoTokenTrailingSourceMaps";
-        EmitFlags[EmitFlags["NoTokenSourceMaps"] = 12288] = "NoTokenSourceMaps";
-        EmitFlags[EmitFlags["NoLeadingComments"] = 16384] = "NoLeadingComments";
-        EmitFlags[EmitFlags["NoTrailingComments"] = 32768] = "NoTrailingComments";
-        EmitFlags[EmitFlags["NoComments"] = 49152] = "NoComments";
-        EmitFlags[EmitFlags["NoNestedComments"] = 65536] = "NoNestedComments";
-        EmitFlags[EmitFlags["ExportName"] = 131072] = "ExportName";
-        EmitFlags[EmitFlags["LocalName"] = 262144] = "LocalName";
-        EmitFlags[EmitFlags["Indented"] = 524288] = "Indented";
-        EmitFlags[EmitFlags["NoIndentation"] = 1048576] = "NoIndentation";
-        EmitFlags[EmitFlags["AsyncFunctionBody"] = 2097152] = "AsyncFunctionBody";
-        EmitFlags[EmitFlags["ReuseTempVariableScope"] = 4194304] = "ReuseTempVariableScope";
-        EmitFlags[EmitFlags["CustomPrologue"] = 8388608] = "CustomPrologue";
-    })(ts.EmitFlags || (ts.EmitFlags = {}));
-    var EmitFlags = ts.EmitFlags;
-    (function (EmitContext) {
-        EmitContext[EmitContext["SourceFile"] = 0] = "SourceFile";
-        EmitContext[EmitContext["Expression"] = 1] = "Expression";
-        EmitContext[EmitContext["IdentifierName"] = 2] = "IdentifierName";
-        EmitContext[EmitContext["Unspecified"] = 3] = "Unspecified";
-    })(ts.EmitContext || (ts.EmitContext = {}));
-    var EmitContext = ts.EmitContext;
+    })(ModuleKind = ts.ModuleKind || (ts.ModuleKind = {}));
+    var Extension;
+    (function (Extension) {
+        Extension[Extension["Ts"] = 0] = "Ts";
+        Extension[Extension["Tsx"] = 1] = "Tsx";
+        Extension[Extension["Dts"] = 2] = "Dts";
+        Extension[Extension["Js"] = 3] = "Js";
+        Extension[Extension["Jsx"] = 4] = "Jsx";
+        Extension[Extension["LastTypeScriptExtension"] = 2] = "LastTypeScriptExtension";
+    })(Extension = ts.Extension || (ts.Extension = {}));
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -990,12 +137,6 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    (function (Ternary) {
-        Ternary[Ternary["False"] = 0] = "False";
-        Ternary[Ternary["Maybe"] = 1] = "Maybe";
-        Ternary[Ternary["True"] = -1] = "True";
-    })(ts.Ternary || (ts.Ternary = {}));
-    var Ternary = ts.Ternary;
     var createObject = Object.create;
     ts.collator = typeof Intl === "object" && typeof Intl.Collator === "function" ? new Intl.Collator() : undefined;
     function createMap(template) {
@@ -1060,12 +201,6 @@ var ts;
         return getCanonicalFileName(nonCanonicalizedPath);
     }
     ts.toPath = toPath;
-    (function (Comparison) {
-        Comparison[Comparison["LessThan"] = -1] = "LessThan";
-        Comparison[Comparison["EqualTo"] = 0] = "EqualTo";
-        Comparison[Comparison["GreaterThan"] = 1] = "GreaterThan";
-    })(ts.Comparison || (ts.Comparison = {}));
-    var Comparison = ts.Comparison;
     function forEach(array, callback) {
         if (array) {
             for (var i = 0, len = array.length; i < len; i++) {
@@ -1078,6 +213,13 @@ var ts;
         return undefined;
     }
     ts.forEach = forEach;
+    function zipWith(arrayA, arrayB, callback) {
+        Debug.assert(arrayA.length === arrayB.length);
+        for (var i = 0; i < arrayA.length; i++) {
+            callback(arrayA[i], arrayB[i], i);
+        }
+    }
+    ts.zipWith = zipWith;
     function every(array, callback) {
         if (array) {
             for (var i = 0, len = array.length; i < len; i++) {
@@ -1337,20 +479,25 @@ var ts;
     ts.mapObject = mapObject;
     function some(array, predicate) {
         if (array) {
-            for (var _i = 0, array_5 = array; _i < array_5.length; _i++) {
-                var v = array_5[_i];
-                if (!predicate || predicate(v)) {
-                    return true;
+            if (predicate) {
+                for (var _i = 0, array_5 = array; _i < array_5.length; _i++) {
+                    var v = array_5[_i];
+                    if (predicate(v)) {
+                        return true;
+                    }
                 }
             }
+            else {
+                return array.length > 0;
+            }
         }
         return false;
     }
     ts.some = some;
     function concatenate(array1, array2) {
-        if (!array2 || !array2.length)
+        if (!some(array2))
             return array1;
-        if (!array1 || !array1.length)
+        if (!some(array1))
             return array2;
         return array1.concat(array2);
     }
@@ -1373,6 +520,41 @@ var ts;
         return result;
     }
     ts.deduplicate = deduplicate;
+    function arrayIsEqualTo(array1, array2, equaler) {
+        if (!array1 || !array2) {
+            return array1 === array2;
+        }
+        if (array1.length !== array2.length) {
+            return false;
+        }
+        for (var i = 0; i < array1.length; i++) {
+            var equals = equaler ? equaler(array1[i], array2[i]) : array1[i] === array2[i];
+            if (!equals) {
+                return false;
+            }
+        }
+        return true;
+    }
+    ts.arrayIsEqualTo = arrayIsEqualTo;
+    function changesAffectModuleResolution(oldOptions, newOptions) {
+        return !oldOptions ||
+            (oldOptions.module !== newOptions.module) ||
+            (oldOptions.moduleResolution !== newOptions.moduleResolution) ||
+            (oldOptions.noResolve !== newOptions.noResolve) ||
+            (oldOptions.target !== newOptions.target) ||
+            (oldOptions.noLib !== newOptions.noLib) ||
+            (oldOptions.jsx !== newOptions.jsx) ||
+            (oldOptions.allowJs !== newOptions.allowJs) ||
+            (oldOptions.rootDir !== newOptions.rootDir) ||
+            (oldOptions.configFilePath !== newOptions.configFilePath) ||
+            (oldOptions.baseUrl !== newOptions.baseUrl) ||
+            (oldOptions.maxNodeModuleJsDepth !== newOptions.maxNodeModuleJsDepth) ||
+            !arrayIsEqualTo(oldOptions.lib, newOptions.lib) ||
+            !arrayIsEqualTo(oldOptions.typeRoots, newOptions.typeRoots) ||
+            !arrayIsEqualTo(oldOptions.rootDirs, newOptions.rootDirs) ||
+            !equalOwnProperties(oldOptions.paths, newOptions.paths);
+    }
+    ts.changesAffectModuleResolution = changesAffectModuleResolution;
     function compact(array) {
         var result;
         if (array) {
@@ -1391,6 +573,26 @@ var ts;
         return result || array;
     }
     ts.compact = compact;
+    function relativeComplement(arrayA, arrayB, comparer, offsetA, offsetB) {
+        if (comparer === void 0) { comparer = compareValues; }
+        if (offsetA === void 0) { offsetA = 0; }
+        if (offsetB === void 0) { offsetB = 0; }
+        if (!arrayB || !arrayA || arrayB.length === 0 || arrayA.length === 0)
+            return arrayB;
+        var result = [];
+        outer: for (; offsetB < arrayB.length; offsetB++) {
+            inner: for (; offsetA < arrayA.length; offsetA++) {
+                switch (comparer(arrayB[offsetB], arrayA[offsetA])) {
+                    case -1: break inner;
+                    case 0: continue outer;
+                    case 1: continue inner;
+                }
+            }
+            result.push(arrayB[offsetB]);
+        }
+        return result;
+    }
+    ts.relativeComplement = relativeComplement;
     function sum(array, prop) {
         var result = 0;
         for (var _i = 0, array_7 = array; _i < array_7.length; _i++) {
@@ -1400,15 +602,23 @@ var ts;
         return result;
     }
     ts.sum = sum;
+    function append(to, value) {
+        if (value === undefined)
+            return to;
+        if (to === undefined)
+            to = [];
+        to.push(value);
+        return to;
+    }
+    ts.append = append;
     function addRange(to, from) {
-        if (to && from) {
-            for (var _i = 0, from_1 = from; _i < from_1.length; _i++) {
-                var v = from_1[_i];
-                if (v !== undefined) {
-                    to.push(v);
-                }
-            }
+        if (from === undefined)
+            return to;
+        for (var _i = 0, from_1 = from; _i < from_1.length; _i++) {
+            var v = from_1[_i];
+            to = append(to, v);
         }
+        return to;
     }
     ts.addRange = addRange;
     function rangeEquals(array1, array2, pos, end) {
@@ -1427,6 +637,12 @@ var ts;
             : undefined;
     }
     ts.firstOrUndefined = firstOrUndefined;
+    function lastOrUndefined(array) {
+        return array && array.length > 0
+            ? array[array.length - 1]
+            : undefined;
+    }
+    ts.lastOrUndefined = lastOrUndefined;
     function singleOrUndefined(array) {
         return array && array.length === 1
             ? array[0]
@@ -1439,17 +655,17 @@ var ts;
             : array;
     }
     ts.singleOrMany = singleOrMany;
-    function lastOrUndefined(array) {
-        return array && array.length > 0
-            ? array[array.length - 1]
-            : undefined;
+    function replaceElement(array, index, value) {
+        var result = array.slice(0);
+        result[index] = value;
+        return result;
     }
-    ts.lastOrUndefined = lastOrUndefined;
-    function binarySearch(array, value, comparer) {
+    ts.replaceElement = replaceElement;
+    function binarySearch(array, value, comparer, offset) {
         if (!array || array.length === 0) {
             return -1;
         }
-        var low = 0;
+        var low = offset || 0;
         var high = array.length - 1;
         comparer = comparer !== undefined
             ? comparer
@@ -1683,6 +899,12 @@ var ts;
         return Array.isArray ? Array.isArray(value) : value instanceof Array;
     }
     ts.isArray = isArray;
+    function noop() { }
+    ts.noop = noop;
+    function notImplemented() {
+        throw new Error("Not implemented");
+    }
+    ts.notImplemented = notImplemented;
     function memoize(callback) {
         var value;
         return function () {
@@ -1798,6 +1020,17 @@ var ts;
         };
     }
     ts.createCompilerDiagnostic = createCompilerDiagnostic;
+    function createCompilerDiagnosticFromMessageChain(chain) {
+        return {
+            file: undefined,
+            start: undefined,
+            length: undefined,
+            code: chain.code,
+            category: chain.category,
+            messageText: chain.next ? chain : chain.messageText
+        };
+    }
+    ts.createCompilerDiagnosticFromMessageChain = createCompilerDiagnosticFromMessageChain;
     function chainDiagnosticMessages(details, message) {
         var text = getLocaleSpecificMessage(message);
         if (arguments.length > 2) {
@@ -2190,6 +1423,10 @@ var ts;
         return expectedPos >= 0 && str.indexOf(suffix, expectedPos) === expectedPos;
     }
     ts.endsWith = endsWith;
+    function hasExtension(fileName) {
+        return getBaseFileName(fileName).indexOf(".") >= 0;
+    }
+    ts.hasExtension = hasExtension;
     function fileExtensionIs(path, extension) {
         return path.length > extension.length && endsWith(path, extension);
     }
@@ -2217,68 +1454,83 @@ var ts;
         var doubleAsteriskRegexFragment = usage === "exclude" ? "(/.+?)?" : "(/[^/.][^/]*)*?";
         var pattern = "";
         var hasWrittenSubpattern = false;
-        spec: for (var _i = 0, specs_1 = specs; _i < specs_1.length; _i++) {
+        for (var _i = 0, specs_1 = specs; _i < specs_1.length; _i++) {
             var spec = specs_1[_i];
             if (!spec) {
                 continue;
             }
-            var subpattern = "";
-            var hasRecursiveDirectoryWildcard = false;
-            var hasWrittenComponent = false;
-            var components = getNormalizedPathComponents(spec, basePath);
-            if (usage !== "exclude" && components[components.length - 1] === "**") {
-                continue spec;
-            }
-            components[0] = removeTrailingDirectorySeparator(components[0]);
-            var optionalCount = 0;
-            for (var _a = 0, components_1 = components; _a < components_1.length; _a++) {
-                var component = components_1[_a];
-                if (component === "**") {
-                    if (hasRecursiveDirectoryWildcard) {
-                        continue spec;
-                    }
-                    subpattern += doubleAsteriskRegexFragment;
-                    hasRecursiveDirectoryWildcard = true;
-                    hasWrittenComponent = true;
-                }
-                else {
-                    if (usage === "directories") {
-                        subpattern += "(";
-                        optionalCount++;
-                    }
-                    if (hasWrittenComponent) {
-                        subpattern += ts.directorySeparator;
-                    }
-                    if (usage !== "exclude") {
-                        if (component.charCodeAt(0) === 42) {
-                            subpattern += "([^./]" + singleAsteriskRegexFragment + ")?";
-                            component = component.substr(1);
-                        }
-                        else if (component.charCodeAt(0) === 63) {
-                            subpattern += "[^./]";
-                            component = component.substr(1);
-                        }
-                    }
-                    subpattern += component.replace(reservedCharacterPattern, replaceWildcardCharacter);
-                    hasWrittenComponent = true;
-                }
-            }
-            while (optionalCount > 0) {
-                subpattern += ")?";
-                optionalCount--;
+            var subPattern = getSubPatternFromSpec(spec, basePath, usage, singleAsteriskRegexFragment, doubleAsteriskRegexFragment, replaceWildcardCharacter);
+            if (subPattern === undefined) {
+                continue;
             }
             if (hasWrittenSubpattern) {
                 pattern += "|";
             }
-            pattern += "(" + subpattern + ")";
+            pattern += "(" + subPattern + ")";
             hasWrittenSubpattern = true;
         }
         if (!pattern) {
             return undefined;
         }
-        return "^(" + pattern + (usage === "exclude" ? ")($|/)" : ")$");
+        var terminator = usage === "exclude" ? "($|/)" : "$";
+        return "^(" + pattern + ")" + terminator;
     }
     ts.getRegularExpressionForWildcard = getRegularExpressionForWildcard;
+    function isImplicitGlob(lastPathComponent) {
+        return !/[.*?]/.test(lastPathComponent);
+    }
+    ts.isImplicitGlob = isImplicitGlob;
+    function getSubPatternFromSpec(spec, basePath, usage, singleAsteriskRegexFragment, doubleAsteriskRegexFragment, replaceWildcardCharacter) {
+        var subpattern = "";
+        var hasRecursiveDirectoryWildcard = false;
+        var hasWrittenComponent = false;
+        var components = getNormalizedPathComponents(spec, basePath);
+        var lastComponent = lastOrUndefined(components);
+        if (usage !== "exclude" && lastComponent === "**") {
+            return undefined;
+        }
+        components[0] = removeTrailingDirectorySeparator(components[0]);
+        if (isImplicitGlob(lastComponent)) {
+            components.push("**", "*");
+        }
+        var optionalCount = 0;
+        for (var _i = 0, components_1 = components; _i < components_1.length; _i++) {
+            var component = components_1[_i];
+            if (component === "**") {
+                if (hasRecursiveDirectoryWildcard) {
+                    return undefined;
+                }
+                subpattern += doubleAsteriskRegexFragment;
+                hasRecursiveDirectoryWildcard = true;
+            }
+            else {
+                if (usage === "directories") {
+                    subpattern += "(";
+                    optionalCount++;
+                }
+                if (hasWrittenComponent) {
+                    subpattern += ts.directorySeparator;
+                }
+                if (usage !== "exclude") {
+                    if (component.charCodeAt(0) === 42) {
+                        subpattern += "([^./]" + singleAsteriskRegexFragment + ")?";
+                        component = component.substr(1);
+                    }
+                    else if (component.charCodeAt(0) === 63) {
+                        subpattern += "[^./]";
+                        component = component.substr(1);
+                    }
+                }
+                subpattern += component.replace(reservedCharacterPattern, replaceWildcardCharacter);
+            }
+            hasWrittenComponent = true;
+        }
+        while (optionalCount > 0) {
+            subpattern += ")?";
+            optionalCount--;
+        }
+        return subpattern;
+    }
     function replaceWildCardCharacterFiles(match) {
         return replaceWildcardCharacter(match, singleAsteriskRegexFragmentFiles);
     }
@@ -2345,25 +1597,30 @@ var ts;
             for (var _i = 0, includes_1 = includes; _i < includes_1.length; _i++) {
                 var include = includes_1[_i];
                 var absolute = isRootedDiskPath(include) ? include : normalizePath(combinePaths(path, include));
-                var wildcardOffset = indexOfAnyCharCode(absolute, wildcardCharCodes);
-                var includeBasePath = wildcardOffset < 0
-                    ? removeTrailingDirectorySeparator(getDirectoryPath(absolute))
-                    : absolute.substring(0, absolute.lastIndexOf(ts.directorySeparator, wildcardOffset));
-                includeBasePaths.push(includeBasePath);
+                includeBasePaths.push(getIncludeBasePath(absolute));
             }
             includeBasePaths.sort(useCaseSensitiveFileNames ? compareStrings : compareStringsCaseInsensitive);
-            include: for (var i = 0; i < includeBasePaths.length; i++) {
-                var includeBasePath = includeBasePaths[i];
-                for (var j = 0; j < basePaths.length; j++) {
-                    if (containsPath(basePaths[j], includeBasePath, path, !useCaseSensitiveFileNames)) {
-                        continue include;
-                    }
+            var _loop_1 = function (includeBasePath) {
+                if (ts.every(basePaths, function (basePath) { return !containsPath(basePath, includeBasePath, path, !useCaseSensitiveFileNames); })) {
+                    basePaths.push(includeBasePath);
                 }
-                basePaths.push(includeBasePath);
+            };
+            for (var _a = 0, includeBasePaths_1 = includeBasePaths; _a < includeBasePaths_1.length; _a++) {
+                var includeBasePath = includeBasePaths_1[_a];
+                _loop_1(includeBasePath);
             }
         }
         return basePaths;
     }
+    function getIncludeBasePath(absolute) {
+        var wildcardOffset = indexOfAnyCharCode(absolute, wildcardCharCodes);
+        if (wildcardOffset < 0) {
+            return !hasExtension(absolute)
+                ? absolute
+                : removeTrailingDirectorySeparator(getDirectoryPath(absolute));
+        }
+        return absolute.substring(0, absolute.lastIndexOf(ts.directorySeparator, wildcardOffset));
+    }
     function ensureScriptKind(fileName, scriptKind) {
         return (scriptKind || getScriptKindFromFileName(fileName)) || 3;
     }
@@ -2413,14 +1670,6 @@ var ts;
         return false;
     }
     ts.isSupportedSourceFileName = isSupportedSourceFileName;
-    (function (ExtensionPriority) {
-        ExtensionPriority[ExtensionPriority["TypeScriptFiles"] = 0] = "TypeScriptFiles";
-        ExtensionPriority[ExtensionPriority["DeclarationAndJavaScriptFiles"] = 2] = "DeclarationAndJavaScriptFiles";
-        ExtensionPriority[ExtensionPriority["Limit"] = 5] = "Limit";
-        ExtensionPriority[ExtensionPriority["Highest"] = 0] = "Highest";
-        ExtensionPriority[ExtensionPriority["Lowest"] = 2] = "Lowest";
-    })(ts.ExtensionPriority || (ts.ExtensionPriority = {}));
-    var ExtensionPriority = ts.ExtensionPriority;
     function getExtensionPriority(path, supportedExtensions) {
         for (var i = supportedExtensions.length - 1; i >= 0; i--) {
             if (fileExtensionIs(path, supportedExtensions[i])) {
@@ -2471,10 +1720,6 @@ var ts;
         return path.substring(0, path.length - extension.length);
     }
     ts.removeExtension = removeExtension;
-    function isJsxOrTsxExtension(ext) {
-        return ext === ".jsx" || ext === ".tsx";
-    }
-    ts.isJsxOrTsxExtension = isJsxOrTsxExtension;
     function changeExtension(path, newExtension) {
         return (removeFileExtension(path) + newExtension);
     }
@@ -2509,13 +1754,6 @@ var ts;
         getTypeConstructor: function () { return Type; },
         getSignatureConstructor: function () { return Signature; }
     };
-    (function (AssertionLevel) {
-        AssertionLevel[AssertionLevel["None"] = 0] = "None";
-        AssertionLevel[AssertionLevel["Normal"] = 1] = "Normal";
-        AssertionLevel[AssertionLevel["Aggressive"] = 2] = "Aggressive";
-        AssertionLevel[AssertionLevel["VeryAggressive"] = 3] = "VeryAggressive";
-    })(ts.AssertionLevel || (ts.AssertionLevel = {}));
-    var AssertionLevel = ts.AssertionLevel;
     var Debug;
     (function (Debug) {
         Debug.currentAssertionLevel = 0;
@@ -2627,6 +1865,36 @@ var ts;
         return !(pos >= 0);
     }
     ts.positionIsSynthesized = positionIsSynthesized;
+    function extensionIsTypeScript(ext) {
+        return ext <= ts.Extension.LastTypeScriptExtension;
+    }
+    ts.extensionIsTypeScript = extensionIsTypeScript;
+    function extensionFromPath(path) {
+        var ext = tryGetExtensionFromPath(path);
+        if (ext !== undefined) {
+            return ext;
+        }
+        Debug.fail("File " + path + " has unknown extension.");
+    }
+    ts.extensionFromPath = extensionFromPath;
+    function tryGetExtensionFromPath(path) {
+        if (fileExtensionIs(path, ".d.ts")) {
+            return ts.Extension.Dts;
+        }
+        if (fileExtensionIs(path, ".ts")) {
+            return ts.Extension.Ts;
+        }
+        if (fileExtensionIs(path, ".tsx")) {
+            return ts.Extension.Tsx;
+        }
+        if (fileExtensionIs(path, ".js")) {
+            return ts.Extension.Js;
+        }
+        if (fileExtensionIs(path, ".jsx")) {
+            return ts.Extension.Jsx;
+        }
+    }
+    ts.tryGetExtensionFromPath = tryGetExtensionFromPath;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -2900,11 +2168,6 @@ var ts;
             function readDirectory(path, extensions, excludes, includes) {
                 return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), getAccessibleFileSystemEntries);
             }
-            var FileSystemEntryKind;
-            (function (FileSystemEntryKind) {
-                FileSystemEntryKind[FileSystemEntryKind["File"] = 0] = "File";
-                FileSystemEntryKind[FileSystemEntryKind["Directory"] = 1] = "Directory";
-            })(FileSystemEntryKind || (FileSystemEntryKind = {}));
             function fileSystemEntryExists(path, entryKind) {
                 try {
                     var stat = _fs.statSync(path);
@@ -2926,6 +2189,7 @@ var ts;
             function getDirectories(path) {
                 return ts.filter(_fs.readdirSync(path), function (dir) { return fileSystemEntryExists(ts.combinePaths(path, dir), 1); });
             }
+            var noOpFileWatcher = { close: ts.noop };
             var nodeSystem = {
                 args: process.argv.slice(2),
                 newLine: _os.EOL,
@@ -2935,7 +2199,7 @@ var ts;
                 },
                 readFile: readFile,
                 writeFile: writeFile,
-                watchFile: function (fileName, callback) {
+                watchFile: function (fileName, callback, pollingInterval) {
                     if (useNonPollingWatchers) {
                         var watchedFile_1 = watchedFileSet.addFile(fileName, callback);
                         return {
@@ -2943,7 +2207,7 @@ var ts;
                         };
                     }
                     else {
-                        _fs.watchFile(fileName, { persistent: true, interval: 250 }, fileChanged);
+                        _fs.watchFile(fileName, { persistent: true, interval: pollingInterval || 250 }, fileChanged);
                         return {
                             close: function () { return _fs.unwatchFile(fileName, fileChanged); }
                         };
@@ -2958,7 +2222,7 @@ var ts;
                 watchDirectory: function (directoryName, callback, recursive) {
                     var options;
                     if (!directoryExists(directoryName)) {
-                        return;
+                        return noOpFileWatcher;
                     }
                     if (isNode4OrLater() && (process.platform === "win32" || process.platform === "darwin")) {
                         options = { persistent: true, recursive: !!recursive };
@@ -3035,7 +2299,9 @@ var ts;
                     }
                     catch (e) {
                     }
-                }
+                },
+                setTimeout: setTimeout,
+                clearTimeout: clearTimeout
             };
             return nodeSystem;
         }
@@ -3153,7 +2419,7 @@ var ts;
         A_set_accessor_parameter_cannot_have_an_initializer: { code: 1052, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_parameter_cannot_have_an_initializer_1052", message: "A 'set' accessor parameter cannot have an initializer." },
         A_set_accessor_cannot_have_rest_parameter: { code: 1053, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_cannot_have_rest_parameter_1053", message: "A 'set' accessor cannot have rest parameter." },
         A_get_accessor_cannot_have_parameters: { code: 1054, category: ts.DiagnosticCategory.Error, key: "A_get_accessor_cannot_have_parameters_1054", message: "A 'get' accessor cannot have parameters." },
-        Type_0_is_not_a_valid_async_function_return_type: { code: 1055, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_a_valid_async_function_return_type_1055", message: "Type '{0}' is not a valid async function return type." },
+        Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value: { code: 1055, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Prom_1055", message: "Type '{0}' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value." },
         Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher: { code: 1056, category: ts.DiagnosticCategory.Error, key: "Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher_1056", message: "Accessors are only available when targeting ECMAScript 5 and higher." },
         An_async_function_or_method_must_have_a_valid_awaitable_return_type: { code: 1057, category: ts.DiagnosticCategory.Error, key: "An_async_function_or_method_must_have_a_valid_awaitable_return_type_1057", message: "An async function or method must have a valid awaitable return type." },
         Operand_for_await_does_not_have_a_valid_callable_then_member: { code: 1058, category: ts.DiagnosticCategory.Error, key: "Operand_for_await_does_not_have_a_valid_callable_then_member_1058", message: "Operand for 'await' does not have a valid callable 'then' member." },
@@ -3263,7 +2529,6 @@ var ts;
         Module_0_has_no_default_export: { code: 1192, category: ts.DiagnosticCategory.Error, key: "Module_0_has_no_default_export_1192", message: "Module '{0}' has no default export." },
         An_export_declaration_cannot_have_modifiers: { code: 1193, category: ts.DiagnosticCategory.Error, key: "An_export_declaration_cannot_have_modifiers_1193", message: "An export declaration cannot have modifiers." },
         Export_declarations_are_not_permitted_in_a_namespace: { code: 1194, category: ts.DiagnosticCategory.Error, key: "Export_declarations_are_not_permitted_in_a_namespace_1194", message: "Export declarations are not permitted in a namespace." },
-        Catch_clause_variable_name_must_be_an_identifier: { code: 1195, category: ts.DiagnosticCategory.Error, key: "Catch_clause_variable_name_must_be_an_identifier_1195", message: "Catch clause variable name must be an identifier." },
         Catch_clause_variable_cannot_have_a_type_annotation: { code: 1196, category: ts.DiagnosticCategory.Error, key: "Catch_clause_variable_cannot_have_a_type_annotation_1196", message: "Catch clause variable cannot have a type annotation." },
         Catch_clause_variable_cannot_have_an_initializer: { code: 1197, category: ts.DiagnosticCategory.Error, key: "Catch_clause_variable_cannot_have_an_initializer_1197", message: "Catch clause variable cannot have an initializer." },
         An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive: { code: 1198, category: ts.DiagnosticCategory.Error, key: "An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive_1198", message: "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive." },
@@ -3381,14 +2646,14 @@ var ts;
         Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1: { code: 2353, category: ts.DiagnosticCategory.Error, key: "Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1_2353", message: "Object literal may only specify known properties, and '{0}' does not exist in type '{1}'." },
         A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value: { code: 2355, category: ts.DiagnosticCategory.Error, key: "A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value_2355", message: "A function whose declared type is neither 'void' nor 'any' must return a value." },
         An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type: { code: 2356, category: ts.DiagnosticCategory.Error, key: "An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type_2356", message: "An arithmetic operand must be of type 'any', 'number' or an enum type." },
-        The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer: { code: 2357, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer_2357", message: "The operand of an increment or decrement operator must be a variable, property or indexer." },
+        The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_or_a_property_access: { code: 2357, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_or_a_property_access_2357", message: "The operand of an increment or decrement operator must be a variable or a property access." },
         The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2358, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_paramete_2358", message: "The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter." },
         The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_Function_interface_type: { code: 2359, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_F_2359", message: "The right-hand side of an 'instanceof' expression must be of type 'any' or of a type assignable to the 'Function' interface type." },
         The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol: { code: 2360, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol_2360", message: "The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'." },
         The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2361, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter_2361", message: "The right-hand side of an 'in' expression must be of type 'any', an object type or a type parameter" },
         The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2362, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type_2362", message: "The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
         The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2363, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type_2363", message: "The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
-        Invalid_left_hand_side_of_assignment_expression: { code: 2364, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_of_assignment_expression_2364", message: "Invalid left-hand side of assignment expression." },
+        The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access: { code: 2364, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access_2364", message: "The left-hand side of an assignment expression must be a variable or a property access." },
         Operator_0_cannot_be_applied_to_types_1_and_2: { code: 2365, category: ts.DiagnosticCategory.Error, key: "Operator_0_cannot_be_applied_to_types_1_and_2_2365", message: "Operator '{0}' cannot be applied to types '{1}' and '{2}'." },
         Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined: { code: 2366, category: ts.DiagnosticCategory.Error, key: "Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined_2366", message: "Function lacks ending return statement and return type does not include 'undefined'." },
         Type_parameter_name_cannot_be_0: { code: 2368, category: ts.DiagnosticCategory.Error, key: "Type_parameter_name_cannot_be_0_2368", message: "Type parameter name cannot be '{0}'" },
@@ -3428,7 +2693,7 @@ var ts;
         Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2: { code: 2403, category: ts.DiagnosticCategory.Error, key: "Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_t_2403", message: "Subsequent variable declarations must have the same type.  Variable '{0}' must be of type '{1}', but here has type '{2}'." },
         The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation: { code: 2404, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation_2404", message: "The left-hand side of a 'for...in' statement cannot use a type annotation." },
         The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any: { code: 2405, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any_2405", message: "The left-hand side of a 'for...in' statement must be of type 'string' or 'any'." },
-        Invalid_left_hand_side_in_for_in_statement: { code: 2406, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_in_for_in_statement_2406", message: "Invalid left-hand side in 'for...in' statement." },
+        The_left_hand_side_of_a_for_in_statement_must_be_a_variable_or_a_property_access: { code: 2406, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_must_be_a_variable_or_a_property_access_2406", message: "The left-hand side of a 'for...in' statement must be a variable or a property access." },
         The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2407, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter_2407", message: "The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter." },
         Setters_cannot_return_a_value: { code: 2408, category: ts.DiagnosticCategory.Error, key: "Setters_cannot_return_a_value_2408", message: "Setters cannot return a value." },
         Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class: { code: 2409, category: ts.DiagnosticCategory.Error, key: "Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class_2409", message: "Return type of constructor signature must be assignable to the instance type of the class" },
@@ -3466,8 +2731,6 @@ var ts;
         Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1: { code: 2446, category: ts.DiagnosticCategory.Error, key: "Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1_2446", message: "Property '{0}' is protected and only accessible through an instance of class '{1}'." },
         The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead: { code: 2447, category: ts.DiagnosticCategory.Error, key: "The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead_2447", message: "The '{0}' operator is not allowed for boolean types. Consider using '{1}' instead." },
         Block_scoped_variable_0_used_before_its_declaration: { code: 2448, category: ts.DiagnosticCategory.Error, key: "Block_scoped_variable_0_used_before_its_declaration_2448", message: "Block-scoped variable '{0}' used before its declaration." },
-        The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property: { code: 2449, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property_2449", message: "The operand of an increment or decrement operator cannot be a constant or a read-only property." },
-        Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property: { code: 2450, category: ts.DiagnosticCategory.Error, key: "Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property_2450", message: "Left-hand side of assignment expression cannot be a constant or a read-only property." },
         Cannot_redeclare_block_scoped_variable_0: { code: 2451, category: ts.DiagnosticCategory.Error, key: "Cannot_redeclare_block_scoped_variable_0_2451", message: "Cannot redeclare block-scoped variable '{0}'." },
         An_enum_member_cannot_have_a_numeric_name: { code: 2452, category: ts.DiagnosticCategory.Error, key: "An_enum_member_cannot_have_a_numeric_name_2452", message: "An enum member cannot have a numeric name." },
         The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_type_arguments_explicitly: { code: 2453, category: ts.DiagnosticCategory.Error, key: "The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_typ_2453", message: "The type argument for type parameter '{0}' cannot be inferred from the usage. Consider specifying the type arguments explicitly." },
@@ -3479,7 +2742,7 @@ var ts;
         Type_0_has_no_property_1_and_no_string_index_signature: { code: 2459, category: ts.DiagnosticCategory.Error, key: "Type_0_has_no_property_1_and_no_string_index_signature_2459", message: "Type '{0}' has no property '{1}' and no string index signature." },
         Type_0_has_no_property_1: { code: 2460, category: ts.DiagnosticCategory.Error, key: "Type_0_has_no_property_1_2460", message: "Type '{0}' has no property '{1}'." },
         Type_0_is_not_an_array_type: { code: 2461, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_an_array_type_2461", message: "Type '{0}' is not an array type." },
-        A_rest_element_must_be_last_in_an_array_destructuring_pattern: { code: 2462, category: ts.DiagnosticCategory.Error, key: "A_rest_element_must_be_last_in_an_array_destructuring_pattern_2462", message: "A rest element must be last in an array destructuring pattern" },
+        A_rest_element_must_be_last_in_a_destructuring_pattern: { code: 2462, category: ts.DiagnosticCategory.Error, key: "A_rest_element_must_be_last_in_a_destructuring_pattern_2462", message: "A rest element must be last in a destructuring pattern" },
         A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature: { code: 2463, category: ts.DiagnosticCategory.Error, key: "A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature_2463", message: "A binding pattern parameter cannot be optional in an implementation signature." },
         A_computed_property_name_must_be_of_type_string_number_symbol_or_any: { code: 2464, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_must_be_of_type_string_number_symbol_or_any_2464", message: "A computed property name must be of type 'string', 'number', 'symbol', or 'any'." },
         this_cannot_be_referenced_in_a_computed_property_name: { code: 2465, category: ts.DiagnosticCategory.Error, key: "this_cannot_be_referenced_in_a_computed_property_name_2465", message: "'this' cannot be referenced in a computed property name." },
@@ -3501,9 +2764,7 @@ var ts;
         Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1: { code: 2481, category: ts.DiagnosticCategory.Error, key: "Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1_2481", message: "Cannot initialize outer scoped variable '{0}' in the same scope as block scoped declaration '{1}'." },
         The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation: { code: 2483, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation_2483", message: "The left-hand side of a 'for...of' statement cannot use a type annotation." },
         Export_declaration_conflicts_with_exported_declaration_of_0: { code: 2484, category: ts.DiagnosticCategory.Error, key: "Export_declaration_conflicts_with_exported_declaration_of_0_2484", message: "Export declaration conflicts with exported declaration of '{0}'" },
-        The_left_hand_side_of_a_for_of_statement_cannot_be_a_constant_or_a_read_only_property: { code: 2485, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_cannot_be_a_constant_or_a_read_only_property_2485", message: "The left-hand side of a 'for...of' statement cannot be a constant or a read-only property." },
-        The_left_hand_side_of_a_for_in_statement_cannot_be_a_constant_or_a_read_only_property: { code: 2486, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_be_a_constant_or_a_read_only_property_2486", message: "The left-hand side of a 'for...in' statement cannot be a constant or a read-only property." },
-        Invalid_left_hand_side_in_for_of_statement: { code: 2487, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_in_for_of_statement_2487", message: "Invalid left-hand side in 'for...of' statement." },
+        The_left_hand_side_of_a_for_of_statement_must_be_a_variable_or_a_property_access: { code: 2487, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_must_be_a_variable_or_a_property_access_2487", message: "The left-hand side of a 'for...of' statement must be a variable or a property access." },
         Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator: { code: 2488, category: ts.DiagnosticCategory.Error, key: "Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator_2488", message: "Type must have a '[Symbol.iterator]()' method that returns an iterator." },
         An_iterator_must_have_a_next_method: { code: 2489, category: ts.DiagnosticCategory.Error, key: "An_iterator_must_have_a_next_method_2489", message: "An iterator must have a 'next()' method." },
         The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: { code: 2490, category: ts.DiagnosticCategory.Error, key: "The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property_2490", message: "The type returned by the 'next()' method of an iterator must have a 'value' property." },
@@ -3550,6 +2811,13 @@ var ts;
         Object_is_possibly_null_or_undefined: { code: 2533, category: ts.DiagnosticCategory.Error, key: "Object_is_possibly_null_or_undefined_2533", message: "Object is possibly 'null' or 'undefined'." },
         A_function_returning_never_cannot_have_a_reachable_end_point: { code: 2534, category: ts.DiagnosticCategory.Error, key: "A_function_returning_never_cannot_have_a_reachable_end_point_2534", message: "A function returning 'never' cannot have a reachable end point." },
         Enum_type_0_has_members_with_initializers_that_are_not_literals: { code: 2535, category: ts.DiagnosticCategory.Error, key: "Enum_type_0_has_members_with_initializers_that_are_not_literals_2535", message: "Enum type '{0}' has members with initializers that are not literals." },
+        Type_0_is_not_constrained_to_keyof_1: { code: 2536, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_constrained_to_keyof_1_2536", message: "Type '{0}' is not constrained to 'keyof {1}'." },
+        Type_0_has_no_matching_index_signature_for_type_1: { code: 2537, category: ts.DiagnosticCategory.Error, key: "Type_0_has_no_matching_index_signature_for_type_1_2537", message: "Type '{0}' has no matching index signature for type '{1}'." },
+        Type_0_cannot_be_used_as_an_index_type: { code: 2538, category: ts.DiagnosticCategory.Error, key: "Type_0_cannot_be_used_as_an_index_type_2538", message: "Type '{0}' cannot be used as an index type." },
+        Cannot_assign_to_0_because_it_is_not_a_variable: { code: 2539, category: ts.DiagnosticCategory.Error, key: "Cannot_assign_to_0_because_it_is_not_a_variable_2539", message: "Cannot assign to '{0}' because it is not a variable." },
+        Cannot_assign_to_0_because_it_is_a_constant_or_a_read_only_property: { code: 2540, category: ts.DiagnosticCategory.Error, key: "Cannot_assign_to_0_because_it_is_a_constant_or_a_read_only_property_2540", message: "Cannot assign to '{0}' because it is a constant or a read-only property." },
+        The_target_of_an_assignment_must_be_a_variable_or_a_property_access: { code: 2541, category: ts.DiagnosticCategory.Error, key: "The_target_of_an_assignment_must_be_a_variable_or_a_property_access_2541", message: "The target of an assignment must be a variable or a property access." },
+        Index_signature_in_type_0_only_permits_reading: { code: 2542, category: ts.DiagnosticCategory.Error, key: "Index_signature_in_type_0_only_permits_reading_2542", message: "Index signature in type '{0}' only permits reading." },
         JSX_element_attributes_type_0_may_not_be_a_union_type: { code: 2600, category: ts.DiagnosticCategory.Error, key: "JSX_element_attributes_type_0_may_not_be_a_union_type_2600", message: "JSX element attributes type '{0}' may not be a union type." },
         The_return_type_of_a_JSX_element_constructor_must_return_an_object_type: { code: 2601, category: ts.DiagnosticCategory.Error, key: "The_return_type_of_a_JSX_element_constructor_must_return_an_object_type_2601", message: "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: { code: 2602, category: ts.DiagnosticCategory.Error, key: "JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist_2602", message: "JSX element implicitly has type 'any' because the global type 'JSX.Element' does not exist." },
@@ -3573,6 +2841,7 @@ var ts;
         Cannot_find_name_0_Did_you_mean_the_static_member_1_0: { code: 2662, category: ts.DiagnosticCategory.Error, key: "Cannot_find_name_0_Did_you_mean_the_static_member_1_0_2662", message: "Cannot find name '{0}'. Did you mean the static member '{1}.{0}'?" },
         Cannot_find_name_0_Did_you_mean_the_instance_member_this_0: { code: 2663, category: ts.DiagnosticCategory.Error, key: "Cannot_find_name_0_Did_you_mean_the_instance_member_this_0_2663", message: "Cannot find name '{0}'. Did you mean the instance member 'this.{0}'?" },
         Invalid_module_name_in_augmentation_module_0_cannot_be_found: { code: 2664, category: ts.DiagnosticCategory.Error, key: "Invalid_module_name_in_augmentation_module_0_cannot_be_found_2664", message: "Invalid module name in augmentation, module '{0}' cannot be found." },
+        Invalid_module_name_in_augmentation_Module_0_resolves_to_an_untyped_module_at_1_which_cannot_be_augmented: { code: 2665, category: ts.DiagnosticCategory.Error, key: "Invalid_module_name_in_augmentation_Module_0_resolves_to_an_untyped_module_at_1_which_cannot_be_augm_2665", message: "Invalid module name in augmentation. Module '{0}' resolves to an untyped module at '{1}', which cannot be augmented." },
         Exports_and_export_assignments_are_not_permitted_in_module_augmentations: { code: 2666, category: ts.DiagnosticCategory.Error, key: "Exports_and_export_assignments_are_not_permitted_in_module_augmentations_2666", message: "Exports and export assignments are not permitted in module augmentations." },
         Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_module: { code: 2667, category: ts.DiagnosticCategory.Error, key: "Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_mod_2667", message: "Imports are not permitted in module augmentations. Consider moving them to the enclosing external module." },
         export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always_visible: { code: 2668, category: ts.DiagnosticCategory.Error, key: "export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always__2668", message: "'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible." },
@@ -3604,6 +2873,10 @@ var ts;
         Namespace_0_has_no_exported_member_1: { code: 2694, category: ts.DiagnosticCategory.Error, key: "Namespace_0_has_no_exported_member_1_2694", message: "Namespace '{0}' has no exported member '{1}'." },
         Left_side_of_comma_operator_is_unused_and_has_no_side_effects: { code: 2695, category: ts.DiagnosticCategory.Error, key: "Left_side_of_comma_operator_is_unused_and_has_no_side_effects_2695", message: "Left side of comma operator is unused and has no side effects." },
         The_Object_type_is_assignable_to_very_few_other_types_Did_you_mean_to_use_the_any_type_instead: { code: 2696, category: ts.DiagnosticCategory.Error, key: "The_Object_type_is_assignable_to_very_few_other_types_Did_you_mean_to_use_the_any_type_instead_2696", message: "The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?" },
+        An_async_function_or_method_must_return_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES2015_in_your_lib_option: { code: 2697, category: ts.DiagnosticCategory.Error, key: "An_async_function_or_method_must_return_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_in_2697", message: "An async function or method must return a 'Promise'. Make sure you have a declaration for 'Promise' or include 'ES2015' in your `--lib` option." },
+        Spread_types_may_only_be_created_from_object_types: { code: 2698, category: ts.DiagnosticCategory.Error, key: "Spread_types_may_only_be_created_from_object_types_2698", message: "Spread types may only be created from object types." },
+        Rest_types_may_only_be_created_from_object_types: { code: 2700, category: ts.DiagnosticCategory.Error, key: "Rest_types_may_only_be_created_from_object_types_2700", message: "Rest types may only be created from object types." },
+        An_object_rest_element_must_be_an_identifier: { code: 2701, category: ts.DiagnosticCategory.Error, key: "An_object_rest_element_must_be_an_identifier_2701", message: "An object rest element must be an identifier." },
         Import_declaration_0_is_using_private_name_1: { code: 4000, category: ts.DiagnosticCategory.Error, key: "Import_declaration_0_is_using_private_name_1_4000", message: "Import declaration '{0}' is using private name '{1}'." },
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", message: "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: { code: 4004, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", message: "Type parameter '{0}' of exported interface has or is using private name '{1}'." },
@@ -3703,6 +2976,7 @@ var ts;
         Substitution_0_for_pattern_1_has_incorrect_type_expected_string_got_2: { code: 5064, category: ts.DiagnosticCategory.Error, key: "Substitution_0_for_pattern_1_has_incorrect_type_expected_string_got_2_5064", message: "Substitution '{0}' for pattern '{1}' has incorrect type, expected 'string', got '{2}'." },
         File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0: { code: 5065, category: ts.DiagnosticCategory.Error, key: "File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildca_5065", message: "File specification cannot contain a parent directory ('..') that appears after a recursive directory wildcard ('**'): '{0}'." },
         Substitutions_for_pattern_0_shouldn_t_be_an_empty_array: { code: 5066, category: ts.DiagnosticCategory.Error, key: "Substitutions_for_pattern_0_shouldn_t_be_an_empty_array_5066", message: "Substitutions for pattern '{0}' shouldn't be an empty array." },
+        Invalid_value_for_jsxFactory_0_is_not_a_valid_identifier_or_qualified_name: { code: 5067, category: ts.DiagnosticCategory.Error, key: "Invalid_value_for_jsxFactory_0_is_not_a_valid_identifier_or_qualified_name_5067", message: "Invalid value for 'jsxFactory'. '{0}' is not a valid identifier or qualified-name." },
         Concatenate_and_emit_output_to_single_file: { code: 6001, category: ts.DiagnosticCategory.Message, key: "Concatenate_and_emit_output_to_single_file_6001", message: "Concatenate and emit output to single file." },
         Generates_corresponding_d_ts_file: { code: 6002, category: ts.DiagnosticCategory.Message, key: "Generates_corresponding_d_ts_file_6002", message: "Generates corresponding '.d.ts' file." },
         Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations: { code: 6003, category: ts.DiagnosticCategory.Message, key: "Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations_6003", message: "Specify the location where debugger should locate map files instead of generated locations." },
@@ -3786,7 +3060,7 @@ var ts;
         File_0_exist_use_it_as_a_name_resolution_result: { code: 6097, category: ts.DiagnosticCategory.Message, key: "File_0_exist_use_it_as_a_name_resolution_result_6097", message: "File '{0}' exist - use it as a name resolution result." },
         Loading_module_0_from_node_modules_folder: { code: 6098, category: ts.DiagnosticCategory.Message, key: "Loading_module_0_from_node_modules_folder_6098", message: "Loading module '{0}' from 'node_modules' folder." },
         Found_package_json_at_0: { code: 6099, category: ts.DiagnosticCategory.Message, key: "Found_package_json_at_0_6099", message: "Found 'package.json' at '{0}'." },
-        package_json_does_not_have_types_field: { code: 6100, category: ts.DiagnosticCategory.Message, key: "package_json_does_not_have_types_field_6100", message: "'package.json' does not have 'types' field." },
+        package_json_does_not_have_a_types_or_main_field: { code: 6100, category: ts.DiagnosticCategory.Message, key: "package_json_does_not_have_a_types_or_main_field_6100", message: "'package.json' does not have a 'types' or 'main' field." },
         package_json_has_0_field_1_that_references_2: { code: 6101, category: ts.DiagnosticCategory.Message, key: "package_json_has_0_field_1_that_references_2_6101", message: "'package.json' has '{0}' field '{1}' that references '{2}'." },
         Allow_javascript_files_to_be_compiled: { code: 6102, category: ts.DiagnosticCategory.Message, key: "Allow_javascript_files_to_be_compiled_6102", message: "Allow javascript files to be compiled." },
         Option_0_should_have_array_of_strings_as_a_value: { code: 6103, category: ts.DiagnosticCategory.Error, key: "Option_0_should_have_array_of_strings_as_a_value_6103", message: "Option '{0}' should have array of strings as a value." },
@@ -3823,11 +3097,16 @@ var ts;
         Report_errors_on_unused_locals: { code: 6134, category: ts.DiagnosticCategory.Message, key: "Report_errors_on_unused_locals_6134", message: "Report errors on unused locals." },
         Report_errors_on_unused_parameters: { code: 6135, category: ts.DiagnosticCategory.Message, key: "Report_errors_on_unused_parameters_6135", message: "Report errors on unused parameters." },
         The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files: { code: 6136, category: ts.DiagnosticCategory.Message, key: "The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files_6136", message: "The maximum dependency depth to search under node_modules and load JavaScript files" },
-        No_types_specified_in_package_json_but_allowJs_is_set_so_returning_main_value_of_0: { code: 6137, category: ts.DiagnosticCategory.Message, key: "No_types_specified_in_package_json_but_allowJs_is_set_so_returning_main_value_of_0_6137", message: "No types specified in 'package.json' but 'allowJs' is set, so returning 'main' value of '{0}'" },
+        No_types_specified_in_package_json_so_returning_main_value_of_0: { code: 6137, category: ts.DiagnosticCategory.Message, key: "No_types_specified_in_package_json_so_returning_main_value_of_0_6137", message: "No types specified in 'package.json', so returning 'main' value of '{0}'" },
         Property_0_is_declared_but_never_used: { code: 6138, category: ts.DiagnosticCategory.Error, key: "Property_0_is_declared_but_never_used_6138", message: "Property '{0}' is declared but never used." },
         Import_emit_helpers_from_tslib: { code: 6139, category: ts.DiagnosticCategory.Message, key: "Import_emit_helpers_from_tslib_6139", message: "Import emit helpers from 'tslib'." },
         Auto_discovery_for_typings_is_enabled_in_project_0_Running_extra_resolution_pass_for_module_1_using_cache_location_2: { code: 6140, category: ts.DiagnosticCategory.Error, key: "Auto_discovery_for_typings_is_enabled_in_project_0_Running_extra_resolution_pass_for_module_1_using__6140", message: "Auto discovery for typings is enabled in project '{0}'. Running extra resolution pass for module '{1}' using cache location '{2}'." },
         Parse_in_strict_mode_and_emit_use_strict_for_each_source_file: { code: 6141, category: ts.DiagnosticCategory.Message, key: "Parse_in_strict_mode_and_emit_use_strict_for_each_source_file_6141", message: "Parse in strict mode and emit \"use strict\" for each source file" },
+        Module_0_was_resolved_to_1_but_jsx_is_not_set: { code: 6142, category: ts.DiagnosticCategory.Error, key: "Module_0_was_resolved_to_1_but_jsx_is_not_set_6142", message: "Module '{0}' was resolved to '{1}', but '--jsx' is not set." },
+        Module_0_was_resolved_to_1_but_allowJs_is_not_set: { code: 6143, category: ts.DiagnosticCategory.Error, key: "Module_0_was_resolved_to_1_but_allowJs_is_not_set_6143", message: "Module '{0}' was resolved to '{1}', but '--allowJs' is not set." },
+        Module_0_was_resolved_as_locally_declared_ambient_module_in_file_1: { code: 6144, category: ts.DiagnosticCategory.Message, key: "Module_0_was_resolved_as_locally_declared_ambient_module_in_file_1_6144", message: "Module '{0}' was resolved as locally declared ambient module in file '{1}'." },
+        Module_0_was_resolved_as_ambient_module_declared_in_1_since_this_file_was_not_modified: { code: 6145, category: ts.DiagnosticCategory.Message, key: "Module_0_was_resolved_as_ambient_module_declared_in_1_since_this_file_was_not_modified_6145", message: "Module '{0}' was resolved as ambient module declared in '{1}' since this file was not modified." },
+        Specify_the_JSX_factory_function_to_use_when_targeting_react_JSX_emit_e_g_React_createElement_or_h: { code: 6146, category: ts.DiagnosticCategory.Message, key: "Specify_the_JSX_factory_function_to_use_when_targeting_react_JSX_emit_e_g_React_createElement_or_h_6146", message: "Specify the JSX factory function to use when targeting 'react' JSX emit, e.g. 'React.createElement' or 'h'." },
         Variable_0_implicitly_has_an_1_type: { code: 7005, category: ts.DiagnosticCategory.Error, key: "Variable_0_implicitly_has_an_1_type_7005", message: "Variable '{0}' implicitly has an '{1}' type." },
         Parameter_0_implicitly_has_an_1_type: { code: 7006, category: ts.DiagnosticCategory.Error, key: "Parameter_0_implicitly_has_an_1_type_7006", message: "Parameter '{0}' implicitly has an '{1}' type." },
         Member_0_implicitly_has_an_1_type: { code: 7008, category: ts.DiagnosticCategory.Error, key: "Member_0_implicitly_has_an_1_type_7008", message: "Member '{0}' implicitly has an '{1}' type." },
@@ -3836,7 +3115,8 @@ var ts;
         Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type: { code: 7011, category: ts.DiagnosticCategory.Error, key: "Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type_7011", message: "Function expression, which lacks return-type annotation, implicitly has an '{0}' return type." },
         Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7013, category: ts.DiagnosticCategory.Error, key: "Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type_7013", message: "Construct signature, which lacks return-type annotation, implicitly has an 'any' return type." },
         Element_implicitly_has_an_any_type_because_index_expression_is_not_of_type_number: { code: 7015, category: ts.DiagnosticCategory.Error, key: "Element_implicitly_has_an_any_type_because_index_expression_is_not_of_type_number_7015", message: "Element implicitly has an 'any' type because index expression is not of type 'number'." },
-        Index_signature_of_object_type_implicitly_has_an_any_type: { code: 7017, category: ts.DiagnosticCategory.Error, key: "Index_signature_of_object_type_implicitly_has_an_any_type_7017", message: "Index signature of object type implicitly has an 'any' type." },
+        Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type: { code: 7016, category: ts.DiagnosticCategory.Error, key: "Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type_7016", message: "Could not find a declaration file for module '{0}'. '{1}' implicitly has an 'any' type." },
+        Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature: { code: 7017, category: ts.DiagnosticCategory.Error, key: "Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_7017", message: "Element implicitly has an 'any' type because type '{0}' has no index signature." },
         Object_literal_s_property_0_implicitly_has_an_1_type: { code: 7018, category: ts.DiagnosticCategory.Error, key: "Object_literal_s_property_0_implicitly_has_an_1_type_7018", message: "Object literal's property '{0}' implicitly has an '{1}' type." },
         Rest_parameter_0_implicitly_has_an_any_type: { code: 7019, category: ts.DiagnosticCategory.Error, key: "Rest_parameter_0_implicitly_has_an_any_type_7019", message: "Rest parameter '{0}' implicitly has an 'any[]' type." },
         Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7020, category: ts.DiagnosticCategory.Error, key: "Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type_7020", message: "Call signature, which lacks return-type annotation, implicitly has an 'any' return type." },
@@ -3883,6 +3163,8 @@ var ts;
         Unknown_typing_option_0: { code: 17010, category: ts.DiagnosticCategory.Error, key: "Unknown_typing_option_0_17010", message: "Unknown typing option '{0}'." },
         Circularity_detected_while_resolving_configuration_Colon_0: { code: 18000, category: ts.DiagnosticCategory.Error, key: "Circularity_detected_while_resolving_configuration_Colon_0_18000", message: "Circularity detected while resolving configuration: {0}" },
         The_path_in_an_extends_options_must_be_relative_or_rooted: { code: 18001, category: ts.DiagnosticCategory.Error, key: "The_path_in_an_extends_options_must_be_relative_or_rooted_18001", message: "The path in an 'extends' options must be relative or rooted." },
+        The_files_list_in_config_file_0_is_empty: { code: 18002, category: ts.DiagnosticCategory.Error, key: "The_files_list_in_config_file_0_is_empty_18002", message: "The 'files' list in config file '{0}' is empty." },
+        No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2: { code: 18003, category: ts.DiagnosticCategory.Error, key: "No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2_18003", message: "No inputs were found in config file '{0}'. Specified 'include' paths were '{1}' and 'exclude' paths were '{2}'." },
         Add_missing_super_call: { code: 90001, category: ts.DiagnosticCategory.Message, key: "Add_missing_super_call_90001", message: "Add missing 'super()' call." },
         Make_super_call_the_first_statement_in_the_constructor: { code: 90002, category: ts.DiagnosticCategory.Message, key: "Make_super_call_the_first_statement_in_the_constructor_90002", message: "Make 'super()' call the first statement in the constructor." },
         Change_extends_to_implements: { code: 90003, category: ts.DiagnosticCategory.Message, key: "Change_extends_to_implements_90003", message: "Change 'extends' to 'implements'" },
@@ -3890,4175 +3172,11 @@ var ts;
         Implement_interface_on_reference: { code: 90005, category: ts.DiagnosticCategory.Message, key: "Implement_interface_on_reference_90005", message: "Implement interface on reference" },
         Implement_interface_on_class: { code: 90006, category: ts.DiagnosticCategory.Message, key: "Implement_interface_on_class_90006", message: "Implement interface on class" },
         Implement_inherited_abstract_class: { code: 90007, category: ts.DiagnosticCategory.Message, key: "Implement_inherited_abstract_class_90007", message: "Implement inherited abstract class" },
+        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: { code: 90009, category: ts.DiagnosticCategory.Error, key: "Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript__90009", message: "Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig" },
+        Type_0_is_not_assignable_to_type_1_Two_different_types_with_this_name_exist_but_they_are_unrelated: { code: 90010, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_assignable_to_type_1_Two_different_types_with_this_name_exist_but_they_are_unrelated_90010", message: "Type '{0}' is not assignable to type '{1}'. Two different types with this name exist, but they are unrelated." },
     };
 })(ts || (ts = {}));
 var ts;
-(function (ts) {
-    function trace(host) {
-        host.trace(ts.formatMessage.apply(undefined, arguments));
-    }
-    ts.trace = trace;
-    function isTraceEnabled(compilerOptions, host) {
-        return compilerOptions.traceResolution && host.trace !== undefined;
-    }
-    ts.isTraceEnabled = isTraceEnabled;
-    function createResolvedModule(resolvedFileName, isExternalLibraryImport, failedLookupLocations) {
-        return { resolvedModule: resolvedFileName ? { resolvedFileName: resolvedFileName, isExternalLibraryImport: isExternalLibraryImport } : undefined, failedLookupLocations: failedLookupLocations };
-    }
-    ts.createResolvedModule = createResolvedModule;
-    function moduleHasNonRelativeName(moduleName) {
-        return !(ts.isRootedDiskPath(moduleName) || ts.isExternalModuleNameRelative(moduleName));
-    }
-    function tryReadTypesSection(packageJsonPath, baseDirectory, state) {
-        var jsonContent = readJson(packageJsonPath, state.host);
-        function tryReadFromField(fieldName) {
-            if (ts.hasProperty(jsonContent, fieldName)) {
-                var typesFile = jsonContent[fieldName];
-                if (typeof typesFile === "string") {
-                    var typesFilePath_1 = ts.normalizePath(ts.combinePaths(baseDirectory, typesFile));
-                    if (state.traceEnabled) {
-                        trace(state.host, ts.Diagnostics.package_json_has_0_field_1_that_references_2, fieldName, typesFile, typesFilePath_1);
-                    }
-                    return typesFilePath_1;
-                }
-                else {
-                    if (state.traceEnabled) {
-                        trace(state.host, ts.Diagnostics.Expected_type_of_0_field_in_package_json_to_be_string_got_1, fieldName, typeof typesFile);
-                    }
-                }
-            }
-        }
-        var typesFilePath = tryReadFromField("typings") || tryReadFromField("types");
-        if (typesFilePath) {
-            return typesFilePath;
-        }
-        if (state.compilerOptions.allowJs && jsonContent.main && typeof jsonContent.main === "string") {
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.No_types_specified_in_package_json_but_allowJs_is_set_so_returning_main_value_of_0, jsonContent.main);
-            }
-            var mainFilePath = ts.normalizePath(ts.combinePaths(baseDirectory, jsonContent.main));
-            return mainFilePath;
-        }
-        return undefined;
-    }
-    function readJson(path, host) {
-        try {
-            var jsonText = host.readFile(path);
-            return jsonText ? JSON.parse(jsonText) : {};
-        }
-        catch (e) {
-            return {};
-        }
-    }
-    var typeReferenceExtensions = [".d.ts"];
-    function getEffectiveTypeRoots(options, host) {
-        if (options.typeRoots) {
-            return options.typeRoots;
-        }
-        var currentDirectory;
-        if (options.configFilePath) {
-            currentDirectory = ts.getDirectoryPath(options.configFilePath);
-        }
-        else if (host.getCurrentDirectory) {
-            currentDirectory = host.getCurrentDirectory();
-        }
-        return currentDirectory !== undefined && getDefaultTypeRoots(currentDirectory, host);
-    }
-    ts.getEffectiveTypeRoots = getEffectiveTypeRoots;
-    function getDefaultTypeRoots(currentDirectory, host) {
-        if (!host.directoryExists) {
-            return [ts.combinePaths(currentDirectory, nodeModulesAtTypes)];
-        }
-        var typeRoots;
-        while (true) {
-            var atTypes = ts.combinePaths(currentDirectory, nodeModulesAtTypes);
-            if (host.directoryExists(atTypes)) {
-                (typeRoots || (typeRoots = [])).push(atTypes);
-            }
-            var parent_1 = ts.getDirectoryPath(currentDirectory);
-            if (parent_1 === currentDirectory) {
-                break;
-            }
-            currentDirectory = parent_1;
-        }
-        return typeRoots;
-    }
-    var nodeModulesAtTypes = ts.combinePaths("node_modules", "@types");
-    function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFile, options, host) {
-        var traceEnabled = isTraceEnabled(options, host);
-        var moduleResolutionState = {
-            compilerOptions: options,
-            host: host,
-            skipTsx: true,
-            traceEnabled: traceEnabled
-        };
-        var typeRoots = getEffectiveTypeRoots(options, host);
-        if (traceEnabled) {
-            if (containingFile === undefined) {
-                if (typeRoots === undefined) {
-                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_not_set_root_directory_not_set, typeReferenceDirectiveName);
-                }
-                else {
-                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_not_set_root_directory_1, typeReferenceDirectiveName, typeRoots);
-                }
-            }
-            else {
-                if (typeRoots === undefined) {
-                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_1_root_directory_not_set, typeReferenceDirectiveName, containingFile);
-                }
-                else {
-                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_1_root_directory_2, typeReferenceDirectiveName, containingFile, typeRoots);
-                }
-            }
-        }
-        var failedLookupLocations = [];
-        if (typeRoots && typeRoots.length) {
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Resolving_with_primary_search_path_0, typeRoots.join(", "));
-            }
-            var primarySearchPaths = typeRoots;
-            for (var _i = 0, primarySearchPaths_1 = primarySearchPaths; _i < primarySearchPaths_1.length; _i++) {
-                var typeRoot = primarySearchPaths_1[_i];
-                var candidate = ts.combinePaths(typeRoot, typeReferenceDirectiveName);
-                var candidateDirectory = ts.getDirectoryPath(candidate);
-                var resolvedFile_1 = loadNodeModuleFromDirectory(typeReferenceExtensions, candidate, failedLookupLocations, !directoryProbablyExists(candidateDirectory, host), moduleResolutionState);
-                if (resolvedFile_1) {
-                    if (traceEnabled) {
-                        trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFile_1, true);
-                    }
-                    return {
-                        resolvedTypeReferenceDirective: { primary: true, resolvedFileName: resolvedFile_1 },
-                        failedLookupLocations: failedLookupLocations
-                    };
-                }
-            }
-        }
-        else {
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Root_directory_cannot_be_determined_skipping_primary_search_paths);
-            }
-        }
-        var resolvedFile;
-        var initialLocationForSecondaryLookup;
-        if (containingFile) {
-            initialLocationForSecondaryLookup = ts.getDirectoryPath(containingFile);
-        }
-        if (initialLocationForSecondaryLookup !== undefined) {
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Looking_up_in_node_modules_folder_initial_location_0, initialLocationForSecondaryLookup);
-            }
-            resolvedFile = loadModuleFromNodeModules(typeReferenceDirectiveName, initialLocationForSecondaryLookup, failedLookupLocations, moduleResolutionState, false);
-            if (traceEnabled) {
-                if (resolvedFile) {
-                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFile, false);
-                }
-                else {
-                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_not_resolved, typeReferenceDirectiveName);
-                }
-            }
-        }
-        else {
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_modules_folder);
-            }
-        }
-        return {
-            resolvedTypeReferenceDirective: resolvedFile
-                ? { primary: false, resolvedFileName: resolvedFile }
-                : undefined,
-            failedLookupLocations: failedLookupLocations
-        };
-    }
-    ts.resolveTypeReferenceDirective = resolveTypeReferenceDirective;
-    function getAutomaticTypeDirectiveNames(options, host) {
-        if (options.types) {
-            return options.types;
-        }
-        var result = [];
-        if (host.directoryExists && host.getDirectories) {
-            var typeRoots = getEffectiveTypeRoots(options, host);
-            if (typeRoots) {
-                for (var _i = 0, typeRoots_1 = typeRoots; _i < typeRoots_1.length; _i++) {
-                    var root = typeRoots_1[_i];
-                    if (host.directoryExists(root)) {
-                        for (var _a = 0, _b = host.getDirectories(root); _a < _b.length; _a++) {
-                            var typeDirectivePath = _b[_a];
-                            var normalized = ts.normalizePath(typeDirectivePath);
-                            var packageJsonPath = pathToPackageJson(ts.combinePaths(root, normalized));
-                            var isNotNeededPackage = host.fileExists(packageJsonPath) && readJson(packageJsonPath, host).typings === null;
-                            if (!isNotNeededPackage) {
-                                result.push(ts.getBaseFileName(normalized));
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return result;
-    }
-    ts.getAutomaticTypeDirectiveNames = getAutomaticTypeDirectiveNames;
-    function resolveModuleName(moduleName, containingFile, compilerOptions, host) {
-        var traceEnabled = isTraceEnabled(compilerOptions, host);
-        if (traceEnabled) {
-            trace(host, ts.Diagnostics.Resolving_module_0_from_1, moduleName, containingFile);
-        }
-        var moduleResolution = compilerOptions.moduleResolution;
-        if (moduleResolution === undefined) {
-            moduleResolution = ts.getEmitModuleKind(compilerOptions) === ts.ModuleKind.CommonJS ? ts.ModuleResolutionKind.NodeJs : ts.ModuleResolutionKind.Classic;
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Module_resolution_kind_is_not_specified_using_0, ts.ModuleResolutionKind[moduleResolution]);
-            }
-        }
-        else {
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Explicitly_specified_module_resolution_kind_Colon_0, ts.ModuleResolutionKind[moduleResolution]);
-            }
-        }
-        var result;
-        switch (moduleResolution) {
-            case ts.ModuleResolutionKind.NodeJs:
-                result = nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host);
-                break;
-            case ts.ModuleResolutionKind.Classic:
-                result = classicNameResolver(moduleName, containingFile, compilerOptions, host);
-                break;
-        }
-        if (traceEnabled) {
-            if (result.resolvedModule) {
-                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);
-            }
-        }
-        return result;
-    }
-    ts.resolveModuleName = resolveModuleName;
-    function tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, loader, failedLookupLocations, supportedExtensions, state) {
-        if (moduleHasNonRelativeName(moduleName)) {
-            return tryLoadModuleUsingBaseUrl(moduleName, loader, failedLookupLocations, supportedExtensions, state);
-        }
-        else {
-            return tryLoadModuleUsingRootDirs(moduleName, containingDirectory, loader, failedLookupLocations, supportedExtensions, state);
-        }
-    }
-    function tryLoadModuleUsingRootDirs(moduleName, containingDirectory, loader, failedLookupLocations, supportedExtensions, state) {
-        if (!state.compilerOptions.rootDirs) {
-            return undefined;
-        }
-        if (state.traceEnabled) {
-            trace(state.host, ts.Diagnostics.rootDirs_option_is_set_using_it_to_resolve_relative_module_name_0, moduleName);
-        }
-        var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
-        var matchedRootDir;
-        var matchedNormalizedPrefix;
-        for (var _i = 0, _a = state.compilerOptions.rootDirs; _i < _a.length; _i++) {
-            var rootDir = _a[_i];
-            var normalizedRoot = ts.normalizePath(rootDir);
-            if (!ts.endsWith(normalizedRoot, ts.directorySeparator)) {
-                normalizedRoot += ts.directorySeparator;
-            }
-            var isLongestMatchingPrefix = ts.startsWith(candidate, normalizedRoot) &&
-                (matchedNormalizedPrefix === undefined || matchedNormalizedPrefix.length < normalizedRoot.length);
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.Checking_if_0_is_the_longest_matching_prefix_for_1_2, normalizedRoot, candidate, isLongestMatchingPrefix);
-            }
-            if (isLongestMatchingPrefix) {
-                matchedNormalizedPrefix = normalizedRoot;
-                matchedRootDir = rootDir;
-            }
-        }
-        if (matchedNormalizedPrefix) {
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.Longest_matching_prefix_for_0_is_1, candidate, matchedNormalizedPrefix);
-            }
-            var suffix = candidate.substr(matchedNormalizedPrefix.length);
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.Loading_0_from_the_root_dir_1_candidate_location_2, suffix, matchedNormalizedPrefix, candidate);
-            }
-            var resolvedFileName = loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(containingDirectory, state.host), state);
-            if (resolvedFileName) {
-                return resolvedFileName;
-            }
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.Trying_other_entries_in_rootDirs);
-            }
-            for (var _b = 0, _c = state.compilerOptions.rootDirs; _b < _c.length; _b++) {
-                var rootDir = _c[_b];
-                if (rootDir === matchedRootDir) {
-                    continue;
-                }
-                var candidate_1 = ts.combinePaths(ts.normalizePath(rootDir), suffix);
-                if (state.traceEnabled) {
-                    trace(state.host, ts.Diagnostics.Loading_0_from_the_root_dir_1_candidate_location_2, suffix, rootDir, candidate_1);
-                }
-                var baseDirectory = ts.getDirectoryPath(candidate_1);
-                var resolvedFileName_1 = loader(candidate_1, supportedExtensions, failedLookupLocations, !directoryProbablyExists(baseDirectory, state.host), state);
-                if (resolvedFileName_1) {
-                    return resolvedFileName_1;
-                }
-            }
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.Module_resolution_using_rootDirs_has_failed);
-            }
-        }
-        return undefined;
-    }
-    function tryLoadModuleUsingBaseUrl(moduleName, loader, failedLookupLocations, supportedExtensions, state) {
-        if (!state.compilerOptions.baseUrl) {
-            return undefined;
-        }
-        if (state.traceEnabled) {
-            trace(state.host, ts.Diagnostics.baseUrl_option_is_set_to_0_using_this_value_to_resolve_non_relative_module_name_1, state.compilerOptions.baseUrl, moduleName);
-        }
-        var matchedPattern = undefined;
-        if (state.compilerOptions.paths) {
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.paths_option_is_specified_looking_for_a_pattern_to_match_module_name_0, moduleName);
-            }
-            matchedPattern = ts.matchPatternOrExact(ts.getOwnKeys(state.compilerOptions.paths), moduleName);
-        }
-        if (matchedPattern) {
-            var matchedStar = typeof matchedPattern === "string" ? undefined : ts.matchedText(matchedPattern, moduleName);
-            var matchedPatternText = typeof matchedPattern === "string" ? matchedPattern : ts.patternText(matchedPattern);
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.Module_name_0_matched_pattern_1, moduleName, matchedPatternText);
-            }
-            for (var _i = 0, _a = state.compilerOptions.paths[matchedPatternText]; _i < _a.length; _i++) {
-                var subst = _a[_i];
-                var path = matchedStar ? subst.replace("*", matchedStar) : subst;
-                var candidate = ts.normalizePath(ts.combinePaths(state.compilerOptions.baseUrl, path));
-                if (state.traceEnabled) {
-                    trace(state.host, ts.Diagnostics.Trying_substitution_0_candidate_module_location_Colon_1, subst, path);
-                }
-                var resolvedFileName = loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
-                if (resolvedFileName) {
-                    return resolvedFileName;
-                }
-            }
-            return undefined;
-        }
-        else {
-            var candidate = ts.normalizePath(ts.combinePaths(state.compilerOptions.baseUrl, moduleName));
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.Resolving_module_name_0_relative_to_base_url_1_2, moduleName, state.compilerOptions.baseUrl, candidate);
-            }
-            return loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
-        }
-    }
-    function nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host) {
-        var containingDirectory = ts.getDirectoryPath(containingFile);
-        var supportedExtensions = ts.getSupportedExtensions(compilerOptions);
-        var traceEnabled = isTraceEnabled(compilerOptions, host);
-        var failedLookupLocations = [];
-        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, skipTsx: false };
-        var resolvedFileName = tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, nodeLoadModuleByRelativeName, failedLookupLocations, supportedExtensions, state);
-        var isExternalLibraryImport = false;
-        if (!resolvedFileName) {
-            if (moduleHasNonRelativeName(moduleName)) {
-                if (traceEnabled) {
-                    trace(host, ts.Diagnostics.Loading_module_0_from_node_modules_folder, moduleName);
-                }
-                resolvedFileName = loadModuleFromNodeModules(moduleName, containingDirectory, failedLookupLocations, state, false);
-                isExternalLibraryImport = resolvedFileName !== undefined;
-            }
-            else {
-                var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
-                resolvedFileName = nodeLoadModuleByRelativeName(candidate, supportedExtensions, failedLookupLocations, false, state);
-            }
-        }
-        if (resolvedFileName && host.realpath) {
-            var originalFileName = resolvedFileName;
-            resolvedFileName = ts.normalizePath(host.realpath(resolvedFileName));
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Resolving_real_path_for_0_result_1, originalFileName, resolvedFileName);
-            }
-        }
-        return createResolvedModule(resolvedFileName, isExternalLibraryImport, failedLookupLocations);
-    }
-    ts.nodeModuleNameResolver = nodeModuleNameResolver;
-    function nodeLoadModuleByRelativeName(candidate, supportedExtensions, failedLookupLocations, onlyRecordFailures, state) {
-        if (state.traceEnabled) {
-            trace(state.host, ts.Diagnostics.Loading_module_as_file_Slash_folder_candidate_module_location_0, candidate);
-        }
-        var resolvedFileName = !ts.pathEndsWithDirectorySeparator(candidate) && loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, onlyRecordFailures, state);
-        return resolvedFileName || loadNodeModuleFromDirectory(supportedExtensions, candidate, failedLookupLocations, onlyRecordFailures, state);
-    }
-    function directoryProbablyExists(directoryName, host) {
-        return !host.directoryExists || host.directoryExists(directoryName);
-    }
-    ts.directoryProbablyExists = directoryProbablyExists;
-    function loadModuleFromFile(candidate, extensions, failedLookupLocation, onlyRecordFailures, state) {
-        var resolvedByAddingExtension = tryAddingExtensions(candidate, extensions, failedLookupLocation, onlyRecordFailures, state);
-        if (resolvedByAddingExtension) {
-            return resolvedByAddingExtension;
-        }
-        if (ts.hasJavaScriptFileExtension(candidate)) {
-            var extensionless = ts.removeFileExtension(candidate);
-            if (state.traceEnabled) {
-                var extension = candidate.substring(extensionless.length);
-                trace(state.host, ts.Diagnostics.File_name_0_has_a_1_extension_stripping_it, candidate, extension);
-            }
-            return tryAddingExtensions(extensionless, extensions, failedLookupLocation, onlyRecordFailures, state);
-        }
-    }
-    function tryAddingExtensions(candidate, extensions, failedLookupLocation, onlyRecordFailures, state) {
-        if (!onlyRecordFailures) {
-            var directory = ts.getDirectoryPath(candidate);
-            if (directory) {
-                onlyRecordFailures = !directoryProbablyExists(directory, state.host);
-            }
-        }
-        return ts.forEach(extensions, function (ext) {
-            return !(state.skipTsx && ts.isJsxOrTsxExtension(ext)) && tryFile(candidate + ext, failedLookupLocation, onlyRecordFailures, state);
-        });
-    }
-    function tryFile(fileName, failedLookupLocation, onlyRecordFailures, state) {
-        if (!onlyRecordFailures && state.host.fileExists(fileName)) {
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.File_0_exist_use_it_as_a_name_resolution_result, fileName);
-            }
-            return fileName;
-        }
-        else {
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.File_0_does_not_exist, fileName);
-            }
-            failedLookupLocation.push(fileName);
-            return undefined;
-        }
-    }
-    function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocation, onlyRecordFailures, state) {
-        var packageJsonPath = pathToPackageJson(candidate);
-        var directoryExists = !onlyRecordFailures && directoryProbablyExists(candidate, state.host);
-        if (directoryExists && state.host.fileExists(packageJsonPath)) {
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath);
-            }
-            var typesFile = tryReadTypesSection(packageJsonPath, candidate, state);
-            if (typesFile) {
-                var onlyRecordFailures_1 = !directoryProbablyExists(ts.getDirectoryPath(typesFile), state.host);
-                var result = tryFile(typesFile, failedLookupLocation, onlyRecordFailures_1, state) ||
-                    tryAddingExtensions(typesFile, extensions, failedLookupLocation, onlyRecordFailures_1, state);
-                if (result) {
-                    return result;
-                }
-            }
-            else {
-                if (state.traceEnabled) {
-                    trace(state.host, ts.Diagnostics.package_json_does_not_have_types_field);
-                }
-            }
-        }
-        else {
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.File_0_does_not_exist, packageJsonPath);
-            }
-            failedLookupLocation.push(packageJsonPath);
-        }
-        return loadModuleFromFile(ts.combinePaths(candidate, "index"), extensions, failedLookupLocation, !directoryExists, state);
-    }
-    function pathToPackageJson(directory) {
-        return ts.combinePaths(directory, "package.json");
-    }
-    function loadModuleFromNodeModulesFolder(moduleName, directory, failedLookupLocations, state) {
-        var nodeModulesFolder = ts.combinePaths(directory, "node_modules");
-        var nodeModulesFolderExists = directoryProbablyExists(nodeModulesFolder, state.host);
-        var candidate = ts.normalizePath(ts.combinePaths(nodeModulesFolder, moduleName));
-        var supportedExtensions = ts.getSupportedExtensions(state.compilerOptions);
-        var result = loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, !nodeModulesFolderExists, state);
-        if (result) {
-            return result;
-        }
-        result = loadNodeModuleFromDirectory(supportedExtensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state);
-        if (result) {
-            return result;
-        }
-    }
-    function loadModuleFromNodeModules(moduleName, directory, failedLookupLocations, state, checkOneLevel) {
-        return loadModuleFromNodeModulesWorker(moduleName, directory, failedLookupLocations, state, checkOneLevel, false);
-    }
-    ts.loadModuleFromNodeModules = loadModuleFromNodeModules;
-    function loadModuleFromNodeModulesAtTypes(moduleName, directory, failedLookupLocations, state) {
-        return loadModuleFromNodeModulesWorker(moduleName, directory, failedLookupLocations, state, false, true);
-    }
-    function loadModuleFromNodeModulesWorker(moduleName, directory, failedLookupLocations, state, checkOneLevel, typesOnly) {
-        directory = ts.normalizeSlashes(directory);
-        while (true) {
-            var baseName = ts.getBaseFileName(directory);
-            if (baseName !== "node_modules") {
-                var packageResult = void 0;
-                if (!typesOnly) {
-                    packageResult = loadModuleFromNodeModulesFolder(moduleName, directory, failedLookupLocations, state);
-                    if (packageResult && ts.hasTypeScriptFileExtension(packageResult)) {
-                        return packageResult;
-                    }
-                }
-                var typesResult = loadModuleFromNodeModulesFolder(ts.combinePaths("@types", moduleName), directory, failedLookupLocations, state);
-                if (typesResult || packageResult) {
-                    return typesResult || packageResult;
-                }
-            }
-            var parentPath = ts.getDirectoryPath(directory);
-            if (parentPath === directory || checkOneLevel) {
-                break;
-            }
-            directory = parentPath;
-        }
-        return undefined;
-    }
-    function classicNameResolver(moduleName, containingFile, compilerOptions, host) {
-        var traceEnabled = isTraceEnabled(compilerOptions, host);
-        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, skipTsx: !compilerOptions.jsx };
-        var failedLookupLocations = [];
-        var supportedExtensions = ts.getSupportedExtensions(compilerOptions);
-        var containingDirectory = ts.getDirectoryPath(containingFile);
-        var resolvedFileName = tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, loadModuleFromFile, failedLookupLocations, supportedExtensions, state);
-        if (resolvedFileName) {
-            return createResolvedModule(resolvedFileName, false, failedLookupLocations);
-        }
-        var referencedSourceFile;
-        if (moduleHasNonRelativeName(moduleName)) {
-            referencedSourceFile = referencedSourceFile = loadModuleFromAncestorDirectories(moduleName, containingDirectory, supportedExtensions, failedLookupLocations, state) ||
-                loadModuleFromNodeModulesAtTypes(moduleName, containingDirectory, failedLookupLocations, state);
-        }
-        else {
-            var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
-            referencedSourceFile = loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, false, state);
-        }
-        return referencedSourceFile
-            ? { resolvedModule: { resolvedFileName: referencedSourceFile }, failedLookupLocations: failedLookupLocations }
-            : { resolvedModule: undefined, failedLookupLocations: failedLookupLocations };
-    }
-    ts.classicNameResolver = classicNameResolver;
-    function loadModuleFromAncestorDirectories(moduleName, containingDirectory, supportedExtensions, failedLookupLocations, state) {
-        while (true) {
-            var searchName = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
-            var referencedSourceFile = loadModuleFromFile(searchName, supportedExtensions, failedLookupLocations, false, state);
-            if (referencedSourceFile) {
-                return referencedSourceFile;
-            }
-            var parentPath = ts.getDirectoryPath(containingDirectory);
-            if (parentPath === containingDirectory) {
-                return undefined;
-            }
-            containingDirectory = parentPath;
-        }
-    }
-})(ts || (ts = {}));
-var ts;
-(function (ts) {
-    ts.externalHelpersModuleNameText = "tslib";
-    function getDeclarationOfKind(symbol, kind) {
-        var declarations = symbol.declarations;
-        if (declarations) {
-            for (var _i = 0, declarations_1 = declarations; _i < declarations_1.length; _i++) {
-                var declaration = declarations_1[_i];
-                if (declaration.kind === kind) {
-                    return declaration;
-                }
-            }
-        }
-        return undefined;
-    }
-    ts.getDeclarationOfKind = getDeclarationOfKind;
-    var stringWriters = [];
-    function getSingleLineStringWriter() {
-        if (stringWriters.length === 0) {
-            var str_1 = "";
-            var writeText = function (text) { return str_1 += text; };
-            return {
-                string: function () { return str_1; },
-                writeKeyword: writeText,
-                writeOperator: writeText,
-                writePunctuation: writeText,
-                writeSpace: writeText,
-                writeStringLiteral: writeText,
-                writeParameter: writeText,
-                writeSymbol: writeText,
-                writeLine: function () { return str_1 += " "; },
-                increaseIndent: function () { },
-                decreaseIndent: function () { },
-                clear: function () { return str_1 = ""; },
-                trackSymbol: function () { },
-                reportInaccessibleThisError: function () { }
-            };
-        }
-        return stringWriters.pop();
-    }
-    ts.getSingleLineStringWriter = getSingleLineStringWriter;
-    function releaseStringWriter(writer) {
-        writer.clear();
-        stringWriters.push(writer);
-    }
-    ts.releaseStringWriter = releaseStringWriter;
-    function getFullWidth(node) {
-        return node.end - node.pos;
-    }
-    ts.getFullWidth = getFullWidth;
-    function arrayIsEqualTo(array1, array2, equaler) {
-        if (!array1 || !array2) {
-            return array1 === array2;
-        }
-        if (array1.length !== array2.length) {
-            return false;
-        }
-        for (var i = 0; i < array1.length; i++) {
-            var equals = equaler ? equaler(array1[i], array2[i]) : array1[i] === array2[i];
-            if (!equals) {
-                return false;
-            }
-        }
-        return true;
-    }
-    ts.arrayIsEqualTo = arrayIsEqualTo;
-    function hasResolvedModule(sourceFile, moduleNameText) {
-        return !!(sourceFile && sourceFile.resolvedModules && sourceFile.resolvedModules[moduleNameText]);
-    }
-    ts.hasResolvedModule = hasResolvedModule;
-    function getResolvedModule(sourceFile, moduleNameText) {
-        return hasResolvedModule(sourceFile, moduleNameText) ? sourceFile.resolvedModules[moduleNameText] : undefined;
-    }
-    ts.getResolvedModule = getResolvedModule;
-    function setResolvedModule(sourceFile, moduleNameText, resolvedModule) {
-        if (!sourceFile.resolvedModules) {
-            sourceFile.resolvedModules = ts.createMap();
-        }
-        sourceFile.resolvedModules[moduleNameText] = resolvedModule;
-    }
-    ts.setResolvedModule = setResolvedModule;
-    function setResolvedTypeReferenceDirective(sourceFile, typeReferenceDirectiveName, resolvedTypeReferenceDirective) {
-        if (!sourceFile.resolvedTypeReferenceDirectiveNames) {
-            sourceFile.resolvedTypeReferenceDirectiveNames = ts.createMap();
-        }
-        sourceFile.resolvedTypeReferenceDirectiveNames[typeReferenceDirectiveName] = resolvedTypeReferenceDirective;
-    }
-    ts.setResolvedTypeReferenceDirective = setResolvedTypeReferenceDirective;
-    function moduleResolutionIsEqualTo(oldResolution, newResolution) {
-        return oldResolution.resolvedFileName === newResolution.resolvedFileName && oldResolution.isExternalLibraryImport === newResolution.isExternalLibraryImport;
-    }
-    ts.moduleResolutionIsEqualTo = moduleResolutionIsEqualTo;
-    function typeDirectiveIsEqualTo(oldResolution, newResolution) {
-        return oldResolution.resolvedFileName === newResolution.resolvedFileName && oldResolution.primary === newResolution.primary;
-    }
-    ts.typeDirectiveIsEqualTo = typeDirectiveIsEqualTo;
-    function hasChangesInResolutions(names, newResolutions, oldResolutions, comparer) {
-        if (names.length !== newResolutions.length) {
-            return false;
-        }
-        for (var i = 0; i < names.length; i++) {
-            var newResolution = newResolutions[i];
-            var oldResolution = oldResolutions && oldResolutions[names[i]];
-            var changed = oldResolution
-                ? !newResolution || !comparer(oldResolution, newResolution)
-                : newResolution;
-            if (changed) {
-                return true;
-            }
-        }
-        return false;
-    }
-    ts.hasChangesInResolutions = hasChangesInResolutions;
-    function containsParseError(node) {
-        aggregateChildData(node);
-        return (node.flags & 2097152) !== 0;
-    }
-    ts.containsParseError = containsParseError;
-    function aggregateChildData(node) {
-        if (!(node.flags & 4194304)) {
-            var thisNodeOrAnySubNodesHasError = ((node.flags & 524288) !== 0) ||
-                ts.forEachChild(node, containsParseError);
-            if (thisNodeOrAnySubNodesHasError) {
-                node.flags |= 2097152;
-            }
-            node.flags |= 4194304;
-        }
-    }
-    function getSourceFileOfNode(node) {
-        while (node && node.kind !== 256) {
-            node = node.parent;
-        }
-        return node;
-    }
-    ts.getSourceFileOfNode = getSourceFileOfNode;
-    function isStatementWithLocals(node) {
-        switch (node.kind) {
-            case 200:
-            case 228:
-            case 207:
-            case 208:
-            case 209:
-                return true;
-        }
-        return false;
-    }
-    ts.isStatementWithLocals = isStatementWithLocals;
-    function getStartPositionOfLine(line, sourceFile) {
-        ts.Debug.assert(line >= 0);
-        return ts.getLineStarts(sourceFile)[line];
-    }
-    ts.getStartPositionOfLine = getStartPositionOfLine;
-    function nodePosToString(node) {
-        var file = getSourceFileOfNode(node);
-        var loc = ts.getLineAndCharacterOfPosition(file, node.pos);
-        return file.fileName + "(" + (loc.line + 1) + "," + (loc.character + 1) + ")";
-    }
-    ts.nodePosToString = nodePosToString;
-    function getStartPosOfNode(node) {
-        return node.pos;
-    }
-    ts.getStartPosOfNode = getStartPosOfNode;
-    function isDefined(value) {
-        return value !== undefined;
-    }
-    ts.isDefined = isDefined;
-    function getEndLinePosition(line, sourceFile) {
-        ts.Debug.assert(line >= 0);
-        var lineStarts = ts.getLineStarts(sourceFile);
-        var lineIndex = line;
-        var sourceText = sourceFile.text;
-        if (lineIndex + 1 === lineStarts.length) {
-            return sourceText.length - 1;
-        }
-        else {
-            var start = lineStarts[lineIndex];
-            var pos = lineStarts[lineIndex + 1] - 1;
-            ts.Debug.assert(ts.isLineBreak(sourceText.charCodeAt(pos)));
-            while (start <= pos && ts.isLineBreak(sourceText.charCodeAt(pos))) {
-                pos--;
-            }
-            return pos;
-        }
-    }
-    ts.getEndLinePosition = getEndLinePosition;
-    function nodeIsMissing(node) {
-        if (node === undefined) {
-            return true;
-        }
-        return node.pos === node.end && node.pos >= 0 && node.kind !== 1;
-    }
-    ts.nodeIsMissing = nodeIsMissing;
-    function nodeIsPresent(node) {
-        return !nodeIsMissing(node);
-    }
-    ts.nodeIsPresent = nodeIsPresent;
-    function getTokenPosOfNode(node, sourceFile, includeJsDocComment) {
-        if (nodeIsMissing(node)) {
-            return node.pos;
-        }
-        if (isJSDocNode(node)) {
-            return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos, false, true);
-        }
-        if (includeJsDocComment && node.jsDocComments && node.jsDocComments.length > 0) {
-            return getTokenPosOfNode(node.jsDocComments[0]);
-        }
-        if (node.kind === 286 && node._children.length > 0) {
-            return getTokenPosOfNode(node._children[0], sourceFile, includeJsDocComment);
-        }
-        return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos);
-    }
-    ts.getTokenPosOfNode = getTokenPosOfNode;
-    function isJSDocNode(node) {
-        return node.kind >= 257 && node.kind <= 282;
-    }
-    ts.isJSDocNode = isJSDocNode;
-    function isJSDocTag(node) {
-        return node.kind >= 273 && node.kind <= 285;
-    }
-    ts.isJSDocTag = isJSDocTag;
-    function getNonDecoratorTokenPosOfNode(node, sourceFile) {
-        if (nodeIsMissing(node) || !node.decorators) {
-            return getTokenPosOfNode(node, sourceFile);
-        }
-        return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.decorators.end);
-    }
-    ts.getNonDecoratorTokenPosOfNode = getNonDecoratorTokenPosOfNode;
-    function getSourceTextOfNodeFromSourceFile(sourceFile, node, includeTrivia) {
-        if (includeTrivia === void 0) { includeTrivia = false; }
-        if (nodeIsMissing(node)) {
-            return "";
-        }
-        var text = sourceFile.text;
-        return text.substring(includeTrivia ? node.pos : ts.skipTrivia(text, node.pos), node.end);
-    }
-    ts.getSourceTextOfNodeFromSourceFile = getSourceTextOfNodeFromSourceFile;
-    function getTextOfNodeFromSourceText(sourceText, node) {
-        if (nodeIsMissing(node)) {
-            return "";
-        }
-        return sourceText.substring(ts.skipTrivia(sourceText, node.pos), node.end);
-    }
-    ts.getTextOfNodeFromSourceText = getTextOfNodeFromSourceText;
-    function getTextOfNode(node, includeTrivia) {
-        if (includeTrivia === void 0) { includeTrivia = false; }
-        return getSourceTextOfNodeFromSourceFile(getSourceFileOfNode(node), node, includeTrivia);
-    }
-    ts.getTextOfNode = getTextOfNode;
-    function getLiteralText(node, sourceFile, languageVersion) {
-        if (languageVersion < 2 && (isTemplateLiteralKind(node.kind) || node.hasExtendedUnicodeEscape)) {
-            return getQuotedEscapedLiteralText('"', node.text, '"');
-        }
-        if (!nodeIsSynthesized(node) && node.parent) {
-            var text = getSourceTextOfNodeFromSourceFile(sourceFile, node);
-            if (languageVersion < 2 && isBinaryOrOctalIntegerLiteral(node, text)) {
-                return node.text;
-            }
-            return text;
-        }
-        switch (node.kind) {
-            case 9:
-                return getQuotedEscapedLiteralText('"', node.text, '"');
-            case 12:
-                return getQuotedEscapedLiteralText("`", node.text, "`");
-            case 13:
-                return getQuotedEscapedLiteralText("`", node.text, "${");
-            case 14:
-                return getQuotedEscapedLiteralText("}", node.text, "${");
-            case 15:
-                return getQuotedEscapedLiteralText("}", node.text, "`");
-            case 8:
-                return node.text;
-        }
-        ts.Debug.fail("Literal kind '" + node.kind + "' not accounted for.");
-    }
-    ts.getLiteralText = getLiteralText;
-    function isBinaryOrOctalIntegerLiteral(node, text) {
-        if (node.kind === 8 && text.length > 1) {
-            switch (text.charCodeAt(1)) {
-                case 98:
-                case 66:
-                case 111:
-                case 79:
-                    return true;
-            }
-        }
-        return false;
-    }
-    ts.isBinaryOrOctalIntegerLiteral = isBinaryOrOctalIntegerLiteral;
-    function getQuotedEscapedLiteralText(leftQuote, text, rightQuote) {
-        return leftQuote + escapeNonAsciiCharacters(escapeString(text)) + rightQuote;
-    }
-    function escapeIdentifier(identifier) {
-        return identifier.length >= 2 && identifier.charCodeAt(0) === 95 && identifier.charCodeAt(1) === 95 ? "_" + identifier : identifier;
-    }
-    ts.escapeIdentifier = escapeIdentifier;
-    function unescapeIdentifier(identifier) {
-        return identifier.length >= 3 && identifier.charCodeAt(0) === 95 && identifier.charCodeAt(1) === 95 && identifier.charCodeAt(2) === 95 ? identifier.substr(1) : identifier;
-    }
-    ts.unescapeIdentifier = unescapeIdentifier;
-    function makeIdentifierFromModuleName(moduleName) {
-        return ts.getBaseFileName(moduleName).replace(/^(\d)/, "_$1").replace(/\W/g, "_");
-    }
-    ts.makeIdentifierFromModuleName = makeIdentifierFromModuleName;
-    function isBlockOrCatchScoped(declaration) {
-        return (ts.getCombinedNodeFlags(declaration) & 3) !== 0 ||
-            isCatchClauseVariableDeclaration(declaration);
-    }
-    ts.isBlockOrCatchScoped = isBlockOrCatchScoped;
-    function isAmbientModule(node) {
-        return node && node.kind === 226 &&
-            (node.name.kind === 9 || isGlobalScopeAugmentation(node));
-    }
-    ts.isAmbientModule = isAmbientModule;
-    function isShorthandAmbientModuleSymbol(moduleSymbol) {
-        return isShorthandAmbientModule(moduleSymbol.valueDeclaration);
-    }
-    ts.isShorthandAmbientModuleSymbol = isShorthandAmbientModuleSymbol;
-    function isShorthandAmbientModule(node) {
-        return node.kind === 226 && (!node.body);
-    }
-    function isBlockScopedContainerTopLevel(node) {
-        return node.kind === 256 ||
-            node.kind === 226 ||
-            isFunctionLike(node);
-    }
-    ts.isBlockScopedContainerTopLevel = isBlockScopedContainerTopLevel;
-    function isGlobalScopeAugmentation(module) {
-        return !!(module.flags & 512);
-    }
-    ts.isGlobalScopeAugmentation = isGlobalScopeAugmentation;
-    function isExternalModuleAugmentation(node) {
-        if (!node || !isAmbientModule(node)) {
-            return false;
-        }
-        switch (node.parent.kind) {
-            case 256:
-                return ts.isExternalModule(node.parent);
-            case 227:
-                return isAmbientModule(node.parent.parent) && !ts.isExternalModule(node.parent.parent.parent);
-        }
-        return false;
-    }
-    ts.isExternalModuleAugmentation = isExternalModuleAugmentation;
-    function isBlockScope(node, parentNode) {
-        switch (node.kind) {
-            case 256:
-            case 228:
-            case 252:
-            case 226:
-            case 207:
-            case 208:
-            case 209:
-            case 149:
-            case 148:
-            case 150:
-            case 151:
-            case 221:
-            case 180:
-            case 181:
-                return true;
-            case 200:
-                return parentNode && !isFunctionLike(parentNode);
-        }
-        return false;
-    }
-    ts.isBlockScope = isBlockScope;
-    function getEnclosingBlockScopeContainer(node) {
-        var current = node.parent;
-        while (current) {
-            if (isBlockScope(current, current.parent)) {
-                return current;
-            }
-            current = current.parent;
-        }
-    }
-    ts.getEnclosingBlockScopeContainer = getEnclosingBlockScopeContainer;
-    function isCatchClauseVariableDeclaration(declaration) {
-        return declaration &&
-            declaration.kind === 219 &&
-            declaration.parent &&
-            declaration.parent.kind === 252;
-    }
-    ts.isCatchClauseVariableDeclaration = isCatchClauseVariableDeclaration;
-    function declarationNameToString(name) {
-        return getFullWidth(name) === 0 ? "(Missing)" : getTextOfNode(name);
-    }
-    ts.declarationNameToString = declarationNameToString;
-    function createDiagnosticForNode(node, message, arg0, arg1, arg2) {
-        var sourceFile = getSourceFileOfNode(node);
-        var span = getErrorSpanForNode(sourceFile, node);
-        return ts.createFileDiagnostic(sourceFile, span.start, span.length, message, arg0, arg1, arg2);
-    }
-    ts.createDiagnosticForNode = createDiagnosticForNode;
-    function createDiagnosticForNodeFromMessageChain(node, messageChain) {
-        var sourceFile = getSourceFileOfNode(node);
-        var span = getErrorSpanForNode(sourceFile, node);
-        return {
-            file: sourceFile,
-            start: span.start,
-            length: span.length,
-            code: messageChain.code,
-            category: messageChain.category,
-            messageText: messageChain.next ? messageChain : messageChain.messageText
-        };
-    }
-    ts.createDiagnosticForNodeFromMessageChain = createDiagnosticForNodeFromMessageChain;
-    function getSpanOfTokenAtPosition(sourceFile, pos) {
-        var scanner = ts.createScanner(sourceFile.languageVersion, true, sourceFile.languageVariant, sourceFile.text, undefined, pos);
-        scanner.scan();
-        var start = scanner.getTokenPos();
-        return ts.createTextSpanFromBounds(start, scanner.getTextPos());
-    }
-    ts.getSpanOfTokenAtPosition = getSpanOfTokenAtPosition;
-    function getErrorSpanForArrowFunction(sourceFile, node) {
-        var pos = ts.skipTrivia(sourceFile.text, node.pos);
-        if (node.body && node.body.kind === 200) {
-            var startLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.pos).line;
-            var endLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.end).line;
-            if (startLine < endLine) {
-                return ts.createTextSpan(pos, getEndLinePosition(startLine, sourceFile) - pos + 1);
-            }
-        }
-        return ts.createTextSpanFromBounds(pos, node.end);
-    }
-    function getErrorSpanForNode(sourceFile, node) {
-        var errorNode = node;
-        switch (node.kind) {
-            case 256:
-                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 219:
-            case 170:
-            case 222:
-            case 193:
-            case 223:
-            case 226:
-            case 225:
-            case 255:
-            case 221:
-            case 180:
-            case 148:
-            case 150:
-            case 151:
-            case 224:
-                errorNode = node.name;
-                break;
-            case 181:
-                return getErrorSpanForArrowFunction(sourceFile, node);
-        }
-        if (errorNode === undefined) {
-            return getSpanOfTokenAtPosition(sourceFile, node.pos);
-        }
-        var pos = nodeIsMissing(errorNode)
-            ? errorNode.pos
-            : ts.skipTrivia(sourceFile.text, errorNode.pos);
-        return ts.createTextSpanFromBounds(pos, errorNode.end);
-    }
-    ts.getErrorSpanForNode = getErrorSpanForNode;
-    function isExternalOrCommonJsModule(file) {
-        return (file.externalModuleIndicator || file.commonJsModuleIndicator) !== undefined;
-    }
-    ts.isExternalOrCommonJsModule = isExternalOrCommonJsModule;
-    function isDeclarationFile(file) {
-        return file.isDeclarationFile;
-    }
-    ts.isDeclarationFile = isDeclarationFile;
-    function isConstEnumDeclaration(node) {
-        return node.kind === 225 && isConst(node);
-    }
-    ts.isConstEnumDeclaration = isConstEnumDeclaration;
-    function isConst(node) {
-        return !!(ts.getCombinedNodeFlags(node) & 2)
-            || !!(ts.getCombinedModifierFlags(node) & 2048);
-    }
-    ts.isConst = isConst;
-    function isLet(node) {
-        return !!(ts.getCombinedNodeFlags(node) & 1);
-    }
-    ts.isLet = isLet;
-    function isSuperCall(n) {
-        return n.kind === 175 && n.expression.kind === 96;
-    }
-    ts.isSuperCall = isSuperCall;
-    function isPrologueDirective(node) {
-        return node.kind === 203 && node.expression.kind === 9;
-    }
-    ts.isPrologueDirective = isPrologueDirective;
-    function getLeadingCommentRangesOfNode(node, sourceFileOfNode) {
-        return ts.getLeadingCommentRanges(sourceFileOfNode.text, node.pos);
-    }
-    ts.getLeadingCommentRangesOfNode = getLeadingCommentRangesOfNode;
-    function getLeadingCommentRangesOfNodeFromText(node, text) {
-        return ts.getLeadingCommentRanges(text, node.pos);
-    }
-    ts.getLeadingCommentRangesOfNodeFromText = getLeadingCommentRangesOfNodeFromText;
-    function getJsDocComments(node, sourceFileOfNode) {
-        return getJsDocCommentsFromText(node, sourceFileOfNode.text);
-    }
-    ts.getJsDocComments = getJsDocComments;
-    function getJsDocCommentsFromText(node, text) {
-        var commentRanges = (node.kind === 143 ||
-            node.kind === 142 ||
-            node.kind === 180 ||
-            node.kind === 181) ?
-            ts.concatenate(ts.getTrailingCommentRanges(text, node.pos), ts.getLeadingCommentRanges(text, node.pos)) :
-            getLeadingCommentRangesOfNodeFromText(node, text);
-        return ts.filter(commentRanges, isJsDocComment);
-        function isJsDocComment(comment) {
-            return text.charCodeAt(comment.pos + 1) === 42 &&
-                text.charCodeAt(comment.pos + 2) === 42 &&
-                text.charCodeAt(comment.pos + 3) !== 47;
-        }
-    }
-    ts.getJsDocCommentsFromText = getJsDocCommentsFromText;
-    ts.fullTripleSlashReferencePathRegEx = /^(\/\/\/\s*<reference\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
-    ts.fullTripleSlashReferenceTypeReferenceDirectiveRegEx = /^(\/\/\/\s*<reference\s+types\s*=\s*)('|")(.+?)\2.*?\/>/;
-    ts.fullTripleSlashAMDReferencePathRegEx = /^(\/\/\/\s*<amd-dependency\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
-    function isPartOfTypeNode(node) {
-        if (155 <= node.kind && node.kind <= 167) {
-            return true;
-        }
-        switch (node.kind) {
-            case 118:
-            case 131:
-            case 133:
-            case 121:
-            case 134:
-            case 136:
-            case 128:
-                return true;
-            case 104:
-                return node.parent.kind !== 184;
-            case 195:
-                return !isExpressionWithTypeArgumentsInClassExtendsClause(node);
-            case 70:
-                if (node.parent.kind === 140 && node.parent.right === node) {
-                    node = node.parent;
-                }
-                else if (node.parent.kind === 173 && node.parent.name === node) {
-                    node = node.parent;
-                }
-                ts.Debug.assert(node.kind === 70 || node.kind === 140 || node.kind === 173, "'node' was expected to be a qualified name, identifier or property access in 'isPartOfTypeNode'.");
-            case 140:
-            case 173:
-            case 98:
-                var parent_2 = node.parent;
-                if (parent_2.kind === 159) {
-                    return false;
-                }
-                if (155 <= parent_2.kind && parent_2.kind <= 167) {
-                    return true;
-                }
-                switch (parent_2.kind) {
-                    case 195:
-                        return !isExpressionWithTypeArgumentsInClassExtendsClause(parent_2);
-                    case 142:
-                        return node === parent_2.constraint;
-                    case 146:
-                    case 145:
-                    case 143:
-                    case 219:
-                        return node === parent_2.type;
-                    case 221:
-                    case 180:
-                    case 181:
-                    case 149:
-                    case 148:
-                    case 147:
-                    case 150:
-                    case 151:
-                        return node === parent_2.type;
-                    case 152:
-                    case 153:
-                    case 154:
-                        return node === parent_2.type;
-                    case 178:
-                        return node === parent_2.type;
-                    case 175:
-                    case 176:
-                        return parent_2.typeArguments && ts.indexOf(parent_2.typeArguments, node) >= 0;
-                    case 177:
-                        return false;
-                }
-        }
-        return false;
-    }
-    ts.isPartOfTypeNode = isPartOfTypeNode;
-    function forEachReturnStatement(body, visitor) {
-        return traverse(body);
-        function traverse(node) {
-            switch (node.kind) {
-                case 212:
-                    return visitor(node);
-                case 228:
-                case 200:
-                case 204:
-                case 205:
-                case 206:
-                case 207:
-                case 208:
-                case 209:
-                case 213:
-                case 214:
-                case 249:
-                case 250:
-                case 215:
-                case 217:
-                case 252:
-                    return ts.forEachChild(node, traverse);
-            }
-        }
-    }
-    ts.forEachReturnStatement = forEachReturnStatement;
-    function forEachYieldExpression(body, visitor) {
-        return traverse(body);
-        function traverse(node) {
-            switch (node.kind) {
-                case 191:
-                    visitor(node);
-                    var operand = node.expression;
-                    if (operand) {
-                        traverse(operand);
-                    }
-                case 225:
-                case 223:
-                case 226:
-                case 224:
-                case 222:
-                case 193:
-                    return;
-                default:
-                    if (isFunctionLike(node)) {
-                        var name_4 = node.name;
-                        if (name_4 && name_4.kind === 141) {
-                            traverse(name_4.expression);
-                            return;
-                        }
-                    }
-                    else if (!isPartOfTypeNode(node)) {
-                        ts.forEachChild(node, traverse);
-                    }
-            }
-        }
-    }
-    ts.forEachYieldExpression = forEachYieldExpression;
-    function isVariableLike(node) {
-        if (node) {
-            switch (node.kind) {
-                case 170:
-                case 255:
-                case 143:
-                case 253:
-                case 146:
-                case 145:
-                case 254:
-                case 219:
-                    return true;
-            }
-        }
-        return false;
-    }
-    ts.isVariableLike = isVariableLike;
-    function isAccessor(node) {
-        return node && (node.kind === 150 || node.kind === 151);
-    }
-    ts.isAccessor = isAccessor;
-    function isClassLike(node) {
-        return node && (node.kind === 222 || node.kind === 193);
-    }
-    ts.isClassLike = isClassLike;
-    function isFunctionLike(node) {
-        return node && isFunctionLikeKind(node.kind);
-    }
-    ts.isFunctionLike = isFunctionLike;
-    function isFunctionLikeKind(kind) {
-        switch (kind) {
-            case 149:
-            case 180:
-            case 221:
-            case 181:
-            case 148:
-            case 147:
-            case 150:
-            case 151:
-            case 152:
-            case 153:
-            case 154:
-            case 157:
-            case 158:
-                return true;
-        }
-        return false;
-    }
-    ts.isFunctionLikeKind = isFunctionLikeKind;
-    function introducesArgumentsExoticObject(node) {
-        switch (node.kind) {
-            case 148:
-            case 147:
-            case 149:
-            case 150:
-            case 151:
-            case 221:
-            case 180:
-                return true;
-        }
-        return false;
-    }
-    ts.introducesArgumentsExoticObject = introducesArgumentsExoticObject;
-    function isIterationStatement(node, lookInLabeledStatements) {
-        switch (node.kind) {
-            case 207:
-            case 208:
-            case 209:
-            case 205:
-            case 206:
-                return true;
-            case 215:
-                return lookInLabeledStatements && isIterationStatement(node.statement, lookInLabeledStatements);
-        }
-        return false;
-    }
-    ts.isIterationStatement = isIterationStatement;
-    function isFunctionBlock(node) {
-        return node && node.kind === 200 && isFunctionLike(node.parent);
-    }
-    ts.isFunctionBlock = isFunctionBlock;
-    function isObjectLiteralMethod(node) {
-        return node && node.kind === 148 && node.parent.kind === 172;
-    }
-    ts.isObjectLiteralMethod = isObjectLiteralMethod;
-    function isObjectLiteralOrClassExpressionMethod(node) {
-        return node.kind === 148 &&
-            (node.parent.kind === 172 ||
-                node.parent.kind === 193);
-    }
-    ts.isObjectLiteralOrClassExpressionMethod = isObjectLiteralOrClassExpressionMethod;
-    function isIdentifierTypePredicate(predicate) {
-        return predicate && predicate.kind === 1;
-    }
-    ts.isIdentifierTypePredicate = isIdentifierTypePredicate;
-    function isThisTypePredicate(predicate) {
-        return predicate && predicate.kind === 0;
-    }
-    ts.isThisTypePredicate = isThisTypePredicate;
-    function getContainingFunction(node) {
-        while (true) {
-            node = node.parent;
-            if (!node || isFunctionLike(node)) {
-                return node;
-            }
-        }
-    }
-    ts.getContainingFunction = getContainingFunction;
-    function getContainingClass(node) {
-        while (true) {
-            node = node.parent;
-            if (!node || isClassLike(node)) {
-                return node;
-            }
-        }
-    }
-    ts.getContainingClass = getContainingClass;
-    function getThisContainer(node, includeArrowFunctions) {
-        while (true) {
-            node = node.parent;
-            if (!node) {
-                return undefined;
-            }
-            switch (node.kind) {
-                case 141:
-                    if (isClassLike(node.parent.parent)) {
-                        return node;
-                    }
-                    node = node.parent;
-                    break;
-                case 144:
-                    if (node.parent.kind === 143 && isClassElement(node.parent.parent)) {
-                        node = node.parent.parent;
-                    }
-                    else if (isClassElement(node.parent)) {
-                        node = node.parent;
-                    }
-                    break;
-                case 181:
-                    if (!includeArrowFunctions) {
-                        continue;
-                    }
-                case 221:
-                case 180:
-                case 226:
-                case 146:
-                case 145:
-                case 148:
-                case 147:
-                case 149:
-                case 150:
-                case 151:
-                case 152:
-                case 153:
-                case 154:
-                case 225:
-                case 256:
-                    return node;
-            }
-        }
-    }
-    ts.getThisContainer = getThisContainer;
-    function getSuperContainer(node, stopOnFunctions) {
-        while (true) {
-            node = node.parent;
-            if (!node) {
-                return node;
-            }
-            switch (node.kind) {
-                case 141:
-                    node = node.parent;
-                    break;
-                case 221:
-                case 180:
-                case 181:
-                    if (!stopOnFunctions) {
-                        continue;
-                    }
-                case 146:
-                case 145:
-                case 148:
-                case 147:
-                case 149:
-                case 150:
-                case 151:
-                    return node;
-                case 144:
-                    if (node.parent.kind === 143 && isClassElement(node.parent.parent)) {
-                        node = node.parent.parent;
-                    }
-                    else if (isClassElement(node.parent)) {
-                        node = node.parent;
-                    }
-                    break;
-            }
-        }
-    }
-    ts.getSuperContainer = getSuperContainer;
-    function getImmediatelyInvokedFunctionExpression(func) {
-        if (func.kind === 180 || func.kind === 181) {
-            var prev = func;
-            var parent_3 = func.parent;
-            while (parent_3.kind === 179) {
-                prev = parent_3;
-                parent_3 = parent_3.parent;
-            }
-            if (parent_3.kind === 175 && parent_3.expression === prev) {
-                return parent_3;
-            }
-        }
-    }
-    ts.getImmediatelyInvokedFunctionExpression = getImmediatelyInvokedFunctionExpression;
-    function isSuperProperty(node) {
-        var kind = node.kind;
-        return (kind === 173 || kind === 174)
-            && node.expression.kind === 96;
-    }
-    ts.isSuperProperty = isSuperProperty;
-    function getEntityNameFromTypeNode(node) {
-        if (node) {
-            switch (node.kind) {
-                case 156:
-                    return node.typeName;
-                case 195:
-                    ts.Debug.assert(isEntityNameExpression(node.expression));
-                    return node.expression;
-                case 70:
-                case 140:
-                    return node;
-            }
-        }
-        return undefined;
-    }
-    ts.getEntityNameFromTypeNode = getEntityNameFromTypeNode;
-    function isCallLikeExpression(node) {
-        switch (node.kind) {
-            case 175:
-            case 176:
-            case 177:
-            case 144:
-                return true;
-            default:
-                return false;
-        }
-    }
-    ts.isCallLikeExpression = isCallLikeExpression;
-    function getInvokedExpression(node) {
-        if (node.kind === 177) {
-            return node.tag;
-        }
-        return node.expression;
-    }
-    ts.getInvokedExpression = getInvokedExpression;
-    function nodeCanBeDecorated(node) {
-        switch (node.kind) {
-            case 222:
-                return true;
-            case 146:
-                return node.parent.kind === 222;
-            case 150:
-            case 151:
-            case 148:
-                return node.body !== undefined
-                    && node.parent.kind === 222;
-            case 143:
-                return node.parent.body !== undefined
-                    && (node.parent.kind === 149
-                        || node.parent.kind === 148
-                        || node.parent.kind === 151)
-                    && node.parent.parent.kind === 222;
-        }
-        return false;
-    }
-    ts.nodeCanBeDecorated = nodeCanBeDecorated;
-    function nodeIsDecorated(node) {
-        return node.decorators !== undefined
-            && nodeCanBeDecorated(node);
-    }
-    ts.nodeIsDecorated = nodeIsDecorated;
-    function nodeOrChildIsDecorated(node) {
-        return nodeIsDecorated(node) || childIsDecorated(node);
-    }
-    ts.nodeOrChildIsDecorated = nodeOrChildIsDecorated;
-    function childIsDecorated(node) {
-        switch (node.kind) {
-            case 222:
-                return ts.forEach(node.members, nodeOrChildIsDecorated);
-            case 148:
-            case 151:
-                return ts.forEach(node.parameters, nodeIsDecorated);
-        }
-    }
-    ts.childIsDecorated = childIsDecorated;
-    function isJSXTagName(node) {
-        var parent = node.parent;
-        if (parent.kind === 244 ||
-            parent.kind === 243 ||
-            parent.kind === 245) {
-            return parent.tagName === node;
-        }
-        return false;
-    }
-    ts.isJSXTagName = isJSXTagName;
-    function isPartOfExpression(node) {
-        switch (node.kind) {
-            case 98:
-            case 96:
-            case 94:
-            case 100:
-            case 85:
-            case 11:
-            case 171:
-            case 172:
-            case 173:
-            case 174:
-            case 175:
-            case 176:
-            case 177:
-            case 196:
-            case 178:
-            case 197:
-            case 179:
-            case 180:
-            case 193:
-            case 181:
-            case 184:
-            case 182:
-            case 183:
-            case 186:
-            case 187:
-            case 188:
-            case 189:
-            case 192:
-            case 190:
-            case 12:
-            case 194:
-            case 242:
-            case 243:
-            case 191:
-            case 185:
-                return true;
-            case 140:
-                while (node.parent.kind === 140) {
-                    node = node.parent;
-                }
-                return node.parent.kind === 159 || isJSXTagName(node);
-            case 70:
-                if (node.parent.kind === 159 || isJSXTagName(node)) {
-                    return true;
-                }
-            case 8:
-            case 9:
-            case 98:
-                var parent_4 = node.parent;
-                switch (parent_4.kind) {
-                    case 219:
-                    case 143:
-                    case 146:
-                    case 145:
-                    case 255:
-                    case 253:
-                    case 170:
-                        return parent_4.initializer === node;
-                    case 203:
-                    case 204:
-                    case 205:
-                    case 206:
-                    case 212:
-                    case 213:
-                    case 214:
-                    case 249:
-                    case 216:
-                    case 214:
-                        return parent_4.expression === node;
-                    case 207:
-                        var forStatement = parent_4;
-                        return (forStatement.initializer === node && forStatement.initializer.kind !== 220) ||
-                            forStatement.condition === node ||
-                            forStatement.incrementor === node;
-                    case 208:
-                    case 209:
-                        var forInStatement = parent_4;
-                        return (forInStatement.initializer === node && forInStatement.initializer.kind !== 220) ||
-                            forInStatement.expression === node;
-                    case 178:
-                    case 196:
-                        return node === parent_4.expression;
-                    case 198:
-                        return node === parent_4.expression;
-                    case 141:
-                        return node === parent_4.expression;
-                    case 144:
-                    case 248:
-                    case 247:
-                        return true;
-                    case 195:
-                        return parent_4.expression === node && isExpressionWithTypeArgumentsInClassExtendsClause(parent_4);
-                    default:
-                        if (isPartOfExpression(parent_4)) {
-                            return true;
-                        }
-                }
-        }
-        return false;
-    }
-    ts.isPartOfExpression = isPartOfExpression;
-    function isInstantiatedModule(node, preserveConstEnums) {
-        var moduleState = ts.getModuleInstanceState(node);
-        return moduleState === 1 ||
-            (preserveConstEnums && moduleState === 2);
-    }
-    ts.isInstantiatedModule = isInstantiatedModule;
-    function isExternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 230 && node.moduleReference.kind === 241;
-    }
-    ts.isExternalModuleImportEqualsDeclaration = isExternalModuleImportEqualsDeclaration;
-    function getExternalModuleImportEqualsDeclarationExpression(node) {
-        ts.Debug.assert(isExternalModuleImportEqualsDeclaration(node));
-        return node.moduleReference.expression;
-    }
-    ts.getExternalModuleImportEqualsDeclarationExpression = getExternalModuleImportEqualsDeclarationExpression;
-    function isInternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 230 && node.moduleReference.kind !== 241;
-    }
-    ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration;
-    function isSourceFileJavaScript(file) {
-        return isInJavaScriptFile(file);
-    }
-    ts.isSourceFileJavaScript = isSourceFileJavaScript;
-    function isInJavaScriptFile(node) {
-        return node && !!(node.flags & 1048576);
-    }
-    ts.isInJavaScriptFile = isInJavaScriptFile;
-    function isRequireCall(expression, checkArgumentIsStringLiteral) {
-        var isRequire = expression.kind === 175 &&
-            expression.expression.kind === 70 &&
-            expression.expression.text === "require" &&
-            expression.arguments.length === 1;
-        return isRequire && (!checkArgumentIsStringLiteral || expression.arguments[0].kind === 9);
-    }
-    ts.isRequireCall = isRequireCall;
-    function isSingleOrDoubleQuote(charCode) {
-        return charCode === 39 || charCode === 34;
-    }
-    ts.isSingleOrDoubleQuote = isSingleOrDoubleQuote;
-    function isDeclarationOfFunctionExpression(s) {
-        if (s.valueDeclaration && s.valueDeclaration.kind === 219) {
-            var declaration = s.valueDeclaration;
-            return declaration.initializer && declaration.initializer.kind === 180;
-        }
-        return false;
-    }
-    ts.isDeclarationOfFunctionExpression = isDeclarationOfFunctionExpression;
-    function getSpecialPropertyAssignmentKind(expression) {
-        if (!isInJavaScriptFile(expression)) {
-            return 0;
-        }
-        if (expression.kind !== 188) {
-            return 0;
-        }
-        var expr = expression;
-        if (expr.operatorToken.kind !== 57 || expr.left.kind !== 173) {
-            return 0;
-        }
-        var lhs = expr.left;
-        if (lhs.expression.kind === 70) {
-            var lhsId = lhs.expression;
-            if (lhsId.text === "exports") {
-                return 1;
-            }
-            else if (lhsId.text === "module" && lhs.name.text === "exports") {
-                return 2;
-            }
-        }
-        else if (lhs.expression.kind === 98) {
-            return 4;
-        }
-        else if (lhs.expression.kind === 173) {
-            var innerPropertyAccess = lhs.expression;
-            if (innerPropertyAccess.expression.kind === 70) {
-                var innerPropertyAccessIdentifier = innerPropertyAccess.expression;
-                if (innerPropertyAccessIdentifier.text === "module" && innerPropertyAccess.name.text === "exports") {
-                    return 1;
-                }
-                if (innerPropertyAccess.name.text === "prototype") {
-                    return 3;
-                }
-            }
-        }
-        return 0;
-    }
-    ts.getSpecialPropertyAssignmentKind = getSpecialPropertyAssignmentKind;
-    function getExternalModuleName(node) {
-        if (node.kind === 231) {
-            return node.moduleSpecifier;
-        }
-        if (node.kind === 230) {
-            var reference = node.moduleReference;
-            if (reference.kind === 241) {
-                return reference.expression;
-            }
-        }
-        if (node.kind === 237) {
-            return node.moduleSpecifier;
-        }
-        if (node.kind === 226 && node.name.kind === 9) {
-            return node.name;
-        }
-    }
-    ts.getExternalModuleName = getExternalModuleName;
-    function getNamespaceDeclarationNode(node) {
-        if (node.kind === 230) {
-            return node;
-        }
-        var importClause = node.importClause;
-        if (importClause && importClause.namedBindings && importClause.namedBindings.kind === 233) {
-            return importClause.namedBindings;
-        }
-    }
-    ts.getNamespaceDeclarationNode = getNamespaceDeclarationNode;
-    function isDefaultImport(node) {
-        return node.kind === 231
-            && node.importClause
-            && !!node.importClause.name;
-    }
-    ts.isDefaultImport = isDefaultImport;
-    function hasQuestionToken(node) {
-        if (node) {
-            switch (node.kind) {
-                case 143:
-                case 148:
-                case 147:
-                case 254:
-                case 253:
-                case 146:
-                case 145:
-                    return node.questionToken !== undefined;
-            }
-        }
-        return false;
-    }
-    ts.hasQuestionToken = hasQuestionToken;
-    function isJSDocConstructSignature(node) {
-        return node.kind === 269 &&
-            node.parameters.length > 0 &&
-            node.parameters[0].type.kind === 271;
-    }
-    ts.isJSDocConstructSignature = isJSDocConstructSignature;
-    function getJSDocTag(node, kind, checkParentVariableStatement) {
-        if (!node) {
-            return undefined;
-        }
-        var jsDocTags = getJSDocTags(node, checkParentVariableStatement);
-        if (!jsDocTags) {
-            return undefined;
-        }
-        for (var _i = 0, jsDocTags_1 = jsDocTags; _i < jsDocTags_1.length; _i++) {
-            var tag = jsDocTags_1[_i];
-            if (tag.kind === kind) {
-                return tag;
-            }
-        }
-    }
-    function append(previous, additional) {
-        if (additional) {
-            if (!previous) {
-                previous = [];
-            }
-            for (var _i = 0, additional_1 = additional; _i < additional_1.length; _i++) {
-                var x = additional_1[_i];
-                previous.push(x);
-            }
-        }
-        return previous;
-    }
-    function getJSDocComments(node, checkParentVariableStatement) {
-        return getJSDocs(node, checkParentVariableStatement, function (docs) { return ts.map(docs, function (doc) { return doc.comment; }); }, function (tags) { return ts.map(tags, function (tag) { return tag.comment; }); });
-    }
-    ts.getJSDocComments = getJSDocComments;
-    function getJSDocTags(node, checkParentVariableStatement) {
-        return getJSDocs(node, checkParentVariableStatement, function (docs) {
-            var result = [];
-            for (var _i = 0, docs_1 = docs; _i < docs_1.length; _i++) {
-                var doc = docs_1[_i];
-                if (doc.tags) {
-                    result.push.apply(result, doc.tags);
-                }
-            }
-            return result;
-        }, function (tags) { return tags; });
-    }
-    function getJSDocs(node, checkParentVariableStatement, getDocs, getTags) {
-        var result = undefined;
-        if (checkParentVariableStatement) {
-            var isInitializerOfVariableDeclarationInStatement = isVariableLike(node.parent) &&
-                (node.parent).initializer === node &&
-                node.parent.parent.parent.kind === 201;
-            var isVariableOfVariableDeclarationStatement = isVariableLike(node) &&
-                node.parent.parent.kind === 201;
-            var variableStatementNode = isInitializerOfVariableDeclarationInStatement ? node.parent.parent.parent :
-                isVariableOfVariableDeclarationStatement ? node.parent.parent :
-                    undefined;
-            if (variableStatementNode) {
-                result = append(result, getJSDocs(variableStatementNode, checkParentVariableStatement, getDocs, getTags));
-            }
-            if (node.kind === 226 &&
-                node.parent && node.parent.kind === 226) {
-                result = append(result, getJSDocs(node.parent, checkParentVariableStatement, getDocs, getTags));
-            }
-            var parent_5 = node.parent;
-            var isSourceOfAssignmentExpressionStatement = parent_5 && parent_5.parent &&
-                parent_5.kind === 188 &&
-                parent_5.operatorToken.kind === 57 &&
-                parent_5.parent.kind === 203;
-            if (isSourceOfAssignmentExpressionStatement) {
-                result = append(result, getJSDocs(parent_5.parent, checkParentVariableStatement, getDocs, getTags));
-            }
-            var isPropertyAssignmentExpression = parent_5 && parent_5.kind === 253;
-            if (isPropertyAssignmentExpression) {
-                result = append(result, getJSDocs(parent_5, checkParentVariableStatement, getDocs, getTags));
-            }
-            if (node.kind === 143) {
-                var paramTags = getJSDocParameterTag(node, checkParentVariableStatement);
-                if (paramTags) {
-                    result = append(result, getTags(paramTags));
-                }
-            }
-        }
-        if (isVariableLike(node) && node.initializer) {
-            result = append(result, getJSDocs(node.initializer, false, getDocs, getTags));
-        }
-        if (node.jsDocComments) {
-            if (result) {
-                result = append(result, getDocs(node.jsDocComments));
-            }
-            else {
-                return getDocs(node.jsDocComments);
-            }
-        }
-        return result;
-    }
-    function getJSDocParameterTag(param, checkParentVariableStatement) {
-        var func = param.parent;
-        var tags = getJSDocTags(func, checkParentVariableStatement);
-        if (!param.name) {
-            var i = func.parameters.indexOf(param);
-            var paramTags = ts.filter(tags, function (tag) { return tag.kind === 275; });
-            if (paramTags && 0 <= i && i < paramTags.length) {
-                return [paramTags[i]];
-            }
-        }
-        else if (param.name.kind === 70) {
-            var name_5 = param.name.text;
-            var paramTags = ts.filter(tags, function (tag) { return tag.kind === 275 && tag.parameterName.text === name_5; });
-            if (paramTags) {
-                return paramTags;
-            }
-        }
-        else {
-            return undefined;
-        }
-    }
-    function getJSDocTypeTag(node) {
-        return getJSDocTag(node, 277, false);
-    }
-    ts.getJSDocTypeTag = getJSDocTypeTag;
-    function getJSDocReturnTag(node) {
-        return getJSDocTag(node, 276, true);
-    }
-    ts.getJSDocReturnTag = getJSDocReturnTag;
-    function getJSDocTemplateTag(node) {
-        return getJSDocTag(node, 278, false);
-    }
-    ts.getJSDocTemplateTag = getJSDocTemplateTag;
-    function getCorrespondingJSDocParameterTag(parameter) {
-        if (parameter.name && parameter.name.kind === 70) {
-            var parameterName = parameter.name.text;
-            var jsDocTags = getJSDocTags(parameter.parent, true);
-            if (!jsDocTags) {
-                return undefined;
-            }
-            for (var _i = 0, jsDocTags_2 = jsDocTags; _i < jsDocTags_2.length; _i++) {
-                var tag = jsDocTags_2[_i];
-                if (tag.kind === 275) {
-                    var parameterTag = tag;
-                    if (parameterTag.parameterName.text === parameterName) {
-                        return parameterTag;
-                    }
-                }
-            }
-        }
-        return undefined;
-    }
-    ts.getCorrespondingJSDocParameterTag = getCorrespondingJSDocParameterTag;
-    function hasRestParameter(s) {
-        return isRestParameter(ts.lastOrUndefined(s.parameters));
-    }
-    ts.hasRestParameter = hasRestParameter;
-    function hasDeclaredRestParameter(s) {
-        return isDeclaredRestParam(ts.lastOrUndefined(s.parameters));
-    }
-    ts.hasDeclaredRestParameter = hasDeclaredRestParameter;
-    function isRestParameter(node) {
-        if (node && (node.flags & 1048576)) {
-            if (node.type && node.type.kind === 270) {
-                return true;
-            }
-            var paramTag = getCorrespondingJSDocParameterTag(node);
-            if (paramTag && paramTag.typeExpression) {
-                return paramTag.typeExpression.type.kind === 270;
-            }
-        }
-        return isDeclaredRestParam(node);
-    }
-    ts.isRestParameter = isRestParameter;
-    function isDeclaredRestParam(node) {
-        return node && node.dotDotDotToken !== undefined;
-    }
-    ts.isDeclaredRestParam = isDeclaredRestParam;
-    function isAssignmentTarget(node) {
-        while (node.parent.kind === 179) {
-            node = node.parent;
-        }
-        while (true) {
-            var parent_6 = node.parent;
-            if (parent_6.kind === 171 || parent_6.kind === 192) {
-                node = parent_6;
-                continue;
-            }
-            if (parent_6.kind === 253 || parent_6.kind === 254) {
-                node = parent_6.parent;
-                continue;
-            }
-            return parent_6.kind === 188 &&
-                isAssignmentOperator(parent_6.operatorToken.kind) &&
-                parent_6.left === node ||
-                (parent_6.kind === 208 || parent_6.kind === 209) &&
-                    parent_6.initializer === node;
-        }
-    }
-    ts.isAssignmentTarget = isAssignmentTarget;
-    function isNodeDescendantOf(node, ancestor) {
-        while (node) {
-            if (node === ancestor)
-                return true;
-            node = node.parent;
-        }
-        return false;
-    }
-    ts.isNodeDescendantOf = isNodeDescendantOf;
-    function isInAmbientContext(node) {
-        while (node) {
-            if (hasModifier(node, 2) || (node.kind === 256 && node.isDeclarationFile)) {
-                return true;
-            }
-            node = node.parent;
-        }
-        return false;
-    }
-    ts.isInAmbientContext = isInAmbientContext;
-    function isDeclarationName(name) {
-        if (name.kind !== 70 && name.kind !== 9 && name.kind !== 8) {
-            return false;
-        }
-        var parent = name.parent;
-        if (parent.kind === 235 || parent.kind === 239) {
-            if (parent.propertyName) {
-                return true;
-            }
-        }
-        if (isDeclaration(parent)) {
-            return parent.name === name;
-        }
-        return false;
-    }
-    ts.isDeclarationName = isDeclarationName;
-    function isLiteralComputedPropertyDeclarationName(node) {
-        return (node.kind === 9 || node.kind === 8) &&
-            node.parent.kind === 141 &&
-            isDeclaration(node.parent.parent);
-    }
-    ts.isLiteralComputedPropertyDeclarationName = isLiteralComputedPropertyDeclarationName;
-    function isIdentifierName(node) {
-        var parent = node.parent;
-        switch (parent.kind) {
-            case 146:
-            case 145:
-            case 148:
-            case 147:
-            case 150:
-            case 151:
-            case 255:
-            case 253:
-            case 173:
-                return parent.name === node;
-            case 140:
-                if (parent.right === node) {
-                    while (parent.kind === 140) {
-                        parent = parent.parent;
-                    }
-                    return parent.kind === 159;
-                }
-                return false;
-            case 170:
-            case 235:
-                return parent.propertyName === node;
-            case 239:
-                return true;
-        }
-        return false;
-    }
-    ts.isIdentifierName = isIdentifierName;
-    function isAliasSymbolDeclaration(node) {
-        return node.kind === 230 ||
-            node.kind === 229 ||
-            node.kind === 232 && !!node.name ||
-            node.kind === 233 ||
-            node.kind === 235 ||
-            node.kind === 239 ||
-            node.kind === 236 && exportAssignmentIsAlias(node);
-    }
-    ts.isAliasSymbolDeclaration = isAliasSymbolDeclaration;
-    function exportAssignmentIsAlias(node) {
-        return isEntityNameExpression(node.expression);
-    }
-    ts.exportAssignmentIsAlias = exportAssignmentIsAlias;
-    function getClassExtendsHeritageClauseElement(node) {
-        var heritageClause = getHeritageClause(node.heritageClauses, 84);
-        return heritageClause && heritageClause.types.length > 0 ? heritageClause.types[0] : undefined;
-    }
-    ts.getClassExtendsHeritageClauseElement = getClassExtendsHeritageClauseElement;
-    function getClassImplementsHeritageClauseElements(node) {
-        var heritageClause = getHeritageClause(node.heritageClauses, 107);
-        return heritageClause ? heritageClause.types : undefined;
-    }
-    ts.getClassImplementsHeritageClauseElements = getClassImplementsHeritageClauseElements;
-    function getInterfaceBaseTypeNodes(node) {
-        var heritageClause = getHeritageClause(node.heritageClauses, 84);
-        return heritageClause ? heritageClause.types : undefined;
-    }
-    ts.getInterfaceBaseTypeNodes = getInterfaceBaseTypeNodes;
-    function getHeritageClause(clauses, kind) {
-        if (clauses) {
-            for (var _i = 0, clauses_1 = clauses; _i < clauses_1.length; _i++) {
-                var clause = clauses_1[_i];
-                if (clause.token === kind) {
-                    return clause;
-                }
-            }
-        }
-        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) {
-                return node;
-            }
-            node = node.parent;
-        }
-        return undefined;
-    }
-    ts.getAncestor = getAncestor;
-    function getFileReferenceFromReferencePath(comment, commentRange) {
-        var simpleReferenceRegEx = /^\/\/\/\s*<reference\s+/gim;
-        var isNoDefaultLibRegEx = /^(\/\/\/\s*<reference\s+no-default-lib\s*=\s*)('|")(.+?)\2\s*\/>/gim;
-        if (simpleReferenceRegEx.test(comment)) {
-            if (isNoDefaultLibRegEx.test(comment)) {
-                return {
-                    isNoDefaultLib: true
-                };
-            }
-            else {
-                var refMatchResult = ts.fullTripleSlashReferencePathRegEx.exec(comment);
-                var refLibResult = !refMatchResult && ts.fullTripleSlashReferenceTypeReferenceDirectiveRegEx.exec(comment);
-                if (refMatchResult || refLibResult) {
-                    var start = commentRange.pos;
-                    var end = commentRange.end;
-                    return {
-                        fileReference: {
-                            pos: start,
-                            end: end,
-                            fileName: (refMatchResult || refLibResult)[3]
-                        },
-                        isNoDefaultLib: false,
-                        isTypeReferenceDirective: !!refLibResult
-                    };
-                }
-                return {
-                    diagnosticMessage: ts.Diagnostics.Invalid_reference_directive_syntax,
-                    isNoDefaultLib: false
-                };
-            }
-        }
-        return undefined;
-    }
-    ts.getFileReferenceFromReferencePath = getFileReferenceFromReferencePath;
-    function isKeyword(token) {
-        return 71 <= token && token <= 139;
-    }
-    ts.isKeyword = isKeyword;
-    function isTrivia(token) {
-        return 2 <= token && token <= 7;
-    }
-    ts.isTrivia = isTrivia;
-    function isAsyncFunctionLike(node) {
-        return isFunctionLike(node) && hasModifier(node, 256) && !isAccessor(node);
-    }
-    ts.isAsyncFunctionLike = isAsyncFunctionLike;
-    function isStringOrNumericLiteral(kind) {
-        return kind === 9 || kind === 8;
-    }
-    ts.isStringOrNumericLiteral = isStringOrNumericLiteral;
-    function hasDynamicName(declaration) {
-        return declaration.name && isDynamicName(declaration.name);
-    }
-    ts.hasDynamicName = hasDynamicName;
-    function isDynamicName(name) {
-        return name.kind === 141 &&
-            !isStringOrNumericLiteral(name.expression.kind) &&
-            !isWellKnownSymbolSyntactically(name.expression);
-    }
-    ts.isDynamicName = isDynamicName;
-    function isWellKnownSymbolSyntactically(node) {
-        return isPropertyAccessExpression(node) && isESSymbolIdentifier(node.expression);
-    }
-    ts.isWellKnownSymbolSyntactically = isWellKnownSymbolSyntactically;
-    function getPropertyNameForPropertyNameNode(name) {
-        if (name.kind === 70 || name.kind === 9 || name.kind === 8 || name.kind === 143) {
-            return name.text;
-        }
-        if (name.kind === 141) {
-            var nameExpression = name.expression;
-            if (isWellKnownSymbolSyntactically(nameExpression)) {
-                var rightHandSideName = nameExpression.name.text;
-                return getPropertyNameForKnownSymbolName(rightHandSideName);
-            }
-            else if (nameExpression.kind === 9 || nameExpression.kind === 8) {
-                return nameExpression.text;
-            }
-        }
-        return undefined;
-    }
-    ts.getPropertyNameForPropertyNameNode = getPropertyNameForPropertyNameNode;
-    function getPropertyNameForKnownSymbolName(symbolName) {
-        return "__@" + symbolName;
-    }
-    ts.getPropertyNameForKnownSymbolName = getPropertyNameForKnownSymbolName;
-    function isESSymbolIdentifier(node) {
-        return node.kind === 70 && node.text === "Symbol";
-    }
-    ts.isESSymbolIdentifier = isESSymbolIdentifier;
-    function isPushOrUnshiftIdentifier(node) {
-        return node.text === "push" || node.text === "unshift";
-    }
-    ts.isPushOrUnshiftIdentifier = isPushOrUnshiftIdentifier;
-    function isModifierKind(token) {
-        switch (token) {
-            case 116:
-            case 119:
-            case 75:
-            case 123:
-            case 78:
-            case 83:
-            case 113:
-            case 111:
-            case 112:
-            case 129:
-            case 114:
-                return true;
-        }
-        return false;
-    }
-    ts.isModifierKind = isModifierKind;
-    function isParameterDeclaration(node) {
-        var root = getRootDeclaration(node);
-        return root.kind === 143;
-    }
-    ts.isParameterDeclaration = isParameterDeclaration;
-    function getRootDeclaration(node) {
-        while (node.kind === 170) {
-            node = node.parent.parent;
-        }
-        return node;
-    }
-    ts.getRootDeclaration = getRootDeclaration;
-    function nodeStartsNewLexicalEnvironment(node) {
-        var kind = node.kind;
-        return kind === 149
-            || kind === 180
-            || kind === 221
-            || kind === 181
-            || kind === 148
-            || kind === 150
-            || kind === 151
-            || kind === 226
-            || kind === 256;
-    }
-    ts.nodeStartsNewLexicalEnvironment = nodeStartsNewLexicalEnvironment;
-    function nodeIsSynthesized(node) {
-        return ts.positionIsSynthesized(node.pos)
-            || ts.positionIsSynthesized(node.end);
-    }
-    ts.nodeIsSynthesized = nodeIsSynthesized;
-    function getOriginalNode(node) {
-        if (node) {
-            while (node.original !== undefined) {
-                node = node.original;
-            }
-        }
-        return node;
-    }
-    ts.getOriginalNode = getOriginalNode;
-    function isParseTreeNode(node) {
-        return (node.flags & 8) === 0;
-    }
-    ts.isParseTreeNode = isParseTreeNode;
-    function getParseTreeNode(node, nodeTest) {
-        if (isParseTreeNode(node)) {
-            return node;
-        }
-        node = getOriginalNode(node);
-        if (isParseTreeNode(node) && (!nodeTest || nodeTest(node))) {
-            return node;
-        }
-        return undefined;
-    }
-    ts.getParseTreeNode = getParseTreeNode;
-    function getOriginalSourceFiles(sourceFiles) {
-        var originalSourceFiles = [];
-        for (var _i = 0, sourceFiles_1 = sourceFiles; _i < sourceFiles_1.length; _i++) {
-            var sourceFile = sourceFiles_1[_i];
-            var originalSourceFile = getParseTreeNode(sourceFile, isSourceFile);
-            if (originalSourceFile) {
-                originalSourceFiles.push(originalSourceFile);
-            }
-        }
-        return originalSourceFiles;
-    }
-    ts.getOriginalSourceFiles = getOriginalSourceFiles;
-    function getOriginalNodeId(node) {
-        node = getOriginalNode(node);
-        return node ? ts.getNodeId(node) : 0;
-    }
-    ts.getOriginalNodeId = getOriginalNodeId;
-    (function (Associativity) {
-        Associativity[Associativity["Left"] = 0] = "Left";
-        Associativity[Associativity["Right"] = 1] = "Right";
-    })(ts.Associativity || (ts.Associativity = {}));
-    var Associativity = ts.Associativity;
-    function getExpressionAssociativity(expression) {
-        var operator = getOperator(expression);
-        var hasArguments = expression.kind === 176 && expression.arguments !== undefined;
-        return getOperatorAssociativity(expression.kind, operator, hasArguments);
-    }
-    ts.getExpressionAssociativity = getExpressionAssociativity;
-    function getOperatorAssociativity(kind, operator, hasArguments) {
-        switch (kind) {
-            case 176:
-                return hasArguments ? 0 : 1;
-            case 186:
-            case 183:
-            case 184:
-            case 182:
-            case 185:
-            case 189:
-            case 191:
-                return 1;
-            case 188:
-                switch (operator) {
-                    case 39:
-                    case 57:
-                    case 58:
-                    case 59:
-                    case 61:
-                    case 60:
-                    case 62:
-                    case 63:
-                    case 64:
-                    case 65:
-                    case 66:
-                    case 67:
-                    case 69:
-                    case 68:
-                        return 1;
-                }
-        }
-        return 0;
-    }
-    ts.getOperatorAssociativity = getOperatorAssociativity;
-    function getExpressionPrecedence(expression) {
-        var operator = getOperator(expression);
-        var hasArguments = expression.kind === 176 && expression.arguments !== undefined;
-        return getOperatorPrecedence(expression.kind, operator, hasArguments);
-    }
-    ts.getExpressionPrecedence = getExpressionPrecedence;
-    function getOperator(expression) {
-        if (expression.kind === 188) {
-            return expression.operatorToken.kind;
-        }
-        else if (expression.kind === 186 || expression.kind === 187) {
-            return expression.operator;
-        }
-        else {
-            return expression.kind;
-        }
-    }
-    ts.getOperator = getOperator;
-    function getOperatorPrecedence(nodeKind, operatorKind, hasArguments) {
-        switch (nodeKind) {
-            case 98:
-            case 96:
-            case 70:
-            case 94:
-            case 100:
-            case 85:
-            case 8:
-            case 9:
-            case 171:
-            case 172:
-            case 180:
-            case 181:
-            case 193:
-            case 242:
-            case 243:
-            case 11:
-            case 12:
-            case 190:
-            case 179:
-            case 194:
-                return 19;
-            case 177:
-            case 173:
-            case 174:
-                return 18;
-            case 176:
-                return hasArguments ? 18 : 17;
-            case 175:
-                return 17;
-            case 187:
-                return 16;
-            case 186:
-            case 183:
-            case 184:
-            case 182:
-            case 185:
-                return 15;
-            case 188:
-                switch (operatorKind) {
-                    case 50:
-                    case 51:
-                        return 15;
-                    case 39:
-                    case 38:
-                    case 40:
-                    case 41:
-                        return 14;
-                    case 36:
-                    case 37:
-                        return 13;
-                    case 44:
-                    case 45:
-                    case 46:
-                        return 12;
-                    case 26:
-                    case 29:
-                    case 28:
-                    case 30:
-                    case 91:
-                    case 92:
-                        return 11;
-                    case 31:
-                    case 33:
-                    case 32:
-                    case 34:
-                        return 10;
-                    case 47:
-                        return 9;
-                    case 49:
-                        return 8;
-                    case 48:
-                        return 7;
-                    case 52:
-                        return 6;
-                    case 53:
-                        return 5;
-                    case 57:
-                    case 58:
-                    case 59:
-                    case 61:
-                    case 60:
-                    case 62:
-                    case 63:
-                    case 64:
-                    case 65:
-                    case 66:
-                    case 67:
-                    case 69:
-                    case 68:
-                        return 3;
-                    case 25:
-                        return 0;
-                    default:
-                        return -1;
-                }
-            case 189:
-                return 4;
-            case 191:
-                return 2;
-            case 192:
-                return 1;
-            default:
-                return -1;
-        }
-    }
-    ts.getOperatorPrecedence = getOperatorPrecedence;
-    function createDiagnosticCollection() {
-        var nonFileDiagnostics = [];
-        var fileDiagnostics = ts.createMap();
-        var diagnosticsModified = false;
-        var modificationCount = 0;
-        return {
-            add: add,
-            getGlobalDiagnostics: getGlobalDiagnostics,
-            getDiagnostics: getDiagnostics,
-            getModificationCount: getModificationCount,
-            reattachFileDiagnostics: reattachFileDiagnostics
-        };
-        function getModificationCount() {
-            return modificationCount;
-        }
-        function reattachFileDiagnostics(newFile) {
-            if (!ts.hasProperty(fileDiagnostics, newFile.fileName)) {
-                return;
-            }
-            for (var _i = 0, _a = fileDiagnostics[newFile.fileName]; _i < _a.length; _i++) {
-                var diagnostic = _a[_i];
-                diagnostic.file = newFile;
-            }
-        }
-        function add(diagnostic) {
-            var diagnostics;
-            if (diagnostic.file) {
-                diagnostics = fileDiagnostics[diagnostic.file.fileName];
-                if (!diagnostics) {
-                    diagnostics = [];
-                    fileDiagnostics[diagnostic.file.fileName] = diagnostics;
-                }
-            }
-            else {
-                diagnostics = nonFileDiagnostics;
-            }
-            diagnostics.push(diagnostic);
-            diagnosticsModified = true;
-            modificationCount++;
-        }
-        function getGlobalDiagnostics() {
-            sortAndDeduplicate();
-            return nonFileDiagnostics;
-        }
-        function getDiagnostics(fileName) {
-            sortAndDeduplicate();
-            if (fileName) {
-                return fileDiagnostics[fileName] || [];
-            }
-            var allDiagnostics = [];
-            function pushDiagnostic(d) {
-                allDiagnostics.push(d);
-            }
-            ts.forEach(nonFileDiagnostics, pushDiagnostic);
-            for (var key in fileDiagnostics) {
-                ts.forEach(fileDiagnostics[key], pushDiagnostic);
-            }
-            return ts.sortAndDeduplicateDiagnostics(allDiagnostics);
-        }
-        function sortAndDeduplicate() {
-            if (!diagnosticsModified) {
-                return;
-            }
-            diagnosticsModified = false;
-            nonFileDiagnostics = ts.sortAndDeduplicateDiagnostics(nonFileDiagnostics);
-            for (var key in fileDiagnostics) {
-                fileDiagnostics[key] = ts.sortAndDeduplicateDiagnostics(fileDiagnostics[key]);
-            }
-        }
-    }
-    ts.createDiagnosticCollection = createDiagnosticCollection;
-    var escapedCharsRegExp = /[\\\"\u0000-\u001f\t\v\f\b\r\n\u2028\u2029\u0085]/g;
-    var escapedCharsMap = ts.createMap({
-        "\0": "\\0",
-        "\t": "\\t",
-        "\v": "\\v",
-        "\f": "\\f",
-        "\b": "\\b",
-        "\r": "\\r",
-        "\n": "\\n",
-        "\\": "\\\\",
-        "\"": "\\\"",
-        "\u2028": "\\u2028",
-        "\u2029": "\\u2029",
-        "\u0085": "\\u0085"
-    });
-    function escapeString(s) {
-        s = escapedCharsRegExp.test(s) ? s.replace(escapedCharsRegExp, getReplacement) : s;
-        return s;
-        function getReplacement(c) {
-            return escapedCharsMap[c] || get16BitUnicodeEscapeSequence(c.charCodeAt(0));
-        }
-    }
-    ts.escapeString = escapeString;
-    function isIntrinsicJsxName(name) {
-        var ch = name.substr(0, 1);
-        return ch.toLowerCase() === ch;
-    }
-    ts.isIntrinsicJsxName = isIntrinsicJsxName;
-    function get16BitUnicodeEscapeSequence(charCode) {
-        var hexCharCode = charCode.toString(16).toUpperCase();
-        var paddedHexCode = ("0000" + hexCharCode).slice(-4);
-        return "\\u" + paddedHexCode;
-    }
-    var nonAsciiCharacters = /[^\u0000-\u007F]/g;
-    function escapeNonAsciiCharacters(s) {
-        return nonAsciiCharacters.test(s) ?
-            s.replace(nonAsciiCharacters, function (c) { return get16BitUnicodeEscapeSequence(c.charCodeAt(0)); }) :
-            s;
-    }
-    ts.escapeNonAsciiCharacters = escapeNonAsciiCharacters;
-    var indentStrings = ["", "    "];
-    function getIndentString(level) {
-        if (indentStrings[level] === undefined) {
-            indentStrings[level] = getIndentString(level - 1) + indentStrings[1];
-        }
-        return indentStrings[level];
-    }
-    ts.getIndentString = getIndentString;
-    function getIndentSize() {
-        return indentStrings[1].length;
-    }
-    ts.getIndentSize = getIndentSize;
-    function createTextWriter(newLine) {
-        var output;
-        var indent;
-        var lineStart;
-        var lineCount;
-        var linePos;
-        function write(s) {
-            if (s && s.length) {
-                if (lineStart) {
-                    output += getIndentString(indent);
-                    lineStart = false;
-                }
-                output += s;
-            }
-        }
-        function reset() {
-            output = "";
-            indent = 0;
-            lineStart = true;
-            lineCount = 0;
-            linePos = 0;
-        }
-        function rawWrite(s) {
-            if (s !== undefined) {
-                if (lineStart) {
-                    lineStart = false;
-                }
-                output += s;
-            }
-        }
-        function writeLiteral(s) {
-            if (s && s.length) {
-                write(s);
-                var lineStartsOfS = ts.computeLineStarts(s);
-                if (lineStartsOfS.length > 1) {
-                    lineCount = lineCount + lineStartsOfS.length - 1;
-                    linePos = output.length - s.length + ts.lastOrUndefined(lineStartsOfS);
-                }
-            }
-        }
-        function writeLine() {
-            if (!lineStart) {
-                output += newLine;
-                lineCount++;
-                linePos = output.length;
-                lineStart = true;
-            }
-        }
-        function writeTextOfNode(text, node) {
-            write(getTextOfNodeFromSourceText(text, node));
-        }
-        reset();
-        return {
-            write: write,
-            rawWrite: rawWrite,
-            writeTextOfNode: writeTextOfNode,
-            writeLiteral: writeLiteral,
-            writeLine: writeLine,
-            increaseIndent: function () { indent++; },
-            decreaseIndent: function () { indent--; },
-            getIndent: function () { return indent; },
-            getTextPos: function () { return output.length; },
-            getLine: function () { return lineCount + 1; },
-            getColumn: function () { return lineStart ? indent * getIndentSize() + 1 : output.length - linePos + 1; },
-            getText: function () { return output; },
-            isAtStartOfLine: function () { return lineStart; },
-            reset: reset
-        };
-    }
-    ts.createTextWriter = createTextWriter;
-    function getResolvedExternalModuleName(host, file) {
-        return file.moduleName || getExternalModuleNameFromPath(host, file.fileName);
-    }
-    ts.getResolvedExternalModuleName = getResolvedExternalModuleName;
-    function getExternalModuleNameFromDeclaration(host, resolver, declaration) {
-        var file = resolver.getExternalModuleFileFromDeclaration(declaration);
-        if (!file || isDeclarationFile(file)) {
-            return undefined;
-        }
-        return getResolvedExternalModuleName(host, file);
-    }
-    ts.getExternalModuleNameFromDeclaration = getExternalModuleNameFromDeclaration;
-    function getExternalModuleNameFromPath(host, fileName) {
-        var getCanonicalFileName = function (f) { return host.getCanonicalFileName(f); };
-        var dir = ts.toPath(host.getCommonSourceDirectory(), host.getCurrentDirectory(), getCanonicalFileName);
-        var filePath = ts.getNormalizedAbsolutePath(fileName, host.getCurrentDirectory());
-        var relativePath = ts.getRelativePathToDirectoryOrUrl(dir, filePath, dir, getCanonicalFileName, false);
-        return ts.removeFileExtension(relativePath);
-    }
-    ts.getExternalModuleNameFromPath = getExternalModuleNameFromPath;
-    function getOwnEmitOutputFilePath(sourceFile, host, extension) {
-        var compilerOptions = host.getCompilerOptions();
-        var emitOutputFilePathWithoutExtension;
-        if (compilerOptions.outDir) {
-            emitOutputFilePathWithoutExtension = ts.removeFileExtension(getSourceFilePathInNewDir(sourceFile, host, compilerOptions.outDir));
-        }
-        else {
-            emitOutputFilePathWithoutExtension = ts.removeFileExtension(sourceFile.fileName);
-        }
-        return emitOutputFilePathWithoutExtension + extension;
-    }
-    ts.getOwnEmitOutputFilePath = getOwnEmitOutputFilePath;
-    function getDeclarationEmitOutputFilePath(sourceFile, host) {
-        var options = host.getCompilerOptions();
-        var outputDir = options.declarationDir || options.outDir;
-        var path = outputDir
-            ? getSourceFilePathInNewDir(sourceFile, host, outputDir)
-            : sourceFile.fileName;
-        return ts.removeFileExtension(path) + ".d.ts";
-    }
-    ts.getDeclarationEmitOutputFilePath = getDeclarationEmitOutputFilePath;
-    function getSourceFilesToEmit(host, targetSourceFile) {
-        var options = host.getCompilerOptions();
-        if (options.outFile || options.out) {
-            var moduleKind = ts.getEmitModuleKind(options);
-            var moduleEmitEnabled = moduleKind === ts.ModuleKind.AMD || moduleKind === ts.ModuleKind.System;
-            var sourceFiles = host.getSourceFiles();
-            return ts.filter(sourceFiles, moduleEmitEnabled ? isNonDeclarationFile : isBundleEmitNonExternalModule);
-        }
-        else {
-            var sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
-            return ts.filter(sourceFiles, isNonDeclarationFile);
-        }
-    }
-    ts.getSourceFilesToEmit = getSourceFilesToEmit;
-    function isNonDeclarationFile(sourceFile) {
-        return !isDeclarationFile(sourceFile);
-    }
-    function isBundleEmitNonExternalModule(sourceFile) {
-        return !isDeclarationFile(sourceFile) && !ts.isExternalModule(sourceFile);
-    }
-    function forEachTransformedEmitFile(host, sourceFiles, action, emitOnlyDtsFiles) {
-        var options = host.getCompilerOptions();
-        if (options.outFile || options.out) {
-            onBundledEmit(sourceFiles);
-        }
-        else {
-            for (var _i = 0, sourceFiles_2 = sourceFiles; _i < sourceFiles_2.length; _i++) {
-                var sourceFile = sourceFiles_2[_i];
-                if (!isDeclarationFile(sourceFile) && !host.isSourceFileFromExternalLibrary(sourceFile)) {
-                    onSingleFileEmit(host, sourceFile);
-                }
-            }
-        }
-        function onSingleFileEmit(host, sourceFile) {
-            var extension = ".js";
-            if (options.jsx === 1) {
-                if (isSourceFileJavaScript(sourceFile)) {
-                    if (ts.fileExtensionIs(sourceFile.fileName, ".jsx")) {
-                        extension = ".jsx";
-                    }
-                }
-                else if (sourceFile.languageVariant === 1) {
-                    extension = ".jsx";
-                }
-            }
-            var jsFilePath = getOwnEmitOutputFilePath(sourceFile, host, extension);
-            var sourceMapFilePath = getSourceMapFilePath(jsFilePath, options);
-            var declarationFilePath = !isSourceFileJavaScript(sourceFile) && (options.declaration || emitOnlyDtsFiles) ? getDeclarationEmitOutputFilePath(sourceFile, host) : undefined;
-            action(jsFilePath, sourceMapFilePath, declarationFilePath, [sourceFile], false);
-        }
-        function onBundledEmit(sourceFiles) {
-            if (sourceFiles.length) {
-                var jsFilePath = options.outFile || options.out;
-                var sourceMapFilePath = getSourceMapFilePath(jsFilePath, options);
-                var declarationFilePath = options.declaration ? ts.removeFileExtension(jsFilePath) + ".d.ts" : undefined;
-                action(jsFilePath, sourceMapFilePath, declarationFilePath, sourceFiles, true);
-            }
-        }
-    }
-    ts.forEachTransformedEmitFile = forEachTransformedEmitFile;
-    function getSourceMapFilePath(jsFilePath, options) {
-        return options.sourceMap ? jsFilePath + ".map" : undefined;
-    }
-    function forEachExpectedEmitFile(host, action, targetSourceFile, emitOnlyDtsFiles) {
-        var options = host.getCompilerOptions();
-        if (options.outFile || options.out) {
-            onBundledEmit(host);
-        }
-        else {
-            var sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
-            for (var _i = 0, sourceFiles_3 = sourceFiles; _i < sourceFiles_3.length; _i++) {
-                var sourceFile = sourceFiles_3[_i];
-                if (!isDeclarationFile(sourceFile) && !host.isSourceFileFromExternalLibrary(sourceFile)) {
-                    onSingleFileEmit(host, sourceFile);
-                }
-            }
-        }
-        function onSingleFileEmit(host, sourceFile) {
-            var extension = ".js";
-            if (options.jsx === 1) {
-                if (isSourceFileJavaScript(sourceFile)) {
-                    if (ts.fileExtensionIs(sourceFile.fileName, ".jsx")) {
-                        extension = ".jsx";
-                    }
-                }
-                else if (sourceFile.languageVariant === 1) {
-                    extension = ".jsx";
-                }
-            }
-            var jsFilePath = getOwnEmitOutputFilePath(sourceFile, host, extension);
-            var declarationFilePath = !isSourceFileJavaScript(sourceFile) && (emitOnlyDtsFiles || options.declaration) ? getDeclarationEmitOutputFilePath(sourceFile, host) : undefined;
-            var emitFileNames = {
-                jsFilePath: jsFilePath,
-                sourceMapFilePath: getSourceMapFilePath(jsFilePath, options),
-                declarationFilePath: declarationFilePath
-            };
-            action(emitFileNames, [sourceFile], false, emitOnlyDtsFiles);
-        }
-        function onBundledEmit(host) {
-            var bundledSources = ts.filter(host.getSourceFiles(), function (sourceFile) { return !isDeclarationFile(sourceFile) &&
-                !host.isSourceFileFromExternalLibrary(sourceFile) &&
-                (!ts.isExternalModule(sourceFile) ||
-                    !!ts.getEmitModuleKind(options)); });
-            if (bundledSources.length) {
-                var jsFilePath = options.outFile || options.out;
-                var emitFileNames = {
-                    jsFilePath: jsFilePath,
-                    sourceMapFilePath: getSourceMapFilePath(jsFilePath, options),
-                    declarationFilePath: options.declaration ? ts.removeFileExtension(jsFilePath) + ".d.ts" : undefined
-                };
-                action(emitFileNames, bundledSources, true, emitOnlyDtsFiles);
-            }
-        }
-    }
-    ts.forEachExpectedEmitFile = forEachExpectedEmitFile;
-    function getSourceFilePathInNewDir(sourceFile, host, newDirPath) {
-        var sourceFilePath = ts.getNormalizedAbsolutePath(sourceFile.fileName, host.getCurrentDirectory());
-        var commonSourceDirectory = host.getCommonSourceDirectory();
-        var isSourceFileInCommonSourceDirectory = host.getCanonicalFileName(sourceFilePath).indexOf(host.getCanonicalFileName(commonSourceDirectory)) === 0;
-        sourceFilePath = isSourceFileInCommonSourceDirectory ? sourceFilePath.substring(commonSourceDirectory.length) : sourceFilePath;
-        return ts.combinePaths(newDirPath, sourceFilePath);
-    }
-    ts.getSourceFilePathInNewDir = getSourceFilePathInNewDir;
-    function writeFile(host, diagnostics, fileName, data, writeByteOrderMark, sourceFiles) {
-        host.writeFile(fileName, data, writeByteOrderMark, function (hostErrorMessage) {
-            diagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Could_not_write_file_0_Colon_1, fileName, hostErrorMessage));
-        }, sourceFiles);
-    }
-    ts.writeFile = writeFile;
-    function getLineOfLocalPosition(currentSourceFile, pos) {
-        return ts.getLineAndCharacterOfPosition(currentSourceFile, pos).line;
-    }
-    ts.getLineOfLocalPosition = getLineOfLocalPosition;
-    function getLineOfLocalPositionFromLineMap(lineMap, pos) {
-        return ts.computeLineAndCharacterOfPosition(lineMap, pos).line;
-    }
-    ts.getLineOfLocalPositionFromLineMap = getLineOfLocalPositionFromLineMap;
-    function getFirstConstructorWithBody(node) {
-        return ts.forEach(node.members, function (member) {
-            if (member.kind === 149 && nodeIsPresent(member.body)) {
-                return member;
-            }
-        });
-    }
-    ts.getFirstConstructorWithBody = getFirstConstructorWithBody;
-    function getSetAccessorTypeAnnotationNode(accessor) {
-        if (accessor && accessor.parameters.length > 0) {
-            var hasThis = accessor.parameters.length === 2 && parameterIsThisKeyword(accessor.parameters[0]);
-            return accessor.parameters[hasThis ? 1 : 0].type;
-        }
-    }
-    ts.getSetAccessorTypeAnnotationNode = getSetAccessorTypeAnnotationNode;
-    function getThisParameter(signature) {
-        if (signature.parameters.length) {
-            var thisParameter = signature.parameters[0];
-            if (parameterIsThisKeyword(thisParameter)) {
-                return thisParameter;
-            }
-        }
-    }
-    ts.getThisParameter = getThisParameter;
-    function parameterIsThisKeyword(parameter) {
-        return isThisIdentifier(parameter.name);
-    }
-    ts.parameterIsThisKeyword = parameterIsThisKeyword;
-    function isThisIdentifier(node) {
-        return node && node.kind === 70 && identifierIsThisKeyword(node);
-    }
-    ts.isThisIdentifier = isThisIdentifier;
-    function identifierIsThisKeyword(id) {
-        return id.originalKeywordKind === 98;
-    }
-    ts.identifierIsThisKeyword = identifierIsThisKeyword;
-    function getAllAccessorDeclarations(declarations, accessor) {
-        var firstAccessor;
-        var secondAccessor;
-        var getAccessor;
-        var setAccessor;
-        if (hasDynamicName(accessor)) {
-            firstAccessor = accessor;
-            if (accessor.kind === 150) {
-                getAccessor = accessor;
-            }
-            else if (accessor.kind === 151) {
-                setAccessor = accessor;
-            }
-            else {
-                ts.Debug.fail("Accessor has wrong kind");
-            }
-        }
-        else {
-            ts.forEach(declarations, function (member) {
-                if ((member.kind === 150 || member.kind === 151)
-                    && hasModifier(member, 32) === hasModifier(accessor, 32)) {
-                    var memberName = getPropertyNameForPropertyNameNode(member.name);
-                    var accessorName = getPropertyNameForPropertyNameNode(accessor.name);
-                    if (memberName === accessorName) {
-                        if (!firstAccessor) {
-                            firstAccessor = member;
-                        }
-                        else if (!secondAccessor) {
-                            secondAccessor = member;
-                        }
-                        if (member.kind === 150 && !getAccessor) {
-                            getAccessor = member;
-                        }
-                        if (member.kind === 151 && !setAccessor) {
-                            setAccessor = member;
-                        }
-                    }
-                }
-            });
-        }
-        return {
-            firstAccessor: firstAccessor,
-            secondAccessor: secondAccessor,
-            getAccessor: getAccessor,
-            setAccessor: setAccessor
-        };
-    }
-    ts.getAllAccessorDeclarations = getAllAccessorDeclarations;
-    function emitNewLineBeforeLeadingComments(lineMap, writer, node, leadingComments) {
-        emitNewLineBeforeLeadingCommentsOfPosition(lineMap, writer, node.pos, leadingComments);
-    }
-    ts.emitNewLineBeforeLeadingComments = emitNewLineBeforeLeadingComments;
-    function emitNewLineBeforeLeadingCommentsOfPosition(lineMap, writer, pos, leadingComments) {
-        if (leadingComments && leadingComments.length && pos !== leadingComments[0].pos &&
-            getLineOfLocalPositionFromLineMap(lineMap, pos) !== getLineOfLocalPositionFromLineMap(lineMap, leadingComments[0].pos)) {
-            writer.writeLine();
-        }
-    }
-    ts.emitNewLineBeforeLeadingCommentsOfPosition = emitNewLineBeforeLeadingCommentsOfPosition;
-    function emitNewLineBeforeLeadingCommentOfPosition(lineMap, writer, pos, commentPos) {
-        if (pos !== commentPos &&
-            getLineOfLocalPositionFromLineMap(lineMap, pos) !== getLineOfLocalPositionFromLineMap(lineMap, commentPos)) {
-            writer.writeLine();
-        }
-    }
-    ts.emitNewLineBeforeLeadingCommentOfPosition = emitNewLineBeforeLeadingCommentOfPosition;
-    function emitComments(text, lineMap, writer, comments, leadingSeparator, trailingSeparator, newLine, writeComment) {
-        if (comments && comments.length > 0) {
-            if (leadingSeparator) {
-                writer.write(" ");
-            }
-            var emitInterveningSeparator = false;
-            for (var _i = 0, comments_1 = comments; _i < comments_1.length; _i++) {
-                var comment = comments_1[_i];
-                if (emitInterveningSeparator) {
-                    writer.write(" ");
-                    emitInterveningSeparator = false;
-                }
-                writeComment(text, lineMap, writer, comment.pos, comment.end, newLine);
-                if (comment.hasTrailingNewLine) {
-                    writer.writeLine();
-                }
-                else {
-                    emitInterveningSeparator = true;
-                }
-            }
-            if (emitInterveningSeparator && trailingSeparator) {
-                writer.write(" ");
-            }
-        }
-    }
-    ts.emitComments = emitComments;
-    function emitDetachedComments(text, lineMap, writer, writeComment, node, newLine, removeComments) {
-        var leadingComments;
-        var currentDetachedCommentInfo;
-        if (removeComments) {
-            if (node.pos === 0) {
-                leadingComments = ts.filter(ts.getLeadingCommentRanges(text, node.pos), isPinnedComment);
-            }
-        }
-        else {
-            leadingComments = ts.getLeadingCommentRanges(text, node.pos);
-        }
-        if (leadingComments) {
-            var detachedComments = [];
-            var lastComment = void 0;
-            for (var _i = 0, leadingComments_1 = leadingComments; _i < leadingComments_1.length; _i++) {
-                var comment = leadingComments_1[_i];
-                if (lastComment) {
-                    var lastCommentLine = getLineOfLocalPositionFromLineMap(lineMap, lastComment.end);
-                    var commentLine = getLineOfLocalPositionFromLineMap(lineMap, comment.pos);
-                    if (commentLine >= lastCommentLine + 2) {
-                        break;
-                    }
-                }
-                detachedComments.push(comment);
-                lastComment = comment;
-            }
-            if (detachedComments.length) {
-                var lastCommentLine = getLineOfLocalPositionFromLineMap(lineMap, ts.lastOrUndefined(detachedComments).end);
-                var nodeLine = getLineOfLocalPositionFromLineMap(lineMap, ts.skipTrivia(text, node.pos));
-                if (nodeLine >= lastCommentLine + 2) {
-                    emitNewLineBeforeLeadingComments(lineMap, writer, node, leadingComments);
-                    emitComments(text, lineMap, writer, detachedComments, false, true, newLine, writeComment);
-                    currentDetachedCommentInfo = { nodePos: node.pos, detachedCommentEndPos: ts.lastOrUndefined(detachedComments).end };
-                }
-            }
-        }
-        return currentDetachedCommentInfo;
-        function isPinnedComment(comment) {
-            return text.charCodeAt(comment.pos + 1) === 42 &&
-                text.charCodeAt(comment.pos + 2) === 33;
-        }
-    }
-    ts.emitDetachedComments = emitDetachedComments;
-    function writeCommentRange(text, lineMap, writer, commentPos, commentEnd, newLine) {
-        if (text.charCodeAt(commentPos + 1) === 42) {
-            var firstCommentLineAndCharacter = ts.computeLineAndCharacterOfPosition(lineMap, commentPos);
-            var lineCount = lineMap.length;
-            var firstCommentLineIndent = void 0;
-            for (var pos = commentPos, currentLine = firstCommentLineAndCharacter.line; pos < commentEnd; currentLine++) {
-                var nextLineStart = (currentLine + 1) === lineCount
-                    ? text.length + 1
-                    : lineMap[currentLine + 1];
-                if (pos !== commentPos) {
-                    if (firstCommentLineIndent === undefined) {
-                        firstCommentLineIndent = calculateIndent(text, lineMap[firstCommentLineAndCharacter.line], commentPos);
-                    }
-                    var currentWriterIndentSpacing = writer.getIndent() * getIndentSize();
-                    var spacesToEmit = currentWriterIndentSpacing - firstCommentLineIndent + calculateIndent(text, pos, nextLineStart);
-                    if (spacesToEmit > 0) {
-                        var numberOfSingleSpacesToEmit = spacesToEmit % getIndentSize();
-                        var indentSizeSpaceString = getIndentString((spacesToEmit - numberOfSingleSpacesToEmit) / getIndentSize());
-                        writer.rawWrite(indentSizeSpaceString);
-                        while (numberOfSingleSpacesToEmit) {
-                            writer.rawWrite(" ");
-                            numberOfSingleSpacesToEmit--;
-                        }
-                    }
-                    else {
-                        writer.rawWrite("");
-                    }
-                }
-                writeTrimmedCurrentLine(text, commentEnd, writer, newLine, pos, nextLineStart);
-                pos = nextLineStart;
-            }
-        }
-        else {
-            writer.write(text.substring(commentPos, commentEnd));
-        }
-    }
-    ts.writeCommentRange = writeCommentRange;
-    function writeTrimmedCurrentLine(text, commentEnd, writer, newLine, pos, nextLineStart) {
-        var end = Math.min(commentEnd, nextLineStart - 1);
-        var currentLineText = text.substring(pos, end).replace(/^\s+|\s+$/g, "");
-        if (currentLineText) {
-            writer.write(currentLineText);
-            if (end !== commentEnd) {
-                writer.writeLine();
-            }
-        }
-        else {
-            writer.writeLiteral(newLine);
-        }
-    }
-    function calculateIndent(text, pos, end) {
-        var currentLineIndent = 0;
-        for (; pos < end && ts.isWhiteSpaceSingleLine(text.charCodeAt(pos)); pos++) {
-            if (text.charCodeAt(pos) === 9) {
-                currentLineIndent += getIndentSize() - (currentLineIndent % getIndentSize());
-            }
-            else {
-                currentLineIndent++;
-            }
-        }
-        return currentLineIndent;
-    }
-    function hasModifiers(node) {
-        return getModifierFlags(node) !== 0;
-    }
-    ts.hasModifiers = hasModifiers;
-    function hasModifier(node, flags) {
-        return (getModifierFlags(node) & flags) !== 0;
-    }
-    ts.hasModifier = hasModifier;
-    function getModifierFlags(node) {
-        if (node.modifierFlagsCache & 536870912) {
-            return node.modifierFlagsCache & ~536870912;
-        }
-        var flags = 0;
-        if (node.modifiers) {
-            for (var _i = 0, _a = node.modifiers; _i < _a.length; _i++) {
-                var modifier = _a[_i];
-                flags |= modifierToFlag(modifier.kind);
-            }
-        }
-        if (node.flags & 4) {
-            flags |= 1;
-        }
-        node.modifierFlagsCache = flags | 536870912;
-        return flags;
-    }
-    ts.getModifierFlags = getModifierFlags;
-    function modifierToFlag(token) {
-        switch (token) {
-            case 114: return 32;
-            case 113: return 4;
-            case 112: return 16;
-            case 111: return 8;
-            case 116: return 128;
-            case 83: return 1;
-            case 123: return 2;
-            case 75: return 2048;
-            case 78: return 512;
-            case 119: return 256;
-            case 129: return 64;
-        }
-        return 0;
-    }
-    ts.modifierToFlag = modifierToFlag;
-    function isLogicalOperator(token) {
-        return token === 53
-            || token === 52
-            || token === 50;
-    }
-    ts.isLogicalOperator = isLogicalOperator;
-    function isAssignmentOperator(token) {
-        return token >= 57 && token <= 69;
-    }
-    ts.isAssignmentOperator = isAssignmentOperator;
-    function tryGetClassExtendingExpressionWithTypeArguments(node) {
-        if (node.kind === 195 &&
-            node.parent.token === 84 &&
-            isClassLike(node.parent.parent)) {
-            return node.parent.parent;
-        }
-    }
-    ts.tryGetClassExtendingExpressionWithTypeArguments = tryGetClassExtendingExpressionWithTypeArguments;
-    function isDestructuringAssignment(node) {
-        if (isBinaryExpression(node)) {
-            if (node.operatorToken.kind === 57) {
-                var kind = node.left.kind;
-                return kind === 172
-                    || kind === 171;
-            }
-        }
-        return false;
-    }
-    ts.isDestructuringAssignment = isDestructuringAssignment;
-    function isSupportedExpressionWithTypeArguments(node) {
-        return isSupportedExpressionWithTypeArgumentsRest(node.expression);
-    }
-    ts.isSupportedExpressionWithTypeArguments = isSupportedExpressionWithTypeArguments;
-    function isSupportedExpressionWithTypeArgumentsRest(node) {
-        if (node.kind === 70) {
-            return true;
-        }
-        else if (isPropertyAccessExpression(node)) {
-            return isSupportedExpressionWithTypeArgumentsRest(node.expression);
-        }
-        else {
-            return false;
-        }
-    }
-    function isExpressionWithTypeArgumentsInClassExtendsClause(node) {
-        return tryGetClassExtendingExpressionWithTypeArguments(node) !== undefined;
-    }
-    ts.isExpressionWithTypeArgumentsInClassExtendsClause = isExpressionWithTypeArgumentsInClassExtendsClause;
-    function isEntityNameExpression(node) {
-        return node.kind === 70 ||
-            node.kind === 173 && isEntityNameExpression(node.expression);
-    }
-    ts.isEntityNameExpression = isEntityNameExpression;
-    function isRightSideOfQualifiedNameOrPropertyAccess(node) {
-        return (node.parent.kind === 140 && node.parent.right === node) ||
-            (node.parent.kind === 173 && node.parent.name === node);
-    }
-    ts.isRightSideOfQualifiedNameOrPropertyAccess = isRightSideOfQualifiedNameOrPropertyAccess;
-    function isEmptyObjectLiteralOrArrayLiteral(expression) {
-        var kind = expression.kind;
-        if (kind === 172) {
-            return expression.properties.length === 0;
-        }
-        if (kind === 171) {
-            return expression.elements.length === 0;
-        }
-        return false;
-    }
-    ts.isEmptyObjectLiteralOrArrayLiteral = isEmptyObjectLiteralOrArrayLiteral;
-    function getLocalSymbolForExportDefault(symbol) {
-        return symbol && symbol.valueDeclaration && hasModifier(symbol.valueDeclaration, 512) ? symbol.valueDeclaration.localSymbol : undefined;
-    }
-    ts.getLocalSymbolForExportDefault = getLocalSymbolForExportDefault;
-    function tryExtractTypeScriptExtension(fileName) {
-        return ts.find(ts.supportedTypescriptExtensionsForExtractExtension, function (extension) { return ts.fileExtensionIs(fileName, extension); });
-    }
-    ts.tryExtractTypeScriptExtension = tryExtractTypeScriptExtension;
-    function getExpandedCharCodes(input) {
-        var output = [];
-        var length = input.length;
-        for (var i = 0; i < length; i++) {
-            var charCode = input.charCodeAt(i);
-            if (charCode < 0x80) {
-                output.push(charCode);
-            }
-            else if (charCode < 0x800) {
-                output.push((charCode >> 6) | 192);
-                output.push((charCode & 63) | 128);
-            }
-            else if (charCode < 0x10000) {
-                output.push((charCode >> 12) | 224);
-                output.push(((charCode >> 6) & 63) | 128);
-                output.push((charCode & 63) | 128);
-            }
-            else if (charCode < 0x20000) {
-                output.push((charCode >> 18) | 240);
-                output.push(((charCode >> 12) & 63) | 128);
-                output.push(((charCode >> 6) & 63) | 128);
-                output.push((charCode & 63) | 128);
-            }
-            else {
-                ts.Debug.assert(false, "Unexpected code point");
-            }
-        }
-        return output;
-    }
-    ts.stringify = typeof JSON !== "undefined" && JSON.stringify
-        ? JSON.stringify
-        : stringifyFallback;
-    function stringifyFallback(value) {
-        return value === undefined ? undefined : stringifyValue(value);
-    }
-    function stringifyValue(value) {
-        return typeof value === "string" ? "\"" + escapeString(value) + "\""
-            : typeof value === "number" ? isFinite(value) ? String(value) : "null"
-                : typeof value === "boolean" ? value ? "true" : "false"
-                    : typeof value === "object" && value ? ts.isArray(value) ? cycleCheck(stringifyArray, value) : cycleCheck(stringifyObject, value)
-                        : "null";
-    }
-    function cycleCheck(cb, value) {
-        ts.Debug.assert(!value.hasOwnProperty("__cycle"), "Converting circular structure to JSON");
-        value.__cycle = true;
-        var result = cb(value);
-        delete value.__cycle;
-        return result;
-    }
-    function stringifyArray(value) {
-        return "[" + ts.reduceLeft(value, stringifyElement, "") + "]";
-    }
-    function stringifyElement(memo, value) {
-        return (memo ? memo + "," : memo) + stringifyValue(value);
-    }
-    function stringifyObject(value) {
-        return "{" + ts.reduceOwnProperties(value, stringifyProperty, "") + "}";
-    }
-    function stringifyProperty(memo, value, key) {
-        return value === undefined || typeof value === "function" || key === "__cycle" ? memo
-            : (memo ? memo + "," : memo) + ("\"" + escapeString(key) + "\":" + stringifyValue(value));
-    }
-    var base64Digits = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
-    function convertToBase64(input) {
-        var result = "";
-        var charCodes = getExpandedCharCodes(input);
-        var i = 0;
-        var length = charCodes.length;
-        var byte1, byte2, byte3, byte4;
-        while (i < length) {
-            byte1 = charCodes[i] >> 2;
-            byte2 = (charCodes[i] & 3) << 4 | charCodes[i + 1] >> 4;
-            byte3 = (charCodes[i + 1] & 15) << 2 | charCodes[i + 2] >> 6;
-            byte4 = charCodes[i + 2] & 63;
-            if (i + 1 >= length) {
-                byte3 = byte4 = 64;
-            }
-            else if (i + 2 >= length) {
-                byte4 = 64;
-            }
-            result += base64Digits.charAt(byte1) + base64Digits.charAt(byte2) + base64Digits.charAt(byte3) + base64Digits.charAt(byte4);
-            i += 3;
-        }
-        return result;
-    }
-    ts.convertToBase64 = convertToBase64;
-    var carriageReturnLineFeed = "\r\n";
-    var lineFeed = "\n";
-    function getNewLineCharacter(options) {
-        if (options.newLine === 0) {
-            return carriageReturnLineFeed;
-        }
-        else if (options.newLine === 1) {
-            return lineFeed;
-        }
-        else if (ts.sys) {
-            return ts.sys.newLine;
-        }
-        return carriageReturnLineFeed;
-    }
-    ts.getNewLineCharacter = getNewLineCharacter;
-    function isSimpleExpression(node) {
-        return isSimpleExpressionWorker(node, 0);
-    }
-    ts.isSimpleExpression = isSimpleExpression;
-    function isSimpleExpressionWorker(node, depth) {
-        if (depth <= 5) {
-            var kind = node.kind;
-            if (kind === 9
-                || kind === 8
-                || kind === 11
-                || kind === 12
-                || kind === 70
-                || kind === 98
-                || kind === 96
-                || kind === 100
-                || kind === 85
-                || kind === 94) {
-                return true;
-            }
-            else if (kind === 173) {
-                return isSimpleExpressionWorker(node.expression, depth + 1);
-            }
-            else if (kind === 174) {
-                return isSimpleExpressionWorker(node.expression, depth + 1)
-                    && isSimpleExpressionWorker(node.argumentExpression, depth + 1);
-            }
-            else if (kind === 186
-                || kind === 187) {
-                return isSimpleExpressionWorker(node.operand, depth + 1);
-            }
-            else if (kind === 188) {
-                return node.operatorToken.kind !== 39
-                    && isSimpleExpressionWorker(node.left, depth + 1)
-                    && isSimpleExpressionWorker(node.right, depth + 1);
-            }
-            else if (kind === 189) {
-                return isSimpleExpressionWorker(node.condition, depth + 1)
-                    && isSimpleExpressionWorker(node.whenTrue, depth + 1)
-                    && isSimpleExpressionWorker(node.whenFalse, depth + 1);
-            }
-            else if (kind === 184
-                || kind === 183
-                || kind === 182) {
-                return isSimpleExpressionWorker(node.expression, depth + 1);
-            }
-            else if (kind === 171) {
-                return node.elements.length === 0;
-            }
-            else if (kind === 172) {
-                return node.properties.length === 0;
-            }
-            else if (kind === 175) {
-                if (!isSimpleExpressionWorker(node.expression, depth + 1)) {
-                    return false;
-                }
-                for (var _i = 0, _a = node.arguments; _i < _a.length; _i++) {
-                    var argument = _a[_i];
-                    if (!isSimpleExpressionWorker(argument, depth + 1)) {
-                        return false;
-                    }
-                }
-                return true;
-            }
-        }
-        return false;
-    }
-    var syntaxKindCache = ts.createMap();
-    function formatSyntaxKind(kind) {
-        var syntaxKindEnum = ts.SyntaxKind;
-        if (syntaxKindEnum) {
-            if (syntaxKindCache[kind]) {
-                return syntaxKindCache[kind];
-            }
-            for (var name_6 in syntaxKindEnum) {
-                if (syntaxKindEnum[name_6] === kind) {
-                    return syntaxKindCache[kind] = kind.toString() + " (" + name_6 + ")";
-                }
-            }
-        }
-        else {
-            return kind.toString();
-        }
-    }
-    ts.formatSyntaxKind = formatSyntaxKind;
-    function movePos(pos, value) {
-        return ts.positionIsSynthesized(pos) ? -1 : pos + value;
-    }
-    ts.movePos = movePos;
-    function createRange(pos, end) {
-        return { pos: pos, end: end };
-    }
-    ts.createRange = createRange;
-    function moveRangeEnd(range, end) {
-        return createRange(range.pos, end);
-    }
-    ts.moveRangeEnd = moveRangeEnd;
-    function moveRangePos(range, pos) {
-        return createRange(pos, range.end);
-    }
-    ts.moveRangePos = moveRangePos;
-    function moveRangePastDecorators(node) {
-        return node.decorators && node.decorators.length > 0
-            ? moveRangePos(node, node.decorators.end)
-            : node;
-    }
-    ts.moveRangePastDecorators = moveRangePastDecorators;
-    function moveRangePastModifiers(node) {
-        return node.modifiers && node.modifiers.length > 0
-            ? moveRangePos(node, node.modifiers.end)
-            : moveRangePastDecorators(node);
-    }
-    ts.moveRangePastModifiers = moveRangePastModifiers;
-    function isCollapsedRange(range) {
-        return range.pos === range.end;
-    }
-    ts.isCollapsedRange = isCollapsedRange;
-    function collapseRangeToStart(range) {
-        return isCollapsedRange(range) ? range : moveRangeEnd(range, range.pos);
-    }
-    ts.collapseRangeToStart = collapseRangeToStart;
-    function collapseRangeToEnd(range) {
-        return isCollapsedRange(range) ? range : moveRangePos(range, range.end);
-    }
-    ts.collapseRangeToEnd = collapseRangeToEnd;
-    function createTokenRange(pos, token) {
-        return createRange(pos, pos + ts.tokenToString(token).length);
-    }
-    ts.createTokenRange = createTokenRange;
-    function rangeIsOnSingleLine(range, sourceFile) {
-        return rangeStartIsOnSameLineAsRangeEnd(range, range, sourceFile);
-    }
-    ts.rangeIsOnSingleLine = rangeIsOnSingleLine;
-    function rangeStartPositionsAreOnSameLine(range1, range2, sourceFile) {
-        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile), getStartPositionOfRange(range2, sourceFile), sourceFile);
-    }
-    ts.rangeStartPositionsAreOnSameLine = rangeStartPositionsAreOnSameLine;
-    function rangeEndPositionsAreOnSameLine(range1, range2, sourceFile) {
-        return positionsAreOnSameLine(range1.end, range2.end, sourceFile);
-    }
-    ts.rangeEndPositionsAreOnSameLine = rangeEndPositionsAreOnSameLine;
-    function rangeStartIsOnSameLineAsRangeEnd(range1, range2, sourceFile) {
-        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile), range2.end, sourceFile);
-    }
-    ts.rangeStartIsOnSameLineAsRangeEnd = rangeStartIsOnSameLineAsRangeEnd;
-    function rangeEndIsOnSameLineAsRangeStart(range1, range2, sourceFile) {
-        return positionsAreOnSameLine(range1.end, getStartPositionOfRange(range2, sourceFile), sourceFile);
-    }
-    ts.rangeEndIsOnSameLineAsRangeStart = rangeEndIsOnSameLineAsRangeStart;
-    function positionsAreOnSameLine(pos1, pos2, sourceFile) {
-        return pos1 === pos2 ||
-            getLineOfLocalPosition(sourceFile, pos1) === getLineOfLocalPosition(sourceFile, pos2);
-    }
-    ts.positionsAreOnSameLine = positionsAreOnSameLine;
-    function getStartPositionOfRange(range, sourceFile) {
-        return ts.positionIsSynthesized(range.pos) ? -1 : ts.skipTrivia(sourceFile.text, range.pos);
-    }
-    ts.getStartPositionOfRange = getStartPositionOfRange;
-    function collectExternalModuleInfo(sourceFile) {
-        var externalImports = [];
-        var exportSpecifiers = ts.createMap();
-        var exportEquals = undefined;
-        var hasExportStarsToExportValues = false;
-        for (var _i = 0, _a = sourceFile.statements; _i < _a.length; _i++) {
-            var node = _a[_i];
-            switch (node.kind) {
-                case 231:
-                    externalImports.push(node);
-                    break;
-                case 230:
-                    if (node.moduleReference.kind === 241) {
-                        externalImports.push(node);
-                    }
-                    break;
-                case 237:
-                    if (node.moduleSpecifier) {
-                        if (!node.exportClause) {
-                            externalImports.push(node);
-                            hasExportStarsToExportValues = true;
-                        }
-                        else {
-                            externalImports.push(node);
-                        }
-                    }
-                    else {
-                        for (var _b = 0, _c = node.exportClause.elements; _b < _c.length; _b++) {
-                            var specifier = _c[_b];
-                            var name_7 = (specifier.propertyName || specifier.name).text;
-                            (exportSpecifiers[name_7] || (exportSpecifiers[name_7] = [])).push(specifier);
-                        }
-                    }
-                    break;
-                case 236:
-                    if (node.isExportEquals && !exportEquals) {
-                        exportEquals = node;
-                    }
-                    break;
-            }
-        }
-        return { externalImports: externalImports, exportSpecifiers: exportSpecifiers, exportEquals: exportEquals, hasExportStarsToExportValues: hasExportStarsToExportValues };
-    }
-    ts.collectExternalModuleInfo = collectExternalModuleInfo;
-    function getInitializedVariables(node) {
-        return ts.filter(node.declarations, isInitializedVariable);
-    }
-    ts.getInitializedVariables = getInitializedVariables;
-    function isInitializedVariable(node) {
-        return node.initializer !== undefined;
-    }
-    function isMergedWithClass(node) {
-        if (node.symbol) {
-            for (var _i = 0, _a = node.symbol.declarations; _i < _a.length; _i++) {
-                var declaration = _a[_i];
-                if (declaration.kind === 222 && declaration !== node) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-    ts.isMergedWithClass = isMergedWithClass;
-    function isFirstDeclarationOfKind(node, kind) {
-        return node.symbol && getDeclarationOfKind(node.symbol, kind) === node;
-    }
-    ts.isFirstDeclarationOfKind = isFirstDeclarationOfKind;
-    function isNodeArray(array) {
-        return array.hasOwnProperty("pos")
-            && array.hasOwnProperty("end");
-    }
-    ts.isNodeArray = isNodeArray;
-    function isNoSubstitutionTemplateLiteral(node) {
-        return node.kind === 12;
-    }
-    ts.isNoSubstitutionTemplateLiteral = isNoSubstitutionTemplateLiteral;
-    function isLiteralKind(kind) {
-        return 8 <= kind && kind <= 12;
-    }
-    ts.isLiteralKind = isLiteralKind;
-    function isTextualLiteralKind(kind) {
-        return kind === 9 || kind === 12;
-    }
-    ts.isTextualLiteralKind = isTextualLiteralKind;
-    function isLiteralExpression(node) {
-        return isLiteralKind(node.kind);
-    }
-    ts.isLiteralExpression = isLiteralExpression;
-    function isTemplateLiteralKind(kind) {
-        return 12 <= kind && kind <= 15;
-    }
-    ts.isTemplateLiteralKind = isTemplateLiteralKind;
-    function isTemplateHead(node) {
-        return node.kind === 13;
-    }
-    ts.isTemplateHead = isTemplateHead;
-    function isTemplateMiddleOrTemplateTail(node) {
-        var kind = node.kind;
-        return kind === 14
-            || kind === 15;
-    }
-    ts.isTemplateMiddleOrTemplateTail = isTemplateMiddleOrTemplateTail;
-    function isIdentifier(node) {
-        return node.kind === 70;
-    }
-    ts.isIdentifier = isIdentifier;
-    function isGeneratedIdentifier(node) {
-        return isIdentifier(node) && node.autoGenerateKind > 0;
-    }
-    ts.isGeneratedIdentifier = isGeneratedIdentifier;
-    function isModifier(node) {
-        return isModifierKind(node.kind);
-    }
-    ts.isModifier = isModifier;
-    function isQualifiedName(node) {
-        return node.kind === 140;
-    }
-    ts.isQualifiedName = isQualifiedName;
-    function isComputedPropertyName(node) {
-        return node.kind === 141;
-    }
-    ts.isComputedPropertyName = isComputedPropertyName;
-    function isEntityName(node) {
-        var kind = node.kind;
-        return kind === 140
-            || kind === 70;
-    }
-    ts.isEntityName = isEntityName;
-    function isPropertyName(node) {
-        var kind = node.kind;
-        return kind === 70
-            || kind === 9
-            || kind === 8
-            || kind === 141;
-    }
-    ts.isPropertyName = isPropertyName;
-    function isModuleName(node) {
-        var kind = node.kind;
-        return kind === 70
-            || kind === 9;
-    }
-    ts.isModuleName = isModuleName;
-    function isBindingName(node) {
-        var kind = node.kind;
-        return kind === 70
-            || kind === 168
-            || kind === 169;
-    }
-    ts.isBindingName = isBindingName;
-    function isTypeParameter(node) {
-        return node.kind === 142;
-    }
-    ts.isTypeParameter = isTypeParameter;
-    function isParameter(node) {
-        return node.kind === 143;
-    }
-    ts.isParameter = isParameter;
-    function isDecorator(node) {
-        return node.kind === 144;
-    }
-    ts.isDecorator = isDecorator;
-    function isMethodDeclaration(node) {
-        return node.kind === 148;
-    }
-    ts.isMethodDeclaration = isMethodDeclaration;
-    function isClassElement(node) {
-        var kind = node.kind;
-        return kind === 149
-            || kind === 146
-            || kind === 148
-            || kind === 150
-            || kind === 151
-            || kind === 154
-            || kind === 199;
-    }
-    ts.isClassElement = isClassElement;
-    function isObjectLiteralElementLike(node) {
-        var kind = node.kind;
-        return kind === 253
-            || kind === 254
-            || kind === 148
-            || kind === 150
-            || kind === 151
-            || kind === 240;
-    }
-    ts.isObjectLiteralElementLike = isObjectLiteralElementLike;
-    function isTypeNodeKind(kind) {
-        return (kind >= 155 && kind <= 167)
-            || kind === 118
-            || kind === 131
-            || kind === 121
-            || kind === 133
-            || kind === 134
-            || kind === 104
-            || kind === 128
-            || kind === 195;
-    }
-    function isTypeNode(node) {
-        return isTypeNodeKind(node.kind);
-    }
-    ts.isTypeNode = isTypeNode;
-    function isBindingPattern(node) {
-        if (node) {
-            var kind = node.kind;
-            return kind === 169
-                || kind === 168;
-        }
-        return false;
-    }
-    ts.isBindingPattern = isBindingPattern;
-    function isBindingElement(node) {
-        return node.kind === 170;
-    }
-    ts.isBindingElement = isBindingElement;
-    function isArrayBindingElement(node) {
-        var kind = node.kind;
-        return kind === 170
-            || kind === 194;
-    }
-    ts.isArrayBindingElement = isArrayBindingElement;
-    function isPropertyAccessExpression(node) {
-        return node.kind === 173;
-    }
-    ts.isPropertyAccessExpression = isPropertyAccessExpression;
-    function isElementAccessExpression(node) {
-        return node.kind === 174;
-    }
-    ts.isElementAccessExpression = isElementAccessExpression;
-    function isBinaryExpression(node) {
-        return node.kind === 188;
-    }
-    ts.isBinaryExpression = isBinaryExpression;
-    function isConditionalExpression(node) {
-        return node.kind === 189;
-    }
-    ts.isConditionalExpression = isConditionalExpression;
-    function isCallExpression(node) {
-        return node.kind === 175;
-    }
-    ts.isCallExpression = isCallExpression;
-    function isTemplateLiteral(node) {
-        var kind = node.kind;
-        return kind === 190
-            || kind === 12;
-    }
-    ts.isTemplateLiteral = isTemplateLiteral;
-    function isSpreadElementExpression(node) {
-        return node.kind === 192;
-    }
-    ts.isSpreadElementExpression = isSpreadElementExpression;
-    function isExpressionWithTypeArguments(node) {
-        return node.kind === 195;
-    }
-    ts.isExpressionWithTypeArguments = isExpressionWithTypeArguments;
-    function isLeftHandSideExpressionKind(kind) {
-        return kind === 173
-            || kind === 174
-            || kind === 176
-            || kind === 175
-            || kind === 242
-            || kind === 243
-            || kind === 177
-            || kind === 171
-            || kind === 179
-            || kind === 172
-            || kind === 193
-            || kind === 180
-            || kind === 70
-            || kind === 11
-            || kind === 8
-            || kind === 9
-            || kind === 12
-            || kind === 190
-            || kind === 85
-            || kind === 94
-            || kind === 98
-            || kind === 100
-            || kind === 96
-            || kind === 197;
-    }
-    function isLeftHandSideExpression(node) {
-        return isLeftHandSideExpressionKind(ts.skipPartiallyEmittedExpressions(node).kind);
-    }
-    ts.isLeftHandSideExpression = isLeftHandSideExpression;
-    function isUnaryExpressionKind(kind) {
-        return kind === 186
-            || kind === 187
-            || kind === 182
-            || kind === 183
-            || kind === 184
-            || kind === 185
-            || kind === 178
-            || isLeftHandSideExpressionKind(kind);
-    }
-    function isUnaryExpression(node) {
-        return isUnaryExpressionKind(ts.skipPartiallyEmittedExpressions(node).kind);
-    }
-    ts.isUnaryExpression = isUnaryExpression;
-    function isExpressionKind(kind) {
-        return kind === 189
-            || kind === 191
-            || kind === 181
-            || kind === 188
-            || kind === 192
-            || kind === 196
-            || kind === 194
-            || isUnaryExpressionKind(kind);
-    }
-    function isExpression(node) {
-        return isExpressionKind(ts.skipPartiallyEmittedExpressions(node).kind);
-    }
-    ts.isExpression = isExpression;
-    function isAssertionExpression(node) {
-        var kind = node.kind;
-        return kind === 178
-            || kind === 196;
-    }
-    ts.isAssertionExpression = isAssertionExpression;
-    function isPartiallyEmittedExpression(node) {
-        return node.kind === 288;
-    }
-    ts.isPartiallyEmittedExpression = isPartiallyEmittedExpression;
-    function isNotEmittedStatement(node) {
-        return node.kind === 287;
-    }
-    ts.isNotEmittedStatement = isNotEmittedStatement;
-    function isNotEmittedOrPartiallyEmittedNode(node) {
-        return isNotEmittedStatement(node)
-            || isPartiallyEmittedExpression(node);
-    }
-    ts.isNotEmittedOrPartiallyEmittedNode = isNotEmittedOrPartiallyEmittedNode;
-    function isOmittedExpression(node) {
-        return node.kind === 194;
-    }
-    ts.isOmittedExpression = isOmittedExpression;
-    function isTemplateSpan(node) {
-        return node.kind === 198;
-    }
-    ts.isTemplateSpan = isTemplateSpan;
-    function isBlock(node) {
-        return node.kind === 200;
-    }
-    ts.isBlock = isBlock;
-    function isConciseBody(node) {
-        return isBlock(node)
-            || isExpression(node);
-    }
-    ts.isConciseBody = isConciseBody;
-    function isFunctionBody(node) {
-        return isBlock(node);
-    }
-    ts.isFunctionBody = isFunctionBody;
-    function isForInitializer(node) {
-        return isVariableDeclarationList(node)
-            || isExpression(node);
-    }
-    ts.isForInitializer = isForInitializer;
-    function isVariableDeclaration(node) {
-        return node.kind === 219;
-    }
-    ts.isVariableDeclaration = isVariableDeclaration;
-    function isVariableDeclarationList(node) {
-        return node.kind === 220;
-    }
-    ts.isVariableDeclarationList = isVariableDeclarationList;
-    function isCaseBlock(node) {
-        return node.kind === 228;
-    }
-    ts.isCaseBlock = isCaseBlock;
-    function isModuleBody(node) {
-        var kind = node.kind;
-        return kind === 227
-            || kind === 226;
-    }
-    ts.isModuleBody = isModuleBody;
-    function isImportEqualsDeclaration(node) {
-        return node.kind === 230;
-    }
-    ts.isImportEqualsDeclaration = isImportEqualsDeclaration;
-    function isImportClause(node) {
-        return node.kind === 232;
-    }
-    ts.isImportClause = isImportClause;
-    function isNamedImportBindings(node) {
-        var kind = node.kind;
-        return kind === 234
-            || kind === 233;
-    }
-    ts.isNamedImportBindings = isNamedImportBindings;
-    function isImportSpecifier(node) {
-        return node.kind === 235;
-    }
-    ts.isImportSpecifier = isImportSpecifier;
-    function isNamedExports(node) {
-        return node.kind === 238;
-    }
-    ts.isNamedExports = isNamedExports;
-    function isExportSpecifier(node) {
-        return node.kind === 239;
-    }
-    ts.isExportSpecifier = isExportSpecifier;
-    function isModuleOrEnumDeclaration(node) {
-        return node.kind === 226 || node.kind === 225;
-    }
-    ts.isModuleOrEnumDeclaration = isModuleOrEnumDeclaration;
-    function isDeclarationKind(kind) {
-        return kind === 181
-            || kind === 170
-            || kind === 222
-            || kind === 193
-            || kind === 149
-            || kind === 225
-            || kind === 255
-            || kind === 239
-            || kind === 221
-            || kind === 180
-            || kind === 150
-            || kind === 232
-            || kind === 230
-            || kind === 235
-            || kind === 223
-            || kind === 148
-            || kind === 147
-            || kind === 226
-            || kind === 229
-            || kind === 233
-            || kind === 143
-            || kind === 253
-            || kind === 146
-            || kind === 145
-            || kind === 151
-            || kind === 254
-            || kind === 224
-            || kind === 142
-            || kind === 219
-            || kind === 279;
-    }
-    function isDeclarationStatementKind(kind) {
-        return kind === 221
-            || kind === 240
-            || kind === 222
-            || kind === 223
-            || kind === 224
-            || kind === 225
-            || kind === 226
-            || kind === 231
-            || kind === 230
-            || kind === 237
-            || kind === 236
-            || kind === 229;
-    }
-    function isStatementKindButNotDeclarationKind(kind) {
-        return kind === 211
-            || kind === 210
-            || kind === 218
-            || kind === 205
-            || kind === 203
-            || kind === 202
-            || kind === 208
-            || kind === 209
-            || kind === 207
-            || kind === 204
-            || kind === 215
-            || kind === 212
-            || kind === 214
-            || kind === 216
-            || kind === 217
-            || kind === 201
-            || kind === 206
-            || kind === 213
-            || kind === 287;
-    }
-    function isDeclaration(node) {
-        return isDeclarationKind(node.kind);
-    }
-    ts.isDeclaration = isDeclaration;
-    function isDeclarationStatement(node) {
-        return isDeclarationStatementKind(node.kind);
-    }
-    ts.isDeclarationStatement = isDeclarationStatement;
-    function isStatementButNotDeclaration(node) {
-        return isStatementKindButNotDeclarationKind(node.kind);
-    }
-    ts.isStatementButNotDeclaration = isStatementButNotDeclaration;
-    function isStatement(node) {
-        var kind = node.kind;
-        return isStatementKindButNotDeclarationKind(kind)
-            || isDeclarationStatementKind(kind)
-            || kind === 200;
-    }
-    ts.isStatement = isStatement;
-    function isModuleReference(node) {
-        var kind = node.kind;
-        return kind === 241
-            || kind === 140
-            || kind === 70;
-    }
-    ts.isModuleReference = isModuleReference;
-    function isJsxOpeningElement(node) {
-        return node.kind === 244;
-    }
-    ts.isJsxOpeningElement = isJsxOpeningElement;
-    function isJsxClosingElement(node) {
-        return node.kind === 245;
-    }
-    ts.isJsxClosingElement = isJsxClosingElement;
-    function isJsxTagNameExpression(node) {
-        var kind = node.kind;
-        return kind === 98
-            || kind === 70
-            || kind === 173;
-    }
-    ts.isJsxTagNameExpression = isJsxTagNameExpression;
-    function isJsxChild(node) {
-        var kind = node.kind;
-        return kind === 242
-            || kind === 248
-            || kind === 243
-            || kind === 10;
-    }
-    ts.isJsxChild = isJsxChild;
-    function isJsxAttributeLike(node) {
-        var kind = node.kind;
-        return kind === 246
-            || kind === 247;
-    }
-    ts.isJsxAttributeLike = isJsxAttributeLike;
-    function isJsxSpreadAttribute(node) {
-        return node.kind === 247;
-    }
-    ts.isJsxSpreadAttribute = isJsxSpreadAttribute;
-    function isJsxAttribute(node) {
-        return node.kind === 246;
-    }
-    ts.isJsxAttribute = isJsxAttribute;
-    function isStringLiteralOrJsxExpression(node) {
-        var kind = node.kind;
-        return kind === 9
-            || kind === 248;
-    }
-    ts.isStringLiteralOrJsxExpression = isStringLiteralOrJsxExpression;
-    function isCaseOrDefaultClause(node) {
-        var kind = node.kind;
-        return kind === 249
-            || kind === 250;
-    }
-    ts.isCaseOrDefaultClause = isCaseOrDefaultClause;
-    function isHeritageClause(node) {
-        return node.kind === 251;
-    }
-    ts.isHeritageClause = isHeritageClause;
-    function isCatchClause(node) {
-        return node.kind === 252;
-    }
-    ts.isCatchClause = isCatchClause;
-    function isPropertyAssignment(node) {
-        return node.kind === 253;
-    }
-    ts.isPropertyAssignment = isPropertyAssignment;
-    function isShorthandPropertyAssignment(node) {
-        return node.kind === 254;
-    }
-    ts.isShorthandPropertyAssignment = isShorthandPropertyAssignment;
-    function isEnumMember(node) {
-        return node.kind === 255;
-    }
-    ts.isEnumMember = isEnumMember;
-    function isSourceFile(node) {
-        return node.kind === 256;
-    }
-    ts.isSourceFile = isSourceFile;
-    function isWatchSet(options) {
-        return options.watch && options.hasOwnProperty("watch");
-    }
-    ts.isWatchSet = isWatchSet;
-})(ts || (ts = {}));
-(function (ts) {
-    function getDefaultLibFileName(options) {
-        switch (options.target) {
-            case 4:
-                return "lib.es2017.d.ts";
-            case 3:
-                return "lib.es2016.d.ts";
-            case 2:
-                return "lib.es6.d.ts";
-            default:
-                return "lib.d.ts";
-        }
-    }
-    ts.getDefaultLibFileName = getDefaultLibFileName;
-    function textSpanEnd(span) {
-        return span.start + span.length;
-    }
-    ts.textSpanEnd = textSpanEnd;
-    function textSpanIsEmpty(span) {
-        return span.length === 0;
-    }
-    ts.textSpanIsEmpty = textSpanIsEmpty;
-    function textSpanContainsPosition(span, position) {
-        return position >= span.start && position < textSpanEnd(span);
-    }
-    ts.textSpanContainsPosition = textSpanContainsPosition;
-    function textSpanContainsTextSpan(span, other) {
-        return other.start >= span.start && textSpanEnd(other) <= textSpanEnd(span);
-    }
-    ts.textSpanContainsTextSpan = textSpanContainsTextSpan;
-    function textSpanOverlapsWith(span, other) {
-        var overlapStart = Math.max(span.start, other.start);
-        var overlapEnd = Math.min(textSpanEnd(span), textSpanEnd(other));
-        return overlapStart < overlapEnd;
-    }
-    ts.textSpanOverlapsWith = textSpanOverlapsWith;
-    function textSpanOverlap(span1, span2) {
-        var overlapStart = Math.max(span1.start, span2.start);
-        var overlapEnd = Math.min(textSpanEnd(span1), textSpanEnd(span2));
-        if (overlapStart < overlapEnd) {
-            return createTextSpanFromBounds(overlapStart, overlapEnd);
-        }
-        return undefined;
-    }
-    ts.textSpanOverlap = textSpanOverlap;
-    function textSpanIntersectsWithTextSpan(span, other) {
-        return other.start <= textSpanEnd(span) && textSpanEnd(other) >= span.start;
-    }
-    ts.textSpanIntersectsWithTextSpan = textSpanIntersectsWithTextSpan;
-    function textSpanIntersectsWith(span, start, length) {
-        var end = start + length;
-        return start <= textSpanEnd(span) && end >= span.start;
-    }
-    ts.textSpanIntersectsWith = textSpanIntersectsWith;
-    function decodedTextSpanIntersectsWith(start1, length1, start2, length2) {
-        var end1 = start1 + length1;
-        var end2 = start2 + length2;
-        return start2 <= end1 && end2 >= start1;
-    }
-    ts.decodedTextSpanIntersectsWith = decodedTextSpanIntersectsWith;
-    function textSpanIntersectsWithPosition(span, position) {
-        return position <= textSpanEnd(span) && position >= span.start;
-    }
-    ts.textSpanIntersectsWithPosition = textSpanIntersectsWithPosition;
-    function textSpanIntersection(span1, span2) {
-        var intersectStart = Math.max(span1.start, span2.start);
-        var intersectEnd = Math.min(textSpanEnd(span1), textSpanEnd(span2));
-        if (intersectStart <= intersectEnd) {
-            return createTextSpanFromBounds(intersectStart, intersectEnd);
-        }
-        return undefined;
-    }
-    ts.textSpanIntersection = textSpanIntersection;
-    function createTextSpan(start, length) {
-        if (start < 0) {
-            throw new Error("start < 0");
-        }
-        if (length < 0) {
-            throw new Error("length < 0");
-        }
-        return { start: start, length: length };
-    }
-    ts.createTextSpan = createTextSpan;
-    function createTextSpanFromBounds(start, end) {
-        return createTextSpan(start, end - start);
-    }
-    ts.createTextSpanFromBounds = createTextSpanFromBounds;
-    function textChangeRangeNewSpan(range) {
-        return createTextSpan(range.span.start, range.newLength);
-    }
-    ts.textChangeRangeNewSpan = textChangeRangeNewSpan;
-    function textChangeRangeIsUnchanged(range) {
-        return textSpanIsEmpty(range.span) && range.newLength === 0;
-    }
-    ts.textChangeRangeIsUnchanged = textChangeRangeIsUnchanged;
-    function createTextChangeRange(span, newLength) {
-        if (newLength < 0) {
-            throw new Error("newLength < 0");
-        }
-        return { span: span, newLength: newLength };
-    }
-    ts.createTextChangeRange = createTextChangeRange;
-    ts.unchangedTextChangeRange = createTextChangeRange(createTextSpan(0, 0), 0);
-    function collapseTextChangeRangesAcrossMultipleVersions(changes) {
-        if (changes.length === 0) {
-            return ts.unchangedTextChangeRange;
-        }
-        if (changes.length === 1) {
-            return changes[0];
-        }
-        var change0 = changes[0];
-        var oldStartN = change0.span.start;
-        var oldEndN = textSpanEnd(change0.span);
-        var newEndN = oldStartN + change0.newLength;
-        for (var i = 1; i < changes.length; i++) {
-            var nextChange = changes[i];
-            var oldStart1 = oldStartN;
-            var oldEnd1 = oldEndN;
-            var newEnd1 = newEndN;
-            var oldStart2 = nextChange.span.start;
-            var oldEnd2 = textSpanEnd(nextChange.span);
-            var newEnd2 = oldStart2 + nextChange.newLength;
-            oldStartN = Math.min(oldStart1, oldStart2);
-            oldEndN = Math.max(oldEnd1, oldEnd1 + (oldEnd2 - newEnd1));
-            newEndN = Math.max(newEnd2, newEnd2 + (newEnd1 - oldEnd2));
-        }
-        return createTextChangeRange(createTextSpanFromBounds(oldStartN, oldEndN), newEndN - oldStartN);
-    }
-    ts.collapseTextChangeRangesAcrossMultipleVersions = collapseTextChangeRangesAcrossMultipleVersions;
-    function getTypeParameterOwner(d) {
-        if (d && d.kind === 142) {
-            for (var current = d; current; current = current.parent) {
-                if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 223) {
-                    return current;
-                }
-            }
-        }
-    }
-    ts.getTypeParameterOwner = getTypeParameterOwner;
-    function isParameterPropertyDeclaration(node) {
-        return ts.hasModifier(node, 92) && node.parent.kind === 149 && ts.isClassLike(node.parent.parent);
-    }
-    ts.isParameterPropertyDeclaration = isParameterPropertyDeclaration;
-    function walkUpBindingElementsAndPatterns(node) {
-        while (node && (node.kind === 170 || ts.isBindingPattern(node))) {
-            node = node.parent;
-        }
-        return node;
-    }
-    function getCombinedModifierFlags(node) {
-        node = walkUpBindingElementsAndPatterns(node);
-        var flags = ts.getModifierFlags(node);
-        if (node.kind === 219) {
-            node = node.parent;
-        }
-        if (node && node.kind === 220) {
-            flags |= ts.getModifierFlags(node);
-            node = node.parent;
-        }
-        if (node && node.kind === 201) {
-            flags |= ts.getModifierFlags(node);
-        }
-        return flags;
-    }
-    ts.getCombinedModifierFlags = getCombinedModifierFlags;
-    function getCombinedNodeFlags(node) {
-        node = walkUpBindingElementsAndPatterns(node);
-        var flags = node.flags;
-        if (node.kind === 219) {
-            node = node.parent;
-        }
-        if (node && node.kind === 220) {
-            flags |= node.flags;
-            node = node.parent;
-        }
-        if (node && node.kind === 201) {
-            flags |= node.flags;
-        }
-        return flags;
-    }
-    ts.getCombinedNodeFlags = getCombinedNodeFlags;
-})(ts || (ts = {}));
-var ts;
 (function (ts) {
     function tokenIsIdentifierOrKeyword(token) {
         return token >= 70;
@@ -8088,7 +3206,7 @@ var ts;
         "false": 85,
         "finally": 86,
         "for": 87,
-        "from": 137,
+        "from": 138,
         "function": 88,
         "get": 124,
         "if": 89,
@@ -8098,34 +3216,35 @@ var ts;
         "instanceof": 92,
         "interface": 108,
         "is": 125,
+        "keyof": 126,
         "let": 109,
-        "module": 126,
-        "namespace": 127,
-        "never": 128,
+        "module": 127,
+        "namespace": 128,
+        "never": 129,
         "new": 93,
         "null": 94,
-        "number": 131,
+        "number": 132,
         "package": 110,
         "private": 111,
         "protected": 112,
         "public": 113,
-        "readonly": 129,
-        "require": 130,
-        "global": 138,
+        "readonly": 130,
+        "require": 131,
+        "global": 139,
         "return": 95,
-        "set": 132,
+        "set": 133,
         "static": 114,
-        "string": 133,
+        "string": 134,
         "super": 96,
         "switch": 97,
-        "symbol": 134,
+        "symbol": 135,
         "this": 98,
         "throw": 99,
         "true": 100,
         "try": 101,
-        "type": 135,
+        "type": 136,
         "typeof": 102,
-        "undefined": 136,
+        "undefined": 137,
         "var": 103,
         "void": 104,
         "while": 105,
@@ -8133,7 +3252,7 @@ var ts;
         "yield": 115,
         "async": 119,
         "await": 120,
-        "of": 139,
+        "of": 140,
         "{": 16,
         "}": 17,
         "(": 18,
@@ -8228,8 +3347,8 @@ var ts;
     }
     function makeReverseMap(source) {
         var result = [];
-        for (var name_8 in source) {
-            result[source[name_8]] = name_8;
+        for (var name_4 in source) {
+            result[source[name_4]] = name_4;
         }
         return result;
     }
@@ -9516,10 +4635,13 @@ var ts;
                 case 44:
                     pos++;
                     return token = 25;
+                case 46:
+                    pos++;
+                    return token = 22;
             }
-            if (isIdentifierStart(ch, 4)) {
+            if (isIdentifierStart(ch, 5)) {
                 pos++;
-                while (isIdentifierPart(text.charCodeAt(pos), 4) && pos < end) {
+                while (isIdentifierPart(text.charCodeAt(pos), 5) && pos < end) {
                     pos++;
                 }
                 return token = 70;
@@ -9607,11 +4729,5885 @@ var ts;
     ts.createScanner = createScanner;
 })(ts || (ts = {}));
 var ts;
+(function (ts) {
+    ts.compileOnSaveCommandLineOption = { name: "compileOnSave", type: "boolean" };
+    ts.optionDeclarations = [
+        {
+            name: "charset",
+            type: "string",
+        },
+        ts.compileOnSaveCommandLineOption,
+        {
+            name: "declaration",
+            shortName: "d",
+            type: "boolean",
+            description: ts.Diagnostics.Generates_corresponding_d_ts_file,
+        },
+        {
+            name: "declarationDir",
+            type: "string",
+            isFilePath: true,
+            paramType: ts.Diagnostics.DIRECTORY,
+        },
+        {
+            name: "diagnostics",
+            type: "boolean",
+        },
+        {
+            name: "extendedDiagnostics",
+            type: "boolean",
+            experimental: true
+        },
+        {
+            name: "emitBOM",
+            type: "boolean"
+        },
+        {
+            name: "help",
+            shortName: "h",
+            type: "boolean",
+            description: ts.Diagnostics.Print_this_message,
+        },
+        {
+            name: "help",
+            shortName: "?",
+            type: "boolean"
+        },
+        {
+            name: "init",
+            type: "boolean",
+            description: ts.Diagnostics.Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file,
+        },
+        {
+            name: "inlineSourceMap",
+            type: "boolean",
+        },
+        {
+            name: "inlineSources",
+            type: "boolean",
+        },
+        {
+            name: "jsx",
+            type: ts.createMap({
+                "preserve": 1,
+                "react": 2
+            }),
+            paramType: ts.Diagnostics.KIND,
+            description: ts.Diagnostics.Specify_JSX_code_generation_Colon_preserve_or_react,
+        },
+        {
+            name: "reactNamespace",
+            type: "string",
+            description: ts.Diagnostics.Specify_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit
+        },
+        {
+            name: "jsxFactory",
+            type: "string",
+            description: ts.Diagnostics.Specify_the_JSX_factory_function_to_use_when_targeting_react_JSX_emit_e_g_React_createElement_or_h
+        },
+        {
+            name: "listFiles",
+            type: "boolean",
+        },
+        {
+            name: "locale",
+            type: "string",
+        },
+        {
+            name: "mapRoot",
+            type: "string",
+            isFilePath: true,
+            description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations,
+            paramType: ts.Diagnostics.LOCATION,
+        },
+        {
+            name: "module",
+            shortName: "m",
+            type: ts.createMap({
+                "none": ts.ModuleKind.None,
+                "commonjs": ts.ModuleKind.CommonJS,
+                "amd": ts.ModuleKind.AMD,
+                "system": ts.ModuleKind.System,
+                "umd": ts.ModuleKind.UMD,
+                "es6": ts.ModuleKind.ES2015,
+                "es2015": ts.ModuleKind.ES2015,
+            }),
+            description: ts.Diagnostics.Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015,
+            paramType: ts.Diagnostics.KIND,
+        },
+        {
+            name: "newLine",
+            type: ts.createMap({
+                "crlf": 0,
+                "lf": 1
+            }),
+            description: ts.Diagnostics.Specify_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix,
+            paramType: ts.Diagnostics.NEWLINE,
+        },
+        {
+            name: "noEmit",
+            type: "boolean",
+            description: ts.Diagnostics.Do_not_emit_outputs,
+        },
+        {
+            name: "noEmitHelpers",
+            type: "boolean"
+        },
+        {
+            name: "noEmitOnError",
+            type: "boolean",
+            description: ts.Diagnostics.Do_not_emit_outputs_if_any_errors_were_reported,
+        },
+        {
+            name: "noErrorTruncation",
+            type: "boolean"
+        },
+        {
+            name: "noImplicitAny",
+            type: "boolean",
+            description: ts.Diagnostics.Raise_error_on_expressions_and_declarations_with_an_implied_any_type,
+        },
+        {
+            name: "noImplicitThis",
+            type: "boolean",
+            description: ts.Diagnostics.Raise_error_on_this_expressions_with_an_implied_any_type,
+        },
+        {
+            name: "noUnusedLocals",
+            type: "boolean",
+            description: ts.Diagnostics.Report_errors_on_unused_locals,
+        },
+        {
+            name: "noUnusedParameters",
+            type: "boolean",
+            description: ts.Diagnostics.Report_errors_on_unused_parameters,
+        },
+        {
+            name: "noLib",
+            type: "boolean",
+        },
+        {
+            name: "noResolve",
+            type: "boolean",
+        },
+        {
+            name: "skipDefaultLibCheck",
+            type: "boolean",
+        },
+        {
+            name: "skipLibCheck",
+            type: "boolean",
+            description: ts.Diagnostics.Skip_type_checking_of_declaration_files,
+        },
+        {
+            name: "out",
+            type: "string",
+            isFilePath: false,
+            paramType: ts.Diagnostics.FILE,
+        },
+        {
+            name: "outFile",
+            type: "string",
+            isFilePath: true,
+            description: ts.Diagnostics.Concatenate_and_emit_output_to_single_file,
+            paramType: ts.Diagnostics.FILE,
+        },
+        {
+            name: "outDir",
+            type: "string",
+            isFilePath: true,
+            description: ts.Diagnostics.Redirect_output_structure_to_the_directory,
+            paramType: ts.Diagnostics.DIRECTORY,
+        },
+        {
+            name: "preserveConstEnums",
+            type: "boolean",
+            description: ts.Diagnostics.Do_not_erase_const_enum_declarations_in_generated_code
+        },
+        {
+            name: "pretty",
+            description: ts.Diagnostics.Stylize_errors_and_messages_using_color_and_context_experimental,
+            type: "boolean"
+        },
+        {
+            name: "project",
+            shortName: "p",
+            type: "string",
+            isFilePath: true,
+            description: ts.Diagnostics.Compile_the_project_in_the_given_directory,
+            paramType: ts.Diagnostics.DIRECTORY
+        },
+        {
+            name: "removeComments",
+            type: "boolean",
+            description: ts.Diagnostics.Do_not_emit_comments_to_output,
+        },
+        {
+            name: "rootDir",
+            type: "string",
+            isFilePath: true,
+            paramType: ts.Diagnostics.LOCATION,
+            description: ts.Diagnostics.Specify_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir,
+        },
+        {
+            name: "isolatedModules",
+            type: "boolean",
+        },
+        {
+            name: "sourceMap",
+            type: "boolean",
+            description: ts.Diagnostics.Generates_corresponding_map_file,
+        },
+        {
+            name: "sourceRoot",
+            type: "string",
+            isFilePath: true,
+            description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations,
+            paramType: ts.Diagnostics.LOCATION,
+        },
+        {
+            name: "suppressExcessPropertyErrors",
+            type: "boolean",
+            description: ts.Diagnostics.Suppress_excess_property_checks_for_object_literals,
+            experimental: true
+        },
+        {
+            name: "suppressImplicitAnyIndexErrors",
+            type: "boolean",
+            description: ts.Diagnostics.Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures,
+        },
+        {
+            name: "stripInternal",
+            type: "boolean",
+            description: ts.Diagnostics.Do_not_emit_declarations_for_code_that_has_an_internal_annotation,
+            experimental: true
+        },
+        {
+            name: "target",
+            shortName: "t",
+            type: ts.createMap({
+                "es3": 0,
+                "es5": 1,
+                "es6": 2,
+                "es2015": 2,
+                "es2016": 3,
+                "es2017": 4,
+                "esnext": 5,
+            }),
+            description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015,
+            paramType: ts.Diagnostics.VERSION,
+        },
+        {
+            name: "version",
+            shortName: "v",
+            type: "boolean",
+            description: ts.Diagnostics.Print_the_compiler_s_version,
+        },
+        {
+            name: "watch",
+            shortName: "w",
+            type: "boolean",
+            description: ts.Diagnostics.Watch_input_files,
+        },
+        {
+            name: "experimentalDecorators",
+            type: "boolean",
+            description: ts.Diagnostics.Enables_experimental_support_for_ES7_decorators
+        },
+        {
+            name: "emitDecoratorMetadata",
+            type: "boolean",
+            experimental: true,
+            description: ts.Diagnostics.Enables_experimental_support_for_emitting_type_metadata_for_decorators
+        },
+        {
+            name: "moduleResolution",
+            type: ts.createMap({
+                "node": ts.ModuleResolutionKind.NodeJs,
+                "classic": ts.ModuleResolutionKind.Classic,
+            }),
+            description: ts.Diagnostics.Specify_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6,
+            paramType: ts.Diagnostics.STRATEGY,
+        },
+        {
+            name: "allowUnusedLabels",
+            type: "boolean",
+            description: ts.Diagnostics.Do_not_report_errors_on_unused_labels
+        },
+        {
+            name: "noImplicitReturns",
+            type: "boolean",
+            description: ts.Diagnostics.Report_error_when_not_all_code_paths_in_function_return_a_value
+        },
+        {
+            name: "noFallthroughCasesInSwitch",
+            type: "boolean",
+            description: ts.Diagnostics.Report_errors_for_fallthrough_cases_in_switch_statement
+        },
+        {
+            name: "allowUnreachableCode",
+            type: "boolean",
+            description: ts.Diagnostics.Do_not_report_errors_on_unreachable_code
+        },
+        {
+            name: "forceConsistentCasingInFileNames",
+            type: "boolean",
+            description: ts.Diagnostics.Disallow_inconsistently_cased_references_to_the_same_file
+        },
+        {
+            name: "baseUrl",
+            type: "string",
+            isFilePath: true,
+            description: ts.Diagnostics.Base_directory_to_resolve_non_absolute_module_names
+        },
+        {
+            name: "paths",
+            type: "object",
+            isTSConfigOnly: true
+        },
+        {
+            name: "rootDirs",
+            type: "list",
+            isTSConfigOnly: true,
+            element: {
+                name: "rootDirs",
+                type: "string",
+                isFilePath: true
+            }
+        },
+        {
+            name: "typeRoots",
+            type: "list",
+            element: {
+                name: "typeRoots",
+                type: "string",
+                isFilePath: true
+            }
+        },
+        {
+            name: "types",
+            type: "list",
+            element: {
+                name: "types",
+                type: "string"
+            },
+            description: ts.Diagnostics.Type_declaration_files_to_be_included_in_compilation
+        },
+        {
+            name: "traceResolution",
+            type: "boolean",
+            description: ts.Diagnostics.Enable_tracing_of_the_name_resolution_process
+        },
+        {
+            name: "allowJs",
+            type: "boolean",
+            description: ts.Diagnostics.Allow_javascript_files_to_be_compiled
+        },
+        {
+            name: "allowSyntheticDefaultImports",
+            type: "boolean",
+            description: ts.Diagnostics.Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typechecking
+        },
+        {
+            name: "noImplicitUseStrict",
+            type: "boolean",
+            description: ts.Diagnostics.Do_not_emit_use_strict_directives_in_module_output
+        },
+        {
+            name: "maxNodeModuleJsDepth",
+            type: "number",
+            description: ts.Diagnostics.The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files
+        },
+        {
+            name: "listEmittedFiles",
+            type: "boolean"
+        },
+        {
+            name: "lib",
+            type: "list",
+            element: {
+                name: "lib",
+                type: ts.createMap({
+                    "es5": "lib.es5.d.ts",
+                    "es6": "lib.es2015.d.ts",
+                    "es2015": "lib.es2015.d.ts",
+                    "es7": "lib.es2016.d.ts",
+                    "es2016": "lib.es2016.d.ts",
+                    "es2017": "lib.es2017.d.ts",
+                    "dom": "lib.dom.d.ts",
+                    "dom.iterable": "lib.dom.iterable.d.ts",
+                    "webworker": "lib.webworker.d.ts",
+                    "scripthost": "lib.scripthost.d.ts",
+                    "es2015.core": "lib.es2015.core.d.ts",
+                    "es2015.collection": "lib.es2015.collection.d.ts",
+                    "es2015.generator": "lib.es2015.generator.d.ts",
+                    "es2015.iterable": "lib.es2015.iterable.d.ts",
+                    "es2015.promise": "lib.es2015.promise.d.ts",
+                    "es2015.proxy": "lib.es2015.proxy.d.ts",
+                    "es2015.reflect": "lib.es2015.reflect.d.ts",
+                    "es2015.symbol": "lib.es2015.symbol.d.ts",
+                    "es2015.symbol.wellknown": "lib.es2015.symbol.wellknown.d.ts",
+                    "es2016.array.include": "lib.es2016.array.include.d.ts",
+                    "es2017.object": "lib.es2017.object.d.ts",
+                    "es2017.sharedmemory": "lib.es2017.sharedmemory.d.ts",
+                    "es2017.string": "lib.es2017.string.d.ts",
+                }),
+            },
+            description: ts.Diagnostics.Specify_library_files_to_be_included_in_the_compilation_Colon
+        },
+        {
+            name: "disableSizeLimit",
+            type: "boolean"
+        },
+        {
+            name: "strictNullChecks",
+            type: "boolean",
+            description: ts.Diagnostics.Enable_strict_null_checks
+        },
+        {
+            name: "importHelpers",
+            type: "boolean",
+            description: ts.Diagnostics.Import_emit_helpers_from_tslib
+        },
+        {
+            name: "alwaysStrict",
+            type: "boolean",
+            description: ts.Diagnostics.Parse_in_strict_mode_and_emit_use_strict_for_each_source_file
+        }
+    ];
+    ts.typingOptionDeclarations = [
+        {
+            name: "enableAutoDiscovery",
+            type: "boolean",
+        },
+        {
+            name: "include",
+            type: "list",
+            element: {
+                name: "include",
+                type: "string"
+            }
+        },
+        {
+            name: "exclude",
+            type: "list",
+            element: {
+                name: "exclude",
+                type: "string"
+            }
+        }
+    ];
+    ts.defaultInitCompilerOptions = {
+        module: ts.ModuleKind.CommonJS,
+        target: 1,
+        noImplicitAny: false,
+        sourceMap: false,
+    };
+    var optionNameMapCache;
+    function getOptionNameMap() {
+        if (optionNameMapCache) {
+            return optionNameMapCache;
+        }
+        var optionNameMap = ts.createMap();
+        var shortOptionNames = ts.createMap();
+        ts.forEach(ts.optionDeclarations, function (option) {
+            optionNameMap[option.name.toLowerCase()] = option;
+            if (option.shortName) {
+                shortOptionNames[option.shortName] = option.name;
+            }
+        });
+        optionNameMapCache = { optionNameMap: optionNameMap, shortOptionNames: shortOptionNames };
+        return optionNameMapCache;
+    }
+    ts.getOptionNameMap = getOptionNameMap;
+    function createCompilerDiagnosticForInvalidCustomType(opt) {
+        var namesOfType = Object.keys(opt.type).map(function (key) { return "'" + key + "'"; }).join(", ");
+        return ts.createCompilerDiagnostic(ts.Diagnostics.Argument_for_0_option_must_be_Colon_1, "--" + opt.name, namesOfType);
+    }
+    ts.createCompilerDiagnosticForInvalidCustomType = createCompilerDiagnosticForInvalidCustomType;
+    function parseCustomTypeOption(opt, value, errors) {
+        var key = trimString((value || "")).toLowerCase();
+        var map = opt.type;
+        if (key in map) {
+            return map[key];
+        }
+        else {
+            errors.push(createCompilerDiagnosticForInvalidCustomType(opt));
+        }
+    }
+    ts.parseCustomTypeOption = parseCustomTypeOption;
+    function parseListTypeOption(opt, value, errors) {
+        if (value === void 0) { value = ""; }
+        value = trimString(value);
+        if (ts.startsWith(value, "-")) {
+            return undefined;
+        }
+        if (value === "") {
+            return [];
+        }
+        var values = value.split(",");
+        switch (opt.element.type) {
+            case "number":
+                return ts.map(values, parseInt);
+            case "string":
+                return ts.map(values, function (v) { return v || ""; });
+            default:
+                return ts.filter(ts.map(values, function (v) { return parseCustomTypeOption(opt.element, v, errors); }), function (v) { return !!v; });
+        }
+    }
+    ts.parseListTypeOption = parseListTypeOption;
+    function parseCommandLine(commandLine, readFile) {
+        var options = {};
+        var fileNames = [];
+        var errors = [];
+        var _a = getOptionNameMap(), optionNameMap = _a.optionNameMap, shortOptionNames = _a.shortOptionNames;
+        parseStrings(commandLine);
+        return {
+            options: options,
+            fileNames: fileNames,
+            errors: errors
+        };
+        function parseStrings(args) {
+            var i = 0;
+            while (i < args.length) {
+                var s = args[i];
+                i++;
+                if (s.charCodeAt(0) === 64) {
+                    parseResponseFile(s.slice(1));
+                }
+                else if (s.charCodeAt(0) === 45) {
+                    s = s.slice(s.charCodeAt(1) === 45 ? 2 : 1).toLowerCase();
+                    if (s in shortOptionNames) {
+                        s = shortOptionNames[s];
+                    }
+                    if (s in optionNameMap) {
+                        var opt = optionNameMap[s];
+                        if (opt.isTSConfigOnly) {
+                            errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_can_only_be_specified_in_tsconfig_json_file, opt.name));
+                        }
+                        else {
+                            if (!args[i] && opt.type !== "boolean") {
+                                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_expects_an_argument, opt.name));
+                            }
+                            switch (opt.type) {
+                                case "number":
+                                    options[opt.name] = parseInt(args[i]);
+                                    i++;
+                                    break;
+                                case "boolean":
+                                    var optValue = args[i];
+                                    options[opt.name] = optValue !== "false";
+                                    if (optValue === "false" || optValue === "true") {
+                                        i++;
+                                    }
+                                    break;
+                                case "string":
+                                    options[opt.name] = args[i] || "";
+                                    i++;
+                                    break;
+                                case "list":
+                                    var result = parseListTypeOption(opt, args[i], errors);
+                                    options[opt.name] = result || [];
+                                    if (result) {
+                                        i++;
+                                    }
+                                    break;
+                                default:
+                                    options[opt.name] = parseCustomTypeOption(opt, args[i], errors);
+                                    i++;
+                                    break;
+                            }
+                        }
+                    }
+                    else {
+                        errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unknown_compiler_option_0, s));
+                    }
+                }
+                else {
+                    fileNames.push(s);
+                }
+            }
+        }
+        function parseResponseFile(fileName) {
+            var text = readFile ? readFile(fileName) : ts.sys.readFile(fileName);
+            if (!text) {
+                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.File_0_not_found, fileName));
+                return;
+            }
+            var args = [];
+            var pos = 0;
+            while (true) {
+                while (pos < text.length && text.charCodeAt(pos) <= 32)
+                    pos++;
+                if (pos >= text.length)
+                    break;
+                var start = pos;
+                if (text.charCodeAt(start) === 34) {
+                    pos++;
+                    while (pos < text.length && text.charCodeAt(pos) !== 34)
+                        pos++;
+                    if (pos < text.length) {
+                        args.push(text.substring(start + 1, pos));
+                        pos++;
+                    }
+                    else {
+                        errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unterminated_quoted_string_in_response_file_0, fileName));
+                    }
+                }
+                else {
+                    while (text.charCodeAt(pos) > 32)
+                        pos++;
+                    args.push(text.substring(start, pos));
+                }
+            }
+            parseStrings(args);
+        }
+    }
+    ts.parseCommandLine = parseCommandLine;
+    function readConfigFile(fileName, readFile) {
+        var text = "";
+        try {
+            text = readFile(fileName);
+        }
+        catch (e) {
+            return { error: ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_read_file_0_Colon_1, fileName, e.message) };
+        }
+        return parseConfigFileTextToJson(fileName, text);
+    }
+    ts.readConfigFile = readConfigFile;
+    function parseConfigFileTextToJson(fileName, jsonText, stripComments) {
+        if (stripComments === void 0) { stripComments = true; }
+        try {
+            var jsonTextToParse = stripComments ? removeComments(jsonText) : jsonText;
+            return { config: /\S/.test(jsonTextToParse) ? JSON.parse(jsonTextToParse) : {} };
+        }
+        catch (e) {
+            return { error: ts.createCompilerDiagnostic(ts.Diagnostics.Failed_to_parse_file_0_Colon_1, fileName, e.message) };
+        }
+    }
+    ts.parseConfigFileTextToJson = parseConfigFileTextToJson;
+    function generateTSConfig(options, fileNames) {
+        var compilerOptions = ts.extend(options, ts.defaultInitCompilerOptions);
+        var configurations = {
+            compilerOptions: serializeCompilerOptions(compilerOptions)
+        };
+        if (fileNames && fileNames.length) {
+            configurations.files = fileNames;
+        }
+        return configurations;
+        function getCustomTypeMapOfCommandLineOption(optionDefinition) {
+            if (optionDefinition.type === "string" || optionDefinition.type === "number" || optionDefinition.type === "boolean") {
+                return undefined;
+            }
+            else if (optionDefinition.type === "list") {
+                return getCustomTypeMapOfCommandLineOption(optionDefinition.element);
+            }
+            else {
+                return optionDefinition.type;
+            }
+        }
+        function getNameOfCompilerOptionValue(value, customTypeMap) {
+            for (var key in customTypeMap) {
+                if (customTypeMap[key] === value) {
+                    return key;
+                }
+            }
+            return undefined;
+        }
+        function serializeCompilerOptions(options) {
+            var result = ts.createMap();
+            var optionsNameMap = getOptionNameMap().optionNameMap;
+            for (var name_5 in options) {
+                if (ts.hasProperty(options, name_5)) {
+                    switch (name_5) {
+                        case "init":
+                        case "watch":
+                        case "version":
+                        case "help":
+                        case "project":
+                            break;
+                        default:
+                            var value = options[name_5];
+                            var optionDefinition = optionsNameMap[name_5.toLowerCase()];
+                            if (optionDefinition) {
+                                var customTypeMap = getCustomTypeMapOfCommandLineOption(optionDefinition);
+                                if (!customTypeMap) {
+                                    result[name_5] = value;
+                                }
+                                else {
+                                    if (optionDefinition.type === "list") {
+                                        var convertedValue = [];
+                                        for (var _i = 0, _a = value; _i < _a.length; _i++) {
+                                            var element = _a[_i];
+                                            convertedValue.push(getNameOfCompilerOptionValue(element, customTypeMap));
+                                        }
+                                        result[name_5] = convertedValue;
+                                    }
+                                    else {
+                                        result[name_5] = getNameOfCompilerOptionValue(value, customTypeMap);
+                                    }
+                                }
+                            }
+                            break;
+                    }
+                }
+            }
+            return result;
+        }
+    }
+    ts.generateTSConfig = generateTSConfig;
+    function removeComments(jsonText) {
+        var output = "";
+        var scanner = ts.createScanner(1, false, 0, jsonText);
+        var token;
+        while ((token = scanner.scan()) !== 1) {
+            switch (token) {
+                case 2:
+                case 3:
+                    output += scanner.getTokenText().replace(/\S/g, " ");
+                    break;
+                default:
+                    output += scanner.getTokenText();
+                    break;
+            }
+        }
+        return output;
+    }
+    function parseJsonConfigFileContent(json, host, basePath, existingOptions, configFileName, resolutionStack) {
+        if (existingOptions === void 0) { existingOptions = {}; }
+        if (resolutionStack === void 0) { resolutionStack = []; }
+        var errors = [];
+        var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames);
+        var resolvedPath = ts.toPath(configFileName || "", basePath, getCanonicalFileName);
+        if (resolutionStack.indexOf(resolvedPath) >= 0) {
+            return {
+                options: {},
+                fileNames: [],
+                typingOptions: {},
+                raw: json,
+                errors: [ts.createCompilerDiagnostic(ts.Diagnostics.Circularity_detected_while_resolving_configuration_Colon_0, resolutionStack.concat([resolvedPath]).join(" -> "))],
+                wildcardDirectories: {}
+            };
+        }
+        var options = convertCompilerOptionsFromJsonWorker(json["compilerOptions"], basePath, errors, configFileName);
+        var typingOptions = convertTypingOptionsFromJsonWorker(json["typingOptions"], basePath, errors, configFileName);
+        if (json["extends"]) {
+            var _a = [undefined, undefined, undefined, {}], include = _a[0], exclude = _a[1], files = _a[2], baseOptions = _a[3];
+            if (typeof json["extends"] === "string") {
+                _b = (tryExtendsName(json["extends"]) || [include, exclude, files, baseOptions]), include = _b[0], exclude = _b[1], files = _b[2], baseOptions = _b[3];
+            }
+            else {
+                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "extends", "string"));
+            }
+            if (include && !json["include"]) {
+                json["include"] = include;
+            }
+            if (exclude && !json["exclude"]) {
+                json["exclude"] = exclude;
+            }
+            if (files && !json["files"]) {
+                json["files"] = files;
+            }
+            options = ts.assign({}, baseOptions, options);
+        }
+        options = ts.extend(existingOptions, options);
+        options.configFilePath = configFileName;
+        var _c = getFileNames(errors), fileNames = _c.fileNames, wildcardDirectories = _c.wildcardDirectories;
+        var compileOnSave = convertCompileOnSaveOptionFromJson(json, basePath, errors);
+        return {
+            options: options,
+            fileNames: fileNames,
+            typingOptions: typingOptions,
+            raw: json,
+            errors: errors,
+            wildcardDirectories: wildcardDirectories,
+            compileOnSave: compileOnSave
+        };
+        function tryExtendsName(extendedConfig) {
+            if (!(ts.isRootedDiskPath(extendedConfig) || ts.startsWith(ts.normalizeSlashes(extendedConfig), "./") || ts.startsWith(ts.normalizeSlashes(extendedConfig), "../"))) {
+                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.The_path_in_an_extends_options_must_be_relative_or_rooted));
+                return;
+            }
+            var extendedConfigPath = ts.toPath(extendedConfig, basePath, getCanonicalFileName);
+            if (!host.fileExists(extendedConfigPath) && !ts.endsWith(extendedConfigPath, ".json")) {
+                extendedConfigPath = extendedConfigPath + ".json";
+                if (!host.fileExists(extendedConfigPath)) {
+                    errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.File_0_does_not_exist, extendedConfig));
+                    return;
+                }
+            }
+            var extendedResult = readConfigFile(extendedConfigPath, function (path) { return host.readFile(path); });
+            if (extendedResult.error) {
+                errors.push(extendedResult.error);
+                return;
+            }
+            var extendedDirname = ts.getDirectoryPath(extendedConfigPath);
+            var relativeDifference = ts.convertToRelativePath(extendedDirname, basePath, getCanonicalFileName);
+            var updatePath = function (path) { return ts.isRootedDiskPath(path) ? path : ts.combinePaths(relativeDifference, path); };
+            var result = parseJsonConfigFileContent(extendedResult.config, host, extendedDirname, undefined, ts.getBaseFileName(extendedConfigPath), resolutionStack.concat([resolvedPath]));
+            errors.push.apply(errors, result.errors);
+            var _a = ts.map(["include", "exclude", "files"], function (key) {
+                if (!json[key] && extendedResult.config[key]) {
+                    return ts.map(extendedResult.config[key], updatePath);
+                }
+            }), include = _a[0], exclude = _a[1], files = _a[2];
+            return [include, exclude, files, result.options];
+        }
+        function getFileNames(errors) {
+            var fileNames;
+            if (ts.hasProperty(json, "files")) {
+                if (ts.isArray(json["files"])) {
+                    fileNames = json["files"];
+                    if (fileNames.length === 0) {
+                        errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.The_files_list_in_config_file_0_is_empty, configFileName || "tsconfig.json"));
+                    }
+                }
+                else {
+                    errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "files", "Array"));
+                }
+            }
+            var includeSpecs;
+            if (ts.hasProperty(json, "include")) {
+                if (ts.isArray(json["include"])) {
+                    includeSpecs = json["include"];
+                }
+                else {
+                    errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "include", "Array"));
+                }
+            }
+            var excludeSpecs;
+            if (ts.hasProperty(json, "exclude")) {
+                if (ts.isArray(json["exclude"])) {
+                    excludeSpecs = json["exclude"];
+                }
+                else {
+                    errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "exclude", "Array"));
+                }
+            }
+            else if (ts.hasProperty(json, "excludes")) {
+                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unknown_option_excludes_Did_you_mean_exclude));
+            }
+            else {
+                excludeSpecs = ["node_modules", "bower_components", "jspm_packages"];
+                var outDir = json["compilerOptions"] && json["compilerOptions"]["outDir"];
+                if (outDir) {
+                    excludeSpecs.push(outDir);
+                }
+            }
+            if (fileNames === undefined && includeSpecs === undefined) {
+                includeSpecs = ["**/*"];
+            }
+            var result = matchFileNames(fileNames, includeSpecs, excludeSpecs, basePath, options, host, errors);
+            if (result.fileNames.length === 0 && !ts.hasProperty(json, "files") && resolutionStack.length === 0) {
+                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2, configFileName || "tsconfig.json", JSON.stringify(includeSpecs || []), JSON.stringify(excludeSpecs || [])));
+            }
+            return result;
+        }
+        var _b;
+    }
+    ts.parseJsonConfigFileContent = parseJsonConfigFileContent;
+    function convertCompileOnSaveOptionFromJson(jsonOption, basePath, errors) {
+        if (!ts.hasProperty(jsonOption, ts.compileOnSaveCommandLineOption.name)) {
+            return false;
+        }
+        var result = convertJsonOption(ts.compileOnSaveCommandLineOption, jsonOption["compileOnSave"], basePath, errors);
+        if (typeof result === "boolean" && result) {
+            return result;
+        }
+        return false;
+    }
+    ts.convertCompileOnSaveOptionFromJson = convertCompileOnSaveOptionFromJson;
+    function convertCompilerOptionsFromJson(jsonOptions, basePath, configFileName) {
+        var errors = [];
+        var options = convertCompilerOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName);
+        return { options: options, errors: errors };
+    }
+    ts.convertCompilerOptionsFromJson = convertCompilerOptionsFromJson;
+    function convertTypingOptionsFromJson(jsonOptions, basePath, configFileName) {
+        var errors = [];
+        var options = convertTypingOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName);
+        return { options: options, errors: errors };
+    }
+    ts.convertTypingOptionsFromJson = convertTypingOptionsFromJson;
+    function convertCompilerOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName) {
+        var options = ts.getBaseFileName(configFileName) === "jsconfig.json"
+            ? { allowJs: true, maxNodeModuleJsDepth: 2, allowSyntheticDefaultImports: true, skipLibCheck: true }
+            : {};
+        convertOptionsFromJson(ts.optionDeclarations, jsonOptions, basePath, options, ts.Diagnostics.Unknown_compiler_option_0, errors);
+        return options;
+    }
+    function convertTypingOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName) {
+        var options = { enableAutoDiscovery: ts.getBaseFileName(configFileName) === "jsconfig.json", include: [], exclude: [] };
+        convertOptionsFromJson(ts.typingOptionDeclarations, jsonOptions, basePath, options, ts.Diagnostics.Unknown_typing_option_0, errors);
+        return options;
+    }
+    function convertOptionsFromJson(optionDeclarations, jsonOptions, basePath, defaultOptions, diagnosticMessage, errors) {
+        if (!jsonOptions) {
+            return;
+        }
+        var optionNameMap = ts.arrayToMap(optionDeclarations, function (opt) { return opt.name; });
+        for (var id in jsonOptions) {
+            if (id in optionNameMap) {
+                var opt = optionNameMap[id];
+                defaultOptions[opt.name] = convertJsonOption(opt, jsonOptions[id], basePath, errors);
+            }
+            else {
+                errors.push(ts.createCompilerDiagnostic(diagnosticMessage, id));
+            }
+        }
+    }
+    function convertJsonOption(opt, value, basePath, errors) {
+        var optType = opt.type;
+        var expectedType = typeof optType === "string" ? optType : "string";
+        if (optType === "list" && ts.isArray(value)) {
+            return convertJsonOptionOfListType(opt, value, basePath, errors);
+        }
+        else if (typeof value === expectedType) {
+            if (typeof optType !== "string") {
+                return convertJsonOptionOfCustomType(opt, value, errors);
+            }
+            else {
+                if (opt.isFilePath) {
+                    value = ts.normalizePath(ts.combinePaths(basePath, value));
+                    if (value === "") {
+                        value = ".";
+                    }
+                }
+            }
+            return value;
+        }
+        else {
+            errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, opt.name, expectedType));
+        }
+    }
+    function convertJsonOptionOfCustomType(opt, value, errors) {
+        var key = value.toLowerCase();
+        if (key in opt.type) {
+            return opt.type[key];
+        }
+        else {
+            errors.push(createCompilerDiagnosticForInvalidCustomType(opt));
+        }
+    }
+    function convertJsonOptionOfListType(option, values, basePath, errors) {
+        return ts.filter(ts.map(values, function (v) { return convertJsonOption(option.element, v, basePath, errors); }), function (v) { return !!v; });
+    }
+    function trimString(s) {
+        return typeof s.trim === "function" ? s.trim() : s.replace(/^[\s]+|[\s]+$/g, "");
+    }
+    var invalidTrailingRecursionPattern = /(^|\/)\*\*\/?$/;
+    var invalidMultipleRecursionPatterns = /(^|\/)\*\*\/(.*\/)?\*\*($|\/)/;
+    var invalidDotDotAfterRecursiveWildcardPattern = /(^|\/)\*\*\/(.*\/)?\.\.($|\/)/;
+    var watchRecursivePattern = /\/[^/]*?[*?][^/]*\//;
+    var wildcardDirectoryPattern = /^[^*?]*(?=\/[^/]*[*?])/;
+    function matchFileNames(fileNames, include, exclude, basePath, options, host, errors) {
+        basePath = ts.normalizePath(basePath);
+        var keyMapper = host.useCaseSensitiveFileNames ? caseSensitiveKeyMapper : caseInsensitiveKeyMapper;
+        var literalFileMap = ts.createMap();
+        var wildcardFileMap = ts.createMap();
+        if (include) {
+            include = validateSpecs(include, errors, false);
+        }
+        if (exclude) {
+            exclude = validateSpecs(exclude, errors, true);
+        }
+        var wildcardDirectories = getWildcardDirectories(include, exclude, basePath, host.useCaseSensitiveFileNames);
+        var supportedExtensions = ts.getSupportedExtensions(options);
+        if (fileNames) {
+            for (var _i = 0, fileNames_1 = fileNames; _i < fileNames_1.length; _i++) {
+                var fileName = fileNames_1[_i];
+                var file = ts.combinePaths(basePath, fileName);
+                literalFileMap[keyMapper(file)] = file;
+            }
+        }
+        if (include && include.length > 0) {
+            for (var _a = 0, _b = host.readDirectory(basePath, supportedExtensions, exclude, include); _a < _b.length; _a++) {
+                var file = _b[_a];
+                if (hasFileWithHigherPriorityExtension(file, literalFileMap, wildcardFileMap, supportedExtensions, keyMapper)) {
+                    continue;
+                }
+                removeWildcardFilesWithLowerPriorityExtension(file, wildcardFileMap, supportedExtensions, keyMapper);
+                var key = keyMapper(file);
+                if (!(key in literalFileMap) && !(key in wildcardFileMap)) {
+                    wildcardFileMap[key] = file;
+                }
+            }
+        }
+        var literalFiles = ts.reduceProperties(literalFileMap, addFileToOutput, []);
+        var wildcardFiles = ts.reduceProperties(wildcardFileMap, addFileToOutput, []);
+        wildcardFiles.sort(host.useCaseSensitiveFileNames ? ts.compareStrings : ts.compareStringsCaseInsensitive);
+        return {
+            fileNames: literalFiles.concat(wildcardFiles),
+            wildcardDirectories: wildcardDirectories
+        };
+    }
+    function validateSpecs(specs, errors, allowTrailingRecursion) {
+        var validSpecs = [];
+        for (var _i = 0, specs_2 = specs; _i < specs_2.length; _i++) {
+            var spec = specs_2[_i];
+            if (!allowTrailingRecursion && invalidTrailingRecursionPattern.test(spec)) {
+                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0, spec));
+            }
+            else if (invalidMultipleRecursionPatterns.test(spec)) {
+                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.File_specification_cannot_contain_multiple_recursive_directory_wildcards_Asterisk_Asterisk_Colon_0, spec));
+            }
+            else if (invalidDotDotAfterRecursiveWildcardPattern.test(spec)) {
+                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0, spec));
+            }
+            else {
+                validSpecs.push(spec);
+            }
+        }
+        return validSpecs;
+    }
+    function getWildcardDirectories(include, exclude, path, useCaseSensitiveFileNames) {
+        var rawExcludeRegex = ts.getRegularExpressionForWildcard(exclude, path, "exclude");
+        var excludeRegex = rawExcludeRegex && new RegExp(rawExcludeRegex, useCaseSensitiveFileNames ? "" : "i");
+        var wildcardDirectories = ts.createMap();
+        if (include !== undefined) {
+            var recursiveKeys = [];
+            for (var _i = 0, include_1 = include; _i < include_1.length; _i++) {
+                var file = include_1[_i];
+                var spec = ts.normalizePath(ts.combinePaths(path, file));
+                if (excludeRegex && excludeRegex.test(spec)) {
+                    continue;
+                }
+                var match = getWildcardDirectoryFromSpec(spec, useCaseSensitiveFileNames);
+                if (match) {
+                    var key = match.key, flags = match.flags;
+                    var existingFlags = wildcardDirectories[key];
+                    if (existingFlags === undefined || existingFlags < flags) {
+                        wildcardDirectories[key] = flags;
+                        if (flags === 1) {
+                            recursiveKeys.push(key);
+                        }
+                    }
+                }
+            }
+            for (var key in wildcardDirectories) {
+                for (var _a = 0, recursiveKeys_1 = recursiveKeys; _a < recursiveKeys_1.length; _a++) {
+                    var recursiveKey = recursiveKeys_1[_a];
+                    if (key !== recursiveKey && ts.containsPath(recursiveKey, key, path, !useCaseSensitiveFileNames)) {
+                        delete wildcardDirectories[key];
+                    }
+                }
+            }
+        }
+        return wildcardDirectories;
+    }
+    function getWildcardDirectoryFromSpec(spec, useCaseSensitiveFileNames) {
+        var match = wildcardDirectoryPattern.exec(spec);
+        if (match) {
+            return {
+                key: useCaseSensitiveFileNames ? match[0] : match[0].toLowerCase(),
+                flags: watchRecursivePattern.test(spec) ? 1 : 0
+            };
+        }
+        if (ts.isImplicitGlob(spec)) {
+            return { key: spec, flags: 1 };
+        }
+        return undefined;
+    }
+    function hasFileWithHigherPriorityExtension(file, literalFiles, wildcardFiles, extensions, keyMapper) {
+        var extensionPriority = ts.getExtensionPriority(file, extensions);
+        var adjustedExtensionPriority = ts.adjustExtensionPriority(extensionPriority);
+        for (var i = 0; i < adjustedExtensionPriority; i++) {
+            var higherPriorityExtension = extensions[i];
+            var higherPriorityPath = keyMapper(ts.changeExtension(file, higherPriorityExtension));
+            if (higherPriorityPath in literalFiles || higherPriorityPath in wildcardFiles) {
+                return true;
+            }
+        }
+        return false;
+    }
+    function removeWildcardFilesWithLowerPriorityExtension(file, wildcardFiles, extensions, keyMapper) {
+        var extensionPriority = ts.getExtensionPriority(file, extensions);
+        var nextExtensionPriority = ts.getNextLowestExtensionPriority(extensionPriority);
+        for (var i = nextExtensionPriority; i < extensions.length; i++) {
+            var lowerPriorityExtension = extensions[i];
+            var lowerPriorityPath = keyMapper(ts.changeExtension(file, lowerPriorityExtension));
+            delete wildcardFiles[lowerPriorityPath];
+        }
+    }
+    function addFileToOutput(output, file) {
+        output.push(file);
+        return output;
+    }
+    function caseSensitiveKeyMapper(key) {
+        return key;
+    }
+    function caseInsensitiveKeyMapper(key) {
+        return key.toLowerCase();
+    }
+})(ts || (ts = {}));
+var ts;
+(function (ts) {
+    var JsTyping;
+    (function (JsTyping) {
+        ;
+        ;
+        var safeList;
+        var EmptySafeList = ts.createMap();
+        JsTyping.nodeCoreModuleList = [
+            "buffer", "querystring", "events", "http", "cluster",
+            "zlib", "os", "https", "punycode", "repl", "readline",
+            "vm", "child_process", "url", "dns", "net",
+            "dgram", "fs", "path", "string_decoder", "tls",
+            "crypto", "stream", "util", "assert", "tty", "domain",
+            "constants", "process", "v8", "timers", "console"
+        ];
+        var nodeCoreModules = ts.arrayToMap(JsTyping.nodeCoreModuleList, function (x) { return x; });
+        function discoverTypings(host, fileNames, projectRootPath, safeListPath, packageNameToTypingLocation, typingOptions, unresolvedImports) {
+            var inferredTypings = ts.createMap();
+            if (!typingOptions || !typingOptions.enableAutoDiscovery) {
+                return { cachedTypingPaths: [], newTypingNames: [], filesToWatch: [] };
+            }
+            fileNames = ts.filter(ts.map(fileNames, ts.normalizePath), function (f) {
+                var kind = ts.ensureScriptKind(f, ts.getScriptKindFromFileName(f));
+                return kind === 1 || kind === 2;
+            });
+            if (!safeList) {
+                var result = ts.readConfigFile(safeListPath, function (path) { return host.readFile(path); });
+                safeList = result.config ? ts.createMap(result.config) : EmptySafeList;
+            }
+            var filesToWatch = [];
+            var searchDirs = [];
+            var exclude = [];
+            mergeTypings(typingOptions.include);
+            exclude = typingOptions.exclude || [];
+            var possibleSearchDirs = ts.map(fileNames, ts.getDirectoryPath);
+            if (projectRootPath) {
+                possibleSearchDirs.push(projectRootPath);
+            }
+            searchDirs = ts.deduplicate(possibleSearchDirs);
+            for (var _i = 0, searchDirs_1 = searchDirs; _i < searchDirs_1.length; _i++) {
+                var searchDir = searchDirs_1[_i];
+                var packageJsonPath = ts.combinePaths(searchDir, "package.json");
+                getTypingNamesFromJson(packageJsonPath, filesToWatch);
+                var bowerJsonPath = ts.combinePaths(searchDir, "bower.json");
+                getTypingNamesFromJson(bowerJsonPath, filesToWatch);
+                var nodeModulesPath = ts.combinePaths(searchDir, "node_modules");
+                getTypingNamesFromNodeModuleFolder(nodeModulesPath);
+            }
+            getTypingNamesFromSourceFileNames(fileNames);
+            if (unresolvedImports) {
+                for (var _a = 0, unresolvedImports_1 = unresolvedImports; _a < unresolvedImports_1.length; _a++) {
+                    var moduleId = unresolvedImports_1[_a];
+                    var typingName = moduleId in nodeCoreModules ? "node" : moduleId;
+                    if (!(typingName in inferredTypings)) {
+                        inferredTypings[typingName] = undefined;
+                    }
+                }
+            }
+            for (var name_6 in packageNameToTypingLocation) {
+                if (name_6 in inferredTypings && !inferredTypings[name_6]) {
+                    inferredTypings[name_6] = packageNameToTypingLocation[name_6];
+                }
+            }
+            for (var _b = 0, exclude_1 = exclude; _b < exclude_1.length; _b++) {
+                var excludeTypingName = exclude_1[_b];
+                delete inferredTypings[excludeTypingName];
+            }
+            var newTypingNames = [];
+            var cachedTypingPaths = [];
+            for (var typing in inferredTypings) {
+                if (inferredTypings[typing] !== undefined) {
+                    cachedTypingPaths.push(inferredTypings[typing]);
+                }
+                else {
+                    newTypingNames.push(typing);
+                }
+            }
+            return { cachedTypingPaths: cachedTypingPaths, newTypingNames: newTypingNames, filesToWatch: filesToWatch };
+            function mergeTypings(typingNames) {
+                if (!typingNames) {
+                    return;
+                }
+                for (var _i = 0, typingNames_1 = typingNames; _i < typingNames_1.length; _i++) {
+                    var typing = typingNames_1[_i];
+                    if (!(typing in inferredTypings)) {
+                        inferredTypings[typing] = undefined;
+                    }
+                }
+            }
+            function getTypingNamesFromJson(jsonPath, filesToWatch) {
+                if (host.fileExists(jsonPath)) {
+                    filesToWatch.push(jsonPath);
+                }
+                var result = ts.readConfigFile(jsonPath, function (path) { return host.readFile(path); });
+                if (result.config) {
+                    var jsonConfig = result.config;
+                    if (jsonConfig.dependencies) {
+                        mergeTypings(ts.getOwnKeys(jsonConfig.dependencies));
+                    }
+                    if (jsonConfig.devDependencies) {
+                        mergeTypings(ts.getOwnKeys(jsonConfig.devDependencies));
+                    }
+                    if (jsonConfig.optionalDependencies) {
+                        mergeTypings(ts.getOwnKeys(jsonConfig.optionalDependencies));
+                    }
+                    if (jsonConfig.peerDependencies) {
+                        mergeTypings(ts.getOwnKeys(jsonConfig.peerDependencies));
+                    }
+                }
+            }
+            function getTypingNamesFromSourceFileNames(fileNames) {
+                var jsFileNames = ts.filter(fileNames, ts.hasJavaScriptFileExtension);
+                var inferredTypingNames = ts.map(jsFileNames, function (f) { return ts.removeFileExtension(ts.getBaseFileName(f.toLowerCase())); });
+                var cleanedTypingNames = ts.map(inferredTypingNames, function (f) { return f.replace(/((?:\.|-)min(?=\.|$))|((?:-|\.)\d+)/g, ""); });
+                if (safeList !== EmptySafeList) {
+                    mergeTypings(ts.filter(cleanedTypingNames, function (f) { return f in safeList; }));
+                }
+                var hasJsxFile = ts.forEach(fileNames, function (f) { return ts.ensureScriptKind(f, ts.getScriptKindFromFileName(f)) === 2; });
+                if (hasJsxFile) {
+                    mergeTypings(["react"]);
+                }
+            }
+            function getTypingNamesFromNodeModuleFolder(nodeModulesPath) {
+                if (!host.directoryExists(nodeModulesPath)) {
+                    return;
+                }
+                var typingNames = [];
+                var fileNames = host.readDirectory(nodeModulesPath, [".json"], undefined, undefined, 2);
+                for (var _i = 0, fileNames_2 = fileNames; _i < fileNames_2.length; _i++) {
+                    var fileName = fileNames_2[_i];
+                    var normalizedFileName = ts.normalizePath(fileName);
+                    if (ts.getBaseFileName(normalizedFileName) !== "package.json") {
+                        continue;
+                    }
+                    var result = ts.readConfigFile(normalizedFileName, function (path) { return host.readFile(path); });
+                    if (!result.config) {
+                        continue;
+                    }
+                    var packageJson = result.config;
+                    if (packageJson._requiredBy &&
+                        ts.filter(packageJson._requiredBy, function (r) { return r[0] === "#" || r === "/"; }).length === 0) {
+                        continue;
+                    }
+                    if (!packageJson.name) {
+                        continue;
+                    }
+                    if (packageJson.typings) {
+                        var absolutePath = ts.getNormalizedAbsolutePath(packageJson.typings, ts.getDirectoryPath(normalizedFileName));
+                        inferredTypings[packageJson.name] = absolutePath;
+                    }
+                    else {
+                        typingNames.push(packageJson.name);
+                    }
+                }
+                mergeTypings(typingNames);
+            }
+        }
+        JsTyping.discoverTypings = discoverTypings;
+    })(JsTyping = ts.JsTyping || (ts.JsTyping = {}));
+})(ts || (ts = {}));
+var ts;
+(function (ts) {
+    var server;
+    (function (server) {
+        server.ActionSet = "action::set";
+        server.ActionInvalidate = "action::invalidate";
+        server.EventInstall = "event::install";
+        var Arguments;
+        (function (Arguments) {
+            Arguments.GlobalCacheLocation = "--globalTypingsCacheLocation";
+            Arguments.LogFile = "--logFile";
+            Arguments.EnableTelemetry = "--enableTelemetry";
+        })(Arguments = server.Arguments || (server.Arguments = {}));
+        function hasArgument(argumentName) {
+            return ts.sys.args.indexOf(argumentName) >= 0;
+        }
+        server.hasArgument = hasArgument;
+        function findArgument(argumentName) {
+            var index = ts.sys.args.indexOf(argumentName);
+            return index >= 0 && index < ts.sys.args.length - 1
+                ? ts.sys.args[index + 1]
+                : undefined;
+        }
+        server.findArgument = findArgument;
+    })(server = ts.server || (ts.server = {}));
+})(ts || (ts = {}));
+var ts;
+(function (ts) {
+    var server;
+    (function (server) {
+        var LogLevel;
+        (function (LogLevel) {
+            LogLevel[LogLevel["terse"] = 0] = "terse";
+            LogLevel[LogLevel["normal"] = 1] = "normal";
+            LogLevel[LogLevel["requestTime"] = 2] = "requestTime";
+            LogLevel[LogLevel["verbose"] = 3] = "verbose";
+        })(LogLevel = server.LogLevel || (server.LogLevel = {}));
+        server.emptyArray = [];
+        var Msg;
+        (function (Msg) {
+            Msg.Err = "Err";
+            Msg.Info = "Info";
+            Msg.Perf = "Perf";
+        })(Msg = server.Msg || (server.Msg = {}));
+        function getProjectRootPath(project) {
+            switch (project.projectKind) {
+                case server.ProjectKind.Configured:
+                    return ts.getDirectoryPath(project.getProjectName());
+                case server.ProjectKind.Inferred:
+                    return "";
+                case server.ProjectKind.External:
+                    var projectName = ts.normalizeSlashes(project.getProjectName());
+                    return project.projectService.host.fileExists(projectName) ? ts.getDirectoryPath(projectName) : projectName;
+            }
+        }
+        function createInstallTypingsRequest(project, typingOptions, unresolvedImports, cachePath) {
+            return {
+                projectName: project.getProjectName(),
+                fileNames: project.getFileNames(true),
+                compilerOptions: project.getCompilerOptions(),
+                typingOptions: typingOptions,
+                unresolvedImports: unresolvedImports,
+                projectRootPath: getProjectRootPath(project),
+                cachePath: cachePath,
+                kind: "discover"
+            };
+        }
+        server.createInstallTypingsRequest = createInstallTypingsRequest;
+        var Errors;
+        (function (Errors) {
+            function ThrowNoProject() {
+                throw new Error("No Project.");
+            }
+            Errors.ThrowNoProject = ThrowNoProject;
+            function ThrowProjectLanguageServiceDisabled() {
+                throw new Error("The project's language service is disabled.");
+            }
+            Errors.ThrowProjectLanguageServiceDisabled = ThrowProjectLanguageServiceDisabled;
+            function ThrowProjectDoesNotContainDocument(fileName, project) {
+                throw new Error("Project '" + project.getProjectName() + "' does not contain document '" + fileName + "'");
+            }
+            Errors.ThrowProjectDoesNotContainDocument = ThrowProjectDoesNotContainDocument;
+        })(Errors = server.Errors || (server.Errors = {}));
+        function getDefaultFormatCodeSettings(host) {
+            return {
+                indentSize: 4,
+                tabSize: 4,
+                newLineCharacter: host.newLine || "\n",
+                convertTabsToSpaces: true,
+                indentStyle: ts.IndentStyle.Smart,
+                insertSpaceAfterCommaDelimiter: true,
+                insertSpaceAfterSemicolonInForStatements: true,
+                insertSpaceBeforeAndAfterBinaryOperators: true,
+                insertSpaceAfterKeywordsInControlFlowStatements: true,
+                insertSpaceAfterFunctionKeywordForAnonymousFunctions: false,
+                insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: false,
+                insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: false,
+                insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces: false,
+                insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces: false,
+                placeOpenBraceOnNewLineForFunctions: false,
+                placeOpenBraceOnNewLineForControlBlocks: false,
+            };
+        }
+        server.getDefaultFormatCodeSettings = getDefaultFormatCodeSettings;
+        function mergeMaps(target, source) {
+            for (var key in source) {
+                if (ts.hasProperty(source, key)) {
+                    target[key] = source[key];
+                }
+            }
+        }
+        server.mergeMaps = mergeMaps;
+        function removeItemFromSet(items, itemToRemove) {
+            if (items.length === 0) {
+                return;
+            }
+            var index = items.indexOf(itemToRemove);
+            if (index < 0) {
+                return;
+            }
+            if (index === items.length - 1) {
+                items.pop();
+            }
+            else {
+                items[index] = items.pop();
+            }
+        }
+        server.removeItemFromSet = removeItemFromSet;
+        function toNormalizedPath(fileName) {
+            return ts.normalizePath(fileName);
+        }
+        server.toNormalizedPath = toNormalizedPath;
+        function normalizedPathToPath(normalizedPath, currentDirectory, getCanonicalFileName) {
+            var f = ts.isRootedDiskPath(normalizedPath) ? normalizedPath : ts.getNormalizedAbsolutePath(normalizedPath, currentDirectory);
+            return getCanonicalFileName(f);
+        }
+        server.normalizedPathToPath = normalizedPathToPath;
+        function asNormalizedPath(fileName) {
+            return fileName;
+        }
+        server.asNormalizedPath = asNormalizedPath;
+        function createNormalizedPathMap() {
+            var map = Object.create(null);
+            return {
+                get: function (path) {
+                    return map[path];
+                },
+                set: function (path, value) {
+                    map[path] = value;
+                },
+                contains: function (path) {
+                    return ts.hasProperty(map, path);
+                },
+                remove: function (path) {
+                    delete map[path];
+                }
+            };
+        }
+        server.createNormalizedPathMap = createNormalizedPathMap;
+        function throwLanguageServiceIsDisabledError() {
+            throw new Error("LanguageService is disabled");
+        }
+        server.nullLanguageService = {
+            cleanupSemanticCache: throwLanguageServiceIsDisabledError,
+            getSyntacticDiagnostics: throwLanguageServiceIsDisabledError,
+            getSemanticDiagnostics: throwLanguageServiceIsDisabledError,
+            getCompilerOptionsDiagnostics: throwLanguageServiceIsDisabledError,
+            getSyntacticClassifications: throwLanguageServiceIsDisabledError,
+            getEncodedSyntacticClassifications: throwLanguageServiceIsDisabledError,
+            getSemanticClassifications: throwLanguageServiceIsDisabledError,
+            getEncodedSemanticClassifications: throwLanguageServiceIsDisabledError,
+            getCompletionsAtPosition: throwLanguageServiceIsDisabledError,
+            findReferences: throwLanguageServiceIsDisabledError,
+            getCompletionEntryDetails: throwLanguageServiceIsDisabledError,
+            getQuickInfoAtPosition: throwLanguageServiceIsDisabledError,
+            findRenameLocations: throwLanguageServiceIsDisabledError,
+            getNameOrDottedNameSpan: throwLanguageServiceIsDisabledError,
+            getBreakpointStatementAtPosition: throwLanguageServiceIsDisabledError,
+            getBraceMatchingAtPosition: throwLanguageServiceIsDisabledError,
+            getSignatureHelpItems: throwLanguageServiceIsDisabledError,
+            getDefinitionAtPosition: throwLanguageServiceIsDisabledError,
+            getRenameInfo: throwLanguageServiceIsDisabledError,
+            getTypeDefinitionAtPosition: throwLanguageServiceIsDisabledError,
+            getReferencesAtPosition: throwLanguageServiceIsDisabledError,
+            getDocumentHighlights: throwLanguageServiceIsDisabledError,
+            getOccurrencesAtPosition: throwLanguageServiceIsDisabledError,
+            getNavigateToItems: throwLanguageServiceIsDisabledError,
+            getNavigationBarItems: throwLanguageServiceIsDisabledError,
+            getNavigationTree: throwLanguageServiceIsDisabledError,
+            getOutliningSpans: throwLanguageServiceIsDisabledError,
+            getTodoComments: throwLanguageServiceIsDisabledError,
+            getIndentationAtPosition: throwLanguageServiceIsDisabledError,
+            getFormattingEditsForRange: throwLanguageServiceIsDisabledError,
+            getFormattingEditsForDocument: throwLanguageServiceIsDisabledError,
+            getFormattingEditsAfterKeystroke: throwLanguageServiceIsDisabledError,
+            getDocCommentTemplateAtPosition: throwLanguageServiceIsDisabledError,
+            isValidBraceCompletionAtPosition: throwLanguageServiceIsDisabledError,
+            getEmitOutput: throwLanguageServiceIsDisabledError,
+            getProgram: throwLanguageServiceIsDisabledError,
+            getNonBoundSourceFile: throwLanguageServiceIsDisabledError,
+            dispose: throwLanguageServiceIsDisabledError,
+            getCompletionEntrySymbol: throwLanguageServiceIsDisabledError,
+            getImplementationAtPosition: throwLanguageServiceIsDisabledError,
+            getSourceFile: throwLanguageServiceIsDisabledError,
+            getCodeFixesAtPosition: throwLanguageServiceIsDisabledError
+        };
+        server.nullLanguageServiceHost = {
+            setCompilationSettings: function () { return undefined; },
+            notifyFileRemoved: function () { return undefined; },
+            startRecordingFilesWithChangedResolutions: function () { return undefined; },
+            finishRecordingFilesWithChangedResolutions: function () { return undefined; }
+        };
+        function isInferredProjectName(name) {
+            return /dev\/null\/inferredProject\d+\*/.test(name);
+        }
+        server.isInferredProjectName = isInferredProjectName;
+        function makeInferredProjectName(counter) {
+            return "/dev/null/inferredProject" + counter + "*";
+        }
+        server.makeInferredProjectName = makeInferredProjectName;
+        function toSortedReadonlyArray(arr) {
+            arr.sort();
+            return arr;
+        }
+        server.toSortedReadonlyArray = toSortedReadonlyArray;
+        var ThrottledOperations = (function () {
+            function ThrottledOperations(host) {
+                this.host = host;
+                this.pendingTimeouts = ts.createMap();
+            }
+            ThrottledOperations.prototype.schedule = function (operationId, delay, cb) {
+                if (ts.hasProperty(this.pendingTimeouts, operationId)) {
+                    this.host.clearTimeout(this.pendingTimeouts[operationId]);
+                }
+                this.pendingTimeouts[operationId] = this.host.setTimeout(ThrottledOperations.run, delay, this, operationId, cb);
+            };
+            ThrottledOperations.run = function (self, operationId, cb) {
+                delete self.pendingTimeouts[operationId];
+                cb();
+            };
+            return ThrottledOperations;
+        }());
+        server.ThrottledOperations = ThrottledOperations;
+        var GcTimer = (function () {
+            function GcTimer(host, delay, logger) {
+                this.host = host;
+                this.delay = delay;
+                this.logger = logger;
+            }
+            GcTimer.prototype.scheduleCollect = function () {
+                if (!this.host.gc || this.timerId != undefined) {
+                    return;
+                }
+                this.timerId = this.host.setTimeout(GcTimer.run, this.delay, this);
+            };
+            GcTimer.run = function (self) {
+                self.timerId = undefined;
+                var log = self.logger.hasLevel(LogLevel.requestTime);
+                var before = log && self.host.getMemoryUsage();
+                self.host.gc();
+                if (log) {
+                    var after = self.host.getMemoryUsage();
+                    self.logger.perftrc("GC::before " + before + ", after " + after);
+                }
+            };
+            return GcTimer;
+        }());
+        server.GcTimer = GcTimer;
+    })(server = ts.server || (ts.server = {}));
+})(ts || (ts = {}));
+var ts;
+(function (ts) {
+    function trace(host) {
+        host.trace(ts.formatMessage.apply(undefined, arguments));
+    }
+    ts.trace = trace;
+    function isTraceEnabled(compilerOptions, host) {
+        return compilerOptions.traceResolution && host.trace !== undefined;
+    }
+    ts.isTraceEnabled = isTraceEnabled;
+    function resolvedTypeScriptOnly(resolved) {
+        if (!resolved) {
+            return undefined;
+        }
+        ts.Debug.assert(ts.extensionIsTypeScript(resolved.extension));
+        return resolved.path;
+    }
+    function resolvedFromAnyFile(path) {
+        return { path: path, extension: ts.extensionFromPath(path) };
+    }
+    function resolvedModuleFromResolved(_a, isExternalLibraryImport) {
+        var path = _a.path, extension = _a.extension;
+        return { resolvedFileName: path, extension: extension, isExternalLibraryImport: isExternalLibraryImport };
+    }
+    function createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations) {
+        return { resolvedModule: resolved && resolvedModuleFromResolved(resolved, isExternalLibraryImport), failedLookupLocations: failedLookupLocations };
+    }
+    function moduleHasNonRelativeName(moduleName) {
+        return !(ts.isRootedDiskPath(moduleName) || ts.isExternalModuleNameRelative(moduleName));
+    }
+    function tryReadTypesSection(extensions, packageJsonPath, baseDirectory, state) {
+        var jsonContent = readJson(packageJsonPath, state.host);
+        switch (extensions) {
+            case 2:
+            case 0:
+                return tryReadFromField("typings") || tryReadFromField("types");
+            case 1:
+                if (typeof jsonContent.main === "string") {
+                    if (state.traceEnabled) {
+                        trace(state.host, ts.Diagnostics.No_types_specified_in_package_json_so_returning_main_value_of_0, jsonContent.main);
+                    }
+                    return ts.normalizePath(ts.combinePaths(baseDirectory, jsonContent.main));
+                }
+                return undefined;
+        }
+        function tryReadFromField(fieldName) {
+            if (ts.hasProperty(jsonContent, fieldName)) {
+                var typesFile = jsonContent[fieldName];
+                if (typeof typesFile === "string") {
+                    var typesFilePath = ts.normalizePath(ts.combinePaths(baseDirectory, typesFile));
+                    if (state.traceEnabled) {
+                        trace(state.host, ts.Diagnostics.package_json_has_0_field_1_that_references_2, fieldName, typesFile, typesFilePath);
+                    }
+                    return typesFilePath;
+                }
+                else {
+                    if (state.traceEnabled) {
+                        trace(state.host, ts.Diagnostics.Expected_type_of_0_field_in_package_json_to_be_string_got_1, fieldName, typeof typesFile);
+                    }
+                }
+            }
+        }
+    }
+    function readJson(path, host) {
+        try {
+            var jsonText = host.readFile(path);
+            return jsonText ? JSON.parse(jsonText) : {};
+        }
+        catch (e) {
+            return {};
+        }
+    }
+    function getEffectiveTypeRoots(options, host) {
+        if (options.typeRoots) {
+            return options.typeRoots;
+        }
+        var currentDirectory;
+        if (options.configFilePath) {
+            currentDirectory = ts.getDirectoryPath(options.configFilePath);
+        }
+        else if (host.getCurrentDirectory) {
+            currentDirectory = host.getCurrentDirectory();
+        }
+        if (currentDirectory !== undefined) {
+            return getDefaultTypeRoots(currentDirectory, host);
+        }
+    }
+    ts.getEffectiveTypeRoots = getEffectiveTypeRoots;
+    function getDefaultTypeRoots(currentDirectory, host) {
+        if (!host.directoryExists) {
+            return [ts.combinePaths(currentDirectory, nodeModulesAtTypes)];
+        }
+        var typeRoots;
+        forEachAncestorDirectory(currentDirectory, function (directory) {
+            var atTypes = ts.combinePaths(directory, nodeModulesAtTypes);
+            if (host.directoryExists(atTypes)) {
+                (typeRoots || (typeRoots = [])).push(atTypes);
+            }
+        });
+        return typeRoots;
+    }
+    var nodeModulesAtTypes = ts.combinePaths("node_modules", "@types");
+    function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFile, options, host) {
+        var traceEnabled = isTraceEnabled(options, host);
+        var moduleResolutionState = {
+            compilerOptions: options,
+            host: host,
+            traceEnabled: traceEnabled
+        };
+        var typeRoots = getEffectiveTypeRoots(options, host);
+        if (traceEnabled) {
+            if (containingFile === undefined) {
+                if (typeRoots === undefined) {
+                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_not_set_root_directory_not_set, typeReferenceDirectiveName);
+                }
+                else {
+                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_not_set_root_directory_1, typeReferenceDirectiveName, typeRoots);
+                }
+            }
+            else {
+                if (typeRoots === undefined) {
+                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_1_root_directory_not_set, typeReferenceDirectiveName, containingFile);
+                }
+                else {
+                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_1_root_directory_2, typeReferenceDirectiveName, containingFile, typeRoots);
+                }
+            }
+        }
+        var failedLookupLocations = [];
+        var resolved = primaryLookup();
+        var primary = true;
+        if (!resolved) {
+            resolved = secondaryLookup();
+            primary = false;
+        }
+        var resolvedTypeReferenceDirective;
+        if (resolved) {
+            resolved = realpath(resolved, host, traceEnabled);
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolved, primary);
+            }
+            resolvedTypeReferenceDirective = { primary: primary, resolvedFileName: resolved };
+        }
+        return { resolvedTypeReferenceDirective: resolvedTypeReferenceDirective, failedLookupLocations: failedLookupLocations };
+        function primaryLookup() {
+            if (typeRoots && typeRoots.length) {
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Resolving_with_primary_search_path_0, typeRoots.join(", "));
+                }
+                return ts.forEach(typeRoots, function (typeRoot) {
+                    var candidate = ts.combinePaths(typeRoot, typeReferenceDirectiveName);
+                    var candidateDirectory = ts.getDirectoryPath(candidate);
+                    return resolvedTypeScriptOnly(loadNodeModuleFromDirectory(2, candidate, failedLookupLocations, !directoryProbablyExists(candidateDirectory, host), moduleResolutionState));
+                });
+            }
+            else {
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Root_directory_cannot_be_determined_skipping_primary_search_paths);
+                }
+            }
+        }
+        function secondaryLookup() {
+            var resolvedFile;
+            var initialLocationForSecondaryLookup = containingFile && ts.getDirectoryPath(containingFile);
+            if (initialLocationForSecondaryLookup !== undefined) {
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Looking_up_in_node_modules_folder_initial_location_0, initialLocationForSecondaryLookup);
+                }
+                resolvedFile = resolvedTypeScriptOnly(loadModuleFromNodeModules(2, typeReferenceDirectiveName, initialLocationForSecondaryLookup, failedLookupLocations, moduleResolutionState));
+                if (!resolvedFile && traceEnabled) {
+                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_not_resolved, typeReferenceDirectiveName);
+                }
+                return resolvedFile;
+            }
+            else {
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_modules_folder);
+                }
+            }
+        }
+    }
+    ts.resolveTypeReferenceDirective = resolveTypeReferenceDirective;
+    function getAutomaticTypeDirectiveNames(options, host) {
+        if (options.types) {
+            return options.types;
+        }
+        var result = [];
+        if (host.directoryExists && host.getDirectories) {
+            var typeRoots = getEffectiveTypeRoots(options, host);
+            if (typeRoots) {
+                for (var _i = 0, typeRoots_1 = typeRoots; _i < typeRoots_1.length; _i++) {
+                    var root = typeRoots_1[_i];
+                    if (host.directoryExists(root)) {
+                        for (var _a = 0, _b = host.getDirectories(root); _a < _b.length; _a++) {
+                            var typeDirectivePath = _b[_a];
+                            var normalized = ts.normalizePath(typeDirectivePath);
+                            var packageJsonPath = pathToPackageJson(ts.combinePaths(root, normalized));
+                            var isNotNeededPackage = host.fileExists(packageJsonPath) && readJson(packageJsonPath, host).typings === null;
+                            if (!isNotNeededPackage) {
+                                result.push(ts.getBaseFileName(normalized));
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return result;
+    }
+    ts.getAutomaticTypeDirectiveNames = getAutomaticTypeDirectiveNames;
+    function resolveModuleName(moduleName, containingFile, compilerOptions, host) {
+        var traceEnabled = isTraceEnabled(compilerOptions, host);
+        if (traceEnabled) {
+            trace(host, ts.Diagnostics.Resolving_module_0_from_1, moduleName, containingFile);
+        }
+        var moduleResolution = compilerOptions.moduleResolution;
+        if (moduleResolution === undefined) {
+            moduleResolution = ts.getEmitModuleKind(compilerOptions) === ts.ModuleKind.CommonJS ? ts.ModuleResolutionKind.NodeJs : ts.ModuleResolutionKind.Classic;
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Module_resolution_kind_is_not_specified_using_0, ts.ModuleResolutionKind[moduleResolution]);
+            }
+        }
+        else {
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Explicitly_specified_module_resolution_kind_Colon_0, ts.ModuleResolutionKind[moduleResolution]);
+            }
+        }
+        var result;
+        switch (moduleResolution) {
+            case ts.ModuleResolutionKind.NodeJs:
+                result = nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host);
+                break;
+            case ts.ModuleResolutionKind.Classic:
+                result = classicNameResolver(moduleName, containingFile, compilerOptions, host);
+                break;
+        }
+        if (traceEnabled) {
+            if (result.resolvedModule) {
+                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);
+            }
+        }
+        return result;
+    }
+    ts.resolveModuleName = resolveModuleName;
+    function tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, loader, failedLookupLocations, state) {
+        if (moduleHasNonRelativeName(moduleName)) {
+            return tryLoadModuleUsingBaseUrl(extensions, moduleName, loader, failedLookupLocations, state);
+        }
+        else {
+            return tryLoadModuleUsingRootDirs(extensions, moduleName, containingDirectory, loader, failedLookupLocations, state);
+        }
+    }
+    function tryLoadModuleUsingRootDirs(extensions, moduleName, containingDirectory, loader, failedLookupLocations, state) {
+        if (!state.compilerOptions.rootDirs) {
+            return undefined;
+        }
+        if (state.traceEnabled) {
+            trace(state.host, ts.Diagnostics.rootDirs_option_is_set_using_it_to_resolve_relative_module_name_0, moduleName);
+        }
+        var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
+        var matchedRootDir;
+        var matchedNormalizedPrefix;
+        for (var _i = 0, _a = state.compilerOptions.rootDirs; _i < _a.length; _i++) {
+            var rootDir = _a[_i];
+            var normalizedRoot = ts.normalizePath(rootDir);
+            if (!ts.endsWith(normalizedRoot, ts.directorySeparator)) {
+                normalizedRoot += ts.directorySeparator;
+            }
+            var isLongestMatchingPrefix = ts.startsWith(candidate, normalizedRoot) &&
+                (matchedNormalizedPrefix === undefined || matchedNormalizedPrefix.length < normalizedRoot.length);
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Checking_if_0_is_the_longest_matching_prefix_for_1_2, normalizedRoot, candidate, isLongestMatchingPrefix);
+            }
+            if (isLongestMatchingPrefix) {
+                matchedNormalizedPrefix = normalizedRoot;
+                matchedRootDir = rootDir;
+            }
+        }
+        if (matchedNormalizedPrefix) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Longest_matching_prefix_for_0_is_1, candidate, matchedNormalizedPrefix);
+            }
+            var suffix = candidate.substr(matchedNormalizedPrefix.length);
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Loading_0_from_the_root_dir_1_candidate_location_2, suffix, matchedNormalizedPrefix, candidate);
+            }
+            var resolvedFileName = loader(extensions, candidate, failedLookupLocations, !directoryProbablyExists(containingDirectory, state.host), state);
+            if (resolvedFileName) {
+                return resolvedFileName;
+            }
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Trying_other_entries_in_rootDirs);
+            }
+            for (var _b = 0, _c = state.compilerOptions.rootDirs; _b < _c.length; _b++) {
+                var rootDir = _c[_b];
+                if (rootDir === matchedRootDir) {
+                    continue;
+                }
+                var candidate_1 = ts.combinePaths(ts.normalizePath(rootDir), suffix);
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.Loading_0_from_the_root_dir_1_candidate_location_2, suffix, rootDir, candidate_1);
+                }
+                var baseDirectory = ts.getDirectoryPath(candidate_1);
+                var resolvedFileName_1 = loader(extensions, candidate_1, failedLookupLocations, !directoryProbablyExists(baseDirectory, state.host), state);
+                if (resolvedFileName_1) {
+                    return resolvedFileName_1;
+                }
+            }
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Module_resolution_using_rootDirs_has_failed);
+            }
+        }
+        return undefined;
+    }
+    function tryLoadModuleUsingBaseUrl(extensions, moduleName, loader, failedLookupLocations, state) {
+        if (!state.compilerOptions.baseUrl) {
+            return undefined;
+        }
+        if (state.traceEnabled) {
+            trace(state.host, ts.Diagnostics.baseUrl_option_is_set_to_0_using_this_value_to_resolve_non_relative_module_name_1, state.compilerOptions.baseUrl, moduleName);
+        }
+        var matchedPattern = undefined;
+        if (state.compilerOptions.paths) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.paths_option_is_specified_looking_for_a_pattern_to_match_module_name_0, moduleName);
+            }
+            matchedPattern = ts.matchPatternOrExact(ts.getOwnKeys(state.compilerOptions.paths), moduleName);
+        }
+        if (matchedPattern) {
+            var matchedStar_1 = typeof matchedPattern === "string" ? undefined : ts.matchedText(matchedPattern, moduleName);
+            var matchedPatternText = typeof matchedPattern === "string" ? matchedPattern : ts.patternText(matchedPattern);
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Module_name_0_matched_pattern_1, moduleName, matchedPatternText);
+            }
+            return ts.forEach(state.compilerOptions.paths[matchedPatternText], function (subst) {
+                var path = matchedStar_1 ? subst.replace("*", matchedStar_1) : subst;
+                var candidate = ts.normalizePath(ts.combinePaths(state.compilerOptions.baseUrl, path));
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.Trying_substitution_0_candidate_module_location_Colon_1, subst, path);
+                }
+                var tsExtension = ts.tryGetExtensionFromPath(candidate);
+                if (tsExtension !== undefined) {
+                    var path_1 = tryFile(candidate, failedLookupLocations, false, state);
+                    return path_1 && { path: path_1, extension: tsExtension };
+                }
+                return loader(extensions, candidate, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
+            });
+        }
+        else {
+            var candidate = ts.normalizePath(ts.combinePaths(state.compilerOptions.baseUrl, moduleName));
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Resolving_module_name_0_relative_to_base_url_1_2, moduleName, state.compilerOptions.baseUrl, candidate);
+            }
+            return loader(extensions, candidate, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
+        }
+    }
+    function nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host) {
+        var containingDirectory = ts.getDirectoryPath(containingFile);
+        var traceEnabled = isTraceEnabled(compilerOptions, host);
+        var failedLookupLocations = [];
+        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled };
+        var result = tryResolve(0) || tryResolve(1);
+        if (result) {
+            var resolved = result.resolved, isExternalLibraryImport = result.isExternalLibraryImport;
+            return createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations);
+        }
+        return { resolvedModule: undefined, failedLookupLocations: failedLookupLocations };
+        function tryResolve(extensions) {
+            var resolved = tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, nodeLoadModuleByRelativeName, failedLookupLocations, state);
+            if (resolved) {
+                return { resolved: resolved, isExternalLibraryImport: false };
+            }
+            if (moduleHasNonRelativeName(moduleName)) {
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Loading_module_0_from_node_modules_folder, moduleName);
+                }
+                var resolved_1 = loadModuleFromNodeModules(extensions, moduleName, containingDirectory, failedLookupLocations, state);
+                return resolved_1 && { resolved: { path: realpath(resolved_1.path, host, traceEnabled), extension: resolved_1.extension }, isExternalLibraryImport: true };
+            }
+            else {
+                var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
+                var resolved_2 = nodeLoadModuleByRelativeName(extensions, candidate, failedLookupLocations, false, state);
+                return resolved_2 && { resolved: resolved_2, isExternalLibraryImport: false };
+            }
+        }
+    }
+    ts.nodeModuleNameResolver = nodeModuleNameResolver;
+    function realpath(path, host, traceEnabled) {
+        if (!host.realpath) {
+            return path;
+        }
+        var real = ts.normalizePath(host.realpath(path));
+        if (traceEnabled) {
+            trace(host, ts.Diagnostics.Resolving_real_path_for_0_result_1, path, real);
+        }
+        return real;
+    }
+    function nodeLoadModuleByRelativeName(extensions, candidate, failedLookupLocations, onlyRecordFailures, state) {
+        if (state.traceEnabled) {
+            trace(state.host, ts.Diagnostics.Loading_module_as_file_Slash_folder_candidate_module_location_0, candidate);
+        }
+        var resolvedFromFile = !ts.pathEndsWithDirectorySeparator(candidate) && loadModuleFromFile(extensions, candidate, failedLookupLocations, onlyRecordFailures, state);
+        return resolvedFromFile || loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, onlyRecordFailures, state);
+    }
+    function directoryProbablyExists(directoryName, host) {
+        return !host.directoryExists || host.directoryExists(directoryName);
+    }
+    ts.directoryProbablyExists = directoryProbablyExists;
+    function loadModuleFromFile(extensions, candidate, failedLookupLocations, onlyRecordFailures, state) {
+        var resolvedByAddingExtension = tryAddingExtensions(candidate, extensions, failedLookupLocations, onlyRecordFailures, state);
+        if (resolvedByAddingExtension) {
+            return resolvedByAddingExtension;
+        }
+        if (ts.hasJavaScriptFileExtension(candidate)) {
+            var extensionless = ts.removeFileExtension(candidate);
+            if (state.traceEnabled) {
+                var extension = candidate.substring(extensionless.length);
+                trace(state.host, ts.Diagnostics.File_name_0_has_a_1_extension_stripping_it, candidate, extension);
+            }
+            return tryAddingExtensions(extensionless, extensions, failedLookupLocations, onlyRecordFailures, state);
+        }
+    }
+    function tryAddingExtensions(candidate, extensions, failedLookupLocations, onlyRecordFailures, state) {
+        if (!onlyRecordFailures) {
+            var directory = ts.getDirectoryPath(candidate);
+            if (directory) {
+                onlyRecordFailures = !directoryProbablyExists(directory, state.host);
+            }
+        }
+        switch (extensions) {
+            case 2:
+                return tryExtension(".d.ts", ts.Extension.Dts);
+            case 0:
+                return tryExtension(".ts", ts.Extension.Ts) || tryExtension(".tsx", ts.Extension.Tsx) || tryExtension(".d.ts", ts.Extension.Dts);
+            case 1:
+                return tryExtension(".js", ts.Extension.Js) || tryExtension(".jsx", ts.Extension.Jsx);
+        }
+        function tryExtension(ext, extension) {
+            var path = tryFile(candidate + ext, failedLookupLocations, onlyRecordFailures, state);
+            return path && { path: path, extension: extension };
+        }
+    }
+    function tryFile(fileName, failedLookupLocations, onlyRecordFailures, state) {
+        if (!onlyRecordFailures && state.host.fileExists(fileName)) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.File_0_exist_use_it_as_a_name_resolution_result, fileName);
+            }
+            return fileName;
+        }
+        else {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.File_0_does_not_exist, fileName);
+            }
+            failedLookupLocations.push(fileName);
+            return undefined;
+        }
+    }
+    function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, onlyRecordFailures, state) {
+        var packageJsonPath = pathToPackageJson(candidate);
+        var directoryExists = !onlyRecordFailures && directoryProbablyExists(candidate, state.host);
+        if (directoryExists && state.host.fileExists(packageJsonPath)) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath);
+            }
+            var typesFile = tryReadTypesSection(extensions, packageJsonPath, candidate, state);
+            if (typesFile) {
+                var onlyRecordFailures_1 = !directoryProbablyExists(ts.getDirectoryPath(typesFile), state.host);
+                var fromFile = tryFile(typesFile, failedLookupLocations, onlyRecordFailures_1, state);
+                if (fromFile) {
+                    return resolvedFromAnyFile(fromFile);
+                }
+                var x = tryAddingExtensions(typesFile, 0, failedLookupLocations, onlyRecordFailures_1, state);
+                if (x) {
+                    return x;
+                }
+            }
+            else {
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.package_json_does_not_have_a_types_or_main_field);
+                }
+            }
+        }
+        else {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.File_0_does_not_exist, packageJsonPath);
+            }
+            failedLookupLocations.push(packageJsonPath);
+        }
+        return loadModuleFromFile(extensions, ts.combinePaths(candidate, "index"), failedLookupLocations, !directoryExists, state);
+    }
+    function pathToPackageJson(directory) {
+        return ts.combinePaths(directory, "package.json");
+    }
+    function loadModuleFromNodeModulesFolder(extensions, moduleName, directory, failedLookupLocations, state) {
+        var nodeModulesFolder = ts.combinePaths(directory, "node_modules");
+        var nodeModulesFolderExists = directoryProbablyExists(nodeModulesFolder, state.host);
+        var candidate = ts.normalizePath(ts.combinePaths(nodeModulesFolder, moduleName));
+        return loadModuleFromFile(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state) ||
+            loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state);
+    }
+    function loadModuleFromNodeModules(extensions, moduleName, directory, failedLookupLocations, state) {
+        return loadModuleFromNodeModulesWorker(extensions, moduleName, directory, failedLookupLocations, state, false);
+    }
+    function loadModuleFromNodeModulesAtTypes(moduleName, directory, failedLookupLocations, state) {
+        return loadModuleFromNodeModulesWorker(2, moduleName, directory, failedLookupLocations, state, true);
+    }
+    function loadModuleFromNodeModulesWorker(extensions, moduleName, directory, failedLookupLocations, state, typesOnly) {
+        return forEachAncestorDirectory(ts.normalizeSlashes(directory), function (ancestorDirectory) {
+            if (ts.getBaseFileName(ancestorDirectory) !== "node_modules") {
+                return loadModuleFromNodeModulesOneLevel(extensions, moduleName, ancestorDirectory, failedLookupLocations, state, typesOnly);
+            }
+        });
+    }
+    function loadModuleFromNodeModulesOneLevel(extensions, moduleName, directory, failedLookupLocations, state, typesOnly) {
+        if (typesOnly === void 0) { typesOnly = false; }
+        var packageResult = typesOnly ? undefined : loadModuleFromNodeModulesFolder(extensions, moduleName, directory, failedLookupLocations, state);
+        if (packageResult) {
+            return packageResult;
+        }
+        if (extensions !== 1) {
+            return loadModuleFromNodeModulesFolder(2, ts.combinePaths("@types", moduleName), directory, failedLookupLocations, state);
+        }
+    }
+    function classicNameResolver(moduleName, containingFile, compilerOptions, host) {
+        var traceEnabled = isTraceEnabled(compilerOptions, host);
+        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled };
+        var failedLookupLocations = [];
+        var containingDirectory = ts.getDirectoryPath(containingFile);
+        var resolved = tryResolve(0) || tryResolve(1);
+        return createResolvedModuleWithFailedLookupLocations(resolved, false, failedLookupLocations);
+        function tryResolve(extensions) {
+            var resolvedUsingSettings = tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, loadModuleFromFile, failedLookupLocations, state);
+            if (resolvedUsingSettings) {
+                return resolvedUsingSettings;
+            }
+            if (moduleHasNonRelativeName(moduleName)) {
+                var resolved_3 = forEachAncestorDirectory(containingDirectory, function (directory) {
+                    var searchName = ts.normalizePath(ts.combinePaths(directory, moduleName));
+                    return loadModuleFromFile(extensions, searchName, failedLookupLocations, false, state);
+                });
+                if (resolved_3) {
+                    return resolved_3;
+                }
+                if (extensions === 0) {
+                    return loadModuleFromNodeModulesAtTypes(moduleName, containingDirectory, failedLookupLocations, state);
+                }
+            }
+            else {
+                var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
+                return loadModuleFromFile(extensions, candidate, failedLookupLocations, false, state);
+            }
+        }
+    }
+    ts.classicNameResolver = classicNameResolver;
+    function loadModuleFromGlobalCache(moduleName, projectName, compilerOptions, host, globalCache) {
+        var traceEnabled = isTraceEnabled(compilerOptions, host);
+        if (traceEnabled) {
+            trace(host, ts.Diagnostics.Auto_discovery_for_typings_is_enabled_in_project_0_Running_extra_resolution_pass_for_module_1_using_cache_location_2, projectName, moduleName, globalCache);
+        }
+        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled };
+        var failedLookupLocations = [];
+        var resolved = loadModuleFromNodeModulesOneLevel(2, moduleName, globalCache, failedLookupLocations, state);
+        return createResolvedModuleWithFailedLookupLocations(resolved, true, failedLookupLocations);
+    }
+    ts.loadModuleFromGlobalCache = loadModuleFromGlobalCache;
+    function forEachAncestorDirectory(directory, callback) {
+        while (true) {
+            var result = callback(directory);
+            if (result !== undefined) {
+                return result;
+            }
+            var parentPath = ts.getDirectoryPath(directory);
+            if (parentPath === directory) {
+                return undefined;
+            }
+            directory = parentPath;
+        }
+    }
+})(ts || (ts = {}));
+var ts;
+(function (ts) {
+    ts.externalHelpersModuleNameText = "tslib";
+    function getDeclarationOfKind(symbol, kind) {
+        var declarations = symbol.declarations;
+        if (declarations) {
+            for (var _i = 0, declarations_1 = declarations; _i < declarations_1.length; _i++) {
+                var declaration = declarations_1[_i];
+                if (declaration.kind === kind) {
+                    return declaration;
+                }
+            }
+        }
+        return undefined;
+    }
+    ts.getDeclarationOfKind = getDeclarationOfKind;
+    var stringWriters = [];
+    function getSingleLineStringWriter() {
+        if (stringWriters.length === 0) {
+            var str_1 = "";
+            var writeText = function (text) { return str_1 += text; };
+            return {
+                string: function () { return str_1; },
+                writeKeyword: writeText,
+                writeOperator: writeText,
+                writePunctuation: writeText,
+                writeSpace: writeText,
+                writeStringLiteral: writeText,
+                writeParameter: writeText,
+                writeSymbol: writeText,
+                writeLine: function () { return str_1 += " "; },
+                increaseIndent: ts.noop,
+                decreaseIndent: ts.noop,
+                clear: function () { return str_1 = ""; },
+                trackSymbol: ts.noop,
+                reportInaccessibleThisError: ts.noop
+            };
+        }
+        return stringWriters.pop();
+    }
+    ts.getSingleLineStringWriter = getSingleLineStringWriter;
+    function releaseStringWriter(writer) {
+        writer.clear();
+        stringWriters.push(writer);
+    }
+    ts.releaseStringWriter = releaseStringWriter;
+    function getFullWidth(node) {
+        return node.end - node.pos;
+    }
+    ts.getFullWidth = getFullWidth;
+    function hasResolvedModule(sourceFile, moduleNameText) {
+        return !!(sourceFile && sourceFile.resolvedModules && sourceFile.resolvedModules[moduleNameText]);
+    }
+    ts.hasResolvedModule = hasResolvedModule;
+    function getResolvedModule(sourceFile, moduleNameText) {
+        return hasResolvedModule(sourceFile, moduleNameText) ? sourceFile.resolvedModules[moduleNameText] : undefined;
+    }
+    ts.getResolvedModule = getResolvedModule;
+    function setResolvedModule(sourceFile, moduleNameText, resolvedModule) {
+        if (!sourceFile.resolvedModules) {
+            sourceFile.resolvedModules = ts.createMap();
+        }
+        sourceFile.resolvedModules[moduleNameText] = resolvedModule;
+    }
+    ts.setResolvedModule = setResolvedModule;
+    function setResolvedTypeReferenceDirective(sourceFile, typeReferenceDirectiveName, resolvedTypeReferenceDirective) {
+        if (!sourceFile.resolvedTypeReferenceDirectiveNames) {
+            sourceFile.resolvedTypeReferenceDirectiveNames = ts.createMap();
+        }
+        sourceFile.resolvedTypeReferenceDirectiveNames[typeReferenceDirectiveName] = resolvedTypeReferenceDirective;
+    }
+    ts.setResolvedTypeReferenceDirective = setResolvedTypeReferenceDirective;
+    function moduleResolutionIsEqualTo(oldResolution, newResolution) {
+        return oldResolution.isExternalLibraryImport === newResolution.isExternalLibraryImport &&
+            oldResolution.extension === newResolution.extension &&
+            oldResolution.resolvedFileName === newResolution.resolvedFileName;
+    }
+    ts.moduleResolutionIsEqualTo = moduleResolutionIsEqualTo;
+    function typeDirectiveIsEqualTo(oldResolution, newResolution) {
+        return oldResolution.resolvedFileName === newResolution.resolvedFileName && oldResolution.primary === newResolution.primary;
+    }
+    ts.typeDirectiveIsEqualTo = typeDirectiveIsEqualTo;
+    function hasChangesInResolutions(names, newResolutions, oldResolutions, comparer) {
+        if (names.length !== newResolutions.length) {
+            return false;
+        }
+        for (var i = 0; i < names.length; i++) {
+            var newResolution = newResolutions[i];
+            var oldResolution = oldResolutions && oldResolutions[names[i]];
+            var changed = oldResolution
+                ? !newResolution || !comparer(oldResolution, newResolution)
+                : newResolution;
+            if (changed) {
+                return true;
+            }
+        }
+        return false;
+    }
+    ts.hasChangesInResolutions = hasChangesInResolutions;
+    function containsParseError(node) {
+        aggregateChildData(node);
+        return (node.flags & 4194304) !== 0;
+    }
+    ts.containsParseError = containsParseError;
+    function aggregateChildData(node) {
+        if (!(node.flags & 8388608)) {
+            var thisNodeOrAnySubNodesHasError = ((node.flags & 1048576) !== 0) ||
+                ts.forEachChild(node, containsParseError);
+            if (thisNodeOrAnySubNodesHasError) {
+                node.flags |= 4194304;
+            }
+            node.flags |= 8388608;
+        }
+    }
+    function getSourceFileOfNode(node) {
+        while (node && node.kind !== 261) {
+            node = node.parent;
+        }
+        return node;
+    }
+    ts.getSourceFileOfNode = getSourceFileOfNode;
+    function isStatementWithLocals(node) {
+        switch (node.kind) {
+            case 204:
+            case 232:
+            case 211:
+            case 212:
+            case 213:
+                return true;
+        }
+        return false;
+    }
+    ts.isStatementWithLocals = isStatementWithLocals;
+    function getStartPositionOfLine(line, sourceFile) {
+        ts.Debug.assert(line >= 0);
+        return ts.getLineStarts(sourceFile)[line];
+    }
+    ts.getStartPositionOfLine = getStartPositionOfLine;
+    function nodePosToString(node) {
+        var file = getSourceFileOfNode(node);
+        var loc = ts.getLineAndCharacterOfPosition(file, node.pos);
+        return file.fileName + "(" + (loc.line + 1) + "," + (loc.character + 1) + ")";
+    }
+    ts.nodePosToString = nodePosToString;
+    function getStartPosOfNode(node) {
+        return node.pos;
+    }
+    ts.getStartPosOfNode = getStartPosOfNode;
+    function isDefined(value) {
+        return value !== undefined;
+    }
+    ts.isDefined = isDefined;
+    function getEndLinePosition(line, sourceFile) {
+        ts.Debug.assert(line >= 0);
+        var lineStarts = ts.getLineStarts(sourceFile);
+        var lineIndex = line;
+        var sourceText = sourceFile.text;
+        if (lineIndex + 1 === lineStarts.length) {
+            return sourceText.length - 1;
+        }
+        else {
+            var start = lineStarts[lineIndex];
+            var pos = lineStarts[lineIndex + 1] - 1;
+            ts.Debug.assert(ts.isLineBreak(sourceText.charCodeAt(pos)));
+            while (start <= pos && ts.isLineBreak(sourceText.charCodeAt(pos))) {
+                pos--;
+            }
+            return pos;
+        }
+    }
+    ts.getEndLinePosition = getEndLinePosition;
+    function nodeIsMissing(node) {
+        if (node === undefined) {
+            return true;
+        }
+        return node.pos === node.end && node.pos >= 0 && node.kind !== 1;
+    }
+    ts.nodeIsMissing = nodeIsMissing;
+    function nodeIsPresent(node) {
+        return !nodeIsMissing(node);
+    }
+    ts.nodeIsPresent = nodeIsPresent;
+    function getTokenPosOfNode(node, sourceFile, includeJsDocComment) {
+        if (nodeIsMissing(node)) {
+            return node.pos;
+        }
+        if (isJSDocNode(node)) {
+            return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos, false, true);
+        }
+        if (includeJsDocComment && node.jsDocComments && node.jsDocComments.length > 0) {
+            return getTokenPosOfNode(node.jsDocComments[0]);
+        }
+        if (node.kind === 291 && node._children.length > 0) {
+            return getTokenPosOfNode(node._children[0], sourceFile, includeJsDocComment);
+        }
+        return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos);
+    }
+    ts.getTokenPosOfNode = getTokenPosOfNode;
+    function isJSDocNode(node) {
+        return node.kind >= 262 && node.kind <= 287;
+    }
+    ts.isJSDocNode = isJSDocNode;
+    function isJSDocTag(node) {
+        return node.kind >= 278 && node.kind <= 290;
+    }
+    ts.isJSDocTag = isJSDocTag;
+    function getNonDecoratorTokenPosOfNode(node, sourceFile) {
+        if (nodeIsMissing(node) || !node.decorators) {
+            return getTokenPosOfNode(node, sourceFile);
+        }
+        return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.decorators.end);
+    }
+    ts.getNonDecoratorTokenPosOfNode = getNonDecoratorTokenPosOfNode;
+    function getSourceTextOfNodeFromSourceFile(sourceFile, node, includeTrivia) {
+        if (includeTrivia === void 0) { includeTrivia = false; }
+        if (nodeIsMissing(node)) {
+            return "";
+        }
+        var text = sourceFile.text;
+        return text.substring(includeTrivia ? node.pos : ts.skipTrivia(text, node.pos), node.end);
+    }
+    ts.getSourceTextOfNodeFromSourceFile = getSourceTextOfNodeFromSourceFile;
+    function getTextOfNodeFromSourceText(sourceText, node) {
+        if (nodeIsMissing(node)) {
+            return "";
+        }
+        return sourceText.substring(ts.skipTrivia(sourceText, node.pos), node.end);
+    }
+    ts.getTextOfNodeFromSourceText = getTextOfNodeFromSourceText;
+    function getTextOfNode(node, includeTrivia) {
+        if (includeTrivia === void 0) { includeTrivia = false; }
+        return getSourceTextOfNodeFromSourceFile(getSourceFileOfNode(node), node, includeTrivia);
+    }
+    ts.getTextOfNode = getTextOfNode;
+    function getLiteralText(node, sourceFile, languageVersion) {
+        if (languageVersion < 2 && (isTemplateLiteralKind(node.kind) || node.hasExtendedUnicodeEscape)) {
+            return getQuotedEscapedLiteralText('"', node.text, '"');
+        }
+        if (!nodeIsSynthesized(node) && node.parent) {
+            var text = getSourceTextOfNodeFromSourceFile(sourceFile, node);
+            if (languageVersion < 2 && isBinaryOrOctalIntegerLiteral(node, text)) {
+                return node.text;
+            }
+            return text;
+        }
+        switch (node.kind) {
+            case 9:
+                return getQuotedEscapedLiteralText('"', node.text, '"');
+            case 12:
+                return getQuotedEscapedLiteralText("`", node.text, "`");
+            case 13:
+                return getQuotedEscapedLiteralText("`", node.text, "${");
+            case 14:
+                return getQuotedEscapedLiteralText("}", node.text, "${");
+            case 15:
+                return getQuotedEscapedLiteralText("}", node.text, "`");
+            case 8:
+                return node.text;
+        }
+        ts.Debug.fail("Literal kind '" + node.kind + "' not accounted for.");
+    }
+    ts.getLiteralText = getLiteralText;
+    function isBinaryOrOctalIntegerLiteral(node, text) {
+        if (node.kind === 8 && text.length > 1) {
+            switch (text.charCodeAt(1)) {
+                case 98:
+                case 66:
+                case 111:
+                case 79:
+                    return true;
+            }
+        }
+        return false;
+    }
+    ts.isBinaryOrOctalIntegerLiteral = isBinaryOrOctalIntegerLiteral;
+    function getQuotedEscapedLiteralText(leftQuote, text, rightQuote) {
+        return leftQuote + escapeNonAsciiCharacters(escapeString(text)) + rightQuote;
+    }
+    function escapeIdentifier(identifier) {
+        return identifier.length >= 2 && identifier.charCodeAt(0) === 95 && identifier.charCodeAt(1) === 95 ? "_" + identifier : identifier;
+    }
+    ts.escapeIdentifier = escapeIdentifier;
+    function unescapeIdentifier(identifier) {
+        return identifier.length >= 3 && identifier.charCodeAt(0) === 95 && identifier.charCodeAt(1) === 95 && identifier.charCodeAt(2) === 95 ? identifier.substr(1) : identifier;
+    }
+    ts.unescapeIdentifier = unescapeIdentifier;
+    function makeIdentifierFromModuleName(moduleName) {
+        return ts.getBaseFileName(moduleName).replace(/^(\d)/, "_$1").replace(/\W/g, "_");
+    }
+    ts.makeIdentifierFromModuleName = makeIdentifierFromModuleName;
+    function isBlockOrCatchScoped(declaration) {
+        return (ts.getCombinedNodeFlags(declaration) & 3) !== 0 ||
+            isCatchClauseVariableDeclarationOrBindingElement(declaration);
+    }
+    ts.isBlockOrCatchScoped = isBlockOrCatchScoped;
+    function isCatchClauseVariableDeclarationOrBindingElement(declaration) {
+        var node = getRootDeclaration(declaration);
+        return node.kind === 223 && node.parent.kind === 256;
+    }
+    ts.isCatchClauseVariableDeclarationOrBindingElement = isCatchClauseVariableDeclarationOrBindingElement;
+    function isAmbientModule(node) {
+        return node && node.kind === 230 &&
+            (node.name.kind === 9 || isGlobalScopeAugmentation(node));
+    }
+    ts.isAmbientModule = isAmbientModule;
+    function isShorthandAmbientModuleSymbol(moduleSymbol) {
+        return isShorthandAmbientModule(moduleSymbol.valueDeclaration);
+    }
+    ts.isShorthandAmbientModuleSymbol = isShorthandAmbientModuleSymbol;
+    function isShorthandAmbientModule(node) {
+        return node.kind === 230 && (!node.body);
+    }
+    function isBlockScopedContainerTopLevel(node) {
+        return node.kind === 261 ||
+            node.kind === 230 ||
+            isFunctionLike(node);
+    }
+    ts.isBlockScopedContainerTopLevel = isBlockScopedContainerTopLevel;
+    function isGlobalScopeAugmentation(module) {
+        return !!(module.flags & 512);
+    }
+    ts.isGlobalScopeAugmentation = isGlobalScopeAugmentation;
+    function isExternalModuleAugmentation(node) {
+        if (!node || !isAmbientModule(node)) {
+            return false;
+        }
+        switch (node.parent.kind) {
+            case 261:
+                return ts.isExternalModule(node.parent);
+            case 231:
+                return isAmbientModule(node.parent.parent) && !ts.isExternalModule(node.parent.parent.parent);
+        }
+        return false;
+    }
+    ts.isExternalModuleAugmentation = isExternalModuleAugmentation;
+    function isBlockScope(node, parentNode) {
+        switch (node.kind) {
+            case 261:
+            case 232:
+            case 256:
+            case 230:
+            case 211:
+            case 212:
+            case 213:
+            case 150:
+            case 149:
+            case 151:
+            case 152:
+            case 225:
+            case 184:
+            case 185:
+                return true;
+            case 204:
+                return parentNode && !isFunctionLike(parentNode);
+        }
+        return false;
+    }
+    ts.isBlockScope = isBlockScope;
+    function getEnclosingBlockScopeContainer(node) {
+        var current = node.parent;
+        while (current) {
+            if (isBlockScope(current, current.parent)) {
+                return current;
+            }
+            current = current.parent;
+        }
+    }
+    ts.getEnclosingBlockScopeContainer = getEnclosingBlockScopeContainer;
+    function declarationNameToString(name) {
+        return getFullWidth(name) === 0 ? "(Missing)" : getTextOfNode(name);
+    }
+    ts.declarationNameToString = declarationNameToString;
+    function getTextOfPropertyName(name) {
+        switch (name.kind) {
+            case 70:
+                return name.text;
+            case 9:
+            case 8:
+                return name.text;
+            case 142:
+                if (isStringOrNumericLiteral(name.expression.kind)) {
+                    return name.expression.text;
+                }
+        }
+        return undefined;
+    }
+    ts.getTextOfPropertyName = getTextOfPropertyName;
+    function entityNameToString(name) {
+        switch (name.kind) {
+            case 70:
+                return getFullWidth(name) === 0 ? unescapeIdentifier(name.text) : getTextOfNode(name);
+            case 141:
+                return entityNameToString(name.left) + "." + entityNameToString(name.right);
+            case 177:
+                return entityNameToString(name.expression) + "." + entityNameToString(name.name);
+        }
+    }
+    ts.entityNameToString = entityNameToString;
+    function createDiagnosticForNode(node, message, arg0, arg1, arg2) {
+        var sourceFile = getSourceFileOfNode(node);
+        return createDiagnosticForNodeInSourceFile(sourceFile, node, message, arg0, arg1, arg2);
+    }
+    ts.createDiagnosticForNode = createDiagnosticForNode;
+    function createDiagnosticForNodeInSourceFile(sourceFile, node, message, arg0, arg1, arg2) {
+        var span = getErrorSpanForNode(sourceFile, node);
+        return ts.createFileDiagnostic(sourceFile, span.start, span.length, message, arg0, arg1, arg2);
+    }
+    ts.createDiagnosticForNodeInSourceFile = createDiagnosticForNodeInSourceFile;
+    function createDiagnosticForNodeFromMessageChain(node, messageChain) {
+        var sourceFile = getSourceFileOfNode(node);
+        var span = getErrorSpanForNode(sourceFile, node);
+        return {
+            file: sourceFile,
+            start: span.start,
+            length: span.length,
+            code: messageChain.code,
+            category: messageChain.category,
+            messageText: messageChain.next ? messageChain : messageChain.messageText
+        };
+    }
+    ts.createDiagnosticForNodeFromMessageChain = createDiagnosticForNodeFromMessageChain;
+    function getSpanOfTokenAtPosition(sourceFile, pos) {
+        var scanner = ts.createScanner(sourceFile.languageVersion, true, sourceFile.languageVariant, sourceFile.text, undefined, pos);
+        scanner.scan();
+        var start = scanner.getTokenPos();
+        return ts.createTextSpanFromBounds(start, scanner.getTextPos());
+    }
+    ts.getSpanOfTokenAtPosition = getSpanOfTokenAtPosition;
+    function getErrorSpanForArrowFunction(sourceFile, node) {
+        var pos = ts.skipTrivia(sourceFile.text, node.pos);
+        if (node.body && node.body.kind === 204) {
+            var startLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.pos).line;
+            var endLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.end).line;
+            if (startLine < endLine) {
+                return ts.createTextSpan(pos, getEndLinePosition(startLine, sourceFile) - pos + 1);
+            }
+        }
+        return ts.createTextSpanFromBounds(pos, node.end);
+    }
+    function getErrorSpanForNode(sourceFile, node) {
+        var errorNode = node;
+        switch (node.kind) {
+            case 261:
+                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 223:
+            case 174:
+            case 226:
+            case 197:
+            case 227:
+            case 230:
+            case 229:
+            case 260:
+            case 225:
+            case 184:
+            case 149:
+            case 151:
+            case 152:
+            case 228:
+                errorNode = node.name;
+                break;
+            case 185:
+                return getErrorSpanForArrowFunction(sourceFile, node);
+        }
+        if (errorNode === undefined) {
+            return getSpanOfTokenAtPosition(sourceFile, node.pos);
+        }
+        var pos = nodeIsMissing(errorNode)
+            ? errorNode.pos
+            : ts.skipTrivia(sourceFile.text, errorNode.pos);
+        return ts.createTextSpanFromBounds(pos, errorNode.end);
+    }
+    ts.getErrorSpanForNode = getErrorSpanForNode;
+    function isExternalOrCommonJsModule(file) {
+        return (file.externalModuleIndicator || file.commonJsModuleIndicator) !== undefined;
+    }
+    ts.isExternalOrCommonJsModule = isExternalOrCommonJsModule;
+    function isDeclarationFile(file) {
+        return file.isDeclarationFile;
+    }
+    ts.isDeclarationFile = isDeclarationFile;
+    function isConstEnumDeclaration(node) {
+        return node.kind === 229 && isConst(node);
+    }
+    ts.isConstEnumDeclaration = isConstEnumDeclaration;
+    function isConst(node) {
+        return !!(ts.getCombinedNodeFlags(node) & 2)
+            || !!(ts.getCombinedModifierFlags(node) & 2048);
+    }
+    ts.isConst = isConst;
+    function isLet(node) {
+        return !!(ts.getCombinedNodeFlags(node) & 1);
+    }
+    ts.isLet = isLet;
+    function isSuperCall(n) {
+        return n.kind === 179 && n.expression.kind === 96;
+    }
+    ts.isSuperCall = isSuperCall;
+    function isPrologueDirective(node) {
+        return node.kind === 207 && node.expression.kind === 9;
+    }
+    ts.isPrologueDirective = isPrologueDirective;
+    function getLeadingCommentRangesOfNode(node, sourceFileOfNode) {
+        return ts.getLeadingCommentRanges(sourceFileOfNode.text, node.pos);
+    }
+    ts.getLeadingCommentRangesOfNode = getLeadingCommentRangesOfNode;
+    function getLeadingCommentRangesOfNodeFromText(node, text) {
+        return ts.getLeadingCommentRanges(text, node.pos);
+    }
+    ts.getLeadingCommentRangesOfNodeFromText = getLeadingCommentRangesOfNodeFromText;
+    function getJsDocComments(node, sourceFileOfNode) {
+        return getJsDocCommentsFromText(node, sourceFileOfNode.text);
+    }
+    ts.getJsDocComments = getJsDocComments;
+    function getJsDocCommentsFromText(node, text) {
+        var commentRanges = (node.kind === 144 ||
+            node.kind === 143 ||
+            node.kind === 184 ||
+            node.kind === 185) ?
+            ts.concatenate(ts.getTrailingCommentRanges(text, node.pos), ts.getLeadingCommentRanges(text, node.pos)) :
+            getLeadingCommentRangesOfNodeFromText(node, text);
+        return ts.filter(commentRanges, isJsDocComment);
+        function isJsDocComment(comment) {
+            return text.charCodeAt(comment.pos + 1) === 42 &&
+                text.charCodeAt(comment.pos + 2) === 42 &&
+                text.charCodeAt(comment.pos + 3) !== 47;
+        }
+    }
+    ts.getJsDocCommentsFromText = getJsDocCommentsFromText;
+    ts.fullTripleSlashReferencePathRegEx = /^(\/\/\/\s*<reference\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
+    ts.fullTripleSlashReferenceTypeReferenceDirectiveRegEx = /^(\/\/\/\s*<reference\s+types\s*=\s*)('|")(.+?)\2.*?\/>/;
+    ts.fullTripleSlashAMDReferencePathRegEx = /^(\/\/\/\s*<amd-dependency\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
+    function isPartOfTypeNode(node) {
+        if (156 <= node.kind && node.kind <= 171) {
+            return true;
+        }
+        switch (node.kind) {
+            case 118:
+            case 132:
+            case 134:
+            case 121:
+            case 135:
+            case 137:
+            case 129:
+                return true;
+            case 104:
+                return node.parent.kind !== 188;
+            case 199:
+                return !isExpressionWithTypeArgumentsInClassExtendsClause(node);
+            case 70:
+                if (node.parent.kind === 141 && node.parent.right === node) {
+                    node = node.parent;
+                }
+                else if (node.parent.kind === 177 && node.parent.name === node) {
+                    node = node.parent;
+                }
+                ts.Debug.assert(node.kind === 70 || node.kind === 141 || node.kind === 177, "'node' was expected to be a qualified name, identifier or property access in 'isPartOfTypeNode'.");
+            case 141:
+            case 177:
+            case 98:
+                var parent_1 = node.parent;
+                if (parent_1.kind === 160) {
+                    return false;
+                }
+                if (156 <= parent_1.kind && parent_1.kind <= 171) {
+                    return true;
+                }
+                switch (parent_1.kind) {
+                    case 199:
+                        return !isExpressionWithTypeArgumentsInClassExtendsClause(parent_1);
+                    case 143:
+                        return node === parent_1.constraint;
+                    case 147:
+                    case 146:
+                    case 144:
+                    case 223:
+                        return node === parent_1.type;
+                    case 225:
+                    case 184:
+                    case 185:
+                    case 150:
+                    case 149:
+                    case 148:
+                    case 151:
+                    case 152:
+                        return node === parent_1.type;
+                    case 153:
+                    case 154:
+                    case 155:
+                        return node === parent_1.type;
+                    case 182:
+                        return node === parent_1.type;
+                    case 179:
+                    case 180:
+                        return parent_1.typeArguments && ts.indexOf(parent_1.typeArguments, node) >= 0;
+                    case 181:
+                        return false;
+                }
+        }
+        return false;
+    }
+    ts.isPartOfTypeNode = isPartOfTypeNode;
+    function forEachReturnStatement(body, visitor) {
+        return traverse(body);
+        function traverse(node) {
+            switch (node.kind) {
+                case 216:
+                    return visitor(node);
+                case 232:
+                case 204:
+                case 208:
+                case 209:
+                case 210:
+                case 211:
+                case 212:
+                case 213:
+                case 217:
+                case 218:
+                case 253:
+                case 254:
+                case 219:
+                case 221:
+                case 256:
+                    return ts.forEachChild(node, traverse);
+            }
+        }
+    }
+    ts.forEachReturnStatement = forEachReturnStatement;
+    function forEachYieldExpression(body, visitor) {
+        return traverse(body);
+        function traverse(node) {
+            switch (node.kind) {
+                case 195:
+                    visitor(node);
+                    var operand = node.expression;
+                    if (operand) {
+                        traverse(operand);
+                    }
+                case 229:
+                case 227:
+                case 230:
+                case 228:
+                case 226:
+                case 197:
+                    return;
+                default:
+                    if (isFunctionLike(node)) {
+                        var name_7 = node.name;
+                        if (name_7 && name_7.kind === 142) {
+                            traverse(name_7.expression);
+                            return;
+                        }
+                    }
+                    else if (!isPartOfTypeNode(node)) {
+                        ts.forEachChild(node, traverse);
+                    }
+            }
+        }
+    }
+    ts.forEachYieldExpression = forEachYieldExpression;
+    function isVariableLike(node) {
+        if (node) {
+            switch (node.kind) {
+                case 174:
+                case 260:
+                case 144:
+                case 257:
+                case 147:
+                case 146:
+                case 258:
+                case 223:
+                    return true;
+            }
+        }
+        return false;
+    }
+    ts.isVariableLike = isVariableLike;
+    function isAccessor(node) {
+        return node && (node.kind === 151 || node.kind === 152);
+    }
+    ts.isAccessor = isAccessor;
+    function isClassLike(node) {
+        return node && (node.kind === 226 || node.kind === 197);
+    }
+    ts.isClassLike = isClassLike;
+    function isFunctionLike(node) {
+        return node && isFunctionLikeKind(node.kind);
+    }
+    ts.isFunctionLike = isFunctionLike;
+    function isFunctionLikeKind(kind) {
+        switch (kind) {
+            case 150:
+            case 184:
+            case 225:
+            case 185:
+            case 149:
+            case 148:
+            case 151:
+            case 152:
+            case 153:
+            case 154:
+            case 155:
+            case 158:
+            case 159:
+                return true;
+        }
+        return false;
+    }
+    ts.isFunctionLikeKind = isFunctionLikeKind;
+    function introducesArgumentsExoticObject(node) {
+        switch (node.kind) {
+            case 149:
+            case 148:
+            case 150:
+            case 151:
+            case 152:
+            case 225:
+            case 184:
+                return true;
+        }
+        return false;
+    }
+    ts.introducesArgumentsExoticObject = introducesArgumentsExoticObject;
+    function isIterationStatement(node, lookInLabeledStatements) {
+        switch (node.kind) {
+            case 211:
+            case 212:
+            case 213:
+            case 209:
+            case 210:
+                return true;
+            case 219:
+                return lookInLabeledStatements && isIterationStatement(node.statement, lookInLabeledStatements);
+        }
+        return false;
+    }
+    ts.isIterationStatement = isIterationStatement;
+    function isFunctionBlock(node) {
+        return node && node.kind === 204 && isFunctionLike(node.parent);
+    }
+    ts.isFunctionBlock = isFunctionBlock;
+    function isObjectLiteralMethod(node) {
+        return node && node.kind === 149 && node.parent.kind === 176;
+    }
+    ts.isObjectLiteralMethod = isObjectLiteralMethod;
+    function isObjectLiteralOrClassExpressionMethod(node) {
+        return node.kind === 149 &&
+            (node.parent.kind === 176 ||
+                node.parent.kind === 197);
+    }
+    ts.isObjectLiteralOrClassExpressionMethod = isObjectLiteralOrClassExpressionMethod;
+    function isIdentifierTypePredicate(predicate) {
+        return predicate && predicate.kind === 1;
+    }
+    ts.isIdentifierTypePredicate = isIdentifierTypePredicate;
+    function isThisTypePredicate(predicate) {
+        return predicate && predicate.kind === 0;
+    }
+    ts.isThisTypePredicate = isThisTypePredicate;
+    function getContainingFunction(node) {
+        while (true) {
+            node = node.parent;
+            if (!node || isFunctionLike(node)) {
+                return node;
+            }
+        }
+    }
+    ts.getContainingFunction = getContainingFunction;
+    function getContainingClass(node) {
+        while (true) {
+            node = node.parent;
+            if (!node || isClassLike(node)) {
+                return node;
+            }
+        }
+    }
+    ts.getContainingClass = getContainingClass;
+    function getThisContainer(node, includeArrowFunctions) {
+        while (true) {
+            node = node.parent;
+            if (!node) {
+                return undefined;
+            }
+            switch (node.kind) {
+                case 142:
+                    if (isClassLike(node.parent.parent)) {
+                        return node;
+                    }
+                    node = node.parent;
+                    break;
+                case 145:
+                    if (node.parent.kind === 144 && isClassElement(node.parent.parent)) {
+                        node = node.parent.parent;
+                    }
+                    else if (isClassElement(node.parent)) {
+                        node = node.parent;
+                    }
+                    break;
+                case 185:
+                    if (!includeArrowFunctions) {
+                        continue;
+                    }
+                case 225:
+                case 184:
+                case 230:
+                case 147:
+                case 146:
+                case 149:
+                case 148:
+                case 150:
+                case 151:
+                case 152:
+                case 153:
+                case 154:
+                case 155:
+                case 229:
+                case 261:
+                    return node;
+            }
+        }
+    }
+    ts.getThisContainer = getThisContainer;
+    function getSuperContainer(node, stopOnFunctions) {
+        while (true) {
+            node = node.parent;
+            if (!node) {
+                return node;
+            }
+            switch (node.kind) {
+                case 142:
+                    node = node.parent;
+                    break;
+                case 225:
+                case 184:
+                case 185:
+                    if (!stopOnFunctions) {
+                        continue;
+                    }
+                case 147:
+                case 146:
+                case 149:
+                case 148:
+                case 150:
+                case 151:
+                case 152:
+                    return node;
+                case 145:
+                    if (node.parent.kind === 144 && isClassElement(node.parent.parent)) {
+                        node = node.parent.parent;
+                    }
+                    else if (isClassElement(node.parent)) {
+                        node = node.parent;
+                    }
+                    break;
+            }
+        }
+    }
+    ts.getSuperContainer = getSuperContainer;
+    function getImmediatelyInvokedFunctionExpression(func) {
+        if (func.kind === 184 || func.kind === 185) {
+            var prev = func;
+            var parent_2 = func.parent;
+            while (parent_2.kind === 183) {
+                prev = parent_2;
+                parent_2 = parent_2.parent;
+            }
+            if (parent_2.kind === 179 && parent_2.expression === prev) {
+                return parent_2;
+            }
+        }
+    }
+    ts.getImmediatelyInvokedFunctionExpression = getImmediatelyInvokedFunctionExpression;
+    function isSuperProperty(node) {
+        var kind = node.kind;
+        return (kind === 177 || kind === 178)
+            && node.expression.kind === 96;
+    }
+    ts.isSuperProperty = isSuperProperty;
+    function getEntityNameFromTypeNode(node) {
+        switch (node.kind) {
+            case 157:
+            case 272:
+                return node.typeName;
+            case 199:
+                return isEntityNameExpression(node.expression)
+                    ? node.expression
+                    : undefined;
+            case 70:
+            case 141:
+                return node;
+        }
+        return undefined;
+    }
+    ts.getEntityNameFromTypeNode = getEntityNameFromTypeNode;
+    function isCallLikeExpression(node) {
+        switch (node.kind) {
+            case 179:
+            case 180:
+            case 181:
+            case 145:
+                return true;
+            default:
+                return false;
+        }
+    }
+    ts.isCallLikeExpression = isCallLikeExpression;
+    function getInvokedExpression(node) {
+        if (node.kind === 181) {
+            return node.tag;
+        }
+        return node.expression;
+    }
+    ts.getInvokedExpression = getInvokedExpression;
+    function nodeCanBeDecorated(node) {
+        switch (node.kind) {
+            case 226:
+                return true;
+            case 147:
+                return node.parent.kind === 226;
+            case 151:
+            case 152:
+            case 149:
+                return node.body !== undefined
+                    && node.parent.kind === 226;
+            case 144:
+                return node.parent.body !== undefined
+                    && (node.parent.kind === 150
+                        || node.parent.kind === 149
+                        || node.parent.kind === 152)
+                    && node.parent.parent.kind === 226;
+        }
+        return false;
+    }
+    ts.nodeCanBeDecorated = nodeCanBeDecorated;
+    function nodeIsDecorated(node) {
+        return node.decorators !== undefined
+            && nodeCanBeDecorated(node);
+    }
+    ts.nodeIsDecorated = nodeIsDecorated;
+    function nodeOrChildIsDecorated(node) {
+        return nodeIsDecorated(node) || childIsDecorated(node);
+    }
+    ts.nodeOrChildIsDecorated = nodeOrChildIsDecorated;
+    function childIsDecorated(node) {
+        switch (node.kind) {
+            case 226:
+                return ts.forEach(node.members, nodeOrChildIsDecorated);
+            case 149:
+            case 152:
+                return ts.forEach(node.parameters, nodeIsDecorated);
+        }
+    }
+    ts.childIsDecorated = childIsDecorated;
+    function isJSXTagName(node) {
+        var parent = node.parent;
+        if (parent.kind === 248 ||
+            parent.kind === 247 ||
+            parent.kind === 249) {
+            return parent.tagName === node;
+        }
+        return false;
+    }
+    ts.isJSXTagName = isJSXTagName;
+    function isPartOfExpression(node) {
+        switch (node.kind) {
+            case 98:
+            case 96:
+            case 94:
+            case 100:
+            case 85:
+            case 11:
+            case 175:
+            case 176:
+            case 177:
+            case 178:
+            case 179:
+            case 180:
+            case 181:
+            case 200:
+            case 182:
+            case 201:
+            case 183:
+            case 184:
+            case 197:
+            case 185:
+            case 188:
+            case 186:
+            case 187:
+            case 190:
+            case 191:
+            case 192:
+            case 193:
+            case 196:
+            case 194:
+            case 12:
+            case 198:
+            case 246:
+            case 247:
+            case 195:
+            case 189:
+                return true;
+            case 141:
+                while (node.parent.kind === 141) {
+                    node = node.parent;
+                }
+                return node.parent.kind === 160 || isJSXTagName(node);
+            case 70:
+                if (node.parent.kind === 160 || isJSXTagName(node)) {
+                    return true;
+                }
+            case 8:
+            case 9:
+            case 98:
+                var parent_3 = node.parent;
+                switch (parent_3.kind) {
+                    case 223:
+                    case 144:
+                    case 147:
+                    case 146:
+                    case 260:
+                    case 257:
+                    case 174:
+                        return parent_3.initializer === node;
+                    case 207:
+                    case 208:
+                    case 209:
+                    case 210:
+                    case 216:
+                    case 217:
+                    case 218:
+                    case 253:
+                    case 220:
+                    case 218:
+                        return parent_3.expression === node;
+                    case 211:
+                        var forStatement = parent_3;
+                        return (forStatement.initializer === node && forStatement.initializer.kind !== 224) ||
+                            forStatement.condition === node ||
+                            forStatement.incrementor === node;
+                    case 212:
+                    case 213:
+                        var forInStatement = parent_3;
+                        return (forInStatement.initializer === node && forInStatement.initializer.kind !== 224) ||
+                            forInStatement.expression === node;
+                    case 182:
+                    case 200:
+                        return node === parent_3.expression;
+                    case 202:
+                        return node === parent_3.expression;
+                    case 142:
+                        return node === parent_3.expression;
+                    case 145:
+                    case 252:
+                    case 251:
+                        return true;
+                    case 199:
+                        return parent_3.expression === node && isExpressionWithTypeArgumentsInClassExtendsClause(parent_3);
+                    default:
+                        if (isPartOfExpression(parent_3)) {
+                            return true;
+                        }
+                }
+        }
+        return false;
+    }
+    ts.isPartOfExpression = isPartOfExpression;
+    function isInstantiatedModule(node, preserveConstEnums) {
+        var moduleState = ts.getModuleInstanceState(node);
+        return moduleState === 1 ||
+            (preserveConstEnums && moduleState === 2);
+    }
+    ts.isInstantiatedModule = isInstantiatedModule;
+    function isExternalModuleImportEqualsDeclaration(node) {
+        return node.kind === 234 && node.moduleReference.kind === 245;
+    }
+    ts.isExternalModuleImportEqualsDeclaration = isExternalModuleImportEqualsDeclaration;
+    function getExternalModuleImportEqualsDeclarationExpression(node) {
+        ts.Debug.assert(isExternalModuleImportEqualsDeclaration(node));
+        return node.moduleReference.expression;
+    }
+    ts.getExternalModuleImportEqualsDeclarationExpression = getExternalModuleImportEqualsDeclarationExpression;
+    function isInternalModuleImportEqualsDeclaration(node) {
+        return node.kind === 234 && node.moduleReference.kind !== 245;
+    }
+    ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration;
+    function isSourceFileJavaScript(file) {
+        return isInJavaScriptFile(file);
+    }
+    ts.isSourceFileJavaScript = isSourceFileJavaScript;
+    function isInJavaScriptFile(node) {
+        return node && !!(node.flags & 2097152);
+    }
+    ts.isInJavaScriptFile = isInJavaScriptFile;
+    function isRequireCall(expression, checkArgumentIsStringLiteral) {
+        var isRequire = expression.kind === 179 &&
+            expression.expression.kind === 70 &&
+            expression.expression.text === "require" &&
+            expression.arguments.length === 1;
+        return isRequire && (!checkArgumentIsStringLiteral || expression.arguments[0].kind === 9);
+    }
+    ts.isRequireCall = isRequireCall;
+    function isSingleOrDoubleQuote(charCode) {
+        return charCode === 39 || charCode === 34;
+    }
+    ts.isSingleOrDoubleQuote = isSingleOrDoubleQuote;
+    function isDeclarationOfFunctionExpression(s) {
+        if (s.valueDeclaration && s.valueDeclaration.kind === 223) {
+            var declaration = s.valueDeclaration;
+            return declaration.initializer && declaration.initializer.kind === 184;
+        }
+        return false;
+    }
+    ts.isDeclarationOfFunctionExpression = isDeclarationOfFunctionExpression;
+    function getSpecialPropertyAssignmentKind(expression) {
+        if (!isInJavaScriptFile(expression)) {
+            return 0;
+        }
+        if (expression.kind !== 192) {
+            return 0;
+        }
+        var expr = expression;
+        if (expr.operatorToken.kind !== 57 || expr.left.kind !== 177) {
+            return 0;
+        }
+        var lhs = expr.left;
+        if (lhs.expression.kind === 70) {
+            var lhsId = lhs.expression;
+            if (lhsId.text === "exports") {
+                return 1;
+            }
+            else if (lhsId.text === "module" && lhs.name.text === "exports") {
+                return 2;
+            }
+        }
+        else if (lhs.expression.kind === 98) {
+            return 4;
+        }
+        else if (lhs.expression.kind === 177) {
+            var innerPropertyAccess = lhs.expression;
+            if (innerPropertyAccess.expression.kind === 70) {
+                var innerPropertyAccessIdentifier = innerPropertyAccess.expression;
+                if (innerPropertyAccessIdentifier.text === "module" && innerPropertyAccess.name.text === "exports") {
+                    return 1;
+                }
+                if (innerPropertyAccess.name.text === "prototype") {
+                    return 3;
+                }
+            }
+        }
+        return 0;
+    }
+    ts.getSpecialPropertyAssignmentKind = getSpecialPropertyAssignmentKind;
+    function getExternalModuleName(node) {
+        if (node.kind === 235) {
+            return node.moduleSpecifier;
+        }
+        if (node.kind === 234) {
+            var reference = node.moduleReference;
+            if (reference.kind === 245) {
+                return reference.expression;
+            }
+        }
+        if (node.kind === 241) {
+            return node.moduleSpecifier;
+        }
+        if (node.kind === 230 && node.name.kind === 9) {
+            return node.name;
+        }
+    }
+    ts.getExternalModuleName = getExternalModuleName;
+    function getNamespaceDeclarationNode(node) {
+        if (node.kind === 234) {
+            return node;
+        }
+        var importClause = node.importClause;
+        if (importClause && importClause.namedBindings && importClause.namedBindings.kind === 237) {
+            return importClause.namedBindings;
+        }
+    }
+    ts.getNamespaceDeclarationNode = getNamespaceDeclarationNode;
+    function isDefaultImport(node) {
+        return node.kind === 235
+            && node.importClause
+            && !!node.importClause.name;
+    }
+    ts.isDefaultImport = isDefaultImport;
+    function hasQuestionToken(node) {
+        if (node) {
+            switch (node.kind) {
+                case 144:
+                case 149:
+                case 148:
+                case 258:
+                case 257:
+                case 147:
+                case 146:
+                    return node.questionToken !== undefined;
+            }
+        }
+        return false;
+    }
+    ts.hasQuestionToken = hasQuestionToken;
+    function isJSDocConstructSignature(node) {
+        return node.kind === 274 &&
+            node.parameters.length > 0 &&
+            node.parameters[0].type.kind === 276;
+    }
+    ts.isJSDocConstructSignature = isJSDocConstructSignature;
+    function getJSDocTag(node, kind, checkParentVariableStatement) {
+        if (!node) {
+            return undefined;
+        }
+        var jsDocTags = getJSDocTags(node, checkParentVariableStatement);
+        if (!jsDocTags) {
+            return undefined;
+        }
+        for (var _i = 0, jsDocTags_1 = jsDocTags; _i < jsDocTags_1.length; _i++) {
+            var tag = jsDocTags_1[_i];
+            if (tag.kind === kind) {
+                return tag;
+            }
+        }
+    }
+    function append(previous, additional) {
+        if (additional) {
+            if (!previous) {
+                previous = [];
+            }
+            for (var _i = 0, additional_1 = additional; _i < additional_1.length; _i++) {
+                var x = additional_1[_i];
+                previous.push(x);
+            }
+        }
+        return previous;
+    }
+    function getJSDocComments(node, checkParentVariableStatement) {
+        return getJSDocs(node, checkParentVariableStatement, function (docs) { return ts.map(docs, function (doc) { return doc.comment; }); }, function (tags) { return ts.map(tags, function (tag) { return tag.comment; }); });
+    }
+    ts.getJSDocComments = getJSDocComments;
+    function getJSDocTags(node, checkParentVariableStatement) {
+        return getJSDocs(node, checkParentVariableStatement, function (docs) {
+            var result = [];
+            for (var _i = 0, docs_1 = docs; _i < docs_1.length; _i++) {
+                var doc = docs_1[_i];
+                if (doc.tags) {
+                    result.push.apply(result, doc.tags);
+                }
+            }
+            return result;
+        }, function (tags) { return tags; });
+    }
+    function getJSDocs(node, checkParentVariableStatement, getDocs, getTags) {
+        var result = undefined;
+        if (checkParentVariableStatement) {
+            var isInitializerOfVariableDeclarationInStatement = isVariableLike(node.parent) &&
+                (node.parent).initializer === node &&
+                node.parent.parent.parent.kind === 205;
+            var isVariableOfVariableDeclarationStatement = isVariableLike(node) &&
+                node.parent.parent.kind === 205;
+            var variableStatementNode = isInitializerOfVariableDeclarationInStatement ? node.parent.parent.parent :
+                isVariableOfVariableDeclarationStatement ? node.parent.parent :
+                    undefined;
+            if (variableStatementNode) {
+                result = append(result, getJSDocs(variableStatementNode, checkParentVariableStatement, getDocs, getTags));
+            }
+            if (node.kind === 230 &&
+                node.parent && node.parent.kind === 230) {
+                result = append(result, getJSDocs(node.parent, checkParentVariableStatement, getDocs, getTags));
+            }
+            var parent_4 = node.parent;
+            var isSourceOfAssignmentExpressionStatement = parent_4 && parent_4.parent &&
+                parent_4.kind === 192 &&
+                parent_4.operatorToken.kind === 57 &&
+                parent_4.parent.kind === 207;
+            if (isSourceOfAssignmentExpressionStatement) {
+                result = append(result, getJSDocs(parent_4.parent, checkParentVariableStatement, getDocs, getTags));
+            }
+            var isPropertyAssignmentExpression = parent_4 && parent_4.kind === 257;
+            if (isPropertyAssignmentExpression) {
+                result = append(result, getJSDocs(parent_4, checkParentVariableStatement, getDocs, getTags));
+            }
+            if (node.kind === 144) {
+                var paramTags = getJSDocParameterTag(node, checkParentVariableStatement);
+                if (paramTags) {
+                    result = append(result, getTags(paramTags));
+                }
+            }
+        }
+        if (isVariableLike(node) && node.initializer) {
+            result = append(result, getJSDocs(node.initializer, false, getDocs, getTags));
+        }
+        if (node.jsDocComments) {
+            if (result) {
+                result = append(result, getDocs(node.jsDocComments));
+            }
+            else {
+                return getDocs(node.jsDocComments);
+            }
+        }
+        return result;
+    }
+    function getJSDocParameterTag(param, checkParentVariableStatement) {
+        var func = param.parent;
+        var tags = getJSDocTags(func, checkParentVariableStatement);
+        if (!param.name) {
+            var i = func.parameters.indexOf(param);
+            var paramTags = ts.filter(tags, function (tag) { return tag.kind === 280; });
+            if (paramTags && 0 <= i && i < paramTags.length) {
+                return [paramTags[i]];
+            }
+        }
+        else if (param.name.kind === 70) {
+            var name_8 = param.name.text;
+            var paramTags = ts.filter(tags, function (tag) { return tag.kind === 280 && tag.parameterName.text === name_8; });
+            if (paramTags) {
+                return paramTags;
+            }
+        }
+        else {
+            return undefined;
+        }
+    }
+    function getJSDocTypeTag(node) {
+        return getJSDocTag(node, 282, false);
+    }
+    ts.getJSDocTypeTag = getJSDocTypeTag;
+    function getJSDocReturnTag(node) {
+        return getJSDocTag(node, 281, true);
+    }
+    ts.getJSDocReturnTag = getJSDocReturnTag;
+    function getJSDocTemplateTag(node) {
+        return getJSDocTag(node, 283, false);
+    }
+    ts.getJSDocTemplateTag = getJSDocTemplateTag;
+    function getCorrespondingJSDocParameterTag(parameter) {
+        if (parameter.name && parameter.name.kind === 70) {
+            var parameterName = parameter.name.text;
+            var jsDocTags = getJSDocTags(parameter.parent, true);
+            if (!jsDocTags) {
+                return undefined;
+            }
+            for (var _i = 0, jsDocTags_2 = jsDocTags; _i < jsDocTags_2.length; _i++) {
+                var tag = jsDocTags_2[_i];
+                if (tag.kind === 280) {
+                    var parameterTag = tag;
+                    if (parameterTag.parameterName.text === parameterName) {
+                        return parameterTag;
+                    }
+                }
+            }
+        }
+        return undefined;
+    }
+    ts.getCorrespondingJSDocParameterTag = getCorrespondingJSDocParameterTag;
+    function hasRestParameter(s) {
+        return isRestParameter(ts.lastOrUndefined(s.parameters));
+    }
+    ts.hasRestParameter = hasRestParameter;
+    function hasDeclaredRestParameter(s) {
+        return isDeclaredRestParam(ts.lastOrUndefined(s.parameters));
+    }
+    ts.hasDeclaredRestParameter = hasDeclaredRestParameter;
+    function isRestParameter(node) {
+        if (node && (node.flags & 2097152)) {
+            if (node.type && node.type.kind === 275) {
+                return true;
+            }
+            var paramTag = getCorrespondingJSDocParameterTag(node);
+            if (paramTag && paramTag.typeExpression) {
+                return paramTag.typeExpression.type.kind === 275;
+            }
+        }
+        return isDeclaredRestParam(node);
+    }
+    ts.isRestParameter = isRestParameter;
+    function isDeclaredRestParam(node) {
+        return node && node.dotDotDotToken !== undefined;
+    }
+    ts.isDeclaredRestParam = isDeclaredRestParam;
+    function getAssignmentTargetKind(node) {
+        var parent = node.parent;
+        while (true) {
+            switch (parent.kind) {
+                case 192:
+                    var binaryOperator = parent.operatorToken.kind;
+                    return isAssignmentOperator(binaryOperator) && parent.left === node ?
+                        binaryOperator === 57 ? 1 : 2 :
+                        0;
+                case 190:
+                case 191:
+                    var unaryOperator = parent.operator;
+                    return unaryOperator === 42 || unaryOperator === 43 ? 2 : 0;
+                case 212:
+                case 213:
+                    return parent.initializer === node ? 1 : 0;
+                case 183:
+                case 175:
+                case 196:
+                    node = parent;
+                    break;
+                case 258:
+                    if (parent.name !== node) {
+                        return 0;
+                    }
+                case 257:
+                    node = parent.parent;
+                    break;
+                default:
+                    return 0;
+            }
+            parent = node.parent;
+        }
+    }
+    ts.getAssignmentTargetKind = getAssignmentTargetKind;
+    function isAssignmentTarget(node) {
+        return getAssignmentTargetKind(node) !== 0;
+    }
+    ts.isAssignmentTarget = isAssignmentTarget;
+    function isNodeDescendantOf(node, ancestor) {
+        while (node) {
+            if (node === ancestor)
+                return true;
+            node = node.parent;
+        }
+        return false;
+    }
+    ts.isNodeDescendantOf = isNodeDescendantOf;
+    function isInAmbientContext(node) {
+        while (node) {
+            if (hasModifier(node, 2) || (node.kind === 261 && node.isDeclarationFile)) {
+                return true;
+            }
+            node = node.parent;
+        }
+        return false;
+    }
+    ts.isInAmbientContext = isInAmbientContext;
+    function isDeclarationName(name) {
+        if (name.kind !== 70 && name.kind !== 9 && name.kind !== 8) {
+            return false;
+        }
+        var parent = name.parent;
+        if (parent.kind === 239 || parent.kind === 243) {
+            if (parent.propertyName) {
+                return true;
+            }
+        }
+        if (isDeclaration(parent)) {
+            return parent.name === name;
+        }
+        return false;
+    }
+    ts.isDeclarationName = isDeclarationName;
+    function isLiteralComputedPropertyDeclarationName(node) {
+        return (node.kind === 9 || node.kind === 8) &&
+            node.parent.kind === 142 &&
+            isDeclaration(node.parent.parent);
+    }
+    ts.isLiteralComputedPropertyDeclarationName = isLiteralComputedPropertyDeclarationName;
+    function isIdentifierName(node) {
+        var parent = node.parent;
+        switch (parent.kind) {
+            case 147:
+            case 146:
+            case 149:
+            case 148:
+            case 151:
+            case 152:
+            case 260:
+            case 257:
+            case 177:
+                return parent.name === node;
+            case 141:
+                if (parent.right === node) {
+                    while (parent.kind === 141) {
+                        parent = parent.parent;
+                    }
+                    return parent.kind === 160;
+                }
+                return false;
+            case 174:
+            case 239:
+                return parent.propertyName === node;
+            case 243:
+                return true;
+        }
+        return false;
+    }
+    ts.isIdentifierName = isIdentifierName;
+    function isAliasSymbolDeclaration(node) {
+        return node.kind === 234 ||
+            node.kind === 233 ||
+            node.kind === 236 && !!node.name ||
+            node.kind === 237 ||
+            node.kind === 239 ||
+            node.kind === 243 ||
+            node.kind === 240 && exportAssignmentIsAlias(node);
+    }
+    ts.isAliasSymbolDeclaration = isAliasSymbolDeclaration;
+    function exportAssignmentIsAlias(node) {
+        return isEntityNameExpression(node.expression);
+    }
+    ts.exportAssignmentIsAlias = exportAssignmentIsAlias;
+    function getClassExtendsHeritageClauseElement(node) {
+        var heritageClause = getHeritageClause(node.heritageClauses, 84);
+        return heritageClause && heritageClause.types.length > 0 ? heritageClause.types[0] : undefined;
+    }
+    ts.getClassExtendsHeritageClauseElement = getClassExtendsHeritageClauseElement;
+    function getClassImplementsHeritageClauseElements(node) {
+        var heritageClause = getHeritageClause(node.heritageClauses, 107);
+        return heritageClause ? heritageClause.types : undefined;
+    }
+    ts.getClassImplementsHeritageClauseElements = getClassImplementsHeritageClauseElements;
+    function getInterfaceBaseTypeNodes(node) {
+        var heritageClause = getHeritageClause(node.heritageClauses, 84);
+        return heritageClause ? heritageClause.types : undefined;
+    }
+    ts.getInterfaceBaseTypeNodes = getInterfaceBaseTypeNodes;
+    function getHeritageClause(clauses, kind) {
+        if (clauses) {
+            for (var _i = 0, clauses_1 = clauses; _i < clauses_1.length; _i++) {
+                var clause = clauses_1[_i];
+                if (clause.token === kind) {
+                    return clause;
+                }
+            }
+        }
+        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) {
+                return node;
+            }
+            node = node.parent;
+        }
+        return undefined;
+    }
+    ts.getAncestor = getAncestor;
+    function getFileReferenceFromReferencePath(comment, commentRange) {
+        var simpleReferenceRegEx = /^\/\/\/\s*<reference\s+/gim;
+        var isNoDefaultLibRegEx = /^(\/\/\/\s*<reference\s+no-default-lib\s*=\s*)('|")(.+?)\2\s*\/>/gim;
+        if (simpleReferenceRegEx.test(comment)) {
+            if (isNoDefaultLibRegEx.test(comment)) {
+                return {
+                    isNoDefaultLib: true
+                };
+            }
+            else {
+                var refMatchResult = ts.fullTripleSlashReferencePathRegEx.exec(comment);
+                var refLibResult = !refMatchResult && ts.fullTripleSlashReferenceTypeReferenceDirectiveRegEx.exec(comment);
+                if (refMatchResult || refLibResult) {
+                    var start = commentRange.pos;
+                    var end = commentRange.end;
+                    return {
+                        fileReference: {
+                            pos: start,
+                            end: end,
+                            fileName: (refMatchResult || refLibResult)[3]
+                        },
+                        isNoDefaultLib: false,
+                        isTypeReferenceDirective: !!refLibResult
+                    };
+                }
+                return {
+                    diagnosticMessage: ts.Diagnostics.Invalid_reference_directive_syntax,
+                    isNoDefaultLib: false
+                };
+            }
+        }
+        return undefined;
+    }
+    ts.getFileReferenceFromReferencePath = getFileReferenceFromReferencePath;
+    function isKeyword(token) {
+        return 71 <= token && token <= 140;
+    }
+    ts.isKeyword = isKeyword;
+    function isTrivia(token) {
+        return 2 <= token && token <= 7;
+    }
+    ts.isTrivia = isTrivia;
+    function isAsyncFunctionLike(node) {
+        return isFunctionLike(node) && hasModifier(node, 256) && !isAccessor(node);
+    }
+    ts.isAsyncFunctionLike = isAsyncFunctionLike;
+    function isStringOrNumericLiteral(kind) {
+        return kind === 9 || kind === 8;
+    }
+    ts.isStringOrNumericLiteral = isStringOrNumericLiteral;
+    function hasDynamicName(declaration) {
+        return declaration.name && isDynamicName(declaration.name);
+    }
+    ts.hasDynamicName = hasDynamicName;
+    function isDynamicName(name) {
+        return name.kind === 142 &&
+            !isStringOrNumericLiteral(name.expression.kind) &&
+            !isWellKnownSymbolSyntactically(name.expression);
+    }
+    ts.isDynamicName = isDynamicName;
+    function isWellKnownSymbolSyntactically(node) {
+        return isPropertyAccessExpression(node) && isESSymbolIdentifier(node.expression);
+    }
+    ts.isWellKnownSymbolSyntactically = isWellKnownSymbolSyntactically;
+    function getPropertyNameForPropertyNameNode(name) {
+        if (name.kind === 70 || name.kind === 9 || name.kind === 8 || name.kind === 144) {
+            return name.text;
+        }
+        if (name.kind === 142) {
+            var nameExpression = name.expression;
+            if (isWellKnownSymbolSyntactically(nameExpression)) {
+                var rightHandSideName = nameExpression.name.text;
+                return getPropertyNameForKnownSymbolName(rightHandSideName);
+            }
+            else if (nameExpression.kind === 9 || nameExpression.kind === 8) {
+                return nameExpression.text;
+            }
+        }
+        return undefined;
+    }
+    ts.getPropertyNameForPropertyNameNode = getPropertyNameForPropertyNameNode;
+    function getPropertyNameForKnownSymbolName(symbolName) {
+        return "__@" + symbolName;
+    }
+    ts.getPropertyNameForKnownSymbolName = getPropertyNameForKnownSymbolName;
+    function isESSymbolIdentifier(node) {
+        return node.kind === 70 && node.text === "Symbol";
+    }
+    ts.isESSymbolIdentifier = isESSymbolIdentifier;
+    function isPushOrUnshiftIdentifier(node) {
+        return node.text === "push" || node.text === "unshift";
+    }
+    ts.isPushOrUnshiftIdentifier = isPushOrUnshiftIdentifier;
+    function isModifierKind(token) {
+        switch (token) {
+            case 116:
+            case 119:
+            case 75:
+            case 123:
+            case 78:
+            case 83:
+            case 113:
+            case 111:
+            case 112:
+            case 130:
+            case 114:
+                return true;
+        }
+        return false;
+    }
+    ts.isModifierKind = isModifierKind;
+    function isParameterDeclaration(node) {
+        var root = getRootDeclaration(node);
+        return root.kind === 144;
+    }
+    ts.isParameterDeclaration = isParameterDeclaration;
+    function getRootDeclaration(node) {
+        while (node.kind === 174) {
+            node = node.parent.parent;
+        }
+        return node;
+    }
+    ts.getRootDeclaration = getRootDeclaration;
+    function nodeStartsNewLexicalEnvironment(node) {
+        var kind = node.kind;
+        return kind === 150
+            || kind === 184
+            || kind === 225
+            || kind === 185
+            || kind === 149
+            || kind === 151
+            || kind === 152
+            || kind === 230
+            || kind === 261;
+    }
+    ts.nodeStartsNewLexicalEnvironment = nodeStartsNewLexicalEnvironment;
+    function nodeIsSynthesized(node) {
+        return ts.positionIsSynthesized(node.pos)
+            || ts.positionIsSynthesized(node.end);
+    }
+    ts.nodeIsSynthesized = nodeIsSynthesized;
+    function getOriginalNode(node, nodeTest) {
+        if (node) {
+            while (node.original !== undefined) {
+                node = node.original;
+            }
+        }
+        return !nodeTest || nodeTest(node) ? node : undefined;
+    }
+    ts.getOriginalNode = getOriginalNode;
+    function isParseTreeNode(node) {
+        return (node.flags & 8) === 0;
+    }
+    ts.isParseTreeNode = isParseTreeNode;
+    function getParseTreeNode(node, nodeTest) {
+        if (isParseTreeNode(node)) {
+            return node;
+        }
+        node = getOriginalNode(node);
+        if (isParseTreeNode(node) && (!nodeTest || nodeTest(node))) {
+            return node;
+        }
+        return undefined;
+    }
+    ts.getParseTreeNode = getParseTreeNode;
+    function getOriginalSourceFiles(sourceFiles) {
+        var originalSourceFiles = [];
+        for (var _i = 0, sourceFiles_1 = sourceFiles; _i < sourceFiles_1.length; _i++) {
+            var sourceFile = sourceFiles_1[_i];
+            var originalSourceFile = getParseTreeNode(sourceFile, isSourceFile);
+            if (originalSourceFile) {
+                originalSourceFiles.push(originalSourceFile);
+            }
+        }
+        return originalSourceFiles;
+    }
+    ts.getOriginalSourceFiles = getOriginalSourceFiles;
+    function getOriginalNodeId(node) {
+        node = getOriginalNode(node);
+        return node ? ts.getNodeId(node) : 0;
+    }
+    ts.getOriginalNodeId = getOriginalNodeId;
+    function getExpressionAssociativity(expression) {
+        var operator = getOperator(expression);
+        var hasArguments = expression.kind === 180 && expression.arguments !== undefined;
+        return getOperatorAssociativity(expression.kind, operator, hasArguments);
+    }
+    ts.getExpressionAssociativity = getExpressionAssociativity;
+    function getOperatorAssociativity(kind, operator, hasArguments) {
+        switch (kind) {
+            case 180:
+                return hasArguments ? 0 : 1;
+            case 190:
+            case 187:
+            case 188:
+            case 186:
+            case 189:
+            case 193:
+            case 195:
+                return 1;
+            case 192:
+                switch (operator) {
+                    case 39:
+                    case 57:
+                    case 58:
+                    case 59:
+                    case 61:
+                    case 60:
+                    case 62:
+                    case 63:
+                    case 64:
+                    case 65:
+                    case 66:
+                    case 67:
+                    case 69:
+                    case 68:
+                        return 1;
+                }
+        }
+        return 0;
+    }
+    ts.getOperatorAssociativity = getOperatorAssociativity;
+    function getExpressionPrecedence(expression) {
+        var operator = getOperator(expression);
+        var hasArguments = expression.kind === 180 && expression.arguments !== undefined;
+        return getOperatorPrecedence(expression.kind, operator, hasArguments);
+    }
+    ts.getExpressionPrecedence = getExpressionPrecedence;
+    function getOperator(expression) {
+        if (expression.kind === 192) {
+            return expression.operatorToken.kind;
+        }
+        else if (expression.kind === 190 || expression.kind === 191) {
+            return expression.operator;
+        }
+        else {
+            return expression.kind;
+        }
+    }
+    ts.getOperator = getOperator;
+    function getOperatorPrecedence(nodeKind, operatorKind, hasArguments) {
+        switch (nodeKind) {
+            case 98:
+            case 96:
+            case 70:
+            case 94:
+            case 100:
+            case 85:
+            case 8:
+            case 9:
+            case 175:
+            case 176:
+            case 184:
+            case 185:
+            case 197:
+            case 246:
+            case 247:
+            case 11:
+            case 12:
+            case 194:
+            case 183:
+            case 198:
+                return 19;
+            case 181:
+            case 177:
+            case 178:
+                return 18;
+            case 180:
+                return hasArguments ? 18 : 17;
+            case 179:
+                return 17;
+            case 191:
+                return 16;
+            case 190:
+            case 187:
+            case 188:
+            case 186:
+            case 189:
+                return 15;
+            case 192:
+                switch (operatorKind) {
+                    case 50:
+                    case 51:
+                        return 15;
+                    case 39:
+                    case 38:
+                    case 40:
+                    case 41:
+                        return 14;
+                    case 36:
+                    case 37:
+                        return 13;
+                    case 44:
+                    case 45:
+                    case 46:
+                        return 12;
+                    case 26:
+                    case 29:
+                    case 28:
+                    case 30:
+                    case 91:
+                    case 92:
+                        return 11;
+                    case 31:
+                    case 33:
+                    case 32:
+                    case 34:
+                        return 10;
+                    case 47:
+                        return 9;
+                    case 49:
+                        return 8;
+                    case 48:
+                        return 7;
+                    case 52:
+                        return 6;
+                    case 53:
+                        return 5;
+                    case 57:
+                    case 58:
+                    case 59:
+                    case 61:
+                    case 60:
+                    case 62:
+                    case 63:
+                    case 64:
+                    case 65:
+                    case 66:
+                    case 67:
+                    case 69:
+                    case 68:
+                        return 3;
+                    case 25:
+                        return 0;
+                    default:
+                        return -1;
+                }
+            case 193:
+                return 4;
+            case 195:
+                return 2;
+            case 196:
+                return 1;
+            default:
+                return -1;
+        }
+    }
+    ts.getOperatorPrecedence = getOperatorPrecedence;
+    function createDiagnosticCollection() {
+        var nonFileDiagnostics = [];
+        var fileDiagnostics = ts.createMap();
+        var diagnosticsModified = false;
+        var modificationCount = 0;
+        return {
+            add: add,
+            getGlobalDiagnostics: getGlobalDiagnostics,
+            getDiagnostics: getDiagnostics,
+            getModificationCount: getModificationCount,
+            reattachFileDiagnostics: reattachFileDiagnostics
+        };
+        function getModificationCount() {
+            return modificationCount;
+        }
+        function reattachFileDiagnostics(newFile) {
+            if (!ts.hasProperty(fileDiagnostics, newFile.fileName)) {
+                return;
+            }
+            for (var _i = 0, _a = fileDiagnostics[newFile.fileName]; _i < _a.length; _i++) {
+                var diagnostic = _a[_i];
+                diagnostic.file = newFile;
+            }
+        }
+        function add(diagnostic) {
+            var diagnostics;
+            if (diagnostic.file) {
+                diagnostics = fileDiagnostics[diagnostic.file.fileName];
+                if (!diagnostics) {
+                    diagnostics = [];
+                    fileDiagnostics[diagnostic.file.fileName] = diagnostics;
+                }
+            }
+            else {
+                diagnostics = nonFileDiagnostics;
+            }
+            diagnostics.push(diagnostic);
+            diagnosticsModified = true;
+            modificationCount++;
+        }
+        function getGlobalDiagnostics() {
+            sortAndDeduplicate();
+            return nonFileDiagnostics;
+        }
+        function getDiagnostics(fileName) {
+            sortAndDeduplicate();
+            if (fileName) {
+                return fileDiagnostics[fileName] || [];
+            }
+            var allDiagnostics = [];
+            function pushDiagnostic(d) {
+                allDiagnostics.push(d);
+            }
+            ts.forEach(nonFileDiagnostics, pushDiagnostic);
+            for (var key in fileDiagnostics) {
+                ts.forEach(fileDiagnostics[key], pushDiagnostic);
+            }
+            return ts.sortAndDeduplicateDiagnostics(allDiagnostics);
+        }
+        function sortAndDeduplicate() {
+            if (!diagnosticsModified) {
+                return;
+            }
+            diagnosticsModified = false;
+            nonFileDiagnostics = ts.sortAndDeduplicateDiagnostics(nonFileDiagnostics);
+            for (var key in fileDiagnostics) {
+                fileDiagnostics[key] = ts.sortAndDeduplicateDiagnostics(fileDiagnostics[key]);
+            }
+        }
+    }
+    ts.createDiagnosticCollection = createDiagnosticCollection;
+    var escapedCharsRegExp = /[\\\"\u0000-\u001f\t\v\f\b\r\n\u2028\u2029\u0085]/g;
+    var escapedCharsMap = ts.createMap({
+        "\0": "\\0",
+        "\t": "\\t",
+        "\v": "\\v",
+        "\f": "\\f",
+        "\b": "\\b",
+        "\r": "\\r",
+        "\n": "\\n",
+        "\\": "\\\\",
+        "\"": "\\\"",
+        "\u2028": "\\u2028",
+        "\u2029": "\\u2029",
+        "\u0085": "\\u0085"
+    });
+    function escapeString(s) {
+        s = escapedCharsRegExp.test(s) ? s.replace(escapedCharsRegExp, getReplacement) : s;
+        return s;
+        function getReplacement(c) {
+            return escapedCharsMap[c] || get16BitUnicodeEscapeSequence(c.charCodeAt(0));
+        }
+    }
+    ts.escapeString = escapeString;
+    function isIntrinsicJsxName(name) {
+        var ch = name.substr(0, 1);
+        return ch.toLowerCase() === ch;
+    }
+    ts.isIntrinsicJsxName = isIntrinsicJsxName;
+    function get16BitUnicodeEscapeSequence(charCode) {
+        var hexCharCode = charCode.toString(16).toUpperCase();
+        var paddedHexCode = ("0000" + hexCharCode).slice(-4);
+        return "\\u" + paddedHexCode;
+    }
+    var nonAsciiCharacters = /[^\u0000-\u007F]/g;
+    function escapeNonAsciiCharacters(s) {
+        return nonAsciiCharacters.test(s) ?
+            s.replace(nonAsciiCharacters, function (c) { return get16BitUnicodeEscapeSequence(c.charCodeAt(0)); }) :
+            s;
+    }
+    ts.escapeNonAsciiCharacters = escapeNonAsciiCharacters;
+    var indentStrings = ["", "    "];
+    function getIndentString(level) {
+        if (indentStrings[level] === undefined) {
+            indentStrings[level] = getIndentString(level - 1) + indentStrings[1];
+        }
+        return indentStrings[level];
+    }
+    ts.getIndentString = getIndentString;
+    function getIndentSize() {
+        return indentStrings[1].length;
+    }
+    ts.getIndentSize = getIndentSize;
+    function createTextWriter(newLine) {
+        var output;
+        var indent;
+        var lineStart;
+        var lineCount;
+        var linePos;
+        function write(s) {
+            if (s && s.length) {
+                if (lineStart) {
+                    output += getIndentString(indent);
+                    lineStart = false;
+                }
+                output += s;
+            }
+        }
+        function reset() {
+            output = "";
+            indent = 0;
+            lineStart = true;
+            lineCount = 0;
+            linePos = 0;
+        }
+        function rawWrite(s) {
+            if (s !== undefined) {
+                if (lineStart) {
+                    lineStart = false;
+                }
+                output += s;
+            }
+        }
+        function writeLiteral(s) {
+            if (s && s.length) {
+                write(s);
+                var lineStartsOfS = ts.computeLineStarts(s);
+                if (lineStartsOfS.length > 1) {
+                    lineCount = lineCount + lineStartsOfS.length - 1;
+                    linePos = output.length - s.length + ts.lastOrUndefined(lineStartsOfS);
+                }
+            }
+        }
+        function writeLine() {
+            if (!lineStart) {
+                output += newLine;
+                lineCount++;
+                linePos = output.length;
+                lineStart = true;
+            }
+        }
+        function writeTextOfNode(text, node) {
+            write(getTextOfNodeFromSourceText(text, node));
+        }
+        reset();
+        return {
+            write: write,
+            rawWrite: rawWrite,
+            writeTextOfNode: writeTextOfNode,
+            writeLiteral: writeLiteral,
+            writeLine: writeLine,
+            increaseIndent: function () { indent++; },
+            decreaseIndent: function () { indent--; },
+            getIndent: function () { return indent; },
+            getTextPos: function () { return output.length; },
+            getLine: function () { return lineCount + 1; },
+            getColumn: function () { return lineStart ? indent * getIndentSize() + 1 : output.length - linePos + 1; },
+            getText: function () { return output; },
+            isAtStartOfLine: function () { return lineStart; },
+            reset: reset
+        };
+    }
+    ts.createTextWriter = createTextWriter;
+    function getResolvedExternalModuleName(host, file) {
+        return file.moduleName || getExternalModuleNameFromPath(host, file.fileName);
+    }
+    ts.getResolvedExternalModuleName = getResolvedExternalModuleName;
+    function getExternalModuleNameFromDeclaration(host, resolver, declaration) {
+        var file = resolver.getExternalModuleFileFromDeclaration(declaration);
+        if (!file || isDeclarationFile(file)) {
+            return undefined;
+        }
+        return getResolvedExternalModuleName(host, file);
+    }
+    ts.getExternalModuleNameFromDeclaration = getExternalModuleNameFromDeclaration;
+    function getExternalModuleNameFromPath(host, fileName) {
+        var getCanonicalFileName = function (f) { return host.getCanonicalFileName(f); };
+        var dir = ts.toPath(host.getCommonSourceDirectory(), host.getCurrentDirectory(), getCanonicalFileName);
+        var filePath = ts.getNormalizedAbsolutePath(fileName, host.getCurrentDirectory());
+        var relativePath = ts.getRelativePathToDirectoryOrUrl(dir, filePath, dir, getCanonicalFileName, false);
+        return ts.removeFileExtension(relativePath);
+    }
+    ts.getExternalModuleNameFromPath = getExternalModuleNameFromPath;
+    function getOwnEmitOutputFilePath(sourceFile, host, extension) {
+        var compilerOptions = host.getCompilerOptions();
+        var emitOutputFilePathWithoutExtension;
+        if (compilerOptions.outDir) {
+            emitOutputFilePathWithoutExtension = ts.removeFileExtension(getSourceFilePathInNewDir(sourceFile, host, compilerOptions.outDir));
+        }
+        else {
+            emitOutputFilePathWithoutExtension = ts.removeFileExtension(sourceFile.fileName);
+        }
+        return emitOutputFilePathWithoutExtension + extension;
+    }
+    ts.getOwnEmitOutputFilePath = getOwnEmitOutputFilePath;
+    function getDeclarationEmitOutputFilePath(sourceFile, host) {
+        var options = host.getCompilerOptions();
+        var outputDir = options.declarationDir || options.outDir;
+        var path = outputDir
+            ? getSourceFilePathInNewDir(sourceFile, host, outputDir)
+            : sourceFile.fileName;
+        return ts.removeFileExtension(path) + ".d.ts";
+    }
+    ts.getDeclarationEmitOutputFilePath = getDeclarationEmitOutputFilePath;
+    function getSourceFilesToEmit(host, targetSourceFile) {
+        var options = host.getCompilerOptions();
+        if (options.outFile || options.out) {
+            var moduleKind = ts.getEmitModuleKind(options);
+            var moduleEmitEnabled = moduleKind === ts.ModuleKind.AMD || moduleKind === ts.ModuleKind.System;
+            var sourceFiles = getAllEmittableSourceFiles();
+            return ts.filter(sourceFiles, moduleEmitEnabled ? isNonDeclarationFile : isBundleEmitNonExternalModule);
+        }
+        else {
+            var sourceFiles = targetSourceFile === undefined ? getAllEmittableSourceFiles() : [targetSourceFile];
+            return filterSourceFilesInDirectory(sourceFiles, function (file) { return host.isSourceFileFromExternalLibrary(file); });
+        }
+        function getAllEmittableSourceFiles() {
+            return options.noEmitForJsFiles ? ts.filter(host.getSourceFiles(), function (sourceFile) { return !isSourceFileJavaScript(sourceFile); }) : host.getSourceFiles();
+        }
+    }
+    ts.getSourceFilesToEmit = getSourceFilesToEmit;
+    function filterSourceFilesInDirectory(sourceFiles, isSourceFileFromExternalLibrary) {
+        return ts.filter(sourceFiles, function (file) { return shouldEmitInDirectory(file, isSourceFileFromExternalLibrary); });
+    }
+    ts.filterSourceFilesInDirectory = filterSourceFilesInDirectory;
+    function isNonDeclarationFile(sourceFile) {
+        return !isDeclarationFile(sourceFile);
+    }
+    function shouldEmitInDirectory(sourceFile, isSourceFileFromExternalLibrary) {
+        return isNonDeclarationFile(sourceFile) && !isSourceFileFromExternalLibrary(sourceFile);
+    }
+    function isBundleEmitNonExternalModule(sourceFile) {
+        return isNonDeclarationFile(sourceFile) && !ts.isExternalModule(sourceFile);
+    }
+    function forEachTransformedEmitFile(host, sourceFiles, action, emitOnlyDtsFiles) {
+        var options = host.getCompilerOptions();
+        if (options.outFile || options.out) {
+            onBundledEmit(sourceFiles);
+        }
+        else {
+            for (var _i = 0, sourceFiles_2 = sourceFiles; _i < sourceFiles_2.length; _i++) {
+                var sourceFile = sourceFiles_2[_i];
+                if (!isDeclarationFile(sourceFile) && !host.isSourceFileFromExternalLibrary(sourceFile)) {
+                    onSingleFileEmit(host, sourceFile);
+                }
+            }
+        }
+        function onSingleFileEmit(host, sourceFile) {
+            var extension = ".js";
+            if (options.jsx === 1) {
+                if (isSourceFileJavaScript(sourceFile)) {
+                    if (ts.fileExtensionIs(sourceFile.fileName, ".jsx")) {
+                        extension = ".jsx";
+                    }
+                }
+                else if (sourceFile.languageVariant === 1) {
+                    extension = ".jsx";
+                }
+            }
+            var jsFilePath = getOwnEmitOutputFilePath(sourceFile, host, extension);
+            var sourceMapFilePath = getSourceMapFilePath(jsFilePath, options);
+            var declarationFilePath = !isSourceFileJavaScript(sourceFile) && (options.declaration || emitOnlyDtsFiles) ? getDeclarationEmitOutputFilePath(sourceFile, host) : undefined;
+            action(jsFilePath, sourceMapFilePath, declarationFilePath, [sourceFile], false);
+        }
+        function onBundledEmit(sourceFiles) {
+            if (sourceFiles.length) {
+                var jsFilePath = options.outFile || options.out;
+                var sourceMapFilePath = getSourceMapFilePath(jsFilePath, options);
+                var declarationFilePath = options.declaration ? ts.removeFileExtension(jsFilePath) + ".d.ts" : undefined;
+                action(jsFilePath, sourceMapFilePath, declarationFilePath, sourceFiles, true);
+            }
+        }
+    }
+    ts.forEachTransformedEmitFile = forEachTransformedEmitFile;
+    function getSourceMapFilePath(jsFilePath, options) {
+        return options.sourceMap ? jsFilePath + ".map" : undefined;
+    }
+    function forEachExpectedEmitFile(host, action, targetSourceFile, emitOnlyDtsFiles) {
+        var options = host.getCompilerOptions();
+        if (options.outFile || options.out) {
+            onBundledEmit(host);
+        }
+        else {
+            var sourceFiles = targetSourceFile === undefined ? getSourceFilesToEmit(host) : [targetSourceFile];
+            for (var _i = 0, sourceFiles_3 = sourceFiles; _i < sourceFiles_3.length; _i++) {
+                var sourceFile = sourceFiles_3[_i];
+                if (shouldEmitInDirectory(sourceFile, function (file) { return host.isSourceFileFromExternalLibrary(file); })) {
+                    onSingleFileEmit(host, sourceFile);
+                }
+            }
+        }
+        function onSingleFileEmit(host, sourceFile) {
+            var extension = ".js";
+            if (options.jsx === 1) {
+                if (isSourceFileJavaScript(sourceFile)) {
+                    if (ts.fileExtensionIs(sourceFile.fileName, ".jsx")) {
+                        extension = ".jsx";
+                    }
+                }
+                else if (sourceFile.languageVariant === 1) {
+                    extension = ".jsx";
+                }
+            }
+            var jsFilePath = getOwnEmitOutputFilePath(sourceFile, host, extension);
+            var declarationFilePath = !isSourceFileJavaScript(sourceFile) && (emitOnlyDtsFiles || options.declaration) ? getDeclarationEmitOutputFilePath(sourceFile, host) : undefined;
+            var emitFileNames = {
+                jsFilePath: jsFilePath,
+                sourceMapFilePath: getSourceMapFilePath(jsFilePath, options),
+                declarationFilePath: declarationFilePath
+            };
+            action(emitFileNames, [sourceFile], false, emitOnlyDtsFiles);
+        }
+        function onBundledEmit(host) {
+            var bundledSources = ts.filter(getSourceFilesToEmit(host), function (sourceFile) { return !isDeclarationFile(sourceFile) &&
+                !host.isSourceFileFromExternalLibrary(sourceFile) &&
+                (!ts.isExternalModule(sourceFile) ||
+                    !!ts.getEmitModuleKind(options)); });
+            if (bundledSources.length) {
+                var jsFilePath = options.outFile || options.out;
+                var emitFileNames = {
+                    jsFilePath: jsFilePath,
+                    sourceMapFilePath: getSourceMapFilePath(jsFilePath, options),
+                    declarationFilePath: options.declaration ? ts.removeFileExtension(jsFilePath) + ".d.ts" : undefined
+                };
+                action(emitFileNames, bundledSources, true, emitOnlyDtsFiles);
+            }
+        }
+    }
+    ts.forEachExpectedEmitFile = forEachExpectedEmitFile;
+    function getSourceFilePathInNewDir(sourceFile, host, newDirPath) {
+        var sourceFilePath = ts.getNormalizedAbsolutePath(sourceFile.fileName, host.getCurrentDirectory());
+        var commonSourceDirectory = host.getCommonSourceDirectory();
+        var isSourceFileInCommonSourceDirectory = host.getCanonicalFileName(sourceFilePath).indexOf(host.getCanonicalFileName(commonSourceDirectory)) === 0;
+        sourceFilePath = isSourceFileInCommonSourceDirectory ? sourceFilePath.substring(commonSourceDirectory.length) : sourceFilePath;
+        return ts.combinePaths(newDirPath, sourceFilePath);
+    }
+    ts.getSourceFilePathInNewDir = getSourceFilePathInNewDir;
+    function writeFile(host, diagnostics, fileName, data, writeByteOrderMark, sourceFiles) {
+        host.writeFile(fileName, data, writeByteOrderMark, function (hostErrorMessage) {
+            diagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Could_not_write_file_0_Colon_1, fileName, hostErrorMessage));
+        }, sourceFiles);
+    }
+    ts.writeFile = writeFile;
+    function getLineOfLocalPosition(currentSourceFile, pos) {
+        return ts.getLineAndCharacterOfPosition(currentSourceFile, pos).line;
+    }
+    ts.getLineOfLocalPosition = getLineOfLocalPosition;
+    function getLineOfLocalPositionFromLineMap(lineMap, pos) {
+        return ts.computeLineAndCharacterOfPosition(lineMap, pos).line;
+    }
+    ts.getLineOfLocalPositionFromLineMap = getLineOfLocalPositionFromLineMap;
+    function getFirstConstructorWithBody(node) {
+        return ts.forEach(node.members, function (member) {
+            if (member.kind === 150 && nodeIsPresent(member.body)) {
+                return member;
+            }
+        });
+    }
+    ts.getFirstConstructorWithBody = getFirstConstructorWithBody;
+    function getSetAccessorTypeAnnotationNode(accessor) {
+        if (accessor && accessor.parameters.length > 0) {
+            var hasThis = accessor.parameters.length === 2 && parameterIsThisKeyword(accessor.parameters[0]);
+            return accessor.parameters[hasThis ? 1 : 0].type;
+        }
+    }
+    ts.getSetAccessorTypeAnnotationNode = getSetAccessorTypeAnnotationNode;
+    function getThisParameter(signature) {
+        if (signature.parameters.length) {
+            var thisParameter = signature.parameters[0];
+            if (parameterIsThisKeyword(thisParameter)) {
+                return thisParameter;
+            }
+        }
+    }
+    ts.getThisParameter = getThisParameter;
+    function parameterIsThisKeyword(parameter) {
+        return isThisIdentifier(parameter.name);
+    }
+    ts.parameterIsThisKeyword = parameterIsThisKeyword;
+    function isThisIdentifier(node) {
+        return node && node.kind === 70 && identifierIsThisKeyword(node);
+    }
+    ts.isThisIdentifier = isThisIdentifier;
+    function identifierIsThisKeyword(id) {
+        return id.originalKeywordKind === 98;
+    }
+    ts.identifierIsThisKeyword = identifierIsThisKeyword;
+    function getAllAccessorDeclarations(declarations, accessor) {
+        var firstAccessor;
+        var secondAccessor;
+        var getAccessor;
+        var setAccessor;
+        if (hasDynamicName(accessor)) {
+            firstAccessor = accessor;
+            if (accessor.kind === 151) {
+                getAccessor = accessor;
+            }
+            else if (accessor.kind === 152) {
+                setAccessor = accessor;
+            }
+            else {
+                ts.Debug.fail("Accessor has wrong kind");
+            }
+        }
+        else {
+            ts.forEach(declarations, function (member) {
+                if ((member.kind === 151 || member.kind === 152)
+                    && hasModifier(member, 32) === hasModifier(accessor, 32)) {
+                    var memberName = getPropertyNameForPropertyNameNode(member.name);
+                    var accessorName = getPropertyNameForPropertyNameNode(accessor.name);
+                    if (memberName === accessorName) {
+                        if (!firstAccessor) {
+                            firstAccessor = member;
+                        }
+                        else if (!secondAccessor) {
+                            secondAccessor = member;
+                        }
+                        if (member.kind === 151 && !getAccessor) {
+                            getAccessor = member;
+                        }
+                        if (member.kind === 152 && !setAccessor) {
+                            setAccessor = member;
+                        }
+                    }
+                }
+            });
+        }
+        return {
+            firstAccessor: firstAccessor,
+            secondAccessor: secondAccessor,
+            getAccessor: getAccessor,
+            setAccessor: setAccessor
+        };
+    }
+    ts.getAllAccessorDeclarations = getAllAccessorDeclarations;
+    function emitNewLineBeforeLeadingComments(lineMap, writer, node, leadingComments) {
+        emitNewLineBeforeLeadingCommentsOfPosition(lineMap, writer, node.pos, leadingComments);
+    }
+    ts.emitNewLineBeforeLeadingComments = emitNewLineBeforeLeadingComments;
+    function emitNewLineBeforeLeadingCommentsOfPosition(lineMap, writer, pos, leadingComments) {
+        if (leadingComments && leadingComments.length && pos !== leadingComments[0].pos &&
+            getLineOfLocalPositionFromLineMap(lineMap, pos) !== getLineOfLocalPositionFromLineMap(lineMap, leadingComments[0].pos)) {
+            writer.writeLine();
+        }
+    }
+    ts.emitNewLineBeforeLeadingCommentsOfPosition = emitNewLineBeforeLeadingCommentsOfPosition;
+    function emitNewLineBeforeLeadingCommentOfPosition(lineMap, writer, pos, commentPos) {
+        if (pos !== commentPos &&
+            getLineOfLocalPositionFromLineMap(lineMap, pos) !== getLineOfLocalPositionFromLineMap(lineMap, commentPos)) {
+            writer.writeLine();
+        }
+    }
+    ts.emitNewLineBeforeLeadingCommentOfPosition = emitNewLineBeforeLeadingCommentOfPosition;
+    function emitComments(text, lineMap, writer, comments, leadingSeparator, trailingSeparator, newLine, writeComment) {
+        if (comments && comments.length > 0) {
+            if (leadingSeparator) {
+                writer.write(" ");
+            }
+            var emitInterveningSeparator = false;
+            for (var _i = 0, comments_1 = comments; _i < comments_1.length; _i++) {
+                var comment = comments_1[_i];
+                if (emitInterveningSeparator) {
+                    writer.write(" ");
+                    emitInterveningSeparator = false;
+                }
+                writeComment(text, lineMap, writer, comment.pos, comment.end, newLine);
+                if (comment.hasTrailingNewLine) {
+                    writer.writeLine();
+                }
+                else {
+                    emitInterveningSeparator = true;
+                }
+            }
+            if (emitInterveningSeparator && trailingSeparator) {
+                writer.write(" ");
+            }
+        }
+    }
+    ts.emitComments = emitComments;
+    function emitDetachedComments(text, lineMap, writer, writeComment, node, newLine, removeComments) {
+        var leadingComments;
+        var currentDetachedCommentInfo;
+        if (removeComments) {
+            if (node.pos === 0) {
+                leadingComments = ts.filter(ts.getLeadingCommentRanges(text, node.pos), isPinnedComment);
+            }
+        }
+        else {
+            leadingComments = ts.getLeadingCommentRanges(text, node.pos);
+        }
+        if (leadingComments) {
+            var detachedComments = [];
+            var lastComment = void 0;
+            for (var _i = 0, leadingComments_1 = leadingComments; _i < leadingComments_1.length; _i++) {
+                var comment = leadingComments_1[_i];
+                if (lastComment) {
+                    var lastCommentLine = getLineOfLocalPositionFromLineMap(lineMap, lastComment.end);
+                    var commentLine = getLineOfLocalPositionFromLineMap(lineMap, comment.pos);
+                    if (commentLine >= lastCommentLine + 2) {
+                        break;
+                    }
+                }
+                detachedComments.push(comment);
+                lastComment = comment;
+            }
+            if (detachedComments.length) {
+                var lastCommentLine = getLineOfLocalPositionFromLineMap(lineMap, ts.lastOrUndefined(detachedComments).end);
+                var nodeLine = getLineOfLocalPositionFromLineMap(lineMap, ts.skipTrivia(text, node.pos));
+                if (nodeLine >= lastCommentLine + 2) {
+                    emitNewLineBeforeLeadingComments(lineMap, writer, node, leadingComments);
+                    emitComments(text, lineMap, writer, detachedComments, false, true, newLine, writeComment);
+                    currentDetachedCommentInfo = { nodePos: node.pos, detachedCommentEndPos: ts.lastOrUndefined(detachedComments).end };
+                }
+            }
+        }
+        return currentDetachedCommentInfo;
+        function isPinnedComment(comment) {
+            return text.charCodeAt(comment.pos + 1) === 42 &&
+                text.charCodeAt(comment.pos + 2) === 33;
+        }
+    }
+    ts.emitDetachedComments = emitDetachedComments;
+    function writeCommentRange(text, lineMap, writer, commentPos, commentEnd, newLine) {
+        if (text.charCodeAt(commentPos + 1) === 42) {
+            var firstCommentLineAndCharacter = ts.computeLineAndCharacterOfPosition(lineMap, commentPos);
+            var lineCount = lineMap.length;
+            var firstCommentLineIndent = void 0;
+            for (var pos = commentPos, currentLine = firstCommentLineAndCharacter.line; pos < commentEnd; currentLine++) {
+                var nextLineStart = (currentLine + 1) === lineCount
+                    ? text.length + 1
+                    : lineMap[currentLine + 1];
+                if (pos !== commentPos) {
+                    if (firstCommentLineIndent === undefined) {
+                        firstCommentLineIndent = calculateIndent(text, lineMap[firstCommentLineAndCharacter.line], commentPos);
+                    }
+                    var currentWriterIndentSpacing = writer.getIndent() * getIndentSize();
+                    var spacesToEmit = currentWriterIndentSpacing - firstCommentLineIndent + calculateIndent(text, pos, nextLineStart);
+                    if (spacesToEmit > 0) {
+                        var numberOfSingleSpacesToEmit = spacesToEmit % getIndentSize();
+                        var indentSizeSpaceString = getIndentString((spacesToEmit - numberOfSingleSpacesToEmit) / getIndentSize());
+                        writer.rawWrite(indentSizeSpaceString);
+                        while (numberOfSingleSpacesToEmit) {
+                            writer.rawWrite(" ");
+                            numberOfSingleSpacesToEmit--;
+                        }
+                    }
+                    else {
+                        writer.rawWrite("");
+                    }
+                }
+                writeTrimmedCurrentLine(text, commentEnd, writer, newLine, pos, nextLineStart);
+                pos = nextLineStart;
+            }
+        }
+        else {
+            writer.write(text.substring(commentPos, commentEnd));
+        }
+    }
+    ts.writeCommentRange = writeCommentRange;
+    function writeTrimmedCurrentLine(text, commentEnd, writer, newLine, pos, nextLineStart) {
+        var end = Math.min(commentEnd, nextLineStart - 1);
+        var currentLineText = text.substring(pos, end).replace(/^\s+|\s+$/g, "");
+        if (currentLineText) {
+            writer.write(currentLineText);
+            if (end !== commentEnd) {
+                writer.writeLine();
+            }
+        }
+        else {
+            writer.writeLiteral(newLine);
+        }
+    }
+    function calculateIndent(text, pos, end) {
+        var currentLineIndent = 0;
+        for (; pos < end && ts.isWhiteSpaceSingleLine(text.charCodeAt(pos)); pos++) {
+            if (text.charCodeAt(pos) === 9) {
+                currentLineIndent += getIndentSize() - (currentLineIndent % getIndentSize());
+            }
+            else {
+                currentLineIndent++;
+            }
+        }
+        return currentLineIndent;
+    }
+    function hasModifiers(node) {
+        return getModifierFlags(node) !== 0;
+    }
+    ts.hasModifiers = hasModifiers;
+    function hasModifier(node, flags) {
+        return (getModifierFlags(node) & flags) !== 0;
+    }
+    ts.hasModifier = hasModifier;
+    function getModifierFlags(node) {
+        if (node.modifierFlagsCache & 536870912) {
+            return node.modifierFlagsCache & ~536870912;
+        }
+        var flags = 0;
+        if (node.modifiers) {
+            for (var _i = 0, _a = node.modifiers; _i < _a.length; _i++) {
+                var modifier = _a[_i];
+                flags |= modifierToFlag(modifier.kind);
+            }
+        }
+        if (node.flags & 4 || (node.kind === 70 && node.isInJSDocNamespace)) {
+            flags |= 1;
+        }
+        node.modifierFlagsCache = flags | 536870912;
+        return flags;
+    }
+    ts.getModifierFlags = getModifierFlags;
+    function modifierToFlag(token) {
+        switch (token) {
+            case 114: return 32;
+            case 113: return 4;
+            case 112: return 16;
+            case 111: return 8;
+            case 116: return 128;
+            case 83: return 1;
+            case 123: return 2;
+            case 75: return 2048;
+            case 78: return 512;
+            case 119: return 256;
+            case 130: return 64;
+        }
+        return 0;
+    }
+    ts.modifierToFlag = modifierToFlag;
+    function isLogicalOperator(token) {
+        return token === 53
+            || token === 52
+            || token === 50;
+    }
+    ts.isLogicalOperator = isLogicalOperator;
+    function isAssignmentOperator(token) {
+        return token >= 57 && token <= 69;
+    }
+    ts.isAssignmentOperator = isAssignmentOperator;
+    function tryGetClassExtendingExpressionWithTypeArguments(node) {
+        if (node.kind === 199 &&
+            node.parent.token === 84 &&
+            isClassLike(node.parent.parent)) {
+            return node.parent.parent;
+        }
+    }
+    ts.tryGetClassExtendingExpressionWithTypeArguments = tryGetClassExtendingExpressionWithTypeArguments;
+    function isAssignmentExpression(node) {
+        return isBinaryExpression(node)
+            && isAssignmentOperator(node.operatorToken.kind)
+            && isLeftHandSideExpression(node.left);
+    }
+    ts.isAssignmentExpression = isAssignmentExpression;
+    function isDestructuringAssignment(node) {
+        if (isBinaryExpression(node)) {
+            if (node.operatorToken.kind === 57) {
+                var kind = node.left.kind;
+                return kind === 176
+                    || kind === 175;
+            }
+        }
+        return false;
+    }
+    ts.isDestructuringAssignment = isDestructuringAssignment;
+    function isSupportedExpressionWithTypeArguments(node) {
+        return isSupportedExpressionWithTypeArgumentsRest(node.expression);
+    }
+    ts.isSupportedExpressionWithTypeArguments = isSupportedExpressionWithTypeArguments;
+    function isSupportedExpressionWithTypeArgumentsRest(node) {
+        if (node.kind === 70) {
+            return true;
+        }
+        else if (isPropertyAccessExpression(node)) {
+            return isSupportedExpressionWithTypeArgumentsRest(node.expression);
+        }
+        else {
+            return false;
+        }
+    }
+    function isExpressionWithTypeArgumentsInClassExtendsClause(node) {
+        return tryGetClassExtendingExpressionWithTypeArguments(node) !== undefined;
+    }
+    ts.isExpressionWithTypeArgumentsInClassExtendsClause = isExpressionWithTypeArgumentsInClassExtendsClause;
+    function isEntityNameExpression(node) {
+        return node.kind === 70 ||
+            node.kind === 177 && isEntityNameExpression(node.expression);
+    }
+    ts.isEntityNameExpression = isEntityNameExpression;
+    function isRightSideOfQualifiedNameOrPropertyAccess(node) {
+        return (node.parent.kind === 141 && node.parent.right === node) ||
+            (node.parent.kind === 177 && node.parent.name === node);
+    }
+    ts.isRightSideOfQualifiedNameOrPropertyAccess = isRightSideOfQualifiedNameOrPropertyAccess;
+    function isEmptyObjectLiteralOrArrayLiteral(expression) {
+        var kind = expression.kind;
+        if (kind === 176) {
+            return expression.properties.length === 0;
+        }
+        if (kind === 175) {
+            return expression.elements.length === 0;
+        }
+        return false;
+    }
+    ts.isEmptyObjectLiteralOrArrayLiteral = isEmptyObjectLiteralOrArrayLiteral;
+    function getLocalSymbolForExportDefault(symbol) {
+        return symbol && symbol.valueDeclaration && hasModifier(symbol.valueDeclaration, 512) ? symbol.valueDeclaration.localSymbol : undefined;
+    }
+    ts.getLocalSymbolForExportDefault = getLocalSymbolForExportDefault;
+    function tryExtractTypeScriptExtension(fileName) {
+        return ts.find(ts.supportedTypescriptExtensionsForExtractExtension, function (extension) { return ts.fileExtensionIs(fileName, extension); });
+    }
+    ts.tryExtractTypeScriptExtension = tryExtractTypeScriptExtension;
+    function getExpandedCharCodes(input) {
+        var output = [];
+        var length = input.length;
+        for (var i = 0; i < length; i++) {
+            var charCode = input.charCodeAt(i);
+            if (charCode < 0x80) {
+                output.push(charCode);
+            }
+            else if (charCode < 0x800) {
+                output.push((charCode >> 6) | 192);
+                output.push((charCode & 63) | 128);
+            }
+            else if (charCode < 0x10000) {
+                output.push((charCode >> 12) | 224);
+                output.push(((charCode >> 6) & 63) | 128);
+                output.push((charCode & 63) | 128);
+            }
+            else if (charCode < 0x20000) {
+                output.push((charCode >> 18) | 240);
+                output.push(((charCode >> 12) & 63) | 128);
+                output.push(((charCode >> 6) & 63) | 128);
+                output.push((charCode & 63) | 128);
+            }
+            else {
+                ts.Debug.assert(false, "Unexpected code point");
+            }
+        }
+        return output;
+    }
+    ts.stringify = typeof JSON !== "undefined" && JSON.stringify
+        ? JSON.stringify
+        : stringifyFallback;
+    function stringifyFallback(value) {
+        return value === undefined ? undefined : stringifyValue(value);
+    }
+    function stringifyValue(value) {
+        return typeof value === "string" ? "\"" + escapeString(value) + "\""
+            : typeof value === "number" ? isFinite(value) ? String(value) : "null"
+                : typeof value === "boolean" ? value ? "true" : "false"
+                    : typeof value === "object" && value ? ts.isArray(value) ? cycleCheck(stringifyArray, value) : cycleCheck(stringifyObject, value)
+                        : "null";
+    }
+    function cycleCheck(cb, value) {
+        ts.Debug.assert(!value.hasOwnProperty("__cycle"), "Converting circular structure to JSON");
+        value.__cycle = true;
+        var result = cb(value);
+        delete value.__cycle;
+        return result;
+    }
+    function stringifyArray(value) {
+        return "[" + ts.reduceLeft(value, stringifyElement, "") + "]";
+    }
+    function stringifyElement(memo, value) {
+        return (memo ? memo + "," : memo) + stringifyValue(value);
+    }
+    function stringifyObject(value) {
+        return "{" + ts.reduceOwnProperties(value, stringifyProperty, "") + "}";
+    }
+    function stringifyProperty(memo, value, key) {
+        return value === undefined || typeof value === "function" || key === "__cycle" ? memo
+            : (memo ? memo + "," : memo) + ("\"" + escapeString(key) + "\":" + stringifyValue(value));
+    }
+    var base64Digits = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+    function convertToBase64(input) {
+        var result = "";
+        var charCodes = getExpandedCharCodes(input);
+        var i = 0;
+        var length = charCodes.length;
+        var byte1, byte2, byte3, byte4;
+        while (i < length) {
+            byte1 = charCodes[i] >> 2;
+            byte2 = (charCodes[i] & 3) << 4 | charCodes[i + 1] >> 4;
+            byte3 = (charCodes[i + 1] & 15) << 2 | charCodes[i + 2] >> 6;
+            byte4 = charCodes[i + 2] & 63;
+            if (i + 1 >= length) {
+                byte3 = byte4 = 64;
+            }
+            else if (i + 2 >= length) {
+                byte4 = 64;
+            }
+            result += base64Digits.charAt(byte1) + base64Digits.charAt(byte2) + base64Digits.charAt(byte3) + base64Digits.charAt(byte4);
+            i += 3;
+        }
+        return result;
+    }
+    ts.convertToBase64 = convertToBase64;
+    var carriageReturnLineFeed = "\r\n";
+    var lineFeed = "\n";
+    function getNewLineCharacter(options) {
+        if (options.newLine === 0) {
+            return carriageReturnLineFeed;
+        }
+        else if (options.newLine === 1) {
+            return lineFeed;
+        }
+        else if (ts.sys) {
+            return ts.sys.newLine;
+        }
+        return carriageReturnLineFeed;
+    }
+    ts.getNewLineCharacter = getNewLineCharacter;
+    function isSimpleExpression(node) {
+        return isSimpleExpressionWorker(node, 0);
+    }
+    ts.isSimpleExpression = isSimpleExpression;
+    function isSimpleExpressionWorker(node, depth) {
+        if (depth <= 5) {
+            var kind = node.kind;
+            if (kind === 9
+                || kind === 8
+                || kind === 11
+                || kind === 12
+                || kind === 70
+                || kind === 98
+                || kind === 96
+                || kind === 100
+                || kind === 85
+                || kind === 94) {
+                return true;
+            }
+            else if (kind === 177) {
+                return isSimpleExpressionWorker(node.expression, depth + 1);
+            }
+            else if (kind === 178) {
+                return isSimpleExpressionWorker(node.expression, depth + 1)
+                    && isSimpleExpressionWorker(node.argumentExpression, depth + 1);
+            }
+            else if (kind === 190
+                || kind === 191) {
+                return isSimpleExpressionWorker(node.operand, depth + 1);
+            }
+            else if (kind === 192) {
+                return node.operatorToken.kind !== 39
+                    && isSimpleExpressionWorker(node.left, depth + 1)
+                    && isSimpleExpressionWorker(node.right, depth + 1);
+            }
+            else if (kind === 193) {
+                return isSimpleExpressionWorker(node.condition, depth + 1)
+                    && isSimpleExpressionWorker(node.whenTrue, depth + 1)
+                    && isSimpleExpressionWorker(node.whenFalse, depth + 1);
+            }
+            else if (kind === 188
+                || kind === 187
+                || kind === 186) {
+                return isSimpleExpressionWorker(node.expression, depth + 1);
+            }
+            else if (kind === 175) {
+                return node.elements.length === 0;
+            }
+            else if (kind === 176) {
+                return node.properties.length === 0;
+            }
+            else if (kind === 179) {
+                if (!isSimpleExpressionWorker(node.expression, depth + 1)) {
+                    return false;
+                }
+                for (var _i = 0, _a = node.arguments; _i < _a.length; _i++) {
+                    var argument = _a[_i];
+                    if (!isSimpleExpressionWorker(argument, depth + 1)) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+        }
+        return false;
+    }
+    var syntaxKindCache = ts.createMap();
+    function formatSyntaxKind(kind) {
+        var syntaxKindEnum = ts.SyntaxKind;
+        if (syntaxKindEnum) {
+            if (syntaxKindCache[kind]) {
+                return syntaxKindCache[kind];
+            }
+            for (var name_9 in syntaxKindEnum) {
+                if (syntaxKindEnum[name_9] === kind) {
+                    return syntaxKindCache[kind] = kind.toString() + " (" + name_9 + ")";
+                }
+            }
+        }
+        else {
+            return kind.toString();
+        }
+    }
+    ts.formatSyntaxKind = formatSyntaxKind;
+    function movePos(pos, value) {
+        return ts.positionIsSynthesized(pos) ? -1 : pos + value;
+    }
+    ts.movePos = movePos;
+    function createRange(pos, end) {
+        return { pos: pos, end: end };
+    }
+    ts.createRange = createRange;
+    function moveRangeEnd(range, end) {
+        return createRange(range.pos, end);
+    }
+    ts.moveRangeEnd = moveRangeEnd;
+    function moveRangePos(range, pos) {
+        return createRange(pos, range.end);
+    }
+    ts.moveRangePos = moveRangePos;
+    function moveRangePastDecorators(node) {
+        return node.decorators && node.decorators.length > 0
+            ? moveRangePos(node, node.decorators.end)
+            : node;
+    }
+    ts.moveRangePastDecorators = moveRangePastDecorators;
+    function moveRangePastModifiers(node) {
+        return node.modifiers && node.modifiers.length > 0
+            ? moveRangePos(node, node.modifiers.end)
+            : moveRangePastDecorators(node);
+    }
+    ts.moveRangePastModifiers = moveRangePastModifiers;
+    function isCollapsedRange(range) {
+        return range.pos === range.end;
+    }
+    ts.isCollapsedRange = isCollapsedRange;
+    function collapseRangeToStart(range) {
+        return isCollapsedRange(range) ? range : moveRangeEnd(range, range.pos);
+    }
+    ts.collapseRangeToStart = collapseRangeToStart;
+    function collapseRangeToEnd(range) {
+        return isCollapsedRange(range) ? range : moveRangePos(range, range.end);
+    }
+    ts.collapseRangeToEnd = collapseRangeToEnd;
+    function createTokenRange(pos, token) {
+        return createRange(pos, pos + ts.tokenToString(token).length);
+    }
+    ts.createTokenRange = createTokenRange;
+    function rangeIsOnSingleLine(range, sourceFile) {
+        return rangeStartIsOnSameLineAsRangeEnd(range, range, sourceFile);
+    }
+    ts.rangeIsOnSingleLine = rangeIsOnSingleLine;
+    function rangeStartPositionsAreOnSameLine(range1, range2, sourceFile) {
+        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile), getStartPositionOfRange(range2, sourceFile), sourceFile);
+    }
+    ts.rangeStartPositionsAreOnSameLine = rangeStartPositionsAreOnSameLine;
+    function rangeEndPositionsAreOnSameLine(range1, range2, sourceFile) {
+        return positionsAreOnSameLine(range1.end, range2.end, sourceFile);
+    }
+    ts.rangeEndPositionsAreOnSameLine = rangeEndPositionsAreOnSameLine;
+    function rangeStartIsOnSameLineAsRangeEnd(range1, range2, sourceFile) {
+        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile), range2.end, sourceFile);
+    }
+    ts.rangeStartIsOnSameLineAsRangeEnd = rangeStartIsOnSameLineAsRangeEnd;
+    function rangeEndIsOnSameLineAsRangeStart(range1, range2, sourceFile) {
+        return positionsAreOnSameLine(range1.end, getStartPositionOfRange(range2, sourceFile), sourceFile);
+    }
+    ts.rangeEndIsOnSameLineAsRangeStart = rangeEndIsOnSameLineAsRangeStart;
+    function positionsAreOnSameLine(pos1, pos2, sourceFile) {
+        return pos1 === pos2 ||
+            getLineOfLocalPosition(sourceFile, pos1) === getLineOfLocalPosition(sourceFile, pos2);
+    }
+    ts.positionsAreOnSameLine = positionsAreOnSameLine;
+    function getStartPositionOfRange(range, sourceFile) {
+        return ts.positionIsSynthesized(range.pos) ? -1 : ts.skipTrivia(sourceFile.text, range.pos);
+    }
+    ts.getStartPositionOfRange = getStartPositionOfRange;
+    function collectExternalModuleInfo(sourceFile, resolver) {
+        var externalImports = [];
+        var exportSpecifiers = ts.createMap();
+        var exportedBindings = ts.createMap();
+        var uniqueExports = ts.createMap();
+        var hasExportDefault = false;
+        var exportEquals = undefined;
+        var hasExportStarsToExportValues = false;
+        for (var _i = 0, _a = sourceFile.statements; _i < _a.length; _i++) {
+            var node = _a[_i];
+            switch (node.kind) {
+                case 235:
+                    externalImports.push(node);
+                    break;
+                case 234:
+                    if (node.moduleReference.kind === 245) {
+                        externalImports.push(node);
+                    }
+                    break;
+                case 241:
+                    if (node.moduleSpecifier) {
+                        if (!node.exportClause) {
+                            externalImports.push(node);
+                            hasExportStarsToExportValues = true;
+                        }
+                        else {
+                            externalImports.push(node);
+                        }
+                    }
+                    else {
+                        for (var _b = 0, _c = node.exportClause.elements; _b < _c.length; _b++) {
+                            var specifier = _c[_b];
+                            if (!uniqueExports[specifier.name.text]) {
+                                var name_10 = specifier.propertyName || specifier.name;
+                                ts.multiMapAdd(exportSpecifiers, name_10.text, specifier);
+                                var decl = resolver.getReferencedImportDeclaration(name_10)
+                                    || resolver.getReferencedValueDeclaration(name_10);
+                                if (decl) {
+                                    ts.multiMapAdd(exportedBindings, getOriginalNodeId(decl), specifier.name);
+                                }
+                                uniqueExports[specifier.name.text] = specifier.name;
+                            }
+                        }
+                    }
+                    break;
+                case 240:
+                    if (node.isExportEquals && !exportEquals) {
+                        exportEquals = node;
+                    }
+                    break;
+                case 205:
+                    if (hasModifier(node, 1)) {
+                        for (var _d = 0, _e = node.declarationList.declarations; _d < _e.length; _d++) {
+                            var decl = _e[_d];
+                            collectExportedVariableInfo(decl, uniqueExports);
+                        }
+                    }
+                    break;
+                case 225:
+                    if (hasModifier(node, 1)) {
+                        if (hasModifier(node, 512)) {
+                            if (!hasExportDefault) {
+                                ts.multiMapAdd(exportedBindings, getOriginalNodeId(node), ts.getDeclarationName(node));
+                                hasExportDefault = true;
+                            }
+                        }
+                        else {
+                            var name_11 = node.name;
+                            if (!uniqueExports[name_11.text]) {
+                                ts.multiMapAdd(exportedBindings, getOriginalNodeId(node), name_11);
+                                uniqueExports[name_11.text] = name_11;
+                            }
+                        }
+                    }
+                    break;
+                case 226:
+                    if (hasModifier(node, 1)) {
+                        if (hasModifier(node, 512)) {
+                            if (!hasExportDefault) {
+                                ts.multiMapAdd(exportedBindings, getOriginalNodeId(node), ts.getDeclarationName(node));
+                                hasExportDefault = true;
+                            }
+                        }
+                        else {
+                            var name_12 = node.name;
+                            if (!uniqueExports[name_12.text]) {
+                                ts.multiMapAdd(exportedBindings, getOriginalNodeId(node), name_12);
+                                uniqueExports[name_12.text] = name_12;
+                            }
+                        }
+                    }
+                    break;
+            }
+        }
+        var exportedNames;
+        for (var key in uniqueExports) {
+            exportedNames = ts.append(exportedNames, uniqueExports[key]);
+        }
+        return { externalImports: externalImports, exportSpecifiers: exportSpecifiers, exportEquals: exportEquals, hasExportStarsToExportValues: hasExportStarsToExportValues, exportedBindings: exportedBindings, exportedNames: exportedNames };
+    }
+    ts.collectExternalModuleInfo = collectExternalModuleInfo;
+    function collectExportedVariableInfo(decl, uniqueExports) {
+        if (isBindingPattern(decl.name)) {
+            for (var _i = 0, _a = decl.name.elements; _i < _a.length; _i++) {
+                var element = _a[_i];
+                if (!isOmittedExpression(element)) {
+                    collectExportedVariableInfo(element, uniqueExports);
+                }
+            }
+        }
+        else if (!isGeneratedIdentifier(decl.name)) {
+            if (!uniqueExports[decl.name.text]) {
+                uniqueExports[decl.name.text] = decl.name;
+            }
+        }
+    }
+    function isDeclarationNameOfEnumOrNamespace(node) {
+        var parseNode = getParseTreeNode(node);
+        if (parseNode) {
+            switch (parseNode.parent.kind) {
+                case 229:
+                case 230:
+                    return parseNode === parseNode.parent.name;
+            }
+        }
+        return false;
+    }
+    ts.isDeclarationNameOfEnumOrNamespace = isDeclarationNameOfEnumOrNamespace;
+    function getInitializedVariables(node) {
+        return ts.filter(node.declarations, isInitializedVariable);
+    }
+    ts.getInitializedVariables = getInitializedVariables;
+    function isInitializedVariable(node) {
+        return node.initializer !== undefined;
+    }
+    function isMergedWithClass(node) {
+        if (node.symbol) {
+            for (var _i = 0, _a = node.symbol.declarations; _i < _a.length; _i++) {
+                var declaration = _a[_i];
+                if (declaration.kind === 226 && declaration !== node) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+    ts.isMergedWithClass = isMergedWithClass;
+    function isFirstDeclarationOfKind(node, kind) {
+        return node.symbol && getDeclarationOfKind(node.symbol, kind) === node;
+    }
+    ts.isFirstDeclarationOfKind = isFirstDeclarationOfKind;
+    function isNodeArray(array) {
+        return array.hasOwnProperty("pos")
+            && array.hasOwnProperty("end");
+    }
+    ts.isNodeArray = isNodeArray;
+    function isNoSubstitutionTemplateLiteral(node) {
+        return node.kind === 12;
+    }
+    ts.isNoSubstitutionTemplateLiteral = isNoSubstitutionTemplateLiteral;
+    function isLiteralKind(kind) {
+        return 8 <= kind && kind <= 12;
+    }
+    ts.isLiteralKind = isLiteralKind;
+    function isTextualLiteralKind(kind) {
+        return kind === 9 || kind === 12;
+    }
+    ts.isTextualLiteralKind = isTextualLiteralKind;
+    function isLiteralExpression(node) {
+        return isLiteralKind(node.kind);
+    }
+    ts.isLiteralExpression = isLiteralExpression;
+    function isTemplateLiteralKind(kind) {
+        return 12 <= kind && kind <= 15;
+    }
+    ts.isTemplateLiteralKind = isTemplateLiteralKind;
+    function isTemplateHead(node) {
+        return node.kind === 13;
+    }
+    ts.isTemplateHead = isTemplateHead;
+    function isTemplateMiddleOrTemplateTail(node) {
+        var kind = node.kind;
+        return kind === 14
+            || kind === 15;
+    }
+    ts.isTemplateMiddleOrTemplateTail = isTemplateMiddleOrTemplateTail;
+    function isIdentifier(node) {
+        return node.kind === 70;
+    }
+    ts.isIdentifier = isIdentifier;
+    function isGeneratedIdentifier(node) {
+        return isIdentifier(node) && node.autoGenerateKind > 0;
+    }
+    ts.isGeneratedIdentifier = isGeneratedIdentifier;
+    function isModifier(node) {
+        return isModifierKind(node.kind);
+    }
+    ts.isModifier = isModifier;
+    function isQualifiedName(node) {
+        return node.kind === 141;
+    }
+    ts.isQualifiedName = isQualifiedName;
+    function isComputedPropertyName(node) {
+        return node.kind === 142;
+    }
+    ts.isComputedPropertyName = isComputedPropertyName;
+    function isEntityName(node) {
+        var kind = node.kind;
+        return kind === 141
+            || kind === 70;
+    }
+    ts.isEntityName = isEntityName;
+    function isPropertyName(node) {
+        var kind = node.kind;
+        return kind === 70
+            || kind === 9
+            || kind === 8
+            || kind === 142;
+    }
+    ts.isPropertyName = isPropertyName;
+    function isModuleName(node) {
+        var kind = node.kind;
+        return kind === 70
+            || kind === 9;
+    }
+    ts.isModuleName = isModuleName;
+    function isBindingName(node) {
+        var kind = node.kind;
+        return kind === 70
+            || kind === 172
+            || kind === 173;
+    }
+    ts.isBindingName = isBindingName;
+    function isTypeParameter(node) {
+        return node.kind === 143;
+    }
+    ts.isTypeParameter = isTypeParameter;
+    function isParameter(node) {
+        return node.kind === 144;
+    }
+    ts.isParameter = isParameter;
+    function isDecorator(node) {
+        return node.kind === 145;
+    }
+    ts.isDecorator = isDecorator;
+    function isMethodDeclaration(node) {
+        return node.kind === 149;
+    }
+    ts.isMethodDeclaration = isMethodDeclaration;
+    function isClassElement(node) {
+        var kind = node.kind;
+        return kind === 150
+            || kind === 147
+            || kind === 149
+            || kind === 151
+            || kind === 152
+            || kind === 155
+            || kind === 203;
+    }
+    ts.isClassElement = isClassElement;
+    function isObjectLiteralElementLike(node) {
+        var kind = node.kind;
+        return kind === 257
+            || kind === 258
+            || kind === 259
+            || kind === 149
+            || kind === 151
+            || kind === 152
+            || kind === 244;
+    }
+    ts.isObjectLiteralElementLike = isObjectLiteralElementLike;
+    function isTypeNodeKind(kind) {
+        return (kind >= 156 && kind <= 171)
+            || kind === 118
+            || kind === 132
+            || kind === 121
+            || kind === 134
+            || kind === 135
+            || kind === 104
+            || kind === 129
+            || kind === 199;
+    }
+    function isTypeNode(node) {
+        return isTypeNodeKind(node.kind);
+    }
+    ts.isTypeNode = isTypeNode;
+    function isBindingPattern(node) {
+        if (node) {
+            var kind = node.kind;
+            return kind === 173
+                || kind === 172;
+        }
+        return false;
+    }
+    ts.isBindingPattern = isBindingPattern;
+    function isBindingElement(node) {
+        return node.kind === 174;
+    }
+    ts.isBindingElement = isBindingElement;
+    function isArrayBindingElement(node) {
+        var kind = node.kind;
+        return kind === 174
+            || kind === 198;
+    }
+    ts.isArrayBindingElement = isArrayBindingElement;
+    function isArrayLiteralExpression(node) {
+        return node.kind === 175;
+    }
+    ts.isArrayLiteralExpression = isArrayLiteralExpression;
+    function isObjectLiteralExpression(node) {
+        return node.kind === 176;
+    }
+    ts.isObjectLiteralExpression = isObjectLiteralExpression;
+    function isPropertyAccessExpression(node) {
+        return node.kind === 177;
+    }
+    ts.isPropertyAccessExpression = isPropertyAccessExpression;
+    function isElementAccessExpression(node) {
+        return node.kind === 178;
+    }
+    ts.isElementAccessExpression = isElementAccessExpression;
+    function isBinaryExpression(node) {
+        return node.kind === 192;
+    }
+    ts.isBinaryExpression = isBinaryExpression;
+    function isConditionalExpression(node) {
+        return node.kind === 193;
+    }
+    ts.isConditionalExpression = isConditionalExpression;
+    function isCallExpression(node) {
+        return node.kind === 179;
+    }
+    ts.isCallExpression = isCallExpression;
+    function isTemplateLiteral(node) {
+        var kind = node.kind;
+        return kind === 194
+            || kind === 12;
+    }
+    ts.isTemplateLiteral = isTemplateLiteral;
+    function isSpreadExpression(node) {
+        return node.kind === 196;
+    }
+    ts.isSpreadExpression = isSpreadExpression;
+    function isExpressionWithTypeArguments(node) {
+        return node.kind === 199;
+    }
+    ts.isExpressionWithTypeArguments = isExpressionWithTypeArguments;
+    function isLeftHandSideExpressionKind(kind) {
+        return kind === 177
+            || kind === 178
+            || kind === 180
+            || kind === 179
+            || kind === 246
+            || kind === 247
+            || kind === 181
+            || kind === 175
+            || kind === 183
+            || kind === 176
+            || kind === 197
+            || kind === 184
+            || kind === 70
+            || kind === 11
+            || kind === 8
+            || kind === 9
+            || kind === 12
+            || kind === 194
+            || kind === 85
+            || kind === 94
+            || kind === 98
+            || kind === 100
+            || kind === 96
+            || kind === 201;
+    }
+    function isLeftHandSideExpression(node) {
+        return isLeftHandSideExpressionKind(ts.skipPartiallyEmittedExpressions(node).kind);
+    }
+    ts.isLeftHandSideExpression = isLeftHandSideExpression;
+    function isUnaryExpressionKind(kind) {
+        return kind === 190
+            || kind === 191
+            || kind === 186
+            || kind === 187
+            || kind === 188
+            || kind === 189
+            || kind === 182
+            || isLeftHandSideExpressionKind(kind);
+    }
+    function isUnaryExpression(node) {
+        return isUnaryExpressionKind(ts.skipPartiallyEmittedExpressions(node).kind);
+    }
+    ts.isUnaryExpression = isUnaryExpression;
+    function isExpressionKind(kind) {
+        return kind === 193
+            || kind === 195
+            || kind === 185
+            || kind === 192
+            || kind === 196
+            || kind === 200
+            || kind === 198
+            || isUnaryExpressionKind(kind);
+    }
+    function isExpression(node) {
+        return isExpressionKind(ts.skipPartiallyEmittedExpressions(node).kind);
+    }
+    ts.isExpression = isExpression;
+    function isAssertionExpression(node) {
+        var kind = node.kind;
+        return kind === 182
+            || kind === 200;
+    }
+    ts.isAssertionExpression = isAssertionExpression;
+    function isPartiallyEmittedExpression(node) {
+        return node.kind === 293;
+    }
+    ts.isPartiallyEmittedExpression = isPartiallyEmittedExpression;
+    function isNotEmittedStatement(node) {
+        return node.kind === 292;
+    }
+    ts.isNotEmittedStatement = isNotEmittedStatement;
+    function isNotEmittedOrPartiallyEmittedNode(node) {
+        return isNotEmittedStatement(node)
+            || isPartiallyEmittedExpression(node);
+    }
+    ts.isNotEmittedOrPartiallyEmittedNode = isNotEmittedOrPartiallyEmittedNode;
+    function isOmittedExpression(node) {
+        return node.kind === 198;
+    }
+    ts.isOmittedExpression = isOmittedExpression;
+    function isTemplateSpan(node) {
+        return node.kind === 202;
+    }
+    ts.isTemplateSpan = isTemplateSpan;
+    function isBlock(node) {
+        return node.kind === 204;
+    }
+    ts.isBlock = isBlock;
+    function isConciseBody(node) {
+        return isBlock(node)
+            || isExpression(node);
+    }
+    ts.isConciseBody = isConciseBody;
+    function isFunctionBody(node) {
+        return isBlock(node);
+    }
+    ts.isFunctionBody = isFunctionBody;
+    function isForInitializer(node) {
+        return isVariableDeclarationList(node)
+            || isExpression(node);
+    }
+    ts.isForInitializer = isForInitializer;
+    function isVariableDeclaration(node) {
+        return node.kind === 223;
+    }
+    ts.isVariableDeclaration = isVariableDeclaration;
+    function isVariableDeclarationList(node) {
+        return node.kind === 224;
+    }
+    ts.isVariableDeclarationList = isVariableDeclarationList;
+    function isCaseBlock(node) {
+        return node.kind === 232;
+    }
+    ts.isCaseBlock = isCaseBlock;
+    function isModuleBody(node) {
+        var kind = node.kind;
+        return kind === 231
+            || kind === 230;
+    }
+    ts.isModuleBody = isModuleBody;
+    function isImportEqualsDeclaration(node) {
+        return node.kind === 234;
+    }
+    ts.isImportEqualsDeclaration = isImportEqualsDeclaration;
+    function isImportClause(node) {
+        return node.kind === 236;
+    }
+    ts.isImportClause = isImportClause;
+    function isNamedImportBindings(node) {
+        var kind = node.kind;
+        return kind === 238
+            || kind === 237;
+    }
+    ts.isNamedImportBindings = isNamedImportBindings;
+    function isImportSpecifier(node) {
+        return node.kind === 239;
+    }
+    ts.isImportSpecifier = isImportSpecifier;
+    function isNamedExports(node) {
+        return node.kind === 242;
+    }
+    ts.isNamedExports = isNamedExports;
+    function isExportSpecifier(node) {
+        return node.kind === 243;
+    }
+    ts.isExportSpecifier = isExportSpecifier;
+    function isModuleOrEnumDeclaration(node) {
+        return node.kind === 230 || node.kind === 229;
+    }
+    ts.isModuleOrEnumDeclaration = isModuleOrEnumDeclaration;
+    function isDeclarationKind(kind) {
+        return kind === 185
+            || kind === 174
+            || kind === 226
+            || kind === 197
+            || kind === 150
+            || kind === 229
+            || kind === 260
+            || kind === 243
+            || kind === 225
+            || kind === 184
+            || kind === 151
+            || kind === 236
+            || kind === 234
+            || kind === 239
+            || kind === 227
+            || kind === 149
+            || kind === 148
+            || kind === 230
+            || kind === 233
+            || kind === 237
+            || kind === 144
+            || kind === 257
+            || kind === 147
+            || kind === 146
+            || kind === 152
+            || kind === 258
+            || kind === 228
+            || kind === 143
+            || kind === 223
+            || kind === 284;
+    }
+    function isDeclarationStatementKind(kind) {
+        return kind === 225
+            || kind === 244
+            || kind === 226
+            || kind === 227
+            || kind === 228
+            || kind === 229
+            || kind === 230
+            || kind === 235
+            || kind === 234
+            || kind === 241
+            || kind === 240
+            || kind === 233;
+    }
+    function isStatementKindButNotDeclarationKind(kind) {
+        return kind === 215
+            || kind === 214
+            || kind === 222
+            || kind === 209
+            || kind === 207
+            || kind === 206
+            || kind === 212
+            || kind === 213
+            || kind === 211
+            || kind === 208
+            || kind === 219
+            || kind === 216
+            || kind === 218
+            || kind === 220
+            || kind === 221
+            || kind === 205
+            || kind === 210
+            || kind === 217
+            || kind === 292
+            || kind === 295
+            || kind === 294;
+    }
+    function isDeclaration(node) {
+        return isDeclarationKind(node.kind);
+    }
+    ts.isDeclaration = isDeclaration;
+    function isDeclarationStatement(node) {
+        return isDeclarationStatementKind(node.kind);
+    }
+    ts.isDeclarationStatement = isDeclarationStatement;
+    function isStatementButNotDeclaration(node) {
+        return isStatementKindButNotDeclarationKind(node.kind);
+    }
+    ts.isStatementButNotDeclaration = isStatementButNotDeclaration;
+    function isStatement(node) {
+        var kind = node.kind;
+        return isStatementKindButNotDeclarationKind(kind)
+            || isDeclarationStatementKind(kind)
+            || kind === 204;
+    }
+    ts.isStatement = isStatement;
+    function isModuleReference(node) {
+        var kind = node.kind;
+        return kind === 245
+            || kind === 141
+            || kind === 70;
+    }
+    ts.isModuleReference = isModuleReference;
+    function isJsxOpeningElement(node) {
+        return node.kind === 248;
+    }
+    ts.isJsxOpeningElement = isJsxOpeningElement;
+    function isJsxClosingElement(node) {
+        return node.kind === 249;
+    }
+    ts.isJsxClosingElement = isJsxClosingElement;
+    function isJsxTagNameExpression(node) {
+        var kind = node.kind;
+        return kind === 98
+            || kind === 70
+            || kind === 177;
+    }
+    ts.isJsxTagNameExpression = isJsxTagNameExpression;
+    function isJsxChild(node) {
+        var kind = node.kind;
+        return kind === 246
+            || kind === 252
+            || kind === 247
+            || kind === 10;
+    }
+    ts.isJsxChild = isJsxChild;
+    function isJsxAttributeLike(node) {
+        var kind = node.kind;
+        return kind === 250
+            || kind === 251;
+    }
+    ts.isJsxAttributeLike = isJsxAttributeLike;
+    function isJsxSpreadAttribute(node) {
+        return node.kind === 251;
+    }
+    ts.isJsxSpreadAttribute = isJsxSpreadAttribute;
+    function isJsxAttribute(node) {
+        return node.kind === 250;
+    }
+    ts.isJsxAttribute = isJsxAttribute;
+    function isStringLiteralOrJsxExpression(node) {
+        var kind = node.kind;
+        return kind === 9
+            || kind === 252;
+    }
+    ts.isStringLiteralOrJsxExpression = isStringLiteralOrJsxExpression;
+    function isCaseOrDefaultClause(node) {
+        var kind = node.kind;
+        return kind === 253
+            || kind === 254;
+    }
+    ts.isCaseOrDefaultClause = isCaseOrDefaultClause;
+    function isHeritageClause(node) {
+        return node.kind === 255;
+    }
+    ts.isHeritageClause = isHeritageClause;
+    function isCatchClause(node) {
+        return node.kind === 256;
+    }
+    ts.isCatchClause = isCatchClause;
+    function isPropertyAssignment(node) {
+        return node.kind === 257;
+    }
+    ts.isPropertyAssignment = isPropertyAssignment;
+    function isShorthandPropertyAssignment(node) {
+        return node.kind === 258;
+    }
+    ts.isShorthandPropertyAssignment = isShorthandPropertyAssignment;
+    function isEnumMember(node) {
+        return node.kind === 260;
+    }
+    ts.isEnumMember = isEnumMember;
+    function isSourceFile(node) {
+        return node.kind === 261;
+    }
+    ts.isSourceFile = isSourceFile;
+    function isWatchSet(options) {
+        return options.watch && options.hasOwnProperty("watch");
+    }
+    ts.isWatchSet = isWatchSet;
+})(ts || (ts = {}));
+(function (ts) {
+    function getDefaultLibFileName(options) {
+        switch (options.target) {
+            case 5:
+            case 4:
+                return "lib.es2017.d.ts";
+            case 3:
+                return "lib.es2016.d.ts";
+            case 2:
+                return "lib.es6.d.ts";
+            default:
+                return "lib.d.ts";
+        }
+    }
+    ts.getDefaultLibFileName = getDefaultLibFileName;
+    function textSpanEnd(span) {
+        return span.start + span.length;
+    }
+    ts.textSpanEnd = textSpanEnd;
+    function textSpanIsEmpty(span) {
+        return span.length === 0;
+    }
+    ts.textSpanIsEmpty = textSpanIsEmpty;
+    function textSpanContainsPosition(span, position) {
+        return position >= span.start && position < textSpanEnd(span);
+    }
+    ts.textSpanContainsPosition = textSpanContainsPosition;
+    function textSpanContainsTextSpan(span, other) {
+        return other.start >= span.start && textSpanEnd(other) <= textSpanEnd(span);
+    }
+    ts.textSpanContainsTextSpan = textSpanContainsTextSpan;
+    function textSpanOverlapsWith(span, other) {
+        var overlapStart = Math.max(span.start, other.start);
+        var overlapEnd = Math.min(textSpanEnd(span), textSpanEnd(other));
+        return overlapStart < overlapEnd;
+    }
+    ts.textSpanOverlapsWith = textSpanOverlapsWith;
+    function textSpanOverlap(span1, span2) {
+        var overlapStart = Math.max(span1.start, span2.start);
+        var overlapEnd = Math.min(textSpanEnd(span1), textSpanEnd(span2));
+        if (overlapStart < overlapEnd) {
+            return createTextSpanFromBounds(overlapStart, overlapEnd);
+        }
+        return undefined;
+    }
+    ts.textSpanOverlap = textSpanOverlap;
+    function textSpanIntersectsWithTextSpan(span, other) {
+        return other.start <= textSpanEnd(span) && textSpanEnd(other) >= span.start;
+    }
+    ts.textSpanIntersectsWithTextSpan = textSpanIntersectsWithTextSpan;
+    function textSpanIntersectsWith(span, start, length) {
+        var end = start + length;
+        return start <= textSpanEnd(span) && end >= span.start;
+    }
+    ts.textSpanIntersectsWith = textSpanIntersectsWith;
+    function decodedTextSpanIntersectsWith(start1, length1, start2, length2) {
+        var end1 = start1 + length1;
+        var end2 = start2 + length2;
+        return start2 <= end1 && end2 >= start1;
+    }
+    ts.decodedTextSpanIntersectsWith = decodedTextSpanIntersectsWith;
+    function textSpanIntersectsWithPosition(span, position) {
+        return position <= textSpanEnd(span) && position >= span.start;
+    }
+    ts.textSpanIntersectsWithPosition = textSpanIntersectsWithPosition;
+    function textSpanIntersection(span1, span2) {
+        var intersectStart = Math.max(span1.start, span2.start);
+        var intersectEnd = Math.min(textSpanEnd(span1), textSpanEnd(span2));
+        if (intersectStart <= intersectEnd) {
+            return createTextSpanFromBounds(intersectStart, intersectEnd);
+        }
+        return undefined;
+    }
+    ts.textSpanIntersection = textSpanIntersection;
+    function createTextSpan(start, length) {
+        if (start < 0) {
+            throw new Error("start < 0");
+        }
+        if (length < 0) {
+            throw new Error("length < 0");
+        }
+        return { start: start, length: length };
+    }
+    ts.createTextSpan = createTextSpan;
+    function createTextSpanFromBounds(start, end) {
+        return createTextSpan(start, end - start);
+    }
+    ts.createTextSpanFromBounds = createTextSpanFromBounds;
+    function textChangeRangeNewSpan(range) {
+        return createTextSpan(range.span.start, range.newLength);
+    }
+    ts.textChangeRangeNewSpan = textChangeRangeNewSpan;
+    function textChangeRangeIsUnchanged(range) {
+        return textSpanIsEmpty(range.span) && range.newLength === 0;
+    }
+    ts.textChangeRangeIsUnchanged = textChangeRangeIsUnchanged;
+    function createTextChangeRange(span, newLength) {
+        if (newLength < 0) {
+            throw new Error("newLength < 0");
+        }
+        return { span: span, newLength: newLength };
+    }
+    ts.createTextChangeRange = createTextChangeRange;
+    ts.unchangedTextChangeRange = createTextChangeRange(createTextSpan(0, 0), 0);
+    function collapseTextChangeRangesAcrossMultipleVersions(changes) {
+        if (changes.length === 0) {
+            return ts.unchangedTextChangeRange;
+        }
+        if (changes.length === 1) {
+            return changes[0];
+        }
+        var change0 = changes[0];
+        var oldStartN = change0.span.start;
+        var oldEndN = textSpanEnd(change0.span);
+        var newEndN = oldStartN + change0.newLength;
+        for (var i = 1; i < changes.length; i++) {
+            var nextChange = changes[i];
+            var oldStart1 = oldStartN;
+            var oldEnd1 = oldEndN;
+            var newEnd1 = newEndN;
+            var oldStart2 = nextChange.span.start;
+            var oldEnd2 = textSpanEnd(nextChange.span);
+            var newEnd2 = oldStart2 + nextChange.newLength;
+            oldStartN = Math.min(oldStart1, oldStart2);
+            oldEndN = Math.max(oldEnd1, oldEnd1 + (oldEnd2 - newEnd1));
+            newEndN = Math.max(newEnd2, newEnd2 + (newEnd1 - oldEnd2));
+        }
+        return createTextChangeRange(createTextSpanFromBounds(oldStartN, oldEndN), newEndN - oldStartN);
+    }
+    ts.collapseTextChangeRangesAcrossMultipleVersions = collapseTextChangeRangesAcrossMultipleVersions;
+    function getTypeParameterOwner(d) {
+        if (d && d.kind === 143) {
+            for (var current = d; current; current = current.parent) {
+                if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 227) {
+                    return current;
+                }
+            }
+        }
+    }
+    ts.getTypeParameterOwner = getTypeParameterOwner;
+    function isParameterPropertyDeclaration(node) {
+        return ts.hasModifier(node, 92) && node.parent.kind === 150 && ts.isClassLike(node.parent.parent);
+    }
+    ts.isParameterPropertyDeclaration = isParameterPropertyDeclaration;
+    function walkUpBindingElementsAndPatterns(node) {
+        while (node && (node.kind === 174 || ts.isBindingPattern(node))) {
+            node = node.parent;
+        }
+        return node;
+    }
+    function getCombinedModifierFlags(node) {
+        node = walkUpBindingElementsAndPatterns(node);
+        var flags = ts.getModifierFlags(node);
+        if (node.kind === 223) {
+            node = node.parent;
+        }
+        if (node && node.kind === 224) {
+            flags |= ts.getModifierFlags(node);
+            node = node.parent;
+        }
+        if (node && node.kind === 205) {
+            flags |= ts.getModifierFlags(node);
+        }
+        return flags;
+    }
+    ts.getCombinedModifierFlags = getCombinedModifierFlags;
+    function getCombinedNodeFlags(node) {
+        node = walkUpBindingElementsAndPatterns(node);
+        var flags = node.flags;
+        if (node.kind === 223) {
+            node = node.parent;
+        }
+        if (node && node.kind === 224) {
+            flags |= node.flags;
+            node = node.parent;
+        }
+        if (node && node.kind === 205) {
+            flags |= node.flags;
+        }
+        return flags;
+    }
+    ts.getCombinedNodeFlags = getCombinedNodeFlags;
+})(ts || (ts = {}));
+var ts;
 (function (ts) {
     var NodeConstructor;
     var SourceFileConstructor;
     function createNode(kind, location, flags) {
-        var ConstructorForKind = kind === 256
+        var ConstructorForKind = kind === 261
             ? (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))
             : (NodeConstructor || (NodeConstructor = ts.objectAllocator.getNodeConstructor()));
         var node = location
@@ -9781,7 +10777,7 @@ var ts;
     }
     ts.createNull = createNull;
     function createComputedPropertyName(expression, location) {
-        var node = createNode(141, location);
+        var node = createNode(142, location);
         node.expression = expression;
         return node;
     }
@@ -9793,12 +10789,8 @@ var ts;
         return node;
     }
     ts.updateComputedPropertyName = updateComputedPropertyName;
-    function createParameter(name, initializer, location) {
-        return createParameterDeclaration(undefined, undefined, undefined, name, undefined, undefined, initializer, location);
-    }
-    ts.createParameter = createParameter;
-    function createParameterDeclaration(decorators, modifiers, dotDotDotToken, name, questionToken, type, initializer, location, flags) {
-        var node = createNode(143, location, flags);
+    function createParameter(decorators, modifiers, dotDotDotToken, name, questionToken, type, initializer, location, flags) {
+        var node = createNode(144, location, flags);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.dotDotDotToken = dotDotDotToken;
@@ -9808,16 +10800,16 @@ var ts;
         node.initializer = initializer ? parenthesizeExpressionForList(initializer) : undefined;
         return node;
     }
-    ts.createParameterDeclaration = createParameterDeclaration;
-    function updateParameterDeclaration(node, decorators, modifiers, name, type, initializer) {
+    ts.createParameter = createParameter;
+    function updateParameter(node, decorators, modifiers, name, type, initializer) {
         if (node.decorators !== decorators || node.modifiers !== modifiers || node.name !== name || node.type !== type || node.initializer !== initializer) {
-            return updateNode(createParameterDeclaration(decorators, modifiers, node.dotDotDotToken, name, node.questionToken, type, initializer, node, node.flags), node);
+            return updateNode(createParameter(decorators, modifiers, node.dotDotDotToken, name, node.questionToken, type, initializer, node, node.flags), node);
         }
         return node;
     }
-    ts.updateParameterDeclaration = updateParameterDeclaration;
+    ts.updateParameter = updateParameter;
     function createProperty(decorators, modifiers, name, questionToken, type, initializer, location) {
-        var node = createNode(146, location);
+        var node = createNode(147, location);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
@@ -9835,7 +10827,7 @@ var ts;
     }
     ts.updateProperty = updateProperty;
     function createMethod(decorators, modifiers, asteriskToken, name, typeParameters, parameters, type, body, location, flags) {
-        var node = createNode(148, location, flags);
+        var node = createNode(149, location, flags);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.asteriskToken = asteriskToken;
@@ -9855,7 +10847,7 @@ var ts;
     }
     ts.updateMethod = updateMethod;
     function createConstructor(decorators, modifiers, parameters, body, location, flags) {
-        var node = createNode(149, location, flags);
+        var node = createNode(150, location, flags);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.typeParameters = undefined;
@@ -9873,7 +10865,7 @@ var ts;
     }
     ts.updateConstructor = updateConstructor;
     function createGetAccessor(decorators, modifiers, name, parameters, type, body, location, flags) {
-        var node = createNode(150, location, flags);
+        var node = createNode(151, location, flags);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
@@ -9892,7 +10884,7 @@ var ts;
     }
     ts.updateGetAccessor = updateGetAccessor;
     function createSetAccessor(decorators, modifiers, name, parameters, body, location, flags) {
-        var node = createNode(151, location, flags);
+        var node = createNode(152, location, flags);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
@@ -9910,7 +10902,7 @@ var ts;
     }
     ts.updateSetAccessor = updateSetAccessor;
     function createObjectBindingPattern(elements, location) {
-        var node = createNode(168, location);
+        var node = createNode(172, location);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -9923,7 +10915,7 @@ var ts;
     }
     ts.updateObjectBindingPattern = updateObjectBindingPattern;
     function createArrayBindingPattern(elements, location) {
-        var node = createNode(169, location);
+        var node = createNode(173, location);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -9936,7 +10928,7 @@ var ts;
     }
     ts.updateArrayBindingPattern = updateArrayBindingPattern;
     function createBindingElement(propertyName, dotDotDotToken, name, initializer, location) {
-        var node = createNode(170, location);
+        var node = createNode(174, location);
         node.propertyName = typeof propertyName === "string" ? createIdentifier(propertyName) : propertyName;
         node.dotDotDotToken = dotDotDotToken;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
@@ -9952,7 +10944,7 @@ var ts;
     }
     ts.updateBindingElement = updateBindingElement;
     function createArrayLiteral(elements, location, multiLine) {
-        var node = createNode(171, location);
+        var node = createNode(175, location);
         node.elements = parenthesizeListElements(createNodeArray(elements));
         if (multiLine) {
             node.multiLine = true;
@@ -9968,7 +10960,7 @@ var ts;
     }
     ts.updateArrayLiteral = updateArrayLiteral;
     function createObjectLiteral(properties, location, multiLine) {
-        var node = createNode(172, location);
+        var node = createNode(176, location);
         node.properties = createNodeArray(properties);
         if (multiLine) {
             node.multiLine = true;
@@ -9984,7 +10976,7 @@ var ts;
     }
     ts.updateObjectLiteral = updateObjectLiteral;
     function createPropertyAccess(expression, name, location, flags) {
-        var node = createNode(173, location, flags);
+        var node = createNode(177, location, flags);
         node.expression = parenthesizeForAccess(expression);
         (node.emitNode || (node.emitNode = {})).flags |= 1048576;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
@@ -10001,7 +10993,7 @@ var ts;
     }
     ts.updatePropertyAccess = updatePropertyAccess;
     function createElementAccess(expression, index, location) {
-        var node = createNode(174, location);
+        var node = createNode(178, location);
         node.expression = parenthesizeForAccess(expression);
         node.argumentExpression = typeof index === "number" ? createLiteral(index) : index;
         return node;
@@ -10015,7 +11007,7 @@ var ts;
     }
     ts.updateElementAccess = updateElementAccess;
     function createCall(expression, typeArguments, argumentsArray, location, flags) {
-        var node = createNode(175, location, flags);
+        var node = createNode(179, location, flags);
         node.expression = parenthesizeForAccess(expression);
         if (typeArguments) {
             node.typeArguments = createNodeArray(typeArguments);
@@ -10032,7 +11024,7 @@ var ts;
     }
     ts.updateCall = updateCall;
     function createNew(expression, typeArguments, argumentsArray, location, flags) {
-        var node = createNode(176, location, flags);
+        var node = createNode(180, location, flags);
         node.expression = parenthesizeForNew(expression);
         node.typeArguments = typeArguments ? createNodeArray(typeArguments) : undefined;
         node.arguments = argumentsArray ? parenthesizeListElements(createNodeArray(argumentsArray)) : undefined;
@@ -10047,7 +11039,7 @@ var ts;
     }
     ts.updateNew = updateNew;
     function createTaggedTemplate(tag, template, location) {
-        var node = createNode(177, location);
+        var node = createNode(181, location);
         node.tag = parenthesizeForAccess(tag);
         node.template = template;
         return node;
@@ -10061,7 +11053,7 @@ var ts;
     }
     ts.updateTaggedTemplate = updateTaggedTemplate;
     function createParen(expression, location) {
-        var node = createNode(179, location);
+        var node = createNode(183, location);
         node.expression = expression;
         return node;
     }
@@ -10074,7 +11066,7 @@ var ts;
     }
     ts.updateParen = updateParen;
     function createFunctionExpression(modifiers, asteriskToken, name, typeParameters, parameters, type, body, location, flags) {
-        var node = createNode(180, location, flags);
+        var node = createNode(184, location, flags);
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.asteriskToken = asteriskToken;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
@@ -10093,7 +11085,7 @@ var ts;
     }
     ts.updateFunctionExpression = updateFunctionExpression;
     function createArrowFunction(modifiers, typeParameters, parameters, type, equalsGreaterThanToken, body, location, flags) {
-        var node = createNode(181, location, flags);
+        var node = createNode(185, location, flags);
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.typeParameters = typeParameters ? createNodeArray(typeParameters) : undefined;
         node.parameters = createNodeArray(parameters);
@@ -10111,7 +11103,7 @@ var ts;
     }
     ts.updateArrowFunction = updateArrowFunction;
     function createDelete(expression, location) {
-        var node = createNode(182, location);
+        var node = createNode(186, location);
         node.expression = parenthesizePrefixOperand(expression);
         return node;
     }
@@ -10124,7 +11116,7 @@ var ts;
     }
     ts.updateDelete = updateDelete;
     function createTypeOf(expression, location) {
-        var node = createNode(183, location);
+        var node = createNode(187, location);
         node.expression = parenthesizePrefixOperand(expression);
         return node;
     }
@@ -10137,7 +11129,7 @@ var ts;
     }
     ts.updateTypeOf = updateTypeOf;
     function createVoid(expression, location) {
-        var node = createNode(184, location);
+        var node = createNode(188, location);
         node.expression = parenthesizePrefixOperand(expression);
         return node;
     }
@@ -10150,7 +11142,7 @@ var ts;
     }
     ts.updateVoid = updateVoid;
     function createAwait(expression, location) {
-        var node = createNode(185, location);
+        var node = createNode(189, location);
         node.expression = parenthesizePrefixOperand(expression);
         return node;
     }
@@ -10163,7 +11155,7 @@ var ts;
     }
     ts.updateAwait = updateAwait;
     function createPrefix(operator, operand, location) {
-        var node = createNode(186, location);
+        var node = createNode(190, location);
         node.operator = operator;
         node.operand = parenthesizePrefixOperand(operand);
         return node;
@@ -10177,7 +11169,7 @@ var ts;
     }
     ts.updatePrefix = updatePrefix;
     function createPostfix(operand, operator, location) {
-        var node = createNode(187, location);
+        var node = createNode(191, location);
         node.operand = parenthesizePostfixOperand(operand);
         node.operator = operator;
         return node;
@@ -10193,7 +11185,7 @@ var ts;
     function createBinary(left, operator, right, location) {
         var operatorToken = typeof operator === "number" ? createToken(operator) : operator;
         var operatorKind = operatorToken.kind;
-        var node = createNode(188, location);
+        var node = createNode(192, location);
         node.left = parenthesizeBinaryOperand(operatorKind, left, true, undefined);
         node.operatorToken = operatorToken;
         node.right = parenthesizeBinaryOperand(operatorKind, right, false, node.left);
@@ -10208,7 +11200,7 @@ var ts;
     }
     ts.updateBinary = updateBinary;
     function createConditional(condition, questionToken, whenTrue, colonToken, whenFalse, location) {
-        var node = createNode(189, location);
+        var node = createNode(193, location);
         node.condition = condition;
         node.questionToken = questionToken;
         node.whenTrue = whenTrue;
@@ -10225,7 +11217,7 @@ var ts;
     }
     ts.updateConditional = updateConditional;
     function createTemplateExpression(head, templateSpans, location) {
-        var node = createNode(190, location);
+        var node = createNode(194, location);
         node.head = head;
         node.templateSpans = createNodeArray(templateSpans);
         return node;
@@ -10239,7 +11231,7 @@ var ts;
     }
     ts.updateTemplateExpression = updateTemplateExpression;
     function createYield(asteriskToken, expression, location) {
-        var node = createNode(191, location);
+        var node = createNode(195, location);
         node.asteriskToken = asteriskToken;
         node.expression = expression;
         return node;
@@ -10253,7 +11245,7 @@ var ts;
     }
     ts.updateYield = updateYield;
     function createSpread(expression, location) {
-        var node = createNode(192, location);
+        var node = createNode(196, location);
         node.expression = parenthesizeExpressionForList(expression);
         return node;
     }
@@ -10266,7 +11258,7 @@ var ts;
     }
     ts.updateSpread = updateSpread;
     function createClassExpression(modifiers, name, typeParameters, heritageClauses, members, location) {
-        var node = createNode(193, location);
+        var node = createNode(197, location);
         node.decorators = undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.name = name;
@@ -10284,12 +11276,12 @@ var ts;
     }
     ts.updateClassExpression = updateClassExpression;
     function createOmittedExpression(location) {
-        var node = createNode(194, location);
+        var node = createNode(198, location);
         return node;
     }
     ts.createOmittedExpression = createOmittedExpression;
     function createExpressionWithTypeArguments(typeArguments, expression, location) {
-        var node = createNode(195, location);
+        var node = createNode(199, location);
         node.typeArguments = typeArguments ? createNodeArray(typeArguments) : undefined;
         node.expression = parenthesizeForAccess(expression);
         return node;
@@ -10303,7 +11295,7 @@ var ts;
     }
     ts.updateExpressionWithTypeArguments = updateExpressionWithTypeArguments;
     function createTemplateSpan(expression, literal, location) {
-        var node = createNode(198, location);
+        var node = createNode(202, location);
         node.expression = expression;
         node.literal = literal;
         return node;
@@ -10317,7 +11309,7 @@ var ts;
     }
     ts.updateTemplateSpan = updateTemplateSpan;
     function createBlock(statements, location, multiLine, flags) {
-        var block = createNode(200, location, flags);
+        var block = createNode(204, location, flags);
         block.statements = createNodeArray(statements);
         if (multiLine) {
             block.multiLine = true;
@@ -10333,7 +11325,7 @@ var ts;
     }
     ts.updateBlock = updateBlock;
     function createVariableStatement(modifiers, declarationList, location, flags) {
-        var node = createNode(201, location, flags);
+        var node = createNode(205, location, flags);
         node.decorators = undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.declarationList = ts.isArray(declarationList) ? createVariableDeclarationList(declarationList) : declarationList;
@@ -10348,7 +11340,7 @@ var ts;
     }
     ts.updateVariableStatement = updateVariableStatement;
     function createVariableDeclarationList(declarations, location, flags) {
-        var node = createNode(220, location, flags);
+        var node = createNode(224, location, flags);
         node.declarations = createNodeArray(declarations);
         return node;
     }
@@ -10361,7 +11353,7 @@ var ts;
     }
     ts.updateVariableDeclarationList = updateVariableDeclarationList;
     function createVariableDeclaration(name, type, initializer, location, flags) {
-        var node = createNode(219, location, flags);
+        var node = createNode(223, location, flags);
         node.name = typeof name === "string" ? createIdentifier(name) : name;
         node.type = type;
         node.initializer = initializer !== undefined ? parenthesizeExpressionForList(initializer) : undefined;
@@ -10376,11 +11368,11 @@ var ts;
     }
     ts.updateVariableDeclaration = updateVariableDeclaration;
     function createEmptyStatement(location) {
-        return createNode(202, location);
+        return createNode(206, location);
     }
     ts.createEmptyStatement = createEmptyStatement;
     function createStatement(expression, location, flags) {
-        var node = createNode(203, location, flags);
+        var node = createNode(207, location, flags);
         node.expression = parenthesizeExpressionForExpressionStatement(expression);
         return node;
     }
@@ -10393,7 +11385,7 @@ var ts;
     }
     ts.updateStatement = updateStatement;
     function createIf(expression, thenStatement, elseStatement, location) {
-        var node = createNode(204, location);
+        var node = createNode(208, location);
         node.expression = expression;
         node.thenStatement = thenStatement;
         node.elseStatement = elseStatement;
@@ -10408,7 +11400,7 @@ var ts;
     }
     ts.updateIf = updateIf;
     function createDo(statement, expression, location) {
-        var node = createNode(205, location);
+        var node = createNode(209, location);
         node.statement = statement;
         node.expression = expression;
         return node;
@@ -10422,7 +11414,7 @@ var ts;
     }
     ts.updateDo = updateDo;
     function createWhile(expression, statement, location) {
-        var node = createNode(206, location);
+        var node = createNode(210, location);
         node.expression = expression;
         node.statement = statement;
         return node;
@@ -10436,7 +11428,7 @@ var ts;
     }
     ts.updateWhile = updateWhile;
     function createFor(initializer, condition, incrementor, statement, location) {
-        var node = createNode(207, location, undefined);
+        var node = createNode(211, location, undefined);
         node.initializer = initializer;
         node.condition = condition;
         node.incrementor = incrementor;
@@ -10452,7 +11444,7 @@ var ts;
     }
     ts.updateFor = updateFor;
     function createForIn(initializer, expression, statement, location) {
-        var node = createNode(208, location);
+        var node = createNode(212, location);
         node.initializer = initializer;
         node.expression = expression;
         node.statement = statement;
@@ -10467,7 +11459,7 @@ var ts;
     }
     ts.updateForIn = updateForIn;
     function createForOf(initializer, expression, statement, location) {
-        var node = createNode(209, location);
+        var node = createNode(213, location);
         node.initializer = initializer;
         node.expression = expression;
         node.statement = statement;
@@ -10482,7 +11474,7 @@ var ts;
     }
     ts.updateForOf = updateForOf;
     function createContinue(label, location) {
-        var node = createNode(210, location);
+        var node = createNode(214, location);
         if (label) {
             node.label = label;
         }
@@ -10497,7 +11489,7 @@ var ts;
     }
     ts.updateContinue = updateContinue;
     function createBreak(label, location) {
-        var node = createNode(211, location);
+        var node = createNode(215, location);
         if (label) {
             node.label = label;
         }
@@ -10512,7 +11504,7 @@ var ts;
     }
     ts.updateBreak = updateBreak;
     function createReturn(expression, location) {
-        var node = createNode(212, location);
+        var node = createNode(216, location);
         node.expression = expression;
         return node;
     }
@@ -10525,7 +11517,7 @@ var ts;
     }
     ts.updateReturn = updateReturn;
     function createWith(expression, statement, location) {
-        var node = createNode(213, location);
+        var node = createNode(217, location);
         node.expression = expression;
         node.statement = statement;
         return node;
@@ -10539,7 +11531,7 @@ var ts;
     }
     ts.updateWith = updateWith;
     function createSwitch(expression, caseBlock, location) {
-        var node = createNode(214, location);
+        var node = createNode(218, location);
         node.expression = parenthesizeExpressionForList(expression);
         node.caseBlock = caseBlock;
         return node;
@@ -10553,7 +11545,7 @@ var ts;
     }
     ts.updateSwitch = updateSwitch;
     function createLabel(label, statement, location) {
-        var node = createNode(215, location);
+        var node = createNode(219, location);
         node.label = typeof label === "string" ? createIdentifier(label) : label;
         node.statement = statement;
         return node;
@@ -10567,7 +11559,7 @@ var ts;
     }
     ts.updateLabel = updateLabel;
     function createThrow(expression, location) {
-        var node = createNode(216, location);
+        var node = createNode(220, location);
         node.expression = expression;
         return node;
     }
@@ -10580,7 +11572,7 @@ var ts;
     }
     ts.updateThrow = updateThrow;
     function createTry(tryBlock, catchClause, finallyBlock, location) {
-        var node = createNode(217, location);
+        var node = createNode(221, location);
         node.tryBlock = tryBlock;
         node.catchClause = catchClause;
         node.finallyBlock = finallyBlock;
@@ -10595,7 +11587,7 @@ var ts;
     }
     ts.updateTry = updateTry;
     function createCaseBlock(clauses, location) {
-        var node = createNode(228, location);
+        var node = createNode(232, location);
         node.clauses = createNodeArray(clauses);
         return node;
     }
@@ -10608,7 +11600,7 @@ var ts;
     }
     ts.updateCaseBlock = updateCaseBlock;
     function createFunctionDeclaration(decorators, modifiers, asteriskToken, name, typeParameters, parameters, type, body, location, flags) {
-        var node = createNode(221, location, flags);
+        var node = createNode(225, location, flags);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.asteriskToken = asteriskToken;
@@ -10628,7 +11620,7 @@ var ts;
     }
     ts.updateFunctionDeclaration = updateFunctionDeclaration;
     function createClassDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members, location) {
-        var node = createNode(222, location);
+        var node = createNode(226, location);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.name = name;
@@ -10646,7 +11638,7 @@ var ts;
     }
     ts.updateClassDeclaration = updateClassDeclaration;
     function createImportDeclaration(decorators, modifiers, importClause, moduleSpecifier, location) {
-        var node = createNode(231, location);
+        var node = createNode(235, location);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.importClause = importClause;
@@ -10662,7 +11654,7 @@ var ts;
     }
     ts.updateImportDeclaration = updateImportDeclaration;
     function createImportClause(name, namedBindings, location) {
-        var node = createNode(232, location);
+        var node = createNode(236, location);
         node.name = name;
         node.namedBindings = namedBindings;
         return node;
@@ -10676,7 +11668,7 @@ var ts;
     }
     ts.updateImportClause = updateImportClause;
     function createNamespaceImport(name, location) {
-        var node = createNode(233, location);
+        var node = createNode(237, location);
         node.name = name;
         return node;
     }
@@ -10689,7 +11681,7 @@ var ts;
     }
     ts.updateNamespaceImport = updateNamespaceImport;
     function createNamedImports(elements, location) {
-        var node = createNode(234, location);
+        var node = createNode(238, location);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -10702,7 +11694,7 @@ var ts;
     }
     ts.updateNamedImports = updateNamedImports;
     function createImportSpecifier(propertyName, name, location) {
-        var node = createNode(235, location);
+        var node = createNode(239, location);
         node.propertyName = propertyName;
         node.name = name;
         return node;
@@ -10716,7 +11708,7 @@ var ts;
     }
     ts.updateImportSpecifier = updateImportSpecifier;
     function createExportAssignment(decorators, modifiers, isExportEquals, expression, location) {
-        var node = createNode(236, location);
+        var node = createNode(240, location);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.isExportEquals = isExportEquals;
@@ -10732,7 +11724,7 @@ var ts;
     }
     ts.updateExportAssignment = updateExportAssignment;
     function createExportDeclaration(decorators, modifiers, exportClause, moduleSpecifier, location) {
-        var node = createNode(237, location);
+        var node = createNode(241, location);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.exportClause = exportClause;
@@ -10748,7 +11740,7 @@ var ts;
     }
     ts.updateExportDeclaration = updateExportDeclaration;
     function createNamedExports(elements, location) {
-        var node = createNode(238, location);
+        var node = createNode(242, location);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -10761,7 +11753,7 @@ var ts;
     }
     ts.updateNamedExports = updateNamedExports;
     function createExportSpecifier(name, propertyName, location) {
-        var node = createNode(239, location);
+        var node = createNode(243, location);
         node.name = typeof name === "string" ? createIdentifier(name) : name;
         node.propertyName = typeof propertyName === "string" ? createIdentifier(propertyName) : propertyName;
         return node;
@@ -10775,7 +11767,7 @@ var ts;
     }
     ts.updateExportSpecifier = updateExportSpecifier;
     function createJsxElement(openingElement, children, closingElement, location) {
-        var node = createNode(242, location);
+        var node = createNode(246, location);
         node.openingElement = openingElement;
         node.children = createNodeArray(children);
         node.closingElement = closingElement;
@@ -10790,7 +11782,7 @@ var ts;
     }
     ts.updateJsxElement = updateJsxElement;
     function createJsxSelfClosingElement(tagName, attributes, location) {
-        var node = createNode(243, location);
+        var node = createNode(247, location);
         node.tagName = tagName;
         node.attributes = createNodeArray(attributes);
         return node;
@@ -10804,7 +11796,7 @@ var ts;
     }
     ts.updateJsxSelfClosingElement = updateJsxSelfClosingElement;
     function createJsxOpeningElement(tagName, attributes, location) {
-        var node = createNode(244, location);
+        var node = createNode(248, location);
         node.tagName = tagName;
         node.attributes = createNodeArray(attributes);
         return node;
@@ -10818,7 +11810,7 @@ var ts;
     }
     ts.updateJsxOpeningElement = updateJsxOpeningElement;
     function createJsxClosingElement(tagName, location) {
-        var node = createNode(245, location);
+        var node = createNode(249, location);
         node.tagName = tagName;
         return node;
     }
@@ -10831,7 +11823,7 @@ var ts;
     }
     ts.updateJsxClosingElement = updateJsxClosingElement;
     function createJsxAttribute(name, initializer, location) {
-        var node = createNode(246, location);
+        var node = createNode(250, location);
         node.name = name;
         node.initializer = initializer;
         return node;
@@ -10845,7 +11837,7 @@ var ts;
     }
     ts.updateJsxAttribute = updateJsxAttribute;
     function createJsxSpreadAttribute(expression, location) {
-        var node = createNode(247, location);
+        var node = createNode(251, location);
         node.expression = expression;
         return node;
     }
@@ -10858,7 +11850,7 @@ var ts;
     }
     ts.updateJsxSpreadAttribute = updateJsxSpreadAttribute;
     function createJsxExpression(expression, location) {
-        var node = createNode(248, location);
+        var node = createNode(252, location);
         node.expression = expression;
         return node;
     }
@@ -10871,7 +11863,7 @@ var ts;
     }
     ts.updateJsxExpression = updateJsxExpression;
     function createHeritageClause(token, types, location) {
-        var node = createNode(251, location);
+        var node = createNode(255, location);
         node.token = token;
         node.types = createNodeArray(types);
         return node;
@@ -10885,7 +11877,7 @@ var ts;
     }
     ts.updateHeritageClause = updateHeritageClause;
     function createCaseClause(expression, statements, location) {
-        var node = createNode(249, location);
+        var node = createNode(253, location);
         node.expression = parenthesizeExpressionForList(expression);
         node.statements = createNodeArray(statements);
         return node;
@@ -10899,7 +11891,7 @@ var ts;
     }
     ts.updateCaseClause = updateCaseClause;
     function createDefaultClause(statements, location) {
-        var node = createNode(250, location);
+        var node = createNode(254, location);
         node.statements = createNodeArray(statements);
         return node;
     }
@@ -10912,7 +11904,7 @@ var ts;
     }
     ts.updateDefaultClause = updateDefaultClause;
     function createCatchClause(variableDeclaration, block, location) {
-        var node = createNode(252, location);
+        var node = createNode(256, location);
         node.variableDeclaration = typeof variableDeclaration === "string" ? createVariableDeclaration(variableDeclaration) : variableDeclaration;
         node.block = block;
         return node;
@@ -10926,7 +11918,7 @@ var ts;
     }
     ts.updateCatchClause = updateCatchClause;
     function createPropertyAssignment(name, initializer, location) {
-        var node = createNode(253, location);
+        var node = createNode(257, location);
         node.name = typeof name === "string" ? createIdentifier(name) : name;
         node.questionToken = undefined;
         node.initializer = initializer !== undefined ? parenthesizeExpressionForList(initializer) : undefined;
@@ -10941,12 +11933,18 @@ var ts;
     }
     ts.updatePropertyAssignment = updatePropertyAssignment;
     function createShorthandPropertyAssignment(name, objectAssignmentInitializer, location) {
-        var node = createNode(254, location);
+        var node = createNode(258, location);
         node.name = typeof name === "string" ? createIdentifier(name) : name;
         node.objectAssignmentInitializer = objectAssignmentInitializer !== undefined ? parenthesizeExpressionForList(objectAssignmentInitializer) : undefined;
         return node;
     }
     ts.createShorthandPropertyAssignment = createShorthandPropertyAssignment;
+    function createSpreadAssignment(expression, location) {
+        var node = createNode(259, location);
+        node.expression = expression !== undefined ? parenthesizeExpressionForList(expression) : undefined;
+        return node;
+    }
+    ts.createSpreadAssignment = createSpreadAssignment;
     function updateShorthandPropertyAssignment(node, name, objectAssignmentInitializer) {
         if (node.name !== name || node.objectAssignmentInitializer !== objectAssignmentInitializer) {
             return updateNode(createShorthandPropertyAssignment(name, objectAssignmentInitializer, node), node);
@@ -10954,9 +11952,16 @@ var ts;
         return node;
     }
     ts.updateShorthandPropertyAssignment = updateShorthandPropertyAssignment;
+    function updateSpreadAssignment(node, expression) {
+        if (node.expression !== expression) {
+            return updateNode(createSpreadAssignment(expression, node), node);
+        }
+        return node;
+    }
+    ts.updateSpreadAssignment = updateSpreadAssignment;
     function updateSourceFileNode(node, statements) {
         if (node.statements !== statements) {
-            var updated = createNode(256, node, node.flags);
+            var updated = createNode(261, node, node.flags);
             updated.statements = createNodeArray(statements);
             updated.endOfFileToken = node.endOfFileToken;
             updated.fileName = node.fileName;
@@ -11018,13 +12023,27 @@ var ts;
     }
     ts.updateSourceFileNode = updateSourceFileNode;
     function createNotEmittedStatement(original) {
-        var node = createNode(287, original);
+        var node = createNode(292, original);
         node.original = original;
         return node;
     }
     ts.createNotEmittedStatement = createNotEmittedStatement;
+    function createEndOfDeclarationMarker(original) {
+        var node = createNode(295);
+        node.emitNode = {};
+        node.original = original;
+        return node;
+    }
+    ts.createEndOfDeclarationMarker = createEndOfDeclarationMarker;
+    function createMergeDeclarationMarker(original) {
+        var node = createNode(294);
+        node.emitNode = {};
+        node.original = original;
+        return node;
+    }
+    ts.createMergeDeclarationMarker = createMergeDeclarationMarker;
     function createPartiallyEmittedExpression(expression, original, location) {
-        var node = createNode(288, location || original);
+        var node = createNode(293, location || original);
         node.expression = expression;
         node.original = original;
         return node;
@@ -11096,10 +12115,6 @@ var ts;
         }
     }
     ts.createMemberAccessForPropertyName = createMemberAccessForPropertyName;
-    function createRestParameter(name) {
-        return createParameterDeclaration(undefined, undefined, createToken(23), name, undefined, undefined, undefined);
-    }
-    ts.createRestParameter = createRestParameter;
     function createFunctionCall(func, thisArg, argumentsList, location) {
         return createCall(createPropertyAccess(func, "call"), undefined, [
             thisArg
@@ -11132,10 +12147,23 @@ var ts;
     function createReactNamespace(reactNamespace, parent) {
         var react = createIdentifier(reactNamespace || "React");
         react.flags &= ~8;
-        react.parent = parent;
+        react.parent = ts.getParseTreeNode(parent);
         return react;
     }
-    function createReactCreateElement(reactNamespace, tagName, props, children, parentElement, location) {
+    function createJsxFactoryExpressionFromEntityName(jsxFactory, parent) {
+        if (ts.isQualifiedName(jsxFactory)) {
+            return createPropertyAccess(createJsxFactoryExpressionFromEntityName(jsxFactory.left, parent), setEmitFlags(getMutableClone(jsxFactory.right), 1536));
+        }
+        else {
+            return createReactNamespace(jsxFactory.text, parent);
+        }
+    }
+    function createJsxFactoryExpression(jsxFactoryEntity, reactNamespace, parent) {
+        return jsxFactoryEntity ?
+            createJsxFactoryExpressionFromEntityName(jsxFactoryEntity, parent) :
+            createPropertyAccess(createReactNamespace(reactNamespace, parent), "createElement");
+    }
+    function createExpressionForJsxElement(jsxFactoryEntity, reactNamespace, tagName, props, children, parentElement, location) {
         var argumentsList = [tagName];
         if (props) {
             argumentsList.push(props);
@@ -11155,9 +12183,21 @@ var ts;
                 argumentsList.push(children[0]);
             }
         }
-        return createCall(createPropertyAccess(createReactNamespace(reactNamespace, parentElement), "createElement"), undefined, argumentsList, location);
+        return createCall(createJsxFactoryExpression(jsxFactoryEntity, reactNamespace, parentElement), undefined, argumentsList, location);
     }
-    ts.createReactCreateElement = createReactCreateElement;
+    ts.createExpressionForJsxElement = createExpressionForJsxElement;
+    function createExportDefault(expression) {
+        return createExportAssignment(undefined, undefined, false, expression);
+    }
+    ts.createExportDefault = createExportDefault;
+    function createExternalModuleExport(exportName) {
+        return createExportDeclaration(undefined, undefined, createNamedExports([createExportSpecifier(exportName)]));
+    }
+    ts.createExternalModuleExport = createExternalModuleExport;
+    function createLetStatement(name, initializer, location) {
+        return createVariableStatement(undefined, createLetDeclarationList([createVariableDeclaration(name, undefined, initializer)]), location);
+    }
+    ts.createLetStatement = createLetStatement;
     function createLetDeclarationList(declarations, location) {
         return createVariableDeclarationList(declarations, location, 1);
     }
@@ -11229,13 +12269,13 @@ var ts;
         return createCall(createPropertyAccess(createIdentifier("Object"), "create"), undefined, [prototype]);
     }
     function createGeti(target) {
-        return createArrowFunction(undefined, undefined, [createParameter("name")], undefined, undefined, createElementAccess(target, createIdentifier("name")));
+        return createArrowFunction(undefined, undefined, [createParameter(undefined, undefined, undefined, "name")], undefined, createToken(35), createElementAccess(target, createIdentifier("name")));
     }
     function createSeti(target) {
         return createArrowFunction(undefined, undefined, [
-            createParameter("name"),
-            createParameter("value")
-        ], undefined, undefined, createAssignment(createElementAccess(target, createIdentifier("name")), createIdentifier("value")));
+            createParameter(undefined, undefined, undefined, "name"),
+            createParameter(undefined, undefined, undefined, "value")
+        ], undefined, createToken(35), createAssignment(createElementAccess(target, createIdentifier("name")), createIdentifier("value")));
     }
     function createAdvancedAsyncSuperHelper() {
         var createCache = createVariableStatement(undefined, createConstDeclarationList([
@@ -11244,20 +12284,20 @@ var ts;
         var getter = createGetAccessor(undefined, undefined, "value", [], undefined, createBlock([
             createReturn(createCall(createIdentifier("geti"), undefined, [createIdentifier("name")]))
         ]));
-        var setter = createSetAccessor(undefined, undefined, "value", [createParameter("v")], createBlock([
+        var setter = createSetAccessor(undefined, undefined, "value", [createParameter(undefined, undefined, undefined, "v")], createBlock([
             createStatement(createCall(createIdentifier("seti"), undefined, [
                 createIdentifier("name"),
                 createIdentifier("v")
             ]))
         ]));
-        var getOrCreateAccessorsForName = createReturn(createArrowFunction(undefined, undefined, [createParameter("name")], undefined, undefined, createLogicalOr(createElementAccess(createIdentifier("cache"), createIdentifier("name")), createParen(createAssignment(createElementAccess(createIdentifier("cache"), createIdentifier("name")), createObjectLiteral([
+        var getOrCreateAccessorsForName = createReturn(createArrowFunction(undefined, undefined, [createParameter(undefined, undefined, undefined, "name")], undefined, createToken(35), createLogicalOr(createElementAccess(createIdentifier("cache"), createIdentifier("name")), createParen(createAssignment(createElementAccess(createIdentifier("cache"), createIdentifier("name")), createObjectLiteral([
             getter,
             setter
         ]))))));
         return createVariableStatement(undefined, createConstDeclarationList([
             createVariableDeclaration("_super", undefined, createCall(createParen(createFunctionExpression(undefined, undefined, undefined, undefined, [
-                createParameter("geti"),
-                createParameter("seti")
+                createParameter(undefined, undefined, undefined, "geti"),
+                createParameter(undefined, undefined, undefined, "seti")
             ], undefined, createBlock([
                 createCache,
                 getOrCreateAccessorsForName
@@ -11283,13 +12323,13 @@ var ts;
             case 8:
             case 9:
                 return false;
-            case 171:
+            case 175:
                 var elements = target.elements;
                 if (elements.length === 0) {
                     return false;
                 }
                 return true;
-            case 172:
+            case 176:
                 return target.properties.length > 0;
             default:
                 return true;
@@ -11309,7 +12349,7 @@ var ts;
         }
         else {
             switch (callee.kind) {
-                case 173: {
+                case 177: {
                     if (shouldBeCapturedInTempVariable(callee.expression, cacheIdentifiers)) {
                         thisArg = createTempVariable(recordTempVariable);
                         target = createPropertyAccess(createAssignment(thisArg, callee.expression, callee.expression), callee.name, callee);
@@ -11320,7 +12360,7 @@ var ts;
                     }
                     break;
                 }
-                case 174: {
+                case 178: {
                     if (shouldBeCapturedInTempVariable(callee.expression, cacheIdentifiers)) {
                         thisArg = createTempVariable(recordTempVariable);
                         target = createElementAccess(createAssignment(thisArg, callee.expression, callee.expression), callee.argumentExpression, callee);
@@ -11370,14 +12410,14 @@ var ts;
     ts.createExpressionForPropertyName = createExpressionForPropertyName;
     function createExpressionForObjectLiteralElementLike(node, property, receiver) {
         switch (property.kind) {
-            case 150:
             case 151:
+            case 152:
                 return createExpressionForAccessorDeclaration(node.properties, property, receiver, node.multiLine);
-            case 253:
+            case 257:
                 return createExpressionForPropertyAssignment(property, receiver);
-            case 254:
+            case 258:
                 return createExpressionForShorthandPropertyAssignment(property, receiver);
-            case 148:
+            case 149:
                 return createExpressionForMethodDeclaration(property, receiver);
         }
     }
@@ -11418,6 +12458,59 @@ var ts;
     function createExpressionForMethodDeclaration(method, receiver) {
         return ts.aggregateTransformFlags(setOriginalNode(createAssignment(createMemberAccessForPropertyName(receiver, method.name, method.name), setOriginalNode(createFunctionExpression(method.modifiers, method.asteriskToken, undefined, undefined, method.parameters, undefined, method.body, method), method), method), method));
     }
+    function getLocalName(node, allowComments, allowSourceMaps) {
+        return getName(node, allowComments, allowSourceMaps, 262144);
+    }
+    ts.getLocalName = getLocalName;
+    function isLocalName(node) {
+        return (getEmitFlags(node) & 262144) !== 0;
+    }
+    ts.isLocalName = isLocalName;
+    function getExportName(node, allowComments, allowSourceMaps) {
+        return getName(node, allowComments, allowSourceMaps, 131072);
+    }
+    ts.getExportName = getExportName;
+    function isExportName(node) {
+        return (getEmitFlags(node) & 131072) !== 0;
+    }
+    ts.isExportName = isExportName;
+    function getDeclarationName(node, allowComments, allowSourceMaps) {
+        return getName(node, allowComments, allowSourceMaps);
+    }
+    ts.getDeclarationName = getDeclarationName;
+    function getName(node, allowComments, allowSourceMaps, emitFlags) {
+        if (node.name && ts.isIdentifier(node.name) && !ts.isGeneratedIdentifier(node.name)) {
+            var name_13 = getMutableClone(node.name);
+            emitFlags |= getEmitFlags(node.name);
+            if (!allowSourceMaps)
+                emitFlags |= 1536;
+            if (!allowComments)
+                emitFlags |= 49152;
+            if (emitFlags)
+                setEmitFlags(name_13, emitFlags);
+            return name_13;
+        }
+        return getGeneratedNameForNode(node);
+    }
+    function getExternalModuleOrNamespaceExportName(ns, node, allowComments, allowSourceMaps) {
+        if (ns && ts.hasModifier(node, 1)) {
+            return getNamespaceMemberName(ns, getName(node), allowComments, allowSourceMaps);
+        }
+        return getExportName(node, allowComments, allowSourceMaps);
+    }
+    ts.getExternalModuleOrNamespaceExportName = getExternalModuleOrNamespaceExportName;
+    function getNamespaceMemberName(ns, name, allowComments, allowSourceMaps) {
+        var qualifiedName = createPropertyAccess(ns, ts.nodeIsSynthesized(name) ? name : getSynthesizedClone(name), name);
+        var emitFlags;
+        if (!allowSourceMaps)
+            emitFlags |= 1536;
+        if (!allowComments)
+            emitFlags |= 49152;
+        if (emitFlags)
+            setEmitFlags(qualifiedName, emitFlags);
+        return qualifiedName;
+    }
+    ts.getNamespaceMemberName = getNamespaceMemberName;
     function isUseStrictPrologue(node) {
         return node.expression.text === "use strict";
     }
@@ -11479,7 +12572,7 @@ var ts;
     ts.ensureUseStrict = ensureUseStrict;
     function parenthesizeBinaryOperand(binaryOperator, operand, isLeftSideOfBinary, leftOperand) {
         var skipped = skipPartiallyEmittedExpressions(operand);
-        if (skipped.kind === 179) {
+        if (skipped.kind === 183) {
             return operand;
         }
         return binaryOperandNeedsParentheses(binaryOperator, operand, isLeftSideOfBinary, leftOperand)
@@ -11488,15 +12581,15 @@ var ts;
     }
     ts.parenthesizeBinaryOperand = parenthesizeBinaryOperand;
     function binaryOperandNeedsParentheses(binaryOperator, operand, isLeftSideOfBinary, leftOperand) {
-        var binaryOperatorPrecedence = ts.getOperatorPrecedence(188, binaryOperator);
-        var binaryOperatorAssociativity = ts.getOperatorAssociativity(188, binaryOperator);
+        var binaryOperatorPrecedence = ts.getOperatorPrecedence(192, binaryOperator);
+        var binaryOperatorAssociativity = ts.getOperatorAssociativity(192, binaryOperator);
         var emittedOperand = skipPartiallyEmittedExpressions(operand);
         var operandPrecedence = ts.getExpressionPrecedence(emittedOperand);
         switch (ts.compareValues(operandPrecedence, binaryOperatorPrecedence)) {
             case -1:
                 if (!isLeftSideOfBinary
                     && binaryOperatorAssociativity === 1
-                    && operand.kind === 191) {
+                    && operand.kind === 195) {
                     return false;
                 }
                 return true;
@@ -11535,7 +12628,7 @@ var ts;
         if (ts.isLiteralKind(node.kind)) {
             return node.kind;
         }
-        if (node.kind === 188 && node.operatorToken.kind === 36) {
+        if (node.kind === 192 && node.operatorToken.kind === 36) {
             if (node.cachedLiteralKind !== undefined) {
                 return node.cachedLiteralKind;
             }
@@ -11552,9 +12645,9 @@ var ts;
     function parenthesizeForNew(expression) {
         var emittedExpression = skipPartiallyEmittedExpressions(expression);
         switch (emittedExpression.kind) {
-            case 175:
+            case 179:
                 return createParen(expression);
-            case 176:
+            case 180:
                 return emittedExpression.arguments
                     ? expression
                     : createParen(expression);
@@ -11565,7 +12658,7 @@ var ts;
     function parenthesizeForAccess(expression) {
         var emittedExpression = skipPartiallyEmittedExpressions(expression);
         if (ts.isLeftHandSideExpression(emittedExpression)
-            && (emittedExpression.kind !== 176 || emittedExpression.arguments)
+            && (emittedExpression.kind !== 180 || emittedExpression.arguments)
             && emittedExpression.kind !== 8) {
             return expression;
         }
@@ -11603,7 +12696,7 @@ var ts;
     function parenthesizeExpressionForList(expression) {
         var emittedExpression = skipPartiallyEmittedExpressions(expression);
         var expressionPrecedence = ts.getExpressionPrecedence(emittedExpression);
-        var commaPrecedence = ts.getOperatorPrecedence(188, 25);
+        var commaPrecedence = ts.getOperatorPrecedence(192, 25);
         return expressionPrecedence > commaPrecedence
             ? expression
             : createParen(expression, expression);
@@ -11614,7 +12707,7 @@ var ts;
         if (ts.isCallExpression(emittedExpression)) {
             var callee = emittedExpression.expression;
             var kind = skipPartiallyEmittedExpressions(callee).kind;
-            if (kind === 180 || kind === 181) {
+            if (kind === 184 || kind === 185) {
                 var mutableCall = getMutableClone(emittedExpression);
                 mutableCall.expression = createParen(callee, callee);
                 return recreatePartiallyEmittedExpressions(expression, mutableCall);
@@ -11622,7 +12715,7 @@ var ts;
         }
         else {
             var leftmostExpressionKind = getLeftmostExpression(emittedExpression).kind;
-            if (leftmostExpressionKind === 172 || leftmostExpressionKind === 180) {
+            if (leftmostExpressionKind === 176 || leftmostExpressionKind === 184) {
                 return createParen(expression, expression);
             }
         }
@@ -11640,21 +12733,21 @@ var ts;
     function getLeftmostExpression(node) {
         while (true) {
             switch (node.kind) {
-                case 187:
+                case 191:
                     node = node.operand;
                     continue;
-                case 188:
+                case 192:
                     node = node.left;
                     continue;
-                case 189:
+                case 193:
                     node = node.condition;
                     continue;
-                case 175:
-                case 174:
-                case 173:
+                case 179:
+                case 178:
+                case 177:
                     node = node.expression;
                     continue;
-                case 288:
+                case 293:
                     node = node.expression;
                     continue;
             }
@@ -11663,19 +12756,12 @@ var ts;
     }
     function parenthesizeConciseBody(body) {
         var emittedBody = skipPartiallyEmittedExpressions(body);
-        if (emittedBody.kind === 172) {
+        if (emittedBody.kind === 176) {
             return createParen(body, body);
         }
         return body;
     }
     ts.parenthesizeConciseBody = parenthesizeConciseBody;
-    (function (OuterExpressionKinds) {
-        OuterExpressionKinds[OuterExpressionKinds["Parentheses"] = 1] = "Parentheses";
-        OuterExpressionKinds[OuterExpressionKinds["Assertions"] = 2] = "Assertions";
-        OuterExpressionKinds[OuterExpressionKinds["PartiallyEmittedExpressions"] = 4] = "PartiallyEmittedExpressions";
-        OuterExpressionKinds[OuterExpressionKinds["All"] = 7] = "All";
-    })(ts.OuterExpressionKinds || (ts.OuterExpressionKinds = {}));
-    var OuterExpressionKinds = ts.OuterExpressionKinds;
     function skipOuterExpressions(node, kinds) {
         if (kinds === void 0) { kinds = 7; }
         var previousNode;
@@ -11695,7 +12781,7 @@ var ts;
     }
     ts.skipOuterExpressions = skipOuterExpressions;
     function skipParentheses(node) {
-        while (node.kind === 179) {
+        while (node.kind === 183) {
             node = node.expression;
         }
         return node;
@@ -11709,7 +12795,7 @@ var ts;
     }
     ts.skipAssertions = skipAssertions;
     function skipPartiallyEmittedExpressions(node) {
-        while (node.kind === 288) {
+        while (node.kind === 293) {
             node = node.expression;
         }
         return node;
@@ -11765,7 +12851,7 @@ var ts;
     function getOrCreateEmitNode(node) {
         if (!node.emitNode) {
             if (ts.isParseTreeNode(node)) {
-                if (node.kind === 256) {
+                if (node.kind === 261) {
                     return node.emitNode = { annotatedNodes: [node] };
                 }
                 var sourceFile = ts.getSourceFileOfNode(node);
@@ -11855,13 +12941,13 @@ var ts;
     function getLocalNameForExternalImport(node, sourceFile) {
         var namespaceDeclaration = ts.getNamespaceDeclarationNode(node);
         if (namespaceDeclaration && !ts.isDefaultImport(node)) {
-            var name_9 = namespaceDeclaration.name;
-            return ts.isGeneratedIdentifier(name_9) ? name_9 : createIdentifier(ts.getSourceTextOfNodeFromSourceFile(sourceFile, namespaceDeclaration.name));
+            var name_14 = namespaceDeclaration.name;
+            return ts.isGeneratedIdentifier(name_14) ? name_14 : createIdentifier(ts.getSourceTextOfNodeFromSourceFile(sourceFile, namespaceDeclaration.name));
         }
-        if (node.kind === 231 && node.importClause) {
+        if (node.kind === 235 && node.importClause) {
             return getGeneratedNameForNode(node);
         }
-        if (node.kind === 237 && node.moduleSpecifier) {
+        if (node.kind === 241 && node.moduleSpecifier) {
             return getGeneratedNameForNode(node);
         }
         return undefined;
@@ -11899,6 +12985,221 @@ var ts;
     function tryGetModuleNameFromDeclaration(declaration, host, resolver, compilerOptions) {
         return tryGetModuleNameFromFile(resolver.getExternalModuleFileFromDeclaration(declaration), host, compilerOptions);
     }
+    function transformFunctionBody(node, visitor, currentSourceFile, context, enableSubstitutionsForCapturedThis, convertObjectRest) {
+        var multiLine = false;
+        var singleLine = false;
+        var statementsLocation;
+        var closeBraceLocation;
+        var statements = [];
+        var body = node.body;
+        var statementOffset;
+        context.startLexicalEnvironment();
+        if (ts.isBlock(body)) {
+            statementOffset = addPrologueDirectives(statements, body.statements, false, visitor);
+        }
+        addCaptureThisForNodeIfNeeded(statements, node, enableSubstitutionsForCapturedThis);
+        addDefaultValueAssignmentsIfNeeded(statements, node, visitor, convertObjectRest);
+        addRestParameterIfNeeded(statements, node, false);
+        if (!multiLine && statements.length > 0) {
+            multiLine = true;
+        }
+        if (ts.isBlock(body)) {
+            statementsLocation = body.statements;
+            ts.addRange(statements, ts.visitNodes(body.statements, visitor, ts.isStatement, statementOffset));
+            if (!multiLine && body.multiLine) {
+                multiLine = true;
+            }
+        }
+        else {
+            ts.Debug.assert(node.kind === 185);
+            statementsLocation = ts.moveRangeEnd(body, -1);
+            var equalsGreaterThanToken = node.equalsGreaterThanToken;
+            if (!ts.nodeIsSynthesized(equalsGreaterThanToken) && !ts.nodeIsSynthesized(body)) {
+                if (ts.rangeEndIsOnSameLineAsRangeStart(equalsGreaterThanToken, body, currentSourceFile)) {
+                    singleLine = true;
+                }
+                else {
+                    multiLine = true;
+                }
+            }
+            var expression = ts.visitNode(body, visitor, ts.isExpression);
+            var returnStatement = createReturn(expression, body);
+            setEmitFlags(returnStatement, 12288 | 1024 | 32768);
+            statements.push(returnStatement);
+            closeBraceLocation = body;
+        }
+        var lexicalEnvironment = context.endLexicalEnvironment();
+        ts.addRange(statements, lexicalEnvironment);
+        if (!multiLine && lexicalEnvironment && lexicalEnvironment.length) {
+            multiLine = true;
+        }
+        var block = createBlock(createNodeArray(statements, statementsLocation), node.body, multiLine);
+        if (!multiLine && singleLine) {
+            setEmitFlags(block, 32);
+        }
+        if (closeBraceLocation) {
+            setTokenSourceMapRange(block, 17, closeBraceLocation);
+        }
+        setOriginalNode(block, node.body);
+        return block;
+    }
+    ts.transformFunctionBody = transformFunctionBody;
+    function addCaptureThisForNodeIfNeeded(statements, node, enableSubstitutionsForCapturedThis) {
+        if (node.transformFlags & 524288 && node.kind !== 185) {
+            captureThisForNode(statements, node, createThis(), enableSubstitutionsForCapturedThis);
+        }
+    }
+    ts.addCaptureThisForNodeIfNeeded = addCaptureThisForNodeIfNeeded;
+    function captureThisForNode(statements, node, initializer, enableSubstitutionsForCapturedThis, originalStatement) {
+        enableSubstitutionsForCapturedThis();
+        var captureThisStatement = createVariableStatement(undefined, createVariableDeclarationList([
+            createVariableDeclaration("_this", undefined, initializer)
+        ]), originalStatement);
+        setEmitFlags(captureThisStatement, 49152 | 8388608);
+        setSourceMapRange(captureThisStatement, node);
+        statements.push(captureThisStatement);
+    }
+    ts.captureThisForNode = captureThisForNode;
+    function shouldAddDefaultValueAssignments(node) {
+        return (node.transformFlags & 2097152) !== 0;
+    }
+    function addDefaultValueAssignmentsIfNeeded(statements, node, visitor, convertObjectRest) {
+        if (!shouldAddDefaultValueAssignments(node)) {
+            return;
+        }
+        for (var _i = 0, _a = node.parameters; _i < _a.length; _i++) {
+            var parameter = _a[_i];
+            var name_15 = parameter.name, initializer = parameter.initializer, dotDotDotToken = parameter.dotDotDotToken;
+            if (dotDotDotToken) {
+                continue;
+            }
+            if (ts.isBindingPattern(name_15)) {
+                addDefaultValueAssignmentForBindingPattern(statements, parameter, name_15, initializer, visitor, convertObjectRest);
+            }
+            else if (initializer) {
+                addDefaultValueAssignmentForInitializer(statements, parameter, name_15, initializer, visitor);
+            }
+        }
+    }
+    ts.addDefaultValueAssignmentsIfNeeded = addDefaultValueAssignmentsIfNeeded;
+    function addDefaultValueAssignmentForBindingPattern(statements, parameter, name, initializer, visitor, convertObjectRest) {
+        var temp = getGeneratedNameForNode(parameter);
+        if (name.elements.length > 0) {
+            statements.push(setEmitFlags(createVariableStatement(undefined, createVariableDeclarationList(ts.flattenParameterDestructuring(parameter, temp, visitor, convertObjectRest))), 8388608));
+        }
+        else if (initializer) {
+            statements.push(setEmitFlags(createStatement(createAssignment(temp, ts.visitNode(initializer, visitor, ts.isExpression))), 8388608));
+        }
+    }
+    function addDefaultValueAssignmentForInitializer(statements, parameter, name, initializer, visitor) {
+        initializer = ts.visitNode(initializer, visitor, ts.isExpression);
+        var statement = createIf(createStrictEquality(getSynthesizedClone(name), createVoidZero()), setEmitFlags(createBlock([
+            createStatement(createAssignment(setEmitFlags(getMutableClone(name), 1536), setEmitFlags(initializer, 1536 | getEmitFlags(initializer)), parameter))
+        ], parameter), 32 | 1024 | 12288), undefined, parameter);
+        statement.startsOnNewLine = true;
+        setEmitFlags(statement, 12288 | 1024 | 8388608);
+        statements.push(statement);
+    }
+    function shouldAddRestParameter(node, inConstructorWithSynthesizedSuper) {
+        return node && node.dotDotDotToken && node.name.kind === 70 && !inConstructorWithSynthesizedSuper;
+    }
+    function addRestParameterIfNeeded(statements, node, inConstructorWithSynthesizedSuper) {
+        var parameter = ts.lastOrUndefined(node.parameters);
+        if (!shouldAddRestParameter(parameter, inConstructorWithSynthesizedSuper)) {
+            return;
+        }
+        var declarationName = getMutableClone(parameter.name);
+        setEmitFlags(declarationName, 1536);
+        var expressionName = getSynthesizedClone(parameter.name);
+        var restIndex = node.parameters.length - 1;
+        var temp = createLoopVariable();
+        statements.push(setEmitFlags(createVariableStatement(undefined, createVariableDeclarationList([
+            createVariableDeclaration(declarationName, undefined, createArrayLiteral([]))
+        ]), parameter), 8388608));
+        var forStatement = createFor(createVariableDeclarationList([
+            createVariableDeclaration(temp, undefined, createLiteral(restIndex))
+        ], parameter), createLessThan(temp, createPropertyAccess(createIdentifier("arguments"), "length"), parameter), createPostfixIncrement(temp, parameter), createBlock([
+            startOnNewLine(createStatement(createAssignment(createElementAccess(expressionName, createSubtract(temp, createLiteral(restIndex))), createElementAccess(createIdentifier("arguments"), temp)), parameter))
+        ]));
+        setEmitFlags(forStatement, 8388608);
+        startOnNewLine(forStatement);
+        statements.push(forStatement);
+    }
+    ts.addRestParameterIfNeeded = addRestParameterIfNeeded;
+    function convertForOf(node, convertedLoopBodyStatements, visitor, enableSubstitutionsForBlockScopedBindings, context, convertObjectRest) {
+        var expression = ts.visitNode(node.expression, visitor, ts.isExpression);
+        var initializer = node.initializer;
+        var statements = [];
+        var counter = convertObjectRest ? undefined : createLoopVariable();
+        var rhsReference = expression.kind === 70
+            ? createUniqueName(expression.text)
+            : createTempVariable(undefined);
+        var elementAccess = convertObjectRest ? rhsReference : createElementAccess(rhsReference, counter);
+        if (ts.isVariableDeclarationList(initializer)) {
+            if (initializer.flags & 3) {
+                enableSubstitutionsForBlockScopedBindings();
+            }
+            var firstOriginalDeclaration = ts.firstOrUndefined(initializer.declarations);
+            if (firstOriginalDeclaration && ts.isBindingPattern(firstOriginalDeclaration.name)) {
+                var declarations = ts.flattenVariableDestructuring(firstOriginalDeclaration, elementAccess, visitor, undefined, convertObjectRest);
+                var declarationList = createVariableDeclarationList(declarations, initializer);
+                setOriginalNode(declarationList, initializer);
+                var firstDeclaration = declarations[0];
+                var lastDeclaration = ts.lastOrUndefined(declarations);
+                setSourceMapRange(declarationList, ts.createRange(firstDeclaration.pos, lastDeclaration.end));
+                statements.push(createVariableStatement(undefined, declarationList));
+            }
+            else {
+                statements.push(createVariableStatement(undefined, setOriginalNode(createVariableDeclarationList([
+                    createVariableDeclaration(firstOriginalDeclaration ? firstOriginalDeclaration.name : createTempVariable(undefined), undefined, createElementAccess(rhsReference, counter))
+                ], ts.moveRangePos(initializer, -1)), initializer), ts.moveRangeEnd(initializer, -1)));
+            }
+        }
+        else {
+            var assignment = createAssignment(initializer, elementAccess);
+            if (ts.isDestructuringAssignment(assignment)) {
+                statements.push(createStatement(ts.flattenDestructuringAssignment(context, assignment, false, context.hoistVariableDeclaration, visitor, convertObjectRest)));
+            }
+            else {
+                assignment.end = initializer.end;
+                statements.push(createStatement(assignment, ts.moveRangeEnd(initializer, -1)));
+            }
+        }
+        var bodyLocation;
+        var statementsLocation;
+        if (convertedLoopBodyStatements) {
+            ts.addRange(statements, convertedLoopBodyStatements);
+        }
+        else {
+            var statement = ts.visitNode(node.statement, visitor, ts.isStatement);
+            if (ts.isBlock(statement)) {
+                ts.addRange(statements, statement.statements);
+                bodyLocation = statement;
+                statementsLocation = statement.statements;
+            }
+            else {
+                statements.push(statement);
+            }
+        }
+        setEmitFlags(expression, 1536 | getEmitFlags(expression));
+        var body = createBlock(createNodeArray(statements, statementsLocation), bodyLocation);
+        setEmitFlags(body, 1536 | 12288);
+        var forStatement;
+        if (convertObjectRest) {
+            forStatement = createForOf(createVariableDeclarationList([
+                createVariableDeclaration(rhsReference, undefined, undefined, node.expression)
+            ], node.expression), node.expression, body, node);
+        }
+        else {
+            forStatement = createFor(setEmitFlags(createVariableDeclarationList([
+                createVariableDeclaration(counter, undefined, createLiteral(0), ts.moveRangePos(node.expression, -1)),
+                createVariableDeclaration(rhsReference, undefined, expression, node.expression)
+            ], node.expression), 16777216), createLessThan(counter, createPropertyAccess(rhsReference, "length"), node.expression), createPostfixIncrement(counter, node.expression), body, node);
+        }
+        setEmitFlags(forStatement, 8192);
+        return forStatement;
+    }
+    ts.convertForOf = convertForOf;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -11907,13 +13208,13 @@ var ts;
     var IdentifierConstructor;
     var SourceFileConstructor;
     function createNode(kind, pos, end) {
-        if (kind === 256) {
+        if (kind === 261) {
             return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, pos, end);
         }
         else if (kind === 70) {
             return new (IdentifierConstructor || (IdentifierConstructor = ts.objectAllocator.getIdentifierConstructor()))(kind, pos, end);
         }
-        else if (kind < 140) {
+        else if (kind < 141) {
             return new (TokenConstructor || (TokenConstructor = ts.objectAllocator.getTokenConstructor()))(kind, pos, end);
         }
         else {
@@ -11949,26 +13250,28 @@ var ts;
         var visitNodes = cbNodeArray ? visitNodeArray : visitEachNode;
         var cbNodes = cbNodeArray || cbNode;
         switch (node.kind) {
-            case 140:
+            case 141:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.right);
-            case 142:
+            case 143:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.constraint) ||
                     visitNode(cbNode, node.expression);
-            case 254:
+            case 258:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.equalsToken) ||
                     visitNode(cbNode, node.objectAssignmentInitializer);
-            case 143:
+            case 259:
+                return visitNode(cbNode, node.expression);
+            case 144:
+            case 147:
             case 146:
-            case 145:
-            case 253:
-            case 219:
-            case 170:
+            case 257:
+            case 223:
+            case 174:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.propertyName) ||
@@ -11977,24 +13280,24 @@ var ts;
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 157:
             case 158:
-            case 152:
+            case 159:
             case 153:
             case 154:
+            case 155:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNodes(cbNodes, node.typeParameters) ||
                     visitNodes(cbNodes, node.parameters) ||
                     visitNode(cbNode, node.type);
-            case 148:
-            case 147:
             case 149:
+            case 148:
             case 150:
             case 151:
-            case 180:
-            case 221:
-            case 181:
+            case 152:
+            case 184:
+            case 225:
+            case 185:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.asteriskToken) ||
@@ -12005,308 +13308,318 @@ var ts;
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.equalsGreaterThanToken) ||
                     visitNode(cbNode, node.body);
-            case 156:
+            case 157:
                 return visitNode(cbNode, node.typeName) ||
                     visitNodes(cbNodes, node.typeArguments);
-            case 155:
+            case 156:
                 return visitNode(cbNode, node.parameterName) ||
                     visitNode(cbNode, node.type);
-            case 159:
-                return visitNode(cbNode, node.exprName);
             case 160:
-                return visitNodes(cbNodes, node.members);
+                return visitNode(cbNode, node.exprName);
             case 161:
-                return visitNode(cbNode, node.elementType);
+                return visitNodes(cbNodes, node.members);
             case 162:
-                return visitNodes(cbNodes, node.elementTypes);
+                return visitNode(cbNode, node.elementType);
             case 163:
+                return visitNodes(cbNodes, node.elementTypes);
             case 164:
-                return visitNodes(cbNodes, node.types);
             case 165:
-                return visitNode(cbNode, node.type);
-            case 167:
-                return visitNode(cbNode, node.literal);
+                return visitNodes(cbNodes, node.types);
+            case 166:
             case 168:
+                return visitNode(cbNode, node.type);
             case 169:
-                return visitNodes(cbNodes, node.elements);
+                return visitNode(cbNode, node.objectType) ||
+                    visitNode(cbNode, node.indexType);
+            case 170:
+                return visitNode(cbNode, node.readonlyToken) ||
+                    visitNode(cbNode, node.typeParameter) ||
+                    visitNode(cbNode, node.questionToken) ||
+                    visitNode(cbNode, node.type);
             case 171:
-                return visitNodes(cbNodes, node.elements);
+                return visitNode(cbNode, node.literal);
             case 172:
-                return visitNodes(cbNodes, node.properties);
             case 173:
+                return visitNodes(cbNodes, node.elements);
+            case 175:
+                return visitNodes(cbNodes, node.elements);
+            case 176:
+                return visitNodes(cbNodes, node.properties);
+            case 177:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.name);
-            case 174:
+            case 178:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.argumentExpression);
-            case 175:
-            case 176:
+            case 179:
+            case 180:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNodes, node.typeArguments) ||
                     visitNodes(cbNodes, node.arguments);
-            case 177:
+            case 181:
                 return visitNode(cbNode, node.tag) ||
                     visitNode(cbNode, node.template);
-            case 178:
+            case 182:
                 return visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.expression);
-            case 179:
-                return visitNode(cbNode, node.expression);
-            case 182:
-                return visitNode(cbNode, node.expression);
             case 183:
                 return visitNode(cbNode, node.expression);
-            case 184:
-                return visitNode(cbNode, node.expression);
             case 186:
-                return visitNode(cbNode, node.operand);
-            case 191:
-                return visitNode(cbNode, node.asteriskToken) ||
-                    visitNode(cbNode, node.expression);
-            case 185:
                 return visitNode(cbNode, node.expression);
             case 187:
-                return visitNode(cbNode, node.operand);
+                return visitNode(cbNode, node.expression);
             case 188:
+                return visitNode(cbNode, node.expression);
+            case 190:
+                return visitNode(cbNode, node.operand);
+            case 195:
+                return visitNode(cbNode, node.asteriskToken) ||
+                    visitNode(cbNode, node.expression);
+            case 189:
+                return visitNode(cbNode, node.expression);
+            case 191:
+                return visitNode(cbNode, node.operand);
+            case 192:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.operatorToken) ||
                     visitNode(cbNode, node.right);
-            case 196:
+            case 200:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.type);
-            case 197:
+            case 201:
                 return visitNode(cbNode, node.expression);
-            case 189:
+            case 193:
                 return visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.whenTrue) ||
                     visitNode(cbNode, node.colonToken) ||
                     visitNode(cbNode, node.whenFalse);
-            case 192:
+            case 196:
                 return visitNode(cbNode, node.expression);
-            case 200:
-            case 227:
+            case 204:
+            case 231:
                 return visitNodes(cbNodes, node.statements);
-            case 256:
+            case 261:
                 return visitNodes(cbNodes, node.statements) ||
                     visitNode(cbNode, node.endOfFileToken);
-            case 201:
+            case 205:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.declarationList);
-            case 220:
+            case 224:
                 return visitNodes(cbNodes, node.declarations);
-            case 203:
+            case 207:
                 return visitNode(cbNode, node.expression);
-            case 204:
+            case 208:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.thenStatement) ||
                     visitNode(cbNode, node.elseStatement);
-            case 205:
+            case 209:
                 return visitNode(cbNode, node.statement) ||
                     visitNode(cbNode, node.expression);
-            case 206:
+            case 210:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 207:
+            case 211:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.incrementor) ||
                     visitNode(cbNode, node.statement);
-            case 208:
-                return visitNode(cbNode, node.initializer) ||
-                    visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.statement);
-            case 209:
-                return visitNode(cbNode, node.initializer) ||
-                    visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.statement);
-            case 210:
-            case 211:
-                return visitNode(cbNode, node.label);
             case 212:
-                return visitNode(cbNode, node.expression);
+                return visitNode(cbNode, node.initializer) ||
+                    visitNode(cbNode, node.expression) ||
+                    visitNode(cbNode, node.statement);
             case 213:
-                return visitNode(cbNode, node.expression) ||
+                return visitNode(cbNode, node.initializer) ||
+                    visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
             case 214:
-                return visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.caseBlock);
-            case 228:
-                return visitNodes(cbNodes, node.clauses);
-            case 249:
-                return visitNode(cbNode, node.expression) ||
-                    visitNodes(cbNodes, node.statements);
-            case 250:
-                return visitNodes(cbNodes, node.statements);
             case 215:
-                return visitNode(cbNode, node.label) ||
-                    visitNode(cbNode, node.statement);
+                return visitNode(cbNode, node.label);
             case 216:
                 return visitNode(cbNode, node.expression);
             case 217:
+                return visitNode(cbNode, node.expression) ||
+                    visitNode(cbNode, node.statement);
+            case 218:
+                return visitNode(cbNode, node.expression) ||
+                    visitNode(cbNode, node.caseBlock);
+            case 232:
+                return visitNodes(cbNodes, node.clauses);
+            case 253:
+                return visitNode(cbNode, node.expression) ||
+                    visitNodes(cbNodes, node.statements);
+            case 254:
+                return visitNodes(cbNodes, node.statements);
+            case 219:
+                return visitNode(cbNode, node.label) ||
+                    visitNode(cbNode, node.statement);
+            case 220:
+                return visitNode(cbNode, node.expression);
+            case 221:
                 return visitNode(cbNode, node.tryBlock) ||
                     visitNode(cbNode, node.catchClause) ||
                     visitNode(cbNode, node.finallyBlock);
-            case 252:
+            case 256:
                 return visitNode(cbNode, node.variableDeclaration) ||
                     visitNode(cbNode, node.block);
-            case 144:
+            case 145:
                 return visitNode(cbNode, node.expression);
-            case 222:
-            case 193:
+            case 226:
+            case 197:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNodes, node.typeParameters) ||
                     visitNodes(cbNodes, node.heritageClauses) ||
                     visitNodes(cbNodes, node.members);
-            case 223:
+            case 227:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNodes, node.typeParameters) ||
                     visitNodes(cbNodes, node.heritageClauses) ||
                     visitNodes(cbNodes, node.members);
-            case 224:
+            case 228:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNodes, node.typeParameters) ||
                     visitNode(cbNode, node.type);
-            case 225:
+            case 229:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNodes, node.members);
-            case 255:
+            case 260:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 226:
-                return visitNodes(cbNodes, node.decorators) ||
-                    visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.body);
             case 230:
+                return visitNodes(cbNodes, node.decorators) ||
+                    visitNodes(cbNodes, node.modifiers) ||
+                    visitNode(cbNode, node.name) ||
+                    visitNode(cbNode, node.body);
+            case 234:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.moduleReference);
-            case 231:
+            case 235:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.importClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 232:
+            case 236:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.namedBindings);
-            case 229:
-                return visitNode(cbNode, node.name);
             case 233:
                 return visitNode(cbNode, node.name);
-            case 234:
-            case 238:
-                return visitNodes(cbNodes, node.elements);
             case 237:
+                return visitNode(cbNode, node.name);
+            case 238:
+            case 242:
+                return visitNodes(cbNodes, node.elements);
+            case 241:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.exportClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 235:
             case 239:
+            case 243:
                 return visitNode(cbNode, node.propertyName) ||
                     visitNode(cbNode, node.name);
-            case 236:
+            case 240:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.expression);
-            case 190:
+            case 194:
                 return visitNode(cbNode, node.head) || visitNodes(cbNodes, node.templateSpans);
-            case 198:
+            case 202:
                 return visitNode(cbNode, node.expression) || visitNode(cbNode, node.literal);
-            case 141:
+            case 142:
                 return visitNode(cbNode, node.expression);
-            case 251:
+            case 255:
                 return visitNodes(cbNodes, node.types);
-            case 195:
+            case 199:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNodes, node.typeArguments);
-            case 241:
+            case 245:
                 return visitNode(cbNode, node.expression);
-            case 240:
+            case 244:
                 return visitNodes(cbNodes, node.decorators);
-            case 242:
+            case 246:
                 return visitNode(cbNode, node.openingElement) ||
                     visitNodes(cbNodes, node.children) ||
                     visitNode(cbNode, node.closingElement);
-            case 243:
-            case 244:
+            case 247:
+            case 248:
                 return visitNode(cbNode, node.tagName) ||
                     visitNodes(cbNodes, node.attributes);
-            case 246:
+            case 250:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 247:
+            case 251:
                 return visitNode(cbNode, node.expression);
-            case 248:
+            case 252:
                 return visitNode(cbNode, node.expression);
-            case 245:
+            case 249:
                 return visitNode(cbNode, node.tagName);
-            case 257:
-                return visitNode(cbNode, node.type);
-            case 261:
-                return visitNodes(cbNodes, node.types);
             case 262:
-                return visitNodes(cbNodes, node.types);
-            case 260:
-                return visitNode(cbNode, node.elementType);
-            case 264:
-                return visitNode(cbNode, node.type);
-            case 263:
-                return visitNode(cbNode, node.type);
-            case 265:
-                return visitNode(cbNode, node.literal);
-            case 267:
-                return visitNode(cbNode, node.name) ||
-                    visitNodes(cbNodes, node.typeArguments);
-            case 268:
-                return visitNode(cbNode, node.type);
-            case 269:
-                return visitNodes(cbNodes, node.parameters) ||
-                    visitNode(cbNode, node.type);
-            case 270:
-                return visitNode(cbNode, node.type);
-            case 271:
-                return visitNode(cbNode, node.type);
-            case 272:
                 return visitNode(cbNode, node.type);
             case 266:
+                return visitNodes(cbNodes, node.types);
+            case 267:
+                return visitNodes(cbNodes, node.types);
+            case 265:
+                return visitNode(cbNode, node.elementType);
+            case 269:
+                return visitNode(cbNode, node.type);
+            case 268:
+                return visitNode(cbNode, node.type);
+            case 270:
+                return visitNode(cbNode, node.literal);
+            case 272:
+                return visitNode(cbNode, node.name) ||
+                    visitNodes(cbNodes, node.typeArguments);
+            case 273:
+                return visitNode(cbNode, node.type);
+            case 274:
+                return visitNodes(cbNodes, node.parameters) ||
+                    visitNode(cbNode, node.type);
+            case 275:
+                return visitNode(cbNode, node.type);
+            case 276:
+                return visitNode(cbNode, node.type);
+            case 277:
+                return visitNode(cbNode, node.type);
+            case 271:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.type);
-            case 273:
+            case 278:
                 return visitNodes(cbNodes, node.tags);
-            case 275:
+            case 280:
                 return visitNode(cbNode, node.preParameterName) ||
                     visitNode(cbNode, node.typeExpression) ||
                     visitNode(cbNode, node.postParameterName);
-            case 276:
+            case 281:
                 return visitNode(cbNode, node.typeExpression);
-            case 277:
+            case 282:
                 return visitNode(cbNode, node.typeExpression);
-            case 278:
+            case 283:
                 return visitNodes(cbNodes, node.typeParameters);
-            case 279:
+            case 284:
                 return visitNode(cbNode, node.typeExpression) ||
+                    visitNode(cbNode, node.fullName) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.jsDocTypeLiteral);
-            case 281:
+            case 286:
                 return visitNodes(cbNodes, node.jsDocPropertyTags);
-            case 280:
+            case 285:
                 return visitNode(cbNode, node.typeExpression) ||
                     visitNode(cbNode, node.name);
-            case 288:
+            case 293:
                 return visitNode(cbNode, node.expression);
-            case 282:
+            case 287:
                 return visitNode(cbNode, node.literal);
         }
     }
@@ -12320,6 +13633,10 @@ var ts;
         return result;
     }
     ts.createSourceFile = createSourceFile;
+    function parseIsolatedEntityName(text, languageVersion) {
+        return Parser.parseIsolatedEntityName(text, languageVersion);
+    }
+    ts.parseIsolatedEntityName = parseIsolatedEntityName;
     function isExternalModule(file) {
         return file.externalModuleIndicator !== undefined;
     }
@@ -12342,8 +13659,8 @@ var ts;
     ts.parseJSDocTypeExpressionForTests = parseJSDocTypeExpressionForTests;
     var Parser;
     (function (Parser) {
-        var scanner = ts.createScanner(4, true);
-        var disallowInAndDecoratorContext = 32768 | 131072;
+        var scanner = ts.createScanner(5, true);
+        var disallowInAndDecoratorContext = 65536 | 262144;
         var NodeConstructor;
         var TokenConstructor;
         var IdentifierConstructor;
@@ -12367,6 +13684,15 @@ var ts;
             return result;
         }
         Parser.parseSourceFile = parseSourceFile;
+        function parseIsolatedEntityName(content, languageVersion) {
+            initializeState(content, languageVersion, undefined, 1);
+            nextToken();
+            var entityName = parseEntityName(true);
+            var isInvalid = token() === 1 && !parseDiagnostics.length;
+            clearState();
+            return isInvalid ? entityName : undefined;
+        }
+        Parser.parseIsolatedEntityName = parseIsolatedEntityName;
         function getLanguageVariant(scriptKind) {
             return scriptKind === 4 || scriptKind === 2 || scriptKind === 1 ? 1 : 0;
         }
@@ -12382,7 +13708,7 @@ var ts;
             identifiers = ts.createMap();
             identifierCount = 0;
             nodeCount = 0;
-            contextFlags = scriptKind === 1 || scriptKind === 2 ? 1048576 : 0;
+            contextFlags = scriptKind === 1 || scriptKind === 2 ? 2097152 : 0;
             parseErrorBeforeNextFinishedNode = false;
             scanner.setText(sourceText);
             scanner.setOnError(scanError);
@@ -12457,7 +13783,7 @@ var ts;
         }
         Parser.fixupParentReferences = fixupParentReferences;
         function createSourceFile(fileName, languageVersion, scriptKind) {
-            var sourceFile = new SourceFileConstructor(256, 0, sourceText.length);
+            var sourceFile = new SourceFileConstructor(261, 0, sourceText.length);
             nodeCount++;
             sourceFile.text = sourceText;
             sourceFile.bindDiagnostics = [];
@@ -12477,17 +13803,17 @@ var ts;
             }
         }
         function setDisallowInContext(val) {
-            setContextFlag(val, 32768);
-        }
-        function setYieldContext(val) {
             setContextFlag(val, 65536);
         }
-        function setDecoratorContext(val) {
+        function setYieldContext(val) {
             setContextFlag(val, 131072);
         }
-        function setAwaitContext(val) {
+        function setDecoratorContext(val) {
             setContextFlag(val, 262144);
         }
+        function setAwaitContext(val) {
+            setContextFlag(val, 524288);
+        }
         function doOutsideOfContext(context, func) {
             var contextFlagsToClear = context & contextFlags;
             if (contextFlagsToClear) {
@@ -12509,41 +13835,41 @@ var ts;
             return func();
         }
         function allowInAnd(func) {
-            return doOutsideOfContext(32768, func);
+            return doOutsideOfContext(65536, func);
         }
         function disallowInAnd(func) {
-            return doInsideOfContext(32768, func);
-        }
-        function doInYieldContext(func) {
             return doInsideOfContext(65536, func);
         }
-        function doInDecoratorContext(func) {
+        function doInYieldContext(func) {
             return doInsideOfContext(131072, func);
         }
-        function doInAwaitContext(func) {
+        function doInDecoratorContext(func) {
             return doInsideOfContext(262144, func);
         }
+        function doInAwaitContext(func) {
+            return doInsideOfContext(524288, func);
+        }
         function doOutsideOfAwaitContext(func) {
-            return doOutsideOfContext(262144, func);
+            return doOutsideOfContext(524288, func);
         }
         function doInYieldAndAwaitContext(func) {
-            return doInsideOfContext(65536 | 262144, func);
+            return doInsideOfContext(131072 | 524288, func);
         }
         function inContext(flags) {
             return (contextFlags & flags) !== 0;
         }
         function inYieldContext() {
-            return inContext(65536);
-        }
-        function inDisallowInContext() {
-            return inContext(32768);
-        }
-        function inDecoratorContext() {
             return inContext(131072);
         }
-        function inAwaitContext() {
+        function inDisallowInContext() {
+            return inContext(65536);
+        }
+        function inDecoratorContext() {
             return inContext(262144);
         }
+        function inAwaitContext() {
+            return inContext(524288);
+        }
         function parseErrorAtCurrentToken(message, arg0) {
             var start = scanner.getTokenPos();
             var length = scanner.getTextPos() - start;
@@ -12684,7 +14010,7 @@ var ts;
             if (!(pos >= 0)) {
                 pos = scanner.getStartPos();
             }
-            return kind >= 140 ? new NodeConstructor(kind, pos, pos) :
+            return kind >= 141 ? new NodeConstructor(kind, pos, pos) :
                 kind === 70 ? new IdentifierConstructor(kind, pos, pos) :
                     new TokenConstructor(kind, pos, pos);
         }
@@ -12704,7 +14030,7 @@ var ts;
             }
             if (parseErrorBeforeNextFinishedNode) {
                 parseErrorBeforeNextFinishedNode = false;
-                node.flags |= 524288;
+                node.flags |= 1048576;
             }
             return node;
         }
@@ -12766,7 +14092,7 @@ var ts;
             return token() === 9 || token() === 8 || ts.tokenIsIdentifierOrKeyword(token());
         }
         function parseComputedPropertyName() {
-            var node = createNode(141);
+            var node = createNode(142);
             parseExpected(20);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21);
@@ -12836,9 +14162,11 @@ var ts;
                 case 6:
                     return token() === 20 || isLiteralPropertyName();
                 case 12:
-                    return token() === 20 || token() === 38 || isLiteralPropertyName();
+                    return token() === 20 || token() === 38 || token() === 23 || isLiteralPropertyName();
+                case 17:
+                    return isLiteralPropertyName();
                 case 9:
-                    return token() === 20 || isLiteralPropertyName();
+                    return token() === 20 || token() === 23 || isLiteralPropertyName();
                 case 7:
                     if (token() === 16) {
                         return lookAhead(isValidHeritageClauseObjectLiteral);
@@ -12853,29 +14181,29 @@ var ts;
                     return isIdentifierOrPattern();
                 case 10:
                     return token() === 25 || token() === 23 || isIdentifierOrPattern();
-                case 17:
+                case 18:
                     return isIdentifier();
                 case 11:
                 case 15:
                     return token() === 25 || token() === 23 || isStartOfExpression();
                 case 16:
                     return isStartOfParameter();
-                case 18:
                 case 19:
-                    return token() === 25 || isStartOfType();
                 case 20:
-                    return isHeritageClause();
+                    return token() === 25 || isStartOfType();
                 case 21:
+                    return isHeritageClause();
+                case 22:
                     return ts.tokenIsIdentifierOrKeyword(token());
                 case 13:
                     return ts.tokenIsIdentifierOrKeyword(token()) || token() === 16;
                 case 14:
                     return true;
-                case 22:
                 case 23:
-                case 25:
-                    return JSDocParser.isJSDocType();
                 case 24:
+                case 26:
+                    return JSDocParser.isJSDocType();
+                case 25:
                     return isSimplePropertyName();
             }
             ts.Debug.fail("Non-exhaustive case in 'isListElement'.");
@@ -12919,7 +14247,7 @@ var ts;
                 case 6:
                 case 12:
                 case 9:
-                case 21:
+                case 22:
                     return token() === 17;
                 case 3:
                     return token() === 17 || token() === 72 || token() === 78;
@@ -12927,31 +14255,32 @@ var ts;
                     return token() === 16 || token() === 84 || token() === 107;
                 case 8:
                     return isVariableDeclaratorListTerminator();
-                case 17:
+                case 18:
                     return token() === 28 || token() === 18 || token() === 16 || token() === 84 || token() === 107;
                 case 11:
                     return token() === 19 || token() === 24;
                 case 15:
-                case 19:
+                case 20:
                 case 10:
                     return token() === 21;
                 case 16:
+                case 17:
                     return token() === 19 || token() === 21;
-                case 18:
+                case 19:
                     return token() !== 25;
-                case 20:
+                case 21:
                     return token() === 16 || token() === 17;
                 case 13:
                     return token() === 28 || token() === 40;
                 case 14:
                     return token() === 26 && lookAhead(nextTokenIsSlash);
-                case 22:
-                    return token() === 19 || token() === 55 || token() === 17;
                 case 23:
-                    return token() === 28 || token() === 17;
-                case 25:
-                    return token() === 21 || token() === 17;
+                    return token() === 19 || token() === 55 || token() === 17;
                 case 24:
+                    return token() === 28 || token() === 17;
+                case 26:
+                    return token() === 21 || token() === 17;
+                case 25:
                     return token() === 17;
             }
         }
@@ -12968,7 +14297,7 @@ var ts;
             return false;
         }
         function isInSomeParsingContext() {
-            for (var kind = 0; kind < 26; kind++) {
+            for (var kind = 0; kind < 27; kind++) {
                 if (parsingContext & (1 << kind)) {
                     if (isListElement(kind, true) || isListTerminator(kind)) {
                         return true;
@@ -13019,7 +14348,7 @@ var ts;
             if (ts.containsParseError(node)) {
                 return undefined;
             }
-            var nodeContextFlags = node.flags & 1540096;
+            var nodeContextFlags = node.flags & 3080192;
             if (nodeContextFlags !== contextFlags) {
                 return undefined;
             }
@@ -13051,10 +14380,12 @@ var ts;
                     return isReusableVariableDeclaration(node);
                 case 16:
                     return isReusableParameter(node);
-                case 20:
                 case 17:
-                case 19:
+                    return false;
+                case 21:
                 case 18:
+                case 20:
+                case 19:
                 case 11:
                 case 12:
                 case 7:
@@ -13066,14 +14397,14 @@ var ts;
         function isReusableClassMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 149:
-                    case 154:
                     case 150:
+                    case 155:
                     case 151:
-                    case 146:
-                    case 199:
+                    case 152:
+                    case 147:
+                    case 203:
                         return true;
-                    case 148:
+                    case 149:
                         var methodDeclaration = node;
                         var nameIsConstructor = methodDeclaration.name.kind === 70 &&
                             methodDeclaration.name.originalKeywordKind === 122;
@@ -13085,8 +14416,8 @@ var ts;
         function isReusableSwitchClause(node) {
             if (node) {
                 switch (node.kind) {
-                    case 249:
-                    case 250:
+                    case 253:
+                    case 254:
                         return true;
                 }
             }
@@ -13095,65 +14426,65 @@ var ts;
         function isReusableStatement(node) {
             if (node) {
                 switch (node.kind) {
-                    case 221:
-                    case 201:
-                    case 200:
+                    case 225:
+                    case 205:
                     case 204:
-                    case 203:
+                    case 208:
+                    case 207:
+                    case 220:
                     case 216:
-                    case 212:
+                    case 218:
+                    case 215:
                     case 214:
+                    case 212:
+                    case 213:
                     case 211:
                     case 210:
-                    case 208:
-                    case 209:
-                    case 207:
-                    case 206:
-                    case 213:
-                    case 202:
                     case 217:
-                    case 215:
-                    case 205:
-                    case 218:
-                    case 231:
-                    case 230:
-                    case 237:
-                    case 236:
-                    case 226:
+                    case 206:
+                    case 221:
+                    case 219:
+                    case 209:
                     case 222:
-                    case 223:
-                    case 225:
-                    case 224:
+                    case 235:
+                    case 234:
+                    case 241:
+                    case 240:
+                    case 230:
+                    case 226:
+                    case 227:
+                    case 229:
+                    case 228:
                         return true;
                 }
             }
             return false;
         }
         function isReusableEnumMember(node) {
-            return node.kind === 255;
+            return node.kind === 260;
         }
         function isReusableTypeMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 153:
-                    case 147:
                     case 154:
-                    case 145:
-                    case 152:
+                    case 148:
+                    case 155:
+                    case 146:
+                    case 153:
                         return true;
                 }
             }
             return false;
         }
         function isReusableVariableDeclaration(node) {
-            if (node.kind !== 219) {
+            if (node.kind !== 223) {
                 return false;
             }
             var variableDeclarator = node;
             return variableDeclarator.initializer === undefined;
         }
         function isReusableParameter(node) {
-            if (node.kind !== 143) {
+            if (node.kind !== 144) {
                 return false;
             }
             var parameter = node;
@@ -13173,6 +14504,7 @@ var ts;
                 case 1: return ts.Diagnostics.Declaration_or_statement_expected;
                 case 2: return ts.Diagnostics.case_or_default_expected;
                 case 3: return ts.Diagnostics.Statement_expected;
+                case 17:
                 case 4: return ts.Diagnostics.Property_or_signature_expected;
                 case 5: return ts.Diagnostics.Unexpected_token_A_constructor_method_accessor_or_property_was_expected;
                 case 6: return ts.Diagnostics.Enum_member_expected;
@@ -13184,17 +14516,17 @@ var ts;
                 case 12: return ts.Diagnostics.Property_assignment_expected;
                 case 15: return ts.Diagnostics.Expression_or_comma_expected;
                 case 16: return ts.Diagnostics.Parameter_declaration_expected;
-                case 17: return ts.Diagnostics.Type_parameter_declaration_expected;
-                case 18: return ts.Diagnostics.Type_argument_expected;
-                case 19: return ts.Diagnostics.Type_expected;
-                case 20: return ts.Diagnostics.Unexpected_token_expected;
-                case 21: return ts.Diagnostics.Identifier_expected;
+                case 18: return ts.Diagnostics.Type_parameter_declaration_expected;
+                case 19: return ts.Diagnostics.Type_argument_expected;
+                case 20: return ts.Diagnostics.Type_expected;
+                case 21: return ts.Diagnostics.Unexpected_token_expected;
+                case 22: return ts.Diagnostics.Identifier_expected;
                 case 13: return ts.Diagnostics.Identifier_expected;
                 case 14: return ts.Diagnostics.Identifier_expected;
-                case 22: return ts.Diagnostics.Parameter_declaration_expected;
-                case 23: return ts.Diagnostics.Type_argument_expected;
-                case 25: return ts.Diagnostics.Type_expected;
-                case 24: return ts.Diagnostics.Property_assignment_expected;
+                case 23: return ts.Diagnostics.Parameter_declaration_expected;
+                case 24: return ts.Diagnostics.Type_argument_expected;
+                case 26: return ts.Diagnostics.Type_expected;
+                case 25: return ts.Diagnostics.Property_assignment_expected;
             }
         }
         ;
@@ -13248,7 +14580,7 @@ var ts;
         function parseEntityName(allowReservedWords, diagnosticMessage) {
             var entity = parseIdentifier(diagnosticMessage);
             while (parseOptional(22)) {
-                var node = createNode(140, entity.pos);
+                var node = createNode(141, entity.pos);
                 node.left = entity;
                 node.right = parseRightSideOfDot(allowReservedWords);
                 entity = finishNode(node);
@@ -13265,7 +14597,7 @@ var ts;
             return allowIdentifierNames ? parseIdentifierName() : parseIdentifier();
         }
         function parseTemplateExpression() {
-            var template = createNode(190);
+            var template = createNode(194);
             template.head = parseTemplateHead();
             ts.Debug.assert(template.head.kind === 13, "Template head has wrong token kind");
             var templateSpans = createNodeArray();
@@ -13277,7 +14609,7 @@ var ts;
             return finishNode(template);
         }
         function parseTemplateSpan() {
-            var span = createNode(198);
+            var span = createNode(202);
             span.expression = allowInAnd(parseExpression);
             var literal;
             if (token() === 17) {
@@ -13325,33 +14657,33 @@ var ts;
         }
         function parseTypeReference() {
             var typeName = parseEntityName(false, ts.Diagnostics.Type_expected);
-            var node = createNode(156, typeName.pos);
+            var node = createNode(157, typeName.pos);
             node.typeName = typeName;
             if (!scanner.hasPrecedingLineBreak() && token() === 26) {
-                node.typeArguments = parseBracketedList(18, parseType, 26, 28);
+                node.typeArguments = parseBracketedList(19, parseType, 26, 28);
             }
             return finishNode(node);
         }
         function parseThisTypePredicate(lhs) {
             nextToken();
-            var node = createNode(155, lhs.pos);
+            var node = createNode(156, lhs.pos);
             node.parameterName = lhs;
             node.type = parseType();
             return finishNode(node);
         }
         function parseThisTypeNode() {
-            var node = createNode(166);
+            var node = createNode(167);
             nextToken();
             return finishNode(node);
         }
         function parseTypeQuery() {
-            var node = createNode(159);
+            var node = createNode(160);
             parseExpected(102);
             node.exprName = parseEntityName(true);
             return finishNode(node);
         }
         function parseTypeParameter() {
-            var node = createNode(142);
+            var node = createNode(143);
             node.name = parseIdentifier();
             if (parseOptional(84)) {
                 if (isStartOfType() || !isStartOfExpression()) {
@@ -13365,7 +14697,7 @@ var ts;
         }
         function parseTypeParameters() {
             if (token() === 26) {
-                return parseBracketedList(17, parseTypeParameter, 26, 28);
+                return parseBracketedList(18, parseTypeParameter, 26, 28);
             }
         }
         function parseParameterType() {
@@ -13378,7 +14710,7 @@ var ts;
             return token() === 23 || isIdentifierOrPattern() || ts.isModifierKind(token()) || token() === 56 || token() === 98;
         }
         function parseParameter() {
-            var node = createNode(143);
+            var node = createNode(144);
             if (token() === 98) {
                 node.name = createIdentifier(true, undefined);
                 node.type = parseParameterType();
@@ -13438,7 +14770,7 @@ var ts;
         }
         function parseSignatureMember(kind) {
             var node = createNode(kind);
-            if (kind === 153) {
+            if (kind === 154) {
                 parseExpected(93);
             }
             fillSignature(55, false, false, false, node);
@@ -13478,7 +14810,7 @@ var ts;
             return token() === 55 || token() === 25 || token() === 21;
         }
         function parseIndexSignatureDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(154, fullStart);
+            var node = createNode(155, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             node.parameters = parseBracketedList(16, parseParameter, 20, 21);
@@ -13490,7 +14822,7 @@ var ts;
             var name = parsePropertyName();
             var questionToken = parseOptionalToken(54);
             if (token() === 18 || token() === 26) {
-                var method = createNode(147, fullStart);
+                var method = createNode(148, fullStart);
                 method.modifiers = modifiers;
                 method.name = name;
                 method.questionToken = questionToken;
@@ -13499,7 +14831,7 @@ var ts;
                 return addJSDocComment(finishNode(method));
             }
             else {
-                var property = createNode(145, fullStart);
+                var property = createNode(146, fullStart);
                 property.modifiers = modifiers;
                 property.name = name;
                 property.questionToken = questionToken;
@@ -13539,10 +14871,10 @@ var ts;
         }
         function parseTypeMember() {
             if (token() === 18 || token() === 26) {
-                return parseSignatureMember(152);
+                return parseSignatureMember(153);
             }
             if (token() === 93 && lookAhead(isStartOfConstructSignature)) {
-                return parseSignatureMember(153);
+                return parseSignatureMember(154);
             }
             var fullStart = getNodePos();
             var modifiers = parseModifiers();
@@ -13556,7 +14888,7 @@ var ts;
             return token() === 18 || token() === 26;
         }
         function parseTypeLiteral() {
-            var node = createNode(160);
+            var node = createNode(161);
             node.members = parseObjectTypeMembers();
             return finishNode(node);
         }
@@ -13571,13 +14903,40 @@ var ts;
             }
             return members;
         }
+        function isStartOfMappedType() {
+            nextToken();
+            if (token() === 130) {
+                nextToken();
+            }
+            return token() === 20 && nextTokenIsIdentifier() && nextToken() === 91;
+        }
+        function parseMappedTypeParameter() {
+            var node = createNode(143);
+            node.name = parseIdentifier();
+            parseExpected(91);
+            node.constraint = parseType();
+            return finishNode(node);
+        }
+        function parseMappedType() {
+            var node = createNode(170);
+            parseExpected(16);
+            node.readonlyToken = parseOptionalToken(130);
+            parseExpected(20);
+            node.typeParameter = parseMappedTypeParameter();
+            parseExpected(21);
+            node.questionToken = parseOptionalToken(54);
+            node.type = parseTypeAnnotation();
+            parseSemicolon();
+            parseExpected(17);
+            return finishNode(node);
+        }
         function parseTupleType() {
-            var node = createNode(162);
-            node.elementTypes = parseBracketedList(19, parseType, 20, 21);
+            var node = createNode(163);
+            node.elementTypes = parseBracketedList(20, parseType, 20, 21);
             return finishNode(node);
         }
         function parseParenthesizedType() {
-            var node = createNode(165);
+            var node = createNode(166);
             parseExpected(18);
             node.type = parseType();
             parseExpected(19);
@@ -13585,7 +14944,7 @@ var ts;
         }
         function parseFunctionOrConstructorType(kind) {
             var node = createNode(kind);
-            if (kind === 158) {
+            if (kind === 159) {
                 parseExpected(93);
             }
             fillSignature(35, false, false, false, node);
@@ -13596,7 +14955,7 @@ var ts;
             return token() === 22 ? undefined : node;
         }
         function parseLiteralTypeNode() {
-            var node = createNode(167);
+            var node = createNode(171);
             node.literal = parseSimpleUnaryExpression();
             finishNode(node);
             return node;
@@ -13607,12 +14966,12 @@ var ts;
         function parseNonArrayType() {
             switch (token()) {
                 case 118:
-                case 133:
-                case 131:
-                case 121:
                 case 134:
-                case 136:
-                case 128:
+                case 132:
+                case 121:
+                case 135:
+                case 137:
+                case 129:
                     var node = tryParse(parseKeywordAndNoDot);
                     return node || parseTypeReference();
                 case 9:
@@ -13637,7 +14996,7 @@ var ts;
                 case 102:
                     return parseTypeQuery();
                 case 16:
-                    return parseTypeLiteral();
+                    return lookAhead(isStartOfMappedType) ? parseMappedType() : parseTypeLiteral();
                 case 20:
                     return parseTupleType();
                 case 18:
@@ -13649,16 +15008,16 @@ var ts;
         function isStartOfType() {
             switch (token()) {
                 case 118:
-                case 133:
-                case 131:
-                case 121:
                 case 134:
+                case 132:
+                case 121:
+                case 135:
                 case 104:
-                case 136:
+                case 137:
                 case 94:
                 case 98:
                 case 102:
-                case 128:
+                case 129:
                 case 16:
                 case 20:
                 case 26:
@@ -13683,13 +15042,36 @@ var ts;
         function parseArrayTypeOrHigher() {
             var type = parseNonArrayType();
             while (!scanner.hasPrecedingLineBreak() && parseOptional(20)) {
-                parseExpected(21);
-                var node = createNode(161, type.pos);
-                node.elementType = type;
-                type = finishNode(node);
+                if (isStartOfType()) {
+                    var node = createNode(169, type.pos);
+                    node.objectType = type;
+                    node.indexType = parseType();
+                    parseExpected(21);
+                    type = finishNode(node);
+                }
+                else {
+                    var node = createNode(162, type.pos);
+                    node.elementType = type;
+                    parseExpected(21);
+                    type = finishNode(node);
+                }
             }
             return type;
         }
+        function parseTypeOperator(operator) {
+            var node = createNode(168);
+            parseExpected(operator);
+            node.operator = operator;
+            node.type = parseTypeOperatorOrHigher();
+            return finishNode(node);
+        }
+        function parseTypeOperatorOrHigher() {
+            switch (token()) {
+                case 126:
+                    return parseTypeOperator(126);
+            }
+            return parseArrayTypeOrHigher();
+        }
         function parseUnionOrIntersectionType(kind, parseConstituentType, operator) {
             var type = parseConstituentType();
             if (token() === operator) {
@@ -13705,10 +15087,10 @@ var ts;
             return type;
         }
         function parseIntersectionTypeOrHigher() {
-            return parseUnionOrIntersectionType(164, parseArrayTypeOrHigher, 47);
+            return parseUnionOrIntersectionType(165, parseTypeOperatorOrHigher, 47);
         }
         function parseUnionTypeOrHigher() {
-            return parseUnionOrIntersectionType(163, parseIntersectionTypeOrHigher, 48);
+            return parseUnionOrIntersectionType(164, parseIntersectionTypeOrHigher, 48);
         }
         function isStartOfFunctionType() {
             if (token() === 26) {
@@ -13754,7 +15136,7 @@ var ts;
             var typePredicateVariable = isIdentifier() && tryParse(parseTypePredicatePrefix);
             var type = parseType();
             if (typePredicateVariable) {
-                var node = createNode(155, typePredicateVariable.pos);
+                var node = createNode(156, typePredicateVariable.pos);
                 node.parameterName = typePredicateVariable;
                 node.type = type;
                 return finishNode(node);
@@ -13771,14 +15153,14 @@ var ts;
             }
         }
         function parseType() {
-            return doOutsideOfContext(327680, parseTypeWorker);
+            return doOutsideOfContext(655360, parseTypeWorker);
         }
         function parseTypeWorker() {
             if (isStartOfFunctionType()) {
-                return parseFunctionOrConstructorType(157);
+                return parseFunctionOrConstructorType(158);
             }
             if (token() === 93) {
-                return parseFunctionOrConstructorType(158);
+                return parseFunctionOrConstructorType(159);
             }
             return parseUnionTypeOrHigher();
         }
@@ -13897,7 +15279,7 @@ var ts;
             return !scanner.hasPrecedingLineBreak() && isIdentifier();
         }
         function parseYieldExpression() {
-            var node = createNode(191);
+            var node = createNode(195);
             nextToken();
             if (!scanner.hasPrecedingLineBreak() &&
                 (token() === 38 || isStartOfExpression())) {
@@ -13913,13 +15295,13 @@ var ts;
             ts.Debug.assert(token() === 35, "parseSimpleArrowFunctionExpression should only have been called if we had a =>");
             var node;
             if (asyncModifier) {
-                node = createNode(181, asyncModifier.pos);
+                node = createNode(185, asyncModifier.pos);
                 node.modifiers = asyncModifier;
             }
             else {
-                node = createNode(181, identifier.pos);
+                node = createNode(185, identifier.pos);
             }
-            var parameter = createNode(143, identifier.pos);
+            var parameter = createNode(144, identifier.pos);
             parameter.name = identifier;
             finishNode(parameter);
             node.parameters = createNodeArray([parameter], parameter.pos);
@@ -14053,7 +15435,7 @@ var ts;
             return 0;
         }
         function parseParenthesizedArrowFunctionExpressionHead(allowAmbiguity) {
-            var node = createNode(181);
+            var node = createNode(185);
             node.modifiers = parseModifiersForArrowFunction();
             var isAsync = !!(ts.getModifierFlags(node) & 256);
             fillSignature(55, false, isAsync, !allowAmbiguity, node);
@@ -14085,7 +15467,7 @@ var ts;
             if (!questionToken) {
                 return leftOperand;
             }
-            var node = createNode(189, leftOperand.pos);
+            var node = createNode(193, leftOperand.pos);
             node.condition = leftOperand;
             node.questionToken = questionToken;
             node.whenTrue = doOutsideOfContext(disallowInAndDecoratorContext, parseAssignmentExpressionOrHigher);
@@ -14098,7 +15480,7 @@ var ts;
             return parseBinaryExpressionRest(precedence, leftOperand);
         }
         function isInOrOfKeyword(t) {
-            return t === 91 || t === 139;
+            return t === 91 || t === 140;
         }
         function parseBinaryExpressionRest(precedence, leftOperand) {
             while (true) {
@@ -14176,39 +15558,39 @@ var ts;
             return -1;
         }
         function makeBinaryExpression(left, operatorToken, right) {
-            var node = createNode(188, left.pos);
+            var node = createNode(192, left.pos);
             node.left = left;
             node.operatorToken = operatorToken;
             node.right = right;
             return finishNode(node);
         }
         function makeAsExpression(left, right) {
-            var node = createNode(196, left.pos);
+            var node = createNode(200, left.pos);
             node.expression = left;
             node.type = right;
             return finishNode(node);
         }
         function parsePrefixUnaryExpression() {
-            var node = createNode(186);
+            var node = createNode(190);
             node.operator = token();
             nextToken();
             node.operand = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseDeleteExpression() {
-            var node = createNode(182);
+            var node = createNode(186);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseTypeOfExpression() {
-            var node = createNode(183);
+            var node = createNode(187);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseVoidExpression() {
-            var node = createNode(184);
+            var node = createNode(188);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
@@ -14223,7 +15605,7 @@ var ts;
             return false;
         }
         function parseAwaitExpression() {
-            var node = createNode(185);
+            var node = createNode(189);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
@@ -14239,7 +15621,7 @@ var ts;
             var simpleUnaryExpression = parseSimpleUnaryExpression();
             if (token() === 39) {
                 var start = ts.skipTrivia(sourceText, simpleUnaryExpression.pos);
-                if (simpleUnaryExpression.kind === 178) {
+                if (simpleUnaryExpression.kind === 182) {
                     parseErrorAtPosition(start, simpleUnaryExpression.end - start, 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 {
@@ -14292,7 +15674,7 @@ var ts;
         }
         function parseIncrementExpression() {
             if (token() === 42 || token() === 43) {
-                var node = createNode(186);
+                var node = createNode(190);
                 node.operator = token();
                 nextToken();
                 node.operand = parseLeftHandSideExpressionOrHigher();
@@ -14304,7 +15686,7 @@ var ts;
             var expression = parseLeftHandSideExpressionOrHigher();
             ts.Debug.assert(ts.isLeftHandSideExpression(expression));
             if ((token() === 42 || token() === 43) && !scanner.hasPrecedingLineBreak()) {
-                var node = createNode(187, expression.pos);
+                var node = createNode(191, expression.pos);
                 node.operand = expression;
                 node.operator = token();
                 nextToken();
@@ -14327,7 +15709,7 @@ var ts;
             if (token() === 18 || token() === 22 || token() === 20) {
                 return expression;
             }
-            var node = createNode(173, expression.pos);
+            var node = createNode(177, expression.pos);
             node.expression = expression;
             parseExpectedToken(22, false, ts.Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access);
             node.name = parseRightSideOfDot(true);
@@ -14349,8 +15731,8 @@ var ts;
         function parseJsxElementOrSelfClosingElement(inExpressionContext) {
             var opening = parseJsxOpeningOrSelfClosingElement(inExpressionContext);
             var result;
-            if (opening.kind === 244) {
-                var node = createNode(242, opening.pos);
+            if (opening.kind === 248) {
+                var node = createNode(246, opening.pos);
                 node.openingElement = opening;
                 node.children = parseJsxChildren(node.openingElement.tagName);
                 node.closingElement = parseJsxClosingElement(inExpressionContext);
@@ -14360,14 +15742,14 @@ var ts;
                 result = finishNode(node);
             }
             else {
-                ts.Debug.assert(opening.kind === 243);
+                ts.Debug.assert(opening.kind === 247);
                 result = opening;
             }
             if (inExpressionContext && token() === 26) {
                 var invalidElement = tryParse(function () { return parseJsxElementOrSelfClosingElement(true); });
                 if (invalidElement) {
                     parseErrorAtCurrentToken(ts.Diagnostics.JSX_expressions_must_have_one_parent_element);
-                    var badNode = createNode(188, result.pos);
+                    var badNode = createNode(192, result.pos);
                     badNode.end = invalidElement.end;
                     badNode.left = result;
                     badNode.right = invalidElement;
@@ -14420,7 +15802,7 @@ var ts;
             var attributes = parseList(13, parseJsxAttribute);
             var node;
             if (token() === 28) {
-                node = createNode(244, fullStart);
+                node = createNode(248, fullStart);
                 scanJsxText();
             }
             else {
@@ -14432,7 +15814,7 @@ var ts;
                     parseExpected(28, undefined, false);
                     scanJsxText();
                 }
-                node = createNode(243, fullStart);
+                node = createNode(247, fullStart);
             }
             node.tagName = tagName;
             node.attributes = attributes;
@@ -14443,7 +15825,7 @@ var ts;
             var expression = token() === 98 ?
                 parseTokenNode() : parseIdentifierName();
             while (parseOptional(22)) {
-                var propertyAccess = createNode(173, expression.pos);
+                var propertyAccess = createNode(177, expression.pos);
                 propertyAccess.expression = expression;
                 propertyAccess.name = parseRightSideOfDot(true);
                 expression = finishNode(propertyAccess);
@@ -14451,7 +15833,7 @@ var ts;
             return expression;
         }
         function parseJsxExpression(inExpressionContext) {
-            var node = createNode(248);
+            var node = createNode(252);
             parseExpected(16);
             if (token() !== 17) {
                 node.expression = parseAssignmentExpressionOrHigher();
@@ -14470,7 +15852,7 @@ var ts;
                 return parseJsxSpreadAttribute();
             }
             scanJsxIdentifier();
-            var node = createNode(246);
+            var node = createNode(250);
             node.name = parseIdentifierName();
             if (token() === 57) {
                 switch (scanJsxAttributeValue()) {
@@ -14485,7 +15867,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxSpreadAttribute() {
-            var node = createNode(247);
+            var node = createNode(251);
             parseExpected(16);
             parseExpected(23);
             node.expression = parseExpression();
@@ -14493,7 +15875,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxClosingElement(inExpressionContext) {
-            var node = createNode(245);
+            var node = createNode(249);
             parseExpected(27);
             node.tagName = parseJsxElementName();
             if (inExpressionContext) {
@@ -14506,7 +15888,7 @@ var ts;
             return finishNode(node);
         }
         function parseTypeAssertion() {
-            var node = createNode(178);
+            var node = createNode(182);
             parseExpected(26);
             node.type = parseType();
             parseExpected(28);
@@ -14517,7 +15899,7 @@ var ts;
             while (true) {
                 var dotToken = parseOptionalToken(22);
                 if (dotToken) {
-                    var propertyAccess = createNode(173, expression.pos);
+                    var propertyAccess = createNode(177, expression.pos);
                     propertyAccess.expression = expression;
                     propertyAccess.name = parseRightSideOfDot(true);
                     expression = finishNode(propertyAccess);
@@ -14525,13 +15907,13 @@ var ts;
                 }
                 if (token() === 50 && !scanner.hasPrecedingLineBreak()) {
                     nextToken();
-                    var nonNullExpression = createNode(197, expression.pos);
+                    var nonNullExpression = createNode(201, expression.pos);
                     nonNullExpression.expression = expression;
                     expression = finishNode(nonNullExpression);
                     continue;
                 }
                 if (!inDecoratorContext() && parseOptional(20)) {
-                    var indexedAccess = createNode(174, expression.pos);
+                    var indexedAccess = createNode(178, expression.pos);
                     indexedAccess.expression = expression;
                     if (token() !== 21) {
                         indexedAccess.argumentExpression = allowInAnd(parseExpression);
@@ -14545,7 +15927,7 @@ var ts;
                     continue;
                 }
                 if (token() === 12 || token() === 13) {
-                    var tagExpression = createNode(177, expression.pos);
+                    var tagExpression = createNode(181, expression.pos);
                     tagExpression.tag = expression;
                     tagExpression.template = token() === 12
                         ? parseLiteralNode()
@@ -14564,7 +15946,7 @@ var ts;
                     if (!typeArguments) {
                         return expression;
                     }
-                    var callExpr = createNode(175, expression.pos);
+                    var callExpr = createNode(179, expression.pos);
                     callExpr.expression = expression;
                     callExpr.typeArguments = typeArguments;
                     callExpr.arguments = parseArgumentList();
@@ -14572,7 +15954,7 @@ var ts;
                     continue;
                 }
                 else if (token() === 18) {
-                    var callExpr = createNode(175, expression.pos);
+                    var callExpr = createNode(179, expression.pos);
                     callExpr.expression = expression;
                     callExpr.arguments = parseArgumentList();
                     expression = finishNode(callExpr);
@@ -14591,7 +15973,7 @@ var ts;
             if (!parseOptional(26)) {
                 return undefined;
             }
-            var typeArguments = parseDelimitedList(18, parseType);
+            var typeArguments = parseDelimitedList(19, parseType);
             if (!parseExpected(28)) {
                 return undefined;
             }
@@ -14667,28 +16049,28 @@ var ts;
             return parseIdentifier(ts.Diagnostics.Expression_expected);
         }
         function parseParenthesizedExpression() {
-            var node = createNode(179);
+            var node = createNode(183);
             parseExpected(18);
             node.expression = allowInAnd(parseExpression);
             parseExpected(19);
             return finishNode(node);
         }
         function parseSpreadElement() {
-            var node = createNode(192);
+            var node = createNode(196);
             parseExpected(23);
             node.expression = parseAssignmentExpressionOrHigher();
             return finishNode(node);
         }
         function parseArgumentOrArrayLiteralElement() {
             return token() === 23 ? parseSpreadElement() :
-                token() === 25 ? createNode(194) :
+                token() === 25 ? createNode(198) :
                     parseAssignmentExpressionOrHigher();
         }
         function parseArgumentExpression() {
             return doOutsideOfContext(disallowInAndDecoratorContext, parseArgumentOrArrayLiteralElement);
         }
         function parseArrayLiteralExpression() {
-            var node = createNode(171);
+            var node = createNode(175);
             parseExpected(20);
             if (scanner.hasPrecedingLineBreak()) {
                 node.multiLine = true;
@@ -14699,15 +16081,21 @@ var ts;
         }
         function tryParseAccessorDeclaration(fullStart, decorators, modifiers) {
             if (parseContextualModifier(124)) {
-                return parseAccessorDeclaration(150, fullStart, decorators, modifiers);
-            }
-            else if (parseContextualModifier(132)) {
                 return parseAccessorDeclaration(151, fullStart, decorators, modifiers);
             }
+            else if (parseContextualModifier(133)) {
+                return parseAccessorDeclaration(152, fullStart, decorators, modifiers);
+            }
             return undefined;
         }
         function parseObjectLiteralElement() {
             var fullStart = scanner.getStartPos();
+            var dotDotDotToken = parseOptionalToken(23);
+            if (dotDotDotToken) {
+                var spreadElement = createNode(259, fullStart);
+                spreadElement.expression = parseAssignmentExpressionOrHigher();
+                return addJSDocComment(finishNode(spreadElement));
+            }
             var decorators = parseDecorators();
             var modifiers = parseModifiers();
             var accessor = tryParseAccessorDeclaration(fullStart, decorators, modifiers);
@@ -14723,7 +16111,7 @@ var ts;
             }
             var isShorthandPropertyAssignment = tokenIsIdentifier && (token() === 25 || token() === 17 || token() === 57);
             if (isShorthandPropertyAssignment) {
-                var shorthandDeclaration = createNode(254, fullStart);
+                var shorthandDeclaration = createNode(258, fullStart);
                 shorthandDeclaration.name = propertyName;
                 shorthandDeclaration.questionToken = questionToken;
                 var equalsToken = parseOptionalToken(57);
@@ -14734,7 +16122,7 @@ var ts;
                 return addJSDocComment(finishNode(shorthandDeclaration));
             }
             else {
-                var propertyAssignment = createNode(253, fullStart);
+                var propertyAssignment = createNode(257, fullStart);
                 propertyAssignment.modifiers = modifiers;
                 propertyAssignment.name = propertyName;
                 propertyAssignment.questionToken = questionToken;
@@ -14744,7 +16132,7 @@ var ts;
             }
         }
         function parseObjectLiteralExpression() {
-            var node = createNode(172);
+            var node = createNode(176);
             parseExpected(16);
             if (scanner.hasPrecedingLineBreak()) {
                 node.multiLine = true;
@@ -14758,7 +16146,7 @@ var ts;
             if (saveDecoratorContext) {
                 setDecoratorContext(false);
             }
-            var node = createNode(180);
+            var node = createNode(184);
             node.modifiers = parseModifiers();
             parseExpected(88);
             node.asteriskToken = parseOptionalToken(38);
@@ -14780,7 +16168,7 @@ var ts;
             return isIdentifier() ? parseIdentifier() : undefined;
         }
         function parseNewExpression() {
-            var node = createNode(176);
+            var node = createNode(180);
             parseExpected(93);
             node.expression = parseMemberExpressionOrHigher();
             node.typeArguments = tryParse(parseTypeArgumentsInExpression);
@@ -14790,7 +16178,7 @@ var ts;
             return finishNode(node);
         }
         function parseBlock(ignoreMissingOpenBrace, diagnosticMessage) {
-            var node = createNode(200);
+            var node = createNode(204);
             if (parseExpected(16, diagnosticMessage) || ignoreMissingOpenBrace) {
                 if (scanner.hasPrecedingLineBreak()) {
                     node.multiLine = true;
@@ -14821,12 +16209,12 @@ var ts;
             return block;
         }
         function parseEmptyStatement() {
-            var node = createNode(202);
+            var node = createNode(206);
             parseExpected(24);
             return finishNode(node);
         }
         function parseIfStatement() {
-            var node = createNode(204);
+            var node = createNode(208);
             parseExpected(89);
             parseExpected(18);
             node.expression = allowInAnd(parseExpression);
@@ -14836,7 +16224,7 @@ var ts;
             return finishNode(node);
         }
         function parseDoStatement() {
-            var node = createNode(205);
+            var node = createNode(209);
             parseExpected(80);
             node.statement = parseStatement();
             parseExpected(105);
@@ -14847,7 +16235,7 @@ var ts;
             return finishNode(node);
         }
         function parseWhileStatement() {
-            var node = createNode(206);
+            var node = createNode(210);
             parseExpected(105);
             parseExpected(18);
             node.expression = allowInAnd(parseExpression);
@@ -14870,21 +16258,21 @@ var ts;
             }
             var forOrForInOrForOfStatement;
             if (parseOptional(91)) {
-                var forInStatement = createNode(208, pos);
+                var forInStatement = createNode(212, pos);
                 forInStatement.initializer = initializer;
                 forInStatement.expression = allowInAnd(parseExpression);
                 parseExpected(19);
                 forOrForInOrForOfStatement = forInStatement;
             }
-            else if (parseOptional(139)) {
-                var forOfStatement = createNode(209, pos);
+            else if (parseOptional(140)) {
+                var forOfStatement = createNode(213, pos);
                 forOfStatement.initializer = initializer;
                 forOfStatement.expression = allowInAnd(parseAssignmentExpressionOrHigher);
                 parseExpected(19);
                 forOrForInOrForOfStatement = forOfStatement;
             }
             else {
-                var forStatement = createNode(207, pos);
+                var forStatement = createNode(211, pos);
                 forStatement.initializer = initializer;
                 parseExpected(24);
                 if (token() !== 24 && token() !== 19) {
@@ -14902,7 +16290,7 @@ var ts;
         }
         function parseBreakOrContinueStatement(kind) {
             var node = createNode(kind);
-            parseExpected(kind === 211 ? 71 : 76);
+            parseExpected(kind === 215 ? 71 : 76);
             if (!canParseSemicolon()) {
                 node.label = parseIdentifier();
             }
@@ -14910,7 +16298,7 @@ var ts;
             return finishNode(node);
         }
         function parseReturnStatement() {
-            var node = createNode(212);
+            var node = createNode(216);
             parseExpected(95);
             if (!canParseSemicolon()) {
                 node.expression = allowInAnd(parseExpression);
@@ -14919,7 +16307,7 @@ var ts;
             return finishNode(node);
         }
         function parseWithStatement() {
-            var node = createNode(213);
+            var node = createNode(217);
             parseExpected(106);
             parseExpected(18);
             node.expression = allowInAnd(parseExpression);
@@ -14928,7 +16316,7 @@ var ts;
             return finishNode(node);
         }
         function parseCaseClause() {
-            var node = createNode(249);
+            var node = createNode(253);
             parseExpected(72);
             node.expression = allowInAnd(parseExpression);
             parseExpected(55);
@@ -14936,7 +16324,7 @@ var ts;
             return finishNode(node);
         }
         function parseDefaultClause() {
-            var node = createNode(250);
+            var node = createNode(254);
             parseExpected(78);
             parseExpected(55);
             node.statements = parseList(3, parseStatement);
@@ -14946,12 +16334,12 @@ var ts;
             return token() === 72 ? parseCaseClause() : parseDefaultClause();
         }
         function parseSwitchStatement() {
-            var node = createNode(214);
+            var node = createNode(218);
             parseExpected(97);
             parseExpected(18);
             node.expression = allowInAnd(parseExpression);
             parseExpected(19);
-            var caseBlock = createNode(228, scanner.getStartPos());
+            var caseBlock = createNode(232, scanner.getStartPos());
             parseExpected(16);
             caseBlock.clauses = parseList(2, parseCaseOrDefaultClause);
             parseExpected(17);
@@ -14959,14 +16347,14 @@ var ts;
             return finishNode(node);
         }
         function parseThrowStatement() {
-            var node = createNode(216);
+            var node = createNode(220);
             parseExpected(99);
             node.expression = scanner.hasPrecedingLineBreak() ? undefined : allowInAnd(parseExpression);
             parseSemicolon();
             return finishNode(node);
         }
         function parseTryStatement() {
-            var node = createNode(217);
+            var node = createNode(221);
             parseExpected(101);
             node.tryBlock = parseBlock(false);
             node.catchClause = token() === 73 ? parseCatchClause() : undefined;
@@ -14977,7 +16365,7 @@ var ts;
             return finishNode(node);
         }
         function parseCatchClause() {
-            var result = createNode(252);
+            var result = createNode(256);
             parseExpected(73);
             if (parseExpected(18)) {
                 result.variableDeclaration = parseVariableDeclaration();
@@ -14987,7 +16375,7 @@ var ts;
             return finishNode(result);
         }
         function parseDebuggerStatement() {
-            var node = createNode(218);
+            var node = createNode(222);
             parseExpected(77);
             parseSemicolon();
             return finishNode(node);
@@ -14996,13 +16384,13 @@ var ts;
             var fullStart = scanner.getStartPos();
             var expression = allowInAnd(parseExpression);
             if (expression.kind === 70 && parseOptional(55)) {
-                var labeledStatement = createNode(215, fullStart);
+                var labeledStatement = createNode(219, fullStart);
                 labeledStatement.label = expression;
                 labeledStatement.statement = parseStatement();
                 return addJSDocComment(finishNode(labeledStatement));
             }
             else {
-                var expressionStatement = createNode(203, fullStart);
+                var expressionStatement = createNode(207, fullStart);
                 expressionStatement.expression = expression;
                 parseSemicolon();
                 return addJSDocComment(finishNode(expressionStatement));
@@ -15031,10 +16419,10 @@ var ts;
                     case 82:
                         return true;
                     case 108:
-                    case 135:
+                    case 136:
                         return nextTokenIsIdentifierOnSameLine();
-                    case 126:
                     case 127:
+                    case 128:
                         return nextTokenIsIdentifierOrStringLiteralOnSameLine();
                     case 116:
                     case 119:
@@ -15042,13 +16430,13 @@ var ts;
                     case 111:
                     case 112:
                     case 113:
-                    case 129:
+                    case 130:
                         nextToken();
                         if (scanner.hasPrecedingLineBreak()) {
                             return false;
                         }
                         continue;
-                    case 138:
+                    case 139:
                         nextToken();
                         return token() === 16 || token() === 70 || token() === 83;
                     case 90:
@@ -15106,16 +16494,16 @@ var ts;
                 case 119:
                 case 123:
                 case 108:
-                case 126:
                 case 127:
-                case 135:
-                case 138:
+                case 128:
+                case 136:
+                case 139:
                     return true;
                 case 113:
                 case 111:
                 case 112:
                 case 114:
-                case 129:
+                case 130:
                     return isStartOfDeclaration() || !lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine);
                 default:
                     return isStartOfExpression();
@@ -15154,9 +16542,9 @@ var ts;
                 case 87:
                     return parseForOrForInOrForOfStatement();
                 case 76:
-                    return parseBreakOrContinueStatement(210);
+                    return parseBreakOrContinueStatement(214);
                 case 71:
-                    return parseBreakOrContinueStatement(211);
+                    return parseBreakOrContinueStatement(215);
                 case 95:
                     return parseReturnStatement();
                 case 106:
@@ -15175,9 +16563,9 @@ var ts;
                     return parseDeclaration();
                 case 119:
                 case 108:
-                case 135:
-                case 126:
+                case 136:
                 case 127:
+                case 128:
                 case 123:
                 case 75:
                 case 82:
@@ -15188,8 +16576,8 @@ var ts;
                 case 113:
                 case 116:
                 case 114:
-                case 129:
-                case 138:
+                case 130:
+                case 139:
                     if (isStartOfDeclaration()) {
                         return parseDeclaration();
                     }
@@ -15212,13 +16600,13 @@ var ts;
                     return parseClassDeclaration(fullStart, decorators, modifiers);
                 case 108:
                     return parseInterfaceDeclaration(fullStart, decorators, modifiers);
-                case 135:
+                case 136:
                     return parseTypeAliasDeclaration(fullStart, decorators, modifiers);
                 case 82:
                     return parseEnumDeclaration(fullStart, decorators, modifiers);
-                case 138:
-                case 126:
+                case 139:
                 case 127:
+                case 128:
                     return parseModuleDeclaration(fullStart, decorators, modifiers);
                 case 90:
                     return parseImportDeclarationOrImportEqualsDeclaration(fullStart, decorators, modifiers);
@@ -15235,7 +16623,7 @@ var ts;
                     }
                 default:
                     if (decorators || modifiers) {
-                        var node = createMissingNode(240, true, ts.Diagnostics.Declaration_expected);
+                        var node = createMissingNode(244, true, ts.Diagnostics.Declaration_expected);
                         node.pos = fullStart;
                         node.decorators = decorators;
                         node.modifiers = modifiers;
@@ -15256,16 +16644,17 @@ var ts;
         }
         function parseArrayBindingElement() {
             if (token() === 25) {
-                return createNode(194);
+                return createNode(198);
             }
-            var node = createNode(170);
+            var node = createNode(174);
             node.dotDotDotToken = parseOptionalToken(23);
             node.name = parseIdentifierOrPattern();
             node.initializer = parseBindingElementInitializer(false);
             return finishNode(node);
         }
         function parseObjectBindingElement() {
-            var node = createNode(170);
+            var node = createNode(174);
+            node.dotDotDotToken = parseOptionalToken(23);
             var tokenIsIdentifier = isIdentifier();
             var propertyName = parsePropertyName();
             if (tokenIsIdentifier && token() !== 55) {
@@ -15280,14 +16669,14 @@ var ts;
             return finishNode(node);
         }
         function parseObjectBindingPattern() {
-            var node = createNode(168);
+            var node = createNode(172);
             parseExpected(16);
             node.elements = parseDelimitedList(9, parseObjectBindingElement);
             parseExpected(17);
             return finishNode(node);
         }
         function parseArrayBindingPattern() {
-            var node = createNode(169);
+            var node = createNode(173);
             parseExpected(20);
             node.elements = parseDelimitedList(10, parseArrayBindingElement);
             parseExpected(21);
@@ -15306,7 +16695,7 @@ var ts;
             return parseIdentifier();
         }
         function parseVariableDeclaration() {
-            var node = createNode(219);
+            var node = createNode(223);
             node.name = parseIdentifierOrPattern();
             node.type = parseTypeAnnotation();
             if (!isInOrOfKeyword(token())) {
@@ -15315,7 +16704,7 @@ var ts;
             return finishNode(node);
         }
         function parseVariableDeclarationList(inForStatementInitializer) {
-            var node = createNode(220);
+            var node = createNode(224);
             switch (token()) {
                 case 103:
                     break;
@@ -15329,7 +16718,7 @@ var ts;
                     ts.Debug.fail();
             }
             nextToken();
-            if (token() === 139 && lookAhead(canFollowContextualOfKeyword)) {
+            if (token() === 140 && lookAhead(canFollowContextualOfKeyword)) {
                 node.declarations = createMissingList();
             }
             else {
@@ -15344,7 +16733,7 @@ var ts;
             return nextTokenIsIdentifier() && nextToken() === 19;
         }
         function parseVariableStatement(fullStart, decorators, modifiers) {
-            var node = createNode(201, fullStart);
+            var node = createNode(205, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             node.declarationList = parseVariableDeclarationList(false);
@@ -15352,7 +16741,7 @@ var ts;
             return addJSDocComment(finishNode(node));
         }
         function parseFunctionDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(221, fullStart);
+            var node = createNode(225, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             parseExpected(88);
@@ -15365,7 +16754,7 @@ var ts;
             return addJSDocComment(finishNode(node));
         }
         function parseConstructorDeclaration(pos, decorators, modifiers) {
-            var node = createNode(149, pos);
+            var node = createNode(150, pos);
             node.decorators = decorators;
             node.modifiers = modifiers;
             parseExpected(122);
@@ -15374,7 +16763,7 @@ var ts;
             return addJSDocComment(finishNode(node));
         }
         function parseMethodDeclaration(fullStart, decorators, modifiers, asteriskToken, name, questionToken, diagnosticMessage) {
-            var method = createNode(148, fullStart);
+            var method = createNode(149, fullStart);
             method.decorators = decorators;
             method.modifiers = modifiers;
             method.asteriskToken = asteriskToken;
@@ -15387,7 +16776,7 @@ var ts;
             return addJSDocComment(finishNode(method));
         }
         function parsePropertyDeclaration(fullStart, decorators, modifiers, name, questionToken) {
-            var property = createNode(146, fullStart);
+            var property = createNode(147, fullStart);
             property.decorators = decorators;
             property.modifiers = modifiers;
             property.name = name;
@@ -15395,7 +16784,7 @@ var ts;
             property.type = parseTypeAnnotation();
             property.initializer = ts.hasModifier(property, 32)
                 ? allowInAnd(parseNonParameterInitializer)
-                : doOutsideOfContext(65536 | 32768, parseNonParameterInitializer);
+                : doOutsideOfContext(131072 | 65536, parseNonParameterInitializer);
             parseSemicolon();
             return addJSDocComment(finishNode(property));
         }
@@ -15428,7 +16817,7 @@ var ts;
                 case 111:
                 case 112:
                 case 114:
-                case 129:
+                case 130:
                     return true;
                 default:
                     return false;
@@ -15457,7 +16846,7 @@ var ts;
                 return true;
             }
             if (idToken !== undefined) {
-                if (!ts.isKeyword(idToken) || idToken === 132 || idToken === 124) {
+                if (!ts.isKeyword(idToken) || idToken === 133 || idToken === 124) {
                     return true;
                 }
                 switch (token()) {
@@ -15480,7 +16869,7 @@ var ts;
                 if (!parseOptional(56)) {
                     break;
                 }
-                var decorator = createNode(144, decoratorStart);
+                var decorator = createNode(145, decoratorStart);
                 decorator.expression = doInDecoratorContext(parseLeftHandSideExpressionOrHigher);
                 finishNode(decorator);
                 if (!decorators) {
@@ -15537,7 +16926,7 @@ var ts;
         }
         function parseClassElement() {
             if (token() === 24) {
-                var result = createNode(199);
+                var result = createNode(203);
                 nextToken();
                 return finishNode(result);
             }
@@ -15562,16 +16951,16 @@ var ts;
                 return parsePropertyOrMethodDeclaration(fullStart, decorators, modifiers);
             }
             if (decorators || modifiers) {
-                var name_10 = createMissingNode(70, true, ts.Diagnostics.Declaration_expected);
-                return parsePropertyDeclaration(fullStart, decorators, modifiers, name_10, undefined);
+                var name_16 = createMissingNode(70, true, ts.Diagnostics.Declaration_expected);
+                return parsePropertyDeclaration(fullStart, decorators, modifiers, name_16, undefined);
             }
             ts.Debug.fail("Should not have attempted to parse class member declaration.");
         }
         function parseClassExpression() {
-            return parseClassDeclarationOrExpression(scanner.getStartPos(), undefined, undefined, 193);
+            return parseClassDeclarationOrExpression(scanner.getStartPos(), undefined, undefined, 197);
         }
         function parseClassDeclaration(fullStart, decorators, modifiers) {
-            return parseClassDeclarationOrExpression(fullStart, decorators, modifiers, 222);
+            return parseClassDeclarationOrExpression(fullStart, decorators, modifiers, 226);
         }
         function parseClassDeclarationOrExpression(fullStart, decorators, modifiers, kind) {
             var node = createNode(kind, fullStart);
@@ -15600,13 +16989,13 @@ var ts;
         }
         function parseHeritageClauses() {
             if (isHeritageClause()) {
-                return parseList(20, parseHeritageClause);
+                return parseList(21, parseHeritageClause);
             }
             return undefined;
         }
         function parseHeritageClause() {
             if (token() === 84 || token() === 107) {
-                var node = createNode(251);
+                var node = createNode(255);
                 node.token = token();
                 nextToken();
                 node.types = parseDelimitedList(7, parseExpressionWithTypeArguments);
@@ -15615,10 +17004,10 @@ var ts;
             return undefined;
         }
         function parseExpressionWithTypeArguments() {
-            var node = createNode(195);
+            var node = createNode(199);
             node.expression = parseLeftHandSideExpressionOrHigher();
             if (token() === 26) {
-                node.typeArguments = parseBracketedList(18, parseType, 26, 28);
+                node.typeArguments = parseBracketedList(19, parseType, 26, 28);
             }
             return finishNode(node);
         }
@@ -15629,7 +17018,7 @@ var ts;
             return parseList(5, parseClassElement);
         }
         function parseInterfaceDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(223, fullStart);
+            var node = createNode(227, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             parseExpected(108);
@@ -15640,10 +17029,10 @@ var ts;
             return addJSDocComment(finishNode(node));
         }
         function parseTypeAliasDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(224, fullStart);
+            var node = createNode(228, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
-            parseExpected(135);
+            parseExpected(136);
             node.name = parseIdentifier();
             node.typeParameters = parseTypeParameters();
             parseExpected(57);
@@ -15652,13 +17041,13 @@ var ts;
             return addJSDocComment(finishNode(node));
         }
         function parseEnumMember() {
-            var node = createNode(255, scanner.getStartPos());
+            var node = createNode(260, scanner.getStartPos());
             node.name = parsePropertyName();
             node.initializer = allowInAnd(parseNonParameterInitializer);
             return addJSDocComment(finishNode(node));
         }
         function parseEnumDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(225, fullStart);
+            var node = createNode(229, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             parseExpected(82);
@@ -15673,7 +17062,7 @@ var ts;
             return addJSDocComment(finishNode(node));
         }
         function parseModuleBlock() {
-            var node = createNode(227, scanner.getStartPos());
+            var node = createNode(231, scanner.getStartPos());
             if (parseExpected(16)) {
                 node.statements = parseList(1, parseStatement);
                 parseExpected(17);
@@ -15684,7 +17073,7 @@ var ts;
             return finishNode(node);
         }
         function parseModuleOrNamespaceDeclaration(fullStart, decorators, modifiers, flags) {
-            var node = createNode(226, fullStart);
+            var node = createNode(230, fullStart);
             var namespaceFlag = flags & 16;
             node.decorators = decorators;
             node.modifiers = modifiers;
@@ -15696,10 +17085,10 @@ var ts;
             return addJSDocComment(finishNode(node));
         }
         function parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(226, fullStart);
+            var node = createNode(230, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
-            if (token() === 138) {
+            if (token() === 139) {
                 node.name = parseIdentifier();
                 node.flags |= 512;
             }
@@ -15716,14 +17105,14 @@ var ts;
         }
         function parseModuleDeclaration(fullStart, decorators, modifiers) {
             var flags = 0;
-            if (token() === 138) {
+            if (token() === 139) {
                 return parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers);
             }
-            else if (parseOptional(127)) {
+            else if (parseOptional(128)) {
                 flags |= 16;
             }
             else {
-                parseExpected(126);
+                parseExpected(127);
                 if (token() === 9) {
                     return parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers);
                 }
@@ -15731,7 +17120,7 @@ var ts;
             return parseModuleOrNamespaceDeclaration(fullStart, decorators, modifiers, flags);
         }
         function isExternalModuleReference() {
-            return token() === 130 &&
+            return token() === 131 &&
                 lookAhead(nextTokenIsOpenParen);
         }
         function nextTokenIsOpenParen() {
@@ -15741,13 +17130,13 @@ var ts;
             return nextToken() === 40;
         }
         function parseNamespaceExportDeclaration(fullStart, decorators, modifiers) {
-            var exportDeclaration = createNode(229, fullStart);
+            var exportDeclaration = createNode(233, fullStart);
             exportDeclaration.decorators = decorators;
             exportDeclaration.modifiers = modifiers;
             parseExpected(117);
-            parseExpected(127);
+            parseExpected(128);
             exportDeclaration.name = parseIdentifier();
-            parseExpected(24);
+            parseSemicolon();
             return finishNode(exportDeclaration);
         }
         function parseImportDeclarationOrImportEqualsDeclaration(fullStart, decorators, modifiers) {
@@ -15756,8 +17145,8 @@ var ts;
             var identifier;
             if (isIdentifier()) {
                 identifier = parseIdentifier();
-                if (token() !== 25 && token() !== 137) {
-                    var importEqualsDeclaration = createNode(230, fullStart);
+                if (token() !== 25 && token() !== 138) {
+                    var importEqualsDeclaration = createNode(234, fullStart);
                     importEqualsDeclaration.decorators = decorators;
                     importEqualsDeclaration.modifiers = modifiers;
                     importEqualsDeclaration.name = identifier;
@@ -15767,27 +17156,27 @@ var ts;
                     return addJSDocComment(finishNode(importEqualsDeclaration));
                 }
             }
-            var importDeclaration = createNode(231, fullStart);
+            var importDeclaration = createNode(235, fullStart);
             importDeclaration.decorators = decorators;
             importDeclaration.modifiers = modifiers;
             if (identifier ||
                 token() === 38 ||
                 token() === 16) {
                 importDeclaration.importClause = parseImportClause(identifier, afterImportPos);
-                parseExpected(137);
+                parseExpected(138);
             }
             importDeclaration.moduleSpecifier = parseModuleSpecifier();
             parseSemicolon();
             return finishNode(importDeclaration);
         }
         function parseImportClause(identifier, fullStart) {
-            var importClause = createNode(232, fullStart);
+            var importClause = createNode(236, fullStart);
             if (identifier) {
                 importClause.name = identifier;
             }
             if (!importClause.name ||
                 parseOptional(25)) {
-                importClause.namedBindings = token() === 38 ? parseNamespaceImport() : parseNamedImportsOrExports(234);
+                importClause.namedBindings = token() === 38 ? parseNamespaceImport() : parseNamedImportsOrExports(238);
             }
             return finishNode(importClause);
         }
@@ -15797,8 +17186,8 @@ var ts;
                 : parseEntityName(false);
         }
         function parseExternalModuleReference() {
-            var node = createNode(241);
-            parseExpected(130);
+            var node = createNode(245);
+            parseExpected(131);
             parseExpected(18);
             node.expression = parseModuleSpecifier();
             parseExpected(19);
@@ -15815,7 +17204,7 @@ var ts;
             }
         }
         function parseNamespaceImport() {
-            var namespaceImport = createNode(233);
+            var namespaceImport = createNode(237);
             parseExpected(38);
             parseExpected(117);
             namespaceImport.name = parseIdentifier();
@@ -15823,14 +17212,14 @@ var ts;
         }
         function parseNamedImportsOrExports(kind) {
             var node = createNode(kind);
-            node.elements = parseBracketedList(21, kind === 234 ? parseImportSpecifier : parseExportSpecifier, 16, 17);
+            node.elements = parseBracketedList(22, kind === 238 ? parseImportSpecifier : parseExportSpecifier, 16, 17);
             return finishNode(node);
         }
         function parseExportSpecifier() {
-            return parseImportOrExportSpecifier(239);
+            return parseImportOrExportSpecifier(243);
         }
         function parseImportSpecifier() {
-            return parseImportOrExportSpecifier(235);
+            return parseImportOrExportSpecifier(239);
         }
         function parseImportOrExportSpecifier(kind) {
             var node = createNode(kind);
@@ -15849,23 +17238,23 @@ var ts;
             else {
                 node.name = identifierName;
             }
-            if (kind === 235 && checkIdentifierIsKeyword) {
+            if (kind === 239 && checkIdentifierIsKeyword) {
                 parseErrorAtPosition(checkIdentifierStart, checkIdentifierEnd - checkIdentifierStart, ts.Diagnostics.Identifier_expected);
             }
             return finishNode(node);
         }
         function parseExportDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(237, fullStart);
+            var node = createNode(241, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             if (parseOptional(38)) {
-                parseExpected(137);
+                parseExpected(138);
                 node.moduleSpecifier = parseModuleSpecifier();
             }
             else {
-                node.exportClause = parseNamedImportsOrExports(238);
-                if (token() === 137 || (token() === 9 && !scanner.hasPrecedingLineBreak())) {
-                    parseExpected(137);
+                node.exportClause = parseNamedImportsOrExports(242);
+                if (token() === 138 || (token() === 9 && !scanner.hasPrecedingLineBreak())) {
+                    parseExpected(138);
                     node.moduleSpecifier = parseModuleSpecifier();
                 }
             }
@@ -15873,7 +17262,7 @@ var ts;
             return finishNode(node);
         }
         function parseExportAssignment(fullStart, decorators, modifiers) {
-            var node = createNode(236, fullStart);
+            var node = createNode(240, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             if (parseOptional(57)) {
@@ -15952,50 +17341,14 @@ var ts;
         function setExternalModuleIndicator(sourceFile) {
             sourceFile.externalModuleIndicator = ts.forEach(sourceFile.statements, function (node) {
                 return ts.hasModifier(node, 1)
-                    || node.kind === 230 && node.moduleReference.kind === 241
-                    || node.kind === 231
-                    || node.kind === 236
-                    || node.kind === 237
+                    || node.kind === 234 && node.moduleReference.kind === 245
+                    || node.kind === 235
+                    || node.kind === 240
+                    || node.kind === 241
                     ? node
                     : undefined;
             });
         }
-        var ParsingContext;
-        (function (ParsingContext) {
-            ParsingContext[ParsingContext["SourceElements"] = 0] = "SourceElements";
-            ParsingContext[ParsingContext["BlockStatements"] = 1] = "BlockStatements";
-            ParsingContext[ParsingContext["SwitchClauses"] = 2] = "SwitchClauses";
-            ParsingContext[ParsingContext["SwitchClauseStatements"] = 3] = "SwitchClauseStatements";
-            ParsingContext[ParsingContext["TypeMembers"] = 4] = "TypeMembers";
-            ParsingContext[ParsingContext["ClassMembers"] = 5] = "ClassMembers";
-            ParsingContext[ParsingContext["EnumMembers"] = 6] = "EnumMembers";
-            ParsingContext[ParsingContext["HeritageClauseElement"] = 7] = "HeritageClauseElement";
-            ParsingContext[ParsingContext["VariableDeclarations"] = 8] = "VariableDeclarations";
-            ParsingContext[ParsingContext["ObjectBindingElements"] = 9] = "ObjectBindingElements";
-            ParsingContext[ParsingContext["ArrayBindingElements"] = 10] = "ArrayBindingElements";
-            ParsingContext[ParsingContext["ArgumentExpressions"] = 11] = "ArgumentExpressions";
-            ParsingContext[ParsingContext["ObjectLiteralMembers"] = 12] = "ObjectLiteralMembers";
-            ParsingContext[ParsingContext["JsxAttributes"] = 13] = "JsxAttributes";
-            ParsingContext[ParsingContext["JsxChildren"] = 14] = "JsxChildren";
-            ParsingContext[ParsingContext["ArrayLiteralMembers"] = 15] = "ArrayLiteralMembers";
-            ParsingContext[ParsingContext["Parameters"] = 16] = "Parameters";
-            ParsingContext[ParsingContext["TypeParameters"] = 17] = "TypeParameters";
-            ParsingContext[ParsingContext["TypeArguments"] = 18] = "TypeArguments";
-            ParsingContext[ParsingContext["TupleElementTypes"] = 19] = "TupleElementTypes";
-            ParsingContext[ParsingContext["HeritageClauses"] = 20] = "HeritageClauses";
-            ParsingContext[ParsingContext["ImportOrExportSpecifiers"] = 21] = "ImportOrExportSpecifiers";
-            ParsingContext[ParsingContext["JSDocFunctionParameters"] = 22] = "JSDocFunctionParameters";
-            ParsingContext[ParsingContext["JSDocTypeArguments"] = 23] = "JSDocTypeArguments";
-            ParsingContext[ParsingContext["JSDocRecordMembers"] = 24] = "JSDocRecordMembers";
-            ParsingContext[ParsingContext["JSDocTupleTypes"] = 25] = "JSDocTupleTypes";
-            ParsingContext[ParsingContext["Count"] = 26] = "Count";
-        })(ParsingContext || (ParsingContext = {}));
-        var Tristate;
-        (function (Tristate) {
-            Tristate[Tristate["False"] = 0] = "False";
-            Tristate[Tristate["True"] = 1] = "True";
-            Tristate[Tristate["Unknown"] = 2] = "Unknown";
-        })(Tristate || (Tristate = {}));
         var JSDocParser;
         (function (JSDocParser) {
             function isJSDocType() {
@@ -16016,8 +17369,8 @@ var ts;
             }
             JSDocParser.isJSDocType = isJSDocType;
             function parseJSDocTypeExpressionForTests(content, start, length) {
-                initializeState(content, 4, undefined, 1);
-                sourceFile = createSourceFile("file.js", 4, 1);
+                initializeState(content, 5, undefined, 1);
+                sourceFile = createSourceFile("file.js", 5, 1);
                 scanner.setText(content, start, length);
                 currentToken = scanner.scan();
                 var jsDocTypeExpression = parseJSDocTypeExpression();
@@ -16027,7 +17380,7 @@ var ts;
             }
             JSDocParser.parseJSDocTypeExpressionForTests = parseJSDocTypeExpressionForTests;
             function parseJSDocTypeExpression() {
-                var result = createNode(257, scanner.getTokenPos());
+                var result = createNode(262, scanner.getTokenPos());
                 parseExpected(16);
                 result.type = parseJSDocTopLevelType();
                 parseExpected(17);
@@ -16038,12 +17391,12 @@ var ts;
             function parseJSDocTopLevelType() {
                 var type = parseJSDocType();
                 if (token() === 48) {
-                    var unionType = createNode(261, type.pos);
+                    var unionType = createNode(266, type.pos);
                     unionType.types = parseJSDocTypeList(type);
                     type = finishNode(unionType);
                 }
                 if (token() === 57) {
-                    var optionalType = createNode(268, type.pos);
+                    var optionalType = createNode(273, type.pos);
                     nextToken();
                     optionalType.type = type;
                     type = finishNode(optionalType);
@@ -16054,20 +17407,20 @@ var ts;
                 var type = parseBasicTypeExpression();
                 while (true) {
                     if (token() === 20) {
-                        var arrayType = createNode(260, type.pos);
+                        var arrayType = createNode(265, type.pos);
                         arrayType.elementType = type;
                         nextToken();
                         parseExpected(21);
                         type = finishNode(arrayType);
                     }
                     else if (token() === 54) {
-                        var nullableType = createNode(263, type.pos);
+                        var nullableType = createNode(268, type.pos);
                         nullableType.type = type;
                         nextToken();
                         type = finishNode(nullableType);
                     }
                     else if (token() === 50) {
-                        var nonNullableType = createNode(264, type.pos);
+                        var nonNullableType = createNode(269, type.pos);
                         nonNullableType.type = type;
                         nextToken();
                         type = finishNode(nonNullableType);
@@ -16101,14 +17454,14 @@ var ts;
                     case 98:
                         return parseJSDocThisType();
                     case 118:
-                    case 133:
-                    case 131:
-                    case 121:
                     case 134:
+                    case 132:
+                    case 121:
+                    case 135:
                     case 104:
                     case 94:
-                    case 136:
-                    case 128:
+                    case 137:
+                    case 129:
                         return parseTokenNode();
                     case 9:
                     case 8:
@@ -16119,30 +17472,30 @@ var ts;
                 return parseJSDocTypeReference();
             }
             function parseJSDocThisType() {
-                var result = createNode(272);
+                var result = createNode(277);
                 nextToken();
                 parseExpected(55);
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocConstructorType() {
-                var result = createNode(271);
+                var result = createNode(276);
                 nextToken();
                 parseExpected(55);
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocVariadicType() {
-                var result = createNode(270);
+                var result = createNode(275);
                 nextToken();
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocFunctionType() {
-                var result = createNode(269);
+                var result = createNode(274);
                 nextToken();
                 parseExpected(18);
-                result.parameters = parseDelimitedList(22, parseJSDocParameter);
+                result.parameters = parseDelimitedList(23, parseJSDocParameter);
                 checkForTrailingComma(result.parameters);
                 parseExpected(19);
                 if (token() === 55) {
@@ -16152,7 +17505,7 @@ var ts;
                 return finishNode(result);
             }
             function parseJSDocParameter() {
-                var parameter = createNode(143);
+                var parameter = createNode(144);
                 parameter.type = parseJSDocType();
                 if (parseOptional(57)) {
                     parameter.questionToken = createNode(57);
@@ -16160,7 +17513,7 @@ var ts;
                 return finishNode(parameter);
             }
             function parseJSDocTypeReference() {
-                var result = createNode(267);
+                var result = createNode(272);
                 result.name = parseSimplePropertyName();
                 if (token() === 26) {
                     result.typeArguments = parseTypeArguments();
@@ -16180,7 +17533,7 @@ var ts;
             }
             function parseTypeArguments() {
                 nextToken();
-                var typeArguments = parseDelimitedList(23, parseJSDocType);
+                var typeArguments = parseDelimitedList(24, parseJSDocType);
                 checkForTrailingComma(typeArguments);
                 checkForEmptyTypeArgumentList(typeArguments);
                 parseExpected(28);
@@ -16194,26 +17547,26 @@ var ts;
                 }
             }
             function parseQualifiedName(left) {
-                var result = createNode(140, left.pos);
+                var result = createNode(141, left.pos);
                 result.left = left;
                 result.right = parseIdentifierName();
                 return finishNode(result);
             }
             function parseJSDocRecordType() {
-                var result = createNode(265);
+                var result = createNode(270);
                 result.literal = parseTypeLiteral();
                 return finishNode(result);
             }
             function parseJSDocNonNullableType() {
-                var result = createNode(264);
+                var result = createNode(269);
                 nextToken();
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocTupleType() {
-                var result = createNode(262);
+                var result = createNode(267);
                 nextToken();
-                result.types = parseDelimitedList(25, parseJSDocType);
+                result.types = parseDelimitedList(26, parseJSDocType);
                 checkForTrailingComma(result.types);
                 parseExpected(21);
                 return finishNode(result);
@@ -16225,7 +17578,7 @@ var ts;
                 }
             }
             function parseJSDocUnionType() {
-                var result = createNode(261);
+                var result = createNode(266);
                 nextToken();
                 result.types = parseJSDocTypeList(parseJSDocType());
                 parseExpected(19);
@@ -16241,12 +17594,12 @@ var ts;
                 return types;
             }
             function parseJSDocAllType() {
-                var result = createNode(258);
+                var result = createNode(263);
                 nextToken();
                 return finishNode(result);
             }
             function parseJSDocLiteralType() {
-                var result = createNode(282);
+                var result = createNode(287);
                 result.literal = parseLiteralTypeNode();
                 return finishNode(result);
             }
@@ -16259,17 +17612,17 @@ var ts;
                     token() === 28 ||
                     token() === 57 ||
                     token() === 48) {
-                    var result = createNode(259, pos);
+                    var result = createNode(264, pos);
                     return finishNode(result);
                 }
                 else {
-                    var result = createNode(263, pos);
+                    var result = createNode(268, pos);
                     result.type = parseJSDocType();
                     return finishNode(result);
                 }
             }
             function parseIsolatedJSDocComment(content, start, length) {
-                initializeState(content, 4, undefined, 1);
+                initializeState(content, 5, undefined, 1);
                 sourceFile = { languageVariant: 0, text: content };
                 var jsDoc = parseJSDocCommentWorker(start, length);
                 var diagnostics = parseDiagnostics;
@@ -16291,12 +17644,6 @@ var ts;
                 return comment;
             }
             JSDocParser.parseJSDocComment = parseJSDocComment;
-            var JSDocState;
-            (function (JSDocState) {
-                JSDocState[JSDocState["BeginningOfLine"] = 0] = "BeginningOfLine";
-                JSDocState[JSDocState["SawAsterisk"] = 1] = "SawAsterisk";
-                JSDocState[JSDocState["SavingComments"] = 2] = "SavingComments";
-            })(JSDocState || (JSDocState = {}));
             function parseJSDocCommentWorker(start, length) {
                 var content = sourceText;
                 start = start || 0;
@@ -16329,6 +17676,7 @@ var ts;
                     }
                     if (token() === 4) {
                         state = 0;
+                        indent = 0;
                         nextJSDocToken();
                     }
                     while (token() !== 1) {
@@ -16408,7 +17756,7 @@ var ts;
                         content.charCodeAt(start + 3) !== 42;
                 }
                 function createJSDocComment() {
-                    var result = createNode(273, start);
+                    var result = createNode(278, start);
                     result.tags = tags;
                     result.comment = comments.length ? comments.join("") : undefined;
                     return finishNode(result, end);
@@ -16515,7 +17863,7 @@ var ts;
                     return comments;
                 }
                 function parseUnknownTag(atToken, tagName) {
-                    var result = createNode(274, atToken.pos);
+                    var result = createNode(279, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     return finishNode(result);
@@ -16570,7 +17918,7 @@ var ts;
                     if (!typeExpression) {
                         typeExpression = tryParseTypeExpression();
                     }
-                    var result = createNode(275, atToken.pos);
+                    var result = createNode(280, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.preParameterName = preName;
@@ -16581,20 +17929,20 @@ var ts;
                     return finishNode(result);
                 }
                 function parseReturnTag(atToken, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 276; })) {
+                    if (ts.forEach(tags, function (t) { return t.kind === 281; })) {
                         parseErrorAtPosition(tagName.pos, scanner.getTokenPos() - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
                     }
-                    var result = createNode(276, atToken.pos);
+                    var result = createNode(281, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.typeExpression = tryParseTypeExpression();
                     return finishNode(result);
                 }
                 function parseTypeTag(atToken, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 277; })) {
+                    if (ts.forEach(tags, function (t) { return t.kind === 282; })) {
                         parseErrorAtPosition(tagName.pos, scanner.getTokenPos() - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
                     }
-                    var result = createNode(277, atToken.pos);
+                    var result = createNode(282, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.typeExpression = tryParseTypeExpression();
@@ -16609,7 +17957,7 @@ var ts;
                         parseErrorAtPosition(scanner.getStartPos(), 0, ts.Diagnostics.Identifier_expected);
                         return undefined;
                     }
-                    var result = createNode(280, atToken.pos);
+                    var result = createNode(285, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.name = name;
@@ -16619,18 +17967,25 @@ var ts;
                 function parseTypedefTag(atToken, tagName) {
                     var typeExpression = tryParseTypeExpression();
                     skipWhitespace();
-                    var typedefTag = createNode(279, atToken.pos);
+                    var typedefTag = createNode(284, atToken.pos);
                     typedefTag.atToken = atToken;
                     typedefTag.tagName = tagName;
-                    typedefTag.name = parseJSDocIdentifierName();
+                    typedefTag.fullName = parseJSDocTypeNameWithNamespace(0);
+                    if (typedefTag.fullName) {
+                        var rightNode = typedefTag.fullName;
+                        while (rightNode.kind !== 70) {
+                            rightNode = rightNode.body;
+                        }
+                        typedefTag.name = rightNode;
+                    }
                     typedefTag.typeExpression = typeExpression;
                     skipWhitespace();
                     if (typeExpression) {
-                        if (typeExpression.type.kind === 267) {
+                        if (typeExpression.type.kind === 272) {
                             var jsDocTypeReference = typeExpression.type;
                             if (jsDocTypeReference.name.kind === 70) {
-                                var name_11 = jsDocTypeReference.name;
-                                if (name_11.text === "Object") {
+                                var name_17 = jsDocTypeReference.name;
+                                if (name_17.text === "Object") {
                                     typedefTag.jsDocTypeLiteral = scanChildTags();
                                 }
                             }
@@ -16644,7 +17999,7 @@ var ts;
                     }
                     return finishNode(typedefTag);
                     function scanChildTags() {
-                        var jsDocTypeLiteral = createNode(281, scanner.getStartPos());
+                        var jsDocTypeLiteral = createNode(286, scanner.getStartPos());
                         var resumePos = scanner.getStartPos();
                         var canParseTag = true;
                         var seenAsterisk = false;
@@ -16681,6 +18036,21 @@ var ts;
                         scanner.setTextPos(resumePos);
                         return finishNode(jsDocTypeLiteral);
                     }
+                    function parseJSDocTypeNameWithNamespace(flags) {
+                        var pos = scanner.getTokenPos();
+                        var typeNameOrNamespaceName = parseJSDocIdentifierName();
+                        if (typeNameOrNamespaceName && parseOptional(22)) {
+                            var jsDocNamespaceNode = createNode(230, pos);
+                            jsDocNamespaceNode.flags |= flags;
+                            jsDocNamespaceNode.name = typeNameOrNamespaceName;
+                            jsDocNamespaceNode.body = parseJSDocTypeNameWithNamespace(4);
+                            return jsDocNamespaceNode;
+                        }
+                        if (typeNameOrNamespaceName && flags & 4) {
+                            typeNameOrNamespaceName.isInJSDocNamespace = true;
+                        }
+                        return typeNameOrNamespaceName;
+                    }
                 }
                 function tryParseChildTag(parentTag) {
                     ts.Debug.assert(token() === 56);
@@ -16701,29 +18071,32 @@ var ts;
                             return true;
                         case "prop":
                         case "property":
-                            if (!parentTag.jsDocPropertyTags) {
-                                parentTag.jsDocPropertyTags = [];
-                            }
                             var propertyTag = parsePropertyTag(atToken, tagName);
-                            parentTag.jsDocPropertyTags.push(propertyTag);
-                            return true;
+                            if (propertyTag) {
+                                if (!parentTag.jsDocPropertyTags) {
+                                    parentTag.jsDocPropertyTags = [];
+                                }
+                                parentTag.jsDocPropertyTags.push(propertyTag);
+                                return true;
+                            }
+                            return false;
                     }
                     return false;
                 }
                 function parseTemplateTag(atToken, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 278; })) {
+                    if (ts.forEach(tags, function (t) { return t.kind === 283; })) {
                         parseErrorAtPosition(tagName.pos, scanner.getTokenPos() - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
                     }
                     var typeParameters = createNodeArray();
                     while (true) {
-                        var name_12 = parseJSDocIdentifierName();
+                        var name_18 = parseJSDocIdentifierName();
                         skipWhitespace();
-                        if (!name_12) {
+                        if (!name_18) {
                             parseErrorAtPosition(scanner.getStartPos(), 0, ts.Diagnostics.Identifier_expected);
                             return undefined;
                         }
-                        var typeParameter = createNode(142, name_12.pos);
-                        typeParameter.name = name_12;
+                        var typeParameter = createNode(143, name_18.pos);
+                        typeParameter.name = name_18;
                         finishNode(typeParameter);
                         typeParameters.push(typeParameter);
                         if (token() === 25) {
@@ -16734,7 +18107,7 @@ var ts;
                             break;
                         }
                     }
-                    var result = createNode(278, atToken.pos);
+                    var result = createNode(283, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.typeParameters = typeParameters;
@@ -17048,31 +18421,21 @@ var ts;
                 }
             }
         }
-        var InvalidPosition;
-        (function (InvalidPosition) {
-            InvalidPosition[InvalidPosition["Value"] = -1] = "Value";
-        })(InvalidPosition || (InvalidPosition = {}));
     })(IncrementalParser || (IncrementalParser = {}));
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    (function (ModuleInstanceState) {
-        ModuleInstanceState[ModuleInstanceState["NonInstantiated"] = 0] = "NonInstantiated";
-        ModuleInstanceState[ModuleInstanceState["Instantiated"] = 1] = "Instantiated";
-        ModuleInstanceState[ModuleInstanceState["ConstEnumOnly"] = 2] = "ConstEnumOnly";
-    })(ts.ModuleInstanceState || (ts.ModuleInstanceState = {}));
-    var ModuleInstanceState = ts.ModuleInstanceState;
     function getModuleInstanceState(node) {
-        if (node.kind === 223 || node.kind === 224) {
+        if (node.kind === 227 || node.kind === 228) {
             return 0;
         }
         else if (ts.isConstEnumDeclaration(node)) {
             return 2;
         }
-        else if ((node.kind === 231 || node.kind === 230) && !(ts.hasModifier(node, 1))) {
+        else if ((node.kind === 235 || node.kind === 234) && !(ts.hasModifier(node, 1))) {
             return 0;
         }
-        else if (node.kind === 227) {
+        else if (node.kind === 231) {
             var state_1 = 0;
             ts.forEachChild(node, function (n) {
                 switch (getModuleInstanceState(n)) {
@@ -17088,27 +18451,18 @@ var ts;
             });
             return state_1;
         }
-        else if (node.kind === 226) {
+        else if (node.kind === 230) {
             var body = node.body;
             return body ? getModuleInstanceState(body) : 1;
         }
+        else if (node.kind === 70 && node.isInJSDocNamespace) {
+            return 0;
+        }
         else {
             return 1;
         }
     }
     ts.getModuleInstanceState = getModuleInstanceState;
-    var ContainerFlags;
-    (function (ContainerFlags) {
-        ContainerFlags[ContainerFlags["None"] = 0] = "None";
-        ContainerFlags[ContainerFlags["IsContainer"] = 1] = "IsContainer";
-        ContainerFlags[ContainerFlags["IsBlockScopedContainer"] = 2] = "IsBlockScopedContainer";
-        ContainerFlags[ContainerFlags["IsControlFlowContainer"] = 4] = "IsControlFlowContainer";
-        ContainerFlags[ContainerFlags["IsFunctionLike"] = 8] = "IsFunctionLike";
-        ContainerFlags[ContainerFlags["IsFunctionExpression"] = 16] = "IsFunctionExpression";
-        ContainerFlags[ContainerFlags["HasLocals"] = 32] = "HasLocals";
-        ContainerFlags[ContainerFlags["IsInterface"] = 64] = "IsInterface";
-        ContainerFlags[ContainerFlags["IsObjectLiteralOrClassExpressionMethod"] = 128] = "IsObjectLiteralOrClassExpressionMethod";
-    })(ContainerFlags || (ContainerFlags = {}));
     var binder = createBinder();
     function bindSourceFile(file, options) {
         ts.performance.mark("beforeBind");
@@ -17206,7 +18560,7 @@ var ts;
             if (symbolFlags & 107455) {
                 var valueDeclaration = symbol.valueDeclaration;
                 if (!valueDeclaration ||
-                    (valueDeclaration.kind !== node.kind && valueDeclaration.kind === 226)) {
+                    (valueDeclaration.kind !== node.kind && valueDeclaration.kind === 230)) {
                     symbol.valueDeclaration = node;
                 }
             }
@@ -17216,7 +18570,7 @@ var ts;
                 if (ts.isAmbientModule(node)) {
                     return ts.isGlobalScopeAugmentation(node) ? "__global" : "\"" + node.name.text + "\"";
                 }
-                if (node.name.kind === 141) {
+                if (node.name.kind === 142) {
                     var nameExpression = node.name.expression;
                     if (ts.isStringOrNumericLiteral(nameExpression.kind)) {
                         return nameExpression.text;
@@ -17227,21 +18581,21 @@ var ts;
                 return node.name.text;
             }
             switch (node.kind) {
-                case 149:
+                case 150:
                     return "__constructor";
-                case 157:
-                case 152:
-                    return "__call";
                 case 158:
                 case 153:
-                    return "__new";
+                    return "__call";
+                case 159:
                 case 154:
+                    return "__new";
+                case 155:
                     return "__index";
-                case 237:
+                case 241:
                     return "__export";
-                case 236:
+                case 240:
                     return node.isExportEquals ? "export=" : "default";
-                case 188:
+                case 192:
                     switch (ts.getSpecialPropertyAssignmentKind(node)) {
                         case 2:
                             return "export=";
@@ -17253,20 +18607,20 @@ var ts;
                     }
                     ts.Debug.fail("Unknown binary declaration kind");
                     break;
-                case 221:
-                case 222:
+                case 225:
+                case 226:
                     return ts.hasModifier(node, 512) ? "default" : undefined;
-                case 269:
+                case 274:
                     return ts.isJSDocConstructSignature(node) ? "__new" : "__call";
-                case 143:
-                    ts.Debug.assert(node.parent.kind === 269);
+                case 144:
+                    ts.Debug.assert(node.parent.kind === 274);
                     var functionType = node.parent;
                     var index = ts.indexOf(functionType.parameters, node);
                     return "arg" + index;
-                case 279:
+                case 284:
                     var parentNode = node.parent && node.parent.parent;
                     var nameFromParentNode = void 0;
-                    if (parentNode && parentNode.kind === 201) {
+                    if (parentNode && parentNode.kind === 205) {
                         if (parentNode.declarationList.declarations.length > 0) {
                             var nameIdentifier = parentNode.declarationList.declarations[0].name;
                             if (nameIdentifier.kind === 70) {
@@ -17310,7 +18664,7 @@ var ts;
                             }
                             else {
                                 if (symbol.declarations && symbol.declarations.length &&
-                                    (isDefaultExport || (node.kind === 236 && !node.isExportEquals))) {
+                                    (isDefaultExport || (node.kind === 240 && !node.isExportEquals))) {
                                     message_1 = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
                                 }
                             }
@@ -17330,7 +18684,7 @@ var ts;
         function declareModuleMember(node, symbolFlags, symbolExcludes) {
             var hasExportModifier = ts.getCombinedModifierFlags(node) & 1;
             if (symbolFlags & 8388608) {
-                if (node.kind === 239 || (node.kind === 230 && hasExportModifier)) {
+                if (node.kind === 243 || (node.kind === 234 && hasExportModifier)) {
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
                 }
                 else {
@@ -17338,7 +18692,11 @@ var ts;
                 }
             }
             else {
-                if (!ts.isAmbientModule(node) && (hasExportModifier || container.flags & 32)) {
+                var isJSDocTypedefInJSDocNamespace = node.kind === 284 &&
+                    node.name &&
+                    node.name.kind === 70 &&
+                    node.name.isInJSDocNamespace;
+                if ((!ts.isAmbientModule(node) && (hasExportModifier || container.flags & 32)) || isJSDocTypedefInJSDocNamespace) {
                     var exportKind = (symbolFlags & 107455 ? 1048576 : 0) |
                         (symbolFlags & 793064 ? 2097152 : 0) |
                         (symbolFlags & 1920 ? 4194304 : 0);
@@ -17373,7 +18731,7 @@ var ts;
                 var saveReturnTarget = currentReturnTarget;
                 var saveActiveLabels = activeLabels;
                 var saveHasExplicitReturn = hasExplicitReturn;
-                var isIIFE = containerFlags & 16 && !!ts.getImmediatelyInvokedFunctionExpression(node);
+                var isIIFE = containerFlags & 16 && !ts.hasModifier(node, 256) && !!ts.getImmediatelyInvokedFunctionExpression(node);
                 if (isIIFE) {
                     currentReturnTarget = createBranchLabel();
                 }
@@ -17389,13 +18747,13 @@ var ts;
                 activeLabels = undefined;
                 hasExplicitReturn = false;
                 bindChildren(node);
-                node.flags &= ~32128;
+                node.flags &= ~64896;
                 if (!(currentFlow.flags & 1) && containerFlags & 8 && ts.nodeIsPresent(node.body)) {
                     node.flags |= 128;
                     if (hasExplicitReturn)
                         node.flags |= 256;
                 }
-                if (node.kind === 256) {
+                if (node.kind === 261) {
                     node.flags |= emitFlags;
                 }
                 if (isIIFE) {
@@ -17430,6 +18788,7 @@ var ts;
                 skipTransformFlagAggregation = true;
                 bindChildrenWorker(node);
                 skipTransformFlagAggregation = false;
+                subtreeTransformFlags |= node.transformFlags & ~getTransformFlagsSubtreeExclusions(node.kind);
             }
             else {
                 var savedSubtreeTransformFlags = subtreeTransformFlags;
@@ -17447,64 +18806,64 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 206:
+                case 210:
                     bindWhileStatement(node);
                     break;
-                case 205:
+                case 209:
                     bindDoStatement(node);
                     break;
-                case 207:
+                case 211:
                     bindForStatement(node);
                     break;
-                case 208:
-                case 209:
+                case 212:
+                case 213:
                     bindForInOrForOfStatement(node);
                     break;
-                case 204:
+                case 208:
                     bindIfStatement(node);
                     break;
-                case 212:
                 case 216:
+                case 220:
                     bindReturnOrThrow(node);
                     break;
-                case 211:
-                case 210:
+                case 215:
+                case 214:
                     bindBreakOrContinueStatement(node);
                     break;
-                case 217:
+                case 221:
                     bindTryStatement(node);
                     break;
-                case 214:
+                case 218:
                     bindSwitchStatement(node);
                     break;
-                case 228:
+                case 232:
                     bindCaseBlock(node);
                     break;
-                case 249:
+                case 253:
                     bindCaseClause(node);
                     break;
-                case 215:
+                case 219:
                     bindLabeledStatement(node);
                     break;
-                case 186:
+                case 190:
                     bindPrefixUnaryExpressionFlow(node);
                     break;
-                case 187:
+                case 191:
                     bindPostfixUnaryExpressionFlow(node);
                     break;
-                case 188:
+                case 192:
                     bindBinaryExpressionFlow(node);
                     break;
-                case 182:
+                case 186:
                     bindDeleteExpressionFlow(node);
                     break;
-                case 189:
+                case 193:
                     bindConditionalExpressionFlow(node);
                     break;
-                case 219:
+                case 223:
                     bindVariableDeclarationFlow(node);
                     break;
-                case 175:
+                case 179:
                     bindCallExpressionFlow(node);
                     break;
                 default:
@@ -17516,15 +18875,15 @@ var ts;
             switch (expr.kind) {
                 case 70:
                 case 98:
-                case 173:
+                case 177:
                     return isNarrowableReference(expr);
-                case 175:
-                    return hasNarrowableArgument(expr);
                 case 179:
+                    return hasNarrowableArgument(expr);
+                case 183:
                     return isNarrowingExpression(expr.expression);
-                case 188:
+                case 192:
                     return isNarrowingBinaryExpression(expr);
-                case 186:
+                case 190:
                     return expr.operator === 50 && isNarrowingExpression(expr.operand);
             }
             return false;
@@ -17532,7 +18891,7 @@ var ts;
         function isNarrowableReference(expr) {
             return expr.kind === 70 ||
                 expr.kind === 98 ||
-                expr.kind === 173 && isNarrowableReference(expr.expression);
+                expr.kind === 177 && isNarrowableReference(expr.expression);
         }
         function hasNarrowableArgument(expr) {
             if (expr.arguments) {
@@ -17543,14 +18902,14 @@ var ts;
                     }
                 }
             }
-            if (expr.expression.kind === 173 &&
+            if (expr.expression.kind === 177 &&
                 isNarrowableReference(expr.expression.expression)) {
                 return true;
             }
             return false;
         }
         function isNarrowingTypeofOperands(expr1, expr2) {
-            return expr1.kind === 183 && isNarrowableOperand(expr1.expression) && expr2.kind === 9;
+            return expr1.kind === 187 && isNarrowableOperand(expr1.expression) && expr2.kind === 9;
         }
         function isNarrowingBinaryExpression(expr) {
             switch (expr.operatorToken.kind) {
@@ -17571,9 +18930,9 @@ var ts;
         }
         function isNarrowableOperand(expr) {
             switch (expr.kind) {
-                case 179:
+                case 183:
                     return isNarrowableOperand(expr.expression);
-                case 188:
+                case 192:
                     switch (expr.operatorToken.kind) {
                         case 57:
                             return isNarrowableOperand(expr.left);
@@ -17667,33 +19026,33 @@ var ts;
         function isStatementCondition(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 204:
-                case 206:
-                case 205:
+                case 208:
+                case 210:
+                case 209:
                     return parent.expression === node;
-                case 207:
-                case 189:
+                case 211:
+                case 193:
                     return parent.condition === node;
             }
             return false;
         }
         function isLogicalExpression(node) {
             while (true) {
-                if (node.kind === 179) {
+                if (node.kind === 183) {
                     node = node.expression;
                 }
-                else if (node.kind === 186 && node.operator === 50) {
+                else if (node.kind === 190 && node.operator === 50) {
                     node = node.operand;
                 }
                 else {
-                    return node.kind === 188 && (node.operatorToken.kind === 52 ||
+                    return node.kind === 192 && (node.operatorToken.kind === 52 ||
                         node.operatorToken.kind === 53);
                 }
             }
         }
         function isTopLevelLogicalExpression(node) {
-            while (node.parent.kind === 179 ||
-                node.parent.kind === 186 &&
+            while (node.parent.kind === 183 ||
+                node.parent.kind === 190 &&
                     node.parent.operator === 50) {
                 node = node.parent;
             }
@@ -17735,8 +19094,11 @@ var ts;
         }
         function bindDoStatement(node) {
             var preDoLabel = createLoopLabel();
-            var preConditionLabel = createBranchLabel();
-            var postDoLabel = createBranchLabel();
+            var enclosingLabeledStatement = node.parent.kind === 219
+                ? ts.lastOrUndefined(activeLabels)
+                : undefined;
+            var preConditionLabel = enclosingLabeledStatement ? enclosingLabeledStatement.continueTarget : createBranchLabel();
+            var postDoLabel = enclosingLabeledStatement ? enclosingLabeledStatement.breakTarget : createBranchLabel();
             addAntecedent(preDoLabel, currentFlow);
             currentFlow = preDoLabel;
             bindIterativeStatement(node.statement, postDoLabel, preConditionLabel);
@@ -17767,7 +19129,7 @@ var ts;
             bind(node.expression);
             addAntecedent(postLoopLabel, currentFlow);
             bind(node.initializer);
-            if (node.initializer.kind !== 220) {
+            if (node.initializer.kind !== 224) {
                 bindAssignmentTargetFlow(node.initializer);
             }
             bindIterativeStatement(node.statement, postLoopLabel, preLoopLabel);
@@ -17789,7 +19151,7 @@ var ts;
         }
         function bindReturnOrThrow(node) {
             bind(node.expression);
-            if (node.kind === 212) {
+            if (node.kind === 216) {
                 hasExplicitReturn = true;
                 if (currentReturnTarget) {
                     addAntecedent(currentReturnTarget, currentFlow);
@@ -17809,7 +19171,7 @@ var ts;
             return undefined;
         }
         function bindbreakOrContinueFlow(node, breakTarget, continueTarget) {
-            var flowLabel = node.kind === 211 ? breakTarget : continueTarget;
+            var flowLabel = node.kind === 215 ? breakTarget : continueTarget;
             if (flowLabel) {
                 addAntecedent(flowLabel, currentFlow);
                 currentFlow = unreachableFlow;
@@ -17866,7 +19228,7 @@ var ts;
             preSwitchCaseFlow = currentFlow;
             bind(node.caseBlock);
             addAntecedent(postSwitchLabel, currentFlow);
-            var hasDefault = ts.forEach(node.caseBlock.clauses, function (c) { return c.kind === 250; });
+            var hasDefault = ts.forEach(node.caseBlock.clauses, function (c) { return c.kind === 254; });
             node.possiblyExhaustive = !hasDefault && !postSwitchLabel.antecedents;
             if (!hasDefault) {
                 addAntecedent(postSwitchLabel, createFlowSwitchClause(preSwitchCaseFlow, node, 0, 0));
@@ -17927,11 +19289,13 @@ var ts;
             if (!activeLabel.referenced && !options.allowUnusedLabels) {
                 file.bindDiagnostics.push(ts.createDiagnosticForNode(node.label, ts.Diagnostics.Unused_label));
             }
-            addAntecedent(postStatementLabel, currentFlow);
-            currentFlow = finishFlowLabel(postStatementLabel);
+            if (!node.statement || node.statement.kind !== 209) {
+                addAntecedent(postStatementLabel, currentFlow);
+                currentFlow = finishFlowLabel(postStatementLabel);
+            }
         }
         function bindDestructuringTargetFlow(node) {
-            if (node.kind === 188 && node.operatorToken.kind === 57) {
+            if (node.kind === 192 && node.operatorToken.kind === 57) {
                 bindAssignmentTargetFlow(node.left);
             }
             else {
@@ -17942,10 +19306,10 @@ var ts;
             if (isNarrowableReference(node)) {
                 currentFlow = createFlowAssignment(currentFlow, node);
             }
-            else if (node.kind === 171) {
+            else if (node.kind === 175) {
                 for (var _i = 0, _a = node.elements; _i < _a.length; _i++) {
                     var e = _a[_i];
-                    if (e.kind === 192) {
+                    if (e.kind === 196) {
                         bindAssignmentTargetFlow(e.expression);
                     }
                     else {
@@ -17953,15 +19317,18 @@ var ts;
                     }
                 }
             }
-            else if (node.kind === 172) {
+            else if (node.kind === 176) {
                 for (var _b = 0, _c = node.properties; _b < _c.length; _b++) {
                     var p = _c[_b];
-                    if (p.kind === 253) {
+                    if (p.kind === 257) {
                         bindDestructuringTargetFlow(p.initializer);
                     }
-                    else if (p.kind === 254) {
+                    else if (p.kind === 258) {
                         bindAssignmentTargetFlow(p.name);
                     }
+                    else if (p.kind === 259) {
+                        bindAssignmentTargetFlow(p.expression);
+                    }
                 }
             }
         }
@@ -18013,9 +19380,9 @@ var ts;
             }
             else {
                 ts.forEachChild(node, bind);
-                if (operator === 57 && !ts.isAssignmentTarget(node)) {
+                if (ts.isAssignmentOperator(operator) && !ts.isAssignmentTarget(node)) {
                     bindAssignmentTargetFlow(node.left);
-                    if (node.left.kind === 174) {
+                    if (operator === 57 && node.left.kind === 178) {
                         var elementAccess = node.left;
                         if (isNarrowableOperand(elementAccess.expression)) {
                             currentFlow = createFlowArrayMutation(currentFlow, node);
@@ -18026,7 +19393,7 @@ var ts;
         }
         function bindDeleteExpressionFlow(node) {
             ts.forEachChild(node, bind);
-            if (node.expression.kind === 173) {
+            if (node.expression.kind === 177) {
                 bindAssignmentTargetFlow(node.expression);
             }
         }
@@ -18036,9 +19403,11 @@ var ts;
             var postExpressionLabel = createBranchLabel();
             bindCondition(node.condition, trueLabel, falseLabel);
             currentFlow = finishFlowLabel(trueLabel);
+            bind(node.questionToken);
             bind(node.whenTrue);
             addAntecedent(postExpressionLabel, currentFlow);
             currentFlow = finishFlowLabel(falseLabel);
+            bind(node.colonToken);
             bind(node.whenFalse);
             addAntecedent(postExpressionLabel, currentFlow);
             currentFlow = finishFlowLabel(postExpressionLabel);
@@ -18057,16 +19426,16 @@ var ts;
         }
         function bindVariableDeclarationFlow(node) {
             ts.forEachChild(node, bind);
-            if (node.initializer || node.parent.parent.kind === 208 || node.parent.parent.kind === 209) {
+            if (node.initializer || node.parent.parent.kind === 212 || node.parent.parent.kind === 213) {
                 bindInitializedVariableFlow(node);
             }
         }
         function bindCallExpressionFlow(node) {
             var expr = node.expression;
-            while (expr.kind === 179) {
+            while (expr.kind === 183) {
                 expr = expr.expression;
             }
-            if (expr.kind === 180 || expr.kind === 181) {
+            if (expr.kind === 184 || expr.kind === 185) {
                 ts.forEach(node.typeArguments, bind);
                 ts.forEach(node.arguments, bind);
                 bind(node.expression);
@@ -18074,7 +19443,7 @@ var ts;
             else {
                 ts.forEachChild(node, bind);
             }
-            if (node.expression.kind === 173) {
+            if (node.expression.kind === 177) {
                 var propertyAccess = node.expression;
                 if (isNarrowableOperand(propertyAccess.expression) && ts.isPushOrUnshiftIdentifier(propertyAccess.name)) {
                     currentFlow = createFlowArrayMutation(currentFlow, node);
@@ -18083,51 +19452,52 @@ var ts;
         }
         function getContainerFlags(node) {
             switch (node.kind) {
-                case 193:
-                case 222:
-                case 225:
-                case 172:
-                case 160:
-                case 281:
-                case 265:
-                    return 1;
-                case 223:
-                    return 1 | 64;
-                case 269:
+                case 197:
                 case 226:
-                case 224:
+                case 229:
+                case 176:
+                case 161:
+                case 286:
+                case 270:
+                    return 1;
+                case 227:
+                    return 1 | 64;
+                case 274:
+                case 230:
+                case 228:
+                case 170:
                     return 1 | 32;
-                case 256:
+                case 261:
                     return 1 | 4 | 32;
-                case 148:
+                case 149:
                     if (ts.isObjectLiteralOrClassExpressionMethod(node)) {
                         return 1 | 4 | 32 | 8 | 128;
                     }
-                case 149:
-                case 221:
-                case 147:
                 case 150:
+                case 225:
+                case 148:
                 case 151:
                 case 152:
                 case 153:
                 case 154:
-                case 157:
+                case 155:
                 case 158:
+                case 159:
                     return 1 | 4 | 32 | 8;
-                case 180:
-                case 181:
+                case 184:
+                case 185:
                     return 1 | 4 | 32 | 8 | 16;
-                case 227:
+                case 231:
                     return 4;
-                case 146:
+                case 147:
                     return node.initializer ? 4 : 0;
-                case 252:
-                case 207:
-                case 208:
-                case 209:
-                case 228:
+                case 256:
+                case 211:
+                case 212:
+                case 213:
+                case 232:
                     return 2;
-                case 200:
+                case 204:
                     return ts.isFunctionLike(node.parent) ? 0 : 2;
             }
             return 0;
@@ -18143,36 +19513,37 @@ var ts;
         }
         function declareSymbolAndAddToSymbolTableWorker(node, symbolFlags, symbolExcludes) {
             switch (container.kind) {
-                case 226:
+                case 230:
                     return declareModuleMember(node, symbolFlags, symbolExcludes);
-                case 256:
+                case 261:
                     return declareSourceFileMember(node, symbolFlags, symbolExcludes);
-                case 193:
-                case 222:
+                case 197:
+                case 226:
                     return declareClassMember(node, symbolFlags, symbolExcludes);
-                case 225:
+                case 229:
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
-                case 160:
-                case 172:
-                case 223:
-                case 265:
-                case 281:
+                case 161:
+                case 176:
+                case 227:
+                case 270:
+                case 286:
                     return declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
-                case 157:
                 case 158:
-                case 152:
+                case 159:
                 case 153:
                 case 154:
-                case 148:
-                case 147:
+                case 155:
                 case 149:
+                case 148:
                 case 150:
                 case 151:
-                case 221:
-                case 180:
-                case 181:
-                case 269:
-                case 224:
+                case 152:
+                case 225:
+                case 184:
+                case 185:
+                case 274:
+                case 228:
+                case 170:
                     return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes);
             }
         }
@@ -18187,11 +19558,11 @@ var ts;
                 : declareSymbol(file.locals, undefined, node, symbolFlags, symbolExcludes);
         }
         function hasExportDeclarations(node) {
-            var body = node.kind === 256 ? node : node.body;
-            if (body && (body.kind === 256 || body.kind === 227)) {
+            var body = node.kind === 261 ? node : node.body;
+            if (body && (body.kind === 261 || body.kind === 231)) {
                 for (var _i = 0, _a = body.statements; _i < _a.length; _i++) {
                     var stat = _a[_i];
-                    if (stat.kind === 237 || stat.kind === 236) {
+                    if (stat.kind === 241 || stat.kind === 240) {
                         return true;
                     }
                 }
@@ -18263,20 +19634,15 @@ var ts;
             typeLiteralSymbol.members[symbol.name] = symbol;
         }
         function bindObjectLiteralExpression(node) {
-            var ElementKind;
-            (function (ElementKind) {
-                ElementKind[ElementKind["Property"] = 1] = "Property";
-                ElementKind[ElementKind["Accessor"] = 2] = "Accessor";
-            })(ElementKind || (ElementKind = {}));
             if (inStrictMode) {
                 var seen = ts.createMap();
                 for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                     var prop = _a[_i];
-                    if (prop.name.kind !== 70) {
+                    if (prop.kind === 259 || prop.name.kind !== 70) {
                         continue;
                     }
                     var identifier = prop.name;
-                    var currentKind = prop.kind === 253 || prop.kind === 254 || prop.kind === 148
+                    var currentKind = prop.kind === 257 || prop.kind === 258 || prop.kind === 149
                         ? 1
                         : 2;
                     var existingKind = seen[identifier.text];
@@ -18298,10 +19664,10 @@ var ts;
         }
         function bindBlockScopedDeclaration(node, symbolFlags, symbolExcludes) {
             switch (blockScopeContainer.kind) {
-                case 226:
+                case 230:
                     declareModuleMember(node, symbolFlags, symbolExcludes);
                     break;
-                case 256:
+                case 261:
                     if (ts.isExternalModule(container)) {
                         declareModuleMember(node, symbolFlags, symbolExcludes);
                         break;
@@ -18391,8 +19757,8 @@ var ts;
         }
         function checkStrictModeFunctionDeclaration(node) {
             if (languageVersion < 2) {
-                if (blockScopeContainer.kind !== 256 &&
-                    blockScopeContainer.kind !== 226 &&
+                if (blockScopeContainer.kind !== 261 &&
+                    blockScopeContainer.kind !== 230 &&
                     !ts.isFunctionLike(blockScopeContainer)) {
                     var errorSpan = ts.getErrorSpanForNode(file, node);
                     file.bindDiagnostics.push(ts.createFileDiagnostic(file, errorSpan.start, errorSpan.length, getStrictModeBlockScopeFunctionDeclarationMessage(node)));
@@ -18435,7 +19801,7 @@ var ts;
             node.parent = parent;
             var saveInStrictMode = inStrictMode;
             bindWorker(node);
-            if (node.kind > 139) {
+            if (node.kind > 140) {
                 var saveParent = parent;
                 parent = node;
                 var containerFlags = getContainerFlags(node);
@@ -18473,17 +19839,25 @@ var ts;
         function bindWorker(node) {
             switch (node.kind) {
                 case 70:
+                    if (node.isInJSDocNamespace) {
+                        var parentNode = node.parent;
+                        while (parentNode && parentNode.kind !== 284) {
+                            parentNode = parentNode.parent;
+                        }
+                        bindBlockScopedDeclaration(parentNode, 524288, 793064);
+                        break;
+                    }
                 case 98:
-                    if (currentFlow && (ts.isExpression(node) || parent.kind === 254)) {
+                    if (currentFlow && (ts.isExpression(node) || parent.kind === 258)) {
                         node.flowNode = currentFlow;
                     }
                     return checkStrictModeIdentifier(node);
-                case 173:
+                case 177:
                     if (currentFlow && isNarrowableReference(node)) {
                         node.flowNode = currentFlow;
                     }
                     break;
-                case 188:
+                case 192:
                     if (ts.isInJavaScriptFile(node)) {
                         var specialKind = ts.getSpecialPropertyAssignmentKind(node);
                         switch (specialKind) {
@@ -18506,111 +19880,132 @@ var ts;
                         }
                     }
                     return checkStrictModeBinaryExpression(node);
-                case 252:
+                case 256:
                     return checkStrictModeCatchClause(node);
-                case 182:
+                case 186:
                     return checkStrictModeDeleteExpression(node);
                 case 8:
                     return checkStrictModeNumericLiteral(node);
-                case 187:
+                case 191:
                     return checkStrictModePostfixUnaryExpression(node);
-                case 186:
+                case 190:
                     return checkStrictModePrefixUnaryExpression(node);
-                case 213:
+                case 217:
                     return checkStrictModeWithStatement(node);
-                case 166:
+                case 167:
                     seenThisKeyword = true;
                     return;
-                case 155:
+                case 156:
                     return checkTypePredicate(node);
-                case 142:
-                    return declareSymbolAndAddToSymbolTable(node, 262144, 530920);
                 case 143:
+                    return declareSymbolAndAddToSymbolTable(node, 262144, 530920);
+                case 144:
                     return bindParameter(node);
-                case 219:
-                case 170:
+                case 223:
+                case 174:
+                    if (node.dotDotDotToken && node.parent.kind === 172) {
+                        emitFlags |= 32768;
+                    }
                     return bindVariableDeclarationOrBindingElement(node);
+                case 147:
                 case 146:
-                case 145:
-                case 266:
+                case 271:
                     return bindPropertyOrMethodOrAccessor(node, 4 | (node.questionToken ? 536870912 : 0), 0);
-                case 280:
+                case 285:
                     return bindJSDocProperty(node);
-                case 253:
-                case 254:
+                case 257:
+                case 258:
                     return bindPropertyOrMethodOrAccessor(node, 4, 0);
-                case 255:
+                case 260:
                     return bindPropertyOrMethodOrAccessor(node, 8, 900095);
-                case 247:
-                    emitFlags |= 16384;
+                case 259:
+                case 251:
+                    var root = container;
+                    var hasRest = false;
+                    while (root.parent) {
+                        if (root.kind === 176 &&
+                            root.parent.kind === 192 &&
+                            root.parent.operatorToken.kind === 57 &&
+                            root.parent.left === root) {
+                            hasRest = true;
+                            break;
+                        }
+                        root = root.parent;
+                    }
+                    emitFlags |= hasRest ? 32768 : 16384;
                     return;
-                case 152:
                 case 153:
                 case 154:
+                case 155:
                     return declareSymbolAndAddToSymbolTable(node, 131072, 0);
-                case 148:
-                case 147:
-                    return bindPropertyOrMethodOrAccessor(node, 8192 | (node.questionToken ? 536870912 : 0), ts.isObjectLiteralMethod(node) ? 0 : 99263);
-                case 221:
-                    return bindFunctionDeclaration(node);
                 case 149:
-                    return declareSymbolAndAddToSymbolTable(node, 16384, 0);
+                case 148:
+                    return bindPropertyOrMethodOrAccessor(node, 8192 | (node.questionToken ? 536870912 : 0), ts.isObjectLiteralMethod(node) ? 0 : 99263);
+                case 225:
+                    return bindFunctionDeclaration(node);
                 case 150:
-                    return bindPropertyOrMethodOrAccessor(node, 32768, 41919);
+                    return declareSymbolAndAddToSymbolTable(node, 16384, 0);
                 case 151:
+                    return bindPropertyOrMethodOrAccessor(node, 32768, 41919);
+                case 152:
                     return bindPropertyOrMethodOrAccessor(node, 65536, 74687);
-                case 157:
                 case 158:
-                case 269:
+                case 159:
+                case 274:
                     return bindFunctionOrConstructorType(node);
-                case 160:
-                case 281:
-                case 265:
+                case 161:
+                case 170:
+                case 286:
+                case 270:
                     return bindAnonymousDeclaration(node, 2048, "__type");
-                case 172:
+                case 176:
                     return bindObjectLiteralExpression(node);
-                case 180:
-                case 181:
+                case 184:
+                case 185:
                     return bindFunctionExpression(node);
-                case 175:
+                case 179:
                     if (ts.isInJavaScriptFile(node)) {
                         bindCallExpression(node);
                     }
                     break;
-                case 193:
-                case 222:
+                case 197:
+                case 226:
                     inStrictMode = true;
                     return bindClassLikeDeclaration(node);
-                case 223:
+                case 227:
                     return bindBlockScopedDeclaration(node, 64, 792968);
-                case 279:
-                case 224:
+                case 284:
+                    if (!node.fullName || node.fullName.kind === 70) {
+                        return bindBlockScopedDeclaration(node, 524288, 793064);
+                    }
+                    break;
+                case 228:
                     return bindBlockScopedDeclaration(node, 524288, 793064);
-                case 225:
-                    return bindEnumDeclaration(node);
-                case 226:
-                    return bindModuleDeclaration(node);
-                case 230:
-                case 233:
-                case 235:
-                case 239:
-                    return declareSymbolAndAddToSymbolTable(node, 8388608, 8388608);
                 case 229:
-                    return bindNamespaceExportDeclaration(node);
-                case 232:
-                    return bindImportClause(node);
+                    return bindEnumDeclaration(node);
+                case 230:
+                    return bindModuleDeclaration(node);
+                case 234:
                 case 237:
-                    return bindExportDeclaration(node);
+                case 239:
+                case 243:
+                    return declareSymbolAndAddToSymbolTable(node, 8388608, 8388608);
+                case 233:
+                    return bindNamespaceExportDeclaration(node);
                 case 236:
+                    return bindImportClause(node);
+                case 241:
+                    return bindExportDeclaration(node);
+                case 240:
                     return bindExportAssignment(node);
-                case 256:
+                case 261:
                     updateStrictModeStatementList(node.statements);
                     return bindSourceFileIfExternalModule();
-                case 200:
+                case 204:
                     if (!ts.isFunctionLike(node.parent)) {
                         return;
                     }
-                case 227:
+                case 231:
                     return updateStrictModeStatementList(node.statements);
             }
         }
@@ -18619,7 +20014,7 @@ var ts;
             if (parameterName && parameterName.kind === 70) {
                 checkStrictModeIdentifier(parameterName);
             }
-            if (parameterName && parameterName.kind === 166) {
+            if (parameterName && parameterName.kind === 167) {
                 seenThisKeyword = true;
             }
             bind(type);
@@ -18638,7 +20033,7 @@ var ts;
                 bindAnonymousDeclaration(node, 8388608, getDeclarationName(node));
             }
             else {
-                var flags = node.kind === 236 && ts.exportAssignmentIsAlias(node)
+                var flags = node.kind === 240 && ts.exportAssignmentIsAlias(node)
                     ? 8388608
                     : 4;
                 declareSymbol(container.symbol.exports, container.symbol, node, flags, 4 | 8388608 | 32 | 16);
@@ -18648,17 +20043,17 @@ var ts;
             if (node.modifiers && node.modifiers.length) {
                 file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Modifiers_cannot_appear_here));
             }
-            if (node.parent.kind !== 256) {
+            if (node.parent.kind !== 261) {
                 file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Global_module_exports_may_only_appear_at_top_level));
                 return;
             }
             else {
-                var parent_7 = node.parent;
-                if (!ts.isExternalModule(parent_7)) {
+                var parent_5 = node.parent;
+                if (!ts.isExternalModule(parent_5)) {
                     file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Global_module_exports_may_only_appear_in_module_files));
                     return;
                 }
-                if (!parent_7.isDeclarationFile) {
+                if (!parent_5.isDeclarationFile) {
                     file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Global_module_exports_may_only_appear_in_declaration_files));
                     return;
                 }
@@ -18697,11 +20092,11 @@ var ts;
         }
         function bindThisPropertyAssignment(node) {
             ts.Debug.assert(ts.isInJavaScriptFile(node));
-            if (container.kind === 221 || container.kind === 180) {
+            if (container.kind === 225 || container.kind === 184) {
                 container.symbol.members = container.symbol.members || ts.createMap();
                 declareSymbol(container.symbol.members, container.symbol, node, 4, 0 & ~4);
             }
-            else if (container.kind === 149) {
+            else if (container.kind === 150) {
                 var saveContainer = container;
                 container = container.parent;
                 var symbol = bindPropertyOrMethodOrAccessor(node, 4, 0);
@@ -18741,7 +20136,7 @@ var ts;
                     emitFlags |= 2048;
                 }
             }
-            if (node.kind === 222) {
+            if (node.kind === 226) {
                 bindBlockScopedDeclaration(node, 32, 899519);
             }
             else {
@@ -18859,15 +20254,15 @@ var ts;
                 return false;
             }
             if (currentFlow === unreachableFlow) {
-                var reportError = (ts.isStatementButNotDeclaration(node) && node.kind !== 202) ||
-                    node.kind === 222 ||
-                    (node.kind === 226 && shouldReportErrorOnModuleDeclaration(node)) ||
-                    (node.kind === 225 && (!ts.isConstEnumDeclaration(node) || options.preserveConstEnums));
+                var reportError = (ts.isStatementButNotDeclaration(node) && node.kind !== 206) ||
+                    node.kind === 226 ||
+                    (node.kind === 230 && shouldReportErrorOnModuleDeclaration(node)) ||
+                    (node.kind === 229 && (!ts.isConstEnumDeclaration(node) || options.preserveConstEnums));
                 if (reportError) {
                     currentFlow = reportedUnreachableFlow;
                     var reportUnreachableCode = !options.allowUnreachableCode &&
                         !ts.isInAmbientContext(node) &&
-                        (node.kind !== 201 ||
+                        (node.kind !== 205 ||
                             ts.getCombinedNodeFlags(node.declarationList) & 3 ||
                             ts.forEach(node.declarationList.declarations, function (d) { return d.initializer; }));
                     if (reportUnreachableCode) {
@@ -18881,54 +20276,56 @@ var ts;
     function computeTransformFlagsForNode(node, subtreeFlags) {
         var kind = node.kind;
         switch (kind) {
-            case 175:
-                return computeCallExpression(node, subtreeFlags);
-            case 176:
-                return computeNewExpression(node, subtreeFlags);
-            case 226:
-                return computeModuleDeclaration(node, subtreeFlags);
             case 179:
-                return computeParenthesizedExpression(node, subtreeFlags);
-            case 188:
-                return computeBinaryExpression(node, subtreeFlags);
-            case 203:
-                return computeExpressionStatement(node, subtreeFlags);
-            case 143:
-                return computeParameter(node, subtreeFlags);
-            case 181:
-                return computeArrowFunction(node, subtreeFlags);
+                return computeCallExpression(node, subtreeFlags);
             case 180:
-                return computeFunctionExpression(node, subtreeFlags);
-            case 221:
-                return computeFunctionDeclaration(node, subtreeFlags);
-            case 219:
-                return computeVariableDeclaration(node, subtreeFlags);
-            case 220:
-                return computeVariableDeclarationList(node, subtreeFlags);
-            case 201:
-                return computeVariableStatement(node, subtreeFlags);
-            case 215:
-                return computeLabeledStatement(node, subtreeFlags);
-            case 222:
-                return computeClassDeclaration(node, subtreeFlags);
-            case 193:
-                return computeClassExpression(node, subtreeFlags);
-            case 251:
-                return computeHeritageClause(node, subtreeFlags);
-            case 195:
-                return computeExpressionWithTypeArguments(node, subtreeFlags);
-            case 149:
-                return computeConstructor(node, subtreeFlags);
-            case 146:
-                return computePropertyDeclaration(node, subtreeFlags);
-            case 148:
-                return computeMethod(node, subtreeFlags);
-            case 150:
-            case 151:
-                return computeAccessor(node, subtreeFlags);
+                return computeNewExpression(node, subtreeFlags);
             case 230:
+                return computeModuleDeclaration(node, subtreeFlags);
+            case 183:
+                return computeParenthesizedExpression(node, subtreeFlags);
+            case 192:
+                return computeBinaryExpression(node, subtreeFlags);
+            case 207:
+                return computeExpressionStatement(node, subtreeFlags);
+            case 144:
+                return computeParameter(node, subtreeFlags);
+            case 185:
+                return computeArrowFunction(node, subtreeFlags);
+            case 184:
+                return computeFunctionExpression(node, subtreeFlags);
+            case 225:
+                return computeFunctionDeclaration(node, subtreeFlags);
+            case 223:
+                return computeVariableDeclaration(node, subtreeFlags);
+            case 224:
+                return computeVariableDeclarationList(node, subtreeFlags);
+            case 205:
+                return computeVariableStatement(node, subtreeFlags);
+            case 219:
+                return computeLabeledStatement(node, subtreeFlags);
+            case 226:
+                return computeClassDeclaration(node, subtreeFlags);
+            case 197:
+                return computeClassExpression(node, subtreeFlags);
+            case 255:
+                return computeHeritageClause(node, subtreeFlags);
+            case 256:
+                return computeCatchClause(node, subtreeFlags);
+            case 199:
+                return computeExpressionWithTypeArguments(node, subtreeFlags);
+            case 150:
+                return computeConstructor(node, subtreeFlags);
+            case 147:
+                return computePropertyDeclaration(node, subtreeFlags);
+            case 149:
+                return computeMethod(node, subtreeFlags);
+            case 151:
+            case 152:
+                return computeAccessor(node, subtreeFlags);
+            case 234:
                 return computeImportEquals(node, subtreeFlags);
-            case 173:
+            case 177:
                 return computePropertyAccess(node, subtreeFlags);
             default:
                 return computeOther(node, kind, subtreeFlags);
@@ -18942,19 +20339,19 @@ var ts;
         if (node.typeArguments) {
             transformFlags |= 3;
         }
-        if (subtreeFlags & 1048576
+        if (subtreeFlags & 8388608
             || isSuperOrSuperProperty(expression, expressionKind)) {
-            transformFlags |= 768;
+            transformFlags |= 3072;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~537922901;
+        return transformFlags & ~545281365;
     }
     function isSuperOrSuperProperty(node, kind) {
         switch (kind) {
             case 96:
                 return true;
-            case 173:
-            case 174:
+            case 177:
+            case 178:
                 var expression = node.expression;
                 var expressionKind = expression.kind;
                 return expressionKind === 96;
@@ -18966,27 +20363,28 @@ var ts;
         if (node.typeArguments) {
             transformFlags |= 3;
         }
-        if (subtreeFlags & 1048576) {
-            transformFlags |= 768;
+        if (subtreeFlags & 8388608) {
+            transformFlags |= 3072;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~537922901;
+        return transformFlags & ~545281365;
     }
     function computeBinaryExpression(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         var operatorTokenKind = node.operatorToken.kind;
         var leftKind = node.left.kind;
-        if (operatorTokenKind === 57
-            && (leftKind === 172
-                || leftKind === 171)) {
-            transformFlags |= 768 | 1024;
+        if (operatorTokenKind === 57 && leftKind === 176) {
+            transformFlags |= 48 | 3072 | 49152;
+        }
+        else if (operatorTokenKind === 57 && leftKind === 175) {
+            transformFlags |= 3072 | 49152;
         }
         else if (operatorTokenKind === 39
             || operatorTokenKind === 61) {
-            transformFlags |= 192;
+            transformFlags |= 768;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~536874325;
+        return transformFlags & ~536892757;
     }
     function computeParameter(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
@@ -18996,33 +20394,36 @@ var ts;
         var dotDotDotToken = node.dotDotDotToken;
         if (node.questionToken
             || node.type
-            || subtreeFlags & 8192
+            || subtreeFlags & 65536
             || ts.isThisIdentifier(name)) {
             transformFlags |= 3;
         }
         if (modifierFlags & 92) {
-            transformFlags |= 3 | 524288;
+            transformFlags |= 3 | 4194304;
         }
-        if (subtreeFlags & 8388608 || initializer || dotDotDotToken) {
-            transformFlags |= 768 | 262144;
+        if (subtreeFlags & 8388608) {
+            transformFlags |= 48;
+        }
+        if (subtreeFlags & 67108864 || initializer || dotDotDotToken) {
+            transformFlags |= 3072 | 2097152;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~545262933;
+        return transformFlags & ~604001621;
     }
     function computeParenthesizedExpression(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         var expression = node.expression;
         var expressionKind = expression.kind;
         var expressionTransformFlags = expression.transformFlags;
-        if (expressionKind === 196
-            || expressionKind === 178) {
+        if (expressionKind === 200
+            || expressionKind === 182) {
             transformFlags |= 3;
         }
-        if (expressionTransformFlags & 1024) {
-            transformFlags |= 1024;
+        if (expressionTransformFlags & 16384) {
+            transformFlags |= 16384;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~536874325;
+        return transformFlags & ~536892757;
     }
     function computeClassDeclaration(node, subtreeFlags) {
         var transformFlags;
@@ -19031,36 +20432,35 @@ var ts;
             transformFlags = 3;
         }
         else {
-            transformFlags = subtreeFlags | 768;
-            if ((subtreeFlags & 548864)
-                || (modifierFlags & 1)
+            transformFlags = subtreeFlags | 3072;
+            if ((subtreeFlags & 4390912)
                 || node.typeParameters) {
                 transformFlags |= 3;
             }
-            if (subtreeFlags & 131072) {
-                transformFlags |= 32768;
+            if (subtreeFlags & 1048576) {
+                transformFlags |= 262144;
             }
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~539749717;
+        return transformFlags & ~559895893;
     }
     function computeClassExpression(node, subtreeFlags) {
-        var transformFlags = subtreeFlags | 768;
-        if (subtreeFlags & 548864
+        var transformFlags = subtreeFlags | 3072;
+        if (subtreeFlags & 4390912
             || node.typeParameters) {
             transformFlags |= 3;
         }
-        if (subtreeFlags & 131072) {
-            transformFlags |= 32768;
+        if (subtreeFlags & 1048576) {
+            transformFlags |= 262144;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~539749717;
+        return transformFlags & ~559895893;
     }
     function computeHeritageClause(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         switch (node.token) {
             case 84:
-                transformFlags |= 768;
+                transformFlags |= 3072;
                 break;
             case 107:
                 transformFlags |= 3;
@@ -19070,15 +20470,23 @@ var ts;
                 break;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~536874325;
+        return transformFlags & ~536892757;
+    }
+    function computeCatchClause(node, subtreeFlags) {
+        var transformFlags = subtreeFlags;
+        if (node.variableDeclaration && ts.isBindingPattern(node.variableDeclaration.name)) {
+            transformFlags |= 3072;
+        }
+        node.transformFlags = transformFlags | 536870912;
+        return transformFlags & ~536892757;
     }
     function computeExpressionWithTypeArguments(node, subtreeFlags) {
-        var transformFlags = subtreeFlags | 768;
+        var transformFlags = subtreeFlags | 3072;
         if (node.typeArguments) {
             transformFlags |= 3;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~536874325;
+        return transformFlags & ~536892757;
     }
     function computeConstructor(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
@@ -19087,10 +20495,10 @@ var ts;
             transformFlags |= 3;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~591760725;
+        return transformFlags & ~975983957;
     }
     function computeMethod(node, subtreeFlags) {
-        var transformFlags = subtreeFlags | 768;
+        var transformFlags = subtreeFlags | 3072;
         if (node.decorators
             || ts.hasModifier(node, 2270)
             || node.typeParameters
@@ -19099,13 +20507,13 @@ var ts;
             transformFlags |= 3;
         }
         if (ts.hasModifier(node, 256)) {
-            transformFlags |= 48;
+            transformFlags |= 192;
         }
         if (node.asteriskToken && ts.getEmitFlags(node) & 2097152) {
-            transformFlags |= 6144;
+            transformFlags |= 12288;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~591760725;
+        return transformFlags & ~975983957;
     }
     function computeAccessor(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
@@ -19116,15 +20524,15 @@ var ts;
             transformFlags |= 3;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~591760725;
+        return transformFlags & ~975983957;
     }
     function computePropertyDeclaration(node, subtreeFlags) {
         var transformFlags = subtreeFlags | 3;
         if (node.initializer) {
-            transformFlags |= 16384;
+            transformFlags |= 131072;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~536874325;
+        return transformFlags & ~536892757;
     }
     function computeFunctionDeclaration(node, subtreeFlags) {
         var transformFlags;
@@ -19134,27 +20542,27 @@ var ts;
             transformFlags = 3;
         }
         else {
-            transformFlags = subtreeFlags | 33554432;
-            if (modifierFlags & 1) {
-                transformFlags |= 3 | 768;
-            }
+            transformFlags = subtreeFlags | 268435456;
             if (modifierFlags & 2270
                 || node.typeParameters
                 || node.type) {
                 transformFlags |= 3;
             }
             if (modifierFlags & 256) {
+                transformFlags |= 192;
+            }
+            if (subtreeFlags & 8388608) {
                 transformFlags |= 48;
             }
-            if (subtreeFlags & 327680) {
-                transformFlags |= 768;
+            if (subtreeFlags & 2621440) {
+                transformFlags |= 3072;
             }
             if (node.asteriskToken && ts.getEmitFlags(node) & 2097152) {
-                transformFlags |= 6144;
+                transformFlags |= 12288;
             }
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~592293205;
+        return transformFlags & ~980243797;
     }
     function computeFunctionExpression(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
@@ -19164,54 +20572,63 @@ var ts;
             transformFlags |= 3;
         }
         if (ts.hasModifier(node, 256)) {
+            transformFlags |= 192;
+        }
+        if (subtreeFlags & 8388608) {
             transformFlags |= 48;
         }
-        if (subtreeFlags & 327680) {
-            transformFlags |= 768;
+        if (subtreeFlags & 2621440) {
+            transformFlags |= 3072;
         }
         if (node.asteriskToken && ts.getEmitFlags(node) & 2097152) {
-            transformFlags |= 6144;
+            transformFlags |= 12288;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~592293205;
+        return transformFlags & ~980243797;
     }
     function computeArrowFunction(node, subtreeFlags) {
-        var transformFlags = subtreeFlags | 768;
+        var transformFlags = subtreeFlags | 3072;
         if (ts.hasModifier(node, 2270)
             || node.typeParameters
             || node.type) {
             transformFlags |= 3;
         }
         if (ts.hasModifier(node, 256)) {
+            transformFlags |= 192;
+        }
+        if (subtreeFlags & 8388608) {
             transformFlags |= 48;
         }
-        if (subtreeFlags & 32768) {
-            transformFlags |= 65536;
+        if (subtreeFlags & 262144) {
+            transformFlags |= 524288;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~592227669;
+        return transformFlags & ~979719509;
     }
     function computePropertyAccess(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         var expression = node.expression;
         var expressionKind = expression.kind;
         if (expressionKind === 96) {
-            transformFlags |= 32768;
+            transformFlags |= 262144;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~536874325;
+        return transformFlags & ~536892757;
     }
     function computeVariableDeclaration(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         var nameKind = node.name.kind;
-        if (nameKind === 168 || nameKind === 169) {
-            transformFlags |= 768 | 8388608;
+        if (nameKind === 172) {
+            transformFlags |= 48 | 3072 | 67108864;
+        }
+        else if (nameKind === 173) {
+            transformFlags |= 3072 | 67108864;
         }
         if (node.type) {
             transformFlags |= 3;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~536874325;
+        return transformFlags & ~536892757;
     }
     function computeVariableStatement(node, subtreeFlags) {
         var transformFlags;
@@ -19222,24 +20639,21 @@ var ts;
         }
         else {
             transformFlags = subtreeFlags;
-            if (modifierFlags & 1) {
-                transformFlags |= 768 | 3;
-            }
-            if (declarationListTransformFlags & 8388608) {
-                transformFlags |= 768;
+            if (declarationListTransformFlags & 67108864) {
+                transformFlags |= 3072;
             }
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~536874325;
+        return transformFlags & ~536892757;
     }
     function computeLabeledStatement(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
-        if (subtreeFlags & 4194304
+        if (subtreeFlags & 33554432
             && ts.isIterationStatement(node, true)) {
-            transformFlags |= 768;
+            transformFlags |= 3072;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~536874325;
+        return transformFlags & ~536892757;
     }
     function computeImportEquals(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
@@ -19247,15 +20661,15 @@ var ts;
             transformFlags |= 3;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~536874325;
+        return transformFlags & ~536892757;
     }
     function computeExpressionStatement(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
-        if (node.expression.transformFlags & 1024) {
-            transformFlags |= 768;
+        if (node.expression.transformFlags & 16384) {
+            transformFlags |= 3072;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~536874325;
+        return transformFlags & ~536892757;
     }
     function computeModuleDeclaration(node, subtreeFlags) {
         var transformFlags = 3;
@@ -19264,26 +20678,26 @@ var ts;
             transformFlags |= subtreeFlags;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~574729557;
+        return transformFlags & ~839734613;
     }
     function computeVariableDeclarationList(node, subtreeFlags) {
-        var transformFlags = subtreeFlags | 33554432;
-        if (subtreeFlags & 8388608) {
-            transformFlags |= 768;
+        var transformFlags = subtreeFlags | 268435456;
+        if (subtreeFlags & 67108864) {
+            transformFlags |= 3072;
         }
         if (node.flags & 3) {
-            transformFlags |= 768 | 4194304;
+            transformFlags |= 3072 | 33554432;
         }
         node.transformFlags = transformFlags | 536870912;
-        return transformFlags & ~545262933;
+        return transformFlags & ~604001621;
     }
     function computeOther(node, kind, subtreeFlags) {
         var transformFlags = subtreeFlags;
-        var excludeFlags = 536874325;
+        var excludeFlags = 536892757;
         switch (kind) {
             case 119:
-            case 185:
-                transformFlags |= 48;
+            case 189:
+                transformFlags |= 192;
                 break;
             case 113:
             case 111:
@@ -19291,52 +20705,49 @@ var ts;
             case 116:
             case 123:
             case 75:
-            case 225:
-            case 255:
-            case 178:
-            case 196:
-            case 197:
-            case 129:
+            case 229:
+            case 260:
+            case 182:
+            case 200:
+            case 201:
+            case 130:
                 transformFlags |= 3;
                 break;
-            case 242:
-            case 243:
-            case 244:
-            case 10:
-            case 245:
             case 246:
             case 247:
             case 248:
+            case 10:
+            case 249:
+            case 250:
+            case 251:
+            case 252:
                 transformFlags |= 12;
                 break;
-            case 83:
-                transformFlags |= 768 | 3;
-                break;
-            case 78:
+            case 213:
+                transformFlags |= 48;
             case 12:
             case 13:
             case 14:
             case 15:
-            case 190:
-            case 177:
-            case 254:
-            case 209:
-                transformFlags |= 768;
+            case 194:
+            case 181:
+            case 258:
+            case 114:
+                transformFlags |= 3072;
                 break;
-            case 191:
-                transformFlags |= 768 | 16777216;
+            case 195:
+                transformFlags |= 3072 | 134217728;
                 break;
             case 118:
-            case 131:
-            case 128:
-            case 133:
-            case 121:
+            case 132:
+            case 129:
             case 134:
+            case 121:
+            case 135:
             case 104:
-            case 142:
-            case 145:
-            case 147:
-            case 152:
+            case 143:
+            case 146:
+            case 148:
             case 153:
             case 154:
             case 155:
@@ -19350,73 +20761,142 @@ var ts;
             case 163:
             case 164:
             case 165:
-            case 223:
-            case 224:
             case 166:
+            case 227:
+            case 228:
             case 167:
+            case 168:
+            case 169:
+            case 170:
+            case 171:
                 transformFlags = 3;
                 excludeFlags = -3;
                 break;
-            case 141:
-                transformFlags |= 2097152;
-                if (subtreeFlags & 32768) {
-                    transformFlags |= 131072;
+            case 142:
+                transformFlags |= 16777216;
+                if (subtreeFlags & 262144) {
+                    transformFlags |= 1048576;
                 }
                 break;
-            case 192:
-                transformFlags |= 1048576;
+            case 196:
+            case 259:
+                transformFlags |= 8388608;
                 break;
+            case 174:
+                if (node.dotDotDotToken) {
+                    transformFlags |= 8388608;
+                }
             case 96:
-                transformFlags |= 768;
+                transformFlags |= 3072;
                 break;
             case 98:
-                transformFlags |= 32768;
-                break;
-            case 168:
-            case 169:
-                transformFlags |= 768 | 8388608;
-                break;
-            case 144:
-                transformFlags |= 3 | 8192;
+                transformFlags |= 262144;
                 break;
             case 172:
-                excludeFlags = 539110741;
-                if (subtreeFlags & 2097152) {
-                    transformFlags |= 768;
+            case 173:
+                if (subtreeFlags & 8388608) {
+                    transformFlags |= 48 | 67108864;
                 }
-                if (subtreeFlags & 131072) {
-                    transformFlags |= 32768;
+                else {
+                    transformFlags |= 3072 | 67108864;
                 }
                 break;
-            case 171:
+            case 145:
+                transformFlags |= 3 | 65536;
+                break;
             case 176:
-                excludeFlags = 537922901;
+                excludeFlags = 554784085;
+                if (subtreeFlags & 16777216) {
+                    transformFlags |= 3072;
+                }
                 if (subtreeFlags & 1048576) {
-                    transformFlags |= 768;
+                    transformFlags |= 262144;
+                }
+                if (subtreeFlags & 8388608) {
+                    transformFlags |= 48;
                 }
                 break;
-            case 205:
-            case 206:
-            case 207:
-            case 208:
-                if (subtreeFlags & 4194304) {
-                    transformFlags |= 768;
+            case 175:
+            case 180:
+                excludeFlags = 545281365;
+                if (subtreeFlags & 8388608) {
+                    transformFlags |= 3072;
                 }
                 break;
-            case 256:
-                if (subtreeFlags & 65536) {
-                    transformFlags |= 768;
-                }
-                break;
-            case 212:
+            case 209:
             case 210:
             case 211:
-                transformFlags |= 33554432;
+            case 212:
+                if (subtreeFlags & 33554432) {
+                    transformFlags |= 3072;
+                }
+                break;
+            case 261:
+                if (subtreeFlags & 524288) {
+                    transformFlags |= 3072;
+                }
+                break;
+            case 216:
+            case 214:
+            case 215:
+                transformFlags |= 268435456;
                 break;
         }
         node.transformFlags = transformFlags | 536870912;
         return transformFlags & ~excludeFlags;
     }
+    function getTransformFlagsSubtreeExclusions(kind) {
+        if (kind >= 156 && kind <= 171) {
+            return -3;
+        }
+        switch (kind) {
+            case 179:
+            case 180:
+            case 175:
+                return 545281365;
+            case 230:
+                return 839734613;
+            case 144:
+                return 604001621;
+            case 185:
+                return 979719509;
+            case 184:
+            case 225:
+                return 980243797;
+            case 224:
+                return 604001621;
+            case 226:
+            case 197:
+                return 559895893;
+            case 150:
+                return 975983957;
+            case 149:
+            case 151:
+            case 152:
+                return 975983957;
+            case 118:
+            case 132:
+            case 129:
+            case 134:
+            case 121:
+            case 135:
+            case 104:
+            case 143:
+            case 146:
+            case 148:
+            case 153:
+            case 154:
+            case 155:
+            case 227:
+            case 228:
+                return -3;
+            case 176:
+                return 554784085;
+            default:
+                return 536892757;
+        }
+    }
+    ts.getTransformFlagsSubtreeExclusions = getTransformFlagsSubtreeExclusions;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -19504,7 +20984,10 @@ var ts;
             getAmbientModules: getAmbientModules,
             getJsxElementAttributesType: getJsxElementAttributesType,
             getJsxIntrinsicTagNames: getJsxIntrinsicTagNames,
-            isOptionalParameter: isOptionalParameter
+            isOptionalParameter: isOptionalParameter,
+            tryFindAmbientModuleWithoutAugmentations: function (moduleName) {
+                return tryFindAmbientModule(moduleName, false);
+            }
         };
         var tupleTypes = [];
         var unionTypes = ts.createMap();
@@ -19518,9 +21001,9 @@ var ts;
         var autoType = createIntrinsicType(1, "any");
         var unknownType = createIntrinsicType(1, "unknown");
         var undefinedType = createIntrinsicType(2048, "undefined");
-        var undefinedWideningType = strictNullChecks ? undefinedType : createIntrinsicType(2048 | 33554432, "undefined");
+        var undefinedWideningType = strictNullChecks ? undefinedType : createIntrinsicType(2048 | 2097152, "undefined");
         var nullType = createIntrinsicType(4096, "null");
-        var nullWideningType = strictNullChecks ? nullType : createIntrinsicType(4096 | 33554432, "null");
+        var nullWideningType = strictNullChecks ? nullType : createIntrinsicType(4096 | 2097152, "null");
         var stringType = createIntrinsicType(2, "string");
         var numberType = createIntrinsicType(4, "number");
         var trueType = createIntrinsicType(128, "true");
@@ -19530,11 +21013,15 @@ var ts;
         var voidType = createIntrinsicType(1024, "void");
         var neverType = createIntrinsicType(8192, "never");
         var silentNeverType = createIntrinsicType(8192, "never");
+        var stringOrNumberType = getUnionType([stringType, numberType]);
         var emptyObjectType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
+        var emptyTypeLiteralSymbol = createSymbol(2048 | 67108864, "__type");
+        emptyTypeLiteralSymbol.members = ts.createMap();
+        var emptyTypeLiteralType = createAnonymousType(emptyTypeLiteralSymbol, emptySymbols, emptyArray, emptyArray, undefined, undefined);
         var emptyGenericType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
         emptyGenericType.instantiations = ts.createMap();
         var anyFunctionType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
-        anyFunctionType.flags |= 134217728;
+        anyFunctionType.flags |= 8388608;
         var noConstraintType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
         var anySignature = createSignature(undefined, undefined, undefined, emptyArray, anyType, undefined, 0, false, false);
         var unknownSignature = createSignature(undefined, undefined, undefined, emptyArray, unknownType, undefined, 0, false, false);
@@ -19596,66 +21083,6 @@ var ts;
         var potentialThisCollisions = [];
         var awaitedTypeStack = [];
         var diagnostics = ts.createDiagnosticCollection();
-        var TypeFacts;
-        (function (TypeFacts) {
-            TypeFacts[TypeFacts["None"] = 0] = "None";
-            TypeFacts[TypeFacts["TypeofEQString"] = 1] = "TypeofEQString";
-            TypeFacts[TypeFacts["TypeofEQNumber"] = 2] = "TypeofEQNumber";
-            TypeFacts[TypeFacts["TypeofEQBoolean"] = 4] = "TypeofEQBoolean";
-            TypeFacts[TypeFacts["TypeofEQSymbol"] = 8] = "TypeofEQSymbol";
-            TypeFacts[TypeFacts["TypeofEQObject"] = 16] = "TypeofEQObject";
-            TypeFacts[TypeFacts["TypeofEQFunction"] = 32] = "TypeofEQFunction";
-            TypeFacts[TypeFacts["TypeofEQHostObject"] = 64] = "TypeofEQHostObject";
-            TypeFacts[TypeFacts["TypeofNEString"] = 128] = "TypeofNEString";
-            TypeFacts[TypeFacts["TypeofNENumber"] = 256] = "TypeofNENumber";
-            TypeFacts[TypeFacts["TypeofNEBoolean"] = 512] = "TypeofNEBoolean";
-            TypeFacts[TypeFacts["TypeofNESymbol"] = 1024] = "TypeofNESymbol";
-            TypeFacts[TypeFacts["TypeofNEObject"] = 2048] = "TypeofNEObject";
-            TypeFacts[TypeFacts["TypeofNEFunction"] = 4096] = "TypeofNEFunction";
-            TypeFacts[TypeFacts["TypeofNEHostObject"] = 8192] = "TypeofNEHostObject";
-            TypeFacts[TypeFacts["EQUndefined"] = 16384] = "EQUndefined";
-            TypeFacts[TypeFacts["EQNull"] = 32768] = "EQNull";
-            TypeFacts[TypeFacts["EQUndefinedOrNull"] = 65536] = "EQUndefinedOrNull";
-            TypeFacts[TypeFacts["NEUndefined"] = 131072] = "NEUndefined";
-            TypeFacts[TypeFacts["NENull"] = 262144] = "NENull";
-            TypeFacts[TypeFacts["NEUndefinedOrNull"] = 524288] = "NEUndefinedOrNull";
-            TypeFacts[TypeFacts["Truthy"] = 1048576] = "Truthy";
-            TypeFacts[TypeFacts["Falsy"] = 2097152] = "Falsy";
-            TypeFacts[TypeFacts["Discriminatable"] = 4194304] = "Discriminatable";
-            TypeFacts[TypeFacts["All"] = 8388607] = "All";
-            TypeFacts[TypeFacts["BaseStringStrictFacts"] = 933633] = "BaseStringStrictFacts";
-            TypeFacts[TypeFacts["BaseStringFacts"] = 3145473] = "BaseStringFacts";
-            TypeFacts[TypeFacts["StringStrictFacts"] = 4079361] = "StringStrictFacts";
-            TypeFacts[TypeFacts["StringFacts"] = 4194049] = "StringFacts";
-            TypeFacts[TypeFacts["EmptyStringStrictFacts"] = 3030785] = "EmptyStringStrictFacts";
-            TypeFacts[TypeFacts["EmptyStringFacts"] = 3145473] = "EmptyStringFacts";
-            TypeFacts[TypeFacts["NonEmptyStringStrictFacts"] = 1982209] = "NonEmptyStringStrictFacts";
-            TypeFacts[TypeFacts["NonEmptyStringFacts"] = 4194049] = "NonEmptyStringFacts";
-            TypeFacts[TypeFacts["BaseNumberStrictFacts"] = 933506] = "BaseNumberStrictFacts";
-            TypeFacts[TypeFacts["BaseNumberFacts"] = 3145346] = "BaseNumberFacts";
-            TypeFacts[TypeFacts["NumberStrictFacts"] = 4079234] = "NumberStrictFacts";
-            TypeFacts[TypeFacts["NumberFacts"] = 4193922] = "NumberFacts";
-            TypeFacts[TypeFacts["ZeroStrictFacts"] = 3030658] = "ZeroStrictFacts";
-            TypeFacts[TypeFacts["ZeroFacts"] = 3145346] = "ZeroFacts";
-            TypeFacts[TypeFacts["NonZeroStrictFacts"] = 1982082] = "NonZeroStrictFacts";
-            TypeFacts[TypeFacts["NonZeroFacts"] = 4193922] = "NonZeroFacts";
-            TypeFacts[TypeFacts["BaseBooleanStrictFacts"] = 933252] = "BaseBooleanStrictFacts";
-            TypeFacts[TypeFacts["BaseBooleanFacts"] = 3145092] = "BaseBooleanFacts";
-            TypeFacts[TypeFacts["BooleanStrictFacts"] = 4078980] = "BooleanStrictFacts";
-            TypeFacts[TypeFacts["BooleanFacts"] = 4193668] = "BooleanFacts";
-            TypeFacts[TypeFacts["FalseStrictFacts"] = 3030404] = "FalseStrictFacts";
-            TypeFacts[TypeFacts["FalseFacts"] = 3145092] = "FalseFacts";
-            TypeFacts[TypeFacts["TrueStrictFacts"] = 1981828] = "TrueStrictFacts";
-            TypeFacts[TypeFacts["TrueFacts"] = 4193668] = "TrueFacts";
-            TypeFacts[TypeFacts["SymbolStrictFacts"] = 1981320] = "SymbolStrictFacts";
-            TypeFacts[TypeFacts["SymbolFacts"] = 4193160] = "SymbolFacts";
-            TypeFacts[TypeFacts["ObjectStrictFacts"] = 6166480] = "ObjectStrictFacts";
-            TypeFacts[TypeFacts["ObjectFacts"] = 8378320] = "ObjectFacts";
-            TypeFacts[TypeFacts["FunctionStrictFacts"] = 6164448] = "FunctionStrictFacts";
-            TypeFacts[TypeFacts["FunctionFacts"] = 8376288] = "FunctionFacts";
-            TypeFacts[TypeFacts["UndefinedFacts"] = 2457472] = "UndefinedFacts";
-            TypeFacts[TypeFacts["NullFacts"] = 2340752] = "NullFacts";
-        })(TypeFacts || (TypeFacts = {}));
         var typeofEQFacts = ts.createMap({
             "string": 1,
             "number": 2,
@@ -19682,6 +21109,8 @@ var ts;
             "undefined": undefinedType
         });
         var jsxElementType;
+        var _jsxNamespace;
+        var _jsxFactoryEntity;
         var jsxTypes = ts.createMap();
         var JsxNames = {
             JSX: "JSX",
@@ -19698,17 +21127,25 @@ var ts;
         var identityRelation = ts.createMap();
         var enumRelation = ts.createMap();
         var _displayBuilder;
-        var TypeSystemPropertyName;
-        (function (TypeSystemPropertyName) {
-            TypeSystemPropertyName[TypeSystemPropertyName["Type"] = 0] = "Type";
-            TypeSystemPropertyName[TypeSystemPropertyName["ResolvedBaseConstructorType"] = 1] = "ResolvedBaseConstructorType";
-            TypeSystemPropertyName[TypeSystemPropertyName["DeclaredType"] = 2] = "DeclaredType";
-            TypeSystemPropertyName[TypeSystemPropertyName["ResolvedReturnType"] = 3] = "ResolvedReturnType";
-        })(TypeSystemPropertyName || (TypeSystemPropertyName = {}));
         var builtinGlobals = ts.createMap();
         builtinGlobals[undefinedSymbol.name] = undefinedSymbol;
         initializeTypeChecker();
         return checker;
+        function getJsxNamespace() {
+            if (_jsxNamespace === undefined) {
+                _jsxNamespace = "React";
+                if (compilerOptions.jsxFactory) {
+                    _jsxFactoryEntity = ts.parseIsolatedEntityName(compilerOptions.jsxFactory, languageVersion);
+                    if (_jsxFactoryEntity) {
+                        _jsxNamespace = getFirstIdentifier(_jsxFactoryEntity).text;
+                    }
+                }
+                else if (compilerOptions.reactNamespace) {
+                    _jsxNamespace = compilerOptions.reactNamespace;
+                }
+            }
+            return _jsxNamespace;
+        }
         function getEmitResolver(sourceFile, cancellationToken) {
             getDiagnostics(sourceFile, cancellationToken);
             return emitResolver;
@@ -19789,7 +21226,7 @@ var ts;
                 target.flags |= source.flags;
                 if (source.valueDeclaration &&
                     (!target.valueDeclaration ||
-                        (target.valueDeclaration.kind === 226 && source.valueDeclaration.kind !== 226))) {
+                        (target.valueDeclaration.kind === 230 && source.valueDeclaration.kind !== 230))) {
                     target.valueDeclaration = source.valueDeclaration;
                 }
                 ts.forEach(source.declarations, function (node) {
@@ -19845,7 +21282,7 @@ var ts;
                 var moduleNotFoundError = !ts.isInAmbientContext(moduleName.parent.parent)
                     ? ts.Diagnostics.Invalid_module_name_in_augmentation_module_0_cannot_be_found
                     : undefined;
-                var mainModule = resolveExternalModuleNameWorker(moduleName, moduleName, moduleNotFoundError);
+                var mainModule = resolveExternalModuleNameWorker(moduleName, moduleName, moduleNotFoundError, true);
                 if (!mainModule) {
                     return;
                 }
@@ -19882,8 +21319,11 @@ var ts;
             var nodeId = getNodeId(node);
             return nodeLinks[nodeId] || (nodeLinks[nodeId] = { flags: 0 });
         }
+        function getObjectFlags(type) {
+            return type.flags & 32768 ? type.objectFlags : 0;
+        }
         function isGlobalSourceFile(node) {
-            return node.kind === 256 && !ts.isExternalOrCommonJsModule(node);
+            return node.kind === 261 && !ts.isExternalOrCommonJsModule(node);
         }
         function getSymbol(symbols, name, meaning) {
             if (meaning) {
@@ -19920,36 +21360,39 @@ var ts;
                     (!compilerOptions.outFile && !compilerOptions.out)) {
                     return true;
                 }
+                if (isUsedInFunctionOrNonStaticProperty(usage)) {
+                    return true;
+                }
                 var sourceFiles = host.getSourceFiles();
                 return ts.indexOf(sourceFiles, declarationFile) <= ts.indexOf(sourceFiles, useFile);
             }
             if (declaration.pos <= usage.pos) {
-                return declaration.kind !== 219 ||
+                return declaration.kind !== 223 ||
                     !isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage);
             }
-            return isUsedInFunctionOrNonStaticProperty(declaration, usage);
+            var container = ts.getEnclosingBlockScopeContainer(declaration);
+            return isUsedInFunctionOrNonStaticProperty(usage, container);
             function isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage) {
                 var container = ts.getEnclosingBlockScopeContainer(declaration);
                 switch (declaration.parent.parent.kind) {
-                    case 201:
-                    case 207:
-                    case 209:
+                    case 205:
+                    case 211:
+                    case 213:
                         if (isSameScopeDescendentOf(usage, declaration, container)) {
                             return true;
                         }
                         break;
                 }
                 switch (declaration.parent.parent.kind) {
-                    case 208:
-                    case 209:
+                    case 212:
+                    case 213:
                         if (isSameScopeDescendentOf(usage, declaration.parent.parent.expression, container)) {
                             return true;
                         }
                 }
                 return false;
             }
-            function isUsedInFunctionOrNonStaticProperty(declaration, usage) {
-                var container = ts.getEnclosingBlockScopeContainer(declaration);
+            function isUsedInFunctionOrNonStaticProperty(usage, container) {
                 var current = usage;
                 while (current) {
                     if (current === container) {
@@ -19959,7 +21402,7 @@ var ts;
                         return true;
                     }
                     var initializerOfNonStaticProperty = current.parent &&
-                        current.parent.kind === 146 &&
+                        current.parent.kind === 147 &&
                         (ts.getModifierFlags(current.parent) & 32) === 0 &&
                         current.parent.initializer === current;
                     if (initializerOfNonStaticProperty) {
@@ -19982,18 +21425,18 @@ var ts;
                     if (result = getSymbol(location.locals, name, meaning)) {
                         var useResult = true;
                         if (ts.isFunctionLike(location) && lastLocation && lastLocation !== location.body) {
-                            if (meaning & result.flags & 793064 && lastLocation.kind !== 273) {
+                            if (meaning & result.flags & 793064 && lastLocation.kind !== 278) {
                                 useResult = result.flags & 262144
                                     ? lastLocation === location.type ||
-                                        lastLocation.kind === 143 ||
-                                        lastLocation.kind === 142
+                                        lastLocation.kind === 144 ||
+                                        lastLocation.kind === 143
                                     : false;
                             }
                             if (meaning & 107455 && result.flags & 1) {
                                 useResult =
-                                    lastLocation.kind === 143 ||
+                                    lastLocation.kind === 144 ||
                                         (lastLocation === location.type &&
-                                            result.valueDeclaration.kind === 143);
+                                            result.valueDeclaration.kind === 144);
                             }
                         }
                         if (useResult) {
@@ -20005,13 +21448,13 @@ var ts;
                     }
                 }
                 switch (location.kind) {
-                    case 256:
+                    case 261:
                         if (!ts.isExternalOrCommonJsModule(location))
                             break;
                         isInExternalModule = true;
-                    case 226:
+                    case 230:
                         var moduleExports = getSymbolOfNode(location).exports;
-                        if (location.kind === 256 || ts.isAmbientModule(location)) {
+                        if (location.kind === 261 || ts.isAmbientModule(location)) {
                             if (result = moduleExports["default"]) {
                                 var localSymbol = ts.getLocalSymbolForExportDefault(result);
                                 if (localSymbol && (result.flags & meaning) && localSymbol.name === name) {
@@ -20021,7 +21464,7 @@ var ts;
                             }
                             if (moduleExports[name] &&
                                 moduleExports[name].flags === 8388608 &&
-                                ts.getDeclarationOfKind(moduleExports[name], 239)) {
+                                ts.getDeclarationOfKind(moduleExports[name], 243)) {
                                 break;
                             }
                         }
@@ -20029,13 +21472,13 @@ var ts;
                             break loop;
                         }
                         break;
-                    case 225:
+                    case 229:
                         if (result = getSymbol(getSymbolOfNode(location).exports, name, meaning & 8)) {
                             break loop;
                         }
                         break;
+                    case 147:
                     case 146:
-                    case 145:
                         if (ts.isClassLike(location.parent) && !(ts.getModifierFlags(location) & 32)) {
                             var ctor = findConstructorDeclaration(location.parent);
                             if (ctor && ctor.locals) {
@@ -20045,9 +21488,9 @@ var ts;
                             }
                         }
                         break;
-                    case 222:
-                    case 193:
-                    case 223:
+                    case 226:
+                    case 197:
+                    case 227:
                         if (result = getSymbol(getSymbolOfNode(location).members, name, meaning & 793064)) {
                             if (lastLocation && ts.getModifierFlags(lastLocation) & 32) {
                                 error(errorLocation, ts.Diagnostics.Static_members_cannot_reference_class_type_parameters);
@@ -20055,7 +21498,7 @@ var ts;
                             }
                             break loop;
                         }
-                        if (location.kind === 193 && meaning & 32) {
+                        if (location.kind === 197 && meaning & 32) {
                             var className = location.name;
                             if (className && name === className.text) {
                                 result = location.symbol;
@@ -20063,28 +21506,28 @@ var ts;
                             }
                         }
                         break;
-                    case 141:
+                    case 142:
                         grandparent = location.parent.parent;
-                        if (ts.isClassLike(grandparent) || grandparent.kind === 223) {
+                        if (ts.isClassLike(grandparent) || grandparent.kind === 227) {
                             if (result = getSymbol(getSymbolOfNode(grandparent).members, name, meaning & 793064)) {
                                 error(errorLocation, ts.Diagnostics.A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type);
                                 return undefined;
                             }
                         }
                         break;
-                    case 148:
-                    case 147:
                     case 149:
+                    case 148:
                     case 150:
                     case 151:
-                    case 221:
-                    case 181:
+                    case 152:
+                    case 225:
+                    case 185:
                         if (meaning & 3 && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
                         }
                         break;
-                    case 180:
+                    case 184:
                         if (meaning & 3 && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
@@ -20097,8 +21540,8 @@ var ts;
                             }
                         }
                         break;
-                    case 144:
-                        if (location.parent && location.parent.kind === 143) {
+                    case 145:
+                        if (location.parent && location.parent.kind === 144) {
                             location = location.parent;
                         }
                         if (location.parent && ts.isClassElement(location.parent)) {
@@ -20140,7 +21583,7 @@ var ts;
                 }
                 if (result && isInExternalModule && (meaning & 107455) === 107455) {
                     var decls = result.declarations;
-                    if (decls && decls.length === 1 && decls[0].kind === 229) {
+                    if (decls && decls.length === 1 && decls[0].kind === 233) {
                         error(errorLocation, ts.Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead, name);
                     }
                 }
@@ -20187,9 +21630,9 @@ var ts;
         function getEntityNameForExtendingInterface(node) {
             switch (node.kind) {
                 case 70:
-                case 173:
+                case 177:
                     return node.parent ? getEntityNameForExtendingInterface(node.parent) : undefined;
-                case 195:
+                case 199:
                     ts.Debug.assert(ts.isEntityNameExpression(node.expression));
                     return node.expression;
                 default:
@@ -20210,7 +21653,7 @@ var ts;
             ts.Debug.assert((result.flags & 2) !== 0);
             var declaration = ts.forEach(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) ? d : undefined; });
             ts.Debug.assert(declaration !== undefined, "Block-scoped variable declaration is undefined");
-            if (!ts.isInAmbientContext(declaration) && !isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 219), errorLocation)) {
+            if (!ts.isInAmbientContext(declaration) && !isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 223), errorLocation)) {
                 error(errorLocation, ts.Diagnostics.Block_scoped_variable_0_used_before_its_declaration, ts.declarationNameToString(declaration.name));
             }
         }
@@ -20227,10 +21670,10 @@ var ts;
         }
         function getAnyImportSyntax(node) {
             if (ts.isAliasSymbolDeclaration(node)) {
-                if (node.kind === 230) {
+                if (node.kind === 234) {
                     return node;
                 }
-                while (node && node.kind !== 231) {
+                while (node && node.kind !== 235) {
                     node = node.parent;
                 }
                 return node;
@@ -20240,7 +21683,7 @@ var ts;
             return ts.forEach(symbol.declarations, function (d) { return ts.isAliasSymbolDeclaration(d) ? d : undefined; });
         }
         function getTargetOfImportEqualsDeclaration(node) {
-            if (node.moduleReference.kind === 241) {
+            if (node.moduleReference.kind === 245) {
                 return resolveExternalModuleSymbol(resolveExternalModuleName(node, ts.getExternalModuleImportEqualsDeclarationExpression(node)));
             }
             return getSymbolOfPartOfRightHandSideOfImportEquals(node.moduleReference);
@@ -20301,28 +21744,28 @@ var ts;
             var moduleSymbol = resolveExternalModuleName(node, node.moduleSpecifier);
             var targetSymbol = resolveESModuleSymbol(moduleSymbol, node.moduleSpecifier);
             if (targetSymbol) {
-                var name_13 = specifier.propertyName || specifier.name;
-                if (name_13.text) {
+                var name_19 = specifier.propertyName || specifier.name;
+                if (name_19.text) {
                     if (ts.isShorthandAmbientModuleSymbol(moduleSymbol)) {
                         return moduleSymbol;
                     }
                     var symbolFromVariable = void 0;
                     if (moduleSymbol && moduleSymbol.exports && moduleSymbol.exports["export="]) {
-                        symbolFromVariable = getPropertyOfType(getTypeOfSymbol(targetSymbol), name_13.text);
+                        symbolFromVariable = getPropertyOfType(getTypeOfSymbol(targetSymbol), name_19.text);
                     }
                     else {
-                        symbolFromVariable = getPropertyOfVariable(targetSymbol, name_13.text);
+                        symbolFromVariable = getPropertyOfVariable(targetSymbol, name_19.text);
                     }
                     symbolFromVariable = resolveSymbol(symbolFromVariable);
-                    var symbolFromModule = getExportOfModule(targetSymbol, name_13.text);
-                    if (!symbolFromModule && allowSyntheticDefaultImports && name_13.text === "default") {
+                    var symbolFromModule = getExportOfModule(targetSymbol, name_19.text);
+                    if (!symbolFromModule && allowSyntheticDefaultImports && name_19.text === "default") {
                         symbolFromModule = resolveExternalModuleSymbol(moduleSymbol) || resolveSymbol(moduleSymbol);
                     }
                     var symbol = symbolFromModule && symbolFromVariable ?
                         combineValueAndTypeSymbols(symbolFromVariable, symbolFromModule) :
                         symbolFromModule || symbolFromVariable;
                     if (!symbol) {
-                        error(name_13, ts.Diagnostics.Module_0_has_no_exported_member_1, getFullyQualifiedName(moduleSymbol), ts.declarationNameToString(name_13));
+                        error(name_19, ts.Diagnostics.Module_0_has_no_exported_member_1, getFullyQualifiedName(moduleSymbol), ts.declarationNameToString(name_19));
                     }
                     return symbol;
                 }
@@ -20344,19 +21787,19 @@ var ts;
         }
         function getTargetOfAliasDeclaration(node) {
             switch (node.kind) {
-                case 230:
+                case 234:
                     return getTargetOfImportEqualsDeclaration(node);
-                case 232:
-                    return getTargetOfImportClause(node);
-                case 233:
-                    return getTargetOfNamespaceImport(node);
-                case 235:
-                    return getTargetOfImportSpecifier(node);
-                case 239:
-                    return getTargetOfExportSpecifier(node);
                 case 236:
+                    return getTargetOfImportClause(node);
+                case 237:
+                    return getTargetOfNamespaceImport(node);
+                case 239:
+                    return getTargetOfImportSpecifier(node);
+                case 243:
+                    return getTargetOfExportSpecifier(node);
+                case 240:
                     return getTargetOfExportAssignment(node);
-                case 229:
+                case 233:
                     return getTargetOfNamespaceExportDeclaration(node);
             }
         }
@@ -20400,10 +21843,10 @@ var ts;
                 links.referenced = true;
                 var node = getDeclarationOfAliasSymbol(symbol);
                 ts.Debug.assert(!!node);
-                if (node.kind === 236) {
+                if (node.kind === 240) {
                     checkExpressionCached(node.expression);
                 }
-                else if (node.kind === 239) {
+                else if (node.kind === 243) {
                     checkExpressionCached(node.propertyName || node.name);
                 }
                 else if (ts.isInternalModuleImportEqualsDeclaration(node)) {
@@ -20415,11 +21858,11 @@ var ts;
             if (entityName.kind === 70 && ts.isRightSideOfQualifiedNameOrPropertyAccess(entityName)) {
                 entityName = entityName.parent;
             }
-            if (entityName.kind === 70 || entityName.parent.kind === 140) {
+            if (entityName.kind === 70 || entityName.parent.kind === 141) {
                 return resolveEntityName(entityName, 1920, false, dontResolveAlias);
             }
             else {
-                ts.Debug.assert(entityName.parent.kind === 230);
+                ts.Debug.assert(entityName.parent.kind === 234);
                 return resolveEntityName(entityName, 107455 | 793064 | 1920, false, dontResolveAlias);
             }
         }
@@ -20438,9 +21881,9 @@ var ts;
                     return undefined;
                 }
             }
-            else if (name.kind === 140 || name.kind === 173) {
-                var left = name.kind === 140 ? name.left : name.expression;
-                var right = name.kind === 140 ? name.right : name.name;
+            else if (name.kind === 141 || name.kind === 177) {
+                var left = name.kind === 141 ? name.left : name.expression;
+                var right = name.kind === 141 ? name.right : name.name;
                 var namespace = resolveEntityName(left, 1920, ignoreErrors, false, location);
                 if (!namespace || ts.nodeIsMissing(right)) {
                     return undefined;
@@ -20465,27 +21908,28 @@ var ts;
         function resolveExternalModuleName(location, moduleReferenceExpression) {
             return resolveExternalModuleNameWorker(location, moduleReferenceExpression, ts.Diagnostics.Cannot_find_module_0);
         }
-        function resolveExternalModuleNameWorker(location, moduleReferenceExpression, moduleNotFoundError) {
+        function resolveExternalModuleNameWorker(location, moduleReferenceExpression, moduleNotFoundError, isForAugmentation) {
+            if (isForAugmentation === void 0) { isForAugmentation = false; }
             if (moduleReferenceExpression.kind !== 9) {
                 return;
             }
             var moduleReferenceLiteral = moduleReferenceExpression;
-            return resolveExternalModule(location, moduleReferenceLiteral.text, moduleNotFoundError, moduleReferenceLiteral);
+            return resolveExternalModule(location, moduleReferenceLiteral.text, moduleNotFoundError, moduleReferenceLiteral, isForAugmentation);
         }
-        function resolveExternalModule(location, moduleReference, moduleNotFoundError, errorNode) {
+        function resolveExternalModule(location, moduleReference, moduleNotFoundError, errorNode, isForAugmentation) {
+            if (isForAugmentation === void 0) { isForAugmentation = false; }
             var moduleName = ts.escapeIdentifier(moduleReference);
             if (moduleName === undefined) {
                 return;
             }
-            var isRelative = ts.isExternalModuleNameRelative(moduleName);
-            if (!isRelative) {
-                var symbol = getSymbol(globals, '"' + moduleName + '"', 512);
-                if (symbol) {
-                    return getMergedSymbol(symbol);
-                }
+            var ambientModule = tryFindAmbientModule(moduleName, true);
+            if (ambientModule) {
+                return ambientModule;
             }
+            var isRelative = ts.isExternalModuleNameRelative(moduleName);
             var resolvedModule = ts.getResolvedModule(ts.getSourceFileOfNode(location), moduleReference);
-            var sourceFile = resolvedModule && host.getSourceFile(resolvedModule.resolvedFileName);
+            var resolutionDiagnostic = resolvedModule && ts.getResolutionDiagnostic(compilerOptions, resolvedModule);
+            var sourceFile = resolvedModule && !resolutionDiagnostic && host.getSourceFile(resolvedModule.resolvedFileName);
             if (sourceFile) {
                 if (sourceFile.symbol) {
                     return getMergedSymbol(sourceFile.symbol);
@@ -20501,14 +21945,30 @@ var ts;
                     return getMergedSymbol(pattern.symbol);
                 }
             }
+            if (!isRelative && resolvedModule && !ts.extensionIsTypeScript(resolvedModule.extension)) {
+                if (isForAugmentation) {
+                    ts.Debug.assert(!!moduleNotFoundError);
+                    var diag = ts.Diagnostics.Invalid_module_name_in_augmentation_Module_0_resolves_to_an_untyped_module_at_1_which_cannot_be_augmented;
+                    error(errorNode, diag, moduleName, resolvedModule.resolvedFileName);
+                }
+                else if (compilerOptions.noImplicitAny && moduleNotFoundError) {
+                    error(errorNode, ts.Diagnostics.Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type, moduleReference, resolvedModule.resolvedFileName);
+                }
+                return undefined;
+            }
             if (moduleNotFoundError) {
-                var tsExtension = ts.tryExtractTypeScriptExtension(moduleName);
-                if (tsExtension) {
-                    var diag = ts.Diagnostics.An_import_path_cannot_end_with_a_0_extension_Consider_importing_1_instead;
-                    error(errorNode, diag, tsExtension, ts.removeExtension(moduleName, tsExtension));
+                if (resolutionDiagnostic) {
+                    error(errorNode, resolutionDiagnostic, moduleName, resolvedModule.resolvedFileName);
                 }
                 else {
-                    error(errorNode, moduleNotFoundError, moduleName);
+                    var tsExtension = ts.tryExtractTypeScriptExtension(moduleName);
+                    if (tsExtension) {
+                        var diag = ts.Diagnostics.An_import_path_cannot_end_with_a_0_extension_Consider_importing_1_instead;
+                        error(errorNode, diag, tsExtension, ts.removeExtension(moduleName, tsExtension));
+                    }
+                    else {
+                        error(errorNode, moduleNotFoundError, moduleName);
+                    }
                 }
             }
             return undefined;
@@ -20623,7 +22083,7 @@ var ts;
             var members = node.members;
             for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
                 var member = members_1[_i];
-                if (member.kind === 149 && ts.nodeIsPresent(member.body)) {
+                if (member.kind === 150 && ts.nodeIsPresent(member.body)) {
                     return member;
                 }
             }
@@ -20645,8 +22105,9 @@ var ts;
             type.intrinsicName = "boolean";
             return type;
         }
-        function createObjectType(kind, symbol) {
-            var type = createType(kind);
+        function createObjectType(objectFlags, symbol) {
+            var type = createType(32768);
+            type.objectFlags = objectFlags;
             type.symbol = symbol;
             return type;
         }
@@ -20670,7 +22131,7 @@ var ts;
             }
             return result || emptyArray;
         }
-        function setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
+        function setStructuredTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
             type.members = members;
             type.properties = getNamedMembers(members);
             type.callSignatures = callSignatures;
@@ -20682,7 +22143,7 @@ var ts;
             return type;
         }
         function createAnonymousType(symbol, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
-            return setObjectTypeMembers(createObjectType(2097152, symbol), members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+            return setStructuredTypeMembers(createObjectType(16, symbol), members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function forEachSymbolTableInScope(enclosingDeclaration, callback) {
             var result;
@@ -20693,11 +22154,11 @@ var ts;
                     }
                 }
                 switch (location_1.kind) {
-                    case 256:
+                    case 261:
                         if (!ts.isExternalOrCommonJsModule(location_1)) {
                             break;
                         }
-                    case 226:
+                    case 230:
                         if (result = callback(getSymbolOfNode(location_1).exports)) {
                             return result;
                         }
@@ -20730,7 +22191,7 @@ var ts;
                 return ts.forEachProperty(symbols, function (symbolFromSymbolTable) {
                     if (symbolFromSymbolTable.flags & 8388608
                         && symbolFromSymbolTable.name !== "export="
-                        && !ts.getDeclarationOfKind(symbolFromSymbolTable, 239)) {
+                        && !ts.getDeclarationOfKind(symbolFromSymbolTable, 243)) {
                         if (!useOnlyExternalAliasing ||
                             ts.forEach(symbolFromSymbolTable.declarations, ts.isExternalModuleImportEqualsDeclaration)) {
                             var resolvedImportedSymbol = resolveAlias(symbolFromSymbolTable);
@@ -20761,7 +22222,7 @@ var ts;
                 if (symbolFromSymbolTable === symbol) {
                     return true;
                 }
-                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 8388608 && !ts.getDeclarationOfKind(symbolFromSymbolTable, 239)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
+                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 8388608 && !ts.getDeclarationOfKind(symbolFromSymbolTable, 243)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
                 if (symbolFromSymbolTable.flags & meaning) {
                     qualify = true;
                     return true;
@@ -20775,10 +22236,10 @@ var ts;
                 for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
                     switch (declaration.kind) {
-                        case 146:
-                        case 148:
-                        case 150:
+                        case 147:
+                        case 149:
                         case 151:
+                        case 152:
                             continue;
                         default:
                             return false;
@@ -20834,7 +22295,7 @@ var ts;
             }
         }
         function hasExternalModuleSymbol(declaration) {
-            return ts.isAmbientModule(declaration) || (declaration.kind === 256 && ts.isExternalOrCommonJsModule(declaration));
+            return ts.isAmbientModule(declaration) || (declaration.kind === 261 && ts.isExternalOrCommonJsModule(declaration));
         }
         function hasVisibleDeclarations(symbol, shouldComputeAliasToMakeVisible) {
             var aliasesToMakeVisible;
@@ -20868,11 +22329,11 @@ var ts;
         }
         function isEntityNameVisible(entityName, enclosingDeclaration) {
             var meaning;
-            if (entityName.parent.kind === 159 || ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
+            if (entityName.parent.kind === 160 || ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
                 meaning = 107455 | 1048576;
             }
-            else if (entityName.kind === 140 || entityName.kind === 173 ||
-                entityName.parent.kind === 230) {
+            else if (entityName.kind === 141 || entityName.kind === 177 ||
+                entityName.parent.kind === 234) {
                 meaning = 1920;
             }
             else {
@@ -20964,10 +22425,10 @@ var ts;
         function getTypeAliasForTypeLiteral(type) {
             if (type.symbol && type.symbol.flags & 2048) {
                 var node = type.symbol.declarations[0].parent;
-                while (node.kind === 165) {
+                while (node.kind === 166) {
                     node = node.parent;
                 }
-                if (node.kind === 224) {
+                if (node.kind === 228) {
                     return getSymbolOfNode(node);
                 }
             }
@@ -20975,7 +22436,7 @@ var ts;
         }
         function isTopLevelInExternalModuleAugmentation(node) {
             return node && node.parent &&
-                node.parent.kind === 227 &&
+                node.parent.kind === 231 &&
                 ts.isExternalModuleAugmentation(node.parent.parent);
         }
         function literalTypeToString(type) {
@@ -20989,10 +22450,10 @@ var ts;
                         return ts.declarationNameToString(declaration.name);
                     }
                     switch (declaration.kind) {
-                        case 193:
+                        case 197:
                             return "(Anonymous class)";
-                        case 180:
-                        case 181:
+                        case 184:
+                        case 185:
                             return "(Anonymous function)";
                     }
                 }
@@ -21044,9 +22505,9 @@ var ts;
                     var accessibleSymbolChain = getAccessibleSymbolChain(symbol, enclosingDeclaration, meaning, !!(flags & 2));
                     if (!accessibleSymbolChain ||
                         needsQualification(accessibleSymbolChain[0], enclosingDeclaration, accessibleSymbolChain.length === 1 ? meaning : getQualifiedLeftMeaning(meaning))) {
-                        var parent_8 = getParentOfSymbol(accessibleSymbolChain ? accessibleSymbolChain[0] : symbol);
-                        if (parent_8) {
-                            walkSymbol(parent_8, getQualifiedLeftMeaning(meaning), false);
+                        var parent_6 = getParentOfSymbol(accessibleSymbolChain ? accessibleSymbolChain[0] : symbol);
+                        if (parent_6) {
+                            walkSymbol(parent_6, getQualifiedLeftMeaning(meaning), false);
                         }
                     }
                     if (accessibleSymbolChain) {
@@ -21087,7 +22548,7 @@ var ts;
                         }
                         writer.writeKeyword("this");
                     }
-                    else if (type.flags & 131072) {
+                    else if (getObjectFlags(type) & 4) {
                         writeTypeReference(type, nextFlags);
                     }
                     else if (type.flags & 256) {
@@ -21095,23 +22556,34 @@ var ts;
                         writePunctuation(writer, 22);
                         appendSymbolNameOnly(type.symbol, writer);
                     }
-                    else if (type.flags & (32768 | 65536 | 16 | 16384)) {
+                    else if (getObjectFlags(type) & 3 || type.flags & (16 | 16384)) {
                         buildSymbolDisplay(type.symbol, writer, enclosingDeclaration, 793064, 0, nextFlags);
                     }
-                    else if (!(flags & 512) && ((type.flags & 2097152 && !type.target) || type.flags & 1572864) && type.aliasSymbol &&
+                    else if (!(flags & 512) && type.aliasSymbol &&
                         isSymbolAccessible(type.aliasSymbol, enclosingDeclaration, 793064, false).accessibility === 0) {
                         var typeArguments = type.aliasTypeArguments;
                         writeSymbolTypeReference(type.aliasSymbol, typeArguments, 0, typeArguments ? typeArguments.length : 0, nextFlags);
                     }
-                    else if (type.flags & 1572864) {
+                    else if (type.flags & 196608) {
                         writeUnionOrIntersectionType(type, nextFlags);
                     }
-                    else if (type.flags & 2097152) {
+                    else if (getObjectFlags(type) & (16 | 32)) {
                         writeAnonymousType(type, nextFlags);
                     }
                     else if (type.flags & 96) {
                         writer.writeStringLiteral(literalTypeToString(type));
                     }
+                    else if (type.flags & 262144) {
+                        writer.writeKeyword("keyof");
+                        writeSpace(writer);
+                        writeType(type.type, 64);
+                    }
+                    else if (type.flags & 524288) {
+                        writeType(type.objectType, 64);
+                        writePunctuation(writer, 20);
+                        writeType(type.indexType, 0);
+                        writePunctuation(writer, 21);
+                    }
                     else {
                         writePunctuation(writer, 16);
                         writeSpace(writer);
@@ -21156,7 +22628,7 @@ var ts;
                         writePunctuation(writer, 20);
                         writePunctuation(writer, 21);
                     }
-                    else if (type.target.flags & 262144) {
+                    else if (type.target.objectFlags & 8) {
                         writePunctuation(writer, 20);
                         writeTypeList(type.typeArguments.slice(0, getTypeReferenceArity(type)), 25);
                         writePunctuation(writer, 21);
@@ -21168,12 +22640,12 @@ var ts;
                             var length_1 = outerTypeParameters.length;
                             while (i < length_1) {
                                 var start = i;
-                                var parent_9 = getParentSymbolOfTypeParameter(outerTypeParameters[i]);
+                                var parent_7 = getParentSymbolOfTypeParameter(outerTypeParameters[i]);
                                 do {
                                     i++;
-                                } while (i < length_1 && getParentSymbolOfTypeParameter(outerTypeParameters[i]) === parent_9);
+                                } while (i < length_1 && getParentSymbolOfTypeParameter(outerTypeParameters[i]) === parent_7);
                                 if (!ts.rangeEquals(outerTypeParameters, typeArguments, start, i)) {
-                                    writeSymbolTypeReference(parent_9, typeArguments, start, i, flags);
+                                    writeSymbolTypeReference(parent_7, typeArguments, start, i, flags);
                                     writePunctuation(writer, 22);
                                 }
                             }
@@ -21186,7 +22658,7 @@ var ts;
                     if (flags & 64) {
                         writePunctuation(writer, 18);
                     }
-                    if (type.flags & 524288) {
+                    if (type.flags & 65536) {
                         writeTypeList(formatUnionTypes(type.types), 48);
                     }
                     else {
@@ -21232,7 +22704,7 @@ var ts;
                         var isNonLocalFunctionSymbol = !!(symbol.flags & 16) &&
                             (symbol.parent ||
                                 ts.forEach(symbol.declarations, function (declaration) {
-                                    return declaration.parent.kind === 256 || declaration.parent.kind === 227;
+                                    return declaration.parent.kind === 261 || declaration.parent.kind === 231;
                                 }));
                         if (isStaticMethodSymbol || isNonLocalFunctionSymbol) {
                             return !!(flags & 2) ||
@@ -21248,7 +22720,7 @@ var ts;
                 function writeIndexSignature(info, keyword) {
                     if (info) {
                         if (info.isReadonly) {
-                            writeKeyword(writer, 129);
+                            writeKeyword(writer, 130);
                             writeSpace(writer);
                         }
                         writePunctuation(writer, 20);
@@ -21266,7 +22738,7 @@ var ts;
                 }
                 function writePropertyWithModifiers(prop) {
                     if (isReadonlySymbol(prop)) {
-                        writeKeyword(writer, 129);
+                        writeKeyword(writer, 130);
                         writeSpace(writer);
                     }
                     buildSymbolDisplay(prop, writer);
@@ -21286,6 +22758,12 @@ var ts;
                     return false;
                 }
                 function writeLiteralType(type, flags) {
+                    if (type.objectFlags & 32) {
+                        if (getConstraintTypeFromMappedType(type).flags & (16384 | 262144)) {
+                            writeMappedType(type);
+                            return;
+                        }
+                    }
                     var resolved = resolveStructuredTypeMembers(type);
                     if (!resolved.properties.length && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
                         if (!resolved.callSignatures.length && !resolved.constructSignatures.length) {
@@ -21322,6 +22800,12 @@ var ts;
                     writePunctuation(writer, 16);
                     writer.writeLine();
                     writer.increaseIndent();
+                    writeObjectLiteralType(resolved);
+                    writer.decreaseIndent();
+                    writePunctuation(writer, 17);
+                    inObjectTypeLiteral = saveInObjectTypeLiteral;
+                }
+                function writeObjectLiteralType(resolved) {
                     for (var _i = 0, _a = resolved.callSignatures; _i < _a.length; _i++) {
                         var signature = _a[_i];
                         buildSignatureDisplay(signature, writer, enclosingDeclaration, globalFlagsToPass, undefined, symbolStack);
@@ -21334,8 +22818,8 @@ var ts;
                         writePunctuation(writer, 24);
                         writer.writeLine();
                     }
-                    writeIndexSignature(resolved.stringIndexInfo, 133);
-                    writeIndexSignature(resolved.numberIndexInfo, 131);
+                    writeIndexSignature(resolved.stringIndexInfo, 134);
+                    writeIndexSignature(resolved.numberIndexInfo, 132);
                     for (var _d = 0, _e = resolved.properties; _d < _e.length; _d++) {
                         var p = _e[_d];
                         var t = getTypeOfSymbol(p);
@@ -21358,9 +22842,32 @@ var ts;
                             writer.writeLine();
                         }
                     }
+                }
+                function writeMappedType(type) {
+                    writePunctuation(writer, 16);
+                    writer.writeLine();
+                    writer.increaseIndent();
+                    if (type.declaration.readonlyToken) {
+                        writeKeyword(writer, 130);
+                        writeSpace(writer);
+                    }
+                    writePunctuation(writer, 20);
+                    appendSymbolNameOnly(getTypeParameterFromMappedType(type).symbol, writer);
+                    writeSpace(writer);
+                    writeKeyword(writer, 91);
+                    writeSpace(writer);
+                    writeType(getConstraintTypeFromMappedType(type), 0);
+                    writePunctuation(writer, 21);
+                    if (type.declaration.questionToken) {
+                        writePunctuation(writer, 54);
+                    }
+                    writePunctuation(writer, 55);
+                    writeSpace(writer);
+                    writeType(getTemplateTypeFromMappedType(type), 0);
+                    writePunctuation(writer, 24);
+                    writer.writeLine();
                     writer.decreaseIndent();
                     writePunctuation(writer, 17);
-                    inObjectTypeLiteral = saveInObjectTypeLiteral;
                 }
             }
             function buildTypeParameterDisplayFromSymbol(symbol, writer, enclosingDeclaration, flags) {
@@ -21398,12 +22905,12 @@ var ts;
                 buildTypeDisplay(getTypeOfSymbol(p), writer, enclosingDeclaration, flags, symbolStack);
             }
             function buildBindingPatternDisplay(bindingPattern, writer, enclosingDeclaration, flags, symbolStack) {
-                if (bindingPattern.kind === 168) {
+                if (bindingPattern.kind === 172) {
                     writePunctuation(writer, 16);
                     buildDisplayForCommaSeparatedList(bindingPattern.elements, writer, function (e) { return buildBindingElementDisplay(e, writer, enclosingDeclaration, flags, symbolStack); });
                     writePunctuation(writer, 17);
                 }
-                else if (bindingPattern.kind === 169) {
+                else if (bindingPattern.kind === 173) {
                     writePunctuation(writer, 20);
                     var elements = bindingPattern.elements;
                     buildDisplayForCommaSeparatedList(elements, writer, function (e) { return buildBindingElementDisplay(e, writer, enclosingDeclaration, flags, symbolStack); });
@@ -21417,7 +22924,7 @@ var ts;
                 if (ts.isOmittedExpression(bindingElement)) {
                     return;
                 }
-                ts.Debug.assert(bindingElement.kind === 170);
+                ts.Debug.assert(bindingElement.kind === 174);
                 if (bindingElement.propertyName) {
                     writer.writeSymbol(ts.getTextOfNode(bindingElement.propertyName), bindingElement.symbol);
                     writePunctuation(writer, 55);
@@ -21545,63 +23052,63 @@ var ts;
             return false;
             function determineIfDeclarationIsVisible() {
                 switch (node.kind) {
-                    case 170:
+                    case 174:
                         return isDeclarationVisible(node.parent.parent);
-                    case 219:
+                    case 223:
                         if (ts.isBindingPattern(node.name) &&
                             !node.name.elements.length) {
                             return false;
                         }
-                    case 226:
-                    case 222:
-                    case 223:
-                    case 224:
-                    case 221:
-                    case 225:
                     case 230:
+                    case 226:
+                    case 227:
+                    case 228:
+                    case 225:
+                    case 229:
+                    case 234:
                         if (ts.isExternalModuleAugmentation(node)) {
                             return true;
                         }
-                        var parent_10 = getDeclarationContainer(node);
+                        var parent_8 = getDeclarationContainer(node);
                         if (!(ts.getCombinedModifierFlags(node) & 1) &&
-                            !(node.kind !== 230 && parent_10.kind !== 256 && ts.isInAmbientContext(parent_10))) {
-                            return isGlobalSourceFile(parent_10);
+                            !(node.kind !== 234 && parent_8.kind !== 261 && ts.isInAmbientContext(parent_8))) {
+                            return isGlobalSourceFile(parent_8);
                         }
-                        return isDeclarationVisible(parent_10);
-                    case 146:
-                    case 145:
-                    case 150:
-                    case 151:
-                    case 148:
+                        return isDeclarationVisible(parent_8);
                     case 147:
+                    case 146:
+                    case 151:
+                    case 152:
+                    case 149:
+                    case 148:
                         if (ts.getModifierFlags(node) & (8 | 16)) {
                             return false;
                         }
-                    case 149:
-                    case 153:
-                    case 152:
+                    case 150:
                     case 154:
-                    case 143:
-                    case 227:
-                    case 157:
+                    case 153:
+                    case 155:
+                    case 144:
+                    case 231:
                     case 158:
-                    case 160:
-                    case 156:
+                    case 159:
                     case 161:
+                    case 157:
                     case 162:
                     case 163:
                     case 164:
                     case 165:
+                    case 166:
                         return isDeclarationVisible(node.parent);
-                    case 232:
-                    case 233:
-                    case 235:
-                        return false;
-                    case 142:
-                    case 256:
-                    case 229:
-                        return true;
                     case 236:
+                    case 237:
+                    case 239:
+                        return false;
+                    case 143:
+                    case 261:
+                    case 233:
+                        return true;
+                    case 240:
                         return false;
                     default:
                         return false;
@@ -21610,10 +23117,10 @@ var ts;
         }
         function collectLinkedAliases(node) {
             var exportSymbol;
-            if (node.parent && node.parent.kind === 236) {
+            if (node.parent && node.parent.kind === 240) {
                 exportSymbol = resolveName(node.parent, node.text, 107455 | 793064 | 1920 | 8388608, ts.Diagnostics.Cannot_find_name_0, node);
             }
-            else if (node.parent.kind === 239) {
+            else if (node.parent.kind === 243) {
                 var exportSpecifier = node.parent;
                 exportSymbol = exportSpecifier.parent.parent.moduleSpecifier ?
                     getExternalModuleMember(exportSpecifier.parent.parent, exportSpecifier) :
@@ -21675,7 +23182,6 @@ var ts;
                 return getSymbolLinks(target).declaredType;
             }
             if (propertyName === 1) {
-                ts.Debug.assert(!!(target.flags & 32768));
                 return target.resolvedBaseConstructorType;
             }
             if (propertyName === 3) {
@@ -21692,12 +23198,12 @@ var ts;
             node = ts.getRootDeclaration(node);
             while (node) {
                 switch (node.kind) {
-                    case 219:
-                    case 220:
-                    case 235:
-                    case 234:
-                    case 233:
-                    case 232:
+                    case 223:
+                    case 224:
+                    case 239:
+                    case 238:
+                    case 237:
+                    case 236:
                         node = node.parent;
                         break;
                     default:
@@ -21723,22 +23229,30 @@ var ts;
             var symbol = getSymbolOfNode(node);
             return symbol && getSymbolLinks(symbol).type || getTypeForVariableLikeDeclaration(node, false);
         }
-        function getTextOfPropertyName(name) {
-            switch (name.kind) {
-                case 70:
-                    return name.text;
-                case 9:
-                case 8:
-                    return name.text;
-                case 141:
-                    if (ts.isStringOrNumericLiteral(name.expression.kind)) {
-                        return name.expression.text;
-                    }
-            }
-            return undefined;
-        }
         function isComputedNonLiteralName(name) {
-            return name.kind === 141 && !ts.isStringOrNumericLiteral(name.expression.kind);
+            return name.kind === 142 && !ts.isStringOrNumericLiteral(name.expression.kind);
+        }
+        function getRestType(source, properties, symbol) {
+            ts.Debug.assert(!!(source.flags & 32768), "Rest types only support object types right now.");
+            var members = ts.createMap();
+            var names = ts.createMap();
+            for (var _i = 0, properties_2 = properties; _i < properties_2.length; _i++) {
+                var name_20 = properties_2[_i];
+                names[ts.getTextOfPropertyName(name_20)] = true;
+            }
+            for (var _a = 0, _b = getPropertiesOfType(source); _a < _b.length; _a++) {
+                var prop = _b[_a];
+                var inNamesToRemove = prop.name in names;
+                var isPrivate = getDeclarationModifierFlagsFromSymbol(prop) & (8 | 16);
+                var isMethod = prop.flags & 8192;
+                var isSetOnlyAccessor = prop.flags & 65536 && !(prop.flags & 32768);
+                if (!inNamesToRemove && !isPrivate && !isMethod && !isSetOnlyAccessor) {
+                    members[prop.name] = prop;
+                }
+            }
+            var stringIndexInfo = getIndexInfoOfType(source, 0);
+            var numberIndexInfo = getIndexInfoOfType(source, 1);
+            return createAnonymousType(symbol, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
         }
         function getTypeForBindingElement(declaration) {
             var pattern = declaration.parent;
@@ -21753,26 +23267,45 @@ var ts;
                 return parentType;
             }
             var type;
-            if (pattern.kind === 168) {
-                var name_14 = declaration.propertyName || declaration.name;
-                if (isComputedNonLiteralName(name_14)) {
-                    return anyType;
+            if (pattern.kind === 172) {
+                if (declaration.dotDotDotToken) {
+                    if (!(parentType.flags & 32768)) {
+                        error(declaration, ts.Diagnostics.Rest_types_may_only_be_created_from_object_types);
+                        return unknownType;
+                    }
+                    var literalMembers = [];
+                    for (var _i = 0, _a = pattern.elements; _i < _a.length; _i++) {
+                        var element = _a[_i];
+                        if (element.kind !== 198 && !element.dotDotDotToken) {
+                            literalMembers.push(element.propertyName || element.name);
+                        }
+                    }
+                    type = getRestType(parentType, literalMembers, declaration.symbol);
                 }
-                if (declaration.initializer) {
-                    getContextualType(declaration.initializer);
-                }
-                var text = getTextOfPropertyName(name_14);
-                type = getTypeOfPropertyOfType(parentType, text) ||
-                    isNumericLiteralName(text) && getIndexTypeOfType(parentType, 1) ||
-                    getIndexTypeOfType(parentType, 0);
-                if (!type) {
-                    error(name_14, ts.Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(parentType), ts.declarationNameToString(name_14));
-                    return unknownType;
+                else {
+                    var name_21 = declaration.propertyName || declaration.name;
+                    if (isComputedNonLiteralName(name_21)) {
+                        return anyType;
+                    }
+                    if (declaration.initializer) {
+                        getContextualType(declaration.initializer);
+                    }
+                    var text = ts.getTextOfPropertyName(name_21);
+                    type = getTypeOfPropertyOfType(parentType, text) ||
+                        isNumericLiteralName(text) && getIndexTypeOfType(parentType, 1) ||
+                        getIndexTypeOfType(parentType, 0);
+                    if (!type) {
+                        error(name_21, ts.Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(parentType), ts.declarationNameToString(name_21));
+                        return unknownType;
+                    }
                 }
             }
             else {
                 var elementType = checkIteratedTypeOrElementType(parentType, pattern, false);
-                if (!declaration.dotDotDotToken) {
+                if (declaration.dotDotDotToken) {
+                    type = createArrayType(elementType);
+                }
+                else {
                     var propName = "" + ts.indexOf(pattern.elements, declaration);
                     type = isTupleLikeType(parentType)
                         ? getTypeOfPropertyOfType(parentType, propName)
@@ -21787,9 +23320,6 @@ var ts;
                         return unknownType;
                     }
                 }
-                else {
-                    type = createArrayType(elementType);
-                }
             }
             if (strictNullChecks && declaration.initializer && !(getFalsyFlags(checkExpressionCached(declaration.initializer)) & 2048)) {
                 type = getTypeWithFacts(type, 131072);
@@ -21809,15 +23339,15 @@ var ts;
             if (typeTag && typeTag.typeExpression) {
                 return typeTag.typeExpression.type;
             }
-            if (declaration.kind === 219 &&
-                declaration.parent.kind === 220 &&
-                declaration.parent.parent.kind === 201) {
+            if (declaration.kind === 223 &&
+                declaration.parent.kind === 224 &&
+                declaration.parent.parent.kind === 205) {
                 var annotation = ts.getJSDocTypeTag(declaration.parent.parent);
                 if (annotation && annotation.typeExpression) {
                     return annotation.typeExpression.type;
                 }
             }
-            else if (declaration.kind === 143) {
+            else if (declaration.kind === 144) {
                 var paramTag = ts.getCorrespondingJSDocParameterTag(declaration);
                 if (paramTag && paramTag.typeExpression) {
                     return paramTag.typeExpression.type;
@@ -21831,22 +23361,22 @@ var ts;
         }
         function isEmptyArrayLiteral(node) {
             var expr = ts.skipParentheses(node);
-            return expr.kind === 171 && expr.elements.length === 0;
+            return expr.kind === 175 && expr.elements.length === 0;
         }
         function addOptionality(type, optional) {
             return strictNullChecks && optional ? includeFalsyTypes(type, 2048) : type;
         }
         function getTypeForVariableLikeDeclaration(declaration, includeOptionality) {
-            if (declaration.flags & 1048576) {
+            if (declaration.flags & 2097152) {
                 var type = getTypeForVariableLikeDeclarationFromJSDocComment(declaration);
                 if (type && type !== unknownType) {
                     return type;
                 }
             }
-            if (declaration.parent.parent.kind === 208) {
+            if (declaration.parent.parent.kind === 212) {
                 return stringType;
             }
-            if (declaration.parent.parent.kind === 209) {
+            if (declaration.parent.parent.kind === 213) {
                 return checkRightHandSideOfForOf(declaration.parent.parent.expression) || anyType;
             }
             if (ts.isBindingPattern(declaration.parent)) {
@@ -21855,7 +23385,7 @@ var ts;
             if (declaration.type) {
                 return addOptionality(getTypeFromTypeNode(declaration.type), declaration.questionToken && includeOptionality);
             }
-            if (declaration.kind === 219 && !ts.isBindingPattern(declaration.name) &&
+            if (declaration.kind === 223 && !ts.isBindingPattern(declaration.name) &&
                 !(ts.getCombinedModifierFlags(declaration) & 1) && !ts.isInAmbientContext(declaration)) {
                 if (!(ts.getCombinedNodeFlags(declaration) & 2) && (!declaration.initializer || isNullOrUndefined(declaration.initializer))) {
                     return autoType;
@@ -21864,10 +23394,10 @@ var ts;
                     return autoArrayType;
                 }
             }
-            if (declaration.kind === 143) {
+            if (declaration.kind === 144) {
                 var func = declaration.parent;
-                if (func.kind === 151 && !ts.hasDynamicName(func)) {
-                    var getter = ts.getDeclarationOfKind(declaration.parent.symbol, 150);
+                if (func.kind === 152 && !ts.hasDynamicName(func)) {
+                    var getter = ts.getDeclarationOfKind(declaration.parent.symbol, 151);
                     if (getter) {
                         var getterSignature = getSignatureFromDeclaration(getter);
                         var thisParameter = getAccessorThisParameter(func);
@@ -21893,7 +23423,7 @@ var ts;
                 var type = checkDeclarationInitializer(declaration);
                 return addOptionality(type, declaration.questionToken && includeOptionality);
             }
-            if (declaration.kind === 254) {
+            if (declaration.kind === 258) {
                 return checkIdentifier(declaration.name);
             }
             if (ts.isBindingPattern(declaration.name)) {
@@ -21918,11 +23448,11 @@ var ts;
             var hasComputedProperties = false;
             ts.forEach(pattern.elements, function (e) {
                 var name = e.propertyName || e.name;
-                if (isComputedNonLiteralName(name)) {
+                if (isComputedNonLiteralName(name) || e.dotDotDotToken) {
                     hasComputedProperties = true;
                     return;
                 }
-                var text = getTextOfPropertyName(name);
+                var text = ts.getTextOfPropertyName(name);
                 var flags = 4 | 67108864 | (e.initializer ? 536870912 : 0);
                 var symbol = createSymbol(flags, text);
                 symbol.type = getTypeFromBindingElement(e, includePatternInType, reportErrors);
@@ -21934,7 +23464,7 @@ var ts;
                 result.pattern = pattern;
             }
             if (hasComputedProperties) {
-                result.isObjectLiteralPatternWithComputedProperties = true;
+                result.objectFlags |= 512;
             }
             return result;
         }
@@ -21953,7 +23483,7 @@ var ts;
             return result;
         }
         function getTypeFromBindingPattern(pattern, includePatternInType, reportErrors) {
-            return pattern.kind === 168
+            return pattern.kind === 172
                 ? getTypeFromObjectBindingPattern(pattern, includePatternInType, reportErrors)
                 : getTypeFromArrayBindingPattern(pattern, includePatternInType, reportErrors);
         }
@@ -21963,7 +23493,7 @@ var ts;
                 if (reportErrors) {
                     reportErrorsFromWidening(declaration, type);
                 }
-                if (declaration.kind === 253) {
+                if (declaration.kind === 257) {
                     return type;
                 }
                 return getWidenedType(type);
@@ -21978,7 +23508,7 @@ var ts;
         }
         function declarationBelongsToPrivateAmbientMember(declaration) {
             var root = ts.getRootDeclaration(declaration);
-            var memberDeclaration = root.kind === 143 ? root.parent : root;
+            var memberDeclaration = root.kind === 144 ? root.parent : root;
             return isPrivateWithinAmbient(memberDeclaration);
         }
         function getTypeOfVariableOrParameterOrProperty(symbol) {
@@ -21988,28 +23518,28 @@ var ts;
                     return links.type = getTypeOfPrototypeProperty(symbol);
                 }
                 var declaration = symbol.valueDeclaration;
-                if (declaration.parent.kind === 252) {
+                if (ts.isCatchClauseVariableDeclarationOrBindingElement(declaration)) {
                     return links.type = anyType;
                 }
-                if (declaration.kind === 236) {
+                if (declaration.kind === 240) {
                     return links.type = checkExpression(declaration.expression);
                 }
-                if (declaration.flags & 1048576 && declaration.kind === 280 && declaration.typeExpression) {
+                if (declaration.flags & 2097152 && declaration.kind === 285 && declaration.typeExpression) {
                     return links.type = getTypeFromTypeNode(declaration.typeExpression.type);
                 }
                 if (!pushTypeResolution(symbol, 0)) {
                     return unknownType;
                 }
                 var type = void 0;
-                if (declaration.kind === 188 ||
-                    declaration.kind === 173 && declaration.parent.kind === 188) {
-                    if (declaration.flags & 1048576) {
+                if (declaration.kind === 192 ||
+                    declaration.kind === 177 && declaration.parent.kind === 192) {
+                    if (declaration.flags & 2097152) {
                         var typeTag = ts.getJSDocTypeTag(declaration.parent);
                         if (typeTag && typeTag.typeExpression) {
                             return links.type = getTypeFromTypeNode(typeTag.typeExpression.type);
                         }
                     }
-                    var declaredTypes = ts.map(symbol.declarations, function (decl) { return decl.kind === 188 ?
+                    var declaredTypes = ts.map(symbol.declarations, function (decl) { return decl.kind === 192 ?
                         checkExpressionCached(decl.right) :
                         checkExpressionCached(decl.parent.right); });
                     type = getUnionType(declaredTypes, true);
@@ -22035,7 +23565,7 @@ var ts;
         }
         function getAnnotatedAccessorType(accessor) {
             if (accessor) {
-                if (accessor.kind === 150) {
+                if (accessor.kind === 151) {
                     return accessor.type && getTypeFromTypeNode(accessor.type);
                 }
                 else {
@@ -22055,9 +23585,9 @@ var ts;
         function getTypeOfAccessors(symbol) {
             var links = getSymbolLinks(symbol);
             if (!links.type) {
-                var getter = ts.getDeclarationOfKind(symbol, 150);
-                var setter = ts.getDeclarationOfKind(symbol, 151);
-                if (getter && getter.flags & 1048576) {
+                var getter = ts.getDeclarationOfKind(symbol, 151);
+                var setter = ts.getDeclarationOfKind(symbol, 152);
+                if (getter && getter.flags & 2097152) {
                     var jsDocType = getTypeForVariableLikeDeclarationFromJSDocComment(getter);
                     if (jsDocType) {
                         return links.type = jsDocType;
@@ -22097,7 +23627,7 @@ var ts;
                 if (!popTypeResolution()) {
                     type = anyType;
                     if (compilerOptions.noImplicitAny) {
-                        var getter_1 = ts.getDeclarationOfKind(symbol, 150);
+                        var getter_1 = ts.getDeclarationOfKind(symbol, 151);
                         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));
                     }
                 }
@@ -22108,11 +23638,11 @@ var ts;
         function getTypeOfFuncClassEnumModule(symbol) {
             var links = getSymbolLinks(symbol);
             if (!links.type) {
-                if (symbol.valueDeclaration.kind === 226 && ts.isShorthandAmbientModuleSymbol(symbol)) {
+                if (symbol.flags & 1536 && ts.isShorthandAmbientModuleSymbol(symbol)) {
                     links.type = anyType;
                 }
                 else {
-                    var type = createObjectType(2097152, symbol);
+                    var type = createObjectType(16, symbol);
                     links.type = strictNullChecks && symbol.flags & 536870912 ?
                         includeFalsyTypes(type, 2048) : type;
                 }
@@ -22165,7 +23695,7 @@ var ts;
             return unknownType;
         }
         function getTargetType(type) {
-            return type.flags & 131072 ? type.target : type;
+            return getObjectFlags(type) & 4 ? type.target : type;
         }
         function hasBaseType(type, checkBase) {
             return check(type);
@@ -22193,9 +23723,9 @@ var ts;
                 if (!node) {
                     return typeParameters;
                 }
-                if (node.kind === 222 || node.kind === 193 ||
-                    node.kind === 221 || node.kind === 180 ||
-                    node.kind === 148 || node.kind === 181) {
+                if (node.kind === 226 || node.kind === 197 ||
+                    node.kind === 225 || node.kind === 184 ||
+                    node.kind === 149 || node.kind === 185) {
                     var declarations = node.typeParameters;
                     if (declarations) {
                         return appendTypeParameters(appendOuterTypeParameters(typeParameters, node), declarations);
@@ -22204,15 +23734,15 @@ var ts;
             }
         }
         function getOuterTypeParametersOfClassOrInterface(symbol) {
-            var declaration = symbol.flags & 32 ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 223);
+            var declaration = symbol.flags & 32 ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 227);
             return appendOuterTypeParameters(undefined, declaration);
         }
         function getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol) {
             var result;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var node = _a[_i];
-                if (node.kind === 223 || node.kind === 222 ||
-                    node.kind === 193 || node.kind === 224) {
+                if (node.kind === 227 || node.kind === 226 ||
+                    node.kind === 197 || node.kind === 228) {
                     var declaration = node;
                     if (declaration.typeParameters) {
                         result = appendTypeParameters(result, declaration.typeParameters);
@@ -22225,7 +23755,7 @@ var ts;
             return ts.concatenate(getOuterTypeParametersOfClassOrInterface(symbol), getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol));
         }
         function isConstructorType(type) {
-            return type.flags & 2588672 && getSignaturesOfType(type, 1).length > 0;
+            return type.flags & 32768 && getSignaturesOfType(type, 1).length > 0;
         }
         function getBaseTypeNodeOfClass(type) {
             return ts.getClassExtendsHeritageClauseElement(type.symbol.valueDeclaration);
@@ -22237,7 +23767,7 @@ var ts;
         function getInstantiatedConstructorsForTypeArguments(type, typeArgumentNodes) {
             var signatures = getConstructorsForTypeArguments(type, typeArgumentNodes);
             if (typeArgumentNodes) {
-                var typeArguments_1 = ts.map(typeArgumentNodes, getTypeFromTypeNodeNoAlias);
+                var typeArguments_1 = ts.map(typeArgumentNodes, getTypeFromTypeNode);
                 signatures = ts.map(signatures, function (sig) { return getSignatureInstantiation(sig, typeArguments_1); });
             }
             return signatures;
@@ -22252,7 +23782,7 @@ var ts;
                     return unknownType;
                 }
                 var baseConstructorType = checkExpression(baseTypeNode.expression);
-                if (baseConstructorType.flags & 2588672) {
+                if (baseConstructorType.flags & 32768) {
                     resolveStructuredTypeMembers(baseConstructorType);
                 }
                 if (!popTypeResolution()) {
@@ -22269,7 +23799,7 @@ var ts;
         }
         function getBaseTypes(type) {
             if (!type.resolvedBaseTypes) {
-                if (type.flags & 262144) {
+                if (type.objectFlags & 8) {
                     type.resolvedBaseTypes = [createArrayType(getUnionType(type.typeParameters))];
                 }
                 else if (type.symbol.flags & (32 | 64)) {
@@ -22289,7 +23819,7 @@ var ts;
         function resolveBaseTypesOfClass(type) {
             type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray;
             var baseConstructorType = getBaseConstructorTypeOfClass(type);
-            if (!(baseConstructorType.flags & 2588672)) {
+            if (!(baseConstructorType.flags & 32768)) {
                 return;
             }
             var baseTypeNode = getBaseTypeNodeOfClass(type);
@@ -22310,7 +23840,7 @@ var ts;
             if (baseType === unknownType) {
                 return;
             }
-            if (!(getTargetType(baseType).flags & (32768 | 65536))) {
+            if (!(getObjectFlags(getTargetType(baseType)) & 3)) {
                 error(baseTypeNode.expression, ts.Diagnostics.Base_constructor_return_type_0_is_not_a_class_or_interface_type, typeToString(baseType));
                 return;
             }
@@ -22338,12 +23868,12 @@ var ts;
             type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray;
             for (var _i = 0, _a = type.symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 223 && ts.getInterfaceBaseTypeNodes(declaration)) {
+                if (declaration.kind === 227 && ts.getInterfaceBaseTypeNodes(declaration)) {
                     for (var _b = 0, _c = ts.getInterfaceBaseTypeNodes(declaration); _b < _c.length; _b++) {
                         var node = _c[_b];
                         var baseType = getTypeFromTypeNode(node);
                         if (baseType !== unknownType) {
-                            if (getTargetType(baseType).flags & (32768 | 65536)) {
+                            if (getObjectFlags(getTargetType(baseType)) & 3) {
                                 if (type !== baseType && !hasBaseType(baseType, type)) {
                                     if (type.resolvedBaseTypes === emptyArray) {
                                         type.resolvedBaseTypes = [baseType];
@@ -22367,7 +23897,7 @@ var ts;
         function isIndependentInterface(symbol) {
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 223) {
+                if (declaration.kind === 227) {
                     if (declaration.flags & 64) {
                         return false;
                     }
@@ -22390,12 +23920,12 @@ var ts;
         function getDeclaredTypeOfClassOrInterface(symbol) {
             var links = getSymbolLinks(symbol);
             if (!links.declaredType) {
-                var kind = symbol.flags & 32 ? 32768 : 65536;
+                var kind = symbol.flags & 32 ? 1 : 2;
                 var type = links.declaredType = createObjectType(kind, symbol);
                 var outerTypeParameters = getOuterTypeParametersOfClassOrInterface(symbol);
                 var localTypeParameters = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol);
-                if (outerTypeParameters || localTypeParameters || kind === 32768 || !isIndependentInterface(symbol)) {
-                    type.flags |= 131072;
+                if (outerTypeParameters || localTypeParameters || kind === 1 || !isIndependentInterface(symbol)) {
+                    type.objectFlags |= 4;
                     type.typeParameters = ts.concatenate(outerTypeParameters, localTypeParameters);
                     type.outerTypeParameters = outerTypeParameters;
                     type.localTypeParameters = localTypeParameters;
@@ -22417,8 +23947,7 @@ var ts;
                 if (!pushTypeResolution(symbol, 2)) {
                     return unknownType;
                 }
-                var typeParameters = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol);
-                var declaration = ts.getDeclarationOfKind(symbol, 279);
+                var declaration = ts.getDeclarationOfKind(symbol, 284);
                 var type = void 0;
                 if (declaration) {
                     if (declaration.jsDocTypeLiteral) {
@@ -22429,14 +23958,15 @@ var ts;
                     }
                 }
                 else {
-                    declaration = ts.getDeclarationOfKind(symbol, 224);
-                    type = getTypeFromTypeNode(declaration.type, symbol, typeParameters);
+                    declaration = ts.getDeclarationOfKind(symbol, 228);
+                    type = getTypeFromTypeNode(declaration.type);
                 }
                 if (popTypeResolution()) {
-                    links.typeParameters = typeParameters;
+                    var typeParameters = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol);
                     if (typeParameters) {
+                        links.typeParameters = typeParameters;
                         links.instantiations = ts.createMap();
-                        links.instantiations[getTypeListId(links.typeParameters)] = type;
+                        links.instantiations[getTypeListId(typeParameters)] = type;
                     }
                 }
                 else {
@@ -22453,14 +23983,14 @@ var ts;
                 return !ts.isInAmbientContext(member);
             }
             return expr.kind === 8 ||
-                expr.kind === 186 && expr.operator === 37 &&
+                expr.kind === 190 && expr.operator === 37 &&
                     expr.operand.kind === 8 ||
                 expr.kind === 70 && !!symbol.exports[expr.text];
         }
         function enumHasLiteralMembers(symbol) {
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 225) {
+                if (declaration.kind === 229) {
                     for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) {
                         var member = _c[_b];
                         if (!isLiteralEnumMember(symbol, member)) {
@@ -22488,7 +24018,7 @@ var ts;
                     var memberTypes = ts.createMap();
                     for (var _i = 0, _a = enumType.symbol.declarations; _i < _a.length; _i++) {
                         var declaration = _a[_i];
-                        if (declaration.kind === 225) {
+                        if (declaration.kind === 229) {
                             computeEnumMemberValues(declaration);
                             for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) {
                                 var member = _c[_b];
@@ -22503,7 +24033,7 @@ var ts;
                     }
                     enumType.memberTypes = memberTypes;
                     if (memberTypeList.length > 1) {
-                        enumType.flags |= 524288;
+                        enumType.flags |= 65536;
                         enumType.types = memberTypeList;
                         unionTypes[getTypeListId(memberTypeList)] = enumType;
                     }
@@ -22515,7 +24045,7 @@ var ts;
             var links = getSymbolLinks(symbol);
             if (!links.declaredType) {
                 var enumType = getDeclaredTypeOfEnum(getParentOfSymbol(symbol));
-                links.declaredType = enumType.flags & 524288 ?
+                links.declaredType = enumType.flags & 65536 ?
                     enumType.memberTypes[getEnumMemberValue(symbol.valueDeclaration)] :
                     enumType;
             }
@@ -22526,7 +24056,7 @@ var ts;
             if (!links.declaredType) {
                 var type = createType(16384);
                 type.symbol = symbol;
-                if (!ts.getDeclarationOfKind(symbol, 142).constraint) {
+                if (!ts.getDeclarationOfKind(symbol, 143).constraint) {
                     type.constraint = noConstraintType;
                 }
                 links.declaredType = type;
@@ -22576,19 +24106,19 @@ var ts;
         function isIndependentType(node) {
             switch (node.kind) {
                 case 118:
-                case 133:
-                case 131:
-                case 121:
                 case 134:
+                case 132:
+                case 121:
+                case 135:
                 case 104:
-                case 136:
+                case 137:
                 case 94:
-                case 128:
-                case 167:
+                case 129:
+                case 171:
                     return true;
-                case 161:
+                case 162:
                     return isIndependentType(node.elementType);
-                case 156:
+                case 157:
                     return isIndependentTypeReference(node);
             }
             return false;
@@ -22597,7 +24127,7 @@ var ts;
             return node.type && isIndependentType(node.type) || !node.type && !node.initializer;
         }
         function isIndependentFunctionLikeDeclaration(node) {
-            if (node.kind !== 149 && (!node.type || !isIndependentType(node.type))) {
+            if (node.kind !== 150 && (!node.type || !isIndependentType(node.type))) {
                 return false;
             }
             for (var _i = 0, _a = node.parameters; _i < _a.length; _i++) {
@@ -22613,12 +24143,12 @@ var ts;
                 var declaration = symbol.declarations[0];
                 if (declaration) {
                     switch (declaration.kind) {
-                        case 146:
-                        case 145:
-                            return isIndependentVariableLikeDeclaration(declaration);
-                        case 148:
                         case 147:
+                        case 146:
+                            return isIndependentVariableLikeDeclaration(declaration);
                         case 149:
+                        case 148:
+                        case 150:
                             return isIndependentFunctionLikeDeclaration(declaration);
                     }
                 }
@@ -22661,7 +24191,7 @@ var ts;
             return type;
         }
         function getTypeWithThisArgument(type, thisArgument) {
-            if (type.flags & 131072) {
+            if (getObjectFlags(type) & 4) {
                 return createTypeReference(type.target, ts.concatenate(type.typeArguments, [thisArgument || type.target.thisType]));
             }
             return type;
@@ -22684,8 +24214,8 @@ var ts;
             else {
                 mapper = createTypeMapper(typeParameters, typeArguments);
                 members = createInstantiatedSymbolTable(source.declaredProperties, mapper, typeParameters.length === 1);
-                callSignatures = instantiateList(source.declaredCallSignatures, mapper, instantiateSignature);
-                constructSignatures = instantiateList(source.declaredConstructSignatures, mapper, instantiateSignature);
+                callSignatures = instantiateSignatures(source.declaredCallSignatures, mapper);
+                constructSignatures = instantiateSignatures(source.declaredConstructSignatures, mapper);
                 stringIndexInfo = instantiateIndexInfo(source.declaredStringIndexInfo, mapper);
                 numberIndexInfo = instantiateIndexInfo(source.declaredNumberIndexInfo, mapper);
             }
@@ -22705,7 +24235,7 @@ var ts;
                     numberIndexInfo = numberIndexInfo || getIndexInfoOfType(instantiatedBaseType, 1);
                 }
             }
-            setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+            setStructuredTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function resolveClassOrInterfaceMembers(type) {
             resolveObjectTypeMembers(type, resolveDeclaredMembers(type), emptyArray, emptyArray);
@@ -22740,14 +24270,14 @@ var ts;
                 return [createSignature(undefined, classType.localTypeParameters, undefined, emptyArray, classType, undefined, 0, false, false)];
             }
             var baseTypeNode = getBaseTypeNodeOfClass(classType);
-            var typeArguments = ts.map(baseTypeNode.typeArguments, getTypeFromTypeNodeNoAlias);
+            var typeArguments = ts.map(baseTypeNode.typeArguments, getTypeFromTypeNode);
             var typeArgCount = typeArguments ? typeArguments.length : 0;
             var result = [];
             for (var _i = 0, baseSignatures_1 = baseSignatures; _i < baseSignatures_1.length; _i++) {
                 var baseSig = baseSignatures_1[_i];
                 var typeParamCount = baseSig.typeParameters ? baseSig.typeParameters.length : 0;
                 if (typeParamCount === typeArgCount) {
-                    var sig = typeParamCount ? getSignatureInstantiation(baseSig, typeArguments) : cloneSignature(baseSig);
+                    var sig = typeParamCount ? createSignatureInstantiation(baseSig, typeArguments) : cloneSignature(baseSig);
                     sig.typeParameters = classType.localTypeParameters;
                     sig.resolvedReturnType = classType;
                     result.push(sig);
@@ -22832,7 +24362,7 @@ var ts;
             var constructSignatures = getUnionSignatures(type.types, 1);
             var stringIndexInfo = getUnionIndexInfo(type.types, 0);
             var numberIndexInfo = getUnionIndexInfo(type.types, 1);
-            setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+            setStructuredTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function intersectTypes(type1, type2) {
             return !type1 ? type2 : !type2 ? type1 : getIntersectionType([type1, type2]);
@@ -22840,6 +24370,9 @@ var ts;
         function intersectIndexInfos(info1, info2) {
             return !info1 ? info2 : !info2 ? info1 : createIndexInfo(getIntersectionType([info1.type, info2.type]), info1.isReadonly && info2.isReadonly);
         }
+        function unionSpreadIndexInfos(info1, info2) {
+            return info1 && info2 && createIndexInfo(getUnionType([info1.type, info2.type]), info1.isReadonly || info2.isReadonly);
+        }
         function resolveIntersectionTypeMembers(type) {
             var callSignatures = emptyArray;
             var constructSignatures = emptyArray;
@@ -22852,17 +24385,17 @@ var ts;
                 stringIndexInfo = intersectIndexInfos(stringIndexInfo, getIndexInfoOfType(t, 0));
                 numberIndexInfo = intersectIndexInfos(numberIndexInfo, getIndexInfoOfType(t, 1));
             }
-            setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+            setStructuredTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function resolveAnonymousTypeMembers(type) {
             var symbol = type.symbol;
             if (type.target) {
                 var members = createInstantiatedSymbolTable(getPropertiesOfObjectType(type.target), type.mapper, false);
-                var callSignatures = instantiateList(getSignaturesOfType(type.target, 0), type.mapper, instantiateSignature);
-                var constructSignatures = instantiateList(getSignaturesOfType(type.target, 1), type.mapper, instantiateSignature);
+                var callSignatures = instantiateSignatures(getSignaturesOfType(type.target, 0), type.mapper);
+                var constructSignatures = instantiateSignatures(getSignaturesOfType(type.target, 1), type.mapper);
                 var stringIndexInfo = instantiateIndexInfo(getIndexInfoOfType(type.target, 0), type.mapper);
                 var numberIndexInfo = instantiateIndexInfo(getIndexInfoOfType(type.target, 1), type.mapper);
-                setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+                setStructuredTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
             }
             else if (symbol.flags & 2048) {
                 var members = symbol.members;
@@ -22870,7 +24403,7 @@ var ts;
                 var constructSignatures = getSignaturesOfSymbol(members["__new"]);
                 var stringIndexInfo = getIndexInfoOfSymbol(symbol, 0);
                 var numberIndexInfo = getIndexInfoOfSymbol(symbol, 1);
-                setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+                setStructuredTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
             }
             else {
                 var members = emptySymbols;
@@ -22885,46 +24418,106 @@ var ts;
                         constructSignatures = getDefaultConstructSignatures(classType);
                     }
                     var baseConstructorType = getBaseConstructorTypeOfClass(classType);
-                    if (baseConstructorType.flags & 2588672) {
+                    if (baseConstructorType.flags & 32768) {
                         members = createSymbolTable(getNamedMembers(members));
                         addInheritedMembers(members, getPropertiesOfObjectType(baseConstructorType));
                     }
                 }
                 var numberIndexInfo = symbol.flags & 384 ? enumNumberIndexInfo : undefined;
-                setObjectTypeMembers(type, members, emptyArray, constructSignatures, undefined, numberIndexInfo);
+                setStructuredTypeMembers(type, members, emptyArray, constructSignatures, undefined, numberIndexInfo);
                 if (symbol.flags & (16 | 8192)) {
                     type.callSignatures = getSignaturesOfSymbol(symbol);
                 }
             }
         }
+        function resolveMappedTypeMembers(type) {
+            var members = ts.createMap();
+            var stringIndexInfo;
+            var numberIndexInfo;
+            var typeParameter = getTypeParameterFromMappedType(type);
+            var constraintType = getConstraintTypeFromMappedType(type);
+            var templateType = getTemplateTypeFromMappedType(type);
+            var isReadonly = !!type.declaration.readonlyToken;
+            var isOptional = !!type.declaration.questionToken;
+            var keyType = constraintType.flags & 16384 ? getApparentType(constraintType) : constraintType;
+            var iterationType = keyType.flags & 262144 ? getIndexType(getApparentType(keyType.type)) : keyType;
+            forEachType(iterationType, function (t) {
+                var iterationMapper = createUnaryTypeMapper(typeParameter, t);
+                var templateMapper = type.mapper ? combineTypeMappers(type.mapper, iterationMapper) : iterationMapper;
+                var propType = instantiateType(templateType, templateMapper);
+                if (t.flags & (32 | 64 | 256)) {
+                    var propName = t.text;
+                    var prop = createSymbol(4 | 67108864 | (isOptional ? 536870912 : 0), propName);
+                    prop.type = addOptionality(propType, isOptional);
+                    prop.isReadonly = isReadonly;
+                    members[propName] = prop;
+                }
+                else if (t.flags & 2) {
+                    stringIndexInfo = createIndexInfo(propType, isReadonly);
+                }
+                else if (t.flags & 4) {
+                    numberIndexInfo = createIndexInfo(propType, isReadonly);
+                }
+            });
+            if (stringIndexInfo && numberIndexInfo && isTypeIdenticalTo(stringIndexInfo.type, numberIndexInfo.type)) {
+                numberIndexInfo = undefined;
+            }
+            setStructuredTypeMembers(type, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
+        }
+        function getTypeParameterFromMappedType(type) {
+            return type.typeParameter ||
+                (type.typeParameter = getDeclaredTypeOfTypeParameter(getSymbolOfNode(type.declaration.typeParameter)));
+        }
+        function getConstraintTypeFromMappedType(type) {
+            return type.constraintType ||
+                (type.constraintType = instantiateType(getConstraintOfTypeParameter(getTypeParameterFromMappedType(type)), type.mapper || identityMapper) || unknownType);
+        }
+        function getTemplateTypeFromMappedType(type) {
+            return type.templateType ||
+                (type.templateType = type.declaration.type ?
+                    instantiateType(getTypeFromTypeNode(type.declaration.type), type.mapper || identityMapper) :
+                    unknownType);
+        }
+        function isGenericMappedType(type) {
+            if (getObjectFlags(type) & 32) {
+                var constraintType = getConstraintTypeFromMappedType(type);
+                return !!(constraintType.flags & (16384 | 262144));
+            }
+            return false;
+        }
         function resolveStructuredTypeMembers(type) {
             if (!type.members) {
-                if (type.flags & 131072) {
-                    resolveTypeReferenceMembers(type);
+                if (type.flags & 32768) {
+                    if (type.objectFlags & 4) {
+                        resolveTypeReferenceMembers(type);
+                    }
+                    else if (type.objectFlags & 3) {
+                        resolveClassOrInterfaceMembers(type);
+                    }
+                    else if (type.objectFlags & 16) {
+                        resolveAnonymousTypeMembers(type);
+                    }
+                    else if (type.objectFlags & 32) {
+                        resolveMappedTypeMembers(type);
+                    }
                 }
-                else if (type.flags & (32768 | 65536)) {
-                    resolveClassOrInterfaceMembers(type);
-                }
-                else if (type.flags & 2097152) {
-                    resolveAnonymousTypeMembers(type);
-                }
-                else if (type.flags & 524288) {
+                else if (type.flags & 65536) {
                     resolveUnionTypeMembers(type);
                 }
-                else if (type.flags & 1048576) {
+                else if (type.flags & 131072) {
                     resolveIntersectionTypeMembers(type);
                 }
             }
             return type;
         }
         function getPropertiesOfObjectType(type) {
-            if (type.flags & 2588672) {
+            if (type.flags & 32768) {
                 return resolveStructuredTypeMembers(type).properties;
             }
             return emptyArray;
         }
         function getPropertyOfObjectType(type, name) {
-            if (type.flags & 2588672) {
+            if (type.flags & 32768) {
                 var resolved = resolveStructuredTypeMembers(type);
                 var symbol = resolved.members[name];
                 if (symbol && symbolIsValue(symbol)) {
@@ -22939,7 +24532,7 @@ var ts;
                     var prop = _c[_b];
                     getUnionOrIntersectionProperty(type, prop.name);
                 }
-                if (type.flags & 524288) {
+                if (type.flags & 65536) {
                     break;
                 }
             }
@@ -22958,7 +24551,9 @@ var ts;
         }
         function getPropertiesOfType(type) {
             type = getApparentType(type);
-            return type.flags & 1572864 ? getPropertiesOfUnionOrIntersectionType(type) : getPropertiesOfObjectType(type);
+            return type.flags & 196608 ?
+                getPropertiesOfUnionOrIntersectionType(type) :
+                getPropertiesOfObjectType(type);
         }
         function getApparentTypeOfTypeParameter(type) {
             if (!type.resolvedApparentType) {
@@ -22971,27 +24566,18 @@ var ts;
             return type.resolvedApparentType;
         }
         function getApparentType(type) {
-            if (type.flags & 16384) {
-                type = getApparentTypeOfTypeParameter(type);
-            }
-            if (type.flags & 34) {
-                type = globalStringType;
-            }
-            else if (type.flags & 340) {
-                type = globalNumberType;
-            }
-            else if (type.flags & 136) {
-                type = globalBooleanType;
-            }
-            else if (type.flags & 512) {
-                type = getGlobalESSymbolType();
-            }
-            return type;
+            var t = type.flags & 16384 ? getApparentTypeOfTypeParameter(type) : type;
+            return t.flags & 34 ? globalStringType :
+                t.flags & 340 ? globalNumberType :
+                    t.flags & 136 ? globalBooleanType :
+                        t.flags & 512 ? getGlobalESSymbolType() :
+                            t.flags & 262144 ? stringOrNumberType :
+                                t;
         }
         function createUnionOrIntersectionProperty(containingType, name) {
             var types = containingType.types;
             var props;
-            var commonFlags = (containingType.flags & 1048576) ? 536870912 : 0;
+            var commonFlags = (containingType.flags & 131072) ? 536870912 : 0;
             var isReadonly = false;
             var isPartial = false;
             for (var _i = 0, types_2 = types; _i < types_2.length; _i++) {
@@ -23011,7 +24597,7 @@ var ts;
                             isReadonly = true;
                         }
                     }
-                    else if (containingType.flags & 524288) {
+                    else if (containingType.flags & 65536) {
                         isPartial = true;
                     }
                 }
@@ -23046,7 +24632,7 @@ var ts;
             result.isPartial = isPartial;
             result.declarations = declarations;
             result.isReadonly = isReadonly;
-            result.type = containingType.flags & 524288 ? getUnionType(propTypes) : getIntersectionType(propTypes);
+            result.type = containingType.flags & 65536 ? getUnionType(propTypes) : getIntersectionType(propTypes);
             return result;
         }
         function getUnionOrIntersectionProperty(type, name) {
@@ -23066,7 +24652,7 @@ var ts;
         }
         function getPropertyOfType(type, name) {
             type = getApparentType(type);
-            if (type.flags & 2588672) {
+            if (type.flags & 32768) {
                 var resolved = resolveStructuredTypeMembers(type);
                 var symbol = resolved.members[name];
                 if (symbol && symbolIsValue(symbol)) {
@@ -23080,13 +24666,13 @@ var ts;
                 }
                 return getPropertyOfObjectType(globalObjectType, name);
             }
-            if (type.flags & 1572864) {
+            if (type.flags & 196608) {
                 return getPropertyOfUnionOrIntersectionType(type, name);
             }
             return undefined;
         }
         function getSignaturesOfStructuredType(type, kind) {
-            if (type.flags & 4161536) {
+            if (type.flags & 229376) {
                 var resolved = resolveStructuredTypeMembers(type);
                 return kind === 0 ? resolved.callSignatures : resolved.constructSignatures;
             }
@@ -23096,7 +24682,7 @@ var ts;
             return getSignaturesOfStructuredType(getApparentType(type), kind);
         }
         function getIndexInfoOfStructuredType(type, kind) {
-            if (type.flags & 4161536) {
+            if (type.flags & 229376) {
                 var resolved = resolveStructuredTypeMembers(type);
                 return kind === 0 ? resolved.stringIndexInfo : resolved.numberIndexInfo;
             }
@@ -23127,7 +24713,7 @@ var ts;
             return undefined;
         }
         function getTypeParametersFromJSDocTemplate(declaration) {
-            if (declaration.flags & 1048576) {
+            if (declaration.flags & 2097152) {
                 var templateTag = ts.getJSDocTemplateTag(declaration);
                 if (templateTag) {
                     return getTypeParametersFromDeclaration(templateTag.typeParameters);
@@ -23155,8 +24741,8 @@ var ts;
             return result;
         }
         function isJSDocOptionalParameter(node) {
-            if (node.flags & 1048576) {
-                if (node.type && node.type.kind === 268) {
+            if (node.flags & 2097152) {
+                if (node.type && node.type.kind === 273) {
                     return true;
                 }
                 var paramTag = ts.getCorrespondingJSDocParameterTag(node);
@@ -23165,11 +24751,18 @@ var ts;
                         return true;
                     }
                     if (paramTag.typeExpression) {
-                        return paramTag.typeExpression.type.kind === 268;
+                        return paramTag.typeExpression.type.kind === 273;
                     }
                 }
             }
         }
+        function tryFindAmbientModule(moduleName, withAugmentations) {
+            if (ts.isExternalModuleNameRelative(moduleName)) {
+                return undefined;
+            }
+            var symbol = getSymbol(globals, "\"" + moduleName + "\"", 512);
+            return symbol && withAugmentations ? getMergedSymbol(symbol) : symbol;
+        }
         function isOptionalParameter(node) {
             if (ts.hasQuestionToken(node) || isJSDocOptionalParameter(node)) {
                 return true;
@@ -23223,7 +24816,7 @@ var ts;
                     else {
                         parameters.push(paramSymbol);
                     }
-                    if (param.type && param.type.kind === 167) {
+                    if (param.type && param.type.kind === 171) {
                         hasLiteralTypes = true;
                     }
                     if (param.initializer || param.questionToken || param.dotDotDotToken || isJSDocOptionalParameter(param)) {
@@ -23235,10 +24828,10 @@ var ts;
                         minArgumentCount = -1;
                     }
                 }
-                if ((declaration.kind === 150 || declaration.kind === 151) &&
+                if ((declaration.kind === 151 || declaration.kind === 152) &&
                     !ts.hasDynamicName(declaration) &&
                     (!hasThisParameter || !thisParameter)) {
-                    var otherKind = declaration.kind === 150 ? 151 : 150;
+                    var otherKind = declaration.kind === 151 ? 152 : 151;
                     var other = ts.getDeclarationOfKind(declaration.symbol, otherKind);
                     if (other) {
                         thisParameter = getAnnotatedAccessorThisParameter(other);
@@ -23250,14 +24843,14 @@ var ts;
                 if (isJSConstructSignature) {
                     minArgumentCount--;
                 }
-                var classType = declaration.kind === 149 ?
+                var classType = declaration.kind === 150 ?
                     getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol))
                     : undefined;
                 var typeParameters = classType ? classType.localTypeParameters :
                     declaration.typeParameters ? getTypeParametersFromDeclaration(declaration.typeParameters) :
                         getTypeParametersFromJSDocTemplate(declaration);
                 var returnType = getSignatureReturnTypeFromDeclaration(declaration, isJSConstructSignature, classType);
-                var typePredicate = declaration.type && declaration.type.kind === 155 ?
+                var typePredicate = declaration.type && declaration.type.kind === 156 ?
                     createTypePredicateFromTypePredicateNode(declaration.type) :
                     undefined;
                 links.resolvedSignature = createSignature(declaration, typeParameters, thisParameter, parameters, returnType, typePredicate, minArgumentCount, ts.hasRestParameter(declaration), hasLiteralTypes);
@@ -23274,14 +24867,14 @@ var ts;
             else if (declaration.type) {
                 return getTypeFromTypeNode(declaration.type);
             }
-            if (declaration.flags & 1048576) {
+            if (declaration.flags & 2097152) {
                 var type = getReturnTypeFromJSDocComment(declaration);
                 if (type && type !== unknownType) {
                     return type;
                 }
             }
-            if (declaration.kind === 150 && !ts.hasDynamicName(declaration)) {
-                var setter = ts.getDeclarationOfKind(declaration.symbol, 151);
+            if (declaration.kind === 151 && !ts.hasDynamicName(declaration)) {
+                var setter = ts.getDeclarationOfKind(declaration.symbol, 152);
                 return getAnnotatedAccessorType(setter);
             }
             if (ts.nodeIsMissing(declaration.body)) {
@@ -23295,20 +24888,20 @@ var ts;
             for (var i = 0, len = symbol.declarations.length; i < len; i++) {
                 var node = symbol.declarations[i];
                 switch (node.kind) {
-                    case 157:
                     case 158:
-                    case 221:
-                    case 148:
-                    case 147:
+                    case 159:
+                    case 225:
                     case 149:
-                    case 152:
+                    case 148:
+                    case 150:
                     case 153:
                     case 154:
-                    case 150:
+                    case 155:
                     case 151:
-                    case 180:
-                    case 181:
-                    case 269:
+                    case 152:
+                    case 184:
+                    case 185:
+                    case 274:
                         if (i > 0 && node.body) {
                             var previous = symbol.declarations[i - 1];
                             if (node.parent === previous.parent && node.kind === previous.kind && node.pos === previous.end) {
@@ -23369,13 +24962,18 @@ var ts;
         function getRestTypeOfSignature(signature) {
             if (signature.hasRestParameter) {
                 var type = getTypeOfSymbol(ts.lastOrUndefined(signature.parameters));
-                if (type.flags & 131072 && type.target === globalArrayType) {
+                if (getObjectFlags(type) & 4 && type.target === globalArrayType) {
                     return type.typeArguments[0];
                 }
             }
             return anyType;
         }
         function getSignatureInstantiation(signature, typeArguments) {
+            var instantiations = signature.instantiations || (signature.instantiations = ts.createMap());
+            var id = getTypeListId(typeArguments);
+            return instantiations[id] || (instantiations[id] = createSignatureInstantiation(signature, typeArguments));
+        }
+        function createSignatureInstantiation(signature, typeArguments) {
             return instantiateSignature(signature, createTypeMapper(signature.typeParameters, typeArguments), true);
         }
         function getErasedSignature(signature) {
@@ -23388,8 +24986,8 @@ var ts;
         }
         function getOrCreateTypeFromSignature(signature) {
             if (!signature.isolatedSignatureType) {
-                var isConstructor = signature.declaration.kind === 149 || signature.declaration.kind === 153;
-                var type = createObjectType(2097152);
+                var isConstructor = signature.declaration.kind === 150 || signature.declaration.kind === 154;
+                var type = createObjectType(16);
                 type.members = emptySymbols;
                 type.properties = emptyArray;
                 type.callSignatures = !isConstructor ? [signature] : emptyArray;
@@ -23402,7 +25000,7 @@ var ts;
             return symbol.members["__index"];
         }
         function getIndexDeclarationOfSymbol(symbol, kind) {
-            var syntaxKind = kind === 1 ? 131 : 133;
+            var syntaxKind = kind === 1 ? 132 : 134;
             var indexSymbol = getIndexSymbol(symbol);
             if (indexSymbol) {
                 for (var _i = 0, _a = indexSymbol.declarations; _i < _a.length; _i++) {
@@ -23429,7 +25027,7 @@ var ts;
             return undefined;
         }
         function getConstraintDeclaration(type) {
-            return ts.getDeclarationOfKind(type.symbol, 142).constraint;
+            return ts.getDeclarationOfKind(type.symbol, 143).constraint;
         }
         function hasConstraintReferenceTo(type, target) {
             var checked;
@@ -23462,7 +25060,7 @@ var ts;
             return typeParameter.constraint === noConstraintType ? undefined : typeParameter.constraint;
         }
         function getParentSymbolOfTypeParameter(typeParameter) {
-            return getSymbolOfNode(ts.getDeclarationOfKind(typeParameter.symbol, 142).parent);
+            return getSymbolOfNode(ts.getDeclarationOfKind(typeParameter.symbol, 143).parent);
         }
         function getTypeListId(types) {
             var result = "";
@@ -23495,22 +25093,23 @@ var ts;
                     result |= type.flags;
                 }
             }
-            return result & 234881024;
+            return result & 14680064;
         }
         function createTypeReference(target, typeArguments) {
             var id = getTypeListId(typeArguments);
             var type = target.instantiations[id];
             if (!type) {
-                var propagatedFlags = typeArguments ? getPropagatingFlagsOfTypes(typeArguments, 0) : 0;
-                var flags = 131072 | propagatedFlags;
-                type = target.instantiations[id] = createObjectType(flags, target.symbol);
+                type = target.instantiations[id] = createObjectType(4, target.symbol);
+                type.flags |= typeArguments ? getPropagatingFlagsOfTypes(typeArguments, 0) : 0;
                 type.target = target;
                 type.typeArguments = typeArguments;
             }
             return type;
         }
         function cloneTypeReference(source) {
-            var type = createObjectType(source.flags, source.symbol);
+            var type = createType(source.flags);
+            type.symbol = source.symbol;
+            type.objectFlags = source.objectFlags;
             type.target = source.target;
             type.typeArguments = source.typeArguments;
             return type;
@@ -23526,7 +25125,7 @@ var ts;
                     error(node, ts.Diagnostics.Generic_type_0_requires_1_type_argument_s, typeToString(type, undefined, 1), typeParameters.length);
                     return unknownType;
                 }
-                return createTypeReference(type, ts.concatenate(type.outerTypeParameters, ts.map(node.typeArguments, getTypeFromTypeNodeNoAlias)));
+                return createTypeReference(type, ts.concatenate(type.outerTypeParameters, ts.map(node.typeArguments, getTypeFromTypeNode)));
             }
             if (node.typeArguments) {
                 error(node, ts.Diagnostics.Type_0_is_not_generic, typeToString(type));
@@ -23534,18 +25133,23 @@ var ts;
             }
             return type;
         }
-        function getTypeFromTypeAliasReference(node, symbol) {
+        function getTypeAliasInstantiation(symbol, typeArguments) {
             var type = getDeclaredTypeOfSymbol(symbol);
             var links = getSymbolLinks(symbol);
             var typeParameters = links.typeParameters;
+            var id = getTypeListId(typeArguments);
+            return links.instantiations[id] || (links.instantiations[id] = instantiateTypeNoAlias(type, createTypeMapper(typeParameters, typeArguments)));
+        }
+        function getTypeFromTypeAliasReference(node, symbol) {
+            var type = getDeclaredTypeOfSymbol(symbol);
+            var typeParameters = getSymbolLinks(symbol).typeParameters;
             if (typeParameters) {
                 if (!node.typeArguments || node.typeArguments.length !== typeParameters.length) {
                     error(node, ts.Diagnostics.Generic_type_0_requires_1_type_argument_s, symbolToString(symbol), typeParameters.length);
                     return unknownType;
                 }
-                var typeArguments = ts.map(node.typeArguments, getTypeFromTypeNodeNoAlias);
-                var id = getTypeListId(typeArguments);
-                return links.instantiations[id] || (links.instantiations[id] = instantiateType(type, createTypeMapper(typeParameters, typeArguments)));
+                var typeArguments = ts.map(node.typeArguments, getTypeFromTypeNode);
+                return getTypeAliasInstantiation(symbol, typeArguments);
             }
             if (node.typeArguments) {
                 error(node, ts.Diagnostics.Type_0_is_not_generic, symbolToString(symbol));
@@ -23562,11 +25166,11 @@ var ts;
         }
         function getTypeReferenceName(node) {
             switch (node.kind) {
-                case 156:
+                case 157:
                     return node.typeName;
-                case 267:
+                case 272:
                     return node.name;
-                case 195:
+                case 199:
                     var expr = node.expression;
                     if (ts.isEntityNameExpression(expr)) {
                         return expr;
@@ -23590,7 +25194,7 @@ var ts;
             if (symbol.flags & 524288) {
                 return getTypeFromTypeAliasReference(node, symbol);
             }
-            if (symbol.flags & 107455 && node.kind === 267) {
+            if (symbol.flags & 107455 && node.kind === 272) {
                 return getTypeOfSymbol(symbol);
             }
             return getTypeFromNonGenericTypeReference(node, symbol);
@@ -23600,13 +25204,13 @@ var ts;
             if (!links.resolvedType) {
                 var symbol = void 0;
                 var type = void 0;
-                if (node.kind === 267) {
+                if (node.kind === 272) {
                     var typeReferenceName = getTypeReferenceName(node);
                     symbol = resolveTypeReferenceName(typeReferenceName);
                     type = getTypeReferenceType(node, symbol);
                 }
                 else {
-                    var typeNameOrExpression = node.kind === 156
+                    var typeNameOrExpression = node.kind === 157
                         ? node.typeName
                         : ts.isEntityNameExpression(node.expression)
                             ? node.expression
@@ -23635,9 +25239,9 @@ var ts;
                 for (var _i = 0, declarations_3 = declarations; _i < declarations_3.length; _i++) {
                     var declaration = declarations_3[_i];
                     switch (declaration.kind) {
-                        case 222:
-                        case 223:
-                        case 225:
+                        case 226:
+                        case 227:
+                        case 229:
                             return declaration;
                     }
                 }
@@ -23646,7 +25250,7 @@ var ts;
                 return arity ? emptyGenericType : emptyObjectType;
             }
             var type = getDeclaredTypeOfSymbol(symbol);
-            if (!(type.flags & 2588672)) {
+            if (!(type.flags & 32768)) {
                 error(getTypeDeclaration(symbol), ts.Diagnostics.Global_type_0_must_be_a_class_or_interface_type, symbol.name);
                 return arity ? emptyGenericType : emptyObjectType;
             }
@@ -23709,7 +25313,7 @@ var ts;
                 property.type = typeParameter;
                 properties.push(property);
             }
-            var type = createObjectType(262144 | 131072);
+            var type = createObjectType(8 | 4);
             type.typeParameters = typeParameters;
             type.outerTypeParameters = undefined;
             type.localTypeParameters = typeParameters;
@@ -23736,7 +25340,7 @@ var ts;
         function getTypeFromTupleTypeNode(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
-                links.resolvedType = createTupleType(ts.map(node.elementTypes, getTypeFromTypeNodeNoAlias));
+                links.resolvedType = createTupleType(ts.map(node.elementTypes, getTypeFromTypeNode));
             }
             return links.resolvedType;
         }
@@ -23764,7 +25368,7 @@ var ts;
         }
         function addTypeToUnion(typeSet, type) {
             var flags = type.flags;
-            if (flags & 524288) {
+            if (flags & 65536) {
                 addTypesToUnion(typeSet, type.types);
             }
             else if (flags & 1) {
@@ -23775,7 +25379,7 @@ var ts;
                     typeSet.containsUndefined = true;
                 if (flags & 4096)
                     typeSet.containsNull = true;
-                if (!(flags & 33554432))
+                if (!(flags & 2097152))
                     typeSet.containsNonWideningType = true;
             }
             else if (!(flags & 8192)) {
@@ -23788,7 +25392,8 @@ var ts;
                 var len = typeSet.length;
                 var index = len && type.id > typeSet[len - 1].id ? ~len : binarySearchTypes(typeSet, type);
                 if (index < 0) {
-                    if (!(flags & 2097152 && type.symbol && type.symbol.flags & (16 | 8192) && containsIdenticalType(typeSet, type))) {
+                    if (!(flags & 32768 && type.objectFlags & 16 &&
+                        type.symbol && type.symbol.flags & (16 | 8192) && containsIdenticalType(typeSet, type))) {
                         typeSet.splice(~index, 0, type);
                     }
                 }
@@ -23850,7 +25455,7 @@ var ts;
                 var t = types[i];
                 var remove = t.flags & 32 && types.containsString ||
                     t.flags & 64 && types.containsNumber ||
-                    t.flags & 96 && t.flags & 16777216 && containsType(types, t.regularType);
+                    t.flags & 96 && t.flags & 1048576 && containsType(types, t.regularType);
                 if (remove) {
                     ts.orderedRemoveItemAt(types, i);
                 }
@@ -23892,22 +25497,22 @@ var ts;
             var type = unionTypes[id];
             if (!type) {
                 var propagatedFlags = getPropagatingFlagsOfTypes(types, 6144);
-                type = unionTypes[id] = createObjectType(524288 | propagatedFlags);
+                type = unionTypes[id] = createType(65536 | propagatedFlags);
                 type.types = types;
                 type.aliasSymbol = aliasSymbol;
                 type.aliasTypeArguments = aliasTypeArguments;
             }
             return type;
         }
-        function getTypeFromUnionTypeNode(node, aliasSymbol, aliasTypeArguments) {
+        function getTypeFromUnionTypeNode(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
-                links.resolvedType = getUnionType(ts.map(node.types, getTypeFromTypeNodeNoAlias), false, aliasSymbol, aliasTypeArguments);
+                links.resolvedType = getUnionType(ts.map(node.types, getTypeFromTypeNode), false, getAliasSymbolForTypeNode(node), getAliasTypeArgumentsForTypeNode(node));
             }
             return links.resolvedType;
         }
         function addTypeToIntersection(typeSet, type) {
-            if (type.flags & 1048576) {
+            if (type.flags & 131072) {
                 addTypesToIntersection(typeSet, type.types);
             }
             else if (type.flags & 1) {
@@ -23927,6 +25532,17 @@ var ts;
             if (types.length === 0) {
                 return emptyObjectType;
             }
+            var _loop_2 = function (i) {
+                var type_1 = types[i];
+                if (type_1.flags & 65536) {
+                    return { value: getUnionType(ts.map(type_1.types, function (t) { return getIntersectionType(ts.replaceElement(types, i, t)); }), false, aliasSymbol, aliasTypeArguments) };
+                }
+            };
+            for (var i = 0; i < types.length; i++) {
+                var state_2 = _loop_2(i);
+                if (typeof state_2 === "object")
+                    return state_2.value;
+            }
             var typeSet = [];
             addTypesToIntersection(typeSet, types);
             if (typeSet.containsAny) {
@@ -23939,39 +25555,248 @@ var ts;
             var type = intersectionTypes[id];
             if (!type) {
                 var propagatedFlags = getPropagatingFlagsOfTypes(typeSet, 6144);
-                type = intersectionTypes[id] = createObjectType(1048576 | propagatedFlags);
+                type = intersectionTypes[id] = createType(131072 | propagatedFlags);
                 type.types = typeSet;
                 type.aliasSymbol = aliasSymbol;
                 type.aliasTypeArguments = aliasTypeArguments;
             }
             return type;
         }
-        function getTypeFromIntersectionTypeNode(node, aliasSymbol, aliasTypeArguments) {
+        function getTypeFromIntersectionTypeNode(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
-                links.resolvedType = getIntersectionType(ts.map(node.types, getTypeFromTypeNodeNoAlias), aliasSymbol, aliasTypeArguments);
+                links.resolvedType = getIntersectionType(ts.map(node.types, getTypeFromTypeNode), getAliasSymbolForTypeNode(node), getAliasTypeArgumentsForTypeNode(node));
             }
             return links.resolvedType;
         }
-        function getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node, aliasSymbol, aliasTypeArguments) {
+        function getIndexTypeForTypeParameter(type) {
+            if (!type.resolvedIndexType) {
+                type.resolvedIndexType = createType(262144);
+                type.resolvedIndexType.type = type;
+            }
+            return type.resolvedIndexType;
+        }
+        function getLiteralTypeFromPropertyName(prop) {
+            return getDeclarationModifierFlagsFromSymbol(prop) & 24 || ts.startsWith(prop.name, "__@") ?
+                neverType :
+                getLiteralTypeForText(32, ts.unescapeIdentifier(prop.name));
+        }
+        function getLiteralTypeFromPropertyNames(type) {
+            return getUnionType(ts.map(getPropertiesOfType(type), getLiteralTypeFromPropertyName));
+        }
+        function getIndexType(type) {
+            return type.flags & 16384 ? getIndexTypeForTypeParameter(type) :
+                type.flags & 1 || getIndexInfoOfType(type, 0) ? stringOrNumberType :
+                    getIndexInfoOfType(type, 1) ? getUnionType([numberType, getLiteralTypeFromPropertyNames(type)]) :
+                        getLiteralTypeFromPropertyNames(type);
+        }
+        function getTypeFromTypeOperatorNode(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
-                var type = createObjectType(2097152, node.symbol);
-                type.aliasSymbol = aliasSymbol;
-                type.aliasTypeArguments = aliasTypeArguments;
+                links.resolvedType = getIndexType(getTypeFromTypeNode(node.type));
+            }
+            return links.resolvedType;
+        }
+        function createIndexedAccessType(objectType, indexType) {
+            var type = createType(524288);
+            type.objectType = objectType;
+            type.indexType = indexType;
+            return type;
+        }
+        function getIndexedAccessTypeForTypeParameter(objectType, indexType) {
+            var indexedAccessTypes = indexType.resolvedIndexedAccessTypes || (indexType.resolvedIndexedAccessTypes = []);
+            return indexedAccessTypes[objectType.id] || (indexedAccessTypes[objectType.id] = createIndexedAccessType(objectType, indexType));
+        }
+        function getPropertyTypeForIndexType(objectType, indexType, accessNode, cacheSymbol) {
+            var accessExpression = accessNode && accessNode.kind === 178 ? accessNode : undefined;
+            var propName = indexType.flags & (32 | 64 | 256) ?
+                indexType.text :
+                accessExpression && checkThatExpressionIsProperSymbolReference(accessExpression.argumentExpression, indexType, false) ?
+                    ts.getPropertyNameForKnownSymbolName(accessExpression.argumentExpression.name.text) :
+                    undefined;
+            if (propName) {
+                var prop = getPropertyOfType(objectType, propName);
+                if (prop) {
+                    if (accessExpression) {
+                        if (ts.isAssignmentTarget(accessExpression) && (isReferenceToReadonlyEntity(accessExpression, prop) || isReferenceThroughNamespaceImport(accessExpression))) {
+                            error(accessExpression.argumentExpression, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_constant_or_a_read_only_property, symbolToString(prop));
+                            return unknownType;
+                        }
+                        if (cacheSymbol) {
+                            getNodeLinks(accessNode).resolvedSymbol = prop;
+                        }
+                    }
+                    return getTypeOfSymbol(prop);
+                }
+            }
+            if (isTypeAnyOrAllConstituentTypesHaveKind(indexType, 34 | 340 | 512)) {
+                if (isTypeAny(objectType)) {
+                    return anyType;
+                }
+                var indexInfo = isTypeAnyOrAllConstituentTypesHaveKind(indexType, 340) && getIndexInfoOfType(objectType, 1) ||
+                    getIndexInfoOfType(objectType, 0) ||
+                    undefined;
+                if (indexInfo) {
+                    if (accessExpression && ts.isAssignmentTarget(accessExpression) && indexInfo.isReadonly) {
+                        error(accessExpression, ts.Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
+                        return unknownType;
+                    }
+                    return indexInfo.type;
+                }
+                if (accessExpression && !isConstEnumObjectType(objectType)) {
+                    if (compilerOptions.noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors) {
+                        if (getIndexTypeOfType(objectType, 1)) {
+                            error(accessExpression.argumentExpression, ts.Diagnostics.Element_implicitly_has_an_any_type_because_index_expression_is_not_of_type_number);
+                        }
+                        else {
+                            error(accessExpression, ts.Diagnostics.Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature, typeToString(objectType));
+                        }
+                    }
+                    return anyType;
+                }
+            }
+            if (accessNode) {
+                var indexNode = accessNode.kind === 178 ? accessNode.argumentExpression : accessNode.indexType;
+                if (indexType.flags & (32 | 64)) {
+                    error(indexNode, ts.Diagnostics.Property_0_does_not_exist_on_type_1, indexType.text, typeToString(objectType));
+                }
+                else if (indexType.flags & (2 | 4)) {
+                    error(indexNode, ts.Diagnostics.Type_0_has_no_matching_index_signature_for_type_1, typeToString(objectType), typeToString(indexType));
+                }
+                else {
+                    error(indexNode, ts.Diagnostics.Type_0_cannot_be_used_as_an_index_type, typeToString(indexType));
+                }
+            }
+            return unknownType;
+        }
+        function getIndexedAccessType(objectType, indexType, accessNode) {
+            if (indexType.flags & 16384) {
+                if (accessNode && !isTypeAssignableTo(getConstraintOfTypeParameter(indexType) || emptyObjectType, getIndexType(objectType))) {
+                    error(accessNode, ts.Diagnostics.Type_0_is_not_constrained_to_keyof_1, typeToString(indexType), typeToString(objectType));
+                    return unknownType;
+                }
+                return getIndexedAccessTypeForTypeParameter(objectType, indexType);
+            }
+            var apparentType = getApparentType(objectType);
+            if (indexType.flags & 65536 && !(indexType.flags & 8190)) {
+                var propTypes = [];
+                for (var _i = 0, _a = indexType.types; _i < _a.length; _i++) {
+                    var t = _a[_i];
+                    var propType = getPropertyTypeForIndexType(apparentType, t, accessNode, false);
+                    if (propType === unknownType) {
+                        return unknownType;
+                    }
+                    propTypes.push(propType);
+                }
+                return getUnionType(propTypes);
+            }
+            return getPropertyTypeForIndexType(apparentType, indexType, accessNode, true);
+        }
+        function getTypeFromIndexedAccessTypeNode(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                links.resolvedType = getIndexedAccessType(getTypeFromTypeNode(node.objectType), getTypeFromTypeNode(node.indexType), node);
+            }
+            return links.resolvedType;
+        }
+        function getTypeFromMappedTypeNode(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                var type = createObjectType(32, node.symbol);
+                type.declaration = node;
+                type.aliasSymbol = getAliasSymbolForTypeNode(node);
+                type.aliasTypeArguments = getAliasTypeArgumentsForTypeNode(node);
                 links.resolvedType = type;
             }
             return links.resolvedType;
         }
+        function getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                var aliasSymbol = getAliasSymbolForTypeNode(node);
+                if (ts.isEmpty(node.symbol.members) && !aliasSymbol) {
+                    links.resolvedType = emptyTypeLiteralType;
+                }
+                else {
+                    var type = createObjectType(16, node.symbol);
+                    type.aliasSymbol = aliasSymbol;
+                    type.aliasTypeArguments = getAliasTypeArgumentsForTypeNode(node);
+                    links.resolvedType = type;
+                }
+            }
+            return links.resolvedType;
+        }
+        function getAliasSymbolForTypeNode(node) {
+            return node.parent.kind === 228 ? getSymbolOfNode(node.parent) : undefined;
+        }
+        function getAliasTypeArgumentsForTypeNode(node) {
+            var symbol = getAliasSymbolForTypeNode(node);
+            return symbol ? getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol) : undefined;
+        }
+        function getSpreadType(left, right, isFromObjectLiteral) {
+            ts.Debug.assert(!!(left.flags & (32768 | 1)) && !!(right.flags & (32768 | 1)), "Only object types may be spread.");
+            if (left.flags & 1 || right.flags & 1) {
+                return anyType;
+            }
+            var members = ts.createMap();
+            var skippedPrivateMembers = ts.createMap();
+            var stringIndexInfo;
+            var numberIndexInfo;
+            if (left === emptyObjectType) {
+                stringIndexInfo = getIndexInfoOfType(right, 0);
+                numberIndexInfo = getIndexInfoOfType(right, 1);
+            }
+            else {
+                stringIndexInfo = unionSpreadIndexInfos(getIndexInfoOfType(left, 0), getIndexInfoOfType(right, 0));
+                numberIndexInfo = unionSpreadIndexInfos(getIndexInfoOfType(left, 1), getIndexInfoOfType(right, 1));
+            }
+            for (var _i = 0, _a = getPropertiesOfType(right); _i < _a.length; _i++) {
+                var rightProp = _a[_i];
+                var isOwnProperty = !(rightProp.flags & 8192) || isFromObjectLiteral;
+                var isSetterWithoutGetter = rightProp.flags & 65536 && !(rightProp.flags & 32768);
+                if (getDeclarationModifierFlagsFromSymbol(rightProp) & (8 | 16)) {
+                    skippedPrivateMembers[rightProp.name] = true;
+                }
+                else if (isOwnProperty && !isSetterWithoutGetter) {
+                    members[rightProp.name] = rightProp;
+                }
+            }
+            for (var _b = 0, _c = getPropertiesOfType(left); _b < _c.length; _b++) {
+                var leftProp = _c[_b];
+                if (leftProp.flags & 65536 && !(leftProp.flags & 32768)
+                    || leftProp.name in skippedPrivateMembers) {
+                    continue;
+                }
+                if (leftProp.name in members) {
+                    var rightProp = members[leftProp.name];
+                    var rightType = getTypeOfSymbol(rightProp);
+                    if (maybeTypeOfKind(rightType, 2048) || rightProp.flags & 536870912) {
+                        var declarations = ts.concatenate(leftProp.declarations, rightProp.declarations);
+                        var flags = 4 | 67108864 | (leftProp.flags & 536870912);
+                        var result = createSymbol(flags, leftProp.name);
+                        result.type = getUnionType([getTypeOfSymbol(leftProp), getTypeWithFacts(rightType, 131072)]);
+                        result.leftSpread = leftProp;
+                        result.rightSpread = rightProp;
+                        result.declarations = declarations;
+                        result.isReadonly = isReadonlySymbol(leftProp) || isReadonlySymbol(rightProp);
+                        members[leftProp.name] = result;
+                    }
+                }
+                else {
+                    members[leftProp.name] = leftProp;
+                }
+            }
+            return createAnonymousType(undefined, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
+        }
         function createLiteralType(flags, text) {
             var type = createType(flags);
             type.text = text;
             return type;
         }
         function getFreshTypeOfLiteralType(type) {
-            if (type.flags & 96 && !(type.flags & 16777216)) {
+            if (type.flags & 96 && !(type.flags & 1048576)) {
                 if (!type.freshType) {
-                    var freshType = createLiteralType(type.flags | 16777216, type.text);
+                    var freshType = createLiteralType(type.flags | 1048576, type.text);
                     freshType.regularType = type;
                     type.freshType = freshType;
                 }
@@ -23980,7 +25805,7 @@ var ts;
             return type;
         }
         function getRegularTypeOfLiteralType(type) {
-            return type.flags & 96 && type.flags & 16777216 ? type.regularType : type;
+            return type.flags & 96 && type.flags & 1048576 ? type.regularType : type;
         }
         function getLiteralTypeForText(flags, text) {
             var map = flags & 32 ? stringLiteralTypes : numericLiteralTypes;
@@ -24004,7 +25829,7 @@ var ts;
         function getTypeFromJSDocTupleType(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
-                var types = ts.map(node.types, getTypeFromTypeNodeNoAlias);
+                var types = ts.map(node.types, getTypeFromTypeNode);
                 links.resolvedType = createTupleType(types);
             }
             return links.resolvedType;
@@ -24012,9 +25837,9 @@ var ts;
         function getThisType(node) {
             var container = ts.getThisContainer(node, false);
             var parent = container && container.parent;
-            if (parent && (ts.isClassLike(parent) || parent.kind === 223)) {
+            if (parent && (ts.isClassLike(parent) || parent.kind === 227)) {
                 if (!(ts.getModifierFlags(container) & 32) &&
-                    (container.kind !== 149 || ts.isNodeDescendantOf(node, container.body))) {
+                    (container.kind !== 150 || ts.isNodeDescendantOf(node, container.body))) {
                     return getDeclaredTypeOfClassOrInterface(getSymbolOfNode(parent)).thisType;
                 }
             }
@@ -24028,85 +25853,88 @@ var ts;
             }
             return links.resolvedType;
         }
-        function getTypeFromTypeNodeNoAlias(type) {
-            return getTypeFromTypeNode(type, undefined, undefined);
-        }
-        function getTypeFromTypeNode(node, aliasSymbol, aliasTypeArguments) {
+        function getTypeFromTypeNode(node) {
             switch (node.kind) {
                 case 118:
-                case 258:
-                case 259:
+                case 263:
+                case 264:
                     return anyType;
-                case 133:
+                case 134:
                     return stringType;
-                case 131:
+                case 132:
                     return numberType;
                 case 121:
                     return booleanType;
-                case 134:
+                case 135:
                     return esSymbolType;
                 case 104:
                     return voidType;
-                case 136:
+                case 137:
                     return undefinedType;
                 case 94:
                     return nullType;
-                case 128:
+                case 129:
                     return neverType;
-                case 283:
+                case 288:
                     return nullType;
-                case 284:
+                case 289:
                     return undefinedType;
-                case 285:
+                case 290:
                     return neverType;
-                case 166:
+                case 167:
                 case 98:
                     return getTypeFromThisTypeNode(node);
-                case 167:
+                case 171:
                     return getTypeFromLiteralTypeNode(node);
-                case 282:
+                case 287:
                     return getTypeFromLiteralTypeNode(node.literal);
-                case 156:
-                case 267:
-                    return getTypeFromTypeReference(node);
-                case 155:
-                    return booleanType;
-                case 195:
-                    return getTypeFromTypeReference(node);
-                case 159:
-                    return getTypeFromTypeQueryNode(node);
-                case 161:
-                case 260:
-                    return getTypeFromArrayTypeNode(node);
-                case 162:
-                    return getTypeFromTupleTypeNode(node);
-                case 163:
-                case 261:
-                    return getTypeFromUnionTypeNode(node, aliasSymbol, aliasTypeArguments);
-                case 164:
-                    return getTypeFromIntersectionTypeNode(node, aliasSymbol, aliasTypeArguments);
-                case 165:
-                case 263:
-                case 264:
-                case 271:
-                case 272:
-                case 268:
-                    return getTypeFromTypeNode(node.type);
-                case 265:
-                    return getTypeFromTypeNode(node.literal);
                 case 157:
-                case 158:
+                case 272:
+                    return getTypeFromTypeReference(node);
+                case 156:
+                    return booleanType;
+                case 199:
+                    return getTypeFromTypeReference(node);
                 case 160:
-                case 281:
+                    return getTypeFromTypeQueryNode(node);
+                case 162:
+                case 265:
+                    return getTypeFromArrayTypeNode(node);
+                case 163:
+                    return getTypeFromTupleTypeNode(node);
+                case 164:
+                case 266:
+                    return getTypeFromUnionTypeNode(node);
+                case 165:
+                    return getTypeFromIntersectionTypeNode(node);
+                case 166:
+                case 268:
                 case 269:
-                    return getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node, aliasSymbol, aliasTypeArguments);
+                case 276:
+                case 277:
+                case 273:
+                    return getTypeFromTypeNode(node.type);
+                case 270:
+                    return getTypeFromTypeNode(node.literal);
+                case 158:
+                case 159:
+                case 161:
+                case 286:
+                case 274:
+                    return getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node);
+                case 168:
+                    return getTypeFromTypeOperatorNode(node);
+                case 169:
+                    return getTypeFromIndexedAccessTypeNode(node);
+                case 170:
+                    return getTypeFromMappedTypeNode(node);
                 case 70:
-                case 140:
+                case 141:
                     var symbol = getSymbolAtLocation(node);
                     return symbol && getDeclaredTypeOfSymbol(symbol);
-                case 262:
+                case 267:
                     return getTypeFromJSDocTupleType(node);
-                case 270:
+                case 275:
                     return getTypeFromJSDocVariadicType(node);
                 default:
                     return unknownType;
@@ -24123,6 +25951,16 @@ var ts;
             }
             return items;
         }
+        function instantiateTypes(types, mapper) {
+            return instantiateList(types, mapper, instantiateType);
+        }
+        function instantiateSignatures(signatures, mapper) {
+            return instantiateList(signatures, mapper, instantiateSignature);
+        }
+        function instantiateCached(type, mapper, instantiator) {
+            var instantiations = mapper.instantiations || (mapper.instantiations = []);
+            return instantiations[type.id] || (instantiations[type.id] = instantiator(type, mapper));
+        }
         function createUnaryTypeMapper(source, target) {
             return function (t) { return t === source ? target : t; };
         }
@@ -24145,7 +25983,6 @@ var ts;
                 count == 2 ? createBinaryTypeMapper(sources[0], targets ? targets[0] : anyType, sources[1], targets ? targets[1] : anyType) :
                     createArrayTypeMapper(sources, targets);
             mapper.mappedTypes = sources;
-            mapper.targetTypes = targets;
             return mapper;
         }
         function createTypeEraser(sources) {
@@ -24235,45 +26072,46 @@ var ts;
             return result;
         }
         function instantiateAnonymousType(type, mapper) {
-            if (mapper.instantiations) {
-                var cachedType = mapper.instantiations[type.id];
-                if (cachedType) {
-                    return cachedType;
-                }
-            }
-            else {
-                mapper.instantiations = [];
-            }
-            var result = createObjectType(2097152 | 4194304, type.symbol);
-            result.target = type;
-            result.mapper = mapper;
+            var result = createObjectType(16 | 64, type.symbol);
+            result.target = type.objectFlags & 64 ? type.target : type;
+            result.mapper = type.objectFlags & 64 ? combineTypeMappers(type.mapper, mapper) : mapper;
             result.aliasSymbol = type.aliasSymbol;
-            result.aliasTypeArguments = mapper.targetTypes;
-            mapper.instantiations[type.id] = result;
+            result.aliasTypeArguments = instantiateTypes(type.aliasTypeArguments, mapper);
+            return result;
+        }
+        function instantiateMappedType(type, mapper) {
+            var result = createObjectType(32 | 64, type.symbol);
+            result.declaration = type.declaration;
+            result.mapper = type.mapper ? combineTypeMappers(type.mapper, mapper) : mapper;
+            result.aliasSymbol = type.aliasSymbol;
+            result.aliasTypeArguments = instantiateTypes(type.aliasTypeArguments, mapper);
             return result;
         }
         function isSymbolInScopeOfMappedTypeParameter(symbol, mapper) {
+            if (!(symbol.declarations && symbol.declarations.length)) {
+                return false;
+            }
             var mappedTypes = mapper.mappedTypes;
             var node = symbol.declarations[0].parent;
             while (node) {
                 switch (node.kind) {
-                    case 157:
                     case 158:
-                    case 221:
-                    case 148:
-                    case 147:
+                    case 159:
+                    case 225:
                     case 149:
-                    case 152:
+                    case 148:
+                    case 150:
                     case 153:
                     case 154:
-                    case 150:
+                    case 155:
                     case 151:
-                    case 180:
-                    case 181:
-                    case 222:
-                    case 193:
-                    case 223:
-                    case 224:
+                    case 152:
+                    case 184:
+                    case 185:
+                    case 226:
+                    case 197:
+                    case 227:
+                    case 228:
                         var declaration = node;
                         if (declaration.typeParameters) {
                             for (var _i = 0, _a = declaration.typeParameters; _i < _a.length; _i++) {
@@ -24283,69 +26121,97 @@ var ts;
                                 }
                             }
                         }
-                        if (ts.isClassLike(node) || node.kind === 223) {
+                        if (ts.isClassLike(node) || node.kind === 227) {
                             var thisType = getDeclaredTypeOfClassOrInterface(getSymbolOfNode(node)).thisType;
                             if (thisType && ts.contains(mappedTypes, thisType)) {
                                 return true;
                             }
                         }
                         break;
-                    case 226:
-                    case 256:
+                    case 230:
+                    case 261:
                         return false;
                 }
                 node = node.parent;
             }
             return false;
         }
+        function isTopLevelTypeAlias(symbol) {
+            if (symbol.declarations && symbol.declarations.length) {
+                var parentKind = symbol.declarations[0].parent.kind;
+                return parentKind === 261 || parentKind === 231;
+            }
+            return false;
+        }
         function instantiateType(type, mapper) {
             if (type && mapper !== identityMapper) {
-                if (type.flags & 16384) {
-                    return mapper(type);
+                if (type.aliasSymbol && isTopLevelTypeAlias(type.aliasSymbol)) {
+                    if (type.aliasTypeArguments) {
+                        return getTypeAliasInstantiation(type.aliasSymbol, instantiateTypes(type.aliasTypeArguments, mapper));
+                    }
+                    return type;
                 }
-                if (type.flags & 2097152) {
+                return instantiateTypeNoAlias(type, mapper);
+            }
+            return type;
+        }
+        function instantiateTypeNoAlias(type, mapper) {
+            if (type.flags & 16384) {
+                return mapper(type);
+            }
+            if (type.flags & 32768) {
+                if (type.objectFlags & 16) {
                     return type.symbol &&
                         type.symbol.flags & (16 | 8192 | 32 | 2048 | 4096) &&
-                        (type.flags & 4194304 || isSymbolInScopeOfMappedTypeParameter(type.symbol, mapper)) ?
-                        instantiateAnonymousType(type, mapper) : type;
+                        (type.objectFlags & 64 || isSymbolInScopeOfMappedTypeParameter(type.symbol, mapper)) ?
+                        instantiateCached(type, mapper, instantiateAnonymousType) : type;
                 }
-                if (type.flags & 131072) {
-                    return createTypeReference(type.target, instantiateList(type.typeArguments, mapper, instantiateType));
+                if (type.objectFlags & 32) {
+                    return instantiateCached(type, mapper, instantiateMappedType);
                 }
-                if (type.flags & 524288 && !(type.flags & 8190)) {
-                    return getUnionType(instantiateList(type.types, mapper, instantiateType), false, type.aliasSymbol, mapper.targetTypes);
-                }
-                if (type.flags & 1048576) {
-                    return getIntersectionType(instantiateList(type.types, mapper, instantiateType), type.aliasSymbol, mapper.targetTypes);
+                if (type.objectFlags & 4) {
+                    return createTypeReference(type.target, instantiateTypes(type.typeArguments, mapper));
                 }
             }
+            if (type.flags & 65536 && !(type.flags & 8190)) {
+                return getUnionType(instantiateTypes(type.types, mapper), false, type.aliasSymbol, instantiateTypes(type.aliasTypeArguments, mapper));
+            }
+            if (type.flags & 131072) {
+                return getIntersectionType(instantiateTypes(type.types, mapper), type.aliasSymbol, instantiateTypes(type.aliasTypeArguments, mapper));
+            }
+            if (type.flags & 262144) {
+                return getIndexType(instantiateType(type.type, mapper));
+            }
+            if (type.flags & 524288) {
+                return getIndexedAccessType(instantiateType(type.objectType, mapper), instantiateType(type.indexType, mapper));
+            }
             return type;
         }
         function instantiateIndexInfo(info, mapper) {
             return info && createIndexInfo(instantiateType(info.type, mapper), info.isReadonly, info.declaration);
         }
         function isContextSensitive(node) {
-            ts.Debug.assert(node.kind !== 148 || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 149 || ts.isObjectLiteralMethod(node));
             switch (node.kind) {
-                case 180:
-                case 181:
+                case 184:
+                case 185:
                     return isContextSensitiveFunctionLikeDeclaration(node);
-                case 172:
+                case 176:
                     return ts.forEach(node.properties, isContextSensitive);
-                case 171:
+                case 175:
                     return ts.forEach(node.elements, isContextSensitive);
-                case 189:
+                case 193:
                     return isContextSensitive(node.whenTrue) ||
                         isContextSensitive(node.whenFalse);
-                case 188:
+                case 192:
                     return node.operatorToken.kind === 53 &&
                         (isContextSensitive(node.left) || isContextSensitive(node.right));
-                case 253:
+                case 257:
                     return isContextSensitive(node.initializer);
+                case 149:
                 case 148:
-                case 147:
                     return isContextSensitiveFunctionLikeDeclaration(node);
-                case 179:
+                case 183:
                     return isContextSensitive(node.expression);
             }
             return false;
@@ -24357,7 +26223,7 @@ var ts;
             if (ts.forEach(node.parameters, function (p) { return !p.type; })) {
                 return true;
             }
-            if (node.kind === 181) {
+            if (node.kind === 185) {
                 return false;
             }
             var parameter = ts.firstOrUndefined(node.parameters);
@@ -24367,10 +26233,10 @@ var ts;
             return (isFunctionExpressionOrArrowFunction(func) || ts.isObjectLiteralMethod(func)) && isContextSensitiveFunctionLikeDeclaration(func);
         }
         function getTypeWithoutSignatures(type) {
-            if (type.flags & 2588672) {
+            if (type.flags & 32768) {
                 var resolved = resolveStructuredTypeMembers(type);
                 if (resolved.constructSignatures.length) {
-                    var result = createObjectType(2097152, type.symbol);
+                    var result = createObjectType(16, type.symbol);
                     result.members = resolved.members;
                     result.properties = resolved.properties;
                     result.callSignatures = emptyArray;
@@ -24549,7 +26415,7 @@ var ts;
             }
             if (source.symbol.name !== target.symbol.name ||
                 !(source.symbol.flags & 256) || !(target.symbol.flags & 256) ||
-                (source.flags & 524288) !== (target.flags & 524288)) {
+                (source.flags & 65536) !== (target.flags & 65536)) {
                 return enumRelation[id] = false;
             }
             var targetEnumType = getTypeOfSymbol(target.symbol);
@@ -24606,23 +26472,23 @@ var ts;
             return false;
         }
         function isTypeRelatedTo(source, target, relation) {
-            if (source.flags & 96 && source.flags & 16777216) {
+            if (source.flags & 96 && source.flags & 1048576) {
                 source = source.regularType;
             }
-            if (target.flags & 96 && target.flags & 16777216) {
+            if (target.flags & 96 && target.flags & 1048576) {
                 target = target.regularType;
             }
             if (source === target || relation !== identityRelation && isSimpleTypeRelatedTo(source, target, relation)) {
                 return true;
             }
-            if (source.flags & 2588672 && target.flags & 2588672) {
+            if (source.flags & 32768 && target.flags & 32768) {
                 var id = relation !== identityRelation || source.id < target.id ? source.id + "," + target.id : target.id + "," + source.id;
                 var related = relation[id];
                 if (related !== undefined) {
                     return related === 1;
                 }
             }
-            if (source.flags & 4177920 || target.flags & 4177920) {
+            if (source.flags & 507904 || target.flags & 507904) {
                 return checkTypeRelatedTo(source, target, relation, undefined, undefined, undefined);
             }
             return false;
@@ -24659,9 +26525,15 @@ var ts;
                     targetType = typeToString(target, undefined, 128);
                 }
                 if (!message) {
-                    message = relation === comparableRelation ?
-                        ts.Diagnostics.Type_0_is_not_comparable_to_type_1 :
-                        ts.Diagnostics.Type_0_is_not_assignable_to_type_1;
+                    if (relation === comparableRelation) {
+                        message = ts.Diagnostics.Type_0_is_not_comparable_to_type_1;
+                    }
+                    else if (sourceType === targetType) {
+                        message = ts.Diagnostics.Type_0_is_not_assignable_to_type_1_Two_different_types_with_this_name_exist_but_they_are_unrelated;
+                    }
+                    else {
+                        message = ts.Diagnostics.Type_0_is_not_assignable_to_type_1;
+                    }
                 }
                 reportError(message, sourceType, targetType);
             }
@@ -24677,10 +26549,10 @@ var ts;
             }
             function isRelatedTo(source, target, reportErrors, headMessage) {
                 var result;
-                if (source.flags & 96 && source.flags & 16777216) {
+                if (source.flags & 96 && source.flags & 1048576) {
                     source = source.regularType;
                 }
-                if (target.flags & 96 && target.flags & 16777216) {
+                if (target.flags & 96 && target.flags & 1048576) {
                     target = target.regularType;
                 }
                 if (source === target)
@@ -24690,19 +26562,24 @@ var ts;
                 }
                 if (isSimpleTypeRelatedTo(source, target, relation, reportErrors ? reportError : undefined))
                     return -1;
-                if (source.flags & 8388608 && source.flags & 16777216) {
+                if (source.flags & 262144) {
+                    if (maybeTypeOfKind(target, 2) && maybeTypeOfKind(target, 4)) {
+                        return -1;
+                    }
+                }
+                if (getObjectFlags(source) & 128 && source.flags & 1048576) {
                     if (hasExcessProperties(source, target, reportErrors)) {
                         if (reportErrors) {
                             reportRelationError(headMessage, source, target);
                         }
                         return 0;
                     }
-                    if (target.flags & 1572864) {
+                    if (target.flags & 196608) {
                         source = getRegularTypeOfObjectLiteral(source);
                     }
                 }
                 var saveErrorInfo = errorInfo;
-                if (source.flags & 524288) {
+                if (source.flags & 65536) {
                     if (relation === comparableRelation) {
                         result = someTypeRelatedToType(source, target, reportErrors && !(source.flags & 8190));
                     }
@@ -24713,20 +26590,38 @@ var ts;
                         return result;
                     }
                 }
-                else if (target.flags & 1048576) {
-                    result = typeRelatedToEachType(source, target, reportErrors);
-                    if (result) {
+                else if (target.flags & 65536) {
+                    if (result = typeRelatedToSomeType(source, target, reportErrors && !(source.flags & 8190) && !(target.flags & 8190))) {
                         return result;
                     }
                 }
-                else {
-                    if (source.flags & 1048576) {
-                        if (result = someTypeRelatedToType(source, target, false)) {
+                else if (target.flags & 131072) {
+                    if (result = typeRelatedToEachType(source, target, reportErrors)) {
+                        return result;
+                    }
+                }
+                else if (source.flags & 131072) {
+                    if (result = someTypeRelatedToType(source, target, false)) {
+                        return result;
+                    }
+                }
+                if (target.flags & 16384) {
+                    var constraint = getConstraintOfTypeParameter(target);
+                    if (constraint && constraint.flags & 262144) {
+                        if (result = isRelatedTo(source, constraint, reportErrors)) {
                             return result;
                         }
                     }
-                    if (target.flags & 524288) {
-                        if (result = typeRelatedToSomeType(source, target, reportErrors && !(source.flags & 8190) && !(target.flags & 8190))) {
+                }
+                else if (target.flags & 262144) {
+                    if (source.flags & 262144) {
+                        if (result = isRelatedTo(target.type, source.type, false)) {
+                            return result;
+                        }
+                    }
+                    var constraint = getConstraintOfTypeParameter(target.type);
+                    if (constraint) {
+                        if (result = isRelatedTo(source, getIndexType(constraint), reportErrors)) {
                             return result;
                         }
                     }
@@ -24744,25 +26639,35 @@ var ts;
                     }
                 }
                 else {
-                    if (source.flags & 131072 && target.flags & 131072 && source.target === target.target) {
+                    if (getObjectFlags(source) & 4 && getObjectFlags(target) & 4 && source.target === target.target) {
                         if (result = typeArgumentsRelatedTo(source, target, reportErrors)) {
                             return result;
                         }
                     }
-                    var apparentSource = getApparentType(source);
-                    if (apparentSource.flags & (2588672 | 1048576) && target.flags & 2588672) {
-                        var reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo && !(source.flags & 8190);
-                        if (result = objectTypeRelatedTo(apparentSource, source, target, reportStructuralErrors)) {
-                            errorInfo = saveErrorInfo;
-                            return result;
+                    if (isGenericMappedType(target)) {
+                        if (isGenericMappedType(source)) {
+                            if ((result = isRelatedTo(getConstraintTypeFromMappedType(target), getConstraintTypeFromMappedType(source), reportErrors)) &&
+                                (result = isRelatedTo(getTemplateTypeFromMappedType(source), getTemplateTypeFromMappedType(target), reportErrors))) {
+                                return result;
+                            }
+                        }
+                    }
+                    else {
+                        var apparentSource = getApparentType(source);
+                        if (apparentSource.flags & (32768 | 131072) && target.flags & 32768) {
+                            var reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo && !(source.flags & 8190);
+                            if (result = objectTypeRelatedTo(apparentSource, source, target, reportStructuralErrors)) {
+                                errorInfo = saveErrorInfo;
+                                return result;
+                            }
                         }
                     }
                 }
                 if (reportErrors) {
-                    if (source.flags & 2588672 && target.flags & 8190) {
+                    if (source.flags & 32768 && target.flags & 8190) {
                         tryElaborateErrorsForPrimitivesAndObjects(source, target);
                     }
-                    else if (source.symbol && source.flags & 2588672 && globalObjectType === source) {
+                    else if (source.symbol && source.flags & 32768 && globalObjectType === source) {
                         reportError(ts.Diagnostics.The_Object_type_is_assignable_to_very_few_other_types_Did_you_mean_to_use_the_any_type_instead);
                     }
                     reportRelationError(headMessage, source, target);
@@ -24771,16 +26676,16 @@ var ts;
             }
             function isIdenticalTo(source, target) {
                 var result;
-                if (source.flags & 2588672 && target.flags & 2588672) {
-                    if (source.flags & 131072 && target.flags & 131072 && source.target === target.target) {
+                if (source.flags & 32768 && target.flags & 32768) {
+                    if (getObjectFlags(source) & 4 && getObjectFlags(target) & 4 && source.target === target.target) {
                         if (result = typeArgumentsRelatedTo(source, target, false)) {
                             return result;
                         }
                     }
                     return objectTypeRelatedTo(source, source, target, false);
                 }
-                if (source.flags & 524288 && target.flags & 524288 ||
-                    source.flags & 1048576 && target.flags & 1048576) {
+                if (source.flags & 65536 && target.flags & 65536 ||
+                    source.flags & 131072 && target.flags & 131072) {
                     if (result = eachTypeRelatedToSomeType(source, target)) {
                         if (result &= eachTypeRelatedToSomeType(target, source)) {
                             return result;
@@ -24790,7 +26695,7 @@ var ts;
                 return 0;
             }
             function isKnownProperty(type, name) {
-                if (type.flags & 2588672) {
+                if (type.flags & 32768) {
                     var resolved = resolveStructuredTypeMembers(type);
                     if ((relation === assignableRelation || relation === comparableRelation) && (type === globalObjectType || isEmptyObjectType(resolved)) ||
                         resolved.stringIndexInfo ||
@@ -24799,7 +26704,7 @@ var ts;
                         return true;
                     }
                 }
-                else if (type.flags & 1572864) {
+                else if (type.flags & 196608) {
                     for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                         var t = _a[_i];
                         if (isKnownProperty(t, name)) {
@@ -24817,8 +26722,7 @@ var ts;
                     !t.numberIndexInfo;
             }
             function hasExcessProperties(source, target, reportErrors) {
-                if (maybeTypeOfKind(target, 2588672) &&
-                    (!(target.flags & 2588672) || !target.isObjectLiteralPatternWithComputedProperties)) {
+                if (maybeTypeOfKind(target, 32768) && !(getObjectFlags(target) & 512)) {
                     for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
                         var prop = _a[_i];
                         if (!isKnownProperty(target, prop.name)) {
@@ -24848,7 +26752,7 @@ var ts;
             }
             function typeRelatedToSomeType(source, target, reportErrors) {
                 var targetTypes = target.types;
-                if (target.flags & 524288 && containsType(targetTypes, source)) {
+                if (target.flags & 65536 && containsType(targetTypes, source)) {
                     return -1;
                 }
                 var len = targetTypes.length;
@@ -24875,7 +26779,7 @@ var ts;
             }
             function someTypeRelatedToType(source, target, reportErrors) {
                 var sourceTypes = source.types;
-                if (source.flags & 524288 && containsType(sourceTypes, target)) {
+                if (source.flags & 65536 && containsType(sourceTypes, target)) {
                     return -1;
                 }
                 var len = sourceTypes.length;
@@ -24995,9 +26899,9 @@ var ts;
                 }
                 var result = -1;
                 var properties = getPropertiesOfObjectType(target);
-                var requireOptionalProperties = relation === subtypeRelation && !(source.flags & 8388608);
-                for (var _i = 0, properties_2 = properties; _i < properties_2.length; _i++) {
-                    var targetProp = properties_2[_i];
+                var requireOptionalProperties = relation === subtypeRelation && !(getObjectFlags(source) & 128);
+                for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
+                    var targetProp = properties_3[_i];
                     var sourceProp = getPropertyOfType(source, targetProp.name);
                     if (sourceProp !== targetProp) {
                         if (!sourceProp) {
@@ -25049,7 +26953,7 @@ var ts;
                                 return 0;
                             }
                             result &= related;
-                            if (sourceProp.flags & 536870912 && !(targetProp.flags & 536870912)) {
+                            if (relation !== comparableRelation && sourceProp.flags & 536870912 && !(targetProp.flags & 536870912)) {
                                 if (reportErrors) {
                                     reportError(ts.Diagnostics.Property_0_is_optional_in_type_1_but_required_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
                                 }
@@ -25061,7 +26965,7 @@ var ts;
                 return result;
             }
             function propertiesIdenticalTo(source, target) {
-                if (!(source.flags & 2588672 && target.flags & 2588672)) {
+                if (!(source.flags & 32768 && target.flags & 32768)) {
                     return 0;
                 }
                 var sourceProperties = getPropertiesOfObjectType(source);
@@ -25233,7 +27137,7 @@ var ts;
             }
         }
         function isAbstractConstructorType(type) {
-            if (type.flags & 2097152) {
+            if (getObjectFlags(type) & 16) {
                 var symbol = type.symbol;
                 if (symbol && symbol.flags & 32) {
                     var declaration = getClassLikeDeclarationOfSymbol(symbol);
@@ -25245,12 +27149,12 @@ var ts;
             return false;
         }
         function isDeeplyNestedGeneric(type, stack, depth) {
-            if (type.flags & (131072 | 4194304) && depth >= 5) {
+            if (getObjectFlags(type) & (4 | 64) && depth >= 5) {
                 var symbol = type.symbol;
                 var count = 0;
                 for (var i = 0; i < depth; i++) {
                     var t = stack[i];
-                    if (t.flags & (131072 | 4194304) && t.symbol === symbol) {
+                    if (getObjectFlags(t) & (4 | 64) && t.symbol === symbol) {
                         count++;
                         if (count >= 5)
                             return true;
@@ -25408,10 +27312,10 @@ var ts;
             checkTypeSubtypeOf(bestSupertypeDownfallType, bestSupertype, errorLocation, ts.Diagnostics.Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0, errorMessageChainHead);
         }
         function isArrayType(type) {
-            return type.flags & 131072 && type.target === globalArrayType;
+            return getObjectFlags(type) & 4 && type.target === globalArrayType;
         }
         function isArrayLikeType(type) {
-            return type.flags & 131072 && (type.target === globalArrayType || type.target === globalReadonlyArrayType) ||
+            return getObjectFlags(type) & 4 && (type.target === globalArrayType || type.target === globalReadonlyArrayType) ||
                 !(type.flags & 6144) && isTypeAssignableTo(type, anyReadonlyArrayType);
         }
         function isTupleLikeType(type) {
@@ -25422,7 +27326,7 @@ var ts;
         }
         function isLiteralType(type) {
             return type.flags & 8 ? true :
-                type.flags & 524288 ? type.flags & 16 ? true : !ts.forEach(type.types, function (t) { return !isUnitType(t); }) :
+                type.flags & 65536 ? type.flags & 16 ? true : !ts.forEach(type.types, function (t) { return !isUnitType(t); }) :
                     isUnitType(type);
         }
         function getBaseTypeOfLiteralType(type) {
@@ -25430,19 +27334,19 @@ var ts;
                 type.flags & 64 ? numberType :
                     type.flags & 128 ? booleanType :
                         type.flags & 256 ? type.baseType :
-                            type.flags & 524288 && !(type.flags & 16) ? getUnionType(ts.sameMap(type.types, getBaseTypeOfLiteralType)) :
+                            type.flags & 65536 && !(type.flags & 16) ? getUnionType(ts.sameMap(type.types, getBaseTypeOfLiteralType)) :
                                 type;
         }
         function getWidenedLiteralType(type) {
-            return type.flags & 32 && type.flags & 16777216 ? stringType :
-                type.flags & 64 && type.flags & 16777216 ? numberType :
+            return type.flags & 32 && type.flags & 1048576 ? stringType :
+                type.flags & 64 && type.flags & 1048576 ? numberType :
                     type.flags & 128 ? booleanType :
                         type.flags & 256 ? type.baseType :
-                            type.flags & 524288 && !(type.flags & 16) ? getUnionType(ts.sameMap(type.types, getWidenedLiteralType)) :
+                            type.flags & 65536 && !(type.flags & 16) ? getUnionType(ts.sameMap(type.types, getWidenedLiteralType)) :
                                 type;
         }
         function isTupleType(type) {
-            return !!(type.flags & 131072 && type.target.flags & 262144);
+            return !!(getObjectFlags(type) & 4 && type.target.objectFlags & 8);
         }
         function getFalsyFlagsOfTypes(types) {
             var result = 0;
@@ -25453,7 +27357,7 @@ var ts;
             return result;
         }
         function getFalsyFlags(type) {
-            return type.flags & 524288 ? getFalsyFlagsOfTypes(type.types) :
+            return type.flags & 65536 ? getFalsyFlagsOfTypes(type.types) :
                 type.flags & 32 ? type.text === "" ? 32 : 0 :
                     type.flags & 64 ? type.text === "0" ? 64 : 0 :
                         type.flags & 128 ? type === falseType ? 128 : 0 :
@@ -25514,7 +27418,7 @@ var ts;
             return members;
         }
         function getRegularTypeOfObjectLiteral(type) {
-            if (!(type.flags & 8388608 && type.flags & 16777216)) {
+            if (!(getObjectFlags(type) & 128 && type.flags & 1048576)) {
                 return type;
             }
             var regularType = type.regularType;
@@ -25524,7 +27428,8 @@ var ts;
             var resolved = type;
             var members = transformTypeOfMembers(type, getRegularTypeOfObjectLiteral);
             var regularNew = createAnonymousType(resolved.symbol, members, resolved.callSignatures, resolved.constructSignatures, resolved.stringIndexInfo, resolved.numberIndexInfo);
-            regularNew.flags = resolved.flags & ~16777216;
+            regularNew.flags = resolved.flags & ~1048576;
+            regularNew.objectFlags |= 128;
             type.regularType = regularNew;
             return regularNew;
         }
@@ -25541,14 +27446,14 @@ var ts;
             return type.flags & 6144 ? type : getWidenedType(type);
         }
         function getWidenedType(type) {
-            if (type.flags & 100663296) {
+            if (type.flags & 6291456) {
                 if (type.flags & 6144) {
                     return anyType;
                 }
-                if (type.flags & 8388608) {
+                if (getObjectFlags(type) & 128) {
                     return getWidenedTypeOfObjectLiteral(type);
                 }
-                if (type.flags & 524288) {
+                if (type.flags & 65536) {
                     return getUnionType(ts.sameMap(type.types, getWidenedConstituentType));
                 }
                 if (isArrayType(type) || isTupleType(type)) {
@@ -25559,7 +27464,7 @@ var ts;
         }
         function reportWideningErrorsInType(type) {
             var errorReported = false;
-            if (type.flags & 524288) {
+            if (type.flags & 65536) {
                 for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                     var t = _a[_i];
                     if (reportWideningErrorsInType(t)) {
@@ -25575,11 +27480,11 @@ var ts;
                     }
                 }
             }
-            if (type.flags & 8388608) {
+            if (getObjectFlags(type) & 128) {
                 for (var _d = 0, _e = getPropertiesOfObjectType(type); _d < _e.length; _d++) {
                     var p = _e[_d];
                     var t = getTypeOfSymbol(p);
-                    if (t.flags & 33554432) {
+                    if (t.flags & 2097152) {
                         if (!reportWideningErrorsInType(t)) {
                             error(p.valueDeclaration, ts.Diagnostics.Object_literal_s_property_0_implicitly_has_an_1_type, p.name, typeToString(getWidenedType(t)));
                         }
@@ -25593,25 +27498,25 @@ var ts;
             var typeAsString = typeToString(getWidenedType(type));
             var diagnostic;
             switch (declaration.kind) {
+                case 147:
                 case 146:
-                case 145:
                     diagnostic = ts.Diagnostics.Member_0_implicitly_has_an_1_type;
                     break;
-                case 143:
+                case 144:
                     diagnostic = declaration.dotDotDotToken ?
                         ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type :
                         ts.Diagnostics.Parameter_0_implicitly_has_an_1_type;
                     break;
-                case 170:
+                case 174:
                     diagnostic = ts.Diagnostics.Binding_element_0_implicitly_has_an_1_type;
                     break;
-                case 221:
+                case 225:
+                case 149:
                 case 148:
-                case 147:
-                case 150:
                 case 151:
-                case 180:
-                case 181:
+                case 152:
+                case 184:
+                case 185:
                     if (!declaration.name) {
                         error(declaration, ts.Diagnostics.Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
                         return;
@@ -25624,7 +27529,7 @@ var ts;
             error(declaration, diagnostic, ts.declarationNameToString(declaration.name), typeAsString);
         }
         function reportErrorsFromWidening(declaration, type) {
-            if (produceDiagnostics && compilerOptions.noImplicitAny && type.flags & 33554432) {
+            if (produceDiagnostics && compilerOptions.noImplicitAny && type.flags & 2097152) {
                 if (!reportWideningErrorsInType(type)) {
                     reportImplicitAnyError(declaration, type);
                 }
@@ -25668,10 +27573,12 @@ var ts;
             };
         }
         function couldContainTypeParameters(type) {
+            var objectFlags = getObjectFlags(type);
             return !!(type.flags & 16384 ||
-                type.flags & 131072 && ts.forEach(type.typeArguments, couldContainTypeParameters) ||
-                type.flags & 2097152 && type.symbol && type.symbol.flags & (8192 | 2048 | 32) ||
-                type.flags & 1572864 && couldUnionOrIntersectionContainTypeParameters(type));
+                objectFlags & 4 && ts.forEach(type.typeArguments, couldContainTypeParameters) ||
+                objectFlags & 16 && type.symbol && type.symbol.flags & (8192 | 2048 | 32) ||
+                objectFlags & 32 ||
+                type.flags & 196608 && couldUnionOrIntersectionContainTypeParameters(type));
         }
         function couldUnionOrIntersectionContainTypeParameters(type) {
             if (type.couldContainTypeParameters === undefined) {
@@ -25680,7 +27587,7 @@ var ts;
             return type.couldContainTypeParameters;
         }
         function isTypeParameterAtTopLevel(type, typeParameter) {
-            return type === typeParameter || type.flags & 1572864 && ts.forEach(type.types, function (t) { return isTypeParameterAtTopLevel(t, typeParameter); });
+            return type === typeParameter || type.flags & 196608 && ts.forEach(type.types, function (t) { return isTypeParameterAtTopLevel(t, typeParameter); });
         }
         function inferTypes(context, originalSource, originalTarget) {
             var typeParameters = context.signature.typeParameters;
@@ -25702,8 +27609,16 @@ var ts;
                 if (!couldContainTypeParameters(target)) {
                     return;
                 }
-                if (source.flags & 524288 && target.flags & 524288 && !(source.flags & 16 && target.flags & 16) ||
-                    source.flags & 1048576 && target.flags & 1048576) {
+                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]);
+                    }
+                    return;
+                }
+                if (source.flags & 65536 && target.flags & 65536 && !(source.flags & 16 && target.flags & 16) ||
+                    source.flags & 131072 && target.flags & 131072) {
                     if (source === target) {
                         for (var _i = 0, _a = source.types; _i < _a.length; _i++) {
                             var t = _a[_i];
@@ -25731,7 +27646,7 @@ var ts;
                     }
                 }
                 if (target.flags & 16384) {
-                    if (source.flags & 134217728) {
+                    if (source.flags & 8388608) {
                         return;
                     }
                     for (var i = 0; i < typeParameters.length; i++) {
@@ -25752,7 +27667,7 @@ var ts;
                         }
                     }
                 }
-                else if (source.flags & 131072 && target.flags & 131072 && source.target === target.target) {
+                else if (getObjectFlags(source) & 4 && getObjectFlags(target) & 4 && source.target === target.target) {
                     var sourceTypes = source.typeArguments || emptyArray;
                     var targetTypes = target.typeArguments || emptyArray;
                     var count = sourceTypes.length < targetTypes.length ? sourceTypes.length : targetTypes.length;
@@ -25760,7 +27675,7 @@ var ts;
                         inferFromTypes(sourceTypes[i], targetTypes[i]);
                     }
                 }
-                else if (target.flags & 1572864) {
+                else if (target.flags & 196608) {
                     var targetTypes = target.types;
                     var typeParameterCount = 0;
                     var typeParameter = void 0;
@@ -25780,7 +27695,7 @@ var ts;
                         inferiority--;
                     }
                 }
-                else if (source.flags & 1572864) {
+                else if (source.flags & 196608) {
                     var sourceTypes = source.types;
                     for (var _e = 0, sourceTypes_3 = sourceTypes; _e < sourceTypes_3.length; _e++) {
                         var sourceType = sourceTypes_3[_e];
@@ -25788,8 +27703,21 @@ var ts;
                     }
                 }
                 else {
+                    if (getObjectFlags(target) & 32) {
+                        var constraintType = getConstraintTypeFromMappedType(target);
+                        if (getObjectFlags(source) & 32) {
+                            inferFromTypes(getConstraintTypeFromMappedType(source), constraintType);
+                            inferFromTypes(getTemplateTypeFromMappedType(source), getTemplateTypeFromMappedType(target));
+                            return;
+                        }
+                        if (constraintType.flags & 16384) {
+                            inferFromTypes(getIndexType(source), constraintType);
+                            inferFromTypes(getUnionType(ts.map(getPropertiesOfType(source), getTypeOfSymbol)), getTemplateTypeFromMappedType(target));
+                            return;
+                        }
+                    }
                     source = getApparentType(source);
-                    if (source.flags & 2588672) {
+                    if (source.flags & 32768) {
                         if (isInProcess(source, target)) {
                             return;
                         }
@@ -25818,8 +27746,8 @@ var ts;
             }
             function inferFromProperties(source, target) {
                 var properties = getPropertiesOfObjectType(target);
-                for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
-                    var targetProp = properties_3[_i];
+                for (var _i = 0, properties_4 = properties; _i < properties_4.length; _i++) {
+                    var targetProp = properties_4[_i];
                     var sourceProp = getPropertyOfObjectType(source, targetProp.name);
                     if (sourceProp) {
                         inferFromTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp));
@@ -25885,7 +27813,7 @@ var ts;
                     reducedTypes.push(t);
                 }
             }
-            return type.flags & 524288 ? getUnionType(reducedTypes) : getIntersectionType(reducedTypes);
+            return type.flags & 65536 ? getUnionType(reducedTypes) : getIntersectionType(reducedTypes);
         }
         function getInferenceCandidates(context, index) {
             var inferences = context.inferences[index];
@@ -25893,7 +27821,7 @@ var ts;
         }
         function hasPrimitiveConstraint(type) {
             var constraint = getConstraintOfTypeParameter(type);
-            return constraint && maybeTypeOfKind(constraint, 8190);
+            return constraint && maybeTypeOfKind(constraint, 8190 | 262144);
         }
         function getInferredType(context, index) {
             var inferredType = context.inferredTypes[index];
@@ -25946,10 +27874,10 @@ var ts;
         function isInTypeQuery(node) {
             while (node) {
                 switch (node.kind) {
-                    case 159:
+                    case 160:
                         return true;
                     case 70:
-                    case 140:
+                    case 141:
                         node = node.parent;
                         continue;
                     default:
@@ -25966,7 +27894,7 @@ var ts;
             if (node.kind === 98) {
                 return "0";
             }
-            if (node.kind === 173) {
+            if (node.kind === 177) {
                 var key = getFlowCacheKey(node.expression);
                 return key && key + "." + node.name.text;
             }
@@ -25977,7 +27905,7 @@ var ts;
                 case 70:
                 case 98:
                     return node;
-                case 173:
+                case 177:
                     return getLeftmostIdentifierOrThis(node.expression);
             }
             return undefined;
@@ -25986,19 +27914,19 @@ var ts;
             switch (source.kind) {
                 case 70:
                     return target.kind === 70 && getResolvedSymbol(source) === getResolvedSymbol(target) ||
-                        (target.kind === 219 || target.kind === 170) &&
+                        (target.kind === 223 || target.kind === 174) &&
                             getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(source)) === getSymbolOfNode(target);
                 case 98:
                     return target.kind === 98;
-                case 173:
-                    return target.kind === 173 &&
+                case 177:
+                    return target.kind === 177 &&
                         source.name.text === target.name.text &&
                         isMatchingReference(source.expression, target.expression);
             }
             return false;
         }
         function containsMatchingReference(source, target) {
-            while (source.kind === 173) {
+            while (source.kind === 177) {
                 source = source.expression;
                 if (isMatchingReference(source, target)) {
                     return true;
@@ -26007,7 +27935,7 @@ var ts;
             return false;
         }
         function containsMatchingReferenceDiscriminant(source, target) {
-            return target.kind === 173 &&
+            return target.kind === 177 &&
                 containsMatchingReference(source, target.expression) &&
                 isDiscriminantProperty(getDeclaredTypeOfReference(target.expression), target.name.text);
         }
@@ -26015,14 +27943,14 @@ var ts;
             if (expr.kind === 70) {
                 return getTypeOfSymbol(getResolvedSymbol(expr));
             }
-            if (expr.kind === 173) {
+            if (expr.kind === 177) {
                 var type = getDeclaredTypeOfReference(expr.expression);
                 return type && getTypeOfPropertyOfType(type, expr.name.text);
             }
             return undefined;
         }
         function isDiscriminantProperty(type, name) {
-            if (type && type.flags & 524288) {
+            if (type && type.flags & 65536) {
                 var prop = getUnionOrIntersectionProperty(type, name);
                 if (prop && prop.flags & 268435456) {
                     if (prop.isDiscriminantProperty === undefined) {
@@ -26045,7 +27973,7 @@ var ts;
                     }
                 }
             }
-            if (callExpression.expression.kind === 173 &&
+            if (callExpression.expression.kind === 177 &&
                 isOrContainsMatchingReference(reference, callExpression.expression.expression)) {
                 return true;
             }
@@ -26059,7 +27987,7 @@ var ts;
             return flow.id;
         }
         function typeMaybeAssignableTo(source, target) {
-            if (!(source.flags & 524288)) {
+            if (!(source.flags & 65536)) {
                 return isTypeAssignableTo(source, target);
             }
             for (var _i = 0, _a = source.types; _i < _a.length; _i++) {
@@ -26122,7 +28050,7 @@ var ts;
                     type === falseType ? 3030404 : 1981828 :
                     type === falseType ? 3145092 : 4193668;
             }
-            if (flags & 2588672) {
+            if (flags & 32768) {
                 return isFunctionObjectType(type) ?
                     strictNullChecks ? 6164448 : 8376288 :
                     strictNullChecks ? 6166480 : 8378320;
@@ -26140,7 +28068,7 @@ var ts;
                 var constraint = getConstraintOfTypeParameter(type);
                 return getTypeFacts(constraint || emptyObjectType);
             }
-            if (flags & 1572864) {
+            if (flags & 196608) {
                 return getTypeFactsOfTypes(type.types);
             }
             return 8388607;
@@ -26156,7 +28084,7 @@ var ts;
             return type;
         }
         function getTypeOfDestructuredProperty(type, name) {
-            var text = getTextOfPropertyName(name);
+            var text = ts.getTextOfPropertyName(name);
             return getTypeOfPropertyOfType(type, text) ||
                 isNumericLiteralName(text) && getIndexTypeOfType(type, 1) ||
                 getIndexTypeOfType(type, 0) ||
@@ -26167,19 +28095,19 @@ var ts;
                 checkIteratedTypeOrElementType(type, undefined, false) ||
                 unknownType;
         }
-        function getTypeOfDestructuredSpreadElement(type) {
+        function getTypeOfDestructuredSpreadExpression(type) {
             return createArrayType(checkIteratedTypeOrElementType(type, undefined, false) || unknownType);
         }
         function getAssignedTypeOfBinaryExpression(node) {
-            return node.parent.kind === 171 || node.parent.kind === 253 ?
+            return node.parent.kind === 175 || node.parent.kind === 257 ?
                 getTypeWithDefault(getAssignedType(node), node.right) :
                 checkExpression(node.right);
         }
         function getAssignedTypeOfArrayLiteralElement(node, element) {
             return getTypeOfDestructuredArrayElement(getAssignedType(node), ts.indexOf(node.elements, element));
         }
-        function getAssignedTypeOfSpreadElement(node) {
-            return getTypeOfDestructuredSpreadElement(getAssignedType(node.parent));
+        function getAssignedTypeOfSpreadExpression(node) {
+            return getTypeOfDestructuredSpreadExpression(getAssignedType(node.parent));
         }
         function getAssignedTypeOfPropertyAssignment(node) {
             return getTypeOfDestructuredProperty(getAssignedType(node.parent), node.name);
@@ -26190,21 +28118,21 @@ var ts;
         function getAssignedType(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 208:
+                case 212:
                     return stringType;
-                case 209:
+                case 213:
                     return checkRightHandSideOfForOf(parent.expression) || unknownType;
-                case 188:
-                    return getAssignedTypeOfBinaryExpression(parent);
-                case 182:
-                    return undefinedType;
-                case 171:
-                    return getAssignedTypeOfArrayLiteralElement(parent, node);
                 case 192:
-                    return getAssignedTypeOfSpreadElement(parent);
-                case 253:
+                    return getAssignedTypeOfBinaryExpression(parent);
+                case 186:
+                    return undefinedType;
+                case 175:
+                    return getAssignedTypeOfArrayLiteralElement(parent, node);
+                case 196:
+                    return getAssignedTypeOfSpreadExpression(parent);
+                case 257:
                     return getAssignedTypeOfPropertyAssignment(parent);
-                case 254:
+                case 258:
                     return getAssignedTypeOfShorthandPropertyAssignment(parent);
             }
             return unknownType;
@@ -26212,11 +28140,11 @@ var ts;
         function getInitialTypeOfBindingElement(node) {
             var pattern = node.parent;
             var parentType = getInitialType(pattern.parent);
-            var type = pattern.kind === 168 ?
+            var type = pattern.kind === 172 ?
                 getTypeOfDestructuredProperty(parentType, node.propertyName || node.name) :
                 !node.dotDotDotToken ?
                     getTypeOfDestructuredArrayElement(parentType, ts.indexOf(pattern.elements, node)) :
-                    getTypeOfDestructuredSpreadElement(parentType);
+                    getTypeOfDestructuredSpreadExpression(parentType);
             return getTypeWithDefault(type, node.initializer);
         }
         function getTypeOfInitializer(node) {
@@ -26227,35 +28155,35 @@ var ts;
             if (node.initializer) {
                 return getTypeOfInitializer(node.initializer);
             }
-            if (node.parent.parent.kind === 208) {
+            if (node.parent.parent.kind === 212) {
                 return stringType;
             }
-            if (node.parent.parent.kind === 209) {
+            if (node.parent.parent.kind === 213) {
                 return checkRightHandSideOfForOf(node.parent.parent.expression) || unknownType;
             }
             return unknownType;
         }
         function getInitialType(node) {
-            return node.kind === 219 ?
+            return node.kind === 223 ?
                 getInitialTypeOfVariableDeclaration(node) :
                 getInitialTypeOfBindingElement(node);
         }
         function getInitialOrAssignedType(node) {
-            return node.kind === 219 || node.kind === 170 ?
+            return node.kind === 223 || node.kind === 174 ?
                 getInitialType(node) :
                 getAssignedType(node);
         }
         function isEmptyArrayAssignment(node) {
-            return node.kind === 219 && node.initializer &&
+            return node.kind === 223 && node.initializer &&
                 isEmptyArrayLiteral(node.initializer) ||
-                node.kind !== 170 && node.parent.kind === 188 &&
+                node.kind !== 174 && node.parent.kind === 192 &&
                     isEmptyArrayLiteral(node.parent.right);
         }
         function getReferenceCandidate(node) {
             switch (node.kind) {
-                case 179:
+                case 183:
                     return getReferenceCandidate(node.expression);
-                case 188:
+                case 192:
                     switch (node.operatorToken.kind) {
                         case 57:
                             return getReferenceCandidate(node.left);
@@ -26267,13 +28195,13 @@ var ts;
         }
         function getReferenceRoot(node) {
             var parent = node.parent;
-            return parent.kind === 179 ||
-                parent.kind === 188 && parent.operatorToken.kind === 57 && parent.left === node ||
-                parent.kind === 188 && parent.operatorToken.kind === 25 && parent.right === node ?
+            return parent.kind === 183 ||
+                parent.kind === 192 && parent.operatorToken.kind === 57 && parent.left === node ||
+                parent.kind === 192 && parent.operatorToken.kind === 25 && parent.right === node ?
                 getReferenceRoot(parent) : node;
         }
         function getTypeOfSwitchClause(clause) {
-            if (clause.kind === 249) {
+            if (clause.kind === 253) {
                 var caseType = getRegularTypeOfLiteralType(checkExpression(clause.expression));
                 return isUnitType(caseType) ? caseType : undefined;
             }
@@ -26288,13 +28216,13 @@ var ts;
             return links.switchTypes;
         }
         function eachTypeContainedIn(source, types) {
-            return source.flags & 524288 ? !ts.forEach(source.types, function (t) { return !ts.contains(types, t); }) : ts.contains(types, source);
+            return source.flags & 65536 ? !ts.forEach(source.types, function (t) { return !ts.contains(types, t); }) : ts.contains(types, source);
         }
         function isTypeSubsetOf(source, target) {
-            return source === target || target.flags & 524288 && isTypeSubsetOfUnion(source, target);
+            return source === target || target.flags & 65536 && isTypeSubsetOfUnion(source, target);
         }
         function isTypeSubsetOfUnion(source, target) {
-            if (source.flags & 524288) {
+            if (source.flags & 65536) {
                 for (var _i = 0, _a = source.types; _i < _a.length; _i++) {
                     var t = _a[_i];
                     if (!containsType(target.types, t)) {
@@ -26308,8 +28236,11 @@ var ts;
             }
             return containsType(target.types, source);
         }
+        function forEachType(type, f) {
+            return type.flags & 65536 ? ts.forEach(type.types, f) : f(type);
+        }
         function filterType(type, f) {
-            if (type.flags & 524288) {
+            if (type.flags & 65536) {
                 var types = type.types;
                 var filtered = ts.filter(types, f);
                 return filtered === types ? type : getUnionTypeFromSortedList(filtered);
@@ -26317,7 +28248,7 @@ var ts;
             return f(type) ? type : neverType;
         }
         function mapType(type, f) {
-            return type.flags & 524288 ? getUnionType(ts.map(type.types, f)) : f(type);
+            return type.flags & 65536 ? getUnionType(ts.map(type.types, f)) : f(type);
         }
         function extractTypesOfKind(type, kind) {
             return filterType(type, function (t) { return (t.flags & kind) !== 0; });
@@ -26343,7 +28274,7 @@ var ts;
             return incomplete ? { flags: 0, type: type } : type;
         }
         function createEvolvingArrayType(elementType) {
-            var result = createObjectType(2097152);
+            var result = createObjectType(256);
             result.elementType = elementType;
             return result;
         }
@@ -26354,13 +28285,10 @@ var ts;
             var elementType = getBaseTypeOfLiteralType(checkExpression(node));
             return isTypeSubsetOf(elementType, evolvingArrayType.elementType) ? evolvingArrayType : getEvolvingArrayType(getUnionType([evolvingArrayType.elementType, elementType]));
         }
-        function isEvolvingArrayType(type) {
-            return !!(type.flags & 2097152 && type.elementType);
-        }
         function createFinalArrayType(elementType) {
             return elementType.flags & 8192 ?
                 autoArrayType :
-                createArrayType(elementType.flags & 524288 ?
+                createArrayType(elementType.flags & 65536 ?
                     getUnionType(elementType.types, true) :
                     elementType);
         }
@@ -26368,17 +28296,17 @@ var ts;
             return evolvingArrayType.finalArrayType || (evolvingArrayType.finalArrayType = createFinalArrayType(evolvingArrayType.elementType));
         }
         function finalizeEvolvingArrayType(type) {
-            return isEvolvingArrayType(type) ? getFinalArrayType(type) : type;
+            return getObjectFlags(type) & 256 ? getFinalArrayType(type) : type;
         }
         function getElementTypeOfEvolvingArrayType(type) {
-            return isEvolvingArrayType(type) ? type.elementType : neverType;
+            return getObjectFlags(type) & 256 ? type.elementType : neverType;
         }
         function isEvolvingArrayTypeList(types) {
             var hasEvolvingArrayType = false;
             for (var _i = 0, types_12 = types; _i < types_12.length; _i++) {
                 var t = types_12[_i];
                 if (!(t.flags & 8192)) {
-                    if (!isEvolvingArrayType(t)) {
+                    if (!(getObjectFlags(t) & 256)) {
                         return false;
                     }
                     hasEvolvingArrayType = true;
@@ -26394,20 +28322,40 @@ var ts;
         function isEvolvingArrayOperationTarget(node) {
             var root = getReferenceRoot(node);
             var parent = root.parent;
-            var isLengthPushOrUnshift = parent.kind === 173 && (parent.name.text === "length" ||
-                parent.parent.kind === 175 && ts.isPushOrUnshiftIdentifier(parent.name));
-            var isElementAssignment = parent.kind === 174 &&
+            var isLengthPushOrUnshift = parent.kind === 177 && (parent.name.text === "length" ||
+                parent.parent.kind === 179 && ts.isPushOrUnshiftIdentifier(parent.name));
+            var isElementAssignment = parent.kind === 178 &&
                 parent.expression === root &&
-                parent.parent.kind === 188 &&
+                parent.parent.kind === 192 &&
                 parent.parent.operatorToken.kind === 57 &&
                 parent.parent.left === parent &&
                 !ts.isAssignmentTarget(parent.parent) &&
                 isTypeAnyOrAllConstituentTypesHaveKind(checkExpression(parent.argumentExpression), 340 | 2048);
             return isLengthPushOrUnshift || isElementAssignment;
         }
+        function maybeTypePredicateCall(node) {
+            var links = getNodeLinks(node);
+            if (links.maybeTypePredicate === undefined) {
+                links.maybeTypePredicate = getMaybeTypePredicate(node);
+            }
+            return links.maybeTypePredicate;
+        }
+        function getMaybeTypePredicate(node) {
+            if (node.expression.kind !== 96) {
+                var funcType = checkNonNullExpression(node.expression);
+                if (funcType !== silentNeverType) {
+                    var apparentType = getApparentType(funcType);
+                    if (apparentType !== unknownType) {
+                        var callSignatures = getSignaturesOfType(apparentType, 0);
+                        return !!ts.forEach(callSignatures, function (sig) { return sig.typePredicate; });
+                    }
+                }
+            }
+            return false;
+        }
         function getFlowTypeOfReference(reference, declaredType, assumeInitialized, flowContainer) {
             var key;
-            if (!reference.flowNode || assumeInitialized && !(declaredType.flags & 4178943)) {
+            if (!reference.flowNode || assumeInitialized && !(declaredType.flags & 1033215)) {
                 return declaredType;
             }
             var initialType = assumeInitialized ? declaredType :
@@ -26416,8 +28364,8 @@ var ts;
             var visitedFlowStart = visitedFlowCount;
             var evolvedType = getTypeFromFlowType(getTypeAtFlowNode(reference.flowNode));
             visitedFlowCount = visitedFlowStart;
-            var resultType = isEvolvingArrayType(evolvedType) && isEvolvingArrayOperationTarget(reference) ? anyArrayType : finalizeEvolvingArrayType(evolvedType);
-            if (reference.parent.kind === 197 && getTypeWithFacts(resultType, 524288).flags & 8192) {
+            var resultType = getObjectFlags(evolvedType) & 256 && isEvolvingArrayOperationTarget(reference) ? anyArrayType : finalizeEvolvingArrayType(evolvedType);
+            if (reference.parent.kind === 201 && getTypeWithFacts(resultType, 524288).flags & 8192) {
                 return declaredType;
             }
             return resultType;
@@ -26462,7 +28410,7 @@ var ts;
                     }
                     else if (flow.flags & 2) {
                         var container = flow.container;
-                        if (container && container !== flowContainer && reference.kind !== 173) {
+                        if (container && container !== flowContainer && reference.kind !== 177) {
                             flow = container.flowNode;
                             continue;
                         }
@@ -26482,7 +28430,7 @@ var ts;
             function getTypeAtFlowAssignment(flow) {
                 var node = flow.node;
                 if (isMatchingReference(reference, node)) {
-                    if (node.parent.kind === 186 || node.parent.kind === 187) {
+                    if (ts.getAssignmentTargetKind(node) === 2) {
                         var flowType = getTypeAtFlowNode(flow.antecedent);
                         return createFlowType(getBaseTypeOfLiteralType(getTypeFromFlowType(flowType)), isIncomplete(flowType));
                     }
@@ -26493,7 +28441,7 @@ var ts;
                         var assignedType = getBaseTypeOfLiteralType(getInitialOrAssignedType(node));
                         return isTypeAssignableTo(assignedType, declaredType) ? assignedType : anyArrayType;
                     }
-                    if (declaredType.flags & 524288) {
+                    if (declaredType.flags & 65536) {
                         return getAssignmentReducedType(declaredType, getInitialOrAssignedType(node));
                     }
                     return declaredType;
@@ -26505,15 +28453,15 @@ var ts;
             }
             function getTypeAtFlowArrayMutation(flow) {
                 var node = flow.node;
-                var expr = node.kind === 175 ?
+                var expr = node.kind === 179 ?
                     node.expression.expression :
                     node.left.expression;
                 if (isMatchingReference(reference, getReferenceCandidate(expr))) {
                     var flowType = getTypeAtFlowNode(flow.antecedent);
                     var type = getTypeFromFlowType(flowType);
-                    if (isEvolvingArrayType(type)) {
+                    if (getObjectFlags(type) & 256) {
                         var evolvedType_1 = type;
-                        if (node.kind === 175) {
+                        if (node.kind === 179) {
                             for (var _i = 0, _a = node.arguments; _i < _a.length; _i++) {
                                 var arg = _a[_i];
                                 evolvedType_1 = addEvolvingArrayElementType(evolvedType_1, arg);
@@ -26631,8 +28579,8 @@ var ts;
                 return cache[key] = result;
             }
             function isMatchingReferenceDiscriminant(expr) {
-                return expr.kind === 173 &&
-                    declaredType.flags & 524288 &&
+                return expr.kind === 177 &&
+                    declaredType.flags & 65536 &&
                     isMatchingReference(reference, expr.expression) &&
                     isDiscriminantProperty(declaredType, expr.name.text);
             }
@@ -26665,10 +28613,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 === 183 && right_1.kind === 9) {
+                        if (left_1.kind === 187 && right_1.kind === 9) {
                             return narrowTypeByTypeof(type, left_1, operator_1, right_1, assumeTrue);
                         }
-                        if (right_1.kind === 183 && left_1.kind === 9) {
+                        if (right_1.kind === 187 && left_1.kind === 9) {
                             return narrowTypeByTypeof(type, right_1, operator_1, left_1, assumeTrue);
                         }
                         if (isMatchingReference(reference, left_1)) {
@@ -26714,7 +28662,7 @@ var ts;
                             assumeTrue ? 16384 : 131072;
                     return getTypeWithFacts(type, facts);
                 }
-                if (type.flags & 2589185) {
+                if (type.flags & 33281) {
                     return type;
                 }
                 if (assumeTrue) {
@@ -26738,7 +28686,7 @@ var ts;
                 if (operator === 32 || operator === 34) {
                     assumeTrue = !assumeTrue;
                 }
-                if (assumeTrue && !(type.flags & 524288)) {
+                if (assumeTrue && !(type.flags & 65536)) {
                     var targetType = typeofTypesByName[literal.text];
                     if (targetType && isTypeSubtypeOf(targetType, type)) {
                         return targetType;
@@ -26790,10 +28738,10 @@ var ts;
                 }
                 if (!targetType) {
                     var constructSignatures = void 0;
-                    if (rightType.flags & 65536) {
+                    if (getObjectFlags(rightType) & 2) {
                         constructSignatures = resolveDeclaredMembers(rightType).declaredConstructSignatures;
                     }
-                    else if (rightType.flags & 2097152) {
+                    else if (getObjectFlags(rightType) & 16) {
                         constructSignatures = getSignaturesOfType(rightType, 1);
                     }
                     if (constructSignatures && constructSignatures.length) {
@@ -26809,7 +28757,7 @@ var ts;
                 if (!assumeTrue) {
                     return filterType(type, function (t) { return !isTypeInstanceOf(t, candidate); });
                 }
-                if (type.flags & 524288) {
+                if (type.flags & 65536) {
                     var assignableType = filterType(type, function (t) { return isTypeInstanceOf(t, candidate); });
                     if (!(assignableType.flags & 8192)) {
                         return assignableType;
@@ -26822,7 +28770,7 @@ var ts;
                             getIntersectionType([type, candidate]);
             }
             function narrowTypeByTypePredicate(type, callExpression, assumeTrue) {
-                if (!hasMatchingArgument(callExpression, reference)) {
+                if (!hasMatchingArgument(callExpression, reference) || !maybeTypePredicateCall(callExpression)) {
                     return type;
                 }
                 var signature = getResolvedSignature(callExpression);
@@ -26845,10 +28793,10 @@ var ts;
                     }
                 }
                 else {
-                    var invokedExpression = skipParenthesizedNodes(callExpression.expression);
-                    if (invokedExpression.kind === 174 || invokedExpression.kind === 173) {
+                    var invokedExpression = ts.skipParentheses(callExpression.expression);
+                    if (invokedExpression.kind === 178 || invokedExpression.kind === 177) {
                         var accessExpression = invokedExpression;
-                        var possibleReference = skipParenthesizedNodes(accessExpression.expression);
+                        var possibleReference = ts.skipParentheses(accessExpression.expression);
                         if (isMatchingReference(reference, possibleReference)) {
                             return getNarrowedType(type, predicate.type, assumeTrue);
                         }
@@ -26863,15 +28811,15 @@ var ts;
                 switch (expr.kind) {
                     case 70:
                     case 98:
-                    case 173:
+                    case 177:
                         return narrowTypeByTruthiness(type, expr, assumeTrue);
-                    case 175:
-                        return narrowTypeByTypePredicate(type, expr, assumeTrue);
                     case 179:
+                        return narrowTypeByTypePredicate(type, expr, assumeTrue);
+                    case 183:
                         return narrowType(type, expr.expression, assumeTrue);
-                    case 188:
+                    case 192:
                         return narrowTypeByBinaryExpression(type, expr, assumeTrue);
-                    case 186:
+                    case 190:
                         if (expr.operator === 50) {
                             return narrowType(type, expr.operand, !assumeTrue);
                         }
@@ -26894,19 +28842,13 @@ var ts;
             }
             return getTypeOfSymbol(symbol);
         }
-        function skipParenthesizedNodes(expression) {
-            while (expression.kind === 179) {
-                expression = expression.expression;
-            }
-            return expression;
-        }
         function getControlFlowContainer(node) {
             while (true) {
                 node = node.parent;
                 if (ts.isFunctionLike(node) && !ts.getImmediatelyInvokedFunctionExpression(node) ||
-                    node.kind === 227 ||
-                    node.kind === 256 ||
-                    node.kind === 146) {
+                    node.kind === 231 ||
+                    node.kind === 261 ||
+                    node.kind === 147) {
                     return node;
                 }
             }
@@ -26937,7 +28879,7 @@ var ts;
             if (node.kind === 70) {
                 if (ts.isAssignmentTarget(node)) {
                     var symbol = getResolvedSymbol(node);
-                    if (symbol.valueDeclaration && ts.getRootDeclaration(symbol.valueDeclaration).kind === 143) {
+                    if (symbol.valueDeclaration && ts.getRootDeclaration(symbol.valueDeclaration).kind === 144) {
                         symbol.isAssigned = true;
                     }
                 }
@@ -26951,19 +28893,23 @@ var ts;
         }
         function checkIdentifier(node) {
             var symbol = getResolvedSymbol(node);
+            if (symbol === unknownSymbol) {
+                return unknownType;
+            }
             if (symbol === argumentsSymbol) {
                 var container = ts.getContainingFunction(node);
                 if (languageVersion < 2) {
-                    if (container.kind === 181) {
+                    if (container.kind === 185) {
                         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)) {
                         error(node, ts.Diagnostics.The_arguments_object_cannot_be_referenced_in_an_async_function_or_method_in_ES3_and_ES5_Consider_using_a_standard_function_or_method);
                     }
                 }
-                if (node.flags & 262144) {
+                if (node.flags & 524288) {
                     getNodeLinks(container).flags |= 8192;
                 }
+                return getTypeOfSymbol(symbol);
             }
             if (symbol.flags & 8388608 && !isInTypeQuery(node) && !isConstEnumOrConstEnumOnlyModule(resolveAlias(symbol))) {
                 markAliasSymbolAsReferenced(symbol);
@@ -26972,7 +28918,7 @@ var ts;
             if (localOrExportSymbol.flags & 32) {
                 var declaration_1 = localOrExportSymbol.valueDeclaration;
                 if (languageVersion === 2
-                    && declaration_1.kind === 222
+                    && declaration_1.kind === 226
                     && ts.nodeIsDecorated(declaration_1)) {
                     var container = ts.getContainingClass(node);
                     while (container !== undefined) {
@@ -26984,11 +28930,11 @@ var ts;
                         container = ts.getContainingClass(container);
                     }
                 }
-                else if (declaration_1.kind === 193) {
+                else if (declaration_1.kind === 197) {
                     var container = ts.getThisContainer(node, false);
                     while (container !== undefined) {
                         if (container.parent === declaration_1) {
-                            if (container.kind === 146 && ts.hasModifier(container, 32)) {
+                            if (container.kind === 147 && ts.hasModifier(container, 32)) {
                                 getNodeLinks(declaration_1).flags |= 8388608;
                                 getNodeLinks(node).flags |= 16777216;
                             }
@@ -27003,15 +28949,26 @@ var ts;
             checkNestedBlockScopedBinding(node, symbol);
             var type = getTypeOfSymbol(localOrExportSymbol);
             var declaration = localOrExportSymbol.valueDeclaration;
-            if (!(localOrExportSymbol.flags & 3) || ts.isAssignmentTarget(node) || !declaration) {
+            var assignmentKind = ts.getAssignmentTargetKind(node);
+            if (assignmentKind) {
+                if (!(localOrExportSymbol.flags & 3)) {
+                    error(node, ts.Diagnostics.Cannot_assign_to_0_because_it_is_not_a_variable, symbolToString(symbol));
+                    return unknownType;
+                }
+                if (isReadonlySymbol(localOrExportSymbol)) {
+                    error(node, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_constant_or_a_read_only_property, symbolToString(symbol));
+                    return unknownType;
+                }
+            }
+            if (!(localOrExportSymbol.flags & 3) || assignmentKind === 1 || !declaration) {
                 return type;
             }
-            var isParameter = ts.getRootDeclaration(declaration).kind === 143;
+            var isParameter = ts.getRootDeclaration(declaration).kind === 144;
             var declarationContainer = getControlFlowContainer(declaration);
             var flowContainer = getControlFlowContainer(node);
             var isOuterVariable = flowContainer !== declarationContainer;
-            while (flowContainer !== declarationContainer && (flowContainer.kind === 180 ||
-                flowContainer.kind === 181 || ts.isObjectLiteralOrClassExpressionMethod(flowContainer)) &&
+            while (flowContainer !== declarationContainer && (flowContainer.kind === 184 ||
+                flowContainer.kind === 185 || ts.isObjectLiteralOrClassExpressionMethod(flowContainer)) &&
                 (isConstVariable(localOrExportSymbol) || isParameter && !isParameterAssigned(localOrExportSymbol))) {
                 flowContainer = getControlFlowContainer(flowContainer);
             }
@@ -27032,7 +28989,7 @@ var ts;
                 error(node, ts.Diagnostics.Variable_0_is_used_before_being_assigned, symbolToString(symbol));
                 return type;
             }
-            return flowType;
+            return assignmentKind ? getBaseTypeOfLiteralType(flowType) : flowType;
         }
         function isInsideFunction(node, threshold) {
             var current = node;
@@ -27047,7 +29004,7 @@ var ts;
         function checkNestedBlockScopedBinding(node, symbol) {
             if (languageVersion >= 2 ||
                 (symbol.flags & (2 | 32)) === 0 ||
-                symbol.valueDeclaration.parent.kind === 252) {
+                symbol.valueDeclaration.parent.kind === 256) {
                 return;
             }
             var container = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
@@ -27065,8 +29022,8 @@ var ts;
                 if (usedInFunction) {
                     getNodeLinks(current).flags |= 65536;
                 }
-                if (container.kind === 207 &&
-                    ts.getAncestor(symbol.valueDeclaration, 220).parent === container &&
+                if (container.kind === 211 &&
+                    ts.getAncestor(symbol.valueDeclaration, 224).parent === container &&
                     isAssignedInBodyOfForStatement(node, container)) {
                     getNodeLinks(symbol.valueDeclaration).flags |= 2097152;
                 }
@@ -27078,14 +29035,14 @@ var ts;
         }
         function isAssignedInBodyOfForStatement(node, container) {
             var current = node;
-            while (current.parent.kind === 179) {
+            while (current.parent.kind === 183) {
                 current = current.parent;
             }
             var isAssigned = false;
             if (ts.isAssignmentTarget(current)) {
                 isAssigned = true;
             }
-            else if ((current.parent.kind === 186 || current.parent.kind === 187)) {
+            else if ((current.parent.kind === 190 || current.parent.kind === 191)) {
                 var expr = current.parent;
                 isAssigned = expr.operator === 42 || expr.operator === 43;
             }
@@ -27104,7 +29061,7 @@ var ts;
         }
         function captureLexicalThis(node, container) {
             getNodeLinks(node).flags |= 2;
-            if (container.kind === 146 || container.kind === 149) {
+            if (container.kind === 147 || container.kind === 150) {
                 var classNode = container.parent;
                 getNodeLinks(classNode).flags |= 4;
             }
@@ -27138,7 +29095,7 @@ var ts;
         function checkThisExpression(node) {
             var container = ts.getThisContainer(node, true);
             var needToCaptureLexicalThis = false;
-            if (container.kind === 149) {
+            if (container.kind === 150) {
                 var containingClassDecl = container.parent;
                 var baseTypeNode = ts.getClassExtendsHeritageClauseElement(containingClassDecl);
                 if (baseTypeNode && !classDeclarationExtendsNull(containingClassDecl)) {
@@ -27148,29 +29105,29 @@ var ts;
                     }
                 }
             }
-            if (container.kind === 181) {
+            if (container.kind === 185) {
                 container = ts.getThisContainer(container, false);
                 needToCaptureLexicalThis = (languageVersion < 2);
             }
             switch (container.kind) {
-                case 226:
+                case 230:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_module_or_namespace_body);
                     break;
-                case 225:
+                case 229:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_current_location);
                     break;
-                case 149:
+                case 150:
                     if (isInConstructorArgumentInitializer(node, container)) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_constructor_arguments);
                     }
                     break;
+                case 147:
                 case 146:
-                case 145:
                     if (ts.getModifierFlags(container) & 32) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_static_property_initializer);
                     }
                     break;
-                case 141:
+                case 142:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_computed_property_name);
                     break;
             }
@@ -27179,7 +29136,7 @@ var ts;
             }
             if (ts.isFunctionLike(container) &&
                 (!isInParameterInitializerBeforeContainingFunction(node) || ts.getThisParameter(container))) {
-                if (container.kind === 180 &&
+                if (container.kind === 184 &&
                     ts.isInJavaScriptFile(container.parent) &&
                     ts.getSpecialPropertyAssignmentKind(container.parent) === 3) {
                     var className = container.parent
@@ -27214,27 +29171,27 @@ var ts;
         }
         function getTypeForThisExpressionFromJSDoc(node) {
             var typeTag = ts.getJSDocTypeTag(node);
-            if (typeTag && typeTag.typeExpression && typeTag.typeExpression.type && typeTag.typeExpression.type.kind === 269) {
+            if (typeTag && typeTag.typeExpression && typeTag.typeExpression.type && typeTag.typeExpression.type.kind === 274) {
                 var jsDocFunctionType = typeTag.typeExpression.type;
-                if (jsDocFunctionType.parameters.length > 0 && jsDocFunctionType.parameters[0].type.kind === 272) {
+                if (jsDocFunctionType.parameters.length > 0 && jsDocFunctionType.parameters[0].type.kind === 277) {
                     return getTypeFromTypeNode(jsDocFunctionType.parameters[0].type);
                 }
             }
         }
         function isInConstructorArgumentInitializer(node, constructorDecl) {
             for (var n = node; n && n !== constructorDecl; n = n.parent) {
-                if (n.kind === 143) {
+                if (n.kind === 144) {
                     return true;
                 }
             }
             return false;
         }
         function checkSuperExpression(node) {
-            var isCallExpression = node.parent.kind === 175 && node.parent.expression === node;
+            var isCallExpression = node.parent.kind === 179 && node.parent.expression === node;
             var container = ts.getSuperContainer(node, true);
             var needToCaptureLexicalThis = false;
             if (!isCallExpression) {
-                while (container && container.kind === 181) {
+                while (container && container.kind === 185) {
                     container = ts.getSuperContainer(container, true);
                     needToCaptureLexicalThis = languageVersion < 2;
                 }
@@ -27243,16 +29200,16 @@ var ts;
             var nodeCheckFlag = 0;
             if (!canUseSuperExpression) {
                 var current = node;
-                while (current && current !== container && current.kind !== 141) {
+                while (current && current !== container && current.kind !== 142) {
                     current = current.parent;
                 }
-                if (current && current.kind === 141) {
+                if (current && current.kind === 142) {
                     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 === 172)) {
+                else if (!container || !container.parent || !(ts.isClassLike(container.parent) || container.parent.kind === 176)) {
                     error(node, ts.Diagnostics.super_can_only_be_referenced_in_members_of_derived_classes_or_object_literal_expressions);
                 }
                 else {
@@ -27267,7 +29224,7 @@ var ts;
                 nodeCheckFlag = 256;
             }
             getNodeLinks(node).flags |= nodeCheckFlag;
-            if (container.kind === 148 && ts.getModifierFlags(container) & 256) {
+            if (container.kind === 149 && ts.getModifierFlags(container) & 256) {
                 if (ts.isSuperProperty(node.parent) && ts.isAssignmentTarget(node.parent)) {
                     getNodeLinks(container).flags |= 4096;
                 }
@@ -27278,7 +29235,7 @@ var ts;
             if (needToCaptureLexicalThis) {
                 captureLexicalThis(node.parent, container);
             }
-            if (container.parent.kind === 172) {
+            if (container.parent.kind === 176) {
                 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 unknownType;
@@ -27296,7 +29253,7 @@ var ts;
                 }
                 return unknownType;
             }
-            if (container.kind === 149 && isInConstructorArgumentInitializer(node, container)) {
+            if (container.kind === 150 && isInConstructorArgumentInitializer(node, container)) {
                 error(node, ts.Diagnostics.super_cannot_be_referenced_in_constructor_arguments);
                 return unknownType;
             }
@@ -27308,24 +29265,24 @@ var ts;
                     return false;
                 }
                 if (isCallExpression) {
-                    return container.kind === 149;
+                    return container.kind === 150;
                 }
                 else {
-                    if (ts.isClassLike(container.parent) || container.parent.kind === 172) {
+                    if (ts.isClassLike(container.parent) || container.parent.kind === 176) {
                         if (ts.getModifierFlags(container) & 32) {
-                            return container.kind === 148 ||
-                                container.kind === 147 ||
-                                container.kind === 150 ||
-                                container.kind === 151;
+                            return container.kind === 149 ||
+                                container.kind === 148 ||
+                                container.kind === 151 ||
+                                container.kind === 152;
                         }
                         else {
-                            return container.kind === 148 ||
-                                container.kind === 147 ||
-                                container.kind === 150 ||
+                            return container.kind === 149 ||
+                                container.kind === 148 ||
                                 container.kind === 151 ||
+                                container.kind === 152 ||
+                                container.kind === 147 ||
                                 container.kind === 146 ||
-                                container.kind === 145 ||
-                                container.kind === 149;
+                                container.kind === 150;
                         }
                     }
                 }
@@ -27333,7 +29290,7 @@ var ts;
             }
         }
         function getContextualThisParameterType(func) {
-            if (isContextSensitiveFunctionOrObjectLiteralMethod(func) && func.kind !== 181) {
+            if (isContextSensitiveFunctionOrObjectLiteralMethod(func) && func.kind !== 185) {
                 var contextualSignature = getContextualSignature(func);
                 if (contextualSignature) {
                     var thisParameter = contextualSignature.thisParameter;
@@ -27389,7 +29346,7 @@ var ts;
                 if (declaration.type) {
                     return getTypeFromTypeNode(declaration.type);
                 }
-                if (declaration.kind === 143) {
+                if (declaration.kind === 144) {
                     var type = getContextuallyTypedParameterType(declaration);
                     if (type) {
                         return type;
@@ -27400,11 +29357,11 @@ var ts;
                 }
                 if (ts.isBindingPattern(declaration.parent)) {
                     var parentDeclaration = declaration.parent.parent;
-                    var name_15 = declaration.propertyName || declaration.name;
+                    var name_22 = declaration.propertyName || declaration.name;
                     if (ts.isVariableLike(parentDeclaration) &&
                         parentDeclaration.type &&
-                        !ts.isBindingPattern(name_15)) {
-                        var text = getTextOfPropertyName(name_15);
+                        !ts.isBindingPattern(name_22)) {
+                        var text = ts.getTextOfPropertyName(name_22);
                         if (text) {
                             return getTypeOfPropertyOfType(getTypeFromTypeNode(parentDeclaration.type), text);
                         }
@@ -27441,7 +29398,7 @@ var ts;
         }
         function isInParameterInitializerBeforeContainingFunction(node) {
             while (node.parent && !ts.isFunctionLike(node.parent)) {
-                if (node.parent.kind === 143 && node.parent.initializer === node) {
+                if (node.parent.kind === 144 && node.parent.initializer === node) {
                     return true;
                 }
                 node = node.parent;
@@ -27450,8 +29407,8 @@ var ts;
         }
         function getContextualReturnType(functionDecl) {
             if (functionDecl.type ||
-                functionDecl.kind === 149 ||
-                functionDecl.kind === 150 && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(functionDecl.symbol, 151))) {
+                functionDecl.kind === 150 ||
+                functionDecl.kind === 151 && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(functionDecl.symbol, 152))) {
                 return getReturnTypeOfSignature(getSignatureFromDeclaration(functionDecl));
             }
             var signature = getContextualSignatureForFunctionLikeDeclaration(functionDecl);
@@ -27470,7 +29427,7 @@ var ts;
             return undefined;
         }
         function getContextualTypeForSubstitutionExpression(template, substitutionExpression) {
-            if (template.parent.kind === 177) {
+            if (template.parent.kind === 181) {
                 return getContextualTypeForArgument(template.parent, substitutionExpression);
             }
             return undefined;
@@ -27501,7 +29458,7 @@ var ts;
             return undefined;
         }
         function applyToContextualType(type, mapper) {
-            if (!(type.flags & 524288)) {
+            if (!(type.flags & 65536)) {
                 return mapper(type);
             }
             var types = type.types;
@@ -27526,7 +29483,7 @@ var ts;
         }
         function getTypeOfPropertyOfContextualType(type, name) {
             return applyToContextualType(type, function (t) {
-                var prop = t.flags & 4161536 ? getPropertyOfType(t, name) : undefined;
+                var prop = t.flags & 229376 ? getPropertyOfType(t, name) : undefined;
                 return prop ? getTypeOfSymbol(prop) : undefined;
             });
         }
@@ -27534,7 +29491,7 @@ var ts;
             return applyToContextualType(type, function (t) { return getIndexTypeOfStructuredType(t, kind); });
         }
         function contextualTypeIsTupleLikeType(type) {
-            return !!(type.flags & 524288 ? ts.forEach(type.types, isTupleLikeType) : isTupleLikeType(type));
+            return !!(type.flags & 65536 ? ts.forEach(type.types, isTupleLikeType) : isTupleLikeType(type));
         }
         function getContextualTypeForObjectLiteralMethod(node) {
             ts.Debug.assert(ts.isObjectLiteralMethod(node));
@@ -27578,13 +29535,13 @@ var ts;
             var kind = attribute.kind;
             var jsxElement = attribute.parent;
             var attrsType = getJsxElementAttributesType(jsxElement);
-            if (attribute.kind === 246) {
+            if (attribute.kind === 250) {
                 if (!attrsType || isTypeAny(attrsType)) {
                     return undefined;
                 }
                 return getTypeOfPropertyOfType(attrsType, attribute.name.text);
             }
-            else if (attribute.kind === 247) {
+            else if (attribute.kind === 251) {
                 return attrsType;
             }
             ts.Debug.fail("Expected JsxAttribute or JsxSpreadAttribute, got ts.SyntaxKind[" + kind + "]");
@@ -27602,56 +29559,70 @@ var ts;
             }
             var parent = node.parent;
             switch (parent.kind) {
-                case 219:
-                case 143:
+                case 223:
+                case 144:
+                case 147:
                 case 146:
-                case 145:
-                case 170:
+                case 174:
                     return getContextualTypeForInitializerExpression(node);
-                case 181:
-                case 212:
+                case 185:
+                case 216:
                     return getContextualTypeForReturnExpression(node);
-                case 191:
+                case 195:
                     return getContextualTypeForYieldOperand(parent);
-                case 175:
-                case 176:
-                    return getContextualTypeForArgument(parent, node);
-                case 178:
-                case 196:
-                    return getTypeFromTypeNode(parent.type);
-                case 188:
-                    return getContextualTypeForBinaryOperand(node);
-                case 253:
-                case 254:
-                    return getContextualTypeForObjectLiteralElement(parent);
-                case 171:
-                    return getContextualTypeForElementExpression(node);
-                case 189:
-                    return getContextualTypeForConditionalOperand(node);
-                case 198:
-                    ts.Debug.assert(parent.parent.kind === 190);
-                    return getContextualTypeForSubstitutionExpression(parent.parent, node);
                 case 179:
+                case 180:
+                    return getContextualTypeForArgument(parent, node);
+                case 182:
+                case 200:
+                    return getTypeFromTypeNode(parent.type);
+                case 192:
+                    return getContextualTypeForBinaryOperand(node);
+                case 257:
+                case 258:
+                    return getContextualTypeForObjectLiteralElement(parent);
+                case 175:
+                    return getContextualTypeForElementExpression(node);
+                case 193:
+                    return getContextualTypeForConditionalOperand(node);
+                case 202:
+                    ts.Debug.assert(parent.parent.kind === 194);
+                    return getContextualTypeForSubstitutionExpression(parent.parent, node);
+                case 183:
                     return getContextualType(parent);
-                case 248:
+                case 252:
                     return getContextualType(parent);
-                case 246:
-                case 247:
+                case 250:
+                case 251:
                     return getContextualTypeForJsxAttribute(parent);
             }
             return undefined;
         }
-        function getNonGenericSignature(type) {
+        function getNonGenericSignature(type, node) {
             var signatures = getSignaturesOfStructuredType(type, 0);
             if (signatures.length === 1) {
                 var signature = signatures[0];
-                if (!signature.typeParameters) {
+                if (!signature.typeParameters && !isAritySmaller(signature, node)) {
                     return signature;
                 }
             }
         }
+        function isAritySmaller(signature, target) {
+            var targetParameterCount = 0;
+            for (; targetParameterCount < target.parameters.length; targetParameterCount++) {
+                var param = target.parameters[targetParameterCount];
+                if (param.initializer || param.questionToken || param.dotDotDotToken || isJSDocOptionalParameter(param)) {
+                    break;
+                }
+            }
+            if (target.parameters.length && ts.parameterIsThisKeyword(target.parameters[0])) {
+                targetParameterCount--;
+            }
+            var sourceLength = signature.hasRestParameter ? Number.MAX_VALUE : signature.parameters.length;
+            return sourceLength < targetParameterCount;
+        }
         function isFunctionExpressionOrArrowFunction(node) {
-            return node.kind === 180 || node.kind === 181;
+            return node.kind === 184 || node.kind === 185;
         }
         function getContextualSignatureForFunctionLikeDeclaration(node) {
             return isFunctionExpressionOrArrowFunction(node) || ts.isObjectLiteralMethod(node)
@@ -27664,19 +29635,19 @@ var ts;
                 getApparentTypeOfContextualType(node);
         }
         function getContextualSignature(node) {
-            ts.Debug.assert(node.kind !== 148 || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 149 || ts.isObjectLiteralMethod(node));
             var type = getContextualTypeForFunctionLikeDeclaration(node);
             if (!type) {
                 return undefined;
             }
-            if (!(type.flags & 524288)) {
-                return getNonGenericSignature(type);
+            if (!(type.flags & 65536)) {
+                return getNonGenericSignature(type, node);
             }
             var signatureList;
             var types = type.types;
             for (var _i = 0, types_14 = types; _i < types_14.length; _i++) {
                 var current = types_14[_i];
-                var signature = getNonGenericSignature(current);
+                var signature = getNonGenericSignature(current, node);
                 if (signature) {
                     if (!signatureList) {
                         signatureList = [signature];
@@ -27700,13 +29671,13 @@ var ts;
         function isInferentialContext(mapper) {
             return mapper && mapper.context;
         }
-        function checkSpreadElementExpression(node, contextualMapper) {
+        function checkSpreadExpression(node, contextualMapper) {
             var arrayOrIterableType = checkExpressionCached(node.expression, contextualMapper);
             return checkIteratedTypeOrElementType(arrayOrIterableType, node.expression, false);
         }
         function hasDefaultValue(node) {
-            return (node.kind === 170 && !!node.initializer) ||
-                (node.kind === 188 && node.operatorToken.kind === 57);
+            return (node.kind === 174 && !!node.initializer) ||
+                (node.kind === 192 && node.operatorToken.kind === 57);
         }
         function checkArrayLiteral(node, contextualMapper) {
             var elements = node.elements;
@@ -27715,7 +29686,7 @@ var ts;
             var inDestructuringPattern = ts.isAssignmentTarget(node);
             for (var _i = 0, elements_1 = elements; _i < elements_1.length; _i++) {
                 var e = elements_1[_i];
-                if (inDestructuringPattern && e.kind === 192) {
+                if (inDestructuringPattern && e.kind === 196) {
                     var restArrayType = checkExpression(e.expression, contextualMapper);
                     var restElementType = getIndexTypeOfType(restArrayType, 1) ||
                         (languageVersion >= 2 ? getElementTypeOfIterable(restArrayType, undefined) : undefined);
@@ -27727,7 +29698,7 @@ var ts;
                     var type = checkExpressionForMutableLocation(e, contextualMapper);
                     elementTypes.push(type);
                 }
-                hasSpreadElement = hasSpreadElement || e.kind === 192;
+                hasSpreadElement = hasSpreadElement || e.kind === 196;
             }
             if (!hasSpreadElement) {
                 if (inDestructuringPattern && elementTypes.length) {
@@ -27738,7 +29709,7 @@ var ts;
                 var contextualType = getApparentTypeOfContextualType(node);
                 if (contextualType && contextualTypeIsTupleLikeType(contextualType)) {
                     var pattern = contextualType.pattern;
-                    if (pattern && (pattern.kind === 169 || pattern.kind === 171)) {
+                    if (pattern && (pattern.kind === 173 || pattern.kind === 175)) {
                         var patternElements = pattern.elements;
                         for (var i = elementTypes.length; i < patternElements.length; i++) {
                             var patternElement = patternElements[i];
@@ -27746,7 +29717,7 @@ var ts;
                                 elementTypes.push(contextualType.typeArguments[i]);
                             }
                             else {
-                                if (patternElement.kind !== 194) {
+                                if (patternElement.kind !== 198) {
                                     error(patternElement, ts.Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);
                                 }
                                 elementTypes.push(unknownType);
@@ -27763,7 +29734,7 @@ var ts;
                 strictNullChecks ? neverType : undefinedWideningType);
         }
         function isNumericName(name) {
-            return name.kind === 141 ? isNumericComputedName(name) : isNumericLiteralName(name.text);
+            return name.kind === 142 ? isNumericComputedName(name) : isNumericLiteralName(name.text);
         }
         function isNumericComputedName(name) {
             return isTypeAnyOrAllConstituentTypesHaveKind(checkComputedPropertyName(name), 340);
@@ -27805,9 +29776,11 @@ var ts;
             checkGrammarObjectLiteralExpression(node, inDestructuringPattern);
             var propertiesTable = ts.createMap();
             var propertiesArray = [];
+            var spread = emptyObjectType;
+            var propagatedFlags = 0;
             var contextualType = getApparentTypeOfContextualType(node);
             var contextualTypeHasPattern = contextualType && contextualType.pattern &&
-                (contextualType.pattern.kind === 168 || contextualType.pattern.kind === 172);
+                (contextualType.pattern.kind === 172 || contextualType.pattern.kind === 176);
             var typeFlags = 0;
             var patternWithComputedProperties = false;
             var hasComputedStringProperty = false;
@@ -27815,25 +29788,25 @@ var ts;
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var memberDecl = _a[_i];
                 var member = memberDecl.symbol;
-                if (memberDecl.kind === 253 ||
-                    memberDecl.kind === 254 ||
+                if (memberDecl.kind === 257 ||
+                    memberDecl.kind === 258 ||
                     ts.isObjectLiteralMethod(memberDecl)) {
                     var type = void 0;
-                    if (memberDecl.kind === 253) {
+                    if (memberDecl.kind === 257) {
                         type = checkPropertyAssignment(memberDecl, contextualMapper);
                     }
-                    else if (memberDecl.kind === 148) {
+                    else if (memberDecl.kind === 149) {
                         type = checkObjectLiteralMethod(memberDecl, contextualMapper);
                     }
                     else {
-                        ts.Debug.assert(memberDecl.kind === 254);
+                        ts.Debug.assert(memberDecl.kind === 258);
                         type = checkExpressionForMutableLocation(memberDecl.name, contextualMapper);
                     }
                     typeFlags |= type.flags;
                     var prop = createSymbol(4 | 67108864 | member.flags, member.name);
                     if (inDestructuringPattern) {
-                        var isOptional = (memberDecl.kind === 253 && hasDefaultValue(memberDecl.initializer)) ||
-                            (memberDecl.kind === 254 && memberDecl.objectAssignmentInitializer);
+                        var isOptional = (memberDecl.kind === 257 && hasDefaultValue(memberDecl.initializer)) ||
+                            (memberDecl.kind === 258 && memberDecl.objectAssignmentInitializer);
                         if (isOptional) {
                             prop.flags |= 536870912;
                         }
@@ -27841,8 +29814,7 @@ var ts;
                             patternWithComputedProperties = true;
                         }
                     }
-                    else if (contextualTypeHasPattern &&
-                        !(contextualType.flags & 2588672 && contextualType.isObjectLiteralPatternWithComputedProperties)) {
+                    else if (contextualTypeHasPattern && !(getObjectFlags(contextualType) & 512)) {
                         var impliedProp = getPropertyOfType(contextualType, member.name);
                         if (impliedProp) {
                             prop.flags |= impliedProp.flags & 536870912;
@@ -27860,8 +29832,25 @@ var ts;
                     prop.target = member;
                     member = prop;
                 }
+                else if (memberDecl.kind === 259) {
+                    if (propertiesArray.length > 0) {
+                        spread = getSpreadType(spread, createObjectLiteralType(), true);
+                        propertiesArray = [];
+                        propertiesTable = ts.createMap();
+                        hasComputedStringProperty = false;
+                        hasComputedNumberProperty = false;
+                        typeFlags = 0;
+                    }
+                    var type = checkExpression(memberDecl.expression);
+                    if (!(type.flags & (32768 | 1))) {
+                        error(memberDecl, ts.Diagnostics.Spread_types_may_only_be_created_from_object_types);
+                        return unknownType;
+                    }
+                    spread = getSpreadType(spread, type, false);
+                    continue;
+                }
                 else {
-                    ts.Debug.assert(memberDecl.kind === 150 || memberDecl.kind === 151);
+                    ts.Debug.assert(memberDecl.kind === 151 || memberDecl.kind === 152);
                     checkAccessorDeclaration(memberDecl);
                 }
                 if (ts.hasDynamicName(memberDecl)) {
@@ -27889,18 +29878,33 @@ var ts;
                     }
                 }
             }
-            var stringIndexInfo = hasComputedStringProperty ? getObjectLiteralIndexInfo(node, propertiesArray, 0) : undefined;
-            var numberIndexInfo = hasComputedNumberProperty ? getObjectLiteralIndexInfo(node, propertiesArray, 1) : undefined;
-            var result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
-            var freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : 16777216;
-            result.flags |= 8388608 | 67108864 | freshObjectLiteralFlag | (typeFlags & 234881024);
-            if (patternWithComputedProperties) {
-                result.isObjectLiteralPatternWithComputedProperties = true;
+            if (spread !== emptyObjectType) {
+                if (propertiesArray.length > 0) {
+                    spread = getSpreadType(spread, createObjectLiteralType(), true);
+                }
+                spread.flags |= propagatedFlags;
+                spread.symbol = node.symbol;
+                return spread;
             }
-            if (inDestructuringPattern) {
-                result.pattern = node;
+            return createObjectLiteralType();
+            function createObjectLiteralType() {
+                var stringIndexInfo = hasComputedStringProperty ? getObjectLiteralIndexInfo(node, propertiesArray, 0) : undefined;
+                var numberIndexInfo = hasComputedNumberProperty ? getObjectLiteralIndexInfo(node, propertiesArray, 1) : undefined;
+                var result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
+                var freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : 1048576;
+                result.flags |= 4194304 | freshObjectLiteralFlag | (typeFlags & 14680064);
+                result.objectFlags |= 128;
+                if (patternWithComputedProperties) {
+                    result.objectFlags |= 512;
+                }
+                if (inDestructuringPattern) {
+                    result.pattern = node;
+                }
+                if (!(result.flags & 6144)) {
+                    propagatedFlags |= (result.flags & 14680064);
+                }
+                return result;
             }
-            return result;
         }
         function checkJsxSelfClosingElement(node) {
             checkJsxOpeningLikeElement(node);
@@ -27917,13 +29921,13 @@ var ts;
             for (var _i = 0, _a = node.children; _i < _a.length; _i++) {
                 var child = _a[_i];
                 switch (child.kind) {
-                    case 248:
+                    case 252:
                         checkJsxExpression(child);
                         break;
-                    case 242:
+                    case 246:
                         checkJsxElement(child);
                         break;
-                    case 243:
+                    case 247:
                         checkJsxSelfClosingElement(child);
                         break;
                 }
@@ -27934,7 +29938,7 @@ var ts;
             return name.indexOf("-") < 0;
         }
         function isJsxIntrinsicIdentifier(tagName) {
-            if (tagName.kind === 173 || tagName.kind === 98) {
+            if (tagName.kind === 177 || tagName.kind === 98) {
                 return false;
             }
             else {
@@ -27950,7 +29954,7 @@ var ts;
                 var correspondingPropSymbol = getPropertyOfType(elementAttributesType, node.name.text);
                 correspondingPropType = correspondingPropSymbol && getTypeOfSymbol(correspondingPropSymbol);
                 if (isUnhyphenatedJsxName(node.name.text)) {
-                    var attributeType = getTypeOfPropertyOfType(elementAttributesType, getTextOfPropertyName(node.name)) || getIndexTypeOfType(elementAttributesType, 0);
+                    var attributeType = getTypeOfPropertyOfType(elementAttributesType, ts.getTextOfPropertyName(node.name)) || getIndexTypeOfType(elementAttributesType, 0);
                     if (attributeType) {
                         correspondingPropType = attributeType;
                     }
@@ -28025,7 +30029,7 @@ var ts;
             return links.resolvedSymbol;
         }
         function getJsxElementInstanceType(node, valueType) {
-            ts.Debug.assert(!(valueType.flags & 524288));
+            ts.Debug.assert(!(valueType.flags & 65536));
             if (isTypeAny(valueType)) {
                 return anyType;
             }
@@ -28064,7 +30068,7 @@ var ts;
             if (!elemType) {
                 elemType = checkExpression(node.tagName);
             }
-            if (elemType.flags & 524288) {
+            if (elemType.flags & 65536) {
                 var types = elemType.types;
                 return getUnionType(ts.map(types, function (type) {
                     return getResolvedJsxType(node, type, elemClassType);
@@ -28126,7 +30130,7 @@ var ts;
                 else if (isTypeAny(attributesType) || (attributesType === unknownType)) {
                     return attributesType;
                 }
-                else if (attributesType.flags & 524288) {
+                else if (attributesType.flags & 65536) {
                     error(node.tagName, ts.Diagnostics.JSX_element_attributes_type_0_may_not_be_a_union_type, typeToString(attributesType));
                     return anyType;
                 }
@@ -28203,20 +30207,23 @@ var ts;
             checkGrammarJsxElement(node);
             checkJsxPreconditions(node);
             var reactRefErr = compilerOptions.jsx === 2 ? ts.Diagnostics.Cannot_find_name_0 : undefined;
-            var reactNamespace = compilerOptions.reactNamespace ? compilerOptions.reactNamespace : "React";
+            var reactNamespace = getJsxNamespace();
             var reactSym = resolveName(node.tagName, reactNamespace, 107455, reactRefErr, reactNamespace);
             if (reactSym) {
-                getSymbolLinks(reactSym).referenced = true;
+                reactSym.isReferenced = true;
+                if (reactSym.flags & 8388608 && !isConstEnumOrConstEnumOnlyModule(resolveAlias(reactSym))) {
+                    markAliasSymbolAsReferenced(reactSym);
+                }
             }
             var targetAttributesType = getJsxElementAttributesType(node);
             var nameTable = ts.createMap();
             var sawSpreadedAny = false;
             for (var i = node.attributes.length - 1; i >= 0; i--) {
-                if (node.attributes[i].kind === 246) {
+                if (node.attributes[i].kind === 250) {
                     checkJsxAttribute((node.attributes[i]), targetAttributesType, nameTable);
                 }
                 else {
-                    ts.Debug.assert(node.attributes[i].kind === 247);
+                    ts.Debug.assert(node.attributes[i].kind === 251);
                     var spreadType = checkJsxSpreadAttribute((node.attributes[i]), targetAttributesType, nameTable);
                     if (isTypeAny(spreadType)) {
                         sawSpreadedAny = true;
@@ -28242,7 +30249,7 @@ var ts;
             }
         }
         function getDeclarationKindFromSymbol(s) {
-            return s.valueDeclaration ? s.valueDeclaration.kind : 146;
+            return s.valueDeclaration ? s.valueDeclaration.kind : 147;
         }
         function getDeclarationModifierFlagsFromSymbol(s) {
             return s.valueDeclaration ? ts.getCombinedModifierFlags(s.valueDeclaration) : s.flags & 134217728 ? 4 | 32 : 0;
@@ -28253,11 +30260,11 @@ var ts;
         function checkClassPropertyAccess(node, left, type, prop) {
             var flags = getDeclarationModifierFlagsFromSymbol(prop);
             var declaringClass = getDeclaredTypeOfSymbol(getParentOfSymbol(prop));
-            var errorNode = node.kind === 173 || node.kind === 219 ?
+            var errorNode = node.kind === 177 || node.kind === 223 ?
                 node.name :
                 node.right;
             if (left.kind === 96) {
-                if (languageVersion < 2 && getDeclarationKindFromSymbol(prop) !== 148) {
+                if (languageVersion < 2 && getDeclarationKindFromSymbol(prop) !== 149) {
                     error(errorNode, ts.Diagnostics.Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword);
                     return false;
                 }
@@ -28294,7 +30301,7 @@ var ts;
             if (type.flags & 16384 && type.isThisType) {
                 type = getConstraintOfTypeParameter(type);
             }
-            if (!(getTargetType(type).flags & (32768 | 65536) && hasBaseType(type, enclosingClass))) {
+            if (!(getObjectFlags(getTargetType(type)) & 3 && hasBaseType(type, enclosingClass))) {
                 error(errorNode, ts.Diagnostics.Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1, symbolToString(prop), typeToString(enclosingClass));
                 return false;
             }
@@ -28320,6 +30327,33 @@ var ts;
         function checkQualifiedName(node) {
             return checkPropertyAccessExpressionOrQualifiedName(node, node.left, node.right);
         }
+        function reportNonexistentProperty(propNode, containingType) {
+            var errorInfo;
+            if (containingType.flags & 65536 && !(containingType.flags & 8190)) {
+                for (var _i = 0, _a = containingType.types; _i < _a.length; _i++) {
+                    var subtype = _a[_i];
+                    if (!getPropertyOfType(subtype, propNode.text)) {
+                        errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.declarationNameToString(propNode), typeToString(subtype));
+                        break;
+                    }
+                }
+            }
+            errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.declarationNameToString(propNode), typeToString(containingType));
+            diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(propNode, errorInfo));
+        }
+        function markPropertyAsReferenced(prop) {
+            if (prop &&
+                noUnusedIdentifiers &&
+                (prop.flags & 106500) &&
+                prop.valueDeclaration && (ts.getModifierFlags(prop.valueDeclaration) & 8)) {
+                if (prop.flags & 16777216) {
+                    getSymbolLinks(prop).target.isReferenced = true;
+                }
+                else {
+                    prop.isReferenced = true;
+                }
+            }
+        }
         function checkPropertyAccessExpressionOrQualifiedName(node, left, right) {
             var type = checkNonNullExpression(left);
             if (isTypeAny(type) || type === silentNeverType) {
@@ -28336,44 +30370,29 @@ var ts;
                 }
                 return unknownType;
             }
-            if (noUnusedIdentifiers &&
-                (prop.flags & 106500) &&
-                prop.valueDeclaration && (ts.getModifierFlags(prop.valueDeclaration) & 8)) {
-                if (prop.flags & 16777216) {
-                    getSymbolLinks(prop).target.isReferenced = true;
-                }
-                else {
-                    prop.isReferenced = true;
-                }
-            }
+            markPropertyAsReferenced(prop);
             getNodeLinks(node).resolvedSymbol = prop;
             if (prop.parent && prop.parent.flags & 32) {
                 checkClassPropertyAccess(node, left, apparentType, prop);
             }
             var propType = getTypeOfSymbol(prop);
-            if (node.kind !== 173 || ts.isAssignmentTarget(node) ||
+            var assignmentKind = ts.getAssignmentTargetKind(node);
+            if (assignmentKind) {
+                if (isReferenceToReadonlyEntity(node, prop) || isReferenceThroughNamespaceImport(node)) {
+                    error(right, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_constant_or_a_read_only_property, right.text);
+                    return unknownType;
+                }
+            }
+            if (node.kind !== 177 || assignmentKind === 1 ||
                 !(prop.flags & (3 | 4 | 98304)) &&
-                    !(prop.flags & 8192 && propType.flags & 524288)) {
+                    !(prop.flags & 8192 && propType.flags & 65536)) {
                 return propType;
             }
-            return getFlowTypeOfReference(node, propType, true, undefined);
-            function reportNonexistentProperty(propNode, containingType) {
-                var errorInfo;
-                if (containingType.flags & 524288 && !(containingType.flags & 8190)) {
-                    for (var _i = 0, _a = containingType.types; _i < _a.length; _i++) {
-                        var subtype = _a[_i];
-                        if (!getPropertyOfType(subtype, propNode.text)) {
-                            errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.declarationNameToString(propNode), typeToString(subtype));
-                            break;
-                        }
-                    }
-                }
-                errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.declarationNameToString(propNode), typeToString(containingType));
-                diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(propNode, errorInfo));
-            }
+            var flowType = getFlowTypeOfReference(node, propType, true, undefined);
+            return assignmentKind ? getBaseTypeOfLiteralType(flowType) : flowType;
         }
         function isValidPropertyAccess(node, propertyName) {
-            var left = node.kind === 173
+            var left = node.kind === 177
                 ? node.expression
                 : node.left;
             var type = checkExpression(left);
@@ -28387,7 +30406,7 @@ var ts;
         }
         function getForInVariableSymbol(node) {
             var initializer = node.initializer;
-            if (initializer.kind === 220) {
+            if (initializer.kind === 224) {
                 var variable = initializer.declarations[0];
                 if (variable && !ts.isBindingPattern(variable.name)) {
                     return getSymbolOfNode(variable);
@@ -28402,14 +30421,14 @@ var ts;
             return getIndexTypeOfType(type, 1) && !getIndexTypeOfType(type, 0);
         }
         function isForInVariableForNumericPropertyNames(expr) {
-            var e = skipParenthesizedNodes(expr);
+            var e = ts.skipParentheses(expr);
             if (e.kind === 70) {
                 var symbol = getResolvedSymbol(e);
                 if (symbol.flags & 3) {
                     var child = expr;
                     var node = expr.parent;
                     while (node) {
-                        if (node.kind === 208 &&
+                        if (node.kind === 212 &&
                             child === node.statement &&
                             getForInVariableSymbol(node) === symbol &&
                             hasNumericPropertyNames(checkExpression(node.expression))) {
@@ -28423,9 +30442,11 @@ var ts;
             return false;
         }
         function checkIndexedAccess(node) {
-            if (!node.argumentExpression) {
+            var objectType = checkNonNullExpression(node.expression);
+            var indexExpression = node.argumentExpression;
+            if (!indexExpression) {
                 var sourceFile = ts.getSourceFileOfNode(node);
-                if (node.parent.kind === 176 && node.parent.expression === node) {
+                if (node.parent.kind === 180 && 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);
@@ -28435,71 +30456,17 @@ var ts;
                     var end = node.end;
                     grammarErrorAtPos(sourceFile, start, end - start, ts.Diagnostics.Expression_expected);
                 }
+                return unknownType;
             }
-            var objectType = getApparentType(checkNonNullExpression(node.expression));
-            var indexType = node.argumentExpression ? checkExpression(node.argumentExpression) : unknownType;
+            var indexType = isForInVariableForNumericPropertyNames(indexExpression) ? numberType : checkExpression(indexExpression);
             if (objectType === unknownType || objectType === silentNeverType) {
                 return objectType;
             }
-            var isConstEnum = isConstEnumObjectType(objectType);
-            if (isConstEnum &&
-                (!node.argumentExpression || node.argumentExpression.kind !== 9)) {
-                error(node.argumentExpression, ts.Diagnostics.A_const_enum_member_can_only_be_accessed_using_a_string_literal);
+            if (isConstEnumObjectType(objectType) && indexExpression.kind !== 9) {
+                error(indexExpression, ts.Diagnostics.A_const_enum_member_can_only_be_accessed_using_a_string_literal);
                 return unknownType;
             }
-            if (node.argumentExpression) {
-                var name_16 = getPropertyNameForIndexedAccess(node.argumentExpression, indexType);
-                if (name_16 !== undefined) {
-                    var prop = getPropertyOfType(objectType, name_16);
-                    if (prop) {
-                        getNodeLinks(node).resolvedSymbol = prop;
-                        return getTypeOfSymbol(prop);
-                    }
-                    else if (isConstEnum) {
-                        error(node.argumentExpression, ts.Diagnostics.Property_0_does_not_exist_on_const_enum_1, name_16, symbolToString(objectType.symbol));
-                        return unknownType;
-                    }
-                }
-            }
-            var allowedNullableFlags = strictNullChecks ? 0 : 6144;
-            if (isTypeAnyOrAllConstituentTypesHaveKind(indexType, 34 | 340 | 512 | allowedNullableFlags)) {
-                if (isTypeAnyOrAllConstituentTypesHaveKind(indexType, 340 | allowedNullableFlags) || isForInVariableForNumericPropertyNames(node.argumentExpression)) {
-                    var numberIndexInfo = getIndexInfoOfType(objectType, 1);
-                    if (numberIndexInfo) {
-                        getNodeLinks(node).resolvedIndexInfo = numberIndexInfo;
-                        return numberIndexInfo.type;
-                    }
-                }
-                var stringIndexInfo = getIndexInfoOfType(objectType, 0);
-                if (stringIndexInfo) {
-                    getNodeLinks(node).resolvedIndexInfo = stringIndexInfo;
-                    return stringIndexInfo.type;
-                }
-                if (compilerOptions.noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors && !isTypeAny(objectType)) {
-                    error(node, getIndexTypeOfType(objectType, 1) ?
-                        ts.Diagnostics.Element_implicitly_has_an_any_type_because_index_expression_is_not_of_type_number :
-                        ts.Diagnostics.Index_signature_of_object_type_implicitly_has_an_any_type);
-                }
-                return anyType;
-            }
-            error(node, ts.Diagnostics.An_index_expression_argument_must_be_of_type_string_number_symbol_or_any);
-            return unknownType;
-        }
-        function getPropertyNameForIndexedAccess(indexArgumentExpression, indexArgumentType) {
-            if (indexArgumentExpression.kind === 9 || indexArgumentExpression.kind === 8) {
-                return indexArgumentExpression.text;
-            }
-            if (indexArgumentExpression.kind === 174 || indexArgumentExpression.kind === 173) {
-                var value = getConstantValue(indexArgumentExpression);
-                if (value !== undefined) {
-                    return value.toString();
-                }
-            }
-            if (checkThatExpressionIsProperSymbolReference(indexArgumentExpression, indexArgumentType, false)) {
-                var rightHandSideName = indexArgumentExpression.name.text;
-                return ts.getPropertyNameForKnownSymbolName(rightHandSideName);
-            }
-            return undefined;
+            return getIndexedAccessType(objectType, indexType, node);
         }
         function checkThatExpressionIsProperSymbolReference(expression, expressionType, reportError) {
             if (expressionType === unknownType) {
@@ -28532,10 +30499,10 @@ var ts;
             return true;
         }
         function resolveUntypedCall(node) {
-            if (node.kind === 177) {
+            if (node.kind === 181) {
                 checkExpression(node.template);
             }
-            else if (node.kind !== 144) {
+            else if (node.kind !== 145) {
                 ts.forEach(node.arguments, function (argument) {
                     checkExpression(argument);
                 });
@@ -28557,19 +30524,19 @@ var ts;
             for (var _i = 0, signatures_2 = signatures; _i < signatures_2.length; _i++) {
                 var signature = signatures_2[_i];
                 var symbol = signature.declaration && getSymbolOfNode(signature.declaration);
-                var parent_11 = signature.declaration && signature.declaration.parent;
+                var parent_9 = signature.declaration && signature.declaration.parent;
                 if (!lastSymbol || symbol === lastSymbol) {
-                    if (lastParent && parent_11 === lastParent) {
+                    if (lastParent && parent_9 === lastParent) {
                         index++;
                     }
                     else {
-                        lastParent = parent_11;
+                        lastParent = parent_9;
                         index = cutoffIndex;
                     }
                 }
                 else {
                     index = cutoffIndex = result.length;
-                    lastParent = parent_11;
+                    lastParent = parent_9;
                 }
                 lastSymbol = symbol;
                 if (signature.hasLiteralTypes) {
@@ -28586,7 +30553,7 @@ var ts;
         function getSpreadArgumentIndex(args) {
             for (var i = 0; i < args.length; i++) {
                 var arg = args[i];
-                if (arg && arg.kind === 192) {
+                if (arg && arg.kind === 196) {
                     return i;
                 }
             }
@@ -28599,11 +30566,11 @@ var ts;
             var callIsIncomplete;
             var isDecorator;
             var spreadArgIndex = -1;
-            if (node.kind === 177) {
+            if (node.kind === 181) {
                 var tagExpression = node;
                 argCount = args.length;
                 typeArguments = undefined;
-                if (tagExpression.template.kind === 190) {
+                if (tagExpression.template.kind === 194) {
                     var templateExpression = tagExpression.template;
                     var lastSpan = ts.lastOrUndefined(templateExpression.templateSpans);
                     ts.Debug.assert(lastSpan !== undefined);
@@ -28615,7 +30582,7 @@ var ts;
                     callIsIncomplete = !!templateLiteral.isUnterminated;
                 }
             }
-            else if (node.kind === 144) {
+            else if (node.kind === 145) {
                 isDecorator = true;
                 typeArguments = undefined;
                 argCount = getEffectiveArgumentCount(node, undefined, signature);
@@ -28623,7 +30590,7 @@ var ts;
             else {
                 var callExpression = node;
                 if (!callExpression.arguments) {
-                    ts.Debug.assert(callExpression.kind === 176);
+                    ts.Debug.assert(callExpression.kind === 180);
                     return signature.minArgumentCount === 0;
                 }
                 argCount = signatureHelpTrailingComma ? args.length + 1 : args.length;
@@ -28646,7 +30613,7 @@ var ts;
             return callIsIncomplete || hasEnoughArguments;
         }
         function getSingleCallSignature(type) {
-            if (type.flags & 2588672) {
+            if (type.flags & 32768) {
                 var resolved = resolveStructuredTypeMembers(type);
                 if (resolved.callSignatures.length === 1 && resolved.constructSignatures.length === 0 &&
                     resolved.properties.length === 0 && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
@@ -28682,7 +30649,7 @@ var ts;
             var argCount = getEffectiveArgumentCount(node, args, signature);
             for (var i = 0; i < argCount; i++) {
                 var arg = getEffectiveArgument(node, args, i);
-                if (arg === undefined || arg.kind !== 194) {
+                if (arg === undefined || arg.kind !== 198) {
                     var paramType = getTypeAtPosition(signature, i);
                     var argType = getEffectiveArgumentType(node, i);
                     if (argType === undefined) {
@@ -28729,7 +30696,7 @@ var ts;
         }
         function checkApplicableSignature(node, args, signature, relation, excludeArgument, reportErrors) {
             var thisType = getThisTypeOfSignature(signature);
-            if (thisType && thisType !== voidType && node.kind !== 176) {
+            if (thisType && thisType !== voidType && node.kind !== 180) {
                 var thisArgumentNode = getThisArgumentOfCall(node);
                 var thisArgumentType = thisArgumentNode ? checkExpression(thisArgumentNode) : voidType;
                 var errorNode = reportErrors ? (thisArgumentNode || node) : undefined;
@@ -28742,7 +30709,7 @@ var ts;
             var argCount = getEffectiveArgumentCount(node, args, signature);
             for (var i = 0; i < argCount; i++) {
                 var arg = getEffectiveArgument(node, args, i);
-                if (arg === undefined || arg.kind !== 194) {
+                if (arg === undefined || arg.kind !== 198) {
                     var paramType = getTypeAtPosition(signature, i);
                     var argType = getEffectiveArgumentType(node, i);
                     if (argType === undefined) {
@@ -28757,28 +30724,28 @@ var ts;
             return true;
         }
         function getThisArgumentOfCall(node) {
-            if (node.kind === 175) {
+            if (node.kind === 179) {
                 var callee = node.expression;
-                if (callee.kind === 173) {
+                if (callee.kind === 177) {
                     return callee.expression;
                 }
-                else if (callee.kind === 174) {
+                else if (callee.kind === 178) {
                     return callee.expression;
                 }
             }
         }
         function getEffectiveCallArguments(node) {
             var args;
-            if (node.kind === 177) {
+            if (node.kind === 181) {
                 var template = node.template;
                 args = [undefined];
-                if (template.kind === 190) {
+                if (template.kind === 194) {
                     ts.forEach(template.templateSpans, function (span) {
                         args.push(span.expression);
                     });
                 }
             }
-            else if (node.kind === 144) {
+            else if (node.kind === 145) {
                 return undefined;
             }
             else {
@@ -28787,21 +30754,21 @@ var ts;
             return args;
         }
         function getEffectiveArgumentCount(node, args, signature) {
-            if (node.kind === 144) {
+            if (node.kind === 145) {
                 switch (node.parent.kind) {
-                    case 222:
-                    case 193:
+                    case 226:
+                    case 197:
                         return 1;
-                    case 146:
+                    case 147:
                         return 2;
-                    case 148:
-                    case 150:
+                    case 149:
                     case 151:
+                    case 152:
                         if (languageVersion === 0) {
                             return 2;
                         }
                         return signature.parameters.length >= 3 ? 3 : 2;
-                    case 143:
+                    case 144:
                         return 3;
                 }
             }
@@ -28810,48 +30777,48 @@ var ts;
             }
         }
         function getEffectiveDecoratorFirstArgumentType(node) {
-            if (node.kind === 222) {
+            if (node.kind === 226) {
                 var classSymbol = getSymbolOfNode(node);
                 return getTypeOfSymbol(classSymbol);
             }
-            if (node.kind === 143) {
+            if (node.kind === 144) {
                 node = node.parent;
-                if (node.kind === 149) {
+                if (node.kind === 150) {
                     var classSymbol = getSymbolOfNode(node);
                     return getTypeOfSymbol(classSymbol);
                 }
             }
-            if (node.kind === 146 ||
-                node.kind === 148 ||
-                node.kind === 150 ||
-                node.kind === 151) {
+            if (node.kind === 147 ||
+                node.kind === 149 ||
+                node.kind === 151 ||
+                node.kind === 152) {
                 return getParentTypeOfClassElement(node);
             }
             ts.Debug.fail("Unsupported decorator target.");
             return unknownType;
         }
         function getEffectiveDecoratorSecondArgumentType(node) {
-            if (node.kind === 222) {
+            if (node.kind === 226) {
                 ts.Debug.fail("Class decorators should not have a second synthetic argument.");
                 return unknownType;
             }
-            if (node.kind === 143) {
+            if (node.kind === 144) {
                 node = node.parent;
-                if (node.kind === 149) {
+                if (node.kind === 150) {
                     return anyType;
                 }
             }
-            if (node.kind === 146 ||
-                node.kind === 148 ||
-                node.kind === 150 ||
-                node.kind === 151) {
+            if (node.kind === 147 ||
+                node.kind === 149 ||
+                node.kind === 151 ||
+                node.kind === 152) {
                 var element = node;
                 switch (element.name.kind) {
                     case 70:
                     case 8:
                     case 9:
                         return getLiteralTypeForText(32, element.name.text);
-                    case 141:
+                    case 142:
                         var nameType = checkComputedPropertyName(element.name);
                         if (isTypeOfKind(nameType, 512)) {
                             return nameType;
@@ -28868,20 +30835,20 @@ var ts;
             return unknownType;
         }
         function getEffectiveDecoratorThirdArgumentType(node) {
-            if (node.kind === 222) {
+            if (node.kind === 226) {
                 ts.Debug.fail("Class decorators should not have a third synthetic argument.");
                 return unknownType;
             }
-            if (node.kind === 143) {
+            if (node.kind === 144) {
                 return numberType;
             }
-            if (node.kind === 146) {
+            if (node.kind === 147) {
                 ts.Debug.fail("Property decorators should not have a third synthetic argument.");
                 return unknownType;
             }
-            if (node.kind === 148 ||
-                node.kind === 150 ||
-                node.kind === 151) {
+            if (node.kind === 149 ||
+                node.kind === 151 ||
+                node.kind === 152) {
                 var propertyType = getTypeOfNode(node);
                 return createTypedPropertyDescriptorType(propertyType);
             }
@@ -28902,26 +30869,26 @@ var ts;
             return unknownType;
         }
         function getEffectiveArgumentType(node, argIndex) {
-            if (node.kind === 144) {
+            if (node.kind === 145) {
                 return getEffectiveDecoratorArgumentType(node, argIndex);
             }
-            else if (argIndex === 0 && node.kind === 177) {
+            else if (argIndex === 0 && node.kind === 181) {
                 return getGlobalTemplateStringsArrayType();
             }
             return undefined;
         }
         function getEffectiveArgument(node, args, argIndex) {
-            if (node.kind === 144 ||
-                (argIndex === 0 && node.kind === 177)) {
+            if (node.kind === 145 ||
+                (argIndex === 0 && node.kind === 181)) {
                 return undefined;
             }
             return args[argIndex];
         }
         function getEffectiveArgumentErrorNode(node, argIndex, arg) {
-            if (node.kind === 144) {
+            if (node.kind === 145) {
                 return node.expression;
             }
-            else if (argIndex === 0 && node.kind === 177) {
+            else if (argIndex === 0 && node.kind === 181) {
                 return node.template;
             }
             else {
@@ -28929,8 +30896,8 @@ var ts;
             }
         }
         function resolveCall(node, signatures, candidatesOutArray, headMessage) {
-            var isTaggedTemplate = node.kind === 177;
-            var isDecorator = node.kind === 144;
+            var isTaggedTemplate = node.kind === 181;
+            var isDecorator = node.kind === 145;
             var typeArguments;
             if (!isTaggedTemplate && !isDecorator) {
                 typeArguments = node.typeArguments;
@@ -28960,7 +30927,7 @@ var ts;
             var candidateForTypeArgumentError;
             var resultOfFailedInference;
             var result;
-            var signatureHelpTrailingComma = candidatesOutArray && node.kind === 175 && node.arguments.hasTrailingComma;
+            var signatureHelpTrailingComma = candidatesOutArray && node.kind === 179 && node.arguments.hasTrailingComma;
             if (candidates.length > 1) {
                 result = chooseOverload(candidates, subtypeRelation, signatureHelpTrailingComma);
             }
@@ -28979,7 +30946,7 @@ var ts;
             else if (candidateForTypeArgumentError) {
                 if (!isTaggedTemplate && !isDecorator && typeArguments) {
                     var typeArguments_2 = node.typeArguments;
-                    checkTypeArguments(candidateForTypeArgumentError, typeArguments_2, ts.map(typeArguments_2, getTypeFromTypeNodeNoAlias), true, headMessage);
+                    checkTypeArguments(candidateForTypeArgumentError, typeArguments_2, ts.map(typeArguments_2, getTypeFromTypeNode), true, headMessage);
                 }
                 else {
                     ts.Debug.assert(resultOfFailedInference.failedTypeParameterIndex >= 0);
@@ -29000,7 +30967,7 @@ var ts;
                     var candidate = candidates_1[_i];
                     if (hasCorrectArity(node, args, candidate)) {
                         if (candidate.typeParameters && typeArguments) {
-                            candidate = getSignatureInstantiation(candidate, ts.map(typeArguments, getTypeFromTypeNodeNoAlias));
+                            candidate = getSignatureInstantiation(candidate, ts.map(typeArguments, getTypeFromTypeNode));
                         }
                         return candidate;
                     }
@@ -29032,7 +30999,7 @@ var ts;
                         if (candidate.typeParameters) {
                             var typeArgumentTypes = void 0;
                             if (typeArguments) {
-                                typeArgumentTypes = ts.map(typeArguments, getTypeFromTypeNodeNoAlias);
+                                typeArgumentTypes = ts.map(typeArguments, getTypeFromTypeNode);
                                 typeArgumentsAreValid = checkTypeArguments(candidate, typeArguments, typeArgumentTypes, false);
                             }
                             else {
@@ -29121,7 +31088,7 @@ var ts;
                 return true;
             }
             if (!numCallSignatures && !numConstructSignatures) {
-                if (funcType.flags & 524288) {
+                if (funcType.flags & 65536) {
                     return false;
                 }
                 return isTypeAssignableTo(funcType, globalFunctionType);
@@ -29228,16 +31195,16 @@ var ts;
         }
         function getDiagnosticHeadMessageForDecoratorResolution(node) {
             switch (node.parent.kind) {
-                case 222:
-                case 193:
+                case 226:
+                case 197:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression;
-                case 143:
+                case 144:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression;
-                case 146:
+                case 147:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression;
-                case 148:
-                case 150:
+                case 149:
                 case 151:
+                case 152:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression;
             }
         }
@@ -29264,13 +31231,13 @@ var ts;
         }
         function resolveSignature(node, candidatesOutArray) {
             switch (node.kind) {
-                case 175:
+                case 179:
                     return resolveCallExpression(node, candidatesOutArray);
-                case 176:
+                case 180:
                     return resolveNewExpression(node, candidatesOutArray);
-                case 177:
+                case 181:
                     return resolveTaggedTemplateExpression(node, candidatesOutArray);
-                case 144:
+                case 145:
                     return resolveDecorator(node, candidatesOutArray);
             }
             ts.Debug.fail("Branch in 'resolveSignature' should be unreachable.");
@@ -29302,12 +31269,12 @@ var ts;
             if (node.expression.kind === 96) {
                 return voidType;
             }
-            if (node.kind === 176) {
+            if (node.kind === 180) {
                 var declaration = signature.declaration;
                 if (declaration &&
-                    declaration.kind !== 149 &&
-                    declaration.kind !== 153 &&
-                    declaration.kind !== 158 &&
+                    declaration.kind !== 150 &&
+                    declaration.kind !== 154 &&
+                    declaration.kind !== 159 &&
                     !ts.isJSDocConstructSignature(declaration)) {
                     var funcSymbol = node.expression.kind === 70 ?
                         getResolvedSymbol(node.expression) :
@@ -29321,13 +31288,33 @@ var ts;
                     return anyType;
                 }
             }
-            if (ts.isInJavaScriptFile(node) &&
-                ts.isRequireCall(node, true) &&
-                !resolveName(node.expression, node.expression.text, 107455, undefined, undefined)) {
+            if (ts.isInJavaScriptFile(node) && isCommonJsRequire(node)) {
                 return resolveExternalModuleTypeByLiteral(node.arguments[0]);
             }
             return getReturnTypeOfSignature(signature);
         }
+        function isCommonJsRequire(node) {
+            if (!ts.isRequireCall(node, true)) {
+                return false;
+            }
+            var resolvedRequire = resolveName(node.expression, node.expression.text, 107455, undefined, undefined);
+            if (!resolvedRequire) {
+                return true;
+            }
+            if (resolvedRequire.flags & 8388608) {
+                return false;
+            }
+            var targetDeclarationKind = resolvedRequire.flags & 16
+                ? 225
+                : resolvedRequire.flags & 3
+                    ? 223
+                    : 0;
+            if (targetDeclarationKind !== 0) {
+                var decl = ts.getDeclarationOfKind(resolvedRequire, targetDeclarationKind);
+                return ts.isInAmbientContext(decl);
+            }
+            return false;
+        }
         function checkTaggedTemplateExpression(node) {
             return getReturnTypeOfSignature(getResolvedSignature(node));
         }
@@ -29413,8 +31400,8 @@ var ts;
             if (!links.type) {
                 links.type = instantiateType(contextualType, mapper);
                 if (links.type === emptyObjectType &&
-                    (parameter.valueDeclaration.name.kind === 168 ||
-                        parameter.valueDeclaration.name.kind === 169)) {
+                    (parameter.valueDeclaration.name.kind === 172 ||
+                        parameter.valueDeclaration.name.kind === 173)) {
                     links.type = getTypeFromBindingPattern(parameter.valueDeclaration.name);
                 }
                 assignBindingElementTypes(parameter.valueDeclaration);
@@ -29441,7 +31428,7 @@ var ts;
         function createPromiseReturnType(func, promisedType) {
             var promiseType = createPromiseType(promisedType);
             if (promiseType === emptyObjectType) {
-                error(func, ts.Diagnostics.An_async_function_or_method_must_have_a_valid_awaitable_return_type);
+                error(func, 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);
                 return unknownType;
             }
             return promiseType;
@@ -29453,7 +31440,7 @@ var ts;
             }
             var isAsync = ts.isAsyncFunctionLike(func);
             var type;
-            if (func.body.kind !== 200) {
+            if (func.body.kind !== 204) {
                 type = checkExpressionCached(func.body, contextualMapper);
                 if (isAsync) {
                     type = checkAwaitedType(type, func, ts.Diagnostics.Return_expression_in_async_function_does_not_have_a_valid_callable_then_member);
@@ -29532,7 +31519,7 @@ var ts;
                 return false;
             }
             var lastStatement = ts.lastOrUndefined(func.body.statements);
-            if (lastStatement && lastStatement.kind === 214 && isExhaustiveSwitchStatement(lastStatement)) {
+            if (lastStatement && lastStatement.kind === 218 && isExhaustiveSwitchStatement(lastStatement)) {
                 return false;
             }
             return true;
@@ -29561,7 +31548,7 @@ var ts;
                 }
             });
             if (aggregatedTypes.length === 0 && !hasReturnWithNoExpression && (hasReturnOfTypeNever ||
-                func.kind === 180 || func.kind === 181)) {
+                func.kind === 184 || func.kind === 185)) {
                 return undefined;
             }
             if (strictNullChecks && aggregatedTypes.length && hasReturnWithNoExpression) {
@@ -29578,7 +31565,7 @@ var ts;
             if (returnType && maybeTypeOfKind(returnType, 1 | 1024)) {
                 return;
             }
-            if (ts.nodeIsMissing(func.body) || func.body.kind !== 200 || !functionHasImplicitReturn(func)) {
+            if (ts.nodeIsMissing(func.body) || func.body.kind !== 204 || !functionHasImplicitReturn(func)) {
                 return;
             }
             var hasExplicitReturn = func.flags & 256;
@@ -29605,9 +31592,9 @@ var ts;
             }
         }
         function checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper) {
-            ts.Debug.assert(node.kind !== 148 || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 149 || ts.isObjectLiteralMethod(node));
             var hasGrammarError = checkGrammarFunctionLikeDeclaration(node);
-            if (!hasGrammarError && node.kind === 180) {
+            if (!hasGrammarError && node.kind === 184) {
                 checkGrammarForGenerator(node);
             }
             if (contextualMapper === identityMapper && isContextSensitive(node)) {
@@ -29641,14 +31628,14 @@ var ts;
                     }
                 }
             }
-            if (produceDiagnostics && node.kind !== 148) {
+            if (produceDiagnostics && node.kind !== 149) {
                 checkCollisionWithCapturedSuperVariable(node, node.name);
                 checkCollisionWithCapturedThisVariable(node, node.name);
             }
             return type;
         }
         function checkFunctionExpressionOrObjectLiteralMethodDeferred(node) {
-            ts.Debug.assert(node.kind !== 148 || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 149 || ts.isObjectLiteralMethod(node));
             var isAsync = ts.isAsyncFunctionLike(node);
             var returnOrPromisedType = node.type && (isAsync ? checkAsyncFunctionReturnType(node) : getTypeFromTypeNode(node.type));
             if (!node.asteriskToken) {
@@ -29658,7 +31645,7 @@ var ts;
                 if (!node.type) {
                     getReturnTypeOfSignature(getSignatureFromDeclaration(node));
                 }
-                if (node.body.kind === 200) {
+                if (node.body.kind === 204) {
                     checkSourceElement(node.body);
                 }
                 else {
@@ -29693,10 +31680,10 @@ var ts;
         function isReferenceToReadonlyEntity(expr, symbol) {
             if (isReadonlySymbol(symbol)) {
                 if (symbol.flags & 4 &&
-                    (expr.kind === 173 || expr.kind === 174) &&
+                    (expr.kind === 177 || expr.kind === 178) &&
                     expr.expression.kind === 98) {
                     var func = ts.getContainingFunction(expr);
-                    if (!(func && func.kind === 149))
+                    if (!(func && func.kind === 150))
                         return true;
                     return !(func.parent === symbol.valueDeclaration.parent || func === symbol.valueDeclaration.parent);
                 }
@@ -29705,44 +31692,24 @@ var ts;
             return false;
         }
         function isReferenceThroughNamespaceImport(expr) {
-            if (expr.kind === 173 || expr.kind === 174) {
-                var node = skipParenthesizedNodes(expr.expression);
+            if (expr.kind === 177 || expr.kind === 178) {
+                var node = ts.skipParentheses(expr.expression);
                 if (node.kind === 70) {
                     var symbol = getNodeLinks(node).resolvedSymbol;
                     if (symbol.flags & 8388608) {
                         var declaration = getDeclarationOfAliasSymbol(symbol);
-                        return declaration && declaration.kind === 233;
+                        return declaration && declaration.kind === 237;
                     }
                 }
             }
             return false;
         }
-        function checkReferenceExpression(expr, invalidReferenceMessage, constantVariableMessage) {
-            var node = skipParenthesizedNodes(expr);
-            if (node.kind !== 70 && node.kind !== 173 && node.kind !== 174) {
+        function checkReferenceExpression(expr, invalidReferenceMessage) {
+            var node = ts.skipParentheses(expr);
+            if (node.kind !== 70 && node.kind !== 177 && node.kind !== 178) {
                 error(expr, invalidReferenceMessage);
                 return false;
             }
-            var links = getNodeLinks(node);
-            var symbol = getExportSymbolOfValueSymbolIfExported(links.resolvedSymbol);
-            if (symbol) {
-                if (symbol !== unknownSymbol && symbol !== argumentsSymbol) {
-                    if (node.kind === 70 && !(symbol.flags & 3)) {
-                        error(expr, invalidReferenceMessage);
-                        return false;
-                    }
-                    if (isReferenceToReadonlyEntity(node, symbol) || isReferenceThroughNamespaceImport(node)) {
-                        error(expr, constantVariableMessage);
-                        return false;
-                    }
-                }
-            }
-            else if (node.kind === 174) {
-                if (links.resolvedIndexInfo && links.resolvedIndexInfo.isReadonly) {
-                    error(expr, constantVariableMessage);
-                    return false;
-                }
-            }
             return true;
         }
         function checkDeleteExpression(node) {
@@ -29759,7 +31726,7 @@ var ts;
         }
         function checkAwaitExpression(node) {
             if (produceDiagnostics) {
-                if (!(node.flags & 262144)) {
+                if (!(node.flags & 524288)) {
                     grammarErrorOnFirstToken(node, ts.Diagnostics.await_expression_is_only_allowed_within_an_async_function);
                 }
                 if (isInParameterInitializerBeforeContainingFunction(node)) {
@@ -29794,7 +31761,7 @@ var ts;
                 case 43:
                     var ok = checkArithmeticOperandType(node.operand, getNonNullableType(operandType), ts.Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
                     if (ok) {
-                        checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property);
+                        checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_or_a_property_access);
                     }
                     return numberType;
             }
@@ -29807,7 +31774,7 @@ var ts;
             }
             var ok = checkArithmeticOperandType(node.operand, getNonNullableType(operandType), ts.Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
             if (ok) {
-                checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property);
+                checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_or_a_property_access);
             }
             return numberType;
         }
@@ -29815,7 +31782,7 @@ var ts;
             if (type.flags & kind) {
                 return true;
             }
-            if (type.flags & 1572864) {
+            if (type.flags & 196608) {
                 var types = type.types;
                 for (var _i = 0, types_15 = types; _i < types_15.length; _i++) {
                     var t = types_15[_i];
@@ -29830,7 +31797,7 @@ var ts;
             if (type.flags & kind) {
                 return true;
             }
-            if (type.flags & 524288) {
+            if (type.flags & 65536) {
                 var types = type.types;
                 for (var _i = 0, types_16 = types; _i < types_16.length; _i++) {
                     var t = types_16[_i];
@@ -29840,7 +31807,7 @@ var ts;
                 }
                 return true;
             }
-            if (type.flags & 1048576) {
+            if (type.flags & 131072) {
                 var types = type.types;
                 for (var _a = 0, types_17 = types; _a < types_17.length; _a++) {
                     var t = types_17[_a];
@@ -29852,7 +31819,7 @@ var ts;
             return false;
         }
         function isConstEnumObjectType(type) {
-            return type.flags & (2588672 | 2097152) && type.symbol && isConstEnumSymbol(type.symbol);
+            return getObjectFlags(type) & 16 && type.symbol && isConstEnumSymbol(type.symbol);
         }
         function isConstEnumSymbol(symbol) {
             return (symbol.flags & 128) !== 0;
@@ -29876,36 +31843,36 @@ var ts;
             if (!isTypeAnyOrAllConstituentTypesHaveKind(leftType, 34 | 340 | 512)) {
                 error(left, ts.Diagnostics.The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol);
             }
-            if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, 2588672 | 16384)) {
+            if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, 32768 | 16384)) {
                 error(right, ts.Diagnostics.The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter);
             }
             return booleanType;
         }
         function checkObjectLiteralAssignment(node, sourceType) {
             var properties = node.properties;
-            for (var _i = 0, properties_4 = properties; _i < properties_4.length; _i++) {
-                var p = properties_4[_i];
+            for (var _i = 0, properties_5 = properties; _i < properties_5.length; _i++) {
+                var p = properties_5[_i];
                 checkObjectLiteralDestructuringPropertyAssignment(sourceType, p);
             }
             return sourceType;
         }
         function checkObjectLiteralDestructuringPropertyAssignment(objectLiteralType, property) {
-            if (property.kind === 253 || property.kind === 254) {
-                var name_17 = property.name;
-                if (name_17.kind === 141) {
-                    checkComputedPropertyName(name_17);
+            if (property.kind === 257 || property.kind === 258) {
+                var name_23 = property.name;
+                if (name_23.kind === 142) {
+                    checkComputedPropertyName(name_23);
                 }
-                if (isComputedNonLiteralName(name_17)) {
+                if (isComputedNonLiteralName(name_23)) {
                     return undefined;
                 }
-                var text = getTextOfPropertyName(name_17);
+                var text = ts.getTextOfPropertyName(name_23);
                 var type = isTypeAny(objectLiteralType)
                     ? objectLiteralType
                     : getTypeOfPropertyOfType(objectLiteralType, text) ||
                         isNumericLiteralName(text) && getIndexTypeOfType(objectLiteralType, 1) ||
                         getIndexTypeOfType(objectLiteralType, 0);
                 if (type) {
-                    if (property.kind === 254) {
+                    if (property.kind === 258) {
                         return checkDestructuringAssignment(property, type);
                     }
                     else {
@@ -29913,7 +31880,12 @@ var ts;
                     }
                 }
                 else {
-                    error(name_17, ts.Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(objectLiteralType), ts.declarationNameToString(name_17));
+                    error(name_23, ts.Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(objectLiteralType), ts.declarationNameToString(name_23));
+                }
+            }
+            else if (property.kind === 259) {
+                if (property.expression.kind !== 70) {
+                    error(property.expression, ts.Diagnostics.An_object_rest_element_must_be_an_identifier);
                 }
             }
             else {
@@ -29931,8 +31903,8 @@ var ts;
         function checkArrayLiteralDestructuringElementAssignment(node, sourceType, elementIndex, elementType, contextualMapper) {
             var elements = node.elements;
             var element = elements[elementIndex];
-            if (element.kind !== 194) {
-                if (element.kind !== 192) {
+            if (element.kind !== 198) {
+                if (element.kind !== 196) {
                     var propName = "" + elementIndex;
                     var type = isTypeAny(sourceType)
                         ? sourceType
@@ -29954,11 +31926,11 @@ var ts;
                 }
                 else {
                     if (elementIndex < elements.length - 1) {
-                        error(element, ts.Diagnostics.A_rest_element_must_be_last_in_an_array_destructuring_pattern);
+                        error(element, ts.Diagnostics.A_rest_element_must_be_last_in_a_destructuring_pattern);
                     }
                     else {
                         var restExpression = element.expression;
-                        if (restExpression.kind === 188 && restExpression.operatorToken.kind === 57) {
+                        if (restExpression.kind === 192 && restExpression.operatorToken.kind === 57) {
                             error(restExpression.operatorToken, ts.Diagnostics.A_rest_element_cannot_have_an_initializer);
                         }
                         else {
@@ -29971,7 +31943,7 @@ var ts;
         }
         function checkDestructuringAssignment(exprOrAssignment, sourceType, contextualMapper) {
             var target;
-            if (exprOrAssignment.kind === 254) {
+            if (exprOrAssignment.kind === 258) {
                 var prop = exprOrAssignment;
                 if (prop.objectAssignmentInitializer) {
                     if (strictNullChecks &&
@@ -29985,21 +31957,21 @@ var ts;
             else {
                 target = exprOrAssignment;
             }
-            if (target.kind === 188 && target.operatorToken.kind === 57) {
+            if (target.kind === 192 && target.operatorToken.kind === 57) {
                 checkBinaryExpression(target, contextualMapper);
                 target = target.left;
             }
-            if (target.kind === 172) {
+            if (target.kind === 176) {
                 return checkObjectLiteralAssignment(target, sourceType);
             }
-            if (target.kind === 171) {
+            if (target.kind === 175) {
                 return checkArrayLiteralAssignment(target, sourceType, contextualMapper);
             }
             return checkReferenceAssignment(target, sourceType, contextualMapper);
         }
         function checkReferenceAssignment(target, sourceType, contextualMapper) {
             var targetType = checkExpression(target, contextualMapper);
-            if (checkReferenceExpression(target, ts.Diagnostics.Invalid_left_hand_side_of_assignment_expression, ts.Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property)) {
+            if (checkReferenceExpression(target, ts.Diagnostics.The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access)) {
                 checkTypeAssignableTo(sourceType, targetType, target, undefined);
             }
             return sourceType;
@@ -30010,35 +31982,35 @@ var ts;
                 case 70:
                 case 9:
                 case 11:
-                case 177:
-                case 190:
+                case 181:
+                case 194:
                 case 12:
                 case 8:
                 case 100:
                 case 85:
                 case 94:
-                case 136:
-                case 180:
-                case 193:
-                case 181:
-                case 171:
-                case 172:
-                case 183:
+                case 137:
+                case 184:
                 case 197:
-                case 243:
-                case 242:
+                case 185:
+                case 175:
+                case 176:
+                case 187:
+                case 201:
+                case 247:
+                case 246:
                     return true;
-                case 189:
+                case 193:
                     return isSideEffectFree(node.whenTrue) &&
                         isSideEffectFree(node.whenFalse);
-                case 188:
+                case 192:
                     if (ts.isAssignmentOperator(node.operatorToken.kind)) {
                         return false;
                     }
                     return isSideEffectFree(node.left) &&
                         isSideEffectFree(node.right);
-                case 186:
-                case 187:
+                case 190:
+                case 191:
                     switch (node.operator) {
                         case 50:
                         case 36:
@@ -30047,9 +32019,9 @@ var ts;
                             return true;
                     }
                     return false;
-                case 184:
-                case 178:
-                case 196:
+                case 188:
+                case 182:
+                case 200:
                 default:
                     return false;
             }
@@ -30069,7 +32041,7 @@ var ts;
         }
         function checkBinaryLikeExpression(left, operatorToken, right, contextualMapper, errorNode) {
             var operator = operatorToken.kind;
-            if (operator === 57 && (left.kind === 172 || left.kind === 171)) {
+            if (operator === 57 && (left.kind === 176 || left.kind === 175)) {
                 return checkDestructuringAssignment(left, checkExpression(right, contextualMapper), contextualMapper);
             }
             var leftType = checkExpression(left, contextualMapper);
@@ -30226,8 +32198,7 @@ var ts;
             }
             function checkAssignmentOperator(valueType) {
                 if (produceDiagnostics && operator >= 57 && operator <= 69) {
-                    var ok = checkReferenceExpression(left, ts.Diagnostics.Invalid_left_hand_side_of_assignment_expression, ts.Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property);
-                    if (ok) {
+                    if (checkReferenceExpression(left, ts.Diagnostics.The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access)) {
                         checkTypeAssignableTo(valueType, leftType, left, undefined);
                     }
                 }
@@ -30253,7 +32224,7 @@ var ts;
         }
         function checkYieldExpression(node) {
             if (produceDiagnostics) {
-                if (!(node.flags & 65536) || isYieldExpressionInClass(node)) {
+                if (!(node.flags & 131072) || isYieldExpressionInClass(node)) {
                     grammarErrorOnFirstToken(node, ts.Diagnostics.A_yield_expression_is_only_allowed_in_a_generator_body);
                 }
                 if (isInParameterInitializerBeforeContainingFunction(node)) {
@@ -30327,8 +32298,8 @@ var ts;
             return links.resolvedType;
         }
         function isTypeAssertion(node) {
-            node = skipParenthesizedNodes(node);
-            return node.kind === 178 || node.kind === 196;
+            node = ts.skipParentheses(node);
+            return node.kind === 182 || node.kind === 200;
         }
         function checkDeclarationInitializer(declaration) {
             var type = checkExpressionCached(declaration.initializer);
@@ -30354,14 +32325,14 @@ var ts;
             return isTypeAssertion(node) || isLiteralContextualType(getContextualType(node)) ? type : getWidenedLiteralType(type);
         }
         function checkPropertyAssignment(node, contextualMapper) {
-            if (node.name.kind === 141) {
+            if (node.name.kind === 142) {
                 checkComputedPropertyName(node.name);
             }
             return checkExpressionForMutableLocation(node.initializer, contextualMapper);
         }
         function checkObjectLiteralMethod(node, contextualMapper) {
             checkGrammarMethod(node);
-            if (node.name.kind === 141) {
+            if (node.name.kind === 142) {
                 checkComputedPropertyName(node.name);
             }
             var uninstantiatedType = checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper);
@@ -30384,7 +32355,7 @@ var ts;
         }
         function checkExpression(node, contextualMapper) {
             var type;
-            if (node.kind === 140) {
+            if (node.kind === 141) {
                 type = checkQualifiedName(node);
             }
             else {
@@ -30392,9 +32363,9 @@ var ts;
                 type = instantiateTypeWithSingleGenericCallSignature(node, uninstantiatedType, contextualMapper);
             }
             if (isConstEnumObjectType(type)) {
-                var ok = (node.parent.kind === 173 && node.parent.expression === node) ||
-                    (node.parent.kind === 174 && node.parent.expression === node) ||
-                    ((node.kind === 70 || node.kind === 140) && isInRightSideOfImportOrExportAssignment(node));
+                var ok = (node.parent.kind === 177 && node.parent.expression === node) ||
+                    (node.parent.kind === 178 && node.parent.expression === node) ||
+                    ((node.kind === 70 || node.kind === 141) && isInRightSideOfImportOrExportAssignment(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);
                 }
@@ -30416,66 +32387,66 @@ var ts;
                 case 100:
                 case 85:
                     return checkLiteralExpression(node);
-                case 190:
+                case 194:
                     return checkTemplateExpression(node);
                 case 12:
                     return stringType;
                 case 11:
                     return globalRegExpType;
-                case 171:
-                    return checkArrayLiteral(node, contextualMapper);
-                case 172:
-                    return checkObjectLiteral(node, contextualMapper);
-                case 173:
-                    return checkPropertyAccessExpression(node);
-                case 174:
-                    return checkIndexedAccess(node);
                 case 175:
+                    return checkArrayLiteral(node, contextualMapper);
                 case 176:
-                    return checkCallExpression(node);
+                    return checkObjectLiteral(node, contextualMapper);
                 case 177:
-                    return checkTaggedTemplateExpression(node);
-                case 179:
-                    return checkExpression(node.expression, contextualMapper);
-                case 193:
-                    return checkClassExpression(node);
-                case 180:
-                case 181:
-                    return checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper);
-                case 183:
-                    return checkTypeOfExpression(node);
+                    return checkPropertyAccessExpression(node);
                 case 178:
-                case 196:
-                    return checkAssertion(node);
+                    return checkIndexedAccess(node);
+                case 179:
+                case 180:
+                    return checkCallExpression(node);
+                case 181:
+                    return checkTaggedTemplateExpression(node);
+                case 183:
+                    return checkExpression(node.expression, contextualMapper);
                 case 197:
-                    return checkNonNullAssertion(node);
-                case 182:
-                    return checkDeleteExpression(node);
+                    return checkClassExpression(node);
                 case 184:
-                    return checkVoidExpression(node);
                 case 185:
-                    return checkAwaitExpression(node);
-                case 186:
-                    return checkPrefixUnaryExpression(node);
+                    return checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper);
                 case 187:
-                    return checkPostfixUnaryExpression(node);
+                    return checkTypeOfExpression(node);
+                case 182:
+                case 200:
+                    return checkAssertion(node);
+                case 201:
+                    return checkNonNullAssertion(node);
+                case 186:
+                    return checkDeleteExpression(node);
                 case 188:
-                    return checkBinaryExpression(node, contextualMapper);
+                    return checkVoidExpression(node);
                 case 189:
-                    return checkConditionalExpression(node, contextualMapper);
-                case 192:
-                    return checkSpreadElementExpression(node, contextualMapper);
-                case 194:
-                    return undefinedWideningType;
+                    return checkAwaitExpression(node);
+                case 190:
+                    return checkPrefixUnaryExpression(node);
                 case 191:
+                    return checkPostfixUnaryExpression(node);
+                case 192:
+                    return checkBinaryExpression(node, contextualMapper);
+                case 193:
+                    return checkConditionalExpression(node, contextualMapper);
+                case 196:
+                    return checkSpreadExpression(node, contextualMapper);
+                case 198:
+                    return undefinedWideningType;
+                case 195:
                     return checkYieldExpression(node);
-                case 248:
+                case 252:
                     return checkJsxExpression(node);
-                case 242:
+                case 246:
                     return checkJsxElement(node);
-                case 243:
+                case 247:
                     return checkJsxSelfClosingElement(node);
-                case 244:
+                case 248:
                     ts.Debug.fail("Shouldn't ever directly check a JsxOpeningElement");
             }
             return unknownType;
@@ -30496,7 +32467,7 @@ var ts;
             var func = ts.getContainingFunction(node);
             if (ts.getModifierFlags(node) & 92) {
                 func = ts.getContainingFunction(node);
-                if (!(func.kind === 149 && ts.nodeIsPresent(func.body))) {
+                if (!(func.kind === 150 && ts.nodeIsPresent(func.body))) {
                     error(node, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
                 }
             }
@@ -30507,7 +32478,7 @@ var ts;
                 if (ts.indexOf(func.parameters, node) !== 0) {
                     error(node, ts.Diagnostics.A_this_parameter_must_be_the_first_parameter);
                 }
-                if (func.kind === 149 || func.kind === 153 || func.kind === 158) {
+                if (func.kind === 150 || func.kind === 154 || func.kind === 159) {
                     error(node, ts.Diagnostics.A_constructor_cannot_have_a_this_parameter);
                 }
             }
@@ -30519,9 +32490,9 @@ var ts;
             if (!node.asteriskToken || !node.body) {
                 return false;
             }
-            return node.kind === 148 ||
-                node.kind === 221 ||
-                node.kind === 180;
+            return node.kind === 149 ||
+                node.kind === 225 ||
+                node.kind === 184;
         }
         function getTypePredicateParameterIndex(parameterList, parameter) {
             if (parameterList) {
@@ -30562,9 +32533,9 @@ var ts;
                 else if (parameterName) {
                     var hasReportedError = false;
                     for (var _i = 0, _a = parent.parameters; _i < _a.length; _i++) {
-                        var name_18 = _a[_i].name;
-                        if (ts.isBindingPattern(name_18) &&
-                            checkIfTypePredicateVariableIsDeclaredInBindingPattern(name_18, parameterName, typePredicate.parameterName)) {
+                        var name_24 = _a[_i].name;
+                        if (ts.isBindingPattern(name_24) &&
+                            checkIfTypePredicateVariableIsDeclaredInBindingPattern(name_24, parameterName, typePredicate.parameterName)) {
                             hasReportedError = true;
                             break;
                         }
@@ -30577,16 +32548,16 @@ var ts;
         }
         function getTypePredicateParent(node) {
             switch (node.parent.kind) {
-                case 181:
-                case 152:
-                case 221:
-                case 180:
-                case 157:
+                case 185:
+                case 153:
+                case 225:
+                case 184:
+                case 158:
+                case 149:
                 case 148:
-                case 147:
-                    var parent_12 = node.parent;
-                    if (node === parent_12.type) {
-                        return parent_12;
+                    var parent_10 = node.parent;
+                    if (node === parent_10.type) {
+                        return parent_10;
                     }
             }
         }
@@ -30596,27 +32567,27 @@ var ts;
                 if (ts.isOmittedExpression(element)) {
                     continue;
                 }
-                var name_19 = element.name;
-                if (name_19.kind === 70 &&
-                    name_19.text === predicateVariableName) {
+                var name_25 = element.name;
+                if (name_25.kind === 70 &&
+                    name_25.text === predicateVariableName) {
                     error(predicateVariableNode, ts.Diagnostics.A_type_predicate_cannot_reference_element_0_in_a_binding_pattern, predicateVariableName);
                     return true;
                 }
-                else if (name_19.kind === 169 ||
-                    name_19.kind === 168) {
-                    if (checkIfTypePredicateVariableIsDeclaredInBindingPattern(name_19, predicateVariableNode, predicateVariableName)) {
+                else if (name_25.kind === 173 ||
+                    name_25.kind === 172) {
+                    if (checkIfTypePredicateVariableIsDeclaredInBindingPattern(name_25, predicateVariableNode, predicateVariableName)) {
                         return true;
                     }
                 }
             }
         }
         function checkSignatureDeclaration(node) {
-            if (node.kind === 154) {
+            if (node.kind === 155) {
                 checkGrammarIndexSignature(node);
             }
-            else if (node.kind === 157 || node.kind === 221 || node.kind === 158 ||
-                node.kind === 152 || node.kind === 149 ||
-                node.kind === 153) {
+            else if (node.kind === 158 || node.kind === 225 || node.kind === 159 ||
+                node.kind === 153 || node.kind === 150 ||
+                node.kind === 154) {
                 checkGrammarFunctionLikeDeclaration(node);
             }
             checkTypeParameters(node.typeParameters);
@@ -30628,10 +32599,10 @@ var ts;
                 checkCollisionWithArgumentsInGeneratedCode(node);
                 if (compilerOptions.noImplicitAny && !node.type) {
                     switch (node.kind) {
-                        case 153:
+                        case 154:
                             error(node, ts.Diagnostics.Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
-                        case 152:
+                        case 153:
                             error(node, ts.Diagnostics.Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
                     }
@@ -30658,17 +32629,11 @@ var ts;
             }
         }
         function checkClassForDuplicateDeclarations(node) {
-            var Accessor;
-            (function (Accessor) {
-                Accessor[Accessor["Getter"] = 1] = "Getter";
-                Accessor[Accessor["Setter"] = 2] = "Setter";
-                Accessor[Accessor["Property"] = 3] = "Property";
-            })(Accessor || (Accessor = {}));
             var instanceNames = ts.createMap();
             var staticNames = ts.createMap();
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                if (member.kind === 149) {
+                if (member.kind === 150) {
                     for (var _b = 0, _c = member.parameters; _b < _c.length; _b++) {
                         var param = _c[_b];
                         if (ts.isParameterPropertyDeclaration(param)) {
@@ -30682,13 +32647,13 @@ var ts;
                     var memberName = member.name && ts.getPropertyNameForPropertyNameNode(member.name);
                     if (memberName) {
                         switch (member.kind) {
-                            case 150:
+                            case 151:
                                 addName(names, member.name, memberName, 1);
                                 break;
-                            case 151:
+                            case 152:
                                 addName(names, member.name, memberName, 2);
                                 break;
-                            case 146:
+                            case 147:
                                 addName(names, member.name, memberName, 3);
                                 break;
                         }
@@ -30714,7 +32679,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 == 145) {
+                if (member.kind == 146) {
                     var memberName = void 0;
                     switch (member.name.kind) {
                         case 9:
@@ -30736,7 +32701,7 @@ var ts;
             }
         }
         function checkTypeForDuplicateIndexSignatures(node) {
-            if (node.kind === 223) {
+            if (node.kind === 227) {
                 var nodeSymbol = getSymbolOfNode(node);
                 if (nodeSymbol.declarations.length > 0 && nodeSymbol.declarations[0] !== node) {
                     return;
@@ -30751,7 +32716,7 @@ var ts;
                     var declaration = decl;
                     if (declaration.parameters.length === 1 && declaration.parameters[0].type) {
                         switch (declaration.parameters[0].type.kind) {
-                            case 133:
+                            case 134:
                                 if (!seenStringIndexer) {
                                     seenStringIndexer = true;
                                 }
@@ -30759,7 +32724,7 @@ var ts;
                                     error(declaration, ts.Diagnostics.Duplicate_string_index_signature);
                                 }
                                 break;
-                            case 131:
+                            case 132:
                                 if (!seenNumericIndexer) {
                                     seenNumericIndexer = true;
                                 }
@@ -30818,12 +32783,12 @@ var ts;
                 if (n.kind === 98) {
                     error(n, ts.Diagnostics.this_cannot_be_referenced_in_current_location);
                 }
-                else if (n.kind !== 180 && n.kind !== 221) {
+                else if (n.kind !== 184 && n.kind !== 225) {
                     ts.forEachChild(n, markThisReferencesAsErrors);
                 }
             }
             function isInstancePropertyWithInitializer(n) {
-                return n.kind === 146 &&
+                return n.kind === 147 &&
                     !(ts.getModifierFlags(n) & 32) &&
                     !!n.initializer;
             }
@@ -30843,7 +32808,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 === 203 && ts.isSuperCall(statement.expression)) {
+                            if (statement.kind === 207 && ts.isSuperCall(statement.expression)) {
                                 superCallStatement = statement;
                                 break;
                             }
@@ -30866,18 +32831,18 @@ var ts;
                 checkGrammarFunctionLikeDeclaration(node) || checkGrammarAccessor(node) || checkGrammarComputedPropertyName(node.name);
                 checkDecorators(node);
                 checkSignatureDeclaration(node);
-                if (node.kind === 150) {
+                if (node.kind === 151) {
                     if (!ts.isInAmbientContext(node) && 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 === 141) {
+                if (node.name.kind === 142) {
                     checkComputedPropertyName(node.name);
                 }
                 if (!ts.hasDynamicName(node)) {
-                    var otherKind = node.kind === 150 ? 151 : 150;
+                    var otherKind = node.kind === 151 ? 152 : 151;
                     var otherAccessor = ts.getDeclarationOfKind(node.symbol, otherKind);
                     if (otherAccessor) {
                         if ((ts.getModifierFlags(node) & 28) !== (ts.getModifierFlags(otherAccessor) & 28)) {
@@ -30891,11 +32856,11 @@ var ts;
                     }
                 }
                 var returnType = getTypeOfAccessors(getSymbolOfNode(node));
-                if (node.kind === 150) {
+                if (node.kind === 151) {
                     checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnType);
                 }
             }
-            if (node.parent.kind !== 172) {
+            if (node.parent.kind !== 176) {
                 checkSourceElement(node.body);
                 registerForUnusedIdentifiersCheck(node);
             }
@@ -30925,7 +32890,7 @@ var ts;
                 var constraint = getConstraintOfTypeParameter(typeParameters[i]);
                 if (constraint) {
                     if (!typeArguments) {
-                        typeArguments = ts.map(typeArgumentNodes, getTypeFromTypeNodeNoAlias);
+                        typeArguments = ts.map(typeArgumentNodes, getTypeFromTypeNode);
                         mapper = createTypeMapper(typeParameters, typeArguments);
                     }
                     var typeArgument = typeArguments[i];
@@ -30976,14 +32941,25 @@ var ts;
         function checkUnionOrIntersectionType(node) {
             ts.forEach(node.types, checkSourceElement);
         }
+        function checkIndexedAccessType(node) {
+            getTypeFromIndexedAccessTypeNode(node);
+        }
+        function checkMappedType(node) {
+            checkSourceElement(node.typeParameter);
+            checkSourceElement(node.type);
+            var type = getTypeFromMappedTypeNode(node);
+            var constraintType = getConstraintTypeFromMappedType(type);
+            var keyType = constraintType.flags & 16384 ? getApparentTypeOfTypeParameter(constraintType) : constraintType;
+            checkTypeAssignableTo(keyType, stringOrNumberType, node.typeParameter.constraint);
+        }
         function isPrivateWithinAmbient(node) {
             return (ts.getModifierFlags(node) & 8) && ts.isInAmbientContext(node);
         }
         function getEffectiveDeclarationFlags(n, flagsToCheck) {
             var flags = ts.getCombinedModifierFlags(n);
-            if (n.parent.kind !== 223 &&
-                n.parent.kind !== 222 &&
-                n.parent.kind !== 193 &&
+            if (n.parent.kind !== 227 &&
+                n.parent.kind !== 226 &&
+                n.parent.kind !== 197 &&
                 ts.isInAmbientContext(n)) {
                 if (!(flags & 2)) {
                     flags |= 1;
@@ -31060,7 +33036,7 @@ var ts;
                     if (subsequentNode.kind === node.kind) {
                         var errorNode_1 = subsequentNode.name || subsequentNode;
                         if (node.name && subsequentNode.name && node.name.text === subsequentNode.name.text) {
-                            var reportError = (node.kind === 148 || node.kind === 147) &&
+                            var reportError = (node.kind === 149 || node.kind === 148) &&
                                 (ts.getModifierFlags(node) & 32) !== (ts.getModifierFlags(subsequentNode) & 32);
                             if (reportError) {
                                 var diagnostic = ts.getModifierFlags(node) & 32 ? ts.Diagnostics.Function_overload_must_be_static : ts.Diagnostics.Function_overload_must_not_be_static;
@@ -31093,11 +33069,11 @@ var ts;
                 var current = declarations_4[_i];
                 var node = current;
                 var inAmbientContext = ts.isInAmbientContext(node);
-                var inAmbientContextOrInterface = node.parent.kind === 223 || node.parent.kind === 160 || inAmbientContext;
+                var inAmbientContextOrInterface = node.parent.kind === 227 || node.parent.kind === 161 || inAmbientContext;
                 if (inAmbientContextOrInterface) {
                     previousDeclaration = undefined;
                 }
-                if (node.kind === 221 || node.kind === 148 || node.kind === 147 || node.kind === 149) {
+                if (node.kind === 225 || node.kind === 149 || node.kind === 148 || node.kind === 150) {
                     var currentNodeFlags = getEffectiveDeclarationFlags(node, flagsToCheck);
                     someNodeFlags |= currentNodeFlags;
                     allNodeFlags &= currentNodeFlags;
@@ -31208,16 +33184,16 @@ var ts;
             }
             function getDeclarationSpaces(d) {
                 switch (d.kind) {
-                    case 223:
+                    case 227:
                         return 2097152;
-                    case 226:
+                    case 230:
                         return ts.isAmbientModule(d) || ts.getModuleInstanceState(d) !== 0
                             ? 4194304 | 1048576
                             : 4194304;
-                    case 222:
-                    case 225:
+                    case 226:
+                    case 229:
                         return 2097152 | 1048576;
-                    case 230:
+                    case 234:
                         var result_2 = 0;
                         var target = resolveAlias(getSymbolOfNode(d));
                         ts.forEach(target.declarations, function (d) { result_2 |= getDeclarationSpaces(d); });
@@ -31244,7 +33220,7 @@ var ts;
             if (isTypeAny(promise)) {
                 return undefined;
             }
-            if (promise.flags & 131072) {
+            if (getObjectFlags(promise) & 4) {
                 if (promise.target === tryGetGlobalPromiseType()
                     || promise.target === getGlobalPromiseLikeType()) {
                     return promise.typeArguments[0];
@@ -31281,7 +33257,7 @@ var ts;
         function checkAwaitedType(type, location, message) {
             return checkAwaitedTypeWorker(type);
             function checkAwaitedTypeWorker(type) {
-                if (type.flags & 524288) {
+                if (type.flags & 65536) {
                     var types = [];
                     for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                         var constituentType = _a[_i];
@@ -31309,51 +33285,50 @@ var ts;
                 }
             }
         }
-        function checkCorrectPromiseType(returnType, location, diagnostic, typeName) {
-            if (returnType === unknownType) {
-                return unknownType;
-            }
-            var globalPromiseType = getGlobalPromiseType();
-            if (globalPromiseType === emptyGenericType
-                || globalPromiseType === getTargetType(returnType)) {
-                return checkAwaitedType(returnType, location, ts.Diagnostics.An_async_function_or_method_must_have_a_valid_awaitable_return_type);
-            }
-            error(location, diagnostic, typeName);
-            return unknownType;
-        }
         function checkAsyncFunctionReturnType(node) {
+            var returnType = getTypeFromTypeNode(node.type);
             if (languageVersion >= 2) {
-                var returnType = getTypeFromTypeNode(node.type);
-                return checkCorrectPromiseType(returnType, node.type, ts.Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type);
+                if (returnType === unknownType) {
+                    return unknownType;
+                }
+                var globalPromiseType = getGlobalPromiseType();
+                if (globalPromiseType !== emptyGenericType && globalPromiseType !== getTargetType(returnType)) {
+                    error(node.type, ts.Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type);
+                    return unknownType;
+                }
             }
-            var globalPromiseConstructorLikeType = getGlobalPromiseConstructorLikeType();
-            if (globalPromiseConstructorLikeType === emptyObjectType) {
-                return unknownType;
+            else {
+                markTypeNodeAsReferenced(node.type);
+                if (returnType === unknownType) {
+                    return unknownType;
+                }
+                var promiseConstructorName = ts.getEntityNameFromTypeNode(node.type);
+                if (promiseConstructorName === undefined) {
+                    error(node.type, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, typeToString(returnType));
+                    return unknownType;
+                }
+                var promiseConstructorSymbol = resolveEntityName(promiseConstructorName, 107455, true);
+                var promiseConstructorType = promiseConstructorSymbol ? getTypeOfSymbol(promiseConstructorSymbol) : unknownType;
+                if (promiseConstructorType === unknownType) {
+                    error(node.type, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, ts.entityNameToString(promiseConstructorName));
+                    return unknownType;
+                }
+                var globalPromiseConstructorLikeType = getGlobalPromiseConstructorLikeType();
+                if (globalPromiseConstructorLikeType === emptyObjectType) {
+                    error(node.type, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, ts.entityNameToString(promiseConstructorName));
+                    return unknownType;
+                }
+                if (!checkTypeAssignableTo(promiseConstructorType, globalPromiseConstructorLikeType, node.type, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value)) {
+                    return unknownType;
+                }
+                var rootName = promiseConstructorName && getFirstIdentifier(promiseConstructorName);
+                var collidingSymbol = getSymbol(node.locals, rootName.text, 107455);
+                if (collidingSymbol) {
+                    error(collidingSymbol.valueDeclaration, ts.Diagnostics.Duplicate_identifier_0_Compiler_uses_declaration_1_to_support_async_functions, rootName.text, ts.entityNameToString(promiseConstructorName));
+                    return unknownType;
+                }
             }
-            var promiseType = getTypeFromTypeNode(node.type);
-            if (promiseType === unknownType && compilerOptions.isolatedModules) {
-                return unknownType;
-            }
-            var promiseConstructor = getNodeLinks(node.type).resolvedSymbol;
-            if (!promiseConstructor || !symbolIsValue(promiseConstructor)) {
-                var typeName = promiseConstructor
-                    ? symbolToString(promiseConstructor)
-                    : typeToString(promiseType);
-                return checkCorrectPromiseType(promiseType, node.type, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type, typeName);
-            }
-            checkReturnTypeAnnotationAsExpression(node);
-            var promiseConstructorType = getTypeOfSymbol(promiseConstructor);
-            if (!checkTypeAssignableTo(promiseConstructorType, globalPromiseConstructorLikeType, node.type, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type)) {
-                return unknownType;
-            }
-            var promiseName = ts.getEntityNameFromTypeNode(node.type);
-            var promiseNameOrNamespaceRoot = getFirstIdentifier(promiseName);
-            var rootSymbol = getSymbol(node.locals, promiseNameOrNamespaceRoot.text, 107455);
-            if (rootSymbol) {
-                error(rootSymbol.valueDeclaration, ts.Diagnostics.Duplicate_identifier_0_Compiler_uses_declaration_1_to_support_async_functions, promiseNameOrNamespaceRoot.text, getFullyQualifiedName(promiseConstructor));
-                return unknownType;
-            }
-            return checkAwaitedType(promiseType, node, ts.Diagnostics.An_async_function_or_method_must_have_a_valid_awaitable_return_type);
+            return checkAwaitedType(returnType, node, ts.Diagnostics.An_async_function_or_method_must_have_a_valid_awaitable_return_type);
         }
         function checkDecorator(node) {
             var signature = getResolvedSignature(node);
@@ -31365,22 +33340,22 @@ var ts;
             var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
             var errorInfo;
             switch (node.parent.kind) {
-                case 222:
+                case 226:
                     var classSymbol = getSymbolOfNode(node.parent);
                     var classConstructorType = getTypeOfSymbol(classSymbol);
                     expectedReturnType = getUnionType([classConstructorType, voidType]);
                     break;
-                case 143:
+                case 144:
                     expectedReturnType = voidType;
                     errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any);
                     break;
-                case 146:
+                case 147:
                     expectedReturnType = voidType;
                     errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.The_return_type_of_a_property_decorator_function_must_be_either_void_or_any);
                     break;
-                case 148:
-                case 150:
+                case 149:
                 case 151:
+                case 152:
                     var methodType = getTypeOfNode(node.parent);
                     var descriptorType = createTypedPropertyDescriptorType(methodType);
                     expectedReturnType = getUnionType([descriptorType, voidType]);
@@ -31388,29 +33363,15 @@ var ts;
             }
             checkTypeAssignableTo(returnType, expectedReturnType, node, headMessage, errorInfo);
         }
-        function checkTypeNodeAsExpression(node) {
-            if (node && node.kind === 156) {
-                var root = getFirstIdentifier(node.typeName);
-                var meaning = root.parent.kind === 156 ? 793064 : 1920;
-                var rootSymbol = resolveName(root, root.text, meaning | 8388608, undefined, undefined);
-                if (rootSymbol && rootSymbol.flags & 8388608) {
-                    var aliasTarget = resolveAlias(rootSymbol);
-                    if (aliasTarget.flags & 107455 && !isConstEnumOrConstEnumOnlyModule(resolveAlias(rootSymbol))) {
-                        markAliasSymbolAsReferenced(rootSymbol);
-                    }
-                }
-            }
-        }
-        function checkTypeAnnotationAsExpression(node) {
-            checkTypeNodeAsExpression(node.type);
-        }
-        function checkReturnTypeAnnotationAsExpression(node) {
-            checkTypeNodeAsExpression(node.type);
-        }
-        function checkParameterTypeAnnotationsAsExpressions(node) {
-            for (var _i = 0, _a = node.parameters; _i < _a.length; _i++) {
-                var parameter = _a[_i];
-                checkTypeAnnotationAsExpression(parameter);
+        function markTypeNodeAsReferenced(node) {
+            var typeName = node && ts.getEntityNameFromTypeNode(node);
+            var rootName = typeName && getFirstIdentifier(typeName);
+            var rootSymbol = rootName && resolveName(rootName, rootName.text, (typeName.kind === 70 ? 793064 : 1920) | 8388608, undefined, undefined);
+            if (rootSymbol
+                && rootSymbol.flags & 8388608
+                && symbolIsValue(rootSymbol)
+                && !isConstEnumOrConstEnumOnlyModule(resolveAlias(rootSymbol))) {
+                markAliasSymbolAsReferenced(rootSymbol);
             }
         }
         function checkDecorators(node) {
@@ -31425,21 +33386,27 @@ var ts;
             }
             if (compilerOptions.emitDecoratorMetadata) {
                 switch (node.kind) {
-                    case 222:
+                    case 226:
                         var constructor = ts.getFirstConstructorWithBody(node);
                         if (constructor) {
-                            checkParameterTypeAnnotationsAsExpressions(constructor);
+                            for (var _i = 0, _a = constructor.parameters; _i < _a.length; _i++) {
+                                var parameter = _a[_i];
+                                markTypeNodeAsReferenced(parameter.type);
+                            }
                         }
                         break;
-                    case 148:
-                    case 150:
+                    case 149:
                     case 151:
-                        checkParameterTypeAnnotationsAsExpressions(node);
-                        checkReturnTypeAnnotationAsExpression(node);
+                    case 152:
+                        for (var _b = 0, _c = node.parameters; _b < _c.length; _b++) {
+                            var parameter = _c[_b];
+                            markTypeNodeAsReferenced(parameter.type);
+                        }
+                        markTypeNodeAsReferenced(node.type);
                         break;
-                    case 146:
-                    case 143:
-                        checkTypeAnnotationAsExpression(node);
+                    case 147:
+                    case 144:
+                        markTypeNodeAsReferenced(node.type);
                         break;
                 }
             }
@@ -31458,7 +33425,7 @@ var ts;
             checkDecorators(node);
             checkSignatureDeclaration(node);
             var isAsync = ts.isAsyncFunctionLike(node);
-            if (node.name && node.name.kind === 141) {
+            if (node.name && node.name.kind === 142) {
                 checkComputedPropertyName(node.name);
             }
             if (!ts.hasDynamicName(node)) {
@@ -31500,43 +33467,43 @@ var ts;
                 for (var _i = 0, deferredUnusedIdentifierNodes_1 = deferredUnusedIdentifierNodes; _i < deferredUnusedIdentifierNodes_1.length; _i++) {
                     var node = deferredUnusedIdentifierNodes_1[_i];
                     switch (node.kind) {
-                        case 256:
-                        case 226:
+                        case 261:
+                        case 230:
                             checkUnusedModuleMembers(node);
                             break;
-                        case 222:
-                        case 193:
+                        case 226:
+                        case 197:
                             checkUnusedClassMembers(node);
                             checkUnusedTypeParameters(node);
                             break;
-                        case 223:
+                        case 227:
                             checkUnusedTypeParameters(node);
                             break;
-                        case 200:
-                        case 228:
-                        case 207:
-                        case 208:
-                        case 209:
+                        case 204:
+                        case 232:
+                        case 211:
+                        case 212:
+                        case 213:
                             checkUnusedLocalsAndParameters(node);
                             break;
-                        case 149:
-                        case 180:
-                        case 221:
-                        case 181:
-                        case 148:
                         case 150:
+                        case 184:
+                        case 225:
+                        case 185:
+                        case 149:
                         case 151:
+                        case 152:
                             if (node.body) {
                                 checkUnusedLocalsAndParameters(node);
                             }
                             checkUnusedTypeParameters(node);
                             break;
-                        case 147:
-                        case 152:
+                        case 148:
                         case 153:
                         case 154:
-                        case 157:
+                        case 155:
                         case 158:
+                        case 159:
                             checkUnusedTypeParameters(node);
                             break;
                     }
@@ -31545,43 +33512,57 @@ var ts;
             }
         }
         function checkUnusedLocalsAndParameters(node) {
-            if (node.parent.kind !== 223 && noUnusedIdentifiers && !ts.isInAmbientContext(node)) {
-                var _loop_1 = function (key) {
+            if (node.parent.kind !== 227 && noUnusedIdentifiers && !ts.isInAmbientContext(node)) {
+                var _loop_3 = function (key) {
                     var local = node.locals[key];
                     if (!local.isReferenced) {
-                        if (local.valueDeclaration && local.valueDeclaration.kind === 143) {
-                            var parameter = local.valueDeclaration;
+                        if (local.valueDeclaration && ts.getRootDeclaration(local.valueDeclaration).kind === 144) {
+                            var parameter = ts.getRootDeclaration(local.valueDeclaration);
                             if (compilerOptions.noUnusedParameters &&
                                 !ts.isParameterPropertyDeclaration(parameter) &&
                                 !ts.parameterIsThisKeyword(parameter) &&
-                                !parameterNameStartsWithUnderscore(parameter)) {
+                                !parameterNameStartsWithUnderscore(local.valueDeclaration.name)) {
                                 error(local.valueDeclaration.name, ts.Diagnostics._0_is_declared_but_never_used, local.name);
                             }
                         }
                         else if (compilerOptions.noUnusedLocals) {
-                            ts.forEach(local.declarations, function (d) { return error(d.name || d, ts.Diagnostics._0_is_declared_but_never_used, local.name); });
+                            ts.forEach(local.declarations, function (d) { return errorUnusedLocal(d.name || d, local.name); });
                         }
                     }
                 };
                 for (var key in node.locals) {
-                    _loop_1(key);
+                    _loop_3(key);
                 }
             }
         }
-        function parameterNameStartsWithUnderscore(parameter) {
-            return parameter.name && parameter.name.kind === 70 && parameter.name.text.charCodeAt(0) === 95;
+        function errorUnusedLocal(node, name) {
+            if (isIdentifierThatStartsWithUnderScore(node)) {
+                var declaration = ts.getRootDeclaration(node.parent);
+                if (declaration.kind === 223 &&
+                    (declaration.parent.parent.kind === 212 ||
+                        declaration.parent.parent.kind === 213)) {
+                    return;
+                }
+            }
+            error(node, ts.Diagnostics._0_is_declared_but_never_used, name);
+        }
+        function parameterNameStartsWithUnderscore(parameterName) {
+            return parameterName && isIdentifierThatStartsWithUnderScore(parameterName);
+        }
+        function isIdentifierThatStartsWithUnderScore(node) {
+            return node.kind === 70 && node.text.charCodeAt(0) === 95;
         }
         function checkUnusedClassMembers(node) {
             if (compilerOptions.noUnusedLocals && !ts.isInAmbientContext(node)) {
                 if (node.members) {
                     for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                         var member = _a[_i];
-                        if (member.kind === 148 || member.kind === 146) {
+                        if (member.kind === 149 || member.kind === 147) {
                             if (!member.symbol.isReferenced && ts.getModifierFlags(member) & 8) {
                                 error(member.name, ts.Diagnostics._0_is_declared_but_never_used, member.symbol.name);
                             }
                         }
-                        else if (member.kind === 149) {
+                        else if (member.kind === 150) {
                             for (var _b = 0, _c = member.parameters; _b < _c.length; _b++) {
                                 var parameter = _c[_b];
                                 if (!parameter.symbol.isReferenced && ts.getModifierFlags(parameter) & 8) {
@@ -31626,7 +33607,7 @@ var ts;
             }
         }
         function checkBlock(node) {
-            if (node.kind === 200) {
+            if (node.kind === 204) {
                 checkGrammarStatementInAmbientContext(node);
             }
             ts.forEach(node.statements, checkSourceElement);
@@ -31648,19 +33629,19 @@ var ts;
             if (!(identifier && identifier.text === name)) {
                 return false;
             }
-            if (node.kind === 146 ||
-                node.kind === 145 ||
+            if (node.kind === 147 ||
+                node.kind === 146 ||
+                node.kind === 149 ||
                 node.kind === 148 ||
-                node.kind === 147 ||
-                node.kind === 150 ||
-                node.kind === 151) {
+                node.kind === 151 ||
+                node.kind === 152) {
                 return false;
             }
             if (ts.isInAmbientContext(node)) {
                 return false;
             }
             var root = ts.getRootDeclaration(node);
-            if (root.kind === 143 && ts.nodeIsMissing(root.parent.body)) {
+            if (root.kind === 144 && ts.nodeIsMissing(root.parent.body)) {
                 return false;
             }
             return true;
@@ -31711,11 +33692,11 @@ var ts;
             if (!needCollisionCheckForIdentifier(node, name, "require") && !needCollisionCheckForIdentifier(node, name, "exports")) {
                 return;
             }
-            if (node.kind === 226 && ts.getModuleInstanceState(node) !== 1) {
+            if (node.kind === 230 && ts.getModuleInstanceState(node) !== 1) {
                 return;
             }
             var parent = getDeclarationContainer(node);
-            if (parent.kind === 256 && ts.isExternalOrCommonJsModule(parent)) {
+            if (parent.kind === 261 && 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));
             }
         }
@@ -31723,11 +33704,11 @@ var ts;
             if (!needCollisionCheckForIdentifier(node, name, "Promise")) {
                 return;
             }
-            if (node.kind === 226 && ts.getModuleInstanceState(node) !== 1) {
+            if (node.kind === 230 && ts.getModuleInstanceState(node) !== 1) {
                 return;
             }
             var parent = getDeclarationContainer(node);
-            if (parent.kind === 256 && ts.isExternalOrCommonJsModule(parent) && parent.flags & 8192) {
+            if (parent.kind === 261 && ts.isExternalOrCommonJsModule(parent) && parent.flags & 8192) {
                 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));
             }
         }
@@ -31735,7 +33716,7 @@ var ts;
             if ((ts.getCombinedNodeFlags(node) & 3) !== 0 || ts.isParameterDeclaration(node)) {
                 return;
             }
-            if (node.kind === 219 && !node.initializer) {
+            if (node.kind === 223 && !node.initializer) {
                 return;
             }
             var symbol = getSymbolOfNode(node);
@@ -31745,25 +33726,25 @@ var ts;
                     localDeclarationSymbol !== symbol &&
                     localDeclarationSymbol.flags & 2) {
                     if (getDeclarationNodeFlagsFromSymbol(localDeclarationSymbol) & 3) {
-                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 220);
-                        var container = varDeclList.parent.kind === 201 && varDeclList.parent.parent
+                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 224);
+                        var container = varDeclList.parent.kind === 205 && varDeclList.parent.parent
                             ? varDeclList.parent.parent
                             : undefined;
                         var namesShareScope = container &&
-                            (container.kind === 200 && ts.isFunctionLike(container.parent) ||
-                                container.kind === 227 ||
-                                container.kind === 226 ||
-                                container.kind === 256);
+                            (container.kind === 204 && ts.isFunctionLike(container.parent) ||
+                                container.kind === 231 ||
+                                container.kind === 230 ||
+                                container.kind === 261);
                         if (!namesShareScope) {
-                            var name_20 = symbolToString(localDeclarationSymbol);
-                            error(node, ts.Diagnostics.Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1, name_20, name_20);
+                            var name_26 = symbolToString(localDeclarationSymbol);
+                            error(node, ts.Diagnostics.Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1, name_26, name_26);
                         }
                     }
                 }
             }
         }
         function checkParameterInitializer(node) {
-            if (ts.getRootDeclaration(node).kind !== 143) {
+            if (ts.getRootDeclaration(node).kind !== 144) {
                 return;
             }
             var func = ts.getContainingFunction(node);
@@ -31772,7 +33753,7 @@ var ts;
                 if (ts.isTypeNode(n) || ts.isDeclarationName(n)) {
                     return;
                 }
-                if (n.kind === 173) {
+                if (n.kind === 177) {
                     return visit(n.expression);
                 }
                 else if (n.kind === 70) {
@@ -31786,7 +33767,7 @@ var ts;
                     }
                     var enclosingContainer = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
                     if (enclosingContainer === func) {
-                        if (symbol.valueDeclaration.kind === 143) {
+                        if (symbol.valueDeclaration.kind === 144) {
                             if (symbol.valueDeclaration.pos < node.pos) {
                                 return;
                             }
@@ -31795,7 +33776,7 @@ var ts;
                                 if (ts.isFunctionLike(current.parent)) {
                                     return;
                                 }
-                                if (current.parent.kind === 146 &&
+                                if (current.parent.kind === 147 &&
                                     !(ts.hasModifier(current.parent, 32)) &&
                                     ts.isClassLike(current.parent.parent)) {
                                     return;
@@ -31817,33 +33798,34 @@ var ts;
         function checkVariableLikeDeclaration(node) {
             checkDecorators(node);
             checkSourceElement(node.type);
-            if (node.name.kind === 141) {
+            if (node.name.kind === 142) {
                 checkComputedPropertyName(node.name);
                 if (node.initializer) {
                     checkExpressionCached(node.initializer);
                 }
             }
-            if (node.kind === 170) {
-                if (node.propertyName && node.propertyName.kind === 141) {
+            if (node.kind === 174) {
+                if (node.propertyName && node.propertyName.kind === 142) {
                     checkComputedPropertyName(node.propertyName);
                 }
-                var parent_13 = node.parent.parent;
-                var parentType = getTypeForBindingElementParent(parent_13);
-                var name_21 = node.propertyName || node.name;
-                var property = getPropertyOfType(parentType, getTextOfPropertyName(name_21));
-                if (parent_13.initializer && property && getParentOfSymbol(property)) {
-                    checkClassPropertyAccess(parent_13, parent_13.initializer, parentType, property);
+                var parent_11 = node.parent.parent;
+                var parentType = getTypeForBindingElementParent(parent_11);
+                var name_27 = node.propertyName || node.name;
+                var property = getPropertyOfType(parentType, ts.getTextOfPropertyName(name_27));
+                markPropertyAsReferenced(property);
+                if (parent_11.initializer && property && getParentOfSymbol(property)) {
+                    checkClassPropertyAccess(parent_11, parent_11.initializer, parentType, property);
                 }
             }
             if (ts.isBindingPattern(node.name)) {
                 ts.forEach(node.name.elements, checkSourceElement);
             }
-            if (node.initializer && ts.getRootDeclaration(node).kind === 143 && ts.nodeIsMissing(ts.getContainingFunction(node).body)) {
+            if (node.initializer && ts.getRootDeclaration(node).kind === 144 && 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 !== 208) {
+                if (node.initializer && node.parent.parent.kind !== 212) {
                     checkTypeAssignableTo(checkExpressionCached(node.initializer), getWidenedTypeForVariableLikeDeclaration(node), node, undefined);
                     checkParameterInitializer(node);
                 }
@@ -31852,7 +33834,7 @@ var ts;
             var symbol = getSymbolOfNode(node);
             var type = convertAutoToAny(getTypeOfVariableOrParameterOrProperty(symbol));
             if (node === symbol.valueDeclaration) {
-                if (node.initializer && node.parent.parent.kind !== 208) {
+                if (node.initializer && node.parent.parent.kind !== 212) {
                     checkTypeAssignableTo(checkExpressionCached(node.initializer), type, node, undefined);
                     checkParameterInitializer(node);
                 }
@@ -31870,9 +33852,9 @@ var ts;
                     error(node.name, ts.Diagnostics.All_declarations_of_0_must_have_identical_modifiers, ts.declarationNameToString(node.name));
                 }
             }
-            if (node.kind !== 146 && node.kind !== 145) {
+            if (node.kind !== 147 && node.kind !== 146) {
                 checkExportsOnMergedDeclarations(node);
-                if (node.kind === 219 || node.kind === 170) {
+                if (node.kind === 223 || node.kind === 174) {
                     checkVarDeclaredNamesNotShadowed(node);
                 }
                 checkCollisionWithCapturedSuperVariable(node, node.name);
@@ -31882,8 +33864,8 @@ var ts;
             }
         }
         function areDeclarationFlagsIdentical(left, right) {
-            if ((left.kind === 143 && right.kind === 219) ||
-                (left.kind === 219 && right.kind === 143)) {
+            if ((left.kind === 144 && right.kind === 223) ||
+                (left.kind === 223 && right.kind === 144)) {
                 return true;
             }
             if (ts.hasQuestionToken(left) !== ts.hasQuestionToken(right)) {
@@ -31910,7 +33892,7 @@ var ts;
             ts.forEach(node.declarationList.declarations, checkSourceElement);
         }
         function checkGrammarDisallowedModifiersOnObjectLiteralExpressionMethod(node) {
-            if (node.modifiers && node.parent.kind === 172) {
+            if (node.modifiers && node.parent.kind === 176) {
                 if (ts.isAsyncFunctionLike(node)) {
                     if (node.modifiers.length > 1) {
                         return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
@@ -31929,7 +33911,7 @@ var ts;
             checkGrammarStatementInAmbientContext(node);
             checkExpression(node.expression);
             checkSourceElement(node.thenStatement);
-            if (node.thenStatement.kind === 202) {
+            if (node.thenStatement.kind === 206) {
                 error(node.thenStatement, ts.Diagnostics.The_body_of_an_if_statement_cannot_be_the_empty_statement);
             }
             checkSourceElement(node.elseStatement);
@@ -31946,12 +33928,12 @@ var ts;
         }
         function checkForStatement(node) {
             if (!checkGrammarStatementInAmbientContext(node)) {
-                if (node.initializer && node.initializer.kind === 220) {
+                if (node.initializer && node.initializer.kind === 224) {
                     checkGrammarVariableDeclarationList(node.initializer);
                 }
             }
             if (node.initializer) {
-                if (node.initializer.kind === 220) {
+                if (node.initializer.kind === 224) {
                     ts.forEach(node.initializer.declarations, checkVariableDeclaration);
                 }
                 else {
@@ -31969,18 +33951,18 @@ var ts;
         }
         function checkForOfStatement(node) {
             checkGrammarForInOrForOfStatement(node);
-            if (node.initializer.kind === 220) {
+            if (node.initializer.kind === 224) {
                 checkForInOrForOfVariableDeclaration(node);
             }
             else {
                 var varExpr = node.initializer;
                 var iteratedType = checkRightHandSideOfForOf(node.expression);
-                if (varExpr.kind === 171 || varExpr.kind === 172) {
+                if (varExpr.kind === 175 || varExpr.kind === 176) {
                     checkDestructuringAssignment(varExpr, iteratedType || unknownType);
                 }
                 else {
                     var leftType = checkExpression(varExpr);
-                    checkReferenceExpression(varExpr, ts.Diagnostics.Invalid_left_hand_side_in_for_of_statement, ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_be_a_constant_or_a_read_only_property);
+                    checkReferenceExpression(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_must_be_a_variable_or_a_property_access);
                     if (iteratedType) {
                         checkTypeAssignableTo(iteratedType, leftType, varExpr, undefined);
                     }
@@ -31993,7 +33975,7 @@ var ts;
         }
         function checkForInStatement(node) {
             checkGrammarForInOrForOfStatement(node);
-            if (node.initializer.kind === 220) {
+            if (node.initializer.kind === 224) {
                 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);
@@ -32003,18 +33985,18 @@ var ts;
             else {
                 var varExpr = node.initializer;
                 var leftType = checkExpression(varExpr);
-                if (varExpr.kind === 171 || varExpr.kind === 172) {
+                if (varExpr.kind === 175 || varExpr.kind === 176) {
                     error(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
                 }
                 else if (!isTypeAnyOrAllConstituentTypesHaveKind(leftType, 34)) {
                     error(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any);
                 }
                 else {
-                    checkReferenceExpression(varExpr, ts.Diagnostics.Invalid_left_hand_side_in_for_in_statement, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_constant_or_a_read_only_property);
+                    checkReferenceExpression(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_must_be_a_variable_or_a_property_access);
                 }
             }
             var rightType = checkNonNullExpression(node.expression);
-            if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, 2588672 | 16384)) {
+            if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, 32768 | 16384)) {
                 error(node.expression, ts.Diagnostics.The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter);
             }
             checkSourceElement(node.statement);
@@ -32067,7 +34049,7 @@ var ts;
             }
             var typeAsIterable = type;
             if (!typeAsIterable.iterableElementType) {
-                if ((type.flags & 131072) && type.target === getGlobalIterableType()) {
+                if ((getObjectFlags(type) & 4) && type.target === getGlobalIterableType()) {
                     typeAsIterable.iterableElementType = type.typeArguments[0];
                 }
                 else {
@@ -32093,7 +34075,7 @@ var ts;
             }
             var typeAsIterator = type;
             if (!typeAsIterator.iteratorElementType) {
-                if ((type.flags & 131072) && type.target === getGlobalIteratorType()) {
+                if ((getObjectFlags(type) & 4) && type.target === getGlobalIteratorType()) {
                     typeAsIterator.iteratorElementType = type.typeArguments[0];
                 }
                 else {
@@ -32128,7 +34110,7 @@ var ts;
             if (isTypeAny(type)) {
                 return undefined;
             }
-            if ((type.flags & 131072) && type.target === getGlobalIterableIteratorType()) {
+            if ((getObjectFlags(type) & 4) && type.target === getGlobalIterableIteratorType()) {
                 return type.typeArguments[0];
             }
             return getElementTypeOfIterable(type, undefined) ||
@@ -32137,8 +34119,12 @@ var ts;
         function checkElementTypeOfArrayOrString(arrayOrStringType, errorNode) {
             ts.Debug.assert(languageVersion < 2);
             var arrayType = arrayOrStringType;
-            if (arrayOrStringType.flags & 524288) {
-                arrayType = getUnionType(ts.filter(arrayOrStringType.types, function (t) { return !(t.flags & 34); }), true);
+            if (arrayOrStringType.flags & 65536) {
+                var arrayTypes = arrayOrStringType.types;
+                var filteredTypes = ts.filter(arrayTypes, function (t) { return !(t.flags & 34); });
+                if (filteredTypes !== arrayTypes) {
+                    arrayType = getUnionType(filteredTypes, true);
+                }
             }
             else if (arrayOrStringType.flags & 34) {
                 arrayType = neverType;
@@ -32176,7 +34162,7 @@ var ts;
             checkGrammarStatementInAmbientContext(node) || checkGrammarBreakOrContinueStatement(node);
         }
         function isGetAccessorWithAnnotatedSetAccessor(node) {
-            return !!(node.kind === 150 && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(node.symbol, 151)));
+            return !!(node.kind === 151 && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(node.symbol, 152)));
         }
         function isUnwrappedReturnTypeVoidOrAny(func, returnType) {
             var unwrappedReturnType = ts.isAsyncFunctionLike(func) ? getPromisedType(returnType) : returnType;
@@ -32198,12 +34184,12 @@ var ts;
                     if (func.asteriskToken) {
                         return;
                     }
-                    if (func.kind === 151) {
+                    if (func.kind === 152) {
                         if (node.expression) {
                             error(node.expression, ts.Diagnostics.Setters_cannot_return_a_value);
                         }
                     }
-                    else if (func.kind === 149) {
+                    else if (func.kind === 150) {
                         if (node.expression && !checkTypeAssignableTo(exprType, returnType, node.expression)) {
                             error(node.expression, ts.Diagnostics.Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class);
                         }
@@ -32221,14 +34207,14 @@ var ts;
                         }
                     }
                 }
-                else if (func.kind !== 149 && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(func, returnType)) {
+                else if (func.kind !== 150 && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(func, returnType)) {
                     error(node, ts.Diagnostics.Not_all_code_paths_return_a_value);
                 }
             }
         }
         function checkWithStatement(node) {
             if (!checkGrammarStatementInAmbientContext(node)) {
-                if (node.flags & 262144) {
+                if (node.flags & 524288) {
                     grammarErrorOnFirstToken(node, ts.Diagnostics.with_statements_are_not_allowed_in_an_async_function_block);
                 }
             }
@@ -32245,8 +34231,9 @@ var ts;
             var firstDefaultClause;
             var hasDuplicateDefaultClause = false;
             var expressionType = checkExpression(node.expression);
+            var expressionIsLiteral = isLiteralType(expressionType);
             ts.forEach(node.caseBlock.clauses, function (clause) {
-                if (clause.kind === 250 && !hasDuplicateDefaultClause) {
+                if (clause.kind === 254 && !hasDuplicateDefaultClause) {
                     if (firstDefaultClause === undefined) {
                         firstDefaultClause = clause;
                     }
@@ -32258,11 +34245,17 @@ var ts;
                         hasDuplicateDefaultClause = true;
                     }
                 }
-                if (produceDiagnostics && clause.kind === 249) {
+                if (produceDiagnostics && clause.kind === 253) {
                     var caseClause = clause;
                     var caseType = checkExpression(caseClause.expression);
-                    if (!isTypeEqualityComparableTo(expressionType, caseType)) {
-                        checkTypeComparableTo(caseType, expressionType, caseClause.expression, undefined);
+                    var caseIsLiteral = isLiteralType(caseType);
+                    var comparedExpressionType = expressionType;
+                    if (!caseIsLiteral || !expressionIsLiteral) {
+                        caseType = caseIsLiteral ? getBaseTypeOfLiteralType(caseType) : caseType;
+                        comparedExpressionType = getBaseTypeOfLiteralType(expressionType);
+                    }
+                    if (!isTypeEqualityComparableTo(comparedExpressionType, caseType)) {
+                        checkTypeComparableTo(caseType, comparedExpressionType, caseClause.expression, undefined);
                     }
                 }
                 ts.forEach(clause.statements, checkSourceElement);
@@ -32278,7 +34271,7 @@ var ts;
                     if (ts.isFunctionLike(current)) {
                         break;
                     }
-                    if (current.kind === 215 && current.label.text === node.label.text) {
+                    if (current.kind === 219 && current.label.text === node.label.text) {
                         var sourceFile = ts.getSourceFileOfNode(node);
                         grammarErrorOnNode(node.label, ts.Diagnostics.Duplicate_label_0, ts.getTextOfNodeFromSourceText(sourceFile.text, node.label));
                         break;
@@ -32304,22 +34297,20 @@ var ts;
             var catchClause = node.catchClause;
             if (catchClause) {
                 if (catchClause.variableDeclaration) {
-                    if (catchClause.variableDeclaration.name.kind !== 70) {
-                        grammarErrorOnFirstToken(catchClause.variableDeclaration.name, ts.Diagnostics.Catch_clause_variable_name_must_be_an_identifier);
-                    }
-                    else if (catchClause.variableDeclaration.type) {
+                    if (catchClause.variableDeclaration.type) {
                         grammarErrorOnFirstToken(catchClause.variableDeclaration.type, ts.Diagnostics.Catch_clause_variable_cannot_have_a_type_annotation);
                     }
                     else if (catchClause.variableDeclaration.initializer) {
                         grammarErrorOnFirstToken(catchClause.variableDeclaration.initializer, ts.Diagnostics.Catch_clause_variable_cannot_have_an_initializer);
                     }
                     else {
-                        var identifierName = catchClause.variableDeclaration.name.text;
-                        var locals = catchClause.block.locals;
-                        if (locals) {
-                            var localSymbol = locals[identifierName];
-                            if (localSymbol && (localSymbol.flags & 2) !== 0) {
-                                grammarErrorOnNode(localSymbol.valueDeclaration, ts.Diagnostics.Cannot_redeclare_identifier_0_in_catch_clause, identifierName);
+                        var blockLocals = catchClause.block.locals;
+                        if (blockLocals) {
+                            for (var caughtName in catchClause.locals) {
+                                var blockLocal = blockLocals[caughtName];
+                                if (blockLocal && (blockLocal.flags & 2) !== 0) {
+                                    grammarErrorOnNode(blockLocal.valueDeclaration, ts.Diagnostics.Cannot_redeclare_identifier_0_in_catch_clause, caughtName);
+                                }
                             }
                         }
                     }
@@ -32341,7 +34332,7 @@ var ts;
                     checkIndexConstraintForProperty(prop, propType, type, declaredStringIndexer, stringIndexType, 0);
                     checkIndexConstraintForProperty(prop, propType, type, declaredNumberIndexer, numberIndexType, 1);
                 });
-                if (type.flags & 32768 && ts.isClassLike(type.symbol.valueDeclaration)) {
+                if (getObjectFlags(type) & 1 && ts.isClassLike(type.symbol.valueDeclaration)) {
                     var classDeclaration = type.symbol.valueDeclaration;
                     for (var _i = 0, _a = classDeclaration.members; _i < _a.length; _i++) {
                         var member = _a[_i];
@@ -32356,7 +34347,7 @@ var ts;
             var errorNode;
             if (stringIndexType && numberIndexType) {
                 errorNode = declaredNumberIndexer || declaredStringIndexer;
-                if (!errorNode && (type.flags & 65536)) {
+                if (!errorNode && (getObjectFlags(type) & 2)) {
                     var someBaseTypeHasBothIndexers = ts.forEach(getBaseTypes(type), function (base) { return getIndexTypeOfType(base, 0) && getIndexTypeOfType(base, 1); });
                     errorNode = someBaseTypeHasBothIndexers ? undefined : type.symbol.declarations[0];
                 }
@@ -32372,13 +34363,13 @@ var ts;
                     return;
                 }
                 var errorNode;
-                if (prop.valueDeclaration.name.kind === 141 || prop.parent === containingType.symbol) {
+                if (prop.valueDeclaration.name.kind === 142 || prop.parent === containingType.symbol) {
                     errorNode = prop.valueDeclaration;
                 }
                 else if (indexDeclaration) {
                     errorNode = indexDeclaration;
                 }
-                else if (containingType.flags & 65536) {
+                else if (getObjectFlags(containingType) & 2) {
                     var someBaseClassHasBothPropertyAndIndexer = ts.forEach(getBaseTypes(containingType), function (base) { return getPropertyOfObjectType(base, prop.name) && getIndexTypeOfType(base, indexKind); });
                     errorNode = someBaseClassHasBothPropertyAndIndexer ? undefined : containingType.symbol.declarations[0];
                 }
@@ -32423,7 +34414,7 @@ var ts;
             var firstDecl;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 222 || declaration.kind === 223) {
+                if (declaration.kind === 226 || declaration.kind === 227) {
                     if (!firstDecl) {
                         firstDecl = declaration;
                     }
@@ -32486,7 +34477,9 @@ var ts;
                     }
                     checkTypeAssignableTo(typeWithThis, getTypeWithThisArgument(baseType_1, type.thisType), node.name || node, ts.Diagnostics.Class_0_incorrectly_extends_base_class_1);
                     checkTypeAssignableTo(staticType, getTypeWithoutSignatures(staticBaseType), node.name || node, ts.Diagnostics.Class_static_side_0_incorrectly_extends_base_class_static_side_1);
-                    if (baseType_1.symbol.valueDeclaration && !ts.isInAmbientContext(baseType_1.symbol.valueDeclaration)) {
+                    if (baseType_1.symbol.valueDeclaration &&
+                        !ts.isInAmbientContext(baseType_1.symbol.valueDeclaration) &&
+                        baseType_1.symbol.valueDeclaration.kind === 226) {
                         if (!isBlockScopedNameDeclaredBeforeUse(baseType_1.symbol.valueDeclaration, node)) {
                             error(baseTypeNode, ts.Diagnostics.A_class_must_be_declared_after_its_base_class);
                         }
@@ -32511,8 +34504,8 @@ var ts;
                     if (produceDiagnostics) {
                         var t = getTypeFromTypeNode(typeRefNode);
                         if (t !== unknownType) {
-                            var declaredType = (t.flags & 131072) ? t.target : t;
-                            if (declaredType.flags & (32768 | 65536)) {
+                            var declaredType = getObjectFlags(t) & 4 ? t.target : t;
+                            if (getObjectFlags(declaredType) & 3) {
                                 checkTypeAssignableTo(typeWithThis, getTypeWithThisArgument(t, type.thisType), node.name || node, ts.Diagnostics.Class_0_incorrectly_implements_interface_1);
                             }
                             else {
@@ -32534,7 +34527,7 @@ var ts;
                 if (declaration && ts.getModifierFlags(declaration) & 8) {
                     var typeClassDeclaration = getClassLikeDeclarationOfSymbol(type.symbol);
                     if (!isNodeWithinClass(node, typeClassDeclaration)) {
-                        error(node, ts.Diagnostics.Cannot_extend_a_class_0_Class_constructor_is_marked_as_private, node.expression.text);
+                        error(node, ts.Diagnostics.Cannot_extend_a_class_0_Class_constructor_is_marked_as_private, getFullyQualifiedName(type.symbol));
                     }
                 }
             }
@@ -32560,7 +34553,7 @@ var ts;
                     if (derived === base) {
                         var derivedClassDecl = getClassLikeDeclarationOfSymbol(type.symbol);
                         if (baseDeclarationFlags & 128 && (!derivedClassDecl || !(ts.getModifierFlags(derivedClassDecl) & 128))) {
-                            if (derivedClassDecl.kind === 193) {
+                            if (derivedClassDecl.kind === 197) {
                                 error(derivedClassDecl, ts.Diagnostics.Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1, symbolToString(baseProperty), typeToString(baseType));
                             }
                             else {
@@ -32604,7 +34597,7 @@ var ts;
             }
         }
         function isAccessor(kind) {
-            return kind === 150 || kind === 151;
+            return kind === 151 || kind === 152;
         }
         function areTypeParametersIdentical(list1, list2) {
             if (!list1 && !list2) {
@@ -32642,8 +34635,8 @@ var ts;
             for (var _i = 0, baseTypes_2 = baseTypes; _i < baseTypes_2.length; _i++) {
                 var base = baseTypes_2[_i];
                 var properties = getPropertiesOfObjectType(getTypeWithThisArgument(base, type.thisType));
-                for (var _a = 0, properties_5 = properties; _a < properties_5.length; _a++) {
-                    var prop = properties_5[_a];
+                for (var _a = 0, properties_6 = properties; _a < properties_6.length; _a++) {
+                    var prop = properties_6[_a];
                     var existing = seen[prop.name];
                     if (!existing) {
                         seen[prop.name] = { prop: prop, containingType: base };
@@ -32671,7 +34664,7 @@ var ts;
                 checkExportsOnMergedDeclarations(node);
                 var symbol = getSymbolOfNode(node);
                 checkTypeParameterListsIdentical(node, symbol);
-                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 223);
+                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 227);
                 if (node === firstInterfaceDecl) {
                     var type = getDeclaredTypeOfSymbol(symbol);
                     var typeWithThis = getTypeWithThisArgument(type);
@@ -32700,6 +34693,7 @@ var ts;
         function checkTypeAliasDeclaration(node) {
             checkGrammarDecorators(node) || checkGrammarModifiers(node);
             checkTypeNameIsReserved(node.name, ts.Diagnostics.Type_alias_name_cannot_be_0);
+            checkTypeParameters(node.typeParameters);
             checkSourceElement(node.type);
         }
         function computeEnumMemberValues(node) {
@@ -32716,7 +34710,7 @@ var ts;
                         error(member.name, ts.Diagnostics.Computed_property_names_are_not_allowed_in_enums);
                     }
                     else {
-                        var text = getTextOfPropertyName(member.name);
+                        var text = ts.getTextOfPropertyName(member.name);
                         if (isNumericLiteralName(text) && !isInfinityOrNaNString(text)) {
                             error(member.name, ts.Diagnostics.An_enum_member_cannot_have_a_numeric_name);
                         }
@@ -32766,7 +34760,7 @@ var ts;
                 return value;
                 function evalConstant(e) {
                     switch (e.kind) {
-                        case 186:
+                        case 190:
                             var value_1 = evalConstant(e.operand);
                             if (value_1 === undefined) {
                                 return undefined;
@@ -32777,7 +34771,7 @@ var ts;
                                 case 51: return ~value_1;
                             }
                             return undefined;
-                        case 188:
+                        case 192:
                             var left = evalConstant(e.left);
                             if (left === undefined) {
                                 return undefined;
@@ -32802,11 +34796,11 @@ var ts;
                             return undefined;
                         case 8:
                             return +e.text;
-                        case 179:
+                        case 183:
                             return evalConstant(e.expression);
                         case 70:
-                        case 174:
-                        case 173:
+                        case 178:
+                        case 177:
                             var member = initializer.parent;
                             var currentType = getTypeOfSymbol(getSymbolOfNode(member.parent));
                             var enumType_1;
@@ -32817,7 +34811,7 @@ var ts;
                             }
                             else {
                                 var expression = void 0;
-                                if (e.kind === 174) {
+                                if (e.kind === 178) {
                                     if (e.argumentExpression === undefined ||
                                         e.argumentExpression.kind !== 9) {
                                         return undefined;
@@ -32834,7 +34828,7 @@ var ts;
                                     if (current.kind === 70) {
                                         break;
                                     }
-                                    else if (current.kind === 173) {
+                                    else if (current.kind === 177) {
                                         current = current.expression;
                                     }
                                     else {
@@ -32894,7 +34888,7 @@ var ts;
                 }
                 var seenEnumMissingInitialInitializer_1 = false;
                 ts.forEach(enumSymbol.declarations, function (declaration) {
-                    if (declaration.kind !== 225) {
+                    if (declaration.kind !== 229) {
                         return false;
                     }
                     var enumDeclaration = declaration;
@@ -32917,8 +34911,8 @@ var ts;
             var declarations = symbol.declarations;
             for (var _i = 0, declarations_5 = declarations; _i < declarations_5.length; _i++) {
                 var declaration = declarations_5[_i];
-                if ((declaration.kind === 222 ||
-                    (declaration.kind === 221 && ts.nodeIsPresent(declaration.body))) &&
+                if ((declaration.kind === 226 ||
+                    (declaration.kind === 225 && ts.nodeIsPresent(declaration.body))) &&
                     !ts.isInAmbientContext(declaration)) {
                     return declaration;
                 }
@@ -32977,7 +34971,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, 222);
+                    var mergedClass = ts.getDeclarationOfKind(symbol, 226);
                     if (mergedClass &&
                         inSameLexicalScope(node, mergedClass)) {
                         getNodeLinks(node).flags |= 32768;
@@ -33020,36 +35014,36 @@ var ts;
         }
         function checkModuleAugmentationElement(node, isGlobalAugmentation) {
             switch (node.kind) {
-                case 201:
+                case 205:
                     for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
                         var decl = _a[_i];
                         checkModuleAugmentationElement(decl, isGlobalAugmentation);
                     }
                     break;
-                case 236:
-                case 237:
+                case 240:
+                case 241:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Exports_and_export_assignments_are_not_permitted_in_module_augmentations);
                     break;
-                case 230:
-                case 231:
+                case 234:
+                case 235:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_module);
                     break;
-                case 170:
-                case 219:
-                    var name_22 = node.name;
-                    if (ts.isBindingPattern(name_22)) {
-                        for (var _b = 0, _c = name_22.elements; _b < _c.length; _b++) {
+                case 174:
+                case 223:
+                    var name_28 = node.name;
+                    if (ts.isBindingPattern(name_28)) {
+                        for (var _b = 0, _c = name_28.elements; _b < _c.length; _b++) {
                             var el = _c[_b];
                             checkModuleAugmentationElement(el, isGlobalAugmentation);
                         }
                         break;
                     }
-                case 222:
-                case 225:
-                case 221:
-                case 223:
                 case 226:
-                case 224:
+                case 229:
+                case 225:
+                case 227:
+                case 230:
+                case 228:
                     if (isGlobalAugmentation) {
                         return;
                     }
@@ -33067,12 +35061,12 @@ var ts;
             switch (node.kind) {
                 case 70:
                     return node;
-                case 140:
+                case 141:
                     do {
                         node = node.left;
                     } while (node.kind !== 70);
                     return node;
-                case 173:
+                case 177:
                     do {
                         node = node.expression;
                     } while (node.kind !== 70);
@@ -33085,9 +35079,9 @@ var ts;
                 error(moduleName, ts.Diagnostics.String_literal_expected);
                 return false;
             }
-            var inAmbientExternalModule = node.parent.kind === 227 && ts.isAmbientModule(node.parent.parent);
-            if (node.parent.kind !== 256 && !inAmbientExternalModule) {
-                error(moduleName, node.kind === 237 ?
+            var inAmbientExternalModule = node.parent.kind === 231 && ts.isAmbientModule(node.parent.parent);
+            if (node.parent.kind !== 261 && !inAmbientExternalModule) {
+                error(moduleName, node.kind === 241 ?
                     ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace :
                     ts.Diagnostics.Import_declarations_in_a_namespace_cannot_reference_a_module);
                 return false;
@@ -33108,7 +35102,7 @@ var ts;
                     (symbol.flags & 793064 ? 793064 : 0) |
                     (symbol.flags & 1920 ? 1920 : 0);
                 if (target.flags & excludedMeanings) {
-                    var message = node.kind === 239 ?
+                    var message = node.kind === 243 ?
                         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));
@@ -33135,7 +35129,7 @@ var ts;
                         checkImportBinding(importClause);
                     }
                     if (importClause.namedBindings) {
-                        if (importClause.namedBindings.kind === 233) {
+                        if (importClause.namedBindings.kind === 237) {
                             checkImportBinding(importClause.namedBindings);
                         }
                         else {
@@ -33186,8 +35180,8 @@ var ts;
             if (!node.moduleSpecifier || checkExternalImportOrExportDeclaration(node)) {
                 if (node.exportClause) {
                     ts.forEach(node.exportClause.elements, checkExportSpecifier);
-                    var inAmbientExternalModule = node.parent.kind === 227 && ts.isAmbientModule(node.parent.parent);
-                    if (node.parent.kind !== 256 && !inAmbientExternalModule) {
+                    var inAmbientExternalModule = node.parent.kind === 231 && ts.isAmbientModule(node.parent.parent);
+                    if (node.parent.kind !== 261 && !inAmbientExternalModule) {
                         error(node, ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace);
                     }
                 }
@@ -33200,7 +35194,7 @@ var ts;
             }
         }
         function checkGrammarModuleElementContext(node, errorMessage) {
-            var isInAppropriateContext = node.parent.kind === 256 || node.parent.kind === 227 || node.parent.kind === 226;
+            var isInAppropriateContext = node.parent.kind === 261 || node.parent.kind === 231 || node.parent.kind === 230;
             if (!isInAppropriateContext) {
                 grammarErrorOnFirstToken(node, errorMessage);
             }
@@ -33223,8 +35217,8 @@ var ts;
             if (checkGrammarModuleElementContext(node, ts.Diagnostics.An_export_assignment_can_only_be_used_in_a_module)) {
                 return;
             }
-            var container = node.parent.kind === 256 ? node.parent : node.parent.parent;
-            if (container.kind === 226 && !ts.isAmbientModule(container)) {
+            var container = node.parent.kind === 261 ? node.parent : node.parent.parent;
+            if (container.kind === 230 && !ts.isAmbientModule(container)) {
                 error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_namespace);
                 return;
             }
@@ -33291,7 +35285,7 @@ var ts;
                 links.exportsChecked = true;
             }
             function isNotOverload(declaration) {
-                return (declaration.kind !== 221 && declaration.kind !== 148) ||
+                return (declaration.kind !== 225 && declaration.kind !== 149) ||
                     !!declaration.body;
             }
         }
@@ -33302,118 +35296,123 @@ var ts;
             var kind = node.kind;
             if (cancellationToken) {
                 switch (kind) {
+                    case 230:
                     case 226:
-                    case 222:
-                    case 223:
-                    case 221:
+                    case 227:
+                    case 225:
                         cancellationToken.throwIfCancellationRequested();
                 }
             }
             switch (kind) {
-                case 142:
-                    return checkTypeParameter(node);
                 case 143:
+                    return checkTypeParameter(node);
+                case 144:
                     return checkParameter(node);
+                case 147:
                 case 146:
-                case 145:
                     return checkPropertyDeclaration(node);
-                case 157:
                 case 158:
-                case 152:
+                case 159:
                 case 153:
-                    return checkSignatureDeclaration(node);
                 case 154:
                     return checkSignatureDeclaration(node);
-                case 148:
-                case 147:
-                    return checkMethodDeclaration(node);
-                case 149:
-                    return checkConstructorDeclaration(node);
-                case 150:
-                case 151:
-                    return checkAccessorDeclaration(node);
-                case 156:
-                    return checkTypeReferenceNode(node);
                 case 155:
+                    return checkSignatureDeclaration(node);
+                case 149:
+                case 148:
+                    return checkMethodDeclaration(node);
+                case 150:
+                    return checkConstructorDeclaration(node);
+                case 151:
+                case 152:
+                    return checkAccessorDeclaration(node);
+                case 157:
+                    return checkTypeReferenceNode(node);
+                case 156:
                     return checkTypePredicate(node);
-                case 159:
-                    return checkTypeQuery(node);
                 case 160:
-                    return checkTypeLiteral(node);
+                    return checkTypeQuery(node);
                 case 161:
-                    return checkArrayType(node);
+                    return checkTypeLiteral(node);
                 case 162:
-                    return checkTupleType(node);
+                    return checkArrayType(node);
                 case 163:
+                    return checkTupleType(node);
                 case 164:
-                    return checkUnionOrIntersectionType(node);
                 case 165:
+                    return checkUnionOrIntersectionType(node);
+                case 166:
+                case 168:
                     return checkSourceElement(node.type);
-                case 221:
-                    return checkFunctionDeclaration(node);
-                case 200:
-                case 227:
-                    return checkBlock(node);
-                case 201:
-                    return checkVariableStatement(node);
-                case 203:
-                    return checkExpressionStatement(node);
-                case 204:
-                    return checkIfStatement(node);
-                case 205:
-                    return checkDoStatement(node);
-                case 206:
-                    return checkWhileStatement(node);
-                case 207:
-                    return checkForStatement(node);
-                case 208:
-                    return checkForInStatement(node);
-                case 209:
-                    return checkForOfStatement(node);
-                case 210:
-                case 211:
-                    return checkBreakOrContinueStatement(node);
-                case 212:
-                    return checkReturnStatement(node);
-                case 213:
-                    return checkWithStatement(node);
-                case 214:
-                    return checkSwitchStatement(node);
-                case 215:
-                    return checkLabeledStatement(node);
-                case 216:
-                    return checkThrowStatement(node);
-                case 217:
-                    return checkTryStatement(node);
-                case 219:
-                    return checkVariableDeclaration(node);
+                case 169:
+                    return checkIndexedAccessType(node);
                 case 170:
-                    return checkBindingElement(node);
-                case 222:
-                    return checkClassDeclaration(node);
-                case 223:
-                    return checkInterfaceDeclaration(node);
-                case 224:
-                    return checkTypeAliasDeclaration(node);
+                    return checkMappedType(node);
                 case 225:
-                    return checkEnumDeclaration(node);
-                case 226:
-                    return checkModuleDeclaration(node);
+                    return checkFunctionDeclaration(node);
+                case 204:
                 case 231:
-                    return checkImportDeclaration(node);
-                case 230:
-                    return checkImportEqualsDeclaration(node);
-                case 237:
-                    return checkExportDeclaration(node);
-                case 236:
-                    return checkExportAssignment(node);
-                case 202:
-                    checkGrammarStatementInAmbientContext(node);
-                    return;
+                    return checkBlock(node);
+                case 205:
+                    return checkVariableStatement(node);
+                case 207:
+                    return checkExpressionStatement(node);
+                case 208:
+                    return checkIfStatement(node);
+                case 209:
+                    return checkDoStatement(node);
+                case 210:
+                    return checkWhileStatement(node);
+                case 211:
+                    return checkForStatement(node);
+                case 212:
+                    return checkForInStatement(node);
+                case 213:
+                    return checkForOfStatement(node);
+                case 214:
+                case 215:
+                    return checkBreakOrContinueStatement(node);
+                case 216:
+                    return checkReturnStatement(node);
+                case 217:
+                    return checkWithStatement(node);
                 case 218:
+                    return checkSwitchStatement(node);
+                case 219:
+                    return checkLabeledStatement(node);
+                case 220:
+                    return checkThrowStatement(node);
+                case 221:
+                    return checkTryStatement(node);
+                case 223:
+                    return checkVariableDeclaration(node);
+                case 174:
+                    return checkBindingElement(node);
+                case 226:
+                    return checkClassDeclaration(node);
+                case 227:
+                    return checkInterfaceDeclaration(node);
+                case 228:
+                    return checkTypeAliasDeclaration(node);
+                case 229:
+                    return checkEnumDeclaration(node);
+                case 230:
+                    return checkModuleDeclaration(node);
+                case 235:
+                    return checkImportDeclaration(node);
+                case 234:
+                    return checkImportEqualsDeclaration(node);
+                case 241:
+                    return checkExportDeclaration(node);
+                case 240:
+                    return checkExportAssignment(node);
+                case 206:
                     checkGrammarStatementInAmbientContext(node);
                     return;
-                case 240:
+                case 222:
+                    checkGrammarStatementInAmbientContext(node);
+                    return;
+                case 244:
                     return checkMissingDeclaration(node);
             }
         }
@@ -33426,17 +35425,17 @@ var ts;
             for (var _i = 0, deferredNodes_1 = deferredNodes; _i < deferredNodes_1.length; _i++) {
                 var node = deferredNodes_1[_i];
                 switch (node.kind) {
-                    case 180:
-                    case 181:
+                    case 184:
+                    case 185:
+                    case 149:
                     case 148:
-                    case 147:
                         checkFunctionExpressionOrObjectLiteralMethodDeferred(node);
                         break;
-                    case 150:
                     case 151:
+                    case 152:
                         checkAccessorDeferred(node);
                         break;
-                    case 193:
+                    case 197:
                         checkClassExpressionDeferred(node);
                         break;
                 }
@@ -33490,8 +35489,19 @@ var ts;
         function getDiagnosticsWorker(sourceFile) {
             throwIfNonDiagnosticsProducing();
             if (sourceFile) {
+                var previousGlobalDiagnostics = diagnostics.getGlobalDiagnostics();
+                var previousGlobalDiagnosticsSize = previousGlobalDiagnostics.length;
                 checkSourceFile(sourceFile);
-                return diagnostics.getDiagnostics(sourceFile.fileName);
+                var semanticDiagnostics = diagnostics.getDiagnostics(sourceFile.fileName);
+                var currentGlobalDiagnostics = diagnostics.getGlobalDiagnostics();
+                if (currentGlobalDiagnostics !== previousGlobalDiagnostics) {
+                    var deferredGlobalDiagnostics = ts.relativeComplement(previousGlobalDiagnostics, currentGlobalDiagnostics, ts.compareDiagnostics);
+                    return ts.concatenate(deferredGlobalDiagnostics, semanticDiagnostics);
+                }
+                else if (previousGlobalDiagnosticsSize === 0 && currentGlobalDiagnostics.length > 0) {
+                    return ts.concatenate(currentGlobalDiagnostics, semanticDiagnostics);
+                }
+                return semanticDiagnostics;
             }
             ts.forEach(host.getSourceFiles(), checkSourceFile);
             return diagnostics.getDiagnostics();
@@ -33508,7 +35518,7 @@ var ts;
         function isInsideWithStatementBody(node) {
             if (node) {
                 while (node.parent) {
-                    if (node.parent.kind === 213 && node.parent.statement === node) {
+                    if (node.parent.kind === 217 && node.parent.statement === node) {
                         return true;
                     }
                     node = node.parent;
@@ -33530,28 +35540,28 @@ var ts;
                         copySymbols(location.locals, meaning);
                     }
                     switch (location.kind) {
-                        case 256:
+                        case 261:
                             if (!ts.isExternalOrCommonJsModule(location)) {
                                 break;
                             }
-                        case 226:
+                        case 230:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 8914931);
                             break;
-                        case 225:
+                        case 229:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 8);
                             break;
-                        case 193:
+                        case 197:
                             var className = location.name;
                             if (className) {
                                 copySymbol(location.symbol, meaning);
                             }
-                        case 222:
-                        case 223:
+                        case 226:
+                        case 227:
                             if (!(memberFlags & 32)) {
                                 copySymbols(getSymbolOfNode(location).members, meaning & 793064);
                             }
                             break;
-                        case 180:
+                        case 184:
                             var funcName = location.name;
                             if (funcName) {
                                 copySymbol(location.symbol, meaning);
@@ -33590,27 +35600,27 @@ var ts;
         }
         function isTypeDeclaration(node) {
             switch (node.kind) {
-                case 142:
-                case 222:
-                case 223:
-                case 224:
-                case 225:
+                case 143:
+                case 226:
+                case 227:
+                case 228:
+                case 229:
                     return true;
             }
         }
         function isTypeReferenceIdentifier(entityName) {
             var node = entityName;
-            while (node.parent && node.parent.kind === 140) {
+            while (node.parent && node.parent.kind === 141) {
                 node = node.parent;
             }
-            return node.parent && (node.parent.kind === 156 || node.parent.kind === 267);
+            return node.parent && (node.parent.kind === 157 || node.parent.kind === 272);
         }
         function isHeritageClauseElementIdentifier(entityName) {
             var node = entityName;
-            while (node.parent && node.parent.kind === 173) {
+            while (node.parent && node.parent.kind === 177) {
                 node = node.parent;
             }
-            return node.parent && node.parent.kind === 195;
+            return node.parent && node.parent.kind === 199;
         }
         function forEachEnclosingClass(node, callback) {
             var result;
@@ -33627,13 +35637,13 @@ var ts;
             return !!forEachEnclosingClass(node, function (n) { return n === classDeclaration; });
         }
         function getLeftSideOfImportEqualsOrExportAssignment(nodeOnRightSide) {
-            while (nodeOnRightSide.parent.kind === 140) {
+            while (nodeOnRightSide.parent.kind === 141) {
                 nodeOnRightSide = nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 230) {
+            if (nodeOnRightSide.parent.kind === 234) {
                 return nodeOnRightSide.parent.moduleReference === nodeOnRightSide && nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 236) {
+            if (nodeOnRightSide.parent.kind === 240) {
                 return nodeOnRightSide.parent.expression === nodeOnRightSide && nodeOnRightSide.parent;
             }
             return undefined;
@@ -33645,7 +35655,7 @@ var ts;
             if (ts.isDeclarationName(entityName)) {
                 return getSymbolOfNode(entityName.parent);
             }
-            if (ts.isInJavaScriptFile(entityName) && entityName.parent.kind === 173) {
+            if (ts.isInJavaScriptFile(entityName) && entityName.parent.kind === 177) {
                 var specialPropertyAssignmentKind = ts.getSpecialPropertyAssignmentKind(entityName.parent.parent);
                 switch (specialPropertyAssignmentKind) {
                     case 1:
@@ -33657,11 +35667,11 @@ var ts;
                     default:
                 }
             }
-            if (entityName.parent.kind === 236 && ts.isEntityNameExpression(entityName)) {
+            if (entityName.parent.kind === 240 && ts.isEntityNameExpression(entityName)) {
                 return resolveEntityName(entityName, 107455 | 793064 | 1920 | 8388608);
             }
-            if (entityName.kind !== 173 && isInRightSideOfImportOrExportAssignment(entityName)) {
-                var importEqualsDeclaration = ts.getAncestor(entityName, 230);
+            if (entityName.kind !== 177 && isInRightSideOfImportOrExportAssignment(entityName)) {
+                var importEqualsDeclaration = ts.getAncestor(entityName, 234);
                 ts.Debug.assert(importEqualsDeclaration !== undefined);
                 return getSymbolOfPartOfRightHandSideOfImportEquals(entityName, true);
             }
@@ -33670,7 +35680,7 @@ var ts;
             }
             if (isHeritageClauseElementIdentifier(entityName)) {
                 var meaning = 0;
-                if (entityName.parent.kind === 195) {
+                if (entityName.parent.kind === 199) {
                     meaning = 793064;
                     if (ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
                         meaning |= 107455;
@@ -33692,14 +35702,14 @@ var ts;
                     }
                     return resolveEntityName(entityName, 107455, false, true);
                 }
-                else if (entityName.kind === 173) {
+                else if (entityName.kind === 177) {
                     var symbol = getNodeLinks(entityName).resolvedSymbol;
                     if (!symbol) {
                         checkPropertyAccessExpression(entityName);
                     }
                     return getNodeLinks(entityName).resolvedSymbol;
                 }
-                else if (entityName.kind === 140) {
+                else if (entityName.kind === 141) {
                     var symbol = getNodeLinks(entityName).resolvedSymbol;
                     if (!symbol) {
                         checkQualifiedName(entityName);
@@ -33708,19 +35718,19 @@ var ts;
                 }
             }
             else if (isTypeReferenceIdentifier(entityName)) {
-                var meaning = (entityName.parent.kind === 156 || entityName.parent.kind === 267) ? 793064 : 1920;
+                var meaning = (entityName.parent.kind === 157 || entityName.parent.kind === 272) ? 793064 : 1920;
                 return resolveEntityName(entityName, meaning, false, true);
             }
-            else if (entityName.parent.kind === 246) {
+            else if (entityName.parent.kind === 250) {
                 return getJsxAttributePropertySymbol(entityName.parent);
             }
-            if (entityName.parent.kind === 155) {
+            if (entityName.parent.kind === 156) {
                 return resolveEntityName(entityName, 1);
             }
             return undefined;
         }
         function getSymbolAtLocation(node) {
-            if (node.kind === 256) {
+            if (node.kind === 261) {
                 return ts.isExternalModule(node) ? getMergedSymbol(node.symbol) : undefined;
             }
             if (isInsideWithStatementBody(node)) {
@@ -33736,8 +35746,8 @@ var ts;
                 if (isInRightSideOfImportOrExportAssignment(node)) {
                     return getSymbolOfEntityNameOrPropertyAccessExpression(node);
                 }
-                else if (node.parent.kind === 170 &&
-                    node.parent.parent.kind === 168 &&
+                else if (node.parent.kind === 174 &&
+                    node.parent.parent.kind === 172 &&
                     node === node.parent.propertyName) {
                     var typeOfPattern = getTypeOfNode(node.parent.parent);
                     var propertyDeclaration = typeOfPattern && getPropertyOfType(typeOfPattern, node.text);
@@ -33748,8 +35758,8 @@ var ts;
             }
             switch (node.kind) {
                 case 70:
-                case 173:
-                case 140:
+                case 177:
+                case 141:
                     return getSymbolOfEntityNameOrPropertyAccessExpression(node);
                 case 98:
                     var container = ts.getThisContainer(node, false);
@@ -33762,18 +35772,18 @@ var ts;
                 case 96:
                     var type = ts.isPartOfExpression(node) ? checkExpression(node) : getTypeFromTypeNode(node);
                     return type.symbol;
-                case 166:
+                case 167:
                     return getTypeFromTypeNode(node).symbol;
                 case 122:
                     var constructorDeclaration = node.parent;
-                    if (constructorDeclaration && constructorDeclaration.kind === 149) {
+                    if (constructorDeclaration && constructorDeclaration.kind === 150) {
                         return constructorDeclaration.parent.symbol;
                     }
                     return undefined;
                 case 9:
                     if ((ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) &&
                         ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) ||
-                        ((node.parent.kind === 231 || node.parent.kind === 237) &&
+                        ((node.parent.kind === 235 || node.parent.kind === 241) &&
                             node.parent.moduleSpecifier === node)) {
                         return resolveExternalModuleName(node, node);
                     }
@@ -33781,7 +35791,7 @@ var ts;
                         return resolveExternalModuleName(node, node);
                     }
                 case 8:
-                    if (node.parent.kind === 174 && node.parent.argumentExpression === node) {
+                    if (node.parent.kind === 178 && node.parent.argumentExpression === node) {
                         var objectType = checkExpression(node.parent.expression);
                         if (objectType === unknownType)
                             return undefined;
@@ -33795,7 +35805,7 @@ var ts;
             return undefined;
         }
         function getShorthandAssignmentValueSymbol(location) {
-            if (location && location.kind === 254) {
+            if (location && location.kind === 258) {
                 return resolveEntityName(location.name, 107455 | 8388608);
             }
             return undefined;
@@ -33845,20 +35855,20 @@ var ts;
             return unknownType;
         }
         function getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr) {
-            ts.Debug.assert(expr.kind === 172 || expr.kind === 171);
-            if (expr.parent.kind === 209) {
+            ts.Debug.assert(expr.kind === 176 || expr.kind === 175);
+            if (expr.parent.kind === 213) {
                 var iteratedType = checkRightHandSideOfForOf(expr.parent.expression);
                 return checkDestructuringAssignment(expr, iteratedType || unknownType);
             }
-            if (expr.parent.kind === 188) {
+            if (expr.parent.kind === 192) {
                 var iteratedType = checkExpression(expr.parent.right);
                 return checkDestructuringAssignment(expr, iteratedType || unknownType);
             }
-            if (expr.parent.kind === 253) {
+            if (expr.parent.kind === 257) {
                 var typeOfParentObjectLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr.parent.parent);
                 return checkObjectLiteralDestructuringPropertyAssignment(typeOfParentObjectLiteral || unknownType, expr.parent);
             }
-            ts.Debug.assert(expr.parent.kind === 171);
+            ts.Debug.assert(expr.parent.kind === 175);
             var typeOfArrayLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr.parent);
             var elementType = checkIteratedTypeOrElementType(typeOfArrayLiteral || unknownType, expr.parent, false) || unknownType;
             return checkArrayLiteralDestructuringElementAssignment(expr.parent, typeOfArrayLiteral, ts.indexOf(expr.parent.elements, expr), elementType || unknownType);
@@ -33894,9 +35904,9 @@ var ts;
         function getRootSymbols(symbol) {
             if (symbol.flags & 268435456) {
                 var symbols_3 = [];
-                var name_23 = symbol.name;
+                var name_29 = symbol.name;
                 ts.forEach(getSymbolLinks(symbol).containingType.types, function (t) {
-                    var symbol = getPropertyOfType(t, name_23);
+                    var symbol = getPropertyOfType(t, name_29);
                     if (symbol) {
                         symbols_3.push(symbol);
                     }
@@ -33904,6 +35914,10 @@ var ts;
                 return symbols_3;
             }
             else if (symbol.flags & 67108864) {
+                if (symbol.leftSpread) {
+                    var links = symbol;
+                    return [links.leftSpread, links.rightSpread];
+                }
                 var target = void 0;
                 var next = symbol;
                 while (next = getSymbolLinks(next).target) {
@@ -33961,7 +35975,7 @@ var ts;
                     }
                     var parentSymbol = getParentOfSymbol(symbol);
                     if (parentSymbol) {
-                        if (parentSymbol.flags & 512 && parentSymbol.valueDeclaration.kind === 256) {
+                        if (parentSymbol.flags & 512 && parentSymbol.valueDeclaration.kind === 261) {
                             var symbolFile = parentSymbol.valueDeclaration;
                             var referenceFile = ts.getSourceFileOfNode(node);
                             var symbolIsUmdExport = symbolFile !== referenceFile;
@@ -33999,7 +36013,7 @@ var ts;
                         else if (nodeLinks_1.flags & 131072) {
                             var isDeclaredInLoop = nodeLinks_1.flags & 262144;
                             var inLoopInitializer = ts.isIterationStatement(container, false);
-                            var inLoopBodyBlock = container.kind === 200 && ts.isIterationStatement(container.parent, false);
+                            var inLoopBodyBlock = container.kind === 204 && ts.isIterationStatement(container.parent, false);
                             links.isDeclarationWithCollidingName = !ts.isBlockScopedContainerTopLevel(container) && (!isDeclaredInLoop || (!inLoopInitializer && !inLoopBodyBlock));
                         }
                         else {
@@ -34039,16 +36053,16 @@ var ts;
                 return true;
             }
             switch (node.kind) {
-                case 230:
-                case 232:
-                case 233:
-                case 235:
-                case 239:
-                    return isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol);
+                case 234:
+                case 236:
                 case 237:
+                case 239:
+                case 243:
+                    return isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol);
+                case 241:
                     var exportClause = node.exportClause;
                     return exportClause && ts.forEach(exportClause.elements, isValueAliasDeclaration);
-                case 236:
+                case 240:
                     return node.expression
                         && node.expression.kind === 70
                         ? isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol)
@@ -34058,7 +36072,7 @@ var ts;
         }
         function isTopLevelValueImportEqualsWithEntityName(node) {
             node = ts.getParseTreeNode(node, ts.isImportEqualsDeclaration);
-            if (node === undefined || node.parent.kind !== 256 || !ts.isInternalModuleImportEqualsDeclaration(node)) {
+            if (node === undefined || node.parent.kind !== 261 || !ts.isInternalModuleImportEqualsDeclaration(node)) {
                 return false;
             }
             var isValue = isAliasResolvedToValue(getSymbolOfNode(node));
@@ -34109,7 +36123,7 @@ var ts;
             return getNodeLinks(node).enumMemberValue;
         }
         function getConstantValue(node) {
-            if (node.kind === 255) {
+            if (node.kind === 260) {
                 return getEnumMemberValue(node);
             }
             var symbol = getNodeLinks(node).resolvedSymbol;
@@ -34121,7 +36135,7 @@ var ts;
             return undefined;
         }
         function isFunctionType(type) {
-            return type.flags & 2588672 && getSignaturesOfType(type, 0).length > 0;
+            return type.flags & 32768 && getSignaturesOfType(type, 0).length > 0;
         }
         function getTypeReferenceSerializationKind(typeName, location) {
             var valueSymbol = resolveEntityName(typeName, 107455, true, false, location);
@@ -34203,9 +36217,9 @@ var ts;
             }
             var location = reference;
             if (startInDeclarationContainer) {
-                var parent_14 = reference.parent;
-                if (ts.isDeclaration(parent_14) && reference === parent_14.name) {
-                    location = getDeclarationContainer(parent_14);
+                var parent_12 = reference.parent;
+                if (ts.isDeclaration(parent_12) && reference === parent_12.name) {
+                    location = getDeclarationContainer(parent_12);
                 }
             }
             return resolveName(location, reference.text, 107455 | 1048576 | 8388608, undefined, undefined);
@@ -34225,7 +36239,7 @@ var ts;
         function isLiteralConstDeclaration(node) {
             if (ts.isConst(node)) {
                 var type = getTypeOfSymbol(getSymbolOfNode(node));
-                return !!(type.flags & 96 && type.flags & 16777216);
+                return !!(type.flags & 96 && type.flags & 1048576);
             }
             return false;
         }
@@ -34276,13 +36290,14 @@ var ts;
                 getTypeReferenceDirectivesForEntityName: getTypeReferenceDirectivesForEntityName,
                 getTypeReferenceDirectivesForSymbol: getTypeReferenceDirectivesForSymbol,
                 isLiteralConstDeclaration: isLiteralConstDeclaration,
-                writeLiteralConstValue: writeLiteralConstValue
+                writeLiteralConstValue: writeLiteralConstValue,
+                getJsxFactoryEntity: function () { return _jsxFactoryEntity; }
             };
             function getTypeReferenceDirectivesForEntityName(node) {
                 if (!fileToDirective) {
                     return undefined;
                 }
-                var meaning = (node.kind === 173) || (node.kind === 70 && isInTypeQuery(node))
+                var meaning = (node.kind === 177) || (node.kind === 70 && isInTypeQuery(node))
                     ? 107455 | 1048576
                     : 793064 | 1920;
                 var symbol = resolveEntityName(node, meaning, true);
@@ -34304,6 +36319,9 @@ var ts;
                         if (typeReferenceDirective) {
                             (typeReferenceDirectives || (typeReferenceDirectives = [])).push(typeReferenceDirective);
                         }
+                        else {
+                            return undefined;
+                        }
                     }
                 }
                 return typeReferenceDirectives;
@@ -34314,15 +36332,15 @@ var ts;
                 }
                 var current = symbol;
                 while (true) {
-                    var parent_15 = getParentOfSymbol(current);
-                    if (parent_15) {
-                        current = parent_15;
+                    var parent_13 = getParentOfSymbol(current);
+                    if (parent_13) {
+                        current = parent_13;
                     }
                     else {
                         break;
                     }
                 }
-                if (current.valueDeclaration && current.valueDeclaration.kind === 256 && current.flags & 512) {
+                if (current.valueDeclaration && current.valueDeclaration.kind === 261 && current.flags & 512) {
                     return false;
                 }
                 for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
@@ -34341,7 +36359,7 @@ var ts;
             if (!moduleSymbol) {
                 return undefined;
             }
-            return ts.getDeclarationOfKind(moduleSymbol, 256);
+            return ts.getDeclarationOfKind(moduleSymbol, 261);
         }
         function initializeTypeChecker() {
             for (var _i = 0, _a = host.getSourceFiles(); _i < _a.length; _i++) {
@@ -34371,7 +36389,7 @@ var ts;
                     }
                 }
                 if ((compilerOptions.isolatedModules || ts.isExternalModule(file)) && !file.isDeclarationFile) {
-                    var fileRequestedExternalEmitHelpers = file.flags & 31744;
+                    var fileRequestedExternalEmitHelpers = file.flags & 64512;
                     if (fileRequestedExternalEmitHelpers) {
                         requestedExternalEmitHelpers |= fileRequestedExternalEmitHelpers;
                         if (firstFileRequestingExternalHelpers === undefined) {
@@ -34440,9 +36458,13 @@ var ts;
                     if (requestedExternalEmitHelpers & 1024 && languageVersion < 2) {
                         verifyHelperSymbol(exports_2, "__extends", 107455);
                     }
-                    if (requestedExternalEmitHelpers & 16384 && compilerOptions.jsx !== 1) {
+                    if (requestedExternalEmitHelpers & 16384 &&
+                        (languageVersion < 5 || compilerOptions.jsx === 2)) {
                         verifyHelperSymbol(exports_2, "__assign", 107455);
                     }
+                    if (languageVersion < 5 && requestedExternalEmitHelpers & 32768) {
+                        verifyHelperSymbol(exports_2, "__rest", 107455);
+                    }
                     if (requestedExternalEmitHelpers & 2048) {
                         verifyHelperSymbol(exports_2, "__decorate", 107455);
                         if (compilerOptions.emitDecoratorMetadata) {
@@ -34477,7 +36499,7 @@ var ts;
         function createThenableType() {
             var thenPropertySymbol = createSymbol(67108864 | 4, "then");
             getSymbolLinks(thenPropertySymbol).type = globalFunctionType;
-            var thenableType = createObjectType(2097152);
+            var thenableType = createObjectType(16);
             thenableType.properties = [thenPropertySymbol];
             thenableType.members = createSymbolTable(thenableType.properties);
             thenableType.callSignatures = [];
@@ -34489,14 +36511,14 @@ var ts;
                 return false;
             }
             if (!ts.nodeCanBeDecorated(node)) {
-                if (node.kind === 148 && !ts.nodeIsPresent(node.body)) {
+                if (node.kind === 149 && !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 === 150 || node.kind === 151) {
+            else if (node.kind === 151 || node.kind === 152) {
                 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);
@@ -34513,17 +36535,17 @@ var ts;
             var flags = 0;
             for (var _i = 0, _a = node.modifiers; _i < _a.length; _i++) {
                 var modifier = _a[_i];
-                if (modifier.kind !== 129) {
-                    if (node.kind === 145 || node.kind === 147) {
+                if (modifier.kind !== 130) {
+                    if (node.kind === 146 || node.kind === 148) {
                         return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_type_member, ts.tokenToString(modifier.kind));
                     }
-                    if (node.kind === 154) {
+                    if (node.kind === 155) {
                         return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_an_index_signature, ts.tokenToString(modifier.kind));
                     }
                 }
                 switch (modifier.kind) {
                     case 75:
-                        if (node.kind !== 225 && node.parent.kind === 222) {
+                        if (node.kind !== 229 && node.parent.kind === 226) {
                             return grammarErrorOnNode(node, ts.Diagnostics.A_class_member_cannot_have_the_0_keyword, ts.tokenToString(75));
                         }
                         break;
@@ -34549,7 +36571,7 @@ var ts;
                         else if (flags & 256) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "async");
                         }
-                        else if (node.parent.kind === 227 || node.parent.kind === 256) {
+                        else if (node.parent.kind === 231 || node.parent.kind === 261) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, text);
                         }
                         else if (flags & 128) {
@@ -34572,10 +36594,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 === 227 || node.parent.kind === 256) {
+                        else if (node.parent.kind === 231 || node.parent.kind === 261) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, "static");
                         }
-                        else if (node.kind === 143) {
+                        else if (node.kind === 144) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "static");
                         }
                         else if (flags & 128) {
@@ -34584,11 +36606,11 @@ var ts;
                         flags |= 32;
                         lastStatic = modifier;
                         break;
-                    case 129:
+                    case 130:
                         if (flags & 64) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "readonly");
                         }
-                        else if (node.kind !== 146 && node.kind !== 145 && node.kind !== 154 && node.kind !== 143) {
+                        else if (node.kind !== 147 && node.kind !== 146 && node.kind !== 155 && node.kind !== 144) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature);
                         }
                         flags |= 64;
@@ -34607,10 +36629,10 @@ var ts;
                         else if (flags & 256) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "async");
                         }
-                        else if (node.parent.kind === 222) {
+                        else if (node.parent.kind === 226) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "export");
                         }
-                        else if (node.kind === 143) {
+                        else if (node.kind === 144) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "export");
                         }
                         flags |= 1;
@@ -34622,13 +36644,13 @@ var ts;
                         else if (flags & 256) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
-                        else if (node.parent.kind === 222) {
+                        else if (node.parent.kind === 226) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "declare");
                         }
-                        else if (node.kind === 143) {
+                        else if (node.kind === 144) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "declare");
                         }
-                        else if (ts.isInAmbientContext(node.parent) && node.parent.kind === 227) {
+                        else if (ts.isInAmbientContext(node.parent) && node.parent.kind === 231) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.A_declare_modifier_cannot_be_used_in_an_already_ambient_context);
                         }
                         flags |= 2;
@@ -34638,14 +36660,14 @@ var ts;
                         if (flags & 128) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "abstract");
                         }
-                        if (node.kind !== 222) {
-                            if (node.kind !== 148 &&
-                                node.kind !== 146 &&
-                                node.kind !== 150 &&
-                                node.kind !== 151) {
+                        if (node.kind !== 226) {
+                            if (node.kind !== 149 &&
+                                node.kind !== 147 &&
+                                node.kind !== 151 &&
+                                node.kind !== 152) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration);
                             }
-                            if (!(node.parent.kind === 222 && ts.getModifierFlags(node.parent) & 128)) {
+                            if (!(node.parent.kind === 226 && ts.getModifierFlags(node.parent) & 128)) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.Abstract_methods_can_only_appear_within_an_abstract_class);
                             }
                             if (flags & 32) {
@@ -34664,7 +36686,7 @@ var ts;
                         else if (flags & 2 || ts.isInAmbientContext(node.parent)) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
-                        else if (node.kind === 143) {
+                        else if (node.kind === 144) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "async");
                         }
                         flags |= 256;
@@ -34672,7 +36694,7 @@ var ts;
                         break;
                 }
             }
-            if (node.kind === 149) {
+            if (node.kind === 150) {
                 if (flags & 32) {
                     return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "static");
                 }
@@ -34687,13 +36709,13 @@ var ts;
                 }
                 return;
             }
-            else if ((node.kind === 231 || node.kind === 230) && flags & 2) {
+            else if ((node.kind === 235 || node.kind === 234) && flags & 2) {
                 return grammarErrorOnNode(lastDeclare, ts.Diagnostics.A_0_modifier_cannot_be_used_with_an_import_declaration, "declare");
             }
-            else if (node.kind === 143 && (flags & 92) && ts.isBindingPattern(node.name)) {
+            else if (node.kind === 144 && (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 === 143 && (flags & 92) && node.dotDotDotToken) {
+            else if (node.kind === 144 && (flags & 92) && node.dotDotDotToken) {
                 return grammarErrorOnNode(node, ts.Diagnostics.A_parameter_property_cannot_be_declared_using_a_rest_parameter);
             }
             if (flags & 256) {
@@ -34709,37 +36731,37 @@ var ts;
         }
         function shouldReportBadModifier(node) {
             switch (node.kind) {
-                case 150:
                 case 151:
-                case 149:
-                case 146:
-                case 145:
-                case 148:
+                case 152:
+                case 150:
                 case 147:
-                case 154:
-                case 226:
-                case 231:
+                case 146:
+                case 149:
+                case 148:
+                case 155:
                 case 230:
-                case 237:
-                case 236:
-                case 180:
-                case 181:
-                case 143:
+                case 235:
+                case 234:
+                case 241:
+                case 240:
+                case 184:
+                case 185:
+                case 144:
                     return false;
                 default:
-                    if (node.parent.kind === 227 || node.parent.kind === 256) {
+                    if (node.parent.kind === 231 || node.parent.kind === 261) {
                         return false;
                     }
                     switch (node.kind) {
-                        case 221:
-                            return nodeHasAnyModifiersExcept(node, 119);
-                        case 222:
-                            return nodeHasAnyModifiersExcept(node, 116);
-                        case 223:
-                        case 201:
-                        case 224:
-                            return true;
                         case 225:
+                            return nodeHasAnyModifiersExcept(node, 119);
+                        case 226:
+                            return nodeHasAnyModifiersExcept(node, 116);
+                        case 227:
+                        case 205:
+                        case 228:
+                            return true;
+                        case 229:
                             return nodeHasAnyModifiersExcept(node, 75);
                         default:
                             ts.Debug.fail();
@@ -34752,10 +36774,10 @@ var ts;
         }
         function checkGrammarAsyncModifier(node, asyncModifier) {
             switch (node.kind) {
-                case 148:
-                case 221:
-                case 180:
-                case 181:
+                case 149:
+                case 225:
+                case 184:
+                case 185:
                     if (!node.asteriskToken) {
                         return false;
                     }
@@ -34817,7 +36839,7 @@ var ts;
                 checkGrammarParameterList(node.parameters) || checkGrammarArrowFunction(node, file);
         }
         function checkGrammarArrowFunction(node, file) {
-            if (node.kind === 181) {
+            if (node.kind === 185) {
                 var arrowFunction = node;
                 var startLine = ts.getLineAndCharacterOfPosition(file, arrowFunction.equalsGreaterThanToken.pos).line;
                 var endLine = ts.getLineAndCharacterOfPosition(file, arrowFunction.equalsGreaterThanToken.end).line;
@@ -34852,7 +36874,7 @@ var ts;
             if (!parameter.type) {
                 return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_must_have_a_type_annotation);
             }
-            if (parameter.type.kind !== 133 && parameter.type.kind !== 131) {
+            if (parameter.type.kind !== 134 && parameter.type.kind !== 132) {
                 return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_must_be_string_or_number);
             }
             if (!node.type) {
@@ -34879,7 +36901,7 @@ var ts;
                 var sourceFile = ts.getSourceFileOfNode(node);
                 for (var _i = 0, args_4 = args; _i < args_4.length; _i++) {
                     var arg = args_4[_i];
-                    if (arg.kind === 194) {
+                    if (arg.kind === 198) {
                         return grammarErrorAtPos(sourceFile, arg.pos, 0, ts.Diagnostics.Argument_expression_expected);
                     }
                 }
@@ -34949,19 +36971,19 @@ var ts;
             return false;
         }
         function checkGrammarComputedPropertyName(node) {
-            if (node.kind !== 141) {
+            if (node.kind !== 142) {
                 return false;
             }
             var computedPropertyName = node;
-            if (computedPropertyName.expression.kind === 188 && computedPropertyName.expression.operatorToken.kind === 25) {
+            if (computedPropertyName.expression.kind === 192 && computedPropertyName.expression.operatorToken.kind === 25) {
                 return grammarErrorOnNode(computedPropertyName.expression, ts.Diagnostics.A_comma_expression_is_not_allowed_in_a_computed_property_name);
             }
         }
         function checkGrammarForGenerator(node) {
             if (node.asteriskToken) {
-                ts.Debug.assert(node.kind === 221 ||
-                    node.kind === 180 ||
-                    node.kind === 148);
+                ts.Debug.assert(node.kind === 225 ||
+                    node.kind === 184 ||
+                    node.kind === 149);
                 if (ts.isInAmbientContext(node)) {
                     return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.Generators_are_not_allowed_in_an_ambient_context);
                 }
@@ -34986,42 +37008,45 @@ var ts;
             var GetOrSetAccessor = GetAccessor | SetAccessor;
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var prop = _a[_i];
-                var name_24 = prop.name;
-                if (name_24.kind === 141) {
-                    checkGrammarComputedPropertyName(name_24);
+                if (prop.kind === 259) {
+                    continue;
                 }
-                if (prop.kind === 254 && !inDestructuring && prop.objectAssignmentInitializer) {
+                var name_30 = prop.name;
+                if (name_30.kind === 142) {
+                    checkGrammarComputedPropertyName(name_30);
+                }
+                if (prop.kind === 258 && !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 !== 119 || prop.kind !== 148) {
+                        if (mod.kind !== 119 || prop.kind !== 149) {
                             grammarErrorOnNode(mod, ts.Diagnostics._0_modifier_cannot_be_used_here, ts.getTextOfNode(mod));
                         }
                     }
                 }
                 var currentKind = void 0;
-                if (prop.kind === 253 || prop.kind === 254) {
+                if (prop.kind === 257 || prop.kind === 258) {
                     checkGrammarForInvalidQuestionMark(prop.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional);
-                    if (name_24.kind === 8) {
-                        checkGrammarNumericLiteral(name_24);
+                    if (name_30.kind === 8) {
+                        checkGrammarNumericLiteral(name_30);
                     }
                     currentKind = Property;
                 }
-                else if (prop.kind === 148) {
+                else if (prop.kind === 149) {
                     currentKind = Property;
                 }
-                else if (prop.kind === 150) {
+                else if (prop.kind === 151) {
                     currentKind = GetAccessor;
                 }
-                else if (prop.kind === 151) {
+                else if (prop.kind === 152) {
                     currentKind = SetAccessor;
                 }
                 else {
                     ts.Debug.fail("Unexpected syntax kind:" + prop.kind);
                 }
-                var effectiveName = ts.getPropertyNameForPropertyNameNode(name_24);
+                var effectiveName = ts.getPropertyNameForPropertyNameNode(name_30);
                 if (effectiveName === undefined) {
                     continue;
                 }
@@ -35031,18 +37056,18 @@ var ts;
                 else {
                     var existingKind = seen[effectiveName];
                     if (currentKind === Property && existingKind === Property) {
-                        grammarErrorOnNode(name_24, ts.Diagnostics.Duplicate_identifier_0, ts.getTextOfNode(name_24));
+                        grammarErrorOnNode(name_30, ts.Diagnostics.Duplicate_identifier_0, ts.getTextOfNode(name_30));
                     }
                     else if ((currentKind & GetOrSetAccessor) && (existingKind & GetOrSetAccessor)) {
                         if (existingKind !== GetOrSetAccessor && currentKind !== existingKind) {
                             seen[effectiveName] = currentKind | existingKind;
                         }
                         else {
-                            return grammarErrorOnNode(name_24, ts.Diagnostics.An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name);
+                            return grammarErrorOnNode(name_30, ts.Diagnostics.An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name);
                         }
                     }
                     else {
-                        return grammarErrorOnNode(name_24, ts.Diagnostics.An_object_literal_cannot_have_property_and_accessor_with_the_same_name);
+                        return grammarErrorOnNode(name_30, ts.Diagnostics.An_object_literal_cannot_have_property_and_accessor_with_the_same_name);
                     }
                 }
             }
@@ -35051,19 +37076,19 @@ var ts;
             var seen = ts.createMap();
             for (var _i = 0, _a = node.attributes; _i < _a.length; _i++) {
                 var attr = _a[_i];
-                if (attr.kind === 247) {
+                if (attr.kind === 251) {
                     continue;
                 }
                 var jsxAttr = attr;
-                var name_25 = jsxAttr.name;
-                if (!seen[name_25.text]) {
-                    seen[name_25.text] = true;
+                var name_31 = jsxAttr.name;
+                if (!seen[name_31.text]) {
+                    seen[name_31.text] = true;
                 }
                 else {
-                    return grammarErrorOnNode(name_25, ts.Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name);
+                    return grammarErrorOnNode(name_31, ts.Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name);
                 }
                 var initializer = jsxAttr.initializer;
-                if (initializer && initializer.kind === 248 && !initializer.expression) {
+                if (initializer && initializer.kind === 252 && !initializer.expression) {
                     return grammarErrorOnNode(jsxAttr.initializer, ts.Diagnostics.JSX_attributes_must_only_be_assigned_a_non_empty_expression);
                 }
             }
@@ -35072,7 +37097,7 @@ var ts;
             if (checkGrammarStatementInAmbientContext(forInOrOfStatement)) {
                 return true;
             }
-            if (forInOrOfStatement.initializer.kind === 220) {
+            if (forInOrOfStatement.initializer.kind === 224) {
                 var variableList = forInOrOfStatement.initializer;
                 if (!checkGrammarVariableDeclarationList(variableList)) {
                     var declarations = variableList.declarations;
@@ -35080,20 +37105,20 @@ var ts;
                         return false;
                     }
                     if (declarations.length > 1) {
-                        var diagnostic = forInOrOfStatement.kind === 208
+                        var diagnostic = forInOrOfStatement.kind === 212
                             ? 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 === 208
+                        var diagnostic = forInOrOfStatement.kind === 212
                             ? 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 === 208
+                        var diagnostic = forInOrOfStatement.kind === 212
                             ? 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);
@@ -35117,11 +37142,11 @@ var ts;
                 return grammarErrorOnNode(accessor.name, ts.Diagnostics.An_accessor_cannot_have_type_parameters);
             }
             else if (!doesAccessorHaveCorrectParameterCount(accessor)) {
-                return grammarErrorOnNode(accessor.name, kind === 150 ?
+                return grammarErrorOnNode(accessor.name, kind === 151 ?
                     ts.Diagnostics.A_get_accessor_cannot_have_parameters :
                     ts.Diagnostics.A_set_accessor_must_have_exactly_one_parameter);
             }
-            else if (kind === 151) {
+            else if (kind === 152) {
                 if (accessor.type) {
                     return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_set_accessor_cannot_have_a_return_type_annotation);
                 }
@@ -35140,10 +37165,10 @@ var ts;
             }
         }
         function doesAccessorHaveCorrectParameterCount(accessor) {
-            return getAccessorThisParameter(accessor) || accessor.parameters.length === (accessor.kind === 150 ? 0 : 1);
+            return getAccessorThisParameter(accessor) || accessor.parameters.length === (accessor.kind === 151 ? 0 : 1);
         }
         function getAccessorThisParameter(accessor) {
-            if (accessor.parameters.length === (accessor.kind === 150 ? 1 : 2)) {
+            if (accessor.parameters.length === (accessor.kind === 151 ? 1 : 2)) {
                 return ts.getThisParameter(accessor);
             }
         }
@@ -35158,7 +37183,7 @@ var ts;
                 checkGrammarForGenerator(node)) {
                 return true;
             }
-            if (node.parent.kind === 172) {
+            if (node.parent.kind === 176) {
                 if (checkGrammarForInvalidQuestionMark(node.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional)) {
                     return true;
                 }
@@ -35174,10 +37199,10 @@ var ts;
                     return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_method_overload_must_directly_refer_to_a_built_in_symbol);
                 }
             }
-            else if (node.parent.kind === 223) {
+            else if (node.parent.kind === 227) {
                 return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol);
             }
-            else if (node.parent.kind === 160) {
+            else if (node.parent.kind === 161) {
                 return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol);
             }
         }
@@ -35188,9 +37213,9 @@ var ts;
                     return grammarErrorOnNode(node, ts.Diagnostics.Jump_target_cannot_cross_function_boundary);
                 }
                 switch (current.kind) {
-                    case 215:
+                    case 219:
                         if (node.label && current.label.text === node.label.text) {
-                            var isMisplacedContinueLabel = node.kind === 210
+                            var isMisplacedContinueLabel = node.kind === 214
                                 && !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);
@@ -35198,8 +37223,8 @@ var ts;
                             return false;
                         }
                         break;
-                    case 214:
-                        if (node.kind === 211 && !node.label) {
+                    case 218:
+                        if (node.kind === 215 && !node.label) {
                             return false;
                         }
                         break;
@@ -35212,13 +37237,13 @@ var ts;
                 current = current.parent;
             }
             if (node.label) {
-                var message = node.kind === 211
+                var message = node.kind === 215
                     ? 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 === 211
+                var message = node.kind === 215
                     ? 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);
@@ -35228,9 +37253,9 @@ var ts;
             if (node.dotDotDotToken) {
                 var elements = node.parent.elements;
                 if (node !== ts.lastOrUndefined(elements)) {
-                    return grammarErrorOnNode(node, ts.Diagnostics.A_rest_element_must_be_last_in_an_array_destructuring_pattern);
+                    return grammarErrorOnNode(node, ts.Diagnostics.A_rest_element_must_be_last_in_a_destructuring_pattern);
                 }
-                if (node.name.kind === 169 || node.name.kind === 168) {
+                if (node.name.kind === 173 || node.name.kind === 172) {
                     return grammarErrorOnNode(node.name, ts.Diagnostics.A_rest_element_cannot_contain_a_binding_pattern);
                 }
                 if (node.initializer) {
@@ -35240,11 +37265,11 @@ var ts;
         }
         function isStringOrNumberLiteralExpression(expr) {
             return expr.kind === 9 || expr.kind === 8 ||
-                expr.kind === 186 && expr.operator === 37 &&
+                expr.kind === 190 && expr.operator === 37 &&
                     expr.operand.kind === 8;
         }
         function checkGrammarVariableDeclaration(node) {
-            if (node.parent.parent.kind !== 208 && node.parent.parent.kind !== 209) {
+            if (node.parent.parent.kind !== 212 && node.parent.parent.kind !== 213) {
                 if (ts.isInAmbientContext(node)) {
                     if (node.initializer) {
                         if (ts.isConst(node) && !node.type) {
@@ -35301,15 +37326,15 @@ var ts;
         }
         function allowLetAndConstDeclarations(parent) {
             switch (parent.kind) {
-                case 204:
-                case 205:
-                case 206:
-                case 213:
-                case 207:
                 case 208:
                 case 209:
+                case 210:
+                case 217:
+                case 211:
+                case 212:
+                case 213:
                     return false;
-                case 215:
+                case 219:
                     return allowLetAndConstDeclarations(parent.parent);
             }
             return true;
@@ -35364,7 +37389,7 @@ var ts;
                     return true;
                 }
             }
-            else if (node.parent.kind === 223) {
+            else if (node.parent.kind === 227) {
                 if (checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol)) {
                     return true;
                 }
@@ -35372,7 +37397,7 @@ var ts;
                     return grammarErrorOnNode(node.initializer, ts.Diagnostics.An_interface_property_cannot_have_an_initializer);
                 }
             }
-            else if (node.parent.kind === 160) {
+            else if (node.parent.kind === 161) {
                 if (checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol)) {
                     return true;
                 }
@@ -35385,13 +37410,13 @@ var ts;
             }
         }
         function checkGrammarTopLevelElementForRequiredDeclareModifier(node) {
-            if (node.kind === 223 ||
-                node.kind === 224 ||
-                node.kind === 231 ||
-                node.kind === 230 ||
-                node.kind === 237 ||
-                node.kind === 236 ||
-                node.kind === 229 ||
+            if (node.kind === 227 ||
+                node.kind === 228 ||
+                node.kind === 235 ||
+                node.kind === 234 ||
+                node.kind === 241 ||
+                node.kind === 240 ||
+                node.kind === 233 ||
                 ts.getModifierFlags(node) & (2 | 1 | 512)) {
                 return false;
             }
@@ -35400,7 +37425,7 @@ var ts;
         function checkGrammarTopLevelElementsForRequiredDeclareModifier(file) {
             for (var _i = 0, _a = file.statements; _i < _a.length; _i++) {
                 var decl = _a[_i];
-                if (ts.isDeclaration(decl) || decl.kind === 201) {
+                if (ts.isDeclaration(decl) || decl.kind === 205) {
                     if (checkGrammarTopLevelElementForRequiredDeclareModifier(decl)) {
                         return true;
                     }
@@ -35419,7 +37444,7 @@ 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 === 200 || node.parent.kind === 227 || node.parent.kind === 256) {
+                if (node.parent.kind === 204 || node.parent.kind === 231 || node.parent.kind === 261) {
                     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);
@@ -35458,49 +37483,49 @@ var ts;
 (function (ts) {
     ;
     var nodeEdgeTraversalMap = ts.createMap((_a = {},
-        _a[140] = [
+        _a[141] = [
             { name: "left", test: ts.isEntityName },
             { name: "right", test: ts.isIdentifier }
         ],
-        _a[144] = [
+        _a[145] = [
             { name: "expression", test: ts.isLeftHandSideExpression }
         ],
-        _a[178] = [
+        _a[182] = [
             { name: "type", test: ts.isTypeNode },
             { name: "expression", test: ts.isUnaryExpression }
         ],
-        _a[196] = [
+        _a[200] = [
             { name: "expression", test: ts.isExpression },
             { name: "type", test: ts.isTypeNode }
         ],
-        _a[197] = [
+        _a[201] = [
             { name: "expression", test: ts.isLeftHandSideExpression }
         ],
-        _a[225] = [
+        _a[229] = [
             { name: "decorators", test: ts.isDecorator },
             { name: "modifiers", test: ts.isModifier },
             { name: "name", test: ts.isIdentifier },
             { name: "members", test: ts.isEnumMember }
         ],
-        _a[226] = [
+        _a[230] = [
             { name: "decorators", test: ts.isDecorator },
             { name: "modifiers", test: ts.isModifier },
             { name: "name", test: ts.isModuleName },
             { name: "body", test: ts.isModuleBody }
         ],
-        _a[227] = [
+        _a[231] = [
             { name: "statements", test: ts.isStatement }
         ],
-        _a[230] = [
+        _a[234] = [
             { name: "decorators", test: ts.isDecorator },
             { name: "modifiers", test: ts.isModifier },
             { name: "name", test: ts.isIdentifier },
             { name: "moduleReference", test: ts.isModuleReference }
         ],
-        _a[241] = [
+        _a[245] = [
             { name: "expression", test: ts.isExpression, optional: true }
         ],
-        _a[255] = [
+        _a[260] = [
             { name: "name", test: ts.isPropertyName },
             { name: "initializer", test: ts.isExpression, optional: true, parenthesize: ts.parenthesizeExpressionForList }
         ],
@@ -35513,41 +37538,41 @@ var ts;
             return initial;
         }
         var kind = node.kind;
-        if ((kind > 0 && kind <= 139)) {
+        if ((kind > 0 && kind <= 140)) {
             return initial;
         }
-        if ((kind >= 155 && kind <= 167)) {
+        if ((kind >= 156 && kind <= 171)) {
             return initial;
         }
         var result = initial;
         switch (node.kind) {
-            case 199:
-            case 202:
-            case 194:
-            case 218:
-            case 287:
+            case 203:
+            case 206:
+            case 198:
+            case 222:
+            case 292:
                 break;
-            case 141:
+            case 142:
                 result = reduceNode(node.expression, f, result);
                 break;
-            case 143:
-                result = ts.reduceLeft(node.decorators, f, result);
-                result = ts.reduceLeft(node.modifiers, f, result);
-                result = reduceNode(node.name, f, result);
-                result = reduceNode(node.type, f, result);
-                result = reduceNode(node.initializer, f, result);
-                break;
             case 144:
-                result = reduceNode(node.expression, f, result);
-                break;
-            case 146:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.type, f, result);
                 result = reduceNode(node.initializer, f, result);
                 break;
-            case 148:
+            case 145:
+                result = reduceNode(node.expression, f, result);
+                break;
+            case 147:
+                result = ts.reduceLeft(node.decorators, f, result);
+                result = ts.reduceLeft(node.modifiers, f, result);
+                result = reduceNode(node.name, f, result);
+                result = reduceNode(node.type, f, result);
+                result = reduceNode(node.initializer, f, result);
+                break;
+            case 149:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
@@ -35556,17 +37581,9 @@ var ts;
                 result = reduceNode(node.type, f, result);
                 result = reduceNode(node.body, f, result);
                 break;
-            case 149:
-                result = ts.reduceLeft(node.modifiers, f, result);
-                result = ts.reduceLeft(node.parameters, f, result);
-                result = reduceNode(node.body, f, result);
-                break;
             case 150:
-                result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
-                result = reduceNode(node.name, f, result);
                 result = ts.reduceLeft(node.parameters, f, result);
-                result = reduceNode(node.type, f, result);
                 result = reduceNode(node.body, f, result);
                 break;
             case 151:
@@ -35574,46 +37591,54 @@ var ts;
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
                 result = ts.reduceLeft(node.parameters, f, result);
+                result = reduceNode(node.type, f, result);
                 result = reduceNode(node.body, f, result);
                 break;
-            case 168:
-            case 169:
+            case 152:
+                result = ts.reduceLeft(node.decorators, f, result);
+                result = ts.reduceLeft(node.modifiers, f, result);
+                result = reduceNode(node.name, f, result);
+                result = ts.reduceLeft(node.parameters, f, result);
+                result = reduceNode(node.body, f, result);
+                break;
+            case 172:
+            case 173:
                 result = ts.reduceLeft(node.elements, f, result);
                 break;
-            case 170:
+            case 174:
                 result = reduceNode(node.propertyName, f, result);
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.initializer, f, result);
                 break;
-            case 171:
+            case 175:
                 result = ts.reduceLeft(node.elements, f, result);
                 break;
-            case 172:
+            case 176:
                 result = ts.reduceLeft(node.properties, f, result);
                 break;
-            case 173:
+            case 177:
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.name, f, result);
                 break;
-            case 174:
+            case 178:
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.argumentExpression, f, result);
                 break;
-            case 175:
+            case 179:
                 result = reduceNode(node.expression, f, result);
                 result = ts.reduceLeft(node.typeArguments, f, result);
                 result = ts.reduceLeft(node.arguments, f, result);
                 break;
-            case 176:
+            case 180:
                 result = reduceNode(node.expression, f, result);
                 result = ts.reduceLeft(node.typeArguments, f, result);
                 result = ts.reduceLeft(node.arguments, f, result);
                 break;
-            case 177:
+            case 181:
                 result = reduceNode(node.tag, f, result);
                 result = reduceNode(node.template, f, result);
                 break;
-            case 180:
+            case 184:
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
                 result = ts.reduceLeft(node.typeParameters, f, result);
@@ -35621,117 +37646,117 @@ var ts;
                 result = reduceNode(node.type, f, result);
                 result = reduceNode(node.body, f, result);
                 break;
-            case 181:
+            case 185:
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = ts.reduceLeft(node.typeParameters, f, result);
                 result = ts.reduceLeft(node.parameters, f, result);
                 result = reduceNode(node.type, f, result);
                 result = reduceNode(node.body, f, result);
                 break;
-            case 179:
-            case 182:
             case 183:
-            case 184:
-            case 185:
-            case 191:
-            case 192:
-            case 197:
-                result = reduceNode(node.expression, f, result);
-                break;
             case 186:
             case 187:
+            case 188:
+            case 189:
+            case 195:
+            case 196:
+            case 201:
+                result = reduceNode(node.expression, f, result);
+                break;
+            case 190:
+            case 191:
                 result = reduceNode(node.operand, f, result);
                 break;
-            case 188:
+            case 192:
                 result = reduceNode(node.left, f, result);
                 result = reduceNode(node.right, f, result);
                 break;
-            case 189:
+            case 193:
                 result = reduceNode(node.condition, f, result);
                 result = reduceNode(node.whenTrue, f, result);
                 result = reduceNode(node.whenFalse, f, result);
                 break;
-            case 190:
+            case 194:
                 result = reduceNode(node.head, f, result);
                 result = ts.reduceLeft(node.templateSpans, f, result);
                 break;
-            case 193:
+            case 197:
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
                 result = ts.reduceLeft(node.typeParameters, f, result);
                 result = ts.reduceLeft(node.heritageClauses, f, result);
                 result = ts.reduceLeft(node.members, f, result);
                 break;
-            case 195:
+            case 199:
                 result = reduceNode(node.expression, f, result);
                 result = ts.reduceLeft(node.typeArguments, f, result);
                 break;
-            case 198:
+            case 202:
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.literal, f, result);
                 break;
-            case 200:
+            case 204:
                 result = ts.reduceLeft(node.statements, f, result);
                 break;
-            case 201:
+            case 205:
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.declarationList, f, result);
                 break;
-            case 203:
+            case 207:
                 result = reduceNode(node.expression, f, result);
                 break;
-            case 204:
+            case 208:
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.thenStatement, f, result);
                 result = reduceNode(node.elseStatement, f, result);
                 break;
-            case 205:
+            case 209:
                 result = reduceNode(node.statement, f, result);
                 result = reduceNode(node.expression, f, result);
                 break;
-            case 206:
-            case 213:
+            case 210:
+            case 217:
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.statement, f, result);
                 break;
-            case 207:
+            case 211:
                 result = reduceNode(node.initializer, f, result);
                 result = reduceNode(node.condition, f, result);
                 result = reduceNode(node.incrementor, f, result);
                 result = reduceNode(node.statement, f, result);
                 break;
-            case 208:
-            case 209:
+            case 212:
+            case 213:
                 result = reduceNode(node.initializer, f, result);
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.statement, f, result);
                 break;
-            case 212:
             case 216:
+            case 220:
                 result = reduceNode(node.expression, f, result);
                 break;
-            case 214:
+            case 218:
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.caseBlock, f, result);
                 break;
-            case 215:
+            case 219:
                 result = reduceNode(node.label, f, result);
                 result = reduceNode(node.statement, f, result);
                 break;
-            case 217:
+            case 221:
                 result = reduceNode(node.tryBlock, f, result);
                 result = reduceNode(node.catchClause, f, result);
                 result = reduceNode(node.finallyBlock, f, result);
                 break;
-            case 219:
+            case 223:
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.type, f, result);
                 result = reduceNode(node.initializer, f, result);
                 break;
-            case 220:
+            case 224:
                 result = ts.reduceLeft(node.declarations, f, result);
                 break;
-            case 221:
+            case 225:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
@@ -35740,7 +37765,7 @@ var ts;
                 result = reduceNode(node.type, f, result);
                 result = reduceNode(node.body, f, result);
                 break;
-            case 222:
+            case 226:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
@@ -35748,89 +37773,92 @@ var ts;
                 result = ts.reduceLeft(node.heritageClauses, f, result);
                 result = ts.reduceLeft(node.members, f, result);
                 break;
-            case 228:
+            case 232:
                 result = ts.reduceLeft(node.clauses, f, result);
                 break;
-            case 231:
+            case 235:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.importClause, f, result);
                 result = reduceNode(node.moduleSpecifier, f, result);
                 break;
-            case 232:
+            case 236:
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.namedBindings, f, result);
                 break;
-            case 233:
+            case 237:
                 result = reduceNode(node.name, f, result);
                 break;
-            case 234:
             case 238:
+            case 242:
                 result = ts.reduceLeft(node.elements, f, result);
                 break;
-            case 235:
             case 239:
+            case 243:
                 result = reduceNode(node.propertyName, f, result);
                 result = reduceNode(node.name, f, result);
                 break;
-            case 236:
+            case 240:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.expression, f, result);
                 break;
-            case 237:
+            case 241:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.exportClause, f, result);
                 result = reduceNode(node.moduleSpecifier, f, result);
                 break;
-            case 242:
+            case 246:
                 result = reduceNode(node.openingElement, f, result);
                 result = ts.reduceLeft(node.children, f, result);
                 result = reduceNode(node.closingElement, f, result);
                 break;
-            case 243:
-            case 244:
+            case 247:
+            case 248:
                 result = reduceNode(node.tagName, f, result);
                 result = ts.reduceLeft(node.attributes, f, result);
                 break;
-            case 245:
+            case 249:
                 result = reduceNode(node.tagName, f, result);
                 break;
-            case 246:
+            case 250:
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.initializer, f, result);
                 break;
-            case 247:
-                result = reduceNode(node.expression, f, result);
-                break;
-            case 248:
-                result = reduceNode(node.expression, f, result);
-                break;
-            case 249:
-                result = reduceNode(node.expression, f, result);
-            case 250:
-                result = ts.reduceLeft(node.statements, f, result);
-                break;
             case 251:
-                result = ts.reduceLeft(node.types, f, result);
+                result = reduceNode(node.expression, f, result);
                 break;
             case 252:
+                result = reduceNode(node.expression, f, result);
+                break;
+            case 253:
+                result = reduceNode(node.expression, f, result);
+            case 254:
+                result = ts.reduceLeft(node.statements, f, result);
+                break;
+            case 255:
+                result = ts.reduceLeft(node.types, f, result);
+                break;
+            case 256:
                 result = reduceNode(node.variableDeclaration, f, result);
                 result = reduceNode(node.block, f, result);
                 break;
-            case 253:
+            case 257:
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.initializer, f, result);
                 break;
-            case 254:
+            case 258:
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.objectAssignmentInitializer, f, result);
                 break;
-            case 256:
+            case 259:
+                result = reduceNode(node.expression, f, result);
+                break;
+            case 261:
                 result = ts.reduceLeft(node.statements, f, result);
                 break;
-            case 288:
+            case 293:
                 result = reduceNode(node.expression, f, result);
                 break;
             default:
@@ -35855,6 +37883,7 @@ var ts;
         if (node === undefined) {
             return undefined;
         }
+        aggregateTransformFlags(node);
         var visited = visitor(node);
         if (visited === node) {
             return node;
@@ -35897,6 +37926,7 @@ var ts;
         }
         for (var i = 0; i < count; i++) {
             var node = nodes[i + start];
+            aggregateTransformFlags(node);
             var visited = node !== undefined ? visitor(node) : undefined;
             if (updated !== undefined || visited === undefined || visited !== node) {
                 if (updated === undefined) {
@@ -35933,178 +37963,180 @@ var ts;
             return undefined;
         }
         var kind = node.kind;
-        if ((kind > 0 && kind <= 139)) {
+        if ((kind > 0 && kind <= 140)) {
             return node;
         }
-        if ((kind >= 155 && kind <= 167)) {
+        if ((kind >= 156 && kind <= 171)) {
             return node;
         }
         switch (node.kind) {
-            case 199:
-            case 202:
-            case 194:
-            case 218:
-                return node;
-            case 141:
-                return ts.updateComputedPropertyName(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 143:
-                return ts.updateParameterDeclaration(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.type, visitor, ts.isTypeNode, true), visitNode(node.initializer, visitor, ts.isExpression, true));
-            case 146:
-                return ts.updateProperty(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.type, visitor, ts.isTypeNode, true), visitNode(node.initializer, visitor, ts.isExpression, true));
-            case 148:
-                return ts.updateMethod(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
-            case 149:
-                return ts.updateConstructor(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
-            case 150:
-                return ts.updateGetAccessor(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
-            case 151:
-                return ts.updateSetAccessor(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
-            case 168:
-                return ts.updateObjectBindingPattern(node, visitNodes(node.elements, visitor, ts.isBindingElement));
-            case 169:
-                return ts.updateArrayBindingPattern(node, visitNodes(node.elements, visitor, ts.isArrayBindingElement));
-            case 170:
-                return ts.updateBindingElement(node, visitNode(node.propertyName, visitor, ts.isPropertyName, true), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.initializer, visitor, ts.isExpression, true));
-            case 171:
-                return ts.updateArrayLiteral(node, visitNodes(node.elements, visitor, ts.isExpression));
-            case 172:
-                return ts.updateObjectLiteral(node, visitNodes(node.properties, visitor, ts.isObjectLiteralElementLike));
-            case 173:
-                return ts.updatePropertyAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.name, visitor, ts.isIdentifier));
-            case 174:
-                return ts.updateElementAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.argumentExpression, visitor, ts.isExpression));
-            case 175:
-                return ts.updateCall(node, visitNode(node.expression, visitor, ts.isExpression), visitNodes(node.typeArguments, visitor, ts.isTypeNode), visitNodes(node.arguments, visitor, ts.isExpression));
-            case 176:
-                return ts.updateNew(node, visitNode(node.expression, visitor, ts.isExpression), visitNodes(node.typeArguments, visitor, ts.isTypeNode), visitNodes(node.arguments, visitor, ts.isExpression));
-            case 177:
-                return ts.updateTaggedTemplate(node, visitNode(node.tag, visitor, ts.isExpression), visitNode(node.template, visitor, ts.isTemplateLiteral));
-            case 179:
-                return ts.updateParen(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 180:
-                return ts.updateFunctionExpression(node, visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
-            case 181:
-                return ts.updateArrowFunction(node, visitNodes(node.modifiers, visitor, ts.isModifier), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isConciseBody, true), context.endLexicalEnvironment()));
-            case 182:
-                return ts.updateDelete(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 183:
-                return ts.updateTypeOf(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 184:
-                return ts.updateVoid(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 185:
-                return ts.updateAwait(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 188:
-                return ts.updateBinary(node, visitNode(node.left, visitor, ts.isExpression), visitNode(node.right, visitor, ts.isExpression));
-            case 186:
-                return ts.updatePrefix(node, visitNode(node.operand, visitor, ts.isExpression));
-            case 187:
-                return ts.updatePostfix(node, visitNode(node.operand, visitor, ts.isExpression));
-            case 189:
-                return ts.updateConditional(node, visitNode(node.condition, visitor, ts.isExpression), visitNode(node.whenTrue, visitor, ts.isExpression), visitNode(node.whenFalse, visitor, ts.isExpression));
-            case 190:
-                return ts.updateTemplateExpression(node, visitNode(node.head, visitor, ts.isTemplateHead), visitNodes(node.templateSpans, visitor, ts.isTemplateSpan));
-            case 191:
-                return ts.updateYield(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 192:
-                return ts.updateSpread(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 193:
-                return ts.updateClassExpression(node, visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier, true), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), visitNodes(node.members, visitor, ts.isClassElement));
-            case 195:
-                return ts.updateExpressionWithTypeArguments(node, visitNodes(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.expression, visitor, ts.isExpression));
-            case 198:
-                return ts.updateTemplateSpan(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.literal, visitor, ts.isTemplateMiddleOrTemplateTail));
-            case 200:
-                return ts.updateBlock(node, visitNodes(node.statements, visitor, ts.isStatement));
-            case 201:
-                return ts.updateVariableStatement(node, visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.declarationList, visitor, ts.isVariableDeclarationList));
             case 203:
-                return ts.updateStatement(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 204:
-                return ts.updateIf(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.thenStatement, visitor, ts.isStatement, false, liftToBlock), visitNode(node.elseStatement, visitor, ts.isStatement, true, liftToBlock));
-            case 205:
-                return ts.updateDo(node, visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock), visitNode(node.expression, visitor, ts.isExpression));
             case 206:
-                return ts.updateWhile(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock));
-            case 207:
-                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, false, liftToBlock));
-            case 208:
-                return ts.updateForIn(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock));
-            case 209:
-                return ts.updateForOf(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock));
-            case 210:
-                return ts.updateContinue(node, visitNode(node.label, visitor, ts.isIdentifier, true));
-            case 211:
-                return ts.updateBreak(node, visitNode(node.label, visitor, ts.isIdentifier, true));
-            case 212:
-                return ts.updateReturn(node, visitNode(node.expression, visitor, ts.isExpression, true));
-            case 213:
-                return ts.updateWith(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock));
-            case 214:
-                return ts.updateSwitch(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.caseBlock, visitor, ts.isCaseBlock));
-            case 215:
-                return ts.updateLabel(node, visitNode(node.label, visitor, ts.isIdentifier), visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock));
-            case 216:
-                return ts.updateThrow(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 217:
-                return ts.updateTry(node, visitNode(node.tryBlock, visitor, ts.isBlock), visitNode(node.catchClause, visitor, ts.isCatchClause, true), visitNode(node.finallyBlock, visitor, ts.isBlock, true));
-            case 219:
-                return ts.updateVariableDeclaration(node, visitNode(node.name, visitor, ts.isBindingName), visitNode(node.type, visitor, ts.isTypeNode, true), visitNode(node.initializer, visitor, ts.isExpression, true));
-            case 220:
-                return ts.updateVariableDeclarationList(node, visitNodes(node.declarations, visitor, ts.isVariableDeclaration));
-            case 221:
-                return ts.updateFunctionDeclaration(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
+            case 198:
             case 222:
+                return node;
+            case 142:
+                return ts.updateComputedPropertyName(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 144:
+                return ts.updateParameter(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.type, visitor, ts.isTypeNode, true), visitNode(node.initializer, visitor, ts.isExpression, true));
+            case 147:
+                return ts.updateProperty(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.type, visitor, ts.isTypeNode, true), visitNode(node.initializer, visitor, ts.isExpression, true));
+            case 149:
+                return ts.updateMethod(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
+            case 150:
+                return ts.updateConstructor(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
+            case 151:
+                return ts.updateGetAccessor(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
+            case 152:
+                return ts.updateSetAccessor(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
+            case 172:
+                return ts.updateObjectBindingPattern(node, visitNodes(node.elements, visitor, ts.isBindingElement));
+            case 173:
+                return ts.updateArrayBindingPattern(node, visitNodes(node.elements, visitor, ts.isArrayBindingElement));
+            case 174:
+                return ts.updateBindingElement(node, visitNode(node.propertyName, visitor, ts.isPropertyName, true), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.initializer, visitor, ts.isExpression, true));
+            case 175:
+                return ts.updateArrayLiteral(node, visitNodes(node.elements, visitor, ts.isExpression));
+            case 176:
+                return ts.updateObjectLiteral(node, visitNodes(node.properties, visitor, ts.isObjectLiteralElementLike));
+            case 177:
+                return ts.updatePropertyAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.name, visitor, ts.isIdentifier));
+            case 178:
+                return ts.updateElementAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.argumentExpression, visitor, ts.isExpression));
+            case 179:
+                return ts.updateCall(node, visitNode(node.expression, visitor, ts.isExpression), visitNodes(node.typeArguments, visitor, ts.isTypeNode), visitNodes(node.arguments, visitor, ts.isExpression));
+            case 180:
+                return ts.updateNew(node, visitNode(node.expression, visitor, ts.isExpression), visitNodes(node.typeArguments, visitor, ts.isTypeNode), visitNodes(node.arguments, visitor, ts.isExpression));
+            case 181:
+                return ts.updateTaggedTemplate(node, visitNode(node.tag, visitor, ts.isExpression), visitNode(node.template, visitor, ts.isTemplateLiteral));
+            case 183:
+                return ts.updateParen(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 184:
+                return ts.updateFunctionExpression(node, visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
+            case 185:
+                return ts.updateArrowFunction(node, visitNodes(node.modifiers, visitor, ts.isModifier), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isConciseBody, true), context.endLexicalEnvironment()));
+            case 186:
+                return ts.updateDelete(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 187:
+                return ts.updateTypeOf(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 188:
+                return ts.updateVoid(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 189:
+                return ts.updateAwait(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 192:
+                return ts.updateBinary(node, visitNode(node.left, visitor, ts.isExpression), visitNode(node.right, visitor, ts.isExpression));
+            case 190:
+                return ts.updatePrefix(node, visitNode(node.operand, visitor, ts.isExpression));
+            case 191:
+                return ts.updatePostfix(node, visitNode(node.operand, visitor, ts.isExpression));
+            case 193:
+                return ts.updateConditional(node, visitNode(node.condition, visitor, ts.isExpression), visitNode(node.whenTrue, visitor, ts.isExpression), visitNode(node.whenFalse, visitor, ts.isExpression));
+            case 194:
+                return ts.updateTemplateExpression(node, visitNode(node.head, visitor, ts.isTemplateHead), visitNodes(node.templateSpans, visitor, ts.isTemplateSpan));
+            case 195:
+                return ts.updateYield(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 196:
+                return ts.updateSpread(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 197:
+                return ts.updateClassExpression(node, visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier, true), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), visitNodes(node.members, visitor, ts.isClassElement));
+            case 199:
+                return ts.updateExpressionWithTypeArguments(node, visitNodes(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.expression, visitor, ts.isExpression));
+            case 202:
+                return ts.updateTemplateSpan(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.literal, visitor, ts.isTemplateMiddleOrTemplateTail));
+            case 204:
+                return ts.updateBlock(node, visitNodes(node.statements, visitor, ts.isStatement));
+            case 205:
+                return ts.updateVariableStatement(node, visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.declarationList, visitor, ts.isVariableDeclarationList));
+            case 207:
+                return ts.updateStatement(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 208:
+                return ts.updateIf(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.thenStatement, visitor, ts.isStatement, false, liftToBlock), visitNode(node.elseStatement, visitor, ts.isStatement, true, liftToBlock));
+            case 209:
+                return ts.updateDo(node, visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock), visitNode(node.expression, visitor, ts.isExpression));
+            case 210:
+                return ts.updateWhile(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock));
+            case 211:
+                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, false, liftToBlock));
+            case 212:
+                return ts.updateForIn(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock));
+            case 213:
+                return ts.updateForOf(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock));
+            case 214:
+                return ts.updateContinue(node, visitNode(node.label, visitor, ts.isIdentifier, true));
+            case 215:
+                return ts.updateBreak(node, visitNode(node.label, visitor, ts.isIdentifier, true));
+            case 216:
+                return ts.updateReturn(node, visitNode(node.expression, visitor, ts.isExpression, true));
+            case 217:
+                return ts.updateWith(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock));
+            case 218:
+                return ts.updateSwitch(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.caseBlock, visitor, ts.isCaseBlock));
+            case 219:
+                return ts.updateLabel(node, visitNode(node.label, visitor, ts.isIdentifier), visitNode(node.statement, visitor, ts.isStatement, false, liftToBlock));
+            case 220:
+                return ts.updateThrow(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 221:
+                return ts.updateTry(node, visitNode(node.tryBlock, visitor, ts.isBlock), visitNode(node.catchClause, visitor, ts.isCatchClause, true), visitNode(node.finallyBlock, visitor, ts.isBlock, true));
+            case 223:
+                return ts.updateVariableDeclaration(node, visitNode(node.name, visitor, ts.isBindingName), visitNode(node.type, visitor, ts.isTypeNode, true), visitNode(node.initializer, visitor, ts.isExpression, true));
+            case 224:
+                return ts.updateVariableDeclarationList(node, visitNodes(node.declarations, visitor, ts.isVariableDeclaration));
+            case 225:
+                return ts.updateFunctionDeclaration(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, true), context.endLexicalEnvironment()));
+            case 226:
                 return ts.updateClassDeclaration(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier, true), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), visitNodes(node.members, visitor, ts.isClassElement));
-            case 228:
-                return ts.updateCaseBlock(node, visitNodes(node.clauses, visitor, ts.isCaseOrDefaultClause));
-            case 231:
-                return ts.updateImportDeclaration(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.importClause, visitor, ts.isImportClause, true), visitNode(node.moduleSpecifier, visitor, ts.isExpression));
             case 232:
-                return ts.updateImportClause(node, visitNode(node.name, visitor, ts.isIdentifier, true), visitNode(node.namedBindings, visitor, ts.isNamedImportBindings, true));
-            case 233:
-                return ts.updateNamespaceImport(node, visitNode(node.name, visitor, ts.isIdentifier));
-            case 234:
-                return ts.updateNamedImports(node, visitNodes(node.elements, visitor, ts.isImportSpecifier));
+                return ts.updateCaseBlock(node, visitNodes(node.clauses, visitor, ts.isCaseOrDefaultClause));
             case 235:
-                return ts.updateImportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier, true), visitNode(node.name, visitor, ts.isIdentifier));
+                return ts.updateImportDeclaration(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.importClause, visitor, ts.isImportClause, true), visitNode(node.moduleSpecifier, visitor, ts.isExpression));
             case 236:
-                return ts.updateExportAssignment(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.expression, visitor, ts.isExpression));
+                return ts.updateImportClause(node, visitNode(node.name, visitor, ts.isIdentifier, true), visitNode(node.namedBindings, visitor, ts.isNamedImportBindings, true));
             case 237:
-                return ts.updateExportDeclaration(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.exportClause, visitor, ts.isNamedExports, true), visitNode(node.moduleSpecifier, visitor, ts.isExpression, true));
+                return ts.updateNamespaceImport(node, visitNode(node.name, visitor, ts.isIdentifier));
             case 238:
-                return ts.updateNamedExports(node, visitNodes(node.elements, visitor, ts.isExportSpecifier));
+                return ts.updateNamedImports(node, visitNodes(node.elements, visitor, ts.isImportSpecifier));
             case 239:
-                return ts.updateExportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier, true), visitNode(node.name, visitor, ts.isIdentifier));
+                return ts.updateImportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier, true), visitNode(node.name, visitor, ts.isIdentifier));
+            case 240:
+                return ts.updateExportAssignment(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.expression, visitor, ts.isExpression));
+            case 241:
+                return ts.updateExportDeclaration(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.exportClause, visitor, ts.isNamedExports, true), visitNode(node.moduleSpecifier, visitor, ts.isExpression, true));
             case 242:
-                return ts.updateJsxElement(node, visitNode(node.openingElement, visitor, ts.isJsxOpeningElement), visitNodes(node.children, visitor, ts.isJsxChild), visitNode(node.closingElement, visitor, ts.isJsxClosingElement));
+                return ts.updateNamedExports(node, visitNodes(node.elements, visitor, ts.isExportSpecifier));
             case 243:
-                return ts.updateJsxSelfClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), visitNodes(node.attributes, visitor, ts.isJsxAttributeLike));
-            case 244:
-                return ts.updateJsxOpeningElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), visitNodes(node.attributes, visitor, ts.isJsxAttributeLike));
-            case 245:
-                return ts.updateJsxClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression));
+                return ts.updateExportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier, true), visitNode(node.name, visitor, ts.isIdentifier));
             case 246:
-                return ts.updateJsxAttribute(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.initializer, visitor, ts.isStringLiteralOrJsxExpression));
+                return ts.updateJsxElement(node, visitNode(node.openingElement, visitor, ts.isJsxOpeningElement), visitNodes(node.children, visitor, ts.isJsxChild), visitNode(node.closingElement, visitor, ts.isJsxClosingElement));
             case 247:
-                return ts.updateJsxSpreadAttribute(node, visitNode(node.expression, visitor, ts.isExpression));
+                return ts.updateJsxSelfClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), visitNodes(node.attributes, visitor, ts.isJsxAttributeLike));
             case 248:
-                return ts.updateJsxExpression(node, visitNode(node.expression, visitor, ts.isExpression));
+                return ts.updateJsxOpeningElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), visitNodes(node.attributes, visitor, ts.isJsxAttributeLike));
             case 249:
-                return ts.updateCaseClause(node, visitNode(node.expression, visitor, ts.isExpression), visitNodes(node.statements, visitor, ts.isStatement));
+                return ts.updateJsxClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression));
             case 250:
-                return ts.updateDefaultClause(node, visitNodes(node.statements, visitor, ts.isStatement));
+                return ts.updateJsxAttribute(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.initializer, visitor, ts.isStringLiteralOrJsxExpression));
             case 251:
-                return ts.updateHeritageClause(node, visitNodes(node.types, visitor, ts.isExpressionWithTypeArguments));
+                return ts.updateJsxSpreadAttribute(node, visitNode(node.expression, visitor, ts.isExpression));
             case 252:
-                return ts.updateCatchClause(node, visitNode(node.variableDeclaration, visitor, ts.isVariableDeclaration), visitNode(node.block, visitor, ts.isBlock));
+                return ts.updateJsxExpression(node, visitNode(node.expression, visitor, ts.isExpression));
             case 253:
-                return ts.updatePropertyAssignment(node, visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.initializer, visitor, ts.isExpression));
+                return ts.updateCaseClause(node, visitNode(node.expression, visitor, ts.isExpression), visitNodes(node.statements, visitor, ts.isStatement));
             case 254:
-                return ts.updateShorthandPropertyAssignment(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.objectAssignmentInitializer, visitor, ts.isExpression));
+                return ts.updateDefaultClause(node, visitNodes(node.statements, visitor, ts.isStatement));
+            case 255:
+                return ts.updateHeritageClause(node, visitNodes(node.types, visitor, ts.isExpressionWithTypeArguments));
             case 256:
+                return ts.updateCatchClause(node, visitNode(node.variableDeclaration, visitor, ts.isVariableDeclaration), visitNode(node.block, visitor, ts.isBlock));
+            case 257:
+                return ts.updatePropertyAssignment(node, visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.initializer, visitor, ts.isExpression));
+            case 258:
+                return ts.updateShorthandPropertyAssignment(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.objectAssignmentInitializer, visitor, ts.isExpression));
+            case 259:
+                return ts.updateSpreadAssignment(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 261:
                 context.startLexicalEnvironment();
                 return ts.updateSourceFileNode(node, ts.createNodeArray(ts.concatenate(visitNodes(node.statements, visitor, ts.isStatement), context.endLexicalEnvironment()), node.statements));
-            case 288:
+            case 293:
                 return ts.updatePartiallyEmittedExpression(node, visitNode(node.expression, visitor, ts.isExpression));
             default:
                 var updated = void 0;
@@ -36163,7 +38195,7 @@ var ts;
             return 0;
         }
         else if (node.transformFlags & 536870912) {
-            return node.transformFlags & ~getTransformFlagsSubtreeExclusions(node.kind);
+            return node.transformFlags & ~ts.getTransformFlagsSubtreeExclusions(node.kind);
         }
         else {
             var subtreeFlags = aggregateTransformFlagsForSubtree(node);
@@ -36179,68 +38211,17 @@ var ts;
     function aggregateTransformFlagsForChildNode(transformFlags, child) {
         return transformFlags | aggregateTransformFlagsForNode(child);
     }
-    function getTransformFlagsSubtreeExclusions(kind) {
-        if (kind >= 155 && kind <= 167) {
-            return -3;
-        }
-        switch (kind) {
-            case 175:
-            case 176:
-            case 171:
-                return 537922901;
-            case 226:
-                return 574729557;
-            case 143:
-                return 545262933;
-            case 181:
-                return 592227669;
-            case 180:
-            case 221:
-                return 592293205;
-            case 220:
-                return 545262933;
-            case 222:
-            case 193:
-                return 539749717;
-            case 149:
-                return 591760725;
-            case 148:
-            case 150:
-            case 151:
-                return 591760725;
-            case 118:
-            case 131:
-            case 128:
-            case 133:
-            case 121:
-            case 134:
-            case 104:
-            case 142:
-            case 145:
-            case 147:
-            case 152:
-            case 153:
-            case 154:
-            case 223:
-            case 224:
-                return -3;
-            case 172:
-                return 539110741;
-            default:
-                return 536874325;
-        }
-    }
     var Debug;
     (function (Debug) {
         Debug.failNotOptional = Debug.shouldAssert(1)
             ? function (message) { return Debug.assert(false, message || "Node not optional."); }
-            : function () { };
+            : ts.noop;
         Debug.failBadSyntaxKind = Debug.shouldAssert(1)
             ? function (node, message) { return Debug.assert(false, message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " was unexpected."; }); }
-            : function () { };
+            : 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 '" + getFunctionName(test) + "'."; }); }
-            : function () { };
+            : ts.noop;
         function getFunctionName(func) {
             if (typeof func !== "function") {
                 return "";
@@ -36259,7 +38240,7 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    function flattenDestructuringAssignment(context, node, needsValue, recordTempVariable, visitor) {
+    function flattenDestructuringAssignment(context, node, needsValue, recordTempVariable, visitor, transformRest) {
         if (ts.isEmptyObjectLiteralOrArrayLiteral(node.left)) {
             var right = node.right;
             if (ts.isDestructuringAssignment(right)) {
@@ -36278,7 +38259,7 @@ var ts;
         else if (ts.nodeIsSynthesized(node)) {
             location = value;
         }
-        flattenDestructuring(node, value, location, emitAssignment, emitTempVariableAssignment, visitor);
+        flattenDestructuring(node, value, location, emitAssignment, emitTempVariableAssignment, recordTempVariable, emitRestAssignment, transformRest, visitor);
         if (needsValue) {
             expressions.push(value);
         }
@@ -36296,11 +38277,14 @@ var ts;
             emitAssignment(name, value, location);
             return name;
         }
+        function emitRestAssignment(elements, value, location) {
+            emitAssignment(ts.createObjectLiteral(elements), value, location);
+        }
     }
     ts.flattenDestructuringAssignment = flattenDestructuringAssignment;
-    function flattenParameterDestructuring(node, value, visitor) {
+    function flattenParameterDestructuring(node, value, visitor, transformRest) {
         var declarations = [];
-        flattenDestructuring(node, value, node, emitAssignment, emitTempVariableAssignment, visitor);
+        flattenDestructuring(node, value, node, emitAssignment, emitTempVariableAssignment, ts.noop, emitRestAssignment, transformRest, visitor);
         return declarations;
         function emitAssignment(name, value, location) {
             var declaration = ts.createVariableDeclaration(name, undefined, value, location);
@@ -36313,12 +38297,15 @@ var ts;
             emitAssignment(name, value, location);
             return name;
         }
+        function emitRestAssignment(elements, value, location) {
+            emitAssignment(ts.createObjectBindingPattern(elements), value, location);
+        }
     }
     ts.flattenParameterDestructuring = flattenParameterDestructuring;
-    function flattenVariableDestructuring(node, value, visitor, recordTempVariable) {
+    function flattenVariableDestructuring(node, value, visitor, recordTempVariable, transformRest) {
         var declarations = [];
         var pendingAssignments;
-        flattenDestructuring(node, value, node, emitAssignment, emitTempVariableAssignment, visitor);
+        flattenDestructuring(node, value, node, emitAssignment, emitTempVariableAssignment, recordTempVariable, emitRestAssignment, transformRest, visitor);
         return declarations;
         function emitAssignment(name, value, location, original) {
             if (pendingAssignments) {
@@ -36348,33 +38335,39 @@ var ts;
             }
             return name;
         }
+        function emitRestAssignment(elements, value, location, original) {
+            emitAssignment(ts.createObjectBindingPattern(elements), value, location, original);
+        }
     }
     ts.flattenVariableDestructuring = flattenVariableDestructuring;
-    function flattenVariableDestructuringToExpression(node, recordTempVariable, nameSubstitution, visitor) {
+    function flattenVariableDestructuringToExpression(node, recordTempVariable, createAssignmentCallback, visitor) {
         var pendingAssignments = [];
-        flattenDestructuring(node, undefined, node, emitAssignment, emitTempVariableAssignment, visitor);
+        flattenDestructuring(node, undefined, node, emitAssignment, emitTempVariableAssignment, ts.noop, emitRestAssignment, false, visitor);
         var expression = ts.inlineExpressions(pendingAssignments);
         ts.aggregateTransformFlags(expression);
         return expression;
         function emitAssignment(name, value, location, original) {
-            var left = nameSubstitution && nameSubstitution(name) || name;
-            emitPendingAssignment(left, value, location, original);
+            var expression = createAssignmentCallback
+                ? createAssignmentCallback(name.kind === 70 ? name : emitTempVariableAssignment(name, location), value, location)
+                : ts.createAssignment(name, value, location);
+            emitPendingAssignment(expression, original);
         }
         function emitTempVariableAssignment(value, location) {
             var name = ts.createTempVariable(recordTempVariable);
-            emitPendingAssignment(name, value, location, undefined);
+            emitPendingAssignment(ts.createAssignment(name, value, location), undefined);
             return name;
         }
-        function emitPendingAssignment(name, value, location, original) {
-            var expression = ts.createAssignment(name, value, location);
+        function emitRestAssignment(elements, value, location, original) {
+            emitAssignment(ts.createObjectLiteral(elements), value, location, original);
+        }
+        function emitPendingAssignment(expression, original) {
             expression.original = original;
             ts.setEmitFlags(expression, 2048);
             pendingAssignments.push(expression);
-            return expression;
         }
     }
     ts.flattenVariableDestructuringToExpression = flattenVariableDestructuringToExpression;
-    function flattenDestructuring(root, value, location, emitAssignment, emitTempVariableAssignment, visitor) {
+    function flattenDestructuring(root, value, location, emitAssignment, emitTempVariableAssignment, recordTempVariable, emitRestAssignment, transformRest, visitor) {
         if (value && visitor) {
             value = ts.visitNode(value, visitor, ts.isExpression);
         }
@@ -36405,17 +38398,17 @@ var ts;
             else {
                 target = bindingTarget;
             }
-            if (target.kind === 172) {
+            if (target.kind === 176) {
                 emitObjectLiteralAssignment(target, value, location);
             }
-            else if (target.kind === 171) {
+            else if (target.kind === 175) {
                 emitArrayLiteralAssignment(target, value, location);
             }
             else {
-                var name_26 = ts.getMutableClone(target);
-                ts.setSourceMapRange(name_26, target);
-                ts.setCommentRange(name_26, target);
-                emitAssignment(name_26, value, location, undefined);
+                var name_32 = ts.getMutableClone(target);
+                ts.setSourceMapRange(name_32, target);
+                ts.setCommentRange(name_32, target);
+                emitAssignment(name_32, value, location, undefined);
             }
         }
         function emitObjectLiteralAssignment(target, value, location) {
@@ -36423,16 +38416,79 @@ var ts;
             if (properties.length !== 1) {
                 value = ensureIdentifier(value, true, location, emitTempVariableAssignment);
             }
-            for (var _i = 0, properties_6 = properties; _i < properties_6.length; _i++) {
-                var p = properties_6[_i];
-                if (p.kind === 253 || p.kind === 254) {
-                    var propName = p.name;
-                    var target_1 = p.kind === 254 ? p : p.initializer || propName;
-                    emitDestructuringAssignment(target_1, createDestructuringPropertyAccess(value, propName), p);
+            var bindingElements = [];
+            for (var i = 0; i < properties.length; i++) {
+                var p = properties[i];
+                if (p.kind === 257 || p.kind === 258) {
+                    if (!transformRest ||
+                        p.transformFlags & 8388608 ||
+                        (p.kind === 257 && p.initializer.transformFlags & 8388608)) {
+                        if (bindingElements.length) {
+                            emitRestAssignment(bindingElements, value, location, target);
+                            bindingElements = [];
+                        }
+                        var propName = p.name;
+                        var bindingTarget = p.kind === 258 ? p : p.initializer || propName;
+                        emitDestructuringAssignment(bindingTarget, createDestructuringPropertyAccess(value, propName), p);
+                    }
+                    else {
+                        bindingElements.push(p);
+                    }
                 }
+                else if (i === properties.length - 1 &&
+                    p.kind === 259 &&
+                    p.expression.kind === 70) {
+                    if (bindingElements.length) {
+                        emitRestAssignment(bindingElements, value, location, target);
+                        bindingElements = [];
+                    }
+                    var propName = p.expression;
+                    var restCall = createRestCall(value, target.properties, function (p) { return p.name; }, target);
+                    emitDestructuringAssignment(propName, restCall, p);
+                }
+            }
+            if (bindingElements.length) {
+                emitRestAssignment(bindingElements, value, location, target);
+                bindingElements = [];
             }
         }
         function emitArrayLiteralAssignment(target, value, location) {
+            if (transformRest) {
+                emitESNextArrayLiteralAssignment(target, value, location);
+            }
+            else {
+                emitES2015ArrayLiteralAssignment(target, value, location);
+            }
+        }
+        function emitESNextArrayLiteralAssignment(target, value, location) {
+            var elements = target.elements;
+            var numElements = elements.length;
+            if (numElements !== 1) {
+                value = ensureIdentifier(value, true, location, emitTempVariableAssignment);
+            }
+            var expressions = [];
+            var spreadContainingExpressions = [];
+            for (var i = 0; i < numElements; i++) {
+                var e = elements[i];
+                if (e.kind === 198) {
+                    continue;
+                }
+                if (e.transformFlags & 8388608 && i < numElements - 1) {
+                    var tmp = ts.createTempVariable(recordTempVariable);
+                    spreadContainingExpressions.push([e, tmp]);
+                    expressions.push(tmp);
+                }
+                else {
+                    expressions.push(e);
+                }
+            }
+            emitAssignment(ts.updateArrayLiteral(target, expressions), value, undefined, undefined);
+            for (var _i = 0, spreadContainingExpressions_1 = spreadContainingExpressions; _i < spreadContainingExpressions_1.length; _i++) {
+                var _a = spreadContainingExpressions_1[_i], e = _a[0], tmp = _a[1];
+                emitDestructuringAssignment(e, tmp, e);
+            }
+        }
+        function emitES2015ArrayLiteralAssignment(target, value, location) {
             var elements = target.elements;
             var numElements = elements.length;
             if (numElements !== 1) {
@@ -36440,8 +38496,8 @@ var ts;
             }
             for (var i = 0; i < numElements; i++) {
                 var e = elements[i];
-                if (e.kind !== 194) {
-                    if (e.kind !== 192) {
+                if (e.kind !== 198) {
+                    if (e.kind !== 196) {
                         emitDestructuringAssignment(e, ts.createElementAccess(value, ts.createLiteral(i)), e);
                     }
                     else if (i === numElements - 1) {
@@ -36450,42 +38506,130 @@ var ts;
                 }
             }
         }
+        function createRestCall(value, elements, getPropertyName, location) {
+            var propertyNames = [];
+            for (var i = 0; i < elements.length - 1; i++) {
+                if (ts.isOmittedExpression(elements[i])) {
+                    continue;
+                }
+                var str = ts.createSynthesizedNode(9);
+                str.pos = location.pos;
+                str.end = location.end;
+                str.text = ts.getTextOfPropertyName(getPropertyName(elements[i]));
+                propertyNames.push(str);
+            }
+            var args = ts.createSynthesizedNodeArray([value, ts.createArrayLiteral(propertyNames, location)]);
+            return ts.createCall(ts.createIdentifier("__rest"), undefined, args);
+        }
         function emitBindingElement(target, value) {
             var initializer = visitor ? ts.visitNode(target.initializer, visitor, ts.isExpression) : target.initializer;
-            if (initializer) {
+            if (transformRest) {
+                value = value || initializer;
+            }
+            else if (initializer) {
                 value = value ? createDefaultValueCheck(value, initializer, target) : initializer;
             }
             else if (!value) {
                 value = ts.createVoidZero();
             }
             var name = target.name;
-            if (ts.isBindingPattern(name)) {
-                var elements = name.elements;
-                var numElements = elements.length;
+            if (!ts.isBindingPattern(name)) {
+                emitAssignment(name, value, target, target);
+            }
+            else {
+                var numElements = name.elements.length;
                 if (numElements !== 1) {
                     value = ensureIdentifier(value, numElements !== 0, target, emitTempVariableAssignment);
                 }
-                for (var i = 0; i < numElements; i++) {
-                    var element = elements[i];
-                    if (ts.isOmittedExpression(element)) {
-                        continue;
-                    }
-                    else if (name.kind === 168) {
-                        var propName = element.propertyName || element.name;
-                        emitBindingElement(element, createDestructuringPropertyAccess(value, propName));
-                    }
-                    else {
-                        if (!element.dotDotDotToken) {
-                            emitBindingElement(element, ts.createElementAccess(value, i));
-                        }
-                        else if (i === numElements - 1) {
-                            emitBindingElement(element, ts.createArraySlice(value, i));
-                        }
-                    }
+                if (name.kind === 173) {
+                    emitArrayBindingElement(name, value);
+                }
+                else {
+                    emitObjectBindingElement(target, value);
                 }
             }
+        }
+        function emitArrayBindingElement(name, value) {
+            if (transformRest) {
+                emitESNextArrayBindingElement(name, value);
+            }
             else {
-                emitAssignment(name, value, target, target);
+                emitES2015ArrayBindingElement(name, value);
+            }
+        }
+        function emitES2015ArrayBindingElement(name, value) {
+            var elements = name.elements;
+            var numElements = elements.length;
+            for (var i = 0; i < numElements; i++) {
+                var element = elements[i];
+                if (ts.isOmittedExpression(element)) {
+                    continue;
+                }
+                if (!element.dotDotDotToken) {
+                    emitBindingElement(element, ts.createElementAccess(value, i));
+                }
+                else if (i === numElements - 1) {
+                    emitBindingElement(element, ts.createArraySlice(value, i));
+                }
+            }
+        }
+        function emitESNextArrayBindingElement(name, value) {
+            var elements = name.elements;
+            var numElements = elements.length;
+            var bindingElements = [];
+            var spreadContainingElements = [];
+            for (var i = 0; i < numElements; i++) {
+                var element = elements[i];
+                if (ts.isOmittedExpression(element)) {
+                    continue;
+                }
+                if (element.transformFlags & 8388608 && i < numElements - 1) {
+                    spreadContainingElements.push(element);
+                    bindingElements.push(ts.createBindingElement(undefined, undefined, ts.getGeneratedNameForNode(element), undefined, value));
+                }
+                else {
+                    bindingElements.push(element);
+                }
+            }
+            emitAssignment(ts.updateArrayBindingPattern(name, bindingElements), value, undefined, undefined);
+            for (var _i = 0, spreadContainingElements_1 = spreadContainingElements; _i < spreadContainingElements_1.length; _i++) {
+                var element = spreadContainingElements_1[_i];
+                emitBindingElement(element, ts.getGeneratedNameForNode(element));
+            }
+        }
+        function emitObjectBindingElement(target, value) {
+            var name = target.name;
+            var elements = name.elements;
+            var numElements = elements.length;
+            var bindingElements = [];
+            for (var i = 0; i < numElements; i++) {
+                var element = elements[i];
+                if (ts.isOmittedExpression(element)) {
+                    continue;
+                }
+                if (i === numElements - 1 && element.dotDotDotToken) {
+                    if (bindingElements.length) {
+                        emitRestAssignment(bindingElements, value, target, target);
+                        bindingElements = [];
+                    }
+                    var restCall = createRestCall(value, name.elements, function (element) { return element.propertyName || element.name; }, name);
+                    emitBindingElement(element, restCall);
+                }
+                else if (transformRest && !(element.transformFlags & 8388608)) {
+                    bindingElements.push(element);
+                }
+                else {
+                    if (bindingElements.length) {
+                        emitRestAssignment(bindingElements, value, target, target);
+                        bindingElements = [];
+                    }
+                    var propName = element.propertyName || element.name;
+                    emitBindingElement(element, createDestructuringPropertyAccess(value, propName));
+                }
+            }
+            if (bindingElements.length) {
+                emitRestAssignment(bindingElements, value, target, target);
+                bindingElements = [];
             }
         }
         function createDefaultValueCheck(value, defaultValue, location) {
@@ -36528,12 +38672,6 @@ var ts;
 var ts;
 (function (ts) {
     var USE_NEW_TYPE_METADATA_FORMAT = false;
-    var TypeScriptSubstitutionFlags;
-    (function (TypeScriptSubstitutionFlags) {
-        TypeScriptSubstitutionFlags[TypeScriptSubstitutionFlags["ClassAliases"] = 1] = "ClassAliases";
-        TypeScriptSubstitutionFlags[TypeScriptSubstitutionFlags["NamespaceExports"] = 2] = "NamespaceExports";
-        TypeScriptSubstitutionFlags[TypeScriptSubstitutionFlags["NonQualifiedEnumMembers"] = 8] = "NonQualifiedEnumMembers";
-    })(TypeScriptSubstitutionFlags || (TypeScriptSubstitutionFlags = {}));
     function transformTypeScript(context) {
         var startLexicalEnvironment = context.startLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration;
         var resolver = context.getEmitResolver();
@@ -36544,14 +38682,14 @@ var ts;
         var previousOnSubstituteNode = context.onSubstituteNode;
         context.onEmitNode = onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
-        context.enableSubstitution(173);
-        context.enableSubstitution(174);
+        context.enableSubstitution(177);
+        context.enableSubstitution(178);
         var currentSourceFile;
         var currentNamespace;
         var currentNamespaceContainerName;
         var currentScope;
         var currentScopeFirstDeclarationsOfName;
-        var currentSourceFileExternalHelpersModuleName;
+        var currentExternalHelpersModuleName;
         var enabledSubstitutions;
         var classAliases;
         var applicableSubstitutions;
@@ -36577,7 +38715,7 @@ var ts;
             return saveStateAndInvoke(node, visitorWorker);
         }
         function visitorWorker(node) {
-            if (node.kind === 256) {
+            if (node.kind === 261) {
                 return visitSourceFile(node);
             }
             else if (node.transformFlags & 1) {
@@ -36593,13 +38731,13 @@ var ts;
         }
         function sourceElementVisitorWorker(node) {
             switch (node.kind) {
-                case 231:
+                case 235:
                     return visitImportDeclaration(node);
-                case 230:
+                case 234:
                     return visitImportEqualsDeclaration(node);
-                case 236:
+                case 240:
                     return visitExportAssignment(node);
-                case 237:
+                case 241:
                     return visitExportDeclaration(node);
                 default:
                     return visitorWorker(node);
@@ -36609,11 +38747,11 @@ var ts;
             return saveStateAndInvoke(node, namespaceElementVisitorWorker);
         }
         function namespaceElementVisitorWorker(node) {
-            if (node.kind === 237 ||
-                node.kind === 231 ||
-                node.kind === 232 ||
-                (node.kind === 230 &&
-                    node.moduleReference.kind === 241)) {
+            if (node.kind === 241 ||
+                node.kind === 235 ||
+                node.kind === 236 ||
+                (node.kind === 234 &&
+                    node.moduleReference.kind === 245)) {
                 return undefined;
             }
             else if (node.transformFlags & 1 || ts.hasModifier(node, 1)) {
@@ -36629,21 +38767,30 @@ var ts;
         }
         function classElementVisitorWorker(node) {
             switch (node.kind) {
-                case 149:
-                    return undefined;
-                case 146:
-                case 154:
                 case 150:
+                    return undefined;
+                case 147:
+                case 155:
                 case 151:
-                case 148:
+                case 152:
+                case 149:
                     return visitorWorker(node);
-                case 199:
+                case 203:
                     return node;
                 default:
                     ts.Debug.failBadSyntaxKind(node);
                     return undefined;
             }
         }
+        function modifierVisitor(node) {
+            if (ts.modifierToFlag(node.kind) & 2270) {
+                return undefined;
+            }
+            else if (currentNamespace && node.kind === 83) {
+                return undefined;
+            }
+            return node;
+        }
         function visitTypeScript(node) {
             if (ts.hasModifier(node, 2) && ts.isStatement(node)) {
                 return ts.createNotEmittedStatement(node);
@@ -36658,78 +38805,81 @@ var ts;
                 case 116:
                 case 75:
                 case 123:
-                case 129:
-                case 161:
+                case 130:
                 case 162:
-                case 160:
-                case 155:
-                case 142:
+                case 163:
+                case 161:
+                case 156:
+                case 143:
                 case 118:
                 case 121:
-                case 133:
-                case 131:
-                case 128:
-                case 104:
                 case 134:
-                case 158:
-                case 157:
+                case 132:
+                case 129:
+                case 104:
+                case 135:
                 case 159:
-                case 156:
-                case 163:
+                case 158:
+                case 160:
+                case 157:
                 case 164:
                 case 165:
                 case 166:
                 case 167:
-                case 154:
-                case 144:
-                case 224:
-                case 146:
-                case 149:
-                    return visitConstructor(node);
-                case 223:
-                    return ts.createNotEmittedStatement(node);
-                case 222:
-                    return visitClassDeclaration(node);
-                case 193:
-                    return visitClassExpression(node);
-                case 251:
-                    return visitHeritageClause(node);
-                case 195:
-                    return visitExpressionWithTypeArguments(node);
-                case 148:
-                    return visitMethodDeclaration(node);
+                case 168:
+                case 169:
+                case 170:
+                case 171:
+                case 155:
+                case 145:
+                case 228:
+                case 147:
                 case 150:
-                    return visitGetAccessor(node);
-                case 151:
-                    return visitSetAccessor(node);
-                case 221:
-                    return visitFunctionDeclaration(node);
-                case 180:
-                    return visitFunctionExpression(node);
-                case 181:
-                    return visitArrowFunction(node);
-                case 143:
-                    return visitParameter(node);
-                case 179:
-                    return visitParenthesizedExpression(node);
-                case 178:
-                case 196:
-                    return visitAssertionExpression(node);
-                case 175:
-                    return visitCallExpression(node);
-                case 176:
-                    return visitNewExpression(node);
-                case 197:
-                    return visitNonNullExpression(node);
-                case 225:
-                    return visitEnumDeclaration(node);
-                case 201:
-                    return visitVariableStatement(node);
-                case 219:
-                    return visitVariableDeclaration(node);
+                    return visitConstructor(node);
+                case 227:
+                    return ts.createNotEmittedStatement(node);
                 case 226:
-                    return visitModuleDeclaration(node);
+                    return visitClassDeclaration(node);
+                case 197:
+                    return visitClassExpression(node);
+                case 255:
+                    return visitHeritageClause(node);
+                case 199:
+                    return visitExpressionWithTypeArguments(node);
+                case 149:
+                    return visitMethodDeclaration(node);
+                case 151:
+                    return visitGetAccessor(node);
+                case 152:
+                    return visitSetAccessor(node);
+                case 225:
+                    return visitFunctionDeclaration(node);
+                case 184:
+                    return visitFunctionExpression(node);
+                case 185:
+                    return visitArrowFunction(node);
+                case 144:
+                    return visitParameter(node);
+                case 183:
+                    return visitParenthesizedExpression(node);
+                case 182:
+                case 200:
+                    return visitAssertionExpression(node);
+                case 179:
+                    return visitCallExpression(node);
+                case 180:
+                    return visitNewExpression(node);
+                case 201:
+                    return visitNonNullExpression(node);
+                case 229:
+                    return visitEnumDeclaration(node);
+                case 205:
+                    return visitVariableStatement(node);
+                case 223:
+                    return visitVariableDeclaration(node);
                 case 230:
+                    return visitModuleDeclaration(node);
+                case 234:
                     return visitImportEqualsDeclaration(node);
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -36738,15 +38888,15 @@ var ts;
         }
         function onBeforeVisitNode(node) {
             switch (node.kind) {
-                case 256:
-                case 228:
-                case 227:
-                case 200:
+                case 261:
+                case 232:
+                case 231:
+                case 204:
                     currentScope = node;
                     currentScopeFirstDeclarationsOfName = undefined;
                     break;
-                case 222:
-                case 221:
+                case 226:
+                case 225:
                     if (ts.hasModifier(node, 2)) {
                         break;
                     }
@@ -36756,10 +38906,11 @@ var ts;
         }
         function visitSourceFile(node) {
             currentSourceFile = node;
-            if (compilerOptions.alwaysStrict) {
+            if (compilerOptions.alwaysStrict &&
+                !(ts.isExternalModule(node) && (compilerOptions.target >= 2 || compilerOptions.module === ts.ModuleKind.ES2015))) {
                 node = ts.ensureUseStrict(node);
             }
-            if (node.flags & 31744
+            if (node.flags & 64512
                 && compilerOptions.importHelpers
                 && (ts.isExternalModule(node) || compilerOptions.isolatedModules)) {
                 startLexicalEnvironment();
@@ -36770,10 +38921,10 @@ var ts;
                 externalHelpersModuleImport.parent = node;
                 externalHelpersModuleImport.flags &= ~8;
                 statements.push(externalHelpersModuleImport);
-                currentSourceFileExternalHelpersModuleName = externalHelpersModuleName;
+                currentExternalHelpersModuleName = externalHelpersModuleName;
                 ts.addRange(statements, ts.visitNodes(node.statements, sourceElementVisitor, ts.isStatement, statementOffset));
                 ts.addRange(statements, endLexicalEnvironment());
-                currentSourceFileExternalHelpersModuleName = undefined;
+                currentExternalHelpersModuleName = undefined;
                 node = ts.updateSourceFileNode(node, ts.createNodeArray(statements, node.statements));
                 node.externalHelpersModuleName = externalHelpersModuleName;
             }
@@ -36800,66 +38951,59 @@ var ts;
             var staticProperties = getInitializedProperties(node, true);
             var hasExtendsClause = ts.getClassExtendsHeritageClauseElement(node) !== undefined;
             var isDecoratedClass = shouldEmitDecorateCallForClass(node);
-            var classAlias;
             var name = node.name;
             if (!name && staticProperties.length > 0) {
                 name = ts.getGeneratedNameForNode(node);
             }
-            var statements = [];
-            if (!isDecoratedClass) {
-                var classDeclaration = ts.createClassDeclaration(undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), name, undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, hasExtendsClause), node);
-                ts.setOriginalNode(classDeclaration, node);
-                if (staticProperties.length > 0) {
-                    ts.setEmitFlags(classDeclaration, 1024 | ts.getEmitFlags(classDeclaration));
-                }
-                statements.push(classDeclaration);
-            }
-            else {
-                classAlias = addClassDeclarationHeadWithDecorators(statements, node, name, hasExtendsClause);
-            }
+            var classStatement = isDecoratedClass
+                ? createClassDeclarationHeadWithDecorators(node, name, hasExtendsClause)
+                : createClassDeclarationHeadWithoutDecorators(node, name, hasExtendsClause, staticProperties.length > 0);
+            var statements = [classStatement];
             if (staticProperties.length) {
-                addInitializedPropertyStatements(statements, staticProperties, getLocalName(node, true));
+                addInitializedPropertyStatements(statements, staticProperties, ts.getLocalName(node));
             }
             addClassElementDecorationStatements(statements, node, false);
             addClassElementDecorationStatements(statements, node, true);
-            addConstructorDecorationStatement(statements, node, classAlias);
+            addConstructorDecorationStatement(statements, node);
             if (isNamespaceExport(node)) {
                 addExportMemberAssignment(statements, node);
             }
             else if (isDecoratedClass) {
                 if (isDefaultExternalModuleExport(node)) {
-                    statements.push(ts.createExportAssignment(undefined, undefined, false, getLocalName(node)));
+                    statements.push(ts.createExportDefault(ts.getLocalName(node, false, true)));
                 }
                 else if (isNamedExternalModuleExport(node)) {
-                    statements.push(createExternalModuleExport(name));
+                    statements.push(ts.createExternalModuleExport(ts.getLocalName(node, false, true)));
                 }
             }
-            return statements;
+            if (statements.length > 1) {
+                statements.push(ts.createEndOfDeclarationMarker(node));
+                ts.setEmitFlags(classStatement, ts.getEmitFlags(classStatement) | 33554432);
+            }
+            return ts.singleOrMany(statements);
         }
-        function addClassDeclarationHeadWithDecorators(statements, node, name, hasExtendsClause) {
+        function createClassDeclarationHeadWithoutDecorators(node, name, hasExtendsClause, hasStaticProperties) {
+            var classDeclaration = ts.createClassDeclaration(undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), name, undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, hasExtendsClause), node);
+            var emitFlags = ts.getEmitFlags(node);
+            if (hasStaticProperties) {
+                emitFlags |= 1024;
+            }
+            ts.setOriginalNode(classDeclaration, node);
+            ts.setEmitFlags(classDeclaration, emitFlags);
+            return classDeclaration;
+        }
+        function createClassDeclarationHeadWithDecorators(node, name, hasExtendsClause) {
             var location = ts.moveRangePastDecorators(node);
-            var classExpression = ts.setOriginalNode(ts.createClassExpression(undefined, name, undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, hasExtendsClause), location), node);
-            if (!name) {
-                name = ts.getGeneratedNameForNode(node);
-            }
-            var classAlias;
-            if (resolver.getNodeCheckFlags(node) & 8388608) {
-                enableSubstitutionForClassAliases();
-                classAlias = ts.createUniqueName(node.name && !ts.isGeneratedIdentifier(node.name) ? node.name.text : "default");
-                classAliases[ts.getOriginalNodeId(node)] = classAlias;
-            }
-            var declaredName = getDeclarationName(node, true);
-            var transformedClassExpression = ts.createVariableStatement(undefined, ts.createLetDeclarationList([
-                ts.createVariableDeclaration(classAlias || declaredName, undefined, classExpression)
-            ]), location);
-            ts.setCommentRange(transformedClassExpression, node);
-            statements.push(ts.setOriginalNode(transformedClassExpression, node));
-            if (classAlias) {
-                statements.push(ts.setOriginalNode(ts.createVariableStatement(undefined, ts.createLetDeclarationList([
-                    ts.createVariableDeclaration(declaredName, undefined, classAlias)
-                ]), location), node));
-            }
-            return classAlias;
+            var classAlias = getClassAliasIfNeeded(node);
+            var declName = ts.getLocalName(node, false, true);
+            var heritageClauses = ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause);
+            var members = transformClassMembers(node, hasExtendsClause);
+            var classExpression = ts.createClassExpression(undefined, name, undefined, heritageClauses, members, location);
+            ts.setOriginalNode(classExpression, node);
+            var statement = ts.createLetStatement(declName, classAlias ? ts.createAssignment(classAlias, classExpression) : classExpression, location);
+            ts.setOriginalNode(statement, node);
+            ts.setCommentRange(statement, node);
+            return statement;
         }
         function visitClassExpression(node) {
             var staticProperties = getInitializedProperties(node, true);
@@ -36892,7 +39036,7 @@ var ts;
         }
         function transformConstructor(node, hasExtendsClause) {
             var hasInstancePropertyWithInitializer = ts.forEach(node.members, isInstanceInitializedProperty);
-            var hasParameterPropertyAssignments = node.transformFlags & 524288;
+            var hasParameterPropertyAssignments = node.transformFlags & 4194304;
             var constructor = ts.getFirstConstructorWithBody(node);
             if (!hasInstancePropertyWithInitializer && !hasParameterPropertyAssignments) {
                 return ts.visitEachChild(constructor, visitor, context);
@@ -36934,7 +39078,7 @@ var ts;
                     return index;
                 }
                 var statement = statements[index];
-                if (statement.kind === 203 && ts.isSuperCall(statement.expression)) {
+                if (statement.kind === 207 && ts.isSuperCall(statement.expression)) {
                     result.push(ts.visitNode(statement, visitor, ts.isStatement));
                     return index + 1;
                 }
@@ -36968,7 +39112,7 @@ var ts;
             return isInitializedProperty(member, false);
         }
         function isInitializedProperty(member, isStatic) {
-            return member.kind === 146
+            return member.kind === 147
                 && isStatic === ts.hasModifier(member, 32)
                 && member.initializer !== undefined;
         }
@@ -37041,12 +39185,12 @@ var ts;
         }
         function getAllDecoratorsOfClassElement(node, member) {
             switch (member.kind) {
-                case 150:
                 case 151:
+                case 152:
                     return getAllDecoratorsOfAccessors(node, member);
-                case 148:
+                case 149:
                     return getAllDecoratorsOfMethod(member);
-                case 146:
+                case 147:
                     return getAllDecoratorsOfProperty(member);
                 default:
                     return undefined;
@@ -37124,37 +39268,33 @@ var ts;
             var prefix = getClassMemberPrefix(node, member);
             var memberName = getExpressionForPropertyName(member, true);
             var descriptor = languageVersion > 0
-                ? member.kind === 146
+                ? member.kind === 147
                     ? ts.createVoidZero()
                     : ts.createNull()
                 : undefined;
-            var helper = ts.createDecorateHelper(currentSourceFileExternalHelpersModuleName, decoratorExpressions, prefix, memberName, descriptor, ts.moveRangePastDecorators(member));
+            var helper = ts.createDecorateHelper(currentExternalHelpersModuleName, decoratorExpressions, prefix, memberName, descriptor, ts.moveRangePastDecorators(member));
             ts.setEmitFlags(helper, 49152);
             return helper;
         }
-        function addConstructorDecorationStatement(statements, node, decoratedClassAlias) {
-            var expression = generateConstructorDecorationExpression(node, decoratedClassAlias);
+        function addConstructorDecorationStatement(statements, node) {
+            var expression = generateConstructorDecorationExpression(node);
             if (expression) {
                 statements.push(ts.setOriginalNode(ts.createStatement(expression), node));
             }
         }
-        function generateConstructorDecorationExpression(node, decoratedClassAlias) {
+        function generateConstructorDecorationExpression(node) {
             var allDecorators = getAllDecoratorsOfConstructor(node);
             var decoratorExpressions = transformAllDecoratorsOfDeclaration(node, allDecorators);
             if (!decoratorExpressions) {
                 return undefined;
             }
-            if (decoratedClassAlias) {
-                var expression = ts.createAssignment(decoratedClassAlias, ts.createDecorateHelper(currentSourceFileExternalHelpersModuleName, decoratorExpressions, getDeclarationName(node)));
-                var result = ts.createAssignment(getDeclarationName(node), expression, ts.moveRangePastDecorators(node));
-                ts.setEmitFlags(result, 49152);
-                return result;
-            }
-            else {
-                var result = ts.createAssignment(getDeclarationName(node), ts.createDecorateHelper(currentSourceFileExternalHelpersModuleName, decoratorExpressions, getDeclarationName(node)), ts.moveRangePastDecorators(node));
-                ts.setEmitFlags(result, 49152);
-                return result;
-            }
+            var classAlias = classAliases && classAliases[ts.getOriginalNodeId(node)];
+            var localName = ts.getLocalName(node, false, true);
+            var decorate = ts.createDecorateHelper(currentExternalHelpersModuleName, decoratorExpressions, localName);
+            var expression = ts.createAssignment(localName, classAlias ? ts.createAssignment(classAlias, decorate) : decorate);
+            ts.setEmitFlags(expression, 49152);
+            ts.setSourceMapRange(expression, ts.moveRangePastDecorators(node));
+            return expression;
         }
         function transformDecorator(decorator) {
             return ts.visitNode(decorator.expression, visitor, ts.isExpression);
@@ -37165,7 +39305,7 @@ var ts;
                 expressions = [];
                 for (var _i = 0, decorators_1 = decorators; _i < decorators_1.length; _i++) {
                     var decorator = decorators_1[_i];
-                    var helper = ts.createParamHelper(currentSourceFileExternalHelpersModuleName, transformDecorator(decorator), parameterOffset, decorator.expression);
+                    var helper = ts.createParamHelper(currentExternalHelpersModuleName, transformDecorator(decorator), parameterOffset, decorator.expression);
                     ts.setEmitFlags(helper, 49152);
                     expressions.push(helper);
                 }
@@ -37183,13 +39323,13 @@ var ts;
         function addOldTypeMetadata(node, decoratorExpressions) {
             if (compilerOptions.emitDecoratorMetadata) {
                 if (shouldAddTypeMetadata(node)) {
-                    decoratorExpressions.push(ts.createMetadataHelper(currentSourceFileExternalHelpersModuleName, "design:type", serializeTypeOfNode(node)));
+                    decoratorExpressions.push(ts.createMetadataHelper(currentExternalHelpersModuleName, "design:type", serializeTypeOfNode(node)));
                 }
                 if (shouldAddParamTypesMetadata(node)) {
-                    decoratorExpressions.push(ts.createMetadataHelper(currentSourceFileExternalHelpersModuleName, "design:paramtypes", serializeParameterTypesOfNode(node)));
+                    decoratorExpressions.push(ts.createMetadataHelper(currentExternalHelpersModuleName, "design:paramtypes", serializeParameterTypesOfNode(node)));
                 }
                 if (shouldAddReturnTypeMetadata(node)) {
-                    decoratorExpressions.push(ts.createMetadataHelper(currentSourceFileExternalHelpersModuleName, "design:returntype", serializeReturnTypeOfNode(node)));
+                    decoratorExpressions.push(ts.createMetadataHelper(currentExternalHelpersModuleName, "design:returntype", serializeReturnTypeOfNode(node)));
                 }
             }
         }
@@ -37197,58 +39337,58 @@ var ts;
             if (compilerOptions.emitDecoratorMetadata) {
                 var properties = void 0;
                 if (shouldAddTypeMetadata(node)) {
-                    (properties || (properties = [])).push(ts.createPropertyAssignment("type", ts.createArrowFunction(undefined, undefined, [], undefined, undefined, serializeTypeOfNode(node))));
+                    (properties || (properties = [])).push(ts.createPropertyAssignment("type", ts.createArrowFunction(undefined, undefined, [], undefined, ts.createToken(35), serializeTypeOfNode(node))));
                 }
                 if (shouldAddParamTypesMetadata(node)) {
-                    (properties || (properties = [])).push(ts.createPropertyAssignment("paramTypes", ts.createArrowFunction(undefined, undefined, [], undefined, undefined, serializeParameterTypesOfNode(node))));
+                    (properties || (properties = [])).push(ts.createPropertyAssignment("paramTypes", ts.createArrowFunction(undefined, undefined, [], undefined, ts.createToken(35), serializeParameterTypesOfNode(node))));
                 }
                 if (shouldAddReturnTypeMetadata(node)) {
-                    (properties || (properties = [])).push(ts.createPropertyAssignment("returnType", ts.createArrowFunction(undefined, undefined, [], undefined, undefined, serializeReturnTypeOfNode(node))));
+                    (properties || (properties = [])).push(ts.createPropertyAssignment("returnType", ts.createArrowFunction(undefined, undefined, [], undefined, ts.createToken(35), serializeReturnTypeOfNode(node))));
                 }
                 if (properties) {
-                    decoratorExpressions.push(ts.createMetadataHelper(currentSourceFileExternalHelpersModuleName, "design:typeinfo", ts.createObjectLiteral(properties, undefined, true)));
+                    decoratorExpressions.push(ts.createMetadataHelper(currentExternalHelpersModuleName, "design:typeinfo", ts.createObjectLiteral(properties, undefined, true)));
                 }
             }
         }
         function shouldAddTypeMetadata(node) {
             var kind = node.kind;
-            return kind === 148
-                || kind === 150
+            return kind === 149
                 || kind === 151
-                || kind === 146;
+                || kind === 152
+                || kind === 147;
         }
         function shouldAddReturnTypeMetadata(node) {
-            return node.kind === 148;
+            return node.kind === 149;
         }
         function shouldAddParamTypesMetadata(node) {
             var kind = node.kind;
-            return kind === 222
-                || kind === 193
-                || kind === 148
-                || kind === 150
-                || kind === 151;
+            return kind === 226
+                || kind === 197
+                || kind === 149
+                || kind === 151
+                || kind === 152;
         }
         function serializeTypeOfNode(node) {
             switch (node.kind) {
-                case 146:
-                case 143:
-                case 150:
-                    return serializeTypeNode(node.type);
+                case 147:
+                case 144:
                 case 151:
+                    return serializeTypeNode(node.type);
+                case 152:
                     return serializeTypeNode(ts.getSetAccessorTypeAnnotationNode(node));
-                case 222:
-                case 193:
-                case 148:
+                case 226:
+                case 197:
+                case 149:
                     return ts.createIdentifier("Function");
                 default:
                     return ts.createVoidZero();
             }
         }
         function getRestParameterElementType(node) {
-            if (node && node.kind === 161) {
+            if (node && node.kind === 162) {
                 return node.elementType;
             }
-            else if (node && node.kind === 156) {
+            else if (node && node.kind === 157) {
                 return ts.singleOrUndefined(node.typeArguments);
             }
             else {
@@ -37296,20 +39436,20 @@ var ts;
             switch (node.kind) {
                 case 104:
                     return ts.createVoidZero();
-                case 165:
+                case 166:
                     return serializeTypeNode(node.type);
-                case 157:
                 case 158:
+                case 159:
                     return ts.createIdentifier("Function");
-                case 161:
                 case 162:
+                case 163:
                     return ts.createIdentifier("Array");
-                case 155:
+                case 156:
                 case 121:
                     return ts.createIdentifier("Boolean");
-                case 133:
+                case 134:
                     return ts.createIdentifier("String");
-                case 167:
+                case 171:
                     switch (node.literal.kind) {
                         case 9:
                             return ts.createIdentifier("String");
@@ -37323,16 +39463,16 @@ var ts;
                             break;
                     }
                     break;
-                case 131:
+                case 132:
                     return ts.createIdentifier("Number");
-                case 134:
+                case 135:
                     return languageVersion < 2
                         ? getGlobalSymbolNameWithFallback()
                         : ts.createIdentifier("Symbol");
-                case 156:
+                case 157:
                     return serializeTypeReferenceNode(node);
+                case 165:
                 case 164:
-                case 163:
                     {
                         var unionOrIntersection = node;
                         var serializedUnion = void 0;
@@ -37356,10 +39496,13 @@ var ts;
                             return serializedUnion;
                         }
                     }
-                case 159:
                 case 160:
+                case 168:
+                case 169:
+                case 170:
+                case 161:
                 case 118:
-                case 166:
+                case 167:
                     break;
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -37401,15 +39544,15 @@ var ts;
         function serializeEntityNameAsExpression(node, useFallback) {
             switch (node.kind) {
                 case 70:
-                    var name_27 = ts.getMutableClone(node);
-                    name_27.flags &= ~8;
-                    name_27.original = undefined;
-                    name_27.parent = currentScope;
+                    var name_33 = ts.getMutableClone(node);
+                    name_33.flags &= ~8;
+                    name_33.original = undefined;
+                    name_33.parent = currentScope;
                     if (useFallback) {
-                        return ts.createLogicalAnd(ts.createStrictInequality(ts.createTypeOf(name_27), ts.createLiteral("undefined")), name_27);
+                        return ts.createLogicalAnd(ts.createStrictInequality(ts.createTypeOf(name_33), ts.createLiteral("undefined")), name_33);
                     }
-                    return name_27;
-                case 140:
+                    return name_33;
+                case 141:
                     return serializeQualifiedNameAsExpression(node, useFallback);
             }
         }
@@ -37483,7 +39626,7 @@ var ts;
             if (!shouldEmitFunctionLikeDeclaration(node)) {
                 return undefined;
             }
-            var method = ts.createMethod(undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.asteriskToken, visitPropertyNameOfClassElement(node), undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, transformFunctionBody(node), node);
+            var method = ts.createMethod(undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, visitPropertyNameOfClassElement(node), undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, transformFunctionBody(node), node);
             ts.setCommentRange(method, node);
             ts.setSourceMapRange(method, ts.moveRangePastDecorators(node));
             ts.setOriginalNode(method, node);
@@ -37496,27 +39639,27 @@ var ts;
             if (!shouldEmitAccessorDeclaration(node)) {
                 return undefined;
             }
-            var accessor = ts.createGetAccessor(undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), visitPropertyNameOfClassElement(node), ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, node.body ? ts.visitEachChild(node.body, visitor, context) : ts.createBlock([]), node);
+            var accessor = ts.createGetAccessor(undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), visitPropertyNameOfClassElement(node), ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, node.body ? ts.visitEachChild(node.body, visitor, context) : ts.createBlock([]), node);
+            ts.setOriginalNode(accessor, node);
             ts.setCommentRange(accessor, node);
             ts.setSourceMapRange(accessor, ts.moveRangePastDecorators(node));
-            ts.setOriginalNode(accessor, node);
             return accessor;
         }
         function visitSetAccessor(node) {
             if (!shouldEmitAccessorDeclaration(node)) {
                 return undefined;
             }
-            var accessor = ts.createSetAccessor(undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), visitPropertyNameOfClassElement(node), ts.visitNodes(node.parameters, visitor, ts.isParameter), node.body ? ts.visitEachChild(node.body, visitor, context) : ts.createBlock([]), node);
+            var accessor = ts.createSetAccessor(undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), visitPropertyNameOfClassElement(node), ts.visitNodes(node.parameters, visitor, ts.isParameter), node.body ? ts.visitEachChild(node.body, visitor, context) : ts.createBlock([]), node);
+            ts.setOriginalNode(accessor, node);
             ts.setCommentRange(accessor, node);
             ts.setSourceMapRange(accessor, ts.moveRangePastDecorators(node));
-            ts.setOriginalNode(accessor, node);
             return accessor;
         }
         function visitFunctionDeclaration(node) {
             if (!shouldEmitFunctionLikeDeclaration(node)) {
                 return ts.createNotEmittedStatement(node);
             }
-            var func = ts.createFunctionDeclaration(undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.asteriskToken, node.name, undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, transformFunctionBody(node), node);
+            var func = ts.createFunctionDeclaration(undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, node.name, undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, transformFunctionBody(node), node);
             ts.setOriginalNode(func, node);
             if (isNamespaceExport(node)) {
                 var statements = [func];
@@ -37529,12 +39672,12 @@ var ts;
             if (ts.nodeIsMissing(node.body)) {
                 return ts.createOmittedExpression();
             }
-            var func = ts.createFunctionExpression(ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.asteriskToken, node.name, undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, transformFunctionBody(node), node);
+            var func = ts.createFunctionExpression(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, node.name, undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, transformFunctionBody(node), node);
             ts.setOriginalNode(func, node);
             return func;
         }
         function visitArrowFunction(node) {
-            var func = ts.createArrowFunction(ts.visitNodes(node.modifiers, visitor, ts.isModifier), undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, node.equalsGreaterThanToken, transformConciseBody(node), node);
+            var func = ts.createArrowFunction(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, node.equalsGreaterThanToken, transformConciseBody(node), node);
             ts.setOriginalNode(func, node);
             return func;
         }
@@ -37581,7 +39724,7 @@ var ts;
             if (ts.parameterIsThisKeyword(node)) {
                 return undefined;
             }
-            var parameter = ts.createParameterDeclaration(undefined, undefined, node.dotDotDotToken, ts.visitNode(node.name, visitor, ts.isBindingName), undefined, undefined, ts.visitNode(node.initializer, visitor, ts.isExpression), ts.moveRangePastModifiers(node));
+            var parameter = ts.createParameter(undefined, undefined, node.dotDotDotToken, ts.visitNode(node.name, visitor, ts.isBindingName), undefined, undefined, ts.visitNode(node.initializer, visitor, ts.isExpression), ts.moveRangePastModifiers(node));
             ts.setOriginalNode(parameter, node);
             ts.setCommentRange(parameter, node);
             ts.setSourceMapRange(parameter, ts.moveRangePastModifiers(node));
@@ -37603,7 +39746,7 @@ var ts;
         function transformInitializedVariable(node) {
             var name = node.name;
             if (ts.isBindingPattern(name)) {
-                return ts.flattenVariableDestructuringToExpression(node, hoistVariableDeclaration, getNamespaceMemberNameWithSourceMapsAndWithoutComments, visitor);
+                return ts.flattenVariableDestructuringToExpression(node, hoistVariableDeclaration, createNamespaceExportExpression, visitor);
             }
             else {
                 return ts.createAssignment(getNamespaceMemberNameWithSourceMapsAndWithoutComments(name), ts.visitNode(node.initializer, visitor, ts.isExpression), node);
@@ -37639,39 +39782,32 @@ var ts;
                 || compilerOptions.preserveConstEnums
                 || compilerOptions.isolatedModules;
         }
-        function shouldEmitVarForEnumDeclaration(node) {
-            return isFirstEmittedDeclarationInScope(node)
-                && (!ts.hasModifier(node, 1)
-                    || isES6ExportedDeclaration(node));
-        }
-        function addVarForEnumExportedFromNamespace(statements, node) {
-            var statement = ts.createVariableStatement(undefined, [ts.createVariableDeclaration(getDeclarationName(node), undefined, getExportName(node))]);
-            ts.setSourceMapRange(statement, node);
-            statements.push(statement);
-        }
         function visitEnumDeclaration(node) {
             if (!shouldEmitEnumDeclaration(node)) {
                 return undefined;
             }
             var statements = [];
             var emitFlags = 64;
-            recordEmittedDeclarationInScope(node);
-            if (shouldEmitVarForEnumDeclaration(node)) {
-                addVarForEnumOrModuleDeclaration(statements, node);
+            if (addVarForEnumOrModuleDeclaration(statements, node)) {
                 if (moduleKind !== ts.ModuleKind.System || currentScope !== currentSourceFile) {
                     emitFlags |= 16384;
                 }
             }
             var parameterName = getNamespaceParameterName(node);
             var containerName = getNamespaceContainerName(node);
-            var exportName = getExportName(node);
-            var enumStatement = ts.createStatement(ts.createCall(ts.createFunctionExpression(undefined, undefined, undefined, undefined, [ts.createParameter(parameterName)], undefined, transformEnumBody(node, containerName)), undefined, [ts.createLogicalOr(exportName, ts.createAssignment(exportName, ts.createObjectLiteral()))]), node);
+            var exportName = ts.hasModifier(node, 1)
+                ? ts.getExternalModuleOrNamespaceExportName(currentNamespaceContainerName, node, false, true)
+                : ts.getLocalName(node, false, true);
+            var moduleArg = ts.createLogicalOr(exportName, ts.createAssignment(exportName, ts.createObjectLiteral()));
+            if (hasNamespaceQualifiedExportName(node)) {
+                var localName = ts.getLocalName(node, false, true);
+                moduleArg = ts.createAssignment(localName, moduleArg);
+            }
+            var enumStatement = ts.createStatement(ts.createCall(ts.createFunctionExpression(undefined, undefined, undefined, undefined, [ts.createParameter(undefined, undefined, undefined, parameterName)], undefined, transformEnumBody(node, containerName)), undefined, [moduleArg]), node);
             ts.setOriginalNode(enumStatement, node);
             ts.setEmitFlags(enumStatement, emitFlags);
             statements.push(enumStatement);
-            if (isNamespaceExport(node)) {
-                addVarForEnumExportedFromNamespace(statements, node);
-            }
+            statements.push(ts.createEndOfDeclarationMarker(node));
             return statements;
         }
         function transformEnumBody(node, localName) {
@@ -37706,9 +39842,11 @@ var ts;
         function shouldEmitModuleDeclaration(node) {
             return ts.isInstantiatedModule(node, compilerOptions.preserveConstEnums || compilerOptions.isolatedModules);
         }
-        function isES6ExportedDeclaration(node) {
-            return isExternalModuleExport(node)
-                && moduleKind === ts.ModuleKind.ES2015;
+        function hasNamespaceQualifiedExportName(node) {
+            return isNamespaceExport(node)
+                || (isExternalModuleExport(node)
+                    && moduleKind !== ts.ModuleKind.ES2015
+                    && moduleKind !== ts.ModuleKind.System);
         }
         function recordEmittedDeclarationInScope(node) {
             var name = node.symbol && node.symbol.name;
@@ -37723,32 +39861,37 @@ var ts;
         }
         function isFirstEmittedDeclarationInScope(node) {
             if (currentScopeFirstDeclarationsOfName) {
-                var name_28 = node.symbol && node.symbol.name;
-                if (name_28) {
-                    return currentScopeFirstDeclarationsOfName[name_28] === node;
+                var name_34 = node.symbol && node.symbol.name;
+                if (name_34) {
+                    return currentScopeFirstDeclarationsOfName[name_34] === node;
                 }
             }
             return false;
         }
-        function shouldEmitVarForModuleDeclaration(node) {
-            return isFirstEmittedDeclarationInScope(node);
-        }
         function addVarForEnumOrModuleDeclaration(statements, node) {
-            var statement = ts.createVariableStatement(isES6ExportedDeclaration(node)
-                ? ts.visitNodes(node.modifiers, visitor, ts.isModifier)
-                : undefined, [
-                ts.createVariableDeclaration(getDeclarationName(node, false, true))
+            var statement = ts.createVariableStatement(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), [
+                ts.createVariableDeclaration(ts.getLocalName(node, false, true))
             ]);
             ts.setOriginalNode(statement, node);
-            if (node.kind === 225) {
-                ts.setSourceMapRange(statement.declarationList, node);
+            recordEmittedDeclarationInScope(node);
+            if (isFirstEmittedDeclarationInScope(node)) {
+                if (node.kind === 229) {
+                    ts.setSourceMapRange(statement.declarationList, node);
+                }
+                else {
+                    ts.setSourceMapRange(statement, node);
+                }
+                ts.setCommentRange(statement, node);
+                ts.setEmitFlags(statement, 32768 | 33554432);
+                statements.push(statement);
+                return true;
             }
             else {
-                ts.setSourceMapRange(statement, node);
+                var mergeMarker = ts.createMergeDeclarationMarker(statement);
+                ts.setEmitFlags(mergeMarker, 49152 | 33554432);
+                statements.push(mergeMarker);
+                return false;
             }
-            ts.setCommentRange(statement, node);
-            ts.setEmitFlags(statement, 32768);
-            statements.push(statement);
         }
         function visitModuleDeclaration(node) {
             if (!shouldEmitModuleDeclaration(node)) {
@@ -37758,25 +39901,26 @@ var ts;
             enableSubstitutionForNamespaceExports();
             var statements = [];
             var emitFlags = 64;
-            recordEmittedDeclarationInScope(node);
-            if (shouldEmitVarForModuleDeclaration(node)) {
-                addVarForEnumOrModuleDeclaration(statements, node);
+            if (addVarForEnumOrModuleDeclaration(statements, node)) {
                 if (moduleKind !== ts.ModuleKind.System || currentScope !== currentSourceFile) {
                     emitFlags |= 16384;
                 }
             }
             var parameterName = getNamespaceParameterName(node);
             var containerName = getNamespaceContainerName(node);
-            var exportName = getExportName(node);
+            var exportName = ts.hasModifier(node, 1)
+                ? ts.getExternalModuleOrNamespaceExportName(currentNamespaceContainerName, node, false, true)
+                : ts.getLocalName(node, false, true);
             var moduleArg = ts.createLogicalOr(exportName, ts.createAssignment(exportName, ts.createObjectLiteral()));
-            if (ts.hasModifier(node, 1) && !isES6ExportedDeclaration(node)) {
-                var localName = getLocalName(node);
+            if (hasNamespaceQualifiedExportName(node)) {
+                var localName = ts.getLocalName(node, false, true);
                 moduleArg = ts.createAssignment(localName, moduleArg);
             }
-            var moduleStatement = ts.createStatement(ts.createCall(ts.createFunctionExpression(undefined, undefined, undefined, undefined, [ts.createParameter(parameterName)], undefined, transformModuleBody(node, containerName)), undefined, [moduleArg]), node);
+            var moduleStatement = ts.createStatement(ts.createCall(ts.createFunctionExpression(undefined, undefined, undefined, undefined, [ts.createParameter(undefined, undefined, undefined, parameterName)], undefined, transformModuleBody(node, containerName)), undefined, [moduleArg]), node);
             ts.setOriginalNode(moduleStatement, node);
             ts.setEmitFlags(moduleStatement, emitFlags);
             statements.push(moduleStatement);
+            statements.push(ts.createEndOfDeclarationMarker(node));
             return statements;
         }
         function transformModuleBody(node, namespaceLocalName) {
@@ -37791,7 +39935,7 @@ var ts;
             var statementsLocation;
             var blockLocation;
             var body = node.body;
-            if (body.kind === 227) {
+            if (body.kind === 231) {
                 ts.addRange(statements, ts.visitNodes(body.statements, namespaceElementVisitor, ts.isStatement));
                 statementsLocation = body.statements;
                 blockLocation = body;
@@ -37814,13 +39958,13 @@ var ts;
             currentNamespace = savedCurrentNamespace;
             currentScopeFirstDeclarationsOfName = savedCurrentScopeFirstDeclarationsOfName;
             var block = ts.createBlock(ts.createNodeArray(statements, statementsLocation), blockLocation, true);
-            if (body.kind !== 227) {
+            if (body.kind !== 231) {
                 ts.setEmitFlags(block, ts.getEmitFlags(block) | 49152);
             }
             return block;
         }
         function getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration) {
-            if (moduleDeclaration.body.kind === 226) {
+            if (moduleDeclaration.body.kind === 230) {
                 var recursiveInnerModule = getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration.body);
                 return recursiveInnerModule || moduleDeclaration.body;
             }
@@ -37840,7 +39984,7 @@ var ts;
             return (name || namedBindings) ? ts.updateImportClause(node, name, namedBindings) : undefined;
         }
         function visitNamedImportBindings(node) {
-            if (node.kind === 233) {
+            if (node.kind === 237) {
                 return resolver.isReferencedAliasDeclaration(node) ? node : undefined;
             }
             else {
@@ -37892,8 +40036,8 @@ var ts;
             var moduleReference = ts.createExpressionFromEntityName(node.moduleReference);
             ts.setEmitFlags(moduleReference, 49152 | 65536);
             if (isNamedExternalModuleExport(node) || !isNamespaceExport(node)) {
-                return ts.setOriginalNode(ts.createVariableStatement(ts.visitNodes(node.modifiers, visitor, ts.isModifier), ts.createVariableDeclarationList([
-                    ts.createVariableDeclaration(node.name, undefined, moduleReference)
+                return ts.setOriginalNode(ts.createVariableStatement(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), ts.createVariableDeclarationList([
+                    ts.setOriginalNode(ts.createVariableDeclaration(node.name, undefined, moduleReference), node)
                 ]), node), node);
             }
             else {
@@ -37918,36 +40062,20 @@ var ts;
             return ts.createStatement(expression, undefined);
         }
         function addExportMemberAssignment(statements, node) {
-            var expression = ts.createAssignment(getExportName(node), getLocalName(node, true));
+            var expression = ts.createAssignment(ts.getExternalModuleOrNamespaceExportName(currentNamespaceContainerName, node, false, true), ts.getLocalName(node));
             ts.setSourceMapRange(expression, ts.createRange(node.name.pos, node.end));
             var statement = ts.createStatement(expression);
             ts.setSourceMapRange(statement, ts.createRange(-1, node.end));
             statements.push(statement);
         }
         function createNamespaceExport(exportName, exportValue, location) {
-            return ts.createStatement(ts.createAssignment(getNamespaceMemberName(exportName, false, true), exportValue), location);
+            return ts.createStatement(ts.createAssignment(ts.getNamespaceMemberName(currentNamespaceContainerName, exportName, false, true), exportValue), location);
         }
-        function createExternalModuleExport(exportName) {
-            return ts.createExportDeclaration(undefined, undefined, ts.createNamedExports([
-                ts.createExportSpecifier(exportName)
-            ]));
-        }
-        function getNamespaceMemberName(name, allowComments, allowSourceMaps) {
-            var qualifiedName = ts.createPropertyAccess(currentNamespaceContainerName, ts.getSynthesizedClone(name), name);
-            var emitFlags;
-            if (!allowComments) {
-                emitFlags |= 49152;
-            }
-            if (!allowSourceMaps) {
-                emitFlags |= 1536;
-            }
-            if (emitFlags) {
-                ts.setEmitFlags(qualifiedName, emitFlags);
-            }
-            return qualifiedName;
+        function createNamespaceExportExpression(exportName, exportValue, location) {
+            return ts.createAssignment(getNamespaceMemberNameWithSourceMapsAndWithoutComments(exportName), exportValue, location);
         }
         function getNamespaceMemberNameWithSourceMapsAndWithoutComments(name) {
-            return getNamespaceMemberName(name, false, true);
+            return ts.getNamespaceMemberName(currentNamespaceContainerName, name, false, true);
         }
         function getNamespaceParameterName(node) {
             var name = ts.getGeneratedNameForNode(node);
@@ -37957,40 +40085,21 @@ var ts;
         function getNamespaceContainerName(node) {
             return ts.getGeneratedNameForNode(node);
         }
-        function getLocalName(node, noSourceMaps, allowComments) {
-            return getDeclarationName(node, allowComments, !noSourceMaps, 262144);
-        }
-        function getExportName(node, noSourceMaps, allowComments) {
-            if (isNamespaceExport(node)) {
-                return getNamespaceMemberName(getDeclarationName(node), allowComments, !noSourceMaps);
-            }
-            return getDeclarationName(node, allowComments, !noSourceMaps, 131072);
-        }
-        function getDeclarationName(node, allowComments, allowSourceMaps, emitFlags) {
-            if (node.name) {
-                var name_29 = ts.getMutableClone(node.name);
-                emitFlags |= ts.getEmitFlags(node.name);
-                if (!allowSourceMaps) {
-                    emitFlags |= 1536;
-                }
-                if (!allowComments) {
-                    emitFlags |= 49152;
-                }
-                if (emitFlags) {
-                    ts.setEmitFlags(name_29, emitFlags);
-                }
-                return name_29;
-            }
-            else {
-                return ts.getGeneratedNameForNode(node);
+        function getClassAliasIfNeeded(node) {
+            if (resolver.getNodeCheckFlags(node) & 8388608) {
+                enableSubstitutionForClassAliases();
+                var classAlias = ts.createUniqueName(node.name && !ts.isGeneratedIdentifier(node.name) ? node.name.text : "default");
+                classAliases[ts.getOriginalNodeId(node)] = classAlias;
+                hoistVariableDeclaration(classAlias);
+                return classAlias;
             }
         }
         function getClassPrototype(node) {
-            return ts.createPropertyAccess(getDeclarationName(node), "prototype");
+            return ts.createPropertyAccess(ts.getDeclarationName(node), "prototype");
         }
         function getClassMemberPrefix(node, member) {
             return ts.hasModifier(member, 32)
-                ? getDeclarationName(node)
+                ? ts.getDeclarationName(node)
                 : getClassPrototype(node);
         }
         function enableSubstitutionForNonQualifiedEnumMembers() {
@@ -38010,15 +40119,15 @@ var ts;
             if ((enabledSubstitutions & 2) === 0) {
                 enabledSubstitutions |= 2;
                 context.enableSubstitution(70);
-                context.enableSubstitution(254);
-                context.enableEmitNotification(226);
+                context.enableSubstitution(258);
+                context.enableEmitNotification(230);
             }
         }
         function isTransformedModuleDeclaration(node) {
-            return ts.getOriginalNode(node).kind === 226;
+            return ts.getOriginalNode(node).kind === 230;
         }
         function isTransformedEnumDeclaration(node) {
-            return ts.getOriginalNode(node).kind === 225;
+            return ts.getOriginalNode(node).kind === 229;
         }
         function onEmitNode(emitContext, node, emitCallback) {
             var savedApplicableSubstitutions = applicableSubstitutions;
@@ -38043,14 +40152,14 @@ var ts;
         }
         function substituteShorthandPropertyAssignment(node) {
             if (enabledSubstitutions & 2) {
-                var name_30 = node.name;
-                var exportedName = trySubstituteNamespaceExportedName(name_30);
+                var name_35 = node.name;
+                var exportedName = trySubstituteNamespaceExportedName(name_35);
                 if (exportedName) {
                     if (node.objectAssignmentInitializer) {
                         var initializer = ts.createAssignment(exportedName, node.objectAssignmentInitializer);
-                        return ts.createPropertyAssignment(name_30, initializer, node);
+                        return ts.createPropertyAssignment(name_35, initializer, node);
                     }
-                    return ts.createPropertyAssignment(name_30, exportedName, node);
+                    return ts.createPropertyAssignment(name_35, exportedName, node);
                 }
             }
             return node;
@@ -38059,9 +40168,9 @@ var ts;
             switch (node.kind) {
                 case 70:
                     return substituteExpressionIdentifier(node);
-                case 173:
+                case 177:
                     return substitutePropertyAccessExpression(node);
-                case 174:
+                case 178:
                     return substituteElementAccessExpression(node);
             }
             return node;
@@ -38089,11 +40198,11 @@ var ts;
             return undefined;
         }
         function trySubstituteNamespaceExportedName(node) {
-            if (enabledSubstitutions & applicableSubstitutions && (ts.getEmitFlags(node) & 262144) === 0) {
+            if (enabledSubstitutions & applicableSubstitutions && !ts.isLocalName(node)) {
                 var container = resolver.getReferencedExportContainer(node, false);
-                if (container) {
-                    var substitute = (applicableSubstitutions & 2 && container.kind === 226) ||
-                        (applicableSubstitutions & 8 && container.kind === 225);
+                if (container && container.kind !== 261) {
+                    var substitute = (applicableSubstitutions & 2 && container.kind === 230) ||
+                        (applicableSubstitutions & 8 && container.kind === 229);
                     if (substitute) {
                         return ts.createPropertyAccess(ts.getGeneratedNameForNode(container), node, node);
                     }
@@ -38164,11 +40273,11 @@ var ts;
         }
         function visitorWorker(node) {
             switch (node.kind) {
-                case 242:
+                case 246:
                     return visitJsxElement(node, false);
-                case 243:
+                case 247:
                     return visitJsxSelfClosingElement(node, false);
-                case 248:
+                case 252:
                     return visitJsxExpression(node);
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -38179,11 +40288,11 @@ var ts;
             switch (node.kind) {
                 case 10:
                     return visitJsxText(node);
-                case 248:
+                case 252:
                     return visitJsxExpression(node);
-                case 242:
+                case 246:
                     return visitJsxElement(node, true);
-                case 243:
+                case 247:
                     return visitJsxSelfClosingElement(node, true);
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -38213,7 +40322,7 @@ var ts;
                 objectProperties = ts.singleOrUndefined(segments)
                     || ts.createAssignHelper(currentSourceFile.externalHelpersModuleName, segments);
             }
-            var element = ts.createReactCreateElement(compilerOptions.reactNamespace, tagName, objectProperties, ts.filter(ts.map(children, transformJsxChildToExpression), ts.isDefined), node, location);
+            var element = ts.createExpressionForJsxElement(context.getEmitResolver().getJsxFactoryEntity(), compilerOptions.reactNamespace, tagName, objectProperties, ts.filter(ts.map(children, transformJsxChildToExpression), ts.isDefined), node, location);
             if (isChild) {
                 ts.startOnNewLine(element);
             }
@@ -38235,7 +40344,7 @@ var ts;
                 var decoded = tryDecodeEntities(node.text);
                 return decoded ? ts.createLiteral(decoded, node) : node;
             }
-            else if (node.kind === 248) {
+            else if (node.kind === 252) {
                 return visitJsxExpression(node);
             }
             else {
@@ -38300,16 +40409,16 @@ var ts;
             return decoded === text ? undefined : decoded;
         }
         function getTagName(node) {
-            if (node.kind === 242) {
+            if (node.kind === 246) {
                 return getTagName(node.openingElement);
             }
             else {
-                var name_31 = node.tagName;
-                if (ts.isIdentifier(name_31) && ts.isIntrinsicJsxName(name_31.text)) {
-                    return ts.createLiteral(name_31.text);
+                var name_36 = node.tagName;
+                if (ts.isIdentifier(name_36) && ts.isIntrinsicJsxName(name_36.text)) {
+                    return ts.createLiteral(name_36.text);
                 }
                 else {
-                    return ts.createExpressionFromEntityName(name_31);
+                    return ts.createExpressionFromEntityName(name_36);
                 }
             }
         }
@@ -38586,12 +40695,165 @@ var ts;
     }
 })(ts || (ts = {}));
 var ts;
+(function (ts) {
+    function transformESNext(context) {
+        var hoistVariableDeclaration = context.hoistVariableDeclaration;
+        var currentSourceFile;
+        return transformSourceFile;
+        function transformSourceFile(node) {
+            currentSourceFile = node;
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function visitor(node) {
+            if (node.transformFlags & 16) {
+                return visitorWorker(node);
+            }
+            else if (node.transformFlags & 32) {
+                return ts.visitEachChild(node, visitor, context);
+            }
+            else {
+                return node;
+            }
+        }
+        function visitorWorker(node) {
+            switch (node.kind) {
+                case 176:
+                    return visitObjectLiteralExpression(node);
+                case 192:
+                    return visitBinaryExpression(node);
+                case 223:
+                    return visitVariableDeclaration(node);
+                case 213:
+                    return visitForOfStatement(node);
+                case 172:
+                case 173:
+                    return node;
+                case 225:
+                    return visitFunctionDeclaration(node);
+                case 184:
+                    return visitFunctionExpression(node);
+                case 185:
+                    return visitArrowFunction(node);
+                case 144:
+                    return visitParameter(node);
+                default:
+                    ts.Debug.failBadSyntaxKind(node);
+                    return ts.visitEachChild(node, visitor, context);
+            }
+        }
+        function chunkObjectLiteralElements(elements) {
+            var chunkObject;
+            var objects = [];
+            for (var _i = 0, elements_3 = elements; _i < elements_3.length; _i++) {
+                var e = elements_3[_i];
+                if (e.kind === 259) {
+                    if (chunkObject) {
+                        objects.push(ts.createObjectLiteral(chunkObject));
+                        chunkObject = undefined;
+                    }
+                    var target = e.expression;
+                    objects.push(ts.visitNode(target, visitor, ts.isExpression));
+                }
+                else {
+                    if (!chunkObject) {
+                        chunkObject = [];
+                    }
+                    if (e.kind === 257) {
+                        var p = e;
+                        chunkObject.push(ts.createPropertyAssignment(p.name, ts.visitNode(p.initializer, visitor, ts.isExpression)));
+                    }
+                    else {
+                        chunkObject.push(e);
+                    }
+                }
+            }
+            if (chunkObject) {
+                objects.push(ts.createObjectLiteral(chunkObject));
+            }
+            return objects;
+        }
+        function visitObjectLiteralExpression(node) {
+            var objects = chunkObjectLiteralElements(node.properties);
+            if (objects.length && objects[0].kind !== 176) {
+                objects.unshift(ts.createObjectLiteral());
+            }
+            return ts.createCall(ts.createIdentifier("__assign"), undefined, objects);
+        }
+        function visitBinaryExpression(node) {
+            if (ts.isDestructuringAssignment(node) && node.left.transformFlags & 48) {
+                return ts.flattenDestructuringAssignment(context, node, true, hoistVariableDeclaration, visitor, true);
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function visitVariableDeclaration(node) {
+            if (ts.isBindingPattern(node.name) && node.name.transformFlags & 48) {
+                var result = ts.flattenVariableDestructuring(node, undefined, visitor, undefined, true);
+                return result;
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function visitForOfStatement(node) {
+            var initializer = node.initializer;
+            if (!isRestBindingPattern(initializer) && !isRestAssignment(initializer)) {
+                return ts.visitEachChild(node, visitor, context);
+            }
+            return ts.convertForOf(node, undefined, visitor, ts.noop, context, true);
+        }
+        function isRestBindingPattern(initializer) {
+            if (ts.isVariableDeclarationList(initializer)) {
+                var declaration = ts.firstOrUndefined(initializer.declarations);
+                return declaration && declaration.name &&
+                    declaration.name.kind === 172 &&
+                    !!(declaration.name.transformFlags & 8388608);
+            }
+            return false;
+        }
+        function isRestAssignment(initializer) {
+            return initializer.kind === 176 &&
+                initializer.transformFlags & 8388608;
+        }
+        function visitParameter(node) {
+            if (isObjectRestParameter(node)) {
+                return ts.setOriginalNode(ts.createParameter(undefined, undefined, undefined, ts.getGeneratedNameForNode(node), undefined, undefined, node.initializer, node), node);
+            }
+            else {
+                return node;
+            }
+        }
+        function isObjectRestParameter(node) {
+            return node.name &&
+                node.name.kind === 172 &&
+                !!(node.name.transformFlags & 8388608);
+        }
+        function visitFunctionDeclaration(node) {
+            var hasRest = ts.forEach(node.parameters, isObjectRestParameter);
+            var body = hasRest ?
+                ts.transformFunctionBody(node, visitor, currentSourceFile, context, ts.noop, true) :
+                ts.visitEachChild(node.body, visitor, context);
+            return ts.setOriginalNode(ts.createFunctionDeclaration(undefined, node.modifiers, node.asteriskToken, node.name, undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, body, node), node);
+        }
+        function visitArrowFunction(node) {
+            var hasRest = ts.forEach(node.parameters, isObjectRestParameter);
+            var body = hasRest ?
+                ts.transformFunctionBody(node, visitor, currentSourceFile, context, ts.noop, true) :
+                ts.visitEachChild(node.body, visitor, context);
+            var func = ts.setOriginalNode(ts.createArrowFunction(undefined, undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, node.equalsGreaterThanToken, body, node), node);
+            ts.setEmitFlags(func, 256);
+            return func;
+        }
+        function visitFunctionExpression(node) {
+            var hasRest = ts.forEach(node.parameters, isObjectRestParameter);
+            var body = hasRest ?
+                ts.transformFunctionBody(node, visitor, currentSourceFile, context, ts.noop, true) :
+                ts.visitEachChild(node.body, visitor, context);
+            return ts.setOriginalNode(ts.createFunctionExpression(undefined, node.asteriskToken, name, undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, body, node), node);
+        }
+    }
+    ts.transformESNext = transformESNext;
+})(ts || (ts = {}));
+var ts;
 (function (ts) {
     function transformES2017(context) {
-        var ES2017SubstitutionFlags;
-        (function (ES2017SubstitutionFlags) {
-            ES2017SubstitutionFlags[ES2017SubstitutionFlags["AsyncMethodsWithSuper"] = 1] = "AsyncMethodsWithSuper";
-        })(ES2017SubstitutionFlags || (ES2017SubstitutionFlags = {}));
         var startLexicalEnvironment = context.startLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment;
         var resolver = context.getEmitResolver();
         var compilerOptions = context.getCompilerOptions();
@@ -38614,10 +40876,10 @@ var ts;
             return ts.visitEachChild(node, visitor, context);
         }
         function visitor(node) {
-            if (node.transformFlags & 16) {
+            if (node.transformFlags & 64) {
                 return visitorWorker(node);
             }
-            else if (node.transformFlags & 32) {
+            else if (node.transformFlags & 128) {
                 return ts.visitEachChild(node, visitor, context);
             }
             return node;
@@ -38626,15 +40888,15 @@ var ts;
             switch (node.kind) {
                 case 119:
                     return undefined;
-                case 185:
+                case 189:
                     return visitAwaitExpression(node);
-                case 148:
+                case 149:
                     return visitMethodDeclaration(node);
-                case 221:
+                case 225:
                     return visitFunctionDeclaration(node);
-                case 180:
+                case 184:
                     return visitFunctionExpression(node);
-                case 181:
+                case 185:
                     return visitArrowFunction(node);
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -38699,9 +40961,10 @@ var ts;
             return ts.mergeFunctionBodyLexicalEnvironment(visited, declarations);
         }
         function transformAsyncFunctionBody(node) {
-            var nodeType = node.original ? node.original.type : node.type;
+            var original = ts.getOriginalNode(node, ts.isFunctionLike);
+            var nodeType = original.type;
             var promiseConstructor = languageVersion < 2 ? getPromiseConstructor(nodeType) : undefined;
-            var isArrowFunction = node.kind === 181;
+            var isArrowFunction = node.kind === 185;
             var hasLexicalArguments = (resolver.getNodeCheckFlags(node) & 8192) !== 0;
             if (!isArrowFunction) {
                 var statements = [];
@@ -38744,12 +41007,14 @@ var ts;
             }
         }
         function getPromiseConstructor(type) {
-            var typeName = ts.getEntityNameFromTypeNode(type);
-            if (typeName && ts.isEntityName(typeName)) {
-                var serializationKind = resolver.getTypeReferenceSerializationKind(typeName);
-                if (serializationKind === ts.TypeReferenceSerializationKind.TypeWithConstructSignatureAndValue
-                    || serializationKind === ts.TypeReferenceSerializationKind.Unknown) {
-                    return typeName;
+            if (type) {
+                var typeName = ts.getEntityNameFromTypeNode(type);
+                if (typeName && ts.isEntityName(typeName)) {
+                    var serializationKind = resolver.getTypeReferenceSerializationKind(typeName);
+                    if (serializationKind === ts.TypeReferenceSerializationKind.TypeWithConstructSignatureAndValue
+                        || serializationKind === ts.TypeReferenceSerializationKind.Unknown) {
+                        return typeName;
+                    }
                 }
             }
             return undefined;
@@ -38757,23 +41022,23 @@ var ts;
         function enableSubstitutionForAsyncMethodsWithSuper() {
             if ((enabledSubstitutions & 1) === 0) {
                 enabledSubstitutions |= 1;
-                context.enableSubstitution(175);
-                context.enableSubstitution(173);
-                context.enableSubstitution(174);
-                context.enableEmitNotification(222);
-                context.enableEmitNotification(148);
-                context.enableEmitNotification(150);
-                context.enableEmitNotification(151);
+                context.enableSubstitution(179);
+                context.enableSubstitution(177);
+                context.enableSubstitution(178);
+                context.enableEmitNotification(226);
                 context.enableEmitNotification(149);
+                context.enableEmitNotification(151);
+                context.enableEmitNotification(152);
+                context.enableEmitNotification(150);
             }
         }
         function substituteExpression(node) {
             switch (node.kind) {
-                case 173:
+                case 177:
                     return substitutePropertyAccessExpression(node);
-                case 174:
+                case 178:
                     return substituteElementAccessExpression(node);
-                case 175:
+                case 179:
                     if (enabledSubstitutions & 1) {
                         return substituteCallExpression(node);
                     }
@@ -38816,11 +41081,11 @@ var ts;
         }
         function isSuperContainer(node) {
             var kind = node.kind;
-            return kind === 222
-                || kind === 149
-                || kind === 148
+            return kind === 226
                 || kind === 150
-                || kind === 151;
+                || kind === 149
+                || kind === 151
+                || kind === 152;
         }
         function onEmitNode(emitContext, node, emitCallback) {
             var savedApplicableSubstitutions = applicableSubstitutions;
@@ -38866,10 +41131,10 @@ var ts;
             return ts.visitEachChild(node, visitor, context);
         }
         function visitor(node) {
-            if (node.transformFlags & 64) {
+            if (node.transformFlags & 256) {
                 return visitorWorker(node);
             }
-            else if (node.transformFlags & 128) {
+            else if (node.transformFlags & 512) {
                 return ts.visitEachChild(node, visitor, context);
             }
             else {
@@ -38878,7 +41143,7 @@ var ts;
         }
         function visitorWorker(node) {
             switch (node.kind) {
-                case 188:
+                case 192:
                     return visitBinaryExpression(node);
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -38921,28 +41186,6 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    var ES2015SubstitutionFlags;
-    (function (ES2015SubstitutionFlags) {
-        ES2015SubstitutionFlags[ES2015SubstitutionFlags["CapturedThis"] = 1] = "CapturedThis";
-        ES2015SubstitutionFlags[ES2015SubstitutionFlags["BlockScopedBindings"] = 2] = "BlockScopedBindings";
-    })(ES2015SubstitutionFlags || (ES2015SubstitutionFlags = {}));
-    var CopyDirection;
-    (function (CopyDirection) {
-        CopyDirection[CopyDirection["ToOriginal"] = 0] = "ToOriginal";
-        CopyDirection[CopyDirection["ToOutParameter"] = 1] = "ToOutParameter";
-    })(CopyDirection || (CopyDirection = {}));
-    var Jump;
-    (function (Jump) {
-        Jump[Jump["Break"] = 2] = "Break";
-        Jump[Jump["Continue"] = 4] = "Continue";
-        Jump[Jump["Return"] = 8] = "Return";
-    })(Jump || (Jump = {}));
-    var SuperCaptureResult;
-    (function (SuperCaptureResult) {
-        SuperCaptureResult[SuperCaptureResult["NoReplacement"] = 0] = "NoReplacement";
-        SuperCaptureResult[SuperCaptureResult["ReplaceSuperCapture"] = 1] = "ReplaceSuperCapture";
-        SuperCaptureResult[SuperCaptureResult["ReplaceWithReturn"] = 2] = "ReplaceWithReturn";
-    })(SuperCaptureResult || (SuperCaptureResult = {}));
     function transformES2015(context) {
         var startLexicalEnvironment = context.startLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration;
         var resolver = context.getEmitResolver();
@@ -38960,6 +41203,7 @@ var ts;
         var enclosingFunction;
         var enclosingNonArrowFunction;
         var enclosingNonAsyncFunctionBody;
+        var isInConstructorWithCapturedSuper;
         var convertedLoopState;
         var enabledSubstitutions;
         return transformSourceFile;
@@ -38989,11 +41233,14 @@ var ts;
             var savedCurrentParent = currentParent;
             var savedCurrentNode = currentNode;
             var savedConvertedLoopState = convertedLoopState;
+            var savedIsInConstructorWithCapturedSuper = isInConstructorWithCapturedSuper;
             if (ts.nodeStartsNewLexicalEnvironment(node)) {
+                isInConstructorWithCapturedSuper = false;
                 convertedLoopState = undefined;
             }
             onBeforeVisitNode(node);
             var visited = f(node);
+            isInConstructorWithCapturedSuper = savedIsInConstructorWithCapturedSuper;
             convertedLoopState = savedConvertedLoopState;
             enclosingFunction = savedEnclosingFunction;
             enclosingNonArrowFunction = savedEnclosingNonArrowFunction;
@@ -39005,16 +41252,25 @@ var ts;
             currentNode = savedCurrentNode;
             return visited;
         }
+        function returnCapturedThis(node) {
+            return ts.setOriginalNode(ts.createReturn(ts.createIdentifier("_this")), node);
+        }
+        function isReturnVoidStatementInConstructorWithCapturedSuper(node) {
+            return isInConstructorWithCapturedSuper && node.kind === 216 && !node.expression;
+        }
         function shouldCheckNode(node) {
-            return (node.transformFlags & 256) !== 0 ||
-                node.kind === 215 ||
+            return (node.transformFlags & 1024) !== 0 ||
+                node.kind === 219 ||
                 (ts.isIterationStatement(node, false) && shouldConvertIterationStatementBody(node));
         }
         function visitorWorker(node) {
-            if (shouldCheckNode(node)) {
+            if (isReturnVoidStatementInConstructorWithCapturedSuper(node)) {
+                return returnCapturedThis(node);
+            }
+            else if (shouldCheckNode(node)) {
                 return visitJavaScript(node);
             }
-            else if (node.transformFlags & 512) {
+            else if (node.transformFlags & 2048 || (isInConstructorWithCapturedSuper && !ts.isExpression(node))) {
                 return ts.visitEachChild(node, visitor, context);
             }
             else {
@@ -39033,14 +41289,15 @@ var ts;
         }
         function visitNodesInConvertedLoop(node) {
             switch (node.kind) {
-                case 212:
+                case 216:
+                    node = isReturnVoidStatementInConstructorWithCapturedSuper(node) ? returnCapturedThis(node) : node;
                     return visitReturnStatement(node);
-                case 201:
+                case 205:
                     return visitVariableStatement(node);
-                case 214:
+                case 218:
                     return visitSwitchStatement(node);
-                case 211:
-                case 210:
+                case 215:
+                case 214:
                     return visitBreakOrContinueStatement(node);
                 case 98:
                     return visitThisKeyword(node);
@@ -39052,74 +41309,76 @@ var ts;
         }
         function visitJavaScript(node) {
             switch (node.kind) {
-                case 83:
-                    return node;
-                case 222:
+                case 114:
+                    return undefined;
+                case 226:
                     return visitClassDeclaration(node);
-                case 193:
+                case 197:
                     return visitClassExpression(node);
-                case 143:
+                case 144:
                     return visitParameter(node);
-                case 221:
+                case 225:
                     return visitFunctionDeclaration(node);
-                case 181:
+                case 185:
                     return visitArrowFunction(node);
-                case 180:
+                case 184:
                     return visitFunctionExpression(node);
-                case 219:
+                case 223:
                     return visitVariableDeclaration(node);
                 case 70:
                     return visitIdentifier(node);
-                case 220:
+                case 224:
                     return visitVariableDeclarationList(node);
-                case 215:
+                case 219:
                     return visitLabeledStatement(node);
-                case 205:
-                    return visitDoStatement(node);
-                case 206:
-                    return visitWhileStatement(node);
-                case 207:
-                    return visitForStatement(node);
-                case 208:
-                    return visitForInStatement(node);
                 case 209:
+                    return visitDoStatement(node);
+                case 210:
+                    return visitWhileStatement(node);
+                case 211:
+                    return visitForStatement(node);
+                case 212:
+                    return visitForInStatement(node);
+                case 213:
                     return visitForOfStatement(node);
-                case 203:
+                case 207:
                     return visitExpressionStatement(node);
-                case 172:
-                    return visitObjectLiteralExpression(node);
-                case 254:
-                    return visitShorthandPropertyAssignment(node);
-                case 171:
-                    return visitArrayLiteralExpression(node);
-                case 175:
-                    return visitCallExpression(node);
                 case 176:
-                    return visitNewExpression(node);
+                    return visitObjectLiteralExpression(node);
+                case 256:
+                    return visitCatchClause(node);
+                case 258:
+                    return visitShorthandPropertyAssignment(node);
+                case 175:
+                    return visitArrayLiteralExpression(node);
                 case 179:
+                    return visitCallExpression(node);
+                case 180:
+                    return visitNewExpression(node);
+                case 183:
                     return visitParenthesizedExpression(node, true);
-                case 188:
+                case 192:
                     return visitBinaryExpression(node, true);
                 case 12:
                 case 13:
                 case 14:
                 case 15:
                     return visitTemplateLiteral(node);
-                case 177:
+                case 181:
                     return visitTaggedTemplateExpression(node);
-                case 190:
+                case 194:
                     return visitTemplateExpression(node);
-                case 191:
+                case 195:
                     return visitYieldExpression(node);
                 case 96:
                     return visitSuperKeyword();
-                case 191:
+                case 195:
                     return ts.visitEachChild(node, visitor, context);
-                case 148:
+                case 149:
                     return visitMethodDeclaration(node);
-                case 256:
+                case 261:
                     return visitSourceFileNode(node);
-                case 201:
+                case 205:
                     return visitVariableStatement(node);
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -39134,7 +41393,7 @@ var ts;
                 }
                 if (ts.isFunctionLike(currentNode)) {
                     enclosingFunction = currentNode;
-                    if (currentNode.kind !== 181) {
+                    if (currentNode.kind !== 185) {
                         enclosingNonArrowFunction = currentNode;
                         if (!(ts.getEmitFlags(currentNode) & 2097152)) {
                             enclosingNonAsyncFunctionBody = currentNode;
@@ -39142,14 +41401,14 @@ var ts;
                     }
                 }
                 switch (currentNode.kind) {
-                    case 201:
+                    case 205:
                         enclosingVariableStatement = currentNode;
                         break;
-                    case 220:
-                    case 219:
-                    case 170:
-                    case 168:
-                    case 169:
+                    case 224:
+                    case 223:
+                    case 174:
+                    case 172:
+                    case 173:
                         break;
                     default:
                         enclosingVariableStatement = undefined;
@@ -39177,7 +41436,7 @@ var ts;
         }
         function visitThisKeyword(node) {
             ts.Debug.assert(convertedLoopState !== undefined);
-            if (enclosingFunction && enclosingFunction.kind === 181) {
+            if (enclosingFunction && enclosingFunction.kind === 185) {
                 convertedLoopState.containsLexicalThis = true;
                 return node;
             }
@@ -39197,13 +41456,13 @@ var ts;
         }
         function visitBreakOrContinueStatement(node) {
             if (convertedLoopState) {
-                var jump = node.kind === 211 ? 2 : 4;
+                var jump = node.kind === 215 ? 2 : 4;
                 var canUseBreakOrContinue = (node.label && convertedLoopState.labels && convertedLoopState.labels[node.label.text]) ||
                     (!node.label && (convertedLoopState.allowedNonLabeledJumps & jump));
                 if (!canUseBreakOrContinue) {
                     var labelMarker = void 0;
                     if (!node.label) {
-                        if (node.kind === 211) {
+                        if (node.kind === 215) {
                             convertedLoopState.nonLocalJumps |= 2;
                             labelMarker = "break";
                         }
@@ -39213,7 +41472,7 @@ var ts;
                         }
                     }
                     else {
-                        if (node.kind === 211) {
+                        if (node.kind === 215) {
                             labelMarker = "break-" + node.label.text;
                             setLabeledJump(convertedLoopState, true, node.label.text, labelMarker);
                         }
@@ -39243,26 +41502,26 @@ var ts;
             return ts.visitEachChild(node, visitor, context);
         }
         function visitClassDeclaration(node) {
-            var modifierFlags = ts.getModifierFlags(node);
-            var isExported = modifierFlags & 1;
-            var isDefault = modifierFlags & 512;
-            var modifiers = isExported && !isDefault
-                ? ts.filter(node.modifiers, isExportModifier)
-                : undefined;
-            var statement = ts.createVariableStatement(modifiers, ts.createVariableDeclarationList([
-                ts.createVariableDeclaration(getDeclarationName(node, true), undefined, transformClassLikeDeclarationToExpression(node))
-            ]), node);
+            var variable = ts.createVariableDeclaration(ts.getLocalName(node, true), undefined, transformClassLikeDeclarationToExpression(node));
+            ts.setOriginalNode(variable, node);
+            var statements = [];
+            var statement = ts.createVariableStatement(undefined, ts.createVariableDeclarationList([variable]), node);
             ts.setOriginalNode(statement, node);
             ts.startOnNewLine(statement);
-            if (isExported && isDefault) {
-                var statements = [statement];
-                statements.push(ts.createExportAssignment(undefined, undefined, false, getDeclarationName(node, false)));
-                return statements;
+            statements.push(statement);
+            if (ts.hasModifier(node, 1)) {
+                var exportStatement = ts.hasModifier(node, 512)
+                    ? ts.createExportDefault(ts.getLocalName(node))
+                    : ts.createExternalModuleExport(ts.getLocalName(node));
+                ts.setOriginalNode(exportStatement, statement);
+                statements.push(exportStatement);
             }
-            return statement;
-        }
-        function isExportModifier(node) {
-            return node.kind === 83;
+            var emitFlags = ts.getEmitFlags(node);
+            if ((emitFlags & 33554432) === 0) {
+                statements.push(ts.createEndOfDeclarationMarker(node));
+                ts.setEmitFlags(statement, emitFlags | 33554432);
+            }
+            return ts.singleOrMany(statements);
         }
         function visitClassExpression(node) {
             return transformClassLikeDeclarationToExpression(node);
@@ -39272,7 +41531,7 @@ var ts;
                 enableSubstitutionsForBlockScopedBindings();
             }
             var extendsClauseElement = ts.getClassExtendsHeritageClauseElement(node);
-            var classFunction = ts.createFunctionExpression(undefined, undefined, undefined, undefined, extendsClauseElement ? [ts.createParameter("_super")] : [], undefined, transformClassBody(node, extendsClauseElement));
+            var classFunction = ts.createFunctionExpression(undefined, undefined, undefined, undefined, extendsClauseElement ? [ts.createParameter(undefined, undefined, undefined, "_super")] : [], undefined, transformClassBody(node, extendsClauseElement));
             if (ts.getEmitFlags(node) & 524288) {
                 ts.setEmitFlags(classFunction, 524288);
             }
@@ -39293,7 +41552,7 @@ var ts;
             addConstructor(statements, node, extendsClauseElement);
             addClassMembers(statements, node);
             var closingBraceLocation = ts.createTokenRange(ts.skipTrivia(currentText, node.members.end), 17);
-            var localName = getLocalName(node);
+            var localName = ts.getLocalName(node);
             var outer = ts.createPartiallyEmittedExpression(localName);
             outer.end = closingBraceLocation.end;
             ts.setEmitFlags(outer, 49152);
@@ -39308,13 +41567,13 @@ var ts;
         }
         function addExtendsHelperIfNeeded(statements, node, extendsClauseElement) {
             if (extendsClauseElement) {
-                statements.push(ts.createStatement(ts.createExtendsHelper(currentSourceFile.externalHelpersModuleName, getDeclarationName(node)), extendsClauseElement));
+                statements.push(ts.createStatement(ts.createExtendsHelper(currentSourceFile.externalHelpersModuleName, ts.getLocalName(node)), extendsClauseElement));
             }
         }
         function addConstructor(statements, node, extendsClauseElement) {
             var constructor = ts.getFirstConstructorWithBody(node);
             var hasSynthesizedSuper = hasSynthesizedDefaultSuperCall(constructor, extendsClauseElement !== undefined);
-            var constructorFunction = ts.createFunctionDeclaration(undefined, undefined, undefined, getDeclarationName(node), undefined, transformConstructorParameters(constructor, hasSynthesizedSuper), undefined, transformConstructorBody(constructor, node, extendsClauseElement, hasSynthesizedSuper), constructor || node);
+            var constructorFunction = ts.createFunctionDeclaration(undefined, undefined, undefined, ts.getDeclarationName(node), undefined, transformConstructorParameters(constructor, hasSynthesizedSuper), undefined, transformConstructorBody(constructor, node, extendsClauseElement, hasSynthesizedSuper), constructor || node);
             if (extendsClauseElement) {
                 ts.setEmitFlags(constructorFunction, 256);
             }
@@ -39337,8 +41596,8 @@ var ts;
                 statementOffset = ts.addPrologueDirectives(statements, constructor.body.statements, false, visitor);
             }
             if (constructor) {
-                addDefaultValueAssignmentsIfNeeded(statements, constructor);
-                addRestParameterIfNeeded(statements, constructor, hasSynthesizedSuper);
+                ts.addDefaultValueAssignmentsIfNeeded(statements, constructor, visitor, false);
+                ts.addRestParameterIfNeeded(statements, constructor, hasSynthesizedSuper);
                 ts.Debug.assert(statementOffset >= 0, "statementOffset not initialized correctly!");
             }
             var superCaptureStatus = declareOrCaptureOrReturnThisForConstructorIfNeeded(statements, constructor, !!extendsClauseElement, hasSynthesizedSuper, statementOffset);
@@ -39346,7 +41605,10 @@ var ts;
                 statementOffset++;
             }
             if (constructor) {
-                var body = saveStateAndInvoke(constructor, function (constructor) { return ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, statementOffset); });
+                var body = saveStateAndInvoke(constructor, function (constructor) {
+                    isInConstructorWithCapturedSuper = superCaptureStatus === 1;
+                    return ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, statementOffset);
+                });
                 ts.addRange(statements, body);
             }
             if (extendsClauseElement
@@ -39362,17 +41624,17 @@ var ts;
             return block;
         }
         function isSufficientlyCoveredByReturnStatements(statement) {
-            if (statement.kind === 212) {
+            if (statement.kind === 216) {
                 return true;
             }
-            else if (statement.kind === 204) {
+            else if (statement.kind === 208) {
                 var ifStatement = statement;
                 if (ifStatement.elseStatement) {
                     return isSufficientlyCoveredByReturnStatements(ifStatement.thenStatement) &&
                         isSufficientlyCoveredByReturnStatements(ifStatement.elseStatement);
                 }
             }
-            else if (statement.kind === 200) {
+            else if (statement.kind === 204) {
                 var lastStatement = ts.lastOrUndefined(statement.statements);
                 if (lastStatement && isSufficientlyCoveredByReturnStatements(lastStatement)) {
                     return true;
@@ -39383,7 +41645,7 @@ var ts;
         function declareOrCaptureOrReturnThisForConstructorIfNeeded(statements, ctor, hasExtendsClause, hasSynthesizedSuper, statementOffset) {
             if (!hasExtendsClause) {
                 if (ctor) {
-                    addCaptureThisForNodeIfNeeded(statements, ctor);
+                    ts.addCaptureThisForNodeIfNeeded(statements, ctor, enableSubstitutionsForCapturedThis);
                 }
                 return 0;
             }
@@ -39392,7 +41654,7 @@ var ts;
                 return 2;
             }
             if (hasSynthesizedSuper) {
-                captureThisForNode(statements, ctor, createDefaultSuperCallOrThis());
+                ts.captureThisForNode(statements, ctor, createDefaultSuperCallOrThis());
                 enableSubstitutionsForCapturedThis();
                 return 1;
             }
@@ -39401,7 +41663,7 @@ var ts;
             var ctorStatements = ctor.body.statements;
             if (statementOffset < ctorStatements.length) {
                 firstStatement = ctorStatements[statementOffset];
-                if (firstStatement.kind === 203 && ts.isSuperCall(firstStatement.expression)) {
+                if (firstStatement.kind === 207 && ts.isSuperCall(firstStatement.expression)) {
                     var superCall = firstStatement.expression;
                     superCallExpression = ts.setOriginalNode(saveStateAndInvoke(superCall, visitImmediateSuperCallInBody), superCall);
                 }
@@ -39410,7 +41672,7 @@ var ts;
                 statements.push(ts.createReturn(superCallExpression));
                 return 2;
             }
-            captureThisForNode(statements, ctor, superCallExpression, firstStatement);
+            ts.captureThisForNode(statements, ctor, superCallExpression, enableSubstitutionsForCapturedThis, firstStatement);
             if (superCallExpression) {
                 return 1;
             }
@@ -39427,111 +41689,33 @@ var ts;
                 return undefined;
             }
             else if (ts.isBindingPattern(node.name)) {
-                return ts.setOriginalNode(ts.createParameter(ts.getGeneratedNameForNode(node), undefined, node), node);
+                return ts.setOriginalNode(ts.createParameter(undefined, undefined, undefined, ts.getGeneratedNameForNode(node), undefined, undefined, undefined, node), node);
             }
             else if (node.initializer) {
-                return ts.setOriginalNode(ts.createParameter(node.name, undefined, node), node);
+                return ts.setOriginalNode(ts.createParameter(undefined, undefined, undefined, node.name, undefined, undefined, undefined, node), node);
             }
             else {
                 return node;
             }
         }
-        function shouldAddDefaultValueAssignments(node) {
-            return (node.transformFlags & 262144) !== 0;
-        }
-        function addDefaultValueAssignmentsIfNeeded(statements, node) {
-            if (!shouldAddDefaultValueAssignments(node)) {
-                return;
-            }
-            for (var _i = 0, _a = node.parameters; _i < _a.length; _i++) {
-                var parameter = _a[_i];
-                var name_32 = parameter.name, initializer = parameter.initializer, dotDotDotToken = parameter.dotDotDotToken;
-                if (dotDotDotToken) {
-                    continue;
-                }
-                if (ts.isBindingPattern(name_32)) {
-                    addDefaultValueAssignmentForBindingPattern(statements, parameter, name_32, initializer);
-                }
-                else if (initializer) {
-                    addDefaultValueAssignmentForInitializer(statements, parameter, name_32, initializer);
-                }
-            }
-        }
-        function addDefaultValueAssignmentForBindingPattern(statements, parameter, name, initializer) {
-            var temp = ts.getGeneratedNameForNode(parameter);
-            if (name.elements.length > 0) {
-                statements.push(ts.setEmitFlags(ts.createVariableStatement(undefined, ts.createVariableDeclarationList(ts.flattenParameterDestructuring(parameter, temp, visitor))), 8388608));
-            }
-            else if (initializer) {
-                statements.push(ts.setEmitFlags(ts.createStatement(ts.createAssignment(temp, ts.visitNode(initializer, visitor, ts.isExpression))), 8388608));
-            }
-        }
-        function addDefaultValueAssignmentForInitializer(statements, parameter, name, initializer) {
-            initializer = ts.visitNode(initializer, visitor, ts.isExpression);
-            var statement = ts.createIf(ts.createStrictEquality(ts.getSynthesizedClone(name), ts.createVoidZero()), ts.setEmitFlags(ts.createBlock([
-                ts.createStatement(ts.createAssignment(ts.setEmitFlags(ts.getMutableClone(name), 1536), ts.setEmitFlags(initializer, 1536 | ts.getEmitFlags(initializer)), parameter))
-            ], parameter), 32 | 1024 | 12288), undefined, parameter);
-            statement.startsOnNewLine = true;
-            ts.setEmitFlags(statement, 12288 | 1024 | 8388608);
-            statements.push(statement);
-        }
-        function shouldAddRestParameter(node, inConstructorWithSynthesizedSuper) {
-            return node && node.dotDotDotToken && node.name.kind === 70 && !inConstructorWithSynthesizedSuper;
-        }
-        function addRestParameterIfNeeded(statements, node, inConstructorWithSynthesizedSuper) {
-            var parameter = ts.lastOrUndefined(node.parameters);
-            if (!shouldAddRestParameter(parameter, inConstructorWithSynthesizedSuper)) {
-                return;
-            }
-            var declarationName = ts.getMutableClone(parameter.name);
-            ts.setEmitFlags(declarationName, 1536);
-            var expressionName = ts.getSynthesizedClone(parameter.name);
-            var restIndex = node.parameters.length - 1;
-            var temp = ts.createLoopVariable();
-            statements.push(ts.setEmitFlags(ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
-                ts.createVariableDeclaration(declarationName, undefined, ts.createArrayLiteral([]))
-            ]), parameter), 8388608));
-            var forStatement = ts.createFor(ts.createVariableDeclarationList([
-                ts.createVariableDeclaration(temp, undefined, ts.createLiteral(restIndex))
-            ], parameter), ts.createLessThan(temp, ts.createPropertyAccess(ts.createIdentifier("arguments"), "length"), parameter), ts.createPostfixIncrement(temp, parameter), ts.createBlock([
-                ts.startOnNewLine(ts.createStatement(ts.createAssignment(ts.createElementAccess(expressionName, ts.createSubtract(temp, ts.createLiteral(restIndex))), ts.createElementAccess(ts.createIdentifier("arguments"), temp)), parameter))
-            ]));
-            ts.setEmitFlags(forStatement, 8388608);
-            ts.startOnNewLine(forStatement);
-            statements.push(forStatement);
-        }
-        function addCaptureThisForNodeIfNeeded(statements, node) {
-            if (node.transformFlags & 65536 && node.kind !== 181) {
-                captureThisForNode(statements, node, ts.createThis());
-            }
-        }
-        function captureThisForNode(statements, node, initializer, originalStatement) {
-            enableSubstitutionsForCapturedThis();
-            var captureThisStatement = ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
-                ts.createVariableDeclaration("_this", undefined, initializer)
-            ]), originalStatement);
-            ts.setEmitFlags(captureThisStatement, 49152 | 8388608);
-            ts.setSourceMapRange(captureThisStatement, node);
-            statements.push(captureThisStatement);
-        }
         function addClassMembers(statements, node) {
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
                 switch (member.kind) {
-                    case 199:
+                    case 203:
                         statements.push(transformSemicolonClassElementToStatement(member));
                         break;
-                    case 148:
+                    case 149:
                         statements.push(transformClassMethodDeclarationToStatement(getClassMemberPrefix(node, member), member));
                         break;
-                    case 150:
                     case 151:
+                    case 152:
                         var accessors = ts.getAllAccessorDeclarations(node.members, member);
                         if (member === accessors.firstAccessor) {
                             statements.push(transformAccessorsToStatement(getClassMemberPrefix(node, member), accessors));
                         }
                         break;
-                    case 149:
+                    case 150:
                         break;
                     default:
                         ts.Debug.failBadSyntaxKind(node);
@@ -39596,7 +41780,7 @@ var ts;
             return call;
         }
         function visitArrowFunction(node) {
-            if (node.transformFlags & 32768) {
+            if (node.transformFlags & 262144) {
                 enableSubstitutionsForCapturedThis();
             }
             var func = transformFunctionLikeToExpression(node, node, undefined);
@@ -39607,80 +41791,22 @@ var ts;
             return transformFunctionLikeToExpression(node, node, node.name);
         }
         function visitFunctionDeclaration(node) {
-            return ts.setOriginalNode(ts.createFunctionDeclaration(undefined, node.modifiers, node.asteriskToken, node.name, undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, transformFunctionBody(node), node), node);
+            return ts.setOriginalNode(ts.createFunctionDeclaration(undefined, node.modifiers, node.asteriskToken, node.name, undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, ts.transformFunctionBody(node, visitor, currentSourceFile, context, enableSubstitutionsForCapturedThis), node), node);
         }
         function transformFunctionLikeToExpression(node, location, name) {
             var savedContainingNonArrowFunction = enclosingNonArrowFunction;
-            if (node.kind !== 181) {
+            if (node.kind !== 185) {
                 enclosingNonArrowFunction = node;
             }
-            var expression = ts.setOriginalNode(ts.createFunctionExpression(undefined, node.asteriskToken, name, undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, saveStateAndInvoke(node, transformFunctionBody), location), node);
+            var expression = ts.setOriginalNode(ts.createFunctionExpression(undefined, node.asteriskToken, name, undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), undefined, saveStateAndInvoke(node, function (node) { return ts.transformFunctionBody(node, visitor, currentSourceFile, context, enableSubstitutionsForCapturedThis); }), location), node);
             enclosingNonArrowFunction = savedContainingNonArrowFunction;
             return expression;
         }
-        function transformFunctionBody(node) {
-            var multiLine = false;
-            var singleLine = false;
-            var statementsLocation;
-            var closeBraceLocation;
-            var statements = [];
-            var body = node.body;
-            var statementOffset;
-            startLexicalEnvironment();
-            if (ts.isBlock(body)) {
-                statementOffset = ts.addPrologueDirectives(statements, body.statements, false, visitor);
-            }
-            addCaptureThisForNodeIfNeeded(statements, node);
-            addDefaultValueAssignmentsIfNeeded(statements, node);
-            addRestParameterIfNeeded(statements, node, false);
-            if (!multiLine && statements.length > 0) {
-                multiLine = true;
-            }
-            if (ts.isBlock(body)) {
-                statementsLocation = body.statements;
-                ts.addRange(statements, ts.visitNodes(body.statements, visitor, ts.isStatement, statementOffset));
-                if (!multiLine && body.multiLine) {
-                    multiLine = true;
-                }
-            }
-            else {
-                ts.Debug.assert(node.kind === 181);
-                statementsLocation = ts.moveRangeEnd(body, -1);
-                var equalsGreaterThanToken = node.equalsGreaterThanToken;
-                if (!ts.nodeIsSynthesized(equalsGreaterThanToken) && !ts.nodeIsSynthesized(body)) {
-                    if (ts.rangeEndIsOnSameLineAsRangeStart(equalsGreaterThanToken, body, currentSourceFile)) {
-                        singleLine = true;
-                    }
-                    else {
-                        multiLine = true;
-                    }
-                }
-                var expression = ts.visitNode(body, visitor, ts.isExpression);
-                var returnStatement = ts.createReturn(expression, body);
-                ts.setEmitFlags(returnStatement, 12288 | 1024 | 32768);
-                statements.push(returnStatement);
-                closeBraceLocation = body;
-            }
-            var lexicalEnvironment = endLexicalEnvironment();
-            ts.addRange(statements, lexicalEnvironment);
-            if (!multiLine && lexicalEnvironment && lexicalEnvironment.length) {
-                multiLine = true;
-            }
-            var block = ts.createBlock(ts.createNodeArray(statements, statementsLocation), node.body, multiLine);
-            if (!multiLine && singleLine) {
-                ts.setEmitFlags(block, 32);
-            }
-            if (closeBraceLocation) {
-                ts.setTokenSourceMapRange(block, 17, closeBraceLocation);
-            }
-            ts.setOriginalNode(block, node.body);
-            return block;
-        }
         function visitExpressionStatement(node) {
             switch (node.expression.kind) {
-                case 179:
+                case 183:
                     return ts.updateStatement(node, visitParenthesizedExpression(node.expression, false));
-                case 188:
+                case 192:
                     return ts.updateStatement(node, visitBinaryExpression(node.expression, false));
             }
             return ts.visitEachChild(node, visitor, context);
@@ -39688,9 +41814,9 @@ var ts;
         function visitParenthesizedExpression(node, needsDestructuringValue) {
             if (needsDestructuringValue) {
                 switch (node.expression.kind) {
-                    case 179:
+                    case 183:
                         return ts.createParen(visitParenthesizedExpression(node.expression, true), node);
-                    case 188:
+                    case 192:
                         return ts.createParen(visitBinaryExpression(node.expression, true), node);
                 }
             }
@@ -39736,7 +41862,7 @@ var ts;
             var declarationList = ts.createVariableDeclarationList(declarations, node);
             ts.setOriginalNode(declarationList, node);
             ts.setCommentRange(declarationList, node);
-            if (node.transformFlags & 8388608
+            if (node.transformFlags & 67108864
                 && (ts.isBindingPattern(node.declarations[0].name)
                     || ts.isBindingPattern(ts.lastOrUndefined(node.declarations).name))) {
                 var firstDeclaration = ts.firstOrUndefined(declarations);
@@ -39755,8 +41881,8 @@ var ts;
                     && ts.isBlock(enclosingBlockScopeContainer)
                     && ts.isIterationStatement(enclosingBlockScopeContainerParent, false));
             var emitExplicitInitializer = !emittedAsTopLevel
-                && enclosingBlockScopeContainer.kind !== 208
-                && enclosingBlockScopeContainer.kind !== 209
+                && enclosingBlockScopeContainer.kind !== 212
+                && enclosingBlockScopeContainer.kind !== 213
                 && (!resolver.isDeclarationWithCollidingName(node)
                     || (isDeclaredInLoop
                         && !isCapturedInFunction
@@ -39818,68 +41944,7 @@ var ts;
             return convertIterationStatementBodyIfNecessary(node, convertForOfToFor);
         }
         function convertForOfToFor(node, convertedLoopBodyStatements) {
-            var expression = ts.visitNode(node.expression, visitor, ts.isExpression);
-            var initializer = node.initializer;
-            var statements = [];
-            var counter = ts.createLoopVariable();
-            var rhsReference = expression.kind === 70
-                ? ts.createUniqueName(expression.text)
-                : ts.createTempVariable(undefined);
-            if (ts.isVariableDeclarationList(initializer)) {
-                if (initializer.flags & 3) {
-                    enableSubstitutionsForBlockScopedBindings();
-                }
-                var firstOriginalDeclaration = ts.firstOrUndefined(initializer.declarations);
-                if (firstOriginalDeclaration && ts.isBindingPattern(firstOriginalDeclaration.name)) {
-                    var declarations = ts.flattenVariableDestructuring(firstOriginalDeclaration, ts.createElementAccess(rhsReference, counter), visitor);
-                    var declarationList = ts.createVariableDeclarationList(declarations, initializer);
-                    ts.setOriginalNode(declarationList, initializer);
-                    var firstDeclaration = declarations[0];
-                    var lastDeclaration = ts.lastOrUndefined(declarations);
-                    ts.setSourceMapRange(declarationList, ts.createRange(firstDeclaration.pos, lastDeclaration.end));
-                    statements.push(ts.createVariableStatement(undefined, declarationList));
-                }
-                else {
-                    statements.push(ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
-                        ts.createVariableDeclaration(firstOriginalDeclaration ? firstOriginalDeclaration.name : ts.createTempVariable(undefined), undefined, ts.createElementAccess(rhsReference, counter))
-                    ], ts.moveRangePos(initializer, -1)), ts.moveRangeEnd(initializer, -1)));
-                }
-            }
-            else {
-                var assignment = ts.createAssignment(initializer, ts.createElementAccess(rhsReference, counter));
-                if (ts.isDestructuringAssignment(assignment)) {
-                    statements.push(ts.createStatement(ts.flattenDestructuringAssignment(context, assignment, false, hoistVariableDeclaration, visitor)));
-                }
-                else {
-                    assignment.end = initializer.end;
-                    statements.push(ts.createStatement(assignment, ts.moveRangeEnd(initializer, -1)));
-                }
-            }
-            var bodyLocation;
-            var statementsLocation;
-            if (convertedLoopBodyStatements) {
-                ts.addRange(statements, convertedLoopBodyStatements);
-            }
-            else {
-                var statement = ts.visitNode(node.statement, visitor, ts.isStatement);
-                if (ts.isBlock(statement)) {
-                    ts.addRange(statements, statement.statements);
-                    bodyLocation = statement;
-                    statementsLocation = statement.statements;
-                }
-                else {
-                    statements.push(statement);
-                }
-            }
-            ts.setEmitFlags(expression, 1536 | ts.getEmitFlags(expression));
-            var body = ts.createBlock(ts.createNodeArray(statements, statementsLocation), bodyLocation);
-            ts.setEmitFlags(body, 1536 | 12288);
-            var forStatement = ts.createFor(ts.createVariableDeclarationList([
-                ts.createVariableDeclaration(counter, undefined, ts.createLiteral(0), ts.moveRangePos(node.expression, -1)),
-                ts.createVariableDeclaration(rhsReference, undefined, expression, node.expression)
-            ], node.expression), ts.createLessThan(counter, ts.createPropertyAccess(rhsReference, "length"), node.expression), ts.createPostfixIncrement(counter, node.expression), body, node);
-            ts.setEmitFlags(forStatement, 8192);
-            return forStatement;
+            return ts.convertForOf(node, convertedLoopBodyStatements, visitor, enableSubstitutionsForBlockScopedBindings, context, false);
         }
         function visitObjectLiteralExpression(node) {
             var properties = node.properties;
@@ -39887,8 +41952,8 @@ var ts;
             var numInitialProperties = numProperties;
             for (var i = 0; i < numProperties; i++) {
                 var property = properties[i];
-                if (property.transformFlags & 16777216
-                    || property.name.kind === 141) {
+                if (property.transformFlags & 134217728
+                    || property.name.kind === 142) {
                     numInitialProperties = i;
                     break;
                 }
@@ -39943,11 +42008,11 @@ var ts;
             var functionName = ts.createUniqueName("_loop");
             var loopInitializer;
             switch (node.kind) {
-                case 207:
-                case 208:
-                case 209:
+                case 211:
+                case 212:
+                case 213:
                     var initializer = node.initializer;
-                    if (initializer && initializer.kind === 220) {
+                    if (initializer && initializer.kind === 224) {
                         loopInitializer = initializer;
                     }
                     break;
@@ -39986,7 +42051,7 @@ var ts;
             }
             var isAsyncBlockContainingAwait = enclosingNonArrowFunction
                 && (ts.getEmitFlags(enclosingNonArrowFunction) & 2097152) !== 0
-                && (node.statement.transformFlags & 16777216) !== 0;
+                && (node.statement.transformFlags & 134217728) !== 0;
             var loopBodyFlags = 0;
             if (currentState.containsLexicalThis) {
                 loopBodyFlags |= 256;
@@ -39994,9 +42059,9 @@ var ts;
             if (isAsyncBlockContainingAwait) {
                 loopBodyFlags |= 2097152;
             }
-            var convertedLoopVariable = ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
+            var convertedLoopVariable = ts.createVariableStatement(undefined, ts.setEmitFlags(ts.createVariableDeclarationList([
                 ts.createVariableDeclaration(functionName, undefined, ts.setEmitFlags(ts.createFunctionExpression(undefined, isAsyncBlockContainingAwait ? ts.createToken(38) : undefined, undefined, undefined, loopParameters, undefined, loopBody), loopBodyFlags))
-            ]));
+            ]), 16777216));
             var statements = [convertedLoopVariable];
             var extraVariableDeclarations;
             if (currentState.argumentsName) {
@@ -40054,7 +42119,7 @@ var ts;
                 loop.transformFlags = 0;
                 ts.aggregateTransformFlags(loop);
             }
-            statements.push(currentParent.kind === 215
+            statements.push(currentParent.kind === 219
                 ? ts.createLabel(currentParent.label, loop)
                 : loop);
             return statements;
@@ -40153,7 +42218,7 @@ var ts;
                 }
             }
             else {
-                loopParameters.push(ts.createParameter(name));
+                loopParameters.push(ts.createParameter(undefined, undefined, undefined, name));
                 if (resolver.getNodeCheckFlags(decl) & 2097152) {
                     var outParamName = ts.createUniqueName("out_" + name.text);
                     loopOutParameters.push({ originalName: name, outParamName: outParamName });
@@ -40166,20 +42231,20 @@ var ts;
             for (var i = start; i < numProperties; i++) {
                 var property = properties[i];
                 switch (property.kind) {
-                    case 150:
                     case 151:
+                    case 152:
                         var accessors = ts.getAllAccessorDeclarations(node.properties, property);
                         if (property === accessors.firstAccessor) {
                             expressions.push(transformAccessorsToExpression(receiver, accessors, node.multiLine));
                         }
                         break;
-                    case 253:
+                    case 257:
                         expressions.push(transformPropertyAssignmentToExpression(property, receiver, node.multiLine));
                         break;
-                    case 254:
+                    case 258:
                         expressions.push(transformShorthandPropertyAssignmentToExpression(property, receiver, node.multiLine));
                         break;
-                    case 148:
+                    case 149:
                         expressions.push(transformObjectLiteralMethodDeclarationToExpression(property, receiver, node.multiLine));
                         break;
                     default:
@@ -40209,6 +42274,19 @@ var ts;
             }
             return expression;
         }
+        function visitCatchClause(node) {
+            ts.Debug.assert(ts.isBindingPattern(node.variableDeclaration.name));
+            var temp = ts.createTempVariable(undefined);
+            var newVariableDeclaration = ts.createVariableDeclaration(temp, undefined, undefined, node.variableDeclaration);
+            var vars = ts.flattenVariableDestructuring(node.variableDeclaration, temp, visitor);
+            var list = ts.createVariableDeclarationList(vars, node.variableDeclaration, node.variableDeclaration.flags);
+            var destructure = ts.createVariableStatement(undefined, list);
+            return ts.updateCatchClause(node, newVariableDeclaration, addStatementToStartOfBlock(node.block, destructure));
+        }
+        function addStatementToStartOfBlock(block, statement) {
+            var transformedStatements = ts.visitNodes(block.statements, visitor, ts.isStatement);
+            return ts.updateBlock(block, [statement].concat(transformedStatements));
+        }
         function visitMethodDeclaration(node) {
             ts.Debug.assert(!ts.isComputedPropertyName(node.name));
             var functionExpression = transformFunctionLikeToExpression(node, ts.moveRangePos(node, -1), undefined);
@@ -40236,7 +42314,7 @@ var ts;
                 ts.setEmitFlags(thisArg, 128);
             }
             var resultingCall;
-            if (node.transformFlags & 1048576) {
+            if (node.transformFlags & 8388608) {
                 resultingCall = ts.createFunctionApply(ts.visitNode(target, visitor, ts.isExpression), ts.visitNode(thisArg, visitor, ts.isExpression), transformAndSpreadElements(node.arguments, false, false, false));
             }
             else {
@@ -40253,35 +42331,35 @@ var ts;
             return resultingCall;
         }
         function visitNewExpression(node) {
-            ts.Debug.assert((node.transformFlags & 1048576) !== 0);
+            ts.Debug.assert((node.transformFlags & 8388608) !== 0);
             var _a = ts.createCallBinding(ts.createPropertyAccess(node.expression, "bind"), hoistVariableDeclaration), target = _a.target, thisArg = _a.thisArg;
             return ts.createNew(ts.createFunctionApply(ts.visitNode(target, visitor, ts.isExpression), thisArg, transformAndSpreadElements(ts.createNodeArray([ts.createVoidZero()].concat(node.arguments)), false, false, false)), undefined, []);
         }
         function transformAndSpreadElements(elements, needsUniqueCopy, multiLine, hasTrailingComma) {
             var numElements = elements.length;
-            var segments = ts.flatten(ts.spanMap(elements, partitionSpreadElement, function (partition, visitPartition, _start, end) {
+            var segments = ts.flatten(ts.spanMap(elements, partitionSpread, function (partition, visitPartition, _start, end) {
                 return visitPartition(partition, multiLine, hasTrailingComma && end === numElements);
             }));
             if (segments.length === 1) {
                 var firstElement = elements[0];
-                return needsUniqueCopy && ts.isSpreadElementExpression(firstElement) && firstElement.expression.kind !== 171
+                return needsUniqueCopy && ts.isSpreadExpression(firstElement) && firstElement.expression.kind !== 175
                     ? ts.createArraySlice(segments[0])
                     : segments[0];
             }
             return ts.createArrayConcat(segments.shift(), segments);
         }
-        function partitionSpreadElement(node) {
-            return ts.isSpreadElementExpression(node)
-                ? visitSpanOfSpreadElements
-                : visitSpanOfNonSpreadElements;
+        function partitionSpread(node) {
+            return ts.isSpreadExpression(node)
+                ? visitSpanOfSpreads
+                : visitSpanOfNonSpreads;
         }
-        function visitSpanOfSpreadElements(chunk) {
-            return ts.map(chunk, visitExpressionOfSpreadElement);
+        function visitSpanOfSpreads(chunk) {
+            return ts.map(chunk, visitExpressionOfSpread);
         }
-        function visitSpanOfNonSpreadElements(chunk, multiLine, hasTrailingComma) {
+        function visitSpanOfNonSpreads(chunk, multiLine, hasTrailingComma) {
             return ts.createArrayLiteral(ts.visitNodes(ts.createNodeArray(chunk, undefined, hasTrailingComma), visitor, ts.isExpression), undefined, multiLine);
         }
-        function visitExpressionOfSpreadElement(node) {
+        function visitExpressionOfSpread(node) {
             return ts.visitNode(node.expression, visitor, ts.isExpression);
         }
         function visitTemplateLiteral(node) {
@@ -40354,7 +42432,7 @@ var ts;
             return enclosingNonAsyncFunctionBody
                 && ts.isClassElement(enclosingNonAsyncFunctionBody)
                 && !ts.hasModifier(enclosingNonAsyncFunctionBody, 32)
-                && currentParent.kind !== 175
+                && currentParent.kind !== 179
                 ? ts.createPropertyAccess(ts.createIdentifier("_super"), "prototype")
                 : ts.createIdentifier("_super");
         }
@@ -40363,7 +42441,7 @@ var ts;
             var statements = [];
             startLexicalEnvironment();
             ts.addRange(statements, prologue);
-            addCaptureThisForNodeIfNeeded(statements, node);
+            ts.addCaptureThisForNodeIfNeeded(statements, node, enableSubstitutionsForCapturedThis);
             ts.addRange(statements, ts.visitNodes(ts.createNodeArray(remaining), visitor, ts.isStatement));
             ts.addRange(statements, endLexicalEnvironment());
             var clone = ts.getMutableClone(node);
@@ -40388,13 +42466,13 @@ var ts;
             if ((enabledSubstitutions & 1) === 0) {
                 enabledSubstitutions |= 1;
                 context.enableSubstitution(98);
-                context.enableEmitNotification(149);
-                context.enableEmitNotification(148);
                 context.enableEmitNotification(150);
+                context.enableEmitNotification(149);
                 context.enableEmitNotification(151);
-                context.enableEmitNotification(181);
-                context.enableEmitNotification(180);
-                context.enableEmitNotification(221);
+                context.enableEmitNotification(152);
+                context.enableEmitNotification(185);
+                context.enableEmitNotification(184);
+                context.enableEmitNotification(225);
             }
         }
         function onSubstituteNode(emitContext, node) {
@@ -40419,10 +42497,10 @@ var ts;
         function isNameOfDeclarationWithCollidingName(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 170:
-                case 222:
-                case 225:
-                case 219:
+                case 174:
+                case 226:
+                case 229:
+                case 223:
                     return parent.name === node
                         && resolver.isDeclarationWithCollidingName(parent);
             }
@@ -40454,28 +42532,8 @@ var ts;
             }
             return node;
         }
-        function getLocalName(node, allowComments, allowSourceMaps) {
-            return getDeclarationName(node, allowComments, allowSourceMaps, 262144);
-        }
-        function getDeclarationName(node, allowComments, allowSourceMaps, emitFlags) {
-            if (node.name && !ts.isGeneratedIdentifier(node.name)) {
-                var name_33 = ts.getMutableClone(node.name);
-                emitFlags |= ts.getEmitFlags(node.name);
-                if (!allowSourceMaps) {
-                    emitFlags |= 1536;
-                }
-                if (!allowComments) {
-                    emitFlags |= 49152;
-                }
-                if (emitFlags) {
-                    ts.setEmitFlags(name_33, emitFlags);
-                }
-                return name_33;
-            }
-            return ts.getGeneratedNameForNode(node);
-        }
         function getClassMemberPrefix(node, member) {
-            var expression = getLocalName(node);
+            var expression = ts.getLocalName(node);
             return ts.hasModifier(member, 32) ? expression : ts.createPropertyAccess(expression, "prototype");
         }
         function hasSynthesizedDefaultSuperCall(constructor, hasExtendsClause) {
@@ -40487,11 +42545,11 @@ var ts;
                 return false;
             }
             var statement = ts.firstOrUndefined(constructor.body.statements);
-            if (!statement || !ts.nodeIsSynthesized(statement) || statement.kind !== 203) {
+            if (!statement || !ts.nodeIsSynthesized(statement) || statement.kind !== 207) {
                 return false;
             }
             var statementExpression = statement.expression;
-            if (!ts.nodeIsSynthesized(statementExpression) || statementExpression.kind !== 175) {
+            if (!ts.nodeIsSynthesized(statementExpression) || statementExpression.kind !== 179) {
                 return false;
             }
             var callTarget = statementExpression.expression;
@@ -40499,7 +42557,7 @@ var ts;
                 return false;
             }
             var callArgument = ts.singleOrUndefined(statementExpression.arguments);
-            if (!callArgument || !ts.nodeIsSynthesized(callArgument) || callArgument.kind !== 192) {
+            if (!callArgument || !ts.nodeIsSynthesized(callArgument) || callArgument.kind !== 196) {
                 return false;
             }
             var expression = callArgument.expression;
@@ -40510,51 +42568,6 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    var OpCode;
-    (function (OpCode) {
-        OpCode[OpCode["Nop"] = 0] = "Nop";
-        OpCode[OpCode["Statement"] = 1] = "Statement";
-        OpCode[OpCode["Assign"] = 2] = "Assign";
-        OpCode[OpCode["Break"] = 3] = "Break";
-        OpCode[OpCode["BreakWhenTrue"] = 4] = "BreakWhenTrue";
-        OpCode[OpCode["BreakWhenFalse"] = 5] = "BreakWhenFalse";
-        OpCode[OpCode["Yield"] = 6] = "Yield";
-        OpCode[OpCode["YieldStar"] = 7] = "YieldStar";
-        OpCode[OpCode["Return"] = 8] = "Return";
-        OpCode[OpCode["Throw"] = 9] = "Throw";
-        OpCode[OpCode["Endfinally"] = 10] = "Endfinally";
-    })(OpCode || (OpCode = {}));
-    var BlockAction;
-    (function (BlockAction) {
-        BlockAction[BlockAction["Open"] = 0] = "Open";
-        BlockAction[BlockAction["Close"] = 1] = "Close";
-    })(BlockAction || (BlockAction = {}));
-    var CodeBlockKind;
-    (function (CodeBlockKind) {
-        CodeBlockKind[CodeBlockKind["Exception"] = 0] = "Exception";
-        CodeBlockKind[CodeBlockKind["With"] = 1] = "With";
-        CodeBlockKind[CodeBlockKind["Switch"] = 2] = "Switch";
-        CodeBlockKind[CodeBlockKind["Loop"] = 3] = "Loop";
-        CodeBlockKind[CodeBlockKind["Labeled"] = 4] = "Labeled";
-    })(CodeBlockKind || (CodeBlockKind = {}));
-    var ExceptionBlockState;
-    (function (ExceptionBlockState) {
-        ExceptionBlockState[ExceptionBlockState["Try"] = 0] = "Try";
-        ExceptionBlockState[ExceptionBlockState["Catch"] = 1] = "Catch";
-        ExceptionBlockState[ExceptionBlockState["Finally"] = 2] = "Finally";
-        ExceptionBlockState[ExceptionBlockState["Done"] = 3] = "Done";
-    })(ExceptionBlockState || (ExceptionBlockState = {}));
-    var Instruction;
-    (function (Instruction) {
-        Instruction[Instruction["Next"] = 0] = "Next";
-        Instruction[Instruction["Throw"] = 1] = "Throw";
-        Instruction[Instruction["Return"] = 2] = "Return";
-        Instruction[Instruction["Break"] = 3] = "Break";
-        Instruction[Instruction["Yield"] = 4] = "Yield";
-        Instruction[Instruction["YieldStar"] = 5] = "YieldStar";
-        Instruction[Instruction["Catch"] = 6] = "Catch";
-        Instruction[Instruction["Endfinally"] = 7] = "Endfinally";
-    })(Instruction || (Instruction = {}));
     var instructionNames = ts.createMap((_a = {},
         _a[2] = "return",
         _a[3] = "break",
@@ -40600,7 +42613,7 @@ var ts;
             if (ts.isDeclarationFile(node)) {
                 return node;
             }
-            if (node.transformFlags & 4096) {
+            if (node.transformFlags & 8192) {
                 currentSourceFile = node;
                 node = ts.visitEachChild(node, visitor, context);
                 currentSourceFile = undefined;
@@ -40615,10 +42628,10 @@ var ts;
             else if (inGeneratorFunctionBody) {
                 return visitJavaScriptInGeneratorFunctionBody(node);
             }
-            else if (transformFlags & 2048) {
+            else if (transformFlags & 4096) {
                 return visitGenerator(node);
             }
-            else if (transformFlags & 4096) {
+            else if (transformFlags & 8192) {
                 return ts.visitEachChild(node, visitor, context);
             }
             else {
@@ -40627,13 +42640,13 @@ var ts;
         }
         function visitJavaScriptInStatementContainingYield(node) {
             switch (node.kind) {
-                case 205:
+                case 209:
                     return visitDoStatement(node);
-                case 206:
+                case 210:
                     return visitWhileStatement(node);
-                case 214:
+                case 218:
                     return visitSwitchStatement(node);
-                case 215:
+                case 219:
                     return visitLabeledStatement(node);
                 default:
                     return visitJavaScriptInGeneratorFunctionBody(node);
@@ -40641,30 +42654,30 @@ var ts;
         }
         function visitJavaScriptInGeneratorFunctionBody(node) {
             switch (node.kind) {
-                case 221:
+                case 225:
                     return visitFunctionDeclaration(node);
-                case 180:
+                case 184:
                     return visitFunctionExpression(node);
-                case 150:
                 case 151:
+                case 152:
                     return visitAccessorDeclaration(node);
-                case 201:
+                case 205:
                     return visitVariableStatement(node);
-                case 207:
-                    return visitForStatement(node);
-                case 208:
-                    return visitForInStatement(node);
                 case 211:
-                    return visitBreakStatement(node);
-                case 210:
-                    return visitContinueStatement(node);
+                    return visitForStatement(node);
                 case 212:
+                    return visitForInStatement(node);
+                case 215:
+                    return visitBreakStatement(node);
+                case 214:
+                    return visitContinueStatement(node);
+                case 216:
                     return visitReturnStatement(node);
                 default:
-                    if (node.transformFlags & 16777216) {
+                    if (node.transformFlags & 134217728) {
                         return visitJavaScriptContainingYield(node);
                     }
-                    else if (node.transformFlags & (4096 | 33554432)) {
+                    else if (node.transformFlags & (8192 | 268435456)) {
                         return ts.visitEachChild(node, visitor, context);
                     }
                     else {
@@ -40674,21 +42687,21 @@ var ts;
         }
         function visitJavaScriptContainingYield(node) {
             switch (node.kind) {
-                case 188:
+                case 192:
                     return visitBinaryExpression(node);
-                case 189:
+                case 193:
                     return visitConditionalExpression(node);
-                case 191:
+                case 195:
                     return visitYieldExpression(node);
-                case 171:
-                    return visitArrayLiteralExpression(node);
-                case 172:
-                    return visitObjectLiteralExpression(node);
-                case 174:
-                    return visitElementAccessExpression(node);
                 case 175:
-                    return visitCallExpression(node);
+                    return visitArrayLiteralExpression(node);
                 case 176:
+                    return visitObjectLiteralExpression(node);
+                case 178:
+                    return visitElementAccessExpression(node);
+                case 179:
+                    return visitCallExpression(node);
+                case 180:
                     return visitNewExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -40696,9 +42709,9 @@ var ts;
         }
         function visitGenerator(node) {
             switch (node.kind) {
-                case 221:
+                case 225:
                     return visitFunctionDeclaration(node);
-                case 180:
+                case 184:
                     return visitFunctionExpression(node);
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -40801,7 +42814,7 @@ var ts;
             return ts.createBlock(statements, body, body.multiLine);
         }
         function visitVariableStatement(node) {
-            if (node.transformFlags & 16777216) {
+            if (node.transformFlags & 134217728) {
                 transformAndEmitVariableDeclarationList(node.declarationList);
                 return undefined;
             }
@@ -40855,10 +42868,10 @@ var ts;
             if (containsYield(right)) {
                 var target = void 0;
                 switch (left.kind) {
-                    case 173:
+                    case 177:
                         target = ts.updatePropertyAccess(left, cacheExpression(ts.visitNode(left.expression, visitor, ts.isLeftHandSideExpression)), left.name);
                         break;
-                    case 174:
+                    case 178:
                         target = ts.updateElementAccess(left, cacheExpression(ts.visitNode(left.expression, visitor, ts.isLeftHandSideExpression)), cacheExpression(ts.visitNode(left.argumentExpression, visitor, ts.isExpression)));
                         break;
                     default:
@@ -41050,35 +43063,35 @@ var ts;
         }
         function transformAndEmitStatementWorker(node) {
             switch (node.kind) {
-                case 200:
-                    return transformAndEmitBlock(node);
-                case 203:
-                    return transformAndEmitExpressionStatement(node);
                 case 204:
-                    return transformAndEmitIfStatement(node);
-                case 205:
-                    return transformAndEmitDoStatement(node);
-                case 206:
-                    return transformAndEmitWhileStatement(node);
+                    return transformAndEmitBlock(node);
                 case 207:
-                    return transformAndEmitForStatement(node);
+                    return transformAndEmitExpressionStatement(node);
                 case 208:
-                    return transformAndEmitForInStatement(node);
+                    return transformAndEmitIfStatement(node);
+                case 209:
+                    return transformAndEmitDoStatement(node);
                 case 210:
-                    return transformAndEmitContinueStatement(node);
+                    return transformAndEmitWhileStatement(node);
                 case 211:
-                    return transformAndEmitBreakStatement(node);
+                    return transformAndEmitForStatement(node);
                 case 212:
-                    return transformAndEmitReturnStatement(node);
-                case 213:
-                    return transformAndEmitWithStatement(node);
+                    return transformAndEmitForInStatement(node);
                 case 214:
-                    return transformAndEmitSwitchStatement(node);
+                    return transformAndEmitContinueStatement(node);
                 case 215:
-                    return transformAndEmitLabeledStatement(node);
+                    return transformAndEmitBreakStatement(node);
                 case 216:
-                    return transformAndEmitThrowStatement(node);
+                    return transformAndEmitReturnStatement(node);
                 case 217:
+                    return transformAndEmitWithStatement(node);
+                case 218:
+                    return transformAndEmitSwitchStatement(node);
+                case 219:
+                    return transformAndEmitLabeledStatement(node);
+                case 220:
+                    return transformAndEmitThrowStatement(node);
+                case 221:
                     return transformAndEmitTryStatement(node);
                 default:
                     return emitStatement(ts.visitNode(node, visitor, ts.isStatement, true));
@@ -41362,7 +43375,7 @@ var ts;
                 for (var i = 0; i < numClauses; i++) {
                     var clause = caseBlock.clauses[i];
                     clauseLabels.push(defineLabel());
-                    if (clause.kind === 250 && defaultClauseIndex === -1) {
+                    if (clause.kind === 254 && defaultClauseIndex === -1) {
                         defaultClauseIndex = i;
                     }
                 }
@@ -41372,7 +43385,7 @@ var ts;
                     var defaultClausesSkipped = 0;
                     for (var i = clausesWritten; i < numClauses; i++) {
                         var clause = caseBlock.clauses[i];
-                        if (clause.kind === 249) {
+                        if (clause.kind === 253) {
                             var caseClause = clause;
                             if (containsYield(caseClause.expression) && pendingClauses.length > 0) {
                                 break;
@@ -41463,7 +43476,7 @@ var ts;
             }
         }
         function containsYield(node) {
-            return node && (node.transformFlags & 16777216) !== 0;
+            return node && (node.transformFlags & 134217728) !== 0;
         }
         function countInitialNodesWithoutYield(nodes) {
             var numNodes = nodes.length;
@@ -41493,9 +43506,9 @@ var ts;
                 if (ts.isIdentifier(original) && original.parent) {
                     var declaration = resolver.getReferencedValueDeclaration(original);
                     if (declaration) {
-                        var name_34 = ts.getProperty(renamedCatchVariableDeclarations, String(ts.getOriginalNodeId(declaration)));
-                        if (name_34) {
-                            var clone_8 = ts.getMutableClone(name_34);
+                        var name_37 = ts.getProperty(renamedCatchVariableDeclarations, String(ts.getOriginalNodeId(declaration)));
+                        if (name_37) {
+                            var clone_8 = ts.getMutableClone(name_37);
                             ts.setSourceMapRange(clone_8, node);
                             ts.setCommentRange(clone_8, node);
                             return clone_8;
@@ -41794,7 +43807,7 @@ var ts;
                 if (labelExpressions === undefined) {
                     labelExpressions = [];
                 }
-                var expression = ts.createSynthesizedNode(8);
+                var expression = ts.createLiteral(-1);
                 if (labelExpressions[label] === undefined) {
                     labelExpressions[label] = [expression];
                 }
@@ -41803,7 +43816,7 @@ var ts;
                 }
                 return expression;
             }
-            return ts.createNode(194);
+            return ts.createOmittedExpression();
         }
         function createInstruction(instruction) {
             var literal = ts.createLiteral(instruction);
@@ -41891,7 +43904,7 @@ var ts;
             var buildResult = buildStatements();
             return ts.createCall(ts.createHelperName(currentSourceFile.externalHelpersModuleName, "__generator"), undefined, [
                 ts.createThis(),
-                ts.setEmitFlags(ts.createFunctionExpression(undefined, undefined, undefined, undefined, [ts.createParameter(state)], undefined, ts.createBlock(buildResult, undefined, buildResult.length > 0)), 4194304)
+                ts.setEmitFlags(ts.createFunctionExpression(undefined, undefined, undefined, undefined, [ts.createParameter(undefined, undefined, undefined, state)], undefined, ts.createBlock(buildResult, undefined, buildResult.length > 0)), 4194304)
             ]);
         }
         function buildStatements() {
@@ -42162,8 +44175,8 @@ var ts;
     function transformES5(context) {
         var previousOnSubstituteNode = context.onSubstituteNode;
         context.onSubstituteNode = onSubstituteNode;
-        context.enableSubstitution(173);
-        context.enableSubstitution(253);
+        context.enableSubstitution(177);
+        context.enableSubstitution(257);
         return transformSourceFile;
         function transformSourceFile(node) {
             return node;
@@ -42222,48 +44235,40 @@ var ts;
         context.onSubstituteNode = onSubstituteNode;
         context.onEmitNode = onEmitNode;
         context.enableSubstitution(70);
-        context.enableSubstitution(188);
-        context.enableSubstitution(186);
-        context.enableSubstitution(187);
-        context.enableSubstitution(254);
-        context.enableEmitNotification(256);
+        context.enableSubstitution(192);
+        context.enableSubstitution(190);
+        context.enableSubstitution(191);
+        context.enableSubstitution(258);
+        context.enableEmitNotification(261);
+        var moduleInfoMap = ts.createMap();
+        var deferredExports = ts.createMap();
         var currentSourceFile;
-        var externalImports;
-        var exportSpecifiers;
-        var exportEquals;
-        var bindingNameExportSpecifiersMap;
-        var bindingNameExportSpecifiersForFileMap = ts.createMap();
-        var hasExportStarsToExportValues;
+        var currentModuleInfo;
+        var noSubstitution;
         return transformSourceFile;
         function transformSourceFile(node) {
-            if (ts.isDeclarationFile(node)) {
+            if (ts.isDeclarationFile(node)
+                || !(ts.isExternalModule(node)
+                    || compilerOptions.isolatedModules)) {
                 return node;
             }
-            if (ts.isExternalModule(node) || compilerOptions.isolatedModules) {
-                currentSourceFile = node;
-                (_a = ts.collectExternalModuleInfo(node), externalImports = _a.externalImports, exportSpecifiers = _a.exportSpecifiers, exportEquals = _a.exportEquals, hasExportStarsToExportValues = _a.hasExportStarsToExportValues, _a);
-                var transformModule_1 = transformModuleDelegates[moduleKind] || transformModuleDelegates[ts.ModuleKind.None];
-                var updated = transformModule_1(node);
-                ts.aggregateTransformFlags(updated);
-                currentSourceFile = undefined;
-                externalImports = undefined;
-                exportSpecifiers = undefined;
-                exportEquals = undefined;
-                hasExportStarsToExportValues = false;
-                return updated;
-            }
-            return node;
-            var _a;
+            currentSourceFile = node;
+            currentModuleInfo = moduleInfoMap[ts.getOriginalNodeId(node)] = ts.collectExternalModuleInfo(node, resolver);
+            var transformModule = transformModuleDelegates[moduleKind] || transformModuleDelegates[ts.ModuleKind.None];
+            var updated = transformModule(node);
+            currentSourceFile = undefined;
+            currentModuleInfo = undefined;
+            return ts.aggregateTransformFlags(updated);
         }
         function transformCommonJSModule(node) {
             startLexicalEnvironment();
             var statements = [];
-            var statementOffset = ts.addPrologueDirectives(statements, node.statements, !compilerOptions.noImplicitUseStrict, visitor);
-            ts.addRange(statements, ts.visitNodes(node.statements, visitor, ts.isStatement, statementOffset));
+            var statementOffset = ts.addPrologueDirectives(statements, node.statements, !compilerOptions.noImplicitUseStrict, sourceElementVisitor);
+            ts.addRange(statements, ts.visitNodes(node.statements, sourceElementVisitor, ts.isStatement, statementOffset));
             ts.addRange(statements, endLexicalEnvironment());
             addExportEqualsIfNeeded(statements, false);
-            var updated = updateSourceFile(node, statements);
-            if (hasExportStarsToExportValues) {
+            var updated = ts.updateSourceFileNode(node, ts.createNodeArray(statements, node.statements));
+            if (currentModuleInfo.hasExportStarsToExportValues) {
                 ts.setEmitFlags(updated, 2 | ts.getEmitFlags(node));
             }
             return updated;
@@ -42280,77 +44285,105 @@ var ts;
         }
         function transformAsynchronousModule(node, define, moduleName, includeNonAmdDependencies) {
             var _a = collectAsynchronousDependencies(node, includeNonAmdDependencies), aliasedModuleNames = _a.aliasedModuleNames, unaliasedModuleNames = _a.unaliasedModuleNames, importAliasNames = _a.importAliasNames;
-            return updateSourceFile(node, [
+            return ts.updateSourceFileNode(node, ts.createNodeArray([
                 ts.createStatement(ts.createCall(define, undefined, (moduleName ? [moduleName] : []).concat([
                     ts.createArrayLiteral([
                         ts.createLiteral("require"),
                         ts.createLiteral("exports")
                     ].concat(aliasedModuleNames, unaliasedModuleNames)),
                     ts.createFunctionExpression(undefined, undefined, undefined, undefined, [
-                        ts.createParameter("require"),
-                        ts.createParameter("exports")
+                        ts.createParameter(undefined, undefined, undefined, "require"),
+                        ts.createParameter(undefined, undefined, undefined, "exports")
                     ].concat(importAliasNames), undefined, transformAsynchronousModuleBody(node))
                 ])))
-            ]);
+            ], node.statements));
+        }
+        function collectAsynchronousDependencies(node, includeNonAmdDependencies) {
+            var aliasedModuleNames = [];
+            var unaliasedModuleNames = [];
+            var importAliasNames = [];
+            for (var _i = 0, _a = node.amdDependencies; _i < _a.length; _i++) {
+                var amdDependency = _a[_i];
+                if (amdDependency.name) {
+                    aliasedModuleNames.push(ts.createLiteral(amdDependency.path));
+                    importAliasNames.push(ts.createParameter(undefined, undefined, undefined, amdDependency.name));
+                }
+                else {
+                    unaliasedModuleNames.push(ts.createLiteral(amdDependency.path));
+                }
+            }
+            for (var _b = 0, _c = currentModuleInfo.externalImports; _b < _c.length; _b++) {
+                var importNode = _c[_b];
+                var externalModuleName = ts.getExternalModuleNameLiteral(importNode, currentSourceFile, host, resolver, compilerOptions);
+                var importAliasName = ts.getLocalNameForExternalImport(importNode, currentSourceFile);
+                if (includeNonAmdDependencies && importAliasName) {
+                    ts.setEmitFlags(importAliasName, 128);
+                    aliasedModuleNames.push(externalModuleName);
+                    importAliasNames.push(ts.createParameter(undefined, undefined, undefined, importAliasName));
+                }
+                else {
+                    unaliasedModuleNames.push(externalModuleName);
+                }
+            }
+            return { aliasedModuleNames: aliasedModuleNames, unaliasedModuleNames: unaliasedModuleNames, importAliasNames: importAliasNames };
         }
         function transformAsynchronousModuleBody(node) {
             startLexicalEnvironment();
             var statements = [];
-            var statementOffset = ts.addPrologueDirectives(statements, node.statements, !compilerOptions.noImplicitUseStrict, visitor);
-            ts.addRange(statements, ts.visitNodes(node.statements, visitor, ts.isStatement, statementOffset));
+            var statementOffset = ts.addPrologueDirectives(statements, node.statements, !compilerOptions.noImplicitUseStrict, sourceElementVisitor);
+            ts.addRange(statements, ts.visitNodes(node.statements, sourceElementVisitor, ts.isStatement, statementOffset));
             ts.addRange(statements, endLexicalEnvironment());
             addExportEqualsIfNeeded(statements, true);
             var body = ts.createBlock(statements, undefined, true);
-            if (hasExportStarsToExportValues) {
+            if (currentModuleInfo.hasExportStarsToExportValues) {
                 ts.setEmitFlags(body, 2);
             }
             return body;
         }
         function addExportEqualsIfNeeded(statements, emitAsReturn) {
-            if (exportEquals) {
+            if (currentModuleInfo.exportEquals) {
                 if (emitAsReturn) {
-                    var statement = ts.createReturn(exportEquals.expression, exportEquals);
+                    var statement = ts.createReturn(currentModuleInfo.exportEquals.expression, currentModuleInfo.exportEquals);
                     ts.setEmitFlags(statement, 12288 | 49152);
                     statements.push(statement);
                 }
                 else {
-                    var statement = ts.createStatement(ts.createAssignment(ts.createPropertyAccess(ts.createIdentifier("module"), "exports"), exportEquals.expression), exportEquals);
+                    var statement = ts.createStatement(ts.createAssignment(ts.createPropertyAccess(ts.createIdentifier("module"), "exports"), currentModuleInfo.exportEquals.expression), currentModuleInfo.exportEquals);
                     ts.setEmitFlags(statement, 49152);
                     statements.push(statement);
                 }
             }
         }
-        function visitor(node) {
+        function sourceElementVisitor(node) {
             switch (node.kind) {
-                case 231:
+                case 235:
                     return visitImportDeclaration(node);
-                case 230:
+                case 234:
                     return visitImportEqualsDeclaration(node);
-                case 237:
+                case 241:
                     return visitExportDeclaration(node);
-                case 236:
+                case 240:
                     return visitExportAssignment(node);
-                case 201:
+                case 205:
                     return visitVariableStatement(node);
-                case 221:
+                case 225:
                     return visitFunctionDeclaration(node);
-                case 222:
+                case 226:
                     return visitClassDeclaration(node);
-                case 203:
-                    return visitExpressionStatement(node);
+                case 294:
+                    return visitMergeDeclarationMarker(node);
+                case 295:
+                    return visitEndOfDeclarationMarker(node);
                 default:
                     return node;
             }
         }
         function visitImportDeclaration(node) {
-            if (!ts.contains(externalImports, node)) {
-                return undefined;
-            }
-            var statements = [];
+            var statements;
             var namespaceDeclaration = ts.getNamespaceDeclarationNode(node);
             if (moduleKind !== ts.ModuleKind.AMD) {
                 if (!node.importClause) {
-                    statements.push(ts.createStatement(createRequireCall(node), node));
+                    return ts.createStatement(createRequireCall(node), node);
                 }
                 else {
                     var variables = [];
@@ -42363,43 +44396,60 @@ var ts;
                             variables.push(ts.createVariableDeclaration(ts.getSynthesizedClone(namespaceDeclaration.name), undefined, ts.getGeneratedNameForNode(node)));
                         }
                     }
-                    statements.push(ts.createVariableStatement(undefined, ts.createConstDeclarationList(variables), node));
+                    statements = ts.append(statements, ts.createVariableStatement(undefined, ts.createVariableDeclarationList(variables, undefined, languageVersion >= 2 ? 2 : 0), node));
                 }
             }
             else if (namespaceDeclaration && ts.isDefaultImport(node)) {
-                statements.push(ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
+                statements = ts.append(statements, ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
                     ts.createVariableDeclaration(ts.getSynthesizedClone(namespaceDeclaration.name), undefined, ts.getGeneratedNameForNode(node), node)
-                ])));
+                ], undefined, languageVersion >= 2 ? 2 : 0)));
+            }
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfImportDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfImportDeclaration(statements, node);
             }
-            addExportImportAssignments(statements, node);
             return ts.singleOrMany(statements);
         }
-        function visitImportEqualsDeclaration(node) {
-            if (!ts.contains(externalImports, node)) {
-                return undefined;
+        function createRequireCall(importNode) {
+            var moduleName = ts.getExternalModuleNameLiteral(importNode, currentSourceFile, host, resolver, compilerOptions);
+            var args = [];
+            if (moduleName) {
+                args.push(moduleName);
             }
-            ts.setEmitFlags(node.name, 128);
-            var statements = [];
+            return ts.createCall(ts.createIdentifier("require"), undefined, args);
+        }
+        function visitImportEqualsDeclaration(node) {
+            ts.Debug.assert(ts.isExternalModuleImportEqualsDeclaration(node), "import= for internal module references should be handled in an earlier transformer.");
+            var statements;
             if (moduleKind !== ts.ModuleKind.AMD) {
                 if (ts.hasModifier(node, 1)) {
-                    statements.push(ts.createStatement(createExportAssignment(node.name, createRequireCall(node)), node));
+                    statements = ts.append(statements, ts.createStatement(createExportExpression(node.name, createRequireCall(node)), node));
                 }
                 else {
-                    statements.push(ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
+                    statements = ts.append(statements, ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
                         ts.createVariableDeclaration(ts.getSynthesizedClone(node.name), undefined, createRequireCall(node))
                     ], undefined, languageVersion >= 2 ? 2 : 0), node));
                 }
             }
             else {
                 if (ts.hasModifier(node, 1)) {
-                    statements.push(ts.createStatement(createExportAssignment(node.name, node.name), node));
+                    statements = ts.append(statements, ts.createStatement(createExportExpression(ts.getExportName(node), ts.getLocalName(node)), node));
                 }
             }
-            addExportImportAssignments(statements, node);
-            return statements;
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfImportEqualsDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfImportEqualsDeclaration(statements, node);
+            }
+            return ts.singleOrMany(statements);
         }
         function visitExportDeclaration(node) {
-            if (!ts.contains(externalImports, node)) {
+            if (!node.moduleSpecifier) {
                 return undefined;
             }
             var generatedName = ts.getGeneratedNameForNode(node);
@@ -42413,7 +44463,7 @@ var ts;
                 for (var _i = 0, _a = node.exportClause.elements; _i < _a.length; _i++) {
                     var specifier = _a[_i];
                     var exportedValue = ts.createPropertyAccess(generatedName, specifier.propertyName || specifier.name);
-                    statements.push(ts.createStatement(createExportAssignment(specifier.name, exportedValue), specifier));
+                    statements.push(ts.createStatement(createExportExpression(ts.getExportName(specifier), exportedValue), specifier));
                 }
                 return ts.singleOrMany(statements);
             }
@@ -42429,195 +44479,248 @@ var ts;
             if (node.isExportEquals) {
                 return undefined;
             }
-            var statements = [];
-            addExportDefault(statements, node.expression, node);
-            return statements;
-        }
-        function addExportDefault(statements, expression, location) {
-            tryAddExportDefaultCompat(statements);
-            statements.push(ts.createStatement(createExportAssignment(ts.createIdentifier("default"), expression), location));
-        }
-        function tryAddExportDefaultCompat(statements) {
-            var original = ts.getOriginalNode(currentSourceFile);
-            ts.Debug.assert(original.kind === 256);
-            if (!original.symbol.exports["___esModule"]) {
-                if (languageVersion === 0) {
-                    statements.push(ts.createStatement(createExportAssignment(ts.createIdentifier("__esModule"), ts.createLiteral(true))));
-                }
-                else {
-                    statements.push(ts.createStatement(ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Object"), "defineProperty"), undefined, [
-                        ts.createIdentifier("exports"),
-                        ts.createLiteral("__esModule"),
-                        ts.createObjectLiteral([
-                            ts.createPropertyAssignment("value", ts.createLiteral(true))
-                        ])
-                    ])));
-                }
-            }
-        }
-        function addExportImportAssignments(statements, node) {
-            if (ts.isImportEqualsDeclaration(node)) {
-                addExportMemberAssignments(statements, node.name);
+            var statements;
+            var original = node.original;
+            if (original && hasAssociatedEndOfDeclarationMarker(original)) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportStatement(deferredExports[id], ts.createIdentifier("default"), node.expression, node, true);
             }
             else {
-                var names = ts.reduceEachChild(node, collectExportMembers, []);
-                for (var _i = 0, names_1 = names; _i < names_1.length; _i++) {
-                    var name_35 = names_1[_i];
-                    addExportMemberAssignments(statements, name_35);
-                }
-            }
-        }
-        function collectExportMembers(names, node) {
-            if (ts.isAliasSymbolDeclaration(node) && ts.isDeclaration(node)) {
-                var name_36 = node.name;
-                if (ts.isIdentifier(name_36)) {
-                    names.push(name_36);
-                }
-            }
-            return ts.reduceEachChild(node, collectExportMembers, names);
-        }
-        function addExportMemberAssignments(statements, name) {
-            if (!exportEquals && exportSpecifiers && ts.hasProperty(exportSpecifiers, name.text)) {
-                for (var _i = 0, _a = exportSpecifiers[name.text]; _i < _a.length; _i++) {
-                    var specifier = _a[_i];
-                    statements.push(ts.startOnNewLine(ts.createStatement(createExportAssignment(specifier.name, name), specifier.name)));
-                }
-            }
-        }
-        function addExportMemberAssignment(statements, node) {
-            if (ts.hasModifier(node, 512)) {
-                addExportDefault(statements, getDeclarationName(node), node);
-            }
-            else {
-                statements.push(createExportStatement(node.name, ts.setEmitFlags(ts.getSynthesizedClone(node.name), 262144), node));
-            }
-        }
-        function visitVariableStatement(node) {
-            var originalKind = ts.getOriginalNode(node).kind;
-            if (originalKind === 226 ||
-                originalKind === 225 ||
-                originalKind === 222) {
-                if (!ts.hasModifier(node, 1)) {
-                    return node;
-                }
-                return ts.setOriginalNode(ts.createVariableStatement(undefined, node.declarationList), node);
-            }
-            var resultStatements = [];
-            if (ts.hasModifier(node, 1)) {
-                var variables = ts.getInitializedVariables(node.declarationList);
-                if (variables.length > 0) {
-                    var inlineAssignments = ts.createStatement(ts.inlineExpressions(ts.map(variables, transformInitializedVariable)), node);
-                    resultStatements.push(inlineAssignments);
-                }
-            }
-            else {
-                resultStatements.push(node);
-            }
-            for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
-                var decl = _a[_i];
-                addExportMemberAssignmentsForBindingName(resultStatements, decl.name);
-            }
-            return resultStatements;
-        }
-        function addExportMemberAssignmentsForBindingName(resultStatements, name) {
-            if (ts.isBindingPattern(name)) {
-                for (var _i = 0, _a = name.elements; _i < _a.length; _i++) {
-                    var element = _a[_i];
-                    if (!ts.isOmittedExpression(element)) {
-                        addExportMemberAssignmentsForBindingName(resultStatements, element.name);
-                    }
-                }
-            }
-            else {
-                if (!exportEquals && exportSpecifiers && ts.hasProperty(exportSpecifiers, name.text)) {
-                    var sourceFileId = ts.getOriginalNodeId(currentSourceFile);
-                    if (!bindingNameExportSpecifiersForFileMap[sourceFileId]) {
-                        bindingNameExportSpecifiersForFileMap[sourceFileId] = ts.createMap();
-                    }
-                    bindingNameExportSpecifiersForFileMap[sourceFileId][name.text] = exportSpecifiers[name.text];
-                    addExportMemberAssignments(resultStatements, name);
-                }
-            }
-        }
-        function transformInitializedVariable(node) {
-            var name = node.name;
-            if (ts.isBindingPattern(name)) {
-                return ts.flattenVariableDestructuringToExpression(node, hoistVariableDeclaration, getModuleMemberName, visitor);
-            }
-            else {
-                return ts.createAssignment(getModuleMemberName(name), ts.visitNode(node.initializer, visitor, ts.isExpression));
+                statements = appendExportStatement(statements, ts.createIdentifier("default"), node.expression, node, true);
             }
+            return ts.singleOrMany(statements);
         }
         function visitFunctionDeclaration(node) {
-            var statements = [];
-            var name = node.name || ts.getGeneratedNameForNode(node);
+            var statements;
             if (ts.hasModifier(node, 1)) {
-                var isAsync = ts.hasModifier(node, 256);
-                statements.push(ts.setOriginalNode(ts.createFunctionDeclaration(undefined, isAsync ? [ts.createNode(119)] : undefined, node.asteriskToken, name, undefined, node.parameters, undefined, node.body, node), node));
-                addExportMemberAssignment(statements, node);
+                statements = ts.append(statements, ts.setOriginalNode(ts.createFunctionDeclaration(undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, ts.getDeclarationName(node, true, true), undefined, node.parameters, undefined, node.body, node), node));
             }
             else {
-                statements.push(node);
+                statements = ts.append(statements, node);
             }
-            if (node.name) {
-                addExportMemberAssignments(statements, node.name);
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfHoistedDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfHoistedDeclaration(statements, node);
             }
             return ts.singleOrMany(statements);
         }
         function visitClassDeclaration(node) {
-            var statements = [];
-            var name = node.name || ts.getGeneratedNameForNode(node);
+            var statements;
             if (ts.hasModifier(node, 1)) {
-                statements.push(ts.setOriginalNode(ts.createClassDeclaration(undefined, undefined, name, undefined, node.heritageClauses, node.members, node), node));
-                addExportMemberAssignment(statements, node);
+                statements = ts.append(statements, ts.setOriginalNode(ts.createClassDeclaration(undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), ts.getDeclarationName(node, true, true), undefined, node.heritageClauses, node.members, node), node));
             }
             else {
-                statements.push(node);
+                statements = ts.append(statements, node);
             }
-            if (node.name && !(node.decorators && node.decorators.length)) {
-                addExportMemberAssignments(statements, node.name);
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfHoistedDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfHoistedDeclaration(statements, node);
             }
             return ts.singleOrMany(statements);
         }
-        function visitExpressionStatement(node) {
-            var original = ts.getOriginalNode(node);
-            var origKind = original.kind;
-            if (origKind === 225 || origKind === 226) {
-                return visitExpressionStatementForEnumOrNamespaceDeclaration(node, original);
-            }
-            else if (origKind === 222) {
-                var classDecl = original;
-                if (classDecl.name) {
-                    var statements = [node];
-                    addExportMemberAssignments(statements, classDecl.name);
-                    return statements;
+        function visitVariableStatement(node) {
+            var statements;
+            var variables;
+            var expressions;
+            if (ts.hasModifier(node, 1)) {
+                var modifiers = void 0;
+                for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
+                    var variable = _a[_i];
+                    if (ts.isIdentifier(variable.name) && ts.isLocalName(variable.name)) {
+                        if (!modifiers) {
+                            modifiers = ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier);
+                        }
+                        variables = ts.append(variables, variable);
+                    }
+                    else if (variable.initializer) {
+                        expressions = ts.append(expressions, transformInitializedVariable(variable));
+                    }
                 }
+                if (variables) {
+                    statements = ts.append(statements, ts.updateVariableStatement(node, modifiers, ts.updateVariableDeclarationList(node.declarationList, variables)));
+                }
+                if (expressions) {
+                    statements = ts.append(statements, ts.createStatement(ts.inlineExpressions(expressions), node));
+                }
+            }
+            else {
+                statements = ts.append(statements, node);
+            }
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfVariableStatement(statements, node);
+            }
+            return ts.singleOrMany(statements);
+        }
+        function transformInitializedVariable(node) {
+            if (ts.isBindingPattern(node.name)) {
+                return ts.flattenVariableDestructuringToExpression(node, hoistVariableDeclaration, createExportExpression);
+            }
+            else {
+                return ts.createAssignment(ts.createPropertyAccess(ts.createIdentifier("exports"), node.name, node.name), node.initializer);
+            }
+        }
+        function visitMergeDeclarationMarker(node) {
+            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 205) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node.original);
             }
             return node;
         }
-        function visitExpressionStatementForEnumOrNamespaceDeclaration(node, original) {
-            var statements = [node];
-            if (ts.hasModifier(original, 1) &&
-                original.kind === 225 &&
-                ts.isFirstDeclarationOfKind(original, 225)) {
-                addVarForExportedEnumOrNamespaceDeclaration(statements, original);
+        function hasAssociatedEndOfDeclarationMarker(node) {
+            return (ts.getEmitFlags(node) & 33554432) !== 0;
+        }
+        function visitEndOfDeclarationMarker(node) {
+            var id = ts.getOriginalNodeId(node);
+            var statements = deferredExports[id];
+            if (statements) {
+                delete deferredExports[id];
+                return ts.append(statements, node);
+            }
+            return node;
+        }
+        function appendExportsOfImportDeclaration(statements, decl) {
+            if (currentModuleInfo.exportEquals) {
+                return statements;
+            }
+            var importClause = decl.importClause;
+            if (!importClause) {
+                return statements;
+            }
+            if (importClause.name) {
+                statements = appendExportsOfDeclaration(statements, importClause);
+            }
+            var namedBindings = importClause.namedBindings;
+            if (namedBindings) {
+                switch (namedBindings.kind) {
+                    case 237:
+                        statements = appendExportsOfDeclaration(statements, namedBindings);
+                        break;
+                    case 238:
+                        for (var _i = 0, _a = namedBindings.elements; _i < _a.length; _i++) {
+                            var importBinding = _a[_i];
+                            statements = appendExportsOfDeclaration(statements, importBinding);
+                        }
+                        break;
+                }
             }
-            addExportMemberAssignments(statements, original.name);
             return statements;
         }
-        function addVarForExportedEnumOrNamespaceDeclaration(statements, node) {
-            var transformedStatement = ts.createVariableStatement(undefined, [ts.createVariableDeclaration(getDeclarationName(node), undefined, ts.createPropertyAccess(ts.createIdentifier("exports"), getDeclarationName(node)))], node);
-            ts.setEmitFlags(transformedStatement, 49152);
-            statements.push(transformedStatement);
+        function appendExportsOfImportEqualsDeclaration(statements, decl) {
+            if (currentModuleInfo.exportEquals) {
+                return statements;
+            }
+            return appendExportsOfDeclaration(statements, decl);
         }
-        function getDeclarationName(node) {
-            return node.name ? ts.getSynthesizedClone(node.name) : ts.getGeneratedNameForNode(node);
+        function appendExportsOfVariableStatement(statements, node) {
+            if (currentModuleInfo.exportEquals) {
+                return statements;
+            }
+            for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
+                var decl = _a[_i];
+                statements = appendExportsOfBindingElement(statements, decl);
+            }
+            return statements;
+        }
+        function appendExportsOfBindingElement(statements, decl) {
+            if (currentModuleInfo.exportEquals) {
+                return statements;
+            }
+            if (ts.isBindingPattern(decl.name)) {
+                for (var _i = 0, _a = decl.name.elements; _i < _a.length; _i++) {
+                    var element = _a[_i];
+                    if (!ts.isOmittedExpression(element)) {
+                        statements = appendExportsOfBindingElement(statements, element);
+                    }
+                }
+            }
+            else if (!ts.isGeneratedIdentifier(decl.name)) {
+                statements = appendExportsOfDeclaration(statements, decl);
+            }
+            return statements;
+        }
+        function appendExportsOfHoistedDeclaration(statements, decl) {
+            if (currentModuleInfo.exportEquals) {
+                return statements;
+            }
+            if (ts.hasModifier(decl, 1)) {
+                var exportName = ts.hasModifier(decl, 512) ? ts.createIdentifier("default") : decl.name;
+                statements = appendExportStatement(statements, exportName, ts.getLocalName(decl), decl);
+            }
+            if (decl.name) {
+                statements = appendExportsOfDeclaration(statements, decl);
+            }
+            return statements;
+        }
+        function appendExportsOfDeclaration(statements, decl) {
+            var name = ts.getDeclarationName(decl);
+            var exportSpecifiers = currentModuleInfo.exportSpecifiers[name.text];
+            if (exportSpecifiers) {
+                for (var _i = 0, exportSpecifiers_1 = exportSpecifiers; _i < exportSpecifiers_1.length; _i++) {
+                    var exportSpecifier = exportSpecifiers_1[_i];
+                    statements = appendExportStatement(statements, exportSpecifier.name, name, exportSpecifier.name);
+                }
+            }
+            return statements;
+        }
+        function appendExportStatement(statements, exportName, expression, location, allowComments) {
+            if (exportName.text === "default") {
+                var sourceFile = ts.getOriginalNode(currentSourceFile, ts.isSourceFile);
+                if (sourceFile && !sourceFile.symbol.exports["___esModule"]) {
+                    if (languageVersion === 0) {
+                        statements = ts.append(statements, ts.createStatement(createExportExpression(ts.createIdentifier("__esModule"), ts.createLiteral(true))));
+                    }
+                    else {
+                        statements = ts.append(statements, ts.createStatement(ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Object"), "defineProperty"), undefined, [
+                            ts.createIdentifier("exports"),
+                            ts.createLiteral("__esModule"),
+                            ts.createObjectLiteral([
+                                ts.createPropertyAssignment("value", ts.createLiteral(true))
+                            ])
+                        ])));
+                    }
+                }
+            }
+            statements = ts.append(statements, createExportStatement(exportName, expression, location, allowComments));
+            return statements;
+        }
+        function createExportStatement(name, value, location, allowComments) {
+            var statement = ts.createStatement(createExportExpression(name, value), location);
+            ts.startOnNewLine(statement);
+            if (!allowComments) {
+                ts.setEmitFlags(statement, 49152);
+            }
+            return statement;
+        }
+        function createExportExpression(name, value, location) {
+            return ts.createAssignment(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.getSynthesizedClone(name)), value, location);
+        }
+        function modifierVisitor(node) {
+            switch (node.kind) {
+                case 83:
+                case 78:
+                    return undefined;
+            }
+            return node;
         }
         function onEmitNode(emitContext, node, emitCallback) {
-            if (node.kind === 256) {
-                bindingNameExportSpecifiersMap = bindingNameExportSpecifiersForFileMap[ts.getOriginalNodeId(node)];
+            if (node.kind === 261) {
+                currentSourceFile = node;
+                currentModuleInfo = moduleInfoMap[ts.getOriginalNodeId(currentSourceFile)];
+                noSubstitution = ts.createMap();
                 previousOnEmitNode(emitContext, node, emitCallback);
-                bindingNameExportSpecifiersMap = undefined;
+                currentSourceFile = undefined;
+                currentModuleInfo = undefined;
+                noSubstitution = undefined;
             }
             else {
                 previousOnEmitNode(emitContext, node, emitCallback);
@@ -42625,6 +44728,9 @@ var ts;
         }
         function onSubstituteNode(emitContext, node) {
             node = previousOnSubstituteNode(emitContext, node);
+            if (node.id && noSubstitution[node.id]) {
+                return node;
+            }
             if (emitContext === 1) {
                 return substituteExpression(node);
             }
@@ -42649,141 +44755,82 @@ var ts;
             switch (node.kind) {
                 case 70:
                     return substituteExpressionIdentifier(node);
-                case 188:
+                case 192:
                     return substituteBinaryExpression(node);
-                case 187:
-                case 186:
+                case 191:
+                case 190:
                     return substituteUnaryExpression(node);
             }
             return node;
         }
         function substituteExpressionIdentifier(node) {
-            return trySubstituteExportedName(node)
-                || trySubstituteImportedName(node)
-                || node;
+            if (!ts.isGeneratedIdentifier(node) && !ts.isLocalName(node)) {
+                var exportContainer = resolver.getReferencedExportContainer(node, ts.isExportName(node));
+                if (exportContainer && exportContainer.kind === 261) {
+                    return ts.createPropertyAccess(ts.createIdentifier("exports"), ts.getSynthesizedClone(node), node);
+                }
+                var importDeclaration = resolver.getReferencedImportDeclaration(node);
+                if (importDeclaration) {
+                    if (ts.isImportClause(importDeclaration)) {
+                        return ts.createPropertyAccess(ts.getGeneratedNameForNode(importDeclaration.parent), ts.createIdentifier("default"), node);
+                    }
+                    else if (ts.isImportSpecifier(importDeclaration)) {
+                        var name_38 = importDeclaration.propertyName || importDeclaration.name;
+                        return ts.createPropertyAccess(ts.getGeneratedNameForNode(importDeclaration.parent.parent.parent), ts.getSynthesizedClone(name_38), node);
+                    }
+                }
+            }
+            return node;
         }
         function substituteBinaryExpression(node) {
-            var left = node.left;
-            if (ts.isIdentifier(left) && ts.isAssignmentOperator(node.operatorToken.kind)) {
-                if (bindingNameExportSpecifiersMap && ts.hasProperty(bindingNameExportSpecifiersMap, left.text)) {
-                    ts.setEmitFlags(node, 128);
-                    var nestedExportAssignment = void 0;
-                    for (var _i = 0, _a = bindingNameExportSpecifiersMap[left.text]; _i < _a.length; _i++) {
-                        var specifier = _a[_i];
-                        nestedExportAssignment = nestedExportAssignment ?
-                            createExportAssignment(specifier.name, nestedExportAssignment) :
-                            createExportAssignment(specifier.name, node);
+            if (ts.isAssignmentOperator(node.operatorToken.kind)
+                && ts.isIdentifier(node.left)
+                && !ts.isGeneratedIdentifier(node.left)
+                && !ts.isLocalName(node.left)
+                && !ts.isDeclarationNameOfEnumOrNamespace(node.left)) {
+                var exportedNames = getExports(node.left);
+                if (exportedNames) {
+                    var expression = node;
+                    for (var _i = 0, exportedNames_1 = exportedNames; _i < exportedNames_1.length; _i++) {
+                        var exportName = exportedNames_1[_i];
+                        noSubstitution[ts.getNodeId(expression)] = true;
+                        expression = createExportExpression(exportName, expression, node);
                     }
-                    return nestedExportAssignment;
+                    return expression;
                 }
             }
             return node;
         }
         function substituteUnaryExpression(node) {
-            var operator = node.operator;
-            var operand = node.operand;
-            if (ts.isIdentifier(operand) && bindingNameExportSpecifiersForFileMap) {
-                if (bindingNameExportSpecifiersMap && ts.hasProperty(bindingNameExportSpecifiersMap, operand.text)) {
-                    ts.setEmitFlags(node, 128);
-                    var transformedUnaryExpression = void 0;
-                    if (node.kind === 187) {
-                        transformedUnaryExpression = ts.createBinary(operand, ts.createToken(operator === 42 ? 58 : 59), ts.createLiteral(1), node);
-                        ts.setEmitFlags(transformedUnaryExpression, 128);
+            if ((node.operator === 42 || node.operator === 43)
+                && ts.isIdentifier(node.operand)
+                && !ts.isGeneratedIdentifier(node.operand)
+                && !ts.isLocalName(node.operand)
+                && !ts.isDeclarationNameOfEnumOrNamespace(node.operand)) {
+                var exportedNames = getExports(node.operand);
+                if (exportedNames) {
+                    var expression = node.kind === 191
+                        ? ts.createBinary(node.operand, ts.createToken(node.operator === 42 ? 58 : 59), ts.createLiteral(1), node)
+                        : node;
+                    for (var _i = 0, exportedNames_2 = exportedNames; _i < exportedNames_2.length; _i++) {
+                        var exportName = exportedNames_2[_i];
+                        noSubstitution[ts.getNodeId(expression)] = true;
+                        expression = createExportExpression(exportName, expression);
                     }
-                    var nestedExportAssignment = void 0;
-                    for (var _i = 0, _a = bindingNameExportSpecifiersMap[operand.text]; _i < _a.length; _i++) {
-                        var specifier = _a[_i];
-                        nestedExportAssignment = nestedExportAssignment ?
-                            createExportAssignment(specifier.name, nestedExportAssignment) :
-                            createExportAssignment(specifier.name, transformedUnaryExpression || node);
-                    }
-                    return nestedExportAssignment;
+                    return expression;
                 }
             }
             return node;
         }
-        function trySubstituteExportedName(node) {
-            var emitFlags = ts.getEmitFlags(node);
-            if ((emitFlags & 262144) === 0) {
-                var container = resolver.getReferencedExportContainer(node, (emitFlags & 131072) !== 0);
-                if (container) {
-                    if (container.kind === 256) {
-                        return ts.createPropertyAccess(ts.createIdentifier("exports"), ts.getSynthesizedClone(node), node);
-                    }
+        function getExports(name) {
+            if (!ts.isGeneratedIdentifier(name)) {
+                var valueDeclaration = resolver.getReferencedImportDeclaration(name)
+                    || resolver.getReferencedValueDeclaration(name);
+                if (valueDeclaration) {
+                    return currentModuleInfo
+                        && currentModuleInfo.exportedBindings[ts.getOriginalNodeId(valueDeclaration)];
                 }
             }
-            return undefined;
-        }
-        function trySubstituteImportedName(node) {
-            if ((ts.getEmitFlags(node) & 262144) === 0) {
-                var declaration = resolver.getReferencedImportDeclaration(node);
-                if (declaration) {
-                    if (ts.isImportClause(declaration)) {
-                        return ts.createPropertyAccess(ts.getGeneratedNameForNode(declaration.parent), ts.createIdentifier("default"), node);
-                    }
-                    else if (ts.isImportSpecifier(declaration)) {
-                        var name_37 = declaration.propertyName || declaration.name;
-                        return ts.createPropertyAccess(ts.getGeneratedNameForNode(declaration.parent.parent.parent), ts.getSynthesizedClone(name_37), node);
-                    }
-                }
-            }
-            return undefined;
-        }
-        function getModuleMemberName(name) {
-            return ts.createPropertyAccess(ts.createIdentifier("exports"), name, name);
-        }
-        function createRequireCall(importNode) {
-            var moduleName = ts.getExternalModuleNameLiteral(importNode, currentSourceFile, host, resolver, compilerOptions);
-            var args = [];
-            if (ts.isDefined(moduleName)) {
-                args.push(moduleName);
-            }
-            return ts.createCall(ts.createIdentifier("require"), undefined, args);
-        }
-        function createExportStatement(name, value, location) {
-            var statement = ts.createStatement(createExportAssignment(name, value));
-            statement.startsOnNewLine = true;
-            if (location) {
-                ts.setSourceMapRange(statement, location);
-            }
-            return statement;
-        }
-        function createExportAssignment(name, value) {
-            return ts.createAssignment(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.getSynthesizedClone(name)), value);
-        }
-        function collectAsynchronousDependencies(node, includeNonAmdDependencies) {
-            var aliasedModuleNames = [];
-            var unaliasedModuleNames = [];
-            var importAliasNames = [];
-            for (var _i = 0, _a = node.amdDependencies; _i < _a.length; _i++) {
-                var amdDependency = _a[_i];
-                if (amdDependency.name) {
-                    aliasedModuleNames.push(ts.createLiteral(amdDependency.path));
-                    importAliasNames.push(ts.createParameter(amdDependency.name));
-                }
-                else {
-                    unaliasedModuleNames.push(ts.createLiteral(amdDependency.path));
-                }
-            }
-            for (var _b = 0, externalImports_1 = externalImports; _b < externalImports_1.length; _b++) {
-                var importNode = externalImports_1[_b];
-                var externalModuleName = ts.getExternalModuleNameLiteral(importNode, currentSourceFile, host, resolver, compilerOptions);
-                var importAliasName = ts.getLocalNameForExternalImport(importNode, currentSourceFile);
-                if (includeNonAmdDependencies && importAliasName) {
-                    ts.setEmitFlags(importAliasName, 128);
-                    aliasedModuleNames.push(externalModuleName);
-                    importAliasNames.push(ts.createParameter(importAliasName));
-                }
-                else {
-                    unaliasedModuleNames.push(externalModuleName);
-                }
-            }
-            return { aliasedModuleNames: aliasedModuleNames, unaliasedModuleNames: unaliasedModuleNames, importAliasNames: importAliasNames };
-        }
-        function updateSourceFile(node, statements) {
-            var updated = ts.getMutableClone(node);
-            updated.statements = ts.createNodeArray(statements, node.statements);
-            return updated;
         }
         var _a;
     }
@@ -42792,7 +44839,7 @@ var ts;
 var ts;
 (function (ts) {
     function transformSystemModule(context) {
-        var startLexicalEnvironment = context.startLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration, hoistFunctionDeclaration = context.hoistFunctionDeclaration;
+        var startLexicalEnvironment = context.startLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration;
         var compilerOptions = context.getCompilerOptions();
         var resolver = context.getEmitResolver();
         var host = context.getEmitHost();
@@ -42801,696 +44848,58 @@ var ts;
         context.onSubstituteNode = onSubstituteNode;
         context.onEmitNode = onEmitNode;
         context.enableSubstitution(70);
-        context.enableSubstitution(188);
-        context.enableSubstitution(186);
-        context.enableSubstitution(187);
-        context.enableEmitNotification(256);
-        var exportFunctionForFileMap = [];
+        context.enableSubstitution(192);
+        context.enableSubstitution(190);
+        context.enableSubstitution(191);
+        context.enableEmitNotification(261);
+        var moduleInfoMap = ts.createMap();
+        var deferredExports = ts.createMap();
+        var exportFunctionsMap = ts.createMap();
+        var noSubstitutionMap = ts.createMap();
         var currentSourceFile;
-        var externalImports;
-        var exportSpecifiers;
-        var exportEquals;
-        var hasExportStarsToExportValues;
-        var exportFunctionForFile;
-        var contextObjectForFile;
-        var exportedLocalNames;
-        var exportedFunctionDeclarations;
+        var moduleInfo;
+        var exportFunction;
+        var contextObject;
+        var hoistedStatements;
         var enclosingBlockScopedContainer;
-        var currentParent;
-        var currentNode;
+        var noSubstitution;
         return transformSourceFile;
         function transformSourceFile(node) {
-            if (ts.isDeclarationFile(node)) {
+            if (ts.isDeclarationFile(node)
+                || !(ts.isExternalModule(node)
+                    || compilerOptions.isolatedModules)) {
                 return node;
             }
-            if (ts.isExternalModule(node) || compilerOptions.isolatedModules) {
-                currentSourceFile = node;
-                currentNode = node;
-                var updated = transformSystemModuleWorker(node);
-                ts.aggregateTransformFlags(updated);
-                currentSourceFile = undefined;
-                externalImports = undefined;
-                exportSpecifiers = undefined;
-                exportEquals = undefined;
-                hasExportStarsToExportValues = false;
-                exportFunctionForFile = undefined;
-                contextObjectForFile = undefined;
-                exportedLocalNames = undefined;
-                exportedFunctionDeclarations = undefined;
-                return updated;
-            }
-            return node;
-        }
-        function transformSystemModuleWorker(node) {
-            ts.Debug.assert(!exportFunctionForFile);
-            (_a = ts.collectExternalModuleInfo(node), externalImports = _a.externalImports, exportSpecifiers = _a.exportSpecifiers, exportEquals = _a.exportEquals, hasExportStarsToExportValues = _a.hasExportStarsToExportValues, _a);
-            exportFunctionForFile = ts.createUniqueName("exports");
-            contextObjectForFile = ts.createUniqueName("context");
-            exportFunctionForFileMap[ts.getOriginalNodeId(node)] = exportFunctionForFile;
-            var dependencyGroups = collectDependencyGroups(externalImports);
-            var statements = [];
-            addSystemModuleBody(statements, node, dependencyGroups);
+            var id = ts.getOriginalNodeId(node);
+            currentSourceFile = node;
+            enclosingBlockScopedContainer = node;
+            moduleInfo = moduleInfoMap[id] = ts.collectExternalModuleInfo(node, resolver);
+            exportFunction = exportFunctionsMap[id] = ts.createUniqueName("exports");
+            contextObject = ts.createUniqueName("context");
+            var dependencyGroups = collectDependencyGroups(moduleInfo.externalImports);
+            var moduleBodyFunction = ts.createFunctionExpression(undefined, undefined, undefined, undefined, [
+                ts.createParameter(undefined, undefined, undefined, exportFunction),
+                ts.createParameter(undefined, undefined, undefined, contextObject)
+            ], undefined, createSystemModuleBody(node, dependencyGroups));
             var moduleName = ts.tryGetModuleNameFromFile(node, host, compilerOptions);
-            var dependencies = ts.createArrayLiteral(ts.map(dependencyGroups, getNameOfDependencyGroup));
-            var body = ts.createFunctionExpression(undefined, undefined, undefined, undefined, [
-                ts.createParameter(exportFunctionForFile),
-                ts.createParameter(contextObjectForFile)
-            ], undefined, ts.setEmitFlags(ts.createBlock(statements, undefined, true), 1));
-            return updateSourceFile(node, [
+            var dependencies = ts.createArrayLiteral(ts.map(dependencyGroups, function (dependencyGroup) { return dependencyGroup.name; }));
+            var updated = ts.updateSourceFileNode(node, ts.createNodeArray([
                 ts.createStatement(ts.createCall(ts.createPropertyAccess(ts.createIdentifier("System"), "register"), undefined, moduleName
-                    ? [moduleName, dependencies, body]
-                    : [dependencies, body]))
-            ], ~1 & ts.getEmitFlags(node));
-            var _a;
-        }
-        function addSystemModuleBody(statements, node, dependencyGroups) {
-            startLexicalEnvironment();
-            var statementOffset = ts.addPrologueDirectives(statements, node.statements, !compilerOptions.noImplicitUseStrict, visitSourceElement);
-            statements.push(ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
-                ts.createVariableDeclaration("__moduleName", undefined, ts.createLogicalAnd(contextObjectForFile, ts.createPropertyAccess(contextObjectForFile, "id")))
-            ])));
-            var executeStatements = ts.visitNodes(node.statements, visitSourceElement, ts.isStatement, statementOffset);
-            ts.addRange(statements, endLexicalEnvironment());
-            ts.addRange(statements, exportedFunctionDeclarations);
-            var exportStarFunction = addExportStarIfNeeded(statements);
-            statements.push(ts.createReturn(ts.setMultiLine(ts.createObjectLiteral([
-                ts.createPropertyAssignment("setters", generateSetters(exportStarFunction, dependencyGroups)),
-                ts.createPropertyAssignment("execute", ts.createFunctionExpression(undefined, undefined, undefined, undefined, [], undefined, ts.createBlock(executeStatements, undefined, true)))
-            ]), true)));
-        }
-        function addExportStarIfNeeded(statements) {
-            if (!hasExportStarsToExportValues) {
-                return;
+                    ? [moduleName, dependencies, moduleBodyFunction]
+                    : [dependencies, moduleBodyFunction]))
+            ], node.statements));
+            ts.setEmitFlags(updated, ts.getEmitFlags(node) & ~1);
+            if (noSubstitution) {
+                noSubstitutionMap[id] = noSubstitution;
+                noSubstitution = undefined;
             }
-            if (!exportedLocalNames && ts.isEmpty(exportSpecifiers)) {
-                var hasExportDeclarationWithExportClause = false;
-                for (var _i = 0, externalImports_2 = externalImports; _i < externalImports_2.length; _i++) {
-                    var externalImport = externalImports_2[_i];
-                    if (externalImport.kind === 237 && externalImport.exportClause) {
-                        hasExportDeclarationWithExportClause = true;
-                        break;
-                    }
-                }
-                if (!hasExportDeclarationWithExportClause) {
-                    return addExportStarFunction(statements, undefined);
-                }
-            }
-            var exportedNames = [];
-            if (exportedLocalNames) {
-                for (var _a = 0, exportedLocalNames_1 = exportedLocalNames; _a < exportedLocalNames_1.length; _a++) {
-                    var exportedLocalName = exportedLocalNames_1[_a];
-                    exportedNames.push(ts.createPropertyAssignment(ts.createLiteral(exportedLocalName.text), ts.createLiteral(true)));
-                }
-            }
-            for (var _b = 0, externalImports_3 = externalImports; _b < externalImports_3.length; _b++) {
-                var externalImport = externalImports_3[_b];
-                if (externalImport.kind !== 237) {
-                    continue;
-                }
-                var exportDecl = externalImport;
-                if (!exportDecl.exportClause) {
-                    continue;
-                }
-                for (var _c = 0, _d = exportDecl.exportClause.elements; _c < _d.length; _c++) {
-                    var element = _d[_c];
-                    exportedNames.push(ts.createPropertyAssignment(ts.createLiteral((element.name || element.propertyName).text), ts.createLiteral(true)));
-                }
-            }
-            var exportedNamesStorageRef = ts.createUniqueName("exportedNames");
-            statements.push(ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
-                ts.createVariableDeclaration(exportedNamesStorageRef, undefined, ts.createObjectLiteral(exportedNames, undefined, true))
-            ])));
-            return addExportStarFunction(statements, exportedNamesStorageRef);
-        }
-        function generateSetters(exportStarFunction, dependencyGroups) {
-            var setters = [];
-            for (var _i = 0, dependencyGroups_1 = dependencyGroups; _i < dependencyGroups_1.length; _i++) {
-                var group = dependencyGroups_1[_i];
-                var localName = ts.forEach(group.externalImports, function (i) { return ts.getLocalNameForExternalImport(i, currentSourceFile); });
-                var parameterName = localName ? ts.getGeneratedNameForNode(localName) : ts.createUniqueName("");
-                var statements = [];
-                for (var _a = 0, _b = group.externalImports; _a < _b.length; _a++) {
-                    var entry = _b[_a];
-                    var importVariableName = ts.getLocalNameForExternalImport(entry, currentSourceFile);
-                    switch (entry.kind) {
-                        case 231:
-                            if (!entry.importClause) {
-                                break;
-                            }
-                        case 230:
-                            ts.Debug.assert(importVariableName !== undefined);
-                            statements.push(ts.createStatement(ts.createAssignment(importVariableName, parameterName)));
-                            break;
-                        case 237:
-                            ts.Debug.assert(importVariableName !== undefined);
-                            if (entry.exportClause) {
-                                var properties = [];
-                                for (var _c = 0, _d = entry.exportClause.elements; _c < _d.length; _c++) {
-                                    var e = _d[_c];
-                                    properties.push(ts.createPropertyAssignment(ts.createLiteral(e.name.text), ts.createElementAccess(parameterName, ts.createLiteral((e.propertyName || e.name).text))));
-                                }
-                                statements.push(ts.createStatement(ts.createCall(exportFunctionForFile, undefined, [ts.createObjectLiteral(properties, undefined, true)])));
-                            }
-                            else {
-                                statements.push(ts.createStatement(ts.createCall(exportStarFunction, undefined, [parameterName])));
-                            }
-                            break;
-                    }
-                }
-                setters.push(ts.createFunctionExpression(undefined, undefined, undefined, undefined, [ts.createParameter(parameterName)], undefined, ts.createBlock(statements, undefined, true)));
-            }
-            return ts.createArrayLiteral(setters, undefined, true);
-        }
-        function visitSourceElement(node) {
-            switch (node.kind) {
-                case 231:
-                    return visitImportDeclaration(node);
-                case 230:
-                    return visitImportEqualsDeclaration(node);
-                case 237:
-                    return visitExportDeclaration(node);
-                case 236:
-                    return visitExportAssignment(node);
-                default:
-                    return visitNestedNode(node);
-            }
-        }
-        function visitNestedNode(node) {
-            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
-            var savedCurrentParent = currentParent;
-            var savedCurrentNode = currentNode;
-            var currentGrandparent = currentParent;
-            currentParent = currentNode;
-            currentNode = node;
-            if (currentParent && ts.isBlockScope(currentParent, currentGrandparent)) {
-                enclosingBlockScopedContainer = currentParent;
-            }
-            var result = visitNestedNodeWorker(node);
-            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
-            currentParent = savedCurrentParent;
-            currentNode = savedCurrentNode;
-            return result;
-        }
-        function visitNestedNodeWorker(node) {
-            switch (node.kind) {
-                case 201:
-                    return visitVariableStatement(node);
-                case 221:
-                    return visitFunctionDeclaration(node);
-                case 222:
-                    return visitClassDeclaration(node);
-                case 207:
-                    return visitForStatement(node);
-                case 208:
-                    return visitForInStatement(node);
-                case 209:
-                    return visitForOfStatement(node);
-                case 205:
-                    return visitDoStatement(node);
-                case 206:
-                    return visitWhileStatement(node);
-                case 215:
-                    return visitLabeledStatement(node);
-                case 213:
-                    return visitWithStatement(node);
-                case 214:
-                    return visitSwitchStatement(node);
-                case 228:
-                    return visitCaseBlock(node);
-                case 249:
-                    return visitCaseClause(node);
-                case 250:
-                    return visitDefaultClause(node);
-                case 217:
-                    return visitTryStatement(node);
-                case 252:
-                    return visitCatchClause(node);
-                case 200:
-                    return visitBlock(node);
-                case 203:
-                    return visitExpressionStatement(node);
-                default:
-                    return node;
-            }
-        }
-        function visitImportDeclaration(node) {
-            if (node.importClause && ts.contains(externalImports, node)) {
-                hoistVariableDeclaration(ts.getLocalNameForExternalImport(node, currentSourceFile));
-            }
-            return undefined;
-        }
-        function visitImportEqualsDeclaration(node) {
-            if (ts.contains(externalImports, node)) {
-                hoistVariableDeclaration(ts.getLocalNameForExternalImport(node, currentSourceFile));
-            }
-            return undefined;
-        }
-        function visitExportDeclaration(node) {
-            if (!node.moduleSpecifier) {
-                var statements = [];
-                ts.addRange(statements, ts.map(node.exportClause.elements, visitExportSpecifier));
-                return statements;
-            }
-            return undefined;
-        }
-        function visitExportSpecifier(specifier) {
-            recordExportName(specifier.name);
-            return createExportStatement(specifier.name, specifier.propertyName || specifier.name);
-        }
-        function visitExportAssignment(node) {
-            if (node.isExportEquals) {
-                return undefined;
-            }
-            return createExportStatement(ts.createLiteral("default"), node.expression);
-        }
-        function visitVariableStatement(node) {
-            var shouldHoist = ((ts.getCombinedNodeFlags(ts.getOriginalNode(node.declarationList)) & 3) == 0) ||
-                enclosingBlockScopedContainer.kind === 256;
-            if (!shouldHoist) {
-                return node;
-            }
-            var isExported = ts.hasModifier(node, 1);
-            var expressions = [];
-            for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
-                var variable = _a[_i];
-                var visited = transformVariable(variable, isExported);
-                if (visited) {
-                    expressions.push(visited);
-                }
-            }
-            if (expressions.length) {
-                return ts.createStatement(ts.inlineExpressions(expressions), node);
-            }
-            return undefined;
-        }
-        function transformVariable(node, isExported) {
-            hoistBindingElement(node, isExported);
-            if (!node.initializer) {
-                return;
-            }
-            var name = node.name;
-            if (ts.isIdentifier(name)) {
-                return ts.createAssignment(name, node.initializer);
-            }
-            else {
-                return ts.flattenVariableDestructuringToExpression(node, hoistVariableDeclaration);
-            }
-        }
-        function visitFunctionDeclaration(node) {
-            if (ts.hasModifier(node, 1)) {
-                var name_38 = node.name || ts.getGeneratedNameForNode(node);
-                var isAsync = ts.hasModifier(node, 256);
-                var newNode = ts.createFunctionDeclaration(undefined, isAsync ? [ts.createNode(119)] : undefined, node.asteriskToken, name_38, undefined, node.parameters, undefined, node.body, node);
-                recordExportedFunctionDeclaration(node);
-                if (!ts.hasModifier(node, 512)) {
-                    recordExportName(name_38);
-                }
-                ts.setOriginalNode(newNode, node);
-                node = newNode;
-            }
-            hoistFunctionDeclaration(node);
-            return undefined;
-        }
-        function visitExpressionStatement(node) {
-            var originalNode = ts.getOriginalNode(node);
-            if ((originalNode.kind === 226 || originalNode.kind === 225) && ts.hasModifier(originalNode, 1)) {
-                var name_39 = getDeclarationName(originalNode);
-                if (originalNode.kind === 225) {
-                    hoistVariableDeclaration(name_39);
-                }
-                return [
-                    node,
-                    createExportStatement(name_39, name_39)
-                ];
-            }
-            return node;
-        }
-        function visitClassDeclaration(node) {
-            var name = getDeclarationName(node);
-            hoistVariableDeclaration(name);
-            var statements = [];
-            statements.push(ts.createStatement(ts.createAssignment(name, ts.createClassExpression(undefined, node.name, undefined, node.heritageClauses, node.members, node)), node));
-            if (ts.hasModifier(node, 1)) {
-                if (!ts.hasModifier(node, 512)) {
-                    recordExportName(name);
-                }
-                statements.push(createDeclarationExport(node));
-            }
-            return statements;
-        }
-        function shouldHoistLoopInitializer(node) {
-            return ts.isVariableDeclarationList(node) && (ts.getCombinedNodeFlags(node) & 3) === 0;
-        }
-        function visitForStatement(node) {
-            var initializer = node.initializer;
-            if (shouldHoistLoopInitializer(initializer)) {
-                var expressions = [];
-                for (var _i = 0, _a = initializer.declarations; _i < _a.length; _i++) {
-                    var variable = _a[_i];
-                    var visited = transformVariable(variable, false);
-                    if (visited) {
-                        expressions.push(visited);
-                    }
-                }
-                ;
-                return ts.createFor(expressions.length
-                    ? ts.inlineExpressions(expressions)
-                    : ts.createSynthesizedNode(194), node.condition, node.incrementor, ts.visitNode(node.statement, visitNestedNode, ts.isStatement), node);
-            }
-            else {
-                return ts.visitEachChild(node, visitNestedNode, context);
-            }
-        }
-        function transformForBinding(node) {
-            var firstDeclaration = ts.firstOrUndefined(node.declarations);
-            hoistBindingElement(firstDeclaration, false);
-            var name = firstDeclaration.name;
-            return ts.isIdentifier(name)
-                ? name
-                : ts.flattenVariableDestructuringToExpression(firstDeclaration, hoistVariableDeclaration);
-        }
-        function visitForInStatement(node) {
-            var initializer = node.initializer;
-            if (shouldHoistLoopInitializer(initializer)) {
-                var updated = ts.getMutableClone(node);
-                updated.initializer = transformForBinding(initializer);
-                updated.statement = ts.visitNode(node.statement, visitNestedNode, ts.isStatement, false, ts.liftToBlock);
-                return updated;
-            }
-            else {
-                return ts.visitEachChild(node, visitNestedNode, context);
-            }
-        }
-        function visitForOfStatement(node) {
-            var initializer = node.initializer;
-            if (shouldHoistLoopInitializer(initializer)) {
-                var updated = ts.getMutableClone(node);
-                updated.initializer = transformForBinding(initializer);
-                updated.statement = ts.visitNode(node.statement, visitNestedNode, ts.isStatement, false, ts.liftToBlock);
-                return updated;
-            }
-            else {
-                return ts.visitEachChild(node, visitNestedNode, context);
-            }
-        }
-        function visitDoStatement(node) {
-            var statement = ts.visitNode(node.statement, visitNestedNode, ts.isStatement, false, ts.liftToBlock);
-            if (statement !== node.statement) {
-                var updated = ts.getMutableClone(node);
-                updated.statement = statement;
-                return updated;
-            }
-            return node;
-        }
-        function visitWhileStatement(node) {
-            var statement = ts.visitNode(node.statement, visitNestedNode, ts.isStatement, false, ts.liftToBlock);
-            if (statement !== node.statement) {
-                var updated = ts.getMutableClone(node);
-                updated.statement = statement;
-                return updated;
-            }
-            return node;
-        }
-        function visitLabeledStatement(node) {
-            var statement = ts.visitNode(node.statement, visitNestedNode, ts.isStatement, false, ts.liftToBlock);
-            if (statement !== node.statement) {
-                var updated = ts.getMutableClone(node);
-                updated.statement = statement;
-                return updated;
-            }
-            return node;
-        }
-        function visitWithStatement(node) {
-            var statement = ts.visitNode(node.statement, visitNestedNode, ts.isStatement, false, ts.liftToBlock);
-            if (statement !== node.statement) {
-                var updated = ts.getMutableClone(node);
-                updated.statement = statement;
-                return updated;
-            }
-            return node;
-        }
-        function visitSwitchStatement(node) {
-            var caseBlock = ts.visitNode(node.caseBlock, visitNestedNode, ts.isCaseBlock);
-            if (caseBlock !== node.caseBlock) {
-                var updated = ts.getMutableClone(node);
-                updated.caseBlock = caseBlock;
-                return updated;
-            }
-            return node;
-        }
-        function visitCaseBlock(node) {
-            var clauses = ts.visitNodes(node.clauses, visitNestedNode, ts.isCaseOrDefaultClause);
-            if (clauses !== node.clauses) {
-                var updated = ts.getMutableClone(node);
-                updated.clauses = clauses;
-                return updated;
-            }
-            return node;
-        }
-        function visitCaseClause(node) {
-            var statements = ts.visitNodes(node.statements, visitNestedNode, ts.isStatement);
-            if (statements !== node.statements) {
-                var updated = ts.getMutableClone(node);
-                updated.statements = statements;
-                return updated;
-            }
-            return node;
-        }
-        function visitDefaultClause(node) {
-            return ts.visitEachChild(node, visitNestedNode, context);
-        }
-        function visitTryStatement(node) {
-            return ts.visitEachChild(node, visitNestedNode, context);
-        }
-        function visitCatchClause(node) {
-            var block = ts.visitNode(node.block, visitNestedNode, ts.isBlock);
-            if (block !== node.block) {
-                var updated = ts.getMutableClone(node);
-                updated.block = block;
-                return updated;
-            }
-            return node;
-        }
-        function visitBlock(node) {
-            return ts.visitEachChild(node, visitNestedNode, context);
-        }
-        function onEmitNode(emitContext, node, emitCallback) {
-            if (node.kind === 256) {
-                exportFunctionForFile = exportFunctionForFileMap[ts.getOriginalNodeId(node)];
-                previousOnEmitNode(emitContext, node, emitCallback);
-                exportFunctionForFile = undefined;
-            }
-            else {
-                previousOnEmitNode(emitContext, node, emitCallback);
-            }
-        }
-        function onSubstituteNode(emitContext, node) {
-            node = previousOnSubstituteNode(emitContext, node);
-            if (emitContext === 1) {
-                return substituteExpression(node);
-            }
-            return node;
-        }
-        function substituteExpression(node) {
-            switch (node.kind) {
-                case 70:
-                    return substituteExpressionIdentifier(node);
-                case 188:
-                    return substituteBinaryExpression(node);
-                case 186:
-                case 187:
-                    return substituteUnaryExpression(node);
-            }
-            return node;
-        }
-        function substituteExpressionIdentifier(node) {
-            var importDeclaration = resolver.getReferencedImportDeclaration(node);
-            if (importDeclaration) {
-                var importBinding = createImportBinding(importDeclaration);
-                if (importBinding) {
-                    return importBinding;
-                }
-            }
-            return node;
-        }
-        function substituteBinaryExpression(node) {
-            if (ts.isAssignmentOperator(node.operatorToken.kind)) {
-                return substituteAssignmentExpression(node);
-            }
-            return node;
-        }
-        function substituteAssignmentExpression(node) {
-            ts.setEmitFlags(node, 128);
-            var left = node.left;
-            switch (left.kind) {
-                case 70:
-                    var exportDeclaration = resolver.getReferencedExportContainer(left);
-                    if (exportDeclaration) {
-                        return createExportExpression(left, node);
-                    }
-                    break;
-                case 172:
-                case 171:
-                    if (hasExportedReferenceInDestructuringPattern(left)) {
-                        return substituteDestructuring(node);
-                    }
-                    break;
-            }
-            return node;
-        }
-        function isExportedBinding(name) {
-            var container = resolver.getReferencedExportContainer(name);
-            return container && container.kind === 256;
-        }
-        function hasExportedReferenceInDestructuringPattern(node) {
-            switch (node.kind) {
-                case 70:
-                    return isExportedBinding(node);
-                case 172:
-                    for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
-                        var property = _a[_i];
-                        if (hasExportedReferenceInObjectDestructuringElement(property)) {
-                            return true;
-                        }
-                    }
-                    break;
-                case 171:
-                    for (var _b = 0, _c = node.elements; _b < _c.length; _b++) {
-                        var element = _c[_b];
-                        if (hasExportedReferenceInArrayDestructuringElement(element)) {
-                            return true;
-                        }
-                    }
-                    break;
-            }
-            return false;
-        }
-        function hasExportedReferenceInObjectDestructuringElement(node) {
-            if (ts.isShorthandPropertyAssignment(node)) {
-                return isExportedBinding(node.name);
-            }
-            else if (ts.isPropertyAssignment(node)) {
-                return hasExportedReferenceInDestructuringElement(node.initializer);
-            }
-            else {
-                return false;
-            }
-        }
-        function hasExportedReferenceInArrayDestructuringElement(node) {
-            if (ts.isSpreadElementExpression(node)) {
-                var expression = node.expression;
-                return ts.isIdentifier(expression) && isExportedBinding(expression);
-            }
-            else {
-                return hasExportedReferenceInDestructuringElement(node);
-            }
-        }
-        function hasExportedReferenceInDestructuringElement(node) {
-            if (ts.isBinaryExpression(node)) {
-                var left = node.left;
-                return node.operatorToken.kind === 57
-                    && isDestructuringPattern(left)
-                    && hasExportedReferenceInDestructuringPattern(left);
-            }
-            else if (ts.isIdentifier(node)) {
-                return isExportedBinding(node);
-            }
-            else if (ts.isSpreadElementExpression(node)) {
-                var expression = node.expression;
-                return ts.isIdentifier(expression) && isExportedBinding(expression);
-            }
-            else if (isDestructuringPattern(node)) {
-                return hasExportedReferenceInDestructuringPattern(node);
-            }
-            else {
-                return false;
-            }
-        }
-        function isDestructuringPattern(node) {
-            var kind = node.kind;
-            return kind === 70
-                || kind === 172
-                || kind === 171;
-        }
-        function substituteDestructuring(node) {
-            return ts.flattenDestructuringAssignment(context, node, true, hoistVariableDeclaration);
-        }
-        function substituteUnaryExpression(node) {
-            var operand = node.operand;
-            var operator = node.operator;
-            var substitute = ts.isIdentifier(operand) &&
-                (node.kind === 187 ||
-                    (node.kind === 186 && (operator === 42 || operator === 43)));
-            if (substitute) {
-                var exportDeclaration = resolver.getReferencedExportContainer(operand);
-                if (exportDeclaration) {
-                    var expr = ts.createPrefix(node.operator, operand, node);
-                    ts.setEmitFlags(expr, 128);
-                    var call = createExportExpression(operand, expr);
-                    if (node.kind === 186) {
-                        return call;
-                    }
-                    else {
-                        return operator === 42
-                            ? ts.createSubtract(call, ts.createLiteral(1))
-                            : ts.createAdd(call, ts.createLiteral(1));
-                    }
-                }
-            }
-            return node;
-        }
-        function getDeclarationName(node) {
-            return node.name ? ts.getSynthesizedClone(node.name) : ts.getGeneratedNameForNode(node);
-        }
-        function addExportStarFunction(statements, localNames) {
-            var exportStarFunction = ts.createUniqueName("exportStar");
-            var m = ts.createIdentifier("m");
-            var n = ts.createIdentifier("n");
-            var exports = ts.createIdentifier("exports");
-            var condition = ts.createStrictInequality(n, ts.createLiteral("default"));
-            if (localNames) {
-                condition = ts.createLogicalAnd(condition, ts.createLogicalNot(ts.createHasOwnProperty(localNames, n)));
-            }
-            statements.push(ts.createFunctionDeclaration(undefined, undefined, undefined, exportStarFunction, undefined, [ts.createParameter(m)], undefined, ts.createBlock([
-                ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
-                    ts.createVariableDeclaration(exports, undefined, ts.createObjectLiteral([]))
-                ])),
-                ts.createForIn(ts.createVariableDeclarationList([
-                    ts.createVariableDeclaration(n, undefined)
-                ]), m, ts.createBlock([
-                    ts.setEmitFlags(ts.createIf(condition, ts.createStatement(ts.createAssignment(ts.createElementAccess(exports, n), ts.createElementAccess(m, n)))), 32)
-                ])),
-                ts.createStatement(ts.createCall(exportFunctionForFile, undefined, [exports]))
-            ], undefined, true)));
-            return exportStarFunction;
-        }
-        function createExportExpression(name, value) {
-            var exportName = ts.isIdentifier(name) ? ts.createLiteral(name.text) : name;
-            return ts.createCall(exportFunctionForFile, undefined, [exportName, value]);
-        }
-        function createExportStatement(name, value) {
-            return ts.createStatement(createExportExpression(name, value));
-        }
-        function createDeclarationExport(node) {
-            var declarationName = getDeclarationName(node);
-            var exportName = ts.hasModifier(node, 512) ? ts.createLiteral("default") : declarationName;
-            return createExportStatement(exportName, declarationName);
-        }
-        function createImportBinding(importDeclaration) {
-            var importAlias;
-            var name;
-            if (ts.isImportClause(importDeclaration)) {
-                importAlias = ts.getGeneratedNameForNode(importDeclaration.parent);
-                name = ts.createIdentifier("default");
-            }
-            else if (ts.isImportSpecifier(importDeclaration)) {
-                importAlias = ts.getGeneratedNameForNode(importDeclaration.parent.parent.parent);
-                name = importDeclaration.propertyName || importDeclaration.name;
-            }
-            else {
-                return undefined;
-            }
-            return ts.createPropertyAccess(importAlias, ts.getSynthesizedClone(name));
+            currentSourceFile = undefined;
+            moduleInfo = undefined;
+            exportFunction = undefined;
+            contextObject = undefined;
+            hoistedStatements = undefined;
+            enclosingBlockScopedContainer = undefined;
+            return ts.aggregateTransformFlags(updated);
         }
         function collectDependencyGroups(externalImports) {
             var groupIndices = ts.createMap();
@@ -43502,7 +44911,6 @@ var ts;
                 if (ts.hasProperty(groupIndices, text)) {
                     var groupIndex = groupIndices[text];
                     dependencyGroups[groupIndex].externalImports.push(externalImport);
-                    continue;
                 }
                 else {
                     groupIndices[text] = dependencyGroups.length;
@@ -43514,47 +44922,722 @@ var ts;
             }
             return dependencyGroups;
         }
-        function getNameOfDependencyGroup(dependencyGroup) {
-            return dependencyGroup.name;
+        function createSystemModuleBody(node, dependencyGroups) {
+            var statements = [];
+            startLexicalEnvironment();
+            var statementOffset = ts.addPrologueDirectives(statements, node.statements, !compilerOptions.noImplicitUseStrict, sourceElementVisitor);
+            statements.push(ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
+                ts.createVariableDeclaration("__moduleName", undefined, ts.createLogicalAnd(contextObject, ts.createPropertyAccess(contextObject, "id")))
+            ])));
+            var executeStatements = ts.visitNodes(node.statements, sourceElementVisitor, ts.isStatement, statementOffset);
+            ts.addRange(statements, hoistedStatements);
+            ts.addRange(statements, endLexicalEnvironment());
+            var exportStarFunction = addExportStarIfNeeded(statements);
+            statements.push(ts.createReturn(ts.setMultiLine(ts.createObjectLiteral([
+                ts.createPropertyAssignment("setters", createSettersArray(exportStarFunction, dependencyGroups)),
+                ts.createPropertyAssignment("execute", ts.createFunctionExpression(undefined, undefined, undefined, undefined, [], undefined, ts.createBlock(executeStatements, undefined, true)))
+            ]), true)));
+            var body = ts.createBlock(statements, undefined, true);
+            ts.setEmitFlags(body, 1);
+            return body;
         }
-        function recordExportName(name) {
-            if (!exportedLocalNames) {
-                exportedLocalNames = [];
-            }
-            exportedLocalNames.push(name);
-        }
-        function recordExportedFunctionDeclaration(node) {
-            if (!exportedFunctionDeclarations) {
-                exportedFunctionDeclarations = [];
-            }
-            exportedFunctionDeclarations.push(createDeclarationExport(node));
-        }
-        function hoistBindingElement(node, isExported) {
-            if (ts.isOmittedExpression(node)) {
+        function addExportStarIfNeeded(statements) {
+            if (!moduleInfo.hasExportStarsToExportValues) {
                 return;
             }
-            var name = node.name;
-            if (ts.isIdentifier(name)) {
-                hoistVariableDeclaration(ts.getSynthesizedClone(name));
-                if (isExported) {
-                    recordExportName(name);
+            if (!moduleInfo.exportedNames && ts.isEmpty(moduleInfo.exportSpecifiers)) {
+                var hasExportDeclarationWithExportClause = false;
+                for (var _i = 0, _a = moduleInfo.externalImports; _i < _a.length; _i++) {
+                    var externalImport = _a[_i];
+                    if (externalImport.kind === 241 && externalImport.exportClause) {
+                        hasExportDeclarationWithExportClause = true;
+                        break;
+                    }
+                }
+                if (!hasExportDeclarationWithExportClause) {
+                    var exportStarFunction_1 = createExportStarFunction(undefined);
+                    statements.push(exportStarFunction_1);
+                    return exportStarFunction_1.name;
                 }
             }
-            else if (ts.isBindingPattern(name)) {
-                ts.forEach(name.elements, isExported ? hoistExportedBindingElement : hoistNonExportedBindingElement);
+            var exportedNames = [];
+            if (moduleInfo.exportedNames) {
+                for (var _b = 0, _c = moduleInfo.exportedNames; _b < _c.length; _b++) {
+                    var exportedLocalName = _c[_b];
+                    if (exportedLocalName.text === "default") {
+                        continue;
+                    }
+                    exportedNames.push(ts.createPropertyAssignment(ts.createLiteral(exportedLocalName), ts.createLiteral(true)));
+                }
+            }
+            for (var _d = 0, _e = moduleInfo.externalImports; _d < _e.length; _d++) {
+                var externalImport = _e[_d];
+                if (externalImport.kind !== 241) {
+                    continue;
+                }
+                var exportDecl = externalImport;
+                if (!exportDecl.exportClause) {
+                    continue;
+                }
+                for (var _f = 0, _g = exportDecl.exportClause.elements; _f < _g.length; _f++) {
+                    var element = _g[_f];
+                    exportedNames.push(ts.createPropertyAssignment(ts.createLiteral((element.name || element.propertyName).text), ts.createLiteral(true)));
+                }
+            }
+            var exportedNamesStorageRef = ts.createUniqueName("exportedNames");
+            statements.push(ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
+                ts.createVariableDeclaration(exportedNamesStorageRef, undefined, ts.createObjectLiteral(exportedNames, undefined, true))
+            ])));
+            var exportStarFunction = createExportStarFunction(exportedNamesStorageRef);
+            statements.push(exportStarFunction);
+            return exportStarFunction.name;
+        }
+        function createExportStarFunction(localNames) {
+            var exportStarFunction = ts.createUniqueName("exportStar");
+            var m = ts.createIdentifier("m");
+            var n = ts.createIdentifier("n");
+            var exports = ts.createIdentifier("exports");
+            var condition = ts.createStrictInequality(n, ts.createLiteral("default"));
+            if (localNames) {
+                condition = ts.createLogicalAnd(condition, ts.createLogicalNot(ts.createHasOwnProperty(localNames, n)));
+            }
+            return ts.createFunctionDeclaration(undefined, undefined, undefined, exportStarFunction, undefined, [ts.createParameter(undefined, undefined, undefined, m)], undefined, ts.createBlock([
+                ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
+                    ts.createVariableDeclaration(exports, undefined, ts.createObjectLiteral([]))
+                ])),
+                ts.createForIn(ts.createVariableDeclarationList([
+                    ts.createVariableDeclaration(n, undefined)
+                ]), m, ts.createBlock([
+                    ts.setEmitFlags(ts.createIf(condition, ts.createStatement(ts.createAssignment(ts.createElementAccess(exports, n), ts.createElementAccess(m, n)))), 32)
+                ])),
+                ts.createStatement(ts.createCall(exportFunction, undefined, [exports]))
+            ], undefined, true));
+        }
+        function createSettersArray(exportStarFunction, dependencyGroups) {
+            var setters = [];
+            for (var _i = 0, dependencyGroups_1 = dependencyGroups; _i < dependencyGroups_1.length; _i++) {
+                var group = dependencyGroups_1[_i];
+                var localName = ts.forEach(group.externalImports, function (i) { return ts.getLocalNameForExternalImport(i, currentSourceFile); });
+                var parameterName = localName ? ts.getGeneratedNameForNode(localName) : ts.createUniqueName("");
+                var statements = [];
+                for (var _a = 0, _b = group.externalImports; _a < _b.length; _a++) {
+                    var entry = _b[_a];
+                    var importVariableName = ts.getLocalNameForExternalImport(entry, currentSourceFile);
+                    switch (entry.kind) {
+                        case 235:
+                            if (!entry.importClause) {
+                                break;
+                            }
+                        case 234:
+                            ts.Debug.assert(importVariableName !== undefined);
+                            statements.push(ts.createStatement(ts.createAssignment(importVariableName, parameterName)));
+                            break;
+                        case 241:
+                            ts.Debug.assert(importVariableName !== undefined);
+                            if (entry.exportClause) {
+                                var properties = [];
+                                for (var _c = 0, _d = entry.exportClause.elements; _c < _d.length; _c++) {
+                                    var e = _d[_c];
+                                    properties.push(ts.createPropertyAssignment(ts.createLiteral(e.name.text), ts.createElementAccess(parameterName, ts.createLiteral((e.propertyName || e.name).text))));
+                                }
+                                statements.push(ts.createStatement(ts.createCall(exportFunction, undefined, [ts.createObjectLiteral(properties, undefined, true)])));
+                            }
+                            else {
+                                statements.push(ts.createStatement(ts.createCall(exportStarFunction, undefined, [parameterName])));
+                            }
+                            break;
+                    }
+                }
+                setters.push(ts.createFunctionExpression(undefined, undefined, undefined, undefined, [ts.createParameter(undefined, undefined, undefined, parameterName)], undefined, ts.createBlock(statements, undefined, true)));
+            }
+            return ts.createArrayLiteral(setters, undefined, true);
+        }
+        function sourceElementVisitor(node) {
+            switch (node.kind) {
+                case 235:
+                    return visitImportDeclaration(node);
+                case 234:
+                    return visitImportEqualsDeclaration(node);
+                case 241:
+                    return undefined;
+                case 240:
+                    return visitExportAssignment(node);
+                default:
+                    return nestedElementVisitor(node);
             }
         }
-        function hoistExportedBindingElement(node) {
-            hoistBindingElement(node, true);
+        function visitImportDeclaration(node) {
+            var statements;
+            if (node.importClause) {
+                hoistVariableDeclaration(ts.getLocalNameForExternalImport(node, currentSourceFile));
+            }
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfImportDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfImportDeclaration(statements, node);
+            }
+            return ts.singleOrMany(statements);
         }
-        function hoistNonExportedBindingElement(node) {
-            hoistBindingElement(node, false);
+        function visitImportEqualsDeclaration(node) {
+            ts.Debug.assert(ts.isExternalModuleImportEqualsDeclaration(node), "import= for internal module references should be handled in an earlier transformer.");
+            var statements;
+            hoistVariableDeclaration(ts.getLocalNameForExternalImport(node, currentSourceFile));
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfImportEqualsDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfImportEqualsDeclaration(statements, node);
+            }
+            return ts.singleOrMany(statements);
         }
-        function updateSourceFile(node, statements, nodeEmitFlags) {
-            var updated = ts.getMutableClone(node);
-            updated.statements = ts.createNodeArray(statements, node.statements);
-            ts.setEmitFlags(updated, nodeEmitFlags);
-            return updated;
+        function visitExportAssignment(node) {
+            if (node.isExportEquals) {
+                return undefined;
+            }
+            var expression = ts.visitNode(node.expression, destructuringVisitor, ts.isExpression);
+            var original = node.original;
+            if (original && hasAssociatedEndOfDeclarationMarker(original)) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportStatement(deferredExports[id], ts.createIdentifier("default"), expression, true);
+            }
+            else {
+                return createExportStatement(ts.createIdentifier("default"), expression, true);
+            }
+        }
+        function visitFunctionDeclaration(node) {
+            if (ts.hasModifier(node, 1)) {
+                hoistedStatements = ts.append(hoistedStatements, ts.updateFunctionDeclaration(node, node.decorators, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), ts.getDeclarationName(node, true, true), undefined, ts.visitNodes(node.parameters, destructuringVisitor, ts.isParameterDeclaration), undefined, ts.visitNode(node.body, destructuringVisitor, ts.isBlock)));
+            }
+            else {
+                hoistedStatements = ts.append(hoistedStatements, node);
+            }
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfHoistedDeclaration(deferredExports[id], node);
+            }
+            else {
+                hoistedStatements = appendExportsOfHoistedDeclaration(hoistedStatements, node);
+            }
+            return undefined;
+        }
+        function visitClassDeclaration(node) {
+            var statements;
+            var name = ts.getLocalName(node);
+            hoistVariableDeclaration(name);
+            statements = ts.append(statements, ts.createStatement(ts.createAssignment(name, ts.createClassExpression(undefined, node.name, undefined, ts.visitNodes(node.heritageClauses, destructuringVisitor, ts.isHeritageClause), ts.visitNodes(node.members, destructuringVisitor, ts.isClassElement), node)), node));
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfHoistedDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfHoistedDeclaration(statements, node);
+            }
+            return ts.singleOrMany(statements);
+        }
+        function visitVariableStatement(node) {
+            if (!shouldHoistVariableDeclarationList(node.declarationList)) {
+                return ts.visitNode(node, destructuringVisitor, ts.isStatement);
+            }
+            var expressions;
+            var isExportedDeclaration = ts.hasModifier(node, 1);
+            var isMarkedDeclaration = hasAssociatedEndOfDeclarationMarker(node);
+            for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
+                var variable = _a[_i];
+                if (variable.initializer) {
+                    expressions = ts.append(expressions, transformInitializedVariable(variable, isExportedDeclaration && !isMarkedDeclaration));
+                }
+                else {
+                    hoistBindingElement(variable);
+                }
+            }
+            var statements;
+            if (expressions) {
+                statements = ts.append(statements, ts.createStatement(ts.inlineExpressions(expressions), node));
+            }
+            if (isMarkedDeclaration) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node, isExportedDeclaration);
+            }
+            else {
+                statements = appendExportsOfVariableStatement(statements, node, false);
+            }
+            return ts.singleOrMany(statements);
+        }
+        function hoistBindingElement(node) {
+            if (ts.isBindingPattern(node.name)) {
+                for (var _i = 0, _a = node.name.elements; _i < _a.length; _i++) {
+                    var element = _a[_i];
+                    if (!ts.isOmittedExpression(element)) {
+                        hoistBindingElement(element);
+                    }
+                }
+            }
+            else {
+                hoistVariableDeclaration(ts.getSynthesizedClone(node.name));
+            }
+        }
+        function shouldHoistVariableDeclarationList(node) {
+            return (ts.getEmitFlags(node) & 16777216) === 0
+                && (enclosingBlockScopedContainer.kind === 261
+                    || (ts.getOriginalNode(node).flags & 3) === 0);
+        }
+        function transformInitializedVariable(node, isExportedDeclaration) {
+            var createAssignment = isExportedDeclaration ? createExportedVariableAssignment : createNonExportedVariableAssignment;
+            return ts.isBindingPattern(node.name)
+                ? ts.flattenVariableDestructuringToExpression(node, hoistVariableDeclaration, createAssignment, destructuringVisitor)
+                : createAssignment(node.name, ts.visitNode(node.initializer, destructuringVisitor, ts.isExpression));
+        }
+        function createExportedVariableAssignment(name, value, location) {
+            return createVariableAssignment(name, value, location, true);
+        }
+        function createNonExportedVariableAssignment(name, value, location) {
+            return createVariableAssignment(name, value, location, false);
+        }
+        function createVariableAssignment(name, value, location, isExportedDeclaration) {
+            hoistVariableDeclaration(ts.getSynthesizedClone(name));
+            return isExportedDeclaration
+                ? createExportExpression(name, preventSubstitution(ts.createAssignment(name, value, location)))
+                : preventSubstitution(ts.createAssignment(name, value, location));
+        }
+        function visitMergeDeclarationMarker(node) {
+            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 205) {
+                var id = ts.getOriginalNodeId(node);
+                var isExportedDeclaration = ts.hasModifier(node.original, 1);
+                deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node.original, isExportedDeclaration);
+            }
+            return node;
+        }
+        function hasAssociatedEndOfDeclarationMarker(node) {
+            return (ts.getEmitFlags(node) & 33554432) !== 0;
+        }
+        function visitEndOfDeclarationMarker(node) {
+            var id = ts.getOriginalNodeId(node);
+            var statements = deferredExports[id];
+            if (statements) {
+                delete deferredExports[id];
+                return ts.append(statements, node);
+            }
+            return node;
+        }
+        function appendExportsOfImportDeclaration(statements, decl) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            var importClause = decl.importClause;
+            if (!importClause) {
+                return statements;
+            }
+            if (importClause.name) {
+                statements = appendExportsOfDeclaration(statements, importClause);
+            }
+            var namedBindings = importClause.namedBindings;
+            if (namedBindings) {
+                switch (namedBindings.kind) {
+                    case 237:
+                        statements = appendExportsOfDeclaration(statements, namedBindings);
+                        break;
+                    case 238:
+                        for (var _i = 0, _a = namedBindings.elements; _i < _a.length; _i++) {
+                            var importBinding = _a[_i];
+                            statements = appendExportsOfDeclaration(statements, importBinding);
+                        }
+                        break;
+                }
+            }
+            return statements;
+        }
+        function appendExportsOfImportEqualsDeclaration(statements, decl) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            return appendExportsOfDeclaration(statements, decl);
+        }
+        function appendExportsOfVariableStatement(statements, node, exportSelf) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
+                var decl = _a[_i];
+                if (decl.initializer || exportSelf) {
+                    statements = appendExportsOfBindingElement(statements, decl, exportSelf);
+                }
+            }
+            return statements;
+        }
+        function appendExportsOfBindingElement(statements, decl, exportSelf) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            if (ts.isBindingPattern(decl.name)) {
+                for (var _i = 0, _a = decl.name.elements; _i < _a.length; _i++) {
+                    var element = _a[_i];
+                    if (!ts.isOmittedExpression(element)) {
+                        statements = appendExportsOfBindingElement(statements, element, exportSelf);
+                    }
+                }
+            }
+            else if (!ts.isGeneratedIdentifier(decl.name)) {
+                var excludeName = void 0;
+                if (exportSelf) {
+                    statements = appendExportStatement(statements, decl.name, ts.getLocalName(decl));
+                    excludeName = decl.name.text;
+                }
+                statements = appendExportsOfDeclaration(statements, decl, excludeName);
+            }
+            return statements;
+        }
+        function appendExportsOfHoistedDeclaration(statements, decl) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            var excludeName;
+            if (ts.hasModifier(decl, 1)) {
+                var exportName = ts.hasModifier(decl, 512) ? ts.createLiteral("default") : decl.name;
+                statements = appendExportStatement(statements, exportName, ts.getLocalName(decl));
+                excludeName = exportName.text;
+            }
+            if (decl.name) {
+                statements = appendExportsOfDeclaration(statements, decl, excludeName);
+            }
+            return statements;
+        }
+        function appendExportsOfDeclaration(statements, decl, excludeName) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            var name = ts.getDeclarationName(decl);
+            var exportSpecifiers = moduleInfo.exportSpecifiers[name.text];
+            if (exportSpecifiers) {
+                for (var _i = 0, exportSpecifiers_2 = exportSpecifiers; _i < exportSpecifiers_2.length; _i++) {
+                    var exportSpecifier = exportSpecifiers_2[_i];
+                    if (exportSpecifier.name.text !== excludeName) {
+                        statements = appendExportStatement(statements, exportSpecifier.name, name);
+                    }
+                }
+            }
+            return statements;
+        }
+        function appendExportStatement(statements, exportName, expression, allowComments) {
+            statements = ts.append(statements, createExportStatement(exportName, expression, allowComments));
+            return statements;
+        }
+        function createExportStatement(name, value, allowComments) {
+            var statement = ts.createStatement(createExportExpression(name, value));
+            ts.startOnNewLine(statement);
+            if (!allowComments) {
+                ts.setEmitFlags(statement, 49152);
+            }
+            return statement;
+        }
+        function createExportExpression(name, value) {
+            var exportName = ts.isIdentifier(name) ? ts.createLiteral(name) : name;
+            return ts.createCall(exportFunction, undefined, [exportName, value]);
+        }
+        function nestedElementVisitor(node) {
+            switch (node.kind) {
+                case 205:
+                    return visitVariableStatement(node);
+                case 225:
+                    return visitFunctionDeclaration(node);
+                case 226:
+                    return visitClassDeclaration(node);
+                case 211:
+                    return visitForStatement(node);
+                case 212:
+                    return visitForInStatement(node);
+                case 213:
+                    return visitForOfStatement(node);
+                case 209:
+                    return visitDoStatement(node);
+                case 210:
+                    return visitWhileStatement(node);
+                case 219:
+                    return visitLabeledStatement(node);
+                case 217:
+                    return visitWithStatement(node);
+                case 218:
+                    return visitSwitchStatement(node);
+                case 232:
+                    return visitCaseBlock(node);
+                case 253:
+                    return visitCaseClause(node);
+                case 254:
+                    return visitDefaultClause(node);
+                case 221:
+                    return visitTryStatement(node);
+                case 256:
+                    return visitCatchClause(node);
+                case 204:
+                    return visitBlock(node);
+                case 294:
+                    return visitMergeDeclarationMarker(node);
+                case 295:
+                    return visitEndOfDeclarationMarker(node);
+                default:
+                    return destructuringVisitor(node);
+            }
+        }
+        function visitForStatement(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.updateFor(node, visitForInitializer(node.initializer), ts.visitNode(node.condition, destructuringVisitor, ts.isExpression, true), ts.visitNode(node.incrementor, destructuringVisitor, ts.isExpression, true), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement));
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        function visitForInStatement(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.updateForIn(node, visitForInitializer(node.initializer), ts.visitNode(node.expression, destructuringVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, false, ts.liftToBlock));
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        function visitForOfStatement(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.updateForOf(node, visitForInitializer(node.initializer), ts.visitNode(node.expression, destructuringVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, false, ts.liftToBlock));
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        function shouldHoistForInitializer(node) {
+            return ts.isVariableDeclarationList(node)
+                && shouldHoistVariableDeclarationList(node);
+        }
+        function visitForInitializer(node) {
+            if (shouldHoistForInitializer(node)) {
+                var expressions = void 0;
+                for (var _i = 0, _a = node.declarations; _i < _a.length; _i++) {
+                    var variable = _a[_i];
+                    expressions = ts.append(expressions, transformInitializedVariable(variable, false));
+                }
+                return expressions ? ts.inlineExpressions(expressions) : ts.createOmittedExpression();
+            }
+            else {
+                return ts.visitEachChild(node, nestedElementVisitor, context);
+            }
+        }
+        function visitDoStatement(node) {
+            return ts.updateDo(node, ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, false, ts.liftToBlock), ts.visitNode(node.expression, destructuringVisitor, ts.isExpression));
+        }
+        function visitWhileStatement(node) {
+            return ts.updateWhile(node, ts.visitNode(node.expression, destructuringVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, false, ts.liftToBlock));
+        }
+        function visitLabeledStatement(node) {
+            return ts.updateLabel(node, node.label, ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, false, ts.liftToBlock));
+        }
+        function visitWithStatement(node) {
+            return ts.updateWith(node, ts.visitNode(node.expression, destructuringVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, false, ts.liftToBlock));
+        }
+        function visitSwitchStatement(node) {
+            return ts.updateSwitch(node, ts.visitNode(node.expression, destructuringVisitor, ts.isExpression), ts.visitNode(node.caseBlock, nestedElementVisitor, ts.isCaseBlock));
+        }
+        function visitCaseBlock(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.updateCaseBlock(node, ts.visitNodes(node.clauses, nestedElementVisitor, ts.isCaseOrDefaultClause));
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        function visitCaseClause(node) {
+            return ts.updateCaseClause(node, ts.visitNode(node.expression, destructuringVisitor, ts.isExpression), ts.visitNodes(node.statements, nestedElementVisitor, ts.isStatement));
+        }
+        function visitDefaultClause(node) {
+            return ts.visitEachChild(node, nestedElementVisitor, context);
+        }
+        function visitTryStatement(node) {
+            return ts.visitEachChild(node, nestedElementVisitor, context);
+        }
+        function visitCatchClause(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.updateCatchClause(node, node.variableDeclaration, ts.visitNode(node.block, nestedElementVisitor, ts.isBlock));
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        function visitBlock(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.visitEachChild(node, nestedElementVisitor, context);
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        function destructuringVisitor(node) {
+            if (node.transformFlags & 16384
+                && node.kind === 192) {
+                return visitDestructuringAssignment(node);
+            }
+            else if (node.transformFlags & 32768) {
+                return ts.visitEachChild(node, destructuringVisitor, context);
+            }
+            else {
+                return node;
+            }
+        }
+        function visitDestructuringAssignment(node) {
+            if (hasExportedReferenceInDestructuringTarget(node.left)) {
+                return ts.flattenDestructuringAssignment(context, node, true, hoistVariableDeclaration, destructuringVisitor);
+            }
+            return ts.visitEachChild(node, destructuringVisitor, context);
+        }
+        function hasExportedReferenceInDestructuringTarget(node) {
+            if (ts.isAssignmentExpression(node)) {
+                return hasExportedReferenceInDestructuringTarget(node.left);
+            }
+            else if (ts.isSpreadExpression(node)) {
+                return hasExportedReferenceInDestructuringTarget(node.expression);
+            }
+            else if (ts.isObjectLiteralExpression(node)) {
+                return ts.some(node.properties, hasExportedReferenceInDestructuringTarget);
+            }
+            else if (ts.isArrayLiteralExpression(node)) {
+                return ts.some(node.elements, hasExportedReferenceInDestructuringTarget);
+            }
+            else if (ts.isShorthandPropertyAssignment(node)) {
+                return hasExportedReferenceInDestructuringTarget(node.name);
+            }
+            else if (ts.isPropertyAssignment(node)) {
+                return hasExportedReferenceInDestructuringTarget(node.initializer);
+            }
+            else if (ts.isIdentifier(node)) {
+                var container = resolver.getReferencedExportContainer(node);
+                return container !== undefined && container.kind === 261;
+            }
+            else {
+                return false;
+            }
+        }
+        function modifierVisitor(node) {
+            switch (node.kind) {
+                case 83:
+                case 78:
+                    return undefined;
+            }
+            return node;
+        }
+        function onEmitNode(emitContext, node, emitCallback) {
+            if (node.kind === 261) {
+                var id = ts.getOriginalNodeId(node);
+                currentSourceFile = node;
+                moduleInfo = moduleInfoMap[id];
+                exportFunction = exportFunctionsMap[id];
+                noSubstitution = noSubstitutionMap[id];
+                if (noSubstitution) {
+                    delete noSubstitutionMap[id];
+                }
+                previousOnEmitNode(emitContext, node, emitCallback);
+                currentSourceFile = undefined;
+                moduleInfo = undefined;
+                exportFunction = undefined;
+                noSubstitution = undefined;
+            }
+            else {
+                previousOnEmitNode(emitContext, node, emitCallback);
+            }
+        }
+        function onSubstituteNode(emitContext, node) {
+            node = previousOnSubstituteNode(emitContext, node);
+            if (isSubstitutionPrevented(node)) {
+                return node;
+            }
+            if (emitContext === 1) {
+                return substituteExpression(node);
+            }
+            return node;
+        }
+        function substituteExpression(node) {
+            switch (node.kind) {
+                case 70:
+                    return substituteExpressionIdentifier(node);
+                case 192:
+                    return substituteBinaryExpression(node);
+                case 190:
+                case 191:
+                    return substituteUnaryExpression(node);
+            }
+            return node;
+        }
+        function substituteExpressionIdentifier(node) {
+            if (!ts.isGeneratedIdentifier(node) && !ts.isLocalName(node)) {
+                var importDeclaration = resolver.getReferencedImportDeclaration(node);
+                if (importDeclaration) {
+                    if (ts.isImportClause(importDeclaration)) {
+                        return ts.createPropertyAccess(ts.getGeneratedNameForNode(importDeclaration.parent), ts.createIdentifier("default"), node);
+                    }
+                    else if (ts.isImportSpecifier(importDeclaration)) {
+                        return ts.createPropertyAccess(ts.getGeneratedNameForNode(importDeclaration.parent.parent.parent), ts.getSynthesizedClone(importDeclaration.propertyName || importDeclaration.name), node);
+                    }
+                }
+            }
+            return node;
+        }
+        function substituteBinaryExpression(node) {
+            if (ts.isAssignmentOperator(node.operatorToken.kind)
+                && ts.isIdentifier(node.left)
+                && !ts.isGeneratedIdentifier(node.left)
+                && !ts.isLocalName(node.left)
+                && !ts.isDeclarationNameOfEnumOrNamespace(node.left)) {
+                var exportedNames = getExports(node.left);
+                if (exportedNames) {
+                    var expression = node;
+                    for (var _i = 0, exportedNames_3 = exportedNames; _i < exportedNames_3.length; _i++) {
+                        var exportName = exportedNames_3[_i];
+                        expression = createExportExpression(exportName, preventSubstitution(expression));
+                    }
+                    return expression;
+                }
+            }
+            return node;
+        }
+        function substituteUnaryExpression(node) {
+            if ((node.operator === 42 || node.operator === 43)
+                && ts.isIdentifier(node.operand)
+                && !ts.isGeneratedIdentifier(node.operand)
+                && !ts.isLocalName(node.operand)
+                && !ts.isDeclarationNameOfEnumOrNamespace(node.operand)) {
+                var exportedNames = getExports(node.operand);
+                if (exportedNames) {
+                    var expression = node.kind === 191
+                        ? ts.createPrefix(node.operator, node.operand, node)
+                        : node;
+                    for (var _i = 0, exportedNames_4 = exportedNames; _i < exportedNames_4.length; _i++) {
+                        var exportName = exportedNames_4[_i];
+                        expression = createExportExpression(exportName, preventSubstitution(expression));
+                    }
+                    if (node.kind === 191) {
+                        expression = node.operator === 42
+                            ? ts.createSubtract(preventSubstitution(expression), ts.createLiteral(1))
+                            : ts.createAdd(preventSubstitution(expression), ts.createLiteral(1));
+                    }
+                    return expression;
+                }
+            }
+            return node;
+        }
+        function getExports(name) {
+            var exportedNames;
+            if (!ts.isGeneratedIdentifier(name)) {
+                var valueDeclaration = resolver.getReferencedImportDeclaration(name)
+                    || resolver.getReferencedValueDeclaration(name);
+                if (valueDeclaration) {
+                    var exportContainer = resolver.getReferencedExportContainer(name, false);
+                    if (exportContainer && exportContainer.kind === 261) {
+                        exportedNames = ts.append(exportedNames, ts.getDeclarationName(valueDeclaration));
+                    }
+                    exportedNames = ts.addRange(exportedNames, moduleInfo && moduleInfo.exportedBindings[ts.getOriginalNodeId(valueDeclaration)]);
+                }
+            }
+            return exportedNames;
+        }
+        function preventSubstitution(node) {
+            if (noSubstitution === undefined)
+                noSubstitution = ts.createMap();
+            noSubstitution[ts.getNodeId(node)] = true;
+            return node;
+        }
+        function isSubstitutionPrevented(node) {
+            return noSubstitution && node.id && noSubstitution[node.id];
         }
     }
     ts.transformSystemModule = transformSystemModule;
@@ -43575,9 +45658,9 @@ var ts;
         }
         function visitor(node) {
             switch (node.kind) {
-                case 230:
+                case 234:
                     return undefined;
-                case 236:
+                case 240:
                     return visitExportAssignment(node);
             }
             return node;
@@ -43598,21 +45681,18 @@ var ts;
         _a[ts.ModuleKind.UMD] = ts.transformModule,
         _a[ts.ModuleKind.None] = ts.transformModule,
         _a));
-    var SyntaxKindFeatureFlags;
-    (function (SyntaxKindFeatureFlags) {
-        SyntaxKindFeatureFlags[SyntaxKindFeatureFlags["Substitution"] = 1] = "Substitution";
-        SyntaxKindFeatureFlags[SyntaxKindFeatureFlags["EmitNotifications"] = 2] = "EmitNotifications";
-    })(SyntaxKindFeatureFlags || (SyntaxKindFeatureFlags = {}));
     function getTransformers(compilerOptions) {
         var jsx = compilerOptions.jsx;
         var languageVersion = ts.getEmitScriptTarget(compilerOptions);
         var moduleKind = ts.getEmitModuleKind(compilerOptions);
         var transformers = [];
         transformers.push(ts.transformTypeScript);
-        transformers.push(moduleTransformerMap[moduleKind] || moduleTransformerMap[ts.ModuleKind.None]);
         if (jsx === 2) {
             transformers.push(ts.transformJsx);
         }
+        if (languageVersion < 5) {
+            transformers.push(ts.transformESNext);
+        }
         if (languageVersion < 4) {
             transformers.push(ts.transformES2017);
         }
@@ -43623,6 +45703,7 @@ var ts;
             transformers.push(ts.transformES2015);
             transformers.push(ts.transformGenerators);
         }
+        transformers.push(moduleTransformerMap[moduleKind] || moduleTransformerMap[ts.ModuleKind.None]);
         if (languageVersion < 1) {
             transformers.push(ts.transformES5);
         }
@@ -43632,7 +45713,7 @@ var ts;
     function transformFiles(resolver, host, sourceFiles, transformers) {
         var lexicalEnvironmentVariableDeclarationsStack = [];
         var lexicalEnvironmentFunctionDeclarationsStack = [];
-        var enabledSyntaxKindFeatures = new Array(289);
+        var enabledSyntaxKindFeatures = new Array(296);
         var lexicalEnvironmentStackOffset = 0;
         var hoistedVariableDeclarations;
         var hoistedFunctionDeclarations;
@@ -43785,7 +45866,7 @@ var ts;
         var isCurrentFileExternalModule;
         var reportedDeclarationError = false;
         var errorNameNode;
-        var emitJsDocComments = compilerOptions.removeComments ? function () { } : writeJsDocComments;
+        var emitJsDocComments = compilerOptions.removeComments ? ts.noop : writeJsDocComments;
         var emit = compilerOptions.stripInternal ? stripInternal : emitNode;
         var noDeclare;
         var moduleElementDeclarationEmitInfo = [];
@@ -43829,7 +45910,7 @@ var ts;
                 var oldWriter = writer;
                 ts.forEach(moduleElementDeclarationEmitInfo, function (aliasEmitInfo) {
                     if (aliasEmitInfo.isVisible && !aliasEmitInfo.asynchronousOutput) {
-                        ts.Debug.assert(aliasEmitInfo.node.kind === 231);
+                        ts.Debug.assert(aliasEmitInfo.node.kind === 235);
                         createAndSetNewTextWriterWithSymbolWriter();
                         ts.Debug.assert(aliasEmitInfo.indent === 0 || (aliasEmitInfo.indent === 1 && isBundledEmit));
                         for (var i = 0; i < aliasEmitInfo.indent; i++) {
@@ -43900,10 +45981,10 @@ var ts;
             var oldWriter = writer;
             ts.forEach(nodes, function (declaration) {
                 var nodeToCheck;
-                if (declaration.kind === 219) {
+                if (declaration.kind === 223) {
                     nodeToCheck = declaration.parent.parent;
                 }
-                else if (declaration.kind === 234 || declaration.kind === 235 || declaration.kind === 232) {
+                else if (declaration.kind === 238 || declaration.kind === 239 || declaration.kind === 236) {
                     ts.Debug.fail("We should be getting ImportDeclaration instead to write");
                 }
                 else {
@@ -43914,7 +45995,7 @@ var ts;
                     moduleElementEmitInfo = ts.forEach(asynchronousSubModuleDeclarationEmitInfo, function (declEmitInfo) { return declEmitInfo.node === nodeToCheck ? declEmitInfo : undefined; });
                 }
                 if (moduleElementEmitInfo) {
-                    if (moduleElementEmitInfo.node.kind === 231) {
+                    if (moduleElementEmitInfo.node.kind === 235) {
                         moduleElementEmitInfo.isVisible = true;
                     }
                     else {
@@ -43922,12 +46003,12 @@ var ts;
                         for (var declarationIndent = moduleElementEmitInfo.indent; declarationIndent; declarationIndent--) {
                             increaseIndent();
                         }
-                        if (nodeToCheck.kind === 226) {
+                        if (nodeToCheck.kind === 230) {
                             ts.Debug.assert(asynchronousSubModuleDeclarationEmitInfo === undefined);
                             asynchronousSubModuleDeclarationEmitInfo = [];
                         }
                         writeModuleElement(nodeToCheck);
-                        if (nodeToCheck.kind === 226) {
+                        if (nodeToCheck.kind === 230) {
                             moduleElementEmitInfo.subModuleElementDeclarationEmitInfo = asynchronousSubModuleDeclarationEmitInfo;
                             asynchronousSubModuleDeclarationEmitInfo = undefined;
                         }
@@ -44040,43 +46121,49 @@ var ts;
         function emitType(type) {
             switch (type.kind) {
                 case 118:
-                case 133:
-                case 131:
-                case 121:
                 case 134:
+                case 132:
+                case 121:
+                case 135:
                 case 104:
-                case 136:
+                case 137:
                 case 94:
-                case 128:
-                case 166:
+                case 129:
                 case 167:
+                case 171:
                     return writeTextOfNode(currentText, type);
-                case 195:
+                case 199:
                     return emitExpressionWithTypeArguments(type);
-                case 156:
-                    return emitTypeReference(type);
-                case 159:
-                    return emitTypeQuery(type);
-                case 161:
-                    return emitArrayType(type);
-                case 162:
-                    return emitTupleType(type);
-                case 163:
-                    return emitUnionType(type);
-                case 164:
-                    return emitIntersectionType(type);
-                case 165:
-                    return emitParenType(type);
                 case 157:
-                case 158:
-                    return emitSignatureDeclarationWithJsDocComments(type);
+                    return emitTypeReference(type);
                 case 160:
+                    return emitTypeQuery(type);
+                case 162:
+                    return emitArrayType(type);
+                case 163:
+                    return emitTupleType(type);
+                case 164:
+                    return emitUnionType(type);
+                case 165:
+                    return emitIntersectionType(type);
+                case 166:
+                    return emitParenType(type);
+                case 168:
+                    return emitTypeOperator(type);
+                case 169:
+                    return emitIndexedAccessType(type);
+                case 170:
+                    return emitMappedType(type);
+                case 158:
+                case 159:
+                    return emitSignatureDeclarationWithJsDocComments(type);
+                case 161:
                     return emitTypeLiteral(type);
                 case 70:
                     return emitEntityName(type);
-                case 140:
+                case 141:
                     return emitEntityName(type);
-                case 155:
+                case 156:
                     return emitTypePredicate(type);
             }
             function writeEntityName(entityName) {
@@ -44084,22 +46171,22 @@ var ts;
                     writeTextOfNode(currentText, entityName);
                 }
                 else {
-                    var left = entityName.kind === 140 ? entityName.left : entityName.expression;
-                    var right = entityName.kind === 140 ? entityName.right : entityName.name;
+                    var left = entityName.kind === 141 ? entityName.left : entityName.expression;
+                    var right = entityName.kind === 141 ? entityName.right : entityName.name;
                     writeEntityName(left);
                     write(".");
                     writeTextOfNode(currentText, right);
                 }
             }
             function emitEntityName(entityName) {
-                var visibilityResult = resolver.isEntityNameVisible(entityName, entityName.parent.kind === 230 ? entityName.parent : enclosingDeclaration);
+                var visibilityResult = resolver.isEntityNameVisible(entityName, entityName.parent.kind === 234 ? entityName.parent : enclosingDeclaration);
                 handleSymbolAccessibilityError(visibilityResult);
                 recordTypeReferenceDirectivesIfNecessary(resolver.getTypeReferenceDirectivesForEntityName(entityName));
                 writeEntityName(entityName);
             }
             function emitExpressionWithTypeArguments(node) {
                 if (ts.isEntityNameExpression(node.expression)) {
-                    ts.Debug.assert(node.expression.kind === 70 || node.expression.kind === 173);
+                    ts.Debug.assert(node.expression.kind === 70 || node.expression.kind === 177);
                     emitEntityName(node.expression);
                     if (node.typeArguments) {
                         write("<");
@@ -44145,6 +46232,42 @@ var ts;
                 emitType(type.type);
                 write(")");
             }
+            function emitTypeOperator(type) {
+                write(ts.tokenToString(type.operator));
+                write(" ");
+                emitType(type.type);
+            }
+            function emitIndexedAccessType(node) {
+                emitType(node.objectType);
+                write("[");
+                emitType(node.indexType);
+                write("]");
+            }
+            function emitMappedType(node) {
+                var prevEnclosingDeclaration = enclosingDeclaration;
+                enclosingDeclaration = node;
+                write("{");
+                writeLine();
+                increaseIndent();
+                if (node.readonlyToken) {
+                    write("readonly ");
+                }
+                write("[");
+                writeEntityName(node.typeParameter.name);
+                write(" in ");
+                emitType(node.typeParameter.constraint);
+                write("]");
+                if (node.questionToken) {
+                    write("?");
+                }
+                write(": ");
+                emitType(node.type);
+                write(";");
+                writeLine();
+                decreaseIndent();
+                write("}");
+                enclosingDeclaration = prevEnclosingDeclaration;
+            }
             function emitTypeLiteral(type) {
                 write("{");
                 if (type.members.length) {
@@ -44173,9 +46296,9 @@ var ts;
             var count = 0;
             while (true) {
                 count++;
-                var name_40 = baseName + "_" + count;
-                if (!(name_40 in currentIdentifiers)) {
-                    return name_40;
+                var name_39 = baseName + "_" + count;
+                if (!(name_39 in currentIdentifiers)) {
+                    return name_39;
                 }
             }
         }
@@ -44219,10 +46342,10 @@ var ts;
             if (isModuleElementVisible) {
                 writeModuleElement(node);
             }
-            else if (node.kind === 230 ||
-                (node.parent.kind === 256 && isCurrentFileExternalModule)) {
+            else if (node.kind === 234 ||
+                (node.parent.kind === 261 && isCurrentFileExternalModule)) {
                 var isVisible = void 0;
-                if (asynchronousSubModuleDeclarationEmitInfo && node.parent.kind !== 256) {
+                if (asynchronousSubModuleDeclarationEmitInfo && node.parent.kind !== 261) {
                     asynchronousSubModuleDeclarationEmitInfo.push({
                         node: node,
                         outputPos: writer.getTextPos(),
@@ -44231,7 +46354,7 @@ var ts;
                     });
                 }
                 else {
-                    if (node.kind === 231) {
+                    if (node.kind === 235) {
                         var importDeclaration = node;
                         if (importDeclaration.importClause) {
                             isVisible = (importDeclaration.importClause.name && resolver.isDeclarationVisible(importDeclaration.importClause)) ||
@@ -44249,30 +46372,30 @@ var ts;
         }
         function writeModuleElement(node) {
             switch (node.kind) {
-                case 221:
-                    return writeFunctionDeclaration(node);
-                case 201:
-                    return writeVariableStatement(node);
-                case 223:
-                    return writeInterfaceDeclaration(node);
-                case 222:
-                    return writeClassDeclaration(node);
-                case 224:
-                    return writeTypeAliasDeclaration(node);
                 case 225:
-                    return writeEnumDeclaration(node);
+                    return writeFunctionDeclaration(node);
+                case 205:
+                    return writeVariableStatement(node);
+                case 227:
+                    return writeInterfaceDeclaration(node);
                 case 226:
-                    return writeModuleDeclaration(node);
+                    return writeClassDeclaration(node);
+                case 228:
+                    return writeTypeAliasDeclaration(node);
+                case 229:
+                    return writeEnumDeclaration(node);
                 case 230:
+                    return writeModuleDeclaration(node);
+                case 234:
                     return writeImportEqualsDeclaration(node);
-                case 231:
+                case 235:
                     return writeImportDeclaration(node);
                 default:
                     ts.Debug.fail("Unknown symbol kind");
             }
         }
         function emitModuleElementDeclarationFlags(node) {
-            if (node.parent.kind === 256) {
+            if (node.parent.kind === 261) {
                 var modifiers = ts.getModifierFlags(node);
                 if (modifiers & 1) {
                     write("export ");
@@ -44280,7 +46403,7 @@ var ts;
                 if (modifiers & 512) {
                     write("default ");
                 }
-                else if (node.kind !== 223 && !noDeclare) {
+                else if (node.kind !== 227 && !noDeclare) {
                     write("declare ");
                 }
             }
@@ -44330,7 +46453,7 @@ var ts;
         }
         function isVisibleNamedBinding(namedBindings) {
             if (namedBindings) {
-                if (namedBindings.kind === 233) {
+                if (namedBindings.kind === 237) {
                     return resolver.isDeclarationVisible(namedBindings);
                 }
                 else {
@@ -44353,7 +46476,7 @@ var ts;
                     if (currentWriterPos !== writer.getTextPos()) {
                         write(", ");
                     }
-                    if (node.importClause.namedBindings.kind === 233) {
+                    if (node.importClause.namedBindings.kind === 237) {
                         write("* as ");
                         writeTextOfNode(currentText, node.importClause.namedBindings.name);
                     }
@@ -44370,13 +46493,13 @@ var ts;
             writer.writeLine();
         }
         function emitExternalModuleSpecifier(parent) {
-            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || parent.kind !== 226;
+            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || parent.kind !== 230;
             var moduleSpecifier;
-            if (parent.kind === 230) {
+            if (parent.kind === 234) {
                 var node = parent;
                 moduleSpecifier = ts.getExternalModuleImportEqualsDeclarationExpression(node);
             }
-            else if (parent.kind === 226) {
+            else if (parent.kind === 230) {
                 moduleSpecifier = parent.name;
             }
             else {
@@ -44444,7 +46567,7 @@ var ts;
                     writeTextOfNode(currentText, node.name);
                 }
             }
-            while (node.body && node.body.kind !== 227) {
+            while (node.body && node.body.kind !== 231) {
                 node = node.body;
                 write(".");
                 writeTextOfNode(currentText, node.name);
@@ -44514,7 +46637,7 @@ var ts;
             writeLine();
         }
         function isPrivateMethodTypeParameter(node) {
-            return node.parent.kind === 148 && ts.hasModifier(node.parent, 8);
+            return node.parent.kind === 149 && ts.hasModifier(node.parent, 8);
         }
         function emitTypeParameters(typeParameters) {
             function emitTypeParameter(node) {
@@ -44524,15 +46647,15 @@ var ts;
                 writeTextOfNode(currentText, node.name);
                 if (node.constraint && !isPrivateMethodTypeParameter(node)) {
                     write(" extends ");
-                    if (node.parent.kind === 157 ||
-                        node.parent.kind === 158 ||
-                        (node.parent.parent && node.parent.parent.kind === 160)) {
-                        ts.Debug.assert(node.parent.kind === 148 ||
-                            node.parent.kind === 147 ||
-                            node.parent.kind === 157 ||
+                    if (node.parent.kind === 158 ||
+                        node.parent.kind === 159 ||
+                        (node.parent.parent && node.parent.parent.kind === 161)) {
+                        ts.Debug.assert(node.parent.kind === 149 ||
+                            node.parent.kind === 148 ||
                             node.parent.kind === 158 ||
-                            node.parent.kind === 152 ||
-                            node.parent.kind === 153);
+                            node.parent.kind === 159 ||
+                            node.parent.kind === 153 ||
+                            node.parent.kind === 154);
                         emitType(node.constraint);
                     }
                     else {
@@ -44542,31 +46665,31 @@ var ts;
                 function getTypeParameterConstraintVisibilityError() {
                     var diagnosticMessage;
                     switch (node.parent.kind) {
-                        case 222:
+                        case 226:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_class_has_or_is_using_private_name_1;
                             break;
-                        case 223:
+                        case 227:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1;
                             break;
-                        case 153:
+                        case 154:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
                             break;
-                        case 152:
+                        case 153:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
                             break;
+                        case 149:
                         case 148:
-                        case 147:
                             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 === 222) {
+                            else if (node.parent.parent.kind === 226) {
                                 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 221:
+                        case 225:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_function_has_or_is_using_private_name_1;
                             break;
                         default:
@@ -44603,7 +46726,7 @@ var ts;
                 }
                 function getHeritageClauseVisibilityError() {
                     var diagnosticMessage;
-                    if (node.parent.parent.kind === 222) {
+                    if (node.parent.parent.kind === 226) {
                         diagnosticMessage = isImplementsList ?
                             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;
@@ -44683,17 +46806,17 @@ var ts;
             writeLine();
         }
         function emitVariableDeclaration(node) {
-            if (node.kind !== 219 || resolver.isDeclarationVisible(node)) {
+            if (node.kind !== 223 || resolver.isDeclarationVisible(node)) {
                 if (ts.isBindingPattern(node.name)) {
                     emitBindingPattern(node.name);
                 }
                 else {
                     writeTextOfNode(currentText, node.name);
-                    if ((node.kind === 146 || node.kind === 145 ||
-                        (node.kind === 143 && !ts.isParameterPropertyDeclaration(node))) && ts.hasQuestionToken(node)) {
+                    if ((node.kind === 147 || node.kind === 146 ||
+                        (node.kind === 144 && !ts.isParameterPropertyDeclaration(node))) && ts.hasQuestionToken(node)) {
                         write("?");
                     }
-                    if ((node.kind === 146 || node.kind === 145) && node.parent.kind === 160) {
+                    if ((node.kind === 147 || node.kind === 146) && node.parent.kind === 161) {
                         emitTypeOfVariableDeclarationFromTypeLiteral(node);
                     }
                     else if (resolver.isLiteralConstDeclaration(node)) {
@@ -44706,14 +46829,14 @@ var ts;
                 }
             }
             function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
-                if (node.kind === 219) {
+                if (node.kind === 223) {
                     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 === 146 || node.kind === 145) {
+                else if (node.kind === 147 || node.kind === 146) {
                     if (ts.hasModifier(node, 32)) {
                         return symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 ?
@@ -44721,7 +46844,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 === 222) {
+                    else if (node.parent.kind === 226) {
                         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 :
@@ -44747,7 +46870,7 @@ var ts;
                 var elements = [];
                 for (var _i = 0, _a = bindingPattern.elements; _i < _a.length; _i++) {
                     var element = _a[_i];
-                    if (element.kind !== 194) {
+                    if (element.kind !== 198) {
                         elements.push(element);
                     }
                 }
@@ -44813,7 +46936,7 @@ var ts;
                     accessorWithTypeAnnotation = node;
                     var type = getTypeAnnotationFromAccessor(node);
                     if (!type) {
-                        var anotherAccessor = node.kind === 150 ? accessors.setAccessor : accessors.getAccessor;
+                        var anotherAccessor = node.kind === 151 ? accessors.setAccessor : accessors.getAccessor;
                         type = getTypeAnnotationFromAccessor(anotherAccessor);
                         if (type) {
                             accessorWithTypeAnnotation = anotherAccessor;
@@ -44826,7 +46949,7 @@ var ts;
             }
             function getTypeAnnotationFromAccessor(accessor) {
                 if (accessor) {
-                    return accessor.kind === 150
+                    return accessor.kind === 151
                         ? accessor.type
                         : accessor.parameters.length > 0
                             ? accessor.parameters[0].type
@@ -44835,7 +46958,7 @@ var ts;
             }
             function getAccessorDeclarationTypeVisibilityError(symbolAccessibilityResult) {
                 var diagnosticMessage;
-                if (accessorWithTypeAnnotation.kind === 151) {
+                if (accessorWithTypeAnnotation.kind === 152) {
                     if (ts.hasModifier(accessorWithTypeAnnotation.parent, 32)) {
                         diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
@@ -44881,17 +47004,17 @@ var ts;
             }
             if (!resolver.isImplementationOfOverload(node)) {
                 emitJsDocComments(node);
-                if (node.kind === 221) {
+                if (node.kind === 225) {
                     emitModuleElementDeclarationFlags(node);
                 }
-                else if (node.kind === 148 || node.kind === 149) {
+                else if (node.kind === 149 || node.kind === 150) {
                     emitClassMemberDeclarationFlags(ts.getModifierFlags(node));
                 }
-                if (node.kind === 221) {
+                if (node.kind === 225) {
                     write("function ");
                     writeTextOfNode(currentText, node.name);
                 }
-                else if (node.kind === 149) {
+                else if (node.kind === 150) {
                     write("constructor");
                 }
                 else {
@@ -44911,15 +47034,15 @@ var ts;
             var prevEnclosingDeclaration = enclosingDeclaration;
             enclosingDeclaration = node;
             var closeParenthesizedFunctionType = false;
-            if (node.kind === 154) {
+            if (node.kind === 155) {
                 emitClassMemberDeclarationFlags(ts.getModifierFlags(node));
                 write("[");
             }
             else {
-                if (node.kind === 153 || node.kind === 158) {
+                if (node.kind === 154 || node.kind === 159) {
                     write("new ");
                 }
-                else if (node.kind === 157) {
+                else if (node.kind === 158) {
                     var currentOutput = writer.getText();
                     if (node.typeParameters && currentOutput.charAt(currentOutput.length - 1) === "<") {
                         closeParenthesizedFunctionType = true;
@@ -44930,20 +47053,20 @@ var ts;
                 write("(");
             }
             emitCommaList(node.parameters, emitParameterDeclaration);
-            if (node.kind === 154) {
+            if (node.kind === 155) {
                 write("]");
             }
             else {
                 write(")");
             }
-            var isFunctionTypeOrConstructorType = node.kind === 157 || node.kind === 158;
-            if (isFunctionTypeOrConstructorType || node.parent.kind === 160) {
+            var isFunctionTypeOrConstructorType = node.kind === 158 || node.kind === 159;
+            if (isFunctionTypeOrConstructorType || node.parent.kind === 161) {
                 if (node.type) {
                     write(isFunctionTypeOrConstructorType ? " => " : ": ");
                     emitType(node.type);
                 }
             }
-            else if (node.kind !== 149 && !ts.hasModifier(node, 8)) {
+            else if (node.kind !== 150 && !ts.hasModifier(node, 8)) {
                 writeReturnTypeAtSignature(node, getReturnTypeVisibilityError);
             }
             enclosingDeclaration = prevEnclosingDeclaration;
@@ -44957,23 +47080,23 @@ var ts;
             function getReturnTypeVisibilityError(symbolAccessibilityResult) {
                 var diagnosticMessage;
                 switch (node.kind) {
-                    case 153:
+                    case 154:
                         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 152:
+                    case 153:
                         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 154:
+                    case 155:
                         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 149:
                     case 148:
-                    case 147:
                         if (ts.hasModifier(node, 32)) {
                             diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                                 symbolAccessibilityResult.accessibility === 2 ?
@@ -44981,7 +47104,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 === 222) {
+                        else if (node.parent.kind === 226) {
                             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 :
@@ -44994,7 +47117,7 @@ var ts;
                                 ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0;
                         }
                         break;
-                    case 221:
+                    case 225:
                         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 :
@@ -45026,9 +47149,9 @@ var ts;
                 write("?");
             }
             decreaseIndent();
-            if (node.parent.kind === 157 ||
-                node.parent.kind === 158 ||
-                node.parent.parent.kind === 160) {
+            if (node.parent.kind === 158 ||
+                node.parent.kind === 159 ||
+                node.parent.parent.kind === 161) {
                 emitTypeOfVariableDeclarationFromTypeLiteral(node);
             }
             else if (!ts.hasModifier(node.parent, 8)) {
@@ -45044,22 +47167,22 @@ var ts;
             }
             function getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
                 switch (node.parent.kind) {
-                    case 149:
+                    case 150:
                         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 153:
+                    case 154:
                         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 152:
+                    case 153:
                         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 149:
                     case 148:
-                    case 147:
                         if (ts.hasModifier(node.parent, 32)) {
                             return symbolAccessibilityResult.errorModuleName ?
                                 symbolAccessibilityResult.accessibility === 2 ?
@@ -45067,7 +47190,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 === 222) {
+                        else if (node.parent.parent.kind === 226) {
                             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 :
@@ -45079,7 +47202,7 @@ 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 221:
+                    case 225:
                         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 :
@@ -45090,12 +47213,12 @@ var ts;
                 }
             }
             function emitBindingPattern(bindingPattern) {
-                if (bindingPattern.kind === 168) {
+                if (bindingPattern.kind === 172) {
                     write("{");
                     emitCommaList(bindingPattern.elements, emitBindingElement);
                     write("}");
                 }
-                else if (bindingPattern.kind === 169) {
+                else if (bindingPattern.kind === 173) {
                     write("[");
                     var elements = bindingPattern.elements;
                     emitCommaList(elements, emitBindingElement);
@@ -45106,10 +47229,10 @@ var ts;
                 }
             }
             function emitBindingElement(bindingElement) {
-                if (bindingElement.kind === 194) {
+                if (bindingElement.kind === 198) {
                     write(" ");
                 }
-                else if (bindingElement.kind === 170) {
+                else if (bindingElement.kind === 174) {
                     if (bindingElement.propertyName) {
                         writeTextOfNode(currentText, bindingElement.propertyName);
                         write(": ");
@@ -45131,39 +47254,39 @@ var ts;
         }
         function emitNode(node) {
             switch (node.kind) {
-                case 221:
-                case 226:
-                case 230:
-                case 223:
-                case 222:
-                case 224:
                 case 225:
+                case 230:
+                case 234:
+                case 227:
+                case 226:
+                case 228:
+                case 229:
                     return emitModuleElement(node, isModuleElementVisible(node));
-                case 201:
+                case 205:
                     return emitModuleElement(node, isVariableStatementVisible(node));
-                case 231:
+                case 235:
                     return emitModuleElement(node, !node.importClause);
-                case 237:
+                case 241:
                     return emitExportDeclaration(node);
+                case 150:
                 case 149:
                 case 148:
-                case 147:
                     return writeFunctionDeclaration(node);
-                case 153:
-                case 152:
                 case 154:
+                case 153:
+                case 155:
                     return emitSignatureDeclarationWithJsDocComments(node);
-                case 150:
                 case 151:
+                case 152:
                     return emitAccessorDeclaration(node);
+                case 147:
                 case 146:
-                case 145:
                     return emitPropertyDeclaration(node);
-                case 255:
+                case 260:
                     return emitEnumMemberDeclaration(node);
-                case 236:
+                case 240:
                     return emitExportAssignment(node);
-                case 256:
+                case 261:
                     return emitSourceFile(node);
             }
         }
@@ -45380,7 +47503,7 @@ var ts;
                 var emitNode = node.emitNode;
                 var emitFlags = emitNode && emitNode.flags;
                 var _a = emitNode && emitNode.sourceMapRange || node, pos = _a.pos, end = _a.end;
-                if (node.kind !== 287
+                if (node.kind !== 292
                     && (emitFlags & 512) === 0
                     && pos >= 0) {
                     emitPos(ts.skipTrivia(currentSourceText, pos));
@@ -45393,7 +47516,7 @@ var ts;
                 else {
                     emitCallback(emitContext, node);
                 }
-                if (node.kind !== 287
+                if (node.kind !== 292
                     && (emitFlags & 1024) === 0
                     && end >= 0) {
                     emitPos(end);
@@ -45537,7 +47660,7 @@ var ts;
                     if (extendedDiagnostics) {
                         ts.performance.mark("preEmitNodeWithComment");
                     }
-                    var isEmittedNode = node.kind !== 287;
+                    var isEmittedNode = node.kind !== 292;
                     var skipLeadingComments = pos < 0 || (emitFlags & 16384) !== 0;
                     var skipTrailingComments = end < 0 || (emitFlags & 32768) !== 0;
                     if (!skipLeadingComments) {
@@ -45551,7 +47674,7 @@ var ts;
                     }
                     if (!skipTrailingComments) {
                         containerEnd = end;
-                        if (node.kind === 220) {
+                        if (node.kind === 224) {
                             declarationListContainerEnd = end;
                         }
                     }
@@ -45751,12 +47874,6 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    var TempFlags;
-    (function (TempFlags) {
-        TempFlags[TempFlags["Auto"] = 0] = "Auto";
-        TempFlags[TempFlags["CountMask"] = 268435455] = "CountMask";
-        TempFlags[TempFlags["_i"] = 268435456] = "_i";
-    })(TempFlags || (TempFlags = {}));
     var id = function (s) { return s; };
     var nullTransformers = [function (_) { return id; }];
     function emitFiles(resolver, host, targetSourceFile, emitOnlyDtsFiles) {
@@ -45764,6 +47881,7 @@ var ts;
         var brackets = createBracketsMap();
         var extendsHelper = "\nvar __extends = (this && this.__extends) || function (d, b) {\n    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];\n    function __() { this.constructor = d; }\n    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());\n};";
         var assignHelper = "\nvar __assign = (this && this.__assign) || Object.assign || function(t) {\n    for (var s, i = 1, n = arguments.length; i < n; i++) {\n        s = arguments[i];\n        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))\n            t[p] = s[p];\n    }\n    return t;\n};";
+        var restHelper = "\nvar __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))\n        t[p] = s[p];\n    return t;\n};";
         var decorateHelper = "\nvar __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {\n    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;\n    if (typeof Reflect === \"object\" && typeof Reflect.decorate === \"function\") r = Reflect.decorate(decorators, target, key, desc);\n    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;\n    return c > 3 && r && Object.defineProperty(target, key, r), r;\n};";
         var metadataHelper = "\nvar __metadata = (this && this.__metadata) || function (k, v) {\n    if (typeof Reflect === \"object\" && typeof Reflect.metadata === \"function\") return Reflect.metadata(k, v);\n};";
         var paramHelper = "\nvar __param = (this && this.__param) || function (paramIndex, decorator) {\n    return function (target, key) { decorator(target, key, paramIndex); }\n};";
@@ -45796,6 +47914,7 @@ var ts;
         var currentFileIdentifiers;
         var extendsEmitted;
         var assignEmitted;
+        var restEmitted;
         var decorateEmitted;
         var paramEmitted;
         var awaiterEmitted;
@@ -45929,7 +48048,7 @@ var ts;
         function pipelineEmitInSourceFileContext(node) {
             var kind = node.kind;
             switch (kind) {
-                case 256:
+                case 261:
                     return emitSourceFile(node);
             }
         }
@@ -45967,7 +48086,6 @@ var ts;
                 case 123:
                 case 124:
                 case 125:
-                case 126:
                 case 127:
                 case 128:
                 case 129:
@@ -45981,182 +48099,191 @@ var ts;
                 case 137:
                 case 138:
                 case 139:
+                case 140:
                     writeTokenText(kind);
                     return;
-                case 140:
-                    return emitQualifiedName(node);
                 case 141:
-                    return emitComputedPropertyName(node);
+                    return emitQualifiedName(node);
                 case 142:
-                    return emitTypeParameter(node);
+                    return emitComputedPropertyName(node);
                 case 143:
-                    return emitParameter(node);
+                    return emitTypeParameter(node);
                 case 144:
-                    return emitDecorator(node);
+                    return emitParameter(node);
                 case 145:
-                    return emitPropertySignature(node);
+                    return emitDecorator(node);
                 case 146:
-                    return emitPropertyDeclaration(node);
+                    return emitPropertySignature(node);
                 case 147:
-                    return emitMethodSignature(node);
+                    return emitPropertyDeclaration(node);
                 case 148:
-                    return emitMethodDeclaration(node);
+                    return emitMethodSignature(node);
                 case 149:
-                    return emitConstructor(node);
+                    return emitMethodDeclaration(node);
                 case 150:
+                    return emitConstructor(node);
                 case 151:
-                    return emitAccessorDeclaration(node);
                 case 152:
-                    return emitCallSignature(node);
+                    return emitAccessorDeclaration(node);
                 case 153:
-                    return emitConstructSignature(node);
+                    return emitCallSignature(node);
                 case 154:
-                    return emitIndexSignature(node);
+                    return emitConstructSignature(node);
                 case 155:
-                    return emitTypePredicate(node);
+                    return emitIndexSignature(node);
                 case 156:
-                    return emitTypeReference(node);
+                    return emitTypePredicate(node);
                 case 157:
-                    return emitFunctionType(node);
+                    return emitTypeReference(node);
                 case 158:
-                    return emitConstructorType(node);
+                    return emitFunctionType(node);
                 case 159:
-                    return emitTypeQuery(node);
+                    return emitConstructorType(node);
                 case 160:
-                    return emitTypeLiteral(node);
+                    return emitTypeQuery(node);
                 case 161:
-                    return emitArrayType(node);
+                    return emitTypeLiteral(node);
                 case 162:
-                    return emitTupleType(node);
+                    return emitArrayType(node);
                 case 163:
-                    return emitUnionType(node);
+                    return emitTupleType(node);
                 case 164:
-                    return emitIntersectionType(node);
+                    return emitUnionType(node);
                 case 165:
-                    return emitParenthesizedType(node);
-                case 195:
-                    return emitExpressionWithTypeArguments(node);
+                    return emitIntersectionType(node);
                 case 166:
-                    return emitThisType();
-                case 167:
-                    return emitLiteralType(node);
-                case 168:
-                    return emitObjectBindingPattern(node);
-                case 169:
-                    return emitArrayBindingPattern(node);
-                case 170:
-                    return emitBindingElement(node);
-                case 198:
-                    return emitTemplateSpan(node);
+                    return emitParenthesizedType(node);
                 case 199:
-                    return emitSemicolonClassElement();
-                case 200:
-                    return emitBlock(node);
-                case 201:
-                    return emitVariableStatement(node);
+                    return emitExpressionWithTypeArguments(node);
+                case 167:
+                    return emitThisType();
+                case 168:
+                    return emitTypeOperator(node);
+                case 169:
+                    return emitIndexedAccessType(node);
+                case 170:
+                    return emitMappedType(node);
+                case 171:
+                    return emitLiteralType(node);
+                case 172:
+                    return emitObjectBindingPattern(node);
+                case 173:
+                    return emitArrayBindingPattern(node);
+                case 174:
+                    return emitBindingElement(node);
                 case 202:
-                    return emitEmptyStatement();
+                    return emitTemplateSpan(node);
                 case 203:
-                    return emitExpressionStatement(node);
+                    return emitSemicolonClassElement();
                 case 204:
-                    return emitIfStatement(node);
+                    return emitBlock(node);
                 case 205:
-                    return emitDoStatement(node);
+                    return emitVariableStatement(node);
                 case 206:
-                    return emitWhileStatement(node);
+                    return emitEmptyStatement();
                 case 207:
-                    return emitForStatement(node);
+                    return emitExpressionStatement(node);
                 case 208:
-                    return emitForInStatement(node);
+                    return emitIfStatement(node);
                 case 209:
-                    return emitForOfStatement(node);
+                    return emitDoStatement(node);
                 case 210:
-                    return emitContinueStatement(node);
+                    return emitWhileStatement(node);
                 case 211:
-                    return emitBreakStatement(node);
+                    return emitForStatement(node);
                 case 212:
-                    return emitReturnStatement(node);
+                    return emitForInStatement(node);
                 case 213:
-                    return emitWithStatement(node);
+                    return emitForOfStatement(node);
                 case 214:
-                    return emitSwitchStatement(node);
+                    return emitContinueStatement(node);
                 case 215:
-                    return emitLabeledStatement(node);
+                    return emitBreakStatement(node);
                 case 216:
-                    return emitThrowStatement(node);
+                    return emitReturnStatement(node);
                 case 217:
-                    return emitTryStatement(node);
+                    return emitWithStatement(node);
                 case 218:
-                    return emitDebuggerStatement(node);
+                    return emitSwitchStatement(node);
                 case 219:
-                    return emitVariableDeclaration(node);
+                    return emitLabeledStatement(node);
                 case 220:
-                    return emitVariableDeclarationList(node);
+                    return emitThrowStatement(node);
                 case 221:
-                    return emitFunctionDeclaration(node);
+                    return emitTryStatement(node);
                 case 222:
-                    return emitClassDeclaration(node);
+                    return emitDebuggerStatement(node);
                 case 223:
-                    return emitInterfaceDeclaration(node);
+                    return emitVariableDeclaration(node);
                 case 224:
-                    return emitTypeAliasDeclaration(node);
+                    return emitVariableDeclarationList(node);
                 case 225:
-                    return emitEnumDeclaration(node);
+                    return emitFunctionDeclaration(node);
                 case 226:
-                    return emitModuleDeclaration(node);
+                    return emitClassDeclaration(node);
                 case 227:
-                    return emitModuleBlock(node);
+                    return emitInterfaceDeclaration(node);
                 case 228:
-                    return emitCaseBlock(node);
+                    return emitTypeAliasDeclaration(node);
+                case 229:
+                    return emitEnumDeclaration(node);
                 case 230:
-                    return emitImportEqualsDeclaration(node);
+                    return emitModuleDeclaration(node);
                 case 231:
-                    return emitImportDeclaration(node);
+                    return emitModuleBlock(node);
                 case 232:
-                    return emitImportClause(node);
-                case 233:
-                    return emitNamespaceImport(node);
+                    return emitCaseBlock(node);
                 case 234:
-                    return emitNamedImports(node);
+                    return emitImportEqualsDeclaration(node);
                 case 235:
-                    return emitImportSpecifier(node);
+                    return emitImportDeclaration(node);
                 case 236:
-                    return emitExportAssignment(node);
+                    return emitImportClause(node);
                 case 237:
-                    return emitExportDeclaration(node);
+                    return emitNamespaceImport(node);
                 case 238:
-                    return emitNamedExports(node);
+                    return emitNamedImports(node);
                 case 239:
-                    return emitExportSpecifier(node);
+                    return emitImportSpecifier(node);
                 case 240:
-                    return;
+                    return emitExportAssignment(node);
                 case 241:
+                    return emitExportDeclaration(node);
+                case 242:
+                    return emitNamedExports(node);
+                case 243:
+                    return emitExportSpecifier(node);
+                case 244:
+                    return;
+                case 245:
                     return emitExternalModuleReference(node);
                 case 10:
                     return emitJsxText(node);
-                case 244:
-                    return emitJsxOpeningElement(node);
-                case 245:
-                    return emitJsxClosingElement(node);
-                case 246:
-                    return emitJsxAttribute(node);
-                case 247:
-                    return emitJsxSpreadAttribute(node);
                 case 248:
-                    return emitJsxExpression(node);
+                    return emitJsxOpeningElement(node);
                 case 249:
-                    return emitCaseClause(node);
+                    return emitJsxClosingElement(node);
                 case 250:
-                    return emitDefaultClause(node);
+                    return emitJsxAttribute(node);
                 case 251:
-                    return emitHeritageClause(node);
+                    return emitJsxSpreadAttribute(node);
                 case 252:
-                    return emitCatchClause(node);
+                    return emitJsxExpression(node);
                 case 253:
-                    return emitPropertyAssignment(node);
+                    return emitCaseClause(node);
                 case 254:
-                    return emitShorthandPropertyAssignment(node);
+                    return emitDefaultClause(node);
                 case 255:
+                    return emitHeritageClause(node);
+                case 256:
+                    return emitCatchClause(node);
+                case 257:
+                    return emitPropertyAssignment(node);
+                case 258:
+                    return emitShorthandPropertyAssignment(node);
+                case 259:
+                    return emitSpreadAssignment(node);
+                case 260:
                     return emitEnumMember(node);
             }
             if (ts.isExpression(node)) {
@@ -46181,63 +48308,63 @@ var ts;
                 case 98:
                     writeTokenText(kind);
                     return;
-                case 171:
-                    return emitArrayLiteralExpression(node);
-                case 172:
-                    return emitObjectLiteralExpression(node);
-                case 173:
-                    return emitPropertyAccessExpression(node);
-                case 174:
-                    return emitElementAccessExpression(node);
                 case 175:
-                    return emitCallExpression(node);
+                    return emitArrayLiteralExpression(node);
                 case 176:
-                    return emitNewExpression(node);
+                    return emitObjectLiteralExpression(node);
                 case 177:
-                    return emitTaggedTemplateExpression(node);
+                    return emitPropertyAccessExpression(node);
                 case 178:
-                    return emitTypeAssertionExpression(node);
+                    return emitElementAccessExpression(node);
                 case 179:
-                    return emitParenthesizedExpression(node);
+                    return emitCallExpression(node);
                 case 180:
-                    return emitFunctionExpression(node);
+                    return emitNewExpression(node);
                 case 181:
-                    return emitArrowFunction(node);
+                    return emitTaggedTemplateExpression(node);
                 case 182:
-                    return emitDeleteExpression(node);
+                    return emitTypeAssertionExpression(node);
                 case 183:
-                    return emitTypeOfExpression(node);
+                    return emitParenthesizedExpression(node);
                 case 184:
-                    return emitVoidExpression(node);
+                    return emitFunctionExpression(node);
                 case 185:
-                    return emitAwaitExpression(node);
+                    return emitArrowFunction(node);
                 case 186:
-                    return emitPrefixUnaryExpression(node);
+                    return emitDeleteExpression(node);
                 case 187:
-                    return emitPostfixUnaryExpression(node);
+                    return emitTypeOfExpression(node);
                 case 188:
-                    return emitBinaryExpression(node);
+                    return emitVoidExpression(node);
                 case 189:
-                    return emitConditionalExpression(node);
+                    return emitAwaitExpression(node);
                 case 190:
-                    return emitTemplateExpression(node);
+                    return emitPrefixUnaryExpression(node);
                 case 191:
-                    return emitYieldExpression(node);
+                    return emitPostfixUnaryExpression(node);
                 case 192:
-                    return emitSpreadElementExpression(node);
+                    return emitBinaryExpression(node);
                 case 193:
-                    return emitClassExpression(node);
+                    return emitConditionalExpression(node);
                 case 194:
-                    return;
+                    return emitTemplateExpression(node);
+                case 195:
+                    return emitYieldExpression(node);
                 case 196:
-                    return emitAsExpression(node);
+                    return emitSpreadExpression(node);
                 case 197:
+                    return emitClassExpression(node);
+                case 198:
+                    return;
+                case 200:
+                    return emitAsExpression(node);
+                case 201:
                     return emitNonNullExpression(node);
-                case 242:
+                case 246:
                     return emitJsxElement(node);
-                case 243:
+                case 247:
                     return emitJsxSelfClosingElement(node);
-                case 288:
+                case 293:
                     return emitPartiallyEmittedExpression(node);
             }
         }
@@ -46341,7 +48468,7 @@ var ts;
         function emitAccessorDeclaration(node) {
             emitDecorators(node, node.decorators);
             emitModifiers(node, node.modifiers);
-            write(node.kind === 150 ? "get " : "set ");
+            write(node.kind === 151 ? "get " : "set ");
             emit(node.name);
             emitSignatureAndBody(node, emitSignatureHead);
         }
@@ -46426,6 +48553,39 @@ var ts;
         function emitThisType() {
             write("this");
         }
+        function emitTypeOperator(node) {
+            writeTokenText(node.operator);
+            write(" ");
+            emit(node.type);
+        }
+        function emitIndexedAccessType(node) {
+            emit(node.objectType);
+            write("[");
+            emit(node.indexType);
+            write("]");
+        }
+        function emitMappedType(node) {
+            write("{");
+            writeLine();
+            increaseIndent();
+            if (node.readonlyToken) {
+                write("readonly ");
+            }
+            write("[");
+            emit(node.typeParameter.name);
+            write(" in ");
+            emit(node.typeParameter.constraint);
+            write("]");
+            if (node.questionToken) {
+                write("?");
+            }
+            write(": ");
+            emit(node.type);
+            write(";");
+            writeLine();
+            decreaseIndent();
+            write("}");
+        }
         function emitLiteralType(node) {
             emitExpression(node.literal);
         }
@@ -46589,7 +48749,7 @@ var ts;
         }
         function shouldEmitWhitespaceBeforeOperand(node) {
             var operand = node.operand;
-            return operand.kind === 186
+            return operand.kind === 190
                 && ((node.operator === 36 && (operand.operator === 36 || operand.operator === 42))
                     || (node.operator === 37 && (operand.operator === 37 || operand.operator === 43)));
         }
@@ -46633,7 +48793,7 @@ var ts;
             write(node.asteriskToken ? "yield*" : "yield");
             emitExpressionWithPrefix(" ", node.expression);
         }
-        function emitSpreadElementExpression(node) {
+        function emitSpreadExpression(node) {
             write("...");
             emitExpression(node.expression);
         }
@@ -46701,7 +48861,7 @@ var ts;
             if (node.elseStatement) {
                 writeLine();
                 writeToken(81, node.thenStatement.end, node);
-                if (node.elseStatement.kind === 204) {
+                if (node.elseStatement.kind === 208) {
                     write(" ");
                     emit(node.elseStatement);
                 }
@@ -46763,7 +48923,7 @@ var ts;
         }
         function emitForBinding(node) {
             if (node !== undefined) {
-                if (node.kind === 220) {
+                if (node.kind === 224) {
                     emit(node);
                 }
                 else {
@@ -46992,7 +49152,7 @@ var ts;
             write(node.flags & 16 ? "namespace " : "module ");
             emit(node.name);
             var body = node.body;
-            while (body.kind === 226) {
+            while (body.kind === 230) {
                 write(".");
                 emit(body.name);
                 body = body.body;
@@ -47211,6 +49371,12 @@ var ts;
                 emitExpression(node.objectAssignmentInitializer);
             }
         }
+        function emitSpreadAssignment(node) {
+            if (node.expression) {
+                write("...");
+                emitExpression(node.expression);
+            }
+        }
         function emitEnumMember(node) {
             emit(node.name);
             emitExpressionWithPrefix(" = ", node.initializer);
@@ -47280,10 +49446,17 @@ var ts;
                 extendsEmitted = true;
                 helpersEmitted = true;
             }
-            if (compilerOptions.jsx !== 1 && !assignEmitted && (node.flags & 16384)) {
+            if ((languageVersion < 5 || currentSourceFile.scriptKind === 2 || currentSourceFile.scriptKind === 4) &&
+                compilerOptions.jsx !== 1 &&
+                !assignEmitted &&
+                node.flags & 16384) {
                 writeLines(assignHelper);
                 assignEmitted = true;
             }
+            if (languageVersion < 5 && !restEmitted && node.flags & 32768) {
+                writeLines(restHelper);
+                restEmitted = true;
+            }
             if (!decorateEmitted && node.flags & 2048) {
                 writeLines(decorateHelper);
                 if (compilerOptions.emitDecoratorMetadata) {
@@ -47606,7 +49779,7 @@ var ts;
                 && !ts.rangeEndIsOnSameLineAsRangeStart(node1, node2, currentSourceFile);
         }
         function skipSynthesizedParentheses(node) {
-            while (node.kind === 179 && ts.nodeIsSynthesized(node)) {
+            while (node.kind === 183 && ts.nodeIsSynthesized(node)) {
                 node = node.expression;
             }
             return node;
@@ -47663,21 +49836,21 @@ var ts;
         }
         function makeTempVariableName(flags) {
             if (flags && !(tempFlags & flags)) {
-                var name_41 = flags === 268435456 ? "_i" : "_n";
-                if (isUniqueName(name_41)) {
+                var name_40 = flags === 268435456 ? "_i" : "_n";
+                if (isUniqueName(name_40)) {
                     tempFlags |= flags;
-                    return name_41;
+                    return name_40;
                 }
             }
             while (true) {
                 var count = tempFlags & 268435455;
                 tempFlags++;
                 if (count !== 8 && count !== 13) {
-                    var name_42 = count < 26
+                    var name_41 = count < 26
                         ? "_" + String.fromCharCode(97 + count)
                         : "_" + (count - 26);
-                    if (isUniqueName(name_42)) {
-                        return name_42;
+                    if (isUniqueName(name_41)) {
+                        return name_41;
                     }
                 }
             }
@@ -47715,17 +49888,17 @@ var ts;
             switch (node.kind) {
                 case 70:
                     return makeUniqueName(getTextOfNode(node));
-                case 226:
-                case 225:
+                case 230:
+                case 229:
                     return generateNameForModuleOrEnum(node);
-                case 231:
-                case 237:
+                case 235:
+                case 241:
                     return generateNameForImportOrExportDeclaration(node);
-                case 221:
-                case 222:
-                case 236:
+                case 225:
+                case 226:
+                case 240:
                     return generateNameForExportDefault();
-                case 193:
+                case 197:
                     return generateNameForClassExpression();
                 default:
                     return makeTempVariableName(0);
@@ -47795,72 +49968,10 @@ var ts;
         }
     }
     ts.emitFiles = emitFiles;
-    var ListFormat;
-    (function (ListFormat) {
-        ListFormat[ListFormat["None"] = 0] = "None";
-        ListFormat[ListFormat["SingleLine"] = 0] = "SingleLine";
-        ListFormat[ListFormat["MultiLine"] = 1] = "MultiLine";
-        ListFormat[ListFormat["PreserveLines"] = 2] = "PreserveLines";
-        ListFormat[ListFormat["LinesMask"] = 3] = "LinesMask";
-        ListFormat[ListFormat["NotDelimited"] = 0] = "NotDelimited";
-        ListFormat[ListFormat["BarDelimited"] = 4] = "BarDelimited";
-        ListFormat[ListFormat["AmpersandDelimited"] = 8] = "AmpersandDelimited";
-        ListFormat[ListFormat["CommaDelimited"] = 16] = "CommaDelimited";
-        ListFormat[ListFormat["DelimitersMask"] = 28] = "DelimitersMask";
-        ListFormat[ListFormat["AllowTrailingComma"] = 32] = "AllowTrailingComma";
-        ListFormat[ListFormat["Indented"] = 64] = "Indented";
-        ListFormat[ListFormat["SpaceBetweenBraces"] = 128] = "SpaceBetweenBraces";
-        ListFormat[ListFormat["SpaceBetweenSiblings"] = 256] = "SpaceBetweenSiblings";
-        ListFormat[ListFormat["Braces"] = 512] = "Braces";
-        ListFormat[ListFormat["Parenthesis"] = 1024] = "Parenthesis";
-        ListFormat[ListFormat["AngleBrackets"] = 2048] = "AngleBrackets";
-        ListFormat[ListFormat["SquareBrackets"] = 4096] = "SquareBrackets";
-        ListFormat[ListFormat["BracketsMask"] = 7680] = "BracketsMask";
-        ListFormat[ListFormat["OptionalIfUndefined"] = 8192] = "OptionalIfUndefined";
-        ListFormat[ListFormat["OptionalIfEmpty"] = 16384] = "OptionalIfEmpty";
-        ListFormat[ListFormat["Optional"] = 24576] = "Optional";
-        ListFormat[ListFormat["PreferNewLine"] = 32768] = "PreferNewLine";
-        ListFormat[ListFormat["NoTrailingNewLine"] = 65536] = "NoTrailingNewLine";
-        ListFormat[ListFormat["NoInterveningComments"] = 131072] = "NoInterveningComments";
-        ListFormat[ListFormat["Modifiers"] = 256] = "Modifiers";
-        ListFormat[ListFormat["HeritageClauses"] = 256] = "HeritageClauses";
-        ListFormat[ListFormat["TypeLiteralMembers"] = 65] = "TypeLiteralMembers";
-        ListFormat[ListFormat["TupleTypeElements"] = 336] = "TupleTypeElements";
-        ListFormat[ListFormat["UnionTypeConstituents"] = 260] = "UnionTypeConstituents";
-        ListFormat[ListFormat["IntersectionTypeConstituents"] = 264] = "IntersectionTypeConstituents";
-        ListFormat[ListFormat["ObjectBindingPatternElements"] = 432] = "ObjectBindingPatternElements";
-        ListFormat[ListFormat["ArrayBindingPatternElements"] = 304] = "ArrayBindingPatternElements";
-        ListFormat[ListFormat["ObjectLiteralExpressionProperties"] = 978] = "ObjectLiteralExpressionProperties";
-        ListFormat[ListFormat["ArrayLiteralExpressionElements"] = 4466] = "ArrayLiteralExpressionElements";
-        ListFormat[ListFormat["CallExpressionArguments"] = 1296] = "CallExpressionArguments";
-        ListFormat[ListFormat["NewExpressionArguments"] = 9488] = "NewExpressionArguments";
-        ListFormat[ListFormat["TemplateExpressionSpans"] = 131072] = "TemplateExpressionSpans";
-        ListFormat[ListFormat["SingleLineBlockStatements"] = 384] = "SingleLineBlockStatements";
-        ListFormat[ListFormat["MultiLineBlockStatements"] = 65] = "MultiLineBlockStatements";
-        ListFormat[ListFormat["VariableDeclarationList"] = 272] = "VariableDeclarationList";
-        ListFormat[ListFormat["SingleLineFunctionBodyStatements"] = 384] = "SingleLineFunctionBodyStatements";
-        ListFormat[ListFormat["MultiLineFunctionBodyStatements"] = 1] = "MultiLineFunctionBodyStatements";
-        ListFormat[ListFormat["ClassHeritageClauses"] = 256] = "ClassHeritageClauses";
-        ListFormat[ListFormat["ClassMembers"] = 65] = "ClassMembers";
-        ListFormat[ListFormat["InterfaceMembers"] = 65] = "InterfaceMembers";
-        ListFormat[ListFormat["EnumMembers"] = 81] = "EnumMembers";
-        ListFormat[ListFormat["CaseBlockClauses"] = 65] = "CaseBlockClauses";
-        ListFormat[ListFormat["NamedImportsOrExportsElements"] = 432] = "NamedImportsOrExportsElements";
-        ListFormat[ListFormat["JsxElementChildren"] = 131072] = "JsxElementChildren";
-        ListFormat[ListFormat["JsxElementAttributes"] = 131328] = "JsxElementAttributes";
-        ListFormat[ListFormat["CaseOrDefaultClauseStatements"] = 81985] = "CaseOrDefaultClauseStatements";
-        ListFormat[ListFormat["HeritageClauseTypes"] = 272] = "HeritageClauseTypes";
-        ListFormat[ListFormat["SourceFileStatements"] = 65537] = "SourceFileStatements";
-        ListFormat[ListFormat["Decorators"] = 24577] = "Decorators";
-        ListFormat[ListFormat["TypeArguments"] = 26960] = "TypeArguments";
-        ListFormat[ListFormat["TypeParameters"] = 26960] = "TypeParameters";
-        ListFormat[ListFormat["Parameters"] = 1360] = "Parameters";
-        ListFormat[ListFormat["IndexSignatureParameters"] = 4432] = "IndexSignatureParameters";
-    })(ListFormat || (ListFormat = {}));
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    ts.version = "2.1.0";
+    ts.version = "2.2.0";
     var emptyArray = [];
     function findConfigFile(searchPath, fileExists, configName) {
         if (configName === void 0) { configName = "tsconfig.json"; }
@@ -48075,11 +50186,11 @@ var ts;
         }
         var resolutions = [];
         var cache = ts.createMap();
-        for (var _i = 0, names_2 = names; _i < names_2.length; _i++) {
-            var name_43 = names_2[_i];
-            var result = name_43 in cache
-                ? cache[name_43]
-                : cache[name_43] = loader(name_43, containingFile);
+        for (var _i = 0, names_1 = names; _i < names_1.length; _i++) {
+            var name_42 = names_1[_i];
+            var result = name_42 in cache
+                ? cache[name_42]
+                : cache[name_42] = loader(name_42, containingFile);
             resolutions.push(result);
         }
         return resolutions;
@@ -48093,7 +50204,7 @@ var ts;
         var classifiableNames;
         var resolvedTypeReferenceDirectives = ts.createMap();
         var fileProcessingDiagnostics = ts.createDiagnosticCollection();
-        var maxNodeModulesJsDepth = typeof options.maxNodeModuleJsDepth === "number" ? options.maxNodeModuleJsDepth : 0;
+        var maxNodeModuleJsDepth = typeof options.maxNodeModuleJsDepth === "number" ? options.maxNodeModuleJsDepth : 0;
         var currentNodeModulesDepth = 0;
         var modulesWithElidedImports = ts.createMap();
         var sourceFilesFoundSearchingNodeModules = ts.createMap();
@@ -48106,7 +50217,14 @@ var ts;
         var hasEmitBlockingDiagnostics = ts.createFileMap(getCanonicalFileName);
         var resolveModuleNamesWorker;
         if (host.resolveModuleNames) {
-            resolveModuleNamesWorker = function (moduleNames, containingFile) { return host.resolveModuleNames(moduleNames, containingFile); };
+            resolveModuleNamesWorker = function (moduleNames, containingFile) { return host.resolveModuleNames(moduleNames, containingFile).map(function (resolved) {
+                if (!resolved || resolved.extension !== undefined) {
+                    return resolved;
+                }
+                var withExtension = ts.clone(resolved);
+                withExtension.extension = ts.extensionFromPath(resolved.resolvedFileName);
+                return withExtension;
+            }); };
         }
         else {
             var loader_1 = function (moduleName, containingFile) { return ts.resolveModuleName(moduleName, containingFile, options, host).resolvedModule; };
@@ -48168,6 +50286,7 @@ var ts;
             getTypeCount: function () { return getDiagnosticsProducingTypeChecker().getTypeCount(); },
             getFileProcessingDiagnostics: function () { return fileProcessingDiagnostics; },
             getResolvedTypeReferenceDirectives: function () { return resolvedTypeReferenceDirectives; },
+            isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
             dropDiagnosticsProducingTypeChecker: dropDiagnosticsProducingTypeChecker
         };
         verifyCompilerOptions();
@@ -48175,12 +50294,13 @@ var ts;
         ts.performance.measure("Program", "beforeProgram", "afterProgram");
         return program;
         function getCommonSourceDirectory() {
-            if (typeof commonSourceDirectory === "undefined") {
-                if (options.rootDir && checkSourceFilesBelongToPath(files, options.rootDir)) {
+            if (commonSourceDirectory === undefined) {
+                var emittedFiles = ts.filterSourceFilesInDirectory(files, isSourceFileFromExternalLibrary);
+                if (options.rootDir && checkSourceFilesBelongToPath(emittedFiles, options.rootDir)) {
                     commonSourceDirectory = ts.getNormalizedAbsolutePath(options.rootDir, currentDirectory);
                 }
                 else {
-                    commonSourceDirectory = computeCommonSourceDirectory(files);
+                    commonSourceDirectory = computeCommonSourceDirectory(emittedFiles);
                 }
                 if (commonSourceDirectory && commonSourceDirectory[commonSourceDirectory.length - 1] !== ts.directorySeparator) {
                     commonSourceDirectory += ts.directorySeparator;
@@ -48199,26 +50319,85 @@ var ts;
             }
             return classifiableNames;
         }
+        function resolveModuleNamesReusingOldState(moduleNames, containingFile, file, oldProgramState) {
+            if (!oldProgramState && !file.ambientModuleNames.length) {
+                return resolveModuleNamesWorker(moduleNames, containingFile);
+            }
+            var unknownModuleNames;
+            var result;
+            var predictedToResolveToAmbientModuleMarker = {};
+            for (var i = 0; i < moduleNames.length; i++) {
+                var moduleName = moduleNames[i];
+                var isKnownToResolveToAmbientModule = false;
+                if (ts.contains(file.ambientModuleNames, moduleName)) {
+                    isKnownToResolveToAmbientModule = true;
+                    if (ts.isTraceEnabled(options, host)) {
+                        ts.trace(host, ts.Diagnostics.Module_0_was_resolved_as_locally_declared_ambient_module_in_file_1, moduleName, containingFile);
+                    }
+                }
+                else {
+                    isKnownToResolveToAmbientModule = checkModuleNameResolvedToAmbientModuleInNonModifiedFile(moduleName, oldProgramState);
+                }
+                if (isKnownToResolveToAmbientModule) {
+                    if (!unknownModuleNames) {
+                        result = new Array(moduleNames.length);
+                        unknownModuleNames = moduleNames.slice(0, i);
+                    }
+                    result[i] = predictedToResolveToAmbientModuleMarker;
+                }
+                else if (unknownModuleNames) {
+                    unknownModuleNames.push(moduleName);
+                }
+            }
+            if (!unknownModuleNames) {
+                return resolveModuleNamesWorker(moduleNames, containingFile);
+            }
+            var resolutions = unknownModuleNames.length
+                ? resolveModuleNamesWorker(unknownModuleNames, containingFile)
+                : emptyArray;
+            var j = 0;
+            for (var i = 0; i < result.length; i++) {
+                if (result[i] == predictedToResolveToAmbientModuleMarker) {
+                    result[i] = undefined;
+                }
+                else {
+                    result[i] = resolutions[j];
+                    j++;
+                }
+            }
+            ts.Debug.assert(j === resolutions.length);
+            return result;
+            function checkModuleNameResolvedToAmbientModuleInNonModifiedFile(moduleName, oldProgramState) {
+                if (!oldProgramState) {
+                    return false;
+                }
+                var resolutionToFile = ts.getResolvedModule(oldProgramState.file, moduleName);
+                if (resolutionToFile) {
+                    return false;
+                }
+                var ambientModule = oldProgram.getTypeChecker().tryFindAmbientModuleWithoutAugmentations(moduleName);
+                if (!(ambientModule && ambientModule.declarations)) {
+                    return false;
+                }
+                var firstUnmodifiedFile = ts.forEach(ambientModule.declarations, function (d) {
+                    var f = ts.getSourceFileOfNode(d);
+                    return !ts.contains(oldProgramState.modifiedFilePaths, f.path) && f;
+                });
+                if (!firstUnmodifiedFile) {
+                    return false;
+                }
+                if (ts.isTraceEnabled(options, host)) {
+                    ts.trace(host, ts.Diagnostics.Module_0_was_resolved_as_ambient_module_declared_in_1_since_this_file_was_not_modified, moduleName, firstUnmodifiedFile.fileName);
+                }
+                return true;
+            }
+        }
         function tryReuseStructureFromOldProgram() {
             if (!oldProgram) {
                 return false;
             }
             var oldOptions = oldProgram.getCompilerOptions();
-            if ((oldOptions.module !== options.module) ||
-                (oldOptions.moduleResolution !== options.moduleResolution) ||
-                (oldOptions.noResolve !== options.noResolve) ||
-                (oldOptions.target !== options.target) ||
-                (oldOptions.noLib !== options.noLib) ||
-                (oldOptions.jsx !== options.jsx) ||
-                (oldOptions.allowJs !== options.allowJs) ||
-                (oldOptions.rootDir !== options.rootDir) ||
-                (oldOptions.configFilePath !== options.configFilePath) ||
-                (oldOptions.baseUrl !== options.baseUrl) ||
-                (oldOptions.maxNodeModuleJsDepth !== options.maxNodeModuleJsDepth) ||
-                !ts.arrayIsEqualTo(oldOptions.lib, options.lib) ||
-                !ts.arrayIsEqualTo(oldOptions.typeRoots, oldOptions.typeRoots) ||
-                !ts.arrayIsEqualTo(oldOptions.rootDirs, options.rootDirs) ||
-                !ts.equalOwnProperties(oldOptions.paths, options.paths)) {
+            if (ts.changesAffectModuleResolution(oldOptions, options)) {
                 return false;
             }
             ts.Debug.assert(!oldProgram.structureIsReused);
@@ -48259,40 +50438,44 @@ var ts;
                     if (!ts.arrayIsEqualTo(oldSourceFile.typeReferenceDirectives, newSourceFile.typeReferenceDirectives, fileReferenceIsEqualTo)) {
                         return false;
                     }
-                    var newSourceFilePath = ts.getNormalizedAbsolutePath(newSourceFile.fileName, currentDirectory);
-                    if (resolveModuleNamesWorker) {
-                        var moduleNames = ts.map(ts.concatenate(newSourceFile.imports, newSourceFile.moduleAugmentations), getTextOfLiteral);
-                        var resolutions = resolveModuleNamesWorker(moduleNames, newSourceFilePath);
-                        var resolutionsChanged = ts.hasChangesInResolutions(moduleNames, resolutions, oldSourceFile.resolvedModules, ts.moduleResolutionIsEqualTo);
-                        if (resolutionsChanged) {
-                            return false;
-                        }
-                    }
-                    if (resolveTypeReferenceDirectiveNamesWorker) {
-                        var typesReferenceDirectives = ts.map(newSourceFile.typeReferenceDirectives, function (x) { return x.fileName; });
-                        var resolutions = resolveTypeReferenceDirectiveNamesWorker(typesReferenceDirectives, newSourceFilePath);
-                        var resolutionsChanged = ts.hasChangesInResolutions(typesReferenceDirectives, resolutions, oldSourceFile.resolvedTypeReferenceDirectiveNames, ts.typeDirectiveIsEqualTo);
-                        if (resolutionsChanged) {
-                            return false;
-                        }
-                    }
-                    newSourceFile.resolvedModules = oldSourceFile.resolvedModules;
-                    newSourceFile.resolvedTypeReferenceDirectiveNames = oldSourceFile.resolvedTypeReferenceDirectiveNames;
-                    modifiedSourceFiles.push(newSourceFile);
+                    modifiedSourceFiles.push({ oldFile: oldSourceFile, newFile: newSourceFile });
                 }
                 else {
                     newSourceFile = oldSourceFile;
                 }
                 newSourceFiles.push(newSourceFile);
             }
+            var modifiedFilePaths = modifiedSourceFiles.map(function (f) { return f.newFile.path; });
+            for (var _b = 0, modifiedSourceFiles_1 = modifiedSourceFiles; _b < modifiedSourceFiles_1.length; _b++) {
+                var _c = modifiedSourceFiles_1[_b], oldSourceFile = _c.oldFile, newSourceFile = _c.newFile;
+                var newSourceFilePath = ts.getNormalizedAbsolutePath(newSourceFile.fileName, currentDirectory);
+                if (resolveModuleNamesWorker) {
+                    var moduleNames = ts.map(ts.concatenate(newSourceFile.imports, newSourceFile.moduleAugmentations), getTextOfLiteral);
+                    var resolutions = resolveModuleNamesReusingOldState(moduleNames, newSourceFilePath, newSourceFile, { file: oldSourceFile, program: oldProgram, modifiedFilePaths: modifiedFilePaths });
+                    var resolutionsChanged = ts.hasChangesInResolutions(moduleNames, resolutions, oldSourceFile.resolvedModules, ts.moduleResolutionIsEqualTo);
+                    if (resolutionsChanged) {
+                        return false;
+                    }
+                }
+                if (resolveTypeReferenceDirectiveNamesWorker) {
+                    var typesReferenceDirectives = ts.map(newSourceFile.typeReferenceDirectives, function (x) { return x.fileName; });
+                    var resolutions = resolveTypeReferenceDirectiveNamesWorker(typesReferenceDirectives, newSourceFilePath);
+                    var resolutionsChanged = ts.hasChangesInResolutions(typesReferenceDirectives, resolutions, oldSourceFile.resolvedTypeReferenceDirectiveNames, ts.typeDirectiveIsEqualTo);
+                    if (resolutionsChanged) {
+                        return false;
+                    }
+                }
+                newSourceFile.resolvedModules = oldSourceFile.resolvedModules;
+                newSourceFile.resolvedTypeReferenceDirectiveNames = oldSourceFile.resolvedTypeReferenceDirectiveNames;
+            }
             for (var i = 0, len = newSourceFiles.length; i < len; i++) {
                 filesByName.set(filePaths[i], newSourceFiles[i]);
             }
             files = newSourceFiles;
             fileProcessingDiagnostics = oldProgram.getFileProcessingDiagnostics();
-            for (var _b = 0, modifiedSourceFiles_1 = modifiedSourceFiles; _b < modifiedSourceFiles_1.length; _b++) {
-                var modifiedFile = modifiedSourceFiles_1[_b];
-                fileProcessingDiagnostics.reattachFileDiagnostics(modifiedFile);
+            for (var _d = 0, modifiedSourceFiles_2 = modifiedSourceFiles; _d < modifiedSourceFiles_2.length; _d++) {
+                var modifiedFile = modifiedSourceFiles_2[_d];
+                fileProcessingDiagnostics.reattachFileDiagnostics(modifiedFile.newFile);
             }
             resolvedTypeReferenceDirectives = oldProgram.getResolvedTypeReferenceDirectives();
             oldProgram.structureIsReused = true;
@@ -48308,11 +50491,14 @@ var ts;
                 getSourceFile: program.getSourceFile,
                 getSourceFileByPath: program.getSourceFileByPath,
                 getSourceFiles: program.getSourceFiles,
-                isSourceFileFromExternalLibrary: function (file) { return !!sourceFilesFoundSearchingNodeModules[file.path]; },
+                isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
                 writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }),
                 isEmitBlocked: isEmitBlocked,
             };
         }
+        function isSourceFileFromExternalLibrary(file) {
+            return sourceFilesFoundSearchingNodeModules[file.path];
+        }
         function getDiagnosticsProducingTypeChecker() {
             return diagnosticsProducingTypeChecker || (diagnosticsProducingTypeChecker = ts.createTypeChecker(program, true));
         }
@@ -48389,6 +50575,12 @@ var ts;
             }
         }
         function getSyntacticDiagnosticsForFile(sourceFile) {
+            if (ts.isSourceFileJavaScript(sourceFile)) {
+                if (!sourceFile.additionalSyntacticDiagnostics) {
+                    sourceFile.additionalSyntacticDiagnostics = getJavaScriptSyntacticDiagnosticsForFile(sourceFile);
+                }
+                return ts.concatenate(sourceFile.additionalSyntacticDiagnostics, sourceFile.parseDiagnostics);
+            }
             return sourceFile.parseDiagnostics;
         }
         function runWithCancellationToken(func) {
@@ -48408,183 +50600,170 @@ var ts;
                 var typeChecker = getDiagnosticsProducingTypeChecker();
                 ts.Debug.assert(!!sourceFile.bindDiagnostics);
                 var bindDiagnostics = sourceFile.bindDiagnostics;
-                var checkDiagnostics = ts.isSourceFileJavaScript(sourceFile) ?
-                    getJavaScriptSemanticDiagnosticsForFile(sourceFile) :
-                    typeChecker.getDiagnostics(sourceFile, cancellationToken);
+                var checkDiagnostics = ts.isSourceFileJavaScript(sourceFile) ? [] : typeChecker.getDiagnostics(sourceFile, cancellationToken);
                 var fileProcessingDiagnosticsInFile = fileProcessingDiagnostics.getDiagnostics(sourceFile.fileName);
                 var programDiagnosticsInFile = programDiagnostics.getDiagnostics(sourceFile.fileName);
                 return bindDiagnostics.concat(checkDiagnostics, fileProcessingDiagnosticsInFile, programDiagnosticsInFile);
             });
         }
-        function getJavaScriptSemanticDiagnosticsForFile(sourceFile) {
+        function getJavaScriptSyntacticDiagnosticsForFile(sourceFile) {
             return runWithCancellationToken(function () {
                 var diagnostics = [];
+                var parent = sourceFile;
                 walk(sourceFile);
                 return diagnostics;
                 function walk(node) {
-                    if (!node) {
-                        return false;
-                    }
-                    switch (node.kind) {
-                        case 230:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.import_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 236:
-                            if (node.isExportEquals) {
-                                diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.export_can_only_be_used_in_a_ts_file));
-                                return true;
-                            }
-                            break;
-                        case 222:
-                            var classDeclaration = node;
-                            if (checkModifiers(classDeclaration.modifiers) ||
-                                checkTypeParameters(classDeclaration.typeParameters)) {
-                                return true;
-                            }
-                            break;
-                        case 251:
-                            var heritageClause = node;
-                            if (heritageClause.token === 107) {
-                                diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.implements_clauses_can_only_be_used_in_a_ts_file));
-                                return true;
-                            }
-                            break;
-                        case 223:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.interface_declarations_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 226:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.module_declarations_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 224:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.type_aliases_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 148:
+                    switch (parent.kind) {
+                        case 144:
                         case 147:
+                            if (parent.questionToken === node) {
+                                diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, "?"));
+                                return;
+                            }
                         case 149:
+                        case 148:
                         case 150:
                         case 151:
-                        case 180:
-                        case 221:
-                        case 181:
-                        case 221:
-                            var functionDeclaration = node;
-                            if (checkModifiers(functionDeclaration.modifiers) ||
-                                checkTypeParameters(functionDeclaration.typeParameters) ||
-                                checkTypeAnnotation(functionDeclaration.type)) {
-                                return true;
+                        case 152:
+                        case 184:
+                        case 225:
+                        case 185:
+                        case 225:
+                        case 223:
+                            if (parent.type === node) {
+                                diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.types_can_only_be_used_in_a_ts_file));
+                                return;
+                            }
+                    }
+                    switch (node.kind) {
+                        case 234:
+                            diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.import_can_only_be_used_in_a_ts_file));
+                            return;
+                        case 240:
+                            if (node.isExportEquals) {
+                                diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.export_can_only_be_used_in_a_ts_file));
+                                return;
                             }
                             break;
-                        case 201:
-                            var variableStatement = node;
-                            if (checkModifiers(variableStatement.modifiers)) {
-                                return true;
+                        case 255:
+                            var heritageClause = node;
+                            if (heritageClause.token === 107) {
+                                diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.implements_clauses_can_only_be_used_in_a_ts_file));
+                                return;
                             }
                             break;
-                        case 219:
-                            var variableDeclaration = node;
-                            if (checkTypeAnnotation(variableDeclaration.type)) {
-                                return true;
+                        case 227:
+                            diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.interface_declarations_can_only_be_used_in_a_ts_file));
+                            return;
+                        case 230:
+                            diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.module_declarations_can_only_be_used_in_a_ts_file));
+                            return;
+                        case 228:
+                            diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.type_aliases_can_only_be_used_in_a_ts_file));
+                            return;
+                        case 229:
+                            diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.enum_declarations_can_only_be_used_in_a_ts_file));
+                            return;
+                        case 182:
+                            var typeAssertionExpression = node;
+                            diagnostics.push(createDiagnosticForNode(typeAssertionExpression.type, ts.Diagnostics.type_assertion_expressions_can_only_be_used_in_a_ts_file));
+                            return;
+                    }
+                    var prevParent = parent;
+                    parent = node;
+                    ts.forEachChild(node, walk, walkArray);
+                    parent = prevParent;
+                }
+                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));
+                    }
+                    switch (parent.kind) {
+                        case 226:
+                        case 149:
+                        case 148:
+                        case 150:
+                        case 151:
+                        case 152:
+                        case 184:
+                        case 225:
+                        case 185:
+                        case 225:
+                            if (nodes === parent.typeParameters) {
+                                diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.type_parameter_declarations_can_only_be_used_in_a_ts_file));
+                                return;
+                            }
+                        case 205:
+                            if (nodes === parent.modifiers) {
+                                return checkModifiers(nodes, parent.kind === 205);
                             }
                             break;
-                        case 175:
-                        case 176:
-                            var expression = node;
-                            if (expression.typeArguments && expression.typeArguments.length > 0) {
-                                var start = expression.typeArguments.pos;
-                                diagnostics.push(ts.createFileDiagnostic(sourceFile, start, expression.typeArguments.end - start, ts.Diagnostics.type_arguments_can_only_be_used_in_a_ts_file));
-                                return true;
-                            }
-                            break;
-                        case 143:
-                            var parameter = node;
-                            if (parameter.modifiers) {
-                                var start = parameter.modifiers.pos;
-                                diagnostics.push(ts.createFileDiagnostic(sourceFile, start, parameter.modifiers.end - start, ts.Diagnostics.parameter_modifiers_can_only_be_used_in_a_ts_file));
-                                return true;
-                            }
-                            if (parameter.questionToken) {
-                                diagnostics.push(ts.createDiagnosticForNode(parameter.questionToken, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, "?"));
-                                return true;
-                            }
-                            if (parameter.type) {
-                                diagnostics.push(ts.createDiagnosticForNode(parameter.type, ts.Diagnostics.types_can_only_be_used_in_a_ts_file));
-                                return true;
-                            }
-                            break;
-                        case 146:
-                            var propertyDeclaration = node;
-                            if (propertyDeclaration.modifiers) {
-                                for (var _i = 0, _a = propertyDeclaration.modifiers; _i < _a.length; _i++) {
+                        case 147:
+                            if (nodes === parent.modifiers) {
+                                for (var _i = 0, _a = nodes; _i < _a.length; _i++) {
                                     var modifier = _a[_i];
                                     if (modifier.kind !== 114) {
-                                        diagnostics.push(ts.createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
-                                        return true;
+                                        diagnostics.push(createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
                                     }
                                 }
-                            }
-                            if (checkTypeAnnotation(node.type)) {
-                                return true;
+                                return;
                             }
                             break;
-                        case 225:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.enum_declarations_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 178:
-                            var typeAssertionExpression = node;
-                            diagnostics.push(ts.createDiagnosticForNode(typeAssertionExpression.type, ts.Diagnostics.type_assertion_expressions_can_only_be_used_in_a_ts_file));
-                            return true;
                         case 144:
-                            if (!options.experimentalDecorators) {
-                                diagnostics.push(ts.createDiagnosticForNode(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));
+                            if (nodes === parent.modifiers) {
+                                diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.parameter_modifiers_can_only_be_used_in_a_ts_file));
+                                return;
                             }
-                            return true;
-                    }
-                    return ts.forEachChild(node, walk);
-                }
-                function checkTypeParameters(typeParameters) {
-                    if (typeParameters) {
-                        var start = typeParameters.pos;
-                        diagnostics.push(ts.createFileDiagnostic(sourceFile, start, typeParameters.end - start, ts.Diagnostics.type_parameter_declarations_can_only_be_used_in_a_ts_file));
-                        return true;
-                    }
-                    return false;
-                }
-                function checkTypeAnnotation(type) {
-                    if (type) {
-                        diagnostics.push(ts.createDiagnosticForNode(type, ts.Diagnostics.types_can_only_be_used_in_a_ts_file));
-                        return true;
-                    }
-                    return false;
-                }
-                function checkModifiers(modifiers) {
-                    if (modifiers) {
-                        for (var _i = 0, modifiers_1 = modifiers; _i < modifiers_1.length; _i++) {
-                            var modifier = modifiers_1[_i];
-                            switch (modifier.kind) {
-                                case 113:
-                                case 111:
-                                case 112:
-                                case 129:
-                                case 123:
-                                    diagnostics.push(ts.createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
-                                    return true;
-                                case 114:
-                                case 83:
-                                case 75:
-                                case 78:
-                                case 116:
+                            break;
+                        case 179:
+                        case 180:
+                        case 199:
+                            if (nodes === parent.typeArguments) {
+                                diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.type_arguments_can_only_be_used_in_a_ts_file));
+                                return;
                             }
+                            break;
+                    }
+                    for (var _b = 0, nodes_4 = nodes; _b < nodes_4.length; _b++) {
+                        var node = nodes_4[_b];
+                        walk(node);
+                    }
+                }
+                function checkModifiers(modifiers, isConstValid) {
+                    for (var _i = 0, modifiers_1 = modifiers; _i < modifiers_1.length; _i++) {
+                        var modifier = modifiers_1[_i];
+                        switch (modifier.kind) {
+                            case 75:
+                                if (isConstValid) {
+                                    continue;
+                                }
+                            case 113:
+                            case 111:
+                            case 112:
+                            case 130:
+                            case 123:
+                            case 116:
+                                diagnostics.push(createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
+                                break;
+                            case 114:
+                            case 83:
+                            case 78:
                         }
                     }
-                    return false;
+                }
+                function createDiagnosticForNodeArray(nodes, message, arg0, arg1, arg2) {
+                    var start = nodes.pos;
+                    return ts.createFileDiagnostic(sourceFile, start, nodes.end - start, message, arg0, arg1, arg2);
+                }
+                function createDiagnosticForNode(node, message, arg0, arg1, arg2) {
+                    return ts.createDiagnosticForNodeInSourceFile(sourceFile, node, message, arg0, arg1, arg2);
                 }
             });
         }
         function getDeclarationDiagnosticsWorker(sourceFile, cancellationToken) {
             return runWithCancellationToken(function () {
                 var resolver = getDiagnosticsProducingTypeChecker().getEmitResolver(sourceFile, cancellationToken);
-                var writeFile = function () { };
-                return ts.getDeclarationDiagnostics(getEmitHost(writeFile), resolver, sourceFile);
+                return ts.getDeclarationDiagnostics(getEmitHost(ts.noop), resolver, sourceFile);
             });
         }
         function getDeclarationDiagnosticsForFile(sourceFile, cancellationToken) {
@@ -48601,9 +50780,6 @@ var ts;
             ts.addRange(allDiagnostics, getDiagnosticsProducingTypeChecker().getGlobalDiagnostics());
             return ts.sortAndDeduplicateDiagnostics(allDiagnostics);
         }
-        function hasExtension(fileName) {
-            return ts.getBaseFileName(fileName).indexOf(".") >= 0;
-        }
         function processRootFile(fileName, isDefaultLib) {
             processSourceFile(ts.normalizePath(fileName), isDefaultLib);
         }
@@ -48622,14 +50798,18 @@ var ts;
             }
             var isJavaScriptFile = ts.isSourceFileJavaScript(file);
             var isExternalModuleFile = ts.isExternalModule(file);
+            var isDtsFile = ts.isDeclarationFile(file);
             var imports;
             var moduleAugmentations;
+            var ambientModules;
             if (options.importHelpers
                 && (options.isolatedModules || isExternalModuleFile)
                 && !file.isDeclarationFile) {
-                var externalHelpersModuleReference = ts.createNode(9);
+                var externalHelpersModuleReference = ts.createSynthesizedNode(9);
                 externalHelpersModuleReference.text = ts.externalHelpersModuleNameText;
-                externalHelpersModuleReference.parent = file;
+                var importDecl = ts.createSynthesizedNode(235);
+                importDecl.parent = file;
+                externalHelpersModuleReference.parent = importDecl;
                 imports = [externalHelpersModuleReference];
             }
             for (var _i = 0, _a = file.statements; _i < _a.length; _i++) {
@@ -48641,12 +50821,13 @@ var ts;
             }
             file.imports = imports || emptyArray;
             file.moduleAugmentations = moduleAugmentations || emptyArray;
+            file.ambientModuleNames = ambientModules || emptyArray;
             return;
             function collectModuleReferences(node, inAmbientModule) {
                 switch (node.kind) {
-                    case 231:
-                    case 230:
-                    case 237:
+                    case 235:
+                    case 234:
+                    case 241:
                         var moduleNameExpr = ts.getExternalModuleName(node);
                         if (!moduleNameExpr || moduleNameExpr.kind !== 9) {
                             break;
@@ -48658,13 +50839,16 @@ var ts;
                             (imports || (imports = [])).push(moduleNameExpr);
                         }
                         break;
-                    case 226:
+                    case 230:
                         if (ts.isAmbientModule(node) && (inAmbientModule || ts.hasModifier(node, 2) || ts.isDeclarationFile(file))) {
                             var moduleName = node.name;
                             if (isExternalModuleFile || (inAmbientModule && !ts.isExternalModuleNameRelative(moduleName.text))) {
                                 (moduleAugmentations || (moduleAugmentations = [])).push(moduleName);
                             }
                             else if (!inAmbientModule) {
+                                if (isDtsFile) {
+                                    (ambientModules || (ambientModules = [])).push(moduleName.text);
+                                }
                                 var body = node.body;
                                 if (body) {
                                     for (var _i = 0, _a = body.statements; _i < _a.length; _i++) {
@@ -48688,7 +50872,7 @@ var ts;
         function processSourceFile(fileName, isDefaultLib, refFile, refPos, refEnd) {
             var diagnosticArgument;
             var diagnostic;
-            if (hasExtension(fileName)) {
+            if (ts.hasExtension(fileName)) {
                 if (!options.allowNonTsExtensions && !ts.forEach(supportedExtensions, function (extension) { return ts.fileExtensionIs(host.getCanonicalFileName(fileName), extension); })) {
                     diagnostic = ts.Diagnostics.File_0_has_unsupported_extension_The_only_supported_extensions_are_1;
                     diagnosticArgument = [fileName, "'" + supportedExtensions.join("', '") + "'"];
@@ -48749,7 +50933,7 @@ var ts;
                     processImportedModules(file_1);
                 }
                 else if (file_1 && modulesWithElidedImports[file_1.path]) {
-                    if (currentNodeModulesDepth < maxNodeModulesJsDepth) {
+                    if (currentNodeModulesDepth < maxNodeModuleJsDepth) {
                         modulesWithElidedImports[file_1.path] = false;
                         processImportedModules(file_1);
                     }
@@ -48821,9 +51005,11 @@ var ts;
                 }
                 else {
                     if (previousResolution) {
-                        var otherFileText = host.readFile(resolvedTypeReferenceDirective.resolvedFileName);
-                        if (otherFileText !== getSourceFile(previousResolution.resolvedFileName).text) {
-                            fileProcessingDiagnostics.add(createDiagnostic(refFile, refPos, refEnd, ts.Diagnostics.Conflicting_definitions_for_0_found_at_1_and_2_Consider_installing_a_specific_version_of_this_library_to_resolve_the_conflict, typeReferenceDirective, resolvedTypeReferenceDirective.resolvedFileName, previousResolution.resolvedFileName));
+                        if (resolvedTypeReferenceDirective.resolvedFileName !== previousResolution.resolvedFileName) {
+                            var otherFileText = host.readFile(resolvedTypeReferenceDirective.resolvedFileName);
+                            if (otherFileText !== getSourceFile(previousResolution.resolvedFileName).text) {
+                                fileProcessingDiagnostics.add(createDiagnostic(refFile, refPos, refEnd, ts.Diagnostics.Conflicting_definitions_for_0_found_at_1_and_2_Consider_installing_a_specific_version_of_this_library_to_resolve_the_conflict, typeReferenceDirective, resolvedTypeReferenceDirective.resolvedFileName, previousResolution.resolvedFileName));
+                            }
                         }
                         saveResolution = false;
                     }
@@ -48858,23 +51044,31 @@ var ts;
             collectExternalModuleReferences(file);
             if (file.imports.length || file.moduleAugmentations.length) {
                 file.resolvedModules = ts.createMap();
-                var moduleNames = ts.map(ts.concatenate(file.imports, file.moduleAugmentations), getTextOfLiteral);
-                var resolutions = resolveModuleNamesWorker(moduleNames, ts.getNormalizedAbsolutePath(file.fileName, currentDirectory));
+                var nonGlobalAugmentation = ts.filter(file.moduleAugmentations, function (moduleAugmentation) { return moduleAugmentation.kind === 9; });
+                var moduleNames = ts.map(ts.concatenate(file.imports, nonGlobalAugmentation), getTextOfLiteral);
+                var resolutions = resolveModuleNamesReusingOldState(moduleNames, ts.getNormalizedAbsolutePath(file.fileName, currentDirectory), file);
+                ts.Debug.assert(resolutions.length === moduleNames.length);
                 for (var i = 0; i < moduleNames.length; i++) {
                     var resolution = resolutions[i];
                     ts.setResolvedModule(file, moduleNames[i], resolution);
-                    var isFromNodeModulesSearch = resolution && resolution.isExternalLibraryImport;
-                    var isJsFileFromNodeModules = isFromNodeModulesSearch && ts.hasJavaScriptFileExtension(resolution.resolvedFileName);
+                    if (!resolution) {
+                        continue;
+                    }
+                    var isFromNodeModulesSearch = resolution.isExternalLibraryImport;
+                    var isJsFileFromNodeModules = isFromNodeModulesSearch && !ts.extensionIsTypeScript(resolution.extension);
+                    var resolvedFileName = resolution.resolvedFileName;
                     if (isFromNodeModulesSearch) {
                         currentNodeModulesDepth++;
                     }
-                    var elideImport = isJsFileFromNodeModules && currentNodeModulesDepth > maxNodeModulesJsDepth;
-                    var shouldAddFile = resolution && !options.noResolve && i < file.imports.length && !elideImport;
+                    var elideImport = isJsFileFromNodeModules && currentNodeModulesDepth > maxNodeModuleJsDepth;
+                    var shouldAddFile = resolvedFileName && !getResolutionDiagnostic(options, resolution) && !options.noResolve && i < file.imports.length && !elideImport;
                     if (elideImport) {
                         modulesWithElidedImports[file.path] = true;
                     }
                     else if (shouldAddFile) {
-                        findSourceFile(resolution.resolvedFileName, ts.toPath(resolution.resolvedFileName, currentDirectory, getCanonicalFileName), false, file, ts.skipTrivia(file.text, file.imports[i].pos), file.imports[i].end);
+                        var path = ts.toPath(resolvedFileName, currentDirectory, getCanonicalFileName);
+                        var pos = ts.skipTrivia(file.text, file.imports[i].pos);
+                        findSourceFile(resolvedFileName, path, false, file, pos, file.imports[i].end);
                     }
                     if (isFromNodeModulesSearch) {
                         currentNodeModulesDepth--;
@@ -48884,7 +51078,6 @@ var ts;
             else {
                 file.resolvedModules = undefined;
             }
-            return;
         }
         function computeCommonSourceDirectory(sourceFiles) {
             var fileNames = [];
@@ -49038,7 +51231,15 @@ var ts;
                 !options.experimentalDecorators) {
                 programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "emitDecoratorMetadata", "experimentalDecorators"));
             }
-            if (options.reactNamespace && !ts.isIdentifierText(options.reactNamespace, languageVersion)) {
+            if (options.jsxFactory) {
+                if (options.reactNamespace) {
+                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "reactNamespace", "jsxFactory"));
+                }
+                if (!ts.parseIsolatedEntityName(options.jsxFactory, languageVersion)) {
+                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Invalid_value_for_jsxFactory_0_is_not_a_valid_identifier_or_qualified_name, options.jsxFactory));
+                }
+            }
+            else if (options.reactNamespace && !ts.isIdentifierText(options.reactNamespace, languageVersion)) {
                 programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Invalid_value_for_reactNamespace_0_is_not_a_valid_identifier, options.reactNamespace));
             }
             if (!options.noEmit && !options.suppressOutputPathCheck) {
@@ -49053,10 +51254,15 @@ var ts;
                 if (emitFileName) {
                     var emitFilePath = ts.toPath(emitFileName, currentDirectory, getCanonicalFileName);
                     if (filesByName.contains(emitFilePath)) {
-                        createEmitBlockingDiagnostics(emitFileName, ts.Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file);
+                        var chain_1;
+                        if (!options.configFilePath) {
+                            chain_1 = 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_1 = ts.chainDiagnosticMessages(chain_1, ts.Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
+                        blockEmittingOfFile(emitFileName, ts.createCompilerDiagnosticFromMessageChain(chain_1));
                     }
                     if (emitFilesSeen.contains(emitFilePath)) {
-                        createEmitBlockingDiagnostics(emitFileName, ts.Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files);
+                        blockEmittingOfFile(emitFileName, ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files, emitFileName));
                     }
                     else {
                         emitFilesSeen.set(emitFilePath, true);
@@ -49064,1096 +51270,33 @@ var ts;
                 }
             }
         }
-        function createEmitBlockingDiagnostics(emitFileName, message) {
+        function blockEmittingOfFile(emitFileName, diag) {
             hasEmitBlockingDiagnostics.set(ts.toPath(emitFileName, currentDirectory, getCanonicalFileName), true);
-            programDiagnostics.add(ts.createCompilerDiagnostic(message, emitFileName));
+            programDiagnostics.add(diag);
         }
     }
     ts.createProgram = createProgram;
-})(ts || (ts = {}));
-var ts;
-(function (ts) {
-    ts.compileOnSaveCommandLineOption = { name: "compileOnSave", type: "boolean" };
-    ts.optionDeclarations = [
-        {
-            name: "charset",
-            type: "string",
-        },
-        ts.compileOnSaveCommandLineOption,
-        {
-            name: "declaration",
-            shortName: "d",
-            type: "boolean",
-            description: ts.Diagnostics.Generates_corresponding_d_ts_file,
-        },
-        {
-            name: "declarationDir",
-            type: "string",
-            isFilePath: true,
-            paramType: ts.Diagnostics.DIRECTORY,
-        },
-        {
-            name: "diagnostics",
-            type: "boolean",
-        },
-        {
-            name: "extendedDiagnostics",
-            type: "boolean",
-            experimental: true
-        },
-        {
-            name: "emitBOM",
-            type: "boolean"
-        },
-        {
-            name: "help",
-            shortName: "h",
-            type: "boolean",
-            description: ts.Diagnostics.Print_this_message,
-        },
-        {
-            name: "help",
-            shortName: "?",
-            type: "boolean"
-        },
-        {
-            name: "init",
-            type: "boolean",
-            description: ts.Diagnostics.Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file,
-        },
-        {
-            name: "inlineSourceMap",
-            type: "boolean",
-        },
-        {
-            name: "inlineSources",
-            type: "boolean",
-        },
-        {
-            name: "jsx",
-            type: ts.createMap({
-                "preserve": 1,
-                "react": 2
-            }),
-            paramType: ts.Diagnostics.KIND,
-            description: ts.Diagnostics.Specify_JSX_code_generation_Colon_preserve_or_react,
-        },
-        {
-            name: "reactNamespace",
-            type: "string",
-            description: ts.Diagnostics.Specify_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit
-        },
-        {
-            name: "listFiles",
-            type: "boolean",
-        },
-        {
-            name: "locale",
-            type: "string",
-        },
-        {
-            name: "mapRoot",
-            type: "string",
-            isFilePath: true,
-            description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations,
-            paramType: ts.Diagnostics.LOCATION,
-        },
-        {
-            name: "module",
-            shortName: "m",
-            type: ts.createMap({
-                "none": ts.ModuleKind.None,
-                "commonjs": ts.ModuleKind.CommonJS,
-                "amd": ts.ModuleKind.AMD,
-                "system": ts.ModuleKind.System,
-                "umd": ts.ModuleKind.UMD,
-                "es6": ts.ModuleKind.ES2015,
-                "es2015": ts.ModuleKind.ES2015,
-            }),
-            description: ts.Diagnostics.Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015,
-            paramType: ts.Diagnostics.KIND,
-        },
-        {
-            name: "newLine",
-            type: ts.createMap({
-                "crlf": 0,
-                "lf": 1
-            }),
-            description: ts.Diagnostics.Specify_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix,
-            paramType: ts.Diagnostics.NEWLINE,
-        },
-        {
-            name: "noEmit",
-            type: "boolean",
-            description: ts.Diagnostics.Do_not_emit_outputs,
-        },
-        {
-            name: "noEmitHelpers",
-            type: "boolean"
-        },
-        {
-            name: "noEmitOnError",
-            type: "boolean",
-            description: ts.Diagnostics.Do_not_emit_outputs_if_any_errors_were_reported,
-        },
-        {
-            name: "noErrorTruncation",
-            type: "boolean"
-        },
-        {
-            name: "noImplicitAny",
-            type: "boolean",
-            description: ts.Diagnostics.Raise_error_on_expressions_and_declarations_with_an_implied_any_type,
-        },
-        {
-            name: "noImplicitThis",
-            type: "boolean",
-            description: ts.Diagnostics.Raise_error_on_this_expressions_with_an_implied_any_type,
-        },
-        {
-            name: "noUnusedLocals",
-            type: "boolean",
-            description: ts.Diagnostics.Report_errors_on_unused_locals,
-        },
-        {
-            name: "noUnusedParameters",
-            type: "boolean",
-            description: ts.Diagnostics.Report_errors_on_unused_parameters,
-        },
-        {
-            name: "noLib",
-            type: "boolean",
-        },
-        {
-            name: "noResolve",
-            type: "boolean",
-        },
-        {
-            name: "skipDefaultLibCheck",
-            type: "boolean",
-        },
-        {
-            name: "skipLibCheck",
-            type: "boolean",
-            description: ts.Diagnostics.Skip_type_checking_of_declaration_files,
-        },
-        {
-            name: "out",
-            type: "string",
-            isFilePath: false,
-            paramType: ts.Diagnostics.FILE,
-        },
-        {
-            name: "outFile",
-            type: "string",
-            isFilePath: true,
-            description: ts.Diagnostics.Concatenate_and_emit_output_to_single_file,
-            paramType: ts.Diagnostics.FILE,
-        },
-        {
-            name: "outDir",
-            type: "string",
-            isFilePath: true,
-            description: ts.Diagnostics.Redirect_output_structure_to_the_directory,
-            paramType: ts.Diagnostics.DIRECTORY,
-        },
-        {
-            name: "preserveConstEnums",
-            type: "boolean",
-            description: ts.Diagnostics.Do_not_erase_const_enum_declarations_in_generated_code
-        },
-        {
-            name: "pretty",
-            description: ts.Diagnostics.Stylize_errors_and_messages_using_color_and_context_experimental,
-            type: "boolean"
-        },
-        {
-            name: "project",
-            shortName: "p",
-            type: "string",
-            isFilePath: true,
-            description: ts.Diagnostics.Compile_the_project_in_the_given_directory,
-            paramType: ts.Diagnostics.DIRECTORY
-        },
-        {
-            name: "removeComments",
-            type: "boolean",
-            description: ts.Diagnostics.Do_not_emit_comments_to_output,
-        },
-        {
-            name: "rootDir",
-            type: "string",
-            isFilePath: true,
-            paramType: ts.Diagnostics.LOCATION,
-            description: ts.Diagnostics.Specify_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir,
-        },
-        {
-            name: "isolatedModules",
-            type: "boolean",
-        },
-        {
-            name: "sourceMap",
-            type: "boolean",
-            description: ts.Diagnostics.Generates_corresponding_map_file,
-        },
-        {
-            name: "sourceRoot",
-            type: "string",
-            isFilePath: true,
-            description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations,
-            paramType: ts.Diagnostics.LOCATION,
-        },
-        {
-            name: "suppressExcessPropertyErrors",
-            type: "boolean",
-            description: ts.Diagnostics.Suppress_excess_property_checks_for_object_literals,
-            experimental: true
-        },
-        {
-            name: "suppressImplicitAnyIndexErrors",
-            type: "boolean",
-            description: ts.Diagnostics.Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures,
-        },
-        {
-            name: "stripInternal",
-            type: "boolean",
-            description: ts.Diagnostics.Do_not_emit_declarations_for_code_that_has_an_internal_annotation,
-            experimental: true
-        },
-        {
-            name: "target",
-            shortName: "t",
-            type: ts.createMap({
-                "es3": 0,
-                "es5": 1,
-                "es6": 2,
-                "es2015": 2,
-                "es2016": 3,
-                "es2017": 4,
-            }),
-            description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015,
-            paramType: ts.Diagnostics.VERSION,
-        },
-        {
-            name: "version",
-            shortName: "v",
-            type: "boolean",
-            description: ts.Diagnostics.Print_the_compiler_s_version,
-        },
-        {
-            name: "watch",
-            shortName: "w",
-            type: "boolean",
-            description: ts.Diagnostics.Watch_input_files,
-        },
-        {
-            name: "experimentalDecorators",
-            type: "boolean",
-            description: ts.Diagnostics.Enables_experimental_support_for_ES7_decorators
-        },
-        {
-            name: "emitDecoratorMetadata",
-            type: "boolean",
-            experimental: true,
-            description: ts.Diagnostics.Enables_experimental_support_for_emitting_type_metadata_for_decorators
-        },
-        {
-            name: "moduleResolution",
-            type: ts.createMap({
-                "node": ts.ModuleResolutionKind.NodeJs,
-                "classic": ts.ModuleResolutionKind.Classic,
-            }),
-            description: ts.Diagnostics.Specify_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6,
-            paramType: ts.Diagnostics.STRATEGY,
-        },
-        {
-            name: "allowUnusedLabels",
-            type: "boolean",
-            description: ts.Diagnostics.Do_not_report_errors_on_unused_labels
-        },
-        {
-            name: "noImplicitReturns",
-            type: "boolean",
-            description: ts.Diagnostics.Report_error_when_not_all_code_paths_in_function_return_a_value
-        },
-        {
-            name: "noFallthroughCasesInSwitch",
-            type: "boolean",
-            description: ts.Diagnostics.Report_errors_for_fallthrough_cases_in_switch_statement
-        },
-        {
-            name: "allowUnreachableCode",
-            type: "boolean",
-            description: ts.Diagnostics.Do_not_report_errors_on_unreachable_code
-        },
-        {
-            name: "forceConsistentCasingInFileNames",
-            type: "boolean",
-            description: ts.Diagnostics.Disallow_inconsistently_cased_references_to_the_same_file
-        },
-        {
-            name: "baseUrl",
-            type: "string",
-            isFilePath: true,
-            description: ts.Diagnostics.Base_directory_to_resolve_non_absolute_module_names
-        },
-        {
-            name: "paths",
-            type: "object",
-            isTSConfigOnly: true
-        },
-        {
-            name: "rootDirs",
-            type: "list",
-            isTSConfigOnly: true,
-            element: {
-                name: "rootDirs",
-                type: "string",
-                isFilePath: true
-            }
-        },
-        {
-            name: "typeRoots",
-            type: "list",
-            element: {
-                name: "typeRoots",
-                type: "string",
-                isFilePath: true
-            }
-        },
-        {
-            name: "types",
-            type: "list",
-            element: {
-                name: "types",
-                type: "string"
-            },
-            description: ts.Diagnostics.Type_declaration_files_to_be_included_in_compilation
-        },
-        {
-            name: "traceResolution",
-            type: "boolean",
-            description: ts.Diagnostics.Enable_tracing_of_the_name_resolution_process
-        },
-        {
-            name: "allowJs",
-            type: "boolean",
-            description: ts.Diagnostics.Allow_javascript_files_to_be_compiled
-        },
-        {
-            name: "allowSyntheticDefaultImports",
-            type: "boolean",
-            description: ts.Diagnostics.Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typechecking
-        },
-        {
-            name: "noImplicitUseStrict",
-            type: "boolean",
-            description: ts.Diagnostics.Do_not_emit_use_strict_directives_in_module_output
-        },
-        {
-            name: "maxNodeModuleJsDepth",
-            type: "number",
-            description: ts.Diagnostics.The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files
-        },
-        {
-            name: "listEmittedFiles",
-            type: "boolean"
-        },
-        {
-            name: "lib",
-            type: "list",
-            element: {
-                name: "lib",
-                type: ts.createMap({
-                    "es5": "lib.es5.d.ts",
-                    "es6": "lib.es2015.d.ts",
-                    "es2015": "lib.es2015.d.ts",
-                    "es7": "lib.es2016.d.ts",
-                    "es2016": "lib.es2016.d.ts",
-                    "es2017": "lib.es2017.d.ts",
-                    "dom": "lib.dom.d.ts",
-                    "dom.iterable": "lib.dom.iterable.d.ts",
-                    "webworker": "lib.webworker.d.ts",
-                    "scripthost": "lib.scripthost.d.ts",
-                    "es2015.core": "lib.es2015.core.d.ts",
-                    "es2015.collection": "lib.es2015.collection.d.ts",
-                    "es2015.generator": "lib.es2015.generator.d.ts",
-                    "es2015.iterable": "lib.es2015.iterable.d.ts",
-                    "es2015.promise": "lib.es2015.promise.d.ts",
-                    "es2015.proxy": "lib.es2015.proxy.d.ts",
-                    "es2015.reflect": "lib.es2015.reflect.d.ts",
-                    "es2015.symbol": "lib.es2015.symbol.d.ts",
-                    "es2015.symbol.wellknown": "lib.es2015.symbol.wellknown.d.ts",
-                    "es2016.array.include": "lib.es2016.array.include.d.ts",
-                    "es2017.object": "lib.es2017.object.d.ts",
-                    "es2017.sharedmemory": "lib.es2017.sharedmemory.d.ts"
-                }),
-            },
-            description: ts.Diagnostics.Specify_library_files_to_be_included_in_the_compilation_Colon
-        },
-        {
-            name: "disableSizeLimit",
-            type: "boolean"
-        },
-        {
-            name: "strictNullChecks",
-            type: "boolean",
-            description: ts.Diagnostics.Enable_strict_null_checks
-        },
-        {
-            name: "importHelpers",
-            type: "boolean",
-            description: ts.Diagnostics.Import_emit_helpers_from_tslib
-        },
-        {
-            name: "alwaysStrict",
-            type: "boolean",
-            description: ts.Diagnostics.Parse_in_strict_mode_and_emit_use_strict_for_each_source_file
-        }
-    ];
-    ts.typingOptionDeclarations = [
-        {
-            name: "enableAutoDiscovery",
-            type: "boolean",
-        },
-        {
-            name: "include",
-            type: "list",
-            element: {
-                name: "include",
-                type: "string"
-            }
-        },
-        {
-            name: "exclude",
-            type: "list",
-            element: {
-                name: "exclude",
-                type: "string"
-            }
-        }
-    ];
-    ts.defaultInitCompilerOptions = {
-        module: ts.ModuleKind.CommonJS,
-        target: 1,
-        noImplicitAny: false,
-        sourceMap: false,
-    };
-    var optionNameMapCache;
-    function getOptionNameMap() {
-        if (optionNameMapCache) {
-            return optionNameMapCache;
-        }
-        var optionNameMap = ts.createMap();
-        var shortOptionNames = ts.createMap();
-        ts.forEach(ts.optionDeclarations, function (option) {
-            optionNameMap[option.name.toLowerCase()] = option;
-            if (option.shortName) {
-                shortOptionNames[option.shortName] = option.name;
-            }
-        });
-        optionNameMapCache = { optionNameMap: optionNameMap, shortOptionNames: shortOptionNames };
-        return optionNameMapCache;
-    }
-    ts.getOptionNameMap = getOptionNameMap;
-    function createCompilerDiagnosticForInvalidCustomType(opt) {
-        var namesOfType = Object.keys(opt.type).map(function (key) { return "'" + key + "'"; }).join(", ");
-        return ts.createCompilerDiagnostic(ts.Diagnostics.Argument_for_0_option_must_be_Colon_1, "--" + opt.name, namesOfType);
-    }
-    ts.createCompilerDiagnosticForInvalidCustomType = createCompilerDiagnosticForInvalidCustomType;
-    function parseCustomTypeOption(opt, value, errors) {
-        var key = trimString((value || "")).toLowerCase();
-        var map = opt.type;
-        if (key in map) {
-            return map[key];
-        }
-        else {
-            errors.push(createCompilerDiagnosticForInvalidCustomType(opt));
-        }
-    }
-    ts.parseCustomTypeOption = parseCustomTypeOption;
-    function parseListTypeOption(opt, value, errors) {
-        if (value === void 0) { value = ""; }
-        value = trimString(value);
-        if (ts.startsWith(value, "-")) {
-            return undefined;
-        }
-        if (value === "") {
-            return [];
-        }
-        var values = value.split(",");
-        switch (opt.element.type) {
-            case "number":
-                return ts.map(values, parseInt);
-            case "string":
-                return ts.map(values, function (v) { return v || ""; });
-            default:
-                return ts.filter(ts.map(values, function (v) { return parseCustomTypeOption(opt.element, v, errors); }), function (v) { return !!v; });
-        }
-    }
-    ts.parseListTypeOption = parseListTypeOption;
-    function parseCommandLine(commandLine, readFile) {
-        var options = {};
-        var fileNames = [];
-        var errors = [];
-        var _a = getOptionNameMap(), optionNameMap = _a.optionNameMap, shortOptionNames = _a.shortOptionNames;
-        parseStrings(commandLine);
-        return {
-            options: options,
-            fileNames: fileNames,
-            errors: errors
-        };
-        function parseStrings(args) {
-            var i = 0;
-            while (i < args.length) {
-                var s = args[i];
-                i++;
-                if (s.charCodeAt(0) === 64) {
-                    parseResponseFile(s.slice(1));
-                }
-                else if (s.charCodeAt(0) === 45) {
-                    s = s.slice(s.charCodeAt(1) === 45 ? 2 : 1).toLowerCase();
-                    if (s in shortOptionNames) {
-                        s = shortOptionNames[s];
-                    }
-                    if (s in optionNameMap) {
-                        var opt = optionNameMap[s];
-                        if (opt.isTSConfigOnly) {
-                            errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_can_only_be_specified_in_tsconfig_json_file, opt.name));
-                        }
-                        else {
-                            if (!args[i] && opt.type !== "boolean") {
-                                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_expects_an_argument, opt.name));
-                            }
-                            switch (opt.type) {
-                                case "number":
-                                    options[opt.name] = parseInt(args[i]);
-                                    i++;
-                                    break;
-                                case "boolean":
-                                    options[opt.name] = true;
-                                    break;
-                                case "string":
-                                    options[opt.name] = args[i] || "";
-                                    i++;
-                                    break;
-                                case "list":
-                                    var result = parseListTypeOption(opt, args[i], errors);
-                                    options[opt.name] = result || [];
-                                    if (result) {
-                                        i++;
-                                    }
-                                    break;
-                                default:
-                                    options[opt.name] = parseCustomTypeOption(opt, args[i], errors);
-                                    i++;
-                                    break;
-                            }
-                        }
-                    }
-                    else {
-                        errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unknown_compiler_option_0, s));
-                    }
-                }
-                else {
-                    fileNames.push(s);
-                }
-            }
-        }
-        function parseResponseFile(fileName) {
-            var text = readFile ? readFile(fileName) : ts.sys.readFile(fileName);
-            if (!text) {
-                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.File_0_not_found, fileName));
-                return;
-            }
-            var args = [];
-            var pos = 0;
-            while (true) {
-                while (pos < text.length && text.charCodeAt(pos) <= 32)
-                    pos++;
-                if (pos >= text.length)
-                    break;
-                var start = pos;
-                if (text.charCodeAt(start) === 34) {
-                    pos++;
-                    while (pos < text.length && text.charCodeAt(pos) !== 34)
-                        pos++;
-                    if (pos < text.length) {
-                        args.push(text.substring(start + 1, pos));
-                        pos++;
-                    }
-                    else {
-                        errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unterminated_quoted_string_in_response_file_0, fileName));
-                    }
-                }
-                else {
-                    while (text.charCodeAt(pos) > 32)
-                        pos++;
-                    args.push(text.substring(start, pos));
-                }
-            }
-            parseStrings(args);
-        }
-    }
-    ts.parseCommandLine = parseCommandLine;
-    function readConfigFile(fileName, readFile) {
-        var text = "";
-        try {
-            text = readFile(fileName);
-        }
-        catch (e) {
-            return { error: ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_read_file_0_Colon_1, fileName, e.message) };
-        }
-        return parseConfigFileTextToJson(fileName, text);
-    }
-    ts.readConfigFile = readConfigFile;
-    function parseConfigFileTextToJson(fileName, jsonText, stripComments) {
-        if (stripComments === void 0) { stripComments = true; }
-        try {
-            var jsonTextToParse = stripComments ? removeComments(jsonText) : jsonText;
-            return { config: /\S/.test(jsonTextToParse) ? JSON.parse(jsonTextToParse) : {} };
-        }
-        catch (e) {
-            return { error: ts.createCompilerDiagnostic(ts.Diagnostics.Failed_to_parse_file_0_Colon_1, fileName, e.message) };
-        }
-    }
-    ts.parseConfigFileTextToJson = parseConfigFileTextToJson;
-    function generateTSConfig(options, fileNames) {
-        var compilerOptions = ts.extend(options, ts.defaultInitCompilerOptions);
-        var configurations = {
-            compilerOptions: serializeCompilerOptions(compilerOptions)
-        };
-        if (fileNames && fileNames.length) {
-            configurations.files = fileNames;
-        }
-        return configurations;
-        function getCustomTypeMapOfCommandLineOption(optionDefinition) {
-            if (optionDefinition.type === "string" || optionDefinition.type === "number" || optionDefinition.type === "boolean") {
+    function getResolutionDiagnostic(options, _a) {
+        var extension = _a.extension;
+        switch (extension) {
+            case ts.Extension.Ts:
+            case ts.Extension.Dts:
                 return undefined;
-            }
-            else if (optionDefinition.type === "list") {
-                return getCustomTypeMapOfCommandLineOption(optionDefinition.element);
-            }
-            else {
-                return optionDefinition.type;
-            }
+            case ts.Extension.Tsx:
+                return needJsx();
+            case ts.Extension.Jsx:
+                return needJsx() || needAllowJs();
+            case ts.Extension.Js:
+                return needAllowJs();
         }
-        function getNameOfCompilerOptionValue(value, customTypeMap) {
-            for (var key in customTypeMap) {
-                if (customTypeMap[key] === value) {
-                    return key;
-                }
-            }
-            return undefined;
+        function needJsx() {
+            return options.jsx ? undefined : ts.Diagnostics.Module_0_was_resolved_to_1_but_jsx_is_not_set;
         }
-        function serializeCompilerOptions(options) {
-            var result = ts.createMap();
-            var optionsNameMap = getOptionNameMap().optionNameMap;
-            for (var name_44 in options) {
-                if (ts.hasProperty(options, name_44)) {
-                    switch (name_44) {
-                        case "init":
-                        case "watch":
-                        case "version":
-                        case "help":
-                        case "project":
-                            break;
-                        default:
-                            var value = options[name_44];
-                            var optionDefinition = optionsNameMap[name_44.toLowerCase()];
-                            if (optionDefinition) {
-                                var customTypeMap = getCustomTypeMapOfCommandLineOption(optionDefinition);
-                                if (!customTypeMap) {
-                                    result[name_44] = value;
-                                }
-                                else {
-                                    if (optionDefinition.type === "list") {
-                                        var convertedValue = [];
-                                        for (var _i = 0, _a = value; _i < _a.length; _i++) {
-                                            var element = _a[_i];
-                                            convertedValue.push(getNameOfCompilerOptionValue(element, customTypeMap));
-                                        }
-                                        result[name_44] = convertedValue;
-                                    }
-                                    else {
-                                        result[name_44] = getNameOfCompilerOptionValue(value, customTypeMap);
-                                    }
-                                }
-                            }
-                            break;
-                    }
-                }
-            }
-            return result;
+        function needAllowJs() {
+            return options.allowJs ? undefined : ts.Diagnostics.Module_0_was_resolved_to_1_but_allowJs_is_not_set;
         }
     }
-    ts.generateTSConfig = generateTSConfig;
-    function removeComments(jsonText) {
-        var output = "";
-        var scanner = ts.createScanner(1, false, 0, jsonText);
-        var token;
-        while ((token = scanner.scan()) !== 1) {
-            switch (token) {
-                case 2:
-                case 3:
-                    output += scanner.getTokenText().replace(/\S/g, " ");
-                    break;
-                default:
-                    output += scanner.getTokenText();
-                    break;
-            }
-        }
-        return output;
-    }
-    function parseJsonConfigFileContent(json, host, basePath, existingOptions, configFileName, resolutionStack) {
-        if (existingOptions === void 0) { existingOptions = {}; }
-        if (resolutionStack === void 0) { resolutionStack = []; }
-        var errors = [];
-        var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames);
-        var resolvedPath = ts.toPath(configFileName || "", basePath, getCanonicalFileName);
-        if (resolutionStack.indexOf(resolvedPath) >= 0) {
-            return {
-                options: {},
-                fileNames: [],
-                typingOptions: {},
-                raw: json,
-                errors: [ts.createCompilerDiagnostic(ts.Diagnostics.Circularity_detected_while_resolving_configuration_Colon_0, resolutionStack.concat([resolvedPath]).join(" -> "))],
-                wildcardDirectories: {}
-            };
-        }
-        var options = convertCompilerOptionsFromJsonWorker(json["compilerOptions"], basePath, errors, configFileName);
-        var typingOptions = convertTypingOptionsFromJsonWorker(json["typingOptions"], basePath, errors, configFileName);
-        if (json["extends"]) {
-            var _a = [undefined, undefined, undefined, {}], include = _a[0], exclude = _a[1], files = _a[2], baseOptions = _a[3];
-            if (typeof json["extends"] === "string") {
-                _b = (tryExtendsName(json["extends"]) || [include, exclude, files, baseOptions]), include = _b[0], exclude = _b[1], files = _b[2], baseOptions = _b[3];
-            }
-            else {
-                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "extends", "string"));
-            }
-            if (include && !json["include"]) {
-                json["include"] = include;
-            }
-            if (exclude && !json["exclude"]) {
-                json["exclude"] = exclude;
-            }
-            if (files && !json["files"]) {
-                json["files"] = files;
-            }
-            options = ts.assign({}, baseOptions, options);
-        }
-        options = ts.extend(existingOptions, options);
-        options.configFilePath = configFileName;
-        var _c = getFileNames(errors), fileNames = _c.fileNames, wildcardDirectories = _c.wildcardDirectories;
-        var compileOnSave = convertCompileOnSaveOptionFromJson(json, basePath, errors);
-        return {
-            options: options,
-            fileNames: fileNames,
-            typingOptions: typingOptions,
-            raw: json,
-            errors: errors,
-            wildcardDirectories: wildcardDirectories,
-            compileOnSave: compileOnSave
-        };
-        function tryExtendsName(extendedConfig) {
-            if (!(ts.isRootedDiskPath(extendedConfig) || ts.startsWith(ts.normalizeSlashes(extendedConfig), "./") || ts.startsWith(ts.normalizeSlashes(extendedConfig), "../"))) {
-                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.The_path_in_an_extends_options_must_be_relative_or_rooted));
-                return;
-            }
-            var extendedConfigPath = ts.toPath(extendedConfig, basePath, getCanonicalFileName);
-            if (!host.fileExists(extendedConfigPath) && !ts.endsWith(extendedConfigPath, ".json")) {
-                extendedConfigPath = extendedConfigPath + ".json";
-                if (!host.fileExists(extendedConfigPath)) {
-                    errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.File_0_does_not_exist, extendedConfig));
-                    return;
-                }
-            }
-            var extendedResult = readConfigFile(extendedConfigPath, function (path) { return host.readFile(path); });
-            if (extendedResult.error) {
-                errors.push(extendedResult.error);
-                return;
-            }
-            var extendedDirname = ts.getDirectoryPath(extendedConfigPath);
-            var relativeDifference = ts.convertToRelativePath(extendedDirname, basePath, getCanonicalFileName);
-            var updatePath = function (path) { return ts.isRootedDiskPath(path) ? path : ts.combinePaths(relativeDifference, path); };
-            var result = parseJsonConfigFileContent(extendedResult.config, host, extendedDirname, undefined, ts.getBaseFileName(extendedConfigPath), resolutionStack.concat([resolvedPath]));
-            errors.push.apply(errors, result.errors);
-            var _a = ts.map(["include", "exclude", "files"], function (key) {
-                if (!json[key] && extendedResult.config[key]) {
-                    return ts.map(extendedResult.config[key], updatePath);
-                }
-            }), include = _a[0], exclude = _a[1], files = _a[2];
-            return [include, exclude, files, result.options];
-        }
-        function getFileNames(errors) {
-            var fileNames;
-            if (ts.hasProperty(json, "files")) {
-                if (ts.isArray(json["files"])) {
-                    fileNames = json["files"];
-                }
-                else {
-                    errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "files", "Array"));
-                }
-            }
-            var includeSpecs;
-            if (ts.hasProperty(json, "include")) {
-                if (ts.isArray(json["include"])) {
-                    includeSpecs = json["include"];
-                }
-                else {
-                    errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "include", "Array"));
-                }
-            }
-            var excludeSpecs;
-            if (ts.hasProperty(json, "exclude")) {
-                if (ts.isArray(json["exclude"])) {
-                    excludeSpecs = json["exclude"];
-                }
-                else {
-                    errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "exclude", "Array"));
-                }
-            }
-            else if (ts.hasProperty(json, "excludes")) {
-                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unknown_option_excludes_Did_you_mean_exclude));
-            }
-            else {
-                excludeSpecs = ["node_modules", "bower_components", "jspm_packages"];
-                var outDir = json["compilerOptions"] && json["compilerOptions"]["outDir"];
-                if (outDir) {
-                    excludeSpecs.push(outDir);
-                }
-            }
-            if (fileNames === undefined && includeSpecs === undefined) {
-                includeSpecs = ["**/*"];
-            }
-            return matchFileNames(fileNames, includeSpecs, excludeSpecs, basePath, options, host, errors);
-        }
-        var _b;
-    }
-    ts.parseJsonConfigFileContent = parseJsonConfigFileContent;
-    function convertCompileOnSaveOptionFromJson(jsonOption, basePath, errors) {
-        if (!ts.hasProperty(jsonOption, ts.compileOnSaveCommandLineOption.name)) {
-            return false;
-        }
-        var result = convertJsonOption(ts.compileOnSaveCommandLineOption, jsonOption["compileOnSave"], basePath, errors);
-        if (typeof result === "boolean" && result) {
-            return result;
-        }
-        return false;
-    }
-    ts.convertCompileOnSaveOptionFromJson = convertCompileOnSaveOptionFromJson;
-    function convertCompilerOptionsFromJson(jsonOptions, basePath, configFileName) {
-        var errors = [];
-        var options = convertCompilerOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName);
-        return { options: options, errors: errors };
-    }
-    ts.convertCompilerOptionsFromJson = convertCompilerOptionsFromJson;
-    function convertTypingOptionsFromJson(jsonOptions, basePath, configFileName) {
-        var errors = [];
-        var options = convertTypingOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName);
-        return { options: options, errors: errors };
-    }
-    ts.convertTypingOptionsFromJson = convertTypingOptionsFromJson;
-    function convertCompilerOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName) {
-        var options = ts.getBaseFileName(configFileName) === "jsconfig.json"
-            ? { allowJs: true, maxNodeModuleJsDepth: 2, allowSyntheticDefaultImports: true, skipLibCheck: true }
-            : {};
-        convertOptionsFromJson(ts.optionDeclarations, jsonOptions, basePath, options, ts.Diagnostics.Unknown_compiler_option_0, errors);
-        return options;
-    }
-    function convertTypingOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName) {
-        var options = ts.getBaseFileName(configFileName) === "jsconfig.json"
-            ? { enableAutoDiscovery: true, include: [], exclude: [] }
-            : { enableAutoDiscovery: false, include: [], exclude: [] };
-        convertOptionsFromJson(ts.typingOptionDeclarations, jsonOptions, basePath, options, ts.Diagnostics.Unknown_typing_option_0, errors);
-        return options;
-    }
-    function convertOptionsFromJson(optionDeclarations, jsonOptions, basePath, defaultOptions, diagnosticMessage, errors) {
-        if (!jsonOptions) {
-            return;
-        }
-        var optionNameMap = ts.arrayToMap(optionDeclarations, function (opt) { return opt.name; });
-        for (var id in jsonOptions) {
-            if (id in optionNameMap) {
-                var opt = optionNameMap[id];
-                defaultOptions[opt.name] = convertJsonOption(opt, jsonOptions[id], basePath, errors);
-            }
-            else {
-                errors.push(ts.createCompilerDiagnostic(diagnosticMessage, id));
-            }
-        }
-    }
-    function convertJsonOption(opt, value, basePath, errors) {
-        var optType = opt.type;
-        var expectedType = typeof optType === "string" ? optType : "string";
-        if (optType === "list" && ts.isArray(value)) {
-            return convertJsonOptionOfListType(opt, value, basePath, errors);
-        }
-        else if (typeof value === expectedType) {
-            if (typeof optType !== "string") {
-                return convertJsonOptionOfCustomType(opt, value, errors);
-            }
-            else {
-                if (opt.isFilePath) {
-                    value = ts.normalizePath(ts.combinePaths(basePath, value));
-                    if (value === "") {
-                        value = ".";
-                    }
-                }
-            }
-            return value;
-        }
-        else {
-            errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, opt.name, expectedType));
-        }
-    }
-    function convertJsonOptionOfCustomType(opt, value, errors) {
-        var key = value.toLowerCase();
-        if (key in opt.type) {
-            return opt.type[key];
-        }
-        else {
-            errors.push(createCompilerDiagnosticForInvalidCustomType(opt));
-        }
-    }
-    function convertJsonOptionOfListType(option, values, basePath, errors) {
-        return ts.filter(ts.map(values, function (v) { return convertJsonOption(option.element, v, basePath, errors); }), function (v) { return !!v; });
-    }
-    function trimString(s) {
-        return typeof s.trim === "function" ? s.trim() : s.replace(/^[\s]+|[\s]+$/g, "");
-    }
-    var invalidTrailingRecursionPattern = /(^|\/)\*\*\/?$/;
-    var invalidMultipleRecursionPatterns = /(^|\/)\*\*\/(.*\/)?\*\*($|\/)/;
-    var invalidDotDotAfterRecursiveWildcardPattern = /(^|\/)\*\*\/(.*\/)?\.\.($|\/)/;
-    var watchRecursivePattern = /\/[^/]*?[*?][^/]*\//;
-    var wildcardDirectoryPattern = /^[^*?]*(?=\/[^/]*[*?])/;
-    function matchFileNames(fileNames, include, exclude, basePath, options, host, errors) {
-        basePath = ts.normalizePath(basePath);
-        var keyMapper = host.useCaseSensitiveFileNames ? caseSensitiveKeyMapper : caseInsensitiveKeyMapper;
-        var literalFileMap = ts.createMap();
-        var wildcardFileMap = ts.createMap();
-        if (include) {
-            include = validateSpecs(include, errors, false);
-        }
-        if (exclude) {
-            exclude = validateSpecs(exclude, errors, true);
-        }
-        var wildcardDirectories = getWildcardDirectories(include, exclude, basePath, host.useCaseSensitiveFileNames);
-        var supportedExtensions = ts.getSupportedExtensions(options);
-        if (fileNames) {
-            for (var _i = 0, fileNames_1 = fileNames; _i < fileNames_1.length; _i++) {
-                var fileName = fileNames_1[_i];
-                var file = ts.combinePaths(basePath, fileName);
-                literalFileMap[keyMapper(file)] = file;
-            }
-        }
-        if (include && include.length > 0) {
-            for (var _a = 0, _b = host.readDirectory(basePath, supportedExtensions, exclude, include); _a < _b.length; _a++) {
-                var file = _b[_a];
-                if (hasFileWithHigherPriorityExtension(file, literalFileMap, wildcardFileMap, supportedExtensions, keyMapper)) {
-                    continue;
-                }
-                removeWildcardFilesWithLowerPriorityExtension(file, wildcardFileMap, supportedExtensions, keyMapper);
-                var key = keyMapper(file);
-                if (!(key in literalFileMap) && !(key in wildcardFileMap)) {
-                    wildcardFileMap[key] = file;
-                }
-            }
-        }
-        var literalFiles = ts.reduceProperties(literalFileMap, addFileToOutput, []);
-        var wildcardFiles = ts.reduceProperties(wildcardFileMap, addFileToOutput, []);
-        wildcardFiles.sort(host.useCaseSensitiveFileNames ? ts.compareStrings : ts.compareStringsCaseInsensitive);
-        return {
-            fileNames: literalFiles.concat(wildcardFiles),
-            wildcardDirectories: wildcardDirectories
-        };
-    }
-    function validateSpecs(specs, errors, allowTrailingRecursion) {
-        var validSpecs = [];
-        for (var _i = 0, specs_2 = specs; _i < specs_2.length; _i++) {
-            var spec = specs_2[_i];
-            if (!allowTrailingRecursion && invalidTrailingRecursionPattern.test(spec)) {
-                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0, spec));
-            }
-            else if (invalidMultipleRecursionPatterns.test(spec)) {
-                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.File_specification_cannot_contain_multiple_recursive_directory_wildcards_Asterisk_Asterisk_Colon_0, spec));
-            }
-            else if (invalidDotDotAfterRecursiveWildcardPattern.test(spec)) {
-                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0, spec));
-            }
-            else {
-                validSpecs.push(spec);
-            }
-        }
-        return validSpecs;
-    }
-    function getWildcardDirectories(include, exclude, path, useCaseSensitiveFileNames) {
-        var rawExcludeRegex = ts.getRegularExpressionForWildcard(exclude, path, "exclude");
-        var excludeRegex = rawExcludeRegex && new RegExp(rawExcludeRegex, useCaseSensitiveFileNames ? "" : "i");
-        var wildcardDirectories = ts.createMap();
-        if (include !== undefined) {
-            var recursiveKeys = [];
-            for (var _i = 0, include_1 = include; _i < include_1.length; _i++) {
-                var file = include_1[_i];
-                var name_45 = ts.normalizePath(ts.combinePaths(path, file));
-                if (excludeRegex && excludeRegex.test(name_45)) {
-                    continue;
-                }
-                var match = wildcardDirectoryPattern.exec(name_45);
-                if (match) {
-                    var key = useCaseSensitiveFileNames ? match[0] : match[0].toLowerCase();
-                    var flags = watchRecursivePattern.test(name_45) ? 1 : 0;
-                    var existingFlags = wildcardDirectories[key];
-                    if (existingFlags === undefined || existingFlags < flags) {
-                        wildcardDirectories[key] = flags;
-                        if (flags === 1) {
-                            recursiveKeys.push(key);
-                        }
-                    }
-                }
-            }
-            for (var key in wildcardDirectories) {
-                for (var _a = 0, recursiveKeys_1 = recursiveKeys; _a < recursiveKeys_1.length; _a++) {
-                    var recursiveKey = recursiveKeys_1[_a];
-                    if (key !== recursiveKey && ts.containsPath(recursiveKey, key, path, !useCaseSensitiveFileNames)) {
-                        delete wildcardDirectories[key];
-                    }
-                }
-            }
-        }
-        return wildcardDirectories;
-    }
-    function hasFileWithHigherPriorityExtension(file, literalFiles, wildcardFiles, extensions, keyMapper) {
-        var extensionPriority = ts.getExtensionPriority(file, extensions);
-        var adjustedExtensionPriority = ts.adjustExtensionPriority(extensionPriority);
-        for (var i = 0; i < adjustedExtensionPriority; i++) {
-            var higherPriorityExtension = extensions[i];
-            var higherPriorityPath = keyMapper(ts.changeExtension(file, higherPriorityExtension));
-            if (higherPriorityPath in literalFiles || higherPriorityPath in wildcardFiles) {
-                return true;
-            }
-        }
-        return false;
-    }
-    function removeWildcardFilesWithLowerPriorityExtension(file, wildcardFiles, extensions, keyMapper) {
-        var extensionPriority = ts.getExtensionPriority(file, extensions);
-        var nextExtensionPriority = ts.getNextLowestExtensionPriority(extensionPriority);
-        for (var i = nextExtensionPriority; i < extensions.length; i++) {
-            var lowerPriorityExtension = extensions[i];
-            var lowerPriorityPath = keyMapper(ts.changeExtension(file, lowerPriorityExtension));
-            delete wildcardFiles[lowerPriorityPath];
-        }
-    }
-    function addFileToOutput(output, file) {
-        output.push(file);
-        return output;
-    }
-    function caseSensitiveKeyMapper(key) {
-        return key;
-    }
-    function caseInsensitiveKeyMapper(key) {
-        return key.toLowerCase();
-    }
+    ts.getResolutionDiagnostic = getResolutionDiagnostic;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -50192,12 +51335,13 @@ var ts;
         HighlightSpanKind.reference = "reference";
         HighlightSpanKind.writtenReference = "writtenReference";
     })(HighlightSpanKind = ts.HighlightSpanKind || (ts.HighlightSpanKind = {}));
+    var IndentStyle;
     (function (IndentStyle) {
         IndentStyle[IndentStyle["None"] = 0] = "None";
         IndentStyle[IndentStyle["Block"] = 1] = "Block";
         IndentStyle[IndentStyle["Smart"] = 2] = "Smart";
-    })(ts.IndentStyle || (ts.IndentStyle = {}));
-    var IndentStyle = ts.IndentStyle;
+    })(IndentStyle = ts.IndentStyle || (ts.IndentStyle = {}));
+    var SymbolDisplayPartKind;
     (function (SymbolDisplayPartKind) {
         SymbolDisplayPartKind[SymbolDisplayPartKind["aliasName"] = 0] = "aliasName";
         SymbolDisplayPartKind[SymbolDisplayPartKind["className"] = 1] = "className";
@@ -50221,24 +51365,8 @@ var ts;
         SymbolDisplayPartKind[SymbolDisplayPartKind["enumMemberName"] = 19] = "enumMemberName";
         SymbolDisplayPartKind[SymbolDisplayPartKind["functionName"] = 20] = "functionName";
         SymbolDisplayPartKind[SymbolDisplayPartKind["regularExpressionLiteral"] = 21] = "regularExpressionLiteral";
-    })(ts.SymbolDisplayPartKind || (ts.SymbolDisplayPartKind = {}));
-    var SymbolDisplayPartKind = ts.SymbolDisplayPartKind;
-    (function (OutputFileType) {
-        OutputFileType[OutputFileType["JavaScript"] = 0] = "JavaScript";
-        OutputFileType[OutputFileType["SourceMap"] = 1] = "SourceMap";
-        OutputFileType[OutputFileType["Declaration"] = 2] = "Declaration";
-    })(ts.OutputFileType || (ts.OutputFileType = {}));
-    var OutputFileType = ts.OutputFileType;
-    (function (EndOfLineState) {
-        EndOfLineState[EndOfLineState["None"] = 0] = "None";
-        EndOfLineState[EndOfLineState["InMultiLineCommentTrivia"] = 1] = "InMultiLineCommentTrivia";
-        EndOfLineState[EndOfLineState["InSingleQuoteStringLiteral"] = 2] = "InSingleQuoteStringLiteral";
-        EndOfLineState[EndOfLineState["InDoubleQuoteStringLiteral"] = 3] = "InDoubleQuoteStringLiteral";
-        EndOfLineState[EndOfLineState["InTemplateHeadOrNoSubstitutionTemplate"] = 4] = "InTemplateHeadOrNoSubstitutionTemplate";
-        EndOfLineState[EndOfLineState["InTemplateMiddleOrTail"] = 5] = "InTemplateMiddleOrTail";
-        EndOfLineState[EndOfLineState["InTemplateSubstitutionPosition"] = 6] = "InTemplateSubstitutionPosition";
-    })(ts.EndOfLineState || (ts.EndOfLineState = {}));
-    var EndOfLineState = ts.EndOfLineState;
+    })(SymbolDisplayPartKind = ts.SymbolDisplayPartKind || (ts.SymbolDisplayPartKind = {}));
+    var TokenClass;
     (function (TokenClass) {
         TokenClass[TokenClass["Punctuation"] = 0] = "Punctuation";
         TokenClass[TokenClass["Keyword"] = 1] = "Keyword";
@@ -50249,8 +51377,7 @@ var ts;
         TokenClass[TokenClass["NumberLiteral"] = 6] = "NumberLiteral";
         TokenClass[TokenClass["StringLiteral"] = 7] = "StringLiteral";
         TokenClass[TokenClass["RegExpLiteral"] = 8] = "RegExpLiteral";
-    })(ts.TokenClass || (ts.TokenClass = {}));
-    var TokenClass = ts.TokenClass;
+    })(TokenClass = ts.TokenClass || (ts.TokenClass = {}));
     var ScriptElementKind;
     (function (ScriptElementKind) {
         ScriptElementKind.unknown = "";
@@ -50326,75 +51453,40 @@ var ts;
     ClassificationTypeNames.jsxText = "jsx text";
     ClassificationTypeNames.jsxAttributeStringLiteralValue = "jsx attribute string literal value";
     ts.ClassificationTypeNames = ClassificationTypeNames;
-    (function (ClassificationType) {
-        ClassificationType[ClassificationType["comment"] = 1] = "comment";
-        ClassificationType[ClassificationType["identifier"] = 2] = "identifier";
-        ClassificationType[ClassificationType["keyword"] = 3] = "keyword";
-        ClassificationType[ClassificationType["numericLiteral"] = 4] = "numericLiteral";
-        ClassificationType[ClassificationType["operator"] = 5] = "operator";
-        ClassificationType[ClassificationType["stringLiteral"] = 6] = "stringLiteral";
-        ClassificationType[ClassificationType["regularExpressionLiteral"] = 7] = "regularExpressionLiteral";
-        ClassificationType[ClassificationType["whiteSpace"] = 8] = "whiteSpace";
-        ClassificationType[ClassificationType["text"] = 9] = "text";
-        ClassificationType[ClassificationType["punctuation"] = 10] = "punctuation";
-        ClassificationType[ClassificationType["className"] = 11] = "className";
-        ClassificationType[ClassificationType["enumName"] = 12] = "enumName";
-        ClassificationType[ClassificationType["interfaceName"] = 13] = "interfaceName";
-        ClassificationType[ClassificationType["moduleName"] = 14] = "moduleName";
-        ClassificationType[ClassificationType["typeParameterName"] = 15] = "typeParameterName";
-        ClassificationType[ClassificationType["typeAliasName"] = 16] = "typeAliasName";
-        ClassificationType[ClassificationType["parameterName"] = 17] = "parameterName";
-        ClassificationType[ClassificationType["docCommentTagName"] = 18] = "docCommentTagName";
-        ClassificationType[ClassificationType["jsxOpenTagName"] = 19] = "jsxOpenTagName";
-        ClassificationType[ClassificationType["jsxCloseTagName"] = 20] = "jsxCloseTagName";
-        ClassificationType[ClassificationType["jsxSelfClosingTagName"] = 21] = "jsxSelfClosingTagName";
-        ClassificationType[ClassificationType["jsxAttribute"] = 22] = "jsxAttribute";
-        ClassificationType[ClassificationType["jsxText"] = 23] = "jsxText";
-        ClassificationType[ClassificationType["jsxAttributeStringLiteralValue"] = 24] = "jsxAttributeStringLiteralValue";
-    })(ts.ClassificationType || (ts.ClassificationType = {}));
-    var ClassificationType = ts.ClassificationType;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    ts.scanner = ts.createScanner(4, true);
+    ts.scanner = ts.createScanner(5, true);
     ts.emptyArray = [];
-    (function (SemanticMeaning) {
-        SemanticMeaning[SemanticMeaning["None"] = 0] = "None";
-        SemanticMeaning[SemanticMeaning["Value"] = 1] = "Value";
-        SemanticMeaning[SemanticMeaning["Type"] = 2] = "Type";
-        SemanticMeaning[SemanticMeaning["Namespace"] = 4] = "Namespace";
-        SemanticMeaning[SemanticMeaning["All"] = 7] = "All";
-    })(ts.SemanticMeaning || (ts.SemanticMeaning = {}));
-    var SemanticMeaning = ts.SemanticMeaning;
     function getMeaningFromDeclaration(node) {
         switch (node.kind) {
-            case 143:
-            case 219:
-            case 170:
-            case 146:
-            case 145:
-            case 253:
-            case 254:
-            case 255:
-            case 148:
+            case 144:
+            case 223:
+            case 174:
             case 147:
+            case 146:
+            case 257:
+            case 258:
+            case 260:
             case 149:
+            case 148:
             case 150:
             case 151:
-            case 221:
-            case 180:
-            case 181:
-            case 252:
-                return 1;
-            case 142:
-            case 223:
-            case 224:
-            case 160:
-                return 2;
-            case 222:
+            case 152:
             case 225:
-                return 1 | 2;
+            case 184:
+            case 185:
+            case 256:
+                return 1;
+            case 143:
+            case 227:
+            case 228:
+            case 161:
+                return 2;
             case 226:
+            case 229:
+                return 1 | 2;
+            case 230:
                 if (ts.isAmbientModule(node)) {
                     return 4 | 1;
                 }
@@ -50404,21 +51496,21 @@ var ts;
                 else {
                     return 4;
                 }
+            case 238:
+            case 239:
             case 234:
             case 235:
-            case 230:
-            case 231:
-            case 236:
-            case 237:
+            case 240:
+            case 241:
                 return 1 | 2 | 4;
-            case 256:
+            case 261:
                 return 4 | 1;
         }
         return 1 | 2 | 4;
     }
     ts.getMeaningFromDeclaration = getMeaningFromDeclaration;
     function getMeaningFromLocation(node) {
-        if (node.parent.kind === 236) {
+        if (node.parent.kind === 240) {
             return 1 | 2 | 4;
         }
         else if (isInRightSideOfImport(node)) {
@@ -50440,15 +51532,15 @@ var ts;
     ts.getMeaningFromLocation = getMeaningFromLocation;
     function getMeaningFromRightHandSideOfImportEquals(node) {
         ts.Debug.assert(node.kind === 70);
-        if (node.parent.kind === 140 &&
+        if (node.parent.kind === 141 &&
             node.parent.right === node &&
-            node.parent.parent.kind === 230) {
+            node.parent.parent.kind === 234) {
             return 1 | 2 | 4;
         }
         return 4;
     }
     function isInRightSideOfImport(node) {
-        while (node.parent.kind === 140) {
+        while (node.parent.kind === 141) {
             node = node.parent;
         }
         return ts.isInternalModuleImportEqualsDeclaration(node.parent) && node.parent.moduleReference === node;
@@ -50459,27 +51551,27 @@ var ts;
     function isQualifiedNameNamespaceReference(node) {
         var root = node;
         var isLastClause = true;
-        if (root.parent.kind === 140) {
-            while (root.parent && root.parent.kind === 140) {
+        if (root.parent.kind === 141) {
+            while (root.parent && root.parent.kind === 141) {
                 root = root.parent;
             }
             isLastClause = root.right === node;
         }
-        return root.parent.kind === 156 && !isLastClause;
+        return root.parent.kind === 157 && !isLastClause;
     }
     function isPropertyAccessNamespaceReference(node) {
         var root = node;
         var isLastClause = true;
-        if (root.parent.kind === 173) {
-            while (root.parent && root.parent.kind === 173) {
+        if (root.parent.kind === 177) {
+            while (root.parent && root.parent.kind === 177) {
                 root = root.parent;
             }
             isLastClause = root.name === node;
         }
-        if (!isLastClause && root.parent.kind === 195 && root.parent.parent.kind === 251) {
+        if (!isLastClause && root.parent.kind === 199 && root.parent.parent.kind === 255) {
             var decl = root.parent.parent.parent;
-            return (decl.kind === 222 && root.parent.parent.token === 107) ||
-                (decl.kind === 223 && root.parent.parent.token === 84);
+            return (decl.kind === 226 && root.parent.parent.token === 107) ||
+                (decl.kind === 227 && root.parent.parent.token === 84);
         }
         return false;
     }
@@ -50487,17 +51579,17 @@ var ts;
         if (ts.isRightSideOfQualifiedNameOrPropertyAccess(node)) {
             node = node.parent;
         }
-        return node.parent.kind === 156 ||
-            (node.parent.kind === 195 && !ts.isExpressionWithTypeArgumentsInClassExtendsClause(node.parent)) ||
+        return node.parent.kind === 157 ||
+            (node.parent.kind === 199 && !ts.isExpressionWithTypeArgumentsInClassExtendsClause(node.parent)) ||
             (node.kind === 98 && !ts.isPartOfExpression(node)) ||
-            node.kind === 166;
+            node.kind === 167;
     }
     function isCallExpressionTarget(node) {
-        return isCallOrNewExpressionTarget(node, 175);
+        return isCallOrNewExpressionTarget(node, 179);
     }
     ts.isCallExpressionTarget = isCallExpressionTarget;
     function isNewExpressionTarget(node) {
-        return isCallOrNewExpressionTarget(node, 176);
+        return isCallOrNewExpressionTarget(node, 180);
     }
     ts.isNewExpressionTarget = isNewExpressionTarget;
     function isCallOrNewExpressionTarget(node, kind) {
@@ -50510,7 +51602,7 @@ var ts;
     ts.climbPastPropertyAccess = climbPastPropertyAccess;
     function getTargetLabel(referenceNode, labelName) {
         while (referenceNode) {
-            if (referenceNode.kind === 215 && referenceNode.label.text === labelName) {
+            if (referenceNode.kind === 219 && referenceNode.label.text === labelName) {
                 return referenceNode.label;
             }
             referenceNode = referenceNode.parent;
@@ -50520,13 +51612,13 @@ var ts;
     ts.getTargetLabel = getTargetLabel;
     function isJumpStatementTarget(node) {
         return node.kind === 70 &&
-            (node.parent.kind === 211 || node.parent.kind === 210) &&
+            (node.parent.kind === 215 || node.parent.kind === 214) &&
             node.parent.label === node;
     }
     ts.isJumpStatementTarget = isJumpStatementTarget;
     function isLabelOfLabeledStatement(node) {
         return node.kind === 70 &&
-            node.parent.kind === 215 &&
+            node.parent.kind === 219 &&
             node.parent.label === node;
     }
     function isLabelName(node) {
@@ -50534,15 +51626,15 @@ var ts;
     }
     ts.isLabelName = isLabelName;
     function isRightSideOfQualifiedName(node) {
-        return node.parent.kind === 140 && node.parent.right === node;
+        return node.parent.kind === 141 && node.parent.right === node;
     }
     ts.isRightSideOfQualifiedName = isRightSideOfQualifiedName;
     function isRightSideOfPropertyAccess(node) {
-        return node && node.parent && node.parent.kind === 173 && node.parent.name === node;
+        return node && node.parent && node.parent.kind === 177 && node.parent.name === node;
     }
     ts.isRightSideOfPropertyAccess = isRightSideOfPropertyAccess;
     function isNameOfModuleDeclaration(node) {
-        return node.parent.kind === 226 && node.parent.name === node;
+        return node.parent.kind === 230 && node.parent.name === node;
     }
     ts.isNameOfModuleDeclaration = isNameOfModuleDeclaration;
     function isNameOfFunctionDeclaration(node) {
@@ -50553,19 +51645,19 @@ var ts;
     function isLiteralNameOfPropertyDeclarationOrIndexAccess(node) {
         if (node.kind === 9 || node.kind === 8) {
             switch (node.parent.kind) {
-                case 146:
-                case 145:
-                case 253:
-                case 255:
-                case 148:
                 case 147:
-                case 150:
+                case 146:
+                case 257:
+                case 260:
+                case 149:
+                case 148:
                 case 151:
-                case 226:
+                case 152:
+                case 230:
                     return node.parent.name === node;
-                case 174:
+                case 178:
                     return node.parent.argumentExpression === node;
-                case 141:
+                case 142:
                     return true;
             }
         }
@@ -50609,17 +51701,17 @@ var ts;
                 return undefined;
             }
             switch (node.kind) {
-                case 256:
+                case 261:
+                case 149:
                 case 148:
-                case 147:
-                case 221:
-                case 180:
-                case 150:
-                case 151:
-                case 222:
-                case 223:
                 case 225:
+                case 184:
+                case 151:
+                case 152:
                 case 226:
+                case 227:
+                case 229:
+                case 230:
                     return node;
             }
         }
@@ -50627,46 +51719,46 @@ var ts;
     ts.getContainerNode = getContainerNode;
     function getNodeKind(node) {
         switch (node.kind) {
-            case 256:
+            case 261:
                 return ts.isExternalModule(node) ? ts.ScriptElementKind.moduleElement : ts.ScriptElementKind.scriptElement;
-            case 226:
-                return ts.ScriptElementKind.moduleElement;
-            case 222:
-            case 193:
-                return ts.ScriptElementKind.classElement;
-            case 223: return ts.ScriptElementKind.interfaceElement;
-            case 224: return ts.ScriptElementKind.typeElement;
-            case 225: return ts.ScriptElementKind.enumElement;
-            case 219:
-                return getKindOfVariableDeclaration(node);
-            case 170:
-                return getKindOfVariableDeclaration(ts.getRootDeclaration(node));
-            case 181:
-            case 221:
-            case 180:
-                return ts.ScriptElementKind.functionElement;
-            case 150: return ts.ScriptElementKind.memberGetAccessorElement;
-            case 151: return ts.ScriptElementKind.memberSetAccessorElement;
-            case 148:
-            case 147:
-                return ts.ScriptElementKind.memberFunctionElement;
-            case 146:
-            case 145:
-                return ts.ScriptElementKind.memberVariableElement;
-            case 154: return ts.ScriptElementKind.indexSignatureElement;
-            case 153: return ts.ScriptElementKind.constructSignatureElement;
-            case 152: return ts.ScriptElementKind.callSignatureElement;
-            case 149: return ts.ScriptElementKind.constructorImplementationElement;
-            case 142: return ts.ScriptElementKind.typeParameterElement;
-            case 255: return ts.ScriptElementKind.enumMemberElement;
-            case 143: return ts.hasModifier(node, 92) ? ts.ScriptElementKind.memberVariableElement : ts.ScriptElementKind.parameterElement;
             case 230:
-            case 235:
-            case 232:
+                return ts.ScriptElementKind.moduleElement;
+            case 226:
+            case 197:
+                return ts.ScriptElementKind.classElement;
+            case 227: return ts.ScriptElementKind.interfaceElement;
+            case 228: return ts.ScriptElementKind.typeElement;
+            case 229: return ts.ScriptElementKind.enumElement;
+            case 223:
+                return getKindOfVariableDeclaration(node);
+            case 174:
+                return getKindOfVariableDeclaration(ts.getRootDeclaration(node));
+            case 185:
+            case 225:
+            case 184:
+                return ts.ScriptElementKind.functionElement;
+            case 151: return ts.ScriptElementKind.memberGetAccessorElement;
+            case 152: return ts.ScriptElementKind.memberSetAccessorElement;
+            case 149:
+            case 148:
+                return ts.ScriptElementKind.memberFunctionElement;
+            case 147:
+            case 146:
+                return ts.ScriptElementKind.memberVariableElement;
+            case 155: return ts.ScriptElementKind.indexSignatureElement;
+            case 154: return ts.ScriptElementKind.constructSignatureElement;
+            case 153: return ts.ScriptElementKind.callSignatureElement;
+            case 150: return ts.ScriptElementKind.constructorImplementationElement;
+            case 143: return ts.ScriptElementKind.typeParameterElement;
+            case 260: return ts.ScriptElementKind.enumMemberElement;
+            case 144: return ts.hasModifier(node, 92) ? ts.ScriptElementKind.memberVariableElement : ts.ScriptElementKind.parameterElement;
+            case 234:
             case 239:
-            case 233:
+            case 236:
+            case 243:
+            case 237:
                 return ts.ScriptElementKind.alias;
-            case 279:
+            case 284:
                 return ts.ScriptElementKind.typeElement;
             default:
                 return ts.ScriptElementKind.unknown;
@@ -50681,7 +51773,7 @@ var ts;
     }
     ts.getNodeKind = getNodeKind;
     function getStringLiteralTypeForNode(node, typeChecker) {
-        var searchNode = node.parent.kind === 167 ? node.parent : node;
+        var searchNode = node.parent.kind === 171 ? node.parent : node;
         var type = typeChecker.getTypeAtLocation(searchNode);
         if (type && type.flags & 32) {
             return type;
@@ -50694,7 +51786,7 @@ var ts;
             case 98:
                 return true;
             case 70:
-                return ts.identifierIsThisKeyword(node) && node.parent.kind === 143;
+                return ts.identifierIsThisKeyword(node) && node.parent.kind === 144;
             default:
                 return false;
         }
@@ -50738,41 +51830,41 @@ var ts;
             return false;
         }
         switch (n.kind) {
-            case 222:
-            case 223:
-            case 225:
-            case 172:
-            case 168:
-            case 160:
-            case 200:
+            case 226:
             case 227:
-            case 228:
-            case 234:
-            case 238:
-                return nodeEndsWith(n, 17, sourceFile);
-            case 252:
-                return isCompletedNode(n.block, sourceFile);
+            case 229:
             case 176:
+            case 172:
+            case 161:
+            case 204:
+            case 231:
+            case 232:
+            case 238:
+            case 242:
+                return nodeEndsWith(n, 17, sourceFile);
+            case 256:
+                return isCompletedNode(n.block, sourceFile);
+            case 180:
                 if (!n.arguments) {
                     return true;
                 }
-            case 175:
             case 179:
-            case 165:
+            case 183:
+            case 166:
                 return nodeEndsWith(n, 19, sourceFile);
-            case 157:
             case 158:
+            case 159:
                 return isCompletedNode(n.type, sourceFile);
-            case 149:
             case 150:
             case 151:
-            case 221:
-            case 180:
-            case 148:
-            case 147:
-            case 153:
             case 152:
-            case 181:
+            case 225:
+            case 184:
+            case 149:
+            case 148:
+            case 154:
+            case 153:
+            case 185:
                 if (n.body) {
                     return isCompletedNode(n.body, sourceFile);
                 }
@@ -50780,65 +51872,65 @@ var ts;
                     return isCompletedNode(n.type, sourceFile);
                 }
                 return hasChildOfKind(n, 19, sourceFile);
-            case 226:
+            case 230:
                 return n.body && isCompletedNode(n.body, sourceFile);
-            case 204:
+            case 208:
                 if (n.elseStatement) {
                     return isCompletedNode(n.elseStatement, sourceFile);
                 }
                 return isCompletedNode(n.thenStatement, sourceFile);
-            case 203:
+            case 207:
                 return isCompletedNode(n.expression, sourceFile) ||
                     hasChildOfKind(n, 24);
-            case 171:
-            case 169:
-            case 174:
-            case 141:
-            case 162:
+            case 175:
+            case 173:
+            case 178:
+            case 142:
+            case 163:
                 return nodeEndsWith(n, 21, sourceFile);
-            case 154:
+            case 155:
                 if (n.type) {
                     return isCompletedNode(n.type, sourceFile);
                 }
                 return hasChildOfKind(n, 21, sourceFile);
-            case 249:
-            case 250:
+            case 253:
+            case 254:
                 return false;
-            case 207:
-            case 208:
-            case 209:
-            case 206:
+            case 211:
+            case 212:
+            case 213:
+            case 210:
                 return isCompletedNode(n.statement, sourceFile);
-            case 205:
+            case 209:
                 var hasWhileKeyword = findChildOfKind(n, 105, sourceFile);
                 if (hasWhileKeyword) {
                     return nodeEndsWith(n, 19, sourceFile);
                 }
                 return isCompletedNode(n.statement, sourceFile);
-            case 159:
+            case 160:
                 return isCompletedNode(n.exprName, sourceFile);
-            case 183:
-            case 182:
-            case 184:
-            case 191:
-            case 192:
+            case 187:
+            case 186:
+            case 188:
+            case 195:
+            case 196:
                 var unaryWordExpression = n;
                 return isCompletedNode(unaryWordExpression.expression, sourceFile);
-            case 177:
+            case 181:
                 return isCompletedNode(n.template, sourceFile);
-            case 190:
+            case 194:
                 var lastSpan = ts.lastOrUndefined(n.templateSpans);
                 return isCompletedNode(lastSpan, sourceFile);
-            case 198:
+            case 202:
                 return ts.nodeIsPresent(n.literal);
-            case 237:
-            case 231:
+            case 241:
+            case 235:
                 return ts.nodeIsPresent(n.moduleSpecifier);
-            case 186:
+            case 190:
                 return isCompletedNode(n.operand, sourceFile);
-            case 188:
+            case 192:
                 return isCompletedNode(n.right, sourceFile);
-            case 189:
+            case 193:
                 return isCompletedNode(n.whenFalse, sourceFile);
             default:
                 return true;
@@ -50881,7 +51973,7 @@ var ts;
     ts.findChildOfKind = findChildOfKind;
     function findContainingList(node) {
         var syntaxList = ts.forEach(node.parent.getChildren(), function (c) {
-            if (c.kind === 286 && c.pos <= node.pos && c.end >= node.end) {
+            if (c.kind === 291 && c.pos <= node.pos && c.end >= node.end) {
                 return c;
             }
         });
@@ -51016,7 +52108,7 @@ var ts;
                     }
                 }
             }
-            ts.Debug.assert(startNode !== undefined || n.kind === 256);
+            ts.Debug.assert(startNode !== undefined || n.kind === 261);
             if (children.length) {
                 var candidate = findRightmostChildNodeWithTokens(children, children.length);
                 return candidate && findRightmostToken(candidate);
@@ -51061,13 +52153,13 @@ var ts;
         if (token.kind === 26 && token.parent.kind === 10) {
             return true;
         }
-        if (token.kind === 26 && token.parent.kind === 248) {
+        if (token.kind === 26 && token.parent.kind === 252) {
             return true;
         }
-        if (token && token.kind === 17 && token.parent.kind === 248) {
+        if (token && token.kind === 17 && token.parent.kind === 252) {
             return true;
         }
-        if (token.kind === 26 && token.parent.kind === 245) {
+        if (token.kind === 26 && token.parent.kind === 249) {
             return true;
         }
         return false;
@@ -51158,17 +52250,17 @@ var ts;
     }
     ts.getNodeModifiers = getNodeModifiers;
     function getTypeArgumentOrTypeParameterList(node) {
-        if (node.kind === 156 || node.kind === 175) {
+        if (node.kind === 157 || node.kind === 179) {
             return node.typeArguments;
         }
-        if (ts.isFunctionLike(node) || node.kind === 222 || node.kind === 223) {
+        if (ts.isFunctionLike(node) || node.kind === 226 || node.kind === 227) {
             return node.typeParameters;
         }
         return undefined;
     }
     ts.getTypeArgumentOrTypeParameterList = getTypeArgumentOrTypeParameterList;
     function isToken(n) {
-        return n.kind >= 0 && n.kind <= 139;
+        return n.kind >= 0 && n.kind <= 140;
     }
     ts.isToken = isToken;
     function isWord(kind) {
@@ -51227,18 +52319,18 @@ var ts;
     }
     ts.compareDataObjects = compareDataObjects;
     function isArrayLiteralOrObjectLiteralDestructuringPattern(node) {
-        if (node.kind === 171 ||
-            node.kind === 172) {
-            if (node.parent.kind === 188 &&
+        if (node.kind === 175 ||
+            node.kind === 176) {
+            if (node.parent.kind === 192 &&
                 node.parent.left === node &&
                 node.parent.operatorToken.kind === 57) {
                 return true;
             }
-            if (node.parent.kind === 209 &&
+            if (node.parent.kind === 213 &&
                 node.parent.initializer === node) {
                 return true;
             }
-            if (isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.kind === 253 ? node.parent.parent : node.parent)) {
+            if (isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.kind === 257 ? node.parent.parent : node.parent)) {
                 return true;
             }
         }
@@ -51269,7 +52361,7 @@ var ts;
 })(ts || (ts = {}));
 (function (ts) {
     function isFirstDeclarationOfSymbolParameter(symbol) {
-        return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === 143;
+        return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === 144;
     }
     ts.isFirstDeclarationOfSymbolParameter = isFirstDeclarationOfSymbolParameter;
     var displayPartWriter = getDisplayPartWriter();
@@ -51291,8 +52383,8 @@ var ts;
             increaseIndent: function () { indent++; },
             decreaseIndent: function () { indent--; },
             clear: resetWriter,
-            trackSymbol: function () { },
-            reportInaccessibleThisError: function () { }
+            trackSymbol: ts.noop,
+            reportInaccessibleThisError: ts.noop
         };
         function writeIndent() {
             if (lineStart) {
@@ -51444,7 +52536,7 @@ var ts;
             return location.getText();
         }
         else if (ts.isStringOrNumericLiteral(location.kind) &&
-            location.parent.kind === 141) {
+            location.parent.kind === 142) {
             return location.text;
         }
         var localExportDefaultSymbol = ts.getLocalSymbolForExportDefault(symbol);
@@ -51454,7 +52546,7 @@ var ts;
     ts.getDeclaredName = getDeclaredName;
     function isImportOrExportSpecifierName(location) {
         return location.parent &&
-            (location.parent.kind === 235 || location.parent.kind === 239) &&
+            (location.parent.kind === 239 || location.parent.kind === 243) &&
             location.parent.propertyName === location;
     }
     ts.isImportOrExportSpecifierName = isImportOrExportSpecifierName;
@@ -51559,89 +52651,89 @@ var ts;
             function spanInNode(node) {
                 if (node) {
                     switch (node.kind) {
-                        case 201:
+                        case 205:
                             return spanInVariableDeclaration(node.declarationList.declarations[0]);
-                        case 219:
-                        case 146:
-                        case 145:
-                            return spanInVariableDeclaration(node);
-                        case 143:
-                            return spanInParameterDeclaration(node);
-                        case 221:
-                        case 148:
+                        case 223:
                         case 147:
-                        case 150:
-                        case 151:
+                        case 146:
+                            return spanInVariableDeclaration(node);
+                        case 144:
+                            return spanInParameterDeclaration(node);
+                        case 225:
                         case 149:
-                        case 180:
-                        case 181:
+                        case 148:
+                        case 151:
+                        case 152:
+                        case 150:
+                        case 184:
+                        case 185:
                             return spanInFunctionDeclaration(node);
-                        case 200:
+                        case 204:
                             if (ts.isFunctionBlock(node)) {
                                 return spanInFunctionBlock(node);
                             }
-                        case 227:
+                        case 231:
                             return spanInBlock(node);
-                        case 252:
+                        case 256:
                             return spanInBlock(node.block);
-                        case 203:
-                            return textSpan(node.expression);
-                        case 212:
-                            return textSpan(node.getChildAt(0), node.expression);
-                        case 206:
-                            return textSpanEndingAtNextToken(node, node.expression);
-                        case 205:
-                            return spanInNode(node.statement);
-                        case 218:
-                            return textSpan(node.getChildAt(0));
-                        case 204:
-                            return textSpanEndingAtNextToken(node, node.expression);
-                        case 215:
-                            return spanInNode(node.statement);
-                        case 211:
-                        case 210:
-                            return textSpan(node.getChildAt(0), node.label);
                         case 207:
-                            return spanInForStatement(node);
-                        case 208:
+                            return textSpan(node.expression);
+                        case 216:
+                            return textSpan(node.getChildAt(0), node.expression);
+                        case 210:
                             return textSpanEndingAtNextToken(node, node.expression);
                         case 209:
-                            return spanInInitializerOfForLike(node);
-                        case 214:
+                            return spanInNode(node.statement);
+                        case 222:
+                            return textSpan(node.getChildAt(0));
+                        case 208:
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 249:
-                        case 250:
+                        case 219:
+                            return spanInNode(node.statement);
+                        case 215:
+                        case 214:
+                            return textSpan(node.getChildAt(0), node.label);
+                        case 211:
+                            return spanInForStatement(node);
+                        case 212:
+                            return textSpanEndingAtNextToken(node, node.expression);
+                        case 213:
+                            return spanInInitializerOfForLike(node);
+                        case 218:
+                            return textSpanEndingAtNextToken(node, node.expression);
+                        case 253:
+                        case 254:
                             return spanInNode(node.statements[0]);
-                        case 217:
+                        case 221:
                             return spanInBlock(node.tryBlock);
-                        case 216:
+                        case 220:
                             return textSpan(node, node.expression);
-                        case 236:
+                        case 240:
                             return textSpan(node, node.expression);
-                        case 230:
+                        case 234:
                             return textSpan(node, node.moduleReference);
-                        case 231:
+                        case 235:
                             return textSpan(node, node.moduleSpecifier);
-                        case 237:
+                        case 241:
                             return textSpan(node, node.moduleSpecifier);
-                        case 226:
+                        case 230:
                             if (ts.getModuleInstanceState(node) !== 1) {
                                 return undefined;
                             }
-                        case 222:
-                        case 225:
-                        case 255:
-                        case 170:
+                        case 226:
+                        case 229:
+                        case 260:
+                        case 174:
                             return textSpan(node);
-                        case 213:
+                        case 217:
                             return spanInNode(node.statement);
-                        case 144:
+                        case 145:
                             return spanInNodeArray(node.parent.decorators);
-                        case 168:
-                        case 169:
+                        case 172:
+                        case 173:
                             return spanInBindingPattern(node);
-                        case 223:
-                        case 224:
+                        case 227:
+                        case 228:
                             return undefined;
                         case 24:
                         case 1:
@@ -51669,20 +52761,20 @@ var ts;
                         case 73:
                         case 86:
                             return spanInNextNode(node);
-                        case 139:
+                        case 140:
                             return spanInOfKeyword(node);
                         default:
                             if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node)) {
                                 return spanInArrayLiteralOrObjectLiteralDestructuringPattern(node);
                             }
                             if ((node.kind === 70 ||
-                                node.kind == 192 ||
-                                node.kind === 253 ||
-                                node.kind === 254) &&
+                                node.kind == 196 ||
+                                node.kind === 257 ||
+                                node.kind === 258) &&
                                 ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent)) {
                                 return textSpan(node);
                             }
-                            if (node.kind === 188) {
+                            if (node.kind === 192) {
                                 var binaryExpression = node;
                                 if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(binaryExpression.left)) {
                                     return spanInArrayLiteralOrObjectLiteralDestructuringPattern(binaryExpression.left);
@@ -51697,38 +52789,38 @@ var ts;
                             }
                             if (ts.isPartOfExpression(node)) {
                                 switch (node.parent.kind) {
-                                    case 205:
-                                        return spanInPreviousNode(node);
-                                    case 144:
-                                        return spanInNode(node.parent);
-                                    case 207:
                                     case 209:
+                                        return spanInPreviousNode(node);
+                                    case 145:
+                                        return spanInNode(node.parent);
+                                    case 211:
+                                    case 213:
                                         return textSpan(node);
-                                    case 188:
+                                    case 192:
                                         if (node.parent.operatorToken.kind === 25) {
                                             return textSpan(node);
                                         }
                                         break;
-                                    case 181:
+                                    case 185:
                                         if (node.parent.body === node) {
                                             return textSpan(node);
                                         }
                                         break;
                                 }
                             }
-                            if (node.parent.kind === 253 &&
+                            if (node.parent.kind === 257 &&
                                 node.parent.name === node &&
                                 !ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.parent)) {
                                 return spanInNode(node.parent.initializer);
                             }
-                            if (node.parent.kind === 178 && node.parent.type === node) {
+                            if (node.parent.kind === 182 && node.parent.type === node) {
                                 return spanInNextNode(node.parent.type);
                             }
                             if (ts.isFunctionLike(node.parent) && node.parent.type === node) {
                                 return spanInPreviousNode(node);
                             }
-                            if ((node.parent.kind === 219 ||
-                                node.parent.kind === 143)) {
+                            if ((node.parent.kind === 223 ||
+                                node.parent.kind === 144)) {
                                 var paramOrVarDecl = node.parent;
                                 if (paramOrVarDecl.initializer === node ||
                                     paramOrVarDecl.type === node ||
@@ -51736,7 +52828,7 @@ var ts;
                                     return spanInPreviousNode(node);
                                 }
                             }
-                            if (node.parent.kind === 188) {
+                            if (node.parent.kind === 192) {
                                 var binaryExpression = node.parent;
                                 if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(binaryExpression.left) &&
                                     (binaryExpression.right === node ||
@@ -51757,7 +52849,7 @@ var ts;
                     }
                 }
                 function spanInVariableDeclaration(variableDeclaration) {
-                    if (variableDeclaration.parent.parent.kind === 208) {
+                    if (variableDeclaration.parent.parent.kind === 212) {
                         return spanInNode(variableDeclaration.parent.parent);
                     }
                     if (ts.isBindingPattern(variableDeclaration.name)) {
@@ -51765,7 +52857,7 @@ var ts;
                     }
                     if (variableDeclaration.initializer ||
                         ts.hasModifier(variableDeclaration, 1) ||
-                        variableDeclaration.parent.parent.kind === 209) {
+                        variableDeclaration.parent.parent.kind === 213) {
                         return textSpanFromVariableDeclaration(variableDeclaration);
                     }
                     var declarations = variableDeclaration.parent.declarations;
@@ -51797,7 +52889,7 @@ var ts;
                 }
                 function canFunctionHaveSpanInWholeDeclaration(functionDeclaration) {
                     return ts.hasModifier(functionDeclaration, 1) ||
-                        (functionDeclaration.parent.kind === 222 && functionDeclaration.kind !== 149);
+                        (functionDeclaration.parent.kind === 226 && functionDeclaration.kind !== 150);
                 }
                 function spanInFunctionDeclaration(functionDeclaration) {
                     if (!functionDeclaration.body) {
@@ -51817,22 +52909,22 @@ var ts;
                 }
                 function spanInBlock(block) {
                     switch (block.parent.kind) {
-                        case 226:
+                        case 230:
                             if (ts.getModuleInstanceState(block.parent) !== 1) {
                                 return undefined;
                             }
-                        case 206:
-                        case 204:
+                        case 210:
                         case 208:
+                        case 212:
                             return spanInNodeIfStartsOnSameLine(block.parent, block.statements[0]);
-                        case 207:
-                        case 209:
+                        case 211:
+                        case 213:
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(block.pos, sourceFile, block.parent), block.statements[0]);
                     }
                     return spanInNode(block.statements[0]);
                 }
                 function spanInInitializerOfForLike(forLikeStatement) {
-                    if (forLikeStatement.initializer.kind === 220) {
+                    if (forLikeStatement.initializer.kind === 224) {
                         var variableDeclarationList = forLikeStatement.initializer;
                         if (variableDeclarationList.declarations.length > 0) {
                             return spanInNode(variableDeclarationList.declarations[0]);
@@ -51854,62 +52946,62 @@ var ts;
                     }
                 }
                 function spanInBindingPattern(bindingPattern) {
-                    var firstBindingElement = ts.forEach(bindingPattern.elements, function (element) { return element.kind !== 194 ? element : undefined; });
+                    var firstBindingElement = ts.forEach(bindingPattern.elements, function (element) { return element.kind !== 198 ? element : undefined; });
                     if (firstBindingElement) {
                         return spanInNode(firstBindingElement);
                     }
-                    if (bindingPattern.parent.kind === 170) {
+                    if (bindingPattern.parent.kind === 174) {
                         return textSpan(bindingPattern.parent);
                     }
                     return textSpanFromVariableDeclaration(bindingPattern.parent);
                 }
                 function spanInArrayLiteralOrObjectLiteralDestructuringPattern(node) {
-                    ts.Debug.assert(node.kind !== 169 && node.kind !== 168);
-                    var elements = node.kind === 171 ?
+                    ts.Debug.assert(node.kind !== 173 && node.kind !== 172);
+                    var elements = node.kind === 175 ?
                         node.elements :
                         node.properties;
-                    var firstBindingElement = ts.forEach(elements, function (element) { return element.kind !== 194 ? element : undefined; });
+                    var firstBindingElement = ts.forEach(elements, function (element) { return element.kind !== 198 ? element : undefined; });
                     if (firstBindingElement) {
                         return spanInNode(firstBindingElement);
                     }
-                    return textSpan(node.parent.kind === 188 ? node.parent : node);
+                    return textSpan(node.parent.kind === 192 ? node.parent : node);
                 }
                 function spanInOpenBraceToken(node) {
                     switch (node.parent.kind) {
-                        case 225:
+                        case 229:
                             var enumDeclaration = node.parent;
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), enumDeclaration.members.length ? enumDeclaration.members[0] : enumDeclaration.getLastToken(sourceFile));
-                        case 222:
+                        case 226:
                             var classDeclaration = node.parent;
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), classDeclaration.members.length ? classDeclaration.members[0] : classDeclaration.getLastToken(sourceFile));
-                        case 228:
+                        case 232:
                             return spanInNodeIfStartsOnSameLine(node.parent.parent, node.parent.clauses[0]);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInCloseBraceToken(node) {
                     switch (node.parent.kind) {
-                        case 227:
+                        case 231:
                             if (ts.getModuleInstanceState(node.parent.parent) !== 1) {
                                 return undefined;
                             }
-                        case 225:
-                        case 222:
+                        case 229:
+                        case 226:
                             return textSpan(node);
-                        case 200:
+                        case 204:
                             if (ts.isFunctionBlock(node.parent)) {
                                 return textSpan(node);
                             }
-                        case 252:
+                        case 256:
                             return spanInNode(ts.lastOrUndefined(node.parent.statements));
-                        case 228:
+                        case 232:
                             var caseBlock = node.parent;
                             var lastClause = ts.lastOrUndefined(caseBlock.clauses);
                             if (lastClause) {
                                 return spanInNode(ts.lastOrUndefined(lastClause.statements));
                             }
                             return undefined;
-                        case 168:
+                        case 172:
                             var bindingPattern = node.parent;
                             return spanInNode(ts.lastOrUndefined(bindingPattern.elements) || bindingPattern);
                         default:
@@ -51922,7 +53014,7 @@ var ts;
                 }
                 function spanInCloseBracketToken(node) {
                     switch (node.parent.kind) {
-                        case 169:
+                        case 173:
                             var bindingPattern = node.parent;
                             return textSpan(ts.lastOrUndefined(bindingPattern.elements) || bindingPattern);
                         default:
@@ -51934,33 +53026,33 @@ var ts;
                     }
                 }
                 function spanInOpenParenToken(node) {
-                    if (node.parent.kind === 205 ||
-                        node.parent.kind === 175 ||
-                        node.parent.kind === 176) {
+                    if (node.parent.kind === 209 ||
+                        node.parent.kind === 179 ||
+                        node.parent.kind === 180) {
                         return spanInPreviousNode(node);
                     }
-                    if (node.parent.kind === 179) {
+                    if (node.parent.kind === 183) {
                         return spanInNextNode(node);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInCloseParenToken(node) {
                     switch (node.parent.kind) {
-                        case 180:
-                        case 221:
-                        case 181:
-                        case 148:
-                        case 147:
-                        case 150:
-                        case 151:
+                        case 184:
+                        case 225:
+                        case 185:
                         case 149:
-                        case 206:
-                        case 205:
-                        case 207:
+                        case 148:
+                        case 151:
+                        case 152:
+                        case 150:
+                        case 210:
                         case 209:
-                        case 175:
-                        case 176:
+                        case 211:
+                        case 213:
                         case 179:
+                        case 180:
+                        case 183:
                             return spanInPreviousNode(node);
                         default:
                             return spanInNode(node.parent);
@@ -51968,26 +53060,26 @@ var ts;
                 }
                 function spanInColonToken(node) {
                     if (ts.isFunctionLike(node.parent) ||
-                        node.parent.kind === 253 ||
-                        node.parent.kind === 143) {
+                        node.parent.kind === 257 ||
+                        node.parent.kind === 144) {
                         return spanInPreviousNode(node);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInGreaterThanOrLessThanToken(node) {
-                    if (node.parent.kind === 178) {
+                    if (node.parent.kind === 182) {
                         return spanInNextNode(node);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInWhileKeyword(node) {
-                    if (node.parent.kind === 205) {
+                    if (node.parent.kind === 209) {
                         return textSpanEndingAtNextToken(node, node.parent.expression);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInOfKeyword(node) {
-                    if (node.parent.kind === 209) {
+                    if (node.parent.kind === 213) {
                         return spanInNextNode(node);
                     }
                     return spanInNode(node.parent);
@@ -52000,7 +53092,7 @@ var ts;
 var ts;
 (function (ts) {
     function createClassifier() {
-        var scanner = ts.createScanner(4, false);
+        var scanner = ts.createScanner(5, false);
         var noRegexTable = [];
         noRegexTable[70] = true;
         noRegexTable[9] = true;
@@ -52018,7 +53110,7 @@ var ts;
         function canFollow(keyword1, keyword2) {
             if (ts.isAccessibilityModifier(keyword1)) {
                 if (keyword2 === 124 ||
-                    keyword2 === 132 ||
+                    keyword2 === 133 ||
                     keyword2 === 122 ||
                     keyword2 === 114) {
                     return true;
@@ -52134,10 +53226,10 @@ var ts;
                         angleBracketStack--;
                     }
                     else if (token === 118 ||
-                        token === 133 ||
-                        token === 131 ||
+                        token === 134 ||
+                        token === 132 ||
                         token === 121 ||
-                        token === 134) {
+                        token === 135) {
                         if (angleBracketStack > 0 && !syntacticClassifierAbsent) {
                             token = 70;
                         }
@@ -52292,7 +53384,7 @@ var ts;
             }
         }
         function isKeyword(token) {
-            return token >= 71 && token <= 139;
+            return token >= 71 && token <= 140;
         }
         function classFromKind(token) {
             if (isKeyword(token)) {
@@ -52338,10 +53430,10 @@ var ts;
     ts.getSemanticClassifications = getSemanticClassifications;
     function checkForClassificationCancellation(cancellationToken, kind) {
         switch (kind) {
+            case 230:
             case 226:
-            case 222:
-            case 223:
-            case 221:
+            case 227:
+            case 225:
                 cancellationToken.throwIfCancellationRequested();
         }
     }
@@ -52385,7 +53477,7 @@ var ts;
             return undefined;
             function hasValueSideModule(symbol) {
                 return ts.forEach(symbol.declarations, function (declaration) {
-                    return declaration.kind === 226 &&
+                    return declaration.kind === 230 &&
                         ts.getModuleInstanceState(declaration) === 1;
                 });
             }
@@ -52457,8 +53549,8 @@ var ts;
     function getEncodedSyntacticClassifications(cancellationToken, sourceFile, span) {
         var spanStart = span.start;
         var spanLength = span.length;
-        var triviaScanner = ts.createScanner(4, false, sourceFile.languageVariant, sourceFile.text);
-        var mergeConflictScanner = ts.createScanner(4, false, sourceFile.languageVariant, sourceFile.text);
+        var triviaScanner = ts.createScanner(5, false, sourceFile.languageVariant, sourceFile.text);
+        var mergeConflictScanner = ts.createScanner(5, false, sourceFile.languageVariant, sourceFile.text);
         var result = [];
         processElement(sourceFile);
         return { spans: result, endOfLineState: 0 };
@@ -52526,16 +53618,16 @@ var ts;
                     pushClassification(tag.tagName.pos, tag.tagName.end - tag.tagName.pos, 18);
                     pos = tag.tagName.end;
                     switch (tag.kind) {
-                        case 275:
+                        case 280:
                             processJSDocParameterTag(tag);
                             break;
-                        case 278:
+                        case 283:
                             processJSDocTemplateTag(tag);
                             break;
-                        case 277:
+                        case 282:
                             processElement(tag.typeExpression);
                             break;
-                        case 276:
+                        case 281:
                             processElement(tag.typeExpression);
                             break;
                     }
@@ -52616,22 +53708,22 @@ var ts;
         }
         function tryClassifyJsxElementName(token) {
             switch (token.parent && token.parent.kind) {
-                case 244:
+                case 248:
                     if (token.parent.tagName === token) {
                         return 19;
                     }
                     break;
-                case 245:
+                case 249:
                     if (token.parent.tagName === token) {
                         return 20;
                     }
                     break;
-                case 243:
+                case 247:
                     if (token.parent.tagName === token) {
                         return 21;
                     }
                     break;
-                case 246:
+                case 250:
                     if (token.parent.name === token) {
                         return 22;
                     }
@@ -52651,17 +53743,17 @@ var ts;
             if (ts.isPunctuation(tokenKind)) {
                 if (token) {
                     if (tokenKind === 57) {
-                        if (token.parent.kind === 219 ||
-                            token.parent.kind === 146 ||
-                            token.parent.kind === 143 ||
-                            token.parent.kind === 246) {
+                        if (token.parent.kind === 223 ||
+                            token.parent.kind === 147 ||
+                            token.parent.kind === 144 ||
+                            token.parent.kind === 250) {
                             return 5;
                         }
                     }
-                    if (token.parent.kind === 188 ||
-                        token.parent.kind === 186 ||
-                        token.parent.kind === 187 ||
-                        token.parent.kind === 189) {
+                    if (token.parent.kind === 192 ||
+                        token.parent.kind === 190 ||
+                        token.parent.kind === 191 ||
+                        token.parent.kind === 193) {
                         return 5;
                     }
                 }
@@ -52671,7 +53763,7 @@ var ts;
                 return 4;
             }
             else if (tokenKind === 9) {
-                return token.parent.kind === 246 ? 24 : 6;
+                return token.parent.kind === 250 ? 24 : 6;
             }
             else if (tokenKind === 11) {
                 return 6;
@@ -52685,32 +53777,32 @@ var ts;
             else if (tokenKind === 70) {
                 if (token) {
                     switch (token.parent.kind) {
-                        case 222:
+                        case 226:
                             if (token.parent.name === token) {
                                 return 11;
                             }
                             return;
-                        case 142:
+                        case 143:
                             if (token.parent.name === token) {
                                 return 15;
                             }
                             return;
-                        case 223:
+                        case 227:
                             if (token.parent.name === token) {
                                 return 13;
                             }
                             return;
-                        case 225:
+                        case 229:
                             if (token.parent.name === token) {
                                 return 12;
                             }
                             return;
-                        case 226:
+                        case 230:
                             if (token.parent.name === token) {
                                 return 14;
                             }
                             return;
-                        case 143:
+                        case 144:
                             if (token.parent.name === token) {
                                 return ts.isThisIdentifier(token) ? 3 : 17;
                             }
@@ -52765,7 +53857,7 @@ var ts;
             else {
                 if (!symbols || symbols.length === 0) {
                     if (sourceFile.languageVariant === 1 &&
-                        location.parent && location.parent.kind === 245) {
+                        location.parent && location.parent.kind === 249) {
                         var tagName = location.parent.parent.openingElement.tagName;
                         entries.push({
                             name: tagName.text,
@@ -52787,13 +53879,13 @@ var ts;
             function getJavaScriptCompletionEntries(sourceFile, position, uniqueNames) {
                 var entries = [];
                 var nameTable = ts.getNameTable(sourceFile);
-                for (var name_46 in nameTable) {
-                    if (nameTable[name_46] === position) {
+                for (var name_43 in nameTable) {
+                    if (nameTable[name_43] === position) {
                         continue;
                     }
-                    if (!uniqueNames[name_46]) {
-                        uniqueNames[name_46] = name_46;
-                        var displayName = getCompletionEntryDisplayName(ts.unescapeIdentifier(name_46), compilerOptions.target, true);
+                    if (!uniqueNames[name_43]) {
+                        uniqueNames[name_43] = name_43;
+                        var displayName = getCompletionEntryDisplayName(ts.unescapeIdentifier(name_43), compilerOptions.target, true);
                         if (displayName) {
                             var entry = {
                                 name: displayName,
@@ -52843,15 +53935,15 @@ var ts;
                 if (!node || node.kind !== 9) {
                     return undefined;
                 }
-                if (node.parent.kind === 253 &&
-                    node.parent.parent.kind === 172 &&
+                if (node.parent.kind === 257 &&
+                    node.parent.parent.kind === 176 &&
                     node.parent.name === node) {
                     return getStringLiteralCompletionEntriesFromPropertyAssignment(node.parent);
                 }
                 else if (ts.isElementAccessExpression(node.parent) && node.parent.argumentExpression === node) {
                     return getStringLiteralCompletionEntriesFromElementAccess(node.parent);
                 }
-                else if (node.parent.kind === 231 || ts.isExpressionOfExternalModuleImportEqualsDeclaration(node) || ts.isRequireCall(node.parent, false)) {
+                else if (node.parent.kind === 235 || ts.isExpressionOfExternalModuleImportEqualsDeclaration(node) || ts.isRequireCall(node.parent, false)) {
                     return getStringLiteralCompletionEntriesFromModuleNames(node);
                 }
                 else {
@@ -52914,7 +54006,7 @@ var ts;
                 if (!type) {
                     return;
                 }
-                if (type.flags & 524288) {
+                if (type.flags & 65536) {
                     ts.forEach(type.types, function (t) { return addStringLiteralCompletionsFromType(t, result); });
                 }
                 else {
@@ -53215,11 +54307,11 @@ var ts;
                     if (currentConfigPath) {
                         paths.push(currentConfigPath);
                         currentDir = ts.getDirectoryPath(currentConfigPath);
-                        var parent_16 = ts.getDirectoryPath(currentDir);
-                        if (currentDir === parent_16) {
+                        var parent_14 = ts.getDirectoryPath(currentDir);
+                        if (currentDir === parent_14) {
                             break;
                         }
-                        currentDir = parent_16;
+                        currentDir = parent_14;
                     }
                     else {
                         break;
@@ -53351,9 +54443,9 @@ var ts;
                         isJsDocTagName = true;
                     }
                     switch (tag.kind) {
-                        case 277:
-                        case 275:
-                        case 276:
+                        case 282:
+                        case 280:
+                        case 281:
                             var tagWithExpression = tag;
                             if (tagWithExpression.typeExpression) {
                                 insideJsDocTagExpression = tagWithExpression.typeExpression.pos < position && position < tagWithExpression.typeExpression.end;
@@ -53388,13 +54480,13 @@ var ts;
                     log("Returning an empty list because completion was requested in an invalid position.");
                     return undefined;
                 }
-                var parent_17 = contextToken.parent, kind = contextToken.kind;
+                var parent_15 = contextToken.parent, kind = contextToken.kind;
                 if (kind === 22) {
-                    if (parent_17.kind === 173) {
+                    if (parent_15.kind === 177) {
                         node = contextToken.parent.expression;
                         isRightOfDot = true;
                     }
-                    else if (parent_17.kind === 140) {
+                    else if (parent_15.kind === 141) {
                         node = contextToken.parent.left;
                         isRightOfDot = true;
                     }
@@ -53407,7 +54499,7 @@ var ts;
                         isRightOfOpenTag = true;
                         location = contextToken;
                     }
-                    else if (kind === 40 && contextToken.parent.kind === 245) {
+                    else if (kind === 40 && contextToken.parent.kind === 249) {
                         isStartingCloseTag = true;
                         location = contextToken;
                     }
@@ -53452,7 +54544,7 @@ var ts;
                 isGlobalCompletion = false;
                 isMemberCompletion = true;
                 isNewIdentifierLocation = false;
-                if (node.kind === 70 || node.kind === 140 || node.kind === 173) {
+                if (node.kind === 70 || node.kind === 141 || node.kind === 177) {
                     var symbol = typeChecker.getSymbolAtLocation(node);
                     if (symbol && symbol.flags & 8388608) {
                         symbol = typeChecker.getAliasedSymbol(symbol);
@@ -53477,7 +54569,7 @@ var ts;
                             symbols.push(symbol);
                         }
                     }
-                    if (isJavaScriptFile && type.flags & 524288) {
+                    if (isJavaScriptFile && type.flags & 65536) {
                         var unionType = type;
                         for (var _b = 0, _c = unionType.types; _b < _c.length; _b++) {
                             var elementType = _c[_b];
@@ -53498,7 +54590,7 @@ var ts;
                 }
                 if (jsxContainer = tryGetContainingJsxElement(contextToken)) {
                     var attrsType = void 0;
-                    if ((jsxContainer.kind === 243) || (jsxContainer.kind === 244)) {
+                    if ((jsxContainer.kind === 247) || (jsxContainer.kind === 248)) {
                         attrsType = typeChecker.getJsxElementAttributesType(jsxContainer);
                         if (attrsType) {
                             symbols = filterJsxAttributes(typeChecker.getPropertiesOfType(attrsType), jsxContainer.attributes);
@@ -53519,9 +54611,9 @@ var ts;
                 var scopeNode = getScopeNode(contextToken, adjustedPosition, sourceFile) || sourceFile;
                 if (scopeNode) {
                     isGlobalCompletion =
-                        scopeNode.kind === 256 ||
-                            scopeNode.kind === 190 ||
-                            scopeNode.kind === 248 ||
+                        scopeNode.kind === 261 ||
+                            scopeNode.kind === 194 ||
+                            scopeNode.kind === 252 ||
                             ts.isStatement(scopeNode);
                 }
                 var symbolMeanings = 793064 | 107455 | 1920 | 8388608;
@@ -53549,11 +54641,11 @@ var ts;
                     return true;
                 }
                 if (contextToken.kind === 28 && contextToken.parent) {
-                    if (contextToken.parent.kind === 244) {
+                    if (contextToken.parent.kind === 248) {
                         return true;
                     }
-                    if (contextToken.parent.kind === 245 || contextToken.parent.kind === 243) {
-                        return contextToken.parent.parent && contextToken.parent.parent.kind === 242;
+                    if (contextToken.parent.kind === 249 || contextToken.parent.kind === 247) {
+                        return contextToken.parent.parent && contextToken.parent.parent.kind === 246;
                     }
                 }
                 return false;
@@ -53563,40 +54655,40 @@ var ts;
                     var containingNodeKind = previousToken.parent.kind;
                     switch (previousToken.kind) {
                         case 25:
-                            return containingNodeKind === 175
-                                || containingNodeKind === 149
-                                || containingNodeKind === 176
-                                || containingNodeKind === 171
-                                || containingNodeKind === 188
-                                || containingNodeKind === 157;
+                            return containingNodeKind === 179
+                                || containingNodeKind === 150
+                                || containingNodeKind === 180
+                                || containingNodeKind === 175
+                                || containingNodeKind === 192
+                                || containingNodeKind === 158;
                         case 18:
-                            return containingNodeKind === 175
-                                || containingNodeKind === 149
-                                || containingNodeKind === 176
-                                || containingNodeKind === 179
-                                || containingNodeKind === 165;
+                            return containingNodeKind === 179
+                                || containingNodeKind === 150
+                                || containingNodeKind === 180
+                                || containingNodeKind === 183
+                                || containingNodeKind === 166;
                         case 20:
-                            return containingNodeKind === 171
-                                || containingNodeKind === 154
-                                || containingNodeKind === 141;
-                        case 126:
+                            return containingNodeKind === 175
+                                || containingNodeKind === 155
+                                || containingNodeKind === 142;
                         case 127:
+                        case 128:
                             return true;
                         case 22:
-                            return containingNodeKind === 226;
+                            return containingNodeKind === 230;
                         case 16:
-                            return containingNodeKind === 222;
+                            return containingNodeKind === 226;
                         case 57:
-                            return containingNodeKind === 219
-                                || containingNodeKind === 188;
+                            return containingNodeKind === 223
+                                || containingNodeKind === 192;
                         case 13:
-                            return containingNodeKind === 190;
+                            return containingNodeKind === 194;
                         case 14:
-                            return containingNodeKind === 198;
+                            return containingNodeKind === 202;
                         case 113:
                         case 111:
                         case 112:
-                            return containingNodeKind === 146;
+                            return containingNodeKind === 147;
                     }
                     switch (previousToken.getText()) {
                         case "public":
@@ -53627,22 +54719,22 @@ var ts;
                 isMemberCompletion = true;
                 var typeForObject;
                 var existingMembers;
-                if (objectLikeContainer.kind === 172) {
+                if (objectLikeContainer.kind === 176) {
                     isNewIdentifierLocation = true;
                     typeForObject = typeChecker.getContextualType(objectLikeContainer);
                     typeForObject = typeForObject && typeForObject.getNonNullableType();
                     existingMembers = objectLikeContainer.properties;
                 }
-                else if (objectLikeContainer.kind === 168) {
+                else if (objectLikeContainer.kind === 172) {
                     isNewIdentifierLocation = false;
                     var rootDeclaration = ts.getRootDeclaration(objectLikeContainer.parent);
                     if (ts.isVariableLike(rootDeclaration)) {
                         var canGetType = !!(rootDeclaration.initializer || rootDeclaration.type);
-                        if (!canGetType && rootDeclaration.kind === 143) {
+                        if (!canGetType && rootDeclaration.kind === 144) {
                             if (ts.isExpression(rootDeclaration.parent)) {
                                 canGetType = !!typeChecker.getContextualType(rootDeclaration.parent);
                             }
-                            else if (rootDeclaration.parent.kind === 148 || rootDeclaration.parent.kind === 151) {
+                            else if (rootDeclaration.parent.kind === 149 || rootDeclaration.parent.kind === 152) {
                                 canGetType = ts.isExpression(rootDeclaration.parent.parent) && !!typeChecker.getContextualType(rootDeclaration.parent.parent);
                             }
                         }
@@ -53668,9 +54760,9 @@ var ts;
                 return true;
             }
             function tryGetImportOrExportClauseCompletionSymbols(namedImportsOrExports) {
-                var declarationKind = namedImportsOrExports.kind === 234 ?
-                    231 :
-                    237;
+                var declarationKind = namedImportsOrExports.kind === 238 ?
+                    235 :
+                    241;
                 var importOrExportDeclaration = ts.getAncestor(namedImportsOrExports, declarationKind);
                 var moduleSpecifier = importOrExportDeclaration.moduleSpecifier;
                 if (!moduleSpecifier) {
@@ -53691,9 +54783,9 @@ var ts;
                     switch (contextToken.kind) {
                         case 16:
                         case 25:
-                            var parent_18 = contextToken.parent;
-                            if (parent_18 && (parent_18.kind === 172 || parent_18.kind === 168)) {
-                                return parent_18;
+                            var parent_16 = contextToken.parent;
+                            if (parent_16 && (parent_16.kind === 176 || parent_16.kind === 172)) {
+                                return parent_16;
                             }
                             break;
                     }
@@ -53706,8 +54798,8 @@ var ts;
                         case 16:
                         case 25:
                             switch (contextToken.parent.kind) {
-                                case 234:
                                 case 238:
+                                case 242:
                                     return contextToken.parent;
                             }
                     }
@@ -53716,34 +54808,34 @@ var ts;
             }
             function tryGetContainingJsxElement(contextToken) {
                 if (contextToken) {
-                    var parent_19 = contextToken.parent;
+                    var parent_17 = contextToken.parent;
                     switch (contextToken.kind) {
                         case 27:
                         case 40:
                         case 70:
-                        case 246:
-                        case 247:
-                            if (parent_19 && (parent_19.kind === 243 || parent_19.kind === 244)) {
-                                return parent_19;
+                        case 250:
+                        case 251:
+                            if (parent_17 && (parent_17.kind === 247 || parent_17.kind === 248)) {
+                                return parent_17;
                             }
-                            else if (parent_19.kind === 246) {
-                                return parent_19.parent;
+                            else if (parent_17.kind === 250) {
+                                return parent_17.parent;
                             }
                             break;
                         case 9:
-                            if (parent_19 && ((parent_19.kind === 246) || (parent_19.kind === 247))) {
-                                return parent_19.parent;
+                            if (parent_17 && ((parent_17.kind === 250) || (parent_17.kind === 251))) {
+                                return parent_17.parent;
                             }
                             break;
                         case 17:
-                            if (parent_19 &&
-                                parent_19.kind === 248 &&
-                                parent_19.parent &&
-                                (parent_19.parent.kind === 246)) {
-                                return parent_19.parent.parent;
+                            if (parent_17 &&
+                                parent_17.kind === 252 &&
+                                parent_17.parent &&
+                                (parent_17.parent.kind === 250)) {
+                                return parent_17.parent.parent;
                             }
-                            if (parent_19 && parent_19.kind === 247) {
-                                return parent_19.parent;
+                            if (parent_17 && parent_17.kind === 251) {
+                                return parent_17.parent;
                             }
                             break;
                     }
@@ -53752,16 +54844,16 @@ var ts;
             }
             function isFunction(kind) {
                 switch (kind) {
-                    case 180:
-                    case 181:
-                    case 221:
+                    case 184:
+                    case 185:
+                    case 225:
+                    case 149:
                     case 148:
-                    case 147:
-                    case 150:
                     case 151:
                     case 152:
                     case 153:
                     case 154:
+                    case 155:
                         return true;
                 }
                 return false;
@@ -53770,66 +54862,66 @@ var ts;
                 var containingNodeKind = contextToken.parent.kind;
                 switch (contextToken.kind) {
                     case 25:
-                        return containingNodeKind === 219 ||
-                            containingNodeKind === 220 ||
-                            containingNodeKind === 201 ||
-                            containingNodeKind === 225 ||
+                        return containingNodeKind === 223 ||
+                            containingNodeKind === 224 ||
+                            containingNodeKind === 205 ||
+                            containingNodeKind === 229 ||
                             isFunction(containingNodeKind) ||
-                            containingNodeKind === 222 ||
-                            containingNodeKind === 193 ||
-                            containingNodeKind === 223 ||
-                            containingNodeKind === 169 ||
-                            containingNodeKind === 224;
+                            containingNodeKind === 226 ||
+                            containingNodeKind === 197 ||
+                            containingNodeKind === 227 ||
+                            containingNodeKind === 173 ||
+                            containingNodeKind === 228;
                     case 22:
-                        return containingNodeKind === 169;
+                        return containingNodeKind === 173;
                     case 55:
-                        return containingNodeKind === 170;
+                        return containingNodeKind === 174;
                     case 20:
-                        return containingNodeKind === 169;
+                        return containingNodeKind === 173;
                     case 18:
-                        return containingNodeKind === 252 ||
+                        return containingNodeKind === 256 ||
                             isFunction(containingNodeKind);
                     case 16:
-                        return containingNodeKind === 225 ||
-                            containingNodeKind === 223 ||
-                            containingNodeKind === 160;
+                        return containingNodeKind === 229 ||
+                            containingNodeKind === 227 ||
+                            containingNodeKind === 161;
                     case 24:
-                        return containingNodeKind === 145 &&
+                        return containingNodeKind === 146 &&
                             contextToken.parent && contextToken.parent.parent &&
-                            (contextToken.parent.parent.kind === 223 ||
-                                contextToken.parent.parent.kind === 160);
+                            (contextToken.parent.parent.kind === 227 ||
+                                contextToken.parent.parent.kind === 161);
                     case 26:
-                        return containingNodeKind === 222 ||
-                            containingNodeKind === 193 ||
-                            containingNodeKind === 223 ||
-                            containingNodeKind === 224 ||
+                        return containingNodeKind === 226 ||
+                            containingNodeKind === 197 ||
+                            containingNodeKind === 227 ||
+                            containingNodeKind === 228 ||
                             isFunction(containingNodeKind);
                     case 114:
-                        return containingNodeKind === 146;
+                        return containingNodeKind === 147;
                     case 23:
-                        return containingNodeKind === 143 ||
+                        return containingNodeKind === 144 ||
                             (contextToken.parent && contextToken.parent.parent &&
-                                contextToken.parent.parent.kind === 169);
+                                contextToken.parent.parent.kind === 173);
                     case 113:
                     case 111:
                     case 112:
-                        return containingNodeKind === 143;
+                        return containingNodeKind === 144;
                     case 117:
-                        return containingNodeKind === 235 ||
-                            containingNodeKind === 239 ||
-                            containingNodeKind === 233;
+                        return containingNodeKind === 239 ||
+                            containingNodeKind === 243 ||
+                            containingNodeKind === 237;
                     case 74:
                     case 82:
                     case 108:
                     case 88:
                     case 103:
                     case 124:
-                    case 132:
+                    case 133:
                     case 90:
                     case 109:
                     case 75:
                     case 115:
-                    case 135:
+                    case 136:
                         return true;
                 }
                 switch (contextToken.getText()) {
@@ -53866,8 +54958,8 @@ var ts;
                     if (element.getStart() <= position && position <= element.getEnd()) {
                         continue;
                     }
-                    var name_47 = element.propertyName || element.name;
-                    existingImportsOrExports[name_47.text] = true;
+                    var name_44 = element.propertyName || element.name;
+                    existingImportsOrExports[name_44.text] = true;
                 }
                 if (!ts.someProperties(existingImportsOrExports)) {
                     return ts.filter(exportsOfModule, function (e) { return e.name !== "default"; });
@@ -53881,17 +54973,19 @@ var ts;
                 var existingMemberNames = ts.createMap();
                 for (var _i = 0, existingMembers_1 = existingMembers; _i < existingMembers_1.length; _i++) {
                     var m = existingMembers_1[_i];
-                    if (m.kind !== 253 &&
-                        m.kind !== 254 &&
-                        m.kind !== 170 &&
-                        m.kind !== 148) {
+                    if (m.kind !== 257 &&
+                        m.kind !== 258 &&
+                        m.kind !== 174 &&
+                        m.kind !== 149 &&
+                        m.kind !== 151 &&
+                        m.kind !== 152) {
                         continue;
                     }
                     if (m.getStart() <= position && position <= m.getEnd()) {
                         continue;
                     }
                     var existingName = void 0;
-                    if (m.kind === 170 && m.propertyName) {
+                    if (m.kind === 174 && m.propertyName) {
                         if (m.propertyName.kind === 70) {
                             existingName = m.propertyName.text;
                         }
@@ -53910,7 +55004,7 @@ var ts;
                     if (attr.getStart() <= position && position <= attr.getEnd()) {
                         continue;
                     }
-                    if (attr.kind === 246) {
+                    if (attr.kind === 250) {
                         seenNames[attr.name.text] = true;
                     }
                 }
@@ -53943,7 +55037,7 @@ var ts;
             return name;
         }
         var keywordCompletions = [];
-        for (var i = 71; i <= 139; i++) {
+        for (var i = 71; i <= 140; i++) {
             keywordCompletions.push({
                 name: ts.tokenToString(i),
                 kind: ts.ScriptElementKind.keyword,
@@ -54007,7 +55101,7 @@ var ts;
             function getSemanticDocumentHighlights(node) {
                 if (node.kind === 70 ||
                     node.kind === 98 ||
-                    node.kind === 166 ||
+                    node.kind === 167 ||
                     node.kind === 96 ||
                     node.kind === 9 ||
                     ts.isLiteralNameOfPropertyDeclarationOrIndexAccess(node)) {
@@ -54059,75 +55153,75 @@ var ts;
                         switch (node.kind) {
                             case 89:
                             case 81:
-                                if (hasKind(node.parent, 204)) {
+                                if (hasKind(node.parent, 208)) {
                                     return getIfElseOccurrences(node.parent);
                                 }
                                 break;
                             case 95:
-                                if (hasKind(node.parent, 212)) {
+                                if (hasKind(node.parent, 216)) {
                                     return getReturnOccurrences(node.parent);
                                 }
                                 break;
                             case 99:
-                                if (hasKind(node.parent, 216)) {
+                                if (hasKind(node.parent, 220)) {
                                     return getThrowOccurrences(node.parent);
                                 }
                                 break;
                             case 73:
-                                if (hasKind(parent(parent(node)), 217)) {
+                                if (hasKind(parent(parent(node)), 221)) {
                                     return getTryCatchFinallyOccurrences(node.parent.parent);
                                 }
                                 break;
                             case 101:
                             case 86:
-                                if (hasKind(parent(node), 217)) {
+                                if (hasKind(parent(node), 221)) {
                                     return getTryCatchFinallyOccurrences(node.parent);
                                 }
                                 break;
                             case 97:
-                                if (hasKind(node.parent, 214)) {
+                                if (hasKind(node.parent, 218)) {
                                     return getSwitchCaseDefaultOccurrences(node.parent);
                                 }
                                 break;
                             case 72:
                             case 78:
-                                if (hasKind(parent(parent(parent(node))), 214)) {
+                                if (hasKind(parent(parent(parent(node))), 218)) {
                                     return getSwitchCaseDefaultOccurrences(node.parent.parent.parent);
                                 }
                                 break;
                             case 71:
                             case 76:
-                                if (hasKind(node.parent, 211) || hasKind(node.parent, 210)) {
+                                if (hasKind(node.parent, 215) || hasKind(node.parent, 214)) {
                                     return getBreakOrContinueStatementOccurrences(node.parent);
                                 }
                                 break;
                             case 87:
-                                if (hasKind(node.parent, 207) ||
-                                    hasKind(node.parent, 208) ||
-                                    hasKind(node.parent, 209)) {
+                                if (hasKind(node.parent, 211) ||
+                                    hasKind(node.parent, 212) ||
+                                    hasKind(node.parent, 213)) {
                                     return getLoopBreakContinueOccurrences(node.parent);
                                 }
                                 break;
                             case 105:
                             case 80:
-                                if (hasKind(node.parent, 206) || hasKind(node.parent, 205)) {
+                                if (hasKind(node.parent, 210) || hasKind(node.parent, 209)) {
                                     return getLoopBreakContinueOccurrences(node.parent);
                                 }
                                 break;
                             case 122:
-                                if (hasKind(node.parent, 149)) {
+                                if (hasKind(node.parent, 150)) {
                                     return getConstructorOccurrences(node.parent);
                                 }
                                 break;
                             case 124:
-                            case 132:
-                                if (hasKind(node.parent, 150) || hasKind(node.parent, 151)) {
+                            case 133:
+                                if (hasKind(node.parent, 151) || hasKind(node.parent, 152)) {
                                     return getGetAndSetOccurrences(node.parent);
                                 }
                                 break;
                             default:
                                 if (ts.isModifierKind(node.kind) && node.parent &&
-                                    (ts.isDeclaration(node.parent) || node.parent.kind === 201)) {
+                                    (ts.isDeclaration(node.parent) || node.parent.kind === 205)) {
                                     return getModifierOccurrences(node.kind, node.parent);
                                 }
                         }
@@ -54139,10 +55233,10 @@ var ts;
                     aggregate(node);
                     return statementAccumulator;
                     function aggregate(node) {
-                        if (node.kind === 216) {
+                        if (node.kind === 220) {
                             statementAccumulator.push(node);
                         }
-                        else if (node.kind === 217) {
+                        else if (node.kind === 221) {
                             var tryStatement = node;
                             if (tryStatement.catchClause) {
                                 aggregate(tryStatement.catchClause);
@@ -54162,17 +55256,17 @@ var ts;
                 function getThrowStatementOwner(throwStatement) {
                     var child = throwStatement;
                     while (child.parent) {
-                        var parent_20 = child.parent;
-                        if (ts.isFunctionBlock(parent_20) || parent_20.kind === 256) {
-                            return parent_20;
+                        var parent_18 = child.parent;
+                        if (ts.isFunctionBlock(parent_18) || parent_18.kind === 261) {
+                            return parent_18;
                         }
-                        if (parent_20.kind === 217) {
-                            var tryStatement = parent_20;
+                        if (parent_18.kind === 221) {
+                            var tryStatement = parent_18;
                             if (tryStatement.tryBlock === child && tryStatement.catchClause) {
                                 return child;
                             }
                         }
-                        child = parent_20;
+                        child = parent_18;
                     }
                     return undefined;
                 }
@@ -54181,7 +55275,7 @@ var ts;
                     aggregate(node);
                     return statementAccumulator;
                     function aggregate(node) {
-                        if (node.kind === 211 || node.kind === 210) {
+                        if (node.kind === 215 || node.kind === 214) {
                             statementAccumulator.push(node);
                         }
                         else if (!ts.isFunctionLike(node)) {
@@ -54196,15 +55290,15 @@ var ts;
                 function getBreakOrContinueOwner(statement) {
                     for (var node_1 = statement.parent; node_1; node_1 = node_1.parent) {
                         switch (node_1.kind) {
-                            case 214:
-                                if (statement.kind === 210) {
+                            case 218:
+                                if (statement.kind === 214) {
                                     continue;
                                 }
-                            case 207:
-                            case 208:
+                            case 211:
+                            case 212:
+                            case 213:
+                            case 210:
                             case 209:
-                            case 206:
-                            case 205:
                                 if (!statement.label || isLabeledBy(node_1, statement.label.text)) {
                                     return node_1;
                                 }
@@ -54221,24 +55315,24 @@ var ts;
                 function getModifierOccurrences(modifier, declaration) {
                     var container = declaration.parent;
                     if (ts.isAccessibilityModifier(modifier)) {
-                        if (!(container.kind === 222 ||
-                            container.kind === 193 ||
-                            (declaration.kind === 143 && hasKind(container, 149)))) {
+                        if (!(container.kind === 226 ||
+                            container.kind === 197 ||
+                            (declaration.kind === 144 && hasKind(container, 150)))) {
                             return undefined;
                         }
                     }
                     else if (modifier === 114) {
-                        if (!(container.kind === 222 || container.kind === 193)) {
+                        if (!(container.kind === 226 || container.kind === 197)) {
                             return undefined;
                         }
                     }
                     else if (modifier === 83 || modifier === 123) {
-                        if (!(container.kind === 227 || container.kind === 256)) {
+                        if (!(container.kind === 231 || container.kind === 261)) {
                             return undefined;
                         }
                     }
                     else if (modifier === 116) {
-                        if (!(container.kind === 222 || declaration.kind === 222)) {
+                        if (!(container.kind === 226 || declaration.kind === 226)) {
                             return undefined;
                         }
                     }
@@ -54249,8 +55343,8 @@ var ts;
                     var modifierFlag = getFlagFromModifier(modifier);
                     var nodes;
                     switch (container.kind) {
-                        case 227:
-                        case 256:
+                        case 231:
+                        case 261:
                             if (modifierFlag & 128) {
                                 nodes = declaration.members.concat(declaration);
                             }
@@ -54258,15 +55352,15 @@ var ts;
                                 nodes = container.statements;
                             }
                             break;
-                        case 149:
+                        case 150:
                             nodes = container.parameters.concat(container.parent.members);
                             break;
-                        case 222:
-                        case 193:
+                        case 226:
+                        case 197:
                             nodes = container.members;
                             if (modifierFlag & 28) {
                                 var constructor = ts.forEach(container.members, function (member) {
-                                    return member.kind === 149 && member;
+                                    return member.kind === 150 && member;
                                 });
                                 if (constructor) {
                                     nodes = nodes.concat(constructor.parameters);
@@ -54319,13 +55413,13 @@ var ts;
                 }
                 function getGetAndSetOccurrences(accessorDeclaration) {
                     var keywords = [];
-                    tryPushAccessorKeyword(accessorDeclaration.symbol, 150);
                     tryPushAccessorKeyword(accessorDeclaration.symbol, 151);
+                    tryPushAccessorKeyword(accessorDeclaration.symbol, 152);
                     return ts.map(keywords, getHighlightSpanForNode);
                     function tryPushAccessorKeyword(accessorSymbol, accessorKind) {
                         var accessor = ts.getDeclarationOfKind(accessorSymbol, accessorKind);
                         if (accessor) {
-                            ts.forEach(accessor.getChildren(), function (child) { return pushKeywordIf(keywords, child, 124, 132); });
+                            ts.forEach(accessor.getChildren(), function (child) { return pushKeywordIf(keywords, child, 124, 133); });
                         }
                     }
                 }
@@ -54342,7 +55436,7 @@ var ts;
                 function getLoopBreakContinueOccurrences(loopNode) {
                     var keywords = [];
                     if (pushKeywordIf(keywords, loopNode.getFirstToken(), 87, 105, 80)) {
-                        if (loopNode.kind === 205) {
+                        if (loopNode.kind === 209) {
                             var loopTokens = loopNode.getChildren();
                             for (var i = loopTokens.length - 1; i >= 0; i--) {
                                 if (pushKeywordIf(keywords, loopTokens[i], 105)) {
@@ -54363,13 +55457,13 @@ var ts;
                     var owner = getBreakOrContinueOwner(breakOrContinueStatement);
                     if (owner) {
                         switch (owner.kind) {
-                            case 207:
-                            case 208:
+                            case 211:
+                            case 212:
+                            case 213:
                             case 209:
-                            case 205:
-                            case 206:
+                            case 210:
                                 return getLoopBreakContinueOccurrences(owner);
-                            case 214:
+                            case 218:
                                 return getSwitchCaseDefaultOccurrences(owner);
                         }
                     }
@@ -54419,7 +55513,7 @@ var ts;
                 }
                 function getReturnOccurrences(returnStatement) {
                     var func = ts.getContainingFunction(returnStatement);
-                    if (!(func && hasKind(func.body, 200))) {
+                    if (!(func && hasKind(func.body, 204))) {
                         return undefined;
                     }
                     var keywords = [];
@@ -54433,7 +55527,7 @@ var ts;
                 }
                 function getIfElseOccurrences(ifStatement) {
                     var keywords = [];
-                    while (hasKind(ifStatement.parent, 204) && ifStatement.parent.elseStatement === ifStatement) {
+                    while (hasKind(ifStatement.parent, 208) && ifStatement.parent.elseStatement === ifStatement) {
                         ifStatement = ifStatement.parent;
                     }
                     while (ifStatement) {
@@ -54444,7 +55538,7 @@ var ts;
                                 break;
                             }
                         }
-                        if (!hasKind(ifStatement.elseStatement, 204)) {
+                        if (!hasKind(ifStatement.elseStatement, 208)) {
                             break;
                         }
                         ifStatement = ifStatement.elseStatement;
@@ -54479,7 +55573,7 @@ var ts;
         }
         DocumentHighlights.getDocumentHighlights = getDocumentHighlights;
         function isLabeledBy(node, labelName) {
-            for (var owner = node.parent; owner.kind === 215; owner = owner.parent) {
+            for (var owner = node.parent; owner.kind === 219; owner = owner.parent) {
                 if (owner.label.text === labelName) {
                     return true;
                 }
@@ -54683,16 +55777,16 @@ var ts;
             }
             function getAliasSymbolForPropertyNameSymbol(symbol, location) {
                 if (symbol.flags & 8388608) {
-                    var defaultImport = ts.getDeclarationOfKind(symbol, 232);
+                    var defaultImport = ts.getDeclarationOfKind(symbol, 236);
                     if (defaultImport) {
                         return typeChecker.getAliasedSymbol(symbol);
                     }
-                    var importOrExportSpecifier = ts.forEach(symbol.declarations, function (declaration) { return (declaration.kind === 235 ||
-                        declaration.kind === 239) ? declaration : undefined; });
+                    var importOrExportSpecifier = ts.forEach(symbol.declarations, function (declaration) { return (declaration.kind === 239 ||
+                        declaration.kind === 243) ? declaration : undefined; });
                     if (importOrExportSpecifier &&
                         (!importOrExportSpecifier.propertyName ||
                             importOrExportSpecifier.propertyName === location)) {
-                        return importOrExportSpecifier.kind === 235 ?
+                        return importOrExportSpecifier.kind === 239 ?
                             typeChecker.getAliasedSymbol(symbol) :
                             typeChecker.getExportSpecifierLocalTargetSymbol(importOrExportSpecifier);
                     }
@@ -54707,14 +55801,14 @@ var ts;
                     typeChecker.getPropertySymbolOfDestructuringAssignment(location);
             }
             function isObjectBindingPatternElementWithoutPropertyName(symbol) {
-                var bindingElement = ts.getDeclarationOfKind(symbol, 170);
+                var bindingElement = ts.getDeclarationOfKind(symbol, 174);
                 return bindingElement &&
-                    bindingElement.parent.kind === 168 &&
+                    bindingElement.parent.kind === 172 &&
                     !bindingElement.propertyName;
             }
             function getPropertySymbolOfObjectBindingPatternWithoutPropertyName(symbol) {
                 if (isObjectBindingPatternElementWithoutPropertyName(symbol)) {
-                    var bindingElement = ts.getDeclarationOfKind(symbol, 170);
+                    var bindingElement = ts.getDeclarationOfKind(symbol, 174);
                     var typeOfPattern = typeChecker.getTypeAtLocation(bindingElement.parent);
                     return typeOfPattern && typeChecker.getPropertyOfType(typeOfPattern, bindingElement.name.text);
                 }
@@ -54730,13 +55824,13 @@ var ts;
             }
             function getSymbolScope(symbol) {
                 var valueDeclaration = symbol.valueDeclaration;
-                if (valueDeclaration && (valueDeclaration.kind === 180 || valueDeclaration.kind === 193)) {
+                if (valueDeclaration && (valueDeclaration.kind === 184 || valueDeclaration.kind === 197)) {
                     return valueDeclaration;
                 }
                 if (symbol.flags & (4 | 8192)) {
                     var privateDeclaration = ts.forEach(symbol.getDeclarations(), function (d) { return (ts.getModifierFlags(d) & 8) ? d : undefined; });
                     if (privateDeclaration) {
-                        return ts.getAncestor(privateDeclaration, 222);
+                        return ts.getAncestor(privateDeclaration, 226);
                     }
                 }
                 if (symbol.flags & 8388608) {
@@ -54760,7 +55854,7 @@ var ts;
                         if (scope && scope !== container) {
                             return undefined;
                         }
-                        if (container.kind === 256 && !ts.isExternalModule(container)) {
+                        if (container.kind === 261 && !ts.isExternalModule(container)) {
                             return undefined;
                         }
                         scope = container;
@@ -54782,8 +55876,8 @@ var ts;
                     if (position > end)
                         break;
                     var endPosition = position + symbolNameLength;
-                    if ((position === 0 || !ts.isIdentifierPart(text.charCodeAt(position - 1), 4)) &&
-                        (endPosition === sourceLength || !ts.isIdentifierPart(text.charCodeAt(endPosition), 4))) {
+                    if ((position === 0 || !ts.isIdentifierPart(text.charCodeAt(position - 1), 5)) &&
+                        (endPosition === sourceLength || !ts.isIdentifierPart(text.charCodeAt(endPosition), 5))) {
                         positions.push(position);
                     }
                     position = text.indexOf(symbolName, position + symbolNameLength + 1);
@@ -54893,7 +55987,7 @@ var ts;
                                 if (localParentType.symbol && localParentType.symbol.flags & (32 | 64) && localParentType.symbol !== searchSymbol.parent) {
                                     return [localParentType.symbol];
                                 }
-                                else if (localParentType.flags & 1572864) {
+                                else if (localParentType.flags & 196608) {
                                     return getSymbolsForClassAndInterfaceComponents(localParentType);
                                 }
                             }
@@ -54927,14 +56021,14 @@ var ts;
                     var result = [];
                     for (var _i = 0, _a = classSymbol.members["__constructor"].declarations; _i < _a.length; _i++) {
                         var decl = _a[_i];
-                        ts.Debug.assert(decl.kind === 149);
+                        ts.Debug.assert(decl.kind === 150);
                         var ctrKeyword = decl.getChildAt(0);
                         ts.Debug.assert(ctrKeyword.kind === 122);
                         result.push(ctrKeyword);
                     }
                     ts.forEachProperty(classSymbol.exports, function (member) {
                         var decl = member.valueDeclaration;
-                        if (decl && decl.kind === 148) {
+                        if (decl && decl.kind === 149) {
                             var body = decl.body;
                             if (body) {
                                 forEachDescendantOfKind(body, 98, function (thisKeyword) {
@@ -54956,7 +56050,7 @@ var ts;
                     var result = [];
                     for (var _i = 0, _a = ctr.declarations; _i < _a.length; _i++) {
                         var decl = _a[_i];
-                        ts.Debug.assert(decl.kind === 149);
+                        ts.Debug.assert(decl.kind === 150);
                         var body = decl.body;
                         if (body) {
                             forEachDescendantOfKind(body, 96, function (node) {
@@ -54997,7 +56091,7 @@ var ts;
                     result.push(getReferenceEntryFromNode(refNode.parent));
                 }
                 else if (refNode.kind === 70) {
-                    if (refNode.parent.kind === 254) {
+                    if (refNode.parent.kind === 258) {
                         getReferenceEntriesForShorthandPropertyAssignment(refNode, typeChecker, result);
                     }
                     var containingClass = getContainingClassIfInHeritageClause(refNode);
@@ -55007,24 +56101,24 @@ var ts;
                     }
                     var containingTypeReference = getContainingTypeReference(refNode);
                     if (containingTypeReference) {
-                        var parent_21 = containingTypeReference.parent;
-                        if (ts.isVariableLike(parent_21) && parent_21.type === containingTypeReference && parent_21.initializer && isImplementationExpression(parent_21.initializer)) {
-                            maybeAdd(getReferenceEntryFromNode(parent_21.initializer));
+                        var parent_19 = containingTypeReference.parent;
+                        if (ts.isVariableLike(parent_19) && parent_19.type === containingTypeReference && parent_19.initializer && isImplementationExpression(parent_19.initializer)) {
+                            maybeAdd(getReferenceEntryFromNode(parent_19.initializer));
                         }
-                        else if (ts.isFunctionLike(parent_21) && parent_21.type === containingTypeReference && parent_21.body) {
-                            if (parent_21.body.kind === 200) {
-                                ts.forEachReturnStatement(parent_21.body, function (returnStatement) {
+                        else if (ts.isFunctionLike(parent_19) && parent_19.type === containingTypeReference && parent_19.body) {
+                            if (parent_19.body.kind === 204) {
+                                ts.forEachReturnStatement(parent_19.body, function (returnStatement) {
                                     if (returnStatement.expression && isImplementationExpression(returnStatement.expression)) {
                                         maybeAdd(getReferenceEntryFromNode(returnStatement.expression));
                                     }
                                 });
                             }
-                            else if (isImplementationExpression(parent_21.body)) {
-                                maybeAdd(getReferenceEntryFromNode(parent_21.body));
+                            else if (isImplementationExpression(parent_19.body)) {
+                                maybeAdd(getReferenceEntryFromNode(parent_19.body));
                             }
                         }
-                        else if (ts.isAssertionExpression(parent_21) && isImplementationExpression(parent_21.expression)) {
-                            maybeAdd(getReferenceEntryFromNode(parent_21.expression));
+                        else if (ts.isAssertionExpression(parent_19) && isImplementationExpression(parent_19.expression)) {
+                            maybeAdd(getReferenceEntryFromNode(parent_19.expression));
                         }
                     }
                 }
@@ -55041,7 +56135,7 @@ var ts;
                     if (componentType.symbol && componentType.symbol.getFlags() & (32 | 64)) {
                         result.push(componentType.symbol);
                     }
-                    if (componentType.getFlags() & 1572864) {
+                    if (componentType.getFlags() & 196608) {
                         getSymbolsForClassAndInterfaceComponents(componentType, result);
                     }
                 }
@@ -55059,26 +56153,26 @@ var ts;
             }
             function getContainingClassIfInHeritageClause(node) {
                 if (node && node.parent) {
-                    if (node.kind === 195
-                        && node.parent.kind === 251
+                    if (node.kind === 199
+                        && node.parent.kind === 255
                         && ts.isClassLike(node.parent.parent)) {
                         return node.parent.parent;
                     }
-                    else if (node.kind === 70 || node.kind === 173) {
+                    else if (node.kind === 70 || node.kind === 177) {
                         return getContainingClassIfInHeritageClause(node.parent);
                     }
                 }
                 return undefined;
             }
             function isImplementationExpression(node) {
-                if (node.kind === 179) {
+                if (node.kind === 183) {
                     return isImplementationExpression(node.expression);
                 }
-                return node.kind === 181 ||
-                    node.kind === 180 ||
-                    node.kind === 172 ||
-                    node.kind === 193 ||
-                    node.kind === 171;
+                return node.kind === 185 ||
+                    node.kind === 184 ||
+                    node.kind === 176 ||
+                    node.kind === 197 ||
+                    node.kind === 175;
             }
             function explicitlyInheritsFrom(child, parent, cachedResults) {
                 var parentIsInterface = parent.getFlags() & 64;
@@ -55107,7 +56201,7 @@ var ts;
                             }
                             return searchTypeReference(ts.getClassExtendsHeritageClauseElement(declaration));
                         }
-                        else if (declaration.kind === 223) {
+                        else if (declaration.kind === 227) {
                             if (parentIsInterface) {
                                 return ts.forEach(ts.getInterfaceBaseTypeNodes(declaration), searchTypeReference);
                             }
@@ -55134,13 +56228,13 @@ var ts;
                 }
                 var staticFlag = 32;
                 switch (searchSpaceNode.kind) {
-                    case 146:
-                    case 145:
-                    case 148:
                     case 147:
+                    case 146:
                     case 149:
+                    case 148:
                     case 150:
                     case 151:
+                    case 152:
                         staticFlag &= ts.getModifierFlags(searchSpaceNode);
                         searchSpaceNode = searchSpaceNode.parent;
                         break;
@@ -55168,32 +56262,32 @@ var ts;
                 var searchSpaceNode = ts.getThisContainer(thisOrSuperKeyword, false);
                 var staticFlag = 32;
                 switch (searchSpaceNode.kind) {
+                    case 149:
                     case 148:
-                    case 147:
                         if (ts.isObjectLiteralMethod(searchSpaceNode)) {
                             break;
                         }
+                    case 147:
                     case 146:
-                    case 145:
-                    case 149:
                     case 150:
                     case 151:
+                    case 152:
                         staticFlag &= ts.getModifierFlags(searchSpaceNode);
                         searchSpaceNode = searchSpaceNode.parent;
                         break;
-                    case 256:
+                    case 261:
                         if (ts.isExternalModule(searchSpaceNode)) {
                             return undefined;
                         }
-                    case 221:
-                    case 180:
+                    case 225:
+                    case 184:
                         break;
                     default:
                         return undefined;
                 }
                 var references = [];
                 var possiblePositions;
-                if (searchSpaceNode.kind === 256) {
+                if (searchSpaceNode.kind === 261) {
                     ts.forEach(sourceFiles, function (sourceFile) {
                         possiblePositions = getPossibleSymbolReferencePositions(sourceFile, "this", sourceFile.getStart(), sourceFile.getEnd());
                         getThisReferencesInFile(sourceFile, sourceFile, possiblePositions, references);
@@ -55227,26 +56321,26 @@ var ts;
                         }
                         var container = ts.getThisContainer(node, false);
                         switch (searchSpaceNode.kind) {
-                            case 180:
-                            case 221:
+                            case 184:
+                            case 225:
                                 if (searchSpaceNode.symbol === container.symbol) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
+                            case 149:
                             case 148:
-                            case 147:
                                 if (ts.isObjectLiteralMethod(searchSpaceNode) && searchSpaceNode.symbol === container.symbol) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
-                            case 193:
-                            case 222:
+                            case 197:
+                            case 226:
                                 if (container.parent && searchSpaceNode.symbol === container.parent.symbol && (ts.getModifierFlags(container) & 32) === staticFlag) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
-                            case 256:
-                                if (container.kind === 256 && !ts.isExternalModule(container)) {
+                            case 261:
+                                if (container.kind === 261 && !ts.isExternalModule(container)) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
@@ -55285,8 +56379,8 @@ var ts;
                         if (!node_2 || node_2.kind !== 9) {
                             return;
                         }
-                        var type_1 = ts.getStringLiteralTypeForNode(node_2, typeChecker);
-                        if (type_1 === searchType) {
+                        var type_2 = ts.getStringLiteralTypeForNode(node_2, typeChecker);
+                        if (type_2 === searchType) {
                             references.push(getReferenceEntryFromNode(node_2));
                         }
                     }
@@ -55295,7 +56389,7 @@ var ts;
             function populateSearchSymbolSet(symbol, location) {
                 var result = [symbol];
                 var containingObjectLiteralElement = getContainingObjectLiteralElement(location);
-                if (containingObjectLiteralElement && containingObjectLiteralElement.kind !== 254) {
+                if (containingObjectLiteralElement && containingObjectLiteralElement.kind !== 258) {
                     var propertySymbol = getPropertySymbolOfDestructuringAssignment(location);
                     if (propertySymbol) {
                         result.push(propertySymbol);
@@ -55314,7 +56408,7 @@ var ts;
                         result.push(shorthandValueSymbol);
                     }
                 }
-                if (symbol.valueDeclaration && symbol.valueDeclaration.kind === 143 &&
+                if (symbol.valueDeclaration && symbol.valueDeclaration.kind === 144 &&
                     ts.isParameterPropertyDeclaration(symbol.valueDeclaration)) {
                     result = result.concat(typeChecker.getSymbolsOfParameterPropertyDeclaration(symbol.valueDeclaration, symbol.name));
                 }
@@ -55345,7 +56439,7 @@ var ts;
                             getPropertySymbolFromTypeReference(ts.getClassExtendsHeritageClauseElement(declaration));
                             ts.forEach(ts.getClassImplementsHeritageClauseElements(declaration), getPropertySymbolFromTypeReference);
                         }
-                        else if (declaration.kind === 223) {
+                        else if (declaration.kind === 227) {
                             ts.forEach(ts.getInterfaceBaseTypeNodes(declaration), getPropertySymbolFromTypeReference);
                         }
                     });
@@ -55408,7 +56502,7 @@ var ts;
                 });
             }
             function getNameFromObjectLiteralElement(node) {
-                if (node.name.kind === 141) {
+                if (node.name.kind === 142) {
                     var nameExpression = node.name.expression;
                     if (ts.isStringOrNumericLiteral(nameExpression.kind)) {
                         return nameExpression.text;
@@ -55427,7 +56521,7 @@ var ts;
                     if (symbol_2) {
                         result_4.push(symbol_2);
                     }
-                    if (contextualType.flags & 524288) {
+                    if (contextualType.flags & 65536) {
                         ts.forEach(contextualType.types, function (t) {
                             var symbol = t.getProperty(name);
                             if (symbol) {
@@ -55477,7 +56571,7 @@ var ts;
                 if (node.initializer) {
                     return true;
                 }
-                else if (node.kind === 219) {
+                else if (node.kind === 223) {
                     var parentStatement = getParentStatementOfVariableDeclaration(node);
                     return parentStatement && ts.hasModifier(parentStatement, 2);
                 }
@@ -55487,18 +56581,18 @@ var ts;
             }
             else {
                 switch (node.kind) {
-                    case 222:
-                    case 193:
-                    case 225:
                     case 226:
+                    case 197:
+                    case 229:
+                    case 230:
                         return true;
                 }
             }
             return false;
         }
         function getParentStatementOfVariableDeclaration(node) {
-            if (node.parent && node.parent.parent && node.parent.parent.kind === 201) {
-                ts.Debug.assert(node.parent.kind === 220);
+            if (node.parent && node.parent.parent && node.parent.parent.kind === 205) {
+                ts.Debug.assert(node.parent.kind === 224);
                 return node.parent.parent;
             }
         }
@@ -55536,10 +56630,10 @@ var ts;
             }
             var parent = node.parent;
             if (parent) {
-                if (parent.kind === 187 || parent.kind === 186) {
+                if (parent.kind === 191 || parent.kind === 190) {
                     return true;
                 }
-                else if (parent.kind === 188 && parent.left === node) {
+                else if (parent.kind === 192 && parent.left === node) {
                     var operator = parent.operatorToken.kind;
                     return 57 <= operator && operator <= 69;
                 }
@@ -55558,7 +56652,7 @@ var ts;
             switch (node.kind) {
                 case 9:
                 case 8:
-                    if (node.parent.kind === 141) {
+                    if (node.parent.kind === 142) {
                         return isObjectLiteralPropertyDeclaration(node.parent.parent) ? node.parent.parent : undefined;
                     }
                 case 70:
@@ -55568,11 +56662,11 @@ var ts;
         }
         function isObjectLiteralPropertyDeclaration(node) {
             switch (node.kind) {
-                case 253:
-                case 254:
-                case 148:
-                case 150:
+                case 257:
+                case 258:
+                case 149:
                 case 151:
+                case 152:
                     return true;
             }
             return false;
@@ -55631,11 +56725,11 @@ var ts;
                 var declaration = symbol.declarations[0];
                 if (node.kind === 70 &&
                     (node.parent === declaration ||
-                        (declaration.kind === 235 && declaration.parent && declaration.parent.kind === 234))) {
+                        (declaration.kind === 239 && declaration.parent && declaration.parent.kind === 238))) {
                     symbol = typeChecker.getAliasedSymbol(symbol);
                 }
             }
-            if (node.parent.kind === 254) {
+            if (node.parent.kind === 258) {
                 var shorthandSymbol = typeChecker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration);
                 if (!shorthandSymbol) {
                     return [];
@@ -55662,7 +56756,7 @@ var ts;
             if (!type) {
                 return undefined;
             }
-            if (type.flags & 524288 && !(type.flags & 16)) {
+            if (type.flags & 65536 && !(type.flags & 16)) {
                 var result_5 = [];
                 ts.forEach(type.types, function (t) {
                     if (t.symbol) {
@@ -55712,8 +56806,8 @@ var ts;
                 var declarations = [];
                 var definition;
                 ts.forEach(signatureDeclarations, function (d) {
-                    if ((selectConstructors && d.kind === 149) ||
-                        (!selectConstructors && (d.kind === 221 || d.kind === 148 || d.kind === 147))) {
+                    if ((selectConstructors && d.kind === 150) ||
+                        (!selectConstructors && (d.kind === 225 || d.kind === 149 || d.kind === 148))) {
                         declarations.push(d);
                         if (d.body)
                             definition = d;
@@ -55789,7 +56883,7 @@ var ts;
     var GoToImplementation;
     (function (GoToImplementation) {
         function getImplementationAtPosition(typeChecker, cancellationToken, sourceFiles, node) {
-            if (node.parent.kind === 254) {
+            if (node.parent.kind === 258) {
                 var result = [];
                 ts.FindAllReferences.getReferenceEntriesForShorthandPropertyAssignment(node, typeChecker, result);
                 return result.length > 0 ? result : undefined;
@@ -55914,16 +57008,16 @@ var ts;
             var commentOwner;
             findOwner: for (commentOwner = tokenAtPos; commentOwner; commentOwner = commentOwner.parent) {
                 switch (commentOwner.kind) {
-                    case 221:
-                    case 148:
+                    case 225:
                     case 149:
-                    case 222:
-                    case 201:
-                        break findOwner;
-                    case 256:
-                        return undefined;
+                    case 150:
                     case 226:
-                        if (commentOwner.parent.kind === 226) {
+                    case 205:
+                        break findOwner;
+                    case 261:
+                        return undefined;
+                    case 230:
+                        if (commentOwner.parent.kind === 230) {
                             return undefined;
                         }
                         break findOwner;
@@ -55957,7 +57051,7 @@ var ts;
             if (ts.isFunctionLike(commentOwner)) {
                 return commentOwner.parameters;
             }
-            if (commentOwner.kind === 201) {
+            if (commentOwner.kind === 205) {
                 var varStatement = commentOwner;
                 var varDeclarations = varStatement.declarationList.declarations;
                 if (varDeclarations.length === 1 && varDeclarations[0].initializer) {
@@ -55967,17 +57061,17 @@ var ts;
             return ts.emptyArray;
         }
         function getParametersFromRightHandSideOfAssignment(rightHandSide) {
-            while (rightHandSide.kind === 179) {
+            while (rightHandSide.kind === 183) {
                 rightHandSide = rightHandSide.expression;
             }
             switch (rightHandSide.kind) {
-                case 180:
-                case 181:
+                case 184:
+                case 185:
                     return rightHandSide.parameters;
-                case 193:
+                case 197:
                     for (var _i = 0, _a = rightHandSide.members; _i < _a.length; _i++) {
                         var member = _a[_i];
-                        if (member.kind === 149) {
+                        if (member.kind === 150) {
                             return member.parameters;
                         }
                     }
@@ -55988,147 +57082,6 @@ var ts;
     })(JsDoc = ts.JsDoc || (ts.JsDoc = {}));
 })(ts || (ts = {}));
 var ts;
-(function (ts) {
-    var JsTyping;
-    (function (JsTyping) {
-        ;
-        ;
-        var safeList;
-        var EmptySafeList = ts.createMap();
-        function discoverTypings(host, fileNames, projectRootPath, safeListPath, packageNameToTypingLocation, typingOptions) {
-            var inferredTypings = ts.createMap();
-            if (!typingOptions || !typingOptions.enableAutoDiscovery) {
-                return { cachedTypingPaths: [], newTypingNames: [], filesToWatch: [] };
-            }
-            fileNames = ts.filter(ts.map(fileNames, ts.normalizePath), function (f) {
-                var kind = ts.ensureScriptKind(f, ts.getScriptKindFromFileName(f));
-                return kind === 1 || kind === 2;
-            });
-            if (!safeList) {
-                var result = ts.readConfigFile(safeListPath, function (path) { return host.readFile(path); });
-                safeList = result.config ? ts.createMap(result.config) : EmptySafeList;
-            }
-            var filesToWatch = [];
-            var searchDirs = [];
-            var exclude = [];
-            mergeTypings(typingOptions.include);
-            exclude = typingOptions.exclude || [];
-            var possibleSearchDirs = ts.map(fileNames, ts.getDirectoryPath);
-            if (projectRootPath !== undefined) {
-                possibleSearchDirs.push(projectRootPath);
-            }
-            searchDirs = ts.deduplicate(possibleSearchDirs);
-            for (var _i = 0, searchDirs_1 = searchDirs; _i < searchDirs_1.length; _i++) {
-                var searchDir = searchDirs_1[_i];
-                var packageJsonPath = ts.combinePaths(searchDir, "package.json");
-                getTypingNamesFromJson(packageJsonPath, filesToWatch);
-                var bowerJsonPath = ts.combinePaths(searchDir, "bower.json");
-                getTypingNamesFromJson(bowerJsonPath, filesToWatch);
-                var nodeModulesPath = ts.combinePaths(searchDir, "node_modules");
-                getTypingNamesFromNodeModuleFolder(nodeModulesPath);
-            }
-            getTypingNamesFromSourceFileNames(fileNames);
-            for (var name_48 in packageNameToTypingLocation) {
-                if (name_48 in inferredTypings && !inferredTypings[name_48]) {
-                    inferredTypings[name_48] = packageNameToTypingLocation[name_48];
-                }
-            }
-            for (var _a = 0, exclude_1 = exclude; _a < exclude_1.length; _a++) {
-                var excludeTypingName = exclude_1[_a];
-                delete inferredTypings[excludeTypingName];
-            }
-            var newTypingNames = [];
-            var cachedTypingPaths = [];
-            for (var typing in inferredTypings) {
-                if (inferredTypings[typing] !== undefined) {
-                    cachedTypingPaths.push(inferredTypings[typing]);
-                }
-                else {
-                    newTypingNames.push(typing);
-                }
-            }
-            return { cachedTypingPaths: cachedTypingPaths, newTypingNames: newTypingNames, filesToWatch: filesToWatch };
-            function mergeTypings(typingNames) {
-                if (!typingNames) {
-                    return;
-                }
-                for (var _i = 0, typingNames_1 = typingNames; _i < typingNames_1.length; _i++) {
-                    var typing = typingNames_1[_i];
-                    if (!(typing in inferredTypings)) {
-                        inferredTypings[typing] = undefined;
-                    }
-                }
-            }
-            function getTypingNamesFromJson(jsonPath, filesToWatch) {
-                var result = ts.readConfigFile(jsonPath, function (path) { return host.readFile(path); });
-                if (result.config) {
-                    var jsonConfig = result.config;
-                    filesToWatch.push(jsonPath);
-                    if (jsonConfig.dependencies) {
-                        mergeTypings(ts.getOwnKeys(jsonConfig.dependencies));
-                    }
-                    if (jsonConfig.devDependencies) {
-                        mergeTypings(ts.getOwnKeys(jsonConfig.devDependencies));
-                    }
-                    if (jsonConfig.optionalDependencies) {
-                        mergeTypings(ts.getOwnKeys(jsonConfig.optionalDependencies));
-                    }
-                    if (jsonConfig.peerDependencies) {
-                        mergeTypings(ts.getOwnKeys(jsonConfig.peerDependencies));
-                    }
-                }
-            }
-            function getTypingNamesFromSourceFileNames(fileNames) {
-                var jsFileNames = ts.filter(fileNames, ts.hasJavaScriptFileExtension);
-                var inferredTypingNames = ts.map(jsFileNames, function (f) { return ts.removeFileExtension(ts.getBaseFileName(f.toLowerCase())); });
-                var cleanedTypingNames = ts.map(inferredTypingNames, function (f) { return f.replace(/((?:\.|-)min(?=\.|$))|((?:-|\.)\d+)/g, ""); });
-                if (safeList !== EmptySafeList) {
-                    mergeTypings(ts.filter(cleanedTypingNames, function (f) { return f in safeList; }));
-                }
-                var hasJsxFile = ts.forEach(fileNames, function (f) { return ts.ensureScriptKind(f, ts.getScriptKindFromFileName(f)) === 2; });
-                if (hasJsxFile) {
-                    mergeTypings(["react"]);
-                }
-            }
-            function getTypingNamesFromNodeModuleFolder(nodeModulesPath) {
-                if (!host.directoryExists(nodeModulesPath)) {
-                    return;
-                }
-                var typingNames = [];
-                var fileNames = host.readDirectory(nodeModulesPath, [".json"], undefined, undefined, 2);
-                for (var _i = 0, fileNames_2 = fileNames; _i < fileNames_2.length; _i++) {
-                    var fileName = fileNames_2[_i];
-                    var normalizedFileName = ts.normalizePath(fileName);
-                    if (ts.getBaseFileName(normalizedFileName) !== "package.json") {
-                        continue;
-                    }
-                    var result = ts.readConfigFile(normalizedFileName, function (path) { return host.readFile(path); });
-                    if (!result.config) {
-                        continue;
-                    }
-                    var packageJson = result.config;
-                    if (packageJson._requiredBy &&
-                        ts.filter(packageJson._requiredBy, function (r) { return r[0] === "#" || r === "/"; }).length === 0) {
-                        continue;
-                    }
-                    if (!packageJson.name) {
-                        continue;
-                    }
-                    if (packageJson.typings) {
-                        var absolutePath = ts.getNormalizedAbsolutePath(packageJson.typings, ts.getDirectoryPath(normalizedFileName));
-                        inferredTypings[packageJson.name] = absolutePath;
-                    }
-                    else {
-                        typingNames.push(packageJson.name);
-                    }
-                }
-                mergeTypings(typingNames);
-            }
-        }
-        JsTyping.discoverTypings = discoverTypings;
-    })(JsTyping = ts.JsTyping || (ts.JsTyping = {}));
-})(ts || (ts = {}));
-var ts;
 (function (ts) {
     var NavigateTo;
     (function (NavigateTo) {
@@ -56141,10 +57094,10 @@ var ts;
                     return;
                 }
                 var nameToDeclarations = sourceFile.getNamedDeclarations();
-                for (var name_49 in nameToDeclarations) {
-                    var declarations = nameToDeclarations[name_49];
+                for (var name_45 in nameToDeclarations) {
+                    var declarations = nameToDeclarations[name_45];
                     if (declarations) {
-                        var matches = patternMatcher.getMatchesForLastSegmentOfPattern(name_49);
+                        var matches = patternMatcher.getMatchesForLastSegmentOfPattern(name_45);
                         if (!matches) {
                             continue;
                         }
@@ -56155,21 +57108,21 @@ var ts;
                                 if (!containers) {
                                     return undefined;
                                 }
-                                matches = patternMatcher.getMatches(containers, name_49);
+                                matches = patternMatcher.getMatches(containers, name_45);
                                 if (!matches) {
                                     continue;
                                 }
                             }
                             var fileName = sourceFile.fileName;
                             var matchKind = bestMatchKind(matches);
-                            rawItems.push({ name: name_49, fileName: fileName, matchKind: matchKind, isCaseSensitive: allMatchesAreCaseSensitive(matches), declaration: declaration });
+                            rawItems.push({ name: name_45, fileName: fileName, matchKind: matchKind, isCaseSensitive: allMatchesAreCaseSensitive(matches), declaration: declaration });
                         }
                     }
                 }
             });
             rawItems = ts.filter(rawItems, function (item) {
                 var decl = item.declaration;
-                if (decl.kind === 232 || decl.kind === 235 || decl.kind === 230) {
+                if (decl.kind === 236 || decl.kind === 239 || decl.kind === 234) {
                     var importer = checker.getSymbolAtLocation(decl.name);
                     var imported = checker.getAliasedSymbol(importer);
                     return importer.name !== imported.name;
@@ -56210,7 +57163,7 @@ var ts;
                     if (text !== undefined) {
                         containers.unshift(text);
                     }
-                    else if (declaration.name.kind === 141) {
+                    else if (declaration.name.kind === 142) {
                         return tryAddComputedPropertyName(declaration.name.expression, containers, true);
                     }
                     else {
@@ -56227,7 +57180,7 @@ var ts;
                     }
                     return true;
                 }
-                if (expression.kind === 173) {
+                if (expression.kind === 177) {
                     var propertyAccess = expression;
                     if (includeLastPortion) {
                         containers.unshift(propertyAccess.name.text);
@@ -56238,7 +57191,7 @@ var ts;
             }
             function getContainers(declaration) {
                 var containers = [];
-                if (declaration.name.kind === 141) {
+                if (declaration.name.kind === 142) {
                     if (!tryAddComputedPropertyName(declaration.name.expression, containers, false)) {
                         return undefined;
                     }
@@ -56370,7 +57323,7 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 149:
+                case 150:
                     var ctr = node;
                     addNodeWithRecursiveChild(ctr, ctr.body);
                     for (var _i = 0, _a = ctr.parameters; _i < _a.length; _i++) {
@@ -56380,28 +57333,28 @@ var ts;
                         }
                     }
                     break;
-                case 148:
-                case 150:
+                case 149:
                 case 151:
-                case 147:
+                case 152:
+                case 148:
                     if (!ts.hasDynamicName(node)) {
                         addNodeWithRecursiveChild(node, node.body);
                     }
                     break;
+                case 147:
                 case 146:
-                case 145:
                     if (!ts.hasDynamicName(node)) {
                         addLeafNode(node);
                     }
                     break;
-                case 232:
+                case 236:
                     var importClause = node;
                     if (importClause.name) {
                         addLeafNode(importClause);
                     }
                     var namedBindings = importClause.namedBindings;
                     if (namedBindings) {
-                        if (namedBindings.kind === 233) {
+                        if (namedBindings.kind === 237) {
                             addLeafNode(namedBindings);
                         }
                         else {
@@ -56412,12 +57365,12 @@ var ts;
                         }
                     }
                     break;
-                case 170:
-                case 219:
+                case 174:
+                case 223:
                     var decl = node;
-                    var name_50 = decl.name;
-                    if (ts.isBindingPattern(name_50)) {
-                        addChildrenRecursively(name_50);
+                    var name_46 = decl.name;
+                    if (ts.isBindingPattern(name_46)) {
+                        addChildrenRecursively(name_46);
                     }
                     else if (decl.initializer && isFunctionOrClassExpression(decl.initializer)) {
                         addChildrenRecursively(decl.initializer);
@@ -56426,12 +57379,12 @@ var ts;
                         addNodeWithRecursiveChild(decl, decl.initializer);
                     }
                     break;
-                case 181:
-                case 221:
-                case 180:
+                case 185:
+                case 225:
+                case 184:
                     addNodeWithRecursiveChild(node, node.body);
                     break;
-                case 225:
+                case 229:
                     startNode(node);
                     for (var _d = 0, _e = node.members; _d < _e.length; _d++) {
                         var member = _e[_d];
@@ -56441,9 +57394,9 @@ var ts;
                     }
                     endNode();
                     break;
-                case 222:
-                case 193:
-                case 223:
+                case 226:
+                case 197:
+                case 227:
                     startNode(node);
                     for (var _f = 0, _g = node.members; _f < _g.length; _f++) {
                         var member = _g[_f];
@@ -56451,21 +57404,21 @@ var ts;
                     }
                     endNode();
                     break;
-                case 226:
+                case 230:
                     addNodeWithRecursiveChild(node, getInteriorModule(node).body);
                     break;
-                case 239:
-                case 230:
-                case 154:
-                case 152:
+                case 243:
+                case 234:
+                case 155:
                 case 153:
-                case 224:
+                case 154:
+                case 228:
                     addLeafNode(node);
                     break;
                 default:
                     ts.forEach(node.jsDocComments, function (jsDocComment) {
                         ts.forEach(jsDocComment.tags, function (tag) {
-                            if (tag.kind === 279) {
+                            if (tag.kind === 284) {
                                 addLeafNode(tag);
                             }
                         });
@@ -56513,12 +57466,12 @@ var ts;
                 }
             });
             function shouldReallyMerge(a, b) {
-                return a.kind === b.kind && (a.kind !== 226 || areSameModule(a, b));
+                return a.kind === b.kind && (a.kind !== 230 || areSameModule(a, b));
                 function areSameModule(a, b) {
                     if (a.body.kind !== b.body.kind) {
                         return false;
                     }
-                    if (a.body.kind !== 226) {
+                    if (a.body.kind !== 230) {
                         return true;
                     }
                     return areSameModule(a.body, b.body);
@@ -56569,7 +57522,7 @@ var ts;
             return a.length - b.length;
         };
         function tryGetName(node) {
-            if (node.kind === 226) {
+            if (node.kind === 230) {
                 return getModuleName(node);
             }
             var decl = node;
@@ -56577,18 +57530,18 @@ var ts;
                 return ts.getPropertyNameForPropertyNameNode(decl.name);
             }
             switch (node.kind) {
-                case 180:
-                case 181:
-                case 193:
+                case 184:
+                case 185:
+                case 197:
                     return getFunctionOrClassName(node);
-                case 279:
+                case 284:
                     return getJSDocTypedefTagName(node);
                 default:
                     return undefined;
             }
         }
         function getItemName(node) {
-            if (node.kind === 226) {
+            if (node.kind === 230) {
                 return getModuleName(node);
             }
             var name = node.name;
@@ -56599,29 +57552,29 @@ var ts;
                 }
             }
             switch (node.kind) {
-                case 256:
+                case 261:
                     var sourceFile = node;
                     return ts.isExternalModule(sourceFile)
                         ? "\"" + ts.escapeString(ts.getBaseFileName(ts.removeFileExtension(ts.normalizePath(sourceFile.fileName)))) + "\""
                         : "<global>";
-                case 181:
-                case 221:
-                case 180:
-                case 222:
-                case 193:
+                case 185:
+                case 225:
+                case 184:
+                case 226:
+                case 197:
                     if (ts.getModifierFlags(node) & 512) {
                         return "default";
                     }
                     return getFunctionOrClassName(node);
-                case 149:
+                case 150:
                     return "constructor";
-                case 153:
-                    return "new()";
-                case 152:
-                    return "()";
                 case 154:
+                    return "new()";
+                case 153:
+                    return "()";
+                case 155:
                     return "[]";
-                case 279:
+                case 284:
                     return getJSDocTypedefTagName(node);
                 default:
                     return "<unknown>";
@@ -56633,7 +57586,7 @@ var ts;
             }
             else {
                 var parentNode = node.parent && node.parent.parent;
-                if (parentNode && parentNode.kind === 201) {
+                if (parentNode && parentNode.kind === 205) {
                     if (parentNode.declarationList.declarations.length > 0) {
                         var nameIdentifier = parentNode.declarationList.declarations[0].name;
                         if (nameIdentifier.kind === 70) {
@@ -56661,24 +57614,24 @@ var ts;
             return topLevel;
             function isTopLevel(item) {
                 switch (navigationBarNodeKind(item)) {
-                    case 222:
-                    case 193:
-                    case 225:
-                    case 223:
                     case 226:
-                    case 256:
-                    case 224:
-                    case 279:
+                    case 197:
+                    case 229:
+                    case 227:
+                    case 230:
+                    case 261:
+                    case 228:
+                    case 284:
                         return true;
-                    case 149:
-                    case 148:
                     case 150:
+                    case 149:
                     case 151:
-                    case 219:
+                    case 152:
+                    case 223:
                         return hasSomeImportantChild(item);
-                    case 181:
-                    case 221:
-                    case 180:
+                    case 185:
+                    case 225:
+                    case 184:
                         return isTopLevelFunctionDeclaration(item);
                     default:
                         return false;
@@ -56688,10 +57641,10 @@ var ts;
                         return false;
                     }
                     switch (navigationBarNodeKind(item.parent)) {
-                        case 227:
-                        case 256:
-                        case 148:
+                        case 231:
+                        case 261:
                         case 149:
+                        case 150:
                             return true;
                         default:
                             return hasSomeImportantChild(item);
@@ -56700,7 +57653,7 @@ var ts;
                 function hasSomeImportantChild(item) {
                     return ts.forEach(item.children, function (child) {
                         var childKind = navigationBarNodeKind(child);
-                        return childKind !== 219 && childKind !== 170;
+                        return childKind !== 223 && childKind !== 174;
                     });
                 }
             }
@@ -56755,20 +57708,20 @@ var ts;
             }
             var result = [];
             result.push(moduleDeclaration.name.text);
-            while (moduleDeclaration.body && moduleDeclaration.body.kind === 226) {
+            while (moduleDeclaration.body && moduleDeclaration.body.kind === 230) {
                 moduleDeclaration = moduleDeclaration.body;
                 result.push(moduleDeclaration.name.text);
             }
             return result.join(".");
         }
         function getInteriorModule(decl) {
-            return decl.body.kind === 226 ? getInteriorModule(decl.body) : decl;
+            return decl.body.kind === 230 ? getInteriorModule(decl.body) : decl;
         }
         function isComputedProperty(member) {
-            return !member.name || member.name.kind === 141;
+            return !member.name || member.name.kind === 142;
         }
         function getNodeSpan(node) {
-            return node.kind === 256
+            return node.kind === 261
                 ? ts.createTextSpanFromBounds(node.getFullStart(), node.getEnd())
                 : ts.createTextSpanFromBounds(node.getStart(curSourceFile), node.getEnd());
         }
@@ -56776,14 +57729,14 @@ var ts;
             if (node.name && ts.getFullWidth(node.name) > 0) {
                 return ts.declarationNameToString(node.name);
             }
-            else if (node.parent.kind === 219) {
+            else if (node.parent.kind === 223) {
                 return ts.declarationNameToString(node.parent.name);
             }
-            else if (node.parent.kind === 188 &&
+            else if (node.parent.kind === 192 &&
                 node.parent.operatorToken.kind === 57) {
-                return nodeText(node.parent.left);
+                return nodeText(node.parent.left).replace(whiteSpaceRegex, "");
             }
-            else if (node.parent.kind === 253 && node.parent.name) {
+            else if (node.parent.kind === 257 && node.parent.name) {
                 return nodeText(node.parent.name);
             }
             else if (ts.getModifierFlags(node) & 512) {
@@ -56794,8 +57747,9 @@ var ts;
             }
         }
         function isFunctionOrClassExpression(node) {
-            return node.kind === 180 || node.kind === 181 || node.kind === 193;
+            return node.kind === 184 || node.kind === 185 || node.kind === 197;
         }
+        var whiteSpaceRegex = /\s+/g;
     })(NavigationBar = ts.NavigationBar || (ts.NavigationBar = {}));
 })(ts || (ts = {}));
 var ts;
@@ -56866,7 +57820,7 @@ var ts;
                 }
             }
             function autoCollapse(node) {
-                return ts.isFunctionBlock(node) && node.parent.kind !== 181;
+                return ts.isFunctionBlock(node) && node.parent.kind !== 185;
             }
             var depth = 0;
             var maxDepth = 20;
@@ -56878,26 +57832,26 @@ var ts;
                     addOutliningForLeadingCommentsForNode(n);
                 }
                 switch (n.kind) {
-                    case 200:
+                    case 204:
                         if (!ts.isFunctionBlock(n)) {
-                            var parent_22 = n.parent;
+                            var parent_20 = n.parent;
                             var openBrace = ts.findChildOfKind(n, 16, sourceFile);
                             var closeBrace = ts.findChildOfKind(n, 17, sourceFile);
-                            if (parent_22.kind === 205 ||
-                                parent_22.kind === 208 ||
-                                parent_22.kind === 209 ||
-                                parent_22.kind === 207 ||
-                                parent_22.kind === 204 ||
-                                parent_22.kind === 206 ||
-                                parent_22.kind === 213 ||
-                                parent_22.kind === 252) {
-                                addOutliningSpan(parent_22, openBrace, closeBrace, autoCollapse(n));
+                            if (parent_20.kind === 209 ||
+                                parent_20.kind === 212 ||
+                                parent_20.kind === 213 ||
+                                parent_20.kind === 211 ||
+                                parent_20.kind === 208 ||
+                                parent_20.kind === 210 ||
+                                parent_20.kind === 217 ||
+                                parent_20.kind === 256) {
+                                addOutliningSpan(parent_20, openBrace, closeBrace, autoCollapse(n));
                                 break;
                             }
-                            if (parent_22.kind === 217) {
-                                var tryStatement = parent_22;
+                            if (parent_20.kind === 221) {
+                                var tryStatement = parent_20;
                                 if (tryStatement.tryBlock === n) {
-                                    addOutliningSpan(parent_22, openBrace, closeBrace, autoCollapse(n));
+                                    addOutliningSpan(parent_20, openBrace, closeBrace, autoCollapse(n));
                                     break;
                                 }
                                 else if (tryStatement.finallyBlock === n) {
@@ -56917,23 +57871,23 @@ var ts;
                             });
                             break;
                         }
-                    case 227: {
+                    case 231: {
                         var openBrace = ts.findChildOfKind(n, 16, sourceFile);
                         var closeBrace = ts.findChildOfKind(n, 17, sourceFile);
                         addOutliningSpan(n.parent, openBrace, closeBrace, autoCollapse(n));
                         break;
                     }
-                    case 222:
-                    case 223:
-                    case 225:
-                    case 172:
-                    case 228: {
+                    case 226:
+                    case 227:
+                    case 229:
+                    case 176:
+                    case 232: {
                         var openBrace = ts.findChildOfKind(n, 16, sourceFile);
                         var closeBrace = ts.findChildOfKind(n, 17, sourceFile);
                         addOutliningSpan(n, openBrace, closeBrace, autoCollapse(n));
                         break;
                     }
-                    case 171:
+                    case 175:
                         var openBracket = ts.findChildOfKind(n, 20, sourceFile);
                         var closeBracket = ts.findChildOfKind(n, 21, sourceFile);
                         addOutliningSpan(n, openBracket, closeBracket, autoCollapse(n));
@@ -56951,13 +57905,13 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
+    var PatternMatchKind;
     (function (PatternMatchKind) {
         PatternMatchKind[PatternMatchKind["exact"] = 0] = "exact";
         PatternMatchKind[PatternMatchKind["prefix"] = 1] = "prefix";
         PatternMatchKind[PatternMatchKind["substring"] = 2] = "substring";
         PatternMatchKind[PatternMatchKind["camelCase"] = 3] = "camelCase";
-    })(ts.PatternMatchKind || (ts.PatternMatchKind = {}));
-    var PatternMatchKind = ts.PatternMatchKind;
+    })(PatternMatchKind = ts.PatternMatchKind || (ts.PatternMatchKind = {}));
     function createPatternMatch(kind, punctuationStripped, isCaseSensitive, camelCaseWeight) {
         return {
             kind: kind,
@@ -57178,7 +58132,7 @@ var ts;
         if (ch >= 65 && ch <= 90) {
             return true;
         }
-        if (ch < 127 || !ts.isUnicodeIdentifierStart(ch, 4)) {
+        if (ch < 127 || !ts.isUnicodeIdentifierStart(ch, 5)) {
             return false;
         }
         var str = String.fromCharCode(ch);
@@ -57188,7 +58142,7 @@ var ts;
         if (ch >= 97 && ch <= 122) {
             return true;
         }
-        if (ch < 127 || !ts.isUnicodeIdentifierStart(ch, 4)) {
+        if (ch < 127 || !ts.isUnicodeIdentifierStart(ch, 5)) {
             return false;
         }
         var str = String.fromCharCode(ch);
@@ -57424,7 +58378,7 @@ var ts;
             var token = ts.scanner.getToken();
             if (token === 123) {
                 token = nextToken();
-                if (token === 126) {
+                if (token === 127) {
                     token = nextToken();
                     if (token === 9) {
                         recordAmbientExternalModule();
@@ -57445,7 +58399,7 @@ var ts;
                 else {
                     if (token === 70 || ts.isKeyword(token)) {
                         token = nextToken();
-                        if (token === 137) {
+                        if (token === 138) {
                             token = nextToken();
                             if (token === 9) {
                                 recordModuleName();
@@ -57471,7 +58425,7 @@ var ts;
                         }
                         if (token === 17) {
                             token = nextToken();
-                            if (token === 137) {
+                            if (token === 138) {
                                 token = nextToken();
                                 if (token === 9) {
                                     recordModuleName();
@@ -57485,7 +58439,7 @@ var ts;
                             token = nextToken();
                             if (token === 70 || ts.isKeyword(token)) {
                                 token = nextToken();
-                                if (token === 137) {
+                                if (token === 138) {
                                     token = nextToken();
                                     if (token === 9) {
                                         recordModuleName();
@@ -57511,7 +58465,7 @@ var ts;
                     }
                     if (token === 17) {
                         token = nextToken();
-                        if (token === 137) {
+                        if (token === 138) {
                             token = nextToken();
                             if (token === 9) {
                                 recordModuleName();
@@ -57521,7 +58475,7 @@ var ts;
                 }
                 else if (token === 38) {
                     token = nextToken();
-                    if (token === 137) {
+                    if (token === 138) {
                         token = nextToken();
                         if (token === 9) {
                             recordModuleName();
@@ -57545,7 +58499,7 @@ var ts;
         }
         function tryConsumeRequireCall(skipCurrentToken) {
             var token = skipCurrentToken ? nextToken() : ts.scanner.getToken();
-            if (token === 130) {
+            if (token === 131) {
                 token = nextToken();
                 if (token === 18) {
                     token = nextToken();
@@ -57739,12 +58693,6 @@ var ts;
     var SignatureHelp;
     (function (SignatureHelp) {
         var emptyArray = [];
-        (function (ArgumentListKind) {
-            ArgumentListKind[ArgumentListKind["TypeArguments"] = 0] = "TypeArguments";
-            ArgumentListKind[ArgumentListKind["CallArguments"] = 1] = "CallArguments";
-            ArgumentListKind[ArgumentListKind["TaggedTemplateArguments"] = 2] = "TaggedTemplateArguments";
-        })(SignatureHelp.ArgumentListKind || (SignatureHelp.ArgumentListKind = {}));
-        var ArgumentListKind = SignatureHelp.ArgumentListKind;
         function getSignatureHelpItems(program, sourceFile, position, cancellationToken) {
             var typeChecker = program.getTypeChecker();
             var startingToken = ts.findTokenOnLeftOfPosition(sourceFile, position);
@@ -57770,14 +58718,14 @@ var ts;
         }
         SignatureHelp.getSignatureHelpItems = getSignatureHelpItems;
         function createJavaScriptSignatureHelpItems(argumentInfo, program) {
-            if (argumentInfo.invocation.kind !== 175) {
+            if (argumentInfo.invocation.kind !== 179) {
                 return undefined;
             }
             var callExpression = argumentInfo.invocation;
             var expression = callExpression.expression;
             var name = expression.kind === 70
                 ? expression
-                : expression.kind === 173
+                : expression.kind === 177
                     ? expression.name
                     : undefined;
             if (!name || !name.text) {
@@ -57806,7 +58754,7 @@ var ts;
             }
         }
         function getImmediatelyContainingArgumentInfo(node, position, sourceFile) {
-            if (node.parent.kind === 175 || node.parent.kind === 176) {
+            if (node.parent.kind === 179 || node.parent.kind === 180) {
                 var callExpression = node.parent;
                 if (node.kind === 26 ||
                     node.kind === 18) {
@@ -57838,23 +58786,23 @@ var ts;
                 }
                 return undefined;
             }
-            else if (node.kind === 12 && node.parent.kind === 177) {
+            else if (node.kind === 12 && node.parent.kind === 181) {
                 if (ts.isInsideTemplateLiteral(node, position)) {
                     return getArgumentListInfoForTemplate(node.parent, 0, sourceFile);
                 }
             }
-            else if (node.kind === 13 && node.parent.parent.kind === 177) {
+            else if (node.kind === 13 && node.parent.parent.kind === 181) {
                 var templateExpression = node.parent;
                 var tagExpression = templateExpression.parent;
-                ts.Debug.assert(templateExpression.kind === 190);
+                ts.Debug.assert(templateExpression.kind === 194);
                 var argumentIndex = ts.isInsideTemplateLiteral(node, position) ? 0 : 1;
                 return getArgumentListInfoForTemplate(tagExpression, argumentIndex, sourceFile);
             }
-            else if (node.parent.kind === 198 && node.parent.parent.parent.kind === 177) {
+            else if (node.parent.kind === 202 && node.parent.parent.parent.kind === 181) {
                 var templateSpan = node.parent;
                 var templateExpression = templateSpan.parent;
                 var tagExpression = templateExpression.parent;
-                ts.Debug.assert(templateExpression.kind === 190);
+                ts.Debug.assert(templateExpression.kind === 194);
                 if (node.kind === 15 && !ts.isInsideTemplateLiteral(node, position)) {
                     return undefined;
                 }
@@ -57918,7 +58866,7 @@ var ts;
             var template = taggedTemplate.template;
             var applicableSpanStart = template.getStart();
             var applicableSpanEnd = template.getEnd();
-            if (template.kind === 190) {
+            if (template.kind === 194) {
                 var lastSpan = ts.lastOrUndefined(template.templateSpans);
                 if (lastSpan.literal.getFullWidth() === 0) {
                     applicableSpanEnd = ts.skipTrivia(sourceFile.text, applicableSpanEnd, false);
@@ -57927,7 +58875,7 @@ var ts;
             return ts.createTextSpan(applicableSpanStart, applicableSpanEnd - applicableSpanStart);
         }
         function getContainingArgumentInfo(node, position, sourceFile) {
-            for (var n = node; n.kind !== 256; n = n.parent) {
+            for (var n = node; n.kind !== 261; n = n.parent) {
                 if (ts.isFunctionBlock(n)) {
                     return undefined;
                 }
@@ -57977,7 +58925,9 @@ var ts;
                 if (callTargetDisplayParts) {
                     ts.addRange(prefixDisplayParts, callTargetDisplayParts);
                 }
+                var isVariadic;
                 if (isTypeParameterList) {
+                    isVariadic = false;
                     prefixDisplayParts.push(ts.punctuationPart(26));
                     var typeParameters = candidateSignature.typeParameters;
                     signatureHelpParameters = typeParameters && typeParameters.length > 0 ? ts.map(typeParameters, createSignatureHelpParameterForTypeParameter) : emptyArray;
@@ -57988,6 +58938,7 @@ var ts;
                     ts.addRange(suffixDisplayParts, parameterParts);
                 }
                 else {
+                    isVariadic = candidateSignature.hasRestParameter;
                     var typeParameterParts = ts.mapToDisplayParts(function (writer) {
                         return typeChecker.getSymbolDisplayBuilder().buildDisplayForTypeParametersAndDelimiters(candidateSignature.typeParameters, writer, invocation);
                     });
@@ -58002,7 +58953,7 @@ var ts;
                 });
                 ts.addRange(suffixDisplayParts, returnTypeParts);
                 return {
-                    isVariadic: candidateSignature.hasRestParameter,
+                    isVariadic: isVariadic,
                     prefixDisplayParts: prefixDisplayParts,
                     suffixDisplayParts: suffixDisplayParts,
                     separatorDisplayParts: [ts.punctuationPart(25), ts.spacePart()],
@@ -58056,7 +59007,7 @@ var ts;
         function getSymbolKind(typeChecker, symbol, location) {
             var flags = symbol.getFlags();
             if (flags & 32)
-                return ts.getDeclarationOfKind(symbol, 193) ?
+                return ts.getDeclarationOfKind(symbol, 197) ?
                     ts.ScriptElementKind.localClassElement : ts.ScriptElementKind.classElement;
             if (flags & 384)
                 return ts.ScriptElementKind.enumElement;
@@ -58156,14 +59107,14 @@ var ts;
                 var signature = void 0;
                 type = isThisExpression ? typeChecker.getTypeAtLocation(location) : typeChecker.getTypeOfSymbolAtLocation(symbol, location);
                 if (type) {
-                    if (location.parent && location.parent.kind === 173) {
+                    if (location.parent && location.parent.kind === 177) {
                         var right = location.parent.name;
                         if (right === location || (right && right.getFullWidth() === 0)) {
                             location = location.parent;
                         }
                     }
                     var callExpression = void 0;
-                    if (location.kind === 175 || location.kind === 176) {
+                    if (location.kind === 179 || location.kind === 180) {
                         callExpression = location;
                     }
                     else if (ts.isCallExpressionTarget(location) || ts.isNewExpressionTarget(location)) {
@@ -58175,7 +59126,7 @@ var ts;
                         if (!signature && candidateSignatures.length) {
                             signature = candidateSignatures[0];
                         }
-                        var useConstructSignatures = callExpression.kind === 176 || callExpression.expression.kind === 96;
+                        var useConstructSignatures = callExpression.kind === 180 || callExpression.expression.kind === 96;
                         var allSignatures = useConstructSignatures ? type.getConstructSignatures() : type.getCallSignatures();
                         if (!ts.contains(allSignatures, signature.target) && !ts.contains(allSignatures, signature)) {
                             signature = allSignatures.length ? allSignatures[0] : undefined;
@@ -58211,7 +59162,7 @@ var ts;
                                         displayParts.push(ts.keywordPart(93));
                                         displayParts.push(ts.spacePart());
                                     }
-                                    if (!(type.flags & 2097152) && type.symbol) {
+                                    if (!(type.flags & 32768 && type.objectFlags & 16) && type.symbol) {
                                         ts.addRange(displayParts, ts.symbolToDisplayParts(typeChecker, type.symbol, enclosingDeclaration, undefined, 1));
                                     }
                                     addSignatureDisplayParts(signature, allSignatures, 8);
@@ -58223,21 +59174,21 @@ var ts;
                         }
                     }
                     else if ((ts.isNameOfFunctionDeclaration(location) && !(symbol.flags & 98304)) ||
-                        (location.kind === 122 && location.parent.kind === 149)) {
+                        (location.kind === 122 && location.parent.kind === 150)) {
                         var functionDeclaration = location.parent;
-                        var allSignatures = functionDeclaration.kind === 149 ? type.getNonNullableType().getConstructSignatures() : type.getNonNullableType().getCallSignatures();
+                        var allSignatures = functionDeclaration.kind === 150 ? type.getNonNullableType().getConstructSignatures() : type.getNonNullableType().getCallSignatures();
                         if (!typeChecker.isImplementationOfOverload(functionDeclaration)) {
                             signature = typeChecker.getSignatureFromDeclaration(functionDeclaration);
                         }
                         else {
                             signature = allSignatures[0];
                         }
-                        if (functionDeclaration.kind === 149) {
+                        if (functionDeclaration.kind === 150) {
                             symbolKind = ts.ScriptElementKind.constructorImplementationElement;
                             addPrefixForAnyFunctionOrVar(type.symbol, symbolKind);
                         }
                         else {
-                            addPrefixForAnyFunctionOrVar(functionDeclaration.kind === 152 &&
+                            addPrefixForAnyFunctionOrVar(functionDeclaration.kind === 153 &&
                                 !(type.symbol.flags & 2048 || type.symbol.flags & 4096) ? type.symbol : symbol, symbolKind);
                         }
                         addSignatureDisplayParts(signature, allSignatures);
@@ -58246,7 +59197,7 @@ var ts;
                 }
             }
             if (symbolFlags & 32 && !hasAddedSymbolInfo && !isThisExpression) {
-                if (ts.getDeclarationOfKind(symbol, 193)) {
+                if (ts.getDeclarationOfKind(symbol, 197)) {
                     pushTypePart(ts.ScriptElementKind.localClassElement);
                 }
                 else {
@@ -58265,7 +59216,7 @@ var ts;
             }
             if (symbolFlags & 524288) {
                 addNewLineIfDisplayPartsExist();
-                displayParts.push(ts.keywordPart(135));
+                displayParts.push(ts.keywordPart(136));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 writeTypeParametersOfSymbol(symbol, sourceFile);
@@ -58286,9 +59237,9 @@ var ts;
             }
             if (symbolFlags & 1536) {
                 addNewLineIfDisplayPartsExist();
-                var declaration = ts.getDeclarationOfKind(symbol, 226);
+                var declaration = ts.getDeclarationOfKind(symbol, 230);
                 var isNamespace = declaration && declaration.name && declaration.name.kind === 70;
-                displayParts.push(ts.keywordPart(isNamespace ? 127 : 126));
+                displayParts.push(ts.keywordPart(isNamespace ? 128 : 127));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
             }
@@ -58299,31 +59250,31 @@ var ts;
                 displayParts.push(ts.punctuationPart(19));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
-                displayParts.push(ts.spacePart());
-                displayParts.push(ts.keywordPart(91));
-                displayParts.push(ts.spacePart());
                 if (symbol.parent) {
+                    addInPrefix();
                     addFullSymbolName(symbol.parent, enclosingDeclaration);
                     writeTypeParametersOfSymbol(symbol.parent, enclosingDeclaration);
                 }
                 else {
-                    var declaration = ts.getDeclarationOfKind(symbol, 142);
+                    var declaration = ts.getDeclarationOfKind(symbol, 143);
                     ts.Debug.assert(declaration !== undefined);
                     declaration = declaration.parent;
                     if (declaration) {
                         if (ts.isFunctionLikeKind(declaration.kind)) {
+                            addInPrefix();
                             var signature = typeChecker.getSignatureFromDeclaration(declaration);
-                            if (declaration.kind === 153) {
+                            if (declaration.kind === 154) {
                                 displayParts.push(ts.keywordPart(93));
                                 displayParts.push(ts.spacePart());
                             }
-                            else if (declaration.kind !== 152 && declaration.name) {
+                            else if (declaration.kind !== 153 && declaration.name) {
                                 addFullSymbolName(declaration.symbol);
                             }
                             ts.addRange(displayParts, ts.signatureToDisplayParts(typeChecker, signature, sourceFile, 32));
                         }
-                        else {
-                            displayParts.push(ts.keywordPart(135));
+                        else if (declaration.kind === 228) {
+                            addInPrefix();
+                            displayParts.push(ts.keywordPart(136));
                             displayParts.push(ts.spacePart());
                             addFullSymbolName(declaration.symbol);
                             writeTypeParametersOfSymbol(declaration.symbol, sourceFile);
@@ -58334,7 +59285,7 @@ var ts;
             if (symbolFlags & 8) {
                 addPrefixForAnyFunctionOrVar(symbol, "enum member");
                 var declaration = symbol.declarations[0];
-                if (declaration.kind === 255) {
+                if (declaration.kind === 260) {
                     var constantValue = typeChecker.getConstantValue(declaration);
                     if (constantValue !== undefined) {
                         displayParts.push(ts.spacePart());
@@ -58346,10 +59297,10 @@ var ts;
             }
             if (symbolFlags & 8388608) {
                 addNewLineIfDisplayPartsExist();
-                if (symbol.declarations[0].kind === 229) {
+                if (symbol.declarations[0].kind === 233) {
                     displayParts.push(ts.keywordPart(83));
                     displayParts.push(ts.spacePart());
-                    displayParts.push(ts.keywordPart(127));
+                    displayParts.push(ts.keywordPart(128));
                 }
                 else {
                     displayParts.push(ts.keywordPart(90));
@@ -58357,13 +59308,13 @@ var ts;
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 ts.forEach(symbol.declarations, function (declaration) {
-                    if (declaration.kind === 230) {
+                    if (declaration.kind === 234) {
                         var importEqualsDeclaration = declaration;
                         if (ts.isExternalModuleImportEqualsDeclaration(importEqualsDeclaration)) {
                             displayParts.push(ts.spacePart());
                             displayParts.push(ts.operatorPart(57));
                             displayParts.push(ts.spacePart());
-                            displayParts.push(ts.keywordPart(130));
+                            displayParts.push(ts.keywordPart(131));
                             displayParts.push(ts.punctuationPart(18));
                             displayParts.push(ts.displayPart(ts.getTextOfNode(ts.getExternalModuleImportEqualsDeclarationExpression(importEqualsDeclaration)), ts.SymbolDisplayPartKind.stringLiteral));
                             displayParts.push(ts.punctuationPart(19));
@@ -58425,10 +59376,10 @@ var ts;
             if (!documentation) {
                 documentation = symbol.getDocumentationComment();
                 if (documentation.length === 0 && symbol.flags & 4) {
-                    if (symbol.parent && ts.forEach(symbol.parent.declarations, function (declaration) { return declaration.kind === 256; })) {
+                    if (symbol.parent && ts.forEach(symbol.parent.declarations, function (declaration) { return declaration.kind === 261; })) {
                         for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                             var declaration = _a[_i];
-                            if (!declaration.parent || declaration.parent.kind !== 188) {
+                            if (!declaration.parent || declaration.parent.kind !== 192) {
                                 continue;
                             }
                             var rhsSymbol = typeChecker.getSymbolAtLocation(declaration.parent.right);
@@ -58449,6 +59400,11 @@ var ts;
                     displayParts.push(ts.lineBreakPart());
                 }
             }
+            function addInPrefix() {
+                displayParts.push(ts.spacePart());
+                displayParts.push(ts.keywordPart(91));
+                displayParts.push(ts.spacePart());
+            }
             function addFullSymbolName(symbol, enclosingDeclaration) {
                 var fullSymbolDisplayParts = ts.symbolToDisplayParts(typeChecker, symbol, enclosingDeclaration || sourceFile, undefined, 1 | 2);
                 ts.addRange(displayParts, fullSymbolDisplayParts);
@@ -58503,14 +59459,14 @@ var ts;
                 return false;
             }
             return ts.forEach(symbol.declarations, function (declaration) {
-                if (declaration.kind === 180) {
+                if (declaration.kind === 184) {
                     return true;
                 }
-                if (declaration.kind !== 219 && declaration.kind !== 221) {
+                if (declaration.kind !== 223 && declaration.kind !== 225) {
                     return false;
                 }
-                for (var parent_23 = declaration.parent; !ts.isFunctionBlock(parent_23); parent_23 = parent_23.parent) {
-                    if (parent_23.kind === 256 || parent_23.kind === 227) {
+                for (var parent_21 = declaration.parent; !ts.isFunctionBlock(parent_21); parent_21 = parent_21.parent) {
+                    if (parent_21.kind === 261 || parent_21.kind === 231) {
                         return false;
                     }
                 }
@@ -58594,7 +59550,7 @@ var ts;
             return typeof o.type === "object" && !ts.forEachProperty(o.type, function (v) { return typeof v !== "number"; });
         });
         options = ts.clone(options);
-        var _loop_2 = function (opt) {
+        var _loop_4 = function (opt) {
             if (!ts.hasProperty(options, opt.name)) {
                 return "continue";
             }
@@ -58610,7 +59566,7 @@ var ts;
         };
         for (var _i = 0, commandLineOptionsStringToEnum_1 = commandLineOptionsStringToEnum; _i < commandLineOptionsStringToEnum_1.length; _i++) {
             var opt = commandLineOptionsStringToEnum_1[_i];
-            _loop_2(opt);
+            _loop_4(opt);
         }
         return options;
     }
@@ -58619,18 +59575,9 @@ var ts;
 (function (ts) {
     var formatting;
     (function (formatting) {
-        var standardScanner = ts.createScanner(4, false, 0);
-        var jsxScanner = ts.createScanner(4, false, 1);
+        var standardScanner = ts.createScanner(5, false, 0);
+        var jsxScanner = ts.createScanner(5, false, 1);
         var scanner;
-        var ScanAction;
-        (function (ScanAction) {
-            ScanAction[ScanAction["Scan"] = 0] = "Scan";
-            ScanAction[ScanAction["RescanGreaterThanToken"] = 1] = "RescanGreaterThanToken";
-            ScanAction[ScanAction["RescanSlashToken"] = 2] = "RescanSlashToken";
-            ScanAction[ScanAction["RescanTemplateToken"] = 3] = "RescanTemplateToken";
-            ScanAction[ScanAction["RescanJsxIdentifier"] = 4] = "RescanJsxIdentifier";
-            ScanAction[ScanAction["RescanJsxText"] = 5] = "RescanJsxText";
-        })(ScanAction || (ScanAction = {}));
         function getFormattingScanner(sourceFile, startPos, endPos) {
             ts.Debug.assert(scanner === undefined, "Scanner should be undefined");
             scanner = sourceFile.languageVariant === 1 ? jsxScanner : standardScanner;
@@ -58710,10 +59657,10 @@ var ts;
             function shouldRescanJsxIdentifier(node) {
                 if (node.parent) {
                     switch (node.parent.kind) {
-                        case 246:
-                        case 244:
-                        case 245:
-                        case 243:
+                        case 250:
+                        case 248:
+                        case 249:
+                        case 247:
                             return node.kind === 70;
                     }
                 }
@@ -58924,20 +59871,6 @@ var ts;
     })(formatting = ts.formatting || (ts.formatting = {}));
 })(ts || (ts = {}));
 var ts;
-(function (ts) {
-    var formatting;
-    (function (formatting) {
-        (function (FormattingRequestKind) {
-            FormattingRequestKind[FormattingRequestKind["FormatDocument"] = 0] = "FormatDocument";
-            FormattingRequestKind[FormattingRequestKind["FormatSelection"] = 1] = "FormatSelection";
-            FormattingRequestKind[FormattingRequestKind["FormatOnEnter"] = 2] = "FormatOnEnter";
-            FormattingRequestKind[FormattingRequestKind["FormatOnSemicolon"] = 3] = "FormatOnSemicolon";
-            FormattingRequestKind[FormattingRequestKind["FormatOnClosingCurlyBrace"] = 4] = "FormatOnClosingCurlyBrace";
-        })(formatting.FormattingRequestKind || (formatting.FormattingRequestKind = {}));
-        var FormattingRequestKind = formatting.FormattingRequestKind;
-    })(formatting = ts.formatting || (ts.formatting = {}));
-})(ts || (ts = {}));
-var ts;
 (function (ts) {
     var formatting;
     (function (formatting) {
@@ -58959,19 +59892,6 @@ var ts;
     })(formatting = ts.formatting || (ts.formatting = {}));
 })(ts || (ts = {}));
 var ts;
-(function (ts) {
-    var formatting;
-    (function (formatting) {
-        (function (RuleAction) {
-            RuleAction[RuleAction["Ignore"] = 1] = "Ignore";
-            RuleAction[RuleAction["Space"] = 2] = "Space";
-            RuleAction[RuleAction["NewLine"] = 4] = "NewLine";
-            RuleAction[RuleAction["Delete"] = 8] = "Delete";
-        })(formatting.RuleAction || (formatting.RuleAction = {}));
-        var RuleAction = formatting.RuleAction;
-    })(formatting = ts.formatting || (ts.formatting = {}));
-})(ts || (ts = {}));
-var ts;
 (function (ts) {
     var formatting;
     (function (formatting) {
@@ -59002,17 +59922,6 @@ var ts;
     })(formatting = ts.formatting || (ts.formatting = {}));
 })(ts || (ts = {}));
 var ts;
-(function (ts) {
-    var formatting;
-    (function (formatting) {
-        (function (RuleFlags) {
-            RuleFlags[RuleFlags["None"] = 0] = "None";
-            RuleFlags[RuleFlags["CanDeleteNewLines"] = 1] = "CanDeleteNewLines";
-        })(formatting.RuleFlags || (formatting.RuleFlags = {}));
-        var RuleFlags = formatting.RuleFlags;
-    })(formatting = ts.formatting || (ts.formatting = {}));
-})(ts || (ts = {}));
-var ts;
 (function (ts) {
     var formatting;
     (function (formatting) {
@@ -59126,13 +60035,13 @@ var ts;
                 this.NoSpaceBetweenReturnAndSemicolon = new formatting.Rule(formatting.RuleDescriptor.create1(95, 24), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
                 this.SpaceBetweenStatements = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([19, 80, 81, 72]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNonJsxElementContext, Rules.IsNotForContext), 2));
                 this.SpaceAfterTryFinally = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([101, 86]), 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2));
-                this.SpaceAfterGetSetInMember = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([124, 132]), 70), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2));
+                this.SpaceAfterGetSetInMember = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([124, 133]), 70), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2));
                 this.SpaceBeforeBinaryKeywordOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryKeywordOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2));
                 this.SpaceAfterBinaryKeywordOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.BinaryKeywordOperators, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2));
                 this.NoSpaceAfterConstructor = new formatting.Rule(formatting.RuleDescriptor.create1(122, 18), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
-                this.NoSpaceAfterModuleImport = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([126, 130]), 18), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
-                this.SpaceAfterCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([116, 74, 123, 78, 82, 83, 84, 124, 107, 90, 108, 126, 127, 111, 113, 112, 132, 114, 135, 137]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2));
-                this.SpaceBeforeCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([84, 107, 137])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2));
+                this.NoSpaceAfterModuleImport = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([127, 131]), 18), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
+                this.SpaceAfterCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([116, 74, 123, 78, 82, 83, 84, 124, 107, 90, 108, 127, 128, 111, 113, 112, 133, 114, 136, 138]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2));
+                this.SpaceBeforeCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([84, 107, 138])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2));
                 this.SpaceAfterModuleName = new formatting.Rule(formatting.RuleDescriptor.create1(9, 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsModuleDeclContext), 2));
                 this.SpaceBeforeArrow = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 35), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2));
                 this.SpaceAfterArrow = new formatting.Rule(formatting.RuleDescriptor.create3(35, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2));
@@ -59146,7 +60055,7 @@ var ts;
                 this.NoSpaceBetweenEmptyInterfaceBraceBrackets = new formatting.Rule(formatting.RuleDescriptor.create1(16, 17), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsObjectTypeContext), 8));
                 this.SpaceBeforeAt = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 56), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2));
                 this.NoSpaceAfterAt = new formatting.Rule(formatting.RuleDescriptor.create3(56, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
-                this.SpaceAfterDecorator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([116, 70, 83, 78, 74, 114, 113, 111, 112, 124, 132, 20, 38])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsEndOfDecoratorContextOnSameLine), 2));
+                this.SpaceAfterDecorator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([116, 70, 83, 78, 74, 114, 113, 111, 112, 124, 133, 20, 38])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsEndOfDecoratorContextOnSameLine), 2));
                 this.NoSpaceBetweenFunctionKeywordAndStar = new formatting.Rule(formatting.RuleDescriptor.create1(88, 38), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclarationOrFunctionExpressionContext), 8));
                 this.SpaceAfterStarInGeneratorDeclaration = new formatting.Rule(formatting.RuleDescriptor.create3(38, formatting.Shared.TokenRange.FromTokens([70, 18])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclarationOrFunctionExpressionContext), 2));
                 this.NoSpaceBetweenYieldKeywordAndStar = new formatting.Rule(formatting.RuleDescriptor.create1(115, 38), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsYieldOrYieldStarWithOperand), 8));
@@ -59251,43 +60160,43 @@ var ts;
             }
             Rules.prototype.getRuleName = function (rule) {
                 var o = this;
-                for (var name_51 in o) {
-                    if (o[name_51] === rule) {
-                        return name_51;
+                for (var name_47 in o) {
+                    if (o[name_47] === rule) {
+                        return name_47;
                     }
                 }
                 throw new Error("Unknown rule");
             };
             Rules.IsForContext = function (context) {
-                return context.contextNode.kind === 207;
+                return context.contextNode.kind === 211;
             };
             Rules.IsNotForContext = function (context) {
                 return !Rules.IsForContext(context);
             };
             Rules.IsBinaryOpContext = function (context) {
                 switch (context.contextNode.kind) {
-                    case 188:
-                    case 189:
-                    case 196:
+                    case 192:
+                    case 193:
+                    case 200:
+                    case 243:
                     case 239:
-                    case 235:
-                    case 155:
-                    case 163:
+                    case 156:
                     case 164:
+                    case 165:
                         return true;
-                    case 170:
-                    case 224:
-                    case 230:
-                    case 219:
-                    case 143:
-                    case 255:
+                    case 174:
+                    case 228:
+                    case 234:
+                    case 223:
+                    case 144:
+                    case 260:
+                    case 147:
                     case 146:
-                    case 145:
                         return context.currentTokenSpan.kind === 57 || context.nextTokenSpan.kind === 57;
-                    case 208:
+                    case 212:
                         return context.currentTokenSpan.kind === 91 || context.nextTokenSpan.kind === 91;
-                    case 209:
-                        return context.currentTokenSpan.kind === 139 || context.nextTokenSpan.kind === 139;
+                    case 213:
+                        return context.currentTokenSpan.kind === 140 || context.nextTokenSpan.kind === 140;
                 }
                 return false;
             };
@@ -59295,7 +60204,7 @@ var ts;
                 return !Rules.IsBinaryOpContext(context);
             };
             Rules.IsConditionalOperatorContext = function (context) {
-                return context.contextNode.kind === 189;
+                return context.contextNode.kind === 193;
             };
             Rules.IsSameLineTokenOrBeforeMultilineBlockContext = function (context) {
                 return context.TokensAreOnSameLine() || Rules.IsBeforeMultilineBlockContext(context);
@@ -59320,90 +60229,90 @@ var ts;
                     return true;
                 }
                 switch (node.kind) {
-                    case 200:
-                    case 228:
-                    case 172:
-                    case 227:
+                    case 204:
+                    case 232:
+                    case 176:
+                    case 231:
                         return true;
                 }
                 return false;
             };
             Rules.IsFunctionDeclContext = function (context) {
                 switch (context.contextNode.kind) {
-                    case 221:
+                    case 225:
+                    case 149:
                     case 148:
-                    case 147:
-                    case 150:
                     case 151:
                     case 152:
-                    case 180:
-                    case 149:
-                    case 181:
-                    case 223:
+                    case 153:
+                    case 184:
+                    case 150:
+                    case 185:
+                    case 227:
                         return true;
                 }
                 return false;
             };
             Rules.IsFunctionDeclarationOrFunctionExpressionContext = function (context) {
-                return context.contextNode.kind === 221 || context.contextNode.kind === 180;
+                return context.contextNode.kind === 225 || context.contextNode.kind === 184;
             };
             Rules.IsTypeScriptDeclWithBlockContext = function (context) {
                 return Rules.NodeIsTypeScriptDeclWithBlockContext(context.contextNode);
             };
             Rules.NodeIsTypeScriptDeclWithBlockContext = function (node) {
                 switch (node.kind) {
-                    case 222:
-                    case 193:
-                    case 223:
-                    case 225:
-                    case 160:
                     case 226:
-                    case 237:
+                    case 197:
+                    case 227:
+                    case 229:
+                    case 161:
+                    case 230:
+                    case 241:
+                    case 242:
+                    case 235:
                     case 238:
-                    case 231:
-                    case 234:
                         return true;
                 }
                 return false;
             };
             Rules.IsAfterCodeBlockContext = function (context) {
                 switch (context.currentTokenParent.kind) {
-                    case 222:
                     case 226:
-                    case 225:
-                    case 200:
-                    case 252:
-                    case 227:
-                    case 214:
+                    case 230:
+                    case 229:
+                    case 204:
+                    case 256:
+                    case 231:
+                    case 218:
                         return true;
                 }
                 return false;
             };
             Rules.IsControlDeclContext = function (context) {
                 switch (context.contextNode.kind) {
-                    case 204:
-                    case 214:
-                    case 207:
                     case 208:
-                    case 209:
-                    case 206:
-                    case 217:
-                    case 205:
+                    case 218:
+                    case 211:
+                    case 212:
                     case 213:
-                    case 252:
+                    case 210:
+                    case 221:
+                    case 209:
+                    case 217:
+                    case 256:
                         return true;
                     default:
                         return false;
                 }
             };
             Rules.IsObjectContext = function (context) {
-                return context.contextNode.kind === 172;
+                return context.contextNode.kind === 176;
             };
             Rules.IsFunctionCallContext = function (context) {
-                return context.contextNode.kind === 175;
+                return context.contextNode.kind === 179;
             };
             Rules.IsNewContext = function (context) {
-                return context.contextNode.kind === 176;
+                return context.contextNode.kind === 180;
             };
             Rules.IsFunctionCallOrNewContext = function (context) {
                 return Rules.IsFunctionCallContext(context) || Rules.IsNewContext(context);
@@ -59415,25 +60324,25 @@ var ts;
                 return context.nextTokenSpan.kind !== 21;
             };
             Rules.IsArrowFunctionContext = function (context) {
-                return context.contextNode.kind === 181;
+                return context.contextNode.kind === 185;
             };
             Rules.IsNonJsxSameLineTokenContext = function (context) {
                 return context.TokensAreOnSameLine() && context.contextNode.kind !== 10;
             };
             Rules.IsNonJsxElementContext = function (context) {
-                return context.contextNode.kind !== 242;
+                return context.contextNode.kind !== 246;
             };
             Rules.IsJsxExpressionContext = function (context) {
-                return context.contextNode.kind === 248;
+                return context.contextNode.kind === 252;
             };
             Rules.IsNextTokenParentJsxAttribute = function (context) {
-                return context.nextTokenParent.kind === 246;
+                return context.nextTokenParent.kind === 250;
             };
             Rules.IsJsxAttributeContext = function (context) {
-                return context.contextNode.kind === 246;
+                return context.contextNode.kind === 250;
             };
             Rules.IsJsxSelfClosingElementContext = function (context) {
-                return context.contextNode.kind === 243;
+                return context.contextNode.kind === 247;
             };
             Rules.IsNotBeforeBlockInFunctionDeclarationContext = function (context) {
                 return !Rules.IsFunctionDeclContext(context) && !Rules.IsBeforeBlockContext(context);
@@ -59448,41 +60357,41 @@ var ts;
                 while (ts.isPartOfExpression(node)) {
                     node = node.parent;
                 }
-                return node.kind === 144;
+                return node.kind === 145;
             };
             Rules.IsStartOfVariableDeclarationList = function (context) {
-                return context.currentTokenParent.kind === 220 &&
+                return context.currentTokenParent.kind === 224 &&
                     context.currentTokenParent.getStart(context.sourceFile) === context.currentTokenSpan.pos;
             };
             Rules.IsNotFormatOnEnter = function (context) {
                 return context.formattingRequestKind !== 2;
             };
             Rules.IsModuleDeclContext = function (context) {
-                return context.contextNode.kind === 226;
+                return context.contextNode.kind === 230;
             };
             Rules.IsObjectTypeContext = function (context) {
-                return context.contextNode.kind === 160;
+                return context.contextNode.kind === 161;
             };
             Rules.IsTypeArgumentOrParameterOrAssertion = function (token, parent) {
                 if (token.kind !== 26 && token.kind !== 28) {
                     return false;
                 }
                 switch (parent.kind) {
-                    case 156:
-                    case 178:
-                    case 222:
-                    case 193:
-                    case 223:
-                    case 221:
-                    case 180:
-                    case 181:
+                    case 157:
+                    case 182:
+                    case 226:
+                    case 197:
+                    case 227:
+                    case 225:
+                    case 184:
+                    case 185:
+                    case 149:
                     case 148:
-                    case 147:
-                    case 152:
                     case 153:
-                    case 175:
-                    case 176:
-                    case 195:
+                    case 154:
+                    case 179:
+                    case 180:
+                    case 199:
                         return true;
                     default:
                         return false;
@@ -59493,13 +60402,13 @@ var ts;
                     Rules.IsTypeArgumentOrParameterOrAssertion(context.nextTokenSpan, context.nextTokenParent);
             };
             Rules.IsTypeAssertionContext = function (context) {
-                return context.contextNode.kind === 178;
+                return context.contextNode.kind === 182;
             };
             Rules.IsVoidOpContext = function (context) {
-                return context.currentTokenSpan.kind === 104 && context.currentTokenParent.kind === 184;
+                return context.currentTokenSpan.kind === 104 && context.currentTokenParent.kind === 188;
             };
             Rules.IsYieldOrYieldStarWithOperand = function (context) {
-                return context.contextNode.kind === 191 && context.contextNode.expression !== undefined;
+                return context.contextNode.kind === 195 && context.contextNode.expression !== undefined;
             };
             return Rules;
         }());
@@ -59521,7 +60430,7 @@ var ts;
                 return result;
             };
             RulesMap.prototype.Initialize = function (rules) {
-                this.mapRowLength = 139 + 1;
+                this.mapRowLength = 140 + 1;
                 this.map = new Array(this.mapRowLength * this.mapRowLength);
                 var rulesBucketConstructionStateList = new Array(this.map.length);
                 this.FillRules(rules, rulesBucketConstructionStateList);
@@ -59534,7 +60443,7 @@ var ts;
                 });
             };
             RulesMap.prototype.GetRuleBucketIndex = function (row, column) {
-                ts.Debug.assert(row <= 139 && column <= 139, "Must compute formatting context from tokens");
+                ts.Debug.assert(row <= 140 && column <= 140, "Must compute formatting context from tokens");
                 var rulesBucketIndex = (row * this.mapRowLength) + column;
                 return rulesBucketIndex;
             };
@@ -59571,6 +60480,7 @@ var ts;
         formatting.RulesMap = RulesMap;
         var MaskBitSize = 5;
         var Mask = 0x1f;
+        var RulesPosition;
         (function (RulesPosition) {
             RulesPosition[RulesPosition["IgnoreRulesSpecific"] = 0] = "IgnoreRulesSpecific";
             RulesPosition[RulesPosition["IgnoreRulesAny"] = MaskBitSize * 1] = "IgnoreRulesAny";
@@ -59578,8 +60488,7 @@ var ts;
             RulesPosition[RulesPosition["ContextRulesAny"] = MaskBitSize * 3] = "ContextRulesAny";
             RulesPosition[RulesPosition["NoContextRulesSpecific"] = MaskBitSize * 4] = "NoContextRulesSpecific";
             RulesPosition[RulesPosition["NoContextRulesAny"] = MaskBitSize * 5] = "NoContextRulesAny";
-        })(formatting.RulesPosition || (formatting.RulesPosition = {}));
-        var RulesPosition = formatting.RulesPosition;
+        })(RulesPosition = formatting.RulesPosition || (formatting.RulesPosition = {}));
         var RulesBucketConstructionState = (function () {
             function RulesBucketConstructionState() {
                 this.rulesInsertionIndexBitmap = 0;
@@ -59698,7 +60607,7 @@ var ts;
                 }
                 TokenAllAccess.prototype.GetTokens = function () {
                     var result = [];
-                    for (var token = 0; token <= 139; token++) {
+                    for (var token = 0; token <= 140; token++) {
                         result.push(token);
                     }
                     return result;
@@ -59742,9 +60651,9 @@ var ts;
             }());
             TokenRange.Any = TokenRange.AllTokens();
             TokenRange.AnyIncludingMultilineComments = TokenRange.FromTokens(TokenRange.Any.GetTokens().concat([3]));
-            TokenRange.Keywords = TokenRange.FromRange(71, 139);
+            TokenRange.Keywords = TokenRange.FromRange(71, 140);
             TokenRange.BinaryOperators = TokenRange.FromRange(26, 69);
-            TokenRange.BinaryKeywordOperators = TokenRange.FromTokens([91, 92, 139, 117, 125]);
+            TokenRange.BinaryKeywordOperators = TokenRange.FromTokens([91, 92, 140, 117, 125]);
             TokenRange.UnaryPrefixOperators = TokenRange.FromTokens([42, 43, 51, 50]);
             TokenRange.UnaryPrefixExpressions = TokenRange.FromTokens([8, 70, 18, 20, 16, 98, 93]);
             TokenRange.UnaryPreincrementExpressions = TokenRange.FromTokens([70, 18, 98, 93]);
@@ -59752,7 +60661,7 @@ var ts;
             TokenRange.UnaryPredecrementExpressions = TokenRange.FromTokens([70, 18, 98, 93]);
             TokenRange.UnaryPostdecrementExpressions = TokenRange.FromTokens([70, 19, 21, 93]);
             TokenRange.Comments = TokenRange.FromTokens([2, 3]);
-            TokenRange.TypeNames = TokenRange.FromTokens([70, 131, 133, 121, 134, 104, 118]);
+            TokenRange.TypeNames = TokenRange.FromTokens([70, 132, 134, 121, 135, 104, 118]);
             Shared.TokenRange = TokenRange;
         })(Shared = formatting.Shared || (formatting.Shared = {}));
     })(formatting = ts.formatting || (ts.formatting = {}));
@@ -59888,10 +60797,6 @@ var ts;
 (function (ts) {
     var formatting;
     (function (formatting) {
-        var Constants;
-        (function (Constants) {
-            Constants[Constants["Unknown"] = -1] = "Unknown";
-        })(Constants || (Constants = {}));
         function formatOnEnter(position, sourceFile, rulesProvider, options) {
             var line = sourceFile.getLineAndCharacterOfPosition(position).line;
             if (line === 0) {
@@ -59964,17 +60869,17 @@ var ts;
         }
         function isListElement(parent, node) {
             switch (parent.kind) {
-                case 222:
-                case 223:
-                    return ts.rangeContainsRange(parent.members, node);
                 case 226:
-                    var body = parent.body;
-                    return body && body.kind === 227 && ts.rangeContainsRange(body.statements, node);
-                case 256:
-                case 200:
                 case 227:
+                    return ts.rangeContainsRange(parent.members, node);
+                case 230:
+                    var body = parent.body;
+                    return body && body.kind === 231 && ts.rangeContainsRange(body.statements, node);
+                case 261:
+                case 204:
+                case 231:
                     return ts.rangeContainsRange(parent.statements, node);
-                case 252:
+                case 256:
                     return ts.rangeContainsRange(parent.block.statements, node);
             }
             return false;
@@ -60130,18 +61035,18 @@ var ts;
                     return node.modifiers[0].kind;
                 }
                 switch (node.kind) {
-                    case 222: return 74;
-                    case 223: return 108;
-                    case 221: return 88;
-                    case 225: return 225;
-                    case 150: return 124;
-                    case 151: return 132;
-                    case 148:
+                    case 226: return 74;
+                    case 227: return 108;
+                    case 225: return 88;
+                    case 229: return 229;
+                    case 151: return 124;
+                    case 152: return 133;
+                    case 149:
                         if (node.asteriskToken) {
                             return 38;
                         }
-                    case 146:
-                    case 143:
+                    case 147:
+                    case 144:
                         return node.name.kind;
                 }
             }
@@ -60257,11 +61162,11 @@ var ts;
                         consumeTokenAndAdvanceScanner(tokenInfo, node, parentDynamicIndentation, child);
                         return inheritedIndentation;
                     }
-                    var effectiveParentStartLine = child.kind === 144 ? childStartLine : undecoratedParentStartLine;
+                    var effectiveParentStartLine = child.kind === 145 ? childStartLine : undecoratedParentStartLine;
                     var childIndentation = computeIndentation(child, childStartLine, childIndentationAmount, node, parentDynamicIndentation, effectiveParentStartLine);
                     processNode(child, childContextNode, childStartLine, undecoratedChildStartLine, childIndentation.indentation, childIndentation.delta);
                     childContextNode = node;
-                    if (isFirstListItem && parent.kind === 171 && inheritedIndentation === -1) {
+                    if (isFirstListItem && parent.kind === 175 && inheritedIndentation === -1) {
                         inheritedIndentation = childIndentation.indentation;
                     }
                     return inheritedIndentation;
@@ -60565,12 +61470,12 @@ var ts;
         }
         function getOpenTokenForList(node, list) {
             switch (node.kind) {
+                case 150:
+                case 225:
+                case 184:
                 case 149:
-                case 221:
-                case 180:
                 case 148:
-                case 147:
-                case 181:
+                case 185:
                     if (node.typeParameters === list) {
                         return 26;
                     }
@@ -60578,8 +61483,8 @@ var ts;
                         return 18;
                     }
                     break;
-                case 175:
-                case 176:
+                case 179:
+                case 180:
                     if (node.typeArguments === list) {
                         return 26;
                     }
@@ -60587,7 +61492,7 @@ var ts;
                         return 18;
                     }
                     break;
-                case 156:
+                case 157:
                     if (node.typeArguments === list) {
                         return 26;
                     }
@@ -60660,10 +61565,6 @@ var ts;
     (function (formatting) {
         var SmartIndenter;
         (function (SmartIndenter) {
-            var Value;
-            (function (Value) {
-                Value[Value["Unknown"] = -1] = "Unknown";
-            })(Value || (Value = {}));
             function getIndentation(position, sourceFile, options) {
                 if (position > sourceFile.text.length) {
                     return getBaseIndentation(options);
@@ -60692,7 +61593,7 @@ var ts;
                     var lineStart = ts.getLineStartPositionForPosition(current_1, sourceFile);
                     return SmartIndenter.findFirstNonWhitespaceColumn(lineStart, current_1, sourceFile, options);
                 }
-                if (precedingToken.kind === 25 && precedingToken.parent.kind !== 188) {
+                if (precedingToken.kind === 25 && precedingToken.parent.kind !== 192) {
                     var actualIndentation = getActualIndentationForListItemBeforeComma(precedingToken, sourceFile, options);
                     if (actualIndentation !== -1) {
                         return actualIndentation;
@@ -60794,7 +61695,7 @@ var ts;
             }
             function getActualIndentationForNode(current, parent, currentLineAndChar, parentAndChildShareLine, sourceFile, options) {
                 var useActualIndentation = (ts.isDeclaration(current) || ts.isStatementButNotDeclaration(current)) &&
-                    (parent.kind === 256 || !parentAndChildShareLine);
+                    (parent.kind === 261 || !parentAndChildShareLine);
                 if (!useActualIndentation) {
                     return -1;
                 }
@@ -60818,7 +61719,7 @@ var ts;
                 return sourceFile.getLineAndCharacterOfPosition(n.getStart(sourceFile));
             }
             function childStartsOnTheSameLineWithElseInIfStatement(parent, child, childStartLine, sourceFile) {
-                if (parent.kind === 204 && parent.elseStatement === child) {
+                if (parent.kind === 208 && parent.elseStatement === child) {
                     var elseKeyword = ts.findChildOfKind(parent, 81, sourceFile);
                     ts.Debug.assert(elseKeyword !== undefined);
                     var elseKeywordStartLine = getStartLineAndCharacterForNode(elseKeyword, sourceFile).line;
@@ -60830,23 +61731,23 @@ var ts;
             function getContainingList(node, sourceFile) {
                 if (node.parent) {
                     switch (node.parent.kind) {
-                        case 156:
+                        case 157:
                             if (node.parent.typeArguments &&
                                 ts.rangeContainsStartEnd(node.parent.typeArguments, node.getStart(sourceFile), node.getEnd())) {
                                 return node.parent.typeArguments;
                             }
                             break;
-                        case 172:
+                        case 176:
                             return node.parent.properties;
-                        case 171:
+                        case 175:
                             return node.parent.elements;
-                        case 221:
-                        case 180:
-                        case 181:
+                        case 225:
+                        case 184:
+                        case 185:
+                        case 149:
                         case 148:
-                        case 147:
-                        case 152:
-                        case 153: {
+                        case 153:
+                        case 154: {
                             var start = node.getStart(sourceFile);
                             if (node.parent.typeParameters &&
                                 ts.rangeContainsStartEnd(node.parent.typeParameters, start, node.getEnd())) {
@@ -60857,8 +61758,8 @@ var ts;
                             }
                             break;
                         }
-                        case 176:
-                        case 175: {
+                        case 180:
+                        case 179: {
                             var start = node.getStart(sourceFile);
                             if (node.parent.typeArguments &&
                                 ts.rangeContainsStartEnd(node.parent.typeArguments, start, node.getEnd())) {
@@ -60886,8 +61787,8 @@ var ts;
                 if (node.kind === 19) {
                     return -1;
                 }
-                if (node.parent && (node.parent.kind === 175 ||
-                    node.parent.kind === 176) &&
+                if (node.parent && (node.parent.kind === 179 ||
+                    node.parent.kind === 180) &&
                     node.parent.expression !== node) {
                     var fullCallOrNewExpression = node.parent.expression;
                     var startingExpression = getStartingExpression(fullCallOrNewExpression);
@@ -60905,10 +61806,10 @@ var ts;
                 function getStartingExpression(node) {
                     while (true) {
                         switch (node.kind) {
-                            case 175:
-                            case 176:
-                            case 173:
-                            case 174:
+                            case 179:
+                            case 180:
+                            case 177:
+                            case 178:
                                 node = node.expression;
                                 break;
                             default:
@@ -60962,48 +61863,48 @@ var ts;
             SmartIndenter.findFirstNonWhitespaceColumn = findFirstNonWhitespaceColumn;
             function nodeContentIsAlwaysIndented(kind) {
                 switch (kind) {
-                    case 203:
-                    case 222:
-                    case 193:
-                    case 223:
-                    case 225:
-                    case 224:
-                    case 171:
-                    case 200:
+                    case 207:
+                    case 226:
+                    case 197:
                     case 227:
-                    case 172:
-                    case 160:
-                    case 162:
+                    case 229:
                     case 228:
-                    case 250:
-                    case 249:
-                    case 179:
-                    case 173:
                     case 175:
+                    case 204:
+                    case 231:
                     case 176:
-                    case 201:
-                    case 219:
-                    case 236:
-                    case 212:
-                    case 189:
-                    case 169:
-                    case 168:
-                    case 244:
-                    case 243:
-                    case 248:
-                    case 147:
-                    case 152:
-                    case 153:
-                    case 143:
-                    case 157:
-                    case 158:
-                    case 165:
+                    case 161:
+                    case 163:
+                    case 232:
+                    case 254:
+                    case 253:
+                    case 183:
                     case 177:
-                    case 185:
+                    case 179:
+                    case 180:
+                    case 205:
+                    case 223:
+                    case 240:
+                    case 216:
+                    case 193:
+                    case 173:
+                    case 172:
+                    case 248:
+                    case 247:
+                    case 252:
+                    case 148:
+                    case 153:
+                    case 154:
+                    case 144:
+                    case 158:
+                    case 159:
+                    case 166:
+                    case 181:
+                    case 189:
+                    case 242:
                     case 238:
-                    case 234:
+                    case 243:
                     case 239:
-                    case 235:
                         return true;
                 }
                 return false;
@@ -61011,27 +61912,27 @@ var ts;
             function nodeWillIndentChild(parent, child, indentByDefault) {
                 var childKind = child ? child.kind : 0;
                 switch (parent.kind) {
-                    case 205:
-                    case 206:
-                    case 208:
                     case 209:
-                    case 207:
-                    case 204:
-                    case 221:
-                    case 180:
-                    case 148:
-                    case 181:
+                    case 210:
+                    case 212:
+                    case 213:
+                    case 211:
+                    case 208:
+                    case 225:
+                    case 184:
                     case 149:
+                    case 185:
                     case 150:
                     case 151:
-                        return childKind !== 200;
-                    case 237:
-                        return childKind !== 238;
-                    case 231:
-                        return childKind !== 232 ||
-                            (child.namedBindings && child.namedBindings.kind !== 234);
-                    case 242:
-                        return childKind !== 245;
+                    case 152:
+                        return childKind !== 204;
+                    case 241:
+                        return childKind !== 242;
+                    case 235:
+                        return childKind !== 236 ||
+                            (child.namedBindings && child.namedBindings.kind !== 238);
+                    case 246:
+                        return childKind !== 249;
                 }
                 return indentByDefault;
             }
@@ -61112,7 +62013,7 @@ var ts;
                 if (!superCall) {
                     return undefined;
                 }
-                if (superCall.expression && superCall.expression.kind == 175) {
+                if (superCall.expression && superCall.expression.kind == 179) {
                     var arguments_1 = superCall.expression.arguments;
                     for (var i = 0; i < arguments_1.length; i++) {
                         if (arguments_1[i].expression === token) {
@@ -61136,7 +62037,7 @@ var ts;
                         changes: changes
                     }];
                 function findSuperCall(n) {
-                    if (n.kind === 203 && ts.isSuperCall(n.expression)) {
+                    if (n.kind === 207 && ts.isSuperCall(n.expression)) {
                         return n;
                     }
                     if (ts.isFunctionLike(n)) {
@@ -61152,7 +62053,7 @@ var ts;
 (function (ts) {
     ts.servicesVersion = "0.5";
     function createNode(kind, pos, end, parent) {
-        var node = kind >= 140 ? new NodeObject(kind, pos, end) :
+        var node = kind >= 141 ? new NodeObject(kind, pos, end) :
             kind === 70 ? new IdentifierObject(70, pos, end) :
                 new TokenObject(kind, pos, end);
         node.parent = parent;
@@ -61164,7 +62065,6 @@ var ts;
             this.end = end;
             this.flags = 0;
             this.transformFlags = undefined;
-            this.excludeTransformFlags = undefined;
             this.parent = undefined;
             this.kind = kind;
         }
@@ -61211,11 +62111,11 @@ var ts;
             return pos;
         };
         NodeObject.prototype.createSyntaxList = function (nodes) {
-            var list = createNode(286, nodes.pos, nodes.end, this);
+            var list = createNode(291, nodes.pos, nodes.end, this);
             list._children = [];
             var pos = nodes.pos;
-            for (var _i = 0, nodes_4 = nodes; _i < nodes_4.length; _i++) {
-                var node = nodes_4[_i];
+            for (var _i = 0, nodes_5 = nodes; _i < nodes_5.length; _i++) {
+                var node = nodes_5[_i];
                 if (pos < node.pos) {
                     pos = this.addSyntheticNodes(list._children, pos, node.pos);
                 }
@@ -61230,11 +62130,11 @@ var ts;
         NodeObject.prototype.createChildren = function (sourceFile) {
             var _this = this;
             var children;
-            if (this.kind >= 140) {
+            if (this.kind >= 141) {
                 ts.scanner.setText((sourceFile || this.getSourceFile()).text);
                 children = [];
                 var pos_3 = this.pos;
-                var useJSDocScanner_1 = this.kind >= 273 && this.kind <= 285;
+                var useJSDocScanner_1 = this.kind >= 278 && this.kind <= 290;
                 var processNode = function (node) {
                     var isJSDocTagNode = ts.isJSDocTag(node);
                     if (!isJSDocTagNode && pos_3 < node.pos) {
@@ -61288,7 +62188,7 @@ var ts;
                 return undefined;
             }
             var child = children[0];
-            return child.kind < 140 ? child : child.getFirstToken(sourceFile);
+            return child.kind < 141 ? child : child.getFirstToken(sourceFile);
         };
         NodeObject.prototype.getLastToken = function (sourceFile) {
             var children = this.getChildren(sourceFile);
@@ -61296,7 +62196,7 @@ var ts;
             if (!child) {
                 return undefined;
             }
-            return child.kind < 140 ? child : child.getLastToken(sourceFile);
+            return child.kind < 141 ? child : child.getLastToken(sourceFile);
         };
         return NodeObject;
     }());
@@ -61423,7 +62323,7 @@ var ts;
             return this.checker.getIndexTypeOfType(this, 1);
         };
         TypeObject.prototype.getBaseTypes = function () {
-            return this.flags & (32768 | 65536)
+            return this.flags & 32768 && this.objectFlags & (1 | 2)
                 ? this.checker.getBaseTypes(this)
                 : undefined;
         };
@@ -61498,9 +62398,9 @@ var ts;
                     if (result_6 !== undefined) {
                         return result_6;
                     }
-                    if (declaration.name.kind === 141) {
+                    if (declaration.name.kind === 142) {
                         var expr = declaration.name.expression;
-                        if (expr.kind === 173) {
+                        if (expr.kind === 177) {
                             return expr.name.text;
                         }
                         return getTextOfIdentifierOrLiteral(expr);
@@ -61520,10 +62420,10 @@ var ts;
             }
             function visit(node) {
                 switch (node.kind) {
-                    case 221:
-                    case 180:
+                    case 225:
+                    case 184:
+                    case 149:
                     case 148:
-                    case 147:
                         var functionDeclaration = node;
                         var declarationName = getDeclarationName(functionDeclaration);
                         if (declarationName) {
@@ -61540,30 +62440,30 @@ var ts;
                             ts.forEachChild(node, visit);
                         }
                         break;
-                    case 222:
-                    case 193:
-                    case 223:
-                    case 224:
-                    case 225:
                     case 226:
+                    case 197:
+                    case 227:
+                    case 228:
+                    case 229:
                     case 230:
+                    case 234:
+                    case 243:
                     case 239:
-                    case 235:
-                    case 230:
-                    case 232:
-                    case 233:
-                    case 150:
+                    case 234:
+                    case 236:
+                    case 237:
                     case 151:
-                    case 160:
+                    case 152:
+                    case 161:
                         addDeclaration(node);
                         ts.forEachChild(node, visit);
                         break;
-                    case 143:
+                    case 144:
                         if (!ts.hasModifier(node, 92)) {
                             break;
                         }
-                    case 219:
-                    case 170: {
+                    case 223:
+                    case 174: {
                         var decl = node;
                         if (ts.isBindingPattern(decl.name)) {
                             ts.forEachChild(decl.name, visit);
@@ -61572,24 +62472,24 @@ var ts;
                         if (decl.initializer)
                             visit(decl.initializer);
                     }
-                    case 255:
+                    case 260:
+                    case 147:
                     case 146:
-                    case 145:
                         addDeclaration(node);
                         break;
-                    case 237:
+                    case 241:
                         if (node.exportClause) {
                             ts.forEach(node.exportClause.elements, visit);
                         }
                         break;
-                    case 231:
+                    case 235:
                         var importClause = node.importClause;
                         if (importClause) {
                             if (importClause.name) {
                                 addDeclaration(importClause);
                             }
                             if (importClause.namedBindings) {
-                                if (importClause.namedBindings.kind === 233) {
+                                if (importClause.namedBindings.kind === 237) {
                                     addDeclaration(importClause.namedBindings);
                                 }
                                 else {
@@ -61735,7 +62635,7 @@ var ts;
             var version = this.host.getScriptVersion(fileName);
             var sourceFile;
             if (this.currentFileName !== fileName) {
-                sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, 4, version, true, scriptKind);
+                sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, 5, version, true, scriptKind);
             }
             else if (this.currentFileVersion !== version) {
                 var editRange = scriptSnapshot.getChangeRange(this.currentFileScriptSnapshot);
@@ -61888,7 +62788,7 @@ var ts;
                 useCaseSensitiveFileNames: function () { return useCaseSensitivefileNames; },
                 getNewLine: function () { return ts.getNewLineOrDefaultFromHost(host); },
                 getDefaultLibFileName: function (options) { return host.getDefaultLibFileName(options); },
-                writeFile: function () { },
+                writeFile: ts.noop,
                 getCurrentDirectory: function () { return currentDirectory; },
                 fileExists: function (fileName) {
                     return hostCache.getOrCreateEntry(fileName) !== undefined;
@@ -62031,10 +62931,10 @@ var ts;
             if (!symbol || typeChecker.isUnknownSymbol(symbol)) {
                 switch (node.kind) {
                     case 70:
-                    case 173:
-                    case 140:
+                    case 177:
+                    case 141:
                     case 98:
-                    case 166:
+                    case 167:
                     case 96:
                         var type = typeChecker.getTypeAtLocation(node);
                         if (type) {
@@ -62163,15 +63063,15 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 173:
-                case 140:
+                case 177:
+                case 141:
                 case 9:
                 case 85:
                 case 100:
                 case 94:
                 case 96:
                 case 98:
-                case 166:
+                case 167:
                 case 70:
                     break;
                 default:
@@ -62183,7 +63083,7 @@ var ts;
                     nodeForStartPos = nodeForStartPos.parent;
                 }
                 else if (ts.isNameOfModuleDeclaration(nodeForStartPos)) {
-                    if (nodeForStartPos.parent.parent.kind === 226 &&
+                    if (nodeForStartPos.parent.parent.kind === 230 &&
                         nodeForStartPos.parent.parent.body === nodeForStartPos.parent) {
                         nodeForStartPos = nodeForStartPos.parent.parent.name;
                     }
@@ -62479,7 +63379,7 @@ var ts;
                 case 9:
                 case 8:
                     if (ts.isDeclarationName(node) ||
-                        node.parent.kind === 241 ||
+                        node.parent.kind === 245 ||
                         isArgumentOfElementAccessExpression(node) ||
                         ts.isLiteralComputedPropertyDeclarationName(node)) {
                         nameTable[node.text] = nameTable[node.text] === undefined ? node.pos : -1;
@@ -62499,7 +63399,7 @@ var ts;
     function isArgumentOfElementAccessExpression(node) {
         return node &&
             node.parent &&
-            node.parent.kind === 174 &&
+            node.parent.kind === 178 &&
             node.parent.argumentExpression === node;
     }
     function getDefaultLibFilePath(options) {
@@ -62514,933 +63414,6 @@ var ts;
     }
     initializeServices();
 })(ts || (ts = {}));
-var debugObjectHost = (function () { return this; })();
-var ts;
-(function (ts) {
-    function logInternalError(logger, err) {
-        if (logger) {
-            logger.log("*INTERNAL ERROR* - Exception in typescript services: " + err.message);
-        }
-    }
-    var ScriptSnapshotShimAdapter = (function () {
-        function ScriptSnapshotShimAdapter(scriptSnapshotShim) {
-            this.scriptSnapshotShim = scriptSnapshotShim;
-        }
-        ScriptSnapshotShimAdapter.prototype.getText = function (start, end) {
-            return this.scriptSnapshotShim.getText(start, end);
-        };
-        ScriptSnapshotShimAdapter.prototype.getLength = function () {
-            return this.scriptSnapshotShim.getLength();
-        };
-        ScriptSnapshotShimAdapter.prototype.getChangeRange = function (oldSnapshot) {
-            var oldSnapshotShim = oldSnapshot;
-            var encoded = this.scriptSnapshotShim.getChangeRange(oldSnapshotShim.scriptSnapshotShim);
-            if (encoded == null) {
-                return null;
-            }
-            var decoded = JSON.parse(encoded);
-            return ts.createTextChangeRange(ts.createTextSpan(decoded.span.start, decoded.span.length), decoded.newLength);
-        };
-        ScriptSnapshotShimAdapter.prototype.dispose = function () {
-            if ("dispose" in this.scriptSnapshotShim) {
-                this.scriptSnapshotShim.dispose();
-            }
-        };
-        return ScriptSnapshotShimAdapter;
-    }());
-    var LanguageServiceShimHostAdapter = (function () {
-        function LanguageServiceShimHostAdapter(shimHost) {
-            var _this = this;
-            this.shimHost = shimHost;
-            this.loggingEnabled = false;
-            this.tracingEnabled = false;
-            if ("getModuleResolutionsForFile" in this.shimHost) {
-                this.resolveModuleNames = function (moduleNames, containingFile) {
-                    var resolutionsInFile = JSON.parse(_this.shimHost.getModuleResolutionsForFile(containingFile));
-                    return ts.map(moduleNames, function (name) {
-                        var result = ts.getProperty(resolutionsInFile, name);
-                        return result ? { resolvedFileName: result } : undefined;
-                    });
-                };
-            }
-            if ("directoryExists" in this.shimHost) {
-                this.directoryExists = function (directoryName) { return _this.shimHost.directoryExists(directoryName); };
-            }
-            if ("getTypeReferenceDirectiveResolutionsForFile" in this.shimHost) {
-                this.resolveTypeReferenceDirectives = function (typeDirectiveNames, containingFile) {
-                    var typeDirectivesForFile = JSON.parse(_this.shimHost.getTypeReferenceDirectiveResolutionsForFile(containingFile));
-                    return ts.map(typeDirectiveNames, function (name) { return ts.getProperty(typeDirectivesForFile, name); });
-                };
-            }
-        }
-        LanguageServiceShimHostAdapter.prototype.log = function (s) {
-            if (this.loggingEnabled) {
-                this.shimHost.log(s);
-            }
-        };
-        LanguageServiceShimHostAdapter.prototype.trace = function (s) {
-            if (this.tracingEnabled) {
-                this.shimHost.trace(s);
-            }
-        };
-        LanguageServiceShimHostAdapter.prototype.error = function (s) {
-            this.shimHost.error(s);
-        };
-        LanguageServiceShimHostAdapter.prototype.getProjectVersion = function () {
-            if (!this.shimHost.getProjectVersion) {
-                return undefined;
-            }
-            return this.shimHost.getProjectVersion();
-        };
-        LanguageServiceShimHostAdapter.prototype.getTypeRootsVersion = function () {
-            if (!this.shimHost.getTypeRootsVersion) {
-                return 0;
-            }
-            return this.shimHost.getTypeRootsVersion();
-        };
-        LanguageServiceShimHostAdapter.prototype.useCaseSensitiveFileNames = function () {
-            return this.shimHost.useCaseSensitiveFileNames ? this.shimHost.useCaseSensitiveFileNames() : false;
-        };
-        LanguageServiceShimHostAdapter.prototype.getCompilationSettings = function () {
-            var settingsJson = this.shimHost.getCompilationSettings();
-            if (settingsJson == null || settingsJson == "") {
-                throw Error("LanguageServiceShimHostAdapter.getCompilationSettings: empty compilationSettings");
-            }
-            return JSON.parse(settingsJson);
-        };
-        LanguageServiceShimHostAdapter.prototype.getScriptFileNames = function () {
-            var encoded = this.shimHost.getScriptFileNames();
-            return this.files = JSON.parse(encoded);
-        };
-        LanguageServiceShimHostAdapter.prototype.getScriptSnapshot = function (fileName) {
-            var scriptSnapshot = this.shimHost.getScriptSnapshot(fileName);
-            return scriptSnapshot && new ScriptSnapshotShimAdapter(scriptSnapshot);
-        };
-        LanguageServiceShimHostAdapter.prototype.getScriptKind = function (fileName) {
-            if ("getScriptKind" in this.shimHost) {
-                return this.shimHost.getScriptKind(fileName);
-            }
-            else {
-                return 0;
-            }
-        };
-        LanguageServiceShimHostAdapter.prototype.getScriptVersion = function (fileName) {
-            return this.shimHost.getScriptVersion(fileName);
-        };
-        LanguageServiceShimHostAdapter.prototype.getLocalizedDiagnosticMessages = function () {
-            var diagnosticMessagesJson = this.shimHost.getLocalizedDiagnosticMessages();
-            if (diagnosticMessagesJson == null || diagnosticMessagesJson == "") {
-                return null;
-            }
-            try {
-                return JSON.parse(diagnosticMessagesJson);
-            }
-            catch (e) {
-                this.log(e.description || "diagnosticMessages.generated.json has invalid JSON format");
-                return null;
-            }
-        };
-        LanguageServiceShimHostAdapter.prototype.getCancellationToken = function () {
-            var hostCancellationToken = this.shimHost.getCancellationToken();
-            return new ThrottledCancellationToken(hostCancellationToken);
-        };
-        LanguageServiceShimHostAdapter.prototype.getCurrentDirectory = function () {
-            return this.shimHost.getCurrentDirectory();
-        };
-        LanguageServiceShimHostAdapter.prototype.getDirectories = function (path) {
-            return JSON.parse(this.shimHost.getDirectories(path));
-        };
-        LanguageServiceShimHostAdapter.prototype.getDefaultLibFileName = function (options) {
-            return this.shimHost.getDefaultLibFileName(JSON.stringify(options));
-        };
-        LanguageServiceShimHostAdapter.prototype.readDirectory = function (path, extensions, exclude, include, depth) {
-            var pattern = ts.getFileMatcherPatterns(path, exclude, include, this.shimHost.useCaseSensitiveFileNames(), this.shimHost.getCurrentDirectory());
-            return JSON.parse(this.shimHost.readDirectory(path, JSON.stringify(extensions), JSON.stringify(pattern.basePaths), pattern.excludePattern, pattern.includeFilePattern, pattern.includeDirectoryPattern, depth));
-        };
-        LanguageServiceShimHostAdapter.prototype.readFile = function (path, encoding) {
-            return this.shimHost.readFile(path, encoding);
-        };
-        LanguageServiceShimHostAdapter.prototype.fileExists = function (path) {
-            return this.shimHost.fileExists(path);
-        };
-        return LanguageServiceShimHostAdapter;
-    }());
-    ts.LanguageServiceShimHostAdapter = LanguageServiceShimHostAdapter;
-    var ThrottledCancellationToken = (function () {
-        function ThrottledCancellationToken(hostCancellationToken) {
-            this.hostCancellationToken = hostCancellationToken;
-            this.lastCancellationCheckTime = 0;
-        }
-        ThrottledCancellationToken.prototype.isCancellationRequested = function () {
-            var time = ts.timestamp();
-            var duration = Math.abs(time - this.lastCancellationCheckTime);
-            if (duration > 10) {
-                this.lastCancellationCheckTime = time;
-                return this.hostCancellationToken.isCancellationRequested();
-            }
-            return false;
-        };
-        return ThrottledCancellationToken;
-    }());
-    var CoreServicesShimHostAdapter = (function () {
-        function CoreServicesShimHostAdapter(shimHost) {
-            var _this = this;
-            this.shimHost = shimHost;
-            this.useCaseSensitiveFileNames = this.shimHost.useCaseSensitiveFileNames ? this.shimHost.useCaseSensitiveFileNames() : false;
-            if ("directoryExists" in this.shimHost) {
-                this.directoryExists = function (directoryName) { return _this.shimHost.directoryExists(directoryName); };
-            }
-            if ("realpath" in this.shimHost) {
-                this.realpath = function (path) { return _this.shimHost.realpath(path); };
-            }
-        }
-        CoreServicesShimHostAdapter.prototype.readDirectory = function (rootDir, extensions, exclude, include, depth) {
-            try {
-                var pattern = ts.getFileMatcherPatterns(rootDir, exclude, include, this.shimHost.useCaseSensitiveFileNames(), this.shimHost.getCurrentDirectory());
-                return JSON.parse(this.shimHost.readDirectory(rootDir, JSON.stringify(extensions), JSON.stringify(pattern.basePaths), pattern.excludePattern, pattern.includeFilePattern, pattern.includeDirectoryPattern, depth));
-            }
-            catch (e) {
-                var results = [];
-                for (var _i = 0, extensions_2 = extensions; _i < extensions_2.length; _i++) {
-                    var extension = extensions_2[_i];
-                    for (var _a = 0, _b = this.readDirectoryFallback(rootDir, extension, exclude); _a < _b.length; _a++) {
-                        var file = _b[_a];
-                        if (!ts.contains(results, file)) {
-                            results.push(file);
-                        }
-                    }
-                }
-                return results;
-            }
-        };
-        CoreServicesShimHostAdapter.prototype.fileExists = function (fileName) {
-            return this.shimHost.fileExists(fileName);
-        };
-        CoreServicesShimHostAdapter.prototype.readFile = function (fileName) {
-            return this.shimHost.readFile(fileName);
-        };
-        CoreServicesShimHostAdapter.prototype.readDirectoryFallback = function (rootDir, extension, exclude) {
-            return JSON.parse(this.shimHost.readDirectory(rootDir, extension, JSON.stringify(exclude)));
-        };
-        CoreServicesShimHostAdapter.prototype.getDirectories = function (path) {
-            return JSON.parse(this.shimHost.getDirectories(path));
-        };
-        return CoreServicesShimHostAdapter;
-    }());
-    ts.CoreServicesShimHostAdapter = CoreServicesShimHostAdapter;
-    function simpleForwardCall(logger, actionDescription, action, logPerformance) {
-        var start;
-        if (logPerformance) {
-            logger.log(actionDescription);
-            start = ts.timestamp();
-        }
-        var result = action();
-        if (logPerformance) {
-            var end = ts.timestamp();
-            logger.log(actionDescription + " completed in " + (end - start) + " msec");
-            if (typeof result === "string") {
-                var str = result;
-                if (str.length > 128) {
-                    str = str.substring(0, 128) + "...";
-                }
-                logger.log("  result.length=" + str.length + ", result='" + JSON.stringify(str) + "'");
-            }
-        }
-        return result;
-    }
-    function forwardJSONCall(logger, actionDescription, action, logPerformance) {
-        return forwardCall(logger, actionDescription, true, action, logPerformance);
-    }
-    function forwardCall(logger, actionDescription, returnJson, action, logPerformance) {
-        try {
-            var result = simpleForwardCall(logger, actionDescription, action, logPerformance);
-            return returnJson ? JSON.stringify({ result: result }) : result;
-        }
-        catch (err) {
-            if (err instanceof ts.OperationCanceledException) {
-                return JSON.stringify({ canceled: true });
-            }
-            logInternalError(logger, err);
-            err.description = actionDescription;
-            return JSON.stringify({ error: err });
-        }
-    }
-    var ShimBase = (function () {
-        function ShimBase(factory) {
-            this.factory = factory;
-            factory.registerShim(this);
-        }
-        ShimBase.prototype.dispose = function (_dummy) {
-            this.factory.unregisterShim(this);
-        };
-        return ShimBase;
-    }());
-    function realizeDiagnostics(diagnostics, newLine) {
-        return diagnostics.map(function (d) { return realizeDiagnostic(d, newLine); });
-    }
-    ts.realizeDiagnostics = realizeDiagnostics;
-    function realizeDiagnostic(diagnostic, newLine) {
-        return {
-            message: ts.flattenDiagnosticMessageText(diagnostic.messageText, newLine),
-            start: diagnostic.start,
-            length: diagnostic.length,
-            category: ts.DiagnosticCategory[diagnostic.category].toLowerCase(),
-            code: diagnostic.code
-        };
-    }
-    var LanguageServiceShimObject = (function (_super) {
-        __extends(LanguageServiceShimObject, _super);
-        function LanguageServiceShimObject(factory, host, languageService) {
-            var _this = _super.call(this, factory) || this;
-            _this.host = host;
-            _this.languageService = languageService;
-            _this.logPerformance = false;
-            _this.logger = _this.host;
-            return _this;
-        }
-        LanguageServiceShimObject.prototype.forwardJSONCall = function (actionDescription, action) {
-            return forwardJSONCall(this.logger, actionDescription, action, this.logPerformance);
-        };
-        LanguageServiceShimObject.prototype.dispose = function (dummy) {
-            this.logger.log("dispose()");
-            this.languageService.dispose();
-            this.languageService = null;
-            if (debugObjectHost && debugObjectHost.CollectGarbage) {
-                debugObjectHost.CollectGarbage();
-                this.logger.log("CollectGarbage()");
-            }
-            this.logger = null;
-            _super.prototype.dispose.call(this, dummy);
-        };
-        LanguageServiceShimObject.prototype.refresh = function (throwOnError) {
-            this.forwardJSONCall("refresh(" + throwOnError + ")", function () { return null; });
-        };
-        LanguageServiceShimObject.prototype.cleanupSemanticCache = function () {
-            var _this = this;
-            this.forwardJSONCall("cleanupSemanticCache()", function () {
-                _this.languageService.cleanupSemanticCache();
-                return null;
-            });
-        };
-        LanguageServiceShimObject.prototype.realizeDiagnostics = function (diagnostics) {
-            var newLine = ts.getNewLineOrDefaultFromHost(this.host);
-            return ts.realizeDiagnostics(diagnostics, newLine);
-        };
-        LanguageServiceShimObject.prototype.getSyntacticClassifications = function (fileName, start, length) {
-            var _this = this;
-            return this.forwardJSONCall("getSyntacticClassifications('" + fileName + "', " + start + ", " + length + ")", function () { return _this.languageService.getSyntacticClassifications(fileName, ts.createTextSpan(start, length)); });
-        };
-        LanguageServiceShimObject.prototype.getSemanticClassifications = function (fileName, start, length) {
-            var _this = this;
-            return this.forwardJSONCall("getSemanticClassifications('" + fileName + "', " + start + ", " + length + ")", function () { return _this.languageService.getSemanticClassifications(fileName, ts.createTextSpan(start, length)); });
-        };
-        LanguageServiceShimObject.prototype.getEncodedSyntacticClassifications = function (fileName, start, length) {
-            var _this = this;
-            return this.forwardJSONCall("getEncodedSyntacticClassifications('" + fileName + "', " + start + ", " + length + ")", function () { return convertClassifications(_this.languageService.getEncodedSyntacticClassifications(fileName, ts.createTextSpan(start, length))); });
-        };
-        LanguageServiceShimObject.prototype.getEncodedSemanticClassifications = function (fileName, start, length) {
-            var _this = this;
-            return this.forwardJSONCall("getEncodedSemanticClassifications('" + fileName + "', " + start + ", " + length + ")", function () { return convertClassifications(_this.languageService.getEncodedSemanticClassifications(fileName, ts.createTextSpan(start, length))); });
-        };
-        LanguageServiceShimObject.prototype.getSyntacticDiagnostics = function (fileName) {
-            var _this = this;
-            return this.forwardJSONCall("getSyntacticDiagnostics('" + fileName + "')", function () {
-                var diagnostics = _this.languageService.getSyntacticDiagnostics(fileName);
-                return _this.realizeDiagnostics(diagnostics);
-            });
-        };
-        LanguageServiceShimObject.prototype.getSemanticDiagnostics = function (fileName) {
-            var _this = this;
-            return this.forwardJSONCall("getSemanticDiagnostics('" + fileName + "')", function () {
-                var diagnostics = _this.languageService.getSemanticDiagnostics(fileName);
-                return _this.realizeDiagnostics(diagnostics);
-            });
-        };
-        LanguageServiceShimObject.prototype.getCompilerOptionsDiagnostics = function () {
-            var _this = this;
-            return this.forwardJSONCall("getCompilerOptionsDiagnostics()", function () {
-                var diagnostics = _this.languageService.getCompilerOptionsDiagnostics();
-                return _this.realizeDiagnostics(diagnostics);
-            });
-        };
-        LanguageServiceShimObject.prototype.getQuickInfoAtPosition = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getQuickInfoAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getQuickInfoAtPosition(fileName, position); });
-        };
-        LanguageServiceShimObject.prototype.getNameOrDottedNameSpan = function (fileName, startPos, endPos) {
-            var _this = this;
-            return this.forwardJSONCall("getNameOrDottedNameSpan('" + fileName + "', " + startPos + ", " + endPos + ")", function () { return _this.languageService.getNameOrDottedNameSpan(fileName, startPos, endPos); });
-        };
-        LanguageServiceShimObject.prototype.getBreakpointStatementAtPosition = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getBreakpointStatementAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getBreakpointStatementAtPosition(fileName, position); });
-        };
-        LanguageServiceShimObject.prototype.getSignatureHelpItems = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getSignatureHelpItems('" + fileName + "', " + position + ")", function () { return _this.languageService.getSignatureHelpItems(fileName, position); });
-        };
-        LanguageServiceShimObject.prototype.getDefinitionAtPosition = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getDefinitionAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getDefinitionAtPosition(fileName, position); });
-        };
-        LanguageServiceShimObject.prototype.getTypeDefinitionAtPosition = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getTypeDefinitionAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getTypeDefinitionAtPosition(fileName, position); });
-        };
-        LanguageServiceShimObject.prototype.getImplementationAtPosition = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getImplementationAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getImplementationAtPosition(fileName, position); });
-        };
-        LanguageServiceShimObject.prototype.getRenameInfo = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getRenameInfo('" + fileName + "', " + position + ")", function () { return _this.languageService.getRenameInfo(fileName, position); });
-        };
-        LanguageServiceShimObject.prototype.findRenameLocations = function (fileName, position, findInStrings, findInComments) {
-            var _this = this;
-            return this.forwardJSONCall("findRenameLocations('" + fileName + "', " + position + ", " + findInStrings + ", " + findInComments + ")", function () { return _this.languageService.findRenameLocations(fileName, position, findInStrings, findInComments); });
-        };
-        LanguageServiceShimObject.prototype.getBraceMatchingAtPosition = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getBraceMatchingAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getBraceMatchingAtPosition(fileName, position); });
-        };
-        LanguageServiceShimObject.prototype.isValidBraceCompletionAtPosition = function (fileName, position, openingBrace) {
-            var _this = this;
-            return this.forwardJSONCall("isValidBraceCompletionAtPosition('" + fileName + "', " + position + ", " + openingBrace + ")", function () { return _this.languageService.isValidBraceCompletionAtPosition(fileName, position, openingBrace); });
-        };
-        LanguageServiceShimObject.prototype.getIndentationAtPosition = function (fileName, position, options) {
-            var _this = this;
-            return this.forwardJSONCall("getIndentationAtPosition('" + fileName + "', " + position + ")", function () {
-                var localOptions = JSON.parse(options);
-                return _this.languageService.getIndentationAtPosition(fileName, position, localOptions);
-            });
-        };
-        LanguageServiceShimObject.prototype.getReferencesAtPosition = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getReferencesAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getReferencesAtPosition(fileName, position); });
-        };
-        LanguageServiceShimObject.prototype.findReferences = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("findReferences('" + fileName + "', " + position + ")", function () { return _this.languageService.findReferences(fileName, position); });
-        };
-        LanguageServiceShimObject.prototype.getOccurrencesAtPosition = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getOccurrencesAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getOccurrencesAtPosition(fileName, position); });
-        };
-        LanguageServiceShimObject.prototype.getDocumentHighlights = function (fileName, position, filesToSearch) {
-            var _this = this;
-            return this.forwardJSONCall("getDocumentHighlights('" + fileName + "', " + position + ")", function () {
-                var results = _this.languageService.getDocumentHighlights(fileName, position, JSON.parse(filesToSearch));
-                var normalizedName = ts.normalizeSlashes(fileName).toLowerCase();
-                return ts.filter(results, function (r) { return ts.normalizeSlashes(r.fileName).toLowerCase() === normalizedName; });
-            });
-        };
-        LanguageServiceShimObject.prototype.getCompletionsAtPosition = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getCompletionsAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getCompletionsAtPosition(fileName, position); });
-        };
-        LanguageServiceShimObject.prototype.getCompletionEntryDetails = function (fileName, position, entryName) {
-            var _this = this;
-            return this.forwardJSONCall("getCompletionEntryDetails('" + fileName + "', " + position + ", '" + entryName + "')", function () { return _this.languageService.getCompletionEntryDetails(fileName, position, entryName); });
-        };
-        LanguageServiceShimObject.prototype.getFormattingEditsForRange = function (fileName, start, end, options) {
-            var _this = this;
-            return this.forwardJSONCall("getFormattingEditsForRange('" + fileName + "', " + start + ", " + end + ")", function () {
-                var localOptions = JSON.parse(options);
-                return _this.languageService.getFormattingEditsForRange(fileName, start, end, localOptions);
-            });
-        };
-        LanguageServiceShimObject.prototype.getFormattingEditsForDocument = function (fileName, options) {
-            var _this = this;
-            return this.forwardJSONCall("getFormattingEditsForDocument('" + fileName + "')", function () {
-                var localOptions = JSON.parse(options);
-                return _this.languageService.getFormattingEditsForDocument(fileName, localOptions);
-            });
-        };
-        LanguageServiceShimObject.prototype.getFormattingEditsAfterKeystroke = function (fileName, position, key, options) {
-            var _this = this;
-            return this.forwardJSONCall("getFormattingEditsAfterKeystroke('" + fileName + "', " + position + ", '" + key + "')", function () {
-                var localOptions = JSON.parse(options);
-                return _this.languageService.getFormattingEditsAfterKeystroke(fileName, position, key, localOptions);
-            });
-        };
-        LanguageServiceShimObject.prototype.getDocCommentTemplateAtPosition = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getDocCommentTemplateAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getDocCommentTemplateAtPosition(fileName, position); });
-        };
-        LanguageServiceShimObject.prototype.getNavigateToItems = function (searchValue, maxResultCount, fileName) {
-            var _this = this;
-            return this.forwardJSONCall("getNavigateToItems('" + searchValue + "', " + maxResultCount + ", " + fileName + ")", function () { return _this.languageService.getNavigateToItems(searchValue, maxResultCount, fileName); });
-        };
-        LanguageServiceShimObject.prototype.getNavigationBarItems = function (fileName) {
-            var _this = this;
-            return this.forwardJSONCall("getNavigationBarItems('" + fileName + "')", function () { return _this.languageService.getNavigationBarItems(fileName); });
-        };
-        LanguageServiceShimObject.prototype.getNavigationTree = function (fileName) {
-            var _this = this;
-            return this.forwardJSONCall("getNavigationTree('" + fileName + "')", function () { return _this.languageService.getNavigationTree(fileName); });
-        };
-        LanguageServiceShimObject.prototype.getOutliningSpans = function (fileName) {
-            var _this = this;
-            return this.forwardJSONCall("getOutliningSpans('" + fileName + "')", function () { return _this.languageService.getOutliningSpans(fileName); });
-        };
-        LanguageServiceShimObject.prototype.getTodoComments = function (fileName, descriptors) {
-            var _this = this;
-            return this.forwardJSONCall("getTodoComments('" + fileName + "')", function () { return _this.languageService.getTodoComments(fileName, JSON.parse(descriptors)); });
-        };
-        LanguageServiceShimObject.prototype.getEmitOutput = function (fileName) {
-            var _this = this;
-            return this.forwardJSONCall("getEmitOutput('" + fileName + "')", function () { return _this.languageService.getEmitOutput(fileName); });
-        };
-        LanguageServiceShimObject.prototype.getEmitOutputObject = function (fileName) {
-            var _this = this;
-            return forwardCall(this.logger, "getEmitOutput('" + fileName + "')", false, function () { return _this.languageService.getEmitOutput(fileName); }, this.logPerformance);
-        };
-        return LanguageServiceShimObject;
-    }(ShimBase));
-    function convertClassifications(classifications) {
-        return { spans: classifications.spans.join(","), endOfLineState: classifications.endOfLineState };
-    }
-    var ClassifierShimObject = (function (_super) {
-        __extends(ClassifierShimObject, _super);
-        function ClassifierShimObject(factory, logger) {
-            var _this = _super.call(this, factory) || this;
-            _this.logger = logger;
-            _this.logPerformance = false;
-            _this.classifier = ts.createClassifier();
-            return _this;
-        }
-        ClassifierShimObject.prototype.getEncodedLexicalClassifications = function (text, lexState, syntacticClassifierAbsent) {
-            var _this = this;
-            return forwardJSONCall(this.logger, "getEncodedLexicalClassifications", function () { return convertClassifications(_this.classifier.getEncodedLexicalClassifications(text, lexState, syntacticClassifierAbsent)); }, this.logPerformance);
-        };
-        ClassifierShimObject.prototype.getClassificationsForLine = function (text, lexState, classifyKeywordsInGenerics) {
-            var classification = this.classifier.getClassificationsForLine(text, lexState, classifyKeywordsInGenerics);
-            var result = "";
-            for (var _i = 0, _a = classification.entries; _i < _a.length; _i++) {
-                var item = _a[_i];
-                result += item.length + "\n";
-                result += item.classification + "\n";
-            }
-            result += classification.finalLexState;
-            return result;
-        };
-        return ClassifierShimObject;
-    }(ShimBase));
-    var CoreServicesShimObject = (function (_super) {
-        __extends(CoreServicesShimObject, _super);
-        function CoreServicesShimObject(factory, logger, host) {
-            var _this = _super.call(this, factory) || this;
-            _this.logger = logger;
-            _this.host = host;
-            _this.logPerformance = false;
-            return _this;
-        }
-        CoreServicesShimObject.prototype.forwardJSONCall = function (actionDescription, action) {
-            return forwardJSONCall(this.logger, actionDescription, action, this.logPerformance);
-        };
-        CoreServicesShimObject.prototype.resolveModuleName = function (fileName, moduleName, compilerOptionsJson) {
-            var _this = this;
-            return this.forwardJSONCall("resolveModuleName('" + fileName + "')", function () {
-                var compilerOptions = JSON.parse(compilerOptionsJson);
-                var result = ts.resolveModuleName(moduleName, ts.normalizeSlashes(fileName), compilerOptions, _this.host);
-                return {
-                    resolvedFileName: result.resolvedModule ? result.resolvedModule.resolvedFileName : undefined,
-                    failedLookupLocations: result.failedLookupLocations
-                };
-            });
-        };
-        CoreServicesShimObject.prototype.resolveTypeReferenceDirective = function (fileName, typeReferenceDirective, compilerOptionsJson) {
-            var _this = this;
-            return this.forwardJSONCall("resolveTypeReferenceDirective(" + fileName + ")", function () {
-                var compilerOptions = JSON.parse(compilerOptionsJson);
-                var result = ts.resolveTypeReferenceDirective(typeReferenceDirective, ts.normalizeSlashes(fileName), compilerOptions, _this.host);
-                return {
-                    resolvedFileName: result.resolvedTypeReferenceDirective ? result.resolvedTypeReferenceDirective.resolvedFileName : undefined,
-                    primary: result.resolvedTypeReferenceDirective ? result.resolvedTypeReferenceDirective.primary : true,
-                    failedLookupLocations: result.failedLookupLocations
-                };
-            });
-        };
-        CoreServicesShimObject.prototype.getPreProcessedFileInfo = function (fileName, sourceTextSnapshot) {
-            var _this = this;
-            return this.forwardJSONCall("getPreProcessedFileInfo('" + fileName + "')", function () {
-                var result = ts.preProcessFile(sourceTextSnapshot.getText(0, sourceTextSnapshot.getLength()), true, true);
-                return {
-                    referencedFiles: _this.convertFileReferences(result.referencedFiles),
-                    importedFiles: _this.convertFileReferences(result.importedFiles),
-                    ambientExternalModules: result.ambientExternalModules,
-                    isLibFile: result.isLibFile,
-                    typeReferenceDirectives: _this.convertFileReferences(result.typeReferenceDirectives)
-                };
-            });
-        };
-        CoreServicesShimObject.prototype.getAutomaticTypeDirectiveNames = function (compilerOptionsJson) {
-            var _this = this;
-            return this.forwardJSONCall("getAutomaticTypeDirectiveNames('" + compilerOptionsJson + "')", function () {
-                var compilerOptions = JSON.parse(compilerOptionsJson);
-                return ts.getAutomaticTypeDirectiveNames(compilerOptions, _this.host);
-            });
-        };
-        CoreServicesShimObject.prototype.convertFileReferences = function (refs) {
-            if (!refs) {
-                return undefined;
-            }
-            var result = [];
-            for (var _i = 0, refs_2 = refs; _i < refs_2.length; _i++) {
-                var ref = refs_2[_i];
-                result.push({
-                    path: ts.normalizeSlashes(ref.fileName),
-                    position: ref.pos,
-                    length: ref.end - ref.pos
-                });
-            }
-            return result;
-        };
-        CoreServicesShimObject.prototype.getTSConfigFileInfo = function (fileName, sourceTextSnapshot) {
-            var _this = this;
-            return this.forwardJSONCall("getTSConfigFileInfo('" + fileName + "')", function () {
-                var text = sourceTextSnapshot.getText(0, sourceTextSnapshot.getLength());
-                var result = ts.parseConfigFileTextToJson(fileName, text);
-                if (result.error) {
-                    return {
-                        options: {},
-                        typingOptions: {},
-                        files: [],
-                        raw: {},
-                        errors: [realizeDiagnostic(result.error, "\r\n")]
-                    };
-                }
-                var normalizedFileName = ts.normalizeSlashes(fileName);
-                var configFile = ts.parseJsonConfigFileContent(result.config, _this.host, ts.getDirectoryPath(normalizedFileName), {}, normalizedFileName);
-                return {
-                    options: configFile.options,
-                    typingOptions: configFile.typingOptions,
-                    files: configFile.fileNames,
-                    raw: configFile.raw,
-                    errors: realizeDiagnostics(configFile.errors, "\r\n")
-                };
-            });
-        };
-        CoreServicesShimObject.prototype.getDefaultCompilationSettings = function () {
-            return this.forwardJSONCall("getDefaultCompilationSettings()", function () { return ts.getDefaultCompilerOptions(); });
-        };
-        CoreServicesShimObject.prototype.discoverTypings = function (discoverTypingsJson) {
-            var _this = this;
-            var getCanonicalFileName = ts.createGetCanonicalFileName(false);
-            return this.forwardJSONCall("discoverTypings()", function () {
-                var info = JSON.parse(discoverTypingsJson);
-                return ts.JsTyping.discoverTypings(_this.host, info.fileNames, ts.toPath(info.projectRootPath, info.projectRootPath, getCanonicalFileName), ts.toPath(info.safeListPath, info.safeListPath, getCanonicalFileName), info.packageNameToTypingLocation, info.typingOptions);
-            });
-        };
-        return CoreServicesShimObject;
-    }(ShimBase));
-    var TypeScriptServicesFactory = (function () {
-        function TypeScriptServicesFactory() {
-            this._shims = [];
-        }
-        TypeScriptServicesFactory.prototype.getServicesVersion = function () {
-            return ts.servicesVersion;
-        };
-        TypeScriptServicesFactory.prototype.createLanguageServiceShim = function (host) {
-            try {
-                if (this.documentRegistry === undefined) {
-                    this.documentRegistry = ts.createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames(), host.getCurrentDirectory());
-                }
-                var hostAdapter = new LanguageServiceShimHostAdapter(host);
-                var languageService = ts.createLanguageService(hostAdapter, this.documentRegistry);
-                return new LanguageServiceShimObject(this, host, languageService);
-            }
-            catch (err) {
-                logInternalError(host, err);
-                throw err;
-            }
-        };
-        TypeScriptServicesFactory.prototype.createClassifierShim = function (logger) {
-            try {
-                return new ClassifierShimObject(this, logger);
-            }
-            catch (err) {
-                logInternalError(logger, err);
-                throw err;
-            }
-        };
-        TypeScriptServicesFactory.prototype.createCoreServicesShim = function (host) {
-            try {
-                var adapter = new CoreServicesShimHostAdapter(host);
-                return new CoreServicesShimObject(this, host, adapter);
-            }
-            catch (err) {
-                logInternalError(host, err);
-                throw err;
-            }
-        };
-        TypeScriptServicesFactory.prototype.close = function () {
-            this._shims = [];
-            this.documentRegistry = undefined;
-        };
-        TypeScriptServicesFactory.prototype.registerShim = function (shim) {
-            this._shims.push(shim);
-        };
-        TypeScriptServicesFactory.prototype.unregisterShim = function (shim) {
-            for (var i = 0, n = this._shims.length; i < n; i++) {
-                if (this._shims[i] === shim) {
-                    delete this._shims[i];
-                    return;
-                }
-            }
-            throw new Error("Invalid operation");
-        };
-        return TypeScriptServicesFactory;
-    }());
-    ts.TypeScriptServicesFactory = TypeScriptServicesFactory;
-    if (typeof module !== "undefined" && module.exports) {
-        module.exports = ts;
-    }
-})(ts || (ts = {}));
-var TypeScript;
-(function (TypeScript) {
-    var Services;
-    (function (Services) {
-        Services.TypeScriptServicesFactory = ts.TypeScriptServicesFactory;
-    })(Services = TypeScript.Services || (TypeScript.Services = {}));
-})(TypeScript || (TypeScript = {}));
-var toolsVersion = "2.1";
-var ts;
-(function (ts) {
-    var server;
-    (function (server) {
-        (function (LogLevel) {
-            LogLevel[LogLevel["terse"] = 0] = "terse";
-            LogLevel[LogLevel["normal"] = 1] = "normal";
-            LogLevel[LogLevel["requestTime"] = 2] = "requestTime";
-            LogLevel[LogLevel["verbose"] = 3] = "verbose";
-        })(server.LogLevel || (server.LogLevel = {}));
-        var LogLevel = server.LogLevel;
-        server.emptyArray = [];
-        var Msg;
-        (function (Msg) {
-            Msg.Err = "Err";
-            Msg.Info = "Info";
-            Msg.Perf = "Perf";
-        })(Msg = server.Msg || (server.Msg = {}));
-        function getProjectRootPath(project) {
-            switch (project.projectKind) {
-                case server.ProjectKind.Configured:
-                    return ts.getDirectoryPath(project.getProjectName());
-                case server.ProjectKind.Inferred:
-                    return "";
-                case server.ProjectKind.External:
-                    var projectName = ts.normalizeSlashes(project.getProjectName());
-                    return project.projectService.host.fileExists(projectName) ? ts.getDirectoryPath(projectName) : projectName;
-            }
-        }
-        function createInstallTypingsRequest(project, typingOptions, cachePath) {
-            return {
-                projectName: project.getProjectName(),
-                fileNames: project.getFileNames(),
-                compilerOptions: project.getCompilerOptions(),
-                typingOptions: typingOptions,
-                projectRootPath: getProjectRootPath(project),
-                cachePath: cachePath,
-                kind: "discover"
-            };
-        }
-        server.createInstallTypingsRequest = createInstallTypingsRequest;
-        var Errors;
-        (function (Errors) {
-            function ThrowNoProject() {
-                throw new Error("No Project.");
-            }
-            Errors.ThrowNoProject = ThrowNoProject;
-            function ThrowProjectLanguageServiceDisabled() {
-                throw new Error("The project's language service is disabled.");
-            }
-            Errors.ThrowProjectLanguageServiceDisabled = ThrowProjectLanguageServiceDisabled;
-            function ThrowProjectDoesNotContainDocument(fileName, project) {
-                throw new Error("Project '" + project.getProjectName() + "' does not contain document '" + fileName + "'");
-            }
-            Errors.ThrowProjectDoesNotContainDocument = ThrowProjectDoesNotContainDocument;
-        })(Errors = server.Errors || (server.Errors = {}));
-        function getDefaultFormatCodeSettings(host) {
-            return {
-                indentSize: 4,
-                tabSize: 4,
-                newLineCharacter: host.newLine || "\n",
-                convertTabsToSpaces: true,
-                indentStyle: ts.IndentStyle.Smart,
-                insertSpaceAfterCommaDelimiter: true,
-                insertSpaceAfterSemicolonInForStatements: true,
-                insertSpaceBeforeAndAfterBinaryOperators: true,
-                insertSpaceAfterKeywordsInControlFlowStatements: true,
-                insertSpaceAfterFunctionKeywordForAnonymousFunctions: false,
-                insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: false,
-                insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: false,
-                insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces: false,
-                insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces: false,
-                placeOpenBraceOnNewLineForFunctions: false,
-                placeOpenBraceOnNewLineForControlBlocks: false,
-            };
-        }
-        server.getDefaultFormatCodeSettings = getDefaultFormatCodeSettings;
-        function mergeMaps(target, source) {
-            for (var key in source) {
-                if (ts.hasProperty(source, key)) {
-                    target[key] = source[key];
-                }
-            }
-        }
-        server.mergeMaps = mergeMaps;
-        function removeItemFromSet(items, itemToRemove) {
-            if (items.length === 0) {
-                return;
-            }
-            var index = items.indexOf(itemToRemove);
-            if (index < 0) {
-                return;
-            }
-            if (index === items.length - 1) {
-                items.pop();
-            }
-            else {
-                items[index] = items.pop();
-            }
-        }
-        server.removeItemFromSet = removeItemFromSet;
-        function toNormalizedPath(fileName) {
-            return ts.normalizePath(fileName);
-        }
-        server.toNormalizedPath = toNormalizedPath;
-        function normalizedPathToPath(normalizedPath, currentDirectory, getCanonicalFileName) {
-            var f = ts.isRootedDiskPath(normalizedPath) ? normalizedPath : ts.getNormalizedAbsolutePath(normalizedPath, currentDirectory);
-            return getCanonicalFileName(f);
-        }
-        server.normalizedPathToPath = normalizedPathToPath;
-        function asNormalizedPath(fileName) {
-            return fileName;
-        }
-        server.asNormalizedPath = asNormalizedPath;
-        function createNormalizedPathMap() {
-            var map = Object.create(null);
-            return {
-                get: function (path) {
-                    return map[path];
-                },
-                set: function (path, value) {
-                    map[path] = value;
-                },
-                contains: function (path) {
-                    return ts.hasProperty(map, path);
-                },
-                remove: function (path) {
-                    delete map[path];
-                }
-            };
-        }
-        server.createNormalizedPathMap = createNormalizedPathMap;
-        function throwLanguageServiceIsDisabledError() {
-            throw new Error("LanguageService is disabled");
-        }
-        server.nullLanguageService = {
-            cleanupSemanticCache: throwLanguageServiceIsDisabledError,
-            getSyntacticDiagnostics: throwLanguageServiceIsDisabledError,
-            getSemanticDiagnostics: throwLanguageServiceIsDisabledError,
-            getCompilerOptionsDiagnostics: throwLanguageServiceIsDisabledError,
-            getSyntacticClassifications: throwLanguageServiceIsDisabledError,
-            getEncodedSyntacticClassifications: throwLanguageServiceIsDisabledError,
-            getSemanticClassifications: throwLanguageServiceIsDisabledError,
-            getEncodedSemanticClassifications: throwLanguageServiceIsDisabledError,
-            getCompletionsAtPosition: throwLanguageServiceIsDisabledError,
-            findReferences: throwLanguageServiceIsDisabledError,
-            getCompletionEntryDetails: throwLanguageServiceIsDisabledError,
-            getQuickInfoAtPosition: throwLanguageServiceIsDisabledError,
-            findRenameLocations: throwLanguageServiceIsDisabledError,
-            getNameOrDottedNameSpan: throwLanguageServiceIsDisabledError,
-            getBreakpointStatementAtPosition: throwLanguageServiceIsDisabledError,
-            getBraceMatchingAtPosition: throwLanguageServiceIsDisabledError,
-            getSignatureHelpItems: throwLanguageServiceIsDisabledError,
-            getDefinitionAtPosition: throwLanguageServiceIsDisabledError,
-            getRenameInfo: throwLanguageServiceIsDisabledError,
-            getTypeDefinitionAtPosition: throwLanguageServiceIsDisabledError,
-            getReferencesAtPosition: throwLanguageServiceIsDisabledError,
-            getDocumentHighlights: throwLanguageServiceIsDisabledError,
-            getOccurrencesAtPosition: throwLanguageServiceIsDisabledError,
-            getNavigateToItems: throwLanguageServiceIsDisabledError,
-            getNavigationBarItems: throwLanguageServiceIsDisabledError,
-            getNavigationTree: throwLanguageServiceIsDisabledError,
-            getOutliningSpans: throwLanguageServiceIsDisabledError,
-            getTodoComments: throwLanguageServiceIsDisabledError,
-            getIndentationAtPosition: throwLanguageServiceIsDisabledError,
-            getFormattingEditsForRange: throwLanguageServiceIsDisabledError,
-            getFormattingEditsForDocument: throwLanguageServiceIsDisabledError,
-            getFormattingEditsAfterKeystroke: throwLanguageServiceIsDisabledError,
-            getDocCommentTemplateAtPosition: throwLanguageServiceIsDisabledError,
-            isValidBraceCompletionAtPosition: throwLanguageServiceIsDisabledError,
-            getEmitOutput: throwLanguageServiceIsDisabledError,
-            getProgram: throwLanguageServiceIsDisabledError,
-            getNonBoundSourceFile: throwLanguageServiceIsDisabledError,
-            dispose: throwLanguageServiceIsDisabledError,
-            getCompletionEntrySymbol: throwLanguageServiceIsDisabledError,
-            getImplementationAtPosition: throwLanguageServiceIsDisabledError,
-            getSourceFile: throwLanguageServiceIsDisabledError,
-            getCodeFixesAtPosition: throwLanguageServiceIsDisabledError
-        };
-        server.nullLanguageServiceHost = {
-            setCompilationSettings: function () { return undefined; },
-            notifyFileRemoved: function () { return undefined; }
-        };
-        function isInferredProjectName(name) {
-            return /dev\/null\/inferredProject\d+\*/.test(name);
-        }
-        server.isInferredProjectName = isInferredProjectName;
-        function makeInferredProjectName(counter) {
-            return "/dev/null/inferredProject" + counter + "*";
-        }
-        server.makeInferredProjectName = makeInferredProjectName;
-        var ThrottledOperations = (function () {
-            function ThrottledOperations(host) {
-                this.host = host;
-                this.pendingTimeouts = ts.createMap();
-            }
-            ThrottledOperations.prototype.schedule = function (operationId, delay, cb) {
-                if (ts.hasProperty(this.pendingTimeouts, operationId)) {
-                    this.host.clearTimeout(this.pendingTimeouts[operationId]);
-                }
-                this.pendingTimeouts[operationId] = this.host.setTimeout(ThrottledOperations.run, delay, this, operationId, cb);
-            };
-            ThrottledOperations.run = function (self, operationId, cb) {
-                delete self.pendingTimeouts[operationId];
-                cb();
-            };
-            return ThrottledOperations;
-        }());
-        server.ThrottledOperations = ThrottledOperations;
-        var GcTimer = (function () {
-            function GcTimer(host, delay, logger) {
-                this.host = host;
-                this.delay = delay;
-                this.logger = logger;
-            }
-            GcTimer.prototype.scheduleCollect = function () {
-                if (!this.host.gc || this.timerId != undefined) {
-                    return;
-                }
-                this.timerId = this.host.setTimeout(GcTimer.run, this.delay, this);
-            };
-            GcTimer.run = function (self) {
-                self.timerId = undefined;
-                var log = self.logger.hasLevel(LogLevel.requestTime);
-                var before = log && self.host.getMemoryUsage();
-                self.host.gc();
-                if (log) {
-                    var after = self.host.getMemoryUsage();
-                    self.logger.perftrc("GC::before " + before + ", after " + after);
-                }
-            };
-            return GcTimer;
-        }());
-        server.GcTimer = GcTimer;
-    })(server = ts.server || (ts.server = {}));
-})(ts || (ts = {}));
 var ts;
 (function (ts) {
     var server;
@@ -63607,55 +63580,58 @@ var ts;
                 this.host = host;
                 this.project = project;
                 this.cancellationToken = cancellationToken;
-                this.getCanonicalFileName = ts.createGetCanonicalFileName(this.host.useCaseSensitiveFileNames);
                 this.resolvedModuleNames = ts.createFileMap();
                 this.resolvedTypeReferenceDirectives = ts.createFileMap();
+                this.getCanonicalFileName = ts.createGetCanonicalFileName(this.host.useCaseSensitiveFileNames);
                 if (host.trace) {
                     this.trace = function (s) { return host.trace(s); };
                 }
                 this.resolveModuleName = function (moduleName, containingFile, compilerOptions, host) {
+                    var globalCache = _this.project.getTypingOptions().enableAutoDiscovery
+                        ? _this.project.projectService.typingsInstaller.globalTypingsCacheLocation
+                        : undefined;
                     var primaryResult = ts.resolveModuleName(moduleName, containingFile, compilerOptions, host);
-                    if (primaryResult.resolvedModule) {
-                        if (ts.fileExtensionIsAny(primaryResult.resolvedModule.resolvedFileName, ts.supportedTypeScriptExtensions)) {
-                            return primaryResult;
+                    if (!(primaryResult.resolvedModule && ts.extensionIsTypeScript(primaryResult.resolvedModule.extension)) && globalCache !== undefined) {
+                        var _a = ts.loadModuleFromGlobalCache(moduleName, _this.project.getProjectName(), compilerOptions, host, globalCache), resolvedModule = _a.resolvedModule, failedLookupLocations = _a.failedLookupLocations;
+                        if (resolvedModule) {
+                            return { resolvedModule: resolvedModule, failedLookupLocations: primaryResult.failedLookupLocations.concat(failedLookupLocations) };
                         }
                     }
-                    var secondaryLookupFailedLookupLocations = [];
-                    var globalCache = _this.project.projectService.typingsInstaller.globalTypingsCacheLocation;
-                    if (_this.project.getTypingOptions().enableAutoDiscovery && globalCache) {
-                        var traceEnabled = ts.isTraceEnabled(compilerOptions, host);
-                        if (traceEnabled) {
-                            ts.trace(host, ts.Diagnostics.Auto_discovery_for_typings_is_enabled_in_project_0_Running_extra_resolution_pass_for_module_1_using_cache_location_2, _this.project.getProjectName(), moduleName, globalCache);
-                        }
-                        var state = { compilerOptions: compilerOptions, host: host, skipTsx: false, traceEnabled: traceEnabled };
-                        var resolvedName = ts.loadModuleFromNodeModules(moduleName, globalCache, secondaryLookupFailedLookupLocations, state, true);
-                        if (resolvedName) {
-                            return ts.createResolvedModule(resolvedName, true, primaryResult.failedLookupLocations.concat(secondaryLookupFailedLookupLocations));
-                        }
-                    }
-                    if (!primaryResult.resolvedModule && secondaryLookupFailedLookupLocations.length) {
-                        primaryResult.failedLookupLocations = primaryResult.failedLookupLocations.concat(secondaryLookupFailedLookupLocations);
-                    }
                     return primaryResult;
                 };
+                if (this.host.realpath) {
+                    this.realpath = function (path) { return _this.host.realpath(path); };
+                }
             }
-            LSHost.prototype.resolveNamesWithLocalCache = function (names, containingFile, cache, loader, getResult) {
+            LSHost.prototype.startRecordingFilesWithChangedResolutions = function () {
+                this.filesWithChangedSetOfUnresolvedImports = [];
+            };
+            LSHost.prototype.finishRecordingFilesWithChangedResolutions = function () {
+                var collected = this.filesWithChangedSetOfUnresolvedImports;
+                this.filesWithChangedSetOfUnresolvedImports = undefined;
+                return collected;
+            };
+            LSHost.prototype.resolveNamesWithLocalCache = function (names, containingFile, cache, loader, getResult, getResultFileName, logChanges) {
                 var path = ts.toPath(containingFile, this.host.getCurrentDirectory(), this.getCanonicalFileName);
                 var currentResolutionsInFile = cache.get(path);
                 var newResolutions = ts.createMap();
                 var resolvedModules = [];
                 var compilerOptions = this.getCompilationSettings();
                 var lastDeletedFileName = this.project.projectService.lastDeletedFile && this.project.projectService.lastDeletedFile.fileName;
-                for (var _i = 0, names_3 = names; _i < names_3.length; _i++) {
-                    var name_52 = names_3[_i];
-                    var resolution = newResolutions[name_52];
+                for (var _i = 0, names_2 = names; _i < names_2.length; _i++) {
+                    var name_48 = names_2[_i];
+                    var resolution = newResolutions[name_48];
                     if (!resolution) {
-                        var existingResolution = currentResolutionsInFile && currentResolutionsInFile[name_52];
+                        var existingResolution = currentResolutionsInFile && currentResolutionsInFile[name_48];
                         if (moduleResolutionIsValid(existingResolution)) {
                             resolution = existingResolution;
                         }
                         else {
-                            newResolutions[name_52] = resolution = loader(name_52, containingFile, compilerOptions, this);
+                            newResolutions[name_48] = resolution = loader(name_48, containingFile, compilerOptions, this);
+                        }
+                        if (logChanges && this.filesWithChangedSetOfUnresolvedImports && !resolutionIsEqualTo(existingResolution, resolution)) {
+                            this.filesWithChangedSetOfUnresolvedImports.push(path);
+                            logChanges = false;
                         }
                     }
                     ts.Debug.assert(resolution !== undefined);
@@ -63663,16 +63639,30 @@ var ts;
                 }
                 cache.set(path, newResolutions);
                 return resolvedModules;
+                function resolutionIsEqualTo(oldResolution, newResolution) {
+                    if (oldResolution === newResolution) {
+                        return true;
+                    }
+                    if (!oldResolution || !newResolution) {
+                        return false;
+                    }
+                    var oldResult = getResult(oldResolution);
+                    var newResult = getResult(newResolution);
+                    if (oldResult === newResult) {
+                        return true;
+                    }
+                    if (!oldResult || !newResult) {
+                        return false;
+                    }
+                    return getResultFileName(oldResult) === getResultFileName(newResult);
+                }
                 function moduleResolutionIsValid(resolution) {
                     if (!resolution) {
                         return false;
                     }
                     var result = getResult(resolution);
                     if (result) {
-                        if (result.resolvedFileName && result.resolvedFileName === lastDeletedFileName) {
-                            return false;
-                        }
-                        return true;
+                        return getResultFileName(result) !== lastDeletedFileName;
                     }
                     return resolution.failedLookupLocations.length === 0;
                 }
@@ -63690,10 +63680,10 @@ var ts;
                 return this.cancellationToken;
             };
             LSHost.prototype.resolveTypeReferenceDirectives = function (typeDirectiveNames, containingFile) {
-                return this.resolveNamesWithLocalCache(typeDirectiveNames, containingFile, this.resolvedTypeReferenceDirectives, ts.resolveTypeReferenceDirective, function (m) { return m.resolvedTypeReferenceDirective; });
+                return this.resolveNamesWithLocalCache(typeDirectiveNames, containingFile, this.resolvedTypeReferenceDirectives, ts.resolveTypeReferenceDirective, function (m) { return m.resolvedTypeReferenceDirective; }, function (r) { return r.resolvedFileName; }, false);
             };
             LSHost.prototype.resolveModuleNames = function (moduleNames, containingFile) {
-                return this.resolveNamesWithLocalCache(moduleNames, containingFile, this.resolvedModuleNames, this.resolveModuleName, function (m) { return m.resolvedModule; });
+                return this.resolveNamesWithLocalCache(moduleNames, containingFile, this.resolvedModuleNames, this.resolveModuleName, function (m) { return m.resolvedModule; }, function (r) { return r.resolvedFileName; }, true);
             };
             LSHost.prototype.getDefaultLibFileName = function () {
                 var nodeModuleBinDir = ts.getDirectoryPath(ts.normalizePath(this.host.getExecutingFilePath()));
@@ -63745,9 +63735,11 @@ var ts;
                 this.resolvedTypeReferenceDirectives.remove(info.path);
             };
             LSHost.prototype.setCompilationSettings = function (opt) {
+                if (ts.changesAffectModuleResolution(this.compilationSettings, opt)) {
+                    this.resolvedModuleNames.clear();
+                    this.resolvedTypeReferenceDirectives.clear();
+                }
                 this.compilationSettings = opt;
-                this.resolvedModuleNames.clear();
-                this.resolvedTypeReferenceDirectives.clear();
             };
             return LSHost;
         }());
@@ -63759,9 +63751,9 @@ var ts;
     var server;
     (function (server) {
         server.nullTypingsInstaller = {
-            enqueueInstallTypingsRequest: function () { },
-            attach: function () { },
-            onProjectClosed: function () { },
+            enqueueInstallTypingsRequest: ts.noop,
+            attach: ts.noop,
+            onProjectClosed: ts.noop,
             globalTypingsCacheLocation: undefined
         };
         var TypingsCacheEntry = (function () {
@@ -63805,48 +63797,52 @@ var ts;
         function compilerOptionsChanged(opt1, opt2) {
             return opt1.allowJs != opt2.allowJs;
         }
-        function toTypingsArray(arr) {
-            arr.sort();
-            return arr;
+        function unresolvedImportsChanged(imports1, imports2) {
+            if (imports1 === imports2) {
+                return false;
+            }
+            return !ts.arrayIsEqualTo(imports1, imports2);
         }
         var TypingsCache = (function () {
             function TypingsCache(installer) {
                 this.installer = installer;
                 this.perProjectCache = ts.createMap();
             }
-            TypingsCache.prototype.getTypingsForProject = function (project, forceRefresh) {
+            TypingsCache.prototype.getTypingsForProject = function (project, unresolvedImports, forceRefresh) {
                 var typingOptions = project.getTypingOptions();
                 if (!typingOptions || !typingOptions.enableAutoDiscovery) {
                     return server.emptyArray;
                 }
                 var entry = this.perProjectCache[project.getProjectName()];
                 var result = entry ? entry.typings : server.emptyArray;
-                if (forceRefresh || !entry || typingOptionsChanged(typingOptions, entry.typingOptions) || compilerOptionsChanged(project.getCompilerOptions(), entry.compilerOptions)) {
+                if (forceRefresh ||
+                    !entry ||
+                    typingOptionsChanged(typingOptions, entry.typingOptions) ||
+                    compilerOptionsChanged(project.getCompilerOptions(), entry.compilerOptions) ||
+                    unresolvedImportsChanged(unresolvedImports, entry.unresolvedImports)) {
                     this.perProjectCache[project.getProjectName()] = {
                         compilerOptions: project.getCompilerOptions(),
                         typingOptions: typingOptions,
                         typings: result,
+                        unresolvedImports: unresolvedImports,
                         poisoned: true
                     };
-                    this.installer.enqueueInstallTypingsRequest(project, typingOptions);
+                    this.installer.enqueueInstallTypingsRequest(project, typingOptions, unresolvedImports);
                 }
                 return result;
             };
-            TypingsCache.prototype.invalidateCachedTypingsForProject = function (project) {
-                var typingOptions = project.getTypingOptions();
-                if (!typingOptions.enableAutoDiscovery) {
-                    return;
-                }
-                this.installer.enqueueInstallTypingsRequest(project, typingOptions);
-            };
-            TypingsCache.prototype.updateTypingsForProject = function (projectName, compilerOptions, typingOptions, newTypings) {
+            TypingsCache.prototype.updateTypingsForProject = function (projectName, compilerOptions, typingOptions, unresolvedImports, newTypings) {
                 this.perProjectCache[projectName] = {
                     compilerOptions: compilerOptions,
                     typingOptions: typingOptions,
-                    typings: toTypingsArray(newTypings),
+                    typings: server.toSortedReadonlyArray(newTypings),
+                    unresolvedImports: unresolvedImports,
                     poisoned: false
                 };
             };
+            TypingsCache.prototype.deleteTypingsForProject = function (projectName) {
+                delete this.perProjectCache[projectName];
+            };
             TypingsCache.prototype.onProjectClosed = function (project) {
                 delete this.perProjectCache[project.getProjectName()];
                 this.installer.onProjectClosed(project);
@@ -63860,7 +63856,6 @@ var ts;
 (function (ts) {
     var server;
     (function (server) {
-        var crypto = require("crypto");
         function shouldEmitFile(scriptInfo) {
             return !scriptInfo.hasMixedContent;
         }
@@ -63877,16 +63872,14 @@ var ts;
             BuilderFileInfo.prototype.containsOnlyAmbientModules = function (sourceFile) {
                 for (var _i = 0, _a = sourceFile.statements; _i < _a.length; _i++) {
                     var statement = _a[_i];
-                    if (statement.kind !== 226 || statement.name.kind !== 9) {
+                    if (statement.kind !== 230 || statement.name.kind !== 9) {
                         return false;
                     }
                 }
                 return true;
             };
             BuilderFileInfo.prototype.computeHash = function (text) {
-                return crypto.createHash("md5")
-                    .update(text)
-                    .digest("base64");
+                return this.project.projectService.host.createHash(text);
             };
             BuilderFileInfo.prototype.getSourceFile = function () {
                 return this.project.getSourceFile(this.scriptInfo.path);
@@ -64162,12 +64155,12 @@ var ts;
 (function (ts) {
     var server;
     (function (server) {
+        var ProjectKind;
         (function (ProjectKind) {
             ProjectKind[ProjectKind["Inferred"] = 0] = "Inferred";
             ProjectKind[ProjectKind["Configured"] = 1] = "Configured";
             ProjectKind[ProjectKind["External"] = 2] = "External";
-        })(server.ProjectKind || (server.ProjectKind = {}));
-        var ProjectKind = server.ProjectKind;
+        })(ProjectKind = server.ProjectKind || (server.ProjectKind = {}));
         function remove(items, item) {
             var index = items.indexOf(item);
             if (index >= 0) {
@@ -64211,6 +64204,32 @@ var ts;
             return counts.ts === 0 && counts.tsx === 0;
         }
         server.allFilesAreJsOrDts = allFilesAreJsOrDts;
+        var UnresolvedImportsMap = (function () {
+            function UnresolvedImportsMap() {
+                this.perFileMap = ts.createFileMap();
+                this.version = 0;
+            }
+            UnresolvedImportsMap.prototype.clear = function () {
+                this.perFileMap.clear();
+                this.version = 0;
+            };
+            UnresolvedImportsMap.prototype.getVersion = function () {
+                return this.version;
+            };
+            UnresolvedImportsMap.prototype.remove = function (path) {
+                this.perFileMap.remove(path);
+                this.version++;
+            };
+            UnresolvedImportsMap.prototype.get = function (path) {
+                return this.perFileMap.get(path);
+            };
+            UnresolvedImportsMap.prototype.set = function (path, value) {
+                this.perFileMap.set(path, value);
+                this.version++;
+            };
+            return UnresolvedImportsMap;
+        }());
+        server.UnresolvedImportsMap = UnresolvedImportsMap;
         var Project = (function () {
             function Project(projectKind, projectService, documentRegistry, hasExplicitListOfFiles, languageServiceEnabled, compilerOptions, compileOnSaveEnabled) {
                 this.projectKind = projectKind;
@@ -64221,6 +64240,7 @@ var ts;
                 this.compileOnSaveEnabled = compileOnSaveEnabled;
                 this.rootFiles = [];
                 this.rootFilesMap = ts.createFileMap();
+                this.cachedUnresolvedImportsPerFile = new UnresolvedImportsMap();
                 this.lastReportedVersion = 0;
                 this.projectStructureVersion = 0;
                 this.projectStateVersion = 0;
@@ -64233,6 +64253,9 @@ var ts;
                 else if (hasExplicitListOfFiles) {
                     this.compilerOptions.allowNonTsExtensions = true;
                 }
+                if (this.projectKind === ProjectKind.Inferred || this.projectKind === ProjectKind.External) {
+                    this.compilerOptions.noEmitForJsFiles = true;
+                }
                 if (languageServiceEnabled) {
                     this.enableLanguageService();
                 }
@@ -64250,6 +64273,9 @@ var ts;
                 this.updateGraph();
                 return hasOneOrMoreJsAndNoTsFiles(this);
             };
+            Project.prototype.getCachedUnresolvedImportsPerFile_TestOnly = function () {
+                return this.cachedUnresolvedImportsPerFile;
+            };
             Project.prototype.getProjectErrors = function () {
                 return this.projectErrors;
             };
@@ -64356,7 +64382,7 @@ var ts;
                 }
                 return this.getLanguageService().getEmitOutput(info.fileName, emitOnlyDtsFiles);
             };
-            Project.prototype.getFileNames = function () {
+            Project.prototype.getFileNames = function (excludeFilesFromExternalLibraries) {
                 if (!this.program) {
                     return [];
                 }
@@ -64370,8 +64396,15 @@ var ts;
                     }
                     return rootFiles;
                 }
-                var sourceFiles = this.program.getSourceFiles();
-                return sourceFiles.map(function (sourceFile) { return server.asNormalizedPath(sourceFile.fileName); });
+                var result = [];
+                for (var _i = 0, _a = this.program.getSourceFiles(); _i < _a.length; _i++) {
+                    var f = _a[_i];
+                    if (excludeFilesFromExternalLibraries && this.program.isSourceFileFromExternalLibrary(f)) {
+                        continue;
+                    }
+                    result.push(server.asNormalizedPath(f.fileName));
+                }
+                return result;
             };
             Project.prototype.getAllEmittableFiles = function () {
                 if (!this.languageServiceEnabled) {
@@ -64412,6 +64445,7 @@ var ts;
                 if (detachFromProject === void 0) { detachFromProject = true; }
                 this.removeRootFileIfNecessary(info);
                 this.lsHost.notifyFileRemoved(info);
+                this.cachedUnresolvedImportsPerFile.remove(info.path);
                 if (detachFromProject) {
                     info.detachFromProject(this);
                 }
@@ -64420,12 +64454,56 @@ var ts;
             Project.prototype.markAsDirty = function () {
                 this.projectStateVersion++;
             };
+            Project.prototype.extractUnresolvedImportsFromSourceFile = function (file, result) {
+                var cached = this.cachedUnresolvedImportsPerFile.get(file.path);
+                if (cached) {
+                    for (var _i = 0, cached_1 = cached; _i < cached_1.length; _i++) {
+                        var f = cached_1[_i];
+                        result.push(f);
+                    }
+                    return;
+                }
+                var unresolvedImports;
+                if (file.resolvedModules) {
+                    for (var name_49 in file.resolvedModules) {
+                        if (!file.resolvedModules[name_49] && !ts.isExternalModuleNameRelative(name_49)) {
+                            var trimmed = name_49.trim();
+                            var i = trimmed.indexOf("/");
+                            if (i !== -1 && trimmed.charCodeAt(0) === 64) {
+                                i = trimmed.indexOf("/", i + 1);
+                            }
+                            if (i !== -1) {
+                                trimmed = trimmed.substr(0, i);
+                            }
+                            (unresolvedImports || (unresolvedImports = [])).push(trimmed);
+                            result.push(trimmed);
+                        }
+                    }
+                }
+                this.cachedUnresolvedImportsPerFile.set(file.path, unresolvedImports || server.emptyArray);
+            };
             Project.prototype.updateGraph = function () {
                 if (!this.languageServiceEnabled) {
                     return true;
                 }
+                this.lsHost.startRecordingFilesWithChangedResolutions();
                 var hasChanges = this.updateGraphWorker();
-                var cachedTypings = this.projectService.typingsCache.getTypingsForProject(this, hasChanges);
+                var changedFiles = this.lsHost.finishRecordingFilesWithChangedResolutions() || server.emptyArray;
+                for (var _i = 0, changedFiles_1 = changedFiles; _i < changedFiles_1.length; _i++) {
+                    var file = changedFiles_1[_i];
+                    this.cachedUnresolvedImportsPerFile.remove(file);
+                }
+                var unresolvedImports;
+                if (hasChanges || changedFiles.length) {
+                    var result = [];
+                    for (var _a = 0, _b = this.program.getSourceFiles(); _a < _b.length; _a++) {
+                        var sourceFile = _b[_a];
+                        this.extractUnresolvedImportsFromSourceFile(sourceFile, result);
+                    }
+                    this.lastCachedUnresolvedImportsList = server.toSortedReadonlyArray(result);
+                }
+                unresolvedImports = this.lastCachedUnresolvedImportsList;
+                var cachedTypings = this.projectService.typingsCache.getTypingsForProject(this, unresolvedImports, hasChanges);
                 if (this.setTypings(cachedTypings)) {
                     hasChanges = this.updateGraphWorker() || hasChanges;
                 }
@@ -64498,6 +64576,10 @@ var ts;
                         compilerOptions.allowJs = true;
                     }
                     compilerOptions.allowNonTsExtensions = true;
+                    if (ts.changesAffectModuleResolution(this.compilerOptions, compilerOptions)) {
+                        this.cachedUnresolvedImportsPerFile.clear();
+                        this.lastCachedUnresolvedImportsList = undefined;
+                    }
                     this.compilerOptions = compilerOptions;
                     this.lsHost.setCompilationSettings(compilerOptions);
                     this.markAsDirty();
@@ -64606,9 +64688,8 @@ var ts;
         server.Project = Project;
         var InferredProject = (function (_super) {
             __extends(InferredProject, _super);
-            function InferredProject(projectService, documentRegistry, languageServiceEnabled, compilerOptions, compileOnSaveEnabled) {
-                var _this = _super.call(this, ProjectKind.Inferred, projectService, documentRegistry, undefined, languageServiceEnabled, compilerOptions, compileOnSaveEnabled) || this;
-                _this.compileOnSaveEnabled = compileOnSaveEnabled;
+            function InferredProject(projectService, documentRegistry, languageServiceEnabled, compilerOptions) {
+                var _this = _super.call(this, ProjectKind.Inferred, projectService, documentRegistry, undefined, languageServiceEnabled, compilerOptions, false) || this;
                 _this.directoriesWatchedForTsconfig = [];
                 _this.inferredProjectName = server.makeInferredProjectName(InferredProject.NextId);
                 InferredProject.NextId++;
@@ -64938,6 +65019,7 @@ var ts;
                 this.inferredProjects = [];
                 this.configuredProjects = [];
                 this.openFiles = [];
+                ts.Debug.assert(!!host.createHash, "'ServerHost.createHash' is required for ProjectService");
                 this.toCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames);
                 this.directoryWatchers = new DirectoryWatchers(this);
                 this.throttledOperations = new server.ThrottledOperations(host);
@@ -64964,17 +65046,18 @@ var ts;
                     return;
                 }
                 switch (response.kind) {
-                    case "set":
-                        this.typingsCache.updateTypingsForProject(response.projectName, response.compilerOptions, response.typingOptions, response.typings);
-                        project.updateGraph();
+                    case server.ActionSet:
+                        this.typingsCache.updateTypingsForProject(response.projectName, response.compilerOptions, response.typingOptions, response.unresolvedImports, response.typings);
                         break;
-                    case "invalidate":
-                        this.typingsCache.invalidateCachedTypingsForProject(project);
+                    case server.ActionInvalidate:
+                        this.typingsCache.deleteTypingsForProject(response.projectName);
                         break;
                 }
+                project.updateGraph();
             };
             ProjectService.prototype.setCompilerOptionsForInferredProjects = function (projectCompilerOptions) {
                 this.compilerOptionsForInferredProjects = convertCompilerOptions(projectCompilerOptions);
+                this.compilerOptionsForInferredProjects.allowNonTsExtensions = true;
                 this.compileOnSaveForInferredProjects = projectCompilerOptions.compileOnSave;
                 for (var _i = 0, _a = this.inferredProjects; _i < _a.length; _i++) {
                     var proj = _a[_i];
@@ -65525,7 +65608,7 @@ var ts;
                 var useExistingProject = this.useSingleInferredProject && this.inferredProjects.length;
                 var project = useExistingProject
                     ? this.inferredProjects[0]
-                    : new server.InferredProject(this, this.documentRegistry, true, this.compilerOptionsForInferredProjects, this.compileOnSaveForInferredProjects);
+                    : new server.InferredProject(this, this.documentRegistry, true, this.compilerOptionsForInferredProjects);
                 project.addRoot(root);
                 this.directoryWatchers.startWatchingContainingDirectoriesForFile(root.fileName, project, function (fileName) { return _this.onConfigFileAddedForInferredProject(fileName); });
                 project.updateGraph();
@@ -65658,13 +65741,13 @@ var ts;
                 this.printProjects();
             };
             ProjectService.prototype.collectChanges = function (lastKnownProjectVersions, currentProjects, result) {
-                var _loop_3 = function (proj) {
+                var _loop_5 = function (proj) {
                     var knownProject = ts.forEach(lastKnownProjectVersions, function (p) { return p.projectName === proj.getProjectName() && p; });
                     result.push(proj.getChangesSinceVersion(knownProject && knownProject.version));
                 };
                 for (var _i = 0, currentProjects_1 = currentProjects; _i < currentProjects_1.length; _i++) {
                     var proj = currentProjects_1[_i];
-                    _loop_3(proj);
+                    _loop_5(proj);
                 }
             };
             ProjectService.prototype.synchronizeProjectList = function (knownProjects) {
@@ -65686,8 +65769,8 @@ var ts;
                     }
                 }
                 if (changedFiles) {
-                    for (var _a = 0, changedFiles_1 = changedFiles; _a < changedFiles_1.length; _a++) {
-                        var file = changedFiles_1[_a];
+                    for (var _a = 0, changedFiles_2 = changedFiles; _a < changedFiles_2.length; _a++) {
+                        var file = changedFiles_2[_a];
                         var scriptInfo = this.getScriptInfo(file.fileName);
                         ts.Debug.assert(!!scriptInfo);
                         for (var i = file.changes.length - 1; i >= 0; i--) {
@@ -65754,7 +65837,9 @@ var ts;
                     var file = _a[_i];
                     var normalized = server.toNormalizedPath(file.fileName);
                     if (ts.getBaseFileName(normalized) === "tsconfig.json") {
-                        (tsConfigFiles || (tsConfigFiles = [])).push(normalized);
+                        if (this.host.fileExists(normalized)) {
+                            (tsConfigFiles || (tsConfigFiles = [])).push(normalized);
+                        }
                     }
                     else {
                         rootFiles.push(file);
@@ -66887,9 +66972,9 @@ var ts;
                 if (simplifiedResult) {
                     return completions.entries.reduce(function (result, entry) {
                         if (completions.isMemberCompletion || (entry.name.toLowerCase().indexOf(prefix.toLowerCase()) === 0)) {
-                            var name_53 = entry.name, kind = entry.kind, kindModifiers = entry.kindModifiers, sortText = entry.sortText, replacementSpan = entry.replacementSpan;
+                            var name_50 = entry.name, kind = entry.kind, kindModifiers = entry.kindModifiers, sortText = entry.sortText, replacementSpan = entry.replacementSpan;
                             var convertedSpan = replacementSpan ? _this.decorateSpan(replacementSpan, scriptInfo) : undefined;
-                            result.push({ name: name_53, kind: kind, kindModifiers: kindModifiers, sortText: sortText, replacementSpan: convertedSpan });
+                            result.push({ name: name_50, kind: kind, kindModifiers: kindModifiers, sortText: sortText, replacementSpan: convertedSpan });
                         }
                         return result;
                     }, []).sort(function (a, b) { return ts.compareStrings(a.name, b.name); });
@@ -67292,6 +67377,7 @@ var ts;
     var server;
     (function (server) {
         var lineCollectionCapacity = 4;
+        var CharRangeSection;
         (function (CharRangeSection) {
             CharRangeSection[CharRangeSection["PreStart"] = 0] = "PreStart";
             CharRangeSection[CharRangeSection["Start"] = 1] = "Start";
@@ -67299,8 +67385,7 @@ var ts;
             CharRangeSection[CharRangeSection["Mid"] = 3] = "Mid";
             CharRangeSection[CharRangeSection["End"] = 4] = "End";
             CharRangeSection[CharRangeSection["PostEnd"] = 5] = "PostEnd";
-        })(server.CharRangeSection || (server.CharRangeSection = {}));
-        var CharRangeSection = server.CharRangeSection;
+        })(CharRangeSection = server.CharRangeSection || (server.CharRangeSection = {}));
         var BaseLineIndexWalker = (function () {
             function BaseLineIndexWalker() {
                 this.goSubtree = true;
@@ -68133,5 +68218,701 @@ var ts;
         server.LineLeaf = LineLeaf;
     })(server = ts.server || (ts.server = {}));
 })(ts || (ts = {}));
-
-//# sourceMappingURL=tsserverlibrary.js.map
+var debugObjectHost = (function () { return this; })();
+var ts;
+(function (ts) {
+    function logInternalError(logger, err) {
+        if (logger) {
+            logger.log("*INTERNAL ERROR* - Exception in typescript services: " + err.message);
+        }
+    }
+    var ScriptSnapshotShimAdapter = (function () {
+        function ScriptSnapshotShimAdapter(scriptSnapshotShim) {
+            this.scriptSnapshotShim = scriptSnapshotShim;
+        }
+        ScriptSnapshotShimAdapter.prototype.getText = function (start, end) {
+            return this.scriptSnapshotShim.getText(start, end);
+        };
+        ScriptSnapshotShimAdapter.prototype.getLength = function () {
+            return this.scriptSnapshotShim.getLength();
+        };
+        ScriptSnapshotShimAdapter.prototype.getChangeRange = function (oldSnapshot) {
+            var oldSnapshotShim = oldSnapshot;
+            var encoded = this.scriptSnapshotShim.getChangeRange(oldSnapshotShim.scriptSnapshotShim);
+            if (encoded == null) {
+                return null;
+            }
+            var decoded = JSON.parse(encoded);
+            return ts.createTextChangeRange(ts.createTextSpan(decoded.span.start, decoded.span.length), decoded.newLength);
+        };
+        ScriptSnapshotShimAdapter.prototype.dispose = function () {
+            if ("dispose" in this.scriptSnapshotShim) {
+                this.scriptSnapshotShim.dispose();
+            }
+        };
+        return ScriptSnapshotShimAdapter;
+    }());
+    var LanguageServiceShimHostAdapter = (function () {
+        function LanguageServiceShimHostAdapter(shimHost) {
+            var _this = this;
+            this.shimHost = shimHost;
+            this.loggingEnabled = false;
+            this.tracingEnabled = false;
+            if ("getModuleResolutionsForFile" in this.shimHost) {
+                this.resolveModuleNames = function (moduleNames, containingFile) {
+                    var resolutionsInFile = JSON.parse(_this.shimHost.getModuleResolutionsForFile(containingFile));
+                    return ts.map(moduleNames, function (name) {
+                        var result = ts.getProperty(resolutionsInFile, name);
+                        return result ? { resolvedFileName: result, extension: ts.extensionFromPath(result), isExternalLibraryImport: false } : undefined;
+                    });
+                };
+            }
+            if ("directoryExists" in this.shimHost) {
+                this.directoryExists = function (directoryName) { return _this.shimHost.directoryExists(directoryName); };
+            }
+            if ("getTypeReferenceDirectiveResolutionsForFile" in this.shimHost) {
+                this.resolveTypeReferenceDirectives = function (typeDirectiveNames, containingFile) {
+                    var typeDirectivesForFile = JSON.parse(_this.shimHost.getTypeReferenceDirectiveResolutionsForFile(containingFile));
+                    return ts.map(typeDirectiveNames, function (name) { return ts.getProperty(typeDirectivesForFile, name); });
+                };
+            }
+        }
+        LanguageServiceShimHostAdapter.prototype.log = function (s) {
+            if (this.loggingEnabled) {
+                this.shimHost.log(s);
+            }
+        };
+        LanguageServiceShimHostAdapter.prototype.trace = function (s) {
+            if (this.tracingEnabled) {
+                this.shimHost.trace(s);
+            }
+        };
+        LanguageServiceShimHostAdapter.prototype.error = function (s) {
+            this.shimHost.error(s);
+        };
+        LanguageServiceShimHostAdapter.prototype.getProjectVersion = function () {
+            if (!this.shimHost.getProjectVersion) {
+                return undefined;
+            }
+            return this.shimHost.getProjectVersion();
+        };
+        LanguageServiceShimHostAdapter.prototype.getTypeRootsVersion = function () {
+            if (!this.shimHost.getTypeRootsVersion) {
+                return 0;
+            }
+            return this.shimHost.getTypeRootsVersion();
+        };
+        LanguageServiceShimHostAdapter.prototype.useCaseSensitiveFileNames = function () {
+            return this.shimHost.useCaseSensitiveFileNames ? this.shimHost.useCaseSensitiveFileNames() : false;
+        };
+        LanguageServiceShimHostAdapter.prototype.getCompilationSettings = function () {
+            var settingsJson = this.shimHost.getCompilationSettings();
+            if (settingsJson == null || settingsJson == "") {
+                throw Error("LanguageServiceShimHostAdapter.getCompilationSettings: empty compilationSettings");
+            }
+            return JSON.parse(settingsJson);
+        };
+        LanguageServiceShimHostAdapter.prototype.getScriptFileNames = function () {
+            var encoded = this.shimHost.getScriptFileNames();
+            return this.files = JSON.parse(encoded);
+        };
+        LanguageServiceShimHostAdapter.prototype.getScriptSnapshot = function (fileName) {
+            var scriptSnapshot = this.shimHost.getScriptSnapshot(fileName);
+            return scriptSnapshot && new ScriptSnapshotShimAdapter(scriptSnapshot);
+        };
+        LanguageServiceShimHostAdapter.prototype.getScriptKind = function (fileName) {
+            if ("getScriptKind" in this.shimHost) {
+                return this.shimHost.getScriptKind(fileName);
+            }
+            else {
+                return 0;
+            }
+        };
+        LanguageServiceShimHostAdapter.prototype.getScriptVersion = function (fileName) {
+            return this.shimHost.getScriptVersion(fileName);
+        };
+        LanguageServiceShimHostAdapter.prototype.getLocalizedDiagnosticMessages = function () {
+            var diagnosticMessagesJson = this.shimHost.getLocalizedDiagnosticMessages();
+            if (diagnosticMessagesJson == null || diagnosticMessagesJson == "") {
+                return null;
+            }
+            try {
+                return JSON.parse(diagnosticMessagesJson);
+            }
+            catch (e) {
+                this.log(e.description || "diagnosticMessages.generated.json has invalid JSON format");
+                return null;
+            }
+        };
+        LanguageServiceShimHostAdapter.prototype.getCancellationToken = function () {
+            var hostCancellationToken = this.shimHost.getCancellationToken();
+            return new ThrottledCancellationToken(hostCancellationToken);
+        };
+        LanguageServiceShimHostAdapter.prototype.getCurrentDirectory = function () {
+            return this.shimHost.getCurrentDirectory();
+        };
+        LanguageServiceShimHostAdapter.prototype.getDirectories = function (path) {
+            return JSON.parse(this.shimHost.getDirectories(path));
+        };
+        LanguageServiceShimHostAdapter.prototype.getDefaultLibFileName = function (options) {
+            return this.shimHost.getDefaultLibFileName(JSON.stringify(options));
+        };
+        LanguageServiceShimHostAdapter.prototype.readDirectory = function (path, extensions, exclude, include, depth) {
+            var pattern = ts.getFileMatcherPatterns(path, exclude, include, this.shimHost.useCaseSensitiveFileNames(), this.shimHost.getCurrentDirectory());
+            return JSON.parse(this.shimHost.readDirectory(path, JSON.stringify(extensions), JSON.stringify(pattern.basePaths), pattern.excludePattern, pattern.includeFilePattern, pattern.includeDirectoryPattern, depth));
+        };
+        LanguageServiceShimHostAdapter.prototype.readFile = function (path, encoding) {
+            return this.shimHost.readFile(path, encoding);
+        };
+        LanguageServiceShimHostAdapter.prototype.fileExists = function (path) {
+            return this.shimHost.fileExists(path);
+        };
+        return LanguageServiceShimHostAdapter;
+    }());
+    ts.LanguageServiceShimHostAdapter = LanguageServiceShimHostAdapter;
+    var ThrottledCancellationToken = (function () {
+        function ThrottledCancellationToken(hostCancellationToken) {
+            this.hostCancellationToken = hostCancellationToken;
+            this.lastCancellationCheckTime = 0;
+        }
+        ThrottledCancellationToken.prototype.isCancellationRequested = function () {
+            var time = ts.timestamp();
+            var duration = Math.abs(time - this.lastCancellationCheckTime);
+            if (duration > 10) {
+                this.lastCancellationCheckTime = time;
+                return this.hostCancellationToken.isCancellationRequested();
+            }
+            return false;
+        };
+        return ThrottledCancellationToken;
+    }());
+    var CoreServicesShimHostAdapter = (function () {
+        function CoreServicesShimHostAdapter(shimHost) {
+            var _this = this;
+            this.shimHost = shimHost;
+            this.useCaseSensitiveFileNames = this.shimHost.useCaseSensitiveFileNames ? this.shimHost.useCaseSensitiveFileNames() : false;
+            if ("directoryExists" in this.shimHost) {
+                this.directoryExists = function (directoryName) { return _this.shimHost.directoryExists(directoryName); };
+            }
+            if ("realpath" in this.shimHost) {
+                this.realpath = function (path) { return _this.shimHost.realpath(path); };
+            }
+        }
+        CoreServicesShimHostAdapter.prototype.readDirectory = function (rootDir, extensions, exclude, include, depth) {
+            try {
+                var pattern = ts.getFileMatcherPatterns(rootDir, exclude, include, this.shimHost.useCaseSensitiveFileNames(), this.shimHost.getCurrentDirectory());
+                return JSON.parse(this.shimHost.readDirectory(rootDir, JSON.stringify(extensions), JSON.stringify(pattern.basePaths), pattern.excludePattern, pattern.includeFilePattern, pattern.includeDirectoryPattern, depth));
+            }
+            catch (e) {
+                var results = [];
+                for (var _i = 0, extensions_2 = extensions; _i < extensions_2.length; _i++) {
+                    var extension = extensions_2[_i];
+                    for (var _a = 0, _b = this.readDirectoryFallback(rootDir, extension, exclude); _a < _b.length; _a++) {
+                        var file = _b[_a];
+                        if (!ts.contains(results, file)) {
+                            results.push(file);
+                        }
+                    }
+                }
+                return results;
+            }
+        };
+        CoreServicesShimHostAdapter.prototype.fileExists = function (fileName) {
+            return this.shimHost.fileExists(fileName);
+        };
+        CoreServicesShimHostAdapter.prototype.readFile = function (fileName) {
+            return this.shimHost.readFile(fileName);
+        };
+        CoreServicesShimHostAdapter.prototype.readDirectoryFallback = function (rootDir, extension, exclude) {
+            return JSON.parse(this.shimHost.readDirectory(rootDir, extension, JSON.stringify(exclude)));
+        };
+        CoreServicesShimHostAdapter.prototype.getDirectories = function (path) {
+            return JSON.parse(this.shimHost.getDirectories(path));
+        };
+        return CoreServicesShimHostAdapter;
+    }());
+    ts.CoreServicesShimHostAdapter = CoreServicesShimHostAdapter;
+    function simpleForwardCall(logger, actionDescription, action, logPerformance) {
+        var start;
+        if (logPerformance) {
+            logger.log(actionDescription);
+            start = ts.timestamp();
+        }
+        var result = action();
+        if (logPerformance) {
+            var end = ts.timestamp();
+            logger.log(actionDescription + " completed in " + (end - start) + " msec");
+            if (typeof result === "string") {
+                var str = result;
+                if (str.length > 128) {
+                    str = str.substring(0, 128) + "...";
+                }
+                logger.log("  result.length=" + str.length + ", result='" + JSON.stringify(str) + "'");
+            }
+        }
+        return result;
+    }
+    function forwardJSONCall(logger, actionDescription, action, logPerformance) {
+        return forwardCall(logger, actionDescription, true, action, logPerformance);
+    }
+    function forwardCall(logger, actionDescription, returnJson, action, logPerformance) {
+        try {
+            var result = simpleForwardCall(logger, actionDescription, action, logPerformance);
+            return returnJson ? JSON.stringify({ result: result }) : result;
+        }
+        catch (err) {
+            if (err instanceof ts.OperationCanceledException) {
+                return JSON.stringify({ canceled: true });
+            }
+            logInternalError(logger, err);
+            err.description = actionDescription;
+            return JSON.stringify({ error: err });
+        }
+    }
+    var ShimBase = (function () {
+        function ShimBase(factory) {
+            this.factory = factory;
+            factory.registerShim(this);
+        }
+        ShimBase.prototype.dispose = function (_dummy) {
+            this.factory.unregisterShim(this);
+        };
+        return ShimBase;
+    }());
+    function realizeDiagnostics(diagnostics, newLine) {
+        return diagnostics.map(function (d) { return realizeDiagnostic(d, newLine); });
+    }
+    ts.realizeDiagnostics = realizeDiagnostics;
+    function realizeDiagnostic(diagnostic, newLine) {
+        return {
+            message: ts.flattenDiagnosticMessageText(diagnostic.messageText, newLine),
+            start: diagnostic.start,
+            length: diagnostic.length,
+            category: ts.DiagnosticCategory[diagnostic.category].toLowerCase(),
+            code: diagnostic.code
+        };
+    }
+    var LanguageServiceShimObject = (function (_super) {
+        __extends(LanguageServiceShimObject, _super);
+        function LanguageServiceShimObject(factory, host, languageService) {
+            var _this = _super.call(this, factory) || this;
+            _this.host = host;
+            _this.languageService = languageService;
+            _this.logPerformance = false;
+            _this.logger = _this.host;
+            return _this;
+        }
+        LanguageServiceShimObject.prototype.forwardJSONCall = function (actionDescription, action) {
+            return forwardJSONCall(this.logger, actionDescription, action, this.logPerformance);
+        };
+        LanguageServiceShimObject.prototype.dispose = function (dummy) {
+            this.logger.log("dispose()");
+            this.languageService.dispose();
+            this.languageService = null;
+            if (debugObjectHost && debugObjectHost.CollectGarbage) {
+                debugObjectHost.CollectGarbage();
+                this.logger.log("CollectGarbage()");
+            }
+            this.logger = null;
+            _super.prototype.dispose.call(this, dummy);
+        };
+        LanguageServiceShimObject.prototype.refresh = function (throwOnError) {
+            this.forwardJSONCall("refresh(" + throwOnError + ")", function () { return null; });
+        };
+        LanguageServiceShimObject.prototype.cleanupSemanticCache = function () {
+            var _this = this;
+            this.forwardJSONCall("cleanupSemanticCache()", function () {
+                _this.languageService.cleanupSemanticCache();
+                return null;
+            });
+        };
+        LanguageServiceShimObject.prototype.realizeDiagnostics = function (diagnostics) {
+            var newLine = ts.getNewLineOrDefaultFromHost(this.host);
+            return ts.realizeDiagnostics(diagnostics, newLine);
+        };
+        LanguageServiceShimObject.prototype.getSyntacticClassifications = function (fileName, start, length) {
+            var _this = this;
+            return this.forwardJSONCall("getSyntacticClassifications('" + fileName + "', " + start + ", " + length + ")", function () { return _this.languageService.getSyntacticClassifications(fileName, ts.createTextSpan(start, length)); });
+        };
+        LanguageServiceShimObject.prototype.getSemanticClassifications = function (fileName, start, length) {
+            var _this = this;
+            return this.forwardJSONCall("getSemanticClassifications('" + fileName + "', " + start + ", " + length + ")", function () { return _this.languageService.getSemanticClassifications(fileName, ts.createTextSpan(start, length)); });
+        };
+        LanguageServiceShimObject.prototype.getEncodedSyntacticClassifications = function (fileName, start, length) {
+            var _this = this;
+            return this.forwardJSONCall("getEncodedSyntacticClassifications('" + fileName + "', " + start + ", " + length + ")", function () { return convertClassifications(_this.languageService.getEncodedSyntacticClassifications(fileName, ts.createTextSpan(start, length))); });
+        };
+        LanguageServiceShimObject.prototype.getEncodedSemanticClassifications = function (fileName, start, length) {
+            var _this = this;
+            return this.forwardJSONCall("getEncodedSemanticClassifications('" + fileName + "', " + start + ", " + length + ")", function () { return convertClassifications(_this.languageService.getEncodedSemanticClassifications(fileName, ts.createTextSpan(start, length))); });
+        };
+        LanguageServiceShimObject.prototype.getSyntacticDiagnostics = function (fileName) {
+            var _this = this;
+            return this.forwardJSONCall("getSyntacticDiagnostics('" + fileName + "')", function () {
+                var diagnostics = _this.languageService.getSyntacticDiagnostics(fileName);
+                return _this.realizeDiagnostics(diagnostics);
+            });
+        };
+        LanguageServiceShimObject.prototype.getSemanticDiagnostics = function (fileName) {
+            var _this = this;
+            return this.forwardJSONCall("getSemanticDiagnostics('" + fileName + "')", function () {
+                var diagnostics = _this.languageService.getSemanticDiagnostics(fileName);
+                return _this.realizeDiagnostics(diagnostics);
+            });
+        };
+        LanguageServiceShimObject.prototype.getCompilerOptionsDiagnostics = function () {
+            var _this = this;
+            return this.forwardJSONCall("getCompilerOptionsDiagnostics()", function () {
+                var diagnostics = _this.languageService.getCompilerOptionsDiagnostics();
+                return _this.realizeDiagnostics(diagnostics);
+            });
+        };
+        LanguageServiceShimObject.prototype.getQuickInfoAtPosition = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getQuickInfoAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getQuickInfoAtPosition(fileName, position); });
+        };
+        LanguageServiceShimObject.prototype.getNameOrDottedNameSpan = function (fileName, startPos, endPos) {
+            var _this = this;
+            return this.forwardJSONCall("getNameOrDottedNameSpan('" + fileName + "', " + startPos + ", " + endPos + ")", function () { return _this.languageService.getNameOrDottedNameSpan(fileName, startPos, endPos); });
+        };
+        LanguageServiceShimObject.prototype.getBreakpointStatementAtPosition = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getBreakpointStatementAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getBreakpointStatementAtPosition(fileName, position); });
+        };
+        LanguageServiceShimObject.prototype.getSignatureHelpItems = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getSignatureHelpItems('" + fileName + "', " + position + ")", function () { return _this.languageService.getSignatureHelpItems(fileName, position); });
+        };
+        LanguageServiceShimObject.prototype.getDefinitionAtPosition = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getDefinitionAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getDefinitionAtPosition(fileName, position); });
+        };
+        LanguageServiceShimObject.prototype.getTypeDefinitionAtPosition = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getTypeDefinitionAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getTypeDefinitionAtPosition(fileName, position); });
+        };
+        LanguageServiceShimObject.prototype.getImplementationAtPosition = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getImplementationAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getImplementationAtPosition(fileName, position); });
+        };
+        LanguageServiceShimObject.prototype.getRenameInfo = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getRenameInfo('" + fileName + "', " + position + ")", function () { return _this.languageService.getRenameInfo(fileName, position); });
+        };
+        LanguageServiceShimObject.prototype.findRenameLocations = function (fileName, position, findInStrings, findInComments) {
+            var _this = this;
+            return this.forwardJSONCall("findRenameLocations('" + fileName + "', " + position + ", " + findInStrings + ", " + findInComments + ")", function () { return _this.languageService.findRenameLocations(fileName, position, findInStrings, findInComments); });
+        };
+        LanguageServiceShimObject.prototype.getBraceMatchingAtPosition = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getBraceMatchingAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getBraceMatchingAtPosition(fileName, position); });
+        };
+        LanguageServiceShimObject.prototype.isValidBraceCompletionAtPosition = function (fileName, position, openingBrace) {
+            var _this = this;
+            return this.forwardJSONCall("isValidBraceCompletionAtPosition('" + fileName + "', " + position + ", " + openingBrace + ")", function () { return _this.languageService.isValidBraceCompletionAtPosition(fileName, position, openingBrace); });
+        };
+        LanguageServiceShimObject.prototype.getIndentationAtPosition = function (fileName, position, options) {
+            var _this = this;
+            return this.forwardJSONCall("getIndentationAtPosition('" + fileName + "', " + position + ")", function () {
+                var localOptions = JSON.parse(options);
+                return _this.languageService.getIndentationAtPosition(fileName, position, localOptions);
+            });
+        };
+        LanguageServiceShimObject.prototype.getReferencesAtPosition = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getReferencesAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getReferencesAtPosition(fileName, position); });
+        };
+        LanguageServiceShimObject.prototype.findReferences = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("findReferences('" + fileName + "', " + position + ")", function () { return _this.languageService.findReferences(fileName, position); });
+        };
+        LanguageServiceShimObject.prototype.getOccurrencesAtPosition = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getOccurrencesAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getOccurrencesAtPosition(fileName, position); });
+        };
+        LanguageServiceShimObject.prototype.getDocumentHighlights = function (fileName, position, filesToSearch) {
+            var _this = this;
+            return this.forwardJSONCall("getDocumentHighlights('" + fileName + "', " + position + ")", function () {
+                var results = _this.languageService.getDocumentHighlights(fileName, position, JSON.parse(filesToSearch));
+                var normalizedName = ts.normalizeSlashes(fileName).toLowerCase();
+                return ts.filter(results, function (r) { return ts.normalizeSlashes(r.fileName).toLowerCase() === normalizedName; });
+            });
+        };
+        LanguageServiceShimObject.prototype.getCompletionsAtPosition = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getCompletionsAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getCompletionsAtPosition(fileName, position); });
+        };
+        LanguageServiceShimObject.prototype.getCompletionEntryDetails = function (fileName, position, entryName) {
+            var _this = this;
+            return this.forwardJSONCall("getCompletionEntryDetails('" + fileName + "', " + position + ", '" + entryName + "')", function () { return _this.languageService.getCompletionEntryDetails(fileName, position, entryName); });
+        };
+        LanguageServiceShimObject.prototype.getFormattingEditsForRange = function (fileName, start, end, options) {
+            var _this = this;
+            return this.forwardJSONCall("getFormattingEditsForRange('" + fileName + "', " + start + ", " + end + ")", function () {
+                var localOptions = JSON.parse(options);
+                return _this.languageService.getFormattingEditsForRange(fileName, start, end, localOptions);
+            });
+        };
+        LanguageServiceShimObject.prototype.getFormattingEditsForDocument = function (fileName, options) {
+            var _this = this;
+            return this.forwardJSONCall("getFormattingEditsForDocument('" + fileName + "')", function () {
+                var localOptions = JSON.parse(options);
+                return _this.languageService.getFormattingEditsForDocument(fileName, localOptions);
+            });
+        };
+        LanguageServiceShimObject.prototype.getFormattingEditsAfterKeystroke = function (fileName, position, key, options) {
+            var _this = this;
+            return this.forwardJSONCall("getFormattingEditsAfterKeystroke('" + fileName + "', " + position + ", '" + key + "')", function () {
+                var localOptions = JSON.parse(options);
+                return _this.languageService.getFormattingEditsAfterKeystroke(fileName, position, key, localOptions);
+            });
+        };
+        LanguageServiceShimObject.prototype.getDocCommentTemplateAtPosition = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getDocCommentTemplateAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getDocCommentTemplateAtPosition(fileName, position); });
+        };
+        LanguageServiceShimObject.prototype.getNavigateToItems = function (searchValue, maxResultCount, fileName) {
+            var _this = this;
+            return this.forwardJSONCall("getNavigateToItems('" + searchValue + "', " + maxResultCount + ", " + fileName + ")", function () { return _this.languageService.getNavigateToItems(searchValue, maxResultCount, fileName); });
+        };
+        LanguageServiceShimObject.prototype.getNavigationBarItems = function (fileName) {
+            var _this = this;
+            return this.forwardJSONCall("getNavigationBarItems('" + fileName + "')", function () { return _this.languageService.getNavigationBarItems(fileName); });
+        };
+        LanguageServiceShimObject.prototype.getNavigationTree = function (fileName) {
+            var _this = this;
+            return this.forwardJSONCall("getNavigationTree('" + fileName + "')", function () { return _this.languageService.getNavigationTree(fileName); });
+        };
+        LanguageServiceShimObject.prototype.getOutliningSpans = function (fileName) {
+            var _this = this;
+            return this.forwardJSONCall("getOutliningSpans('" + fileName + "')", function () { return _this.languageService.getOutliningSpans(fileName); });
+        };
+        LanguageServiceShimObject.prototype.getTodoComments = function (fileName, descriptors) {
+            var _this = this;
+            return this.forwardJSONCall("getTodoComments('" + fileName + "')", function () { return _this.languageService.getTodoComments(fileName, JSON.parse(descriptors)); });
+        };
+        LanguageServiceShimObject.prototype.getEmitOutput = function (fileName) {
+            var _this = this;
+            return this.forwardJSONCall("getEmitOutput('" + fileName + "')", function () { return _this.languageService.getEmitOutput(fileName); });
+        };
+        LanguageServiceShimObject.prototype.getEmitOutputObject = function (fileName) {
+            var _this = this;
+            return forwardCall(this.logger, "getEmitOutput('" + fileName + "')", false, function () { return _this.languageService.getEmitOutput(fileName); }, this.logPerformance);
+        };
+        return LanguageServiceShimObject;
+    }(ShimBase));
+    function convertClassifications(classifications) {
+        return { spans: classifications.spans.join(","), endOfLineState: classifications.endOfLineState };
+    }
+    var ClassifierShimObject = (function (_super) {
+        __extends(ClassifierShimObject, _super);
+        function ClassifierShimObject(factory, logger) {
+            var _this = _super.call(this, factory) || this;
+            _this.logger = logger;
+            _this.logPerformance = false;
+            _this.classifier = ts.createClassifier();
+            return _this;
+        }
+        ClassifierShimObject.prototype.getEncodedLexicalClassifications = function (text, lexState, syntacticClassifierAbsent) {
+            var _this = this;
+            return forwardJSONCall(this.logger, "getEncodedLexicalClassifications", function () { return convertClassifications(_this.classifier.getEncodedLexicalClassifications(text, lexState, syntacticClassifierAbsent)); }, this.logPerformance);
+        };
+        ClassifierShimObject.prototype.getClassificationsForLine = function (text, lexState, classifyKeywordsInGenerics) {
+            var classification = this.classifier.getClassificationsForLine(text, lexState, classifyKeywordsInGenerics);
+            var result = "";
+            for (var _i = 0, _a = classification.entries; _i < _a.length; _i++) {
+                var item = _a[_i];
+                result += item.length + "\n";
+                result += item.classification + "\n";
+            }
+            result += classification.finalLexState;
+            return result;
+        };
+        return ClassifierShimObject;
+    }(ShimBase));
+    var CoreServicesShimObject = (function (_super) {
+        __extends(CoreServicesShimObject, _super);
+        function CoreServicesShimObject(factory, logger, host) {
+            var _this = _super.call(this, factory) || this;
+            _this.logger = logger;
+            _this.host = host;
+            _this.logPerformance = false;
+            return _this;
+        }
+        CoreServicesShimObject.prototype.forwardJSONCall = function (actionDescription, action) {
+            return forwardJSONCall(this.logger, actionDescription, action, this.logPerformance);
+        };
+        CoreServicesShimObject.prototype.resolveModuleName = function (fileName, moduleName, compilerOptionsJson) {
+            var _this = this;
+            return this.forwardJSONCall("resolveModuleName('" + fileName + "')", function () {
+                var compilerOptions = JSON.parse(compilerOptionsJson);
+                var result = ts.resolveModuleName(moduleName, ts.normalizeSlashes(fileName), compilerOptions, _this.host);
+                var resolvedFileName = result.resolvedModule ? result.resolvedModule.resolvedFileName : undefined;
+                if (resolvedFileName && !compilerOptions.allowJs && ts.fileExtensionIs(resolvedFileName, ".js")) {
+                    return {
+                        resolvedFileName: undefined,
+                        failedLookupLocations: []
+                    };
+                }
+                return {
+                    resolvedFileName: resolvedFileName,
+                    failedLookupLocations: result.failedLookupLocations
+                };
+            });
+        };
+        CoreServicesShimObject.prototype.resolveTypeReferenceDirective = function (fileName, typeReferenceDirective, compilerOptionsJson) {
+            var _this = this;
+            return this.forwardJSONCall("resolveTypeReferenceDirective(" + fileName + ")", function () {
+                var compilerOptions = JSON.parse(compilerOptionsJson);
+                var result = ts.resolveTypeReferenceDirective(typeReferenceDirective, ts.normalizeSlashes(fileName), compilerOptions, _this.host);
+                return {
+                    resolvedFileName: result.resolvedTypeReferenceDirective ? result.resolvedTypeReferenceDirective.resolvedFileName : undefined,
+                    primary: result.resolvedTypeReferenceDirective ? result.resolvedTypeReferenceDirective.primary : true,
+                    failedLookupLocations: result.failedLookupLocations
+                };
+            });
+        };
+        CoreServicesShimObject.prototype.getPreProcessedFileInfo = function (fileName, sourceTextSnapshot) {
+            var _this = this;
+            return this.forwardJSONCall("getPreProcessedFileInfo('" + fileName + "')", function () {
+                var result = ts.preProcessFile(sourceTextSnapshot.getText(0, sourceTextSnapshot.getLength()), true, true);
+                return {
+                    referencedFiles: _this.convertFileReferences(result.referencedFiles),
+                    importedFiles: _this.convertFileReferences(result.importedFiles),
+                    ambientExternalModules: result.ambientExternalModules,
+                    isLibFile: result.isLibFile,
+                    typeReferenceDirectives: _this.convertFileReferences(result.typeReferenceDirectives)
+                };
+            });
+        };
+        CoreServicesShimObject.prototype.getAutomaticTypeDirectiveNames = function (compilerOptionsJson) {
+            var _this = this;
+            return this.forwardJSONCall("getAutomaticTypeDirectiveNames('" + compilerOptionsJson + "')", function () {
+                var compilerOptions = JSON.parse(compilerOptionsJson);
+                return ts.getAutomaticTypeDirectiveNames(compilerOptions, _this.host);
+            });
+        };
+        CoreServicesShimObject.prototype.convertFileReferences = function (refs) {
+            if (!refs) {
+                return undefined;
+            }
+            var result = [];
+            for (var _i = 0, refs_2 = refs; _i < refs_2.length; _i++) {
+                var ref = refs_2[_i];
+                result.push({
+                    path: ts.normalizeSlashes(ref.fileName),
+                    position: ref.pos,
+                    length: ref.end - ref.pos
+                });
+            }
+            return result;
+        };
+        CoreServicesShimObject.prototype.getTSConfigFileInfo = function (fileName, sourceTextSnapshot) {
+            var _this = this;
+            return this.forwardJSONCall("getTSConfigFileInfo('" + fileName + "')", function () {
+                var text = sourceTextSnapshot.getText(0, sourceTextSnapshot.getLength());
+                var result = ts.parseConfigFileTextToJson(fileName, text);
+                if (result.error) {
+                    return {
+                        options: {},
+                        typingOptions: {},
+                        files: [],
+                        raw: {},
+                        errors: [realizeDiagnostic(result.error, "\r\n")]
+                    };
+                }
+                var normalizedFileName = ts.normalizeSlashes(fileName);
+                var configFile = ts.parseJsonConfigFileContent(result.config, _this.host, ts.getDirectoryPath(normalizedFileName), {}, normalizedFileName);
+                return {
+                    options: configFile.options,
+                    typingOptions: configFile.typingOptions,
+                    files: configFile.fileNames,
+                    raw: configFile.raw,
+                    errors: realizeDiagnostics(configFile.errors, "\r\n")
+                };
+            });
+        };
+        CoreServicesShimObject.prototype.getDefaultCompilationSettings = function () {
+            return this.forwardJSONCall("getDefaultCompilationSettings()", function () { return ts.getDefaultCompilerOptions(); });
+        };
+        CoreServicesShimObject.prototype.discoverTypings = function (discoverTypingsJson) {
+            var _this = this;
+            var getCanonicalFileName = ts.createGetCanonicalFileName(false);
+            return this.forwardJSONCall("discoverTypings()", function () {
+                var info = JSON.parse(discoverTypingsJson);
+                return ts.JsTyping.discoverTypings(_this.host, info.fileNames, ts.toPath(info.projectRootPath, info.projectRootPath, getCanonicalFileName), ts.toPath(info.safeListPath, info.safeListPath, getCanonicalFileName), info.packageNameToTypingLocation, info.typingOptions, info.unresolvedImports);
+            });
+        };
+        return CoreServicesShimObject;
+    }(ShimBase));
+    var TypeScriptServicesFactory = (function () {
+        function TypeScriptServicesFactory() {
+            this._shims = [];
+        }
+        TypeScriptServicesFactory.prototype.getServicesVersion = function () {
+            return ts.servicesVersion;
+        };
+        TypeScriptServicesFactory.prototype.createLanguageServiceShim = function (host) {
+            try {
+                if (this.documentRegistry === undefined) {
+                    this.documentRegistry = ts.createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames(), host.getCurrentDirectory());
+                }
+                var hostAdapter = new LanguageServiceShimHostAdapter(host);
+                var languageService = ts.createLanguageService(hostAdapter, this.documentRegistry);
+                return new LanguageServiceShimObject(this, host, languageService);
+            }
+            catch (err) {
+                logInternalError(host, err);
+                throw err;
+            }
+        };
+        TypeScriptServicesFactory.prototype.createClassifierShim = function (logger) {
+            try {
+                return new ClassifierShimObject(this, logger);
+            }
+            catch (err) {
+                logInternalError(logger, err);
+                throw err;
+            }
+        };
+        TypeScriptServicesFactory.prototype.createCoreServicesShim = function (host) {
+            try {
+                var adapter = new CoreServicesShimHostAdapter(host);
+                return new CoreServicesShimObject(this, host, adapter);
+            }
+            catch (err) {
+                logInternalError(host, err);
+                throw err;
+            }
+        };
+        TypeScriptServicesFactory.prototype.close = function () {
+            this._shims = [];
+            this.documentRegistry = undefined;
+        };
+        TypeScriptServicesFactory.prototype.registerShim = function (shim) {
+            this._shims.push(shim);
+        };
+        TypeScriptServicesFactory.prototype.unregisterShim = function (shim) {
+            for (var i = 0, n = this._shims.length; i < n; i++) {
+                if (this._shims[i] === shim) {
+                    delete this._shims[i];
+                    return;
+                }
+            }
+            throw new Error("Invalid operation");
+        };
+        return TypeScriptServicesFactory;
+    }());
+    ts.TypeScriptServicesFactory = TypeScriptServicesFactory;
+    if (typeof module !== "undefined" && module.exports) {
+        module.exports = ts;
+    }
+})(ts || (ts = {}));
+var TypeScript;
+(function (TypeScript) {
+    var Services;
+    (function (Services) {
+        Services.TypeScriptServicesFactory = ts.TypeScriptServicesFactory;
+    })(Services = TypeScript.Services || (TypeScript.Services = {}));
+})(TypeScript || (TypeScript = {}));
+var toolsVersion = "2.2";
diff --git a/lib/typescript.d.ts b/lib/typescript.d.ts
index ba46bcf1540..9f1423683eb 100644
--- a/lib/typescript.d.ts
+++ b/lib/typescript.d.ts
@@ -163,170 +163,177 @@ declare namespace ts {
         DeclareKeyword = 123,
         GetKeyword = 124,
         IsKeyword = 125,
-        ModuleKeyword = 126,
-        NamespaceKeyword = 127,
-        NeverKeyword = 128,
-        ReadonlyKeyword = 129,
-        RequireKeyword = 130,
-        NumberKeyword = 131,
-        SetKeyword = 132,
-        StringKeyword = 133,
-        SymbolKeyword = 134,
-        TypeKeyword = 135,
-        UndefinedKeyword = 136,
-        FromKeyword = 137,
-        GlobalKeyword = 138,
-        OfKeyword = 139,
-        QualifiedName = 140,
-        ComputedPropertyName = 141,
-        TypeParameter = 142,
-        Parameter = 143,
-        Decorator = 144,
-        PropertySignature = 145,
-        PropertyDeclaration = 146,
-        MethodSignature = 147,
-        MethodDeclaration = 148,
-        Constructor = 149,
-        GetAccessor = 150,
-        SetAccessor = 151,
-        CallSignature = 152,
-        ConstructSignature = 153,
-        IndexSignature = 154,
-        TypePredicate = 155,
-        TypeReference = 156,
-        FunctionType = 157,
-        ConstructorType = 158,
-        TypeQuery = 159,
-        TypeLiteral = 160,
-        ArrayType = 161,
-        TupleType = 162,
-        UnionType = 163,
-        IntersectionType = 164,
-        ParenthesizedType = 165,
-        ThisType = 166,
-        LiteralType = 167,
-        ObjectBindingPattern = 168,
-        ArrayBindingPattern = 169,
-        BindingElement = 170,
-        ArrayLiteralExpression = 171,
-        ObjectLiteralExpression = 172,
-        PropertyAccessExpression = 173,
-        ElementAccessExpression = 174,
-        CallExpression = 175,
-        NewExpression = 176,
-        TaggedTemplateExpression = 177,
-        TypeAssertionExpression = 178,
-        ParenthesizedExpression = 179,
-        FunctionExpression = 180,
-        ArrowFunction = 181,
-        DeleteExpression = 182,
-        TypeOfExpression = 183,
-        VoidExpression = 184,
-        AwaitExpression = 185,
-        PrefixUnaryExpression = 186,
-        PostfixUnaryExpression = 187,
-        BinaryExpression = 188,
-        ConditionalExpression = 189,
-        TemplateExpression = 190,
-        YieldExpression = 191,
-        SpreadElementExpression = 192,
-        ClassExpression = 193,
-        OmittedExpression = 194,
-        ExpressionWithTypeArguments = 195,
-        AsExpression = 196,
-        NonNullExpression = 197,
-        TemplateSpan = 198,
-        SemicolonClassElement = 199,
-        Block = 200,
-        VariableStatement = 201,
-        EmptyStatement = 202,
-        ExpressionStatement = 203,
-        IfStatement = 204,
-        DoStatement = 205,
-        WhileStatement = 206,
-        ForStatement = 207,
-        ForInStatement = 208,
-        ForOfStatement = 209,
-        ContinueStatement = 210,
-        BreakStatement = 211,
-        ReturnStatement = 212,
-        WithStatement = 213,
-        SwitchStatement = 214,
-        LabeledStatement = 215,
-        ThrowStatement = 216,
-        TryStatement = 217,
-        DebuggerStatement = 218,
-        VariableDeclaration = 219,
-        VariableDeclarationList = 220,
-        FunctionDeclaration = 221,
-        ClassDeclaration = 222,
-        InterfaceDeclaration = 223,
-        TypeAliasDeclaration = 224,
-        EnumDeclaration = 225,
-        ModuleDeclaration = 226,
-        ModuleBlock = 227,
-        CaseBlock = 228,
-        NamespaceExportDeclaration = 229,
-        ImportEqualsDeclaration = 230,
-        ImportDeclaration = 231,
-        ImportClause = 232,
-        NamespaceImport = 233,
-        NamedImports = 234,
-        ImportSpecifier = 235,
-        ExportAssignment = 236,
-        ExportDeclaration = 237,
-        NamedExports = 238,
-        ExportSpecifier = 239,
-        MissingDeclaration = 240,
-        ExternalModuleReference = 241,
-        JsxElement = 242,
-        JsxSelfClosingElement = 243,
-        JsxOpeningElement = 244,
-        JsxClosingElement = 245,
-        JsxAttribute = 246,
-        JsxSpreadAttribute = 247,
-        JsxExpression = 248,
-        CaseClause = 249,
-        DefaultClause = 250,
-        HeritageClause = 251,
-        CatchClause = 252,
-        PropertyAssignment = 253,
-        ShorthandPropertyAssignment = 254,
-        EnumMember = 255,
-        SourceFile = 256,
-        JSDocTypeExpression = 257,
-        JSDocAllType = 258,
-        JSDocUnknownType = 259,
-        JSDocArrayType = 260,
-        JSDocUnionType = 261,
-        JSDocTupleType = 262,
-        JSDocNullableType = 263,
-        JSDocNonNullableType = 264,
-        JSDocRecordType = 265,
-        JSDocRecordMember = 266,
-        JSDocTypeReference = 267,
-        JSDocOptionalType = 268,
-        JSDocFunctionType = 269,
-        JSDocVariadicType = 270,
-        JSDocConstructorType = 271,
-        JSDocThisType = 272,
-        JSDocComment = 273,
-        JSDocTag = 274,
-        JSDocParameterTag = 275,
-        JSDocReturnTag = 276,
-        JSDocTypeTag = 277,
-        JSDocTemplateTag = 278,
-        JSDocTypedefTag = 279,
-        JSDocPropertyTag = 280,
-        JSDocTypeLiteral = 281,
-        JSDocLiteralType = 282,
-        JSDocNullKeyword = 283,
-        JSDocUndefinedKeyword = 284,
-        JSDocNeverKeyword = 285,
-        SyntaxList = 286,
-        NotEmittedStatement = 287,
-        PartiallyEmittedExpression = 288,
-        Count = 289,
+        KeyOfKeyword = 126,
+        ModuleKeyword = 127,
+        NamespaceKeyword = 128,
+        NeverKeyword = 129,
+        ReadonlyKeyword = 130,
+        RequireKeyword = 131,
+        NumberKeyword = 132,
+        SetKeyword = 133,
+        StringKeyword = 134,
+        SymbolKeyword = 135,
+        TypeKeyword = 136,
+        UndefinedKeyword = 137,
+        FromKeyword = 138,
+        GlobalKeyword = 139,
+        OfKeyword = 140,
+        QualifiedName = 141,
+        ComputedPropertyName = 142,
+        TypeParameter = 143,
+        Parameter = 144,
+        Decorator = 145,
+        PropertySignature = 146,
+        PropertyDeclaration = 147,
+        MethodSignature = 148,
+        MethodDeclaration = 149,
+        Constructor = 150,
+        GetAccessor = 151,
+        SetAccessor = 152,
+        CallSignature = 153,
+        ConstructSignature = 154,
+        IndexSignature = 155,
+        TypePredicate = 156,
+        TypeReference = 157,
+        FunctionType = 158,
+        ConstructorType = 159,
+        TypeQuery = 160,
+        TypeLiteral = 161,
+        ArrayType = 162,
+        TupleType = 163,
+        UnionType = 164,
+        IntersectionType = 165,
+        ParenthesizedType = 166,
+        ThisType = 167,
+        TypeOperator = 168,
+        IndexedAccessType = 169,
+        MappedType = 170,
+        LiteralType = 171,
+        ObjectBindingPattern = 172,
+        ArrayBindingPattern = 173,
+        BindingElement = 174,
+        ArrayLiteralExpression = 175,
+        ObjectLiteralExpression = 176,
+        PropertyAccessExpression = 177,
+        ElementAccessExpression = 178,
+        CallExpression = 179,
+        NewExpression = 180,
+        TaggedTemplateExpression = 181,
+        TypeAssertionExpression = 182,
+        ParenthesizedExpression = 183,
+        FunctionExpression = 184,
+        ArrowFunction = 185,
+        DeleteExpression = 186,
+        TypeOfExpression = 187,
+        VoidExpression = 188,
+        AwaitExpression = 189,
+        PrefixUnaryExpression = 190,
+        PostfixUnaryExpression = 191,
+        BinaryExpression = 192,
+        ConditionalExpression = 193,
+        TemplateExpression = 194,
+        YieldExpression = 195,
+        SpreadElement = 196,
+        ClassExpression = 197,
+        OmittedExpression = 198,
+        ExpressionWithTypeArguments = 199,
+        AsExpression = 200,
+        NonNullExpression = 201,
+        TemplateSpan = 202,
+        SemicolonClassElement = 203,
+        Block = 204,
+        VariableStatement = 205,
+        EmptyStatement = 206,
+        ExpressionStatement = 207,
+        IfStatement = 208,
+        DoStatement = 209,
+        WhileStatement = 210,
+        ForStatement = 211,
+        ForInStatement = 212,
+        ForOfStatement = 213,
+        ContinueStatement = 214,
+        BreakStatement = 215,
+        ReturnStatement = 216,
+        WithStatement = 217,
+        SwitchStatement = 218,
+        LabeledStatement = 219,
+        ThrowStatement = 220,
+        TryStatement = 221,
+        DebuggerStatement = 222,
+        VariableDeclaration = 223,
+        VariableDeclarationList = 224,
+        FunctionDeclaration = 225,
+        ClassDeclaration = 226,
+        InterfaceDeclaration = 227,
+        TypeAliasDeclaration = 228,
+        EnumDeclaration = 229,
+        ModuleDeclaration = 230,
+        ModuleBlock = 231,
+        CaseBlock = 232,
+        NamespaceExportDeclaration = 233,
+        ImportEqualsDeclaration = 234,
+        ImportDeclaration = 235,
+        ImportClause = 236,
+        NamespaceImport = 237,
+        NamedImports = 238,
+        ImportSpecifier = 239,
+        ExportAssignment = 240,
+        ExportDeclaration = 241,
+        NamedExports = 242,
+        ExportSpecifier = 243,
+        MissingDeclaration = 244,
+        ExternalModuleReference = 245,
+        JsxElement = 246,
+        JsxSelfClosingElement = 247,
+        JsxOpeningElement = 248,
+        JsxClosingElement = 249,
+        JsxAttribute = 250,
+        JsxSpreadAttribute = 251,
+        JsxExpression = 252,
+        CaseClause = 253,
+        DefaultClause = 254,
+        HeritageClause = 255,
+        CatchClause = 256,
+        PropertyAssignment = 257,
+        ShorthandPropertyAssignment = 258,
+        SpreadAssignment = 259,
+        EnumMember = 260,
+        SourceFile = 261,
+        JSDocTypeExpression = 262,
+        JSDocAllType = 263,
+        JSDocUnknownType = 264,
+        JSDocArrayType = 265,
+        JSDocUnionType = 266,
+        JSDocTupleType = 267,
+        JSDocNullableType = 268,
+        JSDocNonNullableType = 269,
+        JSDocRecordType = 270,
+        JSDocRecordMember = 271,
+        JSDocTypeReference = 272,
+        JSDocOptionalType = 273,
+        JSDocFunctionType = 274,
+        JSDocVariadicType = 275,
+        JSDocConstructorType = 276,
+        JSDocThisType = 277,
+        JSDocComment = 278,
+        JSDocTag = 279,
+        JSDocParameterTag = 280,
+        JSDocReturnTag = 281,
+        JSDocTypeTag = 282,
+        JSDocTemplateTag = 283,
+        JSDocTypedefTag = 284,
+        JSDocPropertyTag = 285,
+        JSDocTypeLiteral = 286,
+        JSDocLiteralType = 287,
+        JSDocNullKeyword = 288,
+        JSDocUndefinedKeyword = 289,
+        JSDocNeverKeyword = 290,
+        SyntaxList = 291,
+        NotEmittedStatement = 292,
+        PartiallyEmittedExpression = 293,
+        MergeDeclarationMarker = 294,
+        EndOfDeclarationMarker = 295,
+        Count = 296,
         FirstAssignment = 57,
         LastAssignment = 69,
         FirstCompoundAssignment = 58,
@@ -334,15 +341,15 @@ declare namespace ts {
         FirstReservedWord = 71,
         LastReservedWord = 106,
         FirstKeyword = 71,
-        LastKeyword = 139,
+        LastKeyword = 140,
         FirstFutureReservedWord = 107,
         LastFutureReservedWord = 115,
-        FirstTypeNode = 155,
-        LastTypeNode = 167,
+        FirstTypeNode = 156,
+        LastTypeNode = 171,
         FirstPunctuation = 16,
         LastPunctuation = 69,
         FirstToken = 0,
-        LastToken = 139,
+        LastToken = 140,
         FirstTriviaToken = 2,
         LastTriviaToken = 7,
         FirstLiteralToken = 8,
@@ -351,11 +358,11 @@ declare namespace ts {
         LastTemplateToken = 15,
         FirstBinaryOperator = 26,
         LastBinaryOperator = 69,
-        FirstNode = 140,
-        FirstJSDocNode = 257,
-        LastJSDocNode = 282,
-        FirstJSDocTagNode = 273,
-        LastJSDocTagNode = 285,
+        FirstNode = 141,
+        FirstJSDocNode = 262,
+        LastJSDocNode = 287,
+        FirstJSDocTagNode = 278,
+        LastJSDocTagNode = 290,
     }
     enum NodeFlags {
         None = 0,
@@ -373,21 +380,22 @@ declare namespace ts {
         HasDecorators = 2048,
         HasParamDecorators = 4096,
         HasAsyncFunctions = 8192,
-        HasJsxSpreadAttributes = 16384,
-        DisallowInContext = 32768,
-        YieldContext = 65536,
-        DecoratorContext = 131072,
-        AwaitContext = 262144,
-        ThisNodeHasError = 524288,
-        JavaScriptFile = 1048576,
-        ThisNodeOrAnySubNodesHasError = 2097152,
-        HasAggregatedChildData = 4194304,
+        HasSpreadAttribute = 16384,
+        HasRestAttribute = 32768,
+        DisallowInContext = 65536,
+        YieldContext = 131072,
+        DecoratorContext = 262144,
+        AwaitContext = 524288,
+        ThisNodeHasError = 1048576,
+        JavaScriptFile = 2097152,
+        ThisNodeOrAnySubNodesHasError = 4194304,
+        HasAggregatedChildData = 8388608,
         BlockScoped = 3,
         ReachabilityCheckFlags = 384,
-        EmitHelperFlags = 31744,
-        ReachabilityAndEmitFlags = 32128,
-        ContextFlags = 1540096,
-        TypeExcludesFlags = 327680,
+        EmitHelperFlags = 64512,
+        ReachabilityAndEmitFlags = 64896,
+        ContextFlags = 3080192,
+        TypeExcludesFlags = 655360,
     }
     enum ModifierFlags {
         None = 0,
@@ -407,6 +415,7 @@ declare namespace ts {
         ParameterPropertyModifier = 92,
         NonPublicAccessibilityModifier = 24,
         TypeScriptModifier = 2270,
+        ExportDefault = 513,
     }
     enum JsxFlags {
         None = 0,
@@ -437,12 +446,14 @@ declare namespace ts {
     type EqualsGreaterThanToken = Token<SyntaxKind.EqualsGreaterThanToken>;
     type EndOfFileToken = Token<SyntaxKind.EndOfFileToken>;
     type AtToken = Token<SyntaxKind.AtToken>;
+    type ReadonlyToken = Token<SyntaxKind.ReadonlyKeyword>;
     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 {
         kind: SyntaxKind.Identifier;
         text: string;
         originalKeywordKind?: SyntaxKind;
+        isInJSDocNamespace?: boolean;
     }
     interface TransientIdentifier extends Identifier {
         resolvedSymbol: Symbol;
@@ -533,7 +544,7 @@ declare namespace ts {
         _objectLiteralBrandBrand: any;
         name?: PropertyName;
     }
-    type ObjectLiteralElementLike = PropertyAssignment | ShorthandPropertyAssignment | MethodDeclaration | AccessorDeclaration;
+    type ObjectLiteralElementLike = PropertyAssignment | ShorthandPropertyAssignment | MethodDeclaration | AccessorDeclaration | SpreadAssignment;
     interface PropertyAssignment extends ObjectLiteralElement {
         kind: SyntaxKind.PropertyAssignment;
         name: PropertyName;
@@ -547,6 +558,10 @@ declare namespace ts {
         equalsToken?: Token<SyntaxKind.EqualsToken>;
         objectAssignmentInitializer?: Expression;
     }
+    interface SpreadAssignment extends ObjectLiteralElement {
+        kind: SyntaxKind.SpreadAssignment;
+        expression: Expression;
+    }
     interface VariableLikeDeclaration extends Declaration {
         propertyName?: PropertyName;
         dotDotDotToken?: DotDotDotToken;
@@ -677,6 +692,23 @@ declare namespace ts {
         kind: SyntaxKind.ParenthesizedType;
         type: TypeNode;
     }
+    interface TypeOperatorNode extends TypeNode {
+        kind: SyntaxKind.TypeOperator;
+        operator: SyntaxKind.KeyOfKeyword;
+        type: TypeNode;
+    }
+    interface IndexedAccessTypeNode extends TypeNode {
+        kind: SyntaxKind.IndexedAccessType;
+        objectType: TypeNode;
+        indexType: TypeNode;
+    }
+    interface MappedTypeNode extends TypeNode, Declaration {
+        kind: SyntaxKind.MappedType;
+        readonlyToken?: ReadonlyToken;
+        typeParameter: TypeParameterDeclaration;
+        questionToken?: QuestionToken;
+        type?: TypeNode;
+    }
     interface LiteralTypeNode extends TypeNode {
         kind: SyntaxKind.LiteralType;
         literal: Expression;
@@ -709,9 +741,6 @@ declare namespace ts {
         operand: LeftHandSideExpression;
         operator: PostfixUnaryOperator;
     }
-    interface PostfixExpression extends UnaryExpression {
-        _postfixExpressionBrand: any;
-    }
     interface LeftHandSideExpression extends IncrementExpression {
         _leftHandSideExpressionBrand: any;
     }
@@ -780,6 +809,17 @@ declare namespace ts {
         operatorToken: BinaryOperatorToken;
         right: Expression;
     }
+    interface AssignmentExpression extends BinaryExpression {
+        left: LeftHandSideExpression;
+        operatorToken: Token<SyntaxKind.EqualsToken>;
+    }
+    interface ObjectDestructuringAssignment extends AssignmentExpression {
+        left: ObjectLiteralExpression;
+    }
+    interface ArrayDestructuringAssignment extends AssignmentExpression {
+        left: ArrayLiteralExpression;
+    }
+    type DestructuringAssignment = ObjectDestructuringAssignment | ArrayDestructuringAssignment;
     interface ConditionalExpression extends Expression {
         kind: SyntaxKind.ConditionalExpression;
         condition: Expression;
@@ -846,8 +886,8 @@ declare namespace ts {
         kind: SyntaxKind.ArrayLiteralExpression;
         elements: NodeArray<Expression>;
     }
-    interface SpreadElementExpression extends Expression {
-        kind: SyntaxKind.SpreadElementExpression;
+    interface SpreadElement extends Expression {
+        kind: SyntaxKind.SpreadElement;
         expression: Expression;
     }
     /**
@@ -1141,12 +1181,16 @@ declare namespace ts {
     interface ModuleDeclaration extends DeclarationStatement {
         kind: SyntaxKind.ModuleDeclaration;
         name: Identifier | LiteralExpression;
-        body?: ModuleBlock | NamespaceDeclaration;
+        body?: ModuleBlock | NamespaceDeclaration | JSDocNamespaceDeclaration | Identifier;
     }
     interface NamespaceDeclaration extends ModuleDeclaration {
         name: Identifier;
         body: ModuleBlock | NamespaceDeclaration;
     }
+    interface JSDocNamespaceDeclaration extends ModuleDeclaration {
+        name: Identifier;
+        body: JSDocNamespaceDeclaration | Identifier;
+    }
     interface ModuleBlock extends Node, Statement {
         kind: SyntaxKind.ModuleBlock;
         statements: NodeArray<Statement>;
@@ -1318,6 +1362,7 @@ declare namespace ts {
     }
     interface JSDocTypedefTag extends JSDocTag, Declaration {
         kind: SyntaxKind.JSDocTypedefTag;
+        fullName?: JSDocNamespaceDeclaration | Identifier;
         name?: Identifier;
         typeExpression?: JSDocTypeExpression;
         jsDocTypeLiteral?: JSDocTypeLiteral;
@@ -1708,14 +1753,11 @@ declare namespace ts {
         Null = 4096,
         Never = 8192,
         TypeParameter = 16384,
-        Class = 32768,
-        Interface = 65536,
-        Reference = 131072,
-        Tuple = 262144,
-        Union = 524288,
-        Intersection = 1048576,
-        Anonymous = 2097152,
-        Instantiated = 4194304,
+        Object = 32768,
+        Union = 65536,
+        Intersection = 131072,
+        Index = 262144,
+        IndexedAccess = 524288,
         Literal = 480,
         StringOrNumberLiteral = 96,
         PossiblyFalsy = 7406,
@@ -1723,12 +1765,11 @@ declare namespace ts {
         NumberLike = 340,
         BooleanLike = 136,
         EnumLike = 272,
-        ObjectType = 2588672,
-        UnionOrIntersection = 1572864,
-        StructuredType = 4161536,
-        StructuredOrTypeParameter = 4177920,
-        Narrowable = 4178943,
-        NotUnionOrUnit = 2589185,
+        UnionOrIntersection = 196608,
+        StructuredType = 229376,
+        StructuredOrTypeParameter = 507904,
+        Narrowable = 1033215,
+        NotUnionOrUnit = 33281,
     }
     type DestructuringPattern = BindingPattern | ObjectLiteralExpression | ArrayLiteralExpression;
     interface Type {
@@ -1749,8 +1790,21 @@ declare namespace ts {
     interface EnumLiteralType extends LiteralType {
         baseType: EnumType & UnionType;
     }
+    enum ObjectFlags {
+        Class = 1,
+        Interface = 2,
+        Reference = 4,
+        Tuple = 8,
+        Anonymous = 16,
+        Mapped = 32,
+        Instantiated = 64,
+        ObjectLiteral = 128,
+        EvolvingArray = 256,
+        ObjectLiteralPatternWithComputedProperties = 512,
+        ClassOrInterface = 3,
+    }
     interface ObjectType extends Type {
-        isObjectLiteralPatternWithComputedProperties?: boolean;
+        objectFlags: ObjectFlags;
     }
     interface InterfaceType extends ObjectType {
         typeParameters: TypeParameter[];
@@ -1778,9 +1832,21 @@ declare namespace ts {
     }
     interface IntersectionType extends UnionOrIntersectionType {
     }
+    type StructuredType = ObjectType | UnionType | IntersectionType;
+    interface EvolvingArrayType extends ObjectType {
+        elementType: Type;
+        finalArrayType?: Type;
+    }
     interface TypeParameter extends Type {
         constraint: Type;
     }
+    interface IndexType extends Type {
+        type: TypeParameter;
+    }
+    interface IndexedAccessType extends Type {
+        objectType: Type;
+        indexType: TypeParameter;
+    }
     enum SignatureKind {
         Call = 0,
         Construct = 1,
@@ -1882,6 +1948,7 @@ declare namespace ts {
         preserveConstEnums?: boolean;
         project?: string;
         reactNamespace?: string;
+        jsxFactory?: string;
         removeComments?: boolean;
         rootDir?: string;
         rootDirs?: string[];
@@ -1912,6 +1979,7 @@ declare namespace ts {
         packageNameToTypingLocation: Map<string>;
         typingOptions: TypingOptions;
         compilerOptions: CompilerOptions;
+        unresolvedImports: ReadonlyArray<string>;
     }
     enum ModuleKind {
         None = 0,
@@ -1947,12 +2015,14 @@ declare namespace ts {
         ES2015 = 2,
         ES2016 = 3,
         ES2017 = 4,
-        Latest = 4,
+        ESNext = 5,
+        Latest = 5,
     }
     enum LanguageVariant {
         Standard = 0,
         JSX = 1,
     }
+    /** Either a parsed command line or a parsed tsconfig.json */
     interface ParsedCommandLine {
         options: CompilerOptions;
         typingOptions?: TypingOptions;
@@ -1979,12 +2049,45 @@ declare namespace ts {
         getCurrentDirectory?(): string;
         getDirectories?(path: string): string[];
     }
+    /**
+     * Represents the result of module resolution.
+     * Module resolution will pick up tsx/jsx/js files even if '--jsx' and '--allowJs' are turned off.
+     * The Program will then filter results based on these flags.
+     *
+     * Prefer to return a `ResolvedModuleFull` so that the file type does not have to be inferred.
+     */
     interface ResolvedModule {
+        /** Path of the file the module was resolved to. */
         resolvedFileName: string;
+        /**
+         * Denotes if 'resolvedFileName' is isExternalLibraryImport and thus should be a proper external module:
+         * - be a .d.ts file
+         * - use top level imports\exports
+         * - don't use tripleslash references
+         */
         isExternalLibraryImport?: boolean;
     }
+    /**
+     * ResolvedModule with an explicitly provided `extension` property.
+     * Prefer this over `ResolvedModule`.
+     */
+    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.
+         */
+        extension: Extension;
+    }
+    enum Extension {
+        Ts = 0,
+        Tsx = 1,
+        Dts = 2,
+        Js = 3,
+        Jsx = 4,
+        LastTypeScriptExtension = 2,
+    }
     interface ResolvedModuleWithFailedLookupLocations {
-        resolvedModule: ResolvedModule;
+        resolvedModule: ResolvedModuleFull | undefined;
         failedLookupLocations: string[];
     }
     interface ResolvedTypeReferenceDirective {
@@ -2042,7 +2145,11 @@ declare namespace ts {
         readFile(path: string, encoding?: string): string;
         getFileSize?(path: string): number;
         writeFile(path: string, data: string, writeByteOrderMark?: boolean): void;
-        watchFile?(path: string, callback: FileWatcherCallback): FileWatcher;
+        /**
+         * @pollingInterval - this parameter is used in polling-based watchers and ignored in watchers that
+         * use native OS file watching
+         */
+        watchFile?(path: string, callback: FileWatcherCallback, pollingInterval?: number): FileWatcher;
         watchDirectory?(path: string, callback: DirectoryWatcherCallback, recursive?: boolean): FileWatcher;
         resolvePath(path: string): string;
         fileExists(path: string): boolean;
@@ -2057,6 +2164,8 @@ declare namespace ts {
         getMemoryUsage?(): number;
         exit(exitCode?: number): void;
         realpath?(path: string): string;
+        setTimeout?(callback: (...args: any[]) => void, ms: number, ...args: any[]): any;
+        clearTimeout?(timeoutId: any): void;
     }
     interface FileWatcher {
         close(): void;
@@ -2159,6 +2268,7 @@ declare namespace ts {
     function createNode(kind: SyntaxKind, pos?: number, end?: number): Node;
     function forEachChild<T>(node: Node, cbNode: (node: Node) => T, cbNodeArray?: (nodes: Node[]) => T): T;
     function createSourceFile(fileName: string, sourceText: string, languageVersion: ScriptTarget, setParentNodes?: boolean, scriptKind?: ScriptKind): SourceFile;
+    function parseIsolatedEntityName(text: string, languageVersion: ScriptTarget): EntityName;
     function isExternalModule(file: SourceFile): boolean;
     function updateSourceFile(sourceFile: SourceFile, newText: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile;
 }
@@ -2172,7 +2282,7 @@ declare namespace ts {
      * This is possible in case if resolution is performed for directives specified via 'types' parameter. In this case initial path for secondary lookups
      * is assumed to be the same as root directory of the project.
      */
-    function resolveTypeReferenceDirective(typeReferenceDirectiveName: string, containingFile: string, options: CompilerOptions, host: ModuleResolutionHost): ResolvedTypeReferenceDirectiveWithFailedLookupLocations;
+    function resolveTypeReferenceDirective(typeReferenceDirectiveName: string, containingFile: string | undefined, options: CompilerOptions, host: ModuleResolutionHost): ResolvedTypeReferenceDirectiveWithFailedLookupLocations;
     /**
       * Given a set of options, returns the set of type directive names
       *   that should be included for this program automatically.
@@ -2188,7 +2298,7 @@ declare namespace ts {
 }
 declare namespace ts {
     /** The version of the TypeScript compiler release */
-    const version = "2.1.0";
+    const version = "2.2.0";
     function findConfigFile(searchPath: string, fileExists: (fileName: string) => boolean, configName?: string): string;
     function resolveTripleslashReference(moduleName: string, containingFile: string): string;
     function createCompilerHost(options: CompilerOptions, setParentNodes?: boolean): CompilerHost;
diff --git a/lib/typescript.js b/lib/typescript.js
index dad603b624a..a36522ece49 100644
--- a/lib/typescript.js
+++ b/lib/typescript.js
@@ -22,6 +22,7 @@ var ts;
 (function (ts) {
     // token > SyntaxKind.Identifer => token is a keyword
     // Also, If you add a new SyntaxKind be sure to keep the `Markers` section at the bottom in sync
+    var SyntaxKind;
     (function (SyntaxKind) {
         SyntaxKind[SyntaxKind["Unknown"] = 0] = "Unknown";
         SyntaxKind[SyntaxKind["EndOfFileToken"] = 1] = "EndOfFileToken";
@@ -160,191 +161,198 @@ var ts;
         SyntaxKind[SyntaxKind["DeclareKeyword"] = 123] = "DeclareKeyword";
         SyntaxKind[SyntaxKind["GetKeyword"] = 124] = "GetKeyword";
         SyntaxKind[SyntaxKind["IsKeyword"] = 125] = "IsKeyword";
-        SyntaxKind[SyntaxKind["ModuleKeyword"] = 126] = "ModuleKeyword";
-        SyntaxKind[SyntaxKind["NamespaceKeyword"] = 127] = "NamespaceKeyword";
-        SyntaxKind[SyntaxKind["NeverKeyword"] = 128] = "NeverKeyword";
-        SyntaxKind[SyntaxKind["ReadonlyKeyword"] = 129] = "ReadonlyKeyword";
-        SyntaxKind[SyntaxKind["RequireKeyword"] = 130] = "RequireKeyword";
-        SyntaxKind[SyntaxKind["NumberKeyword"] = 131] = "NumberKeyword";
-        SyntaxKind[SyntaxKind["SetKeyword"] = 132] = "SetKeyword";
-        SyntaxKind[SyntaxKind["StringKeyword"] = 133] = "StringKeyword";
-        SyntaxKind[SyntaxKind["SymbolKeyword"] = 134] = "SymbolKeyword";
-        SyntaxKind[SyntaxKind["TypeKeyword"] = 135] = "TypeKeyword";
-        SyntaxKind[SyntaxKind["UndefinedKeyword"] = 136] = "UndefinedKeyword";
-        SyntaxKind[SyntaxKind["FromKeyword"] = 137] = "FromKeyword";
-        SyntaxKind[SyntaxKind["GlobalKeyword"] = 138] = "GlobalKeyword";
-        SyntaxKind[SyntaxKind["OfKeyword"] = 139] = "OfKeyword";
+        SyntaxKind[SyntaxKind["KeyOfKeyword"] = 126] = "KeyOfKeyword";
+        SyntaxKind[SyntaxKind["ModuleKeyword"] = 127] = "ModuleKeyword";
+        SyntaxKind[SyntaxKind["NamespaceKeyword"] = 128] = "NamespaceKeyword";
+        SyntaxKind[SyntaxKind["NeverKeyword"] = 129] = "NeverKeyword";
+        SyntaxKind[SyntaxKind["ReadonlyKeyword"] = 130] = "ReadonlyKeyword";
+        SyntaxKind[SyntaxKind["RequireKeyword"] = 131] = "RequireKeyword";
+        SyntaxKind[SyntaxKind["NumberKeyword"] = 132] = "NumberKeyword";
+        SyntaxKind[SyntaxKind["SetKeyword"] = 133] = "SetKeyword";
+        SyntaxKind[SyntaxKind["StringKeyword"] = 134] = "StringKeyword";
+        SyntaxKind[SyntaxKind["SymbolKeyword"] = 135] = "SymbolKeyword";
+        SyntaxKind[SyntaxKind["TypeKeyword"] = 136] = "TypeKeyword";
+        SyntaxKind[SyntaxKind["UndefinedKeyword"] = 137] = "UndefinedKeyword";
+        SyntaxKind[SyntaxKind["FromKeyword"] = 138] = "FromKeyword";
+        SyntaxKind[SyntaxKind["GlobalKeyword"] = 139] = "GlobalKeyword";
+        SyntaxKind[SyntaxKind["OfKeyword"] = 140] = "OfKeyword";
         // Parse tree nodes
         // Names
-        SyntaxKind[SyntaxKind["QualifiedName"] = 140] = "QualifiedName";
-        SyntaxKind[SyntaxKind["ComputedPropertyName"] = 141] = "ComputedPropertyName";
+        SyntaxKind[SyntaxKind["QualifiedName"] = 141] = "QualifiedName";
+        SyntaxKind[SyntaxKind["ComputedPropertyName"] = 142] = "ComputedPropertyName";
         // Signature elements
-        SyntaxKind[SyntaxKind["TypeParameter"] = 142] = "TypeParameter";
-        SyntaxKind[SyntaxKind["Parameter"] = 143] = "Parameter";
-        SyntaxKind[SyntaxKind["Decorator"] = 144] = "Decorator";
+        SyntaxKind[SyntaxKind["TypeParameter"] = 143] = "TypeParameter";
+        SyntaxKind[SyntaxKind["Parameter"] = 144] = "Parameter";
+        SyntaxKind[SyntaxKind["Decorator"] = 145] = "Decorator";
         // TypeMember
-        SyntaxKind[SyntaxKind["PropertySignature"] = 145] = "PropertySignature";
-        SyntaxKind[SyntaxKind["PropertyDeclaration"] = 146] = "PropertyDeclaration";
-        SyntaxKind[SyntaxKind["MethodSignature"] = 147] = "MethodSignature";
-        SyntaxKind[SyntaxKind["MethodDeclaration"] = 148] = "MethodDeclaration";
-        SyntaxKind[SyntaxKind["Constructor"] = 149] = "Constructor";
-        SyntaxKind[SyntaxKind["GetAccessor"] = 150] = "GetAccessor";
-        SyntaxKind[SyntaxKind["SetAccessor"] = 151] = "SetAccessor";
-        SyntaxKind[SyntaxKind["CallSignature"] = 152] = "CallSignature";
-        SyntaxKind[SyntaxKind["ConstructSignature"] = 153] = "ConstructSignature";
-        SyntaxKind[SyntaxKind["IndexSignature"] = 154] = "IndexSignature";
+        SyntaxKind[SyntaxKind["PropertySignature"] = 146] = "PropertySignature";
+        SyntaxKind[SyntaxKind["PropertyDeclaration"] = 147] = "PropertyDeclaration";
+        SyntaxKind[SyntaxKind["MethodSignature"] = 148] = "MethodSignature";
+        SyntaxKind[SyntaxKind["MethodDeclaration"] = 149] = "MethodDeclaration";
+        SyntaxKind[SyntaxKind["Constructor"] = 150] = "Constructor";
+        SyntaxKind[SyntaxKind["GetAccessor"] = 151] = "GetAccessor";
+        SyntaxKind[SyntaxKind["SetAccessor"] = 152] = "SetAccessor";
+        SyntaxKind[SyntaxKind["CallSignature"] = 153] = "CallSignature";
+        SyntaxKind[SyntaxKind["ConstructSignature"] = 154] = "ConstructSignature";
+        SyntaxKind[SyntaxKind["IndexSignature"] = 155] = "IndexSignature";
         // Type
-        SyntaxKind[SyntaxKind["TypePredicate"] = 155] = "TypePredicate";
-        SyntaxKind[SyntaxKind["TypeReference"] = 156] = "TypeReference";
-        SyntaxKind[SyntaxKind["FunctionType"] = 157] = "FunctionType";
-        SyntaxKind[SyntaxKind["ConstructorType"] = 158] = "ConstructorType";
-        SyntaxKind[SyntaxKind["TypeQuery"] = 159] = "TypeQuery";
-        SyntaxKind[SyntaxKind["TypeLiteral"] = 160] = "TypeLiteral";
-        SyntaxKind[SyntaxKind["ArrayType"] = 161] = "ArrayType";
-        SyntaxKind[SyntaxKind["TupleType"] = 162] = "TupleType";
-        SyntaxKind[SyntaxKind["UnionType"] = 163] = "UnionType";
-        SyntaxKind[SyntaxKind["IntersectionType"] = 164] = "IntersectionType";
-        SyntaxKind[SyntaxKind["ParenthesizedType"] = 165] = "ParenthesizedType";
-        SyntaxKind[SyntaxKind["ThisType"] = 166] = "ThisType";
-        SyntaxKind[SyntaxKind["LiteralType"] = 167] = "LiteralType";
+        SyntaxKind[SyntaxKind["TypePredicate"] = 156] = "TypePredicate";
+        SyntaxKind[SyntaxKind["TypeReference"] = 157] = "TypeReference";
+        SyntaxKind[SyntaxKind["FunctionType"] = 158] = "FunctionType";
+        SyntaxKind[SyntaxKind["ConstructorType"] = 159] = "ConstructorType";
+        SyntaxKind[SyntaxKind["TypeQuery"] = 160] = "TypeQuery";
+        SyntaxKind[SyntaxKind["TypeLiteral"] = 161] = "TypeLiteral";
+        SyntaxKind[SyntaxKind["ArrayType"] = 162] = "ArrayType";
+        SyntaxKind[SyntaxKind["TupleType"] = 163] = "TupleType";
+        SyntaxKind[SyntaxKind["UnionType"] = 164] = "UnionType";
+        SyntaxKind[SyntaxKind["IntersectionType"] = 165] = "IntersectionType";
+        SyntaxKind[SyntaxKind["ParenthesizedType"] = 166] = "ParenthesizedType";
+        SyntaxKind[SyntaxKind["ThisType"] = 167] = "ThisType";
+        SyntaxKind[SyntaxKind["TypeOperator"] = 168] = "TypeOperator";
+        SyntaxKind[SyntaxKind["IndexedAccessType"] = 169] = "IndexedAccessType";
+        SyntaxKind[SyntaxKind["MappedType"] = 170] = "MappedType";
+        SyntaxKind[SyntaxKind["LiteralType"] = 171] = "LiteralType";
         // Binding patterns
-        SyntaxKind[SyntaxKind["ObjectBindingPattern"] = 168] = "ObjectBindingPattern";
-        SyntaxKind[SyntaxKind["ArrayBindingPattern"] = 169] = "ArrayBindingPattern";
-        SyntaxKind[SyntaxKind["BindingElement"] = 170] = "BindingElement";
+        SyntaxKind[SyntaxKind["ObjectBindingPattern"] = 172] = "ObjectBindingPattern";
+        SyntaxKind[SyntaxKind["ArrayBindingPattern"] = 173] = "ArrayBindingPattern";
+        SyntaxKind[SyntaxKind["BindingElement"] = 174] = "BindingElement";
         // Expression
-        SyntaxKind[SyntaxKind["ArrayLiteralExpression"] = 171] = "ArrayLiteralExpression";
-        SyntaxKind[SyntaxKind["ObjectLiteralExpression"] = 172] = "ObjectLiteralExpression";
-        SyntaxKind[SyntaxKind["PropertyAccessExpression"] = 173] = "PropertyAccessExpression";
-        SyntaxKind[SyntaxKind["ElementAccessExpression"] = 174] = "ElementAccessExpression";
-        SyntaxKind[SyntaxKind["CallExpression"] = 175] = "CallExpression";
-        SyntaxKind[SyntaxKind["NewExpression"] = 176] = "NewExpression";
-        SyntaxKind[SyntaxKind["TaggedTemplateExpression"] = 177] = "TaggedTemplateExpression";
-        SyntaxKind[SyntaxKind["TypeAssertionExpression"] = 178] = "TypeAssertionExpression";
-        SyntaxKind[SyntaxKind["ParenthesizedExpression"] = 179] = "ParenthesizedExpression";
-        SyntaxKind[SyntaxKind["FunctionExpression"] = 180] = "FunctionExpression";
-        SyntaxKind[SyntaxKind["ArrowFunction"] = 181] = "ArrowFunction";
-        SyntaxKind[SyntaxKind["DeleteExpression"] = 182] = "DeleteExpression";
-        SyntaxKind[SyntaxKind["TypeOfExpression"] = 183] = "TypeOfExpression";
-        SyntaxKind[SyntaxKind["VoidExpression"] = 184] = "VoidExpression";
-        SyntaxKind[SyntaxKind["AwaitExpression"] = 185] = "AwaitExpression";
-        SyntaxKind[SyntaxKind["PrefixUnaryExpression"] = 186] = "PrefixUnaryExpression";
-        SyntaxKind[SyntaxKind["PostfixUnaryExpression"] = 187] = "PostfixUnaryExpression";
-        SyntaxKind[SyntaxKind["BinaryExpression"] = 188] = "BinaryExpression";
-        SyntaxKind[SyntaxKind["ConditionalExpression"] = 189] = "ConditionalExpression";
-        SyntaxKind[SyntaxKind["TemplateExpression"] = 190] = "TemplateExpression";
-        SyntaxKind[SyntaxKind["YieldExpression"] = 191] = "YieldExpression";
-        SyntaxKind[SyntaxKind["SpreadElementExpression"] = 192] = "SpreadElementExpression";
-        SyntaxKind[SyntaxKind["ClassExpression"] = 193] = "ClassExpression";
-        SyntaxKind[SyntaxKind["OmittedExpression"] = 194] = "OmittedExpression";
-        SyntaxKind[SyntaxKind["ExpressionWithTypeArguments"] = 195] = "ExpressionWithTypeArguments";
-        SyntaxKind[SyntaxKind["AsExpression"] = 196] = "AsExpression";
-        SyntaxKind[SyntaxKind["NonNullExpression"] = 197] = "NonNullExpression";
+        SyntaxKind[SyntaxKind["ArrayLiteralExpression"] = 175] = "ArrayLiteralExpression";
+        SyntaxKind[SyntaxKind["ObjectLiteralExpression"] = 176] = "ObjectLiteralExpression";
+        SyntaxKind[SyntaxKind["PropertyAccessExpression"] = 177] = "PropertyAccessExpression";
+        SyntaxKind[SyntaxKind["ElementAccessExpression"] = 178] = "ElementAccessExpression";
+        SyntaxKind[SyntaxKind["CallExpression"] = 179] = "CallExpression";
+        SyntaxKind[SyntaxKind["NewExpression"] = 180] = "NewExpression";
+        SyntaxKind[SyntaxKind["TaggedTemplateExpression"] = 181] = "TaggedTemplateExpression";
+        SyntaxKind[SyntaxKind["TypeAssertionExpression"] = 182] = "TypeAssertionExpression";
+        SyntaxKind[SyntaxKind["ParenthesizedExpression"] = 183] = "ParenthesizedExpression";
+        SyntaxKind[SyntaxKind["FunctionExpression"] = 184] = "FunctionExpression";
+        SyntaxKind[SyntaxKind["ArrowFunction"] = 185] = "ArrowFunction";
+        SyntaxKind[SyntaxKind["DeleteExpression"] = 186] = "DeleteExpression";
+        SyntaxKind[SyntaxKind["TypeOfExpression"] = 187] = "TypeOfExpression";
+        SyntaxKind[SyntaxKind["VoidExpression"] = 188] = "VoidExpression";
+        SyntaxKind[SyntaxKind["AwaitExpression"] = 189] = "AwaitExpression";
+        SyntaxKind[SyntaxKind["PrefixUnaryExpression"] = 190] = "PrefixUnaryExpression";
+        SyntaxKind[SyntaxKind["PostfixUnaryExpression"] = 191] = "PostfixUnaryExpression";
+        SyntaxKind[SyntaxKind["BinaryExpression"] = 192] = "BinaryExpression";
+        SyntaxKind[SyntaxKind["ConditionalExpression"] = 193] = "ConditionalExpression";
+        SyntaxKind[SyntaxKind["TemplateExpression"] = 194] = "TemplateExpression";
+        SyntaxKind[SyntaxKind["YieldExpression"] = 195] = "YieldExpression";
+        SyntaxKind[SyntaxKind["SpreadElement"] = 196] = "SpreadElement";
+        SyntaxKind[SyntaxKind["ClassExpression"] = 197] = "ClassExpression";
+        SyntaxKind[SyntaxKind["OmittedExpression"] = 198] = "OmittedExpression";
+        SyntaxKind[SyntaxKind["ExpressionWithTypeArguments"] = 199] = "ExpressionWithTypeArguments";
+        SyntaxKind[SyntaxKind["AsExpression"] = 200] = "AsExpression";
+        SyntaxKind[SyntaxKind["NonNullExpression"] = 201] = "NonNullExpression";
         // Misc
-        SyntaxKind[SyntaxKind["TemplateSpan"] = 198] = "TemplateSpan";
-        SyntaxKind[SyntaxKind["SemicolonClassElement"] = 199] = "SemicolonClassElement";
+        SyntaxKind[SyntaxKind["TemplateSpan"] = 202] = "TemplateSpan";
+        SyntaxKind[SyntaxKind["SemicolonClassElement"] = 203] = "SemicolonClassElement";
         // Element
-        SyntaxKind[SyntaxKind["Block"] = 200] = "Block";
-        SyntaxKind[SyntaxKind["VariableStatement"] = 201] = "VariableStatement";
-        SyntaxKind[SyntaxKind["EmptyStatement"] = 202] = "EmptyStatement";
-        SyntaxKind[SyntaxKind["ExpressionStatement"] = 203] = "ExpressionStatement";
-        SyntaxKind[SyntaxKind["IfStatement"] = 204] = "IfStatement";
-        SyntaxKind[SyntaxKind["DoStatement"] = 205] = "DoStatement";
-        SyntaxKind[SyntaxKind["WhileStatement"] = 206] = "WhileStatement";
-        SyntaxKind[SyntaxKind["ForStatement"] = 207] = "ForStatement";
-        SyntaxKind[SyntaxKind["ForInStatement"] = 208] = "ForInStatement";
-        SyntaxKind[SyntaxKind["ForOfStatement"] = 209] = "ForOfStatement";
-        SyntaxKind[SyntaxKind["ContinueStatement"] = 210] = "ContinueStatement";
-        SyntaxKind[SyntaxKind["BreakStatement"] = 211] = "BreakStatement";
-        SyntaxKind[SyntaxKind["ReturnStatement"] = 212] = "ReturnStatement";
-        SyntaxKind[SyntaxKind["WithStatement"] = 213] = "WithStatement";
-        SyntaxKind[SyntaxKind["SwitchStatement"] = 214] = "SwitchStatement";
-        SyntaxKind[SyntaxKind["LabeledStatement"] = 215] = "LabeledStatement";
-        SyntaxKind[SyntaxKind["ThrowStatement"] = 216] = "ThrowStatement";
-        SyntaxKind[SyntaxKind["TryStatement"] = 217] = "TryStatement";
-        SyntaxKind[SyntaxKind["DebuggerStatement"] = 218] = "DebuggerStatement";
-        SyntaxKind[SyntaxKind["VariableDeclaration"] = 219] = "VariableDeclaration";
-        SyntaxKind[SyntaxKind["VariableDeclarationList"] = 220] = "VariableDeclarationList";
-        SyntaxKind[SyntaxKind["FunctionDeclaration"] = 221] = "FunctionDeclaration";
-        SyntaxKind[SyntaxKind["ClassDeclaration"] = 222] = "ClassDeclaration";
-        SyntaxKind[SyntaxKind["InterfaceDeclaration"] = 223] = "InterfaceDeclaration";
-        SyntaxKind[SyntaxKind["TypeAliasDeclaration"] = 224] = "TypeAliasDeclaration";
-        SyntaxKind[SyntaxKind["EnumDeclaration"] = 225] = "EnumDeclaration";
-        SyntaxKind[SyntaxKind["ModuleDeclaration"] = 226] = "ModuleDeclaration";
-        SyntaxKind[SyntaxKind["ModuleBlock"] = 227] = "ModuleBlock";
-        SyntaxKind[SyntaxKind["CaseBlock"] = 228] = "CaseBlock";
-        SyntaxKind[SyntaxKind["NamespaceExportDeclaration"] = 229] = "NamespaceExportDeclaration";
-        SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 230] = "ImportEqualsDeclaration";
-        SyntaxKind[SyntaxKind["ImportDeclaration"] = 231] = "ImportDeclaration";
-        SyntaxKind[SyntaxKind["ImportClause"] = 232] = "ImportClause";
-        SyntaxKind[SyntaxKind["NamespaceImport"] = 233] = "NamespaceImport";
-        SyntaxKind[SyntaxKind["NamedImports"] = 234] = "NamedImports";
-        SyntaxKind[SyntaxKind["ImportSpecifier"] = 235] = "ImportSpecifier";
-        SyntaxKind[SyntaxKind["ExportAssignment"] = 236] = "ExportAssignment";
-        SyntaxKind[SyntaxKind["ExportDeclaration"] = 237] = "ExportDeclaration";
-        SyntaxKind[SyntaxKind["NamedExports"] = 238] = "NamedExports";
-        SyntaxKind[SyntaxKind["ExportSpecifier"] = 239] = "ExportSpecifier";
-        SyntaxKind[SyntaxKind["MissingDeclaration"] = 240] = "MissingDeclaration";
+        SyntaxKind[SyntaxKind["Block"] = 204] = "Block";
+        SyntaxKind[SyntaxKind["VariableStatement"] = 205] = "VariableStatement";
+        SyntaxKind[SyntaxKind["EmptyStatement"] = 206] = "EmptyStatement";
+        SyntaxKind[SyntaxKind["ExpressionStatement"] = 207] = "ExpressionStatement";
+        SyntaxKind[SyntaxKind["IfStatement"] = 208] = "IfStatement";
+        SyntaxKind[SyntaxKind["DoStatement"] = 209] = "DoStatement";
+        SyntaxKind[SyntaxKind["WhileStatement"] = 210] = "WhileStatement";
+        SyntaxKind[SyntaxKind["ForStatement"] = 211] = "ForStatement";
+        SyntaxKind[SyntaxKind["ForInStatement"] = 212] = "ForInStatement";
+        SyntaxKind[SyntaxKind["ForOfStatement"] = 213] = "ForOfStatement";
+        SyntaxKind[SyntaxKind["ContinueStatement"] = 214] = "ContinueStatement";
+        SyntaxKind[SyntaxKind["BreakStatement"] = 215] = "BreakStatement";
+        SyntaxKind[SyntaxKind["ReturnStatement"] = 216] = "ReturnStatement";
+        SyntaxKind[SyntaxKind["WithStatement"] = 217] = "WithStatement";
+        SyntaxKind[SyntaxKind["SwitchStatement"] = 218] = "SwitchStatement";
+        SyntaxKind[SyntaxKind["LabeledStatement"] = 219] = "LabeledStatement";
+        SyntaxKind[SyntaxKind["ThrowStatement"] = 220] = "ThrowStatement";
+        SyntaxKind[SyntaxKind["TryStatement"] = 221] = "TryStatement";
+        SyntaxKind[SyntaxKind["DebuggerStatement"] = 222] = "DebuggerStatement";
+        SyntaxKind[SyntaxKind["VariableDeclaration"] = 223] = "VariableDeclaration";
+        SyntaxKind[SyntaxKind["VariableDeclarationList"] = 224] = "VariableDeclarationList";
+        SyntaxKind[SyntaxKind["FunctionDeclaration"] = 225] = "FunctionDeclaration";
+        SyntaxKind[SyntaxKind["ClassDeclaration"] = 226] = "ClassDeclaration";
+        SyntaxKind[SyntaxKind["InterfaceDeclaration"] = 227] = "InterfaceDeclaration";
+        SyntaxKind[SyntaxKind["TypeAliasDeclaration"] = 228] = "TypeAliasDeclaration";
+        SyntaxKind[SyntaxKind["EnumDeclaration"] = 229] = "EnumDeclaration";
+        SyntaxKind[SyntaxKind["ModuleDeclaration"] = 230] = "ModuleDeclaration";
+        SyntaxKind[SyntaxKind["ModuleBlock"] = 231] = "ModuleBlock";
+        SyntaxKind[SyntaxKind["CaseBlock"] = 232] = "CaseBlock";
+        SyntaxKind[SyntaxKind["NamespaceExportDeclaration"] = 233] = "NamespaceExportDeclaration";
+        SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 234] = "ImportEqualsDeclaration";
+        SyntaxKind[SyntaxKind["ImportDeclaration"] = 235] = "ImportDeclaration";
+        SyntaxKind[SyntaxKind["ImportClause"] = 236] = "ImportClause";
+        SyntaxKind[SyntaxKind["NamespaceImport"] = 237] = "NamespaceImport";
+        SyntaxKind[SyntaxKind["NamedImports"] = 238] = "NamedImports";
+        SyntaxKind[SyntaxKind["ImportSpecifier"] = 239] = "ImportSpecifier";
+        SyntaxKind[SyntaxKind["ExportAssignment"] = 240] = "ExportAssignment";
+        SyntaxKind[SyntaxKind["ExportDeclaration"] = 241] = "ExportDeclaration";
+        SyntaxKind[SyntaxKind["NamedExports"] = 242] = "NamedExports";
+        SyntaxKind[SyntaxKind["ExportSpecifier"] = 243] = "ExportSpecifier";
+        SyntaxKind[SyntaxKind["MissingDeclaration"] = 244] = "MissingDeclaration";
         // Module references
-        SyntaxKind[SyntaxKind["ExternalModuleReference"] = 241] = "ExternalModuleReference";
+        SyntaxKind[SyntaxKind["ExternalModuleReference"] = 245] = "ExternalModuleReference";
         // JSX
-        SyntaxKind[SyntaxKind["JsxElement"] = 242] = "JsxElement";
-        SyntaxKind[SyntaxKind["JsxSelfClosingElement"] = 243] = "JsxSelfClosingElement";
-        SyntaxKind[SyntaxKind["JsxOpeningElement"] = 244] = "JsxOpeningElement";
-        SyntaxKind[SyntaxKind["JsxClosingElement"] = 245] = "JsxClosingElement";
-        SyntaxKind[SyntaxKind["JsxAttribute"] = 246] = "JsxAttribute";
-        SyntaxKind[SyntaxKind["JsxSpreadAttribute"] = 247] = "JsxSpreadAttribute";
-        SyntaxKind[SyntaxKind["JsxExpression"] = 248] = "JsxExpression";
+        SyntaxKind[SyntaxKind["JsxElement"] = 246] = "JsxElement";
+        SyntaxKind[SyntaxKind["JsxSelfClosingElement"] = 247] = "JsxSelfClosingElement";
+        SyntaxKind[SyntaxKind["JsxOpeningElement"] = 248] = "JsxOpeningElement";
+        SyntaxKind[SyntaxKind["JsxClosingElement"] = 249] = "JsxClosingElement";
+        SyntaxKind[SyntaxKind["JsxAttribute"] = 250] = "JsxAttribute";
+        SyntaxKind[SyntaxKind["JsxSpreadAttribute"] = 251] = "JsxSpreadAttribute";
+        SyntaxKind[SyntaxKind["JsxExpression"] = 252] = "JsxExpression";
         // Clauses
-        SyntaxKind[SyntaxKind["CaseClause"] = 249] = "CaseClause";
-        SyntaxKind[SyntaxKind["DefaultClause"] = 250] = "DefaultClause";
-        SyntaxKind[SyntaxKind["HeritageClause"] = 251] = "HeritageClause";
-        SyntaxKind[SyntaxKind["CatchClause"] = 252] = "CatchClause";
+        SyntaxKind[SyntaxKind["CaseClause"] = 253] = "CaseClause";
+        SyntaxKind[SyntaxKind["DefaultClause"] = 254] = "DefaultClause";
+        SyntaxKind[SyntaxKind["HeritageClause"] = 255] = "HeritageClause";
+        SyntaxKind[SyntaxKind["CatchClause"] = 256] = "CatchClause";
         // Property assignments
-        SyntaxKind[SyntaxKind["PropertyAssignment"] = 253] = "PropertyAssignment";
-        SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 254] = "ShorthandPropertyAssignment";
+        SyntaxKind[SyntaxKind["PropertyAssignment"] = 257] = "PropertyAssignment";
+        SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 258] = "ShorthandPropertyAssignment";
+        SyntaxKind[SyntaxKind["SpreadAssignment"] = 259] = "SpreadAssignment";
         // Enum
-        SyntaxKind[SyntaxKind["EnumMember"] = 255] = "EnumMember";
+        SyntaxKind[SyntaxKind["EnumMember"] = 260] = "EnumMember";
         // Top-level nodes
-        SyntaxKind[SyntaxKind["SourceFile"] = 256] = "SourceFile";
+        SyntaxKind[SyntaxKind["SourceFile"] = 261] = "SourceFile";
         // JSDoc nodes
-        SyntaxKind[SyntaxKind["JSDocTypeExpression"] = 257] = "JSDocTypeExpression";
+        SyntaxKind[SyntaxKind["JSDocTypeExpression"] = 262] = "JSDocTypeExpression";
         // The * type
-        SyntaxKind[SyntaxKind["JSDocAllType"] = 258] = "JSDocAllType";
+        SyntaxKind[SyntaxKind["JSDocAllType"] = 263] = "JSDocAllType";
         // The ? type
-        SyntaxKind[SyntaxKind["JSDocUnknownType"] = 259] = "JSDocUnknownType";
-        SyntaxKind[SyntaxKind["JSDocArrayType"] = 260] = "JSDocArrayType";
-        SyntaxKind[SyntaxKind["JSDocUnionType"] = 261] = "JSDocUnionType";
-        SyntaxKind[SyntaxKind["JSDocTupleType"] = 262] = "JSDocTupleType";
-        SyntaxKind[SyntaxKind["JSDocNullableType"] = 263] = "JSDocNullableType";
-        SyntaxKind[SyntaxKind["JSDocNonNullableType"] = 264] = "JSDocNonNullableType";
-        SyntaxKind[SyntaxKind["JSDocRecordType"] = 265] = "JSDocRecordType";
-        SyntaxKind[SyntaxKind["JSDocRecordMember"] = 266] = "JSDocRecordMember";
-        SyntaxKind[SyntaxKind["JSDocTypeReference"] = 267] = "JSDocTypeReference";
-        SyntaxKind[SyntaxKind["JSDocOptionalType"] = 268] = "JSDocOptionalType";
-        SyntaxKind[SyntaxKind["JSDocFunctionType"] = 269] = "JSDocFunctionType";
-        SyntaxKind[SyntaxKind["JSDocVariadicType"] = 270] = "JSDocVariadicType";
-        SyntaxKind[SyntaxKind["JSDocConstructorType"] = 271] = "JSDocConstructorType";
-        SyntaxKind[SyntaxKind["JSDocThisType"] = 272] = "JSDocThisType";
-        SyntaxKind[SyntaxKind["JSDocComment"] = 273] = "JSDocComment";
-        SyntaxKind[SyntaxKind["JSDocTag"] = 274] = "JSDocTag";
-        SyntaxKind[SyntaxKind["JSDocParameterTag"] = 275] = "JSDocParameterTag";
-        SyntaxKind[SyntaxKind["JSDocReturnTag"] = 276] = "JSDocReturnTag";
-        SyntaxKind[SyntaxKind["JSDocTypeTag"] = 277] = "JSDocTypeTag";
-        SyntaxKind[SyntaxKind["JSDocTemplateTag"] = 278] = "JSDocTemplateTag";
-        SyntaxKind[SyntaxKind["JSDocTypedefTag"] = 279] = "JSDocTypedefTag";
-        SyntaxKind[SyntaxKind["JSDocPropertyTag"] = 280] = "JSDocPropertyTag";
-        SyntaxKind[SyntaxKind["JSDocTypeLiteral"] = 281] = "JSDocTypeLiteral";
-        SyntaxKind[SyntaxKind["JSDocLiteralType"] = 282] = "JSDocLiteralType";
-        SyntaxKind[SyntaxKind["JSDocNullKeyword"] = 283] = "JSDocNullKeyword";
-        SyntaxKind[SyntaxKind["JSDocUndefinedKeyword"] = 284] = "JSDocUndefinedKeyword";
-        SyntaxKind[SyntaxKind["JSDocNeverKeyword"] = 285] = "JSDocNeverKeyword";
+        SyntaxKind[SyntaxKind["JSDocUnknownType"] = 264] = "JSDocUnknownType";
+        SyntaxKind[SyntaxKind["JSDocArrayType"] = 265] = "JSDocArrayType";
+        SyntaxKind[SyntaxKind["JSDocUnionType"] = 266] = "JSDocUnionType";
+        SyntaxKind[SyntaxKind["JSDocTupleType"] = 267] = "JSDocTupleType";
+        SyntaxKind[SyntaxKind["JSDocNullableType"] = 268] = "JSDocNullableType";
+        SyntaxKind[SyntaxKind["JSDocNonNullableType"] = 269] = "JSDocNonNullableType";
+        SyntaxKind[SyntaxKind["JSDocRecordType"] = 270] = "JSDocRecordType";
+        SyntaxKind[SyntaxKind["JSDocRecordMember"] = 271] = "JSDocRecordMember";
+        SyntaxKind[SyntaxKind["JSDocTypeReference"] = 272] = "JSDocTypeReference";
+        SyntaxKind[SyntaxKind["JSDocOptionalType"] = 273] = "JSDocOptionalType";
+        SyntaxKind[SyntaxKind["JSDocFunctionType"] = 274] = "JSDocFunctionType";
+        SyntaxKind[SyntaxKind["JSDocVariadicType"] = 275] = "JSDocVariadicType";
+        SyntaxKind[SyntaxKind["JSDocConstructorType"] = 276] = "JSDocConstructorType";
+        SyntaxKind[SyntaxKind["JSDocThisType"] = 277] = "JSDocThisType";
+        SyntaxKind[SyntaxKind["JSDocComment"] = 278] = "JSDocComment";
+        SyntaxKind[SyntaxKind["JSDocTag"] = 279] = "JSDocTag";
+        SyntaxKind[SyntaxKind["JSDocParameterTag"] = 280] = "JSDocParameterTag";
+        SyntaxKind[SyntaxKind["JSDocReturnTag"] = 281] = "JSDocReturnTag";
+        SyntaxKind[SyntaxKind["JSDocTypeTag"] = 282] = "JSDocTypeTag";
+        SyntaxKind[SyntaxKind["JSDocTemplateTag"] = 283] = "JSDocTemplateTag";
+        SyntaxKind[SyntaxKind["JSDocTypedefTag"] = 284] = "JSDocTypedefTag";
+        SyntaxKind[SyntaxKind["JSDocPropertyTag"] = 285] = "JSDocPropertyTag";
+        SyntaxKind[SyntaxKind["JSDocTypeLiteral"] = 286] = "JSDocTypeLiteral";
+        SyntaxKind[SyntaxKind["JSDocLiteralType"] = 287] = "JSDocLiteralType";
+        SyntaxKind[SyntaxKind["JSDocNullKeyword"] = 288] = "JSDocNullKeyword";
+        SyntaxKind[SyntaxKind["JSDocUndefinedKeyword"] = 289] = "JSDocUndefinedKeyword";
+        SyntaxKind[SyntaxKind["JSDocNeverKeyword"] = 290] = "JSDocNeverKeyword";
         // Synthesized list
-        SyntaxKind[SyntaxKind["SyntaxList"] = 286] = "SyntaxList";
+        SyntaxKind[SyntaxKind["SyntaxList"] = 291] = "SyntaxList";
         // Transformation nodes
-        SyntaxKind[SyntaxKind["NotEmittedStatement"] = 287] = "NotEmittedStatement";
-        SyntaxKind[SyntaxKind["PartiallyEmittedExpression"] = 288] = "PartiallyEmittedExpression";
+        SyntaxKind[SyntaxKind["NotEmittedStatement"] = 292] = "NotEmittedStatement";
+        SyntaxKind[SyntaxKind["PartiallyEmittedExpression"] = 293] = "PartiallyEmittedExpression";
+        SyntaxKind[SyntaxKind["MergeDeclarationMarker"] = 294] = "MergeDeclarationMarker";
+        SyntaxKind[SyntaxKind["EndOfDeclarationMarker"] = 295] = "EndOfDeclarationMarker";
         // Enum value count
-        SyntaxKind[SyntaxKind["Count"] = 289] = "Count";
+        SyntaxKind[SyntaxKind["Count"] = 296] = "Count";
         // Markers
         SyntaxKind[SyntaxKind["FirstAssignment"] = 57] = "FirstAssignment";
         SyntaxKind[SyntaxKind["LastAssignment"] = 69] = "LastAssignment";
@@ -353,15 +361,15 @@ var ts;
         SyntaxKind[SyntaxKind["FirstReservedWord"] = 71] = "FirstReservedWord";
         SyntaxKind[SyntaxKind["LastReservedWord"] = 106] = "LastReservedWord";
         SyntaxKind[SyntaxKind["FirstKeyword"] = 71] = "FirstKeyword";
-        SyntaxKind[SyntaxKind["LastKeyword"] = 139] = "LastKeyword";
+        SyntaxKind[SyntaxKind["LastKeyword"] = 140] = "LastKeyword";
         SyntaxKind[SyntaxKind["FirstFutureReservedWord"] = 107] = "FirstFutureReservedWord";
         SyntaxKind[SyntaxKind["LastFutureReservedWord"] = 115] = "LastFutureReservedWord";
-        SyntaxKind[SyntaxKind["FirstTypeNode"] = 155] = "FirstTypeNode";
-        SyntaxKind[SyntaxKind["LastTypeNode"] = 167] = "LastTypeNode";
+        SyntaxKind[SyntaxKind["FirstTypeNode"] = 156] = "FirstTypeNode";
+        SyntaxKind[SyntaxKind["LastTypeNode"] = 171] = "LastTypeNode";
         SyntaxKind[SyntaxKind["FirstPunctuation"] = 16] = "FirstPunctuation";
         SyntaxKind[SyntaxKind["LastPunctuation"] = 69] = "LastPunctuation";
         SyntaxKind[SyntaxKind["FirstToken"] = 0] = "FirstToken";
-        SyntaxKind[SyntaxKind["LastToken"] = 139] = "LastToken";
+        SyntaxKind[SyntaxKind["LastToken"] = 140] = "LastToken";
         SyntaxKind[SyntaxKind["FirstTriviaToken"] = 2] = "FirstTriviaToken";
         SyntaxKind[SyntaxKind["LastTriviaToken"] = 7] = "LastTriviaToken";
         SyntaxKind[SyntaxKind["FirstLiteralToken"] = 8] = "FirstLiteralToken";
@@ -370,13 +378,13 @@ var ts;
         SyntaxKind[SyntaxKind["LastTemplateToken"] = 15] = "LastTemplateToken";
         SyntaxKind[SyntaxKind["FirstBinaryOperator"] = 26] = "FirstBinaryOperator";
         SyntaxKind[SyntaxKind["LastBinaryOperator"] = 69] = "LastBinaryOperator";
-        SyntaxKind[SyntaxKind["FirstNode"] = 140] = "FirstNode";
-        SyntaxKind[SyntaxKind["FirstJSDocNode"] = 257] = "FirstJSDocNode";
-        SyntaxKind[SyntaxKind["LastJSDocNode"] = 282] = "LastJSDocNode";
-        SyntaxKind[SyntaxKind["FirstJSDocTagNode"] = 273] = "FirstJSDocTagNode";
-        SyntaxKind[SyntaxKind["LastJSDocTagNode"] = 285] = "LastJSDocTagNode";
-    })(ts.SyntaxKind || (ts.SyntaxKind = {}));
-    var SyntaxKind = ts.SyntaxKind;
+        SyntaxKind[SyntaxKind["FirstNode"] = 141] = "FirstNode";
+        SyntaxKind[SyntaxKind["FirstJSDocNode"] = 262] = "FirstJSDocNode";
+        SyntaxKind[SyntaxKind["LastJSDocNode"] = 287] = "LastJSDocNode";
+        SyntaxKind[SyntaxKind["FirstJSDocTagNode"] = 278] = "FirstJSDocTagNode";
+        SyntaxKind[SyntaxKind["LastJSDocTagNode"] = 290] = "LastJSDocTagNode";
+    })(SyntaxKind = ts.SyntaxKind || (ts.SyntaxKind = {}));
+    var NodeFlags;
     (function (NodeFlags) {
         NodeFlags[NodeFlags["None"] = 0] = "None";
         NodeFlags[NodeFlags["Let"] = 1] = "Let";
@@ -393,25 +401,26 @@ var ts;
         NodeFlags[NodeFlags["HasDecorators"] = 2048] = "HasDecorators";
         NodeFlags[NodeFlags["HasParamDecorators"] = 4096] = "HasParamDecorators";
         NodeFlags[NodeFlags["HasAsyncFunctions"] = 8192] = "HasAsyncFunctions";
-        NodeFlags[NodeFlags["HasJsxSpreadAttributes"] = 16384] = "HasJsxSpreadAttributes";
-        NodeFlags[NodeFlags["DisallowInContext"] = 32768] = "DisallowInContext";
-        NodeFlags[NodeFlags["YieldContext"] = 65536] = "YieldContext";
-        NodeFlags[NodeFlags["DecoratorContext"] = 131072] = "DecoratorContext";
-        NodeFlags[NodeFlags["AwaitContext"] = 262144] = "AwaitContext";
-        NodeFlags[NodeFlags["ThisNodeHasError"] = 524288] = "ThisNodeHasError";
-        NodeFlags[NodeFlags["JavaScriptFile"] = 1048576] = "JavaScriptFile";
-        NodeFlags[NodeFlags["ThisNodeOrAnySubNodesHasError"] = 2097152] = "ThisNodeOrAnySubNodesHasError";
-        NodeFlags[NodeFlags["HasAggregatedChildData"] = 4194304] = "HasAggregatedChildData";
+        NodeFlags[NodeFlags["HasSpreadAttribute"] = 16384] = "HasSpreadAttribute";
+        NodeFlags[NodeFlags["HasRestAttribute"] = 32768] = "HasRestAttribute";
+        NodeFlags[NodeFlags["DisallowInContext"] = 65536] = "DisallowInContext";
+        NodeFlags[NodeFlags["YieldContext"] = 131072] = "YieldContext";
+        NodeFlags[NodeFlags["DecoratorContext"] = 262144] = "DecoratorContext";
+        NodeFlags[NodeFlags["AwaitContext"] = 524288] = "AwaitContext";
+        NodeFlags[NodeFlags["ThisNodeHasError"] = 1048576] = "ThisNodeHasError";
+        NodeFlags[NodeFlags["JavaScriptFile"] = 2097152] = "JavaScriptFile";
+        NodeFlags[NodeFlags["ThisNodeOrAnySubNodesHasError"] = 4194304] = "ThisNodeOrAnySubNodesHasError";
+        NodeFlags[NodeFlags["HasAggregatedChildData"] = 8388608] = "HasAggregatedChildData";
         NodeFlags[NodeFlags["BlockScoped"] = 3] = "BlockScoped";
         NodeFlags[NodeFlags["ReachabilityCheckFlags"] = 384] = "ReachabilityCheckFlags";
-        NodeFlags[NodeFlags["EmitHelperFlags"] = 31744] = "EmitHelperFlags";
-        NodeFlags[NodeFlags["ReachabilityAndEmitFlags"] = 32128] = "ReachabilityAndEmitFlags";
+        NodeFlags[NodeFlags["EmitHelperFlags"] = 64512] = "EmitHelperFlags";
+        NodeFlags[NodeFlags["ReachabilityAndEmitFlags"] = 64896] = "ReachabilityAndEmitFlags";
         // Parsing context flags
-        NodeFlags[NodeFlags["ContextFlags"] = 1540096] = "ContextFlags";
+        NodeFlags[NodeFlags["ContextFlags"] = 3080192] = "ContextFlags";
         // Exclude these flags when parsing a Type
-        NodeFlags[NodeFlags["TypeExcludesFlags"] = 327680] = "TypeExcludesFlags";
-    })(ts.NodeFlags || (ts.NodeFlags = {}));
-    var NodeFlags = ts.NodeFlags;
+        NodeFlags[NodeFlags["TypeExcludesFlags"] = 655360] = "TypeExcludesFlags";
+    })(NodeFlags = ts.NodeFlags || (ts.NodeFlags = {}));
+    var ModifierFlags;
     (function (ModifierFlags) {
         ModifierFlags[ModifierFlags["None"] = 0] = "None";
         ModifierFlags[ModifierFlags["Export"] = 1] = "Export";
@@ -431,8 +440,9 @@ var ts;
         ModifierFlags[ModifierFlags["ParameterPropertyModifier"] = 92] = "ParameterPropertyModifier";
         ModifierFlags[ModifierFlags["NonPublicAccessibilityModifier"] = 24] = "NonPublicAccessibilityModifier";
         ModifierFlags[ModifierFlags["TypeScriptModifier"] = 2270] = "TypeScriptModifier";
-    })(ts.ModifierFlags || (ts.ModifierFlags = {}));
-    var ModifierFlags = ts.ModifierFlags;
+        ModifierFlags[ModifierFlags["ExportDefault"] = 513] = "ExportDefault";
+    })(ModifierFlags = ts.ModifierFlags || (ts.ModifierFlags = {}));
+    var JsxFlags;
     (function (JsxFlags) {
         JsxFlags[JsxFlags["None"] = 0] = "None";
         /** An element from a named property of the JSX.IntrinsicElements interface */
@@ -440,24 +450,24 @@ var ts;
         /** An element inferred from the string index signature of the JSX.IntrinsicElements interface */
         JsxFlags[JsxFlags["IntrinsicIndexedElement"] = 2] = "IntrinsicIndexedElement";
         JsxFlags[JsxFlags["IntrinsicElement"] = 3] = "IntrinsicElement";
-    })(ts.JsxFlags || (ts.JsxFlags = {}));
-    var JsxFlags = ts.JsxFlags;
+    })(JsxFlags = ts.JsxFlags || (ts.JsxFlags = {}));
     /* @internal */
+    var RelationComparisonResult;
     (function (RelationComparisonResult) {
         RelationComparisonResult[RelationComparisonResult["Succeeded"] = 1] = "Succeeded";
         RelationComparisonResult[RelationComparisonResult["Failed"] = 2] = "Failed";
         RelationComparisonResult[RelationComparisonResult["FailedAndReported"] = 3] = "FailedAndReported";
-    })(ts.RelationComparisonResult || (ts.RelationComparisonResult = {}));
-    var RelationComparisonResult = ts.RelationComparisonResult;
+    })(RelationComparisonResult = ts.RelationComparisonResult || (ts.RelationComparisonResult = {}));
     /*@internal*/
+    var GeneratedIdentifierKind;
     (function (GeneratedIdentifierKind) {
         GeneratedIdentifierKind[GeneratedIdentifierKind["None"] = 0] = "None";
         GeneratedIdentifierKind[GeneratedIdentifierKind["Auto"] = 1] = "Auto";
         GeneratedIdentifierKind[GeneratedIdentifierKind["Loop"] = 2] = "Loop";
         GeneratedIdentifierKind[GeneratedIdentifierKind["Unique"] = 3] = "Unique";
         GeneratedIdentifierKind[GeneratedIdentifierKind["Node"] = 4] = "Node";
-    })(ts.GeneratedIdentifierKind || (ts.GeneratedIdentifierKind = {}));
-    var GeneratedIdentifierKind = ts.GeneratedIdentifierKind;
+    })(GeneratedIdentifierKind = ts.GeneratedIdentifierKind || (ts.GeneratedIdentifierKind = {}));
+    var FlowFlags;
     (function (FlowFlags) {
         FlowFlags[FlowFlags["Unreachable"] = 1] = "Unreachable";
         FlowFlags[FlowFlags["Start"] = 2] = "Start";
@@ -472,8 +482,7 @@ var ts;
         FlowFlags[FlowFlags["Shared"] = 1024] = "Shared";
         FlowFlags[FlowFlags["Label"] = 12] = "Label";
         FlowFlags[FlowFlags["Condition"] = 96] = "Condition";
-    })(ts.FlowFlags || (ts.FlowFlags = {}));
-    var FlowFlags = ts.FlowFlags;
+    })(FlowFlags = ts.FlowFlags || (ts.FlowFlags = {}));
     var OperationCanceledException = (function () {
         function OperationCanceledException() {
         }
@@ -481,6 +490,7 @@ var ts;
     }());
     ts.OperationCanceledException = OperationCanceledException;
     /** Return code used by getEmitOutput function to indicate status of the function */
+    var ExitStatus;
     (function (ExitStatus) {
         // Compiler ran successfully.  Either this was a simple do-nothing compilation (for example,
         // when -version or -help was provided, or this was a normal compilation, no diagnostics
@@ -490,8 +500,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";
-    })(ts.ExitStatus || (ts.ExitStatus = {}));
-    var ExitStatus = ts.ExitStatus;
+    })(ExitStatus = ts.ExitStatus || (ts.ExitStatus = {}));
+    var TypeFormatFlags;
     (function (TypeFormatFlags) {
         TypeFormatFlags[TypeFormatFlags["None"] = 0] = "None";
         TypeFormatFlags[TypeFormatFlags["WriteArrayAsGenericType"] = 1] = "WriteArrayAsGenericType";
@@ -505,8 +515,8 @@ var ts;
         TypeFormatFlags[TypeFormatFlags["InFirstTypeArgument"] = 256] = "InFirstTypeArgument";
         TypeFormatFlags[TypeFormatFlags["InTypeAlias"] = 512] = "InTypeAlias";
         TypeFormatFlags[TypeFormatFlags["UseTypeAliasValue"] = 1024] = "UseTypeAliasValue";
-    })(ts.TypeFormatFlags || (ts.TypeFormatFlags = {}));
-    var TypeFormatFlags = ts.TypeFormatFlags;
+    })(TypeFormatFlags = ts.TypeFormatFlags || (ts.TypeFormatFlags = {}));
+    var SymbolFormatFlags;
     (function (SymbolFormatFlags) {
         SymbolFormatFlags[SymbolFormatFlags["None"] = 0] = "None";
         // Write symbols's type argument if it is instantiated symbol
@@ -518,23 +528,29 @@ var ts;
         // eg.  module m { export class c { } } import x = m.c;
         // When this flag is specified m.c will be used to refer to the class instead of alias symbol x
         SymbolFormatFlags[SymbolFormatFlags["UseOnlyExternalAliasing"] = 2] = "UseOnlyExternalAliasing";
-    })(ts.SymbolFormatFlags || (ts.SymbolFormatFlags = {}));
-    var SymbolFormatFlags = ts.SymbolFormatFlags;
+    })(SymbolFormatFlags = ts.SymbolFormatFlags || (ts.SymbolFormatFlags = {}));
     /* @internal */
+    var SymbolAccessibility;
     (function (SymbolAccessibility) {
         SymbolAccessibility[SymbolAccessibility["Accessible"] = 0] = "Accessible";
         SymbolAccessibility[SymbolAccessibility["NotAccessible"] = 1] = "NotAccessible";
         SymbolAccessibility[SymbolAccessibility["CannotBeNamed"] = 2] = "CannotBeNamed";
-    })(ts.SymbolAccessibility || (ts.SymbolAccessibility = {}));
-    var SymbolAccessibility = ts.SymbolAccessibility;
+    })(SymbolAccessibility = ts.SymbolAccessibility || (ts.SymbolAccessibility = {}));
+    /* @internal */
+    var SyntheticSymbolKind;
+    (function (SyntheticSymbolKind) {
+        SyntheticSymbolKind[SyntheticSymbolKind["UnionOrIntersection"] = 0] = "UnionOrIntersection";
+        SyntheticSymbolKind[SyntheticSymbolKind["Spread"] = 1] = "Spread";
+    })(SyntheticSymbolKind = ts.SyntheticSymbolKind || (ts.SyntheticSymbolKind = {}));
+    var TypePredicateKind;
     (function (TypePredicateKind) {
         TypePredicateKind[TypePredicateKind["This"] = 0] = "This";
         TypePredicateKind[TypePredicateKind["Identifier"] = 1] = "Identifier";
-    })(ts.TypePredicateKind || (ts.TypePredicateKind = {}));
-    var TypePredicateKind = ts.TypePredicateKind;
+    })(TypePredicateKind = ts.TypePredicateKind || (ts.TypePredicateKind = {}));
     /** Indicates how to serialize the name for a TypeReferenceNode when emitting decorator
       * metadata */
     /* @internal */
+    var TypeReferenceSerializationKind;
     (function (TypeReferenceSerializationKind) {
         TypeReferenceSerializationKind[TypeReferenceSerializationKind["Unknown"] = 0] = "Unknown";
         // should be emitted using a safe fallback.
@@ -552,8 +568,8 @@ var ts;
         TypeReferenceSerializationKind[TypeReferenceSerializationKind["TypeWithCallSignature"] = 9] = "TypeWithCallSignature";
         // with call signatures.
         TypeReferenceSerializationKind[TypeReferenceSerializationKind["ObjectType"] = 10] = "ObjectType";
-    })(ts.TypeReferenceSerializationKind || (ts.TypeReferenceSerializationKind = {}));
-    var TypeReferenceSerializationKind = ts.TypeReferenceSerializationKind;
+    })(TypeReferenceSerializationKind = ts.TypeReferenceSerializationKind || (ts.TypeReferenceSerializationKind = {}));
+    var SymbolFlags;
     (function (SymbolFlags) {
         SymbolFlags[SymbolFlags["None"] = 0] = "None";
         SymbolFlags[SymbolFlags["FunctionScopedVariable"] = 1] = "FunctionScopedVariable";
@@ -628,9 +644,9 @@ var ts;
         // The set of things we consider semantically classifiable.  Used to speed up the LS during
         // classification.
         SymbolFlags[SymbolFlags["Classifiable"] = 788448] = "Classifiable";
-    })(ts.SymbolFlags || (ts.SymbolFlags = {}));
-    var SymbolFlags = ts.SymbolFlags;
+    })(SymbolFlags = ts.SymbolFlags || (ts.SymbolFlags = {}));
     /* @internal */
+    var NodeCheckFlags;
     (function (NodeCheckFlags) {
         NodeCheckFlags[NodeCheckFlags["TypeChecked"] = 1] = "TypeChecked";
         NodeCheckFlags[NodeCheckFlags["LexicalThis"] = 2] = "LexicalThis";
@@ -652,8 +668,8 @@ var ts;
         NodeCheckFlags[NodeCheckFlags["AssignmentsMarked"] = 4194304] = "AssignmentsMarked";
         NodeCheckFlags[NodeCheckFlags["ClassWithConstructorReference"] = 8388608] = "ClassWithConstructorReference";
         NodeCheckFlags[NodeCheckFlags["ConstructorReferenceInClass"] = 16777216] = "ConstructorReferenceInClass";
-    })(ts.NodeCheckFlags || (ts.NodeCheckFlags = {}));
-    var NodeCheckFlags = ts.NodeCheckFlags;
+    })(NodeCheckFlags = ts.NodeCheckFlags || (ts.NodeCheckFlags = {}));
+    var TypeFlags;
     (function (TypeFlags) {
         TypeFlags[TypeFlags["Any"] = 1] = "Any";
         TypeFlags[TypeFlags["String"] = 2] = "String";
@@ -670,24 +686,19 @@ var ts;
         TypeFlags[TypeFlags["Null"] = 4096] = "Null";
         TypeFlags[TypeFlags["Never"] = 8192] = "Never";
         TypeFlags[TypeFlags["TypeParameter"] = 16384] = "TypeParameter";
-        TypeFlags[TypeFlags["Class"] = 32768] = "Class";
-        TypeFlags[TypeFlags["Interface"] = 65536] = "Interface";
-        TypeFlags[TypeFlags["Reference"] = 131072] = "Reference";
-        TypeFlags[TypeFlags["Tuple"] = 262144] = "Tuple";
-        TypeFlags[TypeFlags["Union"] = 524288] = "Union";
-        TypeFlags[TypeFlags["Intersection"] = 1048576] = "Intersection";
-        TypeFlags[TypeFlags["Anonymous"] = 2097152] = "Anonymous";
-        TypeFlags[TypeFlags["Instantiated"] = 4194304] = "Instantiated";
+        TypeFlags[TypeFlags["Object"] = 32768] = "Object";
+        TypeFlags[TypeFlags["Union"] = 65536] = "Union";
+        TypeFlags[TypeFlags["Intersection"] = 131072] = "Intersection";
+        TypeFlags[TypeFlags["Index"] = 262144] = "Index";
+        TypeFlags[TypeFlags["IndexedAccess"] = 524288] = "IndexedAccess";
         /* @internal */
-        TypeFlags[TypeFlags["ObjectLiteral"] = 8388608] = "ObjectLiteral";
+        TypeFlags[TypeFlags["FreshLiteral"] = 1048576] = "FreshLiteral";
         /* @internal */
-        TypeFlags[TypeFlags["FreshLiteral"] = 16777216] = "FreshLiteral";
+        TypeFlags[TypeFlags["ContainsWideningType"] = 2097152] = "ContainsWideningType";
         /* @internal */
-        TypeFlags[TypeFlags["ContainsWideningType"] = 33554432] = "ContainsWideningType";
+        TypeFlags[TypeFlags["ContainsObjectLiteral"] = 4194304] = "ContainsObjectLiteral";
         /* @internal */
-        TypeFlags[TypeFlags["ContainsObjectLiteral"] = 67108864] = "ContainsObjectLiteral";
-        /* @internal */
-        TypeFlags[TypeFlags["ContainsAnyFunctionType"] = 134217728] = "ContainsAnyFunctionType";
+        TypeFlags[TypeFlags["ContainsAnyFunctionType"] = 8388608] = "ContainsAnyFunctionType";
         /* @internal */
         TypeFlags[TypeFlags["Nullable"] = 6144] = "Nullable";
         TypeFlags[TypeFlags["Literal"] = 480] = "Literal";
@@ -703,31 +714,44 @@ var ts;
         TypeFlags[TypeFlags["NumberLike"] = 340] = "NumberLike";
         TypeFlags[TypeFlags["BooleanLike"] = 136] = "BooleanLike";
         TypeFlags[TypeFlags["EnumLike"] = 272] = "EnumLike";
-        TypeFlags[TypeFlags["ObjectType"] = 2588672] = "ObjectType";
-        TypeFlags[TypeFlags["UnionOrIntersection"] = 1572864] = "UnionOrIntersection";
-        TypeFlags[TypeFlags["StructuredType"] = 4161536] = "StructuredType";
-        TypeFlags[TypeFlags["StructuredOrTypeParameter"] = 4177920] = "StructuredOrTypeParameter";
+        TypeFlags[TypeFlags["UnionOrIntersection"] = 196608] = "UnionOrIntersection";
+        TypeFlags[TypeFlags["StructuredType"] = 229376] = "StructuredType";
+        TypeFlags[TypeFlags["StructuredOrTypeParameter"] = 507904] = "StructuredOrTypeParameter";
         // 'Narrowable' types are types where narrowing actually narrows.
         // This *should* be every type other than null, undefined, void, and never
-        TypeFlags[TypeFlags["Narrowable"] = 4178943] = "Narrowable";
-        TypeFlags[TypeFlags["NotUnionOrUnit"] = 2589185] = "NotUnionOrUnit";
+        TypeFlags[TypeFlags["Narrowable"] = 1033215] = "Narrowable";
+        TypeFlags[TypeFlags["NotUnionOrUnit"] = 33281] = "NotUnionOrUnit";
         /* @internal */
-        TypeFlags[TypeFlags["RequiresWidening"] = 100663296] = "RequiresWidening";
+        TypeFlags[TypeFlags["RequiresWidening"] = 6291456] = "RequiresWidening";
         /* @internal */
-        TypeFlags[TypeFlags["PropagatingFlags"] = 234881024] = "PropagatingFlags";
-    })(ts.TypeFlags || (ts.TypeFlags = {}));
-    var TypeFlags = ts.TypeFlags;
+        TypeFlags[TypeFlags["PropagatingFlags"] = 14680064] = "PropagatingFlags";
+    })(TypeFlags = ts.TypeFlags || (ts.TypeFlags = {}));
+    var ObjectFlags;
+    (function (ObjectFlags) {
+        ObjectFlags[ObjectFlags["Class"] = 1] = "Class";
+        ObjectFlags[ObjectFlags["Interface"] = 2] = "Interface";
+        ObjectFlags[ObjectFlags["Reference"] = 4] = "Reference";
+        ObjectFlags[ObjectFlags["Tuple"] = 8] = "Tuple";
+        ObjectFlags[ObjectFlags["Anonymous"] = 16] = "Anonymous";
+        ObjectFlags[ObjectFlags["Mapped"] = 32] = "Mapped";
+        ObjectFlags[ObjectFlags["Instantiated"] = 64] = "Instantiated";
+        ObjectFlags[ObjectFlags["ObjectLiteral"] = 128] = "ObjectLiteral";
+        ObjectFlags[ObjectFlags["EvolvingArray"] = 256] = "EvolvingArray";
+        ObjectFlags[ObjectFlags["ObjectLiteralPatternWithComputedProperties"] = 512] = "ObjectLiteralPatternWithComputedProperties";
+        ObjectFlags[ObjectFlags["ClassOrInterface"] = 3] = "ClassOrInterface";
+    })(ObjectFlags = ts.ObjectFlags || (ts.ObjectFlags = {}));
+    var SignatureKind;
     (function (SignatureKind) {
         SignatureKind[SignatureKind["Call"] = 0] = "Call";
         SignatureKind[SignatureKind["Construct"] = 1] = "Construct";
-    })(ts.SignatureKind || (ts.SignatureKind = {}));
-    var SignatureKind = ts.SignatureKind;
+    })(SignatureKind = ts.SignatureKind || (ts.SignatureKind = {}));
+    var IndexKind;
     (function (IndexKind) {
         IndexKind[IndexKind["String"] = 0] = "String";
         IndexKind[IndexKind["Number"] = 1] = "Number";
-    })(ts.IndexKind || (ts.IndexKind = {}));
-    var IndexKind = ts.IndexKind;
+    })(IndexKind = ts.IndexKind || (ts.IndexKind = {}));
     /* @internal */
+    var SpecialPropertyAssignmentKind;
     (function (SpecialPropertyAssignmentKind) {
         SpecialPropertyAssignmentKind[SpecialPropertyAssignmentKind["None"] = 0] = "None";
         /// exports.name = expr
@@ -738,19 +762,19 @@ var ts;
         SpecialPropertyAssignmentKind[SpecialPropertyAssignmentKind["PrototypeProperty"] = 3] = "PrototypeProperty";
         /// this.name = expr
         SpecialPropertyAssignmentKind[SpecialPropertyAssignmentKind["ThisProperty"] = 4] = "ThisProperty";
-    })(ts.SpecialPropertyAssignmentKind || (ts.SpecialPropertyAssignmentKind = {}));
-    var SpecialPropertyAssignmentKind = ts.SpecialPropertyAssignmentKind;
+    })(SpecialPropertyAssignmentKind = ts.SpecialPropertyAssignmentKind || (ts.SpecialPropertyAssignmentKind = {}));
+    var DiagnosticCategory;
     (function (DiagnosticCategory) {
         DiagnosticCategory[DiagnosticCategory["Warning"] = 0] = "Warning";
         DiagnosticCategory[DiagnosticCategory["Error"] = 1] = "Error";
         DiagnosticCategory[DiagnosticCategory["Message"] = 2] = "Message";
-    })(ts.DiagnosticCategory || (ts.DiagnosticCategory = {}));
-    var DiagnosticCategory = ts.DiagnosticCategory;
+    })(DiagnosticCategory = ts.DiagnosticCategory || (ts.DiagnosticCategory = {}));
+    var ModuleResolutionKind;
     (function (ModuleResolutionKind) {
         ModuleResolutionKind[ModuleResolutionKind["Classic"] = 1] = "Classic";
         ModuleResolutionKind[ModuleResolutionKind["NodeJs"] = 2] = "NodeJs";
-    })(ts.ModuleResolutionKind || (ts.ModuleResolutionKind = {}));
-    var ModuleResolutionKind = ts.ModuleResolutionKind;
+    })(ModuleResolutionKind = ts.ModuleResolutionKind || (ts.ModuleResolutionKind = {}));
+    var ModuleKind;
     (function (ModuleKind) {
         ModuleKind[ModuleKind["None"] = 0] = "None";
         ModuleKind[ModuleKind["CommonJS"] = 1] = "CommonJS";
@@ -758,53 +782,54 @@ var ts;
         ModuleKind[ModuleKind["UMD"] = 3] = "UMD";
         ModuleKind[ModuleKind["System"] = 4] = "System";
         ModuleKind[ModuleKind["ES2015"] = 5] = "ES2015";
-    })(ts.ModuleKind || (ts.ModuleKind = {}));
-    var ModuleKind = ts.ModuleKind;
+    })(ModuleKind = ts.ModuleKind || (ts.ModuleKind = {}));
+    var JsxEmit;
     (function (JsxEmit) {
         JsxEmit[JsxEmit["None"] = 0] = "None";
         JsxEmit[JsxEmit["Preserve"] = 1] = "Preserve";
         JsxEmit[JsxEmit["React"] = 2] = "React";
-    })(ts.JsxEmit || (ts.JsxEmit = {}));
-    var JsxEmit = ts.JsxEmit;
+    })(JsxEmit = ts.JsxEmit || (ts.JsxEmit = {}));
+    var NewLineKind;
     (function (NewLineKind) {
         NewLineKind[NewLineKind["CarriageReturnLineFeed"] = 0] = "CarriageReturnLineFeed";
         NewLineKind[NewLineKind["LineFeed"] = 1] = "LineFeed";
-    })(ts.NewLineKind || (ts.NewLineKind = {}));
-    var NewLineKind = ts.NewLineKind;
+    })(NewLineKind = ts.NewLineKind || (ts.NewLineKind = {}));
+    var ScriptKind;
     (function (ScriptKind) {
         ScriptKind[ScriptKind["Unknown"] = 0] = "Unknown";
         ScriptKind[ScriptKind["JS"] = 1] = "JS";
         ScriptKind[ScriptKind["JSX"] = 2] = "JSX";
         ScriptKind[ScriptKind["TS"] = 3] = "TS";
         ScriptKind[ScriptKind["TSX"] = 4] = "TSX";
-    })(ts.ScriptKind || (ts.ScriptKind = {}));
-    var ScriptKind = ts.ScriptKind;
+    })(ScriptKind = ts.ScriptKind || (ts.ScriptKind = {}));
+    var ScriptTarget;
     (function (ScriptTarget) {
         ScriptTarget[ScriptTarget["ES3"] = 0] = "ES3";
         ScriptTarget[ScriptTarget["ES5"] = 1] = "ES5";
         ScriptTarget[ScriptTarget["ES2015"] = 2] = "ES2015";
         ScriptTarget[ScriptTarget["ES2016"] = 3] = "ES2016";
         ScriptTarget[ScriptTarget["ES2017"] = 4] = "ES2017";
-        ScriptTarget[ScriptTarget["Latest"] = 4] = "Latest";
-    })(ts.ScriptTarget || (ts.ScriptTarget = {}));
-    var ScriptTarget = ts.ScriptTarget;
+        ScriptTarget[ScriptTarget["ESNext"] = 5] = "ESNext";
+        ScriptTarget[ScriptTarget["Latest"] = 5] = "Latest";
+    })(ScriptTarget = ts.ScriptTarget || (ts.ScriptTarget = {}));
+    var LanguageVariant;
     (function (LanguageVariant) {
         LanguageVariant[LanguageVariant["Standard"] = 0] = "Standard";
         LanguageVariant[LanguageVariant["JSX"] = 1] = "JSX";
-    })(ts.LanguageVariant || (ts.LanguageVariant = {}));
-    var LanguageVariant = ts.LanguageVariant;
+    })(LanguageVariant = ts.LanguageVariant || (ts.LanguageVariant = {}));
     /* @internal */
+    var DiagnosticStyle;
     (function (DiagnosticStyle) {
         DiagnosticStyle[DiagnosticStyle["Simple"] = 0] = "Simple";
         DiagnosticStyle[DiagnosticStyle["Pretty"] = 1] = "Pretty";
-    })(ts.DiagnosticStyle || (ts.DiagnosticStyle = {}));
-    var DiagnosticStyle = ts.DiagnosticStyle;
+    })(DiagnosticStyle = ts.DiagnosticStyle || (ts.DiagnosticStyle = {}));
+    var WatchDirectoryFlags;
     (function (WatchDirectoryFlags) {
         WatchDirectoryFlags[WatchDirectoryFlags["None"] = 0] = "None";
         WatchDirectoryFlags[WatchDirectoryFlags["Recursive"] = 1] = "Recursive";
-    })(ts.WatchDirectoryFlags || (ts.WatchDirectoryFlags = {}));
-    var WatchDirectoryFlags = ts.WatchDirectoryFlags;
+    })(WatchDirectoryFlags = ts.WatchDirectoryFlags || (ts.WatchDirectoryFlags = {}));
     /* @internal */
+    var CharacterCodes;
     (function (CharacterCodes) {
         CharacterCodes[CharacterCodes["nullCharacter"] = 0] = "nullCharacter";
         CharacterCodes[CharacterCodes["maxAsciiCharacter"] = 127] = "maxAsciiCharacter";
@@ -931,9 +956,18 @@ var ts;
         CharacterCodes[CharacterCodes["byteOrderMark"] = 65279] = "byteOrderMark";
         CharacterCodes[CharacterCodes["tab"] = 9] = "tab";
         CharacterCodes[CharacterCodes["verticalTab"] = 11] = "verticalTab";
-    })(ts.CharacterCodes || (ts.CharacterCodes = {}));
-    var CharacterCodes = ts.CharacterCodes;
+    })(CharacterCodes = ts.CharacterCodes || (ts.CharacterCodes = {}));
+    var Extension;
+    (function (Extension) {
+        Extension[Extension["Ts"] = 0] = "Ts";
+        Extension[Extension["Tsx"] = 1] = "Tsx";
+        Extension[Extension["Dts"] = 2] = "Dts";
+        Extension[Extension["Js"] = 3] = "Js";
+        Extension[Extension["Jsx"] = 4] = "Jsx";
+        Extension[Extension["LastTypeScriptExtension"] = 2] = "LastTypeScriptExtension";
+    })(Extension = ts.Extension || (ts.Extension = {}));
     /* @internal */
+    var TransformFlags;
     (function (TransformFlags) {
         TransformFlags[TransformFlags["None"] = 0] = "None";
         // Facts
@@ -942,61 +976,66 @@ var ts;
         TransformFlags[TransformFlags["ContainsTypeScript"] = 2] = "ContainsTypeScript";
         TransformFlags[TransformFlags["Jsx"] = 4] = "Jsx";
         TransformFlags[TransformFlags["ContainsJsx"] = 8] = "ContainsJsx";
-        TransformFlags[TransformFlags["ES2017"] = 16] = "ES2017";
-        TransformFlags[TransformFlags["ContainsES2017"] = 32] = "ContainsES2017";
-        TransformFlags[TransformFlags["ES2016"] = 64] = "ES2016";
-        TransformFlags[TransformFlags["ContainsES2016"] = 128] = "ContainsES2016";
-        TransformFlags[TransformFlags["ES2015"] = 256] = "ES2015";
-        TransformFlags[TransformFlags["ContainsES2015"] = 512] = "ContainsES2015";
-        TransformFlags[TransformFlags["DestructuringAssignment"] = 1024] = "DestructuringAssignment";
-        TransformFlags[TransformFlags["Generator"] = 2048] = "Generator";
-        TransformFlags[TransformFlags["ContainsGenerator"] = 4096] = "ContainsGenerator";
+        TransformFlags[TransformFlags["ESNext"] = 16] = "ESNext";
+        TransformFlags[TransformFlags["ContainsESNext"] = 32] = "ContainsESNext";
+        TransformFlags[TransformFlags["ES2017"] = 64] = "ES2017";
+        TransformFlags[TransformFlags["ContainsES2017"] = 128] = "ContainsES2017";
+        TransformFlags[TransformFlags["ES2016"] = 256] = "ES2016";
+        TransformFlags[TransformFlags["ContainsES2016"] = 512] = "ContainsES2016";
+        TransformFlags[TransformFlags["ES2015"] = 1024] = "ES2015";
+        TransformFlags[TransformFlags["ContainsES2015"] = 2048] = "ContainsES2015";
+        TransformFlags[TransformFlags["Generator"] = 4096] = "Generator";
+        TransformFlags[TransformFlags["ContainsGenerator"] = 8192] = "ContainsGenerator";
+        TransformFlags[TransformFlags["DestructuringAssignment"] = 16384] = "DestructuringAssignment";
+        TransformFlags[TransformFlags["ContainsDestructuringAssignment"] = 32768] = "ContainsDestructuringAssignment";
         // Markers
         // - Flags used to indicate that a subtree contains a specific transformation.
-        TransformFlags[TransformFlags["ContainsDecorators"] = 8192] = "ContainsDecorators";
-        TransformFlags[TransformFlags["ContainsPropertyInitializer"] = 16384] = "ContainsPropertyInitializer";
-        TransformFlags[TransformFlags["ContainsLexicalThis"] = 32768] = "ContainsLexicalThis";
-        TransformFlags[TransformFlags["ContainsCapturedLexicalThis"] = 65536] = "ContainsCapturedLexicalThis";
-        TransformFlags[TransformFlags["ContainsLexicalThisInComputedPropertyName"] = 131072] = "ContainsLexicalThisInComputedPropertyName";
-        TransformFlags[TransformFlags["ContainsDefaultValueAssignments"] = 262144] = "ContainsDefaultValueAssignments";
-        TransformFlags[TransformFlags["ContainsParameterPropertyAssignments"] = 524288] = "ContainsParameterPropertyAssignments";
-        TransformFlags[TransformFlags["ContainsSpreadElementExpression"] = 1048576] = "ContainsSpreadElementExpression";
-        TransformFlags[TransformFlags["ContainsComputedPropertyName"] = 2097152] = "ContainsComputedPropertyName";
-        TransformFlags[TransformFlags["ContainsBlockScopedBinding"] = 4194304] = "ContainsBlockScopedBinding";
-        TransformFlags[TransformFlags["ContainsBindingPattern"] = 8388608] = "ContainsBindingPattern";
-        TransformFlags[TransformFlags["ContainsYield"] = 16777216] = "ContainsYield";
-        TransformFlags[TransformFlags["ContainsHoistedDeclarationOrCompletion"] = 33554432] = "ContainsHoistedDeclarationOrCompletion";
+        TransformFlags[TransformFlags["ContainsDecorators"] = 65536] = "ContainsDecorators";
+        TransformFlags[TransformFlags["ContainsPropertyInitializer"] = 131072] = "ContainsPropertyInitializer";
+        TransformFlags[TransformFlags["ContainsLexicalThis"] = 262144] = "ContainsLexicalThis";
+        TransformFlags[TransformFlags["ContainsCapturedLexicalThis"] = 524288] = "ContainsCapturedLexicalThis";
+        TransformFlags[TransformFlags["ContainsLexicalThisInComputedPropertyName"] = 1048576] = "ContainsLexicalThisInComputedPropertyName";
+        TransformFlags[TransformFlags["ContainsDefaultValueAssignments"] = 2097152] = "ContainsDefaultValueAssignments";
+        TransformFlags[TransformFlags["ContainsParameterPropertyAssignments"] = 4194304] = "ContainsParameterPropertyAssignments";
+        TransformFlags[TransformFlags["ContainsSpreadExpression"] = 8388608] = "ContainsSpreadExpression";
+        TransformFlags[TransformFlags["ContainsComputedPropertyName"] = 16777216] = "ContainsComputedPropertyName";
+        TransformFlags[TransformFlags["ContainsBlockScopedBinding"] = 33554432] = "ContainsBlockScopedBinding";
+        TransformFlags[TransformFlags["ContainsBindingPattern"] = 67108864] = "ContainsBindingPattern";
+        TransformFlags[TransformFlags["ContainsYield"] = 134217728] = "ContainsYield";
+        TransformFlags[TransformFlags["ContainsHoistedDeclarationOrCompletion"] = 268435456] = "ContainsHoistedDeclarationOrCompletion";
         TransformFlags[TransformFlags["HasComputedFlags"] = 536870912] = "HasComputedFlags";
         // Assertions
         // - Bitmasks that are used to assert facts about the syntax of a node and its subtree.
         TransformFlags[TransformFlags["AssertTypeScript"] = 3] = "AssertTypeScript";
         TransformFlags[TransformFlags["AssertJsx"] = 12] = "AssertJsx";
-        TransformFlags[TransformFlags["AssertES2017"] = 48] = "AssertES2017";
-        TransformFlags[TransformFlags["AssertES2016"] = 192] = "AssertES2016";
-        TransformFlags[TransformFlags["AssertES2015"] = 768] = "AssertES2015";
-        TransformFlags[TransformFlags["AssertGenerator"] = 6144] = "AssertGenerator";
+        TransformFlags[TransformFlags["AssertESNext"] = 48] = "AssertESNext";
+        TransformFlags[TransformFlags["AssertES2017"] = 192] = "AssertES2017";
+        TransformFlags[TransformFlags["AssertES2016"] = 768] = "AssertES2016";
+        TransformFlags[TransformFlags["AssertES2015"] = 3072] = "AssertES2015";
+        TransformFlags[TransformFlags["AssertGenerator"] = 12288] = "AssertGenerator";
+        TransformFlags[TransformFlags["AssertDestructuringAssignment"] = 49152] = "AssertDestructuringAssignment";
         // Scope Exclusions
         // - Bitmasks that exclude flags from propagating out of a specific context
         //   into the subtree flags of their container.
-        TransformFlags[TransformFlags["NodeExcludes"] = 536874325] = "NodeExcludes";
-        TransformFlags[TransformFlags["ArrowFunctionExcludes"] = 592227669] = "ArrowFunctionExcludes";
-        TransformFlags[TransformFlags["FunctionExcludes"] = 592293205] = "FunctionExcludes";
-        TransformFlags[TransformFlags["ConstructorExcludes"] = 591760725] = "ConstructorExcludes";
-        TransformFlags[TransformFlags["MethodOrAccessorExcludes"] = 591760725] = "MethodOrAccessorExcludes";
-        TransformFlags[TransformFlags["ClassExcludes"] = 539749717] = "ClassExcludes";
-        TransformFlags[TransformFlags["ModuleExcludes"] = 574729557] = "ModuleExcludes";
+        TransformFlags[TransformFlags["NodeExcludes"] = 536892757] = "NodeExcludes";
+        TransformFlags[TransformFlags["ArrowFunctionExcludes"] = 979719509] = "ArrowFunctionExcludes";
+        TransformFlags[TransformFlags["FunctionExcludes"] = 980243797] = "FunctionExcludes";
+        TransformFlags[TransformFlags["ConstructorExcludes"] = 975983957] = "ConstructorExcludes";
+        TransformFlags[TransformFlags["MethodOrAccessorExcludes"] = 975983957] = "MethodOrAccessorExcludes";
+        TransformFlags[TransformFlags["ClassExcludes"] = 559895893] = "ClassExcludes";
+        TransformFlags[TransformFlags["ModuleExcludes"] = 839734613] = "ModuleExcludes";
         TransformFlags[TransformFlags["TypeExcludes"] = -3] = "TypeExcludes";
-        TransformFlags[TransformFlags["ObjectLiteralExcludes"] = 539110741] = "ObjectLiteralExcludes";
-        TransformFlags[TransformFlags["ArrayLiteralOrCallOrNewExcludes"] = 537922901] = "ArrayLiteralOrCallOrNewExcludes";
-        TransformFlags[TransformFlags["VariableDeclarationListExcludes"] = 545262933] = "VariableDeclarationListExcludes";
-        TransformFlags[TransformFlags["ParameterExcludes"] = 545262933] = "ParameterExcludes";
+        TransformFlags[TransformFlags["ObjectLiteralExcludes"] = 554784085] = "ObjectLiteralExcludes";
+        TransformFlags[TransformFlags["ArrayLiteralOrCallOrNewExcludes"] = 545281365] = "ArrayLiteralOrCallOrNewExcludes";
+        TransformFlags[TransformFlags["VariableDeclarationListExcludes"] = 604001621] = "VariableDeclarationListExcludes";
+        TransformFlags[TransformFlags["ParameterExcludes"] = 604001621] = "ParameterExcludes";
         // Masks
         // - Additional bitmasks
-        TransformFlags[TransformFlags["TypeScriptClassSyntaxMask"] = 548864] = "TypeScriptClassSyntaxMask";
-        TransformFlags[TransformFlags["ES2015FunctionSyntaxMask"] = 327680] = "ES2015FunctionSyntaxMask";
-    })(ts.TransformFlags || (ts.TransformFlags = {}));
-    var TransformFlags = ts.TransformFlags;
+        TransformFlags[TransformFlags["TypeScriptClassSyntaxMask"] = 4390912] = "TypeScriptClassSyntaxMask";
+        TransformFlags[TransformFlags["ES2015FunctionSyntaxMask"] = 2621440] = "ES2015FunctionSyntaxMask";
+    })(TransformFlags = ts.TransformFlags || (ts.TransformFlags = {}));
     /* @internal */
+    var EmitFlags;
     (function (EmitFlags) {
         EmitFlags[EmitFlags["EmitEmitHelpers"] = 1] = "EmitEmitHelpers";
         EmitFlags[EmitFlags["EmitExportStar"] = 2] = "EmitExportStar";
@@ -1025,16 +1064,17 @@ var ts;
         EmitFlags[EmitFlags["AsyncFunctionBody"] = 2097152] = "AsyncFunctionBody";
         EmitFlags[EmitFlags["ReuseTempVariableScope"] = 4194304] = "ReuseTempVariableScope";
         EmitFlags[EmitFlags["CustomPrologue"] = 8388608] = "CustomPrologue";
-    })(ts.EmitFlags || (ts.EmitFlags = {}));
-    var EmitFlags = ts.EmitFlags;
+        EmitFlags[EmitFlags["NoHoisting"] = 16777216] = "NoHoisting";
+        EmitFlags[EmitFlags["HasEndOfDeclarationMarker"] = 33554432] = "HasEndOfDeclarationMarker";
+    })(EmitFlags = ts.EmitFlags || (ts.EmitFlags = {}));
     /* @internal */
+    var EmitContext;
     (function (EmitContext) {
         EmitContext[EmitContext["SourceFile"] = 0] = "SourceFile";
         EmitContext[EmitContext["Expression"] = 1] = "Expression";
         EmitContext[EmitContext["IdentifierName"] = 2] = "IdentifierName";
         EmitContext[EmitContext["Unspecified"] = 3] = "Unspecified";
-    })(ts.EmitContext || (ts.EmitContext = {}));
-    var EmitContext = ts.EmitContext;
+    })(EmitContext = ts.EmitContext || (ts.EmitContext = {}));
 })(ts || (ts = {}));
 /*@internal*/
 var ts;
@@ -1144,12 +1184,12 @@ var ts;
      * x | y is Maybe if either x or y is Maybe, but neither x or y is True.
      * x | y is True if either x or y is True.
      */
+    var Ternary;
     (function (Ternary) {
         Ternary[Ternary["False"] = 0] = "False";
         Ternary[Ternary["Maybe"] = 1] = "Maybe";
         Ternary[Ternary["True"] = -1] = "True";
-    })(ts.Ternary || (ts.Ternary = {}));
-    var Ternary = ts.Ternary;
+    })(Ternary = ts.Ternary || (ts.Ternary = {}));
     var createObject = Object.create;
     // More efficient to create a collator once and use its `compare` than to call `a.localeCompare(b)` many times.
     ts.collator = typeof Intl === "object" && typeof Intl.Collator === "function" ? new Intl.Collator() : undefined;
@@ -1221,12 +1261,12 @@ var ts;
         return getCanonicalFileName(nonCanonicalizedPath);
     }
     ts.toPath = toPath;
+    var Comparison;
     (function (Comparison) {
         Comparison[Comparison["LessThan"] = -1] = "LessThan";
         Comparison[Comparison["EqualTo"] = 0] = "EqualTo";
         Comparison[Comparison["GreaterThan"] = 1] = "GreaterThan";
-    })(ts.Comparison || (ts.Comparison = {}));
-    var Comparison = ts.Comparison;
+    })(Comparison = ts.Comparison || (ts.Comparison = {}));
     /**
      * Iterates through 'array' by index and performs the callback on each element of array until the callback
      * returns a truthy value, then returns that value.
@@ -1244,6 +1284,13 @@ var ts;
         return undefined;
     }
     ts.forEach = forEach;
+    function zipWith(arrayA, arrayB, callback) {
+        Debug.assert(arrayA.length === arrayB.length);
+        for (var i = 0; i < arrayA.length; i++) {
+            callback(arrayA[i], arrayB[i], i);
+        }
+    }
+    ts.zipWith = zipWith;
     /**
      * Iterates through `array` by index and performs the callback on each element of array until the callback
      * returns a falsey value, then returns false.
@@ -1536,20 +1583,25 @@ var ts;
     ts.mapObject = mapObject;
     function some(array, predicate) {
         if (array) {
-            for (var _i = 0, array_5 = array; _i < array_5.length; _i++) {
-                var v = array_5[_i];
-                if (!predicate || predicate(v)) {
-                    return true;
+            if (predicate) {
+                for (var _i = 0, array_5 = array; _i < array_5.length; _i++) {
+                    var v = array_5[_i];
+                    if (predicate(v)) {
+                        return true;
+                    }
                 }
             }
+            else {
+                return array.length > 0;
+            }
         }
         return false;
     }
     ts.some = some;
     function concatenate(array1, array2) {
-        if (!array2 || !array2.length)
+        if (!some(array2))
             return array1;
-        if (!array1 || !array1.length)
+        if (!some(array1))
             return array2;
         return array1.concat(array2);
     }
@@ -1573,6 +1625,41 @@ var ts;
         return result;
     }
     ts.deduplicate = deduplicate;
+    function arrayIsEqualTo(array1, array2, equaler) {
+        if (!array1 || !array2) {
+            return array1 === array2;
+        }
+        if (array1.length !== array2.length) {
+            return false;
+        }
+        for (var i = 0; i < array1.length; i++) {
+            var equals = equaler ? equaler(array1[i], array2[i]) : array1[i] === array2[i];
+            if (!equals) {
+                return false;
+            }
+        }
+        return true;
+    }
+    ts.arrayIsEqualTo = arrayIsEqualTo;
+    function changesAffectModuleResolution(oldOptions, newOptions) {
+        return !oldOptions ||
+            (oldOptions.module !== newOptions.module) ||
+            (oldOptions.moduleResolution !== newOptions.moduleResolution) ||
+            (oldOptions.noResolve !== newOptions.noResolve) ||
+            (oldOptions.target !== newOptions.target) ||
+            (oldOptions.noLib !== newOptions.noLib) ||
+            (oldOptions.jsx !== newOptions.jsx) ||
+            (oldOptions.allowJs !== newOptions.allowJs) ||
+            (oldOptions.rootDir !== newOptions.rootDir) ||
+            (oldOptions.configFilePath !== newOptions.configFilePath) ||
+            (oldOptions.baseUrl !== newOptions.baseUrl) ||
+            (oldOptions.maxNodeModuleJsDepth !== newOptions.maxNodeModuleJsDepth) ||
+            !arrayIsEqualTo(oldOptions.lib, newOptions.lib) ||
+            !arrayIsEqualTo(oldOptions.typeRoots, newOptions.typeRoots) ||
+            !arrayIsEqualTo(oldOptions.rootDirs, newOptions.rootDirs) ||
+            !equalOwnProperties(oldOptions.paths, newOptions.paths);
+    }
+    ts.changesAffectModuleResolution = changesAffectModuleResolution;
     /**
      * Compacts an array, removing any falsey elements.
      */
@@ -1594,6 +1681,31 @@ var ts;
         return result || array;
     }
     ts.compact = compact;
+    /**
+     * Gets the relative complement of `arrayA` with respect to `b`, returning the elements that
+     * are not present in `arrayA` but are present in `arrayB`. Assumes both arrays are sorted
+     * based on the provided comparer.
+     */
+    function relativeComplement(arrayA, arrayB, comparer, offsetA, offsetB) {
+        if (comparer === void 0) { comparer = compareValues; }
+        if (offsetA === void 0) { offsetA = 0; }
+        if (offsetB === void 0) { offsetB = 0; }
+        if (!arrayB || !arrayA || arrayB.length === 0 || arrayA.length === 0)
+            return arrayB;
+        var result = [];
+        outer: for (; offsetB < arrayB.length; offsetB++) {
+            inner: for (; offsetA < arrayA.length; offsetA++) {
+                switch (comparer(arrayB[offsetB], arrayA[offsetA])) {
+                    case -1 /* LessThan */: break inner;
+                    case 0 /* EqualTo */: continue outer;
+                    case 1 /* GreaterThan */: continue inner;
+                }
+            }
+            result.push(arrayB[offsetB]);
+        }
+        return result;
+    }
+    ts.relativeComplement = relativeComplement;
     function sum(array, prop) {
         var result = 0;
         for (var _i = 0, array_7 = array; _i < array_7.length; _i++) {
@@ -1603,15 +1715,39 @@ var ts;
         return result;
     }
     ts.sum = sum;
+    /**
+     * Appends a value to an array, returning the array.
+     *
+     * @param to The array to which `value` is to be appended. If `to` is `undefined`, a new array
+     * is created if `value` was appended.
+     * @param value The value to append to the array. If `value` is `undefined`, nothing is
+     * appended.
+     */
+    function append(to, value) {
+        if (value === undefined)
+            return to;
+        if (to === undefined)
+            to = [];
+        to.push(value);
+        return to;
+    }
+    ts.append = append;
+    /**
+     * Appends a range of value to an array, returning the array.
+     *
+     * @param to The array to which `value` is to be appended. If `to` is `undefined`, a new array
+     * is created if `value` was appended.
+     * @param from The values to append to the array. If `from` is `undefined`, nothing is
+     * appended. If an element of `from` is `undefined`, that element is not appended.
+     */
     function addRange(to, from) {
-        if (to && from) {
-            for (var _i = 0, from_1 = from; _i < from_1.length; _i++) {
-                var v = from_1[_i];
-                if (v !== undefined) {
-                    to.push(v);
-                }
-            }
+        if (from === undefined)
+            return to;
+        for (var _i = 0, from_1 = from; _i < from_1.length; _i++) {
+            var v = from_1[_i];
+            to = append(to, v);
         }
+        return to;
     }
     ts.addRange = addRange;
     function rangeEquals(array1, array2, pos, end) {
@@ -1624,26 +1760,17 @@ var ts;
         return true;
     }
     ts.rangeEquals = rangeEquals;
+    /**
+     * Returns the first element of an array if non-empty, `undefined` otherwise.
+     */
     function firstOrUndefined(array) {
         return array && array.length > 0
             ? array[0]
             : undefined;
     }
     ts.firstOrUndefined = firstOrUndefined;
-    function singleOrUndefined(array) {
-        return array && array.length === 1
-            ? array[0]
-            : undefined;
-    }
-    ts.singleOrUndefined = singleOrUndefined;
-    function singleOrMany(array) {
-        return array && array.length === 1
-            ? array[0]
-            : array;
-    }
-    ts.singleOrMany = singleOrMany;
     /**
-     * Returns the last element of an array if non-empty, undefined otherwise.
+     * Returns the last element of an array if non-empty, `undefined` otherwise.
      */
     function lastOrUndefined(array) {
         return array && array.length > 0
@@ -1651,6 +1778,31 @@ var ts;
             : undefined;
     }
     ts.lastOrUndefined = lastOrUndefined;
+    /**
+     * Returns the only element of an array if it contains only one element, `undefined` otherwise.
+     */
+    function singleOrUndefined(array) {
+        return array && array.length === 1
+            ? array[0]
+            : undefined;
+    }
+    ts.singleOrUndefined = singleOrUndefined;
+    /**
+     * Returns the only element of an array if it contains only one element; otheriwse, returns the
+     * array.
+     */
+    function singleOrMany(array) {
+        return array && array.length === 1
+            ? array[0]
+            : array;
+    }
+    ts.singleOrMany = singleOrMany;
+    function replaceElement(array, index, value) {
+        var result = array.slice(0);
+        result[index] = value;
+        return result;
+    }
+    ts.replaceElement = replaceElement;
     /**
      * Performs a binary search, finding the index at which 'value' occurs in 'array'.
      * If no such index is found, returns the 2's-complement of first index at which
@@ -1658,11 +1810,11 @@ var ts;
      * @param array A sorted array whose first element must be no larger than number
      * @param number The value to be searched for in the array.
      */
-    function binarySearch(array, value, comparer) {
+    function binarySearch(array, value, comparer, offset) {
         if (!array || array.length === 0) {
             return -1;
         }
-        var low = 0;
+        var low = offset || 0;
         var high = array.length - 1;
         comparer = comparer !== undefined
             ? comparer
@@ -1978,6 +2130,14 @@ var ts;
         return Array.isArray ? Array.isArray(value) : value instanceof Array;
     }
     ts.isArray = isArray;
+    /** Does nothing. */
+    function noop() { }
+    ts.noop = noop;
+    /** Throws an error because a function is not implemented. */
+    function notImplemented() {
+        throw new Error("Not implemented");
+    }
+    ts.notImplemented = notImplemented;
     function memoize(callback) {
         var value;
         return function () {
@@ -2094,6 +2254,17 @@ var ts;
         };
     }
     ts.createCompilerDiagnostic = createCompilerDiagnostic;
+    function createCompilerDiagnosticFromMessageChain(chain) {
+        return {
+            file: undefined,
+            start: undefined,
+            length: undefined,
+            code: chain.code,
+            category: chain.category,
+            messageText: chain.next ? chain : chain.messageText
+        };
+    }
+    ts.createCompilerDiagnosticFromMessageChain = createCompilerDiagnosticFromMessageChain;
     function chainDiagnosticMessages(details, message) {
         var text = getLocaleSpecificMessage(message);
         if (arguments.length > 2) {
@@ -2541,6 +2712,10 @@ var ts;
         return expectedPos >= 0 && str.indexOf(suffix, expectedPos) === expectedPos;
     }
     ts.endsWith = endsWith;
+    function hasExtension(fileName) {
+        return getBaseFileName(fileName).indexOf(".") >= 0;
+    }
+    ts.hasExtension = hasExtension;
     function fileExtensionIs(path, extension) {
         return path.length > extension.length && endsWith(path, extension);
     }
@@ -2581,73 +2756,93 @@ var ts;
         var doubleAsteriskRegexFragment = usage === "exclude" ? "(/.+?)?" : "(/[^/.][^/]*)*?";
         var pattern = "";
         var hasWrittenSubpattern = false;
-        spec: for (var _i = 0, specs_1 = specs; _i < specs_1.length; _i++) {
+        for (var _i = 0, specs_1 = specs; _i < specs_1.length; _i++) {
             var spec = specs_1[_i];
             if (!spec) {
                 continue;
             }
-            var subpattern = "";
-            var hasRecursiveDirectoryWildcard = false;
-            var hasWrittenComponent = false;
-            var components = getNormalizedPathComponents(spec, basePath);
-            if (usage !== "exclude" && components[components.length - 1] === "**") {
-                continue spec;
-            }
-            // getNormalizedPathComponents includes the separator for the root component.
-            // We need to remove to create our regex correctly.
-            components[0] = removeTrailingDirectorySeparator(components[0]);
-            var optionalCount = 0;
-            for (var _a = 0, components_1 = components; _a < components_1.length; _a++) {
-                var component = components_1[_a];
-                if (component === "**") {
-                    if (hasRecursiveDirectoryWildcard) {
-                        continue spec;
-                    }
-                    subpattern += doubleAsteriskRegexFragment;
-                    hasRecursiveDirectoryWildcard = true;
-                    hasWrittenComponent = true;
-                }
-                else {
-                    if (usage === "directories") {
-                        subpattern += "(";
-                        optionalCount++;
-                    }
-                    if (hasWrittenComponent) {
-                        subpattern += ts.directorySeparator;
-                    }
-                    if (usage !== "exclude") {
-                        // The * and ? wildcards should not match directories or files that start with . if they
-                        // appear first in a component. Dotted directories and files can be included explicitly
-                        // like so: **/.*/.*
-                        if (component.charCodeAt(0) === 42 /* asterisk */) {
-                            subpattern += "([^./]" + singleAsteriskRegexFragment + ")?";
-                            component = component.substr(1);
-                        }
-                        else if (component.charCodeAt(0) === 63 /* question */) {
-                            subpattern += "[^./]";
-                            component = component.substr(1);
-                        }
-                    }
-                    subpattern += component.replace(reservedCharacterPattern, replaceWildcardCharacter);
-                    hasWrittenComponent = true;
-                }
-            }
-            while (optionalCount > 0) {
-                subpattern += ")?";
-                optionalCount--;
+            var subPattern = getSubPatternFromSpec(spec, basePath, usage, singleAsteriskRegexFragment, doubleAsteriskRegexFragment, replaceWildcardCharacter);
+            if (subPattern === undefined) {
+                continue;
             }
             if (hasWrittenSubpattern) {
                 pattern += "|";
             }
-            pattern += "(" + subpattern + ")";
+            pattern += "(" + subPattern + ")";
             hasWrittenSubpattern = true;
         }
         if (!pattern) {
             return undefined;
         }
-        return "^(" + pattern + (usage === "exclude" ? ")($|/)" : ")$");
+        // If excluding, match "foo/bar/baz...", but if including, only allow "foo".
+        var terminator = usage === "exclude" ? "($|/)" : "$";
+        return "^(" + pattern + ")" + terminator;
     }
     ts.getRegularExpressionForWildcard = getRegularExpressionForWildcard;
+    /**
+     * An "includes" path "foo" is implicitly a glob "foo/** /*" (without the space) if its last component has no extension,
+     * and does not contain any glob characters itself.
+     */
+    function isImplicitGlob(lastPathComponent) {
+        return !/[.*?]/.test(lastPathComponent);
+    }
+    ts.isImplicitGlob = isImplicitGlob;
+    function getSubPatternFromSpec(spec, basePath, usage, singleAsteriskRegexFragment, doubleAsteriskRegexFragment, replaceWildcardCharacter) {
+        var subpattern = "";
+        var hasRecursiveDirectoryWildcard = false;
+        var hasWrittenComponent = false;
+        var components = getNormalizedPathComponents(spec, basePath);
+        var lastComponent = lastOrUndefined(components);
+        if (usage !== "exclude" && lastComponent === "**") {
+            return undefined;
+        }
+        // getNormalizedPathComponents includes the separator for the root component.
+        // We need to remove to create our regex correctly.
+        components[0] = removeTrailingDirectorySeparator(components[0]);
+        if (isImplicitGlob(lastComponent)) {
+            components.push("**", "*");
+        }
+        var optionalCount = 0;
+        for (var _i = 0, components_1 = components; _i < components_1.length; _i++) {
+            var component = components_1[_i];
+            if (component === "**") {
+                if (hasRecursiveDirectoryWildcard) {
+                    return undefined;
+                }
+                subpattern += doubleAsteriskRegexFragment;
+                hasRecursiveDirectoryWildcard = true;
+            }
+            else {
+                if (usage === "directories") {
+                    subpattern += "(";
+                    optionalCount++;
+                }
+                if (hasWrittenComponent) {
+                    subpattern += ts.directorySeparator;
+                }
+                if (usage !== "exclude") {
+                    // The * and ? wildcards should not match directories or files that start with . if they
+                    // appear first in a component. Dotted directories and files can be included explicitly
+                    // like so: **/.*/.*
+                    if (component.charCodeAt(0) === 42 /* asterisk */) {
+                        subpattern += "([^./]" + singleAsteriskRegexFragment + ")?";
+                        component = component.substr(1);
+                    }
+                    else if (component.charCodeAt(0) === 63 /* question */) {
+                        subpattern += "[^./]";
+                        component = component.substr(1);
+                    }
+                }
+                subpattern += component.replace(reservedCharacterPattern, replaceWildcardCharacter);
+            }
+            hasWrittenComponent = true;
+        }
+        while (optionalCount > 0) {
+            subpattern += ")?";
+            optionalCount--;
+        }
+        return subpattern;
+    }
     function replaceWildCardCharacterFiles(match) {
         return replaceWildcardCharacter(match, singleAsteriskRegexFragmentFiles);
     }
@@ -2721,29 +2916,35 @@ var ts;
                 // We also need to check the relative paths by converting them to absolute and normalizing
                 // in case they escape the base path (e.g "..\somedirectory")
                 var absolute = isRootedDiskPath(include) ? include : normalizePath(combinePaths(path, include));
-                var wildcardOffset = indexOfAnyCharCode(absolute, wildcardCharCodes);
-                var includeBasePath = wildcardOffset < 0
-                    ? removeTrailingDirectorySeparator(getDirectoryPath(absolute))
-                    : absolute.substring(0, absolute.lastIndexOf(ts.directorySeparator, wildcardOffset));
                 // Append the literal and canonical candidate base paths.
-                includeBasePaths.push(includeBasePath);
+                includeBasePaths.push(getIncludeBasePath(absolute));
             }
             // Sort the offsets array using either the literal or canonical path representations.
             includeBasePaths.sort(useCaseSensitiveFileNames ? compareStrings : compareStringsCaseInsensitive);
+            var _loop_1 = function (includeBasePath) {
+                if (ts.every(basePaths, function (basePath) { return !containsPath(basePath, includeBasePath, path, !useCaseSensitiveFileNames); })) {
+                    basePaths.push(includeBasePath);
+                }
+            };
             // Iterate over each include base path and include unique base paths that are not a
             // subpath of an existing base path
-            include: for (var i = 0; i < includeBasePaths.length; i++) {
-                var includeBasePath = includeBasePaths[i];
-                for (var j = 0; j < basePaths.length; j++) {
-                    if (containsPath(basePaths[j], includeBasePath, path, !useCaseSensitiveFileNames)) {
-                        continue include;
-                    }
-                }
-                basePaths.push(includeBasePath);
+            for (var _a = 0, includeBasePaths_1 = includeBasePaths; _a < includeBasePaths_1.length; _a++) {
+                var includeBasePath = includeBasePaths_1[_a];
+                _loop_1(includeBasePath);
             }
         }
         return basePaths;
     }
+    function getIncludeBasePath(absolute) {
+        var wildcardOffset = indexOfAnyCharCode(absolute, wildcardCharCodes);
+        if (wildcardOffset < 0) {
+            // No "*" or "?" in the path
+            return !hasExtension(absolute)
+                ? absolute
+                : removeTrailingDirectorySeparator(getDirectoryPath(absolute));
+        }
+        return absolute.substring(0, absolute.lastIndexOf(ts.directorySeparator, wildcardOffset));
+    }
     function ensureScriptKind(fileName, scriptKind) {
         // Using scriptKind as a condition handles both:
         // - 'scriptKind' is unspecified and thus it is `undefined`
@@ -2808,14 +3009,14 @@ var ts;
      * aligned to the offset of the highest priority extension in the
      * allSupportedExtensions array.
      */
+    var ExtensionPriority;
     (function (ExtensionPriority) {
         ExtensionPriority[ExtensionPriority["TypeScriptFiles"] = 0] = "TypeScriptFiles";
         ExtensionPriority[ExtensionPriority["DeclarationAndJavaScriptFiles"] = 2] = "DeclarationAndJavaScriptFiles";
         ExtensionPriority[ExtensionPriority["Limit"] = 5] = "Limit";
         ExtensionPriority[ExtensionPriority["Highest"] = 0] = "Highest";
         ExtensionPriority[ExtensionPriority["Lowest"] = 2] = "Lowest";
-    })(ts.ExtensionPriority || (ts.ExtensionPriority = {}));
-    var ExtensionPriority = ts.ExtensionPriority;
+    })(ExtensionPriority = ts.ExtensionPriority || (ts.ExtensionPriority = {}));
     function getExtensionPriority(path, supportedExtensions) {
         for (var i = supportedExtensions.length - 1; i >= 0; i--) {
             if (fileExtensionIs(path, supportedExtensions[i])) {
@@ -2874,10 +3075,6 @@ var ts;
         return path.substring(0, path.length - extension.length);
     }
     ts.removeExtension = removeExtension;
-    function isJsxOrTsxExtension(ext) {
-        return ext === ".jsx" || ext === ".tsx";
-    }
-    ts.isJsxOrTsxExtension = isJsxOrTsxExtension;
     function changeExtension(path, newExtension) {
         return (removeFileExtension(path) + newExtension);
     }
@@ -2912,13 +3109,13 @@ var ts;
         getTypeConstructor: function () { return Type; },
         getSignatureConstructor: function () { return Signature; }
     };
+    var AssertionLevel;
     (function (AssertionLevel) {
         AssertionLevel[AssertionLevel["None"] = 0] = "None";
         AssertionLevel[AssertionLevel["Normal"] = 1] = "Normal";
         AssertionLevel[AssertionLevel["Aggressive"] = 2] = "Aggressive";
         AssertionLevel[AssertionLevel["VeryAggressive"] = 3] = "VeryAggressive";
-    })(ts.AssertionLevel || (ts.AssertionLevel = {}));
-    var AssertionLevel = ts.AssertionLevel;
+    })(AssertionLevel = ts.AssertionLevel || (ts.AssertionLevel = {}));
     var Debug;
     (function (Debug) {
         Debug.currentAssertionLevel = 0 /* None */;
@@ -3055,6 +3252,41 @@ var ts;
         return !(pos >= 0);
     }
     ts.positionIsSynthesized = positionIsSynthesized;
+    /** True if an extension is one of the supported TypeScript extensions. */
+    function extensionIsTypeScript(ext) {
+        return ext <= ts.Extension.LastTypeScriptExtension;
+    }
+    ts.extensionIsTypeScript = extensionIsTypeScript;
+    /**
+     * Gets the extension from a path.
+     * Path must have a valid extension.
+     */
+    function extensionFromPath(path) {
+        var ext = tryGetExtensionFromPath(path);
+        if (ext !== undefined) {
+            return ext;
+        }
+        Debug.fail("File " + path + " has unknown extension.");
+    }
+    ts.extensionFromPath = extensionFromPath;
+    function tryGetExtensionFromPath(path) {
+        if (fileExtensionIs(path, ".d.ts")) {
+            return ts.Extension.Dts;
+        }
+        if (fileExtensionIs(path, ".ts")) {
+            return ts.Extension.Ts;
+        }
+        if (fileExtensionIs(path, ".tsx")) {
+            return ts.Extension.Tsx;
+        }
+        if (fileExtensionIs(path, ".js")) {
+            return ts.Extension.Js;
+        }
+        if (fileExtensionIs(path, ".jsx")) {
+            return ts.Extension.Jsx;
+        }
+    }
+    ts.tryGetExtensionFromPath = tryGetExtensionFromPath;
 })(ts || (ts = {}));
 /// <reference path="core.ts"/>
 var ts;
@@ -3376,6 +3608,7 @@ var ts;
             function getDirectories(path) {
                 return ts.filter(_fs.readdirSync(path), function (dir) { return fileSystemEntryExists(ts.combinePaths(path, dir), 1 /* Directory */); });
             }
+            var noOpFileWatcher = { close: ts.noop };
             var nodeSystem = {
                 args: process.argv.slice(2),
                 newLine: _os.EOL,
@@ -3385,7 +3618,7 @@ var ts;
                 },
                 readFile: readFile,
                 writeFile: writeFile,
-                watchFile: function (fileName, callback) {
+                watchFile: function (fileName, callback, pollingInterval) {
                     if (useNonPollingWatchers) {
                         var watchedFile_1 = watchedFileSet.addFile(fileName, callback);
                         return {
@@ -3393,7 +3626,7 @@ var ts;
                         };
                     }
                     else {
-                        _fs.watchFile(fileName, { persistent: true, interval: 250 }, fileChanged);
+                        _fs.watchFile(fileName, { persistent: true, interval: pollingInterval || 250 }, fileChanged);
                         return {
                             close: function () { return _fs.unwatchFile(fileName, fileChanged); }
                         };
@@ -3410,7 +3643,7 @@ var ts;
                     // (ref: https://github.com/nodejs/node/pull/2649 and https://github.com/Microsoft/TypeScript/issues/4643)
                     var options;
                     if (!directoryExists(directoryName)) {
-                        return;
+                        return noOpFileWatcher;
                     }
                     if (isNode4OrLater() && (process.platform === "win32" || process.platform === "darwin")) {
                         options = { persistent: true, recursive: !!recursive };
@@ -3491,7 +3724,9 @@ var ts;
                     }
                     catch (e) {
                     }
-                }
+                },
+                setTimeout: setTimeout,
+                clearTimeout: clearTimeout
             };
             return nodeSystem;
         }
@@ -3617,7 +3852,7 @@ var ts;
         A_set_accessor_parameter_cannot_have_an_initializer: { code: 1052, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_parameter_cannot_have_an_initializer_1052", message: "A 'set' accessor parameter cannot have an initializer." },
         A_set_accessor_cannot_have_rest_parameter: { code: 1053, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_cannot_have_rest_parameter_1053", message: "A 'set' accessor cannot have rest parameter." },
         A_get_accessor_cannot_have_parameters: { code: 1054, category: ts.DiagnosticCategory.Error, key: "A_get_accessor_cannot_have_parameters_1054", message: "A 'get' accessor cannot have parameters." },
-        Type_0_is_not_a_valid_async_function_return_type: { code: 1055, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_a_valid_async_function_return_type_1055", message: "Type '{0}' is not a valid async function return type." },
+        Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value: { code: 1055, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Prom_1055", message: "Type '{0}' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value." },
         Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher: { code: 1056, category: ts.DiagnosticCategory.Error, key: "Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher_1056", message: "Accessors are only available when targeting ECMAScript 5 and higher." },
         An_async_function_or_method_must_have_a_valid_awaitable_return_type: { code: 1057, category: ts.DiagnosticCategory.Error, key: "An_async_function_or_method_must_have_a_valid_awaitable_return_type_1057", message: "An async function or method must have a valid awaitable return type." },
         Operand_for_await_does_not_have_a_valid_callable_then_member: { code: 1058, category: ts.DiagnosticCategory.Error, key: "Operand_for_await_does_not_have_a_valid_callable_then_member_1058", message: "Operand for 'await' does not have a valid callable 'then' member." },
@@ -3727,7 +3962,6 @@ var ts;
         Module_0_has_no_default_export: { code: 1192, category: ts.DiagnosticCategory.Error, key: "Module_0_has_no_default_export_1192", message: "Module '{0}' has no default export." },
         An_export_declaration_cannot_have_modifiers: { code: 1193, category: ts.DiagnosticCategory.Error, key: "An_export_declaration_cannot_have_modifiers_1193", message: "An export declaration cannot have modifiers." },
         Export_declarations_are_not_permitted_in_a_namespace: { code: 1194, category: ts.DiagnosticCategory.Error, key: "Export_declarations_are_not_permitted_in_a_namespace_1194", message: "Export declarations are not permitted in a namespace." },
-        Catch_clause_variable_name_must_be_an_identifier: { code: 1195, category: ts.DiagnosticCategory.Error, key: "Catch_clause_variable_name_must_be_an_identifier_1195", message: "Catch clause variable name must be an identifier." },
         Catch_clause_variable_cannot_have_a_type_annotation: { code: 1196, category: ts.DiagnosticCategory.Error, key: "Catch_clause_variable_cannot_have_a_type_annotation_1196", message: "Catch clause variable cannot have a type annotation." },
         Catch_clause_variable_cannot_have_an_initializer: { code: 1197, category: ts.DiagnosticCategory.Error, key: "Catch_clause_variable_cannot_have_an_initializer_1197", message: "Catch clause variable cannot have an initializer." },
         An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive: { code: 1198, category: ts.DiagnosticCategory.Error, key: "An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive_1198", message: "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive." },
@@ -3845,14 +4079,14 @@ var ts;
         Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1: { code: 2353, category: ts.DiagnosticCategory.Error, key: "Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1_2353", message: "Object literal may only specify known properties, and '{0}' does not exist in type '{1}'." },
         A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value: { code: 2355, category: ts.DiagnosticCategory.Error, key: "A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value_2355", message: "A function whose declared type is neither 'void' nor 'any' must return a value." },
         An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type: { code: 2356, category: ts.DiagnosticCategory.Error, key: "An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type_2356", message: "An arithmetic operand must be of type 'any', 'number' or an enum type." },
-        The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer: { code: 2357, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer_2357", message: "The operand of an increment or decrement operator must be a variable, property or indexer." },
+        The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_or_a_property_access: { code: 2357, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_or_a_property_access_2357", message: "The operand of an increment or decrement operator must be a variable or a property access." },
         The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2358, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_paramete_2358", message: "The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter." },
         The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_Function_interface_type: { code: 2359, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_F_2359", message: "The right-hand side of an 'instanceof' expression must be of type 'any' or of a type assignable to the 'Function' interface type." },
         The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol: { code: 2360, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol_2360", message: "The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'." },
         The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2361, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter_2361", message: "The right-hand side of an 'in' expression must be of type 'any', an object type or a type parameter" },
         The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2362, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type_2362", message: "The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
         The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2363, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type_2363", message: "The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
-        Invalid_left_hand_side_of_assignment_expression: { code: 2364, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_of_assignment_expression_2364", message: "Invalid left-hand side of assignment expression." },
+        The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access: { code: 2364, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access_2364", message: "The left-hand side of an assignment expression must be a variable or a property access." },
         Operator_0_cannot_be_applied_to_types_1_and_2: { code: 2365, category: ts.DiagnosticCategory.Error, key: "Operator_0_cannot_be_applied_to_types_1_and_2_2365", message: "Operator '{0}' cannot be applied to types '{1}' and '{2}'." },
         Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined: { code: 2366, category: ts.DiagnosticCategory.Error, key: "Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined_2366", message: "Function lacks ending return statement and return type does not include 'undefined'." },
         Type_parameter_name_cannot_be_0: { code: 2368, category: ts.DiagnosticCategory.Error, key: "Type_parameter_name_cannot_be_0_2368", message: "Type parameter name cannot be '{0}'" },
@@ -3892,7 +4126,7 @@ var ts;
         Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2: { code: 2403, category: ts.DiagnosticCategory.Error, key: "Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_t_2403", message: "Subsequent variable declarations must have the same type.  Variable '{0}' must be of type '{1}', but here has type '{2}'." },
         The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation: { code: 2404, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation_2404", message: "The left-hand side of a 'for...in' statement cannot use a type annotation." },
         The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any: { code: 2405, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any_2405", message: "The left-hand side of a 'for...in' statement must be of type 'string' or 'any'." },
-        Invalid_left_hand_side_in_for_in_statement: { code: 2406, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_in_for_in_statement_2406", message: "Invalid left-hand side in 'for...in' statement." },
+        The_left_hand_side_of_a_for_in_statement_must_be_a_variable_or_a_property_access: { code: 2406, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_must_be_a_variable_or_a_property_access_2406", message: "The left-hand side of a 'for...in' statement must be a variable or a property access." },
         The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2407, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter_2407", message: "The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter." },
         Setters_cannot_return_a_value: { code: 2408, category: ts.DiagnosticCategory.Error, key: "Setters_cannot_return_a_value_2408", message: "Setters cannot return a value." },
         Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class: { code: 2409, category: ts.DiagnosticCategory.Error, key: "Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class_2409", message: "Return type of constructor signature must be assignable to the instance type of the class" },
@@ -3930,8 +4164,6 @@ var ts;
         Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1: { code: 2446, category: ts.DiagnosticCategory.Error, key: "Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1_2446", message: "Property '{0}' is protected and only accessible through an instance of class '{1}'." },
         The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead: { code: 2447, category: ts.DiagnosticCategory.Error, key: "The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead_2447", message: "The '{0}' operator is not allowed for boolean types. Consider using '{1}' instead." },
         Block_scoped_variable_0_used_before_its_declaration: { code: 2448, category: ts.DiagnosticCategory.Error, key: "Block_scoped_variable_0_used_before_its_declaration_2448", message: "Block-scoped variable '{0}' used before its declaration." },
-        The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property: { code: 2449, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property_2449", message: "The operand of an increment or decrement operator cannot be a constant or a read-only property." },
-        Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property: { code: 2450, category: ts.DiagnosticCategory.Error, key: "Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property_2450", message: "Left-hand side of assignment expression cannot be a constant or a read-only property." },
         Cannot_redeclare_block_scoped_variable_0: { code: 2451, category: ts.DiagnosticCategory.Error, key: "Cannot_redeclare_block_scoped_variable_0_2451", message: "Cannot redeclare block-scoped variable '{0}'." },
         An_enum_member_cannot_have_a_numeric_name: { code: 2452, category: ts.DiagnosticCategory.Error, key: "An_enum_member_cannot_have_a_numeric_name_2452", message: "An enum member cannot have a numeric name." },
         The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_type_arguments_explicitly: { code: 2453, category: ts.DiagnosticCategory.Error, key: "The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_typ_2453", message: "The type argument for type parameter '{0}' cannot be inferred from the usage. Consider specifying the type arguments explicitly." },
@@ -3943,7 +4175,7 @@ var ts;
         Type_0_has_no_property_1_and_no_string_index_signature: { code: 2459, category: ts.DiagnosticCategory.Error, key: "Type_0_has_no_property_1_and_no_string_index_signature_2459", message: "Type '{0}' has no property '{1}' and no string index signature." },
         Type_0_has_no_property_1: { code: 2460, category: ts.DiagnosticCategory.Error, key: "Type_0_has_no_property_1_2460", message: "Type '{0}' has no property '{1}'." },
         Type_0_is_not_an_array_type: { code: 2461, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_an_array_type_2461", message: "Type '{0}' is not an array type." },
-        A_rest_element_must_be_last_in_an_array_destructuring_pattern: { code: 2462, category: ts.DiagnosticCategory.Error, key: "A_rest_element_must_be_last_in_an_array_destructuring_pattern_2462", message: "A rest element must be last in an array destructuring pattern" },
+        A_rest_element_must_be_last_in_a_destructuring_pattern: { code: 2462, category: ts.DiagnosticCategory.Error, key: "A_rest_element_must_be_last_in_a_destructuring_pattern_2462", message: "A rest element must be last in a destructuring pattern" },
         A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature: { code: 2463, category: ts.DiagnosticCategory.Error, key: "A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature_2463", message: "A binding pattern parameter cannot be optional in an implementation signature." },
         A_computed_property_name_must_be_of_type_string_number_symbol_or_any: { code: 2464, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_must_be_of_type_string_number_symbol_or_any_2464", message: "A computed property name must be of type 'string', 'number', 'symbol', or 'any'." },
         this_cannot_be_referenced_in_a_computed_property_name: { code: 2465, category: ts.DiagnosticCategory.Error, key: "this_cannot_be_referenced_in_a_computed_property_name_2465", message: "'this' cannot be referenced in a computed property name." },
@@ -3965,9 +4197,7 @@ var ts;
         Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1: { code: 2481, category: ts.DiagnosticCategory.Error, key: "Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1_2481", message: "Cannot initialize outer scoped variable '{0}' in the same scope as block scoped declaration '{1}'." },
         The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation: { code: 2483, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation_2483", message: "The left-hand side of a 'for...of' statement cannot use a type annotation." },
         Export_declaration_conflicts_with_exported_declaration_of_0: { code: 2484, category: ts.DiagnosticCategory.Error, key: "Export_declaration_conflicts_with_exported_declaration_of_0_2484", message: "Export declaration conflicts with exported declaration of '{0}'" },
-        The_left_hand_side_of_a_for_of_statement_cannot_be_a_constant_or_a_read_only_property: { code: 2485, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_cannot_be_a_constant_or_a_read_only_property_2485", message: "The left-hand side of a 'for...of' statement cannot be a constant or a read-only property." },
-        The_left_hand_side_of_a_for_in_statement_cannot_be_a_constant_or_a_read_only_property: { code: 2486, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_be_a_constant_or_a_read_only_property_2486", message: "The left-hand side of a 'for...in' statement cannot be a constant or a read-only property." },
-        Invalid_left_hand_side_in_for_of_statement: { code: 2487, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_in_for_of_statement_2487", message: "Invalid left-hand side in 'for...of' statement." },
+        The_left_hand_side_of_a_for_of_statement_must_be_a_variable_or_a_property_access: { code: 2487, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_must_be_a_variable_or_a_property_access_2487", message: "The left-hand side of a 'for...of' statement must be a variable or a property access." },
         Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator: { code: 2488, category: ts.DiagnosticCategory.Error, key: "Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator_2488", message: "Type must have a '[Symbol.iterator]()' method that returns an iterator." },
         An_iterator_must_have_a_next_method: { code: 2489, category: ts.DiagnosticCategory.Error, key: "An_iterator_must_have_a_next_method_2489", message: "An iterator must have a 'next()' method." },
         The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: { code: 2490, category: ts.DiagnosticCategory.Error, key: "The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property_2490", message: "The type returned by the 'next()' method of an iterator must have a 'value' property." },
@@ -4014,6 +4244,13 @@ var ts;
         Object_is_possibly_null_or_undefined: { code: 2533, category: ts.DiagnosticCategory.Error, key: "Object_is_possibly_null_or_undefined_2533", message: "Object is possibly 'null' or 'undefined'." },
         A_function_returning_never_cannot_have_a_reachable_end_point: { code: 2534, category: ts.DiagnosticCategory.Error, key: "A_function_returning_never_cannot_have_a_reachable_end_point_2534", message: "A function returning 'never' cannot have a reachable end point." },
         Enum_type_0_has_members_with_initializers_that_are_not_literals: { code: 2535, category: ts.DiagnosticCategory.Error, key: "Enum_type_0_has_members_with_initializers_that_are_not_literals_2535", message: "Enum type '{0}' has members with initializers that are not literals." },
+        Type_0_is_not_constrained_to_keyof_1: { code: 2536, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_constrained_to_keyof_1_2536", message: "Type '{0}' is not constrained to 'keyof {1}'." },
+        Type_0_has_no_matching_index_signature_for_type_1: { code: 2537, category: ts.DiagnosticCategory.Error, key: "Type_0_has_no_matching_index_signature_for_type_1_2537", message: "Type '{0}' has no matching index signature for type '{1}'." },
+        Type_0_cannot_be_used_as_an_index_type: { code: 2538, category: ts.DiagnosticCategory.Error, key: "Type_0_cannot_be_used_as_an_index_type_2538", message: "Type '{0}' cannot be used as an index type." },
+        Cannot_assign_to_0_because_it_is_not_a_variable: { code: 2539, category: ts.DiagnosticCategory.Error, key: "Cannot_assign_to_0_because_it_is_not_a_variable_2539", message: "Cannot assign to '{0}' because it is not a variable." },
+        Cannot_assign_to_0_because_it_is_a_constant_or_a_read_only_property: { code: 2540, category: ts.DiagnosticCategory.Error, key: "Cannot_assign_to_0_because_it_is_a_constant_or_a_read_only_property_2540", message: "Cannot assign to '{0}' because it is a constant or a read-only property." },
+        The_target_of_an_assignment_must_be_a_variable_or_a_property_access: { code: 2541, category: ts.DiagnosticCategory.Error, key: "The_target_of_an_assignment_must_be_a_variable_or_a_property_access_2541", message: "The target of an assignment must be a variable or a property access." },
+        Index_signature_in_type_0_only_permits_reading: { code: 2542, category: ts.DiagnosticCategory.Error, key: "Index_signature_in_type_0_only_permits_reading_2542", message: "Index signature in type '{0}' only permits reading." },
         JSX_element_attributes_type_0_may_not_be_a_union_type: { code: 2600, category: ts.DiagnosticCategory.Error, key: "JSX_element_attributes_type_0_may_not_be_a_union_type_2600", message: "JSX element attributes type '{0}' may not be a union type." },
         The_return_type_of_a_JSX_element_constructor_must_return_an_object_type: { code: 2601, category: ts.DiagnosticCategory.Error, key: "The_return_type_of_a_JSX_element_constructor_must_return_an_object_type_2601", message: "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: { code: 2602, category: ts.DiagnosticCategory.Error, key: "JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist_2602", message: "JSX element implicitly has type 'any' because the global type 'JSX.Element' does not exist." },
@@ -4037,6 +4274,7 @@ var ts;
         Cannot_find_name_0_Did_you_mean_the_static_member_1_0: { code: 2662, category: ts.DiagnosticCategory.Error, key: "Cannot_find_name_0_Did_you_mean_the_static_member_1_0_2662", message: "Cannot find name '{0}'. Did you mean the static member '{1}.{0}'?" },
         Cannot_find_name_0_Did_you_mean_the_instance_member_this_0: { code: 2663, category: ts.DiagnosticCategory.Error, key: "Cannot_find_name_0_Did_you_mean_the_instance_member_this_0_2663", message: "Cannot find name '{0}'. Did you mean the instance member 'this.{0}'?" },
         Invalid_module_name_in_augmentation_module_0_cannot_be_found: { code: 2664, category: ts.DiagnosticCategory.Error, key: "Invalid_module_name_in_augmentation_module_0_cannot_be_found_2664", message: "Invalid module name in augmentation, module '{0}' cannot be found." },
+        Invalid_module_name_in_augmentation_Module_0_resolves_to_an_untyped_module_at_1_which_cannot_be_augmented: { code: 2665, category: ts.DiagnosticCategory.Error, key: "Invalid_module_name_in_augmentation_Module_0_resolves_to_an_untyped_module_at_1_which_cannot_be_augm_2665", message: "Invalid module name in augmentation. Module '{0}' resolves to an untyped module at '{1}', which cannot be augmented." },
         Exports_and_export_assignments_are_not_permitted_in_module_augmentations: { code: 2666, category: ts.DiagnosticCategory.Error, key: "Exports_and_export_assignments_are_not_permitted_in_module_augmentations_2666", message: "Exports and export assignments are not permitted in module augmentations." },
         Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_module: { code: 2667, category: ts.DiagnosticCategory.Error, key: "Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_mod_2667", message: "Imports are not permitted in module augmentations. Consider moving them to the enclosing external module." },
         export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always_visible: { code: 2668, category: ts.DiagnosticCategory.Error, key: "export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always__2668", message: "'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible." },
@@ -4068,6 +4306,10 @@ var ts;
         Namespace_0_has_no_exported_member_1: { code: 2694, category: ts.DiagnosticCategory.Error, key: "Namespace_0_has_no_exported_member_1_2694", message: "Namespace '{0}' has no exported member '{1}'." },
         Left_side_of_comma_operator_is_unused_and_has_no_side_effects: { code: 2695, category: ts.DiagnosticCategory.Error, key: "Left_side_of_comma_operator_is_unused_and_has_no_side_effects_2695", message: "Left side of comma operator is unused and has no side effects." },
         The_Object_type_is_assignable_to_very_few_other_types_Did_you_mean_to_use_the_any_type_instead: { code: 2696, category: ts.DiagnosticCategory.Error, key: "The_Object_type_is_assignable_to_very_few_other_types_Did_you_mean_to_use_the_any_type_instead_2696", message: "The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?" },
+        An_async_function_or_method_must_return_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES2015_in_your_lib_option: { code: 2697, category: ts.DiagnosticCategory.Error, key: "An_async_function_or_method_must_return_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_in_2697", message: "An async function or method must return a 'Promise'. Make sure you have a declaration for 'Promise' or include 'ES2015' in your `--lib` option." },
+        Spread_types_may_only_be_created_from_object_types: { code: 2698, category: ts.DiagnosticCategory.Error, key: "Spread_types_may_only_be_created_from_object_types_2698", message: "Spread types may only be created from object types." },
+        Rest_types_may_only_be_created_from_object_types: { code: 2700, category: ts.DiagnosticCategory.Error, key: "Rest_types_may_only_be_created_from_object_types_2700", message: "Rest types may only be created from object types." },
+        An_object_rest_element_must_be_an_identifier: { code: 2701, category: ts.DiagnosticCategory.Error, key: "An_object_rest_element_must_be_an_identifier_2701", message: "An object rest element must be an identifier." },
         Import_declaration_0_is_using_private_name_1: { code: 4000, category: ts.DiagnosticCategory.Error, key: "Import_declaration_0_is_using_private_name_1_4000", message: "Import declaration '{0}' is using private name '{1}'." },
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", message: "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: { code: 4004, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", message: "Type parameter '{0}' of exported interface has or is using private name '{1}'." },
@@ -4167,6 +4409,7 @@ var ts;
         Substitution_0_for_pattern_1_has_incorrect_type_expected_string_got_2: { code: 5064, category: ts.DiagnosticCategory.Error, key: "Substitution_0_for_pattern_1_has_incorrect_type_expected_string_got_2_5064", message: "Substitution '{0}' for pattern '{1}' has incorrect type, expected 'string', got '{2}'." },
         File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0: { code: 5065, category: ts.DiagnosticCategory.Error, key: "File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildca_5065", message: "File specification cannot contain a parent directory ('..') that appears after a recursive directory wildcard ('**'): '{0}'." },
         Substitutions_for_pattern_0_shouldn_t_be_an_empty_array: { code: 5066, category: ts.DiagnosticCategory.Error, key: "Substitutions_for_pattern_0_shouldn_t_be_an_empty_array_5066", message: "Substitutions for pattern '{0}' shouldn't be an empty array." },
+        Invalid_value_for_jsxFactory_0_is_not_a_valid_identifier_or_qualified_name: { code: 5067, category: ts.DiagnosticCategory.Error, key: "Invalid_value_for_jsxFactory_0_is_not_a_valid_identifier_or_qualified_name_5067", message: "Invalid value for 'jsxFactory'. '{0}' is not a valid identifier or qualified-name." },
         Concatenate_and_emit_output_to_single_file: { code: 6001, category: ts.DiagnosticCategory.Message, key: "Concatenate_and_emit_output_to_single_file_6001", message: "Concatenate and emit output to single file." },
         Generates_corresponding_d_ts_file: { code: 6002, category: ts.DiagnosticCategory.Message, key: "Generates_corresponding_d_ts_file_6002", message: "Generates corresponding '.d.ts' file." },
         Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations: { code: 6003, category: ts.DiagnosticCategory.Message, key: "Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations_6003", message: "Specify the location where debugger should locate map files instead of generated locations." },
@@ -4250,7 +4493,7 @@ var ts;
         File_0_exist_use_it_as_a_name_resolution_result: { code: 6097, category: ts.DiagnosticCategory.Message, key: "File_0_exist_use_it_as_a_name_resolution_result_6097", message: "File '{0}' exist - use it as a name resolution result." },
         Loading_module_0_from_node_modules_folder: { code: 6098, category: ts.DiagnosticCategory.Message, key: "Loading_module_0_from_node_modules_folder_6098", message: "Loading module '{0}' from 'node_modules' folder." },
         Found_package_json_at_0: { code: 6099, category: ts.DiagnosticCategory.Message, key: "Found_package_json_at_0_6099", message: "Found 'package.json' at '{0}'." },
-        package_json_does_not_have_types_field: { code: 6100, category: ts.DiagnosticCategory.Message, key: "package_json_does_not_have_types_field_6100", message: "'package.json' does not have 'types' field." },
+        package_json_does_not_have_a_types_or_main_field: { code: 6100, category: ts.DiagnosticCategory.Message, key: "package_json_does_not_have_a_types_or_main_field_6100", message: "'package.json' does not have a 'types' or 'main' field." },
         package_json_has_0_field_1_that_references_2: { code: 6101, category: ts.DiagnosticCategory.Message, key: "package_json_has_0_field_1_that_references_2_6101", message: "'package.json' has '{0}' field '{1}' that references '{2}'." },
         Allow_javascript_files_to_be_compiled: { code: 6102, category: ts.DiagnosticCategory.Message, key: "Allow_javascript_files_to_be_compiled_6102", message: "Allow javascript files to be compiled." },
         Option_0_should_have_array_of_strings_as_a_value: { code: 6103, category: ts.DiagnosticCategory.Error, key: "Option_0_should_have_array_of_strings_as_a_value_6103", message: "Option '{0}' should have array of strings as a value." },
@@ -4287,11 +4530,16 @@ var ts;
         Report_errors_on_unused_locals: { code: 6134, category: ts.DiagnosticCategory.Message, key: "Report_errors_on_unused_locals_6134", message: "Report errors on unused locals." },
         Report_errors_on_unused_parameters: { code: 6135, category: ts.DiagnosticCategory.Message, key: "Report_errors_on_unused_parameters_6135", message: "Report errors on unused parameters." },
         The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files: { code: 6136, category: ts.DiagnosticCategory.Message, key: "The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files_6136", message: "The maximum dependency depth to search under node_modules and load JavaScript files" },
-        No_types_specified_in_package_json_but_allowJs_is_set_so_returning_main_value_of_0: { code: 6137, category: ts.DiagnosticCategory.Message, key: "No_types_specified_in_package_json_but_allowJs_is_set_so_returning_main_value_of_0_6137", message: "No types specified in 'package.json' but 'allowJs' is set, so returning 'main' value of '{0}'" },
+        No_types_specified_in_package_json_so_returning_main_value_of_0: { code: 6137, category: ts.DiagnosticCategory.Message, key: "No_types_specified_in_package_json_so_returning_main_value_of_0_6137", message: "No types specified in 'package.json', so returning 'main' value of '{0}'" },
         Property_0_is_declared_but_never_used: { code: 6138, category: ts.DiagnosticCategory.Error, key: "Property_0_is_declared_but_never_used_6138", message: "Property '{0}' is declared but never used." },
         Import_emit_helpers_from_tslib: { code: 6139, category: ts.DiagnosticCategory.Message, key: "Import_emit_helpers_from_tslib_6139", message: "Import emit helpers from 'tslib'." },
         Auto_discovery_for_typings_is_enabled_in_project_0_Running_extra_resolution_pass_for_module_1_using_cache_location_2: { code: 6140, category: ts.DiagnosticCategory.Error, key: "Auto_discovery_for_typings_is_enabled_in_project_0_Running_extra_resolution_pass_for_module_1_using__6140", message: "Auto discovery for typings is enabled in project '{0}'. Running extra resolution pass for module '{1}' using cache location '{2}'." },
         Parse_in_strict_mode_and_emit_use_strict_for_each_source_file: { code: 6141, category: ts.DiagnosticCategory.Message, key: "Parse_in_strict_mode_and_emit_use_strict_for_each_source_file_6141", message: "Parse in strict mode and emit \"use strict\" for each source file" },
+        Module_0_was_resolved_to_1_but_jsx_is_not_set: { code: 6142, category: ts.DiagnosticCategory.Error, key: "Module_0_was_resolved_to_1_but_jsx_is_not_set_6142", message: "Module '{0}' was resolved to '{1}', but '--jsx' is not set." },
+        Module_0_was_resolved_to_1_but_allowJs_is_not_set: { code: 6143, category: ts.DiagnosticCategory.Error, key: "Module_0_was_resolved_to_1_but_allowJs_is_not_set_6143", message: "Module '{0}' was resolved to '{1}', but '--allowJs' is not set." },
+        Module_0_was_resolved_as_locally_declared_ambient_module_in_file_1: { code: 6144, category: ts.DiagnosticCategory.Message, key: "Module_0_was_resolved_as_locally_declared_ambient_module_in_file_1_6144", message: "Module '{0}' was resolved as locally declared ambient module in file '{1}'." },
+        Module_0_was_resolved_as_ambient_module_declared_in_1_since_this_file_was_not_modified: { code: 6145, category: ts.DiagnosticCategory.Message, key: "Module_0_was_resolved_as_ambient_module_declared_in_1_since_this_file_was_not_modified_6145", message: "Module '{0}' was resolved as ambient module declared in '{1}' since this file was not modified." },
+        Specify_the_JSX_factory_function_to_use_when_targeting_react_JSX_emit_e_g_React_createElement_or_h: { code: 6146, category: ts.DiagnosticCategory.Message, key: "Specify_the_JSX_factory_function_to_use_when_targeting_react_JSX_emit_e_g_React_createElement_or_h_6146", message: "Specify the JSX factory function to use when targeting 'react' JSX emit, e.g. 'React.createElement' or 'h'." },
         Variable_0_implicitly_has_an_1_type: { code: 7005, category: ts.DiagnosticCategory.Error, key: "Variable_0_implicitly_has_an_1_type_7005", message: "Variable '{0}' implicitly has an '{1}' type." },
         Parameter_0_implicitly_has_an_1_type: { code: 7006, category: ts.DiagnosticCategory.Error, key: "Parameter_0_implicitly_has_an_1_type_7006", message: "Parameter '{0}' implicitly has an '{1}' type." },
         Member_0_implicitly_has_an_1_type: { code: 7008, category: ts.DiagnosticCategory.Error, key: "Member_0_implicitly_has_an_1_type_7008", message: "Member '{0}' implicitly has an '{1}' type." },
@@ -4300,7 +4548,8 @@ var ts;
         Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type: { code: 7011, category: ts.DiagnosticCategory.Error, key: "Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type_7011", message: "Function expression, which lacks return-type annotation, implicitly has an '{0}' return type." },
         Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7013, category: ts.DiagnosticCategory.Error, key: "Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type_7013", message: "Construct signature, which lacks return-type annotation, implicitly has an 'any' return type." },
         Element_implicitly_has_an_any_type_because_index_expression_is_not_of_type_number: { code: 7015, category: ts.DiagnosticCategory.Error, key: "Element_implicitly_has_an_any_type_because_index_expression_is_not_of_type_number_7015", message: "Element implicitly has an 'any' type because index expression is not of type 'number'." },
-        Index_signature_of_object_type_implicitly_has_an_any_type: { code: 7017, category: ts.DiagnosticCategory.Error, key: "Index_signature_of_object_type_implicitly_has_an_any_type_7017", message: "Index signature of object type implicitly has an 'any' type." },
+        Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type: { code: 7016, category: ts.DiagnosticCategory.Error, key: "Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type_7016", message: "Could not find a declaration file for module '{0}'. '{1}' implicitly has an 'any' type." },
+        Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature: { code: 7017, category: ts.DiagnosticCategory.Error, key: "Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_7017", message: "Element implicitly has an 'any' type because type '{0}' has no index signature." },
         Object_literal_s_property_0_implicitly_has_an_1_type: { code: 7018, category: ts.DiagnosticCategory.Error, key: "Object_literal_s_property_0_implicitly_has_an_1_type_7018", message: "Object literal's property '{0}' implicitly has an '{1}' type." },
         Rest_parameter_0_implicitly_has_an_any_type: { code: 7019, category: ts.DiagnosticCategory.Error, key: "Rest_parameter_0_implicitly_has_an_any_type_7019", message: "Rest parameter '{0}' implicitly has an 'any[]' type." },
         Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7020, category: ts.DiagnosticCategory.Error, key: "Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type_7020", message: "Call signature, which lacks return-type annotation, implicitly has an 'any' return type." },
@@ -4347,6 +4596,8 @@ var ts;
         Unknown_typing_option_0: { code: 17010, category: ts.DiagnosticCategory.Error, key: "Unknown_typing_option_0_17010", message: "Unknown typing option '{0}'." },
         Circularity_detected_while_resolving_configuration_Colon_0: { code: 18000, category: ts.DiagnosticCategory.Error, key: "Circularity_detected_while_resolving_configuration_Colon_0_18000", message: "Circularity detected while resolving configuration: {0}" },
         The_path_in_an_extends_options_must_be_relative_or_rooted: { code: 18001, category: ts.DiagnosticCategory.Error, key: "The_path_in_an_extends_options_must_be_relative_or_rooted_18001", message: "The path in an 'extends' options must be relative or rooted." },
+        The_files_list_in_config_file_0_is_empty: { code: 18002, category: ts.DiagnosticCategory.Error, key: "The_files_list_in_config_file_0_is_empty_18002", message: "The 'files' list in config file '{0}' is empty." },
+        No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2: { code: 18003, category: ts.DiagnosticCategory.Error, key: "No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2_18003", message: "No inputs were found in config file '{0}'. Specified 'include' paths were '{1}' and 'exclude' paths were '{2}'." },
         Add_missing_super_call: { code: 90001, category: ts.DiagnosticCategory.Message, key: "Add_missing_super_call_90001", message: "Add missing 'super()' call." },
         Make_super_call_the_first_statement_in_the_constructor: { code: 90002, category: ts.DiagnosticCategory.Message, key: "Make_super_call_the_first_statement_in_the_constructor_90002", message: "Make 'super()' call the first statement in the constructor." },
         Change_extends_to_implements: { code: 90003, category: ts.DiagnosticCategory.Message, key: "Change_extends_to_implements_90003", message: "Change 'extends' to 'implements'" },
@@ -4354,6 +4605,8 @@ var ts;
         Implement_interface_on_reference: { code: 90005, category: ts.DiagnosticCategory.Message, key: "Implement_interface_on_reference_90005", message: "Implement interface on reference" },
         Implement_interface_on_class: { code: 90006, category: ts.DiagnosticCategory.Message, key: "Implement_interface_on_class_90006", message: "Implement interface on class" },
         Implement_inherited_abstract_class: { code: 90007, category: ts.DiagnosticCategory.Message, key: "Implement_inherited_abstract_class_90007", message: "Implement inherited abstract class" },
+        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: { code: 90009, category: ts.DiagnosticCategory.Error, key: "Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript__90009", message: "Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig" },
+        Type_0_is_not_assignable_to_type_1_Two_different_types_with_this_name_exist_but_they_are_unrelated: { code: 90010, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_assignable_to_type_1_Two_different_types_with_this_name_exist_but_they_are_unrelated_90010", message: "Type '{0}' is not assignable to type '{1}'. Two different types with this name exist, but they are unrelated." },
     };
 })(ts || (ts = {}));
 /// <reference path="core.ts"/>
@@ -4389,7 +4642,7 @@ var ts;
         "false": 85 /* FalseKeyword */,
         "finally": 86 /* FinallyKeyword */,
         "for": 87 /* ForKeyword */,
-        "from": 137 /* FromKeyword */,
+        "from": 138 /* FromKeyword */,
         "function": 88 /* FunctionKeyword */,
         "get": 124 /* GetKeyword */,
         "if": 89 /* IfKeyword */,
@@ -4399,34 +4652,35 @@ var ts;
         "instanceof": 92 /* InstanceOfKeyword */,
         "interface": 108 /* InterfaceKeyword */,
         "is": 125 /* IsKeyword */,
+        "keyof": 126 /* KeyOfKeyword */,
         "let": 109 /* LetKeyword */,
-        "module": 126 /* ModuleKeyword */,
-        "namespace": 127 /* NamespaceKeyword */,
-        "never": 128 /* NeverKeyword */,
+        "module": 127 /* ModuleKeyword */,
+        "namespace": 128 /* NamespaceKeyword */,
+        "never": 129 /* NeverKeyword */,
         "new": 93 /* NewKeyword */,
         "null": 94 /* NullKeyword */,
-        "number": 131 /* NumberKeyword */,
+        "number": 132 /* NumberKeyword */,
         "package": 110 /* PackageKeyword */,
         "private": 111 /* PrivateKeyword */,
         "protected": 112 /* ProtectedKeyword */,
         "public": 113 /* PublicKeyword */,
-        "readonly": 129 /* ReadonlyKeyword */,
-        "require": 130 /* RequireKeyword */,
-        "global": 138 /* GlobalKeyword */,
+        "readonly": 130 /* ReadonlyKeyword */,
+        "require": 131 /* RequireKeyword */,
+        "global": 139 /* GlobalKeyword */,
         "return": 95 /* ReturnKeyword */,
-        "set": 132 /* SetKeyword */,
+        "set": 133 /* SetKeyword */,
         "static": 114 /* StaticKeyword */,
-        "string": 133 /* StringKeyword */,
+        "string": 134 /* StringKeyword */,
         "super": 96 /* SuperKeyword */,
         "switch": 97 /* SwitchKeyword */,
-        "symbol": 134 /* SymbolKeyword */,
+        "symbol": 135 /* SymbolKeyword */,
         "this": 98 /* ThisKeyword */,
         "throw": 99 /* ThrowKeyword */,
         "true": 100 /* TrueKeyword */,
         "try": 101 /* TryKeyword */,
-        "type": 135 /* TypeKeyword */,
+        "type": 136 /* TypeKeyword */,
         "typeof": 102 /* TypeOfKeyword */,
-        "undefined": 136 /* UndefinedKeyword */,
+        "undefined": 137 /* UndefinedKeyword */,
         "var": 103 /* VarKeyword */,
         "void": 104 /* VoidKeyword */,
         "while": 105 /* WhileKeyword */,
@@ -4434,7 +4688,7 @@ var ts;
         "yield": 115 /* YieldKeyword */,
         "async": 119 /* AsyncKeyword */,
         "await": 120 /* AwaitKeyword */,
-        "of": 139 /* OfKeyword */,
+        "of": 140 /* OfKeyword */,
         "{": 16 /* OpenBraceToken */,
         "}": 17 /* CloseBraceToken */,
         "(": 18 /* OpenParenToken */,
@@ -5984,10 +6238,13 @@ var ts;
                 case 44 /* comma */:
                     pos++;
                     return token = 25 /* CommaToken */;
+                case 46 /* dot */:
+                    pos++;
+                    return token = 22 /* DotToken */;
             }
-            if (isIdentifierStart(ch, 4 /* Latest */)) {
+            if (isIdentifierStart(ch, 5 /* Latest */)) {
                 pos++;
-                while (isIdentifierPart(text.charCodeAt(pos), 4 /* Latest */) && pos < end) {
+                while (isIdentifierPart(text.charCodeAt(pos), 5 /* Latest */) && pos < end) {
                     pos++;
                 }
                 return token = 70 /* Identifier */;
@@ -6112,11 +6369,11 @@ var ts;
                 // Completely ignore indentation for string writers.  And map newlines to
                 // a single space.
                 writeLine: function () { return str_1 += " "; },
-                increaseIndent: function () { },
-                decreaseIndent: function () { },
+                increaseIndent: ts.noop,
+                decreaseIndent: ts.noop,
                 clear: function () { return str_1 = ""; },
-                trackSymbol: function () { },
-                reportInaccessibleThisError: function () { }
+                trackSymbol: ts.noop,
+                reportInaccessibleThisError: ts.noop
             };
         }
         return stringWriters.pop();
@@ -6131,22 +6388,6 @@ var ts;
         return node.end - node.pos;
     }
     ts.getFullWidth = getFullWidth;
-    function arrayIsEqualTo(array1, array2, equaler) {
-        if (!array1 || !array2) {
-            return array1 === array2;
-        }
-        if (array1.length !== array2.length) {
-            return false;
-        }
-        for (var i = 0; i < array1.length; i++) {
-            var equals = equaler ? equaler(array1[i], array2[i]) : array1[i] === array2[i];
-            if (!equals) {
-                return false;
-            }
-        }
-        return true;
-    }
-    ts.arrayIsEqualTo = arrayIsEqualTo;
     function hasResolvedModule(sourceFile, moduleNameText) {
         return !!(sourceFile && sourceFile.resolvedModules && sourceFile.resolvedModules[moduleNameText]);
     }
@@ -6171,7 +6412,9 @@ var ts;
     ts.setResolvedTypeReferenceDirective = setResolvedTypeReferenceDirective;
     /* @internal */
     function moduleResolutionIsEqualTo(oldResolution, newResolution) {
-        return oldResolution.resolvedFileName === newResolution.resolvedFileName && oldResolution.isExternalLibraryImport === newResolution.isExternalLibraryImport;
+        return oldResolution.isExternalLibraryImport === newResolution.isExternalLibraryImport &&
+            oldResolution.extension === newResolution.extension &&
+            oldResolution.resolvedFileName === newResolution.resolvedFileName;
     }
     ts.moduleResolutionIsEqualTo = moduleResolutionIsEqualTo;
     /* @internal */
@@ -6200,28 +6443,28 @@ var ts;
     // Returns true if this node contains a parse error anywhere underneath it.
     function containsParseError(node) {
         aggregateChildData(node);
-        return (node.flags & 2097152 /* ThisNodeOrAnySubNodesHasError */) !== 0;
+        return (node.flags & 4194304 /* ThisNodeOrAnySubNodesHasError */) !== 0;
     }
     ts.containsParseError = containsParseError;
     function aggregateChildData(node) {
-        if (!(node.flags & 4194304 /* HasAggregatedChildData */)) {
+        if (!(node.flags & 8388608 /* HasAggregatedChildData */)) {
             // A node is considered to contain a parse error if:
             //  a) the parser explicitly marked that it had an error
             //  b) any of it's children reported that it had an error.
-            var thisNodeOrAnySubNodesHasError = ((node.flags & 524288 /* ThisNodeHasError */) !== 0) ||
+            var thisNodeOrAnySubNodesHasError = ((node.flags & 1048576 /* ThisNodeHasError */) !== 0) ||
                 ts.forEachChild(node, containsParseError);
             // If so, mark ourselves accordingly.
             if (thisNodeOrAnySubNodesHasError) {
-                node.flags |= 2097152 /* ThisNodeOrAnySubNodesHasError */;
+                node.flags |= 4194304 /* ThisNodeOrAnySubNodesHasError */;
             }
             // Also mark that we've propagated the child information to this node.  This way we can
             // always consult the bit directly on this node without needing to check its children
             // again.
-            node.flags |= 4194304 /* HasAggregatedChildData */;
+            node.flags |= 8388608 /* HasAggregatedChildData */;
         }
     }
     function getSourceFileOfNode(node) {
-        while (node && node.kind !== 256 /* SourceFile */) {
+        while (node && node.kind !== 261 /* SourceFile */) {
             node = node.parent;
         }
         return node;
@@ -6229,11 +6472,11 @@ var ts;
     ts.getSourceFileOfNode = getSourceFileOfNode;
     function isStatementWithLocals(node) {
         switch (node.kind) {
-            case 200 /* Block */:
-            case 228 /* CaseBlock */:
-            case 207 /* ForStatement */:
-            case 208 /* ForInStatement */:
-            case 209 /* ForOfStatement */:
+            case 204 /* Block */:
+            case 232 /* CaseBlock */:
+            case 211 /* ForStatement */:
+            case 212 /* ForInStatement */:
+            case 213 /* ForOfStatement */:
                 return true;
         }
         return false;
@@ -6324,18 +6567,18 @@ 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 === 286 /* SyntaxList */ && node._children.length > 0) {
+        if (node.kind === 291 /* SyntaxList */ && node._children.length > 0) {
             return getTokenPosOfNode(node._children[0], sourceFile, includeJsDocComment);
         }
         return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos);
     }
     ts.getTokenPosOfNode = getTokenPosOfNode;
     function isJSDocNode(node) {
-        return node.kind >= 257 /* FirstJSDocNode */ && node.kind <= 282 /* LastJSDocNode */;
+        return node.kind >= 262 /* FirstJSDocNode */ && node.kind <= 287 /* LastJSDocNode */;
     }
     ts.isJSDocNode = isJSDocNode;
     function isJSDocTag(node) {
-        return node.kind >= 273 /* FirstJSDocTagNode */ && node.kind <= 285 /* LastJSDocTagNode */;
+        return node.kind >= 278 /* FirstJSDocTagNode */ && node.kind <= 290 /* LastJSDocTagNode */;
     }
     ts.isJSDocTag = isJSDocTag;
     function getNonDecoratorTokenPosOfNode(node, sourceFile) {
@@ -6434,25 +6677,31 @@ var ts;
     ts.makeIdentifierFromModuleName = makeIdentifierFromModuleName;
     function isBlockOrCatchScoped(declaration) {
         return (ts.getCombinedNodeFlags(declaration) & 3 /* BlockScoped */) !== 0 ||
-            isCatchClauseVariableDeclaration(declaration);
+            isCatchClauseVariableDeclarationOrBindingElement(declaration);
     }
     ts.isBlockOrCatchScoped = isBlockOrCatchScoped;
+    function isCatchClauseVariableDeclarationOrBindingElement(declaration) {
+        var node = getRootDeclaration(declaration);
+        return node.kind === 223 /* VariableDeclaration */ && node.parent.kind === 256 /* CatchClause */;
+    }
+    ts.isCatchClauseVariableDeclarationOrBindingElement = isCatchClauseVariableDeclarationOrBindingElement;
     function isAmbientModule(node) {
-        return node && node.kind === 226 /* ModuleDeclaration */ &&
+        return node && node.kind === 230 /* ModuleDeclaration */ &&
             (node.name.kind === 9 /* StringLiteral */ || isGlobalScopeAugmentation(node));
     }
     ts.isAmbientModule = isAmbientModule;
+    /** Given a symbol for a module, checks that it is either an untyped import or a shorthand ambient module. */
     function isShorthandAmbientModuleSymbol(moduleSymbol) {
         return isShorthandAmbientModule(moduleSymbol.valueDeclaration);
     }
     ts.isShorthandAmbientModuleSymbol = isShorthandAmbientModuleSymbol;
     function isShorthandAmbientModule(node) {
         // The only kind of module that can be missing a body is a shorthand ambient module.
-        return node.kind === 226 /* ModuleDeclaration */ && (!node.body);
+        return node.kind === 230 /* ModuleDeclaration */ && (!node.body);
     }
     function isBlockScopedContainerTopLevel(node) {
-        return node.kind === 256 /* SourceFile */ ||
-            node.kind === 226 /* ModuleDeclaration */ ||
+        return node.kind === 261 /* SourceFile */ ||
+            node.kind === 230 /* ModuleDeclaration */ ||
             isFunctionLike(node);
     }
     ts.isBlockScopedContainerTopLevel = isBlockScopedContainerTopLevel;
@@ -6468,9 +6717,9 @@ var ts;
             return false;
         }
         switch (node.parent.kind) {
-            case 256 /* SourceFile */:
+            case 261 /* SourceFile */:
                 return ts.isExternalModule(node.parent);
-            case 227 /* ModuleBlock */:
+            case 231 /* ModuleBlock */:
                 return isAmbientModule(node.parent.parent) && !ts.isExternalModule(node.parent.parent.parent);
         }
         return false;
@@ -6478,22 +6727,22 @@ var ts;
     ts.isExternalModuleAugmentation = isExternalModuleAugmentation;
     function isBlockScope(node, parentNode) {
         switch (node.kind) {
-            case 256 /* SourceFile */:
-            case 228 /* CaseBlock */:
-            case 252 /* CatchClause */:
-            case 226 /* ModuleDeclaration */:
-            case 207 /* ForStatement */:
-            case 208 /* ForInStatement */:
-            case 209 /* ForOfStatement */:
-            case 149 /* Constructor */:
-            case 148 /* MethodDeclaration */:
-            case 150 /* GetAccessor */:
-            case 151 /* SetAccessor */:
-            case 221 /* FunctionDeclaration */:
-            case 180 /* FunctionExpression */:
-            case 181 /* ArrowFunction */:
+            case 261 /* SourceFile */:
+            case 232 /* CaseBlock */:
+            case 256 /* CatchClause */:
+            case 230 /* ModuleDeclaration */:
+            case 211 /* ForStatement */:
+            case 212 /* ForInStatement */:
+            case 213 /* ForOfStatement */:
+            case 150 /* Constructor */:
+            case 149 /* MethodDeclaration */:
+            case 151 /* GetAccessor */:
+            case 152 /* SetAccessor */:
+            case 225 /* FunctionDeclaration */:
+            case 184 /* FunctionExpression */:
+            case 185 /* ArrowFunction */:
                 return true;
-            case 200 /* Block */:
+            case 204 /* Block */:
                 // function block is not considered block-scope container
                 // see comment in binder.ts: bind(...), case for SyntaxKind.Block
                 return parentNode && !isFunctionLike(parentNode);
@@ -6513,13 +6762,6 @@ var ts;
         }
     }
     ts.getEnclosingBlockScopeContainer = getEnclosingBlockScopeContainer;
-    function isCatchClauseVariableDeclaration(declaration) {
-        return declaration &&
-            declaration.kind === 219 /* VariableDeclaration */ &&
-            declaration.parent &&
-            declaration.parent.kind === 252 /* CatchClause */;
-    }
-    ts.isCatchClauseVariableDeclaration = isCatchClauseVariableDeclaration;
     // Return display name of an identifier
     // Computed property names will just be emitted as "[<expr>]", where <expr> is the source
     // text of the expression in the computed property.
@@ -6527,12 +6769,42 @@ var ts;
         return getFullWidth(name) === 0 ? "(Missing)" : getTextOfNode(name);
     }
     ts.declarationNameToString = declarationNameToString;
+    function getTextOfPropertyName(name) {
+        switch (name.kind) {
+            case 70 /* Identifier */:
+                return name.text;
+            case 9 /* StringLiteral */:
+            case 8 /* NumericLiteral */:
+                return name.text;
+            case 142 /* ComputedPropertyName */:
+                if (isStringOrNumericLiteral(name.expression.kind)) {
+                    return name.expression.text;
+                }
+        }
+        return undefined;
+    }
+    ts.getTextOfPropertyName = getTextOfPropertyName;
+    function entityNameToString(name) {
+        switch (name.kind) {
+            case 70 /* Identifier */:
+                return getFullWidth(name) === 0 ? unescapeIdentifier(name.text) : getTextOfNode(name);
+            case 141 /* QualifiedName */:
+                return entityNameToString(name.left) + "." + entityNameToString(name.right);
+            case 177 /* PropertyAccessExpression */:
+                return entityNameToString(name.expression) + "." + entityNameToString(name.name);
+        }
+    }
+    ts.entityNameToString = entityNameToString;
     function createDiagnosticForNode(node, message, arg0, arg1, arg2) {
         var sourceFile = getSourceFileOfNode(node);
+        return createDiagnosticForNodeInSourceFile(sourceFile, node, message, arg0, arg1, arg2);
+    }
+    ts.createDiagnosticForNode = createDiagnosticForNode;
+    function createDiagnosticForNodeInSourceFile(sourceFile, node, message, arg0, arg1, arg2) {
         var span = getErrorSpanForNode(sourceFile, node);
         return ts.createFileDiagnostic(sourceFile, span.start, span.length, message, arg0, arg1, arg2);
     }
-    ts.createDiagnosticForNode = createDiagnosticForNode;
+    ts.createDiagnosticForNodeInSourceFile = createDiagnosticForNodeInSourceFile;
     function createDiagnosticForNodeFromMessageChain(node, messageChain) {
         var sourceFile = getSourceFileOfNode(node);
         var span = getErrorSpanForNode(sourceFile, node);
@@ -6555,7 +6827,7 @@ var ts;
     ts.getSpanOfTokenAtPosition = getSpanOfTokenAtPosition;
     function getErrorSpanForArrowFunction(sourceFile, node) {
         var pos = ts.skipTrivia(sourceFile.text, node.pos);
-        if (node.body && node.body.kind === 200 /* Block */) {
+        if (node.body && node.body.kind === 204 /* Block */) {
             var startLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.pos).line;
             var endLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.end).line;
             if (startLine < endLine) {
@@ -6569,7 +6841,7 @@ var ts;
     function getErrorSpanForNode(sourceFile, node) {
         var errorNode = node;
         switch (node.kind) {
-            case 256 /* SourceFile */:
+            case 261 /* 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
@@ -6578,23 +6850,23 @@ var ts;
                 return getSpanOfTokenAtPosition(sourceFile, pos_1);
             // This list is a work in progress. Add missing node kinds to improve their error
             // spans.
-            case 219 /* VariableDeclaration */:
-            case 170 /* BindingElement */:
-            case 222 /* ClassDeclaration */:
-            case 193 /* ClassExpression */:
-            case 223 /* InterfaceDeclaration */:
-            case 226 /* ModuleDeclaration */:
-            case 225 /* EnumDeclaration */:
-            case 255 /* EnumMember */:
-            case 221 /* FunctionDeclaration */:
-            case 180 /* FunctionExpression */:
-            case 148 /* MethodDeclaration */:
-            case 150 /* GetAccessor */:
-            case 151 /* SetAccessor */:
-            case 224 /* TypeAliasDeclaration */:
+            case 223 /* VariableDeclaration */:
+            case 174 /* BindingElement */:
+            case 226 /* ClassDeclaration */:
+            case 197 /* ClassExpression */:
+            case 227 /* InterfaceDeclaration */:
+            case 230 /* ModuleDeclaration */:
+            case 229 /* EnumDeclaration */:
+            case 260 /* EnumMember */:
+            case 225 /* FunctionDeclaration */:
+            case 184 /* FunctionExpression */:
+            case 149 /* MethodDeclaration */:
+            case 151 /* GetAccessor */:
+            case 152 /* SetAccessor */:
+            case 228 /* TypeAliasDeclaration */:
                 errorNode = node.name;
                 break;
-            case 181 /* ArrowFunction */:
+            case 185 /* ArrowFunction */:
                 return getErrorSpanForArrowFunction(sourceFile, node);
         }
         if (errorNode === undefined) {
@@ -6617,7 +6889,7 @@ var ts;
     }
     ts.isDeclarationFile = isDeclarationFile;
     function isConstEnumDeclaration(node) {
-        return node.kind === 225 /* EnumDeclaration */ && isConst(node);
+        return node.kind === 229 /* EnumDeclaration */ && isConst(node);
     }
     ts.isConstEnumDeclaration = isConstEnumDeclaration;
     function isConst(node) {
@@ -6630,11 +6902,11 @@ var ts;
     }
     ts.isLet = isLet;
     function isSuperCall(n) {
-        return n.kind === 175 /* CallExpression */ && n.expression.kind === 96 /* SuperKeyword */;
+        return n.kind === 179 /* CallExpression */ && n.expression.kind === 96 /* SuperKeyword */;
     }
     ts.isSuperCall = isSuperCall;
     function isPrologueDirective(node) {
-        return node.kind === 203 /* ExpressionStatement */ && node.expression.kind === 9 /* StringLiteral */;
+        return node.kind === 207 /* ExpressionStatement */ && node.expression.kind === 9 /* StringLiteral */;
     }
     ts.isPrologueDirective = isPrologueDirective;
     function getLeadingCommentRangesOfNode(node, sourceFileOfNode) {
@@ -6650,10 +6922,10 @@ var ts;
     }
     ts.getJsDocComments = getJsDocComments;
     function getJsDocCommentsFromText(node, text) {
-        var commentRanges = (node.kind === 143 /* Parameter */ ||
-            node.kind === 142 /* TypeParameter */ ||
-            node.kind === 180 /* FunctionExpression */ ||
-            node.kind === 181 /* ArrowFunction */) ?
+        var commentRanges = (node.kind === 144 /* Parameter */ ||
+            node.kind === 143 /* TypeParameter */ ||
+            node.kind === 184 /* FunctionExpression */ ||
+            node.kind === 185 /* ArrowFunction */) ?
             ts.concatenate(ts.getTrailingCommentRanges(text, node.pos), ts.getLeadingCommentRanges(text, node.pos)) :
             getLeadingCommentRangesOfNodeFromText(node, text);
         return ts.filter(commentRanges, isJsDocComment);
@@ -6669,39 +6941,39 @@ var ts;
     ts.fullTripleSlashReferenceTypeReferenceDirectiveRegEx = /^(\/\/\/\s*<reference\s+types\s*=\s*)('|")(.+?)\2.*?\/>/;
     ts.fullTripleSlashAMDReferencePathRegEx = /^(\/\/\/\s*<amd-dependency\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
     function isPartOfTypeNode(node) {
-        if (155 /* FirstTypeNode */ <= node.kind && node.kind <= 167 /* LastTypeNode */) {
+        if (156 /* FirstTypeNode */ <= node.kind && node.kind <= 171 /* LastTypeNode */) {
             return true;
         }
         switch (node.kind) {
             case 118 /* AnyKeyword */:
-            case 131 /* NumberKeyword */:
-            case 133 /* StringKeyword */:
+            case 132 /* NumberKeyword */:
+            case 134 /* StringKeyword */:
             case 121 /* BooleanKeyword */:
-            case 134 /* SymbolKeyword */:
-            case 136 /* UndefinedKeyword */:
-            case 128 /* NeverKeyword */:
+            case 135 /* SymbolKeyword */:
+            case 137 /* UndefinedKeyword */:
+            case 129 /* NeverKeyword */:
                 return true;
             case 104 /* VoidKeyword */:
-                return node.parent.kind !== 184 /* VoidExpression */;
-            case 195 /* ExpressionWithTypeArguments */:
+                return node.parent.kind !== 188 /* VoidExpression */;
+            case 199 /* ExpressionWithTypeArguments */:
                 return !isExpressionWithTypeArgumentsInClassExtendsClause(node);
             // Identifiers and qualified names may be type nodes, depending on their context. Climb
             // above them to find the lowest container
             case 70 /* Identifier */:
                 // If the identifier is the RHS of a qualified name, then it's a type iff its parent is.
-                if (node.parent.kind === 140 /* QualifiedName */ && node.parent.right === node) {
+                if (node.parent.kind === 141 /* QualifiedName */ && node.parent.right === node) {
                     node = node.parent;
                 }
-                else if (node.parent.kind === 173 /* PropertyAccessExpression */ && node.parent.name === node) {
+                else if (node.parent.kind === 177 /* 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 === 70 /* Identifier */ || node.kind === 140 /* QualifiedName */ || node.kind === 173 /* PropertyAccessExpression */, "'node' was expected to be a qualified name, identifier or property access in 'isPartOfTypeNode'.");
-            case 140 /* QualifiedName */:
-            case 173 /* PropertyAccessExpression */:
+                ts.Debug.assert(node.kind === 70 /* Identifier */ || node.kind === 141 /* QualifiedName */ || node.kind === 177 /* PropertyAccessExpression */, "'node' was expected to be a qualified name, identifier or property access in 'isPartOfTypeNode'.");
+            case 141 /* QualifiedName */:
+            case 177 /* PropertyAccessExpression */:
             case 98 /* ThisKeyword */:
                 var parent_1 = node.parent;
-                if (parent_1.kind === 159 /* TypeQuery */) {
+                if (parent_1.kind === 160 /* TypeQuery */) {
                     return false;
                 }
                 // Do not recursively call isPartOfTypeNode on the parent. In the example:
@@ -6710,38 +6982,38 @@ var ts;
                 //
                 // Calling isPartOfTypeNode would consider the qualified name A.B a type node. Only C or
                 // A.B.C is a type node.
-                if (155 /* FirstTypeNode */ <= parent_1.kind && parent_1.kind <= 167 /* LastTypeNode */) {
+                if (156 /* FirstTypeNode */ <= parent_1.kind && parent_1.kind <= 171 /* LastTypeNode */) {
                     return true;
                 }
                 switch (parent_1.kind) {
-                    case 195 /* ExpressionWithTypeArguments */:
+                    case 199 /* ExpressionWithTypeArguments */:
                         return !isExpressionWithTypeArgumentsInClassExtendsClause(parent_1);
-                    case 142 /* TypeParameter */:
+                    case 143 /* TypeParameter */:
                         return node === parent_1.constraint;
-                    case 146 /* PropertyDeclaration */:
-                    case 145 /* PropertySignature */:
-                    case 143 /* Parameter */:
-                    case 219 /* VariableDeclaration */:
+                    case 147 /* PropertyDeclaration */:
+                    case 146 /* PropertySignature */:
+                    case 144 /* Parameter */:
+                    case 223 /* VariableDeclaration */:
                         return node === parent_1.type;
-                    case 221 /* FunctionDeclaration */:
-                    case 180 /* FunctionExpression */:
-                    case 181 /* ArrowFunction */:
-                    case 149 /* Constructor */:
-                    case 148 /* MethodDeclaration */:
-                    case 147 /* MethodSignature */:
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
+                    case 225 /* FunctionDeclaration */:
+                    case 184 /* FunctionExpression */:
+                    case 185 /* ArrowFunction */:
+                    case 150 /* Constructor */:
+                    case 149 /* MethodDeclaration */:
+                    case 148 /* MethodSignature */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* SetAccessor */:
                         return node === parent_1.type;
-                    case 152 /* CallSignature */:
-                    case 153 /* ConstructSignature */:
-                    case 154 /* IndexSignature */:
+                    case 153 /* CallSignature */:
+                    case 154 /* ConstructSignature */:
+                    case 155 /* IndexSignature */:
                         return node === parent_1.type;
-                    case 178 /* TypeAssertionExpression */:
+                    case 182 /* TypeAssertionExpression */:
                         return node === parent_1.type;
-                    case 175 /* CallExpression */:
-                    case 176 /* NewExpression */:
+                    case 179 /* CallExpression */:
+                    case 180 /* NewExpression */:
                         return parent_1.typeArguments && ts.indexOf(parent_1.typeArguments, node) >= 0;
-                    case 177 /* TaggedTemplateExpression */:
+                    case 181 /* TaggedTemplateExpression */:
                         // TODO (drosen): TaggedTemplateExpressions may eventually support type arguments.
                         return false;
                 }
@@ -6755,23 +7027,23 @@ var ts;
         return traverse(body);
         function traverse(node) {
             switch (node.kind) {
-                case 212 /* ReturnStatement */:
+                case 216 /* ReturnStatement */:
                     return visitor(node);
-                case 228 /* CaseBlock */:
-                case 200 /* Block */:
-                case 204 /* IfStatement */:
-                case 205 /* DoStatement */:
-                case 206 /* WhileStatement */:
-                case 207 /* ForStatement */:
-                case 208 /* ForInStatement */:
-                case 209 /* ForOfStatement */:
-                case 213 /* WithStatement */:
-                case 214 /* SwitchStatement */:
-                case 249 /* CaseClause */:
-                case 250 /* DefaultClause */:
-                case 215 /* LabeledStatement */:
-                case 217 /* TryStatement */:
-                case 252 /* CatchClause */:
+                case 232 /* CaseBlock */:
+                case 204 /* Block */:
+                case 208 /* IfStatement */:
+                case 209 /* DoStatement */:
+                case 210 /* WhileStatement */:
+                case 211 /* ForStatement */:
+                case 212 /* ForInStatement */:
+                case 213 /* ForOfStatement */:
+                case 217 /* WithStatement */:
+                case 218 /* SwitchStatement */:
+                case 253 /* CaseClause */:
+                case 254 /* DefaultClause */:
+                case 219 /* LabeledStatement */:
+                case 221 /* TryStatement */:
+                case 256 /* CatchClause */:
                     return ts.forEachChild(node, traverse);
             }
         }
@@ -6781,18 +7053,18 @@ var ts;
         return traverse(body);
         function traverse(node) {
             switch (node.kind) {
-                case 191 /* YieldExpression */:
+                case 195 /* YieldExpression */:
                     visitor(node);
                     var operand = node.expression;
                     if (operand) {
                         traverse(operand);
                     }
-                case 225 /* EnumDeclaration */:
-                case 223 /* InterfaceDeclaration */:
-                case 226 /* ModuleDeclaration */:
-                case 224 /* TypeAliasDeclaration */:
-                case 222 /* ClassDeclaration */:
-                case 193 /* ClassExpression */:
+                case 229 /* EnumDeclaration */:
+                case 227 /* InterfaceDeclaration */:
+                case 230 /* ModuleDeclaration */:
+                case 228 /* TypeAliasDeclaration */:
+                case 226 /* ClassDeclaration */:
+                case 197 /* 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.
@@ -6800,7 +7072,7 @@ var ts;
                 default:
                     if (isFunctionLike(node)) {
                         var name_5 = node.name;
-                        if (name_5 && name_5.kind === 141 /* ComputedPropertyName */) {
+                        if (name_5 && name_5.kind === 142 /* 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(name_5.expression);
@@ -6819,14 +7091,14 @@ var ts;
     function isVariableLike(node) {
         if (node) {
             switch (node.kind) {
-                case 170 /* BindingElement */:
-                case 255 /* EnumMember */:
-                case 143 /* Parameter */:
-                case 253 /* PropertyAssignment */:
-                case 146 /* PropertyDeclaration */:
-                case 145 /* PropertySignature */:
-                case 254 /* ShorthandPropertyAssignment */:
-                case 219 /* VariableDeclaration */:
+                case 174 /* BindingElement */:
+                case 260 /* EnumMember */:
+                case 144 /* Parameter */:
+                case 257 /* PropertyAssignment */:
+                case 147 /* PropertyDeclaration */:
+                case 146 /* PropertySignature */:
+                case 258 /* ShorthandPropertyAssignment */:
+                case 223 /* VariableDeclaration */:
                     return true;
             }
         }
@@ -6834,11 +7106,11 @@ var ts;
     }
     ts.isVariableLike = isVariableLike;
     function isAccessor(node) {
-        return node && (node.kind === 150 /* GetAccessor */ || node.kind === 151 /* SetAccessor */);
+        return node && (node.kind === 151 /* GetAccessor */ || node.kind === 152 /* SetAccessor */);
     }
     ts.isAccessor = isAccessor;
     function isClassLike(node) {
-        return node && (node.kind === 222 /* ClassDeclaration */ || node.kind === 193 /* ClassExpression */);
+        return node && (node.kind === 226 /* ClassDeclaration */ || node.kind === 197 /* ClassExpression */);
     }
     ts.isClassLike = isClassLike;
     function isFunctionLike(node) {
@@ -6847,19 +7119,19 @@ var ts;
     ts.isFunctionLike = isFunctionLike;
     function isFunctionLikeKind(kind) {
         switch (kind) {
-            case 149 /* Constructor */:
-            case 180 /* FunctionExpression */:
-            case 221 /* FunctionDeclaration */:
-            case 181 /* ArrowFunction */:
-            case 148 /* MethodDeclaration */:
-            case 147 /* MethodSignature */:
-            case 150 /* GetAccessor */:
-            case 151 /* SetAccessor */:
-            case 152 /* CallSignature */:
-            case 153 /* ConstructSignature */:
-            case 154 /* IndexSignature */:
-            case 157 /* FunctionType */:
-            case 158 /* ConstructorType */:
+            case 150 /* Constructor */:
+            case 184 /* FunctionExpression */:
+            case 225 /* FunctionDeclaration */:
+            case 185 /* ArrowFunction */:
+            case 149 /* MethodDeclaration */:
+            case 148 /* MethodSignature */:
+            case 151 /* GetAccessor */:
+            case 152 /* SetAccessor */:
+            case 153 /* CallSignature */:
+            case 154 /* ConstructSignature */:
+            case 155 /* IndexSignature */:
+            case 158 /* FunctionType */:
+            case 159 /* ConstructorType */:
                 return true;
         }
         return false;
@@ -6867,13 +7139,13 @@ var ts;
     ts.isFunctionLikeKind = isFunctionLikeKind;
     function introducesArgumentsExoticObject(node) {
         switch (node.kind) {
-            case 148 /* MethodDeclaration */:
-            case 147 /* MethodSignature */:
-            case 149 /* Constructor */:
-            case 150 /* GetAccessor */:
-            case 151 /* SetAccessor */:
-            case 221 /* FunctionDeclaration */:
-            case 180 /* FunctionExpression */:
+            case 149 /* MethodDeclaration */:
+            case 148 /* MethodSignature */:
+            case 150 /* Constructor */:
+            case 151 /* GetAccessor */:
+            case 152 /* SetAccessor */:
+            case 225 /* FunctionDeclaration */:
+            case 184 /* FunctionExpression */:
                 return true;
         }
         return false;
@@ -6881,30 +7153,30 @@ var ts;
     ts.introducesArgumentsExoticObject = introducesArgumentsExoticObject;
     function isIterationStatement(node, lookInLabeledStatements) {
         switch (node.kind) {
-            case 207 /* ForStatement */:
-            case 208 /* ForInStatement */:
-            case 209 /* ForOfStatement */:
-            case 205 /* DoStatement */:
-            case 206 /* WhileStatement */:
+            case 211 /* ForStatement */:
+            case 212 /* ForInStatement */:
+            case 213 /* ForOfStatement */:
+            case 209 /* DoStatement */:
+            case 210 /* WhileStatement */:
                 return true;
-            case 215 /* LabeledStatement */:
+            case 219 /* LabeledStatement */:
                 return lookInLabeledStatements && isIterationStatement(node.statement, lookInLabeledStatements);
         }
         return false;
     }
     ts.isIterationStatement = isIterationStatement;
     function isFunctionBlock(node) {
-        return node && node.kind === 200 /* Block */ && isFunctionLike(node.parent);
+        return node && node.kind === 204 /* Block */ && isFunctionLike(node.parent);
     }
     ts.isFunctionBlock = isFunctionBlock;
     function isObjectLiteralMethod(node) {
-        return node && node.kind === 148 /* MethodDeclaration */ && node.parent.kind === 172 /* ObjectLiteralExpression */;
+        return node && node.kind === 149 /* MethodDeclaration */ && node.parent.kind === 176 /* ObjectLiteralExpression */;
     }
     ts.isObjectLiteralMethod = isObjectLiteralMethod;
     function isObjectLiteralOrClassExpressionMethod(node) {
-        return node.kind === 148 /* MethodDeclaration */ &&
-            (node.parent.kind === 172 /* ObjectLiteralExpression */ ||
-                node.parent.kind === 193 /* ClassExpression */);
+        return node.kind === 149 /* MethodDeclaration */ &&
+            (node.parent.kind === 176 /* ObjectLiteralExpression */ ||
+                node.parent.kind === 197 /* ClassExpression */);
     }
     ts.isObjectLiteralOrClassExpressionMethod = isObjectLiteralOrClassExpressionMethod;
     function isIdentifierTypePredicate(predicate) {
@@ -6940,7 +7212,7 @@ var ts;
                 return undefined;
             }
             switch (node.kind) {
-                case 141 /* ComputedPropertyName */:
+                case 142 /* 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
@@ -6955,9 +7227,9 @@ var ts;
                     // the *body* of the container.
                     node = node.parent;
                     break;
-                case 144 /* Decorator */:
+                case 145 /* Decorator */:
                     // Decorators are always applied outside of the body of a class or method.
-                    if (node.parent.kind === 143 /* Parameter */ && isClassElement(node.parent.parent)) {
+                    if (node.parent.kind === 144 /* Parameter */ && 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;
@@ -6968,26 +7240,26 @@ var ts;
                         node = node.parent;
                     }
                     break;
-                case 181 /* ArrowFunction */:
+                case 185 /* ArrowFunction */:
                     if (!includeArrowFunctions) {
                         continue;
                     }
                 // Fall through
-                case 221 /* FunctionDeclaration */:
-                case 180 /* FunctionExpression */:
-                case 226 /* ModuleDeclaration */:
-                case 146 /* PropertyDeclaration */:
-                case 145 /* PropertySignature */:
-                case 148 /* MethodDeclaration */:
-                case 147 /* MethodSignature */:
-                case 149 /* Constructor */:
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
-                case 152 /* CallSignature */:
-                case 153 /* ConstructSignature */:
-                case 154 /* IndexSignature */:
-                case 225 /* EnumDeclaration */:
-                case 256 /* SourceFile */:
+                case 225 /* FunctionDeclaration */:
+                case 184 /* FunctionExpression */:
+                case 230 /* ModuleDeclaration */:
+                case 147 /* PropertyDeclaration */:
+                case 146 /* PropertySignature */:
+                case 149 /* MethodDeclaration */:
+                case 148 /* MethodSignature */:
+                case 150 /* Constructor */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
+                case 153 /* CallSignature */:
+                case 154 /* ConstructSignature */:
+                case 155 /* IndexSignature */:
+                case 229 /* EnumDeclaration */:
+                case 261 /* SourceFile */:
                     return node;
             }
         }
@@ -7008,26 +7280,26 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 141 /* ComputedPropertyName */:
+                case 142 /* ComputedPropertyName */:
                     node = node.parent;
                     break;
-                case 221 /* FunctionDeclaration */:
-                case 180 /* FunctionExpression */:
-                case 181 /* ArrowFunction */:
+                case 225 /* FunctionDeclaration */:
+                case 184 /* FunctionExpression */:
+                case 185 /* ArrowFunction */:
                     if (!stopOnFunctions) {
                         continue;
                     }
-                case 146 /* PropertyDeclaration */:
-                case 145 /* PropertySignature */:
-                case 148 /* MethodDeclaration */:
-                case 147 /* MethodSignature */:
-                case 149 /* Constructor */:
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
+                case 147 /* PropertyDeclaration */:
+                case 146 /* PropertySignature */:
+                case 149 /* MethodDeclaration */:
+                case 148 /* MethodSignature */:
+                case 150 /* Constructor */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
                     return node;
-                case 144 /* Decorator */:
+                case 145 /* Decorator */:
                     // Decorators are always applied outside of the body of a class or method.
-                    if (node.parent.kind === 143 /* Parameter */ && isClassElement(node.parent.parent)) {
+                    if (node.parent.kind === 144 /* Parameter */ && 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;
@@ -7043,14 +7315,14 @@ var ts;
     }
     ts.getSuperContainer = getSuperContainer;
     function getImmediatelyInvokedFunctionExpression(func) {
-        if (func.kind === 180 /* FunctionExpression */ || func.kind === 181 /* ArrowFunction */) {
+        if (func.kind === 184 /* FunctionExpression */ || func.kind === 185 /* ArrowFunction */) {
             var prev = func;
             var parent_2 = func.parent;
-            while (parent_2.kind === 179 /* ParenthesizedExpression */) {
+            while (parent_2.kind === 183 /* ParenthesizedExpression */) {
                 prev = parent_2;
                 parent_2 = parent_2.parent;
             }
-            if (parent_2.kind === 175 /* CallExpression */ && parent_2.expression === prev) {
+            if (parent_2.kind === 179 /* CallExpression */ && parent_2.expression === prev) {
                 return parent_2;
             }
         }
@@ -7061,32 +7333,32 @@ var ts;
      */
     function isSuperProperty(node) {
         var kind = node.kind;
-        return (kind === 173 /* PropertyAccessExpression */ || kind === 174 /* ElementAccessExpression */)
+        return (kind === 177 /* PropertyAccessExpression */ || kind === 178 /* ElementAccessExpression */)
             && node.expression.kind === 96 /* SuperKeyword */;
     }
     ts.isSuperProperty = isSuperProperty;
     function getEntityNameFromTypeNode(node) {
-        if (node) {
-            switch (node.kind) {
-                case 156 /* TypeReference */:
-                    return node.typeName;
-                case 195 /* ExpressionWithTypeArguments */:
-                    ts.Debug.assert(isEntityNameExpression(node.expression));
-                    return node.expression;
-                case 70 /* Identifier */:
-                case 140 /* QualifiedName */:
-                    return node;
-            }
+        switch (node.kind) {
+            case 157 /* TypeReference */:
+            case 272 /* JSDocTypeReference */:
+                return node.typeName;
+            case 199 /* ExpressionWithTypeArguments */:
+                return isEntityNameExpression(node.expression)
+                    ? node.expression
+                    : undefined;
+            case 70 /* Identifier */:
+            case 141 /* QualifiedName */:
+                return node;
         }
         return undefined;
     }
     ts.getEntityNameFromTypeNode = getEntityNameFromTypeNode;
     function isCallLikeExpression(node) {
         switch (node.kind) {
-            case 175 /* CallExpression */:
-            case 176 /* NewExpression */:
-            case 177 /* TaggedTemplateExpression */:
-            case 144 /* Decorator */:
+            case 179 /* CallExpression */:
+            case 180 /* NewExpression */:
+            case 181 /* TaggedTemplateExpression */:
+            case 145 /* Decorator */:
                 return true;
             default:
                 return false;
@@ -7094,7 +7366,7 @@ var ts;
     }
     ts.isCallLikeExpression = isCallLikeExpression;
     function getInvokedExpression(node) {
-        if (node.kind === 177 /* TaggedTemplateExpression */) {
+        if (node.kind === 181 /* TaggedTemplateExpression */) {
             return node.tag;
         }
         // Will either be a CallExpression, NewExpression, or Decorator.
@@ -7103,25 +7375,25 @@ var ts;
     ts.getInvokedExpression = getInvokedExpression;
     function nodeCanBeDecorated(node) {
         switch (node.kind) {
-            case 222 /* ClassDeclaration */:
+            case 226 /* ClassDeclaration */:
                 // classes are valid targets
                 return true;
-            case 146 /* PropertyDeclaration */:
+            case 147 /* PropertyDeclaration */:
                 // property declarations are valid if their parent is a class declaration.
-                return node.parent.kind === 222 /* ClassDeclaration */;
-            case 150 /* GetAccessor */:
-            case 151 /* SetAccessor */:
-            case 148 /* MethodDeclaration */:
+                return node.parent.kind === 226 /* ClassDeclaration */;
+            case 151 /* GetAccessor */:
+            case 152 /* SetAccessor */:
+            case 149 /* MethodDeclaration */:
                 // if this method has a body and its parent is a class declaration, this is a valid target.
                 return node.body !== undefined
-                    && node.parent.kind === 222 /* ClassDeclaration */;
-            case 143 /* Parameter */:
+                    && node.parent.kind === 226 /* ClassDeclaration */;
+            case 144 /* Parameter */:
                 // if the parameter's parent has a body and its grandparent is a class declaration, this is a valid target;
                 return node.parent.body !== undefined
-                    && (node.parent.kind === 149 /* Constructor */
-                        || node.parent.kind === 148 /* MethodDeclaration */
-                        || node.parent.kind === 151 /* SetAccessor */)
-                    && node.parent.parent.kind === 222 /* ClassDeclaration */;
+                    && (node.parent.kind === 150 /* Constructor */
+                        || node.parent.kind === 149 /* MethodDeclaration */
+                        || node.parent.kind === 152 /* SetAccessor */)
+                    && node.parent.parent.kind === 226 /* ClassDeclaration */;
         }
         return false;
     }
@@ -7137,19 +7409,19 @@ var ts;
     ts.nodeOrChildIsDecorated = nodeOrChildIsDecorated;
     function childIsDecorated(node) {
         switch (node.kind) {
-            case 222 /* ClassDeclaration */:
+            case 226 /* ClassDeclaration */:
                 return ts.forEach(node.members, nodeOrChildIsDecorated);
-            case 148 /* MethodDeclaration */:
-            case 151 /* SetAccessor */:
+            case 149 /* MethodDeclaration */:
+            case 152 /* SetAccessor */:
                 return ts.forEach(node.parameters, nodeIsDecorated);
         }
     }
     ts.childIsDecorated = childIsDecorated;
     function isJSXTagName(node) {
         var parent = node.parent;
-        if (parent.kind === 244 /* JsxOpeningElement */ ||
-            parent.kind === 243 /* JsxSelfClosingElement */ ||
-            parent.kind === 245 /* JsxClosingElement */) {
+        if (parent.kind === 248 /* JsxOpeningElement */ ||
+            parent.kind === 247 /* JsxSelfClosingElement */ ||
+            parent.kind === 249 /* JsxClosingElement */) {
             return parent.tagName === node;
         }
         return false;
@@ -7163,43 +7435,43 @@ var ts;
             case 100 /* TrueKeyword */:
             case 85 /* FalseKeyword */:
             case 11 /* RegularExpressionLiteral */:
-            case 171 /* ArrayLiteralExpression */:
-            case 172 /* ObjectLiteralExpression */:
-            case 173 /* PropertyAccessExpression */:
-            case 174 /* ElementAccessExpression */:
-            case 175 /* CallExpression */:
-            case 176 /* NewExpression */:
-            case 177 /* TaggedTemplateExpression */:
-            case 196 /* AsExpression */:
-            case 178 /* TypeAssertionExpression */:
-            case 197 /* NonNullExpression */:
-            case 179 /* ParenthesizedExpression */:
-            case 180 /* FunctionExpression */:
-            case 193 /* ClassExpression */:
-            case 181 /* ArrowFunction */:
-            case 184 /* VoidExpression */:
-            case 182 /* DeleteExpression */:
-            case 183 /* TypeOfExpression */:
-            case 186 /* PrefixUnaryExpression */:
-            case 187 /* PostfixUnaryExpression */:
-            case 188 /* BinaryExpression */:
-            case 189 /* ConditionalExpression */:
-            case 192 /* SpreadElementExpression */:
-            case 190 /* TemplateExpression */:
+            case 175 /* ArrayLiteralExpression */:
+            case 176 /* ObjectLiteralExpression */:
+            case 177 /* PropertyAccessExpression */:
+            case 178 /* ElementAccessExpression */:
+            case 179 /* CallExpression */:
+            case 180 /* NewExpression */:
+            case 181 /* TaggedTemplateExpression */:
+            case 200 /* AsExpression */:
+            case 182 /* TypeAssertionExpression */:
+            case 201 /* NonNullExpression */:
+            case 183 /* ParenthesizedExpression */:
+            case 184 /* FunctionExpression */:
+            case 197 /* ClassExpression */:
+            case 185 /* ArrowFunction */:
+            case 188 /* VoidExpression */:
+            case 186 /* DeleteExpression */:
+            case 187 /* TypeOfExpression */:
+            case 190 /* PrefixUnaryExpression */:
+            case 191 /* PostfixUnaryExpression */:
+            case 192 /* BinaryExpression */:
+            case 193 /* ConditionalExpression */:
+            case 196 /* SpreadElement */:
+            case 194 /* TemplateExpression */:
             case 12 /* NoSubstitutionTemplateLiteral */:
-            case 194 /* OmittedExpression */:
-            case 242 /* JsxElement */:
-            case 243 /* JsxSelfClosingElement */:
-            case 191 /* YieldExpression */:
-            case 185 /* AwaitExpression */:
+            case 198 /* OmittedExpression */:
+            case 246 /* JsxElement */:
+            case 247 /* JsxSelfClosingElement */:
+            case 195 /* YieldExpression */:
+            case 189 /* AwaitExpression */:
                 return true;
-            case 140 /* QualifiedName */:
-                while (node.parent.kind === 140 /* QualifiedName */) {
+            case 141 /* QualifiedName */:
+                while (node.parent.kind === 141 /* QualifiedName */) {
                     node = node.parent;
                 }
-                return node.parent.kind === 159 /* TypeQuery */ || isJSXTagName(node);
+                return node.parent.kind === 160 /* TypeQuery */ || isJSXTagName(node);
             case 70 /* Identifier */:
-                if (node.parent.kind === 159 /* TypeQuery */ || isJSXTagName(node)) {
+                if (node.parent.kind === 160 /* TypeQuery */ || isJSXTagName(node)) {
                     return true;
                 }
             // fall through
@@ -7208,47 +7480,47 @@ var ts;
             case 98 /* ThisKeyword */:
                 var parent_3 = node.parent;
                 switch (parent_3.kind) {
-                    case 219 /* VariableDeclaration */:
-                    case 143 /* Parameter */:
-                    case 146 /* PropertyDeclaration */:
-                    case 145 /* PropertySignature */:
-                    case 255 /* EnumMember */:
-                    case 253 /* PropertyAssignment */:
-                    case 170 /* BindingElement */:
+                    case 223 /* VariableDeclaration */:
+                    case 144 /* Parameter */:
+                    case 147 /* PropertyDeclaration */:
+                    case 146 /* PropertySignature */:
+                    case 260 /* EnumMember */:
+                    case 257 /* PropertyAssignment */:
+                    case 174 /* BindingElement */:
                         return parent_3.initializer === node;
-                    case 203 /* ExpressionStatement */:
-                    case 204 /* IfStatement */:
-                    case 205 /* DoStatement */:
-                    case 206 /* WhileStatement */:
-                    case 212 /* ReturnStatement */:
-                    case 213 /* WithStatement */:
-                    case 214 /* SwitchStatement */:
-                    case 249 /* CaseClause */:
-                    case 216 /* ThrowStatement */:
-                    case 214 /* SwitchStatement */:
+                    case 207 /* ExpressionStatement */:
+                    case 208 /* IfStatement */:
+                    case 209 /* DoStatement */:
+                    case 210 /* WhileStatement */:
+                    case 216 /* ReturnStatement */:
+                    case 217 /* WithStatement */:
+                    case 218 /* SwitchStatement */:
+                    case 253 /* CaseClause */:
+                    case 220 /* ThrowStatement */:
+                    case 218 /* SwitchStatement */:
                         return parent_3.expression === node;
-                    case 207 /* ForStatement */:
+                    case 211 /* ForStatement */:
                         var forStatement = parent_3;
-                        return (forStatement.initializer === node && forStatement.initializer.kind !== 220 /* VariableDeclarationList */) ||
+                        return (forStatement.initializer === node && forStatement.initializer.kind !== 224 /* VariableDeclarationList */) ||
                             forStatement.condition === node ||
                             forStatement.incrementor === node;
-                    case 208 /* ForInStatement */:
-                    case 209 /* ForOfStatement */:
+                    case 212 /* ForInStatement */:
+                    case 213 /* ForOfStatement */:
                         var forInStatement = parent_3;
-                        return (forInStatement.initializer === node && forInStatement.initializer.kind !== 220 /* VariableDeclarationList */) ||
+                        return (forInStatement.initializer === node && forInStatement.initializer.kind !== 224 /* VariableDeclarationList */) ||
                             forInStatement.expression === node;
-                    case 178 /* TypeAssertionExpression */:
-                    case 196 /* AsExpression */:
+                    case 182 /* TypeAssertionExpression */:
+                    case 200 /* AsExpression */:
                         return node === parent_3.expression;
-                    case 198 /* TemplateSpan */:
+                    case 202 /* TemplateSpan */:
                         return node === parent_3.expression;
-                    case 141 /* ComputedPropertyName */:
+                    case 142 /* ComputedPropertyName */:
                         return node === parent_3.expression;
-                    case 144 /* Decorator */:
-                    case 248 /* JsxExpression */:
-                    case 247 /* JsxSpreadAttribute */:
+                    case 145 /* Decorator */:
+                    case 252 /* JsxExpression */:
+                    case 251 /* JsxSpreadAttribute */:
                         return true;
-                    case 195 /* ExpressionWithTypeArguments */:
+                    case 199 /* ExpressionWithTypeArguments */:
                         return parent_3.expression === node && isExpressionWithTypeArgumentsInClassExtendsClause(parent_3);
                     default:
                         if (isPartOfExpression(parent_3)) {
@@ -7266,7 +7538,7 @@ var ts;
     }
     ts.isInstantiatedModule = isInstantiatedModule;
     function isExternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 230 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 241 /* ExternalModuleReference */;
+        return node.kind === 234 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 245 /* ExternalModuleReference */;
     }
     ts.isExternalModuleImportEqualsDeclaration = isExternalModuleImportEqualsDeclaration;
     function getExternalModuleImportEqualsDeclarationExpression(node) {
@@ -7275,7 +7547,7 @@ var ts;
     }
     ts.getExternalModuleImportEqualsDeclarationExpression = getExternalModuleImportEqualsDeclarationExpression;
     function isInternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 230 /* ImportEqualsDeclaration */ && node.moduleReference.kind !== 241 /* ExternalModuleReference */;
+        return node.kind === 234 /* ImportEqualsDeclaration */ && node.moduleReference.kind !== 245 /* ExternalModuleReference */;
     }
     ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration;
     function isSourceFileJavaScript(file) {
@@ -7283,7 +7555,7 @@ var ts;
     }
     ts.isSourceFileJavaScript = isSourceFileJavaScript;
     function isInJavaScriptFile(node) {
-        return node && !!(node.flags & 1048576 /* JavaScriptFile */);
+        return node && !!(node.flags & 2097152 /* JavaScriptFile */);
     }
     ts.isInJavaScriptFile = isInJavaScriptFile;
     /**
@@ -7293,7 +7565,7 @@ var ts;
     */
     function isRequireCall(expression, checkArgumentIsStringLiteral) {
         // of the form 'require("name")'
-        var isRequire = expression.kind === 175 /* CallExpression */ &&
+        var isRequire = expression.kind === 179 /* CallExpression */ &&
             expression.expression.kind === 70 /* Identifier */ &&
             expression.expression.text === "require" &&
             expression.arguments.length === 1;
@@ -7309,9 +7581,9 @@ var ts;
      * This function does not test if the node is in a JavaScript file or not.
      */
     function isDeclarationOfFunctionExpression(s) {
-        if (s.valueDeclaration && s.valueDeclaration.kind === 219 /* VariableDeclaration */) {
+        if (s.valueDeclaration && s.valueDeclaration.kind === 223 /* VariableDeclaration */) {
             var declaration = s.valueDeclaration;
-            return declaration.initializer && declaration.initializer.kind === 180 /* FunctionExpression */;
+            return declaration.initializer && declaration.initializer.kind === 184 /* FunctionExpression */;
         }
         return false;
     }
@@ -7322,11 +7594,11 @@ var ts;
         if (!isInJavaScriptFile(expression)) {
             return 0 /* None */;
         }
-        if (expression.kind !== 188 /* BinaryExpression */) {
+        if (expression.kind !== 192 /* BinaryExpression */) {
             return 0 /* None */;
         }
         var expr = expression;
-        if (expr.operatorToken.kind !== 57 /* EqualsToken */ || expr.left.kind !== 173 /* PropertyAccessExpression */) {
+        if (expr.operatorToken.kind !== 57 /* EqualsToken */ || expr.left.kind !== 177 /* PropertyAccessExpression */) {
             return 0 /* None */;
         }
         var lhs = expr.left;
@@ -7344,7 +7616,7 @@ var ts;
         else if (lhs.expression.kind === 98 /* ThisKeyword */) {
             return 4 /* ThisProperty */;
         }
-        else if (lhs.expression.kind === 173 /* PropertyAccessExpression */) {
+        else if (lhs.expression.kind === 177 /* PropertyAccessExpression */) {
             // chained dot, e.g. x.y.z = expr; this var is the 'x.y' part
             var innerPropertyAccess = lhs.expression;
             if (innerPropertyAccess.expression.kind === 70 /* Identifier */) {
@@ -7362,35 +7634,35 @@ var ts;
     }
     ts.getSpecialPropertyAssignmentKind = getSpecialPropertyAssignmentKind;
     function getExternalModuleName(node) {
-        if (node.kind === 231 /* ImportDeclaration */) {
+        if (node.kind === 235 /* ImportDeclaration */) {
             return node.moduleSpecifier;
         }
-        if (node.kind === 230 /* ImportEqualsDeclaration */) {
+        if (node.kind === 234 /* ImportEqualsDeclaration */) {
             var reference = node.moduleReference;
-            if (reference.kind === 241 /* ExternalModuleReference */) {
+            if (reference.kind === 245 /* ExternalModuleReference */) {
                 return reference.expression;
             }
         }
-        if (node.kind === 237 /* ExportDeclaration */) {
+        if (node.kind === 241 /* ExportDeclaration */) {
             return node.moduleSpecifier;
         }
-        if (node.kind === 226 /* ModuleDeclaration */ && node.name.kind === 9 /* StringLiteral */) {
+        if (node.kind === 230 /* ModuleDeclaration */ && node.name.kind === 9 /* StringLiteral */) {
             return node.name;
         }
     }
     ts.getExternalModuleName = getExternalModuleName;
     function getNamespaceDeclarationNode(node) {
-        if (node.kind === 230 /* ImportEqualsDeclaration */) {
+        if (node.kind === 234 /* ImportEqualsDeclaration */) {
             return node;
         }
         var importClause = node.importClause;
-        if (importClause && importClause.namedBindings && importClause.namedBindings.kind === 233 /* NamespaceImport */) {
+        if (importClause && importClause.namedBindings && importClause.namedBindings.kind === 237 /* NamespaceImport */) {
             return importClause.namedBindings;
         }
     }
     ts.getNamespaceDeclarationNode = getNamespaceDeclarationNode;
     function isDefaultImport(node) {
-        return node.kind === 231 /* ImportDeclaration */
+        return node.kind === 235 /* ImportDeclaration */
             && node.importClause
             && !!node.importClause.name;
     }
@@ -7398,13 +7670,13 @@ var ts;
     function hasQuestionToken(node) {
         if (node) {
             switch (node.kind) {
-                case 143 /* Parameter */:
-                case 148 /* MethodDeclaration */:
-                case 147 /* MethodSignature */:
-                case 254 /* ShorthandPropertyAssignment */:
-                case 253 /* PropertyAssignment */:
-                case 146 /* PropertyDeclaration */:
-                case 145 /* PropertySignature */:
+                case 144 /* Parameter */:
+                case 149 /* MethodDeclaration */:
+                case 148 /* MethodSignature */:
+                case 258 /* ShorthandPropertyAssignment */:
+                case 257 /* PropertyAssignment */:
+                case 147 /* PropertyDeclaration */:
+                case 146 /* PropertySignature */:
                     return node.questionToken !== undefined;
             }
         }
@@ -7412,9 +7684,9 @@ var ts;
     }
     ts.hasQuestionToken = hasQuestionToken;
     function isJSDocConstructSignature(node) {
-        return node.kind === 269 /* JSDocFunctionType */ &&
+        return node.kind === 274 /* JSDocFunctionType */ &&
             node.parameters.length > 0 &&
-            node.parameters[0].type.kind === 271 /* JSDocConstructorType */;
+            node.parameters[0].type.kind === 276 /* JSDocConstructorType */;
     }
     ts.isJSDocConstructSignature = isJSDocConstructSignature;
     function getJSDocTag(node, kind, checkParentVariableStatement) {
@@ -7474,34 +7746,34 @@ var ts;
             // var x = function(name) { return name.length; }
             var isInitializerOfVariableDeclarationInStatement = isVariableLike(node.parent) &&
                 (node.parent).initializer === node &&
-                node.parent.parent.parent.kind === 201 /* VariableStatement */;
+                node.parent.parent.parent.kind === 205 /* VariableStatement */;
             var isVariableOfVariableDeclarationStatement = isVariableLike(node) &&
-                node.parent.parent.kind === 201 /* VariableStatement */;
+                node.parent.parent.kind === 205 /* VariableStatement */;
             var variableStatementNode = isInitializerOfVariableDeclarationInStatement ? node.parent.parent.parent :
                 isVariableOfVariableDeclarationStatement ? node.parent.parent :
                     undefined;
             if (variableStatementNode) {
                 result = append(result, getJSDocs(variableStatementNode, checkParentVariableStatement, getDocs, getTags));
             }
-            if (node.kind === 226 /* ModuleDeclaration */ &&
-                node.parent && node.parent.kind === 226 /* ModuleDeclaration */) {
+            if (node.kind === 230 /* ModuleDeclaration */ &&
+                node.parent && node.parent.kind === 230 /* ModuleDeclaration */) {
                 result = append(result, getJSDocs(node.parent, checkParentVariableStatement, getDocs, getTags));
             }
             // Also recognize when the node is the RHS of an assignment expression
             var parent_4 = node.parent;
             var isSourceOfAssignmentExpressionStatement = parent_4 && parent_4.parent &&
-                parent_4.kind === 188 /* BinaryExpression */ &&
+                parent_4.kind === 192 /* BinaryExpression */ &&
                 parent_4.operatorToken.kind === 57 /* EqualsToken */ &&
-                parent_4.parent.kind === 203 /* ExpressionStatement */;
+                parent_4.parent.kind === 207 /* ExpressionStatement */;
             if (isSourceOfAssignmentExpressionStatement) {
                 result = append(result, getJSDocs(parent_4.parent, checkParentVariableStatement, getDocs, getTags));
             }
-            var isPropertyAssignmentExpression = parent_4 && parent_4.kind === 253 /* PropertyAssignment */;
+            var isPropertyAssignmentExpression = parent_4 && parent_4.kind === 257 /* PropertyAssignment */;
             if (isPropertyAssignmentExpression) {
                 result = append(result, getJSDocs(parent_4, checkParentVariableStatement, getDocs, getTags));
             }
             // Pull parameter comments from declaring function as well
-            if (node.kind === 143 /* Parameter */) {
+            if (node.kind === 144 /* Parameter */) {
                 var paramTags = getJSDocParameterTag(node, checkParentVariableStatement);
                 if (paramTags) {
                     result = append(result, getTags(paramTags));
@@ -7527,14 +7799,14 @@ var ts;
         if (!param.name) {
             // this is an anonymous jsdoc param from a `function(type1, type2): type3` specification
             var i = func.parameters.indexOf(param);
-            var paramTags = ts.filter(tags, function (tag) { return tag.kind === 275 /* JSDocParameterTag */; });
+            var paramTags = ts.filter(tags, function (tag) { return tag.kind === 280 /* JSDocParameterTag */; });
             if (paramTags && 0 <= i && i < paramTags.length) {
                 return [paramTags[i]];
             }
         }
         else if (param.name.kind === 70 /* Identifier */) {
             var name_6 = param.name.text;
-            var paramTags = ts.filter(tags, function (tag) { return tag.kind === 275 /* JSDocParameterTag */ && tag.parameterName.text === name_6; });
+            var paramTags = ts.filter(tags, function (tag) { return tag.kind === 280 /* JSDocParameterTag */ && tag.parameterName.text === name_6; });
             if (paramTags) {
                 return paramTags;
             }
@@ -7546,15 +7818,15 @@ var ts;
         }
     }
     function getJSDocTypeTag(node) {
-        return getJSDocTag(node, 277 /* JSDocTypeTag */, /*checkParentVariableStatement*/ false);
+        return getJSDocTag(node, 282 /* JSDocTypeTag */, /*checkParentVariableStatement*/ false);
     }
     ts.getJSDocTypeTag = getJSDocTypeTag;
     function getJSDocReturnTag(node) {
-        return getJSDocTag(node, 276 /* JSDocReturnTag */, /*checkParentVariableStatement*/ true);
+        return getJSDocTag(node, 281 /* JSDocReturnTag */, /*checkParentVariableStatement*/ true);
     }
     ts.getJSDocReturnTag = getJSDocReturnTag;
     function getJSDocTemplateTag(node) {
-        return getJSDocTag(node, 278 /* JSDocTemplateTag */, /*checkParentVariableStatement*/ false);
+        return getJSDocTag(node, 283 /* JSDocTemplateTag */, /*checkParentVariableStatement*/ false);
     }
     ts.getJSDocTemplateTag = getJSDocTemplateTag;
     function getCorrespondingJSDocParameterTag(parameter) {
@@ -7568,7 +7840,7 @@ var ts;
             }
             for (var _i = 0, jsDocTags_2 = jsDocTags; _i < jsDocTags_2.length; _i++) {
                 var tag = jsDocTags_2[_i];
-                if (tag.kind === 275 /* JSDocParameterTag */) {
+                if (tag.kind === 280 /* JSDocParameterTag */) {
                     var parameterTag = tag;
                     if (parameterTag.parameterName.text === parameterName) {
                         return parameterTag;
@@ -7588,13 +7860,13 @@ var ts;
     }
     ts.hasDeclaredRestParameter = hasDeclaredRestParameter;
     function isRestParameter(node) {
-        if (node && (node.flags & 1048576 /* JavaScriptFile */)) {
-            if (node.type && node.type.kind === 270 /* JSDocVariadicType */) {
+        if (node && (node.flags & 2097152 /* JavaScriptFile */)) {
+            if (node.type && node.type.kind === 275 /* JSDocVariadicType */) {
                 return true;
             }
             var paramTag = getCorrespondingJSDocParameterTag(node);
             if (paramTag && paramTag.typeExpression) {
-                return paramTag.typeExpression.type.kind === 270 /* JSDocVariadicType */;
+                return paramTag.typeExpression.type.kind === 275 /* JSDocVariadicType */;
             }
         }
         return isDeclaredRestParam(node);
@@ -7604,29 +7876,53 @@ var ts;
         return node && node.dotDotDotToken !== undefined;
     }
     ts.isDeclaredRestParam = isDeclaredRestParam;
+    var AssignmentKind;
+    (function (AssignmentKind) {
+        AssignmentKind[AssignmentKind["None"] = 0] = "None";
+        AssignmentKind[AssignmentKind["Definite"] = 1] = "Definite";
+        AssignmentKind[AssignmentKind["Compound"] = 2] = "Compound";
+    })(AssignmentKind = ts.AssignmentKind || (ts.AssignmentKind = {}));
+    function getAssignmentTargetKind(node) {
+        var parent = node.parent;
+        while (true) {
+            switch (parent.kind) {
+                case 192 /* BinaryExpression */:
+                    var binaryOperator = parent.operatorToken.kind;
+                    return isAssignmentOperator(binaryOperator) && parent.left === node ?
+                        binaryOperator === 57 /* EqualsToken */ ? 1 /* Definite */ : 2 /* Compound */ :
+                        0 /* None */;
+                case 190 /* PrefixUnaryExpression */:
+                case 191 /* PostfixUnaryExpression */:
+                    var unaryOperator = parent.operator;
+                    return unaryOperator === 42 /* PlusPlusToken */ || unaryOperator === 43 /* MinusMinusToken */ ? 2 /* Compound */ : 0 /* None */;
+                case 212 /* ForInStatement */:
+                case 213 /* ForOfStatement */:
+                    return parent.initializer === node ? 1 /* Definite */ : 0 /* None */;
+                case 183 /* ParenthesizedExpression */:
+                case 175 /* ArrayLiteralExpression */:
+                case 196 /* SpreadElement */:
+                    node = parent;
+                    break;
+                case 258 /* ShorthandPropertyAssignment */:
+                    if (parent.name !== node) {
+                        return 0 /* None */;
+                    }
+                // Fall through
+                case 257 /* PropertyAssignment */:
+                    node = parent.parent;
+                    break;
+                default:
+                    return 0 /* None */;
+            }
+            parent = node.parent;
+        }
+    }
+    ts.getAssignmentTargetKind = getAssignmentTargetKind;
     // A node is an assignment target if it is on the left hand side of an '=' token, if it is parented by a property
     // assignment in an object literal that is an assignment target, or if it is parented by an array literal that is
     // an assignment target. Examples include 'a = xxx', '{ p: a } = xxx', '[{ p: a}] = xxx'.
     function isAssignmentTarget(node) {
-        while (node.parent.kind === 179 /* ParenthesizedExpression */) {
-            node = node.parent;
-        }
-        while (true) {
-            var parent_5 = node.parent;
-            if (parent_5.kind === 171 /* ArrayLiteralExpression */ || parent_5.kind === 192 /* SpreadElementExpression */) {
-                node = parent_5;
-                continue;
-            }
-            if (parent_5.kind === 253 /* PropertyAssignment */ || parent_5.kind === 254 /* ShorthandPropertyAssignment */) {
-                node = parent_5.parent;
-                continue;
-            }
-            return parent_5.kind === 188 /* BinaryExpression */ &&
-                isAssignmentOperator(parent_5.operatorToken.kind) &&
-                parent_5.left === node ||
-                (parent_5.kind === 208 /* ForInStatement */ || parent_5.kind === 209 /* ForOfStatement */) &&
-                    parent_5.initializer === node;
-        }
+        return getAssignmentTargetKind(node) !== 0 /* None */;
     }
     ts.isAssignmentTarget = isAssignmentTarget;
     function isNodeDescendantOf(node, ancestor) {
@@ -7640,7 +7936,7 @@ var ts;
     ts.isNodeDescendantOf = isNodeDescendantOf;
     function isInAmbientContext(node) {
         while (node) {
-            if (hasModifier(node, 2 /* Ambient */) || (node.kind === 256 /* SourceFile */ && node.isDeclarationFile)) {
+            if (hasModifier(node, 2 /* Ambient */) || (node.kind === 261 /* SourceFile */ && node.isDeclarationFile)) {
                 return true;
             }
             node = node.parent;
@@ -7654,7 +7950,7 @@ var ts;
             return false;
         }
         var parent = name.parent;
-        if (parent.kind === 235 /* ImportSpecifier */ || parent.kind === 239 /* ExportSpecifier */) {
+        if (parent.kind === 239 /* ImportSpecifier */ || parent.kind === 243 /* ExportSpecifier */) {
             if (parent.propertyName) {
                 return true;
             }
@@ -7667,7 +7963,7 @@ var ts;
     ts.isDeclarationName = isDeclarationName;
     function isLiteralComputedPropertyDeclarationName(node) {
         return (node.kind === 9 /* StringLiteral */ || node.kind === 8 /* NumericLiteral */) &&
-            node.parent.kind === 141 /* ComputedPropertyName */ &&
+            node.parent.kind === 142 /* ComputedPropertyName */ &&
             isDeclaration(node.parent.parent);
     }
     ts.isLiteralComputedPropertyDeclarationName = isLiteralComputedPropertyDeclarationName;
@@ -7675,31 +7971,31 @@ var ts;
     function isIdentifierName(node) {
         var parent = node.parent;
         switch (parent.kind) {
-            case 146 /* PropertyDeclaration */:
-            case 145 /* PropertySignature */:
-            case 148 /* MethodDeclaration */:
-            case 147 /* MethodSignature */:
-            case 150 /* GetAccessor */:
-            case 151 /* SetAccessor */:
-            case 255 /* EnumMember */:
-            case 253 /* PropertyAssignment */:
-            case 173 /* PropertyAccessExpression */:
+            case 147 /* PropertyDeclaration */:
+            case 146 /* PropertySignature */:
+            case 149 /* MethodDeclaration */:
+            case 148 /* MethodSignature */:
+            case 151 /* GetAccessor */:
+            case 152 /* SetAccessor */:
+            case 260 /* EnumMember */:
+            case 257 /* PropertyAssignment */:
+            case 177 /* PropertyAccessExpression */:
                 // Name in member declaration or property name in property access
                 return parent.name === node;
-            case 140 /* QualifiedName */:
+            case 141 /* QualifiedName */:
                 // Name on right hand side of dot in a type query
                 if (parent.right === node) {
-                    while (parent.kind === 140 /* QualifiedName */) {
+                    while (parent.kind === 141 /* QualifiedName */) {
                         parent = parent.parent;
                     }
-                    return parent.kind === 159 /* TypeQuery */;
+                    return parent.kind === 160 /* TypeQuery */;
                 }
                 return false;
-            case 170 /* BindingElement */:
-            case 235 /* ImportSpecifier */:
+            case 174 /* BindingElement */:
+            case 239 /* ImportSpecifier */:
                 // Property name in binding element or import specifier
                 return parent.propertyName === node;
-            case 239 /* ExportSpecifier */:
+            case 243 /* ExportSpecifier */:
                 // Any name in an export specifier
                 return true;
         }
@@ -7715,13 +8011,13 @@ var ts;
     // export = <EntityNameExpression>
     // export default <EntityNameExpression>
     function isAliasSymbolDeclaration(node) {
-        return node.kind === 230 /* ImportEqualsDeclaration */ ||
-            node.kind === 229 /* NamespaceExportDeclaration */ ||
-            node.kind === 232 /* ImportClause */ && !!node.name ||
-            node.kind === 233 /* NamespaceImport */ ||
-            node.kind === 235 /* ImportSpecifier */ ||
-            node.kind === 239 /* ExportSpecifier */ ||
-            node.kind === 236 /* ExportAssignment */ && exportAssignmentIsAlias(node);
+        return node.kind === 234 /* ImportEqualsDeclaration */ ||
+            node.kind === 233 /* NamespaceExportDeclaration */ ||
+            node.kind === 236 /* ImportClause */ && !!node.name ||
+            node.kind === 237 /* NamespaceImport */ ||
+            node.kind === 239 /* ImportSpecifier */ ||
+            node.kind === 243 /* ExportSpecifier */ ||
+            node.kind === 240 /* ExportAssignment */ && exportAssignmentIsAlias(node);
     }
     ts.isAliasSymbolDeclaration = isAliasSymbolDeclaration;
     function exportAssignmentIsAlias(node) {
@@ -7807,7 +8103,7 @@ var ts;
     }
     ts.getFileReferenceFromReferencePath = getFileReferenceFromReferencePath;
     function isKeyword(token) {
-        return 71 /* FirstKeyword */ <= token && token <= 139 /* LastKeyword */;
+        return 71 /* FirstKeyword */ <= token && token <= 140 /* LastKeyword */;
     }
     ts.isKeyword = isKeyword;
     function isTrivia(token) {
@@ -7834,7 +8130,7 @@ var ts;
     }
     ts.hasDynamicName = hasDynamicName;
     function isDynamicName(name) {
-        return name.kind === 141 /* ComputedPropertyName */ &&
+        return name.kind === 142 /* ComputedPropertyName */ &&
             !isStringOrNumericLiteral(name.expression.kind) &&
             !isWellKnownSymbolSyntactically(name.expression);
     }
@@ -7849,10 +8145,10 @@ var ts;
     }
     ts.isWellKnownSymbolSyntactically = isWellKnownSymbolSyntactically;
     function getPropertyNameForPropertyNameNode(name) {
-        if (name.kind === 70 /* Identifier */ || name.kind === 9 /* StringLiteral */ || name.kind === 8 /* NumericLiteral */ || name.kind === 143 /* Parameter */) {
+        if (name.kind === 70 /* Identifier */ || name.kind === 9 /* StringLiteral */ || name.kind === 8 /* NumericLiteral */ || name.kind === 144 /* Parameter */) {
             return name.text;
         }
-        if (name.kind === 141 /* ComputedPropertyName */) {
+        if (name.kind === 142 /* ComputedPropertyName */) {
             var nameExpression = name.expression;
             if (isWellKnownSymbolSyntactically(nameExpression)) {
                 var rightHandSideName = nameExpression.name.text;
@@ -7891,7 +8187,7 @@ var ts;
             case 113 /* PublicKeyword */:
             case 111 /* PrivateKeyword */:
             case 112 /* ProtectedKeyword */:
-            case 129 /* ReadonlyKeyword */:
+            case 130 /* ReadonlyKeyword */:
             case 114 /* StaticKeyword */:
                 return true;
         }
@@ -7900,11 +8196,11 @@ var ts;
     ts.isModifierKind = isModifierKind;
     function isParameterDeclaration(node) {
         var root = getRootDeclaration(node);
-        return root.kind === 143 /* Parameter */;
+        return root.kind === 144 /* Parameter */;
     }
     ts.isParameterDeclaration = isParameterDeclaration;
     function getRootDeclaration(node) {
-        while (node.kind === 170 /* BindingElement */) {
+        while (node.kind === 174 /* BindingElement */) {
             node = node.parent.parent;
         }
         return node;
@@ -7912,15 +8208,15 @@ var ts;
     ts.getRootDeclaration = getRootDeclaration;
     function nodeStartsNewLexicalEnvironment(node) {
         var kind = node.kind;
-        return kind === 149 /* Constructor */
-            || kind === 180 /* FunctionExpression */
-            || kind === 221 /* FunctionDeclaration */
-            || kind === 181 /* ArrowFunction */
-            || kind === 148 /* MethodDeclaration */
-            || kind === 150 /* GetAccessor */
-            || kind === 151 /* SetAccessor */
-            || kind === 226 /* ModuleDeclaration */
-            || kind === 256 /* SourceFile */;
+        return kind === 150 /* Constructor */
+            || kind === 184 /* FunctionExpression */
+            || kind === 225 /* FunctionDeclaration */
+            || kind === 185 /* ArrowFunction */
+            || kind === 149 /* MethodDeclaration */
+            || kind === 151 /* GetAccessor */
+            || kind === 152 /* SetAccessor */
+            || kind === 230 /* ModuleDeclaration */
+            || kind === 261 /* SourceFile */;
     }
     ts.nodeStartsNewLexicalEnvironment = nodeStartsNewLexicalEnvironment;
     function nodeIsSynthesized(node) {
@@ -7928,13 +8224,13 @@ var ts;
             || ts.positionIsSynthesized(node.end);
     }
     ts.nodeIsSynthesized = nodeIsSynthesized;
-    function getOriginalNode(node) {
+    function getOriginalNode(node, nodeTest) {
         if (node) {
             while (node.original !== undefined) {
                 node = node.original;
             }
         }
-        return node;
+        return !nodeTest || nodeTest(node) ? node : undefined;
     }
     ts.getOriginalNode = getOriginalNode;
     /**
@@ -7974,30 +8270,30 @@ var ts;
         return node ? ts.getNodeId(node) : 0;
     }
     ts.getOriginalNodeId = getOriginalNodeId;
+    var Associativity;
     (function (Associativity) {
         Associativity[Associativity["Left"] = 0] = "Left";
         Associativity[Associativity["Right"] = 1] = "Right";
-    })(ts.Associativity || (ts.Associativity = {}));
-    var Associativity = ts.Associativity;
+    })(Associativity = ts.Associativity || (ts.Associativity = {}));
     function getExpressionAssociativity(expression) {
         var operator = getOperator(expression);
-        var hasArguments = expression.kind === 176 /* NewExpression */ && expression.arguments !== undefined;
+        var hasArguments = expression.kind === 180 /* NewExpression */ && expression.arguments !== undefined;
         return getOperatorAssociativity(expression.kind, operator, hasArguments);
     }
     ts.getExpressionAssociativity = getExpressionAssociativity;
     function getOperatorAssociativity(kind, operator, hasArguments) {
         switch (kind) {
-            case 176 /* NewExpression */:
+            case 180 /* NewExpression */:
                 return hasArguments ? 0 /* Left */ : 1 /* Right */;
-            case 186 /* PrefixUnaryExpression */:
-            case 183 /* TypeOfExpression */:
-            case 184 /* VoidExpression */:
-            case 182 /* DeleteExpression */:
-            case 185 /* AwaitExpression */:
-            case 189 /* ConditionalExpression */:
-            case 191 /* YieldExpression */:
+            case 190 /* PrefixUnaryExpression */:
+            case 187 /* TypeOfExpression */:
+            case 188 /* VoidExpression */:
+            case 186 /* DeleteExpression */:
+            case 189 /* AwaitExpression */:
+            case 193 /* ConditionalExpression */:
+            case 195 /* YieldExpression */:
                 return 1 /* Right */;
-            case 188 /* BinaryExpression */:
+            case 192 /* BinaryExpression */:
                 switch (operator) {
                     case 39 /* AsteriskAsteriskToken */:
                     case 57 /* EqualsToken */:
@@ -8021,15 +8317,15 @@ var ts;
     ts.getOperatorAssociativity = getOperatorAssociativity;
     function getExpressionPrecedence(expression) {
         var operator = getOperator(expression);
-        var hasArguments = expression.kind === 176 /* NewExpression */ && expression.arguments !== undefined;
+        var hasArguments = expression.kind === 180 /* NewExpression */ && expression.arguments !== undefined;
         return getOperatorPrecedence(expression.kind, operator, hasArguments);
     }
     ts.getExpressionPrecedence = getExpressionPrecedence;
     function getOperator(expression) {
-        if (expression.kind === 188 /* BinaryExpression */) {
+        if (expression.kind === 192 /* BinaryExpression */) {
             return expression.operatorToken.kind;
         }
-        else if (expression.kind === 186 /* PrefixUnaryExpression */ || expression.kind === 187 /* PostfixUnaryExpression */) {
+        else if (expression.kind === 190 /* PrefixUnaryExpression */ || expression.kind === 191 /* PostfixUnaryExpression */) {
             return expression.operator;
         }
         else {
@@ -8047,36 +8343,36 @@ var ts;
             case 85 /* FalseKeyword */:
             case 8 /* NumericLiteral */:
             case 9 /* StringLiteral */:
-            case 171 /* ArrayLiteralExpression */:
-            case 172 /* ObjectLiteralExpression */:
-            case 180 /* FunctionExpression */:
-            case 181 /* ArrowFunction */:
-            case 193 /* ClassExpression */:
-            case 242 /* JsxElement */:
-            case 243 /* JsxSelfClosingElement */:
+            case 175 /* ArrayLiteralExpression */:
+            case 176 /* ObjectLiteralExpression */:
+            case 184 /* FunctionExpression */:
+            case 185 /* ArrowFunction */:
+            case 197 /* ClassExpression */:
+            case 246 /* JsxElement */:
+            case 247 /* JsxSelfClosingElement */:
             case 11 /* RegularExpressionLiteral */:
             case 12 /* NoSubstitutionTemplateLiteral */:
-            case 190 /* TemplateExpression */:
-            case 179 /* ParenthesizedExpression */:
-            case 194 /* OmittedExpression */:
+            case 194 /* TemplateExpression */:
+            case 183 /* ParenthesizedExpression */:
+            case 198 /* OmittedExpression */:
                 return 19;
-            case 177 /* TaggedTemplateExpression */:
-            case 173 /* PropertyAccessExpression */:
-            case 174 /* ElementAccessExpression */:
+            case 181 /* TaggedTemplateExpression */:
+            case 177 /* PropertyAccessExpression */:
+            case 178 /* ElementAccessExpression */:
                 return 18;
-            case 176 /* NewExpression */:
+            case 180 /* NewExpression */:
                 return hasArguments ? 18 : 17;
-            case 175 /* CallExpression */:
+            case 179 /* CallExpression */:
                 return 17;
-            case 187 /* PostfixUnaryExpression */:
+            case 191 /* PostfixUnaryExpression */:
                 return 16;
-            case 186 /* PrefixUnaryExpression */:
-            case 183 /* TypeOfExpression */:
-            case 184 /* VoidExpression */:
-            case 182 /* DeleteExpression */:
-            case 185 /* AwaitExpression */:
+            case 190 /* PrefixUnaryExpression */:
+            case 187 /* TypeOfExpression */:
+            case 188 /* VoidExpression */:
+            case 186 /* DeleteExpression */:
+            case 189 /* AwaitExpression */:
                 return 15;
-            case 188 /* BinaryExpression */:
+            case 192 /* BinaryExpression */:
                 switch (operatorKind) {
                     case 50 /* ExclamationToken */:
                     case 51 /* TildeToken */:
@@ -8134,11 +8430,11 @@ var ts;
                     default:
                         return -1;
                 }
-            case 189 /* ConditionalExpression */:
+            case 193 /* ConditionalExpression */:
                 return 4;
-            case 191 /* YieldExpression */:
+            case 195 /* YieldExpression */:
                 return 2;
-            case 192 /* SpreadElementExpression */:
+            case 196 /* SpreadElement */:
                 return 1;
             default:
                 return -1;
@@ -8408,21 +8704,36 @@ var ts;
         if (options.outFile || options.out) {
             var moduleKind = ts.getEmitModuleKind(options);
             var moduleEmitEnabled = moduleKind === ts.ModuleKind.AMD || moduleKind === ts.ModuleKind.System;
-            var sourceFiles = host.getSourceFiles();
+            var sourceFiles = getAllEmittableSourceFiles();
             // 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(sourceFiles, moduleEmitEnabled ? isNonDeclarationFile : isBundleEmitNonExternalModule);
         }
         else {
-            var sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
-            return ts.filter(sourceFiles, isNonDeclarationFile);
+            var sourceFiles = targetSourceFile === undefined ? getAllEmittableSourceFiles() : [targetSourceFile];
+            return filterSourceFilesInDirectory(sourceFiles, function (file) { return host.isSourceFileFromExternalLibrary(file); });
+        }
+        function getAllEmittableSourceFiles() {
+            return options.noEmitForJsFiles ? ts.filter(host.getSourceFiles(), function (sourceFile) { return !isSourceFileJavaScript(sourceFile); }) : host.getSourceFiles();
         }
     }
     ts.getSourceFilesToEmit = getSourceFilesToEmit;
+    /** Don't call this for `--outFile`, just for `--outDir` or plain emit. */
+    function filterSourceFilesInDirectory(sourceFiles, isSourceFileFromExternalLibrary) {
+        return ts.filter(sourceFiles, function (file) { return shouldEmitInDirectory(file, isSourceFileFromExternalLibrary); });
+    }
+    ts.filterSourceFilesInDirectory = filterSourceFilesInDirectory;
     function isNonDeclarationFile(sourceFile) {
         return !isDeclarationFile(sourceFile);
     }
+    /**
+     * Whether a file should be emitted in a non-`--outFile` case.
+     * Don't emit if source file is a declaration file, or was located under node_modules
+     */
+    function shouldEmitInDirectory(sourceFile, isSourceFileFromExternalLibrary) {
+        return isNonDeclarationFile(sourceFile) && !isSourceFileFromExternalLibrary(sourceFile);
+    }
     function isBundleEmitNonExternalModule(sourceFile) {
-        return !isDeclarationFile(sourceFile) && !ts.isExternalModule(sourceFile);
+        return isNonDeclarationFile(sourceFile) && !ts.isExternalModule(sourceFile);
     }
     /**
      * Iterates over each source file to emit. The source files are expected to have been
@@ -8500,11 +8811,10 @@ var ts;
             onBundledEmit(host);
         }
         else {
-            var sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
+            var sourceFiles = targetSourceFile === undefined ? getSourceFilesToEmit(host) : [targetSourceFile];
             for (var _i = 0, sourceFiles_3 = sourceFiles; _i < sourceFiles_3.length; _i++) {
                 var sourceFile = sourceFiles_3[_i];
-                // Don't emit if source file is a declaration file, or was located under node_modules
-                if (!isDeclarationFile(sourceFile) && !host.isSourceFileFromExternalLibrary(sourceFile)) {
+                if (shouldEmitInDirectory(sourceFile, function (file) { return host.isSourceFileFromExternalLibrary(file); })) {
                     onSingleFileEmit(host, sourceFile);
                 }
             }
@@ -8537,7 +8847,7 @@ var ts;
         function onBundledEmit(host) {
             // Can emit only sources that are not declaration file and are either non module code or module with
             // --module or --target es6 specified. Files included by searching under node_modules are also not emitted.
-            var bundledSources = ts.filter(host.getSourceFiles(), function (sourceFile) { return !isDeclarationFile(sourceFile) &&
+            var bundledSources = ts.filter(getSourceFilesToEmit(host), function (sourceFile) { return !isDeclarationFile(sourceFile) &&
                 !host.isSourceFileFromExternalLibrary(sourceFile) &&
                 (!ts.isExternalModule(sourceFile) ||
                     !!ts.getEmitModuleKind(options)); });
@@ -8577,7 +8887,7 @@ var ts;
     ts.getLineOfLocalPositionFromLineMap = getLineOfLocalPositionFromLineMap;
     function getFirstConstructorWithBody(node) {
         return ts.forEach(node.members, function (member) {
-            if (member.kind === 149 /* Constructor */ && nodeIsPresent(member.body)) {
+            if (member.kind === 150 /* Constructor */ && nodeIsPresent(member.body)) {
                 return member;
             }
         });
@@ -8619,10 +8929,10 @@ var ts;
         var setAccessor;
         if (hasDynamicName(accessor)) {
             firstAccessor = accessor;
-            if (accessor.kind === 150 /* GetAccessor */) {
+            if (accessor.kind === 151 /* GetAccessor */) {
                 getAccessor = accessor;
             }
-            else if (accessor.kind === 151 /* SetAccessor */) {
+            else if (accessor.kind === 152 /* SetAccessor */) {
                 setAccessor = accessor;
             }
             else {
@@ -8631,7 +8941,7 @@ var ts;
         }
         else {
             ts.forEach(declarations, function (member) {
-                if ((member.kind === 150 /* GetAccessor */ || member.kind === 151 /* SetAccessor */)
+                if ((member.kind === 151 /* GetAccessor */ || member.kind === 152 /* SetAccessor */)
                     && hasModifier(member, 32 /* Static */) === hasModifier(accessor, 32 /* Static */)) {
                     var memberName = getPropertyNameForPropertyNameNode(member.name);
                     var accessorName = getPropertyNameForPropertyNameNode(accessor.name);
@@ -8642,10 +8952,10 @@ var ts;
                         else if (!secondAccessor) {
                             secondAccessor = member;
                         }
-                        if (member.kind === 150 /* GetAccessor */ && !getAccessor) {
+                        if (member.kind === 151 /* GetAccessor */ && !getAccessor) {
                             getAccessor = member;
                         }
-                        if (member.kind === 151 /* SetAccessor */ && !setAccessor) {
+                        if (member.kind === 152 /* SetAccessor */ && !setAccessor) {
                             setAccessor = member;
                         }
                     }
@@ -8872,7 +9182,7 @@ var ts;
                 flags |= modifierToFlag(modifier.kind);
             }
         }
-        if (node.flags & 4 /* NestedNamespace */) {
+        if (node.flags & 4 /* NestedNamespace */ || (node.kind === 70 /* Identifier */ && node.isInJSDocNamespace)) {
             flags |= 1 /* Export */;
         }
         node.modifierFlagsCache = flags | 536870912 /* HasComputedFlags */;
@@ -8891,7 +9201,7 @@ var ts;
             case 75 /* ConstKeyword */: return 2048 /* Const */;
             case 78 /* DefaultKeyword */: return 512 /* Default */;
             case 119 /* AsyncKeyword */: return 256 /* Async */;
-            case 129 /* ReadonlyKeyword */: return 64 /* Readonly */;
+            case 130 /* ReadonlyKeyword */: return 64 /* Readonly */;
         }
         return 0 /* None */;
     }
@@ -8908,19 +9218,25 @@ var ts;
     ts.isAssignmentOperator = isAssignmentOperator;
     /** Get `C` given `N` if `N` is in the position `class C extends N` where `N` is an ExpressionWithTypeArguments. */
     function tryGetClassExtendingExpressionWithTypeArguments(node) {
-        if (node.kind === 195 /* ExpressionWithTypeArguments */ &&
+        if (node.kind === 199 /* ExpressionWithTypeArguments */ &&
             node.parent.token === 84 /* ExtendsKeyword */ &&
             isClassLike(node.parent.parent)) {
             return node.parent.parent;
         }
     }
     ts.tryGetClassExtendingExpressionWithTypeArguments = tryGetClassExtendingExpressionWithTypeArguments;
+    function isAssignmentExpression(node) {
+        return isBinaryExpression(node)
+            && isAssignmentOperator(node.operatorToken.kind)
+            && isLeftHandSideExpression(node.left);
+    }
+    ts.isAssignmentExpression = isAssignmentExpression;
     function isDestructuringAssignment(node) {
         if (isBinaryExpression(node)) {
             if (node.operatorToken.kind === 57 /* EqualsToken */) {
                 var kind = node.left.kind;
-                return kind === 172 /* ObjectLiteralExpression */
-                    || kind === 171 /* ArrayLiteralExpression */;
+                return kind === 176 /* ObjectLiteralExpression */
+                    || kind === 175 /* ArrayLiteralExpression */;
             }
         }
         return false;
@@ -8949,20 +9265,20 @@ var ts;
     ts.isExpressionWithTypeArgumentsInClassExtendsClause = isExpressionWithTypeArgumentsInClassExtendsClause;
     function isEntityNameExpression(node) {
         return node.kind === 70 /* Identifier */ ||
-            node.kind === 173 /* PropertyAccessExpression */ && isEntityNameExpression(node.expression);
+            node.kind === 177 /* PropertyAccessExpression */ && isEntityNameExpression(node.expression);
     }
     ts.isEntityNameExpression = isEntityNameExpression;
     function isRightSideOfQualifiedNameOrPropertyAccess(node) {
-        return (node.parent.kind === 140 /* QualifiedName */ && node.parent.right === node) ||
-            (node.parent.kind === 173 /* PropertyAccessExpression */ && node.parent.name === node);
+        return (node.parent.kind === 141 /* QualifiedName */ && node.parent.right === node) ||
+            (node.parent.kind === 177 /* PropertyAccessExpression */ && node.parent.name === node);
     }
     ts.isRightSideOfQualifiedNameOrPropertyAccess = isRightSideOfQualifiedNameOrPropertyAccess;
     function isEmptyObjectLiteralOrArrayLiteral(expression) {
         var kind = expression.kind;
-        if (kind === 172 /* ObjectLiteralExpression */) {
+        if (kind === 176 /* ObjectLiteralExpression */) {
             return expression.properties.length === 0;
         }
-        if (kind === 171 /* ArrayLiteralExpression */) {
+        if (kind === 175 /* ArrayLiteralExpression */) {
             return expression.elements.length === 0;
         }
         return false;
@@ -9124,39 +9440,39 @@ var ts;
                 || kind === 94 /* NullKeyword */) {
                 return true;
             }
-            else if (kind === 173 /* PropertyAccessExpression */) {
+            else if (kind === 177 /* PropertyAccessExpression */) {
                 return isSimpleExpressionWorker(node.expression, depth + 1);
             }
-            else if (kind === 174 /* ElementAccessExpression */) {
+            else if (kind === 178 /* ElementAccessExpression */) {
                 return isSimpleExpressionWorker(node.expression, depth + 1)
                     && isSimpleExpressionWorker(node.argumentExpression, depth + 1);
             }
-            else if (kind === 186 /* PrefixUnaryExpression */
-                || kind === 187 /* PostfixUnaryExpression */) {
+            else if (kind === 190 /* PrefixUnaryExpression */
+                || kind === 191 /* PostfixUnaryExpression */) {
                 return isSimpleExpressionWorker(node.operand, depth + 1);
             }
-            else if (kind === 188 /* BinaryExpression */) {
+            else if (kind === 192 /* BinaryExpression */) {
                 return node.operatorToken.kind !== 39 /* AsteriskAsteriskToken */
                     && isSimpleExpressionWorker(node.left, depth + 1)
                     && isSimpleExpressionWorker(node.right, depth + 1);
             }
-            else if (kind === 189 /* ConditionalExpression */) {
+            else if (kind === 193 /* ConditionalExpression */) {
                 return isSimpleExpressionWorker(node.condition, depth + 1)
                     && isSimpleExpressionWorker(node.whenTrue, depth + 1)
                     && isSimpleExpressionWorker(node.whenFalse, depth + 1);
             }
-            else if (kind === 184 /* VoidExpression */
-                || kind === 183 /* TypeOfExpression */
-                || kind === 182 /* DeleteExpression */) {
+            else if (kind === 188 /* VoidExpression */
+                || kind === 187 /* TypeOfExpression */
+                || kind === 186 /* DeleteExpression */) {
                 return isSimpleExpressionWorker(node.expression, depth + 1);
             }
-            else if (kind === 171 /* ArrayLiteralExpression */) {
+            else if (kind === 175 /* ArrayLiteralExpression */) {
                 return node.elements.length === 0;
             }
-            else if (kind === 172 /* ObjectLiteralExpression */) {
+            else if (kind === 176 /* ObjectLiteralExpression */) {
                 return node.properties.length === 0;
             }
-            else if (kind === 175 /* CallExpression */) {
+            else if (kind === 179 /* CallExpression */) {
                 if (!isSimpleExpressionWorker(node.expression, depth + 1)) {
                     return false;
                 }
@@ -9315,28 +9631,31 @@ var ts;
         return ts.positionIsSynthesized(range.pos) ? -1 : ts.skipTrivia(sourceFile.text, range.pos);
     }
     ts.getStartPositionOfRange = getStartPositionOfRange;
-    function collectExternalModuleInfo(sourceFile) {
+    function collectExternalModuleInfo(sourceFile, resolver) {
         var externalImports = [];
         var exportSpecifiers = ts.createMap();
+        var exportedBindings = ts.createMap();
+        var uniqueExports = ts.createMap();
+        var hasExportDefault = false;
         var exportEquals = undefined;
         var hasExportStarsToExportValues = false;
         for (var _i = 0, _a = sourceFile.statements; _i < _a.length; _i++) {
             var node = _a[_i];
             switch (node.kind) {
-                case 231 /* ImportDeclaration */:
+                case 235 /* ImportDeclaration */:
                     // import "mod"
                     // import x from "mod"
                     // import * as x from "mod"
                     // import { x, y } from "mod"
                     externalImports.push(node);
                     break;
-                case 230 /* ImportEqualsDeclaration */:
-                    if (node.moduleReference.kind === 241 /* ExternalModuleReference */) {
+                case 234 /* ImportEqualsDeclaration */:
+                    if (node.moduleReference.kind === 245 /* ExternalModuleReference */) {
                         // import x = require("mod")
                         externalImports.push(node);
                     }
                     break;
-                case 237 /* ExportDeclaration */:
+                case 241 /* ExportDeclaration */:
                     if (node.moduleSpecifier) {
                         if (!node.exportClause) {
                             // export * from "mod"
@@ -9352,22 +9671,111 @@ var ts;
                         // export { x, y }
                         for (var _b = 0, _c = node.exportClause.elements; _b < _c.length; _b++) {
                             var specifier = _c[_b];
-                            var name_8 = (specifier.propertyName || specifier.name).text;
-                            (exportSpecifiers[name_8] || (exportSpecifiers[name_8] = [])).push(specifier);
+                            if (!uniqueExports[specifier.name.text]) {
+                                var name_8 = specifier.propertyName || specifier.name;
+                                ts.multiMapAdd(exportSpecifiers, name_8.text, specifier);
+                                var decl = resolver.getReferencedImportDeclaration(name_8)
+                                    || resolver.getReferencedValueDeclaration(name_8);
+                                if (decl) {
+                                    ts.multiMapAdd(exportedBindings, getOriginalNodeId(decl), specifier.name);
+                                }
+                                uniqueExports[specifier.name.text] = specifier.name;
+                            }
                         }
                     }
                     break;
-                case 236 /* ExportAssignment */:
+                case 240 /* ExportAssignment */:
                     if (node.isExportEquals && !exportEquals) {
                         // export = x
                         exportEquals = node;
                     }
                     break;
+                case 205 /* VariableStatement */:
+                    if (hasModifier(node, 1 /* Export */)) {
+                        for (var _d = 0, _e = node.declarationList.declarations; _d < _e.length; _d++) {
+                            var decl = _e[_d];
+                            collectExportedVariableInfo(decl, uniqueExports);
+                        }
+                    }
+                    break;
+                case 225 /* FunctionDeclaration */:
+                    if (hasModifier(node, 1 /* Export */)) {
+                        if (hasModifier(node, 512 /* Default */)) {
+                            // export default function() { }
+                            if (!hasExportDefault) {
+                                ts.multiMapAdd(exportedBindings, getOriginalNodeId(node), ts.getDeclarationName(node));
+                                hasExportDefault = true;
+                            }
+                        }
+                        else {
+                            // export function x() { }
+                            var name_9 = node.name;
+                            if (!uniqueExports[name_9.text]) {
+                                ts.multiMapAdd(exportedBindings, getOriginalNodeId(node), name_9);
+                                uniqueExports[name_9.text] = name_9;
+                            }
+                        }
+                    }
+                    break;
+                case 226 /* ClassDeclaration */:
+                    if (hasModifier(node, 1 /* Export */)) {
+                        if (hasModifier(node, 512 /* Default */)) {
+                            // export default class { }
+                            if (!hasExportDefault) {
+                                ts.multiMapAdd(exportedBindings, getOriginalNodeId(node), ts.getDeclarationName(node));
+                                hasExportDefault = true;
+                            }
+                        }
+                        else {
+                            // export class x { }
+                            var name_10 = node.name;
+                            if (!uniqueExports[name_10.text]) {
+                                ts.multiMapAdd(exportedBindings, getOriginalNodeId(node), name_10);
+                                uniqueExports[name_10.text] = name_10;
+                            }
+                        }
+                    }
+                    break;
             }
         }
-        return { externalImports: externalImports, exportSpecifiers: exportSpecifiers, exportEquals: exportEquals, hasExportStarsToExportValues: hasExportStarsToExportValues };
+        var exportedNames;
+        for (var key in uniqueExports) {
+            exportedNames = ts.append(exportedNames, uniqueExports[key]);
+        }
+        return { externalImports: externalImports, exportSpecifiers: exportSpecifiers, exportEquals: exportEquals, hasExportStarsToExportValues: hasExportStarsToExportValues, exportedBindings: exportedBindings, exportedNames: exportedNames };
     }
     ts.collectExternalModuleInfo = collectExternalModuleInfo;
+    function collectExportedVariableInfo(decl, uniqueExports) {
+        if (isBindingPattern(decl.name)) {
+            for (var _i = 0, _a = decl.name.elements; _i < _a.length; _i++) {
+                var element = _a[_i];
+                if (!isOmittedExpression(element)) {
+                    collectExportedVariableInfo(element, uniqueExports);
+                }
+            }
+        }
+        else if (!isGeneratedIdentifier(decl.name)) {
+            if (!uniqueExports[decl.name.text]) {
+                uniqueExports[decl.name.text] = decl.name;
+            }
+        }
+    }
+    /**
+     * Determines whether a name was originally the declaration name of an enum or namespace
+     * declaration.
+     */
+    function isDeclarationNameOfEnumOrNamespace(node) {
+        var parseNode = getParseTreeNode(node);
+        if (parseNode) {
+            switch (parseNode.parent.kind) {
+                case 229 /* EnumDeclaration */:
+                case 230 /* ModuleDeclaration */:
+                    return parseNode === parseNode.parent.name;
+            }
+        }
+        return false;
+    }
+    ts.isDeclarationNameOfEnumOrNamespace = isDeclarationNameOfEnumOrNamespace;
     function getInitializedVariables(node) {
         return ts.filter(node.declarations, isInitializedVariable);
     }
@@ -9382,7 +9790,7 @@ var ts;
         if (node.symbol) {
             for (var _i = 0, _a = node.symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 222 /* ClassDeclaration */ && declaration !== node) {
+                if (declaration.kind === 226 /* ClassDeclaration */ && declaration !== node) {
                     return true;
                 }
             }
@@ -9459,16 +9867,16 @@ var ts;
     ts.isModifier = isModifier;
     // Names
     function isQualifiedName(node) {
-        return node.kind === 140 /* QualifiedName */;
+        return node.kind === 141 /* QualifiedName */;
     }
     ts.isQualifiedName = isQualifiedName;
     function isComputedPropertyName(node) {
-        return node.kind === 141 /* ComputedPropertyName */;
+        return node.kind === 142 /* ComputedPropertyName */;
     }
     ts.isComputedPropertyName = isComputedPropertyName;
     function isEntityName(node) {
         var kind = node.kind;
-        return kind === 140 /* QualifiedName */
+        return kind === 141 /* QualifiedName */
             || kind === 70 /* Identifier */;
     }
     ts.isEntityName = isEntityName;
@@ -9477,7 +9885,7 @@ var ts;
         return kind === 70 /* Identifier */
             || kind === 9 /* StringLiteral */
             || kind === 8 /* NumericLiteral */
-            || kind === 141 /* ComputedPropertyName */;
+            || kind === 142 /* ComputedPropertyName */;
     }
     ts.isPropertyName = isPropertyName;
     function isModuleName(node) {
@@ -9489,60 +9897,61 @@ var ts;
     function isBindingName(node) {
         var kind = node.kind;
         return kind === 70 /* Identifier */
-            || kind === 168 /* ObjectBindingPattern */
-            || kind === 169 /* ArrayBindingPattern */;
+            || kind === 172 /* ObjectBindingPattern */
+            || kind === 173 /* ArrayBindingPattern */;
     }
     ts.isBindingName = isBindingName;
     // Signature elements
     function isTypeParameter(node) {
-        return node.kind === 142 /* TypeParameter */;
+        return node.kind === 143 /* TypeParameter */;
     }
     ts.isTypeParameter = isTypeParameter;
     function isParameter(node) {
-        return node.kind === 143 /* Parameter */;
+        return node.kind === 144 /* Parameter */;
     }
     ts.isParameter = isParameter;
     function isDecorator(node) {
-        return node.kind === 144 /* Decorator */;
+        return node.kind === 145 /* Decorator */;
     }
     ts.isDecorator = isDecorator;
     // Type members
     function isMethodDeclaration(node) {
-        return node.kind === 148 /* MethodDeclaration */;
+        return node.kind === 149 /* MethodDeclaration */;
     }
     ts.isMethodDeclaration = isMethodDeclaration;
     function isClassElement(node) {
         var kind = node.kind;
-        return kind === 149 /* Constructor */
-            || kind === 146 /* PropertyDeclaration */
-            || kind === 148 /* MethodDeclaration */
-            || kind === 150 /* GetAccessor */
-            || kind === 151 /* SetAccessor */
-            || kind === 154 /* IndexSignature */
-            || kind === 199 /* SemicolonClassElement */;
+        return kind === 150 /* Constructor */
+            || kind === 147 /* PropertyDeclaration */
+            || kind === 149 /* MethodDeclaration */
+            || kind === 151 /* GetAccessor */
+            || kind === 152 /* SetAccessor */
+            || kind === 155 /* IndexSignature */
+            || kind === 203 /* SemicolonClassElement */;
     }
     ts.isClassElement = isClassElement;
     function isObjectLiteralElementLike(node) {
         var kind = node.kind;
-        return kind === 253 /* PropertyAssignment */
-            || kind === 254 /* ShorthandPropertyAssignment */
-            || kind === 148 /* MethodDeclaration */
-            || kind === 150 /* GetAccessor */
-            || kind === 151 /* SetAccessor */
-            || kind === 240 /* MissingDeclaration */;
+        return kind === 257 /* PropertyAssignment */
+            || kind === 258 /* ShorthandPropertyAssignment */
+            || kind === 259 /* SpreadAssignment */
+            || kind === 149 /* MethodDeclaration */
+            || kind === 151 /* GetAccessor */
+            || kind === 152 /* SetAccessor */
+            || kind === 244 /* MissingDeclaration */;
     }
     ts.isObjectLiteralElementLike = isObjectLiteralElementLike;
     // Type
     function isTypeNodeKind(kind) {
-        return (kind >= 155 /* FirstTypeNode */ && kind <= 167 /* LastTypeNode */)
+        return (kind >= 156 /* FirstTypeNode */ && kind <= 171 /* LastTypeNode */)
             || kind === 118 /* AnyKeyword */
-            || kind === 131 /* NumberKeyword */
+            || kind === 132 /* NumberKeyword */
             || kind === 121 /* BooleanKeyword */
-            || kind === 133 /* StringKeyword */
-            || kind === 134 /* SymbolKeyword */
+            || kind === 134 /* StringKeyword */
+            || kind === 135 /* SymbolKeyword */
             || kind === 104 /* VoidKeyword */
-            || kind === 128 /* NeverKeyword */
-            || kind === 195 /* ExpressionWithTypeArguments */;
+            || kind === 129 /* NeverKeyword */
+            || kind === 199 /* ExpressionWithTypeArguments */;
     }
     /**
      * Node test that determines whether a node is a valid type node.
@@ -9557,95 +9966,103 @@ var ts;
     function isBindingPattern(node) {
         if (node) {
             var kind = node.kind;
-            return kind === 169 /* ArrayBindingPattern */
-                || kind === 168 /* ObjectBindingPattern */;
+            return kind === 173 /* ArrayBindingPattern */
+                || kind === 172 /* ObjectBindingPattern */;
         }
         return false;
     }
     ts.isBindingPattern = isBindingPattern;
     function isBindingElement(node) {
-        return node.kind === 170 /* BindingElement */;
+        return node.kind === 174 /* BindingElement */;
     }
     ts.isBindingElement = isBindingElement;
     function isArrayBindingElement(node) {
         var kind = node.kind;
-        return kind === 170 /* BindingElement */
-            || kind === 194 /* OmittedExpression */;
+        return kind === 174 /* BindingElement */
+            || kind === 198 /* OmittedExpression */;
     }
     ts.isArrayBindingElement = isArrayBindingElement;
     // Expression
+    function isArrayLiteralExpression(node) {
+        return node.kind === 175 /* ArrayLiteralExpression */;
+    }
+    ts.isArrayLiteralExpression = isArrayLiteralExpression;
+    function isObjectLiteralExpression(node) {
+        return node.kind === 176 /* ObjectLiteralExpression */;
+    }
+    ts.isObjectLiteralExpression = isObjectLiteralExpression;
     function isPropertyAccessExpression(node) {
-        return node.kind === 173 /* PropertyAccessExpression */;
+        return node.kind === 177 /* PropertyAccessExpression */;
     }
     ts.isPropertyAccessExpression = isPropertyAccessExpression;
     function isElementAccessExpression(node) {
-        return node.kind === 174 /* ElementAccessExpression */;
+        return node.kind === 178 /* ElementAccessExpression */;
     }
     ts.isElementAccessExpression = isElementAccessExpression;
     function isBinaryExpression(node) {
-        return node.kind === 188 /* BinaryExpression */;
+        return node.kind === 192 /* BinaryExpression */;
     }
     ts.isBinaryExpression = isBinaryExpression;
     function isConditionalExpression(node) {
-        return node.kind === 189 /* ConditionalExpression */;
+        return node.kind === 193 /* ConditionalExpression */;
     }
     ts.isConditionalExpression = isConditionalExpression;
     function isCallExpression(node) {
-        return node.kind === 175 /* CallExpression */;
+        return node.kind === 179 /* CallExpression */;
     }
     ts.isCallExpression = isCallExpression;
     function isTemplateLiteral(node) {
         var kind = node.kind;
-        return kind === 190 /* TemplateExpression */
+        return kind === 194 /* TemplateExpression */
             || kind === 12 /* NoSubstitutionTemplateLiteral */;
     }
     ts.isTemplateLiteral = isTemplateLiteral;
-    function isSpreadElementExpression(node) {
-        return node.kind === 192 /* SpreadElementExpression */;
+    function isSpreadExpression(node) {
+        return node.kind === 196 /* SpreadElement */;
     }
-    ts.isSpreadElementExpression = isSpreadElementExpression;
+    ts.isSpreadExpression = isSpreadExpression;
     function isExpressionWithTypeArguments(node) {
-        return node.kind === 195 /* ExpressionWithTypeArguments */;
+        return node.kind === 199 /* ExpressionWithTypeArguments */;
     }
     ts.isExpressionWithTypeArguments = isExpressionWithTypeArguments;
     function isLeftHandSideExpressionKind(kind) {
-        return kind === 173 /* PropertyAccessExpression */
-            || kind === 174 /* ElementAccessExpression */
-            || kind === 176 /* NewExpression */
-            || kind === 175 /* CallExpression */
-            || kind === 242 /* JsxElement */
-            || kind === 243 /* JsxSelfClosingElement */
-            || kind === 177 /* TaggedTemplateExpression */
-            || kind === 171 /* ArrayLiteralExpression */
-            || kind === 179 /* ParenthesizedExpression */
-            || kind === 172 /* ObjectLiteralExpression */
-            || kind === 193 /* ClassExpression */
-            || kind === 180 /* FunctionExpression */
+        return kind === 177 /* PropertyAccessExpression */
+            || kind === 178 /* ElementAccessExpression */
+            || kind === 180 /* NewExpression */
+            || kind === 179 /* CallExpression */
+            || kind === 246 /* JsxElement */
+            || kind === 247 /* JsxSelfClosingElement */
+            || kind === 181 /* TaggedTemplateExpression */
+            || kind === 175 /* ArrayLiteralExpression */
+            || kind === 183 /* ParenthesizedExpression */
+            || kind === 176 /* ObjectLiteralExpression */
+            || kind === 197 /* ClassExpression */
+            || kind === 184 /* FunctionExpression */
             || kind === 70 /* Identifier */
             || kind === 11 /* RegularExpressionLiteral */
             || kind === 8 /* NumericLiteral */
             || kind === 9 /* StringLiteral */
             || kind === 12 /* NoSubstitutionTemplateLiteral */
-            || kind === 190 /* TemplateExpression */
+            || kind === 194 /* TemplateExpression */
             || kind === 85 /* FalseKeyword */
             || kind === 94 /* NullKeyword */
             || kind === 98 /* ThisKeyword */
             || kind === 100 /* TrueKeyword */
             || kind === 96 /* SuperKeyword */
-            || kind === 197 /* NonNullExpression */;
+            || kind === 201 /* NonNullExpression */;
     }
     function isLeftHandSideExpression(node) {
         return isLeftHandSideExpressionKind(ts.skipPartiallyEmittedExpressions(node).kind);
     }
     ts.isLeftHandSideExpression = isLeftHandSideExpression;
     function isUnaryExpressionKind(kind) {
-        return kind === 186 /* PrefixUnaryExpression */
-            || kind === 187 /* PostfixUnaryExpression */
-            || kind === 182 /* DeleteExpression */
-            || kind === 183 /* TypeOfExpression */
-            || kind === 184 /* VoidExpression */
-            || kind === 185 /* AwaitExpression */
-            || kind === 178 /* TypeAssertionExpression */
+        return kind === 190 /* PrefixUnaryExpression */
+            || kind === 191 /* PostfixUnaryExpression */
+            || kind === 186 /* DeleteExpression */
+            || kind === 187 /* TypeOfExpression */
+            || kind === 188 /* VoidExpression */
+            || kind === 189 /* AwaitExpression */
+            || kind === 182 /* TypeAssertionExpression */
             || isLeftHandSideExpressionKind(kind);
     }
     function isUnaryExpression(node) {
@@ -9653,13 +10070,13 @@ var ts;
     }
     ts.isUnaryExpression = isUnaryExpression;
     function isExpressionKind(kind) {
-        return kind === 189 /* ConditionalExpression */
-            || kind === 191 /* YieldExpression */
-            || kind === 181 /* ArrowFunction */
-            || kind === 188 /* BinaryExpression */
-            || kind === 192 /* SpreadElementExpression */
-            || kind === 196 /* AsExpression */
-            || kind === 194 /* OmittedExpression */
+        return kind === 193 /* ConditionalExpression */
+            || kind === 195 /* YieldExpression */
+            || kind === 185 /* ArrowFunction */
+            || kind === 192 /* BinaryExpression */
+            || kind === 196 /* SpreadElement */
+            || kind === 200 /* AsExpression */
+            || kind === 198 /* OmittedExpression */
             || isUnaryExpressionKind(kind);
     }
     function isExpression(node) {
@@ -9668,16 +10085,16 @@ var ts;
     ts.isExpression = isExpression;
     function isAssertionExpression(node) {
         var kind = node.kind;
-        return kind === 178 /* TypeAssertionExpression */
-            || kind === 196 /* AsExpression */;
+        return kind === 182 /* TypeAssertionExpression */
+            || kind === 200 /* AsExpression */;
     }
     ts.isAssertionExpression = isAssertionExpression;
     function isPartiallyEmittedExpression(node) {
-        return node.kind === 288 /* PartiallyEmittedExpression */;
+        return node.kind === 293 /* PartiallyEmittedExpression */;
     }
     ts.isPartiallyEmittedExpression = isPartiallyEmittedExpression;
     function isNotEmittedStatement(node) {
-        return node.kind === 287 /* NotEmittedStatement */;
+        return node.kind === 292 /* NotEmittedStatement */;
     }
     ts.isNotEmittedStatement = isNotEmittedStatement;
     function isNotEmittedOrPartiallyEmittedNode(node) {
@@ -9686,17 +10103,17 @@ var ts;
     }
     ts.isNotEmittedOrPartiallyEmittedNode = isNotEmittedOrPartiallyEmittedNode;
     function isOmittedExpression(node) {
-        return node.kind === 194 /* OmittedExpression */;
+        return node.kind === 198 /* OmittedExpression */;
     }
     ts.isOmittedExpression = isOmittedExpression;
     // Misc
     function isTemplateSpan(node) {
-        return node.kind === 198 /* TemplateSpan */;
+        return node.kind === 202 /* TemplateSpan */;
     }
     ts.isTemplateSpan = isTemplateSpan;
     // Element
     function isBlock(node) {
-        return node.kind === 200 /* Block */;
+        return node.kind === 204 /* Block */;
     }
     ts.isBlock = isBlock;
     function isConciseBody(node) {
@@ -9714,119 +10131,121 @@ var ts;
     }
     ts.isForInitializer = isForInitializer;
     function isVariableDeclaration(node) {
-        return node.kind === 219 /* VariableDeclaration */;
+        return node.kind === 223 /* VariableDeclaration */;
     }
     ts.isVariableDeclaration = isVariableDeclaration;
     function isVariableDeclarationList(node) {
-        return node.kind === 220 /* VariableDeclarationList */;
+        return node.kind === 224 /* VariableDeclarationList */;
     }
     ts.isVariableDeclarationList = isVariableDeclarationList;
     function isCaseBlock(node) {
-        return node.kind === 228 /* CaseBlock */;
+        return node.kind === 232 /* CaseBlock */;
     }
     ts.isCaseBlock = isCaseBlock;
     function isModuleBody(node) {
         var kind = node.kind;
-        return kind === 227 /* ModuleBlock */
-            || kind === 226 /* ModuleDeclaration */;
+        return kind === 231 /* ModuleBlock */
+            || kind === 230 /* ModuleDeclaration */;
     }
     ts.isModuleBody = isModuleBody;
     function isImportEqualsDeclaration(node) {
-        return node.kind === 230 /* ImportEqualsDeclaration */;
+        return node.kind === 234 /* ImportEqualsDeclaration */;
     }
     ts.isImportEqualsDeclaration = isImportEqualsDeclaration;
     function isImportClause(node) {
-        return node.kind === 232 /* ImportClause */;
+        return node.kind === 236 /* ImportClause */;
     }
     ts.isImportClause = isImportClause;
     function isNamedImportBindings(node) {
         var kind = node.kind;
-        return kind === 234 /* NamedImports */
-            || kind === 233 /* NamespaceImport */;
+        return kind === 238 /* NamedImports */
+            || kind === 237 /* NamespaceImport */;
     }
     ts.isNamedImportBindings = isNamedImportBindings;
     function isImportSpecifier(node) {
-        return node.kind === 235 /* ImportSpecifier */;
+        return node.kind === 239 /* ImportSpecifier */;
     }
     ts.isImportSpecifier = isImportSpecifier;
     function isNamedExports(node) {
-        return node.kind === 238 /* NamedExports */;
+        return node.kind === 242 /* NamedExports */;
     }
     ts.isNamedExports = isNamedExports;
     function isExportSpecifier(node) {
-        return node.kind === 239 /* ExportSpecifier */;
+        return node.kind === 243 /* ExportSpecifier */;
     }
     ts.isExportSpecifier = isExportSpecifier;
     function isModuleOrEnumDeclaration(node) {
-        return node.kind === 226 /* ModuleDeclaration */ || node.kind === 225 /* EnumDeclaration */;
+        return node.kind === 230 /* ModuleDeclaration */ || node.kind === 229 /* EnumDeclaration */;
     }
     ts.isModuleOrEnumDeclaration = isModuleOrEnumDeclaration;
     function isDeclarationKind(kind) {
-        return kind === 181 /* ArrowFunction */
-            || kind === 170 /* BindingElement */
-            || kind === 222 /* ClassDeclaration */
-            || kind === 193 /* ClassExpression */
-            || kind === 149 /* Constructor */
-            || kind === 225 /* EnumDeclaration */
-            || kind === 255 /* EnumMember */
-            || kind === 239 /* ExportSpecifier */
-            || kind === 221 /* FunctionDeclaration */
-            || kind === 180 /* FunctionExpression */
-            || kind === 150 /* GetAccessor */
-            || kind === 232 /* ImportClause */
-            || kind === 230 /* ImportEqualsDeclaration */
-            || kind === 235 /* ImportSpecifier */
-            || kind === 223 /* InterfaceDeclaration */
-            || kind === 148 /* MethodDeclaration */
-            || kind === 147 /* MethodSignature */
-            || kind === 226 /* ModuleDeclaration */
-            || kind === 229 /* NamespaceExportDeclaration */
-            || kind === 233 /* NamespaceImport */
-            || kind === 143 /* Parameter */
-            || kind === 253 /* PropertyAssignment */
-            || kind === 146 /* PropertyDeclaration */
-            || kind === 145 /* PropertySignature */
-            || kind === 151 /* SetAccessor */
-            || kind === 254 /* ShorthandPropertyAssignment */
-            || kind === 224 /* TypeAliasDeclaration */
-            || kind === 142 /* TypeParameter */
-            || kind === 219 /* VariableDeclaration */
-            || kind === 279 /* JSDocTypedefTag */;
+        return kind === 185 /* ArrowFunction */
+            || kind === 174 /* BindingElement */
+            || kind === 226 /* ClassDeclaration */
+            || kind === 197 /* ClassExpression */
+            || kind === 150 /* Constructor */
+            || kind === 229 /* EnumDeclaration */
+            || kind === 260 /* EnumMember */
+            || kind === 243 /* ExportSpecifier */
+            || kind === 225 /* FunctionDeclaration */
+            || kind === 184 /* FunctionExpression */
+            || kind === 151 /* GetAccessor */
+            || kind === 236 /* ImportClause */
+            || kind === 234 /* ImportEqualsDeclaration */
+            || kind === 239 /* ImportSpecifier */
+            || kind === 227 /* InterfaceDeclaration */
+            || kind === 149 /* MethodDeclaration */
+            || kind === 148 /* MethodSignature */
+            || kind === 230 /* ModuleDeclaration */
+            || kind === 233 /* NamespaceExportDeclaration */
+            || kind === 237 /* NamespaceImport */
+            || kind === 144 /* Parameter */
+            || kind === 257 /* PropertyAssignment */
+            || kind === 147 /* PropertyDeclaration */
+            || kind === 146 /* PropertySignature */
+            || kind === 152 /* SetAccessor */
+            || kind === 258 /* ShorthandPropertyAssignment */
+            || kind === 228 /* TypeAliasDeclaration */
+            || kind === 143 /* TypeParameter */
+            || kind === 223 /* VariableDeclaration */
+            || kind === 284 /* JSDocTypedefTag */;
     }
     function isDeclarationStatementKind(kind) {
-        return kind === 221 /* FunctionDeclaration */
-            || kind === 240 /* MissingDeclaration */
-            || kind === 222 /* ClassDeclaration */
-            || kind === 223 /* InterfaceDeclaration */
-            || kind === 224 /* TypeAliasDeclaration */
-            || kind === 225 /* EnumDeclaration */
-            || kind === 226 /* ModuleDeclaration */
-            || kind === 231 /* ImportDeclaration */
-            || kind === 230 /* ImportEqualsDeclaration */
-            || kind === 237 /* ExportDeclaration */
-            || kind === 236 /* ExportAssignment */
-            || kind === 229 /* NamespaceExportDeclaration */;
+        return kind === 225 /* FunctionDeclaration */
+            || kind === 244 /* MissingDeclaration */
+            || kind === 226 /* ClassDeclaration */
+            || kind === 227 /* InterfaceDeclaration */
+            || kind === 228 /* TypeAliasDeclaration */
+            || kind === 229 /* EnumDeclaration */
+            || kind === 230 /* ModuleDeclaration */
+            || kind === 235 /* ImportDeclaration */
+            || kind === 234 /* ImportEqualsDeclaration */
+            || kind === 241 /* ExportDeclaration */
+            || kind === 240 /* ExportAssignment */
+            || kind === 233 /* NamespaceExportDeclaration */;
     }
     function isStatementKindButNotDeclarationKind(kind) {
-        return kind === 211 /* BreakStatement */
-            || kind === 210 /* ContinueStatement */
-            || kind === 218 /* DebuggerStatement */
-            || kind === 205 /* DoStatement */
-            || kind === 203 /* ExpressionStatement */
-            || kind === 202 /* EmptyStatement */
-            || kind === 208 /* ForInStatement */
-            || kind === 209 /* ForOfStatement */
-            || kind === 207 /* ForStatement */
-            || kind === 204 /* IfStatement */
-            || kind === 215 /* LabeledStatement */
-            || kind === 212 /* ReturnStatement */
-            || kind === 214 /* SwitchStatement */
-            || kind === 216 /* ThrowStatement */
-            || kind === 217 /* TryStatement */
-            || kind === 201 /* VariableStatement */
-            || kind === 206 /* WhileStatement */
-            || kind === 213 /* WithStatement */
-            || kind === 287 /* NotEmittedStatement */;
+        return kind === 215 /* BreakStatement */
+            || kind === 214 /* ContinueStatement */
+            || kind === 222 /* DebuggerStatement */
+            || kind === 209 /* DoStatement */
+            || kind === 207 /* ExpressionStatement */
+            || kind === 206 /* EmptyStatement */
+            || kind === 212 /* ForInStatement */
+            || kind === 213 /* ForOfStatement */
+            || kind === 211 /* ForStatement */
+            || kind === 208 /* IfStatement */
+            || kind === 219 /* LabeledStatement */
+            || kind === 216 /* ReturnStatement */
+            || kind === 218 /* SwitchStatement */
+            || kind === 220 /* ThrowStatement */
+            || kind === 221 /* TryStatement */
+            || kind === 205 /* VariableStatement */
+            || kind === 210 /* WhileStatement */
+            || kind === 217 /* WithStatement */
+            || kind === 292 /* NotEmittedStatement */
+            || kind === 295 /* EndOfDeclarationMarker */
+            || kind === 294 /* MergeDeclarationMarker */;
     }
     function isDeclaration(node) {
         return isDeclarationKind(node.kind);
@@ -9847,93 +10266,93 @@ var ts;
         var kind = node.kind;
         return isStatementKindButNotDeclarationKind(kind)
             || isDeclarationStatementKind(kind)
-            || kind === 200 /* Block */;
+            || kind === 204 /* Block */;
     }
     ts.isStatement = isStatement;
     // Module references
     function isModuleReference(node) {
         var kind = node.kind;
-        return kind === 241 /* ExternalModuleReference */
-            || kind === 140 /* QualifiedName */
+        return kind === 245 /* ExternalModuleReference */
+            || kind === 141 /* QualifiedName */
             || kind === 70 /* Identifier */;
     }
     ts.isModuleReference = isModuleReference;
     // JSX
     function isJsxOpeningElement(node) {
-        return node.kind === 244 /* JsxOpeningElement */;
+        return node.kind === 248 /* JsxOpeningElement */;
     }
     ts.isJsxOpeningElement = isJsxOpeningElement;
     function isJsxClosingElement(node) {
-        return node.kind === 245 /* JsxClosingElement */;
+        return node.kind === 249 /* JsxClosingElement */;
     }
     ts.isJsxClosingElement = isJsxClosingElement;
     function isJsxTagNameExpression(node) {
         var kind = node.kind;
         return kind === 98 /* ThisKeyword */
             || kind === 70 /* Identifier */
-            || kind === 173 /* PropertyAccessExpression */;
+            || kind === 177 /* PropertyAccessExpression */;
     }
     ts.isJsxTagNameExpression = isJsxTagNameExpression;
     function isJsxChild(node) {
         var kind = node.kind;
-        return kind === 242 /* JsxElement */
-            || kind === 248 /* JsxExpression */
-            || kind === 243 /* JsxSelfClosingElement */
+        return kind === 246 /* JsxElement */
+            || kind === 252 /* JsxExpression */
+            || kind === 247 /* JsxSelfClosingElement */
             || kind === 10 /* JsxText */;
     }
     ts.isJsxChild = isJsxChild;
     function isJsxAttributeLike(node) {
         var kind = node.kind;
-        return kind === 246 /* JsxAttribute */
-            || kind === 247 /* JsxSpreadAttribute */;
+        return kind === 250 /* JsxAttribute */
+            || kind === 251 /* JsxSpreadAttribute */;
     }
     ts.isJsxAttributeLike = isJsxAttributeLike;
     function isJsxSpreadAttribute(node) {
-        return node.kind === 247 /* JsxSpreadAttribute */;
+        return node.kind === 251 /* JsxSpreadAttribute */;
     }
     ts.isJsxSpreadAttribute = isJsxSpreadAttribute;
     function isJsxAttribute(node) {
-        return node.kind === 246 /* JsxAttribute */;
+        return node.kind === 250 /* JsxAttribute */;
     }
     ts.isJsxAttribute = isJsxAttribute;
     function isStringLiteralOrJsxExpression(node) {
         var kind = node.kind;
         return kind === 9 /* StringLiteral */
-            || kind === 248 /* JsxExpression */;
+            || kind === 252 /* JsxExpression */;
     }
     ts.isStringLiteralOrJsxExpression = isStringLiteralOrJsxExpression;
     // Clauses
     function isCaseOrDefaultClause(node) {
         var kind = node.kind;
-        return kind === 249 /* CaseClause */
-            || kind === 250 /* DefaultClause */;
+        return kind === 253 /* CaseClause */
+            || kind === 254 /* DefaultClause */;
     }
     ts.isCaseOrDefaultClause = isCaseOrDefaultClause;
     function isHeritageClause(node) {
-        return node.kind === 251 /* HeritageClause */;
+        return node.kind === 255 /* HeritageClause */;
     }
     ts.isHeritageClause = isHeritageClause;
     function isCatchClause(node) {
-        return node.kind === 252 /* CatchClause */;
+        return node.kind === 256 /* CatchClause */;
     }
     ts.isCatchClause = isCatchClause;
     // Property assignments
     function isPropertyAssignment(node) {
-        return node.kind === 253 /* PropertyAssignment */;
+        return node.kind === 257 /* PropertyAssignment */;
     }
     ts.isPropertyAssignment = isPropertyAssignment;
     function isShorthandPropertyAssignment(node) {
-        return node.kind === 254 /* ShorthandPropertyAssignment */;
+        return node.kind === 258 /* ShorthandPropertyAssignment */;
     }
     ts.isShorthandPropertyAssignment = isShorthandPropertyAssignment;
     // Enum
     function isEnumMember(node) {
-        return node.kind === 255 /* EnumMember */;
+        return node.kind === 260 /* EnumMember */;
     }
     ts.isEnumMember = isEnumMember;
     // Top-level nodes
     function isSourceFile(node) {
-        return node.kind === 256 /* SourceFile */;
+        return node.kind === 261 /* SourceFile */;
     }
     ts.isSourceFile = isSourceFile;
     function isWatchSet(options) {
@@ -9945,6 +10364,7 @@ var ts;
 (function (ts) {
     function getDefaultLibFileName(options) {
         switch (options.target) {
+            case 5 /* ESNext */:
             case 4 /* ES2017 */:
                 return "lib.es2017.d.ts";
             case 3 /* ES2016 */:
@@ -10162,9 +10582,9 @@ var ts;
     }
     ts.collapseTextChangeRangesAcrossMultipleVersions = collapseTextChangeRangesAcrossMultipleVersions;
     function getTypeParameterOwner(d) {
-        if (d && d.kind === 142 /* TypeParameter */) {
+        if (d && d.kind === 143 /* TypeParameter */) {
             for (var current = d; current; current = current.parent) {
-                if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 223 /* InterfaceDeclaration */) {
+                if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 227 /* InterfaceDeclaration */) {
                     return current;
                 }
             }
@@ -10172,11 +10592,11 @@ var ts;
     }
     ts.getTypeParameterOwner = getTypeParameterOwner;
     function isParameterPropertyDeclaration(node) {
-        return ts.hasModifier(node, 92 /* ParameterPropertyModifier */) && node.parent.kind === 149 /* Constructor */ && ts.isClassLike(node.parent.parent);
+        return ts.hasModifier(node, 92 /* ParameterPropertyModifier */) && node.parent.kind === 150 /* Constructor */ && ts.isClassLike(node.parent.parent);
     }
     ts.isParameterPropertyDeclaration = isParameterPropertyDeclaration;
     function walkUpBindingElementsAndPatterns(node) {
-        while (node && (node.kind === 170 /* BindingElement */ || ts.isBindingPattern(node))) {
+        while (node && (node.kind === 174 /* BindingElement */ || ts.isBindingPattern(node))) {
             node = node.parent;
         }
         return node;
@@ -10184,14 +10604,14 @@ var ts;
     function getCombinedModifierFlags(node) {
         node = walkUpBindingElementsAndPatterns(node);
         var flags = ts.getModifierFlags(node);
-        if (node.kind === 219 /* VariableDeclaration */) {
+        if (node.kind === 223 /* VariableDeclaration */) {
             node = node.parent;
         }
-        if (node && node.kind === 220 /* VariableDeclarationList */) {
+        if (node && node.kind === 224 /* VariableDeclarationList */) {
             flags |= ts.getModifierFlags(node);
             node = node.parent;
         }
-        if (node && node.kind === 201 /* VariableStatement */) {
+        if (node && node.kind === 205 /* VariableStatement */) {
             flags |= ts.getModifierFlags(node);
         }
         return flags;
@@ -10207,14 +10627,14 @@ var ts;
     function getCombinedNodeFlags(node) {
         node = walkUpBindingElementsAndPatterns(node);
         var flags = node.flags;
-        if (node.kind === 219 /* VariableDeclaration */) {
+        if (node.kind === 223 /* VariableDeclaration */) {
             node = node.parent;
         }
-        if (node && node.kind === 220 /* VariableDeclarationList */) {
+        if (node && node.kind === 224 /* VariableDeclarationList */) {
             flags |= node.flags;
             node = node.parent;
         }
-        if (node && node.kind === 201 /* VariableStatement */) {
+        if (node && node.kind === 205 /* VariableStatement */) {
             flags |= node.flags;
         }
         return flags;
@@ -10229,7 +10649,7 @@ var ts;
     var NodeConstructor;
     var SourceFileConstructor;
     function createNode(kind, location, flags) {
-        var ConstructorForKind = kind === 256 /* SourceFile */
+        var ConstructorForKind = kind === 261 /* SourceFile */
             ? (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))
             : (NodeConstructor || (NodeConstructor = ts.objectAllocator.getNodeConstructor()));
         var node = location
@@ -10412,7 +10832,7 @@ var ts;
     ts.createNull = createNull;
     // Names
     function createComputedPropertyName(expression, location) {
-        var node = createNode(141 /* ComputedPropertyName */, location);
+        var node = createNode(142 /* ComputedPropertyName */, location);
         node.expression = expression;
         return node;
     }
@@ -10425,17 +10845,8 @@ var ts;
     }
     ts.updateComputedPropertyName = updateComputedPropertyName;
     // Signature elements
-    function createParameter(name, initializer, location) {
-        return createParameterDeclaration(
-        /*decorators*/ undefined, 
-        /*modifiers*/ undefined, 
-        /*dotDotDotToken*/ undefined, name, 
-        /*questionToken*/ undefined, 
-        /*type*/ undefined, initializer, location);
-    }
-    ts.createParameter = createParameter;
-    function createParameterDeclaration(decorators, modifiers, dotDotDotToken, name, questionToken, type, initializer, location, flags) {
-        var node = createNode(143 /* Parameter */, location, flags);
+    function createParameter(decorators, modifiers, dotDotDotToken, name, questionToken, type, initializer, location, flags) {
+        var node = createNode(144 /* Parameter */, location, flags);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.dotDotDotToken = dotDotDotToken;
@@ -10445,17 +10856,17 @@ var ts;
         node.initializer = initializer ? parenthesizeExpressionForList(initializer) : undefined;
         return node;
     }
-    ts.createParameterDeclaration = createParameterDeclaration;
-    function updateParameterDeclaration(node, decorators, modifiers, name, type, initializer) {
+    ts.createParameter = createParameter;
+    function updateParameter(node, decorators, modifiers, name, type, initializer) {
         if (node.decorators !== decorators || node.modifiers !== modifiers || node.name !== name || node.type !== type || node.initializer !== initializer) {
-            return updateNode(createParameterDeclaration(decorators, modifiers, node.dotDotDotToken, name, node.questionToken, type, initializer, /*location*/ node, /*flags*/ node.flags), node);
+            return updateNode(createParameter(decorators, modifiers, node.dotDotDotToken, name, node.questionToken, type, initializer, /*location*/ node, /*flags*/ node.flags), node);
         }
         return node;
     }
-    ts.updateParameterDeclaration = updateParameterDeclaration;
+    ts.updateParameter = updateParameter;
     // Type members
     function createProperty(decorators, modifiers, name, questionToken, type, initializer, location) {
-        var node = createNode(146 /* PropertyDeclaration */, location);
+        var node = createNode(147 /* PropertyDeclaration */, location);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
@@ -10473,7 +10884,7 @@ var ts;
     }
     ts.updateProperty = updateProperty;
     function createMethod(decorators, modifiers, asteriskToken, name, typeParameters, parameters, type, body, location, flags) {
-        var node = createNode(148 /* MethodDeclaration */, location, flags);
+        var node = createNode(149 /* MethodDeclaration */, location, flags);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.asteriskToken = asteriskToken;
@@ -10493,7 +10904,7 @@ var ts;
     }
     ts.updateMethod = updateMethod;
     function createConstructor(decorators, modifiers, parameters, body, location, flags) {
-        var node = createNode(149 /* Constructor */, location, flags);
+        var node = createNode(150 /* Constructor */, location, flags);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.typeParameters = undefined;
@@ -10511,7 +10922,7 @@ var ts;
     }
     ts.updateConstructor = updateConstructor;
     function createGetAccessor(decorators, modifiers, name, parameters, type, body, location, flags) {
-        var node = createNode(150 /* GetAccessor */, location, flags);
+        var node = createNode(151 /* GetAccessor */, location, flags);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
@@ -10530,7 +10941,7 @@ var ts;
     }
     ts.updateGetAccessor = updateGetAccessor;
     function createSetAccessor(decorators, modifiers, name, parameters, body, location, flags) {
-        var node = createNode(151 /* SetAccessor */, location, flags);
+        var node = createNode(152 /* SetAccessor */, location, flags);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
@@ -10549,7 +10960,7 @@ var ts;
     ts.updateSetAccessor = updateSetAccessor;
     // Binding Patterns
     function createObjectBindingPattern(elements, location) {
-        var node = createNode(168 /* ObjectBindingPattern */, location);
+        var node = createNode(172 /* ObjectBindingPattern */, location);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -10562,7 +10973,7 @@ var ts;
     }
     ts.updateObjectBindingPattern = updateObjectBindingPattern;
     function createArrayBindingPattern(elements, location) {
-        var node = createNode(169 /* ArrayBindingPattern */, location);
+        var node = createNode(173 /* ArrayBindingPattern */, location);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -10575,7 +10986,7 @@ var ts;
     }
     ts.updateArrayBindingPattern = updateArrayBindingPattern;
     function createBindingElement(propertyName, dotDotDotToken, name, initializer, location) {
-        var node = createNode(170 /* BindingElement */, location);
+        var node = createNode(174 /* BindingElement */, location);
         node.propertyName = typeof propertyName === "string" ? createIdentifier(propertyName) : propertyName;
         node.dotDotDotToken = dotDotDotToken;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
@@ -10592,7 +11003,7 @@ var ts;
     ts.updateBindingElement = updateBindingElement;
     // Expression
     function createArrayLiteral(elements, location, multiLine) {
-        var node = createNode(171 /* ArrayLiteralExpression */, location);
+        var node = createNode(175 /* ArrayLiteralExpression */, location);
         node.elements = parenthesizeListElements(createNodeArray(elements));
         if (multiLine) {
             node.multiLine = true;
@@ -10608,7 +11019,7 @@ var ts;
     }
     ts.updateArrayLiteral = updateArrayLiteral;
     function createObjectLiteral(properties, location, multiLine) {
-        var node = createNode(172 /* ObjectLiteralExpression */, location);
+        var node = createNode(176 /* ObjectLiteralExpression */, location);
         node.properties = createNodeArray(properties);
         if (multiLine) {
             node.multiLine = true;
@@ -10624,7 +11035,7 @@ var ts;
     }
     ts.updateObjectLiteral = updateObjectLiteral;
     function createPropertyAccess(expression, name, location, flags) {
-        var node = createNode(173 /* PropertyAccessExpression */, location, flags);
+        var node = createNode(177 /* PropertyAccessExpression */, location, flags);
         node.expression = parenthesizeForAccess(expression);
         (node.emitNode || (node.emitNode = {})).flags |= 1048576 /* NoIndentation */;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
@@ -10642,7 +11053,7 @@ var ts;
     }
     ts.updatePropertyAccess = updatePropertyAccess;
     function createElementAccess(expression, index, location) {
-        var node = createNode(174 /* ElementAccessExpression */, location);
+        var node = createNode(178 /* ElementAccessExpression */, location);
         node.expression = parenthesizeForAccess(expression);
         node.argumentExpression = typeof index === "number" ? createLiteral(index) : index;
         return node;
@@ -10656,7 +11067,7 @@ var ts;
     }
     ts.updateElementAccess = updateElementAccess;
     function createCall(expression, typeArguments, argumentsArray, location, flags) {
-        var node = createNode(175 /* CallExpression */, location, flags);
+        var node = createNode(179 /* CallExpression */, location, flags);
         node.expression = parenthesizeForAccess(expression);
         if (typeArguments) {
             node.typeArguments = createNodeArray(typeArguments);
@@ -10673,7 +11084,7 @@ var ts;
     }
     ts.updateCall = updateCall;
     function createNew(expression, typeArguments, argumentsArray, location, flags) {
-        var node = createNode(176 /* NewExpression */, location, flags);
+        var node = createNode(180 /* NewExpression */, location, flags);
         node.expression = parenthesizeForNew(expression);
         node.typeArguments = typeArguments ? createNodeArray(typeArguments) : undefined;
         node.arguments = argumentsArray ? parenthesizeListElements(createNodeArray(argumentsArray)) : undefined;
@@ -10688,7 +11099,7 @@ var ts;
     }
     ts.updateNew = updateNew;
     function createTaggedTemplate(tag, template, location) {
-        var node = createNode(177 /* TaggedTemplateExpression */, location);
+        var node = createNode(181 /* TaggedTemplateExpression */, location);
         node.tag = parenthesizeForAccess(tag);
         node.template = template;
         return node;
@@ -10702,7 +11113,7 @@ var ts;
     }
     ts.updateTaggedTemplate = updateTaggedTemplate;
     function createParen(expression, location) {
-        var node = createNode(179 /* ParenthesizedExpression */, location);
+        var node = createNode(183 /* ParenthesizedExpression */, location);
         node.expression = expression;
         return node;
     }
@@ -10715,7 +11126,7 @@ var ts;
     }
     ts.updateParen = updateParen;
     function createFunctionExpression(modifiers, asteriskToken, name, typeParameters, parameters, type, body, location, flags) {
-        var node = createNode(180 /* FunctionExpression */, location, flags);
+        var node = createNode(184 /* FunctionExpression */, location, flags);
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.asteriskToken = asteriskToken;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
@@ -10734,7 +11145,7 @@ var ts;
     }
     ts.updateFunctionExpression = updateFunctionExpression;
     function createArrowFunction(modifiers, typeParameters, parameters, type, equalsGreaterThanToken, body, location, flags) {
-        var node = createNode(181 /* ArrowFunction */, location, flags);
+        var node = createNode(185 /* ArrowFunction */, location, flags);
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.typeParameters = typeParameters ? createNodeArray(typeParameters) : undefined;
         node.parameters = createNodeArray(parameters);
@@ -10752,7 +11163,7 @@ var ts;
     }
     ts.updateArrowFunction = updateArrowFunction;
     function createDelete(expression, location) {
-        var node = createNode(182 /* DeleteExpression */, location);
+        var node = createNode(186 /* DeleteExpression */, location);
         node.expression = parenthesizePrefixOperand(expression);
         return node;
     }
@@ -10765,7 +11176,7 @@ var ts;
     }
     ts.updateDelete = updateDelete;
     function createTypeOf(expression, location) {
-        var node = createNode(183 /* TypeOfExpression */, location);
+        var node = createNode(187 /* TypeOfExpression */, location);
         node.expression = parenthesizePrefixOperand(expression);
         return node;
     }
@@ -10778,7 +11189,7 @@ var ts;
     }
     ts.updateTypeOf = updateTypeOf;
     function createVoid(expression, location) {
-        var node = createNode(184 /* VoidExpression */, location);
+        var node = createNode(188 /* VoidExpression */, location);
         node.expression = parenthesizePrefixOperand(expression);
         return node;
     }
@@ -10791,7 +11202,7 @@ var ts;
     }
     ts.updateVoid = updateVoid;
     function createAwait(expression, location) {
-        var node = createNode(185 /* AwaitExpression */, location);
+        var node = createNode(189 /* AwaitExpression */, location);
         node.expression = parenthesizePrefixOperand(expression);
         return node;
     }
@@ -10804,7 +11215,7 @@ var ts;
     }
     ts.updateAwait = updateAwait;
     function createPrefix(operator, operand, location) {
-        var node = createNode(186 /* PrefixUnaryExpression */, location);
+        var node = createNode(190 /* PrefixUnaryExpression */, location);
         node.operator = operator;
         node.operand = parenthesizePrefixOperand(operand);
         return node;
@@ -10818,7 +11229,7 @@ var ts;
     }
     ts.updatePrefix = updatePrefix;
     function createPostfix(operand, operator, location) {
-        var node = createNode(187 /* PostfixUnaryExpression */, location);
+        var node = createNode(191 /* PostfixUnaryExpression */, location);
         node.operand = parenthesizePostfixOperand(operand);
         node.operator = operator;
         return node;
@@ -10834,7 +11245,7 @@ var ts;
     function createBinary(left, operator, right, location) {
         var operatorToken = typeof operator === "number" ? createToken(operator) : operator;
         var operatorKind = operatorToken.kind;
-        var node = createNode(188 /* BinaryExpression */, location);
+        var node = createNode(192 /* BinaryExpression */, location);
         node.left = parenthesizeBinaryOperand(operatorKind, left, /*isLeftSideOfBinary*/ true, /*leftOperand*/ undefined);
         node.operatorToken = operatorToken;
         node.right = parenthesizeBinaryOperand(operatorKind, right, /*isLeftSideOfBinary*/ false, node.left);
@@ -10849,7 +11260,7 @@ var ts;
     }
     ts.updateBinary = updateBinary;
     function createConditional(condition, questionToken, whenTrue, colonToken, whenFalse, location) {
-        var node = createNode(189 /* ConditionalExpression */, location);
+        var node = createNode(193 /* ConditionalExpression */, location);
         node.condition = condition;
         node.questionToken = questionToken;
         node.whenTrue = whenTrue;
@@ -10866,7 +11277,7 @@ var ts;
     }
     ts.updateConditional = updateConditional;
     function createTemplateExpression(head, templateSpans, location) {
-        var node = createNode(190 /* TemplateExpression */, location);
+        var node = createNode(194 /* TemplateExpression */, location);
         node.head = head;
         node.templateSpans = createNodeArray(templateSpans);
         return node;
@@ -10880,7 +11291,7 @@ var ts;
     }
     ts.updateTemplateExpression = updateTemplateExpression;
     function createYield(asteriskToken, expression, location) {
-        var node = createNode(191 /* YieldExpression */, location);
+        var node = createNode(195 /* YieldExpression */, location);
         node.asteriskToken = asteriskToken;
         node.expression = expression;
         return node;
@@ -10894,7 +11305,7 @@ var ts;
     }
     ts.updateYield = updateYield;
     function createSpread(expression, location) {
-        var node = createNode(192 /* SpreadElementExpression */, location);
+        var node = createNode(196 /* SpreadElement */, location);
         node.expression = parenthesizeExpressionForList(expression);
         return node;
     }
@@ -10907,7 +11318,7 @@ var ts;
     }
     ts.updateSpread = updateSpread;
     function createClassExpression(modifiers, name, typeParameters, heritageClauses, members, location) {
-        var node = createNode(193 /* ClassExpression */, location);
+        var node = createNode(197 /* ClassExpression */, location);
         node.decorators = undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.name = name;
@@ -10925,12 +11336,12 @@ var ts;
     }
     ts.updateClassExpression = updateClassExpression;
     function createOmittedExpression(location) {
-        var node = createNode(194 /* OmittedExpression */, location);
+        var node = createNode(198 /* OmittedExpression */, location);
         return node;
     }
     ts.createOmittedExpression = createOmittedExpression;
     function createExpressionWithTypeArguments(typeArguments, expression, location) {
-        var node = createNode(195 /* ExpressionWithTypeArguments */, location);
+        var node = createNode(199 /* ExpressionWithTypeArguments */, location);
         node.typeArguments = typeArguments ? createNodeArray(typeArguments) : undefined;
         node.expression = parenthesizeForAccess(expression);
         return node;
@@ -10945,7 +11356,7 @@ var ts;
     ts.updateExpressionWithTypeArguments = updateExpressionWithTypeArguments;
     // Misc
     function createTemplateSpan(expression, literal, location) {
-        var node = createNode(198 /* TemplateSpan */, location);
+        var node = createNode(202 /* TemplateSpan */, location);
         node.expression = expression;
         node.literal = literal;
         return node;
@@ -10960,7 +11371,7 @@ var ts;
     ts.updateTemplateSpan = updateTemplateSpan;
     // Element
     function createBlock(statements, location, multiLine, flags) {
-        var block = createNode(200 /* Block */, location, flags);
+        var block = createNode(204 /* Block */, location, flags);
         block.statements = createNodeArray(statements);
         if (multiLine) {
             block.multiLine = true;
@@ -10976,7 +11387,7 @@ var ts;
     }
     ts.updateBlock = updateBlock;
     function createVariableStatement(modifiers, declarationList, location, flags) {
-        var node = createNode(201 /* VariableStatement */, location, flags);
+        var node = createNode(205 /* VariableStatement */, location, flags);
         node.decorators = undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.declarationList = ts.isArray(declarationList) ? createVariableDeclarationList(declarationList) : declarationList;
@@ -10991,7 +11402,7 @@ var ts;
     }
     ts.updateVariableStatement = updateVariableStatement;
     function createVariableDeclarationList(declarations, location, flags) {
-        var node = createNode(220 /* VariableDeclarationList */, location, flags);
+        var node = createNode(224 /* VariableDeclarationList */, location, flags);
         node.declarations = createNodeArray(declarations);
         return node;
     }
@@ -11004,7 +11415,7 @@ var ts;
     }
     ts.updateVariableDeclarationList = updateVariableDeclarationList;
     function createVariableDeclaration(name, type, initializer, location, flags) {
-        var node = createNode(219 /* VariableDeclaration */, location, flags);
+        var node = createNode(223 /* VariableDeclaration */, location, flags);
         node.name = typeof name === "string" ? createIdentifier(name) : name;
         node.type = type;
         node.initializer = initializer !== undefined ? parenthesizeExpressionForList(initializer) : undefined;
@@ -11019,11 +11430,11 @@ var ts;
     }
     ts.updateVariableDeclaration = updateVariableDeclaration;
     function createEmptyStatement(location) {
-        return createNode(202 /* EmptyStatement */, location);
+        return createNode(206 /* EmptyStatement */, location);
     }
     ts.createEmptyStatement = createEmptyStatement;
     function createStatement(expression, location, flags) {
-        var node = createNode(203 /* ExpressionStatement */, location, flags);
+        var node = createNode(207 /* ExpressionStatement */, location, flags);
         node.expression = parenthesizeExpressionForExpressionStatement(expression);
         return node;
     }
@@ -11036,7 +11447,7 @@ var ts;
     }
     ts.updateStatement = updateStatement;
     function createIf(expression, thenStatement, elseStatement, location) {
-        var node = createNode(204 /* IfStatement */, location);
+        var node = createNode(208 /* IfStatement */, location);
         node.expression = expression;
         node.thenStatement = thenStatement;
         node.elseStatement = elseStatement;
@@ -11051,7 +11462,7 @@ var ts;
     }
     ts.updateIf = updateIf;
     function createDo(statement, expression, location) {
-        var node = createNode(205 /* DoStatement */, location);
+        var node = createNode(209 /* DoStatement */, location);
         node.statement = statement;
         node.expression = expression;
         return node;
@@ -11065,7 +11476,7 @@ var ts;
     }
     ts.updateDo = updateDo;
     function createWhile(expression, statement, location) {
-        var node = createNode(206 /* WhileStatement */, location);
+        var node = createNode(210 /* WhileStatement */, location);
         node.expression = expression;
         node.statement = statement;
         return node;
@@ -11079,7 +11490,7 @@ var ts;
     }
     ts.updateWhile = updateWhile;
     function createFor(initializer, condition, incrementor, statement, location) {
-        var node = createNode(207 /* ForStatement */, location, /*flags*/ undefined);
+        var node = createNode(211 /* ForStatement */, location, /*flags*/ undefined);
         node.initializer = initializer;
         node.condition = condition;
         node.incrementor = incrementor;
@@ -11095,7 +11506,7 @@ var ts;
     }
     ts.updateFor = updateFor;
     function createForIn(initializer, expression, statement, location) {
-        var node = createNode(208 /* ForInStatement */, location);
+        var node = createNode(212 /* ForInStatement */, location);
         node.initializer = initializer;
         node.expression = expression;
         node.statement = statement;
@@ -11110,7 +11521,7 @@ var ts;
     }
     ts.updateForIn = updateForIn;
     function createForOf(initializer, expression, statement, location) {
-        var node = createNode(209 /* ForOfStatement */, location);
+        var node = createNode(213 /* ForOfStatement */, location);
         node.initializer = initializer;
         node.expression = expression;
         node.statement = statement;
@@ -11125,7 +11536,7 @@ var ts;
     }
     ts.updateForOf = updateForOf;
     function createContinue(label, location) {
-        var node = createNode(210 /* ContinueStatement */, location);
+        var node = createNode(214 /* ContinueStatement */, location);
         if (label) {
             node.label = label;
         }
@@ -11140,7 +11551,7 @@ var ts;
     }
     ts.updateContinue = updateContinue;
     function createBreak(label, location) {
-        var node = createNode(211 /* BreakStatement */, location);
+        var node = createNode(215 /* BreakStatement */, location);
         if (label) {
             node.label = label;
         }
@@ -11155,7 +11566,7 @@ var ts;
     }
     ts.updateBreak = updateBreak;
     function createReturn(expression, location) {
-        var node = createNode(212 /* ReturnStatement */, location);
+        var node = createNode(216 /* ReturnStatement */, location);
         node.expression = expression;
         return node;
     }
@@ -11168,7 +11579,7 @@ var ts;
     }
     ts.updateReturn = updateReturn;
     function createWith(expression, statement, location) {
-        var node = createNode(213 /* WithStatement */, location);
+        var node = createNode(217 /* WithStatement */, location);
         node.expression = expression;
         node.statement = statement;
         return node;
@@ -11182,7 +11593,7 @@ var ts;
     }
     ts.updateWith = updateWith;
     function createSwitch(expression, caseBlock, location) {
-        var node = createNode(214 /* SwitchStatement */, location);
+        var node = createNode(218 /* SwitchStatement */, location);
         node.expression = parenthesizeExpressionForList(expression);
         node.caseBlock = caseBlock;
         return node;
@@ -11196,7 +11607,7 @@ var ts;
     }
     ts.updateSwitch = updateSwitch;
     function createLabel(label, statement, location) {
-        var node = createNode(215 /* LabeledStatement */, location);
+        var node = createNode(219 /* LabeledStatement */, location);
         node.label = typeof label === "string" ? createIdentifier(label) : label;
         node.statement = statement;
         return node;
@@ -11210,7 +11621,7 @@ var ts;
     }
     ts.updateLabel = updateLabel;
     function createThrow(expression, location) {
-        var node = createNode(216 /* ThrowStatement */, location);
+        var node = createNode(220 /* ThrowStatement */, location);
         node.expression = expression;
         return node;
     }
@@ -11223,7 +11634,7 @@ var ts;
     }
     ts.updateThrow = updateThrow;
     function createTry(tryBlock, catchClause, finallyBlock, location) {
-        var node = createNode(217 /* TryStatement */, location);
+        var node = createNode(221 /* TryStatement */, location);
         node.tryBlock = tryBlock;
         node.catchClause = catchClause;
         node.finallyBlock = finallyBlock;
@@ -11238,7 +11649,7 @@ var ts;
     }
     ts.updateTry = updateTry;
     function createCaseBlock(clauses, location) {
-        var node = createNode(228 /* CaseBlock */, location);
+        var node = createNode(232 /* CaseBlock */, location);
         node.clauses = createNodeArray(clauses);
         return node;
     }
@@ -11251,7 +11662,7 @@ var ts;
     }
     ts.updateCaseBlock = updateCaseBlock;
     function createFunctionDeclaration(decorators, modifiers, asteriskToken, name, typeParameters, parameters, type, body, location, flags) {
-        var node = createNode(221 /* FunctionDeclaration */, location, flags);
+        var node = createNode(225 /* FunctionDeclaration */, location, flags);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.asteriskToken = asteriskToken;
@@ -11271,7 +11682,7 @@ var ts;
     }
     ts.updateFunctionDeclaration = updateFunctionDeclaration;
     function createClassDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members, location) {
-        var node = createNode(222 /* ClassDeclaration */, location);
+        var node = createNode(226 /* ClassDeclaration */, location);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.name = name;
@@ -11289,7 +11700,7 @@ var ts;
     }
     ts.updateClassDeclaration = updateClassDeclaration;
     function createImportDeclaration(decorators, modifiers, importClause, moduleSpecifier, location) {
-        var node = createNode(231 /* ImportDeclaration */, location);
+        var node = createNode(235 /* ImportDeclaration */, location);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.importClause = importClause;
@@ -11305,7 +11716,7 @@ var ts;
     }
     ts.updateImportDeclaration = updateImportDeclaration;
     function createImportClause(name, namedBindings, location) {
-        var node = createNode(232 /* ImportClause */, location);
+        var node = createNode(236 /* ImportClause */, location);
         node.name = name;
         node.namedBindings = namedBindings;
         return node;
@@ -11319,7 +11730,7 @@ var ts;
     }
     ts.updateImportClause = updateImportClause;
     function createNamespaceImport(name, location) {
-        var node = createNode(233 /* NamespaceImport */, location);
+        var node = createNode(237 /* NamespaceImport */, location);
         node.name = name;
         return node;
     }
@@ -11332,7 +11743,7 @@ var ts;
     }
     ts.updateNamespaceImport = updateNamespaceImport;
     function createNamedImports(elements, location) {
-        var node = createNode(234 /* NamedImports */, location);
+        var node = createNode(238 /* NamedImports */, location);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -11345,7 +11756,7 @@ var ts;
     }
     ts.updateNamedImports = updateNamedImports;
     function createImportSpecifier(propertyName, name, location) {
-        var node = createNode(235 /* ImportSpecifier */, location);
+        var node = createNode(239 /* ImportSpecifier */, location);
         node.propertyName = propertyName;
         node.name = name;
         return node;
@@ -11359,7 +11770,7 @@ var ts;
     }
     ts.updateImportSpecifier = updateImportSpecifier;
     function createExportAssignment(decorators, modifiers, isExportEquals, expression, location) {
-        var node = createNode(236 /* ExportAssignment */, location);
+        var node = createNode(240 /* ExportAssignment */, location);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.isExportEquals = isExportEquals;
@@ -11375,7 +11786,7 @@ var ts;
     }
     ts.updateExportAssignment = updateExportAssignment;
     function createExportDeclaration(decorators, modifiers, exportClause, moduleSpecifier, location) {
-        var node = createNode(237 /* ExportDeclaration */, location);
+        var node = createNode(241 /* ExportDeclaration */, location);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.exportClause = exportClause;
@@ -11391,7 +11802,7 @@ var ts;
     }
     ts.updateExportDeclaration = updateExportDeclaration;
     function createNamedExports(elements, location) {
-        var node = createNode(238 /* NamedExports */, location);
+        var node = createNode(242 /* NamedExports */, location);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -11404,7 +11815,7 @@ var ts;
     }
     ts.updateNamedExports = updateNamedExports;
     function createExportSpecifier(name, propertyName, location) {
-        var node = createNode(239 /* ExportSpecifier */, location);
+        var node = createNode(243 /* ExportSpecifier */, location);
         node.name = typeof name === "string" ? createIdentifier(name) : name;
         node.propertyName = typeof propertyName === "string" ? createIdentifier(propertyName) : propertyName;
         return node;
@@ -11419,7 +11830,7 @@ var ts;
     ts.updateExportSpecifier = updateExportSpecifier;
     // JSX
     function createJsxElement(openingElement, children, closingElement, location) {
-        var node = createNode(242 /* JsxElement */, location);
+        var node = createNode(246 /* JsxElement */, location);
         node.openingElement = openingElement;
         node.children = createNodeArray(children);
         node.closingElement = closingElement;
@@ -11434,7 +11845,7 @@ var ts;
     }
     ts.updateJsxElement = updateJsxElement;
     function createJsxSelfClosingElement(tagName, attributes, location) {
-        var node = createNode(243 /* JsxSelfClosingElement */, location);
+        var node = createNode(247 /* JsxSelfClosingElement */, location);
         node.tagName = tagName;
         node.attributes = createNodeArray(attributes);
         return node;
@@ -11448,7 +11859,7 @@ var ts;
     }
     ts.updateJsxSelfClosingElement = updateJsxSelfClosingElement;
     function createJsxOpeningElement(tagName, attributes, location) {
-        var node = createNode(244 /* JsxOpeningElement */, location);
+        var node = createNode(248 /* JsxOpeningElement */, location);
         node.tagName = tagName;
         node.attributes = createNodeArray(attributes);
         return node;
@@ -11462,7 +11873,7 @@ var ts;
     }
     ts.updateJsxOpeningElement = updateJsxOpeningElement;
     function createJsxClosingElement(tagName, location) {
-        var node = createNode(245 /* JsxClosingElement */, location);
+        var node = createNode(249 /* JsxClosingElement */, location);
         node.tagName = tagName;
         return node;
     }
@@ -11475,7 +11886,7 @@ var ts;
     }
     ts.updateJsxClosingElement = updateJsxClosingElement;
     function createJsxAttribute(name, initializer, location) {
-        var node = createNode(246 /* JsxAttribute */, location);
+        var node = createNode(250 /* JsxAttribute */, location);
         node.name = name;
         node.initializer = initializer;
         return node;
@@ -11489,7 +11900,7 @@ var ts;
     }
     ts.updateJsxAttribute = updateJsxAttribute;
     function createJsxSpreadAttribute(expression, location) {
-        var node = createNode(247 /* JsxSpreadAttribute */, location);
+        var node = createNode(251 /* JsxSpreadAttribute */, location);
         node.expression = expression;
         return node;
     }
@@ -11502,7 +11913,7 @@ var ts;
     }
     ts.updateJsxSpreadAttribute = updateJsxSpreadAttribute;
     function createJsxExpression(expression, location) {
-        var node = createNode(248 /* JsxExpression */, location);
+        var node = createNode(252 /* JsxExpression */, location);
         node.expression = expression;
         return node;
     }
@@ -11516,7 +11927,7 @@ var ts;
     ts.updateJsxExpression = updateJsxExpression;
     // Clauses
     function createHeritageClause(token, types, location) {
-        var node = createNode(251 /* HeritageClause */, location);
+        var node = createNode(255 /* HeritageClause */, location);
         node.token = token;
         node.types = createNodeArray(types);
         return node;
@@ -11530,7 +11941,7 @@ var ts;
     }
     ts.updateHeritageClause = updateHeritageClause;
     function createCaseClause(expression, statements, location) {
-        var node = createNode(249 /* CaseClause */, location);
+        var node = createNode(253 /* CaseClause */, location);
         node.expression = parenthesizeExpressionForList(expression);
         node.statements = createNodeArray(statements);
         return node;
@@ -11544,7 +11955,7 @@ var ts;
     }
     ts.updateCaseClause = updateCaseClause;
     function createDefaultClause(statements, location) {
-        var node = createNode(250 /* DefaultClause */, location);
+        var node = createNode(254 /* DefaultClause */, location);
         node.statements = createNodeArray(statements);
         return node;
     }
@@ -11557,7 +11968,7 @@ var ts;
     }
     ts.updateDefaultClause = updateDefaultClause;
     function createCatchClause(variableDeclaration, block, location) {
-        var node = createNode(252 /* CatchClause */, location);
+        var node = createNode(256 /* CatchClause */, location);
         node.variableDeclaration = typeof variableDeclaration === "string" ? createVariableDeclaration(variableDeclaration) : variableDeclaration;
         node.block = block;
         return node;
@@ -11572,7 +11983,7 @@ var ts;
     ts.updateCatchClause = updateCatchClause;
     // Property assignments
     function createPropertyAssignment(name, initializer, location) {
-        var node = createNode(253 /* PropertyAssignment */, location);
+        var node = createNode(257 /* PropertyAssignment */, location);
         node.name = typeof name === "string" ? createIdentifier(name) : name;
         node.questionToken = undefined;
         node.initializer = initializer !== undefined ? parenthesizeExpressionForList(initializer) : undefined;
@@ -11587,12 +11998,18 @@ var ts;
     }
     ts.updatePropertyAssignment = updatePropertyAssignment;
     function createShorthandPropertyAssignment(name, objectAssignmentInitializer, location) {
-        var node = createNode(254 /* ShorthandPropertyAssignment */, location);
+        var node = createNode(258 /* ShorthandPropertyAssignment */, location);
         node.name = typeof name === "string" ? createIdentifier(name) : name;
         node.objectAssignmentInitializer = objectAssignmentInitializer !== undefined ? parenthesizeExpressionForList(objectAssignmentInitializer) : undefined;
         return node;
     }
     ts.createShorthandPropertyAssignment = createShorthandPropertyAssignment;
+    function createSpreadAssignment(expression, location) {
+        var node = createNode(259 /* SpreadAssignment */, location);
+        node.expression = expression !== undefined ? parenthesizeExpressionForList(expression) : undefined;
+        return node;
+    }
+    ts.createSpreadAssignment = createSpreadAssignment;
     function updateShorthandPropertyAssignment(node, name, objectAssignmentInitializer) {
         if (node.name !== name || node.objectAssignmentInitializer !== objectAssignmentInitializer) {
             return updateNode(createShorthandPropertyAssignment(name, objectAssignmentInitializer, node), node);
@@ -11600,10 +12017,17 @@ var ts;
         return node;
     }
     ts.updateShorthandPropertyAssignment = updateShorthandPropertyAssignment;
+    function updateSpreadAssignment(node, expression) {
+        if (node.expression !== expression) {
+            return updateNode(createSpreadAssignment(expression, node), node);
+        }
+        return node;
+    }
+    ts.updateSpreadAssignment = updateSpreadAssignment;
     // Top-level nodes
     function updateSourceFileNode(node, statements) {
         if (node.statements !== statements) {
-            var updated = createNode(256 /* SourceFile */, /*location*/ node, node.flags);
+            var updated = createNode(261 /* SourceFile */, /*location*/ node, node.flags);
             updated.statements = createNodeArray(statements);
             updated.endOfFileToken = node.endOfFileToken;
             updated.fileName = node.fileName;
@@ -11672,11 +12096,33 @@ var ts;
      * @param original The original statement.
      */
     function createNotEmittedStatement(original) {
-        var node = createNode(287 /* NotEmittedStatement */, /*location*/ original);
+        var node = createNode(292 /* NotEmittedStatement */, /*location*/ original);
         node.original = original;
         return node;
     }
     ts.createNotEmittedStatement = createNotEmittedStatement;
+    /**
+     * Creates a synthetic element to act as a placeholder for the end of an emitted declaration in
+     * order to properly emit exports.
+     */
+    function createEndOfDeclarationMarker(original) {
+        var node = createNode(295 /* EndOfDeclarationMarker */);
+        node.emitNode = {};
+        node.original = original;
+        return node;
+    }
+    ts.createEndOfDeclarationMarker = createEndOfDeclarationMarker;
+    /**
+     * Creates a synthetic element to act as a placeholder for the beginning of a merged declaration in
+     * order to properly emit exports.
+     */
+    function createMergeDeclarationMarker(original) {
+        var node = createNode(294 /* MergeDeclarationMarker */);
+        node.emitNode = {};
+        node.original = original;
+        return node;
+    }
+    ts.createMergeDeclarationMarker = createMergeDeclarationMarker;
     /**
      * Creates a synthetic expression to act as a placeholder for a not-emitted expression in
      * order to preserve comments or sourcemap positions.
@@ -11686,7 +12132,7 @@ var ts;
      * @param location The location for the expression. Defaults to the positions from "original" if provided.
      */
     function createPartiallyEmittedExpression(expression, original, location) {
-        var node = createNode(288 /* PartiallyEmittedExpression */, /*location*/ location || original);
+        var node = createNode(293 /* PartiallyEmittedExpression */, /*location*/ location || original);
         node.expression = expression;
         node.original = original;
         return node;
@@ -11759,15 +12205,6 @@ var ts;
         }
     }
     ts.createMemberAccessForPropertyName = createMemberAccessForPropertyName;
-    function createRestParameter(name) {
-        return createParameterDeclaration(
-        /*decorators*/ undefined, 
-        /*modifiers*/ undefined, createToken(23 /* DotDotDotToken */), name, 
-        /*questionToken*/ undefined, 
-        /*type*/ undefined, 
-        /*initializer*/ undefined);
-    }
-    ts.createRestParameter = createRestParameter;
     function createFunctionCall(func, thisArg, argumentsList, location) {
         return createCall(createPropertyAccess(func, "call"), 
         /*typeArguments*/ undefined, [
@@ -11807,10 +12244,25 @@ var ts;
         // flag and setting a parent node.
         var react = createIdentifier(reactNamespace || "React");
         react.flags &= ~8 /* Synthesized */;
-        react.parent = parent;
+        // Set the parent that is in parse tree 
+        // this makes sure that parent chain is intact for checker to traverse complete scope tree
+        react.parent = ts.getParseTreeNode(parent);
         return react;
     }
-    function createReactCreateElement(reactNamespace, tagName, props, children, parentElement, location) {
+    function createJsxFactoryExpressionFromEntityName(jsxFactory, parent) {
+        if (ts.isQualifiedName(jsxFactory)) {
+            return createPropertyAccess(createJsxFactoryExpressionFromEntityName(jsxFactory.left, parent), setEmitFlags(getMutableClone(jsxFactory.right), 1536 /* NoSourceMap */));
+        }
+        else {
+            return createReactNamespace(jsxFactory.text, parent);
+        }
+    }
+    function createJsxFactoryExpression(jsxFactoryEntity, reactNamespace, parent) {
+        return jsxFactoryEntity ?
+            createJsxFactoryExpressionFromEntityName(jsxFactoryEntity, parent) :
+            createPropertyAccess(createReactNamespace(reactNamespace, parent), "createElement");
+    }
+    function createExpressionForJsxElement(jsxFactoryEntity, reactNamespace, tagName, props, children, parentElement, location) {
         var argumentsList = [tagName];
         if (props) {
             argumentsList.push(props);
@@ -11830,10 +12282,22 @@ var ts;
                 argumentsList.push(children[0]);
             }
         }
-        return createCall(createPropertyAccess(createReactNamespace(reactNamespace, parentElement), "createElement"), 
+        return createCall(createJsxFactoryExpression(jsxFactoryEntity, reactNamespace, parentElement), 
         /*typeArguments*/ undefined, argumentsList, location);
     }
-    ts.createReactCreateElement = createReactCreateElement;
+    ts.createExpressionForJsxElement = createExpressionForJsxElement;
+    function createExportDefault(expression) {
+        return createExportAssignment(/*decorators*/ undefined, /*modifiers*/ undefined, /*isExportEquals*/ false, expression);
+    }
+    ts.createExportDefault = createExportDefault;
+    function createExternalModuleExport(exportName) {
+        return createExportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, createNamedExports([createExportSpecifier(exportName)]));
+    }
+    ts.createExternalModuleExport = createExternalModuleExport;
+    function createLetStatement(name, initializer, location) {
+        return createVariableStatement(/*modifiers*/ undefined, createLetDeclarationList([createVariableDeclaration(name, /*type*/ undefined, initializer)]), location);
+    }
+    ts.createLetStatement = createLetStatement;
     function createLetDeclarationList(declarations, location) {
         return createVariableDeclarationList(declarations, location, 1 /* Let */);
     }
@@ -11922,20 +12386,18 @@ var ts;
         // name => super[name]
         return createArrowFunction(
         /*modifiers*/ undefined, 
-        /*typeParameters*/ undefined, [createParameter("name")], 
-        /*type*/ undefined, 
-        /*equalsGreaterThanToken*/ undefined, createElementAccess(target, createIdentifier("name")));
+        /*typeParameters*/ undefined, [createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "name")], 
+        /*type*/ undefined, createToken(35 /* EqualsGreaterThanToken */), createElementAccess(target, createIdentifier("name")));
     }
     function createSeti(target) {
         // (name, value) => super[name] = value
         return createArrowFunction(
         /*modifiers*/ undefined, 
         /*typeParameters*/ undefined, [
-            createParameter("name"),
-            createParameter("value")
+            createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "name"),
+            createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "value")
         ], 
-        /*type*/ undefined, 
-        /*equalsGreaterThanToken*/ undefined, createAssignment(createElementAccess(target, createIdentifier("name")), createIdentifier("value")));
+        /*type*/ undefined, createToken(35 /* EqualsGreaterThanToken */), createAssignment(createElementAccess(target, createIdentifier("name")), createIdentifier("value")));
     }
     function createAdvancedAsyncSuperHelper() {
         //  const _super = (function (geti, seti) {
@@ -11960,7 +12422,7 @@ var ts;
         // set value(v) { seti(name, v); }
         var setter = createSetAccessor(
         /*decorators*/ undefined, 
-        /*modifiers*/ undefined, "value", [createParameter("v")], createBlock([
+        /*modifiers*/ undefined, "value", [createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "v")], createBlock([
             createStatement(createCall(createIdentifier("seti"), 
             /*typeArguments*/ undefined, [
                 createIdentifier("name"),
@@ -11970,9 +12432,8 @@ var ts;
         // return name => cache[name] || ...
         var getOrCreateAccessorsForName = createReturn(createArrowFunction(
         /*modifiers*/ undefined, 
-        /*typeParameters*/ undefined, [createParameter("name")], 
-        /*type*/ undefined, 
-        /*equalsGreaterThanToken*/ undefined, createLogicalOr(createElementAccess(createIdentifier("cache"), createIdentifier("name")), createParen(createAssignment(createElementAccess(createIdentifier("cache"), createIdentifier("name")), createObjectLiteral([
+        /*typeParameters*/ undefined, [createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "name")], 
+        /*type*/ undefined, createToken(35 /* EqualsGreaterThanToken */), createLogicalOr(createElementAccess(createIdentifier("cache"), createIdentifier("name")), createParen(createAssignment(createElementAccess(createIdentifier("cache"), createIdentifier("name")), createObjectLiteral([
             getter,
             setter
         ]))))));
@@ -11988,8 +12449,8 @@ var ts;
             /*asteriskToken*/ undefined, 
             /*name*/ undefined, 
             /*typeParameters*/ undefined, [
-                createParameter("geti"),
-                createParameter("seti")
+                createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "geti"),
+                createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "seti")
             ], 
             /*type*/ undefined, createBlock([
                 createCache,
@@ -12019,13 +12480,13 @@ var ts;
             case 8 /* NumericLiteral */:
             case 9 /* StringLiteral */:
                 return false;
-            case 171 /* ArrayLiteralExpression */:
+            case 175 /* ArrayLiteralExpression */:
                 var elements = target.elements;
                 if (elements.length === 0) {
                     return false;
                 }
                 return true;
-            case 172 /* ObjectLiteralExpression */:
+            case 176 /* ObjectLiteralExpression */:
                 return target.properties.length > 0;
             default:
                 return true;
@@ -12045,7 +12506,7 @@ var ts;
         }
         else {
             switch (callee.kind) {
-                case 173 /* PropertyAccessExpression */: {
+                case 177 /* PropertyAccessExpression */: {
                     if (shouldBeCapturedInTempVariable(callee.expression, cacheIdentifiers)) {
                         // for `a.b()` target is `(_a = a).b` and thisArg is `_a`
                         thisArg = createTempVariable(recordTempVariable);
@@ -12059,7 +12520,7 @@ var ts;
                     }
                     break;
                 }
-                case 174 /* ElementAccessExpression */: {
+                case 178 /* ElementAccessExpression */: {
                     if (shouldBeCapturedInTempVariable(callee.expression, cacheIdentifiers)) {
                         // for `a[b]()` target is `(_a = a)[b]` and thisArg is `_a`
                         thisArg = createTempVariable(recordTempVariable);
@@ -12113,14 +12574,14 @@ var ts;
     ts.createExpressionForPropertyName = createExpressionForPropertyName;
     function createExpressionForObjectLiteralElementLike(node, property, receiver) {
         switch (property.kind) {
-            case 150 /* GetAccessor */:
-            case 151 /* SetAccessor */:
+            case 151 /* GetAccessor */:
+            case 152 /* SetAccessor */:
                 return createExpressionForAccessorDeclaration(node.properties, property, receiver, node.multiLine);
-            case 253 /* PropertyAssignment */:
+            case 257 /* PropertyAssignment */:
                 return createExpressionForPropertyAssignment(property, receiver);
-            case 254 /* ShorthandPropertyAssignment */:
+            case 258 /* ShorthandPropertyAssignment */:
                 return createExpressionForShorthandPropertyAssignment(property, receiver);
-            case 148 /* MethodDeclaration */:
+            case 149 /* MethodDeclaration */:
                 return createExpressionForMethodDeclaration(property, receiver);
         }
     }
@@ -12184,6 +12645,112 @@ var ts;
         /*location*/ method), 
         /*original*/ method));
     }
+    /**
+     * Gets the local name of a declaration. This is primarily used for declarations that can be
+     * referred to by name in the declaration's immediate scope (classes, enums, namespaces). A
+     * local name will *never* be prefixed with an module or namespace export modifier like
+     * "exports." when emitted as an expression.
+     *
+     * @param node The declaration.
+     * @param allowComments A value indicating whether comments may be emitted for the name.
+     * @param allowSourceMaps A value indicating whether source maps may be emitted for the name.
+     */
+    function getLocalName(node, allowComments, allowSourceMaps) {
+        return getName(node, allowComments, allowSourceMaps, 262144 /* LocalName */);
+    }
+    ts.getLocalName = getLocalName;
+    /**
+     * Gets whether an identifier should only be referred to by its local name.
+     */
+    function isLocalName(node) {
+        return (getEmitFlags(node) & 262144 /* LocalName */) !== 0;
+    }
+    ts.isLocalName = isLocalName;
+    /**
+     * Gets the export name of a declaration. This is primarily used for declarations that can be
+     * referred to by name in the declaration's immediate scope (classes, enums, namespaces). An
+     * export name will *always* be prefixed with an module or namespace export modifier like
+     * `"exports."` when emitted as an expression if the name points to an exported symbol.
+     *
+     * @param node The declaration.
+     * @param allowComments A value indicating whether comments may be emitted for the name.
+     * @param allowSourceMaps A value indicating whether source maps may be emitted for the name.
+     */
+    function getExportName(node, allowComments, allowSourceMaps) {
+        return getName(node, allowComments, allowSourceMaps, 131072 /* ExportName */);
+    }
+    ts.getExportName = getExportName;
+    /**
+     * Gets whether an identifier should only be referred to by its export representation if the
+     * name points to an exported symbol.
+     */
+    function isExportName(node) {
+        return (getEmitFlags(node) & 131072 /* ExportName */) !== 0;
+    }
+    ts.isExportName = isExportName;
+    /**
+     * Gets the name of a declaration for use in declarations.
+     *
+     * @param node The declaration.
+     * @param allowComments A value indicating whether comments may be emitted for the name.
+     * @param allowSourceMaps A value indicating whether source maps may be emitted for the name.
+     */
+    function getDeclarationName(node, allowComments, allowSourceMaps) {
+        return getName(node, allowComments, allowSourceMaps);
+    }
+    ts.getDeclarationName = getDeclarationName;
+    function getName(node, allowComments, allowSourceMaps, emitFlags) {
+        if (node.name && ts.isIdentifier(node.name) && !ts.isGeneratedIdentifier(node.name)) {
+            var name_11 = getMutableClone(node.name);
+            emitFlags |= getEmitFlags(node.name);
+            if (!allowSourceMaps)
+                emitFlags |= 1536 /* NoSourceMap */;
+            if (!allowComments)
+                emitFlags |= 49152 /* NoComments */;
+            if (emitFlags)
+                setEmitFlags(name_11, emitFlags);
+            return name_11;
+        }
+        return getGeneratedNameForNode(node);
+    }
+    /**
+     * Gets the exported name of a declaration for use in expressions.
+     *
+     * An exported name will *always* be prefixed with an module or namespace export modifier like
+     * "exports." if the name points to an exported symbol.
+     *
+     * @param ns The namespace identifier.
+     * @param node The declaration.
+     * @param allowComments A value indicating whether comments may be emitted for the name.
+     * @param allowSourceMaps A value indicating whether source maps may be emitted for the name.
+     */
+    function getExternalModuleOrNamespaceExportName(ns, node, allowComments, allowSourceMaps) {
+        if (ns && ts.hasModifier(node, 1 /* Export */)) {
+            return getNamespaceMemberName(ns, getName(node), allowComments, allowSourceMaps);
+        }
+        return getExportName(node, allowComments, allowSourceMaps);
+    }
+    ts.getExternalModuleOrNamespaceExportName = getExternalModuleOrNamespaceExportName;
+    /**
+     * Gets a namespace-qualified name for use in expressions.
+     *
+     * @param ns The namespace identifier.
+     * @param name The name.
+     * @param allowComments A value indicating whether comments may be emitted for the name.
+     * @param allowSourceMaps A value indicating whether source maps may be emitted for the name.
+     */
+    function getNamespaceMemberName(ns, name, allowComments, allowSourceMaps) {
+        var qualifiedName = createPropertyAccess(ns, ts.nodeIsSynthesized(name) ? name : getSynthesizedClone(name), /*location*/ name);
+        var emitFlags;
+        if (!allowSourceMaps)
+            emitFlags |= 1536 /* NoSourceMap */;
+        if (!allowComments)
+            emitFlags |= 49152 /* NoComments */;
+        if (emitFlags)
+            setEmitFlags(qualifiedName, emitFlags);
+        return qualifiedName;
+    }
+    ts.getNamespaceMemberName = getNamespaceMemberName;
     // Utilities
     function isUseStrictPrologue(node) {
         return node.expression.text === "use strict";
@@ -12273,7 +12840,7 @@ var ts;
     function parenthesizeBinaryOperand(binaryOperator, operand, isLeftSideOfBinary, leftOperand) {
         var skipped = skipPartiallyEmittedExpressions(operand);
         // If the resulting expression is already parenthesized, we do not need to do any further processing.
-        if (skipped.kind === 179 /* ParenthesizedExpression */) {
+        if (skipped.kind === 183 /* ParenthesizedExpression */) {
             return operand;
         }
         return binaryOperandNeedsParentheses(binaryOperator, operand, isLeftSideOfBinary, leftOperand)
@@ -12307,8 +12874,8 @@ 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(188 /* BinaryExpression */, binaryOperator);
-        var binaryOperatorAssociativity = ts.getOperatorAssociativity(188 /* BinaryExpression */, binaryOperator);
+        var binaryOperatorPrecedence = ts.getOperatorPrecedence(192 /* BinaryExpression */, binaryOperator);
+        var binaryOperatorAssociativity = ts.getOperatorAssociativity(192 /* BinaryExpression */, binaryOperator);
         var emittedOperand = skipPartiallyEmittedExpressions(operand);
         var operandPrecedence = ts.getExpressionPrecedence(emittedOperand);
         switch (ts.compareValues(operandPrecedence, binaryOperatorPrecedence)) {
@@ -12317,7 +12884,7 @@ var ts;
                 // and is a yield expression, then we do not need parentheses.
                 if (!isLeftSideOfBinary
                     && binaryOperatorAssociativity === 1 /* Right */
-                    && operand.kind === 191 /* YieldExpression */) {
+                    && operand.kind === 195 /* YieldExpression */) {
                     return false;
                 }
                 return true;
@@ -12405,7 +12972,7 @@ var ts;
         if (ts.isLiteralKind(node.kind)) {
             return node.kind;
         }
-        if (node.kind === 188 /* BinaryExpression */ && node.operatorToken.kind === 36 /* PlusToken */) {
+        if (node.kind === 192 /* BinaryExpression */ && node.operatorToken.kind === 36 /* PlusToken */) {
             if (node.cachedLiteralKind !== undefined) {
                 return node.cachedLiteralKind;
             }
@@ -12428,9 +12995,9 @@ var ts;
     function parenthesizeForNew(expression) {
         var emittedExpression = skipPartiallyEmittedExpressions(expression);
         switch (emittedExpression.kind) {
-            case 175 /* CallExpression */:
+            case 179 /* CallExpression */:
                 return createParen(expression);
-            case 176 /* NewExpression */:
+            case 180 /* NewExpression */:
                 return emittedExpression.arguments
                     ? expression
                     : createParen(expression);
@@ -12455,7 +13022,7 @@ var ts;
         //
         var emittedExpression = skipPartiallyEmittedExpressions(expression);
         if (ts.isLeftHandSideExpression(emittedExpression)
-            && (emittedExpression.kind !== 176 /* NewExpression */ || emittedExpression.arguments)
+            && (emittedExpression.kind !== 180 /* NewExpression */ || emittedExpression.arguments)
             && emittedExpression.kind !== 8 /* NumericLiteral */) {
             return expression;
         }
@@ -12493,7 +13060,7 @@ var ts;
     function parenthesizeExpressionForList(expression) {
         var emittedExpression = skipPartiallyEmittedExpressions(expression);
         var expressionPrecedence = ts.getExpressionPrecedence(emittedExpression);
-        var commaPrecedence = ts.getOperatorPrecedence(188 /* BinaryExpression */, 25 /* CommaToken */);
+        var commaPrecedence = ts.getOperatorPrecedence(192 /* BinaryExpression */, 25 /* CommaToken */);
         return expressionPrecedence > commaPrecedence
             ? expression
             : createParen(expression, /*location*/ expression);
@@ -12504,7 +13071,7 @@ var ts;
         if (ts.isCallExpression(emittedExpression)) {
             var callee = emittedExpression.expression;
             var kind = skipPartiallyEmittedExpressions(callee).kind;
-            if (kind === 180 /* FunctionExpression */ || kind === 181 /* ArrowFunction */) {
+            if (kind === 184 /* FunctionExpression */ || kind === 185 /* ArrowFunction */) {
                 var mutableCall = getMutableClone(emittedExpression);
                 mutableCall.expression = createParen(callee, /*location*/ callee);
                 return recreatePartiallyEmittedExpressions(expression, mutableCall);
@@ -12512,7 +13079,7 @@ var ts;
         }
         else {
             var leftmostExpressionKind = getLeftmostExpression(emittedExpression).kind;
-            if (leftmostExpressionKind === 172 /* ObjectLiteralExpression */ || leftmostExpressionKind === 180 /* FunctionExpression */) {
+            if (leftmostExpressionKind === 176 /* ObjectLiteralExpression */ || leftmostExpressionKind === 184 /* FunctionExpression */) {
                 return createParen(expression, /*location*/ expression);
             }
         }
@@ -12536,21 +13103,21 @@ var ts;
     function getLeftmostExpression(node) {
         while (true) {
             switch (node.kind) {
-                case 187 /* PostfixUnaryExpression */:
+                case 191 /* PostfixUnaryExpression */:
                     node = node.operand;
                     continue;
-                case 188 /* BinaryExpression */:
+                case 192 /* BinaryExpression */:
                     node = node.left;
                     continue;
-                case 189 /* ConditionalExpression */:
+                case 193 /* ConditionalExpression */:
                     node = node.condition;
                     continue;
-                case 175 /* CallExpression */:
-                case 174 /* ElementAccessExpression */:
-                case 173 /* PropertyAccessExpression */:
+                case 179 /* CallExpression */:
+                case 178 /* ElementAccessExpression */:
+                case 177 /* PropertyAccessExpression */:
                     node = node.expression;
                     continue;
-                case 288 /* PartiallyEmittedExpression */:
+                case 293 /* PartiallyEmittedExpression */:
                     node = node.expression;
                     continue;
             }
@@ -12559,19 +13126,19 @@ var ts;
     }
     function parenthesizeConciseBody(body) {
         var emittedBody = skipPartiallyEmittedExpressions(body);
-        if (emittedBody.kind === 172 /* ObjectLiteralExpression */) {
+        if (emittedBody.kind === 176 /* ObjectLiteralExpression */) {
             return createParen(body, /*location*/ body);
         }
         return body;
     }
     ts.parenthesizeConciseBody = parenthesizeConciseBody;
+    var OuterExpressionKinds;
     (function (OuterExpressionKinds) {
         OuterExpressionKinds[OuterExpressionKinds["Parentheses"] = 1] = "Parentheses";
         OuterExpressionKinds[OuterExpressionKinds["Assertions"] = 2] = "Assertions";
         OuterExpressionKinds[OuterExpressionKinds["PartiallyEmittedExpressions"] = 4] = "PartiallyEmittedExpressions";
         OuterExpressionKinds[OuterExpressionKinds["All"] = 7] = "All";
-    })(ts.OuterExpressionKinds || (ts.OuterExpressionKinds = {}));
-    var OuterExpressionKinds = ts.OuterExpressionKinds;
+    })(OuterExpressionKinds = ts.OuterExpressionKinds || (ts.OuterExpressionKinds = {}));
     function skipOuterExpressions(node, kinds) {
         if (kinds === void 0) { kinds = 7 /* All */; }
         var previousNode;
@@ -12591,7 +13158,7 @@ var ts;
     }
     ts.skipOuterExpressions = skipOuterExpressions;
     function skipParentheses(node) {
-        while (node.kind === 179 /* ParenthesizedExpression */) {
+        while (node.kind === 183 /* ParenthesizedExpression */) {
             node = node.expression;
         }
         return node;
@@ -12605,7 +13172,7 @@ var ts;
     }
     ts.skipAssertions = skipAssertions;
     function skipPartiallyEmittedExpressions(node) {
-        while (node.kind === 288 /* PartiallyEmittedExpression */) {
+        while (node.kind === 293 /* PartiallyEmittedExpression */) {
             node = node.expression;
         }
         return node;
@@ -12680,7 +13247,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 === 256 /* SourceFile */) {
+                if (node.kind === 261 /* SourceFile */) {
                     return node.emitNode = { annotatedNodes: [node] };
                 }
                 var sourceFile = ts.getSourceFileOfNode(node);
@@ -12822,13 +13389,13 @@ var ts;
     function getLocalNameForExternalImport(node, sourceFile) {
         var namespaceDeclaration = ts.getNamespaceDeclarationNode(node);
         if (namespaceDeclaration && !ts.isDefaultImport(node)) {
-            var name_9 = namespaceDeclaration.name;
-            return ts.isGeneratedIdentifier(name_9) ? name_9 : createIdentifier(ts.getSourceTextOfNodeFromSourceFile(sourceFile, namespaceDeclaration.name));
+            var name_12 = namespaceDeclaration.name;
+            return ts.isGeneratedIdentifier(name_12) ? name_12 : createIdentifier(ts.getSourceTextOfNodeFromSourceFile(sourceFile, namespaceDeclaration.name));
         }
-        if (node.kind === 231 /* ImportDeclaration */ && node.importClause) {
+        if (node.kind === 235 /* ImportDeclaration */ && node.importClause) {
             return getGeneratedNameForNode(node);
         }
-        if (node.kind === 237 /* ExportDeclaration */ && node.moduleSpecifier) {
+        if (node.kind === 241 /* ExportDeclaration */ && node.moduleSpecifier) {
             return getGeneratedNameForNode(node);
         }
         return undefined;
@@ -12885,6 +13452,363 @@ var ts;
     function tryGetModuleNameFromDeclaration(declaration, host, resolver, compilerOptions) {
         return tryGetModuleNameFromFile(resolver.getExternalModuleFileFromDeclaration(declaration), host, compilerOptions);
     }
+    /**
+     * Transforms the body of a function-like node.
+     *
+     * @param node A function-like node.
+     */
+    function transformFunctionBody(node, visitor, currentSourceFile, context, enableSubstitutionsForCapturedThis, convertObjectRest) {
+        var multiLine = false; // indicates whether the block *must* be emitted as multiple lines
+        var singleLine = false; // indicates whether the block *may* be emitted as a single line
+        var statementsLocation;
+        var closeBraceLocation;
+        var statements = [];
+        var body = node.body;
+        var statementOffset;
+        context.startLexicalEnvironment();
+        if (ts.isBlock(body)) {
+            // ensureUseStrict is false because no new prologue-directive should be added.
+            // addPrologueDirectives will simply put already-existing directives at the beginning of the target statement-array
+            statementOffset = addPrologueDirectives(statements, body.statements, /*ensureUseStrict*/ false, visitor);
+        }
+        addCaptureThisForNodeIfNeeded(statements, node, enableSubstitutionsForCapturedThis);
+        addDefaultValueAssignmentsIfNeeded(statements, node, visitor, convertObjectRest);
+        addRestParameterIfNeeded(statements, node, /*inConstructorWithSynthesizedSuper*/ false);
+        // If we added any generated statements, this must be a multi-line block.
+        if (!multiLine && statements.length > 0) {
+            multiLine = true;
+        }
+        if (ts.isBlock(body)) {
+            statementsLocation = body.statements;
+            ts.addRange(statements, ts.visitNodes(body.statements, visitor, ts.isStatement, statementOffset));
+            // If the original body was a multi-line block, this must be a multi-line block.
+            if (!multiLine && body.multiLine) {
+                multiLine = true;
+            }
+        }
+        else {
+            ts.Debug.assert(node.kind === 185 /* 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
+            // being emitted for the end position only.
+            statementsLocation = ts.moveRangeEnd(body, -1);
+            var equalsGreaterThanToken = node.equalsGreaterThanToken;
+            if (!ts.nodeIsSynthesized(equalsGreaterThanToken) && !ts.nodeIsSynthesized(body)) {
+                if (ts.rangeEndIsOnSameLineAsRangeStart(equalsGreaterThanToken, body, currentSourceFile)) {
+                    singleLine = true;
+                }
+                else {
+                    multiLine = true;
+                }
+            }
+            var expression = ts.visitNode(body, visitor, ts.isExpression);
+            var returnStatement = createReturn(expression, /*location*/ body);
+            setEmitFlags(returnStatement, 12288 /* NoTokenSourceMaps */ | 1024 /* NoTrailingSourceMap */ | 32768 /* NoTrailingComments */);
+            statements.push(returnStatement);
+            // To align with the source map emit for the old emitter, we set a custom
+            // source map location for the close brace.
+            closeBraceLocation = body;
+        }
+        var lexicalEnvironment = context.endLexicalEnvironment();
+        ts.addRange(statements, lexicalEnvironment);
+        // If we added any final generated statements, this must be a multi-line block
+        if (!multiLine && lexicalEnvironment && lexicalEnvironment.length) {
+            multiLine = true;
+        }
+        var block = createBlock(createNodeArray(statements, statementsLocation), node.body, multiLine);
+        if (!multiLine && singleLine) {
+            setEmitFlags(block, 32 /* SingleLine */);
+        }
+        if (closeBraceLocation) {
+            setTokenSourceMapRange(block, 17 /* CloseBraceToken */, closeBraceLocation);
+        }
+        setOriginalNode(block, node.body);
+        return block;
+    }
+    ts.transformFunctionBody = transformFunctionBody;
+    /**
+     * Adds a statement to capture the `this` of a function declaration if it is needed.
+     *
+     * @param statements The statements for the new function body.
+     * @param node A node.
+     */
+    function addCaptureThisForNodeIfNeeded(statements, node, enableSubstitutionsForCapturedThis) {
+        if (node.transformFlags & 524288 /* ContainsCapturedLexicalThis */ && node.kind !== 185 /* ArrowFunction */) {
+            captureThisForNode(statements, node, createThis(), enableSubstitutionsForCapturedThis);
+        }
+    }
+    ts.addCaptureThisForNodeIfNeeded = addCaptureThisForNodeIfNeeded;
+    function captureThisForNode(statements, node, initializer, enableSubstitutionsForCapturedThis, originalStatement) {
+        enableSubstitutionsForCapturedThis();
+        var captureThisStatement = createVariableStatement(
+        /*modifiers*/ undefined, createVariableDeclarationList([
+            createVariableDeclaration("_this", 
+            /*type*/ undefined, initializer)
+        ]), originalStatement);
+        setEmitFlags(captureThisStatement, 49152 /* NoComments */ | 8388608 /* CustomPrologue */);
+        setSourceMapRange(captureThisStatement, node);
+        statements.push(captureThisStatement);
+    }
+    ts.captureThisForNode = captureThisForNode;
+    /**
+     * Gets a value indicating whether we need to add default value assignments for a
+     * function-like node.
+     *
+     * @param node A function-like node.
+     */
+    function shouldAddDefaultValueAssignments(node) {
+        return (node.transformFlags & 2097152 /* ContainsDefaultValueAssignments */) !== 0;
+    }
+    /**
+     * Adds statements to the body of a function-like node if it contains parameters with
+     * binding patterns or initializers.
+     *
+     * @param statements The statements for the new function body.
+     * @param node A function-like node.
+     */
+    function addDefaultValueAssignmentsIfNeeded(statements, node, visitor, convertObjectRest) {
+        if (!shouldAddDefaultValueAssignments(node)) {
+            return;
+        }
+        for (var _i = 0, _a = node.parameters; _i < _a.length; _i++) {
+            var parameter = _a[_i];
+            var name_13 = parameter.name, initializer = parameter.initializer, dotDotDotToken = parameter.dotDotDotToken;
+            // A rest parameter cannot have a binding pattern or an initializer,
+            // so let's just ignore it.
+            if (dotDotDotToken) {
+                continue;
+            }
+            if (ts.isBindingPattern(name_13)) {
+                addDefaultValueAssignmentForBindingPattern(statements, parameter, name_13, initializer, visitor, convertObjectRest);
+            }
+            else if (initializer) {
+                addDefaultValueAssignmentForInitializer(statements, parameter, name_13, initializer, visitor);
+            }
+        }
+    }
+    ts.addDefaultValueAssignmentsIfNeeded = addDefaultValueAssignmentsIfNeeded;
+    /**
+     * Adds statements to the body of a function-like node for parameters with binding patterns
+     *
+     * @param statements The statements for the new function body.
+     * @param parameter The parameter for the function.
+     * @param name The name of the parameter.
+     * @param initializer The initializer for the parameter.
+     */
+    function addDefaultValueAssignmentForBindingPattern(statements, parameter, name, initializer, visitor, convertObjectRest) {
+        var temp = getGeneratedNameForNode(parameter);
+        // In cases where a binding pattern is simply '[]' or '{}',
+        // we usually don't want to emit a var declaration; however, in the presence
+        // of an initializer, we must emit that expression to preserve side effects.
+        if (name.elements.length > 0) {
+            statements.push(setEmitFlags(createVariableStatement(
+            /*modifiers*/ undefined, createVariableDeclarationList(ts.flattenParameterDestructuring(parameter, temp, visitor, convertObjectRest))), 8388608 /* CustomPrologue */));
+        }
+        else if (initializer) {
+            statements.push(setEmitFlags(createStatement(createAssignment(temp, ts.visitNode(initializer, visitor, ts.isExpression))), 8388608 /* CustomPrologue */));
+        }
+    }
+    /**
+     * Adds statements to the body of a function-like node for parameters with initializers.
+     *
+     * @param statements The statements for the new function body.
+     * @param parameter The parameter for the function.
+     * @param name The name of the parameter.
+     * @param initializer The initializer for the parameter.
+     */
+    function addDefaultValueAssignmentForInitializer(statements, parameter, name, initializer, visitor) {
+        initializer = ts.visitNode(initializer, visitor, ts.isExpression);
+        var statement = createIf(createStrictEquality(getSynthesizedClone(name), createVoidZero()), setEmitFlags(createBlock([
+            createStatement(createAssignment(setEmitFlags(getMutableClone(name), 1536 /* NoSourceMap */), setEmitFlags(initializer, 1536 /* NoSourceMap */ | getEmitFlags(initializer)), 
+            /*location*/ parameter))
+        ], /*location*/ parameter), 32 /* SingleLine */ | 1024 /* NoTrailingSourceMap */ | 12288 /* NoTokenSourceMaps */), 
+        /*elseStatement*/ undefined, 
+        /*location*/ parameter);
+        statement.startsOnNewLine = true;
+        setEmitFlags(statement, 12288 /* NoTokenSourceMaps */ | 1024 /* NoTrailingSourceMap */ | 8388608 /* CustomPrologue */);
+        statements.push(statement);
+    }
+    /**
+     * Gets a value indicating whether we need to add statements to handle a rest parameter.
+     *
+     * @param node A ParameterDeclaration node.
+     * @param inConstructorWithSynthesizedSuper A value indicating whether the parameter is
+     *                                          part of a constructor declaration with a
+     *                                          synthesized call to `super`
+     */
+    function shouldAddRestParameter(node, inConstructorWithSynthesizedSuper) {
+        return node && node.dotDotDotToken && node.name.kind === 70 /* Identifier */ && !inConstructorWithSynthesizedSuper;
+    }
+    /**
+     * Adds statements to the body of a function-like node if it contains a rest parameter.
+     *
+     * @param statements The statements for the new function body.
+     * @param node A function-like node.
+     * @param inConstructorWithSynthesizedSuper A value indicating whether the parameter is
+     *                                          part of a constructor declaration with a
+     *                                          synthesized call to `super`
+     */
+    function addRestParameterIfNeeded(statements, node, inConstructorWithSynthesizedSuper) {
+        var parameter = ts.lastOrUndefined(node.parameters);
+        if (!shouldAddRestParameter(parameter, inConstructorWithSynthesizedSuper)) {
+            return;
+        }
+        // `declarationName` is the name of the local declaration for the parameter.
+        var declarationName = getMutableClone(parameter.name);
+        setEmitFlags(declarationName, 1536 /* NoSourceMap */);
+        // `expressionName` is the name of the parameter used in expressions.
+        var expressionName = getSynthesizedClone(parameter.name);
+        var restIndex = node.parameters.length - 1;
+        var temp = createLoopVariable();
+        // var param = [];
+        statements.push(setEmitFlags(createVariableStatement(
+        /*modifiers*/ undefined, createVariableDeclarationList([
+            createVariableDeclaration(declarationName, 
+            /*type*/ undefined, createArrayLiteral([]))
+        ]), 
+        /*location*/ parameter), 8388608 /* CustomPrologue */));
+        // for (var _i = restIndex; _i < arguments.length; _i++) {
+        //   param[_i - restIndex] = arguments[_i];
+        // }
+        var forStatement = createFor(createVariableDeclarationList([
+            createVariableDeclaration(temp, /*type*/ undefined, createLiteral(restIndex))
+        ], /*location*/ parameter), createLessThan(temp, createPropertyAccess(createIdentifier("arguments"), "length"), 
+        /*location*/ parameter), createPostfixIncrement(temp, /*location*/ parameter), createBlock([
+            startOnNewLine(createStatement(createAssignment(createElementAccess(expressionName, createSubtract(temp, createLiteral(restIndex))), createElementAccess(createIdentifier("arguments"), temp)), 
+            /*location*/ parameter))
+        ]));
+        setEmitFlags(forStatement, 8388608 /* CustomPrologue */);
+        startOnNewLine(forStatement);
+        statements.push(forStatement);
+    }
+    ts.addRestParameterIfNeeded = addRestParameterIfNeeded;
+    function convertForOf(node, convertedLoopBodyStatements, visitor, enableSubstitutionsForBlockScopedBindings, context, convertObjectRest) {
+        // The following ES6 code:
+        //
+        //    for (let v of expr) { }
+        //
+        // should be emitted as
+        //
+        //    for (var _i = 0, _a = expr; _i < _a.length; _i++) {
+        //        var v = _a[_i];
+        //    }
+        //
+        // where _a and _i are temps emitted to capture the RHS and the counter,
+        // respectively.
+        // When the left hand side is an expression instead of a let declaration,
+        // the "let v" is not emitted.
+        // When the left hand side is a let/const, the v is renamed if there is
+        // another v in scope.
+        // Note that all assignments to the LHS are emitted in the body, including
+        // all destructuring.
+        // Note also that because an extra statement is needed to assign to the LHS,
+        // for-of bodies are always emitted as blocks.
+        var expression = ts.visitNode(node.expression, visitor, ts.isExpression);
+        var initializer = node.initializer;
+        var statements = [];
+        // In the case where the user wrote an identifier as the RHS, like this:
+        //
+        //     for (let v of arr) { }
+        //
+        // we don't want to emit a temporary variable for the RHS, just use it directly.
+        var counter = convertObjectRest ? undefined : createLoopVariable();
+        var rhsReference = expression.kind === 70 /* Identifier */
+            ? createUniqueName(expression.text)
+            : createTempVariable(/*recordTempVariable*/ undefined);
+        var elementAccess = convertObjectRest ? rhsReference : createElementAccess(rhsReference, counter);
+        // Initialize LHS
+        // var v = _a[_i];
+        if (ts.isVariableDeclarationList(initializer)) {
+            if (initializer.flags & 3 /* BlockScoped */) {
+                enableSubstitutionsForBlockScopedBindings();
+            }
+            var firstOriginalDeclaration = ts.firstOrUndefined(initializer.declarations);
+            if (firstOriginalDeclaration && ts.isBindingPattern(firstOriginalDeclaration.name)) {
+                // This works whether the declaration is a var, let, or const.
+                // It will use rhsIterationValue _a[_i] as the initializer.
+                var declarations = ts.flattenVariableDestructuring(firstOriginalDeclaration, elementAccess, visitor, 
+                /*recordTempVariable*/ undefined, convertObjectRest);
+                var declarationList = createVariableDeclarationList(declarations, /*location*/ initializer);
+                setOriginalNode(declarationList, initializer);
+                // Adjust the source map range for the first declaration to align with the old
+                // emitter.
+                var firstDeclaration = declarations[0];
+                var lastDeclaration = ts.lastOrUndefined(declarations);
+                setSourceMapRange(declarationList, ts.createRange(firstDeclaration.pos, lastDeclaration.end));
+                statements.push(createVariableStatement(
+                /*modifiers*/ undefined, declarationList));
+            }
+            else {
+                // The following call does not include the initializer, so we have
+                // to emit it separately.
+                statements.push(createVariableStatement(
+                /*modifiers*/ undefined, setOriginalNode(createVariableDeclarationList([
+                    createVariableDeclaration(firstOriginalDeclaration ? firstOriginalDeclaration.name : createTempVariable(/*recordTempVariable*/ undefined), 
+                    /*type*/ undefined, createElementAccess(rhsReference, counter))
+                ], /*location*/ ts.moveRangePos(initializer, -1)), initializer), 
+                /*location*/ ts.moveRangeEnd(initializer, -1)));
+            }
+        }
+        else {
+            // Initializer is an expression. Emit the expression in the body, so that it's
+            // evaluated on every iteration.
+            var assignment = createAssignment(initializer, elementAccess);
+            if (ts.isDestructuringAssignment(assignment)) {
+                // This is a destructuring pattern, so we flatten the destructuring instead.
+                statements.push(createStatement(ts.flattenDestructuringAssignment(context, assignment, 
+                /*needsValue*/ false, context.hoistVariableDeclaration, visitor, convertObjectRest)));
+            }
+            else {
+                // Currently there is not way to check that assignment is binary expression of destructing assignment
+                // so we have to cast never type to binaryExpression
+                assignment.end = initializer.end;
+                statements.push(createStatement(assignment, /*location*/ ts.moveRangeEnd(initializer, -1)));
+            }
+        }
+        var bodyLocation;
+        var statementsLocation;
+        if (convertedLoopBodyStatements) {
+            ts.addRange(statements, convertedLoopBodyStatements);
+        }
+        else {
+            var statement = ts.visitNode(node.statement, visitor, ts.isStatement);
+            if (ts.isBlock(statement)) {
+                ts.addRange(statements, statement.statements);
+                bodyLocation = statement;
+                statementsLocation = statement.statements;
+            }
+            else {
+                statements.push(statement);
+            }
+        }
+        // The old emitter does not emit source maps for the expression
+        setEmitFlags(expression, 1536 /* NoSourceMap */ | getEmitFlags(expression));
+        // The old emitter does not emit source maps for the block.
+        // We add the location to preserve comments.
+        var body = createBlock(createNodeArray(statements, /*location*/ statementsLocation), 
+        /*location*/ bodyLocation);
+        setEmitFlags(body, 1536 /* NoSourceMap */ | 12288 /* NoTokenSourceMaps */);
+        var forStatement;
+        if (convertObjectRest) {
+            forStatement = createForOf(createVariableDeclarationList([
+                createVariableDeclaration(rhsReference, /*type*/ undefined, /*initializer*/ undefined, /*location*/ node.expression)
+            ], /*location*/ node.expression), node.expression, body, 
+            /*location*/ node);
+        }
+        else {
+            forStatement = createFor(setEmitFlags(createVariableDeclarationList([
+                createVariableDeclaration(counter, /*type*/ undefined, createLiteral(0), /*location*/ ts.moveRangePos(node.expression, -1)),
+                createVariableDeclaration(rhsReference, /*type*/ undefined, expression, /*location*/ node.expression)
+            ], /*location*/ node.expression), 16777216 /* NoHoisting */), createLessThan(counter, createPropertyAccess(rhsReference, "length"), 
+            /*location*/ node.expression), createPostfixIncrement(counter, /*location*/ node.expression), body, 
+            /*location*/ node);
+        }
+        // Disable trailing source maps for the OpenParenToken to align source map emit with the old emitter.
+        setEmitFlags(forStatement, 8192 /* NoTokenTrailingSourceMaps */);
+        return forStatement;
+    }
+    ts.convertForOf = convertForOf;
 })(ts || (ts = {}));
 /// <reference path="utilities.ts"/>
 /// <reference path="scanner.ts"/>
@@ -12896,13 +13820,13 @@ var ts;
     var IdentifierConstructor;
     var SourceFileConstructor;
     function createNode(kind, pos, end) {
-        if (kind === 256 /* SourceFile */) {
+        if (kind === 261 /* SourceFile */) {
             return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, pos, end);
         }
         else if (kind === 70 /* Identifier */) {
             return new (IdentifierConstructor || (IdentifierConstructor = ts.objectAllocator.getIdentifierConstructor()))(kind, pos, end);
         }
-        else if (kind < 140 /* FirstNode */) {
+        else if (kind < 141 /* FirstNode */) {
             return new (TokenConstructor || (TokenConstructor = ts.objectAllocator.getTokenConstructor()))(kind, pos, end);
         }
         else {
@@ -12945,26 +13869,28 @@ var ts;
         var visitNodes = cbNodeArray ? visitNodeArray : visitEachNode;
         var cbNodes = cbNodeArray || cbNode;
         switch (node.kind) {
-            case 140 /* QualifiedName */:
+            case 141 /* QualifiedName */:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.right);
-            case 142 /* TypeParameter */:
+            case 143 /* TypeParameter */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.constraint) ||
                     visitNode(cbNode, node.expression);
-            case 254 /* ShorthandPropertyAssignment */:
+            case 258 /* ShorthandPropertyAssignment */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.equalsToken) ||
                     visitNode(cbNode, node.objectAssignmentInitializer);
-            case 143 /* Parameter */:
-            case 146 /* PropertyDeclaration */:
-            case 145 /* PropertySignature */:
-            case 253 /* PropertyAssignment */:
-            case 219 /* VariableDeclaration */:
-            case 170 /* BindingElement */:
+            case 259 /* SpreadAssignment */:
+                return visitNode(cbNode, node.expression);
+            case 144 /* Parameter */:
+            case 147 /* PropertyDeclaration */:
+            case 146 /* PropertySignature */:
+            case 257 /* PropertyAssignment */:
+            case 223 /* VariableDeclaration */:
+            case 174 /* BindingElement */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.propertyName) ||
@@ -12973,24 +13899,24 @@ var ts;
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 157 /* FunctionType */:
-            case 158 /* ConstructorType */:
-            case 152 /* CallSignature */:
-            case 153 /* ConstructSignature */:
-            case 154 /* IndexSignature */:
+            case 158 /* FunctionType */:
+            case 159 /* ConstructorType */:
+            case 153 /* CallSignature */:
+            case 154 /* ConstructSignature */:
+            case 155 /* IndexSignature */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNodes(cbNodes, node.typeParameters) ||
                     visitNodes(cbNodes, node.parameters) ||
                     visitNode(cbNode, node.type);
-            case 148 /* MethodDeclaration */:
-            case 147 /* MethodSignature */:
-            case 149 /* Constructor */:
-            case 150 /* GetAccessor */:
-            case 151 /* SetAccessor */:
-            case 180 /* FunctionExpression */:
-            case 221 /* FunctionDeclaration */:
-            case 181 /* ArrowFunction */:
+            case 149 /* MethodDeclaration */:
+            case 148 /* MethodSignature */:
+            case 150 /* Constructor */:
+            case 151 /* GetAccessor */:
+            case 152 /* SetAccessor */:
+            case 184 /* FunctionExpression */:
+            case 225 /* FunctionDeclaration */:
+            case 185 /* ArrowFunction */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.asteriskToken) ||
@@ -13001,308 +13927,318 @@ var ts;
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.equalsGreaterThanToken) ||
                     visitNode(cbNode, node.body);
-            case 156 /* TypeReference */:
+            case 157 /* TypeReference */:
                 return visitNode(cbNode, node.typeName) ||
                     visitNodes(cbNodes, node.typeArguments);
-            case 155 /* TypePredicate */:
+            case 156 /* TypePredicate */:
                 return visitNode(cbNode, node.parameterName) ||
                     visitNode(cbNode, node.type);
-            case 159 /* TypeQuery */:
+            case 160 /* TypeQuery */:
                 return visitNode(cbNode, node.exprName);
-            case 160 /* TypeLiteral */:
+            case 161 /* TypeLiteral */:
                 return visitNodes(cbNodes, node.members);
-            case 161 /* ArrayType */:
+            case 162 /* ArrayType */:
                 return visitNode(cbNode, node.elementType);
-            case 162 /* TupleType */:
+            case 163 /* TupleType */:
                 return visitNodes(cbNodes, node.elementTypes);
-            case 163 /* UnionType */:
-            case 164 /* IntersectionType */:
+            case 164 /* UnionType */:
+            case 165 /* IntersectionType */:
                 return visitNodes(cbNodes, node.types);
-            case 165 /* ParenthesizedType */:
+            case 166 /* ParenthesizedType */:
+            case 168 /* TypeOperator */:
                 return visitNode(cbNode, node.type);
-            case 167 /* LiteralType */:
+            case 169 /* IndexedAccessType */:
+                return visitNode(cbNode, node.objectType) ||
+                    visitNode(cbNode, node.indexType);
+            case 170 /* MappedType */:
+                return visitNode(cbNode, node.readonlyToken) ||
+                    visitNode(cbNode, node.typeParameter) ||
+                    visitNode(cbNode, node.questionToken) ||
+                    visitNode(cbNode, node.type);
+            case 171 /* LiteralType */:
                 return visitNode(cbNode, node.literal);
-            case 168 /* ObjectBindingPattern */:
-            case 169 /* ArrayBindingPattern */:
+            case 172 /* ObjectBindingPattern */:
+            case 173 /* ArrayBindingPattern */:
                 return visitNodes(cbNodes, node.elements);
-            case 171 /* ArrayLiteralExpression */:
+            case 175 /* ArrayLiteralExpression */:
                 return visitNodes(cbNodes, node.elements);
-            case 172 /* ObjectLiteralExpression */:
+            case 176 /* ObjectLiteralExpression */:
                 return visitNodes(cbNodes, node.properties);
-            case 173 /* PropertyAccessExpression */:
+            case 177 /* PropertyAccessExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.name);
-            case 174 /* ElementAccessExpression */:
+            case 178 /* ElementAccessExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.argumentExpression);
-            case 175 /* CallExpression */:
-            case 176 /* NewExpression */:
+            case 179 /* CallExpression */:
+            case 180 /* NewExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNodes, node.typeArguments) ||
                     visitNodes(cbNodes, node.arguments);
-            case 177 /* TaggedTemplateExpression */:
+            case 181 /* TaggedTemplateExpression */:
                 return visitNode(cbNode, node.tag) ||
                     visitNode(cbNode, node.template);
-            case 178 /* TypeAssertionExpression */:
+            case 182 /* TypeAssertionExpression */:
                 return visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.expression);
-            case 179 /* ParenthesizedExpression */:
+            case 183 /* ParenthesizedExpression */:
                 return visitNode(cbNode, node.expression);
-            case 182 /* DeleteExpression */:
+            case 186 /* DeleteExpression */:
                 return visitNode(cbNode, node.expression);
-            case 183 /* TypeOfExpression */:
+            case 187 /* TypeOfExpression */:
                 return visitNode(cbNode, node.expression);
-            case 184 /* VoidExpression */:
+            case 188 /* VoidExpression */:
                 return visitNode(cbNode, node.expression);
-            case 186 /* PrefixUnaryExpression */:
+            case 190 /* PrefixUnaryExpression */:
                 return visitNode(cbNode, node.operand);
-            case 191 /* YieldExpression */:
+            case 195 /* YieldExpression */:
                 return visitNode(cbNode, node.asteriskToken) ||
                     visitNode(cbNode, node.expression);
-            case 185 /* AwaitExpression */:
+            case 189 /* AwaitExpression */:
                 return visitNode(cbNode, node.expression);
-            case 187 /* PostfixUnaryExpression */:
+            case 191 /* PostfixUnaryExpression */:
                 return visitNode(cbNode, node.operand);
-            case 188 /* BinaryExpression */:
+            case 192 /* BinaryExpression */:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.operatorToken) ||
                     visitNode(cbNode, node.right);
-            case 196 /* AsExpression */:
+            case 200 /* AsExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.type);
-            case 197 /* NonNullExpression */:
+            case 201 /* NonNullExpression */:
                 return visitNode(cbNode, node.expression);
-            case 189 /* ConditionalExpression */:
+            case 193 /* ConditionalExpression */:
                 return visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.whenTrue) ||
                     visitNode(cbNode, node.colonToken) ||
                     visitNode(cbNode, node.whenFalse);
-            case 192 /* SpreadElementExpression */:
+            case 196 /* SpreadElement */:
                 return visitNode(cbNode, node.expression);
-            case 200 /* Block */:
-            case 227 /* ModuleBlock */:
+            case 204 /* Block */:
+            case 231 /* ModuleBlock */:
                 return visitNodes(cbNodes, node.statements);
-            case 256 /* SourceFile */:
+            case 261 /* SourceFile */:
                 return visitNodes(cbNodes, node.statements) ||
                     visitNode(cbNode, node.endOfFileToken);
-            case 201 /* VariableStatement */:
+            case 205 /* VariableStatement */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.declarationList);
-            case 220 /* VariableDeclarationList */:
+            case 224 /* VariableDeclarationList */:
                 return visitNodes(cbNodes, node.declarations);
-            case 203 /* ExpressionStatement */:
+            case 207 /* ExpressionStatement */:
                 return visitNode(cbNode, node.expression);
-            case 204 /* IfStatement */:
+            case 208 /* IfStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.thenStatement) ||
                     visitNode(cbNode, node.elseStatement);
-            case 205 /* DoStatement */:
+            case 209 /* DoStatement */:
                 return visitNode(cbNode, node.statement) ||
                     visitNode(cbNode, node.expression);
-            case 206 /* WhileStatement */:
+            case 210 /* WhileStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 207 /* ForStatement */:
+            case 211 /* ForStatement */:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.incrementor) ||
                     visitNode(cbNode, node.statement);
-            case 208 /* ForInStatement */:
+            case 212 /* ForInStatement */:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 209 /* ForOfStatement */:
+            case 213 /* ForOfStatement */:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 210 /* ContinueStatement */:
-            case 211 /* BreakStatement */:
+            case 214 /* ContinueStatement */:
+            case 215 /* BreakStatement */:
                 return visitNode(cbNode, node.label);
-            case 212 /* ReturnStatement */:
+            case 216 /* ReturnStatement */:
                 return visitNode(cbNode, node.expression);
-            case 213 /* WithStatement */:
+            case 217 /* WithStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 214 /* SwitchStatement */:
+            case 218 /* SwitchStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.caseBlock);
-            case 228 /* CaseBlock */:
+            case 232 /* CaseBlock */:
                 return visitNodes(cbNodes, node.clauses);
-            case 249 /* CaseClause */:
+            case 253 /* CaseClause */:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNodes, node.statements);
-            case 250 /* DefaultClause */:
+            case 254 /* DefaultClause */:
                 return visitNodes(cbNodes, node.statements);
-            case 215 /* LabeledStatement */:
+            case 219 /* LabeledStatement */:
                 return visitNode(cbNode, node.label) ||
                     visitNode(cbNode, node.statement);
-            case 216 /* ThrowStatement */:
+            case 220 /* ThrowStatement */:
                 return visitNode(cbNode, node.expression);
-            case 217 /* TryStatement */:
+            case 221 /* TryStatement */:
                 return visitNode(cbNode, node.tryBlock) ||
                     visitNode(cbNode, node.catchClause) ||
                     visitNode(cbNode, node.finallyBlock);
-            case 252 /* CatchClause */:
+            case 256 /* CatchClause */:
                 return visitNode(cbNode, node.variableDeclaration) ||
                     visitNode(cbNode, node.block);
-            case 144 /* Decorator */:
+            case 145 /* Decorator */:
                 return visitNode(cbNode, node.expression);
-            case 222 /* ClassDeclaration */:
-            case 193 /* ClassExpression */:
+            case 226 /* ClassDeclaration */:
+            case 197 /* ClassExpression */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNodes, node.typeParameters) ||
                     visitNodes(cbNodes, node.heritageClauses) ||
                     visitNodes(cbNodes, node.members);
-            case 223 /* InterfaceDeclaration */:
+            case 227 /* InterfaceDeclaration */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNodes, node.typeParameters) ||
                     visitNodes(cbNodes, node.heritageClauses) ||
                     visitNodes(cbNodes, node.members);
-            case 224 /* TypeAliasDeclaration */:
+            case 228 /* TypeAliasDeclaration */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNodes, node.typeParameters) ||
                     visitNode(cbNode, node.type);
-            case 225 /* EnumDeclaration */:
+            case 229 /* EnumDeclaration */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNodes, node.members);
-            case 255 /* EnumMember */:
+            case 260 /* EnumMember */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 226 /* ModuleDeclaration */:
+            case 230 /* ModuleDeclaration */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.body);
-            case 230 /* ImportEqualsDeclaration */:
+            case 234 /* ImportEqualsDeclaration */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.moduleReference);
-            case 231 /* ImportDeclaration */:
+            case 235 /* ImportDeclaration */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.importClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 232 /* ImportClause */:
+            case 236 /* ImportClause */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.namedBindings);
-            case 229 /* NamespaceExportDeclaration */:
+            case 233 /* NamespaceExportDeclaration */:
                 return visitNode(cbNode, node.name);
-            case 233 /* NamespaceImport */:
+            case 237 /* NamespaceImport */:
                 return visitNode(cbNode, node.name);
-            case 234 /* NamedImports */:
-            case 238 /* NamedExports */:
+            case 238 /* NamedImports */:
+            case 242 /* NamedExports */:
                 return visitNodes(cbNodes, node.elements);
-            case 237 /* ExportDeclaration */:
+            case 241 /* ExportDeclaration */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.exportClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 235 /* ImportSpecifier */:
-            case 239 /* ExportSpecifier */:
+            case 239 /* ImportSpecifier */:
+            case 243 /* ExportSpecifier */:
                 return visitNode(cbNode, node.propertyName) ||
                     visitNode(cbNode, node.name);
-            case 236 /* ExportAssignment */:
+            case 240 /* ExportAssignment */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.expression);
-            case 190 /* TemplateExpression */:
+            case 194 /* TemplateExpression */:
                 return visitNode(cbNode, node.head) || visitNodes(cbNodes, node.templateSpans);
-            case 198 /* TemplateSpan */:
+            case 202 /* TemplateSpan */:
                 return visitNode(cbNode, node.expression) || visitNode(cbNode, node.literal);
-            case 141 /* ComputedPropertyName */:
+            case 142 /* ComputedPropertyName */:
                 return visitNode(cbNode, node.expression);
-            case 251 /* HeritageClause */:
+            case 255 /* HeritageClause */:
                 return visitNodes(cbNodes, node.types);
-            case 195 /* ExpressionWithTypeArguments */:
+            case 199 /* ExpressionWithTypeArguments */:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNodes, node.typeArguments);
-            case 241 /* ExternalModuleReference */:
+            case 245 /* ExternalModuleReference */:
                 return visitNode(cbNode, node.expression);
-            case 240 /* MissingDeclaration */:
+            case 244 /* MissingDeclaration */:
                 return visitNodes(cbNodes, node.decorators);
-            case 242 /* JsxElement */:
+            case 246 /* JsxElement */:
                 return visitNode(cbNode, node.openingElement) ||
                     visitNodes(cbNodes, node.children) ||
                     visitNode(cbNode, node.closingElement);
-            case 243 /* JsxSelfClosingElement */:
-            case 244 /* JsxOpeningElement */:
+            case 247 /* JsxSelfClosingElement */:
+            case 248 /* JsxOpeningElement */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNodes(cbNodes, node.attributes);
-            case 246 /* JsxAttribute */:
+            case 250 /* JsxAttribute */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 247 /* JsxSpreadAttribute */:
+            case 251 /* JsxSpreadAttribute */:
                 return visitNode(cbNode, node.expression);
-            case 248 /* JsxExpression */:
+            case 252 /* JsxExpression */:
                 return visitNode(cbNode, node.expression);
-            case 245 /* JsxClosingElement */:
+            case 249 /* JsxClosingElement */:
                 return visitNode(cbNode, node.tagName);
-            case 257 /* JSDocTypeExpression */:
+            case 262 /* JSDocTypeExpression */:
                 return visitNode(cbNode, node.type);
-            case 261 /* JSDocUnionType */:
+            case 266 /* JSDocUnionType */:
                 return visitNodes(cbNodes, node.types);
-            case 262 /* JSDocTupleType */:
+            case 267 /* JSDocTupleType */:
                 return visitNodes(cbNodes, node.types);
-            case 260 /* JSDocArrayType */:
+            case 265 /* JSDocArrayType */:
                 return visitNode(cbNode, node.elementType);
-            case 264 /* JSDocNonNullableType */:
+            case 269 /* JSDocNonNullableType */:
                 return visitNode(cbNode, node.type);
-            case 263 /* JSDocNullableType */:
+            case 268 /* JSDocNullableType */:
                 return visitNode(cbNode, node.type);
-            case 265 /* JSDocRecordType */:
+            case 270 /* JSDocRecordType */:
                 return visitNode(cbNode, node.literal);
-            case 267 /* JSDocTypeReference */:
+            case 272 /* JSDocTypeReference */:
                 return visitNode(cbNode, node.name) ||
                     visitNodes(cbNodes, node.typeArguments);
-            case 268 /* JSDocOptionalType */:
+            case 273 /* JSDocOptionalType */:
                 return visitNode(cbNode, node.type);
-            case 269 /* JSDocFunctionType */:
+            case 274 /* JSDocFunctionType */:
                 return visitNodes(cbNodes, node.parameters) ||
                     visitNode(cbNode, node.type);
-            case 270 /* JSDocVariadicType */:
+            case 275 /* JSDocVariadicType */:
                 return visitNode(cbNode, node.type);
-            case 271 /* JSDocConstructorType */:
+            case 276 /* JSDocConstructorType */:
                 return visitNode(cbNode, node.type);
-            case 272 /* JSDocThisType */:
+            case 277 /* JSDocThisType */:
                 return visitNode(cbNode, node.type);
-            case 266 /* JSDocRecordMember */:
+            case 271 /* JSDocRecordMember */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.type);
-            case 273 /* JSDocComment */:
+            case 278 /* JSDocComment */:
                 return visitNodes(cbNodes, node.tags);
-            case 275 /* JSDocParameterTag */:
+            case 280 /* JSDocParameterTag */:
                 return visitNode(cbNode, node.preParameterName) ||
                     visitNode(cbNode, node.typeExpression) ||
                     visitNode(cbNode, node.postParameterName);
-            case 276 /* JSDocReturnTag */:
+            case 281 /* JSDocReturnTag */:
                 return visitNode(cbNode, node.typeExpression);
-            case 277 /* JSDocTypeTag */:
+            case 282 /* JSDocTypeTag */:
                 return visitNode(cbNode, node.typeExpression);
-            case 278 /* JSDocTemplateTag */:
+            case 283 /* JSDocTemplateTag */:
                 return visitNodes(cbNodes, node.typeParameters);
-            case 279 /* JSDocTypedefTag */:
+            case 284 /* JSDocTypedefTag */:
                 return visitNode(cbNode, node.typeExpression) ||
+                    visitNode(cbNode, node.fullName) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.jsDocTypeLiteral);
-            case 281 /* JSDocTypeLiteral */:
+            case 286 /* JSDocTypeLiteral */:
                 return visitNodes(cbNodes, node.jsDocPropertyTags);
-            case 280 /* JSDocPropertyTag */:
+            case 285 /* JSDocPropertyTag */:
                 return visitNode(cbNode, node.typeExpression) ||
                     visitNode(cbNode, node.name);
-            case 288 /* PartiallyEmittedExpression */:
+            case 293 /* PartiallyEmittedExpression */:
                 return visitNode(cbNode, node.expression);
-            case 282 /* JSDocLiteralType */:
+            case 287 /* JSDocLiteralType */:
                 return visitNode(cbNode, node.literal);
         }
     }
@@ -13316,6 +14252,10 @@ var ts;
         return result;
     }
     ts.createSourceFile = createSourceFile;
+    function parseIsolatedEntityName(text, languageVersion) {
+        return Parser.parseIsolatedEntityName(text, languageVersion);
+    }
+    ts.parseIsolatedEntityName = parseIsolatedEntityName;
     function isExternalModule(file) {
         return file.externalModuleIndicator !== undefined;
     }
@@ -13357,8 +14297,8 @@ 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(4 /* Latest */, /*skipTrivia*/ true);
-        var disallowInAndDecoratorContext = 32768 /* DisallowInContext */ | 131072 /* DecoratorContext */;
+        var scanner = ts.createScanner(5 /* Latest */, /*skipTrivia*/ true);
+        var disallowInAndDecoratorContext = 65536 /* DisallowInContext */ | 262144 /* DecoratorContext */;
         // capture constructors in 'initializeState' to avoid null checks
         var NodeConstructor;
         var TokenConstructor;
@@ -13456,6 +14396,16 @@ var ts;
             return result;
         }
         Parser.parseSourceFile = parseSourceFile;
+        function parseIsolatedEntityName(content, languageVersion) {
+            initializeState(content, languageVersion, /*syntaxCursor*/ undefined, 1 /* JS */);
+            // Prime the scanner.
+            nextToken();
+            var entityName = parseEntityName(/*allowReservedWords*/ true);
+            var isInvalid = token() === 1 /* EndOfFileToken */ && !parseDiagnostics.length;
+            clearState();
+            return isInvalid ? entityName : undefined;
+        }
+        Parser.parseIsolatedEntityName = parseIsolatedEntityName;
         function getLanguageVariant(scriptKind) {
             // .tsx and .jsx files are treated as jsx language variant.
             return scriptKind === 4 /* TSX */ || scriptKind === 2 /* JSX */ || scriptKind === 1 /* JS */ ? 1 /* JSX */ : 0 /* Standard */;
@@ -13472,7 +14422,7 @@ var ts;
             identifiers = ts.createMap();
             identifierCount = 0;
             nodeCount = 0;
-            contextFlags = scriptKind === 1 /* JS */ || scriptKind === 2 /* JSX */ ? 1048576 /* JavaScriptFile */ : 0 /* None */;
+            contextFlags = scriptKind === 1 /* JS */ || scriptKind === 2 /* JSX */ ? 2097152 /* JavaScriptFile */ : 0 /* None */;
             parseErrorBeforeNextFinishedNode = false;
             // Initialize and prime the scanner before parsing the source elements.
             scanner.setText(sourceText);
@@ -13560,7 +14510,7 @@ var ts;
         function createSourceFile(fileName, languageVersion, scriptKind) {
             // 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(256 /* SourceFile */, /*pos*/ 0, /* end */ sourceText.length);
+            var sourceFile = new SourceFileConstructor(261 /* SourceFile */, /*pos*/ 0, /* end */ sourceText.length);
             nodeCount++;
             sourceFile.text = sourceText;
             sourceFile.bindDiagnostics = [];
@@ -13580,16 +14530,16 @@ var ts;
             }
         }
         function setDisallowInContext(val) {
-            setContextFlag(val, 32768 /* DisallowInContext */);
+            setContextFlag(val, 65536 /* DisallowInContext */);
         }
         function setYieldContext(val) {
-            setContextFlag(val, 65536 /* YieldContext */);
+            setContextFlag(val, 131072 /* YieldContext */);
         }
         function setDecoratorContext(val) {
-            setContextFlag(val, 131072 /* DecoratorContext */);
+            setContextFlag(val, 262144 /* DecoratorContext */);
         }
         function setAwaitContext(val) {
-            setContextFlag(val, 262144 /* AwaitContext */);
+            setContextFlag(val, 524288 /* AwaitContext */);
         }
         function doOutsideOfContext(context, func) {
             // contextFlagsToClear will contain only the context flags that are
@@ -13630,40 +14580,40 @@ var ts;
             return func();
         }
         function allowInAnd(func) {
-            return doOutsideOfContext(32768 /* DisallowInContext */, func);
+            return doOutsideOfContext(65536 /* DisallowInContext */, func);
         }
         function disallowInAnd(func) {
-            return doInsideOfContext(32768 /* DisallowInContext */, func);
+            return doInsideOfContext(65536 /* DisallowInContext */, func);
         }
         function doInYieldContext(func) {
-            return doInsideOfContext(65536 /* YieldContext */, func);
+            return doInsideOfContext(131072 /* YieldContext */, func);
         }
         function doInDecoratorContext(func) {
-            return doInsideOfContext(131072 /* DecoratorContext */, func);
+            return doInsideOfContext(262144 /* DecoratorContext */, func);
         }
         function doInAwaitContext(func) {
-            return doInsideOfContext(262144 /* AwaitContext */, func);
+            return doInsideOfContext(524288 /* AwaitContext */, func);
         }
         function doOutsideOfAwaitContext(func) {
-            return doOutsideOfContext(262144 /* AwaitContext */, func);
+            return doOutsideOfContext(524288 /* AwaitContext */, func);
         }
         function doInYieldAndAwaitContext(func) {
-            return doInsideOfContext(65536 /* YieldContext */ | 262144 /* AwaitContext */, func);
+            return doInsideOfContext(131072 /* YieldContext */ | 524288 /* AwaitContext */, func);
         }
         function inContext(flags) {
             return (contextFlags & flags) !== 0;
         }
         function inYieldContext() {
-            return inContext(65536 /* YieldContext */);
+            return inContext(131072 /* YieldContext */);
         }
         function inDisallowInContext() {
-            return inContext(32768 /* DisallowInContext */);
+            return inContext(65536 /* DisallowInContext */);
         }
         function inDecoratorContext() {
-            return inContext(131072 /* DecoratorContext */);
+            return inContext(262144 /* DecoratorContext */);
         }
         function inAwaitContext() {
-            return inContext(262144 /* AwaitContext */);
+            return inContext(524288 /* AwaitContext */);
         }
         function parseErrorAtCurrentToken(message, arg0) {
             var start = scanner.getTokenPos();
@@ -13844,7 +14794,7 @@ var ts;
             if (!(pos >= 0)) {
                 pos = scanner.getStartPos();
             }
-            return kind >= 140 /* FirstNode */ ? new NodeConstructor(kind, pos, pos) :
+            return kind >= 141 /* FirstNode */ ? new NodeConstructor(kind, pos, pos) :
                 kind === 70 /* Identifier */ ? new IdentifierConstructor(kind, pos, pos) :
                     new TokenConstructor(kind, pos, pos);
         }
@@ -13867,7 +14817,7 @@ var ts;
             // flag so that we don't mark any subsequent nodes.
             if (parseErrorBeforeNextFinishedNode) {
                 parseErrorBeforeNextFinishedNode = false;
-                node.flags |= 524288 /* ThisNodeHasError */;
+                node.flags |= 1048576 /* ThisNodeHasError */;
             }
             return node;
         }
@@ -13936,7 +14886,7 @@ var ts;
             // PropertyName [Yield]:
             //      LiteralPropertyName
             //      ComputedPropertyName[?Yield]
-            var node = createNode(141 /* ComputedPropertyName */);
+            var node = createNode(142 /* ComputedPropertyName */);
             parseExpected(20 /* OpenBracketToken */);
             // We parse any expression (including a comma expression). But the grammar
             // says that only an assignment expression is allowed, so the grammar checker
@@ -14023,9 +14973,11 @@ var ts;
                     // which would be a candidate for improved error reporting.
                     return token() === 20 /* OpenBracketToken */ || isLiteralPropertyName();
                 case 12 /* ObjectLiteralMembers */:
-                    return token() === 20 /* OpenBracketToken */ || token() === 38 /* AsteriskToken */ || isLiteralPropertyName();
+                    return token() === 20 /* OpenBracketToken */ || token() === 38 /* AsteriskToken */ || token() === 23 /* DotDotDotToken */ || isLiteralPropertyName();
+                case 17 /* RestProperties */:
+                    return isLiteralPropertyName();
                 case 9 /* ObjectBindingElements */:
-                    return token() === 20 /* OpenBracketToken */ || isLiteralPropertyName();
+                    return token() === 20 /* OpenBracketToken */ || token() === 23 /* DotDotDotToken */ || isLiteralPropertyName();
                 case 7 /* HeritageClauseElement */:
                     // If we see { } then only consume it as an expression if it is followed by , or {
                     // That way we won't consume the body of a class in its heritage clause.
@@ -14045,29 +14997,29 @@ var ts;
                     return isIdentifierOrPattern();
                 case 10 /* ArrayBindingElements */:
                     return token() === 25 /* CommaToken */ || token() === 23 /* DotDotDotToken */ || isIdentifierOrPattern();
-                case 17 /* TypeParameters */:
+                case 18 /* TypeParameters */:
                     return isIdentifier();
                 case 11 /* ArgumentExpressions */:
                 case 15 /* ArrayLiteralMembers */:
                     return token() === 25 /* CommaToken */ || token() === 23 /* DotDotDotToken */ || isStartOfExpression();
                 case 16 /* Parameters */:
                     return isStartOfParameter();
-                case 18 /* TypeArguments */:
-                case 19 /* TupleElementTypes */:
+                case 19 /* TypeArguments */:
+                case 20 /* TupleElementTypes */:
                     return token() === 25 /* CommaToken */ || isStartOfType();
-                case 20 /* HeritageClauses */:
+                case 21 /* HeritageClauses */:
                     return isHeritageClause();
-                case 21 /* ImportOrExportSpecifiers */:
+                case 22 /* ImportOrExportSpecifiers */:
                     return ts.tokenIsIdentifierOrKeyword(token());
                 case 13 /* JsxAttributes */:
                     return ts.tokenIsIdentifierOrKeyword(token()) || token() === 16 /* OpenBraceToken */;
                 case 14 /* JsxChildren */:
                     return true;
-                case 22 /* JSDocFunctionParameters */:
-                case 23 /* JSDocTypeArguments */:
-                case 25 /* JSDocTupleTypes */:
+                case 23 /* JSDocFunctionParameters */:
+                case 24 /* JSDocTypeArguments */:
+                case 26 /* JSDocTupleTypes */:
                     return JSDocParser.isJSDocType();
-                case 24 /* JSDocRecordMembers */:
+                case 25 /* JSDocRecordMembers */:
                     return isSimplePropertyName();
             }
             ts.Debug.fail("Non-exhaustive case in 'isListElement'.");
@@ -14120,7 +15072,7 @@ var ts;
                 case 6 /* EnumMembers */:
                 case 12 /* ObjectLiteralMembers */:
                 case 9 /* ObjectBindingElements */:
-                case 21 /* ImportOrExportSpecifiers */:
+                case 22 /* ImportOrExportSpecifiers */:
                     return token() === 17 /* CloseBraceToken */;
                 case 3 /* SwitchClauseStatements */:
                     return token() === 17 /* CloseBraceToken */ || token() === 72 /* CaseKeyword */ || token() === 78 /* DefaultKeyword */;
@@ -14128,35 +15080,36 @@ var ts;
                     return token() === 16 /* OpenBraceToken */ || token() === 84 /* ExtendsKeyword */ || token() === 107 /* ImplementsKeyword */;
                 case 8 /* VariableDeclarations */:
                     return isVariableDeclaratorListTerminator();
-                case 17 /* TypeParameters */:
+                case 18 /* TypeParameters */:
                     // Tokens other than '>' are here for better error recovery
                     return token() === 28 /* GreaterThanToken */ || token() === 18 /* OpenParenToken */ || token() === 16 /* OpenBraceToken */ || token() === 84 /* ExtendsKeyword */ || token() === 107 /* ImplementsKeyword */;
                 case 11 /* ArgumentExpressions */:
                     // Tokens other than ')' are here for better error recovery
                     return token() === 19 /* CloseParenToken */ || token() === 24 /* SemicolonToken */;
                 case 15 /* ArrayLiteralMembers */:
-                case 19 /* TupleElementTypes */:
+                case 20 /* TupleElementTypes */:
                 case 10 /* ArrayBindingElements */:
                     return token() === 21 /* CloseBracketToken */;
                 case 16 /* Parameters */:
+                case 17 /* RestProperties */:
                     // Tokens other than ')' and ']' (the latter for index signatures) are here for better error recovery
                     return token() === 19 /* CloseParenToken */ || token() === 21 /* CloseBracketToken */ /*|| token === SyntaxKind.OpenBraceToken*/;
-                case 18 /* TypeArguments */:
+                case 19 /* TypeArguments */:
                     // All other tokens should cause the type-argument to terminate except comma token
                     return token() !== 25 /* CommaToken */;
-                case 20 /* HeritageClauses */:
+                case 21 /* HeritageClauses */:
                     return token() === 16 /* OpenBraceToken */ || token() === 17 /* CloseBraceToken */;
                 case 13 /* JsxAttributes */:
                     return token() === 28 /* GreaterThanToken */ || token() === 40 /* SlashToken */;
                 case 14 /* JsxChildren */:
                     return token() === 26 /* LessThanToken */ && lookAhead(nextTokenIsSlash);
-                case 22 /* JSDocFunctionParameters */:
+                case 23 /* JSDocFunctionParameters */:
                     return token() === 19 /* CloseParenToken */ || token() === 55 /* ColonToken */ || token() === 17 /* CloseBraceToken */;
-                case 23 /* JSDocTypeArguments */:
+                case 24 /* JSDocTypeArguments */:
                     return token() === 28 /* GreaterThanToken */ || token() === 17 /* CloseBraceToken */;
-                case 25 /* JSDocTupleTypes */:
+                case 26 /* JSDocTupleTypes */:
                     return token() === 21 /* CloseBracketToken */ || token() === 17 /* CloseBraceToken */;
-                case 24 /* JSDocRecordMembers */:
+                case 25 /* JSDocRecordMembers */:
                     return token() === 17 /* CloseBraceToken */;
             }
         }
@@ -14183,7 +15136,7 @@ var ts;
         }
         // True if positioned at element or terminator of the current list or any enclosing list
         function isInSomeParsingContext() {
-            for (var kind = 0; kind < 26 /* Count */; kind++) {
+            for (var kind = 0; kind < 27 /* Count */; kind++) {
                 if (parsingContext & (1 << kind)) {
                     if (isListElement(kind, /*inErrorRecovery*/ true) || isListTerminator(kind)) {
                         return true;
@@ -14258,7 +15211,7 @@ var ts;
             // differently depending on what mode it is in.
             //
             // This also applies to all our other context flags as well.
-            var nodeContextFlags = node.flags & 1540096 /* ContextFlags */;
+            var nodeContextFlags = node.flags & 3080192 /* ContextFlags */;
             if (nodeContextFlags !== contextFlags) {
                 return undefined;
             }
@@ -14293,20 +15246,22 @@ var ts;
                     return isReusableVariableDeclaration(node);
                 case 16 /* Parameters */:
                     return isReusableParameter(node);
+                case 17 /* RestProperties */:
+                    return false;
                 // Any other lists we do not care about reusing nodes in.  But feel free to add if
                 // you can do so safely.  Danger areas involve nodes that may involve speculative
                 // parsing.  If speculative parsing is involved with the node, then the range the
                 // parser reached while looking ahead might be in the edited range (see the example
                 // in canReuseVariableDeclaratorNode for a good case of this).
-                case 20 /* HeritageClauses */:
+                case 21 /* HeritageClauses */:
                 // This would probably be safe to reuse.  There is no speculative parsing with
                 // heritage clauses.
-                case 17 /* TypeParameters */:
+                case 18 /* TypeParameters */:
                 // This would probably be safe to reuse.  There is no speculative parsing with
                 // type parameters.  Note that that's because type *parameters* only occur in
                 // unambiguous *type* contexts.  While type *arguments* occur in very ambiguous
                 // *expression* contexts.
-                case 19 /* TupleElementTypes */:
+                case 20 /* TupleElementTypes */:
                 // This would probably be safe to reuse.  There is no speculative parsing with
                 // tuple types.
                 // Technically, type argument list types are probably safe to reuse.  While
@@ -14314,7 +15269,7 @@ var ts;
                 // produced from speculative parsing a < as a type argument list), we only have
                 // the types because speculative parsing succeeded.  Thus, the lookahead never
                 // went past the end of the list and rewound.
-                case 18 /* TypeArguments */:
+                case 19 /* TypeArguments */:
                 // Note: these are almost certainly not safe to ever reuse.  Expressions commonly
                 // need a large amount of lookahead, and we should not reuse them as they may
                 // have actually intersected the edit.
@@ -14338,14 +15293,14 @@ var ts;
         function isReusableClassMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 149 /* Constructor */:
-                    case 154 /* IndexSignature */:
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
-                    case 146 /* PropertyDeclaration */:
-                    case 199 /* SemicolonClassElement */:
+                    case 150 /* Constructor */:
+                    case 155 /* IndexSignature */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* SetAccessor */:
+                    case 147 /* PropertyDeclaration */:
+                    case 203 /* SemicolonClassElement */:
                         return true;
-                    case 148 /* MethodDeclaration */:
+                    case 149 /* 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.
@@ -14360,8 +15315,8 @@ var ts;
         function isReusableSwitchClause(node) {
             if (node) {
                 switch (node.kind) {
-                    case 249 /* CaseClause */:
-                    case 250 /* DefaultClause */:
+                    case 253 /* CaseClause */:
+                    case 254 /* DefaultClause */:
                         return true;
                 }
             }
@@ -14370,58 +15325,58 @@ var ts;
         function isReusableStatement(node) {
             if (node) {
                 switch (node.kind) {
-                    case 221 /* FunctionDeclaration */:
-                    case 201 /* VariableStatement */:
-                    case 200 /* Block */:
-                    case 204 /* IfStatement */:
-                    case 203 /* ExpressionStatement */:
-                    case 216 /* ThrowStatement */:
-                    case 212 /* ReturnStatement */:
-                    case 214 /* SwitchStatement */:
-                    case 211 /* BreakStatement */:
-                    case 210 /* ContinueStatement */:
-                    case 208 /* ForInStatement */:
-                    case 209 /* ForOfStatement */:
-                    case 207 /* ForStatement */:
-                    case 206 /* WhileStatement */:
-                    case 213 /* WithStatement */:
-                    case 202 /* EmptyStatement */:
-                    case 217 /* TryStatement */:
-                    case 215 /* LabeledStatement */:
-                    case 205 /* DoStatement */:
-                    case 218 /* DebuggerStatement */:
-                    case 231 /* ImportDeclaration */:
-                    case 230 /* ImportEqualsDeclaration */:
-                    case 237 /* ExportDeclaration */:
-                    case 236 /* ExportAssignment */:
-                    case 226 /* ModuleDeclaration */:
-                    case 222 /* ClassDeclaration */:
-                    case 223 /* InterfaceDeclaration */:
-                    case 225 /* EnumDeclaration */:
-                    case 224 /* TypeAliasDeclaration */:
+                    case 225 /* FunctionDeclaration */:
+                    case 205 /* VariableStatement */:
+                    case 204 /* Block */:
+                    case 208 /* IfStatement */:
+                    case 207 /* ExpressionStatement */:
+                    case 220 /* ThrowStatement */:
+                    case 216 /* ReturnStatement */:
+                    case 218 /* SwitchStatement */:
+                    case 215 /* BreakStatement */:
+                    case 214 /* ContinueStatement */:
+                    case 212 /* ForInStatement */:
+                    case 213 /* ForOfStatement */:
+                    case 211 /* ForStatement */:
+                    case 210 /* WhileStatement */:
+                    case 217 /* WithStatement */:
+                    case 206 /* EmptyStatement */:
+                    case 221 /* TryStatement */:
+                    case 219 /* LabeledStatement */:
+                    case 209 /* DoStatement */:
+                    case 222 /* DebuggerStatement */:
+                    case 235 /* ImportDeclaration */:
+                    case 234 /* ImportEqualsDeclaration */:
+                    case 241 /* ExportDeclaration */:
+                    case 240 /* ExportAssignment */:
+                    case 230 /* ModuleDeclaration */:
+                    case 226 /* ClassDeclaration */:
+                    case 227 /* InterfaceDeclaration */:
+                    case 229 /* EnumDeclaration */:
+                    case 228 /* TypeAliasDeclaration */:
                         return true;
                 }
             }
             return false;
         }
         function isReusableEnumMember(node) {
-            return node.kind === 255 /* EnumMember */;
+            return node.kind === 260 /* EnumMember */;
         }
         function isReusableTypeMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 153 /* ConstructSignature */:
-                    case 147 /* MethodSignature */:
-                    case 154 /* IndexSignature */:
-                    case 145 /* PropertySignature */:
-                    case 152 /* CallSignature */:
+                    case 154 /* ConstructSignature */:
+                    case 148 /* MethodSignature */:
+                    case 155 /* IndexSignature */:
+                    case 146 /* PropertySignature */:
+                    case 153 /* CallSignature */:
                         return true;
                 }
             }
             return false;
         }
         function isReusableVariableDeclaration(node) {
-            if (node.kind !== 219 /* VariableDeclaration */) {
+            if (node.kind !== 223 /* VariableDeclaration */) {
                 return false;
             }
             // Very subtle incremental parsing bug.  Consider the following code:
@@ -14442,7 +15397,7 @@ var ts;
             return variableDeclarator.initializer === undefined;
         }
         function isReusableParameter(node) {
-            if (node.kind !== 143 /* Parameter */) {
+            if (node.kind !== 144 /* Parameter */) {
                 return false;
             }
             // See the comment in isReusableVariableDeclaration for why we do this.
@@ -14464,6 +15419,7 @@ var ts;
                 case 1 /* BlockStatements */: return ts.Diagnostics.Declaration_or_statement_expected;
                 case 2 /* SwitchClauses */: return ts.Diagnostics.case_or_default_expected;
                 case 3 /* SwitchClauseStatements */: return ts.Diagnostics.Statement_expected;
+                case 17 /* RestProperties */: // fallthrough
                 case 4 /* TypeMembers */: return ts.Diagnostics.Property_or_signature_expected;
                 case 5 /* ClassMembers */: return ts.Diagnostics.Unexpected_token_A_constructor_method_accessor_or_property_was_expected;
                 case 6 /* EnumMembers */: return ts.Diagnostics.Enum_member_expected;
@@ -14475,17 +15431,17 @@ var ts;
                 case 12 /* ObjectLiteralMembers */: return ts.Diagnostics.Property_assignment_expected;
                 case 15 /* ArrayLiteralMembers */: return ts.Diagnostics.Expression_or_comma_expected;
                 case 16 /* Parameters */: return ts.Diagnostics.Parameter_declaration_expected;
-                case 17 /* TypeParameters */: return ts.Diagnostics.Type_parameter_declaration_expected;
-                case 18 /* TypeArguments */: return ts.Diagnostics.Type_argument_expected;
-                case 19 /* TupleElementTypes */: return ts.Diagnostics.Type_expected;
-                case 20 /* HeritageClauses */: return ts.Diagnostics.Unexpected_token_expected;
-                case 21 /* ImportOrExportSpecifiers */: return ts.Diagnostics.Identifier_expected;
+                case 18 /* TypeParameters */: return ts.Diagnostics.Type_parameter_declaration_expected;
+                case 19 /* TypeArguments */: return ts.Diagnostics.Type_argument_expected;
+                case 20 /* TupleElementTypes */: return ts.Diagnostics.Type_expected;
+                case 21 /* HeritageClauses */: return ts.Diagnostics.Unexpected_token_expected;
+                case 22 /* ImportOrExportSpecifiers */: return ts.Diagnostics.Identifier_expected;
                 case 13 /* JsxAttributes */: return ts.Diagnostics.Identifier_expected;
                 case 14 /* JsxChildren */: return ts.Diagnostics.Identifier_expected;
-                case 22 /* JSDocFunctionParameters */: return ts.Diagnostics.Parameter_declaration_expected;
-                case 23 /* JSDocTypeArguments */: return ts.Diagnostics.Type_argument_expected;
-                case 25 /* JSDocTupleTypes */: return ts.Diagnostics.Type_expected;
-                case 24 /* JSDocRecordMembers */: return ts.Diagnostics.Property_assignment_expected;
+                case 23 /* JSDocFunctionParameters */: return ts.Diagnostics.Parameter_declaration_expected;
+                case 24 /* JSDocTypeArguments */: return ts.Diagnostics.Type_argument_expected;
+                case 26 /* JSDocTupleTypes */: return ts.Diagnostics.Type_expected;
+                case 25 /* JSDocRecordMembers */: return ts.Diagnostics.Property_assignment_expected;
             }
         }
         ;
@@ -14554,7 +15510,7 @@ var ts;
         function parseEntityName(allowReservedWords, diagnosticMessage) {
             var entity = parseIdentifier(diagnosticMessage);
             while (parseOptional(22 /* DotToken */)) {
-                var node = createNode(140 /* QualifiedName */, entity.pos); // !!!
+                var node = createNode(141 /* QualifiedName */, entity.pos); // !!!
                 node.left = entity;
                 node.right = parseRightSideOfDot(allowReservedWords);
                 entity = finishNode(node);
@@ -14593,7 +15549,7 @@ var ts;
             return allowIdentifierNames ? parseIdentifierName() : parseIdentifier();
         }
         function parseTemplateExpression() {
-            var template = createNode(190 /* TemplateExpression */);
+            var template = createNode(194 /* TemplateExpression */);
             template.head = parseTemplateHead();
             ts.Debug.assert(template.head.kind === 13 /* TemplateHead */, "Template head has wrong token kind");
             var templateSpans = createNodeArray();
@@ -14605,7 +15561,7 @@ var ts;
             return finishNode(template);
         }
         function parseTemplateSpan() {
-            var span = createNode(198 /* TemplateSpan */);
+            var span = createNode(202 /* TemplateSpan */);
             span.expression = allowInAnd(parseExpression);
             var literal;
             if (token() === 17 /* CloseBraceToken */) {
@@ -14660,33 +15616,33 @@ var ts;
         // TYPES
         function parseTypeReference() {
             var typeName = parseEntityName(/*allowReservedWords*/ false, ts.Diagnostics.Type_expected);
-            var node = createNode(156 /* TypeReference */, typeName.pos);
+            var node = createNode(157 /* TypeReference */, typeName.pos);
             node.typeName = typeName;
             if (!scanner.hasPrecedingLineBreak() && token() === 26 /* LessThanToken */) {
-                node.typeArguments = parseBracketedList(18 /* TypeArguments */, parseType, 26 /* LessThanToken */, 28 /* GreaterThanToken */);
+                node.typeArguments = parseBracketedList(19 /* TypeArguments */, parseType, 26 /* LessThanToken */, 28 /* GreaterThanToken */);
             }
             return finishNode(node);
         }
         function parseThisTypePredicate(lhs) {
             nextToken();
-            var node = createNode(155 /* TypePredicate */, lhs.pos);
+            var node = createNode(156 /* TypePredicate */, lhs.pos);
             node.parameterName = lhs;
             node.type = parseType();
             return finishNode(node);
         }
         function parseThisTypeNode() {
-            var node = createNode(166 /* ThisType */);
+            var node = createNode(167 /* ThisType */);
             nextToken();
             return finishNode(node);
         }
         function parseTypeQuery() {
-            var node = createNode(159 /* TypeQuery */);
+            var node = createNode(160 /* TypeQuery */);
             parseExpected(102 /* TypeOfKeyword */);
             node.exprName = parseEntityName(/*allowReservedWords*/ true);
             return finishNode(node);
         }
         function parseTypeParameter() {
-            var node = createNode(142 /* TypeParameter */);
+            var node = createNode(143 /* TypeParameter */);
             node.name = parseIdentifier();
             if (parseOptional(84 /* ExtendsKeyword */)) {
                 // It's not uncommon for people to write improper constraints to a generic.  If the
@@ -14711,7 +15667,7 @@ var ts;
         }
         function parseTypeParameters() {
             if (token() === 26 /* LessThanToken */) {
-                return parseBracketedList(17 /* TypeParameters */, parseTypeParameter, 26 /* LessThanToken */, 28 /* GreaterThanToken */);
+                return parseBracketedList(18 /* TypeParameters */, parseTypeParameter, 26 /* LessThanToken */, 28 /* GreaterThanToken */);
             }
         }
         function parseParameterType() {
@@ -14724,7 +15680,7 @@ var ts;
             return token() === 23 /* DotDotDotToken */ || isIdentifierOrPattern() || ts.isModifierKind(token()) || token() === 56 /* AtToken */ || token() === 98 /* ThisKeyword */;
         }
         function parseParameter() {
-            var node = createNode(143 /* Parameter */);
+            var node = createNode(144 /* Parameter */);
             if (token() === 98 /* ThisKeyword */) {
                 node.name = createIdentifier(/*isIdentifier*/ true, undefined);
                 node.type = parseParameterType();
@@ -14823,7 +15779,7 @@ var ts;
         }
         function parseSignatureMember(kind) {
             var node = createNode(kind);
-            if (kind === 153 /* ConstructSignature */) {
+            if (kind === 154 /* ConstructSignature */) {
                 parseExpected(93 /* NewKeyword */);
             }
             fillSignature(55 /* ColonToken */, /*yieldContext*/ false, /*awaitContext*/ false, /*requireCompleteParameterList*/ false, node);
@@ -14887,7 +15843,7 @@ var ts;
             return token() === 55 /* ColonToken */ || token() === 25 /* CommaToken */ || token() === 21 /* CloseBracketToken */;
         }
         function parseIndexSignatureDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(154 /* IndexSignature */, fullStart);
+            var node = createNode(155 /* IndexSignature */, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             node.parameters = parseBracketedList(16 /* Parameters */, parseParameter, 20 /* OpenBracketToken */, 21 /* CloseBracketToken */);
@@ -14899,7 +15855,7 @@ var ts;
             var name = parsePropertyName();
             var questionToken = parseOptionalToken(54 /* QuestionToken */);
             if (token() === 18 /* OpenParenToken */ || token() === 26 /* LessThanToken */) {
-                var method = createNode(147 /* MethodSignature */, fullStart);
+                var method = createNode(148 /* MethodSignature */, fullStart);
                 method.modifiers = modifiers;
                 method.name = name;
                 method.questionToken = questionToken;
@@ -14910,7 +15866,7 @@ var ts;
                 return addJSDocComment(finishNode(method));
             }
             else {
-                var property = createNode(145 /* PropertySignature */, fullStart);
+                var property = createNode(146 /* PropertySignature */, fullStart);
                 property.modifiers = modifiers;
                 property.name = name;
                 property.questionToken = questionToken;
@@ -14959,10 +15915,10 @@ var ts;
         }
         function parseTypeMember() {
             if (token() === 18 /* OpenParenToken */ || token() === 26 /* LessThanToken */) {
-                return parseSignatureMember(152 /* CallSignature */);
+                return parseSignatureMember(153 /* CallSignature */);
             }
             if (token() === 93 /* NewKeyword */ && lookAhead(isStartOfConstructSignature)) {
-                return parseSignatureMember(153 /* ConstructSignature */);
+                return parseSignatureMember(154 /* ConstructSignature */);
             }
             var fullStart = getNodePos();
             var modifiers = parseModifiers();
@@ -14976,7 +15932,7 @@ var ts;
             return token() === 18 /* OpenParenToken */ || token() === 26 /* LessThanToken */;
         }
         function parseTypeLiteral() {
-            var node = createNode(160 /* TypeLiteral */);
+            var node = createNode(161 /* TypeLiteral */);
             node.members = parseObjectTypeMembers();
             return finishNode(node);
         }
@@ -14991,13 +15947,40 @@ var ts;
             }
             return members;
         }
+        function isStartOfMappedType() {
+            nextToken();
+            if (token() === 130 /* ReadonlyKeyword */) {
+                nextToken();
+            }
+            return token() === 20 /* OpenBracketToken */ && nextTokenIsIdentifier() && nextToken() === 91 /* InKeyword */;
+        }
+        function parseMappedTypeParameter() {
+            var node = createNode(143 /* TypeParameter */);
+            node.name = parseIdentifier();
+            parseExpected(91 /* InKeyword */);
+            node.constraint = parseType();
+            return finishNode(node);
+        }
+        function parseMappedType() {
+            var node = createNode(170 /* MappedType */);
+            parseExpected(16 /* OpenBraceToken */);
+            node.readonlyToken = parseOptionalToken(130 /* ReadonlyKeyword */);
+            parseExpected(20 /* OpenBracketToken */);
+            node.typeParameter = parseMappedTypeParameter();
+            parseExpected(21 /* CloseBracketToken */);
+            node.questionToken = parseOptionalToken(54 /* QuestionToken */);
+            node.type = parseTypeAnnotation();
+            parseSemicolon();
+            parseExpected(17 /* CloseBraceToken */);
+            return finishNode(node);
+        }
         function parseTupleType() {
-            var node = createNode(162 /* TupleType */);
-            node.elementTypes = parseBracketedList(19 /* TupleElementTypes */, parseType, 20 /* OpenBracketToken */, 21 /* CloseBracketToken */);
+            var node = createNode(163 /* TupleType */);
+            node.elementTypes = parseBracketedList(20 /* TupleElementTypes */, parseType, 20 /* OpenBracketToken */, 21 /* CloseBracketToken */);
             return finishNode(node);
         }
         function parseParenthesizedType() {
-            var node = createNode(165 /* ParenthesizedType */);
+            var node = createNode(166 /* ParenthesizedType */);
             parseExpected(18 /* OpenParenToken */);
             node.type = parseType();
             parseExpected(19 /* CloseParenToken */);
@@ -15005,7 +15988,7 @@ var ts;
         }
         function parseFunctionOrConstructorType(kind) {
             var node = createNode(kind);
-            if (kind === 158 /* ConstructorType */) {
+            if (kind === 159 /* ConstructorType */) {
                 parseExpected(93 /* NewKeyword */);
             }
             fillSignature(35 /* EqualsGreaterThanToken */, /*yieldContext*/ false, /*awaitContext*/ false, /*requireCompleteParameterList*/ false, node);
@@ -15016,7 +15999,7 @@ var ts;
             return token() === 22 /* DotToken */ ? undefined : node;
         }
         function parseLiteralTypeNode() {
-            var node = createNode(167 /* LiteralType */);
+            var node = createNode(171 /* LiteralType */);
             node.literal = parseSimpleUnaryExpression();
             finishNode(node);
             return node;
@@ -15027,12 +16010,12 @@ var ts;
         function parseNonArrayType() {
             switch (token()) {
                 case 118 /* AnyKeyword */:
-                case 133 /* StringKeyword */:
-                case 131 /* NumberKeyword */:
+                case 134 /* StringKeyword */:
+                case 132 /* NumberKeyword */:
                 case 121 /* BooleanKeyword */:
-                case 134 /* SymbolKeyword */:
-                case 136 /* UndefinedKeyword */:
-                case 128 /* NeverKeyword */:
+                case 135 /* SymbolKeyword */:
+                case 137 /* UndefinedKeyword */:
+                case 129 /* NeverKeyword */:
                     // If these are followed by a dot, then parse these out as a dotted type reference instead.
                     var node = tryParse(parseKeywordAndNoDot);
                     return node || parseTypeReference();
@@ -15058,7 +16041,7 @@ var ts;
                 case 102 /* TypeOfKeyword */:
                     return parseTypeQuery();
                 case 16 /* OpenBraceToken */:
-                    return parseTypeLiteral();
+                    return lookAhead(isStartOfMappedType) ? parseMappedType() : parseTypeLiteral();
                 case 20 /* OpenBracketToken */:
                     return parseTupleType();
                 case 18 /* OpenParenToken */:
@@ -15070,16 +16053,16 @@ var ts;
         function isStartOfType() {
             switch (token()) {
                 case 118 /* AnyKeyword */:
-                case 133 /* StringKeyword */:
-                case 131 /* NumberKeyword */:
+                case 134 /* StringKeyword */:
+                case 132 /* NumberKeyword */:
                 case 121 /* BooleanKeyword */:
-                case 134 /* SymbolKeyword */:
+                case 135 /* SymbolKeyword */:
                 case 104 /* VoidKeyword */:
-                case 136 /* UndefinedKeyword */:
+                case 137 /* UndefinedKeyword */:
                 case 94 /* NullKeyword */:
                 case 98 /* ThisKeyword */:
                 case 102 /* TypeOfKeyword */:
-                case 128 /* NeverKeyword */:
+                case 129 /* NeverKeyword */:
                 case 16 /* OpenBraceToken */:
                 case 20 /* OpenBracketToken */:
                 case 26 /* LessThanToken */:
@@ -15106,13 +16089,36 @@ var ts;
         function parseArrayTypeOrHigher() {
             var type = parseNonArrayType();
             while (!scanner.hasPrecedingLineBreak() && parseOptional(20 /* OpenBracketToken */)) {
-                parseExpected(21 /* CloseBracketToken */);
-                var node = createNode(161 /* ArrayType */, type.pos);
-                node.elementType = type;
-                type = finishNode(node);
+                if (isStartOfType()) {
+                    var node = createNode(169 /* IndexedAccessType */, type.pos);
+                    node.objectType = type;
+                    node.indexType = parseType();
+                    parseExpected(21 /* CloseBracketToken */);
+                    type = finishNode(node);
+                }
+                else {
+                    var node = createNode(162 /* ArrayType */, type.pos);
+                    node.elementType = type;
+                    parseExpected(21 /* CloseBracketToken */);
+                    type = finishNode(node);
+                }
             }
             return type;
         }
+        function parseTypeOperator(operator) {
+            var node = createNode(168 /* TypeOperator */);
+            parseExpected(operator);
+            node.operator = operator;
+            node.type = parseTypeOperatorOrHigher();
+            return finishNode(node);
+        }
+        function parseTypeOperatorOrHigher() {
+            switch (token()) {
+                case 126 /* KeyOfKeyword */:
+                    return parseTypeOperator(126 /* KeyOfKeyword */);
+            }
+            return parseArrayTypeOrHigher();
+        }
         function parseUnionOrIntersectionType(kind, parseConstituentType, operator) {
             var type = parseConstituentType();
             if (token() === operator) {
@@ -15128,10 +16134,10 @@ var ts;
             return type;
         }
         function parseIntersectionTypeOrHigher() {
-            return parseUnionOrIntersectionType(164 /* IntersectionType */, parseArrayTypeOrHigher, 47 /* AmpersandToken */);
+            return parseUnionOrIntersectionType(165 /* IntersectionType */, parseTypeOperatorOrHigher, 47 /* AmpersandToken */);
         }
         function parseUnionTypeOrHigher() {
-            return parseUnionOrIntersectionType(163 /* UnionType */, parseIntersectionTypeOrHigher, 48 /* BarToken */);
+            return parseUnionOrIntersectionType(164 /* UnionType */, parseIntersectionTypeOrHigher, 48 /* BarToken */);
         }
         function isStartOfFunctionType() {
             if (token() === 26 /* LessThanToken */) {
@@ -15188,7 +16194,7 @@ var ts;
             var typePredicateVariable = isIdentifier() && tryParse(parseTypePredicatePrefix);
             var type = parseType();
             if (typePredicateVariable) {
-                var node = createNode(155 /* TypePredicate */, typePredicateVariable.pos);
+                var node = createNode(156 /* TypePredicate */, typePredicateVariable.pos);
                 node.parameterName = typePredicateVariable;
                 node.type = type;
                 return finishNode(node);
@@ -15207,14 +16213,14 @@ var ts;
         function parseType() {
             // The rules about 'yield' only apply to actual code/expression contexts.  They don't
             // apply to 'type' contexts.  So we disable these parameters here before moving on.
-            return doOutsideOfContext(327680 /* TypeExcludesFlags */, parseTypeWorker);
+            return doOutsideOfContext(655360 /* TypeExcludesFlags */, parseTypeWorker);
         }
         function parseTypeWorker() {
             if (isStartOfFunctionType()) {
-                return parseFunctionOrConstructorType(157 /* FunctionType */);
+                return parseFunctionOrConstructorType(158 /* FunctionType */);
             }
             if (token() === 93 /* NewKeyword */) {
-                return parseFunctionOrConstructorType(158 /* ConstructorType */);
+                return parseFunctionOrConstructorType(159 /* ConstructorType */);
             }
             return parseUnionTypeOrHigher();
         }
@@ -15415,7 +16421,7 @@ var ts;
             return !scanner.hasPrecedingLineBreak() && isIdentifier();
         }
         function parseYieldExpression() {
-            var node = createNode(191 /* YieldExpression */);
+            var node = createNode(195 /* YieldExpression */);
             // YieldExpression[In] :
             //      yield
             //      yield [no LineTerminator here] [Lexical goal InputElementRegExp]AssignmentExpression[?In, Yield]
@@ -15437,13 +16443,13 @@ var ts;
             ts.Debug.assert(token() === 35 /* EqualsGreaterThanToken */, "parseSimpleArrowFunctionExpression should only have been called if we had a =>");
             var node;
             if (asyncModifier) {
-                node = createNode(181 /* ArrowFunction */, asyncModifier.pos);
+                node = createNode(185 /* ArrowFunction */, asyncModifier.pos);
                 node.modifiers = asyncModifier;
             }
             else {
-                node = createNode(181 /* ArrowFunction */, identifier.pos);
+                node = createNode(185 /* ArrowFunction */, identifier.pos);
             }
-            var parameter = createNode(143 /* Parameter */, identifier.pos);
+            var parameter = createNode(144 /* Parameter */, identifier.pos);
             parameter.name = identifier;
             finishNode(parameter);
             node.parameters = createNodeArray([parameter], parameter.pos);
@@ -15625,7 +16631,7 @@ var ts;
             return 0 /* False */;
         }
         function parseParenthesizedArrowFunctionExpressionHead(allowAmbiguity) {
-            var node = createNode(181 /* ArrowFunction */);
+            var node = createNode(185 /* ArrowFunction */);
             node.modifiers = parseModifiersForArrowFunction();
             var isAsync = !!(ts.getModifierFlags(node) & 256 /* Async */);
             // Arrow functions are never generators.
@@ -15691,7 +16697,7 @@ 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(189 /* ConditionalExpression */, leftOperand.pos);
+            var node = createNode(193 /* ConditionalExpression */, leftOperand.pos);
             node.condition = leftOperand;
             node.questionToken = questionToken;
             node.whenTrue = doOutsideOfContext(disallowInAndDecoratorContext, parseAssignmentExpressionOrHigher);
@@ -15704,7 +16710,7 @@ var ts;
             return parseBinaryExpressionRest(precedence, leftOperand);
         }
         function isInOrOfKeyword(t) {
-            return t === 91 /* InKeyword */ || t === 139 /* OfKeyword */;
+            return t === 91 /* InKeyword */ || t === 140 /* OfKeyword */;
         }
         function parseBinaryExpressionRest(precedence, leftOperand) {
             while (true) {
@@ -15812,39 +16818,39 @@ var ts;
             return -1;
         }
         function makeBinaryExpression(left, operatorToken, right) {
-            var node = createNode(188 /* BinaryExpression */, left.pos);
+            var node = createNode(192 /* BinaryExpression */, left.pos);
             node.left = left;
             node.operatorToken = operatorToken;
             node.right = right;
             return finishNode(node);
         }
         function makeAsExpression(left, right) {
-            var node = createNode(196 /* AsExpression */, left.pos);
+            var node = createNode(200 /* AsExpression */, left.pos);
             node.expression = left;
             node.type = right;
             return finishNode(node);
         }
         function parsePrefixUnaryExpression() {
-            var node = createNode(186 /* PrefixUnaryExpression */);
+            var node = createNode(190 /* PrefixUnaryExpression */);
             node.operator = token();
             nextToken();
             node.operand = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseDeleteExpression() {
-            var node = createNode(182 /* DeleteExpression */);
+            var node = createNode(186 /* DeleteExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseTypeOfExpression() {
-            var node = createNode(183 /* TypeOfExpression */);
+            var node = createNode(187 /* TypeOfExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseVoidExpression() {
-            var node = createNode(184 /* VoidExpression */);
+            var node = createNode(188 /* VoidExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
@@ -15860,7 +16866,7 @@ var ts;
             return false;
         }
         function parseAwaitExpression() {
-            var node = createNode(185 /* AwaitExpression */);
+            var node = createNode(189 /* AwaitExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
@@ -15903,7 +16909,7 @@ var ts;
             var simpleUnaryExpression = parseSimpleUnaryExpression();
             if (token() === 39 /* AsteriskAsteriskToken */) {
                 var start = ts.skipTrivia(sourceText, simpleUnaryExpression.pos);
-                if (simpleUnaryExpression.kind === 178 /* TypeAssertionExpression */) {
+                if (simpleUnaryExpression.kind === 182 /* TypeAssertionExpression */) {
                     parseErrorAtPosition(start, simpleUnaryExpression.end - start, 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 {
@@ -15999,7 +17005,7 @@ var ts;
          */
         function parseIncrementExpression() {
             if (token() === 42 /* PlusPlusToken */ || token() === 43 /* MinusMinusToken */) {
-                var node = createNode(186 /* PrefixUnaryExpression */);
+                var node = createNode(190 /* PrefixUnaryExpression */);
                 node.operator = token();
                 nextToken();
                 node.operand = parseLeftHandSideExpressionOrHigher();
@@ -16012,7 +17018,7 @@ var ts;
             var expression = parseLeftHandSideExpressionOrHigher();
             ts.Debug.assert(ts.isLeftHandSideExpression(expression));
             if ((token() === 42 /* PlusPlusToken */ || token() === 43 /* MinusMinusToken */) && !scanner.hasPrecedingLineBreak()) {
-                var node = createNode(187 /* PostfixUnaryExpression */, expression.pos);
+                var node = createNode(191 /* PostfixUnaryExpression */, expression.pos);
                 node.operand = expression;
                 node.operator = token();
                 nextToken();
@@ -16116,7 +17122,7 @@ var ts;
             }
             // 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(173 /* PropertyAccessExpression */, expression.pos);
+            var node = createNode(177 /* PropertyAccessExpression */, expression.pos);
             node.expression = expression;
             parseExpectedToken(22 /* DotToken */, /*reportAtCurrentPosition*/ false, ts.Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access);
             node.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
@@ -16141,8 +17147,8 @@ var ts;
         function parseJsxElementOrSelfClosingElement(inExpressionContext) {
             var opening = parseJsxOpeningOrSelfClosingElement(inExpressionContext);
             var result;
-            if (opening.kind === 244 /* JsxOpeningElement */) {
-                var node = createNode(242 /* JsxElement */, opening.pos);
+            if (opening.kind === 248 /* JsxOpeningElement */) {
+                var node = createNode(246 /* JsxElement */, opening.pos);
                 node.openingElement = opening;
                 node.children = parseJsxChildren(node.openingElement.tagName);
                 node.closingElement = parseJsxClosingElement(inExpressionContext);
@@ -16152,7 +17158,7 @@ var ts;
                 result = finishNode(node);
             }
             else {
-                ts.Debug.assert(opening.kind === 243 /* JsxSelfClosingElement */);
+                ts.Debug.assert(opening.kind === 247 /* JsxSelfClosingElement */);
                 // Nothing else to do for self-closing elements
                 result = opening;
             }
@@ -16167,7 +17173,7 @@ var ts;
                 var invalidElement = tryParse(function () { return parseJsxElementOrSelfClosingElement(/*inExpressionContext*/ true); });
                 if (invalidElement) {
                     parseErrorAtCurrentToken(ts.Diagnostics.JSX_expressions_must_have_one_parent_element);
-                    var badNode = createNode(188 /* BinaryExpression */, result.pos);
+                    var badNode = createNode(192 /* BinaryExpression */, result.pos);
                     badNode.end = invalidElement.end;
                     badNode.left = result;
                     badNode.right = invalidElement;
@@ -16226,7 +17232,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(244 /* JsxOpeningElement */, fullStart);
+                node = createNode(248 /* JsxOpeningElement */, fullStart);
                 scanJsxText();
             }
             else {
@@ -16238,7 +17244,7 @@ var ts;
                     parseExpected(28 /* GreaterThanToken */, /*diagnostic*/ undefined, /*shouldAdvance*/ false);
                     scanJsxText();
                 }
-                node = createNode(243 /* JsxSelfClosingElement */, fullStart);
+                node = createNode(247 /* JsxSelfClosingElement */, fullStart);
             }
             node.tagName = tagName;
             node.attributes = attributes;
@@ -16254,7 +17260,7 @@ var ts;
             var expression = token() === 98 /* ThisKeyword */ ?
                 parseTokenNode() : parseIdentifierName();
             while (parseOptional(22 /* DotToken */)) {
-                var propertyAccess = createNode(173 /* PropertyAccessExpression */, expression.pos);
+                var propertyAccess = createNode(177 /* PropertyAccessExpression */, expression.pos);
                 propertyAccess.expression = expression;
                 propertyAccess.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
                 expression = finishNode(propertyAccess);
@@ -16262,7 +17268,7 @@ var ts;
             return expression;
         }
         function parseJsxExpression(inExpressionContext) {
-            var node = createNode(248 /* JsxExpression */);
+            var node = createNode(252 /* JsxExpression */);
             parseExpected(16 /* OpenBraceToken */);
             if (token() !== 17 /* CloseBraceToken */) {
                 node.expression = parseAssignmentExpressionOrHigher();
@@ -16281,7 +17287,7 @@ var ts;
                 return parseJsxSpreadAttribute();
             }
             scanJsxIdentifier();
-            var node = createNode(246 /* JsxAttribute */);
+            var node = createNode(250 /* JsxAttribute */);
             node.name = parseIdentifierName();
             if (token() === 57 /* EqualsToken */) {
                 switch (scanJsxAttributeValue()) {
@@ -16296,7 +17302,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxSpreadAttribute() {
-            var node = createNode(247 /* JsxSpreadAttribute */);
+            var node = createNode(251 /* JsxSpreadAttribute */);
             parseExpected(16 /* OpenBraceToken */);
             parseExpected(23 /* DotDotDotToken */);
             node.expression = parseExpression();
@@ -16304,7 +17310,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxClosingElement(inExpressionContext) {
-            var node = createNode(245 /* JsxClosingElement */);
+            var node = createNode(249 /* JsxClosingElement */);
             parseExpected(27 /* LessThanSlashToken */);
             node.tagName = parseJsxElementName();
             if (inExpressionContext) {
@@ -16317,7 +17323,7 @@ var ts;
             return finishNode(node);
         }
         function parseTypeAssertion() {
-            var node = createNode(178 /* TypeAssertionExpression */);
+            var node = createNode(182 /* TypeAssertionExpression */);
             parseExpected(26 /* LessThanToken */);
             node.type = parseType();
             parseExpected(28 /* GreaterThanToken */);
@@ -16328,7 +17334,7 @@ var ts;
             while (true) {
                 var dotToken = parseOptionalToken(22 /* DotToken */);
                 if (dotToken) {
-                    var propertyAccess = createNode(173 /* PropertyAccessExpression */, expression.pos);
+                    var propertyAccess = createNode(177 /* PropertyAccessExpression */, expression.pos);
                     propertyAccess.expression = expression;
                     propertyAccess.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
                     expression = finishNode(propertyAccess);
@@ -16336,14 +17342,14 @@ var ts;
                 }
                 if (token() === 50 /* ExclamationToken */ && !scanner.hasPrecedingLineBreak()) {
                     nextToken();
-                    var nonNullExpression = createNode(197 /* NonNullExpression */, expression.pos);
+                    var nonNullExpression = createNode(201 /* 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(20 /* OpenBracketToken */)) {
-                    var indexedAccess = createNode(174 /* ElementAccessExpression */, expression.pos);
+                    var indexedAccess = createNode(178 /* ElementAccessExpression */, expression.pos);
                     indexedAccess.expression = expression;
                     // It's not uncommon for a user to write: "new Type[]".
                     // Check for that common pattern and report a better error message.
@@ -16359,7 +17365,7 @@ var ts;
                     continue;
                 }
                 if (token() === 12 /* NoSubstitutionTemplateLiteral */ || token() === 13 /* TemplateHead */) {
-                    var tagExpression = createNode(177 /* TaggedTemplateExpression */, expression.pos);
+                    var tagExpression = createNode(181 /* TaggedTemplateExpression */, expression.pos);
                     tagExpression.tag = expression;
                     tagExpression.template = token() === 12 /* NoSubstitutionTemplateLiteral */
                         ? parseLiteralNode()
@@ -16382,7 +17388,7 @@ var ts;
                     if (!typeArguments) {
                         return expression;
                     }
-                    var callExpr = createNode(175 /* CallExpression */, expression.pos);
+                    var callExpr = createNode(179 /* CallExpression */, expression.pos);
                     callExpr.expression = expression;
                     callExpr.typeArguments = typeArguments;
                     callExpr.arguments = parseArgumentList();
@@ -16390,7 +17396,7 @@ var ts;
                     continue;
                 }
                 else if (token() === 18 /* OpenParenToken */) {
-                    var callExpr = createNode(175 /* CallExpression */, expression.pos);
+                    var callExpr = createNode(179 /* CallExpression */, expression.pos);
                     callExpr.expression = expression;
                     callExpr.arguments = parseArgumentList();
                     expression = finishNode(callExpr);
@@ -16409,7 +17415,7 @@ var ts;
             if (!parseOptional(26 /* LessThanToken */)) {
                 return undefined;
             }
-            var typeArguments = parseDelimitedList(18 /* TypeArguments */, parseType);
+            var typeArguments = parseDelimitedList(19 /* TypeArguments */, parseType);
             if (!parseExpected(28 /* GreaterThanToken */)) {
                 // If it doesn't have the closing >  then it's definitely not an type argument list.
                 return undefined;
@@ -16500,28 +17506,28 @@ var ts;
             return parseIdentifier(ts.Diagnostics.Expression_expected);
         }
         function parseParenthesizedExpression() {
-            var node = createNode(179 /* ParenthesizedExpression */);
+            var node = createNode(183 /* ParenthesizedExpression */);
             parseExpected(18 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(19 /* CloseParenToken */);
             return finishNode(node);
         }
         function parseSpreadElement() {
-            var node = createNode(192 /* SpreadElementExpression */);
+            var node = createNode(196 /* SpreadElement */);
             parseExpected(23 /* DotDotDotToken */);
             node.expression = parseAssignmentExpressionOrHigher();
             return finishNode(node);
         }
         function parseArgumentOrArrayLiteralElement() {
             return token() === 23 /* DotDotDotToken */ ? parseSpreadElement() :
-                token() === 25 /* CommaToken */ ? createNode(194 /* OmittedExpression */) :
+                token() === 25 /* CommaToken */ ? createNode(198 /* OmittedExpression */) :
                     parseAssignmentExpressionOrHigher();
         }
         function parseArgumentExpression() {
             return doOutsideOfContext(disallowInAndDecoratorContext, parseArgumentOrArrayLiteralElement);
         }
         function parseArrayLiteralExpression() {
-            var node = createNode(171 /* ArrayLiteralExpression */);
+            var node = createNode(175 /* ArrayLiteralExpression */);
             parseExpected(20 /* OpenBracketToken */);
             if (scanner.hasPrecedingLineBreak()) {
                 node.multiLine = true;
@@ -16532,15 +17538,21 @@ var ts;
         }
         function tryParseAccessorDeclaration(fullStart, decorators, modifiers) {
             if (parseContextualModifier(124 /* GetKeyword */)) {
-                return parseAccessorDeclaration(150 /* GetAccessor */, fullStart, decorators, modifiers);
+                return parseAccessorDeclaration(151 /* GetAccessor */, fullStart, decorators, modifiers);
             }
-            else if (parseContextualModifier(132 /* SetKeyword */)) {
-                return parseAccessorDeclaration(151 /* SetAccessor */, fullStart, decorators, modifiers);
+            else if (parseContextualModifier(133 /* SetKeyword */)) {
+                return parseAccessorDeclaration(152 /* SetAccessor */, fullStart, decorators, modifiers);
             }
             return undefined;
         }
         function parseObjectLiteralElement() {
             var fullStart = scanner.getStartPos();
+            var dotDotDotToken = parseOptionalToken(23 /* DotDotDotToken */);
+            if (dotDotDotToken) {
+                var spreadElement = createNode(259 /* SpreadAssignment */, fullStart);
+                spreadElement.expression = parseAssignmentExpressionOrHigher();
+                return addJSDocComment(finishNode(spreadElement));
+            }
             var decorators = parseDecorators();
             var modifiers = parseModifiers();
             var accessor = tryParseAccessorDeclaration(fullStart, decorators, modifiers);
@@ -16562,7 +17574,7 @@ var ts;
             // this is necessary because ObjectLiteral productions are also used to cover grammar for ObjectAssignmentPattern
             var isShorthandPropertyAssignment = tokenIsIdentifier && (token() === 25 /* CommaToken */ || token() === 17 /* CloseBraceToken */ || token() === 57 /* EqualsToken */);
             if (isShorthandPropertyAssignment) {
-                var shorthandDeclaration = createNode(254 /* ShorthandPropertyAssignment */, fullStart);
+                var shorthandDeclaration = createNode(258 /* ShorthandPropertyAssignment */, fullStart);
                 shorthandDeclaration.name = propertyName;
                 shorthandDeclaration.questionToken = questionToken;
                 var equalsToken = parseOptionalToken(57 /* EqualsToken */);
@@ -16573,7 +17585,7 @@ var ts;
                 return addJSDocComment(finishNode(shorthandDeclaration));
             }
             else {
-                var propertyAssignment = createNode(253 /* PropertyAssignment */, fullStart);
+                var propertyAssignment = createNode(257 /* PropertyAssignment */, fullStart);
                 propertyAssignment.modifiers = modifiers;
                 propertyAssignment.name = propertyName;
                 propertyAssignment.questionToken = questionToken;
@@ -16583,7 +17595,7 @@ var ts;
             }
         }
         function parseObjectLiteralExpression() {
-            var node = createNode(172 /* ObjectLiteralExpression */);
+            var node = createNode(176 /* ObjectLiteralExpression */);
             parseExpected(16 /* OpenBraceToken */);
             if (scanner.hasPrecedingLineBreak()) {
                 node.multiLine = true;
@@ -16602,7 +17614,7 @@ var ts;
             if (saveDecoratorContext) {
                 setDecoratorContext(/*val*/ false);
             }
-            var node = createNode(180 /* FunctionExpression */);
+            var node = createNode(184 /* FunctionExpression */);
             node.modifiers = parseModifiers();
             parseExpected(88 /* FunctionKeyword */);
             node.asteriskToken = parseOptionalToken(38 /* AsteriskToken */);
@@ -16624,7 +17636,7 @@ var ts;
             return isIdentifier() ? parseIdentifier() : undefined;
         }
         function parseNewExpression() {
-            var node = createNode(176 /* NewExpression */);
+            var node = createNode(180 /* NewExpression */);
             parseExpected(93 /* NewKeyword */);
             node.expression = parseMemberExpressionOrHigher();
             node.typeArguments = tryParse(parseTypeArgumentsInExpression);
@@ -16635,7 +17647,7 @@ var ts;
         }
         // STATEMENTS
         function parseBlock(ignoreMissingOpenBrace, diagnosticMessage) {
-            var node = createNode(200 /* Block */);
+            var node = createNode(204 /* Block */);
             if (parseExpected(16 /* OpenBraceToken */, diagnosticMessage) || ignoreMissingOpenBrace) {
                 if (scanner.hasPrecedingLineBreak()) {
                     node.multiLine = true;
@@ -16668,12 +17680,12 @@ var ts;
             return block;
         }
         function parseEmptyStatement() {
-            var node = createNode(202 /* EmptyStatement */);
+            var node = createNode(206 /* EmptyStatement */);
             parseExpected(24 /* SemicolonToken */);
             return finishNode(node);
         }
         function parseIfStatement() {
-            var node = createNode(204 /* IfStatement */);
+            var node = createNode(208 /* IfStatement */);
             parseExpected(89 /* IfKeyword */);
             parseExpected(18 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
@@ -16683,7 +17695,7 @@ var ts;
             return finishNode(node);
         }
         function parseDoStatement() {
-            var node = createNode(205 /* DoStatement */);
+            var node = createNode(209 /* DoStatement */);
             parseExpected(80 /* DoKeyword */);
             node.statement = parseStatement();
             parseExpected(105 /* WhileKeyword */);
@@ -16698,7 +17710,7 @@ var ts;
             return finishNode(node);
         }
         function parseWhileStatement() {
-            var node = createNode(206 /* WhileStatement */);
+            var node = createNode(210 /* WhileStatement */);
             parseExpected(105 /* WhileKeyword */);
             parseExpected(18 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
@@ -16721,21 +17733,21 @@ var ts;
             }
             var forOrForInOrForOfStatement;
             if (parseOptional(91 /* InKeyword */)) {
-                var forInStatement = createNode(208 /* ForInStatement */, pos);
+                var forInStatement = createNode(212 /* ForInStatement */, pos);
                 forInStatement.initializer = initializer;
                 forInStatement.expression = allowInAnd(parseExpression);
                 parseExpected(19 /* CloseParenToken */);
                 forOrForInOrForOfStatement = forInStatement;
             }
-            else if (parseOptional(139 /* OfKeyword */)) {
-                var forOfStatement = createNode(209 /* ForOfStatement */, pos);
+            else if (parseOptional(140 /* OfKeyword */)) {
+                var forOfStatement = createNode(213 /* ForOfStatement */, pos);
                 forOfStatement.initializer = initializer;
                 forOfStatement.expression = allowInAnd(parseAssignmentExpressionOrHigher);
                 parseExpected(19 /* CloseParenToken */);
                 forOrForInOrForOfStatement = forOfStatement;
             }
             else {
-                var forStatement = createNode(207 /* ForStatement */, pos);
+                var forStatement = createNode(211 /* ForStatement */, pos);
                 forStatement.initializer = initializer;
                 parseExpected(24 /* SemicolonToken */);
                 if (token() !== 24 /* SemicolonToken */ && token() !== 19 /* CloseParenToken */) {
@@ -16753,7 +17765,7 @@ var ts;
         }
         function parseBreakOrContinueStatement(kind) {
             var node = createNode(kind);
-            parseExpected(kind === 211 /* BreakStatement */ ? 71 /* BreakKeyword */ : 76 /* ContinueKeyword */);
+            parseExpected(kind === 215 /* BreakStatement */ ? 71 /* BreakKeyword */ : 76 /* ContinueKeyword */);
             if (!canParseSemicolon()) {
                 node.label = parseIdentifier();
             }
@@ -16761,7 +17773,7 @@ var ts;
             return finishNode(node);
         }
         function parseReturnStatement() {
-            var node = createNode(212 /* ReturnStatement */);
+            var node = createNode(216 /* ReturnStatement */);
             parseExpected(95 /* ReturnKeyword */);
             if (!canParseSemicolon()) {
                 node.expression = allowInAnd(parseExpression);
@@ -16770,7 +17782,7 @@ var ts;
             return finishNode(node);
         }
         function parseWithStatement() {
-            var node = createNode(213 /* WithStatement */);
+            var node = createNode(217 /* WithStatement */);
             parseExpected(106 /* WithKeyword */);
             parseExpected(18 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
@@ -16779,7 +17791,7 @@ var ts;
             return finishNode(node);
         }
         function parseCaseClause() {
-            var node = createNode(249 /* CaseClause */);
+            var node = createNode(253 /* CaseClause */);
             parseExpected(72 /* CaseKeyword */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(55 /* ColonToken */);
@@ -16787,7 +17799,7 @@ var ts;
             return finishNode(node);
         }
         function parseDefaultClause() {
-            var node = createNode(250 /* DefaultClause */);
+            var node = createNode(254 /* DefaultClause */);
             parseExpected(78 /* DefaultKeyword */);
             parseExpected(55 /* ColonToken */);
             node.statements = parseList(3 /* SwitchClauseStatements */, parseStatement);
@@ -16797,12 +17809,12 @@ var ts;
             return token() === 72 /* CaseKeyword */ ? parseCaseClause() : parseDefaultClause();
         }
         function parseSwitchStatement() {
-            var node = createNode(214 /* SwitchStatement */);
+            var node = createNode(218 /* SwitchStatement */);
             parseExpected(97 /* SwitchKeyword */);
             parseExpected(18 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(19 /* CloseParenToken */);
-            var caseBlock = createNode(228 /* CaseBlock */, scanner.getStartPos());
+            var caseBlock = createNode(232 /* CaseBlock */, scanner.getStartPos());
             parseExpected(16 /* OpenBraceToken */);
             caseBlock.clauses = parseList(2 /* SwitchClauses */, parseCaseOrDefaultClause);
             parseExpected(17 /* CloseBraceToken */);
@@ -16817,7 +17829,7 @@ 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(216 /* ThrowStatement */);
+            var node = createNode(220 /* ThrowStatement */);
             parseExpected(99 /* ThrowKeyword */);
             node.expression = scanner.hasPrecedingLineBreak() ? undefined : allowInAnd(parseExpression);
             parseSemicolon();
@@ -16825,7 +17837,7 @@ var ts;
         }
         // TODO: Review for error recovery
         function parseTryStatement() {
-            var node = createNode(217 /* TryStatement */);
+            var node = createNode(221 /* TryStatement */);
             parseExpected(101 /* TryKeyword */);
             node.tryBlock = parseBlock(/*ignoreMissingOpenBrace*/ false);
             node.catchClause = token() === 73 /* CatchKeyword */ ? parseCatchClause() : undefined;
@@ -16838,7 +17850,7 @@ var ts;
             return finishNode(node);
         }
         function parseCatchClause() {
-            var result = createNode(252 /* CatchClause */);
+            var result = createNode(256 /* CatchClause */);
             parseExpected(73 /* CatchKeyword */);
             if (parseExpected(18 /* OpenParenToken */)) {
                 result.variableDeclaration = parseVariableDeclaration();
@@ -16848,7 +17860,7 @@ var ts;
             return finishNode(result);
         }
         function parseDebuggerStatement() {
-            var node = createNode(218 /* DebuggerStatement */);
+            var node = createNode(222 /* DebuggerStatement */);
             parseExpected(77 /* DebuggerKeyword */);
             parseSemicolon();
             return finishNode(node);
@@ -16860,13 +17872,13 @@ var ts;
             var fullStart = scanner.getStartPos();
             var expression = allowInAnd(parseExpression);
             if (expression.kind === 70 /* Identifier */ && parseOptional(55 /* ColonToken */)) {
-                var labeledStatement = createNode(215 /* LabeledStatement */, fullStart);
+                var labeledStatement = createNode(219 /* LabeledStatement */, fullStart);
                 labeledStatement.label = expression;
                 labeledStatement.statement = parseStatement();
                 return addJSDocComment(finishNode(labeledStatement));
             }
             else {
-                var expressionStatement = createNode(203 /* ExpressionStatement */, fullStart);
+                var expressionStatement = createNode(207 /* ExpressionStatement */, fullStart);
                 expressionStatement.expression = expression;
                 parseSemicolon();
                 return addJSDocComment(finishNode(expressionStatement));
@@ -16916,10 +17928,10 @@ var ts;
                     //
                     // could be legal, it would add complexity for very little gain.
                     case 108 /* InterfaceKeyword */:
-                    case 135 /* TypeKeyword */:
+                    case 136 /* TypeKeyword */:
                         return nextTokenIsIdentifierOnSameLine();
-                    case 126 /* ModuleKeyword */:
-                    case 127 /* NamespaceKeyword */:
+                    case 127 /* ModuleKeyword */:
+                    case 128 /* NamespaceKeyword */:
                         return nextTokenIsIdentifierOrStringLiteralOnSameLine();
                     case 116 /* AbstractKeyword */:
                     case 119 /* AsyncKeyword */:
@@ -16927,14 +17939,14 @@ var ts;
                     case 111 /* PrivateKeyword */:
                     case 112 /* ProtectedKeyword */:
                     case 113 /* PublicKeyword */:
-                    case 129 /* ReadonlyKeyword */:
+                    case 130 /* ReadonlyKeyword */:
                         nextToken();
                         // ASI takes effect for this modifier.
                         if (scanner.hasPrecedingLineBreak()) {
                             return false;
                         }
                         continue;
-                    case 138 /* GlobalKeyword */:
+                    case 139 /* GlobalKeyword */:
                         nextToken();
                         return token() === 16 /* OpenBraceToken */ || token() === 70 /* Identifier */ || token() === 83 /* ExportKeyword */;
                     case 90 /* ImportKeyword */:
@@ -16994,17 +18006,17 @@ var ts;
                 case 119 /* AsyncKeyword */:
                 case 123 /* DeclareKeyword */:
                 case 108 /* InterfaceKeyword */:
-                case 126 /* ModuleKeyword */:
-                case 127 /* NamespaceKeyword */:
-                case 135 /* TypeKeyword */:
-                case 138 /* GlobalKeyword */:
+                case 127 /* ModuleKeyword */:
+                case 128 /* NamespaceKeyword */:
+                case 136 /* TypeKeyword */:
+                case 139 /* GlobalKeyword */:
                     // When these don't start a declaration, they're an identifier in an expression statement
                     return true;
                 case 113 /* PublicKeyword */:
                 case 111 /* PrivateKeyword */:
                 case 112 /* ProtectedKeyword */:
                 case 114 /* StaticKeyword */:
-                case 129 /* ReadonlyKeyword */:
+                case 130 /* 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);
@@ -17047,9 +18059,9 @@ var ts;
                 case 87 /* ForKeyword */:
                     return parseForOrForInOrForOfStatement();
                 case 76 /* ContinueKeyword */:
-                    return parseBreakOrContinueStatement(210 /* ContinueStatement */);
+                    return parseBreakOrContinueStatement(214 /* ContinueStatement */);
                 case 71 /* BreakKeyword */:
-                    return parseBreakOrContinueStatement(211 /* BreakStatement */);
+                    return parseBreakOrContinueStatement(215 /* BreakStatement */);
                 case 95 /* ReturnKeyword */:
                     return parseReturnStatement();
                 case 106 /* WithKeyword */:
@@ -17069,9 +18081,9 @@ var ts;
                     return parseDeclaration();
                 case 119 /* AsyncKeyword */:
                 case 108 /* InterfaceKeyword */:
-                case 135 /* TypeKeyword */:
-                case 126 /* ModuleKeyword */:
-                case 127 /* NamespaceKeyword */:
+                case 136 /* TypeKeyword */:
+                case 127 /* ModuleKeyword */:
+                case 128 /* NamespaceKeyword */:
                 case 123 /* DeclareKeyword */:
                 case 75 /* ConstKeyword */:
                 case 82 /* EnumKeyword */:
@@ -17082,8 +18094,8 @@ var ts;
                 case 113 /* PublicKeyword */:
                 case 116 /* AbstractKeyword */:
                 case 114 /* StaticKeyword */:
-                case 129 /* ReadonlyKeyword */:
-                case 138 /* GlobalKeyword */:
+                case 130 /* ReadonlyKeyword */:
+                case 139 /* GlobalKeyword */:
                     if (isStartOfDeclaration()) {
                         return parseDeclaration();
                     }
@@ -17106,13 +18118,13 @@ var ts;
                     return parseClassDeclaration(fullStart, decorators, modifiers);
                 case 108 /* InterfaceKeyword */:
                     return parseInterfaceDeclaration(fullStart, decorators, modifiers);
-                case 135 /* TypeKeyword */:
+                case 136 /* TypeKeyword */:
                     return parseTypeAliasDeclaration(fullStart, decorators, modifiers);
                 case 82 /* EnumKeyword */:
                     return parseEnumDeclaration(fullStart, decorators, modifiers);
-                case 138 /* GlobalKeyword */:
-                case 126 /* ModuleKeyword */:
-                case 127 /* NamespaceKeyword */:
+                case 139 /* GlobalKeyword */:
+                case 127 /* ModuleKeyword */:
+                case 128 /* NamespaceKeyword */:
                     return parseModuleDeclaration(fullStart, decorators, modifiers);
                 case 90 /* ImportKeyword */:
                     return parseImportDeclarationOrImportEqualsDeclaration(fullStart, decorators, modifiers);
@@ -17131,7 +18143,7 @@ var ts;
                     if (decorators || 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 node = createMissingNode(240 /* MissingDeclaration */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
+                        var node = createMissingNode(244 /* MissingDeclaration */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
                         node.pos = fullStart;
                         node.decorators = decorators;
                         node.modifiers = modifiers;
@@ -17153,16 +18165,17 @@ var ts;
         // DECLARATIONS
         function parseArrayBindingElement() {
             if (token() === 25 /* CommaToken */) {
-                return createNode(194 /* OmittedExpression */);
+                return createNode(198 /* OmittedExpression */);
             }
-            var node = createNode(170 /* BindingElement */);
+            var node = createNode(174 /* BindingElement */);
             node.dotDotDotToken = parseOptionalToken(23 /* DotDotDotToken */);
             node.name = parseIdentifierOrPattern();
             node.initializer = parseBindingElementInitializer(/*inParameter*/ false);
             return finishNode(node);
         }
         function parseObjectBindingElement() {
-            var node = createNode(170 /* BindingElement */);
+            var node = createNode(174 /* BindingElement */);
+            node.dotDotDotToken = parseOptionalToken(23 /* DotDotDotToken */);
             var tokenIsIdentifier = isIdentifier();
             var propertyName = parsePropertyName();
             if (tokenIsIdentifier && token() !== 55 /* ColonToken */) {
@@ -17177,14 +18190,14 @@ var ts;
             return finishNode(node);
         }
         function parseObjectBindingPattern() {
-            var node = createNode(168 /* ObjectBindingPattern */);
+            var node = createNode(172 /* ObjectBindingPattern */);
             parseExpected(16 /* OpenBraceToken */);
             node.elements = parseDelimitedList(9 /* ObjectBindingElements */, parseObjectBindingElement);
             parseExpected(17 /* CloseBraceToken */);
             return finishNode(node);
         }
         function parseArrayBindingPattern() {
-            var node = createNode(169 /* ArrayBindingPattern */);
+            var node = createNode(173 /* ArrayBindingPattern */);
             parseExpected(20 /* OpenBracketToken */);
             node.elements = parseDelimitedList(10 /* ArrayBindingElements */, parseArrayBindingElement);
             parseExpected(21 /* CloseBracketToken */);
@@ -17203,7 +18216,7 @@ var ts;
             return parseIdentifier();
         }
         function parseVariableDeclaration() {
-            var node = createNode(219 /* VariableDeclaration */);
+            var node = createNode(223 /* VariableDeclaration */);
             node.name = parseIdentifierOrPattern();
             node.type = parseTypeAnnotation();
             if (!isInOrOfKeyword(token())) {
@@ -17212,7 +18225,7 @@ var ts;
             return finishNode(node);
         }
         function parseVariableDeclarationList(inForStatementInitializer) {
-            var node = createNode(220 /* VariableDeclarationList */);
+            var node = createNode(224 /* VariableDeclarationList */);
             switch (token()) {
                 case 103 /* VarKeyword */:
                     break;
@@ -17235,7 +18248,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() === 139 /* OfKeyword */ && lookAhead(canFollowContextualOfKeyword)) {
+            if (token() === 140 /* OfKeyword */ && lookAhead(canFollowContextualOfKeyword)) {
                 node.declarations = createMissingList();
             }
             else {
@@ -17250,7 +18263,7 @@ var ts;
             return nextTokenIsIdentifier() && nextToken() === 19 /* CloseParenToken */;
         }
         function parseVariableStatement(fullStart, decorators, modifiers) {
-            var node = createNode(201 /* VariableStatement */, fullStart);
+            var node = createNode(205 /* VariableStatement */, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             node.declarationList = parseVariableDeclarationList(/*inForStatementInitializer*/ false);
@@ -17258,7 +18271,7 @@ var ts;
             return addJSDocComment(finishNode(node));
         }
         function parseFunctionDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(221 /* FunctionDeclaration */, fullStart);
+            var node = createNode(225 /* FunctionDeclaration */, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             parseExpected(88 /* FunctionKeyword */);
@@ -17271,7 +18284,7 @@ var ts;
             return addJSDocComment(finishNode(node));
         }
         function parseConstructorDeclaration(pos, decorators, modifiers) {
-            var node = createNode(149 /* Constructor */, pos);
+            var node = createNode(150 /* Constructor */, pos);
             node.decorators = decorators;
             node.modifiers = modifiers;
             parseExpected(122 /* ConstructorKeyword */);
@@ -17280,7 +18293,7 @@ var ts;
             return addJSDocComment(finishNode(node));
         }
         function parseMethodDeclaration(fullStart, decorators, modifiers, asteriskToken, name, questionToken, diagnosticMessage) {
-            var method = createNode(148 /* MethodDeclaration */, fullStart);
+            var method = createNode(149 /* MethodDeclaration */, fullStart);
             method.decorators = decorators;
             method.modifiers = modifiers;
             method.asteriskToken = asteriskToken;
@@ -17293,7 +18306,7 @@ var ts;
             return addJSDocComment(finishNode(method));
         }
         function parsePropertyDeclaration(fullStart, decorators, modifiers, name, questionToken) {
-            var property = createNode(146 /* PropertyDeclaration */, fullStart);
+            var property = createNode(147 /* PropertyDeclaration */, fullStart);
             property.decorators = decorators;
             property.modifiers = modifiers;
             property.name = name;
@@ -17310,7 +18323,7 @@ var ts;
             // The checker may still error in the static case to explicitly disallow the yield expression.
             property.initializer = ts.hasModifier(property, 32 /* Static */)
                 ? allowInAnd(parseNonParameterInitializer)
-                : doOutsideOfContext(65536 /* YieldContext */ | 32768 /* DisallowInContext */, parseNonParameterInitializer);
+                : doOutsideOfContext(131072 /* YieldContext */ | 65536 /* DisallowInContext */, parseNonParameterInitializer);
             parseSemicolon();
             return addJSDocComment(finishNode(property));
         }
@@ -17345,7 +18358,7 @@ var ts;
                 case 111 /* PrivateKeyword */:
                 case 112 /* ProtectedKeyword */:
                 case 114 /* StaticKeyword */:
-                case 129 /* ReadonlyKeyword */:
+                case 130 /* ReadonlyKeyword */:
                     return true;
                 default:
                     return false;
@@ -17386,7 +18399,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 === 132 /* SetKeyword */ || idToken === 124 /* GetKeyword */) {
+                if (!ts.isKeyword(idToken) || idToken === 133 /* SetKeyword */ || idToken === 124 /* GetKeyword */) {
                     return true;
                 }
                 // If it *is* a keyword, but not an accessor, check a little farther along
@@ -17416,7 +18429,7 @@ var ts;
                 if (!parseOptional(56 /* AtToken */)) {
                     break;
                 }
-                var decorator = createNode(144 /* Decorator */, decoratorStart);
+                var decorator = createNode(145 /* Decorator */, decoratorStart);
                 decorator.expression = doInDecoratorContext(parseLeftHandSideExpressionOrHigher);
                 finishNode(decorator);
                 if (!decorators) {
@@ -17482,7 +18495,7 @@ var ts;
         }
         function parseClassElement() {
             if (token() === 24 /* SemicolonToken */) {
-                var result = createNode(199 /* SemicolonClassElement */);
+                var result = createNode(203 /* SemicolonClassElement */);
                 nextToken();
                 return finishNode(result);
             }
@@ -17510,8 +18523,8 @@ var ts;
             }
             if (decorators || modifiers) {
                 // treat this as a property declaration with a missing name.
-                var name_10 = createMissingNode(70 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
-                return parsePropertyDeclaration(fullStart, decorators, modifiers, name_10, /*questionToken*/ undefined);
+                var name_14 = createMissingNode(70 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
+                return parsePropertyDeclaration(fullStart, decorators, modifiers, name_14, /*questionToken*/ undefined);
             }
             // 'isClassMemberStart' should have hinted not to attempt parsing.
             ts.Debug.fail("Should not have attempted to parse class member declaration.");
@@ -17520,10 +18533,10 @@ var ts;
             return parseClassDeclarationOrExpression(
             /*fullStart*/ scanner.getStartPos(), 
             /*decorators*/ undefined, 
-            /*modifiers*/ undefined, 193 /* ClassExpression */);
+            /*modifiers*/ undefined, 197 /* ClassExpression */);
         }
         function parseClassDeclaration(fullStart, decorators, modifiers) {
-            return parseClassDeclarationOrExpression(fullStart, decorators, modifiers, 222 /* ClassDeclaration */);
+            return parseClassDeclarationOrExpression(fullStart, decorators, modifiers, 226 /* ClassDeclaration */);
         }
         function parseClassDeclarationOrExpression(fullStart, decorators, modifiers, kind) {
             var node = createNode(kind, fullStart);
@@ -17561,13 +18574,13 @@ var ts;
             // ClassTail[Yield,Await] : (Modified) See 14.5
             //      ClassHeritage[?Yield,?Await]opt { ClassBody[?Yield,?Await]opt }
             if (isHeritageClause()) {
-                return parseList(20 /* HeritageClauses */, parseHeritageClause);
+                return parseList(21 /* HeritageClauses */, parseHeritageClause);
             }
             return undefined;
         }
         function parseHeritageClause() {
             if (token() === 84 /* ExtendsKeyword */ || token() === 107 /* ImplementsKeyword */) {
-                var node = createNode(251 /* HeritageClause */);
+                var node = createNode(255 /* HeritageClause */);
                 node.token = token();
                 nextToken();
                 node.types = parseDelimitedList(7 /* HeritageClauseElement */, parseExpressionWithTypeArguments);
@@ -17576,10 +18589,10 @@ var ts;
             return undefined;
         }
         function parseExpressionWithTypeArguments() {
-            var node = createNode(195 /* ExpressionWithTypeArguments */);
+            var node = createNode(199 /* ExpressionWithTypeArguments */);
             node.expression = parseLeftHandSideExpressionOrHigher();
             if (token() === 26 /* LessThanToken */) {
-                node.typeArguments = parseBracketedList(18 /* TypeArguments */, parseType, 26 /* LessThanToken */, 28 /* GreaterThanToken */);
+                node.typeArguments = parseBracketedList(19 /* TypeArguments */, parseType, 26 /* LessThanToken */, 28 /* GreaterThanToken */);
             }
             return finishNode(node);
         }
@@ -17590,7 +18603,7 @@ var ts;
             return parseList(5 /* ClassMembers */, parseClassElement);
         }
         function parseInterfaceDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(223 /* InterfaceDeclaration */, fullStart);
+            var node = createNode(227 /* InterfaceDeclaration */, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             parseExpected(108 /* InterfaceKeyword */);
@@ -17601,10 +18614,10 @@ var ts;
             return addJSDocComment(finishNode(node));
         }
         function parseTypeAliasDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(224 /* TypeAliasDeclaration */, fullStart);
+            var node = createNode(228 /* TypeAliasDeclaration */, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
-            parseExpected(135 /* TypeKeyword */);
+            parseExpected(136 /* TypeKeyword */);
             node.name = parseIdentifier();
             node.typeParameters = parseTypeParameters();
             parseExpected(57 /* EqualsToken */);
@@ -17617,13 +18630,13 @@ 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 = createNode(255 /* EnumMember */, scanner.getStartPos());
+            var node = createNode(260 /* EnumMember */, scanner.getStartPos());
             node.name = parsePropertyName();
             node.initializer = allowInAnd(parseNonParameterInitializer);
             return addJSDocComment(finishNode(node));
         }
         function parseEnumDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(225 /* EnumDeclaration */, fullStart);
+            var node = createNode(229 /* EnumDeclaration */, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             parseExpected(82 /* EnumKeyword */);
@@ -17638,7 +18651,7 @@ var ts;
             return addJSDocComment(finishNode(node));
         }
         function parseModuleBlock() {
-            var node = createNode(227 /* ModuleBlock */, scanner.getStartPos());
+            var node = createNode(231 /* ModuleBlock */, scanner.getStartPos());
             if (parseExpected(16 /* OpenBraceToken */)) {
                 node.statements = parseList(1 /* BlockStatements */, parseStatement);
                 parseExpected(17 /* CloseBraceToken */);
@@ -17649,7 +18662,7 @@ var ts;
             return finishNode(node);
         }
         function parseModuleOrNamespaceDeclaration(fullStart, decorators, modifiers, flags) {
-            var node = createNode(226 /* ModuleDeclaration */, fullStart);
+            var node = createNode(230 /* ModuleDeclaration */, fullStart);
             // 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 */;
@@ -17663,10 +18676,10 @@ var ts;
             return addJSDocComment(finishNode(node));
         }
         function parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(226 /* ModuleDeclaration */, fullStart);
+            var node = createNode(230 /* ModuleDeclaration */, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
-            if (token() === 138 /* GlobalKeyword */) {
+            if (token() === 139 /* GlobalKeyword */) {
                 // parse 'global' as name of global scope augmentation
                 node.name = parseIdentifier();
                 node.flags |= 512 /* GlobalAugmentation */;
@@ -17684,15 +18697,15 @@ var ts;
         }
         function parseModuleDeclaration(fullStart, decorators, modifiers) {
             var flags = 0;
-            if (token() === 138 /* GlobalKeyword */) {
+            if (token() === 139 /* GlobalKeyword */) {
                 // global augmentation
                 return parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers);
             }
-            else if (parseOptional(127 /* NamespaceKeyword */)) {
+            else if (parseOptional(128 /* NamespaceKeyword */)) {
                 flags |= 16 /* Namespace */;
             }
             else {
-                parseExpected(126 /* ModuleKeyword */);
+                parseExpected(127 /* ModuleKeyword */);
                 if (token() === 9 /* StringLiteral */) {
                     return parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers);
                 }
@@ -17700,7 +18713,7 @@ var ts;
             return parseModuleOrNamespaceDeclaration(fullStart, decorators, modifiers, flags);
         }
         function isExternalModuleReference() {
-            return token() === 130 /* RequireKeyword */ &&
+            return token() === 131 /* RequireKeyword */ &&
                 lookAhead(nextTokenIsOpenParen);
         }
         function nextTokenIsOpenParen() {
@@ -17710,13 +18723,13 @@ var ts;
             return nextToken() === 40 /* SlashToken */;
         }
         function parseNamespaceExportDeclaration(fullStart, decorators, modifiers) {
-            var exportDeclaration = createNode(229 /* NamespaceExportDeclaration */, fullStart);
+            var exportDeclaration = createNode(233 /* NamespaceExportDeclaration */, fullStart);
             exportDeclaration.decorators = decorators;
             exportDeclaration.modifiers = modifiers;
             parseExpected(117 /* AsKeyword */);
-            parseExpected(127 /* NamespaceKeyword */);
+            parseExpected(128 /* NamespaceKeyword */);
             exportDeclaration.name = parseIdentifier();
-            parseExpected(24 /* SemicolonToken */);
+            parseSemicolon();
             return finishNode(exportDeclaration);
         }
         function parseImportDeclarationOrImportEqualsDeclaration(fullStart, decorators, modifiers) {
@@ -17725,11 +18738,11 @@ var ts;
             var identifier;
             if (isIdentifier()) {
                 identifier = parseIdentifier();
-                if (token() !== 25 /* CommaToken */ && token() !== 137 /* FromKeyword */) {
+                if (token() !== 25 /* CommaToken */ && token() !== 138 /* FromKeyword */) {
                     // ImportEquals declaration of type:
                     // import x = require("mod"); or
                     // import x = M.x;
-                    var importEqualsDeclaration = createNode(230 /* ImportEqualsDeclaration */, fullStart);
+                    var importEqualsDeclaration = createNode(234 /* ImportEqualsDeclaration */, fullStart);
                     importEqualsDeclaration.decorators = decorators;
                     importEqualsDeclaration.modifiers = modifiers;
                     importEqualsDeclaration.name = identifier;
@@ -17740,7 +18753,7 @@ var ts;
                 }
             }
             // Import statement
-            var importDeclaration = createNode(231 /* ImportDeclaration */, fullStart);
+            var importDeclaration = createNode(235 /* ImportDeclaration */, fullStart);
             importDeclaration.decorators = decorators;
             importDeclaration.modifiers = modifiers;
             // ImportDeclaration:
@@ -17750,7 +18763,7 @@ var ts;
                 token() === 38 /* AsteriskToken */ ||
                 token() === 16 /* OpenBraceToken */) {
                 importDeclaration.importClause = parseImportClause(identifier, afterImportPos);
-                parseExpected(137 /* FromKeyword */);
+                parseExpected(138 /* FromKeyword */);
             }
             importDeclaration.moduleSpecifier = parseModuleSpecifier();
             parseSemicolon();
@@ -17763,7 +18776,7 @@ var ts;
             //  NamedImports
             //  ImportedDefaultBinding, NameSpaceImport
             //  ImportedDefaultBinding, NamedImports
-            var importClause = createNode(232 /* ImportClause */, fullStart);
+            var importClause = createNode(236 /* ImportClause */, fullStart);
             if (identifier) {
                 // ImportedDefaultBinding:
                 //  ImportedBinding
@@ -17773,7 +18786,7 @@ var ts;
             // parse namespace or named imports
             if (!importClause.name ||
                 parseOptional(25 /* CommaToken */)) {
-                importClause.namedBindings = token() === 38 /* AsteriskToken */ ? parseNamespaceImport() : parseNamedImportsOrExports(234 /* NamedImports */);
+                importClause.namedBindings = token() === 38 /* AsteriskToken */ ? parseNamespaceImport() : parseNamedImportsOrExports(238 /* NamedImports */);
             }
             return finishNode(importClause);
         }
@@ -17783,8 +18796,8 @@ var ts;
                 : parseEntityName(/*allowReservedWords*/ false);
         }
         function parseExternalModuleReference() {
-            var node = createNode(241 /* ExternalModuleReference */);
-            parseExpected(130 /* RequireKeyword */);
+            var node = createNode(245 /* ExternalModuleReference */);
+            parseExpected(131 /* RequireKeyword */);
             parseExpected(18 /* OpenParenToken */);
             node.expression = parseModuleSpecifier();
             parseExpected(19 /* CloseParenToken */);
@@ -17806,7 +18819,7 @@ var ts;
         function parseNamespaceImport() {
             // NameSpaceImport:
             //  * as ImportedBinding
-            var namespaceImport = createNode(233 /* NamespaceImport */);
+            var namespaceImport = createNode(237 /* NamespaceImport */);
             parseExpected(38 /* AsteriskToken */);
             parseExpected(117 /* AsKeyword */);
             namespaceImport.name = parseIdentifier();
@@ -17821,14 +18834,14 @@ var ts;
             // ImportsList:
             //  ImportSpecifier
             //  ImportsList, ImportSpecifier
-            node.elements = parseBracketedList(21 /* ImportOrExportSpecifiers */, kind === 234 /* NamedImports */ ? parseImportSpecifier : parseExportSpecifier, 16 /* OpenBraceToken */, 17 /* CloseBraceToken */);
+            node.elements = parseBracketedList(22 /* ImportOrExportSpecifiers */, kind === 238 /* NamedImports */ ? parseImportSpecifier : parseExportSpecifier, 16 /* OpenBraceToken */, 17 /* CloseBraceToken */);
             return finishNode(node);
         }
         function parseExportSpecifier() {
-            return parseImportOrExportSpecifier(239 /* ExportSpecifier */);
+            return parseImportOrExportSpecifier(243 /* ExportSpecifier */);
         }
         function parseImportSpecifier() {
-            return parseImportOrExportSpecifier(235 /* ImportSpecifier */);
+            return parseImportOrExportSpecifier(239 /* ImportSpecifier */);
         }
         function parseImportOrExportSpecifier(kind) {
             var node = createNode(kind);
@@ -17853,27 +18866,27 @@ var ts;
             else {
                 node.name = identifierName;
             }
-            if (kind === 235 /* ImportSpecifier */ && checkIdentifierIsKeyword) {
+            if (kind === 239 /* ImportSpecifier */ && checkIdentifierIsKeyword) {
                 // Report error identifier expected
                 parseErrorAtPosition(checkIdentifierStart, checkIdentifierEnd - checkIdentifierStart, ts.Diagnostics.Identifier_expected);
             }
             return finishNode(node);
         }
         function parseExportDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(237 /* ExportDeclaration */, fullStart);
+            var node = createNode(241 /* ExportDeclaration */, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             if (parseOptional(38 /* AsteriskToken */)) {
-                parseExpected(137 /* FromKeyword */);
+                parseExpected(138 /* FromKeyword */);
                 node.moduleSpecifier = parseModuleSpecifier();
             }
             else {
-                node.exportClause = parseNamedImportsOrExports(238 /* NamedExports */);
+                node.exportClause = parseNamedImportsOrExports(242 /* 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() === 137 /* FromKeyword */ || (token() === 9 /* StringLiteral */ && !scanner.hasPrecedingLineBreak())) {
-                    parseExpected(137 /* FromKeyword */);
+                if (token() === 138 /* FromKeyword */ || (token() === 9 /* StringLiteral */ && !scanner.hasPrecedingLineBreak())) {
+                    parseExpected(138 /* FromKeyword */);
                     node.moduleSpecifier = parseModuleSpecifier();
                 }
             }
@@ -17881,7 +18894,7 @@ var ts;
             return finishNode(node);
         }
         function parseExportAssignment(fullStart, decorators, modifiers) {
-            var node = createNode(236 /* ExportAssignment */, fullStart);
+            var node = createNode(240 /* ExportAssignment */, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             if (parseOptional(57 /* EqualsToken */)) {
@@ -17963,10 +18976,10 @@ var ts;
         function setExternalModuleIndicator(sourceFile) {
             sourceFile.externalModuleIndicator = ts.forEach(sourceFile.statements, function (node) {
                 return ts.hasModifier(node, 1 /* Export */)
-                    || node.kind === 230 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 241 /* ExternalModuleReference */
-                    || node.kind === 231 /* ImportDeclaration */
-                    || node.kind === 236 /* ExportAssignment */
-                    || node.kind === 237 /* ExportDeclaration */
+                    || node.kind === 234 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 245 /* ExternalModuleReference */
+                    || node.kind === 235 /* ImportDeclaration */
+                    || node.kind === 240 /* ExportAssignment */
+                    || node.kind === 241 /* ExportDeclaration */
                     ? node
                     : undefined;
             });
@@ -17990,16 +19003,17 @@ var ts;
             ParsingContext[ParsingContext["JsxChildren"] = 14] = "JsxChildren";
             ParsingContext[ParsingContext["ArrayLiteralMembers"] = 15] = "ArrayLiteralMembers";
             ParsingContext[ParsingContext["Parameters"] = 16] = "Parameters";
-            ParsingContext[ParsingContext["TypeParameters"] = 17] = "TypeParameters";
-            ParsingContext[ParsingContext["TypeArguments"] = 18] = "TypeArguments";
-            ParsingContext[ParsingContext["TupleElementTypes"] = 19] = "TupleElementTypes";
-            ParsingContext[ParsingContext["HeritageClauses"] = 20] = "HeritageClauses";
-            ParsingContext[ParsingContext["ImportOrExportSpecifiers"] = 21] = "ImportOrExportSpecifiers";
-            ParsingContext[ParsingContext["JSDocFunctionParameters"] = 22] = "JSDocFunctionParameters";
-            ParsingContext[ParsingContext["JSDocTypeArguments"] = 23] = "JSDocTypeArguments";
-            ParsingContext[ParsingContext["JSDocRecordMembers"] = 24] = "JSDocRecordMembers";
-            ParsingContext[ParsingContext["JSDocTupleTypes"] = 25] = "JSDocTupleTypes";
-            ParsingContext[ParsingContext["Count"] = 26] = "Count"; // Number of parsing contexts
+            ParsingContext[ParsingContext["RestProperties"] = 17] = "RestProperties";
+            ParsingContext[ParsingContext["TypeParameters"] = 18] = "TypeParameters";
+            ParsingContext[ParsingContext["TypeArguments"] = 19] = "TypeArguments";
+            ParsingContext[ParsingContext["TupleElementTypes"] = 20] = "TupleElementTypes";
+            ParsingContext[ParsingContext["HeritageClauses"] = 21] = "HeritageClauses";
+            ParsingContext[ParsingContext["ImportOrExportSpecifiers"] = 22] = "ImportOrExportSpecifiers";
+            ParsingContext[ParsingContext["JSDocFunctionParameters"] = 23] = "JSDocFunctionParameters";
+            ParsingContext[ParsingContext["JSDocTypeArguments"] = 24] = "JSDocTypeArguments";
+            ParsingContext[ParsingContext["JSDocRecordMembers"] = 25] = "JSDocRecordMembers";
+            ParsingContext[ParsingContext["JSDocTupleTypes"] = 26] = "JSDocTupleTypes";
+            ParsingContext[ParsingContext["Count"] = 27] = "Count"; // Number of parsing contexts
         })(ParsingContext || (ParsingContext = {}));
         var Tristate;
         (function (Tristate) {
@@ -18027,8 +19041,8 @@ var ts;
             }
             JSDocParser.isJSDocType = isJSDocType;
             function parseJSDocTypeExpressionForTests(content, start, length) {
-                initializeState(content, 4 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
-                sourceFile = createSourceFile("file.js", 4 /* Latest */, 1 /* JS */);
+                initializeState(content, 5 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
+                sourceFile = createSourceFile("file.js", 5 /* Latest */, 1 /* JS */);
                 scanner.setText(content, start, length);
                 currentToken = scanner.scan();
                 var jsDocTypeExpression = parseJSDocTypeExpression();
@@ -18040,7 +19054,7 @@ var ts;
             // Parses out a JSDoc type expression.
             /* @internal */
             function parseJSDocTypeExpression() {
-                var result = createNode(257 /* JSDocTypeExpression */, scanner.getTokenPos());
+                var result = createNode(262 /* JSDocTypeExpression */, scanner.getTokenPos());
                 parseExpected(16 /* OpenBraceToken */);
                 result.type = parseJSDocTopLevelType();
                 parseExpected(17 /* CloseBraceToken */);
@@ -18051,12 +19065,12 @@ var ts;
             function parseJSDocTopLevelType() {
                 var type = parseJSDocType();
                 if (token() === 48 /* BarToken */) {
-                    var unionType = createNode(261 /* JSDocUnionType */, type.pos);
+                    var unionType = createNode(266 /* JSDocUnionType */, type.pos);
                     unionType.types = parseJSDocTypeList(type);
                     type = finishNode(unionType);
                 }
                 if (token() === 57 /* EqualsToken */) {
-                    var optionalType = createNode(268 /* JSDocOptionalType */, type.pos);
+                    var optionalType = createNode(273 /* JSDocOptionalType */, type.pos);
                     nextToken();
                     optionalType.type = type;
                     type = finishNode(optionalType);
@@ -18067,20 +19081,20 @@ var ts;
                 var type = parseBasicTypeExpression();
                 while (true) {
                     if (token() === 20 /* OpenBracketToken */) {
-                        var arrayType = createNode(260 /* JSDocArrayType */, type.pos);
+                        var arrayType = createNode(265 /* JSDocArrayType */, type.pos);
                         arrayType.elementType = type;
                         nextToken();
                         parseExpected(21 /* CloseBracketToken */);
                         type = finishNode(arrayType);
                     }
                     else if (token() === 54 /* QuestionToken */) {
-                        var nullableType = createNode(263 /* JSDocNullableType */, type.pos);
+                        var nullableType = createNode(268 /* JSDocNullableType */, type.pos);
                         nullableType.type = type;
                         nextToken();
                         type = finishNode(nullableType);
                     }
                     else if (token() === 50 /* ExclamationToken */) {
-                        var nonNullableType = createNode(264 /* JSDocNonNullableType */, type.pos);
+                        var nonNullableType = createNode(269 /* JSDocNonNullableType */, type.pos);
                         nonNullableType.type = type;
                         nextToken();
                         type = finishNode(nonNullableType);
@@ -18114,14 +19128,14 @@ var ts;
                     case 98 /* ThisKeyword */:
                         return parseJSDocThisType();
                     case 118 /* AnyKeyword */:
-                    case 133 /* StringKeyword */:
-                    case 131 /* NumberKeyword */:
+                    case 134 /* StringKeyword */:
+                    case 132 /* NumberKeyword */:
                     case 121 /* BooleanKeyword */:
-                    case 134 /* SymbolKeyword */:
+                    case 135 /* SymbolKeyword */:
                     case 104 /* VoidKeyword */:
                     case 94 /* NullKeyword */:
-                    case 136 /* UndefinedKeyword */:
-                    case 128 /* NeverKeyword */:
+                    case 137 /* UndefinedKeyword */:
+                    case 129 /* NeverKeyword */:
                         return parseTokenNode();
                     case 9 /* StringLiteral */:
                     case 8 /* NumericLiteral */:
@@ -18132,30 +19146,30 @@ var ts;
                 return parseJSDocTypeReference();
             }
             function parseJSDocThisType() {
-                var result = createNode(272 /* JSDocThisType */);
+                var result = createNode(277 /* JSDocThisType */);
                 nextToken();
                 parseExpected(55 /* ColonToken */);
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocConstructorType() {
-                var result = createNode(271 /* JSDocConstructorType */);
+                var result = createNode(276 /* JSDocConstructorType */);
                 nextToken();
                 parseExpected(55 /* ColonToken */);
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocVariadicType() {
-                var result = createNode(270 /* JSDocVariadicType */);
+                var result = createNode(275 /* JSDocVariadicType */);
                 nextToken();
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocFunctionType() {
-                var result = createNode(269 /* JSDocFunctionType */);
+                var result = createNode(274 /* JSDocFunctionType */);
                 nextToken();
                 parseExpected(18 /* OpenParenToken */);
-                result.parameters = parseDelimitedList(22 /* JSDocFunctionParameters */, parseJSDocParameter);
+                result.parameters = parseDelimitedList(23 /* JSDocFunctionParameters */, parseJSDocParameter);
                 checkForTrailingComma(result.parameters);
                 parseExpected(19 /* CloseParenToken */);
                 if (token() === 55 /* ColonToken */) {
@@ -18165,7 +19179,7 @@ var ts;
                 return finishNode(result);
             }
             function parseJSDocParameter() {
-                var parameter = createNode(143 /* Parameter */);
+                var parameter = createNode(144 /* Parameter */);
                 parameter.type = parseJSDocType();
                 if (parseOptional(57 /* EqualsToken */)) {
                     // TODO(rbuckton): Can this be changed to SyntaxKind.QuestionToken?
@@ -18174,7 +19188,7 @@ var ts;
                 return finishNode(parameter);
             }
             function parseJSDocTypeReference() {
-                var result = createNode(267 /* JSDocTypeReference */);
+                var result = createNode(272 /* JSDocTypeReference */);
                 result.name = parseSimplePropertyName();
                 if (token() === 26 /* LessThanToken */) {
                     result.typeArguments = parseTypeArguments();
@@ -18195,7 +19209,7 @@ var ts;
             function parseTypeArguments() {
                 // Move past the <
                 nextToken();
-                var typeArguments = parseDelimitedList(23 /* JSDocTypeArguments */, parseJSDocType);
+                var typeArguments = parseDelimitedList(24 /* JSDocTypeArguments */, parseJSDocType);
                 checkForTrailingComma(typeArguments);
                 checkForEmptyTypeArgumentList(typeArguments);
                 parseExpected(28 /* GreaterThanToken */);
@@ -18209,26 +19223,26 @@ var ts;
                 }
             }
             function parseQualifiedName(left) {
-                var result = createNode(140 /* QualifiedName */, left.pos);
+                var result = createNode(141 /* QualifiedName */, left.pos);
                 result.left = left;
                 result.right = parseIdentifierName();
                 return finishNode(result);
             }
             function parseJSDocRecordType() {
-                var result = createNode(265 /* JSDocRecordType */);
+                var result = createNode(270 /* JSDocRecordType */);
                 result.literal = parseTypeLiteral();
                 return finishNode(result);
             }
             function parseJSDocNonNullableType() {
-                var result = createNode(264 /* JSDocNonNullableType */);
+                var result = createNode(269 /* JSDocNonNullableType */);
                 nextToken();
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocTupleType() {
-                var result = createNode(262 /* JSDocTupleType */);
+                var result = createNode(267 /* JSDocTupleType */);
                 nextToken();
-                result.types = parseDelimitedList(25 /* JSDocTupleTypes */, parseJSDocType);
+                result.types = parseDelimitedList(26 /* JSDocTupleTypes */, parseJSDocType);
                 checkForTrailingComma(result.types);
                 parseExpected(21 /* CloseBracketToken */);
                 return finishNode(result);
@@ -18240,7 +19254,7 @@ var ts;
                 }
             }
             function parseJSDocUnionType() {
-                var result = createNode(261 /* JSDocUnionType */);
+                var result = createNode(266 /* JSDocUnionType */);
                 nextToken();
                 result.types = parseJSDocTypeList(parseJSDocType());
                 parseExpected(19 /* CloseParenToken */);
@@ -18256,12 +19270,12 @@ var ts;
                 return types;
             }
             function parseJSDocAllType() {
-                var result = createNode(258 /* JSDocAllType */);
+                var result = createNode(263 /* JSDocAllType */);
                 nextToken();
                 return finishNode(result);
             }
             function parseJSDocLiteralType() {
-                var result = createNode(282 /* JSDocLiteralType */);
+                var result = createNode(287 /* JSDocLiteralType */);
                 result.literal = parseLiteralTypeNode();
                 return finishNode(result);
             }
@@ -18284,17 +19298,17 @@ var ts;
                     token() === 28 /* GreaterThanToken */ ||
                     token() === 57 /* EqualsToken */ ||
                     token() === 48 /* BarToken */) {
-                    var result = createNode(259 /* JSDocUnknownType */, pos);
+                    var result = createNode(264 /* JSDocUnknownType */, pos);
                     return finishNode(result);
                 }
                 else {
-                    var result = createNode(263 /* JSDocNullableType */, pos);
+                    var result = createNode(268 /* JSDocNullableType */, pos);
                     result.type = parseJSDocType();
                     return finishNode(result);
                 }
             }
             function parseIsolatedJSDocComment(content, start, length) {
-                initializeState(content, 4 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
+                initializeState(content, 5 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
                 sourceFile = { languageVariant: 0 /* Standard */, text: content };
                 var jsDoc = parseJSDocCommentWorker(start, length);
                 var diagnostics = parseDiagnostics;
@@ -18359,6 +19373,7 @@ var ts;
                     }
                     if (token() === 4 /* NewLineTrivia */) {
                         state = 0 /* BeginningOfLine */;
+                        indent = 0;
                         nextJSDocToken();
                     }
                     while (token() !== 1 /* EndOfFileToken */) {
@@ -18447,7 +19462,7 @@ var ts;
                         content.charCodeAt(start + 3) !== 42 /* asterisk */;
                 }
                 function createJSDocComment() {
-                    var result = createNode(273 /* JSDocComment */, start);
+                    var result = createNode(278 /* JSDocComment */, start);
                     result.tags = tags;
                     result.comment = comments.length ? comments.join("") : undefined;
                     return finishNode(result, end);
@@ -18560,7 +19575,7 @@ var ts;
                     return comments;
                 }
                 function parseUnknownTag(atToken, tagName) {
-                    var result = createNode(274 /* JSDocTag */, atToken.pos);
+                    var result = createNode(279 /* JSDocTag */, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     return finishNode(result);
@@ -18617,7 +19632,7 @@ var ts;
                     if (!typeExpression) {
                         typeExpression = tryParseTypeExpression();
                     }
-                    var result = createNode(275 /* JSDocParameterTag */, atToken.pos);
+                    var result = createNode(280 /* JSDocParameterTag */, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.preParameterName = preName;
@@ -18628,20 +19643,20 @@ var ts;
                     return finishNode(result);
                 }
                 function parseReturnTag(atToken, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 276 /* JSDocReturnTag */; })) {
+                    if (ts.forEach(tags, function (t) { return t.kind === 281 /* JSDocReturnTag */; })) {
                         parseErrorAtPosition(tagName.pos, scanner.getTokenPos() - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
                     }
-                    var result = createNode(276 /* JSDocReturnTag */, atToken.pos);
+                    var result = createNode(281 /* JSDocReturnTag */, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.typeExpression = tryParseTypeExpression();
                     return finishNode(result);
                 }
                 function parseTypeTag(atToken, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 277 /* JSDocTypeTag */; })) {
+                    if (ts.forEach(tags, function (t) { return t.kind === 282 /* JSDocTypeTag */; })) {
                         parseErrorAtPosition(tagName.pos, scanner.getTokenPos() - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
                     }
-                    var result = createNode(277 /* JSDocTypeTag */, atToken.pos);
+                    var result = createNode(282 /* JSDocTypeTag */, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.typeExpression = tryParseTypeExpression();
@@ -18656,7 +19671,7 @@ var ts;
                         parseErrorAtPosition(scanner.getStartPos(), /*length*/ 0, ts.Diagnostics.Identifier_expected);
                         return undefined;
                     }
-                    var result = createNode(280 /* JSDocPropertyTag */, atToken.pos);
+                    var result = createNode(285 /* JSDocPropertyTag */, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.name = name;
@@ -18666,18 +19681,25 @@ var ts;
                 function parseTypedefTag(atToken, tagName) {
                     var typeExpression = tryParseTypeExpression();
                     skipWhitespace();
-                    var typedefTag = createNode(279 /* JSDocTypedefTag */, atToken.pos);
+                    var typedefTag = createNode(284 /* JSDocTypedefTag */, atToken.pos);
                     typedefTag.atToken = atToken;
                     typedefTag.tagName = tagName;
-                    typedefTag.name = parseJSDocIdentifierName();
+                    typedefTag.fullName = parseJSDocTypeNameWithNamespace(/*flags*/ 0);
+                    if (typedefTag.fullName) {
+                        var rightNode = typedefTag.fullName;
+                        while (rightNode.kind !== 70 /* Identifier */) {
+                            rightNode = rightNode.body;
+                        }
+                        typedefTag.name = rightNode;
+                    }
                     typedefTag.typeExpression = typeExpression;
                     skipWhitespace();
                     if (typeExpression) {
-                        if (typeExpression.type.kind === 267 /* JSDocTypeReference */) {
+                        if (typeExpression.type.kind === 272 /* JSDocTypeReference */) {
                             var jsDocTypeReference = typeExpression.type;
                             if (jsDocTypeReference.name.kind === 70 /* Identifier */) {
-                                var name_11 = jsDocTypeReference.name;
-                                if (name_11.text === "Object") {
+                                var name_15 = jsDocTypeReference.name;
+                                if (name_15.text === "Object") {
                                     typedefTag.jsDocTypeLiteral = scanChildTags();
                                 }
                             }
@@ -18691,7 +19713,7 @@ var ts;
                     }
                     return finishNode(typedefTag);
                     function scanChildTags() {
-                        var jsDocTypeLiteral = createNode(281 /* JSDocTypeLiteral */, scanner.getStartPos());
+                        var jsDocTypeLiteral = createNode(286 /* JSDocTypeLiteral */, scanner.getStartPos());
                         var resumePos = scanner.getStartPos();
                         var canParseTag = true;
                         var seenAsterisk = false;
@@ -18728,6 +19750,21 @@ var ts;
                         scanner.setTextPos(resumePos);
                         return finishNode(jsDocTypeLiteral);
                     }
+                    function parseJSDocTypeNameWithNamespace(flags) {
+                        var pos = scanner.getTokenPos();
+                        var typeNameOrNamespaceName = parseJSDocIdentifierName();
+                        if (typeNameOrNamespaceName && parseOptional(22 /* DotToken */)) {
+                            var jsDocNamespaceNode = createNode(230 /* ModuleDeclaration */, pos);
+                            jsDocNamespaceNode.flags |= flags;
+                            jsDocNamespaceNode.name = typeNameOrNamespaceName;
+                            jsDocNamespaceNode.body = parseJSDocTypeNameWithNamespace(4 /* NestedNamespace */);
+                            return jsDocNamespaceNode;
+                        }
+                        if (typeNameOrNamespaceName && flags & 4 /* NestedNamespace */) {
+                            typeNameOrNamespaceName.isInJSDocNamespace = true;
+                        }
+                        return typeNameOrNamespaceName;
+                    }
                 }
                 function tryParseChildTag(parentTag) {
                     ts.Debug.assert(token() === 56 /* AtToken */);
@@ -18749,30 +19786,34 @@ var ts;
                             return true;
                         case "prop":
                         case "property":
-                            if (!parentTag.jsDocPropertyTags) {
-                                parentTag.jsDocPropertyTags = [];
-                            }
                             var propertyTag = parsePropertyTag(atToken, tagName);
-                            parentTag.jsDocPropertyTags.push(propertyTag);
-                            return true;
+                            if (propertyTag) {
+                                if (!parentTag.jsDocPropertyTags) {
+                                    parentTag.jsDocPropertyTags = [];
+                                }
+                                parentTag.jsDocPropertyTags.push(propertyTag);
+                                return true;
+                            }
+                            // Error parsing property tag
+                            return false;
                     }
                     return false;
                 }
                 function parseTemplateTag(atToken, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 278 /* JSDocTemplateTag */; })) {
+                    if (ts.forEach(tags, function (t) { return t.kind === 283 /* JSDocTemplateTag */; })) {
                         parseErrorAtPosition(tagName.pos, scanner.getTokenPos() - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
                     }
                     // Type parameter list looks like '@template T,U,V'
                     var typeParameters = createNodeArray();
                     while (true) {
-                        var name_12 = parseJSDocIdentifierName();
+                        var name_16 = parseJSDocIdentifierName();
                         skipWhitespace();
-                        if (!name_12) {
+                        if (!name_16) {
                             parseErrorAtPosition(scanner.getStartPos(), 0, ts.Diagnostics.Identifier_expected);
                             return undefined;
                         }
-                        var typeParameter = createNode(142 /* TypeParameter */, name_12.pos);
-                        typeParameter.name = name_12;
+                        var typeParameter = createNode(143 /* TypeParameter */, name_16.pos);
+                        typeParameter.name = name_16;
                         finishNode(typeParameter);
                         typeParameters.push(typeParameter);
                         if (token() === 25 /* CommaToken */) {
@@ -18783,7 +19824,7 @@ var ts;
                             break;
                         }
                     }
-                    var result = createNode(278 /* JSDocTemplateTag */, atToken.pos);
+                    var result = createNode(283 /* JSDocTemplateTag */, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.typeParameters = typeParameters;
@@ -19294,25 +20335,25 @@ var ts;
 /* @internal */
 var ts;
 (function (ts) {
+    var ModuleInstanceState;
     (function (ModuleInstanceState) {
         ModuleInstanceState[ModuleInstanceState["NonInstantiated"] = 0] = "NonInstantiated";
         ModuleInstanceState[ModuleInstanceState["Instantiated"] = 1] = "Instantiated";
         ModuleInstanceState[ModuleInstanceState["ConstEnumOnly"] = 2] = "ConstEnumOnly";
-    })(ts.ModuleInstanceState || (ts.ModuleInstanceState = {}));
-    var ModuleInstanceState = ts.ModuleInstanceState;
+    })(ModuleInstanceState = ts.ModuleInstanceState || (ts.ModuleInstanceState = {}));
     function getModuleInstanceState(node) {
         // A module is uninstantiated if it contains only
         // 1. interface declarations, type alias declarations
-        if (node.kind === 223 /* InterfaceDeclaration */ || node.kind === 224 /* TypeAliasDeclaration */) {
+        if (node.kind === 227 /* InterfaceDeclaration */ || node.kind === 228 /* TypeAliasDeclaration */) {
             return 0 /* NonInstantiated */;
         }
         else if (ts.isConstEnumDeclaration(node)) {
             return 2 /* ConstEnumOnly */;
         }
-        else if ((node.kind === 231 /* ImportDeclaration */ || node.kind === 230 /* ImportEqualsDeclaration */) && !(ts.hasModifier(node, 1 /* Export */))) {
+        else if ((node.kind === 235 /* ImportDeclaration */ || node.kind === 234 /* ImportEqualsDeclaration */) && !(ts.hasModifier(node, 1 /* Export */))) {
             return 0 /* NonInstantiated */;
         }
-        else if (node.kind === 227 /* ModuleBlock */) {
+        else if (node.kind === 231 /* ModuleBlock */) {
             var state_1 = 0 /* NonInstantiated */;
             ts.forEachChild(node, function (n) {
                 switch (getModuleInstanceState(n)) {
@@ -19331,10 +20372,13 @@ var ts;
             });
             return state_1;
         }
-        else if (node.kind === 226 /* ModuleDeclaration */) {
+        else if (node.kind === 230 /* ModuleDeclaration */) {
             var body = node.body;
             return body ? getModuleInstanceState(body) : 1 /* Instantiated */;
         }
+        else if (node.kind === 70 /* Identifier */ && node.isInJSDocNamespace) {
+            return 0 /* NonInstantiated */;
+        }
         else {
             return 1 /* Instantiated */;
         }
@@ -19469,7 +20513,7 @@ var ts;
             if (symbolFlags & 107455 /* Value */) {
                 var valueDeclaration = symbol.valueDeclaration;
                 if (!valueDeclaration ||
-                    (valueDeclaration.kind !== node.kind && valueDeclaration.kind === 226 /* ModuleDeclaration */)) {
+                    (valueDeclaration.kind !== node.kind && valueDeclaration.kind === 230 /* ModuleDeclaration */)) {
                     // other kinds of value declarations take precedence over modules
                     symbol.valueDeclaration = node;
                 }
@@ -19482,7 +20526,7 @@ var ts;
                 if (ts.isAmbientModule(node)) {
                     return ts.isGlobalScopeAugmentation(node) ? "__global" : "\"" + node.name.text + "\"";
                 }
-                if (node.name.kind === 141 /* ComputedPropertyName */) {
+                if (node.name.kind === 142 /* ComputedPropertyName */) {
                     var nameExpression = node.name.expression;
                     // treat computed property names where expression is string/numeric literal as just string/numeric literal
                     if (ts.isStringOrNumericLiteral(nameExpression.kind)) {
@@ -19494,21 +20538,21 @@ var ts;
                 return node.name.text;
             }
             switch (node.kind) {
-                case 149 /* Constructor */:
+                case 150 /* Constructor */:
                     return "__constructor";
-                case 157 /* FunctionType */:
-                case 152 /* CallSignature */:
+                case 158 /* FunctionType */:
+                case 153 /* CallSignature */:
                     return "__call";
-                case 158 /* ConstructorType */:
-                case 153 /* ConstructSignature */:
+                case 159 /* ConstructorType */:
+                case 154 /* ConstructSignature */:
                     return "__new";
-                case 154 /* IndexSignature */:
+                case 155 /* IndexSignature */:
                     return "__index";
-                case 237 /* ExportDeclaration */:
+                case 241 /* ExportDeclaration */:
                     return "__export";
-                case 236 /* ExportAssignment */:
+                case 240 /* ExportAssignment */:
                     return node.isExportEquals ? "export=" : "default";
-                case 188 /* BinaryExpression */:
+                case 192 /* BinaryExpression */:
                     switch (ts.getSpecialPropertyAssignmentKind(node)) {
                         case 2 /* ModuleExports */:
                             // module.exports = ...
@@ -19523,22 +20567,22 @@ var ts;
                     }
                     ts.Debug.fail("Unknown binary declaration kind");
                     break;
-                case 221 /* FunctionDeclaration */:
-                case 222 /* ClassDeclaration */:
+                case 225 /* FunctionDeclaration */:
+                case 226 /* ClassDeclaration */:
                     return ts.hasModifier(node, 512 /* Default */) ? "default" : undefined;
-                case 269 /* JSDocFunctionType */:
+                case 274 /* JSDocFunctionType */:
                     return ts.isJSDocConstructSignature(node) ? "__new" : "__call";
-                case 143 /* Parameter */:
+                case 144 /* 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 === 269 /* JSDocFunctionType */);
+                    ts.Debug.assert(node.parent.kind === 274 /* JSDocFunctionType */);
                     var functionType = node.parent;
                     var index = ts.indexOf(functionType.parameters, node);
                     return "arg" + index;
-                case 279 /* JSDocTypedefTag */:
+                case 284 /* JSDocTypedefTag */:
                     var parentNode = node.parent && node.parent.parent;
                     var nameFromParentNode = void 0;
-                    if (parentNode && parentNode.kind === 201 /* VariableStatement */) {
+                    if (parentNode && parentNode.kind === 205 /* VariableStatement */) {
                         if (parentNode.declarationList.declarations.length > 0) {
                             var nameIdentifier = parentNode.declarationList.declarations[0].name;
                             if (nameIdentifier.kind === 70 /* Identifier */) {
@@ -19625,7 +20669,7 @@ 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 &&
-                                    (isDefaultExport || (node.kind === 236 /* ExportAssignment */ && !node.isExportEquals))) {
+                                    (isDefaultExport || (node.kind === 240 /* ExportAssignment */ && !node.isExportEquals))) {
                                     message_1 = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
                                 }
                             }
@@ -19645,7 +20689,7 @@ var ts;
         function declareModuleMember(node, symbolFlags, symbolExcludes) {
             var hasExportModifier = ts.getCombinedModifierFlags(node) & 1 /* Export */;
             if (symbolFlags & 8388608 /* Alias */) {
-                if (node.kind === 239 /* ExportSpecifier */ || (node.kind === 230 /* ImportEqualsDeclaration */ && hasExportModifier)) {
+                if (node.kind === 243 /* ExportSpecifier */ || (node.kind === 234 /* ImportEqualsDeclaration */ && hasExportModifier)) {
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
                 }
                 else {
@@ -19668,7 +20712,11 @@ var ts;
                 //       during global merging in the checker. Why? The only case when ambient module is permitted inside another module is module augmentation
                 //       and this case is specially handled. Module augmentations should only be merged with original module definition
                 //       and should never be merged directly with other augmentation, and the latter case would be possible if automatic merge is allowed.
-                if (!ts.isAmbientModule(node) && (hasExportModifier || container.flags & 32 /* ExportContext */)) {
+                var isJSDocTypedefInJSDocNamespace = node.kind === 284 /* JSDocTypedefTag */ &&
+                    node.name &&
+                    node.name.kind === 70 /* Identifier */ &&
+                    node.name.isInJSDocNamespace;
+                if ((!ts.isAmbientModule(node) && (hasExportModifier || container.flags & 32 /* ExportContext */)) || isJSDocTypedefInJSDocNamespace) {
                     var exportKind = (symbolFlags & 107455 /* Value */ ? 1048576 /* ExportValue */ : 0) |
                         (symbolFlags & 793064 /* Type */ ? 2097152 /* ExportType */ : 0) |
                         (symbolFlags & 1920 /* Namespace */ ? 4194304 /* ExportNamespace */ : 0);
@@ -19726,8 +20774,8 @@ var ts;
                 var saveReturnTarget = currentReturnTarget;
                 var saveActiveLabels = activeLabels;
                 var saveHasExplicitReturn = hasExplicitReturn;
-                var isIIFE = containerFlags & 16 /* IsFunctionExpression */ && !!ts.getImmediatelyInvokedFunctionExpression(node);
-                // An IIFE is considered part of the containing control flow. Return statements behave
+                var isIIFE = containerFlags & 16 /* IsFunctionExpression */ && !ts.hasModifier(node, 256 /* Async */) && !!ts.getImmediatelyInvokedFunctionExpression(node);
+                // A non-async IIFE is considered part of the containing control flow. Return statements behave
                 // similarly to break statements that exit to a label just past the statement body.
                 if (isIIFE) {
                     currentReturnTarget = createBranchLabel();
@@ -19746,13 +20794,13 @@ var ts;
                 bindChildren(node);
                 // Reset all reachability check related flags on node (for incremental scenarios)
                 // Reset all emit helper flags on node (for incremental scenarios)
-                node.flags &= ~32128 /* ReachabilityAndEmitFlags */;
+                node.flags &= ~64896 /* ReachabilityAndEmitFlags */;
                 if (!(currentFlow.flags & 1 /* Unreachable */) && containerFlags & 8 /* IsFunctionLike */ && ts.nodeIsPresent(node.body)) {
                     node.flags |= 128 /* HasImplicitReturn */;
                     if (hasExplicitReturn)
                         node.flags |= 256 /* HasExplicitReturn */;
                 }
-                if (node.kind === 256 /* SourceFile */) {
+                if (node.kind === 261 /* SourceFile */) {
                     node.flags |= emitFlags;
                 }
                 if (isIIFE) {
@@ -19787,6 +20835,7 @@ var ts;
                 skipTransformFlagAggregation = true;
                 bindChildrenWorker(node);
                 skipTransformFlagAggregation = false;
+                subtreeTransformFlags |= node.transformFlags & ~getTransformFlagsSubtreeExclusions(node.kind);
             }
             else {
                 var savedSubtreeTransformFlags = subtreeTransformFlags;
@@ -19807,64 +20856,64 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 206 /* WhileStatement */:
+                case 210 /* WhileStatement */:
                     bindWhileStatement(node);
                     break;
-                case 205 /* DoStatement */:
+                case 209 /* DoStatement */:
                     bindDoStatement(node);
                     break;
-                case 207 /* ForStatement */:
+                case 211 /* ForStatement */:
                     bindForStatement(node);
                     break;
-                case 208 /* ForInStatement */:
-                case 209 /* ForOfStatement */:
+                case 212 /* ForInStatement */:
+                case 213 /* ForOfStatement */:
                     bindForInOrForOfStatement(node);
                     break;
-                case 204 /* IfStatement */:
+                case 208 /* IfStatement */:
                     bindIfStatement(node);
                     break;
-                case 212 /* ReturnStatement */:
-                case 216 /* ThrowStatement */:
+                case 216 /* ReturnStatement */:
+                case 220 /* ThrowStatement */:
                     bindReturnOrThrow(node);
                     break;
-                case 211 /* BreakStatement */:
-                case 210 /* ContinueStatement */:
+                case 215 /* BreakStatement */:
+                case 214 /* ContinueStatement */:
                     bindBreakOrContinueStatement(node);
                     break;
-                case 217 /* TryStatement */:
+                case 221 /* TryStatement */:
                     bindTryStatement(node);
                     break;
-                case 214 /* SwitchStatement */:
+                case 218 /* SwitchStatement */:
                     bindSwitchStatement(node);
                     break;
-                case 228 /* CaseBlock */:
+                case 232 /* CaseBlock */:
                     bindCaseBlock(node);
                     break;
-                case 249 /* CaseClause */:
+                case 253 /* CaseClause */:
                     bindCaseClause(node);
                     break;
-                case 215 /* LabeledStatement */:
+                case 219 /* LabeledStatement */:
                     bindLabeledStatement(node);
                     break;
-                case 186 /* PrefixUnaryExpression */:
+                case 190 /* PrefixUnaryExpression */:
                     bindPrefixUnaryExpressionFlow(node);
                     break;
-                case 187 /* PostfixUnaryExpression */:
+                case 191 /* PostfixUnaryExpression */:
                     bindPostfixUnaryExpressionFlow(node);
                     break;
-                case 188 /* BinaryExpression */:
+                case 192 /* BinaryExpression */:
                     bindBinaryExpressionFlow(node);
                     break;
-                case 182 /* DeleteExpression */:
+                case 186 /* DeleteExpression */:
                     bindDeleteExpressionFlow(node);
                     break;
-                case 189 /* ConditionalExpression */:
+                case 193 /* ConditionalExpression */:
                     bindConditionalExpressionFlow(node);
                     break;
-                case 219 /* VariableDeclaration */:
+                case 223 /* VariableDeclaration */:
                     bindVariableDeclarationFlow(node);
                     break;
-                case 175 /* CallExpression */:
+                case 179 /* CallExpression */:
                     bindCallExpressionFlow(node);
                     break;
                 default:
@@ -19876,15 +20925,15 @@ var ts;
             switch (expr.kind) {
                 case 70 /* Identifier */:
                 case 98 /* ThisKeyword */:
-                case 173 /* PropertyAccessExpression */:
+                case 177 /* PropertyAccessExpression */:
                     return isNarrowableReference(expr);
-                case 175 /* CallExpression */:
+                case 179 /* CallExpression */:
                     return hasNarrowableArgument(expr);
-                case 179 /* ParenthesizedExpression */:
+                case 183 /* ParenthesizedExpression */:
                     return isNarrowingExpression(expr.expression);
-                case 188 /* BinaryExpression */:
+                case 192 /* BinaryExpression */:
                     return isNarrowingBinaryExpression(expr);
-                case 186 /* PrefixUnaryExpression */:
+                case 190 /* PrefixUnaryExpression */:
                     return expr.operator === 50 /* ExclamationToken */ && isNarrowingExpression(expr.operand);
             }
             return false;
@@ -19892,7 +20941,7 @@ var ts;
         function isNarrowableReference(expr) {
             return expr.kind === 70 /* Identifier */ ||
                 expr.kind === 98 /* ThisKeyword */ ||
-                expr.kind === 173 /* PropertyAccessExpression */ && isNarrowableReference(expr.expression);
+                expr.kind === 177 /* PropertyAccessExpression */ && isNarrowableReference(expr.expression);
         }
         function hasNarrowableArgument(expr) {
             if (expr.arguments) {
@@ -19903,14 +20952,14 @@ var ts;
                     }
                 }
             }
-            if (expr.expression.kind === 173 /* PropertyAccessExpression */ &&
+            if (expr.expression.kind === 177 /* PropertyAccessExpression */ &&
                 isNarrowableReference(expr.expression.expression)) {
                 return true;
             }
             return false;
         }
         function isNarrowingTypeofOperands(expr1, expr2) {
-            return expr1.kind === 183 /* TypeOfExpression */ && isNarrowableOperand(expr1.expression) && expr2.kind === 9 /* StringLiteral */;
+            return expr1.kind === 187 /* TypeOfExpression */ && isNarrowableOperand(expr1.expression) && expr2.kind === 9 /* StringLiteral */;
         }
         function isNarrowingBinaryExpression(expr) {
             switch (expr.operatorToken.kind) {
@@ -19931,9 +20980,9 @@ var ts;
         }
         function isNarrowableOperand(expr) {
             switch (expr.kind) {
-                case 179 /* ParenthesizedExpression */:
+                case 183 /* ParenthesizedExpression */:
                     return isNarrowableOperand(expr.expression);
-                case 188 /* BinaryExpression */:
+                case 192 /* BinaryExpression */:
                     switch (expr.operatorToken.kind) {
                         case 57 /* EqualsToken */:
                             return isNarrowableOperand(expr.left);
@@ -20028,33 +21077,33 @@ var ts;
         function isStatementCondition(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 204 /* IfStatement */:
-                case 206 /* WhileStatement */:
-                case 205 /* DoStatement */:
+                case 208 /* IfStatement */:
+                case 210 /* WhileStatement */:
+                case 209 /* DoStatement */:
                     return parent.expression === node;
-                case 207 /* ForStatement */:
-                case 189 /* ConditionalExpression */:
+                case 211 /* ForStatement */:
+                case 193 /* ConditionalExpression */:
                     return parent.condition === node;
             }
             return false;
         }
         function isLogicalExpression(node) {
             while (true) {
-                if (node.kind === 179 /* ParenthesizedExpression */) {
+                if (node.kind === 183 /* ParenthesizedExpression */) {
                     node = node.expression;
                 }
-                else if (node.kind === 186 /* PrefixUnaryExpression */ && node.operator === 50 /* ExclamationToken */) {
+                else if (node.kind === 190 /* PrefixUnaryExpression */ && node.operator === 50 /* ExclamationToken */) {
                     node = node.operand;
                 }
                 else {
-                    return node.kind === 188 /* BinaryExpression */ && (node.operatorToken.kind === 52 /* AmpersandAmpersandToken */ ||
+                    return node.kind === 192 /* BinaryExpression */ && (node.operatorToken.kind === 52 /* AmpersandAmpersandToken */ ||
                         node.operatorToken.kind === 53 /* BarBarToken */);
                 }
             }
         }
         function isTopLevelLogicalExpression(node) {
-            while (node.parent.kind === 179 /* ParenthesizedExpression */ ||
-                node.parent.kind === 186 /* PrefixUnaryExpression */ &&
+            while (node.parent.kind === 183 /* ParenthesizedExpression */ ||
+                node.parent.kind === 190 /* PrefixUnaryExpression */ &&
                     node.parent.operator === 50 /* ExclamationToken */) {
                 node = node.parent;
             }
@@ -20096,8 +21145,13 @@ var ts;
         }
         function bindDoStatement(node) {
             var preDoLabel = createLoopLabel();
-            var preConditionLabel = createBranchLabel();
-            var postDoLabel = createBranchLabel();
+            var enclosingLabeledStatement = node.parent.kind === 219 /* LabeledStatement */
+                ? ts.lastOrUndefined(activeLabels)
+                : undefined;
+            // if do statement is wrapped in labeled statement then target labels for break/continue with or without
+            // label should be the same
+            var preConditionLabel = enclosingLabeledStatement ? enclosingLabeledStatement.continueTarget : createBranchLabel();
+            var postDoLabel = enclosingLabeledStatement ? enclosingLabeledStatement.breakTarget : createBranchLabel();
             addAntecedent(preDoLabel, currentFlow);
             currentFlow = preDoLabel;
             bindIterativeStatement(node.statement, postDoLabel, preConditionLabel);
@@ -20128,7 +21182,7 @@ var ts;
             bind(node.expression);
             addAntecedent(postLoopLabel, currentFlow);
             bind(node.initializer);
-            if (node.initializer.kind !== 220 /* VariableDeclarationList */) {
+            if (node.initializer.kind !== 224 /* VariableDeclarationList */) {
                 bindAssignmentTargetFlow(node.initializer);
             }
             bindIterativeStatement(node.statement, postLoopLabel, preLoopLabel);
@@ -20150,7 +21204,7 @@ var ts;
         }
         function bindReturnOrThrow(node) {
             bind(node.expression);
-            if (node.kind === 212 /* ReturnStatement */) {
+            if (node.kind === 216 /* ReturnStatement */) {
                 hasExplicitReturn = true;
                 if (currentReturnTarget) {
                     addAntecedent(currentReturnTarget, currentFlow);
@@ -20170,7 +21224,7 @@ var ts;
             return undefined;
         }
         function bindbreakOrContinueFlow(node, breakTarget, continueTarget) {
-            var flowLabel = node.kind === 211 /* BreakStatement */ ? breakTarget : continueTarget;
+            var flowLabel = node.kind === 215 /* BreakStatement */ ? breakTarget : continueTarget;
             if (flowLabel) {
                 addAntecedent(flowLabel, currentFlow);
                 currentFlow = unreachableFlow;
@@ -20210,7 +21264,7 @@ var ts;
                 currentFlow = finishFlowLabel(preFinallyLabel);
                 bind(node.finallyBlock);
                 // if flow after finally is unreachable - keep it
-                // otherwise check if flows after try and after catch are unreachable 
+                // otherwise check if flows after try and after catch are unreachable
                 // if yes - convert current flow to unreachable
                 // i.e.
                 // try { return "1" } finally { console.log(1); }
@@ -20236,7 +21290,7 @@ var ts;
             preSwitchCaseFlow = currentFlow;
             bind(node.caseBlock);
             addAntecedent(postSwitchLabel, currentFlow);
-            var hasDefault = ts.forEach(node.caseBlock.clauses, function (c) { return c.kind === 250 /* DefaultClause */; });
+            var hasDefault = ts.forEach(node.caseBlock.clauses, function (c) { return c.kind === 254 /* 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;
@@ -20299,11 +21353,14 @@ var ts;
             if (!activeLabel.referenced && !options.allowUnusedLabels) {
                 file.bindDiagnostics.push(ts.createDiagnosticForNode(node.label, ts.Diagnostics.Unused_label));
             }
-            addAntecedent(postStatementLabel, currentFlow);
-            currentFlow = finishFlowLabel(postStatementLabel);
+            if (!node.statement || node.statement.kind !== 209 /* DoStatement */) {
+                // do statement sets current flow inside bindDoStatement
+                addAntecedent(postStatementLabel, currentFlow);
+                currentFlow = finishFlowLabel(postStatementLabel);
+            }
         }
         function bindDestructuringTargetFlow(node) {
-            if (node.kind === 188 /* BinaryExpression */ && node.operatorToken.kind === 57 /* EqualsToken */) {
+            if (node.kind === 192 /* BinaryExpression */ && node.operatorToken.kind === 57 /* EqualsToken */) {
                 bindAssignmentTargetFlow(node.left);
             }
             else {
@@ -20314,10 +21371,10 @@ var ts;
             if (isNarrowableReference(node)) {
                 currentFlow = createFlowAssignment(currentFlow, node);
             }
-            else if (node.kind === 171 /* ArrayLiteralExpression */) {
+            else if (node.kind === 175 /* ArrayLiteralExpression */) {
                 for (var _i = 0, _a = node.elements; _i < _a.length; _i++) {
                     var e = _a[_i];
-                    if (e.kind === 192 /* SpreadElementExpression */) {
+                    if (e.kind === 196 /* SpreadElement */) {
                         bindAssignmentTargetFlow(e.expression);
                     }
                     else {
@@ -20325,15 +21382,18 @@ var ts;
                     }
                 }
             }
-            else if (node.kind === 172 /* ObjectLiteralExpression */) {
+            else if (node.kind === 176 /* ObjectLiteralExpression */) {
                 for (var _b = 0, _c = node.properties; _b < _c.length; _b++) {
                     var p = _c[_b];
-                    if (p.kind === 253 /* PropertyAssignment */) {
+                    if (p.kind === 257 /* PropertyAssignment */) {
                         bindDestructuringTargetFlow(p.initializer);
                     }
-                    else if (p.kind === 254 /* ShorthandPropertyAssignment */) {
+                    else if (p.kind === 258 /* ShorthandPropertyAssignment */) {
                         bindAssignmentTargetFlow(p.name);
                     }
+                    else if (p.kind === 259 /* SpreadAssignment */) {
+                        bindAssignmentTargetFlow(p.expression);
+                    }
                 }
             }
         }
@@ -20385,9 +21445,9 @@ var ts;
             }
             else {
                 ts.forEachChild(node, bind);
-                if (operator === 57 /* EqualsToken */ && !ts.isAssignmentTarget(node)) {
+                if (ts.isAssignmentOperator(operator) && !ts.isAssignmentTarget(node)) {
                     bindAssignmentTargetFlow(node.left);
-                    if (node.left.kind === 174 /* ElementAccessExpression */) {
+                    if (operator === 57 /* EqualsToken */ && node.left.kind === 178 /* ElementAccessExpression */) {
                         var elementAccess = node.left;
                         if (isNarrowableOperand(elementAccess.expression)) {
                             currentFlow = createFlowArrayMutation(currentFlow, node);
@@ -20398,7 +21458,7 @@ var ts;
         }
         function bindDeleteExpressionFlow(node) {
             ts.forEachChild(node, bind);
-            if (node.expression.kind === 173 /* PropertyAccessExpression */) {
+            if (node.expression.kind === 177 /* PropertyAccessExpression */) {
                 bindAssignmentTargetFlow(node.expression);
             }
         }
@@ -20408,9 +21468,11 @@ var ts;
             var postExpressionLabel = createBranchLabel();
             bindCondition(node.condition, trueLabel, falseLabel);
             currentFlow = finishFlowLabel(trueLabel);
+            bind(node.questionToken);
             bind(node.whenTrue);
             addAntecedent(postExpressionLabel, currentFlow);
             currentFlow = finishFlowLabel(falseLabel);
+            bind(node.colonToken);
             bind(node.whenFalse);
             addAntecedent(postExpressionLabel, currentFlow);
             currentFlow = finishFlowLabel(postExpressionLabel);
@@ -20429,7 +21491,7 @@ var ts;
         }
         function bindVariableDeclarationFlow(node) {
             ts.forEachChild(node, bind);
-            if (node.initializer || node.parent.parent.kind === 208 /* ForInStatement */ || node.parent.parent.kind === 209 /* ForOfStatement */) {
+            if (node.initializer || node.parent.parent.kind === 212 /* ForInStatement */ || node.parent.parent.kind === 213 /* ForOfStatement */) {
                 bindInitializedVariableFlow(node);
             }
         }
@@ -20438,10 +21500,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 === 179 /* ParenthesizedExpression */) {
+            while (expr.kind === 183 /* ParenthesizedExpression */) {
                 expr = expr.expression;
             }
-            if (expr.kind === 180 /* FunctionExpression */ || expr.kind === 181 /* ArrowFunction */) {
+            if (expr.kind === 184 /* FunctionExpression */ || expr.kind === 185 /* ArrowFunction */) {
                 ts.forEach(node.typeArguments, bind);
                 ts.forEach(node.arguments, bind);
                 bind(node.expression);
@@ -20449,7 +21511,7 @@ var ts;
             else {
                 ts.forEachChild(node, bind);
             }
-            if (node.expression.kind === 173 /* PropertyAccessExpression */) {
+            if (node.expression.kind === 177 /* PropertyAccessExpression */) {
                 var propertyAccess = node.expression;
                 if (isNarrowableOperand(propertyAccess.expression) && ts.isPushOrUnshiftIdentifier(propertyAccess.name)) {
                     currentFlow = createFlowArrayMutation(currentFlow, node);
@@ -20458,51 +21520,52 @@ var ts;
         }
         function getContainerFlags(node) {
             switch (node.kind) {
-                case 193 /* ClassExpression */:
-                case 222 /* ClassDeclaration */:
-                case 225 /* EnumDeclaration */:
-                case 172 /* ObjectLiteralExpression */:
-                case 160 /* TypeLiteral */:
-                case 281 /* JSDocTypeLiteral */:
-                case 265 /* JSDocRecordType */:
+                case 197 /* ClassExpression */:
+                case 226 /* ClassDeclaration */:
+                case 229 /* EnumDeclaration */:
+                case 176 /* ObjectLiteralExpression */:
+                case 161 /* TypeLiteral */:
+                case 286 /* JSDocTypeLiteral */:
+                case 270 /* JSDocRecordType */:
                     return 1 /* IsContainer */;
-                case 223 /* InterfaceDeclaration */:
+                case 227 /* InterfaceDeclaration */:
                     return 1 /* IsContainer */ | 64 /* IsInterface */;
-                case 269 /* JSDocFunctionType */:
-                case 226 /* ModuleDeclaration */:
-                case 224 /* TypeAliasDeclaration */:
+                case 274 /* JSDocFunctionType */:
+                case 230 /* ModuleDeclaration */:
+                case 228 /* TypeAliasDeclaration */:
+                case 170 /* MappedType */:
                     return 1 /* IsContainer */ | 32 /* HasLocals */;
-                case 256 /* SourceFile */:
+                case 261 /* SourceFile */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */;
-                case 148 /* MethodDeclaration */:
+                case 149 /* MethodDeclaration */:
                     if (ts.isObjectLiteralOrClassExpressionMethod(node)) {
                         return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */ | 128 /* IsObjectLiteralOrClassExpressionMethod */;
                     }
-                case 149 /* Constructor */:
-                case 221 /* FunctionDeclaration */:
-                case 147 /* MethodSignature */:
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
-                case 152 /* CallSignature */:
-                case 153 /* ConstructSignature */:
-                case 154 /* IndexSignature */:
-                case 157 /* FunctionType */:
-                case 158 /* ConstructorType */:
+                case 150 /* Constructor */:
+                case 225 /* FunctionDeclaration */:
+                case 148 /* MethodSignature */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
+                case 153 /* CallSignature */:
+                case 154 /* ConstructSignature */:
+                case 155 /* IndexSignature */:
+                case 158 /* FunctionType */:
+                case 159 /* ConstructorType */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */;
-                case 180 /* FunctionExpression */:
-                case 181 /* ArrowFunction */:
+                case 184 /* FunctionExpression */:
+                case 185 /* ArrowFunction */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */ | 16 /* IsFunctionExpression */;
-                case 227 /* ModuleBlock */:
+                case 231 /* ModuleBlock */:
                     return 4 /* IsControlFlowContainer */;
-                case 146 /* PropertyDeclaration */:
+                case 147 /* PropertyDeclaration */:
                     return node.initializer ? 4 /* IsControlFlowContainer */ : 0;
-                case 252 /* CatchClause */:
-                case 207 /* ForStatement */:
-                case 208 /* ForInStatement */:
-                case 209 /* ForOfStatement */:
-                case 228 /* CaseBlock */:
+                case 256 /* CatchClause */:
+                case 211 /* ForStatement */:
+                case 212 /* ForInStatement */:
+                case 213 /* ForOfStatement */:
+                case 232 /* CaseBlock */:
                     return 2 /* IsBlockScopedContainer */;
-                case 200 /* Block */:
+                case 204 /* 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
@@ -20539,41 +21602,42 @@ 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 226 /* ModuleDeclaration */:
+                case 230 /* ModuleDeclaration */:
                     return declareModuleMember(node, symbolFlags, symbolExcludes);
-                case 256 /* SourceFile */:
+                case 261 /* SourceFile */:
                     return declareSourceFileMember(node, symbolFlags, symbolExcludes);
-                case 193 /* ClassExpression */:
-                case 222 /* ClassDeclaration */:
+                case 197 /* ClassExpression */:
+                case 226 /* ClassDeclaration */:
                     return declareClassMember(node, symbolFlags, symbolExcludes);
-                case 225 /* EnumDeclaration */:
+                case 229 /* EnumDeclaration */:
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
-                case 160 /* TypeLiteral */:
-                case 172 /* ObjectLiteralExpression */:
-                case 223 /* InterfaceDeclaration */:
-                case 265 /* JSDocRecordType */:
-                case 281 /* JSDocTypeLiteral */:
+                case 161 /* TypeLiteral */:
+                case 176 /* ObjectLiteralExpression */:
+                case 227 /* InterfaceDeclaration */:
+                case 270 /* JSDocRecordType */:
+                case 286 /* JSDocTypeLiteral */:
                     // 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 157 /* FunctionType */:
-                case 158 /* ConstructorType */:
-                case 152 /* CallSignature */:
-                case 153 /* ConstructSignature */:
-                case 154 /* IndexSignature */:
-                case 148 /* MethodDeclaration */:
-                case 147 /* MethodSignature */:
-                case 149 /* Constructor */:
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
-                case 221 /* FunctionDeclaration */:
-                case 180 /* FunctionExpression */:
-                case 181 /* ArrowFunction */:
-                case 269 /* JSDocFunctionType */:
-                case 224 /* TypeAliasDeclaration */:
+                case 158 /* FunctionType */:
+                case 159 /* ConstructorType */:
+                case 153 /* CallSignature */:
+                case 154 /* ConstructSignature */:
+                case 155 /* IndexSignature */:
+                case 149 /* MethodDeclaration */:
+                case 148 /* MethodSignature */:
+                case 150 /* Constructor */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
+                case 225 /* FunctionDeclaration */:
+                case 184 /* FunctionExpression */:
+                case 185 /* ArrowFunction */:
+                case 274 /* JSDocFunctionType */:
+                case 228 /* TypeAliasDeclaration */:
+                case 170 /* 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
@@ -20594,11 +21658,11 @@ var ts;
                 : declareSymbol(file.locals, undefined, node, symbolFlags, symbolExcludes);
         }
         function hasExportDeclarations(node) {
-            var body = node.kind === 256 /* SourceFile */ ? node : node.body;
-            if (body && (body.kind === 256 /* SourceFile */ || body.kind === 227 /* ModuleBlock */)) {
+            var body = node.kind === 261 /* SourceFile */ ? node : node.body;
+            if (body && (body.kind === 261 /* SourceFile */ || body.kind === 231 /* ModuleBlock */)) {
                 for (var _i = 0, _a = body.statements; _i < _a.length; _i++) {
                     var stat = _a[_i];
-                    if (stat.kind === 237 /* ExportDeclaration */ || stat.kind === 236 /* ExportAssignment */) {
+                    if (stat.kind === 241 /* ExportDeclaration */ || stat.kind === 240 /* ExportAssignment */) {
                         return true;
                     }
                 }
@@ -20691,7 +21755,7 @@ var ts;
                 var seen = ts.createMap();
                 for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                     var prop = _a[_i];
-                    if (prop.name.kind !== 70 /* Identifier */) {
+                    if (prop.kind === 259 /* SpreadAssignment */ || prop.name.kind !== 70 /* Identifier */) {
                         continue;
                     }
                     var identifier = prop.name;
@@ -20703,7 +21767,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 === 253 /* PropertyAssignment */ || prop.kind === 254 /* ShorthandPropertyAssignment */ || prop.kind === 148 /* MethodDeclaration */
+                    var currentKind = prop.kind === 257 /* PropertyAssignment */ || prop.kind === 258 /* ShorthandPropertyAssignment */ || prop.kind === 149 /* MethodDeclaration */
                         ? 1 /* Property */
                         : 2 /* Accessor */;
                     var existingKind = seen[identifier.text];
@@ -20725,10 +21789,10 @@ var ts;
         }
         function bindBlockScopedDeclaration(node, symbolFlags, symbolExcludes) {
             switch (blockScopeContainer.kind) {
-                case 226 /* ModuleDeclaration */:
+                case 230 /* ModuleDeclaration */:
                     declareModuleMember(node, symbolFlags, symbolExcludes);
                     break;
-                case 256 /* SourceFile */:
+                case 261 /* SourceFile */:
                     if (ts.isExternalModule(container)) {
                         declareModuleMember(node, symbolFlags, symbolExcludes);
                         break;
@@ -20839,8 +21903,8 @@ var ts;
         function checkStrictModeFunctionDeclaration(node) {
             if (languageVersion < 2 /* ES2015 */) {
                 // Report error if function is not top level function declaration
-                if (blockScopeContainer.kind !== 256 /* SourceFile */ &&
-                    blockScopeContainer.kind !== 226 /* ModuleDeclaration */ &&
+                if (blockScopeContainer.kind !== 261 /* SourceFile */ &&
+                    blockScopeContainer.kind !== 230 /* 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.
@@ -20906,7 +21970,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 > 139 /* LastToken */) {
+            if (node.kind > 140 /* LastToken */) {
                 var saveParent = parent;
                 parent = node;
                 var containerFlags = getContainerFlags(node);
@@ -20948,17 +22012,28 @@ var ts;
             switch (node.kind) {
                 /* Strict mode checks */
                 case 70 /* 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.
+                    if (node.isInJSDocNamespace) {
+                        var parentNode = node.parent;
+                        while (parentNode && parentNode.kind !== 284 /* JSDocTypedefTag */) {
+                            parentNode = parentNode.parent;
+                        }
+                        bindBlockScopedDeclaration(parentNode, 524288 /* TypeAlias */, 793064 /* TypeAliasExcludes */);
+                        break;
+                    }
                 case 98 /* ThisKeyword */:
-                    if (currentFlow && (ts.isExpression(node) || parent.kind === 254 /* ShorthandPropertyAssignment */)) {
+                    if (currentFlow && (ts.isExpression(node) || parent.kind === 258 /* ShorthandPropertyAssignment */)) {
                         node.flowNode = currentFlow;
                     }
                     return checkStrictModeIdentifier(node);
-                case 173 /* PropertyAccessExpression */:
+                case 177 /* PropertyAccessExpression */:
                     if (currentFlow && isNarrowableReference(node)) {
                         node.flowNode = currentFlow;
                     }
                     break;
-                case 188 /* BinaryExpression */:
+                case 192 /* BinaryExpression */:
                     if (ts.isInJavaScriptFile(node)) {
                         var specialKind = ts.getSpecialPropertyAssignmentKind(node);
                         switch (specialKind) {
@@ -20982,119 +22057,140 @@ var ts;
                         }
                     }
                     return checkStrictModeBinaryExpression(node);
-                case 252 /* CatchClause */:
+                case 256 /* CatchClause */:
                     return checkStrictModeCatchClause(node);
-                case 182 /* DeleteExpression */:
+                case 186 /* DeleteExpression */:
                     return checkStrictModeDeleteExpression(node);
                 case 8 /* NumericLiteral */:
                     return checkStrictModeNumericLiteral(node);
-                case 187 /* PostfixUnaryExpression */:
+                case 191 /* PostfixUnaryExpression */:
                     return checkStrictModePostfixUnaryExpression(node);
-                case 186 /* PrefixUnaryExpression */:
+                case 190 /* PrefixUnaryExpression */:
                     return checkStrictModePrefixUnaryExpression(node);
-                case 213 /* WithStatement */:
+                case 217 /* WithStatement */:
                     return checkStrictModeWithStatement(node);
-                case 166 /* ThisType */:
+                case 167 /* ThisType */:
                     seenThisKeyword = true;
                     return;
-                case 155 /* TypePredicate */:
+                case 156 /* TypePredicate */:
                     return checkTypePredicate(node);
-                case 142 /* TypeParameter */:
+                case 143 /* TypeParameter */:
                     return declareSymbolAndAddToSymbolTable(node, 262144 /* TypeParameter */, 530920 /* TypeParameterExcludes */);
-                case 143 /* Parameter */:
+                case 144 /* Parameter */:
                     return bindParameter(node);
-                case 219 /* VariableDeclaration */:
-                case 170 /* BindingElement */:
+                case 223 /* VariableDeclaration */:
+                case 174 /* BindingElement */:
+                    if (node.dotDotDotToken && node.parent.kind === 172 /* ObjectBindingPattern */) {
+                        emitFlags |= 32768 /* HasRestAttribute */;
+                    }
                     return bindVariableDeclarationOrBindingElement(node);
-                case 146 /* PropertyDeclaration */:
-                case 145 /* PropertySignature */:
-                case 266 /* JSDocRecordMember */:
+                case 147 /* PropertyDeclaration */:
+                case 146 /* PropertySignature */:
+                case 271 /* JSDocRecordMember */:
                     return bindPropertyOrMethodOrAccessor(node, 4 /* Property */ | (node.questionToken ? 536870912 /* Optional */ : 0 /* None */), 0 /* PropertyExcludes */);
-                case 280 /* JSDocPropertyTag */:
+                case 285 /* JSDocPropertyTag */:
                     return bindJSDocProperty(node);
-                case 253 /* PropertyAssignment */:
-                case 254 /* ShorthandPropertyAssignment */:
+                case 257 /* PropertyAssignment */:
+                case 258 /* ShorthandPropertyAssignment */:
                     return bindPropertyOrMethodOrAccessor(node, 4 /* Property */, 0 /* PropertyExcludes */);
-                case 255 /* EnumMember */:
+                case 260 /* EnumMember */:
                     return bindPropertyOrMethodOrAccessor(node, 8 /* EnumMember */, 900095 /* EnumMemberExcludes */);
-                case 247 /* JsxSpreadAttribute */:
-                    emitFlags |= 16384 /* HasJsxSpreadAttributes */;
+                case 259 /* SpreadAssignment */:
+                case 251 /* JsxSpreadAttribute */:
+                    var root = container;
+                    var hasRest = false;
+                    while (root.parent) {
+                        if (root.kind === 176 /* ObjectLiteralExpression */ &&
+                            root.parent.kind === 192 /* BinaryExpression */ &&
+                            root.parent.operatorToken.kind === 57 /* EqualsToken */ &&
+                            root.parent.left === root) {
+                            hasRest = true;
+                            break;
+                        }
+                        root = root.parent;
+                    }
+                    emitFlags |= hasRest ? 32768 /* HasRestAttribute */ : 16384 /* HasSpreadAttribute */;
                     return;
-                case 152 /* CallSignature */:
-                case 153 /* ConstructSignature */:
-                case 154 /* IndexSignature */:
+                case 153 /* CallSignature */:
+                case 154 /* ConstructSignature */:
+                case 155 /* IndexSignature */:
                     return declareSymbolAndAddToSymbolTable(node, 131072 /* Signature */, 0 /* None */);
-                case 148 /* MethodDeclaration */:
-                case 147 /* MethodSignature */:
+                case 149 /* MethodDeclaration */:
+                case 148 /* 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 ? 536870912 /* Optional */ : 0 /* None */), ts.isObjectLiteralMethod(node) ? 0 /* PropertyExcludes */ : 99263 /* MethodExcludes */);
-                case 221 /* FunctionDeclaration */:
+                case 225 /* FunctionDeclaration */:
                     return bindFunctionDeclaration(node);
-                case 149 /* Constructor */:
+                case 150 /* Constructor */:
                     return declareSymbolAndAddToSymbolTable(node, 16384 /* Constructor */, /*symbolExcludes:*/ 0 /* None */);
-                case 150 /* GetAccessor */:
+                case 151 /* GetAccessor */:
                     return bindPropertyOrMethodOrAccessor(node, 32768 /* GetAccessor */, 41919 /* GetAccessorExcludes */);
-                case 151 /* SetAccessor */:
+                case 152 /* SetAccessor */:
                     return bindPropertyOrMethodOrAccessor(node, 65536 /* SetAccessor */, 74687 /* SetAccessorExcludes */);
-                case 157 /* FunctionType */:
-                case 158 /* ConstructorType */:
-                case 269 /* JSDocFunctionType */:
+                case 158 /* FunctionType */:
+                case 159 /* ConstructorType */:
+                case 274 /* JSDocFunctionType */:
                     return bindFunctionOrConstructorType(node);
-                case 160 /* TypeLiteral */:
-                case 281 /* JSDocTypeLiteral */:
-                case 265 /* JSDocRecordType */:
+                case 161 /* TypeLiteral */:
+                case 170 /* MappedType */:
+                case 286 /* JSDocTypeLiteral */:
+                case 270 /* JSDocRecordType */:
                     return bindAnonymousDeclaration(node, 2048 /* TypeLiteral */, "__type");
-                case 172 /* ObjectLiteralExpression */:
+                case 176 /* ObjectLiteralExpression */:
                     return bindObjectLiteralExpression(node);
-                case 180 /* FunctionExpression */:
-                case 181 /* ArrowFunction */:
+                case 184 /* FunctionExpression */:
+                case 185 /* ArrowFunction */:
                     return bindFunctionExpression(node);
-                case 175 /* CallExpression */:
+                case 179 /* CallExpression */:
                     if (ts.isInJavaScriptFile(node)) {
                         bindCallExpression(node);
                     }
                     break;
                 // Members of classes, interfaces, and modules
-                case 193 /* ClassExpression */:
-                case 222 /* ClassDeclaration */:
+                case 197 /* ClassExpression */:
+                case 226 /* ClassDeclaration */:
                     // All classes are automatically in strict mode in ES6.
                     inStrictMode = true;
                     return bindClassLikeDeclaration(node);
-                case 223 /* InterfaceDeclaration */:
+                case 227 /* InterfaceDeclaration */:
                     return bindBlockScopedDeclaration(node, 64 /* Interface */, 792968 /* InterfaceExcludes */);
-                case 279 /* JSDocTypedefTag */:
-                case 224 /* TypeAliasDeclaration */:
+                case 284 /* JSDocTypedefTag */:
+                    if (!node.fullName || node.fullName.kind === 70 /* Identifier */) {
+                        return bindBlockScopedDeclaration(node, 524288 /* TypeAlias */, 793064 /* TypeAliasExcludes */);
+                    }
+                    break;
+                case 228 /* TypeAliasDeclaration */:
                     return bindBlockScopedDeclaration(node, 524288 /* TypeAlias */, 793064 /* TypeAliasExcludes */);
-                case 225 /* EnumDeclaration */:
+                case 229 /* EnumDeclaration */:
                     return bindEnumDeclaration(node);
-                case 226 /* ModuleDeclaration */:
+                case 230 /* ModuleDeclaration */:
                     return bindModuleDeclaration(node);
                 // Imports and exports
-                case 230 /* ImportEqualsDeclaration */:
-                case 233 /* NamespaceImport */:
-                case 235 /* ImportSpecifier */:
-                case 239 /* ExportSpecifier */:
+                case 234 /* ImportEqualsDeclaration */:
+                case 237 /* NamespaceImport */:
+                case 239 /* ImportSpecifier */:
+                case 243 /* ExportSpecifier */:
                     return declareSymbolAndAddToSymbolTable(node, 8388608 /* Alias */, 8388608 /* AliasExcludes */);
-                case 229 /* NamespaceExportDeclaration */:
+                case 233 /* NamespaceExportDeclaration */:
                     return bindNamespaceExportDeclaration(node);
-                case 232 /* ImportClause */:
+                case 236 /* ImportClause */:
                     return bindImportClause(node);
-                case 237 /* ExportDeclaration */:
+                case 241 /* ExportDeclaration */:
                     return bindExportDeclaration(node);
-                case 236 /* ExportAssignment */:
+                case 240 /* ExportAssignment */:
                     return bindExportAssignment(node);
-                case 256 /* SourceFile */:
+                case 261 /* SourceFile */:
                     updateStrictModeStatementList(node.statements);
                     return bindSourceFileIfExternalModule();
-                case 200 /* Block */:
+                case 204 /* Block */:
                     if (!ts.isFunctionLike(node.parent)) {
                         return;
                     }
                 // Fall through
-                case 227 /* ModuleBlock */:
+                case 231 /* ModuleBlock */:
                     return updateStrictModeStatementList(node.statements);
             }
         }
@@ -21103,7 +22199,7 @@ var ts;
             if (parameterName && parameterName.kind === 70 /* Identifier */) {
                 checkStrictModeIdentifier(parameterName);
             }
-            if (parameterName && parameterName.kind === 166 /* ThisType */) {
+            if (parameterName && parameterName.kind === 167 /* ThisType */) {
                 seenThisKeyword = true;
             }
             bind(type);
@@ -21126,7 +22222,7 @@ var ts;
                 // An export default clause with an expression exports a value
                 // We want to exclude both class and function here,  this is necessary to issue an error when there are both
                 // default export-assignment and default export function and class declaration.
-                var flags = node.kind === 236 /* ExportAssignment */ && ts.exportAssignmentIsAlias(node)
+                var flags = node.kind === 240 /* ExportAssignment */ && ts.exportAssignmentIsAlias(node)
                     ? 8388608 /* Alias */
                     : 4 /* Property */;
                 declareSymbol(container.symbol.exports, container.symbol, node, flags, 4 /* Property */ | 8388608 /* AliasExcludes */ | 32 /* Class */ | 16 /* Function */);
@@ -21136,17 +22232,17 @@ var ts;
             if (node.modifiers && node.modifiers.length) {
                 file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Modifiers_cannot_appear_here));
             }
-            if (node.parent.kind !== 256 /* SourceFile */) {
+            if (node.parent.kind !== 261 /* SourceFile */) {
                 file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Global_module_exports_may_only_appear_at_top_level));
                 return;
             }
             else {
-                var parent_6 = node.parent;
-                if (!ts.isExternalModule(parent_6)) {
+                var parent_5 = node.parent;
+                if (!ts.isExternalModule(parent_5)) {
                     file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Global_module_exports_may_only_appear_in_module_files));
                     return;
                 }
-                if (!parent_6.isDeclarationFile) {
+                if (!parent_5.isDeclarationFile) {
                     file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Global_module_exports_may_only_appear_in_declaration_files));
                     return;
                 }
@@ -21191,12 +22287,12 @@ var ts;
         function bindThisPropertyAssignment(node) {
             ts.Debug.assert(ts.isInJavaScriptFile(node));
             // Declare a 'member' if the container is an ES5 class or ES6 constructor
-            if (container.kind === 221 /* FunctionDeclaration */ || container.kind === 180 /* FunctionExpression */) {
+            if (container.kind === 225 /* FunctionDeclaration */ || container.kind === 184 /* FunctionExpression */) {
                 container.symbol.members = container.symbol.members || ts.createMap();
                 // It's acceptable for multiple 'this' assignments of the same identifier to occur
                 declareSymbol(container.symbol.members, container.symbol, node, 4 /* Property */, 0 /* PropertyExcludes */ & ~4 /* Property */);
             }
-            else if (container.kind === 149 /* Constructor */) {
+            else if (container.kind === 150 /* Constructor */) {
                 // this.foo assignment in a JavaScript class
                 // Bind this property to the containing class
                 var saveContainer = container;
@@ -21247,7 +22343,7 @@ var ts;
                     emitFlags |= 2048 /* HasDecorators */;
                 }
             }
-            if (node.kind === 222 /* ClassDeclaration */) {
+            if (node.kind === 226 /* ClassDeclaration */) {
                 bindBlockScopedDeclaration(node, 32 /* Class */, 899519 /* ClassExcludes */);
             }
             else {
@@ -21391,13 +22487,13 @@ var ts;
             if (currentFlow === unreachableFlow) {
                 var reportError = 
                 // report error on all statements except empty ones
-                (ts.isStatementButNotDeclaration(node) && node.kind !== 202 /* EmptyStatement */) ||
+                (ts.isStatementButNotDeclaration(node) && node.kind !== 206 /* EmptyStatement */) ||
                     // report error on class declarations
-                    node.kind === 222 /* ClassDeclaration */ ||
+                    node.kind === 226 /* ClassDeclaration */ ||
                     // report error on instantiated modules or const-enums only modules if preserveConstEnums is set
-                    (node.kind === 226 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node)) ||
+                    (node.kind === 230 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node)) ||
                     // report error on regular enums and const enums if preserveConstEnums is set
-                    (node.kind === 225 /* EnumDeclaration */ && (!ts.isConstEnumDeclaration(node) || options.preserveConstEnums));
+                    (node.kind === 229 /* EnumDeclaration */ && (!ts.isConstEnumDeclaration(node) || options.preserveConstEnums));
                 if (reportError) {
                     currentFlow = reportedUnreachableFlow;
                     // unreachable code is reported if
@@ -21411,7 +22507,7 @@ var ts;
                     //   On the other side we do want to report errors on non-initialized 'lets' because of TDZ
                     var reportUnreachableCode = !options.allowUnreachableCode &&
                         !ts.isInAmbientContext(node) &&
-                        (node.kind !== 201 /* VariableStatement */ ||
+                        (node.kind !== 205 /* VariableStatement */ ||
                             ts.getCombinedNodeFlags(node.declarationList) & 3 /* BlockScoped */ ||
                             ts.forEach(node.declarationList.declarations, function (d) { return d.initializer; }));
                     if (reportUnreachableCode) {
@@ -21431,54 +22527,56 @@ var ts;
     function computeTransformFlagsForNode(node, subtreeFlags) {
         var kind = node.kind;
         switch (kind) {
-            case 175 /* CallExpression */:
+            case 179 /* CallExpression */:
                 return computeCallExpression(node, subtreeFlags);
-            case 176 /* NewExpression */:
+            case 180 /* NewExpression */:
                 return computeNewExpression(node, subtreeFlags);
-            case 226 /* ModuleDeclaration */:
+            case 230 /* ModuleDeclaration */:
                 return computeModuleDeclaration(node, subtreeFlags);
-            case 179 /* ParenthesizedExpression */:
+            case 183 /* ParenthesizedExpression */:
                 return computeParenthesizedExpression(node, subtreeFlags);
-            case 188 /* BinaryExpression */:
+            case 192 /* BinaryExpression */:
                 return computeBinaryExpression(node, subtreeFlags);
-            case 203 /* ExpressionStatement */:
+            case 207 /* ExpressionStatement */:
                 return computeExpressionStatement(node, subtreeFlags);
-            case 143 /* Parameter */:
+            case 144 /* Parameter */:
                 return computeParameter(node, subtreeFlags);
-            case 181 /* ArrowFunction */:
+            case 185 /* ArrowFunction */:
                 return computeArrowFunction(node, subtreeFlags);
-            case 180 /* FunctionExpression */:
+            case 184 /* FunctionExpression */:
                 return computeFunctionExpression(node, subtreeFlags);
-            case 221 /* FunctionDeclaration */:
+            case 225 /* FunctionDeclaration */:
                 return computeFunctionDeclaration(node, subtreeFlags);
-            case 219 /* VariableDeclaration */:
+            case 223 /* VariableDeclaration */:
                 return computeVariableDeclaration(node, subtreeFlags);
-            case 220 /* VariableDeclarationList */:
+            case 224 /* VariableDeclarationList */:
                 return computeVariableDeclarationList(node, subtreeFlags);
-            case 201 /* VariableStatement */:
+            case 205 /* VariableStatement */:
                 return computeVariableStatement(node, subtreeFlags);
-            case 215 /* LabeledStatement */:
+            case 219 /* LabeledStatement */:
                 return computeLabeledStatement(node, subtreeFlags);
-            case 222 /* ClassDeclaration */:
+            case 226 /* ClassDeclaration */:
                 return computeClassDeclaration(node, subtreeFlags);
-            case 193 /* ClassExpression */:
+            case 197 /* ClassExpression */:
                 return computeClassExpression(node, subtreeFlags);
-            case 251 /* HeritageClause */:
+            case 255 /* HeritageClause */:
                 return computeHeritageClause(node, subtreeFlags);
-            case 195 /* ExpressionWithTypeArguments */:
+            case 256 /* CatchClause */:
+                return computeCatchClause(node, subtreeFlags);
+            case 199 /* ExpressionWithTypeArguments */:
                 return computeExpressionWithTypeArguments(node, subtreeFlags);
-            case 149 /* Constructor */:
+            case 150 /* Constructor */:
                 return computeConstructor(node, subtreeFlags);
-            case 146 /* PropertyDeclaration */:
+            case 147 /* PropertyDeclaration */:
                 return computePropertyDeclaration(node, subtreeFlags);
-            case 148 /* MethodDeclaration */:
+            case 149 /* MethodDeclaration */:
                 return computeMethod(node, subtreeFlags);
-            case 150 /* GetAccessor */:
-            case 151 /* SetAccessor */:
+            case 151 /* GetAccessor */:
+            case 152 /* SetAccessor */:
                 return computeAccessor(node, subtreeFlags);
-            case 230 /* ImportEqualsDeclaration */:
+            case 234 /* ImportEqualsDeclaration */:
                 return computeImportEquals(node, subtreeFlags);
-            case 173 /* PropertyAccessExpression */:
+            case 177 /* PropertyAccessExpression */:
                 return computePropertyAccess(node, subtreeFlags);
             default:
                 return computeOther(node, kind, subtreeFlags);
@@ -21492,21 +22590,21 @@ var ts;
         if (node.typeArguments) {
             transformFlags |= 3 /* AssertTypeScript */;
         }
-        if (subtreeFlags & 1048576 /* ContainsSpreadElementExpression */
+        if (subtreeFlags & 8388608 /* ContainsSpreadExpression */
             || isSuperOrSuperProperty(expression, expressionKind)) {
-            // If the this node contains a SpreadElementExpression, or is a super call, then it is an ES6
+            // If the this node contains a SpreadExpression, or is a super call, then it is an ES6
             // node.
-            transformFlags |= 768 /* AssertES2015 */;
+            transformFlags |= 3072 /* AssertES2015 */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~537922901 /* ArrayLiteralOrCallOrNewExcludes */;
+        return transformFlags & ~545281365 /* ArrayLiteralOrCallOrNewExcludes */;
     }
     function isSuperOrSuperProperty(node, kind) {
         switch (kind) {
             case 96 /* SuperKeyword */:
                 return true;
-            case 173 /* PropertyAccessExpression */:
-            case 174 /* ElementAccessExpression */:
+            case 177 /* PropertyAccessExpression */:
+            case 178 /* ElementAccessExpression */:
                 var expression = node.expression;
                 var expressionKind = expression.kind;
                 return expressionKind === 96 /* SuperKeyword */;
@@ -21518,31 +22616,34 @@ var ts;
         if (node.typeArguments) {
             transformFlags |= 3 /* AssertTypeScript */;
         }
-        if (subtreeFlags & 1048576 /* ContainsSpreadElementExpression */) {
+        if (subtreeFlags & 8388608 /* ContainsSpreadExpression */) {
             // If the this node contains a SpreadElementExpression then it is an ES6
             // node.
-            transformFlags |= 768 /* AssertES2015 */;
+            transformFlags |= 3072 /* AssertES2015 */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~537922901 /* ArrayLiteralOrCallOrNewExcludes */;
+        return transformFlags & ~545281365 /* ArrayLiteralOrCallOrNewExcludes */;
     }
     function computeBinaryExpression(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         var operatorTokenKind = node.operatorToken.kind;
         var leftKind = node.left.kind;
-        if (operatorTokenKind === 57 /* EqualsToken */
-            && (leftKind === 172 /* ObjectLiteralExpression */
-                || leftKind === 171 /* ArrayLiteralExpression */)) {
-            // Destructuring assignments are ES6 syntax.
-            transformFlags |= 768 /* AssertES2015 */ | 1024 /* DestructuringAssignment */;
+        if (operatorTokenKind === 57 /* EqualsToken */ && leftKind === 176 /* ObjectLiteralExpression */) {
+            // Destructuring object assignments with are ES2015 syntax
+            // and possibly ESNext if they contain rest
+            transformFlags |= 48 /* AssertESNext */ | 3072 /* AssertES2015 */ | 49152 /* AssertDestructuringAssignment */;
+        }
+        else if (operatorTokenKind === 57 /* EqualsToken */ && leftKind === 175 /* ArrayLiteralExpression */) {
+            // Destructuring assignments are ES2015 syntax.
+            transformFlags |= 3072 /* AssertES2015 */ | 49152 /* AssertDestructuringAssignment */;
         }
         else if (operatorTokenKind === 39 /* AsteriskAsteriskToken */
             || operatorTokenKind === 61 /* AsteriskAsteriskEqualsToken */) {
             // Exponentiation is ES2016 syntax.
-            transformFlags |= 192 /* AssertES2016 */;
+            transformFlags |= 768 /* AssertES2016 */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~536874325 /* NodeExcludes */;
+        return transformFlags & ~536892757 /* NodeExcludes */;
     }
     function computeParameter(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
@@ -21554,21 +22655,25 @@ var ts;
         // syntax.
         if (node.questionToken
             || node.type
-            || subtreeFlags & 8192 /* ContainsDecorators */
+            || subtreeFlags & 65536 /* ContainsDecorators */
             || ts.isThisIdentifier(name)) {
             transformFlags |= 3 /* AssertTypeScript */;
         }
         // If a parameter has an accessibility modifier, then it is TypeScript syntax.
         if (modifierFlags & 92 /* ParameterPropertyModifier */) {
-            transformFlags |= 3 /* AssertTypeScript */ | 524288 /* ContainsParameterPropertyAssignments */;
+            transformFlags |= 3 /* AssertTypeScript */ | 4194304 /* ContainsParameterPropertyAssignments */;
+        }
+        // parameters with object rest destructuring are ES Next syntax
+        if (subtreeFlags & 8388608 /* ContainsSpreadExpression */) {
+            transformFlags |= 48 /* AssertESNext */;
         }
         // If a parameter has an initializer, a binding pattern or a dotDotDot token, then
         // it is ES6 syntax and its container must emit default value assignments or parameter destructuring downlevel.
-        if (subtreeFlags & 8388608 /* ContainsBindingPattern */ || initializer || dotDotDotToken) {
-            transformFlags |= 768 /* AssertES2015 */ | 262144 /* ContainsDefaultValueAssignments */;
+        if (subtreeFlags & 67108864 /* ContainsBindingPattern */ || initializer || dotDotDotToken) {
+            transformFlags |= 3072 /* AssertES2015 */ | 2097152 /* ContainsDefaultValueAssignments */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~545262933 /* ParameterExcludes */;
+        return transformFlags & ~604001621 /* ParameterExcludes */;
     }
     function computeParenthesizedExpression(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
@@ -21578,17 +22683,17 @@ 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 === 196 /* AsExpression */
-            || expressionKind === 178 /* TypeAssertionExpression */) {
+        if (expressionKind === 200 /* AsExpression */
+            || expressionKind === 182 /* TypeAssertionExpression */) {
             transformFlags |= 3 /* AssertTypeScript */;
         }
         // If the expression of a ParenthesizedExpression is a destructuring assignment,
         // then the ParenthesizedExpression is a destructuring assignment.
-        if (expressionTransformFlags & 1024 /* DestructuringAssignment */) {
-            transformFlags |= 1024 /* DestructuringAssignment */;
+        if (expressionTransformFlags & 16384 /* DestructuringAssignment */) {
+            transformFlags |= 16384 /* DestructuringAssignment */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~536874325 /* NodeExcludes */;
+        return transformFlags & ~536892757 /* NodeExcludes */;
     }
     function computeClassDeclaration(node, subtreeFlags) {
         var transformFlags;
@@ -21599,47 +22704,47 @@ var ts;
         }
         else {
             // A ClassDeclaration is ES6 syntax.
-            transformFlags = subtreeFlags | 768 /* AssertES2015 */;
+            transformFlags = subtreeFlags | 3072 /* AssertES2015 */;
             // A class with a parameter property assignment, property initializer, or decorator is
             // TypeScript syntax.
-            // An exported declaration may be TypeScript syntax.
-            if ((subtreeFlags & 548864 /* TypeScriptClassSyntaxMask */)
-                || (modifierFlags & 1 /* Export */)
+            // An exported declaration may be TypeScript syntax, but is handled by the visitor
+            // for a namespace declaration.
+            if ((subtreeFlags & 4390912 /* TypeScriptClassSyntaxMask */)
                 || node.typeParameters) {
                 transformFlags |= 3 /* AssertTypeScript */;
             }
-            if (subtreeFlags & 131072 /* ContainsLexicalThisInComputedPropertyName */) {
+            if (subtreeFlags & 1048576 /* ContainsLexicalThisInComputedPropertyName */) {
                 // A computed property name containing `this` might need to be rewritten,
                 // so propagate the ContainsLexicalThis flag upward.
-                transformFlags |= 32768 /* ContainsLexicalThis */;
+                transformFlags |= 262144 /* ContainsLexicalThis */;
             }
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~539749717 /* ClassExcludes */;
+        return transformFlags & ~559895893 /* ClassExcludes */;
     }
     function computeClassExpression(node, subtreeFlags) {
         // A ClassExpression is ES6 syntax.
-        var transformFlags = subtreeFlags | 768 /* AssertES2015 */;
+        var transformFlags = subtreeFlags | 3072 /* AssertES2015 */;
         // A class with a parameter property assignment, property initializer, or decorator is
         // TypeScript syntax.
-        if (subtreeFlags & 548864 /* TypeScriptClassSyntaxMask */
+        if (subtreeFlags & 4390912 /* TypeScriptClassSyntaxMask */
             || node.typeParameters) {
             transformFlags |= 3 /* AssertTypeScript */;
         }
-        if (subtreeFlags & 131072 /* ContainsLexicalThisInComputedPropertyName */) {
+        if (subtreeFlags & 1048576 /* ContainsLexicalThisInComputedPropertyName */) {
             // A computed property name containing `this` might need to be rewritten,
             // so propagate the ContainsLexicalThis flag upward.
-            transformFlags |= 32768 /* ContainsLexicalThis */;
+            transformFlags |= 262144 /* ContainsLexicalThis */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~539749717 /* ClassExcludes */;
+        return transformFlags & ~559895893 /* ClassExcludes */;
     }
     function computeHeritageClause(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         switch (node.token) {
             case 84 /* ExtendsKeyword */:
                 // An `extends` HeritageClause is ES6 syntax.
-                transformFlags |= 768 /* AssertES2015 */;
+                transformFlags |= 3072 /* AssertES2015 */;
                 break;
             case 107 /* ImplementsKeyword */:
                 // An `implements` HeritageClause is TypeScript syntax.
@@ -21650,19 +22755,27 @@ var ts;
                 break;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~536874325 /* NodeExcludes */;
+        return transformFlags & ~536892757 /* NodeExcludes */;
+    }
+    function computeCatchClause(node, subtreeFlags) {
+        var transformFlags = subtreeFlags;
+        if (node.variableDeclaration && ts.isBindingPattern(node.variableDeclaration.name)) {
+            transformFlags |= 3072 /* AssertES2015 */;
+        }
+        node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
+        return transformFlags & ~536892757 /* NodeExcludes */;
     }
     function computeExpressionWithTypeArguments(node, subtreeFlags) {
         // An ExpressionWithTypeArguments is ES6 syntax, as it is used in the
         // extends clause of a class.
-        var transformFlags = subtreeFlags | 768 /* AssertES2015 */;
+        var transformFlags = subtreeFlags | 3072 /* AssertES2015 */;
         // If an ExpressionWithTypeArguments contains type arguments, then it
         // is TypeScript syntax.
         if (node.typeArguments) {
             transformFlags |= 3 /* AssertTypeScript */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~536874325 /* NodeExcludes */;
+        return transformFlags & ~536892757 /* NodeExcludes */;
     }
     function computeConstructor(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
@@ -21672,11 +22785,11 @@ var ts;
             transformFlags |= 3 /* AssertTypeScript */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~591760725 /* ConstructorExcludes */;
+        return transformFlags & ~975983957 /* ConstructorExcludes */;
     }
     function computeMethod(node, subtreeFlags) {
         // A MethodDeclaration is ES6 syntax.
-        var transformFlags = subtreeFlags | 768 /* AssertES2015 */;
+        var transformFlags = subtreeFlags | 3072 /* AssertES2015 */;
         // Decorators, TypeScript-specific modifiers, type parameters, type annotations, and
         // overloads are TypeScript syntax.
         if (node.decorators
@@ -21688,14 +22801,14 @@ var ts;
         }
         // An async method declaration is ES2017 syntax.
         if (ts.hasModifier(node, 256 /* Async */)) {
-            transformFlags |= 48 /* AssertES2017 */;
+            transformFlags |= 192 /* AssertES2017 */;
         }
         // Currently, we only support generators that were originally async function bodies.
         if (node.asteriskToken && ts.getEmitFlags(node) & 2097152 /* AsyncFunctionBody */) {
-            transformFlags |= 6144 /* AssertGenerator */;
+            transformFlags |= 12288 /* AssertGenerator */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~591760725 /* MethodOrAccessorExcludes */;
+        return transformFlags & ~975983957 /* MethodOrAccessorExcludes */;
     }
     function computeAccessor(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
@@ -21708,7 +22821,7 @@ var ts;
             transformFlags |= 3 /* AssertTypeScript */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~591760725 /* MethodOrAccessorExcludes */;
+        return transformFlags & ~975983957 /* MethodOrAccessorExcludes */;
     }
     function computePropertyDeclaration(node, subtreeFlags) {
         // A PropertyDeclaration is TypeScript syntax.
@@ -21716,10 +22829,10 @@ var ts;
         // If the PropertyDeclaration has an initializer, we need to inform its ancestor
         // so that it handle the transformation.
         if (node.initializer) {
-            transformFlags |= 16384 /* ContainsPropertyInitializer */;
+            transformFlags |= 131072 /* ContainsPropertyInitializer */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~536874325 /* NodeExcludes */;
+        return transformFlags & ~536892757 /* NodeExcludes */;
     }
     function computeFunctionDeclaration(node, subtreeFlags) {
         var transformFlags;
@@ -21731,11 +22844,7 @@ var ts;
             transformFlags = 3 /* AssertTypeScript */;
         }
         else {
-            transformFlags = subtreeFlags | 33554432 /* ContainsHoistedDeclarationOrCompletion */;
-            // If a FunctionDeclaration is exported, then it is either ES6 or TypeScript syntax.
-            if (modifierFlags & 1 /* Export */) {
-                transformFlags |= 3 /* AssertTypeScript */ | 768 /* AssertES2015 */;
-            }
+            transformFlags = subtreeFlags | 268435456 /* ContainsHoistedDeclarationOrCompletion */;
             // TypeScript-specific modifiers, type parameters, and type annotations are TypeScript
             // syntax.
             if (modifierFlags & 2270 /* TypeScriptModifier */
@@ -21745,13 +22854,17 @@ var ts;
             }
             // An async function declaration is ES2017 syntax.
             if (modifierFlags & 256 /* Async */) {
-                transformFlags |= 48 /* AssertES2017 */;
+                transformFlags |= 192 /* AssertES2017 */;
+            }
+            // function declarations with object rest destructuring are ES Next syntax
+            if (subtreeFlags & 8388608 /* ContainsSpreadExpression */) {
+                transformFlags |= 48 /* AssertESNext */;
             }
             // If a FunctionDeclaration's subtree has marked the container as needing to capture the
             // lexical this, or the function contains parameters with initializers, then this node is
             // ES6 syntax.
-            if (subtreeFlags & 327680 /* ES2015FunctionSyntaxMask */) {
-                transformFlags |= 768 /* AssertES2015 */;
+            if (subtreeFlags & 2621440 /* ES2015FunctionSyntaxMask */) {
+                transformFlags |= 3072 /* AssertES2015 */;
             }
             // If a FunctionDeclaration is generator function and is the body of a
             // transformed async function, then this node can be transformed to a
@@ -21759,11 +22872,11 @@ var ts;
             // Currently we do not support transforming any other generator fucntions
             // down level.
             if (node.asteriskToken && ts.getEmitFlags(node) & 2097152 /* AsyncFunctionBody */) {
-                transformFlags |= 6144 /* AssertGenerator */;
+                transformFlags |= 12288 /* AssertGenerator */;
             }
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~592293205 /* FunctionExcludes */;
+        return transformFlags & ~980243797 /* FunctionExcludes */;
     }
     function computeFunctionExpression(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
@@ -21776,13 +22889,17 @@ var ts;
         }
         // An async function expression is ES2017 syntax.
         if (ts.hasModifier(node, 256 /* Async */)) {
-            transformFlags |= 48 /* AssertES2017 */;
+            transformFlags |= 192 /* AssertES2017 */;
+        }
+        // function expressions with object rest destructuring are ES Next syntax
+        if (subtreeFlags & 8388608 /* ContainsSpreadExpression */) {
+            transformFlags |= 48 /* AssertESNext */;
         }
         // If a FunctionExpression's subtree has marked the container as needing to capture the
         // lexical this, or the function contains parameters with initializers, then this node is
         // ES6 syntax.
-        if (subtreeFlags & 327680 /* ES2015FunctionSyntaxMask */) {
-            transformFlags |= 768 /* AssertES2015 */;
+        if (subtreeFlags & 2621440 /* ES2015FunctionSyntaxMask */) {
+            transformFlags |= 3072 /* AssertES2015 */;
         }
         // If a FunctionExpression is generator function and is the body of a
         // transformed async function, then this node can be transformed to a
@@ -21790,14 +22907,14 @@ var ts;
         // Currently we do not support transforming any other generator fucntions
         // down level.
         if (node.asteriskToken && ts.getEmitFlags(node) & 2097152 /* AsyncFunctionBody */) {
-            transformFlags |= 6144 /* AssertGenerator */;
+            transformFlags |= 12288 /* AssertGenerator */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~592293205 /* FunctionExcludes */;
+        return transformFlags & ~980243797 /* FunctionExcludes */;
     }
     function computeArrowFunction(node, subtreeFlags) {
         // An ArrowFunction is ES6 syntax, and excludes markers that should not escape the scope of an ArrowFunction.
-        var transformFlags = subtreeFlags | 768 /* AssertES2015 */;
+        var transformFlags = subtreeFlags | 3072 /* AssertES2015 */;
         // TypeScript-specific modifiers, type parameters, and type annotations are TypeScript
         // syntax.
         if (ts.hasModifier(node, 2270 /* TypeScriptModifier */)
@@ -21807,14 +22924,18 @@ var ts;
         }
         // An async arrow function is ES2017 syntax.
         if (ts.hasModifier(node, 256 /* Async */)) {
-            transformFlags |= 48 /* AssertES2017 */;
+            transformFlags |= 192 /* AssertES2017 */;
+        }
+        // arrow functions with object rest destructuring are ES Next syntax
+        if (subtreeFlags & 8388608 /* ContainsSpreadExpression */) {
+            transformFlags |= 48 /* AssertESNext */;
         }
         // If an ArrowFunction contains a lexical this, its container must capture the lexical this.
-        if (subtreeFlags & 32768 /* ContainsLexicalThis */) {
-            transformFlags |= 65536 /* ContainsCapturedLexicalThis */;
+        if (subtreeFlags & 262144 /* ContainsLexicalThis */) {
+            transformFlags |= 524288 /* ContainsCapturedLexicalThis */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~592227669 /* ArrowFunctionExcludes */;
+        return transformFlags & ~979719509 /* ArrowFunctionExcludes */;
     }
     function computePropertyAccess(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
@@ -21823,24 +22944,28 @@ var ts;
         // If a PropertyAccessExpression starts with a super keyword, then it is
         // ES6 syntax, and requires a lexical `this` binding.
         if (expressionKind === 96 /* SuperKeyword */) {
-            transformFlags |= 32768 /* ContainsLexicalThis */;
+            transformFlags |= 262144 /* ContainsLexicalThis */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~536874325 /* NodeExcludes */;
+        return transformFlags & ~536892757 /* NodeExcludes */;
     }
     function computeVariableDeclaration(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         var nameKind = node.name.kind;
-        // A VariableDeclaration with a binding pattern is ES6 syntax.
-        if (nameKind === 168 /* ObjectBindingPattern */ || nameKind === 169 /* ArrayBindingPattern */) {
-            transformFlags |= 768 /* AssertES2015 */ | 8388608 /* ContainsBindingPattern */;
+        // A VariableDeclaration with an object binding pattern is ES2015 syntax
+        // and possibly ESNext syntax if it contains an object binding pattern
+        if (nameKind === 172 /* ObjectBindingPattern */) {
+            transformFlags |= 48 /* AssertESNext */ | 3072 /* AssertES2015 */ | 67108864 /* ContainsBindingPattern */;
+        }
+        else if (nameKind === 173 /* ArrayBindingPattern */) {
+            transformFlags |= 3072 /* AssertES2015 */ | 67108864 /* ContainsBindingPattern */;
         }
         // Type annotations are TypeScript syntax.
         if (node.type) {
             transformFlags |= 3 /* AssertTypeScript */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~536874325 /* NodeExcludes */;
+        return transformFlags & ~536892757 /* NodeExcludes */;
     }
     function computeVariableStatement(node, subtreeFlags) {
         var transformFlags;
@@ -21852,26 +22977,22 @@ var ts;
         }
         else {
             transformFlags = subtreeFlags;
-            // If a VariableStatement is exported, then it is either ES6 or TypeScript syntax.
-            if (modifierFlags & 1 /* Export */) {
-                transformFlags |= 768 /* AssertES2015 */ | 3 /* AssertTypeScript */;
-            }
-            if (declarationListTransformFlags & 8388608 /* ContainsBindingPattern */) {
-                transformFlags |= 768 /* AssertES2015 */;
+            if (declarationListTransformFlags & 67108864 /* ContainsBindingPattern */) {
+                transformFlags |= 3072 /* AssertES2015 */;
             }
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~536874325 /* NodeExcludes */;
+        return transformFlags & ~536892757 /* NodeExcludes */;
     }
     function computeLabeledStatement(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         // A labeled statement containing a block scoped binding *may* need to be transformed from ES6.
-        if (subtreeFlags & 4194304 /* ContainsBlockScopedBinding */
+        if (subtreeFlags & 33554432 /* ContainsBlockScopedBinding */
             && ts.isIterationStatement(node, /*lookInLabeledStatements*/ true)) {
-            transformFlags |= 768 /* AssertES2015 */;
+            transformFlags |= 3072 /* AssertES2015 */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~536874325 /* NodeExcludes */;
+        return transformFlags & ~536892757 /* NodeExcludes */;
     }
     function computeImportEquals(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
@@ -21880,18 +23001,18 @@ var ts;
             transformFlags |= 3 /* AssertTypeScript */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~536874325 /* NodeExcludes */;
+        return transformFlags & ~536892757 /* NodeExcludes */;
     }
     function computeExpressionStatement(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         // If the expression of an expression statement is a destructuring assignment,
         // then we treat the statement as ES6 so that we can indicate that we do not
         // need to hold on to the right-hand side.
-        if (node.expression.transformFlags & 1024 /* DestructuringAssignment */) {
-            transformFlags |= 768 /* AssertES2015 */;
+        if (node.expression.transformFlags & 16384 /* DestructuringAssignment */) {
+            transformFlags |= 3072 /* AssertES2015 */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~536874325 /* NodeExcludes */;
+        return transformFlags & ~536892757 /* NodeExcludes */;
     }
     function computeModuleDeclaration(node, subtreeFlags) {
         var transformFlags = 3 /* AssertTypeScript */;
@@ -21900,29 +23021,29 @@ var ts;
             transformFlags |= subtreeFlags;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~574729557 /* ModuleExcludes */;
+        return transformFlags & ~839734613 /* ModuleExcludes */;
     }
     function computeVariableDeclarationList(node, subtreeFlags) {
-        var transformFlags = subtreeFlags | 33554432 /* ContainsHoistedDeclarationOrCompletion */;
-        if (subtreeFlags & 8388608 /* ContainsBindingPattern */) {
-            transformFlags |= 768 /* AssertES2015 */;
+        var transformFlags = subtreeFlags | 268435456 /* ContainsHoistedDeclarationOrCompletion */;
+        if (subtreeFlags & 67108864 /* ContainsBindingPattern */) {
+            transformFlags |= 3072 /* AssertES2015 */;
         }
         // If a VariableDeclarationList is `let` or `const`, then it is ES6 syntax.
         if (node.flags & 3 /* BlockScoped */) {
-            transformFlags |= 768 /* AssertES2015 */ | 4194304 /* ContainsBlockScopedBinding */;
+            transformFlags |= 3072 /* AssertES2015 */ | 33554432 /* ContainsBlockScopedBinding */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~545262933 /* VariableDeclarationListExcludes */;
+        return transformFlags & ~604001621 /* VariableDeclarationListExcludes */;
     }
     function computeOther(node, kind, subtreeFlags) {
         // Mark transformations needed for each node
         var transformFlags = subtreeFlags;
-        var excludeFlags = 536874325 /* NodeExcludes */;
+        var excludeFlags = 536892757 /* NodeExcludes */;
         switch (kind) {
             case 119 /* AsyncKeyword */:
-            case 185 /* AwaitExpression */:
+            case 189 /* AwaitExpression */:
                 // async/await is ES2017 syntax
-                transformFlags |= 48 /* AssertES2017 */;
+                transformFlags |= 192 /* AssertES2017 */;
                 break;
             case 113 /* PublicKeyword */:
             case 111 /* PrivateKeyword */:
@@ -21930,84 +23051,86 @@ var ts;
             case 116 /* AbstractKeyword */:
             case 123 /* DeclareKeyword */:
             case 75 /* ConstKeyword */:
-            case 225 /* EnumDeclaration */:
-            case 255 /* EnumMember */:
-            case 178 /* TypeAssertionExpression */:
-            case 196 /* AsExpression */:
-            case 197 /* NonNullExpression */:
-            case 129 /* ReadonlyKeyword */:
+            case 229 /* EnumDeclaration */:
+            case 260 /* EnumMember */:
+            case 182 /* TypeAssertionExpression */:
+            case 200 /* AsExpression */:
+            case 201 /* NonNullExpression */:
+            case 130 /* ReadonlyKeyword */:
                 // These nodes are TypeScript syntax.
                 transformFlags |= 3 /* AssertTypeScript */;
                 break;
-            case 242 /* JsxElement */:
-            case 243 /* JsxSelfClosingElement */:
-            case 244 /* JsxOpeningElement */:
+            case 246 /* JsxElement */:
+            case 247 /* JsxSelfClosingElement */:
+            case 248 /* JsxOpeningElement */:
             case 10 /* JsxText */:
-            case 245 /* JsxClosingElement */:
-            case 246 /* JsxAttribute */:
-            case 247 /* JsxSpreadAttribute */:
-            case 248 /* JsxExpression */:
+            case 249 /* JsxClosingElement */:
+            case 250 /* JsxAttribute */:
+            case 251 /* JsxSpreadAttribute */:
+            case 252 /* JsxExpression */:
                 // These nodes are Jsx syntax.
                 transformFlags |= 12 /* AssertJsx */;
                 break;
-            case 83 /* ExportKeyword */:
-                // This node is both ES6 and TypeScript syntax.
-                transformFlags |= 768 /* AssertES2015 */ | 3 /* AssertTypeScript */;
-                break;
-            case 78 /* DefaultKeyword */:
+            case 213 /* ForOfStatement */:
+                // for-of might be ESNext if it has a rest destructuring
+                transformFlags |= 48 /* AssertESNext */;
+            // FALLTHROUGH
             case 12 /* NoSubstitutionTemplateLiteral */:
             case 13 /* TemplateHead */:
             case 14 /* TemplateMiddle */:
             case 15 /* TemplateTail */:
-            case 190 /* TemplateExpression */:
-            case 177 /* TaggedTemplateExpression */:
-            case 254 /* ShorthandPropertyAssignment */:
-            case 209 /* ForOfStatement */:
+            case 194 /* TemplateExpression */:
+            case 181 /* TaggedTemplateExpression */:
+            case 258 /* ShorthandPropertyAssignment */:
+            case 114 /* StaticKeyword */:
                 // These nodes are ES6 syntax.
-                transformFlags |= 768 /* AssertES2015 */;
+                transformFlags |= 3072 /* AssertES2015 */;
                 break;
-            case 191 /* YieldExpression */:
+            case 195 /* YieldExpression */:
                 // This node is ES6 syntax.
-                transformFlags |= 768 /* AssertES2015 */ | 16777216 /* ContainsYield */;
+                transformFlags |= 3072 /* AssertES2015 */ | 134217728 /* ContainsYield */;
                 break;
             case 118 /* AnyKeyword */:
-            case 131 /* NumberKeyword */:
-            case 128 /* NeverKeyword */:
-            case 133 /* StringKeyword */:
+            case 132 /* NumberKeyword */:
+            case 129 /* NeverKeyword */:
+            case 134 /* StringKeyword */:
             case 121 /* BooleanKeyword */:
-            case 134 /* SymbolKeyword */:
+            case 135 /* SymbolKeyword */:
             case 104 /* VoidKeyword */:
-            case 142 /* TypeParameter */:
-            case 145 /* PropertySignature */:
-            case 147 /* MethodSignature */:
-            case 152 /* CallSignature */:
-            case 153 /* ConstructSignature */:
-            case 154 /* IndexSignature */:
-            case 155 /* TypePredicate */:
-            case 156 /* TypeReference */:
-            case 157 /* FunctionType */:
-            case 158 /* ConstructorType */:
-            case 159 /* TypeQuery */:
-            case 160 /* TypeLiteral */:
-            case 161 /* ArrayType */:
-            case 162 /* TupleType */:
-            case 163 /* UnionType */:
-            case 164 /* IntersectionType */:
-            case 165 /* ParenthesizedType */:
-            case 223 /* InterfaceDeclaration */:
-            case 224 /* TypeAliasDeclaration */:
-            case 166 /* ThisType */:
-            case 167 /* LiteralType */:
+            case 143 /* TypeParameter */:
+            case 146 /* PropertySignature */:
+            case 148 /* MethodSignature */:
+            case 153 /* CallSignature */:
+            case 154 /* ConstructSignature */:
+            case 155 /* IndexSignature */:
+            case 156 /* TypePredicate */:
+            case 157 /* TypeReference */:
+            case 158 /* FunctionType */:
+            case 159 /* ConstructorType */:
+            case 160 /* TypeQuery */:
+            case 161 /* TypeLiteral */:
+            case 162 /* ArrayType */:
+            case 163 /* TupleType */:
+            case 164 /* UnionType */:
+            case 165 /* IntersectionType */:
+            case 166 /* ParenthesizedType */:
+            case 227 /* InterfaceDeclaration */:
+            case 228 /* TypeAliasDeclaration */:
+            case 167 /* ThisType */:
+            case 168 /* TypeOperator */:
+            case 169 /* IndexedAccessType */:
+            case 170 /* MappedType */:
+            case 171 /* LiteralType */:
                 // Types and signatures are TypeScript syntax, and exclude all other facts.
                 transformFlags = 3 /* AssertTypeScript */;
                 excludeFlags = -3 /* TypeExcludes */;
                 break;
-            case 141 /* ComputedPropertyName */:
+            case 142 /* 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 |= 2097152 /* ContainsComputedPropertyName */;
-                if (subtreeFlags & 32768 /* ContainsLexicalThis */) {
+                transformFlags |= 16777216 /* ContainsComputedPropertyName */;
+                if (subtreeFlags & 262144 /* ContainsLexicalThis */) {
                     // A computed method name like `[this.getName()](x: string) { ... }` needs to
                     // distinguish itself from the normal case of a method body containing `this`:
                     // `this` inside a method doesn't need to be rewritten (the method provides `this`),
@@ -22016,75 +23139,151 @@ var ts;
                     // `_this = this; () => class K { [_this.getName()]() { ... } }`
                     // To make this distinction, use ContainsLexicalThisInComputedPropertyName
                     // instead of ContainsLexicalThis for computed property names
-                    transformFlags |= 131072 /* ContainsLexicalThisInComputedPropertyName */;
+                    transformFlags |= 1048576 /* ContainsLexicalThisInComputedPropertyName */;
                 }
                 break;
-            case 192 /* SpreadElementExpression */:
-                // This node is ES6 syntax, but is handled by a containing node.
-                transformFlags |= 1048576 /* ContainsSpreadElementExpression */;
+            case 196 /* SpreadElement */:
+            case 259 /* SpreadAssignment */:
+                // This node is ES6 or ES next syntax, but is handled by a containing node.
+                transformFlags |= 8388608 /* ContainsSpreadExpression */;
                 break;
+            case 174 /* BindingElement */:
+                if (node.dotDotDotToken) {
+                    // this node is ES2015 or ES next syntax, but is handled by a containing node.
+                    transformFlags |= 8388608 /* ContainsSpreadExpression */;
+                }
             case 96 /* SuperKeyword */:
                 // This node is ES6 syntax.
-                transformFlags |= 768 /* AssertES2015 */;
+                transformFlags |= 3072 /* AssertES2015 */;
                 break;
             case 98 /* ThisKeyword */:
                 // Mark this node and its ancestors as containing a lexical `this` keyword.
-                transformFlags |= 32768 /* ContainsLexicalThis */;
+                transformFlags |= 262144 /* ContainsLexicalThis */;
                 break;
-            case 168 /* ObjectBindingPattern */:
-            case 169 /* ArrayBindingPattern */:
-                // These nodes are ES6 syntax.
-                transformFlags |= 768 /* AssertES2015 */ | 8388608 /* ContainsBindingPattern */;
+            case 172 /* ObjectBindingPattern */:
+            case 173 /* ArrayBindingPattern */:
+                // These nodes are ES2015 or ES Next syntax.
+                if (subtreeFlags & 8388608 /* ContainsSpreadExpression */) {
+                    transformFlags |= 48 /* AssertESNext */ | 67108864 /* ContainsBindingPattern */;
+                }
+                else {
+                    transformFlags |= 3072 /* AssertES2015 */ | 67108864 /* ContainsBindingPattern */;
+                }
                 break;
-            case 144 /* Decorator */:
+            case 145 /* Decorator */:
                 // This node is TypeScript syntax, and marks its container as also being TypeScript syntax.
-                transformFlags |= 3 /* AssertTypeScript */ | 8192 /* ContainsDecorators */;
+                transformFlags |= 3 /* AssertTypeScript */ | 65536 /* ContainsDecorators */;
                 break;
-            case 172 /* ObjectLiteralExpression */:
-                excludeFlags = 539110741 /* ObjectLiteralExcludes */;
-                if (subtreeFlags & 2097152 /* ContainsComputedPropertyName */) {
+            case 176 /* ObjectLiteralExpression */:
+                excludeFlags = 554784085 /* ObjectLiteralExcludes */;
+                if (subtreeFlags & 16777216 /* ContainsComputedPropertyName */) {
                     // If an ObjectLiteralExpression contains a ComputedPropertyName, then it
                     // is an ES6 node.
-                    transformFlags |= 768 /* AssertES2015 */;
+                    transformFlags |= 3072 /* AssertES2015 */;
                 }
-                if (subtreeFlags & 131072 /* ContainsLexicalThisInComputedPropertyName */) {
+                if (subtreeFlags & 1048576 /* ContainsLexicalThisInComputedPropertyName */) {
                     // A computed property name containing `this` might need to be rewritten,
                     // so propagate the ContainsLexicalThis flag upward.
-                    transformFlags |= 32768 /* ContainsLexicalThis */;
+                    transformFlags |= 262144 /* ContainsLexicalThis */;
+                }
+                if (subtreeFlags & 8388608 /* ContainsSpreadExpression */) {
+                    // If an ObjectLiteralExpression contains a spread element, then it
+                    // is an ES next node.
+                    transformFlags |= 48 /* AssertESNext */;
                 }
                 break;
-            case 171 /* ArrayLiteralExpression */:
-            case 176 /* NewExpression */:
-                excludeFlags = 537922901 /* ArrayLiteralOrCallOrNewExcludes */;
-                if (subtreeFlags & 1048576 /* ContainsSpreadElementExpression */) {
-                    // If the this node contains a SpreadElementExpression, then it is an ES6
+            case 175 /* ArrayLiteralExpression */:
+            case 180 /* NewExpression */:
+                excludeFlags = 545281365 /* ArrayLiteralOrCallOrNewExcludes */;
+                if (subtreeFlags & 8388608 /* ContainsSpreadExpression */) {
+                    // If the this node contains a SpreadExpression, then it is an ES6
                     // node.
-                    transformFlags |= 768 /* AssertES2015 */;
+                    transformFlags |= 3072 /* AssertES2015 */;
                 }
                 break;
-            case 205 /* DoStatement */:
-            case 206 /* WhileStatement */:
-            case 207 /* ForStatement */:
-            case 208 /* ForInStatement */:
+            case 209 /* DoStatement */:
+            case 210 /* WhileStatement */:
+            case 211 /* ForStatement */:
+            case 212 /* ForInStatement */:
                 // A loop containing a block scoped binding *may* need to be transformed from ES6.
-                if (subtreeFlags & 4194304 /* ContainsBlockScopedBinding */) {
-                    transformFlags |= 768 /* AssertES2015 */;
+                if (subtreeFlags & 33554432 /* ContainsBlockScopedBinding */) {
+                    transformFlags |= 3072 /* AssertES2015 */;
                 }
                 break;
-            case 256 /* SourceFile */:
-                if (subtreeFlags & 65536 /* ContainsCapturedLexicalThis */) {
-                    transformFlags |= 768 /* AssertES2015 */;
+            case 261 /* SourceFile */:
+                if (subtreeFlags & 524288 /* ContainsCapturedLexicalThis */) {
+                    transformFlags |= 3072 /* AssertES2015 */;
                 }
                 break;
-            case 212 /* ReturnStatement */:
-            case 210 /* ContinueStatement */:
-            case 211 /* BreakStatement */:
-                transformFlags |= 33554432 /* ContainsHoistedDeclarationOrCompletion */;
+            case 216 /* ReturnStatement */:
+            case 214 /* ContinueStatement */:
+            case 215 /* BreakStatement */:
+                transformFlags |= 268435456 /* ContainsHoistedDeclarationOrCompletion */;
                 break;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
         return transformFlags & ~excludeFlags;
     }
+    /**
+     * Gets the transform flags to exclude when unioning the transform flags of a subtree.
+     *
+     * NOTE: This needs to be kept up-to-date with the exclusions used in `computeTransformFlagsForNode`.
+     *       For performance reasons, `computeTransformFlagsForNode` uses local constant values rather
+     *       than calling this function.
+     */
+    /* @internal */
+    function getTransformFlagsSubtreeExclusions(kind) {
+        if (kind >= 156 /* FirstTypeNode */ && kind <= 171 /* LastTypeNode */) {
+            return -3 /* TypeExcludes */;
+        }
+        switch (kind) {
+            case 179 /* CallExpression */:
+            case 180 /* NewExpression */:
+            case 175 /* ArrayLiteralExpression */:
+                return 545281365 /* ArrayLiteralOrCallOrNewExcludes */;
+            case 230 /* ModuleDeclaration */:
+                return 839734613 /* ModuleExcludes */;
+            case 144 /* Parameter */:
+                return 604001621 /* ParameterExcludes */;
+            case 185 /* ArrowFunction */:
+                return 979719509 /* ArrowFunctionExcludes */;
+            case 184 /* FunctionExpression */:
+            case 225 /* FunctionDeclaration */:
+                return 980243797 /* FunctionExcludes */;
+            case 224 /* VariableDeclarationList */:
+                return 604001621 /* VariableDeclarationListExcludes */;
+            case 226 /* ClassDeclaration */:
+            case 197 /* ClassExpression */:
+                return 559895893 /* ClassExcludes */;
+            case 150 /* Constructor */:
+                return 975983957 /* ConstructorExcludes */;
+            case 149 /* MethodDeclaration */:
+            case 151 /* GetAccessor */:
+            case 152 /* SetAccessor */:
+                return 975983957 /* MethodOrAccessorExcludes */;
+            case 118 /* AnyKeyword */:
+            case 132 /* NumberKeyword */:
+            case 129 /* NeverKeyword */:
+            case 134 /* StringKeyword */:
+            case 121 /* BooleanKeyword */:
+            case 135 /* SymbolKeyword */:
+            case 104 /* VoidKeyword */:
+            case 143 /* TypeParameter */:
+            case 146 /* PropertySignature */:
+            case 148 /* MethodSignature */:
+            case 153 /* CallSignature */:
+            case 154 /* ConstructSignature */:
+            case 155 /* IndexSignature */:
+            case 227 /* InterfaceDeclaration */:
+            case 228 /* TypeAliasDeclaration */:
+                return -3 /* TypeExcludes */;
+            case 176 /* ObjectLiteralExpression */:
+                return 554784085 /* ObjectLiteralExcludes */;
+            default:
+                return 536892757 /* NodeExcludes */;
+        }
+    }
+    ts.getTransformFlagsSubtreeExclusions = getTransformFlagsSubtreeExclusions;
 })(ts || (ts = {}));
 /// <reference path="core.ts" />
 /// <reference path="diagnosticInformationMap.generated.ts" />
@@ -22099,25 +23298,63 @@ var ts;
         return compilerOptions.traceResolution && host.trace !== undefined;
     }
     ts.isTraceEnabled = isTraceEnabled;
-    /* @internal */
-    function createResolvedModule(resolvedFileName, isExternalLibraryImport, failedLookupLocations) {
-        return { resolvedModule: resolvedFileName ? { resolvedFileName: resolvedFileName, isExternalLibraryImport: isExternalLibraryImport } : undefined, failedLookupLocations: failedLookupLocations };
+    /**
+     * Kinds of file that we are currently looking for.
+     * Typically there is one pass with Extensions.TypeScript, then a second pass with Extensions.JavaScript.
+     */
+    var Extensions;
+    (function (Extensions) {
+        Extensions[Extensions["TypeScript"] = 0] = "TypeScript";
+        Extensions[Extensions["JavaScript"] = 1] = "JavaScript";
+        Extensions[Extensions["DtsOnly"] = 2] = "DtsOnly"; /** Only '.d.ts' */
+    })(Extensions || (Extensions = {}));
+    /** Used with `Extensions.DtsOnly` to extract the path from TypeScript results. */
+    function resolvedTypeScriptOnly(resolved) {
+        if (!resolved) {
+            return undefined;
+        }
+        ts.Debug.assert(ts.extensionIsTypeScript(resolved.extension));
+        return resolved.path;
+    }
+    /** Create Resolved from a file with unknown extension. */
+    function resolvedFromAnyFile(path) {
+        return { path: path, extension: ts.extensionFromPath(path) };
+    }
+    /** Adds `isExernalLibraryImport` to a Resolved to get a ResolvedModule. */
+    function resolvedModuleFromResolved(_a, isExternalLibraryImport) {
+        var path = _a.path, extension = _a.extension;
+        return { resolvedFileName: path, extension: extension, isExternalLibraryImport: isExternalLibraryImport };
+    }
+    function createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations) {
+        return { resolvedModule: resolved && resolvedModuleFromResolved(resolved, isExternalLibraryImport), failedLookupLocations: failedLookupLocations };
     }
-    ts.createResolvedModule = createResolvedModule;
     function moduleHasNonRelativeName(moduleName) {
         return !(ts.isRootedDiskPath(moduleName) || ts.isExternalModuleNameRelative(moduleName));
     }
-    function tryReadTypesSection(packageJsonPath, baseDirectory, state) {
+    function tryReadTypesSection(extensions, packageJsonPath, baseDirectory, state) {
         var jsonContent = readJson(packageJsonPath, state.host);
+        switch (extensions) {
+            case 2 /* DtsOnly */:
+            case 0 /* TypeScript */:
+                return tryReadFromField("typings") || tryReadFromField("types");
+            case 1 /* JavaScript */:
+                if (typeof jsonContent.main === "string") {
+                    if (state.traceEnabled) {
+                        trace(state.host, ts.Diagnostics.No_types_specified_in_package_json_so_returning_main_value_of_0, jsonContent.main);
+                    }
+                    return ts.normalizePath(ts.combinePaths(baseDirectory, jsonContent.main));
+                }
+                return undefined;
+        }
         function tryReadFromField(fieldName) {
             if (ts.hasProperty(jsonContent, fieldName)) {
                 var typesFile = jsonContent[fieldName];
                 if (typeof typesFile === "string") {
-                    var typesFilePath_1 = ts.normalizePath(ts.combinePaths(baseDirectory, typesFile));
+                    var typesFilePath = ts.normalizePath(ts.combinePaths(baseDirectory, typesFile));
                     if (state.traceEnabled) {
-                        trace(state.host, ts.Diagnostics.package_json_has_0_field_1_that_references_2, fieldName, typesFile, typesFilePath_1);
+                        trace(state.host, ts.Diagnostics.package_json_has_0_field_1_that_references_2, fieldName, typesFile, typesFilePath);
                     }
-                    return typesFilePath_1;
+                    return typesFilePath;
                 }
                 else {
                     if (state.traceEnabled) {
@@ -22126,19 +23363,6 @@ var ts;
                 }
             }
         }
-        var typesFilePath = tryReadFromField("typings") || tryReadFromField("types");
-        if (typesFilePath) {
-            return typesFilePath;
-        }
-        // Use the main module for inferring types if no types package specified and the allowJs is set
-        if (state.compilerOptions.allowJs && jsonContent.main && typeof jsonContent.main === "string") {
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.No_types_specified_in_package_json_but_allowJs_is_set_so_returning_main_value_of_0, jsonContent.main);
-            }
-            var mainFilePath = ts.normalizePath(ts.combinePaths(baseDirectory, jsonContent.main));
-            return mainFilePath;
-        }
-        return undefined;
     }
     function readJson(path, host) {
         try {
@@ -22150,7 +23374,6 @@ var ts;
             return {};
         }
     }
-    var typeReferenceExtensions = [".d.ts"];
     function getEffectiveTypeRoots(options, host) {
         if (options.typeRoots) {
             return options.typeRoots;
@@ -22162,7 +23385,9 @@ var ts;
         else if (host.getCurrentDirectory) {
             currentDirectory = host.getCurrentDirectory();
         }
-        return currentDirectory !== undefined && getDefaultTypeRoots(currentDirectory, host);
+        if (currentDirectory !== undefined) {
+            return getDefaultTypeRoots(currentDirectory, host);
+        }
     }
     ts.getEffectiveTypeRoots = getEffectiveTypeRoots;
     /**
@@ -22174,17 +23399,12 @@ var ts;
             return [ts.combinePaths(currentDirectory, nodeModulesAtTypes)];
         }
         var typeRoots;
-        while (true) {
-            var atTypes = ts.combinePaths(currentDirectory, nodeModulesAtTypes);
+        forEachAncestorDirectory(currentDirectory, function (directory) {
+            var atTypes = ts.combinePaths(directory, nodeModulesAtTypes);
             if (host.directoryExists(atTypes)) {
                 (typeRoots || (typeRoots = [])).push(atTypes);
             }
-            var parent_7 = ts.getDirectoryPath(currentDirectory);
-            if (parent_7 === currentDirectory) {
-                break;
-            }
-            currentDirectory = parent_7;
-        }
+        });
         return typeRoots;
     }
     var nodeModulesAtTypes = ts.combinePaths("node_modules", "@types");
@@ -22198,7 +23418,6 @@ var ts;
         var moduleResolutionState = {
             compilerOptions: options,
             host: host,
-            skipTsx: true,
             traceEnabled: traceEnabled
         };
         var typeRoots = getEffectiveTypeRoots(options, host);
@@ -22221,64 +23440,59 @@ var ts;
             }
         }
         var failedLookupLocations = [];
-        // Check primary library paths
-        if (typeRoots && typeRoots.length) {
+        var resolved = primaryLookup();
+        var primary = true;
+        if (!resolved) {
+            resolved = secondaryLookup();
+            primary = false;
+        }
+        var resolvedTypeReferenceDirective;
+        if (resolved) {
+            resolved = realpath(resolved, host, traceEnabled);
             if (traceEnabled) {
-                trace(host, ts.Diagnostics.Resolving_with_primary_search_path_0, typeRoots.join(", "));
+                trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolved, primary);
             }
-            var primarySearchPaths = typeRoots;
-            for (var _i = 0, primarySearchPaths_1 = primarySearchPaths; _i < primarySearchPaths_1.length; _i++) {
-                var typeRoot = primarySearchPaths_1[_i];
-                var candidate = ts.combinePaths(typeRoot, typeReferenceDirectiveName);
-                var candidateDirectory = ts.getDirectoryPath(candidate);
-                var resolvedFile_1 = loadNodeModuleFromDirectory(typeReferenceExtensions, candidate, failedLookupLocations, !directoryProbablyExists(candidateDirectory, host), moduleResolutionState);
-                if (resolvedFile_1) {
-                    if (traceEnabled) {
-                        trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFile_1, true);
-                    }
-                    return {
-                        resolvedTypeReferenceDirective: { primary: true, resolvedFileName: resolvedFile_1 },
-                        failedLookupLocations: failedLookupLocations
-                    };
+            resolvedTypeReferenceDirective = { primary: primary, resolvedFileName: resolved };
+        }
+        return { resolvedTypeReferenceDirective: resolvedTypeReferenceDirective, failedLookupLocations: failedLookupLocations };
+        function primaryLookup() {
+            // Check primary library paths
+            if (typeRoots && typeRoots.length) {
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Resolving_with_primary_search_path_0, typeRoots.join(", "));
+                }
+                return ts.forEach(typeRoots, function (typeRoot) {
+                    var candidate = ts.combinePaths(typeRoot, typeReferenceDirectiveName);
+                    var candidateDirectory = ts.getDirectoryPath(candidate);
+                    return resolvedTypeScriptOnly(loadNodeModuleFromDirectory(2 /* DtsOnly */, candidate, failedLookupLocations, !directoryProbablyExists(candidateDirectory, host), moduleResolutionState));
+                });
+            }
+            else {
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Root_directory_cannot_be_determined_skipping_primary_search_paths);
                 }
             }
         }
-        else {
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Root_directory_cannot_be_determined_skipping_primary_search_paths);
-            }
-        }
-        var resolvedFile;
-        var initialLocationForSecondaryLookup;
-        if (containingFile) {
-            initialLocationForSecondaryLookup = ts.getDirectoryPath(containingFile);
-        }
-        if (initialLocationForSecondaryLookup !== undefined) {
-            // check secondary locations
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Looking_up_in_node_modules_folder_initial_location_0, initialLocationForSecondaryLookup);
-            }
-            resolvedFile = loadModuleFromNodeModules(typeReferenceDirectiveName, initialLocationForSecondaryLookup, failedLookupLocations, moduleResolutionState, /*checkOneLevel*/ false);
-            if (traceEnabled) {
-                if (resolvedFile) {
-                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFile, false);
+        function secondaryLookup() {
+            var resolvedFile;
+            var initialLocationForSecondaryLookup = containingFile && ts.getDirectoryPath(containingFile);
+            if (initialLocationForSecondaryLookup !== undefined) {
+                // check secondary locations
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Looking_up_in_node_modules_folder_initial_location_0, initialLocationForSecondaryLookup);
                 }
-                else {
+                resolvedFile = resolvedTypeScriptOnly(loadModuleFromNodeModules(2 /* DtsOnly */, typeReferenceDirectiveName, initialLocationForSecondaryLookup, failedLookupLocations, moduleResolutionState));
+                if (!resolvedFile && traceEnabled) {
                     trace(host, ts.Diagnostics.Type_reference_directive_0_was_not_resolved, typeReferenceDirectiveName);
                 }
+                return resolvedFile;
+            }
+            else {
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_modules_folder);
+                }
             }
         }
-        else {
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_modules_folder);
-            }
-        }
-        return {
-            resolvedTypeReferenceDirective: resolvedFile
-                ? { primary: false, resolvedFileName: resolvedFile }
-                : undefined,
-            failedLookupLocations: failedLookupLocations
-        };
     }
     ts.resolveTypeReferenceDirective = resolveTypeReferenceDirective;
     /**
@@ -22417,15 +23631,15 @@ var ts;
      * be converted to a path relative to found rootDir entry './content/protocols/file2' (*). As a last step compiler will check all remaining
      * entries in 'rootDirs', use them to build absolute path out of (*) and try to resolve module from this location.
      */
-    function tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, loader, failedLookupLocations, supportedExtensions, state) {
+    function tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, loader, failedLookupLocations, state) {
         if (moduleHasNonRelativeName(moduleName)) {
-            return tryLoadModuleUsingBaseUrl(moduleName, loader, failedLookupLocations, supportedExtensions, state);
+            return tryLoadModuleUsingBaseUrl(extensions, moduleName, loader, failedLookupLocations, state);
         }
         else {
-            return tryLoadModuleUsingRootDirs(moduleName, containingDirectory, loader, failedLookupLocations, supportedExtensions, state);
+            return tryLoadModuleUsingRootDirs(extensions, moduleName, containingDirectory, loader, failedLookupLocations, state);
         }
     }
-    function tryLoadModuleUsingRootDirs(moduleName, containingDirectory, loader, failedLookupLocations, supportedExtensions, state) {
+    function tryLoadModuleUsingRootDirs(extensions, moduleName, containingDirectory, loader, failedLookupLocations, state) {
         if (!state.compilerOptions.rootDirs) {
             return undefined;
         }
@@ -22463,7 +23677,7 @@ var ts;
             if (state.traceEnabled) {
                 trace(state.host, ts.Diagnostics.Loading_0_from_the_root_dir_1_candidate_location_2, suffix, matchedNormalizedPrefix, candidate);
             }
-            var resolvedFileName = loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(containingDirectory, state.host), state);
+            var resolvedFileName = loader(extensions, candidate, failedLookupLocations, !directoryProbablyExists(containingDirectory, state.host), state);
             if (resolvedFileName) {
                 return resolvedFileName;
             }
@@ -22482,7 +23696,7 @@ var ts;
                     trace(state.host, ts.Diagnostics.Loading_0_from_the_root_dir_1_candidate_location_2, suffix, rootDir, candidate_1);
                 }
                 var baseDirectory = ts.getDirectoryPath(candidate_1);
-                var resolvedFileName_1 = loader(candidate_1, supportedExtensions, failedLookupLocations, !directoryProbablyExists(baseDirectory, state.host), state);
+                var resolvedFileName_1 = loader(extensions, candidate_1, failedLookupLocations, !directoryProbablyExists(baseDirectory, state.host), state);
                 if (resolvedFileName_1) {
                     return resolvedFileName_1;
                 }
@@ -22493,7 +23707,7 @@ var ts;
         }
         return undefined;
     }
-    function tryLoadModuleUsingBaseUrl(moduleName, loader, failedLookupLocations, supportedExtensions, state) {
+    function tryLoadModuleUsingBaseUrl(extensions, moduleName, loader, failedLookupLocations, state) {
         if (!state.compilerOptions.baseUrl) {
             return undefined;
         }
@@ -22509,70 +23723,82 @@ var ts;
             matchedPattern = ts.matchPatternOrExact(ts.getOwnKeys(state.compilerOptions.paths), moduleName);
         }
         if (matchedPattern) {
-            var matchedStar = typeof matchedPattern === "string" ? undefined : ts.matchedText(matchedPattern, moduleName);
+            var matchedStar_1 = typeof matchedPattern === "string" ? undefined : ts.matchedText(matchedPattern, moduleName);
             var matchedPatternText = typeof matchedPattern === "string" ? matchedPattern : ts.patternText(matchedPattern);
             if (state.traceEnabled) {
                 trace(state.host, ts.Diagnostics.Module_name_0_matched_pattern_1, moduleName, matchedPatternText);
             }
-            for (var _i = 0, _a = state.compilerOptions.paths[matchedPatternText]; _i < _a.length; _i++) {
-                var subst = _a[_i];
-                var path = matchedStar ? subst.replace("*", matchedStar) : subst;
+            return ts.forEach(state.compilerOptions.paths[matchedPatternText], function (subst) {
+                var path = matchedStar_1 ? subst.replace("*", matchedStar_1) : subst;
                 var candidate = ts.normalizePath(ts.combinePaths(state.compilerOptions.baseUrl, path));
                 if (state.traceEnabled) {
                     trace(state.host, ts.Diagnostics.Trying_substitution_0_candidate_module_location_Colon_1, subst, path);
                 }
-                var resolvedFileName = loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
-                if (resolvedFileName) {
-                    return resolvedFileName;
+                // A path mapping may have a ".ts" extension; in contrast to an import, which should omit it.
+                var tsExtension = ts.tryGetExtensionFromPath(candidate);
+                if (tsExtension !== undefined) {
+                    var path_1 = tryFile(candidate, failedLookupLocations, /*onlyRecordFailures*/ false, state);
+                    return path_1 && { path: path_1, extension: tsExtension };
                 }
-            }
-            return undefined;
+                return loader(extensions, candidate, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
+            });
         }
         else {
             var candidate = ts.normalizePath(ts.combinePaths(state.compilerOptions.baseUrl, moduleName));
             if (state.traceEnabled) {
                 trace(state.host, ts.Diagnostics.Resolving_module_name_0_relative_to_base_url_1_2, moduleName, state.compilerOptions.baseUrl, candidate);
             }
-            return loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
+            return loader(extensions, candidate, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
         }
     }
     function nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host) {
         var containingDirectory = ts.getDirectoryPath(containingFile);
-        var supportedExtensions = ts.getSupportedExtensions(compilerOptions);
         var traceEnabled = isTraceEnabled(compilerOptions, host);
         var failedLookupLocations = [];
-        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, skipTsx: false };
-        var resolvedFileName = tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, nodeLoadModuleByRelativeName, failedLookupLocations, supportedExtensions, state);
-        var isExternalLibraryImport = false;
-        if (!resolvedFileName) {
+        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled };
+        var result = tryResolve(0 /* TypeScript */) || tryResolve(1 /* JavaScript */);
+        if (result) {
+            var resolved = result.resolved, isExternalLibraryImport = result.isExternalLibraryImport;
+            return createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations);
+        }
+        return { resolvedModule: undefined, failedLookupLocations: failedLookupLocations };
+        function tryResolve(extensions) {
+            var resolved = tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, nodeLoadModuleByRelativeName, failedLookupLocations, state);
+            if (resolved) {
+                return { resolved: resolved, isExternalLibraryImport: false };
+            }
             if (moduleHasNonRelativeName(moduleName)) {
                 if (traceEnabled) {
                     trace(host, ts.Diagnostics.Loading_module_0_from_node_modules_folder, moduleName);
                 }
-                resolvedFileName = loadModuleFromNodeModules(moduleName, containingDirectory, failedLookupLocations, state, /*checkOneLevel*/ false);
-                isExternalLibraryImport = resolvedFileName !== undefined;
+                var resolved_1 = loadModuleFromNodeModules(extensions, moduleName, containingDirectory, failedLookupLocations, state);
+                // For node_modules lookups, get the real path so that multiple accesses to an `npm link`-ed module do not create duplicate files.
+                return resolved_1 && { resolved: { path: realpath(resolved_1.path, host, traceEnabled), extension: resolved_1.extension }, isExternalLibraryImport: true };
             }
             else {
                 var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
-                resolvedFileName = nodeLoadModuleByRelativeName(candidate, supportedExtensions, failedLookupLocations, /*onlyRecordFailures*/ false, state);
+                var resolved_2 = nodeLoadModuleByRelativeName(extensions, candidate, failedLookupLocations, /*onlyRecordFailures*/ false, state);
+                return resolved_2 && { resolved: resolved_2, isExternalLibraryImport: false };
             }
         }
-        if (resolvedFileName && host.realpath) {
-            var originalFileName = resolvedFileName;
-            resolvedFileName = ts.normalizePath(host.realpath(resolvedFileName));
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Resolving_real_path_for_0_result_1, originalFileName, resolvedFileName);
-            }
-        }
-        return createResolvedModule(resolvedFileName, isExternalLibraryImport, failedLookupLocations);
     }
     ts.nodeModuleNameResolver = nodeModuleNameResolver;
-    function nodeLoadModuleByRelativeName(candidate, supportedExtensions, failedLookupLocations, onlyRecordFailures, state) {
+    function realpath(path, host, traceEnabled) {
+        if (!host.realpath) {
+            return path;
+        }
+        var real = ts.normalizePath(host.realpath(path));
+        if (traceEnabled) {
+            trace(host, ts.Diagnostics.Resolving_real_path_for_0_result_1, path, real);
+        }
+        return real;
+    }
+    function nodeLoadModuleByRelativeName(extensions, candidate, failedLookupLocations, onlyRecordFailures, state) {
         if (state.traceEnabled) {
             trace(state.host, ts.Diagnostics.Loading_module_as_file_Slash_folder_candidate_module_location_0, candidate);
         }
-        var resolvedFileName = !ts.pathEndsWithDirectorySeparator(candidate) && loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, onlyRecordFailures, state);
-        return resolvedFileName || loadNodeModuleFromDirectory(supportedExtensions, candidate, failedLookupLocations, onlyRecordFailures, state);
+        var resolvedFromFile = !ts.pathEndsWithDirectorySeparator(candidate) && loadModuleFromFile(extensions, candidate, failedLookupLocations, onlyRecordFailures, state);
+        return resolvedFromFile || loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, onlyRecordFailures, state);
     }
     /* @internal */
     function directoryProbablyExists(directoryName, host) {
@@ -22584,9 +23810,9 @@ var ts;
      * @param {boolean} onlyRecordFailures - if true then function won't try to actually load files but instead record all attempts as failures. This flag is necessary
      * in cases when we know upfront that all load attempts will fail (because containing folder does not exists) however we still need to record all failed lookup locations.
      */
-    function loadModuleFromFile(candidate, extensions, failedLookupLocation, onlyRecordFailures, state) {
+    function loadModuleFromFile(extensions, candidate, failedLookupLocations, onlyRecordFailures, state) {
         // First, try adding an extension. An import of "foo" could be matched by a file "foo.ts", or "foo.js" by "foo.js.ts"
-        var resolvedByAddingExtension = tryAddingExtensions(candidate, extensions, failedLookupLocation, onlyRecordFailures, state);
+        var resolvedByAddingExtension = tryAddingExtensions(candidate, extensions, failedLookupLocations, onlyRecordFailures, state);
         if (resolvedByAddingExtension) {
             return resolvedByAddingExtension;
         }
@@ -22598,11 +23824,11 @@ var ts;
                 var extension = candidate.substring(extensionless.length);
                 trace(state.host, ts.Diagnostics.File_name_0_has_a_1_extension_stripping_it, candidate, extension);
             }
-            return tryAddingExtensions(extensionless, extensions, failedLookupLocation, onlyRecordFailures, state);
+            return tryAddingExtensions(extensionless, extensions, failedLookupLocations, onlyRecordFailures, state);
         }
     }
     /** Try to return an existing file that adds one of the `extensions` to `candidate`. */
-    function tryAddingExtensions(candidate, extensions, failedLookupLocation, onlyRecordFailures, state) {
+    function tryAddingExtensions(candidate, extensions, failedLookupLocations, onlyRecordFailures, state) {
         if (!onlyRecordFailures) {
             // check if containing folder exists - if it doesn't then just record failures for all supported extensions without disk probing
             var directory = ts.getDirectoryPath(candidate);
@@ -22610,12 +23836,21 @@ var ts;
                 onlyRecordFailures = !directoryProbablyExists(directory, state.host);
             }
         }
-        return ts.forEach(extensions, function (ext) {
-            return !(state.skipTsx && ts.isJsxOrTsxExtension(ext)) && tryFile(candidate + ext, failedLookupLocation, onlyRecordFailures, state);
-        });
+        switch (extensions) {
+            case 2 /* DtsOnly */:
+                return tryExtension(".d.ts", ts.Extension.Dts);
+            case 0 /* TypeScript */:
+                return tryExtension(".ts", ts.Extension.Ts) || tryExtension(".tsx", ts.Extension.Tsx) || tryExtension(".d.ts", ts.Extension.Dts);
+            case 1 /* JavaScript */:
+                return tryExtension(".js", ts.Extension.Js) || tryExtension(".jsx", ts.Extension.Jsx);
+        }
+        function tryExtension(ext, extension) {
+            var path = tryFile(candidate + ext, failedLookupLocations, onlyRecordFailures, state);
+            return path && { path: path, extension: extension };
+        }
     }
     /** Return the file if it exists. */
-    function tryFile(fileName, failedLookupLocation, onlyRecordFailures, state) {
+    function tryFile(fileName, failedLookupLocations, onlyRecordFailures, state) {
         if (!onlyRecordFailures && state.host.fileExists(fileName)) {
             if (state.traceEnabled) {
                 trace(state.host, ts.Diagnostics.File_0_exist_use_it_as_a_name_resolution_result, fileName);
@@ -22626,30 +23861,34 @@ var ts;
             if (state.traceEnabled) {
                 trace(state.host, ts.Diagnostics.File_0_does_not_exist, fileName);
             }
-            failedLookupLocation.push(fileName);
+            failedLookupLocations.push(fileName);
             return undefined;
         }
     }
-    function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocation, onlyRecordFailures, state) {
+    function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, onlyRecordFailures, state) {
         var packageJsonPath = pathToPackageJson(candidate);
         var directoryExists = !onlyRecordFailures && directoryProbablyExists(candidate, state.host);
         if (directoryExists && state.host.fileExists(packageJsonPath)) {
             if (state.traceEnabled) {
                 trace(state.host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath);
             }
-            var typesFile = tryReadTypesSection(packageJsonPath, candidate, state);
+            var typesFile = tryReadTypesSection(extensions, packageJsonPath, candidate, state);
             if (typesFile) {
                 var onlyRecordFailures_1 = !directoryProbablyExists(ts.getDirectoryPath(typesFile), state.host);
                 // A package.json "typings" may specify an exact filename, or may choose to omit an extension.
-                var result = tryFile(typesFile, failedLookupLocation, onlyRecordFailures_1, state) ||
-                    tryAddingExtensions(typesFile, extensions, failedLookupLocation, onlyRecordFailures_1, state);
-                if (result) {
-                    return result;
+                var fromFile = tryFile(typesFile, failedLookupLocations, onlyRecordFailures_1, state);
+                if (fromFile) {
+                    // Note: this would allow a package.json to specify a ".js" file as typings. Maybe that should be forbidden.
+                    return resolvedFromAnyFile(fromFile);
+                }
+                var x = tryAddingExtensions(typesFile, 0 /* TypeScript */, failedLookupLocations, onlyRecordFailures_1, state);
+                if (x) {
+                    return x;
                 }
             }
             else {
                 if (state.traceEnabled) {
-                    trace(state.host, ts.Diagnostics.package_json_does_not_have_types_field);
+                    trace(state.host, ts.Diagnostics.package_json_does_not_have_a_types_or_main_field);
                 }
             }
         }
@@ -22658,101 +23897,106 @@ var ts;
                 trace(state.host, ts.Diagnostics.File_0_does_not_exist, packageJsonPath);
             }
             // record package json as one of failed lookup locations - in the future if this file will appear it will invalidate resolution results
-            failedLookupLocation.push(packageJsonPath);
+            failedLookupLocations.push(packageJsonPath);
         }
-        return loadModuleFromFile(ts.combinePaths(candidate, "index"), extensions, failedLookupLocation, !directoryExists, state);
+        return loadModuleFromFile(extensions, ts.combinePaths(candidate, "index"), failedLookupLocations, !directoryExists, state);
     }
     function pathToPackageJson(directory) {
         return ts.combinePaths(directory, "package.json");
     }
-    function loadModuleFromNodeModulesFolder(moduleName, directory, failedLookupLocations, state) {
+    function loadModuleFromNodeModulesFolder(extensions, moduleName, directory, failedLookupLocations, state) {
         var nodeModulesFolder = ts.combinePaths(directory, "node_modules");
         var nodeModulesFolderExists = directoryProbablyExists(nodeModulesFolder, state.host);
         var candidate = ts.normalizePath(ts.combinePaths(nodeModulesFolder, moduleName));
-        var supportedExtensions = ts.getSupportedExtensions(state.compilerOptions);
-        var result = loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, !nodeModulesFolderExists, state);
-        if (result) {
-            return result;
-        }
-        result = loadNodeModuleFromDirectory(supportedExtensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state);
-        if (result) {
-            return result;
-        }
+        return loadModuleFromFile(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state) ||
+            loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state);
     }
-    /* @internal */
-    function loadModuleFromNodeModules(moduleName, directory, failedLookupLocations, state, checkOneLevel) {
-        return loadModuleFromNodeModulesWorker(moduleName, directory, failedLookupLocations, state, checkOneLevel, /*typesOnly*/ false);
+    function loadModuleFromNodeModules(extensions, moduleName, directory, failedLookupLocations, state) {
+        return loadModuleFromNodeModulesWorker(extensions, moduleName, directory, failedLookupLocations, state, /*typesOnly*/ false);
     }
-    ts.loadModuleFromNodeModules = loadModuleFromNodeModules;
     function loadModuleFromNodeModulesAtTypes(moduleName, directory, failedLookupLocations, state) {
-        return loadModuleFromNodeModulesWorker(moduleName, directory, failedLookupLocations, state, /*checkOneLevel*/ false, /*typesOnly*/ true);
+        // Extensions parameter here doesn't actually matter, because typesOnly ensures we're just doing @types lookup, which is always DtsOnly.
+        return loadModuleFromNodeModulesWorker(2 /* DtsOnly */, moduleName, directory, failedLookupLocations, state, /*typesOnly*/ true);
     }
-    function loadModuleFromNodeModulesWorker(moduleName, directory, failedLookupLocations, state, checkOneLevel, typesOnly) {
-        directory = ts.normalizeSlashes(directory);
-        while (true) {
-            var baseName = ts.getBaseFileName(directory);
-            if (baseName !== "node_modules") {
-                var packageResult = void 0;
-                if (!typesOnly) {
-                    // Try to load source from the package
-                    packageResult = loadModuleFromNodeModulesFolder(moduleName, directory, failedLookupLocations, state);
-                    if (packageResult && ts.hasTypeScriptFileExtension(packageResult)) {
-                        // Always prefer a TypeScript (.ts, .tsx, .d.ts) file shipped with the package
-                        return packageResult;
-                    }
-                }
-                // Else prefer a types package over non-TypeScript results (e.g. JavaScript files)
-                var typesResult = loadModuleFromNodeModulesFolder(ts.combinePaths("@types", moduleName), directory, failedLookupLocations, state);
-                if (typesResult || packageResult) {
-                    return typesResult || packageResult;
-                }
+    function loadModuleFromNodeModulesWorker(extensions, moduleName, directory, failedLookupLocations, state, typesOnly) {
+        return forEachAncestorDirectory(ts.normalizeSlashes(directory), function (ancestorDirectory) {
+            if (ts.getBaseFileName(ancestorDirectory) !== "node_modules") {
+                return loadModuleFromNodeModulesOneLevel(extensions, moduleName, ancestorDirectory, failedLookupLocations, state, typesOnly);
             }
-            var parentPath = ts.getDirectoryPath(directory);
-            if (parentPath === directory || checkOneLevel) {
-                break;
-            }
-            directory = parentPath;
+        });
+    }
+    /** Load a module from a single node_modules directory, but not from any ancestors' node_modules directories. */
+    function loadModuleFromNodeModulesOneLevel(extensions, moduleName, directory, failedLookupLocations, state, typesOnly) {
+        if (typesOnly === void 0) { typesOnly = false; }
+        var packageResult = typesOnly ? undefined : loadModuleFromNodeModulesFolder(extensions, moduleName, directory, failedLookupLocations, state);
+        if (packageResult) {
+            return packageResult;
+        }
+        if (extensions !== 1 /* JavaScript */) {
+            return loadModuleFromNodeModulesFolder(2 /* DtsOnly */, ts.combinePaths("@types", moduleName), directory, failedLookupLocations, state);
         }
-        return undefined;
     }
     function classicNameResolver(moduleName, containingFile, compilerOptions, host) {
         var traceEnabled = isTraceEnabled(compilerOptions, host);
-        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, skipTsx: !compilerOptions.jsx };
+        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled };
         var failedLookupLocations = [];
-        var supportedExtensions = ts.getSupportedExtensions(compilerOptions);
         var containingDirectory = ts.getDirectoryPath(containingFile);
-        var resolvedFileName = tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, loadModuleFromFile, failedLookupLocations, supportedExtensions, state);
-        if (resolvedFileName) {
-            return createResolvedModule(resolvedFileName, /*isExternalLibraryImport*/ false, failedLookupLocations);
+        var resolved = tryResolve(0 /* TypeScript */) || tryResolve(1 /* JavaScript */);
+        return createResolvedModuleWithFailedLookupLocations(resolved, /*isExternalLibraryImport*/ false, failedLookupLocations);
+        function tryResolve(extensions) {
+            var resolvedUsingSettings = tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, loadModuleFromFile, failedLookupLocations, state);
+            if (resolvedUsingSettings) {
+                return resolvedUsingSettings;
+            }
+            if (moduleHasNonRelativeName(moduleName)) {
+                // Climb up parent directories looking for a module.
+                var resolved_3 = forEachAncestorDirectory(containingDirectory, function (directory) {
+                    var searchName = ts.normalizePath(ts.combinePaths(directory, moduleName));
+                    return loadModuleFromFile(extensions, searchName, failedLookupLocations, /*onlyRecordFailures*/ false, state);
+                });
+                if (resolved_3) {
+                    return resolved_3;
+                }
+                if (extensions === 0 /* TypeScript */) {
+                    // If we didn't find the file normally, look it up in @types.
+                    return loadModuleFromNodeModulesAtTypes(moduleName, containingDirectory, failedLookupLocations, state);
+                }
+            }
+            else {
+                var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
+                return loadModuleFromFile(extensions, candidate, failedLookupLocations, /*onlyRecordFailures*/ false, state);
+            }
         }
-        var referencedSourceFile;
-        if (moduleHasNonRelativeName(moduleName)) {
-            referencedSourceFile = referencedSourceFile = loadModuleFromAncestorDirectories(moduleName, containingDirectory, supportedExtensions, failedLookupLocations, state) ||
-                // If we didn't find the file normally, look it up in @types.
-                loadModuleFromNodeModulesAtTypes(moduleName, containingDirectory, failedLookupLocations, state);
-        }
-        else {
-            var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
-            referencedSourceFile = loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, /*onlyRecordFailures*/ false, state);
-        }
-        return referencedSourceFile
-            ? { resolvedModule: { resolvedFileName: referencedSourceFile }, failedLookupLocations: failedLookupLocations }
-            : { resolvedModule: undefined, failedLookupLocations: failedLookupLocations };
     }
     ts.classicNameResolver = classicNameResolver;
-    /** Climb up parent directories looking for a module. */
-    function loadModuleFromAncestorDirectories(moduleName, containingDirectory, supportedExtensions, failedLookupLocations, state) {
+    /**
+     * 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.
+     */
+    /* @internal */
+    function loadModuleFromGlobalCache(moduleName, projectName, compilerOptions, host, globalCache) {
+        var traceEnabled = isTraceEnabled(compilerOptions, host);
+        if (traceEnabled) {
+            trace(host, ts.Diagnostics.Auto_discovery_for_typings_is_enabled_in_project_0_Running_extra_resolution_pass_for_module_1_using_cache_location_2, projectName, moduleName, globalCache);
+        }
+        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled };
+        var failedLookupLocations = [];
+        var resolved = loadModuleFromNodeModulesOneLevel(2 /* DtsOnly */, moduleName, globalCache, failedLookupLocations, state);
+        return createResolvedModuleWithFailedLookupLocations(resolved, /*isExternalLibraryImport*/ true, failedLookupLocations);
+    }
+    ts.loadModuleFromGlobalCache = loadModuleFromGlobalCache;
+    /** Calls `callback` on `directory` and every ancestor directory it has, returning the first defined result. */
+    function forEachAncestorDirectory(directory, callback) {
         while (true) {
-            var searchName = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
-            var referencedSourceFile = loadModuleFromFile(searchName, supportedExtensions, failedLookupLocations, /*onlyRecordFailures*/ false, state);
-            if (referencedSourceFile) {
-                return referencedSourceFile;
+            var result = callback(directory);
+            if (result !== undefined) {
+                return result;
             }
-            var parentPath = ts.getDirectoryPath(containingDirectory);
-            if (parentPath === containingDirectory) {
+            var parentPath = ts.getDirectoryPath(directory);
+            if (parentPath === directory) {
                 return undefined;
             }
-            containingDirectory = parentPath;
+            directory = parentPath;
         }
     }
 })(ts || (ts = {}));
@@ -22854,7 +24098,12 @@ var ts;
             getAmbientModules: getAmbientModules,
             getJsxElementAttributesType: getJsxElementAttributesType,
             getJsxIntrinsicTagNames: getJsxIntrinsicTagNames,
-            isOptionalParameter: isOptionalParameter
+            isOptionalParameter: isOptionalParameter,
+            tryFindAmbientModuleWithoutAugmentations: function (moduleName) {
+                // we deliberately exclude augmentations
+                // since we are only interested in declarations of the module itself
+                return tryFindAmbientModule(moduleName, /*withAugmentations*/ false);
+            }
         };
         var tupleTypes = [];
         var unionTypes = ts.createMap();
@@ -22868,9 +24117,9 @@ var ts;
         var autoType = createIntrinsicType(1 /* Any */, "any");
         var unknownType = createIntrinsicType(1 /* Any */, "unknown");
         var undefinedType = createIntrinsicType(2048 /* Undefined */, "undefined");
-        var undefinedWideningType = strictNullChecks ? undefinedType : createIntrinsicType(2048 /* Undefined */ | 33554432 /* ContainsWideningType */, "undefined");
+        var undefinedWideningType = strictNullChecks ? undefinedType : createIntrinsicType(2048 /* Undefined */ | 2097152 /* ContainsWideningType */, "undefined");
         var nullType = createIntrinsicType(4096 /* Null */, "null");
-        var nullWideningType = strictNullChecks ? nullType : createIntrinsicType(4096 /* Null */ | 33554432 /* ContainsWideningType */, "null");
+        var nullWideningType = strictNullChecks ? nullType : createIntrinsicType(4096 /* Null */ | 2097152 /* ContainsWideningType */, "null");
         var stringType = createIntrinsicType(2 /* String */, "string");
         var numberType = createIntrinsicType(4 /* Number */, "number");
         var trueType = createIntrinsicType(128 /* BooleanLiteral */, "true");
@@ -22880,13 +24129,17 @@ var ts;
         var voidType = createIntrinsicType(1024 /* Void */, "void");
         var neverType = createIntrinsicType(8192 /* Never */, "never");
         var silentNeverType = createIntrinsicType(8192 /* Never */, "never");
+        var stringOrNumberType = getUnionType([stringType, numberType]);
         var emptyObjectType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
+        var emptyTypeLiteralSymbol = createSymbol(2048 /* TypeLiteral */ | 67108864 /* Transient */, "__type");
+        emptyTypeLiteralSymbol.members = ts.createMap();
+        var emptyTypeLiteralType = createAnonymousType(emptyTypeLiteralSymbol, emptySymbols, emptyArray, emptyArray, undefined, undefined);
         var emptyGenericType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
         emptyGenericType.instantiations = ts.createMap();
         var anyFunctionType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
         // The anyFunctionType contains the anyFunctionType by definition. The flag is further propagated
         // in getPropagatingFlagsOfTypes, and it is checked in inferFromTypes.
-        anyFunctionType.flags |= 134217728 /* ContainsAnyFunctionType */;
+        anyFunctionType.flags |= 8388608 /* ContainsAnyFunctionType */;
         var noConstraintType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
         var anySignature = createSignature(undefined, undefined, undefined, emptyArray, anyType, /*typePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false);
         var unknownSignature = createSignature(undefined, undefined, undefined, emptyArray, unknownType, /*typePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false);
@@ -23045,6 +24298,8 @@ var ts;
             "undefined": undefinedType
         });
         var jsxElementType;
+        var _jsxNamespace;
+        var _jsxFactoryEntity;
         /** Things we lazy load from the JSX namespace */
         var jsxTypes = ts.createMap();
         var JsxNames = {
@@ -23074,6 +24329,21 @@ var ts;
         builtinGlobals[undefinedSymbol.name] = undefinedSymbol;
         initializeTypeChecker();
         return checker;
+        function getJsxNamespace() {
+            if (_jsxNamespace === undefined) {
+                _jsxNamespace = "React";
+                if (compilerOptions.jsxFactory) {
+                    _jsxFactoryEntity = ts.parseIsolatedEntityName(compilerOptions.jsxFactory, languageVersion);
+                    if (_jsxFactoryEntity) {
+                        _jsxNamespace = getFirstIdentifier(_jsxFactoryEntity).text;
+                    }
+                }
+                else if (compilerOptions.reactNamespace) {
+                    _jsxNamespace = compilerOptions.reactNamespace;
+                }
+            }
+            return _jsxNamespace;
+        }
         function getEmitResolver(sourceFile, cancellationToken) {
             // Ensure we have all the type information in place for this file so that all the
             // emitter questions of this resolver will return the right information.
@@ -23157,7 +24427,7 @@ var ts;
                 target.flags |= source.flags;
                 if (source.valueDeclaration &&
                     (!target.valueDeclaration ||
-                        (target.valueDeclaration.kind === 226 /* ModuleDeclaration */ && source.valueDeclaration.kind !== 226 /* ModuleDeclaration */))) {
+                        (target.valueDeclaration.kind === 230 /* ModuleDeclaration */ && source.valueDeclaration.kind !== 230 /* ModuleDeclaration */))) {
                     // other kinds of value declarations take precedence over modules
                     target.valueDeclaration = source.valueDeclaration;
                 }
@@ -23219,7 +24489,7 @@ var ts;
                 var moduleNotFoundError = !ts.isInAmbientContext(moduleName.parent.parent)
                     ? ts.Diagnostics.Invalid_module_name_in_augmentation_module_0_cannot_be_found
                     : undefined;
-                var mainModule = resolveExternalModuleNameWorker(moduleName, moduleName, moduleNotFoundError);
+                var mainModule = resolveExternalModuleNameWorker(moduleName, moduleName, moduleNotFoundError, /*isForAugmentation*/ true);
                 if (!mainModule) {
                     return;
                 }
@@ -23260,8 +24530,11 @@ var ts;
             var nodeId = getNodeId(node);
             return nodeLinks[nodeId] || (nodeLinks[nodeId] = { flags: 0 });
         }
+        function getObjectFlags(type) {
+            return type.flags & 32768 /* Object */ ? type.objectFlags : 0;
+        }
         function isGlobalSourceFile(node) {
-            return node.kind === 256 /* SourceFile */ && !ts.isExternalOrCommonJsModule(node);
+            return node.kind === 261 /* SourceFile */ && !ts.isExternalOrCommonJsModule(node);
         }
         function getSymbol(symbols, name, meaning) {
             if (meaning) {
@@ -23307,24 +24580,30 @@ var ts;
                     // nodes are in different files and order cannot be determines
                     return true;
                 }
+                // declaration is after usage
+                // can be legal if usage is deferred (i.e. inside function or in initializer of instance property)
+                if (isUsedInFunctionOrNonStaticProperty(usage)) {
+                    return true;
+                }
                 var sourceFiles = host.getSourceFiles();
                 return ts.indexOf(sourceFiles, declarationFile) <= ts.indexOf(sourceFiles, useFile);
             }
             if (declaration.pos <= usage.pos) {
                 // declaration is before usage
                 // still might be illegal if usage is in the initializer of the variable declaration
-                return declaration.kind !== 219 /* VariableDeclaration */ ||
+                return declaration.kind !== 223 /* VariableDeclaration */ ||
                     !isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage);
             }
             // declaration is after usage
             // can be legal if usage is deferred (i.e. inside function or in initializer of instance property)
-            return isUsedInFunctionOrNonStaticProperty(declaration, usage);
+            var container = ts.getEnclosingBlockScopeContainer(declaration);
+            return isUsedInFunctionOrNonStaticProperty(usage, container);
             function isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage) {
                 var container = ts.getEnclosingBlockScopeContainer(declaration);
                 switch (declaration.parent.parent.kind) {
-                    case 201 /* VariableStatement */:
-                    case 207 /* ForStatement */:
-                    case 209 /* ForOfStatement */:
+                    case 205 /* VariableStatement */:
+                    case 211 /* ForStatement */:
+                    case 213 /* 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)) {
@@ -23333,8 +24612,8 @@ var ts;
                         break;
                 }
                 switch (declaration.parent.parent.kind) {
-                    case 208 /* ForInStatement */:
-                    case 209 /* ForOfStatement */:
+                    case 212 /* ForInStatement */:
+                    case 213 /* ForOfStatement */:
                         // ForIn/ForOf case - use site should not be used in expression part
                         if (isSameScopeDescendentOf(usage, declaration.parent.parent.expression, container)) {
                             return true;
@@ -23342,8 +24621,7 @@ var ts;
                 }
                 return false;
             }
-            function isUsedInFunctionOrNonStaticProperty(declaration, usage) {
-                var container = ts.getEnclosingBlockScopeContainer(declaration);
+            function isUsedInFunctionOrNonStaticProperty(usage, container) {
                 var current = usage;
                 while (current) {
                     if (current === container) {
@@ -23353,7 +24631,7 @@ var ts;
                         return true;
                     }
                     var initializerOfNonStaticProperty = current.parent &&
-                        current.parent.kind === 146 /* PropertyDeclaration */ &&
+                        current.parent.kind === 147 /* PropertyDeclaration */ &&
                         (ts.getModifierFlags(current.parent) & 32 /* Static */) === 0 &&
                         current.parent.initializer === current;
                     if (initializerOfNonStaticProperty) {
@@ -23386,11 +24664,11 @@ 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 & 793064 /* Type */ && lastLocation.kind !== 273 /* JSDocComment */) {
+                            if (meaning & result.flags & 793064 /* Type */ && lastLocation.kind !== 278 /* JSDocComment */) {
                                 useResult = result.flags & 262144 /* TypeParameter */
                                     ? lastLocation === location.type ||
-                                        lastLocation.kind === 143 /* Parameter */ ||
-                                        lastLocation.kind === 142 /* TypeParameter */
+                                        lastLocation.kind === 144 /* Parameter */ ||
+                                        lastLocation.kind === 143 /* TypeParameter */
                                     : false;
                             }
                             if (meaning & 107455 /* Value */ && result.flags & 1 /* FunctionScopedVariable */) {
@@ -23399,9 +24677,9 @@ 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 === 143 /* Parameter */ ||
+                                    lastLocation.kind === 144 /* Parameter */ ||
                                         (lastLocation === location.type &&
-                                            result.valueDeclaration.kind === 143 /* Parameter */);
+                                            result.valueDeclaration.kind === 144 /* Parameter */);
                             }
                         }
                         if (useResult) {
@@ -23413,13 +24691,13 @@ var ts;
                     }
                 }
                 switch (location.kind) {
-                    case 256 /* SourceFile */:
+                    case 261 /* SourceFile */:
                         if (!ts.isExternalOrCommonJsModule(location))
                             break;
                         isInExternalModule = true;
-                    case 226 /* ModuleDeclaration */:
+                    case 230 /* ModuleDeclaration */:
                         var moduleExports = getSymbolOfNode(location).exports;
-                        if (location.kind === 256 /* SourceFile */ || ts.isAmbientModule(location)) {
+                        if (location.kind === 261 /* 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["default"]) {
@@ -23442,7 +24720,7 @@ var ts;
                             //        which is not the desired behavior.
                             if (moduleExports[name] &&
                                 moduleExports[name].flags === 8388608 /* Alias */ &&
-                                ts.getDeclarationOfKind(moduleExports[name], 239 /* ExportSpecifier */)) {
+                                ts.getDeclarationOfKind(moduleExports[name], 243 /* ExportSpecifier */)) {
                                 break;
                             }
                         }
@@ -23450,13 +24728,13 @@ var ts;
                             break loop;
                         }
                         break;
-                    case 225 /* EnumDeclaration */:
+                    case 229 /* EnumDeclaration */:
                         if (result = getSymbol(getSymbolOfNode(location).exports, name, meaning & 8 /* EnumMember */)) {
                             break loop;
                         }
                         break;
-                    case 146 /* PropertyDeclaration */:
-                    case 145 /* PropertySignature */:
+                    case 147 /* PropertyDeclaration */:
+                    case 146 /* PropertySignature */:
                         // 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
@@ -23473,9 +24751,9 @@ var ts;
                             }
                         }
                         break;
-                    case 222 /* ClassDeclaration */:
-                    case 193 /* ClassExpression */:
-                    case 223 /* InterfaceDeclaration */:
+                    case 226 /* ClassDeclaration */:
+                    case 197 /* ClassExpression */:
+                    case 227 /* InterfaceDeclaration */:
                         if (result = getSymbol(getSymbolOfNode(location).members, name, meaning & 793064 /* Type */)) {
                             if (lastLocation && ts.getModifierFlags(lastLocation) & 32 /* Static */) {
                                 // TypeScript 1.0 spec (April 2014): 3.4.1
@@ -23486,7 +24764,7 @@ var ts;
                             }
                             break loop;
                         }
-                        if (location.kind === 193 /* ClassExpression */ && meaning & 32 /* Class */) {
+                        if (location.kind === 197 /* ClassExpression */ && meaning & 32 /* Class */) {
                             var className = location.name;
                             if (className && name === className.text) {
                                 result = location.symbol;
@@ -23502,9 +24780,9 @@ var ts;
                     //       [foo<T>()]() { } // <-- Reference to T from class's own computed property
                     //   }
                     //
-                    case 141 /* ComputedPropertyName */:
+                    case 142 /* ComputedPropertyName */:
                         grandparent = location.parent.parent;
-                        if (ts.isClassLike(grandparent) || grandparent.kind === 223 /* InterfaceDeclaration */) {
+                        if (ts.isClassLike(grandparent) || grandparent.kind === 227 /* InterfaceDeclaration */) {
                             // A reference to this grandparent's type parameters would be an error
                             if (result = getSymbol(getSymbolOfNode(grandparent).members, name, meaning & 793064 /* Type */)) {
                                 error(errorLocation, ts.Diagnostics.A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type);
@@ -23512,19 +24790,19 @@ var ts;
                             }
                         }
                         break;
-                    case 148 /* MethodDeclaration */:
-                    case 147 /* MethodSignature */:
-                    case 149 /* Constructor */:
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
-                    case 221 /* FunctionDeclaration */:
-                    case 181 /* ArrowFunction */:
+                    case 149 /* MethodDeclaration */:
+                    case 148 /* MethodSignature */:
+                    case 150 /* Constructor */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* SetAccessor */:
+                    case 225 /* FunctionDeclaration */:
+                    case 185 /* ArrowFunction */:
                         if (meaning & 3 /* Variable */ && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
                         }
                         break;
-                    case 180 /* FunctionExpression */:
+                    case 184 /* FunctionExpression */:
                         if (meaning & 3 /* Variable */ && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
@@ -23537,7 +24815,7 @@ var ts;
                             }
                         }
                         break;
-                    case 144 /* Decorator */:
+                    case 145 /* Decorator */:
                         // Decorators are resolved at the class declaration. Resolving at the parameter
                         // or member would result in looking up locals in the method.
                         //
@@ -23546,7 +24824,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 === 143 /* Parameter */) {
+                        if (location.parent && location.parent.kind === 144 /* Parameter */) {
                             location = location.parent;
                         }
                         //
@@ -23609,7 +24887,7 @@ var ts;
                 // If we're in an external module, we can't reference value symbols created from UMD export declarations
                 if (result && isInExternalModule && (meaning & 107455 /* Value */) === 107455 /* Value */) {
                     var decls = result.declarations;
-                    if (decls && decls.length === 1 && decls[0].kind === 229 /* NamespaceExportDeclaration */) {
+                    if (decls && decls.length === 1 && decls[0].kind === 233 /* NamespaceExportDeclaration */) {
                         error(errorLocation, ts.Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead, name);
                     }
                 }
@@ -23663,9 +24941,9 @@ var ts;
         function getEntityNameForExtendingInterface(node) {
             switch (node.kind) {
                 case 70 /* Identifier */:
-                case 173 /* PropertyAccessExpression */:
+                case 177 /* PropertyAccessExpression */:
                     return node.parent ? getEntityNameForExtendingInterface(node.parent) : undefined;
-                case 195 /* ExpressionWithTypeArguments */:
+                case 199 /* ExpressionWithTypeArguments */:
                     ts.Debug.assert(ts.isEntityNameExpression(node.expression));
                     return node.expression;
                 default:
@@ -23687,7 +24965,7 @@ var ts;
             // Block-scoped variables cannot be used before their definition
             var declaration = ts.forEach(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) ? d : undefined; });
             ts.Debug.assert(declaration !== undefined, "Block-scoped variable declaration is undefined");
-            if (!ts.isInAmbientContext(declaration) && !isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 219 /* VariableDeclaration */), errorLocation)) {
+            if (!ts.isInAmbientContext(declaration) && !isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 223 /* VariableDeclaration */), errorLocation)) {
                 error(errorLocation, ts.Diagnostics.Block_scoped_variable_0_used_before_its_declaration, ts.declarationNameToString(declaration.name));
             }
         }
@@ -23708,10 +24986,10 @@ var ts;
         }
         function getAnyImportSyntax(node) {
             if (ts.isAliasSymbolDeclaration(node)) {
-                if (node.kind === 230 /* ImportEqualsDeclaration */) {
+                if (node.kind === 234 /* ImportEqualsDeclaration */) {
                     return node;
                 }
-                while (node && node.kind !== 231 /* ImportDeclaration */) {
+                while (node && node.kind !== 235 /* ImportDeclaration */) {
                     node = node.parent;
                 }
                 return node;
@@ -23721,7 +24999,7 @@ var ts;
             return ts.forEach(symbol.declarations, function (d) { return ts.isAliasSymbolDeclaration(d) ? d : undefined; });
         }
         function getTargetOfImportEqualsDeclaration(node) {
-            if (node.moduleReference.kind === 241 /* ExternalModuleReference */) {
+            if (node.moduleReference.kind === 245 /* ExternalModuleReference */) {
                 return resolveExternalModuleSymbol(resolveExternalModuleName(node, ts.getExternalModuleImportEqualsDeclarationExpression(node)));
             }
             return getSymbolOfPartOfRightHandSideOfImportEquals(node.moduleReference);
@@ -23800,31 +25078,31 @@ var ts;
             var moduleSymbol = resolveExternalModuleName(node, node.moduleSpecifier);
             var targetSymbol = resolveESModuleSymbol(moduleSymbol, node.moduleSpecifier);
             if (targetSymbol) {
-                var name_13 = specifier.propertyName || specifier.name;
-                if (name_13.text) {
+                var name_17 = specifier.propertyName || specifier.name;
+                if (name_17.text) {
                     if (ts.isShorthandAmbientModuleSymbol(moduleSymbol)) {
                         return moduleSymbol;
                     }
                     var symbolFromVariable = void 0;
                     // First check if module was specified with "export=". If so, get the member from the resolved type
                     if (moduleSymbol && moduleSymbol.exports && moduleSymbol.exports["export="]) {
-                        symbolFromVariable = getPropertyOfType(getTypeOfSymbol(targetSymbol), name_13.text);
+                        symbolFromVariable = getPropertyOfType(getTypeOfSymbol(targetSymbol), name_17.text);
                     }
                     else {
-                        symbolFromVariable = getPropertyOfVariable(targetSymbol, name_13.text);
+                        symbolFromVariable = getPropertyOfVariable(targetSymbol, name_17.text);
                     }
                     // if symbolFromVariable is export - get its final target
                     symbolFromVariable = resolveSymbol(symbolFromVariable);
-                    var symbolFromModule = getExportOfModule(targetSymbol, name_13.text);
+                    var symbolFromModule = getExportOfModule(targetSymbol, name_17.text);
                     // If the export member we're looking for is default, and there is no real default but allowSyntheticDefaultImports is on, return the entire module as the default
-                    if (!symbolFromModule && allowSyntheticDefaultImports && name_13.text === "default") {
+                    if (!symbolFromModule && allowSyntheticDefaultImports && name_17.text === "default") {
                         symbolFromModule = resolveExternalModuleSymbol(moduleSymbol) || resolveSymbol(moduleSymbol);
                     }
                     var symbol = symbolFromModule && symbolFromVariable ?
                         combineValueAndTypeSymbols(symbolFromVariable, symbolFromModule) :
                         symbolFromModule || symbolFromVariable;
                     if (!symbol) {
-                        error(name_13, ts.Diagnostics.Module_0_has_no_exported_member_1, getFullyQualifiedName(moduleSymbol), ts.declarationNameToString(name_13));
+                        error(name_17, ts.Diagnostics.Module_0_has_no_exported_member_1, getFullyQualifiedName(moduleSymbol), ts.declarationNameToString(name_17));
                     }
                     return symbol;
                 }
@@ -23846,19 +25124,19 @@ var ts;
         }
         function getTargetOfAliasDeclaration(node) {
             switch (node.kind) {
-                case 230 /* ImportEqualsDeclaration */:
+                case 234 /* ImportEqualsDeclaration */:
                     return getTargetOfImportEqualsDeclaration(node);
-                case 232 /* ImportClause */:
+                case 236 /* ImportClause */:
                     return getTargetOfImportClause(node);
-                case 233 /* NamespaceImport */:
+                case 237 /* NamespaceImport */:
                     return getTargetOfNamespaceImport(node);
-                case 235 /* ImportSpecifier */:
+                case 239 /* ImportSpecifier */:
                     return getTargetOfImportSpecifier(node);
-                case 239 /* ExportSpecifier */:
+                case 243 /* ExportSpecifier */:
                     return getTargetOfExportSpecifier(node);
-                case 236 /* ExportAssignment */:
+                case 240 /* ExportAssignment */:
                     return getTargetOfExportAssignment(node);
-                case 229 /* NamespaceExportDeclaration */:
+                case 233 /* NamespaceExportDeclaration */:
                     return getTargetOfNamespaceExportDeclaration(node);
             }
         }
@@ -23905,11 +25183,11 @@ var ts;
                 links.referenced = true;
                 var node = getDeclarationOfAliasSymbol(symbol);
                 ts.Debug.assert(!!node);
-                if (node.kind === 236 /* ExportAssignment */) {
+                if (node.kind === 240 /* ExportAssignment */) {
                     // export default <symbol>
                     checkExpressionCached(node.expression);
                 }
-                else if (node.kind === 239 /* ExportSpecifier */) {
+                else if (node.kind === 243 /* ExportSpecifier */) {
                     // export { <symbol> } or export { <symbol> as foo }
                     checkExpressionCached(node.propertyName || node.name);
                 }
@@ -23931,13 +25209,13 @@ var ts;
                 entityName = entityName.parent;
             }
             // Check for case 1 and 3 in the above example
-            if (entityName.kind === 70 /* Identifier */ || entityName.parent.kind === 140 /* QualifiedName */) {
+            if (entityName.kind === 70 /* Identifier */ || entityName.parent.kind === 141 /* 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 === 230 /* ImportEqualsDeclaration */);
+                ts.Debug.assert(entityName.parent.kind === 234 /* ImportEqualsDeclaration */);
                 return resolveEntityName(entityName, 107455 /* Value */ | 793064 /* Type */ | 1920 /* Namespace */, /*ignoreErrors*/ false, dontResolveAlias);
             }
         }
@@ -23957,9 +25235,9 @@ var ts;
                     return undefined;
                 }
             }
-            else if (name.kind === 140 /* QualifiedName */ || name.kind === 173 /* PropertyAccessExpression */) {
-                var left = name.kind === 140 /* QualifiedName */ ? name.left : name.expression;
-                var right = name.kind === 140 /* QualifiedName */ ? name.right : name.name;
+            else if (name.kind === 141 /* QualifiedName */ || name.kind === 177 /* PropertyAccessExpression */) {
+                var left = name.kind === 141 /* QualifiedName */ ? name.left : name.expression;
+                var right = name.kind === 141 /* QualifiedName */ ? name.right : name.name;
                 var namespace = resolveEntityName(left, 1920 /* Namespace */, ignoreErrors, /*dontResolveAlias*/ false, location);
                 if (!namespace || ts.nodeIsMissing(right)) {
                     return undefined;
@@ -23984,30 +25262,30 @@ var ts;
         function resolveExternalModuleName(location, moduleReferenceExpression) {
             return resolveExternalModuleNameWorker(location, moduleReferenceExpression, ts.Diagnostics.Cannot_find_module_0);
         }
-        function resolveExternalModuleNameWorker(location, moduleReferenceExpression, moduleNotFoundError) {
+        function resolveExternalModuleNameWorker(location, moduleReferenceExpression, moduleNotFoundError, isForAugmentation) {
+            if (isForAugmentation === void 0) { isForAugmentation = false; }
             if (moduleReferenceExpression.kind !== 9 /* StringLiteral */) {
                 return;
             }
             var moduleReferenceLiteral = moduleReferenceExpression;
-            return resolveExternalModule(location, moduleReferenceLiteral.text, moduleNotFoundError, moduleReferenceLiteral);
+            return resolveExternalModule(location, moduleReferenceLiteral.text, moduleNotFoundError, moduleReferenceLiteral, isForAugmentation);
         }
-        function resolveExternalModule(location, moduleReference, moduleNotFoundError, errorNode) {
+        function resolveExternalModule(location, moduleReference, moduleNotFoundError, errorNode, isForAugmentation) {
+            if (isForAugmentation === void 0) { isForAugmentation = false; }
             // Module names are escaped in our symbol table.  However, string literal values aren't.
             // Escape the name in the "require(...)" clause to ensure we find the right symbol.
             var moduleName = ts.escapeIdentifier(moduleReference);
             if (moduleName === undefined) {
                 return;
             }
-            var isRelative = ts.isExternalModuleNameRelative(moduleName);
-            if (!isRelative) {
-                var symbol = getSymbol(globals, '"' + moduleName + '"', 512 /* ValueModule */);
-                if (symbol) {
-                    // merged symbol is module declaration symbol combined with all augmentations
-                    return getMergedSymbol(symbol);
-                }
+            var ambientModule = tryFindAmbientModule(moduleName, /*withAugmentations*/ true);
+            if (ambientModule) {
+                return ambientModule;
             }
+            var isRelative = ts.isExternalModuleNameRelative(moduleName);
             var resolvedModule = ts.getResolvedModule(ts.getSourceFileOfNode(location), moduleReference);
-            var sourceFile = resolvedModule && host.getSourceFile(resolvedModule.resolvedFileName);
+            var resolutionDiagnostic = resolvedModule && ts.getResolutionDiagnostic(compilerOptions, resolvedModule);
+            var sourceFile = resolvedModule && !resolutionDiagnostic && host.getSourceFile(resolvedModule.resolvedFileName);
             if (sourceFile) {
                 if (sourceFile.symbol) {
                     // merged symbol is module declaration symbol combined with all augmentations
@@ -24025,15 +25303,33 @@ var ts;
                     return getMergedSymbol(pattern.symbol);
                 }
             }
+            // May be an untyped module. If so, ignore resolutionDiagnostic.
+            if (!isRelative && resolvedModule && !ts.extensionIsTypeScript(resolvedModule.extension)) {
+                if (isForAugmentation) {
+                    ts.Debug.assert(!!moduleNotFoundError);
+                    var diag = ts.Diagnostics.Invalid_module_name_in_augmentation_Module_0_resolves_to_an_untyped_module_at_1_which_cannot_be_augmented;
+                    error(errorNode, diag, moduleName, resolvedModule.resolvedFileName);
+                }
+                else if (compilerOptions.noImplicitAny && moduleNotFoundError) {
+                    error(errorNode, ts.Diagnostics.Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type, moduleReference, resolvedModule.resolvedFileName);
+                }
+                // Failed imports and untyped modules are both treated in an untyped manner; only difference is whether we give a diagnostic first.
+                return undefined;
+            }
             if (moduleNotFoundError) {
                 // report errors only if it was requested
-                var tsExtension = ts.tryExtractTypeScriptExtension(moduleName);
-                if (tsExtension) {
-                    var diag = ts.Diagnostics.An_import_path_cannot_end_with_a_0_extension_Consider_importing_1_instead;
-                    error(errorNode, diag, tsExtension, ts.removeExtension(moduleName, tsExtension));
+                if (resolutionDiagnostic) {
+                    error(errorNode, resolutionDiagnostic, moduleName, resolvedModule.resolvedFileName);
                 }
                 else {
-                    error(errorNode, moduleNotFoundError, moduleName);
+                    var tsExtension = ts.tryExtractTypeScriptExtension(moduleName);
+                    if (tsExtension) {
+                        var diag = ts.Diagnostics.An_import_path_cannot_end_with_a_0_extension_Consider_importing_1_instead;
+                        error(errorNode, diag, tsExtension, ts.removeExtension(moduleName, tsExtension));
+                    }
+                    else {
+                        error(errorNode, moduleNotFoundError, moduleName);
+                    }
                 }
             }
             return undefined;
@@ -24166,7 +25462,7 @@ var ts;
             var members = node.members;
             for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
                 var member = members_1[_i];
-                if (member.kind === 149 /* Constructor */ && ts.nodeIsPresent(member.body)) {
+                if (member.kind === 150 /* Constructor */ && ts.nodeIsPresent(member.body)) {
                     return member;
                 }
             }
@@ -24188,8 +25484,9 @@ var ts;
             type.intrinsicName = "boolean";
             return type;
         }
-        function createObjectType(kind, symbol) {
-            var type = createType(kind);
+        function createObjectType(objectFlags, symbol) {
+            var type = createType(32768 /* Object */);
+            type.objectFlags = objectFlags;
             type.symbol = symbol;
             return type;
         }
@@ -24217,7 +25514,7 @@ var ts;
             }
             return result || emptyArray;
         }
-        function setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
+        function setStructuredTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
             type.members = members;
             type.properties = getNamedMembers(members);
             type.callSignatures = callSignatures;
@@ -24229,7 +25526,7 @@ var ts;
             return type;
         }
         function createAnonymousType(symbol, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
-            return setObjectTypeMembers(createObjectType(2097152 /* Anonymous */, symbol), members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+            return setStructuredTypeMembers(createObjectType(16 /* Anonymous */, symbol), members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function forEachSymbolTableInScope(enclosingDeclaration, callback) {
             var result;
@@ -24241,11 +25538,11 @@ var ts;
                     }
                 }
                 switch (location_1.kind) {
-                    case 256 /* SourceFile */:
+                    case 261 /* SourceFile */:
                         if (!ts.isExternalOrCommonJsModule(location_1)) {
                             break;
                         }
-                    case 226 /* ModuleDeclaration */:
+                    case 230 /* ModuleDeclaration */:
                         if (result = callback(getSymbolOfNode(location_1).exports)) {
                             return result;
                         }
@@ -24286,7 +25583,7 @@ var ts;
                 return ts.forEachProperty(symbols, function (symbolFromSymbolTable) {
                     if (symbolFromSymbolTable.flags & 8388608 /* Alias */
                         && symbolFromSymbolTable.name !== "export="
-                        && !ts.getDeclarationOfKind(symbolFromSymbolTable, 239 /* ExportSpecifier */)) {
+                        && !ts.getDeclarationOfKind(symbolFromSymbolTable, 243 /* ExportSpecifier */)) {
                         if (!useOnlyExternalAliasing ||
                             // Is this external alias, then use it to name
                             ts.forEach(symbolFromSymbolTable.declarations, ts.isExternalModuleImportEqualsDeclaration)) {
@@ -24325,7 +25622,7 @@ var ts;
                     return true;
                 }
                 // Qualify if the symbol from symbol table has same meaning as expected
-                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 8388608 /* Alias */ && !ts.getDeclarationOfKind(symbolFromSymbolTable, 239 /* ExportSpecifier */)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
+                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 8388608 /* Alias */ && !ts.getDeclarationOfKind(symbolFromSymbolTable, 243 /* ExportSpecifier */)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
                 if (symbolFromSymbolTable.flags & meaning) {
                     qualify = true;
                     return true;
@@ -24340,10 +25637,10 @@ var ts;
                 for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
                     switch (declaration.kind) {
-                        case 146 /* PropertyDeclaration */:
-                        case 148 /* MethodDeclaration */:
-                        case 150 /* GetAccessor */:
-                        case 151 /* SetAccessor */:
+                        case 147 /* PropertyDeclaration */:
+                        case 149 /* MethodDeclaration */:
+                        case 151 /* GetAccessor */:
+                        case 152 /* SetAccessor */:
                             continue;
                         default:
                             return false;
@@ -24424,7 +25721,7 @@ var ts;
             }
         }
         function hasExternalModuleSymbol(declaration) {
-            return ts.isAmbientModule(declaration) || (declaration.kind === 256 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
+            return ts.isAmbientModule(declaration) || (declaration.kind === 261 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
         }
         function hasVisibleDeclarations(symbol, shouldComputeAliasToMakeVisible) {
             var aliasesToMakeVisible;
@@ -24465,12 +25762,12 @@ var ts;
         function isEntityNameVisible(entityName, enclosingDeclaration) {
             // get symbol of the first identifier of the entityName
             var meaning;
-            if (entityName.parent.kind === 159 /* TypeQuery */ || ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
+            if (entityName.parent.kind === 160 /* TypeQuery */ || ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
                 // Typeof value
                 meaning = 107455 /* Value */ | 1048576 /* ExportValue */;
             }
-            else if (entityName.kind === 140 /* QualifiedName */ || entityName.kind === 173 /* PropertyAccessExpression */ ||
-                entityName.parent.kind === 230 /* ImportEqualsDeclaration */) {
+            else if (entityName.kind === 141 /* QualifiedName */ || entityName.kind === 177 /* PropertyAccessExpression */ ||
+                entityName.parent.kind === 234 /* ImportEqualsDeclaration */) {
                 // Left identifier from type reference or TypeAlias
                 // Entity name of the import declaration
                 meaning = 1920 /* Namespace */;
@@ -24566,10 +25863,10 @@ var ts;
         function getTypeAliasForTypeLiteral(type) {
             if (type.symbol && type.symbol.flags & 2048 /* TypeLiteral */) {
                 var node = type.symbol.declarations[0].parent;
-                while (node.kind === 165 /* ParenthesizedType */) {
+                while (node.kind === 166 /* ParenthesizedType */) {
                     node = node.parent;
                 }
-                if (node.kind === 224 /* TypeAliasDeclaration */) {
+                if (node.kind === 228 /* TypeAliasDeclaration */) {
                     return getSymbolOfNode(node);
                 }
             }
@@ -24577,7 +25874,7 @@ var ts;
         }
         function isTopLevelInExternalModuleAugmentation(node) {
             return node && node.parent &&
-                node.parent.kind === 227 /* ModuleBlock */ &&
+                node.parent.kind === 231 /* ModuleBlock */ &&
                 ts.isExternalModuleAugmentation(node.parent.parent);
         }
         function literalTypeToString(type) {
@@ -24591,10 +25888,10 @@ var ts;
                         return ts.declarationNameToString(declaration.name);
                     }
                     switch (declaration.kind) {
-                        case 193 /* ClassExpression */:
+                        case 197 /* ClassExpression */:
                             return "(Anonymous class)";
-                        case 180 /* FunctionExpression */:
-                        case 181 /* ArrowFunction */:
+                        case 184 /* FunctionExpression */:
+                        case 185 /* ArrowFunction */:
                             return "(Anonymous function)";
                     }
                 }
@@ -24669,9 +25966,9 @@ var ts;
                     if (!accessibleSymbolChain ||
                         needsQualification(accessibleSymbolChain[0], enclosingDeclaration, accessibleSymbolChain.length === 1 ? meaning : getQualifiedLeftMeaning(meaning))) {
                         // Go up and add our parent.
-                        var parent_8 = getParentOfSymbol(accessibleSymbolChain ? accessibleSymbolChain[0] : symbol);
-                        if (parent_8) {
-                            walkSymbol(parent_8, getQualifiedLeftMeaning(meaning), /*endOfChain*/ false);
+                        var parent_6 = getParentOfSymbol(accessibleSymbolChain ? accessibleSymbolChain[0] : symbol);
+                        if (parent_6) {
+                            walkSymbol(parent_6, getQualifiedLeftMeaning(meaning), /*endOfChain*/ false);
                         }
                     }
                     if (accessibleSymbolChain) {
@@ -24721,7 +26018,7 @@ var ts;
                         }
                         writer.writeKeyword("this");
                     }
-                    else if (type.flags & 131072 /* Reference */) {
+                    else if (getObjectFlags(type) & 4 /* Reference */) {
                         writeTypeReference(type, nextFlags);
                     }
                     else if (type.flags & 256 /* EnumLiteral */) {
@@ -24729,30 +26026,35 @@ var ts;
                         writePunctuation(writer, 22 /* DotToken */);
                         appendSymbolNameOnly(type.symbol, writer);
                     }
-                    else if (type.flags & (32768 /* Class */ | 65536 /* Interface */ | 16 /* Enum */ | 16384 /* TypeParameter */)) {
+                    else if (getObjectFlags(type) & 3 /* ClassOrInterface */ || type.flags & (16 /* Enum */ | 16384 /* TypeParameter */)) {
                         // The specified symbol flags need to be reinterpreted as type flags
                         buildSymbolDisplay(type.symbol, writer, enclosingDeclaration, 793064 /* Type */, 0 /* None */, nextFlags);
                     }
-                    else if (!(flags & 512 /* InTypeAlias */) && ((type.flags & 2097152 /* Anonymous */ && !type.target) || type.flags & 1572864 /* UnionOrIntersection */) && type.aliasSymbol &&
+                    else if (!(flags & 512 /* InTypeAlias */) && type.aliasSymbol &&
                         isSymbolAccessible(type.aliasSymbol, enclosingDeclaration, 793064 /* Type */, /*shouldComputeAliasesToMakeVisible*/ false).accessibility === 0 /* Accessible */) {
-                        // We emit inferred type as type-alias at the current localtion if all the following is true
-                        //      the input type is has alias symbol that is accessible
-                        //      the input type is a union, intersection or anonymous type that is fully instantiated (if not we want to keep dive into)
-                        //          e.g.: export type Bar<X, Y> = () => [X, Y];
-                        //                export type Foo<Y> = Bar<any, Y>;
-                        //                export const y = (x: Foo<string>) => 1  // we want to emit as ...x: () => [any, string])
                         var typeArguments = type.aliasTypeArguments;
                         writeSymbolTypeReference(type.aliasSymbol, typeArguments, 0, typeArguments ? typeArguments.length : 0, nextFlags);
                     }
-                    else if (type.flags & 1572864 /* UnionOrIntersection */) {
+                    else if (type.flags & 196608 /* UnionOrIntersection */) {
                         writeUnionOrIntersectionType(type, nextFlags);
                     }
-                    else if (type.flags & 2097152 /* Anonymous */) {
+                    else if (getObjectFlags(type) & (16 /* Anonymous */ | 32 /* Mapped */)) {
                         writeAnonymousType(type, nextFlags);
                     }
                     else if (type.flags & 96 /* StringOrNumberLiteral */) {
                         writer.writeStringLiteral(literalTypeToString(type));
                     }
+                    else if (type.flags & 262144 /* Index */) {
+                        writer.writeKeyword("keyof");
+                        writeSpace(writer);
+                        writeType(type.type, 64 /* InElementType */);
+                    }
+                    else if (type.flags & 524288 /* IndexedAccess */) {
+                        writeType(type.objectType, 64 /* InElementType */);
+                        writePunctuation(writer, 20 /* OpenBracketToken */);
+                        writeType(type.indexType, 0 /* None */);
+                        writePunctuation(writer, 21 /* CloseBracketToken */);
+                    }
                     else {
                         // Should never get here
                         // { ... }
@@ -24800,7 +26102,7 @@ var ts;
                         writePunctuation(writer, 20 /* OpenBracketToken */);
                         writePunctuation(writer, 21 /* CloseBracketToken */);
                     }
-                    else if (type.target.flags & 262144 /* Tuple */) {
+                    else if (type.target.objectFlags & 8 /* Tuple */) {
                         writePunctuation(writer, 20 /* OpenBracketToken */);
                         writeTypeList(type.typeArguments.slice(0, getTypeReferenceArity(type)), 25 /* CommaToken */);
                         writePunctuation(writer, 21 /* CloseBracketToken */);
@@ -24816,14 +26118,14 @@ var ts;
                             while (i < length_1) {
                                 // Find group of type arguments for type parameters with the same declaring container.
                                 var start = i;
-                                var parent_9 = getParentSymbolOfTypeParameter(outerTypeParameters[i]);
+                                var parent_7 = getParentSymbolOfTypeParameter(outerTypeParameters[i]);
                                 do {
                                     i++;
-                                } while (i < length_1 && getParentSymbolOfTypeParameter(outerTypeParameters[i]) === parent_9);
+                                } while (i < length_1 && getParentSymbolOfTypeParameter(outerTypeParameters[i]) === parent_7);
                                 // When type parameters are their own type arguments for the whole group (i.e. we have
                                 // the default outer type arguments), we don't show the group.
                                 if (!ts.rangeEquals(outerTypeParameters, typeArguments, start, i)) {
-                                    writeSymbolTypeReference(parent_9, typeArguments, start, i, flags);
+                                    writeSymbolTypeReference(parent_7, typeArguments, start, i, flags);
                                     writePunctuation(writer, 22 /* DotToken */);
                                 }
                             }
@@ -24836,7 +26138,7 @@ var ts;
                     if (flags & 64 /* InElementType */) {
                         writePunctuation(writer, 18 /* OpenParenToken */);
                     }
-                    if (type.flags & 524288 /* Union */) {
+                    if (type.flags & 65536 /* Union */) {
                         writeTypeList(formatUnionTypes(type.types), 48 /* BarToken */);
                     }
                     else {
@@ -24889,7 +26191,7 @@ var ts;
                         var isNonLocalFunctionSymbol = !!(symbol.flags & 16 /* Function */) &&
                             (symbol.parent ||
                                 ts.forEach(symbol.declarations, function (declaration) {
-                                    return declaration.parent.kind === 256 /* SourceFile */ || declaration.parent.kind === 227 /* ModuleBlock */;
+                                    return declaration.parent.kind === 261 /* SourceFile */ || declaration.parent.kind === 231 /* ModuleBlock */;
                                 }));
                         if (isStaticMethodSymbol || isNonLocalFunctionSymbol) {
                             // typeof is allowed only for static/non local functions
@@ -24906,7 +26208,7 @@ var ts;
                 function writeIndexSignature(info, keyword) {
                     if (info) {
                         if (info.isReadonly) {
-                            writeKeyword(writer, 129 /* ReadonlyKeyword */);
+                            writeKeyword(writer, 130 /* ReadonlyKeyword */);
                             writeSpace(writer);
                         }
                         writePunctuation(writer, 20 /* OpenBracketToken */);
@@ -24924,7 +26226,7 @@ var ts;
                 }
                 function writePropertyWithModifiers(prop) {
                     if (isReadonlySymbol(prop)) {
-                        writeKeyword(writer, 129 /* ReadonlyKeyword */);
+                        writeKeyword(writer, 130 /* ReadonlyKeyword */);
                         writeSpace(writer);
                     }
                     buildSymbolDisplay(prop, writer);
@@ -24945,6 +26247,12 @@ var ts;
                     return false;
                 }
                 function writeLiteralType(type, flags) {
+                    if (type.objectFlags & 32 /* Mapped */) {
+                        if (getConstraintTypeFromMappedType(type).flags & (16384 /* TypeParameter */ | 262144 /* Index */)) {
+                            writeMappedType(type);
+                            return;
+                        }
+                    }
                     var resolved = resolveStructuredTypeMembers(type);
                     if (!resolved.properties.length && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
                         if (!resolved.callSignatures.length && !resolved.constructSignatures.length) {
@@ -24981,6 +26289,12 @@ var ts;
                     writePunctuation(writer, 16 /* OpenBraceToken */);
                     writer.writeLine();
                     writer.increaseIndent();
+                    writeObjectLiteralType(resolved);
+                    writer.decreaseIndent();
+                    writePunctuation(writer, 17 /* CloseBraceToken */);
+                    inObjectTypeLiteral = saveInObjectTypeLiteral;
+                }
+                function writeObjectLiteralType(resolved) {
                     for (var _i = 0, _a = resolved.callSignatures; _i < _a.length; _i++) {
                         var signature = _a[_i];
                         buildSignatureDisplay(signature, writer, enclosingDeclaration, globalFlagsToPass, /*kind*/ undefined, symbolStack);
@@ -24993,8 +26307,8 @@ var ts;
                         writePunctuation(writer, 24 /* SemicolonToken */);
                         writer.writeLine();
                     }
-                    writeIndexSignature(resolved.stringIndexInfo, 133 /* StringKeyword */);
-                    writeIndexSignature(resolved.numberIndexInfo, 131 /* NumberKeyword */);
+                    writeIndexSignature(resolved.stringIndexInfo, 134 /* StringKeyword */);
+                    writeIndexSignature(resolved.numberIndexInfo, 132 /* NumberKeyword */);
                     for (var _d = 0, _e = resolved.properties; _d < _e.length; _d++) {
                         var p = _e[_d];
                         var t = getTypeOfSymbol(p);
@@ -25017,9 +26331,32 @@ var ts;
                             writer.writeLine();
                         }
                     }
+                }
+                function writeMappedType(type) {
+                    writePunctuation(writer, 16 /* OpenBraceToken */);
+                    writer.writeLine();
+                    writer.increaseIndent();
+                    if (type.declaration.readonlyToken) {
+                        writeKeyword(writer, 130 /* ReadonlyKeyword */);
+                        writeSpace(writer);
+                    }
+                    writePunctuation(writer, 20 /* OpenBracketToken */);
+                    appendSymbolNameOnly(getTypeParameterFromMappedType(type).symbol, writer);
+                    writeSpace(writer);
+                    writeKeyword(writer, 91 /* InKeyword */);
+                    writeSpace(writer);
+                    writeType(getConstraintTypeFromMappedType(type), 0 /* None */);
+                    writePunctuation(writer, 21 /* CloseBracketToken */);
+                    if (type.declaration.questionToken) {
+                        writePunctuation(writer, 54 /* QuestionToken */);
+                    }
+                    writePunctuation(writer, 55 /* ColonToken */);
+                    writeSpace(writer);
+                    writeType(getTemplateTypeFromMappedType(type), 0 /* None */);
+                    writePunctuation(writer, 24 /* SemicolonToken */);
+                    writer.writeLine();
                     writer.decreaseIndent();
                     writePunctuation(writer, 17 /* CloseBraceToken */);
-                    inObjectTypeLiteral = saveInObjectTypeLiteral;
                 }
             }
             function buildTypeParameterDisplayFromSymbol(symbol, writer, enclosingDeclaration, flags) {
@@ -25058,12 +26395,12 @@ var ts;
             }
             function buildBindingPatternDisplay(bindingPattern, writer, enclosingDeclaration, flags, symbolStack) {
                 // We have to explicitly emit square bracket and bracket because these tokens are not stored inside the node.
-                if (bindingPattern.kind === 168 /* ObjectBindingPattern */) {
+                if (bindingPattern.kind === 172 /* ObjectBindingPattern */) {
                     writePunctuation(writer, 16 /* OpenBraceToken */);
                     buildDisplayForCommaSeparatedList(bindingPattern.elements, writer, function (e) { return buildBindingElementDisplay(e, writer, enclosingDeclaration, flags, symbolStack); });
                     writePunctuation(writer, 17 /* CloseBraceToken */);
                 }
-                else if (bindingPattern.kind === 169 /* ArrayBindingPattern */) {
+                else if (bindingPattern.kind === 173 /* ArrayBindingPattern */) {
                     writePunctuation(writer, 20 /* OpenBracketToken */);
                     var elements = bindingPattern.elements;
                     buildDisplayForCommaSeparatedList(elements, writer, function (e) { return buildBindingElementDisplay(e, writer, enclosingDeclaration, flags, symbolStack); });
@@ -25077,7 +26414,7 @@ var ts;
                 if (ts.isOmittedExpression(bindingElement)) {
                     return;
                 }
-                ts.Debug.assert(bindingElement.kind === 170 /* BindingElement */);
+                ts.Debug.assert(bindingElement.kind === 174 /* BindingElement */);
                 if (bindingElement.propertyName) {
                     writer.writeSymbol(ts.getTextOfNode(bindingElement.propertyName), bindingElement.symbol);
                     writePunctuation(writer, 55 /* ColonToken */);
@@ -25207,75 +26544,75 @@ var ts;
             return false;
             function determineIfDeclarationIsVisible() {
                 switch (node.kind) {
-                    case 170 /* BindingElement */:
+                    case 174 /* BindingElement */:
                         return isDeclarationVisible(node.parent.parent);
-                    case 219 /* VariableDeclaration */:
+                    case 223 /* VariableDeclaration */:
                         if (ts.isBindingPattern(node.name) &&
                             !node.name.elements.length) {
                             // If the binding pattern is empty, this variable declaration is not visible
                             return false;
                         }
                     // Otherwise fall through
-                    case 226 /* ModuleDeclaration */:
-                    case 222 /* ClassDeclaration */:
-                    case 223 /* InterfaceDeclaration */:
-                    case 224 /* TypeAliasDeclaration */:
-                    case 221 /* FunctionDeclaration */:
-                    case 225 /* EnumDeclaration */:
-                    case 230 /* ImportEqualsDeclaration */:
+                    case 230 /* ModuleDeclaration */:
+                    case 226 /* ClassDeclaration */:
+                    case 227 /* InterfaceDeclaration */:
+                    case 228 /* TypeAliasDeclaration */:
+                    case 225 /* FunctionDeclaration */:
+                    case 229 /* EnumDeclaration */:
+                    case 234 /* ImportEqualsDeclaration */:
                         // external module augmentation is always visible
                         if (ts.isExternalModuleAugmentation(node)) {
                             return true;
                         }
-                        var parent_10 = getDeclarationContainer(node);
+                        var parent_8 = 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 !== 230 /* ImportEqualsDeclaration */ && parent_10.kind !== 256 /* SourceFile */ && ts.isInAmbientContext(parent_10))) {
-                            return isGlobalSourceFile(parent_10);
+                            !(node.kind !== 234 /* ImportEqualsDeclaration */ && parent_8.kind !== 261 /* SourceFile */ && ts.isInAmbientContext(parent_8))) {
+                            return isGlobalSourceFile(parent_8);
                         }
                         // Exported members/ambient module elements (exception import declaration) are visible if parent is visible
-                        return isDeclarationVisible(parent_10);
-                    case 146 /* PropertyDeclaration */:
-                    case 145 /* PropertySignature */:
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
-                    case 148 /* MethodDeclaration */:
-                    case 147 /* MethodSignature */:
+                        return isDeclarationVisible(parent_8);
+                    case 147 /* PropertyDeclaration */:
+                    case 146 /* PropertySignature */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* SetAccessor */:
+                    case 149 /* MethodDeclaration */:
+                    case 148 /* MethodSignature */:
                         if (ts.getModifierFlags(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 const it fall into next case statement
-                    case 149 /* Constructor */:
-                    case 153 /* ConstructSignature */:
-                    case 152 /* CallSignature */:
-                    case 154 /* IndexSignature */:
-                    case 143 /* Parameter */:
-                    case 227 /* ModuleBlock */:
-                    case 157 /* FunctionType */:
-                    case 158 /* ConstructorType */:
-                    case 160 /* TypeLiteral */:
-                    case 156 /* TypeReference */:
-                    case 161 /* ArrayType */:
-                    case 162 /* TupleType */:
-                    case 163 /* UnionType */:
-                    case 164 /* IntersectionType */:
-                    case 165 /* ParenthesizedType */:
+                    case 150 /* Constructor */:
+                    case 154 /* ConstructSignature */:
+                    case 153 /* CallSignature */:
+                    case 155 /* IndexSignature */:
+                    case 144 /* Parameter */:
+                    case 231 /* ModuleBlock */:
+                    case 158 /* FunctionType */:
+                    case 159 /* ConstructorType */:
+                    case 161 /* TypeLiteral */:
+                    case 157 /* TypeReference */:
+                    case 162 /* ArrayType */:
+                    case 163 /* TupleType */:
+                    case 164 /* UnionType */:
+                    case 165 /* IntersectionType */:
+                    case 166 /* 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 232 /* ImportClause */:
-                    case 233 /* NamespaceImport */:
-                    case 235 /* ImportSpecifier */:
+                    case 236 /* ImportClause */:
+                    case 237 /* NamespaceImport */:
+                    case 239 /* ImportSpecifier */:
                         return false;
                     // Type parameters are always visible
-                    case 142 /* TypeParameter */:
+                    case 143 /* TypeParameter */:
                     // Source file and namespace export are always visible
-                    case 256 /* SourceFile */:
-                    case 229 /* NamespaceExportDeclaration */:
+                    case 261 /* SourceFile */:
+                    case 233 /* NamespaceExportDeclaration */:
                         return true;
                     // Export assignments do not create name bindings outside the module
-                    case 236 /* ExportAssignment */:
+                    case 240 /* ExportAssignment */:
                         return false;
                     default:
                         return false;
@@ -25284,10 +26621,10 @@ var ts;
         }
         function collectLinkedAliases(node) {
             var exportSymbol;
-            if (node.parent && node.parent.kind === 236 /* ExportAssignment */) {
+            if (node.parent && node.parent.kind === 240 /* ExportAssignment */) {
                 exportSymbol = resolveName(node.parent, node.text, 107455 /* Value */ | 793064 /* Type */ | 1920 /* Namespace */ | 8388608 /* Alias */, ts.Diagnostics.Cannot_find_name_0, node);
             }
-            else if (node.parent.kind === 239 /* ExportSpecifier */) {
+            else if (node.parent.kind === 243 /* ExportSpecifier */) {
                 var exportSpecifier = node.parent;
                 exportSymbol = exportSpecifier.parent.parent.moduleSpecifier ?
                     getExternalModuleMember(exportSpecifier.parent.parent, exportSpecifier) :
@@ -25362,7 +26699,6 @@ var ts;
                 return getSymbolLinks(target).declaredType;
             }
             if (propertyName === 1 /* ResolvedBaseConstructorType */) {
-                ts.Debug.assert(!!(target.flags & 32768 /* Class */));
                 return target.resolvedBaseConstructorType;
             }
             if (propertyName === 3 /* ResolvedReturnType */) {
@@ -25381,12 +26717,12 @@ var ts;
             node = ts.getRootDeclaration(node);
             while (node) {
                 switch (node.kind) {
-                    case 219 /* VariableDeclaration */:
-                    case 220 /* VariableDeclarationList */:
-                    case 235 /* ImportSpecifier */:
-                    case 234 /* NamedImports */:
-                    case 233 /* NamespaceImport */:
-                    case 232 /* ImportClause */:
+                    case 223 /* VariableDeclaration */:
+                    case 224 /* VariableDeclarationList */:
+                    case 239 /* ImportSpecifier */:
+                    case 238 /* NamedImports */:
+                    case 237 /* NamespaceImport */:
+                    case 236 /* ImportClause */:
                         node = node.parent;
                         break;
                     default:
@@ -25419,22 +26755,30 @@ var ts;
             var symbol = getSymbolOfNode(node);
             return symbol && getSymbolLinks(symbol).type || getTypeForVariableLikeDeclaration(node, /*includeOptionality*/ false);
         }
-        function getTextOfPropertyName(name) {
-            switch (name.kind) {
-                case 70 /* Identifier */:
-                    return name.text;
-                case 9 /* StringLiteral */:
-                case 8 /* NumericLiteral */:
-                    return name.text;
-                case 141 /* ComputedPropertyName */:
-                    if (ts.isStringOrNumericLiteral(name.expression.kind)) {
-                        return name.expression.text;
-                    }
-            }
-            return undefined;
-        }
         function isComputedNonLiteralName(name) {
-            return name.kind === 141 /* ComputedPropertyName */ && !ts.isStringOrNumericLiteral(name.expression.kind);
+            return name.kind === 142 /* ComputedPropertyName */ && !ts.isStringOrNumericLiteral(name.expression.kind);
+        }
+        function getRestType(source, properties, symbol) {
+            ts.Debug.assert(!!(source.flags & 32768 /* Object */), "Rest types only support object types right now.");
+            var members = ts.createMap();
+            var names = ts.createMap();
+            for (var _i = 0, properties_2 = properties; _i < properties_2.length; _i++) {
+                var name_18 = properties_2[_i];
+                names[ts.getTextOfPropertyName(name_18)] = true;
+            }
+            for (var _a = 0, _b = getPropertiesOfType(source); _a < _b.length; _a++) {
+                var prop = _b[_a];
+                var inNamesToRemove = prop.name in names;
+                var isPrivate = getDeclarationModifierFlagsFromSymbol(prop) & (8 /* Private */ | 16 /* Protected */);
+                var isMethod = prop.flags & 8192 /* Method */;
+                var isSetOnlyAccessor = prop.flags & 65536 /* SetAccessor */ && !(prop.flags & 32768 /* GetAccessor */);
+                if (!inNamesToRemove && !isPrivate && !isMethod && !isSetOnlyAccessor) {
+                    members[prop.name] = prop;
+                }
+            }
+            var stringIndexInfo = getIndexInfoOfType(source, 0 /* String */);
+            var numberIndexInfo = getIndexInfoOfType(source, 1 /* Number */);
+            return createAnonymousType(symbol, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
         }
         /** Return the inferred type for a binding element */
         function getTypeForBindingElement(declaration) {
@@ -25454,25 +26798,41 @@ var ts;
                 return parentType;
             }
             var type;
-            if (pattern.kind === 168 /* ObjectBindingPattern */) {
-                // Use explicitly specified property name ({ p: xxx } form), or otherwise the implied name ({ p } form)
-                var name_14 = declaration.propertyName || declaration.name;
-                if (isComputedNonLiteralName(name_14)) {
-                    // computed properties with non-literal names are treated as 'any'
-                    return anyType;
+            if (pattern.kind === 172 /* ObjectBindingPattern */) {
+                if (declaration.dotDotDotToken) {
+                    if (!(parentType.flags & 32768 /* Object */)) {
+                        error(declaration, ts.Diagnostics.Rest_types_may_only_be_created_from_object_types);
+                        return unknownType;
+                    }
+                    var literalMembers = [];
+                    for (var _i = 0, _a = pattern.elements; _i < _a.length; _i++) {
+                        var element = _a[_i];
+                        if (element.kind !== 198 /* OmittedExpression */ && !element.dotDotDotToken) {
+                            literalMembers.push(element.propertyName || element.name);
+                        }
+                    }
+                    type = getRestType(parentType, literalMembers, declaration.symbol);
                 }
-                if (declaration.initializer) {
-                    getContextualType(declaration.initializer);
-                }
-                // Use type of the specified property, or otherwise, for a numeric name, the type of the numeric index signature,
-                // or otherwise the type of the string index signature.
-                var text = getTextOfPropertyName(name_14);
-                type = getTypeOfPropertyOfType(parentType, text) ||
-                    isNumericLiteralName(text) && getIndexTypeOfType(parentType, 1 /* Number */) ||
-                    getIndexTypeOfType(parentType, 0 /* String */);
-                if (!type) {
-                    error(name_14, ts.Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(parentType), ts.declarationNameToString(name_14));
-                    return unknownType;
+                else {
+                    // Use explicitly specified property name ({ p: xxx } form), or otherwise the implied name ({ p } form)
+                    var name_19 = declaration.propertyName || declaration.name;
+                    if (isComputedNonLiteralName(name_19)) {
+                        // computed properties with non-literal names are treated as 'any'
+                        return anyType;
+                    }
+                    if (declaration.initializer) {
+                        getContextualType(declaration.initializer);
+                    }
+                    // Use type of the specified property, or otherwise, for a numeric name, the type of the numeric index signature,
+                    // or otherwise the type of the string index signature.
+                    var text = ts.getTextOfPropertyName(name_19);
+                    type = getTypeOfPropertyOfType(parentType, text) ||
+                        isNumericLiteralName(text) && getIndexTypeOfType(parentType, 1 /* Number */) ||
+                        getIndexTypeOfType(parentType, 0 /* String */);
+                    if (!type) {
+                        error(name_19, ts.Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(parentType), ts.declarationNameToString(name_19));
+                        return unknownType;
+                    }
                 }
             }
             else {
@@ -25480,7 +26840,11 @@ var ts;
                 // 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);
-                if (!declaration.dotDotDotToken) {
+                if (declaration.dotDotDotToken) {
+                    // Rest element has an array type with the same element type as the parent type
+                    type = createArrayType(elementType);
+                }
+                else {
                     // Use specific property type when parent is a tuple or numeric index type when parent is an array
                     var propName = "" + ts.indexOf(pattern.elements, declaration);
                     type = isTupleLikeType(parentType)
@@ -25496,10 +26860,6 @@ var ts;
                         return unknownType;
                     }
                 }
-                else {
-                    // Rest element has an array type with the same element type as the parent type
-                    type = createArrayType(elementType);
-                }
             }
             // In strict null checking mode, if a default value of a non-undefined type is specified, remove
             // undefined from the final type.
@@ -25522,16 +26882,16 @@ var ts;
             if (typeTag && typeTag.typeExpression) {
                 return typeTag.typeExpression.type;
             }
-            if (declaration.kind === 219 /* VariableDeclaration */ &&
-                declaration.parent.kind === 220 /* VariableDeclarationList */ &&
-                declaration.parent.parent.kind === 201 /* VariableStatement */) {
+            if (declaration.kind === 223 /* VariableDeclaration */ &&
+                declaration.parent.kind === 224 /* VariableDeclarationList */ &&
+                declaration.parent.parent.kind === 205 /* VariableStatement */) {
                 // @type annotation might have been on the variable statement, try that instead.
                 var annotation = ts.getJSDocTypeTag(declaration.parent.parent);
                 if (annotation && annotation.typeExpression) {
                     return annotation.typeExpression.type;
                 }
             }
-            else if (declaration.kind === 143 /* Parameter */) {
+            else if (declaration.kind === 144 /* Parameter */) {
                 // If it's a parameter, see if the parent has a jsdoc comment with an @param
                 // annotation.
                 var paramTag = ts.getCorrespondingJSDocParameterTag(declaration);
@@ -25547,14 +26907,14 @@ var ts;
         }
         function isEmptyArrayLiteral(node) {
             var expr = ts.skipParentheses(node);
-            return expr.kind === 171 /* ArrayLiteralExpression */ && expr.elements.length === 0;
+            return expr.kind === 175 /* ArrayLiteralExpression */ && expr.elements.length === 0;
         }
         function addOptionality(type, optional) {
             return strictNullChecks && optional ? includeFalsyTypes(type, 2048 /* Undefined */) : type;
         }
         // Return the inferred type for a variable, parameter, or property declaration
         function getTypeForVariableLikeDeclaration(declaration, includeOptionality) {
-            if (declaration.flags & 1048576 /* JavaScriptFile */) {
+            if (declaration.flags & 2097152 /* JavaScriptFile */) {
                 // If this is a variable in a JavaScript file, then use the JSDoc type (if it has
                 // one as its type), otherwise fallback to the below standard TS codepaths to
                 // try to figure it out.
@@ -25564,10 +26924,10 @@ var ts;
                 }
             }
             // A variable declared in a for..in statement is always of type string
-            if (declaration.parent.parent.kind === 208 /* ForInStatement */) {
+            if (declaration.parent.parent.kind === 212 /* ForInStatement */) {
                 return stringType;
             }
-            if (declaration.parent.parent.kind === 209 /* ForOfStatement */) {
+            if (declaration.parent.parent.kind === 213 /* 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,
@@ -25581,7 +26941,7 @@ var ts;
             if (declaration.type) {
                 return addOptionality(getTypeFromTypeNode(declaration.type), /*optional*/ declaration.questionToken && includeOptionality);
             }
-            if (declaration.kind === 219 /* VariableDeclaration */ && !ts.isBindingPattern(declaration.name) &&
+            if (declaration.kind === 223 /* VariableDeclaration */ && !ts.isBindingPattern(declaration.name) &&
                 !(ts.getCombinedModifierFlags(declaration) & 1 /* Export */) && !ts.isInAmbientContext(declaration)) {
                 // Use control flow tracked 'any' type for non-ambient, non-exported var or let variables with no
                 // initializer or a 'null' or 'undefined' initializer.
@@ -25594,11 +26954,11 @@ var ts;
                     return autoArrayType;
                 }
             }
-            if (declaration.kind === 143 /* Parameter */) {
+            if (declaration.kind === 144 /* 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 === 151 /* SetAccessor */ && !ts.hasDynamicName(func)) {
-                    var getter = ts.getDeclarationOfKind(declaration.parent.symbol, 150 /* GetAccessor */);
+                if (func.kind === 152 /* SetAccessor */ && !ts.hasDynamicName(func)) {
+                    var getter = ts.getDeclarationOfKind(declaration.parent.symbol, 151 /* GetAccessor */);
                     if (getter) {
                         var getterSignature = getSignatureFromDeclaration(getter);
                         var thisParameter = getAccessorThisParameter(func);
@@ -25628,7 +26988,7 @@ var ts;
                 return addOptionality(type, /*optional*/ declaration.questionToken && includeOptionality);
             }
             // If it is a short-hand property assignment, use the type of the identifier
-            if (declaration.kind === 254 /* ShorthandPropertyAssignment */) {
+            if (declaration.kind === 258 /* ShorthandPropertyAssignment */) {
                 return checkIdentifier(declaration.name);
             }
             // If the declaration specifies a binding pattern, use the type implied by the binding pattern
@@ -25659,12 +27019,12 @@ var ts;
             var hasComputedProperties = false;
             ts.forEach(pattern.elements, function (e) {
                 var name = e.propertyName || e.name;
-                if (isComputedNonLiteralName(name)) {
-                    // do not include computed properties in the implied type
+                if (isComputedNonLiteralName(name) || e.dotDotDotToken) {
+                    // do not include computed properties or rests in the implied type
                     hasComputedProperties = true;
                     return;
                 }
-                var text = getTextOfPropertyName(name);
+                var text = ts.getTextOfPropertyName(name);
                 var flags = 4 /* Property */ | 67108864 /* Transient */ | (e.initializer ? 536870912 /* Optional */ : 0);
                 var symbol = createSymbol(flags, text);
                 symbol.type = getTypeFromBindingElement(e, includePatternInType, reportErrors);
@@ -25676,7 +27036,7 @@ var ts;
                 result.pattern = pattern;
             }
             if (hasComputedProperties) {
-                result.isObjectLiteralPatternWithComputedProperties = true;
+                result.objectFlags |= 512 /* ObjectLiteralPatternWithComputedProperties */;
             }
             return result;
         }
@@ -25704,7 +27064,7 @@ var ts;
         // parameter with no type annotation or initializer, the type implied by the binding pattern becomes the type of
         // the parameter.
         function getTypeFromBindingPattern(pattern, includePatternInType, reportErrors) {
-            return pattern.kind === 168 /* ObjectBindingPattern */
+            return pattern.kind === 172 /* ObjectBindingPattern */
                 ? getTypeFromObjectBindingPattern(pattern, includePatternInType, reportErrors)
                 : getTypeFromArrayBindingPattern(pattern, includePatternInType, reportErrors);
         }
@@ -25726,7 +27086,7 @@ var ts;
                 // During a normal type check we'll never get to here with a property assignment (the check of the containing
                 // object literal uses a different path). We exclude widening only so that language services and type verification
                 // tools see the actual type.
-                if (declaration.kind === 253 /* PropertyAssignment */) {
+                if (declaration.kind === 257 /* PropertyAssignment */) {
                     return type;
                 }
                 return getWidenedType(type);
@@ -25743,7 +27103,7 @@ var ts;
         }
         function declarationBelongsToPrivateAmbientMember(declaration) {
             var root = ts.getRootDeclaration(declaration);
-            var memberDeclaration = root.kind === 143 /* Parameter */ ? root.parent : root;
+            var memberDeclaration = root.kind === 144 /* Parameter */ ? root.parent : root;
             return isPrivateWithinAmbient(memberDeclaration);
         }
         function getTypeOfVariableOrParameterOrProperty(symbol) {
@@ -25755,14 +27115,14 @@ var ts;
                 }
                 // Handle catch clause variables
                 var declaration = symbol.valueDeclaration;
-                if (declaration.parent.kind === 252 /* CatchClause */) {
+                if (ts.isCatchClauseVariableDeclarationOrBindingElement(declaration)) {
                     return links.type = anyType;
                 }
                 // Handle export default expressions
-                if (declaration.kind === 236 /* ExportAssignment */) {
+                if (declaration.kind === 240 /* ExportAssignment */) {
                     return links.type = checkExpression(declaration.expression);
                 }
-                if (declaration.flags & 1048576 /* JavaScriptFile */ && declaration.kind === 280 /* JSDocPropertyTag */ && declaration.typeExpression) {
+                if (declaration.flags & 2097152 /* JavaScriptFile */ && declaration.kind === 285 /* JSDocPropertyTag */ && declaration.typeExpression) {
                     return links.type = getTypeFromTypeNode(declaration.typeExpression.type);
                 }
                 // Handle variable, parameter or property
@@ -25775,16 +27135,16 @@ var ts;
                 // * exports.p = expr
                 // * this.p = expr
                 // * className.prototype.method = expr
-                if (declaration.kind === 188 /* BinaryExpression */ ||
-                    declaration.kind === 173 /* PropertyAccessExpression */ && declaration.parent.kind === 188 /* BinaryExpression */) {
+                if (declaration.kind === 192 /* BinaryExpression */ ||
+                    declaration.kind === 177 /* PropertyAccessExpression */ && declaration.parent.kind === 192 /* BinaryExpression */) {
                     // Use JS Doc type if present on parent expression statement
-                    if (declaration.flags & 1048576 /* JavaScriptFile */) {
+                    if (declaration.flags & 2097152 /* JavaScriptFile */) {
                         var typeTag = ts.getJSDocTypeTag(declaration.parent);
                         if (typeTag && typeTag.typeExpression) {
                             return links.type = getTypeFromTypeNode(typeTag.typeExpression.type);
                         }
                     }
-                    var declaredTypes = ts.map(symbol.declarations, function (decl) { return decl.kind === 188 /* BinaryExpression */ ?
+                    var declaredTypes = ts.map(symbol.declarations, function (decl) { return decl.kind === 192 /* BinaryExpression */ ?
                         checkExpressionCached(decl.right) :
                         checkExpressionCached(decl.parent.right); });
                     type = getUnionType(declaredTypes, /*subtypeReduction*/ true);
@@ -25812,7 +27172,7 @@ var ts;
         }
         function getAnnotatedAccessorType(accessor) {
             if (accessor) {
-                if (accessor.kind === 150 /* GetAccessor */) {
+                if (accessor.kind === 151 /* GetAccessor */) {
                     return accessor.type && getTypeFromTypeNode(accessor.type);
                 }
                 else {
@@ -25832,9 +27192,9 @@ var ts;
         function getTypeOfAccessors(symbol) {
             var links = getSymbolLinks(symbol);
             if (!links.type) {
-                var getter = ts.getDeclarationOfKind(symbol, 150 /* GetAccessor */);
-                var setter = ts.getDeclarationOfKind(symbol, 151 /* SetAccessor */);
-                if (getter && getter.flags & 1048576 /* JavaScriptFile */) {
+                var getter = ts.getDeclarationOfKind(symbol, 151 /* GetAccessor */);
+                var setter = ts.getDeclarationOfKind(symbol, 152 /* SetAccessor */);
+                if (getter && getter.flags & 2097152 /* JavaScriptFile */) {
                     var jsDocType = getTypeForVariableLikeDeclarationFromJSDocComment(getter);
                     if (jsDocType) {
                         return links.type = jsDocType;
@@ -25877,7 +27237,7 @@ var ts;
                 if (!popTypeResolution()) {
                     type = anyType;
                     if (compilerOptions.noImplicitAny) {
-                        var getter_1 = ts.getDeclarationOfKind(symbol, 150 /* GetAccessor */);
+                        var getter_1 = ts.getDeclarationOfKind(symbol, 151 /* 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));
                     }
                 }
@@ -25888,11 +27248,11 @@ var ts;
         function getTypeOfFuncClassEnumModule(symbol) {
             var links = getSymbolLinks(symbol);
             if (!links.type) {
-                if (symbol.valueDeclaration.kind === 226 /* ModuleDeclaration */ && ts.isShorthandAmbientModuleSymbol(symbol)) {
+                if (symbol.flags & 1536 /* Module */ && ts.isShorthandAmbientModuleSymbol(symbol)) {
                     links.type = anyType;
                 }
                 else {
-                    var type = createObjectType(2097152 /* Anonymous */, symbol);
+                    var type = createObjectType(16 /* Anonymous */, symbol);
                     links.type = strictNullChecks && symbol.flags & 536870912 /* Optional */ ?
                         includeFalsyTypes(type, 2048 /* Undefined */) : type;
                 }
@@ -25950,7 +27310,7 @@ var ts;
             return unknownType;
         }
         function getTargetType(type) {
-            return type.flags & 131072 /* Reference */ ? type.target : type;
+            return getObjectFlags(type) & 4 /* Reference */ ? type.target : type;
         }
         function hasBaseType(type, checkBase) {
             return check(type);
@@ -25984,9 +27344,9 @@ var ts;
                 if (!node) {
                     return typeParameters;
                 }
-                if (node.kind === 222 /* ClassDeclaration */ || node.kind === 193 /* ClassExpression */ ||
-                    node.kind === 221 /* FunctionDeclaration */ || node.kind === 180 /* FunctionExpression */ ||
-                    node.kind === 148 /* MethodDeclaration */ || node.kind === 181 /* ArrowFunction */) {
+                if (node.kind === 226 /* ClassDeclaration */ || node.kind === 197 /* ClassExpression */ ||
+                    node.kind === 225 /* FunctionDeclaration */ || node.kind === 184 /* FunctionExpression */ ||
+                    node.kind === 149 /* MethodDeclaration */ || node.kind === 185 /* ArrowFunction */) {
                     var declarations = node.typeParameters;
                     if (declarations) {
                         return appendTypeParameters(appendOuterTypeParameters(typeParameters, node), declarations);
@@ -25996,7 +27356,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, 223 /* InterfaceDeclaration */);
+            var declaration = symbol.flags & 32 /* Class */ ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 227 /* InterfaceDeclaration */);
             return appendOuterTypeParameters(undefined, declaration);
         }
         // The local type parameters are the combined set of type parameters from all declarations of the class,
@@ -26005,8 +27365,8 @@ var ts;
             var result;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var node = _a[_i];
-                if (node.kind === 223 /* InterfaceDeclaration */ || node.kind === 222 /* ClassDeclaration */ ||
-                    node.kind === 193 /* ClassExpression */ || node.kind === 224 /* TypeAliasDeclaration */) {
+                if (node.kind === 227 /* InterfaceDeclaration */ || node.kind === 226 /* ClassDeclaration */ ||
+                    node.kind === 197 /* ClassExpression */ || node.kind === 228 /* TypeAliasDeclaration */) {
                     var declaration = node;
                     if (declaration.typeParameters) {
                         result = appendTypeParameters(result, declaration.typeParameters);
@@ -26021,7 +27381,7 @@ var ts;
             return ts.concatenate(getOuterTypeParametersOfClassOrInterface(symbol), getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol));
         }
         function isConstructorType(type) {
-            return type.flags & 2588672 /* ObjectType */ && getSignaturesOfType(type, 1 /* Construct */).length > 0;
+            return type.flags & 32768 /* Object */ && getSignaturesOfType(type, 1 /* Construct */).length > 0;
         }
         function getBaseTypeNodeOfClass(type) {
             return ts.getClassExtendsHeritageClauseElement(type.symbol.valueDeclaration);
@@ -26033,7 +27393,7 @@ var ts;
         function getInstantiatedConstructorsForTypeArguments(type, typeArgumentNodes) {
             var signatures = getConstructorsForTypeArguments(type, typeArgumentNodes);
             if (typeArgumentNodes) {
-                var typeArguments_1 = ts.map(typeArgumentNodes, getTypeFromTypeNodeNoAlias);
+                var typeArguments_1 = ts.map(typeArgumentNodes, getTypeFromTypeNode);
                 signatures = ts.map(signatures, function (sig) { return getSignatureInstantiation(sig, typeArguments_1); });
             }
             return signatures;
@@ -26053,7 +27413,7 @@ var ts;
                     return unknownType;
                 }
                 var baseConstructorType = checkExpression(baseTypeNode.expression);
-                if (baseConstructorType.flags & 2588672 /* ObjectType */) {
+                if (baseConstructorType.flags & 32768 /* Object */) {
                     // Resolving the members of a class requires us to resolve the base class of that class.
                     // We force resolution here such that we catch circularities now.
                     resolveStructuredTypeMembers(baseConstructorType);
@@ -26072,7 +27432,7 @@ var ts;
         }
         function getBaseTypes(type) {
             if (!type.resolvedBaseTypes) {
-                if (type.flags & 262144 /* Tuple */) {
+                if (type.objectFlags & 8 /* Tuple */) {
                     type.resolvedBaseTypes = [createArrayType(getUnionType(type.typeParameters))];
                 }
                 else if (type.symbol.flags & (32 /* Class */ | 64 /* Interface */)) {
@@ -26092,7 +27452,7 @@ var ts;
         function resolveBaseTypesOfClass(type) {
             type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray;
             var baseConstructorType = getBaseConstructorTypeOfClass(type);
-            if (!(baseConstructorType.flags & 2588672 /* ObjectType */)) {
+            if (!(baseConstructorType.flags & 32768 /* Object */)) {
                 return;
             }
             var baseTypeNode = getBaseTypeNodeOfClass(type);
@@ -26119,7 +27479,7 @@ var ts;
             if (baseType === unknownType) {
                 return;
             }
-            if (!(getTargetType(baseType).flags & (32768 /* Class */ | 65536 /* Interface */))) {
+            if (!(getObjectFlags(getTargetType(baseType)) & 3 /* ClassOrInterface */)) {
                 error(baseTypeNode.expression, ts.Diagnostics.Base_constructor_return_type_0_is_not_a_class_or_interface_type, typeToString(baseType));
                 return;
             }
@@ -26149,12 +27509,12 @@ var ts;
             type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray;
             for (var _i = 0, _a = type.symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 223 /* InterfaceDeclaration */ && ts.getInterfaceBaseTypeNodes(declaration)) {
+                if (declaration.kind === 227 /* InterfaceDeclaration */ && ts.getInterfaceBaseTypeNodes(declaration)) {
                     for (var _b = 0, _c = ts.getInterfaceBaseTypeNodes(declaration); _b < _c.length; _b++) {
                         var node = _c[_b];
                         var baseType = getTypeFromTypeNode(node);
                         if (baseType !== unknownType) {
-                            if (getTargetType(baseType).flags & (32768 /* Class */ | 65536 /* Interface */)) {
+                            if (getObjectFlags(getTargetType(baseType)) & 3 /* ClassOrInterface */) {
                                 if (type !== baseType && !hasBaseType(baseType, type)) {
                                     if (type.resolvedBaseTypes === emptyArray) {
                                         type.resolvedBaseTypes = [baseType];
@@ -26181,7 +27541,7 @@ var ts;
         function isIndependentInterface(symbol) {
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 223 /* InterfaceDeclaration */) {
+                if (declaration.kind === 227 /* InterfaceDeclaration */) {
                     if (declaration.flags & 64 /* ContainsThis */) {
                         return false;
                     }
@@ -26204,7 +27564,7 @@ var ts;
         function getDeclaredTypeOfClassOrInterface(symbol) {
             var links = getSymbolLinks(symbol);
             if (!links.declaredType) {
-                var kind = symbol.flags & 32 /* Class */ ? 32768 /* Class */ : 65536 /* Interface */;
+                var kind = symbol.flags & 32 /* Class */ ? 1 /* Class */ : 2 /* Interface */;
                 var type = links.declaredType = createObjectType(kind, symbol);
                 var outerTypeParameters = getOuterTypeParametersOfClassOrInterface(symbol);
                 var localTypeParameters = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol);
@@ -26213,8 +27573,8 @@ var ts;
                 // property types inferred from initializers and method return types inferred from return statements are very hard
                 // to exhaustively analyze). We give interfaces a "this" type if we can't definitely determine that they are free of
                 // "this" references.
-                if (outerTypeParameters || localTypeParameters || kind === 32768 /* Class */ || !isIndependentInterface(symbol)) {
-                    type.flags |= 131072 /* Reference */;
+                if (outerTypeParameters || localTypeParameters || kind === 1 /* Class */ || !isIndependentInterface(symbol)) {
+                    type.objectFlags |= 4 /* Reference */;
                     type.typeParameters = ts.concatenate(outerTypeParameters, localTypeParameters);
                     type.outerTypeParameters = outerTypeParameters;
                     type.localTypeParameters = localTypeParameters;
@@ -26238,8 +27598,7 @@ var ts;
                 if (!pushTypeResolution(symbol, 2 /* DeclaredType */)) {
                     return unknownType;
                 }
-                var typeParameters = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol);
-                var declaration = ts.getDeclarationOfKind(symbol, 279 /* JSDocTypedefTag */);
+                var declaration = ts.getDeclarationOfKind(symbol, 284 /* JSDocTypedefTag */);
                 var type = void 0;
                 if (declaration) {
                     if (declaration.jsDocTypeLiteral) {
@@ -26250,16 +27609,17 @@ var ts;
                     }
                 }
                 else {
-                    declaration = ts.getDeclarationOfKind(symbol, 224 /* TypeAliasDeclaration */);
-                    type = getTypeFromTypeNode(declaration.type, symbol, typeParameters);
+                    declaration = ts.getDeclarationOfKind(symbol, 228 /* TypeAliasDeclaration */);
+                    type = getTypeFromTypeNode(declaration.type);
                 }
                 if (popTypeResolution()) {
-                    links.typeParameters = typeParameters;
+                    var typeParameters = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol);
                     if (typeParameters) {
                         // Initialize the instantiation cache for generic type aliases. The declared type corresponds to
                         // an instantiation of the type alias with the type parameters supplied as type arguments.
+                        links.typeParameters = typeParameters;
                         links.instantiations = ts.createMap();
-                        links.instantiations[getTypeListId(links.typeParameters)] = type;
+                        links.instantiations[getTypeListId(typeParameters)] = type;
                     }
                 }
                 else {
@@ -26276,14 +27636,14 @@ var ts;
                 return !ts.isInAmbientContext(member);
             }
             return expr.kind === 8 /* NumericLiteral */ ||
-                expr.kind === 186 /* PrefixUnaryExpression */ && expr.operator === 37 /* MinusToken */ &&
+                expr.kind === 190 /* PrefixUnaryExpression */ && expr.operator === 37 /* MinusToken */ &&
                     expr.operand.kind === 8 /* NumericLiteral */ ||
                 expr.kind === 70 /* Identifier */ && !!symbol.exports[expr.text];
         }
         function enumHasLiteralMembers(symbol) {
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 225 /* EnumDeclaration */) {
+                if (declaration.kind === 229 /* EnumDeclaration */) {
                     for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) {
                         var member = _c[_b];
                         if (!isLiteralEnumMember(symbol, member)) {
@@ -26311,7 +27671,7 @@ var ts;
                     var memberTypes = ts.createMap();
                     for (var _i = 0, _a = enumType.symbol.declarations; _i < _a.length; _i++) {
                         var declaration = _a[_i];
-                        if (declaration.kind === 225 /* EnumDeclaration */) {
+                        if (declaration.kind === 229 /* EnumDeclaration */) {
                             computeEnumMemberValues(declaration);
                             for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) {
                                 var member = _c[_b];
@@ -26326,7 +27686,7 @@ var ts;
                     }
                     enumType.memberTypes = memberTypes;
                     if (memberTypeList.length > 1) {
-                        enumType.flags |= 524288 /* Union */;
+                        enumType.flags |= 65536 /* Union */;
                         enumType.types = memberTypeList;
                         unionTypes[getTypeListId(memberTypeList)] = enumType;
                     }
@@ -26338,7 +27698,7 @@ var ts;
             var links = getSymbolLinks(symbol);
             if (!links.declaredType) {
                 var enumType = getDeclaredTypeOfEnum(getParentOfSymbol(symbol));
-                links.declaredType = enumType.flags & 524288 /* Union */ ?
+                links.declaredType = enumType.flags & 65536 /* Union */ ?
                     enumType.memberTypes[getEnumMemberValue(symbol.valueDeclaration)] :
                     enumType;
             }
@@ -26349,7 +27709,7 @@ var ts;
             if (!links.declaredType) {
                 var type = createType(16384 /* TypeParameter */);
                 type.symbol = symbol;
-                if (!ts.getDeclarationOfKind(symbol, 142 /* TypeParameter */).constraint) {
+                if (!ts.getDeclarationOfKind(symbol, 143 /* TypeParameter */).constraint) {
                     type.constraint = noConstraintType;
                 }
                 links.declaredType = type;
@@ -26403,19 +27763,19 @@ var ts;
         function isIndependentType(node) {
             switch (node.kind) {
                 case 118 /* AnyKeyword */:
-                case 133 /* StringKeyword */:
-                case 131 /* NumberKeyword */:
+                case 134 /* StringKeyword */:
+                case 132 /* NumberKeyword */:
                 case 121 /* BooleanKeyword */:
-                case 134 /* SymbolKeyword */:
+                case 135 /* SymbolKeyword */:
                 case 104 /* VoidKeyword */:
-                case 136 /* UndefinedKeyword */:
+                case 137 /* UndefinedKeyword */:
                 case 94 /* NullKeyword */:
-                case 128 /* NeverKeyword */:
-                case 167 /* LiteralType */:
+                case 129 /* NeverKeyword */:
+                case 171 /* LiteralType */:
                     return true;
-                case 161 /* ArrayType */:
+                case 162 /* ArrayType */:
                     return isIndependentType(node.elementType);
-                case 156 /* TypeReference */:
+                case 157 /* TypeReference */:
                     return isIndependentTypeReference(node);
             }
             return false;
@@ -26428,7 +27788,7 @@ var ts;
         // A function-like declaration is considered independent (free of this references) if it has a return type
         // annotation that is considered independent and if each parameter is considered independent.
         function isIndependentFunctionLikeDeclaration(node) {
-            if (node.kind !== 149 /* Constructor */ && (!node.type || !isIndependentType(node.type))) {
+            if (node.kind !== 150 /* Constructor */ && (!node.type || !isIndependentType(node.type))) {
                 return false;
             }
             for (var _i = 0, _a = node.parameters; _i < _a.length; _i++) {
@@ -26449,12 +27809,12 @@ var ts;
                 var declaration = symbol.declarations[0];
                 if (declaration) {
                     switch (declaration.kind) {
-                        case 146 /* PropertyDeclaration */:
-                        case 145 /* PropertySignature */:
+                        case 147 /* PropertyDeclaration */:
+                        case 146 /* PropertySignature */:
                             return isIndependentVariableLikeDeclaration(declaration);
-                        case 148 /* MethodDeclaration */:
-                        case 147 /* MethodSignature */:
-                        case 149 /* Constructor */:
+                        case 149 /* MethodDeclaration */:
+                        case 148 /* MethodSignature */:
+                        case 150 /* Constructor */:
                             return isIndependentFunctionLikeDeclaration(declaration);
                     }
                 }
@@ -26499,7 +27859,7 @@ var ts;
             return type;
         }
         function getTypeWithThisArgument(type, thisArgument) {
-            if (type.flags & 131072 /* Reference */) {
+            if (getObjectFlags(type) & 4 /* Reference */) {
                 return createTypeReference(type.target, ts.concatenate(type.typeArguments, [thisArgument || type.target.thisType]));
             }
             return type;
@@ -26522,8 +27882,8 @@ var ts;
             else {
                 mapper = createTypeMapper(typeParameters, typeArguments);
                 members = createInstantiatedSymbolTable(source.declaredProperties, mapper, /*mappingThisOnly*/ typeParameters.length === 1);
-                callSignatures = instantiateList(source.declaredCallSignatures, mapper, instantiateSignature);
-                constructSignatures = instantiateList(source.declaredConstructSignatures, mapper, instantiateSignature);
+                callSignatures = instantiateSignatures(source.declaredCallSignatures, mapper);
+                constructSignatures = instantiateSignatures(source.declaredConstructSignatures, mapper);
                 stringIndexInfo = instantiateIndexInfo(source.declaredStringIndexInfo, mapper);
                 numberIndexInfo = instantiateIndexInfo(source.declaredNumberIndexInfo, mapper);
             }
@@ -26543,7 +27903,7 @@ var ts;
                     numberIndexInfo = numberIndexInfo || getIndexInfoOfType(instantiatedBaseType, 1 /* Number */);
                 }
             }
-            setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+            setStructuredTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function resolveClassOrInterfaceMembers(type) {
             resolveObjectTypeMembers(type, resolveDeclaredMembers(type), emptyArray, emptyArray);
@@ -26578,14 +27938,14 @@ var ts;
                 return [createSignature(undefined, classType.localTypeParameters, undefined, emptyArray, classType, /*typePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false)];
             }
             var baseTypeNode = getBaseTypeNodeOfClass(classType);
-            var typeArguments = ts.map(baseTypeNode.typeArguments, getTypeFromTypeNodeNoAlias);
+            var typeArguments = ts.map(baseTypeNode.typeArguments, getTypeFromTypeNode);
             var typeArgCount = typeArguments ? typeArguments.length : 0;
             var result = [];
             for (var _i = 0, baseSignatures_1 = baseSignatures; _i < baseSignatures_1.length; _i++) {
                 var baseSig = baseSignatures_1[_i];
                 var typeParamCount = baseSig.typeParameters ? baseSig.typeParameters.length : 0;
                 if (typeParamCount === typeArgCount) {
-                    var sig = typeParamCount ? getSignatureInstantiation(baseSig, typeArguments) : cloneSignature(baseSig);
+                    var sig = typeParamCount ? createSignatureInstantiation(baseSig, typeArguments) : cloneSignature(baseSig);
                     sig.typeParameters = classType.localTypeParameters;
                     sig.resolvedReturnType = classType;
                     result.push(sig);
@@ -26682,7 +28042,7 @@ var ts;
             var constructSignatures = getUnionSignatures(type.types, 1 /* Construct */);
             var stringIndexInfo = getUnionIndexInfo(type.types, 0 /* String */);
             var numberIndexInfo = getUnionIndexInfo(type.types, 1 /* Number */);
-            setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+            setStructuredTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function intersectTypes(type1, type2) {
             return !type1 ? type2 : !type2 ? type1 : getIntersectionType([type1, type2]);
@@ -26690,6 +28050,9 @@ var ts;
         function intersectIndexInfos(info1, info2) {
             return !info1 ? info2 : !info2 ? info1 : createIndexInfo(getIntersectionType([info1.type, info2.type]), info1.isReadonly && info2.isReadonly);
         }
+        function unionSpreadIndexInfos(info1, info2) {
+            return info1 && info2 && createIndexInfo(getUnionType([info1.type, info2.type]), info1.isReadonly || info2.isReadonly);
+        }
         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).
@@ -26704,17 +28067,17 @@ var ts;
                 stringIndexInfo = intersectIndexInfos(stringIndexInfo, getIndexInfoOfType(t, 0 /* String */));
                 numberIndexInfo = intersectIndexInfos(numberIndexInfo, getIndexInfoOfType(t, 1 /* Number */));
             }
-            setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+            setStructuredTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function resolveAnonymousTypeMembers(type) {
             var symbol = type.symbol;
             if (type.target) {
                 var members = createInstantiatedSymbolTable(getPropertiesOfObjectType(type.target), type.mapper, /*mappingThisOnly*/ false);
-                var callSignatures = instantiateList(getSignaturesOfType(type.target, 0 /* Call */), type.mapper, instantiateSignature);
-                var constructSignatures = instantiateList(getSignaturesOfType(type.target, 1 /* Construct */), type.mapper, instantiateSignature);
+                var callSignatures = instantiateSignatures(getSignaturesOfType(type.target, 0 /* Call */), type.mapper);
+                var constructSignatures = instantiateSignatures(getSignaturesOfType(type.target, 1 /* Construct */), type.mapper);
                 var stringIndexInfo = instantiateIndexInfo(getIndexInfoOfType(type.target, 0 /* String */), type.mapper);
                 var numberIndexInfo = instantiateIndexInfo(getIndexInfoOfType(type.target, 1 /* Number */), type.mapper);
-                setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+                setStructuredTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
             }
             else if (symbol.flags & 2048 /* TypeLiteral */) {
                 var members = symbol.members;
@@ -26722,7 +28085,7 @@ var ts;
                 var constructSignatures = getSignaturesOfSymbol(members["__new"]);
                 var stringIndexInfo = getIndexInfoOfSymbol(symbol, 0 /* String */);
                 var numberIndexInfo = getIndexInfoOfSymbol(symbol, 1 /* Number */);
-                setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+                setStructuredTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
             }
             else {
                 // Combinations of function, class, enum and module
@@ -26738,13 +28101,13 @@ var ts;
                         constructSignatures = getDefaultConstructSignatures(classType);
                     }
                     var baseConstructorType = getBaseConstructorTypeOfClass(classType);
-                    if (baseConstructorType.flags & 2588672 /* ObjectType */) {
+                    if (baseConstructorType.flags & 32768 /* Object */) {
                         members = createSymbolTable(getNamedMembers(members));
                         addInheritedMembers(members, getPropertiesOfObjectType(baseConstructorType));
                     }
                 }
                 var numberIndexInfo = symbol.flags & 384 /* Enum */ ? enumNumberIndexInfo : undefined;
-                setObjectTypeMembers(type, members, emptyArray, constructSignatures, undefined, numberIndexInfo);
+                setStructuredTypeMembers(type, members, emptyArray, constructSignatures, undefined, 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
                 // in the process of resolving (see issue #6072). The temporarily empty signature list
@@ -26754,21 +28117,95 @@ var ts;
                 }
             }
         }
+        /** Resolve the members of a mapped type { [P in K]: T } */
+        function resolveMappedTypeMembers(type) {
+            var members = ts.createMap();
+            var stringIndexInfo;
+            var numberIndexInfo;
+            // In { [P in K]: T }, we refer to P as the type parameter type, K as the constraint type,
+            // and T as the template type.
+            var typeParameter = getTypeParameterFromMappedType(type);
+            var constraintType = getConstraintTypeFromMappedType(type);
+            var templateType = getTemplateTypeFromMappedType(type);
+            var isReadonly = !!type.declaration.readonlyToken;
+            var isOptional = !!type.declaration.questionToken;
+            // First, if the constraint type is a type parameter, obtain the base constraint. Then,
+            // if the key type is a 'keyof X', obtain 'keyof C' where C is the base constraint of X.
+            // Finally, iterate over the constituents of the resulting iteration type.
+            var keyType = constraintType.flags & 16384 /* TypeParameter */ ? getApparentType(constraintType) : constraintType;
+            var iterationType = keyType.flags & 262144 /* Index */ ? getIndexType(getApparentType(keyType.type)) : keyType;
+            forEachType(iterationType, function (t) {
+                // Create a mapper from T to the current iteration type constituent. Then, if the
+                // mapped type is itself an instantiated type, combine the iteration mapper with the
+                // instantiation mapper.
+                var iterationMapper = createUnaryTypeMapper(typeParameter, t);
+                var templateMapper = type.mapper ? combineTypeMappers(type.mapper, iterationMapper) : iterationMapper;
+                var propType = instantiateType(templateType, templateMapper);
+                // If the current iteration type constituent is a literal type, create a property.
+                // Otherwise, for type string create a string index signature and for type number
+                // create a numeric index signature.
+                if (t.flags & (32 /* StringLiteral */ | 64 /* NumberLiteral */ | 256 /* EnumLiteral */)) {
+                    var propName = t.text;
+                    var prop = createSymbol(4 /* Property */ | 67108864 /* Transient */ | (isOptional ? 536870912 /* Optional */ : 0), propName);
+                    prop.type = addOptionality(propType, isOptional);
+                    prop.isReadonly = isReadonly;
+                    members[propName] = prop;
+                }
+                else if (t.flags & 2 /* String */) {
+                    stringIndexInfo = createIndexInfo(propType, isReadonly);
+                }
+                else if (t.flags & 4 /* Number */) {
+                    numberIndexInfo = createIndexInfo(propType, isReadonly);
+                }
+            });
+            // If we created both a string and a numeric string index signature, and if the two index
+            // signatures have identical types, discard the redundant numeric index signature.
+            if (stringIndexInfo && numberIndexInfo && isTypeIdenticalTo(stringIndexInfo.type, numberIndexInfo.type)) {
+                numberIndexInfo = undefined;
+            }
+            setStructuredTypeMembers(type, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
+        }
+        function getTypeParameterFromMappedType(type) {
+            return type.typeParameter ||
+                (type.typeParameter = getDeclaredTypeOfTypeParameter(getSymbolOfNode(type.declaration.typeParameter)));
+        }
+        function getConstraintTypeFromMappedType(type) {
+            return type.constraintType ||
+                (type.constraintType = instantiateType(getConstraintOfTypeParameter(getTypeParameterFromMappedType(type)), type.mapper || identityMapper) || unknownType);
+        }
+        function getTemplateTypeFromMappedType(type) {
+            return type.templateType ||
+                (type.templateType = type.declaration.type ?
+                    instantiateType(getTypeFromTypeNode(type.declaration.type), type.mapper || identityMapper) :
+                    unknownType);
+        }
+        function isGenericMappedType(type) {
+            if (getObjectFlags(type) & 32 /* Mapped */) {
+                var constraintType = getConstraintTypeFromMappedType(type);
+                return !!(constraintType.flags & (16384 /* TypeParameter */ | 262144 /* Index */));
+            }
+            return false;
+        }
         function resolveStructuredTypeMembers(type) {
             if (!type.members) {
-                if (type.flags & 131072 /* Reference */) {
-                    resolveTypeReferenceMembers(type);
+                if (type.flags & 32768 /* Object */) {
+                    if (type.objectFlags & 4 /* Reference */) {
+                        resolveTypeReferenceMembers(type);
+                    }
+                    else if (type.objectFlags & 3 /* ClassOrInterface */) {
+                        resolveClassOrInterfaceMembers(type);
+                    }
+                    else if (type.objectFlags & 16 /* Anonymous */) {
+                        resolveAnonymousTypeMembers(type);
+                    }
+                    else if (type.objectFlags & 32 /* Mapped */) {
+                        resolveMappedTypeMembers(type);
+                    }
                 }
-                else if (type.flags & (32768 /* Class */ | 65536 /* Interface */)) {
-                    resolveClassOrInterfaceMembers(type);
-                }
-                else if (type.flags & 2097152 /* Anonymous */) {
-                    resolveAnonymousTypeMembers(type);
-                }
-                else if (type.flags & 524288 /* Union */) {
+                else if (type.flags & 65536 /* Union */) {
                     resolveUnionTypeMembers(type);
                 }
-                else if (type.flags & 1048576 /* Intersection */) {
+                else if (type.flags & 131072 /* Intersection */) {
                     resolveIntersectionTypeMembers(type);
                 }
             }
@@ -26776,7 +28213,7 @@ var ts;
         }
         /** Return properties of an object type or an empty array for other types */
         function getPropertiesOfObjectType(type) {
-            if (type.flags & 2588672 /* ObjectType */) {
+            if (type.flags & 32768 /* Object */) {
                 return resolveStructuredTypeMembers(type).properties;
             }
             return emptyArray;
@@ -26784,7 +28221,7 @@ var ts;
         /** If the given type is an object type and that type has a property by the given name,
          * return the symbol for that property. Otherwise return undefined. */
         function getPropertyOfObjectType(type, name) {
-            if (type.flags & 2588672 /* ObjectType */) {
+            if (type.flags & 32768 /* Object */) {
                 var resolved = resolveStructuredTypeMembers(type);
                 var symbol = resolved.members[name];
                 if (symbol && symbolIsValue(symbol)) {
@@ -26801,7 +28238,7 @@ var ts;
                 }
                 // The properties of a union type are those that are present in all constituent types, so
                 // we only need to check the properties of the first type
-                if (type.flags & 524288 /* Union */) {
+                if (type.flags & 65536 /* Union */) {
                     break;
                 }
             }
@@ -26821,7 +28258,9 @@ var ts;
         }
         function getPropertiesOfType(type) {
             type = getApparentType(type);
-            return type.flags & 1572864 /* UnionOrIntersection */ ? getPropertiesOfUnionOrIntersectionType(type) : getPropertiesOfObjectType(type);
+            return type.flags & 196608 /* UnionOrIntersection */ ?
+                getPropertiesOfUnionOrIntersectionType(type) :
+                getPropertiesOfObjectType(type);
         }
         /**
          * The apparent type of a type parameter is the base constraint instantiated with the type parameter
@@ -26843,28 +28282,19 @@ var ts;
          * type itself. Note that the apparent type of a union type is the union type itself.
          */
         function getApparentType(type) {
-            if (type.flags & 16384 /* TypeParameter */) {
-                type = getApparentTypeOfTypeParameter(type);
-            }
-            if (type.flags & 34 /* StringLike */) {
-                type = globalStringType;
-            }
-            else if (type.flags & 340 /* NumberLike */) {
-                type = globalNumberType;
-            }
-            else if (type.flags & 136 /* BooleanLike */) {
-                type = globalBooleanType;
-            }
-            else if (type.flags & 512 /* ESSymbol */) {
-                type = getGlobalESSymbolType();
-            }
-            return type;
+            var t = type.flags & 16384 /* TypeParameter */ ? getApparentTypeOfTypeParameter(type) : type;
+            return t.flags & 34 /* StringLike */ ? globalStringType :
+                t.flags & 340 /* NumberLike */ ? globalNumberType :
+                    t.flags & 136 /* BooleanLike */ ? globalBooleanType :
+                        t.flags & 512 /* ESSymbol */ ? getGlobalESSymbolType() :
+                            t.flags & 262144 /* Index */ ? stringOrNumberType :
+                                t;
         }
         function createUnionOrIntersectionProperty(containingType, name) {
             var types = containingType.types;
             var props;
             // Flags we want to propagate to the result if they exist in all source symbols
-            var commonFlags = (containingType.flags & 1048576 /* Intersection */) ? 536870912 /* Optional */ : 0 /* None */;
+            var commonFlags = (containingType.flags & 131072 /* Intersection */) ? 536870912 /* Optional */ : 0 /* None */;
             var isReadonly = false;
             var isPartial = false;
             for (var _i = 0, types_2 = types; _i < types_2.length; _i++) {
@@ -26884,7 +28314,7 @@ var ts;
                             isReadonly = true;
                         }
                     }
-                    else if (containingType.flags & 524288 /* Union */) {
+                    else if (containingType.flags & 65536 /* Union */) {
                         isPartial = true;
                     }
                 }
@@ -26919,7 +28349,7 @@ var ts;
             result.isPartial = isPartial;
             result.declarations = declarations;
             result.isReadonly = isReadonly;
-            result.type = containingType.flags & 524288 /* Union */ ? getUnionType(propTypes) : getIntersectionType(propTypes);
+            result.type = containingType.flags & 65536 /* Union */ ? getUnionType(propTypes) : getIntersectionType(propTypes);
             return result;
         }
         // Return the symbol for a given property in a union or intersection type, or undefined if the property
@@ -26953,7 +28383,7 @@ var ts;
          */
         function getPropertyOfType(type, name) {
             type = getApparentType(type);
-            if (type.flags & 2588672 /* ObjectType */) {
+            if (type.flags & 32768 /* Object */) {
                 var resolved = resolveStructuredTypeMembers(type);
                 var symbol = resolved.members[name];
                 if (symbol && symbolIsValue(symbol)) {
@@ -26967,13 +28397,13 @@ var ts;
                 }
                 return getPropertyOfObjectType(globalObjectType, name);
             }
-            if (type.flags & 1572864 /* UnionOrIntersection */) {
+            if (type.flags & 196608 /* UnionOrIntersection */) {
                 return getPropertyOfUnionOrIntersectionType(type, name);
             }
             return undefined;
         }
         function getSignaturesOfStructuredType(type, kind) {
-            if (type.flags & 4161536 /* StructuredType */) {
+            if (type.flags & 229376 /* StructuredType */) {
                 var resolved = resolveStructuredTypeMembers(type);
                 return kind === 0 /* Call */ ? resolved.callSignatures : resolved.constructSignatures;
             }
@@ -26987,7 +28417,7 @@ var ts;
             return getSignaturesOfStructuredType(getApparentType(type), kind);
         }
         function getIndexInfoOfStructuredType(type, kind) {
-            if (type.flags & 4161536 /* StructuredType */) {
+            if (type.flags & 229376 /* StructuredType */) {
                 var resolved = resolveStructuredTypeMembers(type);
                 return kind === 0 /* String */ ? resolved.stringIndexInfo : resolved.numberIndexInfo;
             }
@@ -27022,7 +28452,7 @@ var ts;
             return undefined;
         }
         function getTypeParametersFromJSDocTemplate(declaration) {
-            if (declaration.flags & 1048576 /* JavaScriptFile */) {
+            if (declaration.flags & 2097152 /* JavaScriptFile */) {
                 var templateTag = ts.getJSDocTemplateTag(declaration);
                 if (templateTag) {
                     return getTypeParametersFromDeclaration(templateTag.typeParameters);
@@ -27052,8 +28482,8 @@ var ts;
             return result;
         }
         function isJSDocOptionalParameter(node) {
-            if (node.flags & 1048576 /* JavaScriptFile */) {
-                if (node.type && node.type.kind === 268 /* JSDocOptionalType */) {
+            if (node.flags & 2097152 /* JavaScriptFile */) {
+                if (node.type && node.type.kind === 273 /* JSDocOptionalType */) {
                     return true;
                 }
                 var paramTag = ts.getCorrespondingJSDocParameterTag(node);
@@ -27062,11 +28492,19 @@ var ts;
                         return true;
                     }
                     if (paramTag.typeExpression) {
-                        return paramTag.typeExpression.type.kind === 268 /* JSDocOptionalType */;
+                        return paramTag.typeExpression.type.kind === 273 /* JSDocOptionalType */;
                     }
                 }
             }
         }
+        function tryFindAmbientModule(moduleName, withAugmentations) {
+            if (ts.isExternalModuleNameRelative(moduleName)) {
+                return undefined;
+            }
+            var symbol = getSymbol(globals, "\"" + moduleName + "\"", 512 /* ValueModule */);
+            // merged symbol is module declaration symbol combined with all augmentations
+            return symbol && withAugmentations ? getMergedSymbol(symbol) : symbol;
+        }
         function isOptionalParameter(node) {
             if (ts.hasQuestionToken(node) || isJSDocOptionalParameter(node)) {
                 return true;
@@ -27124,7 +28562,7 @@ var ts;
                     else {
                         parameters.push(paramSymbol);
                     }
-                    if (param.type && param.type.kind === 167 /* LiteralType */) {
+                    if (param.type && param.type.kind === 171 /* LiteralType */) {
                         hasLiteralTypes = true;
                     }
                     if (param.initializer || param.questionToken || param.dotDotDotToken || isJSDocOptionalParameter(param)) {
@@ -27138,10 +28576,10 @@ 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 === 150 /* GetAccessor */ || declaration.kind === 151 /* SetAccessor */) &&
+                if ((declaration.kind === 151 /* GetAccessor */ || declaration.kind === 152 /* SetAccessor */) &&
                     !ts.hasDynamicName(declaration) &&
                     (!hasThisParameter || !thisParameter)) {
-                    var otherKind = declaration.kind === 150 /* GetAccessor */ ? 151 /* SetAccessor */ : 150 /* GetAccessor */;
+                    var otherKind = declaration.kind === 151 /* GetAccessor */ ? 152 /* SetAccessor */ : 151 /* GetAccessor */;
                     var other = ts.getDeclarationOfKind(declaration.symbol, otherKind);
                     if (other) {
                         thisParameter = getAnnotatedAccessorThisParameter(other);
@@ -27153,14 +28591,14 @@ var ts;
                 if (isJSConstructSignature) {
                     minArgumentCount--;
                 }
-                var classType = declaration.kind === 149 /* Constructor */ ?
+                var classType = declaration.kind === 150 /* Constructor */ ?
                     getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol))
                     : undefined;
                 var typeParameters = classType ? classType.localTypeParameters :
                     declaration.typeParameters ? getTypeParametersFromDeclaration(declaration.typeParameters) :
                         getTypeParametersFromJSDocTemplate(declaration);
                 var returnType = getSignatureReturnTypeFromDeclaration(declaration, isJSConstructSignature, classType);
-                var typePredicate = declaration.type && declaration.type.kind === 155 /* TypePredicate */ ?
+                var typePredicate = declaration.type && declaration.type.kind === 156 /* TypePredicate */ ?
                     createTypePredicateFromTypePredicateNode(declaration.type) :
                     undefined;
                 links.resolvedSignature = createSignature(declaration, typeParameters, thisParameter, parameters, returnType, typePredicate, minArgumentCount, ts.hasRestParameter(declaration), hasLiteralTypes);
@@ -27177,7 +28615,7 @@ var ts;
             else if (declaration.type) {
                 return getTypeFromTypeNode(declaration.type);
             }
-            if (declaration.flags & 1048576 /* JavaScriptFile */) {
+            if (declaration.flags & 2097152 /* JavaScriptFile */) {
                 var type = getReturnTypeFromJSDocComment(declaration);
                 if (type && type !== unknownType) {
                     return type;
@@ -27185,8 +28623,8 @@ var ts;
             }
             // TypeScript 1.0 spec (April 2014):
             // If only one accessor includes a type annotation, the other behaves as if it had the same type annotation.
-            if (declaration.kind === 150 /* GetAccessor */ && !ts.hasDynamicName(declaration)) {
-                var setter = ts.getDeclarationOfKind(declaration.symbol, 151 /* SetAccessor */);
+            if (declaration.kind === 151 /* GetAccessor */ && !ts.hasDynamicName(declaration)) {
+                var setter = ts.getDeclarationOfKind(declaration.symbol, 152 /* SetAccessor */);
                 return getAnnotatedAccessorType(setter);
             }
             if (ts.nodeIsMissing(declaration.body)) {
@@ -27200,20 +28638,20 @@ var ts;
             for (var i = 0, len = symbol.declarations.length; i < len; i++) {
                 var node = symbol.declarations[i];
                 switch (node.kind) {
-                    case 157 /* FunctionType */:
-                    case 158 /* ConstructorType */:
-                    case 221 /* FunctionDeclaration */:
-                    case 148 /* MethodDeclaration */:
-                    case 147 /* MethodSignature */:
-                    case 149 /* Constructor */:
-                    case 152 /* CallSignature */:
-                    case 153 /* ConstructSignature */:
-                    case 154 /* IndexSignature */:
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
-                    case 180 /* FunctionExpression */:
-                    case 181 /* ArrowFunction */:
-                    case 269 /* JSDocFunctionType */:
+                    case 158 /* FunctionType */:
+                    case 159 /* ConstructorType */:
+                    case 225 /* FunctionDeclaration */:
+                    case 149 /* MethodDeclaration */:
+                    case 148 /* MethodSignature */:
+                    case 150 /* Constructor */:
+                    case 153 /* CallSignature */:
+                    case 154 /* ConstructSignature */:
+                    case 155 /* IndexSignature */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* SetAccessor */:
+                    case 184 /* FunctionExpression */:
+                    case 185 /* ArrowFunction */:
+                    case 274 /* JSDocFunctionType */:
                         // Don't include signature if node is the implementation of an overloaded function. A node is considered
                         // an implementation node if it has a body and the previous node is of the same kind and immediately
                         // precedes the implementation node (i.e. has the same parent and ends where the implementation starts).
@@ -27277,13 +28715,18 @@ var ts;
         function getRestTypeOfSignature(signature) {
             if (signature.hasRestParameter) {
                 var type = getTypeOfSymbol(ts.lastOrUndefined(signature.parameters));
-                if (type.flags & 131072 /* Reference */ && type.target === globalArrayType) {
+                if (getObjectFlags(type) & 4 /* Reference */ && type.target === globalArrayType) {
                     return type.typeArguments[0];
                 }
             }
             return anyType;
         }
         function getSignatureInstantiation(signature, typeArguments) {
+            var instantiations = signature.instantiations || (signature.instantiations = ts.createMap());
+            var id = getTypeListId(typeArguments);
+            return instantiations[id] || (instantiations[id] = createSignatureInstantiation(signature, typeArguments));
+        }
+        function createSignatureInstantiation(signature, typeArguments) {
             return instantiateSignature(signature, createTypeMapper(signature.typeParameters, typeArguments), /*eraseTypeParameters*/ true);
         }
         function getErasedSignature(signature) {
@@ -27300,8 +28743,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 === 149 /* Constructor */ || signature.declaration.kind === 153 /* ConstructSignature */;
-                var type = createObjectType(2097152 /* Anonymous */);
+                var isConstructor = signature.declaration.kind === 150 /* Constructor */ || signature.declaration.kind === 154 /* ConstructSignature */;
+                var type = createObjectType(16 /* Anonymous */);
                 type.members = emptySymbols;
                 type.properties = emptyArray;
                 type.callSignatures = !isConstructor ? [signature] : emptyArray;
@@ -27314,7 +28757,7 @@ var ts;
             return symbol.members["__index"];
         }
         function getIndexDeclarationOfSymbol(symbol, kind) {
-            var syntaxKind = kind === 1 /* Number */ ? 131 /* NumberKeyword */ : 133 /* StringKeyword */;
+            var syntaxKind = kind === 1 /* Number */ ? 132 /* NumberKeyword */ : 134 /* StringKeyword */;
             var indexSymbol = getIndexSymbol(symbol);
             if (indexSymbol) {
                 for (var _i = 0, _a = indexSymbol.declarations; _i < _a.length; _i++) {
@@ -27341,7 +28784,7 @@ var ts;
             return undefined;
         }
         function getConstraintDeclaration(type) {
-            return ts.getDeclarationOfKind(type.symbol, 142 /* TypeParameter */).constraint;
+            return ts.getDeclarationOfKind(type.symbol, 143 /* TypeParameter */).constraint;
         }
         function hasConstraintReferenceTo(type, target) {
             var checked;
@@ -27374,7 +28817,7 @@ var ts;
             return typeParameter.constraint === noConstraintType ? undefined : typeParameter.constraint;
         }
         function getParentSymbolOfTypeParameter(typeParameter) {
-            return getSymbolOfNode(ts.getDeclarationOfKind(typeParameter.symbol, 142 /* TypeParameter */).parent);
+            return getSymbolOfNode(ts.getDeclarationOfKind(typeParameter.symbol, 143 /* TypeParameter */).parent);
         }
         function getTypeListId(types) {
             var result = "";
@@ -27411,22 +28854,23 @@ var ts;
                     result |= type.flags;
                 }
             }
-            return result & 234881024 /* PropagatingFlags */;
+            return result & 14680064 /* PropagatingFlags */;
         }
         function createTypeReference(target, typeArguments) {
             var id = getTypeListId(typeArguments);
             var type = target.instantiations[id];
             if (!type) {
-                var propagatedFlags = typeArguments ? getPropagatingFlagsOfTypes(typeArguments, /*excludeKinds*/ 0) : 0;
-                var flags = 131072 /* Reference */ | propagatedFlags;
-                type = target.instantiations[id] = createObjectType(flags, target.symbol);
+                type = target.instantiations[id] = createObjectType(4 /* Reference */, target.symbol);
+                type.flags |= typeArguments ? getPropagatingFlagsOfTypes(typeArguments, /*excludeKinds*/ 0) : 0;
                 type.target = target;
                 type.typeArguments = typeArguments;
             }
             return type;
         }
         function cloneTypeReference(source) {
-            var type = createObjectType(source.flags, source.symbol);
+            var type = createType(source.flags);
+            type.symbol = source.symbol;
+            type.objectFlags = source.objectFlags;
             type.target = source.target;
             type.typeArguments = source.typeArguments;
             return type;
@@ -27446,7 +28890,7 @@ var ts;
                 // In a type reference, the outer type parameters of the referenced class or interface are automatically
                 // supplied as type arguments and the type reference only specifies arguments for the local type parameters
                 // of the class or interface.
-                return createTypeReference(type, ts.concatenate(type.outerTypeParameters, ts.map(node.typeArguments, getTypeFromTypeNodeNoAlias)));
+                return createTypeReference(type, ts.concatenate(type.outerTypeParameters, ts.map(node.typeArguments, getTypeFromTypeNode)));
             }
             if (node.typeArguments) {
                 error(node, ts.Diagnostics.Type_0_is_not_generic, typeToString(type));
@@ -27454,21 +28898,26 @@ var ts;
             }
             return type;
         }
+        function getTypeAliasInstantiation(symbol, typeArguments) {
+            var type = getDeclaredTypeOfSymbol(symbol);
+            var links = getSymbolLinks(symbol);
+            var typeParameters = links.typeParameters;
+            var id = getTypeListId(typeArguments);
+            return links.instantiations[id] || (links.instantiations[id] = instantiateTypeNoAlias(type, createTypeMapper(typeParameters, typeArguments)));
+        }
         // Get type from reference to type alias. When a type alias is generic, the declared type of the type alias may include
         // references to the type parameters of the alias. We replace those with the actual type arguments by instantiating the
         // declared type. Instantiations are cached using the type identities of the type arguments as the key.
         function getTypeFromTypeAliasReference(node, symbol) {
             var type = getDeclaredTypeOfSymbol(symbol);
-            var links = getSymbolLinks(symbol);
-            var typeParameters = links.typeParameters;
+            var typeParameters = getSymbolLinks(symbol).typeParameters;
             if (typeParameters) {
                 if (!node.typeArguments || node.typeArguments.length !== typeParameters.length) {
                     error(node, ts.Diagnostics.Generic_type_0_requires_1_type_argument_s, symbolToString(symbol), typeParameters.length);
                     return unknownType;
                 }
-                var typeArguments = ts.map(node.typeArguments, getTypeFromTypeNodeNoAlias);
-                var id = getTypeListId(typeArguments);
-                return links.instantiations[id] || (links.instantiations[id] = instantiateType(type, createTypeMapper(typeParameters, typeArguments)));
+                var typeArguments = ts.map(node.typeArguments, getTypeFromTypeNode);
+                return getTypeAliasInstantiation(symbol, typeArguments);
             }
             if (node.typeArguments) {
                 error(node, ts.Diagnostics.Type_0_is_not_generic, symbolToString(symbol));
@@ -27486,11 +28935,11 @@ var ts;
         }
         function getTypeReferenceName(node) {
             switch (node.kind) {
-                case 156 /* TypeReference */:
+                case 157 /* TypeReference */:
                     return node.typeName;
-                case 267 /* JSDocTypeReference */:
+                case 272 /* JSDocTypeReference */:
                     return node.name;
-                case 195 /* ExpressionWithTypeArguments */:
+                case 199 /* ExpressionWithTypeArguments */:
                     // We only support expressions that are simple qualified names. For other
                     // expressions this produces undefined.
                     var expr = node.expression;
@@ -27516,7 +28965,7 @@ var ts;
             if (symbol.flags & 524288 /* TypeAlias */) {
                 return getTypeFromTypeAliasReference(node, symbol);
             }
-            if (symbol.flags & 107455 /* Value */ && node.kind === 267 /* JSDocTypeReference */) {
+            if (symbol.flags & 107455 /* Value */ && node.kind === 272 /* JSDocTypeReference */) {
                 // A JSDocTypeReference may have resolved to a value (as opposed to a type). In
                 // that case, the type of this reference is just the type of the value we resolved
                 // to.
@@ -27529,14 +28978,14 @@ var ts;
             if (!links.resolvedType) {
                 var symbol = void 0;
                 var type = void 0;
-                if (node.kind === 267 /* JSDocTypeReference */) {
+                if (node.kind === 272 /* JSDocTypeReference */) {
                     var typeReferenceName = getTypeReferenceName(node);
                     symbol = resolveTypeReferenceName(typeReferenceName);
                     type = getTypeReferenceType(node, symbol);
                 }
                 else {
                     // We only support expressions that are simple qualified names. For other expressions this produces undefined.
-                    var typeNameOrExpression = node.kind === 156 /* TypeReference */
+                    var typeNameOrExpression = node.kind === 157 /* TypeReference */
                         ? node.typeName
                         : ts.isEntityNameExpression(node.expression)
                             ? node.expression
@@ -27571,9 +29020,9 @@ var ts;
                 for (var _i = 0, declarations_3 = declarations; _i < declarations_3.length; _i++) {
                     var declaration = declarations_3[_i];
                     switch (declaration.kind) {
-                        case 222 /* ClassDeclaration */:
-                        case 223 /* InterfaceDeclaration */:
-                        case 225 /* EnumDeclaration */:
+                        case 226 /* ClassDeclaration */:
+                        case 227 /* InterfaceDeclaration */:
+                        case 229 /* EnumDeclaration */:
                             return declaration;
                     }
                 }
@@ -27582,7 +29031,7 @@ var ts;
                 return arity ? emptyGenericType : emptyObjectType;
             }
             var type = getDeclaredTypeOfSymbol(symbol);
-            if (!(type.flags & 2588672 /* ObjectType */)) {
+            if (!(type.flags & 32768 /* Object */)) {
                 error(getTypeDeclaration(symbol), ts.Diagnostics.Global_type_0_must_be_a_class_or_interface_type, symbol.name);
                 return arity ? emptyGenericType : emptyObjectType;
             }
@@ -27662,7 +29111,7 @@ var ts;
                 property.type = typeParameter;
                 properties.push(property);
             }
-            var type = createObjectType(262144 /* Tuple */ | 131072 /* Reference */);
+            var type = createObjectType(8 /* Tuple */ | 4 /* Reference */);
             type.typeParameters = typeParameters;
             type.outerTypeParameters = undefined;
             type.localTypeParameters = typeParameters;
@@ -27689,7 +29138,7 @@ var ts;
         function getTypeFromTupleTypeNode(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
-                links.resolvedType = createTupleType(ts.map(node.elementTypes, getTypeFromTypeNodeNoAlias));
+                links.resolvedType = createTupleType(ts.map(node.elementTypes, getTypeFromTypeNode));
             }
             return links.resolvedType;
         }
@@ -27717,7 +29166,7 @@ var ts;
         }
         function addTypeToUnion(typeSet, type) {
             var flags = type.flags;
-            if (flags & 524288 /* Union */) {
+            if (flags & 65536 /* Union */) {
                 addTypesToUnion(typeSet, type.types);
             }
             else if (flags & 1 /* Any */) {
@@ -27728,7 +29177,7 @@ var ts;
                     typeSet.containsUndefined = true;
                 if (flags & 4096 /* Null */)
                     typeSet.containsNull = true;
-                if (!(flags & 33554432 /* ContainsWideningType */))
+                if (!(flags & 2097152 /* ContainsWideningType */))
                     typeSet.containsNonWideningType = true;
             }
             else if (!(flags & 8192 /* Never */)) {
@@ -27741,7 +29190,8 @@ var ts;
                 var len = typeSet.length;
                 var index = len && type.id > typeSet[len - 1].id ? ~len : binarySearchTypes(typeSet, type);
                 if (index < 0) {
-                    if (!(flags & 2097152 /* Anonymous */ && type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */) && containsIdenticalType(typeSet, type))) {
+                    if (!(flags & 32768 /* Object */ && type.objectFlags & 16 /* Anonymous */ &&
+                        type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */) && containsIdenticalType(typeSet, type))) {
                         typeSet.splice(~index, 0, type);
                     }
                 }
@@ -27805,7 +29255,7 @@ var ts;
                 var t = types[i];
                 var remove = t.flags & 32 /* StringLiteral */ && types.containsString ||
                     t.flags & 64 /* NumberLiteral */ && types.containsNumber ||
-                    t.flags & 96 /* StringOrNumberLiteral */ && t.flags & 16777216 /* FreshLiteral */ && containsType(types, t.regularType);
+                    t.flags & 96 /* StringOrNumberLiteral */ && t.flags & 1048576 /* FreshLiteral */ && containsType(types, t.regularType);
                 if (remove) {
                     ts.orderedRemoveItemAt(types, i);
                 }
@@ -27855,22 +29305,22 @@ var ts;
             var type = unionTypes[id];
             if (!type) {
                 var propagatedFlags = getPropagatingFlagsOfTypes(types, /*excludeKinds*/ 6144 /* Nullable */);
-                type = unionTypes[id] = createObjectType(524288 /* Union */ | propagatedFlags);
+                type = unionTypes[id] = createType(65536 /* Union */ | propagatedFlags);
                 type.types = types;
                 type.aliasSymbol = aliasSymbol;
                 type.aliasTypeArguments = aliasTypeArguments;
             }
             return type;
         }
-        function getTypeFromUnionTypeNode(node, aliasSymbol, aliasTypeArguments) {
+        function getTypeFromUnionTypeNode(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
-                links.resolvedType = getUnionType(ts.map(node.types, getTypeFromTypeNodeNoAlias), /*subtypeReduction*/ false, aliasSymbol, aliasTypeArguments);
+                links.resolvedType = getUnionType(ts.map(node.types, getTypeFromTypeNode), /*subtypeReduction*/ false, getAliasSymbolForTypeNode(node), getAliasTypeArgumentsForTypeNode(node));
             }
             return links.resolvedType;
         }
         function addTypeToIntersection(typeSet, type) {
-            if (type.flags & 1048576 /* Intersection */) {
+            if (type.flags & 131072 /* Intersection */) {
                 addTypesToIntersection(typeSet, type.types);
             }
             else if (type.flags & 1 /* Any */) {
@@ -27888,6 +29338,11 @@ var ts;
                 addTypeToIntersection(typeSet, type);
             }
         }
+        // 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
+        // effectively ensure that union types are always at the top level in type representations.
+        //
         // We do not perform structural deduplication on intersection types. Intersection types are created only by the &
         // type operator and we can't reduce those because we want to support recursive intersection types. For example,
         // a type alias of the form "type List<T> = T & { next: List<T> }" cannot be reduced during its declaration.
@@ -27897,6 +29352,18 @@ var ts;
             if (types.length === 0) {
                 return emptyObjectType;
             }
+            var _loop_2 = function (i) {
+                var type_1 = types[i];
+                if (type_1.flags & 65536 /* Union */) {
+                    return { value: getUnionType(ts.map(type_1.types, function (t) { return getIntersectionType(ts.replaceElement(types, i, t)); }), 
+                        /*subtypeReduction*/ false, aliasSymbol, aliasTypeArguments) };
+                }
+            };
+            for (var i = 0; i < types.length; i++) {
+                var state_2 = _loop_2(i);
+                if (typeof state_2 === "object")
+                    return state_2.value;
+            }
             var typeSet = [];
             addTypesToIntersection(typeSet, types);
             if (typeSet.containsAny) {
@@ -27909,40 +29376,256 @@ var ts;
             var type = intersectionTypes[id];
             if (!type) {
                 var propagatedFlags = getPropagatingFlagsOfTypes(typeSet, /*excludeKinds*/ 6144 /* Nullable */);
-                type = intersectionTypes[id] = createObjectType(1048576 /* Intersection */ | propagatedFlags);
+                type = intersectionTypes[id] = createType(131072 /* Intersection */ | propagatedFlags);
                 type.types = typeSet;
                 type.aliasSymbol = aliasSymbol;
                 type.aliasTypeArguments = aliasTypeArguments;
             }
             return type;
         }
-        function getTypeFromIntersectionTypeNode(node, aliasSymbol, aliasTypeArguments) {
+        function getTypeFromIntersectionTypeNode(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
-                links.resolvedType = getIntersectionType(ts.map(node.types, getTypeFromTypeNodeNoAlias), aliasSymbol, aliasTypeArguments);
+                links.resolvedType = getIntersectionType(ts.map(node.types, getTypeFromTypeNode), getAliasSymbolForTypeNode(node), getAliasTypeArgumentsForTypeNode(node));
             }
             return links.resolvedType;
         }
-        function getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node, aliasSymbol, aliasTypeArguments) {
+        function getIndexTypeForTypeParameter(type) {
+            if (!type.resolvedIndexType) {
+                type.resolvedIndexType = createType(262144 /* Index */);
+                type.resolvedIndexType.type = type;
+            }
+            return type.resolvedIndexType;
+        }
+        function getLiteralTypeFromPropertyName(prop) {
+            return getDeclarationModifierFlagsFromSymbol(prop) & 24 /* NonPublicAccessibilityModifier */ || ts.startsWith(prop.name, "__@") ?
+                neverType :
+                getLiteralTypeForText(32 /* StringLiteral */, ts.unescapeIdentifier(prop.name));
+        }
+        function getLiteralTypeFromPropertyNames(type) {
+            return getUnionType(ts.map(getPropertiesOfType(type), getLiteralTypeFromPropertyName));
+        }
+        function getIndexType(type) {
+            return type.flags & 16384 /* TypeParameter */ ? getIndexTypeForTypeParameter(type) :
+                type.flags & 1 /* Any */ || getIndexInfoOfType(type, 0 /* String */) ? stringOrNumberType :
+                    getIndexInfoOfType(type, 1 /* Number */) ? getUnionType([numberType, getLiteralTypeFromPropertyNames(type)]) :
+                        getLiteralTypeFromPropertyNames(type);
+        }
+        function getTypeFromTypeOperatorNode(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
-                // Deferred resolution of members is handled by resolveObjectTypeMembers
-                var type = createObjectType(2097152 /* Anonymous */, node.symbol);
-                type.aliasSymbol = aliasSymbol;
-                type.aliasTypeArguments = aliasTypeArguments;
+                links.resolvedType = getIndexType(getTypeFromTypeNode(node.type));
+            }
+            return links.resolvedType;
+        }
+        function createIndexedAccessType(objectType, indexType) {
+            var type = createType(524288 /* IndexedAccess */);
+            type.objectType = objectType;
+            type.indexType = indexType;
+            return type;
+        }
+        function getIndexedAccessTypeForTypeParameter(objectType, indexType) {
+            var indexedAccessTypes = indexType.resolvedIndexedAccessTypes || (indexType.resolvedIndexedAccessTypes = []);
+            return indexedAccessTypes[objectType.id] || (indexedAccessTypes[objectType.id] = createIndexedAccessType(objectType, indexType));
+        }
+        function getPropertyTypeForIndexType(objectType, indexType, accessNode, cacheSymbol) {
+            var accessExpression = accessNode && accessNode.kind === 178 /* ElementAccessExpression */ ? accessNode : undefined;
+            var propName = indexType.flags & (32 /* StringLiteral */ | 64 /* NumberLiteral */ | 256 /* EnumLiteral */) ?
+                indexType.text :
+                accessExpression && checkThatExpressionIsProperSymbolReference(accessExpression.argumentExpression, indexType, /*reportError*/ false) ?
+                    ts.getPropertyNameForKnownSymbolName(accessExpression.argumentExpression.name.text) :
+                    undefined;
+            if (propName) {
+                var prop = getPropertyOfType(objectType, propName);
+                if (prop) {
+                    if (accessExpression) {
+                        if (ts.isAssignmentTarget(accessExpression) && (isReferenceToReadonlyEntity(accessExpression, prop) || isReferenceThroughNamespaceImport(accessExpression))) {
+                            error(accessExpression.argumentExpression, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_constant_or_a_read_only_property, symbolToString(prop));
+                            return unknownType;
+                        }
+                        if (cacheSymbol) {
+                            getNodeLinks(accessNode).resolvedSymbol = prop;
+                        }
+                    }
+                    return getTypeOfSymbol(prop);
+                }
+            }
+            if (isTypeAnyOrAllConstituentTypesHaveKind(indexType, 34 /* StringLike */ | 340 /* NumberLike */ | 512 /* ESSymbol */)) {
+                if (isTypeAny(objectType)) {
+                    return anyType;
+                }
+                var indexInfo = isTypeAnyOrAllConstituentTypesHaveKind(indexType, 340 /* NumberLike */) && getIndexInfoOfType(objectType, 1 /* Number */) ||
+                    getIndexInfoOfType(objectType, 0 /* String */) ||
+                    undefined;
+                if (indexInfo) {
+                    if (accessExpression && ts.isAssignmentTarget(accessExpression) && indexInfo.isReadonly) {
+                        error(accessExpression, ts.Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
+                        return unknownType;
+                    }
+                    return indexInfo.type;
+                }
+                if (accessExpression && !isConstEnumObjectType(objectType)) {
+                    if (compilerOptions.noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors) {
+                        if (getIndexTypeOfType(objectType, 1 /* Number */)) {
+                            error(accessExpression.argumentExpression, ts.Diagnostics.Element_implicitly_has_an_any_type_because_index_expression_is_not_of_type_number);
+                        }
+                        else {
+                            error(accessExpression, ts.Diagnostics.Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature, typeToString(objectType));
+                        }
+                    }
+                    return anyType;
+                }
+            }
+            if (accessNode) {
+                var indexNode = accessNode.kind === 178 /* ElementAccessExpression */ ? accessNode.argumentExpression : accessNode.indexType;
+                if (indexType.flags & (32 /* StringLiteral */ | 64 /* NumberLiteral */)) {
+                    error(indexNode, ts.Diagnostics.Property_0_does_not_exist_on_type_1, indexType.text, typeToString(objectType));
+                }
+                else if (indexType.flags & (2 /* String */ | 4 /* Number */)) {
+                    error(indexNode, ts.Diagnostics.Type_0_has_no_matching_index_signature_for_type_1, typeToString(objectType), typeToString(indexType));
+                }
+                else {
+                    error(indexNode, ts.Diagnostics.Type_0_cannot_be_used_as_an_index_type, typeToString(indexType));
+                }
+            }
+            return unknownType;
+        }
+        function getIndexedAccessType(objectType, indexType, accessNode) {
+            if (indexType.flags & 16384 /* TypeParameter */) {
+                if (accessNode && !isTypeAssignableTo(getConstraintOfTypeParameter(indexType) || emptyObjectType, getIndexType(objectType))) {
+                    error(accessNode, ts.Diagnostics.Type_0_is_not_constrained_to_keyof_1, typeToString(indexType), typeToString(objectType));
+                    return unknownType;
+                }
+                return getIndexedAccessTypeForTypeParameter(objectType, indexType);
+            }
+            var apparentType = getApparentType(objectType);
+            if (indexType.flags & 65536 /* Union */ && !(indexType.flags & 8190 /* Primitive */)) {
+                var propTypes = [];
+                for (var _i = 0, _a = indexType.types; _i < _a.length; _i++) {
+                    var t = _a[_i];
+                    var propType = getPropertyTypeForIndexType(apparentType, t, accessNode, /*cacheSymbol*/ false);
+                    if (propType === unknownType) {
+                        return unknownType;
+                    }
+                    propTypes.push(propType);
+                }
+                return getUnionType(propTypes);
+            }
+            return getPropertyTypeForIndexType(apparentType, indexType, accessNode, /*cacheSymbol*/ true);
+        }
+        function getTypeFromIndexedAccessTypeNode(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                links.resolvedType = getIndexedAccessType(getTypeFromTypeNode(node.objectType), getTypeFromTypeNode(node.indexType), node);
+            }
+            return links.resolvedType;
+        }
+        function getTypeFromMappedTypeNode(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                var type = createObjectType(32 /* Mapped */, node.symbol);
+                type.declaration = node;
+                type.aliasSymbol = getAliasSymbolForTypeNode(node);
+                type.aliasTypeArguments = getAliasTypeArgumentsForTypeNode(node);
                 links.resolvedType = type;
             }
             return links.resolvedType;
         }
+        function getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                // Deferred resolution of members is handled by resolveObjectTypeMembers
+                var aliasSymbol = getAliasSymbolForTypeNode(node);
+                if (ts.isEmpty(node.symbol.members) && !aliasSymbol) {
+                    links.resolvedType = emptyTypeLiteralType;
+                }
+                else {
+                    var type = createObjectType(16 /* Anonymous */, node.symbol);
+                    type.aliasSymbol = aliasSymbol;
+                    type.aliasTypeArguments = getAliasTypeArgumentsForTypeNode(node);
+                    links.resolvedType = type;
+                }
+            }
+            return links.resolvedType;
+        }
+        function getAliasSymbolForTypeNode(node) {
+            return node.parent.kind === 228 /* TypeAliasDeclaration */ ? getSymbolOfNode(node.parent) : undefined;
+        }
+        function getAliasTypeArgumentsForTypeNode(node) {
+            var symbol = getAliasSymbolForTypeNode(node);
+            return symbol ? getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol) : undefined;
+        }
+        /**
+         * Since the source of spread types are object literals, which are not binary,
+         * this function should be called in a left folding style, with left = previous result of getSpreadType
+         * and right = the new element to be spread.
+         */
+        function getSpreadType(left, right, isFromObjectLiteral) {
+            ts.Debug.assert(!!(left.flags & (32768 /* Object */ | 1 /* Any */)) && !!(right.flags & (32768 /* Object */ | 1 /* Any */)), "Only object types may be spread.");
+            if (left.flags & 1 /* Any */ || right.flags & 1 /* Any */) {
+                return anyType;
+            }
+            var members = ts.createMap();
+            var skippedPrivateMembers = ts.createMap();
+            var stringIndexInfo;
+            var numberIndexInfo;
+            if (left === emptyObjectType) {
+                // for the first spread element, left === emptyObjectType, so take the right's string indexer
+                stringIndexInfo = getIndexInfoOfType(right, 0 /* String */);
+                numberIndexInfo = getIndexInfoOfType(right, 1 /* Number */);
+            }
+            else {
+                stringIndexInfo = unionSpreadIndexInfos(getIndexInfoOfType(left, 0 /* String */), getIndexInfoOfType(right, 0 /* String */));
+                numberIndexInfo = unionSpreadIndexInfos(getIndexInfoOfType(left, 1 /* Number */), getIndexInfoOfType(right, 1 /* Number */));
+            }
+            for (var _i = 0, _a = getPropertiesOfType(right); _i < _a.length; _i++) {
+                var rightProp = _a[_i];
+                // we approximate own properties as non-methods plus methods that are inside the object literal
+                var isOwnProperty = !(rightProp.flags & 8192 /* Method */) || isFromObjectLiteral;
+                var isSetterWithoutGetter = rightProp.flags & 65536 /* SetAccessor */ && !(rightProp.flags & 32768 /* GetAccessor */);
+                if (getDeclarationModifierFlagsFromSymbol(rightProp) & (8 /* Private */ | 16 /* Protected */)) {
+                    skippedPrivateMembers[rightProp.name] = true;
+                }
+                else if (isOwnProperty && !isSetterWithoutGetter) {
+                    members[rightProp.name] = rightProp;
+                }
+            }
+            for (var _b = 0, _c = getPropertiesOfType(left); _b < _c.length; _b++) {
+                var leftProp = _c[_b];
+                if (leftProp.flags & 65536 /* SetAccessor */ && !(leftProp.flags & 32768 /* GetAccessor */)
+                    || leftProp.name in skippedPrivateMembers) {
+                    continue;
+                }
+                if (leftProp.name in members) {
+                    var rightProp = members[leftProp.name];
+                    var rightType = getTypeOfSymbol(rightProp);
+                    if (maybeTypeOfKind(rightType, 2048 /* Undefined */) || rightProp.flags & 536870912 /* Optional */) {
+                        var declarations = ts.concatenate(leftProp.declarations, rightProp.declarations);
+                        var flags = 4 /* Property */ | 67108864 /* Transient */ | (leftProp.flags & 536870912 /* Optional */);
+                        var result = createSymbol(flags, leftProp.name);
+                        result.type = getUnionType([getTypeOfSymbol(leftProp), getTypeWithFacts(rightType, 131072 /* NEUndefined */)]);
+                        result.leftSpread = leftProp;
+                        result.rightSpread = rightProp;
+                        result.declarations = declarations;
+                        result.isReadonly = isReadonlySymbol(leftProp) || isReadonlySymbol(rightProp);
+                        members[leftProp.name] = result;
+                    }
+                }
+                else {
+                    members[leftProp.name] = leftProp;
+                }
+            }
+            return createAnonymousType(undefined, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
+        }
         function createLiteralType(flags, text) {
             var type = createType(flags);
             type.text = text;
             return type;
         }
         function getFreshTypeOfLiteralType(type) {
-            if (type.flags & 96 /* StringOrNumberLiteral */ && !(type.flags & 16777216 /* FreshLiteral */)) {
+            if (type.flags & 96 /* StringOrNumberLiteral */ && !(type.flags & 1048576 /* FreshLiteral */)) {
                 if (!type.freshType) {
-                    var freshType = createLiteralType(type.flags | 16777216 /* FreshLiteral */, type.text);
+                    var freshType = createLiteralType(type.flags | 1048576 /* FreshLiteral */, type.text);
                     freshType.regularType = type;
                     type.freshType = freshType;
                 }
@@ -27951,7 +29634,7 @@ var ts;
             return type;
         }
         function getRegularTypeOfLiteralType(type) {
-            return type.flags & 96 /* StringOrNumberLiteral */ && type.flags & 16777216 /* FreshLiteral */ ? type.regularType : type;
+            return type.flags & 96 /* StringOrNumberLiteral */ && type.flags & 1048576 /* FreshLiteral */ ? type.regularType : type;
         }
         function getLiteralTypeForText(flags, text) {
             var map = flags & 32 /* StringLiteral */ ? stringLiteralTypes : numericLiteralTypes;
@@ -27975,7 +29658,7 @@ var ts;
         function getTypeFromJSDocTupleType(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
-                var types = ts.map(node.types, getTypeFromTypeNodeNoAlias);
+                var types = ts.map(node.types, getTypeFromTypeNode);
                 links.resolvedType = createTupleType(types);
             }
             return links.resolvedType;
@@ -27983,9 +29666,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 === 223 /* InterfaceDeclaration */)) {
+            if (parent && (ts.isClassLike(parent) || parent.kind === 227 /* InterfaceDeclaration */)) {
                 if (!(ts.getModifierFlags(container) & 32 /* Static */) &&
-                    (container.kind !== 149 /* Constructor */ || ts.isNodeDescendantOf(node, container.body))) {
+                    (container.kind !== 150 /* Constructor */ || ts.isNodeDescendantOf(node, container.body))) {
                     return getDeclaredTypeOfClassOrInterface(getSymbolOfNode(parent)).thisType;
                 }
             }
@@ -27999,87 +29682,90 @@ var ts;
             }
             return links.resolvedType;
         }
-        function getTypeFromTypeNodeNoAlias(type) {
-            return getTypeFromTypeNode(type, /*aliasSymbol*/ undefined, /*aliasTypeArguments*/ undefined);
-        }
-        function getTypeFromTypeNode(node, aliasSymbol, aliasTypeArguments) {
+        function getTypeFromTypeNode(node) {
             switch (node.kind) {
                 case 118 /* AnyKeyword */:
-                case 258 /* JSDocAllType */:
-                case 259 /* JSDocUnknownType */:
+                case 263 /* JSDocAllType */:
+                case 264 /* JSDocUnknownType */:
                     return anyType;
-                case 133 /* StringKeyword */:
+                case 134 /* StringKeyword */:
                     return stringType;
-                case 131 /* NumberKeyword */:
+                case 132 /* NumberKeyword */:
                     return numberType;
                 case 121 /* BooleanKeyword */:
                     return booleanType;
-                case 134 /* SymbolKeyword */:
+                case 135 /* SymbolKeyword */:
                     return esSymbolType;
                 case 104 /* VoidKeyword */:
                     return voidType;
-                case 136 /* UndefinedKeyword */:
+                case 137 /* UndefinedKeyword */:
                     return undefinedType;
                 case 94 /* NullKeyword */:
                     return nullType;
-                case 128 /* NeverKeyword */:
+                case 129 /* NeverKeyword */:
                     return neverType;
-                case 283 /* JSDocNullKeyword */:
+                case 288 /* JSDocNullKeyword */:
                     return nullType;
-                case 284 /* JSDocUndefinedKeyword */:
+                case 289 /* JSDocUndefinedKeyword */:
                     return undefinedType;
-                case 285 /* JSDocNeverKeyword */:
+                case 290 /* JSDocNeverKeyword */:
                     return neverType;
-                case 166 /* ThisType */:
+                case 167 /* ThisType */:
                 case 98 /* ThisKeyword */:
                     return getTypeFromThisTypeNode(node);
-                case 167 /* LiteralType */:
+                case 171 /* LiteralType */:
                     return getTypeFromLiteralTypeNode(node);
-                case 282 /* JSDocLiteralType */:
+                case 287 /* JSDocLiteralType */:
                     return getTypeFromLiteralTypeNode(node.literal);
-                case 156 /* TypeReference */:
-                case 267 /* JSDocTypeReference */:
+                case 157 /* TypeReference */:
+                case 272 /* JSDocTypeReference */:
                     return getTypeFromTypeReference(node);
-                case 155 /* TypePredicate */:
+                case 156 /* TypePredicate */:
                     return booleanType;
-                case 195 /* ExpressionWithTypeArguments */:
+                case 199 /* ExpressionWithTypeArguments */:
                     return getTypeFromTypeReference(node);
-                case 159 /* TypeQuery */:
+                case 160 /* TypeQuery */:
                     return getTypeFromTypeQueryNode(node);
-                case 161 /* ArrayType */:
-                case 260 /* JSDocArrayType */:
+                case 162 /* ArrayType */:
+                case 265 /* JSDocArrayType */:
                     return getTypeFromArrayTypeNode(node);
-                case 162 /* TupleType */:
+                case 163 /* TupleType */:
                     return getTypeFromTupleTypeNode(node);
-                case 163 /* UnionType */:
-                case 261 /* JSDocUnionType */:
-                    return getTypeFromUnionTypeNode(node, aliasSymbol, aliasTypeArguments);
-                case 164 /* IntersectionType */:
-                    return getTypeFromIntersectionTypeNode(node, aliasSymbol, aliasTypeArguments);
-                case 165 /* ParenthesizedType */:
-                case 263 /* JSDocNullableType */:
-                case 264 /* JSDocNonNullableType */:
-                case 271 /* JSDocConstructorType */:
-                case 272 /* JSDocThisType */:
-                case 268 /* JSDocOptionalType */:
+                case 164 /* UnionType */:
+                case 266 /* JSDocUnionType */:
+                    return getTypeFromUnionTypeNode(node);
+                case 165 /* IntersectionType */:
+                    return getTypeFromIntersectionTypeNode(node);
+                case 166 /* ParenthesizedType */:
+                case 268 /* JSDocNullableType */:
+                case 269 /* JSDocNonNullableType */:
+                case 276 /* JSDocConstructorType */:
+                case 277 /* JSDocThisType */:
+                case 273 /* JSDocOptionalType */:
                     return getTypeFromTypeNode(node.type);
-                case 265 /* JSDocRecordType */:
+                case 270 /* JSDocRecordType */:
                     return getTypeFromTypeNode(node.literal);
-                case 157 /* FunctionType */:
-                case 158 /* ConstructorType */:
-                case 160 /* TypeLiteral */:
-                case 281 /* JSDocTypeLiteral */:
-                case 269 /* JSDocFunctionType */:
-                    return getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node, aliasSymbol, aliasTypeArguments);
+                case 158 /* FunctionType */:
+                case 159 /* ConstructorType */:
+                case 161 /* TypeLiteral */:
+                case 286 /* JSDocTypeLiteral */:
+                case 274 /* JSDocFunctionType */:
+                    return getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node);
+                case 168 /* TypeOperator */:
+                    return getTypeFromTypeOperatorNode(node);
+                case 169 /* IndexedAccessType */:
+                    return getTypeFromIndexedAccessTypeNode(node);
+                case 170 /* MappedType */:
+                    return getTypeFromMappedTypeNode(node);
                 // This function assumes that an identifier or qualified name is a type expression
                 // Callers should first ensure this by calling isTypeNode
                 case 70 /* Identifier */:
-                case 140 /* QualifiedName */:
+                case 141 /* QualifiedName */:
                     var symbol = getSymbolAtLocation(node);
                     return symbol && getDeclaredTypeOfSymbol(symbol);
-                case 262 /* JSDocTupleType */:
+                case 267 /* JSDocTupleType */:
                     return getTypeFromJSDocTupleType(node);
-                case 270 /* JSDocVariadicType */:
+                case 275 /* JSDocVariadicType */:
                     return getTypeFromJSDocVariadicType(node);
                 default:
                     return unknownType;
@@ -28096,6 +29782,16 @@ var ts;
             }
             return items;
         }
+        function instantiateTypes(types, mapper) {
+            return instantiateList(types, mapper, instantiateType);
+        }
+        function instantiateSignatures(signatures, mapper) {
+            return instantiateList(signatures, mapper, instantiateSignature);
+        }
+        function instantiateCached(type, mapper, instantiator) {
+            var instantiations = mapper.instantiations || (mapper.instantiations = []);
+            return instantiations[type.id] || (instantiations[type.id] = instantiator(type, mapper));
+        }
         function createUnaryTypeMapper(source, target) {
             return function (t) { return t === source ? target : t; };
         }
@@ -28118,7 +29814,6 @@ var ts;
                 count == 2 ? createBinaryTypeMapper(sources[0], targets ? targets[0] : anyType, sources[1], targets ? targets[1] : anyType) :
                     createArrayTypeMapper(sources, targets);
             mapper.mappedTypes = sources;
-            mapper.targetTypes = targets;
             return mapper;
         }
         function createTypeEraser(sources) {
@@ -28216,25 +29911,25 @@ var ts;
             return result;
         }
         function instantiateAnonymousType(type, mapper) {
-            if (mapper.instantiations) {
-                var cachedType = mapper.instantiations[type.id];
-                if (cachedType) {
-                    return cachedType;
-                }
-            }
-            else {
-                mapper.instantiations = [];
-            }
-            // Mark the anonymous type as instantiated such that our infinite instantiation detection logic can recognize it
-            var result = createObjectType(2097152 /* Anonymous */ | 4194304 /* Instantiated */, type.symbol);
-            result.target = type;
-            result.mapper = mapper;
+            var result = createObjectType(16 /* Anonymous */ | 64 /* Instantiated */, type.symbol);
+            result.target = type.objectFlags & 64 /* Instantiated */ ? type.target : type;
+            result.mapper = type.objectFlags & 64 /* Instantiated */ ? combineTypeMappers(type.mapper, mapper) : mapper;
             result.aliasSymbol = type.aliasSymbol;
-            result.aliasTypeArguments = mapper.targetTypes;
-            mapper.instantiations[type.id] = result;
+            result.aliasTypeArguments = instantiateTypes(type.aliasTypeArguments, mapper);
+            return result;
+        }
+        function instantiateMappedType(type, mapper) {
+            var result = createObjectType(32 /* Mapped */ | 64 /* Instantiated */, type.symbol);
+            result.declaration = type.declaration;
+            result.mapper = type.mapper ? combineTypeMappers(type.mapper, mapper) : mapper;
+            result.aliasSymbol = type.aliasSymbol;
+            result.aliasTypeArguments = instantiateTypes(type.aliasTypeArguments, mapper);
             return result;
         }
         function isSymbolInScopeOfMappedTypeParameter(symbol, mapper) {
+            if (!(symbol.declarations && symbol.declarations.length)) {
+                return false;
+            }
             var mappedTypes = mapper.mappedTypes;
             // Starting with the parent of the symbol's declaration, check if the mapper maps any of
             // the type parameters introduced by enclosing declarations. We just pick the first
@@ -28242,23 +29937,23 @@ var ts;
             var node = symbol.declarations[0].parent;
             while (node) {
                 switch (node.kind) {
-                    case 157 /* FunctionType */:
-                    case 158 /* ConstructorType */:
-                    case 221 /* FunctionDeclaration */:
-                    case 148 /* MethodDeclaration */:
-                    case 147 /* MethodSignature */:
-                    case 149 /* Constructor */:
-                    case 152 /* CallSignature */:
-                    case 153 /* ConstructSignature */:
-                    case 154 /* IndexSignature */:
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
-                    case 180 /* FunctionExpression */:
-                    case 181 /* ArrowFunction */:
-                    case 222 /* ClassDeclaration */:
-                    case 193 /* ClassExpression */:
-                    case 223 /* InterfaceDeclaration */:
-                    case 224 /* TypeAliasDeclaration */:
+                    case 158 /* FunctionType */:
+                    case 159 /* ConstructorType */:
+                    case 225 /* FunctionDeclaration */:
+                    case 149 /* MethodDeclaration */:
+                    case 148 /* MethodSignature */:
+                    case 150 /* Constructor */:
+                    case 153 /* CallSignature */:
+                    case 154 /* ConstructSignature */:
+                    case 155 /* IndexSignature */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* SetAccessor */:
+                    case 184 /* FunctionExpression */:
+                    case 185 /* ArrowFunction */:
+                    case 226 /* ClassDeclaration */:
+                    case 197 /* ClassExpression */:
+                    case 227 /* InterfaceDeclaration */:
+                    case 228 /* TypeAliasDeclaration */:
                         var declaration = node;
                         if (declaration.typeParameters) {
                             for (var _i = 0, _a = declaration.typeParameters; _i < _a.length; _i++) {
@@ -28268,27 +29963,63 @@ var ts;
                                 }
                             }
                         }
-                        if (ts.isClassLike(node) || node.kind === 223 /* InterfaceDeclaration */) {
+                        if (ts.isClassLike(node) || node.kind === 227 /* InterfaceDeclaration */) {
                             var thisType = getDeclaredTypeOfClassOrInterface(getSymbolOfNode(node)).thisType;
                             if (thisType && ts.contains(mappedTypes, thisType)) {
                                 return true;
                             }
                         }
                         break;
-                    case 226 /* ModuleDeclaration */:
-                    case 256 /* SourceFile */:
+                    case 230 /* ModuleDeclaration */:
+                    case 261 /* SourceFile */:
                         return false;
                 }
                 node = node.parent;
             }
             return false;
         }
+        function isTopLevelTypeAlias(symbol) {
+            if (symbol.declarations && symbol.declarations.length) {
+                var parentKind = symbol.declarations[0].parent.kind;
+                return parentKind === 261 /* SourceFile */ || parentKind === 231 /* ModuleBlock */;
+            }
+            return false;
+        }
         function instantiateType(type, mapper) {
             if (type && mapper !== identityMapper) {
-                if (type.flags & 16384 /* TypeParameter */) {
-                    return mapper(type);
+                // If we are instantiating a type that has a top-level type alias, obtain the instantiation through
+                // the type alias instead in order to share instantiations for the same type arguments. This can
+                // dramatically reduce the number of structurally identical types we generate. Note that we can only
+                // perform this optimization for top-level type aliases. Consider:
+                //
+                //   function f1<T>(x: T) {
+                //     type Foo<X> = { x: X, t: T };
+                //     let obj: Foo<T> = { x: x };
+                //     return obj;
+                //   }
+                //   function f2<U>(x: U) { return f1(x); }
+                //   let z = f2(42);
+                //
+                // Above, the declaration of f2 has an inferred return type that is an instantiation of f1's Foo<X>
+                // equivalent to { x: U, t: U }. When instantiating this return type, we can't go back to Foo<X>'s
+                // cache because all cached instantiations are of the form { x: ???, t: T }, i.e. they have not been
+                // instantiated for T. Instead, we need to further instantiate the { x: U, t: U } form.
+                if (type.aliasSymbol && isTopLevelTypeAlias(type.aliasSymbol)) {
+                    if (type.aliasTypeArguments) {
+                        return getTypeAliasInstantiation(type.aliasSymbol, instantiateTypes(type.aliasTypeArguments, mapper));
+                    }
+                    return type;
                 }
-                if (type.flags & 2097152 /* Anonymous */) {
+                return instantiateTypeNoAlias(type, mapper);
+            }
+            return type;
+        }
+        function instantiateTypeNoAlias(type, mapper) {
+            if (type.flags & 16384 /* TypeParameter */) {
+                return mapper(type);
+            }
+            if (type.flags & 32768 /* Object */) {
+                if (type.objectFlags & 16 /* Anonymous */) {
                     // 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. We skip instantiation
@@ -28297,19 +30028,28 @@ var ts;
                     // instantiation.
                     return type.symbol &&
                         type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) &&
-                        (type.flags & 4194304 /* Instantiated */ || isSymbolInScopeOfMappedTypeParameter(type.symbol, mapper)) ?
-                        instantiateAnonymousType(type, mapper) : type;
+                        (type.objectFlags & 64 /* Instantiated */ || isSymbolInScopeOfMappedTypeParameter(type.symbol, mapper)) ?
+                        instantiateCached(type, mapper, instantiateAnonymousType) : type;
                 }
-                if (type.flags & 131072 /* Reference */) {
-                    return createTypeReference(type.target, instantiateList(type.typeArguments, mapper, instantiateType));
+                if (type.objectFlags & 32 /* Mapped */) {
+                    return instantiateCached(type, mapper, instantiateMappedType);
                 }
-                if (type.flags & 524288 /* Union */ && !(type.flags & 8190 /* Primitive */)) {
-                    return getUnionType(instantiateList(type.types, mapper, instantiateType), /*subtypeReduction*/ false, type.aliasSymbol, mapper.targetTypes);
-                }
-                if (type.flags & 1048576 /* Intersection */) {
-                    return getIntersectionType(instantiateList(type.types, mapper, instantiateType), type.aliasSymbol, mapper.targetTypes);
+                if (type.objectFlags & 4 /* Reference */) {
+                    return createTypeReference(type.target, instantiateTypes(type.typeArguments, mapper));
                 }
             }
+            if (type.flags & 65536 /* Union */ && !(type.flags & 8190 /* Primitive */)) {
+                return getUnionType(instantiateTypes(type.types, mapper), /*subtypeReduction*/ false, type.aliasSymbol, instantiateTypes(type.aliasTypeArguments, mapper));
+            }
+            if (type.flags & 131072 /* Intersection */) {
+                return getIntersectionType(instantiateTypes(type.types, mapper), type.aliasSymbol, instantiateTypes(type.aliasTypeArguments, mapper));
+            }
+            if (type.flags & 262144 /* Index */) {
+                return getIndexType(instantiateType(type.type, mapper));
+            }
+            if (type.flags & 524288 /* IndexedAccess */) {
+                return getIndexedAccessType(instantiateType(type.objectType, mapper), instantiateType(type.indexType, mapper));
+            }
             return type;
         }
         function instantiateIndexInfo(info, mapper) {
@@ -28318,27 +30058,27 @@ 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 !== 148 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 149 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             switch (node.kind) {
-                case 180 /* FunctionExpression */:
-                case 181 /* ArrowFunction */:
+                case 184 /* FunctionExpression */:
+                case 185 /* ArrowFunction */:
                     return isContextSensitiveFunctionLikeDeclaration(node);
-                case 172 /* ObjectLiteralExpression */:
+                case 176 /* ObjectLiteralExpression */:
                     return ts.forEach(node.properties, isContextSensitive);
-                case 171 /* ArrayLiteralExpression */:
+                case 175 /* ArrayLiteralExpression */:
                     return ts.forEach(node.elements, isContextSensitive);
-                case 189 /* ConditionalExpression */:
+                case 193 /* ConditionalExpression */:
                     return isContextSensitive(node.whenTrue) ||
                         isContextSensitive(node.whenFalse);
-                case 188 /* BinaryExpression */:
+                case 192 /* BinaryExpression */:
                     return node.operatorToken.kind === 53 /* BarBarToken */ &&
                         (isContextSensitive(node.left) || isContextSensitive(node.right));
-                case 253 /* PropertyAssignment */:
+                case 257 /* PropertyAssignment */:
                     return isContextSensitive(node.initializer);
-                case 148 /* MethodDeclaration */:
-                case 147 /* MethodSignature */:
+                case 149 /* MethodDeclaration */:
+                case 148 /* MethodSignature */:
                     return isContextSensitiveFunctionLikeDeclaration(node);
-                case 179 /* ParenthesizedExpression */:
+                case 183 /* ParenthesizedExpression */:
                     return isContextSensitive(node.expression);
             }
             return false;
@@ -28353,7 +30093,7 @@ var ts;
                 return true;
             }
             // For arrow functions we now know we're not context sensitive.
-            if (node.kind === 181 /* ArrowFunction */) {
+            if (node.kind === 185 /* ArrowFunction */) {
                 return false;
             }
             // If the first parameter is not an explicit 'this' parameter, then the function has
@@ -28367,10 +30107,10 @@ var ts;
             return (isFunctionExpressionOrArrowFunction(func) || ts.isObjectLiteralMethod(func)) && isContextSensitiveFunctionLikeDeclaration(func);
         }
         function getTypeWithoutSignatures(type) {
-            if (type.flags & 2588672 /* ObjectType */) {
+            if (type.flags & 32768 /* Object */) {
                 var resolved = resolveStructuredTypeMembers(type);
                 if (resolved.constructSignatures.length) {
-                    var result = createObjectType(2097152 /* Anonymous */, type.symbol);
+                    var result = createObjectType(16 /* Anonymous */, type.symbol);
                     result.members = resolved.members;
                     result.properties = resolved.properties;
                     result.callSignatures = emptyArray;
@@ -28573,7 +30313,7 @@ var ts;
             }
             if (source.symbol.name !== target.symbol.name ||
                 !(source.symbol.flags & 256 /* RegularEnum */) || !(target.symbol.flags & 256 /* RegularEnum */) ||
-                (source.flags & 524288 /* Union */) !== (target.flags & 524288 /* Union */)) {
+                (source.flags & 65536 /* Union */) !== (target.flags & 65536 /* Union */)) {
                 return enumRelation[id] = false;
             }
             var targetEnumType = getTypeOfSymbol(target.symbol);
@@ -28630,23 +30370,23 @@ var ts;
             return false;
         }
         function isTypeRelatedTo(source, target, relation) {
-            if (source.flags & 96 /* StringOrNumberLiteral */ && source.flags & 16777216 /* FreshLiteral */) {
+            if (source.flags & 96 /* StringOrNumberLiteral */ && source.flags & 1048576 /* FreshLiteral */) {
                 source = source.regularType;
             }
-            if (target.flags & 96 /* StringOrNumberLiteral */ && target.flags & 16777216 /* FreshLiteral */) {
+            if (target.flags & 96 /* StringOrNumberLiteral */ && target.flags & 1048576 /* FreshLiteral */) {
                 target = target.regularType;
             }
             if (source === target || relation !== identityRelation && isSimpleTypeRelatedTo(source, target, relation)) {
                 return true;
             }
-            if (source.flags & 2588672 /* ObjectType */ && target.flags & 2588672 /* ObjectType */) {
+            if (source.flags & 32768 /* Object */ && target.flags & 32768 /* Object */) {
                 var id = relation !== identityRelation || source.id < target.id ? source.id + "," + target.id : target.id + "," + source.id;
                 var related = relation[id];
                 if (related !== undefined) {
                     return related === 1 /* Succeeded */;
                 }
             }
-            if (source.flags & 4177920 /* StructuredOrTypeParameter */ || target.flags & 4177920 /* StructuredOrTypeParameter */) {
+            if (source.flags & 507904 /* StructuredOrTypeParameter */ || target.flags & 507904 /* StructuredOrTypeParameter */) {
                 return checkTypeRelatedTo(source, target, relation, undefined, undefined, undefined);
             }
             return false;
@@ -28693,9 +30433,15 @@ var ts;
                     targetType = typeToString(target, /*enclosingDeclaration*/ undefined, 128 /* UseFullyQualifiedType */);
                 }
                 if (!message) {
-                    message = relation === comparableRelation ?
-                        ts.Diagnostics.Type_0_is_not_comparable_to_type_1 :
-                        ts.Diagnostics.Type_0_is_not_assignable_to_type_1;
+                    if (relation === comparableRelation) {
+                        message = ts.Diagnostics.Type_0_is_not_comparable_to_type_1;
+                    }
+                    else if (sourceType === targetType) {
+                        message = ts.Diagnostics.Type_0_is_not_assignable_to_type_1_Two_different_types_with_this_name_exist_but_they_are_unrelated;
+                    }
+                    else {
+                        message = ts.Diagnostics.Type_0_is_not_assignable_to_type_1;
+                    }
                 }
                 reportError(message, sourceType, targetType);
             }
@@ -28715,10 +30461,10 @@ var ts;
             // Ternary.False if they are not related.
             function isRelatedTo(source, target, reportErrors, headMessage) {
                 var result;
-                if (source.flags & 96 /* StringOrNumberLiteral */ && source.flags & 16777216 /* FreshLiteral */) {
+                if (source.flags & 96 /* StringOrNumberLiteral */ && source.flags & 1048576 /* FreshLiteral */) {
                     source = source.regularType;
                 }
-                if (target.flags & 96 /* StringOrNumberLiteral */ && target.flags & 16777216 /* FreshLiteral */) {
+                if (target.flags & 96 /* StringOrNumberLiteral */ && target.flags & 1048576 /* FreshLiteral */) {
                     target = target.regularType;
                 }
                 // both types are the same - covers 'they are the same primitive type or both are Any' or the same type parameter cases
@@ -28729,7 +30475,13 @@ var ts;
                 }
                 if (isSimpleTypeRelatedTo(source, target, relation, reportErrors ? reportError : undefined))
                     return -1 /* True */;
-                if (source.flags & 8388608 /* ObjectLiteral */ && source.flags & 16777216 /* FreshLiteral */) {
+                if (source.flags & 262144 /* Index */) {
+                    // A keyof T is related to a union type containing both string and number
+                    if (maybeTypeOfKind(target, 2 /* String */) && maybeTypeOfKind(target, 4 /* Number */)) {
+                        return -1 /* True */;
+                    }
+                }
+                if (getObjectFlags(source) & 128 /* ObjectLiteral */ && source.flags & 1048576 /* FreshLiteral */) {
                     if (hasExcessProperties(source, target, reportErrors)) {
                         if (reportErrors) {
                             reportRelationError(headMessage, source, target);
@@ -28740,13 +30492,15 @@ var ts;
                     // 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 (target.flags & 1572864 /* UnionOrIntersection */) {
+                    if (target.flags & 196608 /* UnionOrIntersection */) {
                         source = getRegularTypeOfObjectLiteral(source);
                     }
                 }
                 var saveErrorInfo = errorInfo;
-                // Note that these checks are specifically ordered to produce correct results.
-                if (source.flags & 524288 /* Union */) {
+                // Note that these checks are specifically ordered to produce correct results. In particular,
+                // we need to deconstruct unions before intersections (because unions are always at the top),
+                // and we need to handle "each" relations before "some" relations for the same kind of type.
+                if (source.flags & 65536 /* Union */) {
                     if (relation === comparableRelation) {
                         result = someTypeRelatedToType(source, target, reportErrors && !(source.flags & 8190 /* Primitive */));
                     }
@@ -28757,36 +30511,56 @@ var ts;
                         return result;
                     }
                 }
-                else if (target.flags & 1048576 /* Intersection */) {
-                    result = typeRelatedToEachType(source, target, reportErrors);
-                    if (result) {
+                else if (target.flags & 65536 /* Union */) {
+                    if (result = typeRelatedToSomeType(source, target, reportErrors && !(source.flags & 8190 /* Primitive */) && !(target.flags & 8190 /* Primitive */))) {
                         return result;
                     }
                 }
-                else {
-                    // It is necessary to try these "some" checks on both sides because there may be nested "each" checks
-                    // on either side that need to be prioritized. For example, A | B = (A | B) & (C | D) or
-                    // A & B = (A & B) | (C & D).
-                    if (source.flags & 1048576 /* Intersection */) {
-                        // Check to see if any constituents of the intersection are immediately related to the target.
-                        //
-                        // Don't report errors though. Checking whether a constituent is related to the source is not actually
-                        // useful and leads to some confusing error messages. Instead it is better to let the below checks
-                        // take care of this, or to not elaborate at all. For instance,
-                        //
-                        //    - For an object type (such as 'C = A & B'), users are usually more interested in structural errors.
-                        //
-                        //    - For a union type (such as '(A | B) = (C & D)'), it's better to hold onto the whole intersection
-                        //          than to report that 'D' is not assignable to 'A' or 'B'.
-                        //
-                        //    - For a primitive type or type parameter (such as 'number = A & B') there is no point in
-                        //          breaking the intersection apart.
-                        if (result = someTypeRelatedToType(source, target, /*reportErrors*/ false)) {
+                else if (target.flags & 131072 /* Intersection */) {
+                    if (result = typeRelatedToEachType(source, target, reportErrors)) {
+                        return result;
+                    }
+                }
+                else if (source.flags & 131072 /* Intersection */) {
+                    // Check to see if any constituents of the intersection are immediately related to the target.
+                    //
+                    // Don't report errors though. Checking whether a constituent is related to the source is not actually
+                    // useful and leads to some confusing error messages. Instead it is better to let the below checks
+                    // take care of this, or to not elaborate at all. For instance,
+                    //
+                    //    - For an object type (such as 'C = A & B'), users are usually more interested in structural errors.
+                    //
+                    //    - For a union type (such as '(A | B) = (C & D)'), it's better to hold onto the whole intersection
+                    //          than to report that 'D' is not assignable to 'A' or 'B'.
+                    //
+                    //    - For a primitive type or type parameter (such as 'number = A & B') there is no point in
+                    //          breaking the intersection apart.
+                    if (result = someTypeRelatedToType(source, target, /*reportErrors*/ false)) {
+                        return result;
+                    }
+                }
+                if (target.flags & 16384 /* TypeParameter */) {
+                    // Given a type parameter K with a constraint keyof T, a type S is
+                    // assignable to K if S is assignable to keyof T.
+                    var constraint = getConstraintOfTypeParameter(target);
+                    if (constraint && constraint.flags & 262144 /* Index */) {
+                        if (result = isRelatedTo(source, constraint, reportErrors)) {
                             return result;
                         }
                     }
-                    if (target.flags & 524288 /* Union */) {
-                        if (result = typeRelatedToSomeType(source, target, reportErrors && !(source.flags & 8190 /* Primitive */) && !(target.flags & 8190 /* Primitive */))) {
+                }
+                else if (target.flags & 262144 /* Index */) {
+                    // A keyof S is related to a keyof T if T is related to S.
+                    if (source.flags & 262144 /* Index */) {
+                        if (result = isRelatedTo(target.type, source.type, /*reportErrors*/ false)) {
+                            return result;
+                        }
+                    }
+                    // Given a type parameter T with a constraint C, a type S is assignable to
+                    // keyof T if S is assignable to keyof C.
+                    var constraint = getConstraintOfTypeParameter(target.type);
+                    if (constraint) {
+                        if (result = isRelatedTo(source, getIndexType(constraint), reportErrors)) {
                             return result;
                         }
                     }
@@ -28806,32 +30580,43 @@ var ts;
                     }
                 }
                 else {
-                    if (source.flags & 131072 /* Reference */ && target.flags & 131072 /* Reference */ && source.target === target.target) {
+                    if (getObjectFlags(source) & 4 /* Reference */ && getObjectFlags(target) & 4 /* Reference */ && source.target === target.target) {
                         // We have type references to same target type, see if relationship holds for all type arguments
                         if (result = typeArgumentsRelatedTo(source, target, reportErrors)) {
                             return result;
                         }
                     }
-                    // Even if relationship doesn't hold for unions, intersections, or generic type references,
-                    // it may hold in a structural comparison.
-                    var apparentSource = getApparentType(source);
-                    // In a check of the form X = A & B, we will have previously checked if A relates to X or B relates
-                    // to X. Failing both of those we want to check if the aggregation of A and B's members structurally
-                    // relates to X. Thus, we include intersection types on the source side here.
-                    if (apparentSource.flags & (2588672 /* ObjectType */ | 1048576 /* Intersection */) && target.flags & 2588672 /* ObjectType */) {
-                        // Report structural errors only if we haven't reported any errors yet
-                        var reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo && !(source.flags & 8190 /* Primitive */);
-                        if (result = objectTypeRelatedTo(apparentSource, source, target, reportStructuralErrors)) {
-                            errorInfo = saveErrorInfo;
-                            return result;
+                    if (isGenericMappedType(target)) {
+                        // A type [P in S]: X is related to a type [P in T]: Y if T is related to S and X is related to Y.
+                        if (isGenericMappedType(source)) {
+                            if ((result = isRelatedTo(getConstraintTypeFromMappedType(target), getConstraintTypeFromMappedType(source), reportErrors)) &&
+                                (result = isRelatedTo(getTemplateTypeFromMappedType(source), getTemplateTypeFromMappedType(target), reportErrors))) {
+                                return result;
+                            }
+                        }
+                    }
+                    else {
+                        // Even if relationship doesn't hold for unions, intersections, or generic type references,
+                        // it may hold in a structural comparison.
+                        var apparentSource = getApparentType(source);
+                        // In a check of the form X = A & B, we will have previously checked if A relates to X or B relates
+                        // to X. Failing both of those we want to check if the aggregation of A and B's members structurally
+                        // relates to X. Thus, we include intersection types on the source side here.
+                        if (apparentSource.flags & (32768 /* Object */ | 131072 /* Intersection */) && target.flags & 32768 /* Object */) {
+                            // Report structural errors only if we haven't reported any errors yet
+                            var reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo && !(source.flags & 8190 /* Primitive */);
+                            if (result = objectTypeRelatedTo(apparentSource, source, target, reportStructuralErrors)) {
+                                errorInfo = saveErrorInfo;
+                                return result;
+                            }
                         }
                     }
                 }
                 if (reportErrors) {
-                    if (source.flags & 2588672 /* ObjectType */ && target.flags & 8190 /* Primitive */) {
+                    if (source.flags & 32768 /* Object */ && target.flags & 8190 /* Primitive */) {
                         tryElaborateErrorsForPrimitivesAndObjects(source, target);
                     }
-                    else if (source.symbol && source.flags & 2588672 /* ObjectType */ && globalObjectType === source) {
+                    else if (source.symbol && source.flags & 32768 /* Object */ && globalObjectType === source) {
                         reportError(ts.Diagnostics.The_Object_type_is_assignable_to_very_few_other_types_Did_you_mean_to_use_the_any_type_instead);
                     }
                     reportRelationError(headMessage, source, target);
@@ -28840,8 +30625,8 @@ var ts;
             }
             function isIdenticalTo(source, target) {
                 var result;
-                if (source.flags & 2588672 /* ObjectType */ && target.flags & 2588672 /* ObjectType */) {
-                    if (source.flags & 131072 /* Reference */ && target.flags & 131072 /* Reference */ && source.target === target.target) {
+                if (source.flags & 32768 /* Object */ && target.flags & 32768 /* Object */) {
+                    if (getObjectFlags(source) & 4 /* Reference */ && getObjectFlags(target) & 4 /* Reference */ && source.target === target.target) {
                         // We have type references to same target type, see if all type arguments are identical
                         if (result = typeArgumentsRelatedTo(source, target, /*reportErrors*/ false)) {
                             return result;
@@ -28849,8 +30634,8 @@ var ts;
                     }
                     return objectTypeRelatedTo(source, source, target, /*reportErrors*/ false);
                 }
-                if (source.flags & 524288 /* Union */ && target.flags & 524288 /* Union */ ||
-                    source.flags & 1048576 /* Intersection */ && target.flags & 1048576 /* Intersection */) {
+                if (source.flags & 65536 /* Union */ && target.flags & 65536 /* Union */ ||
+                    source.flags & 131072 /* Intersection */ && target.flags & 131072 /* Intersection */) {
                     if (result = eachTypeRelatedToSomeType(source, target)) {
                         if (result &= eachTypeRelatedToSomeType(target, source)) {
                             return result;
@@ -28864,7 +30649,7 @@ var ts;
             // index signatures, or if the property is actually declared in the object type. In a union or intersection
             // type, a property is considered known if it is known in any constituent type.
             function isKnownProperty(type, name) {
-                if (type.flags & 2588672 /* ObjectType */) {
+                if (type.flags & 32768 /* Object */) {
                     var resolved = resolveStructuredTypeMembers(type);
                     if ((relation === assignableRelation || relation === comparableRelation) && (type === globalObjectType || isEmptyObjectType(resolved)) ||
                         resolved.stringIndexInfo ||
@@ -28873,7 +30658,7 @@ var ts;
                         return true;
                     }
                 }
-                else if (type.flags & 1572864 /* UnionOrIntersection */) {
+                else if (type.flags & 196608 /* UnionOrIntersection */) {
                     for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                         var t = _a[_i];
                         if (isKnownProperty(t, name)) {
@@ -28891,8 +30676,7 @@ var ts;
                     !t.numberIndexInfo;
             }
             function hasExcessProperties(source, target, reportErrors) {
-                if (maybeTypeOfKind(target, 2588672 /* ObjectType */) &&
-                    (!(target.flags & 2588672 /* ObjectType */) || !target.isObjectLiteralPatternWithComputedProperties)) {
+                if (maybeTypeOfKind(target, 32768 /* Object */) && !(getObjectFlags(target) & 512 /* ObjectLiteralPatternWithComputedProperties */)) {
                     for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
                         var prop = _a[_i];
                         if (!isKnownProperty(target, prop.name)) {
@@ -28925,7 +30709,7 @@ var ts;
             }
             function typeRelatedToSomeType(source, target, reportErrors) {
                 var targetTypes = target.types;
-                if (target.flags & 524288 /* Union */ && containsType(targetTypes, source)) {
+                if (target.flags & 65536 /* Union */ && containsType(targetTypes, source)) {
                     return -1 /* True */;
                 }
                 var len = targetTypes.length;
@@ -28952,7 +30736,7 @@ var ts;
             }
             function someTypeRelatedToType(source, target, reportErrors) {
                 var sourceTypes = source.types;
-                if (source.flags & 524288 /* Union */ && containsType(sourceTypes, target)) {
+                if (source.flags & 65536 /* Union */ && containsType(sourceTypes, target)) {
                     return -1 /* True */;
                 }
                 var len = sourceTypes.length;
@@ -29083,9 +30867,9 @@ var ts;
                 }
                 var result = -1 /* True */;
                 var properties = getPropertiesOfObjectType(target);
-                var requireOptionalProperties = relation === subtypeRelation && !(source.flags & 8388608 /* ObjectLiteral */);
-                for (var _i = 0, properties_2 = properties; _i < properties_2.length; _i++) {
-                    var targetProp = properties_2[_i];
+                var requireOptionalProperties = relation === subtypeRelation && !(getObjectFlags(source) & 128 /* ObjectLiteral */);
+                for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
+                    var targetProp = properties_3[_i];
                     var sourceProp = getPropertyOfType(source, targetProp.name);
                     if (sourceProp !== targetProp) {
                         if (!sourceProp) {
@@ -29137,7 +30921,8 @@ var ts;
                                 return 0 /* False */;
                             }
                             result &= related;
-                            if (sourceProp.flags & 536870912 /* Optional */ && !(targetProp.flags & 536870912 /* Optional */)) {
+                            // When checking for comparability, be more lenient with optional properties.
+                            if (relation !== comparableRelation && sourceProp.flags & 536870912 /* Optional */ && !(targetProp.flags & 536870912 /* 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..
@@ -29156,7 +30941,7 @@ var ts;
                 return result;
             }
             function propertiesIdenticalTo(source, target) {
-                if (!(source.flags & 2588672 /* ObjectType */ && target.flags & 2588672 /* ObjectType */)) {
+                if (!(source.flags & 32768 /* Object */ && target.flags & 32768 /* Object */)) {
                     return 0 /* False */;
                 }
                 var sourceProperties = getPropertiesOfObjectType(source);
@@ -29341,7 +31126,7 @@ var ts;
         }
         // Return true if the given type is the constructor type for an abstract class
         function isAbstractConstructorType(type) {
-            if (type.flags & 2097152 /* Anonymous */) {
+            if (getObjectFlags(type) & 16 /* Anonymous */) {
                 var symbol = type.symbol;
                 if (symbol && symbol.flags & 32 /* Class */) {
                     var declaration = getClassLikeDeclarationOfSymbol(symbol);
@@ -29359,12 +31144,12 @@ var ts;
         // some level beyond that.
         function isDeeplyNestedGeneric(type, stack, depth) {
             // We track type references (created by createTypeReference) and instantiated types (created by instantiateType)
-            if (type.flags & (131072 /* Reference */ | 4194304 /* Instantiated */) && depth >= 5) {
+            if (getObjectFlags(type) & (4 /* Reference */ | 64 /* Instantiated */) && depth >= 5) {
                 var symbol = type.symbol;
                 var count = 0;
                 for (var i = 0; i < depth; i++) {
                     var t = stack[i];
-                    if (t.flags & (131072 /* Reference */ | 4194304 /* Instantiated */) && t.symbol === symbol) {
+                    if (getObjectFlags(t) & (4 /* Reference */ | 64 /* Instantiated */) && t.symbol === symbol) {
                         count++;
                         if (count >= 5)
                             return true;
@@ -29550,12 +31335,12 @@ var ts;
             checkTypeSubtypeOf(bestSupertypeDownfallType, bestSupertype, errorLocation, ts.Diagnostics.Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0, errorMessageChainHead);
         }
         function isArrayType(type) {
-            return type.flags & 131072 /* Reference */ && type.target === globalArrayType;
+            return getObjectFlags(type) & 4 /* Reference */ && type.target === globalArrayType;
         }
         function isArrayLikeType(type) {
             // A type is array-like if it is a reference to the global Array or global ReadonlyArray type,
             // or if it is not the undefined or null type and if it is assignable to ReadonlyArray<any>
-            return type.flags & 131072 /* Reference */ && (type.target === globalArrayType || type.target === globalReadonlyArrayType) ||
+            return getObjectFlags(type) & 4 /* Reference */ && (type.target === globalArrayType || type.target === globalReadonlyArrayType) ||
                 !(type.flags & 6144 /* Nullable */) && isTypeAssignableTo(type, anyReadonlyArrayType);
         }
         function isTupleLikeType(type) {
@@ -29566,7 +31351,7 @@ var ts;
         }
         function isLiteralType(type) {
             return type.flags & 8 /* Boolean */ ? true :
-                type.flags & 524288 /* Union */ ? type.flags & 16 /* Enum */ ? true : !ts.forEach(type.types, function (t) { return !isUnitType(t); }) :
+                type.flags & 65536 /* Union */ ? type.flags & 16 /* Enum */ ? true : !ts.forEach(type.types, function (t) { return !isUnitType(t); }) :
                     isUnitType(type);
         }
         function getBaseTypeOfLiteralType(type) {
@@ -29574,15 +31359,15 @@ var ts;
                 type.flags & 64 /* NumberLiteral */ ? numberType :
                     type.flags & 128 /* BooleanLiteral */ ? booleanType :
                         type.flags & 256 /* EnumLiteral */ ? type.baseType :
-                            type.flags & 524288 /* Union */ && !(type.flags & 16 /* Enum */) ? getUnionType(ts.sameMap(type.types, getBaseTypeOfLiteralType)) :
+                            type.flags & 65536 /* Union */ && !(type.flags & 16 /* Enum */) ? getUnionType(ts.sameMap(type.types, getBaseTypeOfLiteralType)) :
                                 type;
         }
         function getWidenedLiteralType(type) {
-            return type.flags & 32 /* StringLiteral */ && type.flags & 16777216 /* FreshLiteral */ ? stringType :
-                type.flags & 64 /* NumberLiteral */ && type.flags & 16777216 /* FreshLiteral */ ? numberType :
+            return type.flags & 32 /* StringLiteral */ && type.flags & 1048576 /* FreshLiteral */ ? stringType :
+                type.flags & 64 /* NumberLiteral */ && type.flags & 1048576 /* FreshLiteral */ ? numberType :
                     type.flags & 128 /* BooleanLiteral */ ? booleanType :
                         type.flags & 256 /* EnumLiteral */ ? type.baseType :
-                            type.flags & 524288 /* Union */ && !(type.flags & 16 /* Enum */) ? getUnionType(ts.sameMap(type.types, getWidenedLiteralType)) :
+                            type.flags & 65536 /* Union */ && !(type.flags & 16 /* Enum */) ? getUnionType(ts.sameMap(type.types, getWidenedLiteralType)) :
                                 type;
         }
         /**
@@ -29590,7 +31375,7 @@ var ts;
          * Prefer using isTupleLikeType() unless the use of `elementTypes` is required.
          */
         function isTupleType(type) {
-            return !!(type.flags & 131072 /* Reference */ && type.target.flags & 262144 /* Tuple */);
+            return !!(getObjectFlags(type) & 4 /* Reference */ && type.target.objectFlags & 8 /* Tuple */);
         }
         function getFalsyFlagsOfTypes(types) {
             var result = 0;
@@ -29604,7 +31389,7 @@ var ts;
         // flags for the string, number, boolean, "", 0, false, void, undefined, or null types respectively. Returns
         // no flags for all other types (including non-falsy literal types).
         function getFalsyFlags(type) {
-            return type.flags & 524288 /* Union */ ? getFalsyFlagsOfTypes(type.types) :
+            return type.flags & 65536 /* Union */ ? getFalsyFlagsOfTypes(type.types) :
                 type.flags & 32 /* StringLiteral */ ? type.text === "" ? 32 /* StringLiteral */ : 0 :
                     type.flags & 64 /* NumberLiteral */ ? type.text === "0" ? 64 /* NumberLiteral */ : 0 :
                         type.flags & 128 /* BooleanLiteral */ ? type === falseType ? 128 /* BooleanLiteral */ : 0 :
@@ -29674,7 +31459,7 @@ var ts;
          * Leave signatures alone since they are not subject to the check.
          */
         function getRegularTypeOfObjectLiteral(type) {
-            if (!(type.flags & 8388608 /* ObjectLiteral */ && type.flags & 16777216 /* FreshLiteral */)) {
+            if (!(getObjectFlags(type) & 128 /* ObjectLiteral */ && type.flags & 1048576 /* FreshLiteral */)) {
                 return type;
             }
             var regularType = type.regularType;
@@ -29684,7 +31469,8 @@ var ts;
             var resolved = type;
             var members = transformTypeOfMembers(type, getRegularTypeOfObjectLiteral);
             var regularNew = createAnonymousType(resolved.symbol, members, resolved.callSignatures, resolved.constructSignatures, resolved.stringIndexInfo, resolved.numberIndexInfo);
-            regularNew.flags = resolved.flags & ~16777216 /* FreshLiteral */;
+            regularNew.flags = resolved.flags & ~1048576 /* FreshLiteral */;
+            regularNew.objectFlags |= 128 /* ObjectLiteral */;
             type.regularType = regularNew;
             return regularNew;
         }
@@ -29701,14 +31487,14 @@ var ts;
             return type.flags & 6144 /* Nullable */ ? type : getWidenedType(type);
         }
         function getWidenedType(type) {
-            if (type.flags & 100663296 /* RequiresWidening */) {
+            if (type.flags & 6291456 /* RequiresWidening */) {
                 if (type.flags & 6144 /* Nullable */) {
                     return anyType;
                 }
-                if (type.flags & 8388608 /* ObjectLiteral */) {
+                if (getObjectFlags(type) & 128 /* ObjectLiteral */) {
                     return getWidenedTypeOfObjectLiteral(type);
                 }
-                if (type.flags & 524288 /* Union */) {
+                if (type.flags & 65536 /* Union */) {
                     return getUnionType(ts.sameMap(type.types, getWidenedConstituentType));
                 }
                 if (isArrayType(type) || isTupleType(type)) {
@@ -29730,7 +31516,7 @@ var ts;
          */
         function reportWideningErrorsInType(type) {
             var errorReported = false;
-            if (type.flags & 524288 /* Union */) {
+            if (type.flags & 65536 /* Union */) {
                 for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                     var t = _a[_i];
                     if (reportWideningErrorsInType(t)) {
@@ -29746,11 +31532,11 @@ var ts;
                     }
                 }
             }
-            if (type.flags & 8388608 /* ObjectLiteral */) {
+            if (getObjectFlags(type) & 128 /* ObjectLiteral */) {
                 for (var _d = 0, _e = getPropertiesOfObjectType(type); _d < _e.length; _d++) {
                     var p = _e[_d];
                     var t = getTypeOfSymbol(p);
-                    if (t.flags & 33554432 /* ContainsWideningType */) {
+                    if (t.flags & 2097152 /* ContainsWideningType */) {
                         if (!reportWideningErrorsInType(t)) {
                             error(p.valueDeclaration, ts.Diagnostics.Object_literal_s_property_0_implicitly_has_an_1_type, p.name, typeToString(getWidenedType(t)));
                         }
@@ -29764,25 +31550,25 @@ var ts;
             var typeAsString = typeToString(getWidenedType(type));
             var diagnostic;
             switch (declaration.kind) {
-                case 146 /* PropertyDeclaration */:
-                case 145 /* PropertySignature */:
+                case 147 /* PropertyDeclaration */:
+                case 146 /* PropertySignature */:
                     diagnostic = ts.Diagnostics.Member_0_implicitly_has_an_1_type;
                     break;
-                case 143 /* Parameter */:
+                case 144 /* Parameter */:
                     diagnostic = declaration.dotDotDotToken ?
                         ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type :
                         ts.Diagnostics.Parameter_0_implicitly_has_an_1_type;
                     break;
-                case 170 /* BindingElement */:
+                case 174 /* BindingElement */:
                     diagnostic = ts.Diagnostics.Binding_element_0_implicitly_has_an_1_type;
                     break;
-                case 221 /* FunctionDeclaration */:
-                case 148 /* MethodDeclaration */:
-                case 147 /* MethodSignature */:
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
-                case 180 /* FunctionExpression */:
-                case 181 /* ArrowFunction */:
+                case 225 /* FunctionDeclaration */:
+                case 149 /* MethodDeclaration */:
+                case 148 /* MethodSignature */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
+                case 184 /* FunctionExpression */:
+                case 185 /* ArrowFunction */:
                     if (!declaration.name) {
                         error(declaration, ts.Diagnostics.Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
                         return;
@@ -29795,7 +31581,7 @@ var ts;
             error(declaration, diagnostic, ts.declarationNameToString(declaration.name), typeAsString);
         }
         function reportErrorsFromWidening(declaration, type) {
-            if (produceDiagnostics && compilerOptions.noImplicitAny && type.flags & 33554432 /* ContainsWideningType */) {
+            if (produceDiagnostics && compilerOptions.noImplicitAny && type.flags & 2097152 /* ContainsWideningType */) {
                 // Report implicit any error within type if possible, otherwise report error on declaration
                 if (!reportWideningErrorsInType(type)) {
                     reportImplicitAnyError(declaration, type);
@@ -29843,10 +31629,12 @@ var ts;
         // we perform type inference (i.e. a type parameter of a generic function). We cache
         // results for union and intersection types for performance reasons.
         function couldContainTypeParameters(type) {
+            var objectFlags = getObjectFlags(type);
             return !!(type.flags & 16384 /* TypeParameter */ ||
-                type.flags & 131072 /* Reference */ && ts.forEach(type.typeArguments, couldContainTypeParameters) ||
-                type.flags & 2097152 /* Anonymous */ && type.symbol && type.symbol.flags & (8192 /* Method */ | 2048 /* TypeLiteral */ | 32 /* Class */) ||
-                type.flags & 1572864 /* UnionOrIntersection */ && couldUnionOrIntersectionContainTypeParameters(type));
+                objectFlags & 4 /* Reference */ && ts.forEach(type.typeArguments, couldContainTypeParameters) ||
+                objectFlags & 16 /* Anonymous */ && type.symbol && type.symbol.flags & (8192 /* Method */ | 2048 /* TypeLiteral */ | 32 /* Class */) ||
+                objectFlags & 32 /* Mapped */ ||
+                type.flags & 196608 /* UnionOrIntersection */ && couldUnionOrIntersectionContainTypeParameters(type));
         }
         function couldUnionOrIntersectionContainTypeParameters(type) {
             if (type.couldContainTypeParameters === undefined) {
@@ -29855,7 +31643,7 @@ var ts;
             return type.couldContainTypeParameters;
         }
         function isTypeParameterAtTopLevel(type, typeParameter) {
-            return type === typeParameter || type.flags & 1572864 /* UnionOrIntersection */ && ts.forEach(type.types, function (t) { return isTypeParameterAtTopLevel(t, typeParameter); });
+            return type === typeParameter || type.flags & 196608 /* UnionOrIntersection */ && ts.forEach(type.types, function (t) { return isTypeParameterAtTopLevel(t, typeParameter); });
         }
         function inferTypes(context, originalSource, originalTarget) {
             var typeParameters = context.signature.typeParameters;
@@ -29877,8 +31665,18 @@ var ts;
                 if (!couldContainTypeParameters(target)) {
                     return;
                 }
-                if (source.flags & 524288 /* Union */ && target.flags & 524288 /* Union */ && !(source.flags & 16 /* Enum */ && target.flags & 16 /* Enum */) ||
-                    source.flags & 1048576 /* Intersection */ && target.flags & 1048576 /* Intersection */) {
+                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]);
+                    }
+                    return;
+                }
+                if (source.flags & 65536 /* Union */ && target.flags & 65536 /* Union */ && !(source.flags & 16 /* Enum */ && target.flags & 16 /* Enum */) ||
+                    source.flags & 131072 /* Intersection */ && target.flags & 131072 /* 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) {
@@ -29923,7 +31721,7 @@ var ts;
                     // it as an inference candidate. Hopefully, a better candidate will come along that does
                     // not contain anyFunctionType when we come back to this argument for its second round
                     // of inference.
-                    if (source.flags & 134217728 /* ContainsAnyFunctionType */) {
+                    if (source.flags & 8388608 /* ContainsAnyFunctionType */) {
                         return;
                     }
                     for (var i = 0; i < typeParameters.length; i++) {
@@ -29950,7 +31748,7 @@ var ts;
                         }
                     }
                 }
-                else if (source.flags & 131072 /* Reference */ && target.flags & 131072 /* Reference */ && source.target === target.target) {
+                else if (getObjectFlags(source) & 4 /* Reference */ && getObjectFlags(target) & 4 /* Reference */ && source.target === target.target) {
                     // If source and target are references to the same generic type, infer from type arguments
                     var sourceTypes = source.typeArguments || emptyArray;
                     var targetTypes = target.typeArguments || emptyArray;
@@ -29959,7 +31757,7 @@ var ts;
                         inferFromTypes(sourceTypes[i], targetTypes[i]);
                     }
                 }
-                else if (target.flags & 1572864 /* UnionOrIntersection */) {
+                else if (target.flags & 196608 /* UnionOrIntersection */) {
                     var targetTypes = target.types;
                     var typeParameterCount = 0;
                     var typeParameter = void 0;
@@ -29983,7 +31781,7 @@ var ts;
                         inferiority--;
                     }
                 }
-                else if (source.flags & 1572864 /* UnionOrIntersection */) {
+                else if (source.flags & 196608 /* UnionOrIntersection */) {
                     // Source is a union or intersection type, infer from each constituent type
                     var sourceTypes = source.types;
                     for (var _e = 0, sourceTypes_3 = sourceTypes; _e < sourceTypes_3.length; _e++) {
@@ -29992,8 +31790,21 @@ var ts;
                     }
                 }
                 else {
+                    if (getObjectFlags(target) & 32 /* Mapped */) {
+                        var constraintType = getConstraintTypeFromMappedType(target);
+                        if (getObjectFlags(source) & 32 /* Mapped */) {
+                            inferFromTypes(getConstraintTypeFromMappedType(source), constraintType);
+                            inferFromTypes(getTemplateTypeFromMappedType(source), getTemplateTypeFromMappedType(target));
+                            return;
+                        }
+                        if (constraintType.flags & 16384 /* TypeParameter */) {
+                            inferFromTypes(getIndexType(source), constraintType);
+                            inferFromTypes(getUnionType(ts.map(getPropertiesOfType(source), getTypeOfSymbol)), getTemplateTypeFromMappedType(target));
+                            return;
+                        }
+                    }
                     source = getApparentType(source);
-                    if (source.flags & 2588672 /* ObjectType */) {
+                    if (source.flags & 32768 /* Object */) {
                         if (isInProcess(source, target)) {
                             return;
                         }
@@ -30022,8 +31833,8 @@ var ts;
             }
             function inferFromProperties(source, target) {
                 var properties = getPropertiesOfObjectType(target);
-                for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
-                    var targetProp = properties_3[_i];
+                for (var _i = 0, properties_4 = properties; _i < properties_4.length; _i++) {
+                    var targetProp = properties_4[_i];
                     var sourceProp = getPropertyOfObjectType(source, targetProp.name);
                     if (sourceProp) {
                         inferFromTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp));
@@ -30093,7 +31904,7 @@ var ts;
                     reducedTypes.push(t);
                 }
             }
-            return type.flags & 524288 /* Union */ ? getUnionType(reducedTypes) : getIntersectionType(reducedTypes);
+            return type.flags & 65536 /* Union */ ? getUnionType(reducedTypes) : getIntersectionType(reducedTypes);
         }
         function getInferenceCandidates(context, index) {
             var inferences = context.inferences[index];
@@ -30101,7 +31912,7 @@ var ts;
         }
         function hasPrimitiveConstraint(type) {
             var constraint = getConstraintOfTypeParameter(type);
-            return constraint && maybeTypeOfKind(constraint, 8190 /* Primitive */);
+            return constraint && maybeTypeOfKind(constraint, 8190 /* Primitive */ | 262144 /* Index */);
         }
         function getInferredType(context, index) {
             var inferredType = context.inferredTypes[index];
@@ -30171,10 +31982,10 @@ var ts;
             // The expression is restricted to a single identifier or a sequence of identifiers separated by periods
             while (node) {
                 switch (node.kind) {
-                    case 159 /* TypeQuery */:
+                    case 160 /* TypeQuery */:
                         return true;
                     case 70 /* Identifier */:
-                    case 140 /* QualifiedName */:
+                    case 141 /* QualifiedName */:
                         node = node.parent;
                         continue;
                     default:
@@ -30195,7 +32006,7 @@ var ts;
             if (node.kind === 98 /* ThisKeyword */) {
                 return "0";
             }
-            if (node.kind === 173 /* PropertyAccessExpression */) {
+            if (node.kind === 177 /* PropertyAccessExpression */) {
                 var key = getFlowCacheKey(node.expression);
                 return key && key + "." + node.name.text;
             }
@@ -30206,7 +32017,7 @@ var ts;
                 case 70 /* Identifier */:
                 case 98 /* ThisKeyword */:
                     return node;
-                case 173 /* PropertyAccessExpression */:
+                case 177 /* PropertyAccessExpression */:
                     return getLeftmostIdentifierOrThis(node.expression);
             }
             return undefined;
@@ -30215,19 +32026,19 @@ var ts;
             switch (source.kind) {
                 case 70 /* Identifier */:
                     return target.kind === 70 /* Identifier */ && getResolvedSymbol(source) === getResolvedSymbol(target) ||
-                        (target.kind === 219 /* VariableDeclaration */ || target.kind === 170 /* BindingElement */) &&
+                        (target.kind === 223 /* VariableDeclaration */ || target.kind === 174 /* BindingElement */) &&
                             getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(source)) === getSymbolOfNode(target);
                 case 98 /* ThisKeyword */:
                     return target.kind === 98 /* ThisKeyword */;
-                case 173 /* PropertyAccessExpression */:
-                    return target.kind === 173 /* PropertyAccessExpression */ &&
+                case 177 /* PropertyAccessExpression */:
+                    return target.kind === 177 /* PropertyAccessExpression */ &&
                         source.name.text === target.name.text &&
                         isMatchingReference(source.expression, target.expression);
             }
             return false;
         }
         function containsMatchingReference(source, target) {
-            while (source.kind === 173 /* PropertyAccessExpression */) {
+            while (source.kind === 177 /* PropertyAccessExpression */) {
                 source = source.expression;
                 if (isMatchingReference(source, target)) {
                     return true;
@@ -30240,7 +32051,7 @@ var ts;
         // a possible discriminant if its type differs in the constituents of containing union type, and if every
         // choice is a unit type or a union of unit types.
         function containsMatchingReferenceDiscriminant(source, target) {
-            return target.kind === 173 /* PropertyAccessExpression */ &&
+            return target.kind === 177 /* PropertyAccessExpression */ &&
                 containsMatchingReference(source, target.expression) &&
                 isDiscriminantProperty(getDeclaredTypeOfReference(target.expression), target.name.text);
         }
@@ -30248,14 +32059,14 @@ var ts;
             if (expr.kind === 70 /* Identifier */) {
                 return getTypeOfSymbol(getResolvedSymbol(expr));
             }
-            if (expr.kind === 173 /* PropertyAccessExpression */) {
+            if (expr.kind === 177 /* PropertyAccessExpression */) {
                 var type = getDeclaredTypeOfReference(expr.expression);
                 return type && getTypeOfPropertyOfType(type, expr.name.text);
             }
             return undefined;
         }
         function isDiscriminantProperty(type, name) {
-            if (type && type.flags & 524288 /* Union */) {
+            if (type && type.flags & 65536 /* Union */) {
                 var prop = getUnionOrIntersectionProperty(type, name);
                 if (prop && prop.flags & 268435456 /* SyntheticProperty */) {
                     if (prop.isDiscriminantProperty === undefined) {
@@ -30278,7 +32089,7 @@ var ts;
                     }
                 }
             }
-            if (callExpression.expression.kind === 173 /* PropertyAccessExpression */ &&
+            if (callExpression.expression.kind === 177 /* PropertyAccessExpression */ &&
                 isOrContainsMatchingReference(reference, callExpression.expression.expression)) {
                 return true;
             }
@@ -30292,7 +32103,7 @@ var ts;
             return flow.id;
         }
         function typeMaybeAssignableTo(source, target) {
-            if (!(source.flags & 524288 /* Union */)) {
+            if (!(source.flags & 65536 /* Union */)) {
                 return isTypeAssignableTo(source, target);
             }
             for (var _i = 0, _a = source.types; _i < _a.length; _i++) {
@@ -30360,7 +32171,7 @@ var ts;
                     type === falseType ? 3030404 /* FalseStrictFacts */ : 1981828 /* TrueStrictFacts */ :
                     type === falseType ? 3145092 /* FalseFacts */ : 4193668 /* TrueFacts */;
             }
-            if (flags & 2588672 /* ObjectType */) {
+            if (flags & 32768 /* Object */) {
                 return isFunctionObjectType(type) ?
                     strictNullChecks ? 6164448 /* FunctionStrictFacts */ : 8376288 /* FunctionFacts */ :
                     strictNullChecks ? 6166480 /* ObjectStrictFacts */ : 8378320 /* ObjectFacts */;
@@ -30378,7 +32189,7 @@ var ts;
                 var constraint = getConstraintOfTypeParameter(type);
                 return getTypeFacts(constraint || emptyObjectType);
             }
-            if (flags & 1572864 /* UnionOrIntersection */) {
+            if (flags & 196608 /* UnionOrIntersection */) {
                 return getTypeFactsOfTypes(type.types);
             }
             return 8388607 /* All */;
@@ -30394,7 +32205,7 @@ var ts;
             return type;
         }
         function getTypeOfDestructuredProperty(type, name) {
-            var text = getTextOfPropertyName(name);
+            var text = ts.getTextOfPropertyName(name);
             return getTypeOfPropertyOfType(type, text) ||
                 isNumericLiteralName(text) && getIndexTypeOfType(type, 1 /* Number */) ||
                 getIndexTypeOfType(type, 0 /* String */) ||
@@ -30405,19 +32216,19 @@ var ts;
                 checkIteratedTypeOrElementType(type, /*errorNode*/ undefined, /*allowStringInput*/ false) ||
                 unknownType;
         }
-        function getTypeOfDestructuredSpreadElement(type) {
+        function getTypeOfDestructuredSpreadExpression(type) {
             return createArrayType(checkIteratedTypeOrElementType(type, /*errorNode*/ undefined, /*allowStringInput*/ false) || unknownType);
         }
         function getAssignedTypeOfBinaryExpression(node) {
-            return node.parent.kind === 171 /* ArrayLiteralExpression */ || node.parent.kind === 253 /* PropertyAssignment */ ?
+            return node.parent.kind === 175 /* ArrayLiteralExpression */ || node.parent.kind === 257 /* PropertyAssignment */ ?
                 getTypeWithDefault(getAssignedType(node), node.right) :
                 checkExpression(node.right);
         }
         function getAssignedTypeOfArrayLiteralElement(node, element) {
             return getTypeOfDestructuredArrayElement(getAssignedType(node), ts.indexOf(node.elements, element));
         }
-        function getAssignedTypeOfSpreadElement(node) {
-            return getTypeOfDestructuredSpreadElement(getAssignedType(node.parent));
+        function getAssignedTypeOfSpreadExpression(node) {
+            return getTypeOfDestructuredSpreadExpression(getAssignedType(node.parent));
         }
         function getAssignedTypeOfPropertyAssignment(node) {
             return getTypeOfDestructuredProperty(getAssignedType(node.parent), node.name);
@@ -30428,21 +32239,21 @@ var ts;
         function getAssignedType(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 208 /* ForInStatement */:
+                case 212 /* ForInStatement */:
                     return stringType;
-                case 209 /* ForOfStatement */:
+                case 213 /* ForOfStatement */:
                     return checkRightHandSideOfForOf(parent.expression) || unknownType;
-                case 188 /* BinaryExpression */:
+                case 192 /* BinaryExpression */:
                     return getAssignedTypeOfBinaryExpression(parent);
-                case 182 /* DeleteExpression */:
+                case 186 /* DeleteExpression */:
                     return undefinedType;
-                case 171 /* ArrayLiteralExpression */:
+                case 175 /* ArrayLiteralExpression */:
                     return getAssignedTypeOfArrayLiteralElement(parent, node);
-                case 192 /* SpreadElementExpression */:
-                    return getAssignedTypeOfSpreadElement(parent);
-                case 253 /* PropertyAssignment */:
+                case 196 /* SpreadElement */:
+                    return getAssignedTypeOfSpreadExpression(parent);
+                case 257 /* PropertyAssignment */:
                     return getAssignedTypeOfPropertyAssignment(parent);
-                case 254 /* ShorthandPropertyAssignment */:
+                case 258 /* ShorthandPropertyAssignment */:
                     return getAssignedTypeOfShorthandPropertyAssignment(parent);
             }
             return unknownType;
@@ -30450,11 +32261,11 @@ var ts;
         function getInitialTypeOfBindingElement(node) {
             var pattern = node.parent;
             var parentType = getInitialType(pattern.parent);
-            var type = pattern.kind === 168 /* ObjectBindingPattern */ ?
+            var type = pattern.kind === 172 /* ObjectBindingPattern */ ?
                 getTypeOfDestructuredProperty(parentType, node.propertyName || node.name) :
                 !node.dotDotDotToken ?
                     getTypeOfDestructuredArrayElement(parentType, ts.indexOf(pattern.elements, node)) :
-                    getTypeOfDestructuredSpreadElement(parentType);
+                    getTypeOfDestructuredSpreadExpression(parentType);
             return getTypeWithDefault(type, node.initializer);
         }
         function getTypeOfInitializer(node) {
@@ -30468,35 +32279,35 @@ var ts;
             if (node.initializer) {
                 return getTypeOfInitializer(node.initializer);
             }
-            if (node.parent.parent.kind === 208 /* ForInStatement */) {
+            if (node.parent.parent.kind === 212 /* ForInStatement */) {
                 return stringType;
             }
-            if (node.parent.parent.kind === 209 /* ForOfStatement */) {
+            if (node.parent.parent.kind === 213 /* ForOfStatement */) {
                 return checkRightHandSideOfForOf(node.parent.parent.expression) || unknownType;
             }
             return unknownType;
         }
         function getInitialType(node) {
-            return node.kind === 219 /* VariableDeclaration */ ?
+            return node.kind === 223 /* VariableDeclaration */ ?
                 getInitialTypeOfVariableDeclaration(node) :
                 getInitialTypeOfBindingElement(node);
         }
         function getInitialOrAssignedType(node) {
-            return node.kind === 219 /* VariableDeclaration */ || node.kind === 170 /* BindingElement */ ?
+            return node.kind === 223 /* VariableDeclaration */ || node.kind === 174 /* BindingElement */ ?
                 getInitialType(node) :
                 getAssignedType(node);
         }
         function isEmptyArrayAssignment(node) {
-            return node.kind === 219 /* VariableDeclaration */ && node.initializer &&
+            return node.kind === 223 /* VariableDeclaration */ && node.initializer &&
                 isEmptyArrayLiteral(node.initializer) ||
-                node.kind !== 170 /* BindingElement */ && node.parent.kind === 188 /* BinaryExpression */ &&
+                node.kind !== 174 /* BindingElement */ && node.parent.kind === 192 /* BinaryExpression */ &&
                     isEmptyArrayLiteral(node.parent.right);
         }
         function getReferenceCandidate(node) {
             switch (node.kind) {
-                case 179 /* ParenthesizedExpression */:
+                case 183 /* ParenthesizedExpression */:
                     return getReferenceCandidate(node.expression);
-                case 188 /* BinaryExpression */:
+                case 192 /* BinaryExpression */:
                     switch (node.operatorToken.kind) {
                         case 57 /* EqualsToken */:
                             return getReferenceCandidate(node.left);
@@ -30508,13 +32319,13 @@ var ts;
         }
         function getReferenceRoot(node) {
             var parent = node.parent;
-            return parent.kind === 179 /* ParenthesizedExpression */ ||
-                parent.kind === 188 /* BinaryExpression */ && parent.operatorToken.kind === 57 /* EqualsToken */ && parent.left === node ||
-                parent.kind === 188 /* BinaryExpression */ && parent.operatorToken.kind === 25 /* CommaToken */ && parent.right === node ?
+            return parent.kind === 183 /* ParenthesizedExpression */ ||
+                parent.kind === 192 /* BinaryExpression */ && parent.operatorToken.kind === 57 /* EqualsToken */ && parent.left === node ||
+                parent.kind === 192 /* BinaryExpression */ && parent.operatorToken.kind === 25 /* CommaToken */ && parent.right === node ?
                 getReferenceRoot(parent) : node;
         }
         function getTypeOfSwitchClause(clause) {
-            if (clause.kind === 249 /* CaseClause */) {
+            if (clause.kind === 253 /* CaseClause */) {
                 var caseType = getRegularTypeOfLiteralType(checkExpression(clause.expression));
                 return isUnitType(caseType) ? caseType : undefined;
             }
@@ -30531,13 +32342,13 @@ var ts;
             return links.switchTypes;
         }
         function eachTypeContainedIn(source, types) {
-            return source.flags & 524288 /* Union */ ? !ts.forEach(source.types, function (t) { return !ts.contains(types, t); }) : ts.contains(types, source);
+            return source.flags & 65536 /* Union */ ? !ts.forEach(source.types, function (t) { return !ts.contains(types, t); }) : ts.contains(types, source);
         }
         function isTypeSubsetOf(source, target) {
-            return source === target || target.flags & 524288 /* Union */ && isTypeSubsetOfUnion(source, target);
+            return source === target || target.flags & 65536 /* Union */ && isTypeSubsetOfUnion(source, target);
         }
         function isTypeSubsetOfUnion(source, target) {
-            if (source.flags & 524288 /* Union */) {
+            if (source.flags & 65536 /* Union */) {
                 for (var _i = 0, _a = source.types; _i < _a.length; _i++) {
                     var t = _a[_i];
                     if (!containsType(target.types, t)) {
@@ -30551,8 +32362,11 @@ var ts;
             }
             return containsType(target.types, source);
         }
+        function forEachType(type, f) {
+            return type.flags & 65536 /* Union */ ? ts.forEach(type.types, f) : f(type);
+        }
         function filterType(type, f) {
-            if (type.flags & 524288 /* Union */) {
+            if (type.flags & 65536 /* Union */) {
                 var types = type.types;
                 var filtered = ts.filter(types, f);
                 return filtered === types ? type : getUnionTypeFromSortedList(filtered);
@@ -30560,7 +32374,7 @@ var ts;
             return f(type) ? type : neverType;
         }
         function mapType(type, f) {
-            return type.flags & 524288 /* Union */ ? getUnionType(ts.map(type.types, f)) : f(type);
+            return type.flags & 65536 /* Union */ ? getUnionType(ts.map(type.types, f)) : f(type);
         }
         function extractTypesOfKind(type, kind) {
             return filterType(type, function (t) { return (t.flags & kind) !== 0; });
@@ -30593,7 +32407,7 @@ var ts;
         // array types are ultimately converted into manifest array types (using getFinalArrayType)
         // and never escape the getFlowTypeOfReference function.
         function createEvolvingArrayType(elementType) {
-            var result = createObjectType(2097152 /* Anonymous */);
+            var result = createObjectType(256 /* EvolvingArray */);
             result.elementType = elementType;
             return result;
         }
@@ -30607,13 +32421,10 @@ var ts;
             var elementType = getBaseTypeOfLiteralType(checkExpression(node));
             return isTypeSubsetOf(elementType, evolvingArrayType.elementType) ? evolvingArrayType : getEvolvingArrayType(getUnionType([evolvingArrayType.elementType, elementType]));
         }
-        function isEvolvingArrayType(type) {
-            return !!(type.flags & 2097152 /* Anonymous */ && type.elementType);
-        }
         function createFinalArrayType(elementType) {
             return elementType.flags & 8192 /* Never */ ?
                 autoArrayType :
-                createArrayType(elementType.flags & 524288 /* Union */ ?
+                createArrayType(elementType.flags & 65536 /* Union */ ?
                     getUnionType(elementType.types, /*subtypeReduction*/ true) :
                     elementType);
         }
@@ -30622,17 +32433,17 @@ var ts;
             return evolvingArrayType.finalArrayType || (evolvingArrayType.finalArrayType = createFinalArrayType(evolvingArrayType.elementType));
         }
         function finalizeEvolvingArrayType(type) {
-            return isEvolvingArrayType(type) ? getFinalArrayType(type) : type;
+            return getObjectFlags(type) & 256 /* EvolvingArray */ ? getFinalArrayType(type) : type;
         }
         function getElementTypeOfEvolvingArrayType(type) {
-            return isEvolvingArrayType(type) ? type.elementType : neverType;
+            return getObjectFlags(type) & 256 /* EvolvingArray */ ? type.elementType : neverType;
         }
         function isEvolvingArrayTypeList(types) {
             var hasEvolvingArrayType = false;
             for (var _i = 0, types_12 = types; _i < types_12.length; _i++) {
                 var t = types_12[_i];
                 if (!(t.flags & 8192 /* Never */)) {
-                    if (!isEvolvingArrayType(t)) {
+                    if (!(getObjectFlags(t) & 256 /* EvolvingArray */)) {
                         return false;
                     }
                     hasEvolvingArrayType = true;
@@ -30653,20 +32464,40 @@ var ts;
         function isEvolvingArrayOperationTarget(node) {
             var root = getReferenceRoot(node);
             var parent = root.parent;
-            var isLengthPushOrUnshift = parent.kind === 173 /* PropertyAccessExpression */ && (parent.name.text === "length" ||
-                parent.parent.kind === 175 /* CallExpression */ && ts.isPushOrUnshiftIdentifier(parent.name));
-            var isElementAssignment = parent.kind === 174 /* ElementAccessExpression */ &&
+            var isLengthPushOrUnshift = parent.kind === 177 /* PropertyAccessExpression */ && (parent.name.text === "length" ||
+                parent.parent.kind === 179 /* CallExpression */ && ts.isPushOrUnshiftIdentifier(parent.name));
+            var isElementAssignment = parent.kind === 178 /* ElementAccessExpression */ &&
                 parent.expression === root &&
-                parent.parent.kind === 188 /* BinaryExpression */ &&
+                parent.parent.kind === 192 /* BinaryExpression */ &&
                 parent.parent.operatorToken.kind === 57 /* EqualsToken */ &&
                 parent.parent.left === parent &&
                 !ts.isAssignmentTarget(parent.parent) &&
                 isTypeAnyOrAllConstituentTypesHaveKind(checkExpression(parent.argumentExpression), 340 /* NumberLike */ | 2048 /* Undefined */);
             return isLengthPushOrUnshift || isElementAssignment;
         }
+        function maybeTypePredicateCall(node) {
+            var links = getNodeLinks(node);
+            if (links.maybeTypePredicate === undefined) {
+                links.maybeTypePredicate = getMaybeTypePredicate(node);
+            }
+            return links.maybeTypePredicate;
+        }
+        function getMaybeTypePredicate(node) {
+            if (node.expression.kind !== 96 /* SuperKeyword */) {
+                var funcType = checkNonNullExpression(node.expression);
+                if (funcType !== silentNeverType) {
+                    var apparentType = getApparentType(funcType);
+                    if (apparentType !== unknownType) {
+                        var callSignatures = getSignaturesOfType(apparentType, 0 /* Call */);
+                        return !!ts.forEach(callSignatures, function (sig) { return sig.typePredicate; });
+                    }
+                }
+            }
+            return false;
+        }
         function getFlowTypeOfReference(reference, declaredType, assumeInitialized, flowContainer) {
             var key;
-            if (!reference.flowNode || assumeInitialized && !(declaredType.flags & 4178943 /* Narrowable */)) {
+            if (!reference.flowNode || assumeInitialized && !(declaredType.flags & 1033215 /* Narrowable */)) {
                 return declaredType;
             }
             var initialType = assumeInitialized ? declaredType :
@@ -30679,8 +32510,8 @@ var ts;
             // we give type 'any[]' to 'x' instead of using the type determined by control flow analysis such that operations
             // on empty arrays are possible without implicit any errors and new element types can be inferred without
             // type mismatch errors.
-            var resultType = isEvolvingArrayType(evolvedType) && isEvolvingArrayOperationTarget(reference) ? anyArrayType : finalizeEvolvingArrayType(evolvedType);
-            if (reference.parent.kind === 197 /* NonNullExpression */ && getTypeWithFacts(resultType, 524288 /* NEUndefinedOrNull */).flags & 8192 /* Never */) {
+            var resultType = getObjectFlags(evolvedType) & 256 /* EvolvingArray */ && isEvolvingArrayOperationTarget(reference) ? anyArrayType : finalizeEvolvingArrayType(evolvedType);
+            if (reference.parent.kind === 201 /* NonNullExpression */ && getTypeWithFacts(resultType, 524288 /* NEUndefinedOrNull */).flags & 8192 /* Never */) {
                 return declaredType;
             }
             return resultType;
@@ -30729,7 +32560,7 @@ var ts;
                     else if (flow.flags & 2 /* Start */) {
                         // Check if we should continue with the control flow of the containing function.
                         var container = flow.container;
-                        if (container && container !== flowContainer && reference.kind !== 173 /* PropertyAccessExpression */) {
+                        if (container && container !== flowContainer && reference.kind !== 177 /* PropertyAccessExpression */) {
                             flow = container.flowNode;
                             continue;
                         }
@@ -30755,7 +32586,7 @@ var ts;
                 // Assignments only narrow the computed type if the declared type is a union type. Thus, we
                 // only need to evaluate the assigned type if the declared type is a union type.
                 if (isMatchingReference(reference, node)) {
-                    if (node.parent.kind === 186 /* PrefixUnaryExpression */ || node.parent.kind === 187 /* PostfixUnaryExpression */) {
+                    if (ts.getAssignmentTargetKind(node) === 2 /* Compound */) {
                         var flowType = getTypeAtFlowNode(flow.antecedent);
                         return createFlowType(getBaseTypeOfLiteralType(getTypeFromFlowType(flowType)), isIncomplete(flowType));
                     }
@@ -30766,7 +32597,7 @@ var ts;
                         var assignedType = getBaseTypeOfLiteralType(getInitialOrAssignedType(node));
                         return isTypeAssignableTo(assignedType, declaredType) ? assignedType : anyArrayType;
                     }
-                    if (declaredType.flags & 524288 /* Union */) {
+                    if (declaredType.flags & 65536 /* Union */) {
                         return getAssignmentReducedType(declaredType, getInitialOrAssignedType(node));
                     }
                     return declaredType;
@@ -30783,15 +32614,15 @@ var ts;
             }
             function getTypeAtFlowArrayMutation(flow) {
                 var node = flow.node;
-                var expr = node.kind === 175 /* CallExpression */ ?
+                var expr = node.kind === 179 /* CallExpression */ ?
                     node.expression.expression :
                     node.left.expression;
                 if (isMatchingReference(reference, getReferenceCandidate(expr))) {
                     var flowType = getTypeAtFlowNode(flow.antecedent);
                     var type = getTypeFromFlowType(flowType);
-                    if (isEvolvingArrayType(type)) {
+                    if (getObjectFlags(type) & 256 /* EvolvingArray */) {
                         var evolvedType_1 = type;
-                        if (node.kind === 175 /* CallExpression */) {
+                        if (node.kind === 179 /* CallExpression */) {
                             for (var _i = 0, _a = node.arguments; _i < _a.length; _i++) {
                                 var arg = _a[_i];
                                 evolvedType_1 = addEvolvingArrayElementType(evolvedType_1, arg);
@@ -30946,8 +32777,8 @@ var ts;
                 return cache[key] = result;
             }
             function isMatchingReferenceDiscriminant(expr) {
-                return expr.kind === 173 /* PropertyAccessExpression */ &&
-                    declaredType.flags & 524288 /* Union */ &&
+                return expr.kind === 177 /* PropertyAccessExpression */ &&
+                    declaredType.flags & 65536 /* Union */ &&
                     isMatchingReference(reference, expr.expression) &&
                     isDiscriminantProperty(declaredType, expr.name.text);
             }
@@ -30980,10 +32811,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 === 183 /* TypeOfExpression */ && right_1.kind === 9 /* StringLiteral */) {
+                        if (left_1.kind === 187 /* TypeOfExpression */ && right_1.kind === 9 /* StringLiteral */) {
                             return narrowTypeByTypeof(type, left_1, operator_1, right_1, assumeTrue);
                         }
-                        if (right_1.kind === 183 /* TypeOfExpression */ && left_1.kind === 9 /* StringLiteral */) {
+                        if (right_1.kind === 187 /* TypeOfExpression */ && left_1.kind === 9 /* StringLiteral */) {
                             return narrowTypeByTypeof(type, right_1, operator_1, left_1, assumeTrue);
                         }
                         if (isMatchingReference(reference, left_1)) {
@@ -31029,7 +32860,7 @@ var ts;
                             assumeTrue ? 16384 /* EQUndefined */ : 131072 /* NEUndefined */;
                     return getTypeWithFacts(type, facts);
                 }
-                if (type.flags & 2589185 /* NotUnionOrUnit */) {
+                if (type.flags & 33281 /* NotUnionOrUnit */) {
                     return type;
                 }
                 if (assumeTrue) {
@@ -31056,7 +32887,7 @@ var ts;
                 if (operator === 32 /* ExclamationEqualsToken */ || operator === 34 /* ExclamationEqualsEqualsToken */) {
                     assumeTrue = !assumeTrue;
                 }
-                if (assumeTrue && !(type.flags & 524288 /* Union */)) {
+                if (assumeTrue && !(type.flags & 65536 /* Union */)) {
                     // We narrow a non-union type to an exact primitive type if the non-union type
                     // is a supertype of that primitive type. For example, type 'any' can be narrowed
                     // to one of the primitive types.
@@ -31118,10 +32949,10 @@ var ts;
                 if (!targetType) {
                     // Target type is type of construct signature
                     var constructSignatures = void 0;
-                    if (rightType.flags & 65536 /* Interface */) {
+                    if (getObjectFlags(rightType) & 2 /* Interface */) {
                         constructSignatures = resolveDeclaredMembers(rightType).declaredConstructSignatures;
                     }
-                    else if (rightType.flags & 2097152 /* Anonymous */) {
+                    else if (getObjectFlags(rightType) & 16 /* Anonymous */) {
                         constructSignatures = getSignaturesOfType(rightType, 1 /* Construct */);
                     }
                     if (constructSignatures && constructSignatures.length) {
@@ -31139,7 +32970,7 @@ var ts;
                 }
                 // If the current type is a union type, remove all constituents that couldn't be instances of
                 // the candidate type. If one or more constituents remain, return a union of those.
-                if (type.flags & 524288 /* Union */) {
+                if (type.flags & 65536 /* Union */) {
                     var assignableType = filterType(type, function (t) { return isTypeInstanceOf(t, candidate); });
                     if (!(assignableType.flags & 8192 /* Never */)) {
                         return assignableType;
@@ -31157,7 +32988,7 @@ var ts;
                             getIntersectionType([type, candidate]);
             }
             function narrowTypeByTypePredicate(type, callExpression, assumeTrue) {
-                if (!hasMatchingArgument(callExpression, reference)) {
+                if (!hasMatchingArgument(callExpression, reference) || !maybeTypePredicateCall(callExpression)) {
                     return type;
                 }
                 var signature = getResolvedSignature(callExpression);
@@ -31181,10 +33012,10 @@ var ts;
                     }
                 }
                 else {
-                    var invokedExpression = skipParenthesizedNodes(callExpression.expression);
-                    if (invokedExpression.kind === 174 /* ElementAccessExpression */ || invokedExpression.kind === 173 /* PropertyAccessExpression */) {
+                    var invokedExpression = ts.skipParentheses(callExpression.expression);
+                    if (invokedExpression.kind === 178 /* ElementAccessExpression */ || invokedExpression.kind === 177 /* PropertyAccessExpression */) {
                         var accessExpression = invokedExpression;
-                        var possibleReference = skipParenthesizedNodes(accessExpression.expression);
+                        var possibleReference = ts.skipParentheses(accessExpression.expression);
                         if (isMatchingReference(reference, possibleReference)) {
                             return getNarrowedType(type, predicate.type, assumeTrue);
                         }
@@ -31201,15 +33032,15 @@ var ts;
                 switch (expr.kind) {
                     case 70 /* Identifier */:
                     case 98 /* ThisKeyword */:
-                    case 173 /* PropertyAccessExpression */:
+                    case 177 /* PropertyAccessExpression */:
                         return narrowTypeByTruthiness(type, expr, assumeTrue);
-                    case 175 /* CallExpression */:
+                    case 179 /* CallExpression */:
                         return narrowTypeByTypePredicate(type, expr, assumeTrue);
-                    case 179 /* ParenthesizedExpression */:
+                    case 183 /* ParenthesizedExpression */:
                         return narrowType(type, expr.expression, assumeTrue);
-                    case 188 /* BinaryExpression */:
+                    case 192 /* BinaryExpression */:
                         return narrowTypeByBinaryExpression(type, expr, assumeTrue);
-                    case 186 /* PrefixUnaryExpression */:
+                    case 190 /* PrefixUnaryExpression */:
                         if (expr.operator === 50 /* ExclamationToken */) {
                             return narrowType(type, expr.operand, !assumeTrue);
                         }
@@ -31241,19 +33072,13 @@ var ts;
             // binder), we simply return the declared type of the symbol.
             return getTypeOfSymbol(symbol);
         }
-        function skipParenthesizedNodes(expression) {
-            while (expression.kind === 179 /* ParenthesizedExpression */) {
-                expression = expression.expression;
-            }
-            return expression;
-        }
         function getControlFlowContainer(node) {
             while (true) {
                 node = node.parent;
                 if (ts.isFunctionLike(node) && !ts.getImmediatelyInvokedFunctionExpression(node) ||
-                    node.kind === 227 /* ModuleBlock */ ||
-                    node.kind === 256 /* SourceFile */ ||
-                    node.kind === 146 /* PropertyDeclaration */) {
+                    node.kind === 231 /* ModuleBlock */ ||
+                    node.kind === 261 /* SourceFile */ ||
+                    node.kind === 147 /* PropertyDeclaration */) {
                     return node;
                 }
             }
@@ -31285,7 +33110,7 @@ var ts;
             if (node.kind === 70 /* Identifier */) {
                 if (ts.isAssignmentTarget(node)) {
                     var symbol = getResolvedSymbol(node);
-                    if (symbol.valueDeclaration && ts.getRootDeclaration(symbol.valueDeclaration).kind === 143 /* Parameter */) {
+                    if (symbol.valueDeclaration && ts.getRootDeclaration(symbol.valueDeclaration).kind === 144 /* Parameter */) {
                         symbol.isAssigned = true;
                     }
                 }
@@ -31299,6 +33124,9 @@ var ts;
         }
         function checkIdentifier(node) {
             var symbol = getResolvedSymbol(node);
+            if (symbol === unknownSymbol) {
+                return unknownType;
+            }
             // As noted in ECMAScript 6 language spec, arrow functions never have an arguments objects.
             // Although in down-level emit of arrow function, we emit it using function expression which means that
             // arguments objects will be bound to the inner object; emitting arrow function natively in ES6, arguments objects
@@ -31308,16 +33136,17 @@ var ts;
             if (symbol === argumentsSymbol) {
                 var container = ts.getContainingFunction(node);
                 if (languageVersion < 2 /* ES2015 */) {
-                    if (container.kind === 181 /* ArrowFunction */) {
+                    if (container.kind === 185 /* 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 */)) {
                         error(node, ts.Diagnostics.The_arguments_object_cannot_be_referenced_in_an_async_function_or_method_in_ES3_and_ES5_Consider_using_a_standard_function_or_method);
                     }
                 }
-                if (node.flags & 262144 /* AwaitContext */) {
+                if (node.flags & 524288 /* AwaitContext */) {
                     getNodeLinks(container).flags |= 8192 /* CaptureArguments */;
                 }
+                return getTypeOfSymbol(symbol);
             }
             if (symbol.flags & 8388608 /* Alias */ && !isInTypeQuery(node) && !isConstEnumOrConstEnumOnlyModule(resolveAlias(symbol))) {
                 markAliasSymbolAsReferenced(symbol);
@@ -31329,7 +33158,7 @@ var ts;
                 // must instead be rewritten to point to a temporary variable to avoid issues with the double-bind
                 // behavior of class names in ES6.
                 if (languageVersion === 2 /* ES2015 */
-                    && declaration_1.kind === 222 /* ClassDeclaration */
+                    && declaration_1.kind === 226 /* ClassDeclaration */
                     && ts.nodeIsDecorated(declaration_1)) {
                     var container = ts.getContainingClass(node);
                     while (container !== undefined) {
@@ -31341,14 +33170,14 @@ var ts;
                         container = ts.getContainingClass(container);
                     }
                 }
-                else if (declaration_1.kind === 193 /* ClassExpression */) {
+                else if (declaration_1.kind === 197 /* 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 !== undefined) {
                         if (container.parent === declaration_1) {
-                            if (container.kind === 146 /* PropertyDeclaration */ && ts.hasModifier(container, 32 /* Static */)) {
+                            if (container.kind === 147 /* PropertyDeclaration */ && ts.hasModifier(container, 32 /* Static */)) {
                                 getNodeLinks(declaration_1).flags |= 8388608 /* ClassWithConstructorReference */;
                                 getNodeLinks(node).flags |= 16777216 /* ConstructorReferenceInClass */;
                             }
@@ -31363,23 +33192,34 @@ var ts;
             checkNestedBlockScopedBinding(node, symbol);
             var type = getTypeOfSymbol(localOrExportSymbol);
             var declaration = localOrExportSymbol.valueDeclaration;
+            var assignmentKind = ts.getAssignmentTargetKind(node);
+            if (assignmentKind) {
+                if (!(localOrExportSymbol.flags & 3 /* Variable */)) {
+                    error(node, ts.Diagnostics.Cannot_assign_to_0_because_it_is_not_a_variable, symbolToString(symbol));
+                    return unknownType;
+                }
+                if (isReadonlySymbol(localOrExportSymbol)) {
+                    error(node, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_constant_or_a_read_only_property, symbolToString(symbol));
+                    return unknownType;
+                }
+            }
             // We only narrow variables and parameters occurring in a non-assignment position. For all other
             // entities we simply return the declared type.
-            if (!(localOrExportSymbol.flags & 3 /* Variable */) || ts.isAssignmentTarget(node) || !declaration) {
+            if (!(localOrExportSymbol.flags & 3 /* Variable */) || assignmentKind === 1 /* Definite */ || !declaration) {
                 return type;
             }
             // 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 === 143 /* Parameter */;
+            var isParameter = ts.getRootDeclaration(declaration).kind === 144 /* Parameter */;
             var declarationContainer = getControlFlowContainer(declaration);
             var flowContainer = getControlFlowContainer(node);
             var isOuterVariable = flowContainer !== declarationContainer;
             // 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 === 180 /* FunctionExpression */ ||
-                flowContainer.kind === 181 /* ArrowFunction */ || ts.isObjectLiteralOrClassExpressionMethod(flowContainer)) &&
+            while (flowContainer !== declarationContainer && (flowContainer.kind === 184 /* FunctionExpression */ ||
+                flowContainer.kind === 185 /* ArrowFunction */ || ts.isObjectLiteralOrClassExpressionMethod(flowContainer)) &&
                 (isConstVariable(localOrExportSymbol) || isParameter && !isParameterAssigned(localOrExportSymbol))) {
                 flowContainer = getControlFlowContainer(flowContainer);
             }
@@ -31407,7 +33247,7 @@ var ts;
                 // Return the declared type to reduce follow-on errors
                 return type;
             }
-            return flowType;
+            return assignmentKind ? getBaseTypeOfLiteralType(flowType) : flowType;
         }
         function isInsideFunction(node, threshold) {
             var current = node;
@@ -31422,7 +33262,7 @@ var ts;
         function checkNestedBlockScopedBinding(node, symbol) {
             if (languageVersion >= 2 /* ES2015 */ ||
                 (symbol.flags & (2 /* BlockScopedVariable */ | 32 /* Class */)) === 0 ||
-                symbol.valueDeclaration.parent.kind === 252 /* CatchClause */) {
+                symbol.valueDeclaration.parent.kind === 256 /* CatchClause */) {
                 return;
             }
             // 1. walk from the use site up to the declaration and check
@@ -31447,8 +33287,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 === 207 /* ForStatement */ &&
-                    ts.getAncestor(symbol.valueDeclaration, 220 /* VariableDeclarationList */).parent === container &&
+                if (container.kind === 211 /* ForStatement */ &&
+                    ts.getAncestor(symbol.valueDeclaration, 224 /* VariableDeclarationList */).parent === container &&
                     isAssignedInBodyOfForStatement(node, container)) {
                     getNodeLinks(symbol.valueDeclaration).flags |= 2097152 /* NeedsLoopOutParameter */;
                 }
@@ -31462,7 +33302,7 @@ var ts;
         function isAssignedInBodyOfForStatement(node, container) {
             var current = node;
             // skip parenthesized nodes
-            while (current.parent.kind === 179 /* ParenthesizedExpression */) {
+            while (current.parent.kind === 183 /* ParenthesizedExpression */) {
                 current = current.parent;
             }
             // check if node is used as LHS in some assignment expression
@@ -31470,7 +33310,7 @@ var ts;
             if (ts.isAssignmentTarget(current)) {
                 isAssigned = true;
             }
-            else if ((current.parent.kind === 186 /* PrefixUnaryExpression */ || current.parent.kind === 187 /* PostfixUnaryExpression */)) {
+            else if ((current.parent.kind === 190 /* PrefixUnaryExpression */ || current.parent.kind === 191 /* PostfixUnaryExpression */)) {
                 var expr = current.parent;
                 isAssigned = expr.operator === 42 /* PlusPlusToken */ || expr.operator === 43 /* MinusMinusToken */;
             }
@@ -31491,7 +33331,7 @@ var ts;
         }
         function captureLexicalThis(node, container) {
             getNodeLinks(node).flags |= 2 /* LexicalThis */;
-            if (container.kind === 146 /* PropertyDeclaration */ || container.kind === 149 /* Constructor */) {
+            if (container.kind === 147 /* PropertyDeclaration */ || container.kind === 150 /* Constructor */) {
                 var classNode = container.parent;
                 getNodeLinks(classNode).flags |= 4 /* CaptureThis */;
             }
@@ -31539,7 +33379,7 @@ var ts;
             // tell whether 'this' needs to be captured.
             var container = ts.getThisContainer(node, /* includeArrowFunctions */ true);
             var needToCaptureLexicalThis = false;
-            if (container.kind === 149 /* Constructor */) {
+            if (container.kind === 150 /* Constructor */) {
                 var containingClassDecl = container.parent;
                 var baseTypeNode = ts.getClassExtendsHeritageClauseElement(containingClassDecl);
                 // If a containing class does not have extends clause or the class extends null
@@ -31560,32 +33400,32 @@ var ts;
                 }
             }
             // Now skip arrow functions to get the "real" owner of 'this'.
-            if (container.kind === 181 /* ArrowFunction */) {
+            if (container.kind === 185 /* ArrowFunction */) {
                 container = ts.getThisContainer(container, /* includeArrowFunctions */ false);
                 // When targeting es6, arrow function lexically bind "this" so we do not need to do the work of binding "this" in emitted code
                 needToCaptureLexicalThis = (languageVersion < 2 /* ES2015 */);
             }
             switch (container.kind) {
-                case 226 /* ModuleDeclaration */:
+                case 230 /* 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 225 /* EnumDeclaration */:
+                case 229 /* 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 149 /* Constructor */:
+                case 150 /* Constructor */:
                     if (isInConstructorArgumentInitializer(node, container)) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_constructor_arguments);
                     }
                     break;
-                case 146 /* PropertyDeclaration */:
-                case 145 /* PropertySignature */:
+                case 147 /* PropertyDeclaration */:
+                case 146 /* PropertySignature */:
                     if (ts.getModifierFlags(container) & 32 /* Static */) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_static_property_initializer);
                     }
                     break;
-                case 141 /* ComputedPropertyName */:
+                case 142 /* ComputedPropertyName */:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_computed_property_name);
                     break;
             }
@@ -31597,7 +33437,7 @@ var ts;
                 // Note: a parameter initializer should refer to class-this unless function-this is explicitly annotated.
                 // If this is a function in a JS file, it might be a class method. Check if it's the RHS
                 // of a x.prototype.y = function [name]() { .... }
-                if (container.kind === 180 /* FunctionExpression */ &&
+                if (container.kind === 184 /* FunctionExpression */ &&
                     ts.isInJavaScriptFile(container.parent) &&
                     ts.getSpecialPropertyAssignmentKind(container.parent) === 3 /* PrototypeProperty */) {
                     // Get the 'x' of 'x.prototype.y = f' (here, 'f' is 'container')
@@ -31634,28 +33474,28 @@ var ts;
         }
         function getTypeForThisExpressionFromJSDoc(node) {
             var typeTag = ts.getJSDocTypeTag(node);
-            if (typeTag && typeTag.typeExpression && typeTag.typeExpression.type && typeTag.typeExpression.type.kind === 269 /* JSDocFunctionType */) {
+            if (typeTag && typeTag.typeExpression && typeTag.typeExpression.type && typeTag.typeExpression.type.kind === 274 /* JSDocFunctionType */) {
                 var jsDocFunctionType = typeTag.typeExpression.type;
-                if (jsDocFunctionType.parameters.length > 0 && jsDocFunctionType.parameters[0].type.kind === 272 /* JSDocThisType */) {
+                if (jsDocFunctionType.parameters.length > 0 && jsDocFunctionType.parameters[0].type.kind === 277 /* JSDocThisType */) {
                     return getTypeFromTypeNode(jsDocFunctionType.parameters[0].type);
                 }
             }
         }
         function isInConstructorArgumentInitializer(node, constructorDecl) {
             for (var n = node; n && n !== constructorDecl; n = n.parent) {
-                if (n.kind === 143 /* Parameter */) {
+                if (n.kind === 144 /* Parameter */) {
                     return true;
                 }
             }
             return false;
         }
         function checkSuperExpression(node) {
-            var isCallExpression = node.parent.kind === 175 /* CallExpression */ && node.parent.expression === node;
+            var isCallExpression = node.parent.kind === 179 /* 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 === 181 /* ArrowFunction */) {
+                while (container && container.kind === 185 /* ArrowFunction */) {
                     container = ts.getSuperContainer(container, /*stopOnFunctions*/ true);
                     needToCaptureLexicalThis = languageVersion < 2 /* ES2015 */;
                 }
@@ -31669,16 +33509,16 @@ var ts;
                 //     [super.foo()]() {}
                 // }
                 var current = node;
-                while (current && current !== container && current.kind !== 141 /* ComputedPropertyName */) {
+                while (current && current !== container && current.kind !== 142 /* ComputedPropertyName */) {
                     current = current.parent;
                 }
-                if (current && current.kind === 141 /* ComputedPropertyName */) {
+                if (current && current.kind === 142 /* 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 === 172 /* ObjectLiteralExpression */)) {
+                else if (!container || !container.parent || !(ts.isClassLike(container.parent) || container.parent.kind === 176 /* ObjectLiteralExpression */)) {
                     error(node, ts.Diagnostics.super_can_only_be_referenced_in_members_of_derived_classes_or_object_literal_expressions);
                 }
                 else {
@@ -31749,7 +33589,7 @@ var ts;
             // This helper creates an object with a "value" property that wraps the `super` property or indexed access for both get and set.
             // This is required for destructuring assignments, as a call expression cannot be used as the target of a destructuring assignment
             // while a property access can.
-            if (container.kind === 148 /* MethodDeclaration */ && ts.getModifierFlags(container) & 256 /* Async */) {
+            if (container.kind === 149 /* MethodDeclaration */ && ts.getModifierFlags(container) & 256 /* Async */) {
                 if (ts.isSuperProperty(node.parent) && ts.isAssignmentTarget(node.parent)) {
                     getNodeLinks(container).flags |= 4096 /* AsyncMethodWithSuperBinding */;
                 }
@@ -31763,7 +33603,7 @@ var ts;
                 // in this case they should also use correct lexical this
                 captureLexicalThis(node.parent, container);
             }
-            if (container.parent.kind === 172 /* ObjectLiteralExpression */) {
+            if (container.parent.kind === 176 /* 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 unknownType;
@@ -31783,7 +33623,7 @@ var ts;
                 }
                 return unknownType;
             }
-            if (container.kind === 149 /* Constructor */ && isInConstructorArgumentInitializer(node, container)) {
+            if (container.kind === 150 /* 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 unknownType;
@@ -31798,7 +33638,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 === 149 /* Constructor */;
+                    return container.kind === 150 /* Constructor */;
                 }
                 else {
                     // TS 1.0 SPEC (April 2014)
@@ -31806,21 +33646,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 === 172 /* ObjectLiteralExpression */) {
+                    if (ts.isClassLike(container.parent) || container.parent.kind === 176 /* ObjectLiteralExpression */) {
                         if (ts.getModifierFlags(container) & 32 /* Static */) {
-                            return container.kind === 148 /* MethodDeclaration */ ||
-                                container.kind === 147 /* MethodSignature */ ||
-                                container.kind === 150 /* GetAccessor */ ||
-                                container.kind === 151 /* SetAccessor */;
+                            return container.kind === 149 /* MethodDeclaration */ ||
+                                container.kind === 148 /* MethodSignature */ ||
+                                container.kind === 151 /* GetAccessor */ ||
+                                container.kind === 152 /* SetAccessor */;
                         }
                         else {
-                            return container.kind === 148 /* MethodDeclaration */ ||
-                                container.kind === 147 /* MethodSignature */ ||
-                                container.kind === 150 /* GetAccessor */ ||
-                                container.kind === 151 /* SetAccessor */ ||
-                                container.kind === 146 /* PropertyDeclaration */ ||
-                                container.kind === 145 /* PropertySignature */ ||
-                                container.kind === 149 /* Constructor */;
+                            return container.kind === 149 /* MethodDeclaration */ ||
+                                container.kind === 148 /* MethodSignature */ ||
+                                container.kind === 151 /* GetAccessor */ ||
+                                container.kind === 152 /* SetAccessor */ ||
+                                container.kind === 147 /* PropertyDeclaration */ ||
+                                container.kind === 146 /* PropertySignature */ ||
+                                container.kind === 150 /* Constructor */;
                         }
                     }
                 }
@@ -31828,7 +33668,7 @@ var ts;
             }
         }
         function getContextualThisParameterType(func) {
-            if (isContextSensitiveFunctionOrObjectLiteralMethod(func) && func.kind !== 181 /* ArrowFunction */) {
+            if (isContextSensitiveFunctionOrObjectLiteralMethod(func) && func.kind !== 185 /* ArrowFunction */) {
                 var contextualSignature = getContextualSignature(func);
                 if (contextualSignature) {
                     var thisParameter = contextualSignature.thisParameter;
@@ -31894,7 +33734,7 @@ var ts;
                 if (declaration.type) {
                     return getTypeFromTypeNode(declaration.type);
                 }
-                if (declaration.kind === 143 /* Parameter */) {
+                if (declaration.kind === 144 /* Parameter */) {
                     var type = getContextuallyTypedParameterType(declaration);
                     if (type) {
                         return type;
@@ -31905,11 +33745,11 @@ var ts;
                 }
                 if (ts.isBindingPattern(declaration.parent)) {
                     var parentDeclaration = declaration.parent.parent;
-                    var name_15 = declaration.propertyName || declaration.name;
+                    var name_20 = declaration.propertyName || declaration.name;
                     if (ts.isVariableLike(parentDeclaration) &&
                         parentDeclaration.type &&
-                        !ts.isBindingPattern(name_15)) {
-                        var text = getTextOfPropertyName(name_15);
+                        !ts.isBindingPattern(name_20)) {
+                        var text = ts.getTextOfPropertyName(name_20);
                         if (text) {
                             return getTypeOfPropertyOfType(getTypeFromTypeNode(parentDeclaration.type), text);
                         }
@@ -31946,7 +33786,7 @@ var ts;
         }
         function isInParameterInitializerBeforeContainingFunction(node) {
             while (node.parent && !ts.isFunctionLike(node.parent)) {
-                if (node.parent.kind === 143 /* Parameter */ && node.parent.initializer === node) {
+                if (node.parent.kind === 144 /* Parameter */ && node.parent.initializer === node) {
                     return true;
                 }
                 node = node.parent;
@@ -31957,8 +33797,8 @@ var ts;
             // 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
             if (functionDecl.type ||
-                functionDecl.kind === 149 /* Constructor */ ||
-                functionDecl.kind === 150 /* GetAccessor */ && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(functionDecl.symbol, 151 /* SetAccessor */))) {
+                functionDecl.kind === 150 /* Constructor */ ||
+                functionDecl.kind === 151 /* GetAccessor */ && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(functionDecl.symbol, 152 /* SetAccessor */))) {
                 return getReturnTypeOfSignature(getSignatureFromDeclaration(functionDecl));
             }
             // Otherwise, if the containing function is contextually typed by a function type with exactly one call signature
@@ -31980,7 +33820,7 @@ var ts;
             return undefined;
         }
         function getContextualTypeForSubstitutionExpression(template, substitutionExpression) {
-            if (template.parent.kind === 177 /* TaggedTemplateExpression */) {
+            if (template.parent.kind === 181 /* TaggedTemplateExpression */) {
                 return getContextualTypeForArgument(template.parent, substitutionExpression);
             }
             return undefined;
@@ -32018,7 +33858,7 @@ var ts;
         // is a union type, the mapping function is applied to each constituent type and a union of the resulting
         // types is returned.
         function applyToContextualType(type, mapper) {
-            if (!(type.flags & 524288 /* Union */)) {
+            if (!(type.flags & 65536 /* Union */)) {
                 return mapper(type);
             }
             var types = type.types;
@@ -32043,7 +33883,7 @@ var ts;
         }
         function getTypeOfPropertyOfContextualType(type, name) {
             return applyToContextualType(type, function (t) {
-                var prop = t.flags & 4161536 /* StructuredType */ ? getPropertyOfType(t, name) : undefined;
+                var prop = t.flags & 229376 /* StructuredType */ ? getPropertyOfType(t, name) : undefined;
                 return prop ? getTypeOfSymbol(prop) : undefined;
             });
         }
@@ -32052,7 +33892,7 @@ var ts;
         }
         // Return true if the given contextual type is a tuple-like type
         function contextualTypeIsTupleLikeType(type) {
-            return !!(type.flags & 524288 /* Union */ ? ts.forEach(type.types, isTupleLikeType) : isTupleLikeType(type));
+            return !!(type.flags & 65536 /* Union */ ? ts.forEach(type.types, isTupleLikeType) : isTupleLikeType(type));
         }
         // 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
@@ -32108,13 +33948,13 @@ var ts;
             var kind = attribute.kind;
             var jsxElement = attribute.parent;
             var attrsType = getJsxElementAttributesType(jsxElement);
-            if (attribute.kind === 246 /* JsxAttribute */) {
+            if (attribute.kind === 250 /* JsxAttribute */) {
                 if (!attrsType || isTypeAny(attrsType)) {
                     return undefined;
                 }
                 return getTypeOfPropertyOfType(attrsType, attribute.name.text);
             }
-            else if (attribute.kind === 247 /* JsxSpreadAttribute */) {
+            else if (attribute.kind === 251 /* JsxSpreadAttribute */) {
                 return attrsType;
             }
             ts.Debug.fail("Expected JsxAttribute or JsxSpreadAttribute, got ts.SyntaxKind[" + kind + "]");
@@ -32152,58 +33992,73 @@ var ts;
             }
             var parent = node.parent;
             switch (parent.kind) {
-                case 219 /* VariableDeclaration */:
-                case 143 /* Parameter */:
-                case 146 /* PropertyDeclaration */:
-                case 145 /* PropertySignature */:
-                case 170 /* BindingElement */:
+                case 223 /* VariableDeclaration */:
+                case 144 /* Parameter */:
+                case 147 /* PropertyDeclaration */:
+                case 146 /* PropertySignature */:
+                case 174 /* BindingElement */:
                     return getContextualTypeForInitializerExpression(node);
-                case 181 /* ArrowFunction */:
-                case 212 /* ReturnStatement */:
+                case 185 /* ArrowFunction */:
+                case 216 /* ReturnStatement */:
                     return getContextualTypeForReturnExpression(node);
-                case 191 /* YieldExpression */:
+                case 195 /* YieldExpression */:
                     return getContextualTypeForYieldOperand(parent);
-                case 175 /* CallExpression */:
-                case 176 /* NewExpression */:
+                case 179 /* CallExpression */:
+                case 180 /* NewExpression */:
                     return getContextualTypeForArgument(parent, node);
-                case 178 /* TypeAssertionExpression */:
-                case 196 /* AsExpression */:
+                case 182 /* TypeAssertionExpression */:
+                case 200 /* AsExpression */:
                     return getTypeFromTypeNode(parent.type);
-                case 188 /* BinaryExpression */:
+                case 192 /* BinaryExpression */:
                     return getContextualTypeForBinaryOperand(node);
-                case 253 /* PropertyAssignment */:
-                case 254 /* ShorthandPropertyAssignment */:
+                case 257 /* PropertyAssignment */:
+                case 258 /* ShorthandPropertyAssignment */:
                     return getContextualTypeForObjectLiteralElement(parent);
-                case 171 /* ArrayLiteralExpression */:
+                case 175 /* ArrayLiteralExpression */:
                     return getContextualTypeForElementExpression(node);
-                case 189 /* ConditionalExpression */:
+                case 193 /* ConditionalExpression */:
                     return getContextualTypeForConditionalOperand(node);
-                case 198 /* TemplateSpan */:
-                    ts.Debug.assert(parent.parent.kind === 190 /* TemplateExpression */);
+                case 202 /* TemplateSpan */:
+                    ts.Debug.assert(parent.parent.kind === 194 /* TemplateExpression */);
                     return getContextualTypeForSubstitutionExpression(parent.parent, node);
-                case 179 /* ParenthesizedExpression */:
+                case 183 /* ParenthesizedExpression */:
                     return getContextualType(parent);
-                case 248 /* JsxExpression */:
+                case 252 /* JsxExpression */:
                     return getContextualType(parent);
-                case 246 /* JsxAttribute */:
-                case 247 /* JsxSpreadAttribute */:
+                case 250 /* JsxAttribute */:
+                case 251 /* JsxSpreadAttribute */:
                     return getContextualTypeForJsxAttribute(parent);
             }
             return undefined;
         }
         // If the given type is an object or union type, if that type has a single signature, and if
         // that signature is non-generic, return the signature. Otherwise return undefined.
-        function getNonGenericSignature(type) {
+        function getNonGenericSignature(type, node) {
             var signatures = getSignaturesOfStructuredType(type, 0 /* Call */);
             if (signatures.length === 1) {
                 var signature = signatures[0];
-                if (!signature.typeParameters) {
+                if (!signature.typeParameters && !isAritySmaller(signature, node)) {
                     return signature;
                 }
             }
         }
+        /** If the contextual signature has fewer parameters than the function expression, do not use it */
+        function isAritySmaller(signature, target) {
+            var targetParameterCount = 0;
+            for (; targetParameterCount < target.parameters.length; targetParameterCount++) {
+                var param = target.parameters[targetParameterCount];
+                if (param.initializer || param.questionToken || param.dotDotDotToken || isJSDocOptionalParameter(param)) {
+                    break;
+                }
+            }
+            if (target.parameters.length && ts.parameterIsThisKeyword(target.parameters[0])) {
+                targetParameterCount--;
+            }
+            var sourceLength = signature.hasRestParameter ? Number.MAX_VALUE : signature.parameters.length;
+            return sourceLength < targetParameterCount;
+        }
         function isFunctionExpressionOrArrowFunction(node) {
-            return node.kind === 180 /* FunctionExpression */ || node.kind === 181 /* ArrowFunction */;
+            return node.kind === 184 /* FunctionExpression */ || node.kind === 185 /* ArrowFunction */;
         }
         function getContextualSignatureForFunctionLikeDeclaration(node) {
             // Only function expressions, arrow functions, and object literal methods are contextually typed.
@@ -32222,19 +34077,19 @@ var ts;
         // 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 !== 148 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 149 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             var type = getContextualTypeForFunctionLikeDeclaration(node);
             if (!type) {
                 return undefined;
             }
-            if (!(type.flags & 524288 /* Union */)) {
-                return getNonGenericSignature(type);
+            if (!(type.flags & 65536 /* Union */)) {
+                return getNonGenericSignature(type, node);
             }
             var signatureList;
             var types = type.types;
             for (var _i = 0, types_14 = types; _i < types_14.length; _i++) {
                 var current = types_14[_i];
-                var signature = getNonGenericSignature(current);
+                var signature = getNonGenericSignature(current, node);
                 if (signature) {
                     if (!signatureList) {
                         // This signature will contribute to contextual union signature
@@ -32278,7 +34133,7 @@ var ts;
         function isInferentialContext(mapper) {
             return mapper && mapper.context;
         }
-        function checkSpreadElementExpression(node, contextualMapper) {
+        function checkSpreadExpression(node, contextualMapper) {
             // It is usually not safe to call checkExpressionCached if we can be contextually typing.
             // You can tell that we are contextually typing because of the contextualMapper parameter.
             // While it is true that a spread element can have a contextual type, it does not do anything
@@ -32289,8 +34144,8 @@ var ts;
             return checkIteratedTypeOrElementType(arrayOrIterableType, node.expression, /*allowStringInput*/ false);
         }
         function hasDefaultValue(node) {
-            return (node.kind === 170 /* BindingElement */ && !!node.initializer) ||
-                (node.kind === 188 /* BinaryExpression */ && node.operatorToken.kind === 57 /* EqualsToken */);
+            return (node.kind === 174 /* BindingElement */ && !!node.initializer) ||
+                (node.kind === 192 /* BinaryExpression */ && node.operatorToken.kind === 57 /* EqualsToken */);
         }
         function checkArrayLiteral(node, contextualMapper) {
             var elements = node.elements;
@@ -32299,7 +34154,7 @@ var ts;
             var inDestructuringPattern = ts.isAssignmentTarget(node);
             for (var _i = 0, elements_1 = elements; _i < elements_1.length; _i++) {
                 var e = elements_1[_i];
-                if (inDestructuringPattern && e.kind === 192 /* SpreadElementExpression */) {
+                if (inDestructuringPattern && e.kind === 196 /* SpreadElement */) {
                     // Given the following situation:
                     //    var c: {};
                     //    [...c] = ["", 0];
@@ -32323,7 +34178,7 @@ var ts;
                     var type = checkExpressionForMutableLocation(e, contextualMapper);
                     elementTypes.push(type);
                 }
-                hasSpreadElement = hasSpreadElement || e.kind === 192 /* SpreadElementExpression */;
+                hasSpreadElement = hasSpreadElement || e.kind === 196 /* SpreadElement */;
             }
             if (!hasSpreadElement) {
                 // If array literal is actually a destructuring pattern, mark it as an implied type. We do this such
@@ -32338,7 +34193,7 @@ var ts;
                     var pattern = 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 (pattern && (pattern.kind === 169 /* ArrayBindingPattern */ || pattern.kind === 171 /* ArrayLiteralExpression */)) {
+                    if (pattern && (pattern.kind === 173 /* ArrayBindingPattern */ || pattern.kind === 175 /* ArrayLiteralExpression */)) {
                         var patternElements = pattern.elements;
                         for (var i = elementTypes.length; i < patternElements.length; i++) {
                             var patternElement = patternElements[i];
@@ -32346,7 +34201,7 @@ var ts;
                                 elementTypes.push(contextualType.typeArguments[i]);
                             }
                             else {
-                                if (patternElement.kind !== 194 /* OmittedExpression */) {
+                                if (patternElement.kind !== 198 /* OmittedExpression */) {
                                     error(patternElement, ts.Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);
                                 }
                                 elementTypes.push(unknownType);
@@ -32363,7 +34218,7 @@ var ts;
                 strictNullChecks ? neverType : undefinedWideningType);
         }
         function isNumericName(name) {
-            return name.kind === 141 /* ComputedPropertyName */ ? isNumericComputedName(name) : isNumericLiteralName(name.text);
+            return name.kind === 142 /* ComputedPropertyName */ ? isNumericComputedName(name) : isNumericLiteralName(name.text);
         }
         function isNumericComputedName(name) {
             // It seems odd to consider an expression of type Any to result in a numeric name,
@@ -32431,9 +34286,11 @@ var ts;
             checkGrammarObjectLiteralExpression(node, inDestructuringPattern);
             var propertiesTable = ts.createMap();
             var propertiesArray = [];
+            var spread = emptyObjectType;
+            var propagatedFlags = 0;
             var contextualType = getApparentTypeOfContextualType(node);
             var contextualTypeHasPattern = contextualType && contextualType.pattern &&
-                (contextualType.pattern.kind === 168 /* ObjectBindingPattern */ || contextualType.pattern.kind === 172 /* ObjectLiteralExpression */);
+                (contextualType.pattern.kind === 172 /* ObjectBindingPattern */ || contextualType.pattern.kind === 176 /* ObjectLiteralExpression */);
             var typeFlags = 0;
             var patternWithComputedProperties = false;
             var hasComputedStringProperty = false;
@@ -32441,18 +34298,18 @@ var ts;
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var memberDecl = _a[_i];
                 var member = memberDecl.symbol;
-                if (memberDecl.kind === 253 /* PropertyAssignment */ ||
-                    memberDecl.kind === 254 /* ShorthandPropertyAssignment */ ||
+                if (memberDecl.kind === 257 /* PropertyAssignment */ ||
+                    memberDecl.kind === 258 /* ShorthandPropertyAssignment */ ||
                     ts.isObjectLiteralMethod(memberDecl)) {
                     var type = void 0;
-                    if (memberDecl.kind === 253 /* PropertyAssignment */) {
+                    if (memberDecl.kind === 257 /* PropertyAssignment */) {
                         type = checkPropertyAssignment(memberDecl, contextualMapper);
                     }
-                    else if (memberDecl.kind === 148 /* MethodDeclaration */) {
+                    else if (memberDecl.kind === 149 /* MethodDeclaration */) {
                         type = checkObjectLiteralMethod(memberDecl, contextualMapper);
                     }
                     else {
-                        ts.Debug.assert(memberDecl.kind === 254 /* ShorthandPropertyAssignment */);
+                        ts.Debug.assert(memberDecl.kind === 258 /* ShorthandPropertyAssignment */);
                         type = checkExpressionForMutableLocation(memberDecl.name, contextualMapper);
                     }
                     typeFlags |= type.flags;
@@ -32460,8 +34317,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 === 253 /* PropertyAssignment */ && hasDefaultValue(memberDecl.initializer)) ||
-                            (memberDecl.kind === 254 /* ShorthandPropertyAssignment */ && memberDecl.objectAssignmentInitializer);
+                        var isOptional = (memberDecl.kind === 257 /* PropertyAssignment */ && hasDefaultValue(memberDecl.initializer)) ||
+                            (memberDecl.kind === 258 /* ShorthandPropertyAssignment */ && memberDecl.objectAssignmentInitializer);
                         if (isOptional) {
                             prop.flags |= 536870912 /* Optional */;
                         }
@@ -32469,8 +34326,7 @@ var ts;
                             patternWithComputedProperties = true;
                         }
                     }
-                    else if (contextualTypeHasPattern &&
-                        !(contextualType.flags & 2588672 /* ObjectType */ && contextualType.isObjectLiteralPatternWithComputedProperties)) {
+                    else if (contextualTypeHasPattern && !(getObjectFlags(contextualType) & 512 /* ObjectLiteralPatternWithComputedProperties */)) {
                         // If object literal is contextually typed by the implied type of a binding pattern, and if the
                         // binding pattern specifies a default value for the property, make the property optional.
                         var impliedProp = getPropertyOfType(contextualType, member.name);
@@ -32490,13 +34346,30 @@ var ts;
                     prop.target = member;
                     member = prop;
                 }
+                else if (memberDecl.kind === 259 /* SpreadAssignment */) {
+                    if (propertiesArray.length > 0) {
+                        spread = getSpreadType(spread, createObjectLiteralType(), /*isFromObjectLiteral*/ true);
+                        propertiesArray = [];
+                        propertiesTable = ts.createMap();
+                        hasComputedStringProperty = false;
+                        hasComputedNumberProperty = false;
+                        typeFlags = 0;
+                    }
+                    var type = checkExpression(memberDecl.expression);
+                    if (!(type.flags & (32768 /* Object */ | 1 /* Any */))) {
+                        error(memberDecl, ts.Diagnostics.Spread_types_may_only_be_created_from_object_types);
+                        return unknownType;
+                    }
+                    spread = getSpreadType(spread, type, /*isFromObjectLiteral*/ false);
+                    continue;
+                }
                 else {
                     // TypeScript 1.0 spec (April 2014)
                     // A get accessor declaration is processed in the same manner as
                     // 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 === 150 /* GetAccessor */ || memberDecl.kind === 151 /* SetAccessor */);
+                    ts.Debug.assert(memberDecl.kind === 151 /* GetAccessor */ || memberDecl.kind === 152 /* SetAccessor */);
                     checkAccessorDeclaration(memberDecl);
                 }
                 if (ts.hasDynamicName(memberDecl)) {
@@ -32526,18 +34399,33 @@ var ts;
                     }
                 }
             }
-            var stringIndexInfo = hasComputedStringProperty ? getObjectLiteralIndexInfo(node, propertiesArray, 0 /* String */) : undefined;
-            var numberIndexInfo = hasComputedNumberProperty ? getObjectLiteralIndexInfo(node, propertiesArray, 1 /* Number */) : undefined;
-            var result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
-            var freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : 16777216 /* FreshLiteral */;
-            result.flags |= 8388608 /* ObjectLiteral */ | 67108864 /* ContainsObjectLiteral */ | freshObjectLiteralFlag | (typeFlags & 234881024 /* PropagatingFlags */);
-            if (patternWithComputedProperties) {
-                result.isObjectLiteralPatternWithComputedProperties = true;
+            if (spread !== emptyObjectType) {
+                if (propertiesArray.length > 0) {
+                    spread = getSpreadType(spread, createObjectLiteralType(), /*isFromObjectLiteral*/ true);
+                }
+                spread.flags |= propagatedFlags;
+                spread.symbol = node.symbol;
+                return spread;
             }
-            if (inDestructuringPattern) {
-                result.pattern = node;
+            return createObjectLiteralType();
+            function createObjectLiteralType() {
+                var stringIndexInfo = hasComputedStringProperty ? getObjectLiteralIndexInfo(node, propertiesArray, 0 /* String */) : undefined;
+                var numberIndexInfo = hasComputedNumberProperty ? getObjectLiteralIndexInfo(node, propertiesArray, 1 /* Number */) : undefined;
+                var result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
+                var freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : 1048576 /* FreshLiteral */;
+                result.flags |= 4194304 /* ContainsObjectLiteral */ | freshObjectLiteralFlag | (typeFlags & 14680064 /* PropagatingFlags */);
+                result.objectFlags |= 128 /* ObjectLiteral */;
+                if (patternWithComputedProperties) {
+                    result.objectFlags |= 512 /* ObjectLiteralPatternWithComputedProperties */;
+                }
+                if (inDestructuringPattern) {
+                    result.pattern = node;
+                }
+                if (!(result.flags & 6144 /* Nullable */)) {
+                    propagatedFlags |= (result.flags & 14680064 /* PropagatingFlags */);
+                }
+                return result;
             }
-            return result;
         }
         function checkJsxSelfClosingElement(node) {
             checkJsxOpeningLikeElement(node);
@@ -32557,13 +34445,13 @@ var ts;
             for (var _i = 0, _a = node.children; _i < _a.length; _i++) {
                 var child = _a[_i];
                 switch (child.kind) {
-                    case 248 /* JsxExpression */:
+                    case 252 /* JsxExpression */:
                         checkJsxExpression(child);
                         break;
-                    case 242 /* JsxElement */:
+                    case 246 /* JsxElement */:
                         checkJsxElement(child);
                         break;
-                    case 243 /* JsxSelfClosingElement */:
+                    case 247 /* JsxSelfClosingElement */:
                         checkJsxSelfClosingElement(child);
                         break;
                 }
@@ -32582,7 +34470,7 @@ var ts;
          */
         function isJsxIntrinsicIdentifier(tagName) {
             // TODO (yuisu): comment
-            if (tagName.kind === 173 /* PropertyAccessExpression */ || tagName.kind === 98 /* ThisKeyword */) {
+            if (tagName.kind === 177 /* PropertyAccessExpression */ || tagName.kind === 98 /* ThisKeyword */) {
                 return false;
             }
             else {
@@ -32600,7 +34488,7 @@ var ts;
                 var correspondingPropSymbol = getPropertyOfType(elementAttributesType, node.name.text);
                 correspondingPropType = correspondingPropSymbol && getTypeOfSymbol(correspondingPropSymbol);
                 if (isUnhyphenatedJsxName(node.name.text)) {
-                    var attributeType = getTypeOfPropertyOfType(elementAttributesType, getTextOfPropertyName(node.name)) || getIndexTypeOfType(elementAttributesType, 0 /* String */);
+                    var attributeType = getTypeOfPropertyOfType(elementAttributesType, ts.getTextOfPropertyName(node.name)) || getIndexTypeOfType(elementAttributesType, 0 /* String */);
                     if (attributeType) {
                         correspondingPropType = attributeType;
                     }
@@ -32693,7 +34581,7 @@ var ts;
          * For example, in the element <MyClass>, the element instance type is `MyClass` (not `typeof MyClass`).
          */
         function getJsxElementInstanceType(node, valueType) {
-            ts.Debug.assert(!(valueType.flags & 524288 /* Union */));
+            ts.Debug.assert(!(valueType.flags & 65536 /* Union */));
             if (isTypeAny(valueType)) {
                 // Short-circuit if the class tag is using an element type 'any'
                 return anyType;
@@ -32751,7 +34639,7 @@ var ts;
             if (!elemType) {
                 elemType = checkExpression(node.tagName);
             }
-            if (elemType.flags & 524288 /* Union */) {
+            if (elemType.flags & 65536 /* Union */) {
                 var types = elemType.types;
                 return getUnionType(ts.map(types, function (type) {
                     return getResolvedJsxType(node, type, elemClassType);
@@ -32825,7 +34713,7 @@ var ts;
                     // Props is of type 'any' or unknown
                     return attributesType;
                 }
-                else if (attributesType.flags & 524288 /* Union */) {
+                else if (attributesType.flags & 65536 /* Union */) {
                     // Props cannot be a union type
                     error(node.tagName, ts.Diagnostics.JSX_element_attributes_type_0_may_not_be_a_union_type, typeToString(attributesType));
                     return anyType;
@@ -32914,13 +34802,19 @@ var ts;
         function checkJsxOpeningLikeElement(node) {
             checkGrammarJsxElement(node);
             checkJsxPreconditions(node);
-            // The reactNamespace symbol should be marked as 'used' so we don't incorrectly elide its import. And if there
-            // is no reactNamespace symbol in scope when targeting React emit, we should issue an error.
+            // The reactNamespace/jsxFactory's root symbol should be marked as 'used' so we don't incorrectly elide its import.
+            // And if there is no reactNamespace/jsxFactory's symbol in scope when targeting React emit, we should issue an error.
             var reactRefErr = compilerOptions.jsx === 2 /* React */ ? ts.Diagnostics.Cannot_find_name_0 : undefined;
-            var reactNamespace = compilerOptions.reactNamespace ? compilerOptions.reactNamespace : "React";
+            var reactNamespace = getJsxNamespace();
             var reactSym = resolveName(node.tagName, reactNamespace, 107455 /* Value */, reactRefErr, reactNamespace);
             if (reactSym) {
-                getSymbolLinks(reactSym).referenced = true;
+                // Mark local symbol as referenced here because it might not have been marked
+                // if jsx emit was not react as there wont be error being emitted
+                reactSym.isReferenced = true;
+                // If react symbol is alias, mark it as refereced
+                if (reactSym.flags & 8388608 /* Alias */ && !isConstEnumOrConstEnumOnlyModule(resolveAlias(reactSym))) {
+                    markAliasSymbolAsReferenced(reactSym);
+                }
             }
             var targetAttributesType = getJsxElementAttributesType(node);
             var nameTable = ts.createMap();
@@ -32929,11 +34823,11 @@ var ts;
             // thus should have their types ignored
             var sawSpreadedAny = false;
             for (var i = node.attributes.length - 1; i >= 0; i--) {
-                if (node.attributes[i].kind === 246 /* JsxAttribute */) {
+                if (node.attributes[i].kind === 250 /* JsxAttribute */) {
                     checkJsxAttribute((node.attributes[i]), targetAttributesType, nameTable);
                 }
                 else {
-                    ts.Debug.assert(node.attributes[i].kind === 247 /* JsxSpreadAttribute */);
+                    ts.Debug.assert(node.attributes[i].kind === 251 /* JsxSpreadAttribute */);
                     var spreadType = checkJsxSpreadAttribute((node.attributes[i]), targetAttributesType, nameTable);
                     if (isTypeAny(spreadType)) {
                         sawSpreadedAny = true;
@@ -32963,7 +34857,7 @@ var ts;
         // If a symbol is a synthesized symbol with no value declaration, we assume it is a property. Example of this are the synthesized
         // '.prototype' property as well as synthesized tuple index properties.
         function getDeclarationKindFromSymbol(s) {
-            return s.valueDeclaration ? s.valueDeclaration.kind : 146 /* PropertyDeclaration */;
+            return s.valueDeclaration ? s.valueDeclaration.kind : 147 /* PropertyDeclaration */;
         }
         function getDeclarationModifierFlagsFromSymbol(s) {
             return s.valueDeclaration ? ts.getCombinedModifierFlags(s.valueDeclaration) : s.flags & 134217728 /* Prototype */ ? 4 /* Public */ | 32 /* Static */ : 0;
@@ -32982,7 +34876,7 @@ var ts;
         function checkClassPropertyAccess(node, left, type, prop) {
             var flags = getDeclarationModifierFlagsFromSymbol(prop);
             var declaringClass = getDeclaredTypeOfSymbol(getParentOfSymbol(prop));
-            var errorNode = node.kind === 173 /* PropertyAccessExpression */ || node.kind === 219 /* VariableDeclaration */ ?
+            var errorNode = node.kind === 177 /* PropertyAccessExpression */ || node.kind === 223 /* VariableDeclaration */ ?
                 node.name :
                 node.right;
             if (left.kind === 96 /* SuperKeyword */) {
@@ -32993,7 +34887,7 @@ var ts;
                 // - In a static member function or static member accessor
                 //   where this references the constructor function object of a derived class,
                 //   a super property access is permitted and must specify a public static member function of the base class.
-                if (languageVersion < 2 /* ES2015 */ && getDeclarationKindFromSymbol(prop) !== 148 /* MethodDeclaration */) {
+                if (languageVersion < 2 /* ES2015 */ && getDeclarationKindFromSymbol(prop) !== 149 /* MethodDeclaration */) {
                     // `prop` refers to a *property* declared in the super class
                     // rather than a *method*, so it does not satisfy the above criteria.
                     error(errorNode, ts.Diagnostics.Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword);
@@ -33047,7 +34941,7 @@ var ts;
                 type = getConstraintOfTypeParameter(type);
             }
             // TODO: why is the first part of this check here?
-            if (!(getTargetType(type).flags & (32768 /* Class */ | 65536 /* Interface */) && hasBaseType(type, enclosingClass))) {
+            if (!(getObjectFlags(getTargetType(type)) & 3 /* ClassOrInterface */ && hasBaseType(type, enclosingClass))) {
                 error(errorNode, ts.Diagnostics.Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1, symbolToString(prop), typeToString(enclosingClass));
                 return false;
             }
@@ -33073,6 +34967,33 @@ var ts;
         function checkQualifiedName(node) {
             return checkPropertyAccessExpressionOrQualifiedName(node, node.left, node.right);
         }
+        function reportNonexistentProperty(propNode, containingType) {
+            var errorInfo;
+            if (containingType.flags & 65536 /* Union */ && !(containingType.flags & 8190 /* Primitive */)) {
+                for (var _i = 0, _a = containingType.types; _i < _a.length; _i++) {
+                    var subtype = _a[_i];
+                    if (!getPropertyOfType(subtype, propNode.text)) {
+                        errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.declarationNameToString(propNode), typeToString(subtype));
+                        break;
+                    }
+                }
+            }
+            errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.declarationNameToString(propNode), typeToString(containingType));
+            diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(propNode, errorInfo));
+        }
+        function markPropertyAsReferenced(prop) {
+            if (prop &&
+                noUnusedIdentifiers &&
+                (prop.flags & 106500 /* ClassMember */) &&
+                prop.valueDeclaration && (ts.getModifierFlags(prop.valueDeclaration) & 8 /* Private */)) {
+                if (prop.flags & 16777216 /* Instantiated */) {
+                    getSymbolLinks(prop).target.isReferenced = true;
+                }
+                else {
+                    prop.isReferenced = true;
+                }
+            }
+        }
         function checkPropertyAccessExpressionOrQualifiedName(node, left, right) {
             var type = checkNonNullExpression(left);
             if (isTypeAny(type) || type === silentNeverType) {
@@ -33090,47 +35011,32 @@ var ts;
                 }
                 return unknownType;
             }
-            if (noUnusedIdentifiers &&
-                (prop.flags & 106500 /* ClassMember */) &&
-                prop.valueDeclaration && (ts.getModifierFlags(prop.valueDeclaration) & 8 /* Private */)) {
-                if (prop.flags & 16777216 /* Instantiated */) {
-                    getSymbolLinks(prop).target.isReferenced = true;
-                }
-                else {
-                    prop.isReferenced = true;
-                }
-            }
+            markPropertyAsReferenced(prop);
             getNodeLinks(node).resolvedSymbol = prop;
             if (prop.parent && prop.parent.flags & 32 /* Class */) {
                 checkClassPropertyAccess(node, left, apparentType, prop);
             }
             var propType = getTypeOfSymbol(prop);
+            var assignmentKind = ts.getAssignmentTargetKind(node);
+            if (assignmentKind) {
+                if (isReferenceToReadonlyEntity(node, prop) || isReferenceThroughNamespaceImport(node)) {
+                    error(right, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_constant_or_a_read_only_property, right.text);
+                    return unknownType;
+                }
+            }
             // 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 !== 173 /* PropertyAccessExpression */ || ts.isAssignmentTarget(node) ||
+            if (node.kind !== 177 /* PropertyAccessExpression */ || assignmentKind === 1 /* Definite */ ||
                 !(prop.flags & (3 /* Variable */ | 4 /* Property */ | 98304 /* Accessor */)) &&
-                    !(prop.flags & 8192 /* Method */ && propType.flags & 524288 /* Union */)) {
+                    !(prop.flags & 8192 /* Method */ && propType.flags & 65536 /* Union */)) {
                 return propType;
             }
-            return getFlowTypeOfReference(node, propType, /*assumeInitialized*/ true, /*flowContainer*/ undefined);
-            function reportNonexistentProperty(propNode, containingType) {
-                var errorInfo;
-                if (containingType.flags & 524288 /* Union */ && !(containingType.flags & 8190 /* Primitive */)) {
-                    for (var _i = 0, _a = containingType.types; _i < _a.length; _i++) {
-                        var subtype = _a[_i];
-                        if (!getPropertyOfType(subtype, propNode.text)) {
-                            errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.declarationNameToString(propNode), typeToString(subtype));
-                            break;
-                        }
-                    }
-                }
-                errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.declarationNameToString(propNode), typeToString(containingType));
-                diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(propNode, errorInfo));
-            }
+            var flowType = getFlowTypeOfReference(node, propType, /*assumeInitialized*/ true, /*flowContainer*/ undefined);
+            return assignmentKind ? getBaseTypeOfLiteralType(flowType) : flowType;
         }
         function isValidPropertyAccess(node, propertyName) {
-            var left = node.kind === 173 /* PropertyAccessExpression */
+            var left = node.kind === 177 /* PropertyAccessExpression */
                 ? node.expression
                 : node.left;
             var type = checkExpression(left);
@@ -33147,7 +35053,7 @@ var ts;
          */
         function getForInVariableSymbol(node) {
             var initializer = node.initializer;
-            if (initializer.kind === 220 /* VariableDeclarationList */) {
+            if (initializer.kind === 224 /* VariableDeclarationList */) {
                 var variable = initializer.declarations[0];
                 if (variable && !ts.isBindingPattern(variable.name)) {
                     return getSymbolOfNode(variable);
@@ -33169,14 +35075,14 @@ var ts;
          * that references a for-in variable for an object with numeric property names.
          */
         function isForInVariableForNumericPropertyNames(expr) {
-            var e = skipParenthesizedNodes(expr);
+            var e = ts.skipParentheses(expr);
             if (e.kind === 70 /* Identifier */) {
                 var symbol = getResolvedSymbol(e);
                 if (symbol.flags & 3 /* Variable */) {
                     var child = expr;
                     var node = expr.parent;
                     while (node) {
-                        if (node.kind === 208 /* ForInStatement */ &&
+                        if (node.kind === 212 /* ForInStatement */ &&
                             child === node.statement &&
                             getForInVariableSymbol(node) === symbol &&
                             hasNumericPropertyNames(checkExpression(node.expression))) {
@@ -33190,10 +35096,11 @@ var ts;
             return false;
         }
         function checkIndexedAccess(node) {
-            // Grammar checking
-            if (!node.argumentExpression) {
+            var objectType = checkNonNullExpression(node.expression);
+            var indexExpression = node.argumentExpression;
+            if (!indexExpression) {
                 var sourceFile = ts.getSourceFileOfNode(node);
-                if (node.parent.kind === 176 /* NewExpression */ && node.parent.expression === node) {
+                if (node.parent.kind === 180 /* 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);
@@ -33203,101 +35110,18 @@ var ts;
                     var end = node.end;
                     grammarErrorAtPos(sourceFile, start, end - start, ts.Diagnostics.Expression_expected);
                 }
+                return unknownType;
             }
-            // Obtain base constraint such that we can bail out if the constraint is an unknown type
-            var objectType = getApparentType(checkNonNullExpression(node.expression));
-            var indexType = node.argumentExpression ? checkExpression(node.argumentExpression) : unknownType;
+            var indexType = isForInVariableForNumericPropertyNames(indexExpression) ? numberType : checkExpression(indexExpression);
             if (objectType === unknownType || objectType === silentNeverType) {
                 return objectType;
             }
-            var isConstEnum = isConstEnumObjectType(objectType);
-            if (isConstEnum &&
-                (!node.argumentExpression || node.argumentExpression.kind !== 9 /* StringLiteral */)) {
-                error(node.argumentExpression, ts.Diagnostics.A_const_enum_member_can_only_be_accessed_using_a_string_literal);
+            if (isConstEnumObjectType(objectType) && indexExpression.kind !== 9 /* StringLiteral */) {
+                error(indexExpression, ts.Diagnostics.A_const_enum_member_can_only_be_accessed_using_a_string_literal);
                 return unknownType;
             }
-            // TypeScript 1.0 spec (April 2014): 4.10 Property Access
-            // - If IndexExpr is a string literal or a numeric literal and ObjExpr's apparent type has a property with the name
-            //    given by that literal(converted to its string representation in the case of a numeric literal), the property access is of the type of that property.
-            // - Otherwise, if ObjExpr's apparent type has a numeric index signature and IndexExpr is of type Any, the Number primitive type, or an enum type,
-            //    the property access is of the type of that index signature.
-            // - Otherwise, if ObjExpr's apparent type has a string index signature and IndexExpr is of type Any, the String or Number primitive type, or an enum type,
-            //    the property access is of the type of that index signature.
-            // - Otherwise, if IndexExpr is of type Any, the String or Number primitive type, or an enum type, the property access is of type Any.
-            // See if we can index as a property.
-            if (node.argumentExpression) {
-                var name_16 = getPropertyNameForIndexedAccess(node.argumentExpression, indexType);
-                if (name_16 !== undefined) {
-                    var prop = getPropertyOfType(objectType, name_16);
-                    if (prop) {
-                        getNodeLinks(node).resolvedSymbol = prop;
-                        return getTypeOfSymbol(prop);
-                    }
-                    else if (isConstEnum) {
-                        error(node.argumentExpression, ts.Diagnostics.Property_0_does_not_exist_on_const_enum_1, name_16, symbolToString(objectType.symbol));
-                        return unknownType;
-                    }
-                }
-            }
-            // Check for compatible indexer types.
-            var allowedNullableFlags = strictNullChecks ? 0 : 6144 /* Nullable */;
-            if (isTypeAnyOrAllConstituentTypesHaveKind(indexType, 34 /* StringLike */ | 340 /* NumberLike */ | 512 /* ESSymbol */ | allowedNullableFlags)) {
-                // Try to use a number indexer.
-                if (isTypeAnyOrAllConstituentTypesHaveKind(indexType, 340 /* NumberLike */ | allowedNullableFlags) || isForInVariableForNumericPropertyNames(node.argumentExpression)) {
-                    var numberIndexInfo = getIndexInfoOfType(objectType, 1 /* Number */);
-                    if (numberIndexInfo) {
-                        getNodeLinks(node).resolvedIndexInfo = numberIndexInfo;
-                        return numberIndexInfo.type;
-                    }
-                }
-                // Try to use string indexing.
-                var stringIndexInfo = getIndexInfoOfType(objectType, 0 /* String */);
-                if (stringIndexInfo) {
-                    getNodeLinks(node).resolvedIndexInfo = stringIndexInfo;
-                    return stringIndexInfo.type;
-                }
-                // Fall back to any.
-                if (compilerOptions.noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors && !isTypeAny(objectType)) {
-                    error(node, getIndexTypeOfType(objectType, 1 /* Number */) ?
-                        ts.Diagnostics.Element_implicitly_has_an_any_type_because_index_expression_is_not_of_type_number :
-                        ts.Diagnostics.Index_signature_of_object_type_implicitly_has_an_any_type);
-                }
-                return anyType;
-            }
-            // REVIEW: Users should know the type that was actually used.
-            error(node, ts.Diagnostics.An_index_expression_argument_must_be_of_type_string_number_symbol_or_any);
-            return unknownType;
+            return getIndexedAccessType(objectType, indexType, node);
         }
-        /**
-         * If indexArgumentExpression is a string literal or number literal, returns its text.
-         * If indexArgumentExpression is a constant value, returns its string value.
-         * If indexArgumentExpression is a well known symbol, returns the property name corresponding
-         *    to this symbol, as long as it is a proper symbol reference.
-         * Otherwise, returns undefined.
-         */
-        function getPropertyNameForIndexedAccess(indexArgumentExpression, indexArgumentType) {
-            if (indexArgumentExpression.kind === 9 /* StringLiteral */ || indexArgumentExpression.kind === 8 /* NumericLiteral */) {
-                return indexArgumentExpression.text;
-            }
-            if (indexArgumentExpression.kind === 174 /* ElementAccessExpression */ || indexArgumentExpression.kind === 173 /* PropertyAccessExpression */) {
-                var value = getConstantValue(indexArgumentExpression);
-                if (value !== undefined) {
-                    return value.toString();
-                }
-            }
-            if (checkThatExpressionIsProperSymbolReference(indexArgumentExpression, indexArgumentType, /*reportError*/ false)) {
-                var rightHandSideName = indexArgumentExpression.name.text;
-                return ts.getPropertyNameForKnownSymbolName(rightHandSideName);
-            }
-            return undefined;
-        }
-        /**
-         * A proper symbol reference requires the following:
-         *   1. The property access denotes a property that exists
-         *   2. The expression is of the form Symbol.<identifier>
-         *   3. The property access is of the primitive type symbol.
-         *   4. Symbol in this context resolves to the global Symbol object
-         */
         function checkThatExpressionIsProperSymbolReference(expression, expressionType, reportError) {
             if (expressionType === unknownType) {
                 // There is already an error, so no need to report one.
@@ -33334,10 +35158,10 @@ var ts;
             return true;
         }
         function resolveUntypedCall(node) {
-            if (node.kind === 177 /* TaggedTemplateExpression */) {
+            if (node.kind === 181 /* TaggedTemplateExpression */) {
                 checkExpression(node.template);
             }
-            else if (node.kind !== 144 /* Decorator */) {
+            else if (node.kind !== 145 /* Decorator */) {
                 ts.forEach(node.arguments, function (argument) {
                     checkExpression(argument);
                 });
@@ -33367,13 +35191,13 @@ var ts;
             for (var _i = 0, signatures_2 = signatures; _i < signatures_2.length; _i++) {
                 var signature = signatures_2[_i];
                 var symbol = signature.declaration && getSymbolOfNode(signature.declaration);
-                var parent_11 = signature.declaration && signature.declaration.parent;
+                var parent_9 = signature.declaration && signature.declaration.parent;
                 if (!lastSymbol || symbol === lastSymbol) {
-                    if (lastParent && parent_11 === lastParent) {
+                    if (lastParent && parent_9 === lastParent) {
                         index++;
                     }
                     else {
-                        lastParent = parent_11;
+                        lastParent = parent_9;
                         index = cutoffIndex;
                     }
                 }
@@ -33381,7 +35205,7 @@ var ts;
                     // current declaration belongs to a different symbol
                     // set cutoffIndex so re-orderings in the future won't change result set from 0 to cutoffIndex
                     index = cutoffIndex = result.length;
-                    lastParent = parent_11;
+                    lastParent = parent_9;
                 }
                 lastSymbol = symbol;
                 // specialized signatures always need to be placed before non-specialized signatures regardless
@@ -33403,7 +35227,7 @@ var ts;
         function getSpreadArgumentIndex(args) {
             for (var i = 0; i < args.length; i++) {
                 var arg = args[i];
-                if (arg && arg.kind === 192 /* SpreadElementExpression */) {
+                if (arg && arg.kind === 196 /* SpreadElement */) {
                     return i;
                 }
             }
@@ -33416,13 +35240,13 @@ var ts;
             var callIsIncomplete; // In incomplete call we want to be lenient when we have too few arguments
             var isDecorator;
             var spreadArgIndex = -1;
-            if (node.kind === 177 /* TaggedTemplateExpression */) {
+            if (node.kind === 181 /* TaggedTemplateExpression */) {
                 var tagExpression = node;
                 // Even if the call is incomplete, we'll have a missing expression as our last argument,
                 // so we can say the count is just the arg list length
                 argCount = args.length;
                 typeArguments = undefined;
-                if (tagExpression.template.kind === 190 /* TemplateExpression */) {
+                if (tagExpression.template.kind === 194 /* 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 templateExpression = tagExpression.template;
@@ -33439,7 +35263,7 @@ var ts;
                     callIsIncomplete = !!templateLiteral.isUnterminated;
                 }
             }
-            else if (node.kind === 144 /* Decorator */) {
+            else if (node.kind === 145 /* Decorator */) {
                 isDecorator = true;
                 typeArguments = undefined;
                 argCount = getEffectiveArgumentCount(node, /*args*/ undefined, signature);
@@ -33448,7 +35272,7 @@ var ts;
                 var callExpression = node;
                 if (!callExpression.arguments) {
                     // This only happens when we have something of the form: 'new C'
-                    ts.Debug.assert(callExpression.kind === 176 /* NewExpression */);
+                    ts.Debug.assert(callExpression.kind === 180 /* NewExpression */);
                     return signature.minArgumentCount === 0;
                 }
                 argCount = signatureHelpTrailingComma ? args.length + 1 : args.length;
@@ -33479,7 +35303,7 @@ var ts;
         }
         // If type has a single call signature and no other members, return that signature. Otherwise, return undefined.
         function getSingleCallSignature(type) {
-            if (type.flags & 2588672 /* ObjectType */) {
+            if (type.flags & 32768 /* Object */) {
                 var resolved = resolveStructuredTypeMembers(type);
                 if (resolved.callSignatures.length === 1 && resolved.constructSignatures.length === 0 &&
                     resolved.properties.length === 0 && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
@@ -33532,7 +35356,7 @@ var ts;
             for (var i = 0; i < argCount; i++) {
                 var arg = getEffectiveArgument(node, args, i);
                 // If the effective argument is 'undefined', then it is an argument that is present but is synthetic.
-                if (arg === undefined || arg.kind !== 194 /* OmittedExpression */) {
+                if (arg === undefined || arg.kind !== 198 /* OmittedExpression */) {
                     var paramType = getTypeAtPosition(signature, i);
                     var argType = getEffectiveArgumentType(node, i);
                     // If the effective argument type is 'undefined', there is no synthetic type
@@ -33589,7 +35413,7 @@ var ts;
         }
         function checkApplicableSignature(node, args, signature, relation, excludeArgument, reportErrors) {
             var thisType = getThisTypeOfSignature(signature);
-            if (thisType && thisType !== voidType && node.kind !== 176 /* NewExpression */) {
+            if (thisType && thisType !== voidType && node.kind !== 180 /* 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.
@@ -33606,7 +35430,7 @@ var ts;
             for (var i = 0; i < argCount; i++) {
                 var arg = getEffectiveArgument(node, args, i);
                 // If the effective argument is 'undefined', then it is an argument that is present but is synthetic.
-                if (arg === undefined || arg.kind !== 194 /* OmittedExpression */) {
+                if (arg === undefined || arg.kind !== 198 /* OmittedExpression */) {
                     // Check spread elements against rest type (from arity check we know spread argument corresponds to a rest parameter)
                     var paramType = getTypeAtPosition(signature, i);
                     var argType = getEffectiveArgumentType(node, i);
@@ -33628,12 +35452,12 @@ var ts;
          * Returns the this argument in calls like x.f(...) and x[f](...). Undefined otherwise.
          */
         function getThisArgumentOfCall(node) {
-            if (node.kind === 175 /* CallExpression */) {
+            if (node.kind === 179 /* CallExpression */) {
                 var callee = node.expression;
-                if (callee.kind === 173 /* PropertyAccessExpression */) {
+                if (callee.kind === 177 /* PropertyAccessExpression */) {
                     return callee.expression;
                 }
-                else if (callee.kind === 174 /* ElementAccessExpression */) {
+                else if (callee.kind === 178 /* ElementAccessExpression */) {
                     return callee.expression;
                 }
             }
@@ -33649,16 +35473,16 @@ var ts;
          */
         function getEffectiveCallArguments(node) {
             var args;
-            if (node.kind === 177 /* TaggedTemplateExpression */) {
+            if (node.kind === 181 /* TaggedTemplateExpression */) {
                 var template = node.template;
                 args = [undefined];
-                if (template.kind === 190 /* TemplateExpression */) {
+                if (template.kind === 194 /* TemplateExpression */) {
                     ts.forEach(template.templateSpans, function (span) {
                         args.push(span.expression);
                     });
                 }
             }
-            else if (node.kind === 144 /* Decorator */) {
+            else if (node.kind === 145 /* Decorator */) {
                 // For a decorator, we return undefined as we will determine
                 // the number and types of arguments for a decorator using
                 // `getEffectiveArgumentCount` and `getEffectiveArgumentType` below.
@@ -33683,19 +35507,19 @@ var ts;
           * Otherwise, the argument count is the length of the 'args' array.
           */
         function getEffectiveArgumentCount(node, args, signature) {
-            if (node.kind === 144 /* Decorator */) {
+            if (node.kind === 145 /* Decorator */) {
                 switch (node.parent.kind) {
-                    case 222 /* ClassDeclaration */:
-                    case 193 /* ClassExpression */:
+                    case 226 /* ClassDeclaration */:
+                    case 197 /* ClassExpression */:
                         // A class decorator will have one argument (see `ClassDecorator` in core.d.ts)
                         return 1;
-                    case 146 /* PropertyDeclaration */:
+                    case 147 /* PropertyDeclaration */:
                         // A property declaration decorator will have two arguments (see
                         // `PropertyDecorator` in core.d.ts)
                         return 2;
-                    case 148 /* MethodDeclaration */:
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
+                    case 149 /* MethodDeclaration */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* 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.
@@ -33705,7 +35529,7 @@ var ts;
                         // If the method decorator signature only accepts a target and a key, we will only
                         // type check those arguments.
                         return signature.parameters.length >= 3 ? 3 : 2;
-                    case 143 /* Parameter */:
+                    case 144 /* Parameter */:
                         // A parameter declaration decorator will have three arguments (see
                         // `ParameterDecorator` in core.d.ts)
                         return 3;
@@ -33729,25 +35553,25 @@ var ts;
           */
         function getEffectiveDecoratorFirstArgumentType(node) {
             // The first argument to a decorator is its `target`.
-            if (node.kind === 222 /* ClassDeclaration */) {
+            if (node.kind === 226 /* ClassDeclaration */) {
                 // For a class decorator, the `target` is the type of the class (e.g. the
                 // "static" or "constructor" side of the class)
                 var classSymbol = getSymbolOfNode(node);
                 return getTypeOfSymbol(classSymbol);
             }
-            if (node.kind === 143 /* Parameter */) {
+            if (node.kind === 144 /* Parameter */) {
                 // For a parameter decorator, the `target` is the parent type of the
                 // parameter's containing method.
                 node = node.parent;
-                if (node.kind === 149 /* Constructor */) {
+                if (node.kind === 150 /* Constructor */) {
                     var classSymbol = getSymbolOfNode(node);
                     return getTypeOfSymbol(classSymbol);
                 }
             }
-            if (node.kind === 146 /* PropertyDeclaration */ ||
-                node.kind === 148 /* MethodDeclaration */ ||
-                node.kind === 150 /* GetAccessor */ ||
-                node.kind === 151 /* SetAccessor */) {
+            if (node.kind === 147 /* PropertyDeclaration */ ||
+                node.kind === 149 /* MethodDeclaration */ ||
+                node.kind === 151 /* GetAccessor */ ||
+                node.kind === 152 /* SetAccessor */) {
                 // For a property or method decorator, the `target` is the
                 // "static"-side type of the parent of the member if the member is
                 // declared "static"; otherwise, it is the "instance"-side type of the
@@ -33774,21 +35598,21 @@ var ts;
           */
         function getEffectiveDecoratorSecondArgumentType(node) {
             // The second argument to a decorator is its `propertyKey`
-            if (node.kind === 222 /* ClassDeclaration */) {
+            if (node.kind === 226 /* ClassDeclaration */) {
                 ts.Debug.fail("Class decorators should not have a second synthetic argument.");
                 return unknownType;
             }
-            if (node.kind === 143 /* Parameter */) {
+            if (node.kind === 144 /* Parameter */) {
                 node = node.parent;
-                if (node.kind === 149 /* Constructor */) {
+                if (node.kind === 150 /* Constructor */) {
                     // For a constructor parameter decorator, the `propertyKey` will be `undefined`.
                     return anyType;
                 }
             }
-            if (node.kind === 146 /* PropertyDeclaration */ ||
-                node.kind === 148 /* MethodDeclaration */ ||
-                node.kind === 150 /* GetAccessor */ ||
-                node.kind === 151 /* SetAccessor */) {
+            if (node.kind === 147 /* PropertyDeclaration */ ||
+                node.kind === 149 /* MethodDeclaration */ ||
+                node.kind === 151 /* GetAccessor */ ||
+                node.kind === 152 /* SetAccessor */) {
                 // The `propertyKey` for a property or method decorator will be a
                 // string literal type if the member name is an identifier, number, or string;
                 // otherwise, if the member name is a computed property name it will
@@ -33799,7 +35623,7 @@ var ts;
                     case 8 /* NumericLiteral */:
                     case 9 /* StringLiteral */:
                         return getLiteralTypeForText(32 /* StringLiteral */, element.name.text);
-                    case 141 /* ComputedPropertyName */:
+                    case 142 /* ComputedPropertyName */:
                         var nameType = checkComputedPropertyName(element.name);
                         if (isTypeOfKind(nameType, 512 /* ESSymbol */)) {
                             return nameType;
@@ -33825,21 +35649,21 @@ var ts;
         function getEffectiveDecoratorThirdArgumentType(node) {
             // The third argument to a decorator is either its `descriptor` for a method decorator
             // or its `parameterIndex` for a parameter decorator
-            if (node.kind === 222 /* ClassDeclaration */) {
+            if (node.kind === 226 /* ClassDeclaration */) {
                 ts.Debug.fail("Class decorators should not have a third synthetic argument.");
                 return unknownType;
             }
-            if (node.kind === 143 /* Parameter */) {
+            if (node.kind === 144 /* Parameter */) {
                 // The `parameterIndex` for a parameter decorator is always a number
                 return numberType;
             }
-            if (node.kind === 146 /* PropertyDeclaration */) {
+            if (node.kind === 147 /* PropertyDeclaration */) {
                 ts.Debug.fail("Property decorators should not have a third synthetic argument.");
                 return unknownType;
             }
-            if (node.kind === 148 /* MethodDeclaration */ ||
-                node.kind === 150 /* GetAccessor */ ||
-                node.kind === 151 /* SetAccessor */) {
+            if (node.kind === 149 /* MethodDeclaration */ ||
+                node.kind === 151 /* GetAccessor */ ||
+                node.kind === 152 /* SetAccessor */) {
                 // The `descriptor` for a method decorator will be a `TypedPropertyDescriptor<T>`
                 // for the type of the member.
                 var propertyType = getTypeOfNode(node);
@@ -33871,10 +35695,10 @@ var ts;
             // Decorators provide special arguments, a tagged template expression provides
             // a special first argument, and string literals get string literal types
             // unless we're reporting errors
-            if (node.kind === 144 /* Decorator */) {
+            if (node.kind === 145 /* Decorator */) {
                 return getEffectiveDecoratorArgumentType(node, argIndex);
             }
-            else if (argIndex === 0 && node.kind === 177 /* TaggedTemplateExpression */) {
+            else if (argIndex === 0 && node.kind === 181 /* TaggedTemplateExpression */) {
                 return getGlobalTemplateStringsArrayType();
             }
             // This is not a synthetic argument, so we return 'undefined'
@@ -33886,8 +35710,8 @@ var ts;
           */
         function getEffectiveArgument(node, args, argIndex) {
             // For a decorator or the first argument of a tagged template expression we return undefined.
-            if (node.kind === 144 /* Decorator */ ||
-                (argIndex === 0 && node.kind === 177 /* TaggedTemplateExpression */)) {
+            if (node.kind === 145 /* Decorator */ ||
+                (argIndex === 0 && node.kind === 181 /* TaggedTemplateExpression */)) {
                 return undefined;
             }
             return args[argIndex];
@@ -33896,11 +35720,11 @@ var ts;
           * Gets the error node to use when reporting errors for an effective argument.
           */
         function getEffectiveArgumentErrorNode(node, argIndex, arg) {
-            if (node.kind === 144 /* Decorator */) {
+            if (node.kind === 145 /* Decorator */) {
                 // For a decorator, we use the expression of the decorator for error reporting.
                 return node.expression;
             }
-            else if (argIndex === 0 && node.kind === 177 /* TaggedTemplateExpression */) {
+            else if (argIndex === 0 && node.kind === 181 /* TaggedTemplateExpression */) {
                 // For a the first argument of a tagged template expression, we use the template of the tag for error reporting.
                 return node.template;
             }
@@ -33909,8 +35733,8 @@ var ts;
             }
         }
         function resolveCall(node, signatures, candidatesOutArray, headMessage) {
-            var isTaggedTemplate = node.kind === 177 /* TaggedTemplateExpression */;
-            var isDecorator = node.kind === 144 /* Decorator */;
+            var isTaggedTemplate = node.kind === 181 /* TaggedTemplateExpression */;
+            var isDecorator = node.kind === 145 /* Decorator */;
             var typeArguments;
             if (!isTaggedTemplate && !isDecorator) {
                 typeArguments = node.typeArguments;
@@ -33981,7 +35805,7 @@ var ts;
             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 = candidatesOutArray && node.kind === 175 /* CallExpression */ && node.arguments.hasTrailingComma;
+            var signatureHelpTrailingComma = candidatesOutArray && node.kind === 179 /* 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
@@ -34020,7 +35844,7 @@ var ts;
             else if (candidateForTypeArgumentError) {
                 if (!isTaggedTemplate && !isDecorator && typeArguments) {
                     var typeArguments_2 = node.typeArguments;
-                    checkTypeArguments(candidateForTypeArgumentError, typeArguments_2, ts.map(typeArguments_2, getTypeFromTypeNodeNoAlias), /*reportErrors*/ true, headMessage);
+                    checkTypeArguments(candidateForTypeArgumentError, typeArguments_2, ts.map(typeArguments_2, getTypeFromTypeNode), /*reportErrors*/ true, headMessage);
                 }
                 else {
                     ts.Debug.assert(resultOfFailedInference.failedTypeParameterIndex >= 0);
@@ -34047,7 +35871,7 @@ var ts;
                     var candidate = candidates_1[_i];
                     if (hasCorrectArity(node, args, candidate)) {
                         if (candidate.typeParameters && typeArguments) {
-                            candidate = getSignatureInstantiation(candidate, ts.map(typeArguments, getTypeFromTypeNodeNoAlias));
+                            candidate = getSignatureInstantiation(candidate, ts.map(typeArguments, getTypeFromTypeNode));
                         }
                         return candidate;
                     }
@@ -34079,7 +35903,7 @@ var ts;
                         if (candidate.typeParameters) {
                             var typeArgumentTypes = void 0;
                             if (typeArguments) {
-                                typeArgumentTypes = ts.map(typeArguments, getTypeFromTypeNodeNoAlias);
+                                typeArgumentTypes = ts.map(typeArguments, getTypeFromTypeNode);
                                 typeArgumentsAreValid = checkTypeArguments(candidate, typeArguments, typeArgumentTypes, /*reportErrors*/ false);
                             }
                             else {
@@ -34195,7 +36019,7 @@ var ts;
             if (!numCallSignatures && !numConstructSignatures) {
                 // We exclude union types because we may have a union of function types that happen to have
                 // no common signatures.
-                if (funcType.flags & 524288 /* Union */) {
+                if (funcType.flags & 65536 /* Union */) {
                     return false;
                 }
                 return isTypeAssignableTo(funcType, globalFunctionType);
@@ -34329,16 +36153,16 @@ var ts;
           */
         function getDiagnosticHeadMessageForDecoratorResolution(node) {
             switch (node.parent.kind) {
-                case 222 /* ClassDeclaration */:
-                case 193 /* ClassExpression */:
+                case 226 /* ClassDeclaration */:
+                case 197 /* ClassExpression */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression;
-                case 143 /* Parameter */:
+                case 144 /* Parameter */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression;
-                case 146 /* PropertyDeclaration */:
+                case 147 /* PropertyDeclaration */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression;
-                case 148 /* MethodDeclaration */:
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
+                case 149 /* MethodDeclaration */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression;
             }
         }
@@ -34368,13 +36192,13 @@ var ts;
         }
         function resolveSignature(node, candidatesOutArray) {
             switch (node.kind) {
-                case 175 /* CallExpression */:
+                case 179 /* CallExpression */:
                     return resolveCallExpression(node, candidatesOutArray);
-                case 176 /* NewExpression */:
+                case 180 /* NewExpression */:
                     return resolveNewExpression(node, candidatesOutArray);
-                case 177 /* TaggedTemplateExpression */:
+                case 181 /* TaggedTemplateExpression */:
                     return resolveTaggedTemplateExpression(node, candidatesOutArray);
-                case 144 /* Decorator */:
+                case 145 /* Decorator */:
                     return resolveDecorator(node, candidatesOutArray);
             }
             ts.Debug.fail("Branch in 'resolveSignature' should be unreachable.");
@@ -34423,12 +36247,12 @@ var ts;
             if (node.expression.kind === 96 /* SuperKeyword */) {
                 return voidType;
             }
-            if (node.kind === 176 /* NewExpression */) {
+            if (node.kind === 180 /* NewExpression */) {
                 var declaration = signature.declaration;
                 if (declaration &&
-                    declaration.kind !== 149 /* Constructor */ &&
-                    declaration.kind !== 153 /* ConstructSignature */ &&
-                    declaration.kind !== 158 /* ConstructorType */ &&
+                    declaration.kind !== 150 /* Constructor */ &&
+                    declaration.kind !== 154 /* ConstructSignature */ &&
+                    declaration.kind !== 159 /* ConstructorType */ &&
                     !ts.isJSDocConstructSignature(declaration)) {
                     // When resolved signature is a call signature (and not a construct signature) the result type is any, unless
                     // the declaring function had members created through 'x.prototype.y = expr' or 'this.y = expr' psuedodeclarations
@@ -34448,14 +36272,37 @@ var ts;
                 }
             }
             // In JavaScript files, calls to any identifier 'require' are treated as external module imports
-            if (ts.isInJavaScriptFile(node) &&
-                ts.isRequireCall(node, /*checkArgumentIsStringLiteral*/ true) &&
-                // Make sure require is not a local function
-                !resolveName(node.expression, node.expression.text, 107455 /* Value */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined)) {
+            if (ts.isInJavaScriptFile(node) && isCommonJsRequire(node)) {
                 return resolveExternalModuleTypeByLiteral(node.arguments[0]);
             }
             return getReturnTypeOfSignature(signature);
         }
+        function isCommonJsRequire(node) {
+            if (!ts.isRequireCall(node, /*checkArgumentIsStringLiteral*/ true)) {
+                return false;
+            }
+            // Make sure require is not a local function
+            var resolvedRequire = resolveName(node.expression, node.expression.text, 107455 /* Value */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined);
+            if (!resolvedRequire) {
+                // project does not contain symbol named 'require' - assume commonjs require
+                return true;
+            }
+            // project includes symbol named 'require' - make sure that it it ambient and local non-alias
+            if (resolvedRequire.flags & 8388608 /* Alias */) {
+                return false;
+            }
+            var targetDeclarationKind = resolvedRequire.flags & 16 /* Function */
+                ? 225 /* FunctionDeclaration */
+                : resolvedRequire.flags & 3 /* Variable */
+                    ? 223 /* VariableDeclaration */
+                    : 0 /* Unknown */;
+            if (targetDeclarationKind !== 0 /* Unknown */) {
+                var decl = ts.getDeclarationOfKind(resolvedRequire, targetDeclarationKind);
+                // function/variable declaration should be ambient
+                return ts.isInAmbientContext(decl);
+            }
+            return false;
+        }
         function checkTaggedTemplateExpression(node) {
             return getReturnTypeOfSignature(getResolvedSignature(node));
         }
@@ -34544,8 +36391,8 @@ var ts;
                 links.type = instantiateType(contextualType, mapper);
                 // if inference didn't come up with anything but {}, fall back to the binding pattern if present.
                 if (links.type === emptyObjectType &&
-                    (parameter.valueDeclaration.name.kind === 168 /* ObjectBindingPattern */ ||
-                        parameter.valueDeclaration.name.kind === 169 /* ArrayBindingPattern */)) {
+                    (parameter.valueDeclaration.name.kind === 172 /* ObjectBindingPattern */ ||
+                        parameter.valueDeclaration.name.kind === 173 /* ArrayBindingPattern */)) {
                     links.type = getTypeFromBindingPattern(parameter.valueDeclaration.name);
                 }
                 assignBindingElementTypes(parameter.valueDeclaration);
@@ -34603,7 +36450,7 @@ var ts;
         function createPromiseReturnType(func, promisedType) {
             var promiseType = createPromiseType(promisedType);
             if (promiseType === emptyObjectType) {
-                error(func, ts.Diagnostics.An_async_function_or_method_must_have_a_valid_awaitable_return_type);
+                error(func, 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);
                 return unknownType;
             }
             return promiseType;
@@ -34615,7 +36462,7 @@ var ts;
             }
             var isAsync = ts.isAsyncFunctionLike(func);
             var type;
-            if (func.body.kind !== 200 /* Block */) {
+            if (func.body.kind !== 204 /* Block */) {
                 type = checkExpressionCached(func.body, contextualMapper);
                 if (isAsync) {
                     // From within an async function you can return either a non-promise value or a promise. Any
@@ -34705,7 +36552,7 @@ var ts;
                 return false;
             }
             var lastStatement = ts.lastOrUndefined(func.body.statements);
-            if (lastStatement && lastStatement.kind === 214 /* SwitchStatement */ && isExhaustiveSwitchStatement(lastStatement)) {
+            if (lastStatement && lastStatement.kind === 218 /* SwitchStatement */ && isExhaustiveSwitchStatement(lastStatement)) {
                 return false;
             }
             return true;
@@ -34738,7 +36585,7 @@ var ts;
                 }
             });
             if (aggregatedTypes.length === 0 && !hasReturnWithNoExpression && (hasReturnOfTypeNever ||
-                func.kind === 180 /* FunctionExpression */ || func.kind === 181 /* ArrowFunction */)) {
+                func.kind === 184 /* FunctionExpression */ || func.kind === 185 /* ArrowFunction */)) {
                 return undefined;
             }
             if (strictNullChecks && aggregatedTypes.length && hasReturnWithNoExpression) {
@@ -34767,7 +36614,7 @@ var ts;
             }
             // 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 (ts.nodeIsMissing(func.body) || func.body.kind !== 200 /* Block */ || !functionHasImplicitReturn(func)) {
+            if (ts.nodeIsMissing(func.body) || func.body.kind !== 204 /* Block */ || !functionHasImplicitReturn(func)) {
                 return;
             }
             var hasExplicitReturn = func.flags & 256 /* HasExplicitReturn */;
@@ -34800,10 +36647,10 @@ var ts;
             }
         }
         function checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper) {
-            ts.Debug.assert(node.kind !== 148 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 149 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             // Grammar checking
             var hasGrammarError = checkGrammarFunctionLikeDeclaration(node);
-            if (!hasGrammarError && node.kind === 180 /* FunctionExpression */) {
+            if (!hasGrammarError && node.kind === 184 /* FunctionExpression */) {
                 checkGrammarForGenerator(node);
             }
             // The identityMapper object is used to indicate that function expressions are wildcards
@@ -34844,14 +36691,14 @@ var ts;
                     }
                 }
             }
-            if (produceDiagnostics && node.kind !== 148 /* MethodDeclaration */) {
+            if (produceDiagnostics && node.kind !== 149 /* MethodDeclaration */) {
                 checkCollisionWithCapturedSuperVariable(node, node.name);
                 checkCollisionWithCapturedThisVariable(node, node.name);
             }
             return type;
         }
         function checkFunctionExpressionOrObjectLiteralMethodDeferred(node) {
-            ts.Debug.assert(node.kind !== 148 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 149 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             var isAsync = ts.isAsyncFunctionLike(node);
             var returnOrPromisedType = node.type && (isAsync ? checkAsyncFunctionReturnType(node) : getTypeFromTypeNode(node.type));
             if (!node.asteriskToken) {
@@ -34867,7 +36714,7 @@ var ts;
                     // checkFunctionExpressionBodies). So it must be done now.
                     getReturnTypeOfSignature(getSignatureFromDeclaration(node));
                 }
-                if (node.body.kind === 200 /* Block */) {
+                if (node.body.kind === 204 /* Block */) {
                     checkSourceElement(node.body);
                 }
                 else {
@@ -34914,11 +36761,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 === 173 /* PropertyAccessExpression */ || expr.kind === 174 /* ElementAccessExpression */) &&
+                    (expr.kind === 177 /* PropertyAccessExpression */ || expr.kind === 178 /* ElementAccessExpression */) &&
                     expr.expression.kind === 98 /* 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 === 149 /* Constructor */))
+                    if (!(func && func.kind === 150 /* Constructor */))
                         return true;
                     // If func.parent is a class and symbol is a (readonly) property of that class, or
                     // if func is a constructor and symbol is a (readonly) parameter property declared in it,
@@ -34930,50 +36777,25 @@ var ts;
             return false;
         }
         function isReferenceThroughNamespaceImport(expr) {
-            if (expr.kind === 173 /* PropertyAccessExpression */ || expr.kind === 174 /* ElementAccessExpression */) {
-                var node = skipParenthesizedNodes(expr.expression);
+            if (expr.kind === 177 /* PropertyAccessExpression */ || expr.kind === 178 /* ElementAccessExpression */) {
+                var node = ts.skipParentheses(expr.expression);
                 if (node.kind === 70 /* Identifier */) {
                     var symbol = getNodeLinks(node).resolvedSymbol;
                     if (symbol.flags & 8388608 /* Alias */) {
                         var declaration = getDeclarationOfAliasSymbol(symbol);
-                        return declaration && declaration.kind === 233 /* NamespaceImport */;
+                        return declaration && declaration.kind === 237 /* NamespaceImport */;
                     }
                 }
             }
             return false;
         }
-        function checkReferenceExpression(expr, invalidReferenceMessage, constantVariableMessage) {
+        function checkReferenceExpression(expr, invalidReferenceMessage) {
             // References are combinations of identifiers, parentheses, and property accesses.
-            var node = skipParenthesizedNodes(expr);
-            if (node.kind !== 70 /* Identifier */ && node.kind !== 173 /* PropertyAccessExpression */ && node.kind !== 174 /* ElementAccessExpression */) {
+            var node = ts.skipParentheses(expr);
+            if (node.kind !== 70 /* Identifier */ && node.kind !== 177 /* PropertyAccessExpression */ && node.kind !== 178 /* ElementAccessExpression */) {
                 error(expr, invalidReferenceMessage);
                 return false;
             }
-            // Because we get the symbol from the resolvedSymbol property, it might be of kind
-            // SymbolFlags.ExportValue. In this case it is necessary to get the actual export
-            // symbol, which will have the correct flags set on it.
-            var links = getNodeLinks(node);
-            var symbol = getExportSymbolOfValueSymbolIfExported(links.resolvedSymbol);
-            if (symbol) {
-                if (symbol !== unknownSymbol && symbol !== argumentsSymbol) {
-                    // Only variables (and not functions, classes, namespaces, enum objects, or enum members)
-                    // are considered references when referenced using a simple identifier.
-                    if (node.kind === 70 /* Identifier */ && !(symbol.flags & 3 /* Variable */)) {
-                        error(expr, invalidReferenceMessage);
-                        return false;
-                    }
-                    if (isReferenceToReadonlyEntity(node, symbol) || isReferenceThroughNamespaceImport(node)) {
-                        error(expr, constantVariableMessage);
-                        return false;
-                    }
-                }
-            }
-            else if (node.kind === 174 /* ElementAccessExpression */) {
-                if (links.resolvedIndexInfo && links.resolvedIndexInfo.isReadonly) {
-                    error(expr, constantVariableMessage);
-                    return false;
-                }
-            }
             return true;
         }
         function checkDeleteExpression(node) {
@@ -34991,7 +36813,7 @@ var ts;
         function checkAwaitExpression(node) {
             // Grammar checking
             if (produceDiagnostics) {
-                if (!(node.flags & 262144 /* AwaitContext */)) {
+                if (!(node.flags & 524288 /* AwaitContext */)) {
                     grammarErrorOnFirstToken(node, ts.Diagnostics.await_expression_is_only_allowed_within_an_async_function);
                 }
                 if (isInParameterInitializerBeforeContainingFunction(node)) {
@@ -35027,7 +36849,7 @@ var ts;
                     var ok = checkArithmeticOperandType(node.operand, getNonNullableType(operandType), ts.Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
                     if (ok) {
                         // run check only if former checks succeeded to avoid reporting cascading errors
-                        checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property);
+                        checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_or_a_property_access);
                     }
                     return numberType;
             }
@@ -35041,7 +36863,7 @@ var ts;
             var ok = checkArithmeticOperandType(node.operand, getNonNullableType(operandType), ts.Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
             if (ok) {
                 // run check only if former checks succeeded to avoid reporting cascading errors
-                checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property);
+                checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_or_a_property_access);
             }
             return numberType;
         }
@@ -35051,7 +36873,7 @@ var ts;
             if (type.flags & kind) {
                 return true;
             }
-            if (type.flags & 1572864 /* UnionOrIntersection */) {
+            if (type.flags & 196608 /* UnionOrIntersection */) {
                 var types = type.types;
                 for (var _i = 0, types_15 = types; _i < types_15.length; _i++) {
                     var t = types_15[_i];
@@ -35069,7 +36891,7 @@ var ts;
             if (type.flags & kind) {
                 return true;
             }
-            if (type.flags & 524288 /* Union */) {
+            if (type.flags & 65536 /* Union */) {
                 var types = type.types;
                 for (var _i = 0, types_16 = types; _i < types_16.length; _i++) {
                     var t = types_16[_i];
@@ -35079,7 +36901,7 @@ var ts;
                 }
                 return true;
             }
-            if (type.flags & 1048576 /* Intersection */) {
+            if (type.flags & 131072 /* Intersection */) {
                 var types = type.types;
                 for (var _a = 0, types_17 = types; _a < types_17.length; _a++) {
                     var t = types_17[_a];
@@ -35091,7 +36913,7 @@ var ts;
             return false;
         }
         function isConstEnumObjectType(type) {
-            return type.flags & (2588672 /* ObjectType */ | 2097152 /* Anonymous */) && type.symbol && isConstEnumSymbol(type.symbol);
+            return getObjectFlags(type) & 16 /* Anonymous */ && type.symbol && isConstEnumSymbol(type.symbol);
         }
         function isConstEnumSymbol(symbol) {
             return (symbol.flags & 128 /* ConstEnum */) !== 0;
@@ -35125,36 +36947,36 @@ var ts;
             if (!isTypeAnyOrAllConstituentTypesHaveKind(leftType, 34 /* StringLike */ | 340 /* NumberLike */ | 512 /* ESSymbol */)) {
                 error(left, ts.Diagnostics.The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol);
             }
-            if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, 2588672 /* ObjectType */ | 16384 /* TypeParameter */)) {
+            if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, 32768 /* Object */ | 16384 /* TypeParameter */)) {
                 error(right, ts.Diagnostics.The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter);
             }
             return booleanType;
         }
         function checkObjectLiteralAssignment(node, sourceType) {
             var properties = node.properties;
-            for (var _i = 0, properties_4 = properties; _i < properties_4.length; _i++) {
-                var p = properties_4[_i];
+            for (var _i = 0, properties_5 = properties; _i < properties_5.length; _i++) {
+                var p = properties_5[_i];
                 checkObjectLiteralDestructuringPropertyAssignment(sourceType, p);
             }
             return sourceType;
         }
         function checkObjectLiteralDestructuringPropertyAssignment(objectLiteralType, property) {
-            if (property.kind === 253 /* PropertyAssignment */ || property.kind === 254 /* ShorthandPropertyAssignment */) {
-                var name_17 = property.name;
-                if (name_17.kind === 141 /* ComputedPropertyName */) {
-                    checkComputedPropertyName(name_17);
+            if (property.kind === 257 /* PropertyAssignment */ || property.kind === 258 /* ShorthandPropertyAssignment */) {
+                var name_21 = property.name;
+                if (name_21.kind === 142 /* ComputedPropertyName */) {
+                    checkComputedPropertyName(name_21);
                 }
-                if (isComputedNonLiteralName(name_17)) {
+                if (isComputedNonLiteralName(name_21)) {
                     return undefined;
                 }
-                var text = getTextOfPropertyName(name_17);
+                var text = ts.getTextOfPropertyName(name_21);
                 var type = isTypeAny(objectLiteralType)
                     ? objectLiteralType
                     : getTypeOfPropertyOfType(objectLiteralType, text) ||
                         isNumericLiteralName(text) && getIndexTypeOfType(objectLiteralType, 1 /* Number */) ||
                         getIndexTypeOfType(objectLiteralType, 0 /* String */);
                 if (type) {
-                    if (property.kind === 254 /* ShorthandPropertyAssignment */) {
+                    if (property.kind === 258 /* ShorthandPropertyAssignment */) {
                         return checkDestructuringAssignment(property, type);
                     }
                     else {
@@ -35163,7 +36985,12 @@ var ts;
                     }
                 }
                 else {
-                    error(name_17, ts.Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(objectLiteralType), ts.declarationNameToString(name_17));
+                    error(name_21, ts.Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(objectLiteralType), ts.declarationNameToString(name_21));
+                }
+            }
+            else if (property.kind === 259 /* SpreadAssignment */) {
+                if (property.expression.kind !== 70 /* Identifier */) {
+                    error(property.expression, ts.Diagnostics.An_object_rest_element_must_be_an_identifier);
                 }
             }
             else {
@@ -35184,8 +37011,8 @@ var ts;
         function checkArrayLiteralDestructuringElementAssignment(node, sourceType, elementIndex, elementType, contextualMapper) {
             var elements = node.elements;
             var element = elements[elementIndex];
-            if (element.kind !== 194 /* OmittedExpression */) {
-                if (element.kind !== 192 /* SpreadElementExpression */) {
+            if (element.kind !== 198 /* OmittedExpression */) {
+                if (element.kind !== 196 /* SpreadElement */) {
                     var propName = "" + elementIndex;
                     var type = isTypeAny(sourceType)
                         ? sourceType
@@ -35209,11 +37036,11 @@ var ts;
                 }
                 else {
                     if (elementIndex < elements.length - 1) {
-                        error(element, ts.Diagnostics.A_rest_element_must_be_last_in_an_array_destructuring_pattern);
+                        error(element, ts.Diagnostics.A_rest_element_must_be_last_in_a_destructuring_pattern);
                     }
                     else {
                         var restExpression = element.expression;
-                        if (restExpression.kind === 188 /* BinaryExpression */ && restExpression.operatorToken.kind === 57 /* EqualsToken */) {
+                        if (restExpression.kind === 192 /* BinaryExpression */ && restExpression.operatorToken.kind === 57 /* EqualsToken */) {
                             error(restExpression.operatorToken, ts.Diagnostics.A_rest_element_cannot_have_an_initializer);
                         }
                         else {
@@ -35226,7 +37053,7 @@ var ts;
         }
         function checkDestructuringAssignment(exprOrAssignment, sourceType, contextualMapper) {
             var target;
-            if (exprOrAssignment.kind === 254 /* ShorthandPropertyAssignment */) {
+            if (exprOrAssignment.kind === 258 /* ShorthandPropertyAssignment */) {
                 var prop = exprOrAssignment;
                 if (prop.objectAssignmentInitializer) {
                     // In strict null checking mode, if a default value of a non-undefined type is specified, remove
@@ -35242,21 +37069,21 @@ var ts;
             else {
                 target = exprOrAssignment;
             }
-            if (target.kind === 188 /* BinaryExpression */ && target.operatorToken.kind === 57 /* EqualsToken */) {
+            if (target.kind === 192 /* BinaryExpression */ && target.operatorToken.kind === 57 /* EqualsToken */) {
                 checkBinaryExpression(target, contextualMapper);
                 target = target.left;
             }
-            if (target.kind === 172 /* ObjectLiteralExpression */) {
+            if (target.kind === 176 /* ObjectLiteralExpression */) {
                 return checkObjectLiteralAssignment(target, sourceType);
             }
-            if (target.kind === 171 /* ArrayLiteralExpression */) {
+            if (target.kind === 175 /* ArrayLiteralExpression */) {
                 return checkArrayLiteralAssignment(target, sourceType, contextualMapper);
             }
             return checkReferenceAssignment(target, sourceType, contextualMapper);
         }
         function checkReferenceAssignment(target, sourceType, contextualMapper) {
             var targetType = checkExpression(target, contextualMapper);
-            if (checkReferenceExpression(target, ts.Diagnostics.Invalid_left_hand_side_of_assignment_expression, ts.Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property)) {
+            if (checkReferenceExpression(target, ts.Diagnostics.The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access)) {
                 checkTypeAssignableTo(sourceType, targetType, target, /*headMessage*/ undefined);
             }
             return sourceType;
@@ -35275,35 +37102,35 @@ var ts;
                 case 70 /* Identifier */:
                 case 9 /* StringLiteral */:
                 case 11 /* RegularExpressionLiteral */:
-                case 177 /* TaggedTemplateExpression */:
-                case 190 /* TemplateExpression */:
+                case 181 /* TaggedTemplateExpression */:
+                case 194 /* TemplateExpression */:
                 case 12 /* NoSubstitutionTemplateLiteral */:
                 case 8 /* NumericLiteral */:
                 case 100 /* TrueKeyword */:
                 case 85 /* FalseKeyword */:
                 case 94 /* NullKeyword */:
-                case 136 /* UndefinedKeyword */:
-                case 180 /* FunctionExpression */:
-                case 193 /* ClassExpression */:
-                case 181 /* ArrowFunction */:
-                case 171 /* ArrayLiteralExpression */:
-                case 172 /* ObjectLiteralExpression */:
-                case 183 /* TypeOfExpression */:
-                case 197 /* NonNullExpression */:
-                case 243 /* JsxSelfClosingElement */:
-                case 242 /* JsxElement */:
+                case 137 /* UndefinedKeyword */:
+                case 184 /* FunctionExpression */:
+                case 197 /* ClassExpression */:
+                case 185 /* ArrowFunction */:
+                case 175 /* ArrayLiteralExpression */:
+                case 176 /* ObjectLiteralExpression */:
+                case 187 /* TypeOfExpression */:
+                case 201 /* NonNullExpression */:
+                case 247 /* JsxSelfClosingElement */:
+                case 246 /* JsxElement */:
                     return true;
-                case 189 /* ConditionalExpression */:
+                case 193 /* ConditionalExpression */:
                     return isSideEffectFree(node.whenTrue) &&
                         isSideEffectFree(node.whenFalse);
-                case 188 /* BinaryExpression */:
+                case 192 /* BinaryExpression */:
                     if (ts.isAssignmentOperator(node.operatorToken.kind)) {
                         return false;
                     }
                     return isSideEffectFree(node.left) &&
                         isSideEffectFree(node.right);
-                case 186 /* PrefixUnaryExpression */:
-                case 187 /* PostfixUnaryExpression */:
+                case 190 /* PrefixUnaryExpression */:
+                case 191 /* PostfixUnaryExpression */:
                     // Unary operators ~, !, +, and - have no side effects.
                     // The rest do.
                     switch (node.operator) {
@@ -35315,9 +37142,9 @@ var ts;
                     }
                     return false;
                 // Some forms listed here for clarity
-                case 184 /* VoidExpression */: // Explicit opt-out
-                case 178 /* TypeAssertionExpression */: // Not SEF, but can produce useful type warnings
-                case 196 /* AsExpression */: // Not SEF, but can produce useful type warnings
+                case 188 /* VoidExpression */: // Explicit opt-out
+                case 182 /* TypeAssertionExpression */: // Not SEF, but can produce useful type warnings
+                case 200 /* AsExpression */: // Not SEF, but can produce useful type warnings
                 default:
                     return false;
             }
@@ -35337,7 +37164,7 @@ var ts;
         }
         function checkBinaryLikeExpression(left, operatorToken, right, contextualMapper, errorNode) {
             var operator = operatorToken.kind;
-            if (operator === 57 /* EqualsToken */ && (left.kind === 172 /* ObjectLiteralExpression */ || left.kind === 171 /* ArrayLiteralExpression */)) {
+            if (operator === 57 /* EqualsToken */ && (left.kind === 176 /* ObjectLiteralExpression */ || left.kind === 175 /* ArrayLiteralExpression */)) {
                 return checkDestructuringAssignment(left, checkExpression(right, contextualMapper), contextualMapper);
             }
             var leftType = checkExpression(left, contextualMapper);
@@ -35520,9 +37347,7 @@ var ts;
                     // requires VarExpr to be classified as a reference
                     // A compound assignment furthermore requires VarExpr to be classified as a reference (section 4.1)
                     // and the type of the non - compound operation to be assignable to the type of VarExpr.
-                    var ok = checkReferenceExpression(left, ts.Diagnostics.Invalid_left_hand_side_of_assignment_expression, ts.Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property);
-                    // Use default messages
-                    if (ok) {
+                    if (checkReferenceExpression(left, ts.Diagnostics.The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access)) {
                         // to avoid cascading errors check assignability only if 'isReference' check succeeded and no errors were reported
                         checkTypeAssignableTo(valueType, leftType, left, /*headMessage*/ undefined);
                     }
@@ -35550,7 +37375,7 @@ var ts;
         function checkYieldExpression(node) {
             // Grammar checking
             if (produceDiagnostics) {
-                if (!(node.flags & 65536 /* YieldContext */) || isYieldExpressionInClass(node)) {
+                if (!(node.flags & 131072 /* YieldContext */) || isYieldExpressionInClass(node)) {
                     grammarErrorOnFirstToken(node, ts.Diagnostics.A_yield_expression_is_only_allowed_in_a_generator_body);
                 }
                 if (isInParameterInitializerBeforeContainingFunction(node)) {
@@ -35638,8 +37463,8 @@ var ts;
             return links.resolvedType;
         }
         function isTypeAssertion(node) {
-            node = skipParenthesizedNodes(node);
-            return node.kind === 178 /* TypeAssertionExpression */ || node.kind === 196 /* AsExpression */;
+            node = ts.skipParentheses(node);
+            return node.kind === 182 /* TypeAssertionExpression */ || node.kind === 200 /* AsExpression */;
         }
         function checkDeclarationInitializer(declaration) {
             var type = checkExpressionCached(declaration.initializer);
@@ -35671,7 +37496,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 === 141 /* ComputedPropertyName */) {
+            if (node.name.kind === 142 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
             }
             return checkExpressionForMutableLocation(node.initializer, contextualMapper);
@@ -35682,7 +37507,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 === 141 /* ComputedPropertyName */) {
+            if (node.name.kind === 142 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
             }
             var uninstantiatedType = checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper);
@@ -35712,7 +37537,7 @@ var ts;
         // contextually typed function and arrow expressions in the initial phase.
         function checkExpression(node, contextualMapper) {
             var type;
-            if (node.kind === 140 /* QualifiedName */) {
+            if (node.kind === 141 /* QualifiedName */) {
                 type = checkQualifiedName(node);
             }
             else {
@@ -35724,9 +37549,9 @@ var ts;
                 // - 'left' in property access
                 // - 'object' in indexed access
                 // - target in rhs of import statement
-                var ok = (node.parent.kind === 173 /* PropertyAccessExpression */ && node.parent.expression === node) ||
-                    (node.parent.kind === 174 /* ElementAccessExpression */ && node.parent.expression === node) ||
-                    ((node.kind === 70 /* Identifier */ || node.kind === 140 /* QualifiedName */) && isInRightSideOfImportOrExportAssignment(node));
+                var ok = (node.parent.kind === 177 /* PropertyAccessExpression */ && node.parent.expression === node) ||
+                    (node.parent.kind === 178 /* ElementAccessExpression */ && node.parent.expression === node) ||
+                    ((node.kind === 70 /* Identifier */ || node.kind === 141 /* QualifiedName */) && isInRightSideOfImportOrExportAssignment(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);
                 }
@@ -35748,66 +37573,66 @@ var ts;
                 case 100 /* TrueKeyword */:
                 case 85 /* FalseKeyword */:
                     return checkLiteralExpression(node);
-                case 190 /* TemplateExpression */:
+                case 194 /* TemplateExpression */:
                     return checkTemplateExpression(node);
                 case 12 /* NoSubstitutionTemplateLiteral */:
                     return stringType;
                 case 11 /* RegularExpressionLiteral */:
                     return globalRegExpType;
-                case 171 /* ArrayLiteralExpression */:
+                case 175 /* ArrayLiteralExpression */:
                     return checkArrayLiteral(node, contextualMapper);
-                case 172 /* ObjectLiteralExpression */:
+                case 176 /* ObjectLiteralExpression */:
                     return checkObjectLiteral(node, contextualMapper);
-                case 173 /* PropertyAccessExpression */:
+                case 177 /* PropertyAccessExpression */:
                     return checkPropertyAccessExpression(node);
-                case 174 /* ElementAccessExpression */:
+                case 178 /* ElementAccessExpression */:
                     return checkIndexedAccess(node);
-                case 175 /* CallExpression */:
-                case 176 /* NewExpression */:
+                case 179 /* CallExpression */:
+                case 180 /* NewExpression */:
                     return checkCallExpression(node);
-                case 177 /* TaggedTemplateExpression */:
+                case 181 /* TaggedTemplateExpression */:
                     return checkTaggedTemplateExpression(node);
-                case 179 /* ParenthesizedExpression */:
+                case 183 /* ParenthesizedExpression */:
                     return checkExpression(node.expression, contextualMapper);
-                case 193 /* ClassExpression */:
+                case 197 /* ClassExpression */:
                     return checkClassExpression(node);
-                case 180 /* FunctionExpression */:
-                case 181 /* ArrowFunction */:
+                case 184 /* FunctionExpression */:
+                case 185 /* ArrowFunction */:
                     return checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper);
-                case 183 /* TypeOfExpression */:
+                case 187 /* TypeOfExpression */:
                     return checkTypeOfExpression(node);
-                case 178 /* TypeAssertionExpression */:
-                case 196 /* AsExpression */:
+                case 182 /* TypeAssertionExpression */:
+                case 200 /* AsExpression */:
                     return checkAssertion(node);
-                case 197 /* NonNullExpression */:
+                case 201 /* NonNullExpression */:
                     return checkNonNullAssertion(node);
-                case 182 /* DeleteExpression */:
+                case 186 /* DeleteExpression */:
                     return checkDeleteExpression(node);
-                case 184 /* VoidExpression */:
+                case 188 /* VoidExpression */:
                     return checkVoidExpression(node);
-                case 185 /* AwaitExpression */:
+                case 189 /* AwaitExpression */:
                     return checkAwaitExpression(node);
-                case 186 /* PrefixUnaryExpression */:
+                case 190 /* PrefixUnaryExpression */:
                     return checkPrefixUnaryExpression(node);
-                case 187 /* PostfixUnaryExpression */:
+                case 191 /* PostfixUnaryExpression */:
                     return checkPostfixUnaryExpression(node);
-                case 188 /* BinaryExpression */:
+                case 192 /* BinaryExpression */:
                     return checkBinaryExpression(node, contextualMapper);
-                case 189 /* ConditionalExpression */:
+                case 193 /* ConditionalExpression */:
                     return checkConditionalExpression(node, contextualMapper);
-                case 192 /* SpreadElementExpression */:
-                    return checkSpreadElementExpression(node, contextualMapper);
-                case 194 /* OmittedExpression */:
+                case 196 /* SpreadElement */:
+                    return checkSpreadExpression(node, contextualMapper);
+                case 198 /* OmittedExpression */:
                     return undefinedWideningType;
-                case 191 /* YieldExpression */:
+                case 195 /* YieldExpression */:
                     return checkYieldExpression(node);
-                case 248 /* JsxExpression */:
+                case 252 /* JsxExpression */:
                     return checkJsxExpression(node);
-                case 242 /* JsxElement */:
+                case 246 /* JsxElement */:
                     return checkJsxElement(node);
-                case 243 /* JsxSelfClosingElement */:
+                case 247 /* JsxSelfClosingElement */:
                     return checkJsxSelfClosingElement(node);
-                case 244 /* JsxOpeningElement */:
+                case 248 /* JsxOpeningElement */:
                     ts.Debug.fail("Shouldn't ever directly check a JsxOpeningElement");
             }
             return unknownType;
@@ -35835,7 +37660,7 @@ var ts;
             var func = ts.getContainingFunction(node);
             if (ts.getModifierFlags(node) & 92 /* ParameterPropertyModifier */) {
                 func = ts.getContainingFunction(node);
-                if (!(func.kind === 149 /* Constructor */ && ts.nodeIsPresent(func.body))) {
+                if (!(func.kind === 150 /* Constructor */ && ts.nodeIsPresent(func.body))) {
                     error(node, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
                 }
             }
@@ -35846,7 +37671,7 @@ var ts;
                 if (ts.indexOf(func.parameters, node) !== 0) {
                     error(node, ts.Diagnostics.A_this_parameter_must_be_the_first_parameter);
                 }
-                if (func.kind === 149 /* Constructor */ || func.kind === 153 /* ConstructSignature */ || func.kind === 158 /* ConstructorType */) {
+                if (func.kind === 150 /* Constructor */ || func.kind === 154 /* ConstructSignature */ || func.kind === 159 /* ConstructorType */) {
                     error(node, ts.Diagnostics.A_constructor_cannot_have_a_this_parameter);
                 }
             }
@@ -35860,9 +37685,9 @@ var ts;
             if (!node.asteriskToken || !node.body) {
                 return false;
             }
-            return node.kind === 148 /* MethodDeclaration */ ||
-                node.kind === 221 /* FunctionDeclaration */ ||
-                node.kind === 180 /* FunctionExpression */;
+            return node.kind === 149 /* MethodDeclaration */ ||
+                node.kind === 225 /* FunctionDeclaration */ ||
+                node.kind === 184 /* FunctionExpression */;
         }
         function getTypePredicateParameterIndex(parameterList, parameter) {
             if (parameterList) {
@@ -35905,9 +37730,9 @@ var ts;
                 else if (parameterName) {
                     var hasReportedError = false;
                     for (var _i = 0, _a = parent.parameters; _i < _a.length; _i++) {
-                        var name_18 = _a[_i].name;
-                        if (ts.isBindingPattern(name_18) &&
-                            checkIfTypePredicateVariableIsDeclaredInBindingPattern(name_18, parameterName, typePredicate.parameterName)) {
+                        var name_22 = _a[_i].name;
+                        if (ts.isBindingPattern(name_22) &&
+                            checkIfTypePredicateVariableIsDeclaredInBindingPattern(name_22, parameterName, typePredicate.parameterName)) {
                             hasReportedError = true;
                             break;
                         }
@@ -35920,16 +37745,16 @@ var ts;
         }
         function getTypePredicateParent(node) {
             switch (node.parent.kind) {
-                case 181 /* ArrowFunction */:
-                case 152 /* CallSignature */:
-                case 221 /* FunctionDeclaration */:
-                case 180 /* FunctionExpression */:
-                case 157 /* FunctionType */:
-                case 148 /* MethodDeclaration */:
-                case 147 /* MethodSignature */:
-                    var parent_12 = node.parent;
-                    if (node === parent_12.type) {
-                        return parent_12;
+                case 185 /* ArrowFunction */:
+                case 153 /* CallSignature */:
+                case 225 /* FunctionDeclaration */:
+                case 184 /* FunctionExpression */:
+                case 158 /* FunctionType */:
+                case 149 /* MethodDeclaration */:
+                case 148 /* MethodSignature */:
+                    var parent_10 = node.parent;
+                    if (node === parent_10.type) {
+                        return parent_10;
                     }
             }
         }
@@ -35939,15 +37764,15 @@ var ts;
                 if (ts.isOmittedExpression(element)) {
                     continue;
                 }
-                var name_19 = element.name;
-                if (name_19.kind === 70 /* Identifier */ &&
-                    name_19.text === predicateVariableName) {
+                var name_23 = element.name;
+                if (name_23.kind === 70 /* Identifier */ &&
+                    name_23.text === predicateVariableName) {
                     error(predicateVariableNode, ts.Diagnostics.A_type_predicate_cannot_reference_element_0_in_a_binding_pattern, predicateVariableName);
                     return true;
                 }
-                else if (name_19.kind === 169 /* ArrayBindingPattern */ ||
-                    name_19.kind === 168 /* ObjectBindingPattern */) {
-                    if (checkIfTypePredicateVariableIsDeclaredInBindingPattern(name_19, predicateVariableNode, predicateVariableName)) {
+                else if (name_23.kind === 173 /* ArrayBindingPattern */ ||
+                    name_23.kind === 172 /* ObjectBindingPattern */) {
+                    if (checkIfTypePredicateVariableIsDeclaredInBindingPattern(name_23, predicateVariableNode, predicateVariableName)) {
                         return true;
                     }
                 }
@@ -35955,12 +37780,12 @@ var ts;
         }
         function checkSignatureDeclaration(node) {
             // Grammar checking
-            if (node.kind === 154 /* IndexSignature */) {
+            if (node.kind === 155 /* IndexSignature */) {
                 checkGrammarIndexSignature(node);
             }
-            else if (node.kind === 157 /* FunctionType */ || node.kind === 221 /* FunctionDeclaration */ || node.kind === 158 /* ConstructorType */ ||
-                node.kind === 152 /* CallSignature */ || node.kind === 149 /* Constructor */ ||
-                node.kind === 153 /* ConstructSignature */) {
+            else if (node.kind === 158 /* FunctionType */ || node.kind === 225 /* FunctionDeclaration */ || node.kind === 159 /* ConstructorType */ ||
+                node.kind === 153 /* CallSignature */ || node.kind === 150 /* Constructor */ ||
+                node.kind === 154 /* ConstructSignature */) {
                 checkGrammarFunctionLikeDeclaration(node);
             }
             checkTypeParameters(node.typeParameters);
@@ -35972,10 +37797,10 @@ var ts;
                 checkCollisionWithArgumentsInGeneratedCode(node);
                 if (compilerOptions.noImplicitAny && !node.type) {
                     switch (node.kind) {
-                        case 153 /* ConstructSignature */:
+                        case 154 /* ConstructSignature */:
                             error(node, ts.Diagnostics.Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
-                        case 152 /* CallSignature */:
+                        case 153 /* CallSignature */:
                             error(node, ts.Diagnostics.Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
                     }
@@ -36018,7 +37843,7 @@ var ts;
             var staticNames = ts.createMap();
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                if (member.kind === 149 /* Constructor */) {
+                if (member.kind === 150 /* Constructor */) {
                     for (var _b = 0, _c = member.parameters; _b < _c.length; _b++) {
                         var param = _c[_b];
                         if (ts.isParameterPropertyDeclaration(param)) {
@@ -36032,13 +37857,13 @@ var ts;
                     var memberName = member.name && ts.getPropertyNameForPropertyNameNode(member.name);
                     if (memberName) {
                         switch (member.kind) {
-                            case 150 /* GetAccessor */:
+                            case 151 /* GetAccessor */:
                                 addName(names, member.name, memberName, 1 /* Getter */);
                                 break;
-                            case 151 /* SetAccessor */:
+                            case 152 /* SetAccessor */:
                                 addName(names, member.name, memberName, 2 /* Setter */);
                                 break;
-                            case 146 /* PropertyDeclaration */:
+                            case 147 /* PropertyDeclaration */:
                                 addName(names, member.name, memberName, 3 /* Property */);
                                 break;
                         }
@@ -36064,7 +37889,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 == 145 /* PropertySignature */) {
+                if (member.kind == 146 /* PropertySignature */) {
                     var memberName = void 0;
                     switch (member.name.kind) {
                         case 9 /* StringLiteral */:
@@ -36086,7 +37911,7 @@ var ts;
             }
         }
         function checkTypeForDuplicateIndexSignatures(node) {
-            if (node.kind === 223 /* InterfaceDeclaration */) {
+            if (node.kind === 227 /* 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
@@ -36106,7 +37931,7 @@ var ts;
                     var declaration = decl;
                     if (declaration.parameters.length === 1 && declaration.parameters[0].type) {
                         switch (declaration.parameters[0].type.kind) {
-                            case 133 /* StringKeyword */:
+                            case 134 /* StringKeyword */:
                                 if (!seenStringIndexer) {
                                     seenStringIndexer = true;
                                 }
@@ -36114,7 +37939,7 @@ var ts;
                                     error(declaration, ts.Diagnostics.Duplicate_string_index_signature);
                                 }
                                 break;
-                            case 131 /* NumberKeyword */:
+                            case 132 /* NumberKeyword */:
                                 if (!seenNumericIndexer) {
                                     seenNumericIndexer = true;
                                 }
@@ -36182,12 +38007,12 @@ var ts;
                 if (n.kind === 98 /* ThisKeyword */) {
                     error(n, ts.Diagnostics.this_cannot_be_referenced_in_current_location);
                 }
-                else if (n.kind !== 180 /* FunctionExpression */ && n.kind !== 221 /* FunctionDeclaration */) {
+                else if (n.kind !== 184 /* FunctionExpression */ && n.kind !== 225 /* FunctionDeclaration */) {
                     ts.forEachChild(n, markThisReferencesAsErrors);
                 }
             }
             function isInstancePropertyWithInitializer(n) {
-                return n.kind === 146 /* PropertyDeclaration */ &&
+                return n.kind === 147 /* PropertyDeclaration */ &&
                     !(ts.getModifierFlags(n) & 32 /* Static */) &&
                     !!n.initializer;
             }
@@ -36217,7 +38042,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 === 203 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
+                            if (statement.kind === 207 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
                                 superCallStatement = statement;
                                 break;
                             }
@@ -36241,7 +38066,7 @@ var ts;
                 checkGrammarFunctionLikeDeclaration(node) || checkGrammarAccessor(node) || checkGrammarComputedPropertyName(node.name);
                 checkDecorators(node);
                 checkSignatureDeclaration(node);
-                if (node.kind === 150 /* GetAccessor */) {
+                if (node.kind === 151 /* GetAccessor */) {
                     if (!ts.isInAmbientContext(node) && 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);
@@ -36251,13 +38076,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 === 141 /* ComputedPropertyName */) {
+                if (node.name.kind === 142 /* ComputedPropertyName */) {
                     checkComputedPropertyName(node.name);
                 }
                 if (!ts.hasDynamicName(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 === 150 /* GetAccessor */ ? 151 /* SetAccessor */ : 150 /* GetAccessor */;
+                    var otherKind = node.kind === 151 /* GetAccessor */ ? 152 /* SetAccessor */ : 151 /* GetAccessor */;
                     var otherAccessor = ts.getDeclarationOfKind(node.symbol, otherKind);
                     if (otherAccessor) {
                         if ((ts.getModifierFlags(node) & 28 /* AccessibilityModifier */) !== (ts.getModifierFlags(otherAccessor) & 28 /* AccessibilityModifier */)) {
@@ -36273,11 +38098,11 @@ var ts;
                     }
                 }
                 var returnType = getTypeOfAccessors(getSymbolOfNode(node));
-                if (node.kind === 150 /* GetAccessor */) {
+                if (node.kind === 151 /* GetAccessor */) {
                     checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnType);
                 }
             }
-            if (node.parent.kind !== 172 /* ObjectLiteralExpression */) {
+            if (node.parent.kind !== 176 /* ObjectLiteralExpression */) {
                 checkSourceElement(node.body);
                 registerForUnusedIdentifiersCheck(node);
             }
@@ -36307,7 +38132,7 @@ var ts;
                 var constraint = getConstraintOfTypeParameter(typeParameters[i]);
                 if (constraint) {
                     if (!typeArguments) {
-                        typeArguments = ts.map(typeArgumentNodes, getTypeFromTypeNodeNoAlias);
+                        typeArguments = ts.map(typeArgumentNodes, getTypeFromTypeNode);
                         mapper = createTypeMapper(typeParameters, typeArguments);
                     }
                     var typeArgument = typeArguments[i];
@@ -36360,6 +38185,17 @@ var ts;
         function checkUnionOrIntersectionType(node) {
             ts.forEach(node.types, checkSourceElement);
         }
+        function checkIndexedAccessType(node) {
+            getTypeFromIndexedAccessTypeNode(node);
+        }
+        function checkMappedType(node) {
+            checkSourceElement(node.typeParameter);
+            checkSourceElement(node.type);
+            var type = getTypeFromMappedTypeNode(node);
+            var constraintType = getConstraintTypeFromMappedType(type);
+            var keyType = constraintType.flags & 16384 /* TypeParameter */ ? getApparentTypeOfTypeParameter(constraintType) : constraintType;
+            checkTypeAssignableTo(keyType, stringOrNumberType, node.typeParameter.constraint);
+        }
         function isPrivateWithinAmbient(node) {
             return (ts.getModifierFlags(node) & 8 /* Private */) && ts.isInAmbientContext(node);
         }
@@ -36367,9 +38203,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 !== 223 /* InterfaceDeclaration */ &&
-                n.parent.kind !== 222 /* ClassDeclaration */ &&
-                n.parent.kind !== 193 /* ClassExpression */ &&
+            if (n.parent.kind !== 227 /* InterfaceDeclaration */ &&
+                n.parent.kind !== 226 /* ClassDeclaration */ &&
+                n.parent.kind !== 197 /* ClassExpression */ &&
                 ts.isInAmbientContext(n)) {
                 if (!(flags & 2 /* Ambient */)) {
                     // It is nested in an ambient context, which means it is automatically exported
@@ -36457,7 +38293,7 @@ var ts;
                         var errorNode_1 = subsequentNode.name || subsequentNode;
                         // TODO(jfreeman): These are methods, so handle computed name case
                         if (node.name && subsequentNode.name && node.name.text === subsequentNode.name.text) {
-                            var reportError = (node.kind === 148 /* MethodDeclaration */ || node.kind === 147 /* MethodSignature */) &&
+                            var reportError = (node.kind === 149 /* MethodDeclaration */ || node.kind === 148 /* MethodSignature */) &&
                                 (ts.getModifierFlags(node) & 32 /* Static */) !== (ts.getModifierFlags(subsequentNode) & 32 /* Static */);
                             // we can get here in two cases
                             // 1. mixed static and instance class members
@@ -36496,7 +38332,7 @@ var ts;
                 var current = declarations_4[_i];
                 var node = current;
                 var inAmbientContext = ts.isInAmbientContext(node);
-                var inAmbientContextOrInterface = node.parent.kind === 223 /* InterfaceDeclaration */ || node.parent.kind === 160 /* TypeLiteral */ || inAmbientContext;
+                var inAmbientContextOrInterface = node.parent.kind === 227 /* InterfaceDeclaration */ || node.parent.kind === 161 /* TypeLiteral */ || inAmbientContext;
                 if (inAmbientContextOrInterface) {
                     // check if declarations are consecutive only if they are non-ambient
                     // 1. ambient declarations can be interleaved
@@ -36507,7 +38343,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 === 221 /* FunctionDeclaration */ || node.kind === 148 /* MethodDeclaration */ || node.kind === 147 /* MethodSignature */ || node.kind === 149 /* Constructor */) {
+                if (node.kind === 225 /* FunctionDeclaration */ || node.kind === 149 /* MethodDeclaration */ || node.kind === 148 /* MethodSignature */ || node.kind === 150 /* Constructor */) {
                     var currentNodeFlags = getEffectiveDeclarationFlags(node, flagsToCheck);
                     someNodeFlags |= currentNodeFlags;
                     allNodeFlags &= currentNodeFlags;
@@ -36629,16 +38465,16 @@ var ts;
             }
             function getDeclarationSpaces(d) {
                 switch (d.kind) {
-                    case 223 /* InterfaceDeclaration */:
+                    case 227 /* InterfaceDeclaration */:
                         return 2097152 /* ExportType */;
-                    case 226 /* ModuleDeclaration */:
+                    case 230 /* ModuleDeclaration */:
                         return ts.isAmbientModule(d) || ts.getModuleInstanceState(d) !== 0 /* NonInstantiated */
                             ? 4194304 /* ExportNamespace */ | 1048576 /* ExportValue */
                             : 4194304 /* ExportNamespace */;
-                    case 222 /* ClassDeclaration */:
-                    case 225 /* EnumDeclaration */:
+                    case 226 /* ClassDeclaration */:
+                    case 229 /* EnumDeclaration */:
                         return 2097152 /* ExportType */ | 1048576 /* ExportValue */;
-                    case 230 /* ImportEqualsDeclaration */:
+                    case 234 /* ImportEqualsDeclaration */:
                         var result_2 = 0;
                         var target = resolveAlias(getSymbolOfNode(d));
                         ts.forEach(target.declarations, function (d) { result_2 |= getDeclarationSpaces(d); });
@@ -36679,7 +38515,7 @@ var ts;
             if (isTypeAny(promise)) {
                 return undefined;
             }
-            if (promise.flags & 131072 /* Reference */) {
+            if (getObjectFlags(promise) & 4 /* Reference */) {
                 if (promise.target === tryGetGlobalPromiseType()
                     || promise.target === getGlobalPromiseLikeType()) {
                     return promise.typeArguments[0];
@@ -36723,7 +38559,7 @@ var ts;
         function checkAwaitedType(type, location, message) {
             return checkAwaitedTypeWorker(type);
             function checkAwaitedTypeWorker(type) {
-                if (type.flags & 524288 /* Union */) {
+                if (type.flags & 65536 /* Union */) {
                     var types = [];
                     for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                         var constituentType = _a[_i];
@@ -36802,56 +38638,19 @@ var ts;
             }
         }
         /**
-         * Checks that the return type provided is an instantiation of the global Promise<T> type
-         * and returns the awaited type of the return type.
+         * Checks the return type of an async function to ensure it is a compatible
+         * Promise implementation.
          *
-         * @param returnType The return type of a FunctionLikeDeclaration
-         * @param location The node on which to report the error.
+         * This checks that an async function has a valid Promise-compatible return type,
+         * and returns the *awaited type* of the promise. An async function has a valid
+         * Promise-compatible return type if the resolved value of the return type has a
+         * construct signature that takes in an `initializer` function that in turn supplies
+         * a `resolve` function as one of its arguments and results in an object with a
+         * callable `then` signature.
+         *
+         * @param node The signature to check
          */
-        function checkCorrectPromiseType(returnType, location, diagnostic, typeName) {
-            if (returnType === unknownType) {
-                // The return type already had some other error, so we ignore and return
-                // the unknown type.
-                return unknownType;
-            }
-            var globalPromiseType = getGlobalPromiseType();
-            if (globalPromiseType === emptyGenericType
-                || globalPromiseType === getTargetType(returnType)) {
-                // Either we couldn't resolve the global promise type, which would have already
-                // reported an error, or we could resolve it and the return type is a valid type
-                // reference to the global type. In either case, we return the awaited type for
-                // the return type.
-                return checkAwaitedType(returnType, location, ts.Diagnostics.An_async_function_or_method_must_have_a_valid_awaitable_return_type);
-            }
-            // The promise type was not a valid type reference to the global promise type, so we
-            // report an error and return the unknown type.
-            error(location, diagnostic, typeName);
-            return unknownType;
-        }
-        /**
-          * Checks the return type of an async function to ensure it is a compatible
-          * Promise implementation.
-          * @param node The signature to check
-          * @param returnType The return type for the function
-          * @remarks
-          * This checks that an async function has a valid Promise-compatible return type,
-          * and returns the *awaited type* of the promise. An async function has a valid
-          * Promise-compatible return type if the resolved value of the return type has a
-          * construct signature that takes in an `initializer` function that in turn supplies
-          * a `resolve` function as one of its arguments and results in an object with a
-          * callable `then` signature.
-          */
         function checkAsyncFunctionReturnType(node) {
-            if (languageVersion >= 2 /* ES2015 */) {
-                var returnType = getTypeFromTypeNode(node.type);
-                return checkCorrectPromiseType(returnType, node.type, ts.Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type);
-            }
-            var globalPromiseConstructorLikeType = getGlobalPromiseConstructorLikeType();
-            if (globalPromiseConstructorLikeType === emptyObjectType) {
-                // If we couldn't resolve the global PromiseConstructorLike type we cannot verify
-                // compatibility with __awaiter.
-                return unknownType;
-            }
             // As part of our emit for an async function, we will need to emit the entity name of
             // the return type annotation as an expression. To meet the necessary runtime semantics
             // for __awaiter, we must also check that the type of the declaration (e.g. the static
@@ -36876,39 +38675,56 @@ var ts;
             //      then<U>(...): Promise<U>;
             //  }
             //
-            // When we get the type of the `Promise` symbol here, we get the type of the static
-            // side of the `Promise` class, which would be `{ new <T>(...): Promise<T> }`.
-            var promiseType = getTypeFromTypeNode(node.type);
-            if (promiseType === unknownType && compilerOptions.isolatedModules) {
-                // If we are compiling with isolatedModules, we may not be able to resolve the
-                // type as a value. As such, we will just return unknownType;
-                return unknownType;
+            var returnType = getTypeFromTypeNode(node.type);
+            if (languageVersion >= 2 /* ES2015 */) {
+                if (returnType === unknownType) {
+                    return unknownType;
+                }
+                var globalPromiseType = getGlobalPromiseType();
+                if (globalPromiseType !== emptyGenericType && globalPromiseType !== getTargetType(returnType)) {
+                    // The promise type was not a valid type reference to the global promise type, so we
+                    // report an error and return the unknown type.
+                    error(node.type, ts.Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type);
+                    return unknownType;
+                }
             }
-            var promiseConstructor = getNodeLinks(node.type).resolvedSymbol;
-            if (!promiseConstructor || !symbolIsValue(promiseConstructor)) {
-                // try to fall back to global promise type.
-                var typeName = promiseConstructor
-                    ? symbolToString(promiseConstructor)
-                    : typeToString(promiseType);
-                return checkCorrectPromiseType(promiseType, node.type, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type, typeName);
-            }
-            // If the Promise constructor, resolved locally, is an alias symbol we should mark it as referenced.
-            checkReturnTypeAnnotationAsExpression(node);
-            // Validate the promise constructor type.
-            var promiseConstructorType = getTypeOfSymbol(promiseConstructor);
-            if (!checkTypeAssignableTo(promiseConstructorType, globalPromiseConstructorLikeType, node.type, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type)) {
-                return unknownType;
-            }
-            // Verify there is no local declaration that could collide with the promise constructor.
-            var promiseName = ts.getEntityNameFromTypeNode(node.type);
-            var promiseNameOrNamespaceRoot = getFirstIdentifier(promiseName);
-            var rootSymbol = getSymbol(node.locals, promiseNameOrNamespaceRoot.text, 107455 /* Value */);
-            if (rootSymbol) {
-                error(rootSymbol.valueDeclaration, ts.Diagnostics.Duplicate_identifier_0_Compiler_uses_declaration_1_to_support_async_functions, promiseNameOrNamespaceRoot.text, getFullyQualifiedName(promiseConstructor));
-                return unknownType;
+            else {
+                // Always mark the type node as referenced if it points to a value
+                markTypeNodeAsReferenced(node.type);
+                if (returnType === unknownType) {
+                    return unknownType;
+                }
+                var promiseConstructorName = ts.getEntityNameFromTypeNode(node.type);
+                if (promiseConstructorName === undefined) {
+                    error(node.type, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, typeToString(returnType));
+                    return unknownType;
+                }
+                var promiseConstructorSymbol = resolveEntityName(promiseConstructorName, 107455 /* Value */, /*ignoreErrors*/ true);
+                var promiseConstructorType = promiseConstructorSymbol ? getTypeOfSymbol(promiseConstructorSymbol) : unknownType;
+                if (promiseConstructorType === unknownType) {
+                    error(node.type, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, ts.entityNameToString(promiseConstructorName));
+                    return unknownType;
+                }
+                var globalPromiseConstructorLikeType = getGlobalPromiseConstructorLikeType();
+                if (globalPromiseConstructorLikeType === emptyObjectType) {
+                    // If we couldn't resolve the global PromiseConstructorLike type we cannot verify
+                    // compatibility with __awaiter.
+                    error(node.type, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, ts.entityNameToString(promiseConstructorName));
+                    return unknownType;
+                }
+                if (!checkTypeAssignableTo(promiseConstructorType, globalPromiseConstructorLikeType, node.type, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value)) {
+                    return unknownType;
+                }
+                // Verify there is no local declaration that could collide with the promise constructor.
+                var rootName = promiseConstructorName && getFirstIdentifier(promiseConstructorName);
+                var collidingSymbol = getSymbol(node.locals, rootName.text, 107455 /* Value */);
+                if (collidingSymbol) {
+                    error(collidingSymbol.valueDeclaration, ts.Diagnostics.Duplicate_identifier_0_Compiler_uses_declaration_1_to_support_async_functions, rootName.text, ts.entityNameToString(promiseConstructorName));
+                    return unknownType;
+                }
             }
             // Get and return the awaited type of the return type.
-            return checkAwaitedType(promiseType, node, ts.Diagnostics.An_async_function_or_method_must_have_a_valid_awaitable_return_type);
+            return checkAwaitedType(returnType, node, ts.Diagnostics.An_async_function_or_method_must_have_a_valid_awaitable_return_type);
         }
         /** Check a decorator */
         function checkDecorator(node) {
@@ -36921,22 +38737,22 @@ var ts;
             var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
             var errorInfo;
             switch (node.parent.kind) {
-                case 222 /* ClassDeclaration */:
+                case 226 /* ClassDeclaration */:
                     var classSymbol = getSymbolOfNode(node.parent);
                     var classConstructorType = getTypeOfSymbol(classSymbol);
                     expectedReturnType = getUnionType([classConstructorType, voidType]);
                     break;
-                case 143 /* Parameter */:
+                case 144 /* Parameter */:
                     expectedReturnType = voidType;
                     errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any);
                     break;
-                case 146 /* PropertyDeclaration */:
+                case 147 /* PropertyDeclaration */:
                     expectedReturnType = voidType;
                     errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.The_return_type_of_a_property_decorator_function_must_be_either_void_or_any);
                     break;
-                case 148 /* MethodDeclaration */:
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
+                case 149 /* MethodDeclaration */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
                     var methodType = getTypeOfNode(node.parent);
                     var descriptorType = createTypedPropertyDescriptorType(methodType);
                     expectedReturnType = getUnionType([descriptorType, voidType]);
@@ -36944,42 +38760,19 @@ var ts;
             }
             checkTypeAssignableTo(returnType, expectedReturnType, node, headMessage, errorInfo);
         }
-        /** Checks a type reference node as an expression. */
-        function checkTypeNodeAsExpression(node) {
-            // When we are emitting type metadata for decorators, we need to try to check the type
-            // as if it were an expression so that we can emit the type in a value position when we
-            // serialize the type metadata.
-            if (node && node.kind === 156 /* TypeReference */) {
-                var root = getFirstIdentifier(node.typeName);
-                var meaning = root.parent.kind === 156 /* TypeReference */ ? 793064 /* Type */ : 1920 /* Namespace */;
-                // Resolve type so we know which symbol is referenced
-                var rootSymbol = resolveName(root, root.text, meaning | 8388608 /* Alias */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined);
-                // Resolved symbol is alias
-                if (rootSymbol && rootSymbol.flags & 8388608 /* Alias */) {
-                    var aliasTarget = resolveAlias(rootSymbol);
-                    // If alias has value symbol - mark alias as referenced
-                    if (aliasTarget.flags & 107455 /* Value */ && !isConstEnumOrConstEnumOnlyModule(resolveAlias(rootSymbol))) {
-                        markAliasSymbolAsReferenced(rootSymbol);
-                    }
-                }
-            }
-        }
         /**
-          * Checks the type annotation of an accessor declaration or property declaration as
-          * an expression if it is a type reference to a type with a value declaration.
-          */
-        function checkTypeAnnotationAsExpression(node) {
-            checkTypeNodeAsExpression(node.type);
-        }
-        function checkReturnTypeAnnotationAsExpression(node) {
-            checkTypeNodeAsExpression(node.type);
-        }
-        /** Checks the type annotation of the parameters of a function/method or the constructor of a class as expressions */
-        function checkParameterTypeAnnotationsAsExpressions(node) {
-            // ensure all type annotations with a value declaration are checked as an expression
-            for (var _i = 0, _a = node.parameters; _i < _a.length; _i++) {
-                var parameter = _a[_i];
-                checkTypeAnnotationAsExpression(parameter);
+         * If a TypeNode can be resolved to a value symbol imported from an external module, it is
+         * marked as referenced to prevent import elision.
+         */
+        function markTypeNodeAsReferenced(node) {
+            var typeName = node && ts.getEntityNameFromTypeNode(node);
+            var rootName = typeName && getFirstIdentifier(typeName);
+            var rootSymbol = rootName && resolveName(rootName, rootName.text, (typeName.kind === 70 /* Identifier */ ? 793064 /* Type */ : 1920 /* Namespace */) | 8388608 /* Alias */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined);
+            if (rootSymbol
+                && rootSymbol.flags & 8388608 /* Alias */
+                && symbolIsValue(rootSymbol)
+                && !isConstEnumOrConstEnumOnlyModule(resolveAlias(rootSymbol))) {
+                markAliasSymbolAsReferenced(rootSymbol);
             }
         }
         /** Check the decorators of a node */
@@ -36998,21 +38791,27 @@ var ts;
             if (compilerOptions.emitDecoratorMetadata) {
                 // we only need to perform these checks if we are emitting serialized type metadata for the target of a decorator.
                 switch (node.kind) {
-                    case 222 /* ClassDeclaration */:
+                    case 226 /* ClassDeclaration */:
                         var constructor = ts.getFirstConstructorWithBody(node);
                         if (constructor) {
-                            checkParameterTypeAnnotationsAsExpressions(constructor);
+                            for (var _i = 0, _a = constructor.parameters; _i < _a.length; _i++) {
+                                var parameter = _a[_i];
+                                markTypeNodeAsReferenced(parameter.type);
+                            }
                         }
                         break;
-                    case 148 /* MethodDeclaration */:
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
-                        checkParameterTypeAnnotationsAsExpressions(node);
-                        checkReturnTypeAnnotationAsExpression(node);
+                    case 149 /* MethodDeclaration */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* SetAccessor */:
+                        for (var _b = 0, _c = node.parameters; _b < _c.length; _b++) {
+                            var parameter = _c[_b];
+                            markTypeNodeAsReferenced(parameter.type);
+                        }
+                        markTypeNodeAsReferenced(node.type);
                         break;
-                    case 146 /* PropertyDeclaration */:
-                    case 143 /* Parameter */:
-                        checkTypeAnnotationAsExpression(node);
+                    case 147 /* PropertyDeclaration */:
+                    case 144 /* Parameter */:
+                        markTypeNodeAsReferenced(node.type);
                         break;
                 }
             }
@@ -37034,7 +38833,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 === 141 /* ComputedPropertyName */) {
+            if (node.name && node.name.kind === 142 /* ComputedPropertyName */) {
                 // This check will account for methods in class/interface declarations,
                 // as well as accessors in classes/object literals
                 checkComputedPropertyName(node.name);
@@ -37094,43 +38893,43 @@ var ts;
                 for (var _i = 0, deferredUnusedIdentifierNodes_1 = deferredUnusedIdentifierNodes; _i < deferredUnusedIdentifierNodes_1.length; _i++) {
                     var node = deferredUnusedIdentifierNodes_1[_i];
                     switch (node.kind) {
-                        case 256 /* SourceFile */:
-                        case 226 /* ModuleDeclaration */:
+                        case 261 /* SourceFile */:
+                        case 230 /* ModuleDeclaration */:
                             checkUnusedModuleMembers(node);
                             break;
-                        case 222 /* ClassDeclaration */:
-                        case 193 /* ClassExpression */:
+                        case 226 /* ClassDeclaration */:
+                        case 197 /* ClassExpression */:
                             checkUnusedClassMembers(node);
                             checkUnusedTypeParameters(node);
                             break;
-                        case 223 /* InterfaceDeclaration */:
+                        case 227 /* InterfaceDeclaration */:
                             checkUnusedTypeParameters(node);
                             break;
-                        case 200 /* Block */:
-                        case 228 /* CaseBlock */:
-                        case 207 /* ForStatement */:
-                        case 208 /* ForInStatement */:
-                        case 209 /* ForOfStatement */:
+                        case 204 /* Block */:
+                        case 232 /* CaseBlock */:
+                        case 211 /* ForStatement */:
+                        case 212 /* ForInStatement */:
+                        case 213 /* ForOfStatement */:
                             checkUnusedLocalsAndParameters(node);
                             break;
-                        case 149 /* Constructor */:
-                        case 180 /* FunctionExpression */:
-                        case 221 /* FunctionDeclaration */:
-                        case 181 /* ArrowFunction */:
-                        case 148 /* MethodDeclaration */:
-                        case 150 /* GetAccessor */:
-                        case 151 /* SetAccessor */:
+                        case 150 /* Constructor */:
+                        case 184 /* FunctionExpression */:
+                        case 225 /* FunctionDeclaration */:
+                        case 185 /* ArrowFunction */:
+                        case 149 /* MethodDeclaration */:
+                        case 151 /* GetAccessor */:
+                        case 152 /* SetAccessor */:
                             if (node.body) {
                                 checkUnusedLocalsAndParameters(node);
                             }
                             checkUnusedTypeParameters(node);
                             break;
-                        case 147 /* MethodSignature */:
-                        case 152 /* CallSignature */:
-                        case 153 /* ConstructSignature */:
-                        case 154 /* IndexSignature */:
-                        case 157 /* FunctionType */:
-                        case 158 /* ConstructorType */:
+                        case 148 /* MethodSignature */:
+                        case 153 /* CallSignature */:
+                        case 154 /* ConstructSignature */:
+                        case 155 /* IndexSignature */:
+                        case 158 /* FunctionType */:
+                        case 159 /* ConstructorType */:
                             checkUnusedTypeParameters(node);
                             break;
                     }
@@ -37139,43 +38938,57 @@ var ts;
             }
         }
         function checkUnusedLocalsAndParameters(node) {
-            if (node.parent.kind !== 223 /* InterfaceDeclaration */ && noUnusedIdentifiers && !ts.isInAmbientContext(node)) {
-                var _loop_1 = function (key) {
+            if (node.parent.kind !== 227 /* InterfaceDeclaration */ && noUnusedIdentifiers && !ts.isInAmbientContext(node)) {
+                var _loop_3 = function (key) {
                     var local = node.locals[key];
                     if (!local.isReferenced) {
-                        if (local.valueDeclaration && local.valueDeclaration.kind === 143 /* Parameter */) {
-                            var parameter = local.valueDeclaration;
+                        if (local.valueDeclaration && ts.getRootDeclaration(local.valueDeclaration).kind === 144 /* Parameter */) {
+                            var parameter = ts.getRootDeclaration(local.valueDeclaration);
                             if (compilerOptions.noUnusedParameters &&
                                 !ts.isParameterPropertyDeclaration(parameter) &&
                                 !ts.parameterIsThisKeyword(parameter) &&
-                                !parameterNameStartsWithUnderscore(parameter)) {
+                                !parameterNameStartsWithUnderscore(local.valueDeclaration.name)) {
                                 error(local.valueDeclaration.name, ts.Diagnostics._0_is_declared_but_never_used, local.name);
                             }
                         }
                         else if (compilerOptions.noUnusedLocals) {
-                            ts.forEach(local.declarations, function (d) { return error(d.name || d, ts.Diagnostics._0_is_declared_but_never_used, local.name); });
+                            ts.forEach(local.declarations, function (d) { return errorUnusedLocal(d.name || d, local.name); });
                         }
                     }
                 };
                 for (var key in node.locals) {
-                    _loop_1(key);
+                    _loop_3(key);
                 }
             }
         }
-        function parameterNameStartsWithUnderscore(parameter) {
-            return parameter.name && parameter.name.kind === 70 /* Identifier */ && parameter.name.text.charCodeAt(0) === 95 /* _ */;
+        function errorUnusedLocal(node, name) {
+            if (isIdentifierThatStartsWithUnderScore(node)) {
+                var declaration = ts.getRootDeclaration(node.parent);
+                if (declaration.kind === 223 /* VariableDeclaration */ &&
+                    (declaration.parent.parent.kind === 212 /* ForInStatement */ ||
+                        declaration.parent.parent.kind === 213 /* ForOfStatement */)) {
+                    return;
+                }
+            }
+            error(node, ts.Diagnostics._0_is_declared_but_never_used, name);
+        }
+        function parameterNameStartsWithUnderscore(parameterName) {
+            return parameterName && isIdentifierThatStartsWithUnderScore(parameterName);
+        }
+        function isIdentifierThatStartsWithUnderScore(node) {
+            return node.kind === 70 /* Identifier */ && node.text.charCodeAt(0) === 95 /* _ */;
         }
         function checkUnusedClassMembers(node) {
             if (compilerOptions.noUnusedLocals && !ts.isInAmbientContext(node)) {
                 if (node.members) {
                     for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                         var member = _a[_i];
-                        if (member.kind === 148 /* MethodDeclaration */ || member.kind === 146 /* PropertyDeclaration */) {
+                        if (member.kind === 149 /* MethodDeclaration */ || member.kind === 147 /* PropertyDeclaration */) {
                             if (!member.symbol.isReferenced && ts.getModifierFlags(member) & 8 /* Private */) {
                                 error(member.name, ts.Diagnostics._0_is_declared_but_never_used, member.symbol.name);
                             }
                         }
-                        else if (member.kind === 149 /* Constructor */) {
+                        else if (member.kind === 150 /* Constructor */) {
                             for (var _b = 0, _c = member.parameters; _b < _c.length; _b++) {
                                 var parameter = _c[_b];
                                 if (!parameter.symbol.isReferenced && ts.getModifierFlags(parameter) & 8 /* Private */) {
@@ -37223,7 +39036,7 @@ var ts;
         }
         function checkBlock(node) {
             // Grammar checking for SyntaxKind.Block
-            if (node.kind === 200 /* Block */) {
+            if (node.kind === 204 /* Block */) {
                 checkGrammarStatementInAmbientContext(node);
             }
             ts.forEach(node.statements, checkSourceElement);
@@ -37246,12 +39059,12 @@ var ts;
             if (!(identifier && identifier.text === name)) {
                 return false;
             }
-            if (node.kind === 146 /* PropertyDeclaration */ ||
-                node.kind === 145 /* PropertySignature */ ||
-                node.kind === 148 /* MethodDeclaration */ ||
-                node.kind === 147 /* MethodSignature */ ||
-                node.kind === 150 /* GetAccessor */ ||
-                node.kind === 151 /* SetAccessor */) {
+            if (node.kind === 147 /* PropertyDeclaration */ ||
+                node.kind === 146 /* PropertySignature */ ||
+                node.kind === 149 /* MethodDeclaration */ ||
+                node.kind === 148 /* MethodSignature */ ||
+                node.kind === 151 /* GetAccessor */ ||
+                node.kind === 152 /* SetAccessor */) {
                 // it is ok to have member named '_super' or '_this' - member access is always qualified
                 return false;
             }
@@ -37260,7 +39073,7 @@ var ts;
                 return false;
             }
             var root = ts.getRootDeclaration(node);
-            if (root.kind === 143 /* Parameter */ && ts.nodeIsMissing(root.parent.body)) {
+            if (root.kind === 144 /* Parameter */ && ts.nodeIsMissing(root.parent.body)) {
                 // just an overload - no codegen impact
                 return false;
             }
@@ -37317,12 +39130,12 @@ var ts;
                 return;
             }
             // Uninstantiated modules shouldnt do this check
-            if (node.kind === 226 /* ModuleDeclaration */ && ts.getModuleInstanceState(node) !== 1 /* Instantiated */) {
+            if (node.kind === 230 /* ModuleDeclaration */ && ts.getModuleInstanceState(node) !== 1 /* Instantiated */) {
                 return;
             }
             // 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 === 256 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent)) {
+            if (parent.kind === 261 /* 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));
             }
@@ -37332,12 +39145,12 @@ var ts;
                 return;
             }
             // Uninstantiated modules shouldnt do this check
-            if (node.kind === 226 /* ModuleDeclaration */ && ts.getModuleInstanceState(node) !== 1 /* Instantiated */) {
+            if (node.kind === 230 /* ModuleDeclaration */ && ts.getModuleInstanceState(node) !== 1 /* Instantiated */) {
                 return;
             }
             // 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 === 256 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent) && parent.flags & 8192 /* HasAsyncFunctions */) {
+            if (parent.kind === 261 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent) && parent.flags & 8192 /* 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));
             }
@@ -37372,7 +39185,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 === 219 /* VariableDeclaration */ && !node.initializer) {
+            if (node.kind === 223 /* VariableDeclaration */ && !node.initializer) {
                 return;
             }
             var symbol = getSymbolOfNode(node);
@@ -37382,24 +39195,24 @@ var ts;
                     localDeclarationSymbol !== symbol &&
                     localDeclarationSymbol.flags & 2 /* BlockScopedVariable */) {
                     if (getDeclarationNodeFlagsFromSymbol(localDeclarationSymbol) & 3 /* BlockScoped */) {
-                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 220 /* VariableDeclarationList */);
-                        var container = varDeclList.parent.kind === 201 /* VariableStatement */ && varDeclList.parent.parent
+                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 224 /* VariableDeclarationList */);
+                        var container = varDeclList.parent.kind === 205 /* 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 === 200 /* Block */ && ts.isFunctionLike(container.parent) ||
-                                container.kind === 227 /* ModuleBlock */ ||
-                                container.kind === 226 /* ModuleDeclaration */ ||
-                                container.kind === 256 /* SourceFile */);
+                            (container.kind === 204 /* Block */ && ts.isFunctionLike(container.parent) ||
+                                container.kind === 231 /* ModuleBlock */ ||
+                                container.kind === 230 /* ModuleDeclaration */ ||
+                                container.kind === 261 /* 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
                         // since LHS will be block scoped name instead of function scoped
                         if (!namesShareScope) {
-                            var name_20 = symbolToString(localDeclarationSymbol);
-                            error(node, ts.Diagnostics.Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1, name_20, name_20);
+                            var name_24 = symbolToString(localDeclarationSymbol);
+                            error(node, ts.Diagnostics.Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1, name_24, name_24);
                         }
                     }
                 }
@@ -37407,7 +39220,7 @@ 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 !== 143 /* Parameter */) {
+            if (ts.getRootDeclaration(node).kind !== 144 /* Parameter */) {
                 return;
             }
             var func = ts.getContainingFunction(node);
@@ -37418,7 +39231,7 @@ var ts;
                     // skip declaration names (i.e. in object literal expressions)
                     return;
                 }
-                if (n.kind === 173 /* PropertyAccessExpression */) {
+                if (n.kind === 177 /* PropertyAccessExpression */) {
                     // skip property names in property access expression
                     return visit(n.expression);
                 }
@@ -37437,7 +39250,7 @@ var ts;
                     // 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 === 143 /* Parameter */) {
+                        if (symbol.valueDeclaration.kind === 144 /* Parameter */) {
                             // 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) {
@@ -37451,7 +39264,7 @@ var ts;
                                 }
                                 // computed property names/initializers in instance property declaration of class like entities
                                 // are executed in constructor and thus deferred
-                                if (current.parent.kind === 146 /* PropertyDeclaration */ &&
+                                if (current.parent.kind === 147 /* PropertyDeclaration */ &&
                                     !(ts.hasModifier(current.parent, 32 /* Static */)) &&
                                     ts.isClassLike(current.parent.parent)) {
                                     return;
@@ -37478,24 +39291,25 @@ 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 === 141 /* ComputedPropertyName */) {
+            if (node.name.kind === 142 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
                 if (node.initializer) {
                     checkExpressionCached(node.initializer);
                 }
             }
-            if (node.kind === 170 /* BindingElement */) {
+            if (node.kind === 174 /* BindingElement */) {
                 // check computed properties inside property names of binding elements
-                if (node.propertyName && node.propertyName.kind === 141 /* ComputedPropertyName */) {
+                if (node.propertyName && node.propertyName.kind === 142 /* ComputedPropertyName */) {
                     checkComputedPropertyName(node.propertyName);
                 }
                 // check private/protected variable access
-                var parent_13 = node.parent.parent;
-                var parentType = getTypeForBindingElementParent(parent_13);
-                var name_21 = node.propertyName || node.name;
-                var property = getPropertyOfType(parentType, getTextOfPropertyName(name_21));
-                if (parent_13.initializer && property && getParentOfSymbol(property)) {
-                    checkClassPropertyAccess(parent_13, parent_13.initializer, parentType, property);
+                var parent_11 = node.parent.parent;
+                var parentType = getTypeForBindingElementParent(parent_11);
+                var name_25 = node.propertyName || node.name;
+                var property = getPropertyOfType(parentType, ts.getTextOfPropertyName(name_25));
+                markPropertyAsReferenced(property);
+                if (parent_11.initializer && property && getParentOfSymbol(property)) {
+                    checkClassPropertyAccess(parent_11, parent_11.initializer, parentType, property);
                 }
             }
             // For a binding pattern, check contained binding elements
@@ -37503,14 +39317,14 @@ var ts;
                 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 === 143 /* Parameter */ && ts.nodeIsMissing(ts.getContainingFunction(node).body)) {
+            if (node.initializer && ts.getRootDeclaration(node).kind === 144 /* 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 !== 208 /* ForInStatement */) {
+                if (node.initializer && node.parent.parent.kind !== 212 /* ForInStatement */) {
                     checkTypeAssignableTo(checkExpressionCached(node.initializer), getWidenedTypeForVariableLikeDeclaration(node), node, /*headMessage*/ undefined);
                     checkParameterInitializer(node);
                 }
@@ -37521,7 +39335,7 @@ var ts;
             if (node === symbol.valueDeclaration) {
                 // Node is the primary declaration of the symbol, just validate the initializer
                 // Don't validate for-in initializer as it is already an error
-                if (node.initializer && node.parent.parent.kind !== 208 /* ForInStatement */) {
+                if (node.initializer && node.parent.parent.kind !== 212 /* ForInStatement */) {
                     checkTypeAssignableTo(checkExpressionCached(node.initializer), type, node, /*headMessage*/ undefined);
                     checkParameterInitializer(node);
                 }
@@ -37541,10 +39355,10 @@ var ts;
                     error(node.name, ts.Diagnostics.All_declarations_of_0_must_have_identical_modifiers, ts.declarationNameToString(node.name));
                 }
             }
-            if (node.kind !== 146 /* PropertyDeclaration */ && node.kind !== 145 /* PropertySignature */) {
+            if (node.kind !== 147 /* PropertyDeclaration */ && node.kind !== 146 /* PropertySignature */) {
                 // We know we don't have a binding pattern or computed name here
                 checkExportsOnMergedDeclarations(node);
-                if (node.kind === 219 /* VariableDeclaration */ || node.kind === 170 /* BindingElement */) {
+                if (node.kind === 223 /* VariableDeclaration */ || node.kind === 174 /* BindingElement */) {
                     checkVarDeclaredNamesNotShadowed(node);
                 }
                 checkCollisionWithCapturedSuperVariable(node, node.name);
@@ -37554,8 +39368,8 @@ var ts;
             }
         }
         function areDeclarationFlagsIdentical(left, right) {
-            if ((left.kind === 143 /* Parameter */ && right.kind === 219 /* VariableDeclaration */) ||
-                (left.kind === 219 /* VariableDeclaration */ && right.kind === 143 /* Parameter */)) {
+            if ((left.kind === 144 /* Parameter */ && right.kind === 223 /* VariableDeclaration */) ||
+                (left.kind === 223 /* VariableDeclaration */ && right.kind === 144 /* Parameter */)) {
                 // Differences in optionality between parameters and variables are allowed.
                 return true;
             }
@@ -37585,7 +39399,7 @@ var ts;
         }
         function checkGrammarDisallowedModifiersOnObjectLiteralExpressionMethod(node) {
             // We only disallow modifier on a method declaration if it is a property of object-literal-expression
-            if (node.modifiers && node.parent.kind === 172 /* ObjectLiteralExpression */) {
+            if (node.modifiers && node.parent.kind === 176 /* ObjectLiteralExpression */) {
                 if (ts.isAsyncFunctionLike(node)) {
                     if (node.modifiers.length > 1) {
                         return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
@@ -37606,7 +39420,7 @@ var ts;
             checkGrammarStatementInAmbientContext(node);
             checkExpression(node.expression);
             checkSourceElement(node.thenStatement);
-            if (node.thenStatement.kind === 202 /* EmptyStatement */) {
+            if (node.thenStatement.kind === 206 /* EmptyStatement */) {
                 error(node.thenStatement, ts.Diagnostics.The_body_of_an_if_statement_cannot_be_the_empty_statement);
             }
             checkSourceElement(node.elseStatement);
@@ -37626,12 +39440,12 @@ var ts;
         function checkForStatement(node) {
             // Grammar checking
             if (!checkGrammarStatementInAmbientContext(node)) {
-                if (node.initializer && node.initializer.kind === 220 /* VariableDeclarationList */) {
+                if (node.initializer && node.initializer.kind === 224 /* VariableDeclarationList */) {
                     checkGrammarVariableDeclarationList(node.initializer);
                 }
             }
             if (node.initializer) {
-                if (node.initializer.kind === 220 /* VariableDeclarationList */) {
+                if (node.initializer.kind === 224 /* VariableDeclarationList */) {
                     ts.forEach(node.initializer.declarations, checkVariableDeclaration);
                 }
                 else {
@@ -37654,14 +39468,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 === 220 /* VariableDeclarationList */) {
+            if (node.initializer.kind === 224 /* VariableDeclarationList */) {
                 checkForInOrForOfVariableDeclaration(node);
             }
             else {
                 var varExpr = node.initializer;
                 var iteratedType = checkRightHandSideOfForOf(node.expression);
                 // There may be a destructuring assignment on the left side
-                if (varExpr.kind === 171 /* ArrayLiteralExpression */ || varExpr.kind === 172 /* ObjectLiteralExpression */) {
+                if (varExpr.kind === 175 /* ArrayLiteralExpression */ || varExpr.kind === 176 /* 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.
@@ -37669,8 +39483,7 @@ var ts;
                 }
                 else {
                     var leftType = checkExpression(varExpr);
-                    checkReferenceExpression(varExpr, /*invalidReferenceMessage*/ ts.Diagnostics.Invalid_left_hand_side_in_for_of_statement, 
-                    /*constantVariableMessage*/ ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_be_a_constant_or_a_read_only_property);
+                    checkReferenceExpression(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_must_be_a_variable_or_a_property_access);
                     // iteratedType will be undefined if the rightType was missing properties/signatures
                     // required to get its iteratedType (like [Symbol.iterator] or next). This may be
                     // because we accessed properties from anyType, or it may have led to an error inside
@@ -37693,7 +39506,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 === 220 /* VariableDeclarationList */) {
+            if (node.initializer.kind === 224 /* 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);
@@ -37707,7 +39520,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 === 171 /* ArrayLiteralExpression */ || varExpr.kind === 172 /* ObjectLiteralExpression */) {
+                if (varExpr.kind === 175 /* ArrayLiteralExpression */ || varExpr.kind === 176 /* ObjectLiteralExpression */) {
                     error(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
                 }
                 else if (!isTypeAnyOrAllConstituentTypesHaveKind(leftType, 34 /* StringLike */)) {
@@ -37715,13 +39528,13 @@ var ts;
                 }
                 else {
                     // run check only former check succeeded to avoid cascading errors
-                    checkReferenceExpression(varExpr, ts.Diagnostics.Invalid_left_hand_side_in_for_in_statement, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_constant_or_a_read_only_property);
+                    checkReferenceExpression(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_must_be_a_variable_or_a_property_access);
                 }
             }
             var rightType = checkNonNullExpression(node.expression);
             // unknownType is returned i.e. if node.expression is identifier whose name cannot be resolved
             // in this case error about missing name is already reported - do not report extra one
-            if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, 2588672 /* ObjectType */ | 16384 /* TypeParameter */)) {
+            if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, 32768 /* Object */ | 16384 /* TypeParameter */)) {
                 error(node.expression, ts.Diagnostics.The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter);
             }
             checkSourceElement(node.statement);
@@ -37803,7 +39616,7 @@ var ts;
             if (!typeAsIterable.iterableElementType) {
                 // As an optimization, if the type is instantiated directly using the globalIterableType (Iterable<number>),
                 // then just grab its type argument.
-                if ((type.flags & 131072 /* Reference */) && type.target === getGlobalIterableType()) {
+                if ((getObjectFlags(type) & 4 /* Reference */) && type.target === getGlobalIterableType()) {
                     typeAsIterable.iterableElementType = type.typeArguments[0];
                 }
                 else {
@@ -37844,7 +39657,7 @@ var ts;
             if (!typeAsIterator.iteratorElementType) {
                 // As an optimization, if the type is instantiated directly using the globalIteratorType (Iterator<number>),
                 // then just grab its type argument.
-                if ((type.flags & 131072 /* Reference */) && type.target === getGlobalIteratorType()) {
+                if ((getObjectFlags(type) & 4 /* Reference */) && type.target === getGlobalIteratorType()) {
                     typeAsIterator.iteratorElementType = type.typeArguments[0];
                 }
                 else {
@@ -37881,7 +39694,7 @@ var ts;
             }
             // As an optimization, if the type is instantiated directly using the globalIterableIteratorType (IterableIterator<number>),
             // then just grab its type argument.
-            if ((type.flags & 131072 /* Reference */) && type.target === getGlobalIterableIteratorType()) {
+            if ((getObjectFlags(type) & 4 /* Reference */) && type.target === getGlobalIterableIteratorType()) {
                 return type.typeArguments[0];
             }
             return getElementTypeOfIterable(type, /*errorNode*/ undefined) ||
@@ -37909,8 +39722,12 @@ var ts;
             // After we remove all types that are StringLike, we will know if there was a string constituent
             // based on whether the remaining type is the same as the initial type.
             var arrayType = arrayOrStringType;
-            if (arrayOrStringType.flags & 524288 /* Union */) {
-                arrayType = getUnionType(ts.filter(arrayOrStringType.types, function (t) { return !(t.flags & 34 /* StringLike */); }), /*subtypeReduction*/ true);
+            if (arrayOrStringType.flags & 65536 /* Union */) {
+                var arrayTypes = arrayOrStringType.types;
+                var filteredTypes = ts.filter(arrayTypes, function (t) { return !(t.flags & 34 /* StringLike */); });
+                if (filteredTypes !== arrayTypes) {
+                    arrayType = getUnionType(filteredTypes, /*subtypeReduction*/ true);
+                }
             }
             else if (arrayOrStringType.flags & 34 /* StringLike */) {
                 arrayType = neverType;
@@ -37957,7 +39774,7 @@ var ts;
             // TODO: Check that target label is valid
         }
         function isGetAccessorWithAnnotatedSetAccessor(node) {
-            return !!(node.kind === 150 /* GetAccessor */ && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(node.symbol, 151 /* SetAccessor */)));
+            return !!(node.kind === 151 /* GetAccessor */ && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(node.symbol, 152 /* SetAccessor */)));
         }
         function isUnwrappedReturnTypeVoidOrAny(func, returnType) {
             var unwrappedReturnType = ts.isAsyncFunctionLike(func) ? getPromisedType(returnType) : returnType;
@@ -37984,12 +39801,12 @@ var ts;
                         // for generators.
                         return;
                     }
-                    if (func.kind === 151 /* SetAccessor */) {
+                    if (func.kind === 152 /* SetAccessor */) {
                         if (node.expression) {
                             error(node.expression, ts.Diagnostics.Setters_cannot_return_a_value);
                         }
                     }
-                    else if (func.kind === 149 /* Constructor */) {
+                    else if (func.kind === 150 /* Constructor */) {
                         if (node.expression && !checkTypeAssignableTo(exprType, returnType, node.expression)) {
                             error(node.expression, ts.Diagnostics.Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class);
                         }
@@ -38010,7 +39827,7 @@ var ts;
                         }
                     }
                 }
-                else if (func.kind !== 149 /* Constructor */ && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(func, returnType)) {
+                else if (func.kind !== 150 /* 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);
                 }
@@ -38019,7 +39836,7 @@ var ts;
         function checkWithStatement(node) {
             // Grammar checking for withStatement
             if (!checkGrammarStatementInAmbientContext(node)) {
-                if (node.flags & 262144 /* AwaitContext */) {
+                if (node.flags & 524288 /* AwaitContext */) {
                     grammarErrorOnFirstToken(node, ts.Diagnostics.with_statements_are_not_allowed_in_an_async_function_block);
                 }
             }
@@ -38037,9 +39854,10 @@ var ts;
             var firstDefaultClause;
             var hasDuplicateDefaultClause = false;
             var expressionType = checkExpression(node.expression);
+            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 === 250 /* DefaultClause */ && !hasDuplicateDefaultClause) {
+                if (clause.kind === 254 /* DefaultClause */ && !hasDuplicateDefaultClause) {
                     if (firstDefaultClause === undefined) {
                         firstDefaultClause = clause;
                     }
@@ -38051,15 +39869,21 @@ var ts;
                         hasDuplicateDefaultClause = true;
                     }
                 }
-                if (produceDiagnostics && clause.kind === 249 /* CaseClause */) {
+                if (produceDiagnostics && clause.kind === 253 /* CaseClause */) {
                     var caseClause = clause;
                     // 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.
                     var caseType = checkExpression(caseClause.expression);
-                    if (!isTypeEqualityComparableTo(expressionType, caseType)) {
+                    var caseIsLiteral = isLiteralType(caseType);
+                    var comparedExpressionType = expressionType;
+                    if (!caseIsLiteral || !expressionIsLiteral) {
+                        caseType = caseIsLiteral ? getBaseTypeOfLiteralType(caseType) : caseType;
+                        comparedExpressionType = getBaseTypeOfLiteralType(expressionType);
+                    }
+                    if (!isTypeEqualityComparableTo(comparedExpressionType, caseType)) {
                         // expressionType is not comparable to caseType, try the reversed check and report errors if it fails
-                        checkTypeComparableTo(caseType, expressionType, caseClause.expression, /*headMessage*/ undefined);
+                        checkTypeComparableTo(caseType, comparedExpressionType, caseClause.expression, /*headMessage*/ undefined);
                     }
                 }
                 ts.forEach(clause.statements, checkSourceElement);
@@ -38076,7 +39900,7 @@ var ts;
                     if (ts.isFunctionLike(current)) {
                         break;
                     }
-                    if (current.kind === 215 /* LabeledStatement */ && current.label.text === node.label.text) {
+                    if (current.kind === 219 /* LabeledStatement */ && current.label.text === node.label.text) {
                         var sourceFile = ts.getSourceFileOfNode(node);
                         grammarErrorOnNode(node.label, ts.Diagnostics.Duplicate_label_0, ts.getTextOfNodeFromSourceText(sourceFile.text, node.label));
                         break;
@@ -38106,22 +39930,20 @@ var ts;
             if (catchClause) {
                 // Grammar checking
                 if (catchClause.variableDeclaration) {
-                    if (catchClause.variableDeclaration.name.kind !== 70 /* Identifier */) {
-                        grammarErrorOnFirstToken(catchClause.variableDeclaration.name, ts.Diagnostics.Catch_clause_variable_name_must_be_an_identifier);
-                    }
-                    else if (catchClause.variableDeclaration.type) {
+                    if (catchClause.variableDeclaration.type) {
                         grammarErrorOnFirstToken(catchClause.variableDeclaration.type, ts.Diagnostics.Catch_clause_variable_cannot_have_a_type_annotation);
                     }
                     else if (catchClause.variableDeclaration.initializer) {
                         grammarErrorOnFirstToken(catchClause.variableDeclaration.initializer, ts.Diagnostics.Catch_clause_variable_cannot_have_an_initializer);
                     }
                     else {
-                        var identifierName = catchClause.variableDeclaration.name.text;
-                        var locals = catchClause.block.locals;
-                        if (locals) {
-                            var localSymbol = locals[identifierName];
-                            if (localSymbol && (localSymbol.flags & 2 /* BlockScopedVariable */) !== 0) {
-                                grammarErrorOnNode(localSymbol.valueDeclaration, ts.Diagnostics.Cannot_redeclare_identifier_0_in_catch_clause, identifierName);
+                        var blockLocals = catchClause.block.locals;
+                        if (blockLocals) {
+                            for (var caughtName in catchClause.locals) {
+                                var blockLocal = blockLocals[caughtName];
+                                if (blockLocal && (blockLocal.flags & 2 /* BlockScopedVariable */) !== 0) {
+                                    grammarErrorOnNode(blockLocal.valueDeclaration, ts.Diagnostics.Cannot_redeclare_identifier_0_in_catch_clause, caughtName);
+                                }
                             }
                         }
                     }
@@ -38143,7 +39965,7 @@ var ts;
                     checkIndexConstraintForProperty(prop, propType, type, declaredStringIndexer, stringIndexType, 0 /* String */);
                     checkIndexConstraintForProperty(prop, propType, type, declaredNumberIndexer, numberIndexType, 1 /* Number */);
                 });
-                if (type.flags & 32768 /* Class */ && ts.isClassLike(type.symbol.valueDeclaration)) {
+                if (getObjectFlags(type) & 1 /* Class */ && ts.isClassLike(type.symbol.valueDeclaration)) {
                     var classDeclaration = type.symbol.valueDeclaration;
                     for (var _i = 0, _a = classDeclaration.members; _i < _a.length; _i++) {
                         var member = _a[_i];
@@ -38162,7 +39984,7 @@ var ts;
             if (stringIndexType && numberIndexType) {
                 errorNode = declaredNumberIndexer || declaredStringIndexer;
                 // condition 'errorNode === undefined' may appear if types does not declare nor string neither number indexer
-                if (!errorNode && (type.flags & 65536 /* Interface */)) {
+                if (!errorNode && (getObjectFlags(type) & 2 /* Interface */)) {
                     var someBaseTypeHasBothIndexers = ts.forEach(getBaseTypes(type), function (base) { return getIndexTypeOfType(base, 0 /* String */) && getIndexTypeOfType(base, 1 /* Number */); });
                     errorNode = someBaseTypeHasBothIndexers ? undefined : type.symbol.declarations[0];
                 }
@@ -38181,13 +40003,13 @@ var ts;
                 // perform property check if property or indexer is declared in 'type'
                 // this allows to rule out cases when both property and indexer are inherited from the base class
                 var errorNode;
-                if (prop.valueDeclaration.name.kind === 141 /* ComputedPropertyName */ || prop.parent === containingType.symbol) {
+                if (prop.valueDeclaration.name.kind === 142 /* ComputedPropertyName */ || prop.parent === containingType.symbol) {
                     errorNode = prop.valueDeclaration;
                 }
                 else if (indexDeclaration) {
                     errorNode = indexDeclaration;
                 }
-                else if (containingType.flags & 65536 /* Interface */) {
+                else if (getObjectFlags(containingType) & 2 /* Interface */) {
                     // for interfaces property and indexer might be inherited from different bases
                     // check if any base class already has both property and indexer.
                     // check should be performed only if 'type' is the first type that brings property\indexer together
@@ -38239,7 +40061,7 @@ var ts;
             var firstDecl;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 222 /* ClassDeclaration */ || declaration.kind === 223 /* InterfaceDeclaration */) {
+                if (declaration.kind === 226 /* ClassDeclaration */ || declaration.kind === 227 /* InterfaceDeclaration */) {
                     if (!firstDecl) {
                         firstDecl = declaration;
                     }
@@ -38302,7 +40124,9 @@ var ts;
                     }
                     checkTypeAssignableTo(typeWithThis, getTypeWithThisArgument(baseType_1, type.thisType), node.name || node, ts.Diagnostics.Class_0_incorrectly_extends_base_class_1);
                     checkTypeAssignableTo(staticType, getTypeWithoutSignatures(staticBaseType), node.name || node, ts.Diagnostics.Class_static_side_0_incorrectly_extends_base_class_static_side_1);
-                    if (baseType_1.symbol.valueDeclaration && !ts.isInAmbientContext(baseType_1.symbol.valueDeclaration)) {
+                    if (baseType_1.symbol.valueDeclaration &&
+                        !ts.isInAmbientContext(baseType_1.symbol.valueDeclaration) &&
+                        baseType_1.symbol.valueDeclaration.kind === 226 /* ClassDeclaration */) {
                         if (!isBlockScopedNameDeclaredBeforeUse(baseType_1.symbol.valueDeclaration, node)) {
                             error(baseTypeNode, ts.Diagnostics.A_class_must_be_declared_after_its_base_class);
                         }
@@ -38331,8 +40155,8 @@ var ts;
                     if (produceDiagnostics) {
                         var t = getTypeFromTypeNode(typeRefNode);
                         if (t !== unknownType) {
-                            var declaredType = (t.flags & 131072 /* Reference */) ? t.target : t;
-                            if (declaredType.flags & (32768 /* Class */ | 65536 /* Interface */)) {
+                            var declaredType = getObjectFlags(t) & 4 /* Reference */ ? t.target : t;
+                            if (getObjectFlags(declaredType) & 3 /* ClassOrInterface */) {
                                 checkTypeAssignableTo(typeWithThis, getTypeWithThisArgument(t, type.thisType), node.name || node, ts.Diagnostics.Class_0_incorrectly_implements_interface_1);
                             }
                             else {
@@ -38354,7 +40178,7 @@ var ts;
                 if (declaration && ts.getModifierFlags(declaration) & 8 /* Private */) {
                     var typeClassDeclaration = getClassLikeDeclarationOfSymbol(type.symbol);
                     if (!isNodeWithinClass(node, typeClassDeclaration)) {
-                        error(node, ts.Diagnostics.Cannot_extend_a_class_0_Class_constructor_is_marked_as_private, node.expression.text);
+                        error(node, ts.Diagnostics.Cannot_extend_a_class_0_Class_constructor_is_marked_as_private, getFullyQualifiedName(type.symbol));
                     }
                 }
             }
@@ -38403,7 +40227,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.getModifierFlags(derivedClassDecl) & 128 /* Abstract */))) {
-                            if (derivedClassDecl.kind === 193 /* ClassExpression */) {
+                            if (derivedClassDecl.kind === 197 /* ClassExpression */) {
                                 error(derivedClassDecl, ts.Diagnostics.Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1, symbolToString(baseProperty), typeToString(baseType));
                             }
                             else {
@@ -38451,7 +40275,7 @@ var ts;
             }
         }
         function isAccessor(kind) {
-            return kind === 150 /* GetAccessor */ || kind === 151 /* SetAccessor */;
+            return kind === 151 /* GetAccessor */ || kind === 152 /* SetAccessor */;
         }
         function areTypeParametersIdentical(list1, list2) {
             if (!list1 && !list2) {
@@ -38492,8 +40316,8 @@ var ts;
             for (var _i = 0, baseTypes_2 = baseTypes; _i < baseTypes_2.length; _i++) {
                 var base = baseTypes_2[_i];
                 var properties = getPropertiesOfObjectType(getTypeWithThisArgument(base, type.thisType));
-                for (var _a = 0, properties_5 = properties; _a < properties_5.length; _a++) {
-                    var prop = properties_5[_a];
+                for (var _a = 0, properties_6 = properties; _a < properties_6.length; _a++) {
+                    var prop = properties_6[_a];
                     var existing = seen[prop.name];
                     if (!existing) {
                         seen[prop.name] = { prop: prop, containingType: base };
@@ -38523,7 +40347,7 @@ var ts;
                 var symbol = getSymbolOfNode(node);
                 checkTypeParameterListsIdentical(node, symbol);
                 // Only check this symbol once
-                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 223 /* InterfaceDeclaration */);
+                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 227 /* InterfaceDeclaration */);
                 if (node === firstInterfaceDecl) {
                     var type = getDeclaredTypeOfSymbol(symbol);
                     var typeWithThis = getTypeWithThisArgument(type);
@@ -38554,6 +40378,7 @@ var ts;
             // Grammar checking
             checkGrammarDecorators(node) || checkGrammarModifiers(node);
             checkTypeNameIsReserved(node.name, ts.Diagnostics.Type_alias_name_cannot_be_0);
+            checkTypeParameters(node.typeParameters);
             checkSourceElement(node.type);
         }
         function computeEnumMemberValues(node) {
@@ -38570,7 +40395,7 @@ var ts;
                         error(member.name, ts.Diagnostics.Computed_property_names_are_not_allowed_in_enums);
                     }
                     else {
-                        var text = getTextOfPropertyName(member.name);
+                        var text = ts.getTextOfPropertyName(member.name);
                         if (isNumericLiteralName(text) && !isInfinityOrNaNString(text)) {
                             error(member.name, ts.Diagnostics.An_enum_member_cannot_have_a_numeric_name);
                         }
@@ -38629,7 +40454,7 @@ var ts;
                 return value;
                 function evalConstant(e) {
                     switch (e.kind) {
-                        case 186 /* PrefixUnaryExpression */:
+                        case 190 /* PrefixUnaryExpression */:
                             var value_1 = evalConstant(e.operand);
                             if (value_1 === undefined) {
                                 return undefined;
@@ -38640,7 +40465,7 @@ var ts;
                                 case 51 /* TildeToken */: return ~value_1;
                             }
                             return undefined;
-                        case 188 /* BinaryExpression */:
+                        case 192 /* BinaryExpression */:
                             var left = evalConstant(e.left);
                             if (left === undefined) {
                                 return undefined;
@@ -38665,11 +40490,11 @@ var ts;
                             return undefined;
                         case 8 /* NumericLiteral */:
                             return +e.text;
-                        case 179 /* ParenthesizedExpression */:
+                        case 183 /* ParenthesizedExpression */:
                             return evalConstant(e.expression);
                         case 70 /* Identifier */:
-                        case 174 /* ElementAccessExpression */:
-                        case 173 /* PropertyAccessExpression */:
+                        case 178 /* ElementAccessExpression */:
+                        case 177 /* PropertyAccessExpression */:
                             var member = initializer.parent;
                             var currentType = getTypeOfSymbol(getSymbolOfNode(member.parent));
                             var enumType_1;
@@ -38682,7 +40507,7 @@ var ts;
                             }
                             else {
                                 var expression = void 0;
-                                if (e.kind === 174 /* ElementAccessExpression */) {
+                                if (e.kind === 178 /* ElementAccessExpression */) {
                                     if (e.argumentExpression === undefined ||
                                         e.argumentExpression.kind !== 9 /* StringLiteral */) {
                                         return undefined;
@@ -38700,7 +40525,7 @@ var ts;
                                     if (current.kind === 70 /* Identifier */) {
                                         break;
                                     }
-                                    else if (current.kind === 173 /* PropertyAccessExpression */) {
+                                    else if (current.kind === 177 /* PropertyAccessExpression */) {
                                         current = current.expression;
                                     }
                                     else {
@@ -38772,7 +40597,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 !== 225 /* EnumDeclaration */) {
+                    if (declaration.kind !== 229 /* EnumDeclaration */) {
                         return false;
                     }
                     var enumDeclaration = declaration;
@@ -38795,8 +40620,8 @@ var ts;
             var declarations = symbol.declarations;
             for (var _i = 0, declarations_5 = declarations; _i < declarations_5.length; _i++) {
                 var declaration = declarations_5[_i];
-                if ((declaration.kind === 222 /* ClassDeclaration */ ||
-                    (declaration.kind === 221 /* FunctionDeclaration */ && ts.nodeIsPresent(declaration.body))) &&
+                if ((declaration.kind === 226 /* ClassDeclaration */ ||
+                    (declaration.kind === 225 /* FunctionDeclaration */ && ts.nodeIsPresent(declaration.body))) &&
                     !ts.isInAmbientContext(declaration)) {
                     return declaration;
                 }
@@ -38860,7 +40685,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, 222 /* ClassDeclaration */);
+                    var mergedClass = ts.getDeclarationOfKind(symbol, 226 /* ClassDeclaration */);
                     if (mergedClass &&
                         inSameLexicalScope(node, mergedClass)) {
                         getNodeLinks(node).flags |= 32768 /* LexicalModuleMergesWithClass */;
@@ -38911,26 +40736,26 @@ var ts;
         }
         function checkModuleAugmentationElement(node, isGlobalAugmentation) {
             switch (node.kind) {
-                case 201 /* VariableStatement */:
+                case 205 /* 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 236 /* ExportAssignment */:
-                case 237 /* ExportDeclaration */:
+                case 240 /* ExportAssignment */:
+                case 241 /* ExportDeclaration */:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Exports_and_export_assignments_are_not_permitted_in_module_augmentations);
                     break;
-                case 230 /* ImportEqualsDeclaration */:
-                case 231 /* ImportDeclaration */:
+                case 234 /* ImportEqualsDeclaration */:
+                case 235 /* ImportDeclaration */:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_module);
                     break;
-                case 170 /* BindingElement */:
-                case 219 /* VariableDeclaration */:
-                    var name_22 = node.name;
-                    if (ts.isBindingPattern(name_22)) {
-                        for (var _b = 0, _c = name_22.elements; _b < _c.length; _b++) {
+                case 174 /* BindingElement */:
+                case 223 /* VariableDeclaration */:
+                    var name_26 = node.name;
+                    if (ts.isBindingPattern(name_26)) {
+                        for (var _b = 0, _c = name_26.elements; _b < _c.length; _b++) {
                             var el = _c[_b];
                             // mark individual names in binding pattern
                             checkModuleAugmentationElement(el, isGlobalAugmentation);
@@ -38938,12 +40763,12 @@ var ts;
                         break;
                     }
                 // fallthrough
-                case 222 /* ClassDeclaration */:
-                case 225 /* EnumDeclaration */:
-                case 221 /* FunctionDeclaration */:
-                case 223 /* InterfaceDeclaration */:
-                case 226 /* ModuleDeclaration */:
-                case 224 /* TypeAliasDeclaration */:
+                case 226 /* ClassDeclaration */:
+                case 229 /* EnumDeclaration */:
+                case 225 /* FunctionDeclaration */:
+                case 227 /* InterfaceDeclaration */:
+                case 230 /* ModuleDeclaration */:
+                case 228 /* TypeAliasDeclaration */:
                     if (isGlobalAugmentation) {
                         return;
                     }
@@ -38966,12 +40791,12 @@ var ts;
             switch (node.kind) {
                 case 70 /* Identifier */:
                     return node;
-                case 140 /* QualifiedName */:
+                case 141 /* QualifiedName */:
                     do {
                         node = node.left;
                     } while (node.kind !== 70 /* Identifier */);
                     return node;
-                case 173 /* PropertyAccessExpression */:
+                case 177 /* PropertyAccessExpression */:
                     do {
                         node = node.expression;
                     } while (node.kind !== 70 /* Identifier */);
@@ -38984,9 +40809,9 @@ var ts;
                 error(moduleName, ts.Diagnostics.String_literal_expected);
                 return false;
             }
-            var inAmbientExternalModule = node.parent.kind === 227 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
-            if (node.parent.kind !== 256 /* SourceFile */ && !inAmbientExternalModule) {
-                error(moduleName, node.kind === 237 /* ExportDeclaration */ ?
+            var inAmbientExternalModule = node.parent.kind === 231 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
+            if (node.parent.kind !== 261 /* SourceFile */ && !inAmbientExternalModule) {
+                error(moduleName, node.kind === 241 /* ExportDeclaration */ ?
                     ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace :
                     ts.Diagnostics.Import_declarations_in_a_namespace_cannot_reference_a_module);
                 return false;
@@ -39019,7 +40844,7 @@ var ts;
                     (symbol.flags & 793064 /* Type */ ? 793064 /* Type */ : 0) |
                     (symbol.flags & 1920 /* Namespace */ ? 1920 /* Namespace */ : 0);
                 if (target.flags & excludedMeanings) {
-                    var message = node.kind === 239 /* ExportSpecifier */ ?
+                    var message = node.kind === 243 /* 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));
@@ -39047,7 +40872,7 @@ var ts;
                         checkImportBinding(importClause);
                     }
                     if (importClause.namedBindings) {
-                        if (importClause.namedBindings.kind === 233 /* NamespaceImport */) {
+                        if (importClause.namedBindings.kind === 237 /* NamespaceImport */) {
                             checkImportBinding(importClause.namedBindings);
                         }
                         else {
@@ -39104,8 +40929,8 @@ var ts;
                     // export { x, y }
                     // export { x, y } from "foo"
                     ts.forEach(node.exportClause.elements, checkExportSpecifier);
-                    var inAmbientExternalModule = node.parent.kind === 227 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
-                    if (node.parent.kind !== 256 /* SourceFile */ && !inAmbientExternalModule) {
+                    var inAmbientExternalModule = node.parent.kind === 231 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
+                    if (node.parent.kind !== 261 /* SourceFile */ && !inAmbientExternalModule) {
                         error(node, ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace);
                     }
                 }
@@ -39119,7 +40944,7 @@ var ts;
             }
         }
         function checkGrammarModuleElementContext(node, errorMessage) {
-            var isInAppropriateContext = node.parent.kind === 256 /* SourceFile */ || node.parent.kind === 227 /* ModuleBlock */ || node.parent.kind === 226 /* ModuleDeclaration */;
+            var isInAppropriateContext = node.parent.kind === 261 /* SourceFile */ || node.parent.kind === 231 /* ModuleBlock */ || node.parent.kind === 230 /* ModuleDeclaration */;
             if (!isInAppropriateContext) {
                 grammarErrorOnFirstToken(node, errorMessage);
             }
@@ -39145,8 +40970,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 === 256 /* SourceFile */ ? node.parent : node.parent.parent;
-            if (container.kind === 226 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
+            var container = node.parent.kind === 261 /* SourceFile */ ? node.parent : node.parent.parent;
+            if (container.kind === 230 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
                 error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_namespace);
                 return;
             }
@@ -39221,7 +41046,7 @@ var ts;
                 links.exportsChecked = true;
             }
             function isNotOverload(declaration) {
-                return (declaration.kind !== 221 /* FunctionDeclaration */ && declaration.kind !== 148 /* MethodDeclaration */) ||
+                return (declaration.kind !== 225 /* FunctionDeclaration */ && declaration.kind !== 149 /* MethodDeclaration */) ||
                     !!declaration.body;
             }
         }
@@ -39234,118 +41059,123 @@ 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 226 /* ModuleDeclaration */:
-                    case 222 /* ClassDeclaration */:
-                    case 223 /* InterfaceDeclaration */:
-                    case 221 /* FunctionDeclaration */:
+                    case 230 /* ModuleDeclaration */:
+                    case 226 /* ClassDeclaration */:
+                    case 227 /* InterfaceDeclaration */:
+                    case 225 /* FunctionDeclaration */:
                         cancellationToken.throwIfCancellationRequested();
                 }
             }
             switch (kind) {
-                case 142 /* TypeParameter */:
+                case 143 /* TypeParameter */:
                     return checkTypeParameter(node);
-                case 143 /* Parameter */:
+                case 144 /* Parameter */:
                     return checkParameter(node);
-                case 146 /* PropertyDeclaration */:
-                case 145 /* PropertySignature */:
+                case 147 /* PropertyDeclaration */:
+                case 146 /* PropertySignature */:
                     return checkPropertyDeclaration(node);
-                case 157 /* FunctionType */:
-                case 158 /* ConstructorType */:
-                case 152 /* CallSignature */:
-                case 153 /* ConstructSignature */:
+                case 158 /* FunctionType */:
+                case 159 /* ConstructorType */:
+                case 153 /* CallSignature */:
+                case 154 /* ConstructSignature */:
                     return checkSignatureDeclaration(node);
-                case 154 /* IndexSignature */:
+                case 155 /* IndexSignature */:
                     return checkSignatureDeclaration(node);
-                case 148 /* MethodDeclaration */:
-                case 147 /* MethodSignature */:
+                case 149 /* MethodDeclaration */:
+                case 148 /* MethodSignature */:
                     return checkMethodDeclaration(node);
-                case 149 /* Constructor */:
+                case 150 /* Constructor */:
                     return checkConstructorDeclaration(node);
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
                     return checkAccessorDeclaration(node);
-                case 156 /* TypeReference */:
+                case 157 /* TypeReference */:
                     return checkTypeReferenceNode(node);
-                case 155 /* TypePredicate */:
+                case 156 /* TypePredicate */:
                     return checkTypePredicate(node);
-                case 159 /* TypeQuery */:
+                case 160 /* TypeQuery */:
                     return checkTypeQuery(node);
-                case 160 /* TypeLiteral */:
+                case 161 /* TypeLiteral */:
                     return checkTypeLiteral(node);
-                case 161 /* ArrayType */:
+                case 162 /* ArrayType */:
                     return checkArrayType(node);
-                case 162 /* TupleType */:
+                case 163 /* TupleType */:
                     return checkTupleType(node);
-                case 163 /* UnionType */:
-                case 164 /* IntersectionType */:
+                case 164 /* UnionType */:
+                case 165 /* IntersectionType */:
                     return checkUnionOrIntersectionType(node);
-                case 165 /* ParenthesizedType */:
+                case 166 /* ParenthesizedType */:
+                case 168 /* TypeOperator */:
                     return checkSourceElement(node.type);
-                case 221 /* FunctionDeclaration */:
+                case 169 /* IndexedAccessType */:
+                    return checkIndexedAccessType(node);
+                case 170 /* MappedType */:
+                    return checkMappedType(node);
+                case 225 /* FunctionDeclaration */:
                     return checkFunctionDeclaration(node);
-                case 200 /* Block */:
-                case 227 /* ModuleBlock */:
+                case 204 /* Block */:
+                case 231 /* ModuleBlock */:
                     return checkBlock(node);
-                case 201 /* VariableStatement */:
+                case 205 /* VariableStatement */:
                     return checkVariableStatement(node);
-                case 203 /* ExpressionStatement */:
+                case 207 /* ExpressionStatement */:
                     return checkExpressionStatement(node);
-                case 204 /* IfStatement */:
+                case 208 /* IfStatement */:
                     return checkIfStatement(node);
-                case 205 /* DoStatement */:
+                case 209 /* DoStatement */:
                     return checkDoStatement(node);
-                case 206 /* WhileStatement */:
+                case 210 /* WhileStatement */:
                     return checkWhileStatement(node);
-                case 207 /* ForStatement */:
+                case 211 /* ForStatement */:
                     return checkForStatement(node);
-                case 208 /* ForInStatement */:
+                case 212 /* ForInStatement */:
                     return checkForInStatement(node);
-                case 209 /* ForOfStatement */:
+                case 213 /* ForOfStatement */:
                     return checkForOfStatement(node);
-                case 210 /* ContinueStatement */:
-                case 211 /* BreakStatement */:
+                case 214 /* ContinueStatement */:
+                case 215 /* BreakStatement */:
                     return checkBreakOrContinueStatement(node);
-                case 212 /* ReturnStatement */:
+                case 216 /* ReturnStatement */:
                     return checkReturnStatement(node);
-                case 213 /* WithStatement */:
+                case 217 /* WithStatement */:
                     return checkWithStatement(node);
-                case 214 /* SwitchStatement */:
+                case 218 /* SwitchStatement */:
                     return checkSwitchStatement(node);
-                case 215 /* LabeledStatement */:
+                case 219 /* LabeledStatement */:
                     return checkLabeledStatement(node);
-                case 216 /* ThrowStatement */:
+                case 220 /* ThrowStatement */:
                     return checkThrowStatement(node);
-                case 217 /* TryStatement */:
+                case 221 /* TryStatement */:
                     return checkTryStatement(node);
-                case 219 /* VariableDeclaration */:
+                case 223 /* VariableDeclaration */:
                     return checkVariableDeclaration(node);
-                case 170 /* BindingElement */:
+                case 174 /* BindingElement */:
                     return checkBindingElement(node);
-                case 222 /* ClassDeclaration */:
+                case 226 /* ClassDeclaration */:
                     return checkClassDeclaration(node);
-                case 223 /* InterfaceDeclaration */:
+                case 227 /* InterfaceDeclaration */:
                     return checkInterfaceDeclaration(node);
-                case 224 /* TypeAliasDeclaration */:
+                case 228 /* TypeAliasDeclaration */:
                     return checkTypeAliasDeclaration(node);
-                case 225 /* EnumDeclaration */:
+                case 229 /* EnumDeclaration */:
                     return checkEnumDeclaration(node);
-                case 226 /* ModuleDeclaration */:
+                case 230 /* ModuleDeclaration */:
                     return checkModuleDeclaration(node);
-                case 231 /* ImportDeclaration */:
+                case 235 /* ImportDeclaration */:
                     return checkImportDeclaration(node);
-                case 230 /* ImportEqualsDeclaration */:
+                case 234 /* ImportEqualsDeclaration */:
                     return checkImportEqualsDeclaration(node);
-                case 237 /* ExportDeclaration */:
+                case 241 /* ExportDeclaration */:
                     return checkExportDeclaration(node);
-                case 236 /* ExportAssignment */:
+                case 240 /* ExportAssignment */:
                     return checkExportAssignment(node);
-                case 202 /* EmptyStatement */:
+                case 206 /* EmptyStatement */:
                     checkGrammarStatementInAmbientContext(node);
                     return;
-                case 218 /* DebuggerStatement */:
+                case 222 /* DebuggerStatement */:
                     checkGrammarStatementInAmbientContext(node);
                     return;
-                case 240 /* MissingDeclaration */:
+                case 244 /* MissingDeclaration */:
                     return checkMissingDeclaration(node);
             }
         }
@@ -39367,17 +41197,17 @@ var ts;
             for (var _i = 0, deferredNodes_1 = deferredNodes; _i < deferredNodes_1.length; _i++) {
                 var node = deferredNodes_1[_i];
                 switch (node.kind) {
-                    case 180 /* FunctionExpression */:
-                    case 181 /* ArrowFunction */:
-                    case 148 /* MethodDeclaration */:
-                    case 147 /* MethodSignature */:
+                    case 184 /* FunctionExpression */:
+                    case 185 /* ArrowFunction */:
+                    case 149 /* MethodDeclaration */:
+                    case 148 /* MethodSignature */:
                         checkFunctionExpressionOrObjectLiteralMethodDeferred(node);
                         break;
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* SetAccessor */:
                         checkAccessorDeferred(node);
                         break;
-                    case 193 /* ClassExpression */:
+                    case 197 /* ClassExpression */:
                         checkClassExpressionDeferred(node);
                         break;
                 }
@@ -39439,9 +41269,29 @@ var ts;
         function getDiagnosticsWorker(sourceFile) {
             throwIfNonDiagnosticsProducing();
             if (sourceFile) {
+                // Some global diagnostics are deferred until they are needed and
+                // may not be reported in the firt call to getGlobalDiagnostics.
+                // We should catch these changes and report them.
+                var previousGlobalDiagnostics = diagnostics.getGlobalDiagnostics();
+                var previousGlobalDiagnosticsSize = previousGlobalDiagnostics.length;
                 checkSourceFile(sourceFile);
-                return diagnostics.getDiagnostics(sourceFile.fileName);
+                var semanticDiagnostics = diagnostics.getDiagnostics(sourceFile.fileName);
+                var currentGlobalDiagnostics = diagnostics.getGlobalDiagnostics();
+                if (currentGlobalDiagnostics !== previousGlobalDiagnostics) {
+                    // If the arrays are not the same reference, new diagnostics were added.
+                    var deferredGlobalDiagnostics = ts.relativeComplement(previousGlobalDiagnostics, currentGlobalDiagnostics, ts.compareDiagnostics);
+                    return ts.concatenate(deferredGlobalDiagnostics, semanticDiagnostics);
+                }
+                else if (previousGlobalDiagnosticsSize === 0 && currentGlobalDiagnostics.length > 0) {
+                    // If the arrays are the same reference, but the length has changed, a single
+                    // new diagnostic was added as DiagnosticCollection attempts to reuse the
+                    // same array.
+                    return ts.concatenate(currentGlobalDiagnostics, semanticDiagnostics);
+                }
+                return semanticDiagnostics;
             }
+            // Global diagnostics are always added when a file is not provided to
+            // getDiagnostics
             ts.forEach(host.getSourceFiles(), checkSourceFile);
             return diagnostics.getDiagnostics();
         }
@@ -39458,7 +41308,7 @@ var ts;
         function isInsideWithStatementBody(node) {
             if (node) {
                 while (node.parent) {
-                    if (node.parent.kind === 213 /* WithStatement */ && node.parent.statement === node) {
+                    if (node.parent.kind === 217 /* WithStatement */ && node.parent.statement === node) {
                         return true;
                     }
                     node = node.parent;
@@ -39481,25 +41331,25 @@ var ts;
                         copySymbols(location.locals, meaning);
                     }
                     switch (location.kind) {
-                        case 256 /* SourceFile */:
+                        case 261 /* SourceFile */:
                             if (!ts.isExternalOrCommonJsModule(location)) {
                                 break;
                             }
-                        case 226 /* ModuleDeclaration */:
+                        case 230 /* ModuleDeclaration */:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 8914931 /* ModuleMember */);
                             break;
-                        case 225 /* EnumDeclaration */:
+                        case 229 /* EnumDeclaration */:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 8 /* EnumMember */);
                             break;
-                        case 193 /* ClassExpression */:
+                        case 197 /* ClassExpression */:
                             var className = location.name;
                             if (className) {
                                 copySymbol(location.symbol, meaning);
                             }
                         // fall 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 222 /* ClassDeclaration */:
-                        case 223 /* InterfaceDeclaration */:
+                        case 226 /* ClassDeclaration */:
+                        case 227 /* 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.
@@ -39508,7 +41358,7 @@ var ts;
                                 copySymbols(getSymbolOfNode(location).members, meaning & 793064 /* Type */);
                             }
                             break;
-                        case 180 /* FunctionExpression */:
+                        case 184 /* FunctionExpression */:
                             var funcName = location.name;
                             if (funcName) {
                                 copySymbol(location.symbol, meaning);
@@ -39557,28 +41407,28 @@ var ts;
         }
         function isTypeDeclaration(node) {
             switch (node.kind) {
-                case 142 /* TypeParameter */:
-                case 222 /* ClassDeclaration */:
-                case 223 /* InterfaceDeclaration */:
-                case 224 /* TypeAliasDeclaration */:
-                case 225 /* EnumDeclaration */:
+                case 143 /* TypeParameter */:
+                case 226 /* ClassDeclaration */:
+                case 227 /* InterfaceDeclaration */:
+                case 228 /* TypeAliasDeclaration */:
+                case 229 /* EnumDeclaration */:
                     return true;
             }
         }
         // True if the given identifier is part of a type reference
         function isTypeReferenceIdentifier(entityName) {
             var node = entityName;
-            while (node.parent && node.parent.kind === 140 /* QualifiedName */) {
+            while (node.parent && node.parent.kind === 141 /* QualifiedName */) {
                 node = node.parent;
             }
-            return node.parent && (node.parent.kind === 156 /* TypeReference */ || node.parent.kind === 267 /* JSDocTypeReference */);
+            return node.parent && (node.parent.kind === 157 /* TypeReference */ || node.parent.kind === 272 /* JSDocTypeReference */);
         }
         function isHeritageClauseElementIdentifier(entityName) {
             var node = entityName;
-            while (node.parent && node.parent.kind === 173 /* PropertyAccessExpression */) {
+            while (node.parent && node.parent.kind === 177 /* PropertyAccessExpression */) {
                 node = node.parent;
             }
-            return node.parent && node.parent.kind === 195 /* ExpressionWithTypeArguments */;
+            return node.parent && node.parent.kind === 199 /* ExpressionWithTypeArguments */;
         }
         function forEachEnclosingClass(node, callback) {
             var result;
@@ -39595,13 +41445,13 @@ var ts;
             return !!forEachEnclosingClass(node, function (n) { return n === classDeclaration; });
         }
         function getLeftSideOfImportEqualsOrExportAssignment(nodeOnRightSide) {
-            while (nodeOnRightSide.parent.kind === 140 /* QualifiedName */) {
+            while (nodeOnRightSide.parent.kind === 141 /* QualifiedName */) {
                 nodeOnRightSide = nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 230 /* ImportEqualsDeclaration */) {
+            if (nodeOnRightSide.parent.kind === 234 /* ImportEqualsDeclaration */) {
                 return nodeOnRightSide.parent.moduleReference === nodeOnRightSide && nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 236 /* ExportAssignment */) {
+            if (nodeOnRightSide.parent.kind === 240 /* ExportAssignment */) {
                 return nodeOnRightSide.parent.expression === nodeOnRightSide && nodeOnRightSide.parent;
             }
             return undefined;
@@ -39613,7 +41463,7 @@ var ts;
             if (ts.isDeclarationName(entityName)) {
                 return getSymbolOfNode(entityName.parent);
             }
-            if (ts.isInJavaScriptFile(entityName) && entityName.parent.kind === 173 /* PropertyAccessExpression */) {
+            if (ts.isInJavaScriptFile(entityName) && entityName.parent.kind === 177 /* PropertyAccessExpression */) {
                 var specialPropertyAssignmentKind = ts.getSpecialPropertyAssignmentKind(entityName.parent.parent);
                 switch (specialPropertyAssignmentKind) {
                     case 1 /* ExportsProperty */:
@@ -39625,13 +41475,13 @@ var ts;
                     default:
                 }
             }
-            if (entityName.parent.kind === 236 /* ExportAssignment */ && ts.isEntityNameExpression(entityName)) {
+            if (entityName.parent.kind === 240 /* ExportAssignment */ && ts.isEntityNameExpression(entityName)) {
                 return resolveEntityName(entityName, 
                 /*all meanings*/ 107455 /* Value */ | 793064 /* Type */ | 1920 /* Namespace */ | 8388608 /* Alias */);
             }
-            if (entityName.kind !== 173 /* PropertyAccessExpression */ && isInRightSideOfImportOrExportAssignment(entityName)) {
+            if (entityName.kind !== 177 /* PropertyAccessExpression */ && isInRightSideOfImportOrExportAssignment(entityName)) {
                 // Since we already checked for ExportAssignment, this really could only be an Import
-                var importEqualsDeclaration = ts.getAncestor(entityName, 230 /* ImportEqualsDeclaration */);
+                var importEqualsDeclaration = ts.getAncestor(entityName, 234 /* ImportEqualsDeclaration */);
                 ts.Debug.assert(importEqualsDeclaration !== undefined);
                 return getSymbolOfPartOfRightHandSideOfImportEquals(entityName, /*dontResolveAlias*/ true);
             }
@@ -39641,7 +41491,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 === 195 /* ExpressionWithTypeArguments */) {
+                if (entityName.parent.kind === 199 /* ExpressionWithTypeArguments */) {
                     meaning = 793064 /* Type */;
                     // In a class 'extends' clause we are also looking for a value.
                     if (ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
@@ -39665,14 +41515,14 @@ var ts;
                     }
                     return resolveEntityName(entityName, 107455 /* Value */, /*ignoreErrors*/ false, /*dontResolveAlias*/ true);
                 }
-                else if (entityName.kind === 173 /* PropertyAccessExpression */) {
+                else if (entityName.kind === 177 /* PropertyAccessExpression */) {
                     var symbol = getNodeLinks(entityName).resolvedSymbol;
                     if (!symbol) {
                         checkPropertyAccessExpression(entityName);
                     }
                     return getNodeLinks(entityName).resolvedSymbol;
                 }
-                else if (entityName.kind === 140 /* QualifiedName */) {
+                else if (entityName.kind === 141 /* QualifiedName */) {
                     var symbol = getNodeLinks(entityName).resolvedSymbol;
                     if (!symbol) {
                         checkQualifiedName(entityName);
@@ -39681,20 +41531,20 @@ var ts;
                 }
             }
             else if (isTypeReferenceIdentifier(entityName)) {
-                var meaning = (entityName.parent.kind === 156 /* TypeReference */ || entityName.parent.kind === 267 /* JSDocTypeReference */) ? 793064 /* Type */ : 1920 /* Namespace */;
+                var meaning = (entityName.parent.kind === 157 /* TypeReference */ || entityName.parent.kind === 272 /* JSDocTypeReference */) ? 793064 /* Type */ : 1920 /* Namespace */;
                 return resolveEntityName(entityName, meaning, /*ignoreErrors*/ false, /*dontResolveAlias*/ true);
             }
-            else if (entityName.parent.kind === 246 /* JsxAttribute */) {
+            else if (entityName.parent.kind === 250 /* JsxAttribute */) {
                 return getJsxAttributePropertySymbol(entityName.parent);
             }
-            if (entityName.parent.kind === 155 /* TypePredicate */) {
+            if (entityName.parent.kind === 156 /* TypePredicate */) {
                 return resolveEntityName(entityName, /*meaning*/ 1 /* FunctionScopedVariable */);
             }
             // Do we want to return undefined here?
             return undefined;
         }
         function getSymbolAtLocation(node) {
-            if (node.kind === 256 /* SourceFile */) {
+            if (node.kind === 261 /* SourceFile */) {
                 return ts.isExternalModule(node) ? getMergedSymbol(node.symbol) : undefined;
             }
             if (isInsideWithStatementBody(node)) {
@@ -39712,8 +41562,8 @@ var ts;
                 if (isInRightSideOfImportOrExportAssignment(node)) {
                     return getSymbolOfEntityNameOrPropertyAccessExpression(node);
                 }
-                else if (node.parent.kind === 170 /* BindingElement */ &&
-                    node.parent.parent.kind === 168 /* ObjectBindingPattern */ &&
+                else if (node.parent.kind === 174 /* BindingElement */ &&
+                    node.parent.parent.kind === 172 /* ObjectBindingPattern */ &&
                     node === node.parent.propertyName) {
                     var typeOfPattern = getTypeOfNode(node.parent.parent);
                     var propertyDeclaration = typeOfPattern && getPropertyOfType(typeOfPattern, node.text);
@@ -39724,8 +41574,8 @@ var ts;
             }
             switch (node.kind) {
                 case 70 /* Identifier */:
-                case 173 /* PropertyAccessExpression */:
-                case 140 /* QualifiedName */:
+                case 177 /* PropertyAccessExpression */:
+                case 141 /* QualifiedName */:
                     return getSymbolOfEntityNameOrPropertyAccessExpression(node);
                 case 98 /* ThisKeyword */:
                     var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
@@ -39739,12 +41589,12 @@ var ts;
                 case 96 /* SuperKeyword */:
                     var type = ts.isPartOfExpression(node) ? checkExpression(node) : getTypeFromTypeNode(node);
                     return type.symbol;
-                case 166 /* ThisType */:
+                case 167 /* ThisType */:
                     return getTypeFromTypeNode(node).symbol;
                 case 122 /* ConstructorKeyword */:
                     // constructor keyword for an overload, should take us to the definition if it exist
                     var constructorDeclaration = node.parent;
-                    if (constructorDeclaration && constructorDeclaration.kind === 149 /* Constructor */) {
+                    if (constructorDeclaration && constructorDeclaration.kind === 150 /* Constructor */) {
                         return constructorDeclaration.parent.symbol;
                     }
                     return undefined;
@@ -39752,7 +41602,7 @@ var ts;
                     // External module name in an import declaration
                     if ((ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) &&
                         ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) ||
-                        ((node.parent.kind === 231 /* ImportDeclaration */ || node.parent.kind === 237 /* ExportDeclaration */) &&
+                        ((node.parent.kind === 235 /* ImportDeclaration */ || node.parent.kind === 241 /* ExportDeclaration */) &&
                             node.parent.moduleSpecifier === node)) {
                         return resolveExternalModuleName(node, node);
                     }
@@ -39762,7 +41612,7 @@ var ts;
                 // Fall through
                 case 8 /* NumericLiteral */:
                     // index access
-                    if (node.parent.kind === 174 /* ElementAccessExpression */ && node.parent.argumentExpression === node) {
+                    if (node.parent.kind === 178 /* ElementAccessExpression */ && node.parent.argumentExpression === node) {
                         var objectType = checkExpression(node.parent.expression);
                         if (objectType === unknownType)
                             return undefined;
@@ -39779,7 +41629,7 @@ var ts;
             // The function returns a value symbol of an identifier in the short-hand property assignment.
             // This is necessary as an identifier in short-hand property assignment can contains two meaning:
             // property name and property value.
-            if (location && location.kind === 254 /* ShorthandPropertyAssignment */) {
+            if (location && location.kind === 258 /* ShorthandPropertyAssignment */) {
                 return resolveEntityName(location.name, 107455 /* Value */ | 8388608 /* Alias */);
             }
             return undefined;
@@ -39841,28 +41691,28 @@ var ts;
         // [ a ] from
         //     [a] = [ some array ...]
         function getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr) {
-            ts.Debug.assert(expr.kind === 172 /* ObjectLiteralExpression */ || expr.kind === 171 /* ArrayLiteralExpression */);
+            ts.Debug.assert(expr.kind === 176 /* ObjectLiteralExpression */ || expr.kind === 175 /* ArrayLiteralExpression */);
             // If this is from "for of"
             //     for ( { a } of elems) {
             //     }
-            if (expr.parent.kind === 209 /* ForOfStatement */) {
+            if (expr.parent.kind === 213 /* ForOfStatement */) {
                 var iteratedType = checkRightHandSideOfForOf(expr.parent.expression);
                 return checkDestructuringAssignment(expr, iteratedType || unknownType);
             }
             // If this is from "for" initializer
             //     for ({a } = elems[0];.....) { }
-            if (expr.parent.kind === 188 /* BinaryExpression */) {
+            if (expr.parent.kind === 192 /* BinaryExpression */) {
                 var iteratedType = checkExpression(expr.parent.right);
                 return checkDestructuringAssignment(expr, iteratedType || unknownType);
             }
             // If this is from nested object binding pattern
             //     for ({ skills: { primary, secondary } } = multiRobot, i = 0; i < 1; i++) {
-            if (expr.parent.kind === 253 /* PropertyAssignment */) {
+            if (expr.parent.kind === 257 /* PropertyAssignment */) {
                 var typeOfParentObjectLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr.parent.parent);
                 return checkObjectLiteralDestructuringPropertyAssignment(typeOfParentObjectLiteral || unknownType, expr.parent);
             }
             // Array literal assignment - array destructuring pattern
-            ts.Debug.assert(expr.parent.kind === 171 /* ArrayLiteralExpression */);
+            ts.Debug.assert(expr.parent.kind === 175 /* ArrayLiteralExpression */);
             //    [{ property1: p1, property2 }] = elems;
             var typeOfArrayLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr.parent);
             var elementType = checkIteratedTypeOrElementType(typeOfArrayLiteral || unknownType, expr.parent, /*allowStringInput*/ false) || unknownType;
@@ -39912,9 +41762,9 @@ var ts;
         function getRootSymbols(symbol) {
             if (symbol.flags & 268435456 /* SyntheticProperty */) {
                 var symbols_3 = [];
-                var name_23 = symbol.name;
+                var name_27 = symbol.name;
                 ts.forEach(getSymbolLinks(symbol).containingType.types, function (t) {
-                    var symbol = getPropertyOfType(t, name_23);
+                    var symbol = getPropertyOfType(t, name_27);
                     if (symbol) {
                         symbols_3.push(symbol);
                     }
@@ -39922,6 +41772,10 @@ var ts;
                 return symbols_3;
             }
             else if (symbol.flags & 67108864 /* Transient */) {
+                if (symbol.leftSpread) {
+                    var links = symbol;
+                    return [links.leftSpread, links.rightSpread];
+                }
                 var target = void 0;
                 var next = symbol;
                 while (next = getSymbolLinks(next).target) {
@@ -39994,7 +41848,7 @@ var ts;
                     }
                     var parentSymbol = getParentOfSymbol(symbol);
                     if (parentSymbol) {
-                        if (parentSymbol.flags & 512 /* ValueModule */ && parentSymbol.valueDeclaration.kind === 256 /* SourceFile */) {
+                        if (parentSymbol.flags & 512 /* ValueModule */ && parentSymbol.valueDeclaration.kind === 261 /* SourceFile */) {
                             var symbolFile = parentSymbol.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.
@@ -40051,7 +41905,7 @@ var ts;
                             //       they will not collide with anything
                             var isDeclaredInLoop = nodeLinks_1.flags & 262144 /* BlockScopedBindingInLoop */;
                             var inLoopInitializer = ts.isIterationStatement(container, /*lookInLabeledStatements*/ false);
-                            var inLoopBodyBlock = container.kind === 200 /* Block */ && ts.isIterationStatement(container.parent, /*lookInLabeledStatements*/ false);
+                            var inLoopBodyBlock = container.kind === 204 /* Block */ && ts.isIterationStatement(container.parent, /*lookInLabeledStatements*/ false);
                             links.isDeclarationWithCollidingName = !ts.isBlockScopedContainerTopLevel(container) && (!isDeclaredInLoop || (!inLoopInitializer && !inLoopBodyBlock));
                         }
                         else {
@@ -40097,16 +41951,16 @@ var ts;
                 return true;
             }
             switch (node.kind) {
-                case 230 /* ImportEqualsDeclaration */:
-                case 232 /* ImportClause */:
-                case 233 /* NamespaceImport */:
-                case 235 /* ImportSpecifier */:
-                case 239 /* ExportSpecifier */:
+                case 234 /* ImportEqualsDeclaration */:
+                case 236 /* ImportClause */:
+                case 237 /* NamespaceImport */:
+                case 239 /* ImportSpecifier */:
+                case 243 /* ExportSpecifier */:
                     return isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol);
-                case 237 /* ExportDeclaration */:
+                case 241 /* ExportDeclaration */:
                     var exportClause = node.exportClause;
                     return exportClause && ts.forEach(exportClause.elements, isValueAliasDeclaration);
-                case 236 /* ExportAssignment */:
+                case 240 /* ExportAssignment */:
                     return node.expression
                         && node.expression.kind === 70 /* Identifier */
                         ? isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol)
@@ -40116,7 +41970,7 @@ var ts;
         }
         function isTopLevelValueImportEqualsWithEntityName(node) {
             node = ts.getParseTreeNode(node, ts.isImportEqualsDeclaration);
-            if (node === undefined || node.parent.kind !== 256 /* SourceFile */ || !ts.isInternalModuleImportEqualsDeclaration(node)) {
+            if (node === undefined || node.parent.kind !== 261 /* SourceFile */ || !ts.isInternalModuleImportEqualsDeclaration(node)) {
                 // parent is not source file or it is not reference to internal module
                 return false;
             }
@@ -40182,7 +42036,7 @@ var ts;
             return getNodeLinks(node).enumMemberValue;
         }
         function getConstantValue(node) {
-            if (node.kind === 255 /* EnumMember */) {
+            if (node.kind === 260 /* EnumMember */) {
                 return getEnumMemberValue(node);
             }
             var symbol = getNodeLinks(node).resolvedSymbol;
@@ -40195,7 +42049,7 @@ var ts;
             return undefined;
         }
         function isFunctionType(type) {
-            return type.flags & 2588672 /* ObjectType */ && getSignaturesOfType(type, 0 /* Call */).length > 0;
+            return type.flags & 32768 /* Object */ && getSignaturesOfType(type, 0 /* Call */).length > 0;
         }
         function getTypeReferenceSerializationKind(typeName, location) {
             // Resolve the symbol as a value to ensure the type can be reached at runtime during emit.
@@ -40283,9 +42137,9 @@ var ts;
             if (startInDeclarationContainer) {
                 // When resolving the name of a declaration as a value, we need to start resolution
                 // at a point outside of the declaration.
-                var parent_14 = reference.parent;
-                if (ts.isDeclaration(parent_14) && reference === parent_14.name) {
-                    location = getDeclarationContainer(parent_14);
+                var parent_12 = reference.parent;
+                if (ts.isDeclaration(parent_12) && reference === parent_12.name) {
+                    location = getDeclarationContainer(parent_12);
                 }
             }
             return resolveName(location, reference.text, 107455 /* Value */ | 1048576 /* ExportValue */ | 8388608 /* Alias */, /*nodeNotFoundMessage*/ undefined, /*nameArg*/ undefined);
@@ -40305,7 +42159,7 @@ var ts;
         function isLiteralConstDeclaration(node) {
             if (ts.isConst(node)) {
                 var type = getTypeOfSymbol(getSymbolOfNode(node));
-                return !!(type.flags & 96 /* StringOrNumberLiteral */ && type.flags & 16777216 /* FreshLiteral */);
+                return !!(type.flags & 96 /* StringOrNumberLiteral */ && type.flags & 1048576 /* FreshLiteral */);
             }
             return false;
         }
@@ -40359,7 +42213,8 @@ var ts;
                 getTypeReferenceDirectivesForEntityName: getTypeReferenceDirectivesForEntityName,
                 getTypeReferenceDirectivesForSymbol: getTypeReferenceDirectivesForSymbol,
                 isLiteralConstDeclaration: isLiteralConstDeclaration,
-                writeLiteralConstValue: writeLiteralConstValue
+                writeLiteralConstValue: writeLiteralConstValue,
+                getJsxFactoryEntity: function () { return _jsxFactoryEntity; }
             };
             // defined here to avoid outer scope pollution
             function getTypeReferenceDirectivesForEntityName(node) {
@@ -40370,7 +42225,7 @@ var ts;
                 // property access can only be used as values
                 // qualified names can only be used as types\namespaces
                 // identifiers are treated as values only if they appear in type queries
-                var meaning = (node.kind === 173 /* PropertyAccessExpression */) || (node.kind === 70 /* Identifier */ && isInTypeQuery(node))
+                var meaning = (node.kind === 177 /* PropertyAccessExpression */) || (node.kind === 70 /* Identifier */ && isInTypeQuery(node))
                     ? 107455 /* Value */ | 1048576 /* ExportValue */
                     : 793064 /* Type */ | 1920 /* Namespace */;
                 var symbol = resolveEntityName(node, meaning, /*ignoreErrors*/ true);
@@ -40396,6 +42251,10 @@ var ts;
                         if (typeReferenceDirective) {
                             (typeReferenceDirectives || (typeReferenceDirectives = [])).push(typeReferenceDirective);
                         }
+                        else {
+                            // found at least one entry that does not originate from type reference directive
+                            return undefined;
+                        }
                     }
                 }
                 return typeReferenceDirectives;
@@ -40409,15 +42268,15 @@ var ts;
                 // external modules cannot define or contribute to type declaration files
                 var current = symbol;
                 while (true) {
-                    var parent_15 = getParentOfSymbol(current);
-                    if (parent_15) {
-                        current = parent_15;
+                    var parent_13 = getParentOfSymbol(current);
+                    if (parent_13) {
+                        current = parent_13;
                     }
                     else {
                         break;
                     }
                 }
-                if (current.valueDeclaration && current.valueDeclaration.kind === 256 /* SourceFile */ && current.flags & 512 /* ValueModule */) {
+                if (current.valueDeclaration && current.valueDeclaration.kind === 261 /* SourceFile */ && current.flags & 512 /* ValueModule */) {
                     return false;
                 }
                 // check that at least one declaration of top level symbol originates from type declaration file
@@ -40437,7 +42296,7 @@ var ts;
             if (!moduleSymbol) {
                 return undefined;
             }
-            return ts.getDeclarationOfKind(moduleSymbol, 256 /* SourceFile */);
+            return ts.getDeclarationOfKind(moduleSymbol, 261 /* SourceFile */);
         }
         function initializeTypeChecker() {
             // Bind all source files and propagate errors
@@ -40470,7 +42329,7 @@ var ts;
                     }
                 }
                 if ((compilerOptions.isolatedModules || ts.isExternalModule(file)) && !file.isDeclarationFile) {
-                    var fileRequestedExternalEmitHelpers = file.flags & 31744 /* EmitHelperFlags */;
+                    var fileRequestedExternalEmitHelpers = file.flags & 64512 /* EmitHelperFlags */;
                     if (fileRequestedExternalEmitHelpers) {
                         requestedExternalEmitHelpers |= fileRequestedExternalEmitHelpers;
                         if (firstFileRequestingExternalHelpers === undefined) {
@@ -40549,9 +42408,13 @@ var ts;
                     if (requestedExternalEmitHelpers & 1024 /* HasClassExtends */ && languageVersion < 2 /* ES2015 */) {
                         verifyHelperSymbol(exports, "__extends", 107455 /* Value */);
                     }
-                    if (requestedExternalEmitHelpers & 16384 /* HasJsxSpreadAttributes */ && compilerOptions.jsx !== 1 /* Preserve */) {
+                    if (requestedExternalEmitHelpers & 16384 /* HasSpreadAttribute */ &&
+                        (languageVersion < 5 /* ESNext */ || compilerOptions.jsx === 2 /* React */)) {
                         verifyHelperSymbol(exports, "__assign", 107455 /* Value */);
                     }
+                    if (languageVersion < 5 /* ESNext */ && requestedExternalEmitHelpers & 32768 /* HasRestAttribute */) {
+                        verifyHelperSymbol(exports, "__rest", 107455 /* Value */);
+                    }
                     if (requestedExternalEmitHelpers & 2048 /* HasDecorators */) {
                         verifyHelperSymbol(exports, "__decorate", 107455 /* Value */);
                         if (compilerOptions.emitDecoratorMetadata) {
@@ -40587,7 +42450,7 @@ var ts;
             // build the thenable type that is used to verify against a non-promise "thenable" operand to `await`.
             var thenPropertySymbol = createSymbol(67108864 /* Transient */ | 4 /* Property */, "then");
             getSymbolLinks(thenPropertySymbol).type = globalFunctionType;
-            var thenableType = createObjectType(2097152 /* Anonymous */);
+            var thenableType = createObjectType(16 /* Anonymous */);
             thenableType.properties = [thenPropertySymbol];
             thenableType.members = createSymbolTable(thenableType.properties);
             thenableType.callSignatures = [];
@@ -40600,14 +42463,14 @@ var ts;
                 return false;
             }
             if (!ts.nodeCanBeDecorated(node)) {
-                if (node.kind === 148 /* MethodDeclaration */ && !ts.nodeIsPresent(node.body)) {
+                if (node.kind === 149 /* 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 === 150 /* GetAccessor */ || node.kind === 151 /* SetAccessor */) {
+            else if (node.kind === 151 /* GetAccessor */ || node.kind === 152 /* 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);
@@ -40624,17 +42487,17 @@ var ts;
             var flags = 0 /* None */;
             for (var _i = 0, _a = node.modifiers; _i < _a.length; _i++) {
                 var modifier = _a[_i];
-                if (modifier.kind !== 129 /* ReadonlyKeyword */) {
-                    if (node.kind === 145 /* PropertySignature */ || node.kind === 147 /* MethodSignature */) {
+                if (modifier.kind !== 130 /* ReadonlyKeyword */) {
+                    if (node.kind === 146 /* PropertySignature */ || node.kind === 148 /* MethodSignature */) {
                         return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_type_member, ts.tokenToString(modifier.kind));
                     }
-                    if (node.kind === 154 /* IndexSignature */) {
+                    if (node.kind === 155 /* IndexSignature */) {
                         return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_an_index_signature, ts.tokenToString(modifier.kind));
                     }
                 }
                 switch (modifier.kind) {
                     case 75 /* ConstKeyword */:
-                        if (node.kind !== 225 /* EnumDeclaration */ && node.parent.kind === 222 /* ClassDeclaration */) {
+                        if (node.kind !== 229 /* EnumDeclaration */ && node.parent.kind === 226 /* ClassDeclaration */) {
                             return grammarErrorOnNode(node, ts.Diagnostics.A_class_member_cannot_have_the_0_keyword, ts.tokenToString(75 /* ConstKeyword */));
                         }
                         break;
@@ -40660,7 +42523,7 @@ 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 === 227 /* ModuleBlock */ || node.parent.kind === 256 /* SourceFile */) {
+                        else if (node.parent.kind === 231 /* ModuleBlock */ || node.parent.kind === 261 /* SourceFile */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, text);
                         }
                         else if (flags & 128 /* Abstract */) {
@@ -40683,10 +42546,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 === 227 /* ModuleBlock */ || node.parent.kind === 256 /* SourceFile */) {
+                        else if (node.parent.kind === 231 /* ModuleBlock */ || node.parent.kind === 261 /* SourceFile */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, "static");
                         }
-                        else if (node.kind === 143 /* Parameter */) {
+                        else if (node.kind === 144 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "static");
                         }
                         else if (flags & 128 /* Abstract */) {
@@ -40695,11 +42558,11 @@ var ts;
                         flags |= 32 /* Static */;
                         lastStatic = modifier;
                         break;
-                    case 129 /* ReadonlyKeyword */:
+                    case 130 /* ReadonlyKeyword */:
                         if (flags & 64 /* Readonly */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "readonly");
                         }
-                        else if (node.kind !== 146 /* PropertyDeclaration */ && node.kind !== 145 /* PropertySignature */ && node.kind !== 154 /* IndexSignature */ && node.kind !== 143 /* Parameter */) {
+                        else if (node.kind !== 147 /* PropertyDeclaration */ && node.kind !== 146 /* PropertySignature */ && node.kind !== 155 /* IndexSignature */ && node.kind !== 144 /* 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);
                         }
@@ -40719,10 +42582,10 @@ 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 === 222 /* ClassDeclaration */) {
+                        else if (node.parent.kind === 226 /* ClassDeclaration */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "export");
                         }
-                        else if (node.kind === 143 /* Parameter */) {
+                        else if (node.kind === 144 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "export");
                         }
                         flags |= 1 /* Export */;
@@ -40734,13 +42597,13 @@ var ts;
                         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 === 222 /* ClassDeclaration */) {
+                        else if (node.parent.kind === 226 /* ClassDeclaration */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "declare");
                         }
-                        else if (node.kind === 143 /* Parameter */) {
+                        else if (node.kind === 144 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "declare");
                         }
-                        else if (ts.isInAmbientContext(node.parent) && node.parent.kind === 227 /* ModuleBlock */) {
+                        else if (ts.isInAmbientContext(node.parent) && node.parent.kind === 231 /* ModuleBlock */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.A_declare_modifier_cannot_be_used_in_an_already_ambient_context);
                         }
                         flags |= 2 /* Ambient */;
@@ -40750,14 +42613,14 @@ var ts;
                         if (flags & 128 /* Abstract */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "abstract");
                         }
-                        if (node.kind !== 222 /* ClassDeclaration */) {
-                            if (node.kind !== 148 /* MethodDeclaration */ &&
-                                node.kind !== 146 /* PropertyDeclaration */ &&
-                                node.kind !== 150 /* GetAccessor */ &&
-                                node.kind !== 151 /* SetAccessor */) {
+                        if (node.kind !== 226 /* ClassDeclaration */) {
+                            if (node.kind !== 149 /* MethodDeclaration */ &&
+                                node.kind !== 147 /* PropertyDeclaration */ &&
+                                node.kind !== 151 /* GetAccessor */ &&
+                                node.kind !== 152 /* SetAccessor */) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration);
                             }
-                            if (!(node.parent.kind === 222 /* ClassDeclaration */ && ts.getModifierFlags(node.parent) & 128 /* Abstract */)) {
+                            if (!(node.parent.kind === 226 /* ClassDeclaration */ && ts.getModifierFlags(node.parent) & 128 /* Abstract */)) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.Abstract_methods_can_only_appear_within_an_abstract_class);
                             }
                             if (flags & 32 /* Static */) {
@@ -40776,7 +42639,7 @@ var ts;
                         else if (flags & 2 /* Ambient */ || ts.isInAmbientContext(node.parent)) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
-                        else if (node.kind === 143 /* Parameter */) {
+                        else if (node.kind === 144 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "async");
                         }
                         flags |= 256 /* Async */;
@@ -40784,7 +42647,7 @@ var ts;
                         break;
                 }
             }
-            if (node.kind === 149 /* Constructor */) {
+            if (node.kind === 150 /* Constructor */) {
                 if (flags & 32 /* Static */) {
                     return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "static");
                 }
@@ -40799,13 +42662,13 @@ var ts;
                 }
                 return;
             }
-            else if ((node.kind === 231 /* ImportDeclaration */ || node.kind === 230 /* ImportEqualsDeclaration */) && flags & 2 /* Ambient */) {
+            else if ((node.kind === 235 /* ImportDeclaration */ || node.kind === 234 /* ImportEqualsDeclaration */) && flags & 2 /* Ambient */) {
                 return grammarErrorOnNode(lastDeclare, ts.Diagnostics.A_0_modifier_cannot_be_used_with_an_import_declaration, "declare");
             }
-            else if (node.kind === 143 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && ts.isBindingPattern(node.name)) {
+            else if (node.kind === 144 /* 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 === 143 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && node.dotDotDotToken) {
+            else if (node.kind === 144 /* 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 */) {
@@ -40825,37 +42688,37 @@ var ts;
         }
         function shouldReportBadModifier(node) {
             switch (node.kind) {
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
-                case 149 /* Constructor */:
-                case 146 /* PropertyDeclaration */:
-                case 145 /* PropertySignature */:
-                case 148 /* MethodDeclaration */:
-                case 147 /* MethodSignature */:
-                case 154 /* IndexSignature */:
-                case 226 /* ModuleDeclaration */:
-                case 231 /* ImportDeclaration */:
-                case 230 /* ImportEqualsDeclaration */:
-                case 237 /* ExportDeclaration */:
-                case 236 /* ExportAssignment */:
-                case 180 /* FunctionExpression */:
-                case 181 /* ArrowFunction */:
-                case 143 /* Parameter */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
+                case 150 /* Constructor */:
+                case 147 /* PropertyDeclaration */:
+                case 146 /* PropertySignature */:
+                case 149 /* MethodDeclaration */:
+                case 148 /* MethodSignature */:
+                case 155 /* IndexSignature */:
+                case 230 /* ModuleDeclaration */:
+                case 235 /* ImportDeclaration */:
+                case 234 /* ImportEqualsDeclaration */:
+                case 241 /* ExportDeclaration */:
+                case 240 /* ExportAssignment */:
+                case 184 /* FunctionExpression */:
+                case 185 /* ArrowFunction */:
+                case 144 /* Parameter */:
                     return false;
                 default:
-                    if (node.parent.kind === 227 /* ModuleBlock */ || node.parent.kind === 256 /* SourceFile */) {
+                    if (node.parent.kind === 231 /* ModuleBlock */ || node.parent.kind === 261 /* SourceFile */) {
                         return false;
                     }
                     switch (node.kind) {
-                        case 221 /* FunctionDeclaration */:
+                        case 225 /* FunctionDeclaration */:
                             return nodeHasAnyModifiersExcept(node, 119 /* AsyncKeyword */);
-                        case 222 /* ClassDeclaration */:
+                        case 226 /* ClassDeclaration */:
                             return nodeHasAnyModifiersExcept(node, 116 /* AbstractKeyword */);
-                        case 223 /* InterfaceDeclaration */:
-                        case 201 /* VariableStatement */:
-                        case 224 /* TypeAliasDeclaration */:
+                        case 227 /* InterfaceDeclaration */:
+                        case 205 /* VariableStatement */:
+                        case 228 /* TypeAliasDeclaration */:
                             return true;
-                        case 225 /* EnumDeclaration */:
+                        case 229 /* EnumDeclaration */:
                             return nodeHasAnyModifiersExcept(node, 75 /* ConstKeyword */);
                         default:
                             ts.Debug.fail();
@@ -40868,10 +42731,10 @@ var ts;
         }
         function checkGrammarAsyncModifier(node, asyncModifier) {
             switch (node.kind) {
-                case 148 /* MethodDeclaration */:
-                case 221 /* FunctionDeclaration */:
-                case 180 /* FunctionExpression */:
-                case 181 /* ArrowFunction */:
+                case 149 /* MethodDeclaration */:
+                case 225 /* FunctionDeclaration */:
+                case 184 /* FunctionExpression */:
+                case 185 /* ArrowFunction */:
                     if (!node.asteriskToken) {
                         return false;
                     }
@@ -40934,7 +42797,7 @@ var ts;
                 checkGrammarParameterList(node.parameters) || checkGrammarArrowFunction(node, file);
         }
         function checkGrammarArrowFunction(node, file) {
-            if (node.kind === 181 /* ArrowFunction */) {
+            if (node.kind === 185 /* ArrowFunction */) {
                 var arrowFunction = node;
                 var startLine = ts.getLineAndCharacterOfPosition(file, arrowFunction.equalsGreaterThanToken.pos).line;
                 var endLine = ts.getLineAndCharacterOfPosition(file, arrowFunction.equalsGreaterThanToken.end).line;
@@ -40969,7 +42832,7 @@ var ts;
             if (!parameter.type) {
                 return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_must_have_a_type_annotation);
             }
-            if (parameter.type.kind !== 133 /* StringKeyword */ && parameter.type.kind !== 131 /* NumberKeyword */) {
+            if (parameter.type.kind !== 134 /* StringKeyword */ && parameter.type.kind !== 132 /* NumberKeyword */) {
                 return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_must_be_string_or_number);
             }
             if (!node.type) {
@@ -40997,7 +42860,7 @@ var ts;
                 var sourceFile = ts.getSourceFileOfNode(node);
                 for (var _i = 0, args_4 = args; _i < args_4.length; _i++) {
                     var arg = args_4[_i];
-                    if (arg.kind === 194 /* OmittedExpression */) {
+                    if (arg.kind === 198 /* OmittedExpression */) {
                         return grammarErrorAtPos(sourceFile, arg.pos, 0, ts.Diagnostics.Argument_expression_expected);
                     }
                 }
@@ -41070,19 +42933,19 @@ var ts;
         }
         function checkGrammarComputedPropertyName(node) {
             // If node is not a computedPropertyName, just skip the grammar checking
-            if (node.kind !== 141 /* ComputedPropertyName */) {
+            if (node.kind !== 142 /* ComputedPropertyName */) {
                 return false;
             }
             var computedPropertyName = node;
-            if (computedPropertyName.expression.kind === 188 /* BinaryExpression */ && computedPropertyName.expression.operatorToken.kind === 25 /* CommaToken */) {
+            if (computedPropertyName.expression.kind === 192 /* BinaryExpression */ && computedPropertyName.expression.operatorToken.kind === 25 /* CommaToken */) {
                 return grammarErrorOnNode(computedPropertyName.expression, ts.Diagnostics.A_comma_expression_is_not_allowed_in_a_computed_property_name);
             }
         }
         function checkGrammarForGenerator(node) {
             if (node.asteriskToken) {
-                ts.Debug.assert(node.kind === 221 /* FunctionDeclaration */ ||
-                    node.kind === 180 /* FunctionExpression */ ||
-                    node.kind === 148 /* MethodDeclaration */);
+                ts.Debug.assert(node.kind === 225 /* FunctionDeclaration */ ||
+                    node.kind === 184 /* FunctionExpression */ ||
+                    node.kind === 149 /* MethodDeclaration */);
                 if (ts.isInAmbientContext(node)) {
                     return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.Generators_are_not_allowed_in_an_ambient_context);
                 }
@@ -41107,12 +42970,15 @@ var ts;
             var GetOrSetAccessor = GetAccessor | SetAccessor;
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var prop = _a[_i];
-                var name_24 = prop.name;
-                if (name_24.kind === 141 /* ComputedPropertyName */) {
-                    // If the name is not a ComputedPropertyName, the grammar checking will skip it
-                    checkGrammarComputedPropertyName(name_24);
+                if (prop.kind === 259 /* SpreadAssignment */) {
+                    continue;
                 }
-                if (prop.kind === 254 /* ShorthandPropertyAssignment */ && !inDestructuring && prop.objectAssignmentInitializer) {
+                var name_28 = prop.name;
+                if (name_28.kind === 142 /* ComputedPropertyName */) {
+                    // If the name is not a ComputedPropertyName, the grammar checking will skip it
+                    checkGrammarComputedPropertyName(name_28);
+                }
+                if (prop.kind === 258 /* 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);
@@ -41121,7 +42987,7 @@ var ts;
                 if (prop.modifiers) {
                     for (var _b = 0, _c = prop.modifiers; _b < _c.length; _b++) {
                         var mod = _c[_b];
-                        if (mod.kind !== 119 /* AsyncKeyword */ || prop.kind !== 148 /* MethodDeclaration */) {
+                        if (mod.kind !== 119 /* AsyncKeyword */ || prop.kind !== 149 /* MethodDeclaration */) {
                             grammarErrorOnNode(mod, ts.Diagnostics._0_modifier_cannot_be_used_here, ts.getTextOfNode(mod));
                         }
                     }
@@ -41135,27 +43001,27 @@ var ts;
                 //    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 = void 0;
-                if (prop.kind === 253 /* PropertyAssignment */ || prop.kind === 254 /* ShorthandPropertyAssignment */) {
+                if (prop.kind === 257 /* PropertyAssignment */ || prop.kind === 258 /* ShorthandPropertyAssignment */) {
                     // Grammar checking for computedPropertyName and shorthandPropertyAssignment
                     checkGrammarForInvalidQuestionMark(prop.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional);
-                    if (name_24.kind === 8 /* NumericLiteral */) {
-                        checkGrammarNumericLiteral(name_24);
+                    if (name_28.kind === 8 /* NumericLiteral */) {
+                        checkGrammarNumericLiteral(name_28);
                     }
                     currentKind = Property;
                 }
-                else if (prop.kind === 148 /* MethodDeclaration */) {
+                else if (prop.kind === 149 /* MethodDeclaration */) {
                     currentKind = Property;
                 }
-                else if (prop.kind === 150 /* GetAccessor */) {
+                else if (prop.kind === 151 /* GetAccessor */) {
                     currentKind = GetAccessor;
                 }
-                else if (prop.kind === 151 /* SetAccessor */) {
+                else if (prop.kind === 152 /* SetAccessor */) {
                     currentKind = SetAccessor;
                 }
                 else {
                     ts.Debug.fail("Unexpected syntax kind:" + prop.kind);
                 }
-                var effectiveName = ts.getPropertyNameForPropertyNameNode(name_24);
+                var effectiveName = ts.getPropertyNameForPropertyNameNode(name_28);
                 if (effectiveName === undefined) {
                     continue;
                 }
@@ -41165,18 +43031,18 @@ var ts;
                 else {
                     var existingKind = seen[effectiveName];
                     if (currentKind === Property && existingKind === Property) {
-                        grammarErrorOnNode(name_24, ts.Diagnostics.Duplicate_identifier_0, ts.getTextOfNode(name_24));
+                        grammarErrorOnNode(name_28, ts.Diagnostics.Duplicate_identifier_0, ts.getTextOfNode(name_28));
                     }
                     else if ((currentKind & GetOrSetAccessor) && (existingKind & GetOrSetAccessor)) {
                         if (existingKind !== GetOrSetAccessor && currentKind !== existingKind) {
                             seen[effectiveName] = currentKind | existingKind;
                         }
                         else {
-                            return grammarErrorOnNode(name_24, ts.Diagnostics.An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name);
+                            return grammarErrorOnNode(name_28, ts.Diagnostics.An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name);
                         }
                     }
                     else {
-                        return grammarErrorOnNode(name_24, ts.Diagnostics.An_object_literal_cannot_have_property_and_accessor_with_the_same_name);
+                        return grammarErrorOnNode(name_28, ts.Diagnostics.An_object_literal_cannot_have_property_and_accessor_with_the_same_name);
                     }
                 }
             }
@@ -41185,19 +43051,19 @@ var ts;
             var seen = ts.createMap();
             for (var _i = 0, _a = node.attributes; _i < _a.length; _i++) {
                 var attr = _a[_i];
-                if (attr.kind === 247 /* JsxSpreadAttribute */) {
+                if (attr.kind === 251 /* JsxSpreadAttribute */) {
                     continue;
                 }
                 var jsxAttr = attr;
-                var name_25 = jsxAttr.name;
-                if (!seen[name_25.text]) {
-                    seen[name_25.text] = true;
+                var name_29 = jsxAttr.name;
+                if (!seen[name_29.text]) {
+                    seen[name_29.text] = true;
                 }
                 else {
-                    return grammarErrorOnNode(name_25, ts.Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name);
+                    return grammarErrorOnNode(name_29, ts.Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name);
                 }
                 var initializer = jsxAttr.initializer;
-                if (initializer && initializer.kind === 248 /* JsxExpression */ && !initializer.expression) {
+                if (initializer && initializer.kind === 252 /* JsxExpression */ && !initializer.expression) {
                     return grammarErrorOnNode(jsxAttr.initializer, ts.Diagnostics.JSX_attributes_must_only_be_assigned_a_non_empty_expression);
                 }
             }
@@ -41206,7 +43072,7 @@ var ts;
             if (checkGrammarStatementInAmbientContext(forInOrOfStatement)) {
                 return true;
             }
-            if (forInOrOfStatement.initializer.kind === 220 /* VariableDeclarationList */) {
+            if (forInOrOfStatement.initializer.kind === 224 /* VariableDeclarationList */) {
                 var variableList = forInOrOfStatement.initializer;
                 if (!checkGrammarVariableDeclarationList(variableList)) {
                     var declarations = variableList.declarations;
@@ -41221,20 +43087,20 @@ var ts;
                         return false;
                     }
                     if (declarations.length > 1) {
-                        var diagnostic = forInOrOfStatement.kind === 208 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 212 /* 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 === 208 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 212 /* 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 === 208 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 212 /* 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);
@@ -41258,11 +43124,11 @@ var ts;
                 return grammarErrorOnNode(accessor.name, ts.Diagnostics.An_accessor_cannot_have_type_parameters);
             }
             else if (!doesAccessorHaveCorrectParameterCount(accessor)) {
-                return grammarErrorOnNode(accessor.name, kind === 150 /* GetAccessor */ ?
+                return grammarErrorOnNode(accessor.name, kind === 151 /* GetAccessor */ ?
                     ts.Diagnostics.A_get_accessor_cannot_have_parameters :
                     ts.Diagnostics.A_set_accessor_must_have_exactly_one_parameter);
             }
-            else if (kind === 151 /* SetAccessor */) {
+            else if (kind === 152 /* SetAccessor */) {
                 if (accessor.type) {
                     return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_set_accessor_cannot_have_a_return_type_annotation);
                 }
@@ -41285,10 +43151,10 @@ var ts;
             A get accessor has no parameters or a single `this` parameter.
             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 === 150 /* GetAccessor */ ? 0 : 1);
+            return getAccessorThisParameter(accessor) || accessor.parameters.length === (accessor.kind === 151 /* GetAccessor */ ? 0 : 1);
         }
         function getAccessorThisParameter(accessor) {
-            if (accessor.parameters.length === (accessor.kind === 150 /* GetAccessor */ ? 1 : 2)) {
+            if (accessor.parameters.length === (accessor.kind === 151 /* GetAccessor */ ? 1 : 2)) {
                 return ts.getThisParameter(accessor);
             }
         }
@@ -41303,7 +43169,7 @@ var ts;
                 checkGrammarForGenerator(node)) {
                 return true;
             }
-            if (node.parent.kind === 172 /* ObjectLiteralExpression */) {
+            if (node.parent.kind === 176 /* ObjectLiteralExpression */) {
                 if (checkGrammarForInvalidQuestionMark(node.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional)) {
                     return true;
                 }
@@ -41324,10 +43190,10 @@ var ts;
                     return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_method_overload_must_directly_refer_to_a_built_in_symbol);
                 }
             }
-            else if (node.parent.kind === 223 /* InterfaceDeclaration */) {
+            else if (node.parent.kind === 227 /* InterfaceDeclaration */) {
                 return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol);
             }
-            else if (node.parent.kind === 160 /* TypeLiteral */) {
+            else if (node.parent.kind === 161 /* TypeLiteral */) {
                 return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol);
             }
         }
@@ -41338,11 +43204,11 @@ var ts;
                     return grammarErrorOnNode(node, ts.Diagnostics.Jump_target_cannot_cross_function_boundary);
                 }
                 switch (current.kind) {
-                    case 215 /* LabeledStatement */:
+                    case 219 /* LabeledStatement */:
                         if (node.label && current.label.text === node.label.text) {
                             // found matching label - verify that label usage is correct
                             // continue can only target labels that are on iteration statements
-                            var isMisplacedContinueLabel = node.kind === 210 /* ContinueStatement */
+                            var isMisplacedContinueLabel = node.kind === 214 /* 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);
@@ -41350,8 +43216,8 @@ var ts;
                             return false;
                         }
                         break;
-                    case 214 /* SwitchStatement */:
-                        if (node.kind === 211 /* BreakStatement */ && !node.label) {
+                    case 218 /* SwitchStatement */:
+                        if (node.kind === 215 /* BreakStatement */ && !node.label) {
                             // unlabeled break within switch statement - ok
                             return false;
                         }
@@ -41366,13 +43232,13 @@ var ts;
                 current = current.parent;
             }
             if (node.label) {
-                var message = node.kind === 211 /* BreakStatement */
+                var message = node.kind === 215 /* 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 === 211 /* BreakStatement */
+                var message = node.kind === 215 /* 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);
@@ -41382,24 +43248,24 @@ var ts;
             if (node.dotDotDotToken) {
                 var elements = node.parent.elements;
                 if (node !== ts.lastOrUndefined(elements)) {
-                    return grammarErrorOnNode(node, ts.Diagnostics.A_rest_element_must_be_last_in_an_array_destructuring_pattern);
+                    return grammarErrorOnNode(node, ts.Diagnostics.A_rest_element_must_be_last_in_a_destructuring_pattern);
                 }
-                if (node.name.kind === 169 /* ArrayBindingPattern */ || node.name.kind === 168 /* ObjectBindingPattern */) {
+                if (node.name.kind === 173 /* ArrayBindingPattern */ || node.name.kind === 172 /* ObjectBindingPattern */) {
                     return grammarErrorOnNode(node.name, ts.Diagnostics.A_rest_element_cannot_contain_a_binding_pattern);
                 }
                 if (node.initializer) {
-                    // Error on equals token which immediate precedes the initializer
+                    // Error on equals token which immediately precedes the initializer
                     return grammarErrorAtPos(ts.getSourceFileOfNode(node), node.initializer.pos - 1, 1, ts.Diagnostics.A_rest_element_cannot_have_an_initializer);
                 }
             }
         }
         function isStringOrNumberLiteralExpression(expr) {
             return expr.kind === 9 /* StringLiteral */ || expr.kind === 8 /* NumericLiteral */ ||
-                expr.kind === 186 /* PrefixUnaryExpression */ && expr.operator === 37 /* MinusToken */ &&
+                expr.kind === 190 /* PrefixUnaryExpression */ && expr.operator === 37 /* MinusToken */ &&
                     expr.operand.kind === 8 /* NumericLiteral */;
         }
         function checkGrammarVariableDeclaration(node) {
-            if (node.parent.parent.kind !== 208 /* ForInStatement */ && node.parent.parent.kind !== 209 /* ForOfStatement */) {
+            if (node.parent.parent.kind !== 212 /* ForInStatement */ && node.parent.parent.kind !== 213 /* ForOfStatement */) {
                 if (ts.isInAmbientContext(node)) {
                     if (node.initializer) {
                         if (ts.isConst(node) && !node.type) {
@@ -41464,15 +43330,15 @@ var ts;
         }
         function allowLetAndConstDeclarations(parent) {
             switch (parent.kind) {
-                case 204 /* IfStatement */:
-                case 205 /* DoStatement */:
-                case 206 /* WhileStatement */:
-                case 213 /* WithStatement */:
-                case 207 /* ForStatement */:
-                case 208 /* ForInStatement */:
-                case 209 /* ForOfStatement */:
+                case 208 /* IfStatement */:
+                case 209 /* DoStatement */:
+                case 210 /* WhileStatement */:
+                case 217 /* WithStatement */:
+                case 211 /* ForStatement */:
+                case 212 /* ForInStatement */:
+                case 213 /* ForOfStatement */:
                     return false;
-                case 215 /* LabeledStatement */:
+                case 219 /* LabeledStatement */:
                     return allowLetAndConstDeclarations(parent.parent);
             }
             return true;
@@ -41527,7 +43393,7 @@ var ts;
                     return true;
                 }
             }
-            else if (node.parent.kind === 223 /* InterfaceDeclaration */) {
+            else if (node.parent.kind === 227 /* InterfaceDeclaration */) {
                 if (checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol)) {
                     return true;
                 }
@@ -41535,7 +43401,7 @@ var ts;
                     return grammarErrorOnNode(node.initializer, ts.Diagnostics.An_interface_property_cannot_have_an_initializer);
                 }
             }
-            else if (node.parent.kind === 160 /* TypeLiteral */) {
+            else if (node.parent.kind === 161 /* TypeLiteral */) {
                 if (checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol)) {
                     return true;
                 }
@@ -41560,13 +43426,13 @@ var ts;
             //     export_opt   AmbientDeclaration
             //
             // TODO: The spec needs to be amended to reflect this grammar.
-            if (node.kind === 223 /* InterfaceDeclaration */ ||
-                node.kind === 224 /* TypeAliasDeclaration */ ||
-                node.kind === 231 /* ImportDeclaration */ ||
-                node.kind === 230 /* ImportEqualsDeclaration */ ||
-                node.kind === 237 /* ExportDeclaration */ ||
-                node.kind === 236 /* ExportAssignment */ ||
-                node.kind === 229 /* NamespaceExportDeclaration */ ||
+            if (node.kind === 227 /* InterfaceDeclaration */ ||
+                node.kind === 228 /* TypeAliasDeclaration */ ||
+                node.kind === 235 /* ImportDeclaration */ ||
+                node.kind === 234 /* ImportEqualsDeclaration */ ||
+                node.kind === 241 /* ExportDeclaration */ ||
+                node.kind === 240 /* ExportAssignment */ ||
+                node.kind === 233 /* NamespaceExportDeclaration */ ||
                 ts.getModifierFlags(node) & (2 /* Ambient */ | 1 /* Export */ | 512 /* Default */)) {
                 return false;
             }
@@ -41575,7 +43441,7 @@ var ts;
         function checkGrammarTopLevelElementsForRequiredDeclareModifier(file) {
             for (var _i = 0, _a = file.statements; _i < _a.length; _i++) {
                 var decl = _a[_i];
-                if (ts.isDeclaration(decl) || decl.kind === 201 /* VariableStatement */) {
+                if (ts.isDeclaration(decl) || decl.kind === 205 /* VariableStatement */) {
                     if (checkGrammarTopLevelElementForRequiredDeclareModifier(decl)) {
                         return true;
                     }
@@ -41601,7 +43467,7 @@ 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 === 200 /* Block */ || node.parent.kind === 227 /* ModuleBlock */ || node.parent.kind === 256 /* SourceFile */) {
+                if (node.parent.kind === 204 /* Block */ || node.parent.kind === 231 /* ModuleBlock */ || node.parent.kind === 261 /* SourceFile */) {
                     var links_1 = getNodeLinks(node.parent);
                     // Check if the containing block ever report this error
                     if (!links_1.hasReportedStatementInAmbientContext) {
@@ -41661,49 +43527,49 @@ var ts;
      *       significantly impacted.
      */
     var nodeEdgeTraversalMap = ts.createMap((_a = {},
-        _a[140 /* QualifiedName */] = [
+        _a[141 /* QualifiedName */] = [
             { name: "left", test: ts.isEntityName },
             { name: "right", test: ts.isIdentifier }
         ],
-        _a[144 /* Decorator */] = [
+        _a[145 /* Decorator */] = [
             { name: "expression", test: ts.isLeftHandSideExpression }
         ],
-        _a[178 /* TypeAssertionExpression */] = [
+        _a[182 /* TypeAssertionExpression */] = [
             { name: "type", test: ts.isTypeNode },
             { name: "expression", test: ts.isUnaryExpression }
         ],
-        _a[196 /* AsExpression */] = [
+        _a[200 /* AsExpression */] = [
             { name: "expression", test: ts.isExpression },
             { name: "type", test: ts.isTypeNode }
         ],
-        _a[197 /* NonNullExpression */] = [
+        _a[201 /* NonNullExpression */] = [
             { name: "expression", test: ts.isLeftHandSideExpression }
         ],
-        _a[225 /* EnumDeclaration */] = [
+        _a[229 /* EnumDeclaration */] = [
             { name: "decorators", test: ts.isDecorator },
             { name: "modifiers", test: ts.isModifier },
             { name: "name", test: ts.isIdentifier },
             { name: "members", test: ts.isEnumMember }
         ],
-        _a[226 /* ModuleDeclaration */] = [
+        _a[230 /* ModuleDeclaration */] = [
             { name: "decorators", test: ts.isDecorator },
             { name: "modifiers", test: ts.isModifier },
             { name: "name", test: ts.isModuleName },
             { name: "body", test: ts.isModuleBody }
         ],
-        _a[227 /* ModuleBlock */] = [
+        _a[231 /* ModuleBlock */] = [
             { name: "statements", test: ts.isStatement }
         ],
-        _a[230 /* ImportEqualsDeclaration */] = [
+        _a[234 /* ImportEqualsDeclaration */] = [
             { name: "decorators", test: ts.isDecorator },
             { name: "modifiers", test: ts.isModifier },
             { name: "name", test: ts.isIdentifier },
             { name: "moduleReference", test: ts.isModuleReference }
         ],
-        _a[241 /* ExternalModuleReference */] = [
+        _a[245 /* ExternalModuleReference */] = [
             { name: "expression", test: ts.isExpression, optional: true }
         ],
-        _a[255 /* EnumMember */] = [
+        _a[260 /* EnumMember */] = [
             { name: "name", test: ts.isPropertyName },
             { name: "initializer", test: ts.isExpression, optional: true, parenthesize: ts.parenthesizeExpressionForList }
         ],
@@ -41726,47 +43592,47 @@ var ts;
         }
         var kind = node.kind;
         // No need to visit nodes with no children.
-        if ((kind > 0 /* FirstToken */ && kind <= 139 /* LastToken */)) {
+        if ((kind > 0 /* FirstToken */ && kind <= 140 /* LastToken */)) {
             return initial;
         }
         // We do not yet support types.
-        if ((kind >= 155 /* TypePredicate */ && kind <= 167 /* LiteralType */)) {
+        if ((kind >= 156 /* TypePredicate */ && kind <= 171 /* LiteralType */)) {
             return initial;
         }
         var result = initial;
         switch (node.kind) {
             // Leaf nodes
-            case 199 /* SemicolonClassElement */:
-            case 202 /* EmptyStatement */:
-            case 194 /* OmittedExpression */:
-            case 218 /* DebuggerStatement */:
-            case 287 /* NotEmittedStatement */:
+            case 203 /* SemicolonClassElement */:
+            case 206 /* EmptyStatement */:
+            case 198 /* OmittedExpression */:
+            case 222 /* DebuggerStatement */:
+            case 292 /* NotEmittedStatement */:
                 // No need to visit nodes with no children.
                 break;
             // Names
-            case 141 /* ComputedPropertyName */:
+            case 142 /* ComputedPropertyName */:
                 result = reduceNode(node.expression, f, result);
                 break;
             // Signature elements
-            case 143 /* Parameter */:
+            case 144 /* Parameter */:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.type, f, result);
                 result = reduceNode(node.initializer, f, result);
                 break;
-            case 144 /* Decorator */:
+            case 145 /* Decorator */:
                 result = reduceNode(node.expression, f, result);
                 break;
             // Type member
-            case 146 /* PropertyDeclaration */:
+            case 147 /* PropertyDeclaration */:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.type, f, result);
                 result = reduceNode(node.initializer, f, result);
                 break;
-            case 148 /* MethodDeclaration */:
+            case 149 /* MethodDeclaration */:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
@@ -41775,12 +43641,12 @@ var ts;
                 result = reduceNode(node.type, f, result);
                 result = reduceNode(node.body, f, result);
                 break;
-            case 149 /* Constructor */:
+            case 150 /* Constructor */:
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = ts.reduceLeft(node.parameters, f, result);
                 result = reduceNode(node.body, f, result);
                 break;
-            case 150 /* GetAccessor */:
+            case 151 /* GetAccessor */:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
@@ -41788,7 +43654,7 @@ var ts;
                 result = reduceNode(node.type, f, result);
                 result = reduceNode(node.body, f, result);
                 break;
-            case 151 /* SetAccessor */:
+            case 152 /* SetAccessor */:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
@@ -41796,45 +43662,45 @@ var ts;
                 result = reduceNode(node.body, f, result);
                 break;
             // Binding patterns
-            case 168 /* ObjectBindingPattern */:
-            case 169 /* ArrayBindingPattern */:
+            case 172 /* ObjectBindingPattern */:
+            case 173 /* ArrayBindingPattern */:
                 result = ts.reduceLeft(node.elements, f, result);
                 break;
-            case 170 /* BindingElement */:
+            case 174 /* BindingElement */:
                 result = reduceNode(node.propertyName, f, result);
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.initializer, f, result);
                 break;
             // Expression
-            case 171 /* ArrayLiteralExpression */:
+            case 175 /* ArrayLiteralExpression */:
                 result = ts.reduceLeft(node.elements, f, result);
                 break;
-            case 172 /* ObjectLiteralExpression */:
+            case 176 /* ObjectLiteralExpression */:
                 result = ts.reduceLeft(node.properties, f, result);
                 break;
-            case 173 /* PropertyAccessExpression */:
+            case 177 /* PropertyAccessExpression */:
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.name, f, result);
                 break;
-            case 174 /* ElementAccessExpression */:
+            case 178 /* ElementAccessExpression */:
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.argumentExpression, f, result);
                 break;
-            case 175 /* CallExpression */:
+            case 179 /* CallExpression */:
                 result = reduceNode(node.expression, f, result);
                 result = ts.reduceLeft(node.typeArguments, f, result);
                 result = ts.reduceLeft(node.arguments, f, result);
                 break;
-            case 176 /* NewExpression */:
+            case 180 /* NewExpression */:
                 result = reduceNode(node.expression, f, result);
                 result = ts.reduceLeft(node.typeArguments, f, result);
                 result = ts.reduceLeft(node.arguments, f, result);
                 break;
-            case 177 /* TaggedTemplateExpression */:
+            case 181 /* TaggedTemplateExpression */:
                 result = reduceNode(node.tag, f, result);
                 result = reduceNode(node.template, f, result);
                 break;
-            case 180 /* FunctionExpression */:
+            case 184 /* FunctionExpression */:
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
                 result = ts.reduceLeft(node.typeParameters, f, result);
@@ -41842,119 +43708,119 @@ var ts;
                 result = reduceNode(node.type, f, result);
                 result = reduceNode(node.body, f, result);
                 break;
-            case 181 /* ArrowFunction */:
+            case 185 /* ArrowFunction */:
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = ts.reduceLeft(node.typeParameters, f, result);
                 result = ts.reduceLeft(node.parameters, f, result);
                 result = reduceNode(node.type, f, result);
                 result = reduceNode(node.body, f, result);
                 break;
-            case 179 /* ParenthesizedExpression */:
-            case 182 /* DeleteExpression */:
-            case 183 /* TypeOfExpression */:
-            case 184 /* VoidExpression */:
-            case 185 /* AwaitExpression */:
-            case 191 /* YieldExpression */:
-            case 192 /* SpreadElementExpression */:
-            case 197 /* NonNullExpression */:
+            case 183 /* ParenthesizedExpression */:
+            case 186 /* DeleteExpression */:
+            case 187 /* TypeOfExpression */:
+            case 188 /* VoidExpression */:
+            case 189 /* AwaitExpression */:
+            case 195 /* YieldExpression */:
+            case 196 /* SpreadElement */:
+            case 201 /* NonNullExpression */:
                 result = reduceNode(node.expression, f, result);
                 break;
-            case 186 /* PrefixUnaryExpression */:
-            case 187 /* PostfixUnaryExpression */:
+            case 190 /* PrefixUnaryExpression */:
+            case 191 /* PostfixUnaryExpression */:
                 result = reduceNode(node.operand, f, result);
                 break;
-            case 188 /* BinaryExpression */:
+            case 192 /* BinaryExpression */:
                 result = reduceNode(node.left, f, result);
                 result = reduceNode(node.right, f, result);
                 break;
-            case 189 /* ConditionalExpression */:
+            case 193 /* ConditionalExpression */:
                 result = reduceNode(node.condition, f, result);
                 result = reduceNode(node.whenTrue, f, result);
                 result = reduceNode(node.whenFalse, f, result);
                 break;
-            case 190 /* TemplateExpression */:
+            case 194 /* TemplateExpression */:
                 result = reduceNode(node.head, f, result);
                 result = ts.reduceLeft(node.templateSpans, f, result);
                 break;
-            case 193 /* ClassExpression */:
+            case 197 /* ClassExpression */:
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
                 result = ts.reduceLeft(node.typeParameters, f, result);
                 result = ts.reduceLeft(node.heritageClauses, f, result);
                 result = ts.reduceLeft(node.members, f, result);
                 break;
-            case 195 /* ExpressionWithTypeArguments */:
+            case 199 /* ExpressionWithTypeArguments */:
                 result = reduceNode(node.expression, f, result);
                 result = ts.reduceLeft(node.typeArguments, f, result);
                 break;
             // Misc
-            case 198 /* TemplateSpan */:
+            case 202 /* TemplateSpan */:
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.literal, f, result);
                 break;
             // Element
-            case 200 /* Block */:
+            case 204 /* Block */:
                 result = ts.reduceLeft(node.statements, f, result);
                 break;
-            case 201 /* VariableStatement */:
+            case 205 /* VariableStatement */:
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.declarationList, f, result);
                 break;
-            case 203 /* ExpressionStatement */:
+            case 207 /* ExpressionStatement */:
                 result = reduceNode(node.expression, f, result);
                 break;
-            case 204 /* IfStatement */:
+            case 208 /* IfStatement */:
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.thenStatement, f, result);
                 result = reduceNode(node.elseStatement, f, result);
                 break;
-            case 205 /* DoStatement */:
+            case 209 /* DoStatement */:
                 result = reduceNode(node.statement, f, result);
                 result = reduceNode(node.expression, f, result);
                 break;
-            case 206 /* WhileStatement */:
-            case 213 /* WithStatement */:
+            case 210 /* WhileStatement */:
+            case 217 /* WithStatement */:
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.statement, f, result);
                 break;
-            case 207 /* ForStatement */:
+            case 211 /* ForStatement */:
                 result = reduceNode(node.initializer, f, result);
                 result = reduceNode(node.condition, f, result);
                 result = reduceNode(node.incrementor, f, result);
                 result = reduceNode(node.statement, f, result);
                 break;
-            case 208 /* ForInStatement */:
-            case 209 /* ForOfStatement */:
+            case 212 /* ForInStatement */:
+            case 213 /* ForOfStatement */:
                 result = reduceNode(node.initializer, f, result);
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.statement, f, result);
                 break;
-            case 212 /* ReturnStatement */:
-            case 216 /* ThrowStatement */:
+            case 216 /* ReturnStatement */:
+            case 220 /* ThrowStatement */:
                 result = reduceNode(node.expression, f, result);
                 break;
-            case 214 /* SwitchStatement */:
+            case 218 /* SwitchStatement */:
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.caseBlock, f, result);
                 break;
-            case 215 /* LabeledStatement */:
+            case 219 /* LabeledStatement */:
                 result = reduceNode(node.label, f, result);
                 result = reduceNode(node.statement, f, result);
                 break;
-            case 217 /* TryStatement */:
+            case 221 /* TryStatement */:
                 result = reduceNode(node.tryBlock, f, result);
                 result = reduceNode(node.catchClause, f, result);
                 result = reduceNode(node.finallyBlock, f, result);
                 break;
-            case 219 /* VariableDeclaration */:
+            case 223 /* VariableDeclaration */:
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.type, f, result);
                 result = reduceNode(node.initializer, f, result);
                 break;
-            case 220 /* VariableDeclarationList */:
+            case 224 /* VariableDeclarationList */:
                 result = ts.reduceLeft(node.declarations, f, result);
                 break;
-            case 221 /* FunctionDeclaration */:
+            case 225 /* FunctionDeclaration */:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
@@ -41963,7 +43829,7 @@ var ts;
                 result = reduceNode(node.type, f, result);
                 result = reduceNode(node.body, f, result);
                 break;
-            case 222 /* ClassDeclaration */:
+            case 226 /* ClassDeclaration */:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
@@ -41971,94 +43837,97 @@ var ts;
                 result = ts.reduceLeft(node.heritageClauses, f, result);
                 result = ts.reduceLeft(node.members, f, result);
                 break;
-            case 228 /* CaseBlock */:
+            case 232 /* CaseBlock */:
                 result = ts.reduceLeft(node.clauses, f, result);
                 break;
-            case 231 /* ImportDeclaration */:
+            case 235 /* ImportDeclaration */:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.importClause, f, result);
                 result = reduceNode(node.moduleSpecifier, f, result);
                 break;
-            case 232 /* ImportClause */:
+            case 236 /* ImportClause */:
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.namedBindings, f, result);
                 break;
-            case 233 /* NamespaceImport */:
+            case 237 /* NamespaceImport */:
                 result = reduceNode(node.name, f, result);
                 break;
-            case 234 /* NamedImports */:
-            case 238 /* NamedExports */:
+            case 238 /* NamedImports */:
+            case 242 /* NamedExports */:
                 result = ts.reduceLeft(node.elements, f, result);
                 break;
-            case 235 /* ImportSpecifier */:
-            case 239 /* ExportSpecifier */:
+            case 239 /* ImportSpecifier */:
+            case 243 /* ExportSpecifier */:
                 result = reduceNode(node.propertyName, f, result);
                 result = reduceNode(node.name, f, result);
                 break;
-            case 236 /* ExportAssignment */:
+            case 240 /* ExportAssignment */:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.expression, f, result);
                 break;
-            case 237 /* ExportDeclaration */:
+            case 241 /* ExportDeclaration */:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.exportClause, f, result);
                 result = reduceNode(node.moduleSpecifier, f, result);
                 break;
             // JSX
-            case 242 /* JsxElement */:
+            case 246 /* JsxElement */:
                 result = reduceNode(node.openingElement, f, result);
                 result = ts.reduceLeft(node.children, f, result);
                 result = reduceNode(node.closingElement, f, result);
                 break;
-            case 243 /* JsxSelfClosingElement */:
-            case 244 /* JsxOpeningElement */:
+            case 247 /* JsxSelfClosingElement */:
+            case 248 /* JsxOpeningElement */:
                 result = reduceNode(node.tagName, f, result);
                 result = ts.reduceLeft(node.attributes, f, result);
                 break;
-            case 245 /* JsxClosingElement */:
+            case 249 /* JsxClosingElement */:
                 result = reduceNode(node.tagName, f, result);
                 break;
-            case 246 /* JsxAttribute */:
+            case 250 /* JsxAttribute */:
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.initializer, f, result);
                 break;
-            case 247 /* JsxSpreadAttribute */:
+            case 251 /* JsxSpreadAttribute */:
                 result = reduceNode(node.expression, f, result);
                 break;
-            case 248 /* JsxExpression */:
+            case 252 /* JsxExpression */:
                 result = reduceNode(node.expression, f, result);
                 break;
             // Clauses
-            case 249 /* CaseClause */:
+            case 253 /* CaseClause */:
                 result = reduceNode(node.expression, f, result);
             // fall-through
-            case 250 /* DefaultClause */:
+            case 254 /* DefaultClause */:
                 result = ts.reduceLeft(node.statements, f, result);
                 break;
-            case 251 /* HeritageClause */:
+            case 255 /* HeritageClause */:
                 result = ts.reduceLeft(node.types, f, result);
                 break;
-            case 252 /* CatchClause */:
+            case 256 /* CatchClause */:
                 result = reduceNode(node.variableDeclaration, f, result);
                 result = reduceNode(node.block, f, result);
                 break;
             // Property assignments
-            case 253 /* PropertyAssignment */:
+            case 257 /* PropertyAssignment */:
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.initializer, f, result);
                 break;
-            case 254 /* ShorthandPropertyAssignment */:
+            case 258 /* ShorthandPropertyAssignment */:
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.objectAssignmentInitializer, f, result);
                 break;
+            case 259 /* SpreadAssignment */:
+                result = reduceNode(node.expression, f, result);
+                break;
             // Top-level nodes
-            case 256 /* SourceFile */:
+            case 261 /* SourceFile */:
                 result = ts.reduceLeft(node.statements, f, result);
                 break;
-            case 288 /* PartiallyEmittedExpression */:
+            case 293 /* PartiallyEmittedExpression */:
                 result = reduceNode(node.expression, f, result);
                 break;
             default:
@@ -42083,6 +43952,7 @@ var ts;
         if (node === undefined) {
             return undefined;
         }
+        aggregateTransformFlags(node);
         var visited = visitor(node);
         if (visited === node) {
             return node;
@@ -42131,6 +44001,7 @@ var ts;
         // Visit each original node.
         for (var i = 0; i < count; i++) {
             var node = nodes[i + start];
+            aggregateTransformFlags(node);
             var visited = node !== undefined ? visitor(node) : undefined;
             if (updated !== undefined || visited === undefined || visited !== node) {
                 if (updated === undefined) {
@@ -42169,192 +44040,194 @@ var ts;
         }
         var kind = node.kind;
         // No need to visit nodes with no children.
-        if ((kind > 0 /* FirstToken */ && kind <= 139 /* LastToken */)) {
+        if ((kind > 0 /* FirstToken */ && kind <= 140 /* LastToken */)) {
             return node;
         }
         // We do not yet support types.
-        if ((kind >= 155 /* TypePredicate */ && kind <= 167 /* LiteralType */)) {
+        if ((kind >= 156 /* TypePredicate */ && kind <= 171 /* LiteralType */)) {
             return node;
         }
         switch (node.kind) {
-            case 199 /* SemicolonClassElement */:
-            case 202 /* EmptyStatement */:
-            case 194 /* OmittedExpression */:
-            case 218 /* DebuggerStatement */:
+            case 203 /* SemicolonClassElement */:
+            case 206 /* EmptyStatement */:
+            case 198 /* OmittedExpression */:
+            case 222 /* DebuggerStatement */:
                 // No need to visit nodes with no children.
                 return node;
             // Names
-            case 141 /* ComputedPropertyName */:
+            case 142 /* ComputedPropertyName */:
                 return ts.updateComputedPropertyName(node, visitNode(node.expression, visitor, ts.isExpression));
             // Signature elements
-            case 143 /* Parameter */:
-                return ts.updateParameterDeclaration(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.type, visitor, ts.isTypeNode, /*optional*/ true), visitNode(node.initializer, visitor, ts.isExpression, /*optional*/ true));
+            case 144 /* Parameter */:
+                return ts.updateParameter(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.type, visitor, ts.isTypeNode, /*optional*/ true), visitNode(node.initializer, visitor, ts.isExpression, /*optional*/ true));
             // Type member
-            case 146 /* PropertyDeclaration */:
+            case 147 /* PropertyDeclaration */:
                 return ts.updateProperty(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.type, visitor, ts.isTypeNode, /*optional*/ true), visitNode(node.initializer, visitor, ts.isExpression, /*optional*/ true));
-            case 148 /* MethodDeclaration */:
+            case 149 /* MethodDeclaration */:
                 return ts.updateMethod(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, /*optional*/ true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, /*optional*/ true), context.endLexicalEnvironment()));
-            case 149 /* Constructor */:
+            case 150 /* Constructor */:
                 return ts.updateConstructor(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, /*optional*/ true), context.endLexicalEnvironment()));
-            case 150 /* GetAccessor */:
+            case 151 /* GetAccessor */:
                 return ts.updateGetAccessor(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, /*optional*/ true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, /*optional*/ true), context.endLexicalEnvironment()));
-            case 151 /* SetAccessor */:
+            case 152 /* SetAccessor */:
                 return ts.updateSetAccessor(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, /*optional*/ true), context.endLexicalEnvironment()));
             // Binding patterns
-            case 168 /* ObjectBindingPattern */:
+            case 172 /* ObjectBindingPattern */:
                 return ts.updateObjectBindingPattern(node, visitNodes(node.elements, visitor, ts.isBindingElement));
-            case 169 /* ArrayBindingPattern */:
+            case 173 /* ArrayBindingPattern */:
                 return ts.updateArrayBindingPattern(node, visitNodes(node.elements, visitor, ts.isArrayBindingElement));
-            case 170 /* BindingElement */:
+            case 174 /* BindingElement */:
                 return ts.updateBindingElement(node, visitNode(node.propertyName, visitor, ts.isPropertyName, /*optional*/ true), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.initializer, visitor, ts.isExpression, /*optional*/ true));
             // Expression
-            case 171 /* ArrayLiteralExpression */:
+            case 175 /* ArrayLiteralExpression */:
                 return ts.updateArrayLiteral(node, visitNodes(node.elements, visitor, ts.isExpression));
-            case 172 /* ObjectLiteralExpression */:
+            case 176 /* ObjectLiteralExpression */:
                 return ts.updateObjectLiteral(node, visitNodes(node.properties, visitor, ts.isObjectLiteralElementLike));
-            case 173 /* PropertyAccessExpression */:
+            case 177 /* PropertyAccessExpression */:
                 return ts.updatePropertyAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.name, visitor, ts.isIdentifier));
-            case 174 /* ElementAccessExpression */:
+            case 178 /* ElementAccessExpression */:
                 return ts.updateElementAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.argumentExpression, visitor, ts.isExpression));
-            case 175 /* CallExpression */:
+            case 179 /* CallExpression */:
                 return ts.updateCall(node, visitNode(node.expression, visitor, ts.isExpression), visitNodes(node.typeArguments, visitor, ts.isTypeNode), visitNodes(node.arguments, visitor, ts.isExpression));
-            case 176 /* NewExpression */:
+            case 180 /* NewExpression */:
                 return ts.updateNew(node, visitNode(node.expression, visitor, ts.isExpression), visitNodes(node.typeArguments, visitor, ts.isTypeNode), visitNodes(node.arguments, visitor, ts.isExpression));
-            case 177 /* TaggedTemplateExpression */:
+            case 181 /* TaggedTemplateExpression */:
                 return ts.updateTaggedTemplate(node, visitNode(node.tag, visitor, ts.isExpression), visitNode(node.template, visitor, ts.isTemplateLiteral));
-            case 179 /* ParenthesizedExpression */:
+            case 183 /* ParenthesizedExpression */:
                 return ts.updateParen(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 180 /* FunctionExpression */:
+            case 184 /* FunctionExpression */:
                 return ts.updateFunctionExpression(node, visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, /*optional*/ true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, /*optional*/ true), context.endLexicalEnvironment()));
-            case 181 /* ArrowFunction */:
+            case 185 /* ArrowFunction */:
                 return ts.updateArrowFunction(node, visitNodes(node.modifiers, visitor, ts.isModifier), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, /*optional*/ true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isConciseBody, /*optional*/ true), context.endLexicalEnvironment()));
-            case 182 /* DeleteExpression */:
+            case 186 /* DeleteExpression */:
                 return ts.updateDelete(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 183 /* TypeOfExpression */:
+            case 187 /* TypeOfExpression */:
                 return ts.updateTypeOf(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 184 /* VoidExpression */:
+            case 188 /* VoidExpression */:
                 return ts.updateVoid(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 185 /* AwaitExpression */:
+            case 189 /* AwaitExpression */:
                 return ts.updateAwait(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 188 /* BinaryExpression */:
+            case 192 /* BinaryExpression */:
                 return ts.updateBinary(node, visitNode(node.left, visitor, ts.isExpression), visitNode(node.right, visitor, ts.isExpression));
-            case 186 /* PrefixUnaryExpression */:
+            case 190 /* PrefixUnaryExpression */:
                 return ts.updatePrefix(node, visitNode(node.operand, visitor, ts.isExpression));
-            case 187 /* PostfixUnaryExpression */:
+            case 191 /* PostfixUnaryExpression */:
                 return ts.updatePostfix(node, visitNode(node.operand, visitor, ts.isExpression));
-            case 189 /* ConditionalExpression */:
+            case 193 /* ConditionalExpression */:
                 return ts.updateConditional(node, visitNode(node.condition, visitor, ts.isExpression), visitNode(node.whenTrue, visitor, ts.isExpression), visitNode(node.whenFalse, visitor, ts.isExpression));
-            case 190 /* TemplateExpression */:
+            case 194 /* TemplateExpression */:
                 return ts.updateTemplateExpression(node, visitNode(node.head, visitor, ts.isTemplateHead), visitNodes(node.templateSpans, visitor, ts.isTemplateSpan));
-            case 191 /* YieldExpression */:
+            case 195 /* YieldExpression */:
                 return ts.updateYield(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 192 /* SpreadElementExpression */:
+            case 196 /* SpreadElement */:
                 return ts.updateSpread(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 193 /* ClassExpression */:
+            case 197 /* ClassExpression */:
                 return ts.updateClassExpression(node, visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier, /*optional*/ true), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), visitNodes(node.members, visitor, ts.isClassElement));
-            case 195 /* ExpressionWithTypeArguments */:
+            case 199 /* ExpressionWithTypeArguments */:
                 return ts.updateExpressionWithTypeArguments(node, visitNodes(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.expression, visitor, ts.isExpression));
             // Misc
-            case 198 /* TemplateSpan */:
+            case 202 /* TemplateSpan */:
                 return ts.updateTemplateSpan(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.literal, visitor, ts.isTemplateMiddleOrTemplateTail));
             // Element
-            case 200 /* Block */:
+            case 204 /* Block */:
                 return ts.updateBlock(node, visitNodes(node.statements, visitor, ts.isStatement));
-            case 201 /* VariableStatement */:
+            case 205 /* VariableStatement */:
                 return ts.updateVariableStatement(node, visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.declarationList, visitor, ts.isVariableDeclarationList));
-            case 203 /* ExpressionStatement */:
+            case 207 /* ExpressionStatement */:
                 return ts.updateStatement(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 204 /* IfStatement */:
+            case 208 /* IfStatement */:
                 return ts.updateIf(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.thenStatement, visitor, ts.isStatement, /*optional*/ false, liftToBlock), visitNode(node.elseStatement, visitor, ts.isStatement, /*optional*/ true, liftToBlock));
-            case 205 /* DoStatement */:
+            case 209 /* DoStatement */:
                 return ts.updateDo(node, visitNode(node.statement, visitor, ts.isStatement, /*optional*/ false, liftToBlock), visitNode(node.expression, visitor, ts.isExpression));
-            case 206 /* WhileStatement */:
+            case 210 /* WhileStatement */:
                 return ts.updateWhile(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, /*optional*/ false, liftToBlock));
-            case 207 /* ForStatement */:
+            case 211 /* 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, /*optional*/ false, liftToBlock));
-            case 208 /* ForInStatement */:
+            case 212 /* ForInStatement */:
                 return ts.updateForIn(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, /*optional*/ false, liftToBlock));
-            case 209 /* ForOfStatement */:
+            case 213 /* ForOfStatement */:
                 return ts.updateForOf(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, /*optional*/ false, liftToBlock));
-            case 210 /* ContinueStatement */:
+            case 214 /* ContinueStatement */:
                 return ts.updateContinue(node, visitNode(node.label, visitor, ts.isIdentifier, /*optional*/ true));
-            case 211 /* BreakStatement */:
+            case 215 /* BreakStatement */:
                 return ts.updateBreak(node, visitNode(node.label, visitor, ts.isIdentifier, /*optional*/ true));
-            case 212 /* ReturnStatement */:
+            case 216 /* ReturnStatement */:
                 return ts.updateReturn(node, visitNode(node.expression, visitor, ts.isExpression, /*optional*/ true));
-            case 213 /* WithStatement */:
+            case 217 /* WithStatement */:
                 return ts.updateWith(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, /*optional*/ false, liftToBlock));
-            case 214 /* SwitchStatement */:
+            case 218 /* SwitchStatement */:
                 return ts.updateSwitch(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.caseBlock, visitor, ts.isCaseBlock));
-            case 215 /* LabeledStatement */:
+            case 219 /* LabeledStatement */:
                 return ts.updateLabel(node, visitNode(node.label, visitor, ts.isIdentifier), visitNode(node.statement, visitor, ts.isStatement, /*optional*/ false, liftToBlock));
-            case 216 /* ThrowStatement */:
+            case 220 /* ThrowStatement */:
                 return ts.updateThrow(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 217 /* TryStatement */:
+            case 221 /* TryStatement */:
                 return ts.updateTry(node, visitNode(node.tryBlock, visitor, ts.isBlock), visitNode(node.catchClause, visitor, ts.isCatchClause, /*optional*/ true), visitNode(node.finallyBlock, visitor, ts.isBlock, /*optional*/ true));
-            case 219 /* VariableDeclaration */:
+            case 223 /* VariableDeclaration */:
                 return ts.updateVariableDeclaration(node, visitNode(node.name, visitor, ts.isBindingName), visitNode(node.type, visitor, ts.isTypeNode, /*optional*/ true), visitNode(node.initializer, visitor, ts.isExpression, /*optional*/ true));
-            case 220 /* VariableDeclarationList */:
+            case 224 /* VariableDeclarationList */:
                 return ts.updateVariableDeclarationList(node, visitNodes(node.declarations, visitor, ts.isVariableDeclaration));
-            case 221 /* FunctionDeclaration */:
+            case 225 /* FunctionDeclaration */:
                 return ts.updateFunctionDeclaration(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, /*optional*/ true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, /*optional*/ true), context.endLexicalEnvironment()));
-            case 222 /* ClassDeclaration */:
+            case 226 /* ClassDeclaration */:
                 return ts.updateClassDeclaration(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier, /*optional*/ true), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), visitNodes(node.members, visitor, ts.isClassElement));
-            case 228 /* CaseBlock */:
+            case 232 /* CaseBlock */:
                 return ts.updateCaseBlock(node, visitNodes(node.clauses, visitor, ts.isCaseOrDefaultClause));
-            case 231 /* ImportDeclaration */:
+            case 235 /* ImportDeclaration */:
                 return ts.updateImportDeclaration(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.importClause, visitor, ts.isImportClause, /*optional*/ true), visitNode(node.moduleSpecifier, visitor, ts.isExpression));
-            case 232 /* ImportClause */:
+            case 236 /* ImportClause */:
                 return ts.updateImportClause(node, visitNode(node.name, visitor, ts.isIdentifier, /*optional*/ true), visitNode(node.namedBindings, visitor, ts.isNamedImportBindings, /*optional*/ true));
-            case 233 /* NamespaceImport */:
+            case 237 /* NamespaceImport */:
                 return ts.updateNamespaceImport(node, visitNode(node.name, visitor, ts.isIdentifier));
-            case 234 /* NamedImports */:
+            case 238 /* NamedImports */:
                 return ts.updateNamedImports(node, visitNodes(node.elements, visitor, ts.isImportSpecifier));
-            case 235 /* ImportSpecifier */:
+            case 239 /* ImportSpecifier */:
                 return ts.updateImportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier, /*optional*/ true), visitNode(node.name, visitor, ts.isIdentifier));
-            case 236 /* ExportAssignment */:
+            case 240 /* ExportAssignment */:
                 return ts.updateExportAssignment(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.expression, visitor, ts.isExpression));
-            case 237 /* ExportDeclaration */:
+            case 241 /* ExportDeclaration */:
                 return ts.updateExportDeclaration(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.exportClause, visitor, ts.isNamedExports, /*optional*/ true), visitNode(node.moduleSpecifier, visitor, ts.isExpression, /*optional*/ true));
-            case 238 /* NamedExports */:
+            case 242 /* NamedExports */:
                 return ts.updateNamedExports(node, visitNodes(node.elements, visitor, ts.isExportSpecifier));
-            case 239 /* ExportSpecifier */:
+            case 243 /* ExportSpecifier */:
                 return ts.updateExportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier, /*optional*/ true), visitNode(node.name, visitor, ts.isIdentifier));
             // JSX
-            case 242 /* JsxElement */:
+            case 246 /* JsxElement */:
                 return ts.updateJsxElement(node, visitNode(node.openingElement, visitor, ts.isJsxOpeningElement), visitNodes(node.children, visitor, ts.isJsxChild), visitNode(node.closingElement, visitor, ts.isJsxClosingElement));
-            case 243 /* JsxSelfClosingElement */:
+            case 247 /* JsxSelfClosingElement */:
                 return ts.updateJsxSelfClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), visitNodes(node.attributes, visitor, ts.isJsxAttributeLike));
-            case 244 /* JsxOpeningElement */:
+            case 248 /* JsxOpeningElement */:
                 return ts.updateJsxOpeningElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), visitNodes(node.attributes, visitor, ts.isJsxAttributeLike));
-            case 245 /* JsxClosingElement */:
+            case 249 /* JsxClosingElement */:
                 return ts.updateJsxClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression));
-            case 246 /* JsxAttribute */:
+            case 250 /* JsxAttribute */:
                 return ts.updateJsxAttribute(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.initializer, visitor, ts.isStringLiteralOrJsxExpression));
-            case 247 /* JsxSpreadAttribute */:
+            case 251 /* JsxSpreadAttribute */:
                 return ts.updateJsxSpreadAttribute(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 248 /* JsxExpression */:
+            case 252 /* JsxExpression */:
                 return ts.updateJsxExpression(node, visitNode(node.expression, visitor, ts.isExpression));
             // Clauses
-            case 249 /* CaseClause */:
+            case 253 /* CaseClause */:
                 return ts.updateCaseClause(node, visitNode(node.expression, visitor, ts.isExpression), visitNodes(node.statements, visitor, ts.isStatement));
-            case 250 /* DefaultClause */:
+            case 254 /* DefaultClause */:
                 return ts.updateDefaultClause(node, visitNodes(node.statements, visitor, ts.isStatement));
-            case 251 /* HeritageClause */:
+            case 255 /* HeritageClause */:
                 return ts.updateHeritageClause(node, visitNodes(node.types, visitor, ts.isExpressionWithTypeArguments));
-            case 252 /* CatchClause */:
+            case 256 /* CatchClause */:
                 return ts.updateCatchClause(node, visitNode(node.variableDeclaration, visitor, ts.isVariableDeclaration), visitNode(node.block, visitor, ts.isBlock));
             // Property assignments
-            case 253 /* PropertyAssignment */:
+            case 257 /* PropertyAssignment */:
                 return ts.updatePropertyAssignment(node, visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.initializer, visitor, ts.isExpression));
-            case 254 /* ShorthandPropertyAssignment */:
+            case 258 /* ShorthandPropertyAssignment */:
                 return ts.updateShorthandPropertyAssignment(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.objectAssignmentInitializer, visitor, ts.isExpression));
+            case 259 /* SpreadAssignment */:
+                return ts.updateSpreadAssignment(node, visitNode(node.expression, visitor, ts.isExpression));
             // Top-level nodes
-            case 256 /* SourceFile */:
+            case 261 /* SourceFile */:
                 context.startLexicalEnvironment();
                 return ts.updateSourceFileNode(node, ts.createNodeArray(ts.concatenate(visitNodes(node.statements, visitor, ts.isStatement), context.endLexicalEnvironment()), node.statements));
             // Transformation nodes
-            case 288 /* PartiallyEmittedExpression */:
+            case 293 /* PartiallyEmittedExpression */:
                 return ts.updatePartiallyEmittedExpression(node, visitNode(node.expression, visitor, ts.isExpression));
             default:
                 var updated = void 0;
@@ -42436,7 +44309,7 @@ var ts;
             return 0 /* None */;
         }
         else if (node.transformFlags & 536870912 /* HasComputedFlags */) {
-            return node.transformFlags & ~getTransformFlagsSubtreeExclusions(node.kind);
+            return node.transformFlags & ~ts.getTransformFlagsSubtreeExclusions(node.kind);
         }
         else {
             var subtreeFlags = aggregateTransformFlagsForSubtree(node);
@@ -42462,75 +44335,17 @@ var ts;
     function aggregateTransformFlagsForChildNode(transformFlags, child) {
         return transformFlags | aggregateTransformFlagsForNode(child);
     }
-    /**
-     * Gets the transform flags to exclude when unioning the transform flags of a subtree.
-     *
-     * NOTE: This needs to be kept up-to-date with the exclusions used in `computeTransformFlagsForNode`.
-     *       For performance reasons, `computeTransformFlagsForNode` uses local constant values rather
-     *       than calling this function.
-     */
-    function getTransformFlagsSubtreeExclusions(kind) {
-        if (kind >= 155 /* FirstTypeNode */ && kind <= 167 /* LastTypeNode */) {
-            return -3 /* TypeExcludes */;
-        }
-        switch (kind) {
-            case 175 /* CallExpression */:
-            case 176 /* NewExpression */:
-            case 171 /* ArrayLiteralExpression */:
-                return 537922901 /* ArrayLiteralOrCallOrNewExcludes */;
-            case 226 /* ModuleDeclaration */:
-                return 574729557 /* ModuleExcludes */;
-            case 143 /* Parameter */:
-                return 545262933 /* ParameterExcludes */;
-            case 181 /* ArrowFunction */:
-                return 592227669 /* ArrowFunctionExcludes */;
-            case 180 /* FunctionExpression */:
-            case 221 /* FunctionDeclaration */:
-                return 592293205 /* FunctionExcludes */;
-            case 220 /* VariableDeclarationList */:
-                return 545262933 /* VariableDeclarationListExcludes */;
-            case 222 /* ClassDeclaration */:
-            case 193 /* ClassExpression */:
-                return 539749717 /* ClassExcludes */;
-            case 149 /* Constructor */:
-                return 591760725 /* ConstructorExcludes */;
-            case 148 /* MethodDeclaration */:
-            case 150 /* GetAccessor */:
-            case 151 /* SetAccessor */:
-                return 591760725 /* MethodOrAccessorExcludes */;
-            case 118 /* AnyKeyword */:
-            case 131 /* NumberKeyword */:
-            case 128 /* NeverKeyword */:
-            case 133 /* StringKeyword */:
-            case 121 /* BooleanKeyword */:
-            case 134 /* SymbolKeyword */:
-            case 104 /* VoidKeyword */:
-            case 142 /* TypeParameter */:
-            case 145 /* PropertySignature */:
-            case 147 /* MethodSignature */:
-            case 152 /* CallSignature */:
-            case 153 /* ConstructSignature */:
-            case 154 /* IndexSignature */:
-            case 223 /* InterfaceDeclaration */:
-            case 224 /* TypeAliasDeclaration */:
-                return -3 /* TypeExcludes */;
-            case 172 /* ObjectLiteralExpression */:
-                return 539110741 /* ObjectLiteralExcludes */;
-            default:
-                return 536874325 /* NodeExcludes */;
-        }
-    }
     var Debug;
     (function (Debug) {
         Debug.failNotOptional = Debug.shouldAssert(1 /* Normal */)
             ? function (message) { return Debug.assert(false, message || "Node not optional."); }
-            : function () { };
+            : ts.noop;
         Debug.failBadSyntaxKind = Debug.shouldAssert(1 /* Normal */)
             ? function (node, message) { return Debug.assert(false, message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " was unexpected."; }); }
-            : function () { };
+            : 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 '" + getFunctionName(test) + "'."; }); }
-            : function () { };
+            : ts.noop;
         function getFunctionName(func) {
             if (typeof func !== "function") {
                 return "";
@@ -42561,7 +44376,7 @@ var ts;
      * @param recordTempVariable A callback used to record new temporary variables.
      * @param visitor An optional visitor to use to visit expressions.
      */
-    function flattenDestructuringAssignment(context, node, needsValue, recordTempVariable, visitor) {
+    function flattenDestructuringAssignment(context, node, needsValue, recordTempVariable, visitor, transformRest) {
         if (ts.isEmptyObjectLiteralOrArrayLiteral(node.left)) {
             var right = node.right;
             if (ts.isDestructuringAssignment(right)) {
@@ -42592,7 +44407,7 @@ var ts;
             // location should point to the right-hand value of the expression.
             location = value;
         }
-        flattenDestructuring(node, value, location, emitAssignment, emitTempVariableAssignment, visitor);
+        flattenDestructuring(node, value, location, emitAssignment, emitTempVariableAssignment, recordTempVariable, emitRestAssignment, transformRest, visitor);
         if (needsValue) {
             expressions.push(value);
         }
@@ -42612,6 +44427,9 @@ var ts;
             emitAssignment(name, value, location);
             return name;
         }
+        function emitRestAssignment(elements, value, location) {
+            emitAssignment(ts.createObjectLiteral(elements), value, location);
+        }
     }
     ts.flattenDestructuringAssignment = flattenDestructuringAssignment;
     /**
@@ -42621,9 +44439,9 @@ var ts;
      * @param value The rhs value for the binding pattern.
      * @param visitor An optional visitor to use to visit expressions.
      */
-    function flattenParameterDestructuring(node, value, visitor) {
+    function flattenParameterDestructuring(node, value, visitor, transformRest) {
         var declarations = [];
-        flattenDestructuring(node, value, node, emitAssignment, emitTempVariableAssignment, visitor);
+        flattenDestructuring(node, value, node, emitAssignment, emitTempVariableAssignment, ts.noop, emitRestAssignment, transformRest, visitor);
         return declarations;
         function emitAssignment(name, value, location) {
             var declaration = ts.createVariableDeclaration(name, /*type*/ undefined, value, location);
@@ -42638,6 +44456,9 @@ var ts;
             emitAssignment(name, value, location);
             return name;
         }
+        function emitRestAssignment(elements, value, location) {
+            emitAssignment(ts.createObjectBindingPattern(elements), value, location);
+        }
     }
     ts.flattenParameterDestructuring = flattenParameterDestructuring;
     /**
@@ -42647,10 +44468,10 @@ var ts;
      * @param value An optional rhs value for the binding pattern.
      * @param visitor An optional visitor to use to visit expressions.
      */
-    function flattenVariableDestructuring(node, value, visitor, recordTempVariable) {
+    function flattenVariableDestructuring(node, value, visitor, recordTempVariable, transformRest) {
         var declarations = [];
         var pendingAssignments;
-        flattenDestructuring(node, value, node, emitAssignment, emitTempVariableAssignment, visitor);
+        flattenDestructuring(node, value, node, emitAssignment, emitTempVariableAssignment, recordTempVariable, emitRestAssignment, transformRest, visitor);
         return declarations;
         function emitAssignment(name, value, location, original) {
             if (pendingAssignments) {
@@ -42682,6 +44503,9 @@ var ts;
             }
             return name;
         }
+        function emitRestAssignment(elements, value, location, original) {
+            emitAssignment(ts.createObjectBindingPattern(elements), value, location, original);
+        }
     }
     ts.flattenVariableDestructuring = flattenVariableDestructuring;
     /**
@@ -42689,36 +44513,40 @@ var ts;
      *
      * @param node The VariableDeclaration to flatten.
      * @param recordTempVariable A callback used to record new temporary variables.
-     * @param nameSubstitution An optional callback used to substitute binding names.
+     * @param createAssignmentCallback An optional callback used to create assignment expressions
+     * for non-temporary variables.
      * @param visitor An optional visitor to use to visit expressions.
      */
-    function flattenVariableDestructuringToExpression(node, recordTempVariable, nameSubstitution, visitor) {
+    function flattenVariableDestructuringToExpression(node, recordTempVariable, createAssignmentCallback, visitor) {
         var pendingAssignments = [];
-        flattenDestructuring(node, /*value*/ undefined, node, emitAssignment, emitTempVariableAssignment, visitor);
+        flattenDestructuring(node, /*value*/ undefined, node, emitAssignment, emitTempVariableAssignment, ts.noop, emitRestAssignment, /*transformRest*/ false, visitor);
         var expression = ts.inlineExpressions(pendingAssignments);
         ts.aggregateTransformFlags(expression);
         return expression;
         function emitAssignment(name, value, location, original) {
-            var left = nameSubstitution && nameSubstitution(name) || name;
-            emitPendingAssignment(left, value, location, original);
+            var expression = createAssignmentCallback
+                ? createAssignmentCallback(name.kind === 70 /* Identifier */ ? name : emitTempVariableAssignment(name, location), value, location)
+                : ts.createAssignment(name, value, location);
+            emitPendingAssignment(expression, original);
         }
         function emitTempVariableAssignment(value, location) {
             var name = ts.createTempVariable(recordTempVariable);
-            emitPendingAssignment(name, value, location, /*original*/ undefined);
+            emitPendingAssignment(ts.createAssignment(name, value, location), /*original*/ undefined);
             return name;
         }
-        function emitPendingAssignment(name, value, location, original) {
-            var expression = ts.createAssignment(name, value, location);
+        function emitRestAssignment(elements, value, location, original) {
+            emitAssignment(ts.createObjectLiteral(elements), value, location, original);
+        }
+        function emitPendingAssignment(expression, original) {
             expression.original = original;
             // NOTE: this completely disables source maps, but aligns with the behavior of
             //       `emitAssignment` in the old emitter.
             ts.setEmitFlags(expression, 2048 /* NoNestedSourceMaps */);
             pendingAssignments.push(expression);
-            return expression;
         }
     }
     ts.flattenVariableDestructuringToExpression = flattenVariableDestructuringToExpression;
-    function flattenDestructuring(root, value, location, emitAssignment, emitTempVariableAssignment, visitor) {
+    function flattenDestructuring(root, value, location, emitAssignment, emitTempVariableAssignment, recordTempVariable, emitRestAssignment, transformRest, visitor) {
         if (value && visitor) {
             value = ts.visitNode(value, visitor, ts.isExpression);
         }
@@ -42750,17 +44578,17 @@ var ts;
             else {
                 target = bindingTarget;
             }
-            if (target.kind === 172 /* ObjectLiteralExpression */) {
+            if (target.kind === 176 /* ObjectLiteralExpression */) {
                 emitObjectLiteralAssignment(target, value, location);
             }
-            else if (target.kind === 171 /* ArrayLiteralExpression */) {
+            else if (target.kind === 175 /* ArrayLiteralExpression */) {
                 emitArrayLiteralAssignment(target, value, location);
             }
             else {
-                var name_26 = ts.getMutableClone(target);
-                ts.setSourceMapRange(name_26, target);
-                ts.setCommentRange(name_26, target);
-                emitAssignment(name_26, value, location, /*original*/ undefined);
+                var name_30 = ts.getMutableClone(target);
+                ts.setSourceMapRange(name_30, target);
+                ts.setCommentRange(name_30, target);
+                emitAssignment(name_30, value, location, /*original*/ undefined);
             }
         }
         function emitObjectLiteralAssignment(target, value, location) {
@@ -42771,30 +44599,96 @@ var ts;
                 // When doing so we want to hightlight the passed in source map node since thats the one needing this temp assignment
                 value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ true, location, emitTempVariableAssignment);
             }
-            for (var _i = 0, properties_6 = properties; _i < properties_6.length; _i++) {
-                var p = properties_6[_i];
-                if (p.kind === 253 /* PropertyAssignment */ || p.kind === 254 /* ShorthandPropertyAssignment */) {
-                    var propName = p.name;
-                    var target_1 = p.kind === 254 /* ShorthandPropertyAssignment */ ? p : p.initializer || propName;
-                    // Assignment for target = value.propName should highligh whole property, hence use p as source map node
-                    emitDestructuringAssignment(target_1, createDestructuringPropertyAccess(value, propName), p);
+            var bindingElements = [];
+            for (var i = 0; i < properties.length; i++) {
+                var p = properties[i];
+                if (p.kind === 257 /* PropertyAssignment */ || p.kind === 258 /* ShorthandPropertyAssignment */) {
+                    if (!transformRest ||
+                        p.transformFlags & 8388608 /* ContainsSpreadExpression */ ||
+                        (p.kind === 257 /* PropertyAssignment */ && p.initializer.transformFlags & 8388608 /* ContainsSpreadExpression */)) {
+                        if (bindingElements.length) {
+                            emitRestAssignment(bindingElements, value, location, target);
+                            bindingElements = [];
+                        }
+                        var propName = p.name;
+                        var bindingTarget = p.kind === 258 /* ShorthandPropertyAssignment */ ? p : p.initializer || propName;
+                        // Assignment for bindingTarget = value.propName should highlight whole property, hence use p as source map node
+                        emitDestructuringAssignment(bindingTarget, createDestructuringPropertyAccess(value, propName), p);
+                    }
+                    else {
+                        bindingElements.push(p);
+                    }
                 }
+                else if (i === properties.length - 1 &&
+                    p.kind === 259 /* SpreadAssignment */ &&
+                    p.expression.kind === 70 /* Identifier */) {
+                    if (bindingElements.length) {
+                        emitRestAssignment(bindingElements, value, location, target);
+                        bindingElements = [];
+                    }
+                    var propName = p.expression;
+                    var restCall = createRestCall(value, target.properties, function (p) { return p.name; }, target);
+                    emitDestructuringAssignment(propName, restCall, p);
+                }
+            }
+            if (bindingElements.length) {
+                emitRestAssignment(bindingElements, value, location, target);
+                bindingElements = [];
             }
         }
         function emitArrayLiteralAssignment(target, value, location) {
+            if (transformRest) {
+                emitESNextArrayLiteralAssignment(target, value, location);
+            }
+            else {
+                emitES2015ArrayLiteralAssignment(target, value, location);
+            }
+        }
+        function emitESNextArrayLiteralAssignment(target, value, location) {
             var elements = target.elements;
             var numElements = elements.length;
             if (numElements !== 1) {
                 // For anything but a single element destructuring we need to generate a temporary
                 // to ensure value is evaluated exactly once.
-                // When doing so we want to hightlight the passed in source map node since thats the one needing this temp assignment
+                // When doing so we want to highlight the passed-in source map node since thats the one needing this temp assignment
+                value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ true, location, emitTempVariableAssignment);
+            }
+            var expressions = [];
+            var spreadContainingExpressions = [];
+            for (var i = 0; i < numElements; i++) {
+                var e = elements[i];
+                if (e.kind === 198 /* OmittedExpression */) {
+                    continue;
+                }
+                if (e.transformFlags & 8388608 /* ContainsSpreadExpression */ && i < numElements - 1) {
+                    var tmp = ts.createTempVariable(recordTempVariable);
+                    spreadContainingExpressions.push([e, tmp]);
+                    expressions.push(tmp);
+                }
+                else {
+                    expressions.push(e);
+                }
+            }
+            emitAssignment(ts.updateArrayLiteral(target, expressions), value, undefined, undefined);
+            for (var _i = 0, spreadContainingExpressions_1 = spreadContainingExpressions; _i < spreadContainingExpressions_1.length; _i++) {
+                var _a = spreadContainingExpressions_1[_i], e = _a[0], tmp = _a[1];
+                emitDestructuringAssignment(e, tmp, e);
+            }
+        }
+        function emitES2015ArrayLiteralAssignment(target, value, location) {
+            var elements = target.elements;
+            var numElements = elements.length;
+            if (numElements !== 1) {
+                // For anything but a single element destructuring we need to generate a temporary
+                // to ensure value is evaluated exactly once.
+                // When doing so we want to highlight the passed-in source map node since thats the one needing this temp assignment
                 value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ true, location, emitTempVariableAssignment);
             }
             for (var i = 0; i < numElements; i++) {
                 var e = elements[i];
-                if (e.kind !== 194 /* OmittedExpression */) {
+                if (e.kind !== 198 /* OmittedExpression */) {
                     // Assignment for target = value.propName should highligh whole property, hence use e as source map node
-                    if (e.kind !== 192 /* SpreadElementExpression */) {
+                    if (e.kind !== 196 /* SpreadElement */) {
                         emitDestructuringAssignment(e, ts.createElementAccess(value, ts.createLiteral(i)), e);
                     }
                     else if (i === numElements - 1) {
@@ -42803,10 +44697,30 @@ var ts;
                 }
             }
         }
+        /** Given value: o, propName: p, pattern: { a, b, ...p } from the original statement
+         * `{ a, b, ...p } = o`, create `p = __rest(o, ["a", "b"]);`*/
+        function createRestCall(value, elements, getPropertyName, location) {
+            var propertyNames = [];
+            for (var i = 0; i < elements.length - 1; i++) {
+                if (ts.isOmittedExpression(elements[i])) {
+                    continue;
+                }
+                var str = ts.createSynthesizedNode(9 /* StringLiteral */);
+                str.pos = location.pos;
+                str.end = location.end;
+                str.text = ts.getTextOfPropertyName(getPropertyName(elements[i]));
+                propertyNames.push(str);
+            }
+            var args = ts.createSynthesizedNodeArray([value, ts.createArrayLiteral(propertyNames, location)]);
+            return ts.createCall(ts.createIdentifier("__rest"), undefined, args);
+        }
         function emitBindingElement(target, value) {
             // Any temporary assignments needed to emit target = value should point to target
             var initializer = visitor ? ts.visitNode(target.initializer, visitor, ts.isExpression) : target.initializer;
-            if (initializer) {
+            if (transformRest) {
+                value = value || initializer;
+            }
+            else if (initializer) {
                 // Combine value and initializer
                 value = value ? createDefaultValueCheck(value, initializer, target) : initializer;
             }
@@ -42815,9 +44729,11 @@ var ts;
                 value = ts.createVoidZero();
             }
             var name = target.name;
-            if (ts.isBindingPattern(name)) {
-                var elements = name.elements;
-                var numElements = elements.length;
+            if (!ts.isBindingPattern(name)) {
+                emitAssignment(name, value, target, target);
+            }
+            else {
+                var numElements = name.elements.length;
                 if (numElements !== 1) {
                     // For anything other than a single-element destructuring we need to generate a temporary
                     // to ensure value is evaluated exactly once. Additionally, if we have zero elements
@@ -42825,29 +44741,98 @@ var ts;
                     // so in that case, we'll intentionally create that temporary.
                     value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ numElements !== 0, target, emitTempVariableAssignment);
                 }
-                for (var i = 0; i < numElements; i++) {
-                    var element = elements[i];
-                    if (ts.isOmittedExpression(element)) {
-                        continue;
-                    }
-                    else if (name.kind === 168 /* ObjectBindingPattern */) {
-                        // Rewrite element to a declaration with an initializer that fetches property
-                        var propName = element.propertyName || element.name;
-                        emitBindingElement(element, createDestructuringPropertyAccess(value, propName));
-                    }
-                    else {
-                        if (!element.dotDotDotToken) {
-                            // Rewrite element to a declaration that accesses array element at index i
-                            emitBindingElement(element, ts.createElementAccess(value, i));
-                        }
-                        else if (i === numElements - 1) {
-                            emitBindingElement(element, ts.createArraySlice(value, i));
-                        }
-                    }
+                if (name.kind === 173 /* ArrayBindingPattern */) {
+                    emitArrayBindingElement(name, value);
+                }
+                else {
+                    emitObjectBindingElement(target, value);
                 }
             }
+        }
+        function emitArrayBindingElement(name, value) {
+            if (transformRest) {
+                emitESNextArrayBindingElement(name, value);
+            }
             else {
-                emitAssignment(name, value, target, target);
+                emitES2015ArrayBindingElement(name, value);
+            }
+        }
+        function emitES2015ArrayBindingElement(name, value) {
+            var elements = name.elements;
+            var numElements = elements.length;
+            for (var i = 0; i < numElements; i++) {
+                var element = elements[i];
+                if (ts.isOmittedExpression(element)) {
+                    continue;
+                }
+                if (!element.dotDotDotToken) {
+                    // Rewrite element to a declaration that accesses array element at index i
+                    emitBindingElement(element, ts.createElementAccess(value, i));
+                }
+                else if (i === numElements - 1) {
+                    emitBindingElement(element, ts.createArraySlice(value, i));
+                }
+            }
+        }
+        function emitESNextArrayBindingElement(name, value) {
+            var elements = name.elements;
+            var numElements = elements.length;
+            var bindingElements = [];
+            var spreadContainingElements = [];
+            for (var i = 0; i < numElements; i++) {
+                var element = elements[i];
+                if (ts.isOmittedExpression(element)) {
+                    continue;
+                }
+                if (element.transformFlags & 8388608 /* ContainsSpreadExpression */ && i < numElements - 1) {
+                    spreadContainingElements.push(element);
+                    bindingElements.push(ts.createBindingElement(undefined, undefined, ts.getGeneratedNameForNode(element), undefined, value));
+                }
+                else {
+                    bindingElements.push(element);
+                }
+            }
+            emitAssignment(ts.updateArrayBindingPattern(name, bindingElements), value, undefined, undefined);
+            for (var _i = 0, spreadContainingElements_1 = spreadContainingElements; _i < spreadContainingElements_1.length; _i++) {
+                var element = spreadContainingElements_1[_i];
+                emitBindingElement(element, ts.getGeneratedNameForNode(element));
+            }
+        }
+        function emitObjectBindingElement(target, value) {
+            var name = target.name;
+            var elements = name.elements;
+            var numElements = elements.length;
+            var bindingElements = [];
+            for (var i = 0; i < numElements; i++) {
+                var element = elements[i];
+                if (ts.isOmittedExpression(element)) {
+                    continue;
+                }
+                if (i === numElements - 1 && element.dotDotDotToken) {
+                    if (bindingElements.length) {
+                        emitRestAssignment(bindingElements, value, target, target);
+                        bindingElements = [];
+                    }
+                    var restCall = createRestCall(value, name.elements, function (element) { return element.propertyName || element.name; }, name);
+                    emitBindingElement(element, restCall);
+                }
+                else if (transformRest && !(element.transformFlags & 8388608 /* ContainsSpreadExpression */)) {
+                    // do not emit until we have a complete bundle of ES2015 syntax
+                    bindingElements.push(element);
+                }
+                else {
+                    if (bindingElements.length) {
+                        emitRestAssignment(bindingElements, value, target, target);
+                        bindingElements = [];
+                    }
+                    // Rewrite element to a declaration with an initializer that fetches property
+                    var propName = element.propertyName || element.name;
+                    emitBindingElement(element, createDestructuringPropertyAccess(value, propName));
+                }
+            }
+            if (bindingElements.length) {
+                emitRestAssignment(bindingElements, value, target, target);
+                bindingElements = [];
             }
         }
         function createDefaultValueCheck(value, defaultValue, location) {
@@ -42938,15 +44923,15 @@ var ts;
         context.onEmitNode = onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
         // Enable substitution for property/element access to emit const enum values.
-        context.enableSubstitution(173 /* PropertyAccessExpression */);
-        context.enableSubstitution(174 /* ElementAccessExpression */);
+        context.enableSubstitution(177 /* PropertyAccessExpression */);
+        context.enableSubstitution(178 /* ElementAccessExpression */);
         // These variables contain state that changes as we descend into the tree.
         var currentSourceFile;
         var currentNamespace;
         var currentNamespaceContainerName;
         var currentScope;
         var currentScopeFirstDeclarationsOfName;
-        var currentSourceFileExternalHelpersModuleName;
+        var currentExternalHelpersModuleName;
         /**
          * 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.
@@ -43007,7 +44992,7 @@ var ts;
          * @param node The node to visit.
          */
         function visitorWorker(node) {
-            if (node.kind === 256 /* SourceFile */) {
+            if (node.kind === 261 /* SourceFile */) {
                 return visitSourceFile(node);
             }
             else if (node.transformFlags & 1 /* TypeScript */) {
@@ -43035,13 +45020,13 @@ var ts;
          */
         function sourceElementVisitorWorker(node) {
             switch (node.kind) {
-                case 231 /* ImportDeclaration */:
+                case 235 /* ImportDeclaration */:
                     return visitImportDeclaration(node);
-                case 230 /* ImportEqualsDeclaration */:
+                case 234 /* ImportEqualsDeclaration */:
                     return visitImportEqualsDeclaration(node);
-                case 236 /* ExportAssignment */:
+                case 240 /* ExportAssignment */:
                     return visitExportAssignment(node);
-                case 237 /* ExportDeclaration */:
+                case 241 /* ExportDeclaration */:
                     return visitExportDeclaration(node);
                 default:
                     return visitorWorker(node);
@@ -43061,11 +45046,11 @@ var ts;
          * @param node The node to visit.
          */
         function namespaceElementVisitorWorker(node) {
-            if (node.kind === 237 /* ExportDeclaration */ ||
-                node.kind === 231 /* ImportDeclaration */ ||
-                node.kind === 232 /* ImportClause */ ||
-                (node.kind === 230 /* ImportEqualsDeclaration */ &&
-                    node.moduleReference.kind === 241 /* ExternalModuleReference */)) {
+            if (node.kind === 241 /* ExportDeclaration */ ||
+                node.kind === 235 /* ImportDeclaration */ ||
+                node.kind === 236 /* ImportClause */ ||
+                (node.kind === 234 /* ImportEqualsDeclaration */ &&
+                    node.moduleReference.kind === 245 /* ExternalModuleReference */)) {
                 // do not emit ES6 imports and exports since they are illegal inside a namespace
                 return undefined;
             }
@@ -43095,25 +45080,34 @@ var ts;
          */
         function classElementVisitorWorker(node) {
             switch (node.kind) {
-                case 149 /* Constructor */:
+                case 150 /* 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 146 /* PropertyDeclaration */:
-                case 154 /* IndexSignature */:
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
-                case 148 /* MethodDeclaration */:
+                case 147 /* PropertyDeclaration */:
+                case 155 /* IndexSignature */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
+                case 149 /* MethodDeclaration */:
                     // Fallback to the default visit behavior.
                     return visitorWorker(node);
-                case 199 /* SemicolonClassElement */:
+                case 203 /* SemicolonClassElement */:
                     return node;
                 default:
                     ts.Debug.failBadSyntaxKind(node);
                     return undefined;
             }
         }
+        function modifierVisitor(node) {
+            if (ts.modifierToFlag(node.kind) & 2270 /* TypeScriptModifier */) {
+                return undefined;
+            }
+            else if (currentNamespace && node.kind === 83 /* ExportKeyword */) {
+                return undefined;
+            }
+            return node;
+        }
         /**
          * Branching visitor, visits a TypeScript syntax node.
          *
@@ -43136,45 +45130,48 @@ var ts;
                 case 116 /* AbstractKeyword */:
                 case 75 /* ConstKeyword */:
                 case 123 /* DeclareKeyword */:
-                case 129 /* ReadonlyKeyword */:
+                case 130 /* ReadonlyKeyword */:
                 // TypeScript accessibility and readonly modifiers are elided.
-                case 161 /* ArrayType */:
-                case 162 /* TupleType */:
-                case 160 /* TypeLiteral */:
-                case 155 /* TypePredicate */:
-                case 142 /* TypeParameter */:
+                case 162 /* ArrayType */:
+                case 163 /* TupleType */:
+                case 161 /* TypeLiteral */:
+                case 156 /* TypePredicate */:
+                case 143 /* TypeParameter */:
                 case 118 /* AnyKeyword */:
                 case 121 /* BooleanKeyword */:
-                case 133 /* StringKeyword */:
-                case 131 /* NumberKeyword */:
-                case 128 /* NeverKeyword */:
+                case 134 /* StringKeyword */:
+                case 132 /* NumberKeyword */:
+                case 129 /* NeverKeyword */:
                 case 104 /* VoidKeyword */:
-                case 134 /* SymbolKeyword */:
-                case 158 /* ConstructorType */:
-                case 157 /* FunctionType */:
-                case 159 /* TypeQuery */:
-                case 156 /* TypeReference */:
-                case 163 /* UnionType */:
-                case 164 /* IntersectionType */:
-                case 165 /* ParenthesizedType */:
-                case 166 /* ThisType */:
-                case 167 /* LiteralType */:
+                case 135 /* SymbolKeyword */:
+                case 159 /* ConstructorType */:
+                case 158 /* FunctionType */:
+                case 160 /* TypeQuery */:
+                case 157 /* TypeReference */:
+                case 164 /* UnionType */:
+                case 165 /* IntersectionType */:
+                case 166 /* ParenthesizedType */:
+                case 167 /* ThisType */:
+                case 168 /* TypeOperator */:
+                case 169 /* IndexedAccessType */:
+                case 170 /* MappedType */:
+                case 171 /* LiteralType */:
                 // TypeScript type nodes are elided.
-                case 154 /* IndexSignature */:
+                case 155 /* IndexSignature */:
                 // TypeScript index signatures are elided.
-                case 144 /* Decorator */:
+                case 145 /* Decorator */:
                 // TypeScript decorators are elided. They will be emitted as part of visitClassDeclaration.
-                case 224 /* TypeAliasDeclaration */:
+                case 228 /* TypeAliasDeclaration */:
                 // TypeScript type-only declarations are elided.
-                case 146 /* PropertyDeclaration */:
+                case 147 /* PropertyDeclaration */:
                 // TypeScript property declarations are elided.
-                case 149 /* Constructor */:
+                case 150 /* Constructor */:
                     return visitConstructor(node);
-                case 223 /* InterfaceDeclaration */:
+                case 227 /* 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 222 /* ClassDeclaration */:
+                case 226 /* ClassDeclaration */:
                     // This is a class declaration with TypeScript syntax extensions.
                     //
                     // TypeScript class syntax extensions include:
@@ -43185,7 +45182,7 @@ var ts;
                     // - index signatures
                     // - method overload signatures
                     return visitClassDeclaration(node);
-                case 193 /* ClassExpression */:
+                case 197 /* ClassExpression */:
                     // This is a class expression with TypeScript syntax extensions.
                     //
                     // TypeScript class syntax extensions include:
@@ -43196,35 +45193,35 @@ var ts;
                     // - index signatures
                     // - method overload signatures
                     return visitClassExpression(node);
-                case 251 /* HeritageClause */:
+                case 255 /* HeritageClause */:
                     // This is a heritage clause with TypeScript syntax extensions.
                     //
                     // TypeScript heritage clause extensions include:
                     // - `implements` clause
                     return visitHeritageClause(node);
-                case 195 /* ExpressionWithTypeArguments */:
+                case 199 /* ExpressionWithTypeArguments */:
                     // TypeScript supports type arguments on an expression in an `extends` heritage clause.
                     return visitExpressionWithTypeArguments(node);
-                case 148 /* MethodDeclaration */:
+                case 149 /* MethodDeclaration */:
                     // TypeScript method declarations may have decorators, modifiers
                     // or type annotations.
                     return visitMethodDeclaration(node);
-                case 150 /* GetAccessor */:
+                case 151 /* GetAccessor */:
                     // Get Accessors can have TypeScript modifiers, decorators, and type annotations.
                     return visitGetAccessor(node);
-                case 151 /* SetAccessor */:
+                case 152 /* SetAccessor */:
                     // Set Accessors can have TypeScript modifiers and type annotations.
                     return visitSetAccessor(node);
-                case 221 /* FunctionDeclaration */:
+                case 225 /* FunctionDeclaration */:
                     // Typescript function declarations can have modifiers, decorators, and type annotations.
                     return visitFunctionDeclaration(node);
-                case 180 /* FunctionExpression */:
+                case 184 /* FunctionExpression */:
                     // TypeScript function expressions can have modifiers and type annotations.
                     return visitFunctionExpression(node);
-                case 181 /* ArrowFunction */:
+                case 185 /* ArrowFunction */:
                     // TypeScript arrow functions can have modifiers and type annotations.
                     return visitArrowFunction(node);
-                case 143 /* Parameter */:
+                case 144 /* Parameter */:
                     // This is a parameter declaration with TypeScript syntax extensions.
                     //
                     // TypeScript parameter declaration syntax extensions include:
@@ -43234,33 +45231,33 @@ var ts;
                     // - type annotations
                     // - this parameters
                     return visitParameter(node);
-                case 179 /* ParenthesizedExpression */:
+                case 183 /* ParenthesizedExpression */:
                     // ParenthesizedExpressions are TypeScript if their expression is a
                     // TypeAssertion or AsExpression
                     return visitParenthesizedExpression(node);
-                case 178 /* TypeAssertionExpression */:
-                case 196 /* AsExpression */:
+                case 182 /* TypeAssertionExpression */:
+                case 200 /* AsExpression */:
                     // TypeScript type assertions are removed, but their subtrees are preserved.
                     return visitAssertionExpression(node);
-                case 175 /* CallExpression */:
+                case 179 /* CallExpression */:
                     return visitCallExpression(node);
-                case 176 /* NewExpression */:
+                case 180 /* NewExpression */:
                     return visitNewExpression(node);
-                case 197 /* NonNullExpression */:
+                case 201 /* NonNullExpression */:
                     // TypeScript non-null expressions are removed, but their subtrees are preserved.
                     return visitNonNullExpression(node);
-                case 225 /* EnumDeclaration */:
+                case 229 /* EnumDeclaration */:
                     // TypeScript enum declarations do not exist in ES6 and must be rewritten.
                     return visitEnumDeclaration(node);
-                case 201 /* VariableStatement */:
+                case 205 /* VariableStatement */:
                     // TypeScript namespace exports for variable statements must be transformed.
                     return visitVariableStatement(node);
-                case 219 /* VariableDeclaration */:
+                case 223 /* VariableDeclaration */:
                     return visitVariableDeclaration(node);
-                case 226 /* ModuleDeclaration */:
+                case 230 /* ModuleDeclaration */:
                     // TypeScript namespace declarations must be transformed.
                     return visitModuleDeclaration(node);
-                case 230 /* ImportEqualsDeclaration */:
+                case 234 /* ImportEqualsDeclaration */:
                     // TypeScript namespace or external module import.
                     return visitImportEqualsDeclaration(node);
                 default:
@@ -43275,15 +45272,15 @@ var ts;
          */
         function onBeforeVisitNode(node) {
             switch (node.kind) {
-                case 256 /* SourceFile */:
-                case 228 /* CaseBlock */:
-                case 227 /* ModuleBlock */:
-                case 200 /* Block */:
+                case 261 /* SourceFile */:
+                case 232 /* CaseBlock */:
+                case 231 /* ModuleBlock */:
+                case 204 /* Block */:
                     currentScope = node;
                     currentScopeFirstDeclarationsOfName = undefined;
                     break;
-                case 222 /* ClassDeclaration */:
-                case 221 /* FunctionDeclaration */:
+                case 226 /* ClassDeclaration */:
+                case 225 /* FunctionDeclaration */:
                     if (ts.hasModifier(node, 2 /* Ambient */)) {
                         break;
                     }
@@ -43294,13 +45291,17 @@ var ts;
         function visitSourceFile(node) {
             currentSourceFile = node;
             // ensure "use strict" is emitted in all scenarios in alwaysStrict mode
-            if (compilerOptions.alwaysStrict) {
+            // There is no need to emit "use strict" in the following cases:
+            //      1. The file is an external module and target is es2015 or higher
+            //      or 2. The file is an external module and module-kind is es6 or es2015 as such value is not allowed when targeting es5 or lower
+            if (compilerOptions.alwaysStrict &&
+                !(ts.isExternalModule(node) && (compilerOptions.target >= 2 /* ES2015 */ || compilerOptions.module === ts.ModuleKind.ES2015))) {
                 node = ts.ensureUseStrict(node);
             }
             // If the source file requires any helpers and is an external module, and
             // the importHelpers compiler option is enabled, emit a synthesized import
             // statement for the helpers library.
-            if (node.flags & 31744 /* EmitHelperFlags */
+            if (node.flags & 64512 /* EmitHelperFlags */
                 && compilerOptions.importHelpers
                 && (ts.isExternalModule(node) || compilerOptions.isolatedModules)) {
                 startLexicalEnvironment();
@@ -43313,10 +45314,10 @@ var ts;
                 externalHelpersModuleImport.parent = node;
                 externalHelpersModuleImport.flags &= ~8 /* Synthesized */;
                 statements.push(externalHelpersModuleImport);
-                currentSourceFileExternalHelpersModuleName = externalHelpersModuleName;
+                currentExternalHelpersModuleName = externalHelpersModuleName;
                 ts.addRange(statements, ts.visitNodes(node.statements, sourceElementVisitor, ts.isStatement, statementOffset));
                 ts.addRange(statements, endLexicalEnvironment());
-                currentSourceFileExternalHelpersModuleName = undefined;
+                currentExternalHelpersModuleName = undefined;
                 node = ts.updateSourceFileNode(node, ts.createNodeArray(statements, node.statements));
                 node.externalHelpersModuleName = externalHelpersModuleName;
             }
@@ -43360,7 +45361,6 @@ var ts;
             var staticProperties = getInitializedProperties(node, /*isStatic*/ true);
             var hasExtendsClause = ts.getClassExtendsHeritageClauseElement(node) !== undefined;
             var isDecoratedClass = shouldEmitDecorateCallForClass(node);
-            var classAlias;
             // emit name if
             // - node has a name
             // - node has static initializers
@@ -43369,38 +45369,22 @@ var ts;
             if (!name && staticProperties.length > 0) {
                 name = ts.getGeneratedNameForNode(node);
             }
-            var statements = [];
-            if (!isDecoratedClass) {
-                //  ${modifiers} class ${name} ${heritageClauses} {
-                //      ${members}
-                //  }
-                var classDeclaration = ts.createClassDeclaration(
-                /*decorators*/ undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), name, 
-                /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, hasExtendsClause), 
-                /*location*/ node);
-                ts.setOriginalNode(classDeclaration, node);
-                // To better align with the old emitter, we should not emit a trailing source map
-                // entry if the class has static properties.
-                if (staticProperties.length > 0) {
-                    ts.setEmitFlags(classDeclaration, 1024 /* NoTrailingSourceMap */ | ts.getEmitFlags(classDeclaration));
-                }
-                statements.push(classDeclaration);
-            }
-            else {
-                classAlias = addClassDeclarationHeadWithDecorators(statements, node, name, hasExtendsClause);
-            }
+            var classStatement = isDecoratedClass
+                ? createClassDeclarationHeadWithDecorators(node, name, hasExtendsClause)
+                : createClassDeclarationHeadWithoutDecorators(node, name, hasExtendsClause, staticProperties.length > 0);
+            var statements = [classStatement];
             // 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 (staticProperties.length) {
-                addInitializedPropertyStatements(statements, staticProperties, getLocalName(node, /*noSourceMaps*/ true));
+                addInitializedPropertyStatements(statements, staticProperties, ts.getLocalName(node));
             }
             // Write any decorators of the node.
             addClassElementDecorationStatements(statements, node, /*isStatic*/ false);
             addClassElementDecorationStatements(statements, node, /*isStatic*/ true);
-            addConstructorDecorationStatement(statements, node, classAlias);
+            addConstructorDecorationStatement(statements, node);
             // If the class is exported as part of a TypeScript namespace, emit the namespace export.
             // Otherwise, if the class was exported at the top level and was decorated, emit an export
             // declaration or export default for the class.
@@ -43409,26 +45393,54 @@ var ts;
             }
             else if (isDecoratedClass) {
                 if (isDefaultExternalModuleExport(node)) {
-                    statements.push(ts.createExportAssignment(
-                    /*decorators*/ undefined, 
-                    /*modifiers*/ undefined, 
-                    /*isExportEquals*/ false, getLocalName(node)));
+                    statements.push(ts.createExportDefault(ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true)));
                 }
                 else if (isNamedExternalModuleExport(node)) {
-                    statements.push(createExternalModuleExport(name));
+                    statements.push(ts.createExternalModuleExport(ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true)));
                 }
             }
-            return statements;
+            if (statements.length > 1) {
+                // Add a DeclarationMarker as a marker for the end of the declaration
+                statements.push(ts.createEndOfDeclarationMarker(node));
+                ts.setEmitFlags(classStatement, ts.getEmitFlags(classStatement) | 33554432 /* HasEndOfDeclarationMarker */);
+            }
+            return ts.singleOrMany(statements);
+        }
+        /**
+         * Transforms a non-decorated class declaration and appends the resulting statements.
+         *
+         * @param node A ClassDeclaration node.
+         * @param name The name of the class.
+         * @param hasExtendsClause A value indicating whether the class has an extends clause.
+         * @param hasStaticProperties A value indicating whether the class has static properties.
+         */
+        function createClassDeclarationHeadWithoutDecorators(node, name, hasExtendsClause, hasStaticProperties) {
+            //  ${modifiers} class ${name} ${heritageClauses} {
+            //      ${members}
+            //  }
+            var classDeclaration = ts.createClassDeclaration(
+            /*decorators*/ undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), name, 
+            /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, hasExtendsClause), node);
+            var emitFlags = ts.getEmitFlags(node);
+            // To better align with the old emitter, we should not emit a trailing source map
+            // entry if the class has static properties.
+            if (hasStaticProperties) {
+                emitFlags |= 1024 /* NoTrailingSourceMap */;
+            }
+            ts.setOriginalNode(classDeclaration, node);
+            ts.setEmitFlags(classDeclaration, emitFlags);
+            return classDeclaration;
         }
         /**
          * 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.
          *
+         * @param statements A statement list to which to add the declaration.
          * @param node A ClassDeclaration node.
          * @param name The name of the class.
-         * @param hasExtendsClause A value indicating whether
+         * @param hasExtendsClause A value indicating whether the class has an extends clause.
          */
-        function addClassDeclarationHeadWithDecorators(statements, node, name, hasExtendsClause) {
+        function createClassDeclarationHeadWithDecorators(node, name, hasExtendsClause) {
             // When we emit an ES6 class that has a class decorator, we must tailor the
             // emit to certain specific cases.
             //
@@ -43463,20 +45475,20 @@ var ts;
             //  ---------------------------------------------------------------------
             //  TypeScript                      | Javascript
             //  ---------------------------------------------------------------------
-            //  @dec                            | let C_1 = class C {
+            //  @dec                            | let C = C_1 = class C {
             //  class C {                       |   static x() { return C_1.y; }
             //    static x() { return C.y; }    | }
-            //    static y = 1;                 | let C = C_1;
-            //  }                               | C.y = 1;
-            //                                  | C = C_1 = __decorate([dec], C);
+            //    static y = 1;                 | C.y = 1;
+            //  }                               | C = C_1 = __decorate([dec], C);
+            //                                  | var C_1;
             //  ---------------------------------------------------------------------
-            //  @dec                            | let C_1 = class C {
+            //  @dec                            | let C = class C {
             //  export class C {                |   static x() { return C_1.y; }
             //    static x() { return C.y; }    | }
-            //    static y = 1;                 | let C = C_1;
-            //  }                               | C.y = 1;
-            //                                  | C = C_1 = __decorate([dec], C);
+            //    static y = 1;                 | C.y = 1;
+            //  }                               | C = C_1 = __decorate([dec], C);
             //                                  | export { C };
+            //                                  | var C_1;
             //  ---------------------------------------------------------------------
             //
             // If a class declaration is the default export of a module, we instead emit
@@ -43505,59 +45517,31 @@ var ts;
             //  ---------------------------------------------------------------------
             //  TypeScript                      | Javascript
             //  ---------------------------------------------------------------------
-            //  @dec                            | let C_1 = class C {
+            //  @dec                            | let C = class C {
             //  export default class C {        |   static x() { return C_1.y; }
             //    static x() { return C.y; }    | }
-            //    static y = 1;                 | let C = C_1;
-            //  }                               | C.y = 1;
-            //                                  | C = C_1 = __decorate([dec], C);
+            //    static y = 1;                 | C.y = 1;
+            //  }                               | C = C_1 = __decorate([dec], C);
             //                                  | export default C;
+            //                                  | var C_1;
             //  ---------------------------------------------------------------------
             //
             var location = ts.moveRangePastDecorators(node);
+            var classAlias = getClassAliasIfNeeded(node);
+            var declName = ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
             //  ... = class ${name} ${heritageClauses} {
             //      ${members}
             //  }
-            var classExpression = ts.setOriginalNode(ts.createClassExpression(
-            /*modifiers*/ undefined, name, 
-            /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, hasExtendsClause), 
-            /*location*/ location), node);
-            if (!name) {
-                name = ts.getGeneratedNameForNode(node);
-            }
-            // Record an alias to avoid class double-binding.
-            var classAlias;
-            if (resolver.getNodeCheckFlags(node) & 8388608 /* ClassWithConstructorReference */) {
-                enableSubstitutionForClassAliases();
-                classAlias = ts.createUniqueName(node.name && !ts.isGeneratedIdentifier(node.name) ? node.name.text : "default");
-                classAliases[ts.getOriginalNodeId(node)] = classAlias;
-            }
-            var declaredName = getDeclarationName(node, /*allowComments*/ true);
+            var heritageClauses = ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause);
+            var members = transformClassMembers(node, hasExtendsClause);
+            var classExpression = ts.createClassExpression(/*modifiers*/ undefined, name, /*typeParameters*/ undefined, heritageClauses, members, location);
+            ts.setOriginalNode(classExpression, node);
             //  let ${name} = ${classExpression} where name is either declaredName if the class doesn't contain self-reference
             //                                         or decoratedClassAlias if the class contain self-reference.
-            var transformedClassExpression = ts.createVariableStatement(
-            /*modifiers*/ undefined, ts.createLetDeclarationList([
-                ts.createVariableDeclaration(classAlias || declaredName, 
-                /*type*/ undefined, classExpression)
-            ]), 
-            /*location*/ location);
-            ts.setCommentRange(transformedClassExpression, node);
-            statements.push(ts.setOriginalNode(
-            /*node*/ transformedClassExpression, 
-            /*original*/ node));
-            if (classAlias) {
-                // We emit the class alias as a `let` declaration here so that it has the same
-                // TDZ as the class.
-                // let ${declaredName} = ${decoratedClassAlias}
-                statements.push(ts.setOriginalNode(ts.createVariableStatement(
-                /*modifiers*/ undefined, ts.createLetDeclarationList([
-                    ts.createVariableDeclaration(declaredName, 
-                    /*type*/ undefined, classAlias)
-                ]), 
-                /*location*/ location), 
-                /*original*/ node));
-            }
-            return classAlias;
+            var statement = ts.createLetStatement(declName, classAlias ? ts.createAssignment(classAlias, classExpression) : classExpression, location);
+            ts.setOriginalNode(statement, node);
+            ts.setCommentRange(statement, node);
+            return statement;
         }
         /**
          * Transforms a class expression with TypeScript syntax into compatible ES6.
@@ -43620,7 +45604,7 @@ var ts;
             // 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 hasInstancePropertyWithInitializer = ts.forEach(node.members, isInstanceInitializedProperty);
-            var hasParameterPropertyAssignments = node.transformFlags & 524288 /* ContainsParameterPropertyAssignments */;
+            var hasParameterPropertyAssignments = node.transformFlags & 4194304 /* ContainsParameterPropertyAssignments */;
             var constructor = ts.getFirstConstructorWithBody(node);
             // If the class does not contain nodes that require a synthesized constructor,
             // accept the current constructor if it exists.
@@ -43740,7 +45724,7 @@ var ts;
                     return index;
                 }
                 var statement = statements[index];
-                if (statement.kind === 203 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
+                if (statement.kind === 207 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
                     result.push(ts.visitNode(statement, visitor, ts.isStatement));
                     return index + 1;
                 }
@@ -43813,7 +45797,7 @@ var ts;
          * @param isStatic A value indicating whether the member should be a static or instance member.
          */
         function isInitializedProperty(member, isStatic) {
-            return member.kind === 146 /* PropertyDeclaration */
+            return member.kind === 147 /* PropertyDeclaration */
                 && isStatic === ts.hasModifier(member, 32 /* Static */)
                 && member.initializer !== undefined;
         }
@@ -43948,12 +45932,12 @@ var ts;
          */
         function getAllDecoratorsOfClassElement(node, member) {
             switch (member.kind) {
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
                     return getAllDecoratorsOfAccessors(node, member);
-                case 148 /* MethodDeclaration */:
+                case 149 /* MethodDeclaration */:
                     return getAllDecoratorsOfMethod(member);
-                case 146 /* PropertyDeclaration */:
+                case 147 /* PropertyDeclaration */:
                     return getAllDecoratorsOfProperty(member);
                 default:
                     return undefined;
@@ -44105,11 +46089,11 @@ var ts;
             var prefix = getClassMemberPrefix(node, member);
             var memberName = getExpressionForPropertyName(member, /*generateNameForComputedPropertyName*/ true);
             var descriptor = languageVersion > 0 /* ES3 */
-                ? member.kind === 146 /* PropertyDeclaration */
+                ? member.kind === 147 /* PropertyDeclaration */
                     ? ts.createVoidZero()
                     : ts.createNull()
                 : undefined;
-            var helper = ts.createDecorateHelper(currentSourceFileExternalHelpersModuleName, decoratorExpressions, prefix, memberName, descriptor, ts.moveRangePastDecorators(member));
+            var helper = ts.createDecorateHelper(currentExternalHelpersModuleName, decoratorExpressions, prefix, memberName, descriptor, ts.moveRangePastDecorators(member));
             ts.setEmitFlags(helper, 49152 /* NoComments */);
             return helper;
         }
@@ -44118,8 +46102,8 @@ var ts;
          *
          * @param node The class node.
          */
-        function addConstructorDecorationStatement(statements, node, decoratedClassAlias) {
-            var expression = generateConstructorDecorationExpression(node, decoratedClassAlias);
+        function addConstructorDecorationStatement(statements, node) {
+            var expression = generateConstructorDecorationExpression(node);
             if (expression) {
                 statements.push(ts.setOriginalNode(ts.createStatement(expression), node));
             }
@@ -44129,33 +46113,19 @@ var ts;
          *
          * @param node The class node.
          */
-        function generateConstructorDecorationExpression(node, decoratedClassAlias) {
+        function generateConstructorDecorationExpression(node) {
             var allDecorators = getAllDecoratorsOfConstructor(node);
             var decoratorExpressions = transformAllDecoratorsOfDeclaration(node, allDecorators);
             if (!decoratorExpressions) {
                 return undefined;
             }
-            // Emit the call to __decorate. Given the class:
-            //
-            //   @dec
-            //   class C {
-            //   }
-            //
-            // The emit for the class is:
-            //
-            //   C = C_1 = __decorate([dec], C);
-            //
-            if (decoratedClassAlias) {
-                var expression = ts.createAssignment(decoratedClassAlias, ts.createDecorateHelper(currentSourceFileExternalHelpersModuleName, decoratorExpressions, getDeclarationName(node)));
-                var result = ts.createAssignment(getDeclarationName(node), expression, ts.moveRangePastDecorators(node));
-                ts.setEmitFlags(result, 49152 /* NoComments */);
-                return result;
-            }
-            else {
-                var result = ts.createAssignment(getDeclarationName(node), ts.createDecorateHelper(currentSourceFileExternalHelpersModuleName, decoratorExpressions, getDeclarationName(node)), ts.moveRangePastDecorators(node));
-                ts.setEmitFlags(result, 49152 /* NoComments */);
-                return result;
-            }
+            var classAlias = classAliases && classAliases[ts.getOriginalNodeId(node)];
+            var localName = ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
+            var decorate = ts.createDecorateHelper(currentExternalHelpersModuleName, decoratorExpressions, localName);
+            var expression = ts.createAssignment(localName, classAlias ? ts.createAssignment(classAlias, decorate) : decorate);
+            ts.setEmitFlags(expression, 49152 /* NoComments */);
+            ts.setSourceMapRange(expression, ts.moveRangePastDecorators(node));
+            return expression;
         }
         /**
          * Transforms a decorator into an expression.
@@ -44177,7 +46147,7 @@ var ts;
                 expressions = [];
                 for (var _i = 0, decorators_1 = decorators; _i < decorators_1.length; _i++) {
                     var decorator = decorators_1[_i];
-                    var helper = ts.createParamHelper(currentSourceFileExternalHelpersModuleName, transformDecorator(decorator), parameterOffset, 
+                    var helper = ts.createParamHelper(currentExternalHelpersModuleName, transformDecorator(decorator), parameterOffset, 
                     /*location*/ decorator.expression);
                     ts.setEmitFlags(helper, 49152 /* NoComments */);
                     expressions.push(helper);
@@ -44202,13 +46172,13 @@ var ts;
         function addOldTypeMetadata(node, decoratorExpressions) {
             if (compilerOptions.emitDecoratorMetadata) {
                 if (shouldAddTypeMetadata(node)) {
-                    decoratorExpressions.push(ts.createMetadataHelper(currentSourceFileExternalHelpersModuleName, "design:type", serializeTypeOfNode(node)));
+                    decoratorExpressions.push(ts.createMetadataHelper(currentExternalHelpersModuleName, "design:type", serializeTypeOfNode(node)));
                 }
                 if (shouldAddParamTypesMetadata(node)) {
-                    decoratorExpressions.push(ts.createMetadataHelper(currentSourceFileExternalHelpersModuleName, "design:paramtypes", serializeParameterTypesOfNode(node)));
+                    decoratorExpressions.push(ts.createMetadataHelper(currentExternalHelpersModuleName, "design:paramtypes", serializeParameterTypesOfNode(node)));
                 }
                 if (shouldAddReturnTypeMetadata(node)) {
-                    decoratorExpressions.push(ts.createMetadataHelper(currentSourceFileExternalHelpersModuleName, "design:returntype", serializeReturnTypeOfNode(node)));
+                    decoratorExpressions.push(ts.createMetadataHelper(currentExternalHelpersModuleName, "design:returntype", serializeReturnTypeOfNode(node)));
                 }
             }
         }
@@ -44216,16 +46186,16 @@ var ts;
             if (compilerOptions.emitDecoratorMetadata) {
                 var properties = void 0;
                 if (shouldAddTypeMetadata(node)) {
-                    (properties || (properties = [])).push(ts.createPropertyAssignment("type", ts.createArrowFunction(/*modifiers*/ undefined, /*typeParameters*/ undefined, [], /*type*/ undefined, /*equalsGreaterThanToken*/ undefined, serializeTypeOfNode(node))));
+                    (properties || (properties = [])).push(ts.createPropertyAssignment("type", ts.createArrowFunction(/*modifiers*/ undefined, /*typeParameters*/ undefined, [], /*type*/ undefined, ts.createToken(35 /* EqualsGreaterThanToken */), serializeTypeOfNode(node))));
                 }
                 if (shouldAddParamTypesMetadata(node)) {
-                    (properties || (properties = [])).push(ts.createPropertyAssignment("paramTypes", ts.createArrowFunction(/*modifiers*/ undefined, /*typeParameters*/ undefined, [], /*type*/ undefined, /*equalsGreaterThanToken*/ undefined, serializeParameterTypesOfNode(node))));
+                    (properties || (properties = [])).push(ts.createPropertyAssignment("paramTypes", ts.createArrowFunction(/*modifiers*/ undefined, /*typeParameters*/ undefined, [], /*type*/ undefined, ts.createToken(35 /* EqualsGreaterThanToken */), serializeParameterTypesOfNode(node))));
                 }
                 if (shouldAddReturnTypeMetadata(node)) {
-                    (properties || (properties = [])).push(ts.createPropertyAssignment("returnType", ts.createArrowFunction(/*modifiers*/ undefined, /*typeParameters*/ undefined, [], /*type*/ undefined, /*equalsGreaterThanToken*/ undefined, serializeReturnTypeOfNode(node))));
+                    (properties || (properties = [])).push(ts.createPropertyAssignment("returnType", ts.createArrowFunction(/*modifiers*/ undefined, /*typeParameters*/ undefined, [], /*type*/ undefined, ts.createToken(35 /* EqualsGreaterThanToken */), serializeReturnTypeOfNode(node))));
                 }
                 if (properties) {
-                    decoratorExpressions.push(ts.createMetadataHelper(currentSourceFileExternalHelpersModuleName, "design:typeinfo", ts.createObjectLiteral(properties, /*location*/ undefined, /*multiLine*/ true)));
+                    decoratorExpressions.push(ts.createMetadataHelper(currentExternalHelpersModuleName, "design:typeinfo", ts.createObjectLiteral(properties, /*location*/ undefined, /*multiLine*/ true)));
                 }
             }
         }
@@ -44238,10 +46208,10 @@ var ts;
          */
         function shouldAddTypeMetadata(node) {
             var kind = node.kind;
-            return kind === 148 /* MethodDeclaration */
-                || kind === 150 /* GetAccessor */
-                || kind === 151 /* SetAccessor */
-                || kind === 146 /* PropertyDeclaration */;
+            return kind === 149 /* MethodDeclaration */
+                || kind === 151 /* GetAccessor */
+                || kind === 152 /* SetAccessor */
+                || kind === 147 /* PropertyDeclaration */;
         }
         /**
          * Determines whether to emit the "design:returntype" metadata based on the node's kind.
@@ -44251,7 +46221,7 @@ var ts;
          * @param node The node to test.
          */
         function shouldAddReturnTypeMetadata(node) {
-            return node.kind === 148 /* MethodDeclaration */;
+            return node.kind === 149 /* MethodDeclaration */;
         }
         /**
          * Determines whether to emit the "design:paramtypes" metadata based on the node's kind.
@@ -44262,11 +46232,11 @@ var ts;
          */
         function shouldAddParamTypesMetadata(node) {
             var kind = node.kind;
-            return kind === 222 /* ClassDeclaration */
-                || kind === 193 /* ClassExpression */
-                || kind === 148 /* MethodDeclaration */
-                || kind === 150 /* GetAccessor */
-                || kind === 151 /* SetAccessor */;
+            return kind === 226 /* ClassDeclaration */
+                || kind === 197 /* ClassExpression */
+                || kind === 149 /* MethodDeclaration */
+                || kind === 151 /* GetAccessor */
+                || kind === 152 /* SetAccessor */;
         }
         /**
          * Serializes the type of a node for use with decorator type metadata.
@@ -44275,15 +46245,15 @@ var ts;
          */
         function serializeTypeOfNode(node) {
             switch (node.kind) {
-                case 146 /* PropertyDeclaration */:
-                case 143 /* Parameter */:
-                case 150 /* GetAccessor */:
+                case 147 /* PropertyDeclaration */:
+                case 144 /* Parameter */:
+                case 151 /* GetAccessor */:
                     return serializeTypeNode(node.type);
-                case 151 /* SetAccessor */:
+                case 152 /* SetAccessor */:
                     return serializeTypeNode(ts.getSetAccessorTypeAnnotationNode(node));
-                case 222 /* ClassDeclaration */:
-                case 193 /* ClassExpression */:
-                case 148 /* MethodDeclaration */:
+                case 226 /* ClassDeclaration */:
+                case 197 /* ClassExpression */:
+                case 149 /* MethodDeclaration */:
                     return ts.createIdentifier("Function");
                 default:
                     return ts.createVoidZero();
@@ -44296,10 +46266,10 @@ var ts;
          * @param node The type node.
          */
         function getRestParameterElementType(node) {
-            if (node && node.kind === 161 /* ArrayType */) {
+            if (node && node.kind === 162 /* ArrayType */) {
                 return node.elementType;
             }
-            else if (node && node.kind === 156 /* TypeReference */) {
+            else if (node && node.kind === 157 /* TypeReference */) {
                 return ts.singleOrUndefined(node.typeArguments);
             }
             else {
@@ -44375,20 +46345,20 @@ var ts;
             switch (node.kind) {
                 case 104 /* VoidKeyword */:
                     return ts.createVoidZero();
-                case 165 /* ParenthesizedType */:
+                case 166 /* ParenthesizedType */:
                     return serializeTypeNode(node.type);
-                case 157 /* FunctionType */:
-                case 158 /* ConstructorType */:
+                case 158 /* FunctionType */:
+                case 159 /* ConstructorType */:
                     return ts.createIdentifier("Function");
-                case 161 /* ArrayType */:
-                case 162 /* TupleType */:
+                case 162 /* ArrayType */:
+                case 163 /* TupleType */:
                     return ts.createIdentifier("Array");
-                case 155 /* TypePredicate */:
+                case 156 /* TypePredicate */:
                 case 121 /* BooleanKeyword */:
                     return ts.createIdentifier("Boolean");
-                case 133 /* StringKeyword */:
+                case 134 /* StringKeyword */:
                     return ts.createIdentifier("String");
-                case 167 /* LiteralType */:
+                case 171 /* LiteralType */:
                     switch (node.literal.kind) {
                         case 9 /* StringLiteral */:
                             return ts.createIdentifier("String");
@@ -44402,16 +46372,16 @@ var ts;
                             break;
                     }
                     break;
-                case 131 /* NumberKeyword */:
+                case 132 /* NumberKeyword */:
                     return ts.createIdentifier("Number");
-                case 134 /* SymbolKeyword */:
+                case 135 /* SymbolKeyword */:
                     return languageVersion < 2 /* ES2015 */
                         ? getGlobalSymbolNameWithFallback()
                         : ts.createIdentifier("Symbol");
-                case 156 /* TypeReference */:
+                case 157 /* TypeReference */:
                     return serializeTypeReferenceNode(node);
-                case 164 /* IntersectionType */:
-                case 163 /* UnionType */:
+                case 165 /* IntersectionType */:
+                case 164 /* UnionType */:
                     {
                         var unionOrIntersection = node;
                         var serializedUnion = void 0;
@@ -44440,10 +46410,13 @@ var ts;
                         }
                     }
                 // Fallthrough
-                case 159 /* TypeQuery */:
-                case 160 /* TypeLiteral */:
+                case 160 /* TypeQuery */:
+                case 168 /* TypeOperator */:
+                case 169 /* IndexedAccessType */:
+                case 170 /* MappedType */:
+                case 161 /* TypeLiteral */:
                 case 118 /* AnyKeyword */:
-                case 166 /* ThisType */:
+                case 167 /* ThisType */:
                     break;
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -44500,15 +46473,15 @@ var ts;
                 case 70 /* 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_27 = ts.getMutableClone(node);
-                    name_27.flags &= ~8 /* Synthesized */;
-                    name_27.original = undefined;
-                    name_27.parent = currentScope;
+                    var name_31 = ts.getMutableClone(node);
+                    name_31.flags &= ~8 /* Synthesized */;
+                    name_31.original = undefined;
+                    name_31.parent = currentScope;
                     if (useFallback) {
-                        return ts.createLogicalAnd(ts.createStrictInequality(ts.createTypeOf(name_27), ts.createLiteral("undefined")), name_27);
+                        return ts.createLogicalAnd(ts.createStrictInequality(ts.createTypeOf(name_31), ts.createLiteral("undefined")), name_31);
                     }
-                    return name_27;
-                case 140 /* QualifiedName */:
+                    return name_31;
+                case 141 /* QualifiedName */:
                     return serializeQualifiedNameAsExpression(node, useFallback);
             }
         }
@@ -44641,7 +46614,7 @@ var ts;
                 return undefined;
             }
             var method = ts.createMethod(
-            /*decorators*/ undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.asteriskToken, visitPropertyNameOfClassElement(node), 
+            /*decorators*/ undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, visitPropertyNameOfClassElement(node), 
             /*typeParameters*/ undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), 
             /*type*/ undefined, transformFunctionBody(node), 
             /*location*/ node);
@@ -44675,14 +46648,14 @@ var ts;
                 return undefined;
             }
             var accessor = ts.createGetAccessor(
-            /*decorators*/ undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), visitPropertyNameOfClassElement(node), ts.visitNodes(node.parameters, visitor, ts.isParameter), 
+            /*decorators*/ undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), visitPropertyNameOfClassElement(node), ts.visitNodes(node.parameters, visitor, ts.isParameter), 
             /*type*/ undefined, node.body ? ts.visitEachChild(node.body, visitor, context) : ts.createBlock([]), 
             /*location*/ 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.setOriginalNode(accessor, node);
             ts.setCommentRange(accessor, node);
             ts.setSourceMapRange(accessor, ts.moveRangePastDecorators(node));
-            ts.setOriginalNode(accessor, node);
             return accessor;
         }
         /**
@@ -44699,13 +46672,13 @@ var ts;
                 return undefined;
             }
             var accessor = ts.createSetAccessor(
-            /*decorators*/ undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), visitPropertyNameOfClassElement(node), ts.visitNodes(node.parameters, visitor, ts.isParameter), node.body ? ts.visitEachChild(node.body, visitor, context) : ts.createBlock([]), 
+            /*decorators*/ undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), visitPropertyNameOfClassElement(node), ts.visitNodes(node.parameters, visitor, ts.isParameter), node.body ? ts.visitEachChild(node.body, visitor, context) : ts.createBlock([]), 
             /*location*/ 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.setOriginalNode(accessor, node);
             ts.setCommentRange(accessor, node);
             ts.setSourceMapRange(accessor, ts.moveRangePastDecorators(node));
-            ts.setOriginalNode(accessor, node);
             return accessor;
         }
         /**
@@ -44723,7 +46696,7 @@ var ts;
                 return ts.createNotEmittedStatement(node);
             }
             var func = ts.createFunctionDeclaration(
-            /*decorators*/ undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.asteriskToken, node.name, 
+            /*decorators*/ undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, node.name, 
             /*typeParameters*/ undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), 
             /*type*/ undefined, transformFunctionBody(node), 
             /*location*/ node);
@@ -44747,7 +46720,7 @@ var ts;
             if (ts.nodeIsMissing(node.body)) {
                 return ts.createOmittedExpression();
             }
-            var func = ts.createFunctionExpression(ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.asteriskToken, node.name, 
+            var func = ts.createFunctionExpression(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, node.name, 
             /*typeParameters*/ undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), 
             /*type*/ undefined, transformFunctionBody(node), 
             /*location*/ node);
@@ -44760,7 +46733,7 @@ var ts;
          * - The node has type annotations
          */
         function visitArrowFunction(node) {
-            var func = ts.createArrowFunction(ts.visitNodes(node.modifiers, visitor, ts.isModifier), 
+            var func = ts.createArrowFunction(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), 
             /*typeParameters*/ undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), 
             /*type*/ undefined, node.equalsGreaterThanToken, transformConciseBody(node), 
             /*location*/ node);
@@ -44820,7 +46793,7 @@ var ts;
             if (ts.parameterIsThisKeyword(node)) {
                 return undefined;
             }
-            var parameter = ts.createParameterDeclaration(
+            var parameter = ts.createParameter(
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, node.dotDotDotToken, ts.visitNode(node.name, visitor, ts.isBindingName), 
             /*questionToken*/ undefined, 
@@ -44857,7 +46830,7 @@ var ts;
         function transformInitializedVariable(node) {
             var name = node.name;
             if (ts.isBindingPattern(name)) {
-                return ts.flattenVariableDestructuringToExpression(node, hoistVariableDeclaration, getNamespaceMemberNameWithSourceMapsAndWithoutComments, visitor);
+                return ts.flattenVariableDestructuringToExpression(node, hoistVariableDeclaration, createNamespaceExportExpression, visitor);
             }
             else {
                 return ts.createAssignment(getNamespaceMemberNameWithSourceMapsAndWithoutComments(name), ts.visitNode(node.initializer, visitor, ts.isExpression), 
@@ -44923,21 +46896,6 @@ var ts;
                 || compilerOptions.preserveConstEnums
                 || compilerOptions.isolatedModules;
         }
-        function shouldEmitVarForEnumDeclaration(node) {
-            return isFirstEmittedDeclarationInScope(node)
-                && (!ts.hasModifier(node, 1 /* Export */)
-                    || isES6ExportedDeclaration(node));
-        }
-        /*
-         * Adds a trailing VariableStatement for an enum or module declaration.
-         */
-        function addVarForEnumExportedFromNamespace(statements, node) {
-            var statement = ts.createVariableStatement(
-            /*modifiers*/ undefined, [ts.createVariableDeclaration(getDeclarationName(node), 
-                /*type*/ undefined, getExportName(node))]);
-            ts.setSourceMapRange(statement, node);
-            statements.push(statement);
-        }
         /**
          * Visits an enum declaration.
          *
@@ -44956,9 +46914,7 @@ var ts;
             // If needed, we should emit a variable declaration for the enum. If we emit
             // a leading variable declaration, we should not emit leading comments for the
             // enum body.
-            recordEmittedDeclarationInScope(node);
-            if (shouldEmitVarForEnumDeclaration(node)) {
-                addVarForEnumOrModuleDeclaration(statements, node);
+            if (addVarForEnumOrModuleDeclaration(statements, node)) {
                 // We should still emit the comments if we are emitting a system module.
                 if (moduleKind !== ts.ModuleKind.System || currentScope !== currentSourceFile) {
                     emitFlags |= 16384 /* NoLeadingComments */;
@@ -44969,7 +46925,18 @@ var ts;
             // `containerName` is the expression used inside of the enum for assignments.
             var containerName = getNamespaceContainerName(node);
             // `exportName` is the expression used within this node's container for any exported references.
-            var exportName = getExportName(node);
+            var exportName = ts.hasModifier(node, 1 /* Export */)
+                ? ts.getExternalModuleOrNamespaceExportName(currentNamespaceContainerName, node, /*allowComments*/ false, /*allowSourceMaps*/ true)
+                : ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
+            //  x || (x = {})
+            //  exports.x || (exports.x = {})
+            var moduleArg = ts.createLogicalOr(exportName, ts.createAssignment(exportName, ts.createObjectLiteral()));
+            if (hasNamespaceQualifiedExportName(node)) {
+                // `localName` is the expression used within this node's containing scope for any local references.
+                var localName = ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
+                //  x = (exports.x || (exports.x = {}))
+                moduleArg = ts.createAssignment(localName, moduleArg);
+            }
             //  (function (x) {
             //      x[x["y"] = 0] = "y";
             //      ...
@@ -44978,16 +46945,16 @@ var ts;
             /*modifiers*/ undefined, 
             /*asteriskToken*/ undefined, 
             /*name*/ undefined, 
-            /*typeParameters*/ undefined, [ts.createParameter(parameterName)], 
+            /*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, parameterName)], 
             /*type*/ undefined, transformEnumBody(node, containerName)), 
-            /*typeArguments*/ undefined, [ts.createLogicalOr(exportName, ts.createAssignment(exportName, ts.createObjectLiteral()))]), 
+            /*typeArguments*/ undefined, [moduleArg]), 
             /*location*/ node);
             ts.setOriginalNode(enumStatement, node);
             ts.setEmitFlags(enumStatement, emitFlags);
             statements.push(enumStatement);
-            if (isNamespaceExport(node)) {
-                addVarForEnumExportedFromNamespace(statements, node);
-            }
+            // Add a DeclarationMarker for the enum to preserve trailing comments and mark
+            // the end of the declaration.
+            statements.push(ts.createEndOfDeclarationMarker(node));
             return statements;
         }
         /**
@@ -45049,9 +47016,15 @@ var ts;
         function shouldEmitModuleDeclaration(node) {
             return ts.isInstantiatedModule(node, compilerOptions.preserveConstEnums || compilerOptions.isolatedModules);
         }
-        function isES6ExportedDeclaration(node) {
-            return isExternalModuleExport(node)
-                && moduleKind === ts.ModuleKind.ES2015;
+        /**
+         * Determines whether an exported declaration will have a qualified export name (e.g. `f.x`
+         * or `exports.x`).
+         */
+        function hasNamespaceQualifiedExportName(node) {
+            return isNamespaceExport(node)
+                || (isExternalModuleExport(node)
+                    && moduleKind !== ts.ModuleKind.ES2015
+                    && moduleKind !== ts.ModuleKind.System);
         }
         /**
          * Records that a declaration was emitted in the current scope, if it was the first
@@ -45077,55 +47050,64 @@ var ts;
          */
         function isFirstEmittedDeclarationInScope(node) {
             if (currentScopeFirstDeclarationsOfName) {
-                var name_28 = node.symbol && node.symbol.name;
-                if (name_28) {
-                    return currentScopeFirstDeclarationsOfName[name_28] === node;
+                var name_32 = node.symbol && node.symbol.name;
+                if (name_32) {
+                    return currentScopeFirstDeclarationsOfName[name_32] === node;
                 }
             }
             return false;
         }
-        function shouldEmitVarForModuleDeclaration(node) {
-            return isFirstEmittedDeclarationInScope(node);
-        }
         /**
          * Adds a leading VariableStatement for a enum or module declaration.
          */
         function addVarForEnumOrModuleDeclaration(statements, node) {
             // Emit a variable statement for the module.
-            var statement = ts.createVariableStatement(isES6ExportedDeclaration(node)
-                ? ts.visitNodes(node.modifiers, visitor, ts.isModifier)
-                : undefined, [
-                ts.createVariableDeclaration(getDeclarationName(node, /*allowComments*/ false, /*allowSourceMaps*/ true))
+            var statement = ts.createVariableStatement(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), [
+                ts.createVariableDeclaration(ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true))
             ]);
-            ts.setOriginalNode(statement, /*original*/ node);
-            // Adjust the source map emit to match the old emitter.
-            if (node.kind === 225 /* EnumDeclaration */) {
-                ts.setSourceMapRange(statement.declarationList, node);
+            ts.setOriginalNode(statement, node);
+            recordEmittedDeclarationInScope(node);
+            if (isFirstEmittedDeclarationInScope(node)) {
+                // Adjust the source map emit to match the old emitter.
+                if (node.kind === 229 /* EnumDeclaration */) {
+                    ts.setSourceMapRange(statement.declarationList, node);
+                }
+                else {
+                    ts.setSourceMapRange(statement, node);
+                }
+                // Trailing comments for module declaration should be emitted after the function closure
+                // instead of the variable statement:
+                //
+                //     /** Module comment*/
+                //     module m1 {
+                //         function foo4Export() {
+                //         }
+                //     } // trailing comment module
+                //
+                // Should emit:
+                //
+                //     /** Module comment*/
+                //     var m1;
+                //     (function (m1) {
+                //         function foo4Export() {
+                //         }
+                //     })(m1 || (m1 = {})); // trailing comment module
+                //
+                ts.setCommentRange(statement, node);
+                ts.setEmitFlags(statement, 32768 /* NoTrailingComments */ | 33554432 /* HasEndOfDeclarationMarker */);
+                statements.push(statement);
+                return true;
             }
             else {
-                ts.setSourceMapRange(statement, node);
+                // For an EnumDeclaration or ModuleDeclaration that merges with a preceeding
+                // declaration we do not emit a leading variable declaration. To preserve the
+                // begin/end semantics of the declararation and to properly handle exports
+                // we wrap the leading variable declaration in a `MergeDeclarationMarker`.
+                var mergeMarker = ts.createMergeDeclarationMarker(statement);
+                ts.setEmitFlags(mergeMarker, 49152 /* NoComments */ | 33554432 /* HasEndOfDeclarationMarker */);
+                statements.push(mergeMarker);
+                return false;
             }
-            // Trailing comments for module declaration should be emitted after the function closure
-            // instead of the variable statement:
-            //
-            //     /** Module comment*/
-            //     module m1 {
-            //         function foo4Export() {
-            //         }
-            //     } // trailing comment module
-            //
-            // Should emit:
-            //
-            //     /** Module comment*/
-            //     var m1;
-            //     (function (m1) {
-            //         function foo4Export() {
-            //         }
-            //     })(m1 || (m1 = {})); // trailing comment module
-            //
-            ts.setCommentRange(statement, node);
-            ts.setEmitFlags(statement, 32768 /* NoTrailingComments */);
-            statements.push(statement);
         }
         /**
          * Visits a module declaration node.
@@ -45147,9 +47129,7 @@ var ts;
             // If needed, we should emit a variable declaration for the module. If we emit
             // a leading variable declaration, we should not emit leading comments for the
             // module body.
-            recordEmittedDeclarationInScope(node);
-            if (shouldEmitVarForModuleDeclaration(node)) {
-                addVarForEnumOrModuleDeclaration(statements, node);
+            if (addVarForEnumOrModuleDeclaration(statements, node)) {
                 // We should still emit the comments if we are emitting a system module.
                 if (moduleKind !== ts.ModuleKind.System || currentScope !== currentSourceFile) {
                     emitFlags |= 16384 /* NoLeadingComments */;
@@ -45160,13 +47140,15 @@ var ts;
             // `containerName` is the expression used inside of the namespace for exports.
             var containerName = getNamespaceContainerName(node);
             // `exportName` is the expression used within this node's container for any exported references.
-            var exportName = getExportName(node);
+            var exportName = ts.hasModifier(node, 1 /* Export */)
+                ? ts.getExternalModuleOrNamespaceExportName(currentNamespaceContainerName, node, /*allowComments*/ false, /*allowSourceMaps*/ true)
+                : ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
             //  x || (x = {})
             //  exports.x || (exports.x = {})
             var moduleArg = ts.createLogicalOr(exportName, ts.createAssignment(exportName, ts.createObjectLiteral()));
-            if (ts.hasModifier(node, 1 /* Export */) && !isES6ExportedDeclaration(node)) {
+            if (hasNamespaceQualifiedExportName(node)) {
                 // `localName` is the expression used within this node's containing scope for any local references.
-                var localName = getLocalName(node);
+                var localName = ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
                 //  x = (exports.x || (exports.x = {}))
                 moduleArg = ts.createAssignment(localName, moduleArg);
             }
@@ -45177,13 +47159,16 @@ var ts;
             /*modifiers*/ undefined, 
             /*asteriskToken*/ undefined, 
             /*name*/ undefined, 
-            /*typeParameters*/ undefined, [ts.createParameter(parameterName)], 
+            /*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, parameterName)], 
             /*type*/ undefined, transformModuleBody(node, containerName)), 
             /*typeArguments*/ undefined, [moduleArg]), 
             /*location*/ node);
             ts.setOriginalNode(moduleStatement, node);
             ts.setEmitFlags(moduleStatement, emitFlags);
             statements.push(moduleStatement);
+            // Add a DeclarationMarker for the namespace to preserve trailing comments and mark
+            // the end of the declaration.
+            statements.push(ts.createEndOfDeclarationMarker(node));
             return statements;
         }
         /**
@@ -45203,7 +47188,7 @@ var ts;
             var statementsLocation;
             var blockLocation;
             var body = node.body;
-            if (body.kind === 227 /* ModuleBlock */) {
+            if (body.kind === 231 /* ModuleBlock */) {
                 ts.addRange(statements, ts.visitNodes(body.statements, namespaceElementVisitor, ts.isStatement));
                 statementsLocation = body.statements;
                 blockLocation = body;
@@ -45249,13 +47234,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 !== 227 /* ModuleBlock */) {
+            if (body.kind !== 231 /* ModuleBlock */) {
                 ts.setEmitFlags(block, ts.getEmitFlags(block) | 49152 /* NoComments */);
             }
             return block;
         }
         function getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration) {
-            if (moduleDeclaration.body.kind === 226 /* ModuleDeclaration */) {
+            if (moduleDeclaration.body.kind === 230 /* ModuleDeclaration */) {
                 var recursiveInnerModule = getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration.body);
                 return recursiveInnerModule || moduleDeclaration.body;
             }
@@ -45296,7 +47281,7 @@ var ts;
          * @param node The named import bindings node.
          */
         function visitNamedImportBindings(node) {
-            if (node.kind === 233 /* NamespaceImport */) {
+            if (node.kind === 237 /* NamespaceImport */) {
                 // Elide a namespace import if it is not referenced.
                 return resolver.isReferencedAliasDeclaration(node) ? node : undefined;
             }
@@ -45403,9 +47388,9 @@ var ts;
             if (isNamedExternalModuleExport(node) || !isNamespaceExport(node)) {
                 //  export var ${name} = ${moduleReference};
                 //  var ${name} = ${moduleReference};
-                return ts.setOriginalNode(ts.createVariableStatement(ts.visitNodes(node.modifiers, visitor, ts.isModifier), ts.createVariableDeclarationList([
-                    ts.createVariableDeclaration(node.name, 
-                    /*type*/ undefined, moduleReference)
+                return ts.setOriginalNode(ts.createVariableStatement(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), ts.createVariableDeclarationList([
+                    ts.setOriginalNode(ts.createVariableDeclaration(node.name, 
+                    /*type*/ undefined, moduleReference), node)
                 ]), node), node);
             }
             else {
@@ -45454,38 +47439,20 @@ var ts;
             return ts.createStatement(expression, /*location*/ undefined);
         }
         function addExportMemberAssignment(statements, node) {
-            var expression = ts.createAssignment(getExportName(node), getLocalName(node, /*noSourceMaps*/ true));
+            var expression = ts.createAssignment(ts.getExternalModuleOrNamespaceExportName(currentNamespaceContainerName, node, /*allowComments*/ false, /*allowSourceMaps*/ true), ts.getLocalName(node));
             ts.setSourceMapRange(expression, ts.createRange(node.name.pos, node.end));
             var statement = ts.createStatement(expression);
             ts.setSourceMapRange(statement, ts.createRange(-1, node.end));
             statements.push(statement);
         }
         function createNamespaceExport(exportName, exportValue, location) {
-            return ts.createStatement(ts.createAssignment(getNamespaceMemberName(exportName, /*allowComments*/ false, /*allowSourceMaps*/ true), exportValue), location);
+            return ts.createStatement(ts.createAssignment(ts.getNamespaceMemberName(currentNamespaceContainerName, exportName, /*allowComments*/ false, /*allowSourceMaps*/ true), exportValue), location);
         }
-        function createExternalModuleExport(exportName) {
-            return ts.createExportDeclaration(
-            /*decorators*/ undefined, 
-            /*modifiers*/ undefined, ts.createNamedExports([
-                ts.createExportSpecifier(exportName)
-            ]));
-        }
-        function getNamespaceMemberName(name, allowComments, allowSourceMaps) {
-            var qualifiedName = ts.createPropertyAccess(currentNamespaceContainerName, ts.getSynthesizedClone(name), /*location*/ name);
-            var emitFlags;
-            if (!allowComments) {
-                emitFlags |= 49152 /* NoComments */;
-            }
-            if (!allowSourceMaps) {
-                emitFlags |= 1536 /* NoSourceMap */;
-            }
-            if (emitFlags) {
-                ts.setEmitFlags(qualifiedName, emitFlags);
-            }
-            return qualifiedName;
+        function createNamespaceExportExpression(exportName, exportValue, location) {
+            return ts.createAssignment(getNamespaceMemberNameWithSourceMapsAndWithoutComments(exportName), exportValue, location);
         }
         function getNamespaceMemberNameWithSourceMapsAndWithoutComments(name) {
-            return getNamespaceMemberName(name, /*allowComments*/ false, /*allowSourceMaps*/ true);
+            return ts.getNamespaceMemberName(currentNamespaceContainerName, name, /*allowComments*/ false, /*allowSourceMaps*/ true);
         }
         /**
          * Gets the declaration name used inside of a namespace or enum.
@@ -45503,67 +47470,25 @@ var ts;
             return ts.getGeneratedNameForNode(node);
         }
         /**
-         * Gets the local name for a declaration for use in expressions.
-         *
-         * A local name will *never* be prefixed with an module or namespace export modifier like
-         * "exports.".
-         *
-         * @param node The declaration.
-         * @param noSourceMaps A value indicating whether source maps may not be emitted for the name.
-         * @param allowComments A value indicating whether comments may be emitted for the name.
+         * Gets a local alias for a class declaration if it is a decorated class with an internal
+         * reference to the static side of the class. This is necessary to avoid issues with
+         * double-binding semantics for the class name.
          */
-        function getLocalName(node, noSourceMaps, allowComments) {
-            return getDeclarationName(node, allowComments, !noSourceMaps, 262144 /* LocalName */);
-        }
-        /**
-         * Gets the export name for a declaration for use in expressions.
-         *
-         * An export name will *always* be prefixed with an module or namespace export modifier
-         * like "exports." if one is required.
-         *
-         * @param node The declaration.
-         * @param noSourceMaps A value indicating whether source maps may not be emitted for the name.
-         * @param allowComments A value indicating whether comments may be emitted for the name.
-         */
-        function getExportName(node, noSourceMaps, allowComments) {
-            if (isNamespaceExport(node)) {
-                return getNamespaceMemberName(getDeclarationName(node), allowComments, !noSourceMaps);
-            }
-            return getDeclarationName(node, allowComments, !noSourceMaps, 131072 /* ExportName */);
-        }
-        /**
-         * Gets the name for a declaration for use in declarations.
-         *
-         * @param node The declaration.
-         * @param allowComments A value indicating whether comments may be emitted for the name.
-         * @param allowSourceMaps A value indicating whether source maps may be emitted for the name.
-         * @param emitFlags Additional NodeEmitFlags to specify for the name.
-         */
-        function getDeclarationName(node, allowComments, allowSourceMaps, emitFlags) {
-            if (node.name) {
-                var name_29 = ts.getMutableClone(node.name);
-                emitFlags |= ts.getEmitFlags(node.name);
-                if (!allowSourceMaps) {
-                    emitFlags |= 1536 /* NoSourceMap */;
-                }
-                if (!allowComments) {
-                    emitFlags |= 49152 /* NoComments */;
-                }
-                if (emitFlags) {
-                    ts.setEmitFlags(name_29, emitFlags);
-                }
-                return name_29;
-            }
-            else {
-                return ts.getGeneratedNameForNode(node);
+        function getClassAliasIfNeeded(node) {
+            if (resolver.getNodeCheckFlags(node) & 8388608 /* ClassWithConstructorReference */) {
+                enableSubstitutionForClassAliases();
+                var classAlias = ts.createUniqueName(node.name && !ts.isGeneratedIdentifier(node.name) ? node.name.text : "default");
+                classAliases[ts.getOriginalNodeId(node)] = classAlias;
+                hoistVariableDeclaration(classAlias);
+                return classAlias;
             }
         }
         function getClassPrototype(node) {
-            return ts.createPropertyAccess(getDeclarationName(node), "prototype");
+            return ts.createPropertyAccess(ts.getDeclarationName(node), "prototype");
         }
         function getClassMemberPrefix(node, member) {
             return ts.hasModifier(member, 32 /* Static */)
-                ? getDeclarationName(node)
+                ? ts.getDeclarationName(node)
                 : getClassPrototype(node);
         }
         function enableSubstitutionForNonQualifiedEnumMembers() {
@@ -45588,20 +47513,21 @@ var ts;
                 // 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(70 /* Identifier */);
-                context.enableSubstitution(254 /* ShorthandPropertyAssignment */);
+                context.enableSubstitution(258 /* ShorthandPropertyAssignment */);
                 // We need to be notified when entering and exiting namespaces.
-                context.enableEmitNotification(226 /* ModuleDeclaration */);
+                context.enableEmitNotification(230 /* ModuleDeclaration */);
             }
         }
         function isTransformedModuleDeclaration(node) {
-            return ts.getOriginalNode(node).kind === 226 /* ModuleDeclaration */;
+            return ts.getOriginalNode(node).kind === 230 /* ModuleDeclaration */;
         }
         function isTransformedEnumDeclaration(node) {
-            return ts.getOriginalNode(node).kind === 225 /* EnumDeclaration */;
+            return ts.getOriginalNode(node).kind === 229 /* EnumDeclaration */;
         }
         /**
          * Hook for node emit.
          *
+         * @param emitContext A context hint for the emitter.
          * @param node The node to emit.
          * @param emit A callback used to emit the node in the printer.
          */
@@ -45619,9 +47545,8 @@ var ts;
         /**
          * Hooks node substitutions.
          *
+         * @param emitContext A context hint for the emitter.
          * @param node The node to substitute.
-         * @param isExpression A value indicating whether the node is to be used in an expression
-         *                     position.
          */
         function onSubstituteNode(emitContext, node) {
             node = previousOnSubstituteNode(emitContext, node);
@@ -45635,16 +47560,16 @@ var ts;
         }
         function substituteShorthandPropertyAssignment(node) {
             if (enabledSubstitutions & 2 /* NamespaceExports */) {
-                var name_30 = node.name;
-                var exportedName = trySubstituteNamespaceExportedName(name_30);
+                var name_33 = node.name;
+                var exportedName = trySubstituteNamespaceExportedName(name_33);
                 if (exportedName) {
                     // A shorthand property with an assignment initializer is probably part of a
                     // destructuring assignment
                     if (node.objectAssignmentInitializer) {
                         var initializer = ts.createAssignment(exportedName, node.objectAssignmentInitializer);
-                        return ts.createPropertyAssignment(name_30, initializer, /*location*/ node);
+                        return ts.createPropertyAssignment(name_33, initializer, /*location*/ node);
                     }
-                    return ts.createPropertyAssignment(name_30, exportedName, /*location*/ node);
+                    return ts.createPropertyAssignment(name_33, exportedName, /*location*/ node);
                 }
             }
             return node;
@@ -45653,9 +47578,9 @@ var ts;
             switch (node.kind) {
                 case 70 /* Identifier */:
                     return substituteExpressionIdentifier(node);
-                case 173 /* PropertyAccessExpression */:
+                case 177 /* PropertyAccessExpression */:
                     return substitutePropertyAccessExpression(node);
-                case 174 /* ElementAccessExpression */:
+                case 178 /* ElementAccessExpression */:
                     return substituteElementAccessExpression(node);
             }
             return node;
@@ -45689,13 +47614,13 @@ var ts;
         }
         function trySubstituteNamespaceExportedName(node) {
             // If this is explicitly a local name, do not substitute.
-            if (enabledSubstitutions & applicableSubstitutions && (ts.getEmitFlags(node) & 262144 /* LocalName */) === 0) {
+            if (enabledSubstitutions & applicableSubstitutions && !ts.isLocalName(node)) {
                 // 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) {
-                    var substitute = (applicableSubstitutions & 2 /* NamespaceExports */ && container.kind === 226 /* ModuleDeclaration */) ||
-                        (applicableSubstitutions & 8 /* NonQualifiedEnumMembers */ && container.kind === 225 /* EnumDeclaration */);
+                if (container && container.kind !== 261 /* SourceFile */) {
+                    var substitute = (applicableSubstitutions & 2 /* NamespaceExports */ && container.kind === 230 /* ModuleDeclaration */) ||
+                        (applicableSubstitutions & 8 /* NonQualifiedEnumMembers */ && container.kind === 229 /* EnumDeclaration */);
                     if (substitute) {
                         return ts.createPropertyAccess(ts.getGeneratedNameForNode(container), node, /*location*/ node);
                     }
@@ -45774,11 +47699,11 @@ var ts;
         }
         function visitorWorker(node) {
             switch (node.kind) {
-                case 242 /* JsxElement */:
+                case 246 /* JsxElement */:
                     return visitJsxElement(node, /*isChild*/ false);
-                case 243 /* JsxSelfClosingElement */:
+                case 247 /* JsxSelfClosingElement */:
                     return visitJsxSelfClosingElement(node, /*isChild*/ false);
-                case 248 /* JsxExpression */:
+                case 252 /* JsxExpression */:
                     return visitJsxExpression(node);
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -45789,11 +47714,11 @@ var ts;
             switch (node.kind) {
                 case 10 /* JsxText */:
                     return visitJsxText(node);
-                case 248 /* JsxExpression */:
+                case 252 /* JsxExpression */:
                     return visitJsxExpression(node);
-                case 242 /* JsxElement */:
+                case 246 /* JsxElement */:
                     return visitJsxElement(node, /*isChild*/ true);
-                case 243 /* JsxSelfClosingElement */:
+                case 247 /* JsxSelfClosingElement */:
                     return visitJsxSelfClosingElement(node, /*isChild*/ true);
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -45830,7 +47755,7 @@ var ts;
                 objectProperties = ts.singleOrUndefined(segments)
                     || ts.createAssignHelper(currentSourceFile.externalHelpersModuleName, segments);
             }
-            var element = ts.createReactCreateElement(compilerOptions.reactNamespace, tagName, objectProperties, ts.filter(ts.map(children, transformJsxChildToExpression), ts.isDefined), node, location);
+            var element = ts.createExpressionForJsxElement(context.getEmitResolver().getJsxFactoryEntity(), compilerOptions.reactNamespace, tagName, objectProperties, ts.filter(ts.map(children, transformJsxChildToExpression), ts.isDefined), node, location);
             if (isChild) {
                 ts.startOnNewLine(element);
             }
@@ -45852,7 +47777,7 @@ var ts;
                 var decoded = tryDecodeEntities(node.text);
                 return decoded ? ts.createLiteral(decoded, /*location*/ node) : node;
             }
-            else if (node.kind === 248 /* JsxExpression */) {
+            else if (node.kind === 252 /* JsxExpression */) {
                 return visitJsxExpression(node);
             }
             else {
@@ -45934,16 +47859,16 @@ var ts;
             return decoded === text ? undefined : decoded;
         }
         function getTagName(node) {
-            if (node.kind === 242 /* JsxElement */) {
+            if (node.kind === 246 /* JsxElement */) {
                 return getTagName(node.openingElement);
             }
             else {
-                var name_31 = node.tagName;
-                if (ts.isIdentifier(name_31) && ts.isIntrinsicJsxName(name_31.text)) {
-                    return ts.createLiteral(name_31.text);
+                var name_34 = node.tagName;
+                if (ts.isIdentifier(name_34) && ts.isIntrinsicJsxName(name_34.text)) {
+                    return ts.createLiteral(name_34.text);
                 }
                 else {
-                    return ts.createExpressionFromEntityName(name_31);
+                    return ts.createExpressionFromEntityName(name_34);
                 }
             }
         }
@@ -46228,6 +48153,232 @@ var ts;
 /// <reference path="../visitor.ts" />
 /*@internal*/
 var ts;
+(function (ts) {
+    function transformESNext(context) {
+        var hoistVariableDeclaration = context.hoistVariableDeclaration;
+        var currentSourceFile;
+        return transformSourceFile;
+        function transformSourceFile(node) {
+            currentSourceFile = node;
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function visitor(node) {
+            if (node.transformFlags & 16 /* ESNext */) {
+                return visitorWorker(node);
+            }
+            else if (node.transformFlags & 32 /* ContainsESNext */) {
+                return ts.visitEachChild(node, visitor, context);
+            }
+            else {
+                return node;
+            }
+        }
+        function visitorWorker(node) {
+            switch (node.kind) {
+                case 176 /* ObjectLiteralExpression */:
+                    return visitObjectLiteralExpression(node);
+                case 192 /* BinaryExpression */:
+                    return visitBinaryExpression(node);
+                case 223 /* VariableDeclaration */:
+                    return visitVariableDeclaration(node);
+                case 213 /* ForOfStatement */:
+                    return visitForOfStatement(node);
+                case 172 /* ObjectBindingPattern */:
+                case 173 /* ArrayBindingPattern */:
+                    return node;
+                case 225 /* FunctionDeclaration */:
+                    return visitFunctionDeclaration(node);
+                case 184 /* FunctionExpression */:
+                    return visitFunctionExpression(node);
+                case 185 /* ArrowFunction */:
+                    return visitArrowFunction(node);
+                case 144 /* Parameter */:
+                    return visitParameter(node);
+                default:
+                    ts.Debug.failBadSyntaxKind(node);
+                    return ts.visitEachChild(node, visitor, context);
+            }
+        }
+        function chunkObjectLiteralElements(elements) {
+            var chunkObject;
+            var objects = [];
+            for (var _i = 0, elements_3 = elements; _i < elements_3.length; _i++) {
+                var e = elements_3[_i];
+                if (e.kind === 259 /* SpreadAssignment */) {
+                    if (chunkObject) {
+                        objects.push(ts.createObjectLiteral(chunkObject));
+                        chunkObject = undefined;
+                    }
+                    var target = e.expression;
+                    objects.push(ts.visitNode(target, visitor, ts.isExpression));
+                }
+                else {
+                    if (!chunkObject) {
+                        chunkObject = [];
+                    }
+                    if (e.kind === 257 /* PropertyAssignment */) {
+                        var p = e;
+                        chunkObject.push(ts.createPropertyAssignment(p.name, ts.visitNode(p.initializer, visitor, ts.isExpression)));
+                    }
+                    else {
+                        chunkObject.push(e);
+                    }
+                }
+            }
+            if (chunkObject) {
+                objects.push(ts.createObjectLiteral(chunkObject));
+            }
+            return objects;
+        }
+        function visitObjectLiteralExpression(node) {
+            // 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});
+            // If the first element is a spread element, then the first argument to __assign is {}:
+            //     { ...o, a, b, ...o2 } => __assign({}, o, {a, b}, o2)
+            var objects = chunkObjectLiteralElements(node.properties);
+            if (objects.length && objects[0].kind !== 176 /* ObjectLiteralExpression */) {
+                objects.unshift(ts.createObjectLiteral());
+            }
+            return ts.createCall(ts.createIdentifier("__assign"), undefined, objects);
+        }
+        /**
+         * Visits a BinaryExpression that contains a destructuring assignment.
+         *
+         * @param node A BinaryExpression node.
+         */
+        function visitBinaryExpression(node) {
+            if (ts.isDestructuringAssignment(node) && node.left.transformFlags & 48 /* AssertESNext */) {
+                return ts.flattenDestructuringAssignment(context, node, /*needsDestructuringValue*/ true, hoistVariableDeclaration, visitor, /*transformRest*/ true);
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        /**
+         * Visits a VariableDeclaration node with a binding pattern.
+         *
+         * @param node A VariableDeclaration node.
+         */
+        function visitVariableDeclaration(node) {
+            // If we are here it is because the name contains a binding pattern with a rest somewhere in it.
+            if (ts.isBindingPattern(node.name) && node.name.transformFlags & 48 /* AssertESNext */) {
+                var result = ts.flattenVariableDestructuring(node, /*value*/ undefined, visitor, /*recordTempVariable*/ undefined, /*transformRest*/ true);
+                return result;
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        /**
+         * Visits a ForOfStatement and converts it into a ES2015-compatible ForOfStatement.
+         *
+         * @param node A ForOfStatement.
+         */
+        function visitForOfStatement(node) {
+            // The following ESNext code:
+            //
+            //    for (let { x, y, ...rest } of expr) { }
+            //
+            // should be emitted as
+            //
+            //    for (var _a of expr) {
+            //        let { x, y } = _a, rest = __rest(_a, ["x", "y"]);
+            //    }
+            //
+            // where _a is a temp emitted to capture the RHS.
+            // When the left hand side is an expression instead of a let declaration,
+            // the `let` before the `{ x, y }` is not emitted.
+            // When the left hand side is a let/const, the v is renamed if there is
+            // another v in scope.
+            // Note that all assignments to the LHS are emitted in the body, including
+            // all destructuring.
+            // Note also that because an extra statement is needed to assign to the LHS,
+            // for-of bodies are always emitted as blocks.
+            // for (<init> of <expression>) <statement>
+            // where <init> is [let] variabledeclarationlist | expression
+            var initializer = node.initializer;
+            if (!isRestBindingPattern(initializer) && !isRestAssignment(initializer)) {
+                return ts.visitEachChild(node, visitor, context);
+            }
+            return ts.convertForOf(node, undefined, visitor, ts.noop, context, /*transformRest*/ true);
+        }
+        function isRestBindingPattern(initializer) {
+            if (ts.isVariableDeclarationList(initializer)) {
+                var declaration = ts.firstOrUndefined(initializer.declarations);
+                return declaration && declaration.name &&
+                    declaration.name.kind === 172 /* ObjectBindingPattern */ &&
+                    !!(declaration.name.transformFlags & 8388608 /* ContainsSpreadExpression */);
+            }
+            return false;
+        }
+        function isRestAssignment(initializer) {
+            return initializer.kind === 176 /* ObjectLiteralExpression */ &&
+                initializer.transformFlags & 8388608 /* ContainsSpreadExpression */;
+        }
+        function visitParameter(node) {
+            if (isObjectRestParameter(node)) {
+                // Binding patterns are converted into a generated name and are
+                // evaluated inside the function body.
+                return ts.setOriginalNode(ts.createParameter(
+                /*decorators*/ undefined, 
+                /*modifiers*/ undefined, 
+                /*dotDotDotToken*/ undefined, ts.getGeneratedNameForNode(node), 
+                /*questionToken*/ undefined, 
+                /*type*/ undefined, node.initializer, 
+                /*location*/ node), 
+                /*original*/ node);
+            }
+            else {
+                return node;
+            }
+        }
+        function isObjectRestParameter(node) {
+            return node.name &&
+                node.name.kind === 172 /* ObjectBindingPattern */ &&
+                !!(node.name.transformFlags & 8388608 /* ContainsSpreadExpression */);
+        }
+        function visitFunctionDeclaration(node) {
+            var hasRest = ts.forEach(node.parameters, isObjectRestParameter);
+            var body = hasRest ?
+                ts.transformFunctionBody(node, visitor, currentSourceFile, context, ts.noop, /*convertObjectRest*/ true) :
+                ts.visitEachChild(node.body, visitor, context);
+            return ts.setOriginalNode(ts.createFunctionDeclaration(
+            /*decorators*/ undefined, node.modifiers, node.asteriskToken, node.name, 
+            /*typeParameters*/ undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), 
+            /*type*/ undefined, body, 
+            /*location*/ node), 
+            /*original*/ node);
+        }
+        function visitArrowFunction(node) {
+            var hasRest = ts.forEach(node.parameters, isObjectRestParameter);
+            var body = hasRest ?
+                ts.transformFunctionBody(node, visitor, currentSourceFile, context, ts.noop, /*convertObjectRest*/ true) :
+                ts.visitEachChild(node.body, visitor, context);
+            var func = ts.setOriginalNode(ts.createArrowFunction(
+            /*modifiers*/ undefined, 
+            /*typeParameters*/ undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), 
+            /*type*/ undefined, node.equalsGreaterThanToken, body, 
+            /*location*/ node), 
+            /*original*/ node);
+            ts.setEmitFlags(func, 256 /* CapturesThis */);
+            return func;
+        }
+        function visitFunctionExpression(node) {
+            var hasRest = ts.forEach(node.parameters, isObjectRestParameter);
+            var body = hasRest ?
+                ts.transformFunctionBody(node, visitor, currentSourceFile, context, ts.noop, /*convertObjectRest*/ true) :
+                ts.visitEachChild(node.body, visitor, context);
+            return ts.setOriginalNode(ts.createFunctionExpression(
+            /*modifiers*/ undefined, node.asteriskToken, name, 
+            /*typeParameters*/ undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), 
+            /*type*/ undefined, body, 
+            /*location*/ node), 
+            /*original*/ node);
+        }
+    }
+    ts.transformESNext = transformESNext;
+})(ts || (ts = {}));
+/// <reference path="../factory.ts" />
+/// <reference path="../visitor.ts" />
+/*@internal*/
+var ts;
 (function (ts) {
     function transformES2017(context) {
         var ES2017SubstitutionFlags;
@@ -46272,10 +48423,10 @@ var ts;
             return ts.visitEachChild(node, visitor, context);
         }
         function visitor(node) {
-            if (node.transformFlags & 16 /* ES2017 */) {
+            if (node.transformFlags & 64 /* ES2017 */) {
                 return visitorWorker(node);
             }
-            else if (node.transformFlags & 32 /* ContainsES2017 */) {
+            else if (node.transformFlags & 128 /* ContainsES2017 */) {
                 return ts.visitEachChild(node, visitor, context);
             }
             return node;
@@ -46285,19 +48436,19 @@ var ts;
                 case 119 /* AsyncKeyword */:
                     // ES2017 async modifier should be elided for targets < ES2017
                     return undefined;
-                case 185 /* AwaitExpression */:
+                case 189 /* AwaitExpression */:
                     // ES2017 'await' expressions must be transformed for targets < ES2017.
                     return visitAwaitExpression(node);
-                case 148 /* MethodDeclaration */:
+                case 149 /* MethodDeclaration */:
                     // ES2017 method declarations may be 'async'
                     return visitMethodDeclaration(node);
-                case 221 /* FunctionDeclaration */:
+                case 225 /* FunctionDeclaration */:
                     // ES2017 function declarations may be 'async'
                     return visitFunctionDeclaration(node);
-                case 180 /* FunctionExpression */:
+                case 184 /* FunctionExpression */:
                     // ES2017 function expressions may be 'async'
                     return visitFunctionExpression(node);
-                case 181 /* ArrowFunction */:
+                case 185 /* ArrowFunction */:
                     // ES2017 arrow functions may be 'async'
                     return visitArrowFunction(node);
                 default:
@@ -46418,9 +48569,10 @@ var ts;
             return ts.mergeFunctionBodyLexicalEnvironment(visited, declarations);
         }
         function transformAsyncFunctionBody(node) {
-            var nodeType = node.original ? node.original.type : node.type;
+            var original = ts.getOriginalNode(node, ts.isFunctionLike);
+            var nodeType = original.type;
             var promiseConstructor = languageVersion < 2 /* ES2015 */ ? getPromiseConstructor(nodeType) : undefined;
-            var isArrowFunction = node.kind === 181 /* ArrowFunction */;
+            var isArrowFunction = node.kind === 185 /* 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
@@ -46470,12 +48622,14 @@ var ts;
             }
         }
         function getPromiseConstructor(type) {
-            var typeName = ts.getEntityNameFromTypeNode(type);
-            if (typeName && ts.isEntityName(typeName)) {
-                var serializationKind = resolver.getTypeReferenceSerializationKind(typeName);
-                if (serializationKind === ts.TypeReferenceSerializationKind.TypeWithConstructSignatureAndValue
-                    || serializationKind === ts.TypeReferenceSerializationKind.Unknown) {
-                    return typeName;
+            if (type) {
+                var typeName = ts.getEntityNameFromTypeNode(type);
+                if (typeName && ts.isEntityName(typeName)) {
+                    var serializationKind = resolver.getTypeReferenceSerializationKind(typeName);
+                    if (serializationKind === ts.TypeReferenceSerializationKind.TypeWithConstructSignatureAndValue
+                        || serializationKind === ts.TypeReferenceSerializationKind.Unknown) {
+                        return typeName;
+                    }
                 }
             }
             return undefined;
@@ -46485,24 +48639,24 @@ 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(175 /* CallExpression */);
-                context.enableSubstitution(173 /* PropertyAccessExpression */);
-                context.enableSubstitution(174 /* ElementAccessExpression */);
+                context.enableSubstitution(179 /* CallExpression */);
+                context.enableSubstitution(177 /* PropertyAccessExpression */);
+                context.enableSubstitution(178 /* ElementAccessExpression */);
                 // We need to be notified when entering and exiting declarations that bind super.
-                context.enableEmitNotification(222 /* ClassDeclaration */);
-                context.enableEmitNotification(148 /* MethodDeclaration */);
-                context.enableEmitNotification(150 /* GetAccessor */);
-                context.enableEmitNotification(151 /* SetAccessor */);
-                context.enableEmitNotification(149 /* Constructor */);
+                context.enableEmitNotification(226 /* ClassDeclaration */);
+                context.enableEmitNotification(149 /* MethodDeclaration */);
+                context.enableEmitNotification(151 /* GetAccessor */);
+                context.enableEmitNotification(152 /* SetAccessor */);
+                context.enableEmitNotification(150 /* Constructor */);
             }
         }
         function substituteExpression(node) {
             switch (node.kind) {
-                case 173 /* PropertyAccessExpression */:
+                case 177 /* PropertyAccessExpression */:
                     return substitutePropertyAccessExpression(node);
-                case 174 /* ElementAccessExpression */:
+                case 178 /* ElementAccessExpression */:
                     return substituteElementAccessExpression(node);
-                case 175 /* CallExpression */:
+                case 179 /* CallExpression */:
                     if (enabledSubstitutions & 1 /* AsyncMethodsWithSuper */) {
                         return substituteCallExpression(node);
                     }
@@ -46546,11 +48700,11 @@ var ts;
         }
         function isSuperContainer(node) {
             var kind = node.kind;
-            return kind === 222 /* ClassDeclaration */
-                || kind === 149 /* Constructor */
-                || kind === 148 /* MethodDeclaration */
-                || kind === 150 /* GetAccessor */
-                || kind === 151 /* SetAccessor */;
+            return kind === 226 /* ClassDeclaration */
+                || kind === 150 /* Constructor */
+                || kind === 149 /* MethodDeclaration */
+                || kind === 151 /* GetAccessor */
+                || kind === 152 /* SetAccessor */;
         }
         /**
          * Hook for node emit.
@@ -46616,10 +48770,10 @@ var ts;
             return ts.visitEachChild(node, visitor, context);
         }
         function visitor(node) {
-            if (node.transformFlags & 64 /* ES2016 */) {
+            if (node.transformFlags & 256 /* ES2016 */) {
                 return visitorWorker(node);
             }
-            else if (node.transformFlags & 128 /* ContainsES2016 */) {
+            else if (node.transformFlags & 512 /* ContainsES2016 */) {
                 return ts.visitEachChild(node, visitor, context);
             }
             else {
@@ -46628,7 +48782,7 @@ var ts;
         }
         function visitorWorker(node) {
             switch (node.kind) {
-                case 188 /* BinaryExpression */:
+                case 192 /* BinaryExpression */:
                     return visitBinaryExpression(node);
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -46742,6 +48896,7 @@ var ts;
         var enclosingFunction;
         var enclosingNonArrowFunction;
         var enclosingNonAsyncFunctionBody;
+        var isInConstructorWithCapturedSuper;
         /**
          * Used to track if we are emitting body of the converted loop
          */
@@ -46779,12 +48934,15 @@ var ts;
             var savedCurrentParent = currentParent;
             var savedCurrentNode = currentNode;
             var savedConvertedLoopState = convertedLoopState;
+            var savedIsInConstructorWithCapturedSuper = isInConstructorWithCapturedSuper;
             if (ts.nodeStartsNewLexicalEnvironment(node)) {
-                // don't treat content of nodes that start new lexical environment as part of converted loop copy
+                // don't treat content of nodes that start new lexical environment as part of converted loop copy or constructor body
+                isInConstructorWithCapturedSuper = false;
                 convertedLoopState = undefined;
             }
             onBeforeVisitNode(node);
             var visited = f(node);
+            isInConstructorWithCapturedSuper = savedIsInConstructorWithCapturedSuper;
             convertedLoopState = savedConvertedLoopState;
             enclosingFunction = savedEnclosingFunction;
             enclosingNonArrowFunction = savedEnclosingNonArrowFunction;
@@ -46796,16 +48954,28 @@ var ts;
             currentNode = savedCurrentNode;
             return visited;
         }
+        function returnCapturedThis(node) {
+            return ts.setOriginalNode(ts.createReturn(ts.createIdentifier("_this")), node);
+        }
+        function isReturnVoidStatementInConstructorWithCapturedSuper(node) {
+            return isInConstructorWithCapturedSuper && node.kind === 216 /* ReturnStatement */ && !node.expression;
+        }
         function shouldCheckNode(node) {
-            return (node.transformFlags & 256 /* ES2015 */) !== 0 ||
-                node.kind === 215 /* LabeledStatement */ ||
+            return (node.transformFlags & 1024 /* ES2015 */) !== 0 ||
+                node.kind === 219 /* LabeledStatement */ ||
                 (ts.isIterationStatement(node, /*lookInLabeledStatements*/ false) && shouldConvertIterationStatementBody(node));
         }
         function visitorWorker(node) {
-            if (shouldCheckNode(node)) {
+            if (isReturnVoidStatementInConstructorWithCapturedSuper(node)) {
+                return returnCapturedThis(node);
+            }
+            else if (shouldCheckNode(node)) {
                 return visitJavaScript(node);
             }
-            else if (node.transformFlags & 512 /* ContainsES2015 */) {
+            else if (node.transformFlags & 2048 /* ContainsES2015 */ || (isInConstructorWithCapturedSuper && !ts.isExpression(node))) {
+                // we want to dive in this branch either if node has children with ES2015 specific syntax
+                // or we are inside constructor that captures result of the super call so all returns without expression should be
+                // rewritten. Note: we skip expressions since returns should never appear there 
                 return ts.visitEachChild(node, visitor, context);
             }
             else {
@@ -46824,14 +48994,15 @@ var ts;
         }
         function visitNodesInConvertedLoop(node) {
             switch (node.kind) {
-                case 212 /* ReturnStatement */:
+                case 216 /* ReturnStatement */:
+                    node = isReturnVoidStatementInConstructorWithCapturedSuper(node) ? returnCapturedThis(node) : node;
                     return visitReturnStatement(node);
-                case 201 /* VariableStatement */:
+                case 205 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 214 /* SwitchStatement */:
+                case 218 /* SwitchStatement */:
                     return visitSwitchStatement(node);
-                case 211 /* BreakStatement */:
-                case 210 /* ContinueStatement */:
+                case 215 /* BreakStatement */:
+                case 214 /* ContinueStatement */:
                     return visitBreakOrContinueStatement(node);
                 case 98 /* ThisKeyword */:
                     return visitThisKeyword(node);
@@ -46843,75 +49014,77 @@ var ts;
         }
         function visitJavaScript(node) {
             switch (node.kind) {
-                case 83 /* ExportKeyword */:
-                    return node;
-                case 222 /* ClassDeclaration */:
+                case 114 /* StaticKeyword */:
+                    return undefined; // elide static keyword
+                case 226 /* ClassDeclaration */:
                     return visitClassDeclaration(node);
-                case 193 /* ClassExpression */:
+                case 197 /* ClassExpression */:
                     return visitClassExpression(node);
-                case 143 /* Parameter */:
+                case 144 /* Parameter */:
                     return visitParameter(node);
-                case 221 /* FunctionDeclaration */:
+                case 225 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 181 /* ArrowFunction */:
+                case 185 /* ArrowFunction */:
                     return visitArrowFunction(node);
-                case 180 /* FunctionExpression */:
+                case 184 /* FunctionExpression */:
                     return visitFunctionExpression(node);
-                case 219 /* VariableDeclaration */:
+                case 223 /* VariableDeclaration */:
                     return visitVariableDeclaration(node);
                 case 70 /* Identifier */:
                     return visitIdentifier(node);
-                case 220 /* VariableDeclarationList */:
+                case 224 /* VariableDeclarationList */:
                     return visitVariableDeclarationList(node);
-                case 215 /* LabeledStatement */:
+                case 219 /* LabeledStatement */:
                     return visitLabeledStatement(node);
-                case 205 /* DoStatement */:
+                case 209 /* DoStatement */:
                     return visitDoStatement(node);
-                case 206 /* WhileStatement */:
+                case 210 /* WhileStatement */:
                     return visitWhileStatement(node);
-                case 207 /* ForStatement */:
+                case 211 /* ForStatement */:
                     return visitForStatement(node);
-                case 208 /* ForInStatement */:
+                case 212 /* ForInStatement */:
                     return visitForInStatement(node);
-                case 209 /* ForOfStatement */:
+                case 213 /* ForOfStatement */:
                     return visitForOfStatement(node);
-                case 203 /* ExpressionStatement */:
+                case 207 /* ExpressionStatement */:
                     return visitExpressionStatement(node);
-                case 172 /* ObjectLiteralExpression */:
+                case 176 /* ObjectLiteralExpression */:
                     return visitObjectLiteralExpression(node);
-                case 254 /* ShorthandPropertyAssignment */:
+                case 256 /* CatchClause */:
+                    return visitCatchClause(node);
+                case 258 /* ShorthandPropertyAssignment */:
                     return visitShorthandPropertyAssignment(node);
-                case 171 /* ArrayLiteralExpression */:
+                case 175 /* ArrayLiteralExpression */:
                     return visitArrayLiteralExpression(node);
-                case 175 /* CallExpression */:
+                case 179 /* CallExpression */:
                     return visitCallExpression(node);
-                case 176 /* NewExpression */:
+                case 180 /* NewExpression */:
                     return visitNewExpression(node);
-                case 179 /* ParenthesizedExpression */:
+                case 183 /* ParenthesizedExpression */:
                     return visitParenthesizedExpression(node, /*needsDestructuringValue*/ true);
-                case 188 /* BinaryExpression */:
+                case 192 /* BinaryExpression */:
                     return visitBinaryExpression(node, /*needsDestructuringValue*/ true);
                 case 12 /* NoSubstitutionTemplateLiteral */:
                 case 13 /* TemplateHead */:
                 case 14 /* TemplateMiddle */:
                 case 15 /* TemplateTail */:
                     return visitTemplateLiteral(node);
-                case 177 /* TaggedTemplateExpression */:
+                case 181 /* TaggedTemplateExpression */:
                     return visitTaggedTemplateExpression(node);
-                case 190 /* TemplateExpression */:
+                case 194 /* TemplateExpression */:
                     return visitTemplateExpression(node);
-                case 191 /* YieldExpression */:
+                case 195 /* YieldExpression */:
                     return visitYieldExpression(node);
                 case 96 /* SuperKeyword */:
                     return visitSuperKeyword();
-                case 191 /* YieldExpression */:
+                case 195 /* YieldExpression */:
                     // `yield` will be handled by a generators transform.
                     return ts.visitEachChild(node, visitor, context);
-                case 148 /* MethodDeclaration */:
+                case 149 /* MethodDeclaration */:
                     return visitMethodDeclaration(node);
-                case 256 /* SourceFile */:
+                case 261 /* SourceFile */:
                     return visitSourceFileNode(node);
-                case 201 /* VariableStatement */:
+                case 205 /* VariableStatement */:
                     return visitVariableStatement(node);
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -46926,7 +49099,7 @@ var ts;
                 }
                 if (ts.isFunctionLike(currentNode)) {
                     enclosingFunction = currentNode;
-                    if (currentNode.kind !== 181 /* ArrowFunction */) {
+                    if (currentNode.kind !== 185 /* ArrowFunction */) {
                         enclosingNonArrowFunction = currentNode;
                         if (!(ts.getEmitFlags(currentNode) & 2097152 /* AsyncFunctionBody */)) {
                             enclosingNonAsyncFunctionBody = currentNode;
@@ -46937,14 +49110,14 @@ var ts;
                 // variable statements, variable declarations, binding elements, and binding
                 // patterns.
                 switch (currentNode.kind) {
-                    case 201 /* VariableStatement */:
+                    case 205 /* VariableStatement */:
                         enclosingVariableStatement = currentNode;
                         break;
-                    case 220 /* VariableDeclarationList */:
-                    case 219 /* VariableDeclaration */:
-                    case 170 /* BindingElement */:
-                    case 168 /* ObjectBindingPattern */:
-                    case 169 /* ArrayBindingPattern */:
+                    case 224 /* VariableDeclarationList */:
+                    case 223 /* VariableDeclaration */:
+                    case 174 /* BindingElement */:
+                    case 172 /* ObjectBindingPattern */:
+                    case 173 /* ArrayBindingPattern */:
                         break;
                     default:
                         enclosingVariableStatement = undefined;
@@ -46973,7 +49146,7 @@ var ts;
         }
         function visitThisKeyword(node) {
             ts.Debug.assert(convertedLoopState !== undefined);
-            if (enclosingFunction && enclosingFunction.kind === 181 /* ArrowFunction */) {
+            if (enclosingFunction && enclosingFunction.kind === 185 /* ArrowFunction */) {
                 // if the enclosing function is an ArrowFunction is then we use the captured 'this' keyword.
                 convertedLoopState.containsLexicalThis = true;
                 return node;
@@ -46998,13 +49171,13 @@ 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 === 211 /* BreakStatement */ ? 2 /* Break */ : 4 /* Continue */;
+                var jump = node.kind === 215 /* BreakStatement */ ? 2 /* Break */ : 4 /* Continue */;
                 var canUseBreakOrContinue = (node.label && convertedLoopState.labels && convertedLoopState.labels[node.label.text]) ||
                     (!node.label && (convertedLoopState.allowedNonLabeledJumps & jump));
                 if (!canUseBreakOrContinue) {
                     var labelMarker = void 0;
                     if (!node.label) {
-                        if (node.kind === 211 /* BreakStatement */) {
+                        if (node.kind === 215 /* BreakStatement */) {
                             convertedLoopState.nonLocalJumps |= 2 /* Break */;
                             labelMarker = "break";
                         }
@@ -47015,7 +49188,7 @@ var ts;
                         }
                     }
                     else {
-                        if (node.kind === 211 /* BreakStatement */) {
+                        if (node.kind === 215 /* BreakStatement */) {
                             labelMarker = "break-" + node.label.text;
                             setLabeledJump(convertedLoopState, /*isBreak*/ true, node.label.text, labelMarker);
                         }
@@ -47059,33 +49232,29 @@ var ts;
             //          }
             //          return C;
             //      }());
-            var modifierFlags = ts.getModifierFlags(node);
-            var isExported = modifierFlags & 1 /* Export */;
-            var isDefault = modifierFlags & 512 /* Default */;
-            // Add an `export` modifier to the statement if needed (for `--target es5 --module es6`)
-            var modifiers = isExported && !isDefault
-                ? ts.filter(node.modifiers, isExportModifier)
-                : undefined;
-            var statement = ts.createVariableStatement(modifiers, ts.createVariableDeclarationList([
-                ts.createVariableDeclaration(getDeclarationName(node, /*allowComments*/ true), 
-                /*type*/ undefined, transformClassLikeDeclarationToExpression(node))
-            ]), 
-            /*location*/ node);
+            var variable = ts.createVariableDeclaration(ts.getLocalName(node, /*allowComments*/ true), 
+            /*type*/ undefined, transformClassLikeDeclarationToExpression(node));
+            ts.setOriginalNode(variable, node);
+            var statements = [];
+            var statement = ts.createVariableStatement(/*modifiers*/ undefined, ts.createVariableDeclarationList([variable]), /*location*/ node);
             ts.setOriginalNode(statement, node);
             ts.startOnNewLine(statement);
+            statements.push(statement);
             // Add an `export default` statement for default exports (for `--target es5 --module es6`)
-            if (isExported && isDefault) {
-                var statements = [statement];
-                statements.push(ts.createExportAssignment(
-                /*decorators*/ undefined, 
-                /*modifiers*/ undefined, 
-                /*isExportEquals*/ false, getDeclarationName(node, /*allowComments*/ false)));
-                return statements;
+            if (ts.hasModifier(node, 1 /* Export */)) {
+                var exportStatement = ts.hasModifier(node, 512 /* Default */)
+                    ? ts.createExportDefault(ts.getLocalName(node))
+                    : ts.createExternalModuleExport(ts.getLocalName(node));
+                ts.setOriginalNode(exportStatement, statement);
+                statements.push(exportStatement);
             }
-            return statement;
-        }
-        function isExportModifier(node) {
-            return node.kind === 83 /* ExportKeyword */;
+            var emitFlags = ts.getEmitFlags(node);
+            if ((emitFlags & 33554432 /* HasEndOfDeclarationMarker */) === 0) {
+                // Add a DeclarationMarker as a marker for the end of the declaration
+                statements.push(ts.createEndOfDeclarationMarker(node));
+                ts.setEmitFlags(statement, emitFlags | 33554432 /* HasEndOfDeclarationMarker */);
+            }
+            return ts.singleOrMany(statements);
         }
         /**
          * Visits a ClassExpression and transforms it into an expression.
@@ -47140,7 +49309,7 @@ var ts;
             /*modifiers*/ undefined, 
             /*asteriskToken*/ undefined, 
             /*name*/ undefined, 
-            /*typeParameters*/ undefined, extendsClauseElement ? [ts.createParameter("_super")] : [], 
+            /*typeParameters*/ undefined, extendsClauseElement ? [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "_super")] : [], 
             /*type*/ undefined, transformClassBody(node, extendsClauseElement));
             // To preserve the behavior of the old emitter, we explicitly indent
             // the body of the function here if it was requested in an earlier
@@ -47175,7 +49344,7 @@ var ts;
             addClassMembers(statements, node);
             // Create a synthetic text range for the return statement.
             var closingBraceLocation = ts.createTokenRange(ts.skipTrivia(currentText, node.members.end), 17 /* CloseBraceToken */);
-            var localName = getLocalName(node);
+            var localName = ts.getLocalName(node);
             // The following partially-emitted expression exists purely to align our sourcemap
             // emit with the original emitter.
             var outer = ts.createPartiallyEmittedExpression(localName);
@@ -47199,7 +49368,7 @@ var ts;
          */
         function addExtendsHelperIfNeeded(statements, node, extendsClauseElement) {
             if (extendsClauseElement) {
-                statements.push(ts.createStatement(ts.createExtendsHelper(currentSourceFile.externalHelpersModuleName, getDeclarationName(node)), 
+                statements.push(ts.createStatement(ts.createExtendsHelper(currentSourceFile.externalHelpersModuleName, ts.getLocalName(node)), 
                 /*location*/ extendsClauseElement));
             }
         }
@@ -47216,7 +49385,7 @@ var ts;
             var constructorFunction = ts.createFunctionDeclaration(
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, 
-            /*asteriskToken*/ undefined, getDeclarationName(node), 
+            /*asteriskToken*/ undefined, ts.getDeclarationName(node), 
             /*typeParameters*/ undefined, transformConstructorParameters(constructor, hasSynthesizedSuper), 
             /*type*/ undefined, transformConstructorBody(constructor, node, extendsClauseElement, hasSynthesizedSuper), 
             /*location*/ constructor || node);
@@ -47267,8 +49436,8 @@ var ts;
                 statementOffset = ts.addPrologueDirectives(statements, constructor.body.statements, /*ensureUseStrict*/ false, visitor);
             }
             if (constructor) {
-                addDefaultValueAssignmentsIfNeeded(statements, constructor);
-                addRestParameterIfNeeded(statements, constructor, hasSynthesizedSuper);
+                ts.addDefaultValueAssignmentsIfNeeded(statements, constructor, visitor, /*convertObjectRest*/ false);
+                ts.addRestParameterIfNeeded(statements, constructor, hasSynthesizedSuper);
                 ts.Debug.assert(statementOffset >= 0, "statementOffset not initialized correctly!");
             }
             var superCaptureStatus = declareOrCaptureOrReturnThisForConstructorIfNeeded(statements, constructor, !!extendsClauseElement, hasSynthesizedSuper, statementOffset);
@@ -47277,7 +49446,10 @@ var ts;
                 statementOffset++;
             }
             if (constructor) {
-                var body = saveStateAndInvoke(constructor, function (constructor) { return ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, /*start*/ statementOffset); });
+                var body = saveStateAndInvoke(constructor, function (constructor) {
+                    isInConstructorWithCapturedSuper = superCaptureStatus === 1 /* ReplaceSuperCapture */;
+                    return ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, /*start*/ statementOffset);
+                });
                 ts.addRange(statements, body);
             }
             // Return `_this` unless we're sure enough that it would be pointless to add a return statement.
@@ -47304,17 +49476,17 @@ var ts;
          */
         function isSufficientlyCoveredByReturnStatements(statement) {
             // A return statement is considered covered.
-            if (statement.kind === 212 /* ReturnStatement */) {
+            if (statement.kind === 216 /* ReturnStatement */) {
                 return true;
             }
-            else if (statement.kind === 204 /* IfStatement */) {
+            else if (statement.kind === 208 /* IfStatement */) {
                 var ifStatement = statement;
                 if (ifStatement.elseStatement) {
                     return isSufficientlyCoveredByReturnStatements(ifStatement.thenStatement) &&
                         isSufficientlyCoveredByReturnStatements(ifStatement.elseStatement);
                 }
             }
-            else if (statement.kind === 200 /* Block */) {
+            else if (statement.kind === 204 /* Block */) {
                 var lastStatement = ts.lastOrUndefined(statement.statements);
                 if (lastStatement && isSufficientlyCoveredByReturnStatements(lastStatement)) {
                     return true;
@@ -47331,7 +49503,7 @@ var ts;
             // If this isn't a derived class, just capture 'this' for arrow functions if necessary.
             if (!hasExtendsClause) {
                 if (ctor) {
-                    addCaptureThisForNodeIfNeeded(statements, ctor);
+                    ts.addCaptureThisForNodeIfNeeded(statements, ctor, enableSubstitutionsForCapturedThis);
                 }
                 return 0 /* NoReplacement */;
             }
@@ -47346,7 +49518,7 @@ var ts;
             // for something like property initializers.
             // Create a captured '_this' variable and assume it will subsequently be used.
             if (hasSynthesizedSuper) {
-                captureThisForNode(statements, ctor, createDefaultSuperCallOrThis());
+                ts.captureThisForNode(statements, ctor, createDefaultSuperCallOrThis());
                 enableSubstitutionsForCapturedThis();
                 return 1 /* ReplaceSuperCapture */;
             }
@@ -47372,7 +49544,7 @@ var ts;
             var ctorStatements = ctor.body.statements;
             if (statementOffset < ctorStatements.length) {
                 firstStatement = ctorStatements[statementOffset];
-                if (firstStatement.kind === 203 /* ExpressionStatement */ && ts.isSuperCall(firstStatement.expression)) {
+                if (firstStatement.kind === 207 /* ExpressionStatement */ && ts.isSuperCall(firstStatement.expression)) {
                     var superCall = firstStatement.expression;
                     superCallExpression = ts.setOriginalNode(saveStateAndInvoke(superCall, visitImmediateSuperCallInBody), superCall);
                 }
@@ -47383,7 +49555,7 @@ var ts;
                 return 2 /* ReplaceWithReturn */;
             }
             // Perform the capture.
-            captureThisForNode(statements, ctor, superCallExpression, firstStatement);
+            ts.captureThisForNode(statements, ctor, superCallExpression, enableSubstitutionsForCapturedThis, firstStatement);
             // If we're actually replacing the original statement, we need to signal this to the caller.
             if (superCallExpression) {
                 return 1 /* ReplaceSuperCapture */;
@@ -47409,14 +49581,24 @@ var ts;
             else if (ts.isBindingPattern(node.name)) {
                 // Binding patterns are converted into a generated name and are
                 // evaluated inside the function body.
-                return ts.setOriginalNode(ts.createParameter(ts.getGeneratedNameForNode(node), 
+                return ts.setOriginalNode(ts.createParameter(
+                /*decorators*/ undefined, 
+                /*modifiers*/ undefined, 
+                /*dotDotDotToken*/ undefined, ts.getGeneratedNameForNode(node), 
+                /*questionToken*/ undefined, 
+                /*type*/ undefined, 
                 /*initializer*/ undefined, 
                 /*location*/ node), 
                 /*original*/ node);
             }
             else if (node.initializer) {
                 // Initializers are elided
-                return ts.setOriginalNode(ts.createParameter(node.name, 
+                return ts.setOriginalNode(ts.createParameter(
+                /*decorators*/ undefined, 
+                /*modifiers*/ undefined, 
+                /*dotDotDotToken*/ undefined, node.name, 
+                /*questionToken*/ undefined, 
+                /*type*/ undefined, 
                 /*initializer*/ undefined, 
                 /*location*/ node), 
                 /*original*/ node);
@@ -47425,158 +49607,6 @@ var ts;
                 return node;
             }
         }
-        /**
-         * Gets a value indicating whether we need to add default value assignments for a
-         * function-like node.
-         *
-         * @param node A function-like node.
-         */
-        function shouldAddDefaultValueAssignments(node) {
-            return (node.transformFlags & 262144 /* ContainsDefaultValueAssignments */) !== 0;
-        }
-        /**
-         * Adds statements to the body of a function-like node if it contains parameters with
-         * binding patterns or initializers.
-         *
-         * @param statements The statements for the new function body.
-         * @param node A function-like node.
-         */
-        function addDefaultValueAssignmentsIfNeeded(statements, node) {
-            if (!shouldAddDefaultValueAssignments(node)) {
-                return;
-            }
-            for (var _i = 0, _a = node.parameters; _i < _a.length; _i++) {
-                var parameter = _a[_i];
-                var name_32 = parameter.name, initializer = parameter.initializer, dotDotDotToken = parameter.dotDotDotToken;
-                // A rest parameter cannot have a binding pattern or an initializer,
-                // so let's just ignore it.
-                if (dotDotDotToken) {
-                    continue;
-                }
-                if (ts.isBindingPattern(name_32)) {
-                    addDefaultValueAssignmentForBindingPattern(statements, parameter, name_32, initializer);
-                }
-                else if (initializer) {
-                    addDefaultValueAssignmentForInitializer(statements, parameter, name_32, initializer);
-                }
-            }
-        }
-        /**
-         * Adds statements to the body of a function-like node for parameters with binding patterns
-         *
-         * @param statements The statements for the new function body.
-         * @param parameter The parameter for the function.
-         * @param name The name of the parameter.
-         * @param initializer The initializer for the parameter.
-         */
-        function addDefaultValueAssignmentForBindingPattern(statements, parameter, name, initializer) {
-            var temp = ts.getGeneratedNameForNode(parameter);
-            // In cases where a binding pattern is simply '[]' or '{}',
-            // we usually don't want to emit a var declaration; however, in the presence
-            // of an initializer, we must emit that expression to preserve side effects.
-            if (name.elements.length > 0) {
-                statements.push(ts.setEmitFlags(ts.createVariableStatement(
-                /*modifiers*/ undefined, ts.createVariableDeclarationList(ts.flattenParameterDestructuring(parameter, temp, visitor))), 8388608 /* CustomPrologue */));
-            }
-            else if (initializer) {
-                statements.push(ts.setEmitFlags(ts.createStatement(ts.createAssignment(temp, ts.visitNode(initializer, visitor, ts.isExpression))), 8388608 /* CustomPrologue */));
-            }
-        }
-        /**
-         * Adds statements to the body of a function-like node for parameters with initializers.
-         *
-         * @param statements The statements for the new function body.
-         * @param parameter The parameter for the function.
-         * @param name The name of the parameter.
-         * @param initializer The initializer for the parameter.
-         */
-        function addDefaultValueAssignmentForInitializer(statements, parameter, name, initializer) {
-            initializer = ts.visitNode(initializer, visitor, ts.isExpression);
-            var statement = ts.createIf(ts.createStrictEquality(ts.getSynthesizedClone(name), ts.createVoidZero()), ts.setEmitFlags(ts.createBlock([
-                ts.createStatement(ts.createAssignment(ts.setEmitFlags(ts.getMutableClone(name), 1536 /* NoSourceMap */), ts.setEmitFlags(initializer, 1536 /* NoSourceMap */ | ts.getEmitFlags(initializer)), 
-                /*location*/ parameter))
-            ], /*location*/ parameter), 32 /* SingleLine */ | 1024 /* NoTrailingSourceMap */ | 12288 /* NoTokenSourceMaps */), 
-            /*elseStatement*/ undefined, 
-            /*location*/ parameter);
-            statement.startsOnNewLine = true;
-            ts.setEmitFlags(statement, 12288 /* NoTokenSourceMaps */ | 1024 /* NoTrailingSourceMap */ | 8388608 /* CustomPrologue */);
-            statements.push(statement);
-        }
-        /**
-         * Gets a value indicating whether we need to add statements to handle a rest parameter.
-         *
-         * @param node A ParameterDeclaration node.
-         * @param inConstructorWithSynthesizedSuper A value indicating whether the parameter is
-         *                                          part of a constructor declaration with a
-         *                                          synthesized call to `super`
-         */
-        function shouldAddRestParameter(node, inConstructorWithSynthesizedSuper) {
-            return node && node.dotDotDotToken && node.name.kind === 70 /* Identifier */ && !inConstructorWithSynthesizedSuper;
-        }
-        /**
-         * Adds statements to the body of a function-like node if it contains a rest parameter.
-         *
-         * @param statements The statements for the new function body.
-         * @param node A function-like node.
-         * @param inConstructorWithSynthesizedSuper A value indicating whether the parameter is
-         *                                          part of a constructor declaration with a
-         *                                          synthesized call to `super`
-         */
-        function addRestParameterIfNeeded(statements, node, inConstructorWithSynthesizedSuper) {
-            var parameter = ts.lastOrUndefined(node.parameters);
-            if (!shouldAddRestParameter(parameter, inConstructorWithSynthesizedSuper)) {
-                return;
-            }
-            // `declarationName` is the name of the local declaration for the parameter.
-            var declarationName = ts.getMutableClone(parameter.name);
-            ts.setEmitFlags(declarationName, 1536 /* NoSourceMap */);
-            // `expressionName` is the name of the parameter used in expressions.
-            var expressionName = ts.getSynthesizedClone(parameter.name);
-            var restIndex = node.parameters.length - 1;
-            var temp = ts.createLoopVariable();
-            // var param = [];
-            statements.push(ts.setEmitFlags(ts.createVariableStatement(
-            /*modifiers*/ undefined, ts.createVariableDeclarationList([
-                ts.createVariableDeclaration(declarationName, 
-                /*type*/ undefined, ts.createArrayLiteral([]))
-            ]), 
-            /*location*/ parameter), 8388608 /* CustomPrologue */));
-            // for (var _i = restIndex; _i < arguments.length; _i++) {
-            //   param[_i - restIndex] = arguments[_i];
-            // }
-            var forStatement = ts.createFor(ts.createVariableDeclarationList([
-                ts.createVariableDeclaration(temp, /*type*/ undefined, ts.createLiteral(restIndex))
-            ], /*location*/ parameter), ts.createLessThan(temp, ts.createPropertyAccess(ts.createIdentifier("arguments"), "length"), 
-            /*location*/ parameter), ts.createPostfixIncrement(temp, /*location*/ parameter), ts.createBlock([
-                ts.startOnNewLine(ts.createStatement(ts.createAssignment(ts.createElementAccess(expressionName, ts.createSubtract(temp, ts.createLiteral(restIndex))), ts.createElementAccess(ts.createIdentifier("arguments"), temp)), 
-                /*location*/ parameter))
-            ]));
-            ts.setEmitFlags(forStatement, 8388608 /* CustomPrologue */);
-            ts.startOnNewLine(forStatement);
-            statements.push(forStatement);
-        }
-        /**
-         * Adds a statement to capture the `this` of a function declaration if it is needed.
-         *
-         * @param statements The statements for the new function body.
-         * @param node A node.
-         */
-        function addCaptureThisForNodeIfNeeded(statements, node) {
-            if (node.transformFlags & 65536 /* ContainsCapturedLexicalThis */ && node.kind !== 181 /* ArrowFunction */) {
-                captureThisForNode(statements, node, ts.createThis());
-            }
-        }
-        function captureThisForNode(statements, node, initializer, originalStatement) {
-            enableSubstitutionsForCapturedThis();
-            var captureThisStatement = ts.createVariableStatement(
-            /*modifiers*/ undefined, ts.createVariableDeclarationList([
-                ts.createVariableDeclaration("_this", 
-                /*type*/ undefined, initializer)
-            ]), originalStatement);
-            ts.setEmitFlags(captureThisStatement, 49152 /* NoComments */ | 8388608 /* CustomPrologue */);
-            ts.setSourceMapRange(captureThisStatement, node);
-            statements.push(captureThisStatement);
-        }
         /**
          * Adds statements to the class body function for a class to define the members of the
          * class.
@@ -47588,20 +49618,20 @@ var ts;
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
                 switch (member.kind) {
-                    case 199 /* SemicolonClassElement */:
+                    case 203 /* SemicolonClassElement */:
                         statements.push(transformSemicolonClassElementToStatement(member));
                         break;
-                    case 148 /* MethodDeclaration */:
+                    case 149 /* MethodDeclaration */:
                         statements.push(transformClassMethodDeclarationToStatement(getClassMemberPrefix(node, member), member));
                         break;
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* SetAccessor */:
                         var accessors = ts.getAllAccessorDeclarations(node.members, member);
                         if (member === accessors.firstAccessor) {
                             statements.push(transformAccessorsToStatement(getClassMemberPrefix(node, member), accessors));
                         }
                         break;
-                    case 149 /* Constructor */:
+                    case 150 /* Constructor */:
                         // Constructors are handled in visitClassExpression/visitClassDeclaration
                         break;
                     default:
@@ -47707,7 +49737,7 @@ var ts;
          * @param node An ArrowFunction node.
          */
         function visitArrowFunction(node) {
-            if (node.transformFlags & 32768 /* ContainsLexicalThis */) {
+            if (node.transformFlags & 262144 /* ContainsLexicalThis */) {
                 enableSubstitutionsForCapturedThis();
             }
             var func = transformFunctionLikeToExpression(node, /*location*/ node, /*name*/ undefined);
@@ -47731,7 +49761,7 @@ var ts;
             return ts.setOriginalNode(ts.createFunctionDeclaration(
             /*decorators*/ undefined, node.modifiers, node.asteriskToken, node.name, 
             /*typeParameters*/ undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), 
-            /*type*/ undefined, transformFunctionBody(node), 
+            /*type*/ undefined, ts.transformFunctionBody(node, visitor, currentSourceFile, context, enableSubstitutionsForCapturedThis), 
             /*location*/ node), 
             /*original*/ node);
         }
@@ -47744,91 +49774,17 @@ var ts;
          */
         function transformFunctionLikeToExpression(node, location, name) {
             var savedContainingNonArrowFunction = enclosingNonArrowFunction;
-            if (node.kind !== 181 /* ArrowFunction */) {
+            if (node.kind !== 185 /* ArrowFunction */) {
                 enclosingNonArrowFunction = node;
             }
             var expression = ts.setOriginalNode(ts.createFunctionExpression(
             /*modifiers*/ undefined, node.asteriskToken, name, 
             /*typeParameters*/ undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), 
-            /*type*/ undefined, saveStateAndInvoke(node, transformFunctionBody), location), 
+            /*type*/ undefined, saveStateAndInvoke(node, function (node) { return ts.transformFunctionBody(node, visitor, currentSourceFile, context, enableSubstitutionsForCapturedThis); }), location), 
             /*original*/ node);
             enclosingNonArrowFunction = savedContainingNonArrowFunction;
             return expression;
         }
-        /**
-         * Transforms the body of a function-like node.
-         *
-         * @param node A function-like node.
-         */
-        function transformFunctionBody(node) {
-            var multiLine = false; // indicates whether the block *must* be emitted as multiple lines
-            var singleLine = false; // indicates whether the block *may* be emitted as a single line
-            var statementsLocation;
-            var closeBraceLocation;
-            var statements = [];
-            var body = node.body;
-            var statementOffset;
-            startLexicalEnvironment();
-            if (ts.isBlock(body)) {
-                // ensureUseStrict is false because no new prologue-directive should be added.
-                // addPrologueDirectives will simply put already-existing directives at the beginning of the target statement-array
-                statementOffset = ts.addPrologueDirectives(statements, body.statements, /*ensureUseStrict*/ false, visitor);
-            }
-            addCaptureThisForNodeIfNeeded(statements, node);
-            addDefaultValueAssignmentsIfNeeded(statements, node);
-            addRestParameterIfNeeded(statements, node, /*inConstructorWithSynthesizedSuper*/ false);
-            // If we added any generated statements, this must be a multi-line block.
-            if (!multiLine && statements.length > 0) {
-                multiLine = true;
-            }
-            if (ts.isBlock(body)) {
-                statementsLocation = body.statements;
-                ts.addRange(statements, ts.visitNodes(body.statements, visitor, ts.isStatement, statementOffset));
-                // If the original body was a multi-line block, this must be a multi-line block.
-                if (!multiLine && body.multiLine) {
-                    multiLine = true;
-                }
-            }
-            else {
-                ts.Debug.assert(node.kind === 181 /* 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
-                // being emitted for the end position only.
-                statementsLocation = ts.moveRangeEnd(body, -1);
-                var equalsGreaterThanToken = node.equalsGreaterThanToken;
-                if (!ts.nodeIsSynthesized(equalsGreaterThanToken) && !ts.nodeIsSynthesized(body)) {
-                    if (ts.rangeEndIsOnSameLineAsRangeStart(equalsGreaterThanToken, body, currentSourceFile)) {
-                        singleLine = true;
-                    }
-                    else {
-                        multiLine = true;
-                    }
-                }
-                var expression = ts.visitNode(body, visitor, ts.isExpression);
-                var returnStatement = ts.createReturn(expression, /*location*/ body);
-                ts.setEmitFlags(returnStatement, 12288 /* NoTokenSourceMaps */ | 1024 /* NoTrailingSourceMap */ | 32768 /* NoTrailingComments */);
-                statements.push(returnStatement);
-                // To align with the source map emit for the old emitter, we set a custom
-                // source map location for the close brace.
-                closeBraceLocation = body;
-            }
-            var lexicalEnvironment = endLexicalEnvironment();
-            ts.addRange(statements, lexicalEnvironment);
-            // If we added any final generated statements, this must be a multi-line block
-            if (!multiLine && lexicalEnvironment && lexicalEnvironment.length) {
-                multiLine = true;
-            }
-            var block = ts.createBlock(ts.createNodeArray(statements, statementsLocation), node.body, multiLine);
-            if (!multiLine && singleLine) {
-                ts.setEmitFlags(block, 32 /* SingleLine */);
-            }
-            if (closeBraceLocation) {
-                ts.setTokenSourceMapRange(block, 17 /* CloseBraceToken */, closeBraceLocation);
-            }
-            ts.setOriginalNode(block, node.body);
-            return block;
-        }
         /**
          * Visits an ExpressionStatement that contains a destructuring assignment.
          *
@@ -47837,9 +49793,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 179 /* ParenthesizedExpression */:
+                case 183 /* ParenthesizedExpression */:
                     return ts.updateStatement(node, visitParenthesizedExpression(node.expression, /*needsDestructuringValue*/ false));
-                case 188 /* BinaryExpression */:
+                case 192 /* BinaryExpression */:
                     return ts.updateStatement(node, visitBinaryExpression(node.expression, /*needsDestructuringValue*/ false));
             }
             return ts.visitEachChild(node, visitor, context);
@@ -47855,10 +49811,10 @@ var ts;
             // If we are here it is most likely because our expression is a destructuring assignment.
             if (needsDestructuringValue) {
                 switch (node.expression.kind) {
-                    case 179 /* ParenthesizedExpression */:
+                    case 183 /* ParenthesizedExpression */:
                         return ts.createParen(visitParenthesizedExpression(node.expression, /*needsDestructuringValue*/ true), 
                         /*location*/ node);
-                    case 188 /* BinaryExpression */:
+                    case 192 /* BinaryExpression */:
                         return ts.createParen(visitBinaryExpression(node.expression, /*needsDestructuringValue*/ true), 
                         /*location*/ node);
                 }
@@ -47887,7 +49843,7 @@ var ts;
                     if (decl.initializer) {
                         var assignment = void 0;
                         if (ts.isBindingPattern(decl.name)) {
-                            assignment = ts.flattenVariableDestructuringToExpression(decl, hoistVariableDeclaration, /*nameSubstitution*/ undefined, visitor);
+                            assignment = ts.flattenVariableDestructuringToExpression(decl, hoistVariableDeclaration, /*createAssignmentCallback*/ undefined, visitor);
                         }
                         else {
                             assignment = ts.createBinary(decl.name, 57 /* EqualsToken */, ts.visitNode(decl.initializer, visitor, ts.isExpression));
@@ -47920,7 +49876,7 @@ var ts;
             var declarationList = ts.createVariableDeclarationList(declarations, /*location*/ node);
             ts.setOriginalNode(declarationList, node);
             ts.setCommentRange(declarationList, node);
-            if (node.transformFlags & 8388608 /* ContainsBindingPattern */
+            if (node.transformFlags & 67108864 /* ContainsBindingPattern */
                 && (ts.isBindingPattern(node.declarations[0].name)
                     || ts.isBindingPattern(ts.lastOrUndefined(node.declarations).name))) {
                 // If the first or last declaration is a binding pattern, we need to modify
@@ -47986,8 +49942,8 @@ var ts;
                     && ts.isBlock(enclosingBlockScopeContainer)
                     && ts.isIterationStatement(enclosingBlockScopeContainerParent, /*lookInLabeledStatements*/ false));
             var emitExplicitInitializer = !emittedAsTopLevel
-                && enclosingBlockScopeContainer.kind !== 208 /* ForInStatement */
-                && enclosingBlockScopeContainer.kind !== 209 /* ForOfStatement */
+                && enclosingBlockScopeContainer.kind !== 212 /* ForInStatement */
+                && enclosingBlockScopeContainer.kind !== 213 /* ForOfStatement */
                 && (!resolver.isDeclarationWithCollidingName(node)
                     || (isDeclaredInLoop
                         && !isCapturedInFunction
@@ -48068,118 +50024,7 @@ var ts;
             return convertIterationStatementBodyIfNecessary(node, convertForOfToFor);
         }
         function convertForOfToFor(node, convertedLoopBodyStatements) {
-            // The following ES6 code:
-            //
-            //    for (let v of expr) { }
-            //
-            // should be emitted as
-            //
-            //    for (var _i = 0, _a = expr; _i < _a.length; _i++) {
-            //        var v = _a[_i];
-            //    }
-            //
-            // where _a and _i are temps emitted to capture the RHS and the counter,
-            // respectively.
-            // When the left hand side is an expression instead of a let declaration,
-            // the "let v" is not emitted.
-            // When the left hand side is a let/const, the v is renamed if there is
-            // another v in scope.
-            // Note that all assignments to the LHS are emitted in the body, including
-            // all destructuring.
-            // Note also that because an extra statement is needed to assign to the LHS,
-            // for-of bodies are always emitted as blocks.
-            var expression = ts.visitNode(node.expression, visitor, ts.isExpression);
-            var initializer = node.initializer;
-            var statements = [];
-            // In the case where the user wrote an identifier as the RHS, like this:
-            //
-            //     for (let v of arr) { }
-            //
-            // we don't want to emit a temporary variable for the RHS, just use it directly.
-            var counter = ts.createLoopVariable();
-            var rhsReference = expression.kind === 70 /* Identifier */
-                ? ts.createUniqueName(expression.text)
-                : ts.createTempVariable(/*recordTempVariable*/ undefined);
-            // Initialize LHS
-            // var v = _a[_i];
-            if (ts.isVariableDeclarationList(initializer)) {
-                if (initializer.flags & 3 /* BlockScoped */) {
-                    enableSubstitutionsForBlockScopedBindings();
-                }
-                var firstOriginalDeclaration = ts.firstOrUndefined(initializer.declarations);
-                if (firstOriginalDeclaration && ts.isBindingPattern(firstOriginalDeclaration.name)) {
-                    // This works whether the declaration is a var, let, or const.
-                    // It will use rhsIterationValue _a[_i] as the initializer.
-                    var declarations = ts.flattenVariableDestructuring(firstOriginalDeclaration, ts.createElementAccess(rhsReference, counter), visitor);
-                    var declarationList = ts.createVariableDeclarationList(declarations, /*location*/ initializer);
-                    ts.setOriginalNode(declarationList, initializer);
-                    // Adjust the source map range for the first declaration to align with the old
-                    // emitter.
-                    var firstDeclaration = declarations[0];
-                    var lastDeclaration = ts.lastOrUndefined(declarations);
-                    ts.setSourceMapRange(declarationList, ts.createRange(firstDeclaration.pos, lastDeclaration.end));
-                    statements.push(ts.createVariableStatement(
-                    /*modifiers*/ undefined, declarationList));
-                }
-                else {
-                    // The following call does not include the initializer, so we have
-                    // to emit it separately.
-                    statements.push(ts.createVariableStatement(
-                    /*modifiers*/ undefined, ts.createVariableDeclarationList([
-                        ts.createVariableDeclaration(firstOriginalDeclaration ? firstOriginalDeclaration.name : ts.createTempVariable(/*recordTempVariable*/ undefined), 
-                        /*type*/ undefined, ts.createElementAccess(rhsReference, counter))
-                    ], /*location*/ ts.moveRangePos(initializer, -1)), 
-                    /*location*/ ts.moveRangeEnd(initializer, -1)));
-                }
-            }
-            else {
-                // Initializer is an expression. Emit the expression in the body, so that it's
-                // evaluated on every iteration.
-                var assignment = ts.createAssignment(initializer, ts.createElementAccess(rhsReference, counter));
-                if (ts.isDestructuringAssignment(assignment)) {
-                    // This is a destructuring pattern, so we flatten the destructuring instead.
-                    statements.push(ts.createStatement(ts.flattenDestructuringAssignment(context, assignment, 
-                    /*needsValue*/ false, hoistVariableDeclaration, visitor)));
-                }
-                else {
-                    // Currently there is not way to check that assignment is binary expression of destructing assignment
-                    // so we have to cast never type to binaryExpression
-                    assignment.end = initializer.end;
-                    statements.push(ts.createStatement(assignment, /*location*/ ts.moveRangeEnd(initializer, -1)));
-                }
-            }
-            var bodyLocation;
-            var statementsLocation;
-            if (convertedLoopBodyStatements) {
-                ts.addRange(statements, convertedLoopBodyStatements);
-            }
-            else {
-                var statement = ts.visitNode(node.statement, visitor, ts.isStatement);
-                if (ts.isBlock(statement)) {
-                    ts.addRange(statements, statement.statements);
-                    bodyLocation = statement;
-                    statementsLocation = statement.statements;
-                }
-                else {
-                    statements.push(statement);
-                }
-            }
-            // The old emitter does not emit source maps for the expression
-            ts.setEmitFlags(expression, 1536 /* NoSourceMap */ | ts.getEmitFlags(expression));
-            // The old emitter does not emit source maps for the block.
-            // We add the location to preserve comments.
-            var body = ts.createBlock(ts.createNodeArray(statements, /*location*/ statementsLocation), 
-            /*location*/ bodyLocation);
-            ts.setEmitFlags(body, 1536 /* NoSourceMap */ | 12288 /* NoTokenSourceMaps */);
-            var forStatement = ts.createFor(ts.createVariableDeclarationList([
-                ts.createVariableDeclaration(counter, /*type*/ undefined, ts.createLiteral(0), /*location*/ ts.moveRangePos(node.expression, -1)),
-                ts.createVariableDeclaration(rhsReference, /*type*/ undefined, expression, /*location*/ node.expression)
-            ], /*location*/ node.expression), ts.createLessThan(counter, ts.createPropertyAccess(rhsReference, "length"), 
-            /*location*/ node.expression), ts.createPostfixIncrement(counter, /*location*/ node.expression), body, 
-            /*location*/ node);
-            // Disable trailing source maps for the OpenParenToken to align source map emit with the old emitter.
-            ts.setEmitFlags(forStatement, 8192 /* NoTokenTrailingSourceMaps */);
-            return forStatement;
+            return ts.convertForOf(node, convertedLoopBodyStatements, visitor, enableSubstitutionsForBlockScopedBindings, context, /*transformRest*/ false);
         }
         /**
          * Visits an ObjectLiteralExpression with computed propety names.
@@ -48195,8 +50040,8 @@ var ts;
             var numInitialProperties = numProperties;
             for (var i = 0; i < numProperties; i++) {
                 var property = properties[i];
-                if (property.transformFlags & 16777216 /* ContainsYield */
-                    || property.name.kind === 141 /* ComputedPropertyName */) {
+                if (property.transformFlags & 134217728 /* ContainsYield */
+                    || property.name.kind === 142 /* ComputedPropertyName */) {
                     numInitialProperties = i;
                     break;
                 }
@@ -48262,11 +50107,11 @@ var ts;
             var functionName = ts.createUniqueName("_loop");
             var loopInitializer;
             switch (node.kind) {
-                case 207 /* ForStatement */:
-                case 208 /* ForInStatement */:
-                case 209 /* ForOfStatement */:
+                case 211 /* ForStatement */:
+                case 212 /* ForInStatement */:
+                case 213 /* ForOfStatement */:
                     var initializer = node.initializer;
-                    if (initializer && initializer.kind === 220 /* VariableDeclarationList */) {
+                    if (initializer && initializer.kind === 224 /* VariableDeclarationList */) {
                         loopInitializer = initializer;
                     }
                     break;
@@ -48315,7 +50160,7 @@ var ts;
             }
             var isAsyncBlockContainingAwait = enclosingNonArrowFunction
                 && (ts.getEmitFlags(enclosingNonArrowFunction) & 2097152 /* AsyncFunctionBody */) !== 0
-                && (node.statement.transformFlags & 16777216 /* ContainsYield */) !== 0;
+                && (node.statement.transformFlags & 134217728 /* ContainsYield */) !== 0;
             var loopBodyFlags = 0;
             if (currentState.containsLexicalThis) {
                 loopBodyFlags |= 256 /* CapturesThis */;
@@ -48324,14 +50169,14 @@ var ts;
                 loopBodyFlags |= 2097152 /* AsyncFunctionBody */;
             }
             var convertedLoopVariable = ts.createVariableStatement(
-            /*modifiers*/ undefined, ts.createVariableDeclarationList([
+            /*modifiers*/ undefined, ts.setEmitFlags(ts.createVariableDeclarationList([
                 ts.createVariableDeclaration(functionName, 
                 /*type*/ undefined, ts.setEmitFlags(ts.createFunctionExpression(
                 /*modifiers*/ undefined, isAsyncBlockContainingAwait ? ts.createToken(38 /* AsteriskToken */) : undefined, 
                 /*name*/ undefined, 
                 /*typeParameters*/ undefined, loopParameters, 
                 /*type*/ undefined, loopBody), loopBodyFlags))
-            ]));
+            ]), 16777216 /* NoHoisting */));
             var statements = [convertedLoopVariable];
             var extraVariableDeclarations;
             // propagate state from the inner loop to the outer loop if necessary
@@ -48413,7 +50258,7 @@ var ts;
                 loop.transformFlags = 0;
                 ts.aggregateTransformFlags(loop);
             }
-            statements.push(currentParent.kind === 215 /* LabeledStatement */
+            statements.push(currentParent.kind === 219 /* LabeledStatement */
                 ? ts.createLabel(currentParent.label, loop)
                 : loop);
             return statements;
@@ -48519,7 +50364,7 @@ var ts;
                 }
             }
             else {
-                loopParameters.push(ts.createParameter(name));
+                loopParameters.push(ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, name));
                 if (resolver.getNodeCheckFlags(decl) & 2097152 /* NeedsLoopOutParameter */) {
                     var outParamName = ts.createUniqueName("out_" + name.text);
                     loopOutParameters.push({ originalName: name, outParamName: outParamName });
@@ -48541,20 +50386,20 @@ var ts;
             for (var i = start; i < numProperties; i++) {
                 var property = properties[i];
                 switch (property.kind) {
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* SetAccessor */:
                         var accessors = ts.getAllAccessorDeclarations(node.properties, property);
                         if (property === accessors.firstAccessor) {
                             expressions.push(transformAccessorsToExpression(receiver, accessors, node.multiLine));
                         }
                         break;
-                    case 253 /* PropertyAssignment */:
+                    case 257 /* PropertyAssignment */:
                         expressions.push(transformPropertyAssignmentToExpression(property, receiver, node.multiLine));
                         break;
-                    case 254 /* ShorthandPropertyAssignment */:
+                    case 258 /* ShorthandPropertyAssignment */:
                         expressions.push(transformShorthandPropertyAssignmentToExpression(property, receiver, node.multiLine));
                         break;
-                    case 148 /* MethodDeclaration */:
+                    case 149 /* MethodDeclaration */:
                         expressions.push(transformObjectLiteralMethodDeclarationToExpression(property, receiver, node.multiLine));
                         break;
                     default:
@@ -48608,6 +50453,19 @@ var ts;
             }
             return expression;
         }
+        function visitCatchClause(node) {
+            ts.Debug.assert(ts.isBindingPattern(node.variableDeclaration.name));
+            var temp = ts.createTempVariable(undefined);
+            var newVariableDeclaration = ts.createVariableDeclaration(temp, undefined, undefined, node.variableDeclaration);
+            var vars = ts.flattenVariableDestructuring(node.variableDeclaration, temp, visitor);
+            var list = ts.createVariableDeclarationList(vars, /*location*/ node.variableDeclaration, /*flags*/ node.variableDeclaration.flags);
+            var destructure = ts.createVariableStatement(undefined, list);
+            return ts.updateCatchClause(node, newVariableDeclaration, addStatementToStartOfBlock(node.block, destructure));
+        }
+        function addStatementToStartOfBlock(block, statement) {
+            var transformedStatements = ts.visitNodes(block.statements, visitor, ts.isStatement);
+            return ts.updateBlock(block, [statement].concat(transformedStatements));
+        }
         /**
          * Visits a MethodDeclaration of an ObjectLiteralExpression and transforms it into a
          * PropertyAssignment.
@@ -48670,7 +50528,7 @@ var ts;
                 ts.setEmitFlags(thisArg, 128 /* NoSubstitution */);
             }
             var resultingCall;
-            if (node.transformFlags & 1048576 /* ContainsSpreadElementExpression */) {
+            if (node.transformFlags & 8388608 /* ContainsSpreadExpression */) {
                 // [source]
                 //      f(...a, b)
                 //      x.m(...a, b)
@@ -48716,7 +50574,7 @@ var ts;
          */
         function visitNewExpression(node) {
             // We are here because we contain a SpreadElementExpression.
-            ts.Debug.assert((node.transformFlags & 1048576 /* ContainsSpreadElementExpression */) !== 0);
+            ts.Debug.assert((node.transformFlags & 8388608 /* ContainsSpreadExpression */) !== 0);
             // [source]
             //      new C(...a)
             //
@@ -48727,7 +50585,7 @@ var ts;
             /*typeArguments*/ undefined, []);
         }
         /**
-         * Transforms an array of Expression nodes that contains a SpreadElementExpression.
+         * Transforms an array of Expression nodes that contains a SpreadExpression.
          *
          * @param elements The array of Expression nodes.
          * @param needsUniqueCopy A value indicating whether to ensure that the result is a fresh array.
@@ -48742,36 +50600,36 @@ var ts;
             // Map spans of spread expressions into their expressions and spans of other
             // expressions into an array literal.
             var numElements = elements.length;
-            var segments = ts.flatten(ts.spanMap(elements, partitionSpreadElement, function (partition, visitPartition, _start, end) {
+            var segments = ts.flatten(ts.spanMap(elements, partitionSpread, function (partition, visitPartition, _start, end) {
                 return visitPartition(partition, multiLine, hasTrailingComma && end === numElements);
             }));
             if (segments.length === 1) {
                 var firstElement = elements[0];
-                return needsUniqueCopy && ts.isSpreadElementExpression(firstElement) && firstElement.expression.kind !== 171 /* ArrayLiteralExpression */
+                return needsUniqueCopy && ts.isSpreadExpression(firstElement) && firstElement.expression.kind !== 175 /* ArrayLiteralExpression */
                     ? ts.createArraySlice(segments[0])
                     : segments[0];
             }
             // Rewrite using the pattern <segment0>.concat(<segment1>, <segment2>, ...)
             return ts.createArrayConcat(segments.shift(), segments);
         }
-        function partitionSpreadElement(node) {
-            return ts.isSpreadElementExpression(node)
-                ? visitSpanOfSpreadElements
-                : visitSpanOfNonSpreadElements;
+        function partitionSpread(node) {
+            return ts.isSpreadExpression(node)
+                ? visitSpanOfSpreads
+                : visitSpanOfNonSpreads;
         }
-        function visitSpanOfSpreadElements(chunk) {
-            return ts.map(chunk, visitExpressionOfSpreadElement);
+        function visitSpanOfSpreads(chunk) {
+            return ts.map(chunk, visitExpressionOfSpread);
         }
-        function visitSpanOfNonSpreadElements(chunk, multiLine, hasTrailingComma) {
+        function visitSpanOfNonSpreads(chunk, multiLine, hasTrailingComma) {
             return ts.createArrayLiteral(ts.visitNodes(ts.createNodeArray(chunk, /*location*/ undefined, hasTrailingComma), visitor, ts.isExpression), 
             /*location*/ undefined, multiLine);
         }
         /**
-         * Transforms the expression of a SpreadElementExpression node.
+         * Transforms the expression of a SpreadExpression node.
          *
-         * @param node A SpreadElementExpression node.
+         * @param node A SpreadExpression node.
          */
-        function visitExpressionOfSpreadElement(node) {
+        function visitExpressionOfSpread(node) {
             return ts.visitNode(node.expression, visitor, ts.isExpression);
         }
         /**
@@ -48928,7 +50786,7 @@ var ts;
             return enclosingNonAsyncFunctionBody
                 && ts.isClassElement(enclosingNonAsyncFunctionBody)
                 && !ts.hasModifier(enclosingNonAsyncFunctionBody, 32 /* Static */)
-                && currentParent.kind !== 175 /* CallExpression */
+                && currentParent.kind !== 179 /* CallExpression */
                 ? ts.createPropertyAccess(ts.createIdentifier("_super"), "prototype")
                 : ts.createIdentifier("_super");
         }
@@ -48937,7 +50795,7 @@ var ts;
             var statements = [];
             startLexicalEnvironment();
             ts.addRange(statements, prologue);
-            addCaptureThisForNodeIfNeeded(statements, node);
+            ts.addCaptureThisForNodeIfNeeded(statements, node, enableSubstitutionsForCapturedThis);
             ts.addRange(statements, ts.visitNodes(ts.createNodeArray(remaining), visitor, ts.isStatement));
             ts.addRange(statements, endLexicalEnvironment());
             var clone = ts.getMutableClone(node);
@@ -48976,21 +50834,20 @@ var ts;
             if ((enabledSubstitutions & 1 /* CapturedThis */) === 0) {
                 enabledSubstitutions |= 1 /* CapturedThis */;
                 context.enableSubstitution(98 /* ThisKeyword */);
-                context.enableEmitNotification(149 /* Constructor */);
-                context.enableEmitNotification(148 /* MethodDeclaration */);
-                context.enableEmitNotification(150 /* GetAccessor */);
-                context.enableEmitNotification(151 /* SetAccessor */);
-                context.enableEmitNotification(181 /* ArrowFunction */);
-                context.enableEmitNotification(180 /* FunctionExpression */);
-                context.enableEmitNotification(221 /* FunctionDeclaration */);
+                context.enableEmitNotification(150 /* Constructor */);
+                context.enableEmitNotification(149 /* MethodDeclaration */);
+                context.enableEmitNotification(151 /* GetAccessor */);
+                context.enableEmitNotification(152 /* SetAccessor */);
+                context.enableEmitNotification(185 /* ArrowFunction */);
+                context.enableEmitNotification(184 /* FunctionExpression */);
+                context.enableEmitNotification(225 /* FunctionDeclaration */);
             }
         }
         /**
          * Hooks node substitutions.
          *
+         * @param emitContext The context for the emitter.
          * @param node The node to substitute.
-         * @param isExpression A value indicating whether the node is to be used in an expression
-         *                     position.
          */
         function onSubstituteNode(emitContext, node) {
             node = previousOnSubstituteNode(emitContext, node);
@@ -49025,10 +50882,10 @@ var ts;
         function isNameOfDeclarationWithCollidingName(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 170 /* BindingElement */:
-                case 222 /* ClassDeclaration */:
-                case 225 /* EnumDeclaration */:
-                case 219 /* VariableDeclaration */:
+                case 174 /* BindingElement */:
+                case 226 /* ClassDeclaration */:
+                case 229 /* EnumDeclaration */:
+                case 223 /* VariableDeclaration */:
                     return parent.name === node
                         && resolver.isDeclarationWithCollidingName(parent);
             }
@@ -49075,44 +50932,8 @@ var ts;
             }
             return node;
         }
-        /**
-         * Gets the local name for a declaration for use in expressions.
-         *
-         * A local name will *never* be prefixed with an module or namespace export modifier like
-         * "exports.".
-         *
-         * @param node The declaration.
-         * @param allowComments A value indicating whether comments may be emitted for the name.
-         * @param allowSourceMaps A value indicating whether source maps may be emitted for the name.
-         */
-        function getLocalName(node, allowComments, allowSourceMaps) {
-            return getDeclarationName(node, allowComments, allowSourceMaps, 262144 /* LocalName */);
-        }
-        /**
-         * Gets the name of a declaration, without source map or comments.
-         *
-         * @param node The declaration.
-         * @param allowComments Allow comments for the name.
-         */
-        function getDeclarationName(node, allowComments, allowSourceMaps, emitFlags) {
-            if (node.name && !ts.isGeneratedIdentifier(node.name)) {
-                var name_33 = ts.getMutableClone(node.name);
-                emitFlags |= ts.getEmitFlags(node.name);
-                if (!allowSourceMaps) {
-                    emitFlags |= 1536 /* NoSourceMap */;
-                }
-                if (!allowComments) {
-                    emitFlags |= 49152 /* NoComments */;
-                }
-                if (emitFlags) {
-                    ts.setEmitFlags(name_33, emitFlags);
-                }
-                return name_33;
-            }
-            return ts.getGeneratedNameForNode(node);
-        }
         function getClassMemberPrefix(node, member) {
-            var expression = getLocalName(node);
+            var expression = ts.getLocalName(node);
             return ts.hasModifier(member, 32 /* Static */) ? expression : ts.createPropertyAccess(expression, "prototype");
         }
         function hasSynthesizedDefaultSuperCall(constructor, hasExtendsClause) {
@@ -49124,11 +50945,11 @@ var ts;
                 return false;
             }
             var statement = ts.firstOrUndefined(constructor.body.statements);
-            if (!statement || !ts.nodeIsSynthesized(statement) || statement.kind !== 203 /* ExpressionStatement */) {
+            if (!statement || !ts.nodeIsSynthesized(statement) || statement.kind !== 207 /* ExpressionStatement */) {
                 return false;
             }
             var statementExpression = statement.expression;
-            if (!ts.nodeIsSynthesized(statementExpression) || statementExpression.kind !== 175 /* CallExpression */) {
+            if (!ts.nodeIsSynthesized(statementExpression) || statementExpression.kind !== 179 /* CallExpression */) {
                 return false;
             }
             var callTarget = statementExpression.expression;
@@ -49136,7 +50957,7 @@ var ts;
                 return false;
             }
             var callArgument = ts.singleOrUndefined(statementExpression.arguments);
-            if (!callArgument || !ts.nodeIsSynthesized(callArgument) || callArgument.kind !== 192 /* SpreadElementExpression */) {
+            if (!callArgument || !ts.nodeIsSynthesized(callArgument) || callArgument.kind !== 196 /* SpreadElement */) {
                 return false;
             }
             var expression = callArgument.expression;
@@ -49378,7 +51199,7 @@ var ts;
             if (ts.isDeclarationFile(node)) {
                 return node;
             }
-            if (node.transformFlags & 4096 /* ContainsGenerator */) {
+            if (node.transformFlags & 8192 /* ContainsGenerator */) {
                 currentSourceFile = node;
                 node = ts.visitEachChild(node, visitor, context);
                 currentSourceFile = undefined;
@@ -49398,10 +51219,10 @@ var ts;
             else if (inGeneratorFunctionBody) {
                 return visitJavaScriptInGeneratorFunctionBody(node);
             }
-            else if (transformFlags & 2048 /* Generator */) {
+            else if (transformFlags & 4096 /* Generator */) {
                 return visitGenerator(node);
             }
-            else if (transformFlags & 4096 /* ContainsGenerator */) {
+            else if (transformFlags & 8192 /* ContainsGenerator */) {
                 return ts.visitEachChild(node, visitor, context);
             }
             else {
@@ -49415,13 +51236,13 @@ var ts;
          */
         function visitJavaScriptInStatementContainingYield(node) {
             switch (node.kind) {
-                case 205 /* DoStatement */:
+                case 209 /* DoStatement */:
                     return visitDoStatement(node);
-                case 206 /* WhileStatement */:
+                case 210 /* WhileStatement */:
                     return visitWhileStatement(node);
-                case 214 /* SwitchStatement */:
+                case 218 /* SwitchStatement */:
                     return visitSwitchStatement(node);
-                case 215 /* LabeledStatement */:
+                case 219 /* LabeledStatement */:
                     return visitLabeledStatement(node);
                 default:
                     return visitJavaScriptInGeneratorFunctionBody(node);
@@ -49434,30 +51255,30 @@ var ts;
          */
         function visitJavaScriptInGeneratorFunctionBody(node) {
             switch (node.kind) {
-                case 221 /* FunctionDeclaration */:
+                case 225 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 180 /* FunctionExpression */:
+                case 184 /* FunctionExpression */:
                     return visitFunctionExpression(node);
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
                     return visitAccessorDeclaration(node);
-                case 201 /* VariableStatement */:
+                case 205 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 207 /* ForStatement */:
+                case 211 /* ForStatement */:
                     return visitForStatement(node);
-                case 208 /* ForInStatement */:
+                case 212 /* ForInStatement */:
                     return visitForInStatement(node);
-                case 211 /* BreakStatement */:
+                case 215 /* BreakStatement */:
                     return visitBreakStatement(node);
-                case 210 /* ContinueStatement */:
+                case 214 /* ContinueStatement */:
                     return visitContinueStatement(node);
-                case 212 /* ReturnStatement */:
+                case 216 /* ReturnStatement */:
                     return visitReturnStatement(node);
                 default:
-                    if (node.transformFlags & 16777216 /* ContainsYield */) {
+                    if (node.transformFlags & 134217728 /* ContainsYield */) {
                         return visitJavaScriptContainingYield(node);
                     }
-                    else if (node.transformFlags & (4096 /* ContainsGenerator */ | 33554432 /* ContainsHoistedDeclarationOrCompletion */)) {
+                    else if (node.transformFlags & (8192 /* ContainsGenerator */ | 268435456 /* ContainsHoistedDeclarationOrCompletion */)) {
                         return ts.visitEachChild(node, visitor, context);
                     }
                     else {
@@ -49472,21 +51293,21 @@ var ts;
          */
         function visitJavaScriptContainingYield(node) {
             switch (node.kind) {
-                case 188 /* BinaryExpression */:
+                case 192 /* BinaryExpression */:
                     return visitBinaryExpression(node);
-                case 189 /* ConditionalExpression */:
+                case 193 /* ConditionalExpression */:
                     return visitConditionalExpression(node);
-                case 191 /* YieldExpression */:
+                case 195 /* YieldExpression */:
                     return visitYieldExpression(node);
-                case 171 /* ArrayLiteralExpression */:
+                case 175 /* ArrayLiteralExpression */:
                     return visitArrayLiteralExpression(node);
-                case 172 /* ObjectLiteralExpression */:
+                case 176 /* ObjectLiteralExpression */:
                     return visitObjectLiteralExpression(node);
-                case 174 /* ElementAccessExpression */:
+                case 178 /* ElementAccessExpression */:
                     return visitElementAccessExpression(node);
-                case 175 /* CallExpression */:
+                case 179 /* CallExpression */:
                     return visitCallExpression(node);
-                case 176 /* NewExpression */:
+                case 180 /* NewExpression */:
                     return visitNewExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -49499,9 +51320,9 @@ var ts;
          */
         function visitGenerator(node) {
             switch (node.kind) {
-                case 221 /* FunctionDeclaration */:
+                case 225 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 180 /* FunctionExpression */:
+                case 184 /* FunctionExpression */:
                     return visitFunctionExpression(node);
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -49662,7 +51483,7 @@ var ts;
          * @param node The node to visit.
          */
         function visitVariableStatement(node) {
-            if (node.transformFlags & 16777216 /* ContainsYield */) {
+            if (node.transformFlags & 134217728 /* ContainsYield */) {
                 transformAndEmitVariableDeclarationList(node.declarationList);
                 return undefined;
             }
@@ -49730,7 +51551,7 @@ var ts;
             if (containsYield(right)) {
                 var target = void 0;
                 switch (left.kind) {
-                    case 173 /* PropertyAccessExpression */:
+                    case 177 /* PropertyAccessExpression */:
                         // [source]
                         //      a.b = yield;
                         //
@@ -49742,7 +51563,7 @@ var ts;
                         //      _a.b = %sent%;
                         target = ts.updatePropertyAccess(left, cacheExpression(ts.visitNode(left.expression, visitor, ts.isLeftHandSideExpression)), left.name);
                         break;
-                    case 174 /* ElementAccessExpression */:
+                    case 178 /* ElementAccessExpression */:
                         // [source]
                         //      a[b] = yield;
                         //
@@ -50111,35 +51932,35 @@ var ts;
         }
         function transformAndEmitStatementWorker(node) {
             switch (node.kind) {
-                case 200 /* Block */:
+                case 204 /* Block */:
                     return transformAndEmitBlock(node);
-                case 203 /* ExpressionStatement */:
+                case 207 /* ExpressionStatement */:
                     return transformAndEmitExpressionStatement(node);
-                case 204 /* IfStatement */:
+                case 208 /* IfStatement */:
                     return transformAndEmitIfStatement(node);
-                case 205 /* DoStatement */:
+                case 209 /* DoStatement */:
                     return transformAndEmitDoStatement(node);
-                case 206 /* WhileStatement */:
+                case 210 /* WhileStatement */:
                     return transformAndEmitWhileStatement(node);
-                case 207 /* ForStatement */:
+                case 211 /* ForStatement */:
                     return transformAndEmitForStatement(node);
-                case 208 /* ForInStatement */:
+                case 212 /* ForInStatement */:
                     return transformAndEmitForInStatement(node);
-                case 210 /* ContinueStatement */:
+                case 214 /* ContinueStatement */:
                     return transformAndEmitContinueStatement(node);
-                case 211 /* BreakStatement */:
+                case 215 /* BreakStatement */:
                     return transformAndEmitBreakStatement(node);
-                case 212 /* ReturnStatement */:
+                case 216 /* ReturnStatement */:
                     return transformAndEmitReturnStatement(node);
-                case 213 /* WithStatement */:
+                case 217 /* WithStatement */:
                     return transformAndEmitWithStatement(node);
-                case 214 /* SwitchStatement */:
+                case 218 /* SwitchStatement */:
                     return transformAndEmitSwitchStatement(node);
-                case 215 /* LabeledStatement */:
+                case 219 /* LabeledStatement */:
                     return transformAndEmitLabeledStatement(node);
-                case 216 /* ThrowStatement */:
+                case 220 /* ThrowStatement */:
                     return transformAndEmitThrowStatement(node);
-                case 217 /* TryStatement */:
+                case 221 /* TryStatement */:
                     return transformAndEmitTryStatement(node);
                 default:
                     return emitStatement(ts.visitNode(node, visitor, ts.isStatement, /*optional*/ true));
@@ -50559,7 +52380,7 @@ var ts;
                 for (var i = 0; i < numClauses; i++) {
                     var clause = caseBlock.clauses[i];
                     clauseLabels.push(defineLabel());
-                    if (clause.kind === 250 /* DefaultClause */ && defaultClauseIndex === -1) {
+                    if (clause.kind === 254 /* DefaultClause */ && defaultClauseIndex === -1) {
                         defaultClauseIndex = i;
                     }
                 }
@@ -50572,7 +52393,7 @@ var ts;
                     var defaultClausesSkipped = 0;
                     for (var i = clausesWritten; i < numClauses; i++) {
                         var clause = caseBlock.clauses[i];
-                        if (clause.kind === 249 /* CaseClause */) {
+                        if (clause.kind === 253 /* CaseClause */) {
                             var caseClause = clause;
                             if (containsYield(caseClause.expression) && pendingClauses.length > 0) {
                                 break;
@@ -50703,7 +52524,7 @@ var ts;
             }
         }
         function containsYield(node) {
-            return node && (node.transformFlags & 16777216 /* ContainsYield */) !== 0;
+            return node && (node.transformFlags & 134217728 /* ContainsYield */) !== 0;
         }
         function countInitialNodesWithoutYield(nodes) {
             var numNodes = nodes.length;
@@ -50733,9 +52554,9 @@ var ts;
                 if (ts.isIdentifier(original) && original.parent) {
                     var declaration = resolver.getReferencedValueDeclaration(original);
                     if (declaration) {
-                        var name_34 = ts.getProperty(renamedCatchVariableDeclarations, String(ts.getOriginalNodeId(declaration)));
-                        if (name_34) {
-                            var clone_8 = ts.getMutableClone(name_34);
+                        var name_35 = ts.getProperty(renamedCatchVariableDeclarations, String(ts.getOriginalNodeId(declaration)));
+                        if (name_35) {
+                            var clone_8 = ts.getMutableClone(name_35);
                             ts.setSourceMapRange(clone_8, node);
                             ts.setCommentRange(clone_8, node);
                             return clone_8;
@@ -51137,7 +52958,7 @@ var ts;
                 if (labelExpressions === undefined) {
                     labelExpressions = [];
                 }
-                var expression = ts.createSynthesizedNode(8 /* NumericLiteral */);
+                var expression = ts.createLiteral(-1);
                 if (labelExpressions[label] === undefined) {
                     labelExpressions[label] = [expression];
                 }
@@ -51146,7 +52967,7 @@ var ts;
                 }
                 return expression;
             }
-            return ts.createNode(194 /* OmittedExpression */);
+            return ts.createOmittedExpression();
         }
         /**
          * Creates a numeric literal for the provided instruction.
@@ -51331,7 +53152,7 @@ var ts;
                 /*modifiers*/ undefined, 
                 /*asteriskToken*/ undefined, 
                 /*name*/ undefined, 
-                /*typeParameters*/ undefined, [ts.createParameter(state)], 
+                /*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, state)], 
                 /*type*/ undefined, ts.createBlock(buildResult, 
                 /*location*/ undefined, 
                 /*multiLine*/ buildResult.length > 0)), 4194304 /* ReuseTempVariableScope */)
@@ -51708,1909 +53529,6 @@ var ts;
     ts.transformGenerators = transformGenerators;
     var _a;
 })(ts || (ts = {}));
-/// <reference path="../../factory.ts" />
-/// <reference path="../../visitor.ts" />
-/*@internal*/
-var ts;
-(function (ts) {
-    function transformModule(context) {
-        var transformModuleDelegates = ts.createMap((_a = {},
-            _a[ts.ModuleKind.None] = transformCommonJSModule,
-            _a[ts.ModuleKind.CommonJS] = transformCommonJSModule,
-            _a[ts.ModuleKind.AMD] = transformAMDModule,
-            _a[ts.ModuleKind.UMD] = transformUMDModule,
-            _a));
-        var startLexicalEnvironment = context.startLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration;
-        var compilerOptions = context.getCompilerOptions();
-        var resolver = context.getEmitResolver();
-        var host = context.getEmitHost();
-        var languageVersion = ts.getEmitScriptTarget(compilerOptions);
-        var moduleKind = ts.getEmitModuleKind(compilerOptions);
-        var previousOnSubstituteNode = context.onSubstituteNode;
-        var previousOnEmitNode = context.onEmitNode;
-        context.onSubstituteNode = onSubstituteNode;
-        context.onEmitNode = onEmitNode;
-        context.enableSubstitution(70 /* Identifier */);
-        context.enableSubstitution(188 /* BinaryExpression */);
-        context.enableSubstitution(186 /* PrefixUnaryExpression */);
-        context.enableSubstitution(187 /* PostfixUnaryExpression */);
-        context.enableSubstitution(254 /* ShorthandPropertyAssignment */);
-        context.enableEmitNotification(256 /* SourceFile */);
-        var currentSourceFile;
-        var externalImports;
-        var exportSpecifiers;
-        var exportEquals;
-        var bindingNameExportSpecifiersMap;
-        // Subset of exportSpecifiers that is a binding-name.
-        // This is to reduce amount of memory we have to keep around even after we done with module-transformer
-        var bindingNameExportSpecifiersForFileMap = ts.createMap();
-        var hasExportStarsToExportValues;
-        return transformSourceFile;
-        /**
-         * Transforms the module aspects of a SourceFile.
-         *
-         * @param node The SourceFile node.
-         */
-        function transformSourceFile(node) {
-            if (ts.isDeclarationFile(node)) {
-                return node;
-            }
-            if (ts.isExternalModule(node) || compilerOptions.isolatedModules) {
-                currentSourceFile = node;
-                // Collect information about the external module.
-                (_a = ts.collectExternalModuleInfo(node), externalImports = _a.externalImports, exportSpecifiers = _a.exportSpecifiers, exportEquals = _a.exportEquals, hasExportStarsToExportValues = _a.hasExportStarsToExportValues, _a);
-                // Perform the transformation.
-                var transformModule_1 = transformModuleDelegates[moduleKind] || transformModuleDelegates[ts.ModuleKind.None];
-                var updated = transformModule_1(node);
-                ts.aggregateTransformFlags(updated);
-                currentSourceFile = undefined;
-                externalImports = undefined;
-                exportSpecifiers = undefined;
-                exportEquals = undefined;
-                hasExportStarsToExportValues = false;
-                return updated;
-            }
-            return node;
-            var _a;
-        }
-        /**
-         * Transforms a SourceFile into a CommonJS module.
-         *
-         * @param node The SourceFile node.
-         */
-        function transformCommonJSModule(node) {
-            startLexicalEnvironment();
-            var statements = [];
-            var statementOffset = ts.addPrologueDirectives(statements, node.statements, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict, visitor);
-            ts.addRange(statements, ts.visitNodes(node.statements, visitor, ts.isStatement, statementOffset));
-            ts.addRange(statements, endLexicalEnvironment());
-            addExportEqualsIfNeeded(statements, /*emitAsReturn*/ false);
-            var updated = updateSourceFile(node, statements);
-            if (hasExportStarsToExportValues) {
-                ts.setEmitFlags(updated, 2 /* EmitExportStar */ | ts.getEmitFlags(node));
-            }
-            return updated;
-        }
-        /**
-         * Transforms a SourceFile into an AMD module.
-         *
-         * @param node The SourceFile node.
-         */
-        function transformAMDModule(node) {
-            var define = ts.createIdentifier("define");
-            var moduleName = ts.tryGetModuleNameFromFile(node, host, compilerOptions);
-            return transformAsynchronousModule(node, define, moduleName, /*includeNonAmdDependencies*/ true);
-        }
-        /**
-         * Transforms a SourceFile into a UMD module.
-         *
-         * @param node The SourceFile node.
-         */
-        function transformUMDModule(node) {
-            var define = ts.createIdentifier("define");
-            ts.setEmitFlags(define, 16 /* UMDDefine */);
-            return transformAsynchronousModule(node, define, /*moduleName*/ undefined, /*includeNonAmdDependencies*/ false);
-        }
-        /**
-         * Transforms a SourceFile into an AMD or UMD module.
-         *
-         * @param node The SourceFile node.
-         * @param define The expression used to define the module.
-         * @param moduleName An expression for the module name, if available.
-         * @param includeNonAmdDependencies A value indicating whether to incldue any non-AMD dependencies.
-         */
-        function transformAsynchronousModule(node, define, moduleName, includeNonAmdDependencies) {
-            // An AMD define function has the following shape:
-            //
-            //     define(id?, dependencies?, factory);
-            //
-            // This has the shape of the following:
-            //
-            //     define(name, ["module1", "module2"], function (module1Alias) { ... }
-            //
-            // The location of the alias in the parameter list in the factory function needs to
-            // match the position of the module name in the dependency list.
-            //
-            // To ensure this is true in cases of modules with no aliases, e.g.:
-            //
-            //     import "module"
-            //
-            // or
-            //
-            //     /// <amd-dependency path= "a.css" />
-            //
-            // we need to add modules without alias names to the end of the dependencies list
-            var _a = collectAsynchronousDependencies(node, includeNonAmdDependencies), aliasedModuleNames = _a.aliasedModuleNames, unaliasedModuleNames = _a.unaliasedModuleNames, importAliasNames = _a.importAliasNames;
-            // Create an updated SourceFile:
-            //
-            //     define(moduleName?, ["module1", "module2"], function ...
-            return updateSourceFile(node, [
-                ts.createStatement(ts.createCall(define, 
-                /*typeArguments*/ undefined, (moduleName ? [moduleName] : []).concat([
-                    // Add the dependency array argument:
-                    //
-                    //     ["require", "exports", module1", "module2", ...]
-                    ts.createArrayLiteral([
-                        ts.createLiteral("require"),
-                        ts.createLiteral("exports")
-                    ].concat(aliasedModuleNames, unaliasedModuleNames)),
-                    // Add the module body function argument:
-                    //
-                    //     function (require, exports, module1, module2) ...
-                    ts.createFunctionExpression(
-                    /*modifiers*/ undefined, 
-                    /*asteriskToken*/ undefined, 
-                    /*name*/ undefined, 
-                    /*typeParameters*/ undefined, [
-                        ts.createParameter("require"),
-                        ts.createParameter("exports")
-                    ].concat(importAliasNames), 
-                    /*type*/ undefined, transformAsynchronousModuleBody(node))
-                ])))
-            ]);
-        }
-        /**
-         * Transforms a SourceFile into an AMD or UMD module body.
-         *
-         * @param node The SourceFile node.
-         */
-        function transformAsynchronousModuleBody(node) {
-            startLexicalEnvironment();
-            var statements = [];
-            var statementOffset = ts.addPrologueDirectives(statements, node.statements, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict, visitor);
-            // Visit each statement of the module body.
-            ts.addRange(statements, ts.visitNodes(node.statements, visitor, ts.isStatement, statementOffset));
-            // End the lexical environment for the module body
-            // and merge any new lexical declarations.
-            ts.addRange(statements, endLexicalEnvironment());
-            // Append the 'export =' statement if provided.
-            addExportEqualsIfNeeded(statements, /*emitAsReturn*/ true);
-            var body = ts.createBlock(statements, /*location*/ undefined, /*multiLine*/ true);
-            if (hasExportStarsToExportValues) {
-                // If we have any `export * from ...` declarations
-                // we need to inform the emitter to add the __export helper.
-                ts.setEmitFlags(body, 2 /* EmitExportStar */);
-            }
-            return body;
-        }
-        function addExportEqualsIfNeeded(statements, emitAsReturn) {
-            if (exportEquals) {
-                if (emitAsReturn) {
-                    var statement = ts.createReturn(exportEquals.expression, 
-                    /*location*/ exportEquals);
-                    ts.setEmitFlags(statement, 12288 /* NoTokenSourceMaps */ | 49152 /* NoComments */);
-                    statements.push(statement);
-                }
-                else {
-                    var statement = ts.createStatement(ts.createAssignment(ts.createPropertyAccess(ts.createIdentifier("module"), "exports"), exportEquals.expression), 
-                    /*location*/ exportEquals);
-                    ts.setEmitFlags(statement, 49152 /* NoComments */);
-                    statements.push(statement);
-                }
-            }
-        }
-        /**
-         * Visits a node at the top level of the source file.
-         *
-         * @param node The node.
-         */
-        function visitor(node) {
-            switch (node.kind) {
-                case 231 /* ImportDeclaration */:
-                    return visitImportDeclaration(node);
-                case 230 /* ImportEqualsDeclaration */:
-                    return visitImportEqualsDeclaration(node);
-                case 237 /* ExportDeclaration */:
-                    return visitExportDeclaration(node);
-                case 236 /* ExportAssignment */:
-                    return visitExportAssignment(node);
-                case 201 /* VariableStatement */:
-                    return visitVariableStatement(node);
-                case 221 /* FunctionDeclaration */:
-                    return visitFunctionDeclaration(node);
-                case 222 /* ClassDeclaration */:
-                    return visitClassDeclaration(node);
-                case 203 /* ExpressionStatement */:
-                    return visitExpressionStatement(node);
-                default:
-                    // This visitor does not descend into the tree, as export/import statements
-                    // are only transformed at the top level of a file.
-                    return node;
-            }
-        }
-        /**
-         * Visits an ImportDeclaration node.
-         *
-         * @param node The ImportDeclaration node.
-         */
-        function visitImportDeclaration(node) {
-            if (!ts.contains(externalImports, node)) {
-                return undefined;
-            }
-            var statements = [];
-            var namespaceDeclaration = ts.getNamespaceDeclarationNode(node);
-            if (moduleKind !== ts.ModuleKind.AMD) {
-                if (!node.importClause) {
-                    // import "mod";
-                    statements.push(ts.createStatement(createRequireCall(node), 
-                    /*location*/ node));
-                }
-                else {
-                    var variables = [];
-                    if (namespaceDeclaration && !ts.isDefaultImport(node)) {
-                        // import * as n from "mod";
-                        variables.push(ts.createVariableDeclaration(ts.getSynthesizedClone(namespaceDeclaration.name), 
-                        /*type*/ undefined, createRequireCall(node)));
-                    }
-                    else {
-                        // import d from "mod";
-                        // import { x, y } from "mod";
-                        // import d, { x, y } from "mod";
-                        // import d, * as n from "mod";
-                        variables.push(ts.createVariableDeclaration(ts.getGeneratedNameForNode(node), 
-                        /*type*/ undefined, createRequireCall(node)));
-                        if (namespaceDeclaration && ts.isDefaultImport(node)) {
-                            variables.push(ts.createVariableDeclaration(ts.getSynthesizedClone(namespaceDeclaration.name), 
-                            /*type*/ undefined, ts.getGeneratedNameForNode(node)));
-                        }
-                    }
-                    statements.push(ts.createVariableStatement(
-                    /*modifiers*/ undefined, ts.createConstDeclarationList(variables), 
-                    /*location*/ node));
-                }
-            }
-            else if (namespaceDeclaration && ts.isDefaultImport(node)) {
-                // import d, * as n from "mod";
-                statements.push(ts.createVariableStatement(
-                /*modifiers*/ undefined, ts.createVariableDeclarationList([
-                    ts.createVariableDeclaration(ts.getSynthesizedClone(namespaceDeclaration.name), 
-                    /*type*/ undefined, ts.getGeneratedNameForNode(node), 
-                    /*location*/ node)
-                ])));
-            }
-            addExportImportAssignments(statements, node);
-            return ts.singleOrMany(statements);
-        }
-        function visitImportEqualsDeclaration(node) {
-            if (!ts.contains(externalImports, node)) {
-                return undefined;
-            }
-            // Set emitFlags on the name of the importEqualsDeclaration
-            // This is so the printer will not substitute the identifier
-            ts.setEmitFlags(node.name, 128 /* NoSubstitution */);
-            var statements = [];
-            if (moduleKind !== ts.ModuleKind.AMD) {
-                if (ts.hasModifier(node, 1 /* Export */)) {
-                    statements.push(ts.createStatement(createExportAssignment(node.name, createRequireCall(node)), 
-                    /*location*/ node));
-                }
-                else {
-                    statements.push(ts.createVariableStatement(
-                    /*modifiers*/ undefined, ts.createVariableDeclarationList([
-                        ts.createVariableDeclaration(ts.getSynthesizedClone(node.name), 
-                        /*type*/ undefined, createRequireCall(node))
-                    ], 
-                    /*location*/ undefined, 
-                    /*flags*/ languageVersion >= 2 /* ES2015 */ ? 2 /* Const */ : 0 /* None */), 
-                    /*location*/ node));
-                }
-            }
-            else {
-                if (ts.hasModifier(node, 1 /* Export */)) {
-                    statements.push(ts.createStatement(createExportAssignment(node.name, node.name), 
-                    /*location*/ node));
-                }
-            }
-            addExportImportAssignments(statements, node);
-            return statements;
-        }
-        function visitExportDeclaration(node) {
-            if (!ts.contains(externalImports, node)) {
-                return undefined;
-            }
-            var generatedName = ts.getGeneratedNameForNode(node);
-            if (node.exportClause) {
-                var statements = [];
-                // export { x, y } from "mod";
-                if (moduleKind !== ts.ModuleKind.AMD) {
-                    statements.push(ts.createVariableStatement(
-                    /*modifiers*/ undefined, ts.createVariableDeclarationList([
-                        ts.createVariableDeclaration(generatedName, 
-                        /*type*/ undefined, createRequireCall(node))
-                    ]), 
-                    /*location*/ node));
-                }
-                for (var _i = 0, _a = node.exportClause.elements; _i < _a.length; _i++) {
-                    var specifier = _a[_i];
-                    var exportedValue = ts.createPropertyAccess(generatedName, specifier.propertyName || specifier.name);
-                    statements.push(ts.createStatement(createExportAssignment(specifier.name, exportedValue), 
-                    /*location*/ specifier));
-                }
-                return ts.singleOrMany(statements);
-            }
-            else {
-                // export * from "mod";
-                return ts.createStatement(ts.createCall(ts.createIdentifier("__export"), 
-                /*typeArguments*/ undefined, [
-                    moduleKind !== ts.ModuleKind.AMD
-                        ? createRequireCall(node)
-                        : generatedName
-                ]), 
-                /*location*/ node);
-            }
-        }
-        function visitExportAssignment(node) {
-            if (node.isExportEquals) {
-                // Elide as `export=` is handled in addExportEqualsIfNeeded
-                return undefined;
-            }
-            var statements = [];
-            addExportDefault(statements, node.expression, /*location*/ node);
-            return statements;
-        }
-        function addExportDefault(statements, expression, location) {
-            tryAddExportDefaultCompat(statements);
-            statements.push(ts.createStatement(createExportAssignment(ts.createIdentifier("default"), expression), location));
-        }
-        function tryAddExportDefaultCompat(statements) {
-            var original = ts.getOriginalNode(currentSourceFile);
-            ts.Debug.assert(original.kind === 256 /* SourceFile */);
-            if (!original.symbol.exports["___esModule"]) {
-                if (languageVersion === 0 /* ES3 */) {
-                    statements.push(ts.createStatement(createExportAssignment(ts.createIdentifier("__esModule"), ts.createLiteral(true))));
-                }
-                else {
-                    statements.push(ts.createStatement(ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Object"), "defineProperty"), 
-                    /*typeArguments*/ undefined, [
-                        ts.createIdentifier("exports"),
-                        ts.createLiteral("__esModule"),
-                        ts.createObjectLiteral([
-                            ts.createPropertyAssignment("value", ts.createLiteral(true))
-                        ])
-                    ])));
-                }
-            }
-        }
-        function addExportImportAssignments(statements, node) {
-            if (ts.isImportEqualsDeclaration(node)) {
-                addExportMemberAssignments(statements, node.name);
-            }
-            else {
-                var names = ts.reduceEachChild(node, collectExportMembers, []);
-                for (var _i = 0, names_1 = names; _i < names_1.length; _i++) {
-                    var name_35 = names_1[_i];
-                    addExportMemberAssignments(statements, name_35);
-                }
-            }
-        }
-        function collectExportMembers(names, node) {
-            if (ts.isAliasSymbolDeclaration(node) && ts.isDeclaration(node)) {
-                var name_36 = node.name;
-                if (ts.isIdentifier(name_36)) {
-                    names.push(name_36);
-                }
-            }
-            return ts.reduceEachChild(node, collectExportMembers, names);
-        }
-        function addExportMemberAssignments(statements, name) {
-            if (!exportEquals && exportSpecifiers && ts.hasProperty(exportSpecifiers, name.text)) {
-                for (var _i = 0, _a = exportSpecifiers[name.text]; _i < _a.length; _i++) {
-                    var specifier = _a[_i];
-                    statements.push(ts.startOnNewLine(ts.createStatement(createExportAssignment(specifier.name, name), 
-                    /*location*/ specifier.name)));
-                }
-            }
-        }
-        function addExportMemberAssignment(statements, node) {
-            if (ts.hasModifier(node, 512 /* Default */)) {
-                addExportDefault(statements, getDeclarationName(node), /*location*/ node);
-            }
-            else {
-                statements.push(createExportStatement(node.name, ts.setEmitFlags(ts.getSynthesizedClone(node.name), 262144 /* LocalName */), /*location*/ node));
-            }
-        }
-        function visitVariableStatement(node) {
-            // If the variable is for a generated declaration,
-            // we should maintain it and just strip off the 'export' modifier if necessary.
-            var originalKind = ts.getOriginalNode(node).kind;
-            if (originalKind === 226 /* ModuleDeclaration */ ||
-                originalKind === 225 /* EnumDeclaration */ ||
-                originalKind === 222 /* ClassDeclaration */) {
-                if (!ts.hasModifier(node, 1 /* Export */)) {
-                    return node;
-                }
-                return ts.setOriginalNode(ts.createVariableStatement(
-                /*modifiers*/ undefined, node.declarationList), node);
-            }
-            var resultStatements = [];
-            // If we're exporting these variables, then these just become assignments to 'exports.blah'.
-            // We only want to emit assignments for variables with initializers.
-            if (ts.hasModifier(node, 1 /* Export */)) {
-                var variables = ts.getInitializedVariables(node.declarationList);
-                if (variables.length > 0) {
-                    var inlineAssignments = ts.createStatement(ts.inlineExpressions(ts.map(variables, transformInitializedVariable)), node);
-                    resultStatements.push(inlineAssignments);
-                }
-            }
-            else {
-                resultStatements.push(node);
-            }
-            // While we might not have been exported here, each variable might have been exported
-            // later on in an export specifier (e.g. `export {foo as blah, bar}`).
-            for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
-                var decl = _a[_i];
-                addExportMemberAssignmentsForBindingName(resultStatements, decl.name);
-            }
-            return resultStatements;
-        }
-        /**
-         * Creates appropriate assignments for each binding identifier that is exported in an export specifier,
-         * and inserts it into 'resultStatements'.
-         */
-        function addExportMemberAssignmentsForBindingName(resultStatements, name) {
-            if (ts.isBindingPattern(name)) {
-                for (var _i = 0, _a = name.elements; _i < _a.length; _i++) {
-                    var element = _a[_i];
-                    if (!ts.isOmittedExpression(element)) {
-                        addExportMemberAssignmentsForBindingName(resultStatements, element.name);
-                    }
-                }
-            }
-            else {
-                if (!exportEquals && exportSpecifiers && ts.hasProperty(exportSpecifiers, name.text)) {
-                    var sourceFileId = ts.getOriginalNodeId(currentSourceFile);
-                    if (!bindingNameExportSpecifiersForFileMap[sourceFileId]) {
-                        bindingNameExportSpecifiersForFileMap[sourceFileId] = ts.createMap();
-                    }
-                    bindingNameExportSpecifiersForFileMap[sourceFileId][name.text] = exportSpecifiers[name.text];
-                    addExportMemberAssignments(resultStatements, name);
-                }
-            }
-        }
-        function transformInitializedVariable(node) {
-            var name = node.name;
-            if (ts.isBindingPattern(name)) {
-                return ts.flattenVariableDestructuringToExpression(node, hoistVariableDeclaration, getModuleMemberName, visitor);
-            }
-            else {
-                return ts.createAssignment(getModuleMemberName(name), ts.visitNode(node.initializer, visitor, ts.isExpression));
-            }
-        }
-        function visitFunctionDeclaration(node) {
-            var statements = [];
-            var name = node.name || ts.getGeneratedNameForNode(node);
-            if (ts.hasModifier(node, 1 /* Export */)) {
-                // Keep async modifier for ES2017 transformer
-                var isAsync = ts.hasModifier(node, 256 /* Async */);
-                statements.push(ts.setOriginalNode(ts.createFunctionDeclaration(
-                /*decorators*/ undefined, isAsync ? [ts.createNode(119 /* AsyncKeyword */)] : undefined, node.asteriskToken, name, 
-                /*typeParameters*/ undefined, node.parameters, 
-                /*type*/ undefined, node.body, 
-                /*location*/ node), 
-                /*original*/ node));
-                addExportMemberAssignment(statements, node);
-            }
-            else {
-                statements.push(node);
-            }
-            if (node.name) {
-                addExportMemberAssignments(statements, node.name);
-            }
-            return ts.singleOrMany(statements);
-        }
-        function visitClassDeclaration(node) {
-            var statements = [];
-            var name = node.name || ts.getGeneratedNameForNode(node);
-            if (ts.hasModifier(node, 1 /* Export */)) {
-                statements.push(ts.setOriginalNode(ts.createClassDeclaration(
-                /*decorators*/ undefined, 
-                /*modifiers*/ undefined, name, 
-                /*typeParameters*/ undefined, node.heritageClauses, node.members, 
-                /*location*/ node), 
-                /*original*/ node));
-                addExportMemberAssignment(statements, node);
-            }
-            else {
-                statements.push(node);
-            }
-            // Decorators end up creating a series of assignment expressions which overwrite
-            // the local binding that we export, so we need to defer from exporting decorated classes
-            // until the decoration assignments take place. We do this when visiting expression-statements.
-            if (node.name && !(node.decorators && node.decorators.length)) {
-                addExportMemberAssignments(statements, node.name);
-            }
-            return ts.singleOrMany(statements);
-        }
-        function visitExpressionStatement(node) {
-            var original = ts.getOriginalNode(node);
-            var origKind = original.kind;
-            if (origKind === 225 /* EnumDeclaration */ || origKind === 226 /* ModuleDeclaration */) {
-                return visitExpressionStatementForEnumOrNamespaceDeclaration(node, original);
-            }
-            else if (origKind === 222 /* ClassDeclaration */) {
-                // The decorated assignment for a class name may need to be transformed.
-                var classDecl = original;
-                if (classDecl.name) {
-                    var statements = [node];
-                    addExportMemberAssignments(statements, classDecl.name);
-                    return statements;
-                }
-            }
-            return node;
-        }
-        function visitExpressionStatementForEnumOrNamespaceDeclaration(node, original) {
-            var statements = [node];
-            // Preserve old behavior for enums in which a variable statement is emitted after the body itself.
-            if (ts.hasModifier(original, 1 /* Export */) &&
-                original.kind === 225 /* EnumDeclaration */ &&
-                ts.isFirstDeclarationOfKind(original, 225 /* EnumDeclaration */)) {
-                addVarForExportedEnumOrNamespaceDeclaration(statements, original);
-            }
-            addExportMemberAssignments(statements, original.name);
-            return statements;
-        }
-        /**
-         * Adds a trailing VariableStatement for an enum or module declaration.
-         */
-        function addVarForExportedEnumOrNamespaceDeclaration(statements, node) {
-            var transformedStatement = ts.createVariableStatement(
-            /*modifiers*/ undefined, [ts.createVariableDeclaration(getDeclarationName(node), 
-                /*type*/ undefined, ts.createPropertyAccess(ts.createIdentifier("exports"), getDeclarationName(node)))], 
-            /*location*/ node);
-            ts.setEmitFlags(transformedStatement, 49152 /* NoComments */);
-            statements.push(transformedStatement);
-        }
-        function getDeclarationName(node) {
-            return node.name ? ts.getSynthesizedClone(node.name) : ts.getGeneratedNameForNode(node);
-        }
-        function onEmitNode(emitContext, node, emitCallback) {
-            if (node.kind === 256 /* SourceFile */) {
-                bindingNameExportSpecifiersMap = bindingNameExportSpecifiersForFileMap[ts.getOriginalNodeId(node)];
-                previousOnEmitNode(emitContext, node, emitCallback);
-                bindingNameExportSpecifiersMap = undefined;
-            }
-            else {
-                previousOnEmitNode(emitContext, node, emitCallback);
-            }
-        }
-        /**
-         * Hooks node substitutions.
-         *
-         * @param node The node to substitute.
-         * @param isExpression A value indicating whether the node is to be used in an expression
-         *                     position.
-         */
-        function onSubstituteNode(emitContext, node) {
-            node = previousOnSubstituteNode(emitContext, node);
-            if (emitContext === 1 /* Expression */) {
-                return substituteExpression(node);
-            }
-            else if (ts.isShorthandPropertyAssignment(node)) {
-                return substituteShorthandPropertyAssignment(node);
-            }
-            return node;
-        }
-        function substituteShorthandPropertyAssignment(node) {
-            var name = node.name;
-            var exportedOrImportedName = substituteExpressionIdentifier(name);
-            if (exportedOrImportedName !== name) {
-                // A shorthand property with an assignment initializer is probably part of a
-                // destructuring assignment
-                if (node.objectAssignmentInitializer) {
-                    var initializer = ts.createAssignment(exportedOrImportedName, node.objectAssignmentInitializer);
-                    return ts.createPropertyAssignment(name, initializer, /*location*/ node);
-                }
-                return ts.createPropertyAssignment(name, exportedOrImportedName, /*location*/ node);
-            }
-            return node;
-        }
-        function substituteExpression(node) {
-            switch (node.kind) {
-                case 70 /* Identifier */:
-                    return substituteExpressionIdentifier(node);
-                case 188 /* BinaryExpression */:
-                    return substituteBinaryExpression(node);
-                case 187 /* PostfixUnaryExpression */:
-                case 186 /* PrefixUnaryExpression */:
-                    return substituteUnaryExpression(node);
-            }
-            return node;
-        }
-        function substituteExpressionIdentifier(node) {
-            return trySubstituteExportedName(node)
-                || trySubstituteImportedName(node)
-                || node;
-        }
-        function substituteBinaryExpression(node) {
-            var left = node.left;
-            // If the left-hand-side of the binaryExpression is an identifier and its is export through export Specifier
-            if (ts.isIdentifier(left) && ts.isAssignmentOperator(node.operatorToken.kind)) {
-                if (bindingNameExportSpecifiersMap && ts.hasProperty(bindingNameExportSpecifiersMap, left.text)) {
-                    ts.setEmitFlags(node, 128 /* NoSubstitution */);
-                    var nestedExportAssignment = void 0;
-                    for (var _i = 0, _a = bindingNameExportSpecifiersMap[left.text]; _i < _a.length; _i++) {
-                        var specifier = _a[_i];
-                        nestedExportAssignment = nestedExportAssignment ?
-                            createExportAssignment(specifier.name, nestedExportAssignment) :
-                            createExportAssignment(specifier.name, node);
-                    }
-                    return nestedExportAssignment;
-                }
-            }
-            return node;
-        }
-        function substituteUnaryExpression(node) {
-            // Because how the compiler only parse plusplus and minusminus to be either prefixUnaryExpression or postFixUnaryExpression depended on where they are
-            // We don't need to check that the operator has SyntaxKind.plusplus or SyntaxKind.minusminus
-            var operator = node.operator;
-            var operand = node.operand;
-            if (ts.isIdentifier(operand) && bindingNameExportSpecifiersForFileMap) {
-                if (bindingNameExportSpecifiersMap && ts.hasProperty(bindingNameExportSpecifiersMap, operand.text)) {
-                    ts.setEmitFlags(node, 128 /* NoSubstitution */);
-                    var transformedUnaryExpression = void 0;
-                    if (node.kind === 187 /* PostfixUnaryExpression */) {
-                        transformedUnaryExpression = ts.createBinary(operand, ts.createToken(operator === 42 /* PlusPlusToken */ ? 58 /* PlusEqualsToken */ : 59 /* MinusEqualsToken */), ts.createLiteral(1), 
-                        /*location*/ node);
-                        // We have to set no substitution flag here to prevent visit the binary expression and substitute it again as we will preform all necessary substitution in here
-                        ts.setEmitFlags(transformedUnaryExpression, 128 /* NoSubstitution */);
-                    }
-                    var nestedExportAssignment = void 0;
-                    for (var _i = 0, _a = bindingNameExportSpecifiersMap[operand.text]; _i < _a.length; _i++) {
-                        var specifier = _a[_i];
-                        nestedExportAssignment = nestedExportAssignment ?
-                            createExportAssignment(specifier.name, nestedExportAssignment) :
-                            createExportAssignment(specifier.name, transformedUnaryExpression || node);
-                    }
-                    return nestedExportAssignment;
-                }
-            }
-            return node;
-        }
-        function trySubstituteExportedName(node) {
-            var emitFlags = ts.getEmitFlags(node);
-            if ((emitFlags & 262144 /* LocalName */) === 0) {
-                var container = resolver.getReferencedExportContainer(node, (emitFlags & 131072 /* ExportName */) !== 0);
-                if (container) {
-                    if (container.kind === 256 /* SourceFile */) {
-                        return ts.createPropertyAccess(ts.createIdentifier("exports"), ts.getSynthesizedClone(node), 
-                        /*location*/ node);
-                    }
-                }
-            }
-            return undefined;
-        }
-        function trySubstituteImportedName(node) {
-            if ((ts.getEmitFlags(node) & 262144 /* LocalName */) === 0) {
-                var declaration = resolver.getReferencedImportDeclaration(node);
-                if (declaration) {
-                    if (ts.isImportClause(declaration)) {
-                        return ts.createPropertyAccess(ts.getGeneratedNameForNode(declaration.parent), ts.createIdentifier("default"), 
-                        /*location*/ node);
-                    }
-                    else if (ts.isImportSpecifier(declaration)) {
-                        var name_37 = declaration.propertyName || declaration.name;
-                        return ts.createPropertyAccess(ts.getGeneratedNameForNode(declaration.parent.parent.parent), ts.getSynthesizedClone(name_37), 
-                        /*location*/ node);
-                    }
-                }
-            }
-            return undefined;
-        }
-        function getModuleMemberName(name) {
-            return ts.createPropertyAccess(ts.createIdentifier("exports"), name, 
-            /*location*/ name);
-        }
-        function createRequireCall(importNode) {
-            var moduleName = ts.getExternalModuleNameLiteral(importNode, currentSourceFile, host, resolver, compilerOptions);
-            var args = [];
-            if (ts.isDefined(moduleName)) {
-                args.push(moduleName);
-            }
-            return ts.createCall(ts.createIdentifier("require"), /*typeArguments*/ undefined, args);
-        }
-        function createExportStatement(name, value, location) {
-            var statement = ts.createStatement(createExportAssignment(name, value));
-            statement.startsOnNewLine = true;
-            if (location) {
-                ts.setSourceMapRange(statement, location);
-            }
-            return statement;
-        }
-        function createExportAssignment(name, value) {
-            return ts.createAssignment(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.getSynthesizedClone(name)), value);
-        }
-        function collectAsynchronousDependencies(node, includeNonAmdDependencies) {
-            // names of modules with corresponding parameter in the factory function
-            var aliasedModuleNames = [];
-            // names of modules with no corresponding parameters in factory function
-            var unaliasedModuleNames = [];
-            // names of the parameters in the factory function; these
-            // parameters need to match the indexes of the corresponding
-            // module names in aliasedModuleNames.
-            var importAliasNames = [];
-            // Fill in amd-dependency tags
-            for (var _i = 0, _a = node.amdDependencies; _i < _a.length; _i++) {
-                var amdDependency = _a[_i];
-                if (amdDependency.name) {
-                    aliasedModuleNames.push(ts.createLiteral(amdDependency.path));
-                    importAliasNames.push(ts.createParameter(amdDependency.name));
-                }
-                else {
-                    unaliasedModuleNames.push(ts.createLiteral(amdDependency.path));
-                }
-            }
-            for (var _b = 0, externalImports_1 = externalImports; _b < externalImports_1.length; _b++) {
-                var importNode = externalImports_1[_b];
-                // Find the name of the external module
-                var externalModuleName = ts.getExternalModuleNameLiteral(importNode, currentSourceFile, host, resolver, compilerOptions);
-                // Find the name of the module alias, if there is one
-                var importAliasName = ts.getLocalNameForExternalImport(importNode, currentSourceFile);
-                if (includeNonAmdDependencies && importAliasName) {
-                    // Set emitFlags on the name of the classDeclaration
-                    // This is so that when printer will not substitute the identifier
-                    ts.setEmitFlags(importAliasName, 128 /* NoSubstitution */);
-                    aliasedModuleNames.push(externalModuleName);
-                    importAliasNames.push(ts.createParameter(importAliasName));
-                }
-                else {
-                    unaliasedModuleNames.push(externalModuleName);
-                }
-            }
-            return { aliasedModuleNames: aliasedModuleNames, unaliasedModuleNames: unaliasedModuleNames, importAliasNames: importAliasNames };
-        }
-        function updateSourceFile(node, statements) {
-            var updated = ts.getMutableClone(node);
-            updated.statements = ts.createNodeArray(statements, node.statements);
-            return updated;
-        }
-        var _a;
-    }
-    ts.transformModule = transformModule;
-})(ts || (ts = {}));
-/// <reference path="../../factory.ts" />
-/// <reference path="../../visitor.ts" />
-/*@internal*/
-var ts;
-(function (ts) {
-    function transformSystemModule(context) {
-        var startLexicalEnvironment = context.startLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration, hoistFunctionDeclaration = context.hoistFunctionDeclaration;
-        var compilerOptions = context.getCompilerOptions();
-        var resolver = context.getEmitResolver();
-        var host = context.getEmitHost();
-        var previousOnSubstituteNode = context.onSubstituteNode;
-        var previousOnEmitNode = context.onEmitNode;
-        context.onSubstituteNode = onSubstituteNode;
-        context.onEmitNode = onEmitNode;
-        context.enableSubstitution(70 /* Identifier */);
-        context.enableSubstitution(188 /* BinaryExpression */);
-        context.enableSubstitution(186 /* PrefixUnaryExpression */);
-        context.enableSubstitution(187 /* PostfixUnaryExpression */);
-        context.enableEmitNotification(256 /* SourceFile */);
-        var exportFunctionForFileMap = [];
-        var currentSourceFile;
-        var externalImports;
-        var exportSpecifiers;
-        var exportEquals;
-        var hasExportStarsToExportValues;
-        var exportFunctionForFile;
-        var contextObjectForFile;
-        var exportedLocalNames;
-        var exportedFunctionDeclarations;
-        var enclosingBlockScopedContainer;
-        var currentParent;
-        var currentNode;
-        return transformSourceFile;
-        function transformSourceFile(node) {
-            if (ts.isDeclarationFile(node)) {
-                return node;
-            }
-            if (ts.isExternalModule(node) || compilerOptions.isolatedModules) {
-                currentSourceFile = node;
-                currentNode = node;
-                // Perform the transformation.
-                var updated = transformSystemModuleWorker(node);
-                ts.aggregateTransformFlags(updated);
-                currentSourceFile = undefined;
-                externalImports = undefined;
-                exportSpecifiers = undefined;
-                exportEquals = undefined;
-                hasExportStarsToExportValues = false;
-                exportFunctionForFile = undefined;
-                contextObjectForFile = undefined;
-                exportedLocalNames = undefined;
-                exportedFunctionDeclarations = undefined;
-                return updated;
-            }
-            return node;
-        }
-        function transformSystemModuleWorker(node) {
-            // System modules have the following shape:
-            //
-            //     System.register(['dep-1', ... 'dep-n'], function(exports) {/* module body function */})
-            //
-            // The parameter 'exports' here is a callback '<T>(name: string, value: T) => T' that
-            // is used to publish exported values. 'exports' returns its 'value' argument so in
-            // most cases expressions that mutate exported values can be rewritten as:
-            //
-            //     expr -> exports('name', expr)
-            //
-            // The only exception in this rule is postfix unary operators,
-            // see comment to 'substitutePostfixUnaryExpression' for more details
-            ts.Debug.assert(!exportFunctionForFile);
-            // Collect information about the external module and dependency groups.
-            (_a = ts.collectExternalModuleInfo(node), externalImports = _a.externalImports, exportSpecifiers = _a.exportSpecifiers, exportEquals = _a.exportEquals, hasExportStarsToExportValues = _a.hasExportStarsToExportValues, _a);
-            // Make sure that the name of the 'exports' function does not conflict with
-            // existing identifiers.
-            exportFunctionForFile = ts.createUniqueName("exports");
-            contextObjectForFile = ts.createUniqueName("context");
-            exportFunctionForFileMap[ts.getOriginalNodeId(node)] = exportFunctionForFile;
-            var dependencyGroups = collectDependencyGroups(externalImports);
-            var statements = [];
-            // Add the body of the module.
-            addSystemModuleBody(statements, node, dependencyGroups);
-            var moduleName = ts.tryGetModuleNameFromFile(node, host, compilerOptions);
-            var dependencies = ts.createArrayLiteral(ts.map(dependencyGroups, getNameOfDependencyGroup));
-            var body = ts.createFunctionExpression(
-            /*modifiers*/ undefined, 
-            /*asteriskToken*/ undefined, 
-            /*name*/ undefined, 
-            /*typeParameters*/ undefined, [
-                ts.createParameter(exportFunctionForFile),
-                ts.createParameter(contextObjectForFile)
-            ], 
-            /*type*/ undefined, ts.setEmitFlags(ts.createBlock(statements, /*location*/ undefined, /*multiLine*/ true), 1 /* EmitEmitHelpers */));
-            // Write the call to `System.register`
-            // Clear the emit-helpers flag for later passes since we'll have already used it in the module body
-            // So the helper will be emit at the correct position instead of at the top of the source-file
-            return updateSourceFile(node, [
-                ts.createStatement(ts.createCall(ts.createPropertyAccess(ts.createIdentifier("System"), "register"), 
-                /*typeArguments*/ undefined, moduleName
-                    ? [moduleName, dependencies, body]
-                    : [dependencies, body]))
-            ], /*nodeEmitFlags*/ ~1 /* EmitEmitHelpers */ & ts.getEmitFlags(node));
-            var _a;
-        }
-        /**
-         * Adds the statements for the module body function for the source file.
-         *
-         * @param statements The output statements for the module body.
-         * @param node The source file for the module.
-         * @param statementOffset The offset at which to begin visiting the statements of the SourceFile.
-         */
-        function addSystemModuleBody(statements, node, dependencyGroups) {
-            // Shape of the body in system modules:
-            //
-            //  function (exports) {
-            //      <list of local aliases for imports>
-            //      <hoisted variable declarations>
-            //      <hoisted function declarations>
-            //      return {
-            //          setters: [
-            //              <list of setter function for imports>
-            //          ],
-            //          execute: function() {
-            //              <module statements>
-            //          }
-            //      }
-            //      <temp declarations>
-            //  }
-            //
-            // i.e:
-            //
-            //   import {x} from 'file1'
-            //   var y = 1;
-            //   export function foo() { return y + x(); }
-            //   console.log(y);
-            //
-            // Will be transformed to:
-            //
-            //  function(exports) {
-            //      var file_1; // local alias
-            //      var y;
-            //      function foo() { return y + file_1.x(); }
-            //      exports("foo", foo);
-            //      return {
-            //          setters: [
-            //              function(v) { file_1 = v }
-            //          ],
-            //          execute(): function() {
-            //              y = 1;
-            //              console.log(y);
-            //          }
-            //      };
-            //  }
-            // We start a new lexical environment in this function body, but *not* in the
-            // body of the execute function. This allows us to emit temporary declarations
-            // only in the outer module body and not in the inner one.
-            startLexicalEnvironment();
-            // Add any prologue directives.
-            var statementOffset = ts.addPrologueDirectives(statements, node.statements, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict, visitSourceElement);
-            // var __moduleName = context_1 && context_1.id;
-            statements.push(ts.createVariableStatement(
-            /*modifiers*/ undefined, ts.createVariableDeclarationList([
-                ts.createVariableDeclaration("__moduleName", 
-                /*type*/ undefined, ts.createLogicalAnd(contextObjectForFile, ts.createPropertyAccess(contextObjectForFile, "id")))
-            ])));
-            // Visit the statements of the source file, emitting any transformations into
-            // the `executeStatements` array. We do this *before* we fill the `setters` array
-            // as we both emit transformations as well as aggregate some data used when creating
-            // setters. This allows us to reduce the number of times we need to loop through the
-            // statements of the source file.
-            var executeStatements = ts.visitNodes(node.statements, visitSourceElement, ts.isStatement, statementOffset);
-            // We emit the lexical environment (hoisted variables and function declarations)
-            // early to align roughly with our previous emit output.
-            // Two key differences in this approach are:
-            // - Temporary variables will appear at the top rather than at the bottom of the file
-            // - Calls to the exporter for exported function declarations are grouped after
-            //   the declarations.
-            ts.addRange(statements, endLexicalEnvironment());
-            // Emit early exports for function declarations.
-            ts.addRange(statements, exportedFunctionDeclarations);
-            var exportStarFunction = addExportStarIfNeeded(statements);
-            statements.push(ts.createReturn(ts.setMultiLine(ts.createObjectLiteral([
-                ts.createPropertyAssignment("setters", generateSetters(exportStarFunction, dependencyGroups)),
-                ts.createPropertyAssignment("execute", ts.createFunctionExpression(
-                /*modifiers*/ undefined, 
-                /*asteriskToken*/ undefined, 
-                /*name*/ undefined, 
-                /*typeParameters*/ undefined, 
-                /*parameters*/ [], 
-                /*type*/ undefined, ts.createBlock(executeStatements, 
-                /*location*/ undefined, 
-                /*multiLine*/ true)))
-            ]), 
-            /*multiLine*/ true)));
-        }
-        function addExportStarIfNeeded(statements) {
-            if (!hasExportStarsToExportValues) {
-                return;
-            }
-            // when resolving exports local exported entries/indirect exported entries in the module
-            // should always win over entries with similar names that were added via star exports
-            // to support this we store names of local/indirect exported entries in a set.
-            // this set is used to filter names brought by star expors.
-            // local names set should only be added if we have anything exported
-            if (!exportedLocalNames && ts.isEmpty(exportSpecifiers)) {
-                // no exported declarations (export var ...) or export specifiers (export {x})
-                // check if we have any non star export declarations.
-                var hasExportDeclarationWithExportClause = false;
-                for (var _i = 0, externalImports_2 = externalImports; _i < externalImports_2.length; _i++) {
-                    var externalImport = externalImports_2[_i];
-                    if (externalImport.kind === 237 /* ExportDeclaration */ && externalImport.exportClause) {
-                        hasExportDeclarationWithExportClause = true;
-                        break;
-                    }
-                }
-                if (!hasExportDeclarationWithExportClause) {
-                    // we still need to emit exportStar helper
-                    return addExportStarFunction(statements, /*localNames*/ undefined);
-                }
-            }
-            var exportedNames = [];
-            if (exportedLocalNames) {
-                for (var _a = 0, exportedLocalNames_1 = exportedLocalNames; _a < exportedLocalNames_1.length; _a++) {
-                    var exportedLocalName = exportedLocalNames_1[_a];
-                    // write name of exported declaration, i.e 'export var x...'
-                    exportedNames.push(ts.createPropertyAssignment(ts.createLiteral(exportedLocalName.text), ts.createLiteral(true)));
-                }
-            }
-            for (var _b = 0, externalImports_3 = externalImports; _b < externalImports_3.length; _b++) {
-                var externalImport = externalImports_3[_b];
-                if (externalImport.kind !== 237 /* ExportDeclaration */) {
-                    continue;
-                }
-                var exportDecl = externalImport;
-                if (!exportDecl.exportClause) {
-                    // export * from ...
-                    continue;
-                }
-                for (var _c = 0, _d = exportDecl.exportClause.elements; _c < _d.length; _c++) {
-                    var element = _d[_c];
-                    // write name of indirectly exported entry, i.e. 'export {x} from ...'
-                    exportedNames.push(ts.createPropertyAssignment(ts.createLiteral((element.name || element.propertyName).text), ts.createLiteral(true)));
-                }
-            }
-            var exportedNamesStorageRef = ts.createUniqueName("exportedNames");
-            statements.push(ts.createVariableStatement(
-            /*modifiers*/ undefined, ts.createVariableDeclarationList([
-                ts.createVariableDeclaration(exportedNamesStorageRef, 
-                /*type*/ undefined, ts.createObjectLiteral(exportedNames, /*location*/ undefined, /*multiline*/ true))
-            ])));
-            return addExportStarFunction(statements, exportedNamesStorageRef);
-        }
-        /**
-         * Emits a setter callback for each dependency group.
-         * @param write The callback used to write each callback.
-         */
-        function generateSetters(exportStarFunction, dependencyGroups) {
-            var setters = [];
-            for (var _i = 0, dependencyGroups_1 = dependencyGroups; _i < dependencyGroups_1.length; _i++) {
-                var group = dependencyGroups_1[_i];
-                // derive a unique name for parameter from the first named entry in the group
-                var localName = ts.forEach(group.externalImports, function (i) { return ts.getLocalNameForExternalImport(i, currentSourceFile); });
-                var parameterName = localName ? ts.getGeneratedNameForNode(localName) : ts.createUniqueName("");
-                var statements = [];
-                for (var _a = 0, _b = group.externalImports; _a < _b.length; _a++) {
-                    var entry = _b[_a];
-                    var importVariableName = ts.getLocalNameForExternalImport(entry, currentSourceFile);
-                    switch (entry.kind) {
-                        case 231 /* ImportDeclaration */:
-                            if (!entry.importClause) {
-                                // 'import "..."' case
-                                // module is imported only for side-effects, no emit required
-                                break;
-                            }
-                        // fall-through
-                        case 230 /* ImportEqualsDeclaration */:
-                            ts.Debug.assert(importVariableName !== undefined);
-                            // save import into the local
-                            statements.push(ts.createStatement(ts.createAssignment(importVariableName, parameterName)));
-                            break;
-                        case 237 /* ExportDeclaration */:
-                            ts.Debug.assert(importVariableName !== undefined);
-                            if (entry.exportClause) {
-                                //  export {a, b as c} from 'foo'
-                                //
-                                // emit as:
-                                //
-                                //  exports_({
-                                //     "a": _["a"],
-                                //     "c": _["b"]
-                                //  });
-                                var properties = [];
-                                for (var _c = 0, _d = entry.exportClause.elements; _c < _d.length; _c++) {
-                                    var e = _d[_c];
-                                    properties.push(ts.createPropertyAssignment(ts.createLiteral(e.name.text), ts.createElementAccess(parameterName, ts.createLiteral((e.propertyName || e.name).text))));
-                                }
-                                statements.push(ts.createStatement(ts.createCall(exportFunctionForFile, 
-                                /*typeArguments*/ undefined, [ts.createObjectLiteral(properties, /*location*/ undefined, /*multiline*/ true)])));
-                            }
-                            else {
-                                //  export * from 'foo'
-                                //
-                                // emit as:
-                                //
-                                //  exportStar(foo_1_1);
-                                statements.push(ts.createStatement(ts.createCall(exportStarFunction, 
-                                /*typeArguments*/ undefined, [parameterName])));
-                            }
-                            break;
-                    }
-                }
-                setters.push(ts.createFunctionExpression(
-                /*modifiers*/ undefined, 
-                /*asteriskToken*/ undefined, 
-                /*name*/ undefined, 
-                /*typeParameters*/ undefined, [ts.createParameter(parameterName)], 
-                /*type*/ undefined, ts.createBlock(statements, /*location*/ undefined, /*multiLine*/ true)));
-            }
-            return ts.createArrayLiteral(setters, /*location*/ undefined, /*multiLine*/ true);
-        }
-        function visitSourceElement(node) {
-            switch (node.kind) {
-                case 231 /* ImportDeclaration */:
-                    return visitImportDeclaration(node);
-                case 230 /* ImportEqualsDeclaration */:
-                    return visitImportEqualsDeclaration(node);
-                case 237 /* ExportDeclaration */:
-                    return visitExportDeclaration(node);
-                case 236 /* ExportAssignment */:
-                    return visitExportAssignment(node);
-                default:
-                    return visitNestedNode(node);
-            }
-        }
-        function visitNestedNode(node) {
-            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
-            var savedCurrentParent = currentParent;
-            var savedCurrentNode = currentNode;
-            var currentGrandparent = currentParent;
-            currentParent = currentNode;
-            currentNode = node;
-            if (currentParent && ts.isBlockScope(currentParent, currentGrandparent)) {
-                enclosingBlockScopedContainer = currentParent;
-            }
-            var result = visitNestedNodeWorker(node);
-            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
-            currentParent = savedCurrentParent;
-            currentNode = savedCurrentNode;
-            return result;
-        }
-        function visitNestedNodeWorker(node) {
-            switch (node.kind) {
-                case 201 /* VariableStatement */:
-                    return visitVariableStatement(node);
-                case 221 /* FunctionDeclaration */:
-                    return visitFunctionDeclaration(node);
-                case 222 /* ClassDeclaration */:
-                    return visitClassDeclaration(node);
-                case 207 /* ForStatement */:
-                    return visitForStatement(node);
-                case 208 /* ForInStatement */:
-                    return visitForInStatement(node);
-                case 209 /* ForOfStatement */:
-                    return visitForOfStatement(node);
-                case 205 /* DoStatement */:
-                    return visitDoStatement(node);
-                case 206 /* WhileStatement */:
-                    return visitWhileStatement(node);
-                case 215 /* LabeledStatement */:
-                    return visitLabeledStatement(node);
-                case 213 /* WithStatement */:
-                    return visitWithStatement(node);
-                case 214 /* SwitchStatement */:
-                    return visitSwitchStatement(node);
-                case 228 /* CaseBlock */:
-                    return visitCaseBlock(node);
-                case 249 /* CaseClause */:
-                    return visitCaseClause(node);
-                case 250 /* DefaultClause */:
-                    return visitDefaultClause(node);
-                case 217 /* TryStatement */:
-                    return visitTryStatement(node);
-                case 252 /* CatchClause */:
-                    return visitCatchClause(node);
-                case 200 /* Block */:
-                    return visitBlock(node);
-                case 203 /* ExpressionStatement */:
-                    return visitExpressionStatement(node);
-                default:
-                    return node;
-            }
-        }
-        function visitImportDeclaration(node) {
-            if (node.importClause && ts.contains(externalImports, node)) {
-                hoistVariableDeclaration(ts.getLocalNameForExternalImport(node, currentSourceFile));
-            }
-            return undefined;
-        }
-        function visitImportEqualsDeclaration(node) {
-            if (ts.contains(externalImports, node)) {
-                hoistVariableDeclaration(ts.getLocalNameForExternalImport(node, currentSourceFile));
-            }
-            // NOTE(rbuckton): Do we support export import = require('') in System?
-            return undefined;
-        }
-        function visitExportDeclaration(node) {
-            if (!node.moduleSpecifier) {
-                var statements = [];
-                ts.addRange(statements, ts.map(node.exportClause.elements, visitExportSpecifier));
-                return statements;
-            }
-            return undefined;
-        }
-        function visitExportSpecifier(specifier) {
-            recordExportName(specifier.name);
-            return createExportStatement(specifier.name, specifier.propertyName || specifier.name);
-        }
-        function visitExportAssignment(node) {
-            if (node.isExportEquals) {
-                // Elide `export=` as it is illegal in a SystemJS module.
-                return undefined;
-            }
-            return createExportStatement(ts.createLiteral("default"), node.expression);
-        }
-        /**
-         * Visits a variable statement, hoisting declared names to the top-level module body.
-         * Each declaration is rewritten into an assignment expression.
-         *
-         * @param node The variable statement to visit.
-         */
-        function visitVariableStatement(node) {
-            // hoist only non-block scoped declarations or block scoped declarations parented by source file
-            var shouldHoist = ((ts.getCombinedNodeFlags(ts.getOriginalNode(node.declarationList)) & 3 /* BlockScoped */) == 0) ||
-                enclosingBlockScopedContainer.kind === 256 /* SourceFile */;
-            if (!shouldHoist) {
-                return node;
-            }
-            var isExported = ts.hasModifier(node, 1 /* Export */);
-            var expressions = [];
-            for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
-                var variable = _a[_i];
-                var visited = transformVariable(variable, isExported);
-                if (visited) {
-                    expressions.push(visited);
-                }
-            }
-            if (expressions.length) {
-                return ts.createStatement(ts.inlineExpressions(expressions), node);
-            }
-            return undefined;
-        }
-        /**
-         * Transforms a VariableDeclaration into one or more assignment expressions.
-         *
-         * @param node The VariableDeclaration to transform.
-         * @param isExported A value used to indicate whether the containing statement was exported.
-         */
-        function transformVariable(node, isExported) {
-            // Hoist any bound names within the declaration.
-            hoistBindingElement(node, isExported);
-            if (!node.initializer) {
-                // If the variable has no initializer, ignore it.
-                return;
-            }
-            var name = node.name;
-            if (ts.isIdentifier(name)) {
-                // If the variable has an IdentifierName, write out an assignment expression in its place.
-                return ts.createAssignment(name, node.initializer);
-            }
-            else {
-                // If the variable has a BindingPattern, flatten the variable into multiple assignment expressions.
-                return ts.flattenVariableDestructuringToExpression(node, hoistVariableDeclaration);
-            }
-        }
-        /**
-         * Visits a FunctionDeclaration, hoisting it to the outer module body function.
-         *
-         * @param node The function declaration to visit.
-         */
-        function visitFunctionDeclaration(node) {
-            if (ts.hasModifier(node, 1 /* Export */)) {
-                // If the function is exported, ensure it has a name and rewrite the function without any export flags.
-                var name_38 = node.name || ts.getGeneratedNameForNode(node);
-                // Keep async modifier for ES2017 transformer
-                var isAsync = ts.hasModifier(node, 256 /* Async */);
-                var newNode = ts.createFunctionDeclaration(
-                /*decorators*/ undefined, isAsync ? [ts.createNode(119 /* AsyncKeyword */)] : undefined, node.asteriskToken, name_38, 
-                /*typeParameters*/ undefined, node.parameters, 
-                /*type*/ undefined, node.body, 
-                /*location*/ node);
-                // Record a declaration export in the outer module body function.
-                recordExportedFunctionDeclaration(node);
-                if (!ts.hasModifier(node, 512 /* Default */)) {
-                    recordExportName(name_38);
-                }
-                ts.setOriginalNode(newNode, node);
-                node = newNode;
-            }
-            // Hoist the function declaration to the outer module body function.
-            hoistFunctionDeclaration(node);
-            return undefined;
-        }
-        function visitExpressionStatement(node) {
-            var originalNode = ts.getOriginalNode(node);
-            if ((originalNode.kind === 226 /* ModuleDeclaration */ || originalNode.kind === 225 /* EnumDeclaration */) && ts.hasModifier(originalNode, 1 /* Export */)) {
-                var name_39 = getDeclarationName(originalNode);
-                // We only need to hoistVariableDeclaration for EnumDeclaration
-                // as ModuleDeclaration is already hoisted when the transformer call visitVariableStatement
-                // which then call transformsVariable for each declaration in declarationList
-                if (originalNode.kind === 225 /* EnumDeclaration */) {
-                    hoistVariableDeclaration(name_39);
-                }
-                return [
-                    node,
-                    createExportStatement(name_39, name_39)
-                ];
-            }
-            return node;
-        }
-        /**
-         * Visits a ClassDeclaration, hoisting its name to the outer module body function.
-         *
-         * @param node The class declaration to visit.
-         */
-        function visitClassDeclaration(node) {
-            // Hoist the name of the class declaration to the outer module body function.
-            var name = getDeclarationName(node);
-            hoistVariableDeclaration(name);
-            var statements = [];
-            // Rewrite the class declaration into an assignment of a class expression.
-            statements.push(ts.createStatement(ts.createAssignment(name, ts.createClassExpression(
-            /*modifiers*/ undefined, node.name, 
-            /*typeParameters*/ undefined, node.heritageClauses, node.members, 
-            /*location*/ node)), 
-            /*location*/ node));
-            // If the class was exported, write a declaration export to the inner module body function.
-            if (ts.hasModifier(node, 1 /* Export */)) {
-                if (!ts.hasModifier(node, 512 /* Default */)) {
-                    recordExportName(name);
-                }
-                statements.push(createDeclarationExport(node));
-            }
-            return statements;
-        }
-        function shouldHoistLoopInitializer(node) {
-            return ts.isVariableDeclarationList(node) && (ts.getCombinedNodeFlags(node) & 3 /* BlockScoped */) === 0;
-        }
-        /**
-         * Visits the body of a ForStatement to hoist declarations.
-         *
-         * @param node The statement to visit.
-         */
-        function visitForStatement(node) {
-            var initializer = node.initializer;
-            if (shouldHoistLoopInitializer(initializer)) {
-                var expressions = [];
-                for (var _i = 0, _a = initializer.declarations; _i < _a.length; _i++) {
-                    var variable = _a[_i];
-                    var visited = transformVariable(variable, /*isExported*/ false);
-                    if (visited) {
-                        expressions.push(visited);
-                    }
-                }
-                ;
-                return ts.createFor(expressions.length
-                    ? ts.inlineExpressions(expressions)
-                    : ts.createSynthesizedNode(194 /* OmittedExpression */), node.condition, node.incrementor, ts.visitNode(node.statement, visitNestedNode, ts.isStatement), 
-                /*location*/ node);
-            }
-            else {
-                return ts.visitEachChild(node, visitNestedNode, context);
-            }
-        }
-        /**
-         * Transforms and hoists the declaration list of a ForInStatement or ForOfStatement into an expression.
-         *
-         * @param node The decalaration list to transform.
-         */
-        function transformForBinding(node) {
-            var firstDeclaration = ts.firstOrUndefined(node.declarations);
-            hoistBindingElement(firstDeclaration, /*isExported*/ false);
-            var name = firstDeclaration.name;
-            return ts.isIdentifier(name)
-                ? name
-                : ts.flattenVariableDestructuringToExpression(firstDeclaration, hoistVariableDeclaration);
-        }
-        /**
-         * Visits the body of a ForInStatement to hoist declarations.
-         *
-         * @param node The statement to visit.
-         */
-        function visitForInStatement(node) {
-            var initializer = node.initializer;
-            if (shouldHoistLoopInitializer(initializer)) {
-                var updated = ts.getMutableClone(node);
-                updated.initializer = transformForBinding(initializer);
-                updated.statement = ts.visitNode(node.statement, visitNestedNode, ts.isStatement, /*optional*/ false, ts.liftToBlock);
-                return updated;
-            }
-            else {
-                return ts.visitEachChild(node, visitNestedNode, context);
-            }
-        }
-        /**
-         * Visits the body of a ForOfStatement to hoist declarations.
-         *
-         * @param node The statement to visit.
-         */
-        function visitForOfStatement(node) {
-            var initializer = node.initializer;
-            if (shouldHoistLoopInitializer(initializer)) {
-                var updated = ts.getMutableClone(node);
-                updated.initializer = transformForBinding(initializer);
-                updated.statement = ts.visitNode(node.statement, visitNestedNode, ts.isStatement, /*optional*/ false, ts.liftToBlock);
-                return updated;
-            }
-            else {
-                return ts.visitEachChild(node, visitNestedNode, context);
-            }
-        }
-        /**
-         * Visits the body of a DoStatement to hoist declarations.
-         *
-         * @param node The statement to visit.
-         */
-        function visitDoStatement(node) {
-            var statement = ts.visitNode(node.statement, visitNestedNode, ts.isStatement, /*optional*/ false, ts.liftToBlock);
-            if (statement !== node.statement) {
-                var updated = ts.getMutableClone(node);
-                updated.statement = statement;
-                return updated;
-            }
-            return node;
-        }
-        /**
-         * Visits the body of a WhileStatement to hoist declarations.
-         *
-         * @param node The statement to visit.
-         */
-        function visitWhileStatement(node) {
-            var statement = ts.visitNode(node.statement, visitNestedNode, ts.isStatement, /*optional*/ false, ts.liftToBlock);
-            if (statement !== node.statement) {
-                var updated = ts.getMutableClone(node);
-                updated.statement = statement;
-                return updated;
-            }
-            return node;
-        }
-        /**
-         * Visits the body of a LabeledStatement to hoist declarations.
-         *
-         * @param node The statement to visit.
-         */
-        function visitLabeledStatement(node) {
-            var statement = ts.visitNode(node.statement, visitNestedNode, ts.isStatement, /*optional*/ false, ts.liftToBlock);
-            if (statement !== node.statement) {
-                var updated = ts.getMutableClone(node);
-                updated.statement = statement;
-                return updated;
-            }
-            return node;
-        }
-        /**
-         * Visits the body of a WithStatement to hoist declarations.
-         *
-         * @param node The statement to visit.
-         */
-        function visitWithStatement(node) {
-            var statement = ts.visitNode(node.statement, visitNestedNode, ts.isStatement, /*optional*/ false, ts.liftToBlock);
-            if (statement !== node.statement) {
-                var updated = ts.getMutableClone(node);
-                updated.statement = statement;
-                return updated;
-            }
-            return node;
-        }
-        /**
-         * Visits the body of a SwitchStatement to hoist declarations.
-         *
-         * @param node The statement to visit.
-         */
-        function visitSwitchStatement(node) {
-            var caseBlock = ts.visitNode(node.caseBlock, visitNestedNode, ts.isCaseBlock);
-            if (caseBlock !== node.caseBlock) {
-                var updated = ts.getMutableClone(node);
-                updated.caseBlock = caseBlock;
-                return updated;
-            }
-            return node;
-        }
-        /**
-         * Visits the body of a CaseBlock to hoist declarations.
-         *
-         * @param node The node to visit.
-         */
-        function visitCaseBlock(node) {
-            var clauses = ts.visitNodes(node.clauses, visitNestedNode, ts.isCaseOrDefaultClause);
-            if (clauses !== node.clauses) {
-                var updated = ts.getMutableClone(node);
-                updated.clauses = clauses;
-                return updated;
-            }
-            return node;
-        }
-        /**
-         * Visits the body of a CaseClause to hoist declarations.
-         *
-         * @param node The clause to visit.
-         */
-        function visitCaseClause(node) {
-            var statements = ts.visitNodes(node.statements, visitNestedNode, ts.isStatement);
-            if (statements !== node.statements) {
-                var updated = ts.getMutableClone(node);
-                updated.statements = statements;
-                return updated;
-            }
-            return node;
-        }
-        /**
-         * Visits the body of a DefaultClause to hoist declarations.
-         *
-         * @param node The clause to visit.
-         */
-        function visitDefaultClause(node) {
-            return ts.visitEachChild(node, visitNestedNode, context);
-        }
-        /**
-         * Visits the body of a TryStatement to hoist declarations.
-         *
-         * @param node The statement to visit.
-         */
-        function visitTryStatement(node) {
-            return ts.visitEachChild(node, visitNestedNode, context);
-        }
-        /**
-         * Visits the body of a CatchClause to hoist declarations.
-         *
-         * @param node The clause to visit.
-         */
-        function visitCatchClause(node) {
-            var block = ts.visitNode(node.block, visitNestedNode, ts.isBlock);
-            if (block !== node.block) {
-                var updated = ts.getMutableClone(node);
-                updated.block = block;
-                return updated;
-            }
-            return node;
-        }
-        /**
-         * Visits the body of a Block to hoist declarations.
-         *
-         * @param node The block to visit.
-         */
-        function visitBlock(node) {
-            return ts.visitEachChild(node, visitNestedNode, context);
-        }
-        //
-        // Substitutions
-        //
-        function onEmitNode(emitContext, node, emitCallback) {
-            if (node.kind === 256 /* SourceFile */) {
-                exportFunctionForFile = exportFunctionForFileMap[ts.getOriginalNodeId(node)];
-                previousOnEmitNode(emitContext, node, emitCallback);
-                exportFunctionForFile = undefined;
-            }
-            else {
-                previousOnEmitNode(emitContext, node, emitCallback);
-            }
-        }
-        /**
-         * Hooks node substitutions.
-         *
-         * @param node The node to substitute.
-         * @param isExpression A value indicating whether the node is to be used in an expression
-         *                     position.
-         */
-        function onSubstituteNode(emitContext, node) {
-            node = previousOnSubstituteNode(emitContext, node);
-            if (emitContext === 1 /* Expression */) {
-                return substituteExpression(node);
-            }
-            return node;
-        }
-        /**
-         * Substitute the expression, if necessary.
-         *
-         * @param node The node to substitute.
-         */
-        function substituteExpression(node) {
-            switch (node.kind) {
-                case 70 /* Identifier */:
-                    return substituteExpressionIdentifier(node);
-                case 188 /* BinaryExpression */:
-                    return substituteBinaryExpression(node);
-                case 186 /* PrefixUnaryExpression */:
-                case 187 /* PostfixUnaryExpression */:
-                    return substituteUnaryExpression(node);
-            }
-            return node;
-        }
-        /**
-         * Substitution for identifiers exported at the top level of a module.
-         */
-        function substituteExpressionIdentifier(node) {
-            var importDeclaration = resolver.getReferencedImportDeclaration(node);
-            if (importDeclaration) {
-                var importBinding = createImportBinding(importDeclaration);
-                if (importBinding) {
-                    return importBinding;
-                }
-            }
-            return node;
-        }
-        function substituteBinaryExpression(node) {
-            if (ts.isAssignmentOperator(node.operatorToken.kind)) {
-                return substituteAssignmentExpression(node);
-            }
-            return node;
-        }
-        function substituteAssignmentExpression(node) {
-            ts.setEmitFlags(node, 128 /* NoSubstitution */);
-            var left = node.left;
-            switch (left.kind) {
-                case 70 /* Identifier */:
-                    var exportDeclaration = resolver.getReferencedExportContainer(left);
-                    if (exportDeclaration) {
-                        return createExportExpression(left, node);
-                    }
-                    break;
-                case 172 /* ObjectLiteralExpression */:
-                case 171 /* ArrayLiteralExpression */:
-                    if (hasExportedReferenceInDestructuringPattern(left)) {
-                        return substituteDestructuring(node);
-                    }
-                    break;
-            }
-            return node;
-        }
-        function isExportedBinding(name) {
-            var container = resolver.getReferencedExportContainer(name);
-            return container && container.kind === 256 /* SourceFile */;
-        }
-        function hasExportedReferenceInDestructuringPattern(node) {
-            switch (node.kind) {
-                case 70 /* Identifier */:
-                    return isExportedBinding(node);
-                case 172 /* ObjectLiteralExpression */:
-                    for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
-                        var property = _a[_i];
-                        if (hasExportedReferenceInObjectDestructuringElement(property)) {
-                            return true;
-                        }
-                    }
-                    break;
-                case 171 /* ArrayLiteralExpression */:
-                    for (var _b = 0, _c = node.elements; _b < _c.length; _b++) {
-                        var element = _c[_b];
-                        if (hasExportedReferenceInArrayDestructuringElement(element)) {
-                            return true;
-                        }
-                    }
-                    break;
-            }
-            return false;
-        }
-        function hasExportedReferenceInObjectDestructuringElement(node) {
-            if (ts.isShorthandPropertyAssignment(node)) {
-                return isExportedBinding(node.name);
-            }
-            else if (ts.isPropertyAssignment(node)) {
-                return hasExportedReferenceInDestructuringElement(node.initializer);
-            }
-            else {
-                return false;
-            }
-        }
-        function hasExportedReferenceInArrayDestructuringElement(node) {
-            if (ts.isSpreadElementExpression(node)) {
-                var expression = node.expression;
-                return ts.isIdentifier(expression) && isExportedBinding(expression);
-            }
-            else {
-                return hasExportedReferenceInDestructuringElement(node);
-            }
-        }
-        function hasExportedReferenceInDestructuringElement(node) {
-            if (ts.isBinaryExpression(node)) {
-                var left = node.left;
-                return node.operatorToken.kind === 57 /* EqualsToken */
-                    && isDestructuringPattern(left)
-                    && hasExportedReferenceInDestructuringPattern(left);
-            }
-            else if (ts.isIdentifier(node)) {
-                return isExportedBinding(node);
-            }
-            else if (ts.isSpreadElementExpression(node)) {
-                var expression = node.expression;
-                return ts.isIdentifier(expression) && isExportedBinding(expression);
-            }
-            else if (isDestructuringPattern(node)) {
-                return hasExportedReferenceInDestructuringPattern(node);
-            }
-            else {
-                return false;
-            }
-        }
-        function isDestructuringPattern(node) {
-            var kind = node.kind;
-            return kind === 70 /* Identifier */
-                || kind === 172 /* ObjectLiteralExpression */
-                || kind === 171 /* ArrayLiteralExpression */;
-        }
-        function substituteDestructuring(node) {
-            return ts.flattenDestructuringAssignment(context, node, /*needsValue*/ true, hoistVariableDeclaration);
-        }
-        function substituteUnaryExpression(node) {
-            var operand = node.operand;
-            var operator = node.operator;
-            var substitute = ts.isIdentifier(operand) &&
-                (node.kind === 187 /* PostfixUnaryExpression */ ||
-                    (node.kind === 186 /* PrefixUnaryExpression */ && (operator === 42 /* PlusPlusToken */ || operator === 43 /* MinusMinusToken */)));
-            if (substitute) {
-                var exportDeclaration = resolver.getReferencedExportContainer(operand);
-                if (exportDeclaration) {
-                    var expr = ts.createPrefix(node.operator, operand, node);
-                    ts.setEmitFlags(expr, 128 /* NoSubstitution */);
-                    var call = createExportExpression(operand, expr);
-                    if (node.kind === 186 /* PrefixUnaryExpression */) {
-                        return call;
-                    }
-                    else {
-                        // export function returns the value that was passes as the second argument
-                        // however for postfix unary expressions result value should be the value before modification.
-                        // emit 'x++' as '(export('x', ++x) - 1)' and 'x--' as '(export('x', --x) + 1)'
-                        return operator === 42 /* PlusPlusToken */
-                            ? ts.createSubtract(call, ts.createLiteral(1))
-                            : ts.createAdd(call, ts.createLiteral(1));
-                    }
-                }
-            }
-            return node;
-        }
-        /**
-         * Gets a name to use for a DeclarationStatement.
-         * @param node The declaration statement.
-         */
-        function getDeclarationName(node) {
-            return node.name ? ts.getSynthesizedClone(node.name) : ts.getGeneratedNameForNode(node);
-        }
-        function addExportStarFunction(statements, localNames) {
-            var exportStarFunction = ts.createUniqueName("exportStar");
-            var m = ts.createIdentifier("m");
-            var n = ts.createIdentifier("n");
-            var exports = ts.createIdentifier("exports");
-            var condition = ts.createStrictInequality(n, ts.createLiteral("default"));
-            if (localNames) {
-                condition = ts.createLogicalAnd(condition, ts.createLogicalNot(ts.createHasOwnProperty(localNames, n)));
-            }
-            statements.push(ts.createFunctionDeclaration(
-            /*decorators*/ undefined, 
-            /*modifiers*/ undefined, 
-            /*asteriskToken*/ undefined, exportStarFunction, 
-            /*typeParameters*/ undefined, [ts.createParameter(m)], 
-            /*type*/ undefined, ts.createBlock([
-                ts.createVariableStatement(
-                /*modifiers*/ undefined, ts.createVariableDeclarationList([
-                    ts.createVariableDeclaration(exports, 
-                    /*type*/ undefined, ts.createObjectLiteral([]))
-                ])),
-                ts.createForIn(ts.createVariableDeclarationList([
-                    ts.createVariableDeclaration(n, /*type*/ undefined)
-                ]), m, ts.createBlock([
-                    ts.setEmitFlags(ts.createIf(condition, ts.createStatement(ts.createAssignment(ts.createElementAccess(exports, n), ts.createElementAccess(m, n)))), 32 /* SingleLine */)
-                ])),
-                ts.createStatement(ts.createCall(exportFunctionForFile, 
-                /*typeArguments*/ undefined, [exports]))
-            ], 
-            /*location*/ undefined, 
-            /*multiline*/ true)));
-            return exportStarFunction;
-        }
-        /**
-         * Creates a call to the current file's export function to export a value.
-         * @param name The bound name of the export.
-         * @param value The exported value.
-         */
-        function createExportExpression(name, value) {
-            var exportName = ts.isIdentifier(name) ? ts.createLiteral(name.text) : name;
-            return ts.createCall(exportFunctionForFile, /*typeArguments*/ undefined, [exportName, value]);
-        }
-        /**
-         * Creates a call to the current file's export function to export a value.
-         * @param name The bound name of the export.
-         * @param value The exported value.
-         */
-        function createExportStatement(name, value) {
-            return ts.createStatement(createExportExpression(name, value));
-        }
-        /**
-         * Creates a call to the current file's export function to export a declaration.
-         * @param node The declaration to export.
-         */
-        function createDeclarationExport(node) {
-            var declarationName = getDeclarationName(node);
-            var exportName = ts.hasModifier(node, 512 /* Default */) ? ts.createLiteral("default") : declarationName;
-            return createExportStatement(exportName, declarationName);
-        }
-        function createImportBinding(importDeclaration) {
-            var importAlias;
-            var name;
-            if (ts.isImportClause(importDeclaration)) {
-                importAlias = ts.getGeneratedNameForNode(importDeclaration.parent);
-                name = ts.createIdentifier("default");
-            }
-            else if (ts.isImportSpecifier(importDeclaration)) {
-                importAlias = ts.getGeneratedNameForNode(importDeclaration.parent.parent.parent);
-                name = importDeclaration.propertyName || importDeclaration.name;
-            }
-            else {
-                return undefined;
-            }
-            return ts.createPropertyAccess(importAlias, ts.getSynthesizedClone(name));
-        }
-        function collectDependencyGroups(externalImports) {
-            var groupIndices = ts.createMap();
-            var dependencyGroups = [];
-            for (var i = 0; i < externalImports.length; i++) {
-                var externalImport = externalImports[i];
-                var externalModuleName = ts.getExternalModuleNameLiteral(externalImport, currentSourceFile, host, resolver, compilerOptions);
-                var text = externalModuleName.text;
-                if (ts.hasProperty(groupIndices, text)) {
-                    // deduplicate/group entries in dependency list by the dependency name
-                    var groupIndex = groupIndices[text];
-                    dependencyGroups[groupIndex].externalImports.push(externalImport);
-                    continue;
-                }
-                else {
-                    groupIndices[text] = dependencyGroups.length;
-                    dependencyGroups.push({
-                        name: externalModuleName,
-                        externalImports: [externalImport]
-                    });
-                }
-            }
-            return dependencyGroups;
-        }
-        function getNameOfDependencyGroup(dependencyGroup) {
-            return dependencyGroup.name;
-        }
-        function recordExportName(name) {
-            if (!exportedLocalNames) {
-                exportedLocalNames = [];
-            }
-            exportedLocalNames.push(name);
-        }
-        function recordExportedFunctionDeclaration(node) {
-            if (!exportedFunctionDeclarations) {
-                exportedFunctionDeclarations = [];
-            }
-            exportedFunctionDeclarations.push(createDeclarationExport(node));
-        }
-        function hoistBindingElement(node, isExported) {
-            if (ts.isOmittedExpression(node)) {
-                return;
-            }
-            var name = node.name;
-            if (ts.isIdentifier(name)) {
-                hoistVariableDeclaration(ts.getSynthesizedClone(name));
-                if (isExported) {
-                    recordExportName(name);
-                }
-            }
-            else if (ts.isBindingPattern(name)) {
-                ts.forEach(name.elements, isExported ? hoistExportedBindingElement : hoistNonExportedBindingElement);
-            }
-        }
-        function hoistExportedBindingElement(node) {
-            hoistBindingElement(node, /*isExported*/ true);
-        }
-        function hoistNonExportedBindingElement(node) {
-            hoistBindingElement(node, /*isExported*/ false);
-        }
-        function updateSourceFile(node, statements, nodeEmitFlags) {
-            var updated = ts.getMutableClone(node);
-            updated.statements = ts.createNodeArray(statements, node.statements);
-            ts.setEmitFlags(updated, nodeEmitFlags);
-            return updated;
-        }
-    }
-    ts.transformSystemModule = transformSystemModule;
-})(ts || (ts = {}));
-/// <reference path="../../factory.ts" />
-/// <reference path="../../visitor.ts" />
-/*@internal*/
-var ts;
-(function (ts) {
-    function transformES2015Module(context) {
-        var compilerOptions = context.getCompilerOptions();
-        return transformSourceFile;
-        function transformSourceFile(node) {
-            if (ts.isDeclarationFile(node)) {
-                return node;
-            }
-            if (ts.isExternalModule(node) || compilerOptions.isolatedModules) {
-                return ts.visitEachChild(node, visitor, context);
-            }
-            return node;
-        }
-        function visitor(node) {
-            switch (node.kind) {
-                case 230 /* ImportEqualsDeclaration */:
-                    // Elide `import=` as it is not legal with --module ES6
-                    return undefined;
-                case 236 /* ExportAssignment */:
-                    return visitExportAssignment(node);
-            }
-            return node;
-        }
-        function visitExportAssignment(node) {
-            // Elide `export=` as it is not legal with --module ES6
-            return node.isExportEquals ? undefined : node;
-        }
-    }
-    ts.transformES2015Module = transformES2015Module;
-})(ts || (ts = {}));
 /// <reference path="../factory.ts" />
 /// <reference path="../visitor.ts" />
 /*@internal*/
@@ -53624,8 +53542,8 @@ var ts;
     function transformES5(context) {
         var previousOnSubstituteNode = context.onSubstituteNode;
         context.onSubstituteNode = onSubstituteNode;
-        context.enableSubstitution(173 /* PropertyAccessExpression */);
-        context.enableSubstitution(253 /* PropertyAssignment */);
+        context.enableSubstitution(177 /* PropertyAccessExpression */);
+        context.enableSubstitution(257 /* PropertyAssignment */);
         return transformSourceFile;
         /**
          * Transforms an ES5 source file to ES3.
@@ -53690,9 +53608,2452 @@ var ts;
     }
     ts.transformES5 = transformES5;
 })(ts || (ts = {}));
+/// <reference path="../../factory.ts" />
+/// <reference path="../../visitor.ts" />
+/*@internal*/
+var ts;
+(function (ts) {
+    function transformES2015Module(context) {
+        var compilerOptions = context.getCompilerOptions();
+        return transformSourceFile;
+        function transformSourceFile(node) {
+            if (ts.isDeclarationFile(node)) {
+                return node;
+            }
+            if (ts.isExternalModule(node) || compilerOptions.isolatedModules) {
+                return ts.visitEachChild(node, visitor, context);
+            }
+            return node;
+        }
+        function visitor(node) {
+            switch (node.kind) {
+                case 234 /* ImportEqualsDeclaration */:
+                    // Elide `import=` as it is not legal with --module ES6
+                    return undefined;
+                case 240 /* ExportAssignment */:
+                    return visitExportAssignment(node);
+            }
+            return node;
+        }
+        function visitExportAssignment(node) {
+            // Elide `export=` as it is not legal with --module ES6
+            return node.isExportEquals ? undefined : node;
+        }
+    }
+    ts.transformES2015Module = transformES2015Module;
+})(ts || (ts = {}));
+/// <reference path="../../factory.ts" />
+/// <reference path="../../visitor.ts" />
+/*@internal*/
+var ts;
+(function (ts) {
+    function transformSystemModule(context) {
+        var startLexicalEnvironment = context.startLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration;
+        var compilerOptions = context.getCompilerOptions();
+        var resolver = context.getEmitResolver();
+        var host = context.getEmitHost();
+        var previousOnSubstituteNode = context.onSubstituteNode;
+        var previousOnEmitNode = context.onEmitNode;
+        context.onSubstituteNode = onSubstituteNode;
+        context.onEmitNode = onEmitNode;
+        context.enableSubstitution(70 /* Identifier */); // Substitutes expression identifiers for imported symbols.
+        context.enableSubstitution(192 /* BinaryExpression */); // Substitutes assignments to exported symbols.
+        context.enableSubstitution(190 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(191 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableEmitNotification(261 /* SourceFile */); // Restore state when substituting nodes in a file.
+        var moduleInfoMap = ts.createMap(); // The ExternalModuleInfo for each file.
+        var deferredExports = ts.createMap(); // Exports to defer until an EndOfDeclarationMarker is found.
+        var exportFunctionsMap = ts.createMap(); // The export function associated with a source file.
+        var noSubstitutionMap = ts.createMap(); // Set of nodes for which substitution rules should be ignored for each file.
+        var currentSourceFile; // The current file.
+        var moduleInfo; // ExternalModuleInfo for the current file.
+        var exportFunction; // The export function for the current file.
+        var contextObject; // The context object for the current file.
+        var hoistedStatements;
+        var enclosingBlockScopedContainer;
+        var noSubstitution; // Set of nodes for which substitution rules should be ignored.
+        return transformSourceFile;
+        /**
+         * Transforms the module aspects of a SourceFile.
+         *
+         * @param node The SourceFile node.
+         */
+        function transformSourceFile(node) {
+            if (ts.isDeclarationFile(node)
+                || !(ts.isExternalModule(node)
+                    || compilerOptions.isolatedModules)) {
+                return node;
+            }
+            var id = ts.getOriginalNodeId(node);
+            currentSourceFile = node;
+            enclosingBlockScopedContainer = node;
+            // System modules have the following shape:
+            //
+            //     System.register(['dep-1', ... 'dep-n'], function(exports) {/* module body function */})
+            //
+            // The parameter 'exports' here is a callback '<T>(name: string, value: T) => T' that
+            // is used to publish exported values. 'exports' returns its 'value' argument so in
+            // most cases expressions that mutate exported values can be rewritten as:
+            //
+            //     expr -> exports('name', expr)
+            //
+            // The only exception in this rule is postfix unary operators,
+            // see comment to 'substitutePostfixUnaryExpression' for more details
+            // Collect information about the external module and dependency groups.
+            moduleInfo = moduleInfoMap[id] = ts.collectExternalModuleInfo(node, resolver);
+            // Make sure that the name of the 'exports' function does not conflict with
+            // existing identifiers.
+            exportFunction = exportFunctionsMap[id] = ts.createUniqueName("exports");
+            contextObject = ts.createUniqueName("context");
+            // Add the body of the module.
+            var dependencyGroups = collectDependencyGroups(moduleInfo.externalImports);
+            var moduleBodyFunction = ts.createFunctionExpression(
+            /*modifiers*/ undefined, 
+            /*asteriskToken*/ undefined, 
+            /*name*/ undefined, 
+            /*typeParameters*/ undefined, [
+                ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, exportFunction),
+                ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, contextObject)
+            ], 
+            /*type*/ undefined, createSystemModuleBody(node, dependencyGroups));
+            // Write the call to `System.register`
+            // Clear the emit-helpers flag for later passes since we'll have already used it in the module body
+            // So the helper will be emit at the correct position instead of at the top of the source-file
+            var moduleName = ts.tryGetModuleNameFromFile(node, host, compilerOptions);
+            var dependencies = ts.createArrayLiteral(ts.map(dependencyGroups, function (dependencyGroup) { return dependencyGroup.name; }));
+            var updated = ts.updateSourceFileNode(node, ts.createNodeArray([
+                ts.createStatement(ts.createCall(ts.createPropertyAccess(ts.createIdentifier("System"), "register"), 
+                /*typeArguments*/ undefined, moduleName
+                    ? [moduleName, dependencies, moduleBodyFunction]
+                    : [dependencies, moduleBodyFunction]))
+            ], node.statements));
+            ts.setEmitFlags(updated, ts.getEmitFlags(node) & ~1 /* EmitEmitHelpers */);
+            if (noSubstitution) {
+                noSubstitutionMap[id] = noSubstitution;
+                noSubstitution = undefined;
+            }
+            currentSourceFile = undefined;
+            moduleInfo = undefined;
+            exportFunction = undefined;
+            contextObject = undefined;
+            hoistedStatements = undefined;
+            enclosingBlockScopedContainer = undefined;
+            return ts.aggregateTransformFlags(updated);
+        }
+        /**
+         * Collects the dependency groups for this files imports.
+         *
+         * @param externalImports The imports for the file.
+         */
+        function collectDependencyGroups(externalImports) {
+            var groupIndices = ts.createMap();
+            var dependencyGroups = [];
+            for (var i = 0; i < externalImports.length; i++) {
+                var externalImport = externalImports[i];
+                var externalModuleName = ts.getExternalModuleNameLiteral(externalImport, currentSourceFile, host, resolver, compilerOptions);
+                var text = externalModuleName.text;
+                if (ts.hasProperty(groupIndices, text)) {
+                    // deduplicate/group entries in dependency list by the dependency name
+                    var groupIndex = groupIndices[text];
+                    dependencyGroups[groupIndex].externalImports.push(externalImport);
+                }
+                else {
+                    groupIndices[text] = dependencyGroups.length;
+                    dependencyGroups.push({
+                        name: externalModuleName,
+                        externalImports: [externalImport]
+                    });
+                }
+            }
+            return dependencyGroups;
+        }
+        /**
+         * Adds the statements for the module body function for the source file.
+         *
+         * @param node The source file for the module.
+         * @param dependencyGroups The grouped dependencies of the module.
+         */
+        function createSystemModuleBody(node, dependencyGroups) {
+            // Shape of the body in system modules:
+            //
+            //  function (exports) {
+            //      <list of local aliases for imports>
+            //      <hoisted variable declarations>
+            //      <hoisted function declarations>
+            //      return {
+            //          setters: [
+            //              <list of setter function for imports>
+            //          ],
+            //          execute: function() {
+            //              <module statements>
+            //          }
+            //      }
+            //      <temp declarations>
+            //  }
+            //
+            // i.e:
+            //
+            //   import {x} from 'file1'
+            //   var y = 1;
+            //   export function foo() { return y + x(); }
+            //   console.log(y);
+            //
+            // Will be transformed to:
+            //
+            //  function(exports) {
+            //      function foo() { return y + file_1.x(); }
+            //      exports("foo", foo);
+            //      var file_1, y;
+            //      return {
+            //          setters: [
+            //              function(v) { file_1 = v }
+            //          ],
+            //          execute(): function() {
+            //              y = 1;
+            //              console.log(y);
+            //          }
+            //      };
+            //  }
+            var statements = [];
+            // We start a new lexical environment in this function body, but *not* in the
+            // body of the execute function. This allows us to emit temporary declarations
+            // only in the outer module body and not in the inner one.
+            startLexicalEnvironment();
+            // Add any prologue directives.
+            var statementOffset = ts.addPrologueDirectives(statements, node.statements, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict, sourceElementVisitor);
+            // var __moduleName = context_1 && context_1.id;
+            statements.push(ts.createVariableStatement(
+            /*modifiers*/ undefined, ts.createVariableDeclarationList([
+                ts.createVariableDeclaration("__moduleName", 
+                /*type*/ undefined, ts.createLogicalAnd(contextObject, ts.createPropertyAccess(contextObject, "id")))
+            ])));
+            // Visit the statements of the source file, emitting any transformations into
+            // the `executeStatements` array. We do this *before* we fill the `setters` array
+            // as we both emit transformations as well as aggregate some data used when creating
+            // setters. This allows us to reduce the number of times we need to loop through the
+            // statements of the source file.
+            var executeStatements = ts.visitNodes(node.statements, sourceElementVisitor, ts.isStatement, statementOffset);
+            // Emit early exports for function declarations.
+            ts.addRange(statements, hoistedStatements);
+            // We emit hoisted variables early to align roughly with our previous emit output.
+            // Two key differences in this approach are:
+            // - Temporary variables will appear at the top rather than at the bottom of the file
+            ts.addRange(statements, endLexicalEnvironment());
+            var exportStarFunction = addExportStarIfNeeded(statements);
+            statements.push(ts.createReturn(ts.setMultiLine(ts.createObjectLiteral([
+                ts.createPropertyAssignment("setters", createSettersArray(exportStarFunction, dependencyGroups)),
+                ts.createPropertyAssignment("execute", ts.createFunctionExpression(
+                /*modifiers*/ undefined, 
+                /*asteriskToken*/ undefined, 
+                /*name*/ undefined, 
+                /*typeParameters*/ undefined, 
+                /*parameters*/ [], 
+                /*type*/ undefined, ts.createBlock(executeStatements, 
+                /*location*/ undefined, 
+                /*multiLine*/ true)))
+            ]), 
+            /*multiLine*/ true)));
+            var body = ts.createBlock(statements, /*location*/ undefined, /*multiLine*/ true);
+            ts.setEmitFlags(body, 1 /* EmitEmitHelpers */);
+            return body;
+        }
+        /**
+         * Adds an exportStar function to a statement list if it is needed for the file.
+         *
+         * @param statements A statement list.
+         */
+        function addExportStarIfNeeded(statements) {
+            if (!moduleInfo.hasExportStarsToExportValues) {
+                return;
+            }
+            // when resolving exports local exported entries/indirect exported entries in the module
+            // should always win over entries with similar names that were added via star exports
+            // to support this we store names of local/indirect exported entries in a set.
+            // this set is used to filter names brought by star expors.
+            // local names set should only be added if we have anything exported
+            if (!moduleInfo.exportedNames && ts.isEmpty(moduleInfo.exportSpecifiers)) {
+                // no exported declarations (export var ...) or export specifiers (export {x})
+                // check if we have any non star export declarations.
+                var hasExportDeclarationWithExportClause = false;
+                for (var _i = 0, _a = moduleInfo.externalImports; _i < _a.length; _i++) {
+                    var externalImport = _a[_i];
+                    if (externalImport.kind === 241 /* ExportDeclaration */ && externalImport.exportClause) {
+                        hasExportDeclarationWithExportClause = true;
+                        break;
+                    }
+                }
+                if (!hasExportDeclarationWithExportClause) {
+                    // we still need to emit exportStar helper
+                    var exportStarFunction_1 = createExportStarFunction(/*localNames*/ undefined);
+                    statements.push(exportStarFunction_1);
+                    return exportStarFunction_1.name;
+                }
+            }
+            var exportedNames = [];
+            if (moduleInfo.exportedNames) {
+                for (var _b = 0, _c = moduleInfo.exportedNames; _b < _c.length; _b++) {
+                    var exportedLocalName = _c[_b];
+                    if (exportedLocalName.text === "default") {
+                        continue;
+                    }
+                    // write name of exported declaration, i.e 'export var x...'
+                    exportedNames.push(ts.createPropertyAssignment(ts.createLiteral(exportedLocalName), ts.createLiteral(true)));
+                }
+            }
+            for (var _d = 0, _e = moduleInfo.externalImports; _d < _e.length; _d++) {
+                var externalImport = _e[_d];
+                if (externalImport.kind !== 241 /* ExportDeclaration */) {
+                    continue;
+                }
+                var exportDecl = externalImport;
+                if (!exportDecl.exportClause) {
+                    // export * from ...
+                    continue;
+                }
+                for (var _f = 0, _g = exportDecl.exportClause.elements; _f < _g.length; _f++) {
+                    var element = _g[_f];
+                    // write name of indirectly exported entry, i.e. 'export {x} from ...'
+                    exportedNames.push(ts.createPropertyAssignment(ts.createLiteral((element.name || element.propertyName).text), ts.createLiteral(true)));
+                }
+            }
+            var exportedNamesStorageRef = ts.createUniqueName("exportedNames");
+            statements.push(ts.createVariableStatement(
+            /*modifiers*/ undefined, ts.createVariableDeclarationList([
+                ts.createVariableDeclaration(exportedNamesStorageRef, 
+                /*type*/ undefined, ts.createObjectLiteral(exportedNames, /*location*/ undefined, /*multiline*/ true))
+            ])));
+            var exportStarFunction = createExportStarFunction(exportedNamesStorageRef);
+            statements.push(exportStarFunction);
+            return exportStarFunction.name;
+        }
+        /**
+         * Creates an exportStar function for the file, with an optional set of excluded local
+         * names.
+         *
+         * @param localNames An optional reference to an object containing a set of excluded local
+         * names.
+         */
+        function createExportStarFunction(localNames) {
+            var exportStarFunction = ts.createUniqueName("exportStar");
+            var m = ts.createIdentifier("m");
+            var n = ts.createIdentifier("n");
+            var exports = ts.createIdentifier("exports");
+            var condition = ts.createStrictInequality(n, ts.createLiteral("default"));
+            if (localNames) {
+                condition = ts.createLogicalAnd(condition, ts.createLogicalNot(ts.createHasOwnProperty(localNames, n)));
+            }
+            return ts.createFunctionDeclaration(
+            /*decorators*/ undefined, 
+            /*modifiers*/ undefined, 
+            /*asteriskToken*/ undefined, exportStarFunction, 
+            /*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, m)], 
+            /*type*/ undefined, ts.createBlock([
+                ts.createVariableStatement(
+                /*modifiers*/ undefined, ts.createVariableDeclarationList([
+                    ts.createVariableDeclaration(exports, 
+                    /*type*/ undefined, ts.createObjectLiteral([]))
+                ])),
+                ts.createForIn(ts.createVariableDeclarationList([
+                    ts.createVariableDeclaration(n, /*type*/ undefined)
+                ]), m, ts.createBlock([
+                    ts.setEmitFlags(ts.createIf(condition, ts.createStatement(ts.createAssignment(ts.createElementAccess(exports, n), ts.createElementAccess(m, n)))), 32 /* SingleLine */)
+                ])),
+                ts.createStatement(ts.createCall(exportFunction, 
+                /*typeArguments*/ undefined, [exports]))
+            ], 
+            /*location*/ undefined, 
+            /*multiline*/ true));
+        }
+        /**
+         * Creates an array setter callbacks for each dependency group.
+         *
+         * @param exportStarFunction A reference to an exportStarFunction for the file.
+         * @param dependencyGroups An array of grouped dependencies.
+         */
+        function createSettersArray(exportStarFunction, dependencyGroups) {
+            var setters = [];
+            for (var _i = 0, dependencyGroups_1 = dependencyGroups; _i < dependencyGroups_1.length; _i++) {
+                var group = dependencyGroups_1[_i];
+                // derive a unique name for parameter from the first named entry in the group
+                var localName = ts.forEach(group.externalImports, function (i) { return ts.getLocalNameForExternalImport(i, currentSourceFile); });
+                var parameterName = localName ? ts.getGeneratedNameForNode(localName) : ts.createUniqueName("");
+                var statements = [];
+                for (var _a = 0, _b = group.externalImports; _a < _b.length; _a++) {
+                    var entry = _b[_a];
+                    var importVariableName = ts.getLocalNameForExternalImport(entry, currentSourceFile);
+                    switch (entry.kind) {
+                        case 235 /* ImportDeclaration */:
+                            if (!entry.importClause) {
+                                // 'import "..."' case
+                                // module is imported only for side-effects, no emit required
+                                break;
+                            }
+                        // fall-through
+                        case 234 /* ImportEqualsDeclaration */:
+                            ts.Debug.assert(importVariableName !== undefined);
+                            // save import into the local
+                            statements.push(ts.createStatement(ts.createAssignment(importVariableName, parameterName)));
+                            break;
+                        case 241 /* ExportDeclaration */:
+                            ts.Debug.assert(importVariableName !== undefined);
+                            if (entry.exportClause) {
+                                //  export {a, b as c} from 'foo'
+                                //
+                                // emit as:
+                                //
+                                //  exports_({
+                                //     "a": _["a"],
+                                //     "c": _["b"]
+                                //  });
+                                var properties = [];
+                                for (var _c = 0, _d = entry.exportClause.elements; _c < _d.length; _c++) {
+                                    var e = _d[_c];
+                                    properties.push(ts.createPropertyAssignment(ts.createLiteral(e.name.text), ts.createElementAccess(parameterName, ts.createLiteral((e.propertyName || e.name).text))));
+                                }
+                                statements.push(ts.createStatement(ts.createCall(exportFunction, 
+                                /*typeArguments*/ undefined, [ts.createObjectLiteral(properties, /*location*/ undefined, /*multiline*/ true)])));
+                            }
+                            else {
+                                //  export * from 'foo'
+                                //
+                                // emit as:
+                                //
+                                //  exportStar(foo_1_1);
+                                statements.push(ts.createStatement(ts.createCall(exportStarFunction, 
+                                /*typeArguments*/ undefined, [parameterName])));
+                            }
+                            break;
+                    }
+                }
+                setters.push(ts.createFunctionExpression(
+                /*modifiers*/ undefined, 
+                /*asteriskToken*/ undefined, 
+                /*name*/ undefined, 
+                /*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, parameterName)], 
+                /*type*/ undefined, ts.createBlock(statements, /*location*/ undefined, /*multiLine*/ true)));
+            }
+            return ts.createArrayLiteral(setters, /*location*/ undefined, /*multiLine*/ true);
+        }
+        //
+        // Top-level Source Element Visitors
+        //
+        /**
+         * Visit source elements at the top-level of a module.
+         *
+         * @param node The node to visit.
+         */
+        function sourceElementVisitor(node) {
+            switch (node.kind) {
+                case 235 /* ImportDeclaration */:
+                    return visitImportDeclaration(node);
+                case 234 /* ImportEqualsDeclaration */:
+                    return visitImportEqualsDeclaration(node);
+                case 241 /* ExportDeclaration */:
+                    // ExportDeclarations are elided as they are handled via
+                    // `appendExportsOfDeclaration`.
+                    return undefined;
+                case 240 /* ExportAssignment */:
+                    return visitExportAssignment(node);
+                default:
+                    return nestedElementVisitor(node);
+            }
+        }
+        /**
+         * Visits an ImportDeclaration node.
+         *
+         * @param node The node to visit.
+         */
+        function visitImportDeclaration(node) {
+            var statements;
+            if (node.importClause) {
+                hoistVariableDeclaration(ts.getLocalNameForExternalImport(node, currentSourceFile));
+            }
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfImportDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfImportDeclaration(statements, node);
+            }
+            return ts.singleOrMany(statements);
+        }
+        /**
+         * Visits an ImportEqualsDeclaration node.
+         *
+         * @param node The node to visit.
+         */
+        function visitImportEqualsDeclaration(node) {
+            ts.Debug.assert(ts.isExternalModuleImportEqualsDeclaration(node), "import= for internal module references should be handled in an earlier transformer.");
+            var statements;
+            hoistVariableDeclaration(ts.getLocalNameForExternalImport(node, currentSourceFile));
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfImportEqualsDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfImportEqualsDeclaration(statements, node);
+            }
+            return ts.singleOrMany(statements);
+        }
+        /**
+         * Visits an ExportAssignment node.
+         *
+         * @param node The node to visit.
+         */
+        function visitExportAssignment(node) {
+            if (node.isExportEquals) {
+                // Elide `export=` as it is illegal in a SystemJS module.
+                return undefined;
+            }
+            var expression = ts.visitNode(node.expression, destructuringVisitor, ts.isExpression);
+            var original = node.original;
+            if (original && hasAssociatedEndOfDeclarationMarker(original)) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportStatement(deferredExports[id], ts.createIdentifier("default"), expression, /*allowComments*/ true);
+            }
+            else {
+                return createExportStatement(ts.createIdentifier("default"), expression, /*allowComments*/ true);
+            }
+        }
+        /**
+         * Visits a FunctionDeclaration, hoisting it to the outer module body function.
+         *
+         * @param node The node to visit.
+         */
+        function visitFunctionDeclaration(node) {
+            if (ts.hasModifier(node, 1 /* Export */)) {
+                hoistedStatements = ts.append(hoistedStatements, ts.updateFunctionDeclaration(node, node.decorators, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), ts.getDeclarationName(node, /*allowComments*/ true, /*allowSourceMaps*/ true), 
+                /*typeParameters*/ undefined, ts.visitNodes(node.parameters, destructuringVisitor, ts.isParameterDeclaration), 
+                /*type*/ undefined, ts.visitNode(node.body, destructuringVisitor, ts.isBlock)));
+            }
+            else {
+                hoistedStatements = ts.append(hoistedStatements, node);
+            }
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfHoistedDeclaration(deferredExports[id], node);
+            }
+            else {
+                hoistedStatements = appendExportsOfHoistedDeclaration(hoistedStatements, node);
+            }
+            return undefined;
+        }
+        /**
+         * Visits a ClassDeclaration, hoisting its name to the outer module body function.
+         *
+         * @param node The node to visit.
+         */
+        function visitClassDeclaration(node) {
+            var statements;
+            // Hoist the name of the class declaration to the outer module body function.
+            var name = ts.getLocalName(node);
+            hoistVariableDeclaration(name);
+            // Rewrite the class declaration into an assignment of a class expression.
+            statements = ts.append(statements, ts.createStatement(ts.createAssignment(name, ts.createClassExpression(
+            /*modifiers*/ undefined, node.name, 
+            /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, destructuringVisitor, ts.isHeritageClause), ts.visitNodes(node.members, destructuringVisitor, ts.isClassElement), 
+            /*location*/ node)), 
+            /*location*/ node));
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfHoistedDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfHoistedDeclaration(statements, node);
+            }
+            return ts.singleOrMany(statements);
+        }
+        /**
+         * Visits a variable statement, hoisting declared names to the top-level module body.
+         * Each declaration is rewritten into an assignment expression.
+         *
+         * @param node The node to visit.
+         */
+        function visitVariableStatement(node) {
+            if (!shouldHoistVariableDeclarationList(node.declarationList)) {
+                return ts.visitNode(node, destructuringVisitor, ts.isStatement);
+            }
+            var expressions;
+            var isExportedDeclaration = ts.hasModifier(node, 1 /* Export */);
+            var isMarkedDeclaration = hasAssociatedEndOfDeclarationMarker(node);
+            for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
+                var variable = _a[_i];
+                if (variable.initializer) {
+                    expressions = ts.append(expressions, transformInitializedVariable(variable, isExportedDeclaration && !isMarkedDeclaration));
+                }
+                else {
+                    hoistBindingElement(variable);
+                }
+            }
+            var statements;
+            if (expressions) {
+                statements = ts.append(statements, ts.createStatement(ts.inlineExpressions(expressions), /*location*/ node));
+            }
+            if (isMarkedDeclaration) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node, isExportedDeclaration);
+            }
+            else {
+                statements = appendExportsOfVariableStatement(statements, node, /*exportSelf*/ false);
+            }
+            return ts.singleOrMany(statements);
+        }
+        /**
+         * Hoists the declared names of a VariableDeclaration or BindingElement.
+         *
+         * @param node The declaration to hoist.
+         */
+        function hoistBindingElement(node) {
+            if (ts.isBindingPattern(node.name)) {
+                for (var _i = 0, _a = node.name.elements; _i < _a.length; _i++) {
+                    var element = _a[_i];
+                    if (!ts.isOmittedExpression(element)) {
+                        hoistBindingElement(element);
+                    }
+                }
+            }
+            else {
+                hoistVariableDeclaration(ts.getSynthesizedClone(node.name));
+            }
+        }
+        /**
+         * Determines whether a VariableDeclarationList should be hoisted.
+         *
+         * @param node The node to test.
+         */
+        function shouldHoistVariableDeclarationList(node) {
+            // hoist only non-block scoped declarations or block scoped declarations parented by source file
+            return (ts.getEmitFlags(node) & 16777216 /* NoHoisting */) === 0
+                && (enclosingBlockScopedContainer.kind === 261 /* SourceFile */
+                    || (ts.getOriginalNode(node).flags & 3 /* BlockScoped */) === 0);
+        }
+        /**
+         * Transform an initialized variable declaration into an expression.
+         *
+         * @param node The node to transform.
+         * @param isExportedDeclaration A value indicating whether the variable is exported.
+         */
+        function transformInitializedVariable(node, isExportedDeclaration) {
+            var createAssignment = isExportedDeclaration ? createExportedVariableAssignment : createNonExportedVariableAssignment;
+            return ts.isBindingPattern(node.name)
+                ? ts.flattenVariableDestructuringToExpression(node, hoistVariableDeclaration, createAssignment, destructuringVisitor)
+                : createAssignment(node.name, ts.visitNode(node.initializer, destructuringVisitor, ts.isExpression));
+        }
+        /**
+         * Creates an assignment expression for an exported variable declaration.
+         *
+         * @param name The name of the variable.
+         * @param value The value of the variable's initializer.
+         * @param location The source map location for the assignment.
+         */
+        function createExportedVariableAssignment(name, value, location) {
+            return createVariableAssignment(name, value, location, /*isExportedDeclaration*/ true);
+        }
+        /**
+         * Creates an assignment expression for a non-exported variable declaration.
+         *
+         * @param name The name of the variable.
+         * @param value The value of the variable's initializer.
+         * @param location The source map location for the assignment.
+         */
+        function createNonExportedVariableAssignment(name, value, location) {
+            return createVariableAssignment(name, value, location, /*isExportedDeclaration*/ false);
+        }
+        /**
+         * Creates an assignment expression for a variable declaration.
+         *
+         * @param name The name of the variable.
+         * @param value The value of the variable's initializer.
+         * @param location The source map location for the assignment.
+         * @param isExportedDeclaration A value indicating whether the variable is exported.
+         */
+        function createVariableAssignment(name, value, location, isExportedDeclaration) {
+            hoistVariableDeclaration(ts.getSynthesizedClone(name));
+            return isExportedDeclaration
+                ? createExportExpression(name, preventSubstitution(ts.createAssignment(name, value, location)))
+                : preventSubstitution(ts.createAssignment(name, value, location));
+        }
+        /**
+         * Visits a MergeDeclarationMarker used as a placeholder for the beginning of a merged
+         * and transformed declaration.
+         *
+         * @param node The node to visit.
+         */
+        function visitMergeDeclarationMarker(node) {
+            // For an EnumDeclaration or ModuleDeclaration that merges with a preceeding
+            // declaration we do not emit a leading variable declaration. To preserve the
+            // begin/end semantics of the declararation and to properly handle exports
+            // we wrapped the leading variable declaration in a `MergeDeclarationMarker`.
+            //
+            // 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 === 205 /* VariableStatement */) {
+                var id = ts.getOriginalNodeId(node);
+                var isExportedDeclaration = ts.hasModifier(node.original, 1 /* Export */);
+                deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node.original, isExportedDeclaration);
+            }
+            return node;
+        }
+        /**
+         * Determines whether a node has an associated EndOfDeclarationMarker.
+         *
+         * @param node The node to test.
+         */
+        function hasAssociatedEndOfDeclarationMarker(node) {
+            return (ts.getEmitFlags(node) & 33554432 /* HasEndOfDeclarationMarker */) !== 0;
+        }
+        /**
+         * Visits a DeclarationMarker used as a placeholder for the end of a transformed
+         * declaration.
+         *
+         * @param node The node to visit.
+         */
+        function visitEndOfDeclarationMarker(node) {
+            // For some transformations we emit an `EndOfDeclarationMarker` to mark the actual
+            // end of the transformed declaration. We use this marker to emit any deferred exports
+            // of the declaration.
+            var id = ts.getOriginalNodeId(node);
+            var statements = deferredExports[id];
+            if (statements) {
+                delete deferredExports[id];
+                return ts.append(statements, node);
+            }
+            return node;
+        }
+        /**
+         * Appends the exports of an ImportDeclaration to a statement list, returning the
+         * statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param decl The declaration whose exports are to be recorded.
+         */
+        function appendExportsOfImportDeclaration(statements, decl) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            var importClause = decl.importClause;
+            if (!importClause) {
+                return statements;
+            }
+            if (importClause.name) {
+                statements = appendExportsOfDeclaration(statements, importClause);
+            }
+            var namedBindings = importClause.namedBindings;
+            if (namedBindings) {
+                switch (namedBindings.kind) {
+                    case 237 /* NamespaceImport */:
+                        statements = appendExportsOfDeclaration(statements, namedBindings);
+                        break;
+                    case 238 /* NamedImports */:
+                        for (var _i = 0, _a = namedBindings.elements; _i < _a.length; _i++) {
+                            var importBinding = _a[_i];
+                            statements = appendExportsOfDeclaration(statements, importBinding);
+                        }
+                        break;
+                }
+            }
+            return statements;
+        }
+        /**
+         * Appends the export of an ImportEqualsDeclaration to a statement list, returning the
+         * statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param decl The declaration whose exports are to be recorded.
+         */
+        function appendExportsOfImportEqualsDeclaration(statements, decl) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            return appendExportsOfDeclaration(statements, decl);
+        }
+        /**
+         * Appends the exports of a VariableStatement to a statement list, returning the statement
+         * list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param node The VariableStatement whose exports are to be recorded.
+         * @param exportSelf A value indicating whether to also export each VariableDeclaration of
+         * `nodes` declaration list.
+         */
+        function appendExportsOfVariableStatement(statements, node, exportSelf) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
+                var decl = _a[_i];
+                if (decl.initializer || exportSelf) {
+                    statements = appendExportsOfBindingElement(statements, decl, exportSelf);
+                }
+            }
+            return statements;
+        }
+        /**
+         * Appends the exports of a VariableDeclaration or BindingElement to a statement list,
+         * returning the statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param decl The declaration whose exports are to be recorded.
+         * @param exportSelf A value indicating whether to also export the declaration itself.
+         */
+        function appendExportsOfBindingElement(statements, decl, exportSelf) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            if (ts.isBindingPattern(decl.name)) {
+                for (var _i = 0, _a = decl.name.elements; _i < _a.length; _i++) {
+                    var element = _a[_i];
+                    if (!ts.isOmittedExpression(element)) {
+                        statements = appendExportsOfBindingElement(statements, element, exportSelf);
+                    }
+                }
+            }
+            else if (!ts.isGeneratedIdentifier(decl.name)) {
+                var excludeName = void 0;
+                if (exportSelf) {
+                    statements = appendExportStatement(statements, decl.name, ts.getLocalName(decl));
+                    excludeName = decl.name.text;
+                }
+                statements = appendExportsOfDeclaration(statements, decl, excludeName);
+            }
+            return statements;
+        }
+        /**
+         * Appends the exports of a ClassDeclaration or FunctionDeclaration to a statement list,
+         * returning the statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param decl The declaration whose exports are to be recorded.
+         */
+        function appendExportsOfHoistedDeclaration(statements, decl) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            var excludeName;
+            if (ts.hasModifier(decl, 1 /* Export */)) {
+                var exportName = ts.hasModifier(decl, 512 /* Default */) ? ts.createLiteral("default") : decl.name;
+                statements = appendExportStatement(statements, exportName, ts.getLocalName(decl));
+                excludeName = exportName.text;
+            }
+            if (decl.name) {
+                statements = appendExportsOfDeclaration(statements, decl, excludeName);
+            }
+            return statements;
+        }
+        /**
+         * Appends the exports of a declaration to a statement list, returning the statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param decl The declaration to export.
+         * @param excludeName An optional name to exclude from exports.
+         */
+        function appendExportsOfDeclaration(statements, decl, excludeName) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            var name = ts.getDeclarationName(decl);
+            var exportSpecifiers = moduleInfo.exportSpecifiers[name.text];
+            if (exportSpecifiers) {
+                for (var _i = 0, exportSpecifiers_1 = exportSpecifiers; _i < exportSpecifiers_1.length; _i++) {
+                    var exportSpecifier = exportSpecifiers_1[_i];
+                    if (exportSpecifier.name.text !== excludeName) {
+                        statements = appendExportStatement(statements, exportSpecifier.name, name);
+                    }
+                }
+            }
+            return statements;
+        }
+        /**
+         * Appends the down-level representation of an export to a statement list, returning the
+         * statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param exportName The name of the export.
+         * @param expression The expression to export.
+         * @param allowComments Whether to allow comments on the export.
+         */
+        function appendExportStatement(statements, exportName, expression, allowComments) {
+            statements = ts.append(statements, createExportStatement(exportName, expression, allowComments));
+            return statements;
+        }
+        /**
+         * Creates a call to the current file's export function to export a value.
+         *
+         * @param name The bound name of the export.
+         * @param value The exported value.
+         * @param allowComments An optional value indicating whether to emit comments for the statement.
+         */
+        function createExportStatement(name, value, allowComments) {
+            var statement = ts.createStatement(createExportExpression(name, value));
+            ts.startOnNewLine(statement);
+            if (!allowComments) {
+                ts.setEmitFlags(statement, 49152 /* NoComments */);
+            }
+            return statement;
+        }
+        /**
+         * Creates a call to the current file's export function to export a value.
+         *
+         * @param name The bound name of the export.
+         * @param value The exported value.
+         */
+        function createExportExpression(name, value) {
+            var exportName = ts.isIdentifier(name) ? ts.createLiteral(name) : name;
+            return ts.createCall(exportFunction, /*typeArguments*/ undefined, [exportName, value]);
+        }
+        //
+        // Top-Level or Nested Source Element Visitors
+        //
+        /**
+         * Visit nested elements at the top-level of a module.
+         *
+         * @param node The node to visit.
+         */
+        function nestedElementVisitor(node) {
+            switch (node.kind) {
+                case 205 /* VariableStatement */:
+                    return visitVariableStatement(node);
+                case 225 /* FunctionDeclaration */:
+                    return visitFunctionDeclaration(node);
+                case 226 /* ClassDeclaration */:
+                    return visitClassDeclaration(node);
+                case 211 /* ForStatement */:
+                    return visitForStatement(node);
+                case 212 /* ForInStatement */:
+                    return visitForInStatement(node);
+                case 213 /* ForOfStatement */:
+                    return visitForOfStatement(node);
+                case 209 /* DoStatement */:
+                    return visitDoStatement(node);
+                case 210 /* WhileStatement */:
+                    return visitWhileStatement(node);
+                case 219 /* LabeledStatement */:
+                    return visitLabeledStatement(node);
+                case 217 /* WithStatement */:
+                    return visitWithStatement(node);
+                case 218 /* SwitchStatement */:
+                    return visitSwitchStatement(node);
+                case 232 /* CaseBlock */:
+                    return visitCaseBlock(node);
+                case 253 /* CaseClause */:
+                    return visitCaseClause(node);
+                case 254 /* DefaultClause */:
+                    return visitDefaultClause(node);
+                case 221 /* TryStatement */:
+                    return visitTryStatement(node);
+                case 256 /* CatchClause */:
+                    return visitCatchClause(node);
+                case 204 /* Block */:
+                    return visitBlock(node);
+                case 294 /* MergeDeclarationMarker */:
+                    return visitMergeDeclarationMarker(node);
+                case 295 /* EndOfDeclarationMarker */:
+                    return visitEndOfDeclarationMarker(node);
+                default:
+                    return destructuringVisitor(node);
+            }
+        }
+        /**
+         * Visits the body of a ForStatement to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitForStatement(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.updateFor(node, visitForInitializer(node.initializer), ts.visitNode(node.condition, destructuringVisitor, ts.isExpression, /*optional*/ true), ts.visitNode(node.incrementor, destructuringVisitor, ts.isExpression, /*optional*/ true), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement));
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        /**
+         * Visits the body of a ForInStatement to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitForInStatement(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.updateForIn(node, visitForInitializer(node.initializer), ts.visitNode(node.expression, destructuringVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, /*optional*/ false, ts.liftToBlock));
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        /**
+         * Visits the body of a ForOfStatement to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitForOfStatement(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.updateForOf(node, visitForInitializer(node.initializer), ts.visitNode(node.expression, destructuringVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, /*optional*/ false, ts.liftToBlock));
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        /**
+         * Determines whether to hoist the initializer of a ForStatement, ForInStatement, or
+         * ForOfStatement.
+         *
+         * @param node The node to test.
+         */
+        function shouldHoistForInitializer(node) {
+            return ts.isVariableDeclarationList(node)
+                && shouldHoistVariableDeclarationList(node);
+        }
+        /**
+         * Visits the initializer of a ForStatement, ForInStatement, or ForOfStatement
+         *
+         * @param node The node to visit.
+         */
+        function visitForInitializer(node) {
+            if (shouldHoistForInitializer(node)) {
+                var expressions = void 0;
+                for (var _i = 0, _a = node.declarations; _i < _a.length; _i++) {
+                    var variable = _a[_i];
+                    expressions = ts.append(expressions, transformInitializedVariable(variable, /*isExportedDeclaration*/ false));
+                }
+                return expressions ? ts.inlineExpressions(expressions) : ts.createOmittedExpression();
+            }
+            else {
+                return ts.visitEachChild(node, nestedElementVisitor, context);
+            }
+        }
+        /**
+         * Visits the body of a DoStatement to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitDoStatement(node) {
+            return ts.updateDo(node, ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, /*optional*/ false, ts.liftToBlock), ts.visitNode(node.expression, destructuringVisitor, ts.isExpression));
+        }
+        /**
+         * Visits the body of a WhileStatement to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitWhileStatement(node) {
+            return ts.updateWhile(node, ts.visitNode(node.expression, destructuringVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, /*optional*/ false, ts.liftToBlock));
+        }
+        /**
+         * Visits the body of a LabeledStatement to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitLabeledStatement(node) {
+            return ts.updateLabel(node, node.label, ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, /*optional*/ false, ts.liftToBlock));
+        }
+        /**
+         * Visits the body of a WithStatement to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitWithStatement(node) {
+            return ts.updateWith(node, ts.visitNode(node.expression, destructuringVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, /*optional*/ false, ts.liftToBlock));
+        }
+        /**
+         * Visits the body of a SwitchStatement to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitSwitchStatement(node) {
+            return ts.updateSwitch(node, ts.visitNode(node.expression, destructuringVisitor, ts.isExpression), ts.visitNode(node.caseBlock, nestedElementVisitor, ts.isCaseBlock));
+        }
+        /**
+         * Visits the body of a CaseBlock to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitCaseBlock(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.updateCaseBlock(node, ts.visitNodes(node.clauses, nestedElementVisitor, ts.isCaseOrDefaultClause));
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        /**
+         * Visits the body of a CaseClause to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitCaseClause(node) {
+            return ts.updateCaseClause(node, ts.visitNode(node.expression, destructuringVisitor, ts.isExpression), ts.visitNodes(node.statements, nestedElementVisitor, ts.isStatement));
+        }
+        /**
+         * Visits the body of a DefaultClause to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitDefaultClause(node) {
+            return ts.visitEachChild(node, nestedElementVisitor, context);
+        }
+        /**
+         * Visits the body of a TryStatement to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitTryStatement(node) {
+            return ts.visitEachChild(node, nestedElementVisitor, context);
+        }
+        /**
+         * Visits the body of a CatchClause to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitCatchClause(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.updateCatchClause(node, node.variableDeclaration, ts.visitNode(node.block, nestedElementVisitor, ts.isBlock));
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        /**
+         * Visits the body of a Block to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitBlock(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.visitEachChild(node, nestedElementVisitor, context);
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        //
+        // Destructuring Assignment Visitors
+        //
+        /**
+         * Visit nodes to flatten destructuring assignments to exported symbols.
+         *
+         * @param node The node to visit.
+         */
+        function destructuringVisitor(node) {
+            if (node.transformFlags & 16384 /* DestructuringAssignment */
+                && node.kind === 192 /* BinaryExpression */) {
+                return visitDestructuringAssignment(node);
+            }
+            else if (node.transformFlags & 32768 /* ContainsDestructuringAssignment */) {
+                return ts.visitEachChild(node, destructuringVisitor, context);
+            }
+            else {
+                return node;
+            }
+        }
+        /**
+         * Visits a DestructuringAssignment to flatten destructuring to exported symbols.
+         *
+         * @param node The node to visit.
+         */
+        function visitDestructuringAssignment(node) {
+            if (hasExportedReferenceInDestructuringTarget(node.left)) {
+                return ts.flattenDestructuringAssignment(context, node, /*needsValue*/ true, hoistVariableDeclaration, destructuringVisitor);
+            }
+            return ts.visitEachChild(node, destructuringVisitor, context);
+        }
+        /**
+         * Determines whether the target of a destructuring assigment refers to an exported symbol.
+         *
+         * @param node The destructuring target.
+         */
+        function hasExportedReferenceInDestructuringTarget(node) {
+            if (ts.isAssignmentExpression(node)) {
+                return hasExportedReferenceInDestructuringTarget(node.left);
+            }
+            else if (ts.isSpreadExpression(node)) {
+                return hasExportedReferenceInDestructuringTarget(node.expression);
+            }
+            else if (ts.isObjectLiteralExpression(node)) {
+                return ts.some(node.properties, hasExportedReferenceInDestructuringTarget);
+            }
+            else if (ts.isArrayLiteralExpression(node)) {
+                return ts.some(node.elements, hasExportedReferenceInDestructuringTarget);
+            }
+            else if (ts.isShorthandPropertyAssignment(node)) {
+                return hasExportedReferenceInDestructuringTarget(node.name);
+            }
+            else if (ts.isPropertyAssignment(node)) {
+                return hasExportedReferenceInDestructuringTarget(node.initializer);
+            }
+            else if (ts.isIdentifier(node)) {
+                var container = resolver.getReferencedExportContainer(node);
+                return container !== undefined && container.kind === 261 /* SourceFile */;
+            }
+            else {
+                return false;
+            }
+        }
+        //
+        // Modifier Visitors
+        //
+        /**
+         * Visit nodes to elide module-specific modifiers.
+         *
+         * @param node The node to visit.
+         */
+        function modifierVisitor(node) {
+            switch (node.kind) {
+                case 83 /* ExportKeyword */:
+                case 78 /* DefaultKeyword */:
+                    return undefined;
+            }
+            return node;
+        }
+        //
+        // Emit Notification
+        //
+        /**
+         * Hook for node emit notifications.
+         *
+         * @param emitContext A context hint for the emitter.
+         * @param node The node to emit.
+         * @param emit A callback used to emit the node in the printer.
+         */
+        function onEmitNode(emitContext, node, emitCallback) {
+            if (node.kind === 261 /* SourceFile */) {
+                var id = ts.getOriginalNodeId(node);
+                currentSourceFile = node;
+                moduleInfo = moduleInfoMap[id];
+                exportFunction = exportFunctionsMap[id];
+                noSubstitution = noSubstitutionMap[id];
+                if (noSubstitution) {
+                    delete noSubstitutionMap[id];
+                }
+                previousOnEmitNode(emitContext, node, emitCallback);
+                currentSourceFile = undefined;
+                moduleInfo = undefined;
+                exportFunction = undefined;
+                noSubstitution = undefined;
+            }
+            else {
+                previousOnEmitNode(emitContext, node, emitCallback);
+            }
+        }
+        //
+        // Substitutions
+        //
+        /**
+         * Hooks node substitutions.
+         *
+         * @param emitContext A context hint for the emitter.
+         * @param node The node to substitute.
+         */
+        function onSubstituteNode(emitContext, node) {
+            node = previousOnSubstituteNode(emitContext, node);
+            if (isSubstitutionPrevented(node)) {
+                return node;
+            }
+            if (emitContext === 1 /* Expression */) {
+                return substituteExpression(node);
+            }
+            return node;
+        }
+        /**
+         * Substitute the expression, if necessary.
+         *
+         * @param node The node to substitute.
+         */
+        function substituteExpression(node) {
+            switch (node.kind) {
+                case 70 /* Identifier */:
+                    return substituteExpressionIdentifier(node);
+                case 192 /* BinaryExpression */:
+                    return substituteBinaryExpression(node);
+                case 190 /* PrefixUnaryExpression */:
+                case 191 /* PostfixUnaryExpression */:
+                    return substituteUnaryExpression(node);
+            }
+            return node;
+        }
+        /**
+         * Substitution for an Identifier expression that may contain an imported or exported symbol.
+         *
+         * @param node The node to substitute.
+         */
+        function substituteExpressionIdentifier(node) {
+            // When we see an identifier in an expression position that
+            // points to an imported symbol, we should substitute a qualified
+            // reference to the imported symbol if one is needed.
+            //
+            // - We do not substitute generated identifiers for any reason.
+            // - We do not substitute identifiers tagged with the LocalName flag.
+            if (!ts.isGeneratedIdentifier(node) && !ts.isLocalName(node)) {
+                var importDeclaration = resolver.getReferencedImportDeclaration(node);
+                if (importDeclaration) {
+                    if (ts.isImportClause(importDeclaration)) {
+                        return ts.createPropertyAccess(ts.getGeneratedNameForNode(importDeclaration.parent), ts.createIdentifier("default"), 
+                        /*location*/ node);
+                    }
+                    else if (ts.isImportSpecifier(importDeclaration)) {
+                        return ts.createPropertyAccess(ts.getGeneratedNameForNode(importDeclaration.parent.parent.parent), ts.getSynthesizedClone(importDeclaration.propertyName || importDeclaration.name), 
+                        /*location*/ node);
+                    }
+                }
+            }
+            return node;
+        }
+        /**
+         * Substitution for a BinaryExpression that may contain an imported or exported symbol.
+         *
+         * @param node The node to substitute.
+         */
+        function substituteBinaryExpression(node) {
+            // When we see an assignment expression whose left-hand side is an exported symbol,
+            // we should ensure all exports of that symbol are updated with the correct value.
+            //
+            // - We do not substitute generated identifiers for any reason.
+            // - We do not substitute identifiers tagged with the LocalName flag.
+            // - We do not substitute identifiers that were originally the name of an enum or
+            //   namespace due to how they are transformed in TypeScript.
+            // - We only substitute identifiers that are exported at the top level.
+            if (ts.isAssignmentOperator(node.operatorToken.kind)
+                && ts.isIdentifier(node.left)
+                && !ts.isGeneratedIdentifier(node.left)
+                && !ts.isLocalName(node.left)
+                && !ts.isDeclarationNameOfEnumOrNamespace(node.left)) {
+                var exportedNames = getExports(node.left);
+                if (exportedNames) {
+                    // For each additional export of the declaration, apply an export assignment.
+                    var expression = node;
+                    for (var _i = 0, exportedNames_1 = exportedNames; _i < exportedNames_1.length; _i++) {
+                        var exportName = exportedNames_1[_i];
+                        expression = createExportExpression(exportName, preventSubstitution(expression));
+                    }
+                    return expression;
+                }
+            }
+            return node;
+        }
+        /**
+         * Substitution for a UnaryExpression that may contain an imported or exported symbol.
+         *
+         * @param node The node to substitute.
+         */
+        function substituteUnaryExpression(node) {
+            // When we see a prefix or postfix increment expression whose operand is an exported
+            // symbol, we should ensure all exports of that symbol are updated with the correct
+            // value.
+            //
+            // - We do not substitute generated identifiers for any reason.
+            // - We do not substitute identifiers tagged with the LocalName flag.
+            // - We do not substitute identifiers that were originally the name of an enum or
+            //   namespace due to how they are transformed in TypeScript.
+            // - We only substitute identifiers that are exported at the top level.
+            if ((node.operator === 42 /* PlusPlusToken */ || node.operator === 43 /* MinusMinusToken */)
+                && ts.isIdentifier(node.operand)
+                && !ts.isGeneratedIdentifier(node.operand)
+                && !ts.isLocalName(node.operand)
+                && !ts.isDeclarationNameOfEnumOrNamespace(node.operand)) {
+                var exportedNames = getExports(node.operand);
+                if (exportedNames) {
+                    var expression = node.kind === 191 /* PostfixUnaryExpression */
+                        ? ts.createPrefix(node.operator, node.operand, 
+                        /*location*/ node)
+                        : node;
+                    for (var _i = 0, exportedNames_2 = exportedNames; _i < exportedNames_2.length; _i++) {
+                        var exportName = exportedNames_2[_i];
+                        expression = createExportExpression(exportName, preventSubstitution(expression));
+                    }
+                    if (node.kind === 191 /* PostfixUnaryExpression */) {
+                        expression = node.operator === 42 /* PlusPlusToken */
+                            ? ts.createSubtract(preventSubstitution(expression), ts.createLiteral(1))
+                            : ts.createAdd(preventSubstitution(expression), ts.createLiteral(1));
+                    }
+                    return expression;
+                }
+            }
+            return node;
+        }
+        /**
+         * Gets the exports of a name.
+         *
+         * @param name The name.
+         */
+        function getExports(name) {
+            var exportedNames;
+            if (!ts.isGeneratedIdentifier(name)) {
+                var valueDeclaration = resolver.getReferencedImportDeclaration(name)
+                    || resolver.getReferencedValueDeclaration(name);
+                if (valueDeclaration) {
+                    var exportContainer = resolver.getReferencedExportContainer(name, /*prefixLocals*/ false);
+                    if (exportContainer && exportContainer.kind === 261 /* SourceFile */) {
+                        exportedNames = ts.append(exportedNames, ts.getDeclarationName(valueDeclaration));
+                    }
+                    exportedNames = ts.addRange(exportedNames, moduleInfo && moduleInfo.exportedBindings[ts.getOriginalNodeId(valueDeclaration)]);
+                }
+            }
+            return exportedNames;
+        }
+        /**
+         * Prevent substitution of a node for this transformer.
+         *
+         * @param node The node which should not be substituted.
+         */
+        function preventSubstitution(node) {
+            if (noSubstitution === undefined)
+                noSubstitution = ts.createMap();
+            noSubstitution[ts.getNodeId(node)] = true;
+            return node;
+        }
+        /**
+         * Determines whether a node should not be substituted.
+         *
+         * @param node The node to test.
+         */
+        function isSubstitutionPrevented(node) {
+            return noSubstitution && node.id && noSubstitution[node.id];
+        }
+    }
+    ts.transformSystemModule = transformSystemModule;
+})(ts || (ts = {}));
+/// <reference path="../../factory.ts" />
+/// <reference path="../../visitor.ts" />
+/*@internal*/
+var ts;
+(function (ts) {
+    function transformModule(context) {
+        var transformModuleDelegates = ts.createMap((_a = {},
+            _a[ts.ModuleKind.None] = transformCommonJSModule,
+            _a[ts.ModuleKind.CommonJS] = transformCommonJSModule,
+            _a[ts.ModuleKind.AMD] = transformAMDModule,
+            _a[ts.ModuleKind.UMD] = transformUMDModule,
+            _a));
+        var startLexicalEnvironment = context.startLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration;
+        var compilerOptions = context.getCompilerOptions();
+        var resolver = context.getEmitResolver();
+        var host = context.getEmitHost();
+        var languageVersion = ts.getEmitScriptTarget(compilerOptions);
+        var moduleKind = ts.getEmitModuleKind(compilerOptions);
+        var previousOnSubstituteNode = context.onSubstituteNode;
+        var previousOnEmitNode = context.onEmitNode;
+        context.onSubstituteNode = onSubstituteNode;
+        context.onEmitNode = onEmitNode;
+        context.enableSubstitution(70 /* Identifier */); // Substitutes expression identifiers with imported/exported symbols.
+        context.enableSubstitution(192 /* BinaryExpression */); // Substitutes assignments to exported symbols.
+        context.enableSubstitution(190 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(191 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(258 /* ShorthandPropertyAssignment */); // Substitutes shorthand property assignments for imported/exported symbols.
+        context.enableEmitNotification(261 /* SourceFile */); // Restore state when substituting nodes in a file.
+        var moduleInfoMap = ts.createMap(); // The ExternalModuleInfo for each file.
+        var deferredExports = ts.createMap(); // Exports to defer until an EndOfDeclarationMarker is found.
+        var currentSourceFile; // The current file.
+        var currentModuleInfo; // The ExternalModuleInfo for the current file.
+        var noSubstitution; // Set of nodes for which substitution rules should be ignored.
+        return transformSourceFile;
+        /**
+         * Transforms the module aspects of a SourceFile.
+         *
+         * @param node The SourceFile node.
+         */
+        function transformSourceFile(node) {
+            if (ts.isDeclarationFile(node)
+                || !(ts.isExternalModule(node)
+                    || compilerOptions.isolatedModules)) {
+                return node;
+            }
+            currentSourceFile = node;
+            currentModuleInfo = moduleInfoMap[ts.getOriginalNodeId(node)] = ts.collectExternalModuleInfo(node, resolver);
+            // Perform the transformation.
+            var transformModule = transformModuleDelegates[moduleKind] || transformModuleDelegates[ts.ModuleKind.None];
+            var updated = transformModule(node);
+            currentSourceFile = undefined;
+            currentModuleInfo = undefined;
+            return ts.aggregateTransformFlags(updated);
+        }
+        /**
+         * Transforms a SourceFile into a CommonJS module.
+         *
+         * @param node The SourceFile node.
+         */
+        function transformCommonJSModule(node) {
+            startLexicalEnvironment();
+            var statements = [];
+            var statementOffset = ts.addPrologueDirectives(statements, node.statements, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict, sourceElementVisitor);
+            ts.addRange(statements, ts.visitNodes(node.statements, sourceElementVisitor, ts.isStatement, statementOffset));
+            ts.addRange(statements, endLexicalEnvironment());
+            addExportEqualsIfNeeded(statements, /*emitAsReturn*/ false);
+            var updated = ts.updateSourceFileNode(node, ts.createNodeArray(statements, node.statements));
+            if (currentModuleInfo.hasExportStarsToExportValues) {
+                ts.setEmitFlags(updated, 2 /* EmitExportStar */ | ts.getEmitFlags(node));
+            }
+            return updated;
+        }
+        /**
+         * Transforms a SourceFile into an AMD module.
+         *
+         * @param node The SourceFile node.
+         */
+        function transformAMDModule(node) {
+            var define = ts.createIdentifier("define");
+            var moduleName = ts.tryGetModuleNameFromFile(node, host, compilerOptions);
+            return transformAsynchronousModule(node, define, moduleName, /*includeNonAmdDependencies*/ true);
+        }
+        /**
+         * Transforms a SourceFile into a UMD module.
+         *
+         * @param node The SourceFile node.
+         */
+        function transformUMDModule(node) {
+            var define = ts.createIdentifier("define");
+            ts.setEmitFlags(define, 16 /* UMDDefine */);
+            return transformAsynchronousModule(node, define, /*moduleName*/ undefined, /*includeNonAmdDependencies*/ false);
+        }
+        /**
+         * Transforms a SourceFile into an AMD or UMD module.
+         *
+         * @param node The SourceFile node.
+         * @param define The expression used to define the module.
+         * @param moduleName An expression for the module name, if available.
+         * @param includeNonAmdDependencies A value indicating whether to incldue any non-AMD dependencies.
+         */
+        function transformAsynchronousModule(node, define, moduleName, includeNonAmdDependencies) {
+            // An AMD define function has the following shape:
+            //
+            //     define(id?, dependencies?, factory);
+            //
+            // This has the shape of the following:
+            //
+            //     define(name, ["module1", "module2"], function (module1Alias) { ... }
+            //
+            // The location of the alias in the parameter list in the factory function needs to
+            // match the position of the module name in the dependency list.
+            //
+            // To ensure this is true in cases of modules with no aliases, e.g.:
+            //
+            //     import "module"
+            //
+            // or
+            //
+            //     /// <amd-dependency path= "a.css" />
+            //
+            // we need to add modules without alias names to the end of the dependencies list
+            var _a = collectAsynchronousDependencies(node, includeNonAmdDependencies), aliasedModuleNames = _a.aliasedModuleNames, unaliasedModuleNames = _a.unaliasedModuleNames, importAliasNames = _a.importAliasNames;
+            // Create an updated SourceFile:
+            //
+            //     define(moduleName?, ["module1", "module2"], function ...
+            return ts.updateSourceFileNode(node, ts.createNodeArray([
+                ts.createStatement(ts.createCall(define, 
+                /*typeArguments*/ undefined, (moduleName ? [moduleName] : []).concat([
+                    // Add the dependency array argument:
+                    //
+                    //     ["require", "exports", module1", "module2", ...]
+                    ts.createArrayLiteral([
+                        ts.createLiteral("require"),
+                        ts.createLiteral("exports")
+                    ].concat(aliasedModuleNames, unaliasedModuleNames)),
+                    // Add the module body function argument:
+                    //
+                    //     function (require, exports, module1, module2) ...
+                    ts.createFunctionExpression(
+                    /*modifiers*/ undefined, 
+                    /*asteriskToken*/ undefined, 
+                    /*name*/ undefined, 
+                    /*typeParameters*/ undefined, [
+                        ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "require"),
+                        ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "exports")
+                    ].concat(importAliasNames), 
+                    /*type*/ undefined, transformAsynchronousModuleBody(node))
+                ])))
+            ], 
+            /*location*/ node.statements));
+        }
+        /**
+         * Collect the additional asynchronous dependencies for the module.
+         *
+         * @param node The source file.
+         * @param includeNonAmdDependencies A value indicating whether to include non-AMD dependencies.
+         */
+        function collectAsynchronousDependencies(node, includeNonAmdDependencies) {
+            // names of modules with corresponding parameter in the factory function
+            var aliasedModuleNames = [];
+            // names of modules with no corresponding parameters in factory function
+            var unaliasedModuleNames = [];
+            // names of the parameters in the factory function; these
+            // parameters need to match the indexes of the corresponding
+            // module names in aliasedModuleNames.
+            var importAliasNames = [];
+            // Fill in amd-dependency tags
+            for (var _i = 0, _a = node.amdDependencies; _i < _a.length; _i++) {
+                var amdDependency = _a[_i];
+                if (amdDependency.name) {
+                    aliasedModuleNames.push(ts.createLiteral(amdDependency.path));
+                    importAliasNames.push(ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, amdDependency.name));
+                }
+                else {
+                    unaliasedModuleNames.push(ts.createLiteral(amdDependency.path));
+                }
+            }
+            for (var _b = 0, _c = currentModuleInfo.externalImports; _b < _c.length; _b++) {
+                var importNode = _c[_b];
+                // Find the name of the external module
+                var externalModuleName = ts.getExternalModuleNameLiteral(importNode, currentSourceFile, host, resolver, compilerOptions);
+                // Find the name of the module alias, if there is one
+                var importAliasName = ts.getLocalNameForExternalImport(importNode, currentSourceFile);
+                if (includeNonAmdDependencies && importAliasName) {
+                    // Set emitFlags on the name of the classDeclaration
+                    // This is so that when printer will not substitute the identifier
+                    ts.setEmitFlags(importAliasName, 128 /* NoSubstitution */);
+                    aliasedModuleNames.push(externalModuleName);
+                    importAliasNames.push(ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, importAliasName));
+                }
+                else {
+                    unaliasedModuleNames.push(externalModuleName);
+                }
+            }
+            return { aliasedModuleNames: aliasedModuleNames, unaliasedModuleNames: unaliasedModuleNames, importAliasNames: importAliasNames };
+        }
+        /**
+         * Transforms a SourceFile into an AMD or UMD module body.
+         *
+         * @param node The SourceFile node.
+         */
+        function transformAsynchronousModuleBody(node) {
+            startLexicalEnvironment();
+            var statements = [];
+            var statementOffset = ts.addPrologueDirectives(statements, node.statements, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict, sourceElementVisitor);
+            // Visit each statement of the module body.
+            ts.addRange(statements, ts.visitNodes(node.statements, sourceElementVisitor, ts.isStatement, statementOffset));
+            // End the lexical environment for the module body
+            // and merge any new lexical declarations.
+            ts.addRange(statements, endLexicalEnvironment());
+            // Append the 'export =' statement if provided.
+            addExportEqualsIfNeeded(statements, /*emitAsReturn*/ true);
+            var body = ts.createBlock(statements, /*location*/ undefined, /*multiLine*/ true);
+            if (currentModuleInfo.hasExportStarsToExportValues) {
+                // If we have any `export * from ...` declarations
+                // we need to inform the emitter to add the __export helper.
+                ts.setEmitFlags(body, 2 /* EmitExportStar */);
+            }
+            return body;
+        }
+        /**
+         * Adds the down-level representation of `export=` to the statement list if one exists
+         * in the source file.
+         *
+         * @param statements The Statement list to modify.
+         * @param emitAsReturn A value indicating whether to emit the `export=` statement as a
+         * return statement.
+         */
+        function addExportEqualsIfNeeded(statements, emitAsReturn) {
+            if (currentModuleInfo.exportEquals) {
+                if (emitAsReturn) {
+                    var statement = ts.createReturn(currentModuleInfo.exportEquals.expression, 
+                    /*location*/ currentModuleInfo.exportEquals);
+                    ts.setEmitFlags(statement, 12288 /* NoTokenSourceMaps */ | 49152 /* NoComments */);
+                    statements.push(statement);
+                }
+                else {
+                    var statement = ts.createStatement(ts.createAssignment(ts.createPropertyAccess(ts.createIdentifier("module"), "exports"), currentModuleInfo.exportEquals.expression), 
+                    /*location*/ currentModuleInfo.exportEquals);
+                    ts.setEmitFlags(statement, 49152 /* NoComments */);
+                    statements.push(statement);
+                }
+            }
+        }
+        //
+        // Top-Level Source Element Visitors
+        //
+        /**
+         * Visits a node at the top level of the source file.
+         *
+         * @param node The node to visit.
+         */
+        function sourceElementVisitor(node) {
+            switch (node.kind) {
+                case 235 /* ImportDeclaration */:
+                    return visitImportDeclaration(node);
+                case 234 /* ImportEqualsDeclaration */:
+                    return visitImportEqualsDeclaration(node);
+                case 241 /* ExportDeclaration */:
+                    return visitExportDeclaration(node);
+                case 240 /* ExportAssignment */:
+                    return visitExportAssignment(node);
+                case 205 /* VariableStatement */:
+                    return visitVariableStatement(node);
+                case 225 /* FunctionDeclaration */:
+                    return visitFunctionDeclaration(node);
+                case 226 /* ClassDeclaration */:
+                    return visitClassDeclaration(node);
+                case 294 /* MergeDeclarationMarker */:
+                    return visitMergeDeclarationMarker(node);
+                case 295 /* EndOfDeclarationMarker */:
+                    return visitEndOfDeclarationMarker(node);
+                default:
+                    // This visitor does not descend into the tree, as export/import statements
+                    // are only transformed at the top level of a file.
+                    return node;
+            }
+        }
+        /**
+         * Visits an ImportDeclaration node.
+         *
+         * @param node The node to visit.
+         */
+        function visitImportDeclaration(node) {
+            var statements;
+            var namespaceDeclaration = ts.getNamespaceDeclarationNode(node);
+            if (moduleKind !== ts.ModuleKind.AMD) {
+                if (!node.importClause) {
+                    // import "mod";
+                    return ts.createStatement(createRequireCall(node), /*location*/ node);
+                }
+                else {
+                    var variables = [];
+                    if (namespaceDeclaration && !ts.isDefaultImport(node)) {
+                        // import * as n from "mod";
+                        variables.push(ts.createVariableDeclaration(ts.getSynthesizedClone(namespaceDeclaration.name), 
+                        /*type*/ undefined, createRequireCall(node)));
+                    }
+                    else {
+                        // import d from "mod";
+                        // import { x, y } from "mod";
+                        // import d, { x, y } from "mod";
+                        // import d, * as n from "mod";
+                        variables.push(ts.createVariableDeclaration(ts.getGeneratedNameForNode(node), 
+                        /*type*/ undefined, createRequireCall(node)));
+                        if (namespaceDeclaration && ts.isDefaultImport(node)) {
+                            variables.push(ts.createVariableDeclaration(ts.getSynthesizedClone(namespaceDeclaration.name), 
+                            /*type*/ undefined, ts.getGeneratedNameForNode(node)));
+                        }
+                    }
+                    statements = ts.append(statements, ts.createVariableStatement(
+                    /*modifiers*/ undefined, ts.createVariableDeclarationList(variables, 
+                    /*location*/ undefined, languageVersion >= 2 /* ES2015 */ ? 2 /* Const */ : 0 /* None */), 
+                    /*location*/ node));
+                }
+            }
+            else if (namespaceDeclaration && ts.isDefaultImport(node)) {
+                // import d, * as n from "mod";
+                statements = ts.append(statements, ts.createVariableStatement(
+                /*modifiers*/ undefined, ts.createVariableDeclarationList([
+                    ts.createVariableDeclaration(ts.getSynthesizedClone(namespaceDeclaration.name), 
+                    /*type*/ undefined, ts.getGeneratedNameForNode(node), 
+                    /*location*/ node)
+                ], 
+                /*location*/ undefined, languageVersion >= 2 /* ES2015 */ ? 2 /* Const */ : 0 /* None */)));
+            }
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfImportDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfImportDeclaration(statements, node);
+            }
+            return ts.singleOrMany(statements);
+        }
+        /**
+         * Creates a `require()` call to import an external module.
+         *
+         * @param importNode The declararation to import.
+         */
+        function createRequireCall(importNode) {
+            var moduleName = ts.getExternalModuleNameLiteral(importNode, currentSourceFile, host, resolver, compilerOptions);
+            var args = [];
+            if (moduleName) {
+                args.push(moduleName);
+            }
+            return ts.createCall(ts.createIdentifier("require"), /*typeArguments*/ undefined, args);
+        }
+        /**
+         * Visits an ImportEqualsDeclaration node.
+         *
+         * @param node The node to visit.
+         */
+        function visitImportEqualsDeclaration(node) {
+            ts.Debug.assert(ts.isExternalModuleImportEqualsDeclaration(node), "import= for internal module references should be handled in an earlier transformer.");
+            var statements;
+            if (moduleKind !== ts.ModuleKind.AMD) {
+                if (ts.hasModifier(node, 1 /* Export */)) {
+                    statements = ts.append(statements, ts.createStatement(createExportExpression(node.name, createRequireCall(node)), 
+                    /*location*/ node));
+                }
+                else {
+                    statements = ts.append(statements, ts.createVariableStatement(
+                    /*modifiers*/ undefined, ts.createVariableDeclarationList([
+                        ts.createVariableDeclaration(ts.getSynthesizedClone(node.name), 
+                        /*type*/ undefined, createRequireCall(node))
+                    ], 
+                    /*location*/ undefined, 
+                    /*flags*/ languageVersion >= 2 /* ES2015 */ ? 2 /* Const */ : 0 /* None */), 
+                    /*location*/ node));
+                }
+            }
+            else {
+                if (ts.hasModifier(node, 1 /* Export */)) {
+                    statements = ts.append(statements, ts.createStatement(createExportExpression(ts.getExportName(node), ts.getLocalName(node)), 
+                    /*location*/ node));
+                }
+            }
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfImportEqualsDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfImportEqualsDeclaration(statements, node);
+            }
+            return ts.singleOrMany(statements);
+        }
+        /**
+         * Visits an ExportDeclaration node.
+         *
+         * @param The node to visit.
+         */
+        function visitExportDeclaration(node) {
+            if (!node.moduleSpecifier) {
+                // Elide export declarations with no module specifier as they are handled
+                // elsewhere.
+                return undefined;
+            }
+            var generatedName = ts.getGeneratedNameForNode(node);
+            if (node.exportClause) {
+                var statements = [];
+                // export { x, y } from "mod";
+                if (moduleKind !== ts.ModuleKind.AMD) {
+                    statements.push(ts.createVariableStatement(
+                    /*modifiers*/ undefined, ts.createVariableDeclarationList([
+                        ts.createVariableDeclaration(generatedName, 
+                        /*type*/ undefined, createRequireCall(node))
+                    ]), 
+                    /*location*/ node));
+                }
+                for (var _i = 0, _a = node.exportClause.elements; _i < _a.length; _i++) {
+                    var specifier = _a[_i];
+                    var exportedValue = ts.createPropertyAccess(generatedName, specifier.propertyName || specifier.name);
+                    statements.push(ts.createStatement(createExportExpression(ts.getExportName(specifier), exportedValue), 
+                    /*location*/ specifier));
+                }
+                return ts.singleOrMany(statements);
+            }
+            else {
+                // export * from "mod";
+                return ts.createStatement(ts.createCall(ts.createIdentifier("__export"), 
+                /*typeArguments*/ undefined, [
+                    moduleKind !== ts.ModuleKind.AMD
+                        ? createRequireCall(node)
+                        : generatedName
+                ]), 
+                /*location*/ node);
+            }
+        }
+        /**
+         * Visits an ExportAssignment node.
+         *
+         * @param node The node to visit.
+         */
+        function visitExportAssignment(node) {
+            if (node.isExportEquals) {
+                return undefined;
+            }
+            var statements;
+            var original = node.original;
+            if (original && hasAssociatedEndOfDeclarationMarker(original)) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportStatement(deferredExports[id], ts.createIdentifier("default"), node.expression, /*location*/ node, /*allowComments*/ true);
+            }
+            else {
+                statements = appendExportStatement(statements, ts.createIdentifier("default"), node.expression, /*location*/ node, /*allowComments*/ true);
+            }
+            return ts.singleOrMany(statements);
+        }
+        /**
+         * Visits a FunctionDeclaration node.
+         *
+         * @param node The node to visit.
+         */
+        function visitFunctionDeclaration(node) {
+            var statements;
+            if (ts.hasModifier(node, 1 /* Export */)) {
+                statements = ts.append(statements, ts.setOriginalNode(ts.createFunctionDeclaration(
+                /*decorators*/ undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, ts.getDeclarationName(node, /*allowComments*/ true, /*allowSourceMaps*/ true), 
+                /*typeParameters*/ undefined, node.parameters, 
+                /*type*/ undefined, node.body, 
+                /*location*/ node), 
+                /*original*/ node));
+            }
+            else {
+                statements = ts.append(statements, node);
+            }
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfHoistedDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfHoistedDeclaration(statements, node);
+            }
+            return ts.singleOrMany(statements);
+        }
+        /**
+         * Visits a ClassDeclaration node.
+         *
+         * @param node The node to visit.
+         */
+        function visitClassDeclaration(node) {
+            var statements;
+            if (ts.hasModifier(node, 1 /* Export */)) {
+                statements = ts.append(statements, ts.setOriginalNode(ts.createClassDeclaration(
+                /*decorators*/ undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), ts.getDeclarationName(node, /*allowComments*/ true, /*allowSourceMaps*/ true), 
+                /*typeParameters*/ undefined, node.heritageClauses, node.members, 
+                /*location*/ node), 
+                /*original*/ node));
+            }
+            else {
+                statements = ts.append(statements, node);
+            }
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfHoistedDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfHoistedDeclaration(statements, node);
+            }
+            return ts.singleOrMany(statements);
+        }
+        /**
+         * Visits a VariableStatement node.
+         *
+         * @param node The node to visit.
+         */
+        function visitVariableStatement(node) {
+            var statements;
+            var variables;
+            var expressions;
+            if (ts.hasModifier(node, 1 /* Export */)) {
+                var modifiers = void 0;
+                // If we're exporting these variables, then these just become assignments to 'exports.x'.
+                // We only want to emit assignments for variables with initializers.
+                for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
+                    var variable = _a[_i];
+                    if (ts.isIdentifier(variable.name) && ts.isLocalName(variable.name)) {
+                        if (!modifiers) {
+                            modifiers = ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier);
+                        }
+                        variables = ts.append(variables, variable);
+                    }
+                    else if (variable.initializer) {
+                        expressions = ts.append(expressions, transformInitializedVariable(variable));
+                    }
+                }
+                if (variables) {
+                    statements = ts.append(statements, ts.updateVariableStatement(node, modifiers, ts.updateVariableDeclarationList(node.declarationList, variables)));
+                }
+                if (expressions) {
+                    statements = ts.append(statements, ts.createStatement(ts.inlineExpressions(expressions), /*location*/ node));
+                }
+            }
+            else {
+                statements = ts.append(statements, node);
+            }
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfVariableStatement(statements, node);
+            }
+            return ts.singleOrMany(statements);
+        }
+        /**
+         * Transforms an exported variable with an initializer into an expression.
+         *
+         * @param node The node to transform.
+         */
+        function transformInitializedVariable(node) {
+            if (ts.isBindingPattern(node.name)) {
+                return ts.flattenVariableDestructuringToExpression(node, hoistVariableDeclaration, createExportExpression);
+            }
+            else {
+                return ts.createAssignment(ts.createPropertyAccess(ts.createIdentifier("exports"), node.name, 
+                /*location*/ node.name), node.initializer);
+            }
+        }
+        /**
+         * Visits a MergeDeclarationMarker used as a placeholder for the beginning of a merged
+         * and transformed declaration.
+         *
+         * @param node The node to visit.
+         */
+        function visitMergeDeclarationMarker(node) {
+            // For an EnumDeclaration or ModuleDeclaration that merges with a preceeding
+            // declaration we do not emit a leading variable declaration. To preserve the
+            // begin/end semantics of the declararation and to properly handle exports
+            // we wrapped the leading variable declaration in a `MergeDeclarationMarker`.
+            //
+            // To balance the declaration, add the exports of the elided variable
+            // statement.
+            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 205 /* VariableStatement */) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node.original);
+            }
+            return node;
+        }
+        /**
+         * Determines whether a node has an associated EndOfDeclarationMarker.
+         *
+         * @param node The node to test.
+         */
+        function hasAssociatedEndOfDeclarationMarker(node) {
+            return (ts.getEmitFlags(node) & 33554432 /* HasEndOfDeclarationMarker */) !== 0;
+        }
+        /**
+         * Visits a DeclarationMarker used as a placeholder for the end of a transformed
+         * declaration.
+         *
+         * @param node The node to visit.
+         */
+        function visitEndOfDeclarationMarker(node) {
+            // For some transformations we emit an `EndOfDeclarationMarker` to mark the actual
+            // end of the transformed declaration. We use this marker to emit any deferred exports
+            // of the declaration.
+            var id = ts.getOriginalNodeId(node);
+            var statements = deferredExports[id];
+            if (statements) {
+                delete deferredExports[id];
+                return ts.append(statements, node);
+            }
+            return node;
+        }
+        /**
+         * Appends the exports of an ImportDeclaration to a statement list, returning the
+         * statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param decl The declaration whose exports are to be recorded.
+         */
+        function appendExportsOfImportDeclaration(statements, decl) {
+            if (currentModuleInfo.exportEquals) {
+                return statements;
+            }
+            var importClause = decl.importClause;
+            if (!importClause) {
+                return statements;
+            }
+            if (importClause.name) {
+                statements = appendExportsOfDeclaration(statements, importClause);
+            }
+            var namedBindings = importClause.namedBindings;
+            if (namedBindings) {
+                switch (namedBindings.kind) {
+                    case 237 /* NamespaceImport */:
+                        statements = appendExportsOfDeclaration(statements, namedBindings);
+                        break;
+                    case 238 /* NamedImports */:
+                        for (var _i = 0, _a = namedBindings.elements; _i < _a.length; _i++) {
+                            var importBinding = _a[_i];
+                            statements = appendExportsOfDeclaration(statements, importBinding);
+                        }
+                        break;
+                }
+            }
+            return statements;
+        }
+        /**
+         * Appends the exports of an ImportEqualsDeclaration to a statement list, returning the
+         * statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param decl The declaration whose exports are to be recorded.
+         */
+        function appendExportsOfImportEqualsDeclaration(statements, decl) {
+            if (currentModuleInfo.exportEquals) {
+                return statements;
+            }
+            return appendExportsOfDeclaration(statements, decl);
+        }
+        /**
+         * Appends the exports of a VariableStatement to a statement list, returning the statement
+         * list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param node The VariableStatement whose exports are to be recorded.
+         */
+        function appendExportsOfVariableStatement(statements, node) {
+            if (currentModuleInfo.exportEquals) {
+                return statements;
+            }
+            for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
+                var decl = _a[_i];
+                statements = appendExportsOfBindingElement(statements, decl);
+            }
+            return statements;
+        }
+        /**
+         * Appends the exports of a VariableDeclaration or BindingElement to a statement list,
+         * returning the statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param decl The declaration whose exports are to be recorded.
+         */
+        function appendExportsOfBindingElement(statements, decl) {
+            if (currentModuleInfo.exportEquals) {
+                return statements;
+            }
+            if (ts.isBindingPattern(decl.name)) {
+                for (var _i = 0, _a = decl.name.elements; _i < _a.length; _i++) {
+                    var element = _a[_i];
+                    if (!ts.isOmittedExpression(element)) {
+                        statements = appendExportsOfBindingElement(statements, element);
+                    }
+                }
+            }
+            else if (!ts.isGeneratedIdentifier(decl.name)) {
+                statements = appendExportsOfDeclaration(statements, decl);
+            }
+            return statements;
+        }
+        /**
+         * Appends the exports of a ClassDeclaration or FunctionDeclaration to a statement list,
+         * returning the statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param decl The declaration whose exports are to be recorded.
+         */
+        function appendExportsOfHoistedDeclaration(statements, decl) {
+            if (currentModuleInfo.exportEquals) {
+                return statements;
+            }
+            if (ts.hasModifier(decl, 1 /* Export */)) {
+                var exportName = ts.hasModifier(decl, 512 /* Default */) ? ts.createIdentifier("default") : decl.name;
+                statements = appendExportStatement(statements, exportName, ts.getLocalName(decl), /*location*/ decl);
+            }
+            if (decl.name) {
+                statements = appendExportsOfDeclaration(statements, decl);
+            }
+            return statements;
+        }
+        /**
+         * Appends the exports of a declaration to a statement list, returning the statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param decl The declaration to export.
+         */
+        function appendExportsOfDeclaration(statements, decl) {
+            var name = ts.getDeclarationName(decl);
+            var exportSpecifiers = currentModuleInfo.exportSpecifiers[name.text];
+            if (exportSpecifiers) {
+                for (var _i = 0, exportSpecifiers_2 = exportSpecifiers; _i < exportSpecifiers_2.length; _i++) {
+                    var exportSpecifier = exportSpecifiers_2[_i];
+                    statements = appendExportStatement(statements, exportSpecifier.name, name, /*location*/ exportSpecifier.name);
+                }
+            }
+            return statements;
+        }
+        /**
+         * Appends the down-level representation of an export to a statement list, returning the
+         * statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param exportName The name of the export.
+         * @param expression The expression to export.
+         * @param location The location to use for source maps and comments for the export.
+         * @param allowComments Whether to allow comments on the export.
+         */
+        function appendExportStatement(statements, exportName, expression, location, allowComments) {
+            if (exportName.text === "default") {
+                var sourceFile = ts.getOriginalNode(currentSourceFile, ts.isSourceFile);
+                if (sourceFile && !sourceFile.symbol.exports["___esModule"]) {
+                    if (languageVersion === 0 /* ES3 */) {
+                        statements = ts.append(statements, ts.createStatement(createExportExpression(ts.createIdentifier("__esModule"), ts.createLiteral(true))));
+                    }
+                    else {
+                        statements = ts.append(statements, ts.createStatement(ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Object"), "defineProperty"), 
+                        /*typeArguments*/ undefined, [
+                            ts.createIdentifier("exports"),
+                            ts.createLiteral("__esModule"),
+                            ts.createObjectLiteral([
+                                ts.createPropertyAssignment("value", ts.createLiteral(true))
+                            ])
+                        ])));
+                    }
+                }
+            }
+            statements = ts.append(statements, createExportStatement(exportName, expression, location, allowComments));
+            return statements;
+        }
+        /**
+         * Creates a call to the current file's export function to export a value.
+         *
+         * @param name The bound name of the export.
+         * @param value The exported value.
+         * @param location The location to use for source maps and comments for the export.
+         * @param allowComments An optional value indicating whether to emit comments for the statement.
+         */
+        function createExportStatement(name, value, location, allowComments) {
+            var statement = ts.createStatement(createExportExpression(name, value), location);
+            ts.startOnNewLine(statement);
+            if (!allowComments) {
+                ts.setEmitFlags(statement, 49152 /* NoComments */);
+            }
+            return statement;
+        }
+        /**
+         * Creates a call to the current file's export function to export a value.
+         *
+         * @param name The bound name of the export.
+         * @param value The exported value.
+         * @param location The location to use for source maps and comments for the export.
+         */
+        function createExportExpression(name, value, location) {
+            return ts.createAssignment(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.getSynthesizedClone(name)), value, location);
+        }
+        //
+        // Modifier Visitors
+        //
+        /**
+         * Visit nodes to elide module-specific modifiers.
+         *
+         * @param node The node to visit.
+         */
+        function modifierVisitor(node) {
+            // Elide module-specific modifiers.
+            switch (node.kind) {
+                case 83 /* ExportKeyword */:
+                case 78 /* DefaultKeyword */:
+                    return undefined;
+            }
+            return node;
+        }
+        //
+        // Emit Notification
+        //
+        /**
+         * Hook for node emit notifications.
+         *
+         * @param emitContext A context hint for the emitter.
+         * @param node The node to emit.
+         * @param emit A callback used to emit the node in the printer.
+         */
+        function onEmitNode(emitContext, node, emitCallback) {
+            if (node.kind === 261 /* SourceFile */) {
+                currentSourceFile = node;
+                currentModuleInfo = moduleInfoMap[ts.getOriginalNodeId(currentSourceFile)];
+                noSubstitution = ts.createMap();
+                previousOnEmitNode(emitContext, node, emitCallback);
+                currentSourceFile = undefined;
+                currentModuleInfo = undefined;
+                noSubstitution = undefined;
+            }
+            else {
+                previousOnEmitNode(emitContext, node, emitCallback);
+            }
+        }
+        //
+        // Substitutions
+        //
+        /**
+         * Hooks node substitutions.
+         *
+         * @param emitContext A context hint for the emitter.
+         * @param node The node to substitute.
+         */
+        function onSubstituteNode(emitContext, node) {
+            node = previousOnSubstituteNode(emitContext, node);
+            if (node.id && noSubstitution[node.id]) {
+                return node;
+            }
+            if (emitContext === 1 /* Expression */) {
+                return substituteExpression(node);
+            }
+            else if (ts.isShorthandPropertyAssignment(node)) {
+                return substituteShorthandPropertyAssignment(node);
+            }
+            return node;
+        }
+        /**
+         * Substitution for a ShorthandPropertyAssignment whose declaration name is an imported
+         * or exported symbol.
+         *
+         * @param node The node to substitute.
+         */
+        function substituteShorthandPropertyAssignment(node) {
+            var name = node.name;
+            var exportedOrImportedName = substituteExpressionIdentifier(name);
+            if (exportedOrImportedName !== name) {
+                // A shorthand property with an assignment initializer is probably part of a
+                // destructuring assignment
+                if (node.objectAssignmentInitializer) {
+                    var initializer = ts.createAssignment(exportedOrImportedName, node.objectAssignmentInitializer);
+                    return ts.createPropertyAssignment(name, initializer, /*location*/ node);
+                }
+                return ts.createPropertyAssignment(name, exportedOrImportedName, /*location*/ node);
+            }
+            return node;
+        }
+        /**
+         * Substitution for an Expression that may contain an imported or exported symbol.
+         *
+         * @param node The node to substitute.
+         */
+        function substituteExpression(node) {
+            switch (node.kind) {
+                case 70 /* Identifier */:
+                    return substituteExpressionIdentifier(node);
+                case 192 /* BinaryExpression */:
+                    return substituteBinaryExpression(node);
+                case 191 /* PostfixUnaryExpression */:
+                case 190 /* PrefixUnaryExpression */:
+                    return substituteUnaryExpression(node);
+            }
+            return node;
+        }
+        /**
+         * Substitution for an Identifier expression that may contain an imported or exported
+         * symbol.
+         *
+         * @param node The node to substitute.
+         */
+        function substituteExpressionIdentifier(node) {
+            if (!ts.isGeneratedIdentifier(node) && !ts.isLocalName(node)) {
+                var exportContainer = resolver.getReferencedExportContainer(node, ts.isExportName(node));
+                if (exportContainer && exportContainer.kind === 261 /* SourceFile */) {
+                    return ts.createPropertyAccess(ts.createIdentifier("exports"), ts.getSynthesizedClone(node), 
+                    /*location*/ node);
+                }
+                var importDeclaration = resolver.getReferencedImportDeclaration(node);
+                if (importDeclaration) {
+                    if (ts.isImportClause(importDeclaration)) {
+                        return ts.createPropertyAccess(ts.getGeneratedNameForNode(importDeclaration.parent), ts.createIdentifier("default"), 
+                        /*location*/ node);
+                    }
+                    else if (ts.isImportSpecifier(importDeclaration)) {
+                        var name_36 = importDeclaration.propertyName || importDeclaration.name;
+                        return ts.createPropertyAccess(ts.getGeneratedNameForNode(importDeclaration.parent.parent.parent), ts.getSynthesizedClone(name_36), 
+                        /*location*/ node);
+                    }
+                }
+            }
+            return node;
+        }
+        /**
+         * Substitution for a BinaryExpression that may contain an imported or exported symbol.
+         *
+         * @param node The node to substitute.
+         */
+        function substituteBinaryExpression(node) {
+            // When we see an assignment expression whose left-hand side is an exported symbol,
+            // we should ensure all exports of that symbol are updated with the correct value.
+            //
+            // - We do not substitute generated identifiers for any reason.
+            // - We do not substitute identifiers tagged with the LocalName flag.
+            // - We do not substitute identifiers that were originally the name of an enum or
+            //   namespace due to how they are transformed in TypeScript.
+            // - We only substitute identifiers that are exported at the top level.
+            if (ts.isAssignmentOperator(node.operatorToken.kind)
+                && ts.isIdentifier(node.left)
+                && !ts.isGeneratedIdentifier(node.left)
+                && !ts.isLocalName(node.left)
+                && !ts.isDeclarationNameOfEnumOrNamespace(node.left)) {
+                var exportedNames = getExports(node.left);
+                if (exportedNames) {
+                    // For each additional export of the declaration, apply an export assignment.
+                    var expression = node;
+                    for (var _i = 0, exportedNames_3 = exportedNames; _i < exportedNames_3.length; _i++) {
+                        var exportName = exportedNames_3[_i];
+                        // Mark the node to prevent triggering this rule again.
+                        noSubstitution[ts.getNodeId(expression)] = true;
+                        expression = createExportExpression(exportName, expression, /*location*/ node);
+                    }
+                    return expression;
+                }
+            }
+            return node;
+        }
+        /**
+         * Substitution for a UnaryExpression that may contain an imported or exported symbol.
+         *
+         * @param node The node to substitute.
+         */
+        function substituteUnaryExpression(node) {
+            // When we see a prefix or postfix increment expression whose operand is an exported
+            // symbol, we should ensure all exports of that symbol are updated with the correct
+            // value.
+            //
+            // - We do not substitute generated identifiers for any reason.
+            // - We do not substitute identifiers tagged with the LocalName flag.
+            // - We do not substitute identifiers that were originally the name of an enum or
+            //   namespace due to how they are transformed in TypeScript.
+            // - We only substitute identifiers that are exported at the top level.
+            if ((node.operator === 42 /* PlusPlusToken */ || node.operator === 43 /* MinusMinusToken */)
+                && ts.isIdentifier(node.operand)
+                && !ts.isGeneratedIdentifier(node.operand)
+                && !ts.isLocalName(node.operand)
+                && !ts.isDeclarationNameOfEnumOrNamespace(node.operand)) {
+                var exportedNames = getExports(node.operand);
+                if (exportedNames) {
+                    var expression = node.kind === 191 /* PostfixUnaryExpression */
+                        ? ts.createBinary(node.operand, ts.createToken(node.operator === 42 /* PlusPlusToken */ ? 58 /* PlusEqualsToken */ : 59 /* MinusEqualsToken */), ts.createLiteral(1), 
+                        /*location*/ node)
+                        : node;
+                    for (var _i = 0, exportedNames_4 = exportedNames; _i < exportedNames_4.length; _i++) {
+                        var exportName = exportedNames_4[_i];
+                        // Mark the node to prevent triggering this rule again.
+                        noSubstitution[ts.getNodeId(expression)] = true;
+                        expression = createExportExpression(exportName, expression);
+                    }
+                    return expression;
+                }
+            }
+            return node;
+        }
+        /**
+         * Gets the additional exports of a name.
+         *
+         * @param name The name.
+         */
+        function getExports(name) {
+            if (!ts.isGeneratedIdentifier(name)) {
+                var valueDeclaration = resolver.getReferencedImportDeclaration(name)
+                    || resolver.getReferencedValueDeclaration(name);
+                if (valueDeclaration) {
+                    return currentModuleInfo
+                        && currentModuleInfo.exportedBindings[ts.getOriginalNodeId(valueDeclaration)];
+                }
+            }
+        }
+        var _a;
+    }
+    ts.transformModule = transformModule;
+})(ts || (ts = {}));
 /// <reference path="visitor.ts" />
 /// <reference path="transformers/ts.ts" />
 /// <reference path="transformers/jsx.ts" />
+/// <reference path="transformers/esnext.ts" />
 /// <reference path="transformers/es2017.ts" />
 /// <reference path="transformers/es2016.ts" />
 /// <reference path="transformers/es2015.ts" />
@@ -53723,10 +56084,12 @@ var ts;
         var moduleKind = ts.getEmitModuleKind(compilerOptions);
         var transformers = [];
         transformers.push(ts.transformTypeScript);
-        transformers.push(moduleTransformerMap[moduleKind] || moduleTransformerMap[ts.ModuleKind.None]);
         if (jsx === 2 /* React */) {
             transformers.push(ts.transformJsx);
         }
+        if (languageVersion < 5 /* ESNext */) {
+            transformers.push(ts.transformESNext);
+        }
         if (languageVersion < 4 /* ES2017 */) {
             transformers.push(ts.transformES2017);
         }
@@ -53737,6 +56100,9 @@ var ts;
             transformers.push(ts.transformES2015);
             transformers.push(ts.transformGenerators);
         }
+        transformers.push(moduleTransformerMap[moduleKind] || moduleTransformerMap[ts.ModuleKind.None]);
+        // The ES5 transformer is last so that it can substitute expressions like `exports.default`
+        // for ES3.
         if (languageVersion < 1 /* ES5 */) {
             transformers.push(ts.transformES5);
         }
@@ -53754,7 +56120,7 @@ var ts;
     function transformFiles(resolver, host, sourceFiles, transformers) {
         var lexicalEnvironmentVariableDeclarationsStack = [];
         var lexicalEnvironmentFunctionDeclarationsStack = [];
-        var enabledSyntaxKindFeatures = new Array(289 /* Count */);
+        var enabledSyntaxKindFeatures = new Array(296 /* Count */);
         var lexicalEnvironmentStackOffset = 0;
         var hoistedVariableDeclarations;
         var hoistedFunctionDeclarations;
@@ -54154,7 +56520,7 @@ var ts;
                 var emitNode = node.emitNode;
                 var emitFlags = emitNode && emitNode.flags;
                 var _a = emitNode && emitNode.sourceMapRange || node, pos = _a.pos, end = _a.end;
-                if (node.kind !== 287 /* NotEmittedStatement */
+                if (node.kind !== 292 /* NotEmittedStatement */
                     && (emitFlags & 512 /* NoLeadingSourceMap */) === 0
                     && pos >= 0) {
                     emitPos(ts.skipTrivia(currentSourceText, pos));
@@ -54167,7 +56533,7 @@ var ts;
                 else {
                     emitCallback(emitContext, node);
                 }
-                if (node.kind !== 287 /* NotEmittedStatement */
+                if (node.kind !== 292 /* NotEmittedStatement */
                     && (emitFlags & 1024 /* NoTrailingSourceMap */) === 0
                     && end >= 0) {
                     emitPos(end);
@@ -54346,7 +56712,7 @@ var ts;
                     if (extendedDiagnostics) {
                         ts.performance.mark("preEmitNodeWithComment");
                     }
-                    var isEmittedNode = node.kind !== 287 /* NotEmittedStatement */;
+                    var isEmittedNode = node.kind !== 292 /* NotEmittedStatement */;
                     var skipLeadingComments = pos < 0 || (emitFlags & 16384 /* NoLeadingComments */) !== 0;
                     var skipTrailingComments = end < 0 || (emitFlags & 32768 /* NoTrailingComments */) !== 0;
                     // Emit leading comments if the position is not synthesized and the node
@@ -54365,7 +56731,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 === 220 /* VariableDeclarationList */) {
+                        if (node.kind === 224 /* VariableDeclarationList */) {
                             declarationListContainerEnd = end;
                         }
                     }
@@ -54619,7 +56985,7 @@ var ts;
         var isCurrentFileExternalModule;
         var reportedDeclarationError = false;
         var errorNameNode;
-        var emitJsDocComments = compilerOptions.removeComments ? function () { } : writeJsDocComments;
+        var emitJsDocComments = compilerOptions.removeComments ? ts.noop : writeJsDocComments;
         var emit = compilerOptions.stripInternal ? stripInternal : emitNode;
         var noDeclare;
         var moduleElementDeclarationEmitInfo = [];
@@ -54675,7 +57041,7 @@ var ts;
                 var oldWriter = writer;
                 ts.forEach(moduleElementDeclarationEmitInfo, function (aliasEmitInfo) {
                     if (aliasEmitInfo.isVisible && !aliasEmitInfo.asynchronousOutput) {
-                        ts.Debug.assert(aliasEmitInfo.node.kind === 231 /* ImportDeclaration */);
+                        ts.Debug.assert(aliasEmitInfo.node.kind === 235 /* ImportDeclaration */);
                         createAndSetNewTextWriterWithSymbolWriter();
                         ts.Debug.assert(aliasEmitInfo.indent === 0 || (aliasEmitInfo.indent === 1 && isBundledEmit));
                         for (var i = 0; i < aliasEmitInfo.indent; i++) {
@@ -54749,10 +57115,10 @@ var ts;
             var oldWriter = writer;
             ts.forEach(nodes, function (declaration) {
                 var nodeToCheck;
-                if (declaration.kind === 219 /* VariableDeclaration */) {
+                if (declaration.kind === 223 /* VariableDeclaration */) {
                     nodeToCheck = declaration.parent.parent;
                 }
-                else if (declaration.kind === 234 /* NamedImports */ || declaration.kind === 235 /* ImportSpecifier */ || declaration.kind === 232 /* ImportClause */) {
+                else if (declaration.kind === 238 /* NamedImports */ || declaration.kind === 239 /* ImportSpecifier */ || declaration.kind === 236 /* ImportClause */) {
                     ts.Debug.fail("We should be getting ImportDeclaration instead to write");
                 }
                 else {
@@ -54770,7 +57136,7 @@ var ts;
                 // Writing of function bar would mark alias declaration foo as visible but we haven't yet visited that declaration so do nothing,
                 // we would write alias foo declaration when we visit it since it would now be marked as visible
                 if (moduleElementEmitInfo) {
-                    if (moduleElementEmitInfo.node.kind === 231 /* ImportDeclaration */) {
+                    if (moduleElementEmitInfo.node.kind === 235 /* ImportDeclaration */) {
                         // we have to create asynchronous output only after we have collected complete information
                         // because it is possible to enable multiple bindings as asynchronously visible
                         moduleElementEmitInfo.isVisible = true;
@@ -54780,12 +57146,12 @@ var ts;
                         for (var declarationIndent = moduleElementEmitInfo.indent; declarationIndent; declarationIndent--) {
                             increaseIndent();
                         }
-                        if (nodeToCheck.kind === 226 /* ModuleDeclaration */) {
+                        if (nodeToCheck.kind === 230 /* ModuleDeclaration */) {
                             ts.Debug.assert(asynchronousSubModuleDeclarationEmitInfo === undefined);
                             asynchronousSubModuleDeclarationEmitInfo = [];
                         }
                         writeModuleElement(nodeToCheck);
-                        if (nodeToCheck.kind === 226 /* ModuleDeclaration */) {
+                        if (nodeToCheck.kind === 230 /* ModuleDeclaration */) {
                             moduleElementEmitInfo.subModuleElementDeclarationEmitInfo = asynchronousSubModuleDeclarationEmitInfo;
                             asynchronousSubModuleDeclarationEmitInfo = undefined;
                         }
@@ -54903,43 +57269,49 @@ var ts;
         function emitType(type) {
             switch (type.kind) {
                 case 118 /* AnyKeyword */:
-                case 133 /* StringKeyword */:
-                case 131 /* NumberKeyword */:
+                case 134 /* StringKeyword */:
+                case 132 /* NumberKeyword */:
                 case 121 /* BooleanKeyword */:
-                case 134 /* SymbolKeyword */:
+                case 135 /* SymbolKeyword */:
                 case 104 /* VoidKeyword */:
-                case 136 /* UndefinedKeyword */:
+                case 137 /* UndefinedKeyword */:
                 case 94 /* NullKeyword */:
-                case 128 /* NeverKeyword */:
-                case 166 /* ThisType */:
-                case 167 /* LiteralType */:
+                case 129 /* NeverKeyword */:
+                case 167 /* ThisType */:
+                case 171 /* LiteralType */:
                     return writeTextOfNode(currentText, type);
-                case 195 /* ExpressionWithTypeArguments */:
+                case 199 /* ExpressionWithTypeArguments */:
                     return emitExpressionWithTypeArguments(type);
-                case 156 /* TypeReference */:
+                case 157 /* TypeReference */:
                     return emitTypeReference(type);
-                case 159 /* TypeQuery */:
+                case 160 /* TypeQuery */:
                     return emitTypeQuery(type);
-                case 161 /* ArrayType */:
+                case 162 /* ArrayType */:
                     return emitArrayType(type);
-                case 162 /* TupleType */:
+                case 163 /* TupleType */:
                     return emitTupleType(type);
-                case 163 /* UnionType */:
+                case 164 /* UnionType */:
                     return emitUnionType(type);
-                case 164 /* IntersectionType */:
+                case 165 /* IntersectionType */:
                     return emitIntersectionType(type);
-                case 165 /* ParenthesizedType */:
+                case 166 /* ParenthesizedType */:
                     return emitParenType(type);
-                case 157 /* FunctionType */:
-                case 158 /* ConstructorType */:
+                case 168 /* TypeOperator */:
+                    return emitTypeOperator(type);
+                case 169 /* IndexedAccessType */:
+                    return emitIndexedAccessType(type);
+                case 170 /* MappedType */:
+                    return emitMappedType(type);
+                case 158 /* FunctionType */:
+                case 159 /* ConstructorType */:
                     return emitSignatureDeclarationWithJsDocComments(type);
-                case 160 /* TypeLiteral */:
+                case 161 /* TypeLiteral */:
                     return emitTypeLiteral(type);
                 case 70 /* Identifier */:
                     return emitEntityName(type);
-                case 140 /* QualifiedName */:
+                case 141 /* QualifiedName */:
                     return emitEntityName(type);
-                case 155 /* TypePredicate */:
+                case 156 /* TypePredicate */:
                     return emitTypePredicate(type);
             }
             function writeEntityName(entityName) {
@@ -54947,8 +57319,8 @@ var ts;
                     writeTextOfNode(currentText, entityName);
                 }
                 else {
-                    var left = entityName.kind === 140 /* QualifiedName */ ? entityName.left : entityName.expression;
-                    var right = entityName.kind === 140 /* QualifiedName */ ? entityName.right : entityName.name;
+                    var left = entityName.kind === 141 /* QualifiedName */ ? entityName.left : entityName.expression;
+                    var right = entityName.kind === 141 /* QualifiedName */ ? entityName.right : entityName.name;
                     writeEntityName(left);
                     write(".");
                     writeTextOfNode(currentText, right);
@@ -54957,14 +57329,14 @@ var ts;
             function emitEntityName(entityName) {
                 var visibilityResult = resolver.isEntityNameVisible(entityName, 
                 // Aliases can be written asynchronously so use correct enclosing declaration
-                entityName.parent.kind === 230 /* ImportEqualsDeclaration */ ? entityName.parent : enclosingDeclaration);
+                entityName.parent.kind === 234 /* ImportEqualsDeclaration */ ? entityName.parent : enclosingDeclaration);
                 handleSymbolAccessibilityError(visibilityResult);
                 recordTypeReferenceDirectivesIfNecessary(resolver.getTypeReferenceDirectivesForEntityName(entityName));
                 writeEntityName(entityName);
             }
             function emitExpressionWithTypeArguments(node) {
                 if (ts.isEntityNameExpression(node.expression)) {
-                    ts.Debug.assert(node.expression.kind === 70 /* Identifier */ || node.expression.kind === 173 /* PropertyAccessExpression */);
+                    ts.Debug.assert(node.expression.kind === 70 /* Identifier */ || node.expression.kind === 177 /* PropertyAccessExpression */);
                     emitEntityName(node.expression);
                     if (node.typeArguments) {
                         write("<");
@@ -55010,6 +57382,42 @@ var ts;
                 emitType(type.type);
                 write(")");
             }
+            function emitTypeOperator(type) {
+                write(ts.tokenToString(type.operator));
+                write(" ");
+                emitType(type.type);
+            }
+            function emitIndexedAccessType(node) {
+                emitType(node.objectType);
+                write("[");
+                emitType(node.indexType);
+                write("]");
+            }
+            function emitMappedType(node) {
+                var prevEnclosingDeclaration = enclosingDeclaration;
+                enclosingDeclaration = node;
+                write("{");
+                writeLine();
+                increaseIndent();
+                if (node.readonlyToken) {
+                    write("readonly ");
+                }
+                write("[");
+                writeEntityName(node.typeParameter.name);
+                write(" in ");
+                emitType(node.typeParameter.constraint);
+                write("]");
+                if (node.questionToken) {
+                    write("?");
+                }
+                write(": ");
+                emitType(node.type);
+                write(";");
+                writeLine();
+                decreaseIndent();
+                write("}");
+                enclosingDeclaration = prevEnclosingDeclaration;
+            }
             function emitTypeLiteral(type) {
                 write("{");
                 if (type.members.length) {
@@ -55043,9 +57451,9 @@ var ts;
             var count = 0;
             while (true) {
                 count++;
-                var name_40 = baseName + "_" + count;
-                if (!(name_40 in currentIdentifiers)) {
-                    return name_40;
+                var name_37 = baseName + "_" + count;
+                if (!(name_37 in currentIdentifiers)) {
+                    return name_37;
                 }
             }
         }
@@ -55092,10 +57500,10 @@ var ts;
             if (isModuleElementVisible) {
                 writeModuleElement(node);
             }
-            else if (node.kind === 230 /* ImportEqualsDeclaration */ ||
-                (node.parent.kind === 256 /* SourceFile */ && isCurrentFileExternalModule)) {
+            else if (node.kind === 234 /* ImportEqualsDeclaration */ ||
+                (node.parent.kind === 261 /* SourceFile */ && isCurrentFileExternalModule)) {
                 var isVisible = void 0;
-                if (asynchronousSubModuleDeclarationEmitInfo && node.parent.kind !== 256 /* SourceFile */) {
+                if (asynchronousSubModuleDeclarationEmitInfo && node.parent.kind !== 261 /* SourceFile */) {
                     // Import declaration of another module that is visited async so lets put it in right spot
                     asynchronousSubModuleDeclarationEmitInfo.push({
                         node: node,
@@ -55105,7 +57513,7 @@ var ts;
                     });
                 }
                 else {
-                    if (node.kind === 231 /* ImportDeclaration */) {
+                    if (node.kind === 235 /* ImportDeclaration */) {
                         var importDeclaration = node;
                         if (importDeclaration.importClause) {
                             isVisible = (importDeclaration.importClause.name && resolver.isDeclarationVisible(importDeclaration.importClause)) ||
@@ -55123,23 +57531,23 @@ var ts;
         }
         function writeModuleElement(node) {
             switch (node.kind) {
-                case 221 /* FunctionDeclaration */:
+                case 225 /* FunctionDeclaration */:
                     return writeFunctionDeclaration(node);
-                case 201 /* VariableStatement */:
+                case 205 /* VariableStatement */:
                     return writeVariableStatement(node);
-                case 223 /* InterfaceDeclaration */:
+                case 227 /* InterfaceDeclaration */:
                     return writeInterfaceDeclaration(node);
-                case 222 /* ClassDeclaration */:
+                case 226 /* ClassDeclaration */:
                     return writeClassDeclaration(node);
-                case 224 /* TypeAliasDeclaration */:
+                case 228 /* TypeAliasDeclaration */:
                     return writeTypeAliasDeclaration(node);
-                case 225 /* EnumDeclaration */:
+                case 229 /* EnumDeclaration */:
                     return writeEnumDeclaration(node);
-                case 226 /* ModuleDeclaration */:
+                case 230 /* ModuleDeclaration */:
                     return writeModuleDeclaration(node);
-                case 230 /* ImportEqualsDeclaration */:
+                case 234 /* ImportEqualsDeclaration */:
                     return writeImportEqualsDeclaration(node);
-                case 231 /* ImportDeclaration */:
+                case 235 /* ImportDeclaration */:
                     return writeImportDeclaration(node);
                 default:
                     ts.Debug.fail("Unknown symbol kind");
@@ -55147,7 +57555,7 @@ var ts;
         }
         function emitModuleElementDeclarationFlags(node) {
             // If the node is parented in the current source file we need to emit export declare or just export
-            if (node.parent.kind === 256 /* SourceFile */) {
+            if (node.parent.kind === 261 /* SourceFile */) {
                 var modifiers = ts.getModifierFlags(node);
                 // If the node is exported
                 if (modifiers & 1 /* Export */) {
@@ -55156,7 +57564,7 @@ var ts;
                 if (modifiers & 512 /* Default */) {
                     write("default ");
                 }
-                else if (node.kind !== 223 /* InterfaceDeclaration */ && !noDeclare) {
+                else if (node.kind !== 227 /* InterfaceDeclaration */ && !noDeclare) {
                     write("declare ");
                 }
             }
@@ -55208,7 +57616,7 @@ var ts;
         }
         function isVisibleNamedBinding(namedBindings) {
             if (namedBindings) {
-                if (namedBindings.kind === 233 /* NamespaceImport */) {
+                if (namedBindings.kind === 237 /* NamespaceImport */) {
                     return resolver.isDeclarationVisible(namedBindings);
                 }
                 else {
@@ -55232,7 +57640,7 @@ var ts;
                         // If the default binding was emitted, write the separated
                         write(", ");
                     }
-                    if (node.importClause.namedBindings.kind === 233 /* NamespaceImport */) {
+                    if (node.importClause.namedBindings.kind === 237 /* NamespaceImport */) {
                         write("* as ");
                         writeTextOfNode(currentText, node.importClause.namedBindings.name);
                     }
@@ -55253,13 +57661,13 @@ var ts;
             // the only case when it is not true is when we call it to emit correct name for module augmentation - d.ts files with just module augmentations are not considered
             // external modules since they are indistinguishable from script files with ambient modules. To fix this in such d.ts files we'll emit top level 'export {}'
             // so compiler will treat them as external modules.
-            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || parent.kind !== 226 /* ModuleDeclaration */;
+            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || parent.kind !== 230 /* ModuleDeclaration */;
             var moduleSpecifier;
-            if (parent.kind === 230 /* ImportEqualsDeclaration */) {
+            if (parent.kind === 234 /* ImportEqualsDeclaration */) {
                 var node = parent;
                 moduleSpecifier = ts.getExternalModuleImportEqualsDeclarationExpression(node);
             }
-            else if (parent.kind === 226 /* ModuleDeclaration */) {
+            else if (parent.kind === 230 /* ModuleDeclaration */) {
                 moduleSpecifier = parent.name;
             }
             else {
@@ -55329,7 +57737,7 @@ var ts;
                     writeTextOfNode(currentText, node.name);
                 }
             }
-            while (node.body && node.body.kind !== 227 /* ModuleBlock */) {
+            while (node.body && node.body.kind !== 231 /* ModuleBlock */) {
                 node = node.body;
                 write(".");
                 writeTextOfNode(currentText, node.name);
@@ -55399,7 +57807,7 @@ var ts;
             writeLine();
         }
         function isPrivateMethodTypeParameter(node) {
-            return node.parent.kind === 148 /* MethodDeclaration */ && ts.hasModifier(node.parent, 8 /* Private */);
+            return node.parent.kind === 149 /* MethodDeclaration */ && ts.hasModifier(node.parent, 8 /* Private */);
         }
         function emitTypeParameters(typeParameters) {
             function emitTypeParameter(node) {
@@ -55410,15 +57818,15 @@ var ts;
                 // If there is constraint present and this is not a type parameter of the private method emit the constraint
                 if (node.constraint && !isPrivateMethodTypeParameter(node)) {
                     write(" extends ");
-                    if (node.parent.kind === 157 /* FunctionType */ ||
-                        node.parent.kind === 158 /* ConstructorType */ ||
-                        (node.parent.parent && node.parent.parent.kind === 160 /* TypeLiteral */)) {
-                        ts.Debug.assert(node.parent.kind === 148 /* MethodDeclaration */ ||
-                            node.parent.kind === 147 /* MethodSignature */ ||
-                            node.parent.kind === 157 /* FunctionType */ ||
-                            node.parent.kind === 158 /* ConstructorType */ ||
-                            node.parent.kind === 152 /* CallSignature */ ||
-                            node.parent.kind === 153 /* ConstructSignature */);
+                    if (node.parent.kind === 158 /* FunctionType */ ||
+                        node.parent.kind === 159 /* ConstructorType */ ||
+                        (node.parent.parent && node.parent.parent.kind === 161 /* TypeLiteral */)) {
+                        ts.Debug.assert(node.parent.kind === 149 /* MethodDeclaration */ ||
+                            node.parent.kind === 148 /* MethodSignature */ ||
+                            node.parent.kind === 158 /* FunctionType */ ||
+                            node.parent.kind === 159 /* ConstructorType */ ||
+                            node.parent.kind === 153 /* CallSignature */ ||
+                            node.parent.kind === 154 /* ConstructSignature */);
                         emitType(node.constraint);
                     }
                     else {
@@ -55429,31 +57837,31 @@ 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 222 /* ClassDeclaration */:
+                        case 226 /* ClassDeclaration */:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_class_has_or_is_using_private_name_1;
                             break;
-                        case 223 /* InterfaceDeclaration */:
+                        case 227 /* InterfaceDeclaration */:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1;
                             break;
-                        case 153 /* ConstructSignature */:
+                        case 154 /* ConstructSignature */:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
                             break;
-                        case 152 /* CallSignature */:
+                        case 153 /* CallSignature */:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
                             break;
-                        case 148 /* MethodDeclaration */:
-                        case 147 /* MethodSignature */:
+                        case 149 /* MethodDeclaration */:
+                        case 148 /* 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 === 222 /* ClassDeclaration */) {
+                            else if (node.parent.parent.kind === 226 /* 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 221 /* FunctionDeclaration */:
+                        case 225 /* FunctionDeclaration */:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_function_has_or_is_using_private_name_1;
                             break;
                         default:
@@ -55491,7 +57899,7 @@ var ts;
                 function getHeritageClauseVisibilityError() {
                     var diagnosticMessage;
                     // Heritage clause is written by user so it can always be named
-                    if (node.parent.parent.kind === 222 /* ClassDeclaration */) {
+                    if (node.parent.parent.kind === 226 /* ClassDeclaration */) {
                         // Class or Interface implemented/extended is inaccessible
                         diagnosticMessage = isImplementsList ?
                             ts.Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_private_name_1 :
@@ -55575,7 +57983,7 @@ var ts;
         function emitVariableDeclaration(node) {
             // If we are emitting property it isn't moduleElement and hence we already know it needs to be emitted
             // so there is no check needed to see if declaration is visible
-            if (node.kind !== 219 /* VariableDeclaration */ || resolver.isDeclarationVisible(node)) {
+            if (node.kind !== 223 /* VariableDeclaration */ || resolver.isDeclarationVisible(node)) {
                 if (ts.isBindingPattern(node.name)) {
                     emitBindingPattern(node.name);
                 }
@@ -55586,11 +57994,11 @@ var ts;
                     writeTextOfNode(currentText, node.name);
                     // If optional property emit ? but in the case of parameterProperty declaration with "?" indicating optional parameter for the constructor
                     // we don't want to emit property declaration with "?"
-                    if ((node.kind === 146 /* PropertyDeclaration */ || node.kind === 145 /* PropertySignature */ ||
-                        (node.kind === 143 /* Parameter */ && !ts.isParameterPropertyDeclaration(node))) && ts.hasQuestionToken(node)) {
+                    if ((node.kind === 147 /* PropertyDeclaration */ || node.kind === 146 /* PropertySignature */ ||
+                        (node.kind === 144 /* Parameter */ && !ts.isParameterPropertyDeclaration(node))) && ts.hasQuestionToken(node)) {
                         write("?");
                     }
-                    if ((node.kind === 146 /* PropertyDeclaration */ || node.kind === 145 /* PropertySignature */) && node.parent.kind === 160 /* TypeLiteral */) {
+                    if ((node.kind === 147 /* PropertyDeclaration */ || node.kind === 146 /* PropertySignature */) && node.parent.kind === 161 /* TypeLiteral */) {
                         emitTypeOfVariableDeclarationFromTypeLiteral(node);
                     }
                     else if (resolver.isLiteralConstDeclaration(node)) {
@@ -55603,14 +58011,14 @@ var ts;
                 }
             }
             function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
-                if (node.kind === 219 /* VariableDeclaration */) {
+                if (node.kind === 223 /* VariableDeclaration */) {
                     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 :
                             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 === 146 /* PropertyDeclaration */ || node.kind === 145 /* PropertySignature */) {
+                else if (node.kind === 147 /* PropertyDeclaration */ || node.kind === 146 /* PropertySignature */) {
                     // TODO(jfreeman): Deal with computed properties in error reporting.
                     if (ts.hasModifier(node, 32 /* Static */)) {
                         return symbolAccessibilityResult.errorModuleName ?
@@ -55619,7 +58027,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 === 222 /* ClassDeclaration */) {
+                    else if (node.parent.kind === 226 /* 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 :
@@ -55651,7 +58059,7 @@ var ts;
                 var elements = [];
                 for (var _i = 0, _a = bindingPattern.elements; _i < _a.length; _i++) {
                     var element = _a[_i];
-                    if (element.kind !== 194 /* OmittedExpression */) {
+                    if (element.kind !== 198 /* OmittedExpression */) {
                         elements.push(element);
                     }
                 }
@@ -55721,7 +58129,7 @@ var ts;
                     var type = getTypeAnnotationFromAccessor(node);
                     if (!type) {
                         // couldn't get type for the first accessor, try the another one
-                        var anotherAccessor = node.kind === 150 /* GetAccessor */ ? accessors.setAccessor : accessors.getAccessor;
+                        var anotherAccessor = node.kind === 151 /* GetAccessor */ ? accessors.setAccessor : accessors.getAccessor;
                         type = getTypeAnnotationFromAccessor(anotherAccessor);
                         if (type) {
                             accessorWithTypeAnnotation = anotherAccessor;
@@ -55734,7 +58142,7 @@ var ts;
             }
             function getTypeAnnotationFromAccessor(accessor) {
                 if (accessor) {
-                    return accessor.kind === 150 /* GetAccessor */
+                    return accessor.kind === 151 /* GetAccessor */
                         ? accessor.type // Getter - return type
                         : accessor.parameters.length > 0
                             ? accessor.parameters[0].type // Setter parameter type
@@ -55743,7 +58151,7 @@ var ts;
             }
             function getAccessorDeclarationTypeVisibilityError(symbolAccessibilityResult) {
                 var diagnosticMessage;
-                if (accessorWithTypeAnnotation.kind === 151 /* SetAccessor */) {
+                if (accessorWithTypeAnnotation.kind === 152 /* SetAccessor */) {
                     // Setters have to have type named and cannot infer it so, the type should always be named
                     if (ts.hasModifier(accessorWithTypeAnnotation.parent, 32 /* Static */)) {
                         diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
@@ -55793,17 +58201,17 @@ var ts;
             // so no need to verify if the declaration is visible
             if (!resolver.isImplementationOfOverload(node)) {
                 emitJsDocComments(node);
-                if (node.kind === 221 /* FunctionDeclaration */) {
+                if (node.kind === 225 /* FunctionDeclaration */) {
                     emitModuleElementDeclarationFlags(node);
                 }
-                else if (node.kind === 148 /* MethodDeclaration */ || node.kind === 149 /* Constructor */) {
+                else if (node.kind === 149 /* MethodDeclaration */ || node.kind === 150 /* Constructor */) {
                     emitClassMemberDeclarationFlags(ts.getModifierFlags(node));
                 }
-                if (node.kind === 221 /* FunctionDeclaration */) {
+                if (node.kind === 225 /* FunctionDeclaration */) {
                     write("function ");
                     writeTextOfNode(currentText, node.name);
                 }
-                else if (node.kind === 149 /* Constructor */) {
+                else if (node.kind === 150 /* Constructor */) {
                     write("constructor");
                 }
                 else {
@@ -55823,17 +58231,17 @@ var ts;
             var prevEnclosingDeclaration = enclosingDeclaration;
             enclosingDeclaration = node;
             var closeParenthesizedFunctionType = false;
-            if (node.kind === 154 /* IndexSignature */) {
+            if (node.kind === 155 /* IndexSignature */) {
                 // Index signature can have readonly modifier
                 emitClassMemberDeclarationFlags(ts.getModifierFlags(node));
                 write("[");
             }
             else {
                 // Construct signature or constructor type write new Signature
-                if (node.kind === 153 /* ConstructSignature */ || node.kind === 158 /* ConstructorType */) {
+                if (node.kind === 154 /* ConstructSignature */ || node.kind === 159 /* ConstructorType */) {
                     write("new ");
                 }
-                else if (node.kind === 157 /* FunctionType */) {
+                else if (node.kind === 158 /* FunctionType */) {
                     var currentOutput = writer.getText();
                     // Do not generate incorrect type when function type with type parameters is type argument
                     // This could happen if user used space between two '<' making it error free
@@ -55848,22 +58256,22 @@ var ts;
             }
             // Parameters
             emitCommaList(node.parameters, emitParameterDeclaration);
-            if (node.kind === 154 /* IndexSignature */) {
+            if (node.kind === 155 /* IndexSignature */) {
                 write("]");
             }
             else {
                 write(")");
             }
             // If this is not a constructor and is not private, emit the return type
-            var isFunctionTypeOrConstructorType = node.kind === 157 /* FunctionType */ || node.kind === 158 /* ConstructorType */;
-            if (isFunctionTypeOrConstructorType || node.parent.kind === 160 /* TypeLiteral */) {
+            var isFunctionTypeOrConstructorType = node.kind === 158 /* FunctionType */ || node.kind === 159 /* ConstructorType */;
+            if (isFunctionTypeOrConstructorType || node.parent.kind === 161 /* TypeLiteral */) {
                 // Emit type literal signature return type only if specified
                 if (node.type) {
                     write(isFunctionTypeOrConstructorType ? " => " : ": ");
                     emitType(node.type);
                 }
             }
-            else if (node.kind !== 149 /* Constructor */ && !ts.hasModifier(node, 8 /* Private */)) {
+            else if (node.kind !== 150 /* Constructor */ && !ts.hasModifier(node, 8 /* Private */)) {
                 writeReturnTypeAtSignature(node, getReturnTypeVisibilityError);
             }
             enclosingDeclaration = prevEnclosingDeclaration;
@@ -55877,26 +58285,26 @@ var ts;
             function getReturnTypeVisibilityError(symbolAccessibilityResult) {
                 var diagnosticMessage;
                 switch (node.kind) {
-                    case 153 /* ConstructSignature */:
+                    case 154 /* 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 152 /* CallSignature */:
+                    case 153 /* 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 154 /* IndexSignature */:
+                    case 155 /* 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 148 /* MethodDeclaration */:
-                    case 147 /* MethodSignature */:
+                    case 149 /* MethodDeclaration */:
+                    case 148 /* MethodSignature */:
                         if (ts.hasModifier(node, 32 /* Static */)) {
                             diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                                 symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
@@ -55904,7 +58312,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 === 222 /* ClassDeclaration */) {
+                        else if (node.parent.kind === 226 /* 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 :
@@ -55918,7 +58326,7 @@ var ts;
                                 ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0;
                         }
                         break;
-                    case 221 /* FunctionDeclaration */:
+                    case 225 /* 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 :
@@ -55953,9 +58361,9 @@ var ts;
                 write("?");
             }
             decreaseIndent();
-            if (node.parent.kind === 157 /* FunctionType */ ||
-                node.parent.kind === 158 /* ConstructorType */ ||
-                node.parent.parent.kind === 160 /* TypeLiteral */) {
+            if (node.parent.kind === 158 /* FunctionType */ ||
+                node.parent.kind === 159 /* ConstructorType */ ||
+                node.parent.parent.kind === 161 /* TypeLiteral */) {
                 emitTypeOfVariableDeclarationFromTypeLiteral(node);
             }
             else if (!ts.hasModifier(node.parent, 8 /* Private */)) {
@@ -55971,24 +58379,24 @@ var ts;
             }
             function getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
                 switch (node.parent.kind) {
-                    case 149 /* Constructor */:
+                    case 150 /* 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 153 /* ConstructSignature */:
+                    case 154 /* ConstructSignature */:
                         // 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 152 /* CallSignature */:
+                    case 153 /* 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 148 /* MethodDeclaration */:
-                    case 147 /* MethodSignature */:
+                    case 149 /* MethodDeclaration */:
+                    case 148 /* MethodSignature */:
                         if (ts.hasModifier(node.parent, 32 /* Static */)) {
                             return symbolAccessibilityResult.errorModuleName ?
                                 symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
@@ -55996,7 +58404,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 === 222 /* ClassDeclaration */) {
+                        else if (node.parent.parent.kind === 226 /* 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 :
@@ -56009,7 +58417,7 @@ 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 221 /* FunctionDeclaration */:
+                    case 225 /* FunctionDeclaration */:
                         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 :
@@ -56021,12 +58429,12 @@ var ts;
             }
             function emitBindingPattern(bindingPattern) {
                 // We have to explicitly emit square bracket and bracket because these tokens are not store inside the node.
-                if (bindingPattern.kind === 168 /* ObjectBindingPattern */) {
+                if (bindingPattern.kind === 172 /* ObjectBindingPattern */) {
                     write("{");
                     emitCommaList(bindingPattern.elements, emitBindingElement);
                     write("}");
                 }
-                else if (bindingPattern.kind === 169 /* ArrayBindingPattern */) {
+                else if (bindingPattern.kind === 173 /* ArrayBindingPattern */) {
                     write("[");
                     var elements = bindingPattern.elements;
                     emitCommaList(elements, emitBindingElement);
@@ -56037,7 +58445,7 @@ var ts;
                 }
             }
             function emitBindingElement(bindingElement) {
-                if (bindingElement.kind === 194 /* OmittedExpression */) {
+                if (bindingElement.kind === 198 /* OmittedExpression */) {
                     // If bindingElement is an omittedExpression (i.e. containing elision),
                     // we will emit blank space (although this may differ from users' original code,
                     // it allows emitSeparatedList to write separator appropriately)
@@ -56046,7 +58454,7 @@ var ts;
                     //      emit    : function foo([ , x,  , ]) {}
                     write(" ");
                 }
-                else if (bindingElement.kind === 170 /* BindingElement */) {
+                else if (bindingElement.kind === 174 /* BindingElement */) {
                     if (bindingElement.propertyName) {
                         // bindingElement has propertyName property in the following case:
                         //      { y: [a,b,c] ...} -> bindingPattern will have a property called propertyName for "y"
@@ -56085,40 +58493,40 @@ var ts;
         }
         function emitNode(node) {
             switch (node.kind) {
-                case 221 /* FunctionDeclaration */:
-                case 226 /* ModuleDeclaration */:
-                case 230 /* ImportEqualsDeclaration */:
-                case 223 /* InterfaceDeclaration */:
-                case 222 /* ClassDeclaration */:
-                case 224 /* TypeAliasDeclaration */:
-                case 225 /* EnumDeclaration */:
+                case 225 /* FunctionDeclaration */:
+                case 230 /* ModuleDeclaration */:
+                case 234 /* ImportEqualsDeclaration */:
+                case 227 /* InterfaceDeclaration */:
+                case 226 /* ClassDeclaration */:
+                case 228 /* TypeAliasDeclaration */:
+                case 229 /* EnumDeclaration */:
                     return emitModuleElement(node, isModuleElementVisible(node));
-                case 201 /* VariableStatement */:
+                case 205 /* VariableStatement */:
                     return emitModuleElement(node, isVariableStatementVisible(node));
-                case 231 /* ImportDeclaration */:
+                case 235 /* ImportDeclaration */:
                     // Import declaration without import clause is visible, otherwise it is not visible
                     return emitModuleElement(node, /*isModuleElementVisible*/ !node.importClause);
-                case 237 /* ExportDeclaration */:
+                case 241 /* ExportDeclaration */:
                     return emitExportDeclaration(node);
-                case 149 /* Constructor */:
-                case 148 /* MethodDeclaration */:
-                case 147 /* MethodSignature */:
+                case 150 /* Constructor */:
+                case 149 /* MethodDeclaration */:
+                case 148 /* MethodSignature */:
                     return writeFunctionDeclaration(node);
-                case 153 /* ConstructSignature */:
-                case 152 /* CallSignature */:
-                case 154 /* IndexSignature */:
+                case 154 /* ConstructSignature */:
+                case 153 /* CallSignature */:
+                case 155 /* IndexSignature */:
                     return emitSignatureDeclarationWithJsDocComments(node);
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
                     return emitAccessorDeclaration(node);
-                case 146 /* PropertyDeclaration */:
-                case 145 /* PropertySignature */:
+                case 147 /* PropertyDeclaration */:
+                case 146 /* PropertySignature */:
                     return emitPropertyDeclaration(node);
-                case 255 /* EnumMember */:
+                case 260 /* EnumMember */:
                     return emitEnumMemberDeclaration(node);
-                case 236 /* ExportAssignment */:
+                case 240 /* ExportAssignment */:
                     return emitExportAssignment(node);
-                case 256 /* SourceFile */:
+                case 261 /* SourceFile */:
                     return emitSourceFile(node);
             }
         }
@@ -56209,6 +58617,7 @@ var ts;
         // This is typically used for JSX spread attributes,
         // and can be used for object literal spread properties.
         var assignHelper = "\nvar __assign = (this && this.__assign) || Object.assign || function(t) {\n    for (var s, i = 1, n = arguments.length; i < n; i++) {\n        s = arguments[i];\n        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))\n            t[p] = s[p];\n    }\n    return t;\n};";
+        var restHelper = "\nvar __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))\n        t[p] = s[p];\n    return t;\n};";
         // emit output for the __decorate helper function
         var decorateHelper = "\nvar __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {\n    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;\n    if (typeof Reflect === \"object\" && typeof Reflect.decorate === \"function\") r = Reflect.decorate(decorators, target, key, desc);\n    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;\n    return c > 3 && r && Object.defineProperty(target, key, r), r;\n};";
         // emit output for the __metadata helper function
@@ -56306,6 +58715,7 @@ var ts;
         var currentFileIdentifiers;
         var extendsEmitted;
         var assignEmitted;
+        var restEmitted;
         var decorateEmitted;
         var paramEmitted;
         var awaiterEmitted;
@@ -56499,7 +58909,7 @@ var ts;
             var kind = node.kind;
             switch (kind) {
                 // Top-level nodes
-                case 256 /* SourceFile */:
+                case 261 /* SourceFile */:
                     return emitSourceFile(node);
             }
         }
@@ -56555,210 +58965,218 @@ var ts;
                 case 123 /* DeclareKeyword */:
                 case 124 /* GetKeyword */:
                 case 125 /* IsKeyword */:
-                case 126 /* ModuleKeyword */:
-                case 127 /* NamespaceKeyword */:
-                case 128 /* NeverKeyword */:
-                case 129 /* ReadonlyKeyword */:
-                case 130 /* RequireKeyword */:
-                case 131 /* NumberKeyword */:
-                case 132 /* SetKeyword */:
-                case 133 /* StringKeyword */:
-                case 134 /* SymbolKeyword */:
-                case 135 /* TypeKeyword */:
-                case 136 /* UndefinedKeyword */:
-                case 137 /* FromKeyword */:
-                case 138 /* GlobalKeyword */:
-                case 139 /* OfKeyword */:
+                case 127 /* ModuleKeyword */:
+                case 128 /* NamespaceKeyword */:
+                case 129 /* NeverKeyword */:
+                case 130 /* ReadonlyKeyword */:
+                case 131 /* RequireKeyword */:
+                case 132 /* NumberKeyword */:
+                case 133 /* SetKeyword */:
+                case 134 /* StringKeyword */:
+                case 135 /* SymbolKeyword */:
+                case 136 /* TypeKeyword */:
+                case 137 /* UndefinedKeyword */:
+                case 138 /* FromKeyword */:
+                case 139 /* GlobalKeyword */:
+                case 140 /* OfKeyword */:
                     writeTokenText(kind);
                     return;
                 // Parse tree nodes
                 // Names
-                case 140 /* QualifiedName */:
+                case 141 /* QualifiedName */:
                     return emitQualifiedName(node);
-                case 141 /* ComputedPropertyName */:
+                case 142 /* ComputedPropertyName */:
                     return emitComputedPropertyName(node);
                 // Signature elements
-                case 142 /* TypeParameter */:
+                case 143 /* TypeParameter */:
                     return emitTypeParameter(node);
-                case 143 /* Parameter */:
+                case 144 /* Parameter */:
                     return emitParameter(node);
-                case 144 /* Decorator */:
+                case 145 /* Decorator */:
                     return emitDecorator(node);
                 // Type members
-                case 145 /* PropertySignature */:
+                case 146 /* PropertySignature */:
                     return emitPropertySignature(node);
-                case 146 /* PropertyDeclaration */:
+                case 147 /* PropertyDeclaration */:
                     return emitPropertyDeclaration(node);
-                case 147 /* MethodSignature */:
+                case 148 /* MethodSignature */:
                     return emitMethodSignature(node);
-                case 148 /* MethodDeclaration */:
+                case 149 /* MethodDeclaration */:
                     return emitMethodDeclaration(node);
-                case 149 /* Constructor */:
+                case 150 /* Constructor */:
                     return emitConstructor(node);
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
                     return emitAccessorDeclaration(node);
-                case 152 /* CallSignature */:
+                case 153 /* CallSignature */:
                     return emitCallSignature(node);
-                case 153 /* ConstructSignature */:
+                case 154 /* ConstructSignature */:
                     return emitConstructSignature(node);
-                case 154 /* IndexSignature */:
+                case 155 /* IndexSignature */:
                     return emitIndexSignature(node);
                 // Types
-                case 155 /* TypePredicate */:
+                case 156 /* TypePredicate */:
                     return emitTypePredicate(node);
-                case 156 /* TypeReference */:
+                case 157 /* TypeReference */:
                     return emitTypeReference(node);
-                case 157 /* FunctionType */:
+                case 158 /* FunctionType */:
                     return emitFunctionType(node);
-                case 158 /* ConstructorType */:
+                case 159 /* ConstructorType */:
                     return emitConstructorType(node);
-                case 159 /* TypeQuery */:
+                case 160 /* TypeQuery */:
                     return emitTypeQuery(node);
-                case 160 /* TypeLiteral */:
+                case 161 /* TypeLiteral */:
                     return emitTypeLiteral(node);
-                case 161 /* ArrayType */:
+                case 162 /* ArrayType */:
                     return emitArrayType(node);
-                case 162 /* TupleType */:
+                case 163 /* TupleType */:
                     return emitTupleType(node);
-                case 163 /* UnionType */:
+                case 164 /* UnionType */:
                     return emitUnionType(node);
-                case 164 /* IntersectionType */:
+                case 165 /* IntersectionType */:
                     return emitIntersectionType(node);
-                case 165 /* ParenthesizedType */:
+                case 166 /* ParenthesizedType */:
                     return emitParenthesizedType(node);
-                case 195 /* ExpressionWithTypeArguments */:
+                case 199 /* ExpressionWithTypeArguments */:
                     return emitExpressionWithTypeArguments(node);
-                case 166 /* ThisType */:
+                case 167 /* ThisType */:
                     return emitThisType();
-                case 167 /* LiteralType */:
+                case 168 /* TypeOperator */:
+                    return emitTypeOperator(node);
+                case 169 /* IndexedAccessType */:
+                    return emitIndexedAccessType(node);
+                case 170 /* MappedType */:
+                    return emitMappedType(node);
+                case 171 /* LiteralType */:
                     return emitLiteralType(node);
                 // Binding patterns
-                case 168 /* ObjectBindingPattern */:
+                case 172 /* ObjectBindingPattern */:
                     return emitObjectBindingPattern(node);
-                case 169 /* ArrayBindingPattern */:
+                case 173 /* ArrayBindingPattern */:
                     return emitArrayBindingPattern(node);
-                case 170 /* BindingElement */:
+                case 174 /* BindingElement */:
                     return emitBindingElement(node);
                 // Misc
-                case 198 /* TemplateSpan */:
+                case 202 /* TemplateSpan */:
                     return emitTemplateSpan(node);
-                case 199 /* SemicolonClassElement */:
+                case 203 /* SemicolonClassElement */:
                     return emitSemicolonClassElement();
                 // Statements
-                case 200 /* Block */:
+                case 204 /* Block */:
                     return emitBlock(node);
-                case 201 /* VariableStatement */:
+                case 205 /* VariableStatement */:
                     return emitVariableStatement(node);
-                case 202 /* EmptyStatement */:
+                case 206 /* EmptyStatement */:
                     return emitEmptyStatement();
-                case 203 /* ExpressionStatement */:
+                case 207 /* ExpressionStatement */:
                     return emitExpressionStatement(node);
-                case 204 /* IfStatement */:
+                case 208 /* IfStatement */:
                     return emitIfStatement(node);
-                case 205 /* DoStatement */:
+                case 209 /* DoStatement */:
                     return emitDoStatement(node);
-                case 206 /* WhileStatement */:
+                case 210 /* WhileStatement */:
                     return emitWhileStatement(node);
-                case 207 /* ForStatement */:
+                case 211 /* ForStatement */:
                     return emitForStatement(node);
-                case 208 /* ForInStatement */:
+                case 212 /* ForInStatement */:
                     return emitForInStatement(node);
-                case 209 /* ForOfStatement */:
+                case 213 /* ForOfStatement */:
                     return emitForOfStatement(node);
-                case 210 /* ContinueStatement */:
+                case 214 /* ContinueStatement */:
                     return emitContinueStatement(node);
-                case 211 /* BreakStatement */:
+                case 215 /* BreakStatement */:
                     return emitBreakStatement(node);
-                case 212 /* ReturnStatement */:
+                case 216 /* ReturnStatement */:
                     return emitReturnStatement(node);
-                case 213 /* WithStatement */:
+                case 217 /* WithStatement */:
                     return emitWithStatement(node);
-                case 214 /* SwitchStatement */:
+                case 218 /* SwitchStatement */:
                     return emitSwitchStatement(node);
-                case 215 /* LabeledStatement */:
+                case 219 /* LabeledStatement */:
                     return emitLabeledStatement(node);
-                case 216 /* ThrowStatement */:
+                case 220 /* ThrowStatement */:
                     return emitThrowStatement(node);
-                case 217 /* TryStatement */:
+                case 221 /* TryStatement */:
                     return emitTryStatement(node);
-                case 218 /* DebuggerStatement */:
+                case 222 /* DebuggerStatement */:
                     return emitDebuggerStatement(node);
                 // Declarations
-                case 219 /* VariableDeclaration */:
+                case 223 /* VariableDeclaration */:
                     return emitVariableDeclaration(node);
-                case 220 /* VariableDeclarationList */:
+                case 224 /* VariableDeclarationList */:
                     return emitVariableDeclarationList(node);
-                case 221 /* FunctionDeclaration */:
+                case 225 /* FunctionDeclaration */:
                     return emitFunctionDeclaration(node);
-                case 222 /* ClassDeclaration */:
+                case 226 /* ClassDeclaration */:
                     return emitClassDeclaration(node);
-                case 223 /* InterfaceDeclaration */:
+                case 227 /* InterfaceDeclaration */:
                     return emitInterfaceDeclaration(node);
-                case 224 /* TypeAliasDeclaration */:
+                case 228 /* TypeAliasDeclaration */:
                     return emitTypeAliasDeclaration(node);
-                case 225 /* EnumDeclaration */:
+                case 229 /* EnumDeclaration */:
                     return emitEnumDeclaration(node);
-                case 226 /* ModuleDeclaration */:
+                case 230 /* ModuleDeclaration */:
                     return emitModuleDeclaration(node);
-                case 227 /* ModuleBlock */:
+                case 231 /* ModuleBlock */:
                     return emitModuleBlock(node);
-                case 228 /* CaseBlock */:
+                case 232 /* CaseBlock */:
                     return emitCaseBlock(node);
-                case 230 /* ImportEqualsDeclaration */:
+                case 234 /* ImportEqualsDeclaration */:
                     return emitImportEqualsDeclaration(node);
-                case 231 /* ImportDeclaration */:
+                case 235 /* ImportDeclaration */:
                     return emitImportDeclaration(node);
-                case 232 /* ImportClause */:
+                case 236 /* ImportClause */:
                     return emitImportClause(node);
-                case 233 /* NamespaceImport */:
+                case 237 /* NamespaceImport */:
                     return emitNamespaceImport(node);
-                case 234 /* NamedImports */:
+                case 238 /* NamedImports */:
                     return emitNamedImports(node);
-                case 235 /* ImportSpecifier */:
+                case 239 /* ImportSpecifier */:
                     return emitImportSpecifier(node);
-                case 236 /* ExportAssignment */:
+                case 240 /* ExportAssignment */:
                     return emitExportAssignment(node);
-                case 237 /* ExportDeclaration */:
+                case 241 /* ExportDeclaration */:
                     return emitExportDeclaration(node);
-                case 238 /* NamedExports */:
+                case 242 /* NamedExports */:
                     return emitNamedExports(node);
-                case 239 /* ExportSpecifier */:
+                case 243 /* ExportSpecifier */:
                     return emitExportSpecifier(node);
-                case 240 /* MissingDeclaration */:
+                case 244 /* MissingDeclaration */:
                     return;
                 // Module references
-                case 241 /* ExternalModuleReference */:
+                case 245 /* ExternalModuleReference */:
                     return emitExternalModuleReference(node);
                 // JSX (non-expression)
                 case 10 /* JsxText */:
                     return emitJsxText(node);
-                case 244 /* JsxOpeningElement */:
+                case 248 /* JsxOpeningElement */:
                     return emitJsxOpeningElement(node);
-                case 245 /* JsxClosingElement */:
+                case 249 /* JsxClosingElement */:
                     return emitJsxClosingElement(node);
-                case 246 /* JsxAttribute */:
+                case 250 /* JsxAttribute */:
                     return emitJsxAttribute(node);
-                case 247 /* JsxSpreadAttribute */:
+                case 251 /* JsxSpreadAttribute */:
                     return emitJsxSpreadAttribute(node);
-                case 248 /* JsxExpression */:
+                case 252 /* JsxExpression */:
                     return emitJsxExpression(node);
                 // Clauses
-                case 249 /* CaseClause */:
+                case 253 /* CaseClause */:
                     return emitCaseClause(node);
-                case 250 /* DefaultClause */:
+                case 254 /* DefaultClause */:
                     return emitDefaultClause(node);
-                case 251 /* HeritageClause */:
+                case 255 /* HeritageClause */:
                     return emitHeritageClause(node);
-                case 252 /* CatchClause */:
+                case 256 /* CatchClause */:
                     return emitCatchClause(node);
                 // Property assignments
-                case 253 /* PropertyAssignment */:
+                case 257 /* PropertyAssignment */:
                     return emitPropertyAssignment(node);
-                case 254 /* ShorthandPropertyAssignment */:
+                case 258 /* ShorthandPropertyAssignment */:
                     return emitShorthandPropertyAssignment(node);
+                case 259 /* SpreadAssignment */:
+                    return emitSpreadAssignment(node);
                 // Enum
-                case 255 /* EnumMember */:
+                case 260 /* EnumMember */:
                     return emitEnumMember(node);
             }
             // If the node is an expression, try to emit it as an expression with
@@ -56795,65 +59213,65 @@ var ts;
                     writeTokenText(kind);
                     return;
                 // Expressions
-                case 171 /* ArrayLiteralExpression */:
+                case 175 /* ArrayLiteralExpression */:
                     return emitArrayLiteralExpression(node);
-                case 172 /* ObjectLiteralExpression */:
+                case 176 /* ObjectLiteralExpression */:
                     return emitObjectLiteralExpression(node);
-                case 173 /* PropertyAccessExpression */:
+                case 177 /* PropertyAccessExpression */:
                     return emitPropertyAccessExpression(node);
-                case 174 /* ElementAccessExpression */:
+                case 178 /* ElementAccessExpression */:
                     return emitElementAccessExpression(node);
-                case 175 /* CallExpression */:
+                case 179 /* CallExpression */:
                     return emitCallExpression(node);
-                case 176 /* NewExpression */:
+                case 180 /* NewExpression */:
                     return emitNewExpression(node);
-                case 177 /* TaggedTemplateExpression */:
+                case 181 /* TaggedTemplateExpression */:
                     return emitTaggedTemplateExpression(node);
-                case 178 /* TypeAssertionExpression */:
+                case 182 /* TypeAssertionExpression */:
                     return emitTypeAssertionExpression(node);
-                case 179 /* ParenthesizedExpression */:
+                case 183 /* ParenthesizedExpression */:
                     return emitParenthesizedExpression(node);
-                case 180 /* FunctionExpression */:
+                case 184 /* FunctionExpression */:
                     return emitFunctionExpression(node);
-                case 181 /* ArrowFunction */:
+                case 185 /* ArrowFunction */:
                     return emitArrowFunction(node);
-                case 182 /* DeleteExpression */:
+                case 186 /* DeleteExpression */:
                     return emitDeleteExpression(node);
-                case 183 /* TypeOfExpression */:
+                case 187 /* TypeOfExpression */:
                     return emitTypeOfExpression(node);
-                case 184 /* VoidExpression */:
+                case 188 /* VoidExpression */:
                     return emitVoidExpression(node);
-                case 185 /* AwaitExpression */:
+                case 189 /* AwaitExpression */:
                     return emitAwaitExpression(node);
-                case 186 /* PrefixUnaryExpression */:
+                case 190 /* PrefixUnaryExpression */:
                     return emitPrefixUnaryExpression(node);
-                case 187 /* PostfixUnaryExpression */:
+                case 191 /* PostfixUnaryExpression */:
                     return emitPostfixUnaryExpression(node);
-                case 188 /* BinaryExpression */:
+                case 192 /* BinaryExpression */:
                     return emitBinaryExpression(node);
-                case 189 /* ConditionalExpression */:
+                case 193 /* ConditionalExpression */:
                     return emitConditionalExpression(node);
-                case 190 /* TemplateExpression */:
+                case 194 /* TemplateExpression */:
                     return emitTemplateExpression(node);
-                case 191 /* YieldExpression */:
+                case 195 /* YieldExpression */:
                     return emitYieldExpression(node);
-                case 192 /* SpreadElementExpression */:
-                    return emitSpreadElementExpression(node);
-                case 193 /* ClassExpression */:
+                case 196 /* SpreadElement */:
+                    return emitSpreadExpression(node);
+                case 197 /* ClassExpression */:
                     return emitClassExpression(node);
-                case 194 /* OmittedExpression */:
+                case 198 /* OmittedExpression */:
                     return;
-                case 196 /* AsExpression */:
+                case 200 /* AsExpression */:
                     return emitAsExpression(node);
-                case 197 /* NonNullExpression */:
+                case 201 /* NonNullExpression */:
                     return emitNonNullExpression(node);
                 // JSX
-                case 242 /* JsxElement */:
+                case 246 /* JsxElement */:
                     return emitJsxElement(node);
-                case 243 /* JsxSelfClosingElement */:
+                case 247 /* JsxSelfClosingElement */:
                     return emitJsxSelfClosingElement(node);
                 // Transformation nodes
-                case 288 /* PartiallyEmittedExpression */:
+                case 293 /* PartiallyEmittedExpression */:
                     return emitPartiallyEmittedExpression(node);
             }
         }
@@ -56979,7 +59397,7 @@ var ts;
         function emitAccessorDeclaration(node) {
             emitDecorators(node, node.decorators);
             emitModifiers(node, node.modifiers);
-            write(node.kind === 150 /* GetAccessor */ ? "get " : "set ");
+            write(node.kind === 151 /* GetAccessor */ ? "get " : "set ");
             emit(node.name);
             emitSignatureAndBody(node, emitSignatureHead);
         }
@@ -57067,6 +59485,39 @@ var ts;
         function emitThisType() {
             write("this");
         }
+        function emitTypeOperator(node) {
+            writeTokenText(node.operator);
+            write(" ");
+            emit(node.type);
+        }
+        function emitIndexedAccessType(node) {
+            emit(node.objectType);
+            write("[");
+            emit(node.indexType);
+            write("]");
+        }
+        function emitMappedType(node) {
+            write("{");
+            writeLine();
+            increaseIndent();
+            if (node.readonlyToken) {
+                write("readonly ");
+            }
+            write("[");
+            emit(node.typeParameter.name);
+            write(" in ");
+            emit(node.typeParameter.constraint);
+            write("]");
+            if (node.questionToken) {
+                write("?");
+            }
+            write(": ");
+            emit(node.type);
+            write(";");
+            writeLine();
+            decreaseIndent();
+            write("}");
+        }
         function emitLiteralType(node) {
             emitExpression(node.literal);
         }
@@ -57253,7 +59704,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 === 186 /* PrefixUnaryExpression */
+            return operand.kind === 190 /* PrefixUnaryExpression */
                 && ((node.operator === 36 /* PlusToken */ && (operand.operator === 36 /* PlusToken */ || operand.operator === 42 /* PlusPlusToken */))
                     || (node.operator === 37 /* MinusToken */ && (operand.operator === 37 /* MinusToken */ || operand.operator === 43 /* MinusMinusToken */)));
         }
@@ -57297,7 +59748,7 @@ var ts;
             write(node.asteriskToken ? "yield*" : "yield");
             emitExpressionWithPrefix(" ", node.expression);
         }
-        function emitSpreadElementExpression(node) {
+        function emitSpreadExpression(node) {
             write("...");
             emitExpression(node.expression);
         }
@@ -57371,7 +59822,7 @@ var ts;
             if (node.elseStatement) {
                 writeLine();
                 writeToken(81 /* ElseKeyword */, node.thenStatement.end, node);
-                if (node.elseStatement.kind === 204 /* IfStatement */) {
+                if (node.elseStatement.kind === 208 /* IfStatement */) {
                     write(" ");
                     emit(node.elseStatement);
                 }
@@ -57433,7 +59884,7 @@ var ts;
         }
         function emitForBinding(node) {
             if (node !== undefined) {
-                if (node.kind === 220 /* VariableDeclarationList */) {
+                if (node.kind === 224 /* VariableDeclarationList */) {
                     emit(node);
                 }
                 else {
@@ -57672,7 +60123,7 @@ var ts;
             write(node.flags & 16 /* Namespace */ ? "namespace " : "module ");
             emit(node.name);
             var body = node.body;
-            while (body.kind === 226 /* ModuleDeclaration */) {
+            while (body.kind === 230 /* ModuleDeclaration */) {
                 write(".");
                 emit(body.name);
                 body = body.body;
@@ -57912,6 +60363,12 @@ var ts;
                 emitExpression(node.objectAssignmentInitializer);
             }
         }
+        function emitSpreadAssignment(node) {
+            if (node.expression) {
+                write("...");
+                emitExpression(node.expression);
+            }
+        }
         //
         // Enum
         //
@@ -57997,10 +60454,17 @@ var ts;
                 extendsEmitted = true;
                 helpersEmitted = true;
             }
-            if (compilerOptions.jsx !== 1 /* Preserve */ && !assignEmitted && (node.flags & 16384 /* HasJsxSpreadAttributes */)) {
+            if ((languageVersion < 5 /* ESNext */ || currentSourceFile.scriptKind === 2 /* JSX */ || currentSourceFile.scriptKind === 4 /* TSX */) &&
+                compilerOptions.jsx !== 1 /* Preserve */ &&
+                !assignEmitted &&
+                node.flags & 16384 /* HasSpreadAttribute */) {
                 writeLines(assignHelper);
                 assignEmitted = true;
             }
+            if (languageVersion < 5 /* ESNext */ && !restEmitted && node.flags & 32768 /* HasRestAttribute */) {
+                writeLines(restHelper);
+                restEmitted = true;
+            }
             if (!decorateEmitted && node.flags & 2048 /* HasDecorators */) {
                 writeLines(decorateHelper);
                 if (compilerOptions.emitDecoratorMetadata) {
@@ -58346,7 +60810,7 @@ var ts;
                 && !ts.rangeEndIsOnSameLineAsRangeStart(node1, node2, currentSourceFile);
         }
         function skipSynthesizedParentheses(node) {
-            while (node.kind === 179 /* ParenthesizedExpression */ && ts.nodeIsSynthesized(node)) {
+            while (node.kind === 183 /* ParenthesizedExpression */ && ts.nodeIsSynthesized(node)) {
                 node = node.expression;
             }
             return node;
@@ -58409,10 +60873,10 @@ var ts;
         */
         function makeTempVariableName(flags) {
             if (flags && !(tempFlags & flags)) {
-                var name_41 = flags === 268435456 /* _i */ ? "_i" : "_n";
-                if (isUniqueName(name_41)) {
+                var name_38 = flags === 268435456 /* _i */ ? "_i" : "_n";
+                if (isUniqueName(name_38)) {
                     tempFlags |= flags;
-                    return name_41;
+                    return name_38;
                 }
             }
             while (true) {
@@ -58420,11 +60884,11 @@ var ts;
                 tempFlags++;
                 // Skip over 'i' and 'n'
                 if (count !== 8 && count !== 13) {
-                    var name_42 = count < 26
+                    var name_39 = count < 26
                         ? "_" + String.fromCharCode(97 /* a */ + count)
                         : "_" + (count - 26);
-                    if (isUniqueName(name_42)) {
-                        return name_42;
+                    if (isUniqueName(name_39)) {
+                        return name_39;
                     }
                 }
             }
@@ -58473,17 +60937,17 @@ var ts;
             switch (node.kind) {
                 case 70 /* Identifier */:
                     return makeUniqueName(getTextOfNode(node));
-                case 226 /* ModuleDeclaration */:
-                case 225 /* EnumDeclaration */:
+                case 230 /* ModuleDeclaration */:
+                case 229 /* EnumDeclaration */:
                     return generateNameForModuleOrEnum(node);
-                case 231 /* ImportDeclaration */:
-                case 237 /* ExportDeclaration */:
+                case 235 /* ImportDeclaration */:
+                case 241 /* ExportDeclaration */:
                     return generateNameForImportOrExportDeclaration(node);
-                case 221 /* FunctionDeclaration */:
-                case 222 /* ClassDeclaration */:
-                case 236 /* ExportAssignment */:
+                case 225 /* FunctionDeclaration */:
+                case 226 /* ClassDeclaration */:
+                case 240 /* ExportAssignment */:
                     return generateNameForExportDefault();
-                case 193 /* ClassExpression */:
+                case 197 /* ClassExpression */:
                     return generateNameForClassExpression();
                 default:
                     return makeTempVariableName(0 /* Auto */);
@@ -58650,7 +61114,7 @@ var ts;
 var ts;
 (function (ts) {
     /** The version of the TypeScript compiler release */
-    ts.version = "2.1.0";
+    ts.version = "2.2.0";
     var emptyArray = [];
     function findConfigFile(searchPath, fileExists, configName) {
         if (configName === void 0) { configName = "tsconfig.json"; }
@@ -58876,11 +61340,11 @@ var ts;
         }
         var resolutions = [];
         var cache = ts.createMap();
-        for (var _i = 0, names_2 = names; _i < names_2.length; _i++) {
-            var name_43 = names_2[_i];
-            var result = name_43 in cache
-                ? cache[name_43]
-                : cache[name_43] = loader(name_43, containingFile);
+        for (var _i = 0, names_1 = names; _i < names_1.length; _i++) {
+            var name_40 = names_1[_i];
+            var result = name_40 in cache
+                ? cache[name_40]
+                : cache[name_40] = loader(name_40, containingFile);
             resolutions.push(result);
         }
         return resolutions;
@@ -58901,7 +61365,7 @@ var ts;
         // - This calls resolveModuleNames, and then calls findSourceFile for each resolved module.
         // As all these operations happen - and are nested - within the createProgram call, they close over the below variables.
         // The current resolution depth is tracked by incrementing/decrementing as the depth first search progresses.
-        var maxNodeModulesJsDepth = typeof options.maxNodeModuleJsDepth === "number" ? options.maxNodeModuleJsDepth : 0;
+        var maxNodeModuleJsDepth = typeof options.maxNodeModuleJsDepth === "number" ? options.maxNodeModuleJsDepth : 0;
         var currentNodeModulesDepth = 0;
         // If a module has some of its imports skipped due to being at the depth limit under node_modules, then track
         // this, as it may be imported at a shallower depth later, and then it will need its skipped imports processed.
@@ -58918,7 +61382,15 @@ var ts;
         var hasEmitBlockingDiagnostics = ts.createFileMap(getCanonicalFileName);
         var resolveModuleNamesWorker;
         if (host.resolveModuleNames) {
-            resolveModuleNamesWorker = function (moduleNames, containingFile) { return host.resolveModuleNames(moduleNames, containingFile); };
+            resolveModuleNamesWorker = function (moduleNames, containingFile) { return host.resolveModuleNames(moduleNames, containingFile).map(function (resolved) {
+                // An older host may have omitted extension, in which case we should infer it from the file extension of resolvedFileName.
+                if (!resolved || resolved.extension !== undefined) {
+                    return resolved;
+                }
+                var withExtension = ts.clone(resolved);
+                withExtension.extension = ts.extensionFromPath(resolved.resolvedFileName);
+                return withExtension;
+            }); };
         }
         else {
             var loader_1 = function (moduleName, containingFile) { return ts.resolveModuleName(moduleName, containingFile, options, host).resolvedModule; };
@@ -58991,6 +61463,7 @@ var ts;
             getTypeCount: function () { return getDiagnosticsProducingTypeChecker().getTypeCount(); },
             getFileProcessingDiagnostics: function () { return fileProcessingDiagnostics; },
             getResolvedTypeReferenceDirectives: function () { return resolvedTypeReferenceDirectives; },
+            isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
             dropDiagnosticsProducingTypeChecker: dropDiagnosticsProducingTypeChecker
         };
         verifyCompilerOptions();
@@ -58998,13 +61471,14 @@ var ts;
         ts.performance.measure("Program", "beforeProgram", "afterProgram");
         return program;
         function getCommonSourceDirectory() {
-            if (typeof commonSourceDirectory === "undefined") {
-                if (options.rootDir && checkSourceFilesBelongToPath(files, options.rootDir)) {
+            if (commonSourceDirectory === undefined) {
+                var emittedFiles = ts.filterSourceFilesInDirectory(files, isSourceFileFromExternalLibrary);
+                if (options.rootDir && checkSourceFilesBelongToPath(emittedFiles, options.rootDir)) {
                     // If a rootDir is specified and is valid use it as the commonSourceDirectory
                     commonSourceDirectory = ts.getNormalizedAbsolutePath(options.rootDir, currentDirectory);
                 }
                 else {
-                    commonSourceDirectory = computeCommonSourceDirectory(files);
+                    commonSourceDirectory = computeCommonSourceDirectory(emittedFiles);
                 }
                 if (commonSourceDirectory && commonSourceDirectory[commonSourceDirectory.length - 1] !== ts.directorySeparator) {
                     // Make sure directory path ends with directory separator so this string can directly
@@ -59027,6 +61501,112 @@ var ts;
             }
             return classifiableNames;
         }
+        function resolveModuleNamesReusingOldState(moduleNames, containingFile, file, oldProgramState) {
+            if (!oldProgramState && !file.ambientModuleNames.length) {
+                // if old program state is not supplied and file does not contain locally defined ambient modules
+                // then the best we can do is fallback to the default logic
+                return resolveModuleNamesWorker(moduleNames, containingFile);
+            }
+            // at this point we know that either
+            // - file has local declarations for ambient modules
+            // OR
+            // - old program state is available
+            // OR
+            // - both of items above
+            // With this it is possible that we can tell how some module names from the initial list will be resolved
+            // without doing actual resolution (in particular if some name was resolved to ambient module).
+            // Such names should be excluded from the list of module names that will be provided to `resolveModuleNamesWorker`
+            // since we don't want to resolve them again.
+            // this is a list of modules for which we cannot predict resolution so they should be actually resolved
+            var unknownModuleNames;
+            // this is a list of combined results assembles from predicted and resolved results.
+            // Order in this list matches the order in the original list of module names `moduleNames` which is important
+            // so later we can split results to resolutions of modules and resolutions of module augmentations.
+            var result;
+            // a transient placeholder that is used to mark predicted resolution in the result list
+            var predictedToResolveToAmbientModuleMarker = {};
+            for (var i = 0; i < moduleNames.length; i++) {
+                var moduleName = moduleNames[i];
+                // module name is known to be resolved to ambient module if
+                // - module name is contained in the list of ambient modules that are locally declared in the file
+                // - in the old program module name was resolved to ambient module whose declaration is in non-modified file
+                //   (so the same module declaration will land in the new program)
+                var isKnownToResolveToAmbientModule = false;
+                if (ts.contains(file.ambientModuleNames, moduleName)) {
+                    isKnownToResolveToAmbientModule = true;
+                    if (ts.isTraceEnabled(options, host)) {
+                        ts.trace(host, ts.Diagnostics.Module_0_was_resolved_as_locally_declared_ambient_module_in_file_1, moduleName, containingFile);
+                    }
+                }
+                else {
+                    isKnownToResolveToAmbientModule = checkModuleNameResolvedToAmbientModuleInNonModifiedFile(moduleName, oldProgramState);
+                }
+                if (isKnownToResolveToAmbientModule) {
+                    if (!unknownModuleNames) {
+                        // found a first module name for which result can be prediced
+                        // this means that this module name should not be passed to `resolveModuleNamesWorker`.
+                        // We'll use a separate list for module names that are definitely unknown.
+                        result = new Array(moduleNames.length);
+                        // copy all module names that appear before the current one in the list
+                        // since they are known to be unknown
+                        unknownModuleNames = moduleNames.slice(0, i);
+                    }
+                    // mark prediced resolution in the result list
+                    result[i] = predictedToResolveToAmbientModuleMarker;
+                }
+                else if (unknownModuleNames) {
+                    // found unknown module name and we are already using separate list for those - add it to the list
+                    unknownModuleNames.push(moduleName);
+                }
+            }
+            if (!unknownModuleNames) {
+                // we've looked throught the list but have not seen any predicted resolution
+                // use default logic
+                return resolveModuleNamesWorker(moduleNames, containingFile);
+            }
+            var resolutions = unknownModuleNames.length
+                ? resolveModuleNamesWorker(unknownModuleNames, containingFile)
+                : emptyArray;
+            // combine results of resolutions and predicted results
+            var j = 0;
+            for (var i = 0; i < result.length; i++) {
+                if (result[i] == predictedToResolveToAmbientModuleMarker) {
+                    result[i] = undefined;
+                }
+                else {
+                    result[i] = resolutions[j];
+                    j++;
+                }
+            }
+            ts.Debug.assert(j === resolutions.length);
+            return result;
+            function checkModuleNameResolvedToAmbientModuleInNonModifiedFile(moduleName, oldProgramState) {
+                if (!oldProgramState) {
+                    return false;
+                }
+                var resolutionToFile = ts.getResolvedModule(oldProgramState.file, moduleName);
+                if (resolutionToFile) {
+                    // module used to be resolved to file - ignore it
+                    return false;
+                }
+                var ambientModule = oldProgram.getTypeChecker().tryFindAmbientModuleWithoutAugmentations(moduleName);
+                if (!(ambientModule && ambientModule.declarations)) {
+                    return false;
+                }
+                // at least one of declarations should come from non-modified source file
+                var firstUnmodifiedFile = ts.forEach(ambientModule.declarations, function (d) {
+                    var f = ts.getSourceFileOfNode(d);
+                    return !ts.contains(oldProgramState.modifiedFilePaths, f.path) && f;
+                });
+                if (!firstUnmodifiedFile) {
+                    return false;
+                }
+                if (ts.isTraceEnabled(options, host)) {
+                    ts.trace(host, ts.Diagnostics.Module_0_was_resolved_as_ambient_module_declared_in_1_since_this_file_was_not_modified, moduleName, firstUnmodifiedFile.fileName);
+                }
+                return true;
+            }
+        }
         function tryReuseStructureFromOldProgram() {
             if (!oldProgram) {
                 return false;
@@ -59034,21 +61614,7 @@ var ts;
             // check properties that can affect structure of the program or module resolution strategy
             // if any of these properties has changed - structure cannot be reused
             var oldOptions = oldProgram.getCompilerOptions();
-            if ((oldOptions.module !== options.module) ||
-                (oldOptions.moduleResolution !== options.moduleResolution) ||
-                (oldOptions.noResolve !== options.noResolve) ||
-                (oldOptions.target !== options.target) ||
-                (oldOptions.noLib !== options.noLib) ||
-                (oldOptions.jsx !== options.jsx) ||
-                (oldOptions.allowJs !== options.allowJs) ||
-                (oldOptions.rootDir !== options.rootDir) ||
-                (oldOptions.configFilePath !== options.configFilePath) ||
-                (oldOptions.baseUrl !== options.baseUrl) ||
-                (oldOptions.maxNodeModuleJsDepth !== options.maxNodeModuleJsDepth) ||
-                !ts.arrayIsEqualTo(oldOptions.lib, options.lib) ||
-                !ts.arrayIsEqualTo(oldOptions.typeRoots, oldOptions.typeRoots) ||
-                !ts.arrayIsEqualTo(oldOptions.rootDirs, options.rootDirs) ||
-                !ts.equalOwnProperties(oldOptions.paths, options.paths)) {
+            if (ts.changesAffectModuleResolution(oldOptions, options)) {
                 return false;
             }
             ts.Debug.assert(!oldProgram.structureIsReused);
@@ -59099,29 +61665,8 @@ var ts;
                         // 'types' references has changed
                         return false;
                     }
-                    var newSourceFilePath = ts.getNormalizedAbsolutePath(newSourceFile.fileName, currentDirectory);
-                    if (resolveModuleNamesWorker) {
-                        var moduleNames = ts.map(ts.concatenate(newSourceFile.imports, newSourceFile.moduleAugmentations), getTextOfLiteral);
-                        var resolutions = resolveModuleNamesWorker(moduleNames, newSourceFilePath);
-                        // ensure that module resolution results are still correct
-                        var resolutionsChanged = ts.hasChangesInResolutions(moduleNames, resolutions, oldSourceFile.resolvedModules, ts.moduleResolutionIsEqualTo);
-                        if (resolutionsChanged) {
-                            return false;
-                        }
-                    }
-                    if (resolveTypeReferenceDirectiveNamesWorker) {
-                        var typesReferenceDirectives = ts.map(newSourceFile.typeReferenceDirectives, function (x) { return x.fileName; });
-                        var resolutions = resolveTypeReferenceDirectiveNamesWorker(typesReferenceDirectives, newSourceFilePath);
-                        // ensure that types resolutions are still correct
-                        var resolutionsChanged = ts.hasChangesInResolutions(typesReferenceDirectives, resolutions, oldSourceFile.resolvedTypeReferenceDirectiveNames, ts.typeDirectiveIsEqualTo);
-                        if (resolutionsChanged) {
-                            return false;
-                        }
-                    }
-                    // pass the cache of module/types resolutions from the old source file
-                    newSourceFile.resolvedModules = oldSourceFile.resolvedModules;
-                    newSourceFile.resolvedTypeReferenceDirectiveNames = oldSourceFile.resolvedTypeReferenceDirectiveNames;
-                    modifiedSourceFiles.push(newSourceFile);
+                    // tentatively approve the file
+                    modifiedSourceFiles.push({ oldFile: oldSourceFile, newFile: newSourceFile });
                 }
                 else {
                     // file has no changes - use it as is
@@ -59130,15 +61675,42 @@ var ts;
                 // if file has passed all checks it should be safe to reuse it
                 newSourceFiles.push(newSourceFile);
             }
+            var modifiedFilePaths = modifiedSourceFiles.map(function (f) { return f.newFile.path; });
+            // try to verify results of module resolution
+            for (var _b = 0, modifiedSourceFiles_1 = modifiedSourceFiles; _b < modifiedSourceFiles_1.length; _b++) {
+                var _c = modifiedSourceFiles_1[_b], oldSourceFile = _c.oldFile, newSourceFile = _c.newFile;
+                var newSourceFilePath = ts.getNormalizedAbsolutePath(newSourceFile.fileName, currentDirectory);
+                if (resolveModuleNamesWorker) {
+                    var moduleNames = ts.map(ts.concatenate(newSourceFile.imports, newSourceFile.moduleAugmentations), getTextOfLiteral);
+                    var resolutions = resolveModuleNamesReusingOldState(moduleNames, newSourceFilePath, newSourceFile, { file: oldSourceFile, program: oldProgram, modifiedFilePaths: modifiedFilePaths });
+                    // ensure that module resolution results are still correct
+                    var resolutionsChanged = ts.hasChangesInResolutions(moduleNames, resolutions, oldSourceFile.resolvedModules, ts.moduleResolutionIsEqualTo);
+                    if (resolutionsChanged) {
+                        return false;
+                    }
+                }
+                if (resolveTypeReferenceDirectiveNamesWorker) {
+                    var typesReferenceDirectives = ts.map(newSourceFile.typeReferenceDirectives, function (x) { return x.fileName; });
+                    var resolutions = resolveTypeReferenceDirectiveNamesWorker(typesReferenceDirectives, newSourceFilePath);
+                    // ensure that types resolutions are still correct
+                    var resolutionsChanged = ts.hasChangesInResolutions(typesReferenceDirectives, resolutions, oldSourceFile.resolvedTypeReferenceDirectiveNames, ts.typeDirectiveIsEqualTo);
+                    if (resolutionsChanged) {
+                        return false;
+                    }
+                }
+                // pass the cache of module/types resolutions from the old source file
+                newSourceFile.resolvedModules = oldSourceFile.resolvedModules;
+                newSourceFile.resolvedTypeReferenceDirectiveNames = oldSourceFile.resolvedTypeReferenceDirectiveNames;
+            }
             // update fileName -> file mapping
             for (var i = 0, len = newSourceFiles.length; i < len; i++) {
                 filesByName.set(filePaths[i], newSourceFiles[i]);
             }
             files = newSourceFiles;
             fileProcessingDiagnostics = oldProgram.getFileProcessingDiagnostics();
-            for (var _b = 0, modifiedSourceFiles_1 = modifiedSourceFiles; _b < modifiedSourceFiles_1.length; _b++) {
-                var modifiedFile = modifiedSourceFiles_1[_b];
-                fileProcessingDiagnostics.reattachFileDiagnostics(modifiedFile);
+            for (var _d = 0, modifiedSourceFiles_2 = modifiedSourceFiles; _d < modifiedSourceFiles_2.length; _d++) {
+                var modifiedFile = modifiedSourceFiles_2[_d];
+                fileProcessingDiagnostics.reattachFileDiagnostics(modifiedFile.newFile);
             }
             resolvedTypeReferenceDirectives = oldProgram.getResolvedTypeReferenceDirectives();
             oldProgram.structureIsReused = true;
@@ -59154,11 +61726,14 @@ var ts;
                 getSourceFile: program.getSourceFile,
                 getSourceFileByPath: program.getSourceFileByPath,
                 getSourceFiles: program.getSourceFiles,
-                isSourceFileFromExternalLibrary: function (file) { return !!sourceFilesFoundSearchingNodeModules[file.path]; },
+                isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
                 writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }),
                 isEmitBlocked: isEmitBlocked,
             };
         }
+        function isSourceFileFromExternalLibrary(file) {
+            return sourceFilesFoundSearchingNodeModules[file.path];
+        }
         function getDiagnosticsProducingTypeChecker() {
             return diagnosticsProducingTypeChecker || (diagnosticsProducingTypeChecker = ts.createTypeChecker(program, /*produceDiagnostics:*/ true));
         }
@@ -59247,6 +61822,14 @@ var ts;
             }
         }
         function getSyntacticDiagnosticsForFile(sourceFile) {
+            // For JavaScript files, we report semantic errors for using TypeScript-only
+            // constructs from within a JavaScript file as syntactic errors.
+            if (ts.isSourceFileJavaScript(sourceFile)) {
+                if (!sourceFile.additionalSyntacticDiagnostics) {
+                    sourceFile.additionalSyntacticDiagnostics = getJavaScriptSyntacticDiagnosticsForFile(sourceFile);
+                }
+                return ts.concatenate(sourceFile.additionalSyntacticDiagnostics, sourceFile.parseDiagnostics);
+            }
             return sourceFile.parseDiagnostics;
         }
         function runWithCancellationToken(func) {
@@ -59275,179 +61858,180 @@ var ts;
                 var typeChecker = getDiagnosticsProducingTypeChecker();
                 ts.Debug.assert(!!sourceFile.bindDiagnostics);
                 var bindDiagnostics = sourceFile.bindDiagnostics;
-                // For JavaScript files, we don't want to report the normal typescript semantic errors.
-                // Instead, we just report errors for using TypeScript-only constructs from within a
-                // JavaScript file.
-                var checkDiagnostics = ts.isSourceFileJavaScript(sourceFile) ?
-                    getJavaScriptSemanticDiagnosticsForFile(sourceFile) :
-                    typeChecker.getDiagnostics(sourceFile, cancellationToken);
+                // For JavaScript files, we don't want to report semantic errors.
+                // Instead, we'll report errors for using TypeScript-only constructs from within a
+                // JavaScript file when we get syntactic diagnostics for the file.
+                var checkDiagnostics = ts.isSourceFileJavaScript(sourceFile) ? [] : typeChecker.getDiagnostics(sourceFile, cancellationToken);
                 var fileProcessingDiagnosticsInFile = fileProcessingDiagnostics.getDiagnostics(sourceFile.fileName);
                 var programDiagnosticsInFile = programDiagnostics.getDiagnostics(sourceFile.fileName);
                 return bindDiagnostics.concat(checkDiagnostics, fileProcessingDiagnosticsInFile, programDiagnosticsInFile);
             });
         }
-        function getJavaScriptSemanticDiagnosticsForFile(sourceFile) {
+        function getJavaScriptSyntacticDiagnosticsForFile(sourceFile) {
             return runWithCancellationToken(function () {
                 var diagnostics = [];
+                var parent = sourceFile;
                 walk(sourceFile);
                 return diagnostics;
                 function walk(node) {
-                    if (!node) {
-                        return false;
+                    // 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 144 /* Parameter */:
+                        case 147 /* PropertyDeclaration */:
+                            if (parent.questionToken === node) {
+                                diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, "?"));
+                                return;
+                            }
+                        // Pass through
+                        case 149 /* MethodDeclaration */:
+                        case 148 /* MethodSignature */:
+                        case 150 /* Constructor */:
+                        case 151 /* GetAccessor */:
+                        case 152 /* SetAccessor */:
+                        case 184 /* FunctionExpression */:
+                        case 225 /* FunctionDeclaration */:
+                        case 185 /* ArrowFunction */:
+                        case 225 /* FunctionDeclaration */:
+                        case 223 /* VariableDeclaration */:
+                            // type annotation
+                            if (parent.type === node) {
+                                diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.types_can_only_be_used_in_a_ts_file));
+                                return;
+                            }
                     }
                     switch (node.kind) {
-                        case 230 /* ImportEqualsDeclaration */:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.import_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 236 /* ExportAssignment */:
+                        case 234 /* ImportEqualsDeclaration */:
+                            diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.import_can_only_be_used_in_a_ts_file));
+                            return;
+                        case 240 /* ExportAssignment */:
                             if (node.isExportEquals) {
-                                diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.export_can_only_be_used_in_a_ts_file));
-                                return true;
+                                diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.export_can_only_be_used_in_a_ts_file));
+                                return;
                             }
                             break;
-                        case 222 /* ClassDeclaration */:
-                            var classDeclaration = node;
-                            if (checkModifiers(classDeclaration.modifiers) ||
-                                checkTypeParameters(classDeclaration.typeParameters)) {
-                                return true;
-                            }
-                            break;
-                        case 251 /* HeritageClause */:
+                        case 255 /* HeritageClause */:
                             var heritageClause = node;
                             if (heritageClause.token === 107 /* ImplementsKeyword */) {
-                                diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.implements_clauses_can_only_be_used_in_a_ts_file));
-                                return true;
+                                diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.implements_clauses_can_only_be_used_in_a_ts_file));
+                                return;
                             }
                             break;
-                        case 223 /* InterfaceDeclaration */:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.interface_declarations_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 226 /* ModuleDeclaration */:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.module_declarations_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 224 /* TypeAliasDeclaration */:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.type_aliases_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 148 /* MethodDeclaration */:
-                        case 147 /* MethodSignature */:
-                        case 149 /* Constructor */:
-                        case 150 /* GetAccessor */:
-                        case 151 /* SetAccessor */:
-                        case 180 /* FunctionExpression */:
-                        case 221 /* FunctionDeclaration */:
-                        case 181 /* ArrowFunction */:
-                        case 221 /* FunctionDeclaration */:
-                            var functionDeclaration = node;
-                            if (checkModifiers(functionDeclaration.modifiers) ||
-                                checkTypeParameters(functionDeclaration.typeParameters) ||
-                                checkTypeAnnotation(functionDeclaration.type)) {
-                                return true;
+                        case 227 /* InterfaceDeclaration */:
+                            diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.interface_declarations_can_only_be_used_in_a_ts_file));
+                            return;
+                        case 230 /* ModuleDeclaration */:
+                            diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.module_declarations_can_only_be_used_in_a_ts_file));
+                            return;
+                        case 228 /* TypeAliasDeclaration */:
+                            diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.type_aliases_can_only_be_used_in_a_ts_file));
+                            return;
+                        case 229 /* EnumDeclaration */:
+                            diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.enum_declarations_can_only_be_used_in_a_ts_file));
+                            return;
+                        case 182 /* TypeAssertionExpression */:
+                            var typeAssertionExpression = node;
+                            diagnostics.push(createDiagnosticForNode(typeAssertionExpression.type, ts.Diagnostics.type_assertion_expressions_can_only_be_used_in_a_ts_file));
+                            return;
+                    }
+                    var prevParent = parent;
+                    parent = node;
+                    ts.forEachChild(node, walk, walkArray);
+                    parent = prevParent;
+                }
+                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));
+                    }
+                    switch (parent.kind) {
+                        case 226 /* ClassDeclaration */:
+                        case 149 /* MethodDeclaration */:
+                        case 148 /* MethodSignature */:
+                        case 150 /* Constructor */:
+                        case 151 /* GetAccessor */:
+                        case 152 /* SetAccessor */:
+                        case 184 /* FunctionExpression */:
+                        case 225 /* FunctionDeclaration */:
+                        case 185 /* ArrowFunction */:
+                        case 225 /* FunctionDeclaration */:
+                            // 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;
+                            }
+                        // pass through
+                        case 205 /* VariableStatement */:
+                            // Check modifiers
+                            if (nodes === parent.modifiers) {
+                                return checkModifiers(nodes, parent.kind === 205 /* VariableStatement */);
                             }
                             break;
-                        case 201 /* VariableStatement */:
-                            var variableStatement = node;
-                            if (checkModifiers(variableStatement.modifiers)) {
-                                return true;
-                            }
-                            break;
-                        case 219 /* VariableDeclaration */:
-                            var variableDeclaration = node;
-                            if (checkTypeAnnotation(variableDeclaration.type)) {
-                                return true;
-                            }
-                            break;
-                        case 175 /* CallExpression */:
-                        case 176 /* NewExpression */:
-                            var expression = node;
-                            if (expression.typeArguments && expression.typeArguments.length > 0) {
-                                var start = expression.typeArguments.pos;
-                                diagnostics.push(ts.createFileDiagnostic(sourceFile, start, expression.typeArguments.end - start, ts.Diagnostics.type_arguments_can_only_be_used_in_a_ts_file));
-                                return true;
-                            }
-                            break;
-                        case 143 /* Parameter */:
-                            var parameter = node;
-                            if (parameter.modifiers) {
-                                var start = parameter.modifiers.pos;
-                                diagnostics.push(ts.createFileDiagnostic(sourceFile, start, parameter.modifiers.end - start, ts.Diagnostics.parameter_modifiers_can_only_be_used_in_a_ts_file));
-                                return true;
-                            }
-                            if (parameter.questionToken) {
-                                diagnostics.push(ts.createDiagnosticForNode(parameter.questionToken, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, "?"));
-                                return true;
-                            }
-                            if (parameter.type) {
-                                diagnostics.push(ts.createDiagnosticForNode(parameter.type, ts.Diagnostics.types_can_only_be_used_in_a_ts_file));
-                                return true;
-                            }
-                            break;
-                        case 146 /* PropertyDeclaration */:
-                            var propertyDeclaration = node;
-                            if (propertyDeclaration.modifiers) {
-                                for (var _i = 0, _a = propertyDeclaration.modifiers; _i < _a.length; _i++) {
+                        case 147 /* 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 !== 114 /* StaticKeyword */) {
-                                        diagnostics.push(ts.createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
-                                        return true;
+                                        diagnostics.push(createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
                                     }
                                 }
-                            }
-                            if (checkTypeAnnotation(node.type)) {
-                                return true;
+                                return;
                             }
                             break;
-                        case 225 /* EnumDeclaration */:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.enum_declarations_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 178 /* TypeAssertionExpression */:
-                            var typeAssertionExpression = node;
-                            diagnostics.push(ts.createDiagnosticForNode(typeAssertionExpression.type, ts.Diagnostics.type_assertion_expressions_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 144 /* Decorator */:
-                            if (!options.experimentalDecorators) {
-                                diagnostics.push(ts.createDiagnosticForNode(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));
+                        case 144 /* 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;
                             }
-                            return true;
-                    }
-                    return ts.forEachChild(node, walk);
-                }
-                function checkTypeParameters(typeParameters) {
-                    if (typeParameters) {
-                        var start = typeParameters.pos;
-                        diagnostics.push(ts.createFileDiagnostic(sourceFile, start, typeParameters.end - start, ts.Diagnostics.type_parameter_declarations_can_only_be_used_in_a_ts_file));
-                        return true;
-                    }
-                    return false;
-                }
-                function checkTypeAnnotation(type) {
-                    if (type) {
-                        diagnostics.push(ts.createDiagnosticForNode(type, ts.Diagnostics.types_can_only_be_used_in_a_ts_file));
-                        return true;
-                    }
-                    return false;
-                }
-                function checkModifiers(modifiers) {
-                    if (modifiers) {
-                        for (var _i = 0, modifiers_1 = modifiers; _i < modifiers_1.length; _i++) {
-                            var modifier = modifiers_1[_i];
-                            switch (modifier.kind) {
-                                case 113 /* PublicKeyword */:
-                                case 111 /* PrivateKeyword */:
-                                case 112 /* ProtectedKeyword */:
-                                case 129 /* ReadonlyKeyword */:
-                                case 123 /* DeclareKeyword */:
-                                    diagnostics.push(ts.createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
-                                    return true;
-                                // These are all legal modifiers.
-                                case 114 /* StaticKeyword */:
-                                case 83 /* ExportKeyword */:
-                                case 75 /* ConstKeyword */:
-                                case 78 /* DefaultKeyword */:
-                                case 116 /* AbstractKeyword */:
+                            break;
+                        case 179 /* CallExpression */:
+                        case 180 /* NewExpression */:
+                        case 199 /* ExpressionWithTypeArguments */:
+                            // Check type arguments
+                            if (nodes === parent.typeArguments) {
+                                diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.type_arguments_can_only_be_used_in_a_ts_file));
+                                return;
                             }
+                            break;
+                    }
+                    for (var _b = 0, nodes_4 = nodes; _b < nodes_4.length; _b++) {
+                        var node = nodes_4[_b];
+                        walk(node);
+                    }
+                }
+                function checkModifiers(modifiers, isConstValid) {
+                    for (var _i = 0, modifiers_1 = modifiers; _i < modifiers_1.length; _i++) {
+                        var modifier = modifiers_1[_i];
+                        switch (modifier.kind) {
+                            case 75 /* ConstKeyword */:
+                                if (isConstValid) {
+                                    continue;
+                                }
+                            // Fallthrough to report error
+                            case 113 /* PublicKeyword */:
+                            case 111 /* PrivateKeyword */:
+                            case 112 /* ProtectedKeyword */:
+                            case 130 /* ReadonlyKeyword */:
+                            case 123 /* DeclareKeyword */:
+                            case 116 /* 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 114 /* StaticKeyword */:
+                            case 83 /* ExportKeyword */:
+                            case 78 /* DefaultKeyword */:
                         }
                     }
-                    return false;
+                }
+                function createDiagnosticForNodeArray(nodes, message, arg0, arg1, arg2) {
+                    var start = nodes.pos;
+                    return ts.createFileDiagnostic(sourceFile, start, nodes.end - start, message, arg0, arg1, arg2);
+                }
+                // Since these are syntactic diagnostics, parent might not have been set
+                // this means the sourceFile cannot be infered from the node
+                function createDiagnosticForNode(node, message, arg0, arg1, arg2) {
+                    return ts.createDiagnosticForNodeInSourceFile(sourceFile, node, message, arg0, arg1, arg2);
                 }
             });
         }
@@ -59455,8 +62039,7 @@ var ts;
             return runWithCancellationToken(function () {
                 var resolver = getDiagnosticsProducingTypeChecker().getEmitResolver(sourceFile, cancellationToken);
                 // Don't actually write any files since we're just getting diagnostics.
-                var writeFile = function () { };
-                return ts.getDeclarationDiagnostics(getEmitHost(writeFile), resolver, sourceFile);
+                return ts.getDeclarationDiagnostics(getEmitHost(ts.noop), resolver, sourceFile);
             });
         }
         function getDeclarationDiagnosticsForFile(sourceFile, cancellationToken) {
@@ -59473,9 +62056,6 @@ var ts;
             ts.addRange(allDiagnostics, getDiagnosticsProducingTypeChecker().getGlobalDiagnostics());
             return ts.sortAndDeduplicateDiagnostics(allDiagnostics);
         }
-        function hasExtension(fileName) {
-            return ts.getBaseFileName(fileName).indexOf(".") >= 0;
-        }
         function processRootFile(fileName, isDefaultLib) {
             processSourceFile(ts.normalizePath(fileName), isDefaultLib);
         }
@@ -59494,16 +62074,21 @@ var ts;
             }
             var isJavaScriptFile = ts.isSourceFileJavaScript(file);
             var isExternalModuleFile = ts.isExternalModule(file);
+            var isDtsFile = ts.isDeclarationFile(file);
             var imports;
             var moduleAugmentations;
+            var ambientModules;
             // If we are importing helpers, we need to add a synthetic reference to resolve the
             // helpers library.
             if (options.importHelpers
                 && (options.isolatedModules || isExternalModuleFile)
                 && !file.isDeclarationFile) {
-                var externalHelpersModuleReference = ts.createNode(9 /* StringLiteral */);
+                // synthesize 'import "tslib"' declaration
+                var externalHelpersModuleReference = ts.createSynthesizedNode(9 /* StringLiteral */);
                 externalHelpersModuleReference.text = ts.externalHelpersModuleNameText;
-                externalHelpersModuleReference.parent = file;
+                var importDecl = ts.createSynthesizedNode(235 /* ImportDeclaration */);
+                importDecl.parent = file;
+                externalHelpersModuleReference.parent = importDecl;
                 imports = [externalHelpersModuleReference];
             }
             for (var _i = 0, _a = file.statements; _i < _a.length; _i++) {
@@ -59515,12 +62100,13 @@ var ts;
             }
             file.imports = imports || emptyArray;
             file.moduleAugmentations = moduleAugmentations || emptyArray;
+            file.ambientModuleNames = ambientModules || emptyArray;
             return;
             function collectModuleReferences(node, inAmbientModule) {
                 switch (node.kind) {
-                    case 231 /* ImportDeclaration */:
-                    case 230 /* ImportEqualsDeclaration */:
-                    case 237 /* ExportDeclaration */:
+                    case 235 /* ImportDeclaration */:
+                    case 234 /* ImportEqualsDeclaration */:
+                    case 241 /* ExportDeclaration */:
                         var moduleNameExpr = ts.getExternalModuleName(node);
                         if (!moduleNameExpr || moduleNameExpr.kind !== 9 /* StringLiteral */) {
                             break;
@@ -59535,7 +62121,7 @@ var ts;
                             (imports || (imports = [])).push(moduleNameExpr);
                         }
                         break;
-                    case 226 /* ModuleDeclaration */:
+                    case 230 /* ModuleDeclaration */:
                         if (ts.isAmbientModule(node) && (inAmbientModule || ts.hasModifier(node, 2 /* Ambient */) || ts.isDeclarationFile(file))) {
                             var moduleName = node.name;
                             // Ambient module declarations can be interpreted as augmentations for some existing external modules.
@@ -59547,6 +62133,10 @@ var ts;
                                 (moduleAugmentations || (moduleAugmentations = [])).push(moduleName);
                             }
                             else if (!inAmbientModule) {
+                                if (isDtsFile) {
+                                    // for global .d.ts files record name of ambient module
+                                    (ambientModules || (ambientModules = [])).push(moduleName.text);
+                                }
                                 // An AmbientExternalModuleDeclaration declares an external module.
                                 // This type of declaration is permitted only in the global module.
                                 // The StringLiteral must specify a top - level external module name.
@@ -59572,13 +62162,10 @@ var ts;
                 }
             }
         }
-        /**
-          * 'isReference' indicates whether the file was brought in via a reference directive (rather than an import declaration)
-          */
         function processSourceFile(fileName, isDefaultLib, refFile, refPos, refEnd) {
             var diagnosticArgument;
             var diagnostic;
-            if (hasExtension(fileName)) {
+            if (ts.hasExtension(fileName)) {
                 if (!options.allowNonTsExtensions && !ts.forEach(supportedExtensions, function (extension) { return ts.fileExtensionIs(host.getCanonicalFileName(fileName), extension); })) {
                     diagnostic = ts.Diagnostics.File_0_has_unsupported_extension_The_only_supported_extensions_are_1;
                     diagnosticArgument = [fileName, "'" + supportedExtensions.join("', '") + "'"];
@@ -59644,7 +62231,7 @@ var ts;
                     processImportedModules(file_1);
                 }
                 else if (file_1 && modulesWithElidedImports[file_1.path]) {
-                    if (currentNodeModulesDepth < maxNodeModulesJsDepth) {
+                    if (currentNodeModulesDepth < maxNodeModuleJsDepth) {
                         modulesWithElidedImports[file_1.path] = false;
                         processImportedModules(file_1);
                     }
@@ -59725,9 +62312,12 @@ var ts;
                     // If we already resolved to this file, it must have been a secondary reference. Check file contents
                     // for sameness and possibly issue an error
                     if (previousResolution) {
-                        var otherFileText = host.readFile(resolvedTypeReferenceDirective.resolvedFileName);
-                        if (otherFileText !== getSourceFile(previousResolution.resolvedFileName).text) {
-                            fileProcessingDiagnostics.add(createDiagnostic(refFile, refPos, refEnd, ts.Diagnostics.Conflicting_definitions_for_0_found_at_1_and_2_Consider_installing_a_specific_version_of_this_library_to_resolve_the_conflict, typeReferenceDirective, resolvedTypeReferenceDirective.resolvedFileName, previousResolution.resolvedFileName));
+                        // Don't bother reading the file again if it's the same file.
+                        if (resolvedTypeReferenceDirective.resolvedFileName !== previousResolution.resolvedFileName) {
+                            var otherFileText = host.readFile(resolvedTypeReferenceDirective.resolvedFileName);
+                            if (otherFileText !== getSourceFile(previousResolution.resolvedFileName).text) {
+                                fileProcessingDiagnostics.add(createDiagnostic(refFile, refPos, refEnd, ts.Diagnostics.Conflicting_definitions_for_0_found_at_1_and_2_Consider_installing_a_specific_version_of_this_library_to_resolve_the_conflict, typeReferenceDirective, resolvedTypeReferenceDirective.resolvedFileName, previousResolution.resolvedFileName));
+                            }
                         }
                         // don't overwrite previous resolution result
                         saveResolution = false;
@@ -59764,29 +62354,39 @@ var ts;
             collectExternalModuleReferences(file);
             if (file.imports.length || file.moduleAugmentations.length) {
                 file.resolvedModules = ts.createMap();
-                var moduleNames = ts.map(ts.concatenate(file.imports, file.moduleAugmentations), getTextOfLiteral);
-                var resolutions = resolveModuleNamesWorker(moduleNames, ts.getNormalizedAbsolutePath(file.fileName, currentDirectory));
+                // Because global augmentation doesn't have string literal name, we can check for global augmentation as such.
+                var nonGlobalAugmentation = ts.filter(file.moduleAugmentations, function (moduleAugmentation) { return moduleAugmentation.kind === 9 /* StringLiteral */; });
+                var moduleNames = ts.map(ts.concatenate(file.imports, nonGlobalAugmentation), getTextOfLiteral);
+                var resolutions = resolveModuleNamesReusingOldState(moduleNames, ts.getNormalizedAbsolutePath(file.fileName, currentDirectory), file);
+                ts.Debug.assert(resolutions.length === moduleNames.length);
                 for (var i = 0; i < moduleNames.length; i++) {
                     var resolution = resolutions[i];
                     ts.setResolvedModule(file, moduleNames[i], resolution);
+                    if (!resolution) {
+                        continue;
+                    }
+                    var isFromNodeModulesSearch = resolution.isExternalLibraryImport;
+                    var isJsFileFromNodeModules = isFromNodeModulesSearch && !ts.extensionIsTypeScript(resolution.extension);
+                    var resolvedFileName = resolution.resolvedFileName;
+                    if (isFromNodeModulesSearch) {
+                        currentNodeModulesDepth++;
+                    }
                     // add file to program only if:
                     // - resolution was successful
                     // - noResolve is falsy
                     // - module name comes from the list of imports
                     // - it's not a top level JavaScript module that exceeded the search max
-                    var isFromNodeModulesSearch = resolution && resolution.isExternalLibraryImport;
-                    var isJsFileFromNodeModules = isFromNodeModulesSearch && ts.hasJavaScriptFileExtension(resolution.resolvedFileName);
-                    if (isFromNodeModulesSearch) {
-                        currentNodeModulesDepth++;
-                    }
-                    var elideImport = isJsFileFromNodeModules && currentNodeModulesDepth > maxNodeModulesJsDepth;
-                    var shouldAddFile = resolution && !options.noResolve && i < file.imports.length && !elideImport;
+                    var elideImport = isJsFileFromNodeModules && currentNodeModulesDepth > maxNodeModuleJsDepth;
+                    // Don't add the file if it has a bad extension (e.g. 'tsx' if we don't have '--allowJs')
+                    // This may still end up being an untyped module -- the file won't be included but imports will be allowed.
+                    var shouldAddFile = resolvedFileName && !getResolutionDiagnostic(options, resolution) && !options.noResolve && i < file.imports.length && !elideImport;
                     if (elideImport) {
                         modulesWithElidedImports[file.path] = true;
                     }
                     else if (shouldAddFile) {
-                        findSourceFile(resolution.resolvedFileName, ts.toPath(resolution.resolvedFileName, currentDirectory, getCanonicalFileName), 
-                        /*isDefaultLib*/ false, file, ts.skipTrivia(file.text, file.imports[i].pos), file.imports[i].end);
+                        var path = ts.toPath(resolvedFileName, currentDirectory, getCanonicalFileName);
+                        var pos = ts.skipTrivia(file.text, file.imports[i].pos);
+                        findSourceFile(resolvedFileName, path, /*isDefaultLib*/ false, file, pos, file.imports[i].end);
                     }
                     if (isFromNodeModulesSearch) {
                         currentNodeModulesDepth--;
@@ -59797,7 +62397,6 @@ var ts;
                 // no imports - drop cached module resolutions
                 file.resolvedModules = undefined;
             }
-            return;
         }
         function computeCommonSourceDirectory(sourceFiles) {
             var fileNames = [];
@@ -59958,7 +62557,15 @@ var ts;
                 !options.experimentalDecorators) {
                 programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "emitDecoratorMetadata", "experimentalDecorators"));
             }
-            if (options.reactNamespace && !ts.isIdentifierText(options.reactNamespace, languageVersion)) {
+            if (options.jsxFactory) {
+                if (options.reactNamespace) {
+                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "reactNamespace", "jsxFactory"));
+                }
+                if (!ts.parseIsolatedEntityName(options.jsxFactory, languageVersion)) {
+                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Invalid_value_for_jsxFactory_0_is_not_a_valid_identifier_or_qualified_name, options.jsxFactory));
+                }
+            }
+            else if (options.reactNamespace && !ts.isIdentifierText(options.reactNamespace, languageVersion)) {
                 programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Invalid_value_for_reactNamespace_0_is_not_a_valid_identifier, options.reactNamespace));
             }
             // If the emit is enabled make sure that every output file is unique and not overwriting any of the input files
@@ -59976,12 +62583,18 @@ var ts;
                     var emitFilePath = ts.toPath(emitFileName, currentDirectory, getCanonicalFileName);
                     // Report error if the output overwrites input file
                     if (filesByName.contains(emitFilePath)) {
-                        createEmitBlockingDiagnostics(emitFileName, ts.Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file);
+                        var chain_1;
+                        if (!options.configFilePath) {
+                            // The program is from either an inferred project or an external project
+                            chain_1 = 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_1 = ts.chainDiagnosticMessages(chain_1, ts.Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
+                        blockEmittingOfFile(emitFileName, ts.createCompilerDiagnosticFromMessageChain(chain_1));
                     }
                     // Report error if multiple files write into same file
                     if (emitFilesSeen.contains(emitFilePath)) {
                         // Already seen the same emit file - report error
-                        createEmitBlockingDiagnostics(emitFileName, ts.Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files);
+                        blockEmittingOfFile(emitFileName, ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files, emitFileName));
                     }
                     else {
                         emitFilesSeen.set(emitFilePath, true);
@@ -59989,12 +62602,40 @@ var ts;
                 }
             }
         }
-        function createEmitBlockingDiagnostics(emitFileName, message) {
+        function blockEmittingOfFile(emitFileName, diag) {
             hasEmitBlockingDiagnostics.set(ts.toPath(emitFileName, currentDirectory, getCanonicalFileName), true);
-            programDiagnostics.add(ts.createCompilerDiagnostic(message, emitFileName));
+            programDiagnostics.add(diag);
         }
     }
     ts.createProgram = createProgram;
+    /* @internal */
+    /**
+     * Returns a DiagnosticMessage if we won't include a resolved module due to its extension.
+     * The DiagnosticMessage's parameters are the imported module name, and the filename it resolved to.
+     * This returns a diagnostic even if the module will be an untyped module.
+     */
+    function getResolutionDiagnostic(options, _a) {
+        var extension = _a.extension;
+        switch (extension) {
+            case ts.Extension.Ts:
+            case ts.Extension.Dts:
+                // These are always allowed.
+                return undefined;
+            case ts.Extension.Tsx:
+                return needJsx();
+            case ts.Extension.Jsx:
+                return needJsx() || needAllowJs();
+            case ts.Extension.Js:
+                return needAllowJs();
+        }
+        function needJsx() {
+            return options.jsx ? undefined : ts.Diagnostics.Module_0_was_resolved_to_1_but_jsx_is_not_set;
+        }
+        function needAllowJs() {
+            return options.allowJs ? undefined : ts.Diagnostics.Module_0_was_resolved_to_1_but_allowJs_is_not_set;
+        }
+    }
+    ts.getResolutionDiagnostic = getResolutionDiagnostic;
 })(ts || (ts = {}));
 /// <reference path="sys.ts"/>
 /// <reference path="types.ts"/>
@@ -60075,6 +62716,11 @@ var ts;
             type: "string",
             description: ts.Diagnostics.Specify_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit
         },
+        {
+            name: "jsxFactory",
+            type: "string",
+            description: ts.Diagnostics.Specify_the_JSX_factory_function_to_use_when_targeting_react_JSX_emit_e_g_React_createElement_or_h
+        },
         {
             name: "listFiles",
             type: "boolean",
@@ -60263,6 +62909,7 @@ var ts;
                 "es2015": 2 /* ES2015 */,
                 "es2016": 3 /* ES2016 */,
                 "es2017": 4 /* ES2017 */,
+                "esnext": 5 /* ESNext */,
             }),
             description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015,
             paramType: ts.Diagnostics.VERSION,
@@ -60426,7 +63073,8 @@ var ts;
                     "es2015.symbol.wellknown": "lib.es2015.symbol.wellknown.d.ts",
                     "es2016.array.include": "lib.es2016.array.include.d.ts",
                     "es2017.object": "lib.es2017.object.d.ts",
-                    "es2017.sharedmemory": "lib.es2017.sharedmemory.d.ts"
+                    "es2017.sharedmemory": "lib.es2017.sharedmemory.d.ts",
+                    "es2017.string": "lib.es2017.string.d.ts",
                 }),
             },
             description: ts.Diagnostics.Specify_library_files_to_be_included_in_the_compilation_Colon
@@ -60580,7 +63228,13 @@ var ts;
                                     i++;
                                     break;
                                 case "boolean":
-                                    options[opt.name] = true;
+                                    // boolean flag has optional value true, false, others
+                                    var optValue = args[i];
+                                    options[opt.name] = optValue !== "false";
+                                    // consume next argument as boolean flag value
+                                    if (optValue === "false" || optValue === "true") {
+                                        i++;
+                                    }
                                     break;
                                 case "string":
                                     options[opt.name] = args[i] || "";
@@ -60717,11 +63371,11 @@ var ts;
         function serializeCompilerOptions(options) {
             var result = ts.createMap();
             var optionsNameMap = getOptionNameMap().optionNameMap;
-            for (var name_44 in options) {
-                if (ts.hasProperty(options, name_44)) {
+            for (var name_41 in options) {
+                if (ts.hasProperty(options, name_41)) {
                     // tsconfig only options cannot be specified via command line,
                     // so we can assume that only types that can appear here string | number | boolean
-                    switch (name_44) {
+                    switch (name_41) {
                         case "init":
                         case "watch":
                         case "version":
@@ -60729,14 +63383,14 @@ var ts;
                         case "project":
                             break;
                         default:
-                            var value = options[name_44];
-                            var optionDefinition = optionsNameMap[name_44.toLowerCase()];
+                            var value = options[name_41];
+                            var optionDefinition = optionsNameMap[name_41.toLowerCase()];
                             if (optionDefinition) {
                                 var customTypeMap = getCustomTypeMapOfCommandLineOption(optionDefinition);
                                 if (!customTypeMap) {
                                     // There is no map associated with this compiler option then use the value as-is
                                     // This is the case if the value is expect to be string, number, boolean or list of string
-                                    result[name_44] = value;
+                                    result[name_41] = value;
                                 }
                                 else {
                                     if (optionDefinition.type === "list") {
@@ -60745,11 +63399,11 @@ var ts;
                                             var element = _a[_i];
                                             convertedValue.push(getNameOfCompilerOptionValue(element, customTypeMap));
                                         }
-                                        result[name_44] = convertedValue;
+                                        result[name_41] = convertedValue;
                                     }
                                     else {
                                         // There is a typeMap associated with this command-line option so use it to map value back to its name
-                                        result[name_44] = getNameOfCompilerOptionValue(value, customTypeMap);
+                                        result[name_41] = getNameOfCompilerOptionValue(value, customTypeMap);
                                     }
                                 }
                             }
@@ -60879,6 +63533,9 @@ var ts;
             if (ts.hasProperty(json, "files")) {
                 if (ts.isArray(json["files"])) {
                     fileNames = json["files"];
+                    if (fileNames.length === 0) {
+                        errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.The_files_list_in_config_file_0_is_empty, configFileName || "tsconfig.json"));
+                    }
                 }
                 else {
                     errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "files", "Array"));
@@ -60916,7 +63573,11 @@ var ts;
             if (fileNames === undefined && includeSpecs === undefined) {
                 includeSpecs = ["**/*"];
             }
-            return matchFileNames(fileNames, includeSpecs, excludeSpecs, basePath, options, host, errors);
+            var result = matchFileNames(fileNames, includeSpecs, excludeSpecs, basePath, options, host, errors);
+            if (result.fileNames.length === 0 && !ts.hasProperty(json, "files") && resolutionStack.length === 0) {
+                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2, configFileName || "tsconfig.json", JSON.stringify(includeSpecs || []), JSON.stringify(excludeSpecs || [])));
+            }
+            return result;
         }
         var _b;
     }
@@ -60952,9 +63613,7 @@ var ts;
         return options;
     }
     function convertTypingOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName) {
-        var options = ts.getBaseFileName(configFileName) === "jsconfig.json"
-            ? { enableAutoDiscovery: true, include: [], exclude: [] }
-            : { enableAutoDiscovery: false, include: [], exclude: [] };
+        var options = { enableAutoDiscovery: ts.getBaseFileName(configFileName) === "jsconfig.json", include: [], exclude: [] };
         convertOptionsFromJson(ts.typingOptionDeclarations, jsonOptions, basePath, options, ts.Diagnostics.Unknown_typing_option_0, errors);
         return options;
     }
@@ -61186,6 +63845,7 @@ var ts;
         //
         //  /a/b/**/d   - Watch /a/b recursively to catch changes to any d in any subfolder recursively
         //  /a/b/*/d    - Watch /a/b recursively to catch any d in any immediate subfolder, even if a new subfolder is added
+        //  /a/b        - Watch /a/b recursively to catch changes to anything in any recursive subfoler
         //
         // We watch a directory without recursion if it contains a wildcard in the file segment of
         // the pattern:
@@ -61199,14 +63859,13 @@ var ts;
             var recursiveKeys = [];
             for (var _i = 0, include_1 = include; _i < include_1.length; _i++) {
                 var file = include_1[_i];
-                var name_45 = ts.normalizePath(ts.combinePaths(path, file));
-                if (excludeRegex && excludeRegex.test(name_45)) {
+                var spec = ts.normalizePath(ts.combinePaths(path, file));
+                if (excludeRegex && excludeRegex.test(spec)) {
                     continue;
                 }
-                var match = wildcardDirectoryPattern.exec(name_45);
+                var match = getWildcardDirectoryFromSpec(spec, useCaseSensitiveFileNames);
                 if (match) {
-                    var key = useCaseSensitiveFileNames ? match[0] : match[0].toLowerCase();
-                    var flags = watchRecursivePattern.test(name_45) ? 1 /* Recursive */ : 0 /* None */;
+                    var key = match.key, flags = match.flags;
                     var existingFlags = wildcardDirectories[key];
                     if (existingFlags === undefined || existingFlags < flags) {
                         wildcardDirectories[key] = flags;
@@ -61228,6 +63887,19 @@ var ts;
         }
         return wildcardDirectories;
     }
+    function getWildcardDirectoryFromSpec(spec, useCaseSensitiveFileNames) {
+        var match = wildcardDirectoryPattern.exec(spec);
+        if (match) {
+            return {
+                key: useCaseSensitiveFileNames ? match[0] : match[0].toLowerCase(),
+                flags: watchRecursivePattern.test(spec) ? 1 /* Recursive */ : 0 /* None */
+            };
+        }
+        if (ts.isImplicitGlob(spec)) {
+            return { key: spec, flags: 1 /* Recursive */ };
+        }
+        return undefined;
+    }
     /**
      * Determines whether a literal or wildcard file has already been included that has a higher
      * extension priority.
@@ -61331,12 +64003,13 @@ var ts;
         HighlightSpanKind.reference = "reference";
         HighlightSpanKind.writtenReference = "writtenReference";
     })(HighlightSpanKind = ts.HighlightSpanKind || (ts.HighlightSpanKind = {}));
+    var IndentStyle;
     (function (IndentStyle) {
         IndentStyle[IndentStyle["None"] = 0] = "None";
         IndentStyle[IndentStyle["Block"] = 1] = "Block";
         IndentStyle[IndentStyle["Smart"] = 2] = "Smart";
-    })(ts.IndentStyle || (ts.IndentStyle = {}));
-    var IndentStyle = ts.IndentStyle;
+    })(IndentStyle = ts.IndentStyle || (ts.IndentStyle = {}));
+    var SymbolDisplayPartKind;
     (function (SymbolDisplayPartKind) {
         SymbolDisplayPartKind[SymbolDisplayPartKind["aliasName"] = 0] = "aliasName";
         SymbolDisplayPartKind[SymbolDisplayPartKind["className"] = 1] = "className";
@@ -61360,14 +64033,14 @@ var ts;
         SymbolDisplayPartKind[SymbolDisplayPartKind["enumMemberName"] = 19] = "enumMemberName";
         SymbolDisplayPartKind[SymbolDisplayPartKind["functionName"] = 20] = "functionName";
         SymbolDisplayPartKind[SymbolDisplayPartKind["regularExpressionLiteral"] = 21] = "regularExpressionLiteral";
-    })(ts.SymbolDisplayPartKind || (ts.SymbolDisplayPartKind = {}));
-    var SymbolDisplayPartKind = ts.SymbolDisplayPartKind;
+    })(SymbolDisplayPartKind = ts.SymbolDisplayPartKind || (ts.SymbolDisplayPartKind = {}));
+    var OutputFileType;
     (function (OutputFileType) {
         OutputFileType[OutputFileType["JavaScript"] = 0] = "JavaScript";
         OutputFileType[OutputFileType["SourceMap"] = 1] = "SourceMap";
         OutputFileType[OutputFileType["Declaration"] = 2] = "Declaration";
-    })(ts.OutputFileType || (ts.OutputFileType = {}));
-    var OutputFileType = ts.OutputFileType;
+    })(OutputFileType = ts.OutputFileType || (ts.OutputFileType = {}));
+    var EndOfLineState;
     (function (EndOfLineState) {
         EndOfLineState[EndOfLineState["None"] = 0] = "None";
         EndOfLineState[EndOfLineState["InMultiLineCommentTrivia"] = 1] = "InMultiLineCommentTrivia";
@@ -61376,8 +64049,8 @@ var ts;
         EndOfLineState[EndOfLineState["InTemplateHeadOrNoSubstitutionTemplate"] = 4] = "InTemplateHeadOrNoSubstitutionTemplate";
         EndOfLineState[EndOfLineState["InTemplateMiddleOrTail"] = 5] = "InTemplateMiddleOrTail";
         EndOfLineState[EndOfLineState["InTemplateSubstitutionPosition"] = 6] = "InTemplateSubstitutionPosition";
-    })(ts.EndOfLineState || (ts.EndOfLineState = {}));
-    var EndOfLineState = ts.EndOfLineState;
+    })(EndOfLineState = ts.EndOfLineState || (ts.EndOfLineState = {}));
+    var TokenClass;
     (function (TokenClass) {
         TokenClass[TokenClass["Punctuation"] = 0] = "Punctuation";
         TokenClass[TokenClass["Keyword"] = 1] = "Keyword";
@@ -61388,8 +64061,7 @@ var ts;
         TokenClass[TokenClass["NumberLiteral"] = 6] = "NumberLiteral";
         TokenClass[TokenClass["StringLiteral"] = 7] = "StringLiteral";
         TokenClass[TokenClass["RegExpLiteral"] = 8] = "RegExpLiteral";
-    })(ts.TokenClass || (ts.TokenClass = {}));
-    var TokenClass = ts.TokenClass;
+    })(TokenClass = ts.TokenClass || (ts.TokenClass = {}));
     // TODO: move these to enums
     var ScriptElementKind;
     (function (ScriptElementKind) {
@@ -61496,6 +64168,7 @@ var ts;
     ClassificationTypeNames.jsxText = "jsx text";
     ClassificationTypeNames.jsxAttributeStringLiteralValue = "jsx attribute string literal value";
     ts.ClassificationTypeNames = ClassificationTypeNames;
+    var ClassificationType;
     (function (ClassificationType) {
         ClassificationType[ClassificationType["comment"] = 1] = "comment";
         ClassificationType[ClassificationType["identifier"] = 2] = "identifier";
@@ -61521,52 +64194,51 @@ var ts;
         ClassificationType[ClassificationType["jsxAttribute"] = 22] = "jsxAttribute";
         ClassificationType[ClassificationType["jsxText"] = 23] = "jsxText";
         ClassificationType[ClassificationType["jsxAttributeStringLiteralValue"] = 24] = "jsxAttributeStringLiteralValue";
-    })(ts.ClassificationType || (ts.ClassificationType = {}));
-    var ClassificationType = ts.ClassificationType;
+    })(ClassificationType = ts.ClassificationType || (ts.ClassificationType = {}));
 })(ts || (ts = {}));
 // These utilities are common to multiple language service features.
 /* @internal */
 var ts;
 (function (ts) {
-    ts.scanner = ts.createScanner(4 /* Latest */, /*skipTrivia*/ true);
+    ts.scanner = ts.createScanner(5 /* Latest */, /*skipTrivia*/ true);
     ts.emptyArray = [];
+    var SemanticMeaning;
     (function (SemanticMeaning) {
         SemanticMeaning[SemanticMeaning["None"] = 0] = "None";
         SemanticMeaning[SemanticMeaning["Value"] = 1] = "Value";
         SemanticMeaning[SemanticMeaning["Type"] = 2] = "Type";
         SemanticMeaning[SemanticMeaning["Namespace"] = 4] = "Namespace";
         SemanticMeaning[SemanticMeaning["All"] = 7] = "All";
-    })(ts.SemanticMeaning || (ts.SemanticMeaning = {}));
-    var SemanticMeaning = ts.SemanticMeaning;
+    })(SemanticMeaning = ts.SemanticMeaning || (ts.SemanticMeaning = {}));
     function getMeaningFromDeclaration(node) {
         switch (node.kind) {
-            case 143 /* Parameter */:
-            case 219 /* VariableDeclaration */:
-            case 170 /* BindingElement */:
-            case 146 /* PropertyDeclaration */:
-            case 145 /* PropertySignature */:
-            case 253 /* PropertyAssignment */:
-            case 254 /* ShorthandPropertyAssignment */:
-            case 255 /* EnumMember */:
-            case 148 /* MethodDeclaration */:
-            case 147 /* MethodSignature */:
-            case 149 /* Constructor */:
-            case 150 /* GetAccessor */:
-            case 151 /* SetAccessor */:
-            case 221 /* FunctionDeclaration */:
-            case 180 /* FunctionExpression */:
-            case 181 /* ArrowFunction */:
-            case 252 /* CatchClause */:
+            case 144 /* Parameter */:
+            case 223 /* VariableDeclaration */:
+            case 174 /* BindingElement */:
+            case 147 /* PropertyDeclaration */:
+            case 146 /* PropertySignature */:
+            case 257 /* PropertyAssignment */:
+            case 258 /* ShorthandPropertyAssignment */:
+            case 260 /* EnumMember */:
+            case 149 /* MethodDeclaration */:
+            case 148 /* MethodSignature */:
+            case 150 /* Constructor */:
+            case 151 /* GetAccessor */:
+            case 152 /* SetAccessor */:
+            case 225 /* FunctionDeclaration */:
+            case 184 /* FunctionExpression */:
+            case 185 /* ArrowFunction */:
+            case 256 /* CatchClause */:
                 return 1 /* Value */;
-            case 142 /* TypeParameter */:
-            case 223 /* InterfaceDeclaration */:
-            case 224 /* TypeAliasDeclaration */:
-            case 160 /* TypeLiteral */:
+            case 143 /* TypeParameter */:
+            case 227 /* InterfaceDeclaration */:
+            case 228 /* TypeAliasDeclaration */:
+            case 161 /* TypeLiteral */:
                 return 2 /* Type */;
-            case 222 /* ClassDeclaration */:
-            case 225 /* EnumDeclaration */:
+            case 226 /* ClassDeclaration */:
+            case 229 /* EnumDeclaration */:
                 return 1 /* Value */ | 2 /* Type */;
-            case 226 /* ModuleDeclaration */:
+            case 230 /* ModuleDeclaration */:
                 if (ts.isAmbientModule(node)) {
                     return 4 /* Namespace */ | 1 /* Value */;
                 }
@@ -61576,22 +64248,22 @@ var ts;
                 else {
                     return 4 /* Namespace */;
                 }
-            case 234 /* NamedImports */:
-            case 235 /* ImportSpecifier */:
-            case 230 /* ImportEqualsDeclaration */:
-            case 231 /* ImportDeclaration */:
-            case 236 /* ExportAssignment */:
-            case 237 /* ExportDeclaration */:
+            case 238 /* NamedImports */:
+            case 239 /* ImportSpecifier */:
+            case 234 /* ImportEqualsDeclaration */:
+            case 235 /* ImportDeclaration */:
+            case 240 /* ExportAssignment */:
+            case 241 /* ExportDeclaration */:
                 return 1 /* Value */ | 2 /* Type */ | 4 /* Namespace */;
             // An external module can be a Value
-            case 256 /* SourceFile */:
+            case 261 /* SourceFile */:
                 return 4 /* Namespace */ | 1 /* Value */;
         }
         return 1 /* Value */ | 2 /* Type */ | 4 /* Namespace */;
     }
     ts.getMeaningFromDeclaration = getMeaningFromDeclaration;
     function getMeaningFromLocation(node) {
-        if (node.parent.kind === 236 /* ExportAssignment */) {
+        if (node.parent.kind === 240 /* ExportAssignment */) {
             return 1 /* Value */ | 2 /* Type */ | 4 /* Namespace */;
         }
         else if (isInRightSideOfImport(node)) {
@@ -61616,15 +64288,15 @@ var ts;
         //     import a = |b|; // Namespace
         //     import a = |b.c|; // Value, type, namespace
         //     import a = |b.c|.d; // Namespace
-        if (node.parent.kind === 140 /* QualifiedName */ &&
+        if (node.parent.kind === 141 /* QualifiedName */ &&
             node.parent.right === node &&
-            node.parent.parent.kind === 230 /* ImportEqualsDeclaration */) {
+            node.parent.parent.kind === 234 /* ImportEqualsDeclaration */) {
             return 1 /* Value */ | 2 /* Type */ | 4 /* Namespace */;
         }
         return 4 /* Namespace */;
     }
     function isInRightSideOfImport(node) {
-        while (node.parent.kind === 140 /* QualifiedName */) {
+        while (node.parent.kind === 141 /* QualifiedName */) {
             node = node.parent;
         }
         return ts.isInternalModuleImportEqualsDeclaration(node.parent) && node.parent.moduleReference === node;
@@ -61635,27 +64307,27 @@ var ts;
     function isQualifiedNameNamespaceReference(node) {
         var root = node;
         var isLastClause = true;
-        if (root.parent.kind === 140 /* QualifiedName */) {
-            while (root.parent && root.parent.kind === 140 /* QualifiedName */) {
+        if (root.parent.kind === 141 /* QualifiedName */) {
+            while (root.parent && root.parent.kind === 141 /* QualifiedName */) {
                 root = root.parent;
             }
             isLastClause = root.right === node;
         }
-        return root.parent.kind === 156 /* TypeReference */ && !isLastClause;
+        return root.parent.kind === 157 /* TypeReference */ && !isLastClause;
     }
     function isPropertyAccessNamespaceReference(node) {
         var root = node;
         var isLastClause = true;
-        if (root.parent.kind === 173 /* PropertyAccessExpression */) {
-            while (root.parent && root.parent.kind === 173 /* PropertyAccessExpression */) {
+        if (root.parent.kind === 177 /* PropertyAccessExpression */) {
+            while (root.parent && root.parent.kind === 177 /* PropertyAccessExpression */) {
                 root = root.parent;
             }
             isLastClause = root.name === node;
         }
-        if (!isLastClause && root.parent.kind === 195 /* ExpressionWithTypeArguments */ && root.parent.parent.kind === 251 /* HeritageClause */) {
+        if (!isLastClause && root.parent.kind === 199 /* ExpressionWithTypeArguments */ && root.parent.parent.kind === 255 /* HeritageClause */) {
             var decl = root.parent.parent.parent;
-            return (decl.kind === 222 /* ClassDeclaration */ && root.parent.parent.token === 107 /* ImplementsKeyword */) ||
-                (decl.kind === 223 /* InterfaceDeclaration */ && root.parent.parent.token === 84 /* ExtendsKeyword */);
+            return (decl.kind === 226 /* ClassDeclaration */ && root.parent.parent.token === 107 /* ImplementsKeyword */) ||
+                (decl.kind === 227 /* InterfaceDeclaration */ && root.parent.parent.token === 84 /* ExtendsKeyword */);
         }
         return false;
     }
@@ -61663,17 +64335,17 @@ var ts;
         if (ts.isRightSideOfQualifiedNameOrPropertyAccess(node)) {
             node = node.parent;
         }
-        return node.parent.kind === 156 /* TypeReference */ ||
-            (node.parent.kind === 195 /* ExpressionWithTypeArguments */ && !ts.isExpressionWithTypeArgumentsInClassExtendsClause(node.parent)) ||
+        return node.parent.kind === 157 /* TypeReference */ ||
+            (node.parent.kind === 199 /* ExpressionWithTypeArguments */ && !ts.isExpressionWithTypeArgumentsInClassExtendsClause(node.parent)) ||
             (node.kind === 98 /* ThisKeyword */ && !ts.isPartOfExpression(node)) ||
-            node.kind === 166 /* ThisType */;
+            node.kind === 167 /* ThisType */;
     }
     function isCallExpressionTarget(node) {
-        return isCallOrNewExpressionTarget(node, 175 /* CallExpression */);
+        return isCallOrNewExpressionTarget(node, 179 /* CallExpression */);
     }
     ts.isCallExpressionTarget = isCallExpressionTarget;
     function isNewExpressionTarget(node) {
-        return isCallOrNewExpressionTarget(node, 176 /* NewExpression */);
+        return isCallOrNewExpressionTarget(node, 180 /* NewExpression */);
     }
     ts.isNewExpressionTarget = isNewExpressionTarget;
     function isCallOrNewExpressionTarget(node, kind) {
@@ -61686,7 +64358,7 @@ var ts;
     ts.climbPastPropertyAccess = climbPastPropertyAccess;
     function getTargetLabel(referenceNode, labelName) {
         while (referenceNode) {
-            if (referenceNode.kind === 215 /* LabeledStatement */ && referenceNode.label.text === labelName) {
+            if (referenceNode.kind === 219 /* LabeledStatement */ && referenceNode.label.text === labelName) {
                 return referenceNode.label;
             }
             referenceNode = referenceNode.parent;
@@ -61696,13 +64368,13 @@ var ts;
     ts.getTargetLabel = getTargetLabel;
     function isJumpStatementTarget(node) {
         return node.kind === 70 /* Identifier */ &&
-            (node.parent.kind === 211 /* BreakStatement */ || node.parent.kind === 210 /* ContinueStatement */) &&
+            (node.parent.kind === 215 /* BreakStatement */ || node.parent.kind === 214 /* ContinueStatement */) &&
             node.parent.label === node;
     }
     ts.isJumpStatementTarget = isJumpStatementTarget;
     function isLabelOfLabeledStatement(node) {
         return node.kind === 70 /* Identifier */ &&
-            node.parent.kind === 215 /* LabeledStatement */ &&
+            node.parent.kind === 219 /* LabeledStatement */ &&
             node.parent.label === node;
     }
     function isLabelName(node) {
@@ -61710,15 +64382,15 @@ var ts;
     }
     ts.isLabelName = isLabelName;
     function isRightSideOfQualifiedName(node) {
-        return node.parent.kind === 140 /* QualifiedName */ && node.parent.right === node;
+        return node.parent.kind === 141 /* QualifiedName */ && node.parent.right === node;
     }
     ts.isRightSideOfQualifiedName = isRightSideOfQualifiedName;
     function isRightSideOfPropertyAccess(node) {
-        return node && node.parent && node.parent.kind === 173 /* PropertyAccessExpression */ && node.parent.name === node;
+        return node && node.parent && node.parent.kind === 177 /* PropertyAccessExpression */ && node.parent.name === node;
     }
     ts.isRightSideOfPropertyAccess = isRightSideOfPropertyAccess;
     function isNameOfModuleDeclaration(node) {
-        return node.parent.kind === 226 /* ModuleDeclaration */ && node.parent.name === node;
+        return node.parent.kind === 230 /* ModuleDeclaration */ && node.parent.name === node;
     }
     ts.isNameOfModuleDeclaration = isNameOfModuleDeclaration;
     function isNameOfFunctionDeclaration(node) {
@@ -61729,19 +64401,19 @@ var ts;
     function isLiteralNameOfPropertyDeclarationOrIndexAccess(node) {
         if (node.kind === 9 /* StringLiteral */ || node.kind === 8 /* NumericLiteral */) {
             switch (node.parent.kind) {
-                case 146 /* PropertyDeclaration */:
-                case 145 /* PropertySignature */:
-                case 253 /* PropertyAssignment */:
-                case 255 /* EnumMember */:
-                case 148 /* MethodDeclaration */:
-                case 147 /* MethodSignature */:
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
-                case 226 /* ModuleDeclaration */:
+                case 147 /* PropertyDeclaration */:
+                case 146 /* PropertySignature */:
+                case 257 /* PropertyAssignment */:
+                case 260 /* EnumMember */:
+                case 149 /* MethodDeclaration */:
+                case 148 /* MethodSignature */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
+                case 230 /* ModuleDeclaration */:
                     return node.parent.name === node;
-                case 174 /* ElementAccessExpression */:
+                case 178 /* ElementAccessExpression */:
                     return node.parent.argumentExpression === node;
-                case 141 /* ComputedPropertyName */:
+                case 142 /* ComputedPropertyName */:
                     return true;
             }
         }
@@ -61790,17 +64462,17 @@ var ts;
                 return undefined;
             }
             switch (node.kind) {
-                case 256 /* SourceFile */:
-                case 148 /* MethodDeclaration */:
-                case 147 /* MethodSignature */:
-                case 221 /* FunctionDeclaration */:
-                case 180 /* FunctionExpression */:
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
-                case 222 /* ClassDeclaration */:
-                case 223 /* InterfaceDeclaration */:
-                case 225 /* EnumDeclaration */:
-                case 226 /* ModuleDeclaration */:
+                case 261 /* SourceFile */:
+                case 149 /* MethodDeclaration */:
+                case 148 /* MethodSignature */:
+                case 225 /* FunctionDeclaration */:
+                case 184 /* FunctionExpression */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
+                case 226 /* ClassDeclaration */:
+                case 227 /* InterfaceDeclaration */:
+                case 229 /* EnumDeclaration */:
+                case 230 /* ModuleDeclaration */:
                     return node;
             }
         }
@@ -61808,46 +64480,46 @@ var ts;
     ts.getContainerNode = getContainerNode;
     function getNodeKind(node) {
         switch (node.kind) {
-            case 256 /* SourceFile */:
+            case 261 /* SourceFile */:
                 return ts.isExternalModule(node) ? ts.ScriptElementKind.moduleElement : ts.ScriptElementKind.scriptElement;
-            case 226 /* ModuleDeclaration */:
+            case 230 /* ModuleDeclaration */:
                 return ts.ScriptElementKind.moduleElement;
-            case 222 /* ClassDeclaration */:
-            case 193 /* ClassExpression */:
+            case 226 /* ClassDeclaration */:
+            case 197 /* ClassExpression */:
                 return ts.ScriptElementKind.classElement;
-            case 223 /* InterfaceDeclaration */: return ts.ScriptElementKind.interfaceElement;
-            case 224 /* TypeAliasDeclaration */: return ts.ScriptElementKind.typeElement;
-            case 225 /* EnumDeclaration */: return ts.ScriptElementKind.enumElement;
-            case 219 /* VariableDeclaration */:
+            case 227 /* InterfaceDeclaration */: return ts.ScriptElementKind.interfaceElement;
+            case 228 /* TypeAliasDeclaration */: return ts.ScriptElementKind.typeElement;
+            case 229 /* EnumDeclaration */: return ts.ScriptElementKind.enumElement;
+            case 223 /* VariableDeclaration */:
                 return getKindOfVariableDeclaration(node);
-            case 170 /* BindingElement */:
+            case 174 /* BindingElement */:
                 return getKindOfVariableDeclaration(ts.getRootDeclaration(node));
-            case 181 /* ArrowFunction */:
-            case 221 /* FunctionDeclaration */:
-            case 180 /* FunctionExpression */:
+            case 185 /* ArrowFunction */:
+            case 225 /* FunctionDeclaration */:
+            case 184 /* FunctionExpression */:
                 return ts.ScriptElementKind.functionElement;
-            case 150 /* GetAccessor */: return ts.ScriptElementKind.memberGetAccessorElement;
-            case 151 /* SetAccessor */: return ts.ScriptElementKind.memberSetAccessorElement;
-            case 148 /* MethodDeclaration */:
-            case 147 /* MethodSignature */:
+            case 151 /* GetAccessor */: return ts.ScriptElementKind.memberGetAccessorElement;
+            case 152 /* SetAccessor */: return ts.ScriptElementKind.memberSetAccessorElement;
+            case 149 /* MethodDeclaration */:
+            case 148 /* MethodSignature */:
                 return ts.ScriptElementKind.memberFunctionElement;
-            case 146 /* PropertyDeclaration */:
-            case 145 /* PropertySignature */:
+            case 147 /* PropertyDeclaration */:
+            case 146 /* PropertySignature */:
                 return ts.ScriptElementKind.memberVariableElement;
-            case 154 /* IndexSignature */: return ts.ScriptElementKind.indexSignatureElement;
-            case 153 /* ConstructSignature */: return ts.ScriptElementKind.constructSignatureElement;
-            case 152 /* CallSignature */: return ts.ScriptElementKind.callSignatureElement;
-            case 149 /* Constructor */: return ts.ScriptElementKind.constructorImplementationElement;
-            case 142 /* TypeParameter */: return ts.ScriptElementKind.typeParameterElement;
-            case 255 /* EnumMember */: return ts.ScriptElementKind.enumMemberElement;
-            case 143 /* Parameter */: return ts.hasModifier(node, 92 /* ParameterPropertyModifier */) ? ts.ScriptElementKind.memberVariableElement : ts.ScriptElementKind.parameterElement;
-            case 230 /* ImportEqualsDeclaration */:
-            case 235 /* ImportSpecifier */:
-            case 232 /* ImportClause */:
-            case 239 /* ExportSpecifier */:
-            case 233 /* NamespaceImport */:
+            case 155 /* IndexSignature */: return ts.ScriptElementKind.indexSignatureElement;
+            case 154 /* ConstructSignature */: return ts.ScriptElementKind.constructSignatureElement;
+            case 153 /* CallSignature */: return ts.ScriptElementKind.callSignatureElement;
+            case 150 /* Constructor */: return ts.ScriptElementKind.constructorImplementationElement;
+            case 143 /* TypeParameter */: return ts.ScriptElementKind.typeParameterElement;
+            case 260 /* EnumMember */: return ts.ScriptElementKind.enumMemberElement;
+            case 144 /* Parameter */: return ts.hasModifier(node, 92 /* ParameterPropertyModifier */) ? ts.ScriptElementKind.memberVariableElement : ts.ScriptElementKind.parameterElement;
+            case 234 /* ImportEqualsDeclaration */:
+            case 239 /* ImportSpecifier */:
+            case 236 /* ImportClause */:
+            case 243 /* ExportSpecifier */:
+            case 237 /* NamespaceImport */:
                 return ts.ScriptElementKind.alias;
-            case 279 /* JSDocTypedefTag */:
+            case 284 /* JSDocTypedefTag */:
                 return ts.ScriptElementKind.typeElement;
             default:
                 return ts.ScriptElementKind.unknown;
@@ -61862,7 +64534,7 @@ var ts;
     }
     ts.getNodeKind = getNodeKind;
     function getStringLiteralTypeForNode(node, typeChecker) {
-        var searchNode = node.parent.kind === 167 /* LiteralType */ ? node.parent : node;
+        var searchNode = node.parent.kind === 171 /* LiteralType */ ? node.parent : node;
         var type = typeChecker.getTypeAtLocation(searchNode);
         if (type && type.flags & 32 /* StringLiteral */) {
             return type;
@@ -61877,7 +64549,7 @@ var ts;
                 return true;
             case 70 /* Identifier */:
                 // 'this' as a parameter
-                return ts.identifierIsThisKeyword(node) && node.parent.kind === 143 /* Parameter */;
+                return ts.identifierIsThisKeyword(node) && node.parent.kind === 144 /* Parameter */;
             default:
                 return false;
         }
@@ -61922,42 +64594,42 @@ var ts;
             return false;
         }
         switch (n.kind) {
-            case 222 /* ClassDeclaration */:
-            case 223 /* InterfaceDeclaration */:
-            case 225 /* EnumDeclaration */:
-            case 172 /* ObjectLiteralExpression */:
-            case 168 /* ObjectBindingPattern */:
-            case 160 /* TypeLiteral */:
-            case 200 /* Block */:
-            case 227 /* ModuleBlock */:
-            case 228 /* CaseBlock */:
-            case 234 /* NamedImports */:
-            case 238 /* NamedExports */:
+            case 226 /* ClassDeclaration */:
+            case 227 /* InterfaceDeclaration */:
+            case 229 /* EnumDeclaration */:
+            case 176 /* ObjectLiteralExpression */:
+            case 172 /* ObjectBindingPattern */:
+            case 161 /* TypeLiteral */:
+            case 204 /* Block */:
+            case 231 /* ModuleBlock */:
+            case 232 /* CaseBlock */:
+            case 238 /* NamedImports */:
+            case 242 /* NamedExports */:
                 return nodeEndsWith(n, 17 /* CloseBraceToken */, sourceFile);
-            case 252 /* CatchClause */:
+            case 256 /* CatchClause */:
                 return isCompletedNode(n.block, sourceFile);
-            case 176 /* NewExpression */:
+            case 180 /* NewExpression */:
                 if (!n.arguments) {
                     return true;
                 }
             // fall through
-            case 175 /* CallExpression */:
-            case 179 /* ParenthesizedExpression */:
-            case 165 /* ParenthesizedType */:
+            case 179 /* CallExpression */:
+            case 183 /* ParenthesizedExpression */:
+            case 166 /* ParenthesizedType */:
                 return nodeEndsWith(n, 19 /* CloseParenToken */, sourceFile);
-            case 157 /* FunctionType */:
-            case 158 /* ConstructorType */:
+            case 158 /* FunctionType */:
+            case 159 /* ConstructorType */:
                 return isCompletedNode(n.type, sourceFile);
-            case 149 /* Constructor */:
-            case 150 /* GetAccessor */:
-            case 151 /* SetAccessor */:
-            case 221 /* FunctionDeclaration */:
-            case 180 /* FunctionExpression */:
-            case 148 /* MethodDeclaration */:
-            case 147 /* MethodSignature */:
-            case 153 /* ConstructSignature */:
-            case 152 /* CallSignature */:
-            case 181 /* ArrowFunction */:
+            case 150 /* Constructor */:
+            case 151 /* GetAccessor */:
+            case 152 /* SetAccessor */:
+            case 225 /* FunctionDeclaration */:
+            case 184 /* FunctionExpression */:
+            case 149 /* MethodDeclaration */:
+            case 148 /* MethodSignature */:
+            case 154 /* ConstructSignature */:
+            case 153 /* CallSignature */:
+            case 185 /* ArrowFunction */:
                 if (n.body) {
                     return isCompletedNode(n.body, sourceFile);
                 }
@@ -61967,67 +64639,67 @@ var ts;
                 // Even though type parameters can be unclosed, we can get away with
                 // having at least a closing paren.
                 return hasChildOfKind(n, 19 /* CloseParenToken */, sourceFile);
-            case 226 /* ModuleDeclaration */:
+            case 230 /* ModuleDeclaration */:
                 return n.body && isCompletedNode(n.body, sourceFile);
-            case 204 /* IfStatement */:
+            case 208 /* IfStatement */:
                 if (n.elseStatement) {
                     return isCompletedNode(n.elseStatement, sourceFile);
                 }
                 return isCompletedNode(n.thenStatement, sourceFile);
-            case 203 /* ExpressionStatement */:
+            case 207 /* ExpressionStatement */:
                 return isCompletedNode(n.expression, sourceFile) ||
                     hasChildOfKind(n, 24 /* SemicolonToken */);
-            case 171 /* ArrayLiteralExpression */:
-            case 169 /* ArrayBindingPattern */:
-            case 174 /* ElementAccessExpression */:
-            case 141 /* ComputedPropertyName */:
-            case 162 /* TupleType */:
+            case 175 /* ArrayLiteralExpression */:
+            case 173 /* ArrayBindingPattern */:
+            case 178 /* ElementAccessExpression */:
+            case 142 /* ComputedPropertyName */:
+            case 163 /* TupleType */:
                 return nodeEndsWith(n, 21 /* CloseBracketToken */, sourceFile);
-            case 154 /* IndexSignature */:
+            case 155 /* IndexSignature */:
                 if (n.type) {
                     return isCompletedNode(n.type, sourceFile);
                 }
                 return hasChildOfKind(n, 21 /* CloseBracketToken */, sourceFile);
-            case 249 /* CaseClause */:
-            case 250 /* DefaultClause */:
+            case 253 /* CaseClause */:
+            case 254 /* DefaultClause */:
                 // there is no such thing as terminator token for CaseClause/DefaultClause so for simplicity always consider them non-completed
                 return false;
-            case 207 /* ForStatement */:
-            case 208 /* ForInStatement */:
-            case 209 /* ForOfStatement */:
-            case 206 /* WhileStatement */:
+            case 211 /* ForStatement */:
+            case 212 /* ForInStatement */:
+            case 213 /* ForOfStatement */:
+            case 210 /* WhileStatement */:
                 return isCompletedNode(n.statement, sourceFile);
-            case 205 /* DoStatement */:
+            case 209 /* DoStatement */:
                 // rough approximation: if DoStatement has While keyword - then if node is completed is checking the presence of ')';
                 var hasWhileKeyword = findChildOfKind(n, 105 /* WhileKeyword */, sourceFile);
                 if (hasWhileKeyword) {
                     return nodeEndsWith(n, 19 /* CloseParenToken */, sourceFile);
                 }
                 return isCompletedNode(n.statement, sourceFile);
-            case 159 /* TypeQuery */:
+            case 160 /* TypeQuery */:
                 return isCompletedNode(n.exprName, sourceFile);
-            case 183 /* TypeOfExpression */:
-            case 182 /* DeleteExpression */:
-            case 184 /* VoidExpression */:
-            case 191 /* YieldExpression */:
-            case 192 /* SpreadElementExpression */:
+            case 187 /* TypeOfExpression */:
+            case 186 /* DeleteExpression */:
+            case 188 /* VoidExpression */:
+            case 195 /* YieldExpression */:
+            case 196 /* SpreadElement */:
                 var unaryWordExpression = n;
                 return isCompletedNode(unaryWordExpression.expression, sourceFile);
-            case 177 /* TaggedTemplateExpression */:
+            case 181 /* TaggedTemplateExpression */:
                 return isCompletedNode(n.template, sourceFile);
-            case 190 /* TemplateExpression */:
+            case 194 /* TemplateExpression */:
                 var lastSpan = ts.lastOrUndefined(n.templateSpans);
                 return isCompletedNode(lastSpan, sourceFile);
-            case 198 /* TemplateSpan */:
+            case 202 /* TemplateSpan */:
                 return ts.nodeIsPresent(n.literal);
-            case 237 /* ExportDeclaration */:
-            case 231 /* ImportDeclaration */:
+            case 241 /* ExportDeclaration */:
+            case 235 /* ImportDeclaration */:
                 return ts.nodeIsPresent(n.moduleSpecifier);
-            case 186 /* PrefixUnaryExpression */:
+            case 190 /* PrefixUnaryExpression */:
                 return isCompletedNode(n.operand, sourceFile);
-            case 188 /* BinaryExpression */:
+            case 192 /* BinaryExpression */:
                 return isCompletedNode(n.right, sourceFile);
-            case 189 /* ConditionalExpression */:
+            case 193 /* ConditionalExpression */:
                 return isCompletedNode(n.whenFalse, sourceFile);
             default:
                 return true;
@@ -62083,7 +64755,7 @@ var ts;
         // for the position of the relevant node (or comma).
         var syntaxList = ts.forEach(node.parent.getChildren(), function (c) {
             // find syntax list that covers the span of the node
-            if (c.kind === 286 /* SyntaxList */ && c.pos <= node.pos && c.end >= node.end) {
+            if (c.kind === 291 /* SyntaxList */ && c.pos <= node.pos && c.end >= node.end) {
                 return c;
             }
         });
@@ -62255,7 +64927,7 @@ var ts;
                     }
                 }
             }
-            ts.Debug.assert(startNode !== undefined || n.kind === 256 /* SourceFile */);
+            ts.Debug.assert(startNode !== undefined || n.kind === 261 /* SourceFile */);
             // 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.
@@ -62314,17 +64986,17 @@ var ts;
             return true;
         }
         // <div> { | </div> or <div a={| </div>
-        if (token.kind === 26 /* LessThanToken */ && token.parent.kind === 248 /* JsxExpression */) {
+        if (token.kind === 26 /* LessThanToken */ && token.parent.kind === 252 /* JsxExpression */) {
             return true;
         }
         // <div> {
         // |
         // } < /div>
-        if (token && token.kind === 17 /* CloseBraceToken */ && token.parent.kind === 248 /* JsxExpression */) {
+        if (token && token.kind === 17 /* CloseBraceToken */ && token.parent.kind === 252 /* JsxExpression */) {
             return true;
         }
         // <div>|</div>
-        if (token.kind === 26 /* LessThanToken */ && token.parent.kind === 245 /* JsxClosingElement */) {
+        if (token.kind === 26 /* LessThanToken */ && token.parent.kind === 249 /* JsxClosingElement */) {
             return true;
         }
         return false;
@@ -62436,17 +65108,17 @@ var ts;
     }
     ts.getNodeModifiers = getNodeModifiers;
     function getTypeArgumentOrTypeParameterList(node) {
-        if (node.kind === 156 /* TypeReference */ || node.kind === 175 /* CallExpression */) {
+        if (node.kind === 157 /* TypeReference */ || node.kind === 179 /* CallExpression */) {
             return node.typeArguments;
         }
-        if (ts.isFunctionLike(node) || node.kind === 222 /* ClassDeclaration */ || node.kind === 223 /* InterfaceDeclaration */) {
+        if (ts.isFunctionLike(node) || node.kind === 226 /* ClassDeclaration */ || node.kind === 227 /* InterfaceDeclaration */) {
             return node.typeParameters;
         }
         return undefined;
     }
     ts.getTypeArgumentOrTypeParameterList = getTypeArgumentOrTypeParameterList;
     function isToken(n) {
-        return n.kind >= 0 /* FirstToken */ && n.kind <= 139 /* LastToken */;
+        return n.kind >= 0 /* FirstToken */ && n.kind <= 140 /* LastToken */;
     }
     ts.isToken = isToken;
     function isWord(kind) {
@@ -62505,18 +65177,18 @@ var ts;
     }
     ts.compareDataObjects = compareDataObjects;
     function isArrayLiteralOrObjectLiteralDestructuringPattern(node) {
-        if (node.kind === 171 /* ArrayLiteralExpression */ ||
-            node.kind === 172 /* ObjectLiteralExpression */) {
+        if (node.kind === 175 /* ArrayLiteralExpression */ ||
+            node.kind === 176 /* ObjectLiteralExpression */) {
             // [a,b,c] from:
             // [a, b, c] = someExpression;
-            if (node.parent.kind === 188 /* BinaryExpression */ &&
+            if (node.parent.kind === 192 /* BinaryExpression */ &&
                 node.parent.left === node &&
                 node.parent.operatorToken.kind === 57 /* EqualsToken */) {
                 return true;
             }
             // [a, b, c] from:
             // for([a, b, c] of expression)
-            if (node.parent.kind === 209 /* ForOfStatement */ &&
+            if (node.parent.kind === 213 /* ForOfStatement */ &&
                 node.parent.initializer === node) {
                 return true;
             }
@@ -62524,7 +65196,7 @@ var ts;
             // [x, [a, b, c] ] = someExpression
             // or
             // {x, a: {a, b, c} } = someExpression
-            if (isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.kind === 253 /* PropertyAssignment */ ? node.parent.parent : node.parent)) {
+            if (isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.kind === 257 /* PropertyAssignment */ ? node.parent.parent : node.parent)) {
                 return true;
             }
         }
@@ -62557,7 +65229,7 @@ var ts;
 /* @internal */
 (function (ts) {
     function isFirstDeclarationOfSymbolParameter(symbol) {
-        return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === 143 /* Parameter */;
+        return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === 144 /* Parameter */;
     }
     ts.isFirstDeclarationOfSymbolParameter = isFirstDeclarationOfSymbolParameter;
     var displayPartWriter = getDisplayPartWriter();
@@ -62579,8 +65251,8 @@ var ts;
             increaseIndent: function () { indent++; },
             decreaseIndent: function () { indent--; },
             clear: resetWriter,
-            trackSymbol: function () { },
-            reportInaccessibleThisError: function () { }
+            trackSymbol: ts.noop,
+            reportInaccessibleThisError: ts.noop
         };
         function writeIndent() {
             if (lineStart) {
@@ -62737,7 +65409,7 @@ var ts;
             return location.getText();
         }
         else if (ts.isStringOrNumericLiteral(location.kind) &&
-            location.parent.kind === 141 /* ComputedPropertyName */) {
+            location.parent.kind === 142 /* ComputedPropertyName */) {
             return location.text;
         }
         // Try to get the local symbol if we're dealing with an 'export default'
@@ -62749,7 +65421,7 @@ var ts;
     ts.getDeclaredName = getDeclaredName;
     function isImportOrExportSpecifierName(location) {
         return location.parent &&
-            (location.parent.kind === 235 /* ImportSpecifier */ || location.parent.kind === 239 /* ExportSpecifier */) &&
+            (location.parent.kind === 239 /* ImportSpecifier */ || location.parent.kind === 243 /* ExportSpecifier */) &&
             location.parent.propertyName === location;
     }
     ts.isImportOrExportSpecifierName = isImportOrExportSpecifierName;
@@ -62821,7 +65493,7 @@ var ts;
 (function (ts) {
     /// Classifier
     function createClassifier() {
-        var scanner = ts.createScanner(4 /* Latest */, /*skipTrivia*/ false);
+        var scanner = ts.createScanner(5 /* Latest */, /*skipTrivia*/ false);
         /// We do not have a full parser support to know when we should parse a regex or not
         /// If we consider every slash token to be a regex, we could be missing cases like "1/2/3", where
         /// we have a series of divide operator. this list allows us to be more accurate by ruling out
@@ -62864,7 +65536,7 @@ var ts;
         function canFollow(keyword1, keyword2) {
             if (ts.isAccessibilityModifier(keyword1)) {
                 if (keyword2 === 124 /* GetKeyword */ ||
-                    keyword2 === 132 /* SetKeyword */ ||
+                    keyword2 === 133 /* SetKeyword */ ||
                     keyword2 === 122 /* ConstructorKeyword */ ||
                     keyword2 === 114 /* StaticKeyword */) {
                     // Allow things like "public get", "public constructor" and "public static".
@@ -63023,10 +65695,10 @@ var ts;
                         angleBracketStack--;
                     }
                     else if (token === 118 /* AnyKeyword */ ||
-                        token === 133 /* StringKeyword */ ||
-                        token === 131 /* NumberKeyword */ ||
+                        token === 134 /* StringKeyword */ ||
+                        token === 132 /* NumberKeyword */ ||
                         token === 121 /* BooleanKeyword */ ||
-                        token === 134 /* SymbolKeyword */) {
+                        token === 135 /* 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,
@@ -63198,7 +65870,7 @@ var ts;
             }
         }
         function isKeyword(token) {
-            return token >= 71 /* FirstKeyword */ && token <= 139 /* LastKeyword */;
+            return token >= 71 /* FirstKeyword */ && token <= 140 /* LastKeyword */;
         }
         function classFromKind(token) {
             if (isKeyword(token)) {
@@ -63255,10 +65927,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 226 /* ModuleDeclaration */:
-            case 222 /* ClassDeclaration */:
-            case 223 /* InterfaceDeclaration */:
-            case 221 /* FunctionDeclaration */:
+            case 230 /* ModuleDeclaration */:
+            case 226 /* ClassDeclaration */:
+            case 227 /* InterfaceDeclaration */:
+            case 225 /* FunctionDeclaration */:
                 cancellationToken.throwIfCancellationRequested();
         }
     }
@@ -63309,7 +65981,7 @@ var ts;
              */
             function hasValueSideModule(symbol) {
                 return ts.forEach(symbol.declarations, function (declaration) {
-                    return declaration.kind === 226 /* ModuleDeclaration */ &&
+                    return declaration.kind === 230 /* ModuleDeclaration */ &&
                         ts.getModuleInstanceState(declaration) === 1 /* Instantiated */;
                 });
             }
@@ -63388,8 +66060,8 @@ var ts;
         var spanStart = span.start;
         var spanLength = span.length;
         // Make a scanner we can get trivia from.
-        var triviaScanner = ts.createScanner(4 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
-        var mergeConflictScanner = ts.createScanner(4 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
+        var triviaScanner = ts.createScanner(5 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
+        var mergeConflictScanner = ts.createScanner(5 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
         var result = [];
         processElement(sourceFile);
         return { spans: result, endOfLineState: 0 /* None */ };
@@ -63473,16 +66145,16 @@ var ts;
                     pushClassification(tag.tagName.pos, tag.tagName.end - tag.tagName.pos, 18 /* docCommentTagName */);
                     pos = tag.tagName.end;
                     switch (tag.kind) {
-                        case 275 /* JSDocParameterTag */:
+                        case 280 /* JSDocParameterTag */:
                             processJSDocParameterTag(tag);
                             break;
-                        case 278 /* JSDocTemplateTag */:
+                        case 283 /* JSDocTemplateTag */:
                             processJSDocTemplateTag(tag);
                             break;
-                        case 277 /* JSDocTypeTag */:
+                        case 282 /* JSDocTypeTag */:
                             processElement(tag.typeExpression);
                             break;
-                        case 276 /* JSDocReturnTag */:
+                        case 281 /* JSDocReturnTag */:
                             processElement(tag.typeExpression);
                             break;
                     }
@@ -63569,22 +66241,22 @@ var ts;
         }
         function tryClassifyJsxElementName(token) {
             switch (token.parent && token.parent.kind) {
-                case 244 /* JsxOpeningElement */:
+                case 248 /* JsxOpeningElement */:
                     if (token.parent.tagName === token) {
                         return 19 /* jsxOpenTagName */;
                     }
                     break;
-                case 245 /* JsxClosingElement */:
+                case 249 /* JsxClosingElement */:
                     if (token.parent.tagName === token) {
                         return 20 /* jsxCloseTagName */;
                     }
                     break;
-                case 243 /* JsxSelfClosingElement */:
+                case 247 /* JsxSelfClosingElement */:
                     if (token.parent.tagName === token) {
                         return 21 /* jsxSelfClosingTagName */;
                     }
                     break;
-                case 246 /* JsxAttribute */:
+                case 250 /* JsxAttribute */:
                     if (token.parent.name === token) {
                         return 22 /* jsxAttribute */;
                     }
@@ -63612,17 +66284,17 @@ var ts;
                 if (token) {
                     if (tokenKind === 57 /* EqualsToken */) {
                         // the '=' in a variable declaration is special cased here.
-                        if (token.parent.kind === 219 /* VariableDeclaration */ ||
-                            token.parent.kind === 146 /* PropertyDeclaration */ ||
-                            token.parent.kind === 143 /* Parameter */ ||
-                            token.parent.kind === 246 /* JsxAttribute */) {
+                        if (token.parent.kind === 223 /* VariableDeclaration */ ||
+                            token.parent.kind === 147 /* PropertyDeclaration */ ||
+                            token.parent.kind === 144 /* Parameter */ ||
+                            token.parent.kind === 250 /* JsxAttribute */) {
                             return 5 /* operator */;
                         }
                     }
-                    if (token.parent.kind === 188 /* BinaryExpression */ ||
-                        token.parent.kind === 186 /* PrefixUnaryExpression */ ||
-                        token.parent.kind === 187 /* PostfixUnaryExpression */ ||
-                        token.parent.kind === 189 /* ConditionalExpression */) {
+                    if (token.parent.kind === 192 /* BinaryExpression */ ||
+                        token.parent.kind === 190 /* PrefixUnaryExpression */ ||
+                        token.parent.kind === 191 /* PostfixUnaryExpression */ ||
+                        token.parent.kind === 193 /* ConditionalExpression */) {
                         return 5 /* operator */;
                     }
                 }
@@ -63632,7 +66304,7 @@ var ts;
                 return 4 /* numericLiteral */;
             }
             else if (tokenKind === 9 /* StringLiteral */) {
-                return token.parent.kind === 246 /* JsxAttribute */ ? 24 /* jsxAttributeStringLiteralValue */ : 6 /* stringLiteral */;
+                return token.parent.kind === 250 /* JsxAttribute */ ? 24 /* jsxAttributeStringLiteralValue */ : 6 /* stringLiteral */;
             }
             else if (tokenKind === 11 /* RegularExpressionLiteral */) {
                 // TODO: we should get another classification type for these literals.
@@ -63648,32 +66320,32 @@ var ts;
             else if (tokenKind === 70 /* Identifier */) {
                 if (token) {
                     switch (token.parent.kind) {
-                        case 222 /* ClassDeclaration */:
+                        case 226 /* ClassDeclaration */:
                             if (token.parent.name === token) {
                                 return 11 /* className */;
                             }
                             return;
-                        case 142 /* TypeParameter */:
+                        case 143 /* TypeParameter */:
                             if (token.parent.name === token) {
                                 return 15 /* typeParameterName */;
                             }
                             return;
-                        case 223 /* InterfaceDeclaration */:
+                        case 227 /* InterfaceDeclaration */:
                             if (token.parent.name === token) {
                                 return 13 /* interfaceName */;
                             }
                             return;
-                        case 225 /* EnumDeclaration */:
+                        case 229 /* EnumDeclaration */:
                             if (token.parent.name === token) {
                                 return 12 /* enumName */;
                             }
                             return;
-                        case 226 /* ModuleDeclaration */:
+                        case 230 /* ModuleDeclaration */:
                             if (token.parent.name === token) {
                                 return 14 /* moduleName */;
                             }
                             return;
-                        case 143 /* Parameter */:
+                        case 144 /* Parameter */:
                             if (token.parent.name === token) {
                                 return ts.isThisIdentifier(token) ? 3 /* keyword */ : 17 /* parameterName */;
                             }
@@ -63733,7 +66405,7 @@ var ts;
             else {
                 if (!symbols || symbols.length === 0) {
                     if (sourceFile.languageVariant === 1 /* JSX */ &&
-                        location.parent && location.parent.kind === 245 /* JsxClosingElement */) {
+                        location.parent && location.parent.kind === 249 /* JsxClosingElement */) {
                         // 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.
                         // For example:
@@ -63760,14 +66432,14 @@ var ts;
             function getJavaScriptCompletionEntries(sourceFile, position, uniqueNames) {
                 var entries = [];
                 var nameTable = ts.getNameTable(sourceFile);
-                for (var name_46 in nameTable) {
+                for (var name_42 in nameTable) {
                     // Skip identifiers produced only from the current location
-                    if (nameTable[name_46] === position) {
+                    if (nameTable[name_42] === position) {
                         continue;
                     }
-                    if (!uniqueNames[name_46]) {
-                        uniqueNames[name_46] = name_46;
-                        var displayName = getCompletionEntryDisplayName(ts.unescapeIdentifier(name_46), compilerOptions.target, /*performCharacterChecks*/ true);
+                    if (!uniqueNames[name_42]) {
+                        uniqueNames[name_42] = name_42;
+                        var displayName = getCompletionEntryDisplayName(ts.unescapeIdentifier(name_42), compilerOptions.target, /*performCharacterChecks*/ true);
                         if (displayName) {
                             var entry = {
                                 name: displayName,
@@ -63827,8 +66499,8 @@ var ts;
                 if (!node || node.kind !== 9 /* StringLiteral */) {
                     return undefined;
                 }
-                if (node.parent.kind === 253 /* PropertyAssignment */ &&
-                    node.parent.parent.kind === 172 /* ObjectLiteralExpression */ &&
+                if (node.parent.kind === 257 /* PropertyAssignment */ &&
+                    node.parent.parent.kind === 176 /* ObjectLiteralExpression */ &&
                     node.parent.name === node) {
                     // Get quoted name of properties of the object literal expression
                     // i.e. interface ConfigFiles {
@@ -63853,7 +66525,7 @@ var ts;
                     // a['/*completion position*/']
                     return getStringLiteralCompletionEntriesFromElementAccess(node.parent);
                 }
-                else if (node.parent.kind === 231 /* ImportDeclaration */ || ts.isExpressionOfExternalModuleImportEqualsDeclaration(node) || ts.isRequireCall(node.parent, false)) {
+                else if (node.parent.kind === 235 /* ImportDeclaration */ || ts.isExpressionOfExternalModuleImportEqualsDeclaration(node) || ts.isRequireCall(node.parent, false)) {
                     // Get all known external module names or complete a path to a module
                     // i.e. import * as ns from "/*completion position*/";
                     //      import x = require("/*completion position*/");
@@ -63925,7 +66597,7 @@ var ts;
                 if (!type) {
                     return;
                 }
-                if (type.flags & 524288 /* Union */) {
+                if (type.flags & 65536 /* Union */) {
                     ts.forEach(type.types, function (t) { return addStringLiteralCompletionsFromType(t, result); });
                 }
                 else {
@@ -64280,11 +66952,11 @@ var ts;
                     if (currentConfigPath) {
                         paths.push(currentConfigPath);
                         currentDir = ts.getDirectoryPath(currentConfigPath);
-                        var parent_16 = ts.getDirectoryPath(currentDir);
-                        if (currentDir === parent_16) {
+                        var parent_14 = ts.getDirectoryPath(currentDir);
+                        if (currentDir === parent_14) {
                             break;
                         }
-                        currentDir = parent_16;
+                        currentDir = parent_14;
                     }
                     else {
                         break;
@@ -64436,9 +67108,9 @@ var ts;
                         isJsDocTagName = true;
                     }
                     switch (tag.kind) {
-                        case 277 /* JSDocTypeTag */:
-                        case 275 /* JSDocParameterTag */:
-                        case 276 /* JSDocReturnTag */:
+                        case 282 /* JSDocTypeTag */:
+                        case 280 /* JSDocParameterTag */:
+                        case 281 /* JSDocReturnTag */:
                             var tagWithExpression = tag;
                             if (tagWithExpression.typeExpression) {
                                 insideJsDocTagExpression = tagWithExpression.typeExpression.pos < position && position < tagWithExpression.typeExpression.end;
@@ -64483,13 +67155,13 @@ var ts;
                     log("Returning an empty list because completion was requested in an invalid position.");
                     return undefined;
                 }
-                var parent_17 = contextToken.parent, kind = contextToken.kind;
+                var parent_15 = contextToken.parent, kind = contextToken.kind;
                 if (kind === 22 /* DotToken */) {
-                    if (parent_17.kind === 173 /* PropertyAccessExpression */) {
+                    if (parent_15.kind === 177 /* PropertyAccessExpression */) {
                         node = contextToken.parent.expression;
                         isRightOfDot = true;
                     }
-                    else if (parent_17.kind === 140 /* QualifiedName */) {
+                    else if (parent_15.kind === 141 /* QualifiedName */) {
                         node = contextToken.parent.left;
                         isRightOfDot = true;
                     }
@@ -64504,7 +67176,7 @@ var ts;
                         isRightOfOpenTag = true;
                         location = contextToken;
                     }
-                    else if (kind === 40 /* SlashToken */ && contextToken.parent.kind === 245 /* JsxClosingElement */) {
+                    else if (kind === 40 /* SlashToken */ && contextToken.parent.kind === 249 /* JsxClosingElement */) {
                         isStartingCloseTag = true;
                         location = contextToken;
                     }
@@ -64553,7 +67225,7 @@ var ts;
                 isGlobalCompletion = false;
                 isMemberCompletion = true;
                 isNewIdentifierLocation = false;
-                if (node.kind === 70 /* Identifier */ || node.kind === 140 /* QualifiedName */ || node.kind === 173 /* PropertyAccessExpression */) {
+                if (node.kind === 70 /* Identifier */ || node.kind === 141 /* QualifiedName */ || node.kind === 177 /* PropertyAccessExpression */) {
                     var symbol = typeChecker.getSymbolAtLocation(node);
                     // This is an alias, follow what it aliases
                     if (symbol && symbol.flags & 8388608 /* Alias */) {
@@ -64581,7 +67253,7 @@ var ts;
                             symbols.push(symbol);
                         }
                     }
-                    if (isJavaScriptFile && type.flags & 524288 /* Union */) {
+                    if (isJavaScriptFile && type.flags & 65536 /* Union */) {
                         // In javascript files, for union types, we don't just get the members that
                         // the individual types have in common, we also include all the members that
                         // each individual type has.  This is because we're going to add all identifiers
@@ -64609,7 +67281,7 @@ var ts;
                 }
                 if (jsxContainer = tryGetContainingJsxElement(contextToken)) {
                     var attrsType = void 0;
-                    if ((jsxContainer.kind === 243 /* JsxSelfClosingElement */) || (jsxContainer.kind === 244 /* JsxOpeningElement */)) {
+                    if ((jsxContainer.kind === 247 /* JsxSelfClosingElement */) || (jsxContainer.kind === 248 /* JsxOpeningElement */)) {
                         // Cursor is inside a JSX self-closing element or opening element
                         attrsType = typeChecker.getJsxElementAttributesType(jsxContainer);
                         if (attrsType) {
@@ -64657,9 +67329,9 @@ var ts;
                 var scopeNode = getScopeNode(contextToken, adjustedPosition, sourceFile) || sourceFile;
                 if (scopeNode) {
                     isGlobalCompletion =
-                        scopeNode.kind === 256 /* SourceFile */ ||
-                            scopeNode.kind === 190 /* TemplateExpression */ ||
-                            scopeNode.kind === 248 /* JsxExpression */ ||
+                        scopeNode.kind === 261 /* SourceFile */ ||
+                            scopeNode.kind === 194 /* TemplateExpression */ ||
+                            scopeNode.kind === 252 /* JsxExpression */ ||
                             ts.isStatement(scopeNode);
                 }
                 /// TODO filter meaning based on the current context
@@ -64692,11 +67364,11 @@ var ts;
                     return true;
                 }
                 if (contextToken.kind === 28 /* GreaterThanToken */ && contextToken.parent) {
-                    if (contextToken.parent.kind === 244 /* JsxOpeningElement */) {
+                    if (contextToken.parent.kind === 248 /* JsxOpeningElement */) {
                         return true;
                     }
-                    if (contextToken.parent.kind === 245 /* JsxClosingElement */ || contextToken.parent.kind === 243 /* JsxSelfClosingElement */) {
-                        return contextToken.parent.parent && contextToken.parent.parent.kind === 242 /* JsxElement */;
+                    if (contextToken.parent.kind === 249 /* JsxClosingElement */ || contextToken.parent.kind === 247 /* JsxSelfClosingElement */) {
+                        return contextToken.parent.parent && contextToken.parent.parent.kind === 246 /* JsxElement */;
                     }
                 }
                 return false;
@@ -64706,40 +67378,40 @@ var ts;
                     var containingNodeKind = previousToken.parent.kind;
                     switch (previousToken.kind) {
                         case 25 /* CommaToken */:
-                            return containingNodeKind === 175 /* CallExpression */ // func( a, |
-                                || containingNodeKind === 149 /* Constructor */ // constructor( a, |   /* public, protected, private keywords are allowed here, so show completion */
-                                || containingNodeKind === 176 /* NewExpression */ // new C(a, |
-                                || containingNodeKind === 171 /* ArrayLiteralExpression */ // [a, |
-                                || containingNodeKind === 188 /* BinaryExpression */ // const x = (a, |
-                                || containingNodeKind === 157 /* FunctionType */; // var x: (s: string, list|
+                            return containingNodeKind === 179 /* CallExpression */ // func( a, |
+                                || containingNodeKind === 150 /* Constructor */ // constructor( a, |   /* public, protected, private keywords are allowed here, so show completion */
+                                || containingNodeKind === 180 /* NewExpression */ // new C(a, |
+                                || containingNodeKind === 175 /* ArrayLiteralExpression */ // [a, |
+                                || containingNodeKind === 192 /* BinaryExpression */ // const x = (a, |
+                                || containingNodeKind === 158 /* FunctionType */; // var x: (s: string, list|
                         case 18 /* OpenParenToken */:
-                            return containingNodeKind === 175 /* CallExpression */ // func( |
-                                || containingNodeKind === 149 /* Constructor */ // constructor( |
-                                || containingNodeKind === 176 /* NewExpression */ // new C(a|
-                                || containingNodeKind === 179 /* ParenthesizedExpression */ // const x = (a|
-                                || containingNodeKind === 165 /* ParenthesizedType */; // function F(pred: (a| /* this can become an arrow function, where 'a' is the argument */
+                            return containingNodeKind === 179 /* CallExpression */ // func( |
+                                || containingNodeKind === 150 /* Constructor */ // constructor( |
+                                || containingNodeKind === 180 /* NewExpression */ // new C(a|
+                                || containingNodeKind === 183 /* ParenthesizedExpression */ // const x = (a|
+                                || containingNodeKind === 166 /* ParenthesizedType */; // function F(pred: (a| /* this can become an arrow function, where 'a' is the argument */
                         case 20 /* OpenBracketToken */:
-                            return containingNodeKind === 171 /* ArrayLiteralExpression */ // [ |
-                                || containingNodeKind === 154 /* IndexSignature */ // [ | : string ]
-                                || containingNodeKind === 141 /* ComputedPropertyName */; // [ |    /* this can become an index signature */
-                        case 126 /* ModuleKeyword */: // module |
-                        case 127 /* NamespaceKeyword */:
+                            return containingNodeKind === 175 /* ArrayLiteralExpression */ // [ |
+                                || containingNodeKind === 155 /* IndexSignature */ // [ | : string ]
+                                || containingNodeKind === 142 /* ComputedPropertyName */; // [ |    /* this can become an index signature */
+                        case 127 /* ModuleKeyword */: // module |
+                        case 128 /* NamespaceKeyword */:
                             return true;
                         case 22 /* DotToken */:
-                            return containingNodeKind === 226 /* ModuleDeclaration */; // module A.|
+                            return containingNodeKind === 230 /* ModuleDeclaration */; // module A.|
                         case 16 /* OpenBraceToken */:
-                            return containingNodeKind === 222 /* ClassDeclaration */; // class A{ |
+                            return containingNodeKind === 226 /* ClassDeclaration */; // class A{ |
                         case 57 /* EqualsToken */:
-                            return containingNodeKind === 219 /* VariableDeclaration */ // const x = a|
-                                || containingNodeKind === 188 /* BinaryExpression */; // x = a|
+                            return containingNodeKind === 223 /* VariableDeclaration */ // const x = a|
+                                || containingNodeKind === 192 /* BinaryExpression */; // x = a|
                         case 13 /* TemplateHead */:
-                            return containingNodeKind === 190 /* TemplateExpression */; // `aa ${|
+                            return containingNodeKind === 194 /* TemplateExpression */; // `aa ${|
                         case 14 /* TemplateMiddle */:
-                            return containingNodeKind === 198 /* TemplateSpan */; // `aa ${10} dd ${|
+                            return containingNodeKind === 202 /* TemplateSpan */; // `aa ${10} dd ${|
                         case 113 /* PublicKeyword */:
                         case 111 /* PrivateKeyword */:
                         case 112 /* ProtectedKeyword */:
-                            return containingNodeKind === 146 /* PropertyDeclaration */; // class A{ public |
+                            return containingNodeKind === 147 /* PropertyDeclaration */; // class A{ public |
                     }
                     // Previous token may have been a keyword that was converted to an identifier.
                     switch (previousToken.getText()) {
@@ -64782,7 +67454,7 @@ var ts;
                 isMemberCompletion = true;
                 var typeForObject;
                 var existingMembers;
-                if (objectLikeContainer.kind === 172 /* ObjectLiteralExpression */) {
+                if (objectLikeContainer.kind === 176 /* ObjectLiteralExpression */) {
                     // We are completing on contextual types, but may also include properties
                     // other than those within the declared type.
                     isNewIdentifierLocation = true;
@@ -64792,7 +67464,7 @@ var ts;
                     typeForObject = typeForObject && typeForObject.getNonNullableType();
                     existingMembers = objectLikeContainer.properties;
                 }
-                else if (objectLikeContainer.kind === 168 /* ObjectBindingPattern */) {
+                else if (objectLikeContainer.kind === 172 /* ObjectBindingPattern */) {
                     // We are *only* completing on properties from the type being destructured.
                     isNewIdentifierLocation = false;
                     var rootDeclaration = ts.getRootDeclaration(objectLikeContainer.parent);
@@ -64803,11 +67475,11 @@ var ts;
                         // 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 = !!(rootDeclaration.initializer || rootDeclaration.type);
-                        if (!canGetType && rootDeclaration.kind === 143 /* Parameter */) {
+                        if (!canGetType && rootDeclaration.kind === 144 /* Parameter */) {
                             if (ts.isExpression(rootDeclaration.parent)) {
                                 canGetType = !!typeChecker.getContextualType(rootDeclaration.parent);
                             }
-                            else if (rootDeclaration.parent.kind === 148 /* MethodDeclaration */ || rootDeclaration.parent.kind === 151 /* SetAccessor */) {
+                            else if (rootDeclaration.parent.kind === 149 /* MethodDeclaration */ || rootDeclaration.parent.kind === 152 /* SetAccessor */) {
                                 canGetType = ts.isExpression(rootDeclaration.parent.parent) && !!typeChecker.getContextualType(rootDeclaration.parent.parent);
                             }
                         }
@@ -64849,9 +67521,9 @@ var ts;
              * @returns true if 'symbols' was successfully populated; false otherwise.
              */
             function tryGetImportOrExportClauseCompletionSymbols(namedImportsOrExports) {
-                var declarationKind = namedImportsOrExports.kind === 234 /* NamedImports */ ?
-                    231 /* ImportDeclaration */ :
-                    237 /* ExportDeclaration */;
+                var declarationKind = namedImportsOrExports.kind === 238 /* NamedImports */ ?
+                    235 /* ImportDeclaration */ :
+                    241 /* ExportDeclaration */;
                 var importOrExportDeclaration = ts.getAncestor(namedImportsOrExports, declarationKind);
                 var moduleSpecifier = importOrExportDeclaration.moduleSpecifier;
                 if (!moduleSpecifier) {
@@ -64876,9 +67548,9 @@ var ts;
                     switch (contextToken.kind) {
                         case 16 /* OpenBraceToken */: // const x = { |
                         case 25 /* CommaToken */:
-                            var parent_18 = contextToken.parent;
-                            if (parent_18 && (parent_18.kind === 172 /* ObjectLiteralExpression */ || parent_18.kind === 168 /* ObjectBindingPattern */)) {
-                                return parent_18;
+                            var parent_16 = contextToken.parent;
+                            if (parent_16 && (parent_16.kind === 176 /* ObjectLiteralExpression */ || parent_16.kind === 172 /* ObjectBindingPattern */)) {
+                                return parent_16;
                             }
                             break;
                     }
@@ -64895,8 +67567,8 @@ var ts;
                         case 16 /* OpenBraceToken */: // import { |
                         case 25 /* CommaToken */:
                             switch (contextToken.parent.kind) {
-                                case 234 /* NamedImports */:
-                                case 238 /* NamedExports */:
+                                case 238 /* NamedImports */:
+                                case 242 /* NamedExports */:
                                     return contextToken.parent;
                             }
                     }
@@ -64905,37 +67577,37 @@ var ts;
             }
             function tryGetContainingJsxElement(contextToken) {
                 if (contextToken) {
-                    var parent_19 = contextToken.parent;
+                    var parent_17 = contextToken.parent;
                     switch (contextToken.kind) {
                         case 27 /* LessThanSlashToken */:
                         case 40 /* SlashToken */:
                         case 70 /* Identifier */:
-                        case 246 /* JsxAttribute */:
-                        case 247 /* JsxSpreadAttribute */:
-                            if (parent_19 && (parent_19.kind === 243 /* JsxSelfClosingElement */ || parent_19.kind === 244 /* JsxOpeningElement */)) {
-                                return parent_19;
+                        case 250 /* JsxAttribute */:
+                        case 251 /* JsxSpreadAttribute */:
+                            if (parent_17 && (parent_17.kind === 247 /* JsxSelfClosingElement */ || parent_17.kind === 248 /* JsxOpeningElement */)) {
+                                return parent_17;
                             }
-                            else if (parent_19.kind === 246 /* JsxAttribute */) {
-                                return parent_19.parent;
+                            else if (parent_17.kind === 250 /* JsxAttribute */) {
+                                return parent_17.parent;
                             }
                             break;
                         // The context token is the closing } or " of an attribute, which means
                         // its parent is a JsxExpression, whose parent is a JsxAttribute,
                         // whose parent is a JsxOpeningLikeElement
                         case 9 /* StringLiteral */:
-                            if (parent_19 && ((parent_19.kind === 246 /* JsxAttribute */) || (parent_19.kind === 247 /* JsxSpreadAttribute */))) {
-                                return parent_19.parent;
+                            if (parent_17 && ((parent_17.kind === 250 /* JsxAttribute */) || (parent_17.kind === 251 /* JsxSpreadAttribute */))) {
+                                return parent_17.parent;
                             }
                             break;
                         case 17 /* CloseBraceToken */:
-                            if (parent_19 &&
-                                parent_19.kind === 248 /* JsxExpression */ &&
-                                parent_19.parent &&
-                                (parent_19.parent.kind === 246 /* JsxAttribute */)) {
-                                return parent_19.parent.parent;
+                            if (parent_17 &&
+                                parent_17.kind === 252 /* JsxExpression */ &&
+                                parent_17.parent &&
+                                (parent_17.parent.kind === 250 /* JsxAttribute */)) {
+                                return parent_17.parent.parent;
                             }
-                            if (parent_19 && parent_19.kind === 247 /* JsxSpreadAttribute */) {
-                                return parent_19.parent;
+                            if (parent_17 && parent_17.kind === 251 /* JsxSpreadAttribute */) {
+                                return parent_17.parent;
                             }
                             break;
                     }
@@ -64944,16 +67616,16 @@ var ts;
             }
             function isFunction(kind) {
                 switch (kind) {
-                    case 180 /* FunctionExpression */:
-                    case 181 /* ArrowFunction */:
-                    case 221 /* FunctionDeclaration */:
-                    case 148 /* MethodDeclaration */:
-                    case 147 /* MethodSignature */:
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
-                    case 152 /* CallSignature */:
-                    case 153 /* ConstructSignature */:
-                    case 154 /* IndexSignature */:
+                    case 184 /* FunctionExpression */:
+                    case 185 /* ArrowFunction */:
+                    case 225 /* FunctionDeclaration */:
+                    case 149 /* MethodDeclaration */:
+                    case 148 /* MethodSignature */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* SetAccessor */:
+                    case 153 /* CallSignature */:
+                    case 154 /* ConstructSignature */:
+                    case 155 /* IndexSignature */:
                         return true;
                 }
                 return false;
@@ -64965,66 +67637,66 @@ var ts;
                 var containingNodeKind = contextToken.parent.kind;
                 switch (contextToken.kind) {
                     case 25 /* CommaToken */:
-                        return containingNodeKind === 219 /* VariableDeclaration */ ||
-                            containingNodeKind === 220 /* VariableDeclarationList */ ||
-                            containingNodeKind === 201 /* VariableStatement */ ||
-                            containingNodeKind === 225 /* EnumDeclaration */ ||
+                        return containingNodeKind === 223 /* VariableDeclaration */ ||
+                            containingNodeKind === 224 /* VariableDeclarationList */ ||
+                            containingNodeKind === 205 /* VariableStatement */ ||
+                            containingNodeKind === 229 /* EnumDeclaration */ ||
                             isFunction(containingNodeKind) ||
-                            containingNodeKind === 222 /* ClassDeclaration */ ||
-                            containingNodeKind === 193 /* ClassExpression */ ||
-                            containingNodeKind === 223 /* InterfaceDeclaration */ ||
-                            containingNodeKind === 169 /* ArrayBindingPattern */ ||
-                            containingNodeKind === 224 /* TypeAliasDeclaration */; // type Map, K, |
+                            containingNodeKind === 226 /* ClassDeclaration */ ||
+                            containingNodeKind === 197 /* ClassExpression */ ||
+                            containingNodeKind === 227 /* InterfaceDeclaration */ ||
+                            containingNodeKind === 173 /* ArrayBindingPattern */ ||
+                            containingNodeKind === 228 /* TypeAliasDeclaration */; // type Map, K, |
                     case 22 /* DotToken */:
-                        return containingNodeKind === 169 /* ArrayBindingPattern */; // var [.|
+                        return containingNodeKind === 173 /* ArrayBindingPattern */; // var [.|
                     case 55 /* ColonToken */:
-                        return containingNodeKind === 170 /* BindingElement */; // var {x :html|
+                        return containingNodeKind === 174 /* BindingElement */; // var {x :html|
                     case 20 /* OpenBracketToken */:
-                        return containingNodeKind === 169 /* ArrayBindingPattern */; // var [x|
+                        return containingNodeKind === 173 /* ArrayBindingPattern */; // var [x|
                     case 18 /* OpenParenToken */:
-                        return containingNodeKind === 252 /* CatchClause */ ||
+                        return containingNodeKind === 256 /* CatchClause */ ||
                             isFunction(containingNodeKind);
                     case 16 /* OpenBraceToken */:
-                        return containingNodeKind === 225 /* EnumDeclaration */ ||
-                            containingNodeKind === 223 /* InterfaceDeclaration */ ||
-                            containingNodeKind === 160 /* TypeLiteral */; // const x : { |
+                        return containingNodeKind === 229 /* EnumDeclaration */ ||
+                            containingNodeKind === 227 /* InterfaceDeclaration */ ||
+                            containingNodeKind === 161 /* TypeLiteral */; // const x : { |
                     case 24 /* SemicolonToken */:
-                        return containingNodeKind === 145 /* PropertySignature */ &&
+                        return containingNodeKind === 146 /* PropertySignature */ &&
                             contextToken.parent && contextToken.parent.parent &&
-                            (contextToken.parent.parent.kind === 223 /* InterfaceDeclaration */ ||
-                                contextToken.parent.parent.kind === 160 /* TypeLiteral */); // const x : { a; |
+                            (contextToken.parent.parent.kind === 227 /* InterfaceDeclaration */ ||
+                                contextToken.parent.parent.kind === 161 /* TypeLiteral */); // const x : { a; |
                     case 26 /* LessThanToken */:
-                        return containingNodeKind === 222 /* ClassDeclaration */ ||
-                            containingNodeKind === 193 /* ClassExpression */ ||
-                            containingNodeKind === 223 /* InterfaceDeclaration */ ||
-                            containingNodeKind === 224 /* TypeAliasDeclaration */ ||
+                        return containingNodeKind === 226 /* ClassDeclaration */ ||
+                            containingNodeKind === 197 /* ClassExpression */ ||
+                            containingNodeKind === 227 /* InterfaceDeclaration */ ||
+                            containingNodeKind === 228 /* TypeAliasDeclaration */ ||
                             isFunction(containingNodeKind);
                     case 114 /* StaticKeyword */:
-                        return containingNodeKind === 146 /* PropertyDeclaration */;
+                        return containingNodeKind === 147 /* PropertyDeclaration */;
                     case 23 /* DotDotDotToken */:
-                        return containingNodeKind === 143 /* Parameter */ ||
+                        return containingNodeKind === 144 /* Parameter */ ||
                             (contextToken.parent && contextToken.parent.parent &&
-                                contextToken.parent.parent.kind === 169 /* ArrayBindingPattern */); // var [...z|
+                                contextToken.parent.parent.kind === 173 /* ArrayBindingPattern */); // var [...z|
                     case 113 /* PublicKeyword */:
                     case 111 /* PrivateKeyword */:
                     case 112 /* ProtectedKeyword */:
-                        return containingNodeKind === 143 /* Parameter */;
+                        return containingNodeKind === 144 /* Parameter */;
                     case 117 /* AsKeyword */:
-                        return containingNodeKind === 235 /* ImportSpecifier */ ||
-                            containingNodeKind === 239 /* ExportSpecifier */ ||
-                            containingNodeKind === 233 /* NamespaceImport */;
+                        return containingNodeKind === 239 /* ImportSpecifier */ ||
+                            containingNodeKind === 243 /* ExportSpecifier */ ||
+                            containingNodeKind === 237 /* NamespaceImport */;
                     case 74 /* ClassKeyword */:
                     case 82 /* EnumKeyword */:
                     case 108 /* InterfaceKeyword */:
                     case 88 /* FunctionKeyword */:
                     case 103 /* VarKeyword */:
                     case 124 /* GetKeyword */:
-                    case 132 /* SetKeyword */:
+                    case 133 /* SetKeyword */:
                     case 90 /* ImportKeyword */:
                     case 109 /* LetKeyword */:
                     case 75 /* ConstKeyword */:
                     case 115 /* YieldKeyword */:
-                    case 135 /* TypeKeyword */:
+                    case 136 /* TypeKeyword */:
                         return true;
                 }
                 // Previous token may have been a keyword that was converted to an identifier.
@@ -65072,8 +67744,8 @@ var ts;
                     if (element.getStart() <= position && position <= element.getEnd()) {
                         continue;
                     }
-                    var name_47 = element.propertyName || element.name;
-                    existingImportsOrExports[name_47.text] = true;
+                    var name_43 = element.propertyName || element.name;
+                    existingImportsOrExports[name_43.text] = true;
                 }
                 if (!ts.someProperties(existingImportsOrExports)) {
                     return ts.filter(exportsOfModule, function (e) { return e.name !== "default"; });
@@ -65094,10 +67766,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 !== 253 /* PropertyAssignment */ &&
-                        m.kind !== 254 /* ShorthandPropertyAssignment */ &&
-                        m.kind !== 170 /* BindingElement */ &&
-                        m.kind !== 148 /* MethodDeclaration */) {
+                    if (m.kind !== 257 /* PropertyAssignment */ &&
+                        m.kind !== 258 /* ShorthandPropertyAssignment */ &&
+                        m.kind !== 174 /* BindingElement */ &&
+                        m.kind !== 149 /* MethodDeclaration */ &&
+                        m.kind !== 151 /* GetAccessor */ &&
+                        m.kind !== 152 /* SetAccessor */) {
                         continue;
                     }
                     // If this is the current item we are editing right now, do not filter it out
@@ -65105,7 +67779,7 @@ var ts;
                         continue;
                     }
                     var existingName = void 0;
-                    if (m.kind === 170 /* BindingElement */ && m.propertyName) {
+                    if (m.kind === 174 /* BindingElement */ && m.propertyName) {
                         // include only identifiers in completion list
                         if (m.propertyName.kind === 70 /* Identifier */) {
                             existingName = m.propertyName.text;
@@ -65135,7 +67809,7 @@ var ts;
                     if (attr.getStart() <= position && position <= attr.getEnd()) {
                         continue;
                     }
-                    if (attr.kind === 246 /* JsxAttribute */) {
+                    if (attr.kind === 250 /* JsxAttribute */) {
                         seenNames[attr.name.text] = true;
                     }
                 }
@@ -65185,7 +67859,7 @@ var ts;
         }
         // A cache of completion entries for keywords, these do not change between sessions
         var keywordCompletions = [];
-        for (var i = 71 /* FirstKeyword */; i <= 139 /* LastKeyword */; i++) {
+        for (var i = 71 /* FirstKeyword */; i <= 140 /* LastKeyword */; i++) {
             keywordCompletions.push({
                 name: ts.tokenToString(i),
                 kind: ts.ScriptElementKind.keyword,
@@ -65262,7 +67936,7 @@ var ts;
             function getSemanticDocumentHighlights(node) {
                 if (node.kind === 70 /* Identifier */ ||
                     node.kind === 98 /* ThisKeyword */ ||
-                    node.kind === 166 /* ThisType */ ||
+                    node.kind === 167 /* ThisType */ ||
                     node.kind === 96 /* SuperKeyword */ ||
                     node.kind === 9 /* StringLiteral */ ||
                     ts.isLiteralNameOfPropertyDeclarationOrIndexAccess(node)) {
@@ -65316,75 +67990,75 @@ var ts;
                         switch (node.kind) {
                             case 89 /* IfKeyword */:
                             case 81 /* ElseKeyword */:
-                                if (hasKind(node.parent, 204 /* IfStatement */)) {
+                                if (hasKind(node.parent, 208 /* IfStatement */)) {
                                     return getIfElseOccurrences(node.parent);
                                 }
                                 break;
                             case 95 /* ReturnKeyword */:
-                                if (hasKind(node.parent, 212 /* ReturnStatement */)) {
+                                if (hasKind(node.parent, 216 /* ReturnStatement */)) {
                                     return getReturnOccurrences(node.parent);
                                 }
                                 break;
                             case 99 /* ThrowKeyword */:
-                                if (hasKind(node.parent, 216 /* ThrowStatement */)) {
+                                if (hasKind(node.parent, 220 /* ThrowStatement */)) {
                                     return getThrowOccurrences(node.parent);
                                 }
                                 break;
                             case 73 /* CatchKeyword */:
-                                if (hasKind(parent(parent(node)), 217 /* TryStatement */)) {
+                                if (hasKind(parent(parent(node)), 221 /* TryStatement */)) {
                                     return getTryCatchFinallyOccurrences(node.parent.parent);
                                 }
                                 break;
                             case 101 /* TryKeyword */:
                             case 86 /* FinallyKeyword */:
-                                if (hasKind(parent(node), 217 /* TryStatement */)) {
+                                if (hasKind(parent(node), 221 /* TryStatement */)) {
                                     return getTryCatchFinallyOccurrences(node.parent);
                                 }
                                 break;
                             case 97 /* SwitchKeyword */:
-                                if (hasKind(node.parent, 214 /* SwitchStatement */)) {
+                                if (hasKind(node.parent, 218 /* SwitchStatement */)) {
                                     return getSwitchCaseDefaultOccurrences(node.parent);
                                 }
                                 break;
                             case 72 /* CaseKeyword */:
                             case 78 /* DefaultKeyword */:
-                                if (hasKind(parent(parent(parent(node))), 214 /* SwitchStatement */)) {
+                                if (hasKind(parent(parent(parent(node))), 218 /* SwitchStatement */)) {
                                     return getSwitchCaseDefaultOccurrences(node.parent.parent.parent);
                                 }
                                 break;
                             case 71 /* BreakKeyword */:
                             case 76 /* ContinueKeyword */:
-                                if (hasKind(node.parent, 211 /* BreakStatement */) || hasKind(node.parent, 210 /* ContinueStatement */)) {
+                                if (hasKind(node.parent, 215 /* BreakStatement */) || hasKind(node.parent, 214 /* ContinueStatement */)) {
                                     return getBreakOrContinueStatementOccurrences(node.parent);
                                 }
                                 break;
                             case 87 /* ForKeyword */:
-                                if (hasKind(node.parent, 207 /* ForStatement */) ||
-                                    hasKind(node.parent, 208 /* ForInStatement */) ||
-                                    hasKind(node.parent, 209 /* ForOfStatement */)) {
+                                if (hasKind(node.parent, 211 /* ForStatement */) ||
+                                    hasKind(node.parent, 212 /* ForInStatement */) ||
+                                    hasKind(node.parent, 213 /* ForOfStatement */)) {
                                     return getLoopBreakContinueOccurrences(node.parent);
                                 }
                                 break;
                             case 105 /* WhileKeyword */:
                             case 80 /* DoKeyword */:
-                                if (hasKind(node.parent, 206 /* WhileStatement */) || hasKind(node.parent, 205 /* DoStatement */)) {
+                                if (hasKind(node.parent, 210 /* WhileStatement */) || hasKind(node.parent, 209 /* DoStatement */)) {
                                     return getLoopBreakContinueOccurrences(node.parent);
                                 }
                                 break;
                             case 122 /* ConstructorKeyword */:
-                                if (hasKind(node.parent, 149 /* Constructor */)) {
+                                if (hasKind(node.parent, 150 /* Constructor */)) {
                                     return getConstructorOccurrences(node.parent);
                                 }
                                 break;
                             case 124 /* GetKeyword */:
-                            case 132 /* SetKeyword */:
-                                if (hasKind(node.parent, 150 /* GetAccessor */) || hasKind(node.parent, 151 /* SetAccessor */)) {
+                            case 133 /* SetKeyword */:
+                                if (hasKind(node.parent, 151 /* GetAccessor */) || hasKind(node.parent, 152 /* SetAccessor */)) {
                                     return getGetAndSetOccurrences(node.parent);
                                 }
                                 break;
                             default:
                                 if (ts.isModifierKind(node.kind) && node.parent &&
-                                    (ts.isDeclaration(node.parent) || node.parent.kind === 201 /* VariableStatement */)) {
+                                    (ts.isDeclaration(node.parent) || node.parent.kind === 205 /* VariableStatement */)) {
                                     return getModifierOccurrences(node.kind, node.parent);
                                 }
                         }
@@ -65400,10 +68074,10 @@ var ts;
                     aggregate(node);
                     return statementAccumulator;
                     function aggregate(node) {
-                        if (node.kind === 216 /* ThrowStatement */) {
+                        if (node.kind === 220 /* ThrowStatement */) {
                             statementAccumulator.push(node);
                         }
-                        else if (node.kind === 217 /* TryStatement */) {
+                        else if (node.kind === 221 /* TryStatement */) {
                             var tryStatement = node;
                             if (tryStatement.catchClause) {
                                 aggregate(tryStatement.catchClause);
@@ -65430,19 +68104,19 @@ var ts;
                 function getThrowStatementOwner(throwStatement) {
                     var child = throwStatement;
                     while (child.parent) {
-                        var parent_20 = child.parent;
-                        if (ts.isFunctionBlock(parent_20) || parent_20.kind === 256 /* SourceFile */) {
-                            return parent_20;
+                        var parent_18 = child.parent;
+                        if (ts.isFunctionBlock(parent_18) || parent_18.kind === 261 /* SourceFile */) {
+                            return parent_18;
                         }
                         // A throw-statement is only owned by a try-statement if the try-statement has
                         // a catch clause, and if the throw-statement occurs within the try block.
-                        if (parent_20.kind === 217 /* TryStatement */) {
-                            var tryStatement = parent_20;
+                        if (parent_18.kind === 221 /* TryStatement */) {
+                            var tryStatement = parent_18;
                             if (tryStatement.tryBlock === child && tryStatement.catchClause) {
                                 return child;
                             }
                         }
-                        child = parent_20;
+                        child = parent_18;
                     }
                     return undefined;
                 }
@@ -65451,7 +68125,7 @@ var ts;
                     aggregate(node);
                     return statementAccumulator;
                     function aggregate(node) {
-                        if (node.kind === 211 /* BreakStatement */ || node.kind === 210 /* ContinueStatement */) {
+                        if (node.kind === 215 /* BreakStatement */ || node.kind === 214 /* ContinueStatement */) {
                             statementAccumulator.push(node);
                         }
                         else if (!ts.isFunctionLike(node)) {
@@ -65466,16 +68140,16 @@ var ts;
                 function getBreakOrContinueOwner(statement) {
                     for (var node_1 = statement.parent; node_1; node_1 = node_1.parent) {
                         switch (node_1.kind) {
-                            case 214 /* SwitchStatement */:
-                                if (statement.kind === 210 /* ContinueStatement */) {
+                            case 218 /* SwitchStatement */:
+                                if (statement.kind === 214 /* ContinueStatement */) {
                                     continue;
                                 }
                             // Fall through.
-                            case 207 /* ForStatement */:
-                            case 208 /* ForInStatement */:
-                            case 209 /* ForOfStatement */:
-                            case 206 /* WhileStatement */:
-                            case 205 /* DoStatement */:
+                            case 211 /* ForStatement */:
+                            case 212 /* ForInStatement */:
+                            case 213 /* ForOfStatement */:
+                            case 210 /* WhileStatement */:
+                            case 209 /* DoStatement */:
                                 if (!statement.label || isLabeledBy(node_1, statement.label.text)) {
                                     return node_1;
                                 }
@@ -65494,24 +68168,24 @@ var ts;
                     var container = declaration.parent;
                     // Make sure we only highlight the keyword when it makes sense to do so.
                     if (ts.isAccessibilityModifier(modifier)) {
-                        if (!(container.kind === 222 /* ClassDeclaration */ ||
-                            container.kind === 193 /* ClassExpression */ ||
-                            (declaration.kind === 143 /* Parameter */ && hasKind(container, 149 /* Constructor */)))) {
+                        if (!(container.kind === 226 /* ClassDeclaration */ ||
+                            container.kind === 197 /* ClassExpression */ ||
+                            (declaration.kind === 144 /* Parameter */ && hasKind(container, 150 /* Constructor */)))) {
                             return undefined;
                         }
                     }
                     else if (modifier === 114 /* StaticKeyword */) {
-                        if (!(container.kind === 222 /* ClassDeclaration */ || container.kind === 193 /* ClassExpression */)) {
+                        if (!(container.kind === 226 /* ClassDeclaration */ || container.kind === 197 /* ClassExpression */)) {
                             return undefined;
                         }
                     }
                     else if (modifier === 83 /* ExportKeyword */ || modifier === 123 /* DeclareKeyword */) {
-                        if (!(container.kind === 227 /* ModuleBlock */ || container.kind === 256 /* SourceFile */)) {
+                        if (!(container.kind === 231 /* ModuleBlock */ || container.kind === 261 /* SourceFile */)) {
                             return undefined;
                         }
                     }
                     else if (modifier === 116 /* AbstractKeyword */) {
-                        if (!(container.kind === 222 /* ClassDeclaration */ || declaration.kind === 222 /* ClassDeclaration */)) {
+                        if (!(container.kind === 226 /* ClassDeclaration */ || declaration.kind === 226 /* ClassDeclaration */)) {
                             return undefined;
                         }
                     }
@@ -65523,8 +68197,8 @@ var ts;
                     var modifierFlag = getFlagFromModifier(modifier);
                     var nodes;
                     switch (container.kind) {
-                        case 227 /* ModuleBlock */:
-                        case 256 /* SourceFile */:
+                        case 231 /* ModuleBlock */:
+                        case 261 /* SourceFile */:
                             // Container is either a class declaration or the declaration is a classDeclaration
                             if (modifierFlag & 128 /* Abstract */) {
                                 nodes = declaration.members.concat(declaration);
@@ -65533,17 +68207,17 @@ var ts;
                                 nodes = container.statements;
                             }
                             break;
-                        case 149 /* Constructor */:
+                        case 150 /* Constructor */:
                             nodes = container.parameters.concat(container.parent.members);
                             break;
-                        case 222 /* ClassDeclaration */:
-                        case 193 /* ClassExpression */:
+                        case 226 /* ClassDeclaration */:
+                        case 197 /* ClassExpression */:
                             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 & 28 /* AccessibilityModifier */) {
                                 var constructor = ts.forEach(container.members, function (member) {
-                                    return member.kind === 149 /* Constructor */ && member;
+                                    return member.kind === 150 /* Constructor */ && member;
                                 });
                                 if (constructor) {
                                     nodes = nodes.concat(constructor.parameters);
@@ -65596,13 +68270,13 @@ var ts;
                 }
                 function getGetAndSetOccurrences(accessorDeclaration) {
                     var keywords = [];
-                    tryPushAccessorKeyword(accessorDeclaration.symbol, 150 /* GetAccessor */);
-                    tryPushAccessorKeyword(accessorDeclaration.symbol, 151 /* SetAccessor */);
+                    tryPushAccessorKeyword(accessorDeclaration.symbol, 151 /* GetAccessor */);
+                    tryPushAccessorKeyword(accessorDeclaration.symbol, 152 /* SetAccessor */);
                     return ts.map(keywords, getHighlightSpanForNode);
                     function tryPushAccessorKeyword(accessorSymbol, accessorKind) {
                         var accessor = ts.getDeclarationOfKind(accessorSymbol, accessorKind);
                         if (accessor) {
-                            ts.forEach(accessor.getChildren(), function (child) { return pushKeywordIf(keywords, child, 124 /* GetKeyword */, 132 /* SetKeyword */); });
+                            ts.forEach(accessor.getChildren(), function (child) { return pushKeywordIf(keywords, child, 124 /* GetKeyword */, 133 /* SetKeyword */); });
                         }
                     }
                 }
@@ -65620,7 +68294,7 @@ var ts;
                     var keywords = [];
                     if (pushKeywordIf(keywords, loopNode.getFirstToken(), 87 /* ForKeyword */, 105 /* WhileKeyword */, 80 /* DoKeyword */)) {
                         // If we succeeded and got a do-while loop, then start looking for a 'while' keyword.
-                        if (loopNode.kind === 205 /* DoStatement */) {
+                        if (loopNode.kind === 209 /* DoStatement */) {
                             var loopTokens = loopNode.getChildren();
                             for (var i = loopTokens.length - 1; i >= 0; i--) {
                                 if (pushKeywordIf(keywords, loopTokens[i], 105 /* WhileKeyword */)) {
@@ -65641,13 +68315,13 @@ var ts;
                     var owner = getBreakOrContinueOwner(breakOrContinueStatement);
                     if (owner) {
                         switch (owner.kind) {
-                            case 207 /* ForStatement */:
-                            case 208 /* ForInStatement */:
-                            case 209 /* ForOfStatement */:
-                            case 205 /* DoStatement */:
-                            case 206 /* WhileStatement */:
+                            case 211 /* ForStatement */:
+                            case 212 /* ForInStatement */:
+                            case 213 /* ForOfStatement */:
+                            case 209 /* DoStatement */:
+                            case 210 /* WhileStatement */:
                                 return getLoopBreakContinueOccurrences(owner);
-                            case 214 /* SwitchStatement */:
+                            case 218 /* SwitchStatement */:
                                 return getSwitchCaseDefaultOccurrences(owner);
                         }
                     }
@@ -65701,7 +68375,7 @@ var ts;
                 function getReturnOccurrences(returnStatement) {
                     var func = ts.getContainingFunction(returnStatement);
                     // If we didn't find a containing function with a block body, bail out.
-                    if (!(func && hasKind(func.body, 200 /* Block */))) {
+                    if (!(func && hasKind(func.body, 204 /* Block */))) {
                         return undefined;
                     }
                     var keywords = [];
@@ -65717,7 +68391,7 @@ var ts;
                 function getIfElseOccurrences(ifStatement) {
                     var keywords = [];
                     // Traverse upwards through all parent if-statements linked by their else-branches.
-                    while (hasKind(ifStatement.parent, 204 /* IfStatement */) && ifStatement.parent.elseStatement === ifStatement) {
+                    while (hasKind(ifStatement.parent, 208 /* IfStatement */) && ifStatement.parent.elseStatement === ifStatement) {
                         ifStatement = ifStatement.parent;
                     }
                     // Now traverse back down through the else branches, aggregating if/else keywords of if-statements.
@@ -65730,7 +68404,7 @@ var ts;
                                 break;
                             }
                         }
-                        if (!hasKind(ifStatement.elseStatement, 204 /* IfStatement */)) {
+                        if (!hasKind(ifStatement.elseStatement, 208 /* IfStatement */)) {
                             break;
                         }
                         ifStatement = ifStatement.elseStatement;
@@ -65773,7 +68447,7 @@ var ts;
          * Note: 'node' cannot be a SourceFile.
          */
         function isLabeledBy(node, labelName) {
-            for (var owner = node.parent; owner.kind === 215 /* LabeledStatement */; owner = owner.parent) {
+            for (var owner = node.parent; owner.kind === 219 /* LabeledStatement */; owner = owner.parent) {
                 if (owner.label.text === labelName) {
                     return true;
                 }
@@ -66007,12 +68681,12 @@ var ts;
             function getAliasSymbolForPropertyNameSymbol(symbol, location) {
                 if (symbol.flags & 8388608 /* Alias */) {
                     // Default import get alias
-                    var defaultImport = ts.getDeclarationOfKind(symbol, 232 /* ImportClause */);
+                    var defaultImport = ts.getDeclarationOfKind(symbol, 236 /* ImportClause */);
                     if (defaultImport) {
                         return typeChecker.getAliasedSymbol(symbol);
                     }
-                    var importOrExportSpecifier = ts.forEach(symbol.declarations, function (declaration) { return (declaration.kind === 235 /* ImportSpecifier */ ||
-                        declaration.kind === 239 /* ExportSpecifier */) ? declaration : undefined; });
+                    var importOrExportSpecifier = ts.forEach(symbol.declarations, function (declaration) { return (declaration.kind === 239 /* ImportSpecifier */ ||
+                        declaration.kind === 243 /* ExportSpecifier */) ? declaration : undefined; });
                     if (importOrExportSpecifier &&
                         // export { a }
                         (!importOrExportSpecifier.propertyName ||
@@ -66020,7 +68694,7 @@ var ts;
                             importOrExportSpecifier.propertyName === location)) {
                         // If Import specifier -> get alias
                         // else Export specifier -> get local target
-                        return importOrExportSpecifier.kind === 235 /* ImportSpecifier */ ?
+                        return importOrExportSpecifier.kind === 239 /* ImportSpecifier */ ?
                             typeChecker.getAliasedSymbol(symbol) :
                             typeChecker.getExportSpecifierLocalTargetSymbol(importOrExportSpecifier);
                     }
@@ -66035,14 +68709,14 @@ var ts;
                     typeChecker.getPropertySymbolOfDestructuringAssignment(location);
             }
             function isObjectBindingPatternElementWithoutPropertyName(symbol) {
-                var bindingElement = ts.getDeclarationOfKind(symbol, 170 /* BindingElement */);
+                var bindingElement = ts.getDeclarationOfKind(symbol, 174 /* BindingElement */);
                 return bindingElement &&
-                    bindingElement.parent.kind === 168 /* ObjectBindingPattern */ &&
+                    bindingElement.parent.kind === 172 /* ObjectBindingPattern */ &&
                     !bindingElement.propertyName;
             }
             function getPropertySymbolOfObjectBindingPatternWithoutPropertyName(symbol) {
                 if (isObjectBindingPatternElementWithoutPropertyName(symbol)) {
-                    var bindingElement = ts.getDeclarationOfKind(symbol, 170 /* BindingElement */);
+                    var bindingElement = ts.getDeclarationOfKind(symbol, 174 /* BindingElement */);
                     var typeOfPattern = typeChecker.getTypeAtLocation(bindingElement.parent);
                     return typeOfPattern && typeChecker.getPropertyOfType(typeOfPattern, bindingElement.name.text);
                 }
@@ -66072,14 +68746,14 @@ 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 valueDeclaration = symbol.valueDeclaration;
-                if (valueDeclaration && (valueDeclaration.kind === 180 /* FunctionExpression */ || valueDeclaration.kind === 193 /* ClassExpression */)) {
+                if (valueDeclaration && (valueDeclaration.kind === 184 /* FunctionExpression */ || valueDeclaration.kind === 197 /* ClassExpression */)) {
                     return valueDeclaration;
                 }
                 // If this is private property or method, the scope is the containing class
                 if (symbol.flags & (4 /* Property */ | 8192 /* Method */)) {
                     var privateDeclaration = ts.forEach(symbol.getDeclarations(), function (d) { return (ts.getModifierFlags(d) & 8 /* Private */) ? d : undefined; });
                     if (privateDeclaration) {
-                        return ts.getAncestor(privateDeclaration, 222 /* ClassDeclaration */);
+                        return ts.getAncestor(privateDeclaration, 226 /* ClassDeclaration */);
                     }
                 }
                 // If the symbol is an import we would like to find it if we are looking for what it imports.
@@ -66110,7 +68784,7 @@ var ts;
                             // Different declarations have different containers, bail out
                             return undefined;
                         }
-                        if (container.kind === 256 /* SourceFile */ && !ts.isExternalModule(container)) {
+                        if (container.kind === 261 /* SourceFile */ && !ts.isExternalModule(container)) {
                             // This is a global variable and not an external module, any declaration defined
                             // within this scope is visible outside the file
                             return undefined;
@@ -66141,8 +68815,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), 4 /* Latest */)) &&
-                        (endPosition === sourceLength || !ts.isIdentifierPart(text.charCodeAt(endPosition), 4 /* Latest */))) {
+                    if ((position === 0 || !ts.isIdentifierPart(text.charCodeAt(position - 1), 5 /* Latest */)) &&
+                        (endPosition === sourceLength || !ts.isIdentifierPart(text.charCodeAt(endPosition), 5 /* Latest */))) {
                         // Found a real match.  Keep searching.
                         positions.push(position);
                     }
@@ -66274,7 +68948,7 @@ var ts;
                                 if (localParentType.symbol && localParentType.symbol.flags & (32 /* Class */ | 64 /* Interface */) && localParentType.symbol !== searchSymbol.parent) {
                                     return [localParentType.symbol];
                                 }
-                                else if (localParentType.flags & 1572864 /* UnionOrIntersection */) {
+                                else if (localParentType.flags & 196608 /* UnionOrIntersection */) {
                                     return getSymbolsForClassAndInterfaceComponents(localParentType);
                                 }
                             }
@@ -66314,14 +68988,14 @@ var ts;
                     var result = [];
                     for (var _i = 0, _a = classSymbol.members["__constructor"].declarations; _i < _a.length; _i++) {
                         var decl = _a[_i];
-                        ts.Debug.assert(decl.kind === 149 /* Constructor */);
+                        ts.Debug.assert(decl.kind === 150 /* Constructor */);
                         var ctrKeyword = decl.getChildAt(0);
                         ts.Debug.assert(ctrKeyword.kind === 122 /* ConstructorKeyword */);
                         result.push(ctrKeyword);
                     }
                     ts.forEachProperty(classSymbol.exports, function (member) {
                         var decl = member.valueDeclaration;
-                        if (decl && decl.kind === 148 /* MethodDeclaration */) {
+                        if (decl && decl.kind === 149 /* MethodDeclaration */) {
                             var body = decl.body;
                             if (body) {
                                 forEachDescendantOfKind(body, 98 /* ThisKeyword */, function (thisKeyword) {
@@ -66344,7 +69018,7 @@ var ts;
                     var result = [];
                     for (var _i = 0, _a = ctr.declarations; _i < _a.length; _i++) {
                         var decl = _a[_i];
-                        ts.Debug.assert(decl.kind === 149 /* Constructor */);
+                        ts.Debug.assert(decl.kind === 150 /* Constructor */);
                         var body = decl.body;
                         if (body) {
                             forEachDescendantOfKind(body, 96 /* SuperKeyword */, function (node) {
@@ -66386,7 +69060,7 @@ var ts;
                     result.push(getReferenceEntryFromNode(refNode.parent));
                 }
                 else if (refNode.kind === 70 /* Identifier */) {
-                    if (refNode.parent.kind === 254 /* ShorthandPropertyAssignment */) {
+                    if (refNode.parent.kind === 258 /* ShorthandPropertyAssignment */) {
                         // Go ahead and dereference the shorthand assignment by going to its definition
                         getReferenceEntriesForShorthandPropertyAssignment(refNode, typeChecker, result);
                     }
@@ -66399,24 +69073,24 @@ var ts;
                     // If we got a type reference, try and see if the reference applies to any expressions that can implement an interface
                     var containingTypeReference = getContainingTypeReference(refNode);
                     if (containingTypeReference) {
-                        var parent_21 = containingTypeReference.parent;
-                        if (ts.isVariableLike(parent_21) && parent_21.type === containingTypeReference && parent_21.initializer && isImplementationExpression(parent_21.initializer)) {
-                            maybeAdd(getReferenceEntryFromNode(parent_21.initializer));
+                        var parent_19 = containingTypeReference.parent;
+                        if (ts.isVariableLike(parent_19) && parent_19.type === containingTypeReference && parent_19.initializer && isImplementationExpression(parent_19.initializer)) {
+                            maybeAdd(getReferenceEntryFromNode(parent_19.initializer));
                         }
-                        else if (ts.isFunctionLike(parent_21) && parent_21.type === containingTypeReference && parent_21.body) {
-                            if (parent_21.body.kind === 200 /* Block */) {
-                                ts.forEachReturnStatement(parent_21.body, function (returnStatement) {
+                        else if (ts.isFunctionLike(parent_19) && parent_19.type === containingTypeReference && parent_19.body) {
+                            if (parent_19.body.kind === 204 /* Block */) {
+                                ts.forEachReturnStatement(parent_19.body, function (returnStatement) {
                                     if (returnStatement.expression && isImplementationExpression(returnStatement.expression)) {
                                         maybeAdd(getReferenceEntryFromNode(returnStatement.expression));
                                     }
                                 });
                             }
-                            else if (isImplementationExpression(parent_21.body)) {
-                                maybeAdd(getReferenceEntryFromNode(parent_21.body));
+                            else if (isImplementationExpression(parent_19.body)) {
+                                maybeAdd(getReferenceEntryFromNode(parent_19.body));
                             }
                         }
-                        else if (ts.isAssertionExpression(parent_21) && isImplementationExpression(parent_21.expression)) {
-                            maybeAdd(getReferenceEntryFromNode(parent_21.expression));
+                        else if (ts.isAssertionExpression(parent_19) && isImplementationExpression(parent_19.expression)) {
+                            maybeAdd(getReferenceEntryFromNode(parent_19.expression));
                         }
                     }
                 }
@@ -66438,7 +69112,7 @@ var ts;
                     if (componentType.symbol && componentType.symbol.getFlags() & (32 /* Class */ | 64 /* Interface */)) {
                         result.push(componentType.symbol);
                     }
-                    if (componentType.getFlags() & 1572864 /* UnionOrIntersection */) {
+                    if (componentType.getFlags() & 196608 /* UnionOrIntersection */) {
                         getSymbolsForClassAndInterfaceComponents(componentType, result);
                     }
                 }
@@ -66456,12 +69130,12 @@ var ts;
             }
             function getContainingClassIfInHeritageClause(node) {
                 if (node && node.parent) {
-                    if (node.kind === 195 /* ExpressionWithTypeArguments */
-                        && node.parent.kind === 251 /* HeritageClause */
+                    if (node.kind === 199 /* ExpressionWithTypeArguments */
+                        && node.parent.kind === 255 /* HeritageClause */
                         && ts.isClassLike(node.parent.parent)) {
                         return node.parent.parent;
                     }
-                    else if (node.kind === 70 /* Identifier */ || node.kind === 173 /* PropertyAccessExpression */) {
+                    else if (node.kind === 70 /* Identifier */ || node.kind === 177 /* PropertyAccessExpression */) {
                         return getContainingClassIfInHeritageClause(node.parent);
                     }
                 }
@@ -66472,14 +69146,14 @@ var ts;
              */
             function isImplementationExpression(node) {
                 // Unwrap parentheses
-                if (node.kind === 179 /* ParenthesizedExpression */) {
+                if (node.kind === 183 /* ParenthesizedExpression */) {
                     return isImplementationExpression(node.expression);
                 }
-                return node.kind === 181 /* ArrowFunction */ ||
-                    node.kind === 180 /* FunctionExpression */ ||
-                    node.kind === 172 /* ObjectLiteralExpression */ ||
-                    node.kind === 193 /* ClassExpression */ ||
-                    node.kind === 171 /* ArrayLiteralExpression */;
+                return node.kind === 185 /* ArrowFunction */ ||
+                    node.kind === 184 /* FunctionExpression */ ||
+                    node.kind === 176 /* ObjectLiteralExpression */ ||
+                    node.kind === 197 /* ClassExpression */ ||
+                    node.kind === 175 /* ArrayLiteralExpression */;
             }
             /**
              * Determines if the parent symbol occurs somewhere in the child's ancestry. If the parent symbol
@@ -66528,7 +69202,7 @@ var ts;
                             }
                             return searchTypeReference(ts.getClassExtendsHeritageClauseElement(declaration));
                         }
-                        else if (declaration.kind === 223 /* InterfaceDeclaration */) {
+                        else if (declaration.kind === 227 /* InterfaceDeclaration */) {
                             if (parentIsInterface) {
                                 return ts.forEach(ts.getInterfaceBaseTypeNodes(declaration), searchTypeReference);
                             }
@@ -66556,13 +69230,13 @@ var ts;
                 // Whether 'super' occurs in a static context within a class.
                 var staticFlag = 32 /* Static */;
                 switch (searchSpaceNode.kind) {
-                    case 146 /* PropertyDeclaration */:
-                    case 145 /* PropertySignature */:
-                    case 148 /* MethodDeclaration */:
-                    case 147 /* MethodSignature */:
-                    case 149 /* Constructor */:
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
+                    case 147 /* PropertyDeclaration */:
+                    case 146 /* PropertySignature */:
+                    case 149 /* MethodDeclaration */:
+                    case 148 /* MethodSignature */:
+                    case 150 /* Constructor */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* SetAccessor */:
                         staticFlag &= ts.getModifierFlags(searchSpaceNode);
                         searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class
                         break;
@@ -66594,27 +69268,27 @@ var ts;
                 // Whether 'this' occurs in a static context within a class.
                 var staticFlag = 32 /* Static */;
                 switch (searchSpaceNode.kind) {
-                    case 148 /* MethodDeclaration */:
-                    case 147 /* MethodSignature */:
+                    case 149 /* MethodDeclaration */:
+                    case 148 /* MethodSignature */:
                         if (ts.isObjectLiteralMethod(searchSpaceNode)) {
                             break;
                         }
                     // fall through
-                    case 146 /* PropertyDeclaration */:
-                    case 145 /* PropertySignature */:
-                    case 149 /* Constructor */:
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
+                    case 147 /* PropertyDeclaration */:
+                    case 146 /* PropertySignature */:
+                    case 150 /* Constructor */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* SetAccessor */:
                         staticFlag &= ts.getModifierFlags(searchSpaceNode);
                         searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class
                         break;
-                    case 256 /* SourceFile */:
+                    case 261 /* SourceFile */:
                         if (ts.isExternalModule(searchSpaceNode)) {
                             return undefined;
                         }
                     // Fall through
-                    case 221 /* FunctionDeclaration */:
-                    case 180 /* FunctionExpression */:
+                    case 225 /* FunctionDeclaration */:
+                    case 184 /* 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.
@@ -66623,7 +69297,7 @@ var ts;
                 }
                 var references = [];
                 var possiblePositions;
-                if (searchSpaceNode.kind === 256 /* SourceFile */) {
+                if (searchSpaceNode.kind === 261 /* SourceFile */) {
                     ts.forEach(sourceFiles, function (sourceFile) {
                         possiblePositions = getPossibleSymbolReferencePositions(sourceFile, "this", sourceFile.getStart(), sourceFile.getEnd());
                         getThisReferencesInFile(sourceFile, sourceFile, possiblePositions, references);
@@ -66657,28 +69331,28 @@ var ts;
                         }
                         var container = ts.getThisContainer(node, /* includeArrowFunctions */ false);
                         switch (searchSpaceNode.kind) {
-                            case 180 /* FunctionExpression */:
-                            case 221 /* FunctionDeclaration */:
+                            case 184 /* FunctionExpression */:
+                            case 225 /* FunctionDeclaration */:
                                 if (searchSpaceNode.symbol === container.symbol) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
-                            case 148 /* MethodDeclaration */:
-                            case 147 /* MethodSignature */:
+                            case 149 /* MethodDeclaration */:
+                            case 148 /* MethodSignature */:
                                 if (ts.isObjectLiteralMethod(searchSpaceNode) && searchSpaceNode.symbol === container.symbol) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
-                            case 193 /* ClassExpression */:
-                            case 222 /* ClassDeclaration */:
+                            case 197 /* ClassExpression */:
+                            case 226 /* ClassDeclaration */:
                                 // Make sure the container belongs to the same class
                                 // and has the appropriate static modifier from the original container.
                                 if (container.parent && searchSpaceNode.symbol === container.parent.symbol && (ts.getModifierFlags(container) & 32 /* Static */) === staticFlag) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
-                            case 256 /* SourceFile */:
-                                if (container.kind === 256 /* SourceFile */ && !ts.isExternalModule(container)) {
+                            case 261 /* SourceFile */:
+                                if (container.kind === 261 /* SourceFile */ && !ts.isExternalModule(container)) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
@@ -66718,8 +69392,8 @@ var ts;
                         if (!node_2 || node_2.kind !== 9 /* StringLiteral */) {
                             return;
                         }
-                        var type_1 = ts.getStringLiteralTypeForNode(node_2, typeChecker);
-                        if (type_1 === searchType) {
+                        var type_2 = ts.getStringLiteralTypeForNode(node_2, typeChecker);
+                        if (type_2 === searchType) {
                             references.push(getReferenceEntryFromNode(node_2));
                         }
                     }
@@ -66732,7 +69406,7 @@ var ts;
                 // Search the property symbol
                 //      for ( { property: p2 } of elems) { }
                 var containingObjectLiteralElement = getContainingObjectLiteralElement(location);
-                if (containingObjectLiteralElement && containingObjectLiteralElement.kind !== 254 /* ShorthandPropertyAssignment */) {
+                if (containingObjectLiteralElement && containingObjectLiteralElement.kind !== 258 /* ShorthandPropertyAssignment */) {
                     var propertySymbol = getPropertySymbolOfDestructuringAssignment(location);
                     if (propertySymbol) {
                         result.push(propertySymbol);
@@ -66780,7 +69454,7 @@ var ts;
                 // we should include both parameter declaration symbol and property declaration symbol
                 // Parameter Declaration symbol is only visible within function scope, so the symbol is stored in constructor.locals.
                 // Property Declaration symbol is a member of the class, so the symbol is stored in its class Declaration.symbol.members
-                if (symbol.valueDeclaration && symbol.valueDeclaration.kind === 143 /* Parameter */ &&
+                if (symbol.valueDeclaration && symbol.valueDeclaration.kind === 144 /* Parameter */ &&
                     ts.isParameterPropertyDeclaration(symbol.valueDeclaration)) {
                     result = result.concat(typeChecker.getSymbolsOfParameterPropertyDeclaration(symbol.valueDeclaration, symbol.name));
                 }
@@ -66835,7 +69509,7 @@ var ts;
                             getPropertySymbolFromTypeReference(ts.getClassExtendsHeritageClauseElement(declaration));
                             ts.forEach(ts.getClassImplementsHeritageClauseElements(declaration), getPropertySymbolFromTypeReference);
                         }
-                        else if (declaration.kind === 223 /* InterfaceDeclaration */) {
+                        else if (declaration.kind === 227 /* InterfaceDeclaration */) {
                             ts.forEach(ts.getInterfaceBaseTypeNodes(declaration), getPropertySymbolFromTypeReference);
                         }
                     });
@@ -66919,7 +69593,7 @@ var ts;
                 });
             }
             function getNameFromObjectLiteralElement(node) {
-                if (node.name.kind === 141 /* ComputedPropertyName */) {
+                if (node.name.kind === 142 /* ComputedPropertyName */) {
                     var nameExpression = node.name.expression;
                     // treat computed property names where expression is string/numeric literal as just string/numeric literal
                     if (ts.isStringOrNumericLiteral(nameExpression.kind)) {
@@ -66939,7 +69613,7 @@ var ts;
                     if (symbol_2) {
                         result_4.push(symbol_2);
                     }
-                    if (contextualType.flags & 524288 /* Union */) {
+                    if (contextualType.flags & 65536 /* Union */) {
                         ts.forEach(contextualType.types, function (t) {
                             var symbol = t.getProperty(name);
                             if (symbol) {
@@ -67001,7 +69675,7 @@ var ts;
                 if (node.initializer) {
                     return true;
                 }
-                else if (node.kind === 219 /* VariableDeclaration */) {
+                else if (node.kind === 223 /* VariableDeclaration */) {
                     var parentStatement = getParentStatementOfVariableDeclaration(node);
                     return parentStatement && ts.hasModifier(parentStatement, 2 /* Ambient */);
                 }
@@ -67011,18 +69685,18 @@ var ts;
             }
             else {
                 switch (node.kind) {
-                    case 222 /* ClassDeclaration */:
-                    case 193 /* ClassExpression */:
-                    case 225 /* EnumDeclaration */:
-                    case 226 /* ModuleDeclaration */:
+                    case 226 /* ClassDeclaration */:
+                    case 197 /* ClassExpression */:
+                    case 229 /* EnumDeclaration */:
+                    case 230 /* ModuleDeclaration */:
                         return true;
                 }
             }
             return false;
         }
         function getParentStatementOfVariableDeclaration(node) {
-            if (node.parent && node.parent.parent && node.parent.parent.kind === 201 /* VariableStatement */) {
-                ts.Debug.assert(node.parent.kind === 220 /* VariableDeclarationList */);
+            if (node.parent && node.parent.parent && node.parent.parent.kind === 205 /* VariableStatement */) {
+                ts.Debug.assert(node.parent.kind === 224 /* VariableDeclarationList */);
                 return node.parent.parent;
             }
         }
@@ -67061,10 +69735,10 @@ var ts;
             }
             var parent = node.parent;
             if (parent) {
-                if (parent.kind === 187 /* PostfixUnaryExpression */ || parent.kind === 186 /* PrefixUnaryExpression */) {
+                if (parent.kind === 191 /* PostfixUnaryExpression */ || parent.kind === 190 /* PrefixUnaryExpression */) {
                     return true;
                 }
-                else if (parent.kind === 188 /* BinaryExpression */ && parent.left === node) {
+                else if (parent.kind === 192 /* BinaryExpression */ && parent.left === node) {
                     var operator = parent.operatorToken.kind;
                     return 57 /* FirstAssignment */ <= operator && operator <= 69 /* LastAssignment */;
                 }
@@ -67086,7 +69760,7 @@ var ts;
             switch (node.kind) {
                 case 9 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
-                    if (node.parent.kind === 141 /* ComputedPropertyName */) {
+                    if (node.parent.kind === 142 /* ComputedPropertyName */) {
                         return isObjectLiteralPropertyDeclaration(node.parent.parent) ? node.parent.parent : undefined;
                     }
                 // intential fall through
@@ -67097,11 +69771,11 @@ var ts;
         }
         function isObjectLiteralPropertyDeclaration(node) {
             switch (node.kind) {
-                case 253 /* PropertyAssignment */:
-                case 254 /* ShorthandPropertyAssignment */:
-                case 148 /* MethodDeclaration */:
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
+                case 257 /* PropertyAssignment */:
+                case 258 /* ShorthandPropertyAssignment */:
+                case 149 /* MethodDeclaration */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
                     return true;
             }
             return false;
@@ -67176,7 +69850,7 @@ var ts;
                 //
                 if (node.kind === 70 /* Identifier */ &&
                     (node.parent === declaration ||
-                        (declaration.kind === 235 /* ImportSpecifier */ && declaration.parent && declaration.parent.kind === 234 /* NamedImports */))) {
+                        (declaration.kind === 239 /* ImportSpecifier */ && declaration.parent && declaration.parent.kind === 238 /* NamedImports */))) {
                     symbol = typeChecker.getAliasedSymbol(symbol);
                 }
             }
@@ -67185,7 +69859,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 === 254 /* ShorthandPropertyAssignment */) {
+            if (node.parent.kind === 258 /* ShorthandPropertyAssignment */) {
                 var shorthandSymbol = typeChecker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration);
                 if (!shorthandSymbol) {
                     return [];
@@ -67213,7 +69887,7 @@ var ts;
             if (!type) {
                 return undefined;
             }
-            if (type.flags & 524288 /* Union */ && !(type.flags & 16 /* Enum */)) {
+            if (type.flags & 65536 /* Union */ && !(type.flags & 16 /* Enum */)) {
                 var result_5 = [];
                 ts.forEach(type.types, function (t) {
                     if (t.symbol) {
@@ -67268,8 +69942,8 @@ var ts;
                 var declarations = [];
                 var definition;
                 ts.forEach(signatureDeclarations, function (d) {
-                    if ((selectConstructors && d.kind === 149 /* Constructor */) ||
-                        (!selectConstructors && (d.kind === 221 /* FunctionDeclaration */ || d.kind === 148 /* MethodDeclaration */ || d.kind === 147 /* MethodSignature */))) {
+                    if ((selectConstructors && d.kind === 150 /* Constructor */) ||
+                        (!selectConstructors && (d.kind === 225 /* FunctionDeclaration */ || d.kind === 149 /* MethodDeclaration */ || d.kind === 148 /* MethodSignature */))) {
                         declarations.push(d);
                         if (d.body)
                             definition = d;
@@ -67349,7 +70023,7 @@ var ts;
         function getImplementationAtPosition(typeChecker, cancellationToken, sourceFiles, node) {
             // 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 === 254 /* ShorthandPropertyAssignment */) {
+            if (node.parent.kind === 258 /* ShorthandPropertyAssignment */) {
                 var result = [];
                 ts.FindAllReferences.getReferenceEntriesForShorthandPropertyAssignment(node, typeChecker, result);
                 return result.length > 0 ? result : undefined;
@@ -67515,19 +70189,19 @@ var ts;
             var commentOwner;
             findOwner: for (commentOwner = tokenAtPos; commentOwner; commentOwner = commentOwner.parent) {
                 switch (commentOwner.kind) {
-                    case 221 /* FunctionDeclaration */:
-                    case 148 /* MethodDeclaration */:
-                    case 149 /* Constructor */:
-                    case 222 /* ClassDeclaration */:
-                    case 201 /* VariableStatement */:
+                    case 225 /* FunctionDeclaration */:
+                    case 149 /* MethodDeclaration */:
+                    case 150 /* Constructor */:
+                    case 226 /* ClassDeclaration */:
+                    case 205 /* VariableStatement */:
                         break findOwner;
-                    case 256 /* SourceFile */:
+                    case 261 /* SourceFile */:
                         return undefined;
-                    case 226 /* ModuleDeclaration */:
+                    case 230 /* 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 { }'.
-                        if (commentOwner.parent.kind === 226 /* ModuleDeclaration */) {
+                        if (commentOwner.parent.kind === 230 /* ModuleDeclaration */) {
                             return undefined;
                         }
                         break findOwner;
@@ -67568,7 +70242,7 @@ var ts;
             if (ts.isFunctionLike(commentOwner)) {
                 return commentOwner.parameters;
             }
-            if (commentOwner.kind === 201 /* VariableStatement */) {
+            if (commentOwner.kind === 205 /* VariableStatement */) {
                 var varStatement = commentOwner;
                 var varDeclarations = varStatement.declarationList.declarations;
                 if (varDeclarations.length === 1 && varDeclarations[0].initializer) {
@@ -67586,17 +70260,17 @@ var ts;
          * @returns the parameters of a signature found on the RHS if one exists; otherwise 'emptyArray'.
          */
         function getParametersFromRightHandSideOfAssignment(rightHandSide) {
-            while (rightHandSide.kind === 179 /* ParenthesizedExpression */) {
+            while (rightHandSide.kind === 183 /* ParenthesizedExpression */) {
                 rightHandSide = rightHandSide.expression;
             }
             switch (rightHandSide.kind) {
-                case 180 /* FunctionExpression */:
-                case 181 /* ArrowFunction */:
+                case 184 /* FunctionExpression */:
+                case 185 /* ArrowFunction */:
                     return rightHandSide.parameters;
-                case 193 /* ClassExpression */:
+                case 197 /* ClassExpression */:
                     for (var _i = 0, _a = rightHandSide.members; _i < _a.length; _i++) {
                         var member = _a[_i];
-                        if (member.kind === 149 /* Constructor */) {
+                        if (member.kind === 150 /* Constructor */) {
                             return member.parameters;
                         }
                     }
@@ -67622,6 +70296,16 @@ var ts;
         // that we are confident require typings
         var safeList;
         var EmptySafeList = ts.createMap();
+        /* @internal */
+        JsTyping.nodeCoreModuleList = [
+            "buffer", "querystring", "events", "http", "cluster",
+            "zlib", "os", "https", "punycode", "repl", "readline",
+            "vm", "child_process", "url", "dns", "net",
+            "dgram", "fs", "path", "string_decoder", "tls",
+            "crypto", "stream", "util", "assert", "tty", "domain",
+            "constants", "process", "v8", "timers", "console"
+        ];
+        var nodeCoreModules = ts.arrayToMap(JsTyping.nodeCoreModuleList, function (x) { return x; });
         /**
          * @param host is the object providing I/O related operations.
          * @param fileNames are the file names that belong to the same project
@@ -67631,7 +70315,7 @@ var ts;
          * @param typingOptions are used to customize the typing inference process
          * @param compilerOptions are used as a source for typing inference
          */
-        function discoverTypings(host, fileNames, projectRootPath, safeListPath, packageNameToTypingLocation, typingOptions) {
+        function discoverTypings(host, fileNames, projectRootPath, safeListPath, packageNameToTypingLocation, typingOptions, unresolvedImports) {
             // A typing name to typing file path mapping
             var inferredTypings = ts.createMap();
             if (!typingOptions || !typingOptions.enableAutoDiscovery) {
@@ -67653,7 +70337,7 @@ var ts;
             mergeTypings(typingOptions.include);
             exclude = typingOptions.exclude || [];
             var possibleSearchDirs = ts.map(fileNames, ts.getDirectoryPath);
-            if (projectRootPath !== undefined) {
+            if (projectRootPath) {
                 possibleSearchDirs.push(projectRootPath);
             }
             searchDirs = ts.deduplicate(possibleSearchDirs);
@@ -67667,15 +70351,25 @@ var ts;
                 getTypingNamesFromNodeModuleFolder(nodeModulesPath);
             }
             getTypingNamesFromSourceFileNames(fileNames);
+            // add typings for unresolved imports
+            if (unresolvedImports) {
+                for (var _a = 0, unresolvedImports_1 = unresolvedImports; _a < unresolvedImports_1.length; _a++) {
+                    var moduleId = unresolvedImports_1[_a];
+                    var typingName = moduleId in nodeCoreModules ? "node" : moduleId;
+                    if (!(typingName in inferredTypings)) {
+                        inferredTypings[typingName] = undefined;
+                    }
+                }
+            }
             // Add the cached typing locations for inferred typings that are already installed
-            for (var name_48 in packageNameToTypingLocation) {
-                if (name_48 in inferredTypings && !inferredTypings[name_48]) {
-                    inferredTypings[name_48] = packageNameToTypingLocation[name_48];
+            for (var name_44 in packageNameToTypingLocation) {
+                if (name_44 in inferredTypings && !inferredTypings[name_44]) {
+                    inferredTypings[name_44] = packageNameToTypingLocation[name_44];
                 }
             }
             // Remove typings that the user has added to the exclude list
-            for (var _a = 0, exclude_1 = exclude; _a < exclude_1.length; _a++) {
-                var excludeTypingName = exclude_1[_a];
+            for (var _b = 0, exclude_1 = exclude; _b < exclude_1.length; _b++) {
+                var excludeTypingName = exclude_1[_b];
                 delete inferredTypings[excludeTypingName];
             }
             var newTypingNames = [];
@@ -67707,10 +70401,12 @@ var ts;
              * Get the typing info from common package manager json files like package.json or bower.json
              */
             function getTypingNamesFromJson(jsonPath, filesToWatch) {
+                if (host.fileExists(jsonPath)) {
+                    filesToWatch.push(jsonPath);
+                }
                 var result = ts.readConfigFile(jsonPath, function (path) { return host.readFile(path); });
                 if (result.config) {
                     var jsonConfig = result.config;
-                    filesToWatch.push(jsonPath);
                     if (jsonConfig.dependencies) {
                         mergeTypings(ts.getOwnKeys(jsonConfig.dependencies));
                     }
@@ -67806,12 +70502,12 @@ var ts;
                     return;
                 }
                 var nameToDeclarations = sourceFile.getNamedDeclarations();
-                for (var name_49 in nameToDeclarations) {
-                    var declarations = nameToDeclarations[name_49];
+                for (var name_45 in nameToDeclarations) {
+                    var declarations = nameToDeclarations[name_45];
                     if (declarations) {
                         // First do a quick check to see if the name of the declaration matches the
                         // last portion of the (possibly) dotted name they're searching for.
-                        var matches = patternMatcher.getMatchesForLastSegmentOfPattern(name_49);
+                        var matches = patternMatcher.getMatchesForLastSegmentOfPattern(name_45);
                         if (!matches) {
                             continue;
                         }
@@ -67824,14 +70520,14 @@ var ts;
                                 if (!containers) {
                                     return undefined;
                                 }
-                                matches = patternMatcher.getMatches(containers, name_49);
+                                matches = patternMatcher.getMatches(containers, name_45);
                                 if (!matches) {
                                     continue;
                                 }
                             }
                             var fileName = sourceFile.fileName;
                             var matchKind = bestMatchKind(matches);
-                            rawItems.push({ name: name_49, fileName: fileName, matchKind: matchKind, isCaseSensitive: allMatchesAreCaseSensitive(matches), declaration: declaration });
+                            rawItems.push({ name: name_45, fileName: fileName, matchKind: matchKind, isCaseSensitive: allMatchesAreCaseSensitive(matches), declaration: declaration });
                         }
                     }
                 }
@@ -67839,7 +70535,7 @@ var ts;
             // Remove imports when the imported declaration is already in the list and has the same name.
             rawItems = ts.filter(rawItems, function (item) {
                 var decl = item.declaration;
-                if (decl.kind === 232 /* ImportClause */ || decl.kind === 235 /* ImportSpecifier */ || decl.kind === 230 /* ImportEqualsDeclaration */) {
+                if (decl.kind === 236 /* ImportClause */ || decl.kind === 239 /* ImportSpecifier */ || decl.kind === 234 /* ImportEqualsDeclaration */) {
                     var importer = checker.getSymbolAtLocation(decl.name);
                     var imported = checker.getAliasedSymbol(importer);
                     return importer.name !== imported.name;
@@ -67881,7 +70577,7 @@ var ts;
                     if (text !== undefined) {
                         containers.unshift(text);
                     }
-                    else if (declaration.name.kind === 141 /* ComputedPropertyName */) {
+                    else if (declaration.name.kind === 142 /* ComputedPropertyName */) {
                         return tryAddComputedPropertyName(declaration.name.expression, containers, /*includeLastPortion*/ true);
                     }
                     else {
@@ -67902,7 +70598,7 @@ var ts;
                     }
                     return true;
                 }
-                if (expression.kind === 173 /* PropertyAccessExpression */) {
+                if (expression.kind === 177 /* PropertyAccessExpression */) {
                     var propertyAccess = expression;
                     if (includeLastPortion) {
                         containers.unshift(propertyAccess.name.text);
@@ -67915,7 +70611,7 @@ var ts;
                 var containers = [];
                 // First, if we started with a computed property name, then add all but the last
                 // portion into the container array.
-                if (declaration.name.kind === 141 /* ComputedPropertyName */) {
+                if (declaration.name.kind === 142 /* ComputedPropertyName */) {
                     if (!tryAddComputedPropertyName(declaration.name.expression, containers, /*includeLastPortion*/ false)) {
                         return undefined;
                     }
@@ -68068,7 +70764,7 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 149 /* Constructor */:
+                case 150 /* 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);
@@ -68080,21 +70776,21 @@ var ts;
                         }
                     }
                     break;
-                case 148 /* MethodDeclaration */:
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
-                case 147 /* MethodSignature */:
+                case 149 /* MethodDeclaration */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
+                case 148 /* MethodSignature */:
                     if (!ts.hasDynamicName(node)) {
                         addNodeWithRecursiveChild(node, node.body);
                     }
                     break;
-                case 146 /* PropertyDeclaration */:
-                case 145 /* PropertySignature */:
+                case 147 /* PropertyDeclaration */:
+                case 146 /* PropertySignature */:
                     if (!ts.hasDynamicName(node)) {
                         addLeafNode(node);
                     }
                     break;
-                case 232 /* ImportClause */:
+                case 236 /* ImportClause */:
                     var importClause = node;
                     // Handle default import case e.g.:
                     //    import d from "mod";
@@ -68106,7 +70802,7 @@ var ts;
                     //    import {a, b as B} from "mod";
                     var namedBindings = importClause.namedBindings;
                     if (namedBindings) {
-                        if (namedBindings.kind === 233 /* NamespaceImport */) {
+                        if (namedBindings.kind === 237 /* NamespaceImport */) {
                             addLeafNode(namedBindings);
                         }
                         else {
@@ -68117,12 +70813,12 @@ var ts;
                         }
                     }
                     break;
-                case 170 /* BindingElement */:
-                case 219 /* VariableDeclaration */:
+                case 174 /* BindingElement */:
+                case 223 /* VariableDeclaration */:
                     var decl = node;
-                    var name_50 = decl.name;
-                    if (ts.isBindingPattern(name_50)) {
-                        addChildrenRecursively(name_50);
+                    var name_46 = decl.name;
+                    if (ts.isBindingPattern(name_46)) {
+                        addChildrenRecursively(name_46);
                     }
                     else if (decl.initializer && isFunctionOrClassExpression(decl.initializer)) {
                         // For `const x = function() {}`, just use the function node, not the const.
@@ -68132,12 +70828,12 @@ var ts;
                         addNodeWithRecursiveChild(decl, decl.initializer);
                     }
                     break;
-                case 181 /* ArrowFunction */:
-                case 221 /* FunctionDeclaration */:
-                case 180 /* FunctionExpression */:
+                case 185 /* ArrowFunction */:
+                case 225 /* FunctionDeclaration */:
+                case 184 /* FunctionExpression */:
                     addNodeWithRecursiveChild(node, node.body);
                     break;
-                case 225 /* EnumDeclaration */:
+                case 229 /* EnumDeclaration */:
                     startNode(node);
                     for (var _d = 0, _e = node.members; _d < _e.length; _d++) {
                         var member = _e[_d];
@@ -68147,9 +70843,9 @@ var ts;
                     }
                     endNode();
                     break;
-                case 222 /* ClassDeclaration */:
-                case 193 /* ClassExpression */:
-                case 223 /* InterfaceDeclaration */:
+                case 226 /* ClassDeclaration */:
+                case 197 /* ClassExpression */:
+                case 227 /* InterfaceDeclaration */:
                     startNode(node);
                     for (var _f = 0, _g = node.members; _f < _g.length; _f++) {
                         var member = _g[_f];
@@ -68157,21 +70853,21 @@ var ts;
                     }
                     endNode();
                     break;
-                case 226 /* ModuleDeclaration */:
+                case 230 /* ModuleDeclaration */:
                     addNodeWithRecursiveChild(node, getInteriorModule(node).body);
                     break;
-                case 239 /* ExportSpecifier */:
-                case 230 /* ImportEqualsDeclaration */:
-                case 154 /* IndexSignature */:
-                case 152 /* CallSignature */:
-                case 153 /* ConstructSignature */:
-                case 224 /* TypeAliasDeclaration */:
+                case 243 /* ExportSpecifier */:
+                case 234 /* ImportEqualsDeclaration */:
+                case 155 /* IndexSignature */:
+                case 153 /* CallSignature */:
+                case 154 /* ConstructSignature */:
+                case 228 /* TypeAliasDeclaration */:
                     addLeafNode(node);
                     break;
                 default:
                     ts.forEach(node.jsDocComments, function (jsDocComment) {
                         ts.forEach(jsDocComment.tags, function (tag) {
-                            if (tag.kind === 279 /* JSDocTypedefTag */) {
+                            if (tag.kind === 284 /* JSDocTypedefTag */) {
                                 addLeafNode(tag);
                             }
                         });
@@ -68222,14 +70918,14 @@ var ts;
             });
             /** a and b have the same name, but they may not be mergeable. */
             function shouldReallyMerge(a, b) {
-                return a.kind === b.kind && (a.kind !== 226 /* ModuleDeclaration */ || areSameModule(a, b));
+                return a.kind === b.kind && (a.kind !== 230 /* ModuleDeclaration */ || areSameModule(a, b));
                 // We use 1 NavNode to represent 'A.B.C', but there are multiple source nodes.
                 // Only merge module nodes that have the same chain. Don't merge 'A.B.C' with 'A'!
                 function areSameModule(a, b) {
                     if (a.body.kind !== b.body.kind) {
                         return false;
                     }
-                    if (a.body.kind !== 226 /* ModuleDeclaration */) {
+                    if (a.body.kind !== 230 /* ModuleDeclaration */) {
                         return true;
                     }
                     return areSameModule(a.body, b.body);
@@ -68289,7 +70985,7 @@ var ts;
          * So `new()` can still come before an `aardvark` method.
          */
         function tryGetName(node) {
-            if (node.kind === 226 /* ModuleDeclaration */) {
+            if (node.kind === 230 /* ModuleDeclaration */) {
                 return getModuleName(node);
             }
             var decl = node;
@@ -68297,18 +70993,18 @@ var ts;
                 return ts.getPropertyNameForPropertyNameNode(decl.name);
             }
             switch (node.kind) {
-                case 180 /* FunctionExpression */:
-                case 181 /* ArrowFunction */:
-                case 193 /* ClassExpression */:
+                case 184 /* FunctionExpression */:
+                case 185 /* ArrowFunction */:
+                case 197 /* ClassExpression */:
                     return getFunctionOrClassName(node);
-                case 279 /* JSDocTypedefTag */:
+                case 284 /* JSDocTypedefTag */:
                     return getJSDocTypedefTagName(node);
                 default:
                     return undefined;
             }
         }
         function getItemName(node) {
-            if (node.kind === 226 /* ModuleDeclaration */) {
+            if (node.kind === 230 /* ModuleDeclaration */) {
                 return getModuleName(node);
             }
             var name = node.name;
@@ -68319,29 +71015,32 @@ var ts;
                 }
             }
             switch (node.kind) {
-                case 256 /* SourceFile */:
+                case 261 /* SourceFile */:
                     var sourceFile = node;
                     return ts.isExternalModule(sourceFile)
                         ? "\"" + ts.escapeString(ts.getBaseFileName(ts.removeFileExtension(ts.normalizePath(sourceFile.fileName)))) + "\""
                         : "<global>";
-                case 181 /* ArrowFunction */:
-                case 221 /* FunctionDeclaration */:
-                case 180 /* FunctionExpression */:
-                case 222 /* ClassDeclaration */:
-                case 193 /* ClassExpression */:
+                case 185 /* ArrowFunction */:
+                case 225 /* FunctionDeclaration */:
+                case 184 /* FunctionExpression */:
+                case 226 /* ClassDeclaration */:
+                case 197 /* ClassExpression */:
                     if (ts.getModifierFlags(node) & 512 /* Default */) {
                         return "default";
                     }
+                    // We may get a string with newlines or other whitespace in the case of an object dereference
+                    // (eg: "app\n.onactivated"), so we should remove the whitespace for readabiltiy in the
+                    // navigation bar.
                     return getFunctionOrClassName(node);
-                case 149 /* Constructor */:
+                case 150 /* Constructor */:
                     return "constructor";
-                case 153 /* ConstructSignature */:
+                case 154 /* ConstructSignature */:
                     return "new()";
-                case 152 /* CallSignature */:
+                case 153 /* CallSignature */:
                     return "()";
-                case 154 /* IndexSignature */:
+                case 155 /* IndexSignature */:
                     return "[]";
-                case 279 /* JSDocTypedefTag */:
+                case 284 /* JSDocTypedefTag */:
                     return getJSDocTypedefTagName(node);
                 default:
                     return "<unknown>";
@@ -68353,7 +71052,7 @@ var ts;
             }
             else {
                 var parentNode = node.parent && node.parent.parent;
-                if (parentNode && parentNode.kind === 201 /* VariableStatement */) {
+                if (parentNode && parentNode.kind === 205 /* VariableStatement */) {
                     if (parentNode.declarationList.declarations.length > 0) {
                         var nameIdentifier = parentNode.declarationList.declarations[0].name;
                         if (nameIdentifier.kind === 70 /* Identifier */) {
@@ -68382,24 +71081,24 @@ var ts;
             return topLevel;
             function isTopLevel(item) {
                 switch (navigationBarNodeKind(item)) {
-                    case 222 /* ClassDeclaration */:
-                    case 193 /* ClassExpression */:
-                    case 225 /* EnumDeclaration */:
-                    case 223 /* InterfaceDeclaration */:
-                    case 226 /* ModuleDeclaration */:
-                    case 256 /* SourceFile */:
-                    case 224 /* TypeAliasDeclaration */:
-                    case 279 /* JSDocTypedefTag */:
+                    case 226 /* ClassDeclaration */:
+                    case 197 /* ClassExpression */:
+                    case 229 /* EnumDeclaration */:
+                    case 227 /* InterfaceDeclaration */:
+                    case 230 /* ModuleDeclaration */:
+                    case 261 /* SourceFile */:
+                    case 228 /* TypeAliasDeclaration */:
+                    case 284 /* JSDocTypedefTag */:
                         return true;
-                    case 149 /* Constructor */:
-                    case 148 /* MethodDeclaration */:
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
-                    case 219 /* VariableDeclaration */:
+                    case 150 /* Constructor */:
+                    case 149 /* MethodDeclaration */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* SetAccessor */:
+                    case 223 /* VariableDeclaration */:
                         return hasSomeImportantChild(item);
-                    case 181 /* ArrowFunction */:
-                    case 221 /* FunctionDeclaration */:
-                    case 180 /* FunctionExpression */:
+                    case 185 /* ArrowFunction */:
+                    case 225 /* FunctionDeclaration */:
+                    case 184 /* FunctionExpression */:
                         return isTopLevelFunctionDeclaration(item);
                     default:
                         return false;
@@ -68409,10 +71108,10 @@ var ts;
                         return false;
                     }
                     switch (navigationBarNodeKind(item.parent)) {
-                        case 227 /* ModuleBlock */:
-                        case 256 /* SourceFile */:
-                        case 148 /* MethodDeclaration */:
-                        case 149 /* Constructor */:
+                        case 231 /* ModuleBlock */:
+                        case 261 /* SourceFile */:
+                        case 149 /* MethodDeclaration */:
+                        case 150 /* Constructor */:
                             return true;
                         default:
                             return hasSomeImportantChild(item);
@@ -68421,7 +71120,7 @@ var ts;
                 function hasSomeImportantChild(item) {
                     return ts.forEach(item.children, function (child) {
                         var childKind = navigationBarNodeKind(child);
-                        return childKind !== 219 /* VariableDeclaration */ && childKind !== 170 /* BindingElement */;
+                        return childKind !== 223 /* VariableDeclaration */ && childKind !== 174 /* BindingElement */;
                     });
                 }
             }
@@ -68479,7 +71178,7 @@ var ts;
             // Otherwise, we need to aggregate each identifier to build up the qualified name.
             var result = [];
             result.push(moduleDeclaration.name.text);
-            while (moduleDeclaration.body && moduleDeclaration.body.kind === 226 /* ModuleDeclaration */) {
+            while (moduleDeclaration.body && moduleDeclaration.body.kind === 230 /* ModuleDeclaration */) {
                 moduleDeclaration = moduleDeclaration.body;
                 result.push(moduleDeclaration.name.text);
             }
@@ -68490,13 +71189,13 @@ var ts;
          * We store 'A' as associated with a NavNode, and use getModuleName to traverse down again.
          */
         function getInteriorModule(decl) {
-            return decl.body.kind === 226 /* ModuleDeclaration */ ? getInteriorModule(decl.body) : decl;
+            return decl.body.kind === 230 /* ModuleDeclaration */ ? getInteriorModule(decl.body) : decl;
         }
         function isComputedProperty(member) {
-            return !member.name || member.name.kind === 141 /* ComputedPropertyName */;
+            return !member.name || member.name.kind === 142 /* ComputedPropertyName */;
         }
         function getNodeSpan(node) {
-            return node.kind === 256 /* SourceFile */
+            return node.kind === 261 /* SourceFile */
                 ? ts.createTextSpanFromBounds(node.getFullStart(), node.getEnd())
                 : ts.createTextSpanFromBounds(node.getStart(curSourceFile), node.getEnd());
         }
@@ -68504,14 +71203,14 @@ var ts;
             if (node.name && ts.getFullWidth(node.name) > 0) {
                 return ts.declarationNameToString(node.name);
             }
-            else if (node.parent.kind === 219 /* VariableDeclaration */) {
+            else if (node.parent.kind === 223 /* VariableDeclaration */) {
                 return ts.declarationNameToString(node.parent.name);
             }
-            else if (node.parent.kind === 188 /* BinaryExpression */ &&
+            else if (node.parent.kind === 192 /* BinaryExpression */ &&
                 node.parent.operatorToken.kind === 57 /* EqualsToken */) {
-                return nodeText(node.parent.left);
+                return nodeText(node.parent.left).replace(whiteSpaceRegex, "");
             }
-            else if (node.parent.kind === 253 /* PropertyAssignment */ && node.parent.name) {
+            else if (node.parent.kind === 257 /* PropertyAssignment */ && node.parent.name) {
                 return nodeText(node.parent.name);
             }
             else if (ts.getModifierFlags(node) & 512 /* Default */) {
@@ -68522,8 +71221,22 @@ var ts;
             }
         }
         function isFunctionOrClassExpression(node) {
-            return node.kind === 180 /* FunctionExpression */ || node.kind === 181 /* ArrowFunction */ || node.kind === 193 /* ClassExpression */;
+            return node.kind === 184 /* FunctionExpression */ || node.kind === 185 /* ArrowFunction */ || node.kind === 197 /* ClassExpression */;
         }
+        /**
+         * Matches all whitespace characters in a string. Eg:
+         *
+         * "app.
+         *
+         * onactivated"
+         *
+         * matches because of the newline, whereas
+         *
+         * "app.onactivated"
+         *
+         * does not match.
+         */
+        var whiteSpaceRegex = /\s+/g;
     })(NavigationBar = ts.NavigationBar || (ts.NavigationBar = {}));
 })(ts || (ts = {}));
 /* @internal */
@@ -68598,7 +71311,7 @@ var ts;
                 }
             }
             function autoCollapse(node) {
-                return ts.isFunctionBlock(node) && node.parent.kind !== 181 /* ArrowFunction */;
+                return ts.isFunctionBlock(node) && node.parent.kind !== 185 /* ArrowFunction */;
             }
             var depth = 0;
             var maxDepth = 20;
@@ -68610,30 +71323,30 @@ var ts;
                     addOutliningForLeadingCommentsForNode(n);
                 }
                 switch (n.kind) {
-                    case 200 /* Block */:
+                    case 204 /* Block */:
                         if (!ts.isFunctionBlock(n)) {
-                            var parent_22 = n.parent;
+                            var parent_20 = n.parent;
                             var openBrace = ts.findChildOfKind(n, 16 /* OpenBraceToken */, sourceFile);
                             var closeBrace = ts.findChildOfKind(n, 17 /* CloseBraceToken */, 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.
-                            if (parent_22.kind === 205 /* DoStatement */ ||
-                                parent_22.kind === 208 /* ForInStatement */ ||
-                                parent_22.kind === 209 /* ForOfStatement */ ||
-                                parent_22.kind === 207 /* ForStatement */ ||
-                                parent_22.kind === 204 /* IfStatement */ ||
-                                parent_22.kind === 206 /* WhileStatement */ ||
-                                parent_22.kind === 213 /* WithStatement */ ||
-                                parent_22.kind === 252 /* CatchClause */) {
-                                addOutliningSpan(parent_22, openBrace, closeBrace, autoCollapse(n));
+                            if (parent_20.kind === 209 /* DoStatement */ ||
+                                parent_20.kind === 212 /* ForInStatement */ ||
+                                parent_20.kind === 213 /* ForOfStatement */ ||
+                                parent_20.kind === 211 /* ForStatement */ ||
+                                parent_20.kind === 208 /* IfStatement */ ||
+                                parent_20.kind === 210 /* WhileStatement */ ||
+                                parent_20.kind === 217 /* WithStatement */ ||
+                                parent_20.kind === 256 /* CatchClause */) {
+                                addOutliningSpan(parent_20, openBrace, closeBrace, autoCollapse(n));
                                 break;
                             }
-                            if (parent_22.kind === 217 /* TryStatement */) {
+                            if (parent_20.kind === 221 /* TryStatement */) {
                                 // Could be the try-block, or the finally-block.
-                                var tryStatement = parent_22;
+                                var tryStatement = parent_20;
                                 if (tryStatement.tryBlock === n) {
-                                    addOutliningSpan(parent_22, openBrace, closeBrace, autoCollapse(n));
+                                    addOutliningSpan(parent_20, openBrace, closeBrace, autoCollapse(n));
                                     break;
                                 }
                                 else if (tryStatement.finallyBlock === n) {
@@ -68656,23 +71369,23 @@ var ts;
                             break;
                         }
                     // Fallthrough.
-                    case 227 /* ModuleBlock */: {
+                    case 231 /* ModuleBlock */: {
                         var openBrace = ts.findChildOfKind(n, 16 /* OpenBraceToken */, sourceFile);
                         var closeBrace = ts.findChildOfKind(n, 17 /* CloseBraceToken */, sourceFile);
                         addOutliningSpan(n.parent, openBrace, closeBrace, autoCollapse(n));
                         break;
                     }
-                    case 222 /* ClassDeclaration */:
-                    case 223 /* InterfaceDeclaration */:
-                    case 225 /* EnumDeclaration */:
-                    case 172 /* ObjectLiteralExpression */:
-                    case 228 /* CaseBlock */: {
+                    case 226 /* ClassDeclaration */:
+                    case 227 /* InterfaceDeclaration */:
+                    case 229 /* EnumDeclaration */:
+                    case 176 /* ObjectLiteralExpression */:
+                    case 232 /* CaseBlock */: {
                         var openBrace = ts.findChildOfKind(n, 16 /* OpenBraceToken */, sourceFile);
                         var closeBrace = ts.findChildOfKind(n, 17 /* CloseBraceToken */, sourceFile);
                         addOutliningSpan(n, openBrace, closeBrace, autoCollapse(n));
                         break;
                     }
-                    case 171 /* ArrayLiteralExpression */:
+                    case 175 /* ArrayLiteralExpression */:
                         var openBracket = ts.findChildOfKind(n, 20 /* OpenBracketToken */, sourceFile);
                         var closeBracket = ts.findChildOfKind(n, 21 /* CloseBracketToken */, sourceFile);
                         addOutliningSpan(n, openBracket, closeBracket, autoCollapse(n));
@@ -68692,13 +71405,13 @@ var ts;
 var ts;
 (function (ts) {
     // Note(cyrusn): this enum is ordered from strongest match type to weakest match type.
+    var PatternMatchKind;
     (function (PatternMatchKind) {
         PatternMatchKind[PatternMatchKind["exact"] = 0] = "exact";
         PatternMatchKind[PatternMatchKind["prefix"] = 1] = "prefix";
         PatternMatchKind[PatternMatchKind["substring"] = 2] = "substring";
         PatternMatchKind[PatternMatchKind["camelCase"] = 3] = "camelCase";
-    })(ts.PatternMatchKind || (ts.PatternMatchKind = {}));
-    var PatternMatchKind = ts.PatternMatchKind;
+    })(PatternMatchKind = ts.PatternMatchKind || (ts.PatternMatchKind = {}));
     function createPatternMatch(kind, punctuationStripped, isCaseSensitive, camelCaseWeight) {
         return {
             kind: kind,
@@ -69029,7 +71742,7 @@ var ts;
         if (ch >= 65 /* A */ && ch <= 90 /* Z */) {
             return true;
         }
-        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 4 /* Latest */)) {
+        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 5 /* Latest */)) {
             return false;
         }
         // TODO: find a way to determine this for any unicode characters in a
@@ -69042,7 +71755,7 @@ var ts;
         if (ch >= 97 /* a */ && ch <= 122 /* z */) {
             return true;
         }
-        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 4 /* Latest */)) {
+        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 5 /* Latest */)) {
             return false;
         }
         // TODO: find a way to determine this for any unicode characters in a
@@ -69320,7 +72033,7 @@ var ts;
             if (token === 123 /* DeclareKeyword */) {
                 // declare module "mod"
                 token = nextToken();
-                if (token === 126 /* ModuleKeyword */) {
+                if (token === 127 /* ModuleKeyword */) {
                     token = nextToken();
                     if (token === 9 /* StringLiteral */) {
                         recordAmbientExternalModule();
@@ -69345,7 +72058,7 @@ var ts;
                 else {
                     if (token === 70 /* Identifier */ || ts.isKeyword(token)) {
                         token = nextToken();
-                        if (token === 137 /* FromKeyword */) {
+                        if (token === 138 /* FromKeyword */) {
                             token = nextToken();
                             if (token === 9 /* StringLiteral */) {
                                 // import d from "mod";
@@ -69376,7 +72089,7 @@ var ts;
                         }
                         if (token === 17 /* CloseBraceToken */) {
                             token = nextToken();
-                            if (token === 137 /* FromKeyword */) {
+                            if (token === 138 /* FromKeyword */) {
                                 token = nextToken();
                                 if (token === 9 /* StringLiteral */) {
                                     // import {a as A} from "mod";
@@ -69392,7 +72105,7 @@ var ts;
                             token = nextToken();
                             if (token === 70 /* Identifier */ || ts.isKeyword(token)) {
                                 token = nextToken();
-                                if (token === 137 /* FromKeyword */) {
+                                if (token === 138 /* FromKeyword */) {
                                     token = nextToken();
                                     if (token === 9 /* StringLiteral */) {
                                         // import * as NS from "mod"
@@ -69422,7 +72135,7 @@ var ts;
                     }
                     if (token === 17 /* CloseBraceToken */) {
                         token = nextToken();
-                        if (token === 137 /* FromKeyword */) {
+                        if (token === 138 /* FromKeyword */) {
                             token = nextToken();
                             if (token === 9 /* StringLiteral */) {
                                 // export {a as A} from "mod";
@@ -69434,7 +72147,7 @@ var ts;
                 }
                 else if (token === 38 /* AsteriskToken */) {
                     token = nextToken();
-                    if (token === 137 /* FromKeyword */) {
+                    if (token === 138 /* FromKeyword */) {
                         token = nextToken();
                         if (token === 9 /* StringLiteral */) {
                             // export * from "mod"
@@ -69459,7 +72172,7 @@ var ts;
         }
         function tryConsumeRequireCall(skipCurrentToken) {
             var token = skipCurrentToken ? nextToken() : ts.scanner.getToken();
-            if (token === 130 /* RequireKeyword */) {
+            if (token === 131 /* RequireKeyword */) {
                 token = nextToken();
                 if (token === 18 /* OpenParenToken */) {
                     token = nextToken();
@@ -69814,12 +72527,12 @@ var ts;
         //    return null;
         // }
         var emptyArray = [];
+        var ArgumentListKind;
         (function (ArgumentListKind) {
             ArgumentListKind[ArgumentListKind["TypeArguments"] = 0] = "TypeArguments";
             ArgumentListKind[ArgumentListKind["CallArguments"] = 1] = "CallArguments";
             ArgumentListKind[ArgumentListKind["TaggedTemplateArguments"] = 2] = "TaggedTemplateArguments";
-        })(SignatureHelp.ArgumentListKind || (SignatureHelp.ArgumentListKind = {}));
-        var ArgumentListKind = SignatureHelp.ArgumentListKind;
+        })(ArgumentListKind = SignatureHelp.ArgumentListKind || (SignatureHelp.ArgumentListKind = {}));
         function getSignatureHelpItems(program, sourceFile, position, cancellationToken) {
             var typeChecker = program.getTypeChecker();
             // Decide whether to show signature help
@@ -69850,7 +72563,7 @@ var ts;
         }
         SignatureHelp.getSignatureHelpItems = getSignatureHelpItems;
         function createJavaScriptSignatureHelpItems(argumentInfo, program) {
-            if (argumentInfo.invocation.kind !== 175 /* CallExpression */) {
+            if (argumentInfo.invocation.kind !== 179 /* CallExpression */) {
                 return undefined;
             }
             // See if we can find some symbol with the call expression name that has call signatures.
@@ -69858,7 +72571,7 @@ var ts;
             var expression = callExpression.expression;
             var name = expression.kind === 70 /* Identifier */
                 ? expression
-                : expression.kind === 173 /* PropertyAccessExpression */
+                : expression.kind === 177 /* PropertyAccessExpression */
                     ? expression.name
                     : undefined;
             if (!name || !name.text) {
@@ -69891,7 +72604,7 @@ var ts;
          * in the argument of an invocation; returns undefined otherwise.
          */
         function getImmediatelyContainingArgumentInfo(node, position, sourceFile) {
-            if (node.parent.kind === 175 /* CallExpression */ || node.parent.kind === 176 /* NewExpression */) {
+            if (node.parent.kind === 179 /* CallExpression */ || node.parent.kind === 180 /* NewExpression */) {
                 var callExpression = node.parent;
                 // There are 3 cases to handle:
                 //   1. The token introduces a list, and should begin a sig help session
@@ -69945,25 +72658,25 @@ var ts;
                 }
                 return undefined;
             }
-            else if (node.kind === 12 /* NoSubstitutionTemplateLiteral */ && node.parent.kind === 177 /* TaggedTemplateExpression */) {
+            else if (node.kind === 12 /* NoSubstitutionTemplateLiteral */ && node.parent.kind === 181 /* TaggedTemplateExpression */) {
                 // Check if we're actually inside the template;
                 // otherwise we'll fall out and return undefined.
                 if (ts.isInsideTemplateLiteral(node, position)) {
                     return getArgumentListInfoForTemplate(node.parent, /*argumentIndex*/ 0, sourceFile);
                 }
             }
-            else if (node.kind === 13 /* TemplateHead */ && node.parent.parent.kind === 177 /* TaggedTemplateExpression */) {
+            else if (node.kind === 13 /* TemplateHead */ && node.parent.parent.kind === 181 /* TaggedTemplateExpression */) {
                 var templateExpression = node.parent;
                 var tagExpression = templateExpression.parent;
-                ts.Debug.assert(templateExpression.kind === 190 /* TemplateExpression */);
+                ts.Debug.assert(templateExpression.kind === 194 /* TemplateExpression */);
                 var argumentIndex = ts.isInsideTemplateLiteral(node, position) ? 0 : 1;
                 return getArgumentListInfoForTemplate(tagExpression, argumentIndex, sourceFile);
             }
-            else if (node.parent.kind === 198 /* TemplateSpan */ && node.parent.parent.parent.kind === 177 /* TaggedTemplateExpression */) {
+            else if (node.parent.kind === 202 /* TemplateSpan */ && node.parent.parent.parent.kind === 181 /* TaggedTemplateExpression */) {
                 var templateSpan = node.parent;
                 var templateExpression = templateSpan.parent;
                 var tagExpression = templateExpression.parent;
-                ts.Debug.assert(templateExpression.kind === 190 /* TemplateExpression */);
+                ts.Debug.assert(templateExpression.kind === 194 /* TemplateExpression */);
                 // If we're just after a template tail, don't show signature help.
                 if (node.kind === 15 /* TemplateTail */ && !ts.isInsideTemplateLiteral(node, position)) {
                     return undefined;
@@ -70081,7 +72794,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 === 190 /* TemplateExpression */) {
+            if (template.kind === 194 /* TemplateExpression */) {
                 var lastSpan = ts.lastOrUndefined(template.templateSpans);
                 if (lastSpan.literal.getFullWidth() === 0) {
                     applicableSpanEnd = ts.skipTrivia(sourceFile.text, applicableSpanEnd, /*stopAfterLineBreak*/ false);
@@ -70090,7 +72803,7 @@ var ts;
             return ts.createTextSpan(applicableSpanStart, applicableSpanEnd - applicableSpanStart);
         }
         function getContainingArgumentInfo(node, position, sourceFile) {
-            for (var n = node; n.kind !== 256 /* SourceFile */; n = n.parent) {
+            for (var n = node; n.kind !== 261 /* SourceFile */; n = n.parent) {
                 if (ts.isFunctionBlock(n)) {
                     return undefined;
                 }
@@ -70150,7 +72863,9 @@ var ts;
                 if (callTargetDisplayParts) {
                     ts.addRange(prefixDisplayParts, callTargetDisplayParts);
                 }
+                var isVariadic;
                 if (isTypeParameterList) {
+                    isVariadic = false; // type parameter lists are not variadic
                     prefixDisplayParts.push(ts.punctuationPart(26 /* LessThanToken */));
                     var typeParameters = candidateSignature.typeParameters;
                     signatureHelpParameters = typeParameters && typeParameters.length > 0 ? ts.map(typeParameters, createSignatureHelpParameterForTypeParameter) : emptyArray;
@@ -70161,6 +72876,7 @@ var ts;
                     ts.addRange(suffixDisplayParts, parameterParts);
                 }
                 else {
+                    isVariadic = candidateSignature.hasRestParameter;
                     var typeParameterParts = ts.mapToDisplayParts(function (writer) {
                         return typeChecker.getSymbolDisplayBuilder().buildDisplayForTypeParametersAndDelimiters(candidateSignature.typeParameters, writer, invocation);
                     });
@@ -70175,7 +72891,7 @@ var ts;
                 });
                 ts.addRange(suffixDisplayParts, returnTypeParts);
                 return {
-                    isVariadic: candidateSignature.hasRestParameter,
+                    isVariadic: isVariadic,
                     prefixDisplayParts: prefixDisplayParts,
                     suffixDisplayParts: suffixDisplayParts,
                     separatorDisplayParts: [ts.punctuationPart(25 /* CommaToken */), ts.spacePart()],
@@ -70232,7 +72948,7 @@ var ts;
         function getSymbolKind(typeChecker, symbol, location) {
             var flags = symbol.getFlags();
             if (flags & 32 /* Class */)
-                return ts.getDeclarationOfKind(symbol, 193 /* ClassExpression */) ?
+                return ts.getDeclarationOfKind(symbol, 197 /* ClassExpression */) ?
                     ts.ScriptElementKind.localClassElement : ts.ScriptElementKind.classElement;
             if (flags & 384 /* Enum */)
                 return ts.ScriptElementKind.enumElement;
@@ -70338,7 +73054,7 @@ var ts;
                 var signature = void 0;
                 type = isThisExpression ? typeChecker.getTypeAtLocation(location) : typeChecker.getTypeOfSymbolAtLocation(symbol, location);
                 if (type) {
-                    if (location.parent && location.parent.kind === 173 /* PropertyAccessExpression */) {
+                    if (location.parent && location.parent.kind === 177 /* 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)) {
@@ -70347,7 +73063,7 @@ var ts;
                     }
                     // try get the call/construct signature from the type if it matches
                     var callExpression = void 0;
-                    if (location.kind === 175 /* CallExpression */ || location.kind === 176 /* NewExpression */) {
+                    if (location.kind === 179 /* CallExpression */ || location.kind === 180 /* NewExpression */) {
                         callExpression = location;
                     }
                     else if (ts.isCallExpressionTarget(location) || ts.isNewExpressionTarget(location)) {
@@ -70360,7 +73076,7 @@ var ts;
                             // Use the first candidate:
                             signature = candidateSignatures[0];
                         }
-                        var useConstructSignatures = callExpression.kind === 176 /* NewExpression */ || callExpression.expression.kind === 96 /* SuperKeyword */;
+                        var useConstructSignatures = callExpression.kind === 180 /* NewExpression */ || callExpression.expression.kind === 96 /* 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
@@ -70400,7 +73116,7 @@ var ts;
                                         displayParts.push(ts.keywordPart(93 /* NewKeyword */));
                                         displayParts.push(ts.spacePart());
                                     }
-                                    if (!(type.flags & 2097152 /* Anonymous */) && type.symbol) {
+                                    if (!(type.flags & 32768 /* Object */ && type.objectFlags & 16 /* Anonymous */) && type.symbol) {
                                         ts.addRange(displayParts, ts.symbolToDisplayParts(typeChecker, type.symbol, enclosingDeclaration, /*meaning*/ undefined, 1 /* WriteTypeParametersOrArguments */));
                                     }
                                     addSignatureDisplayParts(signature, allSignatures, 8 /* WriteArrowStyleSignature */);
@@ -70413,24 +73129,24 @@ var ts;
                         }
                     }
                     else if ((ts.isNameOfFunctionDeclaration(location) && !(symbol.flags & 98304 /* Accessor */)) ||
-                        (location.kind === 122 /* ConstructorKeyword */ && location.parent.kind === 149 /* Constructor */)) {
+                        (location.kind === 122 /* ConstructorKeyword */ && location.parent.kind === 150 /* Constructor */)) {
                         // get the signature from the declaration and write it
                         var functionDeclaration = location.parent;
-                        var allSignatures = functionDeclaration.kind === 149 /* Constructor */ ? type.getNonNullableType().getConstructSignatures() : type.getNonNullableType().getCallSignatures();
+                        var allSignatures = functionDeclaration.kind === 150 /* Constructor */ ? type.getNonNullableType().getConstructSignatures() : type.getNonNullableType().getCallSignatures();
                         if (!typeChecker.isImplementationOfOverload(functionDeclaration)) {
                             signature = typeChecker.getSignatureFromDeclaration(functionDeclaration);
                         }
                         else {
                             signature = allSignatures[0];
                         }
-                        if (functionDeclaration.kind === 149 /* Constructor */) {
+                        if (functionDeclaration.kind === 150 /* Constructor */) {
                             // show (constructor) Type(...) signature
                             symbolKind = ts.ScriptElementKind.constructorImplementationElement;
                             addPrefixForAnyFunctionOrVar(type.symbol, symbolKind);
                         }
                         else {
                             // (function/method) symbol(..signature)
-                            addPrefixForAnyFunctionOrVar(functionDeclaration.kind === 152 /* CallSignature */ &&
+                            addPrefixForAnyFunctionOrVar(functionDeclaration.kind === 153 /* CallSignature */ &&
                                 !(type.symbol.flags & 2048 /* TypeLiteral */ || type.symbol.flags & 4096 /* ObjectLiteral */) ? type.symbol : symbol, symbolKind);
                         }
                         addSignatureDisplayParts(signature, allSignatures);
@@ -70439,7 +73155,7 @@ var ts;
                 }
             }
             if (symbolFlags & 32 /* Class */ && !hasAddedSymbolInfo && !isThisExpression) {
-                if (ts.getDeclarationOfKind(symbol, 193 /* ClassExpression */)) {
+                if (ts.getDeclarationOfKind(symbol, 197 /* 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>
@@ -70462,7 +73178,7 @@ var ts;
             }
             if (symbolFlags & 524288 /* TypeAlias */) {
                 addNewLineIfDisplayPartsExist();
-                displayParts.push(ts.keywordPart(135 /* TypeKeyword */));
+                displayParts.push(ts.keywordPart(136 /* TypeKeyword */));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 writeTypeParametersOfSymbol(symbol, sourceFile);
@@ -70483,9 +73199,9 @@ var ts;
             }
             if (symbolFlags & 1536 /* Module */) {
                 addNewLineIfDisplayPartsExist();
-                var declaration = ts.getDeclarationOfKind(symbol, 226 /* ModuleDeclaration */);
+                var declaration = ts.getDeclarationOfKind(symbol, 230 /* ModuleDeclaration */);
                 var isNamespace = declaration && declaration.name && declaration.name.kind === 70 /* Identifier */;
-                displayParts.push(ts.keywordPart(isNamespace ? 127 /* NamespaceKeyword */ : 126 /* ModuleKeyword */));
+                displayParts.push(ts.keywordPart(isNamespace ? 128 /* NamespaceKeyword */ : 127 /* ModuleKeyword */));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
             }
@@ -70496,36 +73212,36 @@ var ts;
                 displayParts.push(ts.punctuationPart(19 /* CloseParenToken */));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
-                displayParts.push(ts.spacePart());
-                displayParts.push(ts.keywordPart(91 /* InKeyword */));
-                displayParts.push(ts.spacePart());
                 if (symbol.parent) {
                     // Class/Interface type parameter
+                    addInPrefix();
                     addFullSymbolName(symbol.parent, enclosingDeclaration);
                     writeTypeParametersOfSymbol(symbol.parent, enclosingDeclaration);
                 }
                 else {
                     // Method/function type parameter
-                    var declaration = ts.getDeclarationOfKind(symbol, 142 /* TypeParameter */);
+                    var declaration = ts.getDeclarationOfKind(symbol, 143 /* TypeParameter */);
                     ts.Debug.assert(declaration !== undefined);
                     declaration = declaration.parent;
                     if (declaration) {
                         if (ts.isFunctionLikeKind(declaration.kind)) {
+                            addInPrefix();
                             var signature = typeChecker.getSignatureFromDeclaration(declaration);
-                            if (declaration.kind === 153 /* ConstructSignature */) {
+                            if (declaration.kind === 154 /* ConstructSignature */) {
                                 displayParts.push(ts.keywordPart(93 /* NewKeyword */));
                                 displayParts.push(ts.spacePart());
                             }
-                            else if (declaration.kind !== 152 /* CallSignature */ && declaration.name) {
+                            else if (declaration.kind !== 153 /* CallSignature */ && declaration.name) {
                                 addFullSymbolName(declaration.symbol);
                             }
                             ts.addRange(displayParts, ts.signatureToDisplayParts(typeChecker, signature, sourceFile, 32 /* WriteTypeArgumentsOfSignature */));
                         }
-                        else {
+                        else if (declaration.kind === 228 /* TypeAliasDeclaration */) {
                             // Type alias type parameter
                             // For example
                             //      type list<T> = T[];  // Both T will go through same code path
-                            displayParts.push(ts.keywordPart(135 /* TypeKeyword */));
+                            addInPrefix();
+                            displayParts.push(ts.keywordPart(136 /* TypeKeyword */));
                             displayParts.push(ts.spacePart());
                             addFullSymbolName(declaration.symbol);
                             writeTypeParametersOfSymbol(declaration.symbol, sourceFile);
@@ -70536,7 +73252,7 @@ var ts;
             if (symbolFlags & 8 /* EnumMember */) {
                 addPrefixForAnyFunctionOrVar(symbol, "enum member");
                 var declaration = symbol.declarations[0];
-                if (declaration.kind === 255 /* EnumMember */) {
+                if (declaration.kind === 260 /* EnumMember */) {
                     var constantValue = typeChecker.getConstantValue(declaration);
                     if (constantValue !== undefined) {
                         displayParts.push(ts.spacePart());
@@ -70548,10 +73264,10 @@ var ts;
             }
             if (symbolFlags & 8388608 /* Alias */) {
                 addNewLineIfDisplayPartsExist();
-                if (symbol.declarations[0].kind === 229 /* NamespaceExportDeclaration */) {
+                if (symbol.declarations[0].kind === 233 /* NamespaceExportDeclaration */) {
                     displayParts.push(ts.keywordPart(83 /* ExportKeyword */));
                     displayParts.push(ts.spacePart());
-                    displayParts.push(ts.keywordPart(127 /* NamespaceKeyword */));
+                    displayParts.push(ts.keywordPart(128 /* NamespaceKeyword */));
                 }
                 else {
                     displayParts.push(ts.keywordPart(90 /* ImportKeyword */));
@@ -70559,13 +73275,13 @@ var ts;
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 ts.forEach(symbol.declarations, function (declaration) {
-                    if (declaration.kind === 230 /* ImportEqualsDeclaration */) {
+                    if (declaration.kind === 234 /* ImportEqualsDeclaration */) {
                         var importEqualsDeclaration = declaration;
                         if (ts.isExternalModuleImportEqualsDeclaration(importEqualsDeclaration)) {
                             displayParts.push(ts.spacePart());
                             displayParts.push(ts.operatorPart(57 /* EqualsToken */));
                             displayParts.push(ts.spacePart());
-                            displayParts.push(ts.keywordPart(130 /* RequireKeyword */));
+                            displayParts.push(ts.keywordPart(131 /* RequireKeyword */));
                             displayParts.push(ts.punctuationPart(18 /* OpenParenToken */));
                             displayParts.push(ts.displayPart(ts.getTextOfNode(ts.getExternalModuleImportEqualsDeclarationExpression(importEqualsDeclaration)), ts.SymbolDisplayPartKind.stringLiteral));
                             displayParts.push(ts.punctuationPart(19 /* CloseParenToken */));
@@ -70632,10 +73348,10 @@ var ts;
                     // For some special property access expressions like `experts.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 === 256 /* SourceFile */; })) {
+                    if (symbol.parent && ts.forEach(symbol.parent.declarations, function (declaration) { return declaration.kind === 261 /* SourceFile */; })) {
                         for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                             var declaration = _a[_i];
-                            if (!declaration.parent || declaration.parent.kind !== 188 /* BinaryExpression */) {
+                            if (!declaration.parent || declaration.parent.kind !== 192 /* BinaryExpression */) {
                                 continue;
                             }
                             var rhsSymbol = typeChecker.getSymbolAtLocation(declaration.parent.right);
@@ -70656,6 +73372,11 @@ var ts;
                     displayParts.push(ts.lineBreakPart());
                 }
             }
+            function addInPrefix() {
+                displayParts.push(ts.spacePart());
+                displayParts.push(ts.keywordPart(91 /* InKeyword */));
+                displayParts.push(ts.spacePart());
+            }
             function addFullSymbolName(symbol, enclosingDeclaration) {
                 var fullSymbolDisplayParts = ts.symbolToDisplayParts(typeChecker, symbol, enclosingDeclaration || sourceFile, /*meaning*/ undefined, 1 /* WriteTypeParametersOrArguments */ | 2 /* UseOnlyExternalAliasing */);
                 ts.addRange(displayParts, fullSymbolDisplayParts);
@@ -70711,16 +73432,16 @@ var ts;
             }
             return ts.forEach(symbol.declarations, function (declaration) {
                 // Function expressions are local
-                if (declaration.kind === 180 /* FunctionExpression */) {
+                if (declaration.kind === 184 /* FunctionExpression */) {
                     return true;
                 }
-                if (declaration.kind !== 219 /* VariableDeclaration */ && declaration.kind !== 221 /* FunctionDeclaration */) {
+                if (declaration.kind !== 223 /* VariableDeclaration */ && declaration.kind !== 225 /* FunctionDeclaration */) {
                     return false;
                 }
                 // If the parent is not sourceFile or module block it is local variable
-                for (var parent_23 = declaration.parent; !ts.isFunctionBlock(parent_23); parent_23 = parent_23.parent) {
+                for (var parent_21 = declaration.parent; !ts.isFunctionBlock(parent_21); parent_21 = parent_21.parent) {
                     // Reached source file or module block
-                    if (parent_23.kind === 256 /* SourceFile */ || parent_23.kind === 227 /* ModuleBlock */) {
+                    if (parent_21.kind === 261 /* SourceFile */ || parent_21.kind === 231 /* ModuleBlock */) {
                         return false;
                     }
                 }
@@ -70831,7 +73552,7 @@ var ts;
             return typeof o.type === "object" && !ts.forEachProperty(o.type, function (v) { return typeof v !== "number"; });
         });
         options = ts.clone(options);
-        var _loop_2 = function (opt) {
+        var _loop_4 = function (opt) {
             if (!ts.hasProperty(options, opt.name)) {
                 return "continue";
             }
@@ -70850,7 +73571,7 @@ var ts;
         };
         for (var _i = 0, commandLineOptionsStringToEnum_1 = commandLineOptionsStringToEnum; _i < commandLineOptionsStringToEnum_1.length; _i++) {
             var opt = commandLineOptionsStringToEnum_1[_i];
-            _loop_2(opt);
+            _loop_4(opt);
         }
         return options;
     }
@@ -70862,8 +73583,8 @@ var ts;
 (function (ts) {
     var formatting;
     (function (formatting) {
-        var standardScanner = ts.createScanner(4 /* Latest */, /*skipTrivia*/ false, 0 /* Standard */);
-        var jsxScanner = ts.createScanner(4 /* Latest */, /*skipTrivia*/ false, 1 /* JSX */);
+        var standardScanner = ts.createScanner(5 /* Latest */, /*skipTrivia*/ false, 0 /* Standard */);
+        var jsxScanner = ts.createScanner(5 /* Latest */, /*skipTrivia*/ false, 1 /* JSX */);
         /**
          * Scanner that is currently used for formatting
          */
@@ -70958,10 +73679,10 @@ var ts;
             function shouldRescanJsxIdentifier(node) {
                 if (node.parent) {
                     switch (node.parent.kind) {
-                        case 246 /* JsxAttribute */:
-                        case 244 /* JsxOpeningElement */:
-                        case 245 /* JsxClosingElement */:
-                        case 243 /* JsxSelfClosingElement */:
+                        case 250 /* JsxAttribute */:
+                        case 248 /* JsxOpeningElement */:
+                        case 249 /* JsxClosingElement */:
+                        case 247 /* JsxSelfClosingElement */:
                             return node.kind === 70 /* Identifier */;
                     }
                 }
@@ -71196,14 +73917,14 @@ var ts;
 (function (ts) {
     var formatting;
     (function (formatting) {
+        var FormattingRequestKind;
         (function (FormattingRequestKind) {
             FormattingRequestKind[FormattingRequestKind["FormatDocument"] = 0] = "FormatDocument";
             FormattingRequestKind[FormattingRequestKind["FormatSelection"] = 1] = "FormatSelection";
             FormattingRequestKind[FormattingRequestKind["FormatOnEnter"] = 2] = "FormatOnEnter";
             FormattingRequestKind[FormattingRequestKind["FormatOnSemicolon"] = 3] = "FormatOnSemicolon";
             FormattingRequestKind[FormattingRequestKind["FormatOnClosingCurlyBrace"] = 4] = "FormatOnClosingCurlyBrace";
-        })(formatting.FormattingRequestKind || (formatting.FormattingRequestKind = {}));
-        var FormattingRequestKind = formatting.FormattingRequestKind;
+        })(FormattingRequestKind = formatting.FormattingRequestKind || (formatting.FormattingRequestKind = {}));
     })(formatting = ts.formatting || (ts.formatting = {}));
 })(ts || (ts = {}));
 ///<reference path='references.ts' />
@@ -71235,13 +73956,13 @@ var ts;
 (function (ts) {
     var formatting;
     (function (formatting) {
+        var RuleAction;
         (function (RuleAction) {
             RuleAction[RuleAction["Ignore"] = 1] = "Ignore";
             RuleAction[RuleAction["Space"] = 2] = "Space";
             RuleAction[RuleAction["NewLine"] = 4] = "NewLine";
             RuleAction[RuleAction["Delete"] = 8] = "Delete";
-        })(formatting.RuleAction || (formatting.RuleAction = {}));
-        var RuleAction = formatting.RuleAction;
+        })(RuleAction = formatting.RuleAction || (formatting.RuleAction = {}));
     })(formatting = ts.formatting || (ts.formatting = {}));
 })(ts || (ts = {}));
 ///<reference path='references.ts' />
@@ -71282,11 +74003,11 @@ var ts;
 (function (ts) {
     var formatting;
     (function (formatting) {
+        var RuleFlags;
         (function (RuleFlags) {
             RuleFlags[RuleFlags["None"] = 0] = "None";
             RuleFlags[RuleFlags["CanDeleteNewLines"] = 1] = "CanDeleteNewLines";
-        })(formatting.RuleFlags || (formatting.RuleFlags = {}));
-        var RuleFlags = formatting.RuleFlags;
+        })(RuleFlags = formatting.RuleFlags || (formatting.RuleFlags = {}));
     })(formatting = ts.formatting || (ts.formatting = {}));
 })(ts || (ts = {}));
 ///<reference path='references.ts' />
@@ -71437,7 +74158,7 @@ var ts;
                 this.SpaceAfterTryFinally = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([101 /* TryKeyword */, 86 /* FinallyKeyword */]), 16 /* OpenBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
                 //      get x() {}
                 //      set x(val) {}
-                this.SpaceAfterGetSetInMember = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([124 /* GetKeyword */, 132 /* SetKeyword */]), 70 /* Identifier */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2 /* Space */));
+                this.SpaceAfterGetSetInMember = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([124 /* GetKeyword */, 133 /* SetKeyword */]), 70 /* Identifier */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2 /* Space */));
                 // Special case for binary operators (that are keywords). For these we have to add a space and shouldn't follow any user options.
                 this.SpaceBeforeBinaryKeywordOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryKeywordOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
                 this.SpaceAfterBinaryKeywordOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.BinaryKeywordOperators, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
@@ -71445,10 +74166,10 @@ var ts;
                 // Treat constructor as an identifier in a function declaration, and remove spaces between constructor and following left parentheses
                 this.NoSpaceAfterConstructor = new formatting.Rule(formatting.RuleDescriptor.create1(122 /* ConstructorKeyword */, 18 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
                 // Use of module as a function call. e.g.: import m2 = module("m2");
-                this.NoSpaceAfterModuleImport = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([126 /* ModuleKeyword */, 130 /* RequireKeyword */]), 18 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceAfterModuleImport = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([127 /* ModuleKeyword */, 131 /* RequireKeyword */]), 18 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
                 // Add a space around certain TypeScript keywords
-                this.SpaceAfterCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([116 /* AbstractKeyword */, 74 /* ClassKeyword */, 123 /* DeclareKeyword */, 78 /* DefaultKeyword */, 82 /* EnumKeyword */, 83 /* ExportKeyword */, 84 /* ExtendsKeyword */, 124 /* GetKeyword */, 107 /* ImplementsKeyword */, 90 /* ImportKeyword */, 108 /* InterfaceKeyword */, 126 /* ModuleKeyword */, 127 /* NamespaceKeyword */, 111 /* PrivateKeyword */, 113 /* PublicKeyword */, 112 /* ProtectedKeyword */, 132 /* SetKeyword */, 114 /* StaticKeyword */, 135 /* TypeKeyword */, 137 /* FromKeyword */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
-                this.SpaceBeforeCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([84 /* ExtendsKeyword */, 107 /* ImplementsKeyword */, 137 /* FromKeyword */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
+                this.SpaceAfterCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([116 /* AbstractKeyword */, 74 /* ClassKeyword */, 123 /* DeclareKeyword */, 78 /* DefaultKeyword */, 82 /* EnumKeyword */, 83 /* ExportKeyword */, 84 /* ExtendsKeyword */, 124 /* GetKeyword */, 107 /* ImplementsKeyword */, 90 /* ImportKeyword */, 108 /* InterfaceKeyword */, 127 /* ModuleKeyword */, 128 /* NamespaceKeyword */, 111 /* PrivateKeyword */, 113 /* PublicKeyword */, 112 /* ProtectedKeyword */, 133 /* SetKeyword */, 114 /* StaticKeyword */, 136 /* TypeKeyword */, 138 /* FromKeyword */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
+                this.SpaceBeforeCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([84 /* ExtendsKeyword */, 107 /* ImplementsKeyword */, 138 /* FromKeyword */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.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" {
                 this.SpaceAfterModuleName = new formatting.Rule(formatting.RuleDescriptor.create1(9 /* StringLiteral */, 16 /* OpenBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsModuleDeclContext), 2 /* Space */));
                 // Lambda expressions
@@ -71468,7 +74189,7 @@ var ts;
                 // decorators
                 this.SpaceBeforeAt = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 56 /* AtToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
                 this.NoSpaceAfterAt = new formatting.Rule(formatting.RuleDescriptor.create3(56 /* AtToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
-                this.SpaceAfterDecorator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([116 /* AbstractKeyword */, 70 /* Identifier */, 83 /* ExportKeyword */, 78 /* DefaultKeyword */, 74 /* ClassKeyword */, 114 /* StaticKeyword */, 113 /* PublicKeyword */, 111 /* PrivateKeyword */, 112 /* ProtectedKeyword */, 124 /* GetKeyword */, 132 /* SetKeyword */, 20 /* OpenBracketToken */, 38 /* AsteriskToken */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsEndOfDecoratorContextOnSameLine), 2 /* Space */));
+                this.SpaceAfterDecorator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([116 /* AbstractKeyword */, 70 /* Identifier */, 83 /* ExportKeyword */, 78 /* DefaultKeyword */, 74 /* ClassKeyword */, 114 /* StaticKeyword */, 113 /* PublicKeyword */, 111 /* PrivateKeyword */, 112 /* ProtectedKeyword */, 124 /* GetKeyword */, 133 /* SetKeyword */, 20 /* OpenBracketToken */, 38 /* AsteriskToken */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsEndOfDecoratorContextOnSameLine), 2 /* Space */));
                 this.NoSpaceBetweenFunctionKeywordAndStar = new formatting.Rule(formatting.RuleDescriptor.create1(88 /* FunctionKeyword */, 38 /* AsteriskToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclarationOrFunctionExpressionContext), 8 /* Delete */));
                 this.SpaceAfterStarInGeneratorDeclaration = new formatting.Rule(formatting.RuleDescriptor.create3(38 /* AsteriskToken */, formatting.Shared.TokenRange.FromTokens([70 /* Identifier */, 18 /* OpenParenToken */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclarationOrFunctionExpressionContext), 2 /* Space */));
                 this.NoSpaceBetweenYieldKeywordAndStar = new formatting.Rule(formatting.RuleDescriptor.create1(115 /* YieldKeyword */, 38 /* AsteriskToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsYieldOrYieldStarWithOperand), 8 /* Delete */));
@@ -71596,9 +74317,9 @@ var ts;
             }
             Rules.prototype.getRuleName = function (rule) {
                 var o = this;
-                for (var name_51 in o) {
-                    if (o[name_51] === rule) {
-                        return name_51;
+                for (var name_47 in o) {
+                    if (o[name_47] === rule) {
+                        return name_47;
                     }
                 }
                 throw new Error("Unknown rule");
@@ -71607,42 +74328,42 @@ var ts;
             /// Contexts
             ///
             Rules.IsForContext = function (context) {
-                return context.contextNode.kind === 207 /* ForStatement */;
+                return context.contextNode.kind === 211 /* ForStatement */;
             };
             Rules.IsNotForContext = function (context) {
                 return !Rules.IsForContext(context);
             };
             Rules.IsBinaryOpContext = function (context) {
                 switch (context.contextNode.kind) {
-                    case 188 /* BinaryExpression */:
-                    case 189 /* ConditionalExpression */:
-                    case 196 /* AsExpression */:
-                    case 239 /* ExportSpecifier */:
-                    case 235 /* ImportSpecifier */:
-                    case 155 /* TypePredicate */:
-                    case 163 /* UnionType */:
-                    case 164 /* IntersectionType */:
+                    case 192 /* BinaryExpression */:
+                    case 193 /* ConditionalExpression */:
+                    case 200 /* AsExpression */:
+                    case 243 /* ExportSpecifier */:
+                    case 239 /* ImportSpecifier */:
+                    case 156 /* TypePredicate */:
+                    case 164 /* UnionType */:
+                    case 165 /* IntersectionType */:
                         return true;
                     // equals in binding elements: function foo([[x, y] = [1, 2]])
-                    case 170 /* BindingElement */:
+                    case 174 /* BindingElement */:
                     // equals in type X = ...
-                    case 224 /* TypeAliasDeclaration */:
+                    case 228 /* TypeAliasDeclaration */:
                     // equal in import a = module('a');
-                    case 230 /* ImportEqualsDeclaration */:
+                    case 234 /* ImportEqualsDeclaration */:
                     // equal in let a = 0;
-                    case 219 /* VariableDeclaration */:
+                    case 223 /* VariableDeclaration */:
                     // equal in p = 0;
-                    case 143 /* Parameter */:
-                    case 255 /* EnumMember */:
-                    case 146 /* PropertyDeclaration */:
-                    case 145 /* PropertySignature */:
+                    case 144 /* Parameter */:
+                    case 260 /* EnumMember */:
+                    case 147 /* PropertyDeclaration */:
+                    case 146 /* PropertySignature */:
                         return context.currentTokenSpan.kind === 57 /* EqualsToken */ || context.nextTokenSpan.kind === 57 /* EqualsToken */;
                     // "in" keyword in for (let x in []) { }
-                    case 208 /* ForInStatement */:
+                    case 212 /* ForInStatement */:
                         return context.currentTokenSpan.kind === 91 /* InKeyword */ || context.nextTokenSpan.kind === 91 /* InKeyword */;
                     // Technically, "of" is not a binary operator, but format it the same way as "in"
-                    case 209 /* ForOfStatement */:
-                        return context.currentTokenSpan.kind === 139 /* OfKeyword */ || context.nextTokenSpan.kind === 139 /* OfKeyword */;
+                    case 213 /* ForOfStatement */:
+                        return context.currentTokenSpan.kind === 140 /* OfKeyword */ || context.nextTokenSpan.kind === 140 /* OfKeyword */;
                 }
                 return false;
             };
@@ -71650,7 +74371,7 @@ var ts;
                 return !Rules.IsBinaryOpContext(context);
             };
             Rules.IsConditionalOperatorContext = function (context) {
-                return context.contextNode.kind === 189 /* ConditionalExpression */;
+                return context.contextNode.kind === 193 /* ConditionalExpression */;
             };
             Rules.IsSameLineTokenOrBeforeMultilineBlockContext = function (context) {
                 //// This check is mainly used inside SpaceBeforeOpenBraceInControl and SpaceBeforeOpenBraceInFunction.
@@ -71694,97 +74415,97 @@ var ts;
                     return true;
                 }
                 switch (node.kind) {
-                    case 200 /* Block */:
-                    case 228 /* CaseBlock */:
-                    case 172 /* ObjectLiteralExpression */:
-                    case 227 /* ModuleBlock */:
+                    case 204 /* Block */:
+                    case 232 /* CaseBlock */:
+                    case 176 /* ObjectLiteralExpression */:
+                    case 231 /* ModuleBlock */:
                         return true;
                 }
                 return false;
             };
             Rules.IsFunctionDeclContext = function (context) {
                 switch (context.contextNode.kind) {
-                    case 221 /* FunctionDeclaration */:
-                    case 148 /* MethodDeclaration */:
-                    case 147 /* MethodSignature */:
+                    case 225 /* FunctionDeclaration */:
+                    case 149 /* MethodDeclaration */:
+                    case 148 /* MethodSignature */:
                     // case SyntaxKind.MemberFunctionDeclaration:
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* SetAccessor */:
                     // case SyntaxKind.MethodSignature:
-                    case 152 /* CallSignature */:
-                    case 180 /* FunctionExpression */:
-                    case 149 /* Constructor */:
-                    case 181 /* ArrowFunction */:
+                    case 153 /* CallSignature */:
+                    case 184 /* FunctionExpression */:
+                    case 150 /* Constructor */:
+                    case 185 /* ArrowFunction */:
                     // case SyntaxKind.ConstructorDeclaration:
                     // case SyntaxKind.SimpleArrowFunctionExpression:
                     // case SyntaxKind.ParenthesizedArrowFunctionExpression:
-                    case 223 /* InterfaceDeclaration */:
+                    case 227 /* InterfaceDeclaration */:
                         return true;
                 }
                 return false;
             };
             Rules.IsFunctionDeclarationOrFunctionExpressionContext = function (context) {
-                return context.contextNode.kind === 221 /* FunctionDeclaration */ || context.contextNode.kind === 180 /* FunctionExpression */;
+                return context.contextNode.kind === 225 /* FunctionDeclaration */ || context.contextNode.kind === 184 /* FunctionExpression */;
             };
             Rules.IsTypeScriptDeclWithBlockContext = function (context) {
                 return Rules.NodeIsTypeScriptDeclWithBlockContext(context.contextNode);
             };
             Rules.NodeIsTypeScriptDeclWithBlockContext = function (node) {
                 switch (node.kind) {
-                    case 222 /* ClassDeclaration */:
-                    case 193 /* ClassExpression */:
-                    case 223 /* InterfaceDeclaration */:
-                    case 225 /* EnumDeclaration */:
-                    case 160 /* TypeLiteral */:
-                    case 226 /* ModuleDeclaration */:
-                    case 237 /* ExportDeclaration */:
-                    case 238 /* NamedExports */:
-                    case 231 /* ImportDeclaration */:
-                    case 234 /* NamedImports */:
+                    case 226 /* ClassDeclaration */:
+                    case 197 /* ClassExpression */:
+                    case 227 /* InterfaceDeclaration */:
+                    case 229 /* EnumDeclaration */:
+                    case 161 /* TypeLiteral */:
+                    case 230 /* ModuleDeclaration */:
+                    case 241 /* ExportDeclaration */:
+                    case 242 /* NamedExports */:
+                    case 235 /* ImportDeclaration */:
+                    case 238 /* NamedImports */:
                         return true;
                 }
                 return false;
             };
             Rules.IsAfterCodeBlockContext = function (context) {
                 switch (context.currentTokenParent.kind) {
-                    case 222 /* ClassDeclaration */:
-                    case 226 /* ModuleDeclaration */:
-                    case 225 /* EnumDeclaration */:
-                    case 200 /* Block */:
-                    case 252 /* CatchClause */:
-                    case 227 /* ModuleBlock */:
-                    case 214 /* SwitchStatement */:
+                    case 226 /* ClassDeclaration */:
+                    case 230 /* ModuleDeclaration */:
+                    case 229 /* EnumDeclaration */:
+                    case 204 /* Block */:
+                    case 256 /* CatchClause */:
+                    case 231 /* ModuleBlock */:
+                    case 218 /* SwitchStatement */:
                         return true;
                 }
                 return false;
             };
             Rules.IsControlDeclContext = function (context) {
                 switch (context.contextNode.kind) {
-                    case 204 /* IfStatement */:
-                    case 214 /* SwitchStatement */:
-                    case 207 /* ForStatement */:
-                    case 208 /* ForInStatement */:
-                    case 209 /* ForOfStatement */:
-                    case 206 /* WhileStatement */:
-                    case 217 /* TryStatement */:
-                    case 205 /* DoStatement */:
-                    case 213 /* WithStatement */:
+                    case 208 /* IfStatement */:
+                    case 218 /* SwitchStatement */:
+                    case 211 /* ForStatement */:
+                    case 212 /* ForInStatement */:
+                    case 213 /* ForOfStatement */:
+                    case 210 /* WhileStatement */:
+                    case 221 /* TryStatement */:
+                    case 209 /* DoStatement */:
+                    case 217 /* WithStatement */:
                     // TODO
                     // case SyntaxKind.ElseClause:
-                    case 252 /* CatchClause */:
+                    case 256 /* CatchClause */:
                         return true;
                     default:
                         return false;
                 }
             };
             Rules.IsObjectContext = function (context) {
-                return context.contextNode.kind === 172 /* ObjectLiteralExpression */;
+                return context.contextNode.kind === 176 /* ObjectLiteralExpression */;
             };
             Rules.IsFunctionCallContext = function (context) {
-                return context.contextNode.kind === 175 /* CallExpression */;
+                return context.contextNode.kind === 179 /* CallExpression */;
             };
             Rules.IsNewContext = function (context) {
-                return context.contextNode.kind === 176 /* NewExpression */;
+                return context.contextNode.kind === 180 /* NewExpression */;
             };
             Rules.IsFunctionCallOrNewContext = function (context) {
                 return Rules.IsFunctionCallContext(context) || Rules.IsNewContext(context);
@@ -71796,25 +74517,25 @@ var ts;
                 return context.nextTokenSpan.kind !== 21 /* CloseBracketToken */;
             };
             Rules.IsArrowFunctionContext = function (context) {
-                return context.contextNode.kind === 181 /* ArrowFunction */;
+                return context.contextNode.kind === 185 /* ArrowFunction */;
             };
             Rules.IsNonJsxSameLineTokenContext = function (context) {
                 return context.TokensAreOnSameLine() && context.contextNode.kind !== 10 /* JsxText */;
             };
             Rules.IsNonJsxElementContext = function (context) {
-                return context.contextNode.kind !== 242 /* JsxElement */;
+                return context.contextNode.kind !== 246 /* JsxElement */;
             };
             Rules.IsJsxExpressionContext = function (context) {
-                return context.contextNode.kind === 248 /* JsxExpression */;
+                return context.contextNode.kind === 252 /* JsxExpression */;
             };
             Rules.IsNextTokenParentJsxAttribute = function (context) {
-                return context.nextTokenParent.kind === 246 /* JsxAttribute */;
+                return context.nextTokenParent.kind === 250 /* JsxAttribute */;
             };
             Rules.IsJsxAttributeContext = function (context) {
-                return context.contextNode.kind === 246 /* JsxAttribute */;
+                return context.contextNode.kind === 250 /* JsxAttribute */;
             };
             Rules.IsJsxSelfClosingElementContext = function (context) {
-                return context.contextNode.kind === 243 /* JsxSelfClosingElement */;
+                return context.contextNode.kind === 247 /* JsxSelfClosingElement */;
             };
             Rules.IsNotBeforeBlockInFunctionDeclarationContext = function (context) {
                 return !Rules.IsFunctionDeclContext(context) && !Rules.IsBeforeBlockContext(context);
@@ -71829,41 +74550,41 @@ var ts;
                 while (ts.isPartOfExpression(node)) {
                     node = node.parent;
                 }
-                return node.kind === 144 /* Decorator */;
+                return node.kind === 145 /* Decorator */;
             };
             Rules.IsStartOfVariableDeclarationList = function (context) {
-                return context.currentTokenParent.kind === 220 /* VariableDeclarationList */ &&
+                return context.currentTokenParent.kind === 224 /* VariableDeclarationList */ &&
                     context.currentTokenParent.getStart(context.sourceFile) === context.currentTokenSpan.pos;
             };
             Rules.IsNotFormatOnEnter = function (context) {
                 return context.formattingRequestKind !== 2 /* FormatOnEnter */;
             };
             Rules.IsModuleDeclContext = function (context) {
-                return context.contextNode.kind === 226 /* ModuleDeclaration */;
+                return context.contextNode.kind === 230 /* ModuleDeclaration */;
             };
             Rules.IsObjectTypeContext = function (context) {
-                return context.contextNode.kind === 160 /* TypeLiteral */; // && context.contextNode.parent.kind !== SyntaxKind.InterfaceDeclaration;
+                return context.contextNode.kind === 161 /* TypeLiteral */; // && context.contextNode.parent.kind !== SyntaxKind.InterfaceDeclaration;
             };
             Rules.IsTypeArgumentOrParameterOrAssertion = function (token, parent) {
                 if (token.kind !== 26 /* LessThanToken */ && token.kind !== 28 /* GreaterThanToken */) {
                     return false;
                 }
                 switch (parent.kind) {
-                    case 156 /* TypeReference */:
-                    case 178 /* TypeAssertionExpression */:
-                    case 222 /* ClassDeclaration */:
-                    case 193 /* ClassExpression */:
-                    case 223 /* InterfaceDeclaration */:
-                    case 221 /* FunctionDeclaration */:
-                    case 180 /* FunctionExpression */:
-                    case 181 /* ArrowFunction */:
-                    case 148 /* MethodDeclaration */:
-                    case 147 /* MethodSignature */:
-                    case 152 /* CallSignature */:
-                    case 153 /* ConstructSignature */:
-                    case 175 /* CallExpression */:
-                    case 176 /* NewExpression */:
-                    case 195 /* ExpressionWithTypeArguments */:
+                    case 157 /* TypeReference */:
+                    case 182 /* TypeAssertionExpression */:
+                    case 226 /* ClassDeclaration */:
+                    case 197 /* ClassExpression */:
+                    case 227 /* InterfaceDeclaration */:
+                    case 225 /* FunctionDeclaration */:
+                    case 184 /* FunctionExpression */:
+                    case 185 /* ArrowFunction */:
+                    case 149 /* MethodDeclaration */:
+                    case 148 /* MethodSignature */:
+                    case 153 /* CallSignature */:
+                    case 154 /* ConstructSignature */:
+                    case 179 /* CallExpression */:
+                    case 180 /* NewExpression */:
+                    case 199 /* ExpressionWithTypeArguments */:
                         return true;
                     default:
                         return false;
@@ -71874,13 +74595,13 @@ var ts;
                     Rules.IsTypeArgumentOrParameterOrAssertion(context.nextTokenSpan, context.nextTokenParent);
             };
             Rules.IsTypeAssertionContext = function (context) {
-                return context.contextNode.kind === 178 /* TypeAssertionExpression */;
+                return context.contextNode.kind === 182 /* TypeAssertionExpression */;
             };
             Rules.IsVoidOpContext = function (context) {
-                return context.currentTokenSpan.kind === 104 /* VoidKeyword */ && context.currentTokenParent.kind === 184 /* VoidExpression */;
+                return context.currentTokenSpan.kind === 104 /* VoidKeyword */ && context.currentTokenParent.kind === 188 /* VoidExpression */;
             };
             Rules.IsYieldOrYieldStarWithOperand = function (context) {
-                return context.contextNode.kind === 191 /* YieldExpression */ && context.contextNode.expression !== undefined;
+                return context.contextNode.kind === 195 /* YieldExpression */ && context.contextNode.expression !== undefined;
             };
             return Rules;
         }());
@@ -71904,7 +74625,7 @@ var ts;
                 return result;
             };
             RulesMap.prototype.Initialize = function (rules) {
-                this.mapRowLength = 139 /* LastToken */ + 1;
+                this.mapRowLength = 140 /* LastToken */ + 1;
                 this.map = new Array(this.mapRowLength * this.mapRowLength); // new Array<RulesBucket>(this.mapRowLength * this.mapRowLength);
                 // This array is used only during construction of the rulesbucket in the map
                 var rulesBucketConstructionStateList = new Array(this.map.length); // new Array<RulesBucketConstructionState>(this.map.length);
@@ -71918,7 +74639,7 @@ var ts;
                 });
             };
             RulesMap.prototype.GetRuleBucketIndex = function (row, column) {
-                ts.Debug.assert(row <= 139 /* LastKeyword */ && column <= 139 /* LastKeyword */, "Must compute formatting context from tokens");
+                ts.Debug.assert(row <= 140 /* LastKeyword */ && column <= 140 /* LastKeyword */, "Must compute formatting context from tokens");
                 var rulesBucketIndex = (row * this.mapRowLength) + column;
                 return rulesBucketIndex;
             };
@@ -71955,6 +74676,7 @@ var ts;
         formatting.RulesMap = RulesMap;
         var MaskBitSize = 5;
         var Mask = 0x1f;
+        var RulesPosition;
         (function (RulesPosition) {
             RulesPosition[RulesPosition["IgnoreRulesSpecific"] = 0] = "IgnoreRulesSpecific";
             RulesPosition[RulesPosition["IgnoreRulesAny"] = MaskBitSize * 1] = "IgnoreRulesAny";
@@ -71962,8 +74684,7 @@ var ts;
             RulesPosition[RulesPosition["ContextRulesAny"] = MaskBitSize * 3] = "ContextRulesAny";
             RulesPosition[RulesPosition["NoContextRulesSpecific"] = MaskBitSize * 4] = "NoContextRulesSpecific";
             RulesPosition[RulesPosition["NoContextRulesAny"] = MaskBitSize * 5] = "NoContextRulesAny";
-        })(formatting.RulesPosition || (formatting.RulesPosition = {}));
-        var RulesPosition = formatting.RulesPosition;
+        })(RulesPosition = formatting.RulesPosition || (formatting.RulesPosition = {}));
         var RulesBucketConstructionState = (function () {
             function RulesBucketConstructionState() {
                 //// The Rules list contains all the inserted rules into a rulebucket in the following order:
@@ -72099,7 +74820,7 @@ var ts;
                 }
                 TokenAllAccess.prototype.GetTokens = function () {
                     var result = [];
-                    for (var token = 0 /* FirstToken */; token <= 139 /* LastToken */; token++) {
+                    for (var token = 0 /* FirstToken */; token <= 140 /* LastToken */; token++) {
                         result.push(token);
                     }
                     return result;
@@ -72143,9 +74864,9 @@ var ts;
             }());
             TokenRange.Any = TokenRange.AllTokens();
             TokenRange.AnyIncludingMultilineComments = TokenRange.FromTokens(TokenRange.Any.GetTokens().concat([3 /* MultiLineCommentTrivia */]));
-            TokenRange.Keywords = TokenRange.FromRange(71 /* FirstKeyword */, 139 /* LastKeyword */);
+            TokenRange.Keywords = TokenRange.FromRange(71 /* FirstKeyword */, 140 /* LastKeyword */);
             TokenRange.BinaryOperators = TokenRange.FromRange(26 /* FirstBinaryOperator */, 69 /* LastBinaryOperator */);
-            TokenRange.BinaryKeywordOperators = TokenRange.FromTokens([91 /* InKeyword */, 92 /* InstanceOfKeyword */, 139 /* OfKeyword */, 117 /* AsKeyword */, 125 /* IsKeyword */]);
+            TokenRange.BinaryKeywordOperators = TokenRange.FromTokens([91 /* InKeyword */, 92 /* InstanceOfKeyword */, 140 /* OfKeyword */, 117 /* AsKeyword */, 125 /* IsKeyword */]);
             TokenRange.UnaryPrefixOperators = TokenRange.FromTokens([42 /* PlusPlusToken */, 43 /* MinusMinusToken */, 51 /* TildeToken */, 50 /* ExclamationToken */]);
             TokenRange.UnaryPrefixExpressions = TokenRange.FromTokens([8 /* NumericLiteral */, 70 /* Identifier */, 18 /* OpenParenToken */, 20 /* OpenBracketToken */, 16 /* OpenBraceToken */, 98 /* ThisKeyword */, 93 /* NewKeyword */]);
             TokenRange.UnaryPreincrementExpressions = TokenRange.FromTokens([70 /* Identifier */, 18 /* OpenParenToken */, 98 /* ThisKeyword */, 93 /* NewKeyword */]);
@@ -72153,7 +74874,7 @@ var ts;
             TokenRange.UnaryPredecrementExpressions = TokenRange.FromTokens([70 /* Identifier */, 18 /* OpenParenToken */, 98 /* ThisKeyword */, 93 /* NewKeyword */]);
             TokenRange.UnaryPostdecrementExpressions = TokenRange.FromTokens([70 /* Identifier */, 19 /* CloseParenToken */, 21 /* CloseBracketToken */, 93 /* NewKeyword */]);
             TokenRange.Comments = TokenRange.FromTokens([2 /* SingleLineCommentTrivia */, 3 /* MultiLineCommentTrivia */]);
-            TokenRange.TypeNames = TokenRange.FromTokens([70 /* Identifier */, 131 /* NumberKeyword */, 133 /* StringKeyword */, 121 /* BooleanKeyword */, 134 /* SymbolKeyword */, 104 /* VoidKeyword */, 118 /* AnyKeyword */]);
+            TokenRange.TypeNames = TokenRange.FromTokens([70 /* Identifier */, 132 /* NumberKeyword */, 134 /* StringKeyword */, 121 /* BooleanKeyword */, 135 /* SymbolKeyword */, 104 /* VoidKeyword */, 118 /* AnyKeyword */]);
             Shared.TokenRange = TokenRange;
         })(Shared = formatting.Shared || (formatting.Shared = {}));
     })(formatting = ts.formatting || (ts.formatting = {}));
@@ -72412,17 +75133,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 222 /* ClassDeclaration */:
-                case 223 /* InterfaceDeclaration */:
+                case 226 /* ClassDeclaration */:
+                case 227 /* InterfaceDeclaration */:
                     return ts.rangeContainsRange(parent.members, node);
-                case 226 /* ModuleDeclaration */:
+                case 230 /* ModuleDeclaration */:
                     var body = parent.body;
-                    return body && body.kind === 227 /* ModuleBlock */ && ts.rangeContainsRange(body.statements, node);
-                case 256 /* SourceFile */:
-                case 200 /* Block */:
-                case 227 /* ModuleBlock */:
+                    return body && body.kind === 231 /* ModuleBlock */ && ts.rangeContainsRange(body.statements, node);
+                case 261 /* SourceFile */:
+                case 204 /* Block */:
+                case 231 /* ModuleBlock */:
                     return ts.rangeContainsRange(parent.statements, node);
-                case 252 /* CatchClause */:
+                case 256 /* CatchClause */:
                     return ts.rangeContainsRange(parent.block.statements, node);
             }
             return false;
@@ -72627,20 +75348,20 @@ var ts;
                     return node.modifiers[0].kind;
                 }
                 switch (node.kind) {
-                    case 222 /* ClassDeclaration */: return 74 /* ClassKeyword */;
-                    case 223 /* InterfaceDeclaration */: return 108 /* InterfaceKeyword */;
-                    case 221 /* FunctionDeclaration */: return 88 /* FunctionKeyword */;
-                    case 225 /* EnumDeclaration */: return 225 /* EnumDeclaration */;
-                    case 150 /* GetAccessor */: return 124 /* GetKeyword */;
-                    case 151 /* SetAccessor */: return 132 /* SetKeyword */;
-                    case 148 /* MethodDeclaration */:
+                    case 226 /* ClassDeclaration */: return 74 /* ClassKeyword */;
+                    case 227 /* InterfaceDeclaration */: return 108 /* InterfaceKeyword */;
+                    case 225 /* FunctionDeclaration */: return 88 /* FunctionKeyword */;
+                    case 229 /* EnumDeclaration */: return 229 /* EnumDeclaration */;
+                    case 151 /* GetAccessor */: return 124 /* GetKeyword */;
+                    case 152 /* SetAccessor */: return 133 /* SetKeyword */;
+                    case 149 /* MethodDeclaration */:
                         if (node.asteriskToken) {
                             return 38 /* AsteriskToken */;
                         } /*
                     fall-through
                     */
-                    case 146 /* PropertyDeclaration */:
-                    case 143 /* Parameter */:
+                    case 147 /* PropertyDeclaration */:
+                    case 144 /* Parameter */:
                         return node.name.kind;
                 }
             }
@@ -72784,11 +75505,11 @@ var ts;
                         consumeTokenAndAdvanceScanner(tokenInfo, node, parentDynamicIndentation, child);
                         return inheritedIndentation;
                     }
-                    var effectiveParentStartLine = child.kind === 144 /* Decorator */ ? childStartLine : undecoratedParentStartLine;
+                    var effectiveParentStartLine = child.kind === 145 /* Decorator */ ? childStartLine : undecoratedParentStartLine;
                     var childIndentation = computeIndentation(child, childStartLine, childIndentationAmount, node, parentDynamicIndentation, effectiveParentStartLine);
                     processNode(child, childContextNode, childStartLine, undecoratedChildStartLine, childIndentation.indentation, childIndentation.delta);
                     childContextNode = node;
-                    if (isFirstListItem && parent.kind === 171 /* ArrayLiteralExpression */ && inheritedIndentation === -1 /* Unknown */) {
+                    if (isFirstListItem && parent.kind === 175 /* ArrayLiteralExpression */ && inheritedIndentation === -1 /* Unknown */) {
                         inheritedIndentation = childIndentation.indentation;
                     }
                     return inheritedIndentation;
@@ -73133,12 +75854,12 @@ var ts;
         }
         function getOpenTokenForList(node, list) {
             switch (node.kind) {
-                case 149 /* Constructor */:
-                case 221 /* FunctionDeclaration */:
-                case 180 /* FunctionExpression */:
-                case 148 /* MethodDeclaration */:
-                case 147 /* MethodSignature */:
-                case 181 /* ArrowFunction */:
+                case 150 /* Constructor */:
+                case 225 /* FunctionDeclaration */:
+                case 184 /* FunctionExpression */:
+                case 149 /* MethodDeclaration */:
+                case 148 /* MethodSignature */:
+                case 185 /* ArrowFunction */:
                     if (node.typeParameters === list) {
                         return 26 /* LessThanToken */;
                     }
@@ -73146,8 +75867,8 @@ var ts;
                         return 18 /* OpenParenToken */;
                     }
                     break;
-                case 175 /* CallExpression */:
-                case 176 /* NewExpression */:
+                case 179 /* CallExpression */:
+                case 180 /* NewExpression */:
                     if (node.typeArguments === list) {
                         return 26 /* LessThanToken */;
                     }
@@ -73155,7 +75876,7 @@ var ts;
                         return 18 /* OpenParenToken */;
                     }
                     break;
-                case 156 /* TypeReference */:
+                case 157 /* TypeReference */:
                     if (node.typeArguments === list) {
                         return 26 /* LessThanToken */;
                     }
@@ -73271,7 +75992,7 @@ var ts;
                     var lineStart = ts.getLineStartPositionForPosition(current_1, sourceFile);
                     return SmartIndenter.findFirstNonWhitespaceColumn(lineStart, current_1, sourceFile, options);
                 }
-                if (precedingToken.kind === 25 /* CommaToken */ && precedingToken.parent.kind !== 188 /* BinaryExpression */) {
+                if (precedingToken.kind === 25 /* CommaToken */ && precedingToken.parent.kind !== 192 /* 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 */) {
@@ -73394,7 +76115,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 === 256 /* SourceFile */ || !parentAndChildShareLine);
+                    (parent.kind === 261 /* SourceFile */ || !parentAndChildShareLine);
                 if (!useActualIndentation) {
                     return -1 /* Unknown */;
                 }
@@ -73427,7 +76148,7 @@ var ts;
                 return sourceFile.getLineAndCharacterOfPosition(n.getStart(sourceFile));
             }
             function childStartsOnTheSameLineWithElseInIfStatement(parent, child, childStartLine, sourceFile) {
-                if (parent.kind === 204 /* IfStatement */ && parent.elseStatement === child) {
+                if (parent.kind === 208 /* IfStatement */ && parent.elseStatement === child) {
                     var elseKeyword = ts.findChildOfKind(parent, 81 /* ElseKeyword */, sourceFile);
                     ts.Debug.assert(elseKeyword !== undefined);
                     var elseKeywordStartLine = getStartLineAndCharacterForNode(elseKeyword, sourceFile).line;
@@ -73439,23 +76160,23 @@ var ts;
             function getContainingList(node, sourceFile) {
                 if (node.parent) {
                     switch (node.parent.kind) {
-                        case 156 /* TypeReference */:
+                        case 157 /* TypeReference */:
                             if (node.parent.typeArguments &&
                                 ts.rangeContainsStartEnd(node.parent.typeArguments, node.getStart(sourceFile), node.getEnd())) {
                                 return node.parent.typeArguments;
                             }
                             break;
-                        case 172 /* ObjectLiteralExpression */:
+                        case 176 /* ObjectLiteralExpression */:
                             return node.parent.properties;
-                        case 171 /* ArrayLiteralExpression */:
+                        case 175 /* ArrayLiteralExpression */:
                             return node.parent.elements;
-                        case 221 /* FunctionDeclaration */:
-                        case 180 /* FunctionExpression */:
-                        case 181 /* ArrowFunction */:
-                        case 148 /* MethodDeclaration */:
-                        case 147 /* MethodSignature */:
-                        case 152 /* CallSignature */:
-                        case 153 /* ConstructSignature */: {
+                        case 225 /* FunctionDeclaration */:
+                        case 184 /* FunctionExpression */:
+                        case 185 /* ArrowFunction */:
+                        case 149 /* MethodDeclaration */:
+                        case 148 /* MethodSignature */:
+                        case 153 /* CallSignature */:
+                        case 154 /* ConstructSignature */: {
                             var start = node.getStart(sourceFile);
                             if (node.parent.typeParameters &&
                                 ts.rangeContainsStartEnd(node.parent.typeParameters, start, node.getEnd())) {
@@ -73466,8 +76187,8 @@ var ts;
                             }
                             break;
                         }
-                        case 176 /* NewExpression */:
-                        case 175 /* CallExpression */: {
+                        case 180 /* NewExpression */:
+                        case 179 /* CallExpression */: {
                             var start = node.getStart(sourceFile);
                             if (node.parent.typeArguments &&
                                 ts.rangeContainsStartEnd(node.parent.typeArguments, start, node.getEnd())) {
@@ -73497,8 +76218,8 @@ var ts;
                 if (node.kind === 19 /* CloseParenToken */) {
                     return -1 /* Unknown */;
                 }
-                if (node.parent && (node.parent.kind === 175 /* CallExpression */ ||
-                    node.parent.kind === 176 /* NewExpression */) &&
+                if (node.parent && (node.parent.kind === 179 /* CallExpression */ ||
+                    node.parent.kind === 180 /* NewExpression */) &&
                     node.parent.expression !== node) {
                     var fullCallOrNewExpression = node.parent.expression;
                     var startingExpression = getStartingExpression(fullCallOrNewExpression);
@@ -73516,10 +76237,10 @@ var ts;
                 function getStartingExpression(node) {
                     while (true) {
                         switch (node.kind) {
-                            case 175 /* CallExpression */:
-                            case 176 /* NewExpression */:
-                            case 173 /* PropertyAccessExpression */:
-                            case 174 /* ElementAccessExpression */:
+                            case 179 /* CallExpression */:
+                            case 180 /* NewExpression */:
+                            case 177 /* PropertyAccessExpression */:
+                            case 178 /* ElementAccessExpression */:
                                 node = node.expression;
                                 break;
                             default:
@@ -73583,48 +76304,48 @@ var ts;
             SmartIndenter.findFirstNonWhitespaceColumn = findFirstNonWhitespaceColumn;
             function nodeContentIsAlwaysIndented(kind) {
                 switch (kind) {
-                    case 203 /* ExpressionStatement */:
-                    case 222 /* ClassDeclaration */:
-                    case 193 /* ClassExpression */:
-                    case 223 /* InterfaceDeclaration */:
-                    case 225 /* EnumDeclaration */:
-                    case 224 /* TypeAliasDeclaration */:
-                    case 171 /* ArrayLiteralExpression */:
-                    case 200 /* Block */:
-                    case 227 /* ModuleBlock */:
-                    case 172 /* ObjectLiteralExpression */:
-                    case 160 /* TypeLiteral */:
-                    case 162 /* TupleType */:
-                    case 228 /* CaseBlock */:
-                    case 250 /* DefaultClause */:
-                    case 249 /* CaseClause */:
-                    case 179 /* ParenthesizedExpression */:
-                    case 173 /* PropertyAccessExpression */:
-                    case 175 /* CallExpression */:
-                    case 176 /* NewExpression */:
-                    case 201 /* VariableStatement */:
-                    case 219 /* VariableDeclaration */:
-                    case 236 /* ExportAssignment */:
-                    case 212 /* ReturnStatement */:
-                    case 189 /* ConditionalExpression */:
-                    case 169 /* ArrayBindingPattern */:
-                    case 168 /* ObjectBindingPattern */:
-                    case 244 /* JsxOpeningElement */:
-                    case 243 /* JsxSelfClosingElement */:
-                    case 248 /* JsxExpression */:
-                    case 147 /* MethodSignature */:
-                    case 152 /* CallSignature */:
-                    case 153 /* ConstructSignature */:
-                    case 143 /* Parameter */:
-                    case 157 /* FunctionType */:
-                    case 158 /* ConstructorType */:
-                    case 165 /* ParenthesizedType */:
-                    case 177 /* TaggedTemplateExpression */:
-                    case 185 /* AwaitExpression */:
-                    case 238 /* NamedExports */:
-                    case 234 /* NamedImports */:
-                    case 239 /* ExportSpecifier */:
-                    case 235 /* ImportSpecifier */:
+                    case 207 /* ExpressionStatement */:
+                    case 226 /* ClassDeclaration */:
+                    case 197 /* ClassExpression */:
+                    case 227 /* InterfaceDeclaration */:
+                    case 229 /* EnumDeclaration */:
+                    case 228 /* TypeAliasDeclaration */:
+                    case 175 /* ArrayLiteralExpression */:
+                    case 204 /* Block */:
+                    case 231 /* ModuleBlock */:
+                    case 176 /* ObjectLiteralExpression */:
+                    case 161 /* TypeLiteral */:
+                    case 163 /* TupleType */:
+                    case 232 /* CaseBlock */:
+                    case 254 /* DefaultClause */:
+                    case 253 /* CaseClause */:
+                    case 183 /* ParenthesizedExpression */:
+                    case 177 /* PropertyAccessExpression */:
+                    case 179 /* CallExpression */:
+                    case 180 /* NewExpression */:
+                    case 205 /* VariableStatement */:
+                    case 223 /* VariableDeclaration */:
+                    case 240 /* ExportAssignment */:
+                    case 216 /* ReturnStatement */:
+                    case 193 /* ConditionalExpression */:
+                    case 173 /* ArrayBindingPattern */:
+                    case 172 /* ObjectBindingPattern */:
+                    case 248 /* JsxOpeningElement */:
+                    case 247 /* JsxSelfClosingElement */:
+                    case 252 /* JsxExpression */:
+                    case 148 /* MethodSignature */:
+                    case 153 /* CallSignature */:
+                    case 154 /* ConstructSignature */:
+                    case 144 /* Parameter */:
+                    case 158 /* FunctionType */:
+                    case 159 /* ConstructorType */:
+                    case 166 /* ParenthesizedType */:
+                    case 181 /* TaggedTemplateExpression */:
+                    case 189 /* AwaitExpression */:
+                    case 242 /* NamedExports */:
+                    case 238 /* NamedImports */:
+                    case 243 /* ExportSpecifier */:
+                    case 239 /* ImportSpecifier */:
                         return true;
                 }
                 return false;
@@ -73633,27 +76354,27 @@ var ts;
             function nodeWillIndentChild(parent, child, indentByDefault) {
                 var childKind = child ? child.kind : 0 /* Unknown */;
                 switch (parent.kind) {
-                    case 205 /* DoStatement */:
-                    case 206 /* WhileStatement */:
-                    case 208 /* ForInStatement */:
-                    case 209 /* ForOfStatement */:
-                    case 207 /* ForStatement */:
-                    case 204 /* IfStatement */:
-                    case 221 /* FunctionDeclaration */:
-                    case 180 /* FunctionExpression */:
-                    case 148 /* MethodDeclaration */:
-                    case 181 /* ArrowFunction */:
-                    case 149 /* Constructor */:
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
-                        return childKind !== 200 /* Block */;
-                    case 237 /* ExportDeclaration */:
-                        return childKind !== 238 /* NamedExports */;
-                    case 231 /* ImportDeclaration */:
-                        return childKind !== 232 /* ImportClause */ ||
-                            (child.namedBindings && child.namedBindings.kind !== 234 /* NamedImports */);
-                    case 242 /* JsxElement */:
-                        return childKind !== 245 /* JsxClosingElement */;
+                    case 209 /* DoStatement */:
+                    case 210 /* WhileStatement */:
+                    case 212 /* ForInStatement */:
+                    case 213 /* ForOfStatement */:
+                    case 211 /* ForStatement */:
+                    case 208 /* IfStatement */:
+                    case 225 /* FunctionDeclaration */:
+                    case 184 /* FunctionExpression */:
+                    case 149 /* MethodDeclaration */:
+                    case 185 /* ArrowFunction */:
+                    case 150 /* Constructor */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* SetAccessor */:
+                        return childKind !== 204 /* Block */;
+                    case 241 /* ExportDeclaration */:
+                        return childKind !== 242 /* NamedExports */;
+                    case 235 /* ImportDeclaration */:
+                        return childKind !== 236 /* ImportClause */ ||
+                            (child.namedBindings && child.namedBindings.kind !== 238 /* NamedImports */);
+                    case 246 /* JsxElement */:
+                        return childKind !== 249 /* JsxClosingElement */;
                 }
                 // No explicit rule for given nodes so the result will follow the default value argument
                 return indentByDefault;
@@ -73743,7 +76464,7 @@ var ts;
                 }
                 // figure out if the this access is actuall inside the supercall
                 // i.e. super(this.a), since in that case we won't suggest a fix
-                if (superCall.expression && superCall.expression.kind == 175 /* CallExpression */) {
+                if (superCall.expression && superCall.expression.kind == 179 /* CallExpression */) {
                     var arguments_1 = superCall.expression.arguments;
                     for (var i = 0; i < arguments_1.length; i++) {
                         if (arguments_1[i].expression === token) {
@@ -73767,7 +76488,7 @@ var ts;
                         changes: changes
                     }];
                 function findSuperCall(n) {
-                    if (n.kind === 203 /* ExpressionStatement */ && ts.isSuperCall(n.expression)) {
+                    if (n.kind === 207 /* ExpressionStatement */ && ts.isSuperCall(n.expression)) {
                         return n;
                     }
                     if (ts.isFunctionLike(n)) {
@@ -73812,7 +76533,7 @@ var ts;
     /** The version of the language service API */
     ts.servicesVersion = "0.5";
     function createNode(kind, pos, end, parent) {
-        var node = kind >= 140 /* FirstNode */ ? new NodeObject(kind, pos, end) :
+        var node = kind >= 141 /* FirstNode */ ? new NodeObject(kind, pos, end) :
             kind === 70 /* Identifier */ ? new IdentifierObject(70 /* Identifier */, pos, end) :
                 new TokenObject(kind, pos, end);
         node.parent = parent;
@@ -73824,7 +76545,6 @@ var ts;
             this.end = end;
             this.flags = 0 /* None */;
             this.transformFlags = undefined;
-            this.excludeTransformFlags = undefined;
             this.parent = undefined;
             this.kind = kind;
         }
@@ -73871,11 +76591,11 @@ var ts;
             return pos;
         };
         NodeObject.prototype.createSyntaxList = function (nodes) {
-            var list = createNode(286 /* SyntaxList */, nodes.pos, nodes.end, this);
+            var list = createNode(291 /* SyntaxList */, nodes.pos, nodes.end, this);
             list._children = [];
             var pos = nodes.pos;
-            for (var _i = 0, nodes_4 = nodes; _i < nodes_4.length; _i++) {
-                var node = nodes_4[_i];
+            for (var _i = 0, nodes_5 = nodes; _i < nodes_5.length; _i++) {
+                var node = nodes_5[_i];
                 if (pos < node.pos) {
                     pos = this.addSyntheticNodes(list._children, pos, node.pos);
                 }
@@ -73890,11 +76610,11 @@ var ts;
         NodeObject.prototype.createChildren = function (sourceFile) {
             var _this = this;
             var children;
-            if (this.kind >= 140 /* FirstNode */) {
+            if (this.kind >= 141 /* FirstNode */) {
                 ts.scanner.setText((sourceFile || this.getSourceFile()).text);
                 children = [];
                 var pos_3 = this.pos;
-                var useJSDocScanner_1 = this.kind >= 273 /* FirstJSDocTagNode */ && this.kind <= 285 /* LastJSDocTagNode */;
+                var useJSDocScanner_1 = this.kind >= 278 /* FirstJSDocTagNode */ && this.kind <= 290 /* LastJSDocTagNode */;
                 var processNode = function (node) {
                     var isJSDocTagNode = ts.isJSDocTag(node);
                     if (!isJSDocTagNode && pos_3 < node.pos) {
@@ -73952,7 +76672,7 @@ var ts;
                 return undefined;
             }
             var child = children[0];
-            return child.kind < 140 /* FirstNode */ ? child : child.getFirstToken(sourceFile);
+            return child.kind < 141 /* FirstNode */ ? child : child.getFirstToken(sourceFile);
         };
         NodeObject.prototype.getLastToken = function (sourceFile) {
             var children = this.getChildren(sourceFile);
@@ -73960,7 +76680,7 @@ var ts;
             if (!child) {
                 return undefined;
             }
-            return child.kind < 140 /* FirstNode */ ? child : child.getLastToken(sourceFile);
+            return child.kind < 141 /* FirstNode */ ? child : child.getLastToken(sourceFile);
         };
         return NodeObject;
     }());
@@ -74088,7 +76808,7 @@ var ts;
             return this.checker.getIndexTypeOfType(this, 1 /* Number */);
         };
         TypeObject.prototype.getBaseTypes = function () {
-            return this.flags & (32768 /* Class */ | 65536 /* Interface */)
+            return this.flags & 32768 /* Object */ && this.objectFlags & (1 /* Class */ | 2 /* Interface */)
                 ? this.checker.getBaseTypes(this)
                 : undefined;
         };
@@ -74163,9 +76883,9 @@ var ts;
                     if (result_6 !== undefined) {
                         return result_6;
                     }
-                    if (declaration.name.kind === 141 /* ComputedPropertyName */) {
+                    if (declaration.name.kind === 142 /* ComputedPropertyName */) {
                         var expr = declaration.name.expression;
-                        if (expr.kind === 173 /* PropertyAccessExpression */) {
+                        if (expr.kind === 177 /* PropertyAccessExpression */) {
                             return expr.name.text;
                         }
                         return getTextOfIdentifierOrLiteral(expr);
@@ -74185,10 +76905,10 @@ var ts;
             }
             function visit(node) {
                 switch (node.kind) {
-                    case 221 /* FunctionDeclaration */:
-                    case 180 /* FunctionExpression */:
-                    case 148 /* MethodDeclaration */:
-                    case 147 /* MethodSignature */:
+                    case 225 /* FunctionDeclaration */:
+                    case 184 /* FunctionExpression */:
+                    case 149 /* MethodDeclaration */:
+                    case 148 /* MethodSignature */:
                         var functionDeclaration = node;
                         var declarationName = getDeclarationName(functionDeclaration);
                         if (declarationName) {
@@ -74208,32 +76928,32 @@ var ts;
                             ts.forEachChild(node, visit);
                         }
                         break;
-                    case 222 /* ClassDeclaration */:
-                    case 193 /* ClassExpression */:
-                    case 223 /* InterfaceDeclaration */:
-                    case 224 /* TypeAliasDeclaration */:
-                    case 225 /* EnumDeclaration */:
-                    case 226 /* ModuleDeclaration */:
-                    case 230 /* ImportEqualsDeclaration */:
-                    case 239 /* ExportSpecifier */:
-                    case 235 /* ImportSpecifier */:
-                    case 230 /* ImportEqualsDeclaration */:
-                    case 232 /* ImportClause */:
-                    case 233 /* NamespaceImport */:
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
-                    case 160 /* TypeLiteral */:
+                    case 226 /* ClassDeclaration */:
+                    case 197 /* ClassExpression */:
+                    case 227 /* InterfaceDeclaration */:
+                    case 228 /* TypeAliasDeclaration */:
+                    case 229 /* EnumDeclaration */:
+                    case 230 /* ModuleDeclaration */:
+                    case 234 /* ImportEqualsDeclaration */:
+                    case 243 /* ExportSpecifier */:
+                    case 239 /* ImportSpecifier */:
+                    case 234 /* ImportEqualsDeclaration */:
+                    case 236 /* ImportClause */:
+                    case 237 /* NamespaceImport */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* SetAccessor */:
+                    case 161 /* TypeLiteral */:
                         addDeclaration(node);
                         ts.forEachChild(node, visit);
                         break;
-                    case 143 /* Parameter */:
+                    case 144 /* Parameter */:
                         // Only consider parameter properties
                         if (!ts.hasModifier(node, 92 /* ParameterPropertyModifier */)) {
                             break;
                         }
                     // fall through
-                    case 219 /* VariableDeclaration */:
-                    case 170 /* BindingElement */: {
+                    case 223 /* VariableDeclaration */:
+                    case 174 /* BindingElement */: {
                         var decl = node;
                         if (ts.isBindingPattern(decl.name)) {
                             ts.forEachChild(decl.name, visit);
@@ -74242,19 +76962,19 @@ var ts;
                         if (decl.initializer)
                             visit(decl.initializer);
                     }
-                    case 255 /* EnumMember */:
-                    case 146 /* PropertyDeclaration */:
-                    case 145 /* PropertySignature */:
+                    case 260 /* EnumMember */:
+                    case 147 /* PropertyDeclaration */:
+                    case 146 /* PropertySignature */:
                         addDeclaration(node);
                         break;
-                    case 237 /* ExportDeclaration */:
+                    case 241 /* 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 231 /* ImportDeclaration */:
+                    case 235 /* ImportDeclaration */:
                         var importClause = node.importClause;
                         if (importClause) {
                             // Handle default import case e.g.:
@@ -74266,7 +76986,7 @@ var ts;
                             //    import * as NS from "mod";
                             //    import {a, b as B} from "mod";
                             if (importClause.namedBindings) {
-                                if (importClause.namedBindings.kind === 233 /* NamespaceImport */) {
+                                if (importClause.namedBindings.kind === 237 /* NamespaceImport */) {
                                     addDeclaration(importClause.namedBindings);
                                 }
                                 else {
@@ -74421,7 +77141,7 @@ var ts;
             var sourceFile;
             if (this.currentFileName !== fileName) {
                 // This is a new file, just parse it
-                sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, 4 /* Latest */, version, /*setNodeParents*/ true, scriptKind);
+                sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, 5 /* Latest */, version, /*setNodeParents*/ true, scriptKind);
             }
             else if (this.currentFileVersion !== version) {
                 // This is the same file, just a newer version. Incrementally parse the file.
@@ -74599,7 +77319,7 @@ var ts;
                 useCaseSensitiveFileNames: function () { return useCaseSensitivefileNames; },
                 getNewLine: function () { return ts.getNewLineOrDefaultFromHost(host); },
                 getDefaultLibFileName: function (options) { return host.getDefaultLibFileName(options); },
-                writeFile: function () { },
+                writeFile: ts.noop,
                 getCurrentDirectory: function () { return currentDirectory; },
                 fileExists: function (fileName) {
                     // stub missing host functionality
@@ -74796,10 +77516,10 @@ var ts;
                 // Try getting just type at this position and show
                 switch (node.kind) {
                     case 70 /* Identifier */:
-                    case 173 /* PropertyAccessExpression */:
-                    case 140 /* QualifiedName */:
+                    case 177 /* PropertyAccessExpression */:
+                    case 141 /* QualifiedName */:
                     case 98 /* ThisKeyword */:
-                    case 166 /* ThisType */:
+                    case 167 /* ThisType */:
                     case 96 /* SuperKeyword */:
                         // For the identifiers/this/super etc get the type at position
                         var type = typeChecker.getTypeAtLocation(node);
@@ -74942,15 +77662,15 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 173 /* PropertyAccessExpression */:
-                case 140 /* QualifiedName */:
+                case 177 /* PropertyAccessExpression */:
+                case 141 /* QualifiedName */:
                 case 9 /* StringLiteral */:
                 case 85 /* FalseKeyword */:
                 case 100 /* TrueKeyword */:
                 case 94 /* NullKeyword */:
                 case 96 /* SuperKeyword */:
                 case 98 /* ThisKeyword */:
-                case 166 /* ThisType */:
+                case 167 /* ThisType */:
                 case 70 /* Identifier */:
                     break;
                 // Cant create the text span
@@ -74967,7 +77687,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 === 226 /* ModuleDeclaration */ &&
+                    if (nodeForStartPos.parent.parent.kind === 230 /* ModuleDeclaration */ &&
                         nodeForStartPos.parent.parent.body === nodeForStartPos.parent) {
                         // Use parent module declarations name for start pos
                         nodeForStartPos = nodeForStartPos.parent.parent.name;
@@ -75351,7 +78071,7 @@ var ts;
                     // then we want 'something' to be in the name table.  Similarly, if we have
                     // "a['propname']" then we want to store "propname" in the name table.
                     if (ts.isDeclarationName(node) ||
-                        node.parent.kind === 241 /* ExternalModuleReference */ ||
+                        node.parent.kind === 245 /* ExternalModuleReference */ ||
                         isArgumentOfElementAccessExpression(node) ||
                         ts.isLiteralComputedPropertyDeclarationName(node)) {
                         nameTable[node.text] = nameTable[node.text] === undefined ? node.pos : -1;
@@ -75371,7 +78091,7 @@ var ts;
     function isArgumentOfElementAccessExpression(node) {
         return node &&
             node.parent &&
-            node.parent.kind === 174 /* ElementAccessExpression */ &&
+            node.parent.kind === 178 /* ElementAccessExpression */ &&
             node.parent.argumentExpression === node;
     }
     /**
@@ -75455,113 +78175,113 @@ var ts;
             function spanInNode(node) {
                 if (node) {
                     switch (node.kind) {
-                        case 201 /* VariableStatement */:
+                        case 205 /* VariableStatement */:
                             // Span on first variable declaration
                             return spanInVariableDeclaration(node.declarationList.declarations[0]);
-                        case 219 /* VariableDeclaration */:
-                        case 146 /* PropertyDeclaration */:
-                        case 145 /* PropertySignature */:
+                        case 223 /* VariableDeclaration */:
+                        case 147 /* PropertyDeclaration */:
+                        case 146 /* PropertySignature */:
                             return spanInVariableDeclaration(node);
-                        case 143 /* Parameter */:
+                        case 144 /* Parameter */:
                             return spanInParameterDeclaration(node);
-                        case 221 /* FunctionDeclaration */:
-                        case 148 /* MethodDeclaration */:
-                        case 147 /* MethodSignature */:
-                        case 150 /* GetAccessor */:
-                        case 151 /* SetAccessor */:
-                        case 149 /* Constructor */:
-                        case 180 /* FunctionExpression */:
-                        case 181 /* ArrowFunction */:
+                        case 225 /* FunctionDeclaration */:
+                        case 149 /* MethodDeclaration */:
+                        case 148 /* MethodSignature */:
+                        case 151 /* GetAccessor */:
+                        case 152 /* SetAccessor */:
+                        case 150 /* Constructor */:
+                        case 184 /* FunctionExpression */:
+                        case 185 /* ArrowFunction */:
                             return spanInFunctionDeclaration(node);
-                        case 200 /* Block */:
+                        case 204 /* Block */:
                             if (ts.isFunctionBlock(node)) {
                                 return spanInFunctionBlock(node);
                             }
                         // Fall through
-                        case 227 /* ModuleBlock */:
+                        case 231 /* ModuleBlock */:
                             return spanInBlock(node);
-                        case 252 /* CatchClause */:
+                        case 256 /* CatchClause */:
                             return spanInBlock(node.block);
-                        case 203 /* ExpressionStatement */:
+                        case 207 /* ExpressionStatement */:
                             // span on the expression
                             return textSpan(node.expression);
-                        case 212 /* ReturnStatement */:
+                        case 216 /* ReturnStatement */:
                             // span on return keyword and expression if present
                             return textSpan(node.getChildAt(0), node.expression);
-                        case 206 /* WhileStatement */:
+                        case 210 /* WhileStatement */:
                             // Span on while(...)
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 205 /* DoStatement */:
+                        case 209 /* DoStatement */:
                             // span in statement of the do statement
                             return spanInNode(node.statement);
-                        case 218 /* DebuggerStatement */:
+                        case 222 /* DebuggerStatement */:
                             // span on debugger keyword
                             return textSpan(node.getChildAt(0));
-                        case 204 /* IfStatement */:
+                        case 208 /* IfStatement */:
                             // set on if(..) span
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 215 /* LabeledStatement */:
+                        case 219 /* LabeledStatement */:
                             // span in statement
                             return spanInNode(node.statement);
-                        case 211 /* BreakStatement */:
-                        case 210 /* ContinueStatement */:
+                        case 215 /* BreakStatement */:
+                        case 214 /* ContinueStatement */:
                             // On break or continue keyword and label if present
                             return textSpan(node.getChildAt(0), node.label);
-                        case 207 /* ForStatement */:
+                        case 211 /* ForStatement */:
                             return spanInForStatement(node);
-                        case 208 /* ForInStatement */:
+                        case 212 /* ForInStatement */:
                             // span of for (a in ...)
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 209 /* ForOfStatement */:
+                        case 213 /* ForOfStatement */:
                             // span in initializer
                             return spanInInitializerOfForLike(node);
-                        case 214 /* SwitchStatement */:
+                        case 218 /* SwitchStatement */:
                             // span on switch(...)
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 249 /* CaseClause */:
-                        case 250 /* DefaultClause */:
+                        case 253 /* CaseClause */:
+                        case 254 /* DefaultClause */:
                             // span in first statement of the clause
                             return spanInNode(node.statements[0]);
-                        case 217 /* TryStatement */:
+                        case 221 /* TryStatement */:
                             // span in try block
                             return spanInBlock(node.tryBlock);
-                        case 216 /* ThrowStatement */:
+                        case 220 /* ThrowStatement */:
                             // span in throw ...
                             return textSpan(node, node.expression);
-                        case 236 /* ExportAssignment */:
+                        case 240 /* ExportAssignment */:
                             // span on export = id
                             return textSpan(node, node.expression);
-                        case 230 /* ImportEqualsDeclaration */:
+                        case 234 /* ImportEqualsDeclaration */:
                             // import statement without including semicolon
                             return textSpan(node, node.moduleReference);
-                        case 231 /* ImportDeclaration */:
+                        case 235 /* ImportDeclaration */:
                             // import statement without including semicolon
                             return textSpan(node, node.moduleSpecifier);
-                        case 237 /* ExportDeclaration */:
+                        case 241 /* ExportDeclaration */:
                             // import statement without including semicolon
                             return textSpan(node, node.moduleSpecifier);
-                        case 226 /* ModuleDeclaration */:
+                        case 230 /* ModuleDeclaration */:
                             // span on complete module if it is instantiated
                             if (ts.getModuleInstanceState(node) !== 1 /* Instantiated */) {
                                 return undefined;
                             }
-                        case 222 /* ClassDeclaration */:
-                        case 225 /* EnumDeclaration */:
-                        case 255 /* EnumMember */:
-                        case 170 /* BindingElement */:
+                        case 226 /* ClassDeclaration */:
+                        case 229 /* EnumDeclaration */:
+                        case 260 /* EnumMember */:
+                        case 174 /* BindingElement */:
                             // span on complete node
                             return textSpan(node);
-                        case 213 /* WithStatement */:
+                        case 217 /* WithStatement */:
                             // span in statement
                             return spanInNode(node.statement);
-                        case 144 /* Decorator */:
+                        case 145 /* Decorator */:
                             return spanInNodeArray(node.parent.decorators);
-                        case 168 /* ObjectBindingPattern */:
-                        case 169 /* ArrayBindingPattern */:
+                        case 172 /* ObjectBindingPattern */:
+                        case 173 /* ArrayBindingPattern */:
                             return spanInBindingPattern(node);
                         // No breakpoint in interface, type alias
-                        case 223 /* InterfaceDeclaration */:
-                        case 224 /* TypeAliasDeclaration */:
+                        case 227 /* InterfaceDeclaration */:
+                        case 228 /* TypeAliasDeclaration */:
                             return undefined;
                         // Tokens:
                         case 24 /* SemicolonToken */:
@@ -75591,7 +78311,7 @@ var ts;
                         case 73 /* CatchKeyword */:
                         case 86 /* FinallyKeyword */:
                             return spanInNextNode(node);
-                        case 139 /* OfKeyword */:
+                        case 140 /* OfKeyword */:
                             return spanInOfKeyword(node);
                         default:
                             // Destructuring pattern in destructuring assignment
@@ -75604,13 +78324,13 @@ var ts;
                             // a or ...c  or d: x from
                             // [a, b, ...c] or { a, b } or { d: x } from destructuring pattern
                             if ((node.kind === 70 /* Identifier */ ||
-                                node.kind == 192 /* SpreadElementExpression */ ||
-                                node.kind === 253 /* PropertyAssignment */ ||
-                                node.kind === 254 /* ShorthandPropertyAssignment */) &&
+                                node.kind == 196 /* SpreadElement */ ||
+                                node.kind === 257 /* PropertyAssignment */ ||
+                                node.kind === 258 /* ShorthandPropertyAssignment */) &&
                                 ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent)) {
                                 return textSpan(node);
                             }
-                            if (node.kind === 188 /* BinaryExpression */) {
+                            if (node.kind === 192 /* BinaryExpression */) {
                                 var binaryExpression = node;
                                 // Set breakpoint in destructuring pattern if its destructuring assignment
                                 // [a, b, c] or {a, b, c} of
@@ -75633,22 +78353,22 @@ var ts;
                             }
                             if (ts.isPartOfExpression(node)) {
                                 switch (node.parent.kind) {
-                                    case 205 /* DoStatement */:
+                                    case 209 /* DoStatement */:
                                         // Set span as if on while keyword
                                         return spanInPreviousNode(node);
-                                    case 144 /* Decorator */:
+                                    case 145 /* Decorator */:
                                         // Set breakpoint on the decorator emit
                                         return spanInNode(node.parent);
-                                    case 207 /* ForStatement */:
-                                    case 209 /* ForOfStatement */:
+                                    case 211 /* ForStatement */:
+                                    case 213 /* ForOfStatement */:
                                         return textSpan(node);
-                                    case 188 /* BinaryExpression */:
+                                    case 192 /* BinaryExpression */:
                                         if (node.parent.operatorToken.kind === 25 /* CommaToken */) {
                                             // If this is a comma expression, the breakpoint is possible in this expression
                                             return textSpan(node);
                                         }
                                         break;
-                                    case 181 /* ArrowFunction */:
+                                    case 185 /* ArrowFunction */:
                                         if (node.parent.body === node) {
                                             // If this is body of arrow function, it is allowed to have the breakpoint
                                             return textSpan(node);
@@ -75657,13 +78377,13 @@ var ts;
                                 }
                             }
                             // If this is name of property assignment, set breakpoint in the initializer
-                            if (node.parent.kind === 253 /* PropertyAssignment */ &&
+                            if (node.parent.kind === 257 /* PropertyAssignment */ &&
                                 node.parent.name === node &&
                                 !ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.parent)) {
                                 return spanInNode(node.parent.initializer);
                             }
                             // Breakpoint in type assertion goes to its operand
-                            if (node.parent.kind === 178 /* TypeAssertionExpression */ && node.parent.type === node) {
+                            if (node.parent.kind === 182 /* TypeAssertionExpression */ && node.parent.type === node) {
                                 return spanInNextNode(node.parent.type);
                             }
                             // return type of function go to previous token
@@ -75671,8 +78391,8 @@ var ts;
                                 return spanInPreviousNode(node);
                             }
                             // initializer of variable/parameter declaration go to previous node
-                            if ((node.parent.kind === 219 /* VariableDeclaration */ ||
-                                node.parent.kind === 143 /* Parameter */)) {
+                            if ((node.parent.kind === 223 /* VariableDeclaration */ ||
+                                node.parent.kind === 144 /* Parameter */)) {
                                 var paramOrVarDecl = node.parent;
                                 if (paramOrVarDecl.initializer === node ||
                                     paramOrVarDecl.type === node ||
@@ -75680,7 +78400,7 @@ var ts;
                                     return spanInPreviousNode(node);
                                 }
                             }
-                            if (node.parent.kind === 188 /* BinaryExpression */) {
+                            if (node.parent.kind === 192 /* BinaryExpression */) {
                                 var binaryExpression = node.parent;
                                 if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(binaryExpression.left) &&
                                     (binaryExpression.right === node ||
@@ -75706,7 +78426,7 @@ var ts;
                 }
                 function spanInVariableDeclaration(variableDeclaration) {
                     // If declaration of for in statement, just set the span in parent
-                    if (variableDeclaration.parent.parent.kind === 208 /* ForInStatement */) {
+                    if (variableDeclaration.parent.parent.kind === 212 /* ForInStatement */) {
                         return spanInNode(variableDeclaration.parent.parent);
                     }
                     // If this is a destructuring pattern, set breakpoint in binding pattern
@@ -75717,7 +78437,7 @@ var ts;
                     // or its declaration from 'for of'
                     if (variableDeclaration.initializer ||
                         ts.hasModifier(variableDeclaration, 1 /* Export */) ||
-                        variableDeclaration.parent.parent.kind === 209 /* ForOfStatement */) {
+                        variableDeclaration.parent.parent.kind === 213 /* ForOfStatement */) {
                         return textSpanFromVariableDeclaration(variableDeclaration);
                     }
                     var declarations = variableDeclaration.parent.declarations;
@@ -75757,7 +78477,7 @@ var ts;
                 }
                 function canFunctionHaveSpanInWholeDeclaration(functionDeclaration) {
                     return ts.hasModifier(functionDeclaration, 1 /* Export */) ||
-                        (functionDeclaration.parent.kind === 222 /* ClassDeclaration */ && functionDeclaration.kind !== 149 /* Constructor */);
+                        (functionDeclaration.parent.kind === 226 /* ClassDeclaration */ && functionDeclaration.kind !== 150 /* Constructor */);
                 }
                 function spanInFunctionDeclaration(functionDeclaration) {
                     // No breakpoints in the function signature
@@ -75780,25 +78500,25 @@ var ts;
                 }
                 function spanInBlock(block) {
                     switch (block.parent.kind) {
-                        case 226 /* ModuleDeclaration */:
+                        case 230 /* ModuleDeclaration */:
                             if (ts.getModuleInstanceState(block.parent) !== 1 /* Instantiated */) {
                                 return undefined;
                             }
                         // Set on parent if on same line otherwise on first statement
-                        case 206 /* WhileStatement */:
-                        case 204 /* IfStatement */:
-                        case 208 /* ForInStatement */:
+                        case 210 /* WhileStatement */:
+                        case 208 /* IfStatement */:
+                        case 212 /* 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 207 /* ForStatement */:
-                        case 209 /* ForOfStatement */:
+                        case 211 /* ForStatement */:
+                        case 213 /* 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 === 220 /* VariableDeclarationList */) {
+                    if (forLikeStatement.initializer.kind === 224 /* VariableDeclarationList */) {
                         // Declaration list - set breakpoint in first declaration
                         var variableDeclarationList = forLikeStatement.initializer;
                         if (variableDeclarationList.declarations.length > 0) {
@@ -75823,23 +78543,23 @@ var ts;
                 }
                 function spanInBindingPattern(bindingPattern) {
                     // Set breakpoint in first binding element
-                    var firstBindingElement = ts.forEach(bindingPattern.elements, function (element) { return element.kind !== 194 /* OmittedExpression */ ? element : undefined; });
+                    var firstBindingElement = ts.forEach(bindingPattern.elements, function (element) { return element.kind !== 198 /* OmittedExpression */ ? element : undefined; });
                     if (firstBindingElement) {
                         return spanInNode(firstBindingElement);
                     }
                     // Empty binding pattern of binding element, set breakpoint on binding element
-                    if (bindingPattern.parent.kind === 170 /* BindingElement */) {
+                    if (bindingPattern.parent.kind === 174 /* BindingElement */) {
                         return textSpan(bindingPattern.parent);
                     }
                     // Variable declaration is used as the span
                     return textSpanFromVariableDeclaration(bindingPattern.parent);
                 }
                 function spanInArrayLiteralOrObjectLiteralDestructuringPattern(node) {
-                    ts.Debug.assert(node.kind !== 169 /* ArrayBindingPattern */ && node.kind !== 168 /* ObjectBindingPattern */);
-                    var elements = node.kind === 171 /* ArrayLiteralExpression */ ?
+                    ts.Debug.assert(node.kind !== 173 /* ArrayBindingPattern */ && node.kind !== 172 /* ObjectBindingPattern */);
+                    var elements = node.kind === 175 /* ArrayLiteralExpression */ ?
                         node.elements :
                         node.properties;
-                    var firstBindingElement = ts.forEach(elements, function (element) { return element.kind !== 194 /* OmittedExpression */ ? element : undefined; });
+                    var firstBindingElement = ts.forEach(elements, function (element) { return element.kind !== 198 /* OmittedExpression */ ? element : undefined; });
                     if (firstBindingElement) {
                         return spanInNode(firstBindingElement);
                     }
@@ -75847,18 +78567,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 === 188 /* BinaryExpression */ ? node.parent : node);
+                    return textSpan(node.parent.kind === 192 /* BinaryExpression */ ? node.parent : node);
                 }
                 // Tokens:
                 function spanInOpenBraceToken(node) {
                     switch (node.parent.kind) {
-                        case 225 /* EnumDeclaration */:
+                        case 229 /* EnumDeclaration */:
                             var enumDeclaration = node.parent;
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), enumDeclaration.members.length ? enumDeclaration.members[0] : enumDeclaration.getLastToken(sourceFile));
-                        case 222 /* ClassDeclaration */:
+                        case 226 /* ClassDeclaration */:
                             var classDeclaration = node.parent;
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), classDeclaration.members.length ? classDeclaration.members[0] : classDeclaration.getLastToken(sourceFile));
-                        case 228 /* CaseBlock */:
+                        case 232 /* CaseBlock */:
                             return spanInNodeIfStartsOnSameLine(node.parent.parent, node.parent.clauses[0]);
                     }
                     // Default to parent node
@@ -75866,24 +78586,24 @@ var ts;
                 }
                 function spanInCloseBraceToken(node) {
                     switch (node.parent.kind) {
-                        case 227 /* ModuleBlock */:
+                        case 231 /* ModuleBlock */:
                             // If this is not an instantiated module block, no bp span
                             if (ts.getModuleInstanceState(node.parent.parent) !== 1 /* Instantiated */) {
                                 return undefined;
                             }
-                        case 225 /* EnumDeclaration */:
-                        case 222 /* ClassDeclaration */:
+                        case 229 /* EnumDeclaration */:
+                        case 226 /* ClassDeclaration */:
                             // Span on close brace token
                             return textSpan(node);
-                        case 200 /* Block */:
+                        case 204 /* Block */:
                             if (ts.isFunctionBlock(node.parent)) {
                                 // Span on close brace token
                                 return textSpan(node);
                             }
                         // fall through
-                        case 252 /* CatchClause */:
+                        case 256 /* CatchClause */:
                             return spanInNode(ts.lastOrUndefined(node.parent.statements));
-                        case 228 /* CaseBlock */:
+                        case 232 /* CaseBlock */:
                             // breakpoint in last statement of the last clause
                             var caseBlock = node.parent;
                             var lastClause = ts.lastOrUndefined(caseBlock.clauses);
@@ -75891,7 +78611,7 @@ var ts;
                                 return spanInNode(ts.lastOrUndefined(lastClause.statements));
                             }
                             return undefined;
-                        case 168 /* ObjectBindingPattern */:
+                        case 172 /* 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);
@@ -75907,7 +78627,7 @@ var ts;
                 }
                 function spanInCloseBracketToken(node) {
                     switch (node.parent.kind) {
-                        case 169 /* ArrayBindingPattern */:
+                        case 173 /* 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);
@@ -75922,12 +78642,12 @@ var ts;
                     }
                 }
                 function spanInOpenParenToken(node) {
-                    if (node.parent.kind === 205 /* DoStatement */ ||
-                        node.parent.kind === 175 /* CallExpression */ ||
-                        node.parent.kind === 176 /* NewExpression */) {
+                    if (node.parent.kind === 209 /* DoStatement */ ||
+                        node.parent.kind === 179 /* CallExpression */ ||
+                        node.parent.kind === 180 /* NewExpression */) {
                         return spanInPreviousNode(node);
                     }
-                    if (node.parent.kind === 179 /* ParenthesizedExpression */) {
+                    if (node.parent.kind === 183 /* ParenthesizedExpression */) {
                         return spanInNextNode(node);
                     }
                     // Default to parent node
@@ -75936,21 +78656,21 @@ var ts;
                 function spanInCloseParenToken(node) {
                     // Is this close paren token of parameter list, set span in previous token
                     switch (node.parent.kind) {
-                        case 180 /* FunctionExpression */:
-                        case 221 /* FunctionDeclaration */:
-                        case 181 /* ArrowFunction */:
-                        case 148 /* MethodDeclaration */:
-                        case 147 /* MethodSignature */:
-                        case 150 /* GetAccessor */:
-                        case 151 /* SetAccessor */:
-                        case 149 /* Constructor */:
-                        case 206 /* WhileStatement */:
-                        case 205 /* DoStatement */:
-                        case 207 /* ForStatement */:
-                        case 209 /* ForOfStatement */:
-                        case 175 /* CallExpression */:
-                        case 176 /* NewExpression */:
-                        case 179 /* ParenthesizedExpression */:
+                        case 184 /* FunctionExpression */:
+                        case 225 /* FunctionDeclaration */:
+                        case 185 /* ArrowFunction */:
+                        case 149 /* MethodDeclaration */:
+                        case 148 /* MethodSignature */:
+                        case 151 /* GetAccessor */:
+                        case 152 /* SetAccessor */:
+                        case 150 /* Constructor */:
+                        case 210 /* WhileStatement */:
+                        case 209 /* DoStatement */:
+                        case 211 /* ForStatement */:
+                        case 213 /* ForOfStatement */:
+                        case 179 /* CallExpression */:
+                        case 180 /* NewExpression */:
+                        case 183 /* ParenthesizedExpression */:
                             return spanInPreviousNode(node);
                         // Default to parent node
                         default:
@@ -75960,20 +78680,20 @@ var ts;
                 function spanInColonToken(node) {
                     // Is this : specifying return annotation of the function declaration
                     if (ts.isFunctionLike(node.parent) ||
-                        node.parent.kind === 253 /* PropertyAssignment */ ||
-                        node.parent.kind === 143 /* Parameter */) {
+                        node.parent.kind === 257 /* PropertyAssignment */ ||
+                        node.parent.kind === 144 /* Parameter */) {
                         return spanInPreviousNode(node);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInGreaterThanOrLessThanToken(node) {
-                    if (node.parent.kind === 178 /* TypeAssertionExpression */) {
+                    if (node.parent.kind === 182 /* TypeAssertionExpression */) {
                         return spanInNextNode(node);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInWhileKeyword(node) {
-                    if (node.parent.kind === 205 /* DoStatement */) {
+                    if (node.parent.kind === 209 /* DoStatement */) {
                         // Set span on while expression
                         return textSpanEndingAtNextToken(node, node.parent.expression);
                     }
@@ -75981,7 +78701,7 @@ var ts;
                     return spanInNode(node.parent);
                 }
                 function spanInOfKeyword(node) {
-                    if (node.parent.kind === 209 /* ForOfStatement */) {
+                    if (node.parent.kind === 213 /* ForOfStatement */) {
                         // Set using next token
                         return spanInNextNode(node);
                     }
@@ -76063,7 +78783,7 @@ var ts;
                     var resolutionsInFile = JSON.parse(_this.shimHost.getModuleResolutionsForFile(containingFile));
                     return ts.map(moduleNames, function (name) {
                         var result = ts.getProperty(resolutionsInFile, name);
-                        return result ? { resolvedFileName: result } : undefined;
+                        return result ? { resolvedFileName: result, extension: ts.extensionFromPath(result), isExternalLibraryImport: false } : undefined;
                     });
                 };
             }
@@ -76619,8 +79339,15 @@ var ts;
             return this.forwardJSONCall("resolveModuleName('" + fileName + "')", function () {
                 var compilerOptions = JSON.parse(compilerOptionsJson);
                 var result = ts.resolveModuleName(moduleName, ts.normalizeSlashes(fileName), compilerOptions, _this.host);
+                var resolvedFileName = result.resolvedModule ? result.resolvedModule.resolvedFileName : undefined;
+                if (resolvedFileName && !compilerOptions.allowJs && ts.fileExtensionIs(resolvedFileName, ".js")) {
+                    return {
+                        resolvedFileName: undefined,
+                        failedLookupLocations: []
+                    };
+                }
                 return {
-                    resolvedFileName: result.resolvedModule ? result.resolvedModule.resolvedFileName : undefined,
+                    resolvedFileName: resolvedFileName,
                     failedLookupLocations: result.failedLookupLocations
                 };
             });
@@ -76706,7 +79433,7 @@ var ts;
             var getCanonicalFileName = ts.createGetCanonicalFileName(/*useCaseSensitivefileNames:*/ false);
             return this.forwardJSONCall("discoverTypings()", function () {
                 var info = JSON.parse(discoverTypingsJson);
-                return ts.JsTyping.discoverTypings(_this.host, info.fileNames, ts.toPath(info.projectRootPath, info.projectRootPath, getCanonicalFileName), ts.toPath(info.safeListPath, info.safeListPath, getCanonicalFileName), info.packageNameToTypingLocation, info.typingOptions);
+                return ts.JsTyping.discoverTypings(_this.host, info.fileNames, ts.toPath(info.projectRootPath, info.projectRootPath, getCanonicalFileName), ts.toPath(info.safeListPath, info.safeListPath, getCanonicalFileName), info.packageNameToTypingLocation, info.typingOptions, info.unresolvedImports);
             });
         };
         return CoreServicesShimObject;
@@ -76789,11 +79516,7 @@ var TypeScript;
         Services.TypeScriptServicesFactory = ts.TypeScriptServicesFactory;
     })(Services = TypeScript.Services || (TypeScript.Services = {}));
 })(TypeScript || (TypeScript = {}));
-/* tslint:disable:no-unused-variable */
 // 'toolsVersion' gets consumed by the managed side, so it's not unused.
 // TODO: it should be moved into a namespace though.
 /* @internal */
-var toolsVersion = "2.1";
-/* tslint:enable:no-unused-variable */
-
-//# sourceMappingURL=typescriptServices.js.map
+var toolsVersion = "2.2";
diff --git a/lib/typescriptServices.d.ts b/lib/typescriptServices.d.ts
index 2558f2a3f99..bbf7b441de3 100644
--- a/lib/typescriptServices.d.ts
+++ b/lib/typescriptServices.d.ts
@@ -163,170 +163,177 @@ declare namespace ts {
         DeclareKeyword = 123,
         GetKeyword = 124,
         IsKeyword = 125,
-        ModuleKeyword = 126,
-        NamespaceKeyword = 127,
-        NeverKeyword = 128,
-        ReadonlyKeyword = 129,
-        RequireKeyword = 130,
-        NumberKeyword = 131,
-        SetKeyword = 132,
-        StringKeyword = 133,
-        SymbolKeyword = 134,
-        TypeKeyword = 135,
-        UndefinedKeyword = 136,
-        FromKeyword = 137,
-        GlobalKeyword = 138,
-        OfKeyword = 139,
-        QualifiedName = 140,
-        ComputedPropertyName = 141,
-        TypeParameter = 142,
-        Parameter = 143,
-        Decorator = 144,
-        PropertySignature = 145,
-        PropertyDeclaration = 146,
-        MethodSignature = 147,
-        MethodDeclaration = 148,
-        Constructor = 149,
-        GetAccessor = 150,
-        SetAccessor = 151,
-        CallSignature = 152,
-        ConstructSignature = 153,
-        IndexSignature = 154,
-        TypePredicate = 155,
-        TypeReference = 156,
-        FunctionType = 157,
-        ConstructorType = 158,
-        TypeQuery = 159,
-        TypeLiteral = 160,
-        ArrayType = 161,
-        TupleType = 162,
-        UnionType = 163,
-        IntersectionType = 164,
-        ParenthesizedType = 165,
-        ThisType = 166,
-        LiteralType = 167,
-        ObjectBindingPattern = 168,
-        ArrayBindingPattern = 169,
-        BindingElement = 170,
-        ArrayLiteralExpression = 171,
-        ObjectLiteralExpression = 172,
-        PropertyAccessExpression = 173,
-        ElementAccessExpression = 174,
-        CallExpression = 175,
-        NewExpression = 176,
-        TaggedTemplateExpression = 177,
-        TypeAssertionExpression = 178,
-        ParenthesizedExpression = 179,
-        FunctionExpression = 180,
-        ArrowFunction = 181,
-        DeleteExpression = 182,
-        TypeOfExpression = 183,
-        VoidExpression = 184,
-        AwaitExpression = 185,
-        PrefixUnaryExpression = 186,
-        PostfixUnaryExpression = 187,
-        BinaryExpression = 188,
-        ConditionalExpression = 189,
-        TemplateExpression = 190,
-        YieldExpression = 191,
-        SpreadElementExpression = 192,
-        ClassExpression = 193,
-        OmittedExpression = 194,
-        ExpressionWithTypeArguments = 195,
-        AsExpression = 196,
-        NonNullExpression = 197,
-        TemplateSpan = 198,
-        SemicolonClassElement = 199,
-        Block = 200,
-        VariableStatement = 201,
-        EmptyStatement = 202,
-        ExpressionStatement = 203,
-        IfStatement = 204,
-        DoStatement = 205,
-        WhileStatement = 206,
-        ForStatement = 207,
-        ForInStatement = 208,
-        ForOfStatement = 209,
-        ContinueStatement = 210,
-        BreakStatement = 211,
-        ReturnStatement = 212,
-        WithStatement = 213,
-        SwitchStatement = 214,
-        LabeledStatement = 215,
-        ThrowStatement = 216,
-        TryStatement = 217,
-        DebuggerStatement = 218,
-        VariableDeclaration = 219,
-        VariableDeclarationList = 220,
-        FunctionDeclaration = 221,
-        ClassDeclaration = 222,
-        InterfaceDeclaration = 223,
-        TypeAliasDeclaration = 224,
-        EnumDeclaration = 225,
-        ModuleDeclaration = 226,
-        ModuleBlock = 227,
-        CaseBlock = 228,
-        NamespaceExportDeclaration = 229,
-        ImportEqualsDeclaration = 230,
-        ImportDeclaration = 231,
-        ImportClause = 232,
-        NamespaceImport = 233,
-        NamedImports = 234,
-        ImportSpecifier = 235,
-        ExportAssignment = 236,
-        ExportDeclaration = 237,
-        NamedExports = 238,
-        ExportSpecifier = 239,
-        MissingDeclaration = 240,
-        ExternalModuleReference = 241,
-        JsxElement = 242,
-        JsxSelfClosingElement = 243,
-        JsxOpeningElement = 244,
-        JsxClosingElement = 245,
-        JsxAttribute = 246,
-        JsxSpreadAttribute = 247,
-        JsxExpression = 248,
-        CaseClause = 249,
-        DefaultClause = 250,
-        HeritageClause = 251,
-        CatchClause = 252,
-        PropertyAssignment = 253,
-        ShorthandPropertyAssignment = 254,
-        EnumMember = 255,
-        SourceFile = 256,
-        JSDocTypeExpression = 257,
-        JSDocAllType = 258,
-        JSDocUnknownType = 259,
-        JSDocArrayType = 260,
-        JSDocUnionType = 261,
-        JSDocTupleType = 262,
-        JSDocNullableType = 263,
-        JSDocNonNullableType = 264,
-        JSDocRecordType = 265,
-        JSDocRecordMember = 266,
-        JSDocTypeReference = 267,
-        JSDocOptionalType = 268,
-        JSDocFunctionType = 269,
-        JSDocVariadicType = 270,
-        JSDocConstructorType = 271,
-        JSDocThisType = 272,
-        JSDocComment = 273,
-        JSDocTag = 274,
-        JSDocParameterTag = 275,
-        JSDocReturnTag = 276,
-        JSDocTypeTag = 277,
-        JSDocTemplateTag = 278,
-        JSDocTypedefTag = 279,
-        JSDocPropertyTag = 280,
-        JSDocTypeLiteral = 281,
-        JSDocLiteralType = 282,
-        JSDocNullKeyword = 283,
-        JSDocUndefinedKeyword = 284,
-        JSDocNeverKeyword = 285,
-        SyntaxList = 286,
-        NotEmittedStatement = 287,
-        PartiallyEmittedExpression = 288,
-        Count = 289,
+        KeyOfKeyword = 126,
+        ModuleKeyword = 127,
+        NamespaceKeyword = 128,
+        NeverKeyword = 129,
+        ReadonlyKeyword = 130,
+        RequireKeyword = 131,
+        NumberKeyword = 132,
+        SetKeyword = 133,
+        StringKeyword = 134,
+        SymbolKeyword = 135,
+        TypeKeyword = 136,
+        UndefinedKeyword = 137,
+        FromKeyword = 138,
+        GlobalKeyword = 139,
+        OfKeyword = 140,
+        QualifiedName = 141,
+        ComputedPropertyName = 142,
+        TypeParameter = 143,
+        Parameter = 144,
+        Decorator = 145,
+        PropertySignature = 146,
+        PropertyDeclaration = 147,
+        MethodSignature = 148,
+        MethodDeclaration = 149,
+        Constructor = 150,
+        GetAccessor = 151,
+        SetAccessor = 152,
+        CallSignature = 153,
+        ConstructSignature = 154,
+        IndexSignature = 155,
+        TypePredicate = 156,
+        TypeReference = 157,
+        FunctionType = 158,
+        ConstructorType = 159,
+        TypeQuery = 160,
+        TypeLiteral = 161,
+        ArrayType = 162,
+        TupleType = 163,
+        UnionType = 164,
+        IntersectionType = 165,
+        ParenthesizedType = 166,
+        ThisType = 167,
+        TypeOperator = 168,
+        IndexedAccessType = 169,
+        MappedType = 170,
+        LiteralType = 171,
+        ObjectBindingPattern = 172,
+        ArrayBindingPattern = 173,
+        BindingElement = 174,
+        ArrayLiteralExpression = 175,
+        ObjectLiteralExpression = 176,
+        PropertyAccessExpression = 177,
+        ElementAccessExpression = 178,
+        CallExpression = 179,
+        NewExpression = 180,
+        TaggedTemplateExpression = 181,
+        TypeAssertionExpression = 182,
+        ParenthesizedExpression = 183,
+        FunctionExpression = 184,
+        ArrowFunction = 185,
+        DeleteExpression = 186,
+        TypeOfExpression = 187,
+        VoidExpression = 188,
+        AwaitExpression = 189,
+        PrefixUnaryExpression = 190,
+        PostfixUnaryExpression = 191,
+        BinaryExpression = 192,
+        ConditionalExpression = 193,
+        TemplateExpression = 194,
+        YieldExpression = 195,
+        SpreadElement = 196,
+        ClassExpression = 197,
+        OmittedExpression = 198,
+        ExpressionWithTypeArguments = 199,
+        AsExpression = 200,
+        NonNullExpression = 201,
+        TemplateSpan = 202,
+        SemicolonClassElement = 203,
+        Block = 204,
+        VariableStatement = 205,
+        EmptyStatement = 206,
+        ExpressionStatement = 207,
+        IfStatement = 208,
+        DoStatement = 209,
+        WhileStatement = 210,
+        ForStatement = 211,
+        ForInStatement = 212,
+        ForOfStatement = 213,
+        ContinueStatement = 214,
+        BreakStatement = 215,
+        ReturnStatement = 216,
+        WithStatement = 217,
+        SwitchStatement = 218,
+        LabeledStatement = 219,
+        ThrowStatement = 220,
+        TryStatement = 221,
+        DebuggerStatement = 222,
+        VariableDeclaration = 223,
+        VariableDeclarationList = 224,
+        FunctionDeclaration = 225,
+        ClassDeclaration = 226,
+        InterfaceDeclaration = 227,
+        TypeAliasDeclaration = 228,
+        EnumDeclaration = 229,
+        ModuleDeclaration = 230,
+        ModuleBlock = 231,
+        CaseBlock = 232,
+        NamespaceExportDeclaration = 233,
+        ImportEqualsDeclaration = 234,
+        ImportDeclaration = 235,
+        ImportClause = 236,
+        NamespaceImport = 237,
+        NamedImports = 238,
+        ImportSpecifier = 239,
+        ExportAssignment = 240,
+        ExportDeclaration = 241,
+        NamedExports = 242,
+        ExportSpecifier = 243,
+        MissingDeclaration = 244,
+        ExternalModuleReference = 245,
+        JsxElement = 246,
+        JsxSelfClosingElement = 247,
+        JsxOpeningElement = 248,
+        JsxClosingElement = 249,
+        JsxAttribute = 250,
+        JsxSpreadAttribute = 251,
+        JsxExpression = 252,
+        CaseClause = 253,
+        DefaultClause = 254,
+        HeritageClause = 255,
+        CatchClause = 256,
+        PropertyAssignment = 257,
+        ShorthandPropertyAssignment = 258,
+        SpreadAssignment = 259,
+        EnumMember = 260,
+        SourceFile = 261,
+        JSDocTypeExpression = 262,
+        JSDocAllType = 263,
+        JSDocUnknownType = 264,
+        JSDocArrayType = 265,
+        JSDocUnionType = 266,
+        JSDocTupleType = 267,
+        JSDocNullableType = 268,
+        JSDocNonNullableType = 269,
+        JSDocRecordType = 270,
+        JSDocRecordMember = 271,
+        JSDocTypeReference = 272,
+        JSDocOptionalType = 273,
+        JSDocFunctionType = 274,
+        JSDocVariadicType = 275,
+        JSDocConstructorType = 276,
+        JSDocThisType = 277,
+        JSDocComment = 278,
+        JSDocTag = 279,
+        JSDocParameterTag = 280,
+        JSDocReturnTag = 281,
+        JSDocTypeTag = 282,
+        JSDocTemplateTag = 283,
+        JSDocTypedefTag = 284,
+        JSDocPropertyTag = 285,
+        JSDocTypeLiteral = 286,
+        JSDocLiteralType = 287,
+        JSDocNullKeyword = 288,
+        JSDocUndefinedKeyword = 289,
+        JSDocNeverKeyword = 290,
+        SyntaxList = 291,
+        NotEmittedStatement = 292,
+        PartiallyEmittedExpression = 293,
+        MergeDeclarationMarker = 294,
+        EndOfDeclarationMarker = 295,
+        Count = 296,
         FirstAssignment = 57,
         LastAssignment = 69,
         FirstCompoundAssignment = 58,
@@ -334,15 +341,15 @@ declare namespace ts {
         FirstReservedWord = 71,
         LastReservedWord = 106,
         FirstKeyword = 71,
-        LastKeyword = 139,
+        LastKeyword = 140,
         FirstFutureReservedWord = 107,
         LastFutureReservedWord = 115,
-        FirstTypeNode = 155,
-        LastTypeNode = 167,
+        FirstTypeNode = 156,
+        LastTypeNode = 171,
         FirstPunctuation = 16,
         LastPunctuation = 69,
         FirstToken = 0,
-        LastToken = 139,
+        LastToken = 140,
         FirstTriviaToken = 2,
         LastTriviaToken = 7,
         FirstLiteralToken = 8,
@@ -351,11 +358,11 @@ declare namespace ts {
         LastTemplateToken = 15,
         FirstBinaryOperator = 26,
         LastBinaryOperator = 69,
-        FirstNode = 140,
-        FirstJSDocNode = 257,
-        LastJSDocNode = 282,
-        FirstJSDocTagNode = 273,
-        LastJSDocTagNode = 285,
+        FirstNode = 141,
+        FirstJSDocNode = 262,
+        LastJSDocNode = 287,
+        FirstJSDocTagNode = 278,
+        LastJSDocTagNode = 290,
     }
     enum NodeFlags {
         None = 0,
@@ -373,21 +380,22 @@ declare namespace ts {
         HasDecorators = 2048,
         HasParamDecorators = 4096,
         HasAsyncFunctions = 8192,
-        HasJsxSpreadAttributes = 16384,
-        DisallowInContext = 32768,
-        YieldContext = 65536,
-        DecoratorContext = 131072,
-        AwaitContext = 262144,
-        ThisNodeHasError = 524288,
-        JavaScriptFile = 1048576,
-        ThisNodeOrAnySubNodesHasError = 2097152,
-        HasAggregatedChildData = 4194304,
+        HasSpreadAttribute = 16384,
+        HasRestAttribute = 32768,
+        DisallowInContext = 65536,
+        YieldContext = 131072,
+        DecoratorContext = 262144,
+        AwaitContext = 524288,
+        ThisNodeHasError = 1048576,
+        JavaScriptFile = 2097152,
+        ThisNodeOrAnySubNodesHasError = 4194304,
+        HasAggregatedChildData = 8388608,
         BlockScoped = 3,
         ReachabilityCheckFlags = 384,
-        EmitHelperFlags = 31744,
-        ReachabilityAndEmitFlags = 32128,
-        ContextFlags = 1540096,
-        TypeExcludesFlags = 327680,
+        EmitHelperFlags = 64512,
+        ReachabilityAndEmitFlags = 64896,
+        ContextFlags = 3080192,
+        TypeExcludesFlags = 655360,
     }
     enum ModifierFlags {
         None = 0,
@@ -407,6 +415,7 @@ declare namespace ts {
         ParameterPropertyModifier = 92,
         NonPublicAccessibilityModifier = 24,
         TypeScriptModifier = 2270,
+        ExportDefault = 513,
     }
     enum JsxFlags {
         None = 0,
@@ -437,12 +446,14 @@ declare namespace ts {
     type EqualsGreaterThanToken = Token<SyntaxKind.EqualsGreaterThanToken>;
     type EndOfFileToken = Token<SyntaxKind.EndOfFileToken>;
     type AtToken = Token<SyntaxKind.AtToken>;
+    type ReadonlyToken = Token<SyntaxKind.ReadonlyKeyword>;
     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 {
         kind: SyntaxKind.Identifier;
         text: string;
         originalKeywordKind?: SyntaxKind;
+        isInJSDocNamespace?: boolean;
     }
     interface TransientIdentifier extends Identifier {
         resolvedSymbol: Symbol;
@@ -533,7 +544,7 @@ declare namespace ts {
         _objectLiteralBrandBrand: any;
         name?: PropertyName;
     }
-    type ObjectLiteralElementLike = PropertyAssignment | ShorthandPropertyAssignment | MethodDeclaration | AccessorDeclaration;
+    type ObjectLiteralElementLike = PropertyAssignment | ShorthandPropertyAssignment | MethodDeclaration | AccessorDeclaration | SpreadAssignment;
     interface PropertyAssignment extends ObjectLiteralElement {
         kind: SyntaxKind.PropertyAssignment;
         name: PropertyName;
@@ -547,6 +558,10 @@ declare namespace ts {
         equalsToken?: Token<SyntaxKind.EqualsToken>;
         objectAssignmentInitializer?: Expression;
     }
+    interface SpreadAssignment extends ObjectLiteralElement {
+        kind: SyntaxKind.SpreadAssignment;
+        expression: Expression;
+    }
     interface VariableLikeDeclaration extends Declaration {
         propertyName?: PropertyName;
         dotDotDotToken?: DotDotDotToken;
@@ -677,6 +692,23 @@ declare namespace ts {
         kind: SyntaxKind.ParenthesizedType;
         type: TypeNode;
     }
+    interface TypeOperatorNode extends TypeNode {
+        kind: SyntaxKind.TypeOperator;
+        operator: SyntaxKind.KeyOfKeyword;
+        type: TypeNode;
+    }
+    interface IndexedAccessTypeNode extends TypeNode {
+        kind: SyntaxKind.IndexedAccessType;
+        objectType: TypeNode;
+        indexType: TypeNode;
+    }
+    interface MappedTypeNode extends TypeNode, Declaration {
+        kind: SyntaxKind.MappedType;
+        readonlyToken?: ReadonlyToken;
+        typeParameter: TypeParameterDeclaration;
+        questionToken?: QuestionToken;
+        type?: TypeNode;
+    }
     interface LiteralTypeNode extends TypeNode {
         kind: SyntaxKind.LiteralType;
         literal: Expression;
@@ -709,9 +741,6 @@ declare namespace ts {
         operand: LeftHandSideExpression;
         operator: PostfixUnaryOperator;
     }
-    interface PostfixExpression extends UnaryExpression {
-        _postfixExpressionBrand: any;
-    }
     interface LeftHandSideExpression extends IncrementExpression {
         _leftHandSideExpressionBrand: any;
     }
@@ -780,6 +809,17 @@ declare namespace ts {
         operatorToken: BinaryOperatorToken;
         right: Expression;
     }
+    interface AssignmentExpression extends BinaryExpression {
+        left: LeftHandSideExpression;
+        operatorToken: Token<SyntaxKind.EqualsToken>;
+    }
+    interface ObjectDestructuringAssignment extends AssignmentExpression {
+        left: ObjectLiteralExpression;
+    }
+    interface ArrayDestructuringAssignment extends AssignmentExpression {
+        left: ArrayLiteralExpression;
+    }
+    type DestructuringAssignment = ObjectDestructuringAssignment | ArrayDestructuringAssignment;
     interface ConditionalExpression extends Expression {
         kind: SyntaxKind.ConditionalExpression;
         condition: Expression;
@@ -846,8 +886,8 @@ declare namespace ts {
         kind: SyntaxKind.ArrayLiteralExpression;
         elements: NodeArray<Expression>;
     }
-    interface SpreadElementExpression extends Expression {
-        kind: SyntaxKind.SpreadElementExpression;
+    interface SpreadElement extends Expression {
+        kind: SyntaxKind.SpreadElement;
         expression: Expression;
     }
     /**
@@ -1141,12 +1181,16 @@ declare namespace ts {
     interface ModuleDeclaration extends DeclarationStatement {
         kind: SyntaxKind.ModuleDeclaration;
         name: Identifier | LiteralExpression;
-        body?: ModuleBlock | NamespaceDeclaration;
+        body?: ModuleBlock | NamespaceDeclaration | JSDocNamespaceDeclaration | Identifier;
     }
     interface NamespaceDeclaration extends ModuleDeclaration {
         name: Identifier;
         body: ModuleBlock | NamespaceDeclaration;
     }
+    interface JSDocNamespaceDeclaration extends ModuleDeclaration {
+        name: Identifier;
+        body: JSDocNamespaceDeclaration | Identifier;
+    }
     interface ModuleBlock extends Node, Statement {
         kind: SyntaxKind.ModuleBlock;
         statements: NodeArray<Statement>;
@@ -1318,6 +1362,7 @@ declare namespace ts {
     }
     interface JSDocTypedefTag extends JSDocTag, Declaration {
         kind: SyntaxKind.JSDocTypedefTag;
+        fullName?: JSDocNamespaceDeclaration | Identifier;
         name?: Identifier;
         typeExpression?: JSDocTypeExpression;
         jsDocTypeLiteral?: JSDocTypeLiteral;
@@ -1708,14 +1753,11 @@ declare namespace ts {
         Null = 4096,
         Never = 8192,
         TypeParameter = 16384,
-        Class = 32768,
-        Interface = 65536,
-        Reference = 131072,
-        Tuple = 262144,
-        Union = 524288,
-        Intersection = 1048576,
-        Anonymous = 2097152,
-        Instantiated = 4194304,
+        Object = 32768,
+        Union = 65536,
+        Intersection = 131072,
+        Index = 262144,
+        IndexedAccess = 524288,
         Literal = 480,
         StringOrNumberLiteral = 96,
         PossiblyFalsy = 7406,
@@ -1723,12 +1765,11 @@ declare namespace ts {
         NumberLike = 340,
         BooleanLike = 136,
         EnumLike = 272,
-        ObjectType = 2588672,
-        UnionOrIntersection = 1572864,
-        StructuredType = 4161536,
-        StructuredOrTypeParameter = 4177920,
-        Narrowable = 4178943,
-        NotUnionOrUnit = 2589185,
+        UnionOrIntersection = 196608,
+        StructuredType = 229376,
+        StructuredOrTypeParameter = 507904,
+        Narrowable = 1033215,
+        NotUnionOrUnit = 33281,
     }
     type DestructuringPattern = BindingPattern | ObjectLiteralExpression | ArrayLiteralExpression;
     interface Type {
@@ -1749,8 +1790,21 @@ declare namespace ts {
     interface EnumLiteralType extends LiteralType {
         baseType: EnumType & UnionType;
     }
+    enum ObjectFlags {
+        Class = 1,
+        Interface = 2,
+        Reference = 4,
+        Tuple = 8,
+        Anonymous = 16,
+        Mapped = 32,
+        Instantiated = 64,
+        ObjectLiteral = 128,
+        EvolvingArray = 256,
+        ObjectLiteralPatternWithComputedProperties = 512,
+        ClassOrInterface = 3,
+    }
     interface ObjectType extends Type {
-        isObjectLiteralPatternWithComputedProperties?: boolean;
+        objectFlags: ObjectFlags;
     }
     interface InterfaceType extends ObjectType {
         typeParameters: TypeParameter[];
@@ -1778,9 +1832,21 @@ declare namespace ts {
     }
     interface IntersectionType extends UnionOrIntersectionType {
     }
+    type StructuredType = ObjectType | UnionType | IntersectionType;
+    interface EvolvingArrayType extends ObjectType {
+        elementType: Type;
+        finalArrayType?: Type;
+    }
     interface TypeParameter extends Type {
         constraint: Type;
     }
+    interface IndexType extends Type {
+        type: TypeParameter;
+    }
+    interface IndexedAccessType extends Type {
+        objectType: Type;
+        indexType: TypeParameter;
+    }
     enum SignatureKind {
         Call = 0,
         Construct = 1,
@@ -1882,6 +1948,7 @@ declare namespace ts {
         preserveConstEnums?: boolean;
         project?: string;
         reactNamespace?: string;
+        jsxFactory?: string;
         removeComments?: boolean;
         rootDir?: string;
         rootDirs?: string[];
@@ -1912,6 +1979,7 @@ declare namespace ts {
         packageNameToTypingLocation: Map<string>;
         typingOptions: TypingOptions;
         compilerOptions: CompilerOptions;
+        unresolvedImports: ReadonlyArray<string>;
     }
     enum ModuleKind {
         None = 0,
@@ -1947,12 +2015,14 @@ declare namespace ts {
         ES2015 = 2,
         ES2016 = 3,
         ES2017 = 4,
-        Latest = 4,
+        ESNext = 5,
+        Latest = 5,
     }
     enum LanguageVariant {
         Standard = 0,
         JSX = 1,
     }
+    /** Either a parsed command line or a parsed tsconfig.json */
     interface ParsedCommandLine {
         options: CompilerOptions;
         typingOptions?: TypingOptions;
@@ -1979,12 +2049,45 @@ declare namespace ts {
         getCurrentDirectory?(): string;
         getDirectories?(path: string): string[];
     }
+    /**
+     * Represents the result of module resolution.
+     * Module resolution will pick up tsx/jsx/js files even if '--jsx' and '--allowJs' are turned off.
+     * The Program will then filter results based on these flags.
+     *
+     * Prefer to return a `ResolvedModuleFull` so that the file type does not have to be inferred.
+     */
     interface ResolvedModule {
+        /** Path of the file the module was resolved to. */
         resolvedFileName: string;
+        /**
+         * Denotes if 'resolvedFileName' is isExternalLibraryImport and thus should be a proper external module:
+         * - be a .d.ts file
+         * - use top level imports\exports
+         * - don't use tripleslash references
+         */
         isExternalLibraryImport?: boolean;
     }
+    /**
+     * ResolvedModule with an explicitly provided `extension` property.
+     * Prefer this over `ResolvedModule`.
+     */
+    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.
+         */
+        extension: Extension;
+    }
+    enum Extension {
+        Ts = 0,
+        Tsx = 1,
+        Dts = 2,
+        Js = 3,
+        Jsx = 4,
+        LastTypeScriptExtension = 2,
+    }
     interface ResolvedModuleWithFailedLookupLocations {
-        resolvedModule: ResolvedModule;
+        resolvedModule: ResolvedModuleFull | undefined;
         failedLookupLocations: string[];
     }
     interface ResolvedTypeReferenceDirective {
@@ -2042,7 +2145,11 @@ declare namespace ts {
         readFile(path: string, encoding?: string): string;
         getFileSize?(path: string): number;
         writeFile(path: string, data: string, writeByteOrderMark?: boolean): void;
-        watchFile?(path: string, callback: FileWatcherCallback): FileWatcher;
+        /**
+         * @pollingInterval - this parameter is used in polling-based watchers and ignored in watchers that
+         * use native OS file watching
+         */
+        watchFile?(path: string, callback: FileWatcherCallback, pollingInterval?: number): FileWatcher;
         watchDirectory?(path: string, callback: DirectoryWatcherCallback, recursive?: boolean): FileWatcher;
         resolvePath(path: string): string;
         fileExists(path: string): boolean;
@@ -2057,6 +2164,8 @@ declare namespace ts {
         getMemoryUsage?(): number;
         exit(exitCode?: number): void;
         realpath?(path: string): string;
+        setTimeout?(callback: (...args: any[]) => void, ms: number, ...args: any[]): any;
+        clearTimeout?(timeoutId: any): void;
     }
     interface FileWatcher {
         close(): void;
@@ -2159,6 +2268,7 @@ declare namespace ts {
     function createNode(kind: SyntaxKind, pos?: number, end?: number): Node;
     function forEachChild<T>(node: Node, cbNode: (node: Node) => T, cbNodeArray?: (nodes: Node[]) => T): T;
     function createSourceFile(fileName: string, sourceText: string, languageVersion: ScriptTarget, setParentNodes?: boolean, scriptKind?: ScriptKind): SourceFile;
+    function parseIsolatedEntityName(text: string, languageVersion: ScriptTarget): EntityName;
     function isExternalModule(file: SourceFile): boolean;
     function updateSourceFile(sourceFile: SourceFile, newText: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile;
 }
@@ -2172,7 +2282,7 @@ declare namespace ts {
      * This is possible in case if resolution is performed for directives specified via 'types' parameter. In this case initial path for secondary lookups
      * is assumed to be the same as root directory of the project.
      */
-    function resolveTypeReferenceDirective(typeReferenceDirectiveName: string, containingFile: string, options: CompilerOptions, host: ModuleResolutionHost): ResolvedTypeReferenceDirectiveWithFailedLookupLocations;
+    function resolveTypeReferenceDirective(typeReferenceDirectiveName: string, containingFile: string | undefined, options: CompilerOptions, host: ModuleResolutionHost): ResolvedTypeReferenceDirectiveWithFailedLookupLocations;
     /**
       * Given a set of options, returns the set of type directive names
       *   that should be included for this program automatically.
@@ -2188,7 +2298,7 @@ declare namespace ts {
 }
 declare namespace ts {
     /** The version of the TypeScript compiler release */
-    const version = "2.1.0";
+    const version = "2.2.0";
     function findConfigFile(searchPath: string, fileExists: (fileName: string) => boolean, configName?: string): string;
     function resolveTripleslashReference(moduleName: string, containingFile: string): string;
     function createCompilerHost(options: CompilerOptions, setParentNodes?: boolean): CompilerHost;
diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js
index dad603b624a..a36522ece49 100644
--- a/lib/typescriptServices.js
+++ b/lib/typescriptServices.js
@@ -22,6 +22,7 @@ var ts;
 (function (ts) {
     // token > SyntaxKind.Identifer => token is a keyword
     // Also, If you add a new SyntaxKind be sure to keep the `Markers` section at the bottom in sync
+    var SyntaxKind;
     (function (SyntaxKind) {
         SyntaxKind[SyntaxKind["Unknown"] = 0] = "Unknown";
         SyntaxKind[SyntaxKind["EndOfFileToken"] = 1] = "EndOfFileToken";
@@ -160,191 +161,198 @@ var ts;
         SyntaxKind[SyntaxKind["DeclareKeyword"] = 123] = "DeclareKeyword";
         SyntaxKind[SyntaxKind["GetKeyword"] = 124] = "GetKeyword";
         SyntaxKind[SyntaxKind["IsKeyword"] = 125] = "IsKeyword";
-        SyntaxKind[SyntaxKind["ModuleKeyword"] = 126] = "ModuleKeyword";
-        SyntaxKind[SyntaxKind["NamespaceKeyword"] = 127] = "NamespaceKeyword";
-        SyntaxKind[SyntaxKind["NeverKeyword"] = 128] = "NeverKeyword";
-        SyntaxKind[SyntaxKind["ReadonlyKeyword"] = 129] = "ReadonlyKeyword";
-        SyntaxKind[SyntaxKind["RequireKeyword"] = 130] = "RequireKeyword";
-        SyntaxKind[SyntaxKind["NumberKeyword"] = 131] = "NumberKeyword";
-        SyntaxKind[SyntaxKind["SetKeyword"] = 132] = "SetKeyword";
-        SyntaxKind[SyntaxKind["StringKeyword"] = 133] = "StringKeyword";
-        SyntaxKind[SyntaxKind["SymbolKeyword"] = 134] = "SymbolKeyword";
-        SyntaxKind[SyntaxKind["TypeKeyword"] = 135] = "TypeKeyword";
-        SyntaxKind[SyntaxKind["UndefinedKeyword"] = 136] = "UndefinedKeyword";
-        SyntaxKind[SyntaxKind["FromKeyword"] = 137] = "FromKeyword";
-        SyntaxKind[SyntaxKind["GlobalKeyword"] = 138] = "GlobalKeyword";
-        SyntaxKind[SyntaxKind["OfKeyword"] = 139] = "OfKeyword";
+        SyntaxKind[SyntaxKind["KeyOfKeyword"] = 126] = "KeyOfKeyword";
+        SyntaxKind[SyntaxKind["ModuleKeyword"] = 127] = "ModuleKeyword";
+        SyntaxKind[SyntaxKind["NamespaceKeyword"] = 128] = "NamespaceKeyword";
+        SyntaxKind[SyntaxKind["NeverKeyword"] = 129] = "NeverKeyword";
+        SyntaxKind[SyntaxKind["ReadonlyKeyword"] = 130] = "ReadonlyKeyword";
+        SyntaxKind[SyntaxKind["RequireKeyword"] = 131] = "RequireKeyword";
+        SyntaxKind[SyntaxKind["NumberKeyword"] = 132] = "NumberKeyword";
+        SyntaxKind[SyntaxKind["SetKeyword"] = 133] = "SetKeyword";
+        SyntaxKind[SyntaxKind["StringKeyword"] = 134] = "StringKeyword";
+        SyntaxKind[SyntaxKind["SymbolKeyword"] = 135] = "SymbolKeyword";
+        SyntaxKind[SyntaxKind["TypeKeyword"] = 136] = "TypeKeyword";
+        SyntaxKind[SyntaxKind["UndefinedKeyword"] = 137] = "UndefinedKeyword";
+        SyntaxKind[SyntaxKind["FromKeyword"] = 138] = "FromKeyword";
+        SyntaxKind[SyntaxKind["GlobalKeyword"] = 139] = "GlobalKeyword";
+        SyntaxKind[SyntaxKind["OfKeyword"] = 140] = "OfKeyword";
         // Parse tree nodes
         // Names
-        SyntaxKind[SyntaxKind["QualifiedName"] = 140] = "QualifiedName";
-        SyntaxKind[SyntaxKind["ComputedPropertyName"] = 141] = "ComputedPropertyName";
+        SyntaxKind[SyntaxKind["QualifiedName"] = 141] = "QualifiedName";
+        SyntaxKind[SyntaxKind["ComputedPropertyName"] = 142] = "ComputedPropertyName";
         // Signature elements
-        SyntaxKind[SyntaxKind["TypeParameter"] = 142] = "TypeParameter";
-        SyntaxKind[SyntaxKind["Parameter"] = 143] = "Parameter";
-        SyntaxKind[SyntaxKind["Decorator"] = 144] = "Decorator";
+        SyntaxKind[SyntaxKind["TypeParameter"] = 143] = "TypeParameter";
+        SyntaxKind[SyntaxKind["Parameter"] = 144] = "Parameter";
+        SyntaxKind[SyntaxKind["Decorator"] = 145] = "Decorator";
         // TypeMember
-        SyntaxKind[SyntaxKind["PropertySignature"] = 145] = "PropertySignature";
-        SyntaxKind[SyntaxKind["PropertyDeclaration"] = 146] = "PropertyDeclaration";
-        SyntaxKind[SyntaxKind["MethodSignature"] = 147] = "MethodSignature";
-        SyntaxKind[SyntaxKind["MethodDeclaration"] = 148] = "MethodDeclaration";
-        SyntaxKind[SyntaxKind["Constructor"] = 149] = "Constructor";
-        SyntaxKind[SyntaxKind["GetAccessor"] = 150] = "GetAccessor";
-        SyntaxKind[SyntaxKind["SetAccessor"] = 151] = "SetAccessor";
-        SyntaxKind[SyntaxKind["CallSignature"] = 152] = "CallSignature";
-        SyntaxKind[SyntaxKind["ConstructSignature"] = 153] = "ConstructSignature";
-        SyntaxKind[SyntaxKind["IndexSignature"] = 154] = "IndexSignature";
+        SyntaxKind[SyntaxKind["PropertySignature"] = 146] = "PropertySignature";
+        SyntaxKind[SyntaxKind["PropertyDeclaration"] = 147] = "PropertyDeclaration";
+        SyntaxKind[SyntaxKind["MethodSignature"] = 148] = "MethodSignature";
+        SyntaxKind[SyntaxKind["MethodDeclaration"] = 149] = "MethodDeclaration";
+        SyntaxKind[SyntaxKind["Constructor"] = 150] = "Constructor";
+        SyntaxKind[SyntaxKind["GetAccessor"] = 151] = "GetAccessor";
+        SyntaxKind[SyntaxKind["SetAccessor"] = 152] = "SetAccessor";
+        SyntaxKind[SyntaxKind["CallSignature"] = 153] = "CallSignature";
+        SyntaxKind[SyntaxKind["ConstructSignature"] = 154] = "ConstructSignature";
+        SyntaxKind[SyntaxKind["IndexSignature"] = 155] = "IndexSignature";
         // Type
-        SyntaxKind[SyntaxKind["TypePredicate"] = 155] = "TypePredicate";
-        SyntaxKind[SyntaxKind["TypeReference"] = 156] = "TypeReference";
-        SyntaxKind[SyntaxKind["FunctionType"] = 157] = "FunctionType";
-        SyntaxKind[SyntaxKind["ConstructorType"] = 158] = "ConstructorType";
-        SyntaxKind[SyntaxKind["TypeQuery"] = 159] = "TypeQuery";
-        SyntaxKind[SyntaxKind["TypeLiteral"] = 160] = "TypeLiteral";
-        SyntaxKind[SyntaxKind["ArrayType"] = 161] = "ArrayType";
-        SyntaxKind[SyntaxKind["TupleType"] = 162] = "TupleType";
-        SyntaxKind[SyntaxKind["UnionType"] = 163] = "UnionType";
-        SyntaxKind[SyntaxKind["IntersectionType"] = 164] = "IntersectionType";
-        SyntaxKind[SyntaxKind["ParenthesizedType"] = 165] = "ParenthesizedType";
-        SyntaxKind[SyntaxKind["ThisType"] = 166] = "ThisType";
-        SyntaxKind[SyntaxKind["LiteralType"] = 167] = "LiteralType";
+        SyntaxKind[SyntaxKind["TypePredicate"] = 156] = "TypePredicate";
+        SyntaxKind[SyntaxKind["TypeReference"] = 157] = "TypeReference";
+        SyntaxKind[SyntaxKind["FunctionType"] = 158] = "FunctionType";
+        SyntaxKind[SyntaxKind["ConstructorType"] = 159] = "ConstructorType";
+        SyntaxKind[SyntaxKind["TypeQuery"] = 160] = "TypeQuery";
+        SyntaxKind[SyntaxKind["TypeLiteral"] = 161] = "TypeLiteral";
+        SyntaxKind[SyntaxKind["ArrayType"] = 162] = "ArrayType";
+        SyntaxKind[SyntaxKind["TupleType"] = 163] = "TupleType";
+        SyntaxKind[SyntaxKind["UnionType"] = 164] = "UnionType";
+        SyntaxKind[SyntaxKind["IntersectionType"] = 165] = "IntersectionType";
+        SyntaxKind[SyntaxKind["ParenthesizedType"] = 166] = "ParenthesizedType";
+        SyntaxKind[SyntaxKind["ThisType"] = 167] = "ThisType";
+        SyntaxKind[SyntaxKind["TypeOperator"] = 168] = "TypeOperator";
+        SyntaxKind[SyntaxKind["IndexedAccessType"] = 169] = "IndexedAccessType";
+        SyntaxKind[SyntaxKind["MappedType"] = 170] = "MappedType";
+        SyntaxKind[SyntaxKind["LiteralType"] = 171] = "LiteralType";
         // Binding patterns
-        SyntaxKind[SyntaxKind["ObjectBindingPattern"] = 168] = "ObjectBindingPattern";
-        SyntaxKind[SyntaxKind["ArrayBindingPattern"] = 169] = "ArrayBindingPattern";
-        SyntaxKind[SyntaxKind["BindingElement"] = 170] = "BindingElement";
+        SyntaxKind[SyntaxKind["ObjectBindingPattern"] = 172] = "ObjectBindingPattern";
+        SyntaxKind[SyntaxKind["ArrayBindingPattern"] = 173] = "ArrayBindingPattern";
+        SyntaxKind[SyntaxKind["BindingElement"] = 174] = "BindingElement";
         // Expression
-        SyntaxKind[SyntaxKind["ArrayLiteralExpression"] = 171] = "ArrayLiteralExpression";
-        SyntaxKind[SyntaxKind["ObjectLiteralExpression"] = 172] = "ObjectLiteralExpression";
-        SyntaxKind[SyntaxKind["PropertyAccessExpression"] = 173] = "PropertyAccessExpression";
-        SyntaxKind[SyntaxKind["ElementAccessExpression"] = 174] = "ElementAccessExpression";
-        SyntaxKind[SyntaxKind["CallExpression"] = 175] = "CallExpression";
-        SyntaxKind[SyntaxKind["NewExpression"] = 176] = "NewExpression";
-        SyntaxKind[SyntaxKind["TaggedTemplateExpression"] = 177] = "TaggedTemplateExpression";
-        SyntaxKind[SyntaxKind["TypeAssertionExpression"] = 178] = "TypeAssertionExpression";
-        SyntaxKind[SyntaxKind["ParenthesizedExpression"] = 179] = "ParenthesizedExpression";
-        SyntaxKind[SyntaxKind["FunctionExpression"] = 180] = "FunctionExpression";
-        SyntaxKind[SyntaxKind["ArrowFunction"] = 181] = "ArrowFunction";
-        SyntaxKind[SyntaxKind["DeleteExpression"] = 182] = "DeleteExpression";
-        SyntaxKind[SyntaxKind["TypeOfExpression"] = 183] = "TypeOfExpression";
-        SyntaxKind[SyntaxKind["VoidExpression"] = 184] = "VoidExpression";
-        SyntaxKind[SyntaxKind["AwaitExpression"] = 185] = "AwaitExpression";
-        SyntaxKind[SyntaxKind["PrefixUnaryExpression"] = 186] = "PrefixUnaryExpression";
-        SyntaxKind[SyntaxKind["PostfixUnaryExpression"] = 187] = "PostfixUnaryExpression";
-        SyntaxKind[SyntaxKind["BinaryExpression"] = 188] = "BinaryExpression";
-        SyntaxKind[SyntaxKind["ConditionalExpression"] = 189] = "ConditionalExpression";
-        SyntaxKind[SyntaxKind["TemplateExpression"] = 190] = "TemplateExpression";
-        SyntaxKind[SyntaxKind["YieldExpression"] = 191] = "YieldExpression";
-        SyntaxKind[SyntaxKind["SpreadElementExpression"] = 192] = "SpreadElementExpression";
-        SyntaxKind[SyntaxKind["ClassExpression"] = 193] = "ClassExpression";
-        SyntaxKind[SyntaxKind["OmittedExpression"] = 194] = "OmittedExpression";
-        SyntaxKind[SyntaxKind["ExpressionWithTypeArguments"] = 195] = "ExpressionWithTypeArguments";
-        SyntaxKind[SyntaxKind["AsExpression"] = 196] = "AsExpression";
-        SyntaxKind[SyntaxKind["NonNullExpression"] = 197] = "NonNullExpression";
+        SyntaxKind[SyntaxKind["ArrayLiteralExpression"] = 175] = "ArrayLiteralExpression";
+        SyntaxKind[SyntaxKind["ObjectLiteralExpression"] = 176] = "ObjectLiteralExpression";
+        SyntaxKind[SyntaxKind["PropertyAccessExpression"] = 177] = "PropertyAccessExpression";
+        SyntaxKind[SyntaxKind["ElementAccessExpression"] = 178] = "ElementAccessExpression";
+        SyntaxKind[SyntaxKind["CallExpression"] = 179] = "CallExpression";
+        SyntaxKind[SyntaxKind["NewExpression"] = 180] = "NewExpression";
+        SyntaxKind[SyntaxKind["TaggedTemplateExpression"] = 181] = "TaggedTemplateExpression";
+        SyntaxKind[SyntaxKind["TypeAssertionExpression"] = 182] = "TypeAssertionExpression";
+        SyntaxKind[SyntaxKind["ParenthesizedExpression"] = 183] = "ParenthesizedExpression";
+        SyntaxKind[SyntaxKind["FunctionExpression"] = 184] = "FunctionExpression";
+        SyntaxKind[SyntaxKind["ArrowFunction"] = 185] = "ArrowFunction";
+        SyntaxKind[SyntaxKind["DeleteExpression"] = 186] = "DeleteExpression";
+        SyntaxKind[SyntaxKind["TypeOfExpression"] = 187] = "TypeOfExpression";
+        SyntaxKind[SyntaxKind["VoidExpression"] = 188] = "VoidExpression";
+        SyntaxKind[SyntaxKind["AwaitExpression"] = 189] = "AwaitExpression";
+        SyntaxKind[SyntaxKind["PrefixUnaryExpression"] = 190] = "PrefixUnaryExpression";
+        SyntaxKind[SyntaxKind["PostfixUnaryExpression"] = 191] = "PostfixUnaryExpression";
+        SyntaxKind[SyntaxKind["BinaryExpression"] = 192] = "BinaryExpression";
+        SyntaxKind[SyntaxKind["ConditionalExpression"] = 193] = "ConditionalExpression";
+        SyntaxKind[SyntaxKind["TemplateExpression"] = 194] = "TemplateExpression";
+        SyntaxKind[SyntaxKind["YieldExpression"] = 195] = "YieldExpression";
+        SyntaxKind[SyntaxKind["SpreadElement"] = 196] = "SpreadElement";
+        SyntaxKind[SyntaxKind["ClassExpression"] = 197] = "ClassExpression";
+        SyntaxKind[SyntaxKind["OmittedExpression"] = 198] = "OmittedExpression";
+        SyntaxKind[SyntaxKind["ExpressionWithTypeArguments"] = 199] = "ExpressionWithTypeArguments";
+        SyntaxKind[SyntaxKind["AsExpression"] = 200] = "AsExpression";
+        SyntaxKind[SyntaxKind["NonNullExpression"] = 201] = "NonNullExpression";
         // Misc
-        SyntaxKind[SyntaxKind["TemplateSpan"] = 198] = "TemplateSpan";
-        SyntaxKind[SyntaxKind["SemicolonClassElement"] = 199] = "SemicolonClassElement";
+        SyntaxKind[SyntaxKind["TemplateSpan"] = 202] = "TemplateSpan";
+        SyntaxKind[SyntaxKind["SemicolonClassElement"] = 203] = "SemicolonClassElement";
         // Element
-        SyntaxKind[SyntaxKind["Block"] = 200] = "Block";
-        SyntaxKind[SyntaxKind["VariableStatement"] = 201] = "VariableStatement";
-        SyntaxKind[SyntaxKind["EmptyStatement"] = 202] = "EmptyStatement";
-        SyntaxKind[SyntaxKind["ExpressionStatement"] = 203] = "ExpressionStatement";
-        SyntaxKind[SyntaxKind["IfStatement"] = 204] = "IfStatement";
-        SyntaxKind[SyntaxKind["DoStatement"] = 205] = "DoStatement";
-        SyntaxKind[SyntaxKind["WhileStatement"] = 206] = "WhileStatement";
-        SyntaxKind[SyntaxKind["ForStatement"] = 207] = "ForStatement";
-        SyntaxKind[SyntaxKind["ForInStatement"] = 208] = "ForInStatement";
-        SyntaxKind[SyntaxKind["ForOfStatement"] = 209] = "ForOfStatement";
-        SyntaxKind[SyntaxKind["ContinueStatement"] = 210] = "ContinueStatement";
-        SyntaxKind[SyntaxKind["BreakStatement"] = 211] = "BreakStatement";
-        SyntaxKind[SyntaxKind["ReturnStatement"] = 212] = "ReturnStatement";
-        SyntaxKind[SyntaxKind["WithStatement"] = 213] = "WithStatement";
-        SyntaxKind[SyntaxKind["SwitchStatement"] = 214] = "SwitchStatement";
-        SyntaxKind[SyntaxKind["LabeledStatement"] = 215] = "LabeledStatement";
-        SyntaxKind[SyntaxKind["ThrowStatement"] = 216] = "ThrowStatement";
-        SyntaxKind[SyntaxKind["TryStatement"] = 217] = "TryStatement";
-        SyntaxKind[SyntaxKind["DebuggerStatement"] = 218] = "DebuggerStatement";
-        SyntaxKind[SyntaxKind["VariableDeclaration"] = 219] = "VariableDeclaration";
-        SyntaxKind[SyntaxKind["VariableDeclarationList"] = 220] = "VariableDeclarationList";
-        SyntaxKind[SyntaxKind["FunctionDeclaration"] = 221] = "FunctionDeclaration";
-        SyntaxKind[SyntaxKind["ClassDeclaration"] = 222] = "ClassDeclaration";
-        SyntaxKind[SyntaxKind["InterfaceDeclaration"] = 223] = "InterfaceDeclaration";
-        SyntaxKind[SyntaxKind["TypeAliasDeclaration"] = 224] = "TypeAliasDeclaration";
-        SyntaxKind[SyntaxKind["EnumDeclaration"] = 225] = "EnumDeclaration";
-        SyntaxKind[SyntaxKind["ModuleDeclaration"] = 226] = "ModuleDeclaration";
-        SyntaxKind[SyntaxKind["ModuleBlock"] = 227] = "ModuleBlock";
-        SyntaxKind[SyntaxKind["CaseBlock"] = 228] = "CaseBlock";
-        SyntaxKind[SyntaxKind["NamespaceExportDeclaration"] = 229] = "NamespaceExportDeclaration";
-        SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 230] = "ImportEqualsDeclaration";
-        SyntaxKind[SyntaxKind["ImportDeclaration"] = 231] = "ImportDeclaration";
-        SyntaxKind[SyntaxKind["ImportClause"] = 232] = "ImportClause";
-        SyntaxKind[SyntaxKind["NamespaceImport"] = 233] = "NamespaceImport";
-        SyntaxKind[SyntaxKind["NamedImports"] = 234] = "NamedImports";
-        SyntaxKind[SyntaxKind["ImportSpecifier"] = 235] = "ImportSpecifier";
-        SyntaxKind[SyntaxKind["ExportAssignment"] = 236] = "ExportAssignment";
-        SyntaxKind[SyntaxKind["ExportDeclaration"] = 237] = "ExportDeclaration";
-        SyntaxKind[SyntaxKind["NamedExports"] = 238] = "NamedExports";
-        SyntaxKind[SyntaxKind["ExportSpecifier"] = 239] = "ExportSpecifier";
-        SyntaxKind[SyntaxKind["MissingDeclaration"] = 240] = "MissingDeclaration";
+        SyntaxKind[SyntaxKind["Block"] = 204] = "Block";
+        SyntaxKind[SyntaxKind["VariableStatement"] = 205] = "VariableStatement";
+        SyntaxKind[SyntaxKind["EmptyStatement"] = 206] = "EmptyStatement";
+        SyntaxKind[SyntaxKind["ExpressionStatement"] = 207] = "ExpressionStatement";
+        SyntaxKind[SyntaxKind["IfStatement"] = 208] = "IfStatement";
+        SyntaxKind[SyntaxKind["DoStatement"] = 209] = "DoStatement";
+        SyntaxKind[SyntaxKind["WhileStatement"] = 210] = "WhileStatement";
+        SyntaxKind[SyntaxKind["ForStatement"] = 211] = "ForStatement";
+        SyntaxKind[SyntaxKind["ForInStatement"] = 212] = "ForInStatement";
+        SyntaxKind[SyntaxKind["ForOfStatement"] = 213] = "ForOfStatement";
+        SyntaxKind[SyntaxKind["ContinueStatement"] = 214] = "ContinueStatement";
+        SyntaxKind[SyntaxKind["BreakStatement"] = 215] = "BreakStatement";
+        SyntaxKind[SyntaxKind["ReturnStatement"] = 216] = "ReturnStatement";
+        SyntaxKind[SyntaxKind["WithStatement"] = 217] = "WithStatement";
+        SyntaxKind[SyntaxKind["SwitchStatement"] = 218] = "SwitchStatement";
+        SyntaxKind[SyntaxKind["LabeledStatement"] = 219] = "LabeledStatement";
+        SyntaxKind[SyntaxKind["ThrowStatement"] = 220] = "ThrowStatement";
+        SyntaxKind[SyntaxKind["TryStatement"] = 221] = "TryStatement";
+        SyntaxKind[SyntaxKind["DebuggerStatement"] = 222] = "DebuggerStatement";
+        SyntaxKind[SyntaxKind["VariableDeclaration"] = 223] = "VariableDeclaration";
+        SyntaxKind[SyntaxKind["VariableDeclarationList"] = 224] = "VariableDeclarationList";
+        SyntaxKind[SyntaxKind["FunctionDeclaration"] = 225] = "FunctionDeclaration";
+        SyntaxKind[SyntaxKind["ClassDeclaration"] = 226] = "ClassDeclaration";
+        SyntaxKind[SyntaxKind["InterfaceDeclaration"] = 227] = "InterfaceDeclaration";
+        SyntaxKind[SyntaxKind["TypeAliasDeclaration"] = 228] = "TypeAliasDeclaration";
+        SyntaxKind[SyntaxKind["EnumDeclaration"] = 229] = "EnumDeclaration";
+        SyntaxKind[SyntaxKind["ModuleDeclaration"] = 230] = "ModuleDeclaration";
+        SyntaxKind[SyntaxKind["ModuleBlock"] = 231] = "ModuleBlock";
+        SyntaxKind[SyntaxKind["CaseBlock"] = 232] = "CaseBlock";
+        SyntaxKind[SyntaxKind["NamespaceExportDeclaration"] = 233] = "NamespaceExportDeclaration";
+        SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 234] = "ImportEqualsDeclaration";
+        SyntaxKind[SyntaxKind["ImportDeclaration"] = 235] = "ImportDeclaration";
+        SyntaxKind[SyntaxKind["ImportClause"] = 236] = "ImportClause";
+        SyntaxKind[SyntaxKind["NamespaceImport"] = 237] = "NamespaceImport";
+        SyntaxKind[SyntaxKind["NamedImports"] = 238] = "NamedImports";
+        SyntaxKind[SyntaxKind["ImportSpecifier"] = 239] = "ImportSpecifier";
+        SyntaxKind[SyntaxKind["ExportAssignment"] = 240] = "ExportAssignment";
+        SyntaxKind[SyntaxKind["ExportDeclaration"] = 241] = "ExportDeclaration";
+        SyntaxKind[SyntaxKind["NamedExports"] = 242] = "NamedExports";
+        SyntaxKind[SyntaxKind["ExportSpecifier"] = 243] = "ExportSpecifier";
+        SyntaxKind[SyntaxKind["MissingDeclaration"] = 244] = "MissingDeclaration";
         // Module references
-        SyntaxKind[SyntaxKind["ExternalModuleReference"] = 241] = "ExternalModuleReference";
+        SyntaxKind[SyntaxKind["ExternalModuleReference"] = 245] = "ExternalModuleReference";
         // JSX
-        SyntaxKind[SyntaxKind["JsxElement"] = 242] = "JsxElement";
-        SyntaxKind[SyntaxKind["JsxSelfClosingElement"] = 243] = "JsxSelfClosingElement";
-        SyntaxKind[SyntaxKind["JsxOpeningElement"] = 244] = "JsxOpeningElement";
-        SyntaxKind[SyntaxKind["JsxClosingElement"] = 245] = "JsxClosingElement";
-        SyntaxKind[SyntaxKind["JsxAttribute"] = 246] = "JsxAttribute";
-        SyntaxKind[SyntaxKind["JsxSpreadAttribute"] = 247] = "JsxSpreadAttribute";
-        SyntaxKind[SyntaxKind["JsxExpression"] = 248] = "JsxExpression";
+        SyntaxKind[SyntaxKind["JsxElement"] = 246] = "JsxElement";
+        SyntaxKind[SyntaxKind["JsxSelfClosingElement"] = 247] = "JsxSelfClosingElement";
+        SyntaxKind[SyntaxKind["JsxOpeningElement"] = 248] = "JsxOpeningElement";
+        SyntaxKind[SyntaxKind["JsxClosingElement"] = 249] = "JsxClosingElement";
+        SyntaxKind[SyntaxKind["JsxAttribute"] = 250] = "JsxAttribute";
+        SyntaxKind[SyntaxKind["JsxSpreadAttribute"] = 251] = "JsxSpreadAttribute";
+        SyntaxKind[SyntaxKind["JsxExpression"] = 252] = "JsxExpression";
         // Clauses
-        SyntaxKind[SyntaxKind["CaseClause"] = 249] = "CaseClause";
-        SyntaxKind[SyntaxKind["DefaultClause"] = 250] = "DefaultClause";
-        SyntaxKind[SyntaxKind["HeritageClause"] = 251] = "HeritageClause";
-        SyntaxKind[SyntaxKind["CatchClause"] = 252] = "CatchClause";
+        SyntaxKind[SyntaxKind["CaseClause"] = 253] = "CaseClause";
+        SyntaxKind[SyntaxKind["DefaultClause"] = 254] = "DefaultClause";
+        SyntaxKind[SyntaxKind["HeritageClause"] = 255] = "HeritageClause";
+        SyntaxKind[SyntaxKind["CatchClause"] = 256] = "CatchClause";
         // Property assignments
-        SyntaxKind[SyntaxKind["PropertyAssignment"] = 253] = "PropertyAssignment";
-        SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 254] = "ShorthandPropertyAssignment";
+        SyntaxKind[SyntaxKind["PropertyAssignment"] = 257] = "PropertyAssignment";
+        SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 258] = "ShorthandPropertyAssignment";
+        SyntaxKind[SyntaxKind["SpreadAssignment"] = 259] = "SpreadAssignment";
         // Enum
-        SyntaxKind[SyntaxKind["EnumMember"] = 255] = "EnumMember";
+        SyntaxKind[SyntaxKind["EnumMember"] = 260] = "EnumMember";
         // Top-level nodes
-        SyntaxKind[SyntaxKind["SourceFile"] = 256] = "SourceFile";
+        SyntaxKind[SyntaxKind["SourceFile"] = 261] = "SourceFile";
         // JSDoc nodes
-        SyntaxKind[SyntaxKind["JSDocTypeExpression"] = 257] = "JSDocTypeExpression";
+        SyntaxKind[SyntaxKind["JSDocTypeExpression"] = 262] = "JSDocTypeExpression";
         // The * type
-        SyntaxKind[SyntaxKind["JSDocAllType"] = 258] = "JSDocAllType";
+        SyntaxKind[SyntaxKind["JSDocAllType"] = 263] = "JSDocAllType";
         // The ? type
-        SyntaxKind[SyntaxKind["JSDocUnknownType"] = 259] = "JSDocUnknownType";
-        SyntaxKind[SyntaxKind["JSDocArrayType"] = 260] = "JSDocArrayType";
-        SyntaxKind[SyntaxKind["JSDocUnionType"] = 261] = "JSDocUnionType";
-        SyntaxKind[SyntaxKind["JSDocTupleType"] = 262] = "JSDocTupleType";
-        SyntaxKind[SyntaxKind["JSDocNullableType"] = 263] = "JSDocNullableType";
-        SyntaxKind[SyntaxKind["JSDocNonNullableType"] = 264] = "JSDocNonNullableType";
-        SyntaxKind[SyntaxKind["JSDocRecordType"] = 265] = "JSDocRecordType";
-        SyntaxKind[SyntaxKind["JSDocRecordMember"] = 266] = "JSDocRecordMember";
-        SyntaxKind[SyntaxKind["JSDocTypeReference"] = 267] = "JSDocTypeReference";
-        SyntaxKind[SyntaxKind["JSDocOptionalType"] = 268] = "JSDocOptionalType";
-        SyntaxKind[SyntaxKind["JSDocFunctionType"] = 269] = "JSDocFunctionType";
-        SyntaxKind[SyntaxKind["JSDocVariadicType"] = 270] = "JSDocVariadicType";
-        SyntaxKind[SyntaxKind["JSDocConstructorType"] = 271] = "JSDocConstructorType";
-        SyntaxKind[SyntaxKind["JSDocThisType"] = 272] = "JSDocThisType";
-        SyntaxKind[SyntaxKind["JSDocComment"] = 273] = "JSDocComment";
-        SyntaxKind[SyntaxKind["JSDocTag"] = 274] = "JSDocTag";
-        SyntaxKind[SyntaxKind["JSDocParameterTag"] = 275] = "JSDocParameterTag";
-        SyntaxKind[SyntaxKind["JSDocReturnTag"] = 276] = "JSDocReturnTag";
-        SyntaxKind[SyntaxKind["JSDocTypeTag"] = 277] = "JSDocTypeTag";
-        SyntaxKind[SyntaxKind["JSDocTemplateTag"] = 278] = "JSDocTemplateTag";
-        SyntaxKind[SyntaxKind["JSDocTypedefTag"] = 279] = "JSDocTypedefTag";
-        SyntaxKind[SyntaxKind["JSDocPropertyTag"] = 280] = "JSDocPropertyTag";
-        SyntaxKind[SyntaxKind["JSDocTypeLiteral"] = 281] = "JSDocTypeLiteral";
-        SyntaxKind[SyntaxKind["JSDocLiteralType"] = 282] = "JSDocLiteralType";
-        SyntaxKind[SyntaxKind["JSDocNullKeyword"] = 283] = "JSDocNullKeyword";
-        SyntaxKind[SyntaxKind["JSDocUndefinedKeyword"] = 284] = "JSDocUndefinedKeyword";
-        SyntaxKind[SyntaxKind["JSDocNeverKeyword"] = 285] = "JSDocNeverKeyword";
+        SyntaxKind[SyntaxKind["JSDocUnknownType"] = 264] = "JSDocUnknownType";
+        SyntaxKind[SyntaxKind["JSDocArrayType"] = 265] = "JSDocArrayType";
+        SyntaxKind[SyntaxKind["JSDocUnionType"] = 266] = "JSDocUnionType";
+        SyntaxKind[SyntaxKind["JSDocTupleType"] = 267] = "JSDocTupleType";
+        SyntaxKind[SyntaxKind["JSDocNullableType"] = 268] = "JSDocNullableType";
+        SyntaxKind[SyntaxKind["JSDocNonNullableType"] = 269] = "JSDocNonNullableType";
+        SyntaxKind[SyntaxKind["JSDocRecordType"] = 270] = "JSDocRecordType";
+        SyntaxKind[SyntaxKind["JSDocRecordMember"] = 271] = "JSDocRecordMember";
+        SyntaxKind[SyntaxKind["JSDocTypeReference"] = 272] = "JSDocTypeReference";
+        SyntaxKind[SyntaxKind["JSDocOptionalType"] = 273] = "JSDocOptionalType";
+        SyntaxKind[SyntaxKind["JSDocFunctionType"] = 274] = "JSDocFunctionType";
+        SyntaxKind[SyntaxKind["JSDocVariadicType"] = 275] = "JSDocVariadicType";
+        SyntaxKind[SyntaxKind["JSDocConstructorType"] = 276] = "JSDocConstructorType";
+        SyntaxKind[SyntaxKind["JSDocThisType"] = 277] = "JSDocThisType";
+        SyntaxKind[SyntaxKind["JSDocComment"] = 278] = "JSDocComment";
+        SyntaxKind[SyntaxKind["JSDocTag"] = 279] = "JSDocTag";
+        SyntaxKind[SyntaxKind["JSDocParameterTag"] = 280] = "JSDocParameterTag";
+        SyntaxKind[SyntaxKind["JSDocReturnTag"] = 281] = "JSDocReturnTag";
+        SyntaxKind[SyntaxKind["JSDocTypeTag"] = 282] = "JSDocTypeTag";
+        SyntaxKind[SyntaxKind["JSDocTemplateTag"] = 283] = "JSDocTemplateTag";
+        SyntaxKind[SyntaxKind["JSDocTypedefTag"] = 284] = "JSDocTypedefTag";
+        SyntaxKind[SyntaxKind["JSDocPropertyTag"] = 285] = "JSDocPropertyTag";
+        SyntaxKind[SyntaxKind["JSDocTypeLiteral"] = 286] = "JSDocTypeLiteral";
+        SyntaxKind[SyntaxKind["JSDocLiteralType"] = 287] = "JSDocLiteralType";
+        SyntaxKind[SyntaxKind["JSDocNullKeyword"] = 288] = "JSDocNullKeyword";
+        SyntaxKind[SyntaxKind["JSDocUndefinedKeyword"] = 289] = "JSDocUndefinedKeyword";
+        SyntaxKind[SyntaxKind["JSDocNeverKeyword"] = 290] = "JSDocNeverKeyword";
         // Synthesized list
-        SyntaxKind[SyntaxKind["SyntaxList"] = 286] = "SyntaxList";
+        SyntaxKind[SyntaxKind["SyntaxList"] = 291] = "SyntaxList";
         // Transformation nodes
-        SyntaxKind[SyntaxKind["NotEmittedStatement"] = 287] = "NotEmittedStatement";
-        SyntaxKind[SyntaxKind["PartiallyEmittedExpression"] = 288] = "PartiallyEmittedExpression";
+        SyntaxKind[SyntaxKind["NotEmittedStatement"] = 292] = "NotEmittedStatement";
+        SyntaxKind[SyntaxKind["PartiallyEmittedExpression"] = 293] = "PartiallyEmittedExpression";
+        SyntaxKind[SyntaxKind["MergeDeclarationMarker"] = 294] = "MergeDeclarationMarker";
+        SyntaxKind[SyntaxKind["EndOfDeclarationMarker"] = 295] = "EndOfDeclarationMarker";
         // Enum value count
-        SyntaxKind[SyntaxKind["Count"] = 289] = "Count";
+        SyntaxKind[SyntaxKind["Count"] = 296] = "Count";
         // Markers
         SyntaxKind[SyntaxKind["FirstAssignment"] = 57] = "FirstAssignment";
         SyntaxKind[SyntaxKind["LastAssignment"] = 69] = "LastAssignment";
@@ -353,15 +361,15 @@ var ts;
         SyntaxKind[SyntaxKind["FirstReservedWord"] = 71] = "FirstReservedWord";
         SyntaxKind[SyntaxKind["LastReservedWord"] = 106] = "LastReservedWord";
         SyntaxKind[SyntaxKind["FirstKeyword"] = 71] = "FirstKeyword";
-        SyntaxKind[SyntaxKind["LastKeyword"] = 139] = "LastKeyword";
+        SyntaxKind[SyntaxKind["LastKeyword"] = 140] = "LastKeyword";
         SyntaxKind[SyntaxKind["FirstFutureReservedWord"] = 107] = "FirstFutureReservedWord";
         SyntaxKind[SyntaxKind["LastFutureReservedWord"] = 115] = "LastFutureReservedWord";
-        SyntaxKind[SyntaxKind["FirstTypeNode"] = 155] = "FirstTypeNode";
-        SyntaxKind[SyntaxKind["LastTypeNode"] = 167] = "LastTypeNode";
+        SyntaxKind[SyntaxKind["FirstTypeNode"] = 156] = "FirstTypeNode";
+        SyntaxKind[SyntaxKind["LastTypeNode"] = 171] = "LastTypeNode";
         SyntaxKind[SyntaxKind["FirstPunctuation"] = 16] = "FirstPunctuation";
         SyntaxKind[SyntaxKind["LastPunctuation"] = 69] = "LastPunctuation";
         SyntaxKind[SyntaxKind["FirstToken"] = 0] = "FirstToken";
-        SyntaxKind[SyntaxKind["LastToken"] = 139] = "LastToken";
+        SyntaxKind[SyntaxKind["LastToken"] = 140] = "LastToken";
         SyntaxKind[SyntaxKind["FirstTriviaToken"] = 2] = "FirstTriviaToken";
         SyntaxKind[SyntaxKind["LastTriviaToken"] = 7] = "LastTriviaToken";
         SyntaxKind[SyntaxKind["FirstLiteralToken"] = 8] = "FirstLiteralToken";
@@ -370,13 +378,13 @@ var ts;
         SyntaxKind[SyntaxKind["LastTemplateToken"] = 15] = "LastTemplateToken";
         SyntaxKind[SyntaxKind["FirstBinaryOperator"] = 26] = "FirstBinaryOperator";
         SyntaxKind[SyntaxKind["LastBinaryOperator"] = 69] = "LastBinaryOperator";
-        SyntaxKind[SyntaxKind["FirstNode"] = 140] = "FirstNode";
-        SyntaxKind[SyntaxKind["FirstJSDocNode"] = 257] = "FirstJSDocNode";
-        SyntaxKind[SyntaxKind["LastJSDocNode"] = 282] = "LastJSDocNode";
-        SyntaxKind[SyntaxKind["FirstJSDocTagNode"] = 273] = "FirstJSDocTagNode";
-        SyntaxKind[SyntaxKind["LastJSDocTagNode"] = 285] = "LastJSDocTagNode";
-    })(ts.SyntaxKind || (ts.SyntaxKind = {}));
-    var SyntaxKind = ts.SyntaxKind;
+        SyntaxKind[SyntaxKind["FirstNode"] = 141] = "FirstNode";
+        SyntaxKind[SyntaxKind["FirstJSDocNode"] = 262] = "FirstJSDocNode";
+        SyntaxKind[SyntaxKind["LastJSDocNode"] = 287] = "LastJSDocNode";
+        SyntaxKind[SyntaxKind["FirstJSDocTagNode"] = 278] = "FirstJSDocTagNode";
+        SyntaxKind[SyntaxKind["LastJSDocTagNode"] = 290] = "LastJSDocTagNode";
+    })(SyntaxKind = ts.SyntaxKind || (ts.SyntaxKind = {}));
+    var NodeFlags;
     (function (NodeFlags) {
         NodeFlags[NodeFlags["None"] = 0] = "None";
         NodeFlags[NodeFlags["Let"] = 1] = "Let";
@@ -393,25 +401,26 @@ var ts;
         NodeFlags[NodeFlags["HasDecorators"] = 2048] = "HasDecorators";
         NodeFlags[NodeFlags["HasParamDecorators"] = 4096] = "HasParamDecorators";
         NodeFlags[NodeFlags["HasAsyncFunctions"] = 8192] = "HasAsyncFunctions";
-        NodeFlags[NodeFlags["HasJsxSpreadAttributes"] = 16384] = "HasJsxSpreadAttributes";
-        NodeFlags[NodeFlags["DisallowInContext"] = 32768] = "DisallowInContext";
-        NodeFlags[NodeFlags["YieldContext"] = 65536] = "YieldContext";
-        NodeFlags[NodeFlags["DecoratorContext"] = 131072] = "DecoratorContext";
-        NodeFlags[NodeFlags["AwaitContext"] = 262144] = "AwaitContext";
-        NodeFlags[NodeFlags["ThisNodeHasError"] = 524288] = "ThisNodeHasError";
-        NodeFlags[NodeFlags["JavaScriptFile"] = 1048576] = "JavaScriptFile";
-        NodeFlags[NodeFlags["ThisNodeOrAnySubNodesHasError"] = 2097152] = "ThisNodeOrAnySubNodesHasError";
-        NodeFlags[NodeFlags["HasAggregatedChildData"] = 4194304] = "HasAggregatedChildData";
+        NodeFlags[NodeFlags["HasSpreadAttribute"] = 16384] = "HasSpreadAttribute";
+        NodeFlags[NodeFlags["HasRestAttribute"] = 32768] = "HasRestAttribute";
+        NodeFlags[NodeFlags["DisallowInContext"] = 65536] = "DisallowInContext";
+        NodeFlags[NodeFlags["YieldContext"] = 131072] = "YieldContext";
+        NodeFlags[NodeFlags["DecoratorContext"] = 262144] = "DecoratorContext";
+        NodeFlags[NodeFlags["AwaitContext"] = 524288] = "AwaitContext";
+        NodeFlags[NodeFlags["ThisNodeHasError"] = 1048576] = "ThisNodeHasError";
+        NodeFlags[NodeFlags["JavaScriptFile"] = 2097152] = "JavaScriptFile";
+        NodeFlags[NodeFlags["ThisNodeOrAnySubNodesHasError"] = 4194304] = "ThisNodeOrAnySubNodesHasError";
+        NodeFlags[NodeFlags["HasAggregatedChildData"] = 8388608] = "HasAggregatedChildData";
         NodeFlags[NodeFlags["BlockScoped"] = 3] = "BlockScoped";
         NodeFlags[NodeFlags["ReachabilityCheckFlags"] = 384] = "ReachabilityCheckFlags";
-        NodeFlags[NodeFlags["EmitHelperFlags"] = 31744] = "EmitHelperFlags";
-        NodeFlags[NodeFlags["ReachabilityAndEmitFlags"] = 32128] = "ReachabilityAndEmitFlags";
+        NodeFlags[NodeFlags["EmitHelperFlags"] = 64512] = "EmitHelperFlags";
+        NodeFlags[NodeFlags["ReachabilityAndEmitFlags"] = 64896] = "ReachabilityAndEmitFlags";
         // Parsing context flags
-        NodeFlags[NodeFlags["ContextFlags"] = 1540096] = "ContextFlags";
+        NodeFlags[NodeFlags["ContextFlags"] = 3080192] = "ContextFlags";
         // Exclude these flags when parsing a Type
-        NodeFlags[NodeFlags["TypeExcludesFlags"] = 327680] = "TypeExcludesFlags";
-    })(ts.NodeFlags || (ts.NodeFlags = {}));
-    var NodeFlags = ts.NodeFlags;
+        NodeFlags[NodeFlags["TypeExcludesFlags"] = 655360] = "TypeExcludesFlags";
+    })(NodeFlags = ts.NodeFlags || (ts.NodeFlags = {}));
+    var ModifierFlags;
     (function (ModifierFlags) {
         ModifierFlags[ModifierFlags["None"] = 0] = "None";
         ModifierFlags[ModifierFlags["Export"] = 1] = "Export";
@@ -431,8 +440,9 @@ var ts;
         ModifierFlags[ModifierFlags["ParameterPropertyModifier"] = 92] = "ParameterPropertyModifier";
         ModifierFlags[ModifierFlags["NonPublicAccessibilityModifier"] = 24] = "NonPublicAccessibilityModifier";
         ModifierFlags[ModifierFlags["TypeScriptModifier"] = 2270] = "TypeScriptModifier";
-    })(ts.ModifierFlags || (ts.ModifierFlags = {}));
-    var ModifierFlags = ts.ModifierFlags;
+        ModifierFlags[ModifierFlags["ExportDefault"] = 513] = "ExportDefault";
+    })(ModifierFlags = ts.ModifierFlags || (ts.ModifierFlags = {}));
+    var JsxFlags;
     (function (JsxFlags) {
         JsxFlags[JsxFlags["None"] = 0] = "None";
         /** An element from a named property of the JSX.IntrinsicElements interface */
@@ -440,24 +450,24 @@ var ts;
         /** An element inferred from the string index signature of the JSX.IntrinsicElements interface */
         JsxFlags[JsxFlags["IntrinsicIndexedElement"] = 2] = "IntrinsicIndexedElement";
         JsxFlags[JsxFlags["IntrinsicElement"] = 3] = "IntrinsicElement";
-    })(ts.JsxFlags || (ts.JsxFlags = {}));
-    var JsxFlags = ts.JsxFlags;
+    })(JsxFlags = ts.JsxFlags || (ts.JsxFlags = {}));
     /* @internal */
+    var RelationComparisonResult;
     (function (RelationComparisonResult) {
         RelationComparisonResult[RelationComparisonResult["Succeeded"] = 1] = "Succeeded";
         RelationComparisonResult[RelationComparisonResult["Failed"] = 2] = "Failed";
         RelationComparisonResult[RelationComparisonResult["FailedAndReported"] = 3] = "FailedAndReported";
-    })(ts.RelationComparisonResult || (ts.RelationComparisonResult = {}));
-    var RelationComparisonResult = ts.RelationComparisonResult;
+    })(RelationComparisonResult = ts.RelationComparisonResult || (ts.RelationComparisonResult = {}));
     /*@internal*/
+    var GeneratedIdentifierKind;
     (function (GeneratedIdentifierKind) {
         GeneratedIdentifierKind[GeneratedIdentifierKind["None"] = 0] = "None";
         GeneratedIdentifierKind[GeneratedIdentifierKind["Auto"] = 1] = "Auto";
         GeneratedIdentifierKind[GeneratedIdentifierKind["Loop"] = 2] = "Loop";
         GeneratedIdentifierKind[GeneratedIdentifierKind["Unique"] = 3] = "Unique";
         GeneratedIdentifierKind[GeneratedIdentifierKind["Node"] = 4] = "Node";
-    })(ts.GeneratedIdentifierKind || (ts.GeneratedIdentifierKind = {}));
-    var GeneratedIdentifierKind = ts.GeneratedIdentifierKind;
+    })(GeneratedIdentifierKind = ts.GeneratedIdentifierKind || (ts.GeneratedIdentifierKind = {}));
+    var FlowFlags;
     (function (FlowFlags) {
         FlowFlags[FlowFlags["Unreachable"] = 1] = "Unreachable";
         FlowFlags[FlowFlags["Start"] = 2] = "Start";
@@ -472,8 +482,7 @@ var ts;
         FlowFlags[FlowFlags["Shared"] = 1024] = "Shared";
         FlowFlags[FlowFlags["Label"] = 12] = "Label";
         FlowFlags[FlowFlags["Condition"] = 96] = "Condition";
-    })(ts.FlowFlags || (ts.FlowFlags = {}));
-    var FlowFlags = ts.FlowFlags;
+    })(FlowFlags = ts.FlowFlags || (ts.FlowFlags = {}));
     var OperationCanceledException = (function () {
         function OperationCanceledException() {
         }
@@ -481,6 +490,7 @@ var ts;
     }());
     ts.OperationCanceledException = OperationCanceledException;
     /** Return code used by getEmitOutput function to indicate status of the function */
+    var ExitStatus;
     (function (ExitStatus) {
         // Compiler ran successfully.  Either this was a simple do-nothing compilation (for example,
         // when -version or -help was provided, or this was a normal compilation, no diagnostics
@@ -490,8 +500,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";
-    })(ts.ExitStatus || (ts.ExitStatus = {}));
-    var ExitStatus = ts.ExitStatus;
+    })(ExitStatus = ts.ExitStatus || (ts.ExitStatus = {}));
+    var TypeFormatFlags;
     (function (TypeFormatFlags) {
         TypeFormatFlags[TypeFormatFlags["None"] = 0] = "None";
         TypeFormatFlags[TypeFormatFlags["WriteArrayAsGenericType"] = 1] = "WriteArrayAsGenericType";
@@ -505,8 +515,8 @@ var ts;
         TypeFormatFlags[TypeFormatFlags["InFirstTypeArgument"] = 256] = "InFirstTypeArgument";
         TypeFormatFlags[TypeFormatFlags["InTypeAlias"] = 512] = "InTypeAlias";
         TypeFormatFlags[TypeFormatFlags["UseTypeAliasValue"] = 1024] = "UseTypeAliasValue";
-    })(ts.TypeFormatFlags || (ts.TypeFormatFlags = {}));
-    var TypeFormatFlags = ts.TypeFormatFlags;
+    })(TypeFormatFlags = ts.TypeFormatFlags || (ts.TypeFormatFlags = {}));
+    var SymbolFormatFlags;
     (function (SymbolFormatFlags) {
         SymbolFormatFlags[SymbolFormatFlags["None"] = 0] = "None";
         // Write symbols's type argument if it is instantiated symbol
@@ -518,23 +528,29 @@ var ts;
         // eg.  module m { export class c { } } import x = m.c;
         // When this flag is specified m.c will be used to refer to the class instead of alias symbol x
         SymbolFormatFlags[SymbolFormatFlags["UseOnlyExternalAliasing"] = 2] = "UseOnlyExternalAliasing";
-    })(ts.SymbolFormatFlags || (ts.SymbolFormatFlags = {}));
-    var SymbolFormatFlags = ts.SymbolFormatFlags;
+    })(SymbolFormatFlags = ts.SymbolFormatFlags || (ts.SymbolFormatFlags = {}));
     /* @internal */
+    var SymbolAccessibility;
     (function (SymbolAccessibility) {
         SymbolAccessibility[SymbolAccessibility["Accessible"] = 0] = "Accessible";
         SymbolAccessibility[SymbolAccessibility["NotAccessible"] = 1] = "NotAccessible";
         SymbolAccessibility[SymbolAccessibility["CannotBeNamed"] = 2] = "CannotBeNamed";
-    })(ts.SymbolAccessibility || (ts.SymbolAccessibility = {}));
-    var SymbolAccessibility = ts.SymbolAccessibility;
+    })(SymbolAccessibility = ts.SymbolAccessibility || (ts.SymbolAccessibility = {}));
+    /* @internal */
+    var SyntheticSymbolKind;
+    (function (SyntheticSymbolKind) {
+        SyntheticSymbolKind[SyntheticSymbolKind["UnionOrIntersection"] = 0] = "UnionOrIntersection";
+        SyntheticSymbolKind[SyntheticSymbolKind["Spread"] = 1] = "Spread";
+    })(SyntheticSymbolKind = ts.SyntheticSymbolKind || (ts.SyntheticSymbolKind = {}));
+    var TypePredicateKind;
     (function (TypePredicateKind) {
         TypePredicateKind[TypePredicateKind["This"] = 0] = "This";
         TypePredicateKind[TypePredicateKind["Identifier"] = 1] = "Identifier";
-    })(ts.TypePredicateKind || (ts.TypePredicateKind = {}));
-    var TypePredicateKind = ts.TypePredicateKind;
+    })(TypePredicateKind = ts.TypePredicateKind || (ts.TypePredicateKind = {}));
     /** Indicates how to serialize the name for a TypeReferenceNode when emitting decorator
       * metadata */
     /* @internal */
+    var TypeReferenceSerializationKind;
     (function (TypeReferenceSerializationKind) {
         TypeReferenceSerializationKind[TypeReferenceSerializationKind["Unknown"] = 0] = "Unknown";
         // should be emitted using a safe fallback.
@@ -552,8 +568,8 @@ var ts;
         TypeReferenceSerializationKind[TypeReferenceSerializationKind["TypeWithCallSignature"] = 9] = "TypeWithCallSignature";
         // with call signatures.
         TypeReferenceSerializationKind[TypeReferenceSerializationKind["ObjectType"] = 10] = "ObjectType";
-    })(ts.TypeReferenceSerializationKind || (ts.TypeReferenceSerializationKind = {}));
-    var TypeReferenceSerializationKind = ts.TypeReferenceSerializationKind;
+    })(TypeReferenceSerializationKind = ts.TypeReferenceSerializationKind || (ts.TypeReferenceSerializationKind = {}));
+    var SymbolFlags;
     (function (SymbolFlags) {
         SymbolFlags[SymbolFlags["None"] = 0] = "None";
         SymbolFlags[SymbolFlags["FunctionScopedVariable"] = 1] = "FunctionScopedVariable";
@@ -628,9 +644,9 @@ var ts;
         // The set of things we consider semantically classifiable.  Used to speed up the LS during
         // classification.
         SymbolFlags[SymbolFlags["Classifiable"] = 788448] = "Classifiable";
-    })(ts.SymbolFlags || (ts.SymbolFlags = {}));
-    var SymbolFlags = ts.SymbolFlags;
+    })(SymbolFlags = ts.SymbolFlags || (ts.SymbolFlags = {}));
     /* @internal */
+    var NodeCheckFlags;
     (function (NodeCheckFlags) {
         NodeCheckFlags[NodeCheckFlags["TypeChecked"] = 1] = "TypeChecked";
         NodeCheckFlags[NodeCheckFlags["LexicalThis"] = 2] = "LexicalThis";
@@ -652,8 +668,8 @@ var ts;
         NodeCheckFlags[NodeCheckFlags["AssignmentsMarked"] = 4194304] = "AssignmentsMarked";
         NodeCheckFlags[NodeCheckFlags["ClassWithConstructorReference"] = 8388608] = "ClassWithConstructorReference";
         NodeCheckFlags[NodeCheckFlags["ConstructorReferenceInClass"] = 16777216] = "ConstructorReferenceInClass";
-    })(ts.NodeCheckFlags || (ts.NodeCheckFlags = {}));
-    var NodeCheckFlags = ts.NodeCheckFlags;
+    })(NodeCheckFlags = ts.NodeCheckFlags || (ts.NodeCheckFlags = {}));
+    var TypeFlags;
     (function (TypeFlags) {
         TypeFlags[TypeFlags["Any"] = 1] = "Any";
         TypeFlags[TypeFlags["String"] = 2] = "String";
@@ -670,24 +686,19 @@ var ts;
         TypeFlags[TypeFlags["Null"] = 4096] = "Null";
         TypeFlags[TypeFlags["Never"] = 8192] = "Never";
         TypeFlags[TypeFlags["TypeParameter"] = 16384] = "TypeParameter";
-        TypeFlags[TypeFlags["Class"] = 32768] = "Class";
-        TypeFlags[TypeFlags["Interface"] = 65536] = "Interface";
-        TypeFlags[TypeFlags["Reference"] = 131072] = "Reference";
-        TypeFlags[TypeFlags["Tuple"] = 262144] = "Tuple";
-        TypeFlags[TypeFlags["Union"] = 524288] = "Union";
-        TypeFlags[TypeFlags["Intersection"] = 1048576] = "Intersection";
-        TypeFlags[TypeFlags["Anonymous"] = 2097152] = "Anonymous";
-        TypeFlags[TypeFlags["Instantiated"] = 4194304] = "Instantiated";
+        TypeFlags[TypeFlags["Object"] = 32768] = "Object";
+        TypeFlags[TypeFlags["Union"] = 65536] = "Union";
+        TypeFlags[TypeFlags["Intersection"] = 131072] = "Intersection";
+        TypeFlags[TypeFlags["Index"] = 262144] = "Index";
+        TypeFlags[TypeFlags["IndexedAccess"] = 524288] = "IndexedAccess";
         /* @internal */
-        TypeFlags[TypeFlags["ObjectLiteral"] = 8388608] = "ObjectLiteral";
+        TypeFlags[TypeFlags["FreshLiteral"] = 1048576] = "FreshLiteral";
         /* @internal */
-        TypeFlags[TypeFlags["FreshLiteral"] = 16777216] = "FreshLiteral";
+        TypeFlags[TypeFlags["ContainsWideningType"] = 2097152] = "ContainsWideningType";
         /* @internal */
-        TypeFlags[TypeFlags["ContainsWideningType"] = 33554432] = "ContainsWideningType";
+        TypeFlags[TypeFlags["ContainsObjectLiteral"] = 4194304] = "ContainsObjectLiteral";
         /* @internal */
-        TypeFlags[TypeFlags["ContainsObjectLiteral"] = 67108864] = "ContainsObjectLiteral";
-        /* @internal */
-        TypeFlags[TypeFlags["ContainsAnyFunctionType"] = 134217728] = "ContainsAnyFunctionType";
+        TypeFlags[TypeFlags["ContainsAnyFunctionType"] = 8388608] = "ContainsAnyFunctionType";
         /* @internal */
         TypeFlags[TypeFlags["Nullable"] = 6144] = "Nullable";
         TypeFlags[TypeFlags["Literal"] = 480] = "Literal";
@@ -703,31 +714,44 @@ var ts;
         TypeFlags[TypeFlags["NumberLike"] = 340] = "NumberLike";
         TypeFlags[TypeFlags["BooleanLike"] = 136] = "BooleanLike";
         TypeFlags[TypeFlags["EnumLike"] = 272] = "EnumLike";
-        TypeFlags[TypeFlags["ObjectType"] = 2588672] = "ObjectType";
-        TypeFlags[TypeFlags["UnionOrIntersection"] = 1572864] = "UnionOrIntersection";
-        TypeFlags[TypeFlags["StructuredType"] = 4161536] = "StructuredType";
-        TypeFlags[TypeFlags["StructuredOrTypeParameter"] = 4177920] = "StructuredOrTypeParameter";
+        TypeFlags[TypeFlags["UnionOrIntersection"] = 196608] = "UnionOrIntersection";
+        TypeFlags[TypeFlags["StructuredType"] = 229376] = "StructuredType";
+        TypeFlags[TypeFlags["StructuredOrTypeParameter"] = 507904] = "StructuredOrTypeParameter";
         // 'Narrowable' types are types where narrowing actually narrows.
         // This *should* be every type other than null, undefined, void, and never
-        TypeFlags[TypeFlags["Narrowable"] = 4178943] = "Narrowable";
-        TypeFlags[TypeFlags["NotUnionOrUnit"] = 2589185] = "NotUnionOrUnit";
+        TypeFlags[TypeFlags["Narrowable"] = 1033215] = "Narrowable";
+        TypeFlags[TypeFlags["NotUnionOrUnit"] = 33281] = "NotUnionOrUnit";
         /* @internal */
-        TypeFlags[TypeFlags["RequiresWidening"] = 100663296] = "RequiresWidening";
+        TypeFlags[TypeFlags["RequiresWidening"] = 6291456] = "RequiresWidening";
         /* @internal */
-        TypeFlags[TypeFlags["PropagatingFlags"] = 234881024] = "PropagatingFlags";
-    })(ts.TypeFlags || (ts.TypeFlags = {}));
-    var TypeFlags = ts.TypeFlags;
+        TypeFlags[TypeFlags["PropagatingFlags"] = 14680064] = "PropagatingFlags";
+    })(TypeFlags = ts.TypeFlags || (ts.TypeFlags = {}));
+    var ObjectFlags;
+    (function (ObjectFlags) {
+        ObjectFlags[ObjectFlags["Class"] = 1] = "Class";
+        ObjectFlags[ObjectFlags["Interface"] = 2] = "Interface";
+        ObjectFlags[ObjectFlags["Reference"] = 4] = "Reference";
+        ObjectFlags[ObjectFlags["Tuple"] = 8] = "Tuple";
+        ObjectFlags[ObjectFlags["Anonymous"] = 16] = "Anonymous";
+        ObjectFlags[ObjectFlags["Mapped"] = 32] = "Mapped";
+        ObjectFlags[ObjectFlags["Instantiated"] = 64] = "Instantiated";
+        ObjectFlags[ObjectFlags["ObjectLiteral"] = 128] = "ObjectLiteral";
+        ObjectFlags[ObjectFlags["EvolvingArray"] = 256] = "EvolvingArray";
+        ObjectFlags[ObjectFlags["ObjectLiteralPatternWithComputedProperties"] = 512] = "ObjectLiteralPatternWithComputedProperties";
+        ObjectFlags[ObjectFlags["ClassOrInterface"] = 3] = "ClassOrInterface";
+    })(ObjectFlags = ts.ObjectFlags || (ts.ObjectFlags = {}));
+    var SignatureKind;
     (function (SignatureKind) {
         SignatureKind[SignatureKind["Call"] = 0] = "Call";
         SignatureKind[SignatureKind["Construct"] = 1] = "Construct";
-    })(ts.SignatureKind || (ts.SignatureKind = {}));
-    var SignatureKind = ts.SignatureKind;
+    })(SignatureKind = ts.SignatureKind || (ts.SignatureKind = {}));
+    var IndexKind;
     (function (IndexKind) {
         IndexKind[IndexKind["String"] = 0] = "String";
         IndexKind[IndexKind["Number"] = 1] = "Number";
-    })(ts.IndexKind || (ts.IndexKind = {}));
-    var IndexKind = ts.IndexKind;
+    })(IndexKind = ts.IndexKind || (ts.IndexKind = {}));
     /* @internal */
+    var SpecialPropertyAssignmentKind;
     (function (SpecialPropertyAssignmentKind) {
         SpecialPropertyAssignmentKind[SpecialPropertyAssignmentKind["None"] = 0] = "None";
         /// exports.name = expr
@@ -738,19 +762,19 @@ var ts;
         SpecialPropertyAssignmentKind[SpecialPropertyAssignmentKind["PrototypeProperty"] = 3] = "PrototypeProperty";
         /// this.name = expr
         SpecialPropertyAssignmentKind[SpecialPropertyAssignmentKind["ThisProperty"] = 4] = "ThisProperty";
-    })(ts.SpecialPropertyAssignmentKind || (ts.SpecialPropertyAssignmentKind = {}));
-    var SpecialPropertyAssignmentKind = ts.SpecialPropertyAssignmentKind;
+    })(SpecialPropertyAssignmentKind = ts.SpecialPropertyAssignmentKind || (ts.SpecialPropertyAssignmentKind = {}));
+    var DiagnosticCategory;
     (function (DiagnosticCategory) {
         DiagnosticCategory[DiagnosticCategory["Warning"] = 0] = "Warning";
         DiagnosticCategory[DiagnosticCategory["Error"] = 1] = "Error";
         DiagnosticCategory[DiagnosticCategory["Message"] = 2] = "Message";
-    })(ts.DiagnosticCategory || (ts.DiagnosticCategory = {}));
-    var DiagnosticCategory = ts.DiagnosticCategory;
+    })(DiagnosticCategory = ts.DiagnosticCategory || (ts.DiagnosticCategory = {}));
+    var ModuleResolutionKind;
     (function (ModuleResolutionKind) {
         ModuleResolutionKind[ModuleResolutionKind["Classic"] = 1] = "Classic";
         ModuleResolutionKind[ModuleResolutionKind["NodeJs"] = 2] = "NodeJs";
-    })(ts.ModuleResolutionKind || (ts.ModuleResolutionKind = {}));
-    var ModuleResolutionKind = ts.ModuleResolutionKind;
+    })(ModuleResolutionKind = ts.ModuleResolutionKind || (ts.ModuleResolutionKind = {}));
+    var ModuleKind;
     (function (ModuleKind) {
         ModuleKind[ModuleKind["None"] = 0] = "None";
         ModuleKind[ModuleKind["CommonJS"] = 1] = "CommonJS";
@@ -758,53 +782,54 @@ var ts;
         ModuleKind[ModuleKind["UMD"] = 3] = "UMD";
         ModuleKind[ModuleKind["System"] = 4] = "System";
         ModuleKind[ModuleKind["ES2015"] = 5] = "ES2015";
-    })(ts.ModuleKind || (ts.ModuleKind = {}));
-    var ModuleKind = ts.ModuleKind;
+    })(ModuleKind = ts.ModuleKind || (ts.ModuleKind = {}));
+    var JsxEmit;
     (function (JsxEmit) {
         JsxEmit[JsxEmit["None"] = 0] = "None";
         JsxEmit[JsxEmit["Preserve"] = 1] = "Preserve";
         JsxEmit[JsxEmit["React"] = 2] = "React";
-    })(ts.JsxEmit || (ts.JsxEmit = {}));
-    var JsxEmit = ts.JsxEmit;
+    })(JsxEmit = ts.JsxEmit || (ts.JsxEmit = {}));
+    var NewLineKind;
     (function (NewLineKind) {
         NewLineKind[NewLineKind["CarriageReturnLineFeed"] = 0] = "CarriageReturnLineFeed";
         NewLineKind[NewLineKind["LineFeed"] = 1] = "LineFeed";
-    })(ts.NewLineKind || (ts.NewLineKind = {}));
-    var NewLineKind = ts.NewLineKind;
+    })(NewLineKind = ts.NewLineKind || (ts.NewLineKind = {}));
+    var ScriptKind;
     (function (ScriptKind) {
         ScriptKind[ScriptKind["Unknown"] = 0] = "Unknown";
         ScriptKind[ScriptKind["JS"] = 1] = "JS";
         ScriptKind[ScriptKind["JSX"] = 2] = "JSX";
         ScriptKind[ScriptKind["TS"] = 3] = "TS";
         ScriptKind[ScriptKind["TSX"] = 4] = "TSX";
-    })(ts.ScriptKind || (ts.ScriptKind = {}));
-    var ScriptKind = ts.ScriptKind;
+    })(ScriptKind = ts.ScriptKind || (ts.ScriptKind = {}));
+    var ScriptTarget;
     (function (ScriptTarget) {
         ScriptTarget[ScriptTarget["ES3"] = 0] = "ES3";
         ScriptTarget[ScriptTarget["ES5"] = 1] = "ES5";
         ScriptTarget[ScriptTarget["ES2015"] = 2] = "ES2015";
         ScriptTarget[ScriptTarget["ES2016"] = 3] = "ES2016";
         ScriptTarget[ScriptTarget["ES2017"] = 4] = "ES2017";
-        ScriptTarget[ScriptTarget["Latest"] = 4] = "Latest";
-    })(ts.ScriptTarget || (ts.ScriptTarget = {}));
-    var ScriptTarget = ts.ScriptTarget;
+        ScriptTarget[ScriptTarget["ESNext"] = 5] = "ESNext";
+        ScriptTarget[ScriptTarget["Latest"] = 5] = "Latest";
+    })(ScriptTarget = ts.ScriptTarget || (ts.ScriptTarget = {}));
+    var LanguageVariant;
     (function (LanguageVariant) {
         LanguageVariant[LanguageVariant["Standard"] = 0] = "Standard";
         LanguageVariant[LanguageVariant["JSX"] = 1] = "JSX";
-    })(ts.LanguageVariant || (ts.LanguageVariant = {}));
-    var LanguageVariant = ts.LanguageVariant;
+    })(LanguageVariant = ts.LanguageVariant || (ts.LanguageVariant = {}));
     /* @internal */
+    var DiagnosticStyle;
     (function (DiagnosticStyle) {
         DiagnosticStyle[DiagnosticStyle["Simple"] = 0] = "Simple";
         DiagnosticStyle[DiagnosticStyle["Pretty"] = 1] = "Pretty";
-    })(ts.DiagnosticStyle || (ts.DiagnosticStyle = {}));
-    var DiagnosticStyle = ts.DiagnosticStyle;
+    })(DiagnosticStyle = ts.DiagnosticStyle || (ts.DiagnosticStyle = {}));
+    var WatchDirectoryFlags;
     (function (WatchDirectoryFlags) {
         WatchDirectoryFlags[WatchDirectoryFlags["None"] = 0] = "None";
         WatchDirectoryFlags[WatchDirectoryFlags["Recursive"] = 1] = "Recursive";
-    })(ts.WatchDirectoryFlags || (ts.WatchDirectoryFlags = {}));
-    var WatchDirectoryFlags = ts.WatchDirectoryFlags;
+    })(WatchDirectoryFlags = ts.WatchDirectoryFlags || (ts.WatchDirectoryFlags = {}));
     /* @internal */
+    var CharacterCodes;
     (function (CharacterCodes) {
         CharacterCodes[CharacterCodes["nullCharacter"] = 0] = "nullCharacter";
         CharacterCodes[CharacterCodes["maxAsciiCharacter"] = 127] = "maxAsciiCharacter";
@@ -931,9 +956,18 @@ var ts;
         CharacterCodes[CharacterCodes["byteOrderMark"] = 65279] = "byteOrderMark";
         CharacterCodes[CharacterCodes["tab"] = 9] = "tab";
         CharacterCodes[CharacterCodes["verticalTab"] = 11] = "verticalTab";
-    })(ts.CharacterCodes || (ts.CharacterCodes = {}));
-    var CharacterCodes = ts.CharacterCodes;
+    })(CharacterCodes = ts.CharacterCodes || (ts.CharacterCodes = {}));
+    var Extension;
+    (function (Extension) {
+        Extension[Extension["Ts"] = 0] = "Ts";
+        Extension[Extension["Tsx"] = 1] = "Tsx";
+        Extension[Extension["Dts"] = 2] = "Dts";
+        Extension[Extension["Js"] = 3] = "Js";
+        Extension[Extension["Jsx"] = 4] = "Jsx";
+        Extension[Extension["LastTypeScriptExtension"] = 2] = "LastTypeScriptExtension";
+    })(Extension = ts.Extension || (ts.Extension = {}));
     /* @internal */
+    var TransformFlags;
     (function (TransformFlags) {
         TransformFlags[TransformFlags["None"] = 0] = "None";
         // Facts
@@ -942,61 +976,66 @@ var ts;
         TransformFlags[TransformFlags["ContainsTypeScript"] = 2] = "ContainsTypeScript";
         TransformFlags[TransformFlags["Jsx"] = 4] = "Jsx";
         TransformFlags[TransformFlags["ContainsJsx"] = 8] = "ContainsJsx";
-        TransformFlags[TransformFlags["ES2017"] = 16] = "ES2017";
-        TransformFlags[TransformFlags["ContainsES2017"] = 32] = "ContainsES2017";
-        TransformFlags[TransformFlags["ES2016"] = 64] = "ES2016";
-        TransformFlags[TransformFlags["ContainsES2016"] = 128] = "ContainsES2016";
-        TransformFlags[TransformFlags["ES2015"] = 256] = "ES2015";
-        TransformFlags[TransformFlags["ContainsES2015"] = 512] = "ContainsES2015";
-        TransformFlags[TransformFlags["DestructuringAssignment"] = 1024] = "DestructuringAssignment";
-        TransformFlags[TransformFlags["Generator"] = 2048] = "Generator";
-        TransformFlags[TransformFlags["ContainsGenerator"] = 4096] = "ContainsGenerator";
+        TransformFlags[TransformFlags["ESNext"] = 16] = "ESNext";
+        TransformFlags[TransformFlags["ContainsESNext"] = 32] = "ContainsESNext";
+        TransformFlags[TransformFlags["ES2017"] = 64] = "ES2017";
+        TransformFlags[TransformFlags["ContainsES2017"] = 128] = "ContainsES2017";
+        TransformFlags[TransformFlags["ES2016"] = 256] = "ES2016";
+        TransformFlags[TransformFlags["ContainsES2016"] = 512] = "ContainsES2016";
+        TransformFlags[TransformFlags["ES2015"] = 1024] = "ES2015";
+        TransformFlags[TransformFlags["ContainsES2015"] = 2048] = "ContainsES2015";
+        TransformFlags[TransformFlags["Generator"] = 4096] = "Generator";
+        TransformFlags[TransformFlags["ContainsGenerator"] = 8192] = "ContainsGenerator";
+        TransformFlags[TransformFlags["DestructuringAssignment"] = 16384] = "DestructuringAssignment";
+        TransformFlags[TransformFlags["ContainsDestructuringAssignment"] = 32768] = "ContainsDestructuringAssignment";
         // Markers
         // - Flags used to indicate that a subtree contains a specific transformation.
-        TransformFlags[TransformFlags["ContainsDecorators"] = 8192] = "ContainsDecorators";
-        TransformFlags[TransformFlags["ContainsPropertyInitializer"] = 16384] = "ContainsPropertyInitializer";
-        TransformFlags[TransformFlags["ContainsLexicalThis"] = 32768] = "ContainsLexicalThis";
-        TransformFlags[TransformFlags["ContainsCapturedLexicalThis"] = 65536] = "ContainsCapturedLexicalThis";
-        TransformFlags[TransformFlags["ContainsLexicalThisInComputedPropertyName"] = 131072] = "ContainsLexicalThisInComputedPropertyName";
-        TransformFlags[TransformFlags["ContainsDefaultValueAssignments"] = 262144] = "ContainsDefaultValueAssignments";
-        TransformFlags[TransformFlags["ContainsParameterPropertyAssignments"] = 524288] = "ContainsParameterPropertyAssignments";
-        TransformFlags[TransformFlags["ContainsSpreadElementExpression"] = 1048576] = "ContainsSpreadElementExpression";
-        TransformFlags[TransformFlags["ContainsComputedPropertyName"] = 2097152] = "ContainsComputedPropertyName";
-        TransformFlags[TransformFlags["ContainsBlockScopedBinding"] = 4194304] = "ContainsBlockScopedBinding";
-        TransformFlags[TransformFlags["ContainsBindingPattern"] = 8388608] = "ContainsBindingPattern";
-        TransformFlags[TransformFlags["ContainsYield"] = 16777216] = "ContainsYield";
-        TransformFlags[TransformFlags["ContainsHoistedDeclarationOrCompletion"] = 33554432] = "ContainsHoistedDeclarationOrCompletion";
+        TransformFlags[TransformFlags["ContainsDecorators"] = 65536] = "ContainsDecorators";
+        TransformFlags[TransformFlags["ContainsPropertyInitializer"] = 131072] = "ContainsPropertyInitializer";
+        TransformFlags[TransformFlags["ContainsLexicalThis"] = 262144] = "ContainsLexicalThis";
+        TransformFlags[TransformFlags["ContainsCapturedLexicalThis"] = 524288] = "ContainsCapturedLexicalThis";
+        TransformFlags[TransformFlags["ContainsLexicalThisInComputedPropertyName"] = 1048576] = "ContainsLexicalThisInComputedPropertyName";
+        TransformFlags[TransformFlags["ContainsDefaultValueAssignments"] = 2097152] = "ContainsDefaultValueAssignments";
+        TransformFlags[TransformFlags["ContainsParameterPropertyAssignments"] = 4194304] = "ContainsParameterPropertyAssignments";
+        TransformFlags[TransformFlags["ContainsSpreadExpression"] = 8388608] = "ContainsSpreadExpression";
+        TransformFlags[TransformFlags["ContainsComputedPropertyName"] = 16777216] = "ContainsComputedPropertyName";
+        TransformFlags[TransformFlags["ContainsBlockScopedBinding"] = 33554432] = "ContainsBlockScopedBinding";
+        TransformFlags[TransformFlags["ContainsBindingPattern"] = 67108864] = "ContainsBindingPattern";
+        TransformFlags[TransformFlags["ContainsYield"] = 134217728] = "ContainsYield";
+        TransformFlags[TransformFlags["ContainsHoistedDeclarationOrCompletion"] = 268435456] = "ContainsHoistedDeclarationOrCompletion";
         TransformFlags[TransformFlags["HasComputedFlags"] = 536870912] = "HasComputedFlags";
         // Assertions
         // - Bitmasks that are used to assert facts about the syntax of a node and its subtree.
         TransformFlags[TransformFlags["AssertTypeScript"] = 3] = "AssertTypeScript";
         TransformFlags[TransformFlags["AssertJsx"] = 12] = "AssertJsx";
-        TransformFlags[TransformFlags["AssertES2017"] = 48] = "AssertES2017";
-        TransformFlags[TransformFlags["AssertES2016"] = 192] = "AssertES2016";
-        TransformFlags[TransformFlags["AssertES2015"] = 768] = "AssertES2015";
-        TransformFlags[TransformFlags["AssertGenerator"] = 6144] = "AssertGenerator";
+        TransformFlags[TransformFlags["AssertESNext"] = 48] = "AssertESNext";
+        TransformFlags[TransformFlags["AssertES2017"] = 192] = "AssertES2017";
+        TransformFlags[TransformFlags["AssertES2016"] = 768] = "AssertES2016";
+        TransformFlags[TransformFlags["AssertES2015"] = 3072] = "AssertES2015";
+        TransformFlags[TransformFlags["AssertGenerator"] = 12288] = "AssertGenerator";
+        TransformFlags[TransformFlags["AssertDestructuringAssignment"] = 49152] = "AssertDestructuringAssignment";
         // Scope Exclusions
         // - Bitmasks that exclude flags from propagating out of a specific context
         //   into the subtree flags of their container.
-        TransformFlags[TransformFlags["NodeExcludes"] = 536874325] = "NodeExcludes";
-        TransformFlags[TransformFlags["ArrowFunctionExcludes"] = 592227669] = "ArrowFunctionExcludes";
-        TransformFlags[TransformFlags["FunctionExcludes"] = 592293205] = "FunctionExcludes";
-        TransformFlags[TransformFlags["ConstructorExcludes"] = 591760725] = "ConstructorExcludes";
-        TransformFlags[TransformFlags["MethodOrAccessorExcludes"] = 591760725] = "MethodOrAccessorExcludes";
-        TransformFlags[TransformFlags["ClassExcludes"] = 539749717] = "ClassExcludes";
-        TransformFlags[TransformFlags["ModuleExcludes"] = 574729557] = "ModuleExcludes";
+        TransformFlags[TransformFlags["NodeExcludes"] = 536892757] = "NodeExcludes";
+        TransformFlags[TransformFlags["ArrowFunctionExcludes"] = 979719509] = "ArrowFunctionExcludes";
+        TransformFlags[TransformFlags["FunctionExcludes"] = 980243797] = "FunctionExcludes";
+        TransformFlags[TransformFlags["ConstructorExcludes"] = 975983957] = "ConstructorExcludes";
+        TransformFlags[TransformFlags["MethodOrAccessorExcludes"] = 975983957] = "MethodOrAccessorExcludes";
+        TransformFlags[TransformFlags["ClassExcludes"] = 559895893] = "ClassExcludes";
+        TransformFlags[TransformFlags["ModuleExcludes"] = 839734613] = "ModuleExcludes";
         TransformFlags[TransformFlags["TypeExcludes"] = -3] = "TypeExcludes";
-        TransformFlags[TransformFlags["ObjectLiteralExcludes"] = 539110741] = "ObjectLiteralExcludes";
-        TransformFlags[TransformFlags["ArrayLiteralOrCallOrNewExcludes"] = 537922901] = "ArrayLiteralOrCallOrNewExcludes";
-        TransformFlags[TransformFlags["VariableDeclarationListExcludes"] = 545262933] = "VariableDeclarationListExcludes";
-        TransformFlags[TransformFlags["ParameterExcludes"] = 545262933] = "ParameterExcludes";
+        TransformFlags[TransformFlags["ObjectLiteralExcludes"] = 554784085] = "ObjectLiteralExcludes";
+        TransformFlags[TransformFlags["ArrayLiteralOrCallOrNewExcludes"] = 545281365] = "ArrayLiteralOrCallOrNewExcludes";
+        TransformFlags[TransformFlags["VariableDeclarationListExcludes"] = 604001621] = "VariableDeclarationListExcludes";
+        TransformFlags[TransformFlags["ParameterExcludes"] = 604001621] = "ParameterExcludes";
         // Masks
         // - Additional bitmasks
-        TransformFlags[TransformFlags["TypeScriptClassSyntaxMask"] = 548864] = "TypeScriptClassSyntaxMask";
-        TransformFlags[TransformFlags["ES2015FunctionSyntaxMask"] = 327680] = "ES2015FunctionSyntaxMask";
-    })(ts.TransformFlags || (ts.TransformFlags = {}));
-    var TransformFlags = ts.TransformFlags;
+        TransformFlags[TransformFlags["TypeScriptClassSyntaxMask"] = 4390912] = "TypeScriptClassSyntaxMask";
+        TransformFlags[TransformFlags["ES2015FunctionSyntaxMask"] = 2621440] = "ES2015FunctionSyntaxMask";
+    })(TransformFlags = ts.TransformFlags || (ts.TransformFlags = {}));
     /* @internal */
+    var EmitFlags;
     (function (EmitFlags) {
         EmitFlags[EmitFlags["EmitEmitHelpers"] = 1] = "EmitEmitHelpers";
         EmitFlags[EmitFlags["EmitExportStar"] = 2] = "EmitExportStar";
@@ -1025,16 +1064,17 @@ var ts;
         EmitFlags[EmitFlags["AsyncFunctionBody"] = 2097152] = "AsyncFunctionBody";
         EmitFlags[EmitFlags["ReuseTempVariableScope"] = 4194304] = "ReuseTempVariableScope";
         EmitFlags[EmitFlags["CustomPrologue"] = 8388608] = "CustomPrologue";
-    })(ts.EmitFlags || (ts.EmitFlags = {}));
-    var EmitFlags = ts.EmitFlags;
+        EmitFlags[EmitFlags["NoHoisting"] = 16777216] = "NoHoisting";
+        EmitFlags[EmitFlags["HasEndOfDeclarationMarker"] = 33554432] = "HasEndOfDeclarationMarker";
+    })(EmitFlags = ts.EmitFlags || (ts.EmitFlags = {}));
     /* @internal */
+    var EmitContext;
     (function (EmitContext) {
         EmitContext[EmitContext["SourceFile"] = 0] = "SourceFile";
         EmitContext[EmitContext["Expression"] = 1] = "Expression";
         EmitContext[EmitContext["IdentifierName"] = 2] = "IdentifierName";
         EmitContext[EmitContext["Unspecified"] = 3] = "Unspecified";
-    })(ts.EmitContext || (ts.EmitContext = {}));
-    var EmitContext = ts.EmitContext;
+    })(EmitContext = ts.EmitContext || (ts.EmitContext = {}));
 })(ts || (ts = {}));
 /*@internal*/
 var ts;
@@ -1144,12 +1184,12 @@ var ts;
      * x | y is Maybe if either x or y is Maybe, but neither x or y is True.
      * x | y is True if either x or y is True.
      */
+    var Ternary;
     (function (Ternary) {
         Ternary[Ternary["False"] = 0] = "False";
         Ternary[Ternary["Maybe"] = 1] = "Maybe";
         Ternary[Ternary["True"] = -1] = "True";
-    })(ts.Ternary || (ts.Ternary = {}));
-    var Ternary = ts.Ternary;
+    })(Ternary = ts.Ternary || (ts.Ternary = {}));
     var createObject = Object.create;
     // More efficient to create a collator once and use its `compare` than to call `a.localeCompare(b)` many times.
     ts.collator = typeof Intl === "object" && typeof Intl.Collator === "function" ? new Intl.Collator() : undefined;
@@ -1221,12 +1261,12 @@ var ts;
         return getCanonicalFileName(nonCanonicalizedPath);
     }
     ts.toPath = toPath;
+    var Comparison;
     (function (Comparison) {
         Comparison[Comparison["LessThan"] = -1] = "LessThan";
         Comparison[Comparison["EqualTo"] = 0] = "EqualTo";
         Comparison[Comparison["GreaterThan"] = 1] = "GreaterThan";
-    })(ts.Comparison || (ts.Comparison = {}));
-    var Comparison = ts.Comparison;
+    })(Comparison = ts.Comparison || (ts.Comparison = {}));
     /**
      * Iterates through 'array' by index and performs the callback on each element of array until the callback
      * returns a truthy value, then returns that value.
@@ -1244,6 +1284,13 @@ var ts;
         return undefined;
     }
     ts.forEach = forEach;
+    function zipWith(arrayA, arrayB, callback) {
+        Debug.assert(arrayA.length === arrayB.length);
+        for (var i = 0; i < arrayA.length; i++) {
+            callback(arrayA[i], arrayB[i], i);
+        }
+    }
+    ts.zipWith = zipWith;
     /**
      * Iterates through `array` by index and performs the callback on each element of array until the callback
      * returns a falsey value, then returns false.
@@ -1536,20 +1583,25 @@ var ts;
     ts.mapObject = mapObject;
     function some(array, predicate) {
         if (array) {
-            for (var _i = 0, array_5 = array; _i < array_5.length; _i++) {
-                var v = array_5[_i];
-                if (!predicate || predicate(v)) {
-                    return true;
+            if (predicate) {
+                for (var _i = 0, array_5 = array; _i < array_5.length; _i++) {
+                    var v = array_5[_i];
+                    if (predicate(v)) {
+                        return true;
+                    }
                 }
             }
+            else {
+                return array.length > 0;
+            }
         }
         return false;
     }
     ts.some = some;
     function concatenate(array1, array2) {
-        if (!array2 || !array2.length)
+        if (!some(array2))
             return array1;
-        if (!array1 || !array1.length)
+        if (!some(array1))
             return array2;
         return array1.concat(array2);
     }
@@ -1573,6 +1625,41 @@ var ts;
         return result;
     }
     ts.deduplicate = deduplicate;
+    function arrayIsEqualTo(array1, array2, equaler) {
+        if (!array1 || !array2) {
+            return array1 === array2;
+        }
+        if (array1.length !== array2.length) {
+            return false;
+        }
+        for (var i = 0; i < array1.length; i++) {
+            var equals = equaler ? equaler(array1[i], array2[i]) : array1[i] === array2[i];
+            if (!equals) {
+                return false;
+            }
+        }
+        return true;
+    }
+    ts.arrayIsEqualTo = arrayIsEqualTo;
+    function changesAffectModuleResolution(oldOptions, newOptions) {
+        return !oldOptions ||
+            (oldOptions.module !== newOptions.module) ||
+            (oldOptions.moduleResolution !== newOptions.moduleResolution) ||
+            (oldOptions.noResolve !== newOptions.noResolve) ||
+            (oldOptions.target !== newOptions.target) ||
+            (oldOptions.noLib !== newOptions.noLib) ||
+            (oldOptions.jsx !== newOptions.jsx) ||
+            (oldOptions.allowJs !== newOptions.allowJs) ||
+            (oldOptions.rootDir !== newOptions.rootDir) ||
+            (oldOptions.configFilePath !== newOptions.configFilePath) ||
+            (oldOptions.baseUrl !== newOptions.baseUrl) ||
+            (oldOptions.maxNodeModuleJsDepth !== newOptions.maxNodeModuleJsDepth) ||
+            !arrayIsEqualTo(oldOptions.lib, newOptions.lib) ||
+            !arrayIsEqualTo(oldOptions.typeRoots, newOptions.typeRoots) ||
+            !arrayIsEqualTo(oldOptions.rootDirs, newOptions.rootDirs) ||
+            !equalOwnProperties(oldOptions.paths, newOptions.paths);
+    }
+    ts.changesAffectModuleResolution = changesAffectModuleResolution;
     /**
      * Compacts an array, removing any falsey elements.
      */
@@ -1594,6 +1681,31 @@ var ts;
         return result || array;
     }
     ts.compact = compact;
+    /**
+     * Gets the relative complement of `arrayA` with respect to `b`, returning the elements that
+     * are not present in `arrayA` but are present in `arrayB`. Assumes both arrays are sorted
+     * based on the provided comparer.
+     */
+    function relativeComplement(arrayA, arrayB, comparer, offsetA, offsetB) {
+        if (comparer === void 0) { comparer = compareValues; }
+        if (offsetA === void 0) { offsetA = 0; }
+        if (offsetB === void 0) { offsetB = 0; }
+        if (!arrayB || !arrayA || arrayB.length === 0 || arrayA.length === 0)
+            return arrayB;
+        var result = [];
+        outer: for (; offsetB < arrayB.length; offsetB++) {
+            inner: for (; offsetA < arrayA.length; offsetA++) {
+                switch (comparer(arrayB[offsetB], arrayA[offsetA])) {
+                    case -1 /* LessThan */: break inner;
+                    case 0 /* EqualTo */: continue outer;
+                    case 1 /* GreaterThan */: continue inner;
+                }
+            }
+            result.push(arrayB[offsetB]);
+        }
+        return result;
+    }
+    ts.relativeComplement = relativeComplement;
     function sum(array, prop) {
         var result = 0;
         for (var _i = 0, array_7 = array; _i < array_7.length; _i++) {
@@ -1603,15 +1715,39 @@ var ts;
         return result;
     }
     ts.sum = sum;
+    /**
+     * Appends a value to an array, returning the array.
+     *
+     * @param to The array to which `value` is to be appended. If `to` is `undefined`, a new array
+     * is created if `value` was appended.
+     * @param value The value to append to the array. If `value` is `undefined`, nothing is
+     * appended.
+     */
+    function append(to, value) {
+        if (value === undefined)
+            return to;
+        if (to === undefined)
+            to = [];
+        to.push(value);
+        return to;
+    }
+    ts.append = append;
+    /**
+     * Appends a range of value to an array, returning the array.
+     *
+     * @param to The array to which `value` is to be appended. If `to` is `undefined`, a new array
+     * is created if `value` was appended.
+     * @param from The values to append to the array. If `from` is `undefined`, nothing is
+     * appended. If an element of `from` is `undefined`, that element is not appended.
+     */
     function addRange(to, from) {
-        if (to && from) {
-            for (var _i = 0, from_1 = from; _i < from_1.length; _i++) {
-                var v = from_1[_i];
-                if (v !== undefined) {
-                    to.push(v);
-                }
-            }
+        if (from === undefined)
+            return to;
+        for (var _i = 0, from_1 = from; _i < from_1.length; _i++) {
+            var v = from_1[_i];
+            to = append(to, v);
         }
+        return to;
     }
     ts.addRange = addRange;
     function rangeEquals(array1, array2, pos, end) {
@@ -1624,26 +1760,17 @@ var ts;
         return true;
     }
     ts.rangeEquals = rangeEquals;
+    /**
+     * Returns the first element of an array if non-empty, `undefined` otherwise.
+     */
     function firstOrUndefined(array) {
         return array && array.length > 0
             ? array[0]
             : undefined;
     }
     ts.firstOrUndefined = firstOrUndefined;
-    function singleOrUndefined(array) {
-        return array && array.length === 1
-            ? array[0]
-            : undefined;
-    }
-    ts.singleOrUndefined = singleOrUndefined;
-    function singleOrMany(array) {
-        return array && array.length === 1
-            ? array[0]
-            : array;
-    }
-    ts.singleOrMany = singleOrMany;
     /**
-     * Returns the last element of an array if non-empty, undefined otherwise.
+     * Returns the last element of an array if non-empty, `undefined` otherwise.
      */
     function lastOrUndefined(array) {
         return array && array.length > 0
@@ -1651,6 +1778,31 @@ var ts;
             : undefined;
     }
     ts.lastOrUndefined = lastOrUndefined;
+    /**
+     * Returns the only element of an array if it contains only one element, `undefined` otherwise.
+     */
+    function singleOrUndefined(array) {
+        return array && array.length === 1
+            ? array[0]
+            : undefined;
+    }
+    ts.singleOrUndefined = singleOrUndefined;
+    /**
+     * Returns the only element of an array if it contains only one element; otheriwse, returns the
+     * array.
+     */
+    function singleOrMany(array) {
+        return array && array.length === 1
+            ? array[0]
+            : array;
+    }
+    ts.singleOrMany = singleOrMany;
+    function replaceElement(array, index, value) {
+        var result = array.slice(0);
+        result[index] = value;
+        return result;
+    }
+    ts.replaceElement = replaceElement;
     /**
      * Performs a binary search, finding the index at which 'value' occurs in 'array'.
      * If no such index is found, returns the 2's-complement of first index at which
@@ -1658,11 +1810,11 @@ var ts;
      * @param array A sorted array whose first element must be no larger than number
      * @param number The value to be searched for in the array.
      */
-    function binarySearch(array, value, comparer) {
+    function binarySearch(array, value, comparer, offset) {
         if (!array || array.length === 0) {
             return -1;
         }
-        var low = 0;
+        var low = offset || 0;
         var high = array.length - 1;
         comparer = comparer !== undefined
             ? comparer
@@ -1978,6 +2130,14 @@ var ts;
         return Array.isArray ? Array.isArray(value) : value instanceof Array;
     }
     ts.isArray = isArray;
+    /** Does nothing. */
+    function noop() { }
+    ts.noop = noop;
+    /** Throws an error because a function is not implemented. */
+    function notImplemented() {
+        throw new Error("Not implemented");
+    }
+    ts.notImplemented = notImplemented;
     function memoize(callback) {
         var value;
         return function () {
@@ -2094,6 +2254,17 @@ var ts;
         };
     }
     ts.createCompilerDiagnostic = createCompilerDiagnostic;
+    function createCompilerDiagnosticFromMessageChain(chain) {
+        return {
+            file: undefined,
+            start: undefined,
+            length: undefined,
+            code: chain.code,
+            category: chain.category,
+            messageText: chain.next ? chain : chain.messageText
+        };
+    }
+    ts.createCompilerDiagnosticFromMessageChain = createCompilerDiagnosticFromMessageChain;
     function chainDiagnosticMessages(details, message) {
         var text = getLocaleSpecificMessage(message);
         if (arguments.length > 2) {
@@ -2541,6 +2712,10 @@ var ts;
         return expectedPos >= 0 && str.indexOf(suffix, expectedPos) === expectedPos;
     }
     ts.endsWith = endsWith;
+    function hasExtension(fileName) {
+        return getBaseFileName(fileName).indexOf(".") >= 0;
+    }
+    ts.hasExtension = hasExtension;
     function fileExtensionIs(path, extension) {
         return path.length > extension.length && endsWith(path, extension);
     }
@@ -2581,73 +2756,93 @@ var ts;
         var doubleAsteriskRegexFragment = usage === "exclude" ? "(/.+?)?" : "(/[^/.][^/]*)*?";
         var pattern = "";
         var hasWrittenSubpattern = false;
-        spec: for (var _i = 0, specs_1 = specs; _i < specs_1.length; _i++) {
+        for (var _i = 0, specs_1 = specs; _i < specs_1.length; _i++) {
             var spec = specs_1[_i];
             if (!spec) {
                 continue;
             }
-            var subpattern = "";
-            var hasRecursiveDirectoryWildcard = false;
-            var hasWrittenComponent = false;
-            var components = getNormalizedPathComponents(spec, basePath);
-            if (usage !== "exclude" && components[components.length - 1] === "**") {
-                continue spec;
-            }
-            // getNormalizedPathComponents includes the separator for the root component.
-            // We need to remove to create our regex correctly.
-            components[0] = removeTrailingDirectorySeparator(components[0]);
-            var optionalCount = 0;
-            for (var _a = 0, components_1 = components; _a < components_1.length; _a++) {
-                var component = components_1[_a];
-                if (component === "**") {
-                    if (hasRecursiveDirectoryWildcard) {
-                        continue spec;
-                    }
-                    subpattern += doubleAsteriskRegexFragment;
-                    hasRecursiveDirectoryWildcard = true;
-                    hasWrittenComponent = true;
-                }
-                else {
-                    if (usage === "directories") {
-                        subpattern += "(";
-                        optionalCount++;
-                    }
-                    if (hasWrittenComponent) {
-                        subpattern += ts.directorySeparator;
-                    }
-                    if (usage !== "exclude") {
-                        // The * and ? wildcards should not match directories or files that start with . if they
-                        // appear first in a component. Dotted directories and files can be included explicitly
-                        // like so: **/.*/.*
-                        if (component.charCodeAt(0) === 42 /* asterisk */) {
-                            subpattern += "([^./]" + singleAsteriskRegexFragment + ")?";
-                            component = component.substr(1);
-                        }
-                        else if (component.charCodeAt(0) === 63 /* question */) {
-                            subpattern += "[^./]";
-                            component = component.substr(1);
-                        }
-                    }
-                    subpattern += component.replace(reservedCharacterPattern, replaceWildcardCharacter);
-                    hasWrittenComponent = true;
-                }
-            }
-            while (optionalCount > 0) {
-                subpattern += ")?";
-                optionalCount--;
+            var subPattern = getSubPatternFromSpec(spec, basePath, usage, singleAsteriskRegexFragment, doubleAsteriskRegexFragment, replaceWildcardCharacter);
+            if (subPattern === undefined) {
+                continue;
             }
             if (hasWrittenSubpattern) {
                 pattern += "|";
             }
-            pattern += "(" + subpattern + ")";
+            pattern += "(" + subPattern + ")";
             hasWrittenSubpattern = true;
         }
         if (!pattern) {
             return undefined;
         }
-        return "^(" + pattern + (usage === "exclude" ? ")($|/)" : ")$");
+        // If excluding, match "foo/bar/baz...", but if including, only allow "foo".
+        var terminator = usage === "exclude" ? "($|/)" : "$";
+        return "^(" + pattern + ")" + terminator;
     }
     ts.getRegularExpressionForWildcard = getRegularExpressionForWildcard;
+    /**
+     * An "includes" path "foo" is implicitly a glob "foo/** /*" (without the space) if its last component has no extension,
+     * and does not contain any glob characters itself.
+     */
+    function isImplicitGlob(lastPathComponent) {
+        return !/[.*?]/.test(lastPathComponent);
+    }
+    ts.isImplicitGlob = isImplicitGlob;
+    function getSubPatternFromSpec(spec, basePath, usage, singleAsteriskRegexFragment, doubleAsteriskRegexFragment, replaceWildcardCharacter) {
+        var subpattern = "";
+        var hasRecursiveDirectoryWildcard = false;
+        var hasWrittenComponent = false;
+        var components = getNormalizedPathComponents(spec, basePath);
+        var lastComponent = lastOrUndefined(components);
+        if (usage !== "exclude" && lastComponent === "**") {
+            return undefined;
+        }
+        // getNormalizedPathComponents includes the separator for the root component.
+        // We need to remove to create our regex correctly.
+        components[0] = removeTrailingDirectorySeparator(components[0]);
+        if (isImplicitGlob(lastComponent)) {
+            components.push("**", "*");
+        }
+        var optionalCount = 0;
+        for (var _i = 0, components_1 = components; _i < components_1.length; _i++) {
+            var component = components_1[_i];
+            if (component === "**") {
+                if (hasRecursiveDirectoryWildcard) {
+                    return undefined;
+                }
+                subpattern += doubleAsteriskRegexFragment;
+                hasRecursiveDirectoryWildcard = true;
+            }
+            else {
+                if (usage === "directories") {
+                    subpattern += "(";
+                    optionalCount++;
+                }
+                if (hasWrittenComponent) {
+                    subpattern += ts.directorySeparator;
+                }
+                if (usage !== "exclude") {
+                    // The * and ? wildcards should not match directories or files that start with . if they
+                    // appear first in a component. Dotted directories and files can be included explicitly
+                    // like so: **/.*/.*
+                    if (component.charCodeAt(0) === 42 /* asterisk */) {
+                        subpattern += "([^./]" + singleAsteriskRegexFragment + ")?";
+                        component = component.substr(1);
+                    }
+                    else if (component.charCodeAt(0) === 63 /* question */) {
+                        subpattern += "[^./]";
+                        component = component.substr(1);
+                    }
+                }
+                subpattern += component.replace(reservedCharacterPattern, replaceWildcardCharacter);
+            }
+            hasWrittenComponent = true;
+        }
+        while (optionalCount > 0) {
+            subpattern += ")?";
+            optionalCount--;
+        }
+        return subpattern;
+    }
     function replaceWildCardCharacterFiles(match) {
         return replaceWildcardCharacter(match, singleAsteriskRegexFragmentFiles);
     }
@@ -2721,29 +2916,35 @@ var ts;
                 // We also need to check the relative paths by converting them to absolute and normalizing
                 // in case they escape the base path (e.g "..\somedirectory")
                 var absolute = isRootedDiskPath(include) ? include : normalizePath(combinePaths(path, include));
-                var wildcardOffset = indexOfAnyCharCode(absolute, wildcardCharCodes);
-                var includeBasePath = wildcardOffset < 0
-                    ? removeTrailingDirectorySeparator(getDirectoryPath(absolute))
-                    : absolute.substring(0, absolute.lastIndexOf(ts.directorySeparator, wildcardOffset));
                 // Append the literal and canonical candidate base paths.
-                includeBasePaths.push(includeBasePath);
+                includeBasePaths.push(getIncludeBasePath(absolute));
             }
             // Sort the offsets array using either the literal or canonical path representations.
             includeBasePaths.sort(useCaseSensitiveFileNames ? compareStrings : compareStringsCaseInsensitive);
+            var _loop_1 = function (includeBasePath) {
+                if (ts.every(basePaths, function (basePath) { return !containsPath(basePath, includeBasePath, path, !useCaseSensitiveFileNames); })) {
+                    basePaths.push(includeBasePath);
+                }
+            };
             // Iterate over each include base path and include unique base paths that are not a
             // subpath of an existing base path
-            include: for (var i = 0; i < includeBasePaths.length; i++) {
-                var includeBasePath = includeBasePaths[i];
-                for (var j = 0; j < basePaths.length; j++) {
-                    if (containsPath(basePaths[j], includeBasePath, path, !useCaseSensitiveFileNames)) {
-                        continue include;
-                    }
-                }
-                basePaths.push(includeBasePath);
+            for (var _a = 0, includeBasePaths_1 = includeBasePaths; _a < includeBasePaths_1.length; _a++) {
+                var includeBasePath = includeBasePaths_1[_a];
+                _loop_1(includeBasePath);
             }
         }
         return basePaths;
     }
+    function getIncludeBasePath(absolute) {
+        var wildcardOffset = indexOfAnyCharCode(absolute, wildcardCharCodes);
+        if (wildcardOffset < 0) {
+            // No "*" or "?" in the path
+            return !hasExtension(absolute)
+                ? absolute
+                : removeTrailingDirectorySeparator(getDirectoryPath(absolute));
+        }
+        return absolute.substring(0, absolute.lastIndexOf(ts.directorySeparator, wildcardOffset));
+    }
     function ensureScriptKind(fileName, scriptKind) {
         // Using scriptKind as a condition handles both:
         // - 'scriptKind' is unspecified and thus it is `undefined`
@@ -2808,14 +3009,14 @@ var ts;
      * aligned to the offset of the highest priority extension in the
      * allSupportedExtensions array.
      */
+    var ExtensionPriority;
     (function (ExtensionPriority) {
         ExtensionPriority[ExtensionPriority["TypeScriptFiles"] = 0] = "TypeScriptFiles";
         ExtensionPriority[ExtensionPriority["DeclarationAndJavaScriptFiles"] = 2] = "DeclarationAndJavaScriptFiles";
         ExtensionPriority[ExtensionPriority["Limit"] = 5] = "Limit";
         ExtensionPriority[ExtensionPriority["Highest"] = 0] = "Highest";
         ExtensionPriority[ExtensionPriority["Lowest"] = 2] = "Lowest";
-    })(ts.ExtensionPriority || (ts.ExtensionPriority = {}));
-    var ExtensionPriority = ts.ExtensionPriority;
+    })(ExtensionPriority = ts.ExtensionPriority || (ts.ExtensionPriority = {}));
     function getExtensionPriority(path, supportedExtensions) {
         for (var i = supportedExtensions.length - 1; i >= 0; i--) {
             if (fileExtensionIs(path, supportedExtensions[i])) {
@@ -2874,10 +3075,6 @@ var ts;
         return path.substring(0, path.length - extension.length);
     }
     ts.removeExtension = removeExtension;
-    function isJsxOrTsxExtension(ext) {
-        return ext === ".jsx" || ext === ".tsx";
-    }
-    ts.isJsxOrTsxExtension = isJsxOrTsxExtension;
     function changeExtension(path, newExtension) {
         return (removeFileExtension(path) + newExtension);
     }
@@ -2912,13 +3109,13 @@ var ts;
         getTypeConstructor: function () { return Type; },
         getSignatureConstructor: function () { return Signature; }
     };
+    var AssertionLevel;
     (function (AssertionLevel) {
         AssertionLevel[AssertionLevel["None"] = 0] = "None";
         AssertionLevel[AssertionLevel["Normal"] = 1] = "Normal";
         AssertionLevel[AssertionLevel["Aggressive"] = 2] = "Aggressive";
         AssertionLevel[AssertionLevel["VeryAggressive"] = 3] = "VeryAggressive";
-    })(ts.AssertionLevel || (ts.AssertionLevel = {}));
-    var AssertionLevel = ts.AssertionLevel;
+    })(AssertionLevel = ts.AssertionLevel || (ts.AssertionLevel = {}));
     var Debug;
     (function (Debug) {
         Debug.currentAssertionLevel = 0 /* None */;
@@ -3055,6 +3252,41 @@ var ts;
         return !(pos >= 0);
     }
     ts.positionIsSynthesized = positionIsSynthesized;
+    /** True if an extension is one of the supported TypeScript extensions. */
+    function extensionIsTypeScript(ext) {
+        return ext <= ts.Extension.LastTypeScriptExtension;
+    }
+    ts.extensionIsTypeScript = extensionIsTypeScript;
+    /**
+     * Gets the extension from a path.
+     * Path must have a valid extension.
+     */
+    function extensionFromPath(path) {
+        var ext = tryGetExtensionFromPath(path);
+        if (ext !== undefined) {
+            return ext;
+        }
+        Debug.fail("File " + path + " has unknown extension.");
+    }
+    ts.extensionFromPath = extensionFromPath;
+    function tryGetExtensionFromPath(path) {
+        if (fileExtensionIs(path, ".d.ts")) {
+            return ts.Extension.Dts;
+        }
+        if (fileExtensionIs(path, ".ts")) {
+            return ts.Extension.Ts;
+        }
+        if (fileExtensionIs(path, ".tsx")) {
+            return ts.Extension.Tsx;
+        }
+        if (fileExtensionIs(path, ".js")) {
+            return ts.Extension.Js;
+        }
+        if (fileExtensionIs(path, ".jsx")) {
+            return ts.Extension.Jsx;
+        }
+    }
+    ts.tryGetExtensionFromPath = tryGetExtensionFromPath;
 })(ts || (ts = {}));
 /// <reference path="core.ts"/>
 var ts;
@@ -3376,6 +3608,7 @@ var ts;
             function getDirectories(path) {
                 return ts.filter(_fs.readdirSync(path), function (dir) { return fileSystemEntryExists(ts.combinePaths(path, dir), 1 /* Directory */); });
             }
+            var noOpFileWatcher = { close: ts.noop };
             var nodeSystem = {
                 args: process.argv.slice(2),
                 newLine: _os.EOL,
@@ -3385,7 +3618,7 @@ var ts;
                 },
                 readFile: readFile,
                 writeFile: writeFile,
-                watchFile: function (fileName, callback) {
+                watchFile: function (fileName, callback, pollingInterval) {
                     if (useNonPollingWatchers) {
                         var watchedFile_1 = watchedFileSet.addFile(fileName, callback);
                         return {
@@ -3393,7 +3626,7 @@ var ts;
                         };
                     }
                     else {
-                        _fs.watchFile(fileName, { persistent: true, interval: 250 }, fileChanged);
+                        _fs.watchFile(fileName, { persistent: true, interval: pollingInterval || 250 }, fileChanged);
                         return {
                             close: function () { return _fs.unwatchFile(fileName, fileChanged); }
                         };
@@ -3410,7 +3643,7 @@ var ts;
                     // (ref: https://github.com/nodejs/node/pull/2649 and https://github.com/Microsoft/TypeScript/issues/4643)
                     var options;
                     if (!directoryExists(directoryName)) {
-                        return;
+                        return noOpFileWatcher;
                     }
                     if (isNode4OrLater() && (process.platform === "win32" || process.platform === "darwin")) {
                         options = { persistent: true, recursive: !!recursive };
@@ -3491,7 +3724,9 @@ var ts;
                     }
                     catch (e) {
                     }
-                }
+                },
+                setTimeout: setTimeout,
+                clearTimeout: clearTimeout
             };
             return nodeSystem;
         }
@@ -3617,7 +3852,7 @@ var ts;
         A_set_accessor_parameter_cannot_have_an_initializer: { code: 1052, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_parameter_cannot_have_an_initializer_1052", message: "A 'set' accessor parameter cannot have an initializer." },
         A_set_accessor_cannot_have_rest_parameter: { code: 1053, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_cannot_have_rest_parameter_1053", message: "A 'set' accessor cannot have rest parameter." },
         A_get_accessor_cannot_have_parameters: { code: 1054, category: ts.DiagnosticCategory.Error, key: "A_get_accessor_cannot_have_parameters_1054", message: "A 'get' accessor cannot have parameters." },
-        Type_0_is_not_a_valid_async_function_return_type: { code: 1055, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_a_valid_async_function_return_type_1055", message: "Type '{0}' is not a valid async function return type." },
+        Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value: { code: 1055, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Prom_1055", message: "Type '{0}' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value." },
         Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher: { code: 1056, category: ts.DiagnosticCategory.Error, key: "Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher_1056", message: "Accessors are only available when targeting ECMAScript 5 and higher." },
         An_async_function_or_method_must_have_a_valid_awaitable_return_type: { code: 1057, category: ts.DiagnosticCategory.Error, key: "An_async_function_or_method_must_have_a_valid_awaitable_return_type_1057", message: "An async function or method must have a valid awaitable return type." },
         Operand_for_await_does_not_have_a_valid_callable_then_member: { code: 1058, category: ts.DiagnosticCategory.Error, key: "Operand_for_await_does_not_have_a_valid_callable_then_member_1058", message: "Operand for 'await' does not have a valid callable 'then' member." },
@@ -3727,7 +3962,6 @@ var ts;
         Module_0_has_no_default_export: { code: 1192, category: ts.DiagnosticCategory.Error, key: "Module_0_has_no_default_export_1192", message: "Module '{0}' has no default export." },
         An_export_declaration_cannot_have_modifiers: { code: 1193, category: ts.DiagnosticCategory.Error, key: "An_export_declaration_cannot_have_modifiers_1193", message: "An export declaration cannot have modifiers." },
         Export_declarations_are_not_permitted_in_a_namespace: { code: 1194, category: ts.DiagnosticCategory.Error, key: "Export_declarations_are_not_permitted_in_a_namespace_1194", message: "Export declarations are not permitted in a namespace." },
-        Catch_clause_variable_name_must_be_an_identifier: { code: 1195, category: ts.DiagnosticCategory.Error, key: "Catch_clause_variable_name_must_be_an_identifier_1195", message: "Catch clause variable name must be an identifier." },
         Catch_clause_variable_cannot_have_a_type_annotation: { code: 1196, category: ts.DiagnosticCategory.Error, key: "Catch_clause_variable_cannot_have_a_type_annotation_1196", message: "Catch clause variable cannot have a type annotation." },
         Catch_clause_variable_cannot_have_an_initializer: { code: 1197, category: ts.DiagnosticCategory.Error, key: "Catch_clause_variable_cannot_have_an_initializer_1197", message: "Catch clause variable cannot have an initializer." },
         An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive: { code: 1198, category: ts.DiagnosticCategory.Error, key: "An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive_1198", message: "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive." },
@@ -3845,14 +4079,14 @@ var ts;
         Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1: { code: 2353, category: ts.DiagnosticCategory.Error, key: "Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1_2353", message: "Object literal may only specify known properties, and '{0}' does not exist in type '{1}'." },
         A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value: { code: 2355, category: ts.DiagnosticCategory.Error, key: "A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value_2355", message: "A function whose declared type is neither 'void' nor 'any' must return a value." },
         An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type: { code: 2356, category: ts.DiagnosticCategory.Error, key: "An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type_2356", message: "An arithmetic operand must be of type 'any', 'number' or an enum type." },
-        The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer: { code: 2357, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer_2357", message: "The operand of an increment or decrement operator must be a variable, property or indexer." },
+        The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_or_a_property_access: { code: 2357, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_or_a_property_access_2357", message: "The operand of an increment or decrement operator must be a variable or a property access." },
         The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2358, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_paramete_2358", message: "The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter." },
         The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_Function_interface_type: { code: 2359, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_F_2359", message: "The right-hand side of an 'instanceof' expression must be of type 'any' or of a type assignable to the 'Function' interface type." },
         The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol: { code: 2360, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol_2360", message: "The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'." },
         The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2361, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter_2361", message: "The right-hand side of an 'in' expression must be of type 'any', an object type or a type parameter" },
         The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2362, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type_2362", message: "The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
         The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2363, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type_2363", message: "The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
-        Invalid_left_hand_side_of_assignment_expression: { code: 2364, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_of_assignment_expression_2364", message: "Invalid left-hand side of assignment expression." },
+        The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access: { code: 2364, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access_2364", message: "The left-hand side of an assignment expression must be a variable or a property access." },
         Operator_0_cannot_be_applied_to_types_1_and_2: { code: 2365, category: ts.DiagnosticCategory.Error, key: "Operator_0_cannot_be_applied_to_types_1_and_2_2365", message: "Operator '{0}' cannot be applied to types '{1}' and '{2}'." },
         Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined: { code: 2366, category: ts.DiagnosticCategory.Error, key: "Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined_2366", message: "Function lacks ending return statement and return type does not include 'undefined'." },
         Type_parameter_name_cannot_be_0: { code: 2368, category: ts.DiagnosticCategory.Error, key: "Type_parameter_name_cannot_be_0_2368", message: "Type parameter name cannot be '{0}'" },
@@ -3892,7 +4126,7 @@ var ts;
         Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2: { code: 2403, category: ts.DiagnosticCategory.Error, key: "Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_t_2403", message: "Subsequent variable declarations must have the same type.  Variable '{0}' must be of type '{1}', but here has type '{2}'." },
         The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation: { code: 2404, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation_2404", message: "The left-hand side of a 'for...in' statement cannot use a type annotation." },
         The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any: { code: 2405, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any_2405", message: "The left-hand side of a 'for...in' statement must be of type 'string' or 'any'." },
-        Invalid_left_hand_side_in_for_in_statement: { code: 2406, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_in_for_in_statement_2406", message: "Invalid left-hand side in 'for...in' statement." },
+        The_left_hand_side_of_a_for_in_statement_must_be_a_variable_or_a_property_access: { code: 2406, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_must_be_a_variable_or_a_property_access_2406", message: "The left-hand side of a 'for...in' statement must be a variable or a property access." },
         The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2407, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter_2407", message: "The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter." },
         Setters_cannot_return_a_value: { code: 2408, category: ts.DiagnosticCategory.Error, key: "Setters_cannot_return_a_value_2408", message: "Setters cannot return a value." },
         Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class: { code: 2409, category: ts.DiagnosticCategory.Error, key: "Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class_2409", message: "Return type of constructor signature must be assignable to the instance type of the class" },
@@ -3930,8 +4164,6 @@ var ts;
         Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1: { code: 2446, category: ts.DiagnosticCategory.Error, key: "Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1_2446", message: "Property '{0}' is protected and only accessible through an instance of class '{1}'." },
         The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead: { code: 2447, category: ts.DiagnosticCategory.Error, key: "The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead_2447", message: "The '{0}' operator is not allowed for boolean types. Consider using '{1}' instead." },
         Block_scoped_variable_0_used_before_its_declaration: { code: 2448, category: ts.DiagnosticCategory.Error, key: "Block_scoped_variable_0_used_before_its_declaration_2448", message: "Block-scoped variable '{0}' used before its declaration." },
-        The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property: { code: 2449, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property_2449", message: "The operand of an increment or decrement operator cannot be a constant or a read-only property." },
-        Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property: { code: 2450, category: ts.DiagnosticCategory.Error, key: "Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property_2450", message: "Left-hand side of assignment expression cannot be a constant or a read-only property." },
         Cannot_redeclare_block_scoped_variable_0: { code: 2451, category: ts.DiagnosticCategory.Error, key: "Cannot_redeclare_block_scoped_variable_0_2451", message: "Cannot redeclare block-scoped variable '{0}'." },
         An_enum_member_cannot_have_a_numeric_name: { code: 2452, category: ts.DiagnosticCategory.Error, key: "An_enum_member_cannot_have_a_numeric_name_2452", message: "An enum member cannot have a numeric name." },
         The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_type_arguments_explicitly: { code: 2453, category: ts.DiagnosticCategory.Error, key: "The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_typ_2453", message: "The type argument for type parameter '{0}' cannot be inferred from the usage. Consider specifying the type arguments explicitly." },
@@ -3943,7 +4175,7 @@ var ts;
         Type_0_has_no_property_1_and_no_string_index_signature: { code: 2459, category: ts.DiagnosticCategory.Error, key: "Type_0_has_no_property_1_and_no_string_index_signature_2459", message: "Type '{0}' has no property '{1}' and no string index signature." },
         Type_0_has_no_property_1: { code: 2460, category: ts.DiagnosticCategory.Error, key: "Type_0_has_no_property_1_2460", message: "Type '{0}' has no property '{1}'." },
         Type_0_is_not_an_array_type: { code: 2461, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_an_array_type_2461", message: "Type '{0}' is not an array type." },
-        A_rest_element_must_be_last_in_an_array_destructuring_pattern: { code: 2462, category: ts.DiagnosticCategory.Error, key: "A_rest_element_must_be_last_in_an_array_destructuring_pattern_2462", message: "A rest element must be last in an array destructuring pattern" },
+        A_rest_element_must_be_last_in_a_destructuring_pattern: { code: 2462, category: ts.DiagnosticCategory.Error, key: "A_rest_element_must_be_last_in_a_destructuring_pattern_2462", message: "A rest element must be last in a destructuring pattern" },
         A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature: { code: 2463, category: ts.DiagnosticCategory.Error, key: "A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature_2463", message: "A binding pattern parameter cannot be optional in an implementation signature." },
         A_computed_property_name_must_be_of_type_string_number_symbol_or_any: { code: 2464, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_must_be_of_type_string_number_symbol_or_any_2464", message: "A computed property name must be of type 'string', 'number', 'symbol', or 'any'." },
         this_cannot_be_referenced_in_a_computed_property_name: { code: 2465, category: ts.DiagnosticCategory.Error, key: "this_cannot_be_referenced_in_a_computed_property_name_2465", message: "'this' cannot be referenced in a computed property name." },
@@ -3965,9 +4197,7 @@ var ts;
         Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1: { code: 2481, category: ts.DiagnosticCategory.Error, key: "Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1_2481", message: "Cannot initialize outer scoped variable '{0}' in the same scope as block scoped declaration '{1}'." },
         The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation: { code: 2483, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation_2483", message: "The left-hand side of a 'for...of' statement cannot use a type annotation." },
         Export_declaration_conflicts_with_exported_declaration_of_0: { code: 2484, category: ts.DiagnosticCategory.Error, key: "Export_declaration_conflicts_with_exported_declaration_of_0_2484", message: "Export declaration conflicts with exported declaration of '{0}'" },
-        The_left_hand_side_of_a_for_of_statement_cannot_be_a_constant_or_a_read_only_property: { code: 2485, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_cannot_be_a_constant_or_a_read_only_property_2485", message: "The left-hand side of a 'for...of' statement cannot be a constant or a read-only property." },
-        The_left_hand_side_of_a_for_in_statement_cannot_be_a_constant_or_a_read_only_property: { code: 2486, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_be_a_constant_or_a_read_only_property_2486", message: "The left-hand side of a 'for...in' statement cannot be a constant or a read-only property." },
-        Invalid_left_hand_side_in_for_of_statement: { code: 2487, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_in_for_of_statement_2487", message: "Invalid left-hand side in 'for...of' statement." },
+        The_left_hand_side_of_a_for_of_statement_must_be_a_variable_or_a_property_access: { code: 2487, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_must_be_a_variable_or_a_property_access_2487", message: "The left-hand side of a 'for...of' statement must be a variable or a property access." },
         Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator: { code: 2488, category: ts.DiagnosticCategory.Error, key: "Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator_2488", message: "Type must have a '[Symbol.iterator]()' method that returns an iterator." },
         An_iterator_must_have_a_next_method: { code: 2489, category: ts.DiagnosticCategory.Error, key: "An_iterator_must_have_a_next_method_2489", message: "An iterator must have a 'next()' method." },
         The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: { code: 2490, category: ts.DiagnosticCategory.Error, key: "The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property_2490", message: "The type returned by the 'next()' method of an iterator must have a 'value' property." },
@@ -4014,6 +4244,13 @@ var ts;
         Object_is_possibly_null_or_undefined: { code: 2533, category: ts.DiagnosticCategory.Error, key: "Object_is_possibly_null_or_undefined_2533", message: "Object is possibly 'null' or 'undefined'." },
         A_function_returning_never_cannot_have_a_reachable_end_point: { code: 2534, category: ts.DiagnosticCategory.Error, key: "A_function_returning_never_cannot_have_a_reachable_end_point_2534", message: "A function returning 'never' cannot have a reachable end point." },
         Enum_type_0_has_members_with_initializers_that_are_not_literals: { code: 2535, category: ts.DiagnosticCategory.Error, key: "Enum_type_0_has_members_with_initializers_that_are_not_literals_2535", message: "Enum type '{0}' has members with initializers that are not literals." },
+        Type_0_is_not_constrained_to_keyof_1: { code: 2536, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_constrained_to_keyof_1_2536", message: "Type '{0}' is not constrained to 'keyof {1}'." },
+        Type_0_has_no_matching_index_signature_for_type_1: { code: 2537, category: ts.DiagnosticCategory.Error, key: "Type_0_has_no_matching_index_signature_for_type_1_2537", message: "Type '{0}' has no matching index signature for type '{1}'." },
+        Type_0_cannot_be_used_as_an_index_type: { code: 2538, category: ts.DiagnosticCategory.Error, key: "Type_0_cannot_be_used_as_an_index_type_2538", message: "Type '{0}' cannot be used as an index type." },
+        Cannot_assign_to_0_because_it_is_not_a_variable: { code: 2539, category: ts.DiagnosticCategory.Error, key: "Cannot_assign_to_0_because_it_is_not_a_variable_2539", message: "Cannot assign to '{0}' because it is not a variable." },
+        Cannot_assign_to_0_because_it_is_a_constant_or_a_read_only_property: { code: 2540, category: ts.DiagnosticCategory.Error, key: "Cannot_assign_to_0_because_it_is_a_constant_or_a_read_only_property_2540", message: "Cannot assign to '{0}' because it is a constant or a read-only property." },
+        The_target_of_an_assignment_must_be_a_variable_or_a_property_access: { code: 2541, category: ts.DiagnosticCategory.Error, key: "The_target_of_an_assignment_must_be_a_variable_or_a_property_access_2541", message: "The target of an assignment must be a variable or a property access." },
+        Index_signature_in_type_0_only_permits_reading: { code: 2542, category: ts.DiagnosticCategory.Error, key: "Index_signature_in_type_0_only_permits_reading_2542", message: "Index signature in type '{0}' only permits reading." },
         JSX_element_attributes_type_0_may_not_be_a_union_type: { code: 2600, category: ts.DiagnosticCategory.Error, key: "JSX_element_attributes_type_0_may_not_be_a_union_type_2600", message: "JSX element attributes type '{0}' may not be a union type." },
         The_return_type_of_a_JSX_element_constructor_must_return_an_object_type: { code: 2601, category: ts.DiagnosticCategory.Error, key: "The_return_type_of_a_JSX_element_constructor_must_return_an_object_type_2601", message: "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: { code: 2602, category: ts.DiagnosticCategory.Error, key: "JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist_2602", message: "JSX element implicitly has type 'any' because the global type 'JSX.Element' does not exist." },
@@ -4037,6 +4274,7 @@ var ts;
         Cannot_find_name_0_Did_you_mean_the_static_member_1_0: { code: 2662, category: ts.DiagnosticCategory.Error, key: "Cannot_find_name_0_Did_you_mean_the_static_member_1_0_2662", message: "Cannot find name '{0}'. Did you mean the static member '{1}.{0}'?" },
         Cannot_find_name_0_Did_you_mean_the_instance_member_this_0: { code: 2663, category: ts.DiagnosticCategory.Error, key: "Cannot_find_name_0_Did_you_mean_the_instance_member_this_0_2663", message: "Cannot find name '{0}'. Did you mean the instance member 'this.{0}'?" },
         Invalid_module_name_in_augmentation_module_0_cannot_be_found: { code: 2664, category: ts.DiagnosticCategory.Error, key: "Invalid_module_name_in_augmentation_module_0_cannot_be_found_2664", message: "Invalid module name in augmentation, module '{0}' cannot be found." },
+        Invalid_module_name_in_augmentation_Module_0_resolves_to_an_untyped_module_at_1_which_cannot_be_augmented: { code: 2665, category: ts.DiagnosticCategory.Error, key: "Invalid_module_name_in_augmentation_Module_0_resolves_to_an_untyped_module_at_1_which_cannot_be_augm_2665", message: "Invalid module name in augmentation. Module '{0}' resolves to an untyped module at '{1}', which cannot be augmented." },
         Exports_and_export_assignments_are_not_permitted_in_module_augmentations: { code: 2666, category: ts.DiagnosticCategory.Error, key: "Exports_and_export_assignments_are_not_permitted_in_module_augmentations_2666", message: "Exports and export assignments are not permitted in module augmentations." },
         Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_module: { code: 2667, category: ts.DiagnosticCategory.Error, key: "Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_mod_2667", message: "Imports are not permitted in module augmentations. Consider moving them to the enclosing external module." },
         export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always_visible: { code: 2668, category: ts.DiagnosticCategory.Error, key: "export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always__2668", message: "'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible." },
@@ -4068,6 +4306,10 @@ var ts;
         Namespace_0_has_no_exported_member_1: { code: 2694, category: ts.DiagnosticCategory.Error, key: "Namespace_0_has_no_exported_member_1_2694", message: "Namespace '{0}' has no exported member '{1}'." },
         Left_side_of_comma_operator_is_unused_and_has_no_side_effects: { code: 2695, category: ts.DiagnosticCategory.Error, key: "Left_side_of_comma_operator_is_unused_and_has_no_side_effects_2695", message: "Left side of comma operator is unused and has no side effects." },
         The_Object_type_is_assignable_to_very_few_other_types_Did_you_mean_to_use_the_any_type_instead: { code: 2696, category: ts.DiagnosticCategory.Error, key: "The_Object_type_is_assignable_to_very_few_other_types_Did_you_mean_to_use_the_any_type_instead_2696", message: "The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?" },
+        An_async_function_or_method_must_return_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES2015_in_your_lib_option: { code: 2697, category: ts.DiagnosticCategory.Error, key: "An_async_function_or_method_must_return_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_in_2697", message: "An async function or method must return a 'Promise'. Make sure you have a declaration for 'Promise' or include 'ES2015' in your `--lib` option." },
+        Spread_types_may_only_be_created_from_object_types: { code: 2698, category: ts.DiagnosticCategory.Error, key: "Spread_types_may_only_be_created_from_object_types_2698", message: "Spread types may only be created from object types." },
+        Rest_types_may_only_be_created_from_object_types: { code: 2700, category: ts.DiagnosticCategory.Error, key: "Rest_types_may_only_be_created_from_object_types_2700", message: "Rest types may only be created from object types." },
+        An_object_rest_element_must_be_an_identifier: { code: 2701, category: ts.DiagnosticCategory.Error, key: "An_object_rest_element_must_be_an_identifier_2701", message: "An object rest element must be an identifier." },
         Import_declaration_0_is_using_private_name_1: { code: 4000, category: ts.DiagnosticCategory.Error, key: "Import_declaration_0_is_using_private_name_1_4000", message: "Import declaration '{0}' is using private name '{1}'." },
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", message: "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: { code: 4004, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", message: "Type parameter '{0}' of exported interface has or is using private name '{1}'." },
@@ -4167,6 +4409,7 @@ var ts;
         Substitution_0_for_pattern_1_has_incorrect_type_expected_string_got_2: { code: 5064, category: ts.DiagnosticCategory.Error, key: "Substitution_0_for_pattern_1_has_incorrect_type_expected_string_got_2_5064", message: "Substitution '{0}' for pattern '{1}' has incorrect type, expected 'string', got '{2}'." },
         File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0: { code: 5065, category: ts.DiagnosticCategory.Error, key: "File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildca_5065", message: "File specification cannot contain a parent directory ('..') that appears after a recursive directory wildcard ('**'): '{0}'." },
         Substitutions_for_pattern_0_shouldn_t_be_an_empty_array: { code: 5066, category: ts.DiagnosticCategory.Error, key: "Substitutions_for_pattern_0_shouldn_t_be_an_empty_array_5066", message: "Substitutions for pattern '{0}' shouldn't be an empty array." },
+        Invalid_value_for_jsxFactory_0_is_not_a_valid_identifier_or_qualified_name: { code: 5067, category: ts.DiagnosticCategory.Error, key: "Invalid_value_for_jsxFactory_0_is_not_a_valid_identifier_or_qualified_name_5067", message: "Invalid value for 'jsxFactory'. '{0}' is not a valid identifier or qualified-name." },
         Concatenate_and_emit_output_to_single_file: { code: 6001, category: ts.DiagnosticCategory.Message, key: "Concatenate_and_emit_output_to_single_file_6001", message: "Concatenate and emit output to single file." },
         Generates_corresponding_d_ts_file: { code: 6002, category: ts.DiagnosticCategory.Message, key: "Generates_corresponding_d_ts_file_6002", message: "Generates corresponding '.d.ts' file." },
         Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations: { code: 6003, category: ts.DiagnosticCategory.Message, key: "Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations_6003", message: "Specify the location where debugger should locate map files instead of generated locations." },
@@ -4250,7 +4493,7 @@ var ts;
         File_0_exist_use_it_as_a_name_resolution_result: { code: 6097, category: ts.DiagnosticCategory.Message, key: "File_0_exist_use_it_as_a_name_resolution_result_6097", message: "File '{0}' exist - use it as a name resolution result." },
         Loading_module_0_from_node_modules_folder: { code: 6098, category: ts.DiagnosticCategory.Message, key: "Loading_module_0_from_node_modules_folder_6098", message: "Loading module '{0}' from 'node_modules' folder." },
         Found_package_json_at_0: { code: 6099, category: ts.DiagnosticCategory.Message, key: "Found_package_json_at_0_6099", message: "Found 'package.json' at '{0}'." },
-        package_json_does_not_have_types_field: { code: 6100, category: ts.DiagnosticCategory.Message, key: "package_json_does_not_have_types_field_6100", message: "'package.json' does not have 'types' field." },
+        package_json_does_not_have_a_types_or_main_field: { code: 6100, category: ts.DiagnosticCategory.Message, key: "package_json_does_not_have_a_types_or_main_field_6100", message: "'package.json' does not have a 'types' or 'main' field." },
         package_json_has_0_field_1_that_references_2: { code: 6101, category: ts.DiagnosticCategory.Message, key: "package_json_has_0_field_1_that_references_2_6101", message: "'package.json' has '{0}' field '{1}' that references '{2}'." },
         Allow_javascript_files_to_be_compiled: { code: 6102, category: ts.DiagnosticCategory.Message, key: "Allow_javascript_files_to_be_compiled_6102", message: "Allow javascript files to be compiled." },
         Option_0_should_have_array_of_strings_as_a_value: { code: 6103, category: ts.DiagnosticCategory.Error, key: "Option_0_should_have_array_of_strings_as_a_value_6103", message: "Option '{0}' should have array of strings as a value." },
@@ -4287,11 +4530,16 @@ var ts;
         Report_errors_on_unused_locals: { code: 6134, category: ts.DiagnosticCategory.Message, key: "Report_errors_on_unused_locals_6134", message: "Report errors on unused locals." },
         Report_errors_on_unused_parameters: { code: 6135, category: ts.DiagnosticCategory.Message, key: "Report_errors_on_unused_parameters_6135", message: "Report errors on unused parameters." },
         The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files: { code: 6136, category: ts.DiagnosticCategory.Message, key: "The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files_6136", message: "The maximum dependency depth to search under node_modules and load JavaScript files" },
-        No_types_specified_in_package_json_but_allowJs_is_set_so_returning_main_value_of_0: { code: 6137, category: ts.DiagnosticCategory.Message, key: "No_types_specified_in_package_json_but_allowJs_is_set_so_returning_main_value_of_0_6137", message: "No types specified in 'package.json' but 'allowJs' is set, so returning 'main' value of '{0}'" },
+        No_types_specified_in_package_json_so_returning_main_value_of_0: { code: 6137, category: ts.DiagnosticCategory.Message, key: "No_types_specified_in_package_json_so_returning_main_value_of_0_6137", message: "No types specified in 'package.json', so returning 'main' value of '{0}'" },
         Property_0_is_declared_but_never_used: { code: 6138, category: ts.DiagnosticCategory.Error, key: "Property_0_is_declared_but_never_used_6138", message: "Property '{0}' is declared but never used." },
         Import_emit_helpers_from_tslib: { code: 6139, category: ts.DiagnosticCategory.Message, key: "Import_emit_helpers_from_tslib_6139", message: "Import emit helpers from 'tslib'." },
         Auto_discovery_for_typings_is_enabled_in_project_0_Running_extra_resolution_pass_for_module_1_using_cache_location_2: { code: 6140, category: ts.DiagnosticCategory.Error, key: "Auto_discovery_for_typings_is_enabled_in_project_0_Running_extra_resolution_pass_for_module_1_using__6140", message: "Auto discovery for typings is enabled in project '{0}'. Running extra resolution pass for module '{1}' using cache location '{2}'." },
         Parse_in_strict_mode_and_emit_use_strict_for_each_source_file: { code: 6141, category: ts.DiagnosticCategory.Message, key: "Parse_in_strict_mode_and_emit_use_strict_for_each_source_file_6141", message: "Parse in strict mode and emit \"use strict\" for each source file" },
+        Module_0_was_resolved_to_1_but_jsx_is_not_set: { code: 6142, category: ts.DiagnosticCategory.Error, key: "Module_0_was_resolved_to_1_but_jsx_is_not_set_6142", message: "Module '{0}' was resolved to '{1}', but '--jsx' is not set." },
+        Module_0_was_resolved_to_1_but_allowJs_is_not_set: { code: 6143, category: ts.DiagnosticCategory.Error, key: "Module_0_was_resolved_to_1_but_allowJs_is_not_set_6143", message: "Module '{0}' was resolved to '{1}', but '--allowJs' is not set." },
+        Module_0_was_resolved_as_locally_declared_ambient_module_in_file_1: { code: 6144, category: ts.DiagnosticCategory.Message, key: "Module_0_was_resolved_as_locally_declared_ambient_module_in_file_1_6144", message: "Module '{0}' was resolved as locally declared ambient module in file '{1}'." },
+        Module_0_was_resolved_as_ambient_module_declared_in_1_since_this_file_was_not_modified: { code: 6145, category: ts.DiagnosticCategory.Message, key: "Module_0_was_resolved_as_ambient_module_declared_in_1_since_this_file_was_not_modified_6145", message: "Module '{0}' was resolved as ambient module declared in '{1}' since this file was not modified." },
+        Specify_the_JSX_factory_function_to_use_when_targeting_react_JSX_emit_e_g_React_createElement_or_h: { code: 6146, category: ts.DiagnosticCategory.Message, key: "Specify_the_JSX_factory_function_to_use_when_targeting_react_JSX_emit_e_g_React_createElement_or_h_6146", message: "Specify the JSX factory function to use when targeting 'react' JSX emit, e.g. 'React.createElement' or 'h'." },
         Variable_0_implicitly_has_an_1_type: { code: 7005, category: ts.DiagnosticCategory.Error, key: "Variable_0_implicitly_has_an_1_type_7005", message: "Variable '{0}' implicitly has an '{1}' type." },
         Parameter_0_implicitly_has_an_1_type: { code: 7006, category: ts.DiagnosticCategory.Error, key: "Parameter_0_implicitly_has_an_1_type_7006", message: "Parameter '{0}' implicitly has an '{1}' type." },
         Member_0_implicitly_has_an_1_type: { code: 7008, category: ts.DiagnosticCategory.Error, key: "Member_0_implicitly_has_an_1_type_7008", message: "Member '{0}' implicitly has an '{1}' type." },
@@ -4300,7 +4548,8 @@ var ts;
         Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type: { code: 7011, category: ts.DiagnosticCategory.Error, key: "Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type_7011", message: "Function expression, which lacks return-type annotation, implicitly has an '{0}' return type." },
         Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7013, category: ts.DiagnosticCategory.Error, key: "Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type_7013", message: "Construct signature, which lacks return-type annotation, implicitly has an 'any' return type." },
         Element_implicitly_has_an_any_type_because_index_expression_is_not_of_type_number: { code: 7015, category: ts.DiagnosticCategory.Error, key: "Element_implicitly_has_an_any_type_because_index_expression_is_not_of_type_number_7015", message: "Element implicitly has an 'any' type because index expression is not of type 'number'." },
-        Index_signature_of_object_type_implicitly_has_an_any_type: { code: 7017, category: ts.DiagnosticCategory.Error, key: "Index_signature_of_object_type_implicitly_has_an_any_type_7017", message: "Index signature of object type implicitly has an 'any' type." },
+        Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type: { code: 7016, category: ts.DiagnosticCategory.Error, key: "Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type_7016", message: "Could not find a declaration file for module '{0}'. '{1}' implicitly has an 'any' type." },
+        Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature: { code: 7017, category: ts.DiagnosticCategory.Error, key: "Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_7017", message: "Element implicitly has an 'any' type because type '{0}' has no index signature." },
         Object_literal_s_property_0_implicitly_has_an_1_type: { code: 7018, category: ts.DiagnosticCategory.Error, key: "Object_literal_s_property_0_implicitly_has_an_1_type_7018", message: "Object literal's property '{0}' implicitly has an '{1}' type." },
         Rest_parameter_0_implicitly_has_an_any_type: { code: 7019, category: ts.DiagnosticCategory.Error, key: "Rest_parameter_0_implicitly_has_an_any_type_7019", message: "Rest parameter '{0}' implicitly has an 'any[]' type." },
         Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7020, category: ts.DiagnosticCategory.Error, key: "Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type_7020", message: "Call signature, which lacks return-type annotation, implicitly has an 'any' return type." },
@@ -4347,6 +4596,8 @@ var ts;
         Unknown_typing_option_0: { code: 17010, category: ts.DiagnosticCategory.Error, key: "Unknown_typing_option_0_17010", message: "Unknown typing option '{0}'." },
         Circularity_detected_while_resolving_configuration_Colon_0: { code: 18000, category: ts.DiagnosticCategory.Error, key: "Circularity_detected_while_resolving_configuration_Colon_0_18000", message: "Circularity detected while resolving configuration: {0}" },
         The_path_in_an_extends_options_must_be_relative_or_rooted: { code: 18001, category: ts.DiagnosticCategory.Error, key: "The_path_in_an_extends_options_must_be_relative_or_rooted_18001", message: "The path in an 'extends' options must be relative or rooted." },
+        The_files_list_in_config_file_0_is_empty: { code: 18002, category: ts.DiagnosticCategory.Error, key: "The_files_list_in_config_file_0_is_empty_18002", message: "The 'files' list in config file '{0}' is empty." },
+        No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2: { code: 18003, category: ts.DiagnosticCategory.Error, key: "No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2_18003", message: "No inputs were found in config file '{0}'. Specified 'include' paths were '{1}' and 'exclude' paths were '{2}'." },
         Add_missing_super_call: { code: 90001, category: ts.DiagnosticCategory.Message, key: "Add_missing_super_call_90001", message: "Add missing 'super()' call." },
         Make_super_call_the_first_statement_in_the_constructor: { code: 90002, category: ts.DiagnosticCategory.Message, key: "Make_super_call_the_first_statement_in_the_constructor_90002", message: "Make 'super()' call the first statement in the constructor." },
         Change_extends_to_implements: { code: 90003, category: ts.DiagnosticCategory.Message, key: "Change_extends_to_implements_90003", message: "Change 'extends' to 'implements'" },
@@ -4354,6 +4605,8 @@ var ts;
         Implement_interface_on_reference: { code: 90005, category: ts.DiagnosticCategory.Message, key: "Implement_interface_on_reference_90005", message: "Implement interface on reference" },
         Implement_interface_on_class: { code: 90006, category: ts.DiagnosticCategory.Message, key: "Implement_interface_on_class_90006", message: "Implement interface on class" },
         Implement_inherited_abstract_class: { code: 90007, category: ts.DiagnosticCategory.Message, key: "Implement_inherited_abstract_class_90007", message: "Implement inherited abstract class" },
+        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: { code: 90009, category: ts.DiagnosticCategory.Error, key: "Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript__90009", message: "Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig" },
+        Type_0_is_not_assignable_to_type_1_Two_different_types_with_this_name_exist_but_they_are_unrelated: { code: 90010, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_assignable_to_type_1_Two_different_types_with_this_name_exist_but_they_are_unrelated_90010", message: "Type '{0}' is not assignable to type '{1}'. Two different types with this name exist, but they are unrelated." },
     };
 })(ts || (ts = {}));
 /// <reference path="core.ts"/>
@@ -4389,7 +4642,7 @@ var ts;
         "false": 85 /* FalseKeyword */,
         "finally": 86 /* FinallyKeyword */,
         "for": 87 /* ForKeyword */,
-        "from": 137 /* FromKeyword */,
+        "from": 138 /* FromKeyword */,
         "function": 88 /* FunctionKeyword */,
         "get": 124 /* GetKeyword */,
         "if": 89 /* IfKeyword */,
@@ -4399,34 +4652,35 @@ var ts;
         "instanceof": 92 /* InstanceOfKeyword */,
         "interface": 108 /* InterfaceKeyword */,
         "is": 125 /* IsKeyword */,
+        "keyof": 126 /* KeyOfKeyword */,
         "let": 109 /* LetKeyword */,
-        "module": 126 /* ModuleKeyword */,
-        "namespace": 127 /* NamespaceKeyword */,
-        "never": 128 /* NeverKeyword */,
+        "module": 127 /* ModuleKeyword */,
+        "namespace": 128 /* NamespaceKeyword */,
+        "never": 129 /* NeverKeyword */,
         "new": 93 /* NewKeyword */,
         "null": 94 /* NullKeyword */,
-        "number": 131 /* NumberKeyword */,
+        "number": 132 /* NumberKeyword */,
         "package": 110 /* PackageKeyword */,
         "private": 111 /* PrivateKeyword */,
         "protected": 112 /* ProtectedKeyword */,
         "public": 113 /* PublicKeyword */,
-        "readonly": 129 /* ReadonlyKeyword */,
-        "require": 130 /* RequireKeyword */,
-        "global": 138 /* GlobalKeyword */,
+        "readonly": 130 /* ReadonlyKeyword */,
+        "require": 131 /* RequireKeyword */,
+        "global": 139 /* GlobalKeyword */,
         "return": 95 /* ReturnKeyword */,
-        "set": 132 /* SetKeyword */,
+        "set": 133 /* SetKeyword */,
         "static": 114 /* StaticKeyword */,
-        "string": 133 /* StringKeyword */,
+        "string": 134 /* StringKeyword */,
         "super": 96 /* SuperKeyword */,
         "switch": 97 /* SwitchKeyword */,
-        "symbol": 134 /* SymbolKeyword */,
+        "symbol": 135 /* SymbolKeyword */,
         "this": 98 /* ThisKeyword */,
         "throw": 99 /* ThrowKeyword */,
         "true": 100 /* TrueKeyword */,
         "try": 101 /* TryKeyword */,
-        "type": 135 /* TypeKeyword */,
+        "type": 136 /* TypeKeyword */,
         "typeof": 102 /* TypeOfKeyword */,
-        "undefined": 136 /* UndefinedKeyword */,
+        "undefined": 137 /* UndefinedKeyword */,
         "var": 103 /* VarKeyword */,
         "void": 104 /* VoidKeyword */,
         "while": 105 /* WhileKeyword */,
@@ -4434,7 +4688,7 @@ var ts;
         "yield": 115 /* YieldKeyword */,
         "async": 119 /* AsyncKeyword */,
         "await": 120 /* AwaitKeyword */,
-        "of": 139 /* OfKeyword */,
+        "of": 140 /* OfKeyword */,
         "{": 16 /* OpenBraceToken */,
         "}": 17 /* CloseBraceToken */,
         "(": 18 /* OpenParenToken */,
@@ -5984,10 +6238,13 @@ var ts;
                 case 44 /* comma */:
                     pos++;
                     return token = 25 /* CommaToken */;
+                case 46 /* dot */:
+                    pos++;
+                    return token = 22 /* DotToken */;
             }
-            if (isIdentifierStart(ch, 4 /* Latest */)) {
+            if (isIdentifierStart(ch, 5 /* Latest */)) {
                 pos++;
-                while (isIdentifierPart(text.charCodeAt(pos), 4 /* Latest */) && pos < end) {
+                while (isIdentifierPart(text.charCodeAt(pos), 5 /* Latest */) && pos < end) {
                     pos++;
                 }
                 return token = 70 /* Identifier */;
@@ -6112,11 +6369,11 @@ var ts;
                 // Completely ignore indentation for string writers.  And map newlines to
                 // a single space.
                 writeLine: function () { return str_1 += " "; },
-                increaseIndent: function () { },
-                decreaseIndent: function () { },
+                increaseIndent: ts.noop,
+                decreaseIndent: ts.noop,
                 clear: function () { return str_1 = ""; },
-                trackSymbol: function () { },
-                reportInaccessibleThisError: function () { }
+                trackSymbol: ts.noop,
+                reportInaccessibleThisError: ts.noop
             };
         }
         return stringWriters.pop();
@@ -6131,22 +6388,6 @@ var ts;
         return node.end - node.pos;
     }
     ts.getFullWidth = getFullWidth;
-    function arrayIsEqualTo(array1, array2, equaler) {
-        if (!array1 || !array2) {
-            return array1 === array2;
-        }
-        if (array1.length !== array2.length) {
-            return false;
-        }
-        for (var i = 0; i < array1.length; i++) {
-            var equals = equaler ? equaler(array1[i], array2[i]) : array1[i] === array2[i];
-            if (!equals) {
-                return false;
-            }
-        }
-        return true;
-    }
-    ts.arrayIsEqualTo = arrayIsEqualTo;
     function hasResolvedModule(sourceFile, moduleNameText) {
         return !!(sourceFile && sourceFile.resolvedModules && sourceFile.resolvedModules[moduleNameText]);
     }
@@ -6171,7 +6412,9 @@ var ts;
     ts.setResolvedTypeReferenceDirective = setResolvedTypeReferenceDirective;
     /* @internal */
     function moduleResolutionIsEqualTo(oldResolution, newResolution) {
-        return oldResolution.resolvedFileName === newResolution.resolvedFileName && oldResolution.isExternalLibraryImport === newResolution.isExternalLibraryImport;
+        return oldResolution.isExternalLibraryImport === newResolution.isExternalLibraryImport &&
+            oldResolution.extension === newResolution.extension &&
+            oldResolution.resolvedFileName === newResolution.resolvedFileName;
     }
     ts.moduleResolutionIsEqualTo = moduleResolutionIsEqualTo;
     /* @internal */
@@ -6200,28 +6443,28 @@ var ts;
     // Returns true if this node contains a parse error anywhere underneath it.
     function containsParseError(node) {
         aggregateChildData(node);
-        return (node.flags & 2097152 /* ThisNodeOrAnySubNodesHasError */) !== 0;
+        return (node.flags & 4194304 /* ThisNodeOrAnySubNodesHasError */) !== 0;
     }
     ts.containsParseError = containsParseError;
     function aggregateChildData(node) {
-        if (!(node.flags & 4194304 /* HasAggregatedChildData */)) {
+        if (!(node.flags & 8388608 /* HasAggregatedChildData */)) {
             // A node is considered to contain a parse error if:
             //  a) the parser explicitly marked that it had an error
             //  b) any of it's children reported that it had an error.
-            var thisNodeOrAnySubNodesHasError = ((node.flags & 524288 /* ThisNodeHasError */) !== 0) ||
+            var thisNodeOrAnySubNodesHasError = ((node.flags & 1048576 /* ThisNodeHasError */) !== 0) ||
                 ts.forEachChild(node, containsParseError);
             // If so, mark ourselves accordingly.
             if (thisNodeOrAnySubNodesHasError) {
-                node.flags |= 2097152 /* ThisNodeOrAnySubNodesHasError */;
+                node.flags |= 4194304 /* ThisNodeOrAnySubNodesHasError */;
             }
             // Also mark that we've propagated the child information to this node.  This way we can
             // always consult the bit directly on this node without needing to check its children
             // again.
-            node.flags |= 4194304 /* HasAggregatedChildData */;
+            node.flags |= 8388608 /* HasAggregatedChildData */;
         }
     }
     function getSourceFileOfNode(node) {
-        while (node && node.kind !== 256 /* SourceFile */) {
+        while (node && node.kind !== 261 /* SourceFile */) {
             node = node.parent;
         }
         return node;
@@ -6229,11 +6472,11 @@ var ts;
     ts.getSourceFileOfNode = getSourceFileOfNode;
     function isStatementWithLocals(node) {
         switch (node.kind) {
-            case 200 /* Block */:
-            case 228 /* CaseBlock */:
-            case 207 /* ForStatement */:
-            case 208 /* ForInStatement */:
-            case 209 /* ForOfStatement */:
+            case 204 /* Block */:
+            case 232 /* CaseBlock */:
+            case 211 /* ForStatement */:
+            case 212 /* ForInStatement */:
+            case 213 /* ForOfStatement */:
                 return true;
         }
         return false;
@@ -6324,18 +6567,18 @@ 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 === 286 /* SyntaxList */ && node._children.length > 0) {
+        if (node.kind === 291 /* SyntaxList */ && node._children.length > 0) {
             return getTokenPosOfNode(node._children[0], sourceFile, includeJsDocComment);
         }
         return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos);
     }
     ts.getTokenPosOfNode = getTokenPosOfNode;
     function isJSDocNode(node) {
-        return node.kind >= 257 /* FirstJSDocNode */ && node.kind <= 282 /* LastJSDocNode */;
+        return node.kind >= 262 /* FirstJSDocNode */ && node.kind <= 287 /* LastJSDocNode */;
     }
     ts.isJSDocNode = isJSDocNode;
     function isJSDocTag(node) {
-        return node.kind >= 273 /* FirstJSDocTagNode */ && node.kind <= 285 /* LastJSDocTagNode */;
+        return node.kind >= 278 /* FirstJSDocTagNode */ && node.kind <= 290 /* LastJSDocTagNode */;
     }
     ts.isJSDocTag = isJSDocTag;
     function getNonDecoratorTokenPosOfNode(node, sourceFile) {
@@ -6434,25 +6677,31 @@ var ts;
     ts.makeIdentifierFromModuleName = makeIdentifierFromModuleName;
     function isBlockOrCatchScoped(declaration) {
         return (ts.getCombinedNodeFlags(declaration) & 3 /* BlockScoped */) !== 0 ||
-            isCatchClauseVariableDeclaration(declaration);
+            isCatchClauseVariableDeclarationOrBindingElement(declaration);
     }
     ts.isBlockOrCatchScoped = isBlockOrCatchScoped;
+    function isCatchClauseVariableDeclarationOrBindingElement(declaration) {
+        var node = getRootDeclaration(declaration);
+        return node.kind === 223 /* VariableDeclaration */ && node.parent.kind === 256 /* CatchClause */;
+    }
+    ts.isCatchClauseVariableDeclarationOrBindingElement = isCatchClauseVariableDeclarationOrBindingElement;
     function isAmbientModule(node) {
-        return node && node.kind === 226 /* ModuleDeclaration */ &&
+        return node && node.kind === 230 /* ModuleDeclaration */ &&
             (node.name.kind === 9 /* StringLiteral */ || isGlobalScopeAugmentation(node));
     }
     ts.isAmbientModule = isAmbientModule;
+    /** Given a symbol for a module, checks that it is either an untyped import or a shorthand ambient module. */
     function isShorthandAmbientModuleSymbol(moduleSymbol) {
         return isShorthandAmbientModule(moduleSymbol.valueDeclaration);
     }
     ts.isShorthandAmbientModuleSymbol = isShorthandAmbientModuleSymbol;
     function isShorthandAmbientModule(node) {
         // The only kind of module that can be missing a body is a shorthand ambient module.
-        return node.kind === 226 /* ModuleDeclaration */ && (!node.body);
+        return node.kind === 230 /* ModuleDeclaration */ && (!node.body);
     }
     function isBlockScopedContainerTopLevel(node) {
-        return node.kind === 256 /* SourceFile */ ||
-            node.kind === 226 /* ModuleDeclaration */ ||
+        return node.kind === 261 /* SourceFile */ ||
+            node.kind === 230 /* ModuleDeclaration */ ||
             isFunctionLike(node);
     }
     ts.isBlockScopedContainerTopLevel = isBlockScopedContainerTopLevel;
@@ -6468,9 +6717,9 @@ var ts;
             return false;
         }
         switch (node.parent.kind) {
-            case 256 /* SourceFile */:
+            case 261 /* SourceFile */:
                 return ts.isExternalModule(node.parent);
-            case 227 /* ModuleBlock */:
+            case 231 /* ModuleBlock */:
                 return isAmbientModule(node.parent.parent) && !ts.isExternalModule(node.parent.parent.parent);
         }
         return false;
@@ -6478,22 +6727,22 @@ var ts;
     ts.isExternalModuleAugmentation = isExternalModuleAugmentation;
     function isBlockScope(node, parentNode) {
         switch (node.kind) {
-            case 256 /* SourceFile */:
-            case 228 /* CaseBlock */:
-            case 252 /* CatchClause */:
-            case 226 /* ModuleDeclaration */:
-            case 207 /* ForStatement */:
-            case 208 /* ForInStatement */:
-            case 209 /* ForOfStatement */:
-            case 149 /* Constructor */:
-            case 148 /* MethodDeclaration */:
-            case 150 /* GetAccessor */:
-            case 151 /* SetAccessor */:
-            case 221 /* FunctionDeclaration */:
-            case 180 /* FunctionExpression */:
-            case 181 /* ArrowFunction */:
+            case 261 /* SourceFile */:
+            case 232 /* CaseBlock */:
+            case 256 /* CatchClause */:
+            case 230 /* ModuleDeclaration */:
+            case 211 /* ForStatement */:
+            case 212 /* ForInStatement */:
+            case 213 /* ForOfStatement */:
+            case 150 /* Constructor */:
+            case 149 /* MethodDeclaration */:
+            case 151 /* GetAccessor */:
+            case 152 /* SetAccessor */:
+            case 225 /* FunctionDeclaration */:
+            case 184 /* FunctionExpression */:
+            case 185 /* ArrowFunction */:
                 return true;
-            case 200 /* Block */:
+            case 204 /* Block */:
                 // function block is not considered block-scope container
                 // see comment in binder.ts: bind(...), case for SyntaxKind.Block
                 return parentNode && !isFunctionLike(parentNode);
@@ -6513,13 +6762,6 @@ var ts;
         }
     }
     ts.getEnclosingBlockScopeContainer = getEnclosingBlockScopeContainer;
-    function isCatchClauseVariableDeclaration(declaration) {
-        return declaration &&
-            declaration.kind === 219 /* VariableDeclaration */ &&
-            declaration.parent &&
-            declaration.parent.kind === 252 /* CatchClause */;
-    }
-    ts.isCatchClauseVariableDeclaration = isCatchClauseVariableDeclaration;
     // Return display name of an identifier
     // Computed property names will just be emitted as "[<expr>]", where <expr> is the source
     // text of the expression in the computed property.
@@ -6527,12 +6769,42 @@ var ts;
         return getFullWidth(name) === 0 ? "(Missing)" : getTextOfNode(name);
     }
     ts.declarationNameToString = declarationNameToString;
+    function getTextOfPropertyName(name) {
+        switch (name.kind) {
+            case 70 /* Identifier */:
+                return name.text;
+            case 9 /* StringLiteral */:
+            case 8 /* NumericLiteral */:
+                return name.text;
+            case 142 /* ComputedPropertyName */:
+                if (isStringOrNumericLiteral(name.expression.kind)) {
+                    return name.expression.text;
+                }
+        }
+        return undefined;
+    }
+    ts.getTextOfPropertyName = getTextOfPropertyName;
+    function entityNameToString(name) {
+        switch (name.kind) {
+            case 70 /* Identifier */:
+                return getFullWidth(name) === 0 ? unescapeIdentifier(name.text) : getTextOfNode(name);
+            case 141 /* QualifiedName */:
+                return entityNameToString(name.left) + "." + entityNameToString(name.right);
+            case 177 /* PropertyAccessExpression */:
+                return entityNameToString(name.expression) + "." + entityNameToString(name.name);
+        }
+    }
+    ts.entityNameToString = entityNameToString;
     function createDiagnosticForNode(node, message, arg0, arg1, arg2) {
         var sourceFile = getSourceFileOfNode(node);
+        return createDiagnosticForNodeInSourceFile(sourceFile, node, message, arg0, arg1, arg2);
+    }
+    ts.createDiagnosticForNode = createDiagnosticForNode;
+    function createDiagnosticForNodeInSourceFile(sourceFile, node, message, arg0, arg1, arg2) {
         var span = getErrorSpanForNode(sourceFile, node);
         return ts.createFileDiagnostic(sourceFile, span.start, span.length, message, arg0, arg1, arg2);
     }
-    ts.createDiagnosticForNode = createDiagnosticForNode;
+    ts.createDiagnosticForNodeInSourceFile = createDiagnosticForNodeInSourceFile;
     function createDiagnosticForNodeFromMessageChain(node, messageChain) {
         var sourceFile = getSourceFileOfNode(node);
         var span = getErrorSpanForNode(sourceFile, node);
@@ -6555,7 +6827,7 @@ var ts;
     ts.getSpanOfTokenAtPosition = getSpanOfTokenAtPosition;
     function getErrorSpanForArrowFunction(sourceFile, node) {
         var pos = ts.skipTrivia(sourceFile.text, node.pos);
-        if (node.body && node.body.kind === 200 /* Block */) {
+        if (node.body && node.body.kind === 204 /* Block */) {
             var startLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.pos).line;
             var endLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.end).line;
             if (startLine < endLine) {
@@ -6569,7 +6841,7 @@ var ts;
     function getErrorSpanForNode(sourceFile, node) {
         var errorNode = node;
         switch (node.kind) {
-            case 256 /* SourceFile */:
+            case 261 /* 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
@@ -6578,23 +6850,23 @@ var ts;
                 return getSpanOfTokenAtPosition(sourceFile, pos_1);
             // This list is a work in progress. Add missing node kinds to improve their error
             // spans.
-            case 219 /* VariableDeclaration */:
-            case 170 /* BindingElement */:
-            case 222 /* ClassDeclaration */:
-            case 193 /* ClassExpression */:
-            case 223 /* InterfaceDeclaration */:
-            case 226 /* ModuleDeclaration */:
-            case 225 /* EnumDeclaration */:
-            case 255 /* EnumMember */:
-            case 221 /* FunctionDeclaration */:
-            case 180 /* FunctionExpression */:
-            case 148 /* MethodDeclaration */:
-            case 150 /* GetAccessor */:
-            case 151 /* SetAccessor */:
-            case 224 /* TypeAliasDeclaration */:
+            case 223 /* VariableDeclaration */:
+            case 174 /* BindingElement */:
+            case 226 /* ClassDeclaration */:
+            case 197 /* ClassExpression */:
+            case 227 /* InterfaceDeclaration */:
+            case 230 /* ModuleDeclaration */:
+            case 229 /* EnumDeclaration */:
+            case 260 /* EnumMember */:
+            case 225 /* FunctionDeclaration */:
+            case 184 /* FunctionExpression */:
+            case 149 /* MethodDeclaration */:
+            case 151 /* GetAccessor */:
+            case 152 /* SetAccessor */:
+            case 228 /* TypeAliasDeclaration */:
                 errorNode = node.name;
                 break;
-            case 181 /* ArrowFunction */:
+            case 185 /* ArrowFunction */:
                 return getErrorSpanForArrowFunction(sourceFile, node);
         }
         if (errorNode === undefined) {
@@ -6617,7 +6889,7 @@ var ts;
     }
     ts.isDeclarationFile = isDeclarationFile;
     function isConstEnumDeclaration(node) {
-        return node.kind === 225 /* EnumDeclaration */ && isConst(node);
+        return node.kind === 229 /* EnumDeclaration */ && isConst(node);
     }
     ts.isConstEnumDeclaration = isConstEnumDeclaration;
     function isConst(node) {
@@ -6630,11 +6902,11 @@ var ts;
     }
     ts.isLet = isLet;
     function isSuperCall(n) {
-        return n.kind === 175 /* CallExpression */ && n.expression.kind === 96 /* SuperKeyword */;
+        return n.kind === 179 /* CallExpression */ && n.expression.kind === 96 /* SuperKeyword */;
     }
     ts.isSuperCall = isSuperCall;
     function isPrologueDirective(node) {
-        return node.kind === 203 /* ExpressionStatement */ && node.expression.kind === 9 /* StringLiteral */;
+        return node.kind === 207 /* ExpressionStatement */ && node.expression.kind === 9 /* StringLiteral */;
     }
     ts.isPrologueDirective = isPrologueDirective;
     function getLeadingCommentRangesOfNode(node, sourceFileOfNode) {
@@ -6650,10 +6922,10 @@ var ts;
     }
     ts.getJsDocComments = getJsDocComments;
     function getJsDocCommentsFromText(node, text) {
-        var commentRanges = (node.kind === 143 /* Parameter */ ||
-            node.kind === 142 /* TypeParameter */ ||
-            node.kind === 180 /* FunctionExpression */ ||
-            node.kind === 181 /* ArrowFunction */) ?
+        var commentRanges = (node.kind === 144 /* Parameter */ ||
+            node.kind === 143 /* TypeParameter */ ||
+            node.kind === 184 /* FunctionExpression */ ||
+            node.kind === 185 /* ArrowFunction */) ?
             ts.concatenate(ts.getTrailingCommentRanges(text, node.pos), ts.getLeadingCommentRanges(text, node.pos)) :
             getLeadingCommentRangesOfNodeFromText(node, text);
         return ts.filter(commentRanges, isJsDocComment);
@@ -6669,39 +6941,39 @@ var ts;
     ts.fullTripleSlashReferenceTypeReferenceDirectiveRegEx = /^(\/\/\/\s*<reference\s+types\s*=\s*)('|")(.+?)\2.*?\/>/;
     ts.fullTripleSlashAMDReferencePathRegEx = /^(\/\/\/\s*<amd-dependency\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
     function isPartOfTypeNode(node) {
-        if (155 /* FirstTypeNode */ <= node.kind && node.kind <= 167 /* LastTypeNode */) {
+        if (156 /* FirstTypeNode */ <= node.kind && node.kind <= 171 /* LastTypeNode */) {
             return true;
         }
         switch (node.kind) {
             case 118 /* AnyKeyword */:
-            case 131 /* NumberKeyword */:
-            case 133 /* StringKeyword */:
+            case 132 /* NumberKeyword */:
+            case 134 /* StringKeyword */:
             case 121 /* BooleanKeyword */:
-            case 134 /* SymbolKeyword */:
-            case 136 /* UndefinedKeyword */:
-            case 128 /* NeverKeyword */:
+            case 135 /* SymbolKeyword */:
+            case 137 /* UndefinedKeyword */:
+            case 129 /* NeverKeyword */:
                 return true;
             case 104 /* VoidKeyword */:
-                return node.parent.kind !== 184 /* VoidExpression */;
-            case 195 /* ExpressionWithTypeArguments */:
+                return node.parent.kind !== 188 /* VoidExpression */;
+            case 199 /* ExpressionWithTypeArguments */:
                 return !isExpressionWithTypeArgumentsInClassExtendsClause(node);
             // Identifiers and qualified names may be type nodes, depending on their context. Climb
             // above them to find the lowest container
             case 70 /* Identifier */:
                 // If the identifier is the RHS of a qualified name, then it's a type iff its parent is.
-                if (node.parent.kind === 140 /* QualifiedName */ && node.parent.right === node) {
+                if (node.parent.kind === 141 /* QualifiedName */ && node.parent.right === node) {
                     node = node.parent;
                 }
-                else if (node.parent.kind === 173 /* PropertyAccessExpression */ && node.parent.name === node) {
+                else if (node.parent.kind === 177 /* 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 === 70 /* Identifier */ || node.kind === 140 /* QualifiedName */ || node.kind === 173 /* PropertyAccessExpression */, "'node' was expected to be a qualified name, identifier or property access in 'isPartOfTypeNode'.");
-            case 140 /* QualifiedName */:
-            case 173 /* PropertyAccessExpression */:
+                ts.Debug.assert(node.kind === 70 /* Identifier */ || node.kind === 141 /* QualifiedName */ || node.kind === 177 /* PropertyAccessExpression */, "'node' was expected to be a qualified name, identifier or property access in 'isPartOfTypeNode'.");
+            case 141 /* QualifiedName */:
+            case 177 /* PropertyAccessExpression */:
             case 98 /* ThisKeyword */:
                 var parent_1 = node.parent;
-                if (parent_1.kind === 159 /* TypeQuery */) {
+                if (parent_1.kind === 160 /* TypeQuery */) {
                     return false;
                 }
                 // Do not recursively call isPartOfTypeNode on the parent. In the example:
@@ -6710,38 +6982,38 @@ var ts;
                 //
                 // Calling isPartOfTypeNode would consider the qualified name A.B a type node. Only C or
                 // A.B.C is a type node.
-                if (155 /* FirstTypeNode */ <= parent_1.kind && parent_1.kind <= 167 /* LastTypeNode */) {
+                if (156 /* FirstTypeNode */ <= parent_1.kind && parent_1.kind <= 171 /* LastTypeNode */) {
                     return true;
                 }
                 switch (parent_1.kind) {
-                    case 195 /* ExpressionWithTypeArguments */:
+                    case 199 /* ExpressionWithTypeArguments */:
                         return !isExpressionWithTypeArgumentsInClassExtendsClause(parent_1);
-                    case 142 /* TypeParameter */:
+                    case 143 /* TypeParameter */:
                         return node === parent_1.constraint;
-                    case 146 /* PropertyDeclaration */:
-                    case 145 /* PropertySignature */:
-                    case 143 /* Parameter */:
-                    case 219 /* VariableDeclaration */:
+                    case 147 /* PropertyDeclaration */:
+                    case 146 /* PropertySignature */:
+                    case 144 /* Parameter */:
+                    case 223 /* VariableDeclaration */:
                         return node === parent_1.type;
-                    case 221 /* FunctionDeclaration */:
-                    case 180 /* FunctionExpression */:
-                    case 181 /* ArrowFunction */:
-                    case 149 /* Constructor */:
-                    case 148 /* MethodDeclaration */:
-                    case 147 /* MethodSignature */:
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
+                    case 225 /* FunctionDeclaration */:
+                    case 184 /* FunctionExpression */:
+                    case 185 /* ArrowFunction */:
+                    case 150 /* Constructor */:
+                    case 149 /* MethodDeclaration */:
+                    case 148 /* MethodSignature */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* SetAccessor */:
                         return node === parent_1.type;
-                    case 152 /* CallSignature */:
-                    case 153 /* ConstructSignature */:
-                    case 154 /* IndexSignature */:
+                    case 153 /* CallSignature */:
+                    case 154 /* ConstructSignature */:
+                    case 155 /* IndexSignature */:
                         return node === parent_1.type;
-                    case 178 /* TypeAssertionExpression */:
+                    case 182 /* TypeAssertionExpression */:
                         return node === parent_1.type;
-                    case 175 /* CallExpression */:
-                    case 176 /* NewExpression */:
+                    case 179 /* CallExpression */:
+                    case 180 /* NewExpression */:
                         return parent_1.typeArguments && ts.indexOf(parent_1.typeArguments, node) >= 0;
-                    case 177 /* TaggedTemplateExpression */:
+                    case 181 /* TaggedTemplateExpression */:
                         // TODO (drosen): TaggedTemplateExpressions may eventually support type arguments.
                         return false;
                 }
@@ -6755,23 +7027,23 @@ var ts;
         return traverse(body);
         function traverse(node) {
             switch (node.kind) {
-                case 212 /* ReturnStatement */:
+                case 216 /* ReturnStatement */:
                     return visitor(node);
-                case 228 /* CaseBlock */:
-                case 200 /* Block */:
-                case 204 /* IfStatement */:
-                case 205 /* DoStatement */:
-                case 206 /* WhileStatement */:
-                case 207 /* ForStatement */:
-                case 208 /* ForInStatement */:
-                case 209 /* ForOfStatement */:
-                case 213 /* WithStatement */:
-                case 214 /* SwitchStatement */:
-                case 249 /* CaseClause */:
-                case 250 /* DefaultClause */:
-                case 215 /* LabeledStatement */:
-                case 217 /* TryStatement */:
-                case 252 /* CatchClause */:
+                case 232 /* CaseBlock */:
+                case 204 /* Block */:
+                case 208 /* IfStatement */:
+                case 209 /* DoStatement */:
+                case 210 /* WhileStatement */:
+                case 211 /* ForStatement */:
+                case 212 /* ForInStatement */:
+                case 213 /* ForOfStatement */:
+                case 217 /* WithStatement */:
+                case 218 /* SwitchStatement */:
+                case 253 /* CaseClause */:
+                case 254 /* DefaultClause */:
+                case 219 /* LabeledStatement */:
+                case 221 /* TryStatement */:
+                case 256 /* CatchClause */:
                     return ts.forEachChild(node, traverse);
             }
         }
@@ -6781,18 +7053,18 @@ var ts;
         return traverse(body);
         function traverse(node) {
             switch (node.kind) {
-                case 191 /* YieldExpression */:
+                case 195 /* YieldExpression */:
                     visitor(node);
                     var operand = node.expression;
                     if (operand) {
                         traverse(operand);
                     }
-                case 225 /* EnumDeclaration */:
-                case 223 /* InterfaceDeclaration */:
-                case 226 /* ModuleDeclaration */:
-                case 224 /* TypeAliasDeclaration */:
-                case 222 /* ClassDeclaration */:
-                case 193 /* ClassExpression */:
+                case 229 /* EnumDeclaration */:
+                case 227 /* InterfaceDeclaration */:
+                case 230 /* ModuleDeclaration */:
+                case 228 /* TypeAliasDeclaration */:
+                case 226 /* ClassDeclaration */:
+                case 197 /* 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.
@@ -6800,7 +7072,7 @@ var ts;
                 default:
                     if (isFunctionLike(node)) {
                         var name_5 = node.name;
-                        if (name_5 && name_5.kind === 141 /* ComputedPropertyName */) {
+                        if (name_5 && name_5.kind === 142 /* 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(name_5.expression);
@@ -6819,14 +7091,14 @@ var ts;
     function isVariableLike(node) {
         if (node) {
             switch (node.kind) {
-                case 170 /* BindingElement */:
-                case 255 /* EnumMember */:
-                case 143 /* Parameter */:
-                case 253 /* PropertyAssignment */:
-                case 146 /* PropertyDeclaration */:
-                case 145 /* PropertySignature */:
-                case 254 /* ShorthandPropertyAssignment */:
-                case 219 /* VariableDeclaration */:
+                case 174 /* BindingElement */:
+                case 260 /* EnumMember */:
+                case 144 /* Parameter */:
+                case 257 /* PropertyAssignment */:
+                case 147 /* PropertyDeclaration */:
+                case 146 /* PropertySignature */:
+                case 258 /* ShorthandPropertyAssignment */:
+                case 223 /* VariableDeclaration */:
                     return true;
             }
         }
@@ -6834,11 +7106,11 @@ var ts;
     }
     ts.isVariableLike = isVariableLike;
     function isAccessor(node) {
-        return node && (node.kind === 150 /* GetAccessor */ || node.kind === 151 /* SetAccessor */);
+        return node && (node.kind === 151 /* GetAccessor */ || node.kind === 152 /* SetAccessor */);
     }
     ts.isAccessor = isAccessor;
     function isClassLike(node) {
-        return node && (node.kind === 222 /* ClassDeclaration */ || node.kind === 193 /* ClassExpression */);
+        return node && (node.kind === 226 /* ClassDeclaration */ || node.kind === 197 /* ClassExpression */);
     }
     ts.isClassLike = isClassLike;
     function isFunctionLike(node) {
@@ -6847,19 +7119,19 @@ var ts;
     ts.isFunctionLike = isFunctionLike;
     function isFunctionLikeKind(kind) {
         switch (kind) {
-            case 149 /* Constructor */:
-            case 180 /* FunctionExpression */:
-            case 221 /* FunctionDeclaration */:
-            case 181 /* ArrowFunction */:
-            case 148 /* MethodDeclaration */:
-            case 147 /* MethodSignature */:
-            case 150 /* GetAccessor */:
-            case 151 /* SetAccessor */:
-            case 152 /* CallSignature */:
-            case 153 /* ConstructSignature */:
-            case 154 /* IndexSignature */:
-            case 157 /* FunctionType */:
-            case 158 /* ConstructorType */:
+            case 150 /* Constructor */:
+            case 184 /* FunctionExpression */:
+            case 225 /* FunctionDeclaration */:
+            case 185 /* ArrowFunction */:
+            case 149 /* MethodDeclaration */:
+            case 148 /* MethodSignature */:
+            case 151 /* GetAccessor */:
+            case 152 /* SetAccessor */:
+            case 153 /* CallSignature */:
+            case 154 /* ConstructSignature */:
+            case 155 /* IndexSignature */:
+            case 158 /* FunctionType */:
+            case 159 /* ConstructorType */:
                 return true;
         }
         return false;
@@ -6867,13 +7139,13 @@ var ts;
     ts.isFunctionLikeKind = isFunctionLikeKind;
     function introducesArgumentsExoticObject(node) {
         switch (node.kind) {
-            case 148 /* MethodDeclaration */:
-            case 147 /* MethodSignature */:
-            case 149 /* Constructor */:
-            case 150 /* GetAccessor */:
-            case 151 /* SetAccessor */:
-            case 221 /* FunctionDeclaration */:
-            case 180 /* FunctionExpression */:
+            case 149 /* MethodDeclaration */:
+            case 148 /* MethodSignature */:
+            case 150 /* Constructor */:
+            case 151 /* GetAccessor */:
+            case 152 /* SetAccessor */:
+            case 225 /* FunctionDeclaration */:
+            case 184 /* FunctionExpression */:
                 return true;
         }
         return false;
@@ -6881,30 +7153,30 @@ var ts;
     ts.introducesArgumentsExoticObject = introducesArgumentsExoticObject;
     function isIterationStatement(node, lookInLabeledStatements) {
         switch (node.kind) {
-            case 207 /* ForStatement */:
-            case 208 /* ForInStatement */:
-            case 209 /* ForOfStatement */:
-            case 205 /* DoStatement */:
-            case 206 /* WhileStatement */:
+            case 211 /* ForStatement */:
+            case 212 /* ForInStatement */:
+            case 213 /* ForOfStatement */:
+            case 209 /* DoStatement */:
+            case 210 /* WhileStatement */:
                 return true;
-            case 215 /* LabeledStatement */:
+            case 219 /* LabeledStatement */:
                 return lookInLabeledStatements && isIterationStatement(node.statement, lookInLabeledStatements);
         }
         return false;
     }
     ts.isIterationStatement = isIterationStatement;
     function isFunctionBlock(node) {
-        return node && node.kind === 200 /* Block */ && isFunctionLike(node.parent);
+        return node && node.kind === 204 /* Block */ && isFunctionLike(node.parent);
     }
     ts.isFunctionBlock = isFunctionBlock;
     function isObjectLiteralMethod(node) {
-        return node && node.kind === 148 /* MethodDeclaration */ && node.parent.kind === 172 /* ObjectLiteralExpression */;
+        return node && node.kind === 149 /* MethodDeclaration */ && node.parent.kind === 176 /* ObjectLiteralExpression */;
     }
     ts.isObjectLiteralMethod = isObjectLiteralMethod;
     function isObjectLiteralOrClassExpressionMethod(node) {
-        return node.kind === 148 /* MethodDeclaration */ &&
-            (node.parent.kind === 172 /* ObjectLiteralExpression */ ||
-                node.parent.kind === 193 /* ClassExpression */);
+        return node.kind === 149 /* MethodDeclaration */ &&
+            (node.parent.kind === 176 /* ObjectLiteralExpression */ ||
+                node.parent.kind === 197 /* ClassExpression */);
     }
     ts.isObjectLiteralOrClassExpressionMethod = isObjectLiteralOrClassExpressionMethod;
     function isIdentifierTypePredicate(predicate) {
@@ -6940,7 +7212,7 @@ var ts;
                 return undefined;
             }
             switch (node.kind) {
-                case 141 /* ComputedPropertyName */:
+                case 142 /* 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
@@ -6955,9 +7227,9 @@ var ts;
                     // the *body* of the container.
                     node = node.parent;
                     break;
-                case 144 /* Decorator */:
+                case 145 /* Decorator */:
                     // Decorators are always applied outside of the body of a class or method.
-                    if (node.parent.kind === 143 /* Parameter */ && isClassElement(node.parent.parent)) {
+                    if (node.parent.kind === 144 /* Parameter */ && 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;
@@ -6968,26 +7240,26 @@ var ts;
                         node = node.parent;
                     }
                     break;
-                case 181 /* ArrowFunction */:
+                case 185 /* ArrowFunction */:
                     if (!includeArrowFunctions) {
                         continue;
                     }
                 // Fall through
-                case 221 /* FunctionDeclaration */:
-                case 180 /* FunctionExpression */:
-                case 226 /* ModuleDeclaration */:
-                case 146 /* PropertyDeclaration */:
-                case 145 /* PropertySignature */:
-                case 148 /* MethodDeclaration */:
-                case 147 /* MethodSignature */:
-                case 149 /* Constructor */:
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
-                case 152 /* CallSignature */:
-                case 153 /* ConstructSignature */:
-                case 154 /* IndexSignature */:
-                case 225 /* EnumDeclaration */:
-                case 256 /* SourceFile */:
+                case 225 /* FunctionDeclaration */:
+                case 184 /* FunctionExpression */:
+                case 230 /* ModuleDeclaration */:
+                case 147 /* PropertyDeclaration */:
+                case 146 /* PropertySignature */:
+                case 149 /* MethodDeclaration */:
+                case 148 /* MethodSignature */:
+                case 150 /* Constructor */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
+                case 153 /* CallSignature */:
+                case 154 /* ConstructSignature */:
+                case 155 /* IndexSignature */:
+                case 229 /* EnumDeclaration */:
+                case 261 /* SourceFile */:
                     return node;
             }
         }
@@ -7008,26 +7280,26 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 141 /* ComputedPropertyName */:
+                case 142 /* ComputedPropertyName */:
                     node = node.parent;
                     break;
-                case 221 /* FunctionDeclaration */:
-                case 180 /* FunctionExpression */:
-                case 181 /* ArrowFunction */:
+                case 225 /* FunctionDeclaration */:
+                case 184 /* FunctionExpression */:
+                case 185 /* ArrowFunction */:
                     if (!stopOnFunctions) {
                         continue;
                     }
-                case 146 /* PropertyDeclaration */:
-                case 145 /* PropertySignature */:
-                case 148 /* MethodDeclaration */:
-                case 147 /* MethodSignature */:
-                case 149 /* Constructor */:
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
+                case 147 /* PropertyDeclaration */:
+                case 146 /* PropertySignature */:
+                case 149 /* MethodDeclaration */:
+                case 148 /* MethodSignature */:
+                case 150 /* Constructor */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
                     return node;
-                case 144 /* Decorator */:
+                case 145 /* Decorator */:
                     // Decorators are always applied outside of the body of a class or method.
-                    if (node.parent.kind === 143 /* Parameter */ && isClassElement(node.parent.parent)) {
+                    if (node.parent.kind === 144 /* Parameter */ && 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;
@@ -7043,14 +7315,14 @@ var ts;
     }
     ts.getSuperContainer = getSuperContainer;
     function getImmediatelyInvokedFunctionExpression(func) {
-        if (func.kind === 180 /* FunctionExpression */ || func.kind === 181 /* ArrowFunction */) {
+        if (func.kind === 184 /* FunctionExpression */ || func.kind === 185 /* ArrowFunction */) {
             var prev = func;
             var parent_2 = func.parent;
-            while (parent_2.kind === 179 /* ParenthesizedExpression */) {
+            while (parent_2.kind === 183 /* ParenthesizedExpression */) {
                 prev = parent_2;
                 parent_2 = parent_2.parent;
             }
-            if (parent_2.kind === 175 /* CallExpression */ && parent_2.expression === prev) {
+            if (parent_2.kind === 179 /* CallExpression */ && parent_2.expression === prev) {
                 return parent_2;
             }
         }
@@ -7061,32 +7333,32 @@ var ts;
      */
     function isSuperProperty(node) {
         var kind = node.kind;
-        return (kind === 173 /* PropertyAccessExpression */ || kind === 174 /* ElementAccessExpression */)
+        return (kind === 177 /* PropertyAccessExpression */ || kind === 178 /* ElementAccessExpression */)
             && node.expression.kind === 96 /* SuperKeyword */;
     }
     ts.isSuperProperty = isSuperProperty;
     function getEntityNameFromTypeNode(node) {
-        if (node) {
-            switch (node.kind) {
-                case 156 /* TypeReference */:
-                    return node.typeName;
-                case 195 /* ExpressionWithTypeArguments */:
-                    ts.Debug.assert(isEntityNameExpression(node.expression));
-                    return node.expression;
-                case 70 /* Identifier */:
-                case 140 /* QualifiedName */:
-                    return node;
-            }
+        switch (node.kind) {
+            case 157 /* TypeReference */:
+            case 272 /* JSDocTypeReference */:
+                return node.typeName;
+            case 199 /* ExpressionWithTypeArguments */:
+                return isEntityNameExpression(node.expression)
+                    ? node.expression
+                    : undefined;
+            case 70 /* Identifier */:
+            case 141 /* QualifiedName */:
+                return node;
         }
         return undefined;
     }
     ts.getEntityNameFromTypeNode = getEntityNameFromTypeNode;
     function isCallLikeExpression(node) {
         switch (node.kind) {
-            case 175 /* CallExpression */:
-            case 176 /* NewExpression */:
-            case 177 /* TaggedTemplateExpression */:
-            case 144 /* Decorator */:
+            case 179 /* CallExpression */:
+            case 180 /* NewExpression */:
+            case 181 /* TaggedTemplateExpression */:
+            case 145 /* Decorator */:
                 return true;
             default:
                 return false;
@@ -7094,7 +7366,7 @@ var ts;
     }
     ts.isCallLikeExpression = isCallLikeExpression;
     function getInvokedExpression(node) {
-        if (node.kind === 177 /* TaggedTemplateExpression */) {
+        if (node.kind === 181 /* TaggedTemplateExpression */) {
             return node.tag;
         }
         // Will either be a CallExpression, NewExpression, or Decorator.
@@ -7103,25 +7375,25 @@ var ts;
     ts.getInvokedExpression = getInvokedExpression;
     function nodeCanBeDecorated(node) {
         switch (node.kind) {
-            case 222 /* ClassDeclaration */:
+            case 226 /* ClassDeclaration */:
                 // classes are valid targets
                 return true;
-            case 146 /* PropertyDeclaration */:
+            case 147 /* PropertyDeclaration */:
                 // property declarations are valid if their parent is a class declaration.
-                return node.parent.kind === 222 /* ClassDeclaration */;
-            case 150 /* GetAccessor */:
-            case 151 /* SetAccessor */:
-            case 148 /* MethodDeclaration */:
+                return node.parent.kind === 226 /* ClassDeclaration */;
+            case 151 /* GetAccessor */:
+            case 152 /* SetAccessor */:
+            case 149 /* MethodDeclaration */:
                 // if this method has a body and its parent is a class declaration, this is a valid target.
                 return node.body !== undefined
-                    && node.parent.kind === 222 /* ClassDeclaration */;
-            case 143 /* Parameter */:
+                    && node.parent.kind === 226 /* ClassDeclaration */;
+            case 144 /* Parameter */:
                 // if the parameter's parent has a body and its grandparent is a class declaration, this is a valid target;
                 return node.parent.body !== undefined
-                    && (node.parent.kind === 149 /* Constructor */
-                        || node.parent.kind === 148 /* MethodDeclaration */
-                        || node.parent.kind === 151 /* SetAccessor */)
-                    && node.parent.parent.kind === 222 /* ClassDeclaration */;
+                    && (node.parent.kind === 150 /* Constructor */
+                        || node.parent.kind === 149 /* MethodDeclaration */
+                        || node.parent.kind === 152 /* SetAccessor */)
+                    && node.parent.parent.kind === 226 /* ClassDeclaration */;
         }
         return false;
     }
@@ -7137,19 +7409,19 @@ var ts;
     ts.nodeOrChildIsDecorated = nodeOrChildIsDecorated;
     function childIsDecorated(node) {
         switch (node.kind) {
-            case 222 /* ClassDeclaration */:
+            case 226 /* ClassDeclaration */:
                 return ts.forEach(node.members, nodeOrChildIsDecorated);
-            case 148 /* MethodDeclaration */:
-            case 151 /* SetAccessor */:
+            case 149 /* MethodDeclaration */:
+            case 152 /* SetAccessor */:
                 return ts.forEach(node.parameters, nodeIsDecorated);
         }
     }
     ts.childIsDecorated = childIsDecorated;
     function isJSXTagName(node) {
         var parent = node.parent;
-        if (parent.kind === 244 /* JsxOpeningElement */ ||
-            parent.kind === 243 /* JsxSelfClosingElement */ ||
-            parent.kind === 245 /* JsxClosingElement */) {
+        if (parent.kind === 248 /* JsxOpeningElement */ ||
+            parent.kind === 247 /* JsxSelfClosingElement */ ||
+            parent.kind === 249 /* JsxClosingElement */) {
             return parent.tagName === node;
         }
         return false;
@@ -7163,43 +7435,43 @@ var ts;
             case 100 /* TrueKeyword */:
             case 85 /* FalseKeyword */:
             case 11 /* RegularExpressionLiteral */:
-            case 171 /* ArrayLiteralExpression */:
-            case 172 /* ObjectLiteralExpression */:
-            case 173 /* PropertyAccessExpression */:
-            case 174 /* ElementAccessExpression */:
-            case 175 /* CallExpression */:
-            case 176 /* NewExpression */:
-            case 177 /* TaggedTemplateExpression */:
-            case 196 /* AsExpression */:
-            case 178 /* TypeAssertionExpression */:
-            case 197 /* NonNullExpression */:
-            case 179 /* ParenthesizedExpression */:
-            case 180 /* FunctionExpression */:
-            case 193 /* ClassExpression */:
-            case 181 /* ArrowFunction */:
-            case 184 /* VoidExpression */:
-            case 182 /* DeleteExpression */:
-            case 183 /* TypeOfExpression */:
-            case 186 /* PrefixUnaryExpression */:
-            case 187 /* PostfixUnaryExpression */:
-            case 188 /* BinaryExpression */:
-            case 189 /* ConditionalExpression */:
-            case 192 /* SpreadElementExpression */:
-            case 190 /* TemplateExpression */:
+            case 175 /* ArrayLiteralExpression */:
+            case 176 /* ObjectLiteralExpression */:
+            case 177 /* PropertyAccessExpression */:
+            case 178 /* ElementAccessExpression */:
+            case 179 /* CallExpression */:
+            case 180 /* NewExpression */:
+            case 181 /* TaggedTemplateExpression */:
+            case 200 /* AsExpression */:
+            case 182 /* TypeAssertionExpression */:
+            case 201 /* NonNullExpression */:
+            case 183 /* ParenthesizedExpression */:
+            case 184 /* FunctionExpression */:
+            case 197 /* ClassExpression */:
+            case 185 /* ArrowFunction */:
+            case 188 /* VoidExpression */:
+            case 186 /* DeleteExpression */:
+            case 187 /* TypeOfExpression */:
+            case 190 /* PrefixUnaryExpression */:
+            case 191 /* PostfixUnaryExpression */:
+            case 192 /* BinaryExpression */:
+            case 193 /* ConditionalExpression */:
+            case 196 /* SpreadElement */:
+            case 194 /* TemplateExpression */:
             case 12 /* NoSubstitutionTemplateLiteral */:
-            case 194 /* OmittedExpression */:
-            case 242 /* JsxElement */:
-            case 243 /* JsxSelfClosingElement */:
-            case 191 /* YieldExpression */:
-            case 185 /* AwaitExpression */:
+            case 198 /* OmittedExpression */:
+            case 246 /* JsxElement */:
+            case 247 /* JsxSelfClosingElement */:
+            case 195 /* YieldExpression */:
+            case 189 /* AwaitExpression */:
                 return true;
-            case 140 /* QualifiedName */:
-                while (node.parent.kind === 140 /* QualifiedName */) {
+            case 141 /* QualifiedName */:
+                while (node.parent.kind === 141 /* QualifiedName */) {
                     node = node.parent;
                 }
-                return node.parent.kind === 159 /* TypeQuery */ || isJSXTagName(node);
+                return node.parent.kind === 160 /* TypeQuery */ || isJSXTagName(node);
             case 70 /* Identifier */:
-                if (node.parent.kind === 159 /* TypeQuery */ || isJSXTagName(node)) {
+                if (node.parent.kind === 160 /* TypeQuery */ || isJSXTagName(node)) {
                     return true;
                 }
             // fall through
@@ -7208,47 +7480,47 @@ var ts;
             case 98 /* ThisKeyword */:
                 var parent_3 = node.parent;
                 switch (parent_3.kind) {
-                    case 219 /* VariableDeclaration */:
-                    case 143 /* Parameter */:
-                    case 146 /* PropertyDeclaration */:
-                    case 145 /* PropertySignature */:
-                    case 255 /* EnumMember */:
-                    case 253 /* PropertyAssignment */:
-                    case 170 /* BindingElement */:
+                    case 223 /* VariableDeclaration */:
+                    case 144 /* Parameter */:
+                    case 147 /* PropertyDeclaration */:
+                    case 146 /* PropertySignature */:
+                    case 260 /* EnumMember */:
+                    case 257 /* PropertyAssignment */:
+                    case 174 /* BindingElement */:
                         return parent_3.initializer === node;
-                    case 203 /* ExpressionStatement */:
-                    case 204 /* IfStatement */:
-                    case 205 /* DoStatement */:
-                    case 206 /* WhileStatement */:
-                    case 212 /* ReturnStatement */:
-                    case 213 /* WithStatement */:
-                    case 214 /* SwitchStatement */:
-                    case 249 /* CaseClause */:
-                    case 216 /* ThrowStatement */:
-                    case 214 /* SwitchStatement */:
+                    case 207 /* ExpressionStatement */:
+                    case 208 /* IfStatement */:
+                    case 209 /* DoStatement */:
+                    case 210 /* WhileStatement */:
+                    case 216 /* ReturnStatement */:
+                    case 217 /* WithStatement */:
+                    case 218 /* SwitchStatement */:
+                    case 253 /* CaseClause */:
+                    case 220 /* ThrowStatement */:
+                    case 218 /* SwitchStatement */:
                         return parent_3.expression === node;
-                    case 207 /* ForStatement */:
+                    case 211 /* ForStatement */:
                         var forStatement = parent_3;
-                        return (forStatement.initializer === node && forStatement.initializer.kind !== 220 /* VariableDeclarationList */) ||
+                        return (forStatement.initializer === node && forStatement.initializer.kind !== 224 /* VariableDeclarationList */) ||
                             forStatement.condition === node ||
                             forStatement.incrementor === node;
-                    case 208 /* ForInStatement */:
-                    case 209 /* ForOfStatement */:
+                    case 212 /* ForInStatement */:
+                    case 213 /* ForOfStatement */:
                         var forInStatement = parent_3;
-                        return (forInStatement.initializer === node && forInStatement.initializer.kind !== 220 /* VariableDeclarationList */) ||
+                        return (forInStatement.initializer === node && forInStatement.initializer.kind !== 224 /* VariableDeclarationList */) ||
                             forInStatement.expression === node;
-                    case 178 /* TypeAssertionExpression */:
-                    case 196 /* AsExpression */:
+                    case 182 /* TypeAssertionExpression */:
+                    case 200 /* AsExpression */:
                         return node === parent_3.expression;
-                    case 198 /* TemplateSpan */:
+                    case 202 /* TemplateSpan */:
                         return node === parent_3.expression;
-                    case 141 /* ComputedPropertyName */:
+                    case 142 /* ComputedPropertyName */:
                         return node === parent_3.expression;
-                    case 144 /* Decorator */:
-                    case 248 /* JsxExpression */:
-                    case 247 /* JsxSpreadAttribute */:
+                    case 145 /* Decorator */:
+                    case 252 /* JsxExpression */:
+                    case 251 /* JsxSpreadAttribute */:
                         return true;
-                    case 195 /* ExpressionWithTypeArguments */:
+                    case 199 /* ExpressionWithTypeArguments */:
                         return parent_3.expression === node && isExpressionWithTypeArgumentsInClassExtendsClause(parent_3);
                     default:
                         if (isPartOfExpression(parent_3)) {
@@ -7266,7 +7538,7 @@ var ts;
     }
     ts.isInstantiatedModule = isInstantiatedModule;
     function isExternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 230 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 241 /* ExternalModuleReference */;
+        return node.kind === 234 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 245 /* ExternalModuleReference */;
     }
     ts.isExternalModuleImportEqualsDeclaration = isExternalModuleImportEqualsDeclaration;
     function getExternalModuleImportEqualsDeclarationExpression(node) {
@@ -7275,7 +7547,7 @@ var ts;
     }
     ts.getExternalModuleImportEqualsDeclarationExpression = getExternalModuleImportEqualsDeclarationExpression;
     function isInternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 230 /* ImportEqualsDeclaration */ && node.moduleReference.kind !== 241 /* ExternalModuleReference */;
+        return node.kind === 234 /* ImportEqualsDeclaration */ && node.moduleReference.kind !== 245 /* ExternalModuleReference */;
     }
     ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration;
     function isSourceFileJavaScript(file) {
@@ -7283,7 +7555,7 @@ var ts;
     }
     ts.isSourceFileJavaScript = isSourceFileJavaScript;
     function isInJavaScriptFile(node) {
-        return node && !!(node.flags & 1048576 /* JavaScriptFile */);
+        return node && !!(node.flags & 2097152 /* JavaScriptFile */);
     }
     ts.isInJavaScriptFile = isInJavaScriptFile;
     /**
@@ -7293,7 +7565,7 @@ var ts;
     */
     function isRequireCall(expression, checkArgumentIsStringLiteral) {
         // of the form 'require("name")'
-        var isRequire = expression.kind === 175 /* CallExpression */ &&
+        var isRequire = expression.kind === 179 /* CallExpression */ &&
             expression.expression.kind === 70 /* Identifier */ &&
             expression.expression.text === "require" &&
             expression.arguments.length === 1;
@@ -7309,9 +7581,9 @@ var ts;
      * This function does not test if the node is in a JavaScript file or not.
      */
     function isDeclarationOfFunctionExpression(s) {
-        if (s.valueDeclaration && s.valueDeclaration.kind === 219 /* VariableDeclaration */) {
+        if (s.valueDeclaration && s.valueDeclaration.kind === 223 /* VariableDeclaration */) {
             var declaration = s.valueDeclaration;
-            return declaration.initializer && declaration.initializer.kind === 180 /* FunctionExpression */;
+            return declaration.initializer && declaration.initializer.kind === 184 /* FunctionExpression */;
         }
         return false;
     }
@@ -7322,11 +7594,11 @@ var ts;
         if (!isInJavaScriptFile(expression)) {
             return 0 /* None */;
         }
-        if (expression.kind !== 188 /* BinaryExpression */) {
+        if (expression.kind !== 192 /* BinaryExpression */) {
             return 0 /* None */;
         }
         var expr = expression;
-        if (expr.operatorToken.kind !== 57 /* EqualsToken */ || expr.left.kind !== 173 /* PropertyAccessExpression */) {
+        if (expr.operatorToken.kind !== 57 /* EqualsToken */ || expr.left.kind !== 177 /* PropertyAccessExpression */) {
             return 0 /* None */;
         }
         var lhs = expr.left;
@@ -7344,7 +7616,7 @@ var ts;
         else if (lhs.expression.kind === 98 /* ThisKeyword */) {
             return 4 /* ThisProperty */;
         }
-        else if (lhs.expression.kind === 173 /* PropertyAccessExpression */) {
+        else if (lhs.expression.kind === 177 /* PropertyAccessExpression */) {
             // chained dot, e.g. x.y.z = expr; this var is the 'x.y' part
             var innerPropertyAccess = lhs.expression;
             if (innerPropertyAccess.expression.kind === 70 /* Identifier */) {
@@ -7362,35 +7634,35 @@ var ts;
     }
     ts.getSpecialPropertyAssignmentKind = getSpecialPropertyAssignmentKind;
     function getExternalModuleName(node) {
-        if (node.kind === 231 /* ImportDeclaration */) {
+        if (node.kind === 235 /* ImportDeclaration */) {
             return node.moduleSpecifier;
         }
-        if (node.kind === 230 /* ImportEqualsDeclaration */) {
+        if (node.kind === 234 /* ImportEqualsDeclaration */) {
             var reference = node.moduleReference;
-            if (reference.kind === 241 /* ExternalModuleReference */) {
+            if (reference.kind === 245 /* ExternalModuleReference */) {
                 return reference.expression;
             }
         }
-        if (node.kind === 237 /* ExportDeclaration */) {
+        if (node.kind === 241 /* ExportDeclaration */) {
             return node.moduleSpecifier;
         }
-        if (node.kind === 226 /* ModuleDeclaration */ && node.name.kind === 9 /* StringLiteral */) {
+        if (node.kind === 230 /* ModuleDeclaration */ && node.name.kind === 9 /* StringLiteral */) {
             return node.name;
         }
     }
     ts.getExternalModuleName = getExternalModuleName;
     function getNamespaceDeclarationNode(node) {
-        if (node.kind === 230 /* ImportEqualsDeclaration */) {
+        if (node.kind === 234 /* ImportEqualsDeclaration */) {
             return node;
         }
         var importClause = node.importClause;
-        if (importClause && importClause.namedBindings && importClause.namedBindings.kind === 233 /* NamespaceImport */) {
+        if (importClause && importClause.namedBindings && importClause.namedBindings.kind === 237 /* NamespaceImport */) {
             return importClause.namedBindings;
         }
     }
     ts.getNamespaceDeclarationNode = getNamespaceDeclarationNode;
     function isDefaultImport(node) {
-        return node.kind === 231 /* ImportDeclaration */
+        return node.kind === 235 /* ImportDeclaration */
             && node.importClause
             && !!node.importClause.name;
     }
@@ -7398,13 +7670,13 @@ var ts;
     function hasQuestionToken(node) {
         if (node) {
             switch (node.kind) {
-                case 143 /* Parameter */:
-                case 148 /* MethodDeclaration */:
-                case 147 /* MethodSignature */:
-                case 254 /* ShorthandPropertyAssignment */:
-                case 253 /* PropertyAssignment */:
-                case 146 /* PropertyDeclaration */:
-                case 145 /* PropertySignature */:
+                case 144 /* Parameter */:
+                case 149 /* MethodDeclaration */:
+                case 148 /* MethodSignature */:
+                case 258 /* ShorthandPropertyAssignment */:
+                case 257 /* PropertyAssignment */:
+                case 147 /* PropertyDeclaration */:
+                case 146 /* PropertySignature */:
                     return node.questionToken !== undefined;
             }
         }
@@ -7412,9 +7684,9 @@ var ts;
     }
     ts.hasQuestionToken = hasQuestionToken;
     function isJSDocConstructSignature(node) {
-        return node.kind === 269 /* JSDocFunctionType */ &&
+        return node.kind === 274 /* JSDocFunctionType */ &&
             node.parameters.length > 0 &&
-            node.parameters[0].type.kind === 271 /* JSDocConstructorType */;
+            node.parameters[0].type.kind === 276 /* JSDocConstructorType */;
     }
     ts.isJSDocConstructSignature = isJSDocConstructSignature;
     function getJSDocTag(node, kind, checkParentVariableStatement) {
@@ -7474,34 +7746,34 @@ var ts;
             // var x = function(name) { return name.length; }
             var isInitializerOfVariableDeclarationInStatement = isVariableLike(node.parent) &&
                 (node.parent).initializer === node &&
-                node.parent.parent.parent.kind === 201 /* VariableStatement */;
+                node.parent.parent.parent.kind === 205 /* VariableStatement */;
             var isVariableOfVariableDeclarationStatement = isVariableLike(node) &&
-                node.parent.parent.kind === 201 /* VariableStatement */;
+                node.parent.parent.kind === 205 /* VariableStatement */;
             var variableStatementNode = isInitializerOfVariableDeclarationInStatement ? node.parent.parent.parent :
                 isVariableOfVariableDeclarationStatement ? node.parent.parent :
                     undefined;
             if (variableStatementNode) {
                 result = append(result, getJSDocs(variableStatementNode, checkParentVariableStatement, getDocs, getTags));
             }
-            if (node.kind === 226 /* ModuleDeclaration */ &&
-                node.parent && node.parent.kind === 226 /* ModuleDeclaration */) {
+            if (node.kind === 230 /* ModuleDeclaration */ &&
+                node.parent && node.parent.kind === 230 /* ModuleDeclaration */) {
                 result = append(result, getJSDocs(node.parent, checkParentVariableStatement, getDocs, getTags));
             }
             // Also recognize when the node is the RHS of an assignment expression
             var parent_4 = node.parent;
             var isSourceOfAssignmentExpressionStatement = parent_4 && parent_4.parent &&
-                parent_4.kind === 188 /* BinaryExpression */ &&
+                parent_4.kind === 192 /* BinaryExpression */ &&
                 parent_4.operatorToken.kind === 57 /* EqualsToken */ &&
-                parent_4.parent.kind === 203 /* ExpressionStatement */;
+                parent_4.parent.kind === 207 /* ExpressionStatement */;
             if (isSourceOfAssignmentExpressionStatement) {
                 result = append(result, getJSDocs(parent_4.parent, checkParentVariableStatement, getDocs, getTags));
             }
-            var isPropertyAssignmentExpression = parent_4 && parent_4.kind === 253 /* PropertyAssignment */;
+            var isPropertyAssignmentExpression = parent_4 && parent_4.kind === 257 /* PropertyAssignment */;
             if (isPropertyAssignmentExpression) {
                 result = append(result, getJSDocs(parent_4, checkParentVariableStatement, getDocs, getTags));
             }
             // Pull parameter comments from declaring function as well
-            if (node.kind === 143 /* Parameter */) {
+            if (node.kind === 144 /* Parameter */) {
                 var paramTags = getJSDocParameterTag(node, checkParentVariableStatement);
                 if (paramTags) {
                     result = append(result, getTags(paramTags));
@@ -7527,14 +7799,14 @@ var ts;
         if (!param.name) {
             // this is an anonymous jsdoc param from a `function(type1, type2): type3` specification
             var i = func.parameters.indexOf(param);
-            var paramTags = ts.filter(tags, function (tag) { return tag.kind === 275 /* JSDocParameterTag */; });
+            var paramTags = ts.filter(tags, function (tag) { return tag.kind === 280 /* JSDocParameterTag */; });
             if (paramTags && 0 <= i && i < paramTags.length) {
                 return [paramTags[i]];
             }
         }
         else if (param.name.kind === 70 /* Identifier */) {
             var name_6 = param.name.text;
-            var paramTags = ts.filter(tags, function (tag) { return tag.kind === 275 /* JSDocParameterTag */ && tag.parameterName.text === name_6; });
+            var paramTags = ts.filter(tags, function (tag) { return tag.kind === 280 /* JSDocParameterTag */ && tag.parameterName.text === name_6; });
             if (paramTags) {
                 return paramTags;
             }
@@ -7546,15 +7818,15 @@ var ts;
         }
     }
     function getJSDocTypeTag(node) {
-        return getJSDocTag(node, 277 /* JSDocTypeTag */, /*checkParentVariableStatement*/ false);
+        return getJSDocTag(node, 282 /* JSDocTypeTag */, /*checkParentVariableStatement*/ false);
     }
     ts.getJSDocTypeTag = getJSDocTypeTag;
     function getJSDocReturnTag(node) {
-        return getJSDocTag(node, 276 /* JSDocReturnTag */, /*checkParentVariableStatement*/ true);
+        return getJSDocTag(node, 281 /* JSDocReturnTag */, /*checkParentVariableStatement*/ true);
     }
     ts.getJSDocReturnTag = getJSDocReturnTag;
     function getJSDocTemplateTag(node) {
-        return getJSDocTag(node, 278 /* JSDocTemplateTag */, /*checkParentVariableStatement*/ false);
+        return getJSDocTag(node, 283 /* JSDocTemplateTag */, /*checkParentVariableStatement*/ false);
     }
     ts.getJSDocTemplateTag = getJSDocTemplateTag;
     function getCorrespondingJSDocParameterTag(parameter) {
@@ -7568,7 +7840,7 @@ var ts;
             }
             for (var _i = 0, jsDocTags_2 = jsDocTags; _i < jsDocTags_2.length; _i++) {
                 var tag = jsDocTags_2[_i];
-                if (tag.kind === 275 /* JSDocParameterTag */) {
+                if (tag.kind === 280 /* JSDocParameterTag */) {
                     var parameterTag = tag;
                     if (parameterTag.parameterName.text === parameterName) {
                         return parameterTag;
@@ -7588,13 +7860,13 @@ var ts;
     }
     ts.hasDeclaredRestParameter = hasDeclaredRestParameter;
     function isRestParameter(node) {
-        if (node && (node.flags & 1048576 /* JavaScriptFile */)) {
-            if (node.type && node.type.kind === 270 /* JSDocVariadicType */) {
+        if (node && (node.flags & 2097152 /* JavaScriptFile */)) {
+            if (node.type && node.type.kind === 275 /* JSDocVariadicType */) {
                 return true;
             }
             var paramTag = getCorrespondingJSDocParameterTag(node);
             if (paramTag && paramTag.typeExpression) {
-                return paramTag.typeExpression.type.kind === 270 /* JSDocVariadicType */;
+                return paramTag.typeExpression.type.kind === 275 /* JSDocVariadicType */;
             }
         }
         return isDeclaredRestParam(node);
@@ -7604,29 +7876,53 @@ var ts;
         return node && node.dotDotDotToken !== undefined;
     }
     ts.isDeclaredRestParam = isDeclaredRestParam;
+    var AssignmentKind;
+    (function (AssignmentKind) {
+        AssignmentKind[AssignmentKind["None"] = 0] = "None";
+        AssignmentKind[AssignmentKind["Definite"] = 1] = "Definite";
+        AssignmentKind[AssignmentKind["Compound"] = 2] = "Compound";
+    })(AssignmentKind = ts.AssignmentKind || (ts.AssignmentKind = {}));
+    function getAssignmentTargetKind(node) {
+        var parent = node.parent;
+        while (true) {
+            switch (parent.kind) {
+                case 192 /* BinaryExpression */:
+                    var binaryOperator = parent.operatorToken.kind;
+                    return isAssignmentOperator(binaryOperator) && parent.left === node ?
+                        binaryOperator === 57 /* EqualsToken */ ? 1 /* Definite */ : 2 /* Compound */ :
+                        0 /* None */;
+                case 190 /* PrefixUnaryExpression */:
+                case 191 /* PostfixUnaryExpression */:
+                    var unaryOperator = parent.operator;
+                    return unaryOperator === 42 /* PlusPlusToken */ || unaryOperator === 43 /* MinusMinusToken */ ? 2 /* Compound */ : 0 /* None */;
+                case 212 /* ForInStatement */:
+                case 213 /* ForOfStatement */:
+                    return parent.initializer === node ? 1 /* Definite */ : 0 /* None */;
+                case 183 /* ParenthesizedExpression */:
+                case 175 /* ArrayLiteralExpression */:
+                case 196 /* SpreadElement */:
+                    node = parent;
+                    break;
+                case 258 /* ShorthandPropertyAssignment */:
+                    if (parent.name !== node) {
+                        return 0 /* None */;
+                    }
+                // Fall through
+                case 257 /* PropertyAssignment */:
+                    node = parent.parent;
+                    break;
+                default:
+                    return 0 /* None */;
+            }
+            parent = node.parent;
+        }
+    }
+    ts.getAssignmentTargetKind = getAssignmentTargetKind;
     // A node is an assignment target if it is on the left hand side of an '=' token, if it is parented by a property
     // assignment in an object literal that is an assignment target, or if it is parented by an array literal that is
     // an assignment target. Examples include 'a = xxx', '{ p: a } = xxx', '[{ p: a}] = xxx'.
     function isAssignmentTarget(node) {
-        while (node.parent.kind === 179 /* ParenthesizedExpression */) {
-            node = node.parent;
-        }
-        while (true) {
-            var parent_5 = node.parent;
-            if (parent_5.kind === 171 /* ArrayLiteralExpression */ || parent_5.kind === 192 /* SpreadElementExpression */) {
-                node = parent_5;
-                continue;
-            }
-            if (parent_5.kind === 253 /* PropertyAssignment */ || parent_5.kind === 254 /* ShorthandPropertyAssignment */) {
-                node = parent_5.parent;
-                continue;
-            }
-            return parent_5.kind === 188 /* BinaryExpression */ &&
-                isAssignmentOperator(parent_5.operatorToken.kind) &&
-                parent_5.left === node ||
-                (parent_5.kind === 208 /* ForInStatement */ || parent_5.kind === 209 /* ForOfStatement */) &&
-                    parent_5.initializer === node;
-        }
+        return getAssignmentTargetKind(node) !== 0 /* None */;
     }
     ts.isAssignmentTarget = isAssignmentTarget;
     function isNodeDescendantOf(node, ancestor) {
@@ -7640,7 +7936,7 @@ var ts;
     ts.isNodeDescendantOf = isNodeDescendantOf;
     function isInAmbientContext(node) {
         while (node) {
-            if (hasModifier(node, 2 /* Ambient */) || (node.kind === 256 /* SourceFile */ && node.isDeclarationFile)) {
+            if (hasModifier(node, 2 /* Ambient */) || (node.kind === 261 /* SourceFile */ && node.isDeclarationFile)) {
                 return true;
             }
             node = node.parent;
@@ -7654,7 +7950,7 @@ var ts;
             return false;
         }
         var parent = name.parent;
-        if (parent.kind === 235 /* ImportSpecifier */ || parent.kind === 239 /* ExportSpecifier */) {
+        if (parent.kind === 239 /* ImportSpecifier */ || parent.kind === 243 /* ExportSpecifier */) {
             if (parent.propertyName) {
                 return true;
             }
@@ -7667,7 +7963,7 @@ var ts;
     ts.isDeclarationName = isDeclarationName;
     function isLiteralComputedPropertyDeclarationName(node) {
         return (node.kind === 9 /* StringLiteral */ || node.kind === 8 /* NumericLiteral */) &&
-            node.parent.kind === 141 /* ComputedPropertyName */ &&
+            node.parent.kind === 142 /* ComputedPropertyName */ &&
             isDeclaration(node.parent.parent);
     }
     ts.isLiteralComputedPropertyDeclarationName = isLiteralComputedPropertyDeclarationName;
@@ -7675,31 +7971,31 @@ var ts;
     function isIdentifierName(node) {
         var parent = node.parent;
         switch (parent.kind) {
-            case 146 /* PropertyDeclaration */:
-            case 145 /* PropertySignature */:
-            case 148 /* MethodDeclaration */:
-            case 147 /* MethodSignature */:
-            case 150 /* GetAccessor */:
-            case 151 /* SetAccessor */:
-            case 255 /* EnumMember */:
-            case 253 /* PropertyAssignment */:
-            case 173 /* PropertyAccessExpression */:
+            case 147 /* PropertyDeclaration */:
+            case 146 /* PropertySignature */:
+            case 149 /* MethodDeclaration */:
+            case 148 /* MethodSignature */:
+            case 151 /* GetAccessor */:
+            case 152 /* SetAccessor */:
+            case 260 /* EnumMember */:
+            case 257 /* PropertyAssignment */:
+            case 177 /* PropertyAccessExpression */:
                 // Name in member declaration or property name in property access
                 return parent.name === node;
-            case 140 /* QualifiedName */:
+            case 141 /* QualifiedName */:
                 // Name on right hand side of dot in a type query
                 if (parent.right === node) {
-                    while (parent.kind === 140 /* QualifiedName */) {
+                    while (parent.kind === 141 /* QualifiedName */) {
                         parent = parent.parent;
                     }
-                    return parent.kind === 159 /* TypeQuery */;
+                    return parent.kind === 160 /* TypeQuery */;
                 }
                 return false;
-            case 170 /* BindingElement */:
-            case 235 /* ImportSpecifier */:
+            case 174 /* BindingElement */:
+            case 239 /* ImportSpecifier */:
                 // Property name in binding element or import specifier
                 return parent.propertyName === node;
-            case 239 /* ExportSpecifier */:
+            case 243 /* ExportSpecifier */:
                 // Any name in an export specifier
                 return true;
         }
@@ -7715,13 +8011,13 @@ var ts;
     // export = <EntityNameExpression>
     // export default <EntityNameExpression>
     function isAliasSymbolDeclaration(node) {
-        return node.kind === 230 /* ImportEqualsDeclaration */ ||
-            node.kind === 229 /* NamespaceExportDeclaration */ ||
-            node.kind === 232 /* ImportClause */ && !!node.name ||
-            node.kind === 233 /* NamespaceImport */ ||
-            node.kind === 235 /* ImportSpecifier */ ||
-            node.kind === 239 /* ExportSpecifier */ ||
-            node.kind === 236 /* ExportAssignment */ && exportAssignmentIsAlias(node);
+        return node.kind === 234 /* ImportEqualsDeclaration */ ||
+            node.kind === 233 /* NamespaceExportDeclaration */ ||
+            node.kind === 236 /* ImportClause */ && !!node.name ||
+            node.kind === 237 /* NamespaceImport */ ||
+            node.kind === 239 /* ImportSpecifier */ ||
+            node.kind === 243 /* ExportSpecifier */ ||
+            node.kind === 240 /* ExportAssignment */ && exportAssignmentIsAlias(node);
     }
     ts.isAliasSymbolDeclaration = isAliasSymbolDeclaration;
     function exportAssignmentIsAlias(node) {
@@ -7807,7 +8103,7 @@ var ts;
     }
     ts.getFileReferenceFromReferencePath = getFileReferenceFromReferencePath;
     function isKeyword(token) {
-        return 71 /* FirstKeyword */ <= token && token <= 139 /* LastKeyword */;
+        return 71 /* FirstKeyword */ <= token && token <= 140 /* LastKeyword */;
     }
     ts.isKeyword = isKeyword;
     function isTrivia(token) {
@@ -7834,7 +8130,7 @@ var ts;
     }
     ts.hasDynamicName = hasDynamicName;
     function isDynamicName(name) {
-        return name.kind === 141 /* ComputedPropertyName */ &&
+        return name.kind === 142 /* ComputedPropertyName */ &&
             !isStringOrNumericLiteral(name.expression.kind) &&
             !isWellKnownSymbolSyntactically(name.expression);
     }
@@ -7849,10 +8145,10 @@ var ts;
     }
     ts.isWellKnownSymbolSyntactically = isWellKnownSymbolSyntactically;
     function getPropertyNameForPropertyNameNode(name) {
-        if (name.kind === 70 /* Identifier */ || name.kind === 9 /* StringLiteral */ || name.kind === 8 /* NumericLiteral */ || name.kind === 143 /* Parameter */) {
+        if (name.kind === 70 /* Identifier */ || name.kind === 9 /* StringLiteral */ || name.kind === 8 /* NumericLiteral */ || name.kind === 144 /* Parameter */) {
             return name.text;
         }
-        if (name.kind === 141 /* ComputedPropertyName */) {
+        if (name.kind === 142 /* ComputedPropertyName */) {
             var nameExpression = name.expression;
             if (isWellKnownSymbolSyntactically(nameExpression)) {
                 var rightHandSideName = nameExpression.name.text;
@@ -7891,7 +8187,7 @@ var ts;
             case 113 /* PublicKeyword */:
             case 111 /* PrivateKeyword */:
             case 112 /* ProtectedKeyword */:
-            case 129 /* ReadonlyKeyword */:
+            case 130 /* ReadonlyKeyword */:
             case 114 /* StaticKeyword */:
                 return true;
         }
@@ -7900,11 +8196,11 @@ var ts;
     ts.isModifierKind = isModifierKind;
     function isParameterDeclaration(node) {
         var root = getRootDeclaration(node);
-        return root.kind === 143 /* Parameter */;
+        return root.kind === 144 /* Parameter */;
     }
     ts.isParameterDeclaration = isParameterDeclaration;
     function getRootDeclaration(node) {
-        while (node.kind === 170 /* BindingElement */) {
+        while (node.kind === 174 /* BindingElement */) {
             node = node.parent.parent;
         }
         return node;
@@ -7912,15 +8208,15 @@ var ts;
     ts.getRootDeclaration = getRootDeclaration;
     function nodeStartsNewLexicalEnvironment(node) {
         var kind = node.kind;
-        return kind === 149 /* Constructor */
-            || kind === 180 /* FunctionExpression */
-            || kind === 221 /* FunctionDeclaration */
-            || kind === 181 /* ArrowFunction */
-            || kind === 148 /* MethodDeclaration */
-            || kind === 150 /* GetAccessor */
-            || kind === 151 /* SetAccessor */
-            || kind === 226 /* ModuleDeclaration */
-            || kind === 256 /* SourceFile */;
+        return kind === 150 /* Constructor */
+            || kind === 184 /* FunctionExpression */
+            || kind === 225 /* FunctionDeclaration */
+            || kind === 185 /* ArrowFunction */
+            || kind === 149 /* MethodDeclaration */
+            || kind === 151 /* GetAccessor */
+            || kind === 152 /* SetAccessor */
+            || kind === 230 /* ModuleDeclaration */
+            || kind === 261 /* SourceFile */;
     }
     ts.nodeStartsNewLexicalEnvironment = nodeStartsNewLexicalEnvironment;
     function nodeIsSynthesized(node) {
@@ -7928,13 +8224,13 @@ var ts;
             || ts.positionIsSynthesized(node.end);
     }
     ts.nodeIsSynthesized = nodeIsSynthesized;
-    function getOriginalNode(node) {
+    function getOriginalNode(node, nodeTest) {
         if (node) {
             while (node.original !== undefined) {
                 node = node.original;
             }
         }
-        return node;
+        return !nodeTest || nodeTest(node) ? node : undefined;
     }
     ts.getOriginalNode = getOriginalNode;
     /**
@@ -7974,30 +8270,30 @@ var ts;
         return node ? ts.getNodeId(node) : 0;
     }
     ts.getOriginalNodeId = getOriginalNodeId;
+    var Associativity;
     (function (Associativity) {
         Associativity[Associativity["Left"] = 0] = "Left";
         Associativity[Associativity["Right"] = 1] = "Right";
-    })(ts.Associativity || (ts.Associativity = {}));
-    var Associativity = ts.Associativity;
+    })(Associativity = ts.Associativity || (ts.Associativity = {}));
     function getExpressionAssociativity(expression) {
         var operator = getOperator(expression);
-        var hasArguments = expression.kind === 176 /* NewExpression */ && expression.arguments !== undefined;
+        var hasArguments = expression.kind === 180 /* NewExpression */ && expression.arguments !== undefined;
         return getOperatorAssociativity(expression.kind, operator, hasArguments);
     }
     ts.getExpressionAssociativity = getExpressionAssociativity;
     function getOperatorAssociativity(kind, operator, hasArguments) {
         switch (kind) {
-            case 176 /* NewExpression */:
+            case 180 /* NewExpression */:
                 return hasArguments ? 0 /* Left */ : 1 /* Right */;
-            case 186 /* PrefixUnaryExpression */:
-            case 183 /* TypeOfExpression */:
-            case 184 /* VoidExpression */:
-            case 182 /* DeleteExpression */:
-            case 185 /* AwaitExpression */:
-            case 189 /* ConditionalExpression */:
-            case 191 /* YieldExpression */:
+            case 190 /* PrefixUnaryExpression */:
+            case 187 /* TypeOfExpression */:
+            case 188 /* VoidExpression */:
+            case 186 /* DeleteExpression */:
+            case 189 /* AwaitExpression */:
+            case 193 /* ConditionalExpression */:
+            case 195 /* YieldExpression */:
                 return 1 /* Right */;
-            case 188 /* BinaryExpression */:
+            case 192 /* BinaryExpression */:
                 switch (operator) {
                     case 39 /* AsteriskAsteriskToken */:
                     case 57 /* EqualsToken */:
@@ -8021,15 +8317,15 @@ var ts;
     ts.getOperatorAssociativity = getOperatorAssociativity;
     function getExpressionPrecedence(expression) {
         var operator = getOperator(expression);
-        var hasArguments = expression.kind === 176 /* NewExpression */ && expression.arguments !== undefined;
+        var hasArguments = expression.kind === 180 /* NewExpression */ && expression.arguments !== undefined;
         return getOperatorPrecedence(expression.kind, operator, hasArguments);
     }
     ts.getExpressionPrecedence = getExpressionPrecedence;
     function getOperator(expression) {
-        if (expression.kind === 188 /* BinaryExpression */) {
+        if (expression.kind === 192 /* BinaryExpression */) {
             return expression.operatorToken.kind;
         }
-        else if (expression.kind === 186 /* PrefixUnaryExpression */ || expression.kind === 187 /* PostfixUnaryExpression */) {
+        else if (expression.kind === 190 /* PrefixUnaryExpression */ || expression.kind === 191 /* PostfixUnaryExpression */) {
             return expression.operator;
         }
         else {
@@ -8047,36 +8343,36 @@ var ts;
             case 85 /* FalseKeyword */:
             case 8 /* NumericLiteral */:
             case 9 /* StringLiteral */:
-            case 171 /* ArrayLiteralExpression */:
-            case 172 /* ObjectLiteralExpression */:
-            case 180 /* FunctionExpression */:
-            case 181 /* ArrowFunction */:
-            case 193 /* ClassExpression */:
-            case 242 /* JsxElement */:
-            case 243 /* JsxSelfClosingElement */:
+            case 175 /* ArrayLiteralExpression */:
+            case 176 /* ObjectLiteralExpression */:
+            case 184 /* FunctionExpression */:
+            case 185 /* ArrowFunction */:
+            case 197 /* ClassExpression */:
+            case 246 /* JsxElement */:
+            case 247 /* JsxSelfClosingElement */:
             case 11 /* RegularExpressionLiteral */:
             case 12 /* NoSubstitutionTemplateLiteral */:
-            case 190 /* TemplateExpression */:
-            case 179 /* ParenthesizedExpression */:
-            case 194 /* OmittedExpression */:
+            case 194 /* TemplateExpression */:
+            case 183 /* ParenthesizedExpression */:
+            case 198 /* OmittedExpression */:
                 return 19;
-            case 177 /* TaggedTemplateExpression */:
-            case 173 /* PropertyAccessExpression */:
-            case 174 /* ElementAccessExpression */:
+            case 181 /* TaggedTemplateExpression */:
+            case 177 /* PropertyAccessExpression */:
+            case 178 /* ElementAccessExpression */:
                 return 18;
-            case 176 /* NewExpression */:
+            case 180 /* NewExpression */:
                 return hasArguments ? 18 : 17;
-            case 175 /* CallExpression */:
+            case 179 /* CallExpression */:
                 return 17;
-            case 187 /* PostfixUnaryExpression */:
+            case 191 /* PostfixUnaryExpression */:
                 return 16;
-            case 186 /* PrefixUnaryExpression */:
-            case 183 /* TypeOfExpression */:
-            case 184 /* VoidExpression */:
-            case 182 /* DeleteExpression */:
-            case 185 /* AwaitExpression */:
+            case 190 /* PrefixUnaryExpression */:
+            case 187 /* TypeOfExpression */:
+            case 188 /* VoidExpression */:
+            case 186 /* DeleteExpression */:
+            case 189 /* AwaitExpression */:
                 return 15;
-            case 188 /* BinaryExpression */:
+            case 192 /* BinaryExpression */:
                 switch (operatorKind) {
                     case 50 /* ExclamationToken */:
                     case 51 /* TildeToken */:
@@ -8134,11 +8430,11 @@ var ts;
                     default:
                         return -1;
                 }
-            case 189 /* ConditionalExpression */:
+            case 193 /* ConditionalExpression */:
                 return 4;
-            case 191 /* YieldExpression */:
+            case 195 /* YieldExpression */:
                 return 2;
-            case 192 /* SpreadElementExpression */:
+            case 196 /* SpreadElement */:
                 return 1;
             default:
                 return -1;
@@ -8408,21 +8704,36 @@ var ts;
         if (options.outFile || options.out) {
             var moduleKind = ts.getEmitModuleKind(options);
             var moduleEmitEnabled = moduleKind === ts.ModuleKind.AMD || moduleKind === ts.ModuleKind.System;
-            var sourceFiles = host.getSourceFiles();
+            var sourceFiles = getAllEmittableSourceFiles();
             // 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(sourceFiles, moduleEmitEnabled ? isNonDeclarationFile : isBundleEmitNonExternalModule);
         }
         else {
-            var sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
-            return ts.filter(sourceFiles, isNonDeclarationFile);
+            var sourceFiles = targetSourceFile === undefined ? getAllEmittableSourceFiles() : [targetSourceFile];
+            return filterSourceFilesInDirectory(sourceFiles, function (file) { return host.isSourceFileFromExternalLibrary(file); });
+        }
+        function getAllEmittableSourceFiles() {
+            return options.noEmitForJsFiles ? ts.filter(host.getSourceFiles(), function (sourceFile) { return !isSourceFileJavaScript(sourceFile); }) : host.getSourceFiles();
         }
     }
     ts.getSourceFilesToEmit = getSourceFilesToEmit;
+    /** Don't call this for `--outFile`, just for `--outDir` or plain emit. */
+    function filterSourceFilesInDirectory(sourceFiles, isSourceFileFromExternalLibrary) {
+        return ts.filter(sourceFiles, function (file) { return shouldEmitInDirectory(file, isSourceFileFromExternalLibrary); });
+    }
+    ts.filterSourceFilesInDirectory = filterSourceFilesInDirectory;
     function isNonDeclarationFile(sourceFile) {
         return !isDeclarationFile(sourceFile);
     }
+    /**
+     * Whether a file should be emitted in a non-`--outFile` case.
+     * Don't emit if source file is a declaration file, or was located under node_modules
+     */
+    function shouldEmitInDirectory(sourceFile, isSourceFileFromExternalLibrary) {
+        return isNonDeclarationFile(sourceFile) && !isSourceFileFromExternalLibrary(sourceFile);
+    }
     function isBundleEmitNonExternalModule(sourceFile) {
-        return !isDeclarationFile(sourceFile) && !ts.isExternalModule(sourceFile);
+        return isNonDeclarationFile(sourceFile) && !ts.isExternalModule(sourceFile);
     }
     /**
      * Iterates over each source file to emit. The source files are expected to have been
@@ -8500,11 +8811,10 @@ var ts;
             onBundledEmit(host);
         }
         else {
-            var sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
+            var sourceFiles = targetSourceFile === undefined ? getSourceFilesToEmit(host) : [targetSourceFile];
             for (var _i = 0, sourceFiles_3 = sourceFiles; _i < sourceFiles_3.length; _i++) {
                 var sourceFile = sourceFiles_3[_i];
-                // Don't emit if source file is a declaration file, or was located under node_modules
-                if (!isDeclarationFile(sourceFile) && !host.isSourceFileFromExternalLibrary(sourceFile)) {
+                if (shouldEmitInDirectory(sourceFile, function (file) { return host.isSourceFileFromExternalLibrary(file); })) {
                     onSingleFileEmit(host, sourceFile);
                 }
             }
@@ -8537,7 +8847,7 @@ var ts;
         function onBundledEmit(host) {
             // Can emit only sources that are not declaration file and are either non module code or module with
             // --module or --target es6 specified. Files included by searching under node_modules are also not emitted.
-            var bundledSources = ts.filter(host.getSourceFiles(), function (sourceFile) { return !isDeclarationFile(sourceFile) &&
+            var bundledSources = ts.filter(getSourceFilesToEmit(host), function (sourceFile) { return !isDeclarationFile(sourceFile) &&
                 !host.isSourceFileFromExternalLibrary(sourceFile) &&
                 (!ts.isExternalModule(sourceFile) ||
                     !!ts.getEmitModuleKind(options)); });
@@ -8577,7 +8887,7 @@ var ts;
     ts.getLineOfLocalPositionFromLineMap = getLineOfLocalPositionFromLineMap;
     function getFirstConstructorWithBody(node) {
         return ts.forEach(node.members, function (member) {
-            if (member.kind === 149 /* Constructor */ && nodeIsPresent(member.body)) {
+            if (member.kind === 150 /* Constructor */ && nodeIsPresent(member.body)) {
                 return member;
             }
         });
@@ -8619,10 +8929,10 @@ var ts;
         var setAccessor;
         if (hasDynamicName(accessor)) {
             firstAccessor = accessor;
-            if (accessor.kind === 150 /* GetAccessor */) {
+            if (accessor.kind === 151 /* GetAccessor */) {
                 getAccessor = accessor;
             }
-            else if (accessor.kind === 151 /* SetAccessor */) {
+            else if (accessor.kind === 152 /* SetAccessor */) {
                 setAccessor = accessor;
             }
             else {
@@ -8631,7 +8941,7 @@ var ts;
         }
         else {
             ts.forEach(declarations, function (member) {
-                if ((member.kind === 150 /* GetAccessor */ || member.kind === 151 /* SetAccessor */)
+                if ((member.kind === 151 /* GetAccessor */ || member.kind === 152 /* SetAccessor */)
                     && hasModifier(member, 32 /* Static */) === hasModifier(accessor, 32 /* Static */)) {
                     var memberName = getPropertyNameForPropertyNameNode(member.name);
                     var accessorName = getPropertyNameForPropertyNameNode(accessor.name);
@@ -8642,10 +8952,10 @@ var ts;
                         else if (!secondAccessor) {
                             secondAccessor = member;
                         }
-                        if (member.kind === 150 /* GetAccessor */ && !getAccessor) {
+                        if (member.kind === 151 /* GetAccessor */ && !getAccessor) {
                             getAccessor = member;
                         }
-                        if (member.kind === 151 /* SetAccessor */ && !setAccessor) {
+                        if (member.kind === 152 /* SetAccessor */ && !setAccessor) {
                             setAccessor = member;
                         }
                     }
@@ -8872,7 +9182,7 @@ var ts;
                 flags |= modifierToFlag(modifier.kind);
             }
         }
-        if (node.flags & 4 /* NestedNamespace */) {
+        if (node.flags & 4 /* NestedNamespace */ || (node.kind === 70 /* Identifier */ && node.isInJSDocNamespace)) {
             flags |= 1 /* Export */;
         }
         node.modifierFlagsCache = flags | 536870912 /* HasComputedFlags */;
@@ -8891,7 +9201,7 @@ var ts;
             case 75 /* ConstKeyword */: return 2048 /* Const */;
             case 78 /* DefaultKeyword */: return 512 /* Default */;
             case 119 /* AsyncKeyword */: return 256 /* Async */;
-            case 129 /* ReadonlyKeyword */: return 64 /* Readonly */;
+            case 130 /* ReadonlyKeyword */: return 64 /* Readonly */;
         }
         return 0 /* None */;
     }
@@ -8908,19 +9218,25 @@ var ts;
     ts.isAssignmentOperator = isAssignmentOperator;
     /** Get `C` given `N` if `N` is in the position `class C extends N` where `N` is an ExpressionWithTypeArguments. */
     function tryGetClassExtendingExpressionWithTypeArguments(node) {
-        if (node.kind === 195 /* ExpressionWithTypeArguments */ &&
+        if (node.kind === 199 /* ExpressionWithTypeArguments */ &&
             node.parent.token === 84 /* ExtendsKeyword */ &&
             isClassLike(node.parent.parent)) {
             return node.parent.parent;
         }
     }
     ts.tryGetClassExtendingExpressionWithTypeArguments = tryGetClassExtendingExpressionWithTypeArguments;
+    function isAssignmentExpression(node) {
+        return isBinaryExpression(node)
+            && isAssignmentOperator(node.operatorToken.kind)
+            && isLeftHandSideExpression(node.left);
+    }
+    ts.isAssignmentExpression = isAssignmentExpression;
     function isDestructuringAssignment(node) {
         if (isBinaryExpression(node)) {
             if (node.operatorToken.kind === 57 /* EqualsToken */) {
                 var kind = node.left.kind;
-                return kind === 172 /* ObjectLiteralExpression */
-                    || kind === 171 /* ArrayLiteralExpression */;
+                return kind === 176 /* ObjectLiteralExpression */
+                    || kind === 175 /* ArrayLiteralExpression */;
             }
         }
         return false;
@@ -8949,20 +9265,20 @@ var ts;
     ts.isExpressionWithTypeArgumentsInClassExtendsClause = isExpressionWithTypeArgumentsInClassExtendsClause;
     function isEntityNameExpression(node) {
         return node.kind === 70 /* Identifier */ ||
-            node.kind === 173 /* PropertyAccessExpression */ && isEntityNameExpression(node.expression);
+            node.kind === 177 /* PropertyAccessExpression */ && isEntityNameExpression(node.expression);
     }
     ts.isEntityNameExpression = isEntityNameExpression;
     function isRightSideOfQualifiedNameOrPropertyAccess(node) {
-        return (node.parent.kind === 140 /* QualifiedName */ && node.parent.right === node) ||
-            (node.parent.kind === 173 /* PropertyAccessExpression */ && node.parent.name === node);
+        return (node.parent.kind === 141 /* QualifiedName */ && node.parent.right === node) ||
+            (node.parent.kind === 177 /* PropertyAccessExpression */ && node.parent.name === node);
     }
     ts.isRightSideOfQualifiedNameOrPropertyAccess = isRightSideOfQualifiedNameOrPropertyAccess;
     function isEmptyObjectLiteralOrArrayLiteral(expression) {
         var kind = expression.kind;
-        if (kind === 172 /* ObjectLiteralExpression */) {
+        if (kind === 176 /* ObjectLiteralExpression */) {
             return expression.properties.length === 0;
         }
-        if (kind === 171 /* ArrayLiteralExpression */) {
+        if (kind === 175 /* ArrayLiteralExpression */) {
             return expression.elements.length === 0;
         }
         return false;
@@ -9124,39 +9440,39 @@ var ts;
                 || kind === 94 /* NullKeyword */) {
                 return true;
             }
-            else if (kind === 173 /* PropertyAccessExpression */) {
+            else if (kind === 177 /* PropertyAccessExpression */) {
                 return isSimpleExpressionWorker(node.expression, depth + 1);
             }
-            else if (kind === 174 /* ElementAccessExpression */) {
+            else if (kind === 178 /* ElementAccessExpression */) {
                 return isSimpleExpressionWorker(node.expression, depth + 1)
                     && isSimpleExpressionWorker(node.argumentExpression, depth + 1);
             }
-            else if (kind === 186 /* PrefixUnaryExpression */
-                || kind === 187 /* PostfixUnaryExpression */) {
+            else if (kind === 190 /* PrefixUnaryExpression */
+                || kind === 191 /* PostfixUnaryExpression */) {
                 return isSimpleExpressionWorker(node.operand, depth + 1);
             }
-            else if (kind === 188 /* BinaryExpression */) {
+            else if (kind === 192 /* BinaryExpression */) {
                 return node.operatorToken.kind !== 39 /* AsteriskAsteriskToken */
                     && isSimpleExpressionWorker(node.left, depth + 1)
                     && isSimpleExpressionWorker(node.right, depth + 1);
             }
-            else if (kind === 189 /* ConditionalExpression */) {
+            else if (kind === 193 /* ConditionalExpression */) {
                 return isSimpleExpressionWorker(node.condition, depth + 1)
                     && isSimpleExpressionWorker(node.whenTrue, depth + 1)
                     && isSimpleExpressionWorker(node.whenFalse, depth + 1);
             }
-            else if (kind === 184 /* VoidExpression */
-                || kind === 183 /* TypeOfExpression */
-                || kind === 182 /* DeleteExpression */) {
+            else if (kind === 188 /* VoidExpression */
+                || kind === 187 /* TypeOfExpression */
+                || kind === 186 /* DeleteExpression */) {
                 return isSimpleExpressionWorker(node.expression, depth + 1);
             }
-            else if (kind === 171 /* ArrayLiteralExpression */) {
+            else if (kind === 175 /* ArrayLiteralExpression */) {
                 return node.elements.length === 0;
             }
-            else if (kind === 172 /* ObjectLiteralExpression */) {
+            else if (kind === 176 /* ObjectLiteralExpression */) {
                 return node.properties.length === 0;
             }
-            else if (kind === 175 /* CallExpression */) {
+            else if (kind === 179 /* CallExpression */) {
                 if (!isSimpleExpressionWorker(node.expression, depth + 1)) {
                     return false;
                 }
@@ -9315,28 +9631,31 @@ var ts;
         return ts.positionIsSynthesized(range.pos) ? -1 : ts.skipTrivia(sourceFile.text, range.pos);
     }
     ts.getStartPositionOfRange = getStartPositionOfRange;
-    function collectExternalModuleInfo(sourceFile) {
+    function collectExternalModuleInfo(sourceFile, resolver) {
         var externalImports = [];
         var exportSpecifiers = ts.createMap();
+        var exportedBindings = ts.createMap();
+        var uniqueExports = ts.createMap();
+        var hasExportDefault = false;
         var exportEquals = undefined;
         var hasExportStarsToExportValues = false;
         for (var _i = 0, _a = sourceFile.statements; _i < _a.length; _i++) {
             var node = _a[_i];
             switch (node.kind) {
-                case 231 /* ImportDeclaration */:
+                case 235 /* ImportDeclaration */:
                     // import "mod"
                     // import x from "mod"
                     // import * as x from "mod"
                     // import { x, y } from "mod"
                     externalImports.push(node);
                     break;
-                case 230 /* ImportEqualsDeclaration */:
-                    if (node.moduleReference.kind === 241 /* ExternalModuleReference */) {
+                case 234 /* ImportEqualsDeclaration */:
+                    if (node.moduleReference.kind === 245 /* ExternalModuleReference */) {
                         // import x = require("mod")
                         externalImports.push(node);
                     }
                     break;
-                case 237 /* ExportDeclaration */:
+                case 241 /* ExportDeclaration */:
                     if (node.moduleSpecifier) {
                         if (!node.exportClause) {
                             // export * from "mod"
@@ -9352,22 +9671,111 @@ var ts;
                         // export { x, y }
                         for (var _b = 0, _c = node.exportClause.elements; _b < _c.length; _b++) {
                             var specifier = _c[_b];
-                            var name_8 = (specifier.propertyName || specifier.name).text;
-                            (exportSpecifiers[name_8] || (exportSpecifiers[name_8] = [])).push(specifier);
+                            if (!uniqueExports[specifier.name.text]) {
+                                var name_8 = specifier.propertyName || specifier.name;
+                                ts.multiMapAdd(exportSpecifiers, name_8.text, specifier);
+                                var decl = resolver.getReferencedImportDeclaration(name_8)
+                                    || resolver.getReferencedValueDeclaration(name_8);
+                                if (decl) {
+                                    ts.multiMapAdd(exportedBindings, getOriginalNodeId(decl), specifier.name);
+                                }
+                                uniqueExports[specifier.name.text] = specifier.name;
+                            }
                         }
                     }
                     break;
-                case 236 /* ExportAssignment */:
+                case 240 /* ExportAssignment */:
                     if (node.isExportEquals && !exportEquals) {
                         // export = x
                         exportEquals = node;
                     }
                     break;
+                case 205 /* VariableStatement */:
+                    if (hasModifier(node, 1 /* Export */)) {
+                        for (var _d = 0, _e = node.declarationList.declarations; _d < _e.length; _d++) {
+                            var decl = _e[_d];
+                            collectExportedVariableInfo(decl, uniqueExports);
+                        }
+                    }
+                    break;
+                case 225 /* FunctionDeclaration */:
+                    if (hasModifier(node, 1 /* Export */)) {
+                        if (hasModifier(node, 512 /* Default */)) {
+                            // export default function() { }
+                            if (!hasExportDefault) {
+                                ts.multiMapAdd(exportedBindings, getOriginalNodeId(node), ts.getDeclarationName(node));
+                                hasExportDefault = true;
+                            }
+                        }
+                        else {
+                            // export function x() { }
+                            var name_9 = node.name;
+                            if (!uniqueExports[name_9.text]) {
+                                ts.multiMapAdd(exportedBindings, getOriginalNodeId(node), name_9);
+                                uniqueExports[name_9.text] = name_9;
+                            }
+                        }
+                    }
+                    break;
+                case 226 /* ClassDeclaration */:
+                    if (hasModifier(node, 1 /* Export */)) {
+                        if (hasModifier(node, 512 /* Default */)) {
+                            // export default class { }
+                            if (!hasExportDefault) {
+                                ts.multiMapAdd(exportedBindings, getOriginalNodeId(node), ts.getDeclarationName(node));
+                                hasExportDefault = true;
+                            }
+                        }
+                        else {
+                            // export class x { }
+                            var name_10 = node.name;
+                            if (!uniqueExports[name_10.text]) {
+                                ts.multiMapAdd(exportedBindings, getOriginalNodeId(node), name_10);
+                                uniqueExports[name_10.text] = name_10;
+                            }
+                        }
+                    }
+                    break;
             }
         }
-        return { externalImports: externalImports, exportSpecifiers: exportSpecifiers, exportEquals: exportEquals, hasExportStarsToExportValues: hasExportStarsToExportValues };
+        var exportedNames;
+        for (var key in uniqueExports) {
+            exportedNames = ts.append(exportedNames, uniqueExports[key]);
+        }
+        return { externalImports: externalImports, exportSpecifiers: exportSpecifiers, exportEquals: exportEquals, hasExportStarsToExportValues: hasExportStarsToExportValues, exportedBindings: exportedBindings, exportedNames: exportedNames };
     }
     ts.collectExternalModuleInfo = collectExternalModuleInfo;
+    function collectExportedVariableInfo(decl, uniqueExports) {
+        if (isBindingPattern(decl.name)) {
+            for (var _i = 0, _a = decl.name.elements; _i < _a.length; _i++) {
+                var element = _a[_i];
+                if (!isOmittedExpression(element)) {
+                    collectExportedVariableInfo(element, uniqueExports);
+                }
+            }
+        }
+        else if (!isGeneratedIdentifier(decl.name)) {
+            if (!uniqueExports[decl.name.text]) {
+                uniqueExports[decl.name.text] = decl.name;
+            }
+        }
+    }
+    /**
+     * Determines whether a name was originally the declaration name of an enum or namespace
+     * declaration.
+     */
+    function isDeclarationNameOfEnumOrNamespace(node) {
+        var parseNode = getParseTreeNode(node);
+        if (parseNode) {
+            switch (parseNode.parent.kind) {
+                case 229 /* EnumDeclaration */:
+                case 230 /* ModuleDeclaration */:
+                    return parseNode === parseNode.parent.name;
+            }
+        }
+        return false;
+    }
+    ts.isDeclarationNameOfEnumOrNamespace = isDeclarationNameOfEnumOrNamespace;
     function getInitializedVariables(node) {
         return ts.filter(node.declarations, isInitializedVariable);
     }
@@ -9382,7 +9790,7 @@ var ts;
         if (node.symbol) {
             for (var _i = 0, _a = node.symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 222 /* ClassDeclaration */ && declaration !== node) {
+                if (declaration.kind === 226 /* ClassDeclaration */ && declaration !== node) {
                     return true;
                 }
             }
@@ -9459,16 +9867,16 @@ var ts;
     ts.isModifier = isModifier;
     // Names
     function isQualifiedName(node) {
-        return node.kind === 140 /* QualifiedName */;
+        return node.kind === 141 /* QualifiedName */;
     }
     ts.isQualifiedName = isQualifiedName;
     function isComputedPropertyName(node) {
-        return node.kind === 141 /* ComputedPropertyName */;
+        return node.kind === 142 /* ComputedPropertyName */;
     }
     ts.isComputedPropertyName = isComputedPropertyName;
     function isEntityName(node) {
         var kind = node.kind;
-        return kind === 140 /* QualifiedName */
+        return kind === 141 /* QualifiedName */
             || kind === 70 /* Identifier */;
     }
     ts.isEntityName = isEntityName;
@@ -9477,7 +9885,7 @@ var ts;
         return kind === 70 /* Identifier */
             || kind === 9 /* StringLiteral */
             || kind === 8 /* NumericLiteral */
-            || kind === 141 /* ComputedPropertyName */;
+            || kind === 142 /* ComputedPropertyName */;
     }
     ts.isPropertyName = isPropertyName;
     function isModuleName(node) {
@@ -9489,60 +9897,61 @@ var ts;
     function isBindingName(node) {
         var kind = node.kind;
         return kind === 70 /* Identifier */
-            || kind === 168 /* ObjectBindingPattern */
-            || kind === 169 /* ArrayBindingPattern */;
+            || kind === 172 /* ObjectBindingPattern */
+            || kind === 173 /* ArrayBindingPattern */;
     }
     ts.isBindingName = isBindingName;
     // Signature elements
     function isTypeParameter(node) {
-        return node.kind === 142 /* TypeParameter */;
+        return node.kind === 143 /* TypeParameter */;
     }
     ts.isTypeParameter = isTypeParameter;
     function isParameter(node) {
-        return node.kind === 143 /* Parameter */;
+        return node.kind === 144 /* Parameter */;
     }
     ts.isParameter = isParameter;
     function isDecorator(node) {
-        return node.kind === 144 /* Decorator */;
+        return node.kind === 145 /* Decorator */;
     }
     ts.isDecorator = isDecorator;
     // Type members
     function isMethodDeclaration(node) {
-        return node.kind === 148 /* MethodDeclaration */;
+        return node.kind === 149 /* MethodDeclaration */;
     }
     ts.isMethodDeclaration = isMethodDeclaration;
     function isClassElement(node) {
         var kind = node.kind;
-        return kind === 149 /* Constructor */
-            || kind === 146 /* PropertyDeclaration */
-            || kind === 148 /* MethodDeclaration */
-            || kind === 150 /* GetAccessor */
-            || kind === 151 /* SetAccessor */
-            || kind === 154 /* IndexSignature */
-            || kind === 199 /* SemicolonClassElement */;
+        return kind === 150 /* Constructor */
+            || kind === 147 /* PropertyDeclaration */
+            || kind === 149 /* MethodDeclaration */
+            || kind === 151 /* GetAccessor */
+            || kind === 152 /* SetAccessor */
+            || kind === 155 /* IndexSignature */
+            || kind === 203 /* SemicolonClassElement */;
     }
     ts.isClassElement = isClassElement;
     function isObjectLiteralElementLike(node) {
         var kind = node.kind;
-        return kind === 253 /* PropertyAssignment */
-            || kind === 254 /* ShorthandPropertyAssignment */
-            || kind === 148 /* MethodDeclaration */
-            || kind === 150 /* GetAccessor */
-            || kind === 151 /* SetAccessor */
-            || kind === 240 /* MissingDeclaration */;
+        return kind === 257 /* PropertyAssignment */
+            || kind === 258 /* ShorthandPropertyAssignment */
+            || kind === 259 /* SpreadAssignment */
+            || kind === 149 /* MethodDeclaration */
+            || kind === 151 /* GetAccessor */
+            || kind === 152 /* SetAccessor */
+            || kind === 244 /* MissingDeclaration */;
     }
     ts.isObjectLiteralElementLike = isObjectLiteralElementLike;
     // Type
     function isTypeNodeKind(kind) {
-        return (kind >= 155 /* FirstTypeNode */ && kind <= 167 /* LastTypeNode */)
+        return (kind >= 156 /* FirstTypeNode */ && kind <= 171 /* LastTypeNode */)
             || kind === 118 /* AnyKeyword */
-            || kind === 131 /* NumberKeyword */
+            || kind === 132 /* NumberKeyword */
             || kind === 121 /* BooleanKeyword */
-            || kind === 133 /* StringKeyword */
-            || kind === 134 /* SymbolKeyword */
+            || kind === 134 /* StringKeyword */
+            || kind === 135 /* SymbolKeyword */
             || kind === 104 /* VoidKeyword */
-            || kind === 128 /* NeverKeyword */
-            || kind === 195 /* ExpressionWithTypeArguments */;
+            || kind === 129 /* NeverKeyword */
+            || kind === 199 /* ExpressionWithTypeArguments */;
     }
     /**
      * Node test that determines whether a node is a valid type node.
@@ -9557,95 +9966,103 @@ var ts;
     function isBindingPattern(node) {
         if (node) {
             var kind = node.kind;
-            return kind === 169 /* ArrayBindingPattern */
-                || kind === 168 /* ObjectBindingPattern */;
+            return kind === 173 /* ArrayBindingPattern */
+                || kind === 172 /* ObjectBindingPattern */;
         }
         return false;
     }
     ts.isBindingPattern = isBindingPattern;
     function isBindingElement(node) {
-        return node.kind === 170 /* BindingElement */;
+        return node.kind === 174 /* BindingElement */;
     }
     ts.isBindingElement = isBindingElement;
     function isArrayBindingElement(node) {
         var kind = node.kind;
-        return kind === 170 /* BindingElement */
-            || kind === 194 /* OmittedExpression */;
+        return kind === 174 /* BindingElement */
+            || kind === 198 /* OmittedExpression */;
     }
     ts.isArrayBindingElement = isArrayBindingElement;
     // Expression
+    function isArrayLiteralExpression(node) {
+        return node.kind === 175 /* ArrayLiteralExpression */;
+    }
+    ts.isArrayLiteralExpression = isArrayLiteralExpression;
+    function isObjectLiteralExpression(node) {
+        return node.kind === 176 /* ObjectLiteralExpression */;
+    }
+    ts.isObjectLiteralExpression = isObjectLiteralExpression;
     function isPropertyAccessExpression(node) {
-        return node.kind === 173 /* PropertyAccessExpression */;
+        return node.kind === 177 /* PropertyAccessExpression */;
     }
     ts.isPropertyAccessExpression = isPropertyAccessExpression;
     function isElementAccessExpression(node) {
-        return node.kind === 174 /* ElementAccessExpression */;
+        return node.kind === 178 /* ElementAccessExpression */;
     }
     ts.isElementAccessExpression = isElementAccessExpression;
     function isBinaryExpression(node) {
-        return node.kind === 188 /* BinaryExpression */;
+        return node.kind === 192 /* BinaryExpression */;
     }
     ts.isBinaryExpression = isBinaryExpression;
     function isConditionalExpression(node) {
-        return node.kind === 189 /* ConditionalExpression */;
+        return node.kind === 193 /* ConditionalExpression */;
     }
     ts.isConditionalExpression = isConditionalExpression;
     function isCallExpression(node) {
-        return node.kind === 175 /* CallExpression */;
+        return node.kind === 179 /* CallExpression */;
     }
     ts.isCallExpression = isCallExpression;
     function isTemplateLiteral(node) {
         var kind = node.kind;
-        return kind === 190 /* TemplateExpression */
+        return kind === 194 /* TemplateExpression */
             || kind === 12 /* NoSubstitutionTemplateLiteral */;
     }
     ts.isTemplateLiteral = isTemplateLiteral;
-    function isSpreadElementExpression(node) {
-        return node.kind === 192 /* SpreadElementExpression */;
+    function isSpreadExpression(node) {
+        return node.kind === 196 /* SpreadElement */;
     }
-    ts.isSpreadElementExpression = isSpreadElementExpression;
+    ts.isSpreadExpression = isSpreadExpression;
     function isExpressionWithTypeArguments(node) {
-        return node.kind === 195 /* ExpressionWithTypeArguments */;
+        return node.kind === 199 /* ExpressionWithTypeArguments */;
     }
     ts.isExpressionWithTypeArguments = isExpressionWithTypeArguments;
     function isLeftHandSideExpressionKind(kind) {
-        return kind === 173 /* PropertyAccessExpression */
-            || kind === 174 /* ElementAccessExpression */
-            || kind === 176 /* NewExpression */
-            || kind === 175 /* CallExpression */
-            || kind === 242 /* JsxElement */
-            || kind === 243 /* JsxSelfClosingElement */
-            || kind === 177 /* TaggedTemplateExpression */
-            || kind === 171 /* ArrayLiteralExpression */
-            || kind === 179 /* ParenthesizedExpression */
-            || kind === 172 /* ObjectLiteralExpression */
-            || kind === 193 /* ClassExpression */
-            || kind === 180 /* FunctionExpression */
+        return kind === 177 /* PropertyAccessExpression */
+            || kind === 178 /* ElementAccessExpression */
+            || kind === 180 /* NewExpression */
+            || kind === 179 /* CallExpression */
+            || kind === 246 /* JsxElement */
+            || kind === 247 /* JsxSelfClosingElement */
+            || kind === 181 /* TaggedTemplateExpression */
+            || kind === 175 /* ArrayLiteralExpression */
+            || kind === 183 /* ParenthesizedExpression */
+            || kind === 176 /* ObjectLiteralExpression */
+            || kind === 197 /* ClassExpression */
+            || kind === 184 /* FunctionExpression */
             || kind === 70 /* Identifier */
             || kind === 11 /* RegularExpressionLiteral */
             || kind === 8 /* NumericLiteral */
             || kind === 9 /* StringLiteral */
             || kind === 12 /* NoSubstitutionTemplateLiteral */
-            || kind === 190 /* TemplateExpression */
+            || kind === 194 /* TemplateExpression */
             || kind === 85 /* FalseKeyword */
             || kind === 94 /* NullKeyword */
             || kind === 98 /* ThisKeyword */
             || kind === 100 /* TrueKeyword */
             || kind === 96 /* SuperKeyword */
-            || kind === 197 /* NonNullExpression */;
+            || kind === 201 /* NonNullExpression */;
     }
     function isLeftHandSideExpression(node) {
         return isLeftHandSideExpressionKind(ts.skipPartiallyEmittedExpressions(node).kind);
     }
     ts.isLeftHandSideExpression = isLeftHandSideExpression;
     function isUnaryExpressionKind(kind) {
-        return kind === 186 /* PrefixUnaryExpression */
-            || kind === 187 /* PostfixUnaryExpression */
-            || kind === 182 /* DeleteExpression */
-            || kind === 183 /* TypeOfExpression */
-            || kind === 184 /* VoidExpression */
-            || kind === 185 /* AwaitExpression */
-            || kind === 178 /* TypeAssertionExpression */
+        return kind === 190 /* PrefixUnaryExpression */
+            || kind === 191 /* PostfixUnaryExpression */
+            || kind === 186 /* DeleteExpression */
+            || kind === 187 /* TypeOfExpression */
+            || kind === 188 /* VoidExpression */
+            || kind === 189 /* AwaitExpression */
+            || kind === 182 /* TypeAssertionExpression */
             || isLeftHandSideExpressionKind(kind);
     }
     function isUnaryExpression(node) {
@@ -9653,13 +10070,13 @@ var ts;
     }
     ts.isUnaryExpression = isUnaryExpression;
     function isExpressionKind(kind) {
-        return kind === 189 /* ConditionalExpression */
-            || kind === 191 /* YieldExpression */
-            || kind === 181 /* ArrowFunction */
-            || kind === 188 /* BinaryExpression */
-            || kind === 192 /* SpreadElementExpression */
-            || kind === 196 /* AsExpression */
-            || kind === 194 /* OmittedExpression */
+        return kind === 193 /* ConditionalExpression */
+            || kind === 195 /* YieldExpression */
+            || kind === 185 /* ArrowFunction */
+            || kind === 192 /* BinaryExpression */
+            || kind === 196 /* SpreadElement */
+            || kind === 200 /* AsExpression */
+            || kind === 198 /* OmittedExpression */
             || isUnaryExpressionKind(kind);
     }
     function isExpression(node) {
@@ -9668,16 +10085,16 @@ var ts;
     ts.isExpression = isExpression;
     function isAssertionExpression(node) {
         var kind = node.kind;
-        return kind === 178 /* TypeAssertionExpression */
-            || kind === 196 /* AsExpression */;
+        return kind === 182 /* TypeAssertionExpression */
+            || kind === 200 /* AsExpression */;
     }
     ts.isAssertionExpression = isAssertionExpression;
     function isPartiallyEmittedExpression(node) {
-        return node.kind === 288 /* PartiallyEmittedExpression */;
+        return node.kind === 293 /* PartiallyEmittedExpression */;
     }
     ts.isPartiallyEmittedExpression = isPartiallyEmittedExpression;
     function isNotEmittedStatement(node) {
-        return node.kind === 287 /* NotEmittedStatement */;
+        return node.kind === 292 /* NotEmittedStatement */;
     }
     ts.isNotEmittedStatement = isNotEmittedStatement;
     function isNotEmittedOrPartiallyEmittedNode(node) {
@@ -9686,17 +10103,17 @@ var ts;
     }
     ts.isNotEmittedOrPartiallyEmittedNode = isNotEmittedOrPartiallyEmittedNode;
     function isOmittedExpression(node) {
-        return node.kind === 194 /* OmittedExpression */;
+        return node.kind === 198 /* OmittedExpression */;
     }
     ts.isOmittedExpression = isOmittedExpression;
     // Misc
     function isTemplateSpan(node) {
-        return node.kind === 198 /* TemplateSpan */;
+        return node.kind === 202 /* TemplateSpan */;
     }
     ts.isTemplateSpan = isTemplateSpan;
     // Element
     function isBlock(node) {
-        return node.kind === 200 /* Block */;
+        return node.kind === 204 /* Block */;
     }
     ts.isBlock = isBlock;
     function isConciseBody(node) {
@@ -9714,119 +10131,121 @@ var ts;
     }
     ts.isForInitializer = isForInitializer;
     function isVariableDeclaration(node) {
-        return node.kind === 219 /* VariableDeclaration */;
+        return node.kind === 223 /* VariableDeclaration */;
     }
     ts.isVariableDeclaration = isVariableDeclaration;
     function isVariableDeclarationList(node) {
-        return node.kind === 220 /* VariableDeclarationList */;
+        return node.kind === 224 /* VariableDeclarationList */;
     }
     ts.isVariableDeclarationList = isVariableDeclarationList;
     function isCaseBlock(node) {
-        return node.kind === 228 /* CaseBlock */;
+        return node.kind === 232 /* CaseBlock */;
     }
     ts.isCaseBlock = isCaseBlock;
     function isModuleBody(node) {
         var kind = node.kind;
-        return kind === 227 /* ModuleBlock */
-            || kind === 226 /* ModuleDeclaration */;
+        return kind === 231 /* ModuleBlock */
+            || kind === 230 /* ModuleDeclaration */;
     }
     ts.isModuleBody = isModuleBody;
     function isImportEqualsDeclaration(node) {
-        return node.kind === 230 /* ImportEqualsDeclaration */;
+        return node.kind === 234 /* ImportEqualsDeclaration */;
     }
     ts.isImportEqualsDeclaration = isImportEqualsDeclaration;
     function isImportClause(node) {
-        return node.kind === 232 /* ImportClause */;
+        return node.kind === 236 /* ImportClause */;
     }
     ts.isImportClause = isImportClause;
     function isNamedImportBindings(node) {
         var kind = node.kind;
-        return kind === 234 /* NamedImports */
-            || kind === 233 /* NamespaceImport */;
+        return kind === 238 /* NamedImports */
+            || kind === 237 /* NamespaceImport */;
     }
     ts.isNamedImportBindings = isNamedImportBindings;
     function isImportSpecifier(node) {
-        return node.kind === 235 /* ImportSpecifier */;
+        return node.kind === 239 /* ImportSpecifier */;
     }
     ts.isImportSpecifier = isImportSpecifier;
     function isNamedExports(node) {
-        return node.kind === 238 /* NamedExports */;
+        return node.kind === 242 /* NamedExports */;
     }
     ts.isNamedExports = isNamedExports;
     function isExportSpecifier(node) {
-        return node.kind === 239 /* ExportSpecifier */;
+        return node.kind === 243 /* ExportSpecifier */;
     }
     ts.isExportSpecifier = isExportSpecifier;
     function isModuleOrEnumDeclaration(node) {
-        return node.kind === 226 /* ModuleDeclaration */ || node.kind === 225 /* EnumDeclaration */;
+        return node.kind === 230 /* ModuleDeclaration */ || node.kind === 229 /* EnumDeclaration */;
     }
     ts.isModuleOrEnumDeclaration = isModuleOrEnumDeclaration;
     function isDeclarationKind(kind) {
-        return kind === 181 /* ArrowFunction */
-            || kind === 170 /* BindingElement */
-            || kind === 222 /* ClassDeclaration */
-            || kind === 193 /* ClassExpression */
-            || kind === 149 /* Constructor */
-            || kind === 225 /* EnumDeclaration */
-            || kind === 255 /* EnumMember */
-            || kind === 239 /* ExportSpecifier */
-            || kind === 221 /* FunctionDeclaration */
-            || kind === 180 /* FunctionExpression */
-            || kind === 150 /* GetAccessor */
-            || kind === 232 /* ImportClause */
-            || kind === 230 /* ImportEqualsDeclaration */
-            || kind === 235 /* ImportSpecifier */
-            || kind === 223 /* InterfaceDeclaration */
-            || kind === 148 /* MethodDeclaration */
-            || kind === 147 /* MethodSignature */
-            || kind === 226 /* ModuleDeclaration */
-            || kind === 229 /* NamespaceExportDeclaration */
-            || kind === 233 /* NamespaceImport */
-            || kind === 143 /* Parameter */
-            || kind === 253 /* PropertyAssignment */
-            || kind === 146 /* PropertyDeclaration */
-            || kind === 145 /* PropertySignature */
-            || kind === 151 /* SetAccessor */
-            || kind === 254 /* ShorthandPropertyAssignment */
-            || kind === 224 /* TypeAliasDeclaration */
-            || kind === 142 /* TypeParameter */
-            || kind === 219 /* VariableDeclaration */
-            || kind === 279 /* JSDocTypedefTag */;
+        return kind === 185 /* ArrowFunction */
+            || kind === 174 /* BindingElement */
+            || kind === 226 /* ClassDeclaration */
+            || kind === 197 /* ClassExpression */
+            || kind === 150 /* Constructor */
+            || kind === 229 /* EnumDeclaration */
+            || kind === 260 /* EnumMember */
+            || kind === 243 /* ExportSpecifier */
+            || kind === 225 /* FunctionDeclaration */
+            || kind === 184 /* FunctionExpression */
+            || kind === 151 /* GetAccessor */
+            || kind === 236 /* ImportClause */
+            || kind === 234 /* ImportEqualsDeclaration */
+            || kind === 239 /* ImportSpecifier */
+            || kind === 227 /* InterfaceDeclaration */
+            || kind === 149 /* MethodDeclaration */
+            || kind === 148 /* MethodSignature */
+            || kind === 230 /* ModuleDeclaration */
+            || kind === 233 /* NamespaceExportDeclaration */
+            || kind === 237 /* NamespaceImport */
+            || kind === 144 /* Parameter */
+            || kind === 257 /* PropertyAssignment */
+            || kind === 147 /* PropertyDeclaration */
+            || kind === 146 /* PropertySignature */
+            || kind === 152 /* SetAccessor */
+            || kind === 258 /* ShorthandPropertyAssignment */
+            || kind === 228 /* TypeAliasDeclaration */
+            || kind === 143 /* TypeParameter */
+            || kind === 223 /* VariableDeclaration */
+            || kind === 284 /* JSDocTypedefTag */;
     }
     function isDeclarationStatementKind(kind) {
-        return kind === 221 /* FunctionDeclaration */
-            || kind === 240 /* MissingDeclaration */
-            || kind === 222 /* ClassDeclaration */
-            || kind === 223 /* InterfaceDeclaration */
-            || kind === 224 /* TypeAliasDeclaration */
-            || kind === 225 /* EnumDeclaration */
-            || kind === 226 /* ModuleDeclaration */
-            || kind === 231 /* ImportDeclaration */
-            || kind === 230 /* ImportEqualsDeclaration */
-            || kind === 237 /* ExportDeclaration */
-            || kind === 236 /* ExportAssignment */
-            || kind === 229 /* NamespaceExportDeclaration */;
+        return kind === 225 /* FunctionDeclaration */
+            || kind === 244 /* MissingDeclaration */
+            || kind === 226 /* ClassDeclaration */
+            || kind === 227 /* InterfaceDeclaration */
+            || kind === 228 /* TypeAliasDeclaration */
+            || kind === 229 /* EnumDeclaration */
+            || kind === 230 /* ModuleDeclaration */
+            || kind === 235 /* ImportDeclaration */
+            || kind === 234 /* ImportEqualsDeclaration */
+            || kind === 241 /* ExportDeclaration */
+            || kind === 240 /* ExportAssignment */
+            || kind === 233 /* NamespaceExportDeclaration */;
     }
     function isStatementKindButNotDeclarationKind(kind) {
-        return kind === 211 /* BreakStatement */
-            || kind === 210 /* ContinueStatement */
-            || kind === 218 /* DebuggerStatement */
-            || kind === 205 /* DoStatement */
-            || kind === 203 /* ExpressionStatement */
-            || kind === 202 /* EmptyStatement */
-            || kind === 208 /* ForInStatement */
-            || kind === 209 /* ForOfStatement */
-            || kind === 207 /* ForStatement */
-            || kind === 204 /* IfStatement */
-            || kind === 215 /* LabeledStatement */
-            || kind === 212 /* ReturnStatement */
-            || kind === 214 /* SwitchStatement */
-            || kind === 216 /* ThrowStatement */
-            || kind === 217 /* TryStatement */
-            || kind === 201 /* VariableStatement */
-            || kind === 206 /* WhileStatement */
-            || kind === 213 /* WithStatement */
-            || kind === 287 /* NotEmittedStatement */;
+        return kind === 215 /* BreakStatement */
+            || kind === 214 /* ContinueStatement */
+            || kind === 222 /* DebuggerStatement */
+            || kind === 209 /* DoStatement */
+            || kind === 207 /* ExpressionStatement */
+            || kind === 206 /* EmptyStatement */
+            || kind === 212 /* ForInStatement */
+            || kind === 213 /* ForOfStatement */
+            || kind === 211 /* ForStatement */
+            || kind === 208 /* IfStatement */
+            || kind === 219 /* LabeledStatement */
+            || kind === 216 /* ReturnStatement */
+            || kind === 218 /* SwitchStatement */
+            || kind === 220 /* ThrowStatement */
+            || kind === 221 /* TryStatement */
+            || kind === 205 /* VariableStatement */
+            || kind === 210 /* WhileStatement */
+            || kind === 217 /* WithStatement */
+            || kind === 292 /* NotEmittedStatement */
+            || kind === 295 /* EndOfDeclarationMarker */
+            || kind === 294 /* MergeDeclarationMarker */;
     }
     function isDeclaration(node) {
         return isDeclarationKind(node.kind);
@@ -9847,93 +10266,93 @@ var ts;
         var kind = node.kind;
         return isStatementKindButNotDeclarationKind(kind)
             || isDeclarationStatementKind(kind)
-            || kind === 200 /* Block */;
+            || kind === 204 /* Block */;
     }
     ts.isStatement = isStatement;
     // Module references
     function isModuleReference(node) {
         var kind = node.kind;
-        return kind === 241 /* ExternalModuleReference */
-            || kind === 140 /* QualifiedName */
+        return kind === 245 /* ExternalModuleReference */
+            || kind === 141 /* QualifiedName */
             || kind === 70 /* Identifier */;
     }
     ts.isModuleReference = isModuleReference;
     // JSX
     function isJsxOpeningElement(node) {
-        return node.kind === 244 /* JsxOpeningElement */;
+        return node.kind === 248 /* JsxOpeningElement */;
     }
     ts.isJsxOpeningElement = isJsxOpeningElement;
     function isJsxClosingElement(node) {
-        return node.kind === 245 /* JsxClosingElement */;
+        return node.kind === 249 /* JsxClosingElement */;
     }
     ts.isJsxClosingElement = isJsxClosingElement;
     function isJsxTagNameExpression(node) {
         var kind = node.kind;
         return kind === 98 /* ThisKeyword */
             || kind === 70 /* Identifier */
-            || kind === 173 /* PropertyAccessExpression */;
+            || kind === 177 /* PropertyAccessExpression */;
     }
     ts.isJsxTagNameExpression = isJsxTagNameExpression;
     function isJsxChild(node) {
         var kind = node.kind;
-        return kind === 242 /* JsxElement */
-            || kind === 248 /* JsxExpression */
-            || kind === 243 /* JsxSelfClosingElement */
+        return kind === 246 /* JsxElement */
+            || kind === 252 /* JsxExpression */
+            || kind === 247 /* JsxSelfClosingElement */
             || kind === 10 /* JsxText */;
     }
     ts.isJsxChild = isJsxChild;
     function isJsxAttributeLike(node) {
         var kind = node.kind;
-        return kind === 246 /* JsxAttribute */
-            || kind === 247 /* JsxSpreadAttribute */;
+        return kind === 250 /* JsxAttribute */
+            || kind === 251 /* JsxSpreadAttribute */;
     }
     ts.isJsxAttributeLike = isJsxAttributeLike;
     function isJsxSpreadAttribute(node) {
-        return node.kind === 247 /* JsxSpreadAttribute */;
+        return node.kind === 251 /* JsxSpreadAttribute */;
     }
     ts.isJsxSpreadAttribute = isJsxSpreadAttribute;
     function isJsxAttribute(node) {
-        return node.kind === 246 /* JsxAttribute */;
+        return node.kind === 250 /* JsxAttribute */;
     }
     ts.isJsxAttribute = isJsxAttribute;
     function isStringLiteralOrJsxExpression(node) {
         var kind = node.kind;
         return kind === 9 /* StringLiteral */
-            || kind === 248 /* JsxExpression */;
+            || kind === 252 /* JsxExpression */;
     }
     ts.isStringLiteralOrJsxExpression = isStringLiteralOrJsxExpression;
     // Clauses
     function isCaseOrDefaultClause(node) {
         var kind = node.kind;
-        return kind === 249 /* CaseClause */
-            || kind === 250 /* DefaultClause */;
+        return kind === 253 /* CaseClause */
+            || kind === 254 /* DefaultClause */;
     }
     ts.isCaseOrDefaultClause = isCaseOrDefaultClause;
     function isHeritageClause(node) {
-        return node.kind === 251 /* HeritageClause */;
+        return node.kind === 255 /* HeritageClause */;
     }
     ts.isHeritageClause = isHeritageClause;
     function isCatchClause(node) {
-        return node.kind === 252 /* CatchClause */;
+        return node.kind === 256 /* CatchClause */;
     }
     ts.isCatchClause = isCatchClause;
     // Property assignments
     function isPropertyAssignment(node) {
-        return node.kind === 253 /* PropertyAssignment */;
+        return node.kind === 257 /* PropertyAssignment */;
     }
     ts.isPropertyAssignment = isPropertyAssignment;
     function isShorthandPropertyAssignment(node) {
-        return node.kind === 254 /* ShorthandPropertyAssignment */;
+        return node.kind === 258 /* ShorthandPropertyAssignment */;
     }
     ts.isShorthandPropertyAssignment = isShorthandPropertyAssignment;
     // Enum
     function isEnumMember(node) {
-        return node.kind === 255 /* EnumMember */;
+        return node.kind === 260 /* EnumMember */;
     }
     ts.isEnumMember = isEnumMember;
     // Top-level nodes
     function isSourceFile(node) {
-        return node.kind === 256 /* SourceFile */;
+        return node.kind === 261 /* SourceFile */;
     }
     ts.isSourceFile = isSourceFile;
     function isWatchSet(options) {
@@ -9945,6 +10364,7 @@ var ts;
 (function (ts) {
     function getDefaultLibFileName(options) {
         switch (options.target) {
+            case 5 /* ESNext */:
             case 4 /* ES2017 */:
                 return "lib.es2017.d.ts";
             case 3 /* ES2016 */:
@@ -10162,9 +10582,9 @@ var ts;
     }
     ts.collapseTextChangeRangesAcrossMultipleVersions = collapseTextChangeRangesAcrossMultipleVersions;
     function getTypeParameterOwner(d) {
-        if (d && d.kind === 142 /* TypeParameter */) {
+        if (d && d.kind === 143 /* TypeParameter */) {
             for (var current = d; current; current = current.parent) {
-                if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 223 /* InterfaceDeclaration */) {
+                if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 227 /* InterfaceDeclaration */) {
                     return current;
                 }
             }
@@ -10172,11 +10592,11 @@ var ts;
     }
     ts.getTypeParameterOwner = getTypeParameterOwner;
     function isParameterPropertyDeclaration(node) {
-        return ts.hasModifier(node, 92 /* ParameterPropertyModifier */) && node.parent.kind === 149 /* Constructor */ && ts.isClassLike(node.parent.parent);
+        return ts.hasModifier(node, 92 /* ParameterPropertyModifier */) && node.parent.kind === 150 /* Constructor */ && ts.isClassLike(node.parent.parent);
     }
     ts.isParameterPropertyDeclaration = isParameterPropertyDeclaration;
     function walkUpBindingElementsAndPatterns(node) {
-        while (node && (node.kind === 170 /* BindingElement */ || ts.isBindingPattern(node))) {
+        while (node && (node.kind === 174 /* BindingElement */ || ts.isBindingPattern(node))) {
             node = node.parent;
         }
         return node;
@@ -10184,14 +10604,14 @@ var ts;
     function getCombinedModifierFlags(node) {
         node = walkUpBindingElementsAndPatterns(node);
         var flags = ts.getModifierFlags(node);
-        if (node.kind === 219 /* VariableDeclaration */) {
+        if (node.kind === 223 /* VariableDeclaration */) {
             node = node.parent;
         }
-        if (node && node.kind === 220 /* VariableDeclarationList */) {
+        if (node && node.kind === 224 /* VariableDeclarationList */) {
             flags |= ts.getModifierFlags(node);
             node = node.parent;
         }
-        if (node && node.kind === 201 /* VariableStatement */) {
+        if (node && node.kind === 205 /* VariableStatement */) {
             flags |= ts.getModifierFlags(node);
         }
         return flags;
@@ -10207,14 +10627,14 @@ var ts;
     function getCombinedNodeFlags(node) {
         node = walkUpBindingElementsAndPatterns(node);
         var flags = node.flags;
-        if (node.kind === 219 /* VariableDeclaration */) {
+        if (node.kind === 223 /* VariableDeclaration */) {
             node = node.parent;
         }
-        if (node && node.kind === 220 /* VariableDeclarationList */) {
+        if (node && node.kind === 224 /* VariableDeclarationList */) {
             flags |= node.flags;
             node = node.parent;
         }
-        if (node && node.kind === 201 /* VariableStatement */) {
+        if (node && node.kind === 205 /* VariableStatement */) {
             flags |= node.flags;
         }
         return flags;
@@ -10229,7 +10649,7 @@ var ts;
     var NodeConstructor;
     var SourceFileConstructor;
     function createNode(kind, location, flags) {
-        var ConstructorForKind = kind === 256 /* SourceFile */
+        var ConstructorForKind = kind === 261 /* SourceFile */
             ? (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))
             : (NodeConstructor || (NodeConstructor = ts.objectAllocator.getNodeConstructor()));
         var node = location
@@ -10412,7 +10832,7 @@ var ts;
     ts.createNull = createNull;
     // Names
     function createComputedPropertyName(expression, location) {
-        var node = createNode(141 /* ComputedPropertyName */, location);
+        var node = createNode(142 /* ComputedPropertyName */, location);
         node.expression = expression;
         return node;
     }
@@ -10425,17 +10845,8 @@ var ts;
     }
     ts.updateComputedPropertyName = updateComputedPropertyName;
     // Signature elements
-    function createParameter(name, initializer, location) {
-        return createParameterDeclaration(
-        /*decorators*/ undefined, 
-        /*modifiers*/ undefined, 
-        /*dotDotDotToken*/ undefined, name, 
-        /*questionToken*/ undefined, 
-        /*type*/ undefined, initializer, location);
-    }
-    ts.createParameter = createParameter;
-    function createParameterDeclaration(decorators, modifiers, dotDotDotToken, name, questionToken, type, initializer, location, flags) {
-        var node = createNode(143 /* Parameter */, location, flags);
+    function createParameter(decorators, modifiers, dotDotDotToken, name, questionToken, type, initializer, location, flags) {
+        var node = createNode(144 /* Parameter */, location, flags);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.dotDotDotToken = dotDotDotToken;
@@ -10445,17 +10856,17 @@ var ts;
         node.initializer = initializer ? parenthesizeExpressionForList(initializer) : undefined;
         return node;
     }
-    ts.createParameterDeclaration = createParameterDeclaration;
-    function updateParameterDeclaration(node, decorators, modifiers, name, type, initializer) {
+    ts.createParameter = createParameter;
+    function updateParameter(node, decorators, modifiers, name, type, initializer) {
         if (node.decorators !== decorators || node.modifiers !== modifiers || node.name !== name || node.type !== type || node.initializer !== initializer) {
-            return updateNode(createParameterDeclaration(decorators, modifiers, node.dotDotDotToken, name, node.questionToken, type, initializer, /*location*/ node, /*flags*/ node.flags), node);
+            return updateNode(createParameter(decorators, modifiers, node.dotDotDotToken, name, node.questionToken, type, initializer, /*location*/ node, /*flags*/ node.flags), node);
         }
         return node;
     }
-    ts.updateParameterDeclaration = updateParameterDeclaration;
+    ts.updateParameter = updateParameter;
     // Type members
     function createProperty(decorators, modifiers, name, questionToken, type, initializer, location) {
-        var node = createNode(146 /* PropertyDeclaration */, location);
+        var node = createNode(147 /* PropertyDeclaration */, location);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
@@ -10473,7 +10884,7 @@ var ts;
     }
     ts.updateProperty = updateProperty;
     function createMethod(decorators, modifiers, asteriskToken, name, typeParameters, parameters, type, body, location, flags) {
-        var node = createNode(148 /* MethodDeclaration */, location, flags);
+        var node = createNode(149 /* MethodDeclaration */, location, flags);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.asteriskToken = asteriskToken;
@@ -10493,7 +10904,7 @@ var ts;
     }
     ts.updateMethod = updateMethod;
     function createConstructor(decorators, modifiers, parameters, body, location, flags) {
-        var node = createNode(149 /* Constructor */, location, flags);
+        var node = createNode(150 /* Constructor */, location, flags);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.typeParameters = undefined;
@@ -10511,7 +10922,7 @@ var ts;
     }
     ts.updateConstructor = updateConstructor;
     function createGetAccessor(decorators, modifiers, name, parameters, type, body, location, flags) {
-        var node = createNode(150 /* GetAccessor */, location, flags);
+        var node = createNode(151 /* GetAccessor */, location, flags);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
@@ -10530,7 +10941,7 @@ var ts;
     }
     ts.updateGetAccessor = updateGetAccessor;
     function createSetAccessor(decorators, modifiers, name, parameters, body, location, flags) {
-        var node = createNode(151 /* SetAccessor */, location, flags);
+        var node = createNode(152 /* SetAccessor */, location, flags);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
@@ -10549,7 +10960,7 @@ var ts;
     ts.updateSetAccessor = updateSetAccessor;
     // Binding Patterns
     function createObjectBindingPattern(elements, location) {
-        var node = createNode(168 /* ObjectBindingPattern */, location);
+        var node = createNode(172 /* ObjectBindingPattern */, location);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -10562,7 +10973,7 @@ var ts;
     }
     ts.updateObjectBindingPattern = updateObjectBindingPattern;
     function createArrayBindingPattern(elements, location) {
-        var node = createNode(169 /* ArrayBindingPattern */, location);
+        var node = createNode(173 /* ArrayBindingPattern */, location);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -10575,7 +10986,7 @@ var ts;
     }
     ts.updateArrayBindingPattern = updateArrayBindingPattern;
     function createBindingElement(propertyName, dotDotDotToken, name, initializer, location) {
-        var node = createNode(170 /* BindingElement */, location);
+        var node = createNode(174 /* BindingElement */, location);
         node.propertyName = typeof propertyName === "string" ? createIdentifier(propertyName) : propertyName;
         node.dotDotDotToken = dotDotDotToken;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
@@ -10592,7 +11003,7 @@ var ts;
     ts.updateBindingElement = updateBindingElement;
     // Expression
     function createArrayLiteral(elements, location, multiLine) {
-        var node = createNode(171 /* ArrayLiteralExpression */, location);
+        var node = createNode(175 /* ArrayLiteralExpression */, location);
         node.elements = parenthesizeListElements(createNodeArray(elements));
         if (multiLine) {
             node.multiLine = true;
@@ -10608,7 +11019,7 @@ var ts;
     }
     ts.updateArrayLiteral = updateArrayLiteral;
     function createObjectLiteral(properties, location, multiLine) {
-        var node = createNode(172 /* ObjectLiteralExpression */, location);
+        var node = createNode(176 /* ObjectLiteralExpression */, location);
         node.properties = createNodeArray(properties);
         if (multiLine) {
             node.multiLine = true;
@@ -10624,7 +11035,7 @@ var ts;
     }
     ts.updateObjectLiteral = updateObjectLiteral;
     function createPropertyAccess(expression, name, location, flags) {
-        var node = createNode(173 /* PropertyAccessExpression */, location, flags);
+        var node = createNode(177 /* PropertyAccessExpression */, location, flags);
         node.expression = parenthesizeForAccess(expression);
         (node.emitNode || (node.emitNode = {})).flags |= 1048576 /* NoIndentation */;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
@@ -10642,7 +11053,7 @@ var ts;
     }
     ts.updatePropertyAccess = updatePropertyAccess;
     function createElementAccess(expression, index, location) {
-        var node = createNode(174 /* ElementAccessExpression */, location);
+        var node = createNode(178 /* ElementAccessExpression */, location);
         node.expression = parenthesizeForAccess(expression);
         node.argumentExpression = typeof index === "number" ? createLiteral(index) : index;
         return node;
@@ -10656,7 +11067,7 @@ var ts;
     }
     ts.updateElementAccess = updateElementAccess;
     function createCall(expression, typeArguments, argumentsArray, location, flags) {
-        var node = createNode(175 /* CallExpression */, location, flags);
+        var node = createNode(179 /* CallExpression */, location, flags);
         node.expression = parenthesizeForAccess(expression);
         if (typeArguments) {
             node.typeArguments = createNodeArray(typeArguments);
@@ -10673,7 +11084,7 @@ var ts;
     }
     ts.updateCall = updateCall;
     function createNew(expression, typeArguments, argumentsArray, location, flags) {
-        var node = createNode(176 /* NewExpression */, location, flags);
+        var node = createNode(180 /* NewExpression */, location, flags);
         node.expression = parenthesizeForNew(expression);
         node.typeArguments = typeArguments ? createNodeArray(typeArguments) : undefined;
         node.arguments = argumentsArray ? parenthesizeListElements(createNodeArray(argumentsArray)) : undefined;
@@ -10688,7 +11099,7 @@ var ts;
     }
     ts.updateNew = updateNew;
     function createTaggedTemplate(tag, template, location) {
-        var node = createNode(177 /* TaggedTemplateExpression */, location);
+        var node = createNode(181 /* TaggedTemplateExpression */, location);
         node.tag = parenthesizeForAccess(tag);
         node.template = template;
         return node;
@@ -10702,7 +11113,7 @@ var ts;
     }
     ts.updateTaggedTemplate = updateTaggedTemplate;
     function createParen(expression, location) {
-        var node = createNode(179 /* ParenthesizedExpression */, location);
+        var node = createNode(183 /* ParenthesizedExpression */, location);
         node.expression = expression;
         return node;
     }
@@ -10715,7 +11126,7 @@ var ts;
     }
     ts.updateParen = updateParen;
     function createFunctionExpression(modifiers, asteriskToken, name, typeParameters, parameters, type, body, location, flags) {
-        var node = createNode(180 /* FunctionExpression */, location, flags);
+        var node = createNode(184 /* FunctionExpression */, location, flags);
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.asteriskToken = asteriskToken;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
@@ -10734,7 +11145,7 @@ var ts;
     }
     ts.updateFunctionExpression = updateFunctionExpression;
     function createArrowFunction(modifiers, typeParameters, parameters, type, equalsGreaterThanToken, body, location, flags) {
-        var node = createNode(181 /* ArrowFunction */, location, flags);
+        var node = createNode(185 /* ArrowFunction */, location, flags);
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.typeParameters = typeParameters ? createNodeArray(typeParameters) : undefined;
         node.parameters = createNodeArray(parameters);
@@ -10752,7 +11163,7 @@ var ts;
     }
     ts.updateArrowFunction = updateArrowFunction;
     function createDelete(expression, location) {
-        var node = createNode(182 /* DeleteExpression */, location);
+        var node = createNode(186 /* DeleteExpression */, location);
         node.expression = parenthesizePrefixOperand(expression);
         return node;
     }
@@ -10765,7 +11176,7 @@ var ts;
     }
     ts.updateDelete = updateDelete;
     function createTypeOf(expression, location) {
-        var node = createNode(183 /* TypeOfExpression */, location);
+        var node = createNode(187 /* TypeOfExpression */, location);
         node.expression = parenthesizePrefixOperand(expression);
         return node;
     }
@@ -10778,7 +11189,7 @@ var ts;
     }
     ts.updateTypeOf = updateTypeOf;
     function createVoid(expression, location) {
-        var node = createNode(184 /* VoidExpression */, location);
+        var node = createNode(188 /* VoidExpression */, location);
         node.expression = parenthesizePrefixOperand(expression);
         return node;
     }
@@ -10791,7 +11202,7 @@ var ts;
     }
     ts.updateVoid = updateVoid;
     function createAwait(expression, location) {
-        var node = createNode(185 /* AwaitExpression */, location);
+        var node = createNode(189 /* AwaitExpression */, location);
         node.expression = parenthesizePrefixOperand(expression);
         return node;
     }
@@ -10804,7 +11215,7 @@ var ts;
     }
     ts.updateAwait = updateAwait;
     function createPrefix(operator, operand, location) {
-        var node = createNode(186 /* PrefixUnaryExpression */, location);
+        var node = createNode(190 /* PrefixUnaryExpression */, location);
         node.operator = operator;
         node.operand = parenthesizePrefixOperand(operand);
         return node;
@@ -10818,7 +11229,7 @@ var ts;
     }
     ts.updatePrefix = updatePrefix;
     function createPostfix(operand, operator, location) {
-        var node = createNode(187 /* PostfixUnaryExpression */, location);
+        var node = createNode(191 /* PostfixUnaryExpression */, location);
         node.operand = parenthesizePostfixOperand(operand);
         node.operator = operator;
         return node;
@@ -10834,7 +11245,7 @@ var ts;
     function createBinary(left, operator, right, location) {
         var operatorToken = typeof operator === "number" ? createToken(operator) : operator;
         var operatorKind = operatorToken.kind;
-        var node = createNode(188 /* BinaryExpression */, location);
+        var node = createNode(192 /* BinaryExpression */, location);
         node.left = parenthesizeBinaryOperand(operatorKind, left, /*isLeftSideOfBinary*/ true, /*leftOperand*/ undefined);
         node.operatorToken = operatorToken;
         node.right = parenthesizeBinaryOperand(operatorKind, right, /*isLeftSideOfBinary*/ false, node.left);
@@ -10849,7 +11260,7 @@ var ts;
     }
     ts.updateBinary = updateBinary;
     function createConditional(condition, questionToken, whenTrue, colonToken, whenFalse, location) {
-        var node = createNode(189 /* ConditionalExpression */, location);
+        var node = createNode(193 /* ConditionalExpression */, location);
         node.condition = condition;
         node.questionToken = questionToken;
         node.whenTrue = whenTrue;
@@ -10866,7 +11277,7 @@ var ts;
     }
     ts.updateConditional = updateConditional;
     function createTemplateExpression(head, templateSpans, location) {
-        var node = createNode(190 /* TemplateExpression */, location);
+        var node = createNode(194 /* TemplateExpression */, location);
         node.head = head;
         node.templateSpans = createNodeArray(templateSpans);
         return node;
@@ -10880,7 +11291,7 @@ var ts;
     }
     ts.updateTemplateExpression = updateTemplateExpression;
     function createYield(asteriskToken, expression, location) {
-        var node = createNode(191 /* YieldExpression */, location);
+        var node = createNode(195 /* YieldExpression */, location);
         node.asteriskToken = asteriskToken;
         node.expression = expression;
         return node;
@@ -10894,7 +11305,7 @@ var ts;
     }
     ts.updateYield = updateYield;
     function createSpread(expression, location) {
-        var node = createNode(192 /* SpreadElementExpression */, location);
+        var node = createNode(196 /* SpreadElement */, location);
         node.expression = parenthesizeExpressionForList(expression);
         return node;
     }
@@ -10907,7 +11318,7 @@ var ts;
     }
     ts.updateSpread = updateSpread;
     function createClassExpression(modifiers, name, typeParameters, heritageClauses, members, location) {
-        var node = createNode(193 /* ClassExpression */, location);
+        var node = createNode(197 /* ClassExpression */, location);
         node.decorators = undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.name = name;
@@ -10925,12 +11336,12 @@ var ts;
     }
     ts.updateClassExpression = updateClassExpression;
     function createOmittedExpression(location) {
-        var node = createNode(194 /* OmittedExpression */, location);
+        var node = createNode(198 /* OmittedExpression */, location);
         return node;
     }
     ts.createOmittedExpression = createOmittedExpression;
     function createExpressionWithTypeArguments(typeArguments, expression, location) {
-        var node = createNode(195 /* ExpressionWithTypeArguments */, location);
+        var node = createNode(199 /* ExpressionWithTypeArguments */, location);
         node.typeArguments = typeArguments ? createNodeArray(typeArguments) : undefined;
         node.expression = parenthesizeForAccess(expression);
         return node;
@@ -10945,7 +11356,7 @@ var ts;
     ts.updateExpressionWithTypeArguments = updateExpressionWithTypeArguments;
     // Misc
     function createTemplateSpan(expression, literal, location) {
-        var node = createNode(198 /* TemplateSpan */, location);
+        var node = createNode(202 /* TemplateSpan */, location);
         node.expression = expression;
         node.literal = literal;
         return node;
@@ -10960,7 +11371,7 @@ var ts;
     ts.updateTemplateSpan = updateTemplateSpan;
     // Element
     function createBlock(statements, location, multiLine, flags) {
-        var block = createNode(200 /* Block */, location, flags);
+        var block = createNode(204 /* Block */, location, flags);
         block.statements = createNodeArray(statements);
         if (multiLine) {
             block.multiLine = true;
@@ -10976,7 +11387,7 @@ var ts;
     }
     ts.updateBlock = updateBlock;
     function createVariableStatement(modifiers, declarationList, location, flags) {
-        var node = createNode(201 /* VariableStatement */, location, flags);
+        var node = createNode(205 /* VariableStatement */, location, flags);
         node.decorators = undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.declarationList = ts.isArray(declarationList) ? createVariableDeclarationList(declarationList) : declarationList;
@@ -10991,7 +11402,7 @@ var ts;
     }
     ts.updateVariableStatement = updateVariableStatement;
     function createVariableDeclarationList(declarations, location, flags) {
-        var node = createNode(220 /* VariableDeclarationList */, location, flags);
+        var node = createNode(224 /* VariableDeclarationList */, location, flags);
         node.declarations = createNodeArray(declarations);
         return node;
     }
@@ -11004,7 +11415,7 @@ var ts;
     }
     ts.updateVariableDeclarationList = updateVariableDeclarationList;
     function createVariableDeclaration(name, type, initializer, location, flags) {
-        var node = createNode(219 /* VariableDeclaration */, location, flags);
+        var node = createNode(223 /* VariableDeclaration */, location, flags);
         node.name = typeof name === "string" ? createIdentifier(name) : name;
         node.type = type;
         node.initializer = initializer !== undefined ? parenthesizeExpressionForList(initializer) : undefined;
@@ -11019,11 +11430,11 @@ var ts;
     }
     ts.updateVariableDeclaration = updateVariableDeclaration;
     function createEmptyStatement(location) {
-        return createNode(202 /* EmptyStatement */, location);
+        return createNode(206 /* EmptyStatement */, location);
     }
     ts.createEmptyStatement = createEmptyStatement;
     function createStatement(expression, location, flags) {
-        var node = createNode(203 /* ExpressionStatement */, location, flags);
+        var node = createNode(207 /* ExpressionStatement */, location, flags);
         node.expression = parenthesizeExpressionForExpressionStatement(expression);
         return node;
     }
@@ -11036,7 +11447,7 @@ var ts;
     }
     ts.updateStatement = updateStatement;
     function createIf(expression, thenStatement, elseStatement, location) {
-        var node = createNode(204 /* IfStatement */, location);
+        var node = createNode(208 /* IfStatement */, location);
         node.expression = expression;
         node.thenStatement = thenStatement;
         node.elseStatement = elseStatement;
@@ -11051,7 +11462,7 @@ var ts;
     }
     ts.updateIf = updateIf;
     function createDo(statement, expression, location) {
-        var node = createNode(205 /* DoStatement */, location);
+        var node = createNode(209 /* DoStatement */, location);
         node.statement = statement;
         node.expression = expression;
         return node;
@@ -11065,7 +11476,7 @@ var ts;
     }
     ts.updateDo = updateDo;
     function createWhile(expression, statement, location) {
-        var node = createNode(206 /* WhileStatement */, location);
+        var node = createNode(210 /* WhileStatement */, location);
         node.expression = expression;
         node.statement = statement;
         return node;
@@ -11079,7 +11490,7 @@ var ts;
     }
     ts.updateWhile = updateWhile;
     function createFor(initializer, condition, incrementor, statement, location) {
-        var node = createNode(207 /* ForStatement */, location, /*flags*/ undefined);
+        var node = createNode(211 /* ForStatement */, location, /*flags*/ undefined);
         node.initializer = initializer;
         node.condition = condition;
         node.incrementor = incrementor;
@@ -11095,7 +11506,7 @@ var ts;
     }
     ts.updateFor = updateFor;
     function createForIn(initializer, expression, statement, location) {
-        var node = createNode(208 /* ForInStatement */, location);
+        var node = createNode(212 /* ForInStatement */, location);
         node.initializer = initializer;
         node.expression = expression;
         node.statement = statement;
@@ -11110,7 +11521,7 @@ var ts;
     }
     ts.updateForIn = updateForIn;
     function createForOf(initializer, expression, statement, location) {
-        var node = createNode(209 /* ForOfStatement */, location);
+        var node = createNode(213 /* ForOfStatement */, location);
         node.initializer = initializer;
         node.expression = expression;
         node.statement = statement;
@@ -11125,7 +11536,7 @@ var ts;
     }
     ts.updateForOf = updateForOf;
     function createContinue(label, location) {
-        var node = createNode(210 /* ContinueStatement */, location);
+        var node = createNode(214 /* ContinueStatement */, location);
         if (label) {
             node.label = label;
         }
@@ -11140,7 +11551,7 @@ var ts;
     }
     ts.updateContinue = updateContinue;
     function createBreak(label, location) {
-        var node = createNode(211 /* BreakStatement */, location);
+        var node = createNode(215 /* BreakStatement */, location);
         if (label) {
             node.label = label;
         }
@@ -11155,7 +11566,7 @@ var ts;
     }
     ts.updateBreak = updateBreak;
     function createReturn(expression, location) {
-        var node = createNode(212 /* ReturnStatement */, location);
+        var node = createNode(216 /* ReturnStatement */, location);
         node.expression = expression;
         return node;
     }
@@ -11168,7 +11579,7 @@ var ts;
     }
     ts.updateReturn = updateReturn;
     function createWith(expression, statement, location) {
-        var node = createNode(213 /* WithStatement */, location);
+        var node = createNode(217 /* WithStatement */, location);
         node.expression = expression;
         node.statement = statement;
         return node;
@@ -11182,7 +11593,7 @@ var ts;
     }
     ts.updateWith = updateWith;
     function createSwitch(expression, caseBlock, location) {
-        var node = createNode(214 /* SwitchStatement */, location);
+        var node = createNode(218 /* SwitchStatement */, location);
         node.expression = parenthesizeExpressionForList(expression);
         node.caseBlock = caseBlock;
         return node;
@@ -11196,7 +11607,7 @@ var ts;
     }
     ts.updateSwitch = updateSwitch;
     function createLabel(label, statement, location) {
-        var node = createNode(215 /* LabeledStatement */, location);
+        var node = createNode(219 /* LabeledStatement */, location);
         node.label = typeof label === "string" ? createIdentifier(label) : label;
         node.statement = statement;
         return node;
@@ -11210,7 +11621,7 @@ var ts;
     }
     ts.updateLabel = updateLabel;
     function createThrow(expression, location) {
-        var node = createNode(216 /* ThrowStatement */, location);
+        var node = createNode(220 /* ThrowStatement */, location);
         node.expression = expression;
         return node;
     }
@@ -11223,7 +11634,7 @@ var ts;
     }
     ts.updateThrow = updateThrow;
     function createTry(tryBlock, catchClause, finallyBlock, location) {
-        var node = createNode(217 /* TryStatement */, location);
+        var node = createNode(221 /* TryStatement */, location);
         node.tryBlock = tryBlock;
         node.catchClause = catchClause;
         node.finallyBlock = finallyBlock;
@@ -11238,7 +11649,7 @@ var ts;
     }
     ts.updateTry = updateTry;
     function createCaseBlock(clauses, location) {
-        var node = createNode(228 /* CaseBlock */, location);
+        var node = createNode(232 /* CaseBlock */, location);
         node.clauses = createNodeArray(clauses);
         return node;
     }
@@ -11251,7 +11662,7 @@ var ts;
     }
     ts.updateCaseBlock = updateCaseBlock;
     function createFunctionDeclaration(decorators, modifiers, asteriskToken, name, typeParameters, parameters, type, body, location, flags) {
-        var node = createNode(221 /* FunctionDeclaration */, location, flags);
+        var node = createNode(225 /* FunctionDeclaration */, location, flags);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.asteriskToken = asteriskToken;
@@ -11271,7 +11682,7 @@ var ts;
     }
     ts.updateFunctionDeclaration = updateFunctionDeclaration;
     function createClassDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members, location) {
-        var node = createNode(222 /* ClassDeclaration */, location);
+        var node = createNode(226 /* ClassDeclaration */, location);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.name = name;
@@ -11289,7 +11700,7 @@ var ts;
     }
     ts.updateClassDeclaration = updateClassDeclaration;
     function createImportDeclaration(decorators, modifiers, importClause, moduleSpecifier, location) {
-        var node = createNode(231 /* ImportDeclaration */, location);
+        var node = createNode(235 /* ImportDeclaration */, location);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.importClause = importClause;
@@ -11305,7 +11716,7 @@ var ts;
     }
     ts.updateImportDeclaration = updateImportDeclaration;
     function createImportClause(name, namedBindings, location) {
-        var node = createNode(232 /* ImportClause */, location);
+        var node = createNode(236 /* ImportClause */, location);
         node.name = name;
         node.namedBindings = namedBindings;
         return node;
@@ -11319,7 +11730,7 @@ var ts;
     }
     ts.updateImportClause = updateImportClause;
     function createNamespaceImport(name, location) {
-        var node = createNode(233 /* NamespaceImport */, location);
+        var node = createNode(237 /* NamespaceImport */, location);
         node.name = name;
         return node;
     }
@@ -11332,7 +11743,7 @@ var ts;
     }
     ts.updateNamespaceImport = updateNamespaceImport;
     function createNamedImports(elements, location) {
-        var node = createNode(234 /* NamedImports */, location);
+        var node = createNode(238 /* NamedImports */, location);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -11345,7 +11756,7 @@ var ts;
     }
     ts.updateNamedImports = updateNamedImports;
     function createImportSpecifier(propertyName, name, location) {
-        var node = createNode(235 /* ImportSpecifier */, location);
+        var node = createNode(239 /* ImportSpecifier */, location);
         node.propertyName = propertyName;
         node.name = name;
         return node;
@@ -11359,7 +11770,7 @@ var ts;
     }
     ts.updateImportSpecifier = updateImportSpecifier;
     function createExportAssignment(decorators, modifiers, isExportEquals, expression, location) {
-        var node = createNode(236 /* ExportAssignment */, location);
+        var node = createNode(240 /* ExportAssignment */, location);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.isExportEquals = isExportEquals;
@@ -11375,7 +11786,7 @@ var ts;
     }
     ts.updateExportAssignment = updateExportAssignment;
     function createExportDeclaration(decorators, modifiers, exportClause, moduleSpecifier, location) {
-        var node = createNode(237 /* ExportDeclaration */, location);
+        var node = createNode(241 /* ExportDeclaration */, location);
         node.decorators = decorators ? createNodeArray(decorators) : undefined;
         node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.exportClause = exportClause;
@@ -11391,7 +11802,7 @@ var ts;
     }
     ts.updateExportDeclaration = updateExportDeclaration;
     function createNamedExports(elements, location) {
-        var node = createNode(238 /* NamedExports */, location);
+        var node = createNode(242 /* NamedExports */, location);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -11404,7 +11815,7 @@ var ts;
     }
     ts.updateNamedExports = updateNamedExports;
     function createExportSpecifier(name, propertyName, location) {
-        var node = createNode(239 /* ExportSpecifier */, location);
+        var node = createNode(243 /* ExportSpecifier */, location);
         node.name = typeof name === "string" ? createIdentifier(name) : name;
         node.propertyName = typeof propertyName === "string" ? createIdentifier(propertyName) : propertyName;
         return node;
@@ -11419,7 +11830,7 @@ var ts;
     ts.updateExportSpecifier = updateExportSpecifier;
     // JSX
     function createJsxElement(openingElement, children, closingElement, location) {
-        var node = createNode(242 /* JsxElement */, location);
+        var node = createNode(246 /* JsxElement */, location);
         node.openingElement = openingElement;
         node.children = createNodeArray(children);
         node.closingElement = closingElement;
@@ -11434,7 +11845,7 @@ var ts;
     }
     ts.updateJsxElement = updateJsxElement;
     function createJsxSelfClosingElement(tagName, attributes, location) {
-        var node = createNode(243 /* JsxSelfClosingElement */, location);
+        var node = createNode(247 /* JsxSelfClosingElement */, location);
         node.tagName = tagName;
         node.attributes = createNodeArray(attributes);
         return node;
@@ -11448,7 +11859,7 @@ var ts;
     }
     ts.updateJsxSelfClosingElement = updateJsxSelfClosingElement;
     function createJsxOpeningElement(tagName, attributes, location) {
-        var node = createNode(244 /* JsxOpeningElement */, location);
+        var node = createNode(248 /* JsxOpeningElement */, location);
         node.tagName = tagName;
         node.attributes = createNodeArray(attributes);
         return node;
@@ -11462,7 +11873,7 @@ var ts;
     }
     ts.updateJsxOpeningElement = updateJsxOpeningElement;
     function createJsxClosingElement(tagName, location) {
-        var node = createNode(245 /* JsxClosingElement */, location);
+        var node = createNode(249 /* JsxClosingElement */, location);
         node.tagName = tagName;
         return node;
     }
@@ -11475,7 +11886,7 @@ var ts;
     }
     ts.updateJsxClosingElement = updateJsxClosingElement;
     function createJsxAttribute(name, initializer, location) {
-        var node = createNode(246 /* JsxAttribute */, location);
+        var node = createNode(250 /* JsxAttribute */, location);
         node.name = name;
         node.initializer = initializer;
         return node;
@@ -11489,7 +11900,7 @@ var ts;
     }
     ts.updateJsxAttribute = updateJsxAttribute;
     function createJsxSpreadAttribute(expression, location) {
-        var node = createNode(247 /* JsxSpreadAttribute */, location);
+        var node = createNode(251 /* JsxSpreadAttribute */, location);
         node.expression = expression;
         return node;
     }
@@ -11502,7 +11913,7 @@ var ts;
     }
     ts.updateJsxSpreadAttribute = updateJsxSpreadAttribute;
     function createJsxExpression(expression, location) {
-        var node = createNode(248 /* JsxExpression */, location);
+        var node = createNode(252 /* JsxExpression */, location);
         node.expression = expression;
         return node;
     }
@@ -11516,7 +11927,7 @@ var ts;
     ts.updateJsxExpression = updateJsxExpression;
     // Clauses
     function createHeritageClause(token, types, location) {
-        var node = createNode(251 /* HeritageClause */, location);
+        var node = createNode(255 /* HeritageClause */, location);
         node.token = token;
         node.types = createNodeArray(types);
         return node;
@@ -11530,7 +11941,7 @@ var ts;
     }
     ts.updateHeritageClause = updateHeritageClause;
     function createCaseClause(expression, statements, location) {
-        var node = createNode(249 /* CaseClause */, location);
+        var node = createNode(253 /* CaseClause */, location);
         node.expression = parenthesizeExpressionForList(expression);
         node.statements = createNodeArray(statements);
         return node;
@@ -11544,7 +11955,7 @@ var ts;
     }
     ts.updateCaseClause = updateCaseClause;
     function createDefaultClause(statements, location) {
-        var node = createNode(250 /* DefaultClause */, location);
+        var node = createNode(254 /* DefaultClause */, location);
         node.statements = createNodeArray(statements);
         return node;
     }
@@ -11557,7 +11968,7 @@ var ts;
     }
     ts.updateDefaultClause = updateDefaultClause;
     function createCatchClause(variableDeclaration, block, location) {
-        var node = createNode(252 /* CatchClause */, location);
+        var node = createNode(256 /* CatchClause */, location);
         node.variableDeclaration = typeof variableDeclaration === "string" ? createVariableDeclaration(variableDeclaration) : variableDeclaration;
         node.block = block;
         return node;
@@ -11572,7 +11983,7 @@ var ts;
     ts.updateCatchClause = updateCatchClause;
     // Property assignments
     function createPropertyAssignment(name, initializer, location) {
-        var node = createNode(253 /* PropertyAssignment */, location);
+        var node = createNode(257 /* PropertyAssignment */, location);
         node.name = typeof name === "string" ? createIdentifier(name) : name;
         node.questionToken = undefined;
         node.initializer = initializer !== undefined ? parenthesizeExpressionForList(initializer) : undefined;
@@ -11587,12 +11998,18 @@ var ts;
     }
     ts.updatePropertyAssignment = updatePropertyAssignment;
     function createShorthandPropertyAssignment(name, objectAssignmentInitializer, location) {
-        var node = createNode(254 /* ShorthandPropertyAssignment */, location);
+        var node = createNode(258 /* ShorthandPropertyAssignment */, location);
         node.name = typeof name === "string" ? createIdentifier(name) : name;
         node.objectAssignmentInitializer = objectAssignmentInitializer !== undefined ? parenthesizeExpressionForList(objectAssignmentInitializer) : undefined;
         return node;
     }
     ts.createShorthandPropertyAssignment = createShorthandPropertyAssignment;
+    function createSpreadAssignment(expression, location) {
+        var node = createNode(259 /* SpreadAssignment */, location);
+        node.expression = expression !== undefined ? parenthesizeExpressionForList(expression) : undefined;
+        return node;
+    }
+    ts.createSpreadAssignment = createSpreadAssignment;
     function updateShorthandPropertyAssignment(node, name, objectAssignmentInitializer) {
         if (node.name !== name || node.objectAssignmentInitializer !== objectAssignmentInitializer) {
             return updateNode(createShorthandPropertyAssignment(name, objectAssignmentInitializer, node), node);
@@ -11600,10 +12017,17 @@ var ts;
         return node;
     }
     ts.updateShorthandPropertyAssignment = updateShorthandPropertyAssignment;
+    function updateSpreadAssignment(node, expression) {
+        if (node.expression !== expression) {
+            return updateNode(createSpreadAssignment(expression, node), node);
+        }
+        return node;
+    }
+    ts.updateSpreadAssignment = updateSpreadAssignment;
     // Top-level nodes
     function updateSourceFileNode(node, statements) {
         if (node.statements !== statements) {
-            var updated = createNode(256 /* SourceFile */, /*location*/ node, node.flags);
+            var updated = createNode(261 /* SourceFile */, /*location*/ node, node.flags);
             updated.statements = createNodeArray(statements);
             updated.endOfFileToken = node.endOfFileToken;
             updated.fileName = node.fileName;
@@ -11672,11 +12096,33 @@ var ts;
      * @param original The original statement.
      */
     function createNotEmittedStatement(original) {
-        var node = createNode(287 /* NotEmittedStatement */, /*location*/ original);
+        var node = createNode(292 /* NotEmittedStatement */, /*location*/ original);
         node.original = original;
         return node;
     }
     ts.createNotEmittedStatement = createNotEmittedStatement;
+    /**
+     * Creates a synthetic element to act as a placeholder for the end of an emitted declaration in
+     * order to properly emit exports.
+     */
+    function createEndOfDeclarationMarker(original) {
+        var node = createNode(295 /* EndOfDeclarationMarker */);
+        node.emitNode = {};
+        node.original = original;
+        return node;
+    }
+    ts.createEndOfDeclarationMarker = createEndOfDeclarationMarker;
+    /**
+     * Creates a synthetic element to act as a placeholder for the beginning of a merged declaration in
+     * order to properly emit exports.
+     */
+    function createMergeDeclarationMarker(original) {
+        var node = createNode(294 /* MergeDeclarationMarker */);
+        node.emitNode = {};
+        node.original = original;
+        return node;
+    }
+    ts.createMergeDeclarationMarker = createMergeDeclarationMarker;
     /**
      * Creates a synthetic expression to act as a placeholder for a not-emitted expression in
      * order to preserve comments or sourcemap positions.
@@ -11686,7 +12132,7 @@ var ts;
      * @param location The location for the expression. Defaults to the positions from "original" if provided.
      */
     function createPartiallyEmittedExpression(expression, original, location) {
-        var node = createNode(288 /* PartiallyEmittedExpression */, /*location*/ location || original);
+        var node = createNode(293 /* PartiallyEmittedExpression */, /*location*/ location || original);
         node.expression = expression;
         node.original = original;
         return node;
@@ -11759,15 +12205,6 @@ var ts;
         }
     }
     ts.createMemberAccessForPropertyName = createMemberAccessForPropertyName;
-    function createRestParameter(name) {
-        return createParameterDeclaration(
-        /*decorators*/ undefined, 
-        /*modifiers*/ undefined, createToken(23 /* DotDotDotToken */), name, 
-        /*questionToken*/ undefined, 
-        /*type*/ undefined, 
-        /*initializer*/ undefined);
-    }
-    ts.createRestParameter = createRestParameter;
     function createFunctionCall(func, thisArg, argumentsList, location) {
         return createCall(createPropertyAccess(func, "call"), 
         /*typeArguments*/ undefined, [
@@ -11807,10 +12244,25 @@ var ts;
         // flag and setting a parent node.
         var react = createIdentifier(reactNamespace || "React");
         react.flags &= ~8 /* Synthesized */;
-        react.parent = parent;
+        // Set the parent that is in parse tree 
+        // this makes sure that parent chain is intact for checker to traverse complete scope tree
+        react.parent = ts.getParseTreeNode(parent);
         return react;
     }
-    function createReactCreateElement(reactNamespace, tagName, props, children, parentElement, location) {
+    function createJsxFactoryExpressionFromEntityName(jsxFactory, parent) {
+        if (ts.isQualifiedName(jsxFactory)) {
+            return createPropertyAccess(createJsxFactoryExpressionFromEntityName(jsxFactory.left, parent), setEmitFlags(getMutableClone(jsxFactory.right), 1536 /* NoSourceMap */));
+        }
+        else {
+            return createReactNamespace(jsxFactory.text, parent);
+        }
+    }
+    function createJsxFactoryExpression(jsxFactoryEntity, reactNamespace, parent) {
+        return jsxFactoryEntity ?
+            createJsxFactoryExpressionFromEntityName(jsxFactoryEntity, parent) :
+            createPropertyAccess(createReactNamespace(reactNamespace, parent), "createElement");
+    }
+    function createExpressionForJsxElement(jsxFactoryEntity, reactNamespace, tagName, props, children, parentElement, location) {
         var argumentsList = [tagName];
         if (props) {
             argumentsList.push(props);
@@ -11830,10 +12282,22 @@ var ts;
                 argumentsList.push(children[0]);
             }
         }
-        return createCall(createPropertyAccess(createReactNamespace(reactNamespace, parentElement), "createElement"), 
+        return createCall(createJsxFactoryExpression(jsxFactoryEntity, reactNamespace, parentElement), 
         /*typeArguments*/ undefined, argumentsList, location);
     }
-    ts.createReactCreateElement = createReactCreateElement;
+    ts.createExpressionForJsxElement = createExpressionForJsxElement;
+    function createExportDefault(expression) {
+        return createExportAssignment(/*decorators*/ undefined, /*modifiers*/ undefined, /*isExportEquals*/ false, expression);
+    }
+    ts.createExportDefault = createExportDefault;
+    function createExternalModuleExport(exportName) {
+        return createExportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, createNamedExports([createExportSpecifier(exportName)]));
+    }
+    ts.createExternalModuleExport = createExternalModuleExport;
+    function createLetStatement(name, initializer, location) {
+        return createVariableStatement(/*modifiers*/ undefined, createLetDeclarationList([createVariableDeclaration(name, /*type*/ undefined, initializer)]), location);
+    }
+    ts.createLetStatement = createLetStatement;
     function createLetDeclarationList(declarations, location) {
         return createVariableDeclarationList(declarations, location, 1 /* Let */);
     }
@@ -11922,20 +12386,18 @@ var ts;
         // name => super[name]
         return createArrowFunction(
         /*modifiers*/ undefined, 
-        /*typeParameters*/ undefined, [createParameter("name")], 
-        /*type*/ undefined, 
-        /*equalsGreaterThanToken*/ undefined, createElementAccess(target, createIdentifier("name")));
+        /*typeParameters*/ undefined, [createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "name")], 
+        /*type*/ undefined, createToken(35 /* EqualsGreaterThanToken */), createElementAccess(target, createIdentifier("name")));
     }
     function createSeti(target) {
         // (name, value) => super[name] = value
         return createArrowFunction(
         /*modifiers*/ undefined, 
         /*typeParameters*/ undefined, [
-            createParameter("name"),
-            createParameter("value")
+            createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "name"),
+            createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "value")
         ], 
-        /*type*/ undefined, 
-        /*equalsGreaterThanToken*/ undefined, createAssignment(createElementAccess(target, createIdentifier("name")), createIdentifier("value")));
+        /*type*/ undefined, createToken(35 /* EqualsGreaterThanToken */), createAssignment(createElementAccess(target, createIdentifier("name")), createIdentifier("value")));
     }
     function createAdvancedAsyncSuperHelper() {
         //  const _super = (function (geti, seti) {
@@ -11960,7 +12422,7 @@ var ts;
         // set value(v) { seti(name, v); }
         var setter = createSetAccessor(
         /*decorators*/ undefined, 
-        /*modifiers*/ undefined, "value", [createParameter("v")], createBlock([
+        /*modifiers*/ undefined, "value", [createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "v")], createBlock([
             createStatement(createCall(createIdentifier("seti"), 
             /*typeArguments*/ undefined, [
                 createIdentifier("name"),
@@ -11970,9 +12432,8 @@ var ts;
         // return name => cache[name] || ...
         var getOrCreateAccessorsForName = createReturn(createArrowFunction(
         /*modifiers*/ undefined, 
-        /*typeParameters*/ undefined, [createParameter("name")], 
-        /*type*/ undefined, 
-        /*equalsGreaterThanToken*/ undefined, createLogicalOr(createElementAccess(createIdentifier("cache"), createIdentifier("name")), createParen(createAssignment(createElementAccess(createIdentifier("cache"), createIdentifier("name")), createObjectLiteral([
+        /*typeParameters*/ undefined, [createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "name")], 
+        /*type*/ undefined, createToken(35 /* EqualsGreaterThanToken */), createLogicalOr(createElementAccess(createIdentifier("cache"), createIdentifier("name")), createParen(createAssignment(createElementAccess(createIdentifier("cache"), createIdentifier("name")), createObjectLiteral([
             getter,
             setter
         ]))))));
@@ -11988,8 +12449,8 @@ var ts;
             /*asteriskToken*/ undefined, 
             /*name*/ undefined, 
             /*typeParameters*/ undefined, [
-                createParameter("geti"),
-                createParameter("seti")
+                createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "geti"),
+                createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "seti")
             ], 
             /*type*/ undefined, createBlock([
                 createCache,
@@ -12019,13 +12480,13 @@ var ts;
             case 8 /* NumericLiteral */:
             case 9 /* StringLiteral */:
                 return false;
-            case 171 /* ArrayLiteralExpression */:
+            case 175 /* ArrayLiteralExpression */:
                 var elements = target.elements;
                 if (elements.length === 0) {
                     return false;
                 }
                 return true;
-            case 172 /* ObjectLiteralExpression */:
+            case 176 /* ObjectLiteralExpression */:
                 return target.properties.length > 0;
             default:
                 return true;
@@ -12045,7 +12506,7 @@ var ts;
         }
         else {
             switch (callee.kind) {
-                case 173 /* PropertyAccessExpression */: {
+                case 177 /* PropertyAccessExpression */: {
                     if (shouldBeCapturedInTempVariable(callee.expression, cacheIdentifiers)) {
                         // for `a.b()` target is `(_a = a).b` and thisArg is `_a`
                         thisArg = createTempVariable(recordTempVariable);
@@ -12059,7 +12520,7 @@ var ts;
                     }
                     break;
                 }
-                case 174 /* ElementAccessExpression */: {
+                case 178 /* ElementAccessExpression */: {
                     if (shouldBeCapturedInTempVariable(callee.expression, cacheIdentifiers)) {
                         // for `a[b]()` target is `(_a = a)[b]` and thisArg is `_a`
                         thisArg = createTempVariable(recordTempVariable);
@@ -12113,14 +12574,14 @@ var ts;
     ts.createExpressionForPropertyName = createExpressionForPropertyName;
     function createExpressionForObjectLiteralElementLike(node, property, receiver) {
         switch (property.kind) {
-            case 150 /* GetAccessor */:
-            case 151 /* SetAccessor */:
+            case 151 /* GetAccessor */:
+            case 152 /* SetAccessor */:
                 return createExpressionForAccessorDeclaration(node.properties, property, receiver, node.multiLine);
-            case 253 /* PropertyAssignment */:
+            case 257 /* PropertyAssignment */:
                 return createExpressionForPropertyAssignment(property, receiver);
-            case 254 /* ShorthandPropertyAssignment */:
+            case 258 /* ShorthandPropertyAssignment */:
                 return createExpressionForShorthandPropertyAssignment(property, receiver);
-            case 148 /* MethodDeclaration */:
+            case 149 /* MethodDeclaration */:
                 return createExpressionForMethodDeclaration(property, receiver);
         }
     }
@@ -12184,6 +12645,112 @@ var ts;
         /*location*/ method), 
         /*original*/ method));
     }
+    /**
+     * Gets the local name of a declaration. This is primarily used for declarations that can be
+     * referred to by name in the declaration's immediate scope (classes, enums, namespaces). A
+     * local name will *never* be prefixed with an module or namespace export modifier like
+     * "exports." when emitted as an expression.
+     *
+     * @param node The declaration.
+     * @param allowComments A value indicating whether comments may be emitted for the name.
+     * @param allowSourceMaps A value indicating whether source maps may be emitted for the name.
+     */
+    function getLocalName(node, allowComments, allowSourceMaps) {
+        return getName(node, allowComments, allowSourceMaps, 262144 /* LocalName */);
+    }
+    ts.getLocalName = getLocalName;
+    /**
+     * Gets whether an identifier should only be referred to by its local name.
+     */
+    function isLocalName(node) {
+        return (getEmitFlags(node) & 262144 /* LocalName */) !== 0;
+    }
+    ts.isLocalName = isLocalName;
+    /**
+     * Gets the export name of a declaration. This is primarily used for declarations that can be
+     * referred to by name in the declaration's immediate scope (classes, enums, namespaces). An
+     * export name will *always* be prefixed with an module or namespace export modifier like
+     * `"exports."` when emitted as an expression if the name points to an exported symbol.
+     *
+     * @param node The declaration.
+     * @param allowComments A value indicating whether comments may be emitted for the name.
+     * @param allowSourceMaps A value indicating whether source maps may be emitted for the name.
+     */
+    function getExportName(node, allowComments, allowSourceMaps) {
+        return getName(node, allowComments, allowSourceMaps, 131072 /* ExportName */);
+    }
+    ts.getExportName = getExportName;
+    /**
+     * Gets whether an identifier should only be referred to by its export representation if the
+     * name points to an exported symbol.
+     */
+    function isExportName(node) {
+        return (getEmitFlags(node) & 131072 /* ExportName */) !== 0;
+    }
+    ts.isExportName = isExportName;
+    /**
+     * Gets the name of a declaration for use in declarations.
+     *
+     * @param node The declaration.
+     * @param allowComments A value indicating whether comments may be emitted for the name.
+     * @param allowSourceMaps A value indicating whether source maps may be emitted for the name.
+     */
+    function getDeclarationName(node, allowComments, allowSourceMaps) {
+        return getName(node, allowComments, allowSourceMaps);
+    }
+    ts.getDeclarationName = getDeclarationName;
+    function getName(node, allowComments, allowSourceMaps, emitFlags) {
+        if (node.name && ts.isIdentifier(node.name) && !ts.isGeneratedIdentifier(node.name)) {
+            var name_11 = getMutableClone(node.name);
+            emitFlags |= getEmitFlags(node.name);
+            if (!allowSourceMaps)
+                emitFlags |= 1536 /* NoSourceMap */;
+            if (!allowComments)
+                emitFlags |= 49152 /* NoComments */;
+            if (emitFlags)
+                setEmitFlags(name_11, emitFlags);
+            return name_11;
+        }
+        return getGeneratedNameForNode(node);
+    }
+    /**
+     * Gets the exported name of a declaration for use in expressions.
+     *
+     * An exported name will *always* be prefixed with an module or namespace export modifier like
+     * "exports." if the name points to an exported symbol.
+     *
+     * @param ns The namespace identifier.
+     * @param node The declaration.
+     * @param allowComments A value indicating whether comments may be emitted for the name.
+     * @param allowSourceMaps A value indicating whether source maps may be emitted for the name.
+     */
+    function getExternalModuleOrNamespaceExportName(ns, node, allowComments, allowSourceMaps) {
+        if (ns && ts.hasModifier(node, 1 /* Export */)) {
+            return getNamespaceMemberName(ns, getName(node), allowComments, allowSourceMaps);
+        }
+        return getExportName(node, allowComments, allowSourceMaps);
+    }
+    ts.getExternalModuleOrNamespaceExportName = getExternalModuleOrNamespaceExportName;
+    /**
+     * Gets a namespace-qualified name for use in expressions.
+     *
+     * @param ns The namespace identifier.
+     * @param name The name.
+     * @param allowComments A value indicating whether comments may be emitted for the name.
+     * @param allowSourceMaps A value indicating whether source maps may be emitted for the name.
+     */
+    function getNamespaceMemberName(ns, name, allowComments, allowSourceMaps) {
+        var qualifiedName = createPropertyAccess(ns, ts.nodeIsSynthesized(name) ? name : getSynthesizedClone(name), /*location*/ name);
+        var emitFlags;
+        if (!allowSourceMaps)
+            emitFlags |= 1536 /* NoSourceMap */;
+        if (!allowComments)
+            emitFlags |= 49152 /* NoComments */;
+        if (emitFlags)
+            setEmitFlags(qualifiedName, emitFlags);
+        return qualifiedName;
+    }
+    ts.getNamespaceMemberName = getNamespaceMemberName;
     // Utilities
     function isUseStrictPrologue(node) {
         return node.expression.text === "use strict";
@@ -12273,7 +12840,7 @@ var ts;
     function parenthesizeBinaryOperand(binaryOperator, operand, isLeftSideOfBinary, leftOperand) {
         var skipped = skipPartiallyEmittedExpressions(operand);
         // If the resulting expression is already parenthesized, we do not need to do any further processing.
-        if (skipped.kind === 179 /* ParenthesizedExpression */) {
+        if (skipped.kind === 183 /* ParenthesizedExpression */) {
             return operand;
         }
         return binaryOperandNeedsParentheses(binaryOperator, operand, isLeftSideOfBinary, leftOperand)
@@ -12307,8 +12874,8 @@ 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(188 /* BinaryExpression */, binaryOperator);
-        var binaryOperatorAssociativity = ts.getOperatorAssociativity(188 /* BinaryExpression */, binaryOperator);
+        var binaryOperatorPrecedence = ts.getOperatorPrecedence(192 /* BinaryExpression */, binaryOperator);
+        var binaryOperatorAssociativity = ts.getOperatorAssociativity(192 /* BinaryExpression */, binaryOperator);
         var emittedOperand = skipPartiallyEmittedExpressions(operand);
         var operandPrecedence = ts.getExpressionPrecedence(emittedOperand);
         switch (ts.compareValues(operandPrecedence, binaryOperatorPrecedence)) {
@@ -12317,7 +12884,7 @@ var ts;
                 // and is a yield expression, then we do not need parentheses.
                 if (!isLeftSideOfBinary
                     && binaryOperatorAssociativity === 1 /* Right */
-                    && operand.kind === 191 /* YieldExpression */) {
+                    && operand.kind === 195 /* YieldExpression */) {
                     return false;
                 }
                 return true;
@@ -12405,7 +12972,7 @@ var ts;
         if (ts.isLiteralKind(node.kind)) {
             return node.kind;
         }
-        if (node.kind === 188 /* BinaryExpression */ && node.operatorToken.kind === 36 /* PlusToken */) {
+        if (node.kind === 192 /* BinaryExpression */ && node.operatorToken.kind === 36 /* PlusToken */) {
             if (node.cachedLiteralKind !== undefined) {
                 return node.cachedLiteralKind;
             }
@@ -12428,9 +12995,9 @@ var ts;
     function parenthesizeForNew(expression) {
         var emittedExpression = skipPartiallyEmittedExpressions(expression);
         switch (emittedExpression.kind) {
-            case 175 /* CallExpression */:
+            case 179 /* CallExpression */:
                 return createParen(expression);
-            case 176 /* NewExpression */:
+            case 180 /* NewExpression */:
                 return emittedExpression.arguments
                     ? expression
                     : createParen(expression);
@@ -12455,7 +13022,7 @@ var ts;
         //
         var emittedExpression = skipPartiallyEmittedExpressions(expression);
         if (ts.isLeftHandSideExpression(emittedExpression)
-            && (emittedExpression.kind !== 176 /* NewExpression */ || emittedExpression.arguments)
+            && (emittedExpression.kind !== 180 /* NewExpression */ || emittedExpression.arguments)
             && emittedExpression.kind !== 8 /* NumericLiteral */) {
             return expression;
         }
@@ -12493,7 +13060,7 @@ var ts;
     function parenthesizeExpressionForList(expression) {
         var emittedExpression = skipPartiallyEmittedExpressions(expression);
         var expressionPrecedence = ts.getExpressionPrecedence(emittedExpression);
-        var commaPrecedence = ts.getOperatorPrecedence(188 /* BinaryExpression */, 25 /* CommaToken */);
+        var commaPrecedence = ts.getOperatorPrecedence(192 /* BinaryExpression */, 25 /* CommaToken */);
         return expressionPrecedence > commaPrecedence
             ? expression
             : createParen(expression, /*location*/ expression);
@@ -12504,7 +13071,7 @@ var ts;
         if (ts.isCallExpression(emittedExpression)) {
             var callee = emittedExpression.expression;
             var kind = skipPartiallyEmittedExpressions(callee).kind;
-            if (kind === 180 /* FunctionExpression */ || kind === 181 /* ArrowFunction */) {
+            if (kind === 184 /* FunctionExpression */ || kind === 185 /* ArrowFunction */) {
                 var mutableCall = getMutableClone(emittedExpression);
                 mutableCall.expression = createParen(callee, /*location*/ callee);
                 return recreatePartiallyEmittedExpressions(expression, mutableCall);
@@ -12512,7 +13079,7 @@ var ts;
         }
         else {
             var leftmostExpressionKind = getLeftmostExpression(emittedExpression).kind;
-            if (leftmostExpressionKind === 172 /* ObjectLiteralExpression */ || leftmostExpressionKind === 180 /* FunctionExpression */) {
+            if (leftmostExpressionKind === 176 /* ObjectLiteralExpression */ || leftmostExpressionKind === 184 /* FunctionExpression */) {
                 return createParen(expression, /*location*/ expression);
             }
         }
@@ -12536,21 +13103,21 @@ var ts;
     function getLeftmostExpression(node) {
         while (true) {
             switch (node.kind) {
-                case 187 /* PostfixUnaryExpression */:
+                case 191 /* PostfixUnaryExpression */:
                     node = node.operand;
                     continue;
-                case 188 /* BinaryExpression */:
+                case 192 /* BinaryExpression */:
                     node = node.left;
                     continue;
-                case 189 /* ConditionalExpression */:
+                case 193 /* ConditionalExpression */:
                     node = node.condition;
                     continue;
-                case 175 /* CallExpression */:
-                case 174 /* ElementAccessExpression */:
-                case 173 /* PropertyAccessExpression */:
+                case 179 /* CallExpression */:
+                case 178 /* ElementAccessExpression */:
+                case 177 /* PropertyAccessExpression */:
                     node = node.expression;
                     continue;
-                case 288 /* PartiallyEmittedExpression */:
+                case 293 /* PartiallyEmittedExpression */:
                     node = node.expression;
                     continue;
             }
@@ -12559,19 +13126,19 @@ var ts;
     }
     function parenthesizeConciseBody(body) {
         var emittedBody = skipPartiallyEmittedExpressions(body);
-        if (emittedBody.kind === 172 /* ObjectLiteralExpression */) {
+        if (emittedBody.kind === 176 /* ObjectLiteralExpression */) {
             return createParen(body, /*location*/ body);
         }
         return body;
     }
     ts.parenthesizeConciseBody = parenthesizeConciseBody;
+    var OuterExpressionKinds;
     (function (OuterExpressionKinds) {
         OuterExpressionKinds[OuterExpressionKinds["Parentheses"] = 1] = "Parentheses";
         OuterExpressionKinds[OuterExpressionKinds["Assertions"] = 2] = "Assertions";
         OuterExpressionKinds[OuterExpressionKinds["PartiallyEmittedExpressions"] = 4] = "PartiallyEmittedExpressions";
         OuterExpressionKinds[OuterExpressionKinds["All"] = 7] = "All";
-    })(ts.OuterExpressionKinds || (ts.OuterExpressionKinds = {}));
-    var OuterExpressionKinds = ts.OuterExpressionKinds;
+    })(OuterExpressionKinds = ts.OuterExpressionKinds || (ts.OuterExpressionKinds = {}));
     function skipOuterExpressions(node, kinds) {
         if (kinds === void 0) { kinds = 7 /* All */; }
         var previousNode;
@@ -12591,7 +13158,7 @@ var ts;
     }
     ts.skipOuterExpressions = skipOuterExpressions;
     function skipParentheses(node) {
-        while (node.kind === 179 /* ParenthesizedExpression */) {
+        while (node.kind === 183 /* ParenthesizedExpression */) {
             node = node.expression;
         }
         return node;
@@ -12605,7 +13172,7 @@ var ts;
     }
     ts.skipAssertions = skipAssertions;
     function skipPartiallyEmittedExpressions(node) {
-        while (node.kind === 288 /* PartiallyEmittedExpression */) {
+        while (node.kind === 293 /* PartiallyEmittedExpression */) {
             node = node.expression;
         }
         return node;
@@ -12680,7 +13247,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 === 256 /* SourceFile */) {
+                if (node.kind === 261 /* SourceFile */) {
                     return node.emitNode = { annotatedNodes: [node] };
                 }
                 var sourceFile = ts.getSourceFileOfNode(node);
@@ -12822,13 +13389,13 @@ var ts;
     function getLocalNameForExternalImport(node, sourceFile) {
         var namespaceDeclaration = ts.getNamespaceDeclarationNode(node);
         if (namespaceDeclaration && !ts.isDefaultImport(node)) {
-            var name_9 = namespaceDeclaration.name;
-            return ts.isGeneratedIdentifier(name_9) ? name_9 : createIdentifier(ts.getSourceTextOfNodeFromSourceFile(sourceFile, namespaceDeclaration.name));
+            var name_12 = namespaceDeclaration.name;
+            return ts.isGeneratedIdentifier(name_12) ? name_12 : createIdentifier(ts.getSourceTextOfNodeFromSourceFile(sourceFile, namespaceDeclaration.name));
         }
-        if (node.kind === 231 /* ImportDeclaration */ && node.importClause) {
+        if (node.kind === 235 /* ImportDeclaration */ && node.importClause) {
             return getGeneratedNameForNode(node);
         }
-        if (node.kind === 237 /* ExportDeclaration */ && node.moduleSpecifier) {
+        if (node.kind === 241 /* ExportDeclaration */ && node.moduleSpecifier) {
             return getGeneratedNameForNode(node);
         }
         return undefined;
@@ -12885,6 +13452,363 @@ var ts;
     function tryGetModuleNameFromDeclaration(declaration, host, resolver, compilerOptions) {
         return tryGetModuleNameFromFile(resolver.getExternalModuleFileFromDeclaration(declaration), host, compilerOptions);
     }
+    /**
+     * Transforms the body of a function-like node.
+     *
+     * @param node A function-like node.
+     */
+    function transformFunctionBody(node, visitor, currentSourceFile, context, enableSubstitutionsForCapturedThis, convertObjectRest) {
+        var multiLine = false; // indicates whether the block *must* be emitted as multiple lines
+        var singleLine = false; // indicates whether the block *may* be emitted as a single line
+        var statementsLocation;
+        var closeBraceLocation;
+        var statements = [];
+        var body = node.body;
+        var statementOffset;
+        context.startLexicalEnvironment();
+        if (ts.isBlock(body)) {
+            // ensureUseStrict is false because no new prologue-directive should be added.
+            // addPrologueDirectives will simply put already-existing directives at the beginning of the target statement-array
+            statementOffset = addPrologueDirectives(statements, body.statements, /*ensureUseStrict*/ false, visitor);
+        }
+        addCaptureThisForNodeIfNeeded(statements, node, enableSubstitutionsForCapturedThis);
+        addDefaultValueAssignmentsIfNeeded(statements, node, visitor, convertObjectRest);
+        addRestParameterIfNeeded(statements, node, /*inConstructorWithSynthesizedSuper*/ false);
+        // If we added any generated statements, this must be a multi-line block.
+        if (!multiLine && statements.length > 0) {
+            multiLine = true;
+        }
+        if (ts.isBlock(body)) {
+            statementsLocation = body.statements;
+            ts.addRange(statements, ts.visitNodes(body.statements, visitor, ts.isStatement, statementOffset));
+            // If the original body was a multi-line block, this must be a multi-line block.
+            if (!multiLine && body.multiLine) {
+                multiLine = true;
+            }
+        }
+        else {
+            ts.Debug.assert(node.kind === 185 /* 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
+            // being emitted for the end position only.
+            statementsLocation = ts.moveRangeEnd(body, -1);
+            var equalsGreaterThanToken = node.equalsGreaterThanToken;
+            if (!ts.nodeIsSynthesized(equalsGreaterThanToken) && !ts.nodeIsSynthesized(body)) {
+                if (ts.rangeEndIsOnSameLineAsRangeStart(equalsGreaterThanToken, body, currentSourceFile)) {
+                    singleLine = true;
+                }
+                else {
+                    multiLine = true;
+                }
+            }
+            var expression = ts.visitNode(body, visitor, ts.isExpression);
+            var returnStatement = createReturn(expression, /*location*/ body);
+            setEmitFlags(returnStatement, 12288 /* NoTokenSourceMaps */ | 1024 /* NoTrailingSourceMap */ | 32768 /* NoTrailingComments */);
+            statements.push(returnStatement);
+            // To align with the source map emit for the old emitter, we set a custom
+            // source map location for the close brace.
+            closeBraceLocation = body;
+        }
+        var lexicalEnvironment = context.endLexicalEnvironment();
+        ts.addRange(statements, lexicalEnvironment);
+        // If we added any final generated statements, this must be a multi-line block
+        if (!multiLine && lexicalEnvironment && lexicalEnvironment.length) {
+            multiLine = true;
+        }
+        var block = createBlock(createNodeArray(statements, statementsLocation), node.body, multiLine);
+        if (!multiLine && singleLine) {
+            setEmitFlags(block, 32 /* SingleLine */);
+        }
+        if (closeBraceLocation) {
+            setTokenSourceMapRange(block, 17 /* CloseBraceToken */, closeBraceLocation);
+        }
+        setOriginalNode(block, node.body);
+        return block;
+    }
+    ts.transformFunctionBody = transformFunctionBody;
+    /**
+     * Adds a statement to capture the `this` of a function declaration if it is needed.
+     *
+     * @param statements The statements for the new function body.
+     * @param node A node.
+     */
+    function addCaptureThisForNodeIfNeeded(statements, node, enableSubstitutionsForCapturedThis) {
+        if (node.transformFlags & 524288 /* ContainsCapturedLexicalThis */ && node.kind !== 185 /* ArrowFunction */) {
+            captureThisForNode(statements, node, createThis(), enableSubstitutionsForCapturedThis);
+        }
+    }
+    ts.addCaptureThisForNodeIfNeeded = addCaptureThisForNodeIfNeeded;
+    function captureThisForNode(statements, node, initializer, enableSubstitutionsForCapturedThis, originalStatement) {
+        enableSubstitutionsForCapturedThis();
+        var captureThisStatement = createVariableStatement(
+        /*modifiers*/ undefined, createVariableDeclarationList([
+            createVariableDeclaration("_this", 
+            /*type*/ undefined, initializer)
+        ]), originalStatement);
+        setEmitFlags(captureThisStatement, 49152 /* NoComments */ | 8388608 /* CustomPrologue */);
+        setSourceMapRange(captureThisStatement, node);
+        statements.push(captureThisStatement);
+    }
+    ts.captureThisForNode = captureThisForNode;
+    /**
+     * Gets a value indicating whether we need to add default value assignments for a
+     * function-like node.
+     *
+     * @param node A function-like node.
+     */
+    function shouldAddDefaultValueAssignments(node) {
+        return (node.transformFlags & 2097152 /* ContainsDefaultValueAssignments */) !== 0;
+    }
+    /**
+     * Adds statements to the body of a function-like node if it contains parameters with
+     * binding patterns or initializers.
+     *
+     * @param statements The statements for the new function body.
+     * @param node A function-like node.
+     */
+    function addDefaultValueAssignmentsIfNeeded(statements, node, visitor, convertObjectRest) {
+        if (!shouldAddDefaultValueAssignments(node)) {
+            return;
+        }
+        for (var _i = 0, _a = node.parameters; _i < _a.length; _i++) {
+            var parameter = _a[_i];
+            var name_13 = parameter.name, initializer = parameter.initializer, dotDotDotToken = parameter.dotDotDotToken;
+            // A rest parameter cannot have a binding pattern or an initializer,
+            // so let's just ignore it.
+            if (dotDotDotToken) {
+                continue;
+            }
+            if (ts.isBindingPattern(name_13)) {
+                addDefaultValueAssignmentForBindingPattern(statements, parameter, name_13, initializer, visitor, convertObjectRest);
+            }
+            else if (initializer) {
+                addDefaultValueAssignmentForInitializer(statements, parameter, name_13, initializer, visitor);
+            }
+        }
+    }
+    ts.addDefaultValueAssignmentsIfNeeded = addDefaultValueAssignmentsIfNeeded;
+    /**
+     * Adds statements to the body of a function-like node for parameters with binding patterns
+     *
+     * @param statements The statements for the new function body.
+     * @param parameter The parameter for the function.
+     * @param name The name of the parameter.
+     * @param initializer The initializer for the parameter.
+     */
+    function addDefaultValueAssignmentForBindingPattern(statements, parameter, name, initializer, visitor, convertObjectRest) {
+        var temp = getGeneratedNameForNode(parameter);
+        // In cases where a binding pattern is simply '[]' or '{}',
+        // we usually don't want to emit a var declaration; however, in the presence
+        // of an initializer, we must emit that expression to preserve side effects.
+        if (name.elements.length > 0) {
+            statements.push(setEmitFlags(createVariableStatement(
+            /*modifiers*/ undefined, createVariableDeclarationList(ts.flattenParameterDestructuring(parameter, temp, visitor, convertObjectRest))), 8388608 /* CustomPrologue */));
+        }
+        else if (initializer) {
+            statements.push(setEmitFlags(createStatement(createAssignment(temp, ts.visitNode(initializer, visitor, ts.isExpression))), 8388608 /* CustomPrologue */));
+        }
+    }
+    /**
+     * Adds statements to the body of a function-like node for parameters with initializers.
+     *
+     * @param statements The statements for the new function body.
+     * @param parameter The parameter for the function.
+     * @param name The name of the parameter.
+     * @param initializer The initializer for the parameter.
+     */
+    function addDefaultValueAssignmentForInitializer(statements, parameter, name, initializer, visitor) {
+        initializer = ts.visitNode(initializer, visitor, ts.isExpression);
+        var statement = createIf(createStrictEquality(getSynthesizedClone(name), createVoidZero()), setEmitFlags(createBlock([
+            createStatement(createAssignment(setEmitFlags(getMutableClone(name), 1536 /* NoSourceMap */), setEmitFlags(initializer, 1536 /* NoSourceMap */ | getEmitFlags(initializer)), 
+            /*location*/ parameter))
+        ], /*location*/ parameter), 32 /* SingleLine */ | 1024 /* NoTrailingSourceMap */ | 12288 /* NoTokenSourceMaps */), 
+        /*elseStatement*/ undefined, 
+        /*location*/ parameter);
+        statement.startsOnNewLine = true;
+        setEmitFlags(statement, 12288 /* NoTokenSourceMaps */ | 1024 /* NoTrailingSourceMap */ | 8388608 /* CustomPrologue */);
+        statements.push(statement);
+    }
+    /**
+     * Gets a value indicating whether we need to add statements to handle a rest parameter.
+     *
+     * @param node A ParameterDeclaration node.
+     * @param inConstructorWithSynthesizedSuper A value indicating whether the parameter is
+     *                                          part of a constructor declaration with a
+     *                                          synthesized call to `super`
+     */
+    function shouldAddRestParameter(node, inConstructorWithSynthesizedSuper) {
+        return node && node.dotDotDotToken && node.name.kind === 70 /* Identifier */ && !inConstructorWithSynthesizedSuper;
+    }
+    /**
+     * Adds statements to the body of a function-like node if it contains a rest parameter.
+     *
+     * @param statements The statements for the new function body.
+     * @param node A function-like node.
+     * @param inConstructorWithSynthesizedSuper A value indicating whether the parameter is
+     *                                          part of a constructor declaration with a
+     *                                          synthesized call to `super`
+     */
+    function addRestParameterIfNeeded(statements, node, inConstructorWithSynthesizedSuper) {
+        var parameter = ts.lastOrUndefined(node.parameters);
+        if (!shouldAddRestParameter(parameter, inConstructorWithSynthesizedSuper)) {
+            return;
+        }
+        // `declarationName` is the name of the local declaration for the parameter.
+        var declarationName = getMutableClone(parameter.name);
+        setEmitFlags(declarationName, 1536 /* NoSourceMap */);
+        // `expressionName` is the name of the parameter used in expressions.
+        var expressionName = getSynthesizedClone(parameter.name);
+        var restIndex = node.parameters.length - 1;
+        var temp = createLoopVariable();
+        // var param = [];
+        statements.push(setEmitFlags(createVariableStatement(
+        /*modifiers*/ undefined, createVariableDeclarationList([
+            createVariableDeclaration(declarationName, 
+            /*type*/ undefined, createArrayLiteral([]))
+        ]), 
+        /*location*/ parameter), 8388608 /* CustomPrologue */));
+        // for (var _i = restIndex; _i < arguments.length; _i++) {
+        //   param[_i - restIndex] = arguments[_i];
+        // }
+        var forStatement = createFor(createVariableDeclarationList([
+            createVariableDeclaration(temp, /*type*/ undefined, createLiteral(restIndex))
+        ], /*location*/ parameter), createLessThan(temp, createPropertyAccess(createIdentifier("arguments"), "length"), 
+        /*location*/ parameter), createPostfixIncrement(temp, /*location*/ parameter), createBlock([
+            startOnNewLine(createStatement(createAssignment(createElementAccess(expressionName, createSubtract(temp, createLiteral(restIndex))), createElementAccess(createIdentifier("arguments"), temp)), 
+            /*location*/ parameter))
+        ]));
+        setEmitFlags(forStatement, 8388608 /* CustomPrologue */);
+        startOnNewLine(forStatement);
+        statements.push(forStatement);
+    }
+    ts.addRestParameterIfNeeded = addRestParameterIfNeeded;
+    function convertForOf(node, convertedLoopBodyStatements, visitor, enableSubstitutionsForBlockScopedBindings, context, convertObjectRest) {
+        // The following ES6 code:
+        //
+        //    for (let v of expr) { }
+        //
+        // should be emitted as
+        //
+        //    for (var _i = 0, _a = expr; _i < _a.length; _i++) {
+        //        var v = _a[_i];
+        //    }
+        //
+        // where _a and _i are temps emitted to capture the RHS and the counter,
+        // respectively.
+        // When the left hand side is an expression instead of a let declaration,
+        // the "let v" is not emitted.
+        // When the left hand side is a let/const, the v is renamed if there is
+        // another v in scope.
+        // Note that all assignments to the LHS are emitted in the body, including
+        // all destructuring.
+        // Note also that because an extra statement is needed to assign to the LHS,
+        // for-of bodies are always emitted as blocks.
+        var expression = ts.visitNode(node.expression, visitor, ts.isExpression);
+        var initializer = node.initializer;
+        var statements = [];
+        // In the case where the user wrote an identifier as the RHS, like this:
+        //
+        //     for (let v of arr) { }
+        //
+        // we don't want to emit a temporary variable for the RHS, just use it directly.
+        var counter = convertObjectRest ? undefined : createLoopVariable();
+        var rhsReference = expression.kind === 70 /* Identifier */
+            ? createUniqueName(expression.text)
+            : createTempVariable(/*recordTempVariable*/ undefined);
+        var elementAccess = convertObjectRest ? rhsReference : createElementAccess(rhsReference, counter);
+        // Initialize LHS
+        // var v = _a[_i];
+        if (ts.isVariableDeclarationList(initializer)) {
+            if (initializer.flags & 3 /* BlockScoped */) {
+                enableSubstitutionsForBlockScopedBindings();
+            }
+            var firstOriginalDeclaration = ts.firstOrUndefined(initializer.declarations);
+            if (firstOriginalDeclaration && ts.isBindingPattern(firstOriginalDeclaration.name)) {
+                // This works whether the declaration is a var, let, or const.
+                // It will use rhsIterationValue _a[_i] as the initializer.
+                var declarations = ts.flattenVariableDestructuring(firstOriginalDeclaration, elementAccess, visitor, 
+                /*recordTempVariable*/ undefined, convertObjectRest);
+                var declarationList = createVariableDeclarationList(declarations, /*location*/ initializer);
+                setOriginalNode(declarationList, initializer);
+                // Adjust the source map range for the first declaration to align with the old
+                // emitter.
+                var firstDeclaration = declarations[0];
+                var lastDeclaration = ts.lastOrUndefined(declarations);
+                setSourceMapRange(declarationList, ts.createRange(firstDeclaration.pos, lastDeclaration.end));
+                statements.push(createVariableStatement(
+                /*modifiers*/ undefined, declarationList));
+            }
+            else {
+                // The following call does not include the initializer, so we have
+                // to emit it separately.
+                statements.push(createVariableStatement(
+                /*modifiers*/ undefined, setOriginalNode(createVariableDeclarationList([
+                    createVariableDeclaration(firstOriginalDeclaration ? firstOriginalDeclaration.name : createTempVariable(/*recordTempVariable*/ undefined), 
+                    /*type*/ undefined, createElementAccess(rhsReference, counter))
+                ], /*location*/ ts.moveRangePos(initializer, -1)), initializer), 
+                /*location*/ ts.moveRangeEnd(initializer, -1)));
+            }
+        }
+        else {
+            // Initializer is an expression. Emit the expression in the body, so that it's
+            // evaluated on every iteration.
+            var assignment = createAssignment(initializer, elementAccess);
+            if (ts.isDestructuringAssignment(assignment)) {
+                // This is a destructuring pattern, so we flatten the destructuring instead.
+                statements.push(createStatement(ts.flattenDestructuringAssignment(context, assignment, 
+                /*needsValue*/ false, context.hoistVariableDeclaration, visitor, convertObjectRest)));
+            }
+            else {
+                // Currently there is not way to check that assignment is binary expression of destructing assignment
+                // so we have to cast never type to binaryExpression
+                assignment.end = initializer.end;
+                statements.push(createStatement(assignment, /*location*/ ts.moveRangeEnd(initializer, -1)));
+            }
+        }
+        var bodyLocation;
+        var statementsLocation;
+        if (convertedLoopBodyStatements) {
+            ts.addRange(statements, convertedLoopBodyStatements);
+        }
+        else {
+            var statement = ts.visitNode(node.statement, visitor, ts.isStatement);
+            if (ts.isBlock(statement)) {
+                ts.addRange(statements, statement.statements);
+                bodyLocation = statement;
+                statementsLocation = statement.statements;
+            }
+            else {
+                statements.push(statement);
+            }
+        }
+        // The old emitter does not emit source maps for the expression
+        setEmitFlags(expression, 1536 /* NoSourceMap */ | getEmitFlags(expression));
+        // The old emitter does not emit source maps for the block.
+        // We add the location to preserve comments.
+        var body = createBlock(createNodeArray(statements, /*location*/ statementsLocation), 
+        /*location*/ bodyLocation);
+        setEmitFlags(body, 1536 /* NoSourceMap */ | 12288 /* NoTokenSourceMaps */);
+        var forStatement;
+        if (convertObjectRest) {
+            forStatement = createForOf(createVariableDeclarationList([
+                createVariableDeclaration(rhsReference, /*type*/ undefined, /*initializer*/ undefined, /*location*/ node.expression)
+            ], /*location*/ node.expression), node.expression, body, 
+            /*location*/ node);
+        }
+        else {
+            forStatement = createFor(setEmitFlags(createVariableDeclarationList([
+                createVariableDeclaration(counter, /*type*/ undefined, createLiteral(0), /*location*/ ts.moveRangePos(node.expression, -1)),
+                createVariableDeclaration(rhsReference, /*type*/ undefined, expression, /*location*/ node.expression)
+            ], /*location*/ node.expression), 16777216 /* NoHoisting */), createLessThan(counter, createPropertyAccess(rhsReference, "length"), 
+            /*location*/ node.expression), createPostfixIncrement(counter, /*location*/ node.expression), body, 
+            /*location*/ node);
+        }
+        // Disable trailing source maps for the OpenParenToken to align source map emit with the old emitter.
+        setEmitFlags(forStatement, 8192 /* NoTokenTrailingSourceMaps */);
+        return forStatement;
+    }
+    ts.convertForOf = convertForOf;
 })(ts || (ts = {}));
 /// <reference path="utilities.ts"/>
 /// <reference path="scanner.ts"/>
@@ -12896,13 +13820,13 @@ var ts;
     var IdentifierConstructor;
     var SourceFileConstructor;
     function createNode(kind, pos, end) {
-        if (kind === 256 /* SourceFile */) {
+        if (kind === 261 /* SourceFile */) {
             return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, pos, end);
         }
         else if (kind === 70 /* Identifier */) {
             return new (IdentifierConstructor || (IdentifierConstructor = ts.objectAllocator.getIdentifierConstructor()))(kind, pos, end);
         }
-        else if (kind < 140 /* FirstNode */) {
+        else if (kind < 141 /* FirstNode */) {
             return new (TokenConstructor || (TokenConstructor = ts.objectAllocator.getTokenConstructor()))(kind, pos, end);
         }
         else {
@@ -12945,26 +13869,28 @@ var ts;
         var visitNodes = cbNodeArray ? visitNodeArray : visitEachNode;
         var cbNodes = cbNodeArray || cbNode;
         switch (node.kind) {
-            case 140 /* QualifiedName */:
+            case 141 /* QualifiedName */:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.right);
-            case 142 /* TypeParameter */:
+            case 143 /* TypeParameter */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.constraint) ||
                     visitNode(cbNode, node.expression);
-            case 254 /* ShorthandPropertyAssignment */:
+            case 258 /* ShorthandPropertyAssignment */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.equalsToken) ||
                     visitNode(cbNode, node.objectAssignmentInitializer);
-            case 143 /* Parameter */:
-            case 146 /* PropertyDeclaration */:
-            case 145 /* PropertySignature */:
-            case 253 /* PropertyAssignment */:
-            case 219 /* VariableDeclaration */:
-            case 170 /* BindingElement */:
+            case 259 /* SpreadAssignment */:
+                return visitNode(cbNode, node.expression);
+            case 144 /* Parameter */:
+            case 147 /* PropertyDeclaration */:
+            case 146 /* PropertySignature */:
+            case 257 /* PropertyAssignment */:
+            case 223 /* VariableDeclaration */:
+            case 174 /* BindingElement */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.propertyName) ||
@@ -12973,24 +13899,24 @@ var ts;
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 157 /* FunctionType */:
-            case 158 /* ConstructorType */:
-            case 152 /* CallSignature */:
-            case 153 /* ConstructSignature */:
-            case 154 /* IndexSignature */:
+            case 158 /* FunctionType */:
+            case 159 /* ConstructorType */:
+            case 153 /* CallSignature */:
+            case 154 /* ConstructSignature */:
+            case 155 /* IndexSignature */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNodes(cbNodes, node.typeParameters) ||
                     visitNodes(cbNodes, node.parameters) ||
                     visitNode(cbNode, node.type);
-            case 148 /* MethodDeclaration */:
-            case 147 /* MethodSignature */:
-            case 149 /* Constructor */:
-            case 150 /* GetAccessor */:
-            case 151 /* SetAccessor */:
-            case 180 /* FunctionExpression */:
-            case 221 /* FunctionDeclaration */:
-            case 181 /* ArrowFunction */:
+            case 149 /* MethodDeclaration */:
+            case 148 /* MethodSignature */:
+            case 150 /* Constructor */:
+            case 151 /* GetAccessor */:
+            case 152 /* SetAccessor */:
+            case 184 /* FunctionExpression */:
+            case 225 /* FunctionDeclaration */:
+            case 185 /* ArrowFunction */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.asteriskToken) ||
@@ -13001,308 +13927,318 @@ var ts;
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.equalsGreaterThanToken) ||
                     visitNode(cbNode, node.body);
-            case 156 /* TypeReference */:
+            case 157 /* TypeReference */:
                 return visitNode(cbNode, node.typeName) ||
                     visitNodes(cbNodes, node.typeArguments);
-            case 155 /* TypePredicate */:
+            case 156 /* TypePredicate */:
                 return visitNode(cbNode, node.parameterName) ||
                     visitNode(cbNode, node.type);
-            case 159 /* TypeQuery */:
+            case 160 /* TypeQuery */:
                 return visitNode(cbNode, node.exprName);
-            case 160 /* TypeLiteral */:
+            case 161 /* TypeLiteral */:
                 return visitNodes(cbNodes, node.members);
-            case 161 /* ArrayType */:
+            case 162 /* ArrayType */:
                 return visitNode(cbNode, node.elementType);
-            case 162 /* TupleType */:
+            case 163 /* TupleType */:
                 return visitNodes(cbNodes, node.elementTypes);
-            case 163 /* UnionType */:
-            case 164 /* IntersectionType */:
+            case 164 /* UnionType */:
+            case 165 /* IntersectionType */:
                 return visitNodes(cbNodes, node.types);
-            case 165 /* ParenthesizedType */:
+            case 166 /* ParenthesizedType */:
+            case 168 /* TypeOperator */:
                 return visitNode(cbNode, node.type);
-            case 167 /* LiteralType */:
+            case 169 /* IndexedAccessType */:
+                return visitNode(cbNode, node.objectType) ||
+                    visitNode(cbNode, node.indexType);
+            case 170 /* MappedType */:
+                return visitNode(cbNode, node.readonlyToken) ||
+                    visitNode(cbNode, node.typeParameter) ||
+                    visitNode(cbNode, node.questionToken) ||
+                    visitNode(cbNode, node.type);
+            case 171 /* LiteralType */:
                 return visitNode(cbNode, node.literal);
-            case 168 /* ObjectBindingPattern */:
-            case 169 /* ArrayBindingPattern */:
+            case 172 /* ObjectBindingPattern */:
+            case 173 /* ArrayBindingPattern */:
                 return visitNodes(cbNodes, node.elements);
-            case 171 /* ArrayLiteralExpression */:
+            case 175 /* ArrayLiteralExpression */:
                 return visitNodes(cbNodes, node.elements);
-            case 172 /* ObjectLiteralExpression */:
+            case 176 /* ObjectLiteralExpression */:
                 return visitNodes(cbNodes, node.properties);
-            case 173 /* PropertyAccessExpression */:
+            case 177 /* PropertyAccessExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.name);
-            case 174 /* ElementAccessExpression */:
+            case 178 /* ElementAccessExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.argumentExpression);
-            case 175 /* CallExpression */:
-            case 176 /* NewExpression */:
+            case 179 /* CallExpression */:
+            case 180 /* NewExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNodes, node.typeArguments) ||
                     visitNodes(cbNodes, node.arguments);
-            case 177 /* TaggedTemplateExpression */:
+            case 181 /* TaggedTemplateExpression */:
                 return visitNode(cbNode, node.tag) ||
                     visitNode(cbNode, node.template);
-            case 178 /* TypeAssertionExpression */:
+            case 182 /* TypeAssertionExpression */:
                 return visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.expression);
-            case 179 /* ParenthesizedExpression */:
+            case 183 /* ParenthesizedExpression */:
                 return visitNode(cbNode, node.expression);
-            case 182 /* DeleteExpression */:
+            case 186 /* DeleteExpression */:
                 return visitNode(cbNode, node.expression);
-            case 183 /* TypeOfExpression */:
+            case 187 /* TypeOfExpression */:
                 return visitNode(cbNode, node.expression);
-            case 184 /* VoidExpression */:
+            case 188 /* VoidExpression */:
                 return visitNode(cbNode, node.expression);
-            case 186 /* PrefixUnaryExpression */:
+            case 190 /* PrefixUnaryExpression */:
                 return visitNode(cbNode, node.operand);
-            case 191 /* YieldExpression */:
+            case 195 /* YieldExpression */:
                 return visitNode(cbNode, node.asteriskToken) ||
                     visitNode(cbNode, node.expression);
-            case 185 /* AwaitExpression */:
+            case 189 /* AwaitExpression */:
                 return visitNode(cbNode, node.expression);
-            case 187 /* PostfixUnaryExpression */:
+            case 191 /* PostfixUnaryExpression */:
                 return visitNode(cbNode, node.operand);
-            case 188 /* BinaryExpression */:
+            case 192 /* BinaryExpression */:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.operatorToken) ||
                     visitNode(cbNode, node.right);
-            case 196 /* AsExpression */:
+            case 200 /* AsExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.type);
-            case 197 /* NonNullExpression */:
+            case 201 /* NonNullExpression */:
                 return visitNode(cbNode, node.expression);
-            case 189 /* ConditionalExpression */:
+            case 193 /* ConditionalExpression */:
                 return visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.whenTrue) ||
                     visitNode(cbNode, node.colonToken) ||
                     visitNode(cbNode, node.whenFalse);
-            case 192 /* SpreadElementExpression */:
+            case 196 /* SpreadElement */:
                 return visitNode(cbNode, node.expression);
-            case 200 /* Block */:
-            case 227 /* ModuleBlock */:
+            case 204 /* Block */:
+            case 231 /* ModuleBlock */:
                 return visitNodes(cbNodes, node.statements);
-            case 256 /* SourceFile */:
+            case 261 /* SourceFile */:
                 return visitNodes(cbNodes, node.statements) ||
                     visitNode(cbNode, node.endOfFileToken);
-            case 201 /* VariableStatement */:
+            case 205 /* VariableStatement */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.declarationList);
-            case 220 /* VariableDeclarationList */:
+            case 224 /* VariableDeclarationList */:
                 return visitNodes(cbNodes, node.declarations);
-            case 203 /* ExpressionStatement */:
+            case 207 /* ExpressionStatement */:
                 return visitNode(cbNode, node.expression);
-            case 204 /* IfStatement */:
+            case 208 /* IfStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.thenStatement) ||
                     visitNode(cbNode, node.elseStatement);
-            case 205 /* DoStatement */:
+            case 209 /* DoStatement */:
                 return visitNode(cbNode, node.statement) ||
                     visitNode(cbNode, node.expression);
-            case 206 /* WhileStatement */:
+            case 210 /* WhileStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 207 /* ForStatement */:
+            case 211 /* ForStatement */:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.incrementor) ||
                     visitNode(cbNode, node.statement);
-            case 208 /* ForInStatement */:
+            case 212 /* ForInStatement */:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 209 /* ForOfStatement */:
+            case 213 /* ForOfStatement */:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 210 /* ContinueStatement */:
-            case 211 /* BreakStatement */:
+            case 214 /* ContinueStatement */:
+            case 215 /* BreakStatement */:
                 return visitNode(cbNode, node.label);
-            case 212 /* ReturnStatement */:
+            case 216 /* ReturnStatement */:
                 return visitNode(cbNode, node.expression);
-            case 213 /* WithStatement */:
+            case 217 /* WithStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 214 /* SwitchStatement */:
+            case 218 /* SwitchStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.caseBlock);
-            case 228 /* CaseBlock */:
+            case 232 /* CaseBlock */:
                 return visitNodes(cbNodes, node.clauses);
-            case 249 /* CaseClause */:
+            case 253 /* CaseClause */:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNodes, node.statements);
-            case 250 /* DefaultClause */:
+            case 254 /* DefaultClause */:
                 return visitNodes(cbNodes, node.statements);
-            case 215 /* LabeledStatement */:
+            case 219 /* LabeledStatement */:
                 return visitNode(cbNode, node.label) ||
                     visitNode(cbNode, node.statement);
-            case 216 /* ThrowStatement */:
+            case 220 /* ThrowStatement */:
                 return visitNode(cbNode, node.expression);
-            case 217 /* TryStatement */:
+            case 221 /* TryStatement */:
                 return visitNode(cbNode, node.tryBlock) ||
                     visitNode(cbNode, node.catchClause) ||
                     visitNode(cbNode, node.finallyBlock);
-            case 252 /* CatchClause */:
+            case 256 /* CatchClause */:
                 return visitNode(cbNode, node.variableDeclaration) ||
                     visitNode(cbNode, node.block);
-            case 144 /* Decorator */:
+            case 145 /* Decorator */:
                 return visitNode(cbNode, node.expression);
-            case 222 /* ClassDeclaration */:
-            case 193 /* ClassExpression */:
+            case 226 /* ClassDeclaration */:
+            case 197 /* ClassExpression */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNodes, node.typeParameters) ||
                     visitNodes(cbNodes, node.heritageClauses) ||
                     visitNodes(cbNodes, node.members);
-            case 223 /* InterfaceDeclaration */:
+            case 227 /* InterfaceDeclaration */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNodes, node.typeParameters) ||
                     visitNodes(cbNodes, node.heritageClauses) ||
                     visitNodes(cbNodes, node.members);
-            case 224 /* TypeAliasDeclaration */:
+            case 228 /* TypeAliasDeclaration */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNodes, node.typeParameters) ||
                     visitNode(cbNode, node.type);
-            case 225 /* EnumDeclaration */:
+            case 229 /* EnumDeclaration */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNodes, node.members);
-            case 255 /* EnumMember */:
+            case 260 /* EnumMember */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 226 /* ModuleDeclaration */:
+            case 230 /* ModuleDeclaration */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.body);
-            case 230 /* ImportEqualsDeclaration */:
+            case 234 /* ImportEqualsDeclaration */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.moduleReference);
-            case 231 /* ImportDeclaration */:
+            case 235 /* ImportDeclaration */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.importClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 232 /* ImportClause */:
+            case 236 /* ImportClause */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.namedBindings);
-            case 229 /* NamespaceExportDeclaration */:
+            case 233 /* NamespaceExportDeclaration */:
                 return visitNode(cbNode, node.name);
-            case 233 /* NamespaceImport */:
+            case 237 /* NamespaceImport */:
                 return visitNode(cbNode, node.name);
-            case 234 /* NamedImports */:
-            case 238 /* NamedExports */:
+            case 238 /* NamedImports */:
+            case 242 /* NamedExports */:
                 return visitNodes(cbNodes, node.elements);
-            case 237 /* ExportDeclaration */:
+            case 241 /* ExportDeclaration */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.exportClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 235 /* ImportSpecifier */:
-            case 239 /* ExportSpecifier */:
+            case 239 /* ImportSpecifier */:
+            case 243 /* ExportSpecifier */:
                 return visitNode(cbNode, node.propertyName) ||
                     visitNode(cbNode, node.name);
-            case 236 /* ExportAssignment */:
+            case 240 /* ExportAssignment */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.expression);
-            case 190 /* TemplateExpression */:
+            case 194 /* TemplateExpression */:
                 return visitNode(cbNode, node.head) || visitNodes(cbNodes, node.templateSpans);
-            case 198 /* TemplateSpan */:
+            case 202 /* TemplateSpan */:
                 return visitNode(cbNode, node.expression) || visitNode(cbNode, node.literal);
-            case 141 /* ComputedPropertyName */:
+            case 142 /* ComputedPropertyName */:
                 return visitNode(cbNode, node.expression);
-            case 251 /* HeritageClause */:
+            case 255 /* HeritageClause */:
                 return visitNodes(cbNodes, node.types);
-            case 195 /* ExpressionWithTypeArguments */:
+            case 199 /* ExpressionWithTypeArguments */:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNodes, node.typeArguments);
-            case 241 /* ExternalModuleReference */:
+            case 245 /* ExternalModuleReference */:
                 return visitNode(cbNode, node.expression);
-            case 240 /* MissingDeclaration */:
+            case 244 /* MissingDeclaration */:
                 return visitNodes(cbNodes, node.decorators);
-            case 242 /* JsxElement */:
+            case 246 /* JsxElement */:
                 return visitNode(cbNode, node.openingElement) ||
                     visitNodes(cbNodes, node.children) ||
                     visitNode(cbNode, node.closingElement);
-            case 243 /* JsxSelfClosingElement */:
-            case 244 /* JsxOpeningElement */:
+            case 247 /* JsxSelfClosingElement */:
+            case 248 /* JsxOpeningElement */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNodes(cbNodes, node.attributes);
-            case 246 /* JsxAttribute */:
+            case 250 /* JsxAttribute */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 247 /* JsxSpreadAttribute */:
+            case 251 /* JsxSpreadAttribute */:
                 return visitNode(cbNode, node.expression);
-            case 248 /* JsxExpression */:
+            case 252 /* JsxExpression */:
                 return visitNode(cbNode, node.expression);
-            case 245 /* JsxClosingElement */:
+            case 249 /* JsxClosingElement */:
                 return visitNode(cbNode, node.tagName);
-            case 257 /* JSDocTypeExpression */:
+            case 262 /* JSDocTypeExpression */:
                 return visitNode(cbNode, node.type);
-            case 261 /* JSDocUnionType */:
+            case 266 /* JSDocUnionType */:
                 return visitNodes(cbNodes, node.types);
-            case 262 /* JSDocTupleType */:
+            case 267 /* JSDocTupleType */:
                 return visitNodes(cbNodes, node.types);
-            case 260 /* JSDocArrayType */:
+            case 265 /* JSDocArrayType */:
                 return visitNode(cbNode, node.elementType);
-            case 264 /* JSDocNonNullableType */:
+            case 269 /* JSDocNonNullableType */:
                 return visitNode(cbNode, node.type);
-            case 263 /* JSDocNullableType */:
+            case 268 /* JSDocNullableType */:
                 return visitNode(cbNode, node.type);
-            case 265 /* JSDocRecordType */:
+            case 270 /* JSDocRecordType */:
                 return visitNode(cbNode, node.literal);
-            case 267 /* JSDocTypeReference */:
+            case 272 /* JSDocTypeReference */:
                 return visitNode(cbNode, node.name) ||
                     visitNodes(cbNodes, node.typeArguments);
-            case 268 /* JSDocOptionalType */:
+            case 273 /* JSDocOptionalType */:
                 return visitNode(cbNode, node.type);
-            case 269 /* JSDocFunctionType */:
+            case 274 /* JSDocFunctionType */:
                 return visitNodes(cbNodes, node.parameters) ||
                     visitNode(cbNode, node.type);
-            case 270 /* JSDocVariadicType */:
+            case 275 /* JSDocVariadicType */:
                 return visitNode(cbNode, node.type);
-            case 271 /* JSDocConstructorType */:
+            case 276 /* JSDocConstructorType */:
                 return visitNode(cbNode, node.type);
-            case 272 /* JSDocThisType */:
+            case 277 /* JSDocThisType */:
                 return visitNode(cbNode, node.type);
-            case 266 /* JSDocRecordMember */:
+            case 271 /* JSDocRecordMember */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.type);
-            case 273 /* JSDocComment */:
+            case 278 /* JSDocComment */:
                 return visitNodes(cbNodes, node.tags);
-            case 275 /* JSDocParameterTag */:
+            case 280 /* JSDocParameterTag */:
                 return visitNode(cbNode, node.preParameterName) ||
                     visitNode(cbNode, node.typeExpression) ||
                     visitNode(cbNode, node.postParameterName);
-            case 276 /* JSDocReturnTag */:
+            case 281 /* JSDocReturnTag */:
                 return visitNode(cbNode, node.typeExpression);
-            case 277 /* JSDocTypeTag */:
+            case 282 /* JSDocTypeTag */:
                 return visitNode(cbNode, node.typeExpression);
-            case 278 /* JSDocTemplateTag */:
+            case 283 /* JSDocTemplateTag */:
                 return visitNodes(cbNodes, node.typeParameters);
-            case 279 /* JSDocTypedefTag */:
+            case 284 /* JSDocTypedefTag */:
                 return visitNode(cbNode, node.typeExpression) ||
+                    visitNode(cbNode, node.fullName) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.jsDocTypeLiteral);
-            case 281 /* JSDocTypeLiteral */:
+            case 286 /* JSDocTypeLiteral */:
                 return visitNodes(cbNodes, node.jsDocPropertyTags);
-            case 280 /* JSDocPropertyTag */:
+            case 285 /* JSDocPropertyTag */:
                 return visitNode(cbNode, node.typeExpression) ||
                     visitNode(cbNode, node.name);
-            case 288 /* PartiallyEmittedExpression */:
+            case 293 /* PartiallyEmittedExpression */:
                 return visitNode(cbNode, node.expression);
-            case 282 /* JSDocLiteralType */:
+            case 287 /* JSDocLiteralType */:
                 return visitNode(cbNode, node.literal);
         }
     }
@@ -13316,6 +14252,10 @@ var ts;
         return result;
     }
     ts.createSourceFile = createSourceFile;
+    function parseIsolatedEntityName(text, languageVersion) {
+        return Parser.parseIsolatedEntityName(text, languageVersion);
+    }
+    ts.parseIsolatedEntityName = parseIsolatedEntityName;
     function isExternalModule(file) {
         return file.externalModuleIndicator !== undefined;
     }
@@ -13357,8 +14297,8 @@ 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(4 /* Latest */, /*skipTrivia*/ true);
-        var disallowInAndDecoratorContext = 32768 /* DisallowInContext */ | 131072 /* DecoratorContext */;
+        var scanner = ts.createScanner(5 /* Latest */, /*skipTrivia*/ true);
+        var disallowInAndDecoratorContext = 65536 /* DisallowInContext */ | 262144 /* DecoratorContext */;
         // capture constructors in 'initializeState' to avoid null checks
         var NodeConstructor;
         var TokenConstructor;
@@ -13456,6 +14396,16 @@ var ts;
             return result;
         }
         Parser.parseSourceFile = parseSourceFile;
+        function parseIsolatedEntityName(content, languageVersion) {
+            initializeState(content, languageVersion, /*syntaxCursor*/ undefined, 1 /* JS */);
+            // Prime the scanner.
+            nextToken();
+            var entityName = parseEntityName(/*allowReservedWords*/ true);
+            var isInvalid = token() === 1 /* EndOfFileToken */ && !parseDiagnostics.length;
+            clearState();
+            return isInvalid ? entityName : undefined;
+        }
+        Parser.parseIsolatedEntityName = parseIsolatedEntityName;
         function getLanguageVariant(scriptKind) {
             // .tsx and .jsx files are treated as jsx language variant.
             return scriptKind === 4 /* TSX */ || scriptKind === 2 /* JSX */ || scriptKind === 1 /* JS */ ? 1 /* JSX */ : 0 /* Standard */;
@@ -13472,7 +14422,7 @@ var ts;
             identifiers = ts.createMap();
             identifierCount = 0;
             nodeCount = 0;
-            contextFlags = scriptKind === 1 /* JS */ || scriptKind === 2 /* JSX */ ? 1048576 /* JavaScriptFile */ : 0 /* None */;
+            contextFlags = scriptKind === 1 /* JS */ || scriptKind === 2 /* JSX */ ? 2097152 /* JavaScriptFile */ : 0 /* None */;
             parseErrorBeforeNextFinishedNode = false;
             // Initialize and prime the scanner before parsing the source elements.
             scanner.setText(sourceText);
@@ -13560,7 +14510,7 @@ var ts;
         function createSourceFile(fileName, languageVersion, scriptKind) {
             // 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(256 /* SourceFile */, /*pos*/ 0, /* end */ sourceText.length);
+            var sourceFile = new SourceFileConstructor(261 /* SourceFile */, /*pos*/ 0, /* end */ sourceText.length);
             nodeCount++;
             sourceFile.text = sourceText;
             sourceFile.bindDiagnostics = [];
@@ -13580,16 +14530,16 @@ var ts;
             }
         }
         function setDisallowInContext(val) {
-            setContextFlag(val, 32768 /* DisallowInContext */);
+            setContextFlag(val, 65536 /* DisallowInContext */);
         }
         function setYieldContext(val) {
-            setContextFlag(val, 65536 /* YieldContext */);
+            setContextFlag(val, 131072 /* YieldContext */);
         }
         function setDecoratorContext(val) {
-            setContextFlag(val, 131072 /* DecoratorContext */);
+            setContextFlag(val, 262144 /* DecoratorContext */);
         }
         function setAwaitContext(val) {
-            setContextFlag(val, 262144 /* AwaitContext */);
+            setContextFlag(val, 524288 /* AwaitContext */);
         }
         function doOutsideOfContext(context, func) {
             // contextFlagsToClear will contain only the context flags that are
@@ -13630,40 +14580,40 @@ var ts;
             return func();
         }
         function allowInAnd(func) {
-            return doOutsideOfContext(32768 /* DisallowInContext */, func);
+            return doOutsideOfContext(65536 /* DisallowInContext */, func);
         }
         function disallowInAnd(func) {
-            return doInsideOfContext(32768 /* DisallowInContext */, func);
+            return doInsideOfContext(65536 /* DisallowInContext */, func);
         }
         function doInYieldContext(func) {
-            return doInsideOfContext(65536 /* YieldContext */, func);
+            return doInsideOfContext(131072 /* YieldContext */, func);
         }
         function doInDecoratorContext(func) {
-            return doInsideOfContext(131072 /* DecoratorContext */, func);
+            return doInsideOfContext(262144 /* DecoratorContext */, func);
         }
         function doInAwaitContext(func) {
-            return doInsideOfContext(262144 /* AwaitContext */, func);
+            return doInsideOfContext(524288 /* AwaitContext */, func);
         }
         function doOutsideOfAwaitContext(func) {
-            return doOutsideOfContext(262144 /* AwaitContext */, func);
+            return doOutsideOfContext(524288 /* AwaitContext */, func);
         }
         function doInYieldAndAwaitContext(func) {
-            return doInsideOfContext(65536 /* YieldContext */ | 262144 /* AwaitContext */, func);
+            return doInsideOfContext(131072 /* YieldContext */ | 524288 /* AwaitContext */, func);
         }
         function inContext(flags) {
             return (contextFlags & flags) !== 0;
         }
         function inYieldContext() {
-            return inContext(65536 /* YieldContext */);
+            return inContext(131072 /* YieldContext */);
         }
         function inDisallowInContext() {
-            return inContext(32768 /* DisallowInContext */);
+            return inContext(65536 /* DisallowInContext */);
         }
         function inDecoratorContext() {
-            return inContext(131072 /* DecoratorContext */);
+            return inContext(262144 /* DecoratorContext */);
         }
         function inAwaitContext() {
-            return inContext(262144 /* AwaitContext */);
+            return inContext(524288 /* AwaitContext */);
         }
         function parseErrorAtCurrentToken(message, arg0) {
             var start = scanner.getTokenPos();
@@ -13844,7 +14794,7 @@ var ts;
             if (!(pos >= 0)) {
                 pos = scanner.getStartPos();
             }
-            return kind >= 140 /* FirstNode */ ? new NodeConstructor(kind, pos, pos) :
+            return kind >= 141 /* FirstNode */ ? new NodeConstructor(kind, pos, pos) :
                 kind === 70 /* Identifier */ ? new IdentifierConstructor(kind, pos, pos) :
                     new TokenConstructor(kind, pos, pos);
         }
@@ -13867,7 +14817,7 @@ var ts;
             // flag so that we don't mark any subsequent nodes.
             if (parseErrorBeforeNextFinishedNode) {
                 parseErrorBeforeNextFinishedNode = false;
-                node.flags |= 524288 /* ThisNodeHasError */;
+                node.flags |= 1048576 /* ThisNodeHasError */;
             }
             return node;
         }
@@ -13936,7 +14886,7 @@ var ts;
             // PropertyName [Yield]:
             //      LiteralPropertyName
             //      ComputedPropertyName[?Yield]
-            var node = createNode(141 /* ComputedPropertyName */);
+            var node = createNode(142 /* ComputedPropertyName */);
             parseExpected(20 /* OpenBracketToken */);
             // We parse any expression (including a comma expression). But the grammar
             // says that only an assignment expression is allowed, so the grammar checker
@@ -14023,9 +14973,11 @@ var ts;
                     // which would be a candidate for improved error reporting.
                     return token() === 20 /* OpenBracketToken */ || isLiteralPropertyName();
                 case 12 /* ObjectLiteralMembers */:
-                    return token() === 20 /* OpenBracketToken */ || token() === 38 /* AsteriskToken */ || isLiteralPropertyName();
+                    return token() === 20 /* OpenBracketToken */ || token() === 38 /* AsteriskToken */ || token() === 23 /* DotDotDotToken */ || isLiteralPropertyName();
+                case 17 /* RestProperties */:
+                    return isLiteralPropertyName();
                 case 9 /* ObjectBindingElements */:
-                    return token() === 20 /* OpenBracketToken */ || isLiteralPropertyName();
+                    return token() === 20 /* OpenBracketToken */ || token() === 23 /* DotDotDotToken */ || isLiteralPropertyName();
                 case 7 /* HeritageClauseElement */:
                     // If we see { } then only consume it as an expression if it is followed by , or {
                     // That way we won't consume the body of a class in its heritage clause.
@@ -14045,29 +14997,29 @@ var ts;
                     return isIdentifierOrPattern();
                 case 10 /* ArrayBindingElements */:
                     return token() === 25 /* CommaToken */ || token() === 23 /* DotDotDotToken */ || isIdentifierOrPattern();
-                case 17 /* TypeParameters */:
+                case 18 /* TypeParameters */:
                     return isIdentifier();
                 case 11 /* ArgumentExpressions */:
                 case 15 /* ArrayLiteralMembers */:
                     return token() === 25 /* CommaToken */ || token() === 23 /* DotDotDotToken */ || isStartOfExpression();
                 case 16 /* Parameters */:
                     return isStartOfParameter();
-                case 18 /* TypeArguments */:
-                case 19 /* TupleElementTypes */:
+                case 19 /* TypeArguments */:
+                case 20 /* TupleElementTypes */:
                     return token() === 25 /* CommaToken */ || isStartOfType();
-                case 20 /* HeritageClauses */:
+                case 21 /* HeritageClauses */:
                     return isHeritageClause();
-                case 21 /* ImportOrExportSpecifiers */:
+                case 22 /* ImportOrExportSpecifiers */:
                     return ts.tokenIsIdentifierOrKeyword(token());
                 case 13 /* JsxAttributes */:
                     return ts.tokenIsIdentifierOrKeyword(token()) || token() === 16 /* OpenBraceToken */;
                 case 14 /* JsxChildren */:
                     return true;
-                case 22 /* JSDocFunctionParameters */:
-                case 23 /* JSDocTypeArguments */:
-                case 25 /* JSDocTupleTypes */:
+                case 23 /* JSDocFunctionParameters */:
+                case 24 /* JSDocTypeArguments */:
+                case 26 /* JSDocTupleTypes */:
                     return JSDocParser.isJSDocType();
-                case 24 /* JSDocRecordMembers */:
+                case 25 /* JSDocRecordMembers */:
                     return isSimplePropertyName();
             }
             ts.Debug.fail("Non-exhaustive case in 'isListElement'.");
@@ -14120,7 +15072,7 @@ var ts;
                 case 6 /* EnumMembers */:
                 case 12 /* ObjectLiteralMembers */:
                 case 9 /* ObjectBindingElements */:
-                case 21 /* ImportOrExportSpecifiers */:
+                case 22 /* ImportOrExportSpecifiers */:
                     return token() === 17 /* CloseBraceToken */;
                 case 3 /* SwitchClauseStatements */:
                     return token() === 17 /* CloseBraceToken */ || token() === 72 /* CaseKeyword */ || token() === 78 /* DefaultKeyword */;
@@ -14128,35 +15080,36 @@ var ts;
                     return token() === 16 /* OpenBraceToken */ || token() === 84 /* ExtendsKeyword */ || token() === 107 /* ImplementsKeyword */;
                 case 8 /* VariableDeclarations */:
                     return isVariableDeclaratorListTerminator();
-                case 17 /* TypeParameters */:
+                case 18 /* TypeParameters */:
                     // Tokens other than '>' are here for better error recovery
                     return token() === 28 /* GreaterThanToken */ || token() === 18 /* OpenParenToken */ || token() === 16 /* OpenBraceToken */ || token() === 84 /* ExtendsKeyword */ || token() === 107 /* ImplementsKeyword */;
                 case 11 /* ArgumentExpressions */:
                     // Tokens other than ')' are here for better error recovery
                     return token() === 19 /* CloseParenToken */ || token() === 24 /* SemicolonToken */;
                 case 15 /* ArrayLiteralMembers */:
-                case 19 /* TupleElementTypes */:
+                case 20 /* TupleElementTypes */:
                 case 10 /* ArrayBindingElements */:
                     return token() === 21 /* CloseBracketToken */;
                 case 16 /* Parameters */:
+                case 17 /* RestProperties */:
                     // Tokens other than ')' and ']' (the latter for index signatures) are here for better error recovery
                     return token() === 19 /* CloseParenToken */ || token() === 21 /* CloseBracketToken */ /*|| token === SyntaxKind.OpenBraceToken*/;
-                case 18 /* TypeArguments */:
+                case 19 /* TypeArguments */:
                     // All other tokens should cause the type-argument to terminate except comma token
                     return token() !== 25 /* CommaToken */;
-                case 20 /* HeritageClauses */:
+                case 21 /* HeritageClauses */:
                     return token() === 16 /* OpenBraceToken */ || token() === 17 /* CloseBraceToken */;
                 case 13 /* JsxAttributes */:
                     return token() === 28 /* GreaterThanToken */ || token() === 40 /* SlashToken */;
                 case 14 /* JsxChildren */:
                     return token() === 26 /* LessThanToken */ && lookAhead(nextTokenIsSlash);
-                case 22 /* JSDocFunctionParameters */:
+                case 23 /* JSDocFunctionParameters */:
                     return token() === 19 /* CloseParenToken */ || token() === 55 /* ColonToken */ || token() === 17 /* CloseBraceToken */;
-                case 23 /* JSDocTypeArguments */:
+                case 24 /* JSDocTypeArguments */:
                     return token() === 28 /* GreaterThanToken */ || token() === 17 /* CloseBraceToken */;
-                case 25 /* JSDocTupleTypes */:
+                case 26 /* JSDocTupleTypes */:
                     return token() === 21 /* CloseBracketToken */ || token() === 17 /* CloseBraceToken */;
-                case 24 /* JSDocRecordMembers */:
+                case 25 /* JSDocRecordMembers */:
                     return token() === 17 /* CloseBraceToken */;
             }
         }
@@ -14183,7 +15136,7 @@ var ts;
         }
         // True if positioned at element or terminator of the current list or any enclosing list
         function isInSomeParsingContext() {
-            for (var kind = 0; kind < 26 /* Count */; kind++) {
+            for (var kind = 0; kind < 27 /* Count */; kind++) {
                 if (parsingContext & (1 << kind)) {
                     if (isListElement(kind, /*inErrorRecovery*/ true) || isListTerminator(kind)) {
                         return true;
@@ -14258,7 +15211,7 @@ var ts;
             // differently depending on what mode it is in.
             //
             // This also applies to all our other context flags as well.
-            var nodeContextFlags = node.flags & 1540096 /* ContextFlags */;
+            var nodeContextFlags = node.flags & 3080192 /* ContextFlags */;
             if (nodeContextFlags !== contextFlags) {
                 return undefined;
             }
@@ -14293,20 +15246,22 @@ var ts;
                     return isReusableVariableDeclaration(node);
                 case 16 /* Parameters */:
                     return isReusableParameter(node);
+                case 17 /* RestProperties */:
+                    return false;
                 // Any other lists we do not care about reusing nodes in.  But feel free to add if
                 // you can do so safely.  Danger areas involve nodes that may involve speculative
                 // parsing.  If speculative parsing is involved with the node, then the range the
                 // parser reached while looking ahead might be in the edited range (see the example
                 // in canReuseVariableDeclaratorNode for a good case of this).
-                case 20 /* HeritageClauses */:
+                case 21 /* HeritageClauses */:
                 // This would probably be safe to reuse.  There is no speculative parsing with
                 // heritage clauses.
-                case 17 /* TypeParameters */:
+                case 18 /* TypeParameters */:
                 // This would probably be safe to reuse.  There is no speculative parsing with
                 // type parameters.  Note that that's because type *parameters* only occur in
                 // unambiguous *type* contexts.  While type *arguments* occur in very ambiguous
                 // *expression* contexts.
-                case 19 /* TupleElementTypes */:
+                case 20 /* TupleElementTypes */:
                 // This would probably be safe to reuse.  There is no speculative parsing with
                 // tuple types.
                 // Technically, type argument list types are probably safe to reuse.  While
@@ -14314,7 +15269,7 @@ var ts;
                 // produced from speculative parsing a < as a type argument list), we only have
                 // the types because speculative parsing succeeded.  Thus, the lookahead never
                 // went past the end of the list and rewound.
-                case 18 /* TypeArguments */:
+                case 19 /* TypeArguments */:
                 // Note: these are almost certainly not safe to ever reuse.  Expressions commonly
                 // need a large amount of lookahead, and we should not reuse them as they may
                 // have actually intersected the edit.
@@ -14338,14 +15293,14 @@ var ts;
         function isReusableClassMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 149 /* Constructor */:
-                    case 154 /* IndexSignature */:
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
-                    case 146 /* PropertyDeclaration */:
-                    case 199 /* SemicolonClassElement */:
+                    case 150 /* Constructor */:
+                    case 155 /* IndexSignature */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* SetAccessor */:
+                    case 147 /* PropertyDeclaration */:
+                    case 203 /* SemicolonClassElement */:
                         return true;
-                    case 148 /* MethodDeclaration */:
+                    case 149 /* 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.
@@ -14360,8 +15315,8 @@ var ts;
         function isReusableSwitchClause(node) {
             if (node) {
                 switch (node.kind) {
-                    case 249 /* CaseClause */:
-                    case 250 /* DefaultClause */:
+                    case 253 /* CaseClause */:
+                    case 254 /* DefaultClause */:
                         return true;
                 }
             }
@@ -14370,58 +15325,58 @@ var ts;
         function isReusableStatement(node) {
             if (node) {
                 switch (node.kind) {
-                    case 221 /* FunctionDeclaration */:
-                    case 201 /* VariableStatement */:
-                    case 200 /* Block */:
-                    case 204 /* IfStatement */:
-                    case 203 /* ExpressionStatement */:
-                    case 216 /* ThrowStatement */:
-                    case 212 /* ReturnStatement */:
-                    case 214 /* SwitchStatement */:
-                    case 211 /* BreakStatement */:
-                    case 210 /* ContinueStatement */:
-                    case 208 /* ForInStatement */:
-                    case 209 /* ForOfStatement */:
-                    case 207 /* ForStatement */:
-                    case 206 /* WhileStatement */:
-                    case 213 /* WithStatement */:
-                    case 202 /* EmptyStatement */:
-                    case 217 /* TryStatement */:
-                    case 215 /* LabeledStatement */:
-                    case 205 /* DoStatement */:
-                    case 218 /* DebuggerStatement */:
-                    case 231 /* ImportDeclaration */:
-                    case 230 /* ImportEqualsDeclaration */:
-                    case 237 /* ExportDeclaration */:
-                    case 236 /* ExportAssignment */:
-                    case 226 /* ModuleDeclaration */:
-                    case 222 /* ClassDeclaration */:
-                    case 223 /* InterfaceDeclaration */:
-                    case 225 /* EnumDeclaration */:
-                    case 224 /* TypeAliasDeclaration */:
+                    case 225 /* FunctionDeclaration */:
+                    case 205 /* VariableStatement */:
+                    case 204 /* Block */:
+                    case 208 /* IfStatement */:
+                    case 207 /* ExpressionStatement */:
+                    case 220 /* ThrowStatement */:
+                    case 216 /* ReturnStatement */:
+                    case 218 /* SwitchStatement */:
+                    case 215 /* BreakStatement */:
+                    case 214 /* ContinueStatement */:
+                    case 212 /* ForInStatement */:
+                    case 213 /* ForOfStatement */:
+                    case 211 /* ForStatement */:
+                    case 210 /* WhileStatement */:
+                    case 217 /* WithStatement */:
+                    case 206 /* EmptyStatement */:
+                    case 221 /* TryStatement */:
+                    case 219 /* LabeledStatement */:
+                    case 209 /* DoStatement */:
+                    case 222 /* DebuggerStatement */:
+                    case 235 /* ImportDeclaration */:
+                    case 234 /* ImportEqualsDeclaration */:
+                    case 241 /* ExportDeclaration */:
+                    case 240 /* ExportAssignment */:
+                    case 230 /* ModuleDeclaration */:
+                    case 226 /* ClassDeclaration */:
+                    case 227 /* InterfaceDeclaration */:
+                    case 229 /* EnumDeclaration */:
+                    case 228 /* TypeAliasDeclaration */:
                         return true;
                 }
             }
             return false;
         }
         function isReusableEnumMember(node) {
-            return node.kind === 255 /* EnumMember */;
+            return node.kind === 260 /* EnumMember */;
         }
         function isReusableTypeMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 153 /* ConstructSignature */:
-                    case 147 /* MethodSignature */:
-                    case 154 /* IndexSignature */:
-                    case 145 /* PropertySignature */:
-                    case 152 /* CallSignature */:
+                    case 154 /* ConstructSignature */:
+                    case 148 /* MethodSignature */:
+                    case 155 /* IndexSignature */:
+                    case 146 /* PropertySignature */:
+                    case 153 /* CallSignature */:
                         return true;
                 }
             }
             return false;
         }
         function isReusableVariableDeclaration(node) {
-            if (node.kind !== 219 /* VariableDeclaration */) {
+            if (node.kind !== 223 /* VariableDeclaration */) {
                 return false;
             }
             // Very subtle incremental parsing bug.  Consider the following code:
@@ -14442,7 +15397,7 @@ var ts;
             return variableDeclarator.initializer === undefined;
         }
         function isReusableParameter(node) {
-            if (node.kind !== 143 /* Parameter */) {
+            if (node.kind !== 144 /* Parameter */) {
                 return false;
             }
             // See the comment in isReusableVariableDeclaration for why we do this.
@@ -14464,6 +15419,7 @@ var ts;
                 case 1 /* BlockStatements */: return ts.Diagnostics.Declaration_or_statement_expected;
                 case 2 /* SwitchClauses */: return ts.Diagnostics.case_or_default_expected;
                 case 3 /* SwitchClauseStatements */: return ts.Diagnostics.Statement_expected;
+                case 17 /* RestProperties */: // fallthrough
                 case 4 /* TypeMembers */: return ts.Diagnostics.Property_or_signature_expected;
                 case 5 /* ClassMembers */: return ts.Diagnostics.Unexpected_token_A_constructor_method_accessor_or_property_was_expected;
                 case 6 /* EnumMembers */: return ts.Diagnostics.Enum_member_expected;
@@ -14475,17 +15431,17 @@ var ts;
                 case 12 /* ObjectLiteralMembers */: return ts.Diagnostics.Property_assignment_expected;
                 case 15 /* ArrayLiteralMembers */: return ts.Diagnostics.Expression_or_comma_expected;
                 case 16 /* Parameters */: return ts.Diagnostics.Parameter_declaration_expected;
-                case 17 /* TypeParameters */: return ts.Diagnostics.Type_parameter_declaration_expected;
-                case 18 /* TypeArguments */: return ts.Diagnostics.Type_argument_expected;
-                case 19 /* TupleElementTypes */: return ts.Diagnostics.Type_expected;
-                case 20 /* HeritageClauses */: return ts.Diagnostics.Unexpected_token_expected;
-                case 21 /* ImportOrExportSpecifiers */: return ts.Diagnostics.Identifier_expected;
+                case 18 /* TypeParameters */: return ts.Diagnostics.Type_parameter_declaration_expected;
+                case 19 /* TypeArguments */: return ts.Diagnostics.Type_argument_expected;
+                case 20 /* TupleElementTypes */: return ts.Diagnostics.Type_expected;
+                case 21 /* HeritageClauses */: return ts.Diagnostics.Unexpected_token_expected;
+                case 22 /* ImportOrExportSpecifiers */: return ts.Diagnostics.Identifier_expected;
                 case 13 /* JsxAttributes */: return ts.Diagnostics.Identifier_expected;
                 case 14 /* JsxChildren */: return ts.Diagnostics.Identifier_expected;
-                case 22 /* JSDocFunctionParameters */: return ts.Diagnostics.Parameter_declaration_expected;
-                case 23 /* JSDocTypeArguments */: return ts.Diagnostics.Type_argument_expected;
-                case 25 /* JSDocTupleTypes */: return ts.Diagnostics.Type_expected;
-                case 24 /* JSDocRecordMembers */: return ts.Diagnostics.Property_assignment_expected;
+                case 23 /* JSDocFunctionParameters */: return ts.Diagnostics.Parameter_declaration_expected;
+                case 24 /* JSDocTypeArguments */: return ts.Diagnostics.Type_argument_expected;
+                case 26 /* JSDocTupleTypes */: return ts.Diagnostics.Type_expected;
+                case 25 /* JSDocRecordMembers */: return ts.Diagnostics.Property_assignment_expected;
             }
         }
         ;
@@ -14554,7 +15510,7 @@ var ts;
         function parseEntityName(allowReservedWords, diagnosticMessage) {
             var entity = parseIdentifier(diagnosticMessage);
             while (parseOptional(22 /* DotToken */)) {
-                var node = createNode(140 /* QualifiedName */, entity.pos); // !!!
+                var node = createNode(141 /* QualifiedName */, entity.pos); // !!!
                 node.left = entity;
                 node.right = parseRightSideOfDot(allowReservedWords);
                 entity = finishNode(node);
@@ -14593,7 +15549,7 @@ var ts;
             return allowIdentifierNames ? parseIdentifierName() : parseIdentifier();
         }
         function parseTemplateExpression() {
-            var template = createNode(190 /* TemplateExpression */);
+            var template = createNode(194 /* TemplateExpression */);
             template.head = parseTemplateHead();
             ts.Debug.assert(template.head.kind === 13 /* TemplateHead */, "Template head has wrong token kind");
             var templateSpans = createNodeArray();
@@ -14605,7 +15561,7 @@ var ts;
             return finishNode(template);
         }
         function parseTemplateSpan() {
-            var span = createNode(198 /* TemplateSpan */);
+            var span = createNode(202 /* TemplateSpan */);
             span.expression = allowInAnd(parseExpression);
             var literal;
             if (token() === 17 /* CloseBraceToken */) {
@@ -14660,33 +15616,33 @@ var ts;
         // TYPES
         function parseTypeReference() {
             var typeName = parseEntityName(/*allowReservedWords*/ false, ts.Diagnostics.Type_expected);
-            var node = createNode(156 /* TypeReference */, typeName.pos);
+            var node = createNode(157 /* TypeReference */, typeName.pos);
             node.typeName = typeName;
             if (!scanner.hasPrecedingLineBreak() && token() === 26 /* LessThanToken */) {
-                node.typeArguments = parseBracketedList(18 /* TypeArguments */, parseType, 26 /* LessThanToken */, 28 /* GreaterThanToken */);
+                node.typeArguments = parseBracketedList(19 /* TypeArguments */, parseType, 26 /* LessThanToken */, 28 /* GreaterThanToken */);
             }
             return finishNode(node);
         }
         function parseThisTypePredicate(lhs) {
             nextToken();
-            var node = createNode(155 /* TypePredicate */, lhs.pos);
+            var node = createNode(156 /* TypePredicate */, lhs.pos);
             node.parameterName = lhs;
             node.type = parseType();
             return finishNode(node);
         }
         function parseThisTypeNode() {
-            var node = createNode(166 /* ThisType */);
+            var node = createNode(167 /* ThisType */);
             nextToken();
             return finishNode(node);
         }
         function parseTypeQuery() {
-            var node = createNode(159 /* TypeQuery */);
+            var node = createNode(160 /* TypeQuery */);
             parseExpected(102 /* TypeOfKeyword */);
             node.exprName = parseEntityName(/*allowReservedWords*/ true);
             return finishNode(node);
         }
         function parseTypeParameter() {
-            var node = createNode(142 /* TypeParameter */);
+            var node = createNode(143 /* TypeParameter */);
             node.name = parseIdentifier();
             if (parseOptional(84 /* ExtendsKeyword */)) {
                 // It's not uncommon for people to write improper constraints to a generic.  If the
@@ -14711,7 +15667,7 @@ var ts;
         }
         function parseTypeParameters() {
             if (token() === 26 /* LessThanToken */) {
-                return parseBracketedList(17 /* TypeParameters */, parseTypeParameter, 26 /* LessThanToken */, 28 /* GreaterThanToken */);
+                return parseBracketedList(18 /* TypeParameters */, parseTypeParameter, 26 /* LessThanToken */, 28 /* GreaterThanToken */);
             }
         }
         function parseParameterType() {
@@ -14724,7 +15680,7 @@ var ts;
             return token() === 23 /* DotDotDotToken */ || isIdentifierOrPattern() || ts.isModifierKind(token()) || token() === 56 /* AtToken */ || token() === 98 /* ThisKeyword */;
         }
         function parseParameter() {
-            var node = createNode(143 /* Parameter */);
+            var node = createNode(144 /* Parameter */);
             if (token() === 98 /* ThisKeyword */) {
                 node.name = createIdentifier(/*isIdentifier*/ true, undefined);
                 node.type = parseParameterType();
@@ -14823,7 +15779,7 @@ var ts;
         }
         function parseSignatureMember(kind) {
             var node = createNode(kind);
-            if (kind === 153 /* ConstructSignature */) {
+            if (kind === 154 /* ConstructSignature */) {
                 parseExpected(93 /* NewKeyword */);
             }
             fillSignature(55 /* ColonToken */, /*yieldContext*/ false, /*awaitContext*/ false, /*requireCompleteParameterList*/ false, node);
@@ -14887,7 +15843,7 @@ var ts;
             return token() === 55 /* ColonToken */ || token() === 25 /* CommaToken */ || token() === 21 /* CloseBracketToken */;
         }
         function parseIndexSignatureDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(154 /* IndexSignature */, fullStart);
+            var node = createNode(155 /* IndexSignature */, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             node.parameters = parseBracketedList(16 /* Parameters */, parseParameter, 20 /* OpenBracketToken */, 21 /* CloseBracketToken */);
@@ -14899,7 +15855,7 @@ var ts;
             var name = parsePropertyName();
             var questionToken = parseOptionalToken(54 /* QuestionToken */);
             if (token() === 18 /* OpenParenToken */ || token() === 26 /* LessThanToken */) {
-                var method = createNode(147 /* MethodSignature */, fullStart);
+                var method = createNode(148 /* MethodSignature */, fullStart);
                 method.modifiers = modifiers;
                 method.name = name;
                 method.questionToken = questionToken;
@@ -14910,7 +15866,7 @@ var ts;
                 return addJSDocComment(finishNode(method));
             }
             else {
-                var property = createNode(145 /* PropertySignature */, fullStart);
+                var property = createNode(146 /* PropertySignature */, fullStart);
                 property.modifiers = modifiers;
                 property.name = name;
                 property.questionToken = questionToken;
@@ -14959,10 +15915,10 @@ var ts;
         }
         function parseTypeMember() {
             if (token() === 18 /* OpenParenToken */ || token() === 26 /* LessThanToken */) {
-                return parseSignatureMember(152 /* CallSignature */);
+                return parseSignatureMember(153 /* CallSignature */);
             }
             if (token() === 93 /* NewKeyword */ && lookAhead(isStartOfConstructSignature)) {
-                return parseSignatureMember(153 /* ConstructSignature */);
+                return parseSignatureMember(154 /* ConstructSignature */);
             }
             var fullStart = getNodePos();
             var modifiers = parseModifiers();
@@ -14976,7 +15932,7 @@ var ts;
             return token() === 18 /* OpenParenToken */ || token() === 26 /* LessThanToken */;
         }
         function parseTypeLiteral() {
-            var node = createNode(160 /* TypeLiteral */);
+            var node = createNode(161 /* TypeLiteral */);
             node.members = parseObjectTypeMembers();
             return finishNode(node);
         }
@@ -14991,13 +15947,40 @@ var ts;
             }
             return members;
         }
+        function isStartOfMappedType() {
+            nextToken();
+            if (token() === 130 /* ReadonlyKeyword */) {
+                nextToken();
+            }
+            return token() === 20 /* OpenBracketToken */ && nextTokenIsIdentifier() && nextToken() === 91 /* InKeyword */;
+        }
+        function parseMappedTypeParameter() {
+            var node = createNode(143 /* TypeParameter */);
+            node.name = parseIdentifier();
+            parseExpected(91 /* InKeyword */);
+            node.constraint = parseType();
+            return finishNode(node);
+        }
+        function parseMappedType() {
+            var node = createNode(170 /* MappedType */);
+            parseExpected(16 /* OpenBraceToken */);
+            node.readonlyToken = parseOptionalToken(130 /* ReadonlyKeyword */);
+            parseExpected(20 /* OpenBracketToken */);
+            node.typeParameter = parseMappedTypeParameter();
+            parseExpected(21 /* CloseBracketToken */);
+            node.questionToken = parseOptionalToken(54 /* QuestionToken */);
+            node.type = parseTypeAnnotation();
+            parseSemicolon();
+            parseExpected(17 /* CloseBraceToken */);
+            return finishNode(node);
+        }
         function parseTupleType() {
-            var node = createNode(162 /* TupleType */);
-            node.elementTypes = parseBracketedList(19 /* TupleElementTypes */, parseType, 20 /* OpenBracketToken */, 21 /* CloseBracketToken */);
+            var node = createNode(163 /* TupleType */);
+            node.elementTypes = parseBracketedList(20 /* TupleElementTypes */, parseType, 20 /* OpenBracketToken */, 21 /* CloseBracketToken */);
             return finishNode(node);
         }
         function parseParenthesizedType() {
-            var node = createNode(165 /* ParenthesizedType */);
+            var node = createNode(166 /* ParenthesizedType */);
             parseExpected(18 /* OpenParenToken */);
             node.type = parseType();
             parseExpected(19 /* CloseParenToken */);
@@ -15005,7 +15988,7 @@ var ts;
         }
         function parseFunctionOrConstructorType(kind) {
             var node = createNode(kind);
-            if (kind === 158 /* ConstructorType */) {
+            if (kind === 159 /* ConstructorType */) {
                 parseExpected(93 /* NewKeyword */);
             }
             fillSignature(35 /* EqualsGreaterThanToken */, /*yieldContext*/ false, /*awaitContext*/ false, /*requireCompleteParameterList*/ false, node);
@@ -15016,7 +15999,7 @@ var ts;
             return token() === 22 /* DotToken */ ? undefined : node;
         }
         function parseLiteralTypeNode() {
-            var node = createNode(167 /* LiteralType */);
+            var node = createNode(171 /* LiteralType */);
             node.literal = parseSimpleUnaryExpression();
             finishNode(node);
             return node;
@@ -15027,12 +16010,12 @@ var ts;
         function parseNonArrayType() {
             switch (token()) {
                 case 118 /* AnyKeyword */:
-                case 133 /* StringKeyword */:
-                case 131 /* NumberKeyword */:
+                case 134 /* StringKeyword */:
+                case 132 /* NumberKeyword */:
                 case 121 /* BooleanKeyword */:
-                case 134 /* SymbolKeyword */:
-                case 136 /* UndefinedKeyword */:
-                case 128 /* NeverKeyword */:
+                case 135 /* SymbolKeyword */:
+                case 137 /* UndefinedKeyword */:
+                case 129 /* NeverKeyword */:
                     // If these are followed by a dot, then parse these out as a dotted type reference instead.
                     var node = tryParse(parseKeywordAndNoDot);
                     return node || parseTypeReference();
@@ -15058,7 +16041,7 @@ var ts;
                 case 102 /* TypeOfKeyword */:
                     return parseTypeQuery();
                 case 16 /* OpenBraceToken */:
-                    return parseTypeLiteral();
+                    return lookAhead(isStartOfMappedType) ? parseMappedType() : parseTypeLiteral();
                 case 20 /* OpenBracketToken */:
                     return parseTupleType();
                 case 18 /* OpenParenToken */:
@@ -15070,16 +16053,16 @@ var ts;
         function isStartOfType() {
             switch (token()) {
                 case 118 /* AnyKeyword */:
-                case 133 /* StringKeyword */:
-                case 131 /* NumberKeyword */:
+                case 134 /* StringKeyword */:
+                case 132 /* NumberKeyword */:
                 case 121 /* BooleanKeyword */:
-                case 134 /* SymbolKeyword */:
+                case 135 /* SymbolKeyword */:
                 case 104 /* VoidKeyword */:
-                case 136 /* UndefinedKeyword */:
+                case 137 /* UndefinedKeyword */:
                 case 94 /* NullKeyword */:
                 case 98 /* ThisKeyword */:
                 case 102 /* TypeOfKeyword */:
-                case 128 /* NeverKeyword */:
+                case 129 /* NeverKeyword */:
                 case 16 /* OpenBraceToken */:
                 case 20 /* OpenBracketToken */:
                 case 26 /* LessThanToken */:
@@ -15106,13 +16089,36 @@ var ts;
         function parseArrayTypeOrHigher() {
             var type = parseNonArrayType();
             while (!scanner.hasPrecedingLineBreak() && parseOptional(20 /* OpenBracketToken */)) {
-                parseExpected(21 /* CloseBracketToken */);
-                var node = createNode(161 /* ArrayType */, type.pos);
-                node.elementType = type;
-                type = finishNode(node);
+                if (isStartOfType()) {
+                    var node = createNode(169 /* IndexedAccessType */, type.pos);
+                    node.objectType = type;
+                    node.indexType = parseType();
+                    parseExpected(21 /* CloseBracketToken */);
+                    type = finishNode(node);
+                }
+                else {
+                    var node = createNode(162 /* ArrayType */, type.pos);
+                    node.elementType = type;
+                    parseExpected(21 /* CloseBracketToken */);
+                    type = finishNode(node);
+                }
             }
             return type;
         }
+        function parseTypeOperator(operator) {
+            var node = createNode(168 /* TypeOperator */);
+            parseExpected(operator);
+            node.operator = operator;
+            node.type = parseTypeOperatorOrHigher();
+            return finishNode(node);
+        }
+        function parseTypeOperatorOrHigher() {
+            switch (token()) {
+                case 126 /* KeyOfKeyword */:
+                    return parseTypeOperator(126 /* KeyOfKeyword */);
+            }
+            return parseArrayTypeOrHigher();
+        }
         function parseUnionOrIntersectionType(kind, parseConstituentType, operator) {
             var type = parseConstituentType();
             if (token() === operator) {
@@ -15128,10 +16134,10 @@ var ts;
             return type;
         }
         function parseIntersectionTypeOrHigher() {
-            return parseUnionOrIntersectionType(164 /* IntersectionType */, parseArrayTypeOrHigher, 47 /* AmpersandToken */);
+            return parseUnionOrIntersectionType(165 /* IntersectionType */, parseTypeOperatorOrHigher, 47 /* AmpersandToken */);
         }
         function parseUnionTypeOrHigher() {
-            return parseUnionOrIntersectionType(163 /* UnionType */, parseIntersectionTypeOrHigher, 48 /* BarToken */);
+            return parseUnionOrIntersectionType(164 /* UnionType */, parseIntersectionTypeOrHigher, 48 /* BarToken */);
         }
         function isStartOfFunctionType() {
             if (token() === 26 /* LessThanToken */) {
@@ -15188,7 +16194,7 @@ var ts;
             var typePredicateVariable = isIdentifier() && tryParse(parseTypePredicatePrefix);
             var type = parseType();
             if (typePredicateVariable) {
-                var node = createNode(155 /* TypePredicate */, typePredicateVariable.pos);
+                var node = createNode(156 /* TypePredicate */, typePredicateVariable.pos);
                 node.parameterName = typePredicateVariable;
                 node.type = type;
                 return finishNode(node);
@@ -15207,14 +16213,14 @@ var ts;
         function parseType() {
             // The rules about 'yield' only apply to actual code/expression contexts.  They don't
             // apply to 'type' contexts.  So we disable these parameters here before moving on.
-            return doOutsideOfContext(327680 /* TypeExcludesFlags */, parseTypeWorker);
+            return doOutsideOfContext(655360 /* TypeExcludesFlags */, parseTypeWorker);
         }
         function parseTypeWorker() {
             if (isStartOfFunctionType()) {
-                return parseFunctionOrConstructorType(157 /* FunctionType */);
+                return parseFunctionOrConstructorType(158 /* FunctionType */);
             }
             if (token() === 93 /* NewKeyword */) {
-                return parseFunctionOrConstructorType(158 /* ConstructorType */);
+                return parseFunctionOrConstructorType(159 /* ConstructorType */);
             }
             return parseUnionTypeOrHigher();
         }
@@ -15415,7 +16421,7 @@ var ts;
             return !scanner.hasPrecedingLineBreak() && isIdentifier();
         }
         function parseYieldExpression() {
-            var node = createNode(191 /* YieldExpression */);
+            var node = createNode(195 /* YieldExpression */);
             // YieldExpression[In] :
             //      yield
             //      yield [no LineTerminator here] [Lexical goal InputElementRegExp]AssignmentExpression[?In, Yield]
@@ -15437,13 +16443,13 @@ var ts;
             ts.Debug.assert(token() === 35 /* EqualsGreaterThanToken */, "parseSimpleArrowFunctionExpression should only have been called if we had a =>");
             var node;
             if (asyncModifier) {
-                node = createNode(181 /* ArrowFunction */, asyncModifier.pos);
+                node = createNode(185 /* ArrowFunction */, asyncModifier.pos);
                 node.modifiers = asyncModifier;
             }
             else {
-                node = createNode(181 /* ArrowFunction */, identifier.pos);
+                node = createNode(185 /* ArrowFunction */, identifier.pos);
             }
-            var parameter = createNode(143 /* Parameter */, identifier.pos);
+            var parameter = createNode(144 /* Parameter */, identifier.pos);
             parameter.name = identifier;
             finishNode(parameter);
             node.parameters = createNodeArray([parameter], parameter.pos);
@@ -15625,7 +16631,7 @@ var ts;
             return 0 /* False */;
         }
         function parseParenthesizedArrowFunctionExpressionHead(allowAmbiguity) {
-            var node = createNode(181 /* ArrowFunction */);
+            var node = createNode(185 /* ArrowFunction */);
             node.modifiers = parseModifiersForArrowFunction();
             var isAsync = !!(ts.getModifierFlags(node) & 256 /* Async */);
             // Arrow functions are never generators.
@@ -15691,7 +16697,7 @@ 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(189 /* ConditionalExpression */, leftOperand.pos);
+            var node = createNode(193 /* ConditionalExpression */, leftOperand.pos);
             node.condition = leftOperand;
             node.questionToken = questionToken;
             node.whenTrue = doOutsideOfContext(disallowInAndDecoratorContext, parseAssignmentExpressionOrHigher);
@@ -15704,7 +16710,7 @@ var ts;
             return parseBinaryExpressionRest(precedence, leftOperand);
         }
         function isInOrOfKeyword(t) {
-            return t === 91 /* InKeyword */ || t === 139 /* OfKeyword */;
+            return t === 91 /* InKeyword */ || t === 140 /* OfKeyword */;
         }
         function parseBinaryExpressionRest(precedence, leftOperand) {
             while (true) {
@@ -15812,39 +16818,39 @@ var ts;
             return -1;
         }
         function makeBinaryExpression(left, operatorToken, right) {
-            var node = createNode(188 /* BinaryExpression */, left.pos);
+            var node = createNode(192 /* BinaryExpression */, left.pos);
             node.left = left;
             node.operatorToken = operatorToken;
             node.right = right;
             return finishNode(node);
         }
         function makeAsExpression(left, right) {
-            var node = createNode(196 /* AsExpression */, left.pos);
+            var node = createNode(200 /* AsExpression */, left.pos);
             node.expression = left;
             node.type = right;
             return finishNode(node);
         }
         function parsePrefixUnaryExpression() {
-            var node = createNode(186 /* PrefixUnaryExpression */);
+            var node = createNode(190 /* PrefixUnaryExpression */);
             node.operator = token();
             nextToken();
             node.operand = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseDeleteExpression() {
-            var node = createNode(182 /* DeleteExpression */);
+            var node = createNode(186 /* DeleteExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseTypeOfExpression() {
-            var node = createNode(183 /* TypeOfExpression */);
+            var node = createNode(187 /* TypeOfExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseVoidExpression() {
-            var node = createNode(184 /* VoidExpression */);
+            var node = createNode(188 /* VoidExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
@@ -15860,7 +16866,7 @@ var ts;
             return false;
         }
         function parseAwaitExpression() {
-            var node = createNode(185 /* AwaitExpression */);
+            var node = createNode(189 /* AwaitExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
@@ -15903,7 +16909,7 @@ var ts;
             var simpleUnaryExpression = parseSimpleUnaryExpression();
             if (token() === 39 /* AsteriskAsteriskToken */) {
                 var start = ts.skipTrivia(sourceText, simpleUnaryExpression.pos);
-                if (simpleUnaryExpression.kind === 178 /* TypeAssertionExpression */) {
+                if (simpleUnaryExpression.kind === 182 /* TypeAssertionExpression */) {
                     parseErrorAtPosition(start, simpleUnaryExpression.end - start, 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 {
@@ -15999,7 +17005,7 @@ var ts;
          */
         function parseIncrementExpression() {
             if (token() === 42 /* PlusPlusToken */ || token() === 43 /* MinusMinusToken */) {
-                var node = createNode(186 /* PrefixUnaryExpression */);
+                var node = createNode(190 /* PrefixUnaryExpression */);
                 node.operator = token();
                 nextToken();
                 node.operand = parseLeftHandSideExpressionOrHigher();
@@ -16012,7 +17018,7 @@ var ts;
             var expression = parseLeftHandSideExpressionOrHigher();
             ts.Debug.assert(ts.isLeftHandSideExpression(expression));
             if ((token() === 42 /* PlusPlusToken */ || token() === 43 /* MinusMinusToken */) && !scanner.hasPrecedingLineBreak()) {
-                var node = createNode(187 /* PostfixUnaryExpression */, expression.pos);
+                var node = createNode(191 /* PostfixUnaryExpression */, expression.pos);
                 node.operand = expression;
                 node.operator = token();
                 nextToken();
@@ -16116,7 +17122,7 @@ var ts;
             }
             // 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(173 /* PropertyAccessExpression */, expression.pos);
+            var node = createNode(177 /* PropertyAccessExpression */, expression.pos);
             node.expression = expression;
             parseExpectedToken(22 /* DotToken */, /*reportAtCurrentPosition*/ false, ts.Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access);
             node.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
@@ -16141,8 +17147,8 @@ var ts;
         function parseJsxElementOrSelfClosingElement(inExpressionContext) {
             var opening = parseJsxOpeningOrSelfClosingElement(inExpressionContext);
             var result;
-            if (opening.kind === 244 /* JsxOpeningElement */) {
-                var node = createNode(242 /* JsxElement */, opening.pos);
+            if (opening.kind === 248 /* JsxOpeningElement */) {
+                var node = createNode(246 /* JsxElement */, opening.pos);
                 node.openingElement = opening;
                 node.children = parseJsxChildren(node.openingElement.tagName);
                 node.closingElement = parseJsxClosingElement(inExpressionContext);
@@ -16152,7 +17158,7 @@ var ts;
                 result = finishNode(node);
             }
             else {
-                ts.Debug.assert(opening.kind === 243 /* JsxSelfClosingElement */);
+                ts.Debug.assert(opening.kind === 247 /* JsxSelfClosingElement */);
                 // Nothing else to do for self-closing elements
                 result = opening;
             }
@@ -16167,7 +17173,7 @@ var ts;
                 var invalidElement = tryParse(function () { return parseJsxElementOrSelfClosingElement(/*inExpressionContext*/ true); });
                 if (invalidElement) {
                     parseErrorAtCurrentToken(ts.Diagnostics.JSX_expressions_must_have_one_parent_element);
-                    var badNode = createNode(188 /* BinaryExpression */, result.pos);
+                    var badNode = createNode(192 /* BinaryExpression */, result.pos);
                     badNode.end = invalidElement.end;
                     badNode.left = result;
                     badNode.right = invalidElement;
@@ -16226,7 +17232,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(244 /* JsxOpeningElement */, fullStart);
+                node = createNode(248 /* JsxOpeningElement */, fullStart);
                 scanJsxText();
             }
             else {
@@ -16238,7 +17244,7 @@ var ts;
                     parseExpected(28 /* GreaterThanToken */, /*diagnostic*/ undefined, /*shouldAdvance*/ false);
                     scanJsxText();
                 }
-                node = createNode(243 /* JsxSelfClosingElement */, fullStart);
+                node = createNode(247 /* JsxSelfClosingElement */, fullStart);
             }
             node.tagName = tagName;
             node.attributes = attributes;
@@ -16254,7 +17260,7 @@ var ts;
             var expression = token() === 98 /* ThisKeyword */ ?
                 parseTokenNode() : parseIdentifierName();
             while (parseOptional(22 /* DotToken */)) {
-                var propertyAccess = createNode(173 /* PropertyAccessExpression */, expression.pos);
+                var propertyAccess = createNode(177 /* PropertyAccessExpression */, expression.pos);
                 propertyAccess.expression = expression;
                 propertyAccess.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
                 expression = finishNode(propertyAccess);
@@ -16262,7 +17268,7 @@ var ts;
             return expression;
         }
         function parseJsxExpression(inExpressionContext) {
-            var node = createNode(248 /* JsxExpression */);
+            var node = createNode(252 /* JsxExpression */);
             parseExpected(16 /* OpenBraceToken */);
             if (token() !== 17 /* CloseBraceToken */) {
                 node.expression = parseAssignmentExpressionOrHigher();
@@ -16281,7 +17287,7 @@ var ts;
                 return parseJsxSpreadAttribute();
             }
             scanJsxIdentifier();
-            var node = createNode(246 /* JsxAttribute */);
+            var node = createNode(250 /* JsxAttribute */);
             node.name = parseIdentifierName();
             if (token() === 57 /* EqualsToken */) {
                 switch (scanJsxAttributeValue()) {
@@ -16296,7 +17302,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxSpreadAttribute() {
-            var node = createNode(247 /* JsxSpreadAttribute */);
+            var node = createNode(251 /* JsxSpreadAttribute */);
             parseExpected(16 /* OpenBraceToken */);
             parseExpected(23 /* DotDotDotToken */);
             node.expression = parseExpression();
@@ -16304,7 +17310,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxClosingElement(inExpressionContext) {
-            var node = createNode(245 /* JsxClosingElement */);
+            var node = createNode(249 /* JsxClosingElement */);
             parseExpected(27 /* LessThanSlashToken */);
             node.tagName = parseJsxElementName();
             if (inExpressionContext) {
@@ -16317,7 +17323,7 @@ var ts;
             return finishNode(node);
         }
         function parseTypeAssertion() {
-            var node = createNode(178 /* TypeAssertionExpression */);
+            var node = createNode(182 /* TypeAssertionExpression */);
             parseExpected(26 /* LessThanToken */);
             node.type = parseType();
             parseExpected(28 /* GreaterThanToken */);
@@ -16328,7 +17334,7 @@ var ts;
             while (true) {
                 var dotToken = parseOptionalToken(22 /* DotToken */);
                 if (dotToken) {
-                    var propertyAccess = createNode(173 /* PropertyAccessExpression */, expression.pos);
+                    var propertyAccess = createNode(177 /* PropertyAccessExpression */, expression.pos);
                     propertyAccess.expression = expression;
                     propertyAccess.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
                     expression = finishNode(propertyAccess);
@@ -16336,14 +17342,14 @@ var ts;
                 }
                 if (token() === 50 /* ExclamationToken */ && !scanner.hasPrecedingLineBreak()) {
                     nextToken();
-                    var nonNullExpression = createNode(197 /* NonNullExpression */, expression.pos);
+                    var nonNullExpression = createNode(201 /* 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(20 /* OpenBracketToken */)) {
-                    var indexedAccess = createNode(174 /* ElementAccessExpression */, expression.pos);
+                    var indexedAccess = createNode(178 /* ElementAccessExpression */, expression.pos);
                     indexedAccess.expression = expression;
                     // It's not uncommon for a user to write: "new Type[]".
                     // Check for that common pattern and report a better error message.
@@ -16359,7 +17365,7 @@ var ts;
                     continue;
                 }
                 if (token() === 12 /* NoSubstitutionTemplateLiteral */ || token() === 13 /* TemplateHead */) {
-                    var tagExpression = createNode(177 /* TaggedTemplateExpression */, expression.pos);
+                    var tagExpression = createNode(181 /* TaggedTemplateExpression */, expression.pos);
                     tagExpression.tag = expression;
                     tagExpression.template = token() === 12 /* NoSubstitutionTemplateLiteral */
                         ? parseLiteralNode()
@@ -16382,7 +17388,7 @@ var ts;
                     if (!typeArguments) {
                         return expression;
                     }
-                    var callExpr = createNode(175 /* CallExpression */, expression.pos);
+                    var callExpr = createNode(179 /* CallExpression */, expression.pos);
                     callExpr.expression = expression;
                     callExpr.typeArguments = typeArguments;
                     callExpr.arguments = parseArgumentList();
@@ -16390,7 +17396,7 @@ var ts;
                     continue;
                 }
                 else if (token() === 18 /* OpenParenToken */) {
-                    var callExpr = createNode(175 /* CallExpression */, expression.pos);
+                    var callExpr = createNode(179 /* CallExpression */, expression.pos);
                     callExpr.expression = expression;
                     callExpr.arguments = parseArgumentList();
                     expression = finishNode(callExpr);
@@ -16409,7 +17415,7 @@ var ts;
             if (!parseOptional(26 /* LessThanToken */)) {
                 return undefined;
             }
-            var typeArguments = parseDelimitedList(18 /* TypeArguments */, parseType);
+            var typeArguments = parseDelimitedList(19 /* TypeArguments */, parseType);
             if (!parseExpected(28 /* GreaterThanToken */)) {
                 // If it doesn't have the closing >  then it's definitely not an type argument list.
                 return undefined;
@@ -16500,28 +17506,28 @@ var ts;
             return parseIdentifier(ts.Diagnostics.Expression_expected);
         }
         function parseParenthesizedExpression() {
-            var node = createNode(179 /* ParenthesizedExpression */);
+            var node = createNode(183 /* ParenthesizedExpression */);
             parseExpected(18 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(19 /* CloseParenToken */);
             return finishNode(node);
         }
         function parseSpreadElement() {
-            var node = createNode(192 /* SpreadElementExpression */);
+            var node = createNode(196 /* SpreadElement */);
             parseExpected(23 /* DotDotDotToken */);
             node.expression = parseAssignmentExpressionOrHigher();
             return finishNode(node);
         }
         function parseArgumentOrArrayLiteralElement() {
             return token() === 23 /* DotDotDotToken */ ? parseSpreadElement() :
-                token() === 25 /* CommaToken */ ? createNode(194 /* OmittedExpression */) :
+                token() === 25 /* CommaToken */ ? createNode(198 /* OmittedExpression */) :
                     parseAssignmentExpressionOrHigher();
         }
         function parseArgumentExpression() {
             return doOutsideOfContext(disallowInAndDecoratorContext, parseArgumentOrArrayLiteralElement);
         }
         function parseArrayLiteralExpression() {
-            var node = createNode(171 /* ArrayLiteralExpression */);
+            var node = createNode(175 /* ArrayLiteralExpression */);
             parseExpected(20 /* OpenBracketToken */);
             if (scanner.hasPrecedingLineBreak()) {
                 node.multiLine = true;
@@ -16532,15 +17538,21 @@ var ts;
         }
         function tryParseAccessorDeclaration(fullStart, decorators, modifiers) {
             if (parseContextualModifier(124 /* GetKeyword */)) {
-                return parseAccessorDeclaration(150 /* GetAccessor */, fullStart, decorators, modifiers);
+                return parseAccessorDeclaration(151 /* GetAccessor */, fullStart, decorators, modifiers);
             }
-            else if (parseContextualModifier(132 /* SetKeyword */)) {
-                return parseAccessorDeclaration(151 /* SetAccessor */, fullStart, decorators, modifiers);
+            else if (parseContextualModifier(133 /* SetKeyword */)) {
+                return parseAccessorDeclaration(152 /* SetAccessor */, fullStart, decorators, modifiers);
             }
             return undefined;
         }
         function parseObjectLiteralElement() {
             var fullStart = scanner.getStartPos();
+            var dotDotDotToken = parseOptionalToken(23 /* DotDotDotToken */);
+            if (dotDotDotToken) {
+                var spreadElement = createNode(259 /* SpreadAssignment */, fullStart);
+                spreadElement.expression = parseAssignmentExpressionOrHigher();
+                return addJSDocComment(finishNode(spreadElement));
+            }
             var decorators = parseDecorators();
             var modifiers = parseModifiers();
             var accessor = tryParseAccessorDeclaration(fullStart, decorators, modifiers);
@@ -16562,7 +17574,7 @@ var ts;
             // this is necessary because ObjectLiteral productions are also used to cover grammar for ObjectAssignmentPattern
             var isShorthandPropertyAssignment = tokenIsIdentifier && (token() === 25 /* CommaToken */ || token() === 17 /* CloseBraceToken */ || token() === 57 /* EqualsToken */);
             if (isShorthandPropertyAssignment) {
-                var shorthandDeclaration = createNode(254 /* ShorthandPropertyAssignment */, fullStart);
+                var shorthandDeclaration = createNode(258 /* ShorthandPropertyAssignment */, fullStart);
                 shorthandDeclaration.name = propertyName;
                 shorthandDeclaration.questionToken = questionToken;
                 var equalsToken = parseOptionalToken(57 /* EqualsToken */);
@@ -16573,7 +17585,7 @@ var ts;
                 return addJSDocComment(finishNode(shorthandDeclaration));
             }
             else {
-                var propertyAssignment = createNode(253 /* PropertyAssignment */, fullStart);
+                var propertyAssignment = createNode(257 /* PropertyAssignment */, fullStart);
                 propertyAssignment.modifiers = modifiers;
                 propertyAssignment.name = propertyName;
                 propertyAssignment.questionToken = questionToken;
@@ -16583,7 +17595,7 @@ var ts;
             }
         }
         function parseObjectLiteralExpression() {
-            var node = createNode(172 /* ObjectLiteralExpression */);
+            var node = createNode(176 /* ObjectLiteralExpression */);
             parseExpected(16 /* OpenBraceToken */);
             if (scanner.hasPrecedingLineBreak()) {
                 node.multiLine = true;
@@ -16602,7 +17614,7 @@ var ts;
             if (saveDecoratorContext) {
                 setDecoratorContext(/*val*/ false);
             }
-            var node = createNode(180 /* FunctionExpression */);
+            var node = createNode(184 /* FunctionExpression */);
             node.modifiers = parseModifiers();
             parseExpected(88 /* FunctionKeyword */);
             node.asteriskToken = parseOptionalToken(38 /* AsteriskToken */);
@@ -16624,7 +17636,7 @@ var ts;
             return isIdentifier() ? parseIdentifier() : undefined;
         }
         function parseNewExpression() {
-            var node = createNode(176 /* NewExpression */);
+            var node = createNode(180 /* NewExpression */);
             parseExpected(93 /* NewKeyword */);
             node.expression = parseMemberExpressionOrHigher();
             node.typeArguments = tryParse(parseTypeArgumentsInExpression);
@@ -16635,7 +17647,7 @@ var ts;
         }
         // STATEMENTS
         function parseBlock(ignoreMissingOpenBrace, diagnosticMessage) {
-            var node = createNode(200 /* Block */);
+            var node = createNode(204 /* Block */);
             if (parseExpected(16 /* OpenBraceToken */, diagnosticMessage) || ignoreMissingOpenBrace) {
                 if (scanner.hasPrecedingLineBreak()) {
                     node.multiLine = true;
@@ -16668,12 +17680,12 @@ var ts;
             return block;
         }
         function parseEmptyStatement() {
-            var node = createNode(202 /* EmptyStatement */);
+            var node = createNode(206 /* EmptyStatement */);
             parseExpected(24 /* SemicolonToken */);
             return finishNode(node);
         }
         function parseIfStatement() {
-            var node = createNode(204 /* IfStatement */);
+            var node = createNode(208 /* IfStatement */);
             parseExpected(89 /* IfKeyword */);
             parseExpected(18 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
@@ -16683,7 +17695,7 @@ var ts;
             return finishNode(node);
         }
         function parseDoStatement() {
-            var node = createNode(205 /* DoStatement */);
+            var node = createNode(209 /* DoStatement */);
             parseExpected(80 /* DoKeyword */);
             node.statement = parseStatement();
             parseExpected(105 /* WhileKeyword */);
@@ -16698,7 +17710,7 @@ var ts;
             return finishNode(node);
         }
         function parseWhileStatement() {
-            var node = createNode(206 /* WhileStatement */);
+            var node = createNode(210 /* WhileStatement */);
             parseExpected(105 /* WhileKeyword */);
             parseExpected(18 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
@@ -16721,21 +17733,21 @@ var ts;
             }
             var forOrForInOrForOfStatement;
             if (parseOptional(91 /* InKeyword */)) {
-                var forInStatement = createNode(208 /* ForInStatement */, pos);
+                var forInStatement = createNode(212 /* ForInStatement */, pos);
                 forInStatement.initializer = initializer;
                 forInStatement.expression = allowInAnd(parseExpression);
                 parseExpected(19 /* CloseParenToken */);
                 forOrForInOrForOfStatement = forInStatement;
             }
-            else if (parseOptional(139 /* OfKeyword */)) {
-                var forOfStatement = createNode(209 /* ForOfStatement */, pos);
+            else if (parseOptional(140 /* OfKeyword */)) {
+                var forOfStatement = createNode(213 /* ForOfStatement */, pos);
                 forOfStatement.initializer = initializer;
                 forOfStatement.expression = allowInAnd(parseAssignmentExpressionOrHigher);
                 parseExpected(19 /* CloseParenToken */);
                 forOrForInOrForOfStatement = forOfStatement;
             }
             else {
-                var forStatement = createNode(207 /* ForStatement */, pos);
+                var forStatement = createNode(211 /* ForStatement */, pos);
                 forStatement.initializer = initializer;
                 parseExpected(24 /* SemicolonToken */);
                 if (token() !== 24 /* SemicolonToken */ && token() !== 19 /* CloseParenToken */) {
@@ -16753,7 +17765,7 @@ var ts;
         }
         function parseBreakOrContinueStatement(kind) {
             var node = createNode(kind);
-            parseExpected(kind === 211 /* BreakStatement */ ? 71 /* BreakKeyword */ : 76 /* ContinueKeyword */);
+            parseExpected(kind === 215 /* BreakStatement */ ? 71 /* BreakKeyword */ : 76 /* ContinueKeyword */);
             if (!canParseSemicolon()) {
                 node.label = parseIdentifier();
             }
@@ -16761,7 +17773,7 @@ var ts;
             return finishNode(node);
         }
         function parseReturnStatement() {
-            var node = createNode(212 /* ReturnStatement */);
+            var node = createNode(216 /* ReturnStatement */);
             parseExpected(95 /* ReturnKeyword */);
             if (!canParseSemicolon()) {
                 node.expression = allowInAnd(parseExpression);
@@ -16770,7 +17782,7 @@ var ts;
             return finishNode(node);
         }
         function parseWithStatement() {
-            var node = createNode(213 /* WithStatement */);
+            var node = createNode(217 /* WithStatement */);
             parseExpected(106 /* WithKeyword */);
             parseExpected(18 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
@@ -16779,7 +17791,7 @@ var ts;
             return finishNode(node);
         }
         function parseCaseClause() {
-            var node = createNode(249 /* CaseClause */);
+            var node = createNode(253 /* CaseClause */);
             parseExpected(72 /* CaseKeyword */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(55 /* ColonToken */);
@@ -16787,7 +17799,7 @@ var ts;
             return finishNode(node);
         }
         function parseDefaultClause() {
-            var node = createNode(250 /* DefaultClause */);
+            var node = createNode(254 /* DefaultClause */);
             parseExpected(78 /* DefaultKeyword */);
             parseExpected(55 /* ColonToken */);
             node.statements = parseList(3 /* SwitchClauseStatements */, parseStatement);
@@ -16797,12 +17809,12 @@ var ts;
             return token() === 72 /* CaseKeyword */ ? parseCaseClause() : parseDefaultClause();
         }
         function parseSwitchStatement() {
-            var node = createNode(214 /* SwitchStatement */);
+            var node = createNode(218 /* SwitchStatement */);
             parseExpected(97 /* SwitchKeyword */);
             parseExpected(18 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(19 /* CloseParenToken */);
-            var caseBlock = createNode(228 /* CaseBlock */, scanner.getStartPos());
+            var caseBlock = createNode(232 /* CaseBlock */, scanner.getStartPos());
             parseExpected(16 /* OpenBraceToken */);
             caseBlock.clauses = parseList(2 /* SwitchClauses */, parseCaseOrDefaultClause);
             parseExpected(17 /* CloseBraceToken */);
@@ -16817,7 +17829,7 @@ 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(216 /* ThrowStatement */);
+            var node = createNode(220 /* ThrowStatement */);
             parseExpected(99 /* ThrowKeyword */);
             node.expression = scanner.hasPrecedingLineBreak() ? undefined : allowInAnd(parseExpression);
             parseSemicolon();
@@ -16825,7 +17837,7 @@ var ts;
         }
         // TODO: Review for error recovery
         function parseTryStatement() {
-            var node = createNode(217 /* TryStatement */);
+            var node = createNode(221 /* TryStatement */);
             parseExpected(101 /* TryKeyword */);
             node.tryBlock = parseBlock(/*ignoreMissingOpenBrace*/ false);
             node.catchClause = token() === 73 /* CatchKeyword */ ? parseCatchClause() : undefined;
@@ -16838,7 +17850,7 @@ var ts;
             return finishNode(node);
         }
         function parseCatchClause() {
-            var result = createNode(252 /* CatchClause */);
+            var result = createNode(256 /* CatchClause */);
             parseExpected(73 /* CatchKeyword */);
             if (parseExpected(18 /* OpenParenToken */)) {
                 result.variableDeclaration = parseVariableDeclaration();
@@ -16848,7 +17860,7 @@ var ts;
             return finishNode(result);
         }
         function parseDebuggerStatement() {
-            var node = createNode(218 /* DebuggerStatement */);
+            var node = createNode(222 /* DebuggerStatement */);
             parseExpected(77 /* DebuggerKeyword */);
             parseSemicolon();
             return finishNode(node);
@@ -16860,13 +17872,13 @@ var ts;
             var fullStart = scanner.getStartPos();
             var expression = allowInAnd(parseExpression);
             if (expression.kind === 70 /* Identifier */ && parseOptional(55 /* ColonToken */)) {
-                var labeledStatement = createNode(215 /* LabeledStatement */, fullStart);
+                var labeledStatement = createNode(219 /* LabeledStatement */, fullStart);
                 labeledStatement.label = expression;
                 labeledStatement.statement = parseStatement();
                 return addJSDocComment(finishNode(labeledStatement));
             }
             else {
-                var expressionStatement = createNode(203 /* ExpressionStatement */, fullStart);
+                var expressionStatement = createNode(207 /* ExpressionStatement */, fullStart);
                 expressionStatement.expression = expression;
                 parseSemicolon();
                 return addJSDocComment(finishNode(expressionStatement));
@@ -16916,10 +17928,10 @@ var ts;
                     //
                     // could be legal, it would add complexity for very little gain.
                     case 108 /* InterfaceKeyword */:
-                    case 135 /* TypeKeyword */:
+                    case 136 /* TypeKeyword */:
                         return nextTokenIsIdentifierOnSameLine();
-                    case 126 /* ModuleKeyword */:
-                    case 127 /* NamespaceKeyword */:
+                    case 127 /* ModuleKeyword */:
+                    case 128 /* NamespaceKeyword */:
                         return nextTokenIsIdentifierOrStringLiteralOnSameLine();
                     case 116 /* AbstractKeyword */:
                     case 119 /* AsyncKeyword */:
@@ -16927,14 +17939,14 @@ var ts;
                     case 111 /* PrivateKeyword */:
                     case 112 /* ProtectedKeyword */:
                     case 113 /* PublicKeyword */:
-                    case 129 /* ReadonlyKeyword */:
+                    case 130 /* ReadonlyKeyword */:
                         nextToken();
                         // ASI takes effect for this modifier.
                         if (scanner.hasPrecedingLineBreak()) {
                             return false;
                         }
                         continue;
-                    case 138 /* GlobalKeyword */:
+                    case 139 /* GlobalKeyword */:
                         nextToken();
                         return token() === 16 /* OpenBraceToken */ || token() === 70 /* Identifier */ || token() === 83 /* ExportKeyword */;
                     case 90 /* ImportKeyword */:
@@ -16994,17 +18006,17 @@ var ts;
                 case 119 /* AsyncKeyword */:
                 case 123 /* DeclareKeyword */:
                 case 108 /* InterfaceKeyword */:
-                case 126 /* ModuleKeyword */:
-                case 127 /* NamespaceKeyword */:
-                case 135 /* TypeKeyword */:
-                case 138 /* GlobalKeyword */:
+                case 127 /* ModuleKeyword */:
+                case 128 /* NamespaceKeyword */:
+                case 136 /* TypeKeyword */:
+                case 139 /* GlobalKeyword */:
                     // When these don't start a declaration, they're an identifier in an expression statement
                     return true;
                 case 113 /* PublicKeyword */:
                 case 111 /* PrivateKeyword */:
                 case 112 /* ProtectedKeyword */:
                 case 114 /* StaticKeyword */:
-                case 129 /* ReadonlyKeyword */:
+                case 130 /* 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);
@@ -17047,9 +18059,9 @@ var ts;
                 case 87 /* ForKeyword */:
                     return parseForOrForInOrForOfStatement();
                 case 76 /* ContinueKeyword */:
-                    return parseBreakOrContinueStatement(210 /* ContinueStatement */);
+                    return parseBreakOrContinueStatement(214 /* ContinueStatement */);
                 case 71 /* BreakKeyword */:
-                    return parseBreakOrContinueStatement(211 /* BreakStatement */);
+                    return parseBreakOrContinueStatement(215 /* BreakStatement */);
                 case 95 /* ReturnKeyword */:
                     return parseReturnStatement();
                 case 106 /* WithKeyword */:
@@ -17069,9 +18081,9 @@ var ts;
                     return parseDeclaration();
                 case 119 /* AsyncKeyword */:
                 case 108 /* InterfaceKeyword */:
-                case 135 /* TypeKeyword */:
-                case 126 /* ModuleKeyword */:
-                case 127 /* NamespaceKeyword */:
+                case 136 /* TypeKeyword */:
+                case 127 /* ModuleKeyword */:
+                case 128 /* NamespaceKeyword */:
                 case 123 /* DeclareKeyword */:
                 case 75 /* ConstKeyword */:
                 case 82 /* EnumKeyword */:
@@ -17082,8 +18094,8 @@ var ts;
                 case 113 /* PublicKeyword */:
                 case 116 /* AbstractKeyword */:
                 case 114 /* StaticKeyword */:
-                case 129 /* ReadonlyKeyword */:
-                case 138 /* GlobalKeyword */:
+                case 130 /* ReadonlyKeyword */:
+                case 139 /* GlobalKeyword */:
                     if (isStartOfDeclaration()) {
                         return parseDeclaration();
                     }
@@ -17106,13 +18118,13 @@ var ts;
                     return parseClassDeclaration(fullStart, decorators, modifiers);
                 case 108 /* InterfaceKeyword */:
                     return parseInterfaceDeclaration(fullStart, decorators, modifiers);
-                case 135 /* TypeKeyword */:
+                case 136 /* TypeKeyword */:
                     return parseTypeAliasDeclaration(fullStart, decorators, modifiers);
                 case 82 /* EnumKeyword */:
                     return parseEnumDeclaration(fullStart, decorators, modifiers);
-                case 138 /* GlobalKeyword */:
-                case 126 /* ModuleKeyword */:
-                case 127 /* NamespaceKeyword */:
+                case 139 /* GlobalKeyword */:
+                case 127 /* ModuleKeyword */:
+                case 128 /* NamespaceKeyword */:
                     return parseModuleDeclaration(fullStart, decorators, modifiers);
                 case 90 /* ImportKeyword */:
                     return parseImportDeclarationOrImportEqualsDeclaration(fullStart, decorators, modifiers);
@@ -17131,7 +18143,7 @@ var ts;
                     if (decorators || 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 node = createMissingNode(240 /* MissingDeclaration */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
+                        var node = createMissingNode(244 /* MissingDeclaration */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
                         node.pos = fullStart;
                         node.decorators = decorators;
                         node.modifiers = modifiers;
@@ -17153,16 +18165,17 @@ var ts;
         // DECLARATIONS
         function parseArrayBindingElement() {
             if (token() === 25 /* CommaToken */) {
-                return createNode(194 /* OmittedExpression */);
+                return createNode(198 /* OmittedExpression */);
             }
-            var node = createNode(170 /* BindingElement */);
+            var node = createNode(174 /* BindingElement */);
             node.dotDotDotToken = parseOptionalToken(23 /* DotDotDotToken */);
             node.name = parseIdentifierOrPattern();
             node.initializer = parseBindingElementInitializer(/*inParameter*/ false);
             return finishNode(node);
         }
         function parseObjectBindingElement() {
-            var node = createNode(170 /* BindingElement */);
+            var node = createNode(174 /* BindingElement */);
+            node.dotDotDotToken = parseOptionalToken(23 /* DotDotDotToken */);
             var tokenIsIdentifier = isIdentifier();
             var propertyName = parsePropertyName();
             if (tokenIsIdentifier && token() !== 55 /* ColonToken */) {
@@ -17177,14 +18190,14 @@ var ts;
             return finishNode(node);
         }
         function parseObjectBindingPattern() {
-            var node = createNode(168 /* ObjectBindingPattern */);
+            var node = createNode(172 /* ObjectBindingPattern */);
             parseExpected(16 /* OpenBraceToken */);
             node.elements = parseDelimitedList(9 /* ObjectBindingElements */, parseObjectBindingElement);
             parseExpected(17 /* CloseBraceToken */);
             return finishNode(node);
         }
         function parseArrayBindingPattern() {
-            var node = createNode(169 /* ArrayBindingPattern */);
+            var node = createNode(173 /* ArrayBindingPattern */);
             parseExpected(20 /* OpenBracketToken */);
             node.elements = parseDelimitedList(10 /* ArrayBindingElements */, parseArrayBindingElement);
             parseExpected(21 /* CloseBracketToken */);
@@ -17203,7 +18216,7 @@ var ts;
             return parseIdentifier();
         }
         function parseVariableDeclaration() {
-            var node = createNode(219 /* VariableDeclaration */);
+            var node = createNode(223 /* VariableDeclaration */);
             node.name = parseIdentifierOrPattern();
             node.type = parseTypeAnnotation();
             if (!isInOrOfKeyword(token())) {
@@ -17212,7 +18225,7 @@ var ts;
             return finishNode(node);
         }
         function parseVariableDeclarationList(inForStatementInitializer) {
-            var node = createNode(220 /* VariableDeclarationList */);
+            var node = createNode(224 /* VariableDeclarationList */);
             switch (token()) {
                 case 103 /* VarKeyword */:
                     break;
@@ -17235,7 +18248,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() === 139 /* OfKeyword */ && lookAhead(canFollowContextualOfKeyword)) {
+            if (token() === 140 /* OfKeyword */ && lookAhead(canFollowContextualOfKeyword)) {
                 node.declarations = createMissingList();
             }
             else {
@@ -17250,7 +18263,7 @@ var ts;
             return nextTokenIsIdentifier() && nextToken() === 19 /* CloseParenToken */;
         }
         function parseVariableStatement(fullStart, decorators, modifiers) {
-            var node = createNode(201 /* VariableStatement */, fullStart);
+            var node = createNode(205 /* VariableStatement */, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             node.declarationList = parseVariableDeclarationList(/*inForStatementInitializer*/ false);
@@ -17258,7 +18271,7 @@ var ts;
             return addJSDocComment(finishNode(node));
         }
         function parseFunctionDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(221 /* FunctionDeclaration */, fullStart);
+            var node = createNode(225 /* FunctionDeclaration */, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             parseExpected(88 /* FunctionKeyword */);
@@ -17271,7 +18284,7 @@ var ts;
             return addJSDocComment(finishNode(node));
         }
         function parseConstructorDeclaration(pos, decorators, modifiers) {
-            var node = createNode(149 /* Constructor */, pos);
+            var node = createNode(150 /* Constructor */, pos);
             node.decorators = decorators;
             node.modifiers = modifiers;
             parseExpected(122 /* ConstructorKeyword */);
@@ -17280,7 +18293,7 @@ var ts;
             return addJSDocComment(finishNode(node));
         }
         function parseMethodDeclaration(fullStart, decorators, modifiers, asteriskToken, name, questionToken, diagnosticMessage) {
-            var method = createNode(148 /* MethodDeclaration */, fullStart);
+            var method = createNode(149 /* MethodDeclaration */, fullStart);
             method.decorators = decorators;
             method.modifiers = modifiers;
             method.asteriskToken = asteriskToken;
@@ -17293,7 +18306,7 @@ var ts;
             return addJSDocComment(finishNode(method));
         }
         function parsePropertyDeclaration(fullStart, decorators, modifiers, name, questionToken) {
-            var property = createNode(146 /* PropertyDeclaration */, fullStart);
+            var property = createNode(147 /* PropertyDeclaration */, fullStart);
             property.decorators = decorators;
             property.modifiers = modifiers;
             property.name = name;
@@ -17310,7 +18323,7 @@ var ts;
             // The checker may still error in the static case to explicitly disallow the yield expression.
             property.initializer = ts.hasModifier(property, 32 /* Static */)
                 ? allowInAnd(parseNonParameterInitializer)
-                : doOutsideOfContext(65536 /* YieldContext */ | 32768 /* DisallowInContext */, parseNonParameterInitializer);
+                : doOutsideOfContext(131072 /* YieldContext */ | 65536 /* DisallowInContext */, parseNonParameterInitializer);
             parseSemicolon();
             return addJSDocComment(finishNode(property));
         }
@@ -17345,7 +18358,7 @@ var ts;
                 case 111 /* PrivateKeyword */:
                 case 112 /* ProtectedKeyword */:
                 case 114 /* StaticKeyword */:
-                case 129 /* ReadonlyKeyword */:
+                case 130 /* ReadonlyKeyword */:
                     return true;
                 default:
                     return false;
@@ -17386,7 +18399,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 === 132 /* SetKeyword */ || idToken === 124 /* GetKeyword */) {
+                if (!ts.isKeyword(idToken) || idToken === 133 /* SetKeyword */ || idToken === 124 /* GetKeyword */) {
                     return true;
                 }
                 // If it *is* a keyword, but not an accessor, check a little farther along
@@ -17416,7 +18429,7 @@ var ts;
                 if (!parseOptional(56 /* AtToken */)) {
                     break;
                 }
-                var decorator = createNode(144 /* Decorator */, decoratorStart);
+                var decorator = createNode(145 /* Decorator */, decoratorStart);
                 decorator.expression = doInDecoratorContext(parseLeftHandSideExpressionOrHigher);
                 finishNode(decorator);
                 if (!decorators) {
@@ -17482,7 +18495,7 @@ var ts;
         }
         function parseClassElement() {
             if (token() === 24 /* SemicolonToken */) {
-                var result = createNode(199 /* SemicolonClassElement */);
+                var result = createNode(203 /* SemicolonClassElement */);
                 nextToken();
                 return finishNode(result);
             }
@@ -17510,8 +18523,8 @@ var ts;
             }
             if (decorators || modifiers) {
                 // treat this as a property declaration with a missing name.
-                var name_10 = createMissingNode(70 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
-                return parsePropertyDeclaration(fullStart, decorators, modifiers, name_10, /*questionToken*/ undefined);
+                var name_14 = createMissingNode(70 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
+                return parsePropertyDeclaration(fullStart, decorators, modifiers, name_14, /*questionToken*/ undefined);
             }
             // 'isClassMemberStart' should have hinted not to attempt parsing.
             ts.Debug.fail("Should not have attempted to parse class member declaration.");
@@ -17520,10 +18533,10 @@ var ts;
             return parseClassDeclarationOrExpression(
             /*fullStart*/ scanner.getStartPos(), 
             /*decorators*/ undefined, 
-            /*modifiers*/ undefined, 193 /* ClassExpression */);
+            /*modifiers*/ undefined, 197 /* ClassExpression */);
         }
         function parseClassDeclaration(fullStart, decorators, modifiers) {
-            return parseClassDeclarationOrExpression(fullStart, decorators, modifiers, 222 /* ClassDeclaration */);
+            return parseClassDeclarationOrExpression(fullStart, decorators, modifiers, 226 /* ClassDeclaration */);
         }
         function parseClassDeclarationOrExpression(fullStart, decorators, modifiers, kind) {
             var node = createNode(kind, fullStart);
@@ -17561,13 +18574,13 @@ var ts;
             // ClassTail[Yield,Await] : (Modified) See 14.5
             //      ClassHeritage[?Yield,?Await]opt { ClassBody[?Yield,?Await]opt }
             if (isHeritageClause()) {
-                return parseList(20 /* HeritageClauses */, parseHeritageClause);
+                return parseList(21 /* HeritageClauses */, parseHeritageClause);
             }
             return undefined;
         }
         function parseHeritageClause() {
             if (token() === 84 /* ExtendsKeyword */ || token() === 107 /* ImplementsKeyword */) {
-                var node = createNode(251 /* HeritageClause */);
+                var node = createNode(255 /* HeritageClause */);
                 node.token = token();
                 nextToken();
                 node.types = parseDelimitedList(7 /* HeritageClauseElement */, parseExpressionWithTypeArguments);
@@ -17576,10 +18589,10 @@ var ts;
             return undefined;
         }
         function parseExpressionWithTypeArguments() {
-            var node = createNode(195 /* ExpressionWithTypeArguments */);
+            var node = createNode(199 /* ExpressionWithTypeArguments */);
             node.expression = parseLeftHandSideExpressionOrHigher();
             if (token() === 26 /* LessThanToken */) {
-                node.typeArguments = parseBracketedList(18 /* TypeArguments */, parseType, 26 /* LessThanToken */, 28 /* GreaterThanToken */);
+                node.typeArguments = parseBracketedList(19 /* TypeArguments */, parseType, 26 /* LessThanToken */, 28 /* GreaterThanToken */);
             }
             return finishNode(node);
         }
@@ -17590,7 +18603,7 @@ var ts;
             return parseList(5 /* ClassMembers */, parseClassElement);
         }
         function parseInterfaceDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(223 /* InterfaceDeclaration */, fullStart);
+            var node = createNode(227 /* InterfaceDeclaration */, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             parseExpected(108 /* InterfaceKeyword */);
@@ -17601,10 +18614,10 @@ var ts;
             return addJSDocComment(finishNode(node));
         }
         function parseTypeAliasDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(224 /* TypeAliasDeclaration */, fullStart);
+            var node = createNode(228 /* TypeAliasDeclaration */, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
-            parseExpected(135 /* TypeKeyword */);
+            parseExpected(136 /* TypeKeyword */);
             node.name = parseIdentifier();
             node.typeParameters = parseTypeParameters();
             parseExpected(57 /* EqualsToken */);
@@ -17617,13 +18630,13 @@ 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 = createNode(255 /* EnumMember */, scanner.getStartPos());
+            var node = createNode(260 /* EnumMember */, scanner.getStartPos());
             node.name = parsePropertyName();
             node.initializer = allowInAnd(parseNonParameterInitializer);
             return addJSDocComment(finishNode(node));
         }
         function parseEnumDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(225 /* EnumDeclaration */, fullStart);
+            var node = createNode(229 /* EnumDeclaration */, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             parseExpected(82 /* EnumKeyword */);
@@ -17638,7 +18651,7 @@ var ts;
             return addJSDocComment(finishNode(node));
         }
         function parseModuleBlock() {
-            var node = createNode(227 /* ModuleBlock */, scanner.getStartPos());
+            var node = createNode(231 /* ModuleBlock */, scanner.getStartPos());
             if (parseExpected(16 /* OpenBraceToken */)) {
                 node.statements = parseList(1 /* BlockStatements */, parseStatement);
                 parseExpected(17 /* CloseBraceToken */);
@@ -17649,7 +18662,7 @@ var ts;
             return finishNode(node);
         }
         function parseModuleOrNamespaceDeclaration(fullStart, decorators, modifiers, flags) {
-            var node = createNode(226 /* ModuleDeclaration */, fullStart);
+            var node = createNode(230 /* ModuleDeclaration */, fullStart);
             // 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 */;
@@ -17663,10 +18676,10 @@ var ts;
             return addJSDocComment(finishNode(node));
         }
         function parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(226 /* ModuleDeclaration */, fullStart);
+            var node = createNode(230 /* ModuleDeclaration */, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
-            if (token() === 138 /* GlobalKeyword */) {
+            if (token() === 139 /* GlobalKeyword */) {
                 // parse 'global' as name of global scope augmentation
                 node.name = parseIdentifier();
                 node.flags |= 512 /* GlobalAugmentation */;
@@ -17684,15 +18697,15 @@ var ts;
         }
         function parseModuleDeclaration(fullStart, decorators, modifiers) {
             var flags = 0;
-            if (token() === 138 /* GlobalKeyword */) {
+            if (token() === 139 /* GlobalKeyword */) {
                 // global augmentation
                 return parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers);
             }
-            else if (parseOptional(127 /* NamespaceKeyword */)) {
+            else if (parseOptional(128 /* NamespaceKeyword */)) {
                 flags |= 16 /* Namespace */;
             }
             else {
-                parseExpected(126 /* ModuleKeyword */);
+                parseExpected(127 /* ModuleKeyword */);
                 if (token() === 9 /* StringLiteral */) {
                     return parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers);
                 }
@@ -17700,7 +18713,7 @@ var ts;
             return parseModuleOrNamespaceDeclaration(fullStart, decorators, modifiers, flags);
         }
         function isExternalModuleReference() {
-            return token() === 130 /* RequireKeyword */ &&
+            return token() === 131 /* RequireKeyword */ &&
                 lookAhead(nextTokenIsOpenParen);
         }
         function nextTokenIsOpenParen() {
@@ -17710,13 +18723,13 @@ var ts;
             return nextToken() === 40 /* SlashToken */;
         }
         function parseNamespaceExportDeclaration(fullStart, decorators, modifiers) {
-            var exportDeclaration = createNode(229 /* NamespaceExportDeclaration */, fullStart);
+            var exportDeclaration = createNode(233 /* NamespaceExportDeclaration */, fullStart);
             exportDeclaration.decorators = decorators;
             exportDeclaration.modifiers = modifiers;
             parseExpected(117 /* AsKeyword */);
-            parseExpected(127 /* NamespaceKeyword */);
+            parseExpected(128 /* NamespaceKeyword */);
             exportDeclaration.name = parseIdentifier();
-            parseExpected(24 /* SemicolonToken */);
+            parseSemicolon();
             return finishNode(exportDeclaration);
         }
         function parseImportDeclarationOrImportEqualsDeclaration(fullStart, decorators, modifiers) {
@@ -17725,11 +18738,11 @@ var ts;
             var identifier;
             if (isIdentifier()) {
                 identifier = parseIdentifier();
-                if (token() !== 25 /* CommaToken */ && token() !== 137 /* FromKeyword */) {
+                if (token() !== 25 /* CommaToken */ && token() !== 138 /* FromKeyword */) {
                     // ImportEquals declaration of type:
                     // import x = require("mod"); or
                     // import x = M.x;
-                    var importEqualsDeclaration = createNode(230 /* ImportEqualsDeclaration */, fullStart);
+                    var importEqualsDeclaration = createNode(234 /* ImportEqualsDeclaration */, fullStart);
                     importEqualsDeclaration.decorators = decorators;
                     importEqualsDeclaration.modifiers = modifiers;
                     importEqualsDeclaration.name = identifier;
@@ -17740,7 +18753,7 @@ var ts;
                 }
             }
             // Import statement
-            var importDeclaration = createNode(231 /* ImportDeclaration */, fullStart);
+            var importDeclaration = createNode(235 /* ImportDeclaration */, fullStart);
             importDeclaration.decorators = decorators;
             importDeclaration.modifiers = modifiers;
             // ImportDeclaration:
@@ -17750,7 +18763,7 @@ var ts;
                 token() === 38 /* AsteriskToken */ ||
                 token() === 16 /* OpenBraceToken */) {
                 importDeclaration.importClause = parseImportClause(identifier, afterImportPos);
-                parseExpected(137 /* FromKeyword */);
+                parseExpected(138 /* FromKeyword */);
             }
             importDeclaration.moduleSpecifier = parseModuleSpecifier();
             parseSemicolon();
@@ -17763,7 +18776,7 @@ var ts;
             //  NamedImports
             //  ImportedDefaultBinding, NameSpaceImport
             //  ImportedDefaultBinding, NamedImports
-            var importClause = createNode(232 /* ImportClause */, fullStart);
+            var importClause = createNode(236 /* ImportClause */, fullStart);
             if (identifier) {
                 // ImportedDefaultBinding:
                 //  ImportedBinding
@@ -17773,7 +18786,7 @@ var ts;
             // parse namespace or named imports
             if (!importClause.name ||
                 parseOptional(25 /* CommaToken */)) {
-                importClause.namedBindings = token() === 38 /* AsteriskToken */ ? parseNamespaceImport() : parseNamedImportsOrExports(234 /* NamedImports */);
+                importClause.namedBindings = token() === 38 /* AsteriskToken */ ? parseNamespaceImport() : parseNamedImportsOrExports(238 /* NamedImports */);
             }
             return finishNode(importClause);
         }
@@ -17783,8 +18796,8 @@ var ts;
                 : parseEntityName(/*allowReservedWords*/ false);
         }
         function parseExternalModuleReference() {
-            var node = createNode(241 /* ExternalModuleReference */);
-            parseExpected(130 /* RequireKeyword */);
+            var node = createNode(245 /* ExternalModuleReference */);
+            parseExpected(131 /* RequireKeyword */);
             parseExpected(18 /* OpenParenToken */);
             node.expression = parseModuleSpecifier();
             parseExpected(19 /* CloseParenToken */);
@@ -17806,7 +18819,7 @@ var ts;
         function parseNamespaceImport() {
             // NameSpaceImport:
             //  * as ImportedBinding
-            var namespaceImport = createNode(233 /* NamespaceImport */);
+            var namespaceImport = createNode(237 /* NamespaceImport */);
             parseExpected(38 /* AsteriskToken */);
             parseExpected(117 /* AsKeyword */);
             namespaceImport.name = parseIdentifier();
@@ -17821,14 +18834,14 @@ var ts;
             // ImportsList:
             //  ImportSpecifier
             //  ImportsList, ImportSpecifier
-            node.elements = parseBracketedList(21 /* ImportOrExportSpecifiers */, kind === 234 /* NamedImports */ ? parseImportSpecifier : parseExportSpecifier, 16 /* OpenBraceToken */, 17 /* CloseBraceToken */);
+            node.elements = parseBracketedList(22 /* ImportOrExportSpecifiers */, kind === 238 /* NamedImports */ ? parseImportSpecifier : parseExportSpecifier, 16 /* OpenBraceToken */, 17 /* CloseBraceToken */);
             return finishNode(node);
         }
         function parseExportSpecifier() {
-            return parseImportOrExportSpecifier(239 /* ExportSpecifier */);
+            return parseImportOrExportSpecifier(243 /* ExportSpecifier */);
         }
         function parseImportSpecifier() {
-            return parseImportOrExportSpecifier(235 /* ImportSpecifier */);
+            return parseImportOrExportSpecifier(239 /* ImportSpecifier */);
         }
         function parseImportOrExportSpecifier(kind) {
             var node = createNode(kind);
@@ -17853,27 +18866,27 @@ var ts;
             else {
                 node.name = identifierName;
             }
-            if (kind === 235 /* ImportSpecifier */ && checkIdentifierIsKeyword) {
+            if (kind === 239 /* ImportSpecifier */ && checkIdentifierIsKeyword) {
                 // Report error identifier expected
                 parseErrorAtPosition(checkIdentifierStart, checkIdentifierEnd - checkIdentifierStart, ts.Diagnostics.Identifier_expected);
             }
             return finishNode(node);
         }
         function parseExportDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(237 /* ExportDeclaration */, fullStart);
+            var node = createNode(241 /* ExportDeclaration */, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             if (parseOptional(38 /* AsteriskToken */)) {
-                parseExpected(137 /* FromKeyword */);
+                parseExpected(138 /* FromKeyword */);
                 node.moduleSpecifier = parseModuleSpecifier();
             }
             else {
-                node.exportClause = parseNamedImportsOrExports(238 /* NamedExports */);
+                node.exportClause = parseNamedImportsOrExports(242 /* 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() === 137 /* FromKeyword */ || (token() === 9 /* StringLiteral */ && !scanner.hasPrecedingLineBreak())) {
-                    parseExpected(137 /* FromKeyword */);
+                if (token() === 138 /* FromKeyword */ || (token() === 9 /* StringLiteral */ && !scanner.hasPrecedingLineBreak())) {
+                    parseExpected(138 /* FromKeyword */);
                     node.moduleSpecifier = parseModuleSpecifier();
                 }
             }
@@ -17881,7 +18894,7 @@ var ts;
             return finishNode(node);
         }
         function parseExportAssignment(fullStart, decorators, modifiers) {
-            var node = createNode(236 /* ExportAssignment */, fullStart);
+            var node = createNode(240 /* ExportAssignment */, fullStart);
             node.decorators = decorators;
             node.modifiers = modifiers;
             if (parseOptional(57 /* EqualsToken */)) {
@@ -17963,10 +18976,10 @@ var ts;
         function setExternalModuleIndicator(sourceFile) {
             sourceFile.externalModuleIndicator = ts.forEach(sourceFile.statements, function (node) {
                 return ts.hasModifier(node, 1 /* Export */)
-                    || node.kind === 230 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 241 /* ExternalModuleReference */
-                    || node.kind === 231 /* ImportDeclaration */
-                    || node.kind === 236 /* ExportAssignment */
-                    || node.kind === 237 /* ExportDeclaration */
+                    || node.kind === 234 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 245 /* ExternalModuleReference */
+                    || node.kind === 235 /* ImportDeclaration */
+                    || node.kind === 240 /* ExportAssignment */
+                    || node.kind === 241 /* ExportDeclaration */
                     ? node
                     : undefined;
             });
@@ -17990,16 +19003,17 @@ var ts;
             ParsingContext[ParsingContext["JsxChildren"] = 14] = "JsxChildren";
             ParsingContext[ParsingContext["ArrayLiteralMembers"] = 15] = "ArrayLiteralMembers";
             ParsingContext[ParsingContext["Parameters"] = 16] = "Parameters";
-            ParsingContext[ParsingContext["TypeParameters"] = 17] = "TypeParameters";
-            ParsingContext[ParsingContext["TypeArguments"] = 18] = "TypeArguments";
-            ParsingContext[ParsingContext["TupleElementTypes"] = 19] = "TupleElementTypes";
-            ParsingContext[ParsingContext["HeritageClauses"] = 20] = "HeritageClauses";
-            ParsingContext[ParsingContext["ImportOrExportSpecifiers"] = 21] = "ImportOrExportSpecifiers";
-            ParsingContext[ParsingContext["JSDocFunctionParameters"] = 22] = "JSDocFunctionParameters";
-            ParsingContext[ParsingContext["JSDocTypeArguments"] = 23] = "JSDocTypeArguments";
-            ParsingContext[ParsingContext["JSDocRecordMembers"] = 24] = "JSDocRecordMembers";
-            ParsingContext[ParsingContext["JSDocTupleTypes"] = 25] = "JSDocTupleTypes";
-            ParsingContext[ParsingContext["Count"] = 26] = "Count"; // Number of parsing contexts
+            ParsingContext[ParsingContext["RestProperties"] = 17] = "RestProperties";
+            ParsingContext[ParsingContext["TypeParameters"] = 18] = "TypeParameters";
+            ParsingContext[ParsingContext["TypeArguments"] = 19] = "TypeArguments";
+            ParsingContext[ParsingContext["TupleElementTypes"] = 20] = "TupleElementTypes";
+            ParsingContext[ParsingContext["HeritageClauses"] = 21] = "HeritageClauses";
+            ParsingContext[ParsingContext["ImportOrExportSpecifiers"] = 22] = "ImportOrExportSpecifiers";
+            ParsingContext[ParsingContext["JSDocFunctionParameters"] = 23] = "JSDocFunctionParameters";
+            ParsingContext[ParsingContext["JSDocTypeArguments"] = 24] = "JSDocTypeArguments";
+            ParsingContext[ParsingContext["JSDocRecordMembers"] = 25] = "JSDocRecordMembers";
+            ParsingContext[ParsingContext["JSDocTupleTypes"] = 26] = "JSDocTupleTypes";
+            ParsingContext[ParsingContext["Count"] = 27] = "Count"; // Number of parsing contexts
         })(ParsingContext || (ParsingContext = {}));
         var Tristate;
         (function (Tristate) {
@@ -18027,8 +19041,8 @@ var ts;
             }
             JSDocParser.isJSDocType = isJSDocType;
             function parseJSDocTypeExpressionForTests(content, start, length) {
-                initializeState(content, 4 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
-                sourceFile = createSourceFile("file.js", 4 /* Latest */, 1 /* JS */);
+                initializeState(content, 5 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
+                sourceFile = createSourceFile("file.js", 5 /* Latest */, 1 /* JS */);
                 scanner.setText(content, start, length);
                 currentToken = scanner.scan();
                 var jsDocTypeExpression = parseJSDocTypeExpression();
@@ -18040,7 +19054,7 @@ var ts;
             // Parses out a JSDoc type expression.
             /* @internal */
             function parseJSDocTypeExpression() {
-                var result = createNode(257 /* JSDocTypeExpression */, scanner.getTokenPos());
+                var result = createNode(262 /* JSDocTypeExpression */, scanner.getTokenPos());
                 parseExpected(16 /* OpenBraceToken */);
                 result.type = parseJSDocTopLevelType();
                 parseExpected(17 /* CloseBraceToken */);
@@ -18051,12 +19065,12 @@ var ts;
             function parseJSDocTopLevelType() {
                 var type = parseJSDocType();
                 if (token() === 48 /* BarToken */) {
-                    var unionType = createNode(261 /* JSDocUnionType */, type.pos);
+                    var unionType = createNode(266 /* JSDocUnionType */, type.pos);
                     unionType.types = parseJSDocTypeList(type);
                     type = finishNode(unionType);
                 }
                 if (token() === 57 /* EqualsToken */) {
-                    var optionalType = createNode(268 /* JSDocOptionalType */, type.pos);
+                    var optionalType = createNode(273 /* JSDocOptionalType */, type.pos);
                     nextToken();
                     optionalType.type = type;
                     type = finishNode(optionalType);
@@ -18067,20 +19081,20 @@ var ts;
                 var type = parseBasicTypeExpression();
                 while (true) {
                     if (token() === 20 /* OpenBracketToken */) {
-                        var arrayType = createNode(260 /* JSDocArrayType */, type.pos);
+                        var arrayType = createNode(265 /* JSDocArrayType */, type.pos);
                         arrayType.elementType = type;
                         nextToken();
                         parseExpected(21 /* CloseBracketToken */);
                         type = finishNode(arrayType);
                     }
                     else if (token() === 54 /* QuestionToken */) {
-                        var nullableType = createNode(263 /* JSDocNullableType */, type.pos);
+                        var nullableType = createNode(268 /* JSDocNullableType */, type.pos);
                         nullableType.type = type;
                         nextToken();
                         type = finishNode(nullableType);
                     }
                     else if (token() === 50 /* ExclamationToken */) {
-                        var nonNullableType = createNode(264 /* JSDocNonNullableType */, type.pos);
+                        var nonNullableType = createNode(269 /* JSDocNonNullableType */, type.pos);
                         nonNullableType.type = type;
                         nextToken();
                         type = finishNode(nonNullableType);
@@ -18114,14 +19128,14 @@ var ts;
                     case 98 /* ThisKeyword */:
                         return parseJSDocThisType();
                     case 118 /* AnyKeyword */:
-                    case 133 /* StringKeyword */:
-                    case 131 /* NumberKeyword */:
+                    case 134 /* StringKeyword */:
+                    case 132 /* NumberKeyword */:
                     case 121 /* BooleanKeyword */:
-                    case 134 /* SymbolKeyword */:
+                    case 135 /* SymbolKeyword */:
                     case 104 /* VoidKeyword */:
                     case 94 /* NullKeyword */:
-                    case 136 /* UndefinedKeyword */:
-                    case 128 /* NeverKeyword */:
+                    case 137 /* UndefinedKeyword */:
+                    case 129 /* NeverKeyword */:
                         return parseTokenNode();
                     case 9 /* StringLiteral */:
                     case 8 /* NumericLiteral */:
@@ -18132,30 +19146,30 @@ var ts;
                 return parseJSDocTypeReference();
             }
             function parseJSDocThisType() {
-                var result = createNode(272 /* JSDocThisType */);
+                var result = createNode(277 /* JSDocThisType */);
                 nextToken();
                 parseExpected(55 /* ColonToken */);
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocConstructorType() {
-                var result = createNode(271 /* JSDocConstructorType */);
+                var result = createNode(276 /* JSDocConstructorType */);
                 nextToken();
                 parseExpected(55 /* ColonToken */);
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocVariadicType() {
-                var result = createNode(270 /* JSDocVariadicType */);
+                var result = createNode(275 /* JSDocVariadicType */);
                 nextToken();
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocFunctionType() {
-                var result = createNode(269 /* JSDocFunctionType */);
+                var result = createNode(274 /* JSDocFunctionType */);
                 nextToken();
                 parseExpected(18 /* OpenParenToken */);
-                result.parameters = parseDelimitedList(22 /* JSDocFunctionParameters */, parseJSDocParameter);
+                result.parameters = parseDelimitedList(23 /* JSDocFunctionParameters */, parseJSDocParameter);
                 checkForTrailingComma(result.parameters);
                 parseExpected(19 /* CloseParenToken */);
                 if (token() === 55 /* ColonToken */) {
@@ -18165,7 +19179,7 @@ var ts;
                 return finishNode(result);
             }
             function parseJSDocParameter() {
-                var parameter = createNode(143 /* Parameter */);
+                var parameter = createNode(144 /* Parameter */);
                 parameter.type = parseJSDocType();
                 if (parseOptional(57 /* EqualsToken */)) {
                     // TODO(rbuckton): Can this be changed to SyntaxKind.QuestionToken?
@@ -18174,7 +19188,7 @@ var ts;
                 return finishNode(parameter);
             }
             function parseJSDocTypeReference() {
-                var result = createNode(267 /* JSDocTypeReference */);
+                var result = createNode(272 /* JSDocTypeReference */);
                 result.name = parseSimplePropertyName();
                 if (token() === 26 /* LessThanToken */) {
                     result.typeArguments = parseTypeArguments();
@@ -18195,7 +19209,7 @@ var ts;
             function parseTypeArguments() {
                 // Move past the <
                 nextToken();
-                var typeArguments = parseDelimitedList(23 /* JSDocTypeArguments */, parseJSDocType);
+                var typeArguments = parseDelimitedList(24 /* JSDocTypeArguments */, parseJSDocType);
                 checkForTrailingComma(typeArguments);
                 checkForEmptyTypeArgumentList(typeArguments);
                 parseExpected(28 /* GreaterThanToken */);
@@ -18209,26 +19223,26 @@ var ts;
                 }
             }
             function parseQualifiedName(left) {
-                var result = createNode(140 /* QualifiedName */, left.pos);
+                var result = createNode(141 /* QualifiedName */, left.pos);
                 result.left = left;
                 result.right = parseIdentifierName();
                 return finishNode(result);
             }
             function parseJSDocRecordType() {
-                var result = createNode(265 /* JSDocRecordType */);
+                var result = createNode(270 /* JSDocRecordType */);
                 result.literal = parseTypeLiteral();
                 return finishNode(result);
             }
             function parseJSDocNonNullableType() {
-                var result = createNode(264 /* JSDocNonNullableType */);
+                var result = createNode(269 /* JSDocNonNullableType */);
                 nextToken();
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocTupleType() {
-                var result = createNode(262 /* JSDocTupleType */);
+                var result = createNode(267 /* JSDocTupleType */);
                 nextToken();
-                result.types = parseDelimitedList(25 /* JSDocTupleTypes */, parseJSDocType);
+                result.types = parseDelimitedList(26 /* JSDocTupleTypes */, parseJSDocType);
                 checkForTrailingComma(result.types);
                 parseExpected(21 /* CloseBracketToken */);
                 return finishNode(result);
@@ -18240,7 +19254,7 @@ var ts;
                 }
             }
             function parseJSDocUnionType() {
-                var result = createNode(261 /* JSDocUnionType */);
+                var result = createNode(266 /* JSDocUnionType */);
                 nextToken();
                 result.types = parseJSDocTypeList(parseJSDocType());
                 parseExpected(19 /* CloseParenToken */);
@@ -18256,12 +19270,12 @@ var ts;
                 return types;
             }
             function parseJSDocAllType() {
-                var result = createNode(258 /* JSDocAllType */);
+                var result = createNode(263 /* JSDocAllType */);
                 nextToken();
                 return finishNode(result);
             }
             function parseJSDocLiteralType() {
-                var result = createNode(282 /* JSDocLiteralType */);
+                var result = createNode(287 /* JSDocLiteralType */);
                 result.literal = parseLiteralTypeNode();
                 return finishNode(result);
             }
@@ -18284,17 +19298,17 @@ var ts;
                     token() === 28 /* GreaterThanToken */ ||
                     token() === 57 /* EqualsToken */ ||
                     token() === 48 /* BarToken */) {
-                    var result = createNode(259 /* JSDocUnknownType */, pos);
+                    var result = createNode(264 /* JSDocUnknownType */, pos);
                     return finishNode(result);
                 }
                 else {
-                    var result = createNode(263 /* JSDocNullableType */, pos);
+                    var result = createNode(268 /* JSDocNullableType */, pos);
                     result.type = parseJSDocType();
                     return finishNode(result);
                 }
             }
             function parseIsolatedJSDocComment(content, start, length) {
-                initializeState(content, 4 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
+                initializeState(content, 5 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
                 sourceFile = { languageVariant: 0 /* Standard */, text: content };
                 var jsDoc = parseJSDocCommentWorker(start, length);
                 var diagnostics = parseDiagnostics;
@@ -18359,6 +19373,7 @@ var ts;
                     }
                     if (token() === 4 /* NewLineTrivia */) {
                         state = 0 /* BeginningOfLine */;
+                        indent = 0;
                         nextJSDocToken();
                     }
                     while (token() !== 1 /* EndOfFileToken */) {
@@ -18447,7 +19462,7 @@ var ts;
                         content.charCodeAt(start + 3) !== 42 /* asterisk */;
                 }
                 function createJSDocComment() {
-                    var result = createNode(273 /* JSDocComment */, start);
+                    var result = createNode(278 /* JSDocComment */, start);
                     result.tags = tags;
                     result.comment = comments.length ? comments.join("") : undefined;
                     return finishNode(result, end);
@@ -18560,7 +19575,7 @@ var ts;
                     return comments;
                 }
                 function parseUnknownTag(atToken, tagName) {
-                    var result = createNode(274 /* JSDocTag */, atToken.pos);
+                    var result = createNode(279 /* JSDocTag */, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     return finishNode(result);
@@ -18617,7 +19632,7 @@ var ts;
                     if (!typeExpression) {
                         typeExpression = tryParseTypeExpression();
                     }
-                    var result = createNode(275 /* JSDocParameterTag */, atToken.pos);
+                    var result = createNode(280 /* JSDocParameterTag */, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.preParameterName = preName;
@@ -18628,20 +19643,20 @@ var ts;
                     return finishNode(result);
                 }
                 function parseReturnTag(atToken, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 276 /* JSDocReturnTag */; })) {
+                    if (ts.forEach(tags, function (t) { return t.kind === 281 /* JSDocReturnTag */; })) {
                         parseErrorAtPosition(tagName.pos, scanner.getTokenPos() - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
                     }
-                    var result = createNode(276 /* JSDocReturnTag */, atToken.pos);
+                    var result = createNode(281 /* JSDocReturnTag */, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.typeExpression = tryParseTypeExpression();
                     return finishNode(result);
                 }
                 function parseTypeTag(atToken, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 277 /* JSDocTypeTag */; })) {
+                    if (ts.forEach(tags, function (t) { return t.kind === 282 /* JSDocTypeTag */; })) {
                         parseErrorAtPosition(tagName.pos, scanner.getTokenPos() - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
                     }
-                    var result = createNode(277 /* JSDocTypeTag */, atToken.pos);
+                    var result = createNode(282 /* JSDocTypeTag */, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.typeExpression = tryParseTypeExpression();
@@ -18656,7 +19671,7 @@ var ts;
                         parseErrorAtPosition(scanner.getStartPos(), /*length*/ 0, ts.Diagnostics.Identifier_expected);
                         return undefined;
                     }
-                    var result = createNode(280 /* JSDocPropertyTag */, atToken.pos);
+                    var result = createNode(285 /* JSDocPropertyTag */, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.name = name;
@@ -18666,18 +19681,25 @@ var ts;
                 function parseTypedefTag(atToken, tagName) {
                     var typeExpression = tryParseTypeExpression();
                     skipWhitespace();
-                    var typedefTag = createNode(279 /* JSDocTypedefTag */, atToken.pos);
+                    var typedefTag = createNode(284 /* JSDocTypedefTag */, atToken.pos);
                     typedefTag.atToken = atToken;
                     typedefTag.tagName = tagName;
-                    typedefTag.name = parseJSDocIdentifierName();
+                    typedefTag.fullName = parseJSDocTypeNameWithNamespace(/*flags*/ 0);
+                    if (typedefTag.fullName) {
+                        var rightNode = typedefTag.fullName;
+                        while (rightNode.kind !== 70 /* Identifier */) {
+                            rightNode = rightNode.body;
+                        }
+                        typedefTag.name = rightNode;
+                    }
                     typedefTag.typeExpression = typeExpression;
                     skipWhitespace();
                     if (typeExpression) {
-                        if (typeExpression.type.kind === 267 /* JSDocTypeReference */) {
+                        if (typeExpression.type.kind === 272 /* JSDocTypeReference */) {
                             var jsDocTypeReference = typeExpression.type;
                             if (jsDocTypeReference.name.kind === 70 /* Identifier */) {
-                                var name_11 = jsDocTypeReference.name;
-                                if (name_11.text === "Object") {
+                                var name_15 = jsDocTypeReference.name;
+                                if (name_15.text === "Object") {
                                     typedefTag.jsDocTypeLiteral = scanChildTags();
                                 }
                             }
@@ -18691,7 +19713,7 @@ var ts;
                     }
                     return finishNode(typedefTag);
                     function scanChildTags() {
-                        var jsDocTypeLiteral = createNode(281 /* JSDocTypeLiteral */, scanner.getStartPos());
+                        var jsDocTypeLiteral = createNode(286 /* JSDocTypeLiteral */, scanner.getStartPos());
                         var resumePos = scanner.getStartPos();
                         var canParseTag = true;
                         var seenAsterisk = false;
@@ -18728,6 +19750,21 @@ var ts;
                         scanner.setTextPos(resumePos);
                         return finishNode(jsDocTypeLiteral);
                     }
+                    function parseJSDocTypeNameWithNamespace(flags) {
+                        var pos = scanner.getTokenPos();
+                        var typeNameOrNamespaceName = parseJSDocIdentifierName();
+                        if (typeNameOrNamespaceName && parseOptional(22 /* DotToken */)) {
+                            var jsDocNamespaceNode = createNode(230 /* ModuleDeclaration */, pos);
+                            jsDocNamespaceNode.flags |= flags;
+                            jsDocNamespaceNode.name = typeNameOrNamespaceName;
+                            jsDocNamespaceNode.body = parseJSDocTypeNameWithNamespace(4 /* NestedNamespace */);
+                            return jsDocNamespaceNode;
+                        }
+                        if (typeNameOrNamespaceName && flags & 4 /* NestedNamespace */) {
+                            typeNameOrNamespaceName.isInJSDocNamespace = true;
+                        }
+                        return typeNameOrNamespaceName;
+                    }
                 }
                 function tryParseChildTag(parentTag) {
                     ts.Debug.assert(token() === 56 /* AtToken */);
@@ -18749,30 +19786,34 @@ var ts;
                             return true;
                         case "prop":
                         case "property":
-                            if (!parentTag.jsDocPropertyTags) {
-                                parentTag.jsDocPropertyTags = [];
-                            }
                             var propertyTag = parsePropertyTag(atToken, tagName);
-                            parentTag.jsDocPropertyTags.push(propertyTag);
-                            return true;
+                            if (propertyTag) {
+                                if (!parentTag.jsDocPropertyTags) {
+                                    parentTag.jsDocPropertyTags = [];
+                                }
+                                parentTag.jsDocPropertyTags.push(propertyTag);
+                                return true;
+                            }
+                            // Error parsing property tag
+                            return false;
                     }
                     return false;
                 }
                 function parseTemplateTag(atToken, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 278 /* JSDocTemplateTag */; })) {
+                    if (ts.forEach(tags, function (t) { return t.kind === 283 /* JSDocTemplateTag */; })) {
                         parseErrorAtPosition(tagName.pos, scanner.getTokenPos() - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
                     }
                     // Type parameter list looks like '@template T,U,V'
                     var typeParameters = createNodeArray();
                     while (true) {
-                        var name_12 = parseJSDocIdentifierName();
+                        var name_16 = parseJSDocIdentifierName();
                         skipWhitespace();
-                        if (!name_12) {
+                        if (!name_16) {
                             parseErrorAtPosition(scanner.getStartPos(), 0, ts.Diagnostics.Identifier_expected);
                             return undefined;
                         }
-                        var typeParameter = createNode(142 /* TypeParameter */, name_12.pos);
-                        typeParameter.name = name_12;
+                        var typeParameter = createNode(143 /* TypeParameter */, name_16.pos);
+                        typeParameter.name = name_16;
                         finishNode(typeParameter);
                         typeParameters.push(typeParameter);
                         if (token() === 25 /* CommaToken */) {
@@ -18783,7 +19824,7 @@ var ts;
                             break;
                         }
                     }
-                    var result = createNode(278 /* JSDocTemplateTag */, atToken.pos);
+                    var result = createNode(283 /* JSDocTemplateTag */, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.typeParameters = typeParameters;
@@ -19294,25 +20335,25 @@ var ts;
 /* @internal */
 var ts;
 (function (ts) {
+    var ModuleInstanceState;
     (function (ModuleInstanceState) {
         ModuleInstanceState[ModuleInstanceState["NonInstantiated"] = 0] = "NonInstantiated";
         ModuleInstanceState[ModuleInstanceState["Instantiated"] = 1] = "Instantiated";
         ModuleInstanceState[ModuleInstanceState["ConstEnumOnly"] = 2] = "ConstEnumOnly";
-    })(ts.ModuleInstanceState || (ts.ModuleInstanceState = {}));
-    var ModuleInstanceState = ts.ModuleInstanceState;
+    })(ModuleInstanceState = ts.ModuleInstanceState || (ts.ModuleInstanceState = {}));
     function getModuleInstanceState(node) {
         // A module is uninstantiated if it contains only
         // 1. interface declarations, type alias declarations
-        if (node.kind === 223 /* InterfaceDeclaration */ || node.kind === 224 /* TypeAliasDeclaration */) {
+        if (node.kind === 227 /* InterfaceDeclaration */ || node.kind === 228 /* TypeAliasDeclaration */) {
             return 0 /* NonInstantiated */;
         }
         else if (ts.isConstEnumDeclaration(node)) {
             return 2 /* ConstEnumOnly */;
         }
-        else if ((node.kind === 231 /* ImportDeclaration */ || node.kind === 230 /* ImportEqualsDeclaration */) && !(ts.hasModifier(node, 1 /* Export */))) {
+        else if ((node.kind === 235 /* ImportDeclaration */ || node.kind === 234 /* ImportEqualsDeclaration */) && !(ts.hasModifier(node, 1 /* Export */))) {
             return 0 /* NonInstantiated */;
         }
-        else if (node.kind === 227 /* ModuleBlock */) {
+        else if (node.kind === 231 /* ModuleBlock */) {
             var state_1 = 0 /* NonInstantiated */;
             ts.forEachChild(node, function (n) {
                 switch (getModuleInstanceState(n)) {
@@ -19331,10 +20372,13 @@ var ts;
             });
             return state_1;
         }
-        else if (node.kind === 226 /* ModuleDeclaration */) {
+        else if (node.kind === 230 /* ModuleDeclaration */) {
             var body = node.body;
             return body ? getModuleInstanceState(body) : 1 /* Instantiated */;
         }
+        else if (node.kind === 70 /* Identifier */ && node.isInJSDocNamespace) {
+            return 0 /* NonInstantiated */;
+        }
         else {
             return 1 /* Instantiated */;
         }
@@ -19469,7 +20513,7 @@ var ts;
             if (symbolFlags & 107455 /* Value */) {
                 var valueDeclaration = symbol.valueDeclaration;
                 if (!valueDeclaration ||
-                    (valueDeclaration.kind !== node.kind && valueDeclaration.kind === 226 /* ModuleDeclaration */)) {
+                    (valueDeclaration.kind !== node.kind && valueDeclaration.kind === 230 /* ModuleDeclaration */)) {
                     // other kinds of value declarations take precedence over modules
                     symbol.valueDeclaration = node;
                 }
@@ -19482,7 +20526,7 @@ var ts;
                 if (ts.isAmbientModule(node)) {
                     return ts.isGlobalScopeAugmentation(node) ? "__global" : "\"" + node.name.text + "\"";
                 }
-                if (node.name.kind === 141 /* ComputedPropertyName */) {
+                if (node.name.kind === 142 /* ComputedPropertyName */) {
                     var nameExpression = node.name.expression;
                     // treat computed property names where expression is string/numeric literal as just string/numeric literal
                     if (ts.isStringOrNumericLiteral(nameExpression.kind)) {
@@ -19494,21 +20538,21 @@ var ts;
                 return node.name.text;
             }
             switch (node.kind) {
-                case 149 /* Constructor */:
+                case 150 /* Constructor */:
                     return "__constructor";
-                case 157 /* FunctionType */:
-                case 152 /* CallSignature */:
+                case 158 /* FunctionType */:
+                case 153 /* CallSignature */:
                     return "__call";
-                case 158 /* ConstructorType */:
-                case 153 /* ConstructSignature */:
+                case 159 /* ConstructorType */:
+                case 154 /* ConstructSignature */:
                     return "__new";
-                case 154 /* IndexSignature */:
+                case 155 /* IndexSignature */:
                     return "__index";
-                case 237 /* ExportDeclaration */:
+                case 241 /* ExportDeclaration */:
                     return "__export";
-                case 236 /* ExportAssignment */:
+                case 240 /* ExportAssignment */:
                     return node.isExportEquals ? "export=" : "default";
-                case 188 /* BinaryExpression */:
+                case 192 /* BinaryExpression */:
                     switch (ts.getSpecialPropertyAssignmentKind(node)) {
                         case 2 /* ModuleExports */:
                             // module.exports = ...
@@ -19523,22 +20567,22 @@ var ts;
                     }
                     ts.Debug.fail("Unknown binary declaration kind");
                     break;
-                case 221 /* FunctionDeclaration */:
-                case 222 /* ClassDeclaration */:
+                case 225 /* FunctionDeclaration */:
+                case 226 /* ClassDeclaration */:
                     return ts.hasModifier(node, 512 /* Default */) ? "default" : undefined;
-                case 269 /* JSDocFunctionType */:
+                case 274 /* JSDocFunctionType */:
                     return ts.isJSDocConstructSignature(node) ? "__new" : "__call";
-                case 143 /* Parameter */:
+                case 144 /* 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 === 269 /* JSDocFunctionType */);
+                    ts.Debug.assert(node.parent.kind === 274 /* JSDocFunctionType */);
                     var functionType = node.parent;
                     var index = ts.indexOf(functionType.parameters, node);
                     return "arg" + index;
-                case 279 /* JSDocTypedefTag */:
+                case 284 /* JSDocTypedefTag */:
                     var parentNode = node.parent && node.parent.parent;
                     var nameFromParentNode = void 0;
-                    if (parentNode && parentNode.kind === 201 /* VariableStatement */) {
+                    if (parentNode && parentNode.kind === 205 /* VariableStatement */) {
                         if (parentNode.declarationList.declarations.length > 0) {
                             var nameIdentifier = parentNode.declarationList.declarations[0].name;
                             if (nameIdentifier.kind === 70 /* Identifier */) {
@@ -19625,7 +20669,7 @@ 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 &&
-                                    (isDefaultExport || (node.kind === 236 /* ExportAssignment */ && !node.isExportEquals))) {
+                                    (isDefaultExport || (node.kind === 240 /* ExportAssignment */ && !node.isExportEquals))) {
                                     message_1 = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
                                 }
                             }
@@ -19645,7 +20689,7 @@ var ts;
         function declareModuleMember(node, symbolFlags, symbolExcludes) {
             var hasExportModifier = ts.getCombinedModifierFlags(node) & 1 /* Export */;
             if (symbolFlags & 8388608 /* Alias */) {
-                if (node.kind === 239 /* ExportSpecifier */ || (node.kind === 230 /* ImportEqualsDeclaration */ && hasExportModifier)) {
+                if (node.kind === 243 /* ExportSpecifier */ || (node.kind === 234 /* ImportEqualsDeclaration */ && hasExportModifier)) {
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
                 }
                 else {
@@ -19668,7 +20712,11 @@ var ts;
                 //       during global merging in the checker. Why? The only case when ambient module is permitted inside another module is module augmentation
                 //       and this case is specially handled. Module augmentations should only be merged with original module definition
                 //       and should never be merged directly with other augmentation, and the latter case would be possible if automatic merge is allowed.
-                if (!ts.isAmbientModule(node) && (hasExportModifier || container.flags & 32 /* ExportContext */)) {
+                var isJSDocTypedefInJSDocNamespace = node.kind === 284 /* JSDocTypedefTag */ &&
+                    node.name &&
+                    node.name.kind === 70 /* Identifier */ &&
+                    node.name.isInJSDocNamespace;
+                if ((!ts.isAmbientModule(node) && (hasExportModifier || container.flags & 32 /* ExportContext */)) || isJSDocTypedefInJSDocNamespace) {
                     var exportKind = (symbolFlags & 107455 /* Value */ ? 1048576 /* ExportValue */ : 0) |
                         (symbolFlags & 793064 /* Type */ ? 2097152 /* ExportType */ : 0) |
                         (symbolFlags & 1920 /* Namespace */ ? 4194304 /* ExportNamespace */ : 0);
@@ -19726,8 +20774,8 @@ var ts;
                 var saveReturnTarget = currentReturnTarget;
                 var saveActiveLabels = activeLabels;
                 var saveHasExplicitReturn = hasExplicitReturn;
-                var isIIFE = containerFlags & 16 /* IsFunctionExpression */ && !!ts.getImmediatelyInvokedFunctionExpression(node);
-                // An IIFE is considered part of the containing control flow. Return statements behave
+                var isIIFE = containerFlags & 16 /* IsFunctionExpression */ && !ts.hasModifier(node, 256 /* Async */) && !!ts.getImmediatelyInvokedFunctionExpression(node);
+                // A non-async IIFE is considered part of the containing control flow. Return statements behave
                 // similarly to break statements that exit to a label just past the statement body.
                 if (isIIFE) {
                     currentReturnTarget = createBranchLabel();
@@ -19746,13 +20794,13 @@ var ts;
                 bindChildren(node);
                 // Reset all reachability check related flags on node (for incremental scenarios)
                 // Reset all emit helper flags on node (for incremental scenarios)
-                node.flags &= ~32128 /* ReachabilityAndEmitFlags */;
+                node.flags &= ~64896 /* ReachabilityAndEmitFlags */;
                 if (!(currentFlow.flags & 1 /* Unreachable */) && containerFlags & 8 /* IsFunctionLike */ && ts.nodeIsPresent(node.body)) {
                     node.flags |= 128 /* HasImplicitReturn */;
                     if (hasExplicitReturn)
                         node.flags |= 256 /* HasExplicitReturn */;
                 }
-                if (node.kind === 256 /* SourceFile */) {
+                if (node.kind === 261 /* SourceFile */) {
                     node.flags |= emitFlags;
                 }
                 if (isIIFE) {
@@ -19787,6 +20835,7 @@ var ts;
                 skipTransformFlagAggregation = true;
                 bindChildrenWorker(node);
                 skipTransformFlagAggregation = false;
+                subtreeTransformFlags |= node.transformFlags & ~getTransformFlagsSubtreeExclusions(node.kind);
             }
             else {
                 var savedSubtreeTransformFlags = subtreeTransformFlags;
@@ -19807,64 +20856,64 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 206 /* WhileStatement */:
+                case 210 /* WhileStatement */:
                     bindWhileStatement(node);
                     break;
-                case 205 /* DoStatement */:
+                case 209 /* DoStatement */:
                     bindDoStatement(node);
                     break;
-                case 207 /* ForStatement */:
+                case 211 /* ForStatement */:
                     bindForStatement(node);
                     break;
-                case 208 /* ForInStatement */:
-                case 209 /* ForOfStatement */:
+                case 212 /* ForInStatement */:
+                case 213 /* ForOfStatement */:
                     bindForInOrForOfStatement(node);
                     break;
-                case 204 /* IfStatement */:
+                case 208 /* IfStatement */:
                     bindIfStatement(node);
                     break;
-                case 212 /* ReturnStatement */:
-                case 216 /* ThrowStatement */:
+                case 216 /* ReturnStatement */:
+                case 220 /* ThrowStatement */:
                     bindReturnOrThrow(node);
                     break;
-                case 211 /* BreakStatement */:
-                case 210 /* ContinueStatement */:
+                case 215 /* BreakStatement */:
+                case 214 /* ContinueStatement */:
                     bindBreakOrContinueStatement(node);
                     break;
-                case 217 /* TryStatement */:
+                case 221 /* TryStatement */:
                     bindTryStatement(node);
                     break;
-                case 214 /* SwitchStatement */:
+                case 218 /* SwitchStatement */:
                     bindSwitchStatement(node);
                     break;
-                case 228 /* CaseBlock */:
+                case 232 /* CaseBlock */:
                     bindCaseBlock(node);
                     break;
-                case 249 /* CaseClause */:
+                case 253 /* CaseClause */:
                     bindCaseClause(node);
                     break;
-                case 215 /* LabeledStatement */:
+                case 219 /* LabeledStatement */:
                     bindLabeledStatement(node);
                     break;
-                case 186 /* PrefixUnaryExpression */:
+                case 190 /* PrefixUnaryExpression */:
                     bindPrefixUnaryExpressionFlow(node);
                     break;
-                case 187 /* PostfixUnaryExpression */:
+                case 191 /* PostfixUnaryExpression */:
                     bindPostfixUnaryExpressionFlow(node);
                     break;
-                case 188 /* BinaryExpression */:
+                case 192 /* BinaryExpression */:
                     bindBinaryExpressionFlow(node);
                     break;
-                case 182 /* DeleteExpression */:
+                case 186 /* DeleteExpression */:
                     bindDeleteExpressionFlow(node);
                     break;
-                case 189 /* ConditionalExpression */:
+                case 193 /* ConditionalExpression */:
                     bindConditionalExpressionFlow(node);
                     break;
-                case 219 /* VariableDeclaration */:
+                case 223 /* VariableDeclaration */:
                     bindVariableDeclarationFlow(node);
                     break;
-                case 175 /* CallExpression */:
+                case 179 /* CallExpression */:
                     bindCallExpressionFlow(node);
                     break;
                 default:
@@ -19876,15 +20925,15 @@ var ts;
             switch (expr.kind) {
                 case 70 /* Identifier */:
                 case 98 /* ThisKeyword */:
-                case 173 /* PropertyAccessExpression */:
+                case 177 /* PropertyAccessExpression */:
                     return isNarrowableReference(expr);
-                case 175 /* CallExpression */:
+                case 179 /* CallExpression */:
                     return hasNarrowableArgument(expr);
-                case 179 /* ParenthesizedExpression */:
+                case 183 /* ParenthesizedExpression */:
                     return isNarrowingExpression(expr.expression);
-                case 188 /* BinaryExpression */:
+                case 192 /* BinaryExpression */:
                     return isNarrowingBinaryExpression(expr);
-                case 186 /* PrefixUnaryExpression */:
+                case 190 /* PrefixUnaryExpression */:
                     return expr.operator === 50 /* ExclamationToken */ && isNarrowingExpression(expr.operand);
             }
             return false;
@@ -19892,7 +20941,7 @@ var ts;
         function isNarrowableReference(expr) {
             return expr.kind === 70 /* Identifier */ ||
                 expr.kind === 98 /* ThisKeyword */ ||
-                expr.kind === 173 /* PropertyAccessExpression */ && isNarrowableReference(expr.expression);
+                expr.kind === 177 /* PropertyAccessExpression */ && isNarrowableReference(expr.expression);
         }
         function hasNarrowableArgument(expr) {
             if (expr.arguments) {
@@ -19903,14 +20952,14 @@ var ts;
                     }
                 }
             }
-            if (expr.expression.kind === 173 /* PropertyAccessExpression */ &&
+            if (expr.expression.kind === 177 /* PropertyAccessExpression */ &&
                 isNarrowableReference(expr.expression.expression)) {
                 return true;
             }
             return false;
         }
         function isNarrowingTypeofOperands(expr1, expr2) {
-            return expr1.kind === 183 /* TypeOfExpression */ && isNarrowableOperand(expr1.expression) && expr2.kind === 9 /* StringLiteral */;
+            return expr1.kind === 187 /* TypeOfExpression */ && isNarrowableOperand(expr1.expression) && expr2.kind === 9 /* StringLiteral */;
         }
         function isNarrowingBinaryExpression(expr) {
             switch (expr.operatorToken.kind) {
@@ -19931,9 +20980,9 @@ var ts;
         }
         function isNarrowableOperand(expr) {
             switch (expr.kind) {
-                case 179 /* ParenthesizedExpression */:
+                case 183 /* ParenthesizedExpression */:
                     return isNarrowableOperand(expr.expression);
-                case 188 /* BinaryExpression */:
+                case 192 /* BinaryExpression */:
                     switch (expr.operatorToken.kind) {
                         case 57 /* EqualsToken */:
                             return isNarrowableOperand(expr.left);
@@ -20028,33 +21077,33 @@ var ts;
         function isStatementCondition(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 204 /* IfStatement */:
-                case 206 /* WhileStatement */:
-                case 205 /* DoStatement */:
+                case 208 /* IfStatement */:
+                case 210 /* WhileStatement */:
+                case 209 /* DoStatement */:
                     return parent.expression === node;
-                case 207 /* ForStatement */:
-                case 189 /* ConditionalExpression */:
+                case 211 /* ForStatement */:
+                case 193 /* ConditionalExpression */:
                     return parent.condition === node;
             }
             return false;
         }
         function isLogicalExpression(node) {
             while (true) {
-                if (node.kind === 179 /* ParenthesizedExpression */) {
+                if (node.kind === 183 /* ParenthesizedExpression */) {
                     node = node.expression;
                 }
-                else if (node.kind === 186 /* PrefixUnaryExpression */ && node.operator === 50 /* ExclamationToken */) {
+                else if (node.kind === 190 /* PrefixUnaryExpression */ && node.operator === 50 /* ExclamationToken */) {
                     node = node.operand;
                 }
                 else {
-                    return node.kind === 188 /* BinaryExpression */ && (node.operatorToken.kind === 52 /* AmpersandAmpersandToken */ ||
+                    return node.kind === 192 /* BinaryExpression */ && (node.operatorToken.kind === 52 /* AmpersandAmpersandToken */ ||
                         node.operatorToken.kind === 53 /* BarBarToken */);
                 }
             }
         }
         function isTopLevelLogicalExpression(node) {
-            while (node.parent.kind === 179 /* ParenthesizedExpression */ ||
-                node.parent.kind === 186 /* PrefixUnaryExpression */ &&
+            while (node.parent.kind === 183 /* ParenthesizedExpression */ ||
+                node.parent.kind === 190 /* PrefixUnaryExpression */ &&
                     node.parent.operator === 50 /* ExclamationToken */) {
                 node = node.parent;
             }
@@ -20096,8 +21145,13 @@ var ts;
         }
         function bindDoStatement(node) {
             var preDoLabel = createLoopLabel();
-            var preConditionLabel = createBranchLabel();
-            var postDoLabel = createBranchLabel();
+            var enclosingLabeledStatement = node.parent.kind === 219 /* LabeledStatement */
+                ? ts.lastOrUndefined(activeLabels)
+                : undefined;
+            // if do statement is wrapped in labeled statement then target labels for break/continue with or without
+            // label should be the same
+            var preConditionLabel = enclosingLabeledStatement ? enclosingLabeledStatement.continueTarget : createBranchLabel();
+            var postDoLabel = enclosingLabeledStatement ? enclosingLabeledStatement.breakTarget : createBranchLabel();
             addAntecedent(preDoLabel, currentFlow);
             currentFlow = preDoLabel;
             bindIterativeStatement(node.statement, postDoLabel, preConditionLabel);
@@ -20128,7 +21182,7 @@ var ts;
             bind(node.expression);
             addAntecedent(postLoopLabel, currentFlow);
             bind(node.initializer);
-            if (node.initializer.kind !== 220 /* VariableDeclarationList */) {
+            if (node.initializer.kind !== 224 /* VariableDeclarationList */) {
                 bindAssignmentTargetFlow(node.initializer);
             }
             bindIterativeStatement(node.statement, postLoopLabel, preLoopLabel);
@@ -20150,7 +21204,7 @@ var ts;
         }
         function bindReturnOrThrow(node) {
             bind(node.expression);
-            if (node.kind === 212 /* ReturnStatement */) {
+            if (node.kind === 216 /* ReturnStatement */) {
                 hasExplicitReturn = true;
                 if (currentReturnTarget) {
                     addAntecedent(currentReturnTarget, currentFlow);
@@ -20170,7 +21224,7 @@ var ts;
             return undefined;
         }
         function bindbreakOrContinueFlow(node, breakTarget, continueTarget) {
-            var flowLabel = node.kind === 211 /* BreakStatement */ ? breakTarget : continueTarget;
+            var flowLabel = node.kind === 215 /* BreakStatement */ ? breakTarget : continueTarget;
             if (flowLabel) {
                 addAntecedent(flowLabel, currentFlow);
                 currentFlow = unreachableFlow;
@@ -20210,7 +21264,7 @@ var ts;
                 currentFlow = finishFlowLabel(preFinallyLabel);
                 bind(node.finallyBlock);
                 // if flow after finally is unreachable - keep it
-                // otherwise check if flows after try and after catch are unreachable 
+                // otherwise check if flows after try and after catch are unreachable
                 // if yes - convert current flow to unreachable
                 // i.e.
                 // try { return "1" } finally { console.log(1); }
@@ -20236,7 +21290,7 @@ var ts;
             preSwitchCaseFlow = currentFlow;
             bind(node.caseBlock);
             addAntecedent(postSwitchLabel, currentFlow);
-            var hasDefault = ts.forEach(node.caseBlock.clauses, function (c) { return c.kind === 250 /* DefaultClause */; });
+            var hasDefault = ts.forEach(node.caseBlock.clauses, function (c) { return c.kind === 254 /* 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;
@@ -20299,11 +21353,14 @@ var ts;
             if (!activeLabel.referenced && !options.allowUnusedLabels) {
                 file.bindDiagnostics.push(ts.createDiagnosticForNode(node.label, ts.Diagnostics.Unused_label));
             }
-            addAntecedent(postStatementLabel, currentFlow);
-            currentFlow = finishFlowLabel(postStatementLabel);
+            if (!node.statement || node.statement.kind !== 209 /* DoStatement */) {
+                // do statement sets current flow inside bindDoStatement
+                addAntecedent(postStatementLabel, currentFlow);
+                currentFlow = finishFlowLabel(postStatementLabel);
+            }
         }
         function bindDestructuringTargetFlow(node) {
-            if (node.kind === 188 /* BinaryExpression */ && node.operatorToken.kind === 57 /* EqualsToken */) {
+            if (node.kind === 192 /* BinaryExpression */ && node.operatorToken.kind === 57 /* EqualsToken */) {
                 bindAssignmentTargetFlow(node.left);
             }
             else {
@@ -20314,10 +21371,10 @@ var ts;
             if (isNarrowableReference(node)) {
                 currentFlow = createFlowAssignment(currentFlow, node);
             }
-            else if (node.kind === 171 /* ArrayLiteralExpression */) {
+            else if (node.kind === 175 /* ArrayLiteralExpression */) {
                 for (var _i = 0, _a = node.elements; _i < _a.length; _i++) {
                     var e = _a[_i];
-                    if (e.kind === 192 /* SpreadElementExpression */) {
+                    if (e.kind === 196 /* SpreadElement */) {
                         bindAssignmentTargetFlow(e.expression);
                     }
                     else {
@@ -20325,15 +21382,18 @@ var ts;
                     }
                 }
             }
-            else if (node.kind === 172 /* ObjectLiteralExpression */) {
+            else if (node.kind === 176 /* ObjectLiteralExpression */) {
                 for (var _b = 0, _c = node.properties; _b < _c.length; _b++) {
                     var p = _c[_b];
-                    if (p.kind === 253 /* PropertyAssignment */) {
+                    if (p.kind === 257 /* PropertyAssignment */) {
                         bindDestructuringTargetFlow(p.initializer);
                     }
-                    else if (p.kind === 254 /* ShorthandPropertyAssignment */) {
+                    else if (p.kind === 258 /* ShorthandPropertyAssignment */) {
                         bindAssignmentTargetFlow(p.name);
                     }
+                    else if (p.kind === 259 /* SpreadAssignment */) {
+                        bindAssignmentTargetFlow(p.expression);
+                    }
                 }
             }
         }
@@ -20385,9 +21445,9 @@ var ts;
             }
             else {
                 ts.forEachChild(node, bind);
-                if (operator === 57 /* EqualsToken */ && !ts.isAssignmentTarget(node)) {
+                if (ts.isAssignmentOperator(operator) && !ts.isAssignmentTarget(node)) {
                     bindAssignmentTargetFlow(node.left);
-                    if (node.left.kind === 174 /* ElementAccessExpression */) {
+                    if (operator === 57 /* EqualsToken */ && node.left.kind === 178 /* ElementAccessExpression */) {
                         var elementAccess = node.left;
                         if (isNarrowableOperand(elementAccess.expression)) {
                             currentFlow = createFlowArrayMutation(currentFlow, node);
@@ -20398,7 +21458,7 @@ var ts;
         }
         function bindDeleteExpressionFlow(node) {
             ts.forEachChild(node, bind);
-            if (node.expression.kind === 173 /* PropertyAccessExpression */) {
+            if (node.expression.kind === 177 /* PropertyAccessExpression */) {
                 bindAssignmentTargetFlow(node.expression);
             }
         }
@@ -20408,9 +21468,11 @@ var ts;
             var postExpressionLabel = createBranchLabel();
             bindCondition(node.condition, trueLabel, falseLabel);
             currentFlow = finishFlowLabel(trueLabel);
+            bind(node.questionToken);
             bind(node.whenTrue);
             addAntecedent(postExpressionLabel, currentFlow);
             currentFlow = finishFlowLabel(falseLabel);
+            bind(node.colonToken);
             bind(node.whenFalse);
             addAntecedent(postExpressionLabel, currentFlow);
             currentFlow = finishFlowLabel(postExpressionLabel);
@@ -20429,7 +21491,7 @@ var ts;
         }
         function bindVariableDeclarationFlow(node) {
             ts.forEachChild(node, bind);
-            if (node.initializer || node.parent.parent.kind === 208 /* ForInStatement */ || node.parent.parent.kind === 209 /* ForOfStatement */) {
+            if (node.initializer || node.parent.parent.kind === 212 /* ForInStatement */ || node.parent.parent.kind === 213 /* ForOfStatement */) {
                 bindInitializedVariableFlow(node);
             }
         }
@@ -20438,10 +21500,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 === 179 /* ParenthesizedExpression */) {
+            while (expr.kind === 183 /* ParenthesizedExpression */) {
                 expr = expr.expression;
             }
-            if (expr.kind === 180 /* FunctionExpression */ || expr.kind === 181 /* ArrowFunction */) {
+            if (expr.kind === 184 /* FunctionExpression */ || expr.kind === 185 /* ArrowFunction */) {
                 ts.forEach(node.typeArguments, bind);
                 ts.forEach(node.arguments, bind);
                 bind(node.expression);
@@ -20449,7 +21511,7 @@ var ts;
             else {
                 ts.forEachChild(node, bind);
             }
-            if (node.expression.kind === 173 /* PropertyAccessExpression */) {
+            if (node.expression.kind === 177 /* PropertyAccessExpression */) {
                 var propertyAccess = node.expression;
                 if (isNarrowableOperand(propertyAccess.expression) && ts.isPushOrUnshiftIdentifier(propertyAccess.name)) {
                     currentFlow = createFlowArrayMutation(currentFlow, node);
@@ -20458,51 +21520,52 @@ var ts;
         }
         function getContainerFlags(node) {
             switch (node.kind) {
-                case 193 /* ClassExpression */:
-                case 222 /* ClassDeclaration */:
-                case 225 /* EnumDeclaration */:
-                case 172 /* ObjectLiteralExpression */:
-                case 160 /* TypeLiteral */:
-                case 281 /* JSDocTypeLiteral */:
-                case 265 /* JSDocRecordType */:
+                case 197 /* ClassExpression */:
+                case 226 /* ClassDeclaration */:
+                case 229 /* EnumDeclaration */:
+                case 176 /* ObjectLiteralExpression */:
+                case 161 /* TypeLiteral */:
+                case 286 /* JSDocTypeLiteral */:
+                case 270 /* JSDocRecordType */:
                     return 1 /* IsContainer */;
-                case 223 /* InterfaceDeclaration */:
+                case 227 /* InterfaceDeclaration */:
                     return 1 /* IsContainer */ | 64 /* IsInterface */;
-                case 269 /* JSDocFunctionType */:
-                case 226 /* ModuleDeclaration */:
-                case 224 /* TypeAliasDeclaration */:
+                case 274 /* JSDocFunctionType */:
+                case 230 /* ModuleDeclaration */:
+                case 228 /* TypeAliasDeclaration */:
+                case 170 /* MappedType */:
                     return 1 /* IsContainer */ | 32 /* HasLocals */;
-                case 256 /* SourceFile */:
+                case 261 /* SourceFile */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */;
-                case 148 /* MethodDeclaration */:
+                case 149 /* MethodDeclaration */:
                     if (ts.isObjectLiteralOrClassExpressionMethod(node)) {
                         return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */ | 128 /* IsObjectLiteralOrClassExpressionMethod */;
                     }
-                case 149 /* Constructor */:
-                case 221 /* FunctionDeclaration */:
-                case 147 /* MethodSignature */:
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
-                case 152 /* CallSignature */:
-                case 153 /* ConstructSignature */:
-                case 154 /* IndexSignature */:
-                case 157 /* FunctionType */:
-                case 158 /* ConstructorType */:
+                case 150 /* Constructor */:
+                case 225 /* FunctionDeclaration */:
+                case 148 /* MethodSignature */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
+                case 153 /* CallSignature */:
+                case 154 /* ConstructSignature */:
+                case 155 /* IndexSignature */:
+                case 158 /* FunctionType */:
+                case 159 /* ConstructorType */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */;
-                case 180 /* FunctionExpression */:
-                case 181 /* ArrowFunction */:
+                case 184 /* FunctionExpression */:
+                case 185 /* ArrowFunction */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */ | 16 /* IsFunctionExpression */;
-                case 227 /* ModuleBlock */:
+                case 231 /* ModuleBlock */:
                     return 4 /* IsControlFlowContainer */;
-                case 146 /* PropertyDeclaration */:
+                case 147 /* PropertyDeclaration */:
                     return node.initializer ? 4 /* IsControlFlowContainer */ : 0;
-                case 252 /* CatchClause */:
-                case 207 /* ForStatement */:
-                case 208 /* ForInStatement */:
-                case 209 /* ForOfStatement */:
-                case 228 /* CaseBlock */:
+                case 256 /* CatchClause */:
+                case 211 /* ForStatement */:
+                case 212 /* ForInStatement */:
+                case 213 /* ForOfStatement */:
+                case 232 /* CaseBlock */:
                     return 2 /* IsBlockScopedContainer */;
-                case 200 /* Block */:
+                case 204 /* 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
@@ -20539,41 +21602,42 @@ 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 226 /* ModuleDeclaration */:
+                case 230 /* ModuleDeclaration */:
                     return declareModuleMember(node, symbolFlags, symbolExcludes);
-                case 256 /* SourceFile */:
+                case 261 /* SourceFile */:
                     return declareSourceFileMember(node, symbolFlags, symbolExcludes);
-                case 193 /* ClassExpression */:
-                case 222 /* ClassDeclaration */:
+                case 197 /* ClassExpression */:
+                case 226 /* ClassDeclaration */:
                     return declareClassMember(node, symbolFlags, symbolExcludes);
-                case 225 /* EnumDeclaration */:
+                case 229 /* EnumDeclaration */:
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
-                case 160 /* TypeLiteral */:
-                case 172 /* ObjectLiteralExpression */:
-                case 223 /* InterfaceDeclaration */:
-                case 265 /* JSDocRecordType */:
-                case 281 /* JSDocTypeLiteral */:
+                case 161 /* TypeLiteral */:
+                case 176 /* ObjectLiteralExpression */:
+                case 227 /* InterfaceDeclaration */:
+                case 270 /* JSDocRecordType */:
+                case 286 /* JSDocTypeLiteral */:
                     // 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 157 /* FunctionType */:
-                case 158 /* ConstructorType */:
-                case 152 /* CallSignature */:
-                case 153 /* ConstructSignature */:
-                case 154 /* IndexSignature */:
-                case 148 /* MethodDeclaration */:
-                case 147 /* MethodSignature */:
-                case 149 /* Constructor */:
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
-                case 221 /* FunctionDeclaration */:
-                case 180 /* FunctionExpression */:
-                case 181 /* ArrowFunction */:
-                case 269 /* JSDocFunctionType */:
-                case 224 /* TypeAliasDeclaration */:
+                case 158 /* FunctionType */:
+                case 159 /* ConstructorType */:
+                case 153 /* CallSignature */:
+                case 154 /* ConstructSignature */:
+                case 155 /* IndexSignature */:
+                case 149 /* MethodDeclaration */:
+                case 148 /* MethodSignature */:
+                case 150 /* Constructor */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
+                case 225 /* FunctionDeclaration */:
+                case 184 /* FunctionExpression */:
+                case 185 /* ArrowFunction */:
+                case 274 /* JSDocFunctionType */:
+                case 228 /* TypeAliasDeclaration */:
+                case 170 /* 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
@@ -20594,11 +21658,11 @@ var ts;
                 : declareSymbol(file.locals, undefined, node, symbolFlags, symbolExcludes);
         }
         function hasExportDeclarations(node) {
-            var body = node.kind === 256 /* SourceFile */ ? node : node.body;
-            if (body && (body.kind === 256 /* SourceFile */ || body.kind === 227 /* ModuleBlock */)) {
+            var body = node.kind === 261 /* SourceFile */ ? node : node.body;
+            if (body && (body.kind === 261 /* SourceFile */ || body.kind === 231 /* ModuleBlock */)) {
                 for (var _i = 0, _a = body.statements; _i < _a.length; _i++) {
                     var stat = _a[_i];
-                    if (stat.kind === 237 /* ExportDeclaration */ || stat.kind === 236 /* ExportAssignment */) {
+                    if (stat.kind === 241 /* ExportDeclaration */ || stat.kind === 240 /* ExportAssignment */) {
                         return true;
                     }
                 }
@@ -20691,7 +21755,7 @@ var ts;
                 var seen = ts.createMap();
                 for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                     var prop = _a[_i];
-                    if (prop.name.kind !== 70 /* Identifier */) {
+                    if (prop.kind === 259 /* SpreadAssignment */ || prop.name.kind !== 70 /* Identifier */) {
                         continue;
                     }
                     var identifier = prop.name;
@@ -20703,7 +21767,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 === 253 /* PropertyAssignment */ || prop.kind === 254 /* ShorthandPropertyAssignment */ || prop.kind === 148 /* MethodDeclaration */
+                    var currentKind = prop.kind === 257 /* PropertyAssignment */ || prop.kind === 258 /* ShorthandPropertyAssignment */ || prop.kind === 149 /* MethodDeclaration */
                         ? 1 /* Property */
                         : 2 /* Accessor */;
                     var existingKind = seen[identifier.text];
@@ -20725,10 +21789,10 @@ var ts;
         }
         function bindBlockScopedDeclaration(node, symbolFlags, symbolExcludes) {
             switch (blockScopeContainer.kind) {
-                case 226 /* ModuleDeclaration */:
+                case 230 /* ModuleDeclaration */:
                     declareModuleMember(node, symbolFlags, symbolExcludes);
                     break;
-                case 256 /* SourceFile */:
+                case 261 /* SourceFile */:
                     if (ts.isExternalModule(container)) {
                         declareModuleMember(node, symbolFlags, symbolExcludes);
                         break;
@@ -20839,8 +21903,8 @@ var ts;
         function checkStrictModeFunctionDeclaration(node) {
             if (languageVersion < 2 /* ES2015 */) {
                 // Report error if function is not top level function declaration
-                if (blockScopeContainer.kind !== 256 /* SourceFile */ &&
-                    blockScopeContainer.kind !== 226 /* ModuleDeclaration */ &&
+                if (blockScopeContainer.kind !== 261 /* SourceFile */ &&
+                    blockScopeContainer.kind !== 230 /* 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.
@@ -20906,7 +21970,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 > 139 /* LastToken */) {
+            if (node.kind > 140 /* LastToken */) {
                 var saveParent = parent;
                 parent = node;
                 var containerFlags = getContainerFlags(node);
@@ -20948,17 +22012,28 @@ var ts;
             switch (node.kind) {
                 /* Strict mode checks */
                 case 70 /* 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.
+                    if (node.isInJSDocNamespace) {
+                        var parentNode = node.parent;
+                        while (parentNode && parentNode.kind !== 284 /* JSDocTypedefTag */) {
+                            parentNode = parentNode.parent;
+                        }
+                        bindBlockScopedDeclaration(parentNode, 524288 /* TypeAlias */, 793064 /* TypeAliasExcludes */);
+                        break;
+                    }
                 case 98 /* ThisKeyword */:
-                    if (currentFlow && (ts.isExpression(node) || parent.kind === 254 /* ShorthandPropertyAssignment */)) {
+                    if (currentFlow && (ts.isExpression(node) || parent.kind === 258 /* ShorthandPropertyAssignment */)) {
                         node.flowNode = currentFlow;
                     }
                     return checkStrictModeIdentifier(node);
-                case 173 /* PropertyAccessExpression */:
+                case 177 /* PropertyAccessExpression */:
                     if (currentFlow && isNarrowableReference(node)) {
                         node.flowNode = currentFlow;
                     }
                     break;
-                case 188 /* BinaryExpression */:
+                case 192 /* BinaryExpression */:
                     if (ts.isInJavaScriptFile(node)) {
                         var specialKind = ts.getSpecialPropertyAssignmentKind(node);
                         switch (specialKind) {
@@ -20982,119 +22057,140 @@ var ts;
                         }
                     }
                     return checkStrictModeBinaryExpression(node);
-                case 252 /* CatchClause */:
+                case 256 /* CatchClause */:
                     return checkStrictModeCatchClause(node);
-                case 182 /* DeleteExpression */:
+                case 186 /* DeleteExpression */:
                     return checkStrictModeDeleteExpression(node);
                 case 8 /* NumericLiteral */:
                     return checkStrictModeNumericLiteral(node);
-                case 187 /* PostfixUnaryExpression */:
+                case 191 /* PostfixUnaryExpression */:
                     return checkStrictModePostfixUnaryExpression(node);
-                case 186 /* PrefixUnaryExpression */:
+                case 190 /* PrefixUnaryExpression */:
                     return checkStrictModePrefixUnaryExpression(node);
-                case 213 /* WithStatement */:
+                case 217 /* WithStatement */:
                     return checkStrictModeWithStatement(node);
-                case 166 /* ThisType */:
+                case 167 /* ThisType */:
                     seenThisKeyword = true;
                     return;
-                case 155 /* TypePredicate */:
+                case 156 /* TypePredicate */:
                     return checkTypePredicate(node);
-                case 142 /* TypeParameter */:
+                case 143 /* TypeParameter */:
                     return declareSymbolAndAddToSymbolTable(node, 262144 /* TypeParameter */, 530920 /* TypeParameterExcludes */);
-                case 143 /* Parameter */:
+                case 144 /* Parameter */:
                     return bindParameter(node);
-                case 219 /* VariableDeclaration */:
-                case 170 /* BindingElement */:
+                case 223 /* VariableDeclaration */:
+                case 174 /* BindingElement */:
+                    if (node.dotDotDotToken && node.parent.kind === 172 /* ObjectBindingPattern */) {
+                        emitFlags |= 32768 /* HasRestAttribute */;
+                    }
                     return bindVariableDeclarationOrBindingElement(node);
-                case 146 /* PropertyDeclaration */:
-                case 145 /* PropertySignature */:
-                case 266 /* JSDocRecordMember */:
+                case 147 /* PropertyDeclaration */:
+                case 146 /* PropertySignature */:
+                case 271 /* JSDocRecordMember */:
                     return bindPropertyOrMethodOrAccessor(node, 4 /* Property */ | (node.questionToken ? 536870912 /* Optional */ : 0 /* None */), 0 /* PropertyExcludes */);
-                case 280 /* JSDocPropertyTag */:
+                case 285 /* JSDocPropertyTag */:
                     return bindJSDocProperty(node);
-                case 253 /* PropertyAssignment */:
-                case 254 /* ShorthandPropertyAssignment */:
+                case 257 /* PropertyAssignment */:
+                case 258 /* ShorthandPropertyAssignment */:
                     return bindPropertyOrMethodOrAccessor(node, 4 /* Property */, 0 /* PropertyExcludes */);
-                case 255 /* EnumMember */:
+                case 260 /* EnumMember */:
                     return bindPropertyOrMethodOrAccessor(node, 8 /* EnumMember */, 900095 /* EnumMemberExcludes */);
-                case 247 /* JsxSpreadAttribute */:
-                    emitFlags |= 16384 /* HasJsxSpreadAttributes */;
+                case 259 /* SpreadAssignment */:
+                case 251 /* JsxSpreadAttribute */:
+                    var root = container;
+                    var hasRest = false;
+                    while (root.parent) {
+                        if (root.kind === 176 /* ObjectLiteralExpression */ &&
+                            root.parent.kind === 192 /* BinaryExpression */ &&
+                            root.parent.operatorToken.kind === 57 /* EqualsToken */ &&
+                            root.parent.left === root) {
+                            hasRest = true;
+                            break;
+                        }
+                        root = root.parent;
+                    }
+                    emitFlags |= hasRest ? 32768 /* HasRestAttribute */ : 16384 /* HasSpreadAttribute */;
                     return;
-                case 152 /* CallSignature */:
-                case 153 /* ConstructSignature */:
-                case 154 /* IndexSignature */:
+                case 153 /* CallSignature */:
+                case 154 /* ConstructSignature */:
+                case 155 /* IndexSignature */:
                     return declareSymbolAndAddToSymbolTable(node, 131072 /* Signature */, 0 /* None */);
-                case 148 /* MethodDeclaration */:
-                case 147 /* MethodSignature */:
+                case 149 /* MethodDeclaration */:
+                case 148 /* 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 ? 536870912 /* Optional */ : 0 /* None */), ts.isObjectLiteralMethod(node) ? 0 /* PropertyExcludes */ : 99263 /* MethodExcludes */);
-                case 221 /* FunctionDeclaration */:
+                case 225 /* FunctionDeclaration */:
                     return bindFunctionDeclaration(node);
-                case 149 /* Constructor */:
+                case 150 /* Constructor */:
                     return declareSymbolAndAddToSymbolTable(node, 16384 /* Constructor */, /*symbolExcludes:*/ 0 /* None */);
-                case 150 /* GetAccessor */:
+                case 151 /* GetAccessor */:
                     return bindPropertyOrMethodOrAccessor(node, 32768 /* GetAccessor */, 41919 /* GetAccessorExcludes */);
-                case 151 /* SetAccessor */:
+                case 152 /* SetAccessor */:
                     return bindPropertyOrMethodOrAccessor(node, 65536 /* SetAccessor */, 74687 /* SetAccessorExcludes */);
-                case 157 /* FunctionType */:
-                case 158 /* ConstructorType */:
-                case 269 /* JSDocFunctionType */:
+                case 158 /* FunctionType */:
+                case 159 /* ConstructorType */:
+                case 274 /* JSDocFunctionType */:
                     return bindFunctionOrConstructorType(node);
-                case 160 /* TypeLiteral */:
-                case 281 /* JSDocTypeLiteral */:
-                case 265 /* JSDocRecordType */:
+                case 161 /* TypeLiteral */:
+                case 170 /* MappedType */:
+                case 286 /* JSDocTypeLiteral */:
+                case 270 /* JSDocRecordType */:
                     return bindAnonymousDeclaration(node, 2048 /* TypeLiteral */, "__type");
-                case 172 /* ObjectLiteralExpression */:
+                case 176 /* ObjectLiteralExpression */:
                     return bindObjectLiteralExpression(node);
-                case 180 /* FunctionExpression */:
-                case 181 /* ArrowFunction */:
+                case 184 /* FunctionExpression */:
+                case 185 /* ArrowFunction */:
                     return bindFunctionExpression(node);
-                case 175 /* CallExpression */:
+                case 179 /* CallExpression */:
                     if (ts.isInJavaScriptFile(node)) {
                         bindCallExpression(node);
                     }
                     break;
                 // Members of classes, interfaces, and modules
-                case 193 /* ClassExpression */:
-                case 222 /* ClassDeclaration */:
+                case 197 /* ClassExpression */:
+                case 226 /* ClassDeclaration */:
                     // All classes are automatically in strict mode in ES6.
                     inStrictMode = true;
                     return bindClassLikeDeclaration(node);
-                case 223 /* InterfaceDeclaration */:
+                case 227 /* InterfaceDeclaration */:
                     return bindBlockScopedDeclaration(node, 64 /* Interface */, 792968 /* InterfaceExcludes */);
-                case 279 /* JSDocTypedefTag */:
-                case 224 /* TypeAliasDeclaration */:
+                case 284 /* JSDocTypedefTag */:
+                    if (!node.fullName || node.fullName.kind === 70 /* Identifier */) {
+                        return bindBlockScopedDeclaration(node, 524288 /* TypeAlias */, 793064 /* TypeAliasExcludes */);
+                    }
+                    break;
+                case 228 /* TypeAliasDeclaration */:
                     return bindBlockScopedDeclaration(node, 524288 /* TypeAlias */, 793064 /* TypeAliasExcludes */);
-                case 225 /* EnumDeclaration */:
+                case 229 /* EnumDeclaration */:
                     return bindEnumDeclaration(node);
-                case 226 /* ModuleDeclaration */:
+                case 230 /* ModuleDeclaration */:
                     return bindModuleDeclaration(node);
                 // Imports and exports
-                case 230 /* ImportEqualsDeclaration */:
-                case 233 /* NamespaceImport */:
-                case 235 /* ImportSpecifier */:
-                case 239 /* ExportSpecifier */:
+                case 234 /* ImportEqualsDeclaration */:
+                case 237 /* NamespaceImport */:
+                case 239 /* ImportSpecifier */:
+                case 243 /* ExportSpecifier */:
                     return declareSymbolAndAddToSymbolTable(node, 8388608 /* Alias */, 8388608 /* AliasExcludes */);
-                case 229 /* NamespaceExportDeclaration */:
+                case 233 /* NamespaceExportDeclaration */:
                     return bindNamespaceExportDeclaration(node);
-                case 232 /* ImportClause */:
+                case 236 /* ImportClause */:
                     return bindImportClause(node);
-                case 237 /* ExportDeclaration */:
+                case 241 /* ExportDeclaration */:
                     return bindExportDeclaration(node);
-                case 236 /* ExportAssignment */:
+                case 240 /* ExportAssignment */:
                     return bindExportAssignment(node);
-                case 256 /* SourceFile */:
+                case 261 /* SourceFile */:
                     updateStrictModeStatementList(node.statements);
                     return bindSourceFileIfExternalModule();
-                case 200 /* Block */:
+                case 204 /* Block */:
                     if (!ts.isFunctionLike(node.parent)) {
                         return;
                     }
                 // Fall through
-                case 227 /* ModuleBlock */:
+                case 231 /* ModuleBlock */:
                     return updateStrictModeStatementList(node.statements);
             }
         }
@@ -21103,7 +22199,7 @@ var ts;
             if (parameterName && parameterName.kind === 70 /* Identifier */) {
                 checkStrictModeIdentifier(parameterName);
             }
-            if (parameterName && parameterName.kind === 166 /* ThisType */) {
+            if (parameterName && parameterName.kind === 167 /* ThisType */) {
                 seenThisKeyword = true;
             }
             bind(type);
@@ -21126,7 +22222,7 @@ var ts;
                 // An export default clause with an expression exports a value
                 // We want to exclude both class and function here,  this is necessary to issue an error when there are both
                 // default export-assignment and default export function and class declaration.
-                var flags = node.kind === 236 /* ExportAssignment */ && ts.exportAssignmentIsAlias(node)
+                var flags = node.kind === 240 /* ExportAssignment */ && ts.exportAssignmentIsAlias(node)
                     ? 8388608 /* Alias */
                     : 4 /* Property */;
                 declareSymbol(container.symbol.exports, container.symbol, node, flags, 4 /* Property */ | 8388608 /* AliasExcludes */ | 32 /* Class */ | 16 /* Function */);
@@ -21136,17 +22232,17 @@ var ts;
             if (node.modifiers && node.modifiers.length) {
                 file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Modifiers_cannot_appear_here));
             }
-            if (node.parent.kind !== 256 /* SourceFile */) {
+            if (node.parent.kind !== 261 /* SourceFile */) {
                 file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Global_module_exports_may_only_appear_at_top_level));
                 return;
             }
             else {
-                var parent_6 = node.parent;
-                if (!ts.isExternalModule(parent_6)) {
+                var parent_5 = node.parent;
+                if (!ts.isExternalModule(parent_5)) {
                     file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Global_module_exports_may_only_appear_in_module_files));
                     return;
                 }
-                if (!parent_6.isDeclarationFile) {
+                if (!parent_5.isDeclarationFile) {
                     file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Global_module_exports_may_only_appear_in_declaration_files));
                     return;
                 }
@@ -21191,12 +22287,12 @@ var ts;
         function bindThisPropertyAssignment(node) {
             ts.Debug.assert(ts.isInJavaScriptFile(node));
             // Declare a 'member' if the container is an ES5 class or ES6 constructor
-            if (container.kind === 221 /* FunctionDeclaration */ || container.kind === 180 /* FunctionExpression */) {
+            if (container.kind === 225 /* FunctionDeclaration */ || container.kind === 184 /* FunctionExpression */) {
                 container.symbol.members = container.symbol.members || ts.createMap();
                 // It's acceptable for multiple 'this' assignments of the same identifier to occur
                 declareSymbol(container.symbol.members, container.symbol, node, 4 /* Property */, 0 /* PropertyExcludes */ & ~4 /* Property */);
             }
-            else if (container.kind === 149 /* Constructor */) {
+            else if (container.kind === 150 /* Constructor */) {
                 // this.foo assignment in a JavaScript class
                 // Bind this property to the containing class
                 var saveContainer = container;
@@ -21247,7 +22343,7 @@ var ts;
                     emitFlags |= 2048 /* HasDecorators */;
                 }
             }
-            if (node.kind === 222 /* ClassDeclaration */) {
+            if (node.kind === 226 /* ClassDeclaration */) {
                 bindBlockScopedDeclaration(node, 32 /* Class */, 899519 /* ClassExcludes */);
             }
             else {
@@ -21391,13 +22487,13 @@ var ts;
             if (currentFlow === unreachableFlow) {
                 var reportError = 
                 // report error on all statements except empty ones
-                (ts.isStatementButNotDeclaration(node) && node.kind !== 202 /* EmptyStatement */) ||
+                (ts.isStatementButNotDeclaration(node) && node.kind !== 206 /* EmptyStatement */) ||
                     // report error on class declarations
-                    node.kind === 222 /* ClassDeclaration */ ||
+                    node.kind === 226 /* ClassDeclaration */ ||
                     // report error on instantiated modules or const-enums only modules if preserveConstEnums is set
-                    (node.kind === 226 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node)) ||
+                    (node.kind === 230 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node)) ||
                     // report error on regular enums and const enums if preserveConstEnums is set
-                    (node.kind === 225 /* EnumDeclaration */ && (!ts.isConstEnumDeclaration(node) || options.preserveConstEnums));
+                    (node.kind === 229 /* EnumDeclaration */ && (!ts.isConstEnumDeclaration(node) || options.preserveConstEnums));
                 if (reportError) {
                     currentFlow = reportedUnreachableFlow;
                     // unreachable code is reported if
@@ -21411,7 +22507,7 @@ var ts;
                     //   On the other side we do want to report errors on non-initialized 'lets' because of TDZ
                     var reportUnreachableCode = !options.allowUnreachableCode &&
                         !ts.isInAmbientContext(node) &&
-                        (node.kind !== 201 /* VariableStatement */ ||
+                        (node.kind !== 205 /* VariableStatement */ ||
                             ts.getCombinedNodeFlags(node.declarationList) & 3 /* BlockScoped */ ||
                             ts.forEach(node.declarationList.declarations, function (d) { return d.initializer; }));
                     if (reportUnreachableCode) {
@@ -21431,54 +22527,56 @@ var ts;
     function computeTransformFlagsForNode(node, subtreeFlags) {
         var kind = node.kind;
         switch (kind) {
-            case 175 /* CallExpression */:
+            case 179 /* CallExpression */:
                 return computeCallExpression(node, subtreeFlags);
-            case 176 /* NewExpression */:
+            case 180 /* NewExpression */:
                 return computeNewExpression(node, subtreeFlags);
-            case 226 /* ModuleDeclaration */:
+            case 230 /* ModuleDeclaration */:
                 return computeModuleDeclaration(node, subtreeFlags);
-            case 179 /* ParenthesizedExpression */:
+            case 183 /* ParenthesizedExpression */:
                 return computeParenthesizedExpression(node, subtreeFlags);
-            case 188 /* BinaryExpression */:
+            case 192 /* BinaryExpression */:
                 return computeBinaryExpression(node, subtreeFlags);
-            case 203 /* ExpressionStatement */:
+            case 207 /* ExpressionStatement */:
                 return computeExpressionStatement(node, subtreeFlags);
-            case 143 /* Parameter */:
+            case 144 /* Parameter */:
                 return computeParameter(node, subtreeFlags);
-            case 181 /* ArrowFunction */:
+            case 185 /* ArrowFunction */:
                 return computeArrowFunction(node, subtreeFlags);
-            case 180 /* FunctionExpression */:
+            case 184 /* FunctionExpression */:
                 return computeFunctionExpression(node, subtreeFlags);
-            case 221 /* FunctionDeclaration */:
+            case 225 /* FunctionDeclaration */:
                 return computeFunctionDeclaration(node, subtreeFlags);
-            case 219 /* VariableDeclaration */:
+            case 223 /* VariableDeclaration */:
                 return computeVariableDeclaration(node, subtreeFlags);
-            case 220 /* VariableDeclarationList */:
+            case 224 /* VariableDeclarationList */:
                 return computeVariableDeclarationList(node, subtreeFlags);
-            case 201 /* VariableStatement */:
+            case 205 /* VariableStatement */:
                 return computeVariableStatement(node, subtreeFlags);
-            case 215 /* LabeledStatement */:
+            case 219 /* LabeledStatement */:
                 return computeLabeledStatement(node, subtreeFlags);
-            case 222 /* ClassDeclaration */:
+            case 226 /* ClassDeclaration */:
                 return computeClassDeclaration(node, subtreeFlags);
-            case 193 /* ClassExpression */:
+            case 197 /* ClassExpression */:
                 return computeClassExpression(node, subtreeFlags);
-            case 251 /* HeritageClause */:
+            case 255 /* HeritageClause */:
                 return computeHeritageClause(node, subtreeFlags);
-            case 195 /* ExpressionWithTypeArguments */:
+            case 256 /* CatchClause */:
+                return computeCatchClause(node, subtreeFlags);
+            case 199 /* ExpressionWithTypeArguments */:
                 return computeExpressionWithTypeArguments(node, subtreeFlags);
-            case 149 /* Constructor */:
+            case 150 /* Constructor */:
                 return computeConstructor(node, subtreeFlags);
-            case 146 /* PropertyDeclaration */:
+            case 147 /* PropertyDeclaration */:
                 return computePropertyDeclaration(node, subtreeFlags);
-            case 148 /* MethodDeclaration */:
+            case 149 /* MethodDeclaration */:
                 return computeMethod(node, subtreeFlags);
-            case 150 /* GetAccessor */:
-            case 151 /* SetAccessor */:
+            case 151 /* GetAccessor */:
+            case 152 /* SetAccessor */:
                 return computeAccessor(node, subtreeFlags);
-            case 230 /* ImportEqualsDeclaration */:
+            case 234 /* ImportEqualsDeclaration */:
                 return computeImportEquals(node, subtreeFlags);
-            case 173 /* PropertyAccessExpression */:
+            case 177 /* PropertyAccessExpression */:
                 return computePropertyAccess(node, subtreeFlags);
             default:
                 return computeOther(node, kind, subtreeFlags);
@@ -21492,21 +22590,21 @@ var ts;
         if (node.typeArguments) {
             transformFlags |= 3 /* AssertTypeScript */;
         }
-        if (subtreeFlags & 1048576 /* ContainsSpreadElementExpression */
+        if (subtreeFlags & 8388608 /* ContainsSpreadExpression */
             || isSuperOrSuperProperty(expression, expressionKind)) {
-            // If the this node contains a SpreadElementExpression, or is a super call, then it is an ES6
+            // If the this node contains a SpreadExpression, or is a super call, then it is an ES6
             // node.
-            transformFlags |= 768 /* AssertES2015 */;
+            transformFlags |= 3072 /* AssertES2015 */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~537922901 /* ArrayLiteralOrCallOrNewExcludes */;
+        return transformFlags & ~545281365 /* ArrayLiteralOrCallOrNewExcludes */;
     }
     function isSuperOrSuperProperty(node, kind) {
         switch (kind) {
             case 96 /* SuperKeyword */:
                 return true;
-            case 173 /* PropertyAccessExpression */:
-            case 174 /* ElementAccessExpression */:
+            case 177 /* PropertyAccessExpression */:
+            case 178 /* ElementAccessExpression */:
                 var expression = node.expression;
                 var expressionKind = expression.kind;
                 return expressionKind === 96 /* SuperKeyword */;
@@ -21518,31 +22616,34 @@ var ts;
         if (node.typeArguments) {
             transformFlags |= 3 /* AssertTypeScript */;
         }
-        if (subtreeFlags & 1048576 /* ContainsSpreadElementExpression */) {
+        if (subtreeFlags & 8388608 /* ContainsSpreadExpression */) {
             // If the this node contains a SpreadElementExpression then it is an ES6
             // node.
-            transformFlags |= 768 /* AssertES2015 */;
+            transformFlags |= 3072 /* AssertES2015 */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~537922901 /* ArrayLiteralOrCallOrNewExcludes */;
+        return transformFlags & ~545281365 /* ArrayLiteralOrCallOrNewExcludes */;
     }
     function computeBinaryExpression(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         var operatorTokenKind = node.operatorToken.kind;
         var leftKind = node.left.kind;
-        if (operatorTokenKind === 57 /* EqualsToken */
-            && (leftKind === 172 /* ObjectLiteralExpression */
-                || leftKind === 171 /* ArrayLiteralExpression */)) {
-            // Destructuring assignments are ES6 syntax.
-            transformFlags |= 768 /* AssertES2015 */ | 1024 /* DestructuringAssignment */;
+        if (operatorTokenKind === 57 /* EqualsToken */ && leftKind === 176 /* ObjectLiteralExpression */) {
+            // Destructuring object assignments with are ES2015 syntax
+            // and possibly ESNext if they contain rest
+            transformFlags |= 48 /* AssertESNext */ | 3072 /* AssertES2015 */ | 49152 /* AssertDestructuringAssignment */;
+        }
+        else if (operatorTokenKind === 57 /* EqualsToken */ && leftKind === 175 /* ArrayLiteralExpression */) {
+            // Destructuring assignments are ES2015 syntax.
+            transformFlags |= 3072 /* AssertES2015 */ | 49152 /* AssertDestructuringAssignment */;
         }
         else if (operatorTokenKind === 39 /* AsteriskAsteriskToken */
             || operatorTokenKind === 61 /* AsteriskAsteriskEqualsToken */) {
             // Exponentiation is ES2016 syntax.
-            transformFlags |= 192 /* AssertES2016 */;
+            transformFlags |= 768 /* AssertES2016 */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~536874325 /* NodeExcludes */;
+        return transformFlags & ~536892757 /* NodeExcludes */;
     }
     function computeParameter(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
@@ -21554,21 +22655,25 @@ var ts;
         // syntax.
         if (node.questionToken
             || node.type
-            || subtreeFlags & 8192 /* ContainsDecorators */
+            || subtreeFlags & 65536 /* ContainsDecorators */
             || ts.isThisIdentifier(name)) {
             transformFlags |= 3 /* AssertTypeScript */;
         }
         // If a parameter has an accessibility modifier, then it is TypeScript syntax.
         if (modifierFlags & 92 /* ParameterPropertyModifier */) {
-            transformFlags |= 3 /* AssertTypeScript */ | 524288 /* ContainsParameterPropertyAssignments */;
+            transformFlags |= 3 /* AssertTypeScript */ | 4194304 /* ContainsParameterPropertyAssignments */;
+        }
+        // parameters with object rest destructuring are ES Next syntax
+        if (subtreeFlags & 8388608 /* ContainsSpreadExpression */) {
+            transformFlags |= 48 /* AssertESNext */;
         }
         // If a parameter has an initializer, a binding pattern or a dotDotDot token, then
         // it is ES6 syntax and its container must emit default value assignments or parameter destructuring downlevel.
-        if (subtreeFlags & 8388608 /* ContainsBindingPattern */ || initializer || dotDotDotToken) {
-            transformFlags |= 768 /* AssertES2015 */ | 262144 /* ContainsDefaultValueAssignments */;
+        if (subtreeFlags & 67108864 /* ContainsBindingPattern */ || initializer || dotDotDotToken) {
+            transformFlags |= 3072 /* AssertES2015 */ | 2097152 /* ContainsDefaultValueAssignments */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~545262933 /* ParameterExcludes */;
+        return transformFlags & ~604001621 /* ParameterExcludes */;
     }
     function computeParenthesizedExpression(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
@@ -21578,17 +22683,17 @@ 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 === 196 /* AsExpression */
-            || expressionKind === 178 /* TypeAssertionExpression */) {
+        if (expressionKind === 200 /* AsExpression */
+            || expressionKind === 182 /* TypeAssertionExpression */) {
             transformFlags |= 3 /* AssertTypeScript */;
         }
         // If the expression of a ParenthesizedExpression is a destructuring assignment,
         // then the ParenthesizedExpression is a destructuring assignment.
-        if (expressionTransformFlags & 1024 /* DestructuringAssignment */) {
-            transformFlags |= 1024 /* DestructuringAssignment */;
+        if (expressionTransformFlags & 16384 /* DestructuringAssignment */) {
+            transformFlags |= 16384 /* DestructuringAssignment */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~536874325 /* NodeExcludes */;
+        return transformFlags & ~536892757 /* NodeExcludes */;
     }
     function computeClassDeclaration(node, subtreeFlags) {
         var transformFlags;
@@ -21599,47 +22704,47 @@ var ts;
         }
         else {
             // A ClassDeclaration is ES6 syntax.
-            transformFlags = subtreeFlags | 768 /* AssertES2015 */;
+            transformFlags = subtreeFlags | 3072 /* AssertES2015 */;
             // A class with a parameter property assignment, property initializer, or decorator is
             // TypeScript syntax.
-            // An exported declaration may be TypeScript syntax.
-            if ((subtreeFlags & 548864 /* TypeScriptClassSyntaxMask */)
-                || (modifierFlags & 1 /* Export */)
+            // An exported declaration may be TypeScript syntax, but is handled by the visitor
+            // for a namespace declaration.
+            if ((subtreeFlags & 4390912 /* TypeScriptClassSyntaxMask */)
                 || node.typeParameters) {
                 transformFlags |= 3 /* AssertTypeScript */;
             }
-            if (subtreeFlags & 131072 /* ContainsLexicalThisInComputedPropertyName */) {
+            if (subtreeFlags & 1048576 /* ContainsLexicalThisInComputedPropertyName */) {
                 // A computed property name containing `this` might need to be rewritten,
                 // so propagate the ContainsLexicalThis flag upward.
-                transformFlags |= 32768 /* ContainsLexicalThis */;
+                transformFlags |= 262144 /* ContainsLexicalThis */;
             }
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~539749717 /* ClassExcludes */;
+        return transformFlags & ~559895893 /* ClassExcludes */;
     }
     function computeClassExpression(node, subtreeFlags) {
         // A ClassExpression is ES6 syntax.
-        var transformFlags = subtreeFlags | 768 /* AssertES2015 */;
+        var transformFlags = subtreeFlags | 3072 /* AssertES2015 */;
         // A class with a parameter property assignment, property initializer, or decorator is
         // TypeScript syntax.
-        if (subtreeFlags & 548864 /* TypeScriptClassSyntaxMask */
+        if (subtreeFlags & 4390912 /* TypeScriptClassSyntaxMask */
             || node.typeParameters) {
             transformFlags |= 3 /* AssertTypeScript */;
         }
-        if (subtreeFlags & 131072 /* ContainsLexicalThisInComputedPropertyName */) {
+        if (subtreeFlags & 1048576 /* ContainsLexicalThisInComputedPropertyName */) {
             // A computed property name containing `this` might need to be rewritten,
             // so propagate the ContainsLexicalThis flag upward.
-            transformFlags |= 32768 /* ContainsLexicalThis */;
+            transformFlags |= 262144 /* ContainsLexicalThis */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~539749717 /* ClassExcludes */;
+        return transformFlags & ~559895893 /* ClassExcludes */;
     }
     function computeHeritageClause(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         switch (node.token) {
             case 84 /* ExtendsKeyword */:
                 // An `extends` HeritageClause is ES6 syntax.
-                transformFlags |= 768 /* AssertES2015 */;
+                transformFlags |= 3072 /* AssertES2015 */;
                 break;
             case 107 /* ImplementsKeyword */:
                 // An `implements` HeritageClause is TypeScript syntax.
@@ -21650,19 +22755,27 @@ var ts;
                 break;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~536874325 /* NodeExcludes */;
+        return transformFlags & ~536892757 /* NodeExcludes */;
+    }
+    function computeCatchClause(node, subtreeFlags) {
+        var transformFlags = subtreeFlags;
+        if (node.variableDeclaration && ts.isBindingPattern(node.variableDeclaration.name)) {
+            transformFlags |= 3072 /* AssertES2015 */;
+        }
+        node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
+        return transformFlags & ~536892757 /* NodeExcludes */;
     }
     function computeExpressionWithTypeArguments(node, subtreeFlags) {
         // An ExpressionWithTypeArguments is ES6 syntax, as it is used in the
         // extends clause of a class.
-        var transformFlags = subtreeFlags | 768 /* AssertES2015 */;
+        var transformFlags = subtreeFlags | 3072 /* AssertES2015 */;
         // If an ExpressionWithTypeArguments contains type arguments, then it
         // is TypeScript syntax.
         if (node.typeArguments) {
             transformFlags |= 3 /* AssertTypeScript */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~536874325 /* NodeExcludes */;
+        return transformFlags & ~536892757 /* NodeExcludes */;
     }
     function computeConstructor(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
@@ -21672,11 +22785,11 @@ var ts;
             transformFlags |= 3 /* AssertTypeScript */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~591760725 /* ConstructorExcludes */;
+        return transformFlags & ~975983957 /* ConstructorExcludes */;
     }
     function computeMethod(node, subtreeFlags) {
         // A MethodDeclaration is ES6 syntax.
-        var transformFlags = subtreeFlags | 768 /* AssertES2015 */;
+        var transformFlags = subtreeFlags | 3072 /* AssertES2015 */;
         // Decorators, TypeScript-specific modifiers, type parameters, type annotations, and
         // overloads are TypeScript syntax.
         if (node.decorators
@@ -21688,14 +22801,14 @@ var ts;
         }
         // An async method declaration is ES2017 syntax.
         if (ts.hasModifier(node, 256 /* Async */)) {
-            transformFlags |= 48 /* AssertES2017 */;
+            transformFlags |= 192 /* AssertES2017 */;
         }
         // Currently, we only support generators that were originally async function bodies.
         if (node.asteriskToken && ts.getEmitFlags(node) & 2097152 /* AsyncFunctionBody */) {
-            transformFlags |= 6144 /* AssertGenerator */;
+            transformFlags |= 12288 /* AssertGenerator */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~591760725 /* MethodOrAccessorExcludes */;
+        return transformFlags & ~975983957 /* MethodOrAccessorExcludes */;
     }
     function computeAccessor(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
@@ -21708,7 +22821,7 @@ var ts;
             transformFlags |= 3 /* AssertTypeScript */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~591760725 /* MethodOrAccessorExcludes */;
+        return transformFlags & ~975983957 /* MethodOrAccessorExcludes */;
     }
     function computePropertyDeclaration(node, subtreeFlags) {
         // A PropertyDeclaration is TypeScript syntax.
@@ -21716,10 +22829,10 @@ var ts;
         // If the PropertyDeclaration has an initializer, we need to inform its ancestor
         // so that it handle the transformation.
         if (node.initializer) {
-            transformFlags |= 16384 /* ContainsPropertyInitializer */;
+            transformFlags |= 131072 /* ContainsPropertyInitializer */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~536874325 /* NodeExcludes */;
+        return transformFlags & ~536892757 /* NodeExcludes */;
     }
     function computeFunctionDeclaration(node, subtreeFlags) {
         var transformFlags;
@@ -21731,11 +22844,7 @@ var ts;
             transformFlags = 3 /* AssertTypeScript */;
         }
         else {
-            transformFlags = subtreeFlags | 33554432 /* ContainsHoistedDeclarationOrCompletion */;
-            // If a FunctionDeclaration is exported, then it is either ES6 or TypeScript syntax.
-            if (modifierFlags & 1 /* Export */) {
-                transformFlags |= 3 /* AssertTypeScript */ | 768 /* AssertES2015 */;
-            }
+            transformFlags = subtreeFlags | 268435456 /* ContainsHoistedDeclarationOrCompletion */;
             // TypeScript-specific modifiers, type parameters, and type annotations are TypeScript
             // syntax.
             if (modifierFlags & 2270 /* TypeScriptModifier */
@@ -21745,13 +22854,17 @@ var ts;
             }
             // An async function declaration is ES2017 syntax.
             if (modifierFlags & 256 /* Async */) {
-                transformFlags |= 48 /* AssertES2017 */;
+                transformFlags |= 192 /* AssertES2017 */;
+            }
+            // function declarations with object rest destructuring are ES Next syntax
+            if (subtreeFlags & 8388608 /* ContainsSpreadExpression */) {
+                transformFlags |= 48 /* AssertESNext */;
             }
             // If a FunctionDeclaration's subtree has marked the container as needing to capture the
             // lexical this, or the function contains parameters with initializers, then this node is
             // ES6 syntax.
-            if (subtreeFlags & 327680 /* ES2015FunctionSyntaxMask */) {
-                transformFlags |= 768 /* AssertES2015 */;
+            if (subtreeFlags & 2621440 /* ES2015FunctionSyntaxMask */) {
+                transformFlags |= 3072 /* AssertES2015 */;
             }
             // If a FunctionDeclaration is generator function and is the body of a
             // transformed async function, then this node can be transformed to a
@@ -21759,11 +22872,11 @@ var ts;
             // Currently we do not support transforming any other generator fucntions
             // down level.
             if (node.asteriskToken && ts.getEmitFlags(node) & 2097152 /* AsyncFunctionBody */) {
-                transformFlags |= 6144 /* AssertGenerator */;
+                transformFlags |= 12288 /* AssertGenerator */;
             }
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~592293205 /* FunctionExcludes */;
+        return transformFlags & ~980243797 /* FunctionExcludes */;
     }
     function computeFunctionExpression(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
@@ -21776,13 +22889,17 @@ var ts;
         }
         // An async function expression is ES2017 syntax.
         if (ts.hasModifier(node, 256 /* Async */)) {
-            transformFlags |= 48 /* AssertES2017 */;
+            transformFlags |= 192 /* AssertES2017 */;
+        }
+        // function expressions with object rest destructuring are ES Next syntax
+        if (subtreeFlags & 8388608 /* ContainsSpreadExpression */) {
+            transformFlags |= 48 /* AssertESNext */;
         }
         // If a FunctionExpression's subtree has marked the container as needing to capture the
         // lexical this, or the function contains parameters with initializers, then this node is
         // ES6 syntax.
-        if (subtreeFlags & 327680 /* ES2015FunctionSyntaxMask */) {
-            transformFlags |= 768 /* AssertES2015 */;
+        if (subtreeFlags & 2621440 /* ES2015FunctionSyntaxMask */) {
+            transformFlags |= 3072 /* AssertES2015 */;
         }
         // If a FunctionExpression is generator function and is the body of a
         // transformed async function, then this node can be transformed to a
@@ -21790,14 +22907,14 @@ var ts;
         // Currently we do not support transforming any other generator fucntions
         // down level.
         if (node.asteriskToken && ts.getEmitFlags(node) & 2097152 /* AsyncFunctionBody */) {
-            transformFlags |= 6144 /* AssertGenerator */;
+            transformFlags |= 12288 /* AssertGenerator */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~592293205 /* FunctionExcludes */;
+        return transformFlags & ~980243797 /* FunctionExcludes */;
     }
     function computeArrowFunction(node, subtreeFlags) {
         // An ArrowFunction is ES6 syntax, and excludes markers that should not escape the scope of an ArrowFunction.
-        var transformFlags = subtreeFlags | 768 /* AssertES2015 */;
+        var transformFlags = subtreeFlags | 3072 /* AssertES2015 */;
         // TypeScript-specific modifiers, type parameters, and type annotations are TypeScript
         // syntax.
         if (ts.hasModifier(node, 2270 /* TypeScriptModifier */)
@@ -21807,14 +22924,18 @@ var ts;
         }
         // An async arrow function is ES2017 syntax.
         if (ts.hasModifier(node, 256 /* Async */)) {
-            transformFlags |= 48 /* AssertES2017 */;
+            transformFlags |= 192 /* AssertES2017 */;
+        }
+        // arrow functions with object rest destructuring are ES Next syntax
+        if (subtreeFlags & 8388608 /* ContainsSpreadExpression */) {
+            transformFlags |= 48 /* AssertESNext */;
         }
         // If an ArrowFunction contains a lexical this, its container must capture the lexical this.
-        if (subtreeFlags & 32768 /* ContainsLexicalThis */) {
-            transformFlags |= 65536 /* ContainsCapturedLexicalThis */;
+        if (subtreeFlags & 262144 /* ContainsLexicalThis */) {
+            transformFlags |= 524288 /* ContainsCapturedLexicalThis */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~592227669 /* ArrowFunctionExcludes */;
+        return transformFlags & ~979719509 /* ArrowFunctionExcludes */;
     }
     function computePropertyAccess(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
@@ -21823,24 +22944,28 @@ var ts;
         // If a PropertyAccessExpression starts with a super keyword, then it is
         // ES6 syntax, and requires a lexical `this` binding.
         if (expressionKind === 96 /* SuperKeyword */) {
-            transformFlags |= 32768 /* ContainsLexicalThis */;
+            transformFlags |= 262144 /* ContainsLexicalThis */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~536874325 /* NodeExcludes */;
+        return transformFlags & ~536892757 /* NodeExcludes */;
     }
     function computeVariableDeclaration(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         var nameKind = node.name.kind;
-        // A VariableDeclaration with a binding pattern is ES6 syntax.
-        if (nameKind === 168 /* ObjectBindingPattern */ || nameKind === 169 /* ArrayBindingPattern */) {
-            transformFlags |= 768 /* AssertES2015 */ | 8388608 /* ContainsBindingPattern */;
+        // A VariableDeclaration with an object binding pattern is ES2015 syntax
+        // and possibly ESNext syntax if it contains an object binding pattern
+        if (nameKind === 172 /* ObjectBindingPattern */) {
+            transformFlags |= 48 /* AssertESNext */ | 3072 /* AssertES2015 */ | 67108864 /* ContainsBindingPattern */;
+        }
+        else if (nameKind === 173 /* ArrayBindingPattern */) {
+            transformFlags |= 3072 /* AssertES2015 */ | 67108864 /* ContainsBindingPattern */;
         }
         // Type annotations are TypeScript syntax.
         if (node.type) {
             transformFlags |= 3 /* AssertTypeScript */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~536874325 /* NodeExcludes */;
+        return transformFlags & ~536892757 /* NodeExcludes */;
     }
     function computeVariableStatement(node, subtreeFlags) {
         var transformFlags;
@@ -21852,26 +22977,22 @@ var ts;
         }
         else {
             transformFlags = subtreeFlags;
-            // If a VariableStatement is exported, then it is either ES6 or TypeScript syntax.
-            if (modifierFlags & 1 /* Export */) {
-                transformFlags |= 768 /* AssertES2015 */ | 3 /* AssertTypeScript */;
-            }
-            if (declarationListTransformFlags & 8388608 /* ContainsBindingPattern */) {
-                transformFlags |= 768 /* AssertES2015 */;
+            if (declarationListTransformFlags & 67108864 /* ContainsBindingPattern */) {
+                transformFlags |= 3072 /* AssertES2015 */;
             }
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~536874325 /* NodeExcludes */;
+        return transformFlags & ~536892757 /* NodeExcludes */;
     }
     function computeLabeledStatement(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         // A labeled statement containing a block scoped binding *may* need to be transformed from ES6.
-        if (subtreeFlags & 4194304 /* ContainsBlockScopedBinding */
+        if (subtreeFlags & 33554432 /* ContainsBlockScopedBinding */
             && ts.isIterationStatement(node, /*lookInLabeledStatements*/ true)) {
-            transformFlags |= 768 /* AssertES2015 */;
+            transformFlags |= 3072 /* AssertES2015 */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~536874325 /* NodeExcludes */;
+        return transformFlags & ~536892757 /* NodeExcludes */;
     }
     function computeImportEquals(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
@@ -21880,18 +23001,18 @@ var ts;
             transformFlags |= 3 /* AssertTypeScript */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~536874325 /* NodeExcludes */;
+        return transformFlags & ~536892757 /* NodeExcludes */;
     }
     function computeExpressionStatement(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         // If the expression of an expression statement is a destructuring assignment,
         // then we treat the statement as ES6 so that we can indicate that we do not
         // need to hold on to the right-hand side.
-        if (node.expression.transformFlags & 1024 /* DestructuringAssignment */) {
-            transformFlags |= 768 /* AssertES2015 */;
+        if (node.expression.transformFlags & 16384 /* DestructuringAssignment */) {
+            transformFlags |= 3072 /* AssertES2015 */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~536874325 /* NodeExcludes */;
+        return transformFlags & ~536892757 /* NodeExcludes */;
     }
     function computeModuleDeclaration(node, subtreeFlags) {
         var transformFlags = 3 /* AssertTypeScript */;
@@ -21900,29 +23021,29 @@ var ts;
             transformFlags |= subtreeFlags;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~574729557 /* ModuleExcludes */;
+        return transformFlags & ~839734613 /* ModuleExcludes */;
     }
     function computeVariableDeclarationList(node, subtreeFlags) {
-        var transformFlags = subtreeFlags | 33554432 /* ContainsHoistedDeclarationOrCompletion */;
-        if (subtreeFlags & 8388608 /* ContainsBindingPattern */) {
-            transformFlags |= 768 /* AssertES2015 */;
+        var transformFlags = subtreeFlags | 268435456 /* ContainsHoistedDeclarationOrCompletion */;
+        if (subtreeFlags & 67108864 /* ContainsBindingPattern */) {
+            transformFlags |= 3072 /* AssertES2015 */;
         }
         // If a VariableDeclarationList is `let` or `const`, then it is ES6 syntax.
         if (node.flags & 3 /* BlockScoped */) {
-            transformFlags |= 768 /* AssertES2015 */ | 4194304 /* ContainsBlockScopedBinding */;
+            transformFlags |= 3072 /* AssertES2015 */ | 33554432 /* ContainsBlockScopedBinding */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~545262933 /* VariableDeclarationListExcludes */;
+        return transformFlags & ~604001621 /* VariableDeclarationListExcludes */;
     }
     function computeOther(node, kind, subtreeFlags) {
         // Mark transformations needed for each node
         var transformFlags = subtreeFlags;
-        var excludeFlags = 536874325 /* NodeExcludes */;
+        var excludeFlags = 536892757 /* NodeExcludes */;
         switch (kind) {
             case 119 /* AsyncKeyword */:
-            case 185 /* AwaitExpression */:
+            case 189 /* AwaitExpression */:
                 // async/await is ES2017 syntax
-                transformFlags |= 48 /* AssertES2017 */;
+                transformFlags |= 192 /* AssertES2017 */;
                 break;
             case 113 /* PublicKeyword */:
             case 111 /* PrivateKeyword */:
@@ -21930,84 +23051,86 @@ var ts;
             case 116 /* AbstractKeyword */:
             case 123 /* DeclareKeyword */:
             case 75 /* ConstKeyword */:
-            case 225 /* EnumDeclaration */:
-            case 255 /* EnumMember */:
-            case 178 /* TypeAssertionExpression */:
-            case 196 /* AsExpression */:
-            case 197 /* NonNullExpression */:
-            case 129 /* ReadonlyKeyword */:
+            case 229 /* EnumDeclaration */:
+            case 260 /* EnumMember */:
+            case 182 /* TypeAssertionExpression */:
+            case 200 /* AsExpression */:
+            case 201 /* NonNullExpression */:
+            case 130 /* ReadonlyKeyword */:
                 // These nodes are TypeScript syntax.
                 transformFlags |= 3 /* AssertTypeScript */;
                 break;
-            case 242 /* JsxElement */:
-            case 243 /* JsxSelfClosingElement */:
-            case 244 /* JsxOpeningElement */:
+            case 246 /* JsxElement */:
+            case 247 /* JsxSelfClosingElement */:
+            case 248 /* JsxOpeningElement */:
             case 10 /* JsxText */:
-            case 245 /* JsxClosingElement */:
-            case 246 /* JsxAttribute */:
-            case 247 /* JsxSpreadAttribute */:
-            case 248 /* JsxExpression */:
+            case 249 /* JsxClosingElement */:
+            case 250 /* JsxAttribute */:
+            case 251 /* JsxSpreadAttribute */:
+            case 252 /* JsxExpression */:
                 // These nodes are Jsx syntax.
                 transformFlags |= 12 /* AssertJsx */;
                 break;
-            case 83 /* ExportKeyword */:
-                // This node is both ES6 and TypeScript syntax.
-                transformFlags |= 768 /* AssertES2015 */ | 3 /* AssertTypeScript */;
-                break;
-            case 78 /* DefaultKeyword */:
+            case 213 /* ForOfStatement */:
+                // for-of might be ESNext if it has a rest destructuring
+                transformFlags |= 48 /* AssertESNext */;
+            // FALLTHROUGH
             case 12 /* NoSubstitutionTemplateLiteral */:
             case 13 /* TemplateHead */:
             case 14 /* TemplateMiddle */:
             case 15 /* TemplateTail */:
-            case 190 /* TemplateExpression */:
-            case 177 /* TaggedTemplateExpression */:
-            case 254 /* ShorthandPropertyAssignment */:
-            case 209 /* ForOfStatement */:
+            case 194 /* TemplateExpression */:
+            case 181 /* TaggedTemplateExpression */:
+            case 258 /* ShorthandPropertyAssignment */:
+            case 114 /* StaticKeyword */:
                 // These nodes are ES6 syntax.
-                transformFlags |= 768 /* AssertES2015 */;
+                transformFlags |= 3072 /* AssertES2015 */;
                 break;
-            case 191 /* YieldExpression */:
+            case 195 /* YieldExpression */:
                 // This node is ES6 syntax.
-                transformFlags |= 768 /* AssertES2015 */ | 16777216 /* ContainsYield */;
+                transformFlags |= 3072 /* AssertES2015 */ | 134217728 /* ContainsYield */;
                 break;
             case 118 /* AnyKeyword */:
-            case 131 /* NumberKeyword */:
-            case 128 /* NeverKeyword */:
-            case 133 /* StringKeyword */:
+            case 132 /* NumberKeyword */:
+            case 129 /* NeverKeyword */:
+            case 134 /* StringKeyword */:
             case 121 /* BooleanKeyword */:
-            case 134 /* SymbolKeyword */:
+            case 135 /* SymbolKeyword */:
             case 104 /* VoidKeyword */:
-            case 142 /* TypeParameter */:
-            case 145 /* PropertySignature */:
-            case 147 /* MethodSignature */:
-            case 152 /* CallSignature */:
-            case 153 /* ConstructSignature */:
-            case 154 /* IndexSignature */:
-            case 155 /* TypePredicate */:
-            case 156 /* TypeReference */:
-            case 157 /* FunctionType */:
-            case 158 /* ConstructorType */:
-            case 159 /* TypeQuery */:
-            case 160 /* TypeLiteral */:
-            case 161 /* ArrayType */:
-            case 162 /* TupleType */:
-            case 163 /* UnionType */:
-            case 164 /* IntersectionType */:
-            case 165 /* ParenthesizedType */:
-            case 223 /* InterfaceDeclaration */:
-            case 224 /* TypeAliasDeclaration */:
-            case 166 /* ThisType */:
-            case 167 /* LiteralType */:
+            case 143 /* TypeParameter */:
+            case 146 /* PropertySignature */:
+            case 148 /* MethodSignature */:
+            case 153 /* CallSignature */:
+            case 154 /* ConstructSignature */:
+            case 155 /* IndexSignature */:
+            case 156 /* TypePredicate */:
+            case 157 /* TypeReference */:
+            case 158 /* FunctionType */:
+            case 159 /* ConstructorType */:
+            case 160 /* TypeQuery */:
+            case 161 /* TypeLiteral */:
+            case 162 /* ArrayType */:
+            case 163 /* TupleType */:
+            case 164 /* UnionType */:
+            case 165 /* IntersectionType */:
+            case 166 /* ParenthesizedType */:
+            case 227 /* InterfaceDeclaration */:
+            case 228 /* TypeAliasDeclaration */:
+            case 167 /* ThisType */:
+            case 168 /* TypeOperator */:
+            case 169 /* IndexedAccessType */:
+            case 170 /* MappedType */:
+            case 171 /* LiteralType */:
                 // Types and signatures are TypeScript syntax, and exclude all other facts.
                 transformFlags = 3 /* AssertTypeScript */;
                 excludeFlags = -3 /* TypeExcludes */;
                 break;
-            case 141 /* ComputedPropertyName */:
+            case 142 /* 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 |= 2097152 /* ContainsComputedPropertyName */;
-                if (subtreeFlags & 32768 /* ContainsLexicalThis */) {
+                transformFlags |= 16777216 /* ContainsComputedPropertyName */;
+                if (subtreeFlags & 262144 /* ContainsLexicalThis */) {
                     // A computed method name like `[this.getName()](x: string) { ... }` needs to
                     // distinguish itself from the normal case of a method body containing `this`:
                     // `this` inside a method doesn't need to be rewritten (the method provides `this`),
@@ -22016,75 +23139,151 @@ var ts;
                     // `_this = this; () => class K { [_this.getName()]() { ... } }`
                     // To make this distinction, use ContainsLexicalThisInComputedPropertyName
                     // instead of ContainsLexicalThis for computed property names
-                    transformFlags |= 131072 /* ContainsLexicalThisInComputedPropertyName */;
+                    transformFlags |= 1048576 /* ContainsLexicalThisInComputedPropertyName */;
                 }
                 break;
-            case 192 /* SpreadElementExpression */:
-                // This node is ES6 syntax, but is handled by a containing node.
-                transformFlags |= 1048576 /* ContainsSpreadElementExpression */;
+            case 196 /* SpreadElement */:
+            case 259 /* SpreadAssignment */:
+                // This node is ES6 or ES next syntax, but is handled by a containing node.
+                transformFlags |= 8388608 /* ContainsSpreadExpression */;
                 break;
+            case 174 /* BindingElement */:
+                if (node.dotDotDotToken) {
+                    // this node is ES2015 or ES next syntax, but is handled by a containing node.
+                    transformFlags |= 8388608 /* ContainsSpreadExpression */;
+                }
             case 96 /* SuperKeyword */:
                 // This node is ES6 syntax.
-                transformFlags |= 768 /* AssertES2015 */;
+                transformFlags |= 3072 /* AssertES2015 */;
                 break;
             case 98 /* ThisKeyword */:
                 // Mark this node and its ancestors as containing a lexical `this` keyword.
-                transformFlags |= 32768 /* ContainsLexicalThis */;
+                transformFlags |= 262144 /* ContainsLexicalThis */;
                 break;
-            case 168 /* ObjectBindingPattern */:
-            case 169 /* ArrayBindingPattern */:
-                // These nodes are ES6 syntax.
-                transformFlags |= 768 /* AssertES2015 */ | 8388608 /* ContainsBindingPattern */;
+            case 172 /* ObjectBindingPattern */:
+            case 173 /* ArrayBindingPattern */:
+                // These nodes are ES2015 or ES Next syntax.
+                if (subtreeFlags & 8388608 /* ContainsSpreadExpression */) {
+                    transformFlags |= 48 /* AssertESNext */ | 67108864 /* ContainsBindingPattern */;
+                }
+                else {
+                    transformFlags |= 3072 /* AssertES2015 */ | 67108864 /* ContainsBindingPattern */;
+                }
                 break;
-            case 144 /* Decorator */:
+            case 145 /* Decorator */:
                 // This node is TypeScript syntax, and marks its container as also being TypeScript syntax.
-                transformFlags |= 3 /* AssertTypeScript */ | 8192 /* ContainsDecorators */;
+                transformFlags |= 3 /* AssertTypeScript */ | 65536 /* ContainsDecorators */;
                 break;
-            case 172 /* ObjectLiteralExpression */:
-                excludeFlags = 539110741 /* ObjectLiteralExcludes */;
-                if (subtreeFlags & 2097152 /* ContainsComputedPropertyName */) {
+            case 176 /* ObjectLiteralExpression */:
+                excludeFlags = 554784085 /* ObjectLiteralExcludes */;
+                if (subtreeFlags & 16777216 /* ContainsComputedPropertyName */) {
                     // If an ObjectLiteralExpression contains a ComputedPropertyName, then it
                     // is an ES6 node.
-                    transformFlags |= 768 /* AssertES2015 */;
+                    transformFlags |= 3072 /* AssertES2015 */;
                 }
-                if (subtreeFlags & 131072 /* ContainsLexicalThisInComputedPropertyName */) {
+                if (subtreeFlags & 1048576 /* ContainsLexicalThisInComputedPropertyName */) {
                     // A computed property name containing `this` might need to be rewritten,
                     // so propagate the ContainsLexicalThis flag upward.
-                    transformFlags |= 32768 /* ContainsLexicalThis */;
+                    transformFlags |= 262144 /* ContainsLexicalThis */;
+                }
+                if (subtreeFlags & 8388608 /* ContainsSpreadExpression */) {
+                    // If an ObjectLiteralExpression contains a spread element, then it
+                    // is an ES next node.
+                    transformFlags |= 48 /* AssertESNext */;
                 }
                 break;
-            case 171 /* ArrayLiteralExpression */:
-            case 176 /* NewExpression */:
-                excludeFlags = 537922901 /* ArrayLiteralOrCallOrNewExcludes */;
-                if (subtreeFlags & 1048576 /* ContainsSpreadElementExpression */) {
-                    // If the this node contains a SpreadElementExpression, then it is an ES6
+            case 175 /* ArrayLiteralExpression */:
+            case 180 /* NewExpression */:
+                excludeFlags = 545281365 /* ArrayLiteralOrCallOrNewExcludes */;
+                if (subtreeFlags & 8388608 /* ContainsSpreadExpression */) {
+                    // If the this node contains a SpreadExpression, then it is an ES6
                     // node.
-                    transformFlags |= 768 /* AssertES2015 */;
+                    transformFlags |= 3072 /* AssertES2015 */;
                 }
                 break;
-            case 205 /* DoStatement */:
-            case 206 /* WhileStatement */:
-            case 207 /* ForStatement */:
-            case 208 /* ForInStatement */:
+            case 209 /* DoStatement */:
+            case 210 /* WhileStatement */:
+            case 211 /* ForStatement */:
+            case 212 /* ForInStatement */:
                 // A loop containing a block scoped binding *may* need to be transformed from ES6.
-                if (subtreeFlags & 4194304 /* ContainsBlockScopedBinding */) {
-                    transformFlags |= 768 /* AssertES2015 */;
+                if (subtreeFlags & 33554432 /* ContainsBlockScopedBinding */) {
+                    transformFlags |= 3072 /* AssertES2015 */;
                 }
                 break;
-            case 256 /* SourceFile */:
-                if (subtreeFlags & 65536 /* ContainsCapturedLexicalThis */) {
-                    transformFlags |= 768 /* AssertES2015 */;
+            case 261 /* SourceFile */:
+                if (subtreeFlags & 524288 /* ContainsCapturedLexicalThis */) {
+                    transformFlags |= 3072 /* AssertES2015 */;
                 }
                 break;
-            case 212 /* ReturnStatement */:
-            case 210 /* ContinueStatement */:
-            case 211 /* BreakStatement */:
-                transformFlags |= 33554432 /* ContainsHoistedDeclarationOrCompletion */;
+            case 216 /* ReturnStatement */:
+            case 214 /* ContinueStatement */:
+            case 215 /* BreakStatement */:
+                transformFlags |= 268435456 /* ContainsHoistedDeclarationOrCompletion */;
                 break;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
         return transformFlags & ~excludeFlags;
     }
+    /**
+     * Gets the transform flags to exclude when unioning the transform flags of a subtree.
+     *
+     * NOTE: This needs to be kept up-to-date with the exclusions used in `computeTransformFlagsForNode`.
+     *       For performance reasons, `computeTransformFlagsForNode` uses local constant values rather
+     *       than calling this function.
+     */
+    /* @internal */
+    function getTransformFlagsSubtreeExclusions(kind) {
+        if (kind >= 156 /* FirstTypeNode */ && kind <= 171 /* LastTypeNode */) {
+            return -3 /* TypeExcludes */;
+        }
+        switch (kind) {
+            case 179 /* CallExpression */:
+            case 180 /* NewExpression */:
+            case 175 /* ArrayLiteralExpression */:
+                return 545281365 /* ArrayLiteralOrCallOrNewExcludes */;
+            case 230 /* ModuleDeclaration */:
+                return 839734613 /* ModuleExcludes */;
+            case 144 /* Parameter */:
+                return 604001621 /* ParameterExcludes */;
+            case 185 /* ArrowFunction */:
+                return 979719509 /* ArrowFunctionExcludes */;
+            case 184 /* FunctionExpression */:
+            case 225 /* FunctionDeclaration */:
+                return 980243797 /* FunctionExcludes */;
+            case 224 /* VariableDeclarationList */:
+                return 604001621 /* VariableDeclarationListExcludes */;
+            case 226 /* ClassDeclaration */:
+            case 197 /* ClassExpression */:
+                return 559895893 /* ClassExcludes */;
+            case 150 /* Constructor */:
+                return 975983957 /* ConstructorExcludes */;
+            case 149 /* MethodDeclaration */:
+            case 151 /* GetAccessor */:
+            case 152 /* SetAccessor */:
+                return 975983957 /* MethodOrAccessorExcludes */;
+            case 118 /* AnyKeyword */:
+            case 132 /* NumberKeyword */:
+            case 129 /* NeverKeyword */:
+            case 134 /* StringKeyword */:
+            case 121 /* BooleanKeyword */:
+            case 135 /* SymbolKeyword */:
+            case 104 /* VoidKeyword */:
+            case 143 /* TypeParameter */:
+            case 146 /* PropertySignature */:
+            case 148 /* MethodSignature */:
+            case 153 /* CallSignature */:
+            case 154 /* ConstructSignature */:
+            case 155 /* IndexSignature */:
+            case 227 /* InterfaceDeclaration */:
+            case 228 /* TypeAliasDeclaration */:
+                return -3 /* TypeExcludes */;
+            case 176 /* ObjectLiteralExpression */:
+                return 554784085 /* ObjectLiteralExcludes */;
+            default:
+                return 536892757 /* NodeExcludes */;
+        }
+    }
+    ts.getTransformFlagsSubtreeExclusions = getTransformFlagsSubtreeExclusions;
 })(ts || (ts = {}));
 /// <reference path="core.ts" />
 /// <reference path="diagnosticInformationMap.generated.ts" />
@@ -22099,25 +23298,63 @@ var ts;
         return compilerOptions.traceResolution && host.trace !== undefined;
     }
     ts.isTraceEnabled = isTraceEnabled;
-    /* @internal */
-    function createResolvedModule(resolvedFileName, isExternalLibraryImport, failedLookupLocations) {
-        return { resolvedModule: resolvedFileName ? { resolvedFileName: resolvedFileName, isExternalLibraryImport: isExternalLibraryImport } : undefined, failedLookupLocations: failedLookupLocations };
+    /**
+     * Kinds of file that we are currently looking for.
+     * Typically there is one pass with Extensions.TypeScript, then a second pass with Extensions.JavaScript.
+     */
+    var Extensions;
+    (function (Extensions) {
+        Extensions[Extensions["TypeScript"] = 0] = "TypeScript";
+        Extensions[Extensions["JavaScript"] = 1] = "JavaScript";
+        Extensions[Extensions["DtsOnly"] = 2] = "DtsOnly"; /** Only '.d.ts' */
+    })(Extensions || (Extensions = {}));
+    /** Used with `Extensions.DtsOnly` to extract the path from TypeScript results. */
+    function resolvedTypeScriptOnly(resolved) {
+        if (!resolved) {
+            return undefined;
+        }
+        ts.Debug.assert(ts.extensionIsTypeScript(resolved.extension));
+        return resolved.path;
+    }
+    /** Create Resolved from a file with unknown extension. */
+    function resolvedFromAnyFile(path) {
+        return { path: path, extension: ts.extensionFromPath(path) };
+    }
+    /** Adds `isExernalLibraryImport` to a Resolved to get a ResolvedModule. */
+    function resolvedModuleFromResolved(_a, isExternalLibraryImport) {
+        var path = _a.path, extension = _a.extension;
+        return { resolvedFileName: path, extension: extension, isExternalLibraryImport: isExternalLibraryImport };
+    }
+    function createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations) {
+        return { resolvedModule: resolved && resolvedModuleFromResolved(resolved, isExternalLibraryImport), failedLookupLocations: failedLookupLocations };
     }
-    ts.createResolvedModule = createResolvedModule;
     function moduleHasNonRelativeName(moduleName) {
         return !(ts.isRootedDiskPath(moduleName) || ts.isExternalModuleNameRelative(moduleName));
     }
-    function tryReadTypesSection(packageJsonPath, baseDirectory, state) {
+    function tryReadTypesSection(extensions, packageJsonPath, baseDirectory, state) {
         var jsonContent = readJson(packageJsonPath, state.host);
+        switch (extensions) {
+            case 2 /* DtsOnly */:
+            case 0 /* TypeScript */:
+                return tryReadFromField("typings") || tryReadFromField("types");
+            case 1 /* JavaScript */:
+                if (typeof jsonContent.main === "string") {
+                    if (state.traceEnabled) {
+                        trace(state.host, ts.Diagnostics.No_types_specified_in_package_json_so_returning_main_value_of_0, jsonContent.main);
+                    }
+                    return ts.normalizePath(ts.combinePaths(baseDirectory, jsonContent.main));
+                }
+                return undefined;
+        }
         function tryReadFromField(fieldName) {
             if (ts.hasProperty(jsonContent, fieldName)) {
                 var typesFile = jsonContent[fieldName];
                 if (typeof typesFile === "string") {
-                    var typesFilePath_1 = ts.normalizePath(ts.combinePaths(baseDirectory, typesFile));
+                    var typesFilePath = ts.normalizePath(ts.combinePaths(baseDirectory, typesFile));
                     if (state.traceEnabled) {
-                        trace(state.host, ts.Diagnostics.package_json_has_0_field_1_that_references_2, fieldName, typesFile, typesFilePath_1);
+                        trace(state.host, ts.Diagnostics.package_json_has_0_field_1_that_references_2, fieldName, typesFile, typesFilePath);
                     }
-                    return typesFilePath_1;
+                    return typesFilePath;
                 }
                 else {
                     if (state.traceEnabled) {
@@ -22126,19 +23363,6 @@ var ts;
                 }
             }
         }
-        var typesFilePath = tryReadFromField("typings") || tryReadFromField("types");
-        if (typesFilePath) {
-            return typesFilePath;
-        }
-        // Use the main module for inferring types if no types package specified and the allowJs is set
-        if (state.compilerOptions.allowJs && jsonContent.main && typeof jsonContent.main === "string") {
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.No_types_specified_in_package_json_but_allowJs_is_set_so_returning_main_value_of_0, jsonContent.main);
-            }
-            var mainFilePath = ts.normalizePath(ts.combinePaths(baseDirectory, jsonContent.main));
-            return mainFilePath;
-        }
-        return undefined;
     }
     function readJson(path, host) {
         try {
@@ -22150,7 +23374,6 @@ var ts;
             return {};
         }
     }
-    var typeReferenceExtensions = [".d.ts"];
     function getEffectiveTypeRoots(options, host) {
         if (options.typeRoots) {
             return options.typeRoots;
@@ -22162,7 +23385,9 @@ var ts;
         else if (host.getCurrentDirectory) {
             currentDirectory = host.getCurrentDirectory();
         }
-        return currentDirectory !== undefined && getDefaultTypeRoots(currentDirectory, host);
+        if (currentDirectory !== undefined) {
+            return getDefaultTypeRoots(currentDirectory, host);
+        }
     }
     ts.getEffectiveTypeRoots = getEffectiveTypeRoots;
     /**
@@ -22174,17 +23399,12 @@ var ts;
             return [ts.combinePaths(currentDirectory, nodeModulesAtTypes)];
         }
         var typeRoots;
-        while (true) {
-            var atTypes = ts.combinePaths(currentDirectory, nodeModulesAtTypes);
+        forEachAncestorDirectory(currentDirectory, function (directory) {
+            var atTypes = ts.combinePaths(directory, nodeModulesAtTypes);
             if (host.directoryExists(atTypes)) {
                 (typeRoots || (typeRoots = [])).push(atTypes);
             }
-            var parent_7 = ts.getDirectoryPath(currentDirectory);
-            if (parent_7 === currentDirectory) {
-                break;
-            }
-            currentDirectory = parent_7;
-        }
+        });
         return typeRoots;
     }
     var nodeModulesAtTypes = ts.combinePaths("node_modules", "@types");
@@ -22198,7 +23418,6 @@ var ts;
         var moduleResolutionState = {
             compilerOptions: options,
             host: host,
-            skipTsx: true,
             traceEnabled: traceEnabled
         };
         var typeRoots = getEffectiveTypeRoots(options, host);
@@ -22221,64 +23440,59 @@ var ts;
             }
         }
         var failedLookupLocations = [];
-        // Check primary library paths
-        if (typeRoots && typeRoots.length) {
+        var resolved = primaryLookup();
+        var primary = true;
+        if (!resolved) {
+            resolved = secondaryLookup();
+            primary = false;
+        }
+        var resolvedTypeReferenceDirective;
+        if (resolved) {
+            resolved = realpath(resolved, host, traceEnabled);
             if (traceEnabled) {
-                trace(host, ts.Diagnostics.Resolving_with_primary_search_path_0, typeRoots.join(", "));
+                trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolved, primary);
             }
-            var primarySearchPaths = typeRoots;
-            for (var _i = 0, primarySearchPaths_1 = primarySearchPaths; _i < primarySearchPaths_1.length; _i++) {
-                var typeRoot = primarySearchPaths_1[_i];
-                var candidate = ts.combinePaths(typeRoot, typeReferenceDirectiveName);
-                var candidateDirectory = ts.getDirectoryPath(candidate);
-                var resolvedFile_1 = loadNodeModuleFromDirectory(typeReferenceExtensions, candidate, failedLookupLocations, !directoryProbablyExists(candidateDirectory, host), moduleResolutionState);
-                if (resolvedFile_1) {
-                    if (traceEnabled) {
-                        trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFile_1, true);
-                    }
-                    return {
-                        resolvedTypeReferenceDirective: { primary: true, resolvedFileName: resolvedFile_1 },
-                        failedLookupLocations: failedLookupLocations
-                    };
+            resolvedTypeReferenceDirective = { primary: primary, resolvedFileName: resolved };
+        }
+        return { resolvedTypeReferenceDirective: resolvedTypeReferenceDirective, failedLookupLocations: failedLookupLocations };
+        function primaryLookup() {
+            // Check primary library paths
+            if (typeRoots && typeRoots.length) {
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Resolving_with_primary_search_path_0, typeRoots.join(", "));
+                }
+                return ts.forEach(typeRoots, function (typeRoot) {
+                    var candidate = ts.combinePaths(typeRoot, typeReferenceDirectiveName);
+                    var candidateDirectory = ts.getDirectoryPath(candidate);
+                    return resolvedTypeScriptOnly(loadNodeModuleFromDirectory(2 /* DtsOnly */, candidate, failedLookupLocations, !directoryProbablyExists(candidateDirectory, host), moduleResolutionState));
+                });
+            }
+            else {
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Root_directory_cannot_be_determined_skipping_primary_search_paths);
                 }
             }
         }
-        else {
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Root_directory_cannot_be_determined_skipping_primary_search_paths);
-            }
-        }
-        var resolvedFile;
-        var initialLocationForSecondaryLookup;
-        if (containingFile) {
-            initialLocationForSecondaryLookup = ts.getDirectoryPath(containingFile);
-        }
-        if (initialLocationForSecondaryLookup !== undefined) {
-            // check secondary locations
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Looking_up_in_node_modules_folder_initial_location_0, initialLocationForSecondaryLookup);
-            }
-            resolvedFile = loadModuleFromNodeModules(typeReferenceDirectiveName, initialLocationForSecondaryLookup, failedLookupLocations, moduleResolutionState, /*checkOneLevel*/ false);
-            if (traceEnabled) {
-                if (resolvedFile) {
-                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFile, false);
+        function secondaryLookup() {
+            var resolvedFile;
+            var initialLocationForSecondaryLookup = containingFile && ts.getDirectoryPath(containingFile);
+            if (initialLocationForSecondaryLookup !== undefined) {
+                // check secondary locations
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Looking_up_in_node_modules_folder_initial_location_0, initialLocationForSecondaryLookup);
                 }
-                else {
+                resolvedFile = resolvedTypeScriptOnly(loadModuleFromNodeModules(2 /* DtsOnly */, typeReferenceDirectiveName, initialLocationForSecondaryLookup, failedLookupLocations, moduleResolutionState));
+                if (!resolvedFile && traceEnabled) {
                     trace(host, ts.Diagnostics.Type_reference_directive_0_was_not_resolved, typeReferenceDirectiveName);
                 }
+                return resolvedFile;
+            }
+            else {
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_modules_folder);
+                }
             }
         }
-        else {
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_modules_folder);
-            }
-        }
-        return {
-            resolvedTypeReferenceDirective: resolvedFile
-                ? { primary: false, resolvedFileName: resolvedFile }
-                : undefined,
-            failedLookupLocations: failedLookupLocations
-        };
     }
     ts.resolveTypeReferenceDirective = resolveTypeReferenceDirective;
     /**
@@ -22417,15 +23631,15 @@ var ts;
      * be converted to a path relative to found rootDir entry './content/protocols/file2' (*). As a last step compiler will check all remaining
      * entries in 'rootDirs', use them to build absolute path out of (*) and try to resolve module from this location.
      */
-    function tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, loader, failedLookupLocations, supportedExtensions, state) {
+    function tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, loader, failedLookupLocations, state) {
         if (moduleHasNonRelativeName(moduleName)) {
-            return tryLoadModuleUsingBaseUrl(moduleName, loader, failedLookupLocations, supportedExtensions, state);
+            return tryLoadModuleUsingBaseUrl(extensions, moduleName, loader, failedLookupLocations, state);
         }
         else {
-            return tryLoadModuleUsingRootDirs(moduleName, containingDirectory, loader, failedLookupLocations, supportedExtensions, state);
+            return tryLoadModuleUsingRootDirs(extensions, moduleName, containingDirectory, loader, failedLookupLocations, state);
         }
     }
-    function tryLoadModuleUsingRootDirs(moduleName, containingDirectory, loader, failedLookupLocations, supportedExtensions, state) {
+    function tryLoadModuleUsingRootDirs(extensions, moduleName, containingDirectory, loader, failedLookupLocations, state) {
         if (!state.compilerOptions.rootDirs) {
             return undefined;
         }
@@ -22463,7 +23677,7 @@ var ts;
             if (state.traceEnabled) {
                 trace(state.host, ts.Diagnostics.Loading_0_from_the_root_dir_1_candidate_location_2, suffix, matchedNormalizedPrefix, candidate);
             }
-            var resolvedFileName = loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(containingDirectory, state.host), state);
+            var resolvedFileName = loader(extensions, candidate, failedLookupLocations, !directoryProbablyExists(containingDirectory, state.host), state);
             if (resolvedFileName) {
                 return resolvedFileName;
             }
@@ -22482,7 +23696,7 @@ var ts;
                     trace(state.host, ts.Diagnostics.Loading_0_from_the_root_dir_1_candidate_location_2, suffix, rootDir, candidate_1);
                 }
                 var baseDirectory = ts.getDirectoryPath(candidate_1);
-                var resolvedFileName_1 = loader(candidate_1, supportedExtensions, failedLookupLocations, !directoryProbablyExists(baseDirectory, state.host), state);
+                var resolvedFileName_1 = loader(extensions, candidate_1, failedLookupLocations, !directoryProbablyExists(baseDirectory, state.host), state);
                 if (resolvedFileName_1) {
                     return resolvedFileName_1;
                 }
@@ -22493,7 +23707,7 @@ var ts;
         }
         return undefined;
     }
-    function tryLoadModuleUsingBaseUrl(moduleName, loader, failedLookupLocations, supportedExtensions, state) {
+    function tryLoadModuleUsingBaseUrl(extensions, moduleName, loader, failedLookupLocations, state) {
         if (!state.compilerOptions.baseUrl) {
             return undefined;
         }
@@ -22509,70 +23723,82 @@ var ts;
             matchedPattern = ts.matchPatternOrExact(ts.getOwnKeys(state.compilerOptions.paths), moduleName);
         }
         if (matchedPattern) {
-            var matchedStar = typeof matchedPattern === "string" ? undefined : ts.matchedText(matchedPattern, moduleName);
+            var matchedStar_1 = typeof matchedPattern === "string" ? undefined : ts.matchedText(matchedPattern, moduleName);
             var matchedPatternText = typeof matchedPattern === "string" ? matchedPattern : ts.patternText(matchedPattern);
             if (state.traceEnabled) {
                 trace(state.host, ts.Diagnostics.Module_name_0_matched_pattern_1, moduleName, matchedPatternText);
             }
-            for (var _i = 0, _a = state.compilerOptions.paths[matchedPatternText]; _i < _a.length; _i++) {
-                var subst = _a[_i];
-                var path = matchedStar ? subst.replace("*", matchedStar) : subst;
+            return ts.forEach(state.compilerOptions.paths[matchedPatternText], function (subst) {
+                var path = matchedStar_1 ? subst.replace("*", matchedStar_1) : subst;
                 var candidate = ts.normalizePath(ts.combinePaths(state.compilerOptions.baseUrl, path));
                 if (state.traceEnabled) {
                     trace(state.host, ts.Diagnostics.Trying_substitution_0_candidate_module_location_Colon_1, subst, path);
                 }
-                var resolvedFileName = loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
-                if (resolvedFileName) {
-                    return resolvedFileName;
+                // A path mapping may have a ".ts" extension; in contrast to an import, which should omit it.
+                var tsExtension = ts.tryGetExtensionFromPath(candidate);
+                if (tsExtension !== undefined) {
+                    var path_1 = tryFile(candidate, failedLookupLocations, /*onlyRecordFailures*/ false, state);
+                    return path_1 && { path: path_1, extension: tsExtension };
                 }
-            }
-            return undefined;
+                return loader(extensions, candidate, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
+            });
         }
         else {
             var candidate = ts.normalizePath(ts.combinePaths(state.compilerOptions.baseUrl, moduleName));
             if (state.traceEnabled) {
                 trace(state.host, ts.Diagnostics.Resolving_module_name_0_relative_to_base_url_1_2, moduleName, state.compilerOptions.baseUrl, candidate);
             }
-            return loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
+            return loader(extensions, candidate, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
         }
     }
     function nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host) {
         var containingDirectory = ts.getDirectoryPath(containingFile);
-        var supportedExtensions = ts.getSupportedExtensions(compilerOptions);
         var traceEnabled = isTraceEnabled(compilerOptions, host);
         var failedLookupLocations = [];
-        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, skipTsx: false };
-        var resolvedFileName = tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, nodeLoadModuleByRelativeName, failedLookupLocations, supportedExtensions, state);
-        var isExternalLibraryImport = false;
-        if (!resolvedFileName) {
+        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled };
+        var result = tryResolve(0 /* TypeScript */) || tryResolve(1 /* JavaScript */);
+        if (result) {
+            var resolved = result.resolved, isExternalLibraryImport = result.isExternalLibraryImport;
+            return createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations);
+        }
+        return { resolvedModule: undefined, failedLookupLocations: failedLookupLocations };
+        function tryResolve(extensions) {
+            var resolved = tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, nodeLoadModuleByRelativeName, failedLookupLocations, state);
+            if (resolved) {
+                return { resolved: resolved, isExternalLibraryImport: false };
+            }
             if (moduleHasNonRelativeName(moduleName)) {
                 if (traceEnabled) {
                     trace(host, ts.Diagnostics.Loading_module_0_from_node_modules_folder, moduleName);
                 }
-                resolvedFileName = loadModuleFromNodeModules(moduleName, containingDirectory, failedLookupLocations, state, /*checkOneLevel*/ false);
-                isExternalLibraryImport = resolvedFileName !== undefined;
+                var resolved_1 = loadModuleFromNodeModules(extensions, moduleName, containingDirectory, failedLookupLocations, state);
+                // For node_modules lookups, get the real path so that multiple accesses to an `npm link`-ed module do not create duplicate files.
+                return resolved_1 && { resolved: { path: realpath(resolved_1.path, host, traceEnabled), extension: resolved_1.extension }, isExternalLibraryImport: true };
             }
             else {
                 var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
-                resolvedFileName = nodeLoadModuleByRelativeName(candidate, supportedExtensions, failedLookupLocations, /*onlyRecordFailures*/ false, state);
+                var resolved_2 = nodeLoadModuleByRelativeName(extensions, candidate, failedLookupLocations, /*onlyRecordFailures*/ false, state);
+                return resolved_2 && { resolved: resolved_2, isExternalLibraryImport: false };
             }
         }
-        if (resolvedFileName && host.realpath) {
-            var originalFileName = resolvedFileName;
-            resolvedFileName = ts.normalizePath(host.realpath(resolvedFileName));
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Resolving_real_path_for_0_result_1, originalFileName, resolvedFileName);
-            }
-        }
-        return createResolvedModule(resolvedFileName, isExternalLibraryImport, failedLookupLocations);
     }
     ts.nodeModuleNameResolver = nodeModuleNameResolver;
-    function nodeLoadModuleByRelativeName(candidate, supportedExtensions, failedLookupLocations, onlyRecordFailures, state) {
+    function realpath(path, host, traceEnabled) {
+        if (!host.realpath) {
+            return path;
+        }
+        var real = ts.normalizePath(host.realpath(path));
+        if (traceEnabled) {
+            trace(host, ts.Diagnostics.Resolving_real_path_for_0_result_1, path, real);
+        }
+        return real;
+    }
+    function nodeLoadModuleByRelativeName(extensions, candidate, failedLookupLocations, onlyRecordFailures, state) {
         if (state.traceEnabled) {
             trace(state.host, ts.Diagnostics.Loading_module_as_file_Slash_folder_candidate_module_location_0, candidate);
         }
-        var resolvedFileName = !ts.pathEndsWithDirectorySeparator(candidate) && loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, onlyRecordFailures, state);
-        return resolvedFileName || loadNodeModuleFromDirectory(supportedExtensions, candidate, failedLookupLocations, onlyRecordFailures, state);
+        var resolvedFromFile = !ts.pathEndsWithDirectorySeparator(candidate) && loadModuleFromFile(extensions, candidate, failedLookupLocations, onlyRecordFailures, state);
+        return resolvedFromFile || loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, onlyRecordFailures, state);
     }
     /* @internal */
     function directoryProbablyExists(directoryName, host) {
@@ -22584,9 +23810,9 @@ var ts;
      * @param {boolean} onlyRecordFailures - if true then function won't try to actually load files but instead record all attempts as failures. This flag is necessary
      * in cases when we know upfront that all load attempts will fail (because containing folder does not exists) however we still need to record all failed lookup locations.
      */
-    function loadModuleFromFile(candidate, extensions, failedLookupLocation, onlyRecordFailures, state) {
+    function loadModuleFromFile(extensions, candidate, failedLookupLocations, onlyRecordFailures, state) {
         // First, try adding an extension. An import of "foo" could be matched by a file "foo.ts", or "foo.js" by "foo.js.ts"
-        var resolvedByAddingExtension = tryAddingExtensions(candidate, extensions, failedLookupLocation, onlyRecordFailures, state);
+        var resolvedByAddingExtension = tryAddingExtensions(candidate, extensions, failedLookupLocations, onlyRecordFailures, state);
         if (resolvedByAddingExtension) {
             return resolvedByAddingExtension;
         }
@@ -22598,11 +23824,11 @@ var ts;
                 var extension = candidate.substring(extensionless.length);
                 trace(state.host, ts.Diagnostics.File_name_0_has_a_1_extension_stripping_it, candidate, extension);
             }
-            return tryAddingExtensions(extensionless, extensions, failedLookupLocation, onlyRecordFailures, state);
+            return tryAddingExtensions(extensionless, extensions, failedLookupLocations, onlyRecordFailures, state);
         }
     }
     /** Try to return an existing file that adds one of the `extensions` to `candidate`. */
-    function tryAddingExtensions(candidate, extensions, failedLookupLocation, onlyRecordFailures, state) {
+    function tryAddingExtensions(candidate, extensions, failedLookupLocations, onlyRecordFailures, state) {
         if (!onlyRecordFailures) {
             // check if containing folder exists - if it doesn't then just record failures for all supported extensions without disk probing
             var directory = ts.getDirectoryPath(candidate);
@@ -22610,12 +23836,21 @@ var ts;
                 onlyRecordFailures = !directoryProbablyExists(directory, state.host);
             }
         }
-        return ts.forEach(extensions, function (ext) {
-            return !(state.skipTsx && ts.isJsxOrTsxExtension(ext)) && tryFile(candidate + ext, failedLookupLocation, onlyRecordFailures, state);
-        });
+        switch (extensions) {
+            case 2 /* DtsOnly */:
+                return tryExtension(".d.ts", ts.Extension.Dts);
+            case 0 /* TypeScript */:
+                return tryExtension(".ts", ts.Extension.Ts) || tryExtension(".tsx", ts.Extension.Tsx) || tryExtension(".d.ts", ts.Extension.Dts);
+            case 1 /* JavaScript */:
+                return tryExtension(".js", ts.Extension.Js) || tryExtension(".jsx", ts.Extension.Jsx);
+        }
+        function tryExtension(ext, extension) {
+            var path = tryFile(candidate + ext, failedLookupLocations, onlyRecordFailures, state);
+            return path && { path: path, extension: extension };
+        }
     }
     /** Return the file if it exists. */
-    function tryFile(fileName, failedLookupLocation, onlyRecordFailures, state) {
+    function tryFile(fileName, failedLookupLocations, onlyRecordFailures, state) {
         if (!onlyRecordFailures && state.host.fileExists(fileName)) {
             if (state.traceEnabled) {
                 trace(state.host, ts.Diagnostics.File_0_exist_use_it_as_a_name_resolution_result, fileName);
@@ -22626,30 +23861,34 @@ var ts;
             if (state.traceEnabled) {
                 trace(state.host, ts.Diagnostics.File_0_does_not_exist, fileName);
             }
-            failedLookupLocation.push(fileName);
+            failedLookupLocations.push(fileName);
             return undefined;
         }
     }
-    function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocation, onlyRecordFailures, state) {
+    function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, onlyRecordFailures, state) {
         var packageJsonPath = pathToPackageJson(candidate);
         var directoryExists = !onlyRecordFailures && directoryProbablyExists(candidate, state.host);
         if (directoryExists && state.host.fileExists(packageJsonPath)) {
             if (state.traceEnabled) {
                 trace(state.host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath);
             }
-            var typesFile = tryReadTypesSection(packageJsonPath, candidate, state);
+            var typesFile = tryReadTypesSection(extensions, packageJsonPath, candidate, state);
             if (typesFile) {
                 var onlyRecordFailures_1 = !directoryProbablyExists(ts.getDirectoryPath(typesFile), state.host);
                 // A package.json "typings" may specify an exact filename, or may choose to omit an extension.
-                var result = tryFile(typesFile, failedLookupLocation, onlyRecordFailures_1, state) ||
-                    tryAddingExtensions(typesFile, extensions, failedLookupLocation, onlyRecordFailures_1, state);
-                if (result) {
-                    return result;
+                var fromFile = tryFile(typesFile, failedLookupLocations, onlyRecordFailures_1, state);
+                if (fromFile) {
+                    // Note: this would allow a package.json to specify a ".js" file as typings. Maybe that should be forbidden.
+                    return resolvedFromAnyFile(fromFile);
+                }
+                var x = tryAddingExtensions(typesFile, 0 /* TypeScript */, failedLookupLocations, onlyRecordFailures_1, state);
+                if (x) {
+                    return x;
                 }
             }
             else {
                 if (state.traceEnabled) {
-                    trace(state.host, ts.Diagnostics.package_json_does_not_have_types_field);
+                    trace(state.host, ts.Diagnostics.package_json_does_not_have_a_types_or_main_field);
                 }
             }
         }
@@ -22658,101 +23897,106 @@ var ts;
                 trace(state.host, ts.Diagnostics.File_0_does_not_exist, packageJsonPath);
             }
             // record package json as one of failed lookup locations - in the future if this file will appear it will invalidate resolution results
-            failedLookupLocation.push(packageJsonPath);
+            failedLookupLocations.push(packageJsonPath);
         }
-        return loadModuleFromFile(ts.combinePaths(candidate, "index"), extensions, failedLookupLocation, !directoryExists, state);
+        return loadModuleFromFile(extensions, ts.combinePaths(candidate, "index"), failedLookupLocations, !directoryExists, state);
     }
     function pathToPackageJson(directory) {
         return ts.combinePaths(directory, "package.json");
     }
-    function loadModuleFromNodeModulesFolder(moduleName, directory, failedLookupLocations, state) {
+    function loadModuleFromNodeModulesFolder(extensions, moduleName, directory, failedLookupLocations, state) {
         var nodeModulesFolder = ts.combinePaths(directory, "node_modules");
         var nodeModulesFolderExists = directoryProbablyExists(nodeModulesFolder, state.host);
         var candidate = ts.normalizePath(ts.combinePaths(nodeModulesFolder, moduleName));
-        var supportedExtensions = ts.getSupportedExtensions(state.compilerOptions);
-        var result = loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, !nodeModulesFolderExists, state);
-        if (result) {
-            return result;
-        }
-        result = loadNodeModuleFromDirectory(supportedExtensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state);
-        if (result) {
-            return result;
-        }
+        return loadModuleFromFile(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state) ||
+            loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state);
     }
-    /* @internal */
-    function loadModuleFromNodeModules(moduleName, directory, failedLookupLocations, state, checkOneLevel) {
-        return loadModuleFromNodeModulesWorker(moduleName, directory, failedLookupLocations, state, checkOneLevel, /*typesOnly*/ false);
+    function loadModuleFromNodeModules(extensions, moduleName, directory, failedLookupLocations, state) {
+        return loadModuleFromNodeModulesWorker(extensions, moduleName, directory, failedLookupLocations, state, /*typesOnly*/ false);
     }
-    ts.loadModuleFromNodeModules = loadModuleFromNodeModules;
     function loadModuleFromNodeModulesAtTypes(moduleName, directory, failedLookupLocations, state) {
-        return loadModuleFromNodeModulesWorker(moduleName, directory, failedLookupLocations, state, /*checkOneLevel*/ false, /*typesOnly*/ true);
+        // Extensions parameter here doesn't actually matter, because typesOnly ensures we're just doing @types lookup, which is always DtsOnly.
+        return loadModuleFromNodeModulesWorker(2 /* DtsOnly */, moduleName, directory, failedLookupLocations, state, /*typesOnly*/ true);
     }
-    function loadModuleFromNodeModulesWorker(moduleName, directory, failedLookupLocations, state, checkOneLevel, typesOnly) {
-        directory = ts.normalizeSlashes(directory);
-        while (true) {
-            var baseName = ts.getBaseFileName(directory);
-            if (baseName !== "node_modules") {
-                var packageResult = void 0;
-                if (!typesOnly) {
-                    // Try to load source from the package
-                    packageResult = loadModuleFromNodeModulesFolder(moduleName, directory, failedLookupLocations, state);
-                    if (packageResult && ts.hasTypeScriptFileExtension(packageResult)) {
-                        // Always prefer a TypeScript (.ts, .tsx, .d.ts) file shipped with the package
-                        return packageResult;
-                    }
-                }
-                // Else prefer a types package over non-TypeScript results (e.g. JavaScript files)
-                var typesResult = loadModuleFromNodeModulesFolder(ts.combinePaths("@types", moduleName), directory, failedLookupLocations, state);
-                if (typesResult || packageResult) {
-                    return typesResult || packageResult;
-                }
+    function loadModuleFromNodeModulesWorker(extensions, moduleName, directory, failedLookupLocations, state, typesOnly) {
+        return forEachAncestorDirectory(ts.normalizeSlashes(directory), function (ancestorDirectory) {
+            if (ts.getBaseFileName(ancestorDirectory) !== "node_modules") {
+                return loadModuleFromNodeModulesOneLevel(extensions, moduleName, ancestorDirectory, failedLookupLocations, state, typesOnly);
             }
-            var parentPath = ts.getDirectoryPath(directory);
-            if (parentPath === directory || checkOneLevel) {
-                break;
-            }
-            directory = parentPath;
+        });
+    }
+    /** Load a module from a single node_modules directory, but not from any ancestors' node_modules directories. */
+    function loadModuleFromNodeModulesOneLevel(extensions, moduleName, directory, failedLookupLocations, state, typesOnly) {
+        if (typesOnly === void 0) { typesOnly = false; }
+        var packageResult = typesOnly ? undefined : loadModuleFromNodeModulesFolder(extensions, moduleName, directory, failedLookupLocations, state);
+        if (packageResult) {
+            return packageResult;
+        }
+        if (extensions !== 1 /* JavaScript */) {
+            return loadModuleFromNodeModulesFolder(2 /* DtsOnly */, ts.combinePaths("@types", moduleName), directory, failedLookupLocations, state);
         }
-        return undefined;
     }
     function classicNameResolver(moduleName, containingFile, compilerOptions, host) {
         var traceEnabled = isTraceEnabled(compilerOptions, host);
-        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, skipTsx: !compilerOptions.jsx };
+        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled };
         var failedLookupLocations = [];
-        var supportedExtensions = ts.getSupportedExtensions(compilerOptions);
         var containingDirectory = ts.getDirectoryPath(containingFile);
-        var resolvedFileName = tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, loadModuleFromFile, failedLookupLocations, supportedExtensions, state);
-        if (resolvedFileName) {
-            return createResolvedModule(resolvedFileName, /*isExternalLibraryImport*/ false, failedLookupLocations);
+        var resolved = tryResolve(0 /* TypeScript */) || tryResolve(1 /* JavaScript */);
+        return createResolvedModuleWithFailedLookupLocations(resolved, /*isExternalLibraryImport*/ false, failedLookupLocations);
+        function tryResolve(extensions) {
+            var resolvedUsingSettings = tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, loadModuleFromFile, failedLookupLocations, state);
+            if (resolvedUsingSettings) {
+                return resolvedUsingSettings;
+            }
+            if (moduleHasNonRelativeName(moduleName)) {
+                // Climb up parent directories looking for a module.
+                var resolved_3 = forEachAncestorDirectory(containingDirectory, function (directory) {
+                    var searchName = ts.normalizePath(ts.combinePaths(directory, moduleName));
+                    return loadModuleFromFile(extensions, searchName, failedLookupLocations, /*onlyRecordFailures*/ false, state);
+                });
+                if (resolved_3) {
+                    return resolved_3;
+                }
+                if (extensions === 0 /* TypeScript */) {
+                    // If we didn't find the file normally, look it up in @types.
+                    return loadModuleFromNodeModulesAtTypes(moduleName, containingDirectory, failedLookupLocations, state);
+                }
+            }
+            else {
+                var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
+                return loadModuleFromFile(extensions, candidate, failedLookupLocations, /*onlyRecordFailures*/ false, state);
+            }
         }
-        var referencedSourceFile;
-        if (moduleHasNonRelativeName(moduleName)) {
-            referencedSourceFile = referencedSourceFile = loadModuleFromAncestorDirectories(moduleName, containingDirectory, supportedExtensions, failedLookupLocations, state) ||
-                // If we didn't find the file normally, look it up in @types.
-                loadModuleFromNodeModulesAtTypes(moduleName, containingDirectory, failedLookupLocations, state);
-        }
-        else {
-            var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
-            referencedSourceFile = loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, /*onlyRecordFailures*/ false, state);
-        }
-        return referencedSourceFile
-            ? { resolvedModule: { resolvedFileName: referencedSourceFile }, failedLookupLocations: failedLookupLocations }
-            : { resolvedModule: undefined, failedLookupLocations: failedLookupLocations };
     }
     ts.classicNameResolver = classicNameResolver;
-    /** Climb up parent directories looking for a module. */
-    function loadModuleFromAncestorDirectories(moduleName, containingDirectory, supportedExtensions, failedLookupLocations, state) {
+    /**
+     * 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.
+     */
+    /* @internal */
+    function loadModuleFromGlobalCache(moduleName, projectName, compilerOptions, host, globalCache) {
+        var traceEnabled = isTraceEnabled(compilerOptions, host);
+        if (traceEnabled) {
+            trace(host, ts.Diagnostics.Auto_discovery_for_typings_is_enabled_in_project_0_Running_extra_resolution_pass_for_module_1_using_cache_location_2, projectName, moduleName, globalCache);
+        }
+        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled };
+        var failedLookupLocations = [];
+        var resolved = loadModuleFromNodeModulesOneLevel(2 /* DtsOnly */, moduleName, globalCache, failedLookupLocations, state);
+        return createResolvedModuleWithFailedLookupLocations(resolved, /*isExternalLibraryImport*/ true, failedLookupLocations);
+    }
+    ts.loadModuleFromGlobalCache = loadModuleFromGlobalCache;
+    /** Calls `callback` on `directory` and every ancestor directory it has, returning the first defined result. */
+    function forEachAncestorDirectory(directory, callback) {
         while (true) {
-            var searchName = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
-            var referencedSourceFile = loadModuleFromFile(searchName, supportedExtensions, failedLookupLocations, /*onlyRecordFailures*/ false, state);
-            if (referencedSourceFile) {
-                return referencedSourceFile;
+            var result = callback(directory);
+            if (result !== undefined) {
+                return result;
             }
-            var parentPath = ts.getDirectoryPath(containingDirectory);
-            if (parentPath === containingDirectory) {
+            var parentPath = ts.getDirectoryPath(directory);
+            if (parentPath === directory) {
                 return undefined;
             }
-            containingDirectory = parentPath;
+            directory = parentPath;
         }
     }
 })(ts || (ts = {}));
@@ -22854,7 +24098,12 @@ var ts;
             getAmbientModules: getAmbientModules,
             getJsxElementAttributesType: getJsxElementAttributesType,
             getJsxIntrinsicTagNames: getJsxIntrinsicTagNames,
-            isOptionalParameter: isOptionalParameter
+            isOptionalParameter: isOptionalParameter,
+            tryFindAmbientModuleWithoutAugmentations: function (moduleName) {
+                // we deliberately exclude augmentations
+                // since we are only interested in declarations of the module itself
+                return tryFindAmbientModule(moduleName, /*withAugmentations*/ false);
+            }
         };
         var tupleTypes = [];
         var unionTypes = ts.createMap();
@@ -22868,9 +24117,9 @@ var ts;
         var autoType = createIntrinsicType(1 /* Any */, "any");
         var unknownType = createIntrinsicType(1 /* Any */, "unknown");
         var undefinedType = createIntrinsicType(2048 /* Undefined */, "undefined");
-        var undefinedWideningType = strictNullChecks ? undefinedType : createIntrinsicType(2048 /* Undefined */ | 33554432 /* ContainsWideningType */, "undefined");
+        var undefinedWideningType = strictNullChecks ? undefinedType : createIntrinsicType(2048 /* Undefined */ | 2097152 /* ContainsWideningType */, "undefined");
         var nullType = createIntrinsicType(4096 /* Null */, "null");
-        var nullWideningType = strictNullChecks ? nullType : createIntrinsicType(4096 /* Null */ | 33554432 /* ContainsWideningType */, "null");
+        var nullWideningType = strictNullChecks ? nullType : createIntrinsicType(4096 /* Null */ | 2097152 /* ContainsWideningType */, "null");
         var stringType = createIntrinsicType(2 /* String */, "string");
         var numberType = createIntrinsicType(4 /* Number */, "number");
         var trueType = createIntrinsicType(128 /* BooleanLiteral */, "true");
@@ -22880,13 +24129,17 @@ var ts;
         var voidType = createIntrinsicType(1024 /* Void */, "void");
         var neverType = createIntrinsicType(8192 /* Never */, "never");
         var silentNeverType = createIntrinsicType(8192 /* Never */, "never");
+        var stringOrNumberType = getUnionType([stringType, numberType]);
         var emptyObjectType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
+        var emptyTypeLiteralSymbol = createSymbol(2048 /* TypeLiteral */ | 67108864 /* Transient */, "__type");
+        emptyTypeLiteralSymbol.members = ts.createMap();
+        var emptyTypeLiteralType = createAnonymousType(emptyTypeLiteralSymbol, emptySymbols, emptyArray, emptyArray, undefined, undefined);
         var emptyGenericType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
         emptyGenericType.instantiations = ts.createMap();
         var anyFunctionType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
         // The anyFunctionType contains the anyFunctionType by definition. The flag is further propagated
         // in getPropagatingFlagsOfTypes, and it is checked in inferFromTypes.
-        anyFunctionType.flags |= 134217728 /* ContainsAnyFunctionType */;
+        anyFunctionType.flags |= 8388608 /* ContainsAnyFunctionType */;
         var noConstraintType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
         var anySignature = createSignature(undefined, undefined, undefined, emptyArray, anyType, /*typePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false);
         var unknownSignature = createSignature(undefined, undefined, undefined, emptyArray, unknownType, /*typePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false);
@@ -23045,6 +24298,8 @@ var ts;
             "undefined": undefinedType
         });
         var jsxElementType;
+        var _jsxNamespace;
+        var _jsxFactoryEntity;
         /** Things we lazy load from the JSX namespace */
         var jsxTypes = ts.createMap();
         var JsxNames = {
@@ -23074,6 +24329,21 @@ var ts;
         builtinGlobals[undefinedSymbol.name] = undefinedSymbol;
         initializeTypeChecker();
         return checker;
+        function getJsxNamespace() {
+            if (_jsxNamespace === undefined) {
+                _jsxNamespace = "React";
+                if (compilerOptions.jsxFactory) {
+                    _jsxFactoryEntity = ts.parseIsolatedEntityName(compilerOptions.jsxFactory, languageVersion);
+                    if (_jsxFactoryEntity) {
+                        _jsxNamespace = getFirstIdentifier(_jsxFactoryEntity).text;
+                    }
+                }
+                else if (compilerOptions.reactNamespace) {
+                    _jsxNamespace = compilerOptions.reactNamespace;
+                }
+            }
+            return _jsxNamespace;
+        }
         function getEmitResolver(sourceFile, cancellationToken) {
             // Ensure we have all the type information in place for this file so that all the
             // emitter questions of this resolver will return the right information.
@@ -23157,7 +24427,7 @@ var ts;
                 target.flags |= source.flags;
                 if (source.valueDeclaration &&
                     (!target.valueDeclaration ||
-                        (target.valueDeclaration.kind === 226 /* ModuleDeclaration */ && source.valueDeclaration.kind !== 226 /* ModuleDeclaration */))) {
+                        (target.valueDeclaration.kind === 230 /* ModuleDeclaration */ && source.valueDeclaration.kind !== 230 /* ModuleDeclaration */))) {
                     // other kinds of value declarations take precedence over modules
                     target.valueDeclaration = source.valueDeclaration;
                 }
@@ -23219,7 +24489,7 @@ var ts;
                 var moduleNotFoundError = !ts.isInAmbientContext(moduleName.parent.parent)
                     ? ts.Diagnostics.Invalid_module_name_in_augmentation_module_0_cannot_be_found
                     : undefined;
-                var mainModule = resolveExternalModuleNameWorker(moduleName, moduleName, moduleNotFoundError);
+                var mainModule = resolveExternalModuleNameWorker(moduleName, moduleName, moduleNotFoundError, /*isForAugmentation*/ true);
                 if (!mainModule) {
                     return;
                 }
@@ -23260,8 +24530,11 @@ var ts;
             var nodeId = getNodeId(node);
             return nodeLinks[nodeId] || (nodeLinks[nodeId] = { flags: 0 });
         }
+        function getObjectFlags(type) {
+            return type.flags & 32768 /* Object */ ? type.objectFlags : 0;
+        }
         function isGlobalSourceFile(node) {
-            return node.kind === 256 /* SourceFile */ && !ts.isExternalOrCommonJsModule(node);
+            return node.kind === 261 /* SourceFile */ && !ts.isExternalOrCommonJsModule(node);
         }
         function getSymbol(symbols, name, meaning) {
             if (meaning) {
@@ -23307,24 +24580,30 @@ var ts;
                     // nodes are in different files and order cannot be determines
                     return true;
                 }
+                // declaration is after usage
+                // can be legal if usage is deferred (i.e. inside function or in initializer of instance property)
+                if (isUsedInFunctionOrNonStaticProperty(usage)) {
+                    return true;
+                }
                 var sourceFiles = host.getSourceFiles();
                 return ts.indexOf(sourceFiles, declarationFile) <= ts.indexOf(sourceFiles, useFile);
             }
             if (declaration.pos <= usage.pos) {
                 // declaration is before usage
                 // still might be illegal if usage is in the initializer of the variable declaration
-                return declaration.kind !== 219 /* VariableDeclaration */ ||
+                return declaration.kind !== 223 /* VariableDeclaration */ ||
                     !isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage);
             }
             // declaration is after usage
             // can be legal if usage is deferred (i.e. inside function or in initializer of instance property)
-            return isUsedInFunctionOrNonStaticProperty(declaration, usage);
+            var container = ts.getEnclosingBlockScopeContainer(declaration);
+            return isUsedInFunctionOrNonStaticProperty(usage, container);
             function isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage) {
                 var container = ts.getEnclosingBlockScopeContainer(declaration);
                 switch (declaration.parent.parent.kind) {
-                    case 201 /* VariableStatement */:
-                    case 207 /* ForStatement */:
-                    case 209 /* ForOfStatement */:
+                    case 205 /* VariableStatement */:
+                    case 211 /* ForStatement */:
+                    case 213 /* 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)) {
@@ -23333,8 +24612,8 @@ var ts;
                         break;
                 }
                 switch (declaration.parent.parent.kind) {
-                    case 208 /* ForInStatement */:
-                    case 209 /* ForOfStatement */:
+                    case 212 /* ForInStatement */:
+                    case 213 /* ForOfStatement */:
                         // ForIn/ForOf case - use site should not be used in expression part
                         if (isSameScopeDescendentOf(usage, declaration.parent.parent.expression, container)) {
                             return true;
@@ -23342,8 +24621,7 @@ var ts;
                 }
                 return false;
             }
-            function isUsedInFunctionOrNonStaticProperty(declaration, usage) {
-                var container = ts.getEnclosingBlockScopeContainer(declaration);
+            function isUsedInFunctionOrNonStaticProperty(usage, container) {
                 var current = usage;
                 while (current) {
                     if (current === container) {
@@ -23353,7 +24631,7 @@ var ts;
                         return true;
                     }
                     var initializerOfNonStaticProperty = current.parent &&
-                        current.parent.kind === 146 /* PropertyDeclaration */ &&
+                        current.parent.kind === 147 /* PropertyDeclaration */ &&
                         (ts.getModifierFlags(current.parent) & 32 /* Static */) === 0 &&
                         current.parent.initializer === current;
                     if (initializerOfNonStaticProperty) {
@@ -23386,11 +24664,11 @@ 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 & 793064 /* Type */ && lastLocation.kind !== 273 /* JSDocComment */) {
+                            if (meaning & result.flags & 793064 /* Type */ && lastLocation.kind !== 278 /* JSDocComment */) {
                                 useResult = result.flags & 262144 /* TypeParameter */
                                     ? lastLocation === location.type ||
-                                        lastLocation.kind === 143 /* Parameter */ ||
-                                        lastLocation.kind === 142 /* TypeParameter */
+                                        lastLocation.kind === 144 /* Parameter */ ||
+                                        lastLocation.kind === 143 /* TypeParameter */
                                     : false;
                             }
                             if (meaning & 107455 /* Value */ && result.flags & 1 /* FunctionScopedVariable */) {
@@ -23399,9 +24677,9 @@ 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 === 143 /* Parameter */ ||
+                                    lastLocation.kind === 144 /* Parameter */ ||
                                         (lastLocation === location.type &&
-                                            result.valueDeclaration.kind === 143 /* Parameter */);
+                                            result.valueDeclaration.kind === 144 /* Parameter */);
                             }
                         }
                         if (useResult) {
@@ -23413,13 +24691,13 @@ var ts;
                     }
                 }
                 switch (location.kind) {
-                    case 256 /* SourceFile */:
+                    case 261 /* SourceFile */:
                         if (!ts.isExternalOrCommonJsModule(location))
                             break;
                         isInExternalModule = true;
-                    case 226 /* ModuleDeclaration */:
+                    case 230 /* ModuleDeclaration */:
                         var moduleExports = getSymbolOfNode(location).exports;
-                        if (location.kind === 256 /* SourceFile */ || ts.isAmbientModule(location)) {
+                        if (location.kind === 261 /* 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["default"]) {
@@ -23442,7 +24720,7 @@ var ts;
                             //        which is not the desired behavior.
                             if (moduleExports[name] &&
                                 moduleExports[name].flags === 8388608 /* Alias */ &&
-                                ts.getDeclarationOfKind(moduleExports[name], 239 /* ExportSpecifier */)) {
+                                ts.getDeclarationOfKind(moduleExports[name], 243 /* ExportSpecifier */)) {
                                 break;
                             }
                         }
@@ -23450,13 +24728,13 @@ var ts;
                             break loop;
                         }
                         break;
-                    case 225 /* EnumDeclaration */:
+                    case 229 /* EnumDeclaration */:
                         if (result = getSymbol(getSymbolOfNode(location).exports, name, meaning & 8 /* EnumMember */)) {
                             break loop;
                         }
                         break;
-                    case 146 /* PropertyDeclaration */:
-                    case 145 /* PropertySignature */:
+                    case 147 /* PropertyDeclaration */:
+                    case 146 /* PropertySignature */:
                         // 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
@@ -23473,9 +24751,9 @@ var ts;
                             }
                         }
                         break;
-                    case 222 /* ClassDeclaration */:
-                    case 193 /* ClassExpression */:
-                    case 223 /* InterfaceDeclaration */:
+                    case 226 /* ClassDeclaration */:
+                    case 197 /* ClassExpression */:
+                    case 227 /* InterfaceDeclaration */:
                         if (result = getSymbol(getSymbolOfNode(location).members, name, meaning & 793064 /* Type */)) {
                             if (lastLocation && ts.getModifierFlags(lastLocation) & 32 /* Static */) {
                                 // TypeScript 1.0 spec (April 2014): 3.4.1
@@ -23486,7 +24764,7 @@ var ts;
                             }
                             break loop;
                         }
-                        if (location.kind === 193 /* ClassExpression */ && meaning & 32 /* Class */) {
+                        if (location.kind === 197 /* ClassExpression */ && meaning & 32 /* Class */) {
                             var className = location.name;
                             if (className && name === className.text) {
                                 result = location.symbol;
@@ -23502,9 +24780,9 @@ var ts;
                     //       [foo<T>()]() { } // <-- Reference to T from class's own computed property
                     //   }
                     //
-                    case 141 /* ComputedPropertyName */:
+                    case 142 /* ComputedPropertyName */:
                         grandparent = location.parent.parent;
-                        if (ts.isClassLike(grandparent) || grandparent.kind === 223 /* InterfaceDeclaration */) {
+                        if (ts.isClassLike(grandparent) || grandparent.kind === 227 /* InterfaceDeclaration */) {
                             // A reference to this grandparent's type parameters would be an error
                             if (result = getSymbol(getSymbolOfNode(grandparent).members, name, meaning & 793064 /* Type */)) {
                                 error(errorLocation, ts.Diagnostics.A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type);
@@ -23512,19 +24790,19 @@ var ts;
                             }
                         }
                         break;
-                    case 148 /* MethodDeclaration */:
-                    case 147 /* MethodSignature */:
-                    case 149 /* Constructor */:
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
-                    case 221 /* FunctionDeclaration */:
-                    case 181 /* ArrowFunction */:
+                    case 149 /* MethodDeclaration */:
+                    case 148 /* MethodSignature */:
+                    case 150 /* Constructor */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* SetAccessor */:
+                    case 225 /* FunctionDeclaration */:
+                    case 185 /* ArrowFunction */:
                         if (meaning & 3 /* Variable */ && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
                         }
                         break;
-                    case 180 /* FunctionExpression */:
+                    case 184 /* FunctionExpression */:
                         if (meaning & 3 /* Variable */ && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
@@ -23537,7 +24815,7 @@ var ts;
                             }
                         }
                         break;
-                    case 144 /* Decorator */:
+                    case 145 /* Decorator */:
                         // Decorators are resolved at the class declaration. Resolving at the parameter
                         // or member would result in looking up locals in the method.
                         //
@@ -23546,7 +24824,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 === 143 /* Parameter */) {
+                        if (location.parent && location.parent.kind === 144 /* Parameter */) {
                             location = location.parent;
                         }
                         //
@@ -23609,7 +24887,7 @@ var ts;
                 // If we're in an external module, we can't reference value symbols created from UMD export declarations
                 if (result && isInExternalModule && (meaning & 107455 /* Value */) === 107455 /* Value */) {
                     var decls = result.declarations;
-                    if (decls && decls.length === 1 && decls[0].kind === 229 /* NamespaceExportDeclaration */) {
+                    if (decls && decls.length === 1 && decls[0].kind === 233 /* NamespaceExportDeclaration */) {
                         error(errorLocation, ts.Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead, name);
                     }
                 }
@@ -23663,9 +24941,9 @@ var ts;
         function getEntityNameForExtendingInterface(node) {
             switch (node.kind) {
                 case 70 /* Identifier */:
-                case 173 /* PropertyAccessExpression */:
+                case 177 /* PropertyAccessExpression */:
                     return node.parent ? getEntityNameForExtendingInterface(node.parent) : undefined;
-                case 195 /* ExpressionWithTypeArguments */:
+                case 199 /* ExpressionWithTypeArguments */:
                     ts.Debug.assert(ts.isEntityNameExpression(node.expression));
                     return node.expression;
                 default:
@@ -23687,7 +24965,7 @@ var ts;
             // Block-scoped variables cannot be used before their definition
             var declaration = ts.forEach(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) ? d : undefined; });
             ts.Debug.assert(declaration !== undefined, "Block-scoped variable declaration is undefined");
-            if (!ts.isInAmbientContext(declaration) && !isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 219 /* VariableDeclaration */), errorLocation)) {
+            if (!ts.isInAmbientContext(declaration) && !isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 223 /* VariableDeclaration */), errorLocation)) {
                 error(errorLocation, ts.Diagnostics.Block_scoped_variable_0_used_before_its_declaration, ts.declarationNameToString(declaration.name));
             }
         }
@@ -23708,10 +24986,10 @@ var ts;
         }
         function getAnyImportSyntax(node) {
             if (ts.isAliasSymbolDeclaration(node)) {
-                if (node.kind === 230 /* ImportEqualsDeclaration */) {
+                if (node.kind === 234 /* ImportEqualsDeclaration */) {
                     return node;
                 }
-                while (node && node.kind !== 231 /* ImportDeclaration */) {
+                while (node && node.kind !== 235 /* ImportDeclaration */) {
                     node = node.parent;
                 }
                 return node;
@@ -23721,7 +24999,7 @@ var ts;
             return ts.forEach(symbol.declarations, function (d) { return ts.isAliasSymbolDeclaration(d) ? d : undefined; });
         }
         function getTargetOfImportEqualsDeclaration(node) {
-            if (node.moduleReference.kind === 241 /* ExternalModuleReference */) {
+            if (node.moduleReference.kind === 245 /* ExternalModuleReference */) {
                 return resolveExternalModuleSymbol(resolveExternalModuleName(node, ts.getExternalModuleImportEqualsDeclarationExpression(node)));
             }
             return getSymbolOfPartOfRightHandSideOfImportEquals(node.moduleReference);
@@ -23800,31 +25078,31 @@ var ts;
             var moduleSymbol = resolveExternalModuleName(node, node.moduleSpecifier);
             var targetSymbol = resolveESModuleSymbol(moduleSymbol, node.moduleSpecifier);
             if (targetSymbol) {
-                var name_13 = specifier.propertyName || specifier.name;
-                if (name_13.text) {
+                var name_17 = specifier.propertyName || specifier.name;
+                if (name_17.text) {
                     if (ts.isShorthandAmbientModuleSymbol(moduleSymbol)) {
                         return moduleSymbol;
                     }
                     var symbolFromVariable = void 0;
                     // First check if module was specified with "export=". If so, get the member from the resolved type
                     if (moduleSymbol && moduleSymbol.exports && moduleSymbol.exports["export="]) {
-                        symbolFromVariable = getPropertyOfType(getTypeOfSymbol(targetSymbol), name_13.text);
+                        symbolFromVariable = getPropertyOfType(getTypeOfSymbol(targetSymbol), name_17.text);
                     }
                     else {
-                        symbolFromVariable = getPropertyOfVariable(targetSymbol, name_13.text);
+                        symbolFromVariable = getPropertyOfVariable(targetSymbol, name_17.text);
                     }
                     // if symbolFromVariable is export - get its final target
                     symbolFromVariable = resolveSymbol(symbolFromVariable);
-                    var symbolFromModule = getExportOfModule(targetSymbol, name_13.text);
+                    var symbolFromModule = getExportOfModule(targetSymbol, name_17.text);
                     // If the export member we're looking for is default, and there is no real default but allowSyntheticDefaultImports is on, return the entire module as the default
-                    if (!symbolFromModule && allowSyntheticDefaultImports && name_13.text === "default") {
+                    if (!symbolFromModule && allowSyntheticDefaultImports && name_17.text === "default") {
                         symbolFromModule = resolveExternalModuleSymbol(moduleSymbol) || resolveSymbol(moduleSymbol);
                     }
                     var symbol = symbolFromModule && symbolFromVariable ?
                         combineValueAndTypeSymbols(symbolFromVariable, symbolFromModule) :
                         symbolFromModule || symbolFromVariable;
                     if (!symbol) {
-                        error(name_13, ts.Diagnostics.Module_0_has_no_exported_member_1, getFullyQualifiedName(moduleSymbol), ts.declarationNameToString(name_13));
+                        error(name_17, ts.Diagnostics.Module_0_has_no_exported_member_1, getFullyQualifiedName(moduleSymbol), ts.declarationNameToString(name_17));
                     }
                     return symbol;
                 }
@@ -23846,19 +25124,19 @@ var ts;
         }
         function getTargetOfAliasDeclaration(node) {
             switch (node.kind) {
-                case 230 /* ImportEqualsDeclaration */:
+                case 234 /* ImportEqualsDeclaration */:
                     return getTargetOfImportEqualsDeclaration(node);
-                case 232 /* ImportClause */:
+                case 236 /* ImportClause */:
                     return getTargetOfImportClause(node);
-                case 233 /* NamespaceImport */:
+                case 237 /* NamespaceImport */:
                     return getTargetOfNamespaceImport(node);
-                case 235 /* ImportSpecifier */:
+                case 239 /* ImportSpecifier */:
                     return getTargetOfImportSpecifier(node);
-                case 239 /* ExportSpecifier */:
+                case 243 /* ExportSpecifier */:
                     return getTargetOfExportSpecifier(node);
-                case 236 /* ExportAssignment */:
+                case 240 /* ExportAssignment */:
                     return getTargetOfExportAssignment(node);
-                case 229 /* NamespaceExportDeclaration */:
+                case 233 /* NamespaceExportDeclaration */:
                     return getTargetOfNamespaceExportDeclaration(node);
             }
         }
@@ -23905,11 +25183,11 @@ var ts;
                 links.referenced = true;
                 var node = getDeclarationOfAliasSymbol(symbol);
                 ts.Debug.assert(!!node);
-                if (node.kind === 236 /* ExportAssignment */) {
+                if (node.kind === 240 /* ExportAssignment */) {
                     // export default <symbol>
                     checkExpressionCached(node.expression);
                 }
-                else if (node.kind === 239 /* ExportSpecifier */) {
+                else if (node.kind === 243 /* ExportSpecifier */) {
                     // export { <symbol> } or export { <symbol> as foo }
                     checkExpressionCached(node.propertyName || node.name);
                 }
@@ -23931,13 +25209,13 @@ var ts;
                 entityName = entityName.parent;
             }
             // Check for case 1 and 3 in the above example
-            if (entityName.kind === 70 /* Identifier */ || entityName.parent.kind === 140 /* QualifiedName */) {
+            if (entityName.kind === 70 /* Identifier */ || entityName.parent.kind === 141 /* 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 === 230 /* ImportEqualsDeclaration */);
+                ts.Debug.assert(entityName.parent.kind === 234 /* ImportEqualsDeclaration */);
                 return resolveEntityName(entityName, 107455 /* Value */ | 793064 /* Type */ | 1920 /* Namespace */, /*ignoreErrors*/ false, dontResolveAlias);
             }
         }
@@ -23957,9 +25235,9 @@ var ts;
                     return undefined;
                 }
             }
-            else if (name.kind === 140 /* QualifiedName */ || name.kind === 173 /* PropertyAccessExpression */) {
-                var left = name.kind === 140 /* QualifiedName */ ? name.left : name.expression;
-                var right = name.kind === 140 /* QualifiedName */ ? name.right : name.name;
+            else if (name.kind === 141 /* QualifiedName */ || name.kind === 177 /* PropertyAccessExpression */) {
+                var left = name.kind === 141 /* QualifiedName */ ? name.left : name.expression;
+                var right = name.kind === 141 /* QualifiedName */ ? name.right : name.name;
                 var namespace = resolveEntityName(left, 1920 /* Namespace */, ignoreErrors, /*dontResolveAlias*/ false, location);
                 if (!namespace || ts.nodeIsMissing(right)) {
                     return undefined;
@@ -23984,30 +25262,30 @@ var ts;
         function resolveExternalModuleName(location, moduleReferenceExpression) {
             return resolveExternalModuleNameWorker(location, moduleReferenceExpression, ts.Diagnostics.Cannot_find_module_0);
         }
-        function resolveExternalModuleNameWorker(location, moduleReferenceExpression, moduleNotFoundError) {
+        function resolveExternalModuleNameWorker(location, moduleReferenceExpression, moduleNotFoundError, isForAugmentation) {
+            if (isForAugmentation === void 0) { isForAugmentation = false; }
             if (moduleReferenceExpression.kind !== 9 /* StringLiteral */) {
                 return;
             }
             var moduleReferenceLiteral = moduleReferenceExpression;
-            return resolveExternalModule(location, moduleReferenceLiteral.text, moduleNotFoundError, moduleReferenceLiteral);
+            return resolveExternalModule(location, moduleReferenceLiteral.text, moduleNotFoundError, moduleReferenceLiteral, isForAugmentation);
         }
-        function resolveExternalModule(location, moduleReference, moduleNotFoundError, errorNode) {
+        function resolveExternalModule(location, moduleReference, moduleNotFoundError, errorNode, isForAugmentation) {
+            if (isForAugmentation === void 0) { isForAugmentation = false; }
             // Module names are escaped in our symbol table.  However, string literal values aren't.
             // Escape the name in the "require(...)" clause to ensure we find the right symbol.
             var moduleName = ts.escapeIdentifier(moduleReference);
             if (moduleName === undefined) {
                 return;
             }
-            var isRelative = ts.isExternalModuleNameRelative(moduleName);
-            if (!isRelative) {
-                var symbol = getSymbol(globals, '"' + moduleName + '"', 512 /* ValueModule */);
-                if (symbol) {
-                    // merged symbol is module declaration symbol combined with all augmentations
-                    return getMergedSymbol(symbol);
-                }
+            var ambientModule = tryFindAmbientModule(moduleName, /*withAugmentations*/ true);
+            if (ambientModule) {
+                return ambientModule;
             }
+            var isRelative = ts.isExternalModuleNameRelative(moduleName);
             var resolvedModule = ts.getResolvedModule(ts.getSourceFileOfNode(location), moduleReference);
-            var sourceFile = resolvedModule && host.getSourceFile(resolvedModule.resolvedFileName);
+            var resolutionDiagnostic = resolvedModule && ts.getResolutionDiagnostic(compilerOptions, resolvedModule);
+            var sourceFile = resolvedModule && !resolutionDiagnostic && host.getSourceFile(resolvedModule.resolvedFileName);
             if (sourceFile) {
                 if (sourceFile.symbol) {
                     // merged symbol is module declaration symbol combined with all augmentations
@@ -24025,15 +25303,33 @@ var ts;
                     return getMergedSymbol(pattern.symbol);
                 }
             }
+            // May be an untyped module. If so, ignore resolutionDiagnostic.
+            if (!isRelative && resolvedModule && !ts.extensionIsTypeScript(resolvedModule.extension)) {
+                if (isForAugmentation) {
+                    ts.Debug.assert(!!moduleNotFoundError);
+                    var diag = ts.Diagnostics.Invalid_module_name_in_augmentation_Module_0_resolves_to_an_untyped_module_at_1_which_cannot_be_augmented;
+                    error(errorNode, diag, moduleName, resolvedModule.resolvedFileName);
+                }
+                else if (compilerOptions.noImplicitAny && moduleNotFoundError) {
+                    error(errorNode, ts.Diagnostics.Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type, moduleReference, resolvedModule.resolvedFileName);
+                }
+                // Failed imports and untyped modules are both treated in an untyped manner; only difference is whether we give a diagnostic first.
+                return undefined;
+            }
             if (moduleNotFoundError) {
                 // report errors only if it was requested
-                var tsExtension = ts.tryExtractTypeScriptExtension(moduleName);
-                if (tsExtension) {
-                    var diag = ts.Diagnostics.An_import_path_cannot_end_with_a_0_extension_Consider_importing_1_instead;
-                    error(errorNode, diag, tsExtension, ts.removeExtension(moduleName, tsExtension));
+                if (resolutionDiagnostic) {
+                    error(errorNode, resolutionDiagnostic, moduleName, resolvedModule.resolvedFileName);
                 }
                 else {
-                    error(errorNode, moduleNotFoundError, moduleName);
+                    var tsExtension = ts.tryExtractTypeScriptExtension(moduleName);
+                    if (tsExtension) {
+                        var diag = ts.Diagnostics.An_import_path_cannot_end_with_a_0_extension_Consider_importing_1_instead;
+                        error(errorNode, diag, tsExtension, ts.removeExtension(moduleName, tsExtension));
+                    }
+                    else {
+                        error(errorNode, moduleNotFoundError, moduleName);
+                    }
                 }
             }
             return undefined;
@@ -24166,7 +25462,7 @@ var ts;
             var members = node.members;
             for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
                 var member = members_1[_i];
-                if (member.kind === 149 /* Constructor */ && ts.nodeIsPresent(member.body)) {
+                if (member.kind === 150 /* Constructor */ && ts.nodeIsPresent(member.body)) {
                     return member;
                 }
             }
@@ -24188,8 +25484,9 @@ var ts;
             type.intrinsicName = "boolean";
             return type;
         }
-        function createObjectType(kind, symbol) {
-            var type = createType(kind);
+        function createObjectType(objectFlags, symbol) {
+            var type = createType(32768 /* Object */);
+            type.objectFlags = objectFlags;
             type.symbol = symbol;
             return type;
         }
@@ -24217,7 +25514,7 @@ var ts;
             }
             return result || emptyArray;
         }
-        function setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
+        function setStructuredTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
             type.members = members;
             type.properties = getNamedMembers(members);
             type.callSignatures = callSignatures;
@@ -24229,7 +25526,7 @@ var ts;
             return type;
         }
         function createAnonymousType(symbol, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
-            return setObjectTypeMembers(createObjectType(2097152 /* Anonymous */, symbol), members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+            return setStructuredTypeMembers(createObjectType(16 /* Anonymous */, symbol), members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function forEachSymbolTableInScope(enclosingDeclaration, callback) {
             var result;
@@ -24241,11 +25538,11 @@ var ts;
                     }
                 }
                 switch (location_1.kind) {
-                    case 256 /* SourceFile */:
+                    case 261 /* SourceFile */:
                         if (!ts.isExternalOrCommonJsModule(location_1)) {
                             break;
                         }
-                    case 226 /* ModuleDeclaration */:
+                    case 230 /* ModuleDeclaration */:
                         if (result = callback(getSymbolOfNode(location_1).exports)) {
                             return result;
                         }
@@ -24286,7 +25583,7 @@ var ts;
                 return ts.forEachProperty(symbols, function (symbolFromSymbolTable) {
                     if (symbolFromSymbolTable.flags & 8388608 /* Alias */
                         && symbolFromSymbolTable.name !== "export="
-                        && !ts.getDeclarationOfKind(symbolFromSymbolTable, 239 /* ExportSpecifier */)) {
+                        && !ts.getDeclarationOfKind(symbolFromSymbolTable, 243 /* ExportSpecifier */)) {
                         if (!useOnlyExternalAliasing ||
                             // Is this external alias, then use it to name
                             ts.forEach(symbolFromSymbolTable.declarations, ts.isExternalModuleImportEqualsDeclaration)) {
@@ -24325,7 +25622,7 @@ var ts;
                     return true;
                 }
                 // Qualify if the symbol from symbol table has same meaning as expected
-                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 8388608 /* Alias */ && !ts.getDeclarationOfKind(symbolFromSymbolTable, 239 /* ExportSpecifier */)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
+                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 8388608 /* Alias */ && !ts.getDeclarationOfKind(symbolFromSymbolTable, 243 /* ExportSpecifier */)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
                 if (symbolFromSymbolTable.flags & meaning) {
                     qualify = true;
                     return true;
@@ -24340,10 +25637,10 @@ var ts;
                 for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
                     switch (declaration.kind) {
-                        case 146 /* PropertyDeclaration */:
-                        case 148 /* MethodDeclaration */:
-                        case 150 /* GetAccessor */:
-                        case 151 /* SetAccessor */:
+                        case 147 /* PropertyDeclaration */:
+                        case 149 /* MethodDeclaration */:
+                        case 151 /* GetAccessor */:
+                        case 152 /* SetAccessor */:
                             continue;
                         default:
                             return false;
@@ -24424,7 +25721,7 @@ var ts;
             }
         }
         function hasExternalModuleSymbol(declaration) {
-            return ts.isAmbientModule(declaration) || (declaration.kind === 256 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
+            return ts.isAmbientModule(declaration) || (declaration.kind === 261 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
         }
         function hasVisibleDeclarations(symbol, shouldComputeAliasToMakeVisible) {
             var aliasesToMakeVisible;
@@ -24465,12 +25762,12 @@ var ts;
         function isEntityNameVisible(entityName, enclosingDeclaration) {
             // get symbol of the first identifier of the entityName
             var meaning;
-            if (entityName.parent.kind === 159 /* TypeQuery */ || ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
+            if (entityName.parent.kind === 160 /* TypeQuery */ || ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
                 // Typeof value
                 meaning = 107455 /* Value */ | 1048576 /* ExportValue */;
             }
-            else if (entityName.kind === 140 /* QualifiedName */ || entityName.kind === 173 /* PropertyAccessExpression */ ||
-                entityName.parent.kind === 230 /* ImportEqualsDeclaration */) {
+            else if (entityName.kind === 141 /* QualifiedName */ || entityName.kind === 177 /* PropertyAccessExpression */ ||
+                entityName.parent.kind === 234 /* ImportEqualsDeclaration */) {
                 // Left identifier from type reference or TypeAlias
                 // Entity name of the import declaration
                 meaning = 1920 /* Namespace */;
@@ -24566,10 +25863,10 @@ var ts;
         function getTypeAliasForTypeLiteral(type) {
             if (type.symbol && type.symbol.flags & 2048 /* TypeLiteral */) {
                 var node = type.symbol.declarations[0].parent;
-                while (node.kind === 165 /* ParenthesizedType */) {
+                while (node.kind === 166 /* ParenthesizedType */) {
                     node = node.parent;
                 }
-                if (node.kind === 224 /* TypeAliasDeclaration */) {
+                if (node.kind === 228 /* TypeAliasDeclaration */) {
                     return getSymbolOfNode(node);
                 }
             }
@@ -24577,7 +25874,7 @@ var ts;
         }
         function isTopLevelInExternalModuleAugmentation(node) {
             return node && node.parent &&
-                node.parent.kind === 227 /* ModuleBlock */ &&
+                node.parent.kind === 231 /* ModuleBlock */ &&
                 ts.isExternalModuleAugmentation(node.parent.parent);
         }
         function literalTypeToString(type) {
@@ -24591,10 +25888,10 @@ var ts;
                         return ts.declarationNameToString(declaration.name);
                     }
                     switch (declaration.kind) {
-                        case 193 /* ClassExpression */:
+                        case 197 /* ClassExpression */:
                             return "(Anonymous class)";
-                        case 180 /* FunctionExpression */:
-                        case 181 /* ArrowFunction */:
+                        case 184 /* FunctionExpression */:
+                        case 185 /* ArrowFunction */:
                             return "(Anonymous function)";
                     }
                 }
@@ -24669,9 +25966,9 @@ var ts;
                     if (!accessibleSymbolChain ||
                         needsQualification(accessibleSymbolChain[0], enclosingDeclaration, accessibleSymbolChain.length === 1 ? meaning : getQualifiedLeftMeaning(meaning))) {
                         // Go up and add our parent.
-                        var parent_8 = getParentOfSymbol(accessibleSymbolChain ? accessibleSymbolChain[0] : symbol);
-                        if (parent_8) {
-                            walkSymbol(parent_8, getQualifiedLeftMeaning(meaning), /*endOfChain*/ false);
+                        var parent_6 = getParentOfSymbol(accessibleSymbolChain ? accessibleSymbolChain[0] : symbol);
+                        if (parent_6) {
+                            walkSymbol(parent_6, getQualifiedLeftMeaning(meaning), /*endOfChain*/ false);
                         }
                     }
                     if (accessibleSymbolChain) {
@@ -24721,7 +26018,7 @@ var ts;
                         }
                         writer.writeKeyword("this");
                     }
-                    else if (type.flags & 131072 /* Reference */) {
+                    else if (getObjectFlags(type) & 4 /* Reference */) {
                         writeTypeReference(type, nextFlags);
                     }
                     else if (type.flags & 256 /* EnumLiteral */) {
@@ -24729,30 +26026,35 @@ var ts;
                         writePunctuation(writer, 22 /* DotToken */);
                         appendSymbolNameOnly(type.symbol, writer);
                     }
-                    else if (type.flags & (32768 /* Class */ | 65536 /* Interface */ | 16 /* Enum */ | 16384 /* TypeParameter */)) {
+                    else if (getObjectFlags(type) & 3 /* ClassOrInterface */ || type.flags & (16 /* Enum */ | 16384 /* TypeParameter */)) {
                         // The specified symbol flags need to be reinterpreted as type flags
                         buildSymbolDisplay(type.symbol, writer, enclosingDeclaration, 793064 /* Type */, 0 /* None */, nextFlags);
                     }
-                    else if (!(flags & 512 /* InTypeAlias */) && ((type.flags & 2097152 /* Anonymous */ && !type.target) || type.flags & 1572864 /* UnionOrIntersection */) && type.aliasSymbol &&
+                    else if (!(flags & 512 /* InTypeAlias */) && type.aliasSymbol &&
                         isSymbolAccessible(type.aliasSymbol, enclosingDeclaration, 793064 /* Type */, /*shouldComputeAliasesToMakeVisible*/ false).accessibility === 0 /* Accessible */) {
-                        // We emit inferred type as type-alias at the current localtion if all the following is true
-                        //      the input type is has alias symbol that is accessible
-                        //      the input type is a union, intersection or anonymous type that is fully instantiated (if not we want to keep dive into)
-                        //          e.g.: export type Bar<X, Y> = () => [X, Y];
-                        //                export type Foo<Y> = Bar<any, Y>;
-                        //                export const y = (x: Foo<string>) => 1  // we want to emit as ...x: () => [any, string])
                         var typeArguments = type.aliasTypeArguments;
                         writeSymbolTypeReference(type.aliasSymbol, typeArguments, 0, typeArguments ? typeArguments.length : 0, nextFlags);
                     }
-                    else if (type.flags & 1572864 /* UnionOrIntersection */) {
+                    else if (type.flags & 196608 /* UnionOrIntersection */) {
                         writeUnionOrIntersectionType(type, nextFlags);
                     }
-                    else if (type.flags & 2097152 /* Anonymous */) {
+                    else if (getObjectFlags(type) & (16 /* Anonymous */ | 32 /* Mapped */)) {
                         writeAnonymousType(type, nextFlags);
                     }
                     else if (type.flags & 96 /* StringOrNumberLiteral */) {
                         writer.writeStringLiteral(literalTypeToString(type));
                     }
+                    else if (type.flags & 262144 /* Index */) {
+                        writer.writeKeyword("keyof");
+                        writeSpace(writer);
+                        writeType(type.type, 64 /* InElementType */);
+                    }
+                    else if (type.flags & 524288 /* IndexedAccess */) {
+                        writeType(type.objectType, 64 /* InElementType */);
+                        writePunctuation(writer, 20 /* OpenBracketToken */);
+                        writeType(type.indexType, 0 /* None */);
+                        writePunctuation(writer, 21 /* CloseBracketToken */);
+                    }
                     else {
                         // Should never get here
                         // { ... }
@@ -24800,7 +26102,7 @@ var ts;
                         writePunctuation(writer, 20 /* OpenBracketToken */);
                         writePunctuation(writer, 21 /* CloseBracketToken */);
                     }
-                    else if (type.target.flags & 262144 /* Tuple */) {
+                    else if (type.target.objectFlags & 8 /* Tuple */) {
                         writePunctuation(writer, 20 /* OpenBracketToken */);
                         writeTypeList(type.typeArguments.slice(0, getTypeReferenceArity(type)), 25 /* CommaToken */);
                         writePunctuation(writer, 21 /* CloseBracketToken */);
@@ -24816,14 +26118,14 @@ var ts;
                             while (i < length_1) {
                                 // Find group of type arguments for type parameters with the same declaring container.
                                 var start = i;
-                                var parent_9 = getParentSymbolOfTypeParameter(outerTypeParameters[i]);
+                                var parent_7 = getParentSymbolOfTypeParameter(outerTypeParameters[i]);
                                 do {
                                     i++;
-                                } while (i < length_1 && getParentSymbolOfTypeParameter(outerTypeParameters[i]) === parent_9);
+                                } while (i < length_1 && getParentSymbolOfTypeParameter(outerTypeParameters[i]) === parent_7);
                                 // When type parameters are their own type arguments for the whole group (i.e. we have
                                 // the default outer type arguments), we don't show the group.
                                 if (!ts.rangeEquals(outerTypeParameters, typeArguments, start, i)) {
-                                    writeSymbolTypeReference(parent_9, typeArguments, start, i, flags);
+                                    writeSymbolTypeReference(parent_7, typeArguments, start, i, flags);
                                     writePunctuation(writer, 22 /* DotToken */);
                                 }
                             }
@@ -24836,7 +26138,7 @@ var ts;
                     if (flags & 64 /* InElementType */) {
                         writePunctuation(writer, 18 /* OpenParenToken */);
                     }
-                    if (type.flags & 524288 /* Union */) {
+                    if (type.flags & 65536 /* Union */) {
                         writeTypeList(formatUnionTypes(type.types), 48 /* BarToken */);
                     }
                     else {
@@ -24889,7 +26191,7 @@ var ts;
                         var isNonLocalFunctionSymbol = !!(symbol.flags & 16 /* Function */) &&
                             (symbol.parent ||
                                 ts.forEach(symbol.declarations, function (declaration) {
-                                    return declaration.parent.kind === 256 /* SourceFile */ || declaration.parent.kind === 227 /* ModuleBlock */;
+                                    return declaration.parent.kind === 261 /* SourceFile */ || declaration.parent.kind === 231 /* ModuleBlock */;
                                 }));
                         if (isStaticMethodSymbol || isNonLocalFunctionSymbol) {
                             // typeof is allowed only for static/non local functions
@@ -24906,7 +26208,7 @@ var ts;
                 function writeIndexSignature(info, keyword) {
                     if (info) {
                         if (info.isReadonly) {
-                            writeKeyword(writer, 129 /* ReadonlyKeyword */);
+                            writeKeyword(writer, 130 /* ReadonlyKeyword */);
                             writeSpace(writer);
                         }
                         writePunctuation(writer, 20 /* OpenBracketToken */);
@@ -24924,7 +26226,7 @@ var ts;
                 }
                 function writePropertyWithModifiers(prop) {
                     if (isReadonlySymbol(prop)) {
-                        writeKeyword(writer, 129 /* ReadonlyKeyword */);
+                        writeKeyword(writer, 130 /* ReadonlyKeyword */);
                         writeSpace(writer);
                     }
                     buildSymbolDisplay(prop, writer);
@@ -24945,6 +26247,12 @@ var ts;
                     return false;
                 }
                 function writeLiteralType(type, flags) {
+                    if (type.objectFlags & 32 /* Mapped */) {
+                        if (getConstraintTypeFromMappedType(type).flags & (16384 /* TypeParameter */ | 262144 /* Index */)) {
+                            writeMappedType(type);
+                            return;
+                        }
+                    }
                     var resolved = resolveStructuredTypeMembers(type);
                     if (!resolved.properties.length && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
                         if (!resolved.callSignatures.length && !resolved.constructSignatures.length) {
@@ -24981,6 +26289,12 @@ var ts;
                     writePunctuation(writer, 16 /* OpenBraceToken */);
                     writer.writeLine();
                     writer.increaseIndent();
+                    writeObjectLiteralType(resolved);
+                    writer.decreaseIndent();
+                    writePunctuation(writer, 17 /* CloseBraceToken */);
+                    inObjectTypeLiteral = saveInObjectTypeLiteral;
+                }
+                function writeObjectLiteralType(resolved) {
                     for (var _i = 0, _a = resolved.callSignatures; _i < _a.length; _i++) {
                         var signature = _a[_i];
                         buildSignatureDisplay(signature, writer, enclosingDeclaration, globalFlagsToPass, /*kind*/ undefined, symbolStack);
@@ -24993,8 +26307,8 @@ var ts;
                         writePunctuation(writer, 24 /* SemicolonToken */);
                         writer.writeLine();
                     }
-                    writeIndexSignature(resolved.stringIndexInfo, 133 /* StringKeyword */);
-                    writeIndexSignature(resolved.numberIndexInfo, 131 /* NumberKeyword */);
+                    writeIndexSignature(resolved.stringIndexInfo, 134 /* StringKeyword */);
+                    writeIndexSignature(resolved.numberIndexInfo, 132 /* NumberKeyword */);
                     for (var _d = 0, _e = resolved.properties; _d < _e.length; _d++) {
                         var p = _e[_d];
                         var t = getTypeOfSymbol(p);
@@ -25017,9 +26331,32 @@ var ts;
                             writer.writeLine();
                         }
                     }
+                }
+                function writeMappedType(type) {
+                    writePunctuation(writer, 16 /* OpenBraceToken */);
+                    writer.writeLine();
+                    writer.increaseIndent();
+                    if (type.declaration.readonlyToken) {
+                        writeKeyword(writer, 130 /* ReadonlyKeyword */);
+                        writeSpace(writer);
+                    }
+                    writePunctuation(writer, 20 /* OpenBracketToken */);
+                    appendSymbolNameOnly(getTypeParameterFromMappedType(type).symbol, writer);
+                    writeSpace(writer);
+                    writeKeyword(writer, 91 /* InKeyword */);
+                    writeSpace(writer);
+                    writeType(getConstraintTypeFromMappedType(type), 0 /* None */);
+                    writePunctuation(writer, 21 /* CloseBracketToken */);
+                    if (type.declaration.questionToken) {
+                        writePunctuation(writer, 54 /* QuestionToken */);
+                    }
+                    writePunctuation(writer, 55 /* ColonToken */);
+                    writeSpace(writer);
+                    writeType(getTemplateTypeFromMappedType(type), 0 /* None */);
+                    writePunctuation(writer, 24 /* SemicolonToken */);
+                    writer.writeLine();
                     writer.decreaseIndent();
                     writePunctuation(writer, 17 /* CloseBraceToken */);
-                    inObjectTypeLiteral = saveInObjectTypeLiteral;
                 }
             }
             function buildTypeParameterDisplayFromSymbol(symbol, writer, enclosingDeclaration, flags) {
@@ -25058,12 +26395,12 @@ var ts;
             }
             function buildBindingPatternDisplay(bindingPattern, writer, enclosingDeclaration, flags, symbolStack) {
                 // We have to explicitly emit square bracket and bracket because these tokens are not stored inside the node.
-                if (bindingPattern.kind === 168 /* ObjectBindingPattern */) {
+                if (bindingPattern.kind === 172 /* ObjectBindingPattern */) {
                     writePunctuation(writer, 16 /* OpenBraceToken */);
                     buildDisplayForCommaSeparatedList(bindingPattern.elements, writer, function (e) { return buildBindingElementDisplay(e, writer, enclosingDeclaration, flags, symbolStack); });
                     writePunctuation(writer, 17 /* CloseBraceToken */);
                 }
-                else if (bindingPattern.kind === 169 /* ArrayBindingPattern */) {
+                else if (bindingPattern.kind === 173 /* ArrayBindingPattern */) {
                     writePunctuation(writer, 20 /* OpenBracketToken */);
                     var elements = bindingPattern.elements;
                     buildDisplayForCommaSeparatedList(elements, writer, function (e) { return buildBindingElementDisplay(e, writer, enclosingDeclaration, flags, symbolStack); });
@@ -25077,7 +26414,7 @@ var ts;
                 if (ts.isOmittedExpression(bindingElement)) {
                     return;
                 }
-                ts.Debug.assert(bindingElement.kind === 170 /* BindingElement */);
+                ts.Debug.assert(bindingElement.kind === 174 /* BindingElement */);
                 if (bindingElement.propertyName) {
                     writer.writeSymbol(ts.getTextOfNode(bindingElement.propertyName), bindingElement.symbol);
                     writePunctuation(writer, 55 /* ColonToken */);
@@ -25207,75 +26544,75 @@ var ts;
             return false;
             function determineIfDeclarationIsVisible() {
                 switch (node.kind) {
-                    case 170 /* BindingElement */:
+                    case 174 /* BindingElement */:
                         return isDeclarationVisible(node.parent.parent);
-                    case 219 /* VariableDeclaration */:
+                    case 223 /* VariableDeclaration */:
                         if (ts.isBindingPattern(node.name) &&
                             !node.name.elements.length) {
                             // If the binding pattern is empty, this variable declaration is not visible
                             return false;
                         }
                     // Otherwise fall through
-                    case 226 /* ModuleDeclaration */:
-                    case 222 /* ClassDeclaration */:
-                    case 223 /* InterfaceDeclaration */:
-                    case 224 /* TypeAliasDeclaration */:
-                    case 221 /* FunctionDeclaration */:
-                    case 225 /* EnumDeclaration */:
-                    case 230 /* ImportEqualsDeclaration */:
+                    case 230 /* ModuleDeclaration */:
+                    case 226 /* ClassDeclaration */:
+                    case 227 /* InterfaceDeclaration */:
+                    case 228 /* TypeAliasDeclaration */:
+                    case 225 /* FunctionDeclaration */:
+                    case 229 /* EnumDeclaration */:
+                    case 234 /* ImportEqualsDeclaration */:
                         // external module augmentation is always visible
                         if (ts.isExternalModuleAugmentation(node)) {
                             return true;
                         }
-                        var parent_10 = getDeclarationContainer(node);
+                        var parent_8 = 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 !== 230 /* ImportEqualsDeclaration */ && parent_10.kind !== 256 /* SourceFile */ && ts.isInAmbientContext(parent_10))) {
-                            return isGlobalSourceFile(parent_10);
+                            !(node.kind !== 234 /* ImportEqualsDeclaration */ && parent_8.kind !== 261 /* SourceFile */ && ts.isInAmbientContext(parent_8))) {
+                            return isGlobalSourceFile(parent_8);
                         }
                         // Exported members/ambient module elements (exception import declaration) are visible if parent is visible
-                        return isDeclarationVisible(parent_10);
-                    case 146 /* PropertyDeclaration */:
-                    case 145 /* PropertySignature */:
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
-                    case 148 /* MethodDeclaration */:
-                    case 147 /* MethodSignature */:
+                        return isDeclarationVisible(parent_8);
+                    case 147 /* PropertyDeclaration */:
+                    case 146 /* PropertySignature */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* SetAccessor */:
+                    case 149 /* MethodDeclaration */:
+                    case 148 /* MethodSignature */:
                         if (ts.getModifierFlags(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 const it fall into next case statement
-                    case 149 /* Constructor */:
-                    case 153 /* ConstructSignature */:
-                    case 152 /* CallSignature */:
-                    case 154 /* IndexSignature */:
-                    case 143 /* Parameter */:
-                    case 227 /* ModuleBlock */:
-                    case 157 /* FunctionType */:
-                    case 158 /* ConstructorType */:
-                    case 160 /* TypeLiteral */:
-                    case 156 /* TypeReference */:
-                    case 161 /* ArrayType */:
-                    case 162 /* TupleType */:
-                    case 163 /* UnionType */:
-                    case 164 /* IntersectionType */:
-                    case 165 /* ParenthesizedType */:
+                    case 150 /* Constructor */:
+                    case 154 /* ConstructSignature */:
+                    case 153 /* CallSignature */:
+                    case 155 /* IndexSignature */:
+                    case 144 /* Parameter */:
+                    case 231 /* ModuleBlock */:
+                    case 158 /* FunctionType */:
+                    case 159 /* ConstructorType */:
+                    case 161 /* TypeLiteral */:
+                    case 157 /* TypeReference */:
+                    case 162 /* ArrayType */:
+                    case 163 /* TupleType */:
+                    case 164 /* UnionType */:
+                    case 165 /* IntersectionType */:
+                    case 166 /* 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 232 /* ImportClause */:
-                    case 233 /* NamespaceImport */:
-                    case 235 /* ImportSpecifier */:
+                    case 236 /* ImportClause */:
+                    case 237 /* NamespaceImport */:
+                    case 239 /* ImportSpecifier */:
                         return false;
                     // Type parameters are always visible
-                    case 142 /* TypeParameter */:
+                    case 143 /* TypeParameter */:
                     // Source file and namespace export are always visible
-                    case 256 /* SourceFile */:
-                    case 229 /* NamespaceExportDeclaration */:
+                    case 261 /* SourceFile */:
+                    case 233 /* NamespaceExportDeclaration */:
                         return true;
                     // Export assignments do not create name bindings outside the module
-                    case 236 /* ExportAssignment */:
+                    case 240 /* ExportAssignment */:
                         return false;
                     default:
                         return false;
@@ -25284,10 +26621,10 @@ var ts;
         }
         function collectLinkedAliases(node) {
             var exportSymbol;
-            if (node.parent && node.parent.kind === 236 /* ExportAssignment */) {
+            if (node.parent && node.parent.kind === 240 /* ExportAssignment */) {
                 exportSymbol = resolveName(node.parent, node.text, 107455 /* Value */ | 793064 /* Type */ | 1920 /* Namespace */ | 8388608 /* Alias */, ts.Diagnostics.Cannot_find_name_0, node);
             }
-            else if (node.parent.kind === 239 /* ExportSpecifier */) {
+            else if (node.parent.kind === 243 /* ExportSpecifier */) {
                 var exportSpecifier = node.parent;
                 exportSymbol = exportSpecifier.parent.parent.moduleSpecifier ?
                     getExternalModuleMember(exportSpecifier.parent.parent, exportSpecifier) :
@@ -25362,7 +26699,6 @@ var ts;
                 return getSymbolLinks(target).declaredType;
             }
             if (propertyName === 1 /* ResolvedBaseConstructorType */) {
-                ts.Debug.assert(!!(target.flags & 32768 /* Class */));
                 return target.resolvedBaseConstructorType;
             }
             if (propertyName === 3 /* ResolvedReturnType */) {
@@ -25381,12 +26717,12 @@ var ts;
             node = ts.getRootDeclaration(node);
             while (node) {
                 switch (node.kind) {
-                    case 219 /* VariableDeclaration */:
-                    case 220 /* VariableDeclarationList */:
-                    case 235 /* ImportSpecifier */:
-                    case 234 /* NamedImports */:
-                    case 233 /* NamespaceImport */:
-                    case 232 /* ImportClause */:
+                    case 223 /* VariableDeclaration */:
+                    case 224 /* VariableDeclarationList */:
+                    case 239 /* ImportSpecifier */:
+                    case 238 /* NamedImports */:
+                    case 237 /* NamespaceImport */:
+                    case 236 /* ImportClause */:
                         node = node.parent;
                         break;
                     default:
@@ -25419,22 +26755,30 @@ var ts;
             var symbol = getSymbolOfNode(node);
             return symbol && getSymbolLinks(symbol).type || getTypeForVariableLikeDeclaration(node, /*includeOptionality*/ false);
         }
-        function getTextOfPropertyName(name) {
-            switch (name.kind) {
-                case 70 /* Identifier */:
-                    return name.text;
-                case 9 /* StringLiteral */:
-                case 8 /* NumericLiteral */:
-                    return name.text;
-                case 141 /* ComputedPropertyName */:
-                    if (ts.isStringOrNumericLiteral(name.expression.kind)) {
-                        return name.expression.text;
-                    }
-            }
-            return undefined;
-        }
         function isComputedNonLiteralName(name) {
-            return name.kind === 141 /* ComputedPropertyName */ && !ts.isStringOrNumericLiteral(name.expression.kind);
+            return name.kind === 142 /* ComputedPropertyName */ && !ts.isStringOrNumericLiteral(name.expression.kind);
+        }
+        function getRestType(source, properties, symbol) {
+            ts.Debug.assert(!!(source.flags & 32768 /* Object */), "Rest types only support object types right now.");
+            var members = ts.createMap();
+            var names = ts.createMap();
+            for (var _i = 0, properties_2 = properties; _i < properties_2.length; _i++) {
+                var name_18 = properties_2[_i];
+                names[ts.getTextOfPropertyName(name_18)] = true;
+            }
+            for (var _a = 0, _b = getPropertiesOfType(source); _a < _b.length; _a++) {
+                var prop = _b[_a];
+                var inNamesToRemove = prop.name in names;
+                var isPrivate = getDeclarationModifierFlagsFromSymbol(prop) & (8 /* Private */ | 16 /* Protected */);
+                var isMethod = prop.flags & 8192 /* Method */;
+                var isSetOnlyAccessor = prop.flags & 65536 /* SetAccessor */ && !(prop.flags & 32768 /* GetAccessor */);
+                if (!inNamesToRemove && !isPrivate && !isMethod && !isSetOnlyAccessor) {
+                    members[prop.name] = prop;
+                }
+            }
+            var stringIndexInfo = getIndexInfoOfType(source, 0 /* String */);
+            var numberIndexInfo = getIndexInfoOfType(source, 1 /* Number */);
+            return createAnonymousType(symbol, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
         }
         /** Return the inferred type for a binding element */
         function getTypeForBindingElement(declaration) {
@@ -25454,25 +26798,41 @@ var ts;
                 return parentType;
             }
             var type;
-            if (pattern.kind === 168 /* ObjectBindingPattern */) {
-                // Use explicitly specified property name ({ p: xxx } form), or otherwise the implied name ({ p } form)
-                var name_14 = declaration.propertyName || declaration.name;
-                if (isComputedNonLiteralName(name_14)) {
-                    // computed properties with non-literal names are treated as 'any'
-                    return anyType;
+            if (pattern.kind === 172 /* ObjectBindingPattern */) {
+                if (declaration.dotDotDotToken) {
+                    if (!(parentType.flags & 32768 /* Object */)) {
+                        error(declaration, ts.Diagnostics.Rest_types_may_only_be_created_from_object_types);
+                        return unknownType;
+                    }
+                    var literalMembers = [];
+                    for (var _i = 0, _a = pattern.elements; _i < _a.length; _i++) {
+                        var element = _a[_i];
+                        if (element.kind !== 198 /* OmittedExpression */ && !element.dotDotDotToken) {
+                            literalMembers.push(element.propertyName || element.name);
+                        }
+                    }
+                    type = getRestType(parentType, literalMembers, declaration.symbol);
                 }
-                if (declaration.initializer) {
-                    getContextualType(declaration.initializer);
-                }
-                // Use type of the specified property, or otherwise, for a numeric name, the type of the numeric index signature,
-                // or otherwise the type of the string index signature.
-                var text = getTextOfPropertyName(name_14);
-                type = getTypeOfPropertyOfType(parentType, text) ||
-                    isNumericLiteralName(text) && getIndexTypeOfType(parentType, 1 /* Number */) ||
-                    getIndexTypeOfType(parentType, 0 /* String */);
-                if (!type) {
-                    error(name_14, ts.Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(parentType), ts.declarationNameToString(name_14));
-                    return unknownType;
+                else {
+                    // Use explicitly specified property name ({ p: xxx } form), or otherwise the implied name ({ p } form)
+                    var name_19 = declaration.propertyName || declaration.name;
+                    if (isComputedNonLiteralName(name_19)) {
+                        // computed properties with non-literal names are treated as 'any'
+                        return anyType;
+                    }
+                    if (declaration.initializer) {
+                        getContextualType(declaration.initializer);
+                    }
+                    // Use type of the specified property, or otherwise, for a numeric name, the type of the numeric index signature,
+                    // or otherwise the type of the string index signature.
+                    var text = ts.getTextOfPropertyName(name_19);
+                    type = getTypeOfPropertyOfType(parentType, text) ||
+                        isNumericLiteralName(text) && getIndexTypeOfType(parentType, 1 /* Number */) ||
+                        getIndexTypeOfType(parentType, 0 /* String */);
+                    if (!type) {
+                        error(name_19, ts.Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(parentType), ts.declarationNameToString(name_19));
+                        return unknownType;
+                    }
                 }
             }
             else {
@@ -25480,7 +26840,11 @@ var ts;
                 // 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);
-                if (!declaration.dotDotDotToken) {
+                if (declaration.dotDotDotToken) {
+                    // Rest element has an array type with the same element type as the parent type
+                    type = createArrayType(elementType);
+                }
+                else {
                     // Use specific property type when parent is a tuple or numeric index type when parent is an array
                     var propName = "" + ts.indexOf(pattern.elements, declaration);
                     type = isTupleLikeType(parentType)
@@ -25496,10 +26860,6 @@ var ts;
                         return unknownType;
                     }
                 }
-                else {
-                    // Rest element has an array type with the same element type as the parent type
-                    type = createArrayType(elementType);
-                }
             }
             // In strict null checking mode, if a default value of a non-undefined type is specified, remove
             // undefined from the final type.
@@ -25522,16 +26882,16 @@ var ts;
             if (typeTag && typeTag.typeExpression) {
                 return typeTag.typeExpression.type;
             }
-            if (declaration.kind === 219 /* VariableDeclaration */ &&
-                declaration.parent.kind === 220 /* VariableDeclarationList */ &&
-                declaration.parent.parent.kind === 201 /* VariableStatement */) {
+            if (declaration.kind === 223 /* VariableDeclaration */ &&
+                declaration.parent.kind === 224 /* VariableDeclarationList */ &&
+                declaration.parent.parent.kind === 205 /* VariableStatement */) {
                 // @type annotation might have been on the variable statement, try that instead.
                 var annotation = ts.getJSDocTypeTag(declaration.parent.parent);
                 if (annotation && annotation.typeExpression) {
                     return annotation.typeExpression.type;
                 }
             }
-            else if (declaration.kind === 143 /* Parameter */) {
+            else if (declaration.kind === 144 /* Parameter */) {
                 // If it's a parameter, see if the parent has a jsdoc comment with an @param
                 // annotation.
                 var paramTag = ts.getCorrespondingJSDocParameterTag(declaration);
@@ -25547,14 +26907,14 @@ var ts;
         }
         function isEmptyArrayLiteral(node) {
             var expr = ts.skipParentheses(node);
-            return expr.kind === 171 /* ArrayLiteralExpression */ && expr.elements.length === 0;
+            return expr.kind === 175 /* ArrayLiteralExpression */ && expr.elements.length === 0;
         }
         function addOptionality(type, optional) {
             return strictNullChecks && optional ? includeFalsyTypes(type, 2048 /* Undefined */) : type;
         }
         // Return the inferred type for a variable, parameter, or property declaration
         function getTypeForVariableLikeDeclaration(declaration, includeOptionality) {
-            if (declaration.flags & 1048576 /* JavaScriptFile */) {
+            if (declaration.flags & 2097152 /* JavaScriptFile */) {
                 // If this is a variable in a JavaScript file, then use the JSDoc type (if it has
                 // one as its type), otherwise fallback to the below standard TS codepaths to
                 // try to figure it out.
@@ -25564,10 +26924,10 @@ var ts;
                 }
             }
             // A variable declared in a for..in statement is always of type string
-            if (declaration.parent.parent.kind === 208 /* ForInStatement */) {
+            if (declaration.parent.parent.kind === 212 /* ForInStatement */) {
                 return stringType;
             }
-            if (declaration.parent.parent.kind === 209 /* ForOfStatement */) {
+            if (declaration.parent.parent.kind === 213 /* 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,
@@ -25581,7 +26941,7 @@ var ts;
             if (declaration.type) {
                 return addOptionality(getTypeFromTypeNode(declaration.type), /*optional*/ declaration.questionToken && includeOptionality);
             }
-            if (declaration.kind === 219 /* VariableDeclaration */ && !ts.isBindingPattern(declaration.name) &&
+            if (declaration.kind === 223 /* VariableDeclaration */ && !ts.isBindingPattern(declaration.name) &&
                 !(ts.getCombinedModifierFlags(declaration) & 1 /* Export */) && !ts.isInAmbientContext(declaration)) {
                 // Use control flow tracked 'any' type for non-ambient, non-exported var or let variables with no
                 // initializer or a 'null' or 'undefined' initializer.
@@ -25594,11 +26954,11 @@ var ts;
                     return autoArrayType;
                 }
             }
-            if (declaration.kind === 143 /* Parameter */) {
+            if (declaration.kind === 144 /* 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 === 151 /* SetAccessor */ && !ts.hasDynamicName(func)) {
-                    var getter = ts.getDeclarationOfKind(declaration.parent.symbol, 150 /* GetAccessor */);
+                if (func.kind === 152 /* SetAccessor */ && !ts.hasDynamicName(func)) {
+                    var getter = ts.getDeclarationOfKind(declaration.parent.symbol, 151 /* GetAccessor */);
                     if (getter) {
                         var getterSignature = getSignatureFromDeclaration(getter);
                         var thisParameter = getAccessorThisParameter(func);
@@ -25628,7 +26988,7 @@ var ts;
                 return addOptionality(type, /*optional*/ declaration.questionToken && includeOptionality);
             }
             // If it is a short-hand property assignment, use the type of the identifier
-            if (declaration.kind === 254 /* ShorthandPropertyAssignment */) {
+            if (declaration.kind === 258 /* ShorthandPropertyAssignment */) {
                 return checkIdentifier(declaration.name);
             }
             // If the declaration specifies a binding pattern, use the type implied by the binding pattern
@@ -25659,12 +27019,12 @@ var ts;
             var hasComputedProperties = false;
             ts.forEach(pattern.elements, function (e) {
                 var name = e.propertyName || e.name;
-                if (isComputedNonLiteralName(name)) {
-                    // do not include computed properties in the implied type
+                if (isComputedNonLiteralName(name) || e.dotDotDotToken) {
+                    // do not include computed properties or rests in the implied type
                     hasComputedProperties = true;
                     return;
                 }
-                var text = getTextOfPropertyName(name);
+                var text = ts.getTextOfPropertyName(name);
                 var flags = 4 /* Property */ | 67108864 /* Transient */ | (e.initializer ? 536870912 /* Optional */ : 0);
                 var symbol = createSymbol(flags, text);
                 symbol.type = getTypeFromBindingElement(e, includePatternInType, reportErrors);
@@ -25676,7 +27036,7 @@ var ts;
                 result.pattern = pattern;
             }
             if (hasComputedProperties) {
-                result.isObjectLiteralPatternWithComputedProperties = true;
+                result.objectFlags |= 512 /* ObjectLiteralPatternWithComputedProperties */;
             }
             return result;
         }
@@ -25704,7 +27064,7 @@ var ts;
         // parameter with no type annotation or initializer, the type implied by the binding pattern becomes the type of
         // the parameter.
         function getTypeFromBindingPattern(pattern, includePatternInType, reportErrors) {
-            return pattern.kind === 168 /* ObjectBindingPattern */
+            return pattern.kind === 172 /* ObjectBindingPattern */
                 ? getTypeFromObjectBindingPattern(pattern, includePatternInType, reportErrors)
                 : getTypeFromArrayBindingPattern(pattern, includePatternInType, reportErrors);
         }
@@ -25726,7 +27086,7 @@ var ts;
                 // During a normal type check we'll never get to here with a property assignment (the check of the containing
                 // object literal uses a different path). We exclude widening only so that language services and type verification
                 // tools see the actual type.
-                if (declaration.kind === 253 /* PropertyAssignment */) {
+                if (declaration.kind === 257 /* PropertyAssignment */) {
                     return type;
                 }
                 return getWidenedType(type);
@@ -25743,7 +27103,7 @@ var ts;
         }
         function declarationBelongsToPrivateAmbientMember(declaration) {
             var root = ts.getRootDeclaration(declaration);
-            var memberDeclaration = root.kind === 143 /* Parameter */ ? root.parent : root;
+            var memberDeclaration = root.kind === 144 /* Parameter */ ? root.parent : root;
             return isPrivateWithinAmbient(memberDeclaration);
         }
         function getTypeOfVariableOrParameterOrProperty(symbol) {
@@ -25755,14 +27115,14 @@ var ts;
                 }
                 // Handle catch clause variables
                 var declaration = symbol.valueDeclaration;
-                if (declaration.parent.kind === 252 /* CatchClause */) {
+                if (ts.isCatchClauseVariableDeclarationOrBindingElement(declaration)) {
                     return links.type = anyType;
                 }
                 // Handle export default expressions
-                if (declaration.kind === 236 /* ExportAssignment */) {
+                if (declaration.kind === 240 /* ExportAssignment */) {
                     return links.type = checkExpression(declaration.expression);
                 }
-                if (declaration.flags & 1048576 /* JavaScriptFile */ && declaration.kind === 280 /* JSDocPropertyTag */ && declaration.typeExpression) {
+                if (declaration.flags & 2097152 /* JavaScriptFile */ && declaration.kind === 285 /* JSDocPropertyTag */ && declaration.typeExpression) {
                     return links.type = getTypeFromTypeNode(declaration.typeExpression.type);
                 }
                 // Handle variable, parameter or property
@@ -25775,16 +27135,16 @@ var ts;
                 // * exports.p = expr
                 // * this.p = expr
                 // * className.prototype.method = expr
-                if (declaration.kind === 188 /* BinaryExpression */ ||
-                    declaration.kind === 173 /* PropertyAccessExpression */ && declaration.parent.kind === 188 /* BinaryExpression */) {
+                if (declaration.kind === 192 /* BinaryExpression */ ||
+                    declaration.kind === 177 /* PropertyAccessExpression */ && declaration.parent.kind === 192 /* BinaryExpression */) {
                     // Use JS Doc type if present on parent expression statement
-                    if (declaration.flags & 1048576 /* JavaScriptFile */) {
+                    if (declaration.flags & 2097152 /* JavaScriptFile */) {
                         var typeTag = ts.getJSDocTypeTag(declaration.parent);
                         if (typeTag && typeTag.typeExpression) {
                             return links.type = getTypeFromTypeNode(typeTag.typeExpression.type);
                         }
                     }
-                    var declaredTypes = ts.map(symbol.declarations, function (decl) { return decl.kind === 188 /* BinaryExpression */ ?
+                    var declaredTypes = ts.map(symbol.declarations, function (decl) { return decl.kind === 192 /* BinaryExpression */ ?
                         checkExpressionCached(decl.right) :
                         checkExpressionCached(decl.parent.right); });
                     type = getUnionType(declaredTypes, /*subtypeReduction*/ true);
@@ -25812,7 +27172,7 @@ var ts;
         }
         function getAnnotatedAccessorType(accessor) {
             if (accessor) {
-                if (accessor.kind === 150 /* GetAccessor */) {
+                if (accessor.kind === 151 /* GetAccessor */) {
                     return accessor.type && getTypeFromTypeNode(accessor.type);
                 }
                 else {
@@ -25832,9 +27192,9 @@ var ts;
         function getTypeOfAccessors(symbol) {
             var links = getSymbolLinks(symbol);
             if (!links.type) {
-                var getter = ts.getDeclarationOfKind(symbol, 150 /* GetAccessor */);
-                var setter = ts.getDeclarationOfKind(symbol, 151 /* SetAccessor */);
-                if (getter && getter.flags & 1048576 /* JavaScriptFile */) {
+                var getter = ts.getDeclarationOfKind(symbol, 151 /* GetAccessor */);
+                var setter = ts.getDeclarationOfKind(symbol, 152 /* SetAccessor */);
+                if (getter && getter.flags & 2097152 /* JavaScriptFile */) {
                     var jsDocType = getTypeForVariableLikeDeclarationFromJSDocComment(getter);
                     if (jsDocType) {
                         return links.type = jsDocType;
@@ -25877,7 +27237,7 @@ var ts;
                 if (!popTypeResolution()) {
                     type = anyType;
                     if (compilerOptions.noImplicitAny) {
-                        var getter_1 = ts.getDeclarationOfKind(symbol, 150 /* GetAccessor */);
+                        var getter_1 = ts.getDeclarationOfKind(symbol, 151 /* 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));
                     }
                 }
@@ -25888,11 +27248,11 @@ var ts;
         function getTypeOfFuncClassEnumModule(symbol) {
             var links = getSymbolLinks(symbol);
             if (!links.type) {
-                if (symbol.valueDeclaration.kind === 226 /* ModuleDeclaration */ && ts.isShorthandAmbientModuleSymbol(symbol)) {
+                if (symbol.flags & 1536 /* Module */ && ts.isShorthandAmbientModuleSymbol(symbol)) {
                     links.type = anyType;
                 }
                 else {
-                    var type = createObjectType(2097152 /* Anonymous */, symbol);
+                    var type = createObjectType(16 /* Anonymous */, symbol);
                     links.type = strictNullChecks && symbol.flags & 536870912 /* Optional */ ?
                         includeFalsyTypes(type, 2048 /* Undefined */) : type;
                 }
@@ -25950,7 +27310,7 @@ var ts;
             return unknownType;
         }
         function getTargetType(type) {
-            return type.flags & 131072 /* Reference */ ? type.target : type;
+            return getObjectFlags(type) & 4 /* Reference */ ? type.target : type;
         }
         function hasBaseType(type, checkBase) {
             return check(type);
@@ -25984,9 +27344,9 @@ var ts;
                 if (!node) {
                     return typeParameters;
                 }
-                if (node.kind === 222 /* ClassDeclaration */ || node.kind === 193 /* ClassExpression */ ||
-                    node.kind === 221 /* FunctionDeclaration */ || node.kind === 180 /* FunctionExpression */ ||
-                    node.kind === 148 /* MethodDeclaration */ || node.kind === 181 /* ArrowFunction */) {
+                if (node.kind === 226 /* ClassDeclaration */ || node.kind === 197 /* ClassExpression */ ||
+                    node.kind === 225 /* FunctionDeclaration */ || node.kind === 184 /* FunctionExpression */ ||
+                    node.kind === 149 /* MethodDeclaration */ || node.kind === 185 /* ArrowFunction */) {
                     var declarations = node.typeParameters;
                     if (declarations) {
                         return appendTypeParameters(appendOuterTypeParameters(typeParameters, node), declarations);
@@ -25996,7 +27356,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, 223 /* InterfaceDeclaration */);
+            var declaration = symbol.flags & 32 /* Class */ ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 227 /* InterfaceDeclaration */);
             return appendOuterTypeParameters(undefined, declaration);
         }
         // The local type parameters are the combined set of type parameters from all declarations of the class,
@@ -26005,8 +27365,8 @@ var ts;
             var result;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var node = _a[_i];
-                if (node.kind === 223 /* InterfaceDeclaration */ || node.kind === 222 /* ClassDeclaration */ ||
-                    node.kind === 193 /* ClassExpression */ || node.kind === 224 /* TypeAliasDeclaration */) {
+                if (node.kind === 227 /* InterfaceDeclaration */ || node.kind === 226 /* ClassDeclaration */ ||
+                    node.kind === 197 /* ClassExpression */ || node.kind === 228 /* TypeAliasDeclaration */) {
                     var declaration = node;
                     if (declaration.typeParameters) {
                         result = appendTypeParameters(result, declaration.typeParameters);
@@ -26021,7 +27381,7 @@ var ts;
             return ts.concatenate(getOuterTypeParametersOfClassOrInterface(symbol), getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol));
         }
         function isConstructorType(type) {
-            return type.flags & 2588672 /* ObjectType */ && getSignaturesOfType(type, 1 /* Construct */).length > 0;
+            return type.flags & 32768 /* Object */ && getSignaturesOfType(type, 1 /* Construct */).length > 0;
         }
         function getBaseTypeNodeOfClass(type) {
             return ts.getClassExtendsHeritageClauseElement(type.symbol.valueDeclaration);
@@ -26033,7 +27393,7 @@ var ts;
         function getInstantiatedConstructorsForTypeArguments(type, typeArgumentNodes) {
             var signatures = getConstructorsForTypeArguments(type, typeArgumentNodes);
             if (typeArgumentNodes) {
-                var typeArguments_1 = ts.map(typeArgumentNodes, getTypeFromTypeNodeNoAlias);
+                var typeArguments_1 = ts.map(typeArgumentNodes, getTypeFromTypeNode);
                 signatures = ts.map(signatures, function (sig) { return getSignatureInstantiation(sig, typeArguments_1); });
             }
             return signatures;
@@ -26053,7 +27413,7 @@ var ts;
                     return unknownType;
                 }
                 var baseConstructorType = checkExpression(baseTypeNode.expression);
-                if (baseConstructorType.flags & 2588672 /* ObjectType */) {
+                if (baseConstructorType.flags & 32768 /* Object */) {
                     // Resolving the members of a class requires us to resolve the base class of that class.
                     // We force resolution here such that we catch circularities now.
                     resolveStructuredTypeMembers(baseConstructorType);
@@ -26072,7 +27432,7 @@ var ts;
         }
         function getBaseTypes(type) {
             if (!type.resolvedBaseTypes) {
-                if (type.flags & 262144 /* Tuple */) {
+                if (type.objectFlags & 8 /* Tuple */) {
                     type.resolvedBaseTypes = [createArrayType(getUnionType(type.typeParameters))];
                 }
                 else if (type.symbol.flags & (32 /* Class */ | 64 /* Interface */)) {
@@ -26092,7 +27452,7 @@ var ts;
         function resolveBaseTypesOfClass(type) {
             type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray;
             var baseConstructorType = getBaseConstructorTypeOfClass(type);
-            if (!(baseConstructorType.flags & 2588672 /* ObjectType */)) {
+            if (!(baseConstructorType.flags & 32768 /* Object */)) {
                 return;
             }
             var baseTypeNode = getBaseTypeNodeOfClass(type);
@@ -26119,7 +27479,7 @@ var ts;
             if (baseType === unknownType) {
                 return;
             }
-            if (!(getTargetType(baseType).flags & (32768 /* Class */ | 65536 /* Interface */))) {
+            if (!(getObjectFlags(getTargetType(baseType)) & 3 /* ClassOrInterface */)) {
                 error(baseTypeNode.expression, ts.Diagnostics.Base_constructor_return_type_0_is_not_a_class_or_interface_type, typeToString(baseType));
                 return;
             }
@@ -26149,12 +27509,12 @@ var ts;
             type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray;
             for (var _i = 0, _a = type.symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 223 /* InterfaceDeclaration */ && ts.getInterfaceBaseTypeNodes(declaration)) {
+                if (declaration.kind === 227 /* InterfaceDeclaration */ && ts.getInterfaceBaseTypeNodes(declaration)) {
                     for (var _b = 0, _c = ts.getInterfaceBaseTypeNodes(declaration); _b < _c.length; _b++) {
                         var node = _c[_b];
                         var baseType = getTypeFromTypeNode(node);
                         if (baseType !== unknownType) {
-                            if (getTargetType(baseType).flags & (32768 /* Class */ | 65536 /* Interface */)) {
+                            if (getObjectFlags(getTargetType(baseType)) & 3 /* ClassOrInterface */) {
                                 if (type !== baseType && !hasBaseType(baseType, type)) {
                                     if (type.resolvedBaseTypes === emptyArray) {
                                         type.resolvedBaseTypes = [baseType];
@@ -26181,7 +27541,7 @@ var ts;
         function isIndependentInterface(symbol) {
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 223 /* InterfaceDeclaration */) {
+                if (declaration.kind === 227 /* InterfaceDeclaration */) {
                     if (declaration.flags & 64 /* ContainsThis */) {
                         return false;
                     }
@@ -26204,7 +27564,7 @@ var ts;
         function getDeclaredTypeOfClassOrInterface(symbol) {
             var links = getSymbolLinks(symbol);
             if (!links.declaredType) {
-                var kind = symbol.flags & 32 /* Class */ ? 32768 /* Class */ : 65536 /* Interface */;
+                var kind = symbol.flags & 32 /* Class */ ? 1 /* Class */ : 2 /* Interface */;
                 var type = links.declaredType = createObjectType(kind, symbol);
                 var outerTypeParameters = getOuterTypeParametersOfClassOrInterface(symbol);
                 var localTypeParameters = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol);
@@ -26213,8 +27573,8 @@ var ts;
                 // property types inferred from initializers and method return types inferred from return statements are very hard
                 // to exhaustively analyze). We give interfaces a "this" type if we can't definitely determine that they are free of
                 // "this" references.
-                if (outerTypeParameters || localTypeParameters || kind === 32768 /* Class */ || !isIndependentInterface(symbol)) {
-                    type.flags |= 131072 /* Reference */;
+                if (outerTypeParameters || localTypeParameters || kind === 1 /* Class */ || !isIndependentInterface(symbol)) {
+                    type.objectFlags |= 4 /* Reference */;
                     type.typeParameters = ts.concatenate(outerTypeParameters, localTypeParameters);
                     type.outerTypeParameters = outerTypeParameters;
                     type.localTypeParameters = localTypeParameters;
@@ -26238,8 +27598,7 @@ var ts;
                 if (!pushTypeResolution(symbol, 2 /* DeclaredType */)) {
                     return unknownType;
                 }
-                var typeParameters = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol);
-                var declaration = ts.getDeclarationOfKind(symbol, 279 /* JSDocTypedefTag */);
+                var declaration = ts.getDeclarationOfKind(symbol, 284 /* JSDocTypedefTag */);
                 var type = void 0;
                 if (declaration) {
                     if (declaration.jsDocTypeLiteral) {
@@ -26250,16 +27609,17 @@ var ts;
                     }
                 }
                 else {
-                    declaration = ts.getDeclarationOfKind(symbol, 224 /* TypeAliasDeclaration */);
-                    type = getTypeFromTypeNode(declaration.type, symbol, typeParameters);
+                    declaration = ts.getDeclarationOfKind(symbol, 228 /* TypeAliasDeclaration */);
+                    type = getTypeFromTypeNode(declaration.type);
                 }
                 if (popTypeResolution()) {
-                    links.typeParameters = typeParameters;
+                    var typeParameters = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol);
                     if (typeParameters) {
                         // Initialize the instantiation cache for generic type aliases. The declared type corresponds to
                         // an instantiation of the type alias with the type parameters supplied as type arguments.
+                        links.typeParameters = typeParameters;
                         links.instantiations = ts.createMap();
-                        links.instantiations[getTypeListId(links.typeParameters)] = type;
+                        links.instantiations[getTypeListId(typeParameters)] = type;
                     }
                 }
                 else {
@@ -26276,14 +27636,14 @@ var ts;
                 return !ts.isInAmbientContext(member);
             }
             return expr.kind === 8 /* NumericLiteral */ ||
-                expr.kind === 186 /* PrefixUnaryExpression */ && expr.operator === 37 /* MinusToken */ &&
+                expr.kind === 190 /* PrefixUnaryExpression */ && expr.operator === 37 /* MinusToken */ &&
                     expr.operand.kind === 8 /* NumericLiteral */ ||
                 expr.kind === 70 /* Identifier */ && !!symbol.exports[expr.text];
         }
         function enumHasLiteralMembers(symbol) {
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 225 /* EnumDeclaration */) {
+                if (declaration.kind === 229 /* EnumDeclaration */) {
                     for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) {
                         var member = _c[_b];
                         if (!isLiteralEnumMember(symbol, member)) {
@@ -26311,7 +27671,7 @@ var ts;
                     var memberTypes = ts.createMap();
                     for (var _i = 0, _a = enumType.symbol.declarations; _i < _a.length; _i++) {
                         var declaration = _a[_i];
-                        if (declaration.kind === 225 /* EnumDeclaration */) {
+                        if (declaration.kind === 229 /* EnumDeclaration */) {
                             computeEnumMemberValues(declaration);
                             for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) {
                                 var member = _c[_b];
@@ -26326,7 +27686,7 @@ var ts;
                     }
                     enumType.memberTypes = memberTypes;
                     if (memberTypeList.length > 1) {
-                        enumType.flags |= 524288 /* Union */;
+                        enumType.flags |= 65536 /* Union */;
                         enumType.types = memberTypeList;
                         unionTypes[getTypeListId(memberTypeList)] = enumType;
                     }
@@ -26338,7 +27698,7 @@ var ts;
             var links = getSymbolLinks(symbol);
             if (!links.declaredType) {
                 var enumType = getDeclaredTypeOfEnum(getParentOfSymbol(symbol));
-                links.declaredType = enumType.flags & 524288 /* Union */ ?
+                links.declaredType = enumType.flags & 65536 /* Union */ ?
                     enumType.memberTypes[getEnumMemberValue(symbol.valueDeclaration)] :
                     enumType;
             }
@@ -26349,7 +27709,7 @@ var ts;
             if (!links.declaredType) {
                 var type = createType(16384 /* TypeParameter */);
                 type.symbol = symbol;
-                if (!ts.getDeclarationOfKind(symbol, 142 /* TypeParameter */).constraint) {
+                if (!ts.getDeclarationOfKind(symbol, 143 /* TypeParameter */).constraint) {
                     type.constraint = noConstraintType;
                 }
                 links.declaredType = type;
@@ -26403,19 +27763,19 @@ var ts;
         function isIndependentType(node) {
             switch (node.kind) {
                 case 118 /* AnyKeyword */:
-                case 133 /* StringKeyword */:
-                case 131 /* NumberKeyword */:
+                case 134 /* StringKeyword */:
+                case 132 /* NumberKeyword */:
                 case 121 /* BooleanKeyword */:
-                case 134 /* SymbolKeyword */:
+                case 135 /* SymbolKeyword */:
                 case 104 /* VoidKeyword */:
-                case 136 /* UndefinedKeyword */:
+                case 137 /* UndefinedKeyword */:
                 case 94 /* NullKeyword */:
-                case 128 /* NeverKeyword */:
-                case 167 /* LiteralType */:
+                case 129 /* NeverKeyword */:
+                case 171 /* LiteralType */:
                     return true;
-                case 161 /* ArrayType */:
+                case 162 /* ArrayType */:
                     return isIndependentType(node.elementType);
-                case 156 /* TypeReference */:
+                case 157 /* TypeReference */:
                     return isIndependentTypeReference(node);
             }
             return false;
@@ -26428,7 +27788,7 @@ var ts;
         // A function-like declaration is considered independent (free of this references) if it has a return type
         // annotation that is considered independent and if each parameter is considered independent.
         function isIndependentFunctionLikeDeclaration(node) {
-            if (node.kind !== 149 /* Constructor */ && (!node.type || !isIndependentType(node.type))) {
+            if (node.kind !== 150 /* Constructor */ && (!node.type || !isIndependentType(node.type))) {
                 return false;
             }
             for (var _i = 0, _a = node.parameters; _i < _a.length; _i++) {
@@ -26449,12 +27809,12 @@ var ts;
                 var declaration = symbol.declarations[0];
                 if (declaration) {
                     switch (declaration.kind) {
-                        case 146 /* PropertyDeclaration */:
-                        case 145 /* PropertySignature */:
+                        case 147 /* PropertyDeclaration */:
+                        case 146 /* PropertySignature */:
                             return isIndependentVariableLikeDeclaration(declaration);
-                        case 148 /* MethodDeclaration */:
-                        case 147 /* MethodSignature */:
-                        case 149 /* Constructor */:
+                        case 149 /* MethodDeclaration */:
+                        case 148 /* MethodSignature */:
+                        case 150 /* Constructor */:
                             return isIndependentFunctionLikeDeclaration(declaration);
                     }
                 }
@@ -26499,7 +27859,7 @@ var ts;
             return type;
         }
         function getTypeWithThisArgument(type, thisArgument) {
-            if (type.flags & 131072 /* Reference */) {
+            if (getObjectFlags(type) & 4 /* Reference */) {
                 return createTypeReference(type.target, ts.concatenate(type.typeArguments, [thisArgument || type.target.thisType]));
             }
             return type;
@@ -26522,8 +27882,8 @@ var ts;
             else {
                 mapper = createTypeMapper(typeParameters, typeArguments);
                 members = createInstantiatedSymbolTable(source.declaredProperties, mapper, /*mappingThisOnly*/ typeParameters.length === 1);
-                callSignatures = instantiateList(source.declaredCallSignatures, mapper, instantiateSignature);
-                constructSignatures = instantiateList(source.declaredConstructSignatures, mapper, instantiateSignature);
+                callSignatures = instantiateSignatures(source.declaredCallSignatures, mapper);
+                constructSignatures = instantiateSignatures(source.declaredConstructSignatures, mapper);
                 stringIndexInfo = instantiateIndexInfo(source.declaredStringIndexInfo, mapper);
                 numberIndexInfo = instantiateIndexInfo(source.declaredNumberIndexInfo, mapper);
             }
@@ -26543,7 +27903,7 @@ var ts;
                     numberIndexInfo = numberIndexInfo || getIndexInfoOfType(instantiatedBaseType, 1 /* Number */);
                 }
             }
-            setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+            setStructuredTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function resolveClassOrInterfaceMembers(type) {
             resolveObjectTypeMembers(type, resolveDeclaredMembers(type), emptyArray, emptyArray);
@@ -26578,14 +27938,14 @@ var ts;
                 return [createSignature(undefined, classType.localTypeParameters, undefined, emptyArray, classType, /*typePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false)];
             }
             var baseTypeNode = getBaseTypeNodeOfClass(classType);
-            var typeArguments = ts.map(baseTypeNode.typeArguments, getTypeFromTypeNodeNoAlias);
+            var typeArguments = ts.map(baseTypeNode.typeArguments, getTypeFromTypeNode);
             var typeArgCount = typeArguments ? typeArguments.length : 0;
             var result = [];
             for (var _i = 0, baseSignatures_1 = baseSignatures; _i < baseSignatures_1.length; _i++) {
                 var baseSig = baseSignatures_1[_i];
                 var typeParamCount = baseSig.typeParameters ? baseSig.typeParameters.length : 0;
                 if (typeParamCount === typeArgCount) {
-                    var sig = typeParamCount ? getSignatureInstantiation(baseSig, typeArguments) : cloneSignature(baseSig);
+                    var sig = typeParamCount ? createSignatureInstantiation(baseSig, typeArguments) : cloneSignature(baseSig);
                     sig.typeParameters = classType.localTypeParameters;
                     sig.resolvedReturnType = classType;
                     result.push(sig);
@@ -26682,7 +28042,7 @@ var ts;
             var constructSignatures = getUnionSignatures(type.types, 1 /* Construct */);
             var stringIndexInfo = getUnionIndexInfo(type.types, 0 /* String */);
             var numberIndexInfo = getUnionIndexInfo(type.types, 1 /* Number */);
-            setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+            setStructuredTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function intersectTypes(type1, type2) {
             return !type1 ? type2 : !type2 ? type1 : getIntersectionType([type1, type2]);
@@ -26690,6 +28050,9 @@ var ts;
         function intersectIndexInfos(info1, info2) {
             return !info1 ? info2 : !info2 ? info1 : createIndexInfo(getIntersectionType([info1.type, info2.type]), info1.isReadonly && info2.isReadonly);
         }
+        function unionSpreadIndexInfos(info1, info2) {
+            return info1 && info2 && createIndexInfo(getUnionType([info1.type, info2.type]), info1.isReadonly || info2.isReadonly);
+        }
         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).
@@ -26704,17 +28067,17 @@ var ts;
                 stringIndexInfo = intersectIndexInfos(stringIndexInfo, getIndexInfoOfType(t, 0 /* String */));
                 numberIndexInfo = intersectIndexInfos(numberIndexInfo, getIndexInfoOfType(t, 1 /* Number */));
             }
-            setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+            setStructuredTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function resolveAnonymousTypeMembers(type) {
             var symbol = type.symbol;
             if (type.target) {
                 var members = createInstantiatedSymbolTable(getPropertiesOfObjectType(type.target), type.mapper, /*mappingThisOnly*/ false);
-                var callSignatures = instantiateList(getSignaturesOfType(type.target, 0 /* Call */), type.mapper, instantiateSignature);
-                var constructSignatures = instantiateList(getSignaturesOfType(type.target, 1 /* Construct */), type.mapper, instantiateSignature);
+                var callSignatures = instantiateSignatures(getSignaturesOfType(type.target, 0 /* Call */), type.mapper);
+                var constructSignatures = instantiateSignatures(getSignaturesOfType(type.target, 1 /* Construct */), type.mapper);
                 var stringIndexInfo = instantiateIndexInfo(getIndexInfoOfType(type.target, 0 /* String */), type.mapper);
                 var numberIndexInfo = instantiateIndexInfo(getIndexInfoOfType(type.target, 1 /* Number */), type.mapper);
-                setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+                setStructuredTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
             }
             else if (symbol.flags & 2048 /* TypeLiteral */) {
                 var members = symbol.members;
@@ -26722,7 +28085,7 @@ var ts;
                 var constructSignatures = getSignaturesOfSymbol(members["__new"]);
                 var stringIndexInfo = getIndexInfoOfSymbol(symbol, 0 /* String */);
                 var numberIndexInfo = getIndexInfoOfSymbol(symbol, 1 /* Number */);
-                setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+                setStructuredTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
             }
             else {
                 // Combinations of function, class, enum and module
@@ -26738,13 +28101,13 @@ var ts;
                         constructSignatures = getDefaultConstructSignatures(classType);
                     }
                     var baseConstructorType = getBaseConstructorTypeOfClass(classType);
-                    if (baseConstructorType.flags & 2588672 /* ObjectType */) {
+                    if (baseConstructorType.flags & 32768 /* Object */) {
                         members = createSymbolTable(getNamedMembers(members));
                         addInheritedMembers(members, getPropertiesOfObjectType(baseConstructorType));
                     }
                 }
                 var numberIndexInfo = symbol.flags & 384 /* Enum */ ? enumNumberIndexInfo : undefined;
-                setObjectTypeMembers(type, members, emptyArray, constructSignatures, undefined, numberIndexInfo);
+                setStructuredTypeMembers(type, members, emptyArray, constructSignatures, undefined, 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
                 // in the process of resolving (see issue #6072). The temporarily empty signature list
@@ -26754,21 +28117,95 @@ var ts;
                 }
             }
         }
+        /** Resolve the members of a mapped type { [P in K]: T } */
+        function resolveMappedTypeMembers(type) {
+            var members = ts.createMap();
+            var stringIndexInfo;
+            var numberIndexInfo;
+            // In { [P in K]: T }, we refer to P as the type parameter type, K as the constraint type,
+            // and T as the template type.
+            var typeParameter = getTypeParameterFromMappedType(type);
+            var constraintType = getConstraintTypeFromMappedType(type);
+            var templateType = getTemplateTypeFromMappedType(type);
+            var isReadonly = !!type.declaration.readonlyToken;
+            var isOptional = !!type.declaration.questionToken;
+            // First, if the constraint type is a type parameter, obtain the base constraint. Then,
+            // if the key type is a 'keyof X', obtain 'keyof C' where C is the base constraint of X.
+            // Finally, iterate over the constituents of the resulting iteration type.
+            var keyType = constraintType.flags & 16384 /* TypeParameter */ ? getApparentType(constraintType) : constraintType;
+            var iterationType = keyType.flags & 262144 /* Index */ ? getIndexType(getApparentType(keyType.type)) : keyType;
+            forEachType(iterationType, function (t) {
+                // Create a mapper from T to the current iteration type constituent. Then, if the
+                // mapped type is itself an instantiated type, combine the iteration mapper with the
+                // instantiation mapper.
+                var iterationMapper = createUnaryTypeMapper(typeParameter, t);
+                var templateMapper = type.mapper ? combineTypeMappers(type.mapper, iterationMapper) : iterationMapper;
+                var propType = instantiateType(templateType, templateMapper);
+                // If the current iteration type constituent is a literal type, create a property.
+                // Otherwise, for type string create a string index signature and for type number
+                // create a numeric index signature.
+                if (t.flags & (32 /* StringLiteral */ | 64 /* NumberLiteral */ | 256 /* EnumLiteral */)) {
+                    var propName = t.text;
+                    var prop = createSymbol(4 /* Property */ | 67108864 /* Transient */ | (isOptional ? 536870912 /* Optional */ : 0), propName);
+                    prop.type = addOptionality(propType, isOptional);
+                    prop.isReadonly = isReadonly;
+                    members[propName] = prop;
+                }
+                else if (t.flags & 2 /* String */) {
+                    stringIndexInfo = createIndexInfo(propType, isReadonly);
+                }
+                else if (t.flags & 4 /* Number */) {
+                    numberIndexInfo = createIndexInfo(propType, isReadonly);
+                }
+            });
+            // If we created both a string and a numeric string index signature, and if the two index
+            // signatures have identical types, discard the redundant numeric index signature.
+            if (stringIndexInfo && numberIndexInfo && isTypeIdenticalTo(stringIndexInfo.type, numberIndexInfo.type)) {
+                numberIndexInfo = undefined;
+            }
+            setStructuredTypeMembers(type, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
+        }
+        function getTypeParameterFromMappedType(type) {
+            return type.typeParameter ||
+                (type.typeParameter = getDeclaredTypeOfTypeParameter(getSymbolOfNode(type.declaration.typeParameter)));
+        }
+        function getConstraintTypeFromMappedType(type) {
+            return type.constraintType ||
+                (type.constraintType = instantiateType(getConstraintOfTypeParameter(getTypeParameterFromMappedType(type)), type.mapper || identityMapper) || unknownType);
+        }
+        function getTemplateTypeFromMappedType(type) {
+            return type.templateType ||
+                (type.templateType = type.declaration.type ?
+                    instantiateType(getTypeFromTypeNode(type.declaration.type), type.mapper || identityMapper) :
+                    unknownType);
+        }
+        function isGenericMappedType(type) {
+            if (getObjectFlags(type) & 32 /* Mapped */) {
+                var constraintType = getConstraintTypeFromMappedType(type);
+                return !!(constraintType.flags & (16384 /* TypeParameter */ | 262144 /* Index */));
+            }
+            return false;
+        }
         function resolveStructuredTypeMembers(type) {
             if (!type.members) {
-                if (type.flags & 131072 /* Reference */) {
-                    resolveTypeReferenceMembers(type);
+                if (type.flags & 32768 /* Object */) {
+                    if (type.objectFlags & 4 /* Reference */) {
+                        resolveTypeReferenceMembers(type);
+                    }
+                    else if (type.objectFlags & 3 /* ClassOrInterface */) {
+                        resolveClassOrInterfaceMembers(type);
+                    }
+                    else if (type.objectFlags & 16 /* Anonymous */) {
+                        resolveAnonymousTypeMembers(type);
+                    }
+                    else if (type.objectFlags & 32 /* Mapped */) {
+                        resolveMappedTypeMembers(type);
+                    }
                 }
-                else if (type.flags & (32768 /* Class */ | 65536 /* Interface */)) {
-                    resolveClassOrInterfaceMembers(type);
-                }
-                else if (type.flags & 2097152 /* Anonymous */) {
-                    resolveAnonymousTypeMembers(type);
-                }
-                else if (type.flags & 524288 /* Union */) {
+                else if (type.flags & 65536 /* Union */) {
                     resolveUnionTypeMembers(type);
                 }
-                else if (type.flags & 1048576 /* Intersection */) {
+                else if (type.flags & 131072 /* Intersection */) {
                     resolveIntersectionTypeMembers(type);
                 }
             }
@@ -26776,7 +28213,7 @@ var ts;
         }
         /** Return properties of an object type or an empty array for other types */
         function getPropertiesOfObjectType(type) {
-            if (type.flags & 2588672 /* ObjectType */) {
+            if (type.flags & 32768 /* Object */) {
                 return resolveStructuredTypeMembers(type).properties;
             }
             return emptyArray;
@@ -26784,7 +28221,7 @@ var ts;
         /** If the given type is an object type and that type has a property by the given name,
          * return the symbol for that property. Otherwise return undefined. */
         function getPropertyOfObjectType(type, name) {
-            if (type.flags & 2588672 /* ObjectType */) {
+            if (type.flags & 32768 /* Object */) {
                 var resolved = resolveStructuredTypeMembers(type);
                 var symbol = resolved.members[name];
                 if (symbol && symbolIsValue(symbol)) {
@@ -26801,7 +28238,7 @@ var ts;
                 }
                 // The properties of a union type are those that are present in all constituent types, so
                 // we only need to check the properties of the first type
-                if (type.flags & 524288 /* Union */) {
+                if (type.flags & 65536 /* Union */) {
                     break;
                 }
             }
@@ -26821,7 +28258,9 @@ var ts;
         }
         function getPropertiesOfType(type) {
             type = getApparentType(type);
-            return type.flags & 1572864 /* UnionOrIntersection */ ? getPropertiesOfUnionOrIntersectionType(type) : getPropertiesOfObjectType(type);
+            return type.flags & 196608 /* UnionOrIntersection */ ?
+                getPropertiesOfUnionOrIntersectionType(type) :
+                getPropertiesOfObjectType(type);
         }
         /**
          * The apparent type of a type parameter is the base constraint instantiated with the type parameter
@@ -26843,28 +28282,19 @@ var ts;
          * type itself. Note that the apparent type of a union type is the union type itself.
          */
         function getApparentType(type) {
-            if (type.flags & 16384 /* TypeParameter */) {
-                type = getApparentTypeOfTypeParameter(type);
-            }
-            if (type.flags & 34 /* StringLike */) {
-                type = globalStringType;
-            }
-            else if (type.flags & 340 /* NumberLike */) {
-                type = globalNumberType;
-            }
-            else if (type.flags & 136 /* BooleanLike */) {
-                type = globalBooleanType;
-            }
-            else if (type.flags & 512 /* ESSymbol */) {
-                type = getGlobalESSymbolType();
-            }
-            return type;
+            var t = type.flags & 16384 /* TypeParameter */ ? getApparentTypeOfTypeParameter(type) : type;
+            return t.flags & 34 /* StringLike */ ? globalStringType :
+                t.flags & 340 /* NumberLike */ ? globalNumberType :
+                    t.flags & 136 /* BooleanLike */ ? globalBooleanType :
+                        t.flags & 512 /* ESSymbol */ ? getGlobalESSymbolType() :
+                            t.flags & 262144 /* Index */ ? stringOrNumberType :
+                                t;
         }
         function createUnionOrIntersectionProperty(containingType, name) {
             var types = containingType.types;
             var props;
             // Flags we want to propagate to the result if they exist in all source symbols
-            var commonFlags = (containingType.flags & 1048576 /* Intersection */) ? 536870912 /* Optional */ : 0 /* None */;
+            var commonFlags = (containingType.flags & 131072 /* Intersection */) ? 536870912 /* Optional */ : 0 /* None */;
             var isReadonly = false;
             var isPartial = false;
             for (var _i = 0, types_2 = types; _i < types_2.length; _i++) {
@@ -26884,7 +28314,7 @@ var ts;
                             isReadonly = true;
                         }
                     }
-                    else if (containingType.flags & 524288 /* Union */) {
+                    else if (containingType.flags & 65536 /* Union */) {
                         isPartial = true;
                     }
                 }
@@ -26919,7 +28349,7 @@ var ts;
             result.isPartial = isPartial;
             result.declarations = declarations;
             result.isReadonly = isReadonly;
-            result.type = containingType.flags & 524288 /* Union */ ? getUnionType(propTypes) : getIntersectionType(propTypes);
+            result.type = containingType.flags & 65536 /* Union */ ? getUnionType(propTypes) : getIntersectionType(propTypes);
             return result;
         }
         // Return the symbol for a given property in a union or intersection type, or undefined if the property
@@ -26953,7 +28383,7 @@ var ts;
          */
         function getPropertyOfType(type, name) {
             type = getApparentType(type);
-            if (type.flags & 2588672 /* ObjectType */) {
+            if (type.flags & 32768 /* Object */) {
                 var resolved = resolveStructuredTypeMembers(type);
                 var symbol = resolved.members[name];
                 if (symbol && symbolIsValue(symbol)) {
@@ -26967,13 +28397,13 @@ var ts;
                 }
                 return getPropertyOfObjectType(globalObjectType, name);
             }
-            if (type.flags & 1572864 /* UnionOrIntersection */) {
+            if (type.flags & 196608 /* UnionOrIntersection */) {
                 return getPropertyOfUnionOrIntersectionType(type, name);
             }
             return undefined;
         }
         function getSignaturesOfStructuredType(type, kind) {
-            if (type.flags & 4161536 /* StructuredType */) {
+            if (type.flags & 229376 /* StructuredType */) {
                 var resolved = resolveStructuredTypeMembers(type);
                 return kind === 0 /* Call */ ? resolved.callSignatures : resolved.constructSignatures;
             }
@@ -26987,7 +28417,7 @@ var ts;
             return getSignaturesOfStructuredType(getApparentType(type), kind);
         }
         function getIndexInfoOfStructuredType(type, kind) {
-            if (type.flags & 4161536 /* StructuredType */) {
+            if (type.flags & 229376 /* StructuredType */) {
                 var resolved = resolveStructuredTypeMembers(type);
                 return kind === 0 /* String */ ? resolved.stringIndexInfo : resolved.numberIndexInfo;
             }
@@ -27022,7 +28452,7 @@ var ts;
             return undefined;
         }
         function getTypeParametersFromJSDocTemplate(declaration) {
-            if (declaration.flags & 1048576 /* JavaScriptFile */) {
+            if (declaration.flags & 2097152 /* JavaScriptFile */) {
                 var templateTag = ts.getJSDocTemplateTag(declaration);
                 if (templateTag) {
                     return getTypeParametersFromDeclaration(templateTag.typeParameters);
@@ -27052,8 +28482,8 @@ var ts;
             return result;
         }
         function isJSDocOptionalParameter(node) {
-            if (node.flags & 1048576 /* JavaScriptFile */) {
-                if (node.type && node.type.kind === 268 /* JSDocOptionalType */) {
+            if (node.flags & 2097152 /* JavaScriptFile */) {
+                if (node.type && node.type.kind === 273 /* JSDocOptionalType */) {
                     return true;
                 }
                 var paramTag = ts.getCorrespondingJSDocParameterTag(node);
@@ -27062,11 +28492,19 @@ var ts;
                         return true;
                     }
                     if (paramTag.typeExpression) {
-                        return paramTag.typeExpression.type.kind === 268 /* JSDocOptionalType */;
+                        return paramTag.typeExpression.type.kind === 273 /* JSDocOptionalType */;
                     }
                 }
             }
         }
+        function tryFindAmbientModule(moduleName, withAugmentations) {
+            if (ts.isExternalModuleNameRelative(moduleName)) {
+                return undefined;
+            }
+            var symbol = getSymbol(globals, "\"" + moduleName + "\"", 512 /* ValueModule */);
+            // merged symbol is module declaration symbol combined with all augmentations
+            return symbol && withAugmentations ? getMergedSymbol(symbol) : symbol;
+        }
         function isOptionalParameter(node) {
             if (ts.hasQuestionToken(node) || isJSDocOptionalParameter(node)) {
                 return true;
@@ -27124,7 +28562,7 @@ var ts;
                     else {
                         parameters.push(paramSymbol);
                     }
-                    if (param.type && param.type.kind === 167 /* LiteralType */) {
+                    if (param.type && param.type.kind === 171 /* LiteralType */) {
                         hasLiteralTypes = true;
                     }
                     if (param.initializer || param.questionToken || param.dotDotDotToken || isJSDocOptionalParameter(param)) {
@@ -27138,10 +28576,10 @@ 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 === 150 /* GetAccessor */ || declaration.kind === 151 /* SetAccessor */) &&
+                if ((declaration.kind === 151 /* GetAccessor */ || declaration.kind === 152 /* SetAccessor */) &&
                     !ts.hasDynamicName(declaration) &&
                     (!hasThisParameter || !thisParameter)) {
-                    var otherKind = declaration.kind === 150 /* GetAccessor */ ? 151 /* SetAccessor */ : 150 /* GetAccessor */;
+                    var otherKind = declaration.kind === 151 /* GetAccessor */ ? 152 /* SetAccessor */ : 151 /* GetAccessor */;
                     var other = ts.getDeclarationOfKind(declaration.symbol, otherKind);
                     if (other) {
                         thisParameter = getAnnotatedAccessorThisParameter(other);
@@ -27153,14 +28591,14 @@ var ts;
                 if (isJSConstructSignature) {
                     minArgumentCount--;
                 }
-                var classType = declaration.kind === 149 /* Constructor */ ?
+                var classType = declaration.kind === 150 /* Constructor */ ?
                     getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol))
                     : undefined;
                 var typeParameters = classType ? classType.localTypeParameters :
                     declaration.typeParameters ? getTypeParametersFromDeclaration(declaration.typeParameters) :
                         getTypeParametersFromJSDocTemplate(declaration);
                 var returnType = getSignatureReturnTypeFromDeclaration(declaration, isJSConstructSignature, classType);
-                var typePredicate = declaration.type && declaration.type.kind === 155 /* TypePredicate */ ?
+                var typePredicate = declaration.type && declaration.type.kind === 156 /* TypePredicate */ ?
                     createTypePredicateFromTypePredicateNode(declaration.type) :
                     undefined;
                 links.resolvedSignature = createSignature(declaration, typeParameters, thisParameter, parameters, returnType, typePredicate, minArgumentCount, ts.hasRestParameter(declaration), hasLiteralTypes);
@@ -27177,7 +28615,7 @@ var ts;
             else if (declaration.type) {
                 return getTypeFromTypeNode(declaration.type);
             }
-            if (declaration.flags & 1048576 /* JavaScriptFile */) {
+            if (declaration.flags & 2097152 /* JavaScriptFile */) {
                 var type = getReturnTypeFromJSDocComment(declaration);
                 if (type && type !== unknownType) {
                     return type;
@@ -27185,8 +28623,8 @@ var ts;
             }
             // TypeScript 1.0 spec (April 2014):
             // If only one accessor includes a type annotation, the other behaves as if it had the same type annotation.
-            if (declaration.kind === 150 /* GetAccessor */ && !ts.hasDynamicName(declaration)) {
-                var setter = ts.getDeclarationOfKind(declaration.symbol, 151 /* SetAccessor */);
+            if (declaration.kind === 151 /* GetAccessor */ && !ts.hasDynamicName(declaration)) {
+                var setter = ts.getDeclarationOfKind(declaration.symbol, 152 /* SetAccessor */);
                 return getAnnotatedAccessorType(setter);
             }
             if (ts.nodeIsMissing(declaration.body)) {
@@ -27200,20 +28638,20 @@ var ts;
             for (var i = 0, len = symbol.declarations.length; i < len; i++) {
                 var node = symbol.declarations[i];
                 switch (node.kind) {
-                    case 157 /* FunctionType */:
-                    case 158 /* ConstructorType */:
-                    case 221 /* FunctionDeclaration */:
-                    case 148 /* MethodDeclaration */:
-                    case 147 /* MethodSignature */:
-                    case 149 /* Constructor */:
-                    case 152 /* CallSignature */:
-                    case 153 /* ConstructSignature */:
-                    case 154 /* IndexSignature */:
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
-                    case 180 /* FunctionExpression */:
-                    case 181 /* ArrowFunction */:
-                    case 269 /* JSDocFunctionType */:
+                    case 158 /* FunctionType */:
+                    case 159 /* ConstructorType */:
+                    case 225 /* FunctionDeclaration */:
+                    case 149 /* MethodDeclaration */:
+                    case 148 /* MethodSignature */:
+                    case 150 /* Constructor */:
+                    case 153 /* CallSignature */:
+                    case 154 /* ConstructSignature */:
+                    case 155 /* IndexSignature */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* SetAccessor */:
+                    case 184 /* FunctionExpression */:
+                    case 185 /* ArrowFunction */:
+                    case 274 /* JSDocFunctionType */:
                         // Don't include signature if node is the implementation of an overloaded function. A node is considered
                         // an implementation node if it has a body and the previous node is of the same kind and immediately
                         // precedes the implementation node (i.e. has the same parent and ends where the implementation starts).
@@ -27277,13 +28715,18 @@ var ts;
         function getRestTypeOfSignature(signature) {
             if (signature.hasRestParameter) {
                 var type = getTypeOfSymbol(ts.lastOrUndefined(signature.parameters));
-                if (type.flags & 131072 /* Reference */ && type.target === globalArrayType) {
+                if (getObjectFlags(type) & 4 /* Reference */ && type.target === globalArrayType) {
                     return type.typeArguments[0];
                 }
             }
             return anyType;
         }
         function getSignatureInstantiation(signature, typeArguments) {
+            var instantiations = signature.instantiations || (signature.instantiations = ts.createMap());
+            var id = getTypeListId(typeArguments);
+            return instantiations[id] || (instantiations[id] = createSignatureInstantiation(signature, typeArguments));
+        }
+        function createSignatureInstantiation(signature, typeArguments) {
             return instantiateSignature(signature, createTypeMapper(signature.typeParameters, typeArguments), /*eraseTypeParameters*/ true);
         }
         function getErasedSignature(signature) {
@@ -27300,8 +28743,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 === 149 /* Constructor */ || signature.declaration.kind === 153 /* ConstructSignature */;
-                var type = createObjectType(2097152 /* Anonymous */);
+                var isConstructor = signature.declaration.kind === 150 /* Constructor */ || signature.declaration.kind === 154 /* ConstructSignature */;
+                var type = createObjectType(16 /* Anonymous */);
                 type.members = emptySymbols;
                 type.properties = emptyArray;
                 type.callSignatures = !isConstructor ? [signature] : emptyArray;
@@ -27314,7 +28757,7 @@ var ts;
             return symbol.members["__index"];
         }
         function getIndexDeclarationOfSymbol(symbol, kind) {
-            var syntaxKind = kind === 1 /* Number */ ? 131 /* NumberKeyword */ : 133 /* StringKeyword */;
+            var syntaxKind = kind === 1 /* Number */ ? 132 /* NumberKeyword */ : 134 /* StringKeyword */;
             var indexSymbol = getIndexSymbol(symbol);
             if (indexSymbol) {
                 for (var _i = 0, _a = indexSymbol.declarations; _i < _a.length; _i++) {
@@ -27341,7 +28784,7 @@ var ts;
             return undefined;
         }
         function getConstraintDeclaration(type) {
-            return ts.getDeclarationOfKind(type.symbol, 142 /* TypeParameter */).constraint;
+            return ts.getDeclarationOfKind(type.symbol, 143 /* TypeParameter */).constraint;
         }
         function hasConstraintReferenceTo(type, target) {
             var checked;
@@ -27374,7 +28817,7 @@ var ts;
             return typeParameter.constraint === noConstraintType ? undefined : typeParameter.constraint;
         }
         function getParentSymbolOfTypeParameter(typeParameter) {
-            return getSymbolOfNode(ts.getDeclarationOfKind(typeParameter.symbol, 142 /* TypeParameter */).parent);
+            return getSymbolOfNode(ts.getDeclarationOfKind(typeParameter.symbol, 143 /* TypeParameter */).parent);
         }
         function getTypeListId(types) {
             var result = "";
@@ -27411,22 +28854,23 @@ var ts;
                     result |= type.flags;
                 }
             }
-            return result & 234881024 /* PropagatingFlags */;
+            return result & 14680064 /* PropagatingFlags */;
         }
         function createTypeReference(target, typeArguments) {
             var id = getTypeListId(typeArguments);
             var type = target.instantiations[id];
             if (!type) {
-                var propagatedFlags = typeArguments ? getPropagatingFlagsOfTypes(typeArguments, /*excludeKinds*/ 0) : 0;
-                var flags = 131072 /* Reference */ | propagatedFlags;
-                type = target.instantiations[id] = createObjectType(flags, target.symbol);
+                type = target.instantiations[id] = createObjectType(4 /* Reference */, target.symbol);
+                type.flags |= typeArguments ? getPropagatingFlagsOfTypes(typeArguments, /*excludeKinds*/ 0) : 0;
                 type.target = target;
                 type.typeArguments = typeArguments;
             }
             return type;
         }
         function cloneTypeReference(source) {
-            var type = createObjectType(source.flags, source.symbol);
+            var type = createType(source.flags);
+            type.symbol = source.symbol;
+            type.objectFlags = source.objectFlags;
             type.target = source.target;
             type.typeArguments = source.typeArguments;
             return type;
@@ -27446,7 +28890,7 @@ var ts;
                 // In a type reference, the outer type parameters of the referenced class or interface are automatically
                 // supplied as type arguments and the type reference only specifies arguments for the local type parameters
                 // of the class or interface.
-                return createTypeReference(type, ts.concatenate(type.outerTypeParameters, ts.map(node.typeArguments, getTypeFromTypeNodeNoAlias)));
+                return createTypeReference(type, ts.concatenate(type.outerTypeParameters, ts.map(node.typeArguments, getTypeFromTypeNode)));
             }
             if (node.typeArguments) {
                 error(node, ts.Diagnostics.Type_0_is_not_generic, typeToString(type));
@@ -27454,21 +28898,26 @@ var ts;
             }
             return type;
         }
+        function getTypeAliasInstantiation(symbol, typeArguments) {
+            var type = getDeclaredTypeOfSymbol(symbol);
+            var links = getSymbolLinks(symbol);
+            var typeParameters = links.typeParameters;
+            var id = getTypeListId(typeArguments);
+            return links.instantiations[id] || (links.instantiations[id] = instantiateTypeNoAlias(type, createTypeMapper(typeParameters, typeArguments)));
+        }
         // Get type from reference to type alias. When a type alias is generic, the declared type of the type alias may include
         // references to the type parameters of the alias. We replace those with the actual type arguments by instantiating the
         // declared type. Instantiations are cached using the type identities of the type arguments as the key.
         function getTypeFromTypeAliasReference(node, symbol) {
             var type = getDeclaredTypeOfSymbol(symbol);
-            var links = getSymbolLinks(symbol);
-            var typeParameters = links.typeParameters;
+            var typeParameters = getSymbolLinks(symbol).typeParameters;
             if (typeParameters) {
                 if (!node.typeArguments || node.typeArguments.length !== typeParameters.length) {
                     error(node, ts.Diagnostics.Generic_type_0_requires_1_type_argument_s, symbolToString(symbol), typeParameters.length);
                     return unknownType;
                 }
-                var typeArguments = ts.map(node.typeArguments, getTypeFromTypeNodeNoAlias);
-                var id = getTypeListId(typeArguments);
-                return links.instantiations[id] || (links.instantiations[id] = instantiateType(type, createTypeMapper(typeParameters, typeArguments)));
+                var typeArguments = ts.map(node.typeArguments, getTypeFromTypeNode);
+                return getTypeAliasInstantiation(symbol, typeArguments);
             }
             if (node.typeArguments) {
                 error(node, ts.Diagnostics.Type_0_is_not_generic, symbolToString(symbol));
@@ -27486,11 +28935,11 @@ var ts;
         }
         function getTypeReferenceName(node) {
             switch (node.kind) {
-                case 156 /* TypeReference */:
+                case 157 /* TypeReference */:
                     return node.typeName;
-                case 267 /* JSDocTypeReference */:
+                case 272 /* JSDocTypeReference */:
                     return node.name;
-                case 195 /* ExpressionWithTypeArguments */:
+                case 199 /* ExpressionWithTypeArguments */:
                     // We only support expressions that are simple qualified names. For other
                     // expressions this produces undefined.
                     var expr = node.expression;
@@ -27516,7 +28965,7 @@ var ts;
             if (symbol.flags & 524288 /* TypeAlias */) {
                 return getTypeFromTypeAliasReference(node, symbol);
             }
-            if (symbol.flags & 107455 /* Value */ && node.kind === 267 /* JSDocTypeReference */) {
+            if (symbol.flags & 107455 /* Value */ && node.kind === 272 /* JSDocTypeReference */) {
                 // A JSDocTypeReference may have resolved to a value (as opposed to a type). In
                 // that case, the type of this reference is just the type of the value we resolved
                 // to.
@@ -27529,14 +28978,14 @@ var ts;
             if (!links.resolvedType) {
                 var symbol = void 0;
                 var type = void 0;
-                if (node.kind === 267 /* JSDocTypeReference */) {
+                if (node.kind === 272 /* JSDocTypeReference */) {
                     var typeReferenceName = getTypeReferenceName(node);
                     symbol = resolveTypeReferenceName(typeReferenceName);
                     type = getTypeReferenceType(node, symbol);
                 }
                 else {
                     // We only support expressions that are simple qualified names. For other expressions this produces undefined.
-                    var typeNameOrExpression = node.kind === 156 /* TypeReference */
+                    var typeNameOrExpression = node.kind === 157 /* TypeReference */
                         ? node.typeName
                         : ts.isEntityNameExpression(node.expression)
                             ? node.expression
@@ -27571,9 +29020,9 @@ var ts;
                 for (var _i = 0, declarations_3 = declarations; _i < declarations_3.length; _i++) {
                     var declaration = declarations_3[_i];
                     switch (declaration.kind) {
-                        case 222 /* ClassDeclaration */:
-                        case 223 /* InterfaceDeclaration */:
-                        case 225 /* EnumDeclaration */:
+                        case 226 /* ClassDeclaration */:
+                        case 227 /* InterfaceDeclaration */:
+                        case 229 /* EnumDeclaration */:
                             return declaration;
                     }
                 }
@@ -27582,7 +29031,7 @@ var ts;
                 return arity ? emptyGenericType : emptyObjectType;
             }
             var type = getDeclaredTypeOfSymbol(symbol);
-            if (!(type.flags & 2588672 /* ObjectType */)) {
+            if (!(type.flags & 32768 /* Object */)) {
                 error(getTypeDeclaration(symbol), ts.Diagnostics.Global_type_0_must_be_a_class_or_interface_type, symbol.name);
                 return arity ? emptyGenericType : emptyObjectType;
             }
@@ -27662,7 +29111,7 @@ var ts;
                 property.type = typeParameter;
                 properties.push(property);
             }
-            var type = createObjectType(262144 /* Tuple */ | 131072 /* Reference */);
+            var type = createObjectType(8 /* Tuple */ | 4 /* Reference */);
             type.typeParameters = typeParameters;
             type.outerTypeParameters = undefined;
             type.localTypeParameters = typeParameters;
@@ -27689,7 +29138,7 @@ var ts;
         function getTypeFromTupleTypeNode(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
-                links.resolvedType = createTupleType(ts.map(node.elementTypes, getTypeFromTypeNodeNoAlias));
+                links.resolvedType = createTupleType(ts.map(node.elementTypes, getTypeFromTypeNode));
             }
             return links.resolvedType;
         }
@@ -27717,7 +29166,7 @@ var ts;
         }
         function addTypeToUnion(typeSet, type) {
             var flags = type.flags;
-            if (flags & 524288 /* Union */) {
+            if (flags & 65536 /* Union */) {
                 addTypesToUnion(typeSet, type.types);
             }
             else if (flags & 1 /* Any */) {
@@ -27728,7 +29177,7 @@ var ts;
                     typeSet.containsUndefined = true;
                 if (flags & 4096 /* Null */)
                     typeSet.containsNull = true;
-                if (!(flags & 33554432 /* ContainsWideningType */))
+                if (!(flags & 2097152 /* ContainsWideningType */))
                     typeSet.containsNonWideningType = true;
             }
             else if (!(flags & 8192 /* Never */)) {
@@ -27741,7 +29190,8 @@ var ts;
                 var len = typeSet.length;
                 var index = len && type.id > typeSet[len - 1].id ? ~len : binarySearchTypes(typeSet, type);
                 if (index < 0) {
-                    if (!(flags & 2097152 /* Anonymous */ && type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */) && containsIdenticalType(typeSet, type))) {
+                    if (!(flags & 32768 /* Object */ && type.objectFlags & 16 /* Anonymous */ &&
+                        type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */) && containsIdenticalType(typeSet, type))) {
                         typeSet.splice(~index, 0, type);
                     }
                 }
@@ -27805,7 +29255,7 @@ var ts;
                 var t = types[i];
                 var remove = t.flags & 32 /* StringLiteral */ && types.containsString ||
                     t.flags & 64 /* NumberLiteral */ && types.containsNumber ||
-                    t.flags & 96 /* StringOrNumberLiteral */ && t.flags & 16777216 /* FreshLiteral */ && containsType(types, t.regularType);
+                    t.flags & 96 /* StringOrNumberLiteral */ && t.flags & 1048576 /* FreshLiteral */ && containsType(types, t.regularType);
                 if (remove) {
                     ts.orderedRemoveItemAt(types, i);
                 }
@@ -27855,22 +29305,22 @@ var ts;
             var type = unionTypes[id];
             if (!type) {
                 var propagatedFlags = getPropagatingFlagsOfTypes(types, /*excludeKinds*/ 6144 /* Nullable */);
-                type = unionTypes[id] = createObjectType(524288 /* Union */ | propagatedFlags);
+                type = unionTypes[id] = createType(65536 /* Union */ | propagatedFlags);
                 type.types = types;
                 type.aliasSymbol = aliasSymbol;
                 type.aliasTypeArguments = aliasTypeArguments;
             }
             return type;
         }
-        function getTypeFromUnionTypeNode(node, aliasSymbol, aliasTypeArguments) {
+        function getTypeFromUnionTypeNode(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
-                links.resolvedType = getUnionType(ts.map(node.types, getTypeFromTypeNodeNoAlias), /*subtypeReduction*/ false, aliasSymbol, aliasTypeArguments);
+                links.resolvedType = getUnionType(ts.map(node.types, getTypeFromTypeNode), /*subtypeReduction*/ false, getAliasSymbolForTypeNode(node), getAliasTypeArgumentsForTypeNode(node));
             }
             return links.resolvedType;
         }
         function addTypeToIntersection(typeSet, type) {
-            if (type.flags & 1048576 /* Intersection */) {
+            if (type.flags & 131072 /* Intersection */) {
                 addTypesToIntersection(typeSet, type.types);
             }
             else if (type.flags & 1 /* Any */) {
@@ -27888,6 +29338,11 @@ var ts;
                 addTypeToIntersection(typeSet, type);
             }
         }
+        // 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
+        // effectively ensure that union types are always at the top level in type representations.
+        //
         // We do not perform structural deduplication on intersection types. Intersection types are created only by the &
         // type operator and we can't reduce those because we want to support recursive intersection types. For example,
         // a type alias of the form "type List<T> = T & { next: List<T> }" cannot be reduced during its declaration.
@@ -27897,6 +29352,18 @@ var ts;
             if (types.length === 0) {
                 return emptyObjectType;
             }
+            var _loop_2 = function (i) {
+                var type_1 = types[i];
+                if (type_1.flags & 65536 /* Union */) {
+                    return { value: getUnionType(ts.map(type_1.types, function (t) { return getIntersectionType(ts.replaceElement(types, i, t)); }), 
+                        /*subtypeReduction*/ false, aliasSymbol, aliasTypeArguments) };
+                }
+            };
+            for (var i = 0; i < types.length; i++) {
+                var state_2 = _loop_2(i);
+                if (typeof state_2 === "object")
+                    return state_2.value;
+            }
             var typeSet = [];
             addTypesToIntersection(typeSet, types);
             if (typeSet.containsAny) {
@@ -27909,40 +29376,256 @@ var ts;
             var type = intersectionTypes[id];
             if (!type) {
                 var propagatedFlags = getPropagatingFlagsOfTypes(typeSet, /*excludeKinds*/ 6144 /* Nullable */);
-                type = intersectionTypes[id] = createObjectType(1048576 /* Intersection */ | propagatedFlags);
+                type = intersectionTypes[id] = createType(131072 /* Intersection */ | propagatedFlags);
                 type.types = typeSet;
                 type.aliasSymbol = aliasSymbol;
                 type.aliasTypeArguments = aliasTypeArguments;
             }
             return type;
         }
-        function getTypeFromIntersectionTypeNode(node, aliasSymbol, aliasTypeArguments) {
+        function getTypeFromIntersectionTypeNode(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
-                links.resolvedType = getIntersectionType(ts.map(node.types, getTypeFromTypeNodeNoAlias), aliasSymbol, aliasTypeArguments);
+                links.resolvedType = getIntersectionType(ts.map(node.types, getTypeFromTypeNode), getAliasSymbolForTypeNode(node), getAliasTypeArgumentsForTypeNode(node));
             }
             return links.resolvedType;
         }
-        function getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node, aliasSymbol, aliasTypeArguments) {
+        function getIndexTypeForTypeParameter(type) {
+            if (!type.resolvedIndexType) {
+                type.resolvedIndexType = createType(262144 /* Index */);
+                type.resolvedIndexType.type = type;
+            }
+            return type.resolvedIndexType;
+        }
+        function getLiteralTypeFromPropertyName(prop) {
+            return getDeclarationModifierFlagsFromSymbol(prop) & 24 /* NonPublicAccessibilityModifier */ || ts.startsWith(prop.name, "__@") ?
+                neverType :
+                getLiteralTypeForText(32 /* StringLiteral */, ts.unescapeIdentifier(prop.name));
+        }
+        function getLiteralTypeFromPropertyNames(type) {
+            return getUnionType(ts.map(getPropertiesOfType(type), getLiteralTypeFromPropertyName));
+        }
+        function getIndexType(type) {
+            return type.flags & 16384 /* TypeParameter */ ? getIndexTypeForTypeParameter(type) :
+                type.flags & 1 /* Any */ || getIndexInfoOfType(type, 0 /* String */) ? stringOrNumberType :
+                    getIndexInfoOfType(type, 1 /* Number */) ? getUnionType([numberType, getLiteralTypeFromPropertyNames(type)]) :
+                        getLiteralTypeFromPropertyNames(type);
+        }
+        function getTypeFromTypeOperatorNode(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
-                // Deferred resolution of members is handled by resolveObjectTypeMembers
-                var type = createObjectType(2097152 /* Anonymous */, node.symbol);
-                type.aliasSymbol = aliasSymbol;
-                type.aliasTypeArguments = aliasTypeArguments;
+                links.resolvedType = getIndexType(getTypeFromTypeNode(node.type));
+            }
+            return links.resolvedType;
+        }
+        function createIndexedAccessType(objectType, indexType) {
+            var type = createType(524288 /* IndexedAccess */);
+            type.objectType = objectType;
+            type.indexType = indexType;
+            return type;
+        }
+        function getIndexedAccessTypeForTypeParameter(objectType, indexType) {
+            var indexedAccessTypes = indexType.resolvedIndexedAccessTypes || (indexType.resolvedIndexedAccessTypes = []);
+            return indexedAccessTypes[objectType.id] || (indexedAccessTypes[objectType.id] = createIndexedAccessType(objectType, indexType));
+        }
+        function getPropertyTypeForIndexType(objectType, indexType, accessNode, cacheSymbol) {
+            var accessExpression = accessNode && accessNode.kind === 178 /* ElementAccessExpression */ ? accessNode : undefined;
+            var propName = indexType.flags & (32 /* StringLiteral */ | 64 /* NumberLiteral */ | 256 /* EnumLiteral */) ?
+                indexType.text :
+                accessExpression && checkThatExpressionIsProperSymbolReference(accessExpression.argumentExpression, indexType, /*reportError*/ false) ?
+                    ts.getPropertyNameForKnownSymbolName(accessExpression.argumentExpression.name.text) :
+                    undefined;
+            if (propName) {
+                var prop = getPropertyOfType(objectType, propName);
+                if (prop) {
+                    if (accessExpression) {
+                        if (ts.isAssignmentTarget(accessExpression) && (isReferenceToReadonlyEntity(accessExpression, prop) || isReferenceThroughNamespaceImport(accessExpression))) {
+                            error(accessExpression.argumentExpression, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_constant_or_a_read_only_property, symbolToString(prop));
+                            return unknownType;
+                        }
+                        if (cacheSymbol) {
+                            getNodeLinks(accessNode).resolvedSymbol = prop;
+                        }
+                    }
+                    return getTypeOfSymbol(prop);
+                }
+            }
+            if (isTypeAnyOrAllConstituentTypesHaveKind(indexType, 34 /* StringLike */ | 340 /* NumberLike */ | 512 /* ESSymbol */)) {
+                if (isTypeAny(objectType)) {
+                    return anyType;
+                }
+                var indexInfo = isTypeAnyOrAllConstituentTypesHaveKind(indexType, 340 /* NumberLike */) && getIndexInfoOfType(objectType, 1 /* Number */) ||
+                    getIndexInfoOfType(objectType, 0 /* String */) ||
+                    undefined;
+                if (indexInfo) {
+                    if (accessExpression && ts.isAssignmentTarget(accessExpression) && indexInfo.isReadonly) {
+                        error(accessExpression, ts.Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
+                        return unknownType;
+                    }
+                    return indexInfo.type;
+                }
+                if (accessExpression && !isConstEnumObjectType(objectType)) {
+                    if (compilerOptions.noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors) {
+                        if (getIndexTypeOfType(objectType, 1 /* Number */)) {
+                            error(accessExpression.argumentExpression, ts.Diagnostics.Element_implicitly_has_an_any_type_because_index_expression_is_not_of_type_number);
+                        }
+                        else {
+                            error(accessExpression, ts.Diagnostics.Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature, typeToString(objectType));
+                        }
+                    }
+                    return anyType;
+                }
+            }
+            if (accessNode) {
+                var indexNode = accessNode.kind === 178 /* ElementAccessExpression */ ? accessNode.argumentExpression : accessNode.indexType;
+                if (indexType.flags & (32 /* StringLiteral */ | 64 /* NumberLiteral */)) {
+                    error(indexNode, ts.Diagnostics.Property_0_does_not_exist_on_type_1, indexType.text, typeToString(objectType));
+                }
+                else if (indexType.flags & (2 /* String */ | 4 /* Number */)) {
+                    error(indexNode, ts.Diagnostics.Type_0_has_no_matching_index_signature_for_type_1, typeToString(objectType), typeToString(indexType));
+                }
+                else {
+                    error(indexNode, ts.Diagnostics.Type_0_cannot_be_used_as_an_index_type, typeToString(indexType));
+                }
+            }
+            return unknownType;
+        }
+        function getIndexedAccessType(objectType, indexType, accessNode) {
+            if (indexType.flags & 16384 /* TypeParameter */) {
+                if (accessNode && !isTypeAssignableTo(getConstraintOfTypeParameter(indexType) || emptyObjectType, getIndexType(objectType))) {
+                    error(accessNode, ts.Diagnostics.Type_0_is_not_constrained_to_keyof_1, typeToString(indexType), typeToString(objectType));
+                    return unknownType;
+                }
+                return getIndexedAccessTypeForTypeParameter(objectType, indexType);
+            }
+            var apparentType = getApparentType(objectType);
+            if (indexType.flags & 65536 /* Union */ && !(indexType.flags & 8190 /* Primitive */)) {
+                var propTypes = [];
+                for (var _i = 0, _a = indexType.types; _i < _a.length; _i++) {
+                    var t = _a[_i];
+                    var propType = getPropertyTypeForIndexType(apparentType, t, accessNode, /*cacheSymbol*/ false);
+                    if (propType === unknownType) {
+                        return unknownType;
+                    }
+                    propTypes.push(propType);
+                }
+                return getUnionType(propTypes);
+            }
+            return getPropertyTypeForIndexType(apparentType, indexType, accessNode, /*cacheSymbol*/ true);
+        }
+        function getTypeFromIndexedAccessTypeNode(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                links.resolvedType = getIndexedAccessType(getTypeFromTypeNode(node.objectType), getTypeFromTypeNode(node.indexType), node);
+            }
+            return links.resolvedType;
+        }
+        function getTypeFromMappedTypeNode(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                var type = createObjectType(32 /* Mapped */, node.symbol);
+                type.declaration = node;
+                type.aliasSymbol = getAliasSymbolForTypeNode(node);
+                type.aliasTypeArguments = getAliasTypeArgumentsForTypeNode(node);
                 links.resolvedType = type;
             }
             return links.resolvedType;
         }
+        function getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                // Deferred resolution of members is handled by resolveObjectTypeMembers
+                var aliasSymbol = getAliasSymbolForTypeNode(node);
+                if (ts.isEmpty(node.symbol.members) && !aliasSymbol) {
+                    links.resolvedType = emptyTypeLiteralType;
+                }
+                else {
+                    var type = createObjectType(16 /* Anonymous */, node.symbol);
+                    type.aliasSymbol = aliasSymbol;
+                    type.aliasTypeArguments = getAliasTypeArgumentsForTypeNode(node);
+                    links.resolvedType = type;
+                }
+            }
+            return links.resolvedType;
+        }
+        function getAliasSymbolForTypeNode(node) {
+            return node.parent.kind === 228 /* TypeAliasDeclaration */ ? getSymbolOfNode(node.parent) : undefined;
+        }
+        function getAliasTypeArgumentsForTypeNode(node) {
+            var symbol = getAliasSymbolForTypeNode(node);
+            return symbol ? getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol) : undefined;
+        }
+        /**
+         * Since the source of spread types are object literals, which are not binary,
+         * this function should be called in a left folding style, with left = previous result of getSpreadType
+         * and right = the new element to be spread.
+         */
+        function getSpreadType(left, right, isFromObjectLiteral) {
+            ts.Debug.assert(!!(left.flags & (32768 /* Object */ | 1 /* Any */)) && !!(right.flags & (32768 /* Object */ | 1 /* Any */)), "Only object types may be spread.");
+            if (left.flags & 1 /* Any */ || right.flags & 1 /* Any */) {
+                return anyType;
+            }
+            var members = ts.createMap();
+            var skippedPrivateMembers = ts.createMap();
+            var stringIndexInfo;
+            var numberIndexInfo;
+            if (left === emptyObjectType) {
+                // for the first spread element, left === emptyObjectType, so take the right's string indexer
+                stringIndexInfo = getIndexInfoOfType(right, 0 /* String */);
+                numberIndexInfo = getIndexInfoOfType(right, 1 /* Number */);
+            }
+            else {
+                stringIndexInfo = unionSpreadIndexInfos(getIndexInfoOfType(left, 0 /* String */), getIndexInfoOfType(right, 0 /* String */));
+                numberIndexInfo = unionSpreadIndexInfos(getIndexInfoOfType(left, 1 /* Number */), getIndexInfoOfType(right, 1 /* Number */));
+            }
+            for (var _i = 0, _a = getPropertiesOfType(right); _i < _a.length; _i++) {
+                var rightProp = _a[_i];
+                // we approximate own properties as non-methods plus methods that are inside the object literal
+                var isOwnProperty = !(rightProp.flags & 8192 /* Method */) || isFromObjectLiteral;
+                var isSetterWithoutGetter = rightProp.flags & 65536 /* SetAccessor */ && !(rightProp.flags & 32768 /* GetAccessor */);
+                if (getDeclarationModifierFlagsFromSymbol(rightProp) & (8 /* Private */ | 16 /* Protected */)) {
+                    skippedPrivateMembers[rightProp.name] = true;
+                }
+                else if (isOwnProperty && !isSetterWithoutGetter) {
+                    members[rightProp.name] = rightProp;
+                }
+            }
+            for (var _b = 0, _c = getPropertiesOfType(left); _b < _c.length; _b++) {
+                var leftProp = _c[_b];
+                if (leftProp.flags & 65536 /* SetAccessor */ && !(leftProp.flags & 32768 /* GetAccessor */)
+                    || leftProp.name in skippedPrivateMembers) {
+                    continue;
+                }
+                if (leftProp.name in members) {
+                    var rightProp = members[leftProp.name];
+                    var rightType = getTypeOfSymbol(rightProp);
+                    if (maybeTypeOfKind(rightType, 2048 /* Undefined */) || rightProp.flags & 536870912 /* Optional */) {
+                        var declarations = ts.concatenate(leftProp.declarations, rightProp.declarations);
+                        var flags = 4 /* Property */ | 67108864 /* Transient */ | (leftProp.flags & 536870912 /* Optional */);
+                        var result = createSymbol(flags, leftProp.name);
+                        result.type = getUnionType([getTypeOfSymbol(leftProp), getTypeWithFacts(rightType, 131072 /* NEUndefined */)]);
+                        result.leftSpread = leftProp;
+                        result.rightSpread = rightProp;
+                        result.declarations = declarations;
+                        result.isReadonly = isReadonlySymbol(leftProp) || isReadonlySymbol(rightProp);
+                        members[leftProp.name] = result;
+                    }
+                }
+                else {
+                    members[leftProp.name] = leftProp;
+                }
+            }
+            return createAnonymousType(undefined, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
+        }
         function createLiteralType(flags, text) {
             var type = createType(flags);
             type.text = text;
             return type;
         }
         function getFreshTypeOfLiteralType(type) {
-            if (type.flags & 96 /* StringOrNumberLiteral */ && !(type.flags & 16777216 /* FreshLiteral */)) {
+            if (type.flags & 96 /* StringOrNumberLiteral */ && !(type.flags & 1048576 /* FreshLiteral */)) {
                 if (!type.freshType) {
-                    var freshType = createLiteralType(type.flags | 16777216 /* FreshLiteral */, type.text);
+                    var freshType = createLiteralType(type.flags | 1048576 /* FreshLiteral */, type.text);
                     freshType.regularType = type;
                     type.freshType = freshType;
                 }
@@ -27951,7 +29634,7 @@ var ts;
             return type;
         }
         function getRegularTypeOfLiteralType(type) {
-            return type.flags & 96 /* StringOrNumberLiteral */ && type.flags & 16777216 /* FreshLiteral */ ? type.regularType : type;
+            return type.flags & 96 /* StringOrNumberLiteral */ && type.flags & 1048576 /* FreshLiteral */ ? type.regularType : type;
         }
         function getLiteralTypeForText(flags, text) {
             var map = flags & 32 /* StringLiteral */ ? stringLiteralTypes : numericLiteralTypes;
@@ -27975,7 +29658,7 @@ var ts;
         function getTypeFromJSDocTupleType(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
-                var types = ts.map(node.types, getTypeFromTypeNodeNoAlias);
+                var types = ts.map(node.types, getTypeFromTypeNode);
                 links.resolvedType = createTupleType(types);
             }
             return links.resolvedType;
@@ -27983,9 +29666,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 === 223 /* InterfaceDeclaration */)) {
+            if (parent && (ts.isClassLike(parent) || parent.kind === 227 /* InterfaceDeclaration */)) {
                 if (!(ts.getModifierFlags(container) & 32 /* Static */) &&
-                    (container.kind !== 149 /* Constructor */ || ts.isNodeDescendantOf(node, container.body))) {
+                    (container.kind !== 150 /* Constructor */ || ts.isNodeDescendantOf(node, container.body))) {
                     return getDeclaredTypeOfClassOrInterface(getSymbolOfNode(parent)).thisType;
                 }
             }
@@ -27999,87 +29682,90 @@ var ts;
             }
             return links.resolvedType;
         }
-        function getTypeFromTypeNodeNoAlias(type) {
-            return getTypeFromTypeNode(type, /*aliasSymbol*/ undefined, /*aliasTypeArguments*/ undefined);
-        }
-        function getTypeFromTypeNode(node, aliasSymbol, aliasTypeArguments) {
+        function getTypeFromTypeNode(node) {
             switch (node.kind) {
                 case 118 /* AnyKeyword */:
-                case 258 /* JSDocAllType */:
-                case 259 /* JSDocUnknownType */:
+                case 263 /* JSDocAllType */:
+                case 264 /* JSDocUnknownType */:
                     return anyType;
-                case 133 /* StringKeyword */:
+                case 134 /* StringKeyword */:
                     return stringType;
-                case 131 /* NumberKeyword */:
+                case 132 /* NumberKeyword */:
                     return numberType;
                 case 121 /* BooleanKeyword */:
                     return booleanType;
-                case 134 /* SymbolKeyword */:
+                case 135 /* SymbolKeyword */:
                     return esSymbolType;
                 case 104 /* VoidKeyword */:
                     return voidType;
-                case 136 /* UndefinedKeyword */:
+                case 137 /* UndefinedKeyword */:
                     return undefinedType;
                 case 94 /* NullKeyword */:
                     return nullType;
-                case 128 /* NeverKeyword */:
+                case 129 /* NeverKeyword */:
                     return neverType;
-                case 283 /* JSDocNullKeyword */:
+                case 288 /* JSDocNullKeyword */:
                     return nullType;
-                case 284 /* JSDocUndefinedKeyword */:
+                case 289 /* JSDocUndefinedKeyword */:
                     return undefinedType;
-                case 285 /* JSDocNeverKeyword */:
+                case 290 /* JSDocNeverKeyword */:
                     return neverType;
-                case 166 /* ThisType */:
+                case 167 /* ThisType */:
                 case 98 /* ThisKeyword */:
                     return getTypeFromThisTypeNode(node);
-                case 167 /* LiteralType */:
+                case 171 /* LiteralType */:
                     return getTypeFromLiteralTypeNode(node);
-                case 282 /* JSDocLiteralType */:
+                case 287 /* JSDocLiteralType */:
                     return getTypeFromLiteralTypeNode(node.literal);
-                case 156 /* TypeReference */:
-                case 267 /* JSDocTypeReference */:
+                case 157 /* TypeReference */:
+                case 272 /* JSDocTypeReference */:
                     return getTypeFromTypeReference(node);
-                case 155 /* TypePredicate */:
+                case 156 /* TypePredicate */:
                     return booleanType;
-                case 195 /* ExpressionWithTypeArguments */:
+                case 199 /* ExpressionWithTypeArguments */:
                     return getTypeFromTypeReference(node);
-                case 159 /* TypeQuery */:
+                case 160 /* TypeQuery */:
                     return getTypeFromTypeQueryNode(node);
-                case 161 /* ArrayType */:
-                case 260 /* JSDocArrayType */:
+                case 162 /* ArrayType */:
+                case 265 /* JSDocArrayType */:
                     return getTypeFromArrayTypeNode(node);
-                case 162 /* TupleType */:
+                case 163 /* TupleType */:
                     return getTypeFromTupleTypeNode(node);
-                case 163 /* UnionType */:
-                case 261 /* JSDocUnionType */:
-                    return getTypeFromUnionTypeNode(node, aliasSymbol, aliasTypeArguments);
-                case 164 /* IntersectionType */:
-                    return getTypeFromIntersectionTypeNode(node, aliasSymbol, aliasTypeArguments);
-                case 165 /* ParenthesizedType */:
-                case 263 /* JSDocNullableType */:
-                case 264 /* JSDocNonNullableType */:
-                case 271 /* JSDocConstructorType */:
-                case 272 /* JSDocThisType */:
-                case 268 /* JSDocOptionalType */:
+                case 164 /* UnionType */:
+                case 266 /* JSDocUnionType */:
+                    return getTypeFromUnionTypeNode(node);
+                case 165 /* IntersectionType */:
+                    return getTypeFromIntersectionTypeNode(node);
+                case 166 /* ParenthesizedType */:
+                case 268 /* JSDocNullableType */:
+                case 269 /* JSDocNonNullableType */:
+                case 276 /* JSDocConstructorType */:
+                case 277 /* JSDocThisType */:
+                case 273 /* JSDocOptionalType */:
                     return getTypeFromTypeNode(node.type);
-                case 265 /* JSDocRecordType */:
+                case 270 /* JSDocRecordType */:
                     return getTypeFromTypeNode(node.literal);
-                case 157 /* FunctionType */:
-                case 158 /* ConstructorType */:
-                case 160 /* TypeLiteral */:
-                case 281 /* JSDocTypeLiteral */:
-                case 269 /* JSDocFunctionType */:
-                    return getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node, aliasSymbol, aliasTypeArguments);
+                case 158 /* FunctionType */:
+                case 159 /* ConstructorType */:
+                case 161 /* TypeLiteral */:
+                case 286 /* JSDocTypeLiteral */:
+                case 274 /* JSDocFunctionType */:
+                    return getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node);
+                case 168 /* TypeOperator */:
+                    return getTypeFromTypeOperatorNode(node);
+                case 169 /* IndexedAccessType */:
+                    return getTypeFromIndexedAccessTypeNode(node);
+                case 170 /* MappedType */:
+                    return getTypeFromMappedTypeNode(node);
                 // This function assumes that an identifier or qualified name is a type expression
                 // Callers should first ensure this by calling isTypeNode
                 case 70 /* Identifier */:
-                case 140 /* QualifiedName */:
+                case 141 /* QualifiedName */:
                     var symbol = getSymbolAtLocation(node);
                     return symbol && getDeclaredTypeOfSymbol(symbol);
-                case 262 /* JSDocTupleType */:
+                case 267 /* JSDocTupleType */:
                     return getTypeFromJSDocTupleType(node);
-                case 270 /* JSDocVariadicType */:
+                case 275 /* JSDocVariadicType */:
                     return getTypeFromJSDocVariadicType(node);
                 default:
                     return unknownType;
@@ -28096,6 +29782,16 @@ var ts;
             }
             return items;
         }
+        function instantiateTypes(types, mapper) {
+            return instantiateList(types, mapper, instantiateType);
+        }
+        function instantiateSignatures(signatures, mapper) {
+            return instantiateList(signatures, mapper, instantiateSignature);
+        }
+        function instantiateCached(type, mapper, instantiator) {
+            var instantiations = mapper.instantiations || (mapper.instantiations = []);
+            return instantiations[type.id] || (instantiations[type.id] = instantiator(type, mapper));
+        }
         function createUnaryTypeMapper(source, target) {
             return function (t) { return t === source ? target : t; };
         }
@@ -28118,7 +29814,6 @@ var ts;
                 count == 2 ? createBinaryTypeMapper(sources[0], targets ? targets[0] : anyType, sources[1], targets ? targets[1] : anyType) :
                     createArrayTypeMapper(sources, targets);
             mapper.mappedTypes = sources;
-            mapper.targetTypes = targets;
             return mapper;
         }
         function createTypeEraser(sources) {
@@ -28216,25 +29911,25 @@ var ts;
             return result;
         }
         function instantiateAnonymousType(type, mapper) {
-            if (mapper.instantiations) {
-                var cachedType = mapper.instantiations[type.id];
-                if (cachedType) {
-                    return cachedType;
-                }
-            }
-            else {
-                mapper.instantiations = [];
-            }
-            // Mark the anonymous type as instantiated such that our infinite instantiation detection logic can recognize it
-            var result = createObjectType(2097152 /* Anonymous */ | 4194304 /* Instantiated */, type.symbol);
-            result.target = type;
-            result.mapper = mapper;
+            var result = createObjectType(16 /* Anonymous */ | 64 /* Instantiated */, type.symbol);
+            result.target = type.objectFlags & 64 /* Instantiated */ ? type.target : type;
+            result.mapper = type.objectFlags & 64 /* Instantiated */ ? combineTypeMappers(type.mapper, mapper) : mapper;
             result.aliasSymbol = type.aliasSymbol;
-            result.aliasTypeArguments = mapper.targetTypes;
-            mapper.instantiations[type.id] = result;
+            result.aliasTypeArguments = instantiateTypes(type.aliasTypeArguments, mapper);
+            return result;
+        }
+        function instantiateMappedType(type, mapper) {
+            var result = createObjectType(32 /* Mapped */ | 64 /* Instantiated */, type.symbol);
+            result.declaration = type.declaration;
+            result.mapper = type.mapper ? combineTypeMappers(type.mapper, mapper) : mapper;
+            result.aliasSymbol = type.aliasSymbol;
+            result.aliasTypeArguments = instantiateTypes(type.aliasTypeArguments, mapper);
             return result;
         }
         function isSymbolInScopeOfMappedTypeParameter(symbol, mapper) {
+            if (!(symbol.declarations && symbol.declarations.length)) {
+                return false;
+            }
             var mappedTypes = mapper.mappedTypes;
             // Starting with the parent of the symbol's declaration, check if the mapper maps any of
             // the type parameters introduced by enclosing declarations. We just pick the first
@@ -28242,23 +29937,23 @@ var ts;
             var node = symbol.declarations[0].parent;
             while (node) {
                 switch (node.kind) {
-                    case 157 /* FunctionType */:
-                    case 158 /* ConstructorType */:
-                    case 221 /* FunctionDeclaration */:
-                    case 148 /* MethodDeclaration */:
-                    case 147 /* MethodSignature */:
-                    case 149 /* Constructor */:
-                    case 152 /* CallSignature */:
-                    case 153 /* ConstructSignature */:
-                    case 154 /* IndexSignature */:
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
-                    case 180 /* FunctionExpression */:
-                    case 181 /* ArrowFunction */:
-                    case 222 /* ClassDeclaration */:
-                    case 193 /* ClassExpression */:
-                    case 223 /* InterfaceDeclaration */:
-                    case 224 /* TypeAliasDeclaration */:
+                    case 158 /* FunctionType */:
+                    case 159 /* ConstructorType */:
+                    case 225 /* FunctionDeclaration */:
+                    case 149 /* MethodDeclaration */:
+                    case 148 /* MethodSignature */:
+                    case 150 /* Constructor */:
+                    case 153 /* CallSignature */:
+                    case 154 /* ConstructSignature */:
+                    case 155 /* IndexSignature */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* SetAccessor */:
+                    case 184 /* FunctionExpression */:
+                    case 185 /* ArrowFunction */:
+                    case 226 /* ClassDeclaration */:
+                    case 197 /* ClassExpression */:
+                    case 227 /* InterfaceDeclaration */:
+                    case 228 /* TypeAliasDeclaration */:
                         var declaration = node;
                         if (declaration.typeParameters) {
                             for (var _i = 0, _a = declaration.typeParameters; _i < _a.length; _i++) {
@@ -28268,27 +29963,63 @@ var ts;
                                 }
                             }
                         }
-                        if (ts.isClassLike(node) || node.kind === 223 /* InterfaceDeclaration */) {
+                        if (ts.isClassLike(node) || node.kind === 227 /* InterfaceDeclaration */) {
                             var thisType = getDeclaredTypeOfClassOrInterface(getSymbolOfNode(node)).thisType;
                             if (thisType && ts.contains(mappedTypes, thisType)) {
                                 return true;
                             }
                         }
                         break;
-                    case 226 /* ModuleDeclaration */:
-                    case 256 /* SourceFile */:
+                    case 230 /* ModuleDeclaration */:
+                    case 261 /* SourceFile */:
                         return false;
                 }
                 node = node.parent;
             }
             return false;
         }
+        function isTopLevelTypeAlias(symbol) {
+            if (symbol.declarations && symbol.declarations.length) {
+                var parentKind = symbol.declarations[0].parent.kind;
+                return parentKind === 261 /* SourceFile */ || parentKind === 231 /* ModuleBlock */;
+            }
+            return false;
+        }
         function instantiateType(type, mapper) {
             if (type && mapper !== identityMapper) {
-                if (type.flags & 16384 /* TypeParameter */) {
-                    return mapper(type);
+                // If we are instantiating a type that has a top-level type alias, obtain the instantiation through
+                // the type alias instead in order to share instantiations for the same type arguments. This can
+                // dramatically reduce the number of structurally identical types we generate. Note that we can only
+                // perform this optimization for top-level type aliases. Consider:
+                //
+                //   function f1<T>(x: T) {
+                //     type Foo<X> = { x: X, t: T };
+                //     let obj: Foo<T> = { x: x };
+                //     return obj;
+                //   }
+                //   function f2<U>(x: U) { return f1(x); }
+                //   let z = f2(42);
+                //
+                // Above, the declaration of f2 has an inferred return type that is an instantiation of f1's Foo<X>
+                // equivalent to { x: U, t: U }. When instantiating this return type, we can't go back to Foo<X>'s
+                // cache because all cached instantiations are of the form { x: ???, t: T }, i.e. they have not been
+                // instantiated for T. Instead, we need to further instantiate the { x: U, t: U } form.
+                if (type.aliasSymbol && isTopLevelTypeAlias(type.aliasSymbol)) {
+                    if (type.aliasTypeArguments) {
+                        return getTypeAliasInstantiation(type.aliasSymbol, instantiateTypes(type.aliasTypeArguments, mapper));
+                    }
+                    return type;
                 }
-                if (type.flags & 2097152 /* Anonymous */) {
+                return instantiateTypeNoAlias(type, mapper);
+            }
+            return type;
+        }
+        function instantiateTypeNoAlias(type, mapper) {
+            if (type.flags & 16384 /* TypeParameter */) {
+                return mapper(type);
+            }
+            if (type.flags & 32768 /* Object */) {
+                if (type.objectFlags & 16 /* Anonymous */) {
                     // 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. We skip instantiation
@@ -28297,19 +30028,28 @@ var ts;
                     // instantiation.
                     return type.symbol &&
                         type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) &&
-                        (type.flags & 4194304 /* Instantiated */ || isSymbolInScopeOfMappedTypeParameter(type.symbol, mapper)) ?
-                        instantiateAnonymousType(type, mapper) : type;
+                        (type.objectFlags & 64 /* Instantiated */ || isSymbolInScopeOfMappedTypeParameter(type.symbol, mapper)) ?
+                        instantiateCached(type, mapper, instantiateAnonymousType) : type;
                 }
-                if (type.flags & 131072 /* Reference */) {
-                    return createTypeReference(type.target, instantiateList(type.typeArguments, mapper, instantiateType));
+                if (type.objectFlags & 32 /* Mapped */) {
+                    return instantiateCached(type, mapper, instantiateMappedType);
                 }
-                if (type.flags & 524288 /* Union */ && !(type.flags & 8190 /* Primitive */)) {
-                    return getUnionType(instantiateList(type.types, mapper, instantiateType), /*subtypeReduction*/ false, type.aliasSymbol, mapper.targetTypes);
-                }
-                if (type.flags & 1048576 /* Intersection */) {
-                    return getIntersectionType(instantiateList(type.types, mapper, instantiateType), type.aliasSymbol, mapper.targetTypes);
+                if (type.objectFlags & 4 /* Reference */) {
+                    return createTypeReference(type.target, instantiateTypes(type.typeArguments, mapper));
                 }
             }
+            if (type.flags & 65536 /* Union */ && !(type.flags & 8190 /* Primitive */)) {
+                return getUnionType(instantiateTypes(type.types, mapper), /*subtypeReduction*/ false, type.aliasSymbol, instantiateTypes(type.aliasTypeArguments, mapper));
+            }
+            if (type.flags & 131072 /* Intersection */) {
+                return getIntersectionType(instantiateTypes(type.types, mapper), type.aliasSymbol, instantiateTypes(type.aliasTypeArguments, mapper));
+            }
+            if (type.flags & 262144 /* Index */) {
+                return getIndexType(instantiateType(type.type, mapper));
+            }
+            if (type.flags & 524288 /* IndexedAccess */) {
+                return getIndexedAccessType(instantiateType(type.objectType, mapper), instantiateType(type.indexType, mapper));
+            }
             return type;
         }
         function instantiateIndexInfo(info, mapper) {
@@ -28318,27 +30058,27 @@ 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 !== 148 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 149 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             switch (node.kind) {
-                case 180 /* FunctionExpression */:
-                case 181 /* ArrowFunction */:
+                case 184 /* FunctionExpression */:
+                case 185 /* ArrowFunction */:
                     return isContextSensitiveFunctionLikeDeclaration(node);
-                case 172 /* ObjectLiteralExpression */:
+                case 176 /* ObjectLiteralExpression */:
                     return ts.forEach(node.properties, isContextSensitive);
-                case 171 /* ArrayLiteralExpression */:
+                case 175 /* ArrayLiteralExpression */:
                     return ts.forEach(node.elements, isContextSensitive);
-                case 189 /* ConditionalExpression */:
+                case 193 /* ConditionalExpression */:
                     return isContextSensitive(node.whenTrue) ||
                         isContextSensitive(node.whenFalse);
-                case 188 /* BinaryExpression */:
+                case 192 /* BinaryExpression */:
                     return node.operatorToken.kind === 53 /* BarBarToken */ &&
                         (isContextSensitive(node.left) || isContextSensitive(node.right));
-                case 253 /* PropertyAssignment */:
+                case 257 /* PropertyAssignment */:
                     return isContextSensitive(node.initializer);
-                case 148 /* MethodDeclaration */:
-                case 147 /* MethodSignature */:
+                case 149 /* MethodDeclaration */:
+                case 148 /* MethodSignature */:
                     return isContextSensitiveFunctionLikeDeclaration(node);
-                case 179 /* ParenthesizedExpression */:
+                case 183 /* ParenthesizedExpression */:
                     return isContextSensitive(node.expression);
             }
             return false;
@@ -28353,7 +30093,7 @@ var ts;
                 return true;
             }
             // For arrow functions we now know we're not context sensitive.
-            if (node.kind === 181 /* ArrowFunction */) {
+            if (node.kind === 185 /* ArrowFunction */) {
                 return false;
             }
             // If the first parameter is not an explicit 'this' parameter, then the function has
@@ -28367,10 +30107,10 @@ var ts;
             return (isFunctionExpressionOrArrowFunction(func) || ts.isObjectLiteralMethod(func)) && isContextSensitiveFunctionLikeDeclaration(func);
         }
         function getTypeWithoutSignatures(type) {
-            if (type.flags & 2588672 /* ObjectType */) {
+            if (type.flags & 32768 /* Object */) {
                 var resolved = resolveStructuredTypeMembers(type);
                 if (resolved.constructSignatures.length) {
-                    var result = createObjectType(2097152 /* Anonymous */, type.symbol);
+                    var result = createObjectType(16 /* Anonymous */, type.symbol);
                     result.members = resolved.members;
                     result.properties = resolved.properties;
                     result.callSignatures = emptyArray;
@@ -28573,7 +30313,7 @@ var ts;
             }
             if (source.symbol.name !== target.symbol.name ||
                 !(source.symbol.flags & 256 /* RegularEnum */) || !(target.symbol.flags & 256 /* RegularEnum */) ||
-                (source.flags & 524288 /* Union */) !== (target.flags & 524288 /* Union */)) {
+                (source.flags & 65536 /* Union */) !== (target.flags & 65536 /* Union */)) {
                 return enumRelation[id] = false;
             }
             var targetEnumType = getTypeOfSymbol(target.symbol);
@@ -28630,23 +30370,23 @@ var ts;
             return false;
         }
         function isTypeRelatedTo(source, target, relation) {
-            if (source.flags & 96 /* StringOrNumberLiteral */ && source.flags & 16777216 /* FreshLiteral */) {
+            if (source.flags & 96 /* StringOrNumberLiteral */ && source.flags & 1048576 /* FreshLiteral */) {
                 source = source.regularType;
             }
-            if (target.flags & 96 /* StringOrNumberLiteral */ && target.flags & 16777216 /* FreshLiteral */) {
+            if (target.flags & 96 /* StringOrNumberLiteral */ && target.flags & 1048576 /* FreshLiteral */) {
                 target = target.regularType;
             }
             if (source === target || relation !== identityRelation && isSimpleTypeRelatedTo(source, target, relation)) {
                 return true;
             }
-            if (source.flags & 2588672 /* ObjectType */ && target.flags & 2588672 /* ObjectType */) {
+            if (source.flags & 32768 /* Object */ && target.flags & 32768 /* Object */) {
                 var id = relation !== identityRelation || source.id < target.id ? source.id + "," + target.id : target.id + "," + source.id;
                 var related = relation[id];
                 if (related !== undefined) {
                     return related === 1 /* Succeeded */;
                 }
             }
-            if (source.flags & 4177920 /* StructuredOrTypeParameter */ || target.flags & 4177920 /* StructuredOrTypeParameter */) {
+            if (source.flags & 507904 /* StructuredOrTypeParameter */ || target.flags & 507904 /* StructuredOrTypeParameter */) {
                 return checkTypeRelatedTo(source, target, relation, undefined, undefined, undefined);
             }
             return false;
@@ -28693,9 +30433,15 @@ var ts;
                     targetType = typeToString(target, /*enclosingDeclaration*/ undefined, 128 /* UseFullyQualifiedType */);
                 }
                 if (!message) {
-                    message = relation === comparableRelation ?
-                        ts.Diagnostics.Type_0_is_not_comparable_to_type_1 :
-                        ts.Diagnostics.Type_0_is_not_assignable_to_type_1;
+                    if (relation === comparableRelation) {
+                        message = ts.Diagnostics.Type_0_is_not_comparable_to_type_1;
+                    }
+                    else if (sourceType === targetType) {
+                        message = ts.Diagnostics.Type_0_is_not_assignable_to_type_1_Two_different_types_with_this_name_exist_but_they_are_unrelated;
+                    }
+                    else {
+                        message = ts.Diagnostics.Type_0_is_not_assignable_to_type_1;
+                    }
                 }
                 reportError(message, sourceType, targetType);
             }
@@ -28715,10 +30461,10 @@ var ts;
             // Ternary.False if they are not related.
             function isRelatedTo(source, target, reportErrors, headMessage) {
                 var result;
-                if (source.flags & 96 /* StringOrNumberLiteral */ && source.flags & 16777216 /* FreshLiteral */) {
+                if (source.flags & 96 /* StringOrNumberLiteral */ && source.flags & 1048576 /* FreshLiteral */) {
                     source = source.regularType;
                 }
-                if (target.flags & 96 /* StringOrNumberLiteral */ && target.flags & 16777216 /* FreshLiteral */) {
+                if (target.flags & 96 /* StringOrNumberLiteral */ && target.flags & 1048576 /* FreshLiteral */) {
                     target = target.regularType;
                 }
                 // both types are the same - covers 'they are the same primitive type or both are Any' or the same type parameter cases
@@ -28729,7 +30475,13 @@ var ts;
                 }
                 if (isSimpleTypeRelatedTo(source, target, relation, reportErrors ? reportError : undefined))
                     return -1 /* True */;
-                if (source.flags & 8388608 /* ObjectLiteral */ && source.flags & 16777216 /* FreshLiteral */) {
+                if (source.flags & 262144 /* Index */) {
+                    // A keyof T is related to a union type containing both string and number
+                    if (maybeTypeOfKind(target, 2 /* String */) && maybeTypeOfKind(target, 4 /* Number */)) {
+                        return -1 /* True */;
+                    }
+                }
+                if (getObjectFlags(source) & 128 /* ObjectLiteral */ && source.flags & 1048576 /* FreshLiteral */) {
                     if (hasExcessProperties(source, target, reportErrors)) {
                         if (reportErrors) {
                             reportRelationError(headMessage, source, target);
@@ -28740,13 +30492,15 @@ var ts;
                     // 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 (target.flags & 1572864 /* UnionOrIntersection */) {
+                    if (target.flags & 196608 /* UnionOrIntersection */) {
                         source = getRegularTypeOfObjectLiteral(source);
                     }
                 }
                 var saveErrorInfo = errorInfo;
-                // Note that these checks are specifically ordered to produce correct results.
-                if (source.flags & 524288 /* Union */) {
+                // Note that these checks are specifically ordered to produce correct results. In particular,
+                // we need to deconstruct unions before intersections (because unions are always at the top),
+                // and we need to handle "each" relations before "some" relations for the same kind of type.
+                if (source.flags & 65536 /* Union */) {
                     if (relation === comparableRelation) {
                         result = someTypeRelatedToType(source, target, reportErrors && !(source.flags & 8190 /* Primitive */));
                     }
@@ -28757,36 +30511,56 @@ var ts;
                         return result;
                     }
                 }
-                else if (target.flags & 1048576 /* Intersection */) {
-                    result = typeRelatedToEachType(source, target, reportErrors);
-                    if (result) {
+                else if (target.flags & 65536 /* Union */) {
+                    if (result = typeRelatedToSomeType(source, target, reportErrors && !(source.flags & 8190 /* Primitive */) && !(target.flags & 8190 /* Primitive */))) {
                         return result;
                     }
                 }
-                else {
-                    // It is necessary to try these "some" checks on both sides because there may be nested "each" checks
-                    // on either side that need to be prioritized. For example, A | B = (A | B) & (C | D) or
-                    // A & B = (A & B) | (C & D).
-                    if (source.flags & 1048576 /* Intersection */) {
-                        // Check to see if any constituents of the intersection are immediately related to the target.
-                        //
-                        // Don't report errors though. Checking whether a constituent is related to the source is not actually
-                        // useful and leads to some confusing error messages. Instead it is better to let the below checks
-                        // take care of this, or to not elaborate at all. For instance,
-                        //
-                        //    - For an object type (such as 'C = A & B'), users are usually more interested in structural errors.
-                        //
-                        //    - For a union type (such as '(A | B) = (C & D)'), it's better to hold onto the whole intersection
-                        //          than to report that 'D' is not assignable to 'A' or 'B'.
-                        //
-                        //    - For a primitive type or type parameter (such as 'number = A & B') there is no point in
-                        //          breaking the intersection apart.
-                        if (result = someTypeRelatedToType(source, target, /*reportErrors*/ false)) {
+                else if (target.flags & 131072 /* Intersection */) {
+                    if (result = typeRelatedToEachType(source, target, reportErrors)) {
+                        return result;
+                    }
+                }
+                else if (source.flags & 131072 /* Intersection */) {
+                    // Check to see if any constituents of the intersection are immediately related to the target.
+                    //
+                    // Don't report errors though. Checking whether a constituent is related to the source is not actually
+                    // useful and leads to some confusing error messages. Instead it is better to let the below checks
+                    // take care of this, or to not elaborate at all. For instance,
+                    //
+                    //    - For an object type (such as 'C = A & B'), users are usually more interested in structural errors.
+                    //
+                    //    - For a union type (such as '(A | B) = (C & D)'), it's better to hold onto the whole intersection
+                    //          than to report that 'D' is not assignable to 'A' or 'B'.
+                    //
+                    //    - For a primitive type or type parameter (such as 'number = A & B') there is no point in
+                    //          breaking the intersection apart.
+                    if (result = someTypeRelatedToType(source, target, /*reportErrors*/ false)) {
+                        return result;
+                    }
+                }
+                if (target.flags & 16384 /* TypeParameter */) {
+                    // Given a type parameter K with a constraint keyof T, a type S is
+                    // assignable to K if S is assignable to keyof T.
+                    var constraint = getConstraintOfTypeParameter(target);
+                    if (constraint && constraint.flags & 262144 /* Index */) {
+                        if (result = isRelatedTo(source, constraint, reportErrors)) {
                             return result;
                         }
                     }
-                    if (target.flags & 524288 /* Union */) {
-                        if (result = typeRelatedToSomeType(source, target, reportErrors && !(source.flags & 8190 /* Primitive */) && !(target.flags & 8190 /* Primitive */))) {
+                }
+                else if (target.flags & 262144 /* Index */) {
+                    // A keyof S is related to a keyof T if T is related to S.
+                    if (source.flags & 262144 /* Index */) {
+                        if (result = isRelatedTo(target.type, source.type, /*reportErrors*/ false)) {
+                            return result;
+                        }
+                    }
+                    // Given a type parameter T with a constraint C, a type S is assignable to
+                    // keyof T if S is assignable to keyof C.
+                    var constraint = getConstraintOfTypeParameter(target.type);
+                    if (constraint) {
+                        if (result = isRelatedTo(source, getIndexType(constraint), reportErrors)) {
                             return result;
                         }
                     }
@@ -28806,32 +30580,43 @@ var ts;
                     }
                 }
                 else {
-                    if (source.flags & 131072 /* Reference */ && target.flags & 131072 /* Reference */ && source.target === target.target) {
+                    if (getObjectFlags(source) & 4 /* Reference */ && getObjectFlags(target) & 4 /* Reference */ && source.target === target.target) {
                         // We have type references to same target type, see if relationship holds for all type arguments
                         if (result = typeArgumentsRelatedTo(source, target, reportErrors)) {
                             return result;
                         }
                     }
-                    // Even if relationship doesn't hold for unions, intersections, or generic type references,
-                    // it may hold in a structural comparison.
-                    var apparentSource = getApparentType(source);
-                    // In a check of the form X = A & B, we will have previously checked if A relates to X or B relates
-                    // to X. Failing both of those we want to check if the aggregation of A and B's members structurally
-                    // relates to X. Thus, we include intersection types on the source side here.
-                    if (apparentSource.flags & (2588672 /* ObjectType */ | 1048576 /* Intersection */) && target.flags & 2588672 /* ObjectType */) {
-                        // Report structural errors only if we haven't reported any errors yet
-                        var reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo && !(source.flags & 8190 /* Primitive */);
-                        if (result = objectTypeRelatedTo(apparentSource, source, target, reportStructuralErrors)) {
-                            errorInfo = saveErrorInfo;
-                            return result;
+                    if (isGenericMappedType(target)) {
+                        // A type [P in S]: X is related to a type [P in T]: Y if T is related to S and X is related to Y.
+                        if (isGenericMappedType(source)) {
+                            if ((result = isRelatedTo(getConstraintTypeFromMappedType(target), getConstraintTypeFromMappedType(source), reportErrors)) &&
+                                (result = isRelatedTo(getTemplateTypeFromMappedType(source), getTemplateTypeFromMappedType(target), reportErrors))) {
+                                return result;
+                            }
+                        }
+                    }
+                    else {
+                        // Even if relationship doesn't hold for unions, intersections, or generic type references,
+                        // it may hold in a structural comparison.
+                        var apparentSource = getApparentType(source);
+                        // In a check of the form X = A & B, we will have previously checked if A relates to X or B relates
+                        // to X. Failing both of those we want to check if the aggregation of A and B's members structurally
+                        // relates to X. Thus, we include intersection types on the source side here.
+                        if (apparentSource.flags & (32768 /* Object */ | 131072 /* Intersection */) && target.flags & 32768 /* Object */) {
+                            // Report structural errors only if we haven't reported any errors yet
+                            var reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo && !(source.flags & 8190 /* Primitive */);
+                            if (result = objectTypeRelatedTo(apparentSource, source, target, reportStructuralErrors)) {
+                                errorInfo = saveErrorInfo;
+                                return result;
+                            }
                         }
                     }
                 }
                 if (reportErrors) {
-                    if (source.flags & 2588672 /* ObjectType */ && target.flags & 8190 /* Primitive */) {
+                    if (source.flags & 32768 /* Object */ && target.flags & 8190 /* Primitive */) {
                         tryElaborateErrorsForPrimitivesAndObjects(source, target);
                     }
-                    else if (source.symbol && source.flags & 2588672 /* ObjectType */ && globalObjectType === source) {
+                    else if (source.symbol && source.flags & 32768 /* Object */ && globalObjectType === source) {
                         reportError(ts.Diagnostics.The_Object_type_is_assignable_to_very_few_other_types_Did_you_mean_to_use_the_any_type_instead);
                     }
                     reportRelationError(headMessage, source, target);
@@ -28840,8 +30625,8 @@ var ts;
             }
             function isIdenticalTo(source, target) {
                 var result;
-                if (source.flags & 2588672 /* ObjectType */ && target.flags & 2588672 /* ObjectType */) {
-                    if (source.flags & 131072 /* Reference */ && target.flags & 131072 /* Reference */ && source.target === target.target) {
+                if (source.flags & 32768 /* Object */ && target.flags & 32768 /* Object */) {
+                    if (getObjectFlags(source) & 4 /* Reference */ && getObjectFlags(target) & 4 /* Reference */ && source.target === target.target) {
                         // We have type references to same target type, see if all type arguments are identical
                         if (result = typeArgumentsRelatedTo(source, target, /*reportErrors*/ false)) {
                             return result;
@@ -28849,8 +30634,8 @@ var ts;
                     }
                     return objectTypeRelatedTo(source, source, target, /*reportErrors*/ false);
                 }
-                if (source.flags & 524288 /* Union */ && target.flags & 524288 /* Union */ ||
-                    source.flags & 1048576 /* Intersection */ && target.flags & 1048576 /* Intersection */) {
+                if (source.flags & 65536 /* Union */ && target.flags & 65536 /* Union */ ||
+                    source.flags & 131072 /* Intersection */ && target.flags & 131072 /* Intersection */) {
                     if (result = eachTypeRelatedToSomeType(source, target)) {
                         if (result &= eachTypeRelatedToSomeType(target, source)) {
                             return result;
@@ -28864,7 +30649,7 @@ var ts;
             // index signatures, or if the property is actually declared in the object type. In a union or intersection
             // type, a property is considered known if it is known in any constituent type.
             function isKnownProperty(type, name) {
-                if (type.flags & 2588672 /* ObjectType */) {
+                if (type.flags & 32768 /* Object */) {
                     var resolved = resolveStructuredTypeMembers(type);
                     if ((relation === assignableRelation || relation === comparableRelation) && (type === globalObjectType || isEmptyObjectType(resolved)) ||
                         resolved.stringIndexInfo ||
@@ -28873,7 +30658,7 @@ var ts;
                         return true;
                     }
                 }
-                else if (type.flags & 1572864 /* UnionOrIntersection */) {
+                else if (type.flags & 196608 /* UnionOrIntersection */) {
                     for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                         var t = _a[_i];
                         if (isKnownProperty(t, name)) {
@@ -28891,8 +30676,7 @@ var ts;
                     !t.numberIndexInfo;
             }
             function hasExcessProperties(source, target, reportErrors) {
-                if (maybeTypeOfKind(target, 2588672 /* ObjectType */) &&
-                    (!(target.flags & 2588672 /* ObjectType */) || !target.isObjectLiteralPatternWithComputedProperties)) {
+                if (maybeTypeOfKind(target, 32768 /* Object */) && !(getObjectFlags(target) & 512 /* ObjectLiteralPatternWithComputedProperties */)) {
                     for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
                         var prop = _a[_i];
                         if (!isKnownProperty(target, prop.name)) {
@@ -28925,7 +30709,7 @@ var ts;
             }
             function typeRelatedToSomeType(source, target, reportErrors) {
                 var targetTypes = target.types;
-                if (target.flags & 524288 /* Union */ && containsType(targetTypes, source)) {
+                if (target.flags & 65536 /* Union */ && containsType(targetTypes, source)) {
                     return -1 /* True */;
                 }
                 var len = targetTypes.length;
@@ -28952,7 +30736,7 @@ var ts;
             }
             function someTypeRelatedToType(source, target, reportErrors) {
                 var sourceTypes = source.types;
-                if (source.flags & 524288 /* Union */ && containsType(sourceTypes, target)) {
+                if (source.flags & 65536 /* Union */ && containsType(sourceTypes, target)) {
                     return -1 /* True */;
                 }
                 var len = sourceTypes.length;
@@ -29083,9 +30867,9 @@ var ts;
                 }
                 var result = -1 /* True */;
                 var properties = getPropertiesOfObjectType(target);
-                var requireOptionalProperties = relation === subtypeRelation && !(source.flags & 8388608 /* ObjectLiteral */);
-                for (var _i = 0, properties_2 = properties; _i < properties_2.length; _i++) {
-                    var targetProp = properties_2[_i];
+                var requireOptionalProperties = relation === subtypeRelation && !(getObjectFlags(source) & 128 /* ObjectLiteral */);
+                for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
+                    var targetProp = properties_3[_i];
                     var sourceProp = getPropertyOfType(source, targetProp.name);
                     if (sourceProp !== targetProp) {
                         if (!sourceProp) {
@@ -29137,7 +30921,8 @@ var ts;
                                 return 0 /* False */;
                             }
                             result &= related;
-                            if (sourceProp.flags & 536870912 /* Optional */ && !(targetProp.flags & 536870912 /* Optional */)) {
+                            // When checking for comparability, be more lenient with optional properties.
+                            if (relation !== comparableRelation && sourceProp.flags & 536870912 /* Optional */ && !(targetProp.flags & 536870912 /* 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..
@@ -29156,7 +30941,7 @@ var ts;
                 return result;
             }
             function propertiesIdenticalTo(source, target) {
-                if (!(source.flags & 2588672 /* ObjectType */ && target.flags & 2588672 /* ObjectType */)) {
+                if (!(source.flags & 32768 /* Object */ && target.flags & 32768 /* Object */)) {
                     return 0 /* False */;
                 }
                 var sourceProperties = getPropertiesOfObjectType(source);
@@ -29341,7 +31126,7 @@ var ts;
         }
         // Return true if the given type is the constructor type for an abstract class
         function isAbstractConstructorType(type) {
-            if (type.flags & 2097152 /* Anonymous */) {
+            if (getObjectFlags(type) & 16 /* Anonymous */) {
                 var symbol = type.symbol;
                 if (symbol && symbol.flags & 32 /* Class */) {
                     var declaration = getClassLikeDeclarationOfSymbol(symbol);
@@ -29359,12 +31144,12 @@ var ts;
         // some level beyond that.
         function isDeeplyNestedGeneric(type, stack, depth) {
             // We track type references (created by createTypeReference) and instantiated types (created by instantiateType)
-            if (type.flags & (131072 /* Reference */ | 4194304 /* Instantiated */) && depth >= 5) {
+            if (getObjectFlags(type) & (4 /* Reference */ | 64 /* Instantiated */) && depth >= 5) {
                 var symbol = type.symbol;
                 var count = 0;
                 for (var i = 0; i < depth; i++) {
                     var t = stack[i];
-                    if (t.flags & (131072 /* Reference */ | 4194304 /* Instantiated */) && t.symbol === symbol) {
+                    if (getObjectFlags(t) & (4 /* Reference */ | 64 /* Instantiated */) && t.symbol === symbol) {
                         count++;
                         if (count >= 5)
                             return true;
@@ -29550,12 +31335,12 @@ var ts;
             checkTypeSubtypeOf(bestSupertypeDownfallType, bestSupertype, errorLocation, ts.Diagnostics.Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0, errorMessageChainHead);
         }
         function isArrayType(type) {
-            return type.flags & 131072 /* Reference */ && type.target === globalArrayType;
+            return getObjectFlags(type) & 4 /* Reference */ && type.target === globalArrayType;
         }
         function isArrayLikeType(type) {
             // A type is array-like if it is a reference to the global Array or global ReadonlyArray type,
             // or if it is not the undefined or null type and if it is assignable to ReadonlyArray<any>
-            return type.flags & 131072 /* Reference */ && (type.target === globalArrayType || type.target === globalReadonlyArrayType) ||
+            return getObjectFlags(type) & 4 /* Reference */ && (type.target === globalArrayType || type.target === globalReadonlyArrayType) ||
                 !(type.flags & 6144 /* Nullable */) && isTypeAssignableTo(type, anyReadonlyArrayType);
         }
         function isTupleLikeType(type) {
@@ -29566,7 +31351,7 @@ var ts;
         }
         function isLiteralType(type) {
             return type.flags & 8 /* Boolean */ ? true :
-                type.flags & 524288 /* Union */ ? type.flags & 16 /* Enum */ ? true : !ts.forEach(type.types, function (t) { return !isUnitType(t); }) :
+                type.flags & 65536 /* Union */ ? type.flags & 16 /* Enum */ ? true : !ts.forEach(type.types, function (t) { return !isUnitType(t); }) :
                     isUnitType(type);
         }
         function getBaseTypeOfLiteralType(type) {
@@ -29574,15 +31359,15 @@ var ts;
                 type.flags & 64 /* NumberLiteral */ ? numberType :
                     type.flags & 128 /* BooleanLiteral */ ? booleanType :
                         type.flags & 256 /* EnumLiteral */ ? type.baseType :
-                            type.flags & 524288 /* Union */ && !(type.flags & 16 /* Enum */) ? getUnionType(ts.sameMap(type.types, getBaseTypeOfLiteralType)) :
+                            type.flags & 65536 /* Union */ && !(type.flags & 16 /* Enum */) ? getUnionType(ts.sameMap(type.types, getBaseTypeOfLiteralType)) :
                                 type;
         }
         function getWidenedLiteralType(type) {
-            return type.flags & 32 /* StringLiteral */ && type.flags & 16777216 /* FreshLiteral */ ? stringType :
-                type.flags & 64 /* NumberLiteral */ && type.flags & 16777216 /* FreshLiteral */ ? numberType :
+            return type.flags & 32 /* StringLiteral */ && type.flags & 1048576 /* FreshLiteral */ ? stringType :
+                type.flags & 64 /* NumberLiteral */ && type.flags & 1048576 /* FreshLiteral */ ? numberType :
                     type.flags & 128 /* BooleanLiteral */ ? booleanType :
                         type.flags & 256 /* EnumLiteral */ ? type.baseType :
-                            type.flags & 524288 /* Union */ && !(type.flags & 16 /* Enum */) ? getUnionType(ts.sameMap(type.types, getWidenedLiteralType)) :
+                            type.flags & 65536 /* Union */ && !(type.flags & 16 /* Enum */) ? getUnionType(ts.sameMap(type.types, getWidenedLiteralType)) :
                                 type;
         }
         /**
@@ -29590,7 +31375,7 @@ var ts;
          * Prefer using isTupleLikeType() unless the use of `elementTypes` is required.
          */
         function isTupleType(type) {
-            return !!(type.flags & 131072 /* Reference */ && type.target.flags & 262144 /* Tuple */);
+            return !!(getObjectFlags(type) & 4 /* Reference */ && type.target.objectFlags & 8 /* Tuple */);
         }
         function getFalsyFlagsOfTypes(types) {
             var result = 0;
@@ -29604,7 +31389,7 @@ var ts;
         // flags for the string, number, boolean, "", 0, false, void, undefined, or null types respectively. Returns
         // no flags for all other types (including non-falsy literal types).
         function getFalsyFlags(type) {
-            return type.flags & 524288 /* Union */ ? getFalsyFlagsOfTypes(type.types) :
+            return type.flags & 65536 /* Union */ ? getFalsyFlagsOfTypes(type.types) :
                 type.flags & 32 /* StringLiteral */ ? type.text === "" ? 32 /* StringLiteral */ : 0 :
                     type.flags & 64 /* NumberLiteral */ ? type.text === "0" ? 64 /* NumberLiteral */ : 0 :
                         type.flags & 128 /* BooleanLiteral */ ? type === falseType ? 128 /* BooleanLiteral */ : 0 :
@@ -29674,7 +31459,7 @@ var ts;
          * Leave signatures alone since they are not subject to the check.
          */
         function getRegularTypeOfObjectLiteral(type) {
-            if (!(type.flags & 8388608 /* ObjectLiteral */ && type.flags & 16777216 /* FreshLiteral */)) {
+            if (!(getObjectFlags(type) & 128 /* ObjectLiteral */ && type.flags & 1048576 /* FreshLiteral */)) {
                 return type;
             }
             var regularType = type.regularType;
@@ -29684,7 +31469,8 @@ var ts;
             var resolved = type;
             var members = transformTypeOfMembers(type, getRegularTypeOfObjectLiteral);
             var regularNew = createAnonymousType(resolved.symbol, members, resolved.callSignatures, resolved.constructSignatures, resolved.stringIndexInfo, resolved.numberIndexInfo);
-            regularNew.flags = resolved.flags & ~16777216 /* FreshLiteral */;
+            regularNew.flags = resolved.flags & ~1048576 /* FreshLiteral */;
+            regularNew.objectFlags |= 128 /* ObjectLiteral */;
             type.regularType = regularNew;
             return regularNew;
         }
@@ -29701,14 +31487,14 @@ var ts;
             return type.flags & 6144 /* Nullable */ ? type : getWidenedType(type);
         }
         function getWidenedType(type) {
-            if (type.flags & 100663296 /* RequiresWidening */) {
+            if (type.flags & 6291456 /* RequiresWidening */) {
                 if (type.flags & 6144 /* Nullable */) {
                     return anyType;
                 }
-                if (type.flags & 8388608 /* ObjectLiteral */) {
+                if (getObjectFlags(type) & 128 /* ObjectLiteral */) {
                     return getWidenedTypeOfObjectLiteral(type);
                 }
-                if (type.flags & 524288 /* Union */) {
+                if (type.flags & 65536 /* Union */) {
                     return getUnionType(ts.sameMap(type.types, getWidenedConstituentType));
                 }
                 if (isArrayType(type) || isTupleType(type)) {
@@ -29730,7 +31516,7 @@ var ts;
          */
         function reportWideningErrorsInType(type) {
             var errorReported = false;
-            if (type.flags & 524288 /* Union */) {
+            if (type.flags & 65536 /* Union */) {
                 for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                     var t = _a[_i];
                     if (reportWideningErrorsInType(t)) {
@@ -29746,11 +31532,11 @@ var ts;
                     }
                 }
             }
-            if (type.flags & 8388608 /* ObjectLiteral */) {
+            if (getObjectFlags(type) & 128 /* ObjectLiteral */) {
                 for (var _d = 0, _e = getPropertiesOfObjectType(type); _d < _e.length; _d++) {
                     var p = _e[_d];
                     var t = getTypeOfSymbol(p);
-                    if (t.flags & 33554432 /* ContainsWideningType */) {
+                    if (t.flags & 2097152 /* ContainsWideningType */) {
                         if (!reportWideningErrorsInType(t)) {
                             error(p.valueDeclaration, ts.Diagnostics.Object_literal_s_property_0_implicitly_has_an_1_type, p.name, typeToString(getWidenedType(t)));
                         }
@@ -29764,25 +31550,25 @@ var ts;
             var typeAsString = typeToString(getWidenedType(type));
             var diagnostic;
             switch (declaration.kind) {
-                case 146 /* PropertyDeclaration */:
-                case 145 /* PropertySignature */:
+                case 147 /* PropertyDeclaration */:
+                case 146 /* PropertySignature */:
                     diagnostic = ts.Diagnostics.Member_0_implicitly_has_an_1_type;
                     break;
-                case 143 /* Parameter */:
+                case 144 /* Parameter */:
                     diagnostic = declaration.dotDotDotToken ?
                         ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type :
                         ts.Diagnostics.Parameter_0_implicitly_has_an_1_type;
                     break;
-                case 170 /* BindingElement */:
+                case 174 /* BindingElement */:
                     diagnostic = ts.Diagnostics.Binding_element_0_implicitly_has_an_1_type;
                     break;
-                case 221 /* FunctionDeclaration */:
-                case 148 /* MethodDeclaration */:
-                case 147 /* MethodSignature */:
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
-                case 180 /* FunctionExpression */:
-                case 181 /* ArrowFunction */:
+                case 225 /* FunctionDeclaration */:
+                case 149 /* MethodDeclaration */:
+                case 148 /* MethodSignature */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
+                case 184 /* FunctionExpression */:
+                case 185 /* ArrowFunction */:
                     if (!declaration.name) {
                         error(declaration, ts.Diagnostics.Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
                         return;
@@ -29795,7 +31581,7 @@ var ts;
             error(declaration, diagnostic, ts.declarationNameToString(declaration.name), typeAsString);
         }
         function reportErrorsFromWidening(declaration, type) {
-            if (produceDiagnostics && compilerOptions.noImplicitAny && type.flags & 33554432 /* ContainsWideningType */) {
+            if (produceDiagnostics && compilerOptions.noImplicitAny && type.flags & 2097152 /* ContainsWideningType */) {
                 // Report implicit any error within type if possible, otherwise report error on declaration
                 if (!reportWideningErrorsInType(type)) {
                     reportImplicitAnyError(declaration, type);
@@ -29843,10 +31629,12 @@ var ts;
         // we perform type inference (i.e. a type parameter of a generic function). We cache
         // results for union and intersection types for performance reasons.
         function couldContainTypeParameters(type) {
+            var objectFlags = getObjectFlags(type);
             return !!(type.flags & 16384 /* TypeParameter */ ||
-                type.flags & 131072 /* Reference */ && ts.forEach(type.typeArguments, couldContainTypeParameters) ||
-                type.flags & 2097152 /* Anonymous */ && type.symbol && type.symbol.flags & (8192 /* Method */ | 2048 /* TypeLiteral */ | 32 /* Class */) ||
-                type.flags & 1572864 /* UnionOrIntersection */ && couldUnionOrIntersectionContainTypeParameters(type));
+                objectFlags & 4 /* Reference */ && ts.forEach(type.typeArguments, couldContainTypeParameters) ||
+                objectFlags & 16 /* Anonymous */ && type.symbol && type.symbol.flags & (8192 /* Method */ | 2048 /* TypeLiteral */ | 32 /* Class */) ||
+                objectFlags & 32 /* Mapped */ ||
+                type.flags & 196608 /* UnionOrIntersection */ && couldUnionOrIntersectionContainTypeParameters(type));
         }
         function couldUnionOrIntersectionContainTypeParameters(type) {
             if (type.couldContainTypeParameters === undefined) {
@@ -29855,7 +31643,7 @@ var ts;
             return type.couldContainTypeParameters;
         }
         function isTypeParameterAtTopLevel(type, typeParameter) {
-            return type === typeParameter || type.flags & 1572864 /* UnionOrIntersection */ && ts.forEach(type.types, function (t) { return isTypeParameterAtTopLevel(t, typeParameter); });
+            return type === typeParameter || type.flags & 196608 /* UnionOrIntersection */ && ts.forEach(type.types, function (t) { return isTypeParameterAtTopLevel(t, typeParameter); });
         }
         function inferTypes(context, originalSource, originalTarget) {
             var typeParameters = context.signature.typeParameters;
@@ -29877,8 +31665,18 @@ var ts;
                 if (!couldContainTypeParameters(target)) {
                     return;
                 }
-                if (source.flags & 524288 /* Union */ && target.flags & 524288 /* Union */ && !(source.flags & 16 /* Enum */ && target.flags & 16 /* Enum */) ||
-                    source.flags & 1048576 /* Intersection */ && target.flags & 1048576 /* Intersection */) {
+                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]);
+                    }
+                    return;
+                }
+                if (source.flags & 65536 /* Union */ && target.flags & 65536 /* Union */ && !(source.flags & 16 /* Enum */ && target.flags & 16 /* Enum */) ||
+                    source.flags & 131072 /* Intersection */ && target.flags & 131072 /* 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) {
@@ -29923,7 +31721,7 @@ var ts;
                     // it as an inference candidate. Hopefully, a better candidate will come along that does
                     // not contain anyFunctionType when we come back to this argument for its second round
                     // of inference.
-                    if (source.flags & 134217728 /* ContainsAnyFunctionType */) {
+                    if (source.flags & 8388608 /* ContainsAnyFunctionType */) {
                         return;
                     }
                     for (var i = 0; i < typeParameters.length; i++) {
@@ -29950,7 +31748,7 @@ var ts;
                         }
                     }
                 }
-                else if (source.flags & 131072 /* Reference */ && target.flags & 131072 /* Reference */ && source.target === target.target) {
+                else if (getObjectFlags(source) & 4 /* Reference */ && getObjectFlags(target) & 4 /* Reference */ && source.target === target.target) {
                     // If source and target are references to the same generic type, infer from type arguments
                     var sourceTypes = source.typeArguments || emptyArray;
                     var targetTypes = target.typeArguments || emptyArray;
@@ -29959,7 +31757,7 @@ var ts;
                         inferFromTypes(sourceTypes[i], targetTypes[i]);
                     }
                 }
-                else if (target.flags & 1572864 /* UnionOrIntersection */) {
+                else if (target.flags & 196608 /* UnionOrIntersection */) {
                     var targetTypes = target.types;
                     var typeParameterCount = 0;
                     var typeParameter = void 0;
@@ -29983,7 +31781,7 @@ var ts;
                         inferiority--;
                     }
                 }
-                else if (source.flags & 1572864 /* UnionOrIntersection */) {
+                else if (source.flags & 196608 /* UnionOrIntersection */) {
                     // Source is a union or intersection type, infer from each constituent type
                     var sourceTypes = source.types;
                     for (var _e = 0, sourceTypes_3 = sourceTypes; _e < sourceTypes_3.length; _e++) {
@@ -29992,8 +31790,21 @@ var ts;
                     }
                 }
                 else {
+                    if (getObjectFlags(target) & 32 /* Mapped */) {
+                        var constraintType = getConstraintTypeFromMappedType(target);
+                        if (getObjectFlags(source) & 32 /* Mapped */) {
+                            inferFromTypes(getConstraintTypeFromMappedType(source), constraintType);
+                            inferFromTypes(getTemplateTypeFromMappedType(source), getTemplateTypeFromMappedType(target));
+                            return;
+                        }
+                        if (constraintType.flags & 16384 /* TypeParameter */) {
+                            inferFromTypes(getIndexType(source), constraintType);
+                            inferFromTypes(getUnionType(ts.map(getPropertiesOfType(source), getTypeOfSymbol)), getTemplateTypeFromMappedType(target));
+                            return;
+                        }
+                    }
                     source = getApparentType(source);
-                    if (source.flags & 2588672 /* ObjectType */) {
+                    if (source.flags & 32768 /* Object */) {
                         if (isInProcess(source, target)) {
                             return;
                         }
@@ -30022,8 +31833,8 @@ var ts;
             }
             function inferFromProperties(source, target) {
                 var properties = getPropertiesOfObjectType(target);
-                for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
-                    var targetProp = properties_3[_i];
+                for (var _i = 0, properties_4 = properties; _i < properties_4.length; _i++) {
+                    var targetProp = properties_4[_i];
                     var sourceProp = getPropertyOfObjectType(source, targetProp.name);
                     if (sourceProp) {
                         inferFromTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp));
@@ -30093,7 +31904,7 @@ var ts;
                     reducedTypes.push(t);
                 }
             }
-            return type.flags & 524288 /* Union */ ? getUnionType(reducedTypes) : getIntersectionType(reducedTypes);
+            return type.flags & 65536 /* Union */ ? getUnionType(reducedTypes) : getIntersectionType(reducedTypes);
         }
         function getInferenceCandidates(context, index) {
             var inferences = context.inferences[index];
@@ -30101,7 +31912,7 @@ var ts;
         }
         function hasPrimitiveConstraint(type) {
             var constraint = getConstraintOfTypeParameter(type);
-            return constraint && maybeTypeOfKind(constraint, 8190 /* Primitive */);
+            return constraint && maybeTypeOfKind(constraint, 8190 /* Primitive */ | 262144 /* Index */);
         }
         function getInferredType(context, index) {
             var inferredType = context.inferredTypes[index];
@@ -30171,10 +31982,10 @@ var ts;
             // The expression is restricted to a single identifier or a sequence of identifiers separated by periods
             while (node) {
                 switch (node.kind) {
-                    case 159 /* TypeQuery */:
+                    case 160 /* TypeQuery */:
                         return true;
                     case 70 /* Identifier */:
-                    case 140 /* QualifiedName */:
+                    case 141 /* QualifiedName */:
                         node = node.parent;
                         continue;
                     default:
@@ -30195,7 +32006,7 @@ var ts;
             if (node.kind === 98 /* ThisKeyword */) {
                 return "0";
             }
-            if (node.kind === 173 /* PropertyAccessExpression */) {
+            if (node.kind === 177 /* PropertyAccessExpression */) {
                 var key = getFlowCacheKey(node.expression);
                 return key && key + "." + node.name.text;
             }
@@ -30206,7 +32017,7 @@ var ts;
                 case 70 /* Identifier */:
                 case 98 /* ThisKeyword */:
                     return node;
-                case 173 /* PropertyAccessExpression */:
+                case 177 /* PropertyAccessExpression */:
                     return getLeftmostIdentifierOrThis(node.expression);
             }
             return undefined;
@@ -30215,19 +32026,19 @@ var ts;
             switch (source.kind) {
                 case 70 /* Identifier */:
                     return target.kind === 70 /* Identifier */ && getResolvedSymbol(source) === getResolvedSymbol(target) ||
-                        (target.kind === 219 /* VariableDeclaration */ || target.kind === 170 /* BindingElement */) &&
+                        (target.kind === 223 /* VariableDeclaration */ || target.kind === 174 /* BindingElement */) &&
                             getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(source)) === getSymbolOfNode(target);
                 case 98 /* ThisKeyword */:
                     return target.kind === 98 /* ThisKeyword */;
-                case 173 /* PropertyAccessExpression */:
-                    return target.kind === 173 /* PropertyAccessExpression */ &&
+                case 177 /* PropertyAccessExpression */:
+                    return target.kind === 177 /* PropertyAccessExpression */ &&
                         source.name.text === target.name.text &&
                         isMatchingReference(source.expression, target.expression);
             }
             return false;
         }
         function containsMatchingReference(source, target) {
-            while (source.kind === 173 /* PropertyAccessExpression */) {
+            while (source.kind === 177 /* PropertyAccessExpression */) {
                 source = source.expression;
                 if (isMatchingReference(source, target)) {
                     return true;
@@ -30240,7 +32051,7 @@ var ts;
         // a possible discriminant if its type differs in the constituents of containing union type, and if every
         // choice is a unit type or a union of unit types.
         function containsMatchingReferenceDiscriminant(source, target) {
-            return target.kind === 173 /* PropertyAccessExpression */ &&
+            return target.kind === 177 /* PropertyAccessExpression */ &&
                 containsMatchingReference(source, target.expression) &&
                 isDiscriminantProperty(getDeclaredTypeOfReference(target.expression), target.name.text);
         }
@@ -30248,14 +32059,14 @@ var ts;
             if (expr.kind === 70 /* Identifier */) {
                 return getTypeOfSymbol(getResolvedSymbol(expr));
             }
-            if (expr.kind === 173 /* PropertyAccessExpression */) {
+            if (expr.kind === 177 /* PropertyAccessExpression */) {
                 var type = getDeclaredTypeOfReference(expr.expression);
                 return type && getTypeOfPropertyOfType(type, expr.name.text);
             }
             return undefined;
         }
         function isDiscriminantProperty(type, name) {
-            if (type && type.flags & 524288 /* Union */) {
+            if (type && type.flags & 65536 /* Union */) {
                 var prop = getUnionOrIntersectionProperty(type, name);
                 if (prop && prop.flags & 268435456 /* SyntheticProperty */) {
                     if (prop.isDiscriminantProperty === undefined) {
@@ -30278,7 +32089,7 @@ var ts;
                     }
                 }
             }
-            if (callExpression.expression.kind === 173 /* PropertyAccessExpression */ &&
+            if (callExpression.expression.kind === 177 /* PropertyAccessExpression */ &&
                 isOrContainsMatchingReference(reference, callExpression.expression.expression)) {
                 return true;
             }
@@ -30292,7 +32103,7 @@ var ts;
             return flow.id;
         }
         function typeMaybeAssignableTo(source, target) {
-            if (!(source.flags & 524288 /* Union */)) {
+            if (!(source.flags & 65536 /* Union */)) {
                 return isTypeAssignableTo(source, target);
             }
             for (var _i = 0, _a = source.types; _i < _a.length; _i++) {
@@ -30360,7 +32171,7 @@ var ts;
                     type === falseType ? 3030404 /* FalseStrictFacts */ : 1981828 /* TrueStrictFacts */ :
                     type === falseType ? 3145092 /* FalseFacts */ : 4193668 /* TrueFacts */;
             }
-            if (flags & 2588672 /* ObjectType */) {
+            if (flags & 32768 /* Object */) {
                 return isFunctionObjectType(type) ?
                     strictNullChecks ? 6164448 /* FunctionStrictFacts */ : 8376288 /* FunctionFacts */ :
                     strictNullChecks ? 6166480 /* ObjectStrictFacts */ : 8378320 /* ObjectFacts */;
@@ -30378,7 +32189,7 @@ var ts;
                 var constraint = getConstraintOfTypeParameter(type);
                 return getTypeFacts(constraint || emptyObjectType);
             }
-            if (flags & 1572864 /* UnionOrIntersection */) {
+            if (flags & 196608 /* UnionOrIntersection */) {
                 return getTypeFactsOfTypes(type.types);
             }
             return 8388607 /* All */;
@@ -30394,7 +32205,7 @@ var ts;
             return type;
         }
         function getTypeOfDestructuredProperty(type, name) {
-            var text = getTextOfPropertyName(name);
+            var text = ts.getTextOfPropertyName(name);
             return getTypeOfPropertyOfType(type, text) ||
                 isNumericLiteralName(text) && getIndexTypeOfType(type, 1 /* Number */) ||
                 getIndexTypeOfType(type, 0 /* String */) ||
@@ -30405,19 +32216,19 @@ var ts;
                 checkIteratedTypeOrElementType(type, /*errorNode*/ undefined, /*allowStringInput*/ false) ||
                 unknownType;
         }
-        function getTypeOfDestructuredSpreadElement(type) {
+        function getTypeOfDestructuredSpreadExpression(type) {
             return createArrayType(checkIteratedTypeOrElementType(type, /*errorNode*/ undefined, /*allowStringInput*/ false) || unknownType);
         }
         function getAssignedTypeOfBinaryExpression(node) {
-            return node.parent.kind === 171 /* ArrayLiteralExpression */ || node.parent.kind === 253 /* PropertyAssignment */ ?
+            return node.parent.kind === 175 /* ArrayLiteralExpression */ || node.parent.kind === 257 /* PropertyAssignment */ ?
                 getTypeWithDefault(getAssignedType(node), node.right) :
                 checkExpression(node.right);
         }
         function getAssignedTypeOfArrayLiteralElement(node, element) {
             return getTypeOfDestructuredArrayElement(getAssignedType(node), ts.indexOf(node.elements, element));
         }
-        function getAssignedTypeOfSpreadElement(node) {
-            return getTypeOfDestructuredSpreadElement(getAssignedType(node.parent));
+        function getAssignedTypeOfSpreadExpression(node) {
+            return getTypeOfDestructuredSpreadExpression(getAssignedType(node.parent));
         }
         function getAssignedTypeOfPropertyAssignment(node) {
             return getTypeOfDestructuredProperty(getAssignedType(node.parent), node.name);
@@ -30428,21 +32239,21 @@ var ts;
         function getAssignedType(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 208 /* ForInStatement */:
+                case 212 /* ForInStatement */:
                     return stringType;
-                case 209 /* ForOfStatement */:
+                case 213 /* ForOfStatement */:
                     return checkRightHandSideOfForOf(parent.expression) || unknownType;
-                case 188 /* BinaryExpression */:
+                case 192 /* BinaryExpression */:
                     return getAssignedTypeOfBinaryExpression(parent);
-                case 182 /* DeleteExpression */:
+                case 186 /* DeleteExpression */:
                     return undefinedType;
-                case 171 /* ArrayLiteralExpression */:
+                case 175 /* ArrayLiteralExpression */:
                     return getAssignedTypeOfArrayLiteralElement(parent, node);
-                case 192 /* SpreadElementExpression */:
-                    return getAssignedTypeOfSpreadElement(parent);
-                case 253 /* PropertyAssignment */:
+                case 196 /* SpreadElement */:
+                    return getAssignedTypeOfSpreadExpression(parent);
+                case 257 /* PropertyAssignment */:
                     return getAssignedTypeOfPropertyAssignment(parent);
-                case 254 /* ShorthandPropertyAssignment */:
+                case 258 /* ShorthandPropertyAssignment */:
                     return getAssignedTypeOfShorthandPropertyAssignment(parent);
             }
             return unknownType;
@@ -30450,11 +32261,11 @@ var ts;
         function getInitialTypeOfBindingElement(node) {
             var pattern = node.parent;
             var parentType = getInitialType(pattern.parent);
-            var type = pattern.kind === 168 /* ObjectBindingPattern */ ?
+            var type = pattern.kind === 172 /* ObjectBindingPattern */ ?
                 getTypeOfDestructuredProperty(parentType, node.propertyName || node.name) :
                 !node.dotDotDotToken ?
                     getTypeOfDestructuredArrayElement(parentType, ts.indexOf(pattern.elements, node)) :
-                    getTypeOfDestructuredSpreadElement(parentType);
+                    getTypeOfDestructuredSpreadExpression(parentType);
             return getTypeWithDefault(type, node.initializer);
         }
         function getTypeOfInitializer(node) {
@@ -30468,35 +32279,35 @@ var ts;
             if (node.initializer) {
                 return getTypeOfInitializer(node.initializer);
             }
-            if (node.parent.parent.kind === 208 /* ForInStatement */) {
+            if (node.parent.parent.kind === 212 /* ForInStatement */) {
                 return stringType;
             }
-            if (node.parent.parent.kind === 209 /* ForOfStatement */) {
+            if (node.parent.parent.kind === 213 /* ForOfStatement */) {
                 return checkRightHandSideOfForOf(node.parent.parent.expression) || unknownType;
             }
             return unknownType;
         }
         function getInitialType(node) {
-            return node.kind === 219 /* VariableDeclaration */ ?
+            return node.kind === 223 /* VariableDeclaration */ ?
                 getInitialTypeOfVariableDeclaration(node) :
                 getInitialTypeOfBindingElement(node);
         }
         function getInitialOrAssignedType(node) {
-            return node.kind === 219 /* VariableDeclaration */ || node.kind === 170 /* BindingElement */ ?
+            return node.kind === 223 /* VariableDeclaration */ || node.kind === 174 /* BindingElement */ ?
                 getInitialType(node) :
                 getAssignedType(node);
         }
         function isEmptyArrayAssignment(node) {
-            return node.kind === 219 /* VariableDeclaration */ && node.initializer &&
+            return node.kind === 223 /* VariableDeclaration */ && node.initializer &&
                 isEmptyArrayLiteral(node.initializer) ||
-                node.kind !== 170 /* BindingElement */ && node.parent.kind === 188 /* BinaryExpression */ &&
+                node.kind !== 174 /* BindingElement */ && node.parent.kind === 192 /* BinaryExpression */ &&
                     isEmptyArrayLiteral(node.parent.right);
         }
         function getReferenceCandidate(node) {
             switch (node.kind) {
-                case 179 /* ParenthesizedExpression */:
+                case 183 /* ParenthesizedExpression */:
                     return getReferenceCandidate(node.expression);
-                case 188 /* BinaryExpression */:
+                case 192 /* BinaryExpression */:
                     switch (node.operatorToken.kind) {
                         case 57 /* EqualsToken */:
                             return getReferenceCandidate(node.left);
@@ -30508,13 +32319,13 @@ var ts;
         }
         function getReferenceRoot(node) {
             var parent = node.parent;
-            return parent.kind === 179 /* ParenthesizedExpression */ ||
-                parent.kind === 188 /* BinaryExpression */ && parent.operatorToken.kind === 57 /* EqualsToken */ && parent.left === node ||
-                parent.kind === 188 /* BinaryExpression */ && parent.operatorToken.kind === 25 /* CommaToken */ && parent.right === node ?
+            return parent.kind === 183 /* ParenthesizedExpression */ ||
+                parent.kind === 192 /* BinaryExpression */ && parent.operatorToken.kind === 57 /* EqualsToken */ && parent.left === node ||
+                parent.kind === 192 /* BinaryExpression */ && parent.operatorToken.kind === 25 /* CommaToken */ && parent.right === node ?
                 getReferenceRoot(parent) : node;
         }
         function getTypeOfSwitchClause(clause) {
-            if (clause.kind === 249 /* CaseClause */) {
+            if (clause.kind === 253 /* CaseClause */) {
                 var caseType = getRegularTypeOfLiteralType(checkExpression(clause.expression));
                 return isUnitType(caseType) ? caseType : undefined;
             }
@@ -30531,13 +32342,13 @@ var ts;
             return links.switchTypes;
         }
         function eachTypeContainedIn(source, types) {
-            return source.flags & 524288 /* Union */ ? !ts.forEach(source.types, function (t) { return !ts.contains(types, t); }) : ts.contains(types, source);
+            return source.flags & 65536 /* Union */ ? !ts.forEach(source.types, function (t) { return !ts.contains(types, t); }) : ts.contains(types, source);
         }
         function isTypeSubsetOf(source, target) {
-            return source === target || target.flags & 524288 /* Union */ && isTypeSubsetOfUnion(source, target);
+            return source === target || target.flags & 65536 /* Union */ && isTypeSubsetOfUnion(source, target);
         }
         function isTypeSubsetOfUnion(source, target) {
-            if (source.flags & 524288 /* Union */) {
+            if (source.flags & 65536 /* Union */) {
                 for (var _i = 0, _a = source.types; _i < _a.length; _i++) {
                     var t = _a[_i];
                     if (!containsType(target.types, t)) {
@@ -30551,8 +32362,11 @@ var ts;
             }
             return containsType(target.types, source);
         }
+        function forEachType(type, f) {
+            return type.flags & 65536 /* Union */ ? ts.forEach(type.types, f) : f(type);
+        }
         function filterType(type, f) {
-            if (type.flags & 524288 /* Union */) {
+            if (type.flags & 65536 /* Union */) {
                 var types = type.types;
                 var filtered = ts.filter(types, f);
                 return filtered === types ? type : getUnionTypeFromSortedList(filtered);
@@ -30560,7 +32374,7 @@ var ts;
             return f(type) ? type : neverType;
         }
         function mapType(type, f) {
-            return type.flags & 524288 /* Union */ ? getUnionType(ts.map(type.types, f)) : f(type);
+            return type.flags & 65536 /* Union */ ? getUnionType(ts.map(type.types, f)) : f(type);
         }
         function extractTypesOfKind(type, kind) {
             return filterType(type, function (t) { return (t.flags & kind) !== 0; });
@@ -30593,7 +32407,7 @@ var ts;
         // array types are ultimately converted into manifest array types (using getFinalArrayType)
         // and never escape the getFlowTypeOfReference function.
         function createEvolvingArrayType(elementType) {
-            var result = createObjectType(2097152 /* Anonymous */);
+            var result = createObjectType(256 /* EvolvingArray */);
             result.elementType = elementType;
             return result;
         }
@@ -30607,13 +32421,10 @@ var ts;
             var elementType = getBaseTypeOfLiteralType(checkExpression(node));
             return isTypeSubsetOf(elementType, evolvingArrayType.elementType) ? evolvingArrayType : getEvolvingArrayType(getUnionType([evolvingArrayType.elementType, elementType]));
         }
-        function isEvolvingArrayType(type) {
-            return !!(type.flags & 2097152 /* Anonymous */ && type.elementType);
-        }
         function createFinalArrayType(elementType) {
             return elementType.flags & 8192 /* Never */ ?
                 autoArrayType :
-                createArrayType(elementType.flags & 524288 /* Union */ ?
+                createArrayType(elementType.flags & 65536 /* Union */ ?
                     getUnionType(elementType.types, /*subtypeReduction*/ true) :
                     elementType);
         }
@@ -30622,17 +32433,17 @@ var ts;
             return evolvingArrayType.finalArrayType || (evolvingArrayType.finalArrayType = createFinalArrayType(evolvingArrayType.elementType));
         }
         function finalizeEvolvingArrayType(type) {
-            return isEvolvingArrayType(type) ? getFinalArrayType(type) : type;
+            return getObjectFlags(type) & 256 /* EvolvingArray */ ? getFinalArrayType(type) : type;
         }
         function getElementTypeOfEvolvingArrayType(type) {
-            return isEvolvingArrayType(type) ? type.elementType : neverType;
+            return getObjectFlags(type) & 256 /* EvolvingArray */ ? type.elementType : neverType;
         }
         function isEvolvingArrayTypeList(types) {
             var hasEvolvingArrayType = false;
             for (var _i = 0, types_12 = types; _i < types_12.length; _i++) {
                 var t = types_12[_i];
                 if (!(t.flags & 8192 /* Never */)) {
-                    if (!isEvolvingArrayType(t)) {
+                    if (!(getObjectFlags(t) & 256 /* EvolvingArray */)) {
                         return false;
                     }
                     hasEvolvingArrayType = true;
@@ -30653,20 +32464,40 @@ var ts;
         function isEvolvingArrayOperationTarget(node) {
             var root = getReferenceRoot(node);
             var parent = root.parent;
-            var isLengthPushOrUnshift = parent.kind === 173 /* PropertyAccessExpression */ && (parent.name.text === "length" ||
-                parent.parent.kind === 175 /* CallExpression */ && ts.isPushOrUnshiftIdentifier(parent.name));
-            var isElementAssignment = parent.kind === 174 /* ElementAccessExpression */ &&
+            var isLengthPushOrUnshift = parent.kind === 177 /* PropertyAccessExpression */ && (parent.name.text === "length" ||
+                parent.parent.kind === 179 /* CallExpression */ && ts.isPushOrUnshiftIdentifier(parent.name));
+            var isElementAssignment = parent.kind === 178 /* ElementAccessExpression */ &&
                 parent.expression === root &&
-                parent.parent.kind === 188 /* BinaryExpression */ &&
+                parent.parent.kind === 192 /* BinaryExpression */ &&
                 parent.parent.operatorToken.kind === 57 /* EqualsToken */ &&
                 parent.parent.left === parent &&
                 !ts.isAssignmentTarget(parent.parent) &&
                 isTypeAnyOrAllConstituentTypesHaveKind(checkExpression(parent.argumentExpression), 340 /* NumberLike */ | 2048 /* Undefined */);
             return isLengthPushOrUnshift || isElementAssignment;
         }
+        function maybeTypePredicateCall(node) {
+            var links = getNodeLinks(node);
+            if (links.maybeTypePredicate === undefined) {
+                links.maybeTypePredicate = getMaybeTypePredicate(node);
+            }
+            return links.maybeTypePredicate;
+        }
+        function getMaybeTypePredicate(node) {
+            if (node.expression.kind !== 96 /* SuperKeyword */) {
+                var funcType = checkNonNullExpression(node.expression);
+                if (funcType !== silentNeverType) {
+                    var apparentType = getApparentType(funcType);
+                    if (apparentType !== unknownType) {
+                        var callSignatures = getSignaturesOfType(apparentType, 0 /* Call */);
+                        return !!ts.forEach(callSignatures, function (sig) { return sig.typePredicate; });
+                    }
+                }
+            }
+            return false;
+        }
         function getFlowTypeOfReference(reference, declaredType, assumeInitialized, flowContainer) {
             var key;
-            if (!reference.flowNode || assumeInitialized && !(declaredType.flags & 4178943 /* Narrowable */)) {
+            if (!reference.flowNode || assumeInitialized && !(declaredType.flags & 1033215 /* Narrowable */)) {
                 return declaredType;
             }
             var initialType = assumeInitialized ? declaredType :
@@ -30679,8 +32510,8 @@ var ts;
             // we give type 'any[]' to 'x' instead of using the type determined by control flow analysis such that operations
             // on empty arrays are possible without implicit any errors and new element types can be inferred without
             // type mismatch errors.
-            var resultType = isEvolvingArrayType(evolvedType) && isEvolvingArrayOperationTarget(reference) ? anyArrayType : finalizeEvolvingArrayType(evolvedType);
-            if (reference.parent.kind === 197 /* NonNullExpression */ && getTypeWithFacts(resultType, 524288 /* NEUndefinedOrNull */).flags & 8192 /* Never */) {
+            var resultType = getObjectFlags(evolvedType) & 256 /* EvolvingArray */ && isEvolvingArrayOperationTarget(reference) ? anyArrayType : finalizeEvolvingArrayType(evolvedType);
+            if (reference.parent.kind === 201 /* NonNullExpression */ && getTypeWithFacts(resultType, 524288 /* NEUndefinedOrNull */).flags & 8192 /* Never */) {
                 return declaredType;
             }
             return resultType;
@@ -30729,7 +32560,7 @@ var ts;
                     else if (flow.flags & 2 /* Start */) {
                         // Check if we should continue with the control flow of the containing function.
                         var container = flow.container;
-                        if (container && container !== flowContainer && reference.kind !== 173 /* PropertyAccessExpression */) {
+                        if (container && container !== flowContainer && reference.kind !== 177 /* PropertyAccessExpression */) {
                             flow = container.flowNode;
                             continue;
                         }
@@ -30755,7 +32586,7 @@ var ts;
                 // Assignments only narrow the computed type if the declared type is a union type. Thus, we
                 // only need to evaluate the assigned type if the declared type is a union type.
                 if (isMatchingReference(reference, node)) {
-                    if (node.parent.kind === 186 /* PrefixUnaryExpression */ || node.parent.kind === 187 /* PostfixUnaryExpression */) {
+                    if (ts.getAssignmentTargetKind(node) === 2 /* Compound */) {
                         var flowType = getTypeAtFlowNode(flow.antecedent);
                         return createFlowType(getBaseTypeOfLiteralType(getTypeFromFlowType(flowType)), isIncomplete(flowType));
                     }
@@ -30766,7 +32597,7 @@ var ts;
                         var assignedType = getBaseTypeOfLiteralType(getInitialOrAssignedType(node));
                         return isTypeAssignableTo(assignedType, declaredType) ? assignedType : anyArrayType;
                     }
-                    if (declaredType.flags & 524288 /* Union */) {
+                    if (declaredType.flags & 65536 /* Union */) {
                         return getAssignmentReducedType(declaredType, getInitialOrAssignedType(node));
                     }
                     return declaredType;
@@ -30783,15 +32614,15 @@ var ts;
             }
             function getTypeAtFlowArrayMutation(flow) {
                 var node = flow.node;
-                var expr = node.kind === 175 /* CallExpression */ ?
+                var expr = node.kind === 179 /* CallExpression */ ?
                     node.expression.expression :
                     node.left.expression;
                 if (isMatchingReference(reference, getReferenceCandidate(expr))) {
                     var flowType = getTypeAtFlowNode(flow.antecedent);
                     var type = getTypeFromFlowType(flowType);
-                    if (isEvolvingArrayType(type)) {
+                    if (getObjectFlags(type) & 256 /* EvolvingArray */) {
                         var evolvedType_1 = type;
-                        if (node.kind === 175 /* CallExpression */) {
+                        if (node.kind === 179 /* CallExpression */) {
                             for (var _i = 0, _a = node.arguments; _i < _a.length; _i++) {
                                 var arg = _a[_i];
                                 evolvedType_1 = addEvolvingArrayElementType(evolvedType_1, arg);
@@ -30946,8 +32777,8 @@ var ts;
                 return cache[key] = result;
             }
             function isMatchingReferenceDiscriminant(expr) {
-                return expr.kind === 173 /* PropertyAccessExpression */ &&
-                    declaredType.flags & 524288 /* Union */ &&
+                return expr.kind === 177 /* PropertyAccessExpression */ &&
+                    declaredType.flags & 65536 /* Union */ &&
                     isMatchingReference(reference, expr.expression) &&
                     isDiscriminantProperty(declaredType, expr.name.text);
             }
@@ -30980,10 +32811,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 === 183 /* TypeOfExpression */ && right_1.kind === 9 /* StringLiteral */) {
+                        if (left_1.kind === 187 /* TypeOfExpression */ && right_1.kind === 9 /* StringLiteral */) {
                             return narrowTypeByTypeof(type, left_1, operator_1, right_1, assumeTrue);
                         }
-                        if (right_1.kind === 183 /* TypeOfExpression */ && left_1.kind === 9 /* StringLiteral */) {
+                        if (right_1.kind === 187 /* TypeOfExpression */ && left_1.kind === 9 /* StringLiteral */) {
                             return narrowTypeByTypeof(type, right_1, operator_1, left_1, assumeTrue);
                         }
                         if (isMatchingReference(reference, left_1)) {
@@ -31029,7 +32860,7 @@ var ts;
                             assumeTrue ? 16384 /* EQUndefined */ : 131072 /* NEUndefined */;
                     return getTypeWithFacts(type, facts);
                 }
-                if (type.flags & 2589185 /* NotUnionOrUnit */) {
+                if (type.flags & 33281 /* NotUnionOrUnit */) {
                     return type;
                 }
                 if (assumeTrue) {
@@ -31056,7 +32887,7 @@ var ts;
                 if (operator === 32 /* ExclamationEqualsToken */ || operator === 34 /* ExclamationEqualsEqualsToken */) {
                     assumeTrue = !assumeTrue;
                 }
-                if (assumeTrue && !(type.flags & 524288 /* Union */)) {
+                if (assumeTrue && !(type.flags & 65536 /* Union */)) {
                     // We narrow a non-union type to an exact primitive type if the non-union type
                     // is a supertype of that primitive type. For example, type 'any' can be narrowed
                     // to one of the primitive types.
@@ -31118,10 +32949,10 @@ var ts;
                 if (!targetType) {
                     // Target type is type of construct signature
                     var constructSignatures = void 0;
-                    if (rightType.flags & 65536 /* Interface */) {
+                    if (getObjectFlags(rightType) & 2 /* Interface */) {
                         constructSignatures = resolveDeclaredMembers(rightType).declaredConstructSignatures;
                     }
-                    else if (rightType.flags & 2097152 /* Anonymous */) {
+                    else if (getObjectFlags(rightType) & 16 /* Anonymous */) {
                         constructSignatures = getSignaturesOfType(rightType, 1 /* Construct */);
                     }
                     if (constructSignatures && constructSignatures.length) {
@@ -31139,7 +32970,7 @@ var ts;
                 }
                 // If the current type is a union type, remove all constituents that couldn't be instances of
                 // the candidate type. If one or more constituents remain, return a union of those.
-                if (type.flags & 524288 /* Union */) {
+                if (type.flags & 65536 /* Union */) {
                     var assignableType = filterType(type, function (t) { return isTypeInstanceOf(t, candidate); });
                     if (!(assignableType.flags & 8192 /* Never */)) {
                         return assignableType;
@@ -31157,7 +32988,7 @@ var ts;
                             getIntersectionType([type, candidate]);
             }
             function narrowTypeByTypePredicate(type, callExpression, assumeTrue) {
-                if (!hasMatchingArgument(callExpression, reference)) {
+                if (!hasMatchingArgument(callExpression, reference) || !maybeTypePredicateCall(callExpression)) {
                     return type;
                 }
                 var signature = getResolvedSignature(callExpression);
@@ -31181,10 +33012,10 @@ var ts;
                     }
                 }
                 else {
-                    var invokedExpression = skipParenthesizedNodes(callExpression.expression);
-                    if (invokedExpression.kind === 174 /* ElementAccessExpression */ || invokedExpression.kind === 173 /* PropertyAccessExpression */) {
+                    var invokedExpression = ts.skipParentheses(callExpression.expression);
+                    if (invokedExpression.kind === 178 /* ElementAccessExpression */ || invokedExpression.kind === 177 /* PropertyAccessExpression */) {
                         var accessExpression = invokedExpression;
-                        var possibleReference = skipParenthesizedNodes(accessExpression.expression);
+                        var possibleReference = ts.skipParentheses(accessExpression.expression);
                         if (isMatchingReference(reference, possibleReference)) {
                             return getNarrowedType(type, predicate.type, assumeTrue);
                         }
@@ -31201,15 +33032,15 @@ var ts;
                 switch (expr.kind) {
                     case 70 /* Identifier */:
                     case 98 /* ThisKeyword */:
-                    case 173 /* PropertyAccessExpression */:
+                    case 177 /* PropertyAccessExpression */:
                         return narrowTypeByTruthiness(type, expr, assumeTrue);
-                    case 175 /* CallExpression */:
+                    case 179 /* CallExpression */:
                         return narrowTypeByTypePredicate(type, expr, assumeTrue);
-                    case 179 /* ParenthesizedExpression */:
+                    case 183 /* ParenthesizedExpression */:
                         return narrowType(type, expr.expression, assumeTrue);
-                    case 188 /* BinaryExpression */:
+                    case 192 /* BinaryExpression */:
                         return narrowTypeByBinaryExpression(type, expr, assumeTrue);
-                    case 186 /* PrefixUnaryExpression */:
+                    case 190 /* PrefixUnaryExpression */:
                         if (expr.operator === 50 /* ExclamationToken */) {
                             return narrowType(type, expr.operand, !assumeTrue);
                         }
@@ -31241,19 +33072,13 @@ var ts;
             // binder), we simply return the declared type of the symbol.
             return getTypeOfSymbol(symbol);
         }
-        function skipParenthesizedNodes(expression) {
-            while (expression.kind === 179 /* ParenthesizedExpression */) {
-                expression = expression.expression;
-            }
-            return expression;
-        }
         function getControlFlowContainer(node) {
             while (true) {
                 node = node.parent;
                 if (ts.isFunctionLike(node) && !ts.getImmediatelyInvokedFunctionExpression(node) ||
-                    node.kind === 227 /* ModuleBlock */ ||
-                    node.kind === 256 /* SourceFile */ ||
-                    node.kind === 146 /* PropertyDeclaration */) {
+                    node.kind === 231 /* ModuleBlock */ ||
+                    node.kind === 261 /* SourceFile */ ||
+                    node.kind === 147 /* PropertyDeclaration */) {
                     return node;
                 }
             }
@@ -31285,7 +33110,7 @@ var ts;
             if (node.kind === 70 /* Identifier */) {
                 if (ts.isAssignmentTarget(node)) {
                     var symbol = getResolvedSymbol(node);
-                    if (symbol.valueDeclaration && ts.getRootDeclaration(symbol.valueDeclaration).kind === 143 /* Parameter */) {
+                    if (symbol.valueDeclaration && ts.getRootDeclaration(symbol.valueDeclaration).kind === 144 /* Parameter */) {
                         symbol.isAssigned = true;
                     }
                 }
@@ -31299,6 +33124,9 @@ var ts;
         }
         function checkIdentifier(node) {
             var symbol = getResolvedSymbol(node);
+            if (symbol === unknownSymbol) {
+                return unknownType;
+            }
             // As noted in ECMAScript 6 language spec, arrow functions never have an arguments objects.
             // Although in down-level emit of arrow function, we emit it using function expression which means that
             // arguments objects will be bound to the inner object; emitting arrow function natively in ES6, arguments objects
@@ -31308,16 +33136,17 @@ var ts;
             if (symbol === argumentsSymbol) {
                 var container = ts.getContainingFunction(node);
                 if (languageVersion < 2 /* ES2015 */) {
-                    if (container.kind === 181 /* ArrowFunction */) {
+                    if (container.kind === 185 /* 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 */)) {
                         error(node, ts.Diagnostics.The_arguments_object_cannot_be_referenced_in_an_async_function_or_method_in_ES3_and_ES5_Consider_using_a_standard_function_or_method);
                     }
                 }
-                if (node.flags & 262144 /* AwaitContext */) {
+                if (node.flags & 524288 /* AwaitContext */) {
                     getNodeLinks(container).flags |= 8192 /* CaptureArguments */;
                 }
+                return getTypeOfSymbol(symbol);
             }
             if (symbol.flags & 8388608 /* Alias */ && !isInTypeQuery(node) && !isConstEnumOrConstEnumOnlyModule(resolveAlias(symbol))) {
                 markAliasSymbolAsReferenced(symbol);
@@ -31329,7 +33158,7 @@ var ts;
                 // must instead be rewritten to point to a temporary variable to avoid issues with the double-bind
                 // behavior of class names in ES6.
                 if (languageVersion === 2 /* ES2015 */
-                    && declaration_1.kind === 222 /* ClassDeclaration */
+                    && declaration_1.kind === 226 /* ClassDeclaration */
                     && ts.nodeIsDecorated(declaration_1)) {
                     var container = ts.getContainingClass(node);
                     while (container !== undefined) {
@@ -31341,14 +33170,14 @@ var ts;
                         container = ts.getContainingClass(container);
                     }
                 }
-                else if (declaration_1.kind === 193 /* ClassExpression */) {
+                else if (declaration_1.kind === 197 /* 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 !== undefined) {
                         if (container.parent === declaration_1) {
-                            if (container.kind === 146 /* PropertyDeclaration */ && ts.hasModifier(container, 32 /* Static */)) {
+                            if (container.kind === 147 /* PropertyDeclaration */ && ts.hasModifier(container, 32 /* Static */)) {
                                 getNodeLinks(declaration_1).flags |= 8388608 /* ClassWithConstructorReference */;
                                 getNodeLinks(node).flags |= 16777216 /* ConstructorReferenceInClass */;
                             }
@@ -31363,23 +33192,34 @@ var ts;
             checkNestedBlockScopedBinding(node, symbol);
             var type = getTypeOfSymbol(localOrExportSymbol);
             var declaration = localOrExportSymbol.valueDeclaration;
+            var assignmentKind = ts.getAssignmentTargetKind(node);
+            if (assignmentKind) {
+                if (!(localOrExportSymbol.flags & 3 /* Variable */)) {
+                    error(node, ts.Diagnostics.Cannot_assign_to_0_because_it_is_not_a_variable, symbolToString(symbol));
+                    return unknownType;
+                }
+                if (isReadonlySymbol(localOrExportSymbol)) {
+                    error(node, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_constant_or_a_read_only_property, symbolToString(symbol));
+                    return unknownType;
+                }
+            }
             // We only narrow variables and parameters occurring in a non-assignment position. For all other
             // entities we simply return the declared type.
-            if (!(localOrExportSymbol.flags & 3 /* Variable */) || ts.isAssignmentTarget(node) || !declaration) {
+            if (!(localOrExportSymbol.flags & 3 /* Variable */) || assignmentKind === 1 /* Definite */ || !declaration) {
                 return type;
             }
             // 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 === 143 /* Parameter */;
+            var isParameter = ts.getRootDeclaration(declaration).kind === 144 /* Parameter */;
             var declarationContainer = getControlFlowContainer(declaration);
             var flowContainer = getControlFlowContainer(node);
             var isOuterVariable = flowContainer !== declarationContainer;
             // 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 === 180 /* FunctionExpression */ ||
-                flowContainer.kind === 181 /* ArrowFunction */ || ts.isObjectLiteralOrClassExpressionMethod(flowContainer)) &&
+            while (flowContainer !== declarationContainer && (flowContainer.kind === 184 /* FunctionExpression */ ||
+                flowContainer.kind === 185 /* ArrowFunction */ || ts.isObjectLiteralOrClassExpressionMethod(flowContainer)) &&
                 (isConstVariable(localOrExportSymbol) || isParameter && !isParameterAssigned(localOrExportSymbol))) {
                 flowContainer = getControlFlowContainer(flowContainer);
             }
@@ -31407,7 +33247,7 @@ var ts;
                 // Return the declared type to reduce follow-on errors
                 return type;
             }
-            return flowType;
+            return assignmentKind ? getBaseTypeOfLiteralType(flowType) : flowType;
         }
         function isInsideFunction(node, threshold) {
             var current = node;
@@ -31422,7 +33262,7 @@ var ts;
         function checkNestedBlockScopedBinding(node, symbol) {
             if (languageVersion >= 2 /* ES2015 */ ||
                 (symbol.flags & (2 /* BlockScopedVariable */ | 32 /* Class */)) === 0 ||
-                symbol.valueDeclaration.parent.kind === 252 /* CatchClause */) {
+                symbol.valueDeclaration.parent.kind === 256 /* CatchClause */) {
                 return;
             }
             // 1. walk from the use site up to the declaration and check
@@ -31447,8 +33287,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 === 207 /* ForStatement */ &&
-                    ts.getAncestor(symbol.valueDeclaration, 220 /* VariableDeclarationList */).parent === container &&
+                if (container.kind === 211 /* ForStatement */ &&
+                    ts.getAncestor(symbol.valueDeclaration, 224 /* VariableDeclarationList */).parent === container &&
                     isAssignedInBodyOfForStatement(node, container)) {
                     getNodeLinks(symbol.valueDeclaration).flags |= 2097152 /* NeedsLoopOutParameter */;
                 }
@@ -31462,7 +33302,7 @@ var ts;
         function isAssignedInBodyOfForStatement(node, container) {
             var current = node;
             // skip parenthesized nodes
-            while (current.parent.kind === 179 /* ParenthesizedExpression */) {
+            while (current.parent.kind === 183 /* ParenthesizedExpression */) {
                 current = current.parent;
             }
             // check if node is used as LHS in some assignment expression
@@ -31470,7 +33310,7 @@ var ts;
             if (ts.isAssignmentTarget(current)) {
                 isAssigned = true;
             }
-            else if ((current.parent.kind === 186 /* PrefixUnaryExpression */ || current.parent.kind === 187 /* PostfixUnaryExpression */)) {
+            else if ((current.parent.kind === 190 /* PrefixUnaryExpression */ || current.parent.kind === 191 /* PostfixUnaryExpression */)) {
                 var expr = current.parent;
                 isAssigned = expr.operator === 42 /* PlusPlusToken */ || expr.operator === 43 /* MinusMinusToken */;
             }
@@ -31491,7 +33331,7 @@ var ts;
         }
         function captureLexicalThis(node, container) {
             getNodeLinks(node).flags |= 2 /* LexicalThis */;
-            if (container.kind === 146 /* PropertyDeclaration */ || container.kind === 149 /* Constructor */) {
+            if (container.kind === 147 /* PropertyDeclaration */ || container.kind === 150 /* Constructor */) {
                 var classNode = container.parent;
                 getNodeLinks(classNode).flags |= 4 /* CaptureThis */;
             }
@@ -31539,7 +33379,7 @@ var ts;
             // tell whether 'this' needs to be captured.
             var container = ts.getThisContainer(node, /* includeArrowFunctions */ true);
             var needToCaptureLexicalThis = false;
-            if (container.kind === 149 /* Constructor */) {
+            if (container.kind === 150 /* Constructor */) {
                 var containingClassDecl = container.parent;
                 var baseTypeNode = ts.getClassExtendsHeritageClauseElement(containingClassDecl);
                 // If a containing class does not have extends clause or the class extends null
@@ -31560,32 +33400,32 @@ var ts;
                 }
             }
             // Now skip arrow functions to get the "real" owner of 'this'.
-            if (container.kind === 181 /* ArrowFunction */) {
+            if (container.kind === 185 /* ArrowFunction */) {
                 container = ts.getThisContainer(container, /* includeArrowFunctions */ false);
                 // When targeting es6, arrow function lexically bind "this" so we do not need to do the work of binding "this" in emitted code
                 needToCaptureLexicalThis = (languageVersion < 2 /* ES2015 */);
             }
             switch (container.kind) {
-                case 226 /* ModuleDeclaration */:
+                case 230 /* 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 225 /* EnumDeclaration */:
+                case 229 /* 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 149 /* Constructor */:
+                case 150 /* Constructor */:
                     if (isInConstructorArgumentInitializer(node, container)) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_constructor_arguments);
                     }
                     break;
-                case 146 /* PropertyDeclaration */:
-                case 145 /* PropertySignature */:
+                case 147 /* PropertyDeclaration */:
+                case 146 /* PropertySignature */:
                     if (ts.getModifierFlags(container) & 32 /* Static */) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_static_property_initializer);
                     }
                     break;
-                case 141 /* ComputedPropertyName */:
+                case 142 /* ComputedPropertyName */:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_computed_property_name);
                     break;
             }
@@ -31597,7 +33437,7 @@ var ts;
                 // Note: a parameter initializer should refer to class-this unless function-this is explicitly annotated.
                 // If this is a function in a JS file, it might be a class method. Check if it's the RHS
                 // of a x.prototype.y = function [name]() { .... }
-                if (container.kind === 180 /* FunctionExpression */ &&
+                if (container.kind === 184 /* FunctionExpression */ &&
                     ts.isInJavaScriptFile(container.parent) &&
                     ts.getSpecialPropertyAssignmentKind(container.parent) === 3 /* PrototypeProperty */) {
                     // Get the 'x' of 'x.prototype.y = f' (here, 'f' is 'container')
@@ -31634,28 +33474,28 @@ var ts;
         }
         function getTypeForThisExpressionFromJSDoc(node) {
             var typeTag = ts.getJSDocTypeTag(node);
-            if (typeTag && typeTag.typeExpression && typeTag.typeExpression.type && typeTag.typeExpression.type.kind === 269 /* JSDocFunctionType */) {
+            if (typeTag && typeTag.typeExpression && typeTag.typeExpression.type && typeTag.typeExpression.type.kind === 274 /* JSDocFunctionType */) {
                 var jsDocFunctionType = typeTag.typeExpression.type;
-                if (jsDocFunctionType.parameters.length > 0 && jsDocFunctionType.parameters[0].type.kind === 272 /* JSDocThisType */) {
+                if (jsDocFunctionType.parameters.length > 0 && jsDocFunctionType.parameters[0].type.kind === 277 /* JSDocThisType */) {
                     return getTypeFromTypeNode(jsDocFunctionType.parameters[0].type);
                 }
             }
         }
         function isInConstructorArgumentInitializer(node, constructorDecl) {
             for (var n = node; n && n !== constructorDecl; n = n.parent) {
-                if (n.kind === 143 /* Parameter */) {
+                if (n.kind === 144 /* Parameter */) {
                     return true;
                 }
             }
             return false;
         }
         function checkSuperExpression(node) {
-            var isCallExpression = node.parent.kind === 175 /* CallExpression */ && node.parent.expression === node;
+            var isCallExpression = node.parent.kind === 179 /* 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 === 181 /* ArrowFunction */) {
+                while (container && container.kind === 185 /* ArrowFunction */) {
                     container = ts.getSuperContainer(container, /*stopOnFunctions*/ true);
                     needToCaptureLexicalThis = languageVersion < 2 /* ES2015 */;
                 }
@@ -31669,16 +33509,16 @@ var ts;
                 //     [super.foo()]() {}
                 // }
                 var current = node;
-                while (current && current !== container && current.kind !== 141 /* ComputedPropertyName */) {
+                while (current && current !== container && current.kind !== 142 /* ComputedPropertyName */) {
                     current = current.parent;
                 }
-                if (current && current.kind === 141 /* ComputedPropertyName */) {
+                if (current && current.kind === 142 /* 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 === 172 /* ObjectLiteralExpression */)) {
+                else if (!container || !container.parent || !(ts.isClassLike(container.parent) || container.parent.kind === 176 /* ObjectLiteralExpression */)) {
                     error(node, ts.Diagnostics.super_can_only_be_referenced_in_members_of_derived_classes_or_object_literal_expressions);
                 }
                 else {
@@ -31749,7 +33589,7 @@ var ts;
             // This helper creates an object with a "value" property that wraps the `super` property or indexed access for both get and set.
             // This is required for destructuring assignments, as a call expression cannot be used as the target of a destructuring assignment
             // while a property access can.
-            if (container.kind === 148 /* MethodDeclaration */ && ts.getModifierFlags(container) & 256 /* Async */) {
+            if (container.kind === 149 /* MethodDeclaration */ && ts.getModifierFlags(container) & 256 /* Async */) {
                 if (ts.isSuperProperty(node.parent) && ts.isAssignmentTarget(node.parent)) {
                     getNodeLinks(container).flags |= 4096 /* AsyncMethodWithSuperBinding */;
                 }
@@ -31763,7 +33603,7 @@ var ts;
                 // in this case they should also use correct lexical this
                 captureLexicalThis(node.parent, container);
             }
-            if (container.parent.kind === 172 /* ObjectLiteralExpression */) {
+            if (container.parent.kind === 176 /* 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 unknownType;
@@ -31783,7 +33623,7 @@ var ts;
                 }
                 return unknownType;
             }
-            if (container.kind === 149 /* Constructor */ && isInConstructorArgumentInitializer(node, container)) {
+            if (container.kind === 150 /* 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 unknownType;
@@ -31798,7 +33638,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 === 149 /* Constructor */;
+                    return container.kind === 150 /* Constructor */;
                 }
                 else {
                     // TS 1.0 SPEC (April 2014)
@@ -31806,21 +33646,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 === 172 /* ObjectLiteralExpression */) {
+                    if (ts.isClassLike(container.parent) || container.parent.kind === 176 /* ObjectLiteralExpression */) {
                         if (ts.getModifierFlags(container) & 32 /* Static */) {
-                            return container.kind === 148 /* MethodDeclaration */ ||
-                                container.kind === 147 /* MethodSignature */ ||
-                                container.kind === 150 /* GetAccessor */ ||
-                                container.kind === 151 /* SetAccessor */;
+                            return container.kind === 149 /* MethodDeclaration */ ||
+                                container.kind === 148 /* MethodSignature */ ||
+                                container.kind === 151 /* GetAccessor */ ||
+                                container.kind === 152 /* SetAccessor */;
                         }
                         else {
-                            return container.kind === 148 /* MethodDeclaration */ ||
-                                container.kind === 147 /* MethodSignature */ ||
-                                container.kind === 150 /* GetAccessor */ ||
-                                container.kind === 151 /* SetAccessor */ ||
-                                container.kind === 146 /* PropertyDeclaration */ ||
-                                container.kind === 145 /* PropertySignature */ ||
-                                container.kind === 149 /* Constructor */;
+                            return container.kind === 149 /* MethodDeclaration */ ||
+                                container.kind === 148 /* MethodSignature */ ||
+                                container.kind === 151 /* GetAccessor */ ||
+                                container.kind === 152 /* SetAccessor */ ||
+                                container.kind === 147 /* PropertyDeclaration */ ||
+                                container.kind === 146 /* PropertySignature */ ||
+                                container.kind === 150 /* Constructor */;
                         }
                     }
                 }
@@ -31828,7 +33668,7 @@ var ts;
             }
         }
         function getContextualThisParameterType(func) {
-            if (isContextSensitiveFunctionOrObjectLiteralMethod(func) && func.kind !== 181 /* ArrowFunction */) {
+            if (isContextSensitiveFunctionOrObjectLiteralMethod(func) && func.kind !== 185 /* ArrowFunction */) {
                 var contextualSignature = getContextualSignature(func);
                 if (contextualSignature) {
                     var thisParameter = contextualSignature.thisParameter;
@@ -31894,7 +33734,7 @@ var ts;
                 if (declaration.type) {
                     return getTypeFromTypeNode(declaration.type);
                 }
-                if (declaration.kind === 143 /* Parameter */) {
+                if (declaration.kind === 144 /* Parameter */) {
                     var type = getContextuallyTypedParameterType(declaration);
                     if (type) {
                         return type;
@@ -31905,11 +33745,11 @@ var ts;
                 }
                 if (ts.isBindingPattern(declaration.parent)) {
                     var parentDeclaration = declaration.parent.parent;
-                    var name_15 = declaration.propertyName || declaration.name;
+                    var name_20 = declaration.propertyName || declaration.name;
                     if (ts.isVariableLike(parentDeclaration) &&
                         parentDeclaration.type &&
-                        !ts.isBindingPattern(name_15)) {
-                        var text = getTextOfPropertyName(name_15);
+                        !ts.isBindingPattern(name_20)) {
+                        var text = ts.getTextOfPropertyName(name_20);
                         if (text) {
                             return getTypeOfPropertyOfType(getTypeFromTypeNode(parentDeclaration.type), text);
                         }
@@ -31946,7 +33786,7 @@ var ts;
         }
         function isInParameterInitializerBeforeContainingFunction(node) {
             while (node.parent && !ts.isFunctionLike(node.parent)) {
-                if (node.parent.kind === 143 /* Parameter */ && node.parent.initializer === node) {
+                if (node.parent.kind === 144 /* Parameter */ && node.parent.initializer === node) {
                     return true;
                 }
                 node = node.parent;
@@ -31957,8 +33797,8 @@ var ts;
             // 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
             if (functionDecl.type ||
-                functionDecl.kind === 149 /* Constructor */ ||
-                functionDecl.kind === 150 /* GetAccessor */ && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(functionDecl.symbol, 151 /* SetAccessor */))) {
+                functionDecl.kind === 150 /* Constructor */ ||
+                functionDecl.kind === 151 /* GetAccessor */ && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(functionDecl.symbol, 152 /* SetAccessor */))) {
                 return getReturnTypeOfSignature(getSignatureFromDeclaration(functionDecl));
             }
             // Otherwise, if the containing function is contextually typed by a function type with exactly one call signature
@@ -31980,7 +33820,7 @@ var ts;
             return undefined;
         }
         function getContextualTypeForSubstitutionExpression(template, substitutionExpression) {
-            if (template.parent.kind === 177 /* TaggedTemplateExpression */) {
+            if (template.parent.kind === 181 /* TaggedTemplateExpression */) {
                 return getContextualTypeForArgument(template.parent, substitutionExpression);
             }
             return undefined;
@@ -32018,7 +33858,7 @@ var ts;
         // is a union type, the mapping function is applied to each constituent type and a union of the resulting
         // types is returned.
         function applyToContextualType(type, mapper) {
-            if (!(type.flags & 524288 /* Union */)) {
+            if (!(type.flags & 65536 /* Union */)) {
                 return mapper(type);
             }
             var types = type.types;
@@ -32043,7 +33883,7 @@ var ts;
         }
         function getTypeOfPropertyOfContextualType(type, name) {
             return applyToContextualType(type, function (t) {
-                var prop = t.flags & 4161536 /* StructuredType */ ? getPropertyOfType(t, name) : undefined;
+                var prop = t.flags & 229376 /* StructuredType */ ? getPropertyOfType(t, name) : undefined;
                 return prop ? getTypeOfSymbol(prop) : undefined;
             });
         }
@@ -32052,7 +33892,7 @@ var ts;
         }
         // Return true if the given contextual type is a tuple-like type
         function contextualTypeIsTupleLikeType(type) {
-            return !!(type.flags & 524288 /* Union */ ? ts.forEach(type.types, isTupleLikeType) : isTupleLikeType(type));
+            return !!(type.flags & 65536 /* Union */ ? ts.forEach(type.types, isTupleLikeType) : isTupleLikeType(type));
         }
         // 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
@@ -32108,13 +33948,13 @@ var ts;
             var kind = attribute.kind;
             var jsxElement = attribute.parent;
             var attrsType = getJsxElementAttributesType(jsxElement);
-            if (attribute.kind === 246 /* JsxAttribute */) {
+            if (attribute.kind === 250 /* JsxAttribute */) {
                 if (!attrsType || isTypeAny(attrsType)) {
                     return undefined;
                 }
                 return getTypeOfPropertyOfType(attrsType, attribute.name.text);
             }
-            else if (attribute.kind === 247 /* JsxSpreadAttribute */) {
+            else if (attribute.kind === 251 /* JsxSpreadAttribute */) {
                 return attrsType;
             }
             ts.Debug.fail("Expected JsxAttribute or JsxSpreadAttribute, got ts.SyntaxKind[" + kind + "]");
@@ -32152,58 +33992,73 @@ var ts;
             }
             var parent = node.parent;
             switch (parent.kind) {
-                case 219 /* VariableDeclaration */:
-                case 143 /* Parameter */:
-                case 146 /* PropertyDeclaration */:
-                case 145 /* PropertySignature */:
-                case 170 /* BindingElement */:
+                case 223 /* VariableDeclaration */:
+                case 144 /* Parameter */:
+                case 147 /* PropertyDeclaration */:
+                case 146 /* PropertySignature */:
+                case 174 /* BindingElement */:
                     return getContextualTypeForInitializerExpression(node);
-                case 181 /* ArrowFunction */:
-                case 212 /* ReturnStatement */:
+                case 185 /* ArrowFunction */:
+                case 216 /* ReturnStatement */:
                     return getContextualTypeForReturnExpression(node);
-                case 191 /* YieldExpression */:
+                case 195 /* YieldExpression */:
                     return getContextualTypeForYieldOperand(parent);
-                case 175 /* CallExpression */:
-                case 176 /* NewExpression */:
+                case 179 /* CallExpression */:
+                case 180 /* NewExpression */:
                     return getContextualTypeForArgument(parent, node);
-                case 178 /* TypeAssertionExpression */:
-                case 196 /* AsExpression */:
+                case 182 /* TypeAssertionExpression */:
+                case 200 /* AsExpression */:
                     return getTypeFromTypeNode(parent.type);
-                case 188 /* BinaryExpression */:
+                case 192 /* BinaryExpression */:
                     return getContextualTypeForBinaryOperand(node);
-                case 253 /* PropertyAssignment */:
-                case 254 /* ShorthandPropertyAssignment */:
+                case 257 /* PropertyAssignment */:
+                case 258 /* ShorthandPropertyAssignment */:
                     return getContextualTypeForObjectLiteralElement(parent);
-                case 171 /* ArrayLiteralExpression */:
+                case 175 /* ArrayLiteralExpression */:
                     return getContextualTypeForElementExpression(node);
-                case 189 /* ConditionalExpression */:
+                case 193 /* ConditionalExpression */:
                     return getContextualTypeForConditionalOperand(node);
-                case 198 /* TemplateSpan */:
-                    ts.Debug.assert(parent.parent.kind === 190 /* TemplateExpression */);
+                case 202 /* TemplateSpan */:
+                    ts.Debug.assert(parent.parent.kind === 194 /* TemplateExpression */);
                     return getContextualTypeForSubstitutionExpression(parent.parent, node);
-                case 179 /* ParenthesizedExpression */:
+                case 183 /* ParenthesizedExpression */:
                     return getContextualType(parent);
-                case 248 /* JsxExpression */:
+                case 252 /* JsxExpression */:
                     return getContextualType(parent);
-                case 246 /* JsxAttribute */:
-                case 247 /* JsxSpreadAttribute */:
+                case 250 /* JsxAttribute */:
+                case 251 /* JsxSpreadAttribute */:
                     return getContextualTypeForJsxAttribute(parent);
             }
             return undefined;
         }
         // If the given type is an object or union type, if that type has a single signature, and if
         // that signature is non-generic, return the signature. Otherwise return undefined.
-        function getNonGenericSignature(type) {
+        function getNonGenericSignature(type, node) {
             var signatures = getSignaturesOfStructuredType(type, 0 /* Call */);
             if (signatures.length === 1) {
                 var signature = signatures[0];
-                if (!signature.typeParameters) {
+                if (!signature.typeParameters && !isAritySmaller(signature, node)) {
                     return signature;
                 }
             }
         }
+        /** If the contextual signature has fewer parameters than the function expression, do not use it */
+        function isAritySmaller(signature, target) {
+            var targetParameterCount = 0;
+            for (; targetParameterCount < target.parameters.length; targetParameterCount++) {
+                var param = target.parameters[targetParameterCount];
+                if (param.initializer || param.questionToken || param.dotDotDotToken || isJSDocOptionalParameter(param)) {
+                    break;
+                }
+            }
+            if (target.parameters.length && ts.parameterIsThisKeyword(target.parameters[0])) {
+                targetParameterCount--;
+            }
+            var sourceLength = signature.hasRestParameter ? Number.MAX_VALUE : signature.parameters.length;
+            return sourceLength < targetParameterCount;
+        }
         function isFunctionExpressionOrArrowFunction(node) {
-            return node.kind === 180 /* FunctionExpression */ || node.kind === 181 /* ArrowFunction */;
+            return node.kind === 184 /* FunctionExpression */ || node.kind === 185 /* ArrowFunction */;
         }
         function getContextualSignatureForFunctionLikeDeclaration(node) {
             // Only function expressions, arrow functions, and object literal methods are contextually typed.
@@ -32222,19 +34077,19 @@ var ts;
         // 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 !== 148 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 149 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             var type = getContextualTypeForFunctionLikeDeclaration(node);
             if (!type) {
                 return undefined;
             }
-            if (!(type.flags & 524288 /* Union */)) {
-                return getNonGenericSignature(type);
+            if (!(type.flags & 65536 /* Union */)) {
+                return getNonGenericSignature(type, node);
             }
             var signatureList;
             var types = type.types;
             for (var _i = 0, types_14 = types; _i < types_14.length; _i++) {
                 var current = types_14[_i];
-                var signature = getNonGenericSignature(current);
+                var signature = getNonGenericSignature(current, node);
                 if (signature) {
                     if (!signatureList) {
                         // This signature will contribute to contextual union signature
@@ -32278,7 +34133,7 @@ var ts;
         function isInferentialContext(mapper) {
             return mapper && mapper.context;
         }
-        function checkSpreadElementExpression(node, contextualMapper) {
+        function checkSpreadExpression(node, contextualMapper) {
             // It is usually not safe to call checkExpressionCached if we can be contextually typing.
             // You can tell that we are contextually typing because of the contextualMapper parameter.
             // While it is true that a spread element can have a contextual type, it does not do anything
@@ -32289,8 +34144,8 @@ var ts;
             return checkIteratedTypeOrElementType(arrayOrIterableType, node.expression, /*allowStringInput*/ false);
         }
         function hasDefaultValue(node) {
-            return (node.kind === 170 /* BindingElement */ && !!node.initializer) ||
-                (node.kind === 188 /* BinaryExpression */ && node.operatorToken.kind === 57 /* EqualsToken */);
+            return (node.kind === 174 /* BindingElement */ && !!node.initializer) ||
+                (node.kind === 192 /* BinaryExpression */ && node.operatorToken.kind === 57 /* EqualsToken */);
         }
         function checkArrayLiteral(node, contextualMapper) {
             var elements = node.elements;
@@ -32299,7 +34154,7 @@ var ts;
             var inDestructuringPattern = ts.isAssignmentTarget(node);
             for (var _i = 0, elements_1 = elements; _i < elements_1.length; _i++) {
                 var e = elements_1[_i];
-                if (inDestructuringPattern && e.kind === 192 /* SpreadElementExpression */) {
+                if (inDestructuringPattern && e.kind === 196 /* SpreadElement */) {
                     // Given the following situation:
                     //    var c: {};
                     //    [...c] = ["", 0];
@@ -32323,7 +34178,7 @@ var ts;
                     var type = checkExpressionForMutableLocation(e, contextualMapper);
                     elementTypes.push(type);
                 }
-                hasSpreadElement = hasSpreadElement || e.kind === 192 /* SpreadElementExpression */;
+                hasSpreadElement = hasSpreadElement || e.kind === 196 /* SpreadElement */;
             }
             if (!hasSpreadElement) {
                 // If array literal is actually a destructuring pattern, mark it as an implied type. We do this such
@@ -32338,7 +34193,7 @@ var ts;
                     var pattern = 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 (pattern && (pattern.kind === 169 /* ArrayBindingPattern */ || pattern.kind === 171 /* ArrayLiteralExpression */)) {
+                    if (pattern && (pattern.kind === 173 /* ArrayBindingPattern */ || pattern.kind === 175 /* ArrayLiteralExpression */)) {
                         var patternElements = pattern.elements;
                         for (var i = elementTypes.length; i < patternElements.length; i++) {
                             var patternElement = patternElements[i];
@@ -32346,7 +34201,7 @@ var ts;
                                 elementTypes.push(contextualType.typeArguments[i]);
                             }
                             else {
-                                if (patternElement.kind !== 194 /* OmittedExpression */) {
+                                if (patternElement.kind !== 198 /* OmittedExpression */) {
                                     error(patternElement, ts.Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);
                                 }
                                 elementTypes.push(unknownType);
@@ -32363,7 +34218,7 @@ var ts;
                 strictNullChecks ? neverType : undefinedWideningType);
         }
         function isNumericName(name) {
-            return name.kind === 141 /* ComputedPropertyName */ ? isNumericComputedName(name) : isNumericLiteralName(name.text);
+            return name.kind === 142 /* ComputedPropertyName */ ? isNumericComputedName(name) : isNumericLiteralName(name.text);
         }
         function isNumericComputedName(name) {
             // It seems odd to consider an expression of type Any to result in a numeric name,
@@ -32431,9 +34286,11 @@ var ts;
             checkGrammarObjectLiteralExpression(node, inDestructuringPattern);
             var propertiesTable = ts.createMap();
             var propertiesArray = [];
+            var spread = emptyObjectType;
+            var propagatedFlags = 0;
             var contextualType = getApparentTypeOfContextualType(node);
             var contextualTypeHasPattern = contextualType && contextualType.pattern &&
-                (contextualType.pattern.kind === 168 /* ObjectBindingPattern */ || contextualType.pattern.kind === 172 /* ObjectLiteralExpression */);
+                (contextualType.pattern.kind === 172 /* ObjectBindingPattern */ || contextualType.pattern.kind === 176 /* ObjectLiteralExpression */);
             var typeFlags = 0;
             var patternWithComputedProperties = false;
             var hasComputedStringProperty = false;
@@ -32441,18 +34298,18 @@ var ts;
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var memberDecl = _a[_i];
                 var member = memberDecl.symbol;
-                if (memberDecl.kind === 253 /* PropertyAssignment */ ||
-                    memberDecl.kind === 254 /* ShorthandPropertyAssignment */ ||
+                if (memberDecl.kind === 257 /* PropertyAssignment */ ||
+                    memberDecl.kind === 258 /* ShorthandPropertyAssignment */ ||
                     ts.isObjectLiteralMethod(memberDecl)) {
                     var type = void 0;
-                    if (memberDecl.kind === 253 /* PropertyAssignment */) {
+                    if (memberDecl.kind === 257 /* PropertyAssignment */) {
                         type = checkPropertyAssignment(memberDecl, contextualMapper);
                     }
-                    else if (memberDecl.kind === 148 /* MethodDeclaration */) {
+                    else if (memberDecl.kind === 149 /* MethodDeclaration */) {
                         type = checkObjectLiteralMethod(memberDecl, contextualMapper);
                     }
                     else {
-                        ts.Debug.assert(memberDecl.kind === 254 /* ShorthandPropertyAssignment */);
+                        ts.Debug.assert(memberDecl.kind === 258 /* ShorthandPropertyAssignment */);
                         type = checkExpressionForMutableLocation(memberDecl.name, contextualMapper);
                     }
                     typeFlags |= type.flags;
@@ -32460,8 +34317,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 === 253 /* PropertyAssignment */ && hasDefaultValue(memberDecl.initializer)) ||
-                            (memberDecl.kind === 254 /* ShorthandPropertyAssignment */ && memberDecl.objectAssignmentInitializer);
+                        var isOptional = (memberDecl.kind === 257 /* PropertyAssignment */ && hasDefaultValue(memberDecl.initializer)) ||
+                            (memberDecl.kind === 258 /* ShorthandPropertyAssignment */ && memberDecl.objectAssignmentInitializer);
                         if (isOptional) {
                             prop.flags |= 536870912 /* Optional */;
                         }
@@ -32469,8 +34326,7 @@ var ts;
                             patternWithComputedProperties = true;
                         }
                     }
-                    else if (contextualTypeHasPattern &&
-                        !(contextualType.flags & 2588672 /* ObjectType */ && contextualType.isObjectLiteralPatternWithComputedProperties)) {
+                    else if (contextualTypeHasPattern && !(getObjectFlags(contextualType) & 512 /* ObjectLiteralPatternWithComputedProperties */)) {
                         // If object literal is contextually typed by the implied type of a binding pattern, and if the
                         // binding pattern specifies a default value for the property, make the property optional.
                         var impliedProp = getPropertyOfType(contextualType, member.name);
@@ -32490,13 +34346,30 @@ var ts;
                     prop.target = member;
                     member = prop;
                 }
+                else if (memberDecl.kind === 259 /* SpreadAssignment */) {
+                    if (propertiesArray.length > 0) {
+                        spread = getSpreadType(spread, createObjectLiteralType(), /*isFromObjectLiteral*/ true);
+                        propertiesArray = [];
+                        propertiesTable = ts.createMap();
+                        hasComputedStringProperty = false;
+                        hasComputedNumberProperty = false;
+                        typeFlags = 0;
+                    }
+                    var type = checkExpression(memberDecl.expression);
+                    if (!(type.flags & (32768 /* Object */ | 1 /* Any */))) {
+                        error(memberDecl, ts.Diagnostics.Spread_types_may_only_be_created_from_object_types);
+                        return unknownType;
+                    }
+                    spread = getSpreadType(spread, type, /*isFromObjectLiteral*/ false);
+                    continue;
+                }
                 else {
                     // TypeScript 1.0 spec (April 2014)
                     // A get accessor declaration is processed in the same manner as
                     // 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 === 150 /* GetAccessor */ || memberDecl.kind === 151 /* SetAccessor */);
+                    ts.Debug.assert(memberDecl.kind === 151 /* GetAccessor */ || memberDecl.kind === 152 /* SetAccessor */);
                     checkAccessorDeclaration(memberDecl);
                 }
                 if (ts.hasDynamicName(memberDecl)) {
@@ -32526,18 +34399,33 @@ var ts;
                     }
                 }
             }
-            var stringIndexInfo = hasComputedStringProperty ? getObjectLiteralIndexInfo(node, propertiesArray, 0 /* String */) : undefined;
-            var numberIndexInfo = hasComputedNumberProperty ? getObjectLiteralIndexInfo(node, propertiesArray, 1 /* Number */) : undefined;
-            var result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
-            var freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : 16777216 /* FreshLiteral */;
-            result.flags |= 8388608 /* ObjectLiteral */ | 67108864 /* ContainsObjectLiteral */ | freshObjectLiteralFlag | (typeFlags & 234881024 /* PropagatingFlags */);
-            if (patternWithComputedProperties) {
-                result.isObjectLiteralPatternWithComputedProperties = true;
+            if (spread !== emptyObjectType) {
+                if (propertiesArray.length > 0) {
+                    spread = getSpreadType(spread, createObjectLiteralType(), /*isFromObjectLiteral*/ true);
+                }
+                spread.flags |= propagatedFlags;
+                spread.symbol = node.symbol;
+                return spread;
             }
-            if (inDestructuringPattern) {
-                result.pattern = node;
+            return createObjectLiteralType();
+            function createObjectLiteralType() {
+                var stringIndexInfo = hasComputedStringProperty ? getObjectLiteralIndexInfo(node, propertiesArray, 0 /* String */) : undefined;
+                var numberIndexInfo = hasComputedNumberProperty ? getObjectLiteralIndexInfo(node, propertiesArray, 1 /* Number */) : undefined;
+                var result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
+                var freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : 1048576 /* FreshLiteral */;
+                result.flags |= 4194304 /* ContainsObjectLiteral */ | freshObjectLiteralFlag | (typeFlags & 14680064 /* PropagatingFlags */);
+                result.objectFlags |= 128 /* ObjectLiteral */;
+                if (patternWithComputedProperties) {
+                    result.objectFlags |= 512 /* ObjectLiteralPatternWithComputedProperties */;
+                }
+                if (inDestructuringPattern) {
+                    result.pattern = node;
+                }
+                if (!(result.flags & 6144 /* Nullable */)) {
+                    propagatedFlags |= (result.flags & 14680064 /* PropagatingFlags */);
+                }
+                return result;
             }
-            return result;
         }
         function checkJsxSelfClosingElement(node) {
             checkJsxOpeningLikeElement(node);
@@ -32557,13 +34445,13 @@ var ts;
             for (var _i = 0, _a = node.children; _i < _a.length; _i++) {
                 var child = _a[_i];
                 switch (child.kind) {
-                    case 248 /* JsxExpression */:
+                    case 252 /* JsxExpression */:
                         checkJsxExpression(child);
                         break;
-                    case 242 /* JsxElement */:
+                    case 246 /* JsxElement */:
                         checkJsxElement(child);
                         break;
-                    case 243 /* JsxSelfClosingElement */:
+                    case 247 /* JsxSelfClosingElement */:
                         checkJsxSelfClosingElement(child);
                         break;
                 }
@@ -32582,7 +34470,7 @@ var ts;
          */
         function isJsxIntrinsicIdentifier(tagName) {
             // TODO (yuisu): comment
-            if (tagName.kind === 173 /* PropertyAccessExpression */ || tagName.kind === 98 /* ThisKeyword */) {
+            if (tagName.kind === 177 /* PropertyAccessExpression */ || tagName.kind === 98 /* ThisKeyword */) {
                 return false;
             }
             else {
@@ -32600,7 +34488,7 @@ var ts;
                 var correspondingPropSymbol = getPropertyOfType(elementAttributesType, node.name.text);
                 correspondingPropType = correspondingPropSymbol && getTypeOfSymbol(correspondingPropSymbol);
                 if (isUnhyphenatedJsxName(node.name.text)) {
-                    var attributeType = getTypeOfPropertyOfType(elementAttributesType, getTextOfPropertyName(node.name)) || getIndexTypeOfType(elementAttributesType, 0 /* String */);
+                    var attributeType = getTypeOfPropertyOfType(elementAttributesType, ts.getTextOfPropertyName(node.name)) || getIndexTypeOfType(elementAttributesType, 0 /* String */);
                     if (attributeType) {
                         correspondingPropType = attributeType;
                     }
@@ -32693,7 +34581,7 @@ var ts;
          * For example, in the element <MyClass>, the element instance type is `MyClass` (not `typeof MyClass`).
          */
         function getJsxElementInstanceType(node, valueType) {
-            ts.Debug.assert(!(valueType.flags & 524288 /* Union */));
+            ts.Debug.assert(!(valueType.flags & 65536 /* Union */));
             if (isTypeAny(valueType)) {
                 // Short-circuit if the class tag is using an element type 'any'
                 return anyType;
@@ -32751,7 +34639,7 @@ var ts;
             if (!elemType) {
                 elemType = checkExpression(node.tagName);
             }
-            if (elemType.flags & 524288 /* Union */) {
+            if (elemType.flags & 65536 /* Union */) {
                 var types = elemType.types;
                 return getUnionType(ts.map(types, function (type) {
                     return getResolvedJsxType(node, type, elemClassType);
@@ -32825,7 +34713,7 @@ var ts;
                     // Props is of type 'any' or unknown
                     return attributesType;
                 }
-                else if (attributesType.flags & 524288 /* Union */) {
+                else if (attributesType.flags & 65536 /* Union */) {
                     // Props cannot be a union type
                     error(node.tagName, ts.Diagnostics.JSX_element_attributes_type_0_may_not_be_a_union_type, typeToString(attributesType));
                     return anyType;
@@ -32914,13 +34802,19 @@ var ts;
         function checkJsxOpeningLikeElement(node) {
             checkGrammarJsxElement(node);
             checkJsxPreconditions(node);
-            // The reactNamespace symbol should be marked as 'used' so we don't incorrectly elide its import. And if there
-            // is no reactNamespace symbol in scope when targeting React emit, we should issue an error.
+            // The reactNamespace/jsxFactory's root symbol should be marked as 'used' so we don't incorrectly elide its import.
+            // And if there is no reactNamespace/jsxFactory's symbol in scope when targeting React emit, we should issue an error.
             var reactRefErr = compilerOptions.jsx === 2 /* React */ ? ts.Diagnostics.Cannot_find_name_0 : undefined;
-            var reactNamespace = compilerOptions.reactNamespace ? compilerOptions.reactNamespace : "React";
+            var reactNamespace = getJsxNamespace();
             var reactSym = resolveName(node.tagName, reactNamespace, 107455 /* Value */, reactRefErr, reactNamespace);
             if (reactSym) {
-                getSymbolLinks(reactSym).referenced = true;
+                // Mark local symbol as referenced here because it might not have been marked
+                // if jsx emit was not react as there wont be error being emitted
+                reactSym.isReferenced = true;
+                // If react symbol is alias, mark it as refereced
+                if (reactSym.flags & 8388608 /* Alias */ && !isConstEnumOrConstEnumOnlyModule(resolveAlias(reactSym))) {
+                    markAliasSymbolAsReferenced(reactSym);
+                }
             }
             var targetAttributesType = getJsxElementAttributesType(node);
             var nameTable = ts.createMap();
@@ -32929,11 +34823,11 @@ var ts;
             // thus should have their types ignored
             var sawSpreadedAny = false;
             for (var i = node.attributes.length - 1; i >= 0; i--) {
-                if (node.attributes[i].kind === 246 /* JsxAttribute */) {
+                if (node.attributes[i].kind === 250 /* JsxAttribute */) {
                     checkJsxAttribute((node.attributes[i]), targetAttributesType, nameTable);
                 }
                 else {
-                    ts.Debug.assert(node.attributes[i].kind === 247 /* JsxSpreadAttribute */);
+                    ts.Debug.assert(node.attributes[i].kind === 251 /* JsxSpreadAttribute */);
                     var spreadType = checkJsxSpreadAttribute((node.attributes[i]), targetAttributesType, nameTable);
                     if (isTypeAny(spreadType)) {
                         sawSpreadedAny = true;
@@ -32963,7 +34857,7 @@ var ts;
         // If a symbol is a synthesized symbol with no value declaration, we assume it is a property. Example of this are the synthesized
         // '.prototype' property as well as synthesized tuple index properties.
         function getDeclarationKindFromSymbol(s) {
-            return s.valueDeclaration ? s.valueDeclaration.kind : 146 /* PropertyDeclaration */;
+            return s.valueDeclaration ? s.valueDeclaration.kind : 147 /* PropertyDeclaration */;
         }
         function getDeclarationModifierFlagsFromSymbol(s) {
             return s.valueDeclaration ? ts.getCombinedModifierFlags(s.valueDeclaration) : s.flags & 134217728 /* Prototype */ ? 4 /* Public */ | 32 /* Static */ : 0;
@@ -32982,7 +34876,7 @@ var ts;
         function checkClassPropertyAccess(node, left, type, prop) {
             var flags = getDeclarationModifierFlagsFromSymbol(prop);
             var declaringClass = getDeclaredTypeOfSymbol(getParentOfSymbol(prop));
-            var errorNode = node.kind === 173 /* PropertyAccessExpression */ || node.kind === 219 /* VariableDeclaration */ ?
+            var errorNode = node.kind === 177 /* PropertyAccessExpression */ || node.kind === 223 /* VariableDeclaration */ ?
                 node.name :
                 node.right;
             if (left.kind === 96 /* SuperKeyword */) {
@@ -32993,7 +34887,7 @@ var ts;
                 // - In a static member function or static member accessor
                 //   where this references the constructor function object of a derived class,
                 //   a super property access is permitted and must specify a public static member function of the base class.
-                if (languageVersion < 2 /* ES2015 */ && getDeclarationKindFromSymbol(prop) !== 148 /* MethodDeclaration */) {
+                if (languageVersion < 2 /* ES2015 */ && getDeclarationKindFromSymbol(prop) !== 149 /* MethodDeclaration */) {
                     // `prop` refers to a *property* declared in the super class
                     // rather than a *method*, so it does not satisfy the above criteria.
                     error(errorNode, ts.Diagnostics.Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword);
@@ -33047,7 +34941,7 @@ var ts;
                 type = getConstraintOfTypeParameter(type);
             }
             // TODO: why is the first part of this check here?
-            if (!(getTargetType(type).flags & (32768 /* Class */ | 65536 /* Interface */) && hasBaseType(type, enclosingClass))) {
+            if (!(getObjectFlags(getTargetType(type)) & 3 /* ClassOrInterface */ && hasBaseType(type, enclosingClass))) {
                 error(errorNode, ts.Diagnostics.Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1, symbolToString(prop), typeToString(enclosingClass));
                 return false;
             }
@@ -33073,6 +34967,33 @@ var ts;
         function checkQualifiedName(node) {
             return checkPropertyAccessExpressionOrQualifiedName(node, node.left, node.right);
         }
+        function reportNonexistentProperty(propNode, containingType) {
+            var errorInfo;
+            if (containingType.flags & 65536 /* Union */ && !(containingType.flags & 8190 /* Primitive */)) {
+                for (var _i = 0, _a = containingType.types; _i < _a.length; _i++) {
+                    var subtype = _a[_i];
+                    if (!getPropertyOfType(subtype, propNode.text)) {
+                        errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.declarationNameToString(propNode), typeToString(subtype));
+                        break;
+                    }
+                }
+            }
+            errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.declarationNameToString(propNode), typeToString(containingType));
+            diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(propNode, errorInfo));
+        }
+        function markPropertyAsReferenced(prop) {
+            if (prop &&
+                noUnusedIdentifiers &&
+                (prop.flags & 106500 /* ClassMember */) &&
+                prop.valueDeclaration && (ts.getModifierFlags(prop.valueDeclaration) & 8 /* Private */)) {
+                if (prop.flags & 16777216 /* Instantiated */) {
+                    getSymbolLinks(prop).target.isReferenced = true;
+                }
+                else {
+                    prop.isReferenced = true;
+                }
+            }
+        }
         function checkPropertyAccessExpressionOrQualifiedName(node, left, right) {
             var type = checkNonNullExpression(left);
             if (isTypeAny(type) || type === silentNeverType) {
@@ -33090,47 +35011,32 @@ var ts;
                 }
                 return unknownType;
             }
-            if (noUnusedIdentifiers &&
-                (prop.flags & 106500 /* ClassMember */) &&
-                prop.valueDeclaration && (ts.getModifierFlags(prop.valueDeclaration) & 8 /* Private */)) {
-                if (prop.flags & 16777216 /* Instantiated */) {
-                    getSymbolLinks(prop).target.isReferenced = true;
-                }
-                else {
-                    prop.isReferenced = true;
-                }
-            }
+            markPropertyAsReferenced(prop);
             getNodeLinks(node).resolvedSymbol = prop;
             if (prop.parent && prop.parent.flags & 32 /* Class */) {
                 checkClassPropertyAccess(node, left, apparentType, prop);
             }
             var propType = getTypeOfSymbol(prop);
+            var assignmentKind = ts.getAssignmentTargetKind(node);
+            if (assignmentKind) {
+                if (isReferenceToReadonlyEntity(node, prop) || isReferenceThroughNamespaceImport(node)) {
+                    error(right, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_constant_or_a_read_only_property, right.text);
+                    return unknownType;
+                }
+            }
             // 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 !== 173 /* PropertyAccessExpression */ || ts.isAssignmentTarget(node) ||
+            if (node.kind !== 177 /* PropertyAccessExpression */ || assignmentKind === 1 /* Definite */ ||
                 !(prop.flags & (3 /* Variable */ | 4 /* Property */ | 98304 /* Accessor */)) &&
-                    !(prop.flags & 8192 /* Method */ && propType.flags & 524288 /* Union */)) {
+                    !(prop.flags & 8192 /* Method */ && propType.flags & 65536 /* Union */)) {
                 return propType;
             }
-            return getFlowTypeOfReference(node, propType, /*assumeInitialized*/ true, /*flowContainer*/ undefined);
-            function reportNonexistentProperty(propNode, containingType) {
-                var errorInfo;
-                if (containingType.flags & 524288 /* Union */ && !(containingType.flags & 8190 /* Primitive */)) {
-                    for (var _i = 0, _a = containingType.types; _i < _a.length; _i++) {
-                        var subtype = _a[_i];
-                        if (!getPropertyOfType(subtype, propNode.text)) {
-                            errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.declarationNameToString(propNode), typeToString(subtype));
-                            break;
-                        }
-                    }
-                }
-                errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.declarationNameToString(propNode), typeToString(containingType));
-                diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(propNode, errorInfo));
-            }
+            var flowType = getFlowTypeOfReference(node, propType, /*assumeInitialized*/ true, /*flowContainer*/ undefined);
+            return assignmentKind ? getBaseTypeOfLiteralType(flowType) : flowType;
         }
         function isValidPropertyAccess(node, propertyName) {
-            var left = node.kind === 173 /* PropertyAccessExpression */
+            var left = node.kind === 177 /* PropertyAccessExpression */
                 ? node.expression
                 : node.left;
             var type = checkExpression(left);
@@ -33147,7 +35053,7 @@ var ts;
          */
         function getForInVariableSymbol(node) {
             var initializer = node.initializer;
-            if (initializer.kind === 220 /* VariableDeclarationList */) {
+            if (initializer.kind === 224 /* VariableDeclarationList */) {
                 var variable = initializer.declarations[0];
                 if (variable && !ts.isBindingPattern(variable.name)) {
                     return getSymbolOfNode(variable);
@@ -33169,14 +35075,14 @@ var ts;
          * that references a for-in variable for an object with numeric property names.
          */
         function isForInVariableForNumericPropertyNames(expr) {
-            var e = skipParenthesizedNodes(expr);
+            var e = ts.skipParentheses(expr);
             if (e.kind === 70 /* Identifier */) {
                 var symbol = getResolvedSymbol(e);
                 if (symbol.flags & 3 /* Variable */) {
                     var child = expr;
                     var node = expr.parent;
                     while (node) {
-                        if (node.kind === 208 /* ForInStatement */ &&
+                        if (node.kind === 212 /* ForInStatement */ &&
                             child === node.statement &&
                             getForInVariableSymbol(node) === symbol &&
                             hasNumericPropertyNames(checkExpression(node.expression))) {
@@ -33190,10 +35096,11 @@ var ts;
             return false;
         }
         function checkIndexedAccess(node) {
-            // Grammar checking
-            if (!node.argumentExpression) {
+            var objectType = checkNonNullExpression(node.expression);
+            var indexExpression = node.argumentExpression;
+            if (!indexExpression) {
                 var sourceFile = ts.getSourceFileOfNode(node);
-                if (node.parent.kind === 176 /* NewExpression */ && node.parent.expression === node) {
+                if (node.parent.kind === 180 /* 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);
@@ -33203,101 +35110,18 @@ var ts;
                     var end = node.end;
                     grammarErrorAtPos(sourceFile, start, end - start, ts.Diagnostics.Expression_expected);
                 }
+                return unknownType;
             }
-            // Obtain base constraint such that we can bail out if the constraint is an unknown type
-            var objectType = getApparentType(checkNonNullExpression(node.expression));
-            var indexType = node.argumentExpression ? checkExpression(node.argumentExpression) : unknownType;
+            var indexType = isForInVariableForNumericPropertyNames(indexExpression) ? numberType : checkExpression(indexExpression);
             if (objectType === unknownType || objectType === silentNeverType) {
                 return objectType;
             }
-            var isConstEnum = isConstEnumObjectType(objectType);
-            if (isConstEnum &&
-                (!node.argumentExpression || node.argumentExpression.kind !== 9 /* StringLiteral */)) {
-                error(node.argumentExpression, ts.Diagnostics.A_const_enum_member_can_only_be_accessed_using_a_string_literal);
+            if (isConstEnumObjectType(objectType) && indexExpression.kind !== 9 /* StringLiteral */) {
+                error(indexExpression, ts.Diagnostics.A_const_enum_member_can_only_be_accessed_using_a_string_literal);
                 return unknownType;
             }
-            // TypeScript 1.0 spec (April 2014): 4.10 Property Access
-            // - If IndexExpr is a string literal or a numeric literal and ObjExpr's apparent type has a property with the name
-            //    given by that literal(converted to its string representation in the case of a numeric literal), the property access is of the type of that property.
-            // - Otherwise, if ObjExpr's apparent type has a numeric index signature and IndexExpr is of type Any, the Number primitive type, or an enum type,
-            //    the property access is of the type of that index signature.
-            // - Otherwise, if ObjExpr's apparent type has a string index signature and IndexExpr is of type Any, the String or Number primitive type, or an enum type,
-            //    the property access is of the type of that index signature.
-            // - Otherwise, if IndexExpr is of type Any, the String or Number primitive type, or an enum type, the property access is of type Any.
-            // See if we can index as a property.
-            if (node.argumentExpression) {
-                var name_16 = getPropertyNameForIndexedAccess(node.argumentExpression, indexType);
-                if (name_16 !== undefined) {
-                    var prop = getPropertyOfType(objectType, name_16);
-                    if (prop) {
-                        getNodeLinks(node).resolvedSymbol = prop;
-                        return getTypeOfSymbol(prop);
-                    }
-                    else if (isConstEnum) {
-                        error(node.argumentExpression, ts.Diagnostics.Property_0_does_not_exist_on_const_enum_1, name_16, symbolToString(objectType.symbol));
-                        return unknownType;
-                    }
-                }
-            }
-            // Check for compatible indexer types.
-            var allowedNullableFlags = strictNullChecks ? 0 : 6144 /* Nullable */;
-            if (isTypeAnyOrAllConstituentTypesHaveKind(indexType, 34 /* StringLike */ | 340 /* NumberLike */ | 512 /* ESSymbol */ | allowedNullableFlags)) {
-                // Try to use a number indexer.
-                if (isTypeAnyOrAllConstituentTypesHaveKind(indexType, 340 /* NumberLike */ | allowedNullableFlags) || isForInVariableForNumericPropertyNames(node.argumentExpression)) {
-                    var numberIndexInfo = getIndexInfoOfType(objectType, 1 /* Number */);
-                    if (numberIndexInfo) {
-                        getNodeLinks(node).resolvedIndexInfo = numberIndexInfo;
-                        return numberIndexInfo.type;
-                    }
-                }
-                // Try to use string indexing.
-                var stringIndexInfo = getIndexInfoOfType(objectType, 0 /* String */);
-                if (stringIndexInfo) {
-                    getNodeLinks(node).resolvedIndexInfo = stringIndexInfo;
-                    return stringIndexInfo.type;
-                }
-                // Fall back to any.
-                if (compilerOptions.noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors && !isTypeAny(objectType)) {
-                    error(node, getIndexTypeOfType(objectType, 1 /* Number */) ?
-                        ts.Diagnostics.Element_implicitly_has_an_any_type_because_index_expression_is_not_of_type_number :
-                        ts.Diagnostics.Index_signature_of_object_type_implicitly_has_an_any_type);
-                }
-                return anyType;
-            }
-            // REVIEW: Users should know the type that was actually used.
-            error(node, ts.Diagnostics.An_index_expression_argument_must_be_of_type_string_number_symbol_or_any);
-            return unknownType;
+            return getIndexedAccessType(objectType, indexType, node);
         }
-        /**
-         * If indexArgumentExpression is a string literal or number literal, returns its text.
-         * If indexArgumentExpression is a constant value, returns its string value.
-         * If indexArgumentExpression is a well known symbol, returns the property name corresponding
-         *    to this symbol, as long as it is a proper symbol reference.
-         * Otherwise, returns undefined.
-         */
-        function getPropertyNameForIndexedAccess(indexArgumentExpression, indexArgumentType) {
-            if (indexArgumentExpression.kind === 9 /* StringLiteral */ || indexArgumentExpression.kind === 8 /* NumericLiteral */) {
-                return indexArgumentExpression.text;
-            }
-            if (indexArgumentExpression.kind === 174 /* ElementAccessExpression */ || indexArgumentExpression.kind === 173 /* PropertyAccessExpression */) {
-                var value = getConstantValue(indexArgumentExpression);
-                if (value !== undefined) {
-                    return value.toString();
-                }
-            }
-            if (checkThatExpressionIsProperSymbolReference(indexArgumentExpression, indexArgumentType, /*reportError*/ false)) {
-                var rightHandSideName = indexArgumentExpression.name.text;
-                return ts.getPropertyNameForKnownSymbolName(rightHandSideName);
-            }
-            return undefined;
-        }
-        /**
-         * A proper symbol reference requires the following:
-         *   1. The property access denotes a property that exists
-         *   2. The expression is of the form Symbol.<identifier>
-         *   3. The property access is of the primitive type symbol.
-         *   4. Symbol in this context resolves to the global Symbol object
-         */
         function checkThatExpressionIsProperSymbolReference(expression, expressionType, reportError) {
             if (expressionType === unknownType) {
                 // There is already an error, so no need to report one.
@@ -33334,10 +35158,10 @@ var ts;
             return true;
         }
         function resolveUntypedCall(node) {
-            if (node.kind === 177 /* TaggedTemplateExpression */) {
+            if (node.kind === 181 /* TaggedTemplateExpression */) {
                 checkExpression(node.template);
             }
-            else if (node.kind !== 144 /* Decorator */) {
+            else if (node.kind !== 145 /* Decorator */) {
                 ts.forEach(node.arguments, function (argument) {
                     checkExpression(argument);
                 });
@@ -33367,13 +35191,13 @@ var ts;
             for (var _i = 0, signatures_2 = signatures; _i < signatures_2.length; _i++) {
                 var signature = signatures_2[_i];
                 var symbol = signature.declaration && getSymbolOfNode(signature.declaration);
-                var parent_11 = signature.declaration && signature.declaration.parent;
+                var parent_9 = signature.declaration && signature.declaration.parent;
                 if (!lastSymbol || symbol === lastSymbol) {
-                    if (lastParent && parent_11 === lastParent) {
+                    if (lastParent && parent_9 === lastParent) {
                         index++;
                     }
                     else {
-                        lastParent = parent_11;
+                        lastParent = parent_9;
                         index = cutoffIndex;
                     }
                 }
@@ -33381,7 +35205,7 @@ var ts;
                     // current declaration belongs to a different symbol
                     // set cutoffIndex so re-orderings in the future won't change result set from 0 to cutoffIndex
                     index = cutoffIndex = result.length;
-                    lastParent = parent_11;
+                    lastParent = parent_9;
                 }
                 lastSymbol = symbol;
                 // specialized signatures always need to be placed before non-specialized signatures regardless
@@ -33403,7 +35227,7 @@ var ts;
         function getSpreadArgumentIndex(args) {
             for (var i = 0; i < args.length; i++) {
                 var arg = args[i];
-                if (arg && arg.kind === 192 /* SpreadElementExpression */) {
+                if (arg && arg.kind === 196 /* SpreadElement */) {
                     return i;
                 }
             }
@@ -33416,13 +35240,13 @@ var ts;
             var callIsIncomplete; // In incomplete call we want to be lenient when we have too few arguments
             var isDecorator;
             var spreadArgIndex = -1;
-            if (node.kind === 177 /* TaggedTemplateExpression */) {
+            if (node.kind === 181 /* TaggedTemplateExpression */) {
                 var tagExpression = node;
                 // Even if the call is incomplete, we'll have a missing expression as our last argument,
                 // so we can say the count is just the arg list length
                 argCount = args.length;
                 typeArguments = undefined;
-                if (tagExpression.template.kind === 190 /* TemplateExpression */) {
+                if (tagExpression.template.kind === 194 /* 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 templateExpression = tagExpression.template;
@@ -33439,7 +35263,7 @@ var ts;
                     callIsIncomplete = !!templateLiteral.isUnterminated;
                 }
             }
-            else if (node.kind === 144 /* Decorator */) {
+            else if (node.kind === 145 /* Decorator */) {
                 isDecorator = true;
                 typeArguments = undefined;
                 argCount = getEffectiveArgumentCount(node, /*args*/ undefined, signature);
@@ -33448,7 +35272,7 @@ var ts;
                 var callExpression = node;
                 if (!callExpression.arguments) {
                     // This only happens when we have something of the form: 'new C'
-                    ts.Debug.assert(callExpression.kind === 176 /* NewExpression */);
+                    ts.Debug.assert(callExpression.kind === 180 /* NewExpression */);
                     return signature.minArgumentCount === 0;
                 }
                 argCount = signatureHelpTrailingComma ? args.length + 1 : args.length;
@@ -33479,7 +35303,7 @@ var ts;
         }
         // If type has a single call signature and no other members, return that signature. Otherwise, return undefined.
         function getSingleCallSignature(type) {
-            if (type.flags & 2588672 /* ObjectType */) {
+            if (type.flags & 32768 /* Object */) {
                 var resolved = resolveStructuredTypeMembers(type);
                 if (resolved.callSignatures.length === 1 && resolved.constructSignatures.length === 0 &&
                     resolved.properties.length === 0 && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
@@ -33532,7 +35356,7 @@ var ts;
             for (var i = 0; i < argCount; i++) {
                 var arg = getEffectiveArgument(node, args, i);
                 // If the effective argument is 'undefined', then it is an argument that is present but is synthetic.
-                if (arg === undefined || arg.kind !== 194 /* OmittedExpression */) {
+                if (arg === undefined || arg.kind !== 198 /* OmittedExpression */) {
                     var paramType = getTypeAtPosition(signature, i);
                     var argType = getEffectiveArgumentType(node, i);
                     // If the effective argument type is 'undefined', there is no synthetic type
@@ -33589,7 +35413,7 @@ var ts;
         }
         function checkApplicableSignature(node, args, signature, relation, excludeArgument, reportErrors) {
             var thisType = getThisTypeOfSignature(signature);
-            if (thisType && thisType !== voidType && node.kind !== 176 /* NewExpression */) {
+            if (thisType && thisType !== voidType && node.kind !== 180 /* 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.
@@ -33606,7 +35430,7 @@ var ts;
             for (var i = 0; i < argCount; i++) {
                 var arg = getEffectiveArgument(node, args, i);
                 // If the effective argument is 'undefined', then it is an argument that is present but is synthetic.
-                if (arg === undefined || arg.kind !== 194 /* OmittedExpression */) {
+                if (arg === undefined || arg.kind !== 198 /* OmittedExpression */) {
                     // Check spread elements against rest type (from arity check we know spread argument corresponds to a rest parameter)
                     var paramType = getTypeAtPosition(signature, i);
                     var argType = getEffectiveArgumentType(node, i);
@@ -33628,12 +35452,12 @@ var ts;
          * Returns the this argument in calls like x.f(...) and x[f](...). Undefined otherwise.
          */
         function getThisArgumentOfCall(node) {
-            if (node.kind === 175 /* CallExpression */) {
+            if (node.kind === 179 /* CallExpression */) {
                 var callee = node.expression;
-                if (callee.kind === 173 /* PropertyAccessExpression */) {
+                if (callee.kind === 177 /* PropertyAccessExpression */) {
                     return callee.expression;
                 }
-                else if (callee.kind === 174 /* ElementAccessExpression */) {
+                else if (callee.kind === 178 /* ElementAccessExpression */) {
                     return callee.expression;
                 }
             }
@@ -33649,16 +35473,16 @@ var ts;
          */
         function getEffectiveCallArguments(node) {
             var args;
-            if (node.kind === 177 /* TaggedTemplateExpression */) {
+            if (node.kind === 181 /* TaggedTemplateExpression */) {
                 var template = node.template;
                 args = [undefined];
-                if (template.kind === 190 /* TemplateExpression */) {
+                if (template.kind === 194 /* TemplateExpression */) {
                     ts.forEach(template.templateSpans, function (span) {
                         args.push(span.expression);
                     });
                 }
             }
-            else if (node.kind === 144 /* Decorator */) {
+            else if (node.kind === 145 /* Decorator */) {
                 // For a decorator, we return undefined as we will determine
                 // the number and types of arguments for a decorator using
                 // `getEffectiveArgumentCount` and `getEffectiveArgumentType` below.
@@ -33683,19 +35507,19 @@ var ts;
           * Otherwise, the argument count is the length of the 'args' array.
           */
         function getEffectiveArgumentCount(node, args, signature) {
-            if (node.kind === 144 /* Decorator */) {
+            if (node.kind === 145 /* Decorator */) {
                 switch (node.parent.kind) {
-                    case 222 /* ClassDeclaration */:
-                    case 193 /* ClassExpression */:
+                    case 226 /* ClassDeclaration */:
+                    case 197 /* ClassExpression */:
                         // A class decorator will have one argument (see `ClassDecorator` in core.d.ts)
                         return 1;
-                    case 146 /* PropertyDeclaration */:
+                    case 147 /* PropertyDeclaration */:
                         // A property declaration decorator will have two arguments (see
                         // `PropertyDecorator` in core.d.ts)
                         return 2;
-                    case 148 /* MethodDeclaration */:
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
+                    case 149 /* MethodDeclaration */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* 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.
@@ -33705,7 +35529,7 @@ var ts;
                         // If the method decorator signature only accepts a target and a key, we will only
                         // type check those arguments.
                         return signature.parameters.length >= 3 ? 3 : 2;
-                    case 143 /* Parameter */:
+                    case 144 /* Parameter */:
                         // A parameter declaration decorator will have three arguments (see
                         // `ParameterDecorator` in core.d.ts)
                         return 3;
@@ -33729,25 +35553,25 @@ var ts;
           */
         function getEffectiveDecoratorFirstArgumentType(node) {
             // The first argument to a decorator is its `target`.
-            if (node.kind === 222 /* ClassDeclaration */) {
+            if (node.kind === 226 /* ClassDeclaration */) {
                 // For a class decorator, the `target` is the type of the class (e.g. the
                 // "static" or "constructor" side of the class)
                 var classSymbol = getSymbolOfNode(node);
                 return getTypeOfSymbol(classSymbol);
             }
-            if (node.kind === 143 /* Parameter */) {
+            if (node.kind === 144 /* Parameter */) {
                 // For a parameter decorator, the `target` is the parent type of the
                 // parameter's containing method.
                 node = node.parent;
-                if (node.kind === 149 /* Constructor */) {
+                if (node.kind === 150 /* Constructor */) {
                     var classSymbol = getSymbolOfNode(node);
                     return getTypeOfSymbol(classSymbol);
                 }
             }
-            if (node.kind === 146 /* PropertyDeclaration */ ||
-                node.kind === 148 /* MethodDeclaration */ ||
-                node.kind === 150 /* GetAccessor */ ||
-                node.kind === 151 /* SetAccessor */) {
+            if (node.kind === 147 /* PropertyDeclaration */ ||
+                node.kind === 149 /* MethodDeclaration */ ||
+                node.kind === 151 /* GetAccessor */ ||
+                node.kind === 152 /* SetAccessor */) {
                 // For a property or method decorator, the `target` is the
                 // "static"-side type of the parent of the member if the member is
                 // declared "static"; otherwise, it is the "instance"-side type of the
@@ -33774,21 +35598,21 @@ var ts;
           */
         function getEffectiveDecoratorSecondArgumentType(node) {
             // The second argument to a decorator is its `propertyKey`
-            if (node.kind === 222 /* ClassDeclaration */) {
+            if (node.kind === 226 /* ClassDeclaration */) {
                 ts.Debug.fail("Class decorators should not have a second synthetic argument.");
                 return unknownType;
             }
-            if (node.kind === 143 /* Parameter */) {
+            if (node.kind === 144 /* Parameter */) {
                 node = node.parent;
-                if (node.kind === 149 /* Constructor */) {
+                if (node.kind === 150 /* Constructor */) {
                     // For a constructor parameter decorator, the `propertyKey` will be `undefined`.
                     return anyType;
                 }
             }
-            if (node.kind === 146 /* PropertyDeclaration */ ||
-                node.kind === 148 /* MethodDeclaration */ ||
-                node.kind === 150 /* GetAccessor */ ||
-                node.kind === 151 /* SetAccessor */) {
+            if (node.kind === 147 /* PropertyDeclaration */ ||
+                node.kind === 149 /* MethodDeclaration */ ||
+                node.kind === 151 /* GetAccessor */ ||
+                node.kind === 152 /* SetAccessor */) {
                 // The `propertyKey` for a property or method decorator will be a
                 // string literal type if the member name is an identifier, number, or string;
                 // otherwise, if the member name is a computed property name it will
@@ -33799,7 +35623,7 @@ var ts;
                     case 8 /* NumericLiteral */:
                     case 9 /* StringLiteral */:
                         return getLiteralTypeForText(32 /* StringLiteral */, element.name.text);
-                    case 141 /* ComputedPropertyName */:
+                    case 142 /* ComputedPropertyName */:
                         var nameType = checkComputedPropertyName(element.name);
                         if (isTypeOfKind(nameType, 512 /* ESSymbol */)) {
                             return nameType;
@@ -33825,21 +35649,21 @@ var ts;
         function getEffectiveDecoratorThirdArgumentType(node) {
             // The third argument to a decorator is either its `descriptor` for a method decorator
             // or its `parameterIndex` for a parameter decorator
-            if (node.kind === 222 /* ClassDeclaration */) {
+            if (node.kind === 226 /* ClassDeclaration */) {
                 ts.Debug.fail("Class decorators should not have a third synthetic argument.");
                 return unknownType;
             }
-            if (node.kind === 143 /* Parameter */) {
+            if (node.kind === 144 /* Parameter */) {
                 // The `parameterIndex` for a parameter decorator is always a number
                 return numberType;
             }
-            if (node.kind === 146 /* PropertyDeclaration */) {
+            if (node.kind === 147 /* PropertyDeclaration */) {
                 ts.Debug.fail("Property decorators should not have a third synthetic argument.");
                 return unknownType;
             }
-            if (node.kind === 148 /* MethodDeclaration */ ||
-                node.kind === 150 /* GetAccessor */ ||
-                node.kind === 151 /* SetAccessor */) {
+            if (node.kind === 149 /* MethodDeclaration */ ||
+                node.kind === 151 /* GetAccessor */ ||
+                node.kind === 152 /* SetAccessor */) {
                 // The `descriptor` for a method decorator will be a `TypedPropertyDescriptor<T>`
                 // for the type of the member.
                 var propertyType = getTypeOfNode(node);
@@ -33871,10 +35695,10 @@ var ts;
             // Decorators provide special arguments, a tagged template expression provides
             // a special first argument, and string literals get string literal types
             // unless we're reporting errors
-            if (node.kind === 144 /* Decorator */) {
+            if (node.kind === 145 /* Decorator */) {
                 return getEffectiveDecoratorArgumentType(node, argIndex);
             }
-            else if (argIndex === 0 && node.kind === 177 /* TaggedTemplateExpression */) {
+            else if (argIndex === 0 && node.kind === 181 /* TaggedTemplateExpression */) {
                 return getGlobalTemplateStringsArrayType();
             }
             // This is not a synthetic argument, so we return 'undefined'
@@ -33886,8 +35710,8 @@ var ts;
           */
         function getEffectiveArgument(node, args, argIndex) {
             // For a decorator or the first argument of a tagged template expression we return undefined.
-            if (node.kind === 144 /* Decorator */ ||
-                (argIndex === 0 && node.kind === 177 /* TaggedTemplateExpression */)) {
+            if (node.kind === 145 /* Decorator */ ||
+                (argIndex === 0 && node.kind === 181 /* TaggedTemplateExpression */)) {
                 return undefined;
             }
             return args[argIndex];
@@ -33896,11 +35720,11 @@ var ts;
           * Gets the error node to use when reporting errors for an effective argument.
           */
         function getEffectiveArgumentErrorNode(node, argIndex, arg) {
-            if (node.kind === 144 /* Decorator */) {
+            if (node.kind === 145 /* Decorator */) {
                 // For a decorator, we use the expression of the decorator for error reporting.
                 return node.expression;
             }
-            else if (argIndex === 0 && node.kind === 177 /* TaggedTemplateExpression */) {
+            else if (argIndex === 0 && node.kind === 181 /* TaggedTemplateExpression */) {
                 // For a the first argument of a tagged template expression, we use the template of the tag for error reporting.
                 return node.template;
             }
@@ -33909,8 +35733,8 @@ var ts;
             }
         }
         function resolveCall(node, signatures, candidatesOutArray, headMessage) {
-            var isTaggedTemplate = node.kind === 177 /* TaggedTemplateExpression */;
-            var isDecorator = node.kind === 144 /* Decorator */;
+            var isTaggedTemplate = node.kind === 181 /* TaggedTemplateExpression */;
+            var isDecorator = node.kind === 145 /* Decorator */;
             var typeArguments;
             if (!isTaggedTemplate && !isDecorator) {
                 typeArguments = node.typeArguments;
@@ -33981,7 +35805,7 @@ var ts;
             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 = candidatesOutArray && node.kind === 175 /* CallExpression */ && node.arguments.hasTrailingComma;
+            var signatureHelpTrailingComma = candidatesOutArray && node.kind === 179 /* 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
@@ -34020,7 +35844,7 @@ var ts;
             else if (candidateForTypeArgumentError) {
                 if (!isTaggedTemplate && !isDecorator && typeArguments) {
                     var typeArguments_2 = node.typeArguments;
-                    checkTypeArguments(candidateForTypeArgumentError, typeArguments_2, ts.map(typeArguments_2, getTypeFromTypeNodeNoAlias), /*reportErrors*/ true, headMessage);
+                    checkTypeArguments(candidateForTypeArgumentError, typeArguments_2, ts.map(typeArguments_2, getTypeFromTypeNode), /*reportErrors*/ true, headMessage);
                 }
                 else {
                     ts.Debug.assert(resultOfFailedInference.failedTypeParameterIndex >= 0);
@@ -34047,7 +35871,7 @@ var ts;
                     var candidate = candidates_1[_i];
                     if (hasCorrectArity(node, args, candidate)) {
                         if (candidate.typeParameters && typeArguments) {
-                            candidate = getSignatureInstantiation(candidate, ts.map(typeArguments, getTypeFromTypeNodeNoAlias));
+                            candidate = getSignatureInstantiation(candidate, ts.map(typeArguments, getTypeFromTypeNode));
                         }
                         return candidate;
                     }
@@ -34079,7 +35903,7 @@ var ts;
                         if (candidate.typeParameters) {
                             var typeArgumentTypes = void 0;
                             if (typeArguments) {
-                                typeArgumentTypes = ts.map(typeArguments, getTypeFromTypeNodeNoAlias);
+                                typeArgumentTypes = ts.map(typeArguments, getTypeFromTypeNode);
                                 typeArgumentsAreValid = checkTypeArguments(candidate, typeArguments, typeArgumentTypes, /*reportErrors*/ false);
                             }
                             else {
@@ -34195,7 +36019,7 @@ var ts;
             if (!numCallSignatures && !numConstructSignatures) {
                 // We exclude union types because we may have a union of function types that happen to have
                 // no common signatures.
-                if (funcType.flags & 524288 /* Union */) {
+                if (funcType.flags & 65536 /* Union */) {
                     return false;
                 }
                 return isTypeAssignableTo(funcType, globalFunctionType);
@@ -34329,16 +36153,16 @@ var ts;
           */
         function getDiagnosticHeadMessageForDecoratorResolution(node) {
             switch (node.parent.kind) {
-                case 222 /* ClassDeclaration */:
-                case 193 /* ClassExpression */:
+                case 226 /* ClassDeclaration */:
+                case 197 /* ClassExpression */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression;
-                case 143 /* Parameter */:
+                case 144 /* Parameter */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression;
-                case 146 /* PropertyDeclaration */:
+                case 147 /* PropertyDeclaration */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression;
-                case 148 /* MethodDeclaration */:
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
+                case 149 /* MethodDeclaration */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression;
             }
         }
@@ -34368,13 +36192,13 @@ var ts;
         }
         function resolveSignature(node, candidatesOutArray) {
             switch (node.kind) {
-                case 175 /* CallExpression */:
+                case 179 /* CallExpression */:
                     return resolveCallExpression(node, candidatesOutArray);
-                case 176 /* NewExpression */:
+                case 180 /* NewExpression */:
                     return resolveNewExpression(node, candidatesOutArray);
-                case 177 /* TaggedTemplateExpression */:
+                case 181 /* TaggedTemplateExpression */:
                     return resolveTaggedTemplateExpression(node, candidatesOutArray);
-                case 144 /* Decorator */:
+                case 145 /* Decorator */:
                     return resolveDecorator(node, candidatesOutArray);
             }
             ts.Debug.fail("Branch in 'resolveSignature' should be unreachable.");
@@ -34423,12 +36247,12 @@ var ts;
             if (node.expression.kind === 96 /* SuperKeyword */) {
                 return voidType;
             }
-            if (node.kind === 176 /* NewExpression */) {
+            if (node.kind === 180 /* NewExpression */) {
                 var declaration = signature.declaration;
                 if (declaration &&
-                    declaration.kind !== 149 /* Constructor */ &&
-                    declaration.kind !== 153 /* ConstructSignature */ &&
-                    declaration.kind !== 158 /* ConstructorType */ &&
+                    declaration.kind !== 150 /* Constructor */ &&
+                    declaration.kind !== 154 /* ConstructSignature */ &&
+                    declaration.kind !== 159 /* ConstructorType */ &&
                     !ts.isJSDocConstructSignature(declaration)) {
                     // When resolved signature is a call signature (and not a construct signature) the result type is any, unless
                     // the declaring function had members created through 'x.prototype.y = expr' or 'this.y = expr' psuedodeclarations
@@ -34448,14 +36272,37 @@ var ts;
                 }
             }
             // In JavaScript files, calls to any identifier 'require' are treated as external module imports
-            if (ts.isInJavaScriptFile(node) &&
-                ts.isRequireCall(node, /*checkArgumentIsStringLiteral*/ true) &&
-                // Make sure require is not a local function
-                !resolveName(node.expression, node.expression.text, 107455 /* Value */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined)) {
+            if (ts.isInJavaScriptFile(node) && isCommonJsRequire(node)) {
                 return resolveExternalModuleTypeByLiteral(node.arguments[0]);
             }
             return getReturnTypeOfSignature(signature);
         }
+        function isCommonJsRequire(node) {
+            if (!ts.isRequireCall(node, /*checkArgumentIsStringLiteral*/ true)) {
+                return false;
+            }
+            // Make sure require is not a local function
+            var resolvedRequire = resolveName(node.expression, node.expression.text, 107455 /* Value */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined);
+            if (!resolvedRequire) {
+                // project does not contain symbol named 'require' - assume commonjs require
+                return true;
+            }
+            // project includes symbol named 'require' - make sure that it it ambient and local non-alias
+            if (resolvedRequire.flags & 8388608 /* Alias */) {
+                return false;
+            }
+            var targetDeclarationKind = resolvedRequire.flags & 16 /* Function */
+                ? 225 /* FunctionDeclaration */
+                : resolvedRequire.flags & 3 /* Variable */
+                    ? 223 /* VariableDeclaration */
+                    : 0 /* Unknown */;
+            if (targetDeclarationKind !== 0 /* Unknown */) {
+                var decl = ts.getDeclarationOfKind(resolvedRequire, targetDeclarationKind);
+                // function/variable declaration should be ambient
+                return ts.isInAmbientContext(decl);
+            }
+            return false;
+        }
         function checkTaggedTemplateExpression(node) {
             return getReturnTypeOfSignature(getResolvedSignature(node));
         }
@@ -34544,8 +36391,8 @@ var ts;
                 links.type = instantiateType(contextualType, mapper);
                 // if inference didn't come up with anything but {}, fall back to the binding pattern if present.
                 if (links.type === emptyObjectType &&
-                    (parameter.valueDeclaration.name.kind === 168 /* ObjectBindingPattern */ ||
-                        parameter.valueDeclaration.name.kind === 169 /* ArrayBindingPattern */)) {
+                    (parameter.valueDeclaration.name.kind === 172 /* ObjectBindingPattern */ ||
+                        parameter.valueDeclaration.name.kind === 173 /* ArrayBindingPattern */)) {
                     links.type = getTypeFromBindingPattern(parameter.valueDeclaration.name);
                 }
                 assignBindingElementTypes(parameter.valueDeclaration);
@@ -34603,7 +36450,7 @@ var ts;
         function createPromiseReturnType(func, promisedType) {
             var promiseType = createPromiseType(promisedType);
             if (promiseType === emptyObjectType) {
-                error(func, ts.Diagnostics.An_async_function_or_method_must_have_a_valid_awaitable_return_type);
+                error(func, 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);
                 return unknownType;
             }
             return promiseType;
@@ -34615,7 +36462,7 @@ var ts;
             }
             var isAsync = ts.isAsyncFunctionLike(func);
             var type;
-            if (func.body.kind !== 200 /* Block */) {
+            if (func.body.kind !== 204 /* Block */) {
                 type = checkExpressionCached(func.body, contextualMapper);
                 if (isAsync) {
                     // From within an async function you can return either a non-promise value or a promise. Any
@@ -34705,7 +36552,7 @@ var ts;
                 return false;
             }
             var lastStatement = ts.lastOrUndefined(func.body.statements);
-            if (lastStatement && lastStatement.kind === 214 /* SwitchStatement */ && isExhaustiveSwitchStatement(lastStatement)) {
+            if (lastStatement && lastStatement.kind === 218 /* SwitchStatement */ && isExhaustiveSwitchStatement(lastStatement)) {
                 return false;
             }
             return true;
@@ -34738,7 +36585,7 @@ var ts;
                 }
             });
             if (aggregatedTypes.length === 0 && !hasReturnWithNoExpression && (hasReturnOfTypeNever ||
-                func.kind === 180 /* FunctionExpression */ || func.kind === 181 /* ArrowFunction */)) {
+                func.kind === 184 /* FunctionExpression */ || func.kind === 185 /* ArrowFunction */)) {
                 return undefined;
             }
             if (strictNullChecks && aggregatedTypes.length && hasReturnWithNoExpression) {
@@ -34767,7 +36614,7 @@ var ts;
             }
             // 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 (ts.nodeIsMissing(func.body) || func.body.kind !== 200 /* Block */ || !functionHasImplicitReturn(func)) {
+            if (ts.nodeIsMissing(func.body) || func.body.kind !== 204 /* Block */ || !functionHasImplicitReturn(func)) {
                 return;
             }
             var hasExplicitReturn = func.flags & 256 /* HasExplicitReturn */;
@@ -34800,10 +36647,10 @@ var ts;
             }
         }
         function checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper) {
-            ts.Debug.assert(node.kind !== 148 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 149 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             // Grammar checking
             var hasGrammarError = checkGrammarFunctionLikeDeclaration(node);
-            if (!hasGrammarError && node.kind === 180 /* FunctionExpression */) {
+            if (!hasGrammarError && node.kind === 184 /* FunctionExpression */) {
                 checkGrammarForGenerator(node);
             }
             // The identityMapper object is used to indicate that function expressions are wildcards
@@ -34844,14 +36691,14 @@ var ts;
                     }
                 }
             }
-            if (produceDiagnostics && node.kind !== 148 /* MethodDeclaration */) {
+            if (produceDiagnostics && node.kind !== 149 /* MethodDeclaration */) {
                 checkCollisionWithCapturedSuperVariable(node, node.name);
                 checkCollisionWithCapturedThisVariable(node, node.name);
             }
             return type;
         }
         function checkFunctionExpressionOrObjectLiteralMethodDeferred(node) {
-            ts.Debug.assert(node.kind !== 148 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 149 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             var isAsync = ts.isAsyncFunctionLike(node);
             var returnOrPromisedType = node.type && (isAsync ? checkAsyncFunctionReturnType(node) : getTypeFromTypeNode(node.type));
             if (!node.asteriskToken) {
@@ -34867,7 +36714,7 @@ var ts;
                     // checkFunctionExpressionBodies). So it must be done now.
                     getReturnTypeOfSignature(getSignatureFromDeclaration(node));
                 }
-                if (node.body.kind === 200 /* Block */) {
+                if (node.body.kind === 204 /* Block */) {
                     checkSourceElement(node.body);
                 }
                 else {
@@ -34914,11 +36761,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 === 173 /* PropertyAccessExpression */ || expr.kind === 174 /* ElementAccessExpression */) &&
+                    (expr.kind === 177 /* PropertyAccessExpression */ || expr.kind === 178 /* ElementAccessExpression */) &&
                     expr.expression.kind === 98 /* 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 === 149 /* Constructor */))
+                    if (!(func && func.kind === 150 /* Constructor */))
                         return true;
                     // If func.parent is a class and symbol is a (readonly) property of that class, or
                     // if func is a constructor and symbol is a (readonly) parameter property declared in it,
@@ -34930,50 +36777,25 @@ var ts;
             return false;
         }
         function isReferenceThroughNamespaceImport(expr) {
-            if (expr.kind === 173 /* PropertyAccessExpression */ || expr.kind === 174 /* ElementAccessExpression */) {
-                var node = skipParenthesizedNodes(expr.expression);
+            if (expr.kind === 177 /* PropertyAccessExpression */ || expr.kind === 178 /* ElementAccessExpression */) {
+                var node = ts.skipParentheses(expr.expression);
                 if (node.kind === 70 /* Identifier */) {
                     var symbol = getNodeLinks(node).resolvedSymbol;
                     if (symbol.flags & 8388608 /* Alias */) {
                         var declaration = getDeclarationOfAliasSymbol(symbol);
-                        return declaration && declaration.kind === 233 /* NamespaceImport */;
+                        return declaration && declaration.kind === 237 /* NamespaceImport */;
                     }
                 }
             }
             return false;
         }
-        function checkReferenceExpression(expr, invalidReferenceMessage, constantVariableMessage) {
+        function checkReferenceExpression(expr, invalidReferenceMessage) {
             // References are combinations of identifiers, parentheses, and property accesses.
-            var node = skipParenthesizedNodes(expr);
-            if (node.kind !== 70 /* Identifier */ && node.kind !== 173 /* PropertyAccessExpression */ && node.kind !== 174 /* ElementAccessExpression */) {
+            var node = ts.skipParentheses(expr);
+            if (node.kind !== 70 /* Identifier */ && node.kind !== 177 /* PropertyAccessExpression */ && node.kind !== 178 /* ElementAccessExpression */) {
                 error(expr, invalidReferenceMessage);
                 return false;
             }
-            // Because we get the symbol from the resolvedSymbol property, it might be of kind
-            // SymbolFlags.ExportValue. In this case it is necessary to get the actual export
-            // symbol, which will have the correct flags set on it.
-            var links = getNodeLinks(node);
-            var symbol = getExportSymbolOfValueSymbolIfExported(links.resolvedSymbol);
-            if (symbol) {
-                if (symbol !== unknownSymbol && symbol !== argumentsSymbol) {
-                    // Only variables (and not functions, classes, namespaces, enum objects, or enum members)
-                    // are considered references when referenced using a simple identifier.
-                    if (node.kind === 70 /* Identifier */ && !(symbol.flags & 3 /* Variable */)) {
-                        error(expr, invalidReferenceMessage);
-                        return false;
-                    }
-                    if (isReferenceToReadonlyEntity(node, symbol) || isReferenceThroughNamespaceImport(node)) {
-                        error(expr, constantVariableMessage);
-                        return false;
-                    }
-                }
-            }
-            else if (node.kind === 174 /* ElementAccessExpression */) {
-                if (links.resolvedIndexInfo && links.resolvedIndexInfo.isReadonly) {
-                    error(expr, constantVariableMessage);
-                    return false;
-                }
-            }
             return true;
         }
         function checkDeleteExpression(node) {
@@ -34991,7 +36813,7 @@ var ts;
         function checkAwaitExpression(node) {
             // Grammar checking
             if (produceDiagnostics) {
-                if (!(node.flags & 262144 /* AwaitContext */)) {
+                if (!(node.flags & 524288 /* AwaitContext */)) {
                     grammarErrorOnFirstToken(node, ts.Diagnostics.await_expression_is_only_allowed_within_an_async_function);
                 }
                 if (isInParameterInitializerBeforeContainingFunction(node)) {
@@ -35027,7 +36849,7 @@ var ts;
                     var ok = checkArithmeticOperandType(node.operand, getNonNullableType(operandType), ts.Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
                     if (ok) {
                         // run check only if former checks succeeded to avoid reporting cascading errors
-                        checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property);
+                        checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_or_a_property_access);
                     }
                     return numberType;
             }
@@ -35041,7 +36863,7 @@ var ts;
             var ok = checkArithmeticOperandType(node.operand, getNonNullableType(operandType), ts.Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
             if (ok) {
                 // run check only if former checks succeeded to avoid reporting cascading errors
-                checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property);
+                checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_or_a_property_access);
             }
             return numberType;
         }
@@ -35051,7 +36873,7 @@ var ts;
             if (type.flags & kind) {
                 return true;
             }
-            if (type.flags & 1572864 /* UnionOrIntersection */) {
+            if (type.flags & 196608 /* UnionOrIntersection */) {
                 var types = type.types;
                 for (var _i = 0, types_15 = types; _i < types_15.length; _i++) {
                     var t = types_15[_i];
@@ -35069,7 +36891,7 @@ var ts;
             if (type.flags & kind) {
                 return true;
             }
-            if (type.flags & 524288 /* Union */) {
+            if (type.flags & 65536 /* Union */) {
                 var types = type.types;
                 for (var _i = 0, types_16 = types; _i < types_16.length; _i++) {
                     var t = types_16[_i];
@@ -35079,7 +36901,7 @@ var ts;
                 }
                 return true;
             }
-            if (type.flags & 1048576 /* Intersection */) {
+            if (type.flags & 131072 /* Intersection */) {
                 var types = type.types;
                 for (var _a = 0, types_17 = types; _a < types_17.length; _a++) {
                     var t = types_17[_a];
@@ -35091,7 +36913,7 @@ var ts;
             return false;
         }
         function isConstEnumObjectType(type) {
-            return type.flags & (2588672 /* ObjectType */ | 2097152 /* Anonymous */) && type.symbol && isConstEnumSymbol(type.symbol);
+            return getObjectFlags(type) & 16 /* Anonymous */ && type.symbol && isConstEnumSymbol(type.symbol);
         }
         function isConstEnumSymbol(symbol) {
             return (symbol.flags & 128 /* ConstEnum */) !== 0;
@@ -35125,36 +36947,36 @@ var ts;
             if (!isTypeAnyOrAllConstituentTypesHaveKind(leftType, 34 /* StringLike */ | 340 /* NumberLike */ | 512 /* ESSymbol */)) {
                 error(left, ts.Diagnostics.The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol);
             }
-            if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, 2588672 /* ObjectType */ | 16384 /* TypeParameter */)) {
+            if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, 32768 /* Object */ | 16384 /* TypeParameter */)) {
                 error(right, ts.Diagnostics.The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter);
             }
             return booleanType;
         }
         function checkObjectLiteralAssignment(node, sourceType) {
             var properties = node.properties;
-            for (var _i = 0, properties_4 = properties; _i < properties_4.length; _i++) {
-                var p = properties_4[_i];
+            for (var _i = 0, properties_5 = properties; _i < properties_5.length; _i++) {
+                var p = properties_5[_i];
                 checkObjectLiteralDestructuringPropertyAssignment(sourceType, p);
             }
             return sourceType;
         }
         function checkObjectLiteralDestructuringPropertyAssignment(objectLiteralType, property) {
-            if (property.kind === 253 /* PropertyAssignment */ || property.kind === 254 /* ShorthandPropertyAssignment */) {
-                var name_17 = property.name;
-                if (name_17.kind === 141 /* ComputedPropertyName */) {
-                    checkComputedPropertyName(name_17);
+            if (property.kind === 257 /* PropertyAssignment */ || property.kind === 258 /* ShorthandPropertyAssignment */) {
+                var name_21 = property.name;
+                if (name_21.kind === 142 /* ComputedPropertyName */) {
+                    checkComputedPropertyName(name_21);
                 }
-                if (isComputedNonLiteralName(name_17)) {
+                if (isComputedNonLiteralName(name_21)) {
                     return undefined;
                 }
-                var text = getTextOfPropertyName(name_17);
+                var text = ts.getTextOfPropertyName(name_21);
                 var type = isTypeAny(objectLiteralType)
                     ? objectLiteralType
                     : getTypeOfPropertyOfType(objectLiteralType, text) ||
                         isNumericLiteralName(text) && getIndexTypeOfType(objectLiteralType, 1 /* Number */) ||
                         getIndexTypeOfType(objectLiteralType, 0 /* String */);
                 if (type) {
-                    if (property.kind === 254 /* ShorthandPropertyAssignment */) {
+                    if (property.kind === 258 /* ShorthandPropertyAssignment */) {
                         return checkDestructuringAssignment(property, type);
                     }
                     else {
@@ -35163,7 +36985,12 @@ var ts;
                     }
                 }
                 else {
-                    error(name_17, ts.Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(objectLiteralType), ts.declarationNameToString(name_17));
+                    error(name_21, ts.Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(objectLiteralType), ts.declarationNameToString(name_21));
+                }
+            }
+            else if (property.kind === 259 /* SpreadAssignment */) {
+                if (property.expression.kind !== 70 /* Identifier */) {
+                    error(property.expression, ts.Diagnostics.An_object_rest_element_must_be_an_identifier);
                 }
             }
             else {
@@ -35184,8 +37011,8 @@ var ts;
         function checkArrayLiteralDestructuringElementAssignment(node, sourceType, elementIndex, elementType, contextualMapper) {
             var elements = node.elements;
             var element = elements[elementIndex];
-            if (element.kind !== 194 /* OmittedExpression */) {
-                if (element.kind !== 192 /* SpreadElementExpression */) {
+            if (element.kind !== 198 /* OmittedExpression */) {
+                if (element.kind !== 196 /* SpreadElement */) {
                     var propName = "" + elementIndex;
                     var type = isTypeAny(sourceType)
                         ? sourceType
@@ -35209,11 +37036,11 @@ var ts;
                 }
                 else {
                     if (elementIndex < elements.length - 1) {
-                        error(element, ts.Diagnostics.A_rest_element_must_be_last_in_an_array_destructuring_pattern);
+                        error(element, ts.Diagnostics.A_rest_element_must_be_last_in_a_destructuring_pattern);
                     }
                     else {
                         var restExpression = element.expression;
-                        if (restExpression.kind === 188 /* BinaryExpression */ && restExpression.operatorToken.kind === 57 /* EqualsToken */) {
+                        if (restExpression.kind === 192 /* BinaryExpression */ && restExpression.operatorToken.kind === 57 /* EqualsToken */) {
                             error(restExpression.operatorToken, ts.Diagnostics.A_rest_element_cannot_have_an_initializer);
                         }
                         else {
@@ -35226,7 +37053,7 @@ var ts;
         }
         function checkDestructuringAssignment(exprOrAssignment, sourceType, contextualMapper) {
             var target;
-            if (exprOrAssignment.kind === 254 /* ShorthandPropertyAssignment */) {
+            if (exprOrAssignment.kind === 258 /* ShorthandPropertyAssignment */) {
                 var prop = exprOrAssignment;
                 if (prop.objectAssignmentInitializer) {
                     // In strict null checking mode, if a default value of a non-undefined type is specified, remove
@@ -35242,21 +37069,21 @@ var ts;
             else {
                 target = exprOrAssignment;
             }
-            if (target.kind === 188 /* BinaryExpression */ && target.operatorToken.kind === 57 /* EqualsToken */) {
+            if (target.kind === 192 /* BinaryExpression */ && target.operatorToken.kind === 57 /* EqualsToken */) {
                 checkBinaryExpression(target, contextualMapper);
                 target = target.left;
             }
-            if (target.kind === 172 /* ObjectLiteralExpression */) {
+            if (target.kind === 176 /* ObjectLiteralExpression */) {
                 return checkObjectLiteralAssignment(target, sourceType);
             }
-            if (target.kind === 171 /* ArrayLiteralExpression */) {
+            if (target.kind === 175 /* ArrayLiteralExpression */) {
                 return checkArrayLiteralAssignment(target, sourceType, contextualMapper);
             }
             return checkReferenceAssignment(target, sourceType, contextualMapper);
         }
         function checkReferenceAssignment(target, sourceType, contextualMapper) {
             var targetType = checkExpression(target, contextualMapper);
-            if (checkReferenceExpression(target, ts.Diagnostics.Invalid_left_hand_side_of_assignment_expression, ts.Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property)) {
+            if (checkReferenceExpression(target, ts.Diagnostics.The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access)) {
                 checkTypeAssignableTo(sourceType, targetType, target, /*headMessage*/ undefined);
             }
             return sourceType;
@@ -35275,35 +37102,35 @@ var ts;
                 case 70 /* Identifier */:
                 case 9 /* StringLiteral */:
                 case 11 /* RegularExpressionLiteral */:
-                case 177 /* TaggedTemplateExpression */:
-                case 190 /* TemplateExpression */:
+                case 181 /* TaggedTemplateExpression */:
+                case 194 /* TemplateExpression */:
                 case 12 /* NoSubstitutionTemplateLiteral */:
                 case 8 /* NumericLiteral */:
                 case 100 /* TrueKeyword */:
                 case 85 /* FalseKeyword */:
                 case 94 /* NullKeyword */:
-                case 136 /* UndefinedKeyword */:
-                case 180 /* FunctionExpression */:
-                case 193 /* ClassExpression */:
-                case 181 /* ArrowFunction */:
-                case 171 /* ArrayLiteralExpression */:
-                case 172 /* ObjectLiteralExpression */:
-                case 183 /* TypeOfExpression */:
-                case 197 /* NonNullExpression */:
-                case 243 /* JsxSelfClosingElement */:
-                case 242 /* JsxElement */:
+                case 137 /* UndefinedKeyword */:
+                case 184 /* FunctionExpression */:
+                case 197 /* ClassExpression */:
+                case 185 /* ArrowFunction */:
+                case 175 /* ArrayLiteralExpression */:
+                case 176 /* ObjectLiteralExpression */:
+                case 187 /* TypeOfExpression */:
+                case 201 /* NonNullExpression */:
+                case 247 /* JsxSelfClosingElement */:
+                case 246 /* JsxElement */:
                     return true;
-                case 189 /* ConditionalExpression */:
+                case 193 /* ConditionalExpression */:
                     return isSideEffectFree(node.whenTrue) &&
                         isSideEffectFree(node.whenFalse);
-                case 188 /* BinaryExpression */:
+                case 192 /* BinaryExpression */:
                     if (ts.isAssignmentOperator(node.operatorToken.kind)) {
                         return false;
                     }
                     return isSideEffectFree(node.left) &&
                         isSideEffectFree(node.right);
-                case 186 /* PrefixUnaryExpression */:
-                case 187 /* PostfixUnaryExpression */:
+                case 190 /* PrefixUnaryExpression */:
+                case 191 /* PostfixUnaryExpression */:
                     // Unary operators ~, !, +, and - have no side effects.
                     // The rest do.
                     switch (node.operator) {
@@ -35315,9 +37142,9 @@ var ts;
                     }
                     return false;
                 // Some forms listed here for clarity
-                case 184 /* VoidExpression */: // Explicit opt-out
-                case 178 /* TypeAssertionExpression */: // Not SEF, but can produce useful type warnings
-                case 196 /* AsExpression */: // Not SEF, but can produce useful type warnings
+                case 188 /* VoidExpression */: // Explicit opt-out
+                case 182 /* TypeAssertionExpression */: // Not SEF, but can produce useful type warnings
+                case 200 /* AsExpression */: // Not SEF, but can produce useful type warnings
                 default:
                     return false;
             }
@@ -35337,7 +37164,7 @@ var ts;
         }
         function checkBinaryLikeExpression(left, operatorToken, right, contextualMapper, errorNode) {
             var operator = operatorToken.kind;
-            if (operator === 57 /* EqualsToken */ && (left.kind === 172 /* ObjectLiteralExpression */ || left.kind === 171 /* ArrayLiteralExpression */)) {
+            if (operator === 57 /* EqualsToken */ && (left.kind === 176 /* ObjectLiteralExpression */ || left.kind === 175 /* ArrayLiteralExpression */)) {
                 return checkDestructuringAssignment(left, checkExpression(right, contextualMapper), contextualMapper);
             }
             var leftType = checkExpression(left, contextualMapper);
@@ -35520,9 +37347,7 @@ var ts;
                     // requires VarExpr to be classified as a reference
                     // A compound assignment furthermore requires VarExpr to be classified as a reference (section 4.1)
                     // and the type of the non - compound operation to be assignable to the type of VarExpr.
-                    var ok = checkReferenceExpression(left, ts.Diagnostics.Invalid_left_hand_side_of_assignment_expression, ts.Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property);
-                    // Use default messages
-                    if (ok) {
+                    if (checkReferenceExpression(left, ts.Diagnostics.The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access)) {
                         // to avoid cascading errors check assignability only if 'isReference' check succeeded and no errors were reported
                         checkTypeAssignableTo(valueType, leftType, left, /*headMessage*/ undefined);
                     }
@@ -35550,7 +37375,7 @@ var ts;
         function checkYieldExpression(node) {
             // Grammar checking
             if (produceDiagnostics) {
-                if (!(node.flags & 65536 /* YieldContext */) || isYieldExpressionInClass(node)) {
+                if (!(node.flags & 131072 /* YieldContext */) || isYieldExpressionInClass(node)) {
                     grammarErrorOnFirstToken(node, ts.Diagnostics.A_yield_expression_is_only_allowed_in_a_generator_body);
                 }
                 if (isInParameterInitializerBeforeContainingFunction(node)) {
@@ -35638,8 +37463,8 @@ var ts;
             return links.resolvedType;
         }
         function isTypeAssertion(node) {
-            node = skipParenthesizedNodes(node);
-            return node.kind === 178 /* TypeAssertionExpression */ || node.kind === 196 /* AsExpression */;
+            node = ts.skipParentheses(node);
+            return node.kind === 182 /* TypeAssertionExpression */ || node.kind === 200 /* AsExpression */;
         }
         function checkDeclarationInitializer(declaration) {
             var type = checkExpressionCached(declaration.initializer);
@@ -35671,7 +37496,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 === 141 /* ComputedPropertyName */) {
+            if (node.name.kind === 142 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
             }
             return checkExpressionForMutableLocation(node.initializer, contextualMapper);
@@ -35682,7 +37507,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 === 141 /* ComputedPropertyName */) {
+            if (node.name.kind === 142 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
             }
             var uninstantiatedType = checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper);
@@ -35712,7 +37537,7 @@ var ts;
         // contextually typed function and arrow expressions in the initial phase.
         function checkExpression(node, contextualMapper) {
             var type;
-            if (node.kind === 140 /* QualifiedName */) {
+            if (node.kind === 141 /* QualifiedName */) {
                 type = checkQualifiedName(node);
             }
             else {
@@ -35724,9 +37549,9 @@ var ts;
                 // - 'left' in property access
                 // - 'object' in indexed access
                 // - target in rhs of import statement
-                var ok = (node.parent.kind === 173 /* PropertyAccessExpression */ && node.parent.expression === node) ||
-                    (node.parent.kind === 174 /* ElementAccessExpression */ && node.parent.expression === node) ||
-                    ((node.kind === 70 /* Identifier */ || node.kind === 140 /* QualifiedName */) && isInRightSideOfImportOrExportAssignment(node));
+                var ok = (node.parent.kind === 177 /* PropertyAccessExpression */ && node.parent.expression === node) ||
+                    (node.parent.kind === 178 /* ElementAccessExpression */ && node.parent.expression === node) ||
+                    ((node.kind === 70 /* Identifier */ || node.kind === 141 /* QualifiedName */) && isInRightSideOfImportOrExportAssignment(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);
                 }
@@ -35748,66 +37573,66 @@ var ts;
                 case 100 /* TrueKeyword */:
                 case 85 /* FalseKeyword */:
                     return checkLiteralExpression(node);
-                case 190 /* TemplateExpression */:
+                case 194 /* TemplateExpression */:
                     return checkTemplateExpression(node);
                 case 12 /* NoSubstitutionTemplateLiteral */:
                     return stringType;
                 case 11 /* RegularExpressionLiteral */:
                     return globalRegExpType;
-                case 171 /* ArrayLiteralExpression */:
+                case 175 /* ArrayLiteralExpression */:
                     return checkArrayLiteral(node, contextualMapper);
-                case 172 /* ObjectLiteralExpression */:
+                case 176 /* ObjectLiteralExpression */:
                     return checkObjectLiteral(node, contextualMapper);
-                case 173 /* PropertyAccessExpression */:
+                case 177 /* PropertyAccessExpression */:
                     return checkPropertyAccessExpression(node);
-                case 174 /* ElementAccessExpression */:
+                case 178 /* ElementAccessExpression */:
                     return checkIndexedAccess(node);
-                case 175 /* CallExpression */:
-                case 176 /* NewExpression */:
+                case 179 /* CallExpression */:
+                case 180 /* NewExpression */:
                     return checkCallExpression(node);
-                case 177 /* TaggedTemplateExpression */:
+                case 181 /* TaggedTemplateExpression */:
                     return checkTaggedTemplateExpression(node);
-                case 179 /* ParenthesizedExpression */:
+                case 183 /* ParenthesizedExpression */:
                     return checkExpression(node.expression, contextualMapper);
-                case 193 /* ClassExpression */:
+                case 197 /* ClassExpression */:
                     return checkClassExpression(node);
-                case 180 /* FunctionExpression */:
-                case 181 /* ArrowFunction */:
+                case 184 /* FunctionExpression */:
+                case 185 /* ArrowFunction */:
                     return checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper);
-                case 183 /* TypeOfExpression */:
+                case 187 /* TypeOfExpression */:
                     return checkTypeOfExpression(node);
-                case 178 /* TypeAssertionExpression */:
-                case 196 /* AsExpression */:
+                case 182 /* TypeAssertionExpression */:
+                case 200 /* AsExpression */:
                     return checkAssertion(node);
-                case 197 /* NonNullExpression */:
+                case 201 /* NonNullExpression */:
                     return checkNonNullAssertion(node);
-                case 182 /* DeleteExpression */:
+                case 186 /* DeleteExpression */:
                     return checkDeleteExpression(node);
-                case 184 /* VoidExpression */:
+                case 188 /* VoidExpression */:
                     return checkVoidExpression(node);
-                case 185 /* AwaitExpression */:
+                case 189 /* AwaitExpression */:
                     return checkAwaitExpression(node);
-                case 186 /* PrefixUnaryExpression */:
+                case 190 /* PrefixUnaryExpression */:
                     return checkPrefixUnaryExpression(node);
-                case 187 /* PostfixUnaryExpression */:
+                case 191 /* PostfixUnaryExpression */:
                     return checkPostfixUnaryExpression(node);
-                case 188 /* BinaryExpression */:
+                case 192 /* BinaryExpression */:
                     return checkBinaryExpression(node, contextualMapper);
-                case 189 /* ConditionalExpression */:
+                case 193 /* ConditionalExpression */:
                     return checkConditionalExpression(node, contextualMapper);
-                case 192 /* SpreadElementExpression */:
-                    return checkSpreadElementExpression(node, contextualMapper);
-                case 194 /* OmittedExpression */:
+                case 196 /* SpreadElement */:
+                    return checkSpreadExpression(node, contextualMapper);
+                case 198 /* OmittedExpression */:
                     return undefinedWideningType;
-                case 191 /* YieldExpression */:
+                case 195 /* YieldExpression */:
                     return checkYieldExpression(node);
-                case 248 /* JsxExpression */:
+                case 252 /* JsxExpression */:
                     return checkJsxExpression(node);
-                case 242 /* JsxElement */:
+                case 246 /* JsxElement */:
                     return checkJsxElement(node);
-                case 243 /* JsxSelfClosingElement */:
+                case 247 /* JsxSelfClosingElement */:
                     return checkJsxSelfClosingElement(node);
-                case 244 /* JsxOpeningElement */:
+                case 248 /* JsxOpeningElement */:
                     ts.Debug.fail("Shouldn't ever directly check a JsxOpeningElement");
             }
             return unknownType;
@@ -35835,7 +37660,7 @@ var ts;
             var func = ts.getContainingFunction(node);
             if (ts.getModifierFlags(node) & 92 /* ParameterPropertyModifier */) {
                 func = ts.getContainingFunction(node);
-                if (!(func.kind === 149 /* Constructor */ && ts.nodeIsPresent(func.body))) {
+                if (!(func.kind === 150 /* Constructor */ && ts.nodeIsPresent(func.body))) {
                     error(node, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
                 }
             }
@@ -35846,7 +37671,7 @@ var ts;
                 if (ts.indexOf(func.parameters, node) !== 0) {
                     error(node, ts.Diagnostics.A_this_parameter_must_be_the_first_parameter);
                 }
-                if (func.kind === 149 /* Constructor */ || func.kind === 153 /* ConstructSignature */ || func.kind === 158 /* ConstructorType */) {
+                if (func.kind === 150 /* Constructor */ || func.kind === 154 /* ConstructSignature */ || func.kind === 159 /* ConstructorType */) {
                     error(node, ts.Diagnostics.A_constructor_cannot_have_a_this_parameter);
                 }
             }
@@ -35860,9 +37685,9 @@ var ts;
             if (!node.asteriskToken || !node.body) {
                 return false;
             }
-            return node.kind === 148 /* MethodDeclaration */ ||
-                node.kind === 221 /* FunctionDeclaration */ ||
-                node.kind === 180 /* FunctionExpression */;
+            return node.kind === 149 /* MethodDeclaration */ ||
+                node.kind === 225 /* FunctionDeclaration */ ||
+                node.kind === 184 /* FunctionExpression */;
         }
         function getTypePredicateParameterIndex(parameterList, parameter) {
             if (parameterList) {
@@ -35905,9 +37730,9 @@ var ts;
                 else if (parameterName) {
                     var hasReportedError = false;
                     for (var _i = 0, _a = parent.parameters; _i < _a.length; _i++) {
-                        var name_18 = _a[_i].name;
-                        if (ts.isBindingPattern(name_18) &&
-                            checkIfTypePredicateVariableIsDeclaredInBindingPattern(name_18, parameterName, typePredicate.parameterName)) {
+                        var name_22 = _a[_i].name;
+                        if (ts.isBindingPattern(name_22) &&
+                            checkIfTypePredicateVariableIsDeclaredInBindingPattern(name_22, parameterName, typePredicate.parameterName)) {
                             hasReportedError = true;
                             break;
                         }
@@ -35920,16 +37745,16 @@ var ts;
         }
         function getTypePredicateParent(node) {
             switch (node.parent.kind) {
-                case 181 /* ArrowFunction */:
-                case 152 /* CallSignature */:
-                case 221 /* FunctionDeclaration */:
-                case 180 /* FunctionExpression */:
-                case 157 /* FunctionType */:
-                case 148 /* MethodDeclaration */:
-                case 147 /* MethodSignature */:
-                    var parent_12 = node.parent;
-                    if (node === parent_12.type) {
-                        return parent_12;
+                case 185 /* ArrowFunction */:
+                case 153 /* CallSignature */:
+                case 225 /* FunctionDeclaration */:
+                case 184 /* FunctionExpression */:
+                case 158 /* FunctionType */:
+                case 149 /* MethodDeclaration */:
+                case 148 /* MethodSignature */:
+                    var parent_10 = node.parent;
+                    if (node === parent_10.type) {
+                        return parent_10;
                     }
             }
         }
@@ -35939,15 +37764,15 @@ var ts;
                 if (ts.isOmittedExpression(element)) {
                     continue;
                 }
-                var name_19 = element.name;
-                if (name_19.kind === 70 /* Identifier */ &&
-                    name_19.text === predicateVariableName) {
+                var name_23 = element.name;
+                if (name_23.kind === 70 /* Identifier */ &&
+                    name_23.text === predicateVariableName) {
                     error(predicateVariableNode, ts.Diagnostics.A_type_predicate_cannot_reference_element_0_in_a_binding_pattern, predicateVariableName);
                     return true;
                 }
-                else if (name_19.kind === 169 /* ArrayBindingPattern */ ||
-                    name_19.kind === 168 /* ObjectBindingPattern */) {
-                    if (checkIfTypePredicateVariableIsDeclaredInBindingPattern(name_19, predicateVariableNode, predicateVariableName)) {
+                else if (name_23.kind === 173 /* ArrayBindingPattern */ ||
+                    name_23.kind === 172 /* ObjectBindingPattern */) {
+                    if (checkIfTypePredicateVariableIsDeclaredInBindingPattern(name_23, predicateVariableNode, predicateVariableName)) {
                         return true;
                     }
                 }
@@ -35955,12 +37780,12 @@ var ts;
         }
         function checkSignatureDeclaration(node) {
             // Grammar checking
-            if (node.kind === 154 /* IndexSignature */) {
+            if (node.kind === 155 /* IndexSignature */) {
                 checkGrammarIndexSignature(node);
             }
-            else if (node.kind === 157 /* FunctionType */ || node.kind === 221 /* FunctionDeclaration */ || node.kind === 158 /* ConstructorType */ ||
-                node.kind === 152 /* CallSignature */ || node.kind === 149 /* Constructor */ ||
-                node.kind === 153 /* ConstructSignature */) {
+            else if (node.kind === 158 /* FunctionType */ || node.kind === 225 /* FunctionDeclaration */ || node.kind === 159 /* ConstructorType */ ||
+                node.kind === 153 /* CallSignature */ || node.kind === 150 /* Constructor */ ||
+                node.kind === 154 /* ConstructSignature */) {
                 checkGrammarFunctionLikeDeclaration(node);
             }
             checkTypeParameters(node.typeParameters);
@@ -35972,10 +37797,10 @@ var ts;
                 checkCollisionWithArgumentsInGeneratedCode(node);
                 if (compilerOptions.noImplicitAny && !node.type) {
                     switch (node.kind) {
-                        case 153 /* ConstructSignature */:
+                        case 154 /* ConstructSignature */:
                             error(node, ts.Diagnostics.Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
-                        case 152 /* CallSignature */:
+                        case 153 /* CallSignature */:
                             error(node, ts.Diagnostics.Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
                     }
@@ -36018,7 +37843,7 @@ var ts;
             var staticNames = ts.createMap();
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                if (member.kind === 149 /* Constructor */) {
+                if (member.kind === 150 /* Constructor */) {
                     for (var _b = 0, _c = member.parameters; _b < _c.length; _b++) {
                         var param = _c[_b];
                         if (ts.isParameterPropertyDeclaration(param)) {
@@ -36032,13 +37857,13 @@ var ts;
                     var memberName = member.name && ts.getPropertyNameForPropertyNameNode(member.name);
                     if (memberName) {
                         switch (member.kind) {
-                            case 150 /* GetAccessor */:
+                            case 151 /* GetAccessor */:
                                 addName(names, member.name, memberName, 1 /* Getter */);
                                 break;
-                            case 151 /* SetAccessor */:
+                            case 152 /* SetAccessor */:
                                 addName(names, member.name, memberName, 2 /* Setter */);
                                 break;
-                            case 146 /* PropertyDeclaration */:
+                            case 147 /* PropertyDeclaration */:
                                 addName(names, member.name, memberName, 3 /* Property */);
                                 break;
                         }
@@ -36064,7 +37889,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 == 145 /* PropertySignature */) {
+                if (member.kind == 146 /* PropertySignature */) {
                     var memberName = void 0;
                     switch (member.name.kind) {
                         case 9 /* StringLiteral */:
@@ -36086,7 +37911,7 @@ var ts;
             }
         }
         function checkTypeForDuplicateIndexSignatures(node) {
-            if (node.kind === 223 /* InterfaceDeclaration */) {
+            if (node.kind === 227 /* 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
@@ -36106,7 +37931,7 @@ var ts;
                     var declaration = decl;
                     if (declaration.parameters.length === 1 && declaration.parameters[0].type) {
                         switch (declaration.parameters[0].type.kind) {
-                            case 133 /* StringKeyword */:
+                            case 134 /* StringKeyword */:
                                 if (!seenStringIndexer) {
                                     seenStringIndexer = true;
                                 }
@@ -36114,7 +37939,7 @@ var ts;
                                     error(declaration, ts.Diagnostics.Duplicate_string_index_signature);
                                 }
                                 break;
-                            case 131 /* NumberKeyword */:
+                            case 132 /* NumberKeyword */:
                                 if (!seenNumericIndexer) {
                                     seenNumericIndexer = true;
                                 }
@@ -36182,12 +38007,12 @@ var ts;
                 if (n.kind === 98 /* ThisKeyword */) {
                     error(n, ts.Diagnostics.this_cannot_be_referenced_in_current_location);
                 }
-                else if (n.kind !== 180 /* FunctionExpression */ && n.kind !== 221 /* FunctionDeclaration */) {
+                else if (n.kind !== 184 /* FunctionExpression */ && n.kind !== 225 /* FunctionDeclaration */) {
                     ts.forEachChild(n, markThisReferencesAsErrors);
                 }
             }
             function isInstancePropertyWithInitializer(n) {
-                return n.kind === 146 /* PropertyDeclaration */ &&
+                return n.kind === 147 /* PropertyDeclaration */ &&
                     !(ts.getModifierFlags(n) & 32 /* Static */) &&
                     !!n.initializer;
             }
@@ -36217,7 +38042,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 === 203 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
+                            if (statement.kind === 207 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
                                 superCallStatement = statement;
                                 break;
                             }
@@ -36241,7 +38066,7 @@ var ts;
                 checkGrammarFunctionLikeDeclaration(node) || checkGrammarAccessor(node) || checkGrammarComputedPropertyName(node.name);
                 checkDecorators(node);
                 checkSignatureDeclaration(node);
-                if (node.kind === 150 /* GetAccessor */) {
+                if (node.kind === 151 /* GetAccessor */) {
                     if (!ts.isInAmbientContext(node) && 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);
@@ -36251,13 +38076,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 === 141 /* ComputedPropertyName */) {
+                if (node.name.kind === 142 /* ComputedPropertyName */) {
                     checkComputedPropertyName(node.name);
                 }
                 if (!ts.hasDynamicName(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 === 150 /* GetAccessor */ ? 151 /* SetAccessor */ : 150 /* GetAccessor */;
+                    var otherKind = node.kind === 151 /* GetAccessor */ ? 152 /* SetAccessor */ : 151 /* GetAccessor */;
                     var otherAccessor = ts.getDeclarationOfKind(node.symbol, otherKind);
                     if (otherAccessor) {
                         if ((ts.getModifierFlags(node) & 28 /* AccessibilityModifier */) !== (ts.getModifierFlags(otherAccessor) & 28 /* AccessibilityModifier */)) {
@@ -36273,11 +38098,11 @@ var ts;
                     }
                 }
                 var returnType = getTypeOfAccessors(getSymbolOfNode(node));
-                if (node.kind === 150 /* GetAccessor */) {
+                if (node.kind === 151 /* GetAccessor */) {
                     checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnType);
                 }
             }
-            if (node.parent.kind !== 172 /* ObjectLiteralExpression */) {
+            if (node.parent.kind !== 176 /* ObjectLiteralExpression */) {
                 checkSourceElement(node.body);
                 registerForUnusedIdentifiersCheck(node);
             }
@@ -36307,7 +38132,7 @@ var ts;
                 var constraint = getConstraintOfTypeParameter(typeParameters[i]);
                 if (constraint) {
                     if (!typeArguments) {
-                        typeArguments = ts.map(typeArgumentNodes, getTypeFromTypeNodeNoAlias);
+                        typeArguments = ts.map(typeArgumentNodes, getTypeFromTypeNode);
                         mapper = createTypeMapper(typeParameters, typeArguments);
                     }
                     var typeArgument = typeArguments[i];
@@ -36360,6 +38185,17 @@ var ts;
         function checkUnionOrIntersectionType(node) {
             ts.forEach(node.types, checkSourceElement);
         }
+        function checkIndexedAccessType(node) {
+            getTypeFromIndexedAccessTypeNode(node);
+        }
+        function checkMappedType(node) {
+            checkSourceElement(node.typeParameter);
+            checkSourceElement(node.type);
+            var type = getTypeFromMappedTypeNode(node);
+            var constraintType = getConstraintTypeFromMappedType(type);
+            var keyType = constraintType.flags & 16384 /* TypeParameter */ ? getApparentTypeOfTypeParameter(constraintType) : constraintType;
+            checkTypeAssignableTo(keyType, stringOrNumberType, node.typeParameter.constraint);
+        }
         function isPrivateWithinAmbient(node) {
             return (ts.getModifierFlags(node) & 8 /* Private */) && ts.isInAmbientContext(node);
         }
@@ -36367,9 +38203,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 !== 223 /* InterfaceDeclaration */ &&
-                n.parent.kind !== 222 /* ClassDeclaration */ &&
-                n.parent.kind !== 193 /* ClassExpression */ &&
+            if (n.parent.kind !== 227 /* InterfaceDeclaration */ &&
+                n.parent.kind !== 226 /* ClassDeclaration */ &&
+                n.parent.kind !== 197 /* ClassExpression */ &&
                 ts.isInAmbientContext(n)) {
                 if (!(flags & 2 /* Ambient */)) {
                     // It is nested in an ambient context, which means it is automatically exported
@@ -36457,7 +38293,7 @@ var ts;
                         var errorNode_1 = subsequentNode.name || subsequentNode;
                         // TODO(jfreeman): These are methods, so handle computed name case
                         if (node.name && subsequentNode.name && node.name.text === subsequentNode.name.text) {
-                            var reportError = (node.kind === 148 /* MethodDeclaration */ || node.kind === 147 /* MethodSignature */) &&
+                            var reportError = (node.kind === 149 /* MethodDeclaration */ || node.kind === 148 /* MethodSignature */) &&
                                 (ts.getModifierFlags(node) & 32 /* Static */) !== (ts.getModifierFlags(subsequentNode) & 32 /* Static */);
                             // we can get here in two cases
                             // 1. mixed static and instance class members
@@ -36496,7 +38332,7 @@ var ts;
                 var current = declarations_4[_i];
                 var node = current;
                 var inAmbientContext = ts.isInAmbientContext(node);
-                var inAmbientContextOrInterface = node.parent.kind === 223 /* InterfaceDeclaration */ || node.parent.kind === 160 /* TypeLiteral */ || inAmbientContext;
+                var inAmbientContextOrInterface = node.parent.kind === 227 /* InterfaceDeclaration */ || node.parent.kind === 161 /* TypeLiteral */ || inAmbientContext;
                 if (inAmbientContextOrInterface) {
                     // check if declarations are consecutive only if they are non-ambient
                     // 1. ambient declarations can be interleaved
@@ -36507,7 +38343,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 === 221 /* FunctionDeclaration */ || node.kind === 148 /* MethodDeclaration */ || node.kind === 147 /* MethodSignature */ || node.kind === 149 /* Constructor */) {
+                if (node.kind === 225 /* FunctionDeclaration */ || node.kind === 149 /* MethodDeclaration */ || node.kind === 148 /* MethodSignature */ || node.kind === 150 /* Constructor */) {
                     var currentNodeFlags = getEffectiveDeclarationFlags(node, flagsToCheck);
                     someNodeFlags |= currentNodeFlags;
                     allNodeFlags &= currentNodeFlags;
@@ -36629,16 +38465,16 @@ var ts;
             }
             function getDeclarationSpaces(d) {
                 switch (d.kind) {
-                    case 223 /* InterfaceDeclaration */:
+                    case 227 /* InterfaceDeclaration */:
                         return 2097152 /* ExportType */;
-                    case 226 /* ModuleDeclaration */:
+                    case 230 /* ModuleDeclaration */:
                         return ts.isAmbientModule(d) || ts.getModuleInstanceState(d) !== 0 /* NonInstantiated */
                             ? 4194304 /* ExportNamespace */ | 1048576 /* ExportValue */
                             : 4194304 /* ExportNamespace */;
-                    case 222 /* ClassDeclaration */:
-                    case 225 /* EnumDeclaration */:
+                    case 226 /* ClassDeclaration */:
+                    case 229 /* EnumDeclaration */:
                         return 2097152 /* ExportType */ | 1048576 /* ExportValue */;
-                    case 230 /* ImportEqualsDeclaration */:
+                    case 234 /* ImportEqualsDeclaration */:
                         var result_2 = 0;
                         var target = resolveAlias(getSymbolOfNode(d));
                         ts.forEach(target.declarations, function (d) { result_2 |= getDeclarationSpaces(d); });
@@ -36679,7 +38515,7 @@ var ts;
             if (isTypeAny(promise)) {
                 return undefined;
             }
-            if (promise.flags & 131072 /* Reference */) {
+            if (getObjectFlags(promise) & 4 /* Reference */) {
                 if (promise.target === tryGetGlobalPromiseType()
                     || promise.target === getGlobalPromiseLikeType()) {
                     return promise.typeArguments[0];
@@ -36723,7 +38559,7 @@ var ts;
         function checkAwaitedType(type, location, message) {
             return checkAwaitedTypeWorker(type);
             function checkAwaitedTypeWorker(type) {
-                if (type.flags & 524288 /* Union */) {
+                if (type.flags & 65536 /* Union */) {
                     var types = [];
                     for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                         var constituentType = _a[_i];
@@ -36802,56 +38638,19 @@ var ts;
             }
         }
         /**
-         * Checks that the return type provided is an instantiation of the global Promise<T> type
-         * and returns the awaited type of the return type.
+         * Checks the return type of an async function to ensure it is a compatible
+         * Promise implementation.
          *
-         * @param returnType The return type of a FunctionLikeDeclaration
-         * @param location The node on which to report the error.
+         * This checks that an async function has a valid Promise-compatible return type,
+         * and returns the *awaited type* of the promise. An async function has a valid
+         * Promise-compatible return type if the resolved value of the return type has a
+         * construct signature that takes in an `initializer` function that in turn supplies
+         * a `resolve` function as one of its arguments and results in an object with a
+         * callable `then` signature.
+         *
+         * @param node The signature to check
          */
-        function checkCorrectPromiseType(returnType, location, diagnostic, typeName) {
-            if (returnType === unknownType) {
-                // The return type already had some other error, so we ignore and return
-                // the unknown type.
-                return unknownType;
-            }
-            var globalPromiseType = getGlobalPromiseType();
-            if (globalPromiseType === emptyGenericType
-                || globalPromiseType === getTargetType(returnType)) {
-                // Either we couldn't resolve the global promise type, which would have already
-                // reported an error, or we could resolve it and the return type is a valid type
-                // reference to the global type. In either case, we return the awaited type for
-                // the return type.
-                return checkAwaitedType(returnType, location, ts.Diagnostics.An_async_function_or_method_must_have_a_valid_awaitable_return_type);
-            }
-            // The promise type was not a valid type reference to the global promise type, so we
-            // report an error and return the unknown type.
-            error(location, diagnostic, typeName);
-            return unknownType;
-        }
-        /**
-          * Checks the return type of an async function to ensure it is a compatible
-          * Promise implementation.
-          * @param node The signature to check
-          * @param returnType The return type for the function
-          * @remarks
-          * This checks that an async function has a valid Promise-compatible return type,
-          * and returns the *awaited type* of the promise. An async function has a valid
-          * Promise-compatible return type if the resolved value of the return type has a
-          * construct signature that takes in an `initializer` function that in turn supplies
-          * a `resolve` function as one of its arguments and results in an object with a
-          * callable `then` signature.
-          */
         function checkAsyncFunctionReturnType(node) {
-            if (languageVersion >= 2 /* ES2015 */) {
-                var returnType = getTypeFromTypeNode(node.type);
-                return checkCorrectPromiseType(returnType, node.type, ts.Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type);
-            }
-            var globalPromiseConstructorLikeType = getGlobalPromiseConstructorLikeType();
-            if (globalPromiseConstructorLikeType === emptyObjectType) {
-                // If we couldn't resolve the global PromiseConstructorLike type we cannot verify
-                // compatibility with __awaiter.
-                return unknownType;
-            }
             // As part of our emit for an async function, we will need to emit the entity name of
             // the return type annotation as an expression. To meet the necessary runtime semantics
             // for __awaiter, we must also check that the type of the declaration (e.g. the static
@@ -36876,39 +38675,56 @@ var ts;
             //      then<U>(...): Promise<U>;
             //  }
             //
-            // When we get the type of the `Promise` symbol here, we get the type of the static
-            // side of the `Promise` class, which would be `{ new <T>(...): Promise<T> }`.
-            var promiseType = getTypeFromTypeNode(node.type);
-            if (promiseType === unknownType && compilerOptions.isolatedModules) {
-                // If we are compiling with isolatedModules, we may not be able to resolve the
-                // type as a value. As such, we will just return unknownType;
-                return unknownType;
+            var returnType = getTypeFromTypeNode(node.type);
+            if (languageVersion >= 2 /* ES2015 */) {
+                if (returnType === unknownType) {
+                    return unknownType;
+                }
+                var globalPromiseType = getGlobalPromiseType();
+                if (globalPromiseType !== emptyGenericType && globalPromiseType !== getTargetType(returnType)) {
+                    // The promise type was not a valid type reference to the global promise type, so we
+                    // report an error and return the unknown type.
+                    error(node.type, ts.Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type);
+                    return unknownType;
+                }
             }
-            var promiseConstructor = getNodeLinks(node.type).resolvedSymbol;
-            if (!promiseConstructor || !symbolIsValue(promiseConstructor)) {
-                // try to fall back to global promise type.
-                var typeName = promiseConstructor
-                    ? symbolToString(promiseConstructor)
-                    : typeToString(promiseType);
-                return checkCorrectPromiseType(promiseType, node.type, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type, typeName);
-            }
-            // If the Promise constructor, resolved locally, is an alias symbol we should mark it as referenced.
-            checkReturnTypeAnnotationAsExpression(node);
-            // Validate the promise constructor type.
-            var promiseConstructorType = getTypeOfSymbol(promiseConstructor);
-            if (!checkTypeAssignableTo(promiseConstructorType, globalPromiseConstructorLikeType, node.type, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type)) {
-                return unknownType;
-            }
-            // Verify there is no local declaration that could collide with the promise constructor.
-            var promiseName = ts.getEntityNameFromTypeNode(node.type);
-            var promiseNameOrNamespaceRoot = getFirstIdentifier(promiseName);
-            var rootSymbol = getSymbol(node.locals, promiseNameOrNamespaceRoot.text, 107455 /* Value */);
-            if (rootSymbol) {
-                error(rootSymbol.valueDeclaration, ts.Diagnostics.Duplicate_identifier_0_Compiler_uses_declaration_1_to_support_async_functions, promiseNameOrNamespaceRoot.text, getFullyQualifiedName(promiseConstructor));
-                return unknownType;
+            else {
+                // Always mark the type node as referenced if it points to a value
+                markTypeNodeAsReferenced(node.type);
+                if (returnType === unknownType) {
+                    return unknownType;
+                }
+                var promiseConstructorName = ts.getEntityNameFromTypeNode(node.type);
+                if (promiseConstructorName === undefined) {
+                    error(node.type, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, typeToString(returnType));
+                    return unknownType;
+                }
+                var promiseConstructorSymbol = resolveEntityName(promiseConstructorName, 107455 /* Value */, /*ignoreErrors*/ true);
+                var promiseConstructorType = promiseConstructorSymbol ? getTypeOfSymbol(promiseConstructorSymbol) : unknownType;
+                if (promiseConstructorType === unknownType) {
+                    error(node.type, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, ts.entityNameToString(promiseConstructorName));
+                    return unknownType;
+                }
+                var globalPromiseConstructorLikeType = getGlobalPromiseConstructorLikeType();
+                if (globalPromiseConstructorLikeType === emptyObjectType) {
+                    // If we couldn't resolve the global PromiseConstructorLike type we cannot verify
+                    // compatibility with __awaiter.
+                    error(node.type, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, ts.entityNameToString(promiseConstructorName));
+                    return unknownType;
+                }
+                if (!checkTypeAssignableTo(promiseConstructorType, globalPromiseConstructorLikeType, node.type, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value)) {
+                    return unknownType;
+                }
+                // Verify there is no local declaration that could collide with the promise constructor.
+                var rootName = promiseConstructorName && getFirstIdentifier(promiseConstructorName);
+                var collidingSymbol = getSymbol(node.locals, rootName.text, 107455 /* Value */);
+                if (collidingSymbol) {
+                    error(collidingSymbol.valueDeclaration, ts.Diagnostics.Duplicate_identifier_0_Compiler_uses_declaration_1_to_support_async_functions, rootName.text, ts.entityNameToString(promiseConstructorName));
+                    return unknownType;
+                }
             }
             // Get and return the awaited type of the return type.
-            return checkAwaitedType(promiseType, node, ts.Diagnostics.An_async_function_or_method_must_have_a_valid_awaitable_return_type);
+            return checkAwaitedType(returnType, node, ts.Diagnostics.An_async_function_or_method_must_have_a_valid_awaitable_return_type);
         }
         /** Check a decorator */
         function checkDecorator(node) {
@@ -36921,22 +38737,22 @@ var ts;
             var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
             var errorInfo;
             switch (node.parent.kind) {
-                case 222 /* ClassDeclaration */:
+                case 226 /* ClassDeclaration */:
                     var classSymbol = getSymbolOfNode(node.parent);
                     var classConstructorType = getTypeOfSymbol(classSymbol);
                     expectedReturnType = getUnionType([classConstructorType, voidType]);
                     break;
-                case 143 /* Parameter */:
+                case 144 /* Parameter */:
                     expectedReturnType = voidType;
                     errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any);
                     break;
-                case 146 /* PropertyDeclaration */:
+                case 147 /* PropertyDeclaration */:
                     expectedReturnType = voidType;
                     errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.The_return_type_of_a_property_decorator_function_must_be_either_void_or_any);
                     break;
-                case 148 /* MethodDeclaration */:
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
+                case 149 /* MethodDeclaration */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
                     var methodType = getTypeOfNode(node.parent);
                     var descriptorType = createTypedPropertyDescriptorType(methodType);
                     expectedReturnType = getUnionType([descriptorType, voidType]);
@@ -36944,42 +38760,19 @@ var ts;
             }
             checkTypeAssignableTo(returnType, expectedReturnType, node, headMessage, errorInfo);
         }
-        /** Checks a type reference node as an expression. */
-        function checkTypeNodeAsExpression(node) {
-            // When we are emitting type metadata for decorators, we need to try to check the type
-            // as if it were an expression so that we can emit the type in a value position when we
-            // serialize the type metadata.
-            if (node && node.kind === 156 /* TypeReference */) {
-                var root = getFirstIdentifier(node.typeName);
-                var meaning = root.parent.kind === 156 /* TypeReference */ ? 793064 /* Type */ : 1920 /* Namespace */;
-                // Resolve type so we know which symbol is referenced
-                var rootSymbol = resolveName(root, root.text, meaning | 8388608 /* Alias */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined);
-                // Resolved symbol is alias
-                if (rootSymbol && rootSymbol.flags & 8388608 /* Alias */) {
-                    var aliasTarget = resolveAlias(rootSymbol);
-                    // If alias has value symbol - mark alias as referenced
-                    if (aliasTarget.flags & 107455 /* Value */ && !isConstEnumOrConstEnumOnlyModule(resolveAlias(rootSymbol))) {
-                        markAliasSymbolAsReferenced(rootSymbol);
-                    }
-                }
-            }
-        }
         /**
-          * Checks the type annotation of an accessor declaration or property declaration as
-          * an expression if it is a type reference to a type with a value declaration.
-          */
-        function checkTypeAnnotationAsExpression(node) {
-            checkTypeNodeAsExpression(node.type);
-        }
-        function checkReturnTypeAnnotationAsExpression(node) {
-            checkTypeNodeAsExpression(node.type);
-        }
-        /** Checks the type annotation of the parameters of a function/method or the constructor of a class as expressions */
-        function checkParameterTypeAnnotationsAsExpressions(node) {
-            // ensure all type annotations with a value declaration are checked as an expression
-            for (var _i = 0, _a = node.parameters; _i < _a.length; _i++) {
-                var parameter = _a[_i];
-                checkTypeAnnotationAsExpression(parameter);
+         * If a TypeNode can be resolved to a value symbol imported from an external module, it is
+         * marked as referenced to prevent import elision.
+         */
+        function markTypeNodeAsReferenced(node) {
+            var typeName = node && ts.getEntityNameFromTypeNode(node);
+            var rootName = typeName && getFirstIdentifier(typeName);
+            var rootSymbol = rootName && resolveName(rootName, rootName.text, (typeName.kind === 70 /* Identifier */ ? 793064 /* Type */ : 1920 /* Namespace */) | 8388608 /* Alias */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined);
+            if (rootSymbol
+                && rootSymbol.flags & 8388608 /* Alias */
+                && symbolIsValue(rootSymbol)
+                && !isConstEnumOrConstEnumOnlyModule(resolveAlias(rootSymbol))) {
+                markAliasSymbolAsReferenced(rootSymbol);
             }
         }
         /** Check the decorators of a node */
@@ -36998,21 +38791,27 @@ var ts;
             if (compilerOptions.emitDecoratorMetadata) {
                 // we only need to perform these checks if we are emitting serialized type metadata for the target of a decorator.
                 switch (node.kind) {
-                    case 222 /* ClassDeclaration */:
+                    case 226 /* ClassDeclaration */:
                         var constructor = ts.getFirstConstructorWithBody(node);
                         if (constructor) {
-                            checkParameterTypeAnnotationsAsExpressions(constructor);
+                            for (var _i = 0, _a = constructor.parameters; _i < _a.length; _i++) {
+                                var parameter = _a[_i];
+                                markTypeNodeAsReferenced(parameter.type);
+                            }
                         }
                         break;
-                    case 148 /* MethodDeclaration */:
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
-                        checkParameterTypeAnnotationsAsExpressions(node);
-                        checkReturnTypeAnnotationAsExpression(node);
+                    case 149 /* MethodDeclaration */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* SetAccessor */:
+                        for (var _b = 0, _c = node.parameters; _b < _c.length; _b++) {
+                            var parameter = _c[_b];
+                            markTypeNodeAsReferenced(parameter.type);
+                        }
+                        markTypeNodeAsReferenced(node.type);
                         break;
-                    case 146 /* PropertyDeclaration */:
-                    case 143 /* Parameter */:
-                        checkTypeAnnotationAsExpression(node);
+                    case 147 /* PropertyDeclaration */:
+                    case 144 /* Parameter */:
+                        markTypeNodeAsReferenced(node.type);
                         break;
                 }
             }
@@ -37034,7 +38833,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 === 141 /* ComputedPropertyName */) {
+            if (node.name && node.name.kind === 142 /* ComputedPropertyName */) {
                 // This check will account for methods in class/interface declarations,
                 // as well as accessors in classes/object literals
                 checkComputedPropertyName(node.name);
@@ -37094,43 +38893,43 @@ var ts;
                 for (var _i = 0, deferredUnusedIdentifierNodes_1 = deferredUnusedIdentifierNodes; _i < deferredUnusedIdentifierNodes_1.length; _i++) {
                     var node = deferredUnusedIdentifierNodes_1[_i];
                     switch (node.kind) {
-                        case 256 /* SourceFile */:
-                        case 226 /* ModuleDeclaration */:
+                        case 261 /* SourceFile */:
+                        case 230 /* ModuleDeclaration */:
                             checkUnusedModuleMembers(node);
                             break;
-                        case 222 /* ClassDeclaration */:
-                        case 193 /* ClassExpression */:
+                        case 226 /* ClassDeclaration */:
+                        case 197 /* ClassExpression */:
                             checkUnusedClassMembers(node);
                             checkUnusedTypeParameters(node);
                             break;
-                        case 223 /* InterfaceDeclaration */:
+                        case 227 /* InterfaceDeclaration */:
                             checkUnusedTypeParameters(node);
                             break;
-                        case 200 /* Block */:
-                        case 228 /* CaseBlock */:
-                        case 207 /* ForStatement */:
-                        case 208 /* ForInStatement */:
-                        case 209 /* ForOfStatement */:
+                        case 204 /* Block */:
+                        case 232 /* CaseBlock */:
+                        case 211 /* ForStatement */:
+                        case 212 /* ForInStatement */:
+                        case 213 /* ForOfStatement */:
                             checkUnusedLocalsAndParameters(node);
                             break;
-                        case 149 /* Constructor */:
-                        case 180 /* FunctionExpression */:
-                        case 221 /* FunctionDeclaration */:
-                        case 181 /* ArrowFunction */:
-                        case 148 /* MethodDeclaration */:
-                        case 150 /* GetAccessor */:
-                        case 151 /* SetAccessor */:
+                        case 150 /* Constructor */:
+                        case 184 /* FunctionExpression */:
+                        case 225 /* FunctionDeclaration */:
+                        case 185 /* ArrowFunction */:
+                        case 149 /* MethodDeclaration */:
+                        case 151 /* GetAccessor */:
+                        case 152 /* SetAccessor */:
                             if (node.body) {
                                 checkUnusedLocalsAndParameters(node);
                             }
                             checkUnusedTypeParameters(node);
                             break;
-                        case 147 /* MethodSignature */:
-                        case 152 /* CallSignature */:
-                        case 153 /* ConstructSignature */:
-                        case 154 /* IndexSignature */:
-                        case 157 /* FunctionType */:
-                        case 158 /* ConstructorType */:
+                        case 148 /* MethodSignature */:
+                        case 153 /* CallSignature */:
+                        case 154 /* ConstructSignature */:
+                        case 155 /* IndexSignature */:
+                        case 158 /* FunctionType */:
+                        case 159 /* ConstructorType */:
                             checkUnusedTypeParameters(node);
                             break;
                     }
@@ -37139,43 +38938,57 @@ var ts;
             }
         }
         function checkUnusedLocalsAndParameters(node) {
-            if (node.parent.kind !== 223 /* InterfaceDeclaration */ && noUnusedIdentifiers && !ts.isInAmbientContext(node)) {
-                var _loop_1 = function (key) {
+            if (node.parent.kind !== 227 /* InterfaceDeclaration */ && noUnusedIdentifiers && !ts.isInAmbientContext(node)) {
+                var _loop_3 = function (key) {
                     var local = node.locals[key];
                     if (!local.isReferenced) {
-                        if (local.valueDeclaration && local.valueDeclaration.kind === 143 /* Parameter */) {
-                            var parameter = local.valueDeclaration;
+                        if (local.valueDeclaration && ts.getRootDeclaration(local.valueDeclaration).kind === 144 /* Parameter */) {
+                            var parameter = ts.getRootDeclaration(local.valueDeclaration);
                             if (compilerOptions.noUnusedParameters &&
                                 !ts.isParameterPropertyDeclaration(parameter) &&
                                 !ts.parameterIsThisKeyword(parameter) &&
-                                !parameterNameStartsWithUnderscore(parameter)) {
+                                !parameterNameStartsWithUnderscore(local.valueDeclaration.name)) {
                                 error(local.valueDeclaration.name, ts.Diagnostics._0_is_declared_but_never_used, local.name);
                             }
                         }
                         else if (compilerOptions.noUnusedLocals) {
-                            ts.forEach(local.declarations, function (d) { return error(d.name || d, ts.Diagnostics._0_is_declared_but_never_used, local.name); });
+                            ts.forEach(local.declarations, function (d) { return errorUnusedLocal(d.name || d, local.name); });
                         }
                     }
                 };
                 for (var key in node.locals) {
-                    _loop_1(key);
+                    _loop_3(key);
                 }
             }
         }
-        function parameterNameStartsWithUnderscore(parameter) {
-            return parameter.name && parameter.name.kind === 70 /* Identifier */ && parameter.name.text.charCodeAt(0) === 95 /* _ */;
+        function errorUnusedLocal(node, name) {
+            if (isIdentifierThatStartsWithUnderScore(node)) {
+                var declaration = ts.getRootDeclaration(node.parent);
+                if (declaration.kind === 223 /* VariableDeclaration */ &&
+                    (declaration.parent.parent.kind === 212 /* ForInStatement */ ||
+                        declaration.parent.parent.kind === 213 /* ForOfStatement */)) {
+                    return;
+                }
+            }
+            error(node, ts.Diagnostics._0_is_declared_but_never_used, name);
+        }
+        function parameterNameStartsWithUnderscore(parameterName) {
+            return parameterName && isIdentifierThatStartsWithUnderScore(parameterName);
+        }
+        function isIdentifierThatStartsWithUnderScore(node) {
+            return node.kind === 70 /* Identifier */ && node.text.charCodeAt(0) === 95 /* _ */;
         }
         function checkUnusedClassMembers(node) {
             if (compilerOptions.noUnusedLocals && !ts.isInAmbientContext(node)) {
                 if (node.members) {
                     for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                         var member = _a[_i];
-                        if (member.kind === 148 /* MethodDeclaration */ || member.kind === 146 /* PropertyDeclaration */) {
+                        if (member.kind === 149 /* MethodDeclaration */ || member.kind === 147 /* PropertyDeclaration */) {
                             if (!member.symbol.isReferenced && ts.getModifierFlags(member) & 8 /* Private */) {
                                 error(member.name, ts.Diagnostics._0_is_declared_but_never_used, member.symbol.name);
                             }
                         }
-                        else if (member.kind === 149 /* Constructor */) {
+                        else if (member.kind === 150 /* Constructor */) {
                             for (var _b = 0, _c = member.parameters; _b < _c.length; _b++) {
                                 var parameter = _c[_b];
                                 if (!parameter.symbol.isReferenced && ts.getModifierFlags(parameter) & 8 /* Private */) {
@@ -37223,7 +39036,7 @@ var ts;
         }
         function checkBlock(node) {
             // Grammar checking for SyntaxKind.Block
-            if (node.kind === 200 /* Block */) {
+            if (node.kind === 204 /* Block */) {
                 checkGrammarStatementInAmbientContext(node);
             }
             ts.forEach(node.statements, checkSourceElement);
@@ -37246,12 +39059,12 @@ var ts;
             if (!(identifier && identifier.text === name)) {
                 return false;
             }
-            if (node.kind === 146 /* PropertyDeclaration */ ||
-                node.kind === 145 /* PropertySignature */ ||
-                node.kind === 148 /* MethodDeclaration */ ||
-                node.kind === 147 /* MethodSignature */ ||
-                node.kind === 150 /* GetAccessor */ ||
-                node.kind === 151 /* SetAccessor */) {
+            if (node.kind === 147 /* PropertyDeclaration */ ||
+                node.kind === 146 /* PropertySignature */ ||
+                node.kind === 149 /* MethodDeclaration */ ||
+                node.kind === 148 /* MethodSignature */ ||
+                node.kind === 151 /* GetAccessor */ ||
+                node.kind === 152 /* SetAccessor */) {
                 // it is ok to have member named '_super' or '_this' - member access is always qualified
                 return false;
             }
@@ -37260,7 +39073,7 @@ var ts;
                 return false;
             }
             var root = ts.getRootDeclaration(node);
-            if (root.kind === 143 /* Parameter */ && ts.nodeIsMissing(root.parent.body)) {
+            if (root.kind === 144 /* Parameter */ && ts.nodeIsMissing(root.parent.body)) {
                 // just an overload - no codegen impact
                 return false;
             }
@@ -37317,12 +39130,12 @@ var ts;
                 return;
             }
             // Uninstantiated modules shouldnt do this check
-            if (node.kind === 226 /* ModuleDeclaration */ && ts.getModuleInstanceState(node) !== 1 /* Instantiated */) {
+            if (node.kind === 230 /* ModuleDeclaration */ && ts.getModuleInstanceState(node) !== 1 /* Instantiated */) {
                 return;
             }
             // 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 === 256 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent)) {
+            if (parent.kind === 261 /* 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));
             }
@@ -37332,12 +39145,12 @@ var ts;
                 return;
             }
             // Uninstantiated modules shouldnt do this check
-            if (node.kind === 226 /* ModuleDeclaration */ && ts.getModuleInstanceState(node) !== 1 /* Instantiated */) {
+            if (node.kind === 230 /* ModuleDeclaration */ && ts.getModuleInstanceState(node) !== 1 /* Instantiated */) {
                 return;
             }
             // 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 === 256 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent) && parent.flags & 8192 /* HasAsyncFunctions */) {
+            if (parent.kind === 261 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent) && parent.flags & 8192 /* 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));
             }
@@ -37372,7 +39185,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 === 219 /* VariableDeclaration */ && !node.initializer) {
+            if (node.kind === 223 /* VariableDeclaration */ && !node.initializer) {
                 return;
             }
             var symbol = getSymbolOfNode(node);
@@ -37382,24 +39195,24 @@ var ts;
                     localDeclarationSymbol !== symbol &&
                     localDeclarationSymbol.flags & 2 /* BlockScopedVariable */) {
                     if (getDeclarationNodeFlagsFromSymbol(localDeclarationSymbol) & 3 /* BlockScoped */) {
-                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 220 /* VariableDeclarationList */);
-                        var container = varDeclList.parent.kind === 201 /* VariableStatement */ && varDeclList.parent.parent
+                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 224 /* VariableDeclarationList */);
+                        var container = varDeclList.parent.kind === 205 /* 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 === 200 /* Block */ && ts.isFunctionLike(container.parent) ||
-                                container.kind === 227 /* ModuleBlock */ ||
-                                container.kind === 226 /* ModuleDeclaration */ ||
-                                container.kind === 256 /* SourceFile */);
+                            (container.kind === 204 /* Block */ && ts.isFunctionLike(container.parent) ||
+                                container.kind === 231 /* ModuleBlock */ ||
+                                container.kind === 230 /* ModuleDeclaration */ ||
+                                container.kind === 261 /* 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
                         // since LHS will be block scoped name instead of function scoped
                         if (!namesShareScope) {
-                            var name_20 = symbolToString(localDeclarationSymbol);
-                            error(node, ts.Diagnostics.Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1, name_20, name_20);
+                            var name_24 = symbolToString(localDeclarationSymbol);
+                            error(node, ts.Diagnostics.Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1, name_24, name_24);
                         }
                     }
                 }
@@ -37407,7 +39220,7 @@ 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 !== 143 /* Parameter */) {
+            if (ts.getRootDeclaration(node).kind !== 144 /* Parameter */) {
                 return;
             }
             var func = ts.getContainingFunction(node);
@@ -37418,7 +39231,7 @@ var ts;
                     // skip declaration names (i.e. in object literal expressions)
                     return;
                 }
-                if (n.kind === 173 /* PropertyAccessExpression */) {
+                if (n.kind === 177 /* PropertyAccessExpression */) {
                     // skip property names in property access expression
                     return visit(n.expression);
                 }
@@ -37437,7 +39250,7 @@ var ts;
                     // 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 === 143 /* Parameter */) {
+                        if (symbol.valueDeclaration.kind === 144 /* Parameter */) {
                             // 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) {
@@ -37451,7 +39264,7 @@ var ts;
                                 }
                                 // computed property names/initializers in instance property declaration of class like entities
                                 // are executed in constructor and thus deferred
-                                if (current.parent.kind === 146 /* PropertyDeclaration */ &&
+                                if (current.parent.kind === 147 /* PropertyDeclaration */ &&
                                     !(ts.hasModifier(current.parent, 32 /* Static */)) &&
                                     ts.isClassLike(current.parent.parent)) {
                                     return;
@@ -37478,24 +39291,25 @@ 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 === 141 /* ComputedPropertyName */) {
+            if (node.name.kind === 142 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
                 if (node.initializer) {
                     checkExpressionCached(node.initializer);
                 }
             }
-            if (node.kind === 170 /* BindingElement */) {
+            if (node.kind === 174 /* BindingElement */) {
                 // check computed properties inside property names of binding elements
-                if (node.propertyName && node.propertyName.kind === 141 /* ComputedPropertyName */) {
+                if (node.propertyName && node.propertyName.kind === 142 /* ComputedPropertyName */) {
                     checkComputedPropertyName(node.propertyName);
                 }
                 // check private/protected variable access
-                var parent_13 = node.parent.parent;
-                var parentType = getTypeForBindingElementParent(parent_13);
-                var name_21 = node.propertyName || node.name;
-                var property = getPropertyOfType(parentType, getTextOfPropertyName(name_21));
-                if (parent_13.initializer && property && getParentOfSymbol(property)) {
-                    checkClassPropertyAccess(parent_13, parent_13.initializer, parentType, property);
+                var parent_11 = node.parent.parent;
+                var parentType = getTypeForBindingElementParent(parent_11);
+                var name_25 = node.propertyName || node.name;
+                var property = getPropertyOfType(parentType, ts.getTextOfPropertyName(name_25));
+                markPropertyAsReferenced(property);
+                if (parent_11.initializer && property && getParentOfSymbol(property)) {
+                    checkClassPropertyAccess(parent_11, parent_11.initializer, parentType, property);
                 }
             }
             // For a binding pattern, check contained binding elements
@@ -37503,14 +39317,14 @@ var ts;
                 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 === 143 /* Parameter */ && ts.nodeIsMissing(ts.getContainingFunction(node).body)) {
+            if (node.initializer && ts.getRootDeclaration(node).kind === 144 /* 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 !== 208 /* ForInStatement */) {
+                if (node.initializer && node.parent.parent.kind !== 212 /* ForInStatement */) {
                     checkTypeAssignableTo(checkExpressionCached(node.initializer), getWidenedTypeForVariableLikeDeclaration(node), node, /*headMessage*/ undefined);
                     checkParameterInitializer(node);
                 }
@@ -37521,7 +39335,7 @@ var ts;
             if (node === symbol.valueDeclaration) {
                 // Node is the primary declaration of the symbol, just validate the initializer
                 // Don't validate for-in initializer as it is already an error
-                if (node.initializer && node.parent.parent.kind !== 208 /* ForInStatement */) {
+                if (node.initializer && node.parent.parent.kind !== 212 /* ForInStatement */) {
                     checkTypeAssignableTo(checkExpressionCached(node.initializer), type, node, /*headMessage*/ undefined);
                     checkParameterInitializer(node);
                 }
@@ -37541,10 +39355,10 @@ var ts;
                     error(node.name, ts.Diagnostics.All_declarations_of_0_must_have_identical_modifiers, ts.declarationNameToString(node.name));
                 }
             }
-            if (node.kind !== 146 /* PropertyDeclaration */ && node.kind !== 145 /* PropertySignature */) {
+            if (node.kind !== 147 /* PropertyDeclaration */ && node.kind !== 146 /* PropertySignature */) {
                 // We know we don't have a binding pattern or computed name here
                 checkExportsOnMergedDeclarations(node);
-                if (node.kind === 219 /* VariableDeclaration */ || node.kind === 170 /* BindingElement */) {
+                if (node.kind === 223 /* VariableDeclaration */ || node.kind === 174 /* BindingElement */) {
                     checkVarDeclaredNamesNotShadowed(node);
                 }
                 checkCollisionWithCapturedSuperVariable(node, node.name);
@@ -37554,8 +39368,8 @@ var ts;
             }
         }
         function areDeclarationFlagsIdentical(left, right) {
-            if ((left.kind === 143 /* Parameter */ && right.kind === 219 /* VariableDeclaration */) ||
-                (left.kind === 219 /* VariableDeclaration */ && right.kind === 143 /* Parameter */)) {
+            if ((left.kind === 144 /* Parameter */ && right.kind === 223 /* VariableDeclaration */) ||
+                (left.kind === 223 /* VariableDeclaration */ && right.kind === 144 /* Parameter */)) {
                 // Differences in optionality between parameters and variables are allowed.
                 return true;
             }
@@ -37585,7 +39399,7 @@ var ts;
         }
         function checkGrammarDisallowedModifiersOnObjectLiteralExpressionMethod(node) {
             // We only disallow modifier on a method declaration if it is a property of object-literal-expression
-            if (node.modifiers && node.parent.kind === 172 /* ObjectLiteralExpression */) {
+            if (node.modifiers && node.parent.kind === 176 /* ObjectLiteralExpression */) {
                 if (ts.isAsyncFunctionLike(node)) {
                     if (node.modifiers.length > 1) {
                         return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
@@ -37606,7 +39420,7 @@ var ts;
             checkGrammarStatementInAmbientContext(node);
             checkExpression(node.expression);
             checkSourceElement(node.thenStatement);
-            if (node.thenStatement.kind === 202 /* EmptyStatement */) {
+            if (node.thenStatement.kind === 206 /* EmptyStatement */) {
                 error(node.thenStatement, ts.Diagnostics.The_body_of_an_if_statement_cannot_be_the_empty_statement);
             }
             checkSourceElement(node.elseStatement);
@@ -37626,12 +39440,12 @@ var ts;
         function checkForStatement(node) {
             // Grammar checking
             if (!checkGrammarStatementInAmbientContext(node)) {
-                if (node.initializer && node.initializer.kind === 220 /* VariableDeclarationList */) {
+                if (node.initializer && node.initializer.kind === 224 /* VariableDeclarationList */) {
                     checkGrammarVariableDeclarationList(node.initializer);
                 }
             }
             if (node.initializer) {
-                if (node.initializer.kind === 220 /* VariableDeclarationList */) {
+                if (node.initializer.kind === 224 /* VariableDeclarationList */) {
                     ts.forEach(node.initializer.declarations, checkVariableDeclaration);
                 }
                 else {
@@ -37654,14 +39468,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 === 220 /* VariableDeclarationList */) {
+            if (node.initializer.kind === 224 /* VariableDeclarationList */) {
                 checkForInOrForOfVariableDeclaration(node);
             }
             else {
                 var varExpr = node.initializer;
                 var iteratedType = checkRightHandSideOfForOf(node.expression);
                 // There may be a destructuring assignment on the left side
-                if (varExpr.kind === 171 /* ArrayLiteralExpression */ || varExpr.kind === 172 /* ObjectLiteralExpression */) {
+                if (varExpr.kind === 175 /* ArrayLiteralExpression */ || varExpr.kind === 176 /* 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.
@@ -37669,8 +39483,7 @@ var ts;
                 }
                 else {
                     var leftType = checkExpression(varExpr);
-                    checkReferenceExpression(varExpr, /*invalidReferenceMessage*/ ts.Diagnostics.Invalid_left_hand_side_in_for_of_statement, 
-                    /*constantVariableMessage*/ ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_be_a_constant_or_a_read_only_property);
+                    checkReferenceExpression(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_must_be_a_variable_or_a_property_access);
                     // iteratedType will be undefined if the rightType was missing properties/signatures
                     // required to get its iteratedType (like [Symbol.iterator] or next). This may be
                     // because we accessed properties from anyType, or it may have led to an error inside
@@ -37693,7 +39506,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 === 220 /* VariableDeclarationList */) {
+            if (node.initializer.kind === 224 /* 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);
@@ -37707,7 +39520,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 === 171 /* ArrayLiteralExpression */ || varExpr.kind === 172 /* ObjectLiteralExpression */) {
+                if (varExpr.kind === 175 /* ArrayLiteralExpression */ || varExpr.kind === 176 /* ObjectLiteralExpression */) {
                     error(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
                 }
                 else if (!isTypeAnyOrAllConstituentTypesHaveKind(leftType, 34 /* StringLike */)) {
@@ -37715,13 +39528,13 @@ var ts;
                 }
                 else {
                     // run check only former check succeeded to avoid cascading errors
-                    checkReferenceExpression(varExpr, ts.Diagnostics.Invalid_left_hand_side_in_for_in_statement, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_constant_or_a_read_only_property);
+                    checkReferenceExpression(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_must_be_a_variable_or_a_property_access);
                 }
             }
             var rightType = checkNonNullExpression(node.expression);
             // unknownType is returned i.e. if node.expression is identifier whose name cannot be resolved
             // in this case error about missing name is already reported - do not report extra one
-            if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, 2588672 /* ObjectType */ | 16384 /* TypeParameter */)) {
+            if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, 32768 /* Object */ | 16384 /* TypeParameter */)) {
                 error(node.expression, ts.Diagnostics.The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter);
             }
             checkSourceElement(node.statement);
@@ -37803,7 +39616,7 @@ var ts;
             if (!typeAsIterable.iterableElementType) {
                 // As an optimization, if the type is instantiated directly using the globalIterableType (Iterable<number>),
                 // then just grab its type argument.
-                if ((type.flags & 131072 /* Reference */) && type.target === getGlobalIterableType()) {
+                if ((getObjectFlags(type) & 4 /* Reference */) && type.target === getGlobalIterableType()) {
                     typeAsIterable.iterableElementType = type.typeArguments[0];
                 }
                 else {
@@ -37844,7 +39657,7 @@ var ts;
             if (!typeAsIterator.iteratorElementType) {
                 // As an optimization, if the type is instantiated directly using the globalIteratorType (Iterator<number>),
                 // then just grab its type argument.
-                if ((type.flags & 131072 /* Reference */) && type.target === getGlobalIteratorType()) {
+                if ((getObjectFlags(type) & 4 /* Reference */) && type.target === getGlobalIteratorType()) {
                     typeAsIterator.iteratorElementType = type.typeArguments[0];
                 }
                 else {
@@ -37881,7 +39694,7 @@ var ts;
             }
             // As an optimization, if the type is instantiated directly using the globalIterableIteratorType (IterableIterator<number>),
             // then just grab its type argument.
-            if ((type.flags & 131072 /* Reference */) && type.target === getGlobalIterableIteratorType()) {
+            if ((getObjectFlags(type) & 4 /* Reference */) && type.target === getGlobalIterableIteratorType()) {
                 return type.typeArguments[0];
             }
             return getElementTypeOfIterable(type, /*errorNode*/ undefined) ||
@@ -37909,8 +39722,12 @@ var ts;
             // After we remove all types that are StringLike, we will know if there was a string constituent
             // based on whether the remaining type is the same as the initial type.
             var arrayType = arrayOrStringType;
-            if (arrayOrStringType.flags & 524288 /* Union */) {
-                arrayType = getUnionType(ts.filter(arrayOrStringType.types, function (t) { return !(t.flags & 34 /* StringLike */); }), /*subtypeReduction*/ true);
+            if (arrayOrStringType.flags & 65536 /* Union */) {
+                var arrayTypes = arrayOrStringType.types;
+                var filteredTypes = ts.filter(arrayTypes, function (t) { return !(t.flags & 34 /* StringLike */); });
+                if (filteredTypes !== arrayTypes) {
+                    arrayType = getUnionType(filteredTypes, /*subtypeReduction*/ true);
+                }
             }
             else if (arrayOrStringType.flags & 34 /* StringLike */) {
                 arrayType = neverType;
@@ -37957,7 +39774,7 @@ var ts;
             // TODO: Check that target label is valid
         }
         function isGetAccessorWithAnnotatedSetAccessor(node) {
-            return !!(node.kind === 150 /* GetAccessor */ && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(node.symbol, 151 /* SetAccessor */)));
+            return !!(node.kind === 151 /* GetAccessor */ && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(node.symbol, 152 /* SetAccessor */)));
         }
         function isUnwrappedReturnTypeVoidOrAny(func, returnType) {
             var unwrappedReturnType = ts.isAsyncFunctionLike(func) ? getPromisedType(returnType) : returnType;
@@ -37984,12 +39801,12 @@ var ts;
                         // for generators.
                         return;
                     }
-                    if (func.kind === 151 /* SetAccessor */) {
+                    if (func.kind === 152 /* SetAccessor */) {
                         if (node.expression) {
                             error(node.expression, ts.Diagnostics.Setters_cannot_return_a_value);
                         }
                     }
-                    else if (func.kind === 149 /* Constructor */) {
+                    else if (func.kind === 150 /* Constructor */) {
                         if (node.expression && !checkTypeAssignableTo(exprType, returnType, node.expression)) {
                             error(node.expression, ts.Diagnostics.Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class);
                         }
@@ -38010,7 +39827,7 @@ var ts;
                         }
                     }
                 }
-                else if (func.kind !== 149 /* Constructor */ && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(func, returnType)) {
+                else if (func.kind !== 150 /* 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);
                 }
@@ -38019,7 +39836,7 @@ var ts;
         function checkWithStatement(node) {
             // Grammar checking for withStatement
             if (!checkGrammarStatementInAmbientContext(node)) {
-                if (node.flags & 262144 /* AwaitContext */) {
+                if (node.flags & 524288 /* AwaitContext */) {
                     grammarErrorOnFirstToken(node, ts.Diagnostics.with_statements_are_not_allowed_in_an_async_function_block);
                 }
             }
@@ -38037,9 +39854,10 @@ var ts;
             var firstDefaultClause;
             var hasDuplicateDefaultClause = false;
             var expressionType = checkExpression(node.expression);
+            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 === 250 /* DefaultClause */ && !hasDuplicateDefaultClause) {
+                if (clause.kind === 254 /* DefaultClause */ && !hasDuplicateDefaultClause) {
                     if (firstDefaultClause === undefined) {
                         firstDefaultClause = clause;
                     }
@@ -38051,15 +39869,21 @@ var ts;
                         hasDuplicateDefaultClause = true;
                     }
                 }
-                if (produceDiagnostics && clause.kind === 249 /* CaseClause */) {
+                if (produceDiagnostics && clause.kind === 253 /* CaseClause */) {
                     var caseClause = clause;
                     // 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.
                     var caseType = checkExpression(caseClause.expression);
-                    if (!isTypeEqualityComparableTo(expressionType, caseType)) {
+                    var caseIsLiteral = isLiteralType(caseType);
+                    var comparedExpressionType = expressionType;
+                    if (!caseIsLiteral || !expressionIsLiteral) {
+                        caseType = caseIsLiteral ? getBaseTypeOfLiteralType(caseType) : caseType;
+                        comparedExpressionType = getBaseTypeOfLiteralType(expressionType);
+                    }
+                    if (!isTypeEqualityComparableTo(comparedExpressionType, caseType)) {
                         // expressionType is not comparable to caseType, try the reversed check and report errors if it fails
-                        checkTypeComparableTo(caseType, expressionType, caseClause.expression, /*headMessage*/ undefined);
+                        checkTypeComparableTo(caseType, comparedExpressionType, caseClause.expression, /*headMessage*/ undefined);
                     }
                 }
                 ts.forEach(clause.statements, checkSourceElement);
@@ -38076,7 +39900,7 @@ var ts;
                     if (ts.isFunctionLike(current)) {
                         break;
                     }
-                    if (current.kind === 215 /* LabeledStatement */ && current.label.text === node.label.text) {
+                    if (current.kind === 219 /* LabeledStatement */ && current.label.text === node.label.text) {
                         var sourceFile = ts.getSourceFileOfNode(node);
                         grammarErrorOnNode(node.label, ts.Diagnostics.Duplicate_label_0, ts.getTextOfNodeFromSourceText(sourceFile.text, node.label));
                         break;
@@ -38106,22 +39930,20 @@ var ts;
             if (catchClause) {
                 // Grammar checking
                 if (catchClause.variableDeclaration) {
-                    if (catchClause.variableDeclaration.name.kind !== 70 /* Identifier */) {
-                        grammarErrorOnFirstToken(catchClause.variableDeclaration.name, ts.Diagnostics.Catch_clause_variable_name_must_be_an_identifier);
-                    }
-                    else if (catchClause.variableDeclaration.type) {
+                    if (catchClause.variableDeclaration.type) {
                         grammarErrorOnFirstToken(catchClause.variableDeclaration.type, ts.Diagnostics.Catch_clause_variable_cannot_have_a_type_annotation);
                     }
                     else if (catchClause.variableDeclaration.initializer) {
                         grammarErrorOnFirstToken(catchClause.variableDeclaration.initializer, ts.Diagnostics.Catch_clause_variable_cannot_have_an_initializer);
                     }
                     else {
-                        var identifierName = catchClause.variableDeclaration.name.text;
-                        var locals = catchClause.block.locals;
-                        if (locals) {
-                            var localSymbol = locals[identifierName];
-                            if (localSymbol && (localSymbol.flags & 2 /* BlockScopedVariable */) !== 0) {
-                                grammarErrorOnNode(localSymbol.valueDeclaration, ts.Diagnostics.Cannot_redeclare_identifier_0_in_catch_clause, identifierName);
+                        var blockLocals = catchClause.block.locals;
+                        if (blockLocals) {
+                            for (var caughtName in catchClause.locals) {
+                                var blockLocal = blockLocals[caughtName];
+                                if (blockLocal && (blockLocal.flags & 2 /* BlockScopedVariable */) !== 0) {
+                                    grammarErrorOnNode(blockLocal.valueDeclaration, ts.Diagnostics.Cannot_redeclare_identifier_0_in_catch_clause, caughtName);
+                                }
                             }
                         }
                     }
@@ -38143,7 +39965,7 @@ var ts;
                     checkIndexConstraintForProperty(prop, propType, type, declaredStringIndexer, stringIndexType, 0 /* String */);
                     checkIndexConstraintForProperty(prop, propType, type, declaredNumberIndexer, numberIndexType, 1 /* Number */);
                 });
-                if (type.flags & 32768 /* Class */ && ts.isClassLike(type.symbol.valueDeclaration)) {
+                if (getObjectFlags(type) & 1 /* Class */ && ts.isClassLike(type.symbol.valueDeclaration)) {
                     var classDeclaration = type.symbol.valueDeclaration;
                     for (var _i = 0, _a = classDeclaration.members; _i < _a.length; _i++) {
                         var member = _a[_i];
@@ -38162,7 +39984,7 @@ var ts;
             if (stringIndexType && numberIndexType) {
                 errorNode = declaredNumberIndexer || declaredStringIndexer;
                 // condition 'errorNode === undefined' may appear if types does not declare nor string neither number indexer
-                if (!errorNode && (type.flags & 65536 /* Interface */)) {
+                if (!errorNode && (getObjectFlags(type) & 2 /* Interface */)) {
                     var someBaseTypeHasBothIndexers = ts.forEach(getBaseTypes(type), function (base) { return getIndexTypeOfType(base, 0 /* String */) && getIndexTypeOfType(base, 1 /* Number */); });
                     errorNode = someBaseTypeHasBothIndexers ? undefined : type.symbol.declarations[0];
                 }
@@ -38181,13 +40003,13 @@ var ts;
                 // perform property check if property or indexer is declared in 'type'
                 // this allows to rule out cases when both property and indexer are inherited from the base class
                 var errorNode;
-                if (prop.valueDeclaration.name.kind === 141 /* ComputedPropertyName */ || prop.parent === containingType.symbol) {
+                if (prop.valueDeclaration.name.kind === 142 /* ComputedPropertyName */ || prop.parent === containingType.symbol) {
                     errorNode = prop.valueDeclaration;
                 }
                 else if (indexDeclaration) {
                     errorNode = indexDeclaration;
                 }
-                else if (containingType.flags & 65536 /* Interface */) {
+                else if (getObjectFlags(containingType) & 2 /* Interface */) {
                     // for interfaces property and indexer might be inherited from different bases
                     // check if any base class already has both property and indexer.
                     // check should be performed only if 'type' is the first type that brings property\indexer together
@@ -38239,7 +40061,7 @@ var ts;
             var firstDecl;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 222 /* ClassDeclaration */ || declaration.kind === 223 /* InterfaceDeclaration */) {
+                if (declaration.kind === 226 /* ClassDeclaration */ || declaration.kind === 227 /* InterfaceDeclaration */) {
                     if (!firstDecl) {
                         firstDecl = declaration;
                     }
@@ -38302,7 +40124,9 @@ var ts;
                     }
                     checkTypeAssignableTo(typeWithThis, getTypeWithThisArgument(baseType_1, type.thisType), node.name || node, ts.Diagnostics.Class_0_incorrectly_extends_base_class_1);
                     checkTypeAssignableTo(staticType, getTypeWithoutSignatures(staticBaseType), node.name || node, ts.Diagnostics.Class_static_side_0_incorrectly_extends_base_class_static_side_1);
-                    if (baseType_1.symbol.valueDeclaration && !ts.isInAmbientContext(baseType_1.symbol.valueDeclaration)) {
+                    if (baseType_1.symbol.valueDeclaration &&
+                        !ts.isInAmbientContext(baseType_1.symbol.valueDeclaration) &&
+                        baseType_1.symbol.valueDeclaration.kind === 226 /* ClassDeclaration */) {
                         if (!isBlockScopedNameDeclaredBeforeUse(baseType_1.symbol.valueDeclaration, node)) {
                             error(baseTypeNode, ts.Diagnostics.A_class_must_be_declared_after_its_base_class);
                         }
@@ -38331,8 +40155,8 @@ var ts;
                     if (produceDiagnostics) {
                         var t = getTypeFromTypeNode(typeRefNode);
                         if (t !== unknownType) {
-                            var declaredType = (t.flags & 131072 /* Reference */) ? t.target : t;
-                            if (declaredType.flags & (32768 /* Class */ | 65536 /* Interface */)) {
+                            var declaredType = getObjectFlags(t) & 4 /* Reference */ ? t.target : t;
+                            if (getObjectFlags(declaredType) & 3 /* ClassOrInterface */) {
                                 checkTypeAssignableTo(typeWithThis, getTypeWithThisArgument(t, type.thisType), node.name || node, ts.Diagnostics.Class_0_incorrectly_implements_interface_1);
                             }
                             else {
@@ -38354,7 +40178,7 @@ var ts;
                 if (declaration && ts.getModifierFlags(declaration) & 8 /* Private */) {
                     var typeClassDeclaration = getClassLikeDeclarationOfSymbol(type.symbol);
                     if (!isNodeWithinClass(node, typeClassDeclaration)) {
-                        error(node, ts.Diagnostics.Cannot_extend_a_class_0_Class_constructor_is_marked_as_private, node.expression.text);
+                        error(node, ts.Diagnostics.Cannot_extend_a_class_0_Class_constructor_is_marked_as_private, getFullyQualifiedName(type.symbol));
                     }
                 }
             }
@@ -38403,7 +40227,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.getModifierFlags(derivedClassDecl) & 128 /* Abstract */))) {
-                            if (derivedClassDecl.kind === 193 /* ClassExpression */) {
+                            if (derivedClassDecl.kind === 197 /* ClassExpression */) {
                                 error(derivedClassDecl, ts.Diagnostics.Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1, symbolToString(baseProperty), typeToString(baseType));
                             }
                             else {
@@ -38451,7 +40275,7 @@ var ts;
             }
         }
         function isAccessor(kind) {
-            return kind === 150 /* GetAccessor */ || kind === 151 /* SetAccessor */;
+            return kind === 151 /* GetAccessor */ || kind === 152 /* SetAccessor */;
         }
         function areTypeParametersIdentical(list1, list2) {
             if (!list1 && !list2) {
@@ -38492,8 +40316,8 @@ var ts;
             for (var _i = 0, baseTypes_2 = baseTypes; _i < baseTypes_2.length; _i++) {
                 var base = baseTypes_2[_i];
                 var properties = getPropertiesOfObjectType(getTypeWithThisArgument(base, type.thisType));
-                for (var _a = 0, properties_5 = properties; _a < properties_5.length; _a++) {
-                    var prop = properties_5[_a];
+                for (var _a = 0, properties_6 = properties; _a < properties_6.length; _a++) {
+                    var prop = properties_6[_a];
                     var existing = seen[prop.name];
                     if (!existing) {
                         seen[prop.name] = { prop: prop, containingType: base };
@@ -38523,7 +40347,7 @@ var ts;
                 var symbol = getSymbolOfNode(node);
                 checkTypeParameterListsIdentical(node, symbol);
                 // Only check this symbol once
-                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 223 /* InterfaceDeclaration */);
+                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 227 /* InterfaceDeclaration */);
                 if (node === firstInterfaceDecl) {
                     var type = getDeclaredTypeOfSymbol(symbol);
                     var typeWithThis = getTypeWithThisArgument(type);
@@ -38554,6 +40378,7 @@ var ts;
             // Grammar checking
             checkGrammarDecorators(node) || checkGrammarModifiers(node);
             checkTypeNameIsReserved(node.name, ts.Diagnostics.Type_alias_name_cannot_be_0);
+            checkTypeParameters(node.typeParameters);
             checkSourceElement(node.type);
         }
         function computeEnumMemberValues(node) {
@@ -38570,7 +40395,7 @@ var ts;
                         error(member.name, ts.Diagnostics.Computed_property_names_are_not_allowed_in_enums);
                     }
                     else {
-                        var text = getTextOfPropertyName(member.name);
+                        var text = ts.getTextOfPropertyName(member.name);
                         if (isNumericLiteralName(text) && !isInfinityOrNaNString(text)) {
                             error(member.name, ts.Diagnostics.An_enum_member_cannot_have_a_numeric_name);
                         }
@@ -38629,7 +40454,7 @@ var ts;
                 return value;
                 function evalConstant(e) {
                     switch (e.kind) {
-                        case 186 /* PrefixUnaryExpression */:
+                        case 190 /* PrefixUnaryExpression */:
                             var value_1 = evalConstant(e.operand);
                             if (value_1 === undefined) {
                                 return undefined;
@@ -38640,7 +40465,7 @@ var ts;
                                 case 51 /* TildeToken */: return ~value_1;
                             }
                             return undefined;
-                        case 188 /* BinaryExpression */:
+                        case 192 /* BinaryExpression */:
                             var left = evalConstant(e.left);
                             if (left === undefined) {
                                 return undefined;
@@ -38665,11 +40490,11 @@ var ts;
                             return undefined;
                         case 8 /* NumericLiteral */:
                             return +e.text;
-                        case 179 /* ParenthesizedExpression */:
+                        case 183 /* ParenthesizedExpression */:
                             return evalConstant(e.expression);
                         case 70 /* Identifier */:
-                        case 174 /* ElementAccessExpression */:
-                        case 173 /* PropertyAccessExpression */:
+                        case 178 /* ElementAccessExpression */:
+                        case 177 /* PropertyAccessExpression */:
                             var member = initializer.parent;
                             var currentType = getTypeOfSymbol(getSymbolOfNode(member.parent));
                             var enumType_1;
@@ -38682,7 +40507,7 @@ var ts;
                             }
                             else {
                                 var expression = void 0;
-                                if (e.kind === 174 /* ElementAccessExpression */) {
+                                if (e.kind === 178 /* ElementAccessExpression */) {
                                     if (e.argumentExpression === undefined ||
                                         e.argumentExpression.kind !== 9 /* StringLiteral */) {
                                         return undefined;
@@ -38700,7 +40525,7 @@ var ts;
                                     if (current.kind === 70 /* Identifier */) {
                                         break;
                                     }
-                                    else if (current.kind === 173 /* PropertyAccessExpression */) {
+                                    else if (current.kind === 177 /* PropertyAccessExpression */) {
                                         current = current.expression;
                                     }
                                     else {
@@ -38772,7 +40597,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 !== 225 /* EnumDeclaration */) {
+                    if (declaration.kind !== 229 /* EnumDeclaration */) {
                         return false;
                     }
                     var enumDeclaration = declaration;
@@ -38795,8 +40620,8 @@ var ts;
             var declarations = symbol.declarations;
             for (var _i = 0, declarations_5 = declarations; _i < declarations_5.length; _i++) {
                 var declaration = declarations_5[_i];
-                if ((declaration.kind === 222 /* ClassDeclaration */ ||
-                    (declaration.kind === 221 /* FunctionDeclaration */ && ts.nodeIsPresent(declaration.body))) &&
+                if ((declaration.kind === 226 /* ClassDeclaration */ ||
+                    (declaration.kind === 225 /* FunctionDeclaration */ && ts.nodeIsPresent(declaration.body))) &&
                     !ts.isInAmbientContext(declaration)) {
                     return declaration;
                 }
@@ -38860,7 +40685,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, 222 /* ClassDeclaration */);
+                    var mergedClass = ts.getDeclarationOfKind(symbol, 226 /* ClassDeclaration */);
                     if (mergedClass &&
                         inSameLexicalScope(node, mergedClass)) {
                         getNodeLinks(node).flags |= 32768 /* LexicalModuleMergesWithClass */;
@@ -38911,26 +40736,26 @@ var ts;
         }
         function checkModuleAugmentationElement(node, isGlobalAugmentation) {
             switch (node.kind) {
-                case 201 /* VariableStatement */:
+                case 205 /* 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 236 /* ExportAssignment */:
-                case 237 /* ExportDeclaration */:
+                case 240 /* ExportAssignment */:
+                case 241 /* ExportDeclaration */:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Exports_and_export_assignments_are_not_permitted_in_module_augmentations);
                     break;
-                case 230 /* ImportEqualsDeclaration */:
-                case 231 /* ImportDeclaration */:
+                case 234 /* ImportEqualsDeclaration */:
+                case 235 /* ImportDeclaration */:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_module);
                     break;
-                case 170 /* BindingElement */:
-                case 219 /* VariableDeclaration */:
-                    var name_22 = node.name;
-                    if (ts.isBindingPattern(name_22)) {
-                        for (var _b = 0, _c = name_22.elements; _b < _c.length; _b++) {
+                case 174 /* BindingElement */:
+                case 223 /* VariableDeclaration */:
+                    var name_26 = node.name;
+                    if (ts.isBindingPattern(name_26)) {
+                        for (var _b = 0, _c = name_26.elements; _b < _c.length; _b++) {
                             var el = _c[_b];
                             // mark individual names in binding pattern
                             checkModuleAugmentationElement(el, isGlobalAugmentation);
@@ -38938,12 +40763,12 @@ var ts;
                         break;
                     }
                 // fallthrough
-                case 222 /* ClassDeclaration */:
-                case 225 /* EnumDeclaration */:
-                case 221 /* FunctionDeclaration */:
-                case 223 /* InterfaceDeclaration */:
-                case 226 /* ModuleDeclaration */:
-                case 224 /* TypeAliasDeclaration */:
+                case 226 /* ClassDeclaration */:
+                case 229 /* EnumDeclaration */:
+                case 225 /* FunctionDeclaration */:
+                case 227 /* InterfaceDeclaration */:
+                case 230 /* ModuleDeclaration */:
+                case 228 /* TypeAliasDeclaration */:
                     if (isGlobalAugmentation) {
                         return;
                     }
@@ -38966,12 +40791,12 @@ var ts;
             switch (node.kind) {
                 case 70 /* Identifier */:
                     return node;
-                case 140 /* QualifiedName */:
+                case 141 /* QualifiedName */:
                     do {
                         node = node.left;
                     } while (node.kind !== 70 /* Identifier */);
                     return node;
-                case 173 /* PropertyAccessExpression */:
+                case 177 /* PropertyAccessExpression */:
                     do {
                         node = node.expression;
                     } while (node.kind !== 70 /* Identifier */);
@@ -38984,9 +40809,9 @@ var ts;
                 error(moduleName, ts.Diagnostics.String_literal_expected);
                 return false;
             }
-            var inAmbientExternalModule = node.parent.kind === 227 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
-            if (node.parent.kind !== 256 /* SourceFile */ && !inAmbientExternalModule) {
-                error(moduleName, node.kind === 237 /* ExportDeclaration */ ?
+            var inAmbientExternalModule = node.parent.kind === 231 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
+            if (node.parent.kind !== 261 /* SourceFile */ && !inAmbientExternalModule) {
+                error(moduleName, node.kind === 241 /* ExportDeclaration */ ?
                     ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace :
                     ts.Diagnostics.Import_declarations_in_a_namespace_cannot_reference_a_module);
                 return false;
@@ -39019,7 +40844,7 @@ var ts;
                     (symbol.flags & 793064 /* Type */ ? 793064 /* Type */ : 0) |
                     (symbol.flags & 1920 /* Namespace */ ? 1920 /* Namespace */ : 0);
                 if (target.flags & excludedMeanings) {
-                    var message = node.kind === 239 /* ExportSpecifier */ ?
+                    var message = node.kind === 243 /* 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));
@@ -39047,7 +40872,7 @@ var ts;
                         checkImportBinding(importClause);
                     }
                     if (importClause.namedBindings) {
-                        if (importClause.namedBindings.kind === 233 /* NamespaceImport */) {
+                        if (importClause.namedBindings.kind === 237 /* NamespaceImport */) {
                             checkImportBinding(importClause.namedBindings);
                         }
                         else {
@@ -39104,8 +40929,8 @@ var ts;
                     // export { x, y }
                     // export { x, y } from "foo"
                     ts.forEach(node.exportClause.elements, checkExportSpecifier);
-                    var inAmbientExternalModule = node.parent.kind === 227 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
-                    if (node.parent.kind !== 256 /* SourceFile */ && !inAmbientExternalModule) {
+                    var inAmbientExternalModule = node.parent.kind === 231 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
+                    if (node.parent.kind !== 261 /* SourceFile */ && !inAmbientExternalModule) {
                         error(node, ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace);
                     }
                 }
@@ -39119,7 +40944,7 @@ var ts;
             }
         }
         function checkGrammarModuleElementContext(node, errorMessage) {
-            var isInAppropriateContext = node.parent.kind === 256 /* SourceFile */ || node.parent.kind === 227 /* ModuleBlock */ || node.parent.kind === 226 /* ModuleDeclaration */;
+            var isInAppropriateContext = node.parent.kind === 261 /* SourceFile */ || node.parent.kind === 231 /* ModuleBlock */ || node.parent.kind === 230 /* ModuleDeclaration */;
             if (!isInAppropriateContext) {
                 grammarErrorOnFirstToken(node, errorMessage);
             }
@@ -39145,8 +40970,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 === 256 /* SourceFile */ ? node.parent : node.parent.parent;
-            if (container.kind === 226 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
+            var container = node.parent.kind === 261 /* SourceFile */ ? node.parent : node.parent.parent;
+            if (container.kind === 230 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
                 error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_namespace);
                 return;
             }
@@ -39221,7 +41046,7 @@ var ts;
                 links.exportsChecked = true;
             }
             function isNotOverload(declaration) {
-                return (declaration.kind !== 221 /* FunctionDeclaration */ && declaration.kind !== 148 /* MethodDeclaration */) ||
+                return (declaration.kind !== 225 /* FunctionDeclaration */ && declaration.kind !== 149 /* MethodDeclaration */) ||
                     !!declaration.body;
             }
         }
@@ -39234,118 +41059,123 @@ 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 226 /* ModuleDeclaration */:
-                    case 222 /* ClassDeclaration */:
-                    case 223 /* InterfaceDeclaration */:
-                    case 221 /* FunctionDeclaration */:
+                    case 230 /* ModuleDeclaration */:
+                    case 226 /* ClassDeclaration */:
+                    case 227 /* InterfaceDeclaration */:
+                    case 225 /* FunctionDeclaration */:
                         cancellationToken.throwIfCancellationRequested();
                 }
             }
             switch (kind) {
-                case 142 /* TypeParameter */:
+                case 143 /* TypeParameter */:
                     return checkTypeParameter(node);
-                case 143 /* Parameter */:
+                case 144 /* Parameter */:
                     return checkParameter(node);
-                case 146 /* PropertyDeclaration */:
-                case 145 /* PropertySignature */:
+                case 147 /* PropertyDeclaration */:
+                case 146 /* PropertySignature */:
                     return checkPropertyDeclaration(node);
-                case 157 /* FunctionType */:
-                case 158 /* ConstructorType */:
-                case 152 /* CallSignature */:
-                case 153 /* ConstructSignature */:
+                case 158 /* FunctionType */:
+                case 159 /* ConstructorType */:
+                case 153 /* CallSignature */:
+                case 154 /* ConstructSignature */:
                     return checkSignatureDeclaration(node);
-                case 154 /* IndexSignature */:
+                case 155 /* IndexSignature */:
                     return checkSignatureDeclaration(node);
-                case 148 /* MethodDeclaration */:
-                case 147 /* MethodSignature */:
+                case 149 /* MethodDeclaration */:
+                case 148 /* MethodSignature */:
                     return checkMethodDeclaration(node);
-                case 149 /* Constructor */:
+                case 150 /* Constructor */:
                     return checkConstructorDeclaration(node);
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
                     return checkAccessorDeclaration(node);
-                case 156 /* TypeReference */:
+                case 157 /* TypeReference */:
                     return checkTypeReferenceNode(node);
-                case 155 /* TypePredicate */:
+                case 156 /* TypePredicate */:
                     return checkTypePredicate(node);
-                case 159 /* TypeQuery */:
+                case 160 /* TypeQuery */:
                     return checkTypeQuery(node);
-                case 160 /* TypeLiteral */:
+                case 161 /* TypeLiteral */:
                     return checkTypeLiteral(node);
-                case 161 /* ArrayType */:
+                case 162 /* ArrayType */:
                     return checkArrayType(node);
-                case 162 /* TupleType */:
+                case 163 /* TupleType */:
                     return checkTupleType(node);
-                case 163 /* UnionType */:
-                case 164 /* IntersectionType */:
+                case 164 /* UnionType */:
+                case 165 /* IntersectionType */:
                     return checkUnionOrIntersectionType(node);
-                case 165 /* ParenthesizedType */:
+                case 166 /* ParenthesizedType */:
+                case 168 /* TypeOperator */:
                     return checkSourceElement(node.type);
-                case 221 /* FunctionDeclaration */:
+                case 169 /* IndexedAccessType */:
+                    return checkIndexedAccessType(node);
+                case 170 /* MappedType */:
+                    return checkMappedType(node);
+                case 225 /* FunctionDeclaration */:
                     return checkFunctionDeclaration(node);
-                case 200 /* Block */:
-                case 227 /* ModuleBlock */:
+                case 204 /* Block */:
+                case 231 /* ModuleBlock */:
                     return checkBlock(node);
-                case 201 /* VariableStatement */:
+                case 205 /* VariableStatement */:
                     return checkVariableStatement(node);
-                case 203 /* ExpressionStatement */:
+                case 207 /* ExpressionStatement */:
                     return checkExpressionStatement(node);
-                case 204 /* IfStatement */:
+                case 208 /* IfStatement */:
                     return checkIfStatement(node);
-                case 205 /* DoStatement */:
+                case 209 /* DoStatement */:
                     return checkDoStatement(node);
-                case 206 /* WhileStatement */:
+                case 210 /* WhileStatement */:
                     return checkWhileStatement(node);
-                case 207 /* ForStatement */:
+                case 211 /* ForStatement */:
                     return checkForStatement(node);
-                case 208 /* ForInStatement */:
+                case 212 /* ForInStatement */:
                     return checkForInStatement(node);
-                case 209 /* ForOfStatement */:
+                case 213 /* ForOfStatement */:
                     return checkForOfStatement(node);
-                case 210 /* ContinueStatement */:
-                case 211 /* BreakStatement */:
+                case 214 /* ContinueStatement */:
+                case 215 /* BreakStatement */:
                     return checkBreakOrContinueStatement(node);
-                case 212 /* ReturnStatement */:
+                case 216 /* ReturnStatement */:
                     return checkReturnStatement(node);
-                case 213 /* WithStatement */:
+                case 217 /* WithStatement */:
                     return checkWithStatement(node);
-                case 214 /* SwitchStatement */:
+                case 218 /* SwitchStatement */:
                     return checkSwitchStatement(node);
-                case 215 /* LabeledStatement */:
+                case 219 /* LabeledStatement */:
                     return checkLabeledStatement(node);
-                case 216 /* ThrowStatement */:
+                case 220 /* ThrowStatement */:
                     return checkThrowStatement(node);
-                case 217 /* TryStatement */:
+                case 221 /* TryStatement */:
                     return checkTryStatement(node);
-                case 219 /* VariableDeclaration */:
+                case 223 /* VariableDeclaration */:
                     return checkVariableDeclaration(node);
-                case 170 /* BindingElement */:
+                case 174 /* BindingElement */:
                     return checkBindingElement(node);
-                case 222 /* ClassDeclaration */:
+                case 226 /* ClassDeclaration */:
                     return checkClassDeclaration(node);
-                case 223 /* InterfaceDeclaration */:
+                case 227 /* InterfaceDeclaration */:
                     return checkInterfaceDeclaration(node);
-                case 224 /* TypeAliasDeclaration */:
+                case 228 /* TypeAliasDeclaration */:
                     return checkTypeAliasDeclaration(node);
-                case 225 /* EnumDeclaration */:
+                case 229 /* EnumDeclaration */:
                     return checkEnumDeclaration(node);
-                case 226 /* ModuleDeclaration */:
+                case 230 /* ModuleDeclaration */:
                     return checkModuleDeclaration(node);
-                case 231 /* ImportDeclaration */:
+                case 235 /* ImportDeclaration */:
                     return checkImportDeclaration(node);
-                case 230 /* ImportEqualsDeclaration */:
+                case 234 /* ImportEqualsDeclaration */:
                     return checkImportEqualsDeclaration(node);
-                case 237 /* ExportDeclaration */:
+                case 241 /* ExportDeclaration */:
                     return checkExportDeclaration(node);
-                case 236 /* ExportAssignment */:
+                case 240 /* ExportAssignment */:
                     return checkExportAssignment(node);
-                case 202 /* EmptyStatement */:
+                case 206 /* EmptyStatement */:
                     checkGrammarStatementInAmbientContext(node);
                     return;
-                case 218 /* DebuggerStatement */:
+                case 222 /* DebuggerStatement */:
                     checkGrammarStatementInAmbientContext(node);
                     return;
-                case 240 /* MissingDeclaration */:
+                case 244 /* MissingDeclaration */:
                     return checkMissingDeclaration(node);
             }
         }
@@ -39367,17 +41197,17 @@ var ts;
             for (var _i = 0, deferredNodes_1 = deferredNodes; _i < deferredNodes_1.length; _i++) {
                 var node = deferredNodes_1[_i];
                 switch (node.kind) {
-                    case 180 /* FunctionExpression */:
-                    case 181 /* ArrowFunction */:
-                    case 148 /* MethodDeclaration */:
-                    case 147 /* MethodSignature */:
+                    case 184 /* FunctionExpression */:
+                    case 185 /* ArrowFunction */:
+                    case 149 /* MethodDeclaration */:
+                    case 148 /* MethodSignature */:
                         checkFunctionExpressionOrObjectLiteralMethodDeferred(node);
                         break;
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* SetAccessor */:
                         checkAccessorDeferred(node);
                         break;
-                    case 193 /* ClassExpression */:
+                    case 197 /* ClassExpression */:
                         checkClassExpressionDeferred(node);
                         break;
                 }
@@ -39439,9 +41269,29 @@ var ts;
         function getDiagnosticsWorker(sourceFile) {
             throwIfNonDiagnosticsProducing();
             if (sourceFile) {
+                // Some global diagnostics are deferred until they are needed and
+                // may not be reported in the firt call to getGlobalDiagnostics.
+                // We should catch these changes and report them.
+                var previousGlobalDiagnostics = diagnostics.getGlobalDiagnostics();
+                var previousGlobalDiagnosticsSize = previousGlobalDiagnostics.length;
                 checkSourceFile(sourceFile);
-                return diagnostics.getDiagnostics(sourceFile.fileName);
+                var semanticDiagnostics = diagnostics.getDiagnostics(sourceFile.fileName);
+                var currentGlobalDiagnostics = diagnostics.getGlobalDiagnostics();
+                if (currentGlobalDiagnostics !== previousGlobalDiagnostics) {
+                    // If the arrays are not the same reference, new diagnostics were added.
+                    var deferredGlobalDiagnostics = ts.relativeComplement(previousGlobalDiagnostics, currentGlobalDiagnostics, ts.compareDiagnostics);
+                    return ts.concatenate(deferredGlobalDiagnostics, semanticDiagnostics);
+                }
+                else if (previousGlobalDiagnosticsSize === 0 && currentGlobalDiagnostics.length > 0) {
+                    // If the arrays are the same reference, but the length has changed, a single
+                    // new diagnostic was added as DiagnosticCollection attempts to reuse the
+                    // same array.
+                    return ts.concatenate(currentGlobalDiagnostics, semanticDiagnostics);
+                }
+                return semanticDiagnostics;
             }
+            // Global diagnostics are always added when a file is not provided to
+            // getDiagnostics
             ts.forEach(host.getSourceFiles(), checkSourceFile);
             return diagnostics.getDiagnostics();
         }
@@ -39458,7 +41308,7 @@ var ts;
         function isInsideWithStatementBody(node) {
             if (node) {
                 while (node.parent) {
-                    if (node.parent.kind === 213 /* WithStatement */ && node.parent.statement === node) {
+                    if (node.parent.kind === 217 /* WithStatement */ && node.parent.statement === node) {
                         return true;
                     }
                     node = node.parent;
@@ -39481,25 +41331,25 @@ var ts;
                         copySymbols(location.locals, meaning);
                     }
                     switch (location.kind) {
-                        case 256 /* SourceFile */:
+                        case 261 /* SourceFile */:
                             if (!ts.isExternalOrCommonJsModule(location)) {
                                 break;
                             }
-                        case 226 /* ModuleDeclaration */:
+                        case 230 /* ModuleDeclaration */:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 8914931 /* ModuleMember */);
                             break;
-                        case 225 /* EnumDeclaration */:
+                        case 229 /* EnumDeclaration */:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 8 /* EnumMember */);
                             break;
-                        case 193 /* ClassExpression */:
+                        case 197 /* ClassExpression */:
                             var className = location.name;
                             if (className) {
                                 copySymbol(location.symbol, meaning);
                             }
                         // fall 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 222 /* ClassDeclaration */:
-                        case 223 /* InterfaceDeclaration */:
+                        case 226 /* ClassDeclaration */:
+                        case 227 /* 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.
@@ -39508,7 +41358,7 @@ var ts;
                                 copySymbols(getSymbolOfNode(location).members, meaning & 793064 /* Type */);
                             }
                             break;
-                        case 180 /* FunctionExpression */:
+                        case 184 /* FunctionExpression */:
                             var funcName = location.name;
                             if (funcName) {
                                 copySymbol(location.symbol, meaning);
@@ -39557,28 +41407,28 @@ var ts;
         }
         function isTypeDeclaration(node) {
             switch (node.kind) {
-                case 142 /* TypeParameter */:
-                case 222 /* ClassDeclaration */:
-                case 223 /* InterfaceDeclaration */:
-                case 224 /* TypeAliasDeclaration */:
-                case 225 /* EnumDeclaration */:
+                case 143 /* TypeParameter */:
+                case 226 /* ClassDeclaration */:
+                case 227 /* InterfaceDeclaration */:
+                case 228 /* TypeAliasDeclaration */:
+                case 229 /* EnumDeclaration */:
                     return true;
             }
         }
         // True if the given identifier is part of a type reference
         function isTypeReferenceIdentifier(entityName) {
             var node = entityName;
-            while (node.parent && node.parent.kind === 140 /* QualifiedName */) {
+            while (node.parent && node.parent.kind === 141 /* QualifiedName */) {
                 node = node.parent;
             }
-            return node.parent && (node.parent.kind === 156 /* TypeReference */ || node.parent.kind === 267 /* JSDocTypeReference */);
+            return node.parent && (node.parent.kind === 157 /* TypeReference */ || node.parent.kind === 272 /* JSDocTypeReference */);
         }
         function isHeritageClauseElementIdentifier(entityName) {
             var node = entityName;
-            while (node.parent && node.parent.kind === 173 /* PropertyAccessExpression */) {
+            while (node.parent && node.parent.kind === 177 /* PropertyAccessExpression */) {
                 node = node.parent;
             }
-            return node.parent && node.parent.kind === 195 /* ExpressionWithTypeArguments */;
+            return node.parent && node.parent.kind === 199 /* ExpressionWithTypeArguments */;
         }
         function forEachEnclosingClass(node, callback) {
             var result;
@@ -39595,13 +41445,13 @@ var ts;
             return !!forEachEnclosingClass(node, function (n) { return n === classDeclaration; });
         }
         function getLeftSideOfImportEqualsOrExportAssignment(nodeOnRightSide) {
-            while (nodeOnRightSide.parent.kind === 140 /* QualifiedName */) {
+            while (nodeOnRightSide.parent.kind === 141 /* QualifiedName */) {
                 nodeOnRightSide = nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 230 /* ImportEqualsDeclaration */) {
+            if (nodeOnRightSide.parent.kind === 234 /* ImportEqualsDeclaration */) {
                 return nodeOnRightSide.parent.moduleReference === nodeOnRightSide && nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 236 /* ExportAssignment */) {
+            if (nodeOnRightSide.parent.kind === 240 /* ExportAssignment */) {
                 return nodeOnRightSide.parent.expression === nodeOnRightSide && nodeOnRightSide.parent;
             }
             return undefined;
@@ -39613,7 +41463,7 @@ var ts;
             if (ts.isDeclarationName(entityName)) {
                 return getSymbolOfNode(entityName.parent);
             }
-            if (ts.isInJavaScriptFile(entityName) && entityName.parent.kind === 173 /* PropertyAccessExpression */) {
+            if (ts.isInJavaScriptFile(entityName) && entityName.parent.kind === 177 /* PropertyAccessExpression */) {
                 var specialPropertyAssignmentKind = ts.getSpecialPropertyAssignmentKind(entityName.parent.parent);
                 switch (specialPropertyAssignmentKind) {
                     case 1 /* ExportsProperty */:
@@ -39625,13 +41475,13 @@ var ts;
                     default:
                 }
             }
-            if (entityName.parent.kind === 236 /* ExportAssignment */ && ts.isEntityNameExpression(entityName)) {
+            if (entityName.parent.kind === 240 /* ExportAssignment */ && ts.isEntityNameExpression(entityName)) {
                 return resolveEntityName(entityName, 
                 /*all meanings*/ 107455 /* Value */ | 793064 /* Type */ | 1920 /* Namespace */ | 8388608 /* Alias */);
             }
-            if (entityName.kind !== 173 /* PropertyAccessExpression */ && isInRightSideOfImportOrExportAssignment(entityName)) {
+            if (entityName.kind !== 177 /* PropertyAccessExpression */ && isInRightSideOfImportOrExportAssignment(entityName)) {
                 // Since we already checked for ExportAssignment, this really could only be an Import
-                var importEqualsDeclaration = ts.getAncestor(entityName, 230 /* ImportEqualsDeclaration */);
+                var importEqualsDeclaration = ts.getAncestor(entityName, 234 /* ImportEqualsDeclaration */);
                 ts.Debug.assert(importEqualsDeclaration !== undefined);
                 return getSymbolOfPartOfRightHandSideOfImportEquals(entityName, /*dontResolveAlias*/ true);
             }
@@ -39641,7 +41491,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 === 195 /* ExpressionWithTypeArguments */) {
+                if (entityName.parent.kind === 199 /* ExpressionWithTypeArguments */) {
                     meaning = 793064 /* Type */;
                     // In a class 'extends' clause we are also looking for a value.
                     if (ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
@@ -39665,14 +41515,14 @@ var ts;
                     }
                     return resolveEntityName(entityName, 107455 /* Value */, /*ignoreErrors*/ false, /*dontResolveAlias*/ true);
                 }
-                else if (entityName.kind === 173 /* PropertyAccessExpression */) {
+                else if (entityName.kind === 177 /* PropertyAccessExpression */) {
                     var symbol = getNodeLinks(entityName).resolvedSymbol;
                     if (!symbol) {
                         checkPropertyAccessExpression(entityName);
                     }
                     return getNodeLinks(entityName).resolvedSymbol;
                 }
-                else if (entityName.kind === 140 /* QualifiedName */) {
+                else if (entityName.kind === 141 /* QualifiedName */) {
                     var symbol = getNodeLinks(entityName).resolvedSymbol;
                     if (!symbol) {
                         checkQualifiedName(entityName);
@@ -39681,20 +41531,20 @@ var ts;
                 }
             }
             else if (isTypeReferenceIdentifier(entityName)) {
-                var meaning = (entityName.parent.kind === 156 /* TypeReference */ || entityName.parent.kind === 267 /* JSDocTypeReference */) ? 793064 /* Type */ : 1920 /* Namespace */;
+                var meaning = (entityName.parent.kind === 157 /* TypeReference */ || entityName.parent.kind === 272 /* JSDocTypeReference */) ? 793064 /* Type */ : 1920 /* Namespace */;
                 return resolveEntityName(entityName, meaning, /*ignoreErrors*/ false, /*dontResolveAlias*/ true);
             }
-            else if (entityName.parent.kind === 246 /* JsxAttribute */) {
+            else if (entityName.parent.kind === 250 /* JsxAttribute */) {
                 return getJsxAttributePropertySymbol(entityName.parent);
             }
-            if (entityName.parent.kind === 155 /* TypePredicate */) {
+            if (entityName.parent.kind === 156 /* TypePredicate */) {
                 return resolveEntityName(entityName, /*meaning*/ 1 /* FunctionScopedVariable */);
             }
             // Do we want to return undefined here?
             return undefined;
         }
         function getSymbolAtLocation(node) {
-            if (node.kind === 256 /* SourceFile */) {
+            if (node.kind === 261 /* SourceFile */) {
                 return ts.isExternalModule(node) ? getMergedSymbol(node.symbol) : undefined;
             }
             if (isInsideWithStatementBody(node)) {
@@ -39712,8 +41562,8 @@ var ts;
                 if (isInRightSideOfImportOrExportAssignment(node)) {
                     return getSymbolOfEntityNameOrPropertyAccessExpression(node);
                 }
-                else if (node.parent.kind === 170 /* BindingElement */ &&
-                    node.parent.parent.kind === 168 /* ObjectBindingPattern */ &&
+                else if (node.parent.kind === 174 /* BindingElement */ &&
+                    node.parent.parent.kind === 172 /* ObjectBindingPattern */ &&
                     node === node.parent.propertyName) {
                     var typeOfPattern = getTypeOfNode(node.parent.parent);
                     var propertyDeclaration = typeOfPattern && getPropertyOfType(typeOfPattern, node.text);
@@ -39724,8 +41574,8 @@ var ts;
             }
             switch (node.kind) {
                 case 70 /* Identifier */:
-                case 173 /* PropertyAccessExpression */:
-                case 140 /* QualifiedName */:
+                case 177 /* PropertyAccessExpression */:
+                case 141 /* QualifiedName */:
                     return getSymbolOfEntityNameOrPropertyAccessExpression(node);
                 case 98 /* ThisKeyword */:
                     var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
@@ -39739,12 +41589,12 @@ var ts;
                 case 96 /* SuperKeyword */:
                     var type = ts.isPartOfExpression(node) ? checkExpression(node) : getTypeFromTypeNode(node);
                     return type.symbol;
-                case 166 /* ThisType */:
+                case 167 /* ThisType */:
                     return getTypeFromTypeNode(node).symbol;
                 case 122 /* ConstructorKeyword */:
                     // constructor keyword for an overload, should take us to the definition if it exist
                     var constructorDeclaration = node.parent;
-                    if (constructorDeclaration && constructorDeclaration.kind === 149 /* Constructor */) {
+                    if (constructorDeclaration && constructorDeclaration.kind === 150 /* Constructor */) {
                         return constructorDeclaration.parent.symbol;
                     }
                     return undefined;
@@ -39752,7 +41602,7 @@ var ts;
                     // External module name in an import declaration
                     if ((ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) &&
                         ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) ||
-                        ((node.parent.kind === 231 /* ImportDeclaration */ || node.parent.kind === 237 /* ExportDeclaration */) &&
+                        ((node.parent.kind === 235 /* ImportDeclaration */ || node.parent.kind === 241 /* ExportDeclaration */) &&
                             node.parent.moduleSpecifier === node)) {
                         return resolveExternalModuleName(node, node);
                     }
@@ -39762,7 +41612,7 @@ var ts;
                 // Fall through
                 case 8 /* NumericLiteral */:
                     // index access
-                    if (node.parent.kind === 174 /* ElementAccessExpression */ && node.parent.argumentExpression === node) {
+                    if (node.parent.kind === 178 /* ElementAccessExpression */ && node.parent.argumentExpression === node) {
                         var objectType = checkExpression(node.parent.expression);
                         if (objectType === unknownType)
                             return undefined;
@@ -39779,7 +41629,7 @@ var ts;
             // The function returns a value symbol of an identifier in the short-hand property assignment.
             // This is necessary as an identifier in short-hand property assignment can contains two meaning:
             // property name and property value.
-            if (location && location.kind === 254 /* ShorthandPropertyAssignment */) {
+            if (location && location.kind === 258 /* ShorthandPropertyAssignment */) {
                 return resolveEntityName(location.name, 107455 /* Value */ | 8388608 /* Alias */);
             }
             return undefined;
@@ -39841,28 +41691,28 @@ var ts;
         // [ a ] from
         //     [a] = [ some array ...]
         function getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr) {
-            ts.Debug.assert(expr.kind === 172 /* ObjectLiteralExpression */ || expr.kind === 171 /* ArrayLiteralExpression */);
+            ts.Debug.assert(expr.kind === 176 /* ObjectLiteralExpression */ || expr.kind === 175 /* ArrayLiteralExpression */);
             // If this is from "for of"
             //     for ( { a } of elems) {
             //     }
-            if (expr.parent.kind === 209 /* ForOfStatement */) {
+            if (expr.parent.kind === 213 /* ForOfStatement */) {
                 var iteratedType = checkRightHandSideOfForOf(expr.parent.expression);
                 return checkDestructuringAssignment(expr, iteratedType || unknownType);
             }
             // If this is from "for" initializer
             //     for ({a } = elems[0];.....) { }
-            if (expr.parent.kind === 188 /* BinaryExpression */) {
+            if (expr.parent.kind === 192 /* BinaryExpression */) {
                 var iteratedType = checkExpression(expr.parent.right);
                 return checkDestructuringAssignment(expr, iteratedType || unknownType);
             }
             // If this is from nested object binding pattern
             //     for ({ skills: { primary, secondary } } = multiRobot, i = 0; i < 1; i++) {
-            if (expr.parent.kind === 253 /* PropertyAssignment */) {
+            if (expr.parent.kind === 257 /* PropertyAssignment */) {
                 var typeOfParentObjectLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr.parent.parent);
                 return checkObjectLiteralDestructuringPropertyAssignment(typeOfParentObjectLiteral || unknownType, expr.parent);
             }
             // Array literal assignment - array destructuring pattern
-            ts.Debug.assert(expr.parent.kind === 171 /* ArrayLiteralExpression */);
+            ts.Debug.assert(expr.parent.kind === 175 /* ArrayLiteralExpression */);
             //    [{ property1: p1, property2 }] = elems;
             var typeOfArrayLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr.parent);
             var elementType = checkIteratedTypeOrElementType(typeOfArrayLiteral || unknownType, expr.parent, /*allowStringInput*/ false) || unknownType;
@@ -39912,9 +41762,9 @@ var ts;
         function getRootSymbols(symbol) {
             if (symbol.flags & 268435456 /* SyntheticProperty */) {
                 var symbols_3 = [];
-                var name_23 = symbol.name;
+                var name_27 = symbol.name;
                 ts.forEach(getSymbolLinks(symbol).containingType.types, function (t) {
-                    var symbol = getPropertyOfType(t, name_23);
+                    var symbol = getPropertyOfType(t, name_27);
                     if (symbol) {
                         symbols_3.push(symbol);
                     }
@@ -39922,6 +41772,10 @@ var ts;
                 return symbols_3;
             }
             else if (symbol.flags & 67108864 /* Transient */) {
+                if (symbol.leftSpread) {
+                    var links = symbol;
+                    return [links.leftSpread, links.rightSpread];
+                }
                 var target = void 0;
                 var next = symbol;
                 while (next = getSymbolLinks(next).target) {
@@ -39994,7 +41848,7 @@ var ts;
                     }
                     var parentSymbol = getParentOfSymbol(symbol);
                     if (parentSymbol) {
-                        if (parentSymbol.flags & 512 /* ValueModule */ && parentSymbol.valueDeclaration.kind === 256 /* SourceFile */) {
+                        if (parentSymbol.flags & 512 /* ValueModule */ && parentSymbol.valueDeclaration.kind === 261 /* SourceFile */) {
                             var symbolFile = parentSymbol.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.
@@ -40051,7 +41905,7 @@ var ts;
                             //       they will not collide with anything
                             var isDeclaredInLoop = nodeLinks_1.flags & 262144 /* BlockScopedBindingInLoop */;
                             var inLoopInitializer = ts.isIterationStatement(container, /*lookInLabeledStatements*/ false);
-                            var inLoopBodyBlock = container.kind === 200 /* Block */ && ts.isIterationStatement(container.parent, /*lookInLabeledStatements*/ false);
+                            var inLoopBodyBlock = container.kind === 204 /* Block */ && ts.isIterationStatement(container.parent, /*lookInLabeledStatements*/ false);
                             links.isDeclarationWithCollidingName = !ts.isBlockScopedContainerTopLevel(container) && (!isDeclaredInLoop || (!inLoopInitializer && !inLoopBodyBlock));
                         }
                         else {
@@ -40097,16 +41951,16 @@ var ts;
                 return true;
             }
             switch (node.kind) {
-                case 230 /* ImportEqualsDeclaration */:
-                case 232 /* ImportClause */:
-                case 233 /* NamespaceImport */:
-                case 235 /* ImportSpecifier */:
-                case 239 /* ExportSpecifier */:
+                case 234 /* ImportEqualsDeclaration */:
+                case 236 /* ImportClause */:
+                case 237 /* NamespaceImport */:
+                case 239 /* ImportSpecifier */:
+                case 243 /* ExportSpecifier */:
                     return isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol);
-                case 237 /* ExportDeclaration */:
+                case 241 /* ExportDeclaration */:
                     var exportClause = node.exportClause;
                     return exportClause && ts.forEach(exportClause.elements, isValueAliasDeclaration);
-                case 236 /* ExportAssignment */:
+                case 240 /* ExportAssignment */:
                     return node.expression
                         && node.expression.kind === 70 /* Identifier */
                         ? isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol)
@@ -40116,7 +41970,7 @@ var ts;
         }
         function isTopLevelValueImportEqualsWithEntityName(node) {
             node = ts.getParseTreeNode(node, ts.isImportEqualsDeclaration);
-            if (node === undefined || node.parent.kind !== 256 /* SourceFile */ || !ts.isInternalModuleImportEqualsDeclaration(node)) {
+            if (node === undefined || node.parent.kind !== 261 /* SourceFile */ || !ts.isInternalModuleImportEqualsDeclaration(node)) {
                 // parent is not source file or it is not reference to internal module
                 return false;
             }
@@ -40182,7 +42036,7 @@ var ts;
             return getNodeLinks(node).enumMemberValue;
         }
         function getConstantValue(node) {
-            if (node.kind === 255 /* EnumMember */) {
+            if (node.kind === 260 /* EnumMember */) {
                 return getEnumMemberValue(node);
             }
             var symbol = getNodeLinks(node).resolvedSymbol;
@@ -40195,7 +42049,7 @@ var ts;
             return undefined;
         }
         function isFunctionType(type) {
-            return type.flags & 2588672 /* ObjectType */ && getSignaturesOfType(type, 0 /* Call */).length > 0;
+            return type.flags & 32768 /* Object */ && getSignaturesOfType(type, 0 /* Call */).length > 0;
         }
         function getTypeReferenceSerializationKind(typeName, location) {
             // Resolve the symbol as a value to ensure the type can be reached at runtime during emit.
@@ -40283,9 +42137,9 @@ var ts;
             if (startInDeclarationContainer) {
                 // When resolving the name of a declaration as a value, we need to start resolution
                 // at a point outside of the declaration.
-                var parent_14 = reference.parent;
-                if (ts.isDeclaration(parent_14) && reference === parent_14.name) {
-                    location = getDeclarationContainer(parent_14);
+                var parent_12 = reference.parent;
+                if (ts.isDeclaration(parent_12) && reference === parent_12.name) {
+                    location = getDeclarationContainer(parent_12);
                 }
             }
             return resolveName(location, reference.text, 107455 /* Value */ | 1048576 /* ExportValue */ | 8388608 /* Alias */, /*nodeNotFoundMessage*/ undefined, /*nameArg*/ undefined);
@@ -40305,7 +42159,7 @@ var ts;
         function isLiteralConstDeclaration(node) {
             if (ts.isConst(node)) {
                 var type = getTypeOfSymbol(getSymbolOfNode(node));
-                return !!(type.flags & 96 /* StringOrNumberLiteral */ && type.flags & 16777216 /* FreshLiteral */);
+                return !!(type.flags & 96 /* StringOrNumberLiteral */ && type.flags & 1048576 /* FreshLiteral */);
             }
             return false;
         }
@@ -40359,7 +42213,8 @@ var ts;
                 getTypeReferenceDirectivesForEntityName: getTypeReferenceDirectivesForEntityName,
                 getTypeReferenceDirectivesForSymbol: getTypeReferenceDirectivesForSymbol,
                 isLiteralConstDeclaration: isLiteralConstDeclaration,
-                writeLiteralConstValue: writeLiteralConstValue
+                writeLiteralConstValue: writeLiteralConstValue,
+                getJsxFactoryEntity: function () { return _jsxFactoryEntity; }
             };
             // defined here to avoid outer scope pollution
             function getTypeReferenceDirectivesForEntityName(node) {
@@ -40370,7 +42225,7 @@ var ts;
                 // property access can only be used as values
                 // qualified names can only be used as types\namespaces
                 // identifiers are treated as values only if they appear in type queries
-                var meaning = (node.kind === 173 /* PropertyAccessExpression */) || (node.kind === 70 /* Identifier */ && isInTypeQuery(node))
+                var meaning = (node.kind === 177 /* PropertyAccessExpression */) || (node.kind === 70 /* Identifier */ && isInTypeQuery(node))
                     ? 107455 /* Value */ | 1048576 /* ExportValue */
                     : 793064 /* Type */ | 1920 /* Namespace */;
                 var symbol = resolveEntityName(node, meaning, /*ignoreErrors*/ true);
@@ -40396,6 +42251,10 @@ var ts;
                         if (typeReferenceDirective) {
                             (typeReferenceDirectives || (typeReferenceDirectives = [])).push(typeReferenceDirective);
                         }
+                        else {
+                            // found at least one entry that does not originate from type reference directive
+                            return undefined;
+                        }
                     }
                 }
                 return typeReferenceDirectives;
@@ -40409,15 +42268,15 @@ var ts;
                 // external modules cannot define or contribute to type declaration files
                 var current = symbol;
                 while (true) {
-                    var parent_15 = getParentOfSymbol(current);
-                    if (parent_15) {
-                        current = parent_15;
+                    var parent_13 = getParentOfSymbol(current);
+                    if (parent_13) {
+                        current = parent_13;
                     }
                     else {
                         break;
                     }
                 }
-                if (current.valueDeclaration && current.valueDeclaration.kind === 256 /* SourceFile */ && current.flags & 512 /* ValueModule */) {
+                if (current.valueDeclaration && current.valueDeclaration.kind === 261 /* SourceFile */ && current.flags & 512 /* ValueModule */) {
                     return false;
                 }
                 // check that at least one declaration of top level symbol originates from type declaration file
@@ -40437,7 +42296,7 @@ var ts;
             if (!moduleSymbol) {
                 return undefined;
             }
-            return ts.getDeclarationOfKind(moduleSymbol, 256 /* SourceFile */);
+            return ts.getDeclarationOfKind(moduleSymbol, 261 /* SourceFile */);
         }
         function initializeTypeChecker() {
             // Bind all source files and propagate errors
@@ -40470,7 +42329,7 @@ var ts;
                     }
                 }
                 if ((compilerOptions.isolatedModules || ts.isExternalModule(file)) && !file.isDeclarationFile) {
-                    var fileRequestedExternalEmitHelpers = file.flags & 31744 /* EmitHelperFlags */;
+                    var fileRequestedExternalEmitHelpers = file.flags & 64512 /* EmitHelperFlags */;
                     if (fileRequestedExternalEmitHelpers) {
                         requestedExternalEmitHelpers |= fileRequestedExternalEmitHelpers;
                         if (firstFileRequestingExternalHelpers === undefined) {
@@ -40549,9 +42408,13 @@ var ts;
                     if (requestedExternalEmitHelpers & 1024 /* HasClassExtends */ && languageVersion < 2 /* ES2015 */) {
                         verifyHelperSymbol(exports, "__extends", 107455 /* Value */);
                     }
-                    if (requestedExternalEmitHelpers & 16384 /* HasJsxSpreadAttributes */ && compilerOptions.jsx !== 1 /* Preserve */) {
+                    if (requestedExternalEmitHelpers & 16384 /* HasSpreadAttribute */ &&
+                        (languageVersion < 5 /* ESNext */ || compilerOptions.jsx === 2 /* React */)) {
                         verifyHelperSymbol(exports, "__assign", 107455 /* Value */);
                     }
+                    if (languageVersion < 5 /* ESNext */ && requestedExternalEmitHelpers & 32768 /* HasRestAttribute */) {
+                        verifyHelperSymbol(exports, "__rest", 107455 /* Value */);
+                    }
                     if (requestedExternalEmitHelpers & 2048 /* HasDecorators */) {
                         verifyHelperSymbol(exports, "__decorate", 107455 /* Value */);
                         if (compilerOptions.emitDecoratorMetadata) {
@@ -40587,7 +42450,7 @@ var ts;
             // build the thenable type that is used to verify against a non-promise "thenable" operand to `await`.
             var thenPropertySymbol = createSymbol(67108864 /* Transient */ | 4 /* Property */, "then");
             getSymbolLinks(thenPropertySymbol).type = globalFunctionType;
-            var thenableType = createObjectType(2097152 /* Anonymous */);
+            var thenableType = createObjectType(16 /* Anonymous */);
             thenableType.properties = [thenPropertySymbol];
             thenableType.members = createSymbolTable(thenableType.properties);
             thenableType.callSignatures = [];
@@ -40600,14 +42463,14 @@ var ts;
                 return false;
             }
             if (!ts.nodeCanBeDecorated(node)) {
-                if (node.kind === 148 /* MethodDeclaration */ && !ts.nodeIsPresent(node.body)) {
+                if (node.kind === 149 /* 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 === 150 /* GetAccessor */ || node.kind === 151 /* SetAccessor */) {
+            else if (node.kind === 151 /* GetAccessor */ || node.kind === 152 /* 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);
@@ -40624,17 +42487,17 @@ var ts;
             var flags = 0 /* None */;
             for (var _i = 0, _a = node.modifiers; _i < _a.length; _i++) {
                 var modifier = _a[_i];
-                if (modifier.kind !== 129 /* ReadonlyKeyword */) {
-                    if (node.kind === 145 /* PropertySignature */ || node.kind === 147 /* MethodSignature */) {
+                if (modifier.kind !== 130 /* ReadonlyKeyword */) {
+                    if (node.kind === 146 /* PropertySignature */ || node.kind === 148 /* MethodSignature */) {
                         return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_type_member, ts.tokenToString(modifier.kind));
                     }
-                    if (node.kind === 154 /* IndexSignature */) {
+                    if (node.kind === 155 /* IndexSignature */) {
                         return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_an_index_signature, ts.tokenToString(modifier.kind));
                     }
                 }
                 switch (modifier.kind) {
                     case 75 /* ConstKeyword */:
-                        if (node.kind !== 225 /* EnumDeclaration */ && node.parent.kind === 222 /* ClassDeclaration */) {
+                        if (node.kind !== 229 /* EnumDeclaration */ && node.parent.kind === 226 /* ClassDeclaration */) {
                             return grammarErrorOnNode(node, ts.Diagnostics.A_class_member_cannot_have_the_0_keyword, ts.tokenToString(75 /* ConstKeyword */));
                         }
                         break;
@@ -40660,7 +42523,7 @@ 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 === 227 /* ModuleBlock */ || node.parent.kind === 256 /* SourceFile */) {
+                        else if (node.parent.kind === 231 /* ModuleBlock */ || node.parent.kind === 261 /* SourceFile */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, text);
                         }
                         else if (flags & 128 /* Abstract */) {
@@ -40683,10 +42546,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 === 227 /* ModuleBlock */ || node.parent.kind === 256 /* SourceFile */) {
+                        else if (node.parent.kind === 231 /* ModuleBlock */ || node.parent.kind === 261 /* SourceFile */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, "static");
                         }
-                        else if (node.kind === 143 /* Parameter */) {
+                        else if (node.kind === 144 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "static");
                         }
                         else if (flags & 128 /* Abstract */) {
@@ -40695,11 +42558,11 @@ var ts;
                         flags |= 32 /* Static */;
                         lastStatic = modifier;
                         break;
-                    case 129 /* ReadonlyKeyword */:
+                    case 130 /* ReadonlyKeyword */:
                         if (flags & 64 /* Readonly */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "readonly");
                         }
-                        else if (node.kind !== 146 /* PropertyDeclaration */ && node.kind !== 145 /* PropertySignature */ && node.kind !== 154 /* IndexSignature */ && node.kind !== 143 /* Parameter */) {
+                        else if (node.kind !== 147 /* PropertyDeclaration */ && node.kind !== 146 /* PropertySignature */ && node.kind !== 155 /* IndexSignature */ && node.kind !== 144 /* 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);
                         }
@@ -40719,10 +42582,10 @@ 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 === 222 /* ClassDeclaration */) {
+                        else if (node.parent.kind === 226 /* ClassDeclaration */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "export");
                         }
-                        else if (node.kind === 143 /* Parameter */) {
+                        else if (node.kind === 144 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "export");
                         }
                         flags |= 1 /* Export */;
@@ -40734,13 +42597,13 @@ var ts;
                         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 === 222 /* ClassDeclaration */) {
+                        else if (node.parent.kind === 226 /* ClassDeclaration */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "declare");
                         }
-                        else if (node.kind === 143 /* Parameter */) {
+                        else if (node.kind === 144 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "declare");
                         }
-                        else if (ts.isInAmbientContext(node.parent) && node.parent.kind === 227 /* ModuleBlock */) {
+                        else if (ts.isInAmbientContext(node.parent) && node.parent.kind === 231 /* ModuleBlock */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.A_declare_modifier_cannot_be_used_in_an_already_ambient_context);
                         }
                         flags |= 2 /* Ambient */;
@@ -40750,14 +42613,14 @@ var ts;
                         if (flags & 128 /* Abstract */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "abstract");
                         }
-                        if (node.kind !== 222 /* ClassDeclaration */) {
-                            if (node.kind !== 148 /* MethodDeclaration */ &&
-                                node.kind !== 146 /* PropertyDeclaration */ &&
-                                node.kind !== 150 /* GetAccessor */ &&
-                                node.kind !== 151 /* SetAccessor */) {
+                        if (node.kind !== 226 /* ClassDeclaration */) {
+                            if (node.kind !== 149 /* MethodDeclaration */ &&
+                                node.kind !== 147 /* PropertyDeclaration */ &&
+                                node.kind !== 151 /* GetAccessor */ &&
+                                node.kind !== 152 /* SetAccessor */) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration);
                             }
-                            if (!(node.parent.kind === 222 /* ClassDeclaration */ && ts.getModifierFlags(node.parent) & 128 /* Abstract */)) {
+                            if (!(node.parent.kind === 226 /* ClassDeclaration */ && ts.getModifierFlags(node.parent) & 128 /* Abstract */)) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.Abstract_methods_can_only_appear_within_an_abstract_class);
                             }
                             if (flags & 32 /* Static */) {
@@ -40776,7 +42639,7 @@ var ts;
                         else if (flags & 2 /* Ambient */ || ts.isInAmbientContext(node.parent)) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
-                        else if (node.kind === 143 /* Parameter */) {
+                        else if (node.kind === 144 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "async");
                         }
                         flags |= 256 /* Async */;
@@ -40784,7 +42647,7 @@ var ts;
                         break;
                 }
             }
-            if (node.kind === 149 /* Constructor */) {
+            if (node.kind === 150 /* Constructor */) {
                 if (flags & 32 /* Static */) {
                     return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "static");
                 }
@@ -40799,13 +42662,13 @@ var ts;
                 }
                 return;
             }
-            else if ((node.kind === 231 /* ImportDeclaration */ || node.kind === 230 /* ImportEqualsDeclaration */) && flags & 2 /* Ambient */) {
+            else if ((node.kind === 235 /* ImportDeclaration */ || node.kind === 234 /* ImportEqualsDeclaration */) && flags & 2 /* Ambient */) {
                 return grammarErrorOnNode(lastDeclare, ts.Diagnostics.A_0_modifier_cannot_be_used_with_an_import_declaration, "declare");
             }
-            else if (node.kind === 143 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && ts.isBindingPattern(node.name)) {
+            else if (node.kind === 144 /* 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 === 143 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && node.dotDotDotToken) {
+            else if (node.kind === 144 /* 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 */) {
@@ -40825,37 +42688,37 @@ var ts;
         }
         function shouldReportBadModifier(node) {
             switch (node.kind) {
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
-                case 149 /* Constructor */:
-                case 146 /* PropertyDeclaration */:
-                case 145 /* PropertySignature */:
-                case 148 /* MethodDeclaration */:
-                case 147 /* MethodSignature */:
-                case 154 /* IndexSignature */:
-                case 226 /* ModuleDeclaration */:
-                case 231 /* ImportDeclaration */:
-                case 230 /* ImportEqualsDeclaration */:
-                case 237 /* ExportDeclaration */:
-                case 236 /* ExportAssignment */:
-                case 180 /* FunctionExpression */:
-                case 181 /* ArrowFunction */:
-                case 143 /* Parameter */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
+                case 150 /* Constructor */:
+                case 147 /* PropertyDeclaration */:
+                case 146 /* PropertySignature */:
+                case 149 /* MethodDeclaration */:
+                case 148 /* MethodSignature */:
+                case 155 /* IndexSignature */:
+                case 230 /* ModuleDeclaration */:
+                case 235 /* ImportDeclaration */:
+                case 234 /* ImportEqualsDeclaration */:
+                case 241 /* ExportDeclaration */:
+                case 240 /* ExportAssignment */:
+                case 184 /* FunctionExpression */:
+                case 185 /* ArrowFunction */:
+                case 144 /* Parameter */:
                     return false;
                 default:
-                    if (node.parent.kind === 227 /* ModuleBlock */ || node.parent.kind === 256 /* SourceFile */) {
+                    if (node.parent.kind === 231 /* ModuleBlock */ || node.parent.kind === 261 /* SourceFile */) {
                         return false;
                     }
                     switch (node.kind) {
-                        case 221 /* FunctionDeclaration */:
+                        case 225 /* FunctionDeclaration */:
                             return nodeHasAnyModifiersExcept(node, 119 /* AsyncKeyword */);
-                        case 222 /* ClassDeclaration */:
+                        case 226 /* ClassDeclaration */:
                             return nodeHasAnyModifiersExcept(node, 116 /* AbstractKeyword */);
-                        case 223 /* InterfaceDeclaration */:
-                        case 201 /* VariableStatement */:
-                        case 224 /* TypeAliasDeclaration */:
+                        case 227 /* InterfaceDeclaration */:
+                        case 205 /* VariableStatement */:
+                        case 228 /* TypeAliasDeclaration */:
                             return true;
-                        case 225 /* EnumDeclaration */:
+                        case 229 /* EnumDeclaration */:
                             return nodeHasAnyModifiersExcept(node, 75 /* ConstKeyword */);
                         default:
                             ts.Debug.fail();
@@ -40868,10 +42731,10 @@ var ts;
         }
         function checkGrammarAsyncModifier(node, asyncModifier) {
             switch (node.kind) {
-                case 148 /* MethodDeclaration */:
-                case 221 /* FunctionDeclaration */:
-                case 180 /* FunctionExpression */:
-                case 181 /* ArrowFunction */:
+                case 149 /* MethodDeclaration */:
+                case 225 /* FunctionDeclaration */:
+                case 184 /* FunctionExpression */:
+                case 185 /* ArrowFunction */:
                     if (!node.asteriskToken) {
                         return false;
                     }
@@ -40934,7 +42797,7 @@ var ts;
                 checkGrammarParameterList(node.parameters) || checkGrammarArrowFunction(node, file);
         }
         function checkGrammarArrowFunction(node, file) {
-            if (node.kind === 181 /* ArrowFunction */) {
+            if (node.kind === 185 /* ArrowFunction */) {
                 var arrowFunction = node;
                 var startLine = ts.getLineAndCharacterOfPosition(file, arrowFunction.equalsGreaterThanToken.pos).line;
                 var endLine = ts.getLineAndCharacterOfPosition(file, arrowFunction.equalsGreaterThanToken.end).line;
@@ -40969,7 +42832,7 @@ var ts;
             if (!parameter.type) {
                 return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_must_have_a_type_annotation);
             }
-            if (parameter.type.kind !== 133 /* StringKeyword */ && parameter.type.kind !== 131 /* NumberKeyword */) {
+            if (parameter.type.kind !== 134 /* StringKeyword */ && parameter.type.kind !== 132 /* NumberKeyword */) {
                 return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_must_be_string_or_number);
             }
             if (!node.type) {
@@ -40997,7 +42860,7 @@ var ts;
                 var sourceFile = ts.getSourceFileOfNode(node);
                 for (var _i = 0, args_4 = args; _i < args_4.length; _i++) {
                     var arg = args_4[_i];
-                    if (arg.kind === 194 /* OmittedExpression */) {
+                    if (arg.kind === 198 /* OmittedExpression */) {
                         return grammarErrorAtPos(sourceFile, arg.pos, 0, ts.Diagnostics.Argument_expression_expected);
                     }
                 }
@@ -41070,19 +42933,19 @@ var ts;
         }
         function checkGrammarComputedPropertyName(node) {
             // If node is not a computedPropertyName, just skip the grammar checking
-            if (node.kind !== 141 /* ComputedPropertyName */) {
+            if (node.kind !== 142 /* ComputedPropertyName */) {
                 return false;
             }
             var computedPropertyName = node;
-            if (computedPropertyName.expression.kind === 188 /* BinaryExpression */ && computedPropertyName.expression.operatorToken.kind === 25 /* CommaToken */) {
+            if (computedPropertyName.expression.kind === 192 /* BinaryExpression */ && computedPropertyName.expression.operatorToken.kind === 25 /* CommaToken */) {
                 return grammarErrorOnNode(computedPropertyName.expression, ts.Diagnostics.A_comma_expression_is_not_allowed_in_a_computed_property_name);
             }
         }
         function checkGrammarForGenerator(node) {
             if (node.asteriskToken) {
-                ts.Debug.assert(node.kind === 221 /* FunctionDeclaration */ ||
-                    node.kind === 180 /* FunctionExpression */ ||
-                    node.kind === 148 /* MethodDeclaration */);
+                ts.Debug.assert(node.kind === 225 /* FunctionDeclaration */ ||
+                    node.kind === 184 /* FunctionExpression */ ||
+                    node.kind === 149 /* MethodDeclaration */);
                 if (ts.isInAmbientContext(node)) {
                     return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.Generators_are_not_allowed_in_an_ambient_context);
                 }
@@ -41107,12 +42970,15 @@ var ts;
             var GetOrSetAccessor = GetAccessor | SetAccessor;
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var prop = _a[_i];
-                var name_24 = prop.name;
-                if (name_24.kind === 141 /* ComputedPropertyName */) {
-                    // If the name is not a ComputedPropertyName, the grammar checking will skip it
-                    checkGrammarComputedPropertyName(name_24);
+                if (prop.kind === 259 /* SpreadAssignment */) {
+                    continue;
                 }
-                if (prop.kind === 254 /* ShorthandPropertyAssignment */ && !inDestructuring && prop.objectAssignmentInitializer) {
+                var name_28 = prop.name;
+                if (name_28.kind === 142 /* ComputedPropertyName */) {
+                    // If the name is not a ComputedPropertyName, the grammar checking will skip it
+                    checkGrammarComputedPropertyName(name_28);
+                }
+                if (prop.kind === 258 /* 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);
@@ -41121,7 +42987,7 @@ var ts;
                 if (prop.modifiers) {
                     for (var _b = 0, _c = prop.modifiers; _b < _c.length; _b++) {
                         var mod = _c[_b];
-                        if (mod.kind !== 119 /* AsyncKeyword */ || prop.kind !== 148 /* MethodDeclaration */) {
+                        if (mod.kind !== 119 /* AsyncKeyword */ || prop.kind !== 149 /* MethodDeclaration */) {
                             grammarErrorOnNode(mod, ts.Diagnostics._0_modifier_cannot_be_used_here, ts.getTextOfNode(mod));
                         }
                     }
@@ -41135,27 +43001,27 @@ var ts;
                 //    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 = void 0;
-                if (prop.kind === 253 /* PropertyAssignment */ || prop.kind === 254 /* ShorthandPropertyAssignment */) {
+                if (prop.kind === 257 /* PropertyAssignment */ || prop.kind === 258 /* ShorthandPropertyAssignment */) {
                     // Grammar checking for computedPropertyName and shorthandPropertyAssignment
                     checkGrammarForInvalidQuestionMark(prop.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional);
-                    if (name_24.kind === 8 /* NumericLiteral */) {
-                        checkGrammarNumericLiteral(name_24);
+                    if (name_28.kind === 8 /* NumericLiteral */) {
+                        checkGrammarNumericLiteral(name_28);
                     }
                     currentKind = Property;
                 }
-                else if (prop.kind === 148 /* MethodDeclaration */) {
+                else if (prop.kind === 149 /* MethodDeclaration */) {
                     currentKind = Property;
                 }
-                else if (prop.kind === 150 /* GetAccessor */) {
+                else if (prop.kind === 151 /* GetAccessor */) {
                     currentKind = GetAccessor;
                 }
-                else if (prop.kind === 151 /* SetAccessor */) {
+                else if (prop.kind === 152 /* SetAccessor */) {
                     currentKind = SetAccessor;
                 }
                 else {
                     ts.Debug.fail("Unexpected syntax kind:" + prop.kind);
                 }
-                var effectiveName = ts.getPropertyNameForPropertyNameNode(name_24);
+                var effectiveName = ts.getPropertyNameForPropertyNameNode(name_28);
                 if (effectiveName === undefined) {
                     continue;
                 }
@@ -41165,18 +43031,18 @@ var ts;
                 else {
                     var existingKind = seen[effectiveName];
                     if (currentKind === Property && existingKind === Property) {
-                        grammarErrorOnNode(name_24, ts.Diagnostics.Duplicate_identifier_0, ts.getTextOfNode(name_24));
+                        grammarErrorOnNode(name_28, ts.Diagnostics.Duplicate_identifier_0, ts.getTextOfNode(name_28));
                     }
                     else if ((currentKind & GetOrSetAccessor) && (existingKind & GetOrSetAccessor)) {
                         if (existingKind !== GetOrSetAccessor && currentKind !== existingKind) {
                             seen[effectiveName] = currentKind | existingKind;
                         }
                         else {
-                            return grammarErrorOnNode(name_24, ts.Diagnostics.An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name);
+                            return grammarErrorOnNode(name_28, ts.Diagnostics.An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name);
                         }
                     }
                     else {
-                        return grammarErrorOnNode(name_24, ts.Diagnostics.An_object_literal_cannot_have_property_and_accessor_with_the_same_name);
+                        return grammarErrorOnNode(name_28, ts.Diagnostics.An_object_literal_cannot_have_property_and_accessor_with_the_same_name);
                     }
                 }
             }
@@ -41185,19 +43051,19 @@ var ts;
             var seen = ts.createMap();
             for (var _i = 0, _a = node.attributes; _i < _a.length; _i++) {
                 var attr = _a[_i];
-                if (attr.kind === 247 /* JsxSpreadAttribute */) {
+                if (attr.kind === 251 /* JsxSpreadAttribute */) {
                     continue;
                 }
                 var jsxAttr = attr;
-                var name_25 = jsxAttr.name;
-                if (!seen[name_25.text]) {
-                    seen[name_25.text] = true;
+                var name_29 = jsxAttr.name;
+                if (!seen[name_29.text]) {
+                    seen[name_29.text] = true;
                 }
                 else {
-                    return grammarErrorOnNode(name_25, ts.Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name);
+                    return grammarErrorOnNode(name_29, ts.Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name);
                 }
                 var initializer = jsxAttr.initializer;
-                if (initializer && initializer.kind === 248 /* JsxExpression */ && !initializer.expression) {
+                if (initializer && initializer.kind === 252 /* JsxExpression */ && !initializer.expression) {
                     return grammarErrorOnNode(jsxAttr.initializer, ts.Diagnostics.JSX_attributes_must_only_be_assigned_a_non_empty_expression);
                 }
             }
@@ -41206,7 +43072,7 @@ var ts;
             if (checkGrammarStatementInAmbientContext(forInOrOfStatement)) {
                 return true;
             }
-            if (forInOrOfStatement.initializer.kind === 220 /* VariableDeclarationList */) {
+            if (forInOrOfStatement.initializer.kind === 224 /* VariableDeclarationList */) {
                 var variableList = forInOrOfStatement.initializer;
                 if (!checkGrammarVariableDeclarationList(variableList)) {
                     var declarations = variableList.declarations;
@@ -41221,20 +43087,20 @@ var ts;
                         return false;
                     }
                     if (declarations.length > 1) {
-                        var diagnostic = forInOrOfStatement.kind === 208 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 212 /* 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 === 208 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 212 /* 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 === 208 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 212 /* 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);
@@ -41258,11 +43124,11 @@ var ts;
                 return grammarErrorOnNode(accessor.name, ts.Diagnostics.An_accessor_cannot_have_type_parameters);
             }
             else if (!doesAccessorHaveCorrectParameterCount(accessor)) {
-                return grammarErrorOnNode(accessor.name, kind === 150 /* GetAccessor */ ?
+                return grammarErrorOnNode(accessor.name, kind === 151 /* GetAccessor */ ?
                     ts.Diagnostics.A_get_accessor_cannot_have_parameters :
                     ts.Diagnostics.A_set_accessor_must_have_exactly_one_parameter);
             }
-            else if (kind === 151 /* SetAccessor */) {
+            else if (kind === 152 /* SetAccessor */) {
                 if (accessor.type) {
                     return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_set_accessor_cannot_have_a_return_type_annotation);
                 }
@@ -41285,10 +43151,10 @@ var ts;
             A get accessor has no parameters or a single `this` parameter.
             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 === 150 /* GetAccessor */ ? 0 : 1);
+            return getAccessorThisParameter(accessor) || accessor.parameters.length === (accessor.kind === 151 /* GetAccessor */ ? 0 : 1);
         }
         function getAccessorThisParameter(accessor) {
-            if (accessor.parameters.length === (accessor.kind === 150 /* GetAccessor */ ? 1 : 2)) {
+            if (accessor.parameters.length === (accessor.kind === 151 /* GetAccessor */ ? 1 : 2)) {
                 return ts.getThisParameter(accessor);
             }
         }
@@ -41303,7 +43169,7 @@ var ts;
                 checkGrammarForGenerator(node)) {
                 return true;
             }
-            if (node.parent.kind === 172 /* ObjectLiteralExpression */) {
+            if (node.parent.kind === 176 /* ObjectLiteralExpression */) {
                 if (checkGrammarForInvalidQuestionMark(node.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional)) {
                     return true;
                 }
@@ -41324,10 +43190,10 @@ var ts;
                     return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_method_overload_must_directly_refer_to_a_built_in_symbol);
                 }
             }
-            else if (node.parent.kind === 223 /* InterfaceDeclaration */) {
+            else if (node.parent.kind === 227 /* InterfaceDeclaration */) {
                 return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol);
             }
-            else if (node.parent.kind === 160 /* TypeLiteral */) {
+            else if (node.parent.kind === 161 /* TypeLiteral */) {
                 return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol);
             }
         }
@@ -41338,11 +43204,11 @@ var ts;
                     return grammarErrorOnNode(node, ts.Diagnostics.Jump_target_cannot_cross_function_boundary);
                 }
                 switch (current.kind) {
-                    case 215 /* LabeledStatement */:
+                    case 219 /* LabeledStatement */:
                         if (node.label && current.label.text === node.label.text) {
                             // found matching label - verify that label usage is correct
                             // continue can only target labels that are on iteration statements
-                            var isMisplacedContinueLabel = node.kind === 210 /* ContinueStatement */
+                            var isMisplacedContinueLabel = node.kind === 214 /* 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);
@@ -41350,8 +43216,8 @@ var ts;
                             return false;
                         }
                         break;
-                    case 214 /* SwitchStatement */:
-                        if (node.kind === 211 /* BreakStatement */ && !node.label) {
+                    case 218 /* SwitchStatement */:
+                        if (node.kind === 215 /* BreakStatement */ && !node.label) {
                             // unlabeled break within switch statement - ok
                             return false;
                         }
@@ -41366,13 +43232,13 @@ var ts;
                 current = current.parent;
             }
             if (node.label) {
-                var message = node.kind === 211 /* BreakStatement */
+                var message = node.kind === 215 /* 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 === 211 /* BreakStatement */
+                var message = node.kind === 215 /* 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);
@@ -41382,24 +43248,24 @@ var ts;
             if (node.dotDotDotToken) {
                 var elements = node.parent.elements;
                 if (node !== ts.lastOrUndefined(elements)) {
-                    return grammarErrorOnNode(node, ts.Diagnostics.A_rest_element_must_be_last_in_an_array_destructuring_pattern);
+                    return grammarErrorOnNode(node, ts.Diagnostics.A_rest_element_must_be_last_in_a_destructuring_pattern);
                 }
-                if (node.name.kind === 169 /* ArrayBindingPattern */ || node.name.kind === 168 /* ObjectBindingPattern */) {
+                if (node.name.kind === 173 /* ArrayBindingPattern */ || node.name.kind === 172 /* ObjectBindingPattern */) {
                     return grammarErrorOnNode(node.name, ts.Diagnostics.A_rest_element_cannot_contain_a_binding_pattern);
                 }
                 if (node.initializer) {
-                    // Error on equals token which immediate precedes the initializer
+                    // Error on equals token which immediately precedes the initializer
                     return grammarErrorAtPos(ts.getSourceFileOfNode(node), node.initializer.pos - 1, 1, ts.Diagnostics.A_rest_element_cannot_have_an_initializer);
                 }
             }
         }
         function isStringOrNumberLiteralExpression(expr) {
             return expr.kind === 9 /* StringLiteral */ || expr.kind === 8 /* NumericLiteral */ ||
-                expr.kind === 186 /* PrefixUnaryExpression */ && expr.operator === 37 /* MinusToken */ &&
+                expr.kind === 190 /* PrefixUnaryExpression */ && expr.operator === 37 /* MinusToken */ &&
                     expr.operand.kind === 8 /* NumericLiteral */;
         }
         function checkGrammarVariableDeclaration(node) {
-            if (node.parent.parent.kind !== 208 /* ForInStatement */ && node.parent.parent.kind !== 209 /* ForOfStatement */) {
+            if (node.parent.parent.kind !== 212 /* ForInStatement */ && node.parent.parent.kind !== 213 /* ForOfStatement */) {
                 if (ts.isInAmbientContext(node)) {
                     if (node.initializer) {
                         if (ts.isConst(node) && !node.type) {
@@ -41464,15 +43330,15 @@ var ts;
         }
         function allowLetAndConstDeclarations(parent) {
             switch (parent.kind) {
-                case 204 /* IfStatement */:
-                case 205 /* DoStatement */:
-                case 206 /* WhileStatement */:
-                case 213 /* WithStatement */:
-                case 207 /* ForStatement */:
-                case 208 /* ForInStatement */:
-                case 209 /* ForOfStatement */:
+                case 208 /* IfStatement */:
+                case 209 /* DoStatement */:
+                case 210 /* WhileStatement */:
+                case 217 /* WithStatement */:
+                case 211 /* ForStatement */:
+                case 212 /* ForInStatement */:
+                case 213 /* ForOfStatement */:
                     return false;
-                case 215 /* LabeledStatement */:
+                case 219 /* LabeledStatement */:
                     return allowLetAndConstDeclarations(parent.parent);
             }
             return true;
@@ -41527,7 +43393,7 @@ var ts;
                     return true;
                 }
             }
-            else if (node.parent.kind === 223 /* InterfaceDeclaration */) {
+            else if (node.parent.kind === 227 /* InterfaceDeclaration */) {
                 if (checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol)) {
                     return true;
                 }
@@ -41535,7 +43401,7 @@ var ts;
                     return grammarErrorOnNode(node.initializer, ts.Diagnostics.An_interface_property_cannot_have_an_initializer);
                 }
             }
-            else if (node.parent.kind === 160 /* TypeLiteral */) {
+            else if (node.parent.kind === 161 /* TypeLiteral */) {
                 if (checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol)) {
                     return true;
                 }
@@ -41560,13 +43426,13 @@ var ts;
             //     export_opt   AmbientDeclaration
             //
             // TODO: The spec needs to be amended to reflect this grammar.
-            if (node.kind === 223 /* InterfaceDeclaration */ ||
-                node.kind === 224 /* TypeAliasDeclaration */ ||
-                node.kind === 231 /* ImportDeclaration */ ||
-                node.kind === 230 /* ImportEqualsDeclaration */ ||
-                node.kind === 237 /* ExportDeclaration */ ||
-                node.kind === 236 /* ExportAssignment */ ||
-                node.kind === 229 /* NamespaceExportDeclaration */ ||
+            if (node.kind === 227 /* InterfaceDeclaration */ ||
+                node.kind === 228 /* TypeAliasDeclaration */ ||
+                node.kind === 235 /* ImportDeclaration */ ||
+                node.kind === 234 /* ImportEqualsDeclaration */ ||
+                node.kind === 241 /* ExportDeclaration */ ||
+                node.kind === 240 /* ExportAssignment */ ||
+                node.kind === 233 /* NamespaceExportDeclaration */ ||
                 ts.getModifierFlags(node) & (2 /* Ambient */ | 1 /* Export */ | 512 /* Default */)) {
                 return false;
             }
@@ -41575,7 +43441,7 @@ var ts;
         function checkGrammarTopLevelElementsForRequiredDeclareModifier(file) {
             for (var _i = 0, _a = file.statements; _i < _a.length; _i++) {
                 var decl = _a[_i];
-                if (ts.isDeclaration(decl) || decl.kind === 201 /* VariableStatement */) {
+                if (ts.isDeclaration(decl) || decl.kind === 205 /* VariableStatement */) {
                     if (checkGrammarTopLevelElementForRequiredDeclareModifier(decl)) {
                         return true;
                     }
@@ -41601,7 +43467,7 @@ 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 === 200 /* Block */ || node.parent.kind === 227 /* ModuleBlock */ || node.parent.kind === 256 /* SourceFile */) {
+                if (node.parent.kind === 204 /* Block */ || node.parent.kind === 231 /* ModuleBlock */ || node.parent.kind === 261 /* SourceFile */) {
                     var links_1 = getNodeLinks(node.parent);
                     // Check if the containing block ever report this error
                     if (!links_1.hasReportedStatementInAmbientContext) {
@@ -41661,49 +43527,49 @@ var ts;
      *       significantly impacted.
      */
     var nodeEdgeTraversalMap = ts.createMap((_a = {},
-        _a[140 /* QualifiedName */] = [
+        _a[141 /* QualifiedName */] = [
             { name: "left", test: ts.isEntityName },
             { name: "right", test: ts.isIdentifier }
         ],
-        _a[144 /* Decorator */] = [
+        _a[145 /* Decorator */] = [
             { name: "expression", test: ts.isLeftHandSideExpression }
         ],
-        _a[178 /* TypeAssertionExpression */] = [
+        _a[182 /* TypeAssertionExpression */] = [
             { name: "type", test: ts.isTypeNode },
             { name: "expression", test: ts.isUnaryExpression }
         ],
-        _a[196 /* AsExpression */] = [
+        _a[200 /* AsExpression */] = [
             { name: "expression", test: ts.isExpression },
             { name: "type", test: ts.isTypeNode }
         ],
-        _a[197 /* NonNullExpression */] = [
+        _a[201 /* NonNullExpression */] = [
             { name: "expression", test: ts.isLeftHandSideExpression }
         ],
-        _a[225 /* EnumDeclaration */] = [
+        _a[229 /* EnumDeclaration */] = [
             { name: "decorators", test: ts.isDecorator },
             { name: "modifiers", test: ts.isModifier },
             { name: "name", test: ts.isIdentifier },
             { name: "members", test: ts.isEnumMember }
         ],
-        _a[226 /* ModuleDeclaration */] = [
+        _a[230 /* ModuleDeclaration */] = [
             { name: "decorators", test: ts.isDecorator },
             { name: "modifiers", test: ts.isModifier },
             { name: "name", test: ts.isModuleName },
             { name: "body", test: ts.isModuleBody }
         ],
-        _a[227 /* ModuleBlock */] = [
+        _a[231 /* ModuleBlock */] = [
             { name: "statements", test: ts.isStatement }
         ],
-        _a[230 /* ImportEqualsDeclaration */] = [
+        _a[234 /* ImportEqualsDeclaration */] = [
             { name: "decorators", test: ts.isDecorator },
             { name: "modifiers", test: ts.isModifier },
             { name: "name", test: ts.isIdentifier },
             { name: "moduleReference", test: ts.isModuleReference }
         ],
-        _a[241 /* ExternalModuleReference */] = [
+        _a[245 /* ExternalModuleReference */] = [
             { name: "expression", test: ts.isExpression, optional: true }
         ],
-        _a[255 /* EnumMember */] = [
+        _a[260 /* EnumMember */] = [
             { name: "name", test: ts.isPropertyName },
             { name: "initializer", test: ts.isExpression, optional: true, parenthesize: ts.parenthesizeExpressionForList }
         ],
@@ -41726,47 +43592,47 @@ var ts;
         }
         var kind = node.kind;
         // No need to visit nodes with no children.
-        if ((kind > 0 /* FirstToken */ && kind <= 139 /* LastToken */)) {
+        if ((kind > 0 /* FirstToken */ && kind <= 140 /* LastToken */)) {
             return initial;
         }
         // We do not yet support types.
-        if ((kind >= 155 /* TypePredicate */ && kind <= 167 /* LiteralType */)) {
+        if ((kind >= 156 /* TypePredicate */ && kind <= 171 /* LiteralType */)) {
             return initial;
         }
         var result = initial;
         switch (node.kind) {
             // Leaf nodes
-            case 199 /* SemicolonClassElement */:
-            case 202 /* EmptyStatement */:
-            case 194 /* OmittedExpression */:
-            case 218 /* DebuggerStatement */:
-            case 287 /* NotEmittedStatement */:
+            case 203 /* SemicolonClassElement */:
+            case 206 /* EmptyStatement */:
+            case 198 /* OmittedExpression */:
+            case 222 /* DebuggerStatement */:
+            case 292 /* NotEmittedStatement */:
                 // No need to visit nodes with no children.
                 break;
             // Names
-            case 141 /* ComputedPropertyName */:
+            case 142 /* ComputedPropertyName */:
                 result = reduceNode(node.expression, f, result);
                 break;
             // Signature elements
-            case 143 /* Parameter */:
+            case 144 /* Parameter */:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.type, f, result);
                 result = reduceNode(node.initializer, f, result);
                 break;
-            case 144 /* Decorator */:
+            case 145 /* Decorator */:
                 result = reduceNode(node.expression, f, result);
                 break;
             // Type member
-            case 146 /* PropertyDeclaration */:
+            case 147 /* PropertyDeclaration */:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.type, f, result);
                 result = reduceNode(node.initializer, f, result);
                 break;
-            case 148 /* MethodDeclaration */:
+            case 149 /* MethodDeclaration */:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
@@ -41775,12 +43641,12 @@ var ts;
                 result = reduceNode(node.type, f, result);
                 result = reduceNode(node.body, f, result);
                 break;
-            case 149 /* Constructor */:
+            case 150 /* Constructor */:
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = ts.reduceLeft(node.parameters, f, result);
                 result = reduceNode(node.body, f, result);
                 break;
-            case 150 /* GetAccessor */:
+            case 151 /* GetAccessor */:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
@@ -41788,7 +43654,7 @@ var ts;
                 result = reduceNode(node.type, f, result);
                 result = reduceNode(node.body, f, result);
                 break;
-            case 151 /* SetAccessor */:
+            case 152 /* SetAccessor */:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
@@ -41796,45 +43662,45 @@ var ts;
                 result = reduceNode(node.body, f, result);
                 break;
             // Binding patterns
-            case 168 /* ObjectBindingPattern */:
-            case 169 /* ArrayBindingPattern */:
+            case 172 /* ObjectBindingPattern */:
+            case 173 /* ArrayBindingPattern */:
                 result = ts.reduceLeft(node.elements, f, result);
                 break;
-            case 170 /* BindingElement */:
+            case 174 /* BindingElement */:
                 result = reduceNode(node.propertyName, f, result);
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.initializer, f, result);
                 break;
             // Expression
-            case 171 /* ArrayLiteralExpression */:
+            case 175 /* ArrayLiteralExpression */:
                 result = ts.reduceLeft(node.elements, f, result);
                 break;
-            case 172 /* ObjectLiteralExpression */:
+            case 176 /* ObjectLiteralExpression */:
                 result = ts.reduceLeft(node.properties, f, result);
                 break;
-            case 173 /* PropertyAccessExpression */:
+            case 177 /* PropertyAccessExpression */:
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.name, f, result);
                 break;
-            case 174 /* ElementAccessExpression */:
+            case 178 /* ElementAccessExpression */:
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.argumentExpression, f, result);
                 break;
-            case 175 /* CallExpression */:
+            case 179 /* CallExpression */:
                 result = reduceNode(node.expression, f, result);
                 result = ts.reduceLeft(node.typeArguments, f, result);
                 result = ts.reduceLeft(node.arguments, f, result);
                 break;
-            case 176 /* NewExpression */:
+            case 180 /* NewExpression */:
                 result = reduceNode(node.expression, f, result);
                 result = ts.reduceLeft(node.typeArguments, f, result);
                 result = ts.reduceLeft(node.arguments, f, result);
                 break;
-            case 177 /* TaggedTemplateExpression */:
+            case 181 /* TaggedTemplateExpression */:
                 result = reduceNode(node.tag, f, result);
                 result = reduceNode(node.template, f, result);
                 break;
-            case 180 /* FunctionExpression */:
+            case 184 /* FunctionExpression */:
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
                 result = ts.reduceLeft(node.typeParameters, f, result);
@@ -41842,119 +43708,119 @@ var ts;
                 result = reduceNode(node.type, f, result);
                 result = reduceNode(node.body, f, result);
                 break;
-            case 181 /* ArrowFunction */:
+            case 185 /* ArrowFunction */:
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = ts.reduceLeft(node.typeParameters, f, result);
                 result = ts.reduceLeft(node.parameters, f, result);
                 result = reduceNode(node.type, f, result);
                 result = reduceNode(node.body, f, result);
                 break;
-            case 179 /* ParenthesizedExpression */:
-            case 182 /* DeleteExpression */:
-            case 183 /* TypeOfExpression */:
-            case 184 /* VoidExpression */:
-            case 185 /* AwaitExpression */:
-            case 191 /* YieldExpression */:
-            case 192 /* SpreadElementExpression */:
-            case 197 /* NonNullExpression */:
+            case 183 /* ParenthesizedExpression */:
+            case 186 /* DeleteExpression */:
+            case 187 /* TypeOfExpression */:
+            case 188 /* VoidExpression */:
+            case 189 /* AwaitExpression */:
+            case 195 /* YieldExpression */:
+            case 196 /* SpreadElement */:
+            case 201 /* NonNullExpression */:
                 result = reduceNode(node.expression, f, result);
                 break;
-            case 186 /* PrefixUnaryExpression */:
-            case 187 /* PostfixUnaryExpression */:
+            case 190 /* PrefixUnaryExpression */:
+            case 191 /* PostfixUnaryExpression */:
                 result = reduceNode(node.operand, f, result);
                 break;
-            case 188 /* BinaryExpression */:
+            case 192 /* BinaryExpression */:
                 result = reduceNode(node.left, f, result);
                 result = reduceNode(node.right, f, result);
                 break;
-            case 189 /* ConditionalExpression */:
+            case 193 /* ConditionalExpression */:
                 result = reduceNode(node.condition, f, result);
                 result = reduceNode(node.whenTrue, f, result);
                 result = reduceNode(node.whenFalse, f, result);
                 break;
-            case 190 /* TemplateExpression */:
+            case 194 /* TemplateExpression */:
                 result = reduceNode(node.head, f, result);
                 result = ts.reduceLeft(node.templateSpans, f, result);
                 break;
-            case 193 /* ClassExpression */:
+            case 197 /* ClassExpression */:
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
                 result = ts.reduceLeft(node.typeParameters, f, result);
                 result = ts.reduceLeft(node.heritageClauses, f, result);
                 result = ts.reduceLeft(node.members, f, result);
                 break;
-            case 195 /* ExpressionWithTypeArguments */:
+            case 199 /* ExpressionWithTypeArguments */:
                 result = reduceNode(node.expression, f, result);
                 result = ts.reduceLeft(node.typeArguments, f, result);
                 break;
             // Misc
-            case 198 /* TemplateSpan */:
+            case 202 /* TemplateSpan */:
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.literal, f, result);
                 break;
             // Element
-            case 200 /* Block */:
+            case 204 /* Block */:
                 result = ts.reduceLeft(node.statements, f, result);
                 break;
-            case 201 /* VariableStatement */:
+            case 205 /* VariableStatement */:
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.declarationList, f, result);
                 break;
-            case 203 /* ExpressionStatement */:
+            case 207 /* ExpressionStatement */:
                 result = reduceNode(node.expression, f, result);
                 break;
-            case 204 /* IfStatement */:
+            case 208 /* IfStatement */:
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.thenStatement, f, result);
                 result = reduceNode(node.elseStatement, f, result);
                 break;
-            case 205 /* DoStatement */:
+            case 209 /* DoStatement */:
                 result = reduceNode(node.statement, f, result);
                 result = reduceNode(node.expression, f, result);
                 break;
-            case 206 /* WhileStatement */:
-            case 213 /* WithStatement */:
+            case 210 /* WhileStatement */:
+            case 217 /* WithStatement */:
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.statement, f, result);
                 break;
-            case 207 /* ForStatement */:
+            case 211 /* ForStatement */:
                 result = reduceNode(node.initializer, f, result);
                 result = reduceNode(node.condition, f, result);
                 result = reduceNode(node.incrementor, f, result);
                 result = reduceNode(node.statement, f, result);
                 break;
-            case 208 /* ForInStatement */:
-            case 209 /* ForOfStatement */:
+            case 212 /* ForInStatement */:
+            case 213 /* ForOfStatement */:
                 result = reduceNode(node.initializer, f, result);
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.statement, f, result);
                 break;
-            case 212 /* ReturnStatement */:
-            case 216 /* ThrowStatement */:
+            case 216 /* ReturnStatement */:
+            case 220 /* ThrowStatement */:
                 result = reduceNode(node.expression, f, result);
                 break;
-            case 214 /* SwitchStatement */:
+            case 218 /* SwitchStatement */:
                 result = reduceNode(node.expression, f, result);
                 result = reduceNode(node.caseBlock, f, result);
                 break;
-            case 215 /* LabeledStatement */:
+            case 219 /* LabeledStatement */:
                 result = reduceNode(node.label, f, result);
                 result = reduceNode(node.statement, f, result);
                 break;
-            case 217 /* TryStatement */:
+            case 221 /* TryStatement */:
                 result = reduceNode(node.tryBlock, f, result);
                 result = reduceNode(node.catchClause, f, result);
                 result = reduceNode(node.finallyBlock, f, result);
                 break;
-            case 219 /* VariableDeclaration */:
+            case 223 /* VariableDeclaration */:
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.type, f, result);
                 result = reduceNode(node.initializer, f, result);
                 break;
-            case 220 /* VariableDeclarationList */:
+            case 224 /* VariableDeclarationList */:
                 result = ts.reduceLeft(node.declarations, f, result);
                 break;
-            case 221 /* FunctionDeclaration */:
+            case 225 /* FunctionDeclaration */:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
@@ -41963,7 +43829,7 @@ var ts;
                 result = reduceNode(node.type, f, result);
                 result = reduceNode(node.body, f, result);
                 break;
-            case 222 /* ClassDeclaration */:
+            case 226 /* ClassDeclaration */:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.name, f, result);
@@ -41971,94 +43837,97 @@ var ts;
                 result = ts.reduceLeft(node.heritageClauses, f, result);
                 result = ts.reduceLeft(node.members, f, result);
                 break;
-            case 228 /* CaseBlock */:
+            case 232 /* CaseBlock */:
                 result = ts.reduceLeft(node.clauses, f, result);
                 break;
-            case 231 /* ImportDeclaration */:
+            case 235 /* ImportDeclaration */:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.importClause, f, result);
                 result = reduceNode(node.moduleSpecifier, f, result);
                 break;
-            case 232 /* ImportClause */:
+            case 236 /* ImportClause */:
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.namedBindings, f, result);
                 break;
-            case 233 /* NamespaceImport */:
+            case 237 /* NamespaceImport */:
                 result = reduceNode(node.name, f, result);
                 break;
-            case 234 /* NamedImports */:
-            case 238 /* NamedExports */:
+            case 238 /* NamedImports */:
+            case 242 /* NamedExports */:
                 result = ts.reduceLeft(node.elements, f, result);
                 break;
-            case 235 /* ImportSpecifier */:
-            case 239 /* ExportSpecifier */:
+            case 239 /* ImportSpecifier */:
+            case 243 /* ExportSpecifier */:
                 result = reduceNode(node.propertyName, f, result);
                 result = reduceNode(node.name, f, result);
                 break;
-            case 236 /* ExportAssignment */:
+            case 240 /* ExportAssignment */:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.expression, f, result);
                 break;
-            case 237 /* ExportDeclaration */:
+            case 241 /* ExportDeclaration */:
                 result = ts.reduceLeft(node.decorators, f, result);
                 result = ts.reduceLeft(node.modifiers, f, result);
                 result = reduceNode(node.exportClause, f, result);
                 result = reduceNode(node.moduleSpecifier, f, result);
                 break;
             // JSX
-            case 242 /* JsxElement */:
+            case 246 /* JsxElement */:
                 result = reduceNode(node.openingElement, f, result);
                 result = ts.reduceLeft(node.children, f, result);
                 result = reduceNode(node.closingElement, f, result);
                 break;
-            case 243 /* JsxSelfClosingElement */:
-            case 244 /* JsxOpeningElement */:
+            case 247 /* JsxSelfClosingElement */:
+            case 248 /* JsxOpeningElement */:
                 result = reduceNode(node.tagName, f, result);
                 result = ts.reduceLeft(node.attributes, f, result);
                 break;
-            case 245 /* JsxClosingElement */:
+            case 249 /* JsxClosingElement */:
                 result = reduceNode(node.tagName, f, result);
                 break;
-            case 246 /* JsxAttribute */:
+            case 250 /* JsxAttribute */:
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.initializer, f, result);
                 break;
-            case 247 /* JsxSpreadAttribute */:
+            case 251 /* JsxSpreadAttribute */:
                 result = reduceNode(node.expression, f, result);
                 break;
-            case 248 /* JsxExpression */:
+            case 252 /* JsxExpression */:
                 result = reduceNode(node.expression, f, result);
                 break;
             // Clauses
-            case 249 /* CaseClause */:
+            case 253 /* CaseClause */:
                 result = reduceNode(node.expression, f, result);
             // fall-through
-            case 250 /* DefaultClause */:
+            case 254 /* DefaultClause */:
                 result = ts.reduceLeft(node.statements, f, result);
                 break;
-            case 251 /* HeritageClause */:
+            case 255 /* HeritageClause */:
                 result = ts.reduceLeft(node.types, f, result);
                 break;
-            case 252 /* CatchClause */:
+            case 256 /* CatchClause */:
                 result = reduceNode(node.variableDeclaration, f, result);
                 result = reduceNode(node.block, f, result);
                 break;
             // Property assignments
-            case 253 /* PropertyAssignment */:
+            case 257 /* PropertyAssignment */:
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.initializer, f, result);
                 break;
-            case 254 /* ShorthandPropertyAssignment */:
+            case 258 /* ShorthandPropertyAssignment */:
                 result = reduceNode(node.name, f, result);
                 result = reduceNode(node.objectAssignmentInitializer, f, result);
                 break;
+            case 259 /* SpreadAssignment */:
+                result = reduceNode(node.expression, f, result);
+                break;
             // Top-level nodes
-            case 256 /* SourceFile */:
+            case 261 /* SourceFile */:
                 result = ts.reduceLeft(node.statements, f, result);
                 break;
-            case 288 /* PartiallyEmittedExpression */:
+            case 293 /* PartiallyEmittedExpression */:
                 result = reduceNode(node.expression, f, result);
                 break;
             default:
@@ -42083,6 +43952,7 @@ var ts;
         if (node === undefined) {
             return undefined;
         }
+        aggregateTransformFlags(node);
         var visited = visitor(node);
         if (visited === node) {
             return node;
@@ -42131,6 +44001,7 @@ var ts;
         // Visit each original node.
         for (var i = 0; i < count; i++) {
             var node = nodes[i + start];
+            aggregateTransformFlags(node);
             var visited = node !== undefined ? visitor(node) : undefined;
             if (updated !== undefined || visited === undefined || visited !== node) {
                 if (updated === undefined) {
@@ -42169,192 +44040,194 @@ var ts;
         }
         var kind = node.kind;
         // No need to visit nodes with no children.
-        if ((kind > 0 /* FirstToken */ && kind <= 139 /* LastToken */)) {
+        if ((kind > 0 /* FirstToken */ && kind <= 140 /* LastToken */)) {
             return node;
         }
         // We do not yet support types.
-        if ((kind >= 155 /* TypePredicate */ && kind <= 167 /* LiteralType */)) {
+        if ((kind >= 156 /* TypePredicate */ && kind <= 171 /* LiteralType */)) {
             return node;
         }
         switch (node.kind) {
-            case 199 /* SemicolonClassElement */:
-            case 202 /* EmptyStatement */:
-            case 194 /* OmittedExpression */:
-            case 218 /* DebuggerStatement */:
+            case 203 /* SemicolonClassElement */:
+            case 206 /* EmptyStatement */:
+            case 198 /* OmittedExpression */:
+            case 222 /* DebuggerStatement */:
                 // No need to visit nodes with no children.
                 return node;
             // Names
-            case 141 /* ComputedPropertyName */:
+            case 142 /* ComputedPropertyName */:
                 return ts.updateComputedPropertyName(node, visitNode(node.expression, visitor, ts.isExpression));
             // Signature elements
-            case 143 /* Parameter */:
-                return ts.updateParameterDeclaration(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.type, visitor, ts.isTypeNode, /*optional*/ true), visitNode(node.initializer, visitor, ts.isExpression, /*optional*/ true));
+            case 144 /* Parameter */:
+                return ts.updateParameter(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.type, visitor, ts.isTypeNode, /*optional*/ true), visitNode(node.initializer, visitor, ts.isExpression, /*optional*/ true));
             // Type member
-            case 146 /* PropertyDeclaration */:
+            case 147 /* PropertyDeclaration */:
                 return ts.updateProperty(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.type, visitor, ts.isTypeNode, /*optional*/ true), visitNode(node.initializer, visitor, ts.isExpression, /*optional*/ true));
-            case 148 /* MethodDeclaration */:
+            case 149 /* MethodDeclaration */:
                 return ts.updateMethod(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, /*optional*/ true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, /*optional*/ true), context.endLexicalEnvironment()));
-            case 149 /* Constructor */:
+            case 150 /* Constructor */:
                 return ts.updateConstructor(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, /*optional*/ true), context.endLexicalEnvironment()));
-            case 150 /* GetAccessor */:
+            case 151 /* GetAccessor */:
                 return ts.updateGetAccessor(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, /*optional*/ true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, /*optional*/ true), context.endLexicalEnvironment()));
-            case 151 /* SetAccessor */:
+            case 152 /* SetAccessor */:
                 return ts.updateSetAccessor(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, /*optional*/ true), context.endLexicalEnvironment()));
             // Binding patterns
-            case 168 /* ObjectBindingPattern */:
+            case 172 /* ObjectBindingPattern */:
                 return ts.updateObjectBindingPattern(node, visitNodes(node.elements, visitor, ts.isBindingElement));
-            case 169 /* ArrayBindingPattern */:
+            case 173 /* ArrayBindingPattern */:
                 return ts.updateArrayBindingPattern(node, visitNodes(node.elements, visitor, ts.isArrayBindingElement));
-            case 170 /* BindingElement */:
+            case 174 /* BindingElement */:
                 return ts.updateBindingElement(node, visitNode(node.propertyName, visitor, ts.isPropertyName, /*optional*/ true), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.initializer, visitor, ts.isExpression, /*optional*/ true));
             // Expression
-            case 171 /* ArrayLiteralExpression */:
+            case 175 /* ArrayLiteralExpression */:
                 return ts.updateArrayLiteral(node, visitNodes(node.elements, visitor, ts.isExpression));
-            case 172 /* ObjectLiteralExpression */:
+            case 176 /* ObjectLiteralExpression */:
                 return ts.updateObjectLiteral(node, visitNodes(node.properties, visitor, ts.isObjectLiteralElementLike));
-            case 173 /* PropertyAccessExpression */:
+            case 177 /* PropertyAccessExpression */:
                 return ts.updatePropertyAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.name, visitor, ts.isIdentifier));
-            case 174 /* ElementAccessExpression */:
+            case 178 /* ElementAccessExpression */:
                 return ts.updateElementAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.argumentExpression, visitor, ts.isExpression));
-            case 175 /* CallExpression */:
+            case 179 /* CallExpression */:
                 return ts.updateCall(node, visitNode(node.expression, visitor, ts.isExpression), visitNodes(node.typeArguments, visitor, ts.isTypeNode), visitNodes(node.arguments, visitor, ts.isExpression));
-            case 176 /* NewExpression */:
+            case 180 /* NewExpression */:
                 return ts.updateNew(node, visitNode(node.expression, visitor, ts.isExpression), visitNodes(node.typeArguments, visitor, ts.isTypeNode), visitNodes(node.arguments, visitor, ts.isExpression));
-            case 177 /* TaggedTemplateExpression */:
+            case 181 /* TaggedTemplateExpression */:
                 return ts.updateTaggedTemplate(node, visitNode(node.tag, visitor, ts.isExpression), visitNode(node.template, visitor, ts.isTemplateLiteral));
-            case 179 /* ParenthesizedExpression */:
+            case 183 /* ParenthesizedExpression */:
                 return ts.updateParen(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 180 /* FunctionExpression */:
+            case 184 /* FunctionExpression */:
                 return ts.updateFunctionExpression(node, visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, /*optional*/ true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, /*optional*/ true), context.endLexicalEnvironment()));
-            case 181 /* ArrowFunction */:
+            case 185 /* ArrowFunction */:
                 return ts.updateArrowFunction(node, visitNodes(node.modifiers, visitor, ts.isModifier), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, /*optional*/ true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isConciseBody, /*optional*/ true), context.endLexicalEnvironment()));
-            case 182 /* DeleteExpression */:
+            case 186 /* DeleteExpression */:
                 return ts.updateDelete(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 183 /* TypeOfExpression */:
+            case 187 /* TypeOfExpression */:
                 return ts.updateTypeOf(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 184 /* VoidExpression */:
+            case 188 /* VoidExpression */:
                 return ts.updateVoid(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 185 /* AwaitExpression */:
+            case 189 /* AwaitExpression */:
                 return ts.updateAwait(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 188 /* BinaryExpression */:
+            case 192 /* BinaryExpression */:
                 return ts.updateBinary(node, visitNode(node.left, visitor, ts.isExpression), visitNode(node.right, visitor, ts.isExpression));
-            case 186 /* PrefixUnaryExpression */:
+            case 190 /* PrefixUnaryExpression */:
                 return ts.updatePrefix(node, visitNode(node.operand, visitor, ts.isExpression));
-            case 187 /* PostfixUnaryExpression */:
+            case 191 /* PostfixUnaryExpression */:
                 return ts.updatePostfix(node, visitNode(node.operand, visitor, ts.isExpression));
-            case 189 /* ConditionalExpression */:
+            case 193 /* ConditionalExpression */:
                 return ts.updateConditional(node, visitNode(node.condition, visitor, ts.isExpression), visitNode(node.whenTrue, visitor, ts.isExpression), visitNode(node.whenFalse, visitor, ts.isExpression));
-            case 190 /* TemplateExpression */:
+            case 194 /* TemplateExpression */:
                 return ts.updateTemplateExpression(node, visitNode(node.head, visitor, ts.isTemplateHead), visitNodes(node.templateSpans, visitor, ts.isTemplateSpan));
-            case 191 /* YieldExpression */:
+            case 195 /* YieldExpression */:
                 return ts.updateYield(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 192 /* SpreadElementExpression */:
+            case 196 /* SpreadElement */:
                 return ts.updateSpread(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 193 /* ClassExpression */:
+            case 197 /* ClassExpression */:
                 return ts.updateClassExpression(node, visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier, /*optional*/ true), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), visitNodes(node.members, visitor, ts.isClassElement));
-            case 195 /* ExpressionWithTypeArguments */:
+            case 199 /* ExpressionWithTypeArguments */:
                 return ts.updateExpressionWithTypeArguments(node, visitNodes(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.expression, visitor, ts.isExpression));
             // Misc
-            case 198 /* TemplateSpan */:
+            case 202 /* TemplateSpan */:
                 return ts.updateTemplateSpan(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.literal, visitor, ts.isTemplateMiddleOrTemplateTail));
             // Element
-            case 200 /* Block */:
+            case 204 /* Block */:
                 return ts.updateBlock(node, visitNodes(node.statements, visitor, ts.isStatement));
-            case 201 /* VariableStatement */:
+            case 205 /* VariableStatement */:
                 return ts.updateVariableStatement(node, visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.declarationList, visitor, ts.isVariableDeclarationList));
-            case 203 /* ExpressionStatement */:
+            case 207 /* ExpressionStatement */:
                 return ts.updateStatement(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 204 /* IfStatement */:
+            case 208 /* IfStatement */:
                 return ts.updateIf(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.thenStatement, visitor, ts.isStatement, /*optional*/ false, liftToBlock), visitNode(node.elseStatement, visitor, ts.isStatement, /*optional*/ true, liftToBlock));
-            case 205 /* DoStatement */:
+            case 209 /* DoStatement */:
                 return ts.updateDo(node, visitNode(node.statement, visitor, ts.isStatement, /*optional*/ false, liftToBlock), visitNode(node.expression, visitor, ts.isExpression));
-            case 206 /* WhileStatement */:
+            case 210 /* WhileStatement */:
                 return ts.updateWhile(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, /*optional*/ false, liftToBlock));
-            case 207 /* ForStatement */:
+            case 211 /* 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, /*optional*/ false, liftToBlock));
-            case 208 /* ForInStatement */:
+            case 212 /* ForInStatement */:
                 return ts.updateForIn(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, /*optional*/ false, liftToBlock));
-            case 209 /* ForOfStatement */:
+            case 213 /* ForOfStatement */:
                 return ts.updateForOf(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, /*optional*/ false, liftToBlock));
-            case 210 /* ContinueStatement */:
+            case 214 /* ContinueStatement */:
                 return ts.updateContinue(node, visitNode(node.label, visitor, ts.isIdentifier, /*optional*/ true));
-            case 211 /* BreakStatement */:
+            case 215 /* BreakStatement */:
                 return ts.updateBreak(node, visitNode(node.label, visitor, ts.isIdentifier, /*optional*/ true));
-            case 212 /* ReturnStatement */:
+            case 216 /* ReturnStatement */:
                 return ts.updateReturn(node, visitNode(node.expression, visitor, ts.isExpression, /*optional*/ true));
-            case 213 /* WithStatement */:
+            case 217 /* WithStatement */:
                 return ts.updateWith(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, /*optional*/ false, liftToBlock));
-            case 214 /* SwitchStatement */:
+            case 218 /* SwitchStatement */:
                 return ts.updateSwitch(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.caseBlock, visitor, ts.isCaseBlock));
-            case 215 /* LabeledStatement */:
+            case 219 /* LabeledStatement */:
                 return ts.updateLabel(node, visitNode(node.label, visitor, ts.isIdentifier), visitNode(node.statement, visitor, ts.isStatement, /*optional*/ false, liftToBlock));
-            case 216 /* ThrowStatement */:
+            case 220 /* ThrowStatement */:
                 return ts.updateThrow(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 217 /* TryStatement */:
+            case 221 /* TryStatement */:
                 return ts.updateTry(node, visitNode(node.tryBlock, visitor, ts.isBlock), visitNode(node.catchClause, visitor, ts.isCatchClause, /*optional*/ true), visitNode(node.finallyBlock, visitor, ts.isBlock, /*optional*/ true));
-            case 219 /* VariableDeclaration */:
+            case 223 /* VariableDeclaration */:
                 return ts.updateVariableDeclaration(node, visitNode(node.name, visitor, ts.isBindingName), visitNode(node.type, visitor, ts.isTypeNode, /*optional*/ true), visitNode(node.initializer, visitor, ts.isExpression, /*optional*/ true));
-            case 220 /* VariableDeclarationList */:
+            case 224 /* VariableDeclarationList */:
                 return ts.updateVariableDeclarationList(node, visitNodes(node.declarations, visitor, ts.isVariableDeclaration));
-            case 221 /* FunctionDeclaration */:
+            case 225 /* FunctionDeclaration */:
                 return ts.updateFunctionDeclaration(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), (context.startLexicalEnvironment(), visitNodes(node.parameters, visitor, ts.isParameter)), visitNode(node.type, visitor, ts.isTypeNode, /*optional*/ true), mergeFunctionBodyLexicalEnvironment(visitNode(node.body, visitor, ts.isFunctionBody, /*optional*/ true), context.endLexicalEnvironment()));
-            case 222 /* ClassDeclaration */:
+            case 226 /* ClassDeclaration */:
                 return ts.updateClassDeclaration(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier, /*optional*/ true), visitNodes(node.typeParameters, visitor, ts.isTypeParameter), visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), visitNodes(node.members, visitor, ts.isClassElement));
-            case 228 /* CaseBlock */:
+            case 232 /* CaseBlock */:
                 return ts.updateCaseBlock(node, visitNodes(node.clauses, visitor, ts.isCaseOrDefaultClause));
-            case 231 /* ImportDeclaration */:
+            case 235 /* ImportDeclaration */:
                 return ts.updateImportDeclaration(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.importClause, visitor, ts.isImportClause, /*optional*/ true), visitNode(node.moduleSpecifier, visitor, ts.isExpression));
-            case 232 /* ImportClause */:
+            case 236 /* ImportClause */:
                 return ts.updateImportClause(node, visitNode(node.name, visitor, ts.isIdentifier, /*optional*/ true), visitNode(node.namedBindings, visitor, ts.isNamedImportBindings, /*optional*/ true));
-            case 233 /* NamespaceImport */:
+            case 237 /* NamespaceImport */:
                 return ts.updateNamespaceImport(node, visitNode(node.name, visitor, ts.isIdentifier));
-            case 234 /* NamedImports */:
+            case 238 /* NamedImports */:
                 return ts.updateNamedImports(node, visitNodes(node.elements, visitor, ts.isImportSpecifier));
-            case 235 /* ImportSpecifier */:
+            case 239 /* ImportSpecifier */:
                 return ts.updateImportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier, /*optional*/ true), visitNode(node.name, visitor, ts.isIdentifier));
-            case 236 /* ExportAssignment */:
+            case 240 /* ExportAssignment */:
                 return ts.updateExportAssignment(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.expression, visitor, ts.isExpression));
-            case 237 /* ExportDeclaration */:
+            case 241 /* ExportDeclaration */:
                 return ts.updateExportDeclaration(node, visitNodes(node.decorators, visitor, ts.isDecorator), visitNodes(node.modifiers, visitor, ts.isModifier), visitNode(node.exportClause, visitor, ts.isNamedExports, /*optional*/ true), visitNode(node.moduleSpecifier, visitor, ts.isExpression, /*optional*/ true));
-            case 238 /* NamedExports */:
+            case 242 /* NamedExports */:
                 return ts.updateNamedExports(node, visitNodes(node.elements, visitor, ts.isExportSpecifier));
-            case 239 /* ExportSpecifier */:
+            case 243 /* ExportSpecifier */:
                 return ts.updateExportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier, /*optional*/ true), visitNode(node.name, visitor, ts.isIdentifier));
             // JSX
-            case 242 /* JsxElement */:
+            case 246 /* JsxElement */:
                 return ts.updateJsxElement(node, visitNode(node.openingElement, visitor, ts.isJsxOpeningElement), visitNodes(node.children, visitor, ts.isJsxChild), visitNode(node.closingElement, visitor, ts.isJsxClosingElement));
-            case 243 /* JsxSelfClosingElement */:
+            case 247 /* JsxSelfClosingElement */:
                 return ts.updateJsxSelfClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), visitNodes(node.attributes, visitor, ts.isJsxAttributeLike));
-            case 244 /* JsxOpeningElement */:
+            case 248 /* JsxOpeningElement */:
                 return ts.updateJsxOpeningElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), visitNodes(node.attributes, visitor, ts.isJsxAttributeLike));
-            case 245 /* JsxClosingElement */:
+            case 249 /* JsxClosingElement */:
                 return ts.updateJsxClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression));
-            case 246 /* JsxAttribute */:
+            case 250 /* JsxAttribute */:
                 return ts.updateJsxAttribute(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.initializer, visitor, ts.isStringLiteralOrJsxExpression));
-            case 247 /* JsxSpreadAttribute */:
+            case 251 /* JsxSpreadAttribute */:
                 return ts.updateJsxSpreadAttribute(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 248 /* JsxExpression */:
+            case 252 /* JsxExpression */:
                 return ts.updateJsxExpression(node, visitNode(node.expression, visitor, ts.isExpression));
             // Clauses
-            case 249 /* CaseClause */:
+            case 253 /* CaseClause */:
                 return ts.updateCaseClause(node, visitNode(node.expression, visitor, ts.isExpression), visitNodes(node.statements, visitor, ts.isStatement));
-            case 250 /* DefaultClause */:
+            case 254 /* DefaultClause */:
                 return ts.updateDefaultClause(node, visitNodes(node.statements, visitor, ts.isStatement));
-            case 251 /* HeritageClause */:
+            case 255 /* HeritageClause */:
                 return ts.updateHeritageClause(node, visitNodes(node.types, visitor, ts.isExpressionWithTypeArguments));
-            case 252 /* CatchClause */:
+            case 256 /* CatchClause */:
                 return ts.updateCatchClause(node, visitNode(node.variableDeclaration, visitor, ts.isVariableDeclaration), visitNode(node.block, visitor, ts.isBlock));
             // Property assignments
-            case 253 /* PropertyAssignment */:
+            case 257 /* PropertyAssignment */:
                 return ts.updatePropertyAssignment(node, visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.initializer, visitor, ts.isExpression));
-            case 254 /* ShorthandPropertyAssignment */:
+            case 258 /* ShorthandPropertyAssignment */:
                 return ts.updateShorthandPropertyAssignment(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.objectAssignmentInitializer, visitor, ts.isExpression));
+            case 259 /* SpreadAssignment */:
+                return ts.updateSpreadAssignment(node, visitNode(node.expression, visitor, ts.isExpression));
             // Top-level nodes
-            case 256 /* SourceFile */:
+            case 261 /* SourceFile */:
                 context.startLexicalEnvironment();
                 return ts.updateSourceFileNode(node, ts.createNodeArray(ts.concatenate(visitNodes(node.statements, visitor, ts.isStatement), context.endLexicalEnvironment()), node.statements));
             // Transformation nodes
-            case 288 /* PartiallyEmittedExpression */:
+            case 293 /* PartiallyEmittedExpression */:
                 return ts.updatePartiallyEmittedExpression(node, visitNode(node.expression, visitor, ts.isExpression));
             default:
                 var updated = void 0;
@@ -42436,7 +44309,7 @@ var ts;
             return 0 /* None */;
         }
         else if (node.transformFlags & 536870912 /* HasComputedFlags */) {
-            return node.transformFlags & ~getTransformFlagsSubtreeExclusions(node.kind);
+            return node.transformFlags & ~ts.getTransformFlagsSubtreeExclusions(node.kind);
         }
         else {
             var subtreeFlags = aggregateTransformFlagsForSubtree(node);
@@ -42462,75 +44335,17 @@ var ts;
     function aggregateTransformFlagsForChildNode(transformFlags, child) {
         return transformFlags | aggregateTransformFlagsForNode(child);
     }
-    /**
-     * Gets the transform flags to exclude when unioning the transform flags of a subtree.
-     *
-     * NOTE: This needs to be kept up-to-date with the exclusions used in `computeTransformFlagsForNode`.
-     *       For performance reasons, `computeTransformFlagsForNode` uses local constant values rather
-     *       than calling this function.
-     */
-    function getTransformFlagsSubtreeExclusions(kind) {
-        if (kind >= 155 /* FirstTypeNode */ && kind <= 167 /* LastTypeNode */) {
-            return -3 /* TypeExcludes */;
-        }
-        switch (kind) {
-            case 175 /* CallExpression */:
-            case 176 /* NewExpression */:
-            case 171 /* ArrayLiteralExpression */:
-                return 537922901 /* ArrayLiteralOrCallOrNewExcludes */;
-            case 226 /* ModuleDeclaration */:
-                return 574729557 /* ModuleExcludes */;
-            case 143 /* Parameter */:
-                return 545262933 /* ParameterExcludes */;
-            case 181 /* ArrowFunction */:
-                return 592227669 /* ArrowFunctionExcludes */;
-            case 180 /* FunctionExpression */:
-            case 221 /* FunctionDeclaration */:
-                return 592293205 /* FunctionExcludes */;
-            case 220 /* VariableDeclarationList */:
-                return 545262933 /* VariableDeclarationListExcludes */;
-            case 222 /* ClassDeclaration */:
-            case 193 /* ClassExpression */:
-                return 539749717 /* ClassExcludes */;
-            case 149 /* Constructor */:
-                return 591760725 /* ConstructorExcludes */;
-            case 148 /* MethodDeclaration */:
-            case 150 /* GetAccessor */:
-            case 151 /* SetAccessor */:
-                return 591760725 /* MethodOrAccessorExcludes */;
-            case 118 /* AnyKeyword */:
-            case 131 /* NumberKeyword */:
-            case 128 /* NeverKeyword */:
-            case 133 /* StringKeyword */:
-            case 121 /* BooleanKeyword */:
-            case 134 /* SymbolKeyword */:
-            case 104 /* VoidKeyword */:
-            case 142 /* TypeParameter */:
-            case 145 /* PropertySignature */:
-            case 147 /* MethodSignature */:
-            case 152 /* CallSignature */:
-            case 153 /* ConstructSignature */:
-            case 154 /* IndexSignature */:
-            case 223 /* InterfaceDeclaration */:
-            case 224 /* TypeAliasDeclaration */:
-                return -3 /* TypeExcludes */;
-            case 172 /* ObjectLiteralExpression */:
-                return 539110741 /* ObjectLiteralExcludes */;
-            default:
-                return 536874325 /* NodeExcludes */;
-        }
-    }
     var Debug;
     (function (Debug) {
         Debug.failNotOptional = Debug.shouldAssert(1 /* Normal */)
             ? function (message) { return Debug.assert(false, message || "Node not optional."); }
-            : function () { };
+            : ts.noop;
         Debug.failBadSyntaxKind = Debug.shouldAssert(1 /* Normal */)
             ? function (node, message) { return Debug.assert(false, message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " was unexpected."; }); }
-            : function () { };
+            : 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 '" + getFunctionName(test) + "'."; }); }
-            : function () { };
+            : ts.noop;
         function getFunctionName(func) {
             if (typeof func !== "function") {
                 return "";
@@ -42561,7 +44376,7 @@ var ts;
      * @param recordTempVariable A callback used to record new temporary variables.
      * @param visitor An optional visitor to use to visit expressions.
      */
-    function flattenDestructuringAssignment(context, node, needsValue, recordTempVariable, visitor) {
+    function flattenDestructuringAssignment(context, node, needsValue, recordTempVariable, visitor, transformRest) {
         if (ts.isEmptyObjectLiteralOrArrayLiteral(node.left)) {
             var right = node.right;
             if (ts.isDestructuringAssignment(right)) {
@@ -42592,7 +44407,7 @@ var ts;
             // location should point to the right-hand value of the expression.
             location = value;
         }
-        flattenDestructuring(node, value, location, emitAssignment, emitTempVariableAssignment, visitor);
+        flattenDestructuring(node, value, location, emitAssignment, emitTempVariableAssignment, recordTempVariable, emitRestAssignment, transformRest, visitor);
         if (needsValue) {
             expressions.push(value);
         }
@@ -42612,6 +44427,9 @@ var ts;
             emitAssignment(name, value, location);
             return name;
         }
+        function emitRestAssignment(elements, value, location) {
+            emitAssignment(ts.createObjectLiteral(elements), value, location);
+        }
     }
     ts.flattenDestructuringAssignment = flattenDestructuringAssignment;
     /**
@@ -42621,9 +44439,9 @@ var ts;
      * @param value The rhs value for the binding pattern.
      * @param visitor An optional visitor to use to visit expressions.
      */
-    function flattenParameterDestructuring(node, value, visitor) {
+    function flattenParameterDestructuring(node, value, visitor, transformRest) {
         var declarations = [];
-        flattenDestructuring(node, value, node, emitAssignment, emitTempVariableAssignment, visitor);
+        flattenDestructuring(node, value, node, emitAssignment, emitTempVariableAssignment, ts.noop, emitRestAssignment, transformRest, visitor);
         return declarations;
         function emitAssignment(name, value, location) {
             var declaration = ts.createVariableDeclaration(name, /*type*/ undefined, value, location);
@@ -42638,6 +44456,9 @@ var ts;
             emitAssignment(name, value, location);
             return name;
         }
+        function emitRestAssignment(elements, value, location) {
+            emitAssignment(ts.createObjectBindingPattern(elements), value, location);
+        }
     }
     ts.flattenParameterDestructuring = flattenParameterDestructuring;
     /**
@@ -42647,10 +44468,10 @@ var ts;
      * @param value An optional rhs value for the binding pattern.
      * @param visitor An optional visitor to use to visit expressions.
      */
-    function flattenVariableDestructuring(node, value, visitor, recordTempVariable) {
+    function flattenVariableDestructuring(node, value, visitor, recordTempVariable, transformRest) {
         var declarations = [];
         var pendingAssignments;
-        flattenDestructuring(node, value, node, emitAssignment, emitTempVariableAssignment, visitor);
+        flattenDestructuring(node, value, node, emitAssignment, emitTempVariableAssignment, recordTempVariable, emitRestAssignment, transformRest, visitor);
         return declarations;
         function emitAssignment(name, value, location, original) {
             if (pendingAssignments) {
@@ -42682,6 +44503,9 @@ var ts;
             }
             return name;
         }
+        function emitRestAssignment(elements, value, location, original) {
+            emitAssignment(ts.createObjectBindingPattern(elements), value, location, original);
+        }
     }
     ts.flattenVariableDestructuring = flattenVariableDestructuring;
     /**
@@ -42689,36 +44513,40 @@ var ts;
      *
      * @param node The VariableDeclaration to flatten.
      * @param recordTempVariable A callback used to record new temporary variables.
-     * @param nameSubstitution An optional callback used to substitute binding names.
+     * @param createAssignmentCallback An optional callback used to create assignment expressions
+     * for non-temporary variables.
      * @param visitor An optional visitor to use to visit expressions.
      */
-    function flattenVariableDestructuringToExpression(node, recordTempVariable, nameSubstitution, visitor) {
+    function flattenVariableDestructuringToExpression(node, recordTempVariable, createAssignmentCallback, visitor) {
         var pendingAssignments = [];
-        flattenDestructuring(node, /*value*/ undefined, node, emitAssignment, emitTempVariableAssignment, visitor);
+        flattenDestructuring(node, /*value*/ undefined, node, emitAssignment, emitTempVariableAssignment, ts.noop, emitRestAssignment, /*transformRest*/ false, visitor);
         var expression = ts.inlineExpressions(pendingAssignments);
         ts.aggregateTransformFlags(expression);
         return expression;
         function emitAssignment(name, value, location, original) {
-            var left = nameSubstitution && nameSubstitution(name) || name;
-            emitPendingAssignment(left, value, location, original);
+            var expression = createAssignmentCallback
+                ? createAssignmentCallback(name.kind === 70 /* Identifier */ ? name : emitTempVariableAssignment(name, location), value, location)
+                : ts.createAssignment(name, value, location);
+            emitPendingAssignment(expression, original);
         }
         function emitTempVariableAssignment(value, location) {
             var name = ts.createTempVariable(recordTempVariable);
-            emitPendingAssignment(name, value, location, /*original*/ undefined);
+            emitPendingAssignment(ts.createAssignment(name, value, location), /*original*/ undefined);
             return name;
         }
-        function emitPendingAssignment(name, value, location, original) {
-            var expression = ts.createAssignment(name, value, location);
+        function emitRestAssignment(elements, value, location, original) {
+            emitAssignment(ts.createObjectLiteral(elements), value, location, original);
+        }
+        function emitPendingAssignment(expression, original) {
             expression.original = original;
             // NOTE: this completely disables source maps, but aligns with the behavior of
             //       `emitAssignment` in the old emitter.
             ts.setEmitFlags(expression, 2048 /* NoNestedSourceMaps */);
             pendingAssignments.push(expression);
-            return expression;
         }
     }
     ts.flattenVariableDestructuringToExpression = flattenVariableDestructuringToExpression;
-    function flattenDestructuring(root, value, location, emitAssignment, emitTempVariableAssignment, visitor) {
+    function flattenDestructuring(root, value, location, emitAssignment, emitTempVariableAssignment, recordTempVariable, emitRestAssignment, transformRest, visitor) {
         if (value && visitor) {
             value = ts.visitNode(value, visitor, ts.isExpression);
         }
@@ -42750,17 +44578,17 @@ var ts;
             else {
                 target = bindingTarget;
             }
-            if (target.kind === 172 /* ObjectLiteralExpression */) {
+            if (target.kind === 176 /* ObjectLiteralExpression */) {
                 emitObjectLiteralAssignment(target, value, location);
             }
-            else if (target.kind === 171 /* ArrayLiteralExpression */) {
+            else if (target.kind === 175 /* ArrayLiteralExpression */) {
                 emitArrayLiteralAssignment(target, value, location);
             }
             else {
-                var name_26 = ts.getMutableClone(target);
-                ts.setSourceMapRange(name_26, target);
-                ts.setCommentRange(name_26, target);
-                emitAssignment(name_26, value, location, /*original*/ undefined);
+                var name_30 = ts.getMutableClone(target);
+                ts.setSourceMapRange(name_30, target);
+                ts.setCommentRange(name_30, target);
+                emitAssignment(name_30, value, location, /*original*/ undefined);
             }
         }
         function emitObjectLiteralAssignment(target, value, location) {
@@ -42771,30 +44599,96 @@ var ts;
                 // When doing so we want to hightlight the passed in source map node since thats the one needing this temp assignment
                 value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ true, location, emitTempVariableAssignment);
             }
-            for (var _i = 0, properties_6 = properties; _i < properties_6.length; _i++) {
-                var p = properties_6[_i];
-                if (p.kind === 253 /* PropertyAssignment */ || p.kind === 254 /* ShorthandPropertyAssignment */) {
-                    var propName = p.name;
-                    var target_1 = p.kind === 254 /* ShorthandPropertyAssignment */ ? p : p.initializer || propName;
-                    // Assignment for target = value.propName should highligh whole property, hence use p as source map node
-                    emitDestructuringAssignment(target_1, createDestructuringPropertyAccess(value, propName), p);
+            var bindingElements = [];
+            for (var i = 0; i < properties.length; i++) {
+                var p = properties[i];
+                if (p.kind === 257 /* PropertyAssignment */ || p.kind === 258 /* ShorthandPropertyAssignment */) {
+                    if (!transformRest ||
+                        p.transformFlags & 8388608 /* ContainsSpreadExpression */ ||
+                        (p.kind === 257 /* PropertyAssignment */ && p.initializer.transformFlags & 8388608 /* ContainsSpreadExpression */)) {
+                        if (bindingElements.length) {
+                            emitRestAssignment(bindingElements, value, location, target);
+                            bindingElements = [];
+                        }
+                        var propName = p.name;
+                        var bindingTarget = p.kind === 258 /* ShorthandPropertyAssignment */ ? p : p.initializer || propName;
+                        // Assignment for bindingTarget = value.propName should highlight whole property, hence use p as source map node
+                        emitDestructuringAssignment(bindingTarget, createDestructuringPropertyAccess(value, propName), p);
+                    }
+                    else {
+                        bindingElements.push(p);
+                    }
                 }
+                else if (i === properties.length - 1 &&
+                    p.kind === 259 /* SpreadAssignment */ &&
+                    p.expression.kind === 70 /* Identifier */) {
+                    if (bindingElements.length) {
+                        emitRestAssignment(bindingElements, value, location, target);
+                        bindingElements = [];
+                    }
+                    var propName = p.expression;
+                    var restCall = createRestCall(value, target.properties, function (p) { return p.name; }, target);
+                    emitDestructuringAssignment(propName, restCall, p);
+                }
+            }
+            if (bindingElements.length) {
+                emitRestAssignment(bindingElements, value, location, target);
+                bindingElements = [];
             }
         }
         function emitArrayLiteralAssignment(target, value, location) {
+            if (transformRest) {
+                emitESNextArrayLiteralAssignment(target, value, location);
+            }
+            else {
+                emitES2015ArrayLiteralAssignment(target, value, location);
+            }
+        }
+        function emitESNextArrayLiteralAssignment(target, value, location) {
             var elements = target.elements;
             var numElements = elements.length;
             if (numElements !== 1) {
                 // For anything but a single element destructuring we need to generate a temporary
                 // to ensure value is evaluated exactly once.
-                // When doing so we want to hightlight the passed in source map node since thats the one needing this temp assignment
+                // When doing so we want to highlight the passed-in source map node since thats the one needing this temp assignment
+                value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ true, location, emitTempVariableAssignment);
+            }
+            var expressions = [];
+            var spreadContainingExpressions = [];
+            for (var i = 0; i < numElements; i++) {
+                var e = elements[i];
+                if (e.kind === 198 /* OmittedExpression */) {
+                    continue;
+                }
+                if (e.transformFlags & 8388608 /* ContainsSpreadExpression */ && i < numElements - 1) {
+                    var tmp = ts.createTempVariable(recordTempVariable);
+                    spreadContainingExpressions.push([e, tmp]);
+                    expressions.push(tmp);
+                }
+                else {
+                    expressions.push(e);
+                }
+            }
+            emitAssignment(ts.updateArrayLiteral(target, expressions), value, undefined, undefined);
+            for (var _i = 0, spreadContainingExpressions_1 = spreadContainingExpressions; _i < spreadContainingExpressions_1.length; _i++) {
+                var _a = spreadContainingExpressions_1[_i], e = _a[0], tmp = _a[1];
+                emitDestructuringAssignment(e, tmp, e);
+            }
+        }
+        function emitES2015ArrayLiteralAssignment(target, value, location) {
+            var elements = target.elements;
+            var numElements = elements.length;
+            if (numElements !== 1) {
+                // For anything but a single element destructuring we need to generate a temporary
+                // to ensure value is evaluated exactly once.
+                // When doing so we want to highlight the passed-in source map node since thats the one needing this temp assignment
                 value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ true, location, emitTempVariableAssignment);
             }
             for (var i = 0; i < numElements; i++) {
                 var e = elements[i];
-                if (e.kind !== 194 /* OmittedExpression */) {
+                if (e.kind !== 198 /* OmittedExpression */) {
                     // Assignment for target = value.propName should highligh whole property, hence use e as source map node
-                    if (e.kind !== 192 /* SpreadElementExpression */) {
+                    if (e.kind !== 196 /* SpreadElement */) {
                         emitDestructuringAssignment(e, ts.createElementAccess(value, ts.createLiteral(i)), e);
                     }
                     else if (i === numElements - 1) {
@@ -42803,10 +44697,30 @@ var ts;
                 }
             }
         }
+        /** Given value: o, propName: p, pattern: { a, b, ...p } from the original statement
+         * `{ a, b, ...p } = o`, create `p = __rest(o, ["a", "b"]);`*/
+        function createRestCall(value, elements, getPropertyName, location) {
+            var propertyNames = [];
+            for (var i = 0; i < elements.length - 1; i++) {
+                if (ts.isOmittedExpression(elements[i])) {
+                    continue;
+                }
+                var str = ts.createSynthesizedNode(9 /* StringLiteral */);
+                str.pos = location.pos;
+                str.end = location.end;
+                str.text = ts.getTextOfPropertyName(getPropertyName(elements[i]));
+                propertyNames.push(str);
+            }
+            var args = ts.createSynthesizedNodeArray([value, ts.createArrayLiteral(propertyNames, location)]);
+            return ts.createCall(ts.createIdentifier("__rest"), undefined, args);
+        }
         function emitBindingElement(target, value) {
             // Any temporary assignments needed to emit target = value should point to target
             var initializer = visitor ? ts.visitNode(target.initializer, visitor, ts.isExpression) : target.initializer;
-            if (initializer) {
+            if (transformRest) {
+                value = value || initializer;
+            }
+            else if (initializer) {
                 // Combine value and initializer
                 value = value ? createDefaultValueCheck(value, initializer, target) : initializer;
             }
@@ -42815,9 +44729,11 @@ var ts;
                 value = ts.createVoidZero();
             }
             var name = target.name;
-            if (ts.isBindingPattern(name)) {
-                var elements = name.elements;
-                var numElements = elements.length;
+            if (!ts.isBindingPattern(name)) {
+                emitAssignment(name, value, target, target);
+            }
+            else {
+                var numElements = name.elements.length;
                 if (numElements !== 1) {
                     // For anything other than a single-element destructuring we need to generate a temporary
                     // to ensure value is evaluated exactly once. Additionally, if we have zero elements
@@ -42825,29 +44741,98 @@ var ts;
                     // so in that case, we'll intentionally create that temporary.
                     value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ numElements !== 0, target, emitTempVariableAssignment);
                 }
-                for (var i = 0; i < numElements; i++) {
-                    var element = elements[i];
-                    if (ts.isOmittedExpression(element)) {
-                        continue;
-                    }
-                    else if (name.kind === 168 /* ObjectBindingPattern */) {
-                        // Rewrite element to a declaration with an initializer that fetches property
-                        var propName = element.propertyName || element.name;
-                        emitBindingElement(element, createDestructuringPropertyAccess(value, propName));
-                    }
-                    else {
-                        if (!element.dotDotDotToken) {
-                            // Rewrite element to a declaration that accesses array element at index i
-                            emitBindingElement(element, ts.createElementAccess(value, i));
-                        }
-                        else if (i === numElements - 1) {
-                            emitBindingElement(element, ts.createArraySlice(value, i));
-                        }
-                    }
+                if (name.kind === 173 /* ArrayBindingPattern */) {
+                    emitArrayBindingElement(name, value);
+                }
+                else {
+                    emitObjectBindingElement(target, value);
                 }
             }
+        }
+        function emitArrayBindingElement(name, value) {
+            if (transformRest) {
+                emitESNextArrayBindingElement(name, value);
+            }
             else {
-                emitAssignment(name, value, target, target);
+                emitES2015ArrayBindingElement(name, value);
+            }
+        }
+        function emitES2015ArrayBindingElement(name, value) {
+            var elements = name.elements;
+            var numElements = elements.length;
+            for (var i = 0; i < numElements; i++) {
+                var element = elements[i];
+                if (ts.isOmittedExpression(element)) {
+                    continue;
+                }
+                if (!element.dotDotDotToken) {
+                    // Rewrite element to a declaration that accesses array element at index i
+                    emitBindingElement(element, ts.createElementAccess(value, i));
+                }
+                else if (i === numElements - 1) {
+                    emitBindingElement(element, ts.createArraySlice(value, i));
+                }
+            }
+        }
+        function emitESNextArrayBindingElement(name, value) {
+            var elements = name.elements;
+            var numElements = elements.length;
+            var bindingElements = [];
+            var spreadContainingElements = [];
+            for (var i = 0; i < numElements; i++) {
+                var element = elements[i];
+                if (ts.isOmittedExpression(element)) {
+                    continue;
+                }
+                if (element.transformFlags & 8388608 /* ContainsSpreadExpression */ && i < numElements - 1) {
+                    spreadContainingElements.push(element);
+                    bindingElements.push(ts.createBindingElement(undefined, undefined, ts.getGeneratedNameForNode(element), undefined, value));
+                }
+                else {
+                    bindingElements.push(element);
+                }
+            }
+            emitAssignment(ts.updateArrayBindingPattern(name, bindingElements), value, undefined, undefined);
+            for (var _i = 0, spreadContainingElements_1 = spreadContainingElements; _i < spreadContainingElements_1.length; _i++) {
+                var element = spreadContainingElements_1[_i];
+                emitBindingElement(element, ts.getGeneratedNameForNode(element));
+            }
+        }
+        function emitObjectBindingElement(target, value) {
+            var name = target.name;
+            var elements = name.elements;
+            var numElements = elements.length;
+            var bindingElements = [];
+            for (var i = 0; i < numElements; i++) {
+                var element = elements[i];
+                if (ts.isOmittedExpression(element)) {
+                    continue;
+                }
+                if (i === numElements - 1 && element.dotDotDotToken) {
+                    if (bindingElements.length) {
+                        emitRestAssignment(bindingElements, value, target, target);
+                        bindingElements = [];
+                    }
+                    var restCall = createRestCall(value, name.elements, function (element) { return element.propertyName || element.name; }, name);
+                    emitBindingElement(element, restCall);
+                }
+                else if (transformRest && !(element.transformFlags & 8388608 /* ContainsSpreadExpression */)) {
+                    // do not emit until we have a complete bundle of ES2015 syntax
+                    bindingElements.push(element);
+                }
+                else {
+                    if (bindingElements.length) {
+                        emitRestAssignment(bindingElements, value, target, target);
+                        bindingElements = [];
+                    }
+                    // Rewrite element to a declaration with an initializer that fetches property
+                    var propName = element.propertyName || element.name;
+                    emitBindingElement(element, createDestructuringPropertyAccess(value, propName));
+                }
+            }
+            if (bindingElements.length) {
+                emitRestAssignment(bindingElements, value, target, target);
+                bindingElements = [];
             }
         }
         function createDefaultValueCheck(value, defaultValue, location) {
@@ -42938,15 +44923,15 @@ var ts;
         context.onEmitNode = onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
         // Enable substitution for property/element access to emit const enum values.
-        context.enableSubstitution(173 /* PropertyAccessExpression */);
-        context.enableSubstitution(174 /* ElementAccessExpression */);
+        context.enableSubstitution(177 /* PropertyAccessExpression */);
+        context.enableSubstitution(178 /* ElementAccessExpression */);
         // These variables contain state that changes as we descend into the tree.
         var currentSourceFile;
         var currentNamespace;
         var currentNamespaceContainerName;
         var currentScope;
         var currentScopeFirstDeclarationsOfName;
-        var currentSourceFileExternalHelpersModuleName;
+        var currentExternalHelpersModuleName;
         /**
          * 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.
@@ -43007,7 +44992,7 @@ var ts;
          * @param node The node to visit.
          */
         function visitorWorker(node) {
-            if (node.kind === 256 /* SourceFile */) {
+            if (node.kind === 261 /* SourceFile */) {
                 return visitSourceFile(node);
             }
             else if (node.transformFlags & 1 /* TypeScript */) {
@@ -43035,13 +45020,13 @@ var ts;
          */
         function sourceElementVisitorWorker(node) {
             switch (node.kind) {
-                case 231 /* ImportDeclaration */:
+                case 235 /* ImportDeclaration */:
                     return visitImportDeclaration(node);
-                case 230 /* ImportEqualsDeclaration */:
+                case 234 /* ImportEqualsDeclaration */:
                     return visitImportEqualsDeclaration(node);
-                case 236 /* ExportAssignment */:
+                case 240 /* ExportAssignment */:
                     return visitExportAssignment(node);
-                case 237 /* ExportDeclaration */:
+                case 241 /* ExportDeclaration */:
                     return visitExportDeclaration(node);
                 default:
                     return visitorWorker(node);
@@ -43061,11 +45046,11 @@ var ts;
          * @param node The node to visit.
          */
         function namespaceElementVisitorWorker(node) {
-            if (node.kind === 237 /* ExportDeclaration */ ||
-                node.kind === 231 /* ImportDeclaration */ ||
-                node.kind === 232 /* ImportClause */ ||
-                (node.kind === 230 /* ImportEqualsDeclaration */ &&
-                    node.moduleReference.kind === 241 /* ExternalModuleReference */)) {
+            if (node.kind === 241 /* ExportDeclaration */ ||
+                node.kind === 235 /* ImportDeclaration */ ||
+                node.kind === 236 /* ImportClause */ ||
+                (node.kind === 234 /* ImportEqualsDeclaration */ &&
+                    node.moduleReference.kind === 245 /* ExternalModuleReference */)) {
                 // do not emit ES6 imports and exports since they are illegal inside a namespace
                 return undefined;
             }
@@ -43095,25 +45080,34 @@ var ts;
          */
         function classElementVisitorWorker(node) {
             switch (node.kind) {
-                case 149 /* Constructor */:
+                case 150 /* 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 146 /* PropertyDeclaration */:
-                case 154 /* IndexSignature */:
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
-                case 148 /* MethodDeclaration */:
+                case 147 /* PropertyDeclaration */:
+                case 155 /* IndexSignature */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
+                case 149 /* MethodDeclaration */:
                     // Fallback to the default visit behavior.
                     return visitorWorker(node);
-                case 199 /* SemicolonClassElement */:
+                case 203 /* SemicolonClassElement */:
                     return node;
                 default:
                     ts.Debug.failBadSyntaxKind(node);
                     return undefined;
             }
         }
+        function modifierVisitor(node) {
+            if (ts.modifierToFlag(node.kind) & 2270 /* TypeScriptModifier */) {
+                return undefined;
+            }
+            else if (currentNamespace && node.kind === 83 /* ExportKeyword */) {
+                return undefined;
+            }
+            return node;
+        }
         /**
          * Branching visitor, visits a TypeScript syntax node.
          *
@@ -43136,45 +45130,48 @@ var ts;
                 case 116 /* AbstractKeyword */:
                 case 75 /* ConstKeyword */:
                 case 123 /* DeclareKeyword */:
-                case 129 /* ReadonlyKeyword */:
+                case 130 /* ReadonlyKeyword */:
                 // TypeScript accessibility and readonly modifiers are elided.
-                case 161 /* ArrayType */:
-                case 162 /* TupleType */:
-                case 160 /* TypeLiteral */:
-                case 155 /* TypePredicate */:
-                case 142 /* TypeParameter */:
+                case 162 /* ArrayType */:
+                case 163 /* TupleType */:
+                case 161 /* TypeLiteral */:
+                case 156 /* TypePredicate */:
+                case 143 /* TypeParameter */:
                 case 118 /* AnyKeyword */:
                 case 121 /* BooleanKeyword */:
-                case 133 /* StringKeyword */:
-                case 131 /* NumberKeyword */:
-                case 128 /* NeverKeyword */:
+                case 134 /* StringKeyword */:
+                case 132 /* NumberKeyword */:
+                case 129 /* NeverKeyword */:
                 case 104 /* VoidKeyword */:
-                case 134 /* SymbolKeyword */:
-                case 158 /* ConstructorType */:
-                case 157 /* FunctionType */:
-                case 159 /* TypeQuery */:
-                case 156 /* TypeReference */:
-                case 163 /* UnionType */:
-                case 164 /* IntersectionType */:
-                case 165 /* ParenthesizedType */:
-                case 166 /* ThisType */:
-                case 167 /* LiteralType */:
+                case 135 /* SymbolKeyword */:
+                case 159 /* ConstructorType */:
+                case 158 /* FunctionType */:
+                case 160 /* TypeQuery */:
+                case 157 /* TypeReference */:
+                case 164 /* UnionType */:
+                case 165 /* IntersectionType */:
+                case 166 /* ParenthesizedType */:
+                case 167 /* ThisType */:
+                case 168 /* TypeOperator */:
+                case 169 /* IndexedAccessType */:
+                case 170 /* MappedType */:
+                case 171 /* LiteralType */:
                 // TypeScript type nodes are elided.
-                case 154 /* IndexSignature */:
+                case 155 /* IndexSignature */:
                 // TypeScript index signatures are elided.
-                case 144 /* Decorator */:
+                case 145 /* Decorator */:
                 // TypeScript decorators are elided. They will be emitted as part of visitClassDeclaration.
-                case 224 /* TypeAliasDeclaration */:
+                case 228 /* TypeAliasDeclaration */:
                 // TypeScript type-only declarations are elided.
-                case 146 /* PropertyDeclaration */:
+                case 147 /* PropertyDeclaration */:
                 // TypeScript property declarations are elided.
-                case 149 /* Constructor */:
+                case 150 /* Constructor */:
                     return visitConstructor(node);
-                case 223 /* InterfaceDeclaration */:
+                case 227 /* 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 222 /* ClassDeclaration */:
+                case 226 /* ClassDeclaration */:
                     // This is a class declaration with TypeScript syntax extensions.
                     //
                     // TypeScript class syntax extensions include:
@@ -43185,7 +45182,7 @@ var ts;
                     // - index signatures
                     // - method overload signatures
                     return visitClassDeclaration(node);
-                case 193 /* ClassExpression */:
+                case 197 /* ClassExpression */:
                     // This is a class expression with TypeScript syntax extensions.
                     //
                     // TypeScript class syntax extensions include:
@@ -43196,35 +45193,35 @@ var ts;
                     // - index signatures
                     // - method overload signatures
                     return visitClassExpression(node);
-                case 251 /* HeritageClause */:
+                case 255 /* HeritageClause */:
                     // This is a heritage clause with TypeScript syntax extensions.
                     //
                     // TypeScript heritage clause extensions include:
                     // - `implements` clause
                     return visitHeritageClause(node);
-                case 195 /* ExpressionWithTypeArguments */:
+                case 199 /* ExpressionWithTypeArguments */:
                     // TypeScript supports type arguments on an expression in an `extends` heritage clause.
                     return visitExpressionWithTypeArguments(node);
-                case 148 /* MethodDeclaration */:
+                case 149 /* MethodDeclaration */:
                     // TypeScript method declarations may have decorators, modifiers
                     // or type annotations.
                     return visitMethodDeclaration(node);
-                case 150 /* GetAccessor */:
+                case 151 /* GetAccessor */:
                     // Get Accessors can have TypeScript modifiers, decorators, and type annotations.
                     return visitGetAccessor(node);
-                case 151 /* SetAccessor */:
+                case 152 /* SetAccessor */:
                     // Set Accessors can have TypeScript modifiers and type annotations.
                     return visitSetAccessor(node);
-                case 221 /* FunctionDeclaration */:
+                case 225 /* FunctionDeclaration */:
                     // Typescript function declarations can have modifiers, decorators, and type annotations.
                     return visitFunctionDeclaration(node);
-                case 180 /* FunctionExpression */:
+                case 184 /* FunctionExpression */:
                     // TypeScript function expressions can have modifiers and type annotations.
                     return visitFunctionExpression(node);
-                case 181 /* ArrowFunction */:
+                case 185 /* ArrowFunction */:
                     // TypeScript arrow functions can have modifiers and type annotations.
                     return visitArrowFunction(node);
-                case 143 /* Parameter */:
+                case 144 /* Parameter */:
                     // This is a parameter declaration with TypeScript syntax extensions.
                     //
                     // TypeScript parameter declaration syntax extensions include:
@@ -43234,33 +45231,33 @@ var ts;
                     // - type annotations
                     // - this parameters
                     return visitParameter(node);
-                case 179 /* ParenthesizedExpression */:
+                case 183 /* ParenthesizedExpression */:
                     // ParenthesizedExpressions are TypeScript if their expression is a
                     // TypeAssertion or AsExpression
                     return visitParenthesizedExpression(node);
-                case 178 /* TypeAssertionExpression */:
-                case 196 /* AsExpression */:
+                case 182 /* TypeAssertionExpression */:
+                case 200 /* AsExpression */:
                     // TypeScript type assertions are removed, but their subtrees are preserved.
                     return visitAssertionExpression(node);
-                case 175 /* CallExpression */:
+                case 179 /* CallExpression */:
                     return visitCallExpression(node);
-                case 176 /* NewExpression */:
+                case 180 /* NewExpression */:
                     return visitNewExpression(node);
-                case 197 /* NonNullExpression */:
+                case 201 /* NonNullExpression */:
                     // TypeScript non-null expressions are removed, but their subtrees are preserved.
                     return visitNonNullExpression(node);
-                case 225 /* EnumDeclaration */:
+                case 229 /* EnumDeclaration */:
                     // TypeScript enum declarations do not exist in ES6 and must be rewritten.
                     return visitEnumDeclaration(node);
-                case 201 /* VariableStatement */:
+                case 205 /* VariableStatement */:
                     // TypeScript namespace exports for variable statements must be transformed.
                     return visitVariableStatement(node);
-                case 219 /* VariableDeclaration */:
+                case 223 /* VariableDeclaration */:
                     return visitVariableDeclaration(node);
-                case 226 /* ModuleDeclaration */:
+                case 230 /* ModuleDeclaration */:
                     // TypeScript namespace declarations must be transformed.
                     return visitModuleDeclaration(node);
-                case 230 /* ImportEqualsDeclaration */:
+                case 234 /* ImportEqualsDeclaration */:
                     // TypeScript namespace or external module import.
                     return visitImportEqualsDeclaration(node);
                 default:
@@ -43275,15 +45272,15 @@ var ts;
          */
         function onBeforeVisitNode(node) {
             switch (node.kind) {
-                case 256 /* SourceFile */:
-                case 228 /* CaseBlock */:
-                case 227 /* ModuleBlock */:
-                case 200 /* Block */:
+                case 261 /* SourceFile */:
+                case 232 /* CaseBlock */:
+                case 231 /* ModuleBlock */:
+                case 204 /* Block */:
                     currentScope = node;
                     currentScopeFirstDeclarationsOfName = undefined;
                     break;
-                case 222 /* ClassDeclaration */:
-                case 221 /* FunctionDeclaration */:
+                case 226 /* ClassDeclaration */:
+                case 225 /* FunctionDeclaration */:
                     if (ts.hasModifier(node, 2 /* Ambient */)) {
                         break;
                     }
@@ -43294,13 +45291,17 @@ var ts;
         function visitSourceFile(node) {
             currentSourceFile = node;
             // ensure "use strict" is emitted in all scenarios in alwaysStrict mode
-            if (compilerOptions.alwaysStrict) {
+            // There is no need to emit "use strict" in the following cases:
+            //      1. The file is an external module and target is es2015 or higher
+            //      or 2. The file is an external module and module-kind is es6 or es2015 as such value is not allowed when targeting es5 or lower
+            if (compilerOptions.alwaysStrict &&
+                !(ts.isExternalModule(node) && (compilerOptions.target >= 2 /* ES2015 */ || compilerOptions.module === ts.ModuleKind.ES2015))) {
                 node = ts.ensureUseStrict(node);
             }
             // If the source file requires any helpers and is an external module, and
             // the importHelpers compiler option is enabled, emit a synthesized import
             // statement for the helpers library.
-            if (node.flags & 31744 /* EmitHelperFlags */
+            if (node.flags & 64512 /* EmitHelperFlags */
                 && compilerOptions.importHelpers
                 && (ts.isExternalModule(node) || compilerOptions.isolatedModules)) {
                 startLexicalEnvironment();
@@ -43313,10 +45314,10 @@ var ts;
                 externalHelpersModuleImport.parent = node;
                 externalHelpersModuleImport.flags &= ~8 /* Synthesized */;
                 statements.push(externalHelpersModuleImport);
-                currentSourceFileExternalHelpersModuleName = externalHelpersModuleName;
+                currentExternalHelpersModuleName = externalHelpersModuleName;
                 ts.addRange(statements, ts.visitNodes(node.statements, sourceElementVisitor, ts.isStatement, statementOffset));
                 ts.addRange(statements, endLexicalEnvironment());
-                currentSourceFileExternalHelpersModuleName = undefined;
+                currentExternalHelpersModuleName = undefined;
                 node = ts.updateSourceFileNode(node, ts.createNodeArray(statements, node.statements));
                 node.externalHelpersModuleName = externalHelpersModuleName;
             }
@@ -43360,7 +45361,6 @@ var ts;
             var staticProperties = getInitializedProperties(node, /*isStatic*/ true);
             var hasExtendsClause = ts.getClassExtendsHeritageClauseElement(node) !== undefined;
             var isDecoratedClass = shouldEmitDecorateCallForClass(node);
-            var classAlias;
             // emit name if
             // - node has a name
             // - node has static initializers
@@ -43369,38 +45369,22 @@ var ts;
             if (!name && staticProperties.length > 0) {
                 name = ts.getGeneratedNameForNode(node);
             }
-            var statements = [];
-            if (!isDecoratedClass) {
-                //  ${modifiers} class ${name} ${heritageClauses} {
-                //      ${members}
-                //  }
-                var classDeclaration = ts.createClassDeclaration(
-                /*decorators*/ undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), name, 
-                /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, hasExtendsClause), 
-                /*location*/ node);
-                ts.setOriginalNode(classDeclaration, node);
-                // To better align with the old emitter, we should not emit a trailing source map
-                // entry if the class has static properties.
-                if (staticProperties.length > 0) {
-                    ts.setEmitFlags(classDeclaration, 1024 /* NoTrailingSourceMap */ | ts.getEmitFlags(classDeclaration));
-                }
-                statements.push(classDeclaration);
-            }
-            else {
-                classAlias = addClassDeclarationHeadWithDecorators(statements, node, name, hasExtendsClause);
-            }
+            var classStatement = isDecoratedClass
+                ? createClassDeclarationHeadWithDecorators(node, name, hasExtendsClause)
+                : createClassDeclarationHeadWithoutDecorators(node, name, hasExtendsClause, staticProperties.length > 0);
+            var statements = [classStatement];
             // 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 (staticProperties.length) {
-                addInitializedPropertyStatements(statements, staticProperties, getLocalName(node, /*noSourceMaps*/ true));
+                addInitializedPropertyStatements(statements, staticProperties, ts.getLocalName(node));
             }
             // Write any decorators of the node.
             addClassElementDecorationStatements(statements, node, /*isStatic*/ false);
             addClassElementDecorationStatements(statements, node, /*isStatic*/ true);
-            addConstructorDecorationStatement(statements, node, classAlias);
+            addConstructorDecorationStatement(statements, node);
             // If the class is exported as part of a TypeScript namespace, emit the namespace export.
             // Otherwise, if the class was exported at the top level and was decorated, emit an export
             // declaration or export default for the class.
@@ -43409,26 +45393,54 @@ var ts;
             }
             else if (isDecoratedClass) {
                 if (isDefaultExternalModuleExport(node)) {
-                    statements.push(ts.createExportAssignment(
-                    /*decorators*/ undefined, 
-                    /*modifiers*/ undefined, 
-                    /*isExportEquals*/ false, getLocalName(node)));
+                    statements.push(ts.createExportDefault(ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true)));
                 }
                 else if (isNamedExternalModuleExport(node)) {
-                    statements.push(createExternalModuleExport(name));
+                    statements.push(ts.createExternalModuleExport(ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true)));
                 }
             }
-            return statements;
+            if (statements.length > 1) {
+                // Add a DeclarationMarker as a marker for the end of the declaration
+                statements.push(ts.createEndOfDeclarationMarker(node));
+                ts.setEmitFlags(classStatement, ts.getEmitFlags(classStatement) | 33554432 /* HasEndOfDeclarationMarker */);
+            }
+            return ts.singleOrMany(statements);
+        }
+        /**
+         * Transforms a non-decorated class declaration and appends the resulting statements.
+         *
+         * @param node A ClassDeclaration node.
+         * @param name The name of the class.
+         * @param hasExtendsClause A value indicating whether the class has an extends clause.
+         * @param hasStaticProperties A value indicating whether the class has static properties.
+         */
+        function createClassDeclarationHeadWithoutDecorators(node, name, hasExtendsClause, hasStaticProperties) {
+            //  ${modifiers} class ${name} ${heritageClauses} {
+            //      ${members}
+            //  }
+            var classDeclaration = ts.createClassDeclaration(
+            /*decorators*/ undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), name, 
+            /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, hasExtendsClause), node);
+            var emitFlags = ts.getEmitFlags(node);
+            // To better align with the old emitter, we should not emit a trailing source map
+            // entry if the class has static properties.
+            if (hasStaticProperties) {
+                emitFlags |= 1024 /* NoTrailingSourceMap */;
+            }
+            ts.setOriginalNode(classDeclaration, node);
+            ts.setEmitFlags(classDeclaration, emitFlags);
+            return classDeclaration;
         }
         /**
          * 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.
          *
+         * @param statements A statement list to which to add the declaration.
          * @param node A ClassDeclaration node.
          * @param name The name of the class.
-         * @param hasExtendsClause A value indicating whether
+         * @param hasExtendsClause A value indicating whether the class has an extends clause.
          */
-        function addClassDeclarationHeadWithDecorators(statements, node, name, hasExtendsClause) {
+        function createClassDeclarationHeadWithDecorators(node, name, hasExtendsClause) {
             // When we emit an ES6 class that has a class decorator, we must tailor the
             // emit to certain specific cases.
             //
@@ -43463,20 +45475,20 @@ var ts;
             //  ---------------------------------------------------------------------
             //  TypeScript                      | Javascript
             //  ---------------------------------------------------------------------
-            //  @dec                            | let C_1 = class C {
+            //  @dec                            | let C = C_1 = class C {
             //  class C {                       |   static x() { return C_1.y; }
             //    static x() { return C.y; }    | }
-            //    static y = 1;                 | let C = C_1;
-            //  }                               | C.y = 1;
-            //                                  | C = C_1 = __decorate([dec], C);
+            //    static y = 1;                 | C.y = 1;
+            //  }                               | C = C_1 = __decorate([dec], C);
+            //                                  | var C_1;
             //  ---------------------------------------------------------------------
-            //  @dec                            | let C_1 = class C {
+            //  @dec                            | let C = class C {
             //  export class C {                |   static x() { return C_1.y; }
             //    static x() { return C.y; }    | }
-            //    static y = 1;                 | let C = C_1;
-            //  }                               | C.y = 1;
-            //                                  | C = C_1 = __decorate([dec], C);
+            //    static y = 1;                 | C.y = 1;
+            //  }                               | C = C_1 = __decorate([dec], C);
             //                                  | export { C };
+            //                                  | var C_1;
             //  ---------------------------------------------------------------------
             //
             // If a class declaration is the default export of a module, we instead emit
@@ -43505,59 +45517,31 @@ var ts;
             //  ---------------------------------------------------------------------
             //  TypeScript                      | Javascript
             //  ---------------------------------------------------------------------
-            //  @dec                            | let C_1 = class C {
+            //  @dec                            | let C = class C {
             //  export default class C {        |   static x() { return C_1.y; }
             //    static x() { return C.y; }    | }
-            //    static y = 1;                 | let C = C_1;
-            //  }                               | C.y = 1;
-            //                                  | C = C_1 = __decorate([dec], C);
+            //    static y = 1;                 | C.y = 1;
+            //  }                               | C = C_1 = __decorate([dec], C);
             //                                  | export default C;
+            //                                  | var C_1;
             //  ---------------------------------------------------------------------
             //
             var location = ts.moveRangePastDecorators(node);
+            var classAlias = getClassAliasIfNeeded(node);
+            var declName = ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
             //  ... = class ${name} ${heritageClauses} {
             //      ${members}
             //  }
-            var classExpression = ts.setOriginalNode(ts.createClassExpression(
-            /*modifiers*/ undefined, name, 
-            /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, hasExtendsClause), 
-            /*location*/ location), node);
-            if (!name) {
-                name = ts.getGeneratedNameForNode(node);
-            }
-            // Record an alias to avoid class double-binding.
-            var classAlias;
-            if (resolver.getNodeCheckFlags(node) & 8388608 /* ClassWithConstructorReference */) {
-                enableSubstitutionForClassAliases();
-                classAlias = ts.createUniqueName(node.name && !ts.isGeneratedIdentifier(node.name) ? node.name.text : "default");
-                classAliases[ts.getOriginalNodeId(node)] = classAlias;
-            }
-            var declaredName = getDeclarationName(node, /*allowComments*/ true);
+            var heritageClauses = ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause);
+            var members = transformClassMembers(node, hasExtendsClause);
+            var classExpression = ts.createClassExpression(/*modifiers*/ undefined, name, /*typeParameters*/ undefined, heritageClauses, members, location);
+            ts.setOriginalNode(classExpression, node);
             //  let ${name} = ${classExpression} where name is either declaredName if the class doesn't contain self-reference
             //                                         or decoratedClassAlias if the class contain self-reference.
-            var transformedClassExpression = ts.createVariableStatement(
-            /*modifiers*/ undefined, ts.createLetDeclarationList([
-                ts.createVariableDeclaration(classAlias || declaredName, 
-                /*type*/ undefined, classExpression)
-            ]), 
-            /*location*/ location);
-            ts.setCommentRange(transformedClassExpression, node);
-            statements.push(ts.setOriginalNode(
-            /*node*/ transformedClassExpression, 
-            /*original*/ node));
-            if (classAlias) {
-                // We emit the class alias as a `let` declaration here so that it has the same
-                // TDZ as the class.
-                // let ${declaredName} = ${decoratedClassAlias}
-                statements.push(ts.setOriginalNode(ts.createVariableStatement(
-                /*modifiers*/ undefined, ts.createLetDeclarationList([
-                    ts.createVariableDeclaration(declaredName, 
-                    /*type*/ undefined, classAlias)
-                ]), 
-                /*location*/ location), 
-                /*original*/ node));
-            }
-            return classAlias;
+            var statement = ts.createLetStatement(declName, classAlias ? ts.createAssignment(classAlias, classExpression) : classExpression, location);
+            ts.setOriginalNode(statement, node);
+            ts.setCommentRange(statement, node);
+            return statement;
         }
         /**
          * Transforms a class expression with TypeScript syntax into compatible ES6.
@@ -43620,7 +45604,7 @@ var ts;
             // 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 hasInstancePropertyWithInitializer = ts.forEach(node.members, isInstanceInitializedProperty);
-            var hasParameterPropertyAssignments = node.transformFlags & 524288 /* ContainsParameterPropertyAssignments */;
+            var hasParameterPropertyAssignments = node.transformFlags & 4194304 /* ContainsParameterPropertyAssignments */;
             var constructor = ts.getFirstConstructorWithBody(node);
             // If the class does not contain nodes that require a synthesized constructor,
             // accept the current constructor if it exists.
@@ -43740,7 +45724,7 @@ var ts;
                     return index;
                 }
                 var statement = statements[index];
-                if (statement.kind === 203 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
+                if (statement.kind === 207 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
                     result.push(ts.visitNode(statement, visitor, ts.isStatement));
                     return index + 1;
                 }
@@ -43813,7 +45797,7 @@ var ts;
          * @param isStatic A value indicating whether the member should be a static or instance member.
          */
         function isInitializedProperty(member, isStatic) {
-            return member.kind === 146 /* PropertyDeclaration */
+            return member.kind === 147 /* PropertyDeclaration */
                 && isStatic === ts.hasModifier(member, 32 /* Static */)
                 && member.initializer !== undefined;
         }
@@ -43948,12 +45932,12 @@ var ts;
          */
         function getAllDecoratorsOfClassElement(node, member) {
             switch (member.kind) {
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
                     return getAllDecoratorsOfAccessors(node, member);
-                case 148 /* MethodDeclaration */:
+                case 149 /* MethodDeclaration */:
                     return getAllDecoratorsOfMethod(member);
-                case 146 /* PropertyDeclaration */:
+                case 147 /* PropertyDeclaration */:
                     return getAllDecoratorsOfProperty(member);
                 default:
                     return undefined;
@@ -44105,11 +46089,11 @@ var ts;
             var prefix = getClassMemberPrefix(node, member);
             var memberName = getExpressionForPropertyName(member, /*generateNameForComputedPropertyName*/ true);
             var descriptor = languageVersion > 0 /* ES3 */
-                ? member.kind === 146 /* PropertyDeclaration */
+                ? member.kind === 147 /* PropertyDeclaration */
                     ? ts.createVoidZero()
                     : ts.createNull()
                 : undefined;
-            var helper = ts.createDecorateHelper(currentSourceFileExternalHelpersModuleName, decoratorExpressions, prefix, memberName, descriptor, ts.moveRangePastDecorators(member));
+            var helper = ts.createDecorateHelper(currentExternalHelpersModuleName, decoratorExpressions, prefix, memberName, descriptor, ts.moveRangePastDecorators(member));
             ts.setEmitFlags(helper, 49152 /* NoComments */);
             return helper;
         }
@@ -44118,8 +46102,8 @@ var ts;
          *
          * @param node The class node.
          */
-        function addConstructorDecorationStatement(statements, node, decoratedClassAlias) {
-            var expression = generateConstructorDecorationExpression(node, decoratedClassAlias);
+        function addConstructorDecorationStatement(statements, node) {
+            var expression = generateConstructorDecorationExpression(node);
             if (expression) {
                 statements.push(ts.setOriginalNode(ts.createStatement(expression), node));
             }
@@ -44129,33 +46113,19 @@ var ts;
          *
          * @param node The class node.
          */
-        function generateConstructorDecorationExpression(node, decoratedClassAlias) {
+        function generateConstructorDecorationExpression(node) {
             var allDecorators = getAllDecoratorsOfConstructor(node);
             var decoratorExpressions = transformAllDecoratorsOfDeclaration(node, allDecorators);
             if (!decoratorExpressions) {
                 return undefined;
             }
-            // Emit the call to __decorate. Given the class:
-            //
-            //   @dec
-            //   class C {
-            //   }
-            //
-            // The emit for the class is:
-            //
-            //   C = C_1 = __decorate([dec], C);
-            //
-            if (decoratedClassAlias) {
-                var expression = ts.createAssignment(decoratedClassAlias, ts.createDecorateHelper(currentSourceFileExternalHelpersModuleName, decoratorExpressions, getDeclarationName(node)));
-                var result = ts.createAssignment(getDeclarationName(node), expression, ts.moveRangePastDecorators(node));
-                ts.setEmitFlags(result, 49152 /* NoComments */);
-                return result;
-            }
-            else {
-                var result = ts.createAssignment(getDeclarationName(node), ts.createDecorateHelper(currentSourceFileExternalHelpersModuleName, decoratorExpressions, getDeclarationName(node)), ts.moveRangePastDecorators(node));
-                ts.setEmitFlags(result, 49152 /* NoComments */);
-                return result;
-            }
+            var classAlias = classAliases && classAliases[ts.getOriginalNodeId(node)];
+            var localName = ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
+            var decorate = ts.createDecorateHelper(currentExternalHelpersModuleName, decoratorExpressions, localName);
+            var expression = ts.createAssignment(localName, classAlias ? ts.createAssignment(classAlias, decorate) : decorate);
+            ts.setEmitFlags(expression, 49152 /* NoComments */);
+            ts.setSourceMapRange(expression, ts.moveRangePastDecorators(node));
+            return expression;
         }
         /**
          * Transforms a decorator into an expression.
@@ -44177,7 +46147,7 @@ var ts;
                 expressions = [];
                 for (var _i = 0, decorators_1 = decorators; _i < decorators_1.length; _i++) {
                     var decorator = decorators_1[_i];
-                    var helper = ts.createParamHelper(currentSourceFileExternalHelpersModuleName, transformDecorator(decorator), parameterOffset, 
+                    var helper = ts.createParamHelper(currentExternalHelpersModuleName, transformDecorator(decorator), parameterOffset, 
                     /*location*/ decorator.expression);
                     ts.setEmitFlags(helper, 49152 /* NoComments */);
                     expressions.push(helper);
@@ -44202,13 +46172,13 @@ var ts;
         function addOldTypeMetadata(node, decoratorExpressions) {
             if (compilerOptions.emitDecoratorMetadata) {
                 if (shouldAddTypeMetadata(node)) {
-                    decoratorExpressions.push(ts.createMetadataHelper(currentSourceFileExternalHelpersModuleName, "design:type", serializeTypeOfNode(node)));
+                    decoratorExpressions.push(ts.createMetadataHelper(currentExternalHelpersModuleName, "design:type", serializeTypeOfNode(node)));
                 }
                 if (shouldAddParamTypesMetadata(node)) {
-                    decoratorExpressions.push(ts.createMetadataHelper(currentSourceFileExternalHelpersModuleName, "design:paramtypes", serializeParameterTypesOfNode(node)));
+                    decoratorExpressions.push(ts.createMetadataHelper(currentExternalHelpersModuleName, "design:paramtypes", serializeParameterTypesOfNode(node)));
                 }
                 if (shouldAddReturnTypeMetadata(node)) {
-                    decoratorExpressions.push(ts.createMetadataHelper(currentSourceFileExternalHelpersModuleName, "design:returntype", serializeReturnTypeOfNode(node)));
+                    decoratorExpressions.push(ts.createMetadataHelper(currentExternalHelpersModuleName, "design:returntype", serializeReturnTypeOfNode(node)));
                 }
             }
         }
@@ -44216,16 +46186,16 @@ var ts;
             if (compilerOptions.emitDecoratorMetadata) {
                 var properties = void 0;
                 if (shouldAddTypeMetadata(node)) {
-                    (properties || (properties = [])).push(ts.createPropertyAssignment("type", ts.createArrowFunction(/*modifiers*/ undefined, /*typeParameters*/ undefined, [], /*type*/ undefined, /*equalsGreaterThanToken*/ undefined, serializeTypeOfNode(node))));
+                    (properties || (properties = [])).push(ts.createPropertyAssignment("type", ts.createArrowFunction(/*modifiers*/ undefined, /*typeParameters*/ undefined, [], /*type*/ undefined, ts.createToken(35 /* EqualsGreaterThanToken */), serializeTypeOfNode(node))));
                 }
                 if (shouldAddParamTypesMetadata(node)) {
-                    (properties || (properties = [])).push(ts.createPropertyAssignment("paramTypes", ts.createArrowFunction(/*modifiers*/ undefined, /*typeParameters*/ undefined, [], /*type*/ undefined, /*equalsGreaterThanToken*/ undefined, serializeParameterTypesOfNode(node))));
+                    (properties || (properties = [])).push(ts.createPropertyAssignment("paramTypes", ts.createArrowFunction(/*modifiers*/ undefined, /*typeParameters*/ undefined, [], /*type*/ undefined, ts.createToken(35 /* EqualsGreaterThanToken */), serializeParameterTypesOfNode(node))));
                 }
                 if (shouldAddReturnTypeMetadata(node)) {
-                    (properties || (properties = [])).push(ts.createPropertyAssignment("returnType", ts.createArrowFunction(/*modifiers*/ undefined, /*typeParameters*/ undefined, [], /*type*/ undefined, /*equalsGreaterThanToken*/ undefined, serializeReturnTypeOfNode(node))));
+                    (properties || (properties = [])).push(ts.createPropertyAssignment("returnType", ts.createArrowFunction(/*modifiers*/ undefined, /*typeParameters*/ undefined, [], /*type*/ undefined, ts.createToken(35 /* EqualsGreaterThanToken */), serializeReturnTypeOfNode(node))));
                 }
                 if (properties) {
-                    decoratorExpressions.push(ts.createMetadataHelper(currentSourceFileExternalHelpersModuleName, "design:typeinfo", ts.createObjectLiteral(properties, /*location*/ undefined, /*multiLine*/ true)));
+                    decoratorExpressions.push(ts.createMetadataHelper(currentExternalHelpersModuleName, "design:typeinfo", ts.createObjectLiteral(properties, /*location*/ undefined, /*multiLine*/ true)));
                 }
             }
         }
@@ -44238,10 +46208,10 @@ var ts;
          */
         function shouldAddTypeMetadata(node) {
             var kind = node.kind;
-            return kind === 148 /* MethodDeclaration */
-                || kind === 150 /* GetAccessor */
-                || kind === 151 /* SetAccessor */
-                || kind === 146 /* PropertyDeclaration */;
+            return kind === 149 /* MethodDeclaration */
+                || kind === 151 /* GetAccessor */
+                || kind === 152 /* SetAccessor */
+                || kind === 147 /* PropertyDeclaration */;
         }
         /**
          * Determines whether to emit the "design:returntype" metadata based on the node's kind.
@@ -44251,7 +46221,7 @@ var ts;
          * @param node The node to test.
          */
         function shouldAddReturnTypeMetadata(node) {
-            return node.kind === 148 /* MethodDeclaration */;
+            return node.kind === 149 /* MethodDeclaration */;
         }
         /**
          * Determines whether to emit the "design:paramtypes" metadata based on the node's kind.
@@ -44262,11 +46232,11 @@ var ts;
          */
         function shouldAddParamTypesMetadata(node) {
             var kind = node.kind;
-            return kind === 222 /* ClassDeclaration */
-                || kind === 193 /* ClassExpression */
-                || kind === 148 /* MethodDeclaration */
-                || kind === 150 /* GetAccessor */
-                || kind === 151 /* SetAccessor */;
+            return kind === 226 /* ClassDeclaration */
+                || kind === 197 /* ClassExpression */
+                || kind === 149 /* MethodDeclaration */
+                || kind === 151 /* GetAccessor */
+                || kind === 152 /* SetAccessor */;
         }
         /**
          * Serializes the type of a node for use with decorator type metadata.
@@ -44275,15 +46245,15 @@ var ts;
          */
         function serializeTypeOfNode(node) {
             switch (node.kind) {
-                case 146 /* PropertyDeclaration */:
-                case 143 /* Parameter */:
-                case 150 /* GetAccessor */:
+                case 147 /* PropertyDeclaration */:
+                case 144 /* Parameter */:
+                case 151 /* GetAccessor */:
                     return serializeTypeNode(node.type);
-                case 151 /* SetAccessor */:
+                case 152 /* SetAccessor */:
                     return serializeTypeNode(ts.getSetAccessorTypeAnnotationNode(node));
-                case 222 /* ClassDeclaration */:
-                case 193 /* ClassExpression */:
-                case 148 /* MethodDeclaration */:
+                case 226 /* ClassDeclaration */:
+                case 197 /* ClassExpression */:
+                case 149 /* MethodDeclaration */:
                     return ts.createIdentifier("Function");
                 default:
                     return ts.createVoidZero();
@@ -44296,10 +46266,10 @@ var ts;
          * @param node The type node.
          */
         function getRestParameterElementType(node) {
-            if (node && node.kind === 161 /* ArrayType */) {
+            if (node && node.kind === 162 /* ArrayType */) {
                 return node.elementType;
             }
-            else if (node && node.kind === 156 /* TypeReference */) {
+            else if (node && node.kind === 157 /* TypeReference */) {
                 return ts.singleOrUndefined(node.typeArguments);
             }
             else {
@@ -44375,20 +46345,20 @@ var ts;
             switch (node.kind) {
                 case 104 /* VoidKeyword */:
                     return ts.createVoidZero();
-                case 165 /* ParenthesizedType */:
+                case 166 /* ParenthesizedType */:
                     return serializeTypeNode(node.type);
-                case 157 /* FunctionType */:
-                case 158 /* ConstructorType */:
+                case 158 /* FunctionType */:
+                case 159 /* ConstructorType */:
                     return ts.createIdentifier("Function");
-                case 161 /* ArrayType */:
-                case 162 /* TupleType */:
+                case 162 /* ArrayType */:
+                case 163 /* TupleType */:
                     return ts.createIdentifier("Array");
-                case 155 /* TypePredicate */:
+                case 156 /* TypePredicate */:
                 case 121 /* BooleanKeyword */:
                     return ts.createIdentifier("Boolean");
-                case 133 /* StringKeyword */:
+                case 134 /* StringKeyword */:
                     return ts.createIdentifier("String");
-                case 167 /* LiteralType */:
+                case 171 /* LiteralType */:
                     switch (node.literal.kind) {
                         case 9 /* StringLiteral */:
                             return ts.createIdentifier("String");
@@ -44402,16 +46372,16 @@ var ts;
                             break;
                     }
                     break;
-                case 131 /* NumberKeyword */:
+                case 132 /* NumberKeyword */:
                     return ts.createIdentifier("Number");
-                case 134 /* SymbolKeyword */:
+                case 135 /* SymbolKeyword */:
                     return languageVersion < 2 /* ES2015 */
                         ? getGlobalSymbolNameWithFallback()
                         : ts.createIdentifier("Symbol");
-                case 156 /* TypeReference */:
+                case 157 /* TypeReference */:
                     return serializeTypeReferenceNode(node);
-                case 164 /* IntersectionType */:
-                case 163 /* UnionType */:
+                case 165 /* IntersectionType */:
+                case 164 /* UnionType */:
                     {
                         var unionOrIntersection = node;
                         var serializedUnion = void 0;
@@ -44440,10 +46410,13 @@ var ts;
                         }
                     }
                 // Fallthrough
-                case 159 /* TypeQuery */:
-                case 160 /* TypeLiteral */:
+                case 160 /* TypeQuery */:
+                case 168 /* TypeOperator */:
+                case 169 /* IndexedAccessType */:
+                case 170 /* MappedType */:
+                case 161 /* TypeLiteral */:
                 case 118 /* AnyKeyword */:
-                case 166 /* ThisType */:
+                case 167 /* ThisType */:
                     break;
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -44500,15 +46473,15 @@ var ts;
                 case 70 /* 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_27 = ts.getMutableClone(node);
-                    name_27.flags &= ~8 /* Synthesized */;
-                    name_27.original = undefined;
-                    name_27.parent = currentScope;
+                    var name_31 = ts.getMutableClone(node);
+                    name_31.flags &= ~8 /* Synthesized */;
+                    name_31.original = undefined;
+                    name_31.parent = currentScope;
                     if (useFallback) {
-                        return ts.createLogicalAnd(ts.createStrictInequality(ts.createTypeOf(name_27), ts.createLiteral("undefined")), name_27);
+                        return ts.createLogicalAnd(ts.createStrictInequality(ts.createTypeOf(name_31), ts.createLiteral("undefined")), name_31);
                     }
-                    return name_27;
-                case 140 /* QualifiedName */:
+                    return name_31;
+                case 141 /* QualifiedName */:
                     return serializeQualifiedNameAsExpression(node, useFallback);
             }
         }
@@ -44641,7 +46614,7 @@ var ts;
                 return undefined;
             }
             var method = ts.createMethod(
-            /*decorators*/ undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.asteriskToken, visitPropertyNameOfClassElement(node), 
+            /*decorators*/ undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, visitPropertyNameOfClassElement(node), 
             /*typeParameters*/ undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), 
             /*type*/ undefined, transformFunctionBody(node), 
             /*location*/ node);
@@ -44675,14 +46648,14 @@ var ts;
                 return undefined;
             }
             var accessor = ts.createGetAccessor(
-            /*decorators*/ undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), visitPropertyNameOfClassElement(node), ts.visitNodes(node.parameters, visitor, ts.isParameter), 
+            /*decorators*/ undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), visitPropertyNameOfClassElement(node), ts.visitNodes(node.parameters, visitor, ts.isParameter), 
             /*type*/ undefined, node.body ? ts.visitEachChild(node.body, visitor, context) : ts.createBlock([]), 
             /*location*/ 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.setOriginalNode(accessor, node);
             ts.setCommentRange(accessor, node);
             ts.setSourceMapRange(accessor, ts.moveRangePastDecorators(node));
-            ts.setOriginalNode(accessor, node);
             return accessor;
         }
         /**
@@ -44699,13 +46672,13 @@ var ts;
                 return undefined;
             }
             var accessor = ts.createSetAccessor(
-            /*decorators*/ undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), visitPropertyNameOfClassElement(node), ts.visitNodes(node.parameters, visitor, ts.isParameter), node.body ? ts.visitEachChild(node.body, visitor, context) : ts.createBlock([]), 
+            /*decorators*/ undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), visitPropertyNameOfClassElement(node), ts.visitNodes(node.parameters, visitor, ts.isParameter), node.body ? ts.visitEachChild(node.body, visitor, context) : ts.createBlock([]), 
             /*location*/ 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.setOriginalNode(accessor, node);
             ts.setCommentRange(accessor, node);
             ts.setSourceMapRange(accessor, ts.moveRangePastDecorators(node));
-            ts.setOriginalNode(accessor, node);
             return accessor;
         }
         /**
@@ -44723,7 +46696,7 @@ var ts;
                 return ts.createNotEmittedStatement(node);
             }
             var func = ts.createFunctionDeclaration(
-            /*decorators*/ undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.asteriskToken, node.name, 
+            /*decorators*/ undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, node.name, 
             /*typeParameters*/ undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), 
             /*type*/ undefined, transformFunctionBody(node), 
             /*location*/ node);
@@ -44747,7 +46720,7 @@ var ts;
             if (ts.nodeIsMissing(node.body)) {
                 return ts.createOmittedExpression();
             }
-            var func = ts.createFunctionExpression(ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.asteriskToken, node.name, 
+            var func = ts.createFunctionExpression(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, node.name, 
             /*typeParameters*/ undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), 
             /*type*/ undefined, transformFunctionBody(node), 
             /*location*/ node);
@@ -44760,7 +46733,7 @@ var ts;
          * - The node has type annotations
          */
         function visitArrowFunction(node) {
-            var func = ts.createArrowFunction(ts.visitNodes(node.modifiers, visitor, ts.isModifier), 
+            var func = ts.createArrowFunction(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), 
             /*typeParameters*/ undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), 
             /*type*/ undefined, node.equalsGreaterThanToken, transformConciseBody(node), 
             /*location*/ node);
@@ -44820,7 +46793,7 @@ var ts;
             if (ts.parameterIsThisKeyword(node)) {
                 return undefined;
             }
-            var parameter = ts.createParameterDeclaration(
+            var parameter = ts.createParameter(
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, node.dotDotDotToken, ts.visitNode(node.name, visitor, ts.isBindingName), 
             /*questionToken*/ undefined, 
@@ -44857,7 +46830,7 @@ var ts;
         function transformInitializedVariable(node) {
             var name = node.name;
             if (ts.isBindingPattern(name)) {
-                return ts.flattenVariableDestructuringToExpression(node, hoistVariableDeclaration, getNamespaceMemberNameWithSourceMapsAndWithoutComments, visitor);
+                return ts.flattenVariableDestructuringToExpression(node, hoistVariableDeclaration, createNamespaceExportExpression, visitor);
             }
             else {
                 return ts.createAssignment(getNamespaceMemberNameWithSourceMapsAndWithoutComments(name), ts.visitNode(node.initializer, visitor, ts.isExpression), 
@@ -44923,21 +46896,6 @@ var ts;
                 || compilerOptions.preserveConstEnums
                 || compilerOptions.isolatedModules;
         }
-        function shouldEmitVarForEnumDeclaration(node) {
-            return isFirstEmittedDeclarationInScope(node)
-                && (!ts.hasModifier(node, 1 /* Export */)
-                    || isES6ExportedDeclaration(node));
-        }
-        /*
-         * Adds a trailing VariableStatement for an enum or module declaration.
-         */
-        function addVarForEnumExportedFromNamespace(statements, node) {
-            var statement = ts.createVariableStatement(
-            /*modifiers*/ undefined, [ts.createVariableDeclaration(getDeclarationName(node), 
-                /*type*/ undefined, getExportName(node))]);
-            ts.setSourceMapRange(statement, node);
-            statements.push(statement);
-        }
         /**
          * Visits an enum declaration.
          *
@@ -44956,9 +46914,7 @@ var ts;
             // If needed, we should emit a variable declaration for the enum. If we emit
             // a leading variable declaration, we should not emit leading comments for the
             // enum body.
-            recordEmittedDeclarationInScope(node);
-            if (shouldEmitVarForEnumDeclaration(node)) {
-                addVarForEnumOrModuleDeclaration(statements, node);
+            if (addVarForEnumOrModuleDeclaration(statements, node)) {
                 // We should still emit the comments if we are emitting a system module.
                 if (moduleKind !== ts.ModuleKind.System || currentScope !== currentSourceFile) {
                     emitFlags |= 16384 /* NoLeadingComments */;
@@ -44969,7 +46925,18 @@ var ts;
             // `containerName` is the expression used inside of the enum for assignments.
             var containerName = getNamespaceContainerName(node);
             // `exportName` is the expression used within this node's container for any exported references.
-            var exportName = getExportName(node);
+            var exportName = ts.hasModifier(node, 1 /* Export */)
+                ? ts.getExternalModuleOrNamespaceExportName(currentNamespaceContainerName, node, /*allowComments*/ false, /*allowSourceMaps*/ true)
+                : ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
+            //  x || (x = {})
+            //  exports.x || (exports.x = {})
+            var moduleArg = ts.createLogicalOr(exportName, ts.createAssignment(exportName, ts.createObjectLiteral()));
+            if (hasNamespaceQualifiedExportName(node)) {
+                // `localName` is the expression used within this node's containing scope for any local references.
+                var localName = ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
+                //  x = (exports.x || (exports.x = {}))
+                moduleArg = ts.createAssignment(localName, moduleArg);
+            }
             //  (function (x) {
             //      x[x["y"] = 0] = "y";
             //      ...
@@ -44978,16 +46945,16 @@ var ts;
             /*modifiers*/ undefined, 
             /*asteriskToken*/ undefined, 
             /*name*/ undefined, 
-            /*typeParameters*/ undefined, [ts.createParameter(parameterName)], 
+            /*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, parameterName)], 
             /*type*/ undefined, transformEnumBody(node, containerName)), 
-            /*typeArguments*/ undefined, [ts.createLogicalOr(exportName, ts.createAssignment(exportName, ts.createObjectLiteral()))]), 
+            /*typeArguments*/ undefined, [moduleArg]), 
             /*location*/ node);
             ts.setOriginalNode(enumStatement, node);
             ts.setEmitFlags(enumStatement, emitFlags);
             statements.push(enumStatement);
-            if (isNamespaceExport(node)) {
-                addVarForEnumExportedFromNamespace(statements, node);
-            }
+            // Add a DeclarationMarker for the enum to preserve trailing comments and mark
+            // the end of the declaration.
+            statements.push(ts.createEndOfDeclarationMarker(node));
             return statements;
         }
         /**
@@ -45049,9 +47016,15 @@ var ts;
         function shouldEmitModuleDeclaration(node) {
             return ts.isInstantiatedModule(node, compilerOptions.preserveConstEnums || compilerOptions.isolatedModules);
         }
-        function isES6ExportedDeclaration(node) {
-            return isExternalModuleExport(node)
-                && moduleKind === ts.ModuleKind.ES2015;
+        /**
+         * Determines whether an exported declaration will have a qualified export name (e.g. `f.x`
+         * or `exports.x`).
+         */
+        function hasNamespaceQualifiedExportName(node) {
+            return isNamespaceExport(node)
+                || (isExternalModuleExport(node)
+                    && moduleKind !== ts.ModuleKind.ES2015
+                    && moduleKind !== ts.ModuleKind.System);
         }
         /**
          * Records that a declaration was emitted in the current scope, if it was the first
@@ -45077,55 +47050,64 @@ var ts;
          */
         function isFirstEmittedDeclarationInScope(node) {
             if (currentScopeFirstDeclarationsOfName) {
-                var name_28 = node.symbol && node.symbol.name;
-                if (name_28) {
-                    return currentScopeFirstDeclarationsOfName[name_28] === node;
+                var name_32 = node.symbol && node.symbol.name;
+                if (name_32) {
+                    return currentScopeFirstDeclarationsOfName[name_32] === node;
                 }
             }
             return false;
         }
-        function shouldEmitVarForModuleDeclaration(node) {
-            return isFirstEmittedDeclarationInScope(node);
-        }
         /**
          * Adds a leading VariableStatement for a enum or module declaration.
          */
         function addVarForEnumOrModuleDeclaration(statements, node) {
             // Emit a variable statement for the module.
-            var statement = ts.createVariableStatement(isES6ExportedDeclaration(node)
-                ? ts.visitNodes(node.modifiers, visitor, ts.isModifier)
-                : undefined, [
-                ts.createVariableDeclaration(getDeclarationName(node, /*allowComments*/ false, /*allowSourceMaps*/ true))
+            var statement = ts.createVariableStatement(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), [
+                ts.createVariableDeclaration(ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true))
             ]);
-            ts.setOriginalNode(statement, /*original*/ node);
-            // Adjust the source map emit to match the old emitter.
-            if (node.kind === 225 /* EnumDeclaration */) {
-                ts.setSourceMapRange(statement.declarationList, node);
+            ts.setOriginalNode(statement, node);
+            recordEmittedDeclarationInScope(node);
+            if (isFirstEmittedDeclarationInScope(node)) {
+                // Adjust the source map emit to match the old emitter.
+                if (node.kind === 229 /* EnumDeclaration */) {
+                    ts.setSourceMapRange(statement.declarationList, node);
+                }
+                else {
+                    ts.setSourceMapRange(statement, node);
+                }
+                // Trailing comments for module declaration should be emitted after the function closure
+                // instead of the variable statement:
+                //
+                //     /** Module comment*/
+                //     module m1 {
+                //         function foo4Export() {
+                //         }
+                //     } // trailing comment module
+                //
+                // Should emit:
+                //
+                //     /** Module comment*/
+                //     var m1;
+                //     (function (m1) {
+                //         function foo4Export() {
+                //         }
+                //     })(m1 || (m1 = {})); // trailing comment module
+                //
+                ts.setCommentRange(statement, node);
+                ts.setEmitFlags(statement, 32768 /* NoTrailingComments */ | 33554432 /* HasEndOfDeclarationMarker */);
+                statements.push(statement);
+                return true;
             }
             else {
-                ts.setSourceMapRange(statement, node);
+                // For an EnumDeclaration or ModuleDeclaration that merges with a preceeding
+                // declaration we do not emit a leading variable declaration. To preserve the
+                // begin/end semantics of the declararation and to properly handle exports
+                // we wrap the leading variable declaration in a `MergeDeclarationMarker`.
+                var mergeMarker = ts.createMergeDeclarationMarker(statement);
+                ts.setEmitFlags(mergeMarker, 49152 /* NoComments */ | 33554432 /* HasEndOfDeclarationMarker */);
+                statements.push(mergeMarker);
+                return false;
             }
-            // Trailing comments for module declaration should be emitted after the function closure
-            // instead of the variable statement:
-            //
-            //     /** Module comment*/
-            //     module m1 {
-            //         function foo4Export() {
-            //         }
-            //     } // trailing comment module
-            //
-            // Should emit:
-            //
-            //     /** Module comment*/
-            //     var m1;
-            //     (function (m1) {
-            //         function foo4Export() {
-            //         }
-            //     })(m1 || (m1 = {})); // trailing comment module
-            //
-            ts.setCommentRange(statement, node);
-            ts.setEmitFlags(statement, 32768 /* NoTrailingComments */);
-            statements.push(statement);
         }
         /**
          * Visits a module declaration node.
@@ -45147,9 +47129,7 @@ var ts;
             // If needed, we should emit a variable declaration for the module. If we emit
             // a leading variable declaration, we should not emit leading comments for the
             // module body.
-            recordEmittedDeclarationInScope(node);
-            if (shouldEmitVarForModuleDeclaration(node)) {
-                addVarForEnumOrModuleDeclaration(statements, node);
+            if (addVarForEnumOrModuleDeclaration(statements, node)) {
                 // We should still emit the comments if we are emitting a system module.
                 if (moduleKind !== ts.ModuleKind.System || currentScope !== currentSourceFile) {
                     emitFlags |= 16384 /* NoLeadingComments */;
@@ -45160,13 +47140,15 @@ var ts;
             // `containerName` is the expression used inside of the namespace for exports.
             var containerName = getNamespaceContainerName(node);
             // `exportName` is the expression used within this node's container for any exported references.
-            var exportName = getExportName(node);
+            var exportName = ts.hasModifier(node, 1 /* Export */)
+                ? ts.getExternalModuleOrNamespaceExportName(currentNamespaceContainerName, node, /*allowComments*/ false, /*allowSourceMaps*/ true)
+                : ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
             //  x || (x = {})
             //  exports.x || (exports.x = {})
             var moduleArg = ts.createLogicalOr(exportName, ts.createAssignment(exportName, ts.createObjectLiteral()));
-            if (ts.hasModifier(node, 1 /* Export */) && !isES6ExportedDeclaration(node)) {
+            if (hasNamespaceQualifiedExportName(node)) {
                 // `localName` is the expression used within this node's containing scope for any local references.
-                var localName = getLocalName(node);
+                var localName = ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
                 //  x = (exports.x || (exports.x = {}))
                 moduleArg = ts.createAssignment(localName, moduleArg);
             }
@@ -45177,13 +47159,16 @@ var ts;
             /*modifiers*/ undefined, 
             /*asteriskToken*/ undefined, 
             /*name*/ undefined, 
-            /*typeParameters*/ undefined, [ts.createParameter(parameterName)], 
+            /*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, parameterName)], 
             /*type*/ undefined, transformModuleBody(node, containerName)), 
             /*typeArguments*/ undefined, [moduleArg]), 
             /*location*/ node);
             ts.setOriginalNode(moduleStatement, node);
             ts.setEmitFlags(moduleStatement, emitFlags);
             statements.push(moduleStatement);
+            // Add a DeclarationMarker for the namespace to preserve trailing comments and mark
+            // the end of the declaration.
+            statements.push(ts.createEndOfDeclarationMarker(node));
             return statements;
         }
         /**
@@ -45203,7 +47188,7 @@ var ts;
             var statementsLocation;
             var blockLocation;
             var body = node.body;
-            if (body.kind === 227 /* ModuleBlock */) {
+            if (body.kind === 231 /* ModuleBlock */) {
                 ts.addRange(statements, ts.visitNodes(body.statements, namespaceElementVisitor, ts.isStatement));
                 statementsLocation = body.statements;
                 blockLocation = body;
@@ -45249,13 +47234,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 !== 227 /* ModuleBlock */) {
+            if (body.kind !== 231 /* ModuleBlock */) {
                 ts.setEmitFlags(block, ts.getEmitFlags(block) | 49152 /* NoComments */);
             }
             return block;
         }
         function getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration) {
-            if (moduleDeclaration.body.kind === 226 /* ModuleDeclaration */) {
+            if (moduleDeclaration.body.kind === 230 /* ModuleDeclaration */) {
                 var recursiveInnerModule = getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration.body);
                 return recursiveInnerModule || moduleDeclaration.body;
             }
@@ -45296,7 +47281,7 @@ var ts;
          * @param node The named import bindings node.
          */
         function visitNamedImportBindings(node) {
-            if (node.kind === 233 /* NamespaceImport */) {
+            if (node.kind === 237 /* NamespaceImport */) {
                 // Elide a namespace import if it is not referenced.
                 return resolver.isReferencedAliasDeclaration(node) ? node : undefined;
             }
@@ -45403,9 +47388,9 @@ var ts;
             if (isNamedExternalModuleExport(node) || !isNamespaceExport(node)) {
                 //  export var ${name} = ${moduleReference};
                 //  var ${name} = ${moduleReference};
-                return ts.setOriginalNode(ts.createVariableStatement(ts.visitNodes(node.modifiers, visitor, ts.isModifier), ts.createVariableDeclarationList([
-                    ts.createVariableDeclaration(node.name, 
-                    /*type*/ undefined, moduleReference)
+                return ts.setOriginalNode(ts.createVariableStatement(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), ts.createVariableDeclarationList([
+                    ts.setOriginalNode(ts.createVariableDeclaration(node.name, 
+                    /*type*/ undefined, moduleReference), node)
                 ]), node), node);
             }
             else {
@@ -45454,38 +47439,20 @@ var ts;
             return ts.createStatement(expression, /*location*/ undefined);
         }
         function addExportMemberAssignment(statements, node) {
-            var expression = ts.createAssignment(getExportName(node), getLocalName(node, /*noSourceMaps*/ true));
+            var expression = ts.createAssignment(ts.getExternalModuleOrNamespaceExportName(currentNamespaceContainerName, node, /*allowComments*/ false, /*allowSourceMaps*/ true), ts.getLocalName(node));
             ts.setSourceMapRange(expression, ts.createRange(node.name.pos, node.end));
             var statement = ts.createStatement(expression);
             ts.setSourceMapRange(statement, ts.createRange(-1, node.end));
             statements.push(statement);
         }
         function createNamespaceExport(exportName, exportValue, location) {
-            return ts.createStatement(ts.createAssignment(getNamespaceMemberName(exportName, /*allowComments*/ false, /*allowSourceMaps*/ true), exportValue), location);
+            return ts.createStatement(ts.createAssignment(ts.getNamespaceMemberName(currentNamespaceContainerName, exportName, /*allowComments*/ false, /*allowSourceMaps*/ true), exportValue), location);
         }
-        function createExternalModuleExport(exportName) {
-            return ts.createExportDeclaration(
-            /*decorators*/ undefined, 
-            /*modifiers*/ undefined, ts.createNamedExports([
-                ts.createExportSpecifier(exportName)
-            ]));
-        }
-        function getNamespaceMemberName(name, allowComments, allowSourceMaps) {
-            var qualifiedName = ts.createPropertyAccess(currentNamespaceContainerName, ts.getSynthesizedClone(name), /*location*/ name);
-            var emitFlags;
-            if (!allowComments) {
-                emitFlags |= 49152 /* NoComments */;
-            }
-            if (!allowSourceMaps) {
-                emitFlags |= 1536 /* NoSourceMap */;
-            }
-            if (emitFlags) {
-                ts.setEmitFlags(qualifiedName, emitFlags);
-            }
-            return qualifiedName;
+        function createNamespaceExportExpression(exportName, exportValue, location) {
+            return ts.createAssignment(getNamespaceMemberNameWithSourceMapsAndWithoutComments(exportName), exportValue, location);
         }
         function getNamespaceMemberNameWithSourceMapsAndWithoutComments(name) {
-            return getNamespaceMemberName(name, /*allowComments*/ false, /*allowSourceMaps*/ true);
+            return ts.getNamespaceMemberName(currentNamespaceContainerName, name, /*allowComments*/ false, /*allowSourceMaps*/ true);
         }
         /**
          * Gets the declaration name used inside of a namespace or enum.
@@ -45503,67 +47470,25 @@ var ts;
             return ts.getGeneratedNameForNode(node);
         }
         /**
-         * Gets the local name for a declaration for use in expressions.
-         *
-         * A local name will *never* be prefixed with an module or namespace export modifier like
-         * "exports.".
-         *
-         * @param node The declaration.
-         * @param noSourceMaps A value indicating whether source maps may not be emitted for the name.
-         * @param allowComments A value indicating whether comments may be emitted for the name.
+         * Gets a local alias for a class declaration if it is a decorated class with an internal
+         * reference to the static side of the class. This is necessary to avoid issues with
+         * double-binding semantics for the class name.
          */
-        function getLocalName(node, noSourceMaps, allowComments) {
-            return getDeclarationName(node, allowComments, !noSourceMaps, 262144 /* LocalName */);
-        }
-        /**
-         * Gets the export name for a declaration for use in expressions.
-         *
-         * An export name will *always* be prefixed with an module or namespace export modifier
-         * like "exports." if one is required.
-         *
-         * @param node The declaration.
-         * @param noSourceMaps A value indicating whether source maps may not be emitted for the name.
-         * @param allowComments A value indicating whether comments may be emitted for the name.
-         */
-        function getExportName(node, noSourceMaps, allowComments) {
-            if (isNamespaceExport(node)) {
-                return getNamespaceMemberName(getDeclarationName(node), allowComments, !noSourceMaps);
-            }
-            return getDeclarationName(node, allowComments, !noSourceMaps, 131072 /* ExportName */);
-        }
-        /**
-         * Gets the name for a declaration for use in declarations.
-         *
-         * @param node The declaration.
-         * @param allowComments A value indicating whether comments may be emitted for the name.
-         * @param allowSourceMaps A value indicating whether source maps may be emitted for the name.
-         * @param emitFlags Additional NodeEmitFlags to specify for the name.
-         */
-        function getDeclarationName(node, allowComments, allowSourceMaps, emitFlags) {
-            if (node.name) {
-                var name_29 = ts.getMutableClone(node.name);
-                emitFlags |= ts.getEmitFlags(node.name);
-                if (!allowSourceMaps) {
-                    emitFlags |= 1536 /* NoSourceMap */;
-                }
-                if (!allowComments) {
-                    emitFlags |= 49152 /* NoComments */;
-                }
-                if (emitFlags) {
-                    ts.setEmitFlags(name_29, emitFlags);
-                }
-                return name_29;
-            }
-            else {
-                return ts.getGeneratedNameForNode(node);
+        function getClassAliasIfNeeded(node) {
+            if (resolver.getNodeCheckFlags(node) & 8388608 /* ClassWithConstructorReference */) {
+                enableSubstitutionForClassAliases();
+                var classAlias = ts.createUniqueName(node.name && !ts.isGeneratedIdentifier(node.name) ? node.name.text : "default");
+                classAliases[ts.getOriginalNodeId(node)] = classAlias;
+                hoistVariableDeclaration(classAlias);
+                return classAlias;
             }
         }
         function getClassPrototype(node) {
-            return ts.createPropertyAccess(getDeclarationName(node), "prototype");
+            return ts.createPropertyAccess(ts.getDeclarationName(node), "prototype");
         }
         function getClassMemberPrefix(node, member) {
             return ts.hasModifier(member, 32 /* Static */)
-                ? getDeclarationName(node)
+                ? ts.getDeclarationName(node)
                 : getClassPrototype(node);
         }
         function enableSubstitutionForNonQualifiedEnumMembers() {
@@ -45588,20 +47513,21 @@ var ts;
                 // 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(70 /* Identifier */);
-                context.enableSubstitution(254 /* ShorthandPropertyAssignment */);
+                context.enableSubstitution(258 /* ShorthandPropertyAssignment */);
                 // We need to be notified when entering and exiting namespaces.
-                context.enableEmitNotification(226 /* ModuleDeclaration */);
+                context.enableEmitNotification(230 /* ModuleDeclaration */);
             }
         }
         function isTransformedModuleDeclaration(node) {
-            return ts.getOriginalNode(node).kind === 226 /* ModuleDeclaration */;
+            return ts.getOriginalNode(node).kind === 230 /* ModuleDeclaration */;
         }
         function isTransformedEnumDeclaration(node) {
-            return ts.getOriginalNode(node).kind === 225 /* EnumDeclaration */;
+            return ts.getOriginalNode(node).kind === 229 /* EnumDeclaration */;
         }
         /**
          * Hook for node emit.
          *
+         * @param emitContext A context hint for the emitter.
          * @param node The node to emit.
          * @param emit A callback used to emit the node in the printer.
          */
@@ -45619,9 +47545,8 @@ var ts;
         /**
          * Hooks node substitutions.
          *
+         * @param emitContext A context hint for the emitter.
          * @param node The node to substitute.
-         * @param isExpression A value indicating whether the node is to be used in an expression
-         *                     position.
          */
         function onSubstituteNode(emitContext, node) {
             node = previousOnSubstituteNode(emitContext, node);
@@ -45635,16 +47560,16 @@ var ts;
         }
         function substituteShorthandPropertyAssignment(node) {
             if (enabledSubstitutions & 2 /* NamespaceExports */) {
-                var name_30 = node.name;
-                var exportedName = trySubstituteNamespaceExportedName(name_30);
+                var name_33 = node.name;
+                var exportedName = trySubstituteNamespaceExportedName(name_33);
                 if (exportedName) {
                     // A shorthand property with an assignment initializer is probably part of a
                     // destructuring assignment
                     if (node.objectAssignmentInitializer) {
                         var initializer = ts.createAssignment(exportedName, node.objectAssignmentInitializer);
-                        return ts.createPropertyAssignment(name_30, initializer, /*location*/ node);
+                        return ts.createPropertyAssignment(name_33, initializer, /*location*/ node);
                     }
-                    return ts.createPropertyAssignment(name_30, exportedName, /*location*/ node);
+                    return ts.createPropertyAssignment(name_33, exportedName, /*location*/ node);
                 }
             }
             return node;
@@ -45653,9 +47578,9 @@ var ts;
             switch (node.kind) {
                 case 70 /* Identifier */:
                     return substituteExpressionIdentifier(node);
-                case 173 /* PropertyAccessExpression */:
+                case 177 /* PropertyAccessExpression */:
                     return substitutePropertyAccessExpression(node);
-                case 174 /* ElementAccessExpression */:
+                case 178 /* ElementAccessExpression */:
                     return substituteElementAccessExpression(node);
             }
             return node;
@@ -45689,13 +47614,13 @@ var ts;
         }
         function trySubstituteNamespaceExportedName(node) {
             // If this is explicitly a local name, do not substitute.
-            if (enabledSubstitutions & applicableSubstitutions && (ts.getEmitFlags(node) & 262144 /* LocalName */) === 0) {
+            if (enabledSubstitutions & applicableSubstitutions && !ts.isLocalName(node)) {
                 // 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) {
-                    var substitute = (applicableSubstitutions & 2 /* NamespaceExports */ && container.kind === 226 /* ModuleDeclaration */) ||
-                        (applicableSubstitutions & 8 /* NonQualifiedEnumMembers */ && container.kind === 225 /* EnumDeclaration */);
+                if (container && container.kind !== 261 /* SourceFile */) {
+                    var substitute = (applicableSubstitutions & 2 /* NamespaceExports */ && container.kind === 230 /* ModuleDeclaration */) ||
+                        (applicableSubstitutions & 8 /* NonQualifiedEnumMembers */ && container.kind === 229 /* EnumDeclaration */);
                     if (substitute) {
                         return ts.createPropertyAccess(ts.getGeneratedNameForNode(container), node, /*location*/ node);
                     }
@@ -45774,11 +47699,11 @@ var ts;
         }
         function visitorWorker(node) {
             switch (node.kind) {
-                case 242 /* JsxElement */:
+                case 246 /* JsxElement */:
                     return visitJsxElement(node, /*isChild*/ false);
-                case 243 /* JsxSelfClosingElement */:
+                case 247 /* JsxSelfClosingElement */:
                     return visitJsxSelfClosingElement(node, /*isChild*/ false);
-                case 248 /* JsxExpression */:
+                case 252 /* JsxExpression */:
                     return visitJsxExpression(node);
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -45789,11 +47714,11 @@ var ts;
             switch (node.kind) {
                 case 10 /* JsxText */:
                     return visitJsxText(node);
-                case 248 /* JsxExpression */:
+                case 252 /* JsxExpression */:
                     return visitJsxExpression(node);
-                case 242 /* JsxElement */:
+                case 246 /* JsxElement */:
                     return visitJsxElement(node, /*isChild*/ true);
-                case 243 /* JsxSelfClosingElement */:
+                case 247 /* JsxSelfClosingElement */:
                     return visitJsxSelfClosingElement(node, /*isChild*/ true);
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -45830,7 +47755,7 @@ var ts;
                 objectProperties = ts.singleOrUndefined(segments)
                     || ts.createAssignHelper(currentSourceFile.externalHelpersModuleName, segments);
             }
-            var element = ts.createReactCreateElement(compilerOptions.reactNamespace, tagName, objectProperties, ts.filter(ts.map(children, transformJsxChildToExpression), ts.isDefined), node, location);
+            var element = ts.createExpressionForJsxElement(context.getEmitResolver().getJsxFactoryEntity(), compilerOptions.reactNamespace, tagName, objectProperties, ts.filter(ts.map(children, transformJsxChildToExpression), ts.isDefined), node, location);
             if (isChild) {
                 ts.startOnNewLine(element);
             }
@@ -45852,7 +47777,7 @@ var ts;
                 var decoded = tryDecodeEntities(node.text);
                 return decoded ? ts.createLiteral(decoded, /*location*/ node) : node;
             }
-            else if (node.kind === 248 /* JsxExpression */) {
+            else if (node.kind === 252 /* JsxExpression */) {
                 return visitJsxExpression(node);
             }
             else {
@@ -45934,16 +47859,16 @@ var ts;
             return decoded === text ? undefined : decoded;
         }
         function getTagName(node) {
-            if (node.kind === 242 /* JsxElement */) {
+            if (node.kind === 246 /* JsxElement */) {
                 return getTagName(node.openingElement);
             }
             else {
-                var name_31 = node.tagName;
-                if (ts.isIdentifier(name_31) && ts.isIntrinsicJsxName(name_31.text)) {
-                    return ts.createLiteral(name_31.text);
+                var name_34 = node.tagName;
+                if (ts.isIdentifier(name_34) && ts.isIntrinsicJsxName(name_34.text)) {
+                    return ts.createLiteral(name_34.text);
                 }
                 else {
-                    return ts.createExpressionFromEntityName(name_31);
+                    return ts.createExpressionFromEntityName(name_34);
                 }
             }
         }
@@ -46228,6 +48153,232 @@ var ts;
 /// <reference path="../visitor.ts" />
 /*@internal*/
 var ts;
+(function (ts) {
+    function transformESNext(context) {
+        var hoistVariableDeclaration = context.hoistVariableDeclaration;
+        var currentSourceFile;
+        return transformSourceFile;
+        function transformSourceFile(node) {
+            currentSourceFile = node;
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function visitor(node) {
+            if (node.transformFlags & 16 /* ESNext */) {
+                return visitorWorker(node);
+            }
+            else if (node.transformFlags & 32 /* ContainsESNext */) {
+                return ts.visitEachChild(node, visitor, context);
+            }
+            else {
+                return node;
+            }
+        }
+        function visitorWorker(node) {
+            switch (node.kind) {
+                case 176 /* ObjectLiteralExpression */:
+                    return visitObjectLiteralExpression(node);
+                case 192 /* BinaryExpression */:
+                    return visitBinaryExpression(node);
+                case 223 /* VariableDeclaration */:
+                    return visitVariableDeclaration(node);
+                case 213 /* ForOfStatement */:
+                    return visitForOfStatement(node);
+                case 172 /* ObjectBindingPattern */:
+                case 173 /* ArrayBindingPattern */:
+                    return node;
+                case 225 /* FunctionDeclaration */:
+                    return visitFunctionDeclaration(node);
+                case 184 /* FunctionExpression */:
+                    return visitFunctionExpression(node);
+                case 185 /* ArrowFunction */:
+                    return visitArrowFunction(node);
+                case 144 /* Parameter */:
+                    return visitParameter(node);
+                default:
+                    ts.Debug.failBadSyntaxKind(node);
+                    return ts.visitEachChild(node, visitor, context);
+            }
+        }
+        function chunkObjectLiteralElements(elements) {
+            var chunkObject;
+            var objects = [];
+            for (var _i = 0, elements_3 = elements; _i < elements_3.length; _i++) {
+                var e = elements_3[_i];
+                if (e.kind === 259 /* SpreadAssignment */) {
+                    if (chunkObject) {
+                        objects.push(ts.createObjectLiteral(chunkObject));
+                        chunkObject = undefined;
+                    }
+                    var target = e.expression;
+                    objects.push(ts.visitNode(target, visitor, ts.isExpression));
+                }
+                else {
+                    if (!chunkObject) {
+                        chunkObject = [];
+                    }
+                    if (e.kind === 257 /* PropertyAssignment */) {
+                        var p = e;
+                        chunkObject.push(ts.createPropertyAssignment(p.name, ts.visitNode(p.initializer, visitor, ts.isExpression)));
+                    }
+                    else {
+                        chunkObject.push(e);
+                    }
+                }
+            }
+            if (chunkObject) {
+                objects.push(ts.createObjectLiteral(chunkObject));
+            }
+            return objects;
+        }
+        function visitObjectLiteralExpression(node) {
+            // 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});
+            // If the first element is a spread element, then the first argument to __assign is {}:
+            //     { ...o, a, b, ...o2 } => __assign({}, o, {a, b}, o2)
+            var objects = chunkObjectLiteralElements(node.properties);
+            if (objects.length && objects[0].kind !== 176 /* ObjectLiteralExpression */) {
+                objects.unshift(ts.createObjectLiteral());
+            }
+            return ts.createCall(ts.createIdentifier("__assign"), undefined, objects);
+        }
+        /**
+         * Visits a BinaryExpression that contains a destructuring assignment.
+         *
+         * @param node A BinaryExpression node.
+         */
+        function visitBinaryExpression(node) {
+            if (ts.isDestructuringAssignment(node) && node.left.transformFlags & 48 /* AssertESNext */) {
+                return ts.flattenDestructuringAssignment(context, node, /*needsDestructuringValue*/ true, hoistVariableDeclaration, visitor, /*transformRest*/ true);
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        /**
+         * Visits a VariableDeclaration node with a binding pattern.
+         *
+         * @param node A VariableDeclaration node.
+         */
+        function visitVariableDeclaration(node) {
+            // If we are here it is because the name contains a binding pattern with a rest somewhere in it.
+            if (ts.isBindingPattern(node.name) && node.name.transformFlags & 48 /* AssertESNext */) {
+                var result = ts.flattenVariableDestructuring(node, /*value*/ undefined, visitor, /*recordTempVariable*/ undefined, /*transformRest*/ true);
+                return result;
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        /**
+         * Visits a ForOfStatement and converts it into a ES2015-compatible ForOfStatement.
+         *
+         * @param node A ForOfStatement.
+         */
+        function visitForOfStatement(node) {
+            // The following ESNext code:
+            //
+            //    for (let { x, y, ...rest } of expr) { }
+            //
+            // should be emitted as
+            //
+            //    for (var _a of expr) {
+            //        let { x, y } = _a, rest = __rest(_a, ["x", "y"]);
+            //    }
+            //
+            // where _a is a temp emitted to capture the RHS.
+            // When the left hand side is an expression instead of a let declaration,
+            // the `let` before the `{ x, y }` is not emitted.
+            // When the left hand side is a let/const, the v is renamed if there is
+            // another v in scope.
+            // Note that all assignments to the LHS are emitted in the body, including
+            // all destructuring.
+            // Note also that because an extra statement is needed to assign to the LHS,
+            // for-of bodies are always emitted as blocks.
+            // for (<init> of <expression>) <statement>
+            // where <init> is [let] variabledeclarationlist | expression
+            var initializer = node.initializer;
+            if (!isRestBindingPattern(initializer) && !isRestAssignment(initializer)) {
+                return ts.visitEachChild(node, visitor, context);
+            }
+            return ts.convertForOf(node, undefined, visitor, ts.noop, context, /*transformRest*/ true);
+        }
+        function isRestBindingPattern(initializer) {
+            if (ts.isVariableDeclarationList(initializer)) {
+                var declaration = ts.firstOrUndefined(initializer.declarations);
+                return declaration && declaration.name &&
+                    declaration.name.kind === 172 /* ObjectBindingPattern */ &&
+                    !!(declaration.name.transformFlags & 8388608 /* ContainsSpreadExpression */);
+            }
+            return false;
+        }
+        function isRestAssignment(initializer) {
+            return initializer.kind === 176 /* ObjectLiteralExpression */ &&
+                initializer.transformFlags & 8388608 /* ContainsSpreadExpression */;
+        }
+        function visitParameter(node) {
+            if (isObjectRestParameter(node)) {
+                // Binding patterns are converted into a generated name and are
+                // evaluated inside the function body.
+                return ts.setOriginalNode(ts.createParameter(
+                /*decorators*/ undefined, 
+                /*modifiers*/ undefined, 
+                /*dotDotDotToken*/ undefined, ts.getGeneratedNameForNode(node), 
+                /*questionToken*/ undefined, 
+                /*type*/ undefined, node.initializer, 
+                /*location*/ node), 
+                /*original*/ node);
+            }
+            else {
+                return node;
+            }
+        }
+        function isObjectRestParameter(node) {
+            return node.name &&
+                node.name.kind === 172 /* ObjectBindingPattern */ &&
+                !!(node.name.transformFlags & 8388608 /* ContainsSpreadExpression */);
+        }
+        function visitFunctionDeclaration(node) {
+            var hasRest = ts.forEach(node.parameters, isObjectRestParameter);
+            var body = hasRest ?
+                ts.transformFunctionBody(node, visitor, currentSourceFile, context, ts.noop, /*convertObjectRest*/ true) :
+                ts.visitEachChild(node.body, visitor, context);
+            return ts.setOriginalNode(ts.createFunctionDeclaration(
+            /*decorators*/ undefined, node.modifiers, node.asteriskToken, node.name, 
+            /*typeParameters*/ undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), 
+            /*type*/ undefined, body, 
+            /*location*/ node), 
+            /*original*/ node);
+        }
+        function visitArrowFunction(node) {
+            var hasRest = ts.forEach(node.parameters, isObjectRestParameter);
+            var body = hasRest ?
+                ts.transformFunctionBody(node, visitor, currentSourceFile, context, ts.noop, /*convertObjectRest*/ true) :
+                ts.visitEachChild(node.body, visitor, context);
+            var func = ts.setOriginalNode(ts.createArrowFunction(
+            /*modifiers*/ undefined, 
+            /*typeParameters*/ undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), 
+            /*type*/ undefined, node.equalsGreaterThanToken, body, 
+            /*location*/ node), 
+            /*original*/ node);
+            ts.setEmitFlags(func, 256 /* CapturesThis */);
+            return func;
+        }
+        function visitFunctionExpression(node) {
+            var hasRest = ts.forEach(node.parameters, isObjectRestParameter);
+            var body = hasRest ?
+                ts.transformFunctionBody(node, visitor, currentSourceFile, context, ts.noop, /*convertObjectRest*/ true) :
+                ts.visitEachChild(node.body, visitor, context);
+            return ts.setOriginalNode(ts.createFunctionExpression(
+            /*modifiers*/ undefined, node.asteriskToken, name, 
+            /*typeParameters*/ undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), 
+            /*type*/ undefined, body, 
+            /*location*/ node), 
+            /*original*/ node);
+        }
+    }
+    ts.transformESNext = transformESNext;
+})(ts || (ts = {}));
+/// <reference path="../factory.ts" />
+/// <reference path="../visitor.ts" />
+/*@internal*/
+var ts;
 (function (ts) {
     function transformES2017(context) {
         var ES2017SubstitutionFlags;
@@ -46272,10 +48423,10 @@ var ts;
             return ts.visitEachChild(node, visitor, context);
         }
         function visitor(node) {
-            if (node.transformFlags & 16 /* ES2017 */) {
+            if (node.transformFlags & 64 /* ES2017 */) {
                 return visitorWorker(node);
             }
-            else if (node.transformFlags & 32 /* ContainsES2017 */) {
+            else if (node.transformFlags & 128 /* ContainsES2017 */) {
                 return ts.visitEachChild(node, visitor, context);
             }
             return node;
@@ -46285,19 +48436,19 @@ var ts;
                 case 119 /* AsyncKeyword */:
                     // ES2017 async modifier should be elided for targets < ES2017
                     return undefined;
-                case 185 /* AwaitExpression */:
+                case 189 /* AwaitExpression */:
                     // ES2017 'await' expressions must be transformed for targets < ES2017.
                     return visitAwaitExpression(node);
-                case 148 /* MethodDeclaration */:
+                case 149 /* MethodDeclaration */:
                     // ES2017 method declarations may be 'async'
                     return visitMethodDeclaration(node);
-                case 221 /* FunctionDeclaration */:
+                case 225 /* FunctionDeclaration */:
                     // ES2017 function declarations may be 'async'
                     return visitFunctionDeclaration(node);
-                case 180 /* FunctionExpression */:
+                case 184 /* FunctionExpression */:
                     // ES2017 function expressions may be 'async'
                     return visitFunctionExpression(node);
-                case 181 /* ArrowFunction */:
+                case 185 /* ArrowFunction */:
                     // ES2017 arrow functions may be 'async'
                     return visitArrowFunction(node);
                 default:
@@ -46418,9 +48569,10 @@ var ts;
             return ts.mergeFunctionBodyLexicalEnvironment(visited, declarations);
         }
         function transformAsyncFunctionBody(node) {
-            var nodeType = node.original ? node.original.type : node.type;
+            var original = ts.getOriginalNode(node, ts.isFunctionLike);
+            var nodeType = original.type;
             var promiseConstructor = languageVersion < 2 /* ES2015 */ ? getPromiseConstructor(nodeType) : undefined;
-            var isArrowFunction = node.kind === 181 /* ArrowFunction */;
+            var isArrowFunction = node.kind === 185 /* 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
@@ -46470,12 +48622,14 @@ var ts;
             }
         }
         function getPromiseConstructor(type) {
-            var typeName = ts.getEntityNameFromTypeNode(type);
-            if (typeName && ts.isEntityName(typeName)) {
-                var serializationKind = resolver.getTypeReferenceSerializationKind(typeName);
-                if (serializationKind === ts.TypeReferenceSerializationKind.TypeWithConstructSignatureAndValue
-                    || serializationKind === ts.TypeReferenceSerializationKind.Unknown) {
-                    return typeName;
+            if (type) {
+                var typeName = ts.getEntityNameFromTypeNode(type);
+                if (typeName && ts.isEntityName(typeName)) {
+                    var serializationKind = resolver.getTypeReferenceSerializationKind(typeName);
+                    if (serializationKind === ts.TypeReferenceSerializationKind.TypeWithConstructSignatureAndValue
+                        || serializationKind === ts.TypeReferenceSerializationKind.Unknown) {
+                        return typeName;
+                    }
                 }
             }
             return undefined;
@@ -46485,24 +48639,24 @@ 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(175 /* CallExpression */);
-                context.enableSubstitution(173 /* PropertyAccessExpression */);
-                context.enableSubstitution(174 /* ElementAccessExpression */);
+                context.enableSubstitution(179 /* CallExpression */);
+                context.enableSubstitution(177 /* PropertyAccessExpression */);
+                context.enableSubstitution(178 /* ElementAccessExpression */);
                 // We need to be notified when entering and exiting declarations that bind super.
-                context.enableEmitNotification(222 /* ClassDeclaration */);
-                context.enableEmitNotification(148 /* MethodDeclaration */);
-                context.enableEmitNotification(150 /* GetAccessor */);
-                context.enableEmitNotification(151 /* SetAccessor */);
-                context.enableEmitNotification(149 /* Constructor */);
+                context.enableEmitNotification(226 /* ClassDeclaration */);
+                context.enableEmitNotification(149 /* MethodDeclaration */);
+                context.enableEmitNotification(151 /* GetAccessor */);
+                context.enableEmitNotification(152 /* SetAccessor */);
+                context.enableEmitNotification(150 /* Constructor */);
             }
         }
         function substituteExpression(node) {
             switch (node.kind) {
-                case 173 /* PropertyAccessExpression */:
+                case 177 /* PropertyAccessExpression */:
                     return substitutePropertyAccessExpression(node);
-                case 174 /* ElementAccessExpression */:
+                case 178 /* ElementAccessExpression */:
                     return substituteElementAccessExpression(node);
-                case 175 /* CallExpression */:
+                case 179 /* CallExpression */:
                     if (enabledSubstitutions & 1 /* AsyncMethodsWithSuper */) {
                         return substituteCallExpression(node);
                     }
@@ -46546,11 +48700,11 @@ var ts;
         }
         function isSuperContainer(node) {
             var kind = node.kind;
-            return kind === 222 /* ClassDeclaration */
-                || kind === 149 /* Constructor */
-                || kind === 148 /* MethodDeclaration */
-                || kind === 150 /* GetAccessor */
-                || kind === 151 /* SetAccessor */;
+            return kind === 226 /* ClassDeclaration */
+                || kind === 150 /* Constructor */
+                || kind === 149 /* MethodDeclaration */
+                || kind === 151 /* GetAccessor */
+                || kind === 152 /* SetAccessor */;
         }
         /**
          * Hook for node emit.
@@ -46616,10 +48770,10 @@ var ts;
             return ts.visitEachChild(node, visitor, context);
         }
         function visitor(node) {
-            if (node.transformFlags & 64 /* ES2016 */) {
+            if (node.transformFlags & 256 /* ES2016 */) {
                 return visitorWorker(node);
             }
-            else if (node.transformFlags & 128 /* ContainsES2016 */) {
+            else if (node.transformFlags & 512 /* ContainsES2016 */) {
                 return ts.visitEachChild(node, visitor, context);
             }
             else {
@@ -46628,7 +48782,7 @@ var ts;
         }
         function visitorWorker(node) {
             switch (node.kind) {
-                case 188 /* BinaryExpression */:
+                case 192 /* BinaryExpression */:
                     return visitBinaryExpression(node);
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -46742,6 +48896,7 @@ var ts;
         var enclosingFunction;
         var enclosingNonArrowFunction;
         var enclosingNonAsyncFunctionBody;
+        var isInConstructorWithCapturedSuper;
         /**
          * Used to track if we are emitting body of the converted loop
          */
@@ -46779,12 +48934,15 @@ var ts;
             var savedCurrentParent = currentParent;
             var savedCurrentNode = currentNode;
             var savedConvertedLoopState = convertedLoopState;
+            var savedIsInConstructorWithCapturedSuper = isInConstructorWithCapturedSuper;
             if (ts.nodeStartsNewLexicalEnvironment(node)) {
-                // don't treat content of nodes that start new lexical environment as part of converted loop copy
+                // don't treat content of nodes that start new lexical environment as part of converted loop copy or constructor body
+                isInConstructorWithCapturedSuper = false;
                 convertedLoopState = undefined;
             }
             onBeforeVisitNode(node);
             var visited = f(node);
+            isInConstructorWithCapturedSuper = savedIsInConstructorWithCapturedSuper;
             convertedLoopState = savedConvertedLoopState;
             enclosingFunction = savedEnclosingFunction;
             enclosingNonArrowFunction = savedEnclosingNonArrowFunction;
@@ -46796,16 +48954,28 @@ var ts;
             currentNode = savedCurrentNode;
             return visited;
         }
+        function returnCapturedThis(node) {
+            return ts.setOriginalNode(ts.createReturn(ts.createIdentifier("_this")), node);
+        }
+        function isReturnVoidStatementInConstructorWithCapturedSuper(node) {
+            return isInConstructorWithCapturedSuper && node.kind === 216 /* ReturnStatement */ && !node.expression;
+        }
         function shouldCheckNode(node) {
-            return (node.transformFlags & 256 /* ES2015 */) !== 0 ||
-                node.kind === 215 /* LabeledStatement */ ||
+            return (node.transformFlags & 1024 /* ES2015 */) !== 0 ||
+                node.kind === 219 /* LabeledStatement */ ||
                 (ts.isIterationStatement(node, /*lookInLabeledStatements*/ false) && shouldConvertIterationStatementBody(node));
         }
         function visitorWorker(node) {
-            if (shouldCheckNode(node)) {
+            if (isReturnVoidStatementInConstructorWithCapturedSuper(node)) {
+                return returnCapturedThis(node);
+            }
+            else if (shouldCheckNode(node)) {
                 return visitJavaScript(node);
             }
-            else if (node.transformFlags & 512 /* ContainsES2015 */) {
+            else if (node.transformFlags & 2048 /* ContainsES2015 */ || (isInConstructorWithCapturedSuper && !ts.isExpression(node))) {
+                // we want to dive in this branch either if node has children with ES2015 specific syntax
+                // or we are inside constructor that captures result of the super call so all returns without expression should be
+                // rewritten. Note: we skip expressions since returns should never appear there 
                 return ts.visitEachChild(node, visitor, context);
             }
             else {
@@ -46824,14 +48994,15 @@ var ts;
         }
         function visitNodesInConvertedLoop(node) {
             switch (node.kind) {
-                case 212 /* ReturnStatement */:
+                case 216 /* ReturnStatement */:
+                    node = isReturnVoidStatementInConstructorWithCapturedSuper(node) ? returnCapturedThis(node) : node;
                     return visitReturnStatement(node);
-                case 201 /* VariableStatement */:
+                case 205 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 214 /* SwitchStatement */:
+                case 218 /* SwitchStatement */:
                     return visitSwitchStatement(node);
-                case 211 /* BreakStatement */:
-                case 210 /* ContinueStatement */:
+                case 215 /* BreakStatement */:
+                case 214 /* ContinueStatement */:
                     return visitBreakOrContinueStatement(node);
                 case 98 /* ThisKeyword */:
                     return visitThisKeyword(node);
@@ -46843,75 +49014,77 @@ var ts;
         }
         function visitJavaScript(node) {
             switch (node.kind) {
-                case 83 /* ExportKeyword */:
-                    return node;
-                case 222 /* ClassDeclaration */:
+                case 114 /* StaticKeyword */:
+                    return undefined; // elide static keyword
+                case 226 /* ClassDeclaration */:
                     return visitClassDeclaration(node);
-                case 193 /* ClassExpression */:
+                case 197 /* ClassExpression */:
                     return visitClassExpression(node);
-                case 143 /* Parameter */:
+                case 144 /* Parameter */:
                     return visitParameter(node);
-                case 221 /* FunctionDeclaration */:
+                case 225 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 181 /* ArrowFunction */:
+                case 185 /* ArrowFunction */:
                     return visitArrowFunction(node);
-                case 180 /* FunctionExpression */:
+                case 184 /* FunctionExpression */:
                     return visitFunctionExpression(node);
-                case 219 /* VariableDeclaration */:
+                case 223 /* VariableDeclaration */:
                     return visitVariableDeclaration(node);
                 case 70 /* Identifier */:
                     return visitIdentifier(node);
-                case 220 /* VariableDeclarationList */:
+                case 224 /* VariableDeclarationList */:
                     return visitVariableDeclarationList(node);
-                case 215 /* LabeledStatement */:
+                case 219 /* LabeledStatement */:
                     return visitLabeledStatement(node);
-                case 205 /* DoStatement */:
+                case 209 /* DoStatement */:
                     return visitDoStatement(node);
-                case 206 /* WhileStatement */:
+                case 210 /* WhileStatement */:
                     return visitWhileStatement(node);
-                case 207 /* ForStatement */:
+                case 211 /* ForStatement */:
                     return visitForStatement(node);
-                case 208 /* ForInStatement */:
+                case 212 /* ForInStatement */:
                     return visitForInStatement(node);
-                case 209 /* ForOfStatement */:
+                case 213 /* ForOfStatement */:
                     return visitForOfStatement(node);
-                case 203 /* ExpressionStatement */:
+                case 207 /* ExpressionStatement */:
                     return visitExpressionStatement(node);
-                case 172 /* ObjectLiteralExpression */:
+                case 176 /* ObjectLiteralExpression */:
                     return visitObjectLiteralExpression(node);
-                case 254 /* ShorthandPropertyAssignment */:
+                case 256 /* CatchClause */:
+                    return visitCatchClause(node);
+                case 258 /* ShorthandPropertyAssignment */:
                     return visitShorthandPropertyAssignment(node);
-                case 171 /* ArrayLiteralExpression */:
+                case 175 /* ArrayLiteralExpression */:
                     return visitArrayLiteralExpression(node);
-                case 175 /* CallExpression */:
+                case 179 /* CallExpression */:
                     return visitCallExpression(node);
-                case 176 /* NewExpression */:
+                case 180 /* NewExpression */:
                     return visitNewExpression(node);
-                case 179 /* ParenthesizedExpression */:
+                case 183 /* ParenthesizedExpression */:
                     return visitParenthesizedExpression(node, /*needsDestructuringValue*/ true);
-                case 188 /* BinaryExpression */:
+                case 192 /* BinaryExpression */:
                     return visitBinaryExpression(node, /*needsDestructuringValue*/ true);
                 case 12 /* NoSubstitutionTemplateLiteral */:
                 case 13 /* TemplateHead */:
                 case 14 /* TemplateMiddle */:
                 case 15 /* TemplateTail */:
                     return visitTemplateLiteral(node);
-                case 177 /* TaggedTemplateExpression */:
+                case 181 /* TaggedTemplateExpression */:
                     return visitTaggedTemplateExpression(node);
-                case 190 /* TemplateExpression */:
+                case 194 /* TemplateExpression */:
                     return visitTemplateExpression(node);
-                case 191 /* YieldExpression */:
+                case 195 /* YieldExpression */:
                     return visitYieldExpression(node);
                 case 96 /* SuperKeyword */:
                     return visitSuperKeyword();
-                case 191 /* YieldExpression */:
+                case 195 /* YieldExpression */:
                     // `yield` will be handled by a generators transform.
                     return ts.visitEachChild(node, visitor, context);
-                case 148 /* MethodDeclaration */:
+                case 149 /* MethodDeclaration */:
                     return visitMethodDeclaration(node);
-                case 256 /* SourceFile */:
+                case 261 /* SourceFile */:
                     return visitSourceFileNode(node);
-                case 201 /* VariableStatement */:
+                case 205 /* VariableStatement */:
                     return visitVariableStatement(node);
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -46926,7 +49099,7 @@ var ts;
                 }
                 if (ts.isFunctionLike(currentNode)) {
                     enclosingFunction = currentNode;
-                    if (currentNode.kind !== 181 /* ArrowFunction */) {
+                    if (currentNode.kind !== 185 /* ArrowFunction */) {
                         enclosingNonArrowFunction = currentNode;
                         if (!(ts.getEmitFlags(currentNode) & 2097152 /* AsyncFunctionBody */)) {
                             enclosingNonAsyncFunctionBody = currentNode;
@@ -46937,14 +49110,14 @@ var ts;
                 // variable statements, variable declarations, binding elements, and binding
                 // patterns.
                 switch (currentNode.kind) {
-                    case 201 /* VariableStatement */:
+                    case 205 /* VariableStatement */:
                         enclosingVariableStatement = currentNode;
                         break;
-                    case 220 /* VariableDeclarationList */:
-                    case 219 /* VariableDeclaration */:
-                    case 170 /* BindingElement */:
-                    case 168 /* ObjectBindingPattern */:
-                    case 169 /* ArrayBindingPattern */:
+                    case 224 /* VariableDeclarationList */:
+                    case 223 /* VariableDeclaration */:
+                    case 174 /* BindingElement */:
+                    case 172 /* ObjectBindingPattern */:
+                    case 173 /* ArrayBindingPattern */:
                         break;
                     default:
                         enclosingVariableStatement = undefined;
@@ -46973,7 +49146,7 @@ var ts;
         }
         function visitThisKeyword(node) {
             ts.Debug.assert(convertedLoopState !== undefined);
-            if (enclosingFunction && enclosingFunction.kind === 181 /* ArrowFunction */) {
+            if (enclosingFunction && enclosingFunction.kind === 185 /* ArrowFunction */) {
                 // if the enclosing function is an ArrowFunction is then we use the captured 'this' keyword.
                 convertedLoopState.containsLexicalThis = true;
                 return node;
@@ -46998,13 +49171,13 @@ 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 === 211 /* BreakStatement */ ? 2 /* Break */ : 4 /* Continue */;
+                var jump = node.kind === 215 /* BreakStatement */ ? 2 /* Break */ : 4 /* Continue */;
                 var canUseBreakOrContinue = (node.label && convertedLoopState.labels && convertedLoopState.labels[node.label.text]) ||
                     (!node.label && (convertedLoopState.allowedNonLabeledJumps & jump));
                 if (!canUseBreakOrContinue) {
                     var labelMarker = void 0;
                     if (!node.label) {
-                        if (node.kind === 211 /* BreakStatement */) {
+                        if (node.kind === 215 /* BreakStatement */) {
                             convertedLoopState.nonLocalJumps |= 2 /* Break */;
                             labelMarker = "break";
                         }
@@ -47015,7 +49188,7 @@ var ts;
                         }
                     }
                     else {
-                        if (node.kind === 211 /* BreakStatement */) {
+                        if (node.kind === 215 /* BreakStatement */) {
                             labelMarker = "break-" + node.label.text;
                             setLabeledJump(convertedLoopState, /*isBreak*/ true, node.label.text, labelMarker);
                         }
@@ -47059,33 +49232,29 @@ var ts;
             //          }
             //          return C;
             //      }());
-            var modifierFlags = ts.getModifierFlags(node);
-            var isExported = modifierFlags & 1 /* Export */;
-            var isDefault = modifierFlags & 512 /* Default */;
-            // Add an `export` modifier to the statement if needed (for `--target es5 --module es6`)
-            var modifiers = isExported && !isDefault
-                ? ts.filter(node.modifiers, isExportModifier)
-                : undefined;
-            var statement = ts.createVariableStatement(modifiers, ts.createVariableDeclarationList([
-                ts.createVariableDeclaration(getDeclarationName(node, /*allowComments*/ true), 
-                /*type*/ undefined, transformClassLikeDeclarationToExpression(node))
-            ]), 
-            /*location*/ node);
+            var variable = ts.createVariableDeclaration(ts.getLocalName(node, /*allowComments*/ true), 
+            /*type*/ undefined, transformClassLikeDeclarationToExpression(node));
+            ts.setOriginalNode(variable, node);
+            var statements = [];
+            var statement = ts.createVariableStatement(/*modifiers*/ undefined, ts.createVariableDeclarationList([variable]), /*location*/ node);
             ts.setOriginalNode(statement, node);
             ts.startOnNewLine(statement);
+            statements.push(statement);
             // Add an `export default` statement for default exports (for `--target es5 --module es6`)
-            if (isExported && isDefault) {
-                var statements = [statement];
-                statements.push(ts.createExportAssignment(
-                /*decorators*/ undefined, 
-                /*modifiers*/ undefined, 
-                /*isExportEquals*/ false, getDeclarationName(node, /*allowComments*/ false)));
-                return statements;
+            if (ts.hasModifier(node, 1 /* Export */)) {
+                var exportStatement = ts.hasModifier(node, 512 /* Default */)
+                    ? ts.createExportDefault(ts.getLocalName(node))
+                    : ts.createExternalModuleExport(ts.getLocalName(node));
+                ts.setOriginalNode(exportStatement, statement);
+                statements.push(exportStatement);
             }
-            return statement;
-        }
-        function isExportModifier(node) {
-            return node.kind === 83 /* ExportKeyword */;
+            var emitFlags = ts.getEmitFlags(node);
+            if ((emitFlags & 33554432 /* HasEndOfDeclarationMarker */) === 0) {
+                // Add a DeclarationMarker as a marker for the end of the declaration
+                statements.push(ts.createEndOfDeclarationMarker(node));
+                ts.setEmitFlags(statement, emitFlags | 33554432 /* HasEndOfDeclarationMarker */);
+            }
+            return ts.singleOrMany(statements);
         }
         /**
          * Visits a ClassExpression and transforms it into an expression.
@@ -47140,7 +49309,7 @@ var ts;
             /*modifiers*/ undefined, 
             /*asteriskToken*/ undefined, 
             /*name*/ undefined, 
-            /*typeParameters*/ undefined, extendsClauseElement ? [ts.createParameter("_super")] : [], 
+            /*typeParameters*/ undefined, extendsClauseElement ? [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "_super")] : [], 
             /*type*/ undefined, transformClassBody(node, extendsClauseElement));
             // To preserve the behavior of the old emitter, we explicitly indent
             // the body of the function here if it was requested in an earlier
@@ -47175,7 +49344,7 @@ var ts;
             addClassMembers(statements, node);
             // Create a synthetic text range for the return statement.
             var closingBraceLocation = ts.createTokenRange(ts.skipTrivia(currentText, node.members.end), 17 /* CloseBraceToken */);
-            var localName = getLocalName(node);
+            var localName = ts.getLocalName(node);
             // The following partially-emitted expression exists purely to align our sourcemap
             // emit with the original emitter.
             var outer = ts.createPartiallyEmittedExpression(localName);
@@ -47199,7 +49368,7 @@ var ts;
          */
         function addExtendsHelperIfNeeded(statements, node, extendsClauseElement) {
             if (extendsClauseElement) {
-                statements.push(ts.createStatement(ts.createExtendsHelper(currentSourceFile.externalHelpersModuleName, getDeclarationName(node)), 
+                statements.push(ts.createStatement(ts.createExtendsHelper(currentSourceFile.externalHelpersModuleName, ts.getLocalName(node)), 
                 /*location*/ extendsClauseElement));
             }
         }
@@ -47216,7 +49385,7 @@ var ts;
             var constructorFunction = ts.createFunctionDeclaration(
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, 
-            /*asteriskToken*/ undefined, getDeclarationName(node), 
+            /*asteriskToken*/ undefined, ts.getDeclarationName(node), 
             /*typeParameters*/ undefined, transformConstructorParameters(constructor, hasSynthesizedSuper), 
             /*type*/ undefined, transformConstructorBody(constructor, node, extendsClauseElement, hasSynthesizedSuper), 
             /*location*/ constructor || node);
@@ -47267,8 +49436,8 @@ var ts;
                 statementOffset = ts.addPrologueDirectives(statements, constructor.body.statements, /*ensureUseStrict*/ false, visitor);
             }
             if (constructor) {
-                addDefaultValueAssignmentsIfNeeded(statements, constructor);
-                addRestParameterIfNeeded(statements, constructor, hasSynthesizedSuper);
+                ts.addDefaultValueAssignmentsIfNeeded(statements, constructor, visitor, /*convertObjectRest*/ false);
+                ts.addRestParameterIfNeeded(statements, constructor, hasSynthesizedSuper);
                 ts.Debug.assert(statementOffset >= 0, "statementOffset not initialized correctly!");
             }
             var superCaptureStatus = declareOrCaptureOrReturnThisForConstructorIfNeeded(statements, constructor, !!extendsClauseElement, hasSynthesizedSuper, statementOffset);
@@ -47277,7 +49446,10 @@ var ts;
                 statementOffset++;
             }
             if (constructor) {
-                var body = saveStateAndInvoke(constructor, function (constructor) { return ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, /*start*/ statementOffset); });
+                var body = saveStateAndInvoke(constructor, function (constructor) {
+                    isInConstructorWithCapturedSuper = superCaptureStatus === 1 /* ReplaceSuperCapture */;
+                    return ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, /*start*/ statementOffset);
+                });
                 ts.addRange(statements, body);
             }
             // Return `_this` unless we're sure enough that it would be pointless to add a return statement.
@@ -47304,17 +49476,17 @@ var ts;
          */
         function isSufficientlyCoveredByReturnStatements(statement) {
             // A return statement is considered covered.
-            if (statement.kind === 212 /* ReturnStatement */) {
+            if (statement.kind === 216 /* ReturnStatement */) {
                 return true;
             }
-            else if (statement.kind === 204 /* IfStatement */) {
+            else if (statement.kind === 208 /* IfStatement */) {
                 var ifStatement = statement;
                 if (ifStatement.elseStatement) {
                     return isSufficientlyCoveredByReturnStatements(ifStatement.thenStatement) &&
                         isSufficientlyCoveredByReturnStatements(ifStatement.elseStatement);
                 }
             }
-            else if (statement.kind === 200 /* Block */) {
+            else if (statement.kind === 204 /* Block */) {
                 var lastStatement = ts.lastOrUndefined(statement.statements);
                 if (lastStatement && isSufficientlyCoveredByReturnStatements(lastStatement)) {
                     return true;
@@ -47331,7 +49503,7 @@ var ts;
             // If this isn't a derived class, just capture 'this' for arrow functions if necessary.
             if (!hasExtendsClause) {
                 if (ctor) {
-                    addCaptureThisForNodeIfNeeded(statements, ctor);
+                    ts.addCaptureThisForNodeIfNeeded(statements, ctor, enableSubstitutionsForCapturedThis);
                 }
                 return 0 /* NoReplacement */;
             }
@@ -47346,7 +49518,7 @@ var ts;
             // for something like property initializers.
             // Create a captured '_this' variable and assume it will subsequently be used.
             if (hasSynthesizedSuper) {
-                captureThisForNode(statements, ctor, createDefaultSuperCallOrThis());
+                ts.captureThisForNode(statements, ctor, createDefaultSuperCallOrThis());
                 enableSubstitutionsForCapturedThis();
                 return 1 /* ReplaceSuperCapture */;
             }
@@ -47372,7 +49544,7 @@ var ts;
             var ctorStatements = ctor.body.statements;
             if (statementOffset < ctorStatements.length) {
                 firstStatement = ctorStatements[statementOffset];
-                if (firstStatement.kind === 203 /* ExpressionStatement */ && ts.isSuperCall(firstStatement.expression)) {
+                if (firstStatement.kind === 207 /* ExpressionStatement */ && ts.isSuperCall(firstStatement.expression)) {
                     var superCall = firstStatement.expression;
                     superCallExpression = ts.setOriginalNode(saveStateAndInvoke(superCall, visitImmediateSuperCallInBody), superCall);
                 }
@@ -47383,7 +49555,7 @@ var ts;
                 return 2 /* ReplaceWithReturn */;
             }
             // Perform the capture.
-            captureThisForNode(statements, ctor, superCallExpression, firstStatement);
+            ts.captureThisForNode(statements, ctor, superCallExpression, enableSubstitutionsForCapturedThis, firstStatement);
             // If we're actually replacing the original statement, we need to signal this to the caller.
             if (superCallExpression) {
                 return 1 /* ReplaceSuperCapture */;
@@ -47409,14 +49581,24 @@ var ts;
             else if (ts.isBindingPattern(node.name)) {
                 // Binding patterns are converted into a generated name and are
                 // evaluated inside the function body.
-                return ts.setOriginalNode(ts.createParameter(ts.getGeneratedNameForNode(node), 
+                return ts.setOriginalNode(ts.createParameter(
+                /*decorators*/ undefined, 
+                /*modifiers*/ undefined, 
+                /*dotDotDotToken*/ undefined, ts.getGeneratedNameForNode(node), 
+                /*questionToken*/ undefined, 
+                /*type*/ undefined, 
                 /*initializer*/ undefined, 
                 /*location*/ node), 
                 /*original*/ node);
             }
             else if (node.initializer) {
                 // Initializers are elided
-                return ts.setOriginalNode(ts.createParameter(node.name, 
+                return ts.setOriginalNode(ts.createParameter(
+                /*decorators*/ undefined, 
+                /*modifiers*/ undefined, 
+                /*dotDotDotToken*/ undefined, node.name, 
+                /*questionToken*/ undefined, 
+                /*type*/ undefined, 
                 /*initializer*/ undefined, 
                 /*location*/ node), 
                 /*original*/ node);
@@ -47425,158 +49607,6 @@ var ts;
                 return node;
             }
         }
-        /**
-         * Gets a value indicating whether we need to add default value assignments for a
-         * function-like node.
-         *
-         * @param node A function-like node.
-         */
-        function shouldAddDefaultValueAssignments(node) {
-            return (node.transformFlags & 262144 /* ContainsDefaultValueAssignments */) !== 0;
-        }
-        /**
-         * Adds statements to the body of a function-like node if it contains parameters with
-         * binding patterns or initializers.
-         *
-         * @param statements The statements for the new function body.
-         * @param node A function-like node.
-         */
-        function addDefaultValueAssignmentsIfNeeded(statements, node) {
-            if (!shouldAddDefaultValueAssignments(node)) {
-                return;
-            }
-            for (var _i = 0, _a = node.parameters; _i < _a.length; _i++) {
-                var parameter = _a[_i];
-                var name_32 = parameter.name, initializer = parameter.initializer, dotDotDotToken = parameter.dotDotDotToken;
-                // A rest parameter cannot have a binding pattern or an initializer,
-                // so let's just ignore it.
-                if (dotDotDotToken) {
-                    continue;
-                }
-                if (ts.isBindingPattern(name_32)) {
-                    addDefaultValueAssignmentForBindingPattern(statements, parameter, name_32, initializer);
-                }
-                else if (initializer) {
-                    addDefaultValueAssignmentForInitializer(statements, parameter, name_32, initializer);
-                }
-            }
-        }
-        /**
-         * Adds statements to the body of a function-like node for parameters with binding patterns
-         *
-         * @param statements The statements for the new function body.
-         * @param parameter The parameter for the function.
-         * @param name The name of the parameter.
-         * @param initializer The initializer for the parameter.
-         */
-        function addDefaultValueAssignmentForBindingPattern(statements, parameter, name, initializer) {
-            var temp = ts.getGeneratedNameForNode(parameter);
-            // In cases where a binding pattern is simply '[]' or '{}',
-            // we usually don't want to emit a var declaration; however, in the presence
-            // of an initializer, we must emit that expression to preserve side effects.
-            if (name.elements.length > 0) {
-                statements.push(ts.setEmitFlags(ts.createVariableStatement(
-                /*modifiers*/ undefined, ts.createVariableDeclarationList(ts.flattenParameterDestructuring(parameter, temp, visitor))), 8388608 /* CustomPrologue */));
-            }
-            else if (initializer) {
-                statements.push(ts.setEmitFlags(ts.createStatement(ts.createAssignment(temp, ts.visitNode(initializer, visitor, ts.isExpression))), 8388608 /* CustomPrologue */));
-            }
-        }
-        /**
-         * Adds statements to the body of a function-like node for parameters with initializers.
-         *
-         * @param statements The statements for the new function body.
-         * @param parameter The parameter for the function.
-         * @param name The name of the parameter.
-         * @param initializer The initializer for the parameter.
-         */
-        function addDefaultValueAssignmentForInitializer(statements, parameter, name, initializer) {
-            initializer = ts.visitNode(initializer, visitor, ts.isExpression);
-            var statement = ts.createIf(ts.createStrictEquality(ts.getSynthesizedClone(name), ts.createVoidZero()), ts.setEmitFlags(ts.createBlock([
-                ts.createStatement(ts.createAssignment(ts.setEmitFlags(ts.getMutableClone(name), 1536 /* NoSourceMap */), ts.setEmitFlags(initializer, 1536 /* NoSourceMap */ | ts.getEmitFlags(initializer)), 
-                /*location*/ parameter))
-            ], /*location*/ parameter), 32 /* SingleLine */ | 1024 /* NoTrailingSourceMap */ | 12288 /* NoTokenSourceMaps */), 
-            /*elseStatement*/ undefined, 
-            /*location*/ parameter);
-            statement.startsOnNewLine = true;
-            ts.setEmitFlags(statement, 12288 /* NoTokenSourceMaps */ | 1024 /* NoTrailingSourceMap */ | 8388608 /* CustomPrologue */);
-            statements.push(statement);
-        }
-        /**
-         * Gets a value indicating whether we need to add statements to handle a rest parameter.
-         *
-         * @param node A ParameterDeclaration node.
-         * @param inConstructorWithSynthesizedSuper A value indicating whether the parameter is
-         *                                          part of a constructor declaration with a
-         *                                          synthesized call to `super`
-         */
-        function shouldAddRestParameter(node, inConstructorWithSynthesizedSuper) {
-            return node && node.dotDotDotToken && node.name.kind === 70 /* Identifier */ && !inConstructorWithSynthesizedSuper;
-        }
-        /**
-         * Adds statements to the body of a function-like node if it contains a rest parameter.
-         *
-         * @param statements The statements for the new function body.
-         * @param node A function-like node.
-         * @param inConstructorWithSynthesizedSuper A value indicating whether the parameter is
-         *                                          part of a constructor declaration with a
-         *                                          synthesized call to `super`
-         */
-        function addRestParameterIfNeeded(statements, node, inConstructorWithSynthesizedSuper) {
-            var parameter = ts.lastOrUndefined(node.parameters);
-            if (!shouldAddRestParameter(parameter, inConstructorWithSynthesizedSuper)) {
-                return;
-            }
-            // `declarationName` is the name of the local declaration for the parameter.
-            var declarationName = ts.getMutableClone(parameter.name);
-            ts.setEmitFlags(declarationName, 1536 /* NoSourceMap */);
-            // `expressionName` is the name of the parameter used in expressions.
-            var expressionName = ts.getSynthesizedClone(parameter.name);
-            var restIndex = node.parameters.length - 1;
-            var temp = ts.createLoopVariable();
-            // var param = [];
-            statements.push(ts.setEmitFlags(ts.createVariableStatement(
-            /*modifiers*/ undefined, ts.createVariableDeclarationList([
-                ts.createVariableDeclaration(declarationName, 
-                /*type*/ undefined, ts.createArrayLiteral([]))
-            ]), 
-            /*location*/ parameter), 8388608 /* CustomPrologue */));
-            // for (var _i = restIndex; _i < arguments.length; _i++) {
-            //   param[_i - restIndex] = arguments[_i];
-            // }
-            var forStatement = ts.createFor(ts.createVariableDeclarationList([
-                ts.createVariableDeclaration(temp, /*type*/ undefined, ts.createLiteral(restIndex))
-            ], /*location*/ parameter), ts.createLessThan(temp, ts.createPropertyAccess(ts.createIdentifier("arguments"), "length"), 
-            /*location*/ parameter), ts.createPostfixIncrement(temp, /*location*/ parameter), ts.createBlock([
-                ts.startOnNewLine(ts.createStatement(ts.createAssignment(ts.createElementAccess(expressionName, ts.createSubtract(temp, ts.createLiteral(restIndex))), ts.createElementAccess(ts.createIdentifier("arguments"), temp)), 
-                /*location*/ parameter))
-            ]));
-            ts.setEmitFlags(forStatement, 8388608 /* CustomPrologue */);
-            ts.startOnNewLine(forStatement);
-            statements.push(forStatement);
-        }
-        /**
-         * Adds a statement to capture the `this` of a function declaration if it is needed.
-         *
-         * @param statements The statements for the new function body.
-         * @param node A node.
-         */
-        function addCaptureThisForNodeIfNeeded(statements, node) {
-            if (node.transformFlags & 65536 /* ContainsCapturedLexicalThis */ && node.kind !== 181 /* ArrowFunction */) {
-                captureThisForNode(statements, node, ts.createThis());
-            }
-        }
-        function captureThisForNode(statements, node, initializer, originalStatement) {
-            enableSubstitutionsForCapturedThis();
-            var captureThisStatement = ts.createVariableStatement(
-            /*modifiers*/ undefined, ts.createVariableDeclarationList([
-                ts.createVariableDeclaration("_this", 
-                /*type*/ undefined, initializer)
-            ]), originalStatement);
-            ts.setEmitFlags(captureThisStatement, 49152 /* NoComments */ | 8388608 /* CustomPrologue */);
-            ts.setSourceMapRange(captureThisStatement, node);
-            statements.push(captureThisStatement);
-        }
         /**
          * Adds statements to the class body function for a class to define the members of the
          * class.
@@ -47588,20 +49618,20 @@ var ts;
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
                 switch (member.kind) {
-                    case 199 /* SemicolonClassElement */:
+                    case 203 /* SemicolonClassElement */:
                         statements.push(transformSemicolonClassElementToStatement(member));
                         break;
-                    case 148 /* MethodDeclaration */:
+                    case 149 /* MethodDeclaration */:
                         statements.push(transformClassMethodDeclarationToStatement(getClassMemberPrefix(node, member), member));
                         break;
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* SetAccessor */:
                         var accessors = ts.getAllAccessorDeclarations(node.members, member);
                         if (member === accessors.firstAccessor) {
                             statements.push(transformAccessorsToStatement(getClassMemberPrefix(node, member), accessors));
                         }
                         break;
-                    case 149 /* Constructor */:
+                    case 150 /* Constructor */:
                         // Constructors are handled in visitClassExpression/visitClassDeclaration
                         break;
                     default:
@@ -47707,7 +49737,7 @@ var ts;
          * @param node An ArrowFunction node.
          */
         function visitArrowFunction(node) {
-            if (node.transformFlags & 32768 /* ContainsLexicalThis */) {
+            if (node.transformFlags & 262144 /* ContainsLexicalThis */) {
                 enableSubstitutionsForCapturedThis();
             }
             var func = transformFunctionLikeToExpression(node, /*location*/ node, /*name*/ undefined);
@@ -47731,7 +49761,7 @@ var ts;
             return ts.setOriginalNode(ts.createFunctionDeclaration(
             /*decorators*/ undefined, node.modifiers, node.asteriskToken, node.name, 
             /*typeParameters*/ undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), 
-            /*type*/ undefined, transformFunctionBody(node), 
+            /*type*/ undefined, ts.transformFunctionBody(node, visitor, currentSourceFile, context, enableSubstitutionsForCapturedThis), 
             /*location*/ node), 
             /*original*/ node);
         }
@@ -47744,91 +49774,17 @@ var ts;
          */
         function transformFunctionLikeToExpression(node, location, name) {
             var savedContainingNonArrowFunction = enclosingNonArrowFunction;
-            if (node.kind !== 181 /* ArrowFunction */) {
+            if (node.kind !== 185 /* ArrowFunction */) {
                 enclosingNonArrowFunction = node;
             }
             var expression = ts.setOriginalNode(ts.createFunctionExpression(
             /*modifiers*/ undefined, node.asteriskToken, name, 
             /*typeParameters*/ undefined, ts.visitNodes(node.parameters, visitor, ts.isParameter), 
-            /*type*/ undefined, saveStateAndInvoke(node, transformFunctionBody), location), 
+            /*type*/ undefined, saveStateAndInvoke(node, function (node) { return ts.transformFunctionBody(node, visitor, currentSourceFile, context, enableSubstitutionsForCapturedThis); }), location), 
             /*original*/ node);
             enclosingNonArrowFunction = savedContainingNonArrowFunction;
             return expression;
         }
-        /**
-         * Transforms the body of a function-like node.
-         *
-         * @param node A function-like node.
-         */
-        function transformFunctionBody(node) {
-            var multiLine = false; // indicates whether the block *must* be emitted as multiple lines
-            var singleLine = false; // indicates whether the block *may* be emitted as a single line
-            var statementsLocation;
-            var closeBraceLocation;
-            var statements = [];
-            var body = node.body;
-            var statementOffset;
-            startLexicalEnvironment();
-            if (ts.isBlock(body)) {
-                // ensureUseStrict is false because no new prologue-directive should be added.
-                // addPrologueDirectives will simply put already-existing directives at the beginning of the target statement-array
-                statementOffset = ts.addPrologueDirectives(statements, body.statements, /*ensureUseStrict*/ false, visitor);
-            }
-            addCaptureThisForNodeIfNeeded(statements, node);
-            addDefaultValueAssignmentsIfNeeded(statements, node);
-            addRestParameterIfNeeded(statements, node, /*inConstructorWithSynthesizedSuper*/ false);
-            // If we added any generated statements, this must be a multi-line block.
-            if (!multiLine && statements.length > 0) {
-                multiLine = true;
-            }
-            if (ts.isBlock(body)) {
-                statementsLocation = body.statements;
-                ts.addRange(statements, ts.visitNodes(body.statements, visitor, ts.isStatement, statementOffset));
-                // If the original body was a multi-line block, this must be a multi-line block.
-                if (!multiLine && body.multiLine) {
-                    multiLine = true;
-                }
-            }
-            else {
-                ts.Debug.assert(node.kind === 181 /* 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
-                // being emitted for the end position only.
-                statementsLocation = ts.moveRangeEnd(body, -1);
-                var equalsGreaterThanToken = node.equalsGreaterThanToken;
-                if (!ts.nodeIsSynthesized(equalsGreaterThanToken) && !ts.nodeIsSynthesized(body)) {
-                    if (ts.rangeEndIsOnSameLineAsRangeStart(equalsGreaterThanToken, body, currentSourceFile)) {
-                        singleLine = true;
-                    }
-                    else {
-                        multiLine = true;
-                    }
-                }
-                var expression = ts.visitNode(body, visitor, ts.isExpression);
-                var returnStatement = ts.createReturn(expression, /*location*/ body);
-                ts.setEmitFlags(returnStatement, 12288 /* NoTokenSourceMaps */ | 1024 /* NoTrailingSourceMap */ | 32768 /* NoTrailingComments */);
-                statements.push(returnStatement);
-                // To align with the source map emit for the old emitter, we set a custom
-                // source map location for the close brace.
-                closeBraceLocation = body;
-            }
-            var lexicalEnvironment = endLexicalEnvironment();
-            ts.addRange(statements, lexicalEnvironment);
-            // If we added any final generated statements, this must be a multi-line block
-            if (!multiLine && lexicalEnvironment && lexicalEnvironment.length) {
-                multiLine = true;
-            }
-            var block = ts.createBlock(ts.createNodeArray(statements, statementsLocation), node.body, multiLine);
-            if (!multiLine && singleLine) {
-                ts.setEmitFlags(block, 32 /* SingleLine */);
-            }
-            if (closeBraceLocation) {
-                ts.setTokenSourceMapRange(block, 17 /* CloseBraceToken */, closeBraceLocation);
-            }
-            ts.setOriginalNode(block, node.body);
-            return block;
-        }
         /**
          * Visits an ExpressionStatement that contains a destructuring assignment.
          *
@@ -47837,9 +49793,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 179 /* ParenthesizedExpression */:
+                case 183 /* ParenthesizedExpression */:
                     return ts.updateStatement(node, visitParenthesizedExpression(node.expression, /*needsDestructuringValue*/ false));
-                case 188 /* BinaryExpression */:
+                case 192 /* BinaryExpression */:
                     return ts.updateStatement(node, visitBinaryExpression(node.expression, /*needsDestructuringValue*/ false));
             }
             return ts.visitEachChild(node, visitor, context);
@@ -47855,10 +49811,10 @@ var ts;
             // If we are here it is most likely because our expression is a destructuring assignment.
             if (needsDestructuringValue) {
                 switch (node.expression.kind) {
-                    case 179 /* ParenthesizedExpression */:
+                    case 183 /* ParenthesizedExpression */:
                         return ts.createParen(visitParenthesizedExpression(node.expression, /*needsDestructuringValue*/ true), 
                         /*location*/ node);
-                    case 188 /* BinaryExpression */:
+                    case 192 /* BinaryExpression */:
                         return ts.createParen(visitBinaryExpression(node.expression, /*needsDestructuringValue*/ true), 
                         /*location*/ node);
                 }
@@ -47887,7 +49843,7 @@ var ts;
                     if (decl.initializer) {
                         var assignment = void 0;
                         if (ts.isBindingPattern(decl.name)) {
-                            assignment = ts.flattenVariableDestructuringToExpression(decl, hoistVariableDeclaration, /*nameSubstitution*/ undefined, visitor);
+                            assignment = ts.flattenVariableDestructuringToExpression(decl, hoistVariableDeclaration, /*createAssignmentCallback*/ undefined, visitor);
                         }
                         else {
                             assignment = ts.createBinary(decl.name, 57 /* EqualsToken */, ts.visitNode(decl.initializer, visitor, ts.isExpression));
@@ -47920,7 +49876,7 @@ var ts;
             var declarationList = ts.createVariableDeclarationList(declarations, /*location*/ node);
             ts.setOriginalNode(declarationList, node);
             ts.setCommentRange(declarationList, node);
-            if (node.transformFlags & 8388608 /* ContainsBindingPattern */
+            if (node.transformFlags & 67108864 /* ContainsBindingPattern */
                 && (ts.isBindingPattern(node.declarations[0].name)
                     || ts.isBindingPattern(ts.lastOrUndefined(node.declarations).name))) {
                 // If the first or last declaration is a binding pattern, we need to modify
@@ -47986,8 +49942,8 @@ var ts;
                     && ts.isBlock(enclosingBlockScopeContainer)
                     && ts.isIterationStatement(enclosingBlockScopeContainerParent, /*lookInLabeledStatements*/ false));
             var emitExplicitInitializer = !emittedAsTopLevel
-                && enclosingBlockScopeContainer.kind !== 208 /* ForInStatement */
-                && enclosingBlockScopeContainer.kind !== 209 /* ForOfStatement */
+                && enclosingBlockScopeContainer.kind !== 212 /* ForInStatement */
+                && enclosingBlockScopeContainer.kind !== 213 /* ForOfStatement */
                 && (!resolver.isDeclarationWithCollidingName(node)
                     || (isDeclaredInLoop
                         && !isCapturedInFunction
@@ -48068,118 +50024,7 @@ var ts;
             return convertIterationStatementBodyIfNecessary(node, convertForOfToFor);
         }
         function convertForOfToFor(node, convertedLoopBodyStatements) {
-            // The following ES6 code:
-            //
-            //    for (let v of expr) { }
-            //
-            // should be emitted as
-            //
-            //    for (var _i = 0, _a = expr; _i < _a.length; _i++) {
-            //        var v = _a[_i];
-            //    }
-            //
-            // where _a and _i are temps emitted to capture the RHS and the counter,
-            // respectively.
-            // When the left hand side is an expression instead of a let declaration,
-            // the "let v" is not emitted.
-            // When the left hand side is a let/const, the v is renamed if there is
-            // another v in scope.
-            // Note that all assignments to the LHS are emitted in the body, including
-            // all destructuring.
-            // Note also that because an extra statement is needed to assign to the LHS,
-            // for-of bodies are always emitted as blocks.
-            var expression = ts.visitNode(node.expression, visitor, ts.isExpression);
-            var initializer = node.initializer;
-            var statements = [];
-            // In the case where the user wrote an identifier as the RHS, like this:
-            //
-            //     for (let v of arr) { }
-            //
-            // we don't want to emit a temporary variable for the RHS, just use it directly.
-            var counter = ts.createLoopVariable();
-            var rhsReference = expression.kind === 70 /* Identifier */
-                ? ts.createUniqueName(expression.text)
-                : ts.createTempVariable(/*recordTempVariable*/ undefined);
-            // Initialize LHS
-            // var v = _a[_i];
-            if (ts.isVariableDeclarationList(initializer)) {
-                if (initializer.flags & 3 /* BlockScoped */) {
-                    enableSubstitutionsForBlockScopedBindings();
-                }
-                var firstOriginalDeclaration = ts.firstOrUndefined(initializer.declarations);
-                if (firstOriginalDeclaration && ts.isBindingPattern(firstOriginalDeclaration.name)) {
-                    // This works whether the declaration is a var, let, or const.
-                    // It will use rhsIterationValue _a[_i] as the initializer.
-                    var declarations = ts.flattenVariableDestructuring(firstOriginalDeclaration, ts.createElementAccess(rhsReference, counter), visitor);
-                    var declarationList = ts.createVariableDeclarationList(declarations, /*location*/ initializer);
-                    ts.setOriginalNode(declarationList, initializer);
-                    // Adjust the source map range for the first declaration to align with the old
-                    // emitter.
-                    var firstDeclaration = declarations[0];
-                    var lastDeclaration = ts.lastOrUndefined(declarations);
-                    ts.setSourceMapRange(declarationList, ts.createRange(firstDeclaration.pos, lastDeclaration.end));
-                    statements.push(ts.createVariableStatement(
-                    /*modifiers*/ undefined, declarationList));
-                }
-                else {
-                    // The following call does not include the initializer, so we have
-                    // to emit it separately.
-                    statements.push(ts.createVariableStatement(
-                    /*modifiers*/ undefined, ts.createVariableDeclarationList([
-                        ts.createVariableDeclaration(firstOriginalDeclaration ? firstOriginalDeclaration.name : ts.createTempVariable(/*recordTempVariable*/ undefined), 
-                        /*type*/ undefined, ts.createElementAccess(rhsReference, counter))
-                    ], /*location*/ ts.moveRangePos(initializer, -1)), 
-                    /*location*/ ts.moveRangeEnd(initializer, -1)));
-                }
-            }
-            else {
-                // Initializer is an expression. Emit the expression in the body, so that it's
-                // evaluated on every iteration.
-                var assignment = ts.createAssignment(initializer, ts.createElementAccess(rhsReference, counter));
-                if (ts.isDestructuringAssignment(assignment)) {
-                    // This is a destructuring pattern, so we flatten the destructuring instead.
-                    statements.push(ts.createStatement(ts.flattenDestructuringAssignment(context, assignment, 
-                    /*needsValue*/ false, hoistVariableDeclaration, visitor)));
-                }
-                else {
-                    // Currently there is not way to check that assignment is binary expression of destructing assignment
-                    // so we have to cast never type to binaryExpression
-                    assignment.end = initializer.end;
-                    statements.push(ts.createStatement(assignment, /*location*/ ts.moveRangeEnd(initializer, -1)));
-                }
-            }
-            var bodyLocation;
-            var statementsLocation;
-            if (convertedLoopBodyStatements) {
-                ts.addRange(statements, convertedLoopBodyStatements);
-            }
-            else {
-                var statement = ts.visitNode(node.statement, visitor, ts.isStatement);
-                if (ts.isBlock(statement)) {
-                    ts.addRange(statements, statement.statements);
-                    bodyLocation = statement;
-                    statementsLocation = statement.statements;
-                }
-                else {
-                    statements.push(statement);
-                }
-            }
-            // The old emitter does not emit source maps for the expression
-            ts.setEmitFlags(expression, 1536 /* NoSourceMap */ | ts.getEmitFlags(expression));
-            // The old emitter does not emit source maps for the block.
-            // We add the location to preserve comments.
-            var body = ts.createBlock(ts.createNodeArray(statements, /*location*/ statementsLocation), 
-            /*location*/ bodyLocation);
-            ts.setEmitFlags(body, 1536 /* NoSourceMap */ | 12288 /* NoTokenSourceMaps */);
-            var forStatement = ts.createFor(ts.createVariableDeclarationList([
-                ts.createVariableDeclaration(counter, /*type*/ undefined, ts.createLiteral(0), /*location*/ ts.moveRangePos(node.expression, -1)),
-                ts.createVariableDeclaration(rhsReference, /*type*/ undefined, expression, /*location*/ node.expression)
-            ], /*location*/ node.expression), ts.createLessThan(counter, ts.createPropertyAccess(rhsReference, "length"), 
-            /*location*/ node.expression), ts.createPostfixIncrement(counter, /*location*/ node.expression), body, 
-            /*location*/ node);
-            // Disable trailing source maps for the OpenParenToken to align source map emit with the old emitter.
-            ts.setEmitFlags(forStatement, 8192 /* NoTokenTrailingSourceMaps */);
-            return forStatement;
+            return ts.convertForOf(node, convertedLoopBodyStatements, visitor, enableSubstitutionsForBlockScopedBindings, context, /*transformRest*/ false);
         }
         /**
          * Visits an ObjectLiteralExpression with computed propety names.
@@ -48195,8 +50040,8 @@ var ts;
             var numInitialProperties = numProperties;
             for (var i = 0; i < numProperties; i++) {
                 var property = properties[i];
-                if (property.transformFlags & 16777216 /* ContainsYield */
-                    || property.name.kind === 141 /* ComputedPropertyName */) {
+                if (property.transformFlags & 134217728 /* ContainsYield */
+                    || property.name.kind === 142 /* ComputedPropertyName */) {
                     numInitialProperties = i;
                     break;
                 }
@@ -48262,11 +50107,11 @@ var ts;
             var functionName = ts.createUniqueName("_loop");
             var loopInitializer;
             switch (node.kind) {
-                case 207 /* ForStatement */:
-                case 208 /* ForInStatement */:
-                case 209 /* ForOfStatement */:
+                case 211 /* ForStatement */:
+                case 212 /* ForInStatement */:
+                case 213 /* ForOfStatement */:
                     var initializer = node.initializer;
-                    if (initializer && initializer.kind === 220 /* VariableDeclarationList */) {
+                    if (initializer && initializer.kind === 224 /* VariableDeclarationList */) {
                         loopInitializer = initializer;
                     }
                     break;
@@ -48315,7 +50160,7 @@ var ts;
             }
             var isAsyncBlockContainingAwait = enclosingNonArrowFunction
                 && (ts.getEmitFlags(enclosingNonArrowFunction) & 2097152 /* AsyncFunctionBody */) !== 0
-                && (node.statement.transformFlags & 16777216 /* ContainsYield */) !== 0;
+                && (node.statement.transformFlags & 134217728 /* ContainsYield */) !== 0;
             var loopBodyFlags = 0;
             if (currentState.containsLexicalThis) {
                 loopBodyFlags |= 256 /* CapturesThis */;
@@ -48324,14 +50169,14 @@ var ts;
                 loopBodyFlags |= 2097152 /* AsyncFunctionBody */;
             }
             var convertedLoopVariable = ts.createVariableStatement(
-            /*modifiers*/ undefined, ts.createVariableDeclarationList([
+            /*modifiers*/ undefined, ts.setEmitFlags(ts.createVariableDeclarationList([
                 ts.createVariableDeclaration(functionName, 
                 /*type*/ undefined, ts.setEmitFlags(ts.createFunctionExpression(
                 /*modifiers*/ undefined, isAsyncBlockContainingAwait ? ts.createToken(38 /* AsteriskToken */) : undefined, 
                 /*name*/ undefined, 
                 /*typeParameters*/ undefined, loopParameters, 
                 /*type*/ undefined, loopBody), loopBodyFlags))
-            ]));
+            ]), 16777216 /* NoHoisting */));
             var statements = [convertedLoopVariable];
             var extraVariableDeclarations;
             // propagate state from the inner loop to the outer loop if necessary
@@ -48413,7 +50258,7 @@ var ts;
                 loop.transformFlags = 0;
                 ts.aggregateTransformFlags(loop);
             }
-            statements.push(currentParent.kind === 215 /* LabeledStatement */
+            statements.push(currentParent.kind === 219 /* LabeledStatement */
                 ? ts.createLabel(currentParent.label, loop)
                 : loop);
             return statements;
@@ -48519,7 +50364,7 @@ var ts;
                 }
             }
             else {
-                loopParameters.push(ts.createParameter(name));
+                loopParameters.push(ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, name));
                 if (resolver.getNodeCheckFlags(decl) & 2097152 /* NeedsLoopOutParameter */) {
                     var outParamName = ts.createUniqueName("out_" + name.text);
                     loopOutParameters.push({ originalName: name, outParamName: outParamName });
@@ -48541,20 +50386,20 @@ var ts;
             for (var i = start; i < numProperties; i++) {
                 var property = properties[i];
                 switch (property.kind) {
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* SetAccessor */:
                         var accessors = ts.getAllAccessorDeclarations(node.properties, property);
                         if (property === accessors.firstAccessor) {
                             expressions.push(transformAccessorsToExpression(receiver, accessors, node.multiLine));
                         }
                         break;
-                    case 253 /* PropertyAssignment */:
+                    case 257 /* PropertyAssignment */:
                         expressions.push(transformPropertyAssignmentToExpression(property, receiver, node.multiLine));
                         break;
-                    case 254 /* ShorthandPropertyAssignment */:
+                    case 258 /* ShorthandPropertyAssignment */:
                         expressions.push(transformShorthandPropertyAssignmentToExpression(property, receiver, node.multiLine));
                         break;
-                    case 148 /* MethodDeclaration */:
+                    case 149 /* MethodDeclaration */:
                         expressions.push(transformObjectLiteralMethodDeclarationToExpression(property, receiver, node.multiLine));
                         break;
                     default:
@@ -48608,6 +50453,19 @@ var ts;
             }
             return expression;
         }
+        function visitCatchClause(node) {
+            ts.Debug.assert(ts.isBindingPattern(node.variableDeclaration.name));
+            var temp = ts.createTempVariable(undefined);
+            var newVariableDeclaration = ts.createVariableDeclaration(temp, undefined, undefined, node.variableDeclaration);
+            var vars = ts.flattenVariableDestructuring(node.variableDeclaration, temp, visitor);
+            var list = ts.createVariableDeclarationList(vars, /*location*/ node.variableDeclaration, /*flags*/ node.variableDeclaration.flags);
+            var destructure = ts.createVariableStatement(undefined, list);
+            return ts.updateCatchClause(node, newVariableDeclaration, addStatementToStartOfBlock(node.block, destructure));
+        }
+        function addStatementToStartOfBlock(block, statement) {
+            var transformedStatements = ts.visitNodes(block.statements, visitor, ts.isStatement);
+            return ts.updateBlock(block, [statement].concat(transformedStatements));
+        }
         /**
          * Visits a MethodDeclaration of an ObjectLiteralExpression and transforms it into a
          * PropertyAssignment.
@@ -48670,7 +50528,7 @@ var ts;
                 ts.setEmitFlags(thisArg, 128 /* NoSubstitution */);
             }
             var resultingCall;
-            if (node.transformFlags & 1048576 /* ContainsSpreadElementExpression */) {
+            if (node.transformFlags & 8388608 /* ContainsSpreadExpression */) {
                 // [source]
                 //      f(...a, b)
                 //      x.m(...a, b)
@@ -48716,7 +50574,7 @@ var ts;
          */
         function visitNewExpression(node) {
             // We are here because we contain a SpreadElementExpression.
-            ts.Debug.assert((node.transformFlags & 1048576 /* ContainsSpreadElementExpression */) !== 0);
+            ts.Debug.assert((node.transformFlags & 8388608 /* ContainsSpreadExpression */) !== 0);
             // [source]
             //      new C(...a)
             //
@@ -48727,7 +50585,7 @@ var ts;
             /*typeArguments*/ undefined, []);
         }
         /**
-         * Transforms an array of Expression nodes that contains a SpreadElementExpression.
+         * Transforms an array of Expression nodes that contains a SpreadExpression.
          *
          * @param elements The array of Expression nodes.
          * @param needsUniqueCopy A value indicating whether to ensure that the result is a fresh array.
@@ -48742,36 +50600,36 @@ var ts;
             // Map spans of spread expressions into their expressions and spans of other
             // expressions into an array literal.
             var numElements = elements.length;
-            var segments = ts.flatten(ts.spanMap(elements, partitionSpreadElement, function (partition, visitPartition, _start, end) {
+            var segments = ts.flatten(ts.spanMap(elements, partitionSpread, function (partition, visitPartition, _start, end) {
                 return visitPartition(partition, multiLine, hasTrailingComma && end === numElements);
             }));
             if (segments.length === 1) {
                 var firstElement = elements[0];
-                return needsUniqueCopy && ts.isSpreadElementExpression(firstElement) && firstElement.expression.kind !== 171 /* ArrayLiteralExpression */
+                return needsUniqueCopy && ts.isSpreadExpression(firstElement) && firstElement.expression.kind !== 175 /* ArrayLiteralExpression */
                     ? ts.createArraySlice(segments[0])
                     : segments[0];
             }
             // Rewrite using the pattern <segment0>.concat(<segment1>, <segment2>, ...)
             return ts.createArrayConcat(segments.shift(), segments);
         }
-        function partitionSpreadElement(node) {
-            return ts.isSpreadElementExpression(node)
-                ? visitSpanOfSpreadElements
-                : visitSpanOfNonSpreadElements;
+        function partitionSpread(node) {
+            return ts.isSpreadExpression(node)
+                ? visitSpanOfSpreads
+                : visitSpanOfNonSpreads;
         }
-        function visitSpanOfSpreadElements(chunk) {
-            return ts.map(chunk, visitExpressionOfSpreadElement);
+        function visitSpanOfSpreads(chunk) {
+            return ts.map(chunk, visitExpressionOfSpread);
         }
-        function visitSpanOfNonSpreadElements(chunk, multiLine, hasTrailingComma) {
+        function visitSpanOfNonSpreads(chunk, multiLine, hasTrailingComma) {
             return ts.createArrayLiteral(ts.visitNodes(ts.createNodeArray(chunk, /*location*/ undefined, hasTrailingComma), visitor, ts.isExpression), 
             /*location*/ undefined, multiLine);
         }
         /**
-         * Transforms the expression of a SpreadElementExpression node.
+         * Transforms the expression of a SpreadExpression node.
          *
-         * @param node A SpreadElementExpression node.
+         * @param node A SpreadExpression node.
          */
-        function visitExpressionOfSpreadElement(node) {
+        function visitExpressionOfSpread(node) {
             return ts.visitNode(node.expression, visitor, ts.isExpression);
         }
         /**
@@ -48928,7 +50786,7 @@ var ts;
             return enclosingNonAsyncFunctionBody
                 && ts.isClassElement(enclosingNonAsyncFunctionBody)
                 && !ts.hasModifier(enclosingNonAsyncFunctionBody, 32 /* Static */)
-                && currentParent.kind !== 175 /* CallExpression */
+                && currentParent.kind !== 179 /* CallExpression */
                 ? ts.createPropertyAccess(ts.createIdentifier("_super"), "prototype")
                 : ts.createIdentifier("_super");
         }
@@ -48937,7 +50795,7 @@ var ts;
             var statements = [];
             startLexicalEnvironment();
             ts.addRange(statements, prologue);
-            addCaptureThisForNodeIfNeeded(statements, node);
+            ts.addCaptureThisForNodeIfNeeded(statements, node, enableSubstitutionsForCapturedThis);
             ts.addRange(statements, ts.visitNodes(ts.createNodeArray(remaining), visitor, ts.isStatement));
             ts.addRange(statements, endLexicalEnvironment());
             var clone = ts.getMutableClone(node);
@@ -48976,21 +50834,20 @@ var ts;
             if ((enabledSubstitutions & 1 /* CapturedThis */) === 0) {
                 enabledSubstitutions |= 1 /* CapturedThis */;
                 context.enableSubstitution(98 /* ThisKeyword */);
-                context.enableEmitNotification(149 /* Constructor */);
-                context.enableEmitNotification(148 /* MethodDeclaration */);
-                context.enableEmitNotification(150 /* GetAccessor */);
-                context.enableEmitNotification(151 /* SetAccessor */);
-                context.enableEmitNotification(181 /* ArrowFunction */);
-                context.enableEmitNotification(180 /* FunctionExpression */);
-                context.enableEmitNotification(221 /* FunctionDeclaration */);
+                context.enableEmitNotification(150 /* Constructor */);
+                context.enableEmitNotification(149 /* MethodDeclaration */);
+                context.enableEmitNotification(151 /* GetAccessor */);
+                context.enableEmitNotification(152 /* SetAccessor */);
+                context.enableEmitNotification(185 /* ArrowFunction */);
+                context.enableEmitNotification(184 /* FunctionExpression */);
+                context.enableEmitNotification(225 /* FunctionDeclaration */);
             }
         }
         /**
          * Hooks node substitutions.
          *
+         * @param emitContext The context for the emitter.
          * @param node The node to substitute.
-         * @param isExpression A value indicating whether the node is to be used in an expression
-         *                     position.
          */
         function onSubstituteNode(emitContext, node) {
             node = previousOnSubstituteNode(emitContext, node);
@@ -49025,10 +50882,10 @@ var ts;
         function isNameOfDeclarationWithCollidingName(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 170 /* BindingElement */:
-                case 222 /* ClassDeclaration */:
-                case 225 /* EnumDeclaration */:
-                case 219 /* VariableDeclaration */:
+                case 174 /* BindingElement */:
+                case 226 /* ClassDeclaration */:
+                case 229 /* EnumDeclaration */:
+                case 223 /* VariableDeclaration */:
                     return parent.name === node
                         && resolver.isDeclarationWithCollidingName(parent);
             }
@@ -49075,44 +50932,8 @@ var ts;
             }
             return node;
         }
-        /**
-         * Gets the local name for a declaration for use in expressions.
-         *
-         * A local name will *never* be prefixed with an module or namespace export modifier like
-         * "exports.".
-         *
-         * @param node The declaration.
-         * @param allowComments A value indicating whether comments may be emitted for the name.
-         * @param allowSourceMaps A value indicating whether source maps may be emitted for the name.
-         */
-        function getLocalName(node, allowComments, allowSourceMaps) {
-            return getDeclarationName(node, allowComments, allowSourceMaps, 262144 /* LocalName */);
-        }
-        /**
-         * Gets the name of a declaration, without source map or comments.
-         *
-         * @param node The declaration.
-         * @param allowComments Allow comments for the name.
-         */
-        function getDeclarationName(node, allowComments, allowSourceMaps, emitFlags) {
-            if (node.name && !ts.isGeneratedIdentifier(node.name)) {
-                var name_33 = ts.getMutableClone(node.name);
-                emitFlags |= ts.getEmitFlags(node.name);
-                if (!allowSourceMaps) {
-                    emitFlags |= 1536 /* NoSourceMap */;
-                }
-                if (!allowComments) {
-                    emitFlags |= 49152 /* NoComments */;
-                }
-                if (emitFlags) {
-                    ts.setEmitFlags(name_33, emitFlags);
-                }
-                return name_33;
-            }
-            return ts.getGeneratedNameForNode(node);
-        }
         function getClassMemberPrefix(node, member) {
-            var expression = getLocalName(node);
+            var expression = ts.getLocalName(node);
             return ts.hasModifier(member, 32 /* Static */) ? expression : ts.createPropertyAccess(expression, "prototype");
         }
         function hasSynthesizedDefaultSuperCall(constructor, hasExtendsClause) {
@@ -49124,11 +50945,11 @@ var ts;
                 return false;
             }
             var statement = ts.firstOrUndefined(constructor.body.statements);
-            if (!statement || !ts.nodeIsSynthesized(statement) || statement.kind !== 203 /* ExpressionStatement */) {
+            if (!statement || !ts.nodeIsSynthesized(statement) || statement.kind !== 207 /* ExpressionStatement */) {
                 return false;
             }
             var statementExpression = statement.expression;
-            if (!ts.nodeIsSynthesized(statementExpression) || statementExpression.kind !== 175 /* CallExpression */) {
+            if (!ts.nodeIsSynthesized(statementExpression) || statementExpression.kind !== 179 /* CallExpression */) {
                 return false;
             }
             var callTarget = statementExpression.expression;
@@ -49136,7 +50957,7 @@ var ts;
                 return false;
             }
             var callArgument = ts.singleOrUndefined(statementExpression.arguments);
-            if (!callArgument || !ts.nodeIsSynthesized(callArgument) || callArgument.kind !== 192 /* SpreadElementExpression */) {
+            if (!callArgument || !ts.nodeIsSynthesized(callArgument) || callArgument.kind !== 196 /* SpreadElement */) {
                 return false;
             }
             var expression = callArgument.expression;
@@ -49378,7 +51199,7 @@ var ts;
             if (ts.isDeclarationFile(node)) {
                 return node;
             }
-            if (node.transformFlags & 4096 /* ContainsGenerator */) {
+            if (node.transformFlags & 8192 /* ContainsGenerator */) {
                 currentSourceFile = node;
                 node = ts.visitEachChild(node, visitor, context);
                 currentSourceFile = undefined;
@@ -49398,10 +51219,10 @@ var ts;
             else if (inGeneratorFunctionBody) {
                 return visitJavaScriptInGeneratorFunctionBody(node);
             }
-            else if (transformFlags & 2048 /* Generator */) {
+            else if (transformFlags & 4096 /* Generator */) {
                 return visitGenerator(node);
             }
-            else if (transformFlags & 4096 /* ContainsGenerator */) {
+            else if (transformFlags & 8192 /* ContainsGenerator */) {
                 return ts.visitEachChild(node, visitor, context);
             }
             else {
@@ -49415,13 +51236,13 @@ var ts;
          */
         function visitJavaScriptInStatementContainingYield(node) {
             switch (node.kind) {
-                case 205 /* DoStatement */:
+                case 209 /* DoStatement */:
                     return visitDoStatement(node);
-                case 206 /* WhileStatement */:
+                case 210 /* WhileStatement */:
                     return visitWhileStatement(node);
-                case 214 /* SwitchStatement */:
+                case 218 /* SwitchStatement */:
                     return visitSwitchStatement(node);
-                case 215 /* LabeledStatement */:
+                case 219 /* LabeledStatement */:
                     return visitLabeledStatement(node);
                 default:
                     return visitJavaScriptInGeneratorFunctionBody(node);
@@ -49434,30 +51255,30 @@ var ts;
          */
         function visitJavaScriptInGeneratorFunctionBody(node) {
             switch (node.kind) {
-                case 221 /* FunctionDeclaration */:
+                case 225 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 180 /* FunctionExpression */:
+                case 184 /* FunctionExpression */:
                     return visitFunctionExpression(node);
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
                     return visitAccessorDeclaration(node);
-                case 201 /* VariableStatement */:
+                case 205 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 207 /* ForStatement */:
+                case 211 /* ForStatement */:
                     return visitForStatement(node);
-                case 208 /* ForInStatement */:
+                case 212 /* ForInStatement */:
                     return visitForInStatement(node);
-                case 211 /* BreakStatement */:
+                case 215 /* BreakStatement */:
                     return visitBreakStatement(node);
-                case 210 /* ContinueStatement */:
+                case 214 /* ContinueStatement */:
                     return visitContinueStatement(node);
-                case 212 /* ReturnStatement */:
+                case 216 /* ReturnStatement */:
                     return visitReturnStatement(node);
                 default:
-                    if (node.transformFlags & 16777216 /* ContainsYield */) {
+                    if (node.transformFlags & 134217728 /* ContainsYield */) {
                         return visitJavaScriptContainingYield(node);
                     }
-                    else if (node.transformFlags & (4096 /* ContainsGenerator */ | 33554432 /* ContainsHoistedDeclarationOrCompletion */)) {
+                    else if (node.transformFlags & (8192 /* ContainsGenerator */ | 268435456 /* ContainsHoistedDeclarationOrCompletion */)) {
                         return ts.visitEachChild(node, visitor, context);
                     }
                     else {
@@ -49472,21 +51293,21 @@ var ts;
          */
         function visitJavaScriptContainingYield(node) {
             switch (node.kind) {
-                case 188 /* BinaryExpression */:
+                case 192 /* BinaryExpression */:
                     return visitBinaryExpression(node);
-                case 189 /* ConditionalExpression */:
+                case 193 /* ConditionalExpression */:
                     return visitConditionalExpression(node);
-                case 191 /* YieldExpression */:
+                case 195 /* YieldExpression */:
                     return visitYieldExpression(node);
-                case 171 /* ArrayLiteralExpression */:
+                case 175 /* ArrayLiteralExpression */:
                     return visitArrayLiteralExpression(node);
-                case 172 /* ObjectLiteralExpression */:
+                case 176 /* ObjectLiteralExpression */:
                     return visitObjectLiteralExpression(node);
-                case 174 /* ElementAccessExpression */:
+                case 178 /* ElementAccessExpression */:
                     return visitElementAccessExpression(node);
-                case 175 /* CallExpression */:
+                case 179 /* CallExpression */:
                     return visitCallExpression(node);
-                case 176 /* NewExpression */:
+                case 180 /* NewExpression */:
                     return visitNewExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -49499,9 +51320,9 @@ var ts;
          */
         function visitGenerator(node) {
             switch (node.kind) {
-                case 221 /* FunctionDeclaration */:
+                case 225 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 180 /* FunctionExpression */:
+                case 184 /* FunctionExpression */:
                     return visitFunctionExpression(node);
                 default:
                     ts.Debug.failBadSyntaxKind(node);
@@ -49662,7 +51483,7 @@ var ts;
          * @param node The node to visit.
          */
         function visitVariableStatement(node) {
-            if (node.transformFlags & 16777216 /* ContainsYield */) {
+            if (node.transformFlags & 134217728 /* ContainsYield */) {
                 transformAndEmitVariableDeclarationList(node.declarationList);
                 return undefined;
             }
@@ -49730,7 +51551,7 @@ var ts;
             if (containsYield(right)) {
                 var target = void 0;
                 switch (left.kind) {
-                    case 173 /* PropertyAccessExpression */:
+                    case 177 /* PropertyAccessExpression */:
                         // [source]
                         //      a.b = yield;
                         //
@@ -49742,7 +51563,7 @@ var ts;
                         //      _a.b = %sent%;
                         target = ts.updatePropertyAccess(left, cacheExpression(ts.visitNode(left.expression, visitor, ts.isLeftHandSideExpression)), left.name);
                         break;
-                    case 174 /* ElementAccessExpression */:
+                    case 178 /* ElementAccessExpression */:
                         // [source]
                         //      a[b] = yield;
                         //
@@ -50111,35 +51932,35 @@ var ts;
         }
         function transformAndEmitStatementWorker(node) {
             switch (node.kind) {
-                case 200 /* Block */:
+                case 204 /* Block */:
                     return transformAndEmitBlock(node);
-                case 203 /* ExpressionStatement */:
+                case 207 /* ExpressionStatement */:
                     return transformAndEmitExpressionStatement(node);
-                case 204 /* IfStatement */:
+                case 208 /* IfStatement */:
                     return transformAndEmitIfStatement(node);
-                case 205 /* DoStatement */:
+                case 209 /* DoStatement */:
                     return transformAndEmitDoStatement(node);
-                case 206 /* WhileStatement */:
+                case 210 /* WhileStatement */:
                     return transformAndEmitWhileStatement(node);
-                case 207 /* ForStatement */:
+                case 211 /* ForStatement */:
                     return transformAndEmitForStatement(node);
-                case 208 /* ForInStatement */:
+                case 212 /* ForInStatement */:
                     return transformAndEmitForInStatement(node);
-                case 210 /* ContinueStatement */:
+                case 214 /* ContinueStatement */:
                     return transformAndEmitContinueStatement(node);
-                case 211 /* BreakStatement */:
+                case 215 /* BreakStatement */:
                     return transformAndEmitBreakStatement(node);
-                case 212 /* ReturnStatement */:
+                case 216 /* ReturnStatement */:
                     return transformAndEmitReturnStatement(node);
-                case 213 /* WithStatement */:
+                case 217 /* WithStatement */:
                     return transformAndEmitWithStatement(node);
-                case 214 /* SwitchStatement */:
+                case 218 /* SwitchStatement */:
                     return transformAndEmitSwitchStatement(node);
-                case 215 /* LabeledStatement */:
+                case 219 /* LabeledStatement */:
                     return transformAndEmitLabeledStatement(node);
-                case 216 /* ThrowStatement */:
+                case 220 /* ThrowStatement */:
                     return transformAndEmitThrowStatement(node);
-                case 217 /* TryStatement */:
+                case 221 /* TryStatement */:
                     return transformAndEmitTryStatement(node);
                 default:
                     return emitStatement(ts.visitNode(node, visitor, ts.isStatement, /*optional*/ true));
@@ -50559,7 +52380,7 @@ var ts;
                 for (var i = 0; i < numClauses; i++) {
                     var clause = caseBlock.clauses[i];
                     clauseLabels.push(defineLabel());
-                    if (clause.kind === 250 /* DefaultClause */ && defaultClauseIndex === -1) {
+                    if (clause.kind === 254 /* DefaultClause */ && defaultClauseIndex === -1) {
                         defaultClauseIndex = i;
                     }
                 }
@@ -50572,7 +52393,7 @@ var ts;
                     var defaultClausesSkipped = 0;
                     for (var i = clausesWritten; i < numClauses; i++) {
                         var clause = caseBlock.clauses[i];
-                        if (clause.kind === 249 /* CaseClause */) {
+                        if (clause.kind === 253 /* CaseClause */) {
                             var caseClause = clause;
                             if (containsYield(caseClause.expression) && pendingClauses.length > 0) {
                                 break;
@@ -50703,7 +52524,7 @@ var ts;
             }
         }
         function containsYield(node) {
-            return node && (node.transformFlags & 16777216 /* ContainsYield */) !== 0;
+            return node && (node.transformFlags & 134217728 /* ContainsYield */) !== 0;
         }
         function countInitialNodesWithoutYield(nodes) {
             var numNodes = nodes.length;
@@ -50733,9 +52554,9 @@ var ts;
                 if (ts.isIdentifier(original) && original.parent) {
                     var declaration = resolver.getReferencedValueDeclaration(original);
                     if (declaration) {
-                        var name_34 = ts.getProperty(renamedCatchVariableDeclarations, String(ts.getOriginalNodeId(declaration)));
-                        if (name_34) {
-                            var clone_8 = ts.getMutableClone(name_34);
+                        var name_35 = ts.getProperty(renamedCatchVariableDeclarations, String(ts.getOriginalNodeId(declaration)));
+                        if (name_35) {
+                            var clone_8 = ts.getMutableClone(name_35);
                             ts.setSourceMapRange(clone_8, node);
                             ts.setCommentRange(clone_8, node);
                             return clone_8;
@@ -51137,7 +52958,7 @@ var ts;
                 if (labelExpressions === undefined) {
                     labelExpressions = [];
                 }
-                var expression = ts.createSynthesizedNode(8 /* NumericLiteral */);
+                var expression = ts.createLiteral(-1);
                 if (labelExpressions[label] === undefined) {
                     labelExpressions[label] = [expression];
                 }
@@ -51146,7 +52967,7 @@ var ts;
                 }
                 return expression;
             }
-            return ts.createNode(194 /* OmittedExpression */);
+            return ts.createOmittedExpression();
         }
         /**
          * Creates a numeric literal for the provided instruction.
@@ -51331,7 +53152,7 @@ var ts;
                 /*modifiers*/ undefined, 
                 /*asteriskToken*/ undefined, 
                 /*name*/ undefined, 
-                /*typeParameters*/ undefined, [ts.createParameter(state)], 
+                /*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, state)], 
                 /*type*/ undefined, ts.createBlock(buildResult, 
                 /*location*/ undefined, 
                 /*multiLine*/ buildResult.length > 0)), 4194304 /* ReuseTempVariableScope */)
@@ -51708,1909 +53529,6 @@ var ts;
     ts.transformGenerators = transformGenerators;
     var _a;
 })(ts || (ts = {}));
-/// <reference path="../../factory.ts" />
-/// <reference path="../../visitor.ts" />
-/*@internal*/
-var ts;
-(function (ts) {
-    function transformModule(context) {
-        var transformModuleDelegates = ts.createMap((_a = {},
-            _a[ts.ModuleKind.None] = transformCommonJSModule,
-            _a[ts.ModuleKind.CommonJS] = transformCommonJSModule,
-            _a[ts.ModuleKind.AMD] = transformAMDModule,
-            _a[ts.ModuleKind.UMD] = transformUMDModule,
-            _a));
-        var startLexicalEnvironment = context.startLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration;
-        var compilerOptions = context.getCompilerOptions();
-        var resolver = context.getEmitResolver();
-        var host = context.getEmitHost();
-        var languageVersion = ts.getEmitScriptTarget(compilerOptions);
-        var moduleKind = ts.getEmitModuleKind(compilerOptions);
-        var previousOnSubstituteNode = context.onSubstituteNode;
-        var previousOnEmitNode = context.onEmitNode;
-        context.onSubstituteNode = onSubstituteNode;
-        context.onEmitNode = onEmitNode;
-        context.enableSubstitution(70 /* Identifier */);
-        context.enableSubstitution(188 /* BinaryExpression */);
-        context.enableSubstitution(186 /* PrefixUnaryExpression */);
-        context.enableSubstitution(187 /* PostfixUnaryExpression */);
-        context.enableSubstitution(254 /* ShorthandPropertyAssignment */);
-        context.enableEmitNotification(256 /* SourceFile */);
-        var currentSourceFile;
-        var externalImports;
-        var exportSpecifiers;
-        var exportEquals;
-        var bindingNameExportSpecifiersMap;
-        // Subset of exportSpecifiers that is a binding-name.
-        // This is to reduce amount of memory we have to keep around even after we done with module-transformer
-        var bindingNameExportSpecifiersForFileMap = ts.createMap();
-        var hasExportStarsToExportValues;
-        return transformSourceFile;
-        /**
-         * Transforms the module aspects of a SourceFile.
-         *
-         * @param node The SourceFile node.
-         */
-        function transformSourceFile(node) {
-            if (ts.isDeclarationFile(node)) {
-                return node;
-            }
-            if (ts.isExternalModule(node) || compilerOptions.isolatedModules) {
-                currentSourceFile = node;
-                // Collect information about the external module.
-                (_a = ts.collectExternalModuleInfo(node), externalImports = _a.externalImports, exportSpecifiers = _a.exportSpecifiers, exportEquals = _a.exportEquals, hasExportStarsToExportValues = _a.hasExportStarsToExportValues, _a);
-                // Perform the transformation.
-                var transformModule_1 = transformModuleDelegates[moduleKind] || transformModuleDelegates[ts.ModuleKind.None];
-                var updated = transformModule_1(node);
-                ts.aggregateTransformFlags(updated);
-                currentSourceFile = undefined;
-                externalImports = undefined;
-                exportSpecifiers = undefined;
-                exportEquals = undefined;
-                hasExportStarsToExportValues = false;
-                return updated;
-            }
-            return node;
-            var _a;
-        }
-        /**
-         * Transforms a SourceFile into a CommonJS module.
-         *
-         * @param node The SourceFile node.
-         */
-        function transformCommonJSModule(node) {
-            startLexicalEnvironment();
-            var statements = [];
-            var statementOffset = ts.addPrologueDirectives(statements, node.statements, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict, visitor);
-            ts.addRange(statements, ts.visitNodes(node.statements, visitor, ts.isStatement, statementOffset));
-            ts.addRange(statements, endLexicalEnvironment());
-            addExportEqualsIfNeeded(statements, /*emitAsReturn*/ false);
-            var updated = updateSourceFile(node, statements);
-            if (hasExportStarsToExportValues) {
-                ts.setEmitFlags(updated, 2 /* EmitExportStar */ | ts.getEmitFlags(node));
-            }
-            return updated;
-        }
-        /**
-         * Transforms a SourceFile into an AMD module.
-         *
-         * @param node The SourceFile node.
-         */
-        function transformAMDModule(node) {
-            var define = ts.createIdentifier("define");
-            var moduleName = ts.tryGetModuleNameFromFile(node, host, compilerOptions);
-            return transformAsynchronousModule(node, define, moduleName, /*includeNonAmdDependencies*/ true);
-        }
-        /**
-         * Transforms a SourceFile into a UMD module.
-         *
-         * @param node The SourceFile node.
-         */
-        function transformUMDModule(node) {
-            var define = ts.createIdentifier("define");
-            ts.setEmitFlags(define, 16 /* UMDDefine */);
-            return transformAsynchronousModule(node, define, /*moduleName*/ undefined, /*includeNonAmdDependencies*/ false);
-        }
-        /**
-         * Transforms a SourceFile into an AMD or UMD module.
-         *
-         * @param node The SourceFile node.
-         * @param define The expression used to define the module.
-         * @param moduleName An expression for the module name, if available.
-         * @param includeNonAmdDependencies A value indicating whether to incldue any non-AMD dependencies.
-         */
-        function transformAsynchronousModule(node, define, moduleName, includeNonAmdDependencies) {
-            // An AMD define function has the following shape:
-            //
-            //     define(id?, dependencies?, factory);
-            //
-            // This has the shape of the following:
-            //
-            //     define(name, ["module1", "module2"], function (module1Alias) { ... }
-            //
-            // The location of the alias in the parameter list in the factory function needs to
-            // match the position of the module name in the dependency list.
-            //
-            // To ensure this is true in cases of modules with no aliases, e.g.:
-            //
-            //     import "module"
-            //
-            // or
-            //
-            //     /// <amd-dependency path= "a.css" />
-            //
-            // we need to add modules without alias names to the end of the dependencies list
-            var _a = collectAsynchronousDependencies(node, includeNonAmdDependencies), aliasedModuleNames = _a.aliasedModuleNames, unaliasedModuleNames = _a.unaliasedModuleNames, importAliasNames = _a.importAliasNames;
-            // Create an updated SourceFile:
-            //
-            //     define(moduleName?, ["module1", "module2"], function ...
-            return updateSourceFile(node, [
-                ts.createStatement(ts.createCall(define, 
-                /*typeArguments*/ undefined, (moduleName ? [moduleName] : []).concat([
-                    // Add the dependency array argument:
-                    //
-                    //     ["require", "exports", module1", "module2", ...]
-                    ts.createArrayLiteral([
-                        ts.createLiteral("require"),
-                        ts.createLiteral("exports")
-                    ].concat(aliasedModuleNames, unaliasedModuleNames)),
-                    // Add the module body function argument:
-                    //
-                    //     function (require, exports, module1, module2) ...
-                    ts.createFunctionExpression(
-                    /*modifiers*/ undefined, 
-                    /*asteriskToken*/ undefined, 
-                    /*name*/ undefined, 
-                    /*typeParameters*/ undefined, [
-                        ts.createParameter("require"),
-                        ts.createParameter("exports")
-                    ].concat(importAliasNames), 
-                    /*type*/ undefined, transformAsynchronousModuleBody(node))
-                ])))
-            ]);
-        }
-        /**
-         * Transforms a SourceFile into an AMD or UMD module body.
-         *
-         * @param node The SourceFile node.
-         */
-        function transformAsynchronousModuleBody(node) {
-            startLexicalEnvironment();
-            var statements = [];
-            var statementOffset = ts.addPrologueDirectives(statements, node.statements, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict, visitor);
-            // Visit each statement of the module body.
-            ts.addRange(statements, ts.visitNodes(node.statements, visitor, ts.isStatement, statementOffset));
-            // End the lexical environment for the module body
-            // and merge any new lexical declarations.
-            ts.addRange(statements, endLexicalEnvironment());
-            // Append the 'export =' statement if provided.
-            addExportEqualsIfNeeded(statements, /*emitAsReturn*/ true);
-            var body = ts.createBlock(statements, /*location*/ undefined, /*multiLine*/ true);
-            if (hasExportStarsToExportValues) {
-                // If we have any `export * from ...` declarations
-                // we need to inform the emitter to add the __export helper.
-                ts.setEmitFlags(body, 2 /* EmitExportStar */);
-            }
-            return body;
-        }
-        function addExportEqualsIfNeeded(statements, emitAsReturn) {
-            if (exportEquals) {
-                if (emitAsReturn) {
-                    var statement = ts.createReturn(exportEquals.expression, 
-                    /*location*/ exportEquals);
-                    ts.setEmitFlags(statement, 12288 /* NoTokenSourceMaps */ | 49152 /* NoComments */);
-                    statements.push(statement);
-                }
-                else {
-                    var statement = ts.createStatement(ts.createAssignment(ts.createPropertyAccess(ts.createIdentifier("module"), "exports"), exportEquals.expression), 
-                    /*location*/ exportEquals);
-                    ts.setEmitFlags(statement, 49152 /* NoComments */);
-                    statements.push(statement);
-                }
-            }
-        }
-        /**
-         * Visits a node at the top level of the source file.
-         *
-         * @param node The node.
-         */
-        function visitor(node) {
-            switch (node.kind) {
-                case 231 /* ImportDeclaration */:
-                    return visitImportDeclaration(node);
-                case 230 /* ImportEqualsDeclaration */:
-                    return visitImportEqualsDeclaration(node);
-                case 237 /* ExportDeclaration */:
-                    return visitExportDeclaration(node);
-                case 236 /* ExportAssignment */:
-                    return visitExportAssignment(node);
-                case 201 /* VariableStatement */:
-                    return visitVariableStatement(node);
-                case 221 /* FunctionDeclaration */:
-                    return visitFunctionDeclaration(node);
-                case 222 /* ClassDeclaration */:
-                    return visitClassDeclaration(node);
-                case 203 /* ExpressionStatement */:
-                    return visitExpressionStatement(node);
-                default:
-                    // This visitor does not descend into the tree, as export/import statements
-                    // are only transformed at the top level of a file.
-                    return node;
-            }
-        }
-        /**
-         * Visits an ImportDeclaration node.
-         *
-         * @param node The ImportDeclaration node.
-         */
-        function visitImportDeclaration(node) {
-            if (!ts.contains(externalImports, node)) {
-                return undefined;
-            }
-            var statements = [];
-            var namespaceDeclaration = ts.getNamespaceDeclarationNode(node);
-            if (moduleKind !== ts.ModuleKind.AMD) {
-                if (!node.importClause) {
-                    // import "mod";
-                    statements.push(ts.createStatement(createRequireCall(node), 
-                    /*location*/ node));
-                }
-                else {
-                    var variables = [];
-                    if (namespaceDeclaration && !ts.isDefaultImport(node)) {
-                        // import * as n from "mod";
-                        variables.push(ts.createVariableDeclaration(ts.getSynthesizedClone(namespaceDeclaration.name), 
-                        /*type*/ undefined, createRequireCall(node)));
-                    }
-                    else {
-                        // import d from "mod";
-                        // import { x, y } from "mod";
-                        // import d, { x, y } from "mod";
-                        // import d, * as n from "mod";
-                        variables.push(ts.createVariableDeclaration(ts.getGeneratedNameForNode(node), 
-                        /*type*/ undefined, createRequireCall(node)));
-                        if (namespaceDeclaration && ts.isDefaultImport(node)) {
-                            variables.push(ts.createVariableDeclaration(ts.getSynthesizedClone(namespaceDeclaration.name), 
-                            /*type*/ undefined, ts.getGeneratedNameForNode(node)));
-                        }
-                    }
-                    statements.push(ts.createVariableStatement(
-                    /*modifiers*/ undefined, ts.createConstDeclarationList(variables), 
-                    /*location*/ node));
-                }
-            }
-            else if (namespaceDeclaration && ts.isDefaultImport(node)) {
-                // import d, * as n from "mod";
-                statements.push(ts.createVariableStatement(
-                /*modifiers*/ undefined, ts.createVariableDeclarationList([
-                    ts.createVariableDeclaration(ts.getSynthesizedClone(namespaceDeclaration.name), 
-                    /*type*/ undefined, ts.getGeneratedNameForNode(node), 
-                    /*location*/ node)
-                ])));
-            }
-            addExportImportAssignments(statements, node);
-            return ts.singleOrMany(statements);
-        }
-        function visitImportEqualsDeclaration(node) {
-            if (!ts.contains(externalImports, node)) {
-                return undefined;
-            }
-            // Set emitFlags on the name of the importEqualsDeclaration
-            // This is so the printer will not substitute the identifier
-            ts.setEmitFlags(node.name, 128 /* NoSubstitution */);
-            var statements = [];
-            if (moduleKind !== ts.ModuleKind.AMD) {
-                if (ts.hasModifier(node, 1 /* Export */)) {
-                    statements.push(ts.createStatement(createExportAssignment(node.name, createRequireCall(node)), 
-                    /*location*/ node));
-                }
-                else {
-                    statements.push(ts.createVariableStatement(
-                    /*modifiers*/ undefined, ts.createVariableDeclarationList([
-                        ts.createVariableDeclaration(ts.getSynthesizedClone(node.name), 
-                        /*type*/ undefined, createRequireCall(node))
-                    ], 
-                    /*location*/ undefined, 
-                    /*flags*/ languageVersion >= 2 /* ES2015 */ ? 2 /* Const */ : 0 /* None */), 
-                    /*location*/ node));
-                }
-            }
-            else {
-                if (ts.hasModifier(node, 1 /* Export */)) {
-                    statements.push(ts.createStatement(createExportAssignment(node.name, node.name), 
-                    /*location*/ node));
-                }
-            }
-            addExportImportAssignments(statements, node);
-            return statements;
-        }
-        function visitExportDeclaration(node) {
-            if (!ts.contains(externalImports, node)) {
-                return undefined;
-            }
-            var generatedName = ts.getGeneratedNameForNode(node);
-            if (node.exportClause) {
-                var statements = [];
-                // export { x, y } from "mod";
-                if (moduleKind !== ts.ModuleKind.AMD) {
-                    statements.push(ts.createVariableStatement(
-                    /*modifiers*/ undefined, ts.createVariableDeclarationList([
-                        ts.createVariableDeclaration(generatedName, 
-                        /*type*/ undefined, createRequireCall(node))
-                    ]), 
-                    /*location*/ node));
-                }
-                for (var _i = 0, _a = node.exportClause.elements; _i < _a.length; _i++) {
-                    var specifier = _a[_i];
-                    var exportedValue = ts.createPropertyAccess(generatedName, specifier.propertyName || specifier.name);
-                    statements.push(ts.createStatement(createExportAssignment(specifier.name, exportedValue), 
-                    /*location*/ specifier));
-                }
-                return ts.singleOrMany(statements);
-            }
-            else {
-                // export * from "mod";
-                return ts.createStatement(ts.createCall(ts.createIdentifier("__export"), 
-                /*typeArguments*/ undefined, [
-                    moduleKind !== ts.ModuleKind.AMD
-                        ? createRequireCall(node)
-                        : generatedName
-                ]), 
-                /*location*/ node);
-            }
-        }
-        function visitExportAssignment(node) {
-            if (node.isExportEquals) {
-                // Elide as `export=` is handled in addExportEqualsIfNeeded
-                return undefined;
-            }
-            var statements = [];
-            addExportDefault(statements, node.expression, /*location*/ node);
-            return statements;
-        }
-        function addExportDefault(statements, expression, location) {
-            tryAddExportDefaultCompat(statements);
-            statements.push(ts.createStatement(createExportAssignment(ts.createIdentifier("default"), expression), location));
-        }
-        function tryAddExportDefaultCompat(statements) {
-            var original = ts.getOriginalNode(currentSourceFile);
-            ts.Debug.assert(original.kind === 256 /* SourceFile */);
-            if (!original.symbol.exports["___esModule"]) {
-                if (languageVersion === 0 /* ES3 */) {
-                    statements.push(ts.createStatement(createExportAssignment(ts.createIdentifier("__esModule"), ts.createLiteral(true))));
-                }
-                else {
-                    statements.push(ts.createStatement(ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Object"), "defineProperty"), 
-                    /*typeArguments*/ undefined, [
-                        ts.createIdentifier("exports"),
-                        ts.createLiteral("__esModule"),
-                        ts.createObjectLiteral([
-                            ts.createPropertyAssignment("value", ts.createLiteral(true))
-                        ])
-                    ])));
-                }
-            }
-        }
-        function addExportImportAssignments(statements, node) {
-            if (ts.isImportEqualsDeclaration(node)) {
-                addExportMemberAssignments(statements, node.name);
-            }
-            else {
-                var names = ts.reduceEachChild(node, collectExportMembers, []);
-                for (var _i = 0, names_1 = names; _i < names_1.length; _i++) {
-                    var name_35 = names_1[_i];
-                    addExportMemberAssignments(statements, name_35);
-                }
-            }
-        }
-        function collectExportMembers(names, node) {
-            if (ts.isAliasSymbolDeclaration(node) && ts.isDeclaration(node)) {
-                var name_36 = node.name;
-                if (ts.isIdentifier(name_36)) {
-                    names.push(name_36);
-                }
-            }
-            return ts.reduceEachChild(node, collectExportMembers, names);
-        }
-        function addExportMemberAssignments(statements, name) {
-            if (!exportEquals && exportSpecifiers && ts.hasProperty(exportSpecifiers, name.text)) {
-                for (var _i = 0, _a = exportSpecifiers[name.text]; _i < _a.length; _i++) {
-                    var specifier = _a[_i];
-                    statements.push(ts.startOnNewLine(ts.createStatement(createExportAssignment(specifier.name, name), 
-                    /*location*/ specifier.name)));
-                }
-            }
-        }
-        function addExportMemberAssignment(statements, node) {
-            if (ts.hasModifier(node, 512 /* Default */)) {
-                addExportDefault(statements, getDeclarationName(node), /*location*/ node);
-            }
-            else {
-                statements.push(createExportStatement(node.name, ts.setEmitFlags(ts.getSynthesizedClone(node.name), 262144 /* LocalName */), /*location*/ node));
-            }
-        }
-        function visitVariableStatement(node) {
-            // If the variable is for a generated declaration,
-            // we should maintain it and just strip off the 'export' modifier if necessary.
-            var originalKind = ts.getOriginalNode(node).kind;
-            if (originalKind === 226 /* ModuleDeclaration */ ||
-                originalKind === 225 /* EnumDeclaration */ ||
-                originalKind === 222 /* ClassDeclaration */) {
-                if (!ts.hasModifier(node, 1 /* Export */)) {
-                    return node;
-                }
-                return ts.setOriginalNode(ts.createVariableStatement(
-                /*modifiers*/ undefined, node.declarationList), node);
-            }
-            var resultStatements = [];
-            // If we're exporting these variables, then these just become assignments to 'exports.blah'.
-            // We only want to emit assignments for variables with initializers.
-            if (ts.hasModifier(node, 1 /* Export */)) {
-                var variables = ts.getInitializedVariables(node.declarationList);
-                if (variables.length > 0) {
-                    var inlineAssignments = ts.createStatement(ts.inlineExpressions(ts.map(variables, transformInitializedVariable)), node);
-                    resultStatements.push(inlineAssignments);
-                }
-            }
-            else {
-                resultStatements.push(node);
-            }
-            // While we might not have been exported here, each variable might have been exported
-            // later on in an export specifier (e.g. `export {foo as blah, bar}`).
-            for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
-                var decl = _a[_i];
-                addExportMemberAssignmentsForBindingName(resultStatements, decl.name);
-            }
-            return resultStatements;
-        }
-        /**
-         * Creates appropriate assignments for each binding identifier that is exported in an export specifier,
-         * and inserts it into 'resultStatements'.
-         */
-        function addExportMemberAssignmentsForBindingName(resultStatements, name) {
-            if (ts.isBindingPattern(name)) {
-                for (var _i = 0, _a = name.elements; _i < _a.length; _i++) {
-                    var element = _a[_i];
-                    if (!ts.isOmittedExpression(element)) {
-                        addExportMemberAssignmentsForBindingName(resultStatements, element.name);
-                    }
-                }
-            }
-            else {
-                if (!exportEquals && exportSpecifiers && ts.hasProperty(exportSpecifiers, name.text)) {
-                    var sourceFileId = ts.getOriginalNodeId(currentSourceFile);
-                    if (!bindingNameExportSpecifiersForFileMap[sourceFileId]) {
-                        bindingNameExportSpecifiersForFileMap[sourceFileId] = ts.createMap();
-                    }
-                    bindingNameExportSpecifiersForFileMap[sourceFileId][name.text] = exportSpecifiers[name.text];
-                    addExportMemberAssignments(resultStatements, name);
-                }
-            }
-        }
-        function transformInitializedVariable(node) {
-            var name = node.name;
-            if (ts.isBindingPattern(name)) {
-                return ts.flattenVariableDestructuringToExpression(node, hoistVariableDeclaration, getModuleMemberName, visitor);
-            }
-            else {
-                return ts.createAssignment(getModuleMemberName(name), ts.visitNode(node.initializer, visitor, ts.isExpression));
-            }
-        }
-        function visitFunctionDeclaration(node) {
-            var statements = [];
-            var name = node.name || ts.getGeneratedNameForNode(node);
-            if (ts.hasModifier(node, 1 /* Export */)) {
-                // Keep async modifier for ES2017 transformer
-                var isAsync = ts.hasModifier(node, 256 /* Async */);
-                statements.push(ts.setOriginalNode(ts.createFunctionDeclaration(
-                /*decorators*/ undefined, isAsync ? [ts.createNode(119 /* AsyncKeyword */)] : undefined, node.asteriskToken, name, 
-                /*typeParameters*/ undefined, node.parameters, 
-                /*type*/ undefined, node.body, 
-                /*location*/ node), 
-                /*original*/ node));
-                addExportMemberAssignment(statements, node);
-            }
-            else {
-                statements.push(node);
-            }
-            if (node.name) {
-                addExportMemberAssignments(statements, node.name);
-            }
-            return ts.singleOrMany(statements);
-        }
-        function visitClassDeclaration(node) {
-            var statements = [];
-            var name = node.name || ts.getGeneratedNameForNode(node);
-            if (ts.hasModifier(node, 1 /* Export */)) {
-                statements.push(ts.setOriginalNode(ts.createClassDeclaration(
-                /*decorators*/ undefined, 
-                /*modifiers*/ undefined, name, 
-                /*typeParameters*/ undefined, node.heritageClauses, node.members, 
-                /*location*/ node), 
-                /*original*/ node));
-                addExportMemberAssignment(statements, node);
-            }
-            else {
-                statements.push(node);
-            }
-            // Decorators end up creating a series of assignment expressions which overwrite
-            // the local binding that we export, so we need to defer from exporting decorated classes
-            // until the decoration assignments take place. We do this when visiting expression-statements.
-            if (node.name && !(node.decorators && node.decorators.length)) {
-                addExportMemberAssignments(statements, node.name);
-            }
-            return ts.singleOrMany(statements);
-        }
-        function visitExpressionStatement(node) {
-            var original = ts.getOriginalNode(node);
-            var origKind = original.kind;
-            if (origKind === 225 /* EnumDeclaration */ || origKind === 226 /* ModuleDeclaration */) {
-                return visitExpressionStatementForEnumOrNamespaceDeclaration(node, original);
-            }
-            else if (origKind === 222 /* ClassDeclaration */) {
-                // The decorated assignment for a class name may need to be transformed.
-                var classDecl = original;
-                if (classDecl.name) {
-                    var statements = [node];
-                    addExportMemberAssignments(statements, classDecl.name);
-                    return statements;
-                }
-            }
-            return node;
-        }
-        function visitExpressionStatementForEnumOrNamespaceDeclaration(node, original) {
-            var statements = [node];
-            // Preserve old behavior for enums in which a variable statement is emitted after the body itself.
-            if (ts.hasModifier(original, 1 /* Export */) &&
-                original.kind === 225 /* EnumDeclaration */ &&
-                ts.isFirstDeclarationOfKind(original, 225 /* EnumDeclaration */)) {
-                addVarForExportedEnumOrNamespaceDeclaration(statements, original);
-            }
-            addExportMemberAssignments(statements, original.name);
-            return statements;
-        }
-        /**
-         * Adds a trailing VariableStatement for an enum or module declaration.
-         */
-        function addVarForExportedEnumOrNamespaceDeclaration(statements, node) {
-            var transformedStatement = ts.createVariableStatement(
-            /*modifiers*/ undefined, [ts.createVariableDeclaration(getDeclarationName(node), 
-                /*type*/ undefined, ts.createPropertyAccess(ts.createIdentifier("exports"), getDeclarationName(node)))], 
-            /*location*/ node);
-            ts.setEmitFlags(transformedStatement, 49152 /* NoComments */);
-            statements.push(transformedStatement);
-        }
-        function getDeclarationName(node) {
-            return node.name ? ts.getSynthesizedClone(node.name) : ts.getGeneratedNameForNode(node);
-        }
-        function onEmitNode(emitContext, node, emitCallback) {
-            if (node.kind === 256 /* SourceFile */) {
-                bindingNameExportSpecifiersMap = bindingNameExportSpecifiersForFileMap[ts.getOriginalNodeId(node)];
-                previousOnEmitNode(emitContext, node, emitCallback);
-                bindingNameExportSpecifiersMap = undefined;
-            }
-            else {
-                previousOnEmitNode(emitContext, node, emitCallback);
-            }
-        }
-        /**
-         * Hooks node substitutions.
-         *
-         * @param node The node to substitute.
-         * @param isExpression A value indicating whether the node is to be used in an expression
-         *                     position.
-         */
-        function onSubstituteNode(emitContext, node) {
-            node = previousOnSubstituteNode(emitContext, node);
-            if (emitContext === 1 /* Expression */) {
-                return substituteExpression(node);
-            }
-            else if (ts.isShorthandPropertyAssignment(node)) {
-                return substituteShorthandPropertyAssignment(node);
-            }
-            return node;
-        }
-        function substituteShorthandPropertyAssignment(node) {
-            var name = node.name;
-            var exportedOrImportedName = substituteExpressionIdentifier(name);
-            if (exportedOrImportedName !== name) {
-                // A shorthand property with an assignment initializer is probably part of a
-                // destructuring assignment
-                if (node.objectAssignmentInitializer) {
-                    var initializer = ts.createAssignment(exportedOrImportedName, node.objectAssignmentInitializer);
-                    return ts.createPropertyAssignment(name, initializer, /*location*/ node);
-                }
-                return ts.createPropertyAssignment(name, exportedOrImportedName, /*location*/ node);
-            }
-            return node;
-        }
-        function substituteExpression(node) {
-            switch (node.kind) {
-                case 70 /* Identifier */:
-                    return substituteExpressionIdentifier(node);
-                case 188 /* BinaryExpression */:
-                    return substituteBinaryExpression(node);
-                case 187 /* PostfixUnaryExpression */:
-                case 186 /* PrefixUnaryExpression */:
-                    return substituteUnaryExpression(node);
-            }
-            return node;
-        }
-        function substituteExpressionIdentifier(node) {
-            return trySubstituteExportedName(node)
-                || trySubstituteImportedName(node)
-                || node;
-        }
-        function substituteBinaryExpression(node) {
-            var left = node.left;
-            // If the left-hand-side of the binaryExpression is an identifier and its is export through export Specifier
-            if (ts.isIdentifier(left) && ts.isAssignmentOperator(node.operatorToken.kind)) {
-                if (bindingNameExportSpecifiersMap && ts.hasProperty(bindingNameExportSpecifiersMap, left.text)) {
-                    ts.setEmitFlags(node, 128 /* NoSubstitution */);
-                    var nestedExportAssignment = void 0;
-                    for (var _i = 0, _a = bindingNameExportSpecifiersMap[left.text]; _i < _a.length; _i++) {
-                        var specifier = _a[_i];
-                        nestedExportAssignment = nestedExportAssignment ?
-                            createExportAssignment(specifier.name, nestedExportAssignment) :
-                            createExportAssignment(specifier.name, node);
-                    }
-                    return nestedExportAssignment;
-                }
-            }
-            return node;
-        }
-        function substituteUnaryExpression(node) {
-            // Because how the compiler only parse plusplus and minusminus to be either prefixUnaryExpression or postFixUnaryExpression depended on where they are
-            // We don't need to check that the operator has SyntaxKind.plusplus or SyntaxKind.minusminus
-            var operator = node.operator;
-            var operand = node.operand;
-            if (ts.isIdentifier(operand) && bindingNameExportSpecifiersForFileMap) {
-                if (bindingNameExportSpecifiersMap && ts.hasProperty(bindingNameExportSpecifiersMap, operand.text)) {
-                    ts.setEmitFlags(node, 128 /* NoSubstitution */);
-                    var transformedUnaryExpression = void 0;
-                    if (node.kind === 187 /* PostfixUnaryExpression */) {
-                        transformedUnaryExpression = ts.createBinary(operand, ts.createToken(operator === 42 /* PlusPlusToken */ ? 58 /* PlusEqualsToken */ : 59 /* MinusEqualsToken */), ts.createLiteral(1), 
-                        /*location*/ node);
-                        // We have to set no substitution flag here to prevent visit the binary expression and substitute it again as we will preform all necessary substitution in here
-                        ts.setEmitFlags(transformedUnaryExpression, 128 /* NoSubstitution */);
-                    }
-                    var nestedExportAssignment = void 0;
-                    for (var _i = 0, _a = bindingNameExportSpecifiersMap[operand.text]; _i < _a.length; _i++) {
-                        var specifier = _a[_i];
-                        nestedExportAssignment = nestedExportAssignment ?
-                            createExportAssignment(specifier.name, nestedExportAssignment) :
-                            createExportAssignment(specifier.name, transformedUnaryExpression || node);
-                    }
-                    return nestedExportAssignment;
-                }
-            }
-            return node;
-        }
-        function trySubstituteExportedName(node) {
-            var emitFlags = ts.getEmitFlags(node);
-            if ((emitFlags & 262144 /* LocalName */) === 0) {
-                var container = resolver.getReferencedExportContainer(node, (emitFlags & 131072 /* ExportName */) !== 0);
-                if (container) {
-                    if (container.kind === 256 /* SourceFile */) {
-                        return ts.createPropertyAccess(ts.createIdentifier("exports"), ts.getSynthesizedClone(node), 
-                        /*location*/ node);
-                    }
-                }
-            }
-            return undefined;
-        }
-        function trySubstituteImportedName(node) {
-            if ((ts.getEmitFlags(node) & 262144 /* LocalName */) === 0) {
-                var declaration = resolver.getReferencedImportDeclaration(node);
-                if (declaration) {
-                    if (ts.isImportClause(declaration)) {
-                        return ts.createPropertyAccess(ts.getGeneratedNameForNode(declaration.parent), ts.createIdentifier("default"), 
-                        /*location*/ node);
-                    }
-                    else if (ts.isImportSpecifier(declaration)) {
-                        var name_37 = declaration.propertyName || declaration.name;
-                        return ts.createPropertyAccess(ts.getGeneratedNameForNode(declaration.parent.parent.parent), ts.getSynthesizedClone(name_37), 
-                        /*location*/ node);
-                    }
-                }
-            }
-            return undefined;
-        }
-        function getModuleMemberName(name) {
-            return ts.createPropertyAccess(ts.createIdentifier("exports"), name, 
-            /*location*/ name);
-        }
-        function createRequireCall(importNode) {
-            var moduleName = ts.getExternalModuleNameLiteral(importNode, currentSourceFile, host, resolver, compilerOptions);
-            var args = [];
-            if (ts.isDefined(moduleName)) {
-                args.push(moduleName);
-            }
-            return ts.createCall(ts.createIdentifier("require"), /*typeArguments*/ undefined, args);
-        }
-        function createExportStatement(name, value, location) {
-            var statement = ts.createStatement(createExportAssignment(name, value));
-            statement.startsOnNewLine = true;
-            if (location) {
-                ts.setSourceMapRange(statement, location);
-            }
-            return statement;
-        }
-        function createExportAssignment(name, value) {
-            return ts.createAssignment(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.getSynthesizedClone(name)), value);
-        }
-        function collectAsynchronousDependencies(node, includeNonAmdDependencies) {
-            // names of modules with corresponding parameter in the factory function
-            var aliasedModuleNames = [];
-            // names of modules with no corresponding parameters in factory function
-            var unaliasedModuleNames = [];
-            // names of the parameters in the factory function; these
-            // parameters need to match the indexes of the corresponding
-            // module names in aliasedModuleNames.
-            var importAliasNames = [];
-            // Fill in amd-dependency tags
-            for (var _i = 0, _a = node.amdDependencies; _i < _a.length; _i++) {
-                var amdDependency = _a[_i];
-                if (amdDependency.name) {
-                    aliasedModuleNames.push(ts.createLiteral(amdDependency.path));
-                    importAliasNames.push(ts.createParameter(amdDependency.name));
-                }
-                else {
-                    unaliasedModuleNames.push(ts.createLiteral(amdDependency.path));
-                }
-            }
-            for (var _b = 0, externalImports_1 = externalImports; _b < externalImports_1.length; _b++) {
-                var importNode = externalImports_1[_b];
-                // Find the name of the external module
-                var externalModuleName = ts.getExternalModuleNameLiteral(importNode, currentSourceFile, host, resolver, compilerOptions);
-                // Find the name of the module alias, if there is one
-                var importAliasName = ts.getLocalNameForExternalImport(importNode, currentSourceFile);
-                if (includeNonAmdDependencies && importAliasName) {
-                    // Set emitFlags on the name of the classDeclaration
-                    // This is so that when printer will not substitute the identifier
-                    ts.setEmitFlags(importAliasName, 128 /* NoSubstitution */);
-                    aliasedModuleNames.push(externalModuleName);
-                    importAliasNames.push(ts.createParameter(importAliasName));
-                }
-                else {
-                    unaliasedModuleNames.push(externalModuleName);
-                }
-            }
-            return { aliasedModuleNames: aliasedModuleNames, unaliasedModuleNames: unaliasedModuleNames, importAliasNames: importAliasNames };
-        }
-        function updateSourceFile(node, statements) {
-            var updated = ts.getMutableClone(node);
-            updated.statements = ts.createNodeArray(statements, node.statements);
-            return updated;
-        }
-        var _a;
-    }
-    ts.transformModule = transformModule;
-})(ts || (ts = {}));
-/// <reference path="../../factory.ts" />
-/// <reference path="../../visitor.ts" />
-/*@internal*/
-var ts;
-(function (ts) {
-    function transformSystemModule(context) {
-        var startLexicalEnvironment = context.startLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration, hoistFunctionDeclaration = context.hoistFunctionDeclaration;
-        var compilerOptions = context.getCompilerOptions();
-        var resolver = context.getEmitResolver();
-        var host = context.getEmitHost();
-        var previousOnSubstituteNode = context.onSubstituteNode;
-        var previousOnEmitNode = context.onEmitNode;
-        context.onSubstituteNode = onSubstituteNode;
-        context.onEmitNode = onEmitNode;
-        context.enableSubstitution(70 /* Identifier */);
-        context.enableSubstitution(188 /* BinaryExpression */);
-        context.enableSubstitution(186 /* PrefixUnaryExpression */);
-        context.enableSubstitution(187 /* PostfixUnaryExpression */);
-        context.enableEmitNotification(256 /* SourceFile */);
-        var exportFunctionForFileMap = [];
-        var currentSourceFile;
-        var externalImports;
-        var exportSpecifiers;
-        var exportEquals;
-        var hasExportStarsToExportValues;
-        var exportFunctionForFile;
-        var contextObjectForFile;
-        var exportedLocalNames;
-        var exportedFunctionDeclarations;
-        var enclosingBlockScopedContainer;
-        var currentParent;
-        var currentNode;
-        return transformSourceFile;
-        function transformSourceFile(node) {
-            if (ts.isDeclarationFile(node)) {
-                return node;
-            }
-            if (ts.isExternalModule(node) || compilerOptions.isolatedModules) {
-                currentSourceFile = node;
-                currentNode = node;
-                // Perform the transformation.
-                var updated = transformSystemModuleWorker(node);
-                ts.aggregateTransformFlags(updated);
-                currentSourceFile = undefined;
-                externalImports = undefined;
-                exportSpecifiers = undefined;
-                exportEquals = undefined;
-                hasExportStarsToExportValues = false;
-                exportFunctionForFile = undefined;
-                contextObjectForFile = undefined;
-                exportedLocalNames = undefined;
-                exportedFunctionDeclarations = undefined;
-                return updated;
-            }
-            return node;
-        }
-        function transformSystemModuleWorker(node) {
-            // System modules have the following shape:
-            //
-            //     System.register(['dep-1', ... 'dep-n'], function(exports) {/* module body function */})
-            //
-            // The parameter 'exports' here is a callback '<T>(name: string, value: T) => T' that
-            // is used to publish exported values. 'exports' returns its 'value' argument so in
-            // most cases expressions that mutate exported values can be rewritten as:
-            //
-            //     expr -> exports('name', expr)
-            //
-            // The only exception in this rule is postfix unary operators,
-            // see comment to 'substitutePostfixUnaryExpression' for more details
-            ts.Debug.assert(!exportFunctionForFile);
-            // Collect information about the external module and dependency groups.
-            (_a = ts.collectExternalModuleInfo(node), externalImports = _a.externalImports, exportSpecifiers = _a.exportSpecifiers, exportEquals = _a.exportEquals, hasExportStarsToExportValues = _a.hasExportStarsToExportValues, _a);
-            // Make sure that the name of the 'exports' function does not conflict with
-            // existing identifiers.
-            exportFunctionForFile = ts.createUniqueName("exports");
-            contextObjectForFile = ts.createUniqueName("context");
-            exportFunctionForFileMap[ts.getOriginalNodeId(node)] = exportFunctionForFile;
-            var dependencyGroups = collectDependencyGroups(externalImports);
-            var statements = [];
-            // Add the body of the module.
-            addSystemModuleBody(statements, node, dependencyGroups);
-            var moduleName = ts.tryGetModuleNameFromFile(node, host, compilerOptions);
-            var dependencies = ts.createArrayLiteral(ts.map(dependencyGroups, getNameOfDependencyGroup));
-            var body = ts.createFunctionExpression(
-            /*modifiers*/ undefined, 
-            /*asteriskToken*/ undefined, 
-            /*name*/ undefined, 
-            /*typeParameters*/ undefined, [
-                ts.createParameter(exportFunctionForFile),
-                ts.createParameter(contextObjectForFile)
-            ], 
-            /*type*/ undefined, ts.setEmitFlags(ts.createBlock(statements, /*location*/ undefined, /*multiLine*/ true), 1 /* EmitEmitHelpers */));
-            // Write the call to `System.register`
-            // Clear the emit-helpers flag for later passes since we'll have already used it in the module body
-            // So the helper will be emit at the correct position instead of at the top of the source-file
-            return updateSourceFile(node, [
-                ts.createStatement(ts.createCall(ts.createPropertyAccess(ts.createIdentifier("System"), "register"), 
-                /*typeArguments*/ undefined, moduleName
-                    ? [moduleName, dependencies, body]
-                    : [dependencies, body]))
-            ], /*nodeEmitFlags*/ ~1 /* EmitEmitHelpers */ & ts.getEmitFlags(node));
-            var _a;
-        }
-        /**
-         * Adds the statements for the module body function for the source file.
-         *
-         * @param statements The output statements for the module body.
-         * @param node The source file for the module.
-         * @param statementOffset The offset at which to begin visiting the statements of the SourceFile.
-         */
-        function addSystemModuleBody(statements, node, dependencyGroups) {
-            // Shape of the body in system modules:
-            //
-            //  function (exports) {
-            //      <list of local aliases for imports>
-            //      <hoisted variable declarations>
-            //      <hoisted function declarations>
-            //      return {
-            //          setters: [
-            //              <list of setter function for imports>
-            //          ],
-            //          execute: function() {
-            //              <module statements>
-            //          }
-            //      }
-            //      <temp declarations>
-            //  }
-            //
-            // i.e:
-            //
-            //   import {x} from 'file1'
-            //   var y = 1;
-            //   export function foo() { return y + x(); }
-            //   console.log(y);
-            //
-            // Will be transformed to:
-            //
-            //  function(exports) {
-            //      var file_1; // local alias
-            //      var y;
-            //      function foo() { return y + file_1.x(); }
-            //      exports("foo", foo);
-            //      return {
-            //          setters: [
-            //              function(v) { file_1 = v }
-            //          ],
-            //          execute(): function() {
-            //              y = 1;
-            //              console.log(y);
-            //          }
-            //      };
-            //  }
-            // We start a new lexical environment in this function body, but *not* in the
-            // body of the execute function. This allows us to emit temporary declarations
-            // only in the outer module body and not in the inner one.
-            startLexicalEnvironment();
-            // Add any prologue directives.
-            var statementOffset = ts.addPrologueDirectives(statements, node.statements, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict, visitSourceElement);
-            // var __moduleName = context_1 && context_1.id;
-            statements.push(ts.createVariableStatement(
-            /*modifiers*/ undefined, ts.createVariableDeclarationList([
-                ts.createVariableDeclaration("__moduleName", 
-                /*type*/ undefined, ts.createLogicalAnd(contextObjectForFile, ts.createPropertyAccess(contextObjectForFile, "id")))
-            ])));
-            // Visit the statements of the source file, emitting any transformations into
-            // the `executeStatements` array. We do this *before* we fill the `setters` array
-            // as we both emit transformations as well as aggregate some data used when creating
-            // setters. This allows us to reduce the number of times we need to loop through the
-            // statements of the source file.
-            var executeStatements = ts.visitNodes(node.statements, visitSourceElement, ts.isStatement, statementOffset);
-            // We emit the lexical environment (hoisted variables and function declarations)
-            // early to align roughly with our previous emit output.
-            // Two key differences in this approach are:
-            // - Temporary variables will appear at the top rather than at the bottom of the file
-            // - Calls to the exporter for exported function declarations are grouped after
-            //   the declarations.
-            ts.addRange(statements, endLexicalEnvironment());
-            // Emit early exports for function declarations.
-            ts.addRange(statements, exportedFunctionDeclarations);
-            var exportStarFunction = addExportStarIfNeeded(statements);
-            statements.push(ts.createReturn(ts.setMultiLine(ts.createObjectLiteral([
-                ts.createPropertyAssignment("setters", generateSetters(exportStarFunction, dependencyGroups)),
-                ts.createPropertyAssignment("execute", ts.createFunctionExpression(
-                /*modifiers*/ undefined, 
-                /*asteriskToken*/ undefined, 
-                /*name*/ undefined, 
-                /*typeParameters*/ undefined, 
-                /*parameters*/ [], 
-                /*type*/ undefined, ts.createBlock(executeStatements, 
-                /*location*/ undefined, 
-                /*multiLine*/ true)))
-            ]), 
-            /*multiLine*/ true)));
-        }
-        function addExportStarIfNeeded(statements) {
-            if (!hasExportStarsToExportValues) {
-                return;
-            }
-            // when resolving exports local exported entries/indirect exported entries in the module
-            // should always win over entries with similar names that were added via star exports
-            // to support this we store names of local/indirect exported entries in a set.
-            // this set is used to filter names brought by star expors.
-            // local names set should only be added if we have anything exported
-            if (!exportedLocalNames && ts.isEmpty(exportSpecifiers)) {
-                // no exported declarations (export var ...) or export specifiers (export {x})
-                // check if we have any non star export declarations.
-                var hasExportDeclarationWithExportClause = false;
-                for (var _i = 0, externalImports_2 = externalImports; _i < externalImports_2.length; _i++) {
-                    var externalImport = externalImports_2[_i];
-                    if (externalImport.kind === 237 /* ExportDeclaration */ && externalImport.exportClause) {
-                        hasExportDeclarationWithExportClause = true;
-                        break;
-                    }
-                }
-                if (!hasExportDeclarationWithExportClause) {
-                    // we still need to emit exportStar helper
-                    return addExportStarFunction(statements, /*localNames*/ undefined);
-                }
-            }
-            var exportedNames = [];
-            if (exportedLocalNames) {
-                for (var _a = 0, exportedLocalNames_1 = exportedLocalNames; _a < exportedLocalNames_1.length; _a++) {
-                    var exportedLocalName = exportedLocalNames_1[_a];
-                    // write name of exported declaration, i.e 'export var x...'
-                    exportedNames.push(ts.createPropertyAssignment(ts.createLiteral(exportedLocalName.text), ts.createLiteral(true)));
-                }
-            }
-            for (var _b = 0, externalImports_3 = externalImports; _b < externalImports_3.length; _b++) {
-                var externalImport = externalImports_3[_b];
-                if (externalImport.kind !== 237 /* ExportDeclaration */) {
-                    continue;
-                }
-                var exportDecl = externalImport;
-                if (!exportDecl.exportClause) {
-                    // export * from ...
-                    continue;
-                }
-                for (var _c = 0, _d = exportDecl.exportClause.elements; _c < _d.length; _c++) {
-                    var element = _d[_c];
-                    // write name of indirectly exported entry, i.e. 'export {x} from ...'
-                    exportedNames.push(ts.createPropertyAssignment(ts.createLiteral((element.name || element.propertyName).text), ts.createLiteral(true)));
-                }
-            }
-            var exportedNamesStorageRef = ts.createUniqueName("exportedNames");
-            statements.push(ts.createVariableStatement(
-            /*modifiers*/ undefined, ts.createVariableDeclarationList([
-                ts.createVariableDeclaration(exportedNamesStorageRef, 
-                /*type*/ undefined, ts.createObjectLiteral(exportedNames, /*location*/ undefined, /*multiline*/ true))
-            ])));
-            return addExportStarFunction(statements, exportedNamesStorageRef);
-        }
-        /**
-         * Emits a setter callback for each dependency group.
-         * @param write The callback used to write each callback.
-         */
-        function generateSetters(exportStarFunction, dependencyGroups) {
-            var setters = [];
-            for (var _i = 0, dependencyGroups_1 = dependencyGroups; _i < dependencyGroups_1.length; _i++) {
-                var group = dependencyGroups_1[_i];
-                // derive a unique name for parameter from the first named entry in the group
-                var localName = ts.forEach(group.externalImports, function (i) { return ts.getLocalNameForExternalImport(i, currentSourceFile); });
-                var parameterName = localName ? ts.getGeneratedNameForNode(localName) : ts.createUniqueName("");
-                var statements = [];
-                for (var _a = 0, _b = group.externalImports; _a < _b.length; _a++) {
-                    var entry = _b[_a];
-                    var importVariableName = ts.getLocalNameForExternalImport(entry, currentSourceFile);
-                    switch (entry.kind) {
-                        case 231 /* ImportDeclaration */:
-                            if (!entry.importClause) {
-                                // 'import "..."' case
-                                // module is imported only for side-effects, no emit required
-                                break;
-                            }
-                        // fall-through
-                        case 230 /* ImportEqualsDeclaration */:
-                            ts.Debug.assert(importVariableName !== undefined);
-                            // save import into the local
-                            statements.push(ts.createStatement(ts.createAssignment(importVariableName, parameterName)));
-                            break;
-                        case 237 /* ExportDeclaration */:
-                            ts.Debug.assert(importVariableName !== undefined);
-                            if (entry.exportClause) {
-                                //  export {a, b as c} from 'foo'
-                                //
-                                // emit as:
-                                //
-                                //  exports_({
-                                //     "a": _["a"],
-                                //     "c": _["b"]
-                                //  });
-                                var properties = [];
-                                for (var _c = 0, _d = entry.exportClause.elements; _c < _d.length; _c++) {
-                                    var e = _d[_c];
-                                    properties.push(ts.createPropertyAssignment(ts.createLiteral(e.name.text), ts.createElementAccess(parameterName, ts.createLiteral((e.propertyName || e.name).text))));
-                                }
-                                statements.push(ts.createStatement(ts.createCall(exportFunctionForFile, 
-                                /*typeArguments*/ undefined, [ts.createObjectLiteral(properties, /*location*/ undefined, /*multiline*/ true)])));
-                            }
-                            else {
-                                //  export * from 'foo'
-                                //
-                                // emit as:
-                                //
-                                //  exportStar(foo_1_1);
-                                statements.push(ts.createStatement(ts.createCall(exportStarFunction, 
-                                /*typeArguments*/ undefined, [parameterName])));
-                            }
-                            break;
-                    }
-                }
-                setters.push(ts.createFunctionExpression(
-                /*modifiers*/ undefined, 
-                /*asteriskToken*/ undefined, 
-                /*name*/ undefined, 
-                /*typeParameters*/ undefined, [ts.createParameter(parameterName)], 
-                /*type*/ undefined, ts.createBlock(statements, /*location*/ undefined, /*multiLine*/ true)));
-            }
-            return ts.createArrayLiteral(setters, /*location*/ undefined, /*multiLine*/ true);
-        }
-        function visitSourceElement(node) {
-            switch (node.kind) {
-                case 231 /* ImportDeclaration */:
-                    return visitImportDeclaration(node);
-                case 230 /* ImportEqualsDeclaration */:
-                    return visitImportEqualsDeclaration(node);
-                case 237 /* ExportDeclaration */:
-                    return visitExportDeclaration(node);
-                case 236 /* ExportAssignment */:
-                    return visitExportAssignment(node);
-                default:
-                    return visitNestedNode(node);
-            }
-        }
-        function visitNestedNode(node) {
-            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
-            var savedCurrentParent = currentParent;
-            var savedCurrentNode = currentNode;
-            var currentGrandparent = currentParent;
-            currentParent = currentNode;
-            currentNode = node;
-            if (currentParent && ts.isBlockScope(currentParent, currentGrandparent)) {
-                enclosingBlockScopedContainer = currentParent;
-            }
-            var result = visitNestedNodeWorker(node);
-            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
-            currentParent = savedCurrentParent;
-            currentNode = savedCurrentNode;
-            return result;
-        }
-        function visitNestedNodeWorker(node) {
-            switch (node.kind) {
-                case 201 /* VariableStatement */:
-                    return visitVariableStatement(node);
-                case 221 /* FunctionDeclaration */:
-                    return visitFunctionDeclaration(node);
-                case 222 /* ClassDeclaration */:
-                    return visitClassDeclaration(node);
-                case 207 /* ForStatement */:
-                    return visitForStatement(node);
-                case 208 /* ForInStatement */:
-                    return visitForInStatement(node);
-                case 209 /* ForOfStatement */:
-                    return visitForOfStatement(node);
-                case 205 /* DoStatement */:
-                    return visitDoStatement(node);
-                case 206 /* WhileStatement */:
-                    return visitWhileStatement(node);
-                case 215 /* LabeledStatement */:
-                    return visitLabeledStatement(node);
-                case 213 /* WithStatement */:
-                    return visitWithStatement(node);
-                case 214 /* SwitchStatement */:
-                    return visitSwitchStatement(node);
-                case 228 /* CaseBlock */:
-                    return visitCaseBlock(node);
-                case 249 /* CaseClause */:
-                    return visitCaseClause(node);
-                case 250 /* DefaultClause */:
-                    return visitDefaultClause(node);
-                case 217 /* TryStatement */:
-                    return visitTryStatement(node);
-                case 252 /* CatchClause */:
-                    return visitCatchClause(node);
-                case 200 /* Block */:
-                    return visitBlock(node);
-                case 203 /* ExpressionStatement */:
-                    return visitExpressionStatement(node);
-                default:
-                    return node;
-            }
-        }
-        function visitImportDeclaration(node) {
-            if (node.importClause && ts.contains(externalImports, node)) {
-                hoistVariableDeclaration(ts.getLocalNameForExternalImport(node, currentSourceFile));
-            }
-            return undefined;
-        }
-        function visitImportEqualsDeclaration(node) {
-            if (ts.contains(externalImports, node)) {
-                hoistVariableDeclaration(ts.getLocalNameForExternalImport(node, currentSourceFile));
-            }
-            // NOTE(rbuckton): Do we support export import = require('') in System?
-            return undefined;
-        }
-        function visitExportDeclaration(node) {
-            if (!node.moduleSpecifier) {
-                var statements = [];
-                ts.addRange(statements, ts.map(node.exportClause.elements, visitExportSpecifier));
-                return statements;
-            }
-            return undefined;
-        }
-        function visitExportSpecifier(specifier) {
-            recordExportName(specifier.name);
-            return createExportStatement(specifier.name, specifier.propertyName || specifier.name);
-        }
-        function visitExportAssignment(node) {
-            if (node.isExportEquals) {
-                // Elide `export=` as it is illegal in a SystemJS module.
-                return undefined;
-            }
-            return createExportStatement(ts.createLiteral("default"), node.expression);
-        }
-        /**
-         * Visits a variable statement, hoisting declared names to the top-level module body.
-         * Each declaration is rewritten into an assignment expression.
-         *
-         * @param node The variable statement to visit.
-         */
-        function visitVariableStatement(node) {
-            // hoist only non-block scoped declarations or block scoped declarations parented by source file
-            var shouldHoist = ((ts.getCombinedNodeFlags(ts.getOriginalNode(node.declarationList)) & 3 /* BlockScoped */) == 0) ||
-                enclosingBlockScopedContainer.kind === 256 /* SourceFile */;
-            if (!shouldHoist) {
-                return node;
-            }
-            var isExported = ts.hasModifier(node, 1 /* Export */);
-            var expressions = [];
-            for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
-                var variable = _a[_i];
-                var visited = transformVariable(variable, isExported);
-                if (visited) {
-                    expressions.push(visited);
-                }
-            }
-            if (expressions.length) {
-                return ts.createStatement(ts.inlineExpressions(expressions), node);
-            }
-            return undefined;
-        }
-        /**
-         * Transforms a VariableDeclaration into one or more assignment expressions.
-         *
-         * @param node The VariableDeclaration to transform.
-         * @param isExported A value used to indicate whether the containing statement was exported.
-         */
-        function transformVariable(node, isExported) {
-            // Hoist any bound names within the declaration.
-            hoistBindingElement(node, isExported);
-            if (!node.initializer) {
-                // If the variable has no initializer, ignore it.
-                return;
-            }
-            var name = node.name;
-            if (ts.isIdentifier(name)) {
-                // If the variable has an IdentifierName, write out an assignment expression in its place.
-                return ts.createAssignment(name, node.initializer);
-            }
-            else {
-                // If the variable has a BindingPattern, flatten the variable into multiple assignment expressions.
-                return ts.flattenVariableDestructuringToExpression(node, hoistVariableDeclaration);
-            }
-        }
-        /**
-         * Visits a FunctionDeclaration, hoisting it to the outer module body function.
-         *
-         * @param node The function declaration to visit.
-         */
-        function visitFunctionDeclaration(node) {
-            if (ts.hasModifier(node, 1 /* Export */)) {
-                // If the function is exported, ensure it has a name and rewrite the function without any export flags.
-                var name_38 = node.name || ts.getGeneratedNameForNode(node);
-                // Keep async modifier for ES2017 transformer
-                var isAsync = ts.hasModifier(node, 256 /* Async */);
-                var newNode = ts.createFunctionDeclaration(
-                /*decorators*/ undefined, isAsync ? [ts.createNode(119 /* AsyncKeyword */)] : undefined, node.asteriskToken, name_38, 
-                /*typeParameters*/ undefined, node.parameters, 
-                /*type*/ undefined, node.body, 
-                /*location*/ node);
-                // Record a declaration export in the outer module body function.
-                recordExportedFunctionDeclaration(node);
-                if (!ts.hasModifier(node, 512 /* Default */)) {
-                    recordExportName(name_38);
-                }
-                ts.setOriginalNode(newNode, node);
-                node = newNode;
-            }
-            // Hoist the function declaration to the outer module body function.
-            hoistFunctionDeclaration(node);
-            return undefined;
-        }
-        function visitExpressionStatement(node) {
-            var originalNode = ts.getOriginalNode(node);
-            if ((originalNode.kind === 226 /* ModuleDeclaration */ || originalNode.kind === 225 /* EnumDeclaration */) && ts.hasModifier(originalNode, 1 /* Export */)) {
-                var name_39 = getDeclarationName(originalNode);
-                // We only need to hoistVariableDeclaration for EnumDeclaration
-                // as ModuleDeclaration is already hoisted when the transformer call visitVariableStatement
-                // which then call transformsVariable for each declaration in declarationList
-                if (originalNode.kind === 225 /* EnumDeclaration */) {
-                    hoistVariableDeclaration(name_39);
-                }
-                return [
-                    node,
-                    createExportStatement(name_39, name_39)
-                ];
-            }
-            return node;
-        }
-        /**
-         * Visits a ClassDeclaration, hoisting its name to the outer module body function.
-         *
-         * @param node The class declaration to visit.
-         */
-        function visitClassDeclaration(node) {
-            // Hoist the name of the class declaration to the outer module body function.
-            var name = getDeclarationName(node);
-            hoistVariableDeclaration(name);
-            var statements = [];
-            // Rewrite the class declaration into an assignment of a class expression.
-            statements.push(ts.createStatement(ts.createAssignment(name, ts.createClassExpression(
-            /*modifiers*/ undefined, node.name, 
-            /*typeParameters*/ undefined, node.heritageClauses, node.members, 
-            /*location*/ node)), 
-            /*location*/ node));
-            // If the class was exported, write a declaration export to the inner module body function.
-            if (ts.hasModifier(node, 1 /* Export */)) {
-                if (!ts.hasModifier(node, 512 /* Default */)) {
-                    recordExportName(name);
-                }
-                statements.push(createDeclarationExport(node));
-            }
-            return statements;
-        }
-        function shouldHoistLoopInitializer(node) {
-            return ts.isVariableDeclarationList(node) && (ts.getCombinedNodeFlags(node) & 3 /* BlockScoped */) === 0;
-        }
-        /**
-         * Visits the body of a ForStatement to hoist declarations.
-         *
-         * @param node The statement to visit.
-         */
-        function visitForStatement(node) {
-            var initializer = node.initializer;
-            if (shouldHoistLoopInitializer(initializer)) {
-                var expressions = [];
-                for (var _i = 0, _a = initializer.declarations; _i < _a.length; _i++) {
-                    var variable = _a[_i];
-                    var visited = transformVariable(variable, /*isExported*/ false);
-                    if (visited) {
-                        expressions.push(visited);
-                    }
-                }
-                ;
-                return ts.createFor(expressions.length
-                    ? ts.inlineExpressions(expressions)
-                    : ts.createSynthesizedNode(194 /* OmittedExpression */), node.condition, node.incrementor, ts.visitNode(node.statement, visitNestedNode, ts.isStatement), 
-                /*location*/ node);
-            }
-            else {
-                return ts.visitEachChild(node, visitNestedNode, context);
-            }
-        }
-        /**
-         * Transforms and hoists the declaration list of a ForInStatement or ForOfStatement into an expression.
-         *
-         * @param node The decalaration list to transform.
-         */
-        function transformForBinding(node) {
-            var firstDeclaration = ts.firstOrUndefined(node.declarations);
-            hoistBindingElement(firstDeclaration, /*isExported*/ false);
-            var name = firstDeclaration.name;
-            return ts.isIdentifier(name)
-                ? name
-                : ts.flattenVariableDestructuringToExpression(firstDeclaration, hoistVariableDeclaration);
-        }
-        /**
-         * Visits the body of a ForInStatement to hoist declarations.
-         *
-         * @param node The statement to visit.
-         */
-        function visitForInStatement(node) {
-            var initializer = node.initializer;
-            if (shouldHoistLoopInitializer(initializer)) {
-                var updated = ts.getMutableClone(node);
-                updated.initializer = transformForBinding(initializer);
-                updated.statement = ts.visitNode(node.statement, visitNestedNode, ts.isStatement, /*optional*/ false, ts.liftToBlock);
-                return updated;
-            }
-            else {
-                return ts.visitEachChild(node, visitNestedNode, context);
-            }
-        }
-        /**
-         * Visits the body of a ForOfStatement to hoist declarations.
-         *
-         * @param node The statement to visit.
-         */
-        function visitForOfStatement(node) {
-            var initializer = node.initializer;
-            if (shouldHoistLoopInitializer(initializer)) {
-                var updated = ts.getMutableClone(node);
-                updated.initializer = transformForBinding(initializer);
-                updated.statement = ts.visitNode(node.statement, visitNestedNode, ts.isStatement, /*optional*/ false, ts.liftToBlock);
-                return updated;
-            }
-            else {
-                return ts.visitEachChild(node, visitNestedNode, context);
-            }
-        }
-        /**
-         * Visits the body of a DoStatement to hoist declarations.
-         *
-         * @param node The statement to visit.
-         */
-        function visitDoStatement(node) {
-            var statement = ts.visitNode(node.statement, visitNestedNode, ts.isStatement, /*optional*/ false, ts.liftToBlock);
-            if (statement !== node.statement) {
-                var updated = ts.getMutableClone(node);
-                updated.statement = statement;
-                return updated;
-            }
-            return node;
-        }
-        /**
-         * Visits the body of a WhileStatement to hoist declarations.
-         *
-         * @param node The statement to visit.
-         */
-        function visitWhileStatement(node) {
-            var statement = ts.visitNode(node.statement, visitNestedNode, ts.isStatement, /*optional*/ false, ts.liftToBlock);
-            if (statement !== node.statement) {
-                var updated = ts.getMutableClone(node);
-                updated.statement = statement;
-                return updated;
-            }
-            return node;
-        }
-        /**
-         * Visits the body of a LabeledStatement to hoist declarations.
-         *
-         * @param node The statement to visit.
-         */
-        function visitLabeledStatement(node) {
-            var statement = ts.visitNode(node.statement, visitNestedNode, ts.isStatement, /*optional*/ false, ts.liftToBlock);
-            if (statement !== node.statement) {
-                var updated = ts.getMutableClone(node);
-                updated.statement = statement;
-                return updated;
-            }
-            return node;
-        }
-        /**
-         * Visits the body of a WithStatement to hoist declarations.
-         *
-         * @param node The statement to visit.
-         */
-        function visitWithStatement(node) {
-            var statement = ts.visitNode(node.statement, visitNestedNode, ts.isStatement, /*optional*/ false, ts.liftToBlock);
-            if (statement !== node.statement) {
-                var updated = ts.getMutableClone(node);
-                updated.statement = statement;
-                return updated;
-            }
-            return node;
-        }
-        /**
-         * Visits the body of a SwitchStatement to hoist declarations.
-         *
-         * @param node The statement to visit.
-         */
-        function visitSwitchStatement(node) {
-            var caseBlock = ts.visitNode(node.caseBlock, visitNestedNode, ts.isCaseBlock);
-            if (caseBlock !== node.caseBlock) {
-                var updated = ts.getMutableClone(node);
-                updated.caseBlock = caseBlock;
-                return updated;
-            }
-            return node;
-        }
-        /**
-         * Visits the body of a CaseBlock to hoist declarations.
-         *
-         * @param node The node to visit.
-         */
-        function visitCaseBlock(node) {
-            var clauses = ts.visitNodes(node.clauses, visitNestedNode, ts.isCaseOrDefaultClause);
-            if (clauses !== node.clauses) {
-                var updated = ts.getMutableClone(node);
-                updated.clauses = clauses;
-                return updated;
-            }
-            return node;
-        }
-        /**
-         * Visits the body of a CaseClause to hoist declarations.
-         *
-         * @param node The clause to visit.
-         */
-        function visitCaseClause(node) {
-            var statements = ts.visitNodes(node.statements, visitNestedNode, ts.isStatement);
-            if (statements !== node.statements) {
-                var updated = ts.getMutableClone(node);
-                updated.statements = statements;
-                return updated;
-            }
-            return node;
-        }
-        /**
-         * Visits the body of a DefaultClause to hoist declarations.
-         *
-         * @param node The clause to visit.
-         */
-        function visitDefaultClause(node) {
-            return ts.visitEachChild(node, visitNestedNode, context);
-        }
-        /**
-         * Visits the body of a TryStatement to hoist declarations.
-         *
-         * @param node The statement to visit.
-         */
-        function visitTryStatement(node) {
-            return ts.visitEachChild(node, visitNestedNode, context);
-        }
-        /**
-         * Visits the body of a CatchClause to hoist declarations.
-         *
-         * @param node The clause to visit.
-         */
-        function visitCatchClause(node) {
-            var block = ts.visitNode(node.block, visitNestedNode, ts.isBlock);
-            if (block !== node.block) {
-                var updated = ts.getMutableClone(node);
-                updated.block = block;
-                return updated;
-            }
-            return node;
-        }
-        /**
-         * Visits the body of a Block to hoist declarations.
-         *
-         * @param node The block to visit.
-         */
-        function visitBlock(node) {
-            return ts.visitEachChild(node, visitNestedNode, context);
-        }
-        //
-        // Substitutions
-        //
-        function onEmitNode(emitContext, node, emitCallback) {
-            if (node.kind === 256 /* SourceFile */) {
-                exportFunctionForFile = exportFunctionForFileMap[ts.getOriginalNodeId(node)];
-                previousOnEmitNode(emitContext, node, emitCallback);
-                exportFunctionForFile = undefined;
-            }
-            else {
-                previousOnEmitNode(emitContext, node, emitCallback);
-            }
-        }
-        /**
-         * Hooks node substitutions.
-         *
-         * @param node The node to substitute.
-         * @param isExpression A value indicating whether the node is to be used in an expression
-         *                     position.
-         */
-        function onSubstituteNode(emitContext, node) {
-            node = previousOnSubstituteNode(emitContext, node);
-            if (emitContext === 1 /* Expression */) {
-                return substituteExpression(node);
-            }
-            return node;
-        }
-        /**
-         * Substitute the expression, if necessary.
-         *
-         * @param node The node to substitute.
-         */
-        function substituteExpression(node) {
-            switch (node.kind) {
-                case 70 /* Identifier */:
-                    return substituteExpressionIdentifier(node);
-                case 188 /* BinaryExpression */:
-                    return substituteBinaryExpression(node);
-                case 186 /* PrefixUnaryExpression */:
-                case 187 /* PostfixUnaryExpression */:
-                    return substituteUnaryExpression(node);
-            }
-            return node;
-        }
-        /**
-         * Substitution for identifiers exported at the top level of a module.
-         */
-        function substituteExpressionIdentifier(node) {
-            var importDeclaration = resolver.getReferencedImportDeclaration(node);
-            if (importDeclaration) {
-                var importBinding = createImportBinding(importDeclaration);
-                if (importBinding) {
-                    return importBinding;
-                }
-            }
-            return node;
-        }
-        function substituteBinaryExpression(node) {
-            if (ts.isAssignmentOperator(node.operatorToken.kind)) {
-                return substituteAssignmentExpression(node);
-            }
-            return node;
-        }
-        function substituteAssignmentExpression(node) {
-            ts.setEmitFlags(node, 128 /* NoSubstitution */);
-            var left = node.left;
-            switch (left.kind) {
-                case 70 /* Identifier */:
-                    var exportDeclaration = resolver.getReferencedExportContainer(left);
-                    if (exportDeclaration) {
-                        return createExportExpression(left, node);
-                    }
-                    break;
-                case 172 /* ObjectLiteralExpression */:
-                case 171 /* ArrayLiteralExpression */:
-                    if (hasExportedReferenceInDestructuringPattern(left)) {
-                        return substituteDestructuring(node);
-                    }
-                    break;
-            }
-            return node;
-        }
-        function isExportedBinding(name) {
-            var container = resolver.getReferencedExportContainer(name);
-            return container && container.kind === 256 /* SourceFile */;
-        }
-        function hasExportedReferenceInDestructuringPattern(node) {
-            switch (node.kind) {
-                case 70 /* Identifier */:
-                    return isExportedBinding(node);
-                case 172 /* ObjectLiteralExpression */:
-                    for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
-                        var property = _a[_i];
-                        if (hasExportedReferenceInObjectDestructuringElement(property)) {
-                            return true;
-                        }
-                    }
-                    break;
-                case 171 /* ArrayLiteralExpression */:
-                    for (var _b = 0, _c = node.elements; _b < _c.length; _b++) {
-                        var element = _c[_b];
-                        if (hasExportedReferenceInArrayDestructuringElement(element)) {
-                            return true;
-                        }
-                    }
-                    break;
-            }
-            return false;
-        }
-        function hasExportedReferenceInObjectDestructuringElement(node) {
-            if (ts.isShorthandPropertyAssignment(node)) {
-                return isExportedBinding(node.name);
-            }
-            else if (ts.isPropertyAssignment(node)) {
-                return hasExportedReferenceInDestructuringElement(node.initializer);
-            }
-            else {
-                return false;
-            }
-        }
-        function hasExportedReferenceInArrayDestructuringElement(node) {
-            if (ts.isSpreadElementExpression(node)) {
-                var expression = node.expression;
-                return ts.isIdentifier(expression) && isExportedBinding(expression);
-            }
-            else {
-                return hasExportedReferenceInDestructuringElement(node);
-            }
-        }
-        function hasExportedReferenceInDestructuringElement(node) {
-            if (ts.isBinaryExpression(node)) {
-                var left = node.left;
-                return node.operatorToken.kind === 57 /* EqualsToken */
-                    && isDestructuringPattern(left)
-                    && hasExportedReferenceInDestructuringPattern(left);
-            }
-            else if (ts.isIdentifier(node)) {
-                return isExportedBinding(node);
-            }
-            else if (ts.isSpreadElementExpression(node)) {
-                var expression = node.expression;
-                return ts.isIdentifier(expression) && isExportedBinding(expression);
-            }
-            else if (isDestructuringPattern(node)) {
-                return hasExportedReferenceInDestructuringPattern(node);
-            }
-            else {
-                return false;
-            }
-        }
-        function isDestructuringPattern(node) {
-            var kind = node.kind;
-            return kind === 70 /* Identifier */
-                || kind === 172 /* ObjectLiteralExpression */
-                || kind === 171 /* ArrayLiteralExpression */;
-        }
-        function substituteDestructuring(node) {
-            return ts.flattenDestructuringAssignment(context, node, /*needsValue*/ true, hoistVariableDeclaration);
-        }
-        function substituteUnaryExpression(node) {
-            var operand = node.operand;
-            var operator = node.operator;
-            var substitute = ts.isIdentifier(operand) &&
-                (node.kind === 187 /* PostfixUnaryExpression */ ||
-                    (node.kind === 186 /* PrefixUnaryExpression */ && (operator === 42 /* PlusPlusToken */ || operator === 43 /* MinusMinusToken */)));
-            if (substitute) {
-                var exportDeclaration = resolver.getReferencedExportContainer(operand);
-                if (exportDeclaration) {
-                    var expr = ts.createPrefix(node.operator, operand, node);
-                    ts.setEmitFlags(expr, 128 /* NoSubstitution */);
-                    var call = createExportExpression(operand, expr);
-                    if (node.kind === 186 /* PrefixUnaryExpression */) {
-                        return call;
-                    }
-                    else {
-                        // export function returns the value that was passes as the second argument
-                        // however for postfix unary expressions result value should be the value before modification.
-                        // emit 'x++' as '(export('x', ++x) - 1)' and 'x--' as '(export('x', --x) + 1)'
-                        return operator === 42 /* PlusPlusToken */
-                            ? ts.createSubtract(call, ts.createLiteral(1))
-                            : ts.createAdd(call, ts.createLiteral(1));
-                    }
-                }
-            }
-            return node;
-        }
-        /**
-         * Gets a name to use for a DeclarationStatement.
-         * @param node The declaration statement.
-         */
-        function getDeclarationName(node) {
-            return node.name ? ts.getSynthesizedClone(node.name) : ts.getGeneratedNameForNode(node);
-        }
-        function addExportStarFunction(statements, localNames) {
-            var exportStarFunction = ts.createUniqueName("exportStar");
-            var m = ts.createIdentifier("m");
-            var n = ts.createIdentifier("n");
-            var exports = ts.createIdentifier("exports");
-            var condition = ts.createStrictInequality(n, ts.createLiteral("default"));
-            if (localNames) {
-                condition = ts.createLogicalAnd(condition, ts.createLogicalNot(ts.createHasOwnProperty(localNames, n)));
-            }
-            statements.push(ts.createFunctionDeclaration(
-            /*decorators*/ undefined, 
-            /*modifiers*/ undefined, 
-            /*asteriskToken*/ undefined, exportStarFunction, 
-            /*typeParameters*/ undefined, [ts.createParameter(m)], 
-            /*type*/ undefined, ts.createBlock([
-                ts.createVariableStatement(
-                /*modifiers*/ undefined, ts.createVariableDeclarationList([
-                    ts.createVariableDeclaration(exports, 
-                    /*type*/ undefined, ts.createObjectLiteral([]))
-                ])),
-                ts.createForIn(ts.createVariableDeclarationList([
-                    ts.createVariableDeclaration(n, /*type*/ undefined)
-                ]), m, ts.createBlock([
-                    ts.setEmitFlags(ts.createIf(condition, ts.createStatement(ts.createAssignment(ts.createElementAccess(exports, n), ts.createElementAccess(m, n)))), 32 /* SingleLine */)
-                ])),
-                ts.createStatement(ts.createCall(exportFunctionForFile, 
-                /*typeArguments*/ undefined, [exports]))
-            ], 
-            /*location*/ undefined, 
-            /*multiline*/ true)));
-            return exportStarFunction;
-        }
-        /**
-         * Creates a call to the current file's export function to export a value.
-         * @param name The bound name of the export.
-         * @param value The exported value.
-         */
-        function createExportExpression(name, value) {
-            var exportName = ts.isIdentifier(name) ? ts.createLiteral(name.text) : name;
-            return ts.createCall(exportFunctionForFile, /*typeArguments*/ undefined, [exportName, value]);
-        }
-        /**
-         * Creates a call to the current file's export function to export a value.
-         * @param name The bound name of the export.
-         * @param value The exported value.
-         */
-        function createExportStatement(name, value) {
-            return ts.createStatement(createExportExpression(name, value));
-        }
-        /**
-         * Creates a call to the current file's export function to export a declaration.
-         * @param node The declaration to export.
-         */
-        function createDeclarationExport(node) {
-            var declarationName = getDeclarationName(node);
-            var exportName = ts.hasModifier(node, 512 /* Default */) ? ts.createLiteral("default") : declarationName;
-            return createExportStatement(exportName, declarationName);
-        }
-        function createImportBinding(importDeclaration) {
-            var importAlias;
-            var name;
-            if (ts.isImportClause(importDeclaration)) {
-                importAlias = ts.getGeneratedNameForNode(importDeclaration.parent);
-                name = ts.createIdentifier("default");
-            }
-            else if (ts.isImportSpecifier(importDeclaration)) {
-                importAlias = ts.getGeneratedNameForNode(importDeclaration.parent.parent.parent);
-                name = importDeclaration.propertyName || importDeclaration.name;
-            }
-            else {
-                return undefined;
-            }
-            return ts.createPropertyAccess(importAlias, ts.getSynthesizedClone(name));
-        }
-        function collectDependencyGroups(externalImports) {
-            var groupIndices = ts.createMap();
-            var dependencyGroups = [];
-            for (var i = 0; i < externalImports.length; i++) {
-                var externalImport = externalImports[i];
-                var externalModuleName = ts.getExternalModuleNameLiteral(externalImport, currentSourceFile, host, resolver, compilerOptions);
-                var text = externalModuleName.text;
-                if (ts.hasProperty(groupIndices, text)) {
-                    // deduplicate/group entries in dependency list by the dependency name
-                    var groupIndex = groupIndices[text];
-                    dependencyGroups[groupIndex].externalImports.push(externalImport);
-                    continue;
-                }
-                else {
-                    groupIndices[text] = dependencyGroups.length;
-                    dependencyGroups.push({
-                        name: externalModuleName,
-                        externalImports: [externalImport]
-                    });
-                }
-            }
-            return dependencyGroups;
-        }
-        function getNameOfDependencyGroup(dependencyGroup) {
-            return dependencyGroup.name;
-        }
-        function recordExportName(name) {
-            if (!exportedLocalNames) {
-                exportedLocalNames = [];
-            }
-            exportedLocalNames.push(name);
-        }
-        function recordExportedFunctionDeclaration(node) {
-            if (!exportedFunctionDeclarations) {
-                exportedFunctionDeclarations = [];
-            }
-            exportedFunctionDeclarations.push(createDeclarationExport(node));
-        }
-        function hoistBindingElement(node, isExported) {
-            if (ts.isOmittedExpression(node)) {
-                return;
-            }
-            var name = node.name;
-            if (ts.isIdentifier(name)) {
-                hoistVariableDeclaration(ts.getSynthesizedClone(name));
-                if (isExported) {
-                    recordExportName(name);
-                }
-            }
-            else if (ts.isBindingPattern(name)) {
-                ts.forEach(name.elements, isExported ? hoistExportedBindingElement : hoistNonExportedBindingElement);
-            }
-        }
-        function hoistExportedBindingElement(node) {
-            hoistBindingElement(node, /*isExported*/ true);
-        }
-        function hoistNonExportedBindingElement(node) {
-            hoistBindingElement(node, /*isExported*/ false);
-        }
-        function updateSourceFile(node, statements, nodeEmitFlags) {
-            var updated = ts.getMutableClone(node);
-            updated.statements = ts.createNodeArray(statements, node.statements);
-            ts.setEmitFlags(updated, nodeEmitFlags);
-            return updated;
-        }
-    }
-    ts.transformSystemModule = transformSystemModule;
-})(ts || (ts = {}));
-/// <reference path="../../factory.ts" />
-/// <reference path="../../visitor.ts" />
-/*@internal*/
-var ts;
-(function (ts) {
-    function transformES2015Module(context) {
-        var compilerOptions = context.getCompilerOptions();
-        return transformSourceFile;
-        function transformSourceFile(node) {
-            if (ts.isDeclarationFile(node)) {
-                return node;
-            }
-            if (ts.isExternalModule(node) || compilerOptions.isolatedModules) {
-                return ts.visitEachChild(node, visitor, context);
-            }
-            return node;
-        }
-        function visitor(node) {
-            switch (node.kind) {
-                case 230 /* ImportEqualsDeclaration */:
-                    // Elide `import=` as it is not legal with --module ES6
-                    return undefined;
-                case 236 /* ExportAssignment */:
-                    return visitExportAssignment(node);
-            }
-            return node;
-        }
-        function visitExportAssignment(node) {
-            // Elide `export=` as it is not legal with --module ES6
-            return node.isExportEquals ? undefined : node;
-        }
-    }
-    ts.transformES2015Module = transformES2015Module;
-})(ts || (ts = {}));
 /// <reference path="../factory.ts" />
 /// <reference path="../visitor.ts" />
 /*@internal*/
@@ -53624,8 +53542,8 @@ var ts;
     function transformES5(context) {
         var previousOnSubstituteNode = context.onSubstituteNode;
         context.onSubstituteNode = onSubstituteNode;
-        context.enableSubstitution(173 /* PropertyAccessExpression */);
-        context.enableSubstitution(253 /* PropertyAssignment */);
+        context.enableSubstitution(177 /* PropertyAccessExpression */);
+        context.enableSubstitution(257 /* PropertyAssignment */);
         return transformSourceFile;
         /**
          * Transforms an ES5 source file to ES3.
@@ -53690,9 +53608,2452 @@ var ts;
     }
     ts.transformES5 = transformES5;
 })(ts || (ts = {}));
+/// <reference path="../../factory.ts" />
+/// <reference path="../../visitor.ts" />
+/*@internal*/
+var ts;
+(function (ts) {
+    function transformES2015Module(context) {
+        var compilerOptions = context.getCompilerOptions();
+        return transformSourceFile;
+        function transformSourceFile(node) {
+            if (ts.isDeclarationFile(node)) {
+                return node;
+            }
+            if (ts.isExternalModule(node) || compilerOptions.isolatedModules) {
+                return ts.visitEachChild(node, visitor, context);
+            }
+            return node;
+        }
+        function visitor(node) {
+            switch (node.kind) {
+                case 234 /* ImportEqualsDeclaration */:
+                    // Elide `import=` as it is not legal with --module ES6
+                    return undefined;
+                case 240 /* ExportAssignment */:
+                    return visitExportAssignment(node);
+            }
+            return node;
+        }
+        function visitExportAssignment(node) {
+            // Elide `export=` as it is not legal with --module ES6
+            return node.isExportEquals ? undefined : node;
+        }
+    }
+    ts.transformES2015Module = transformES2015Module;
+})(ts || (ts = {}));
+/// <reference path="../../factory.ts" />
+/// <reference path="../../visitor.ts" />
+/*@internal*/
+var ts;
+(function (ts) {
+    function transformSystemModule(context) {
+        var startLexicalEnvironment = context.startLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration;
+        var compilerOptions = context.getCompilerOptions();
+        var resolver = context.getEmitResolver();
+        var host = context.getEmitHost();
+        var previousOnSubstituteNode = context.onSubstituteNode;
+        var previousOnEmitNode = context.onEmitNode;
+        context.onSubstituteNode = onSubstituteNode;
+        context.onEmitNode = onEmitNode;
+        context.enableSubstitution(70 /* Identifier */); // Substitutes expression identifiers for imported symbols.
+        context.enableSubstitution(192 /* BinaryExpression */); // Substitutes assignments to exported symbols.
+        context.enableSubstitution(190 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(191 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableEmitNotification(261 /* SourceFile */); // Restore state when substituting nodes in a file.
+        var moduleInfoMap = ts.createMap(); // The ExternalModuleInfo for each file.
+        var deferredExports = ts.createMap(); // Exports to defer until an EndOfDeclarationMarker is found.
+        var exportFunctionsMap = ts.createMap(); // The export function associated with a source file.
+        var noSubstitutionMap = ts.createMap(); // Set of nodes for which substitution rules should be ignored for each file.
+        var currentSourceFile; // The current file.
+        var moduleInfo; // ExternalModuleInfo for the current file.
+        var exportFunction; // The export function for the current file.
+        var contextObject; // The context object for the current file.
+        var hoistedStatements;
+        var enclosingBlockScopedContainer;
+        var noSubstitution; // Set of nodes for which substitution rules should be ignored.
+        return transformSourceFile;
+        /**
+         * Transforms the module aspects of a SourceFile.
+         *
+         * @param node The SourceFile node.
+         */
+        function transformSourceFile(node) {
+            if (ts.isDeclarationFile(node)
+                || !(ts.isExternalModule(node)
+                    || compilerOptions.isolatedModules)) {
+                return node;
+            }
+            var id = ts.getOriginalNodeId(node);
+            currentSourceFile = node;
+            enclosingBlockScopedContainer = node;
+            // System modules have the following shape:
+            //
+            //     System.register(['dep-1', ... 'dep-n'], function(exports) {/* module body function */})
+            //
+            // The parameter 'exports' here is a callback '<T>(name: string, value: T) => T' that
+            // is used to publish exported values. 'exports' returns its 'value' argument so in
+            // most cases expressions that mutate exported values can be rewritten as:
+            //
+            //     expr -> exports('name', expr)
+            //
+            // The only exception in this rule is postfix unary operators,
+            // see comment to 'substitutePostfixUnaryExpression' for more details
+            // Collect information about the external module and dependency groups.
+            moduleInfo = moduleInfoMap[id] = ts.collectExternalModuleInfo(node, resolver);
+            // Make sure that the name of the 'exports' function does not conflict with
+            // existing identifiers.
+            exportFunction = exportFunctionsMap[id] = ts.createUniqueName("exports");
+            contextObject = ts.createUniqueName("context");
+            // Add the body of the module.
+            var dependencyGroups = collectDependencyGroups(moduleInfo.externalImports);
+            var moduleBodyFunction = ts.createFunctionExpression(
+            /*modifiers*/ undefined, 
+            /*asteriskToken*/ undefined, 
+            /*name*/ undefined, 
+            /*typeParameters*/ undefined, [
+                ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, exportFunction),
+                ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, contextObject)
+            ], 
+            /*type*/ undefined, createSystemModuleBody(node, dependencyGroups));
+            // Write the call to `System.register`
+            // Clear the emit-helpers flag for later passes since we'll have already used it in the module body
+            // So the helper will be emit at the correct position instead of at the top of the source-file
+            var moduleName = ts.tryGetModuleNameFromFile(node, host, compilerOptions);
+            var dependencies = ts.createArrayLiteral(ts.map(dependencyGroups, function (dependencyGroup) { return dependencyGroup.name; }));
+            var updated = ts.updateSourceFileNode(node, ts.createNodeArray([
+                ts.createStatement(ts.createCall(ts.createPropertyAccess(ts.createIdentifier("System"), "register"), 
+                /*typeArguments*/ undefined, moduleName
+                    ? [moduleName, dependencies, moduleBodyFunction]
+                    : [dependencies, moduleBodyFunction]))
+            ], node.statements));
+            ts.setEmitFlags(updated, ts.getEmitFlags(node) & ~1 /* EmitEmitHelpers */);
+            if (noSubstitution) {
+                noSubstitutionMap[id] = noSubstitution;
+                noSubstitution = undefined;
+            }
+            currentSourceFile = undefined;
+            moduleInfo = undefined;
+            exportFunction = undefined;
+            contextObject = undefined;
+            hoistedStatements = undefined;
+            enclosingBlockScopedContainer = undefined;
+            return ts.aggregateTransformFlags(updated);
+        }
+        /**
+         * Collects the dependency groups for this files imports.
+         *
+         * @param externalImports The imports for the file.
+         */
+        function collectDependencyGroups(externalImports) {
+            var groupIndices = ts.createMap();
+            var dependencyGroups = [];
+            for (var i = 0; i < externalImports.length; i++) {
+                var externalImport = externalImports[i];
+                var externalModuleName = ts.getExternalModuleNameLiteral(externalImport, currentSourceFile, host, resolver, compilerOptions);
+                var text = externalModuleName.text;
+                if (ts.hasProperty(groupIndices, text)) {
+                    // deduplicate/group entries in dependency list by the dependency name
+                    var groupIndex = groupIndices[text];
+                    dependencyGroups[groupIndex].externalImports.push(externalImport);
+                }
+                else {
+                    groupIndices[text] = dependencyGroups.length;
+                    dependencyGroups.push({
+                        name: externalModuleName,
+                        externalImports: [externalImport]
+                    });
+                }
+            }
+            return dependencyGroups;
+        }
+        /**
+         * Adds the statements for the module body function for the source file.
+         *
+         * @param node The source file for the module.
+         * @param dependencyGroups The grouped dependencies of the module.
+         */
+        function createSystemModuleBody(node, dependencyGroups) {
+            // Shape of the body in system modules:
+            //
+            //  function (exports) {
+            //      <list of local aliases for imports>
+            //      <hoisted variable declarations>
+            //      <hoisted function declarations>
+            //      return {
+            //          setters: [
+            //              <list of setter function for imports>
+            //          ],
+            //          execute: function() {
+            //              <module statements>
+            //          }
+            //      }
+            //      <temp declarations>
+            //  }
+            //
+            // i.e:
+            //
+            //   import {x} from 'file1'
+            //   var y = 1;
+            //   export function foo() { return y + x(); }
+            //   console.log(y);
+            //
+            // Will be transformed to:
+            //
+            //  function(exports) {
+            //      function foo() { return y + file_1.x(); }
+            //      exports("foo", foo);
+            //      var file_1, y;
+            //      return {
+            //          setters: [
+            //              function(v) { file_1 = v }
+            //          ],
+            //          execute(): function() {
+            //              y = 1;
+            //              console.log(y);
+            //          }
+            //      };
+            //  }
+            var statements = [];
+            // We start a new lexical environment in this function body, but *not* in the
+            // body of the execute function. This allows us to emit temporary declarations
+            // only in the outer module body and not in the inner one.
+            startLexicalEnvironment();
+            // Add any prologue directives.
+            var statementOffset = ts.addPrologueDirectives(statements, node.statements, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict, sourceElementVisitor);
+            // var __moduleName = context_1 && context_1.id;
+            statements.push(ts.createVariableStatement(
+            /*modifiers*/ undefined, ts.createVariableDeclarationList([
+                ts.createVariableDeclaration("__moduleName", 
+                /*type*/ undefined, ts.createLogicalAnd(contextObject, ts.createPropertyAccess(contextObject, "id")))
+            ])));
+            // Visit the statements of the source file, emitting any transformations into
+            // the `executeStatements` array. We do this *before* we fill the `setters` array
+            // as we both emit transformations as well as aggregate some data used when creating
+            // setters. This allows us to reduce the number of times we need to loop through the
+            // statements of the source file.
+            var executeStatements = ts.visitNodes(node.statements, sourceElementVisitor, ts.isStatement, statementOffset);
+            // Emit early exports for function declarations.
+            ts.addRange(statements, hoistedStatements);
+            // We emit hoisted variables early to align roughly with our previous emit output.
+            // Two key differences in this approach are:
+            // - Temporary variables will appear at the top rather than at the bottom of the file
+            ts.addRange(statements, endLexicalEnvironment());
+            var exportStarFunction = addExportStarIfNeeded(statements);
+            statements.push(ts.createReturn(ts.setMultiLine(ts.createObjectLiteral([
+                ts.createPropertyAssignment("setters", createSettersArray(exportStarFunction, dependencyGroups)),
+                ts.createPropertyAssignment("execute", ts.createFunctionExpression(
+                /*modifiers*/ undefined, 
+                /*asteriskToken*/ undefined, 
+                /*name*/ undefined, 
+                /*typeParameters*/ undefined, 
+                /*parameters*/ [], 
+                /*type*/ undefined, ts.createBlock(executeStatements, 
+                /*location*/ undefined, 
+                /*multiLine*/ true)))
+            ]), 
+            /*multiLine*/ true)));
+            var body = ts.createBlock(statements, /*location*/ undefined, /*multiLine*/ true);
+            ts.setEmitFlags(body, 1 /* EmitEmitHelpers */);
+            return body;
+        }
+        /**
+         * Adds an exportStar function to a statement list if it is needed for the file.
+         *
+         * @param statements A statement list.
+         */
+        function addExportStarIfNeeded(statements) {
+            if (!moduleInfo.hasExportStarsToExportValues) {
+                return;
+            }
+            // when resolving exports local exported entries/indirect exported entries in the module
+            // should always win over entries with similar names that were added via star exports
+            // to support this we store names of local/indirect exported entries in a set.
+            // this set is used to filter names brought by star expors.
+            // local names set should only be added if we have anything exported
+            if (!moduleInfo.exportedNames && ts.isEmpty(moduleInfo.exportSpecifiers)) {
+                // no exported declarations (export var ...) or export specifiers (export {x})
+                // check if we have any non star export declarations.
+                var hasExportDeclarationWithExportClause = false;
+                for (var _i = 0, _a = moduleInfo.externalImports; _i < _a.length; _i++) {
+                    var externalImport = _a[_i];
+                    if (externalImport.kind === 241 /* ExportDeclaration */ && externalImport.exportClause) {
+                        hasExportDeclarationWithExportClause = true;
+                        break;
+                    }
+                }
+                if (!hasExportDeclarationWithExportClause) {
+                    // we still need to emit exportStar helper
+                    var exportStarFunction_1 = createExportStarFunction(/*localNames*/ undefined);
+                    statements.push(exportStarFunction_1);
+                    return exportStarFunction_1.name;
+                }
+            }
+            var exportedNames = [];
+            if (moduleInfo.exportedNames) {
+                for (var _b = 0, _c = moduleInfo.exportedNames; _b < _c.length; _b++) {
+                    var exportedLocalName = _c[_b];
+                    if (exportedLocalName.text === "default") {
+                        continue;
+                    }
+                    // write name of exported declaration, i.e 'export var x...'
+                    exportedNames.push(ts.createPropertyAssignment(ts.createLiteral(exportedLocalName), ts.createLiteral(true)));
+                }
+            }
+            for (var _d = 0, _e = moduleInfo.externalImports; _d < _e.length; _d++) {
+                var externalImport = _e[_d];
+                if (externalImport.kind !== 241 /* ExportDeclaration */) {
+                    continue;
+                }
+                var exportDecl = externalImport;
+                if (!exportDecl.exportClause) {
+                    // export * from ...
+                    continue;
+                }
+                for (var _f = 0, _g = exportDecl.exportClause.elements; _f < _g.length; _f++) {
+                    var element = _g[_f];
+                    // write name of indirectly exported entry, i.e. 'export {x} from ...'
+                    exportedNames.push(ts.createPropertyAssignment(ts.createLiteral((element.name || element.propertyName).text), ts.createLiteral(true)));
+                }
+            }
+            var exportedNamesStorageRef = ts.createUniqueName("exportedNames");
+            statements.push(ts.createVariableStatement(
+            /*modifiers*/ undefined, ts.createVariableDeclarationList([
+                ts.createVariableDeclaration(exportedNamesStorageRef, 
+                /*type*/ undefined, ts.createObjectLiteral(exportedNames, /*location*/ undefined, /*multiline*/ true))
+            ])));
+            var exportStarFunction = createExportStarFunction(exportedNamesStorageRef);
+            statements.push(exportStarFunction);
+            return exportStarFunction.name;
+        }
+        /**
+         * Creates an exportStar function for the file, with an optional set of excluded local
+         * names.
+         *
+         * @param localNames An optional reference to an object containing a set of excluded local
+         * names.
+         */
+        function createExportStarFunction(localNames) {
+            var exportStarFunction = ts.createUniqueName("exportStar");
+            var m = ts.createIdentifier("m");
+            var n = ts.createIdentifier("n");
+            var exports = ts.createIdentifier("exports");
+            var condition = ts.createStrictInequality(n, ts.createLiteral("default"));
+            if (localNames) {
+                condition = ts.createLogicalAnd(condition, ts.createLogicalNot(ts.createHasOwnProperty(localNames, n)));
+            }
+            return ts.createFunctionDeclaration(
+            /*decorators*/ undefined, 
+            /*modifiers*/ undefined, 
+            /*asteriskToken*/ undefined, exportStarFunction, 
+            /*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, m)], 
+            /*type*/ undefined, ts.createBlock([
+                ts.createVariableStatement(
+                /*modifiers*/ undefined, ts.createVariableDeclarationList([
+                    ts.createVariableDeclaration(exports, 
+                    /*type*/ undefined, ts.createObjectLiteral([]))
+                ])),
+                ts.createForIn(ts.createVariableDeclarationList([
+                    ts.createVariableDeclaration(n, /*type*/ undefined)
+                ]), m, ts.createBlock([
+                    ts.setEmitFlags(ts.createIf(condition, ts.createStatement(ts.createAssignment(ts.createElementAccess(exports, n), ts.createElementAccess(m, n)))), 32 /* SingleLine */)
+                ])),
+                ts.createStatement(ts.createCall(exportFunction, 
+                /*typeArguments*/ undefined, [exports]))
+            ], 
+            /*location*/ undefined, 
+            /*multiline*/ true));
+        }
+        /**
+         * Creates an array setter callbacks for each dependency group.
+         *
+         * @param exportStarFunction A reference to an exportStarFunction for the file.
+         * @param dependencyGroups An array of grouped dependencies.
+         */
+        function createSettersArray(exportStarFunction, dependencyGroups) {
+            var setters = [];
+            for (var _i = 0, dependencyGroups_1 = dependencyGroups; _i < dependencyGroups_1.length; _i++) {
+                var group = dependencyGroups_1[_i];
+                // derive a unique name for parameter from the first named entry in the group
+                var localName = ts.forEach(group.externalImports, function (i) { return ts.getLocalNameForExternalImport(i, currentSourceFile); });
+                var parameterName = localName ? ts.getGeneratedNameForNode(localName) : ts.createUniqueName("");
+                var statements = [];
+                for (var _a = 0, _b = group.externalImports; _a < _b.length; _a++) {
+                    var entry = _b[_a];
+                    var importVariableName = ts.getLocalNameForExternalImport(entry, currentSourceFile);
+                    switch (entry.kind) {
+                        case 235 /* ImportDeclaration */:
+                            if (!entry.importClause) {
+                                // 'import "..."' case
+                                // module is imported only for side-effects, no emit required
+                                break;
+                            }
+                        // fall-through
+                        case 234 /* ImportEqualsDeclaration */:
+                            ts.Debug.assert(importVariableName !== undefined);
+                            // save import into the local
+                            statements.push(ts.createStatement(ts.createAssignment(importVariableName, parameterName)));
+                            break;
+                        case 241 /* ExportDeclaration */:
+                            ts.Debug.assert(importVariableName !== undefined);
+                            if (entry.exportClause) {
+                                //  export {a, b as c} from 'foo'
+                                //
+                                // emit as:
+                                //
+                                //  exports_({
+                                //     "a": _["a"],
+                                //     "c": _["b"]
+                                //  });
+                                var properties = [];
+                                for (var _c = 0, _d = entry.exportClause.elements; _c < _d.length; _c++) {
+                                    var e = _d[_c];
+                                    properties.push(ts.createPropertyAssignment(ts.createLiteral(e.name.text), ts.createElementAccess(parameterName, ts.createLiteral((e.propertyName || e.name).text))));
+                                }
+                                statements.push(ts.createStatement(ts.createCall(exportFunction, 
+                                /*typeArguments*/ undefined, [ts.createObjectLiteral(properties, /*location*/ undefined, /*multiline*/ true)])));
+                            }
+                            else {
+                                //  export * from 'foo'
+                                //
+                                // emit as:
+                                //
+                                //  exportStar(foo_1_1);
+                                statements.push(ts.createStatement(ts.createCall(exportStarFunction, 
+                                /*typeArguments*/ undefined, [parameterName])));
+                            }
+                            break;
+                    }
+                }
+                setters.push(ts.createFunctionExpression(
+                /*modifiers*/ undefined, 
+                /*asteriskToken*/ undefined, 
+                /*name*/ undefined, 
+                /*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, parameterName)], 
+                /*type*/ undefined, ts.createBlock(statements, /*location*/ undefined, /*multiLine*/ true)));
+            }
+            return ts.createArrayLiteral(setters, /*location*/ undefined, /*multiLine*/ true);
+        }
+        //
+        // Top-level Source Element Visitors
+        //
+        /**
+         * Visit source elements at the top-level of a module.
+         *
+         * @param node The node to visit.
+         */
+        function sourceElementVisitor(node) {
+            switch (node.kind) {
+                case 235 /* ImportDeclaration */:
+                    return visitImportDeclaration(node);
+                case 234 /* ImportEqualsDeclaration */:
+                    return visitImportEqualsDeclaration(node);
+                case 241 /* ExportDeclaration */:
+                    // ExportDeclarations are elided as they are handled via
+                    // `appendExportsOfDeclaration`.
+                    return undefined;
+                case 240 /* ExportAssignment */:
+                    return visitExportAssignment(node);
+                default:
+                    return nestedElementVisitor(node);
+            }
+        }
+        /**
+         * Visits an ImportDeclaration node.
+         *
+         * @param node The node to visit.
+         */
+        function visitImportDeclaration(node) {
+            var statements;
+            if (node.importClause) {
+                hoistVariableDeclaration(ts.getLocalNameForExternalImport(node, currentSourceFile));
+            }
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfImportDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfImportDeclaration(statements, node);
+            }
+            return ts.singleOrMany(statements);
+        }
+        /**
+         * Visits an ImportEqualsDeclaration node.
+         *
+         * @param node The node to visit.
+         */
+        function visitImportEqualsDeclaration(node) {
+            ts.Debug.assert(ts.isExternalModuleImportEqualsDeclaration(node), "import= for internal module references should be handled in an earlier transformer.");
+            var statements;
+            hoistVariableDeclaration(ts.getLocalNameForExternalImport(node, currentSourceFile));
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfImportEqualsDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfImportEqualsDeclaration(statements, node);
+            }
+            return ts.singleOrMany(statements);
+        }
+        /**
+         * Visits an ExportAssignment node.
+         *
+         * @param node The node to visit.
+         */
+        function visitExportAssignment(node) {
+            if (node.isExportEquals) {
+                // Elide `export=` as it is illegal in a SystemJS module.
+                return undefined;
+            }
+            var expression = ts.visitNode(node.expression, destructuringVisitor, ts.isExpression);
+            var original = node.original;
+            if (original && hasAssociatedEndOfDeclarationMarker(original)) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportStatement(deferredExports[id], ts.createIdentifier("default"), expression, /*allowComments*/ true);
+            }
+            else {
+                return createExportStatement(ts.createIdentifier("default"), expression, /*allowComments*/ true);
+            }
+        }
+        /**
+         * Visits a FunctionDeclaration, hoisting it to the outer module body function.
+         *
+         * @param node The node to visit.
+         */
+        function visitFunctionDeclaration(node) {
+            if (ts.hasModifier(node, 1 /* Export */)) {
+                hoistedStatements = ts.append(hoistedStatements, ts.updateFunctionDeclaration(node, node.decorators, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), ts.getDeclarationName(node, /*allowComments*/ true, /*allowSourceMaps*/ true), 
+                /*typeParameters*/ undefined, ts.visitNodes(node.parameters, destructuringVisitor, ts.isParameterDeclaration), 
+                /*type*/ undefined, ts.visitNode(node.body, destructuringVisitor, ts.isBlock)));
+            }
+            else {
+                hoistedStatements = ts.append(hoistedStatements, node);
+            }
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfHoistedDeclaration(deferredExports[id], node);
+            }
+            else {
+                hoistedStatements = appendExportsOfHoistedDeclaration(hoistedStatements, node);
+            }
+            return undefined;
+        }
+        /**
+         * Visits a ClassDeclaration, hoisting its name to the outer module body function.
+         *
+         * @param node The node to visit.
+         */
+        function visitClassDeclaration(node) {
+            var statements;
+            // Hoist the name of the class declaration to the outer module body function.
+            var name = ts.getLocalName(node);
+            hoistVariableDeclaration(name);
+            // Rewrite the class declaration into an assignment of a class expression.
+            statements = ts.append(statements, ts.createStatement(ts.createAssignment(name, ts.createClassExpression(
+            /*modifiers*/ undefined, node.name, 
+            /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, destructuringVisitor, ts.isHeritageClause), ts.visitNodes(node.members, destructuringVisitor, ts.isClassElement), 
+            /*location*/ node)), 
+            /*location*/ node));
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfHoistedDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfHoistedDeclaration(statements, node);
+            }
+            return ts.singleOrMany(statements);
+        }
+        /**
+         * Visits a variable statement, hoisting declared names to the top-level module body.
+         * Each declaration is rewritten into an assignment expression.
+         *
+         * @param node The node to visit.
+         */
+        function visitVariableStatement(node) {
+            if (!shouldHoistVariableDeclarationList(node.declarationList)) {
+                return ts.visitNode(node, destructuringVisitor, ts.isStatement);
+            }
+            var expressions;
+            var isExportedDeclaration = ts.hasModifier(node, 1 /* Export */);
+            var isMarkedDeclaration = hasAssociatedEndOfDeclarationMarker(node);
+            for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
+                var variable = _a[_i];
+                if (variable.initializer) {
+                    expressions = ts.append(expressions, transformInitializedVariable(variable, isExportedDeclaration && !isMarkedDeclaration));
+                }
+                else {
+                    hoistBindingElement(variable);
+                }
+            }
+            var statements;
+            if (expressions) {
+                statements = ts.append(statements, ts.createStatement(ts.inlineExpressions(expressions), /*location*/ node));
+            }
+            if (isMarkedDeclaration) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node, isExportedDeclaration);
+            }
+            else {
+                statements = appendExportsOfVariableStatement(statements, node, /*exportSelf*/ false);
+            }
+            return ts.singleOrMany(statements);
+        }
+        /**
+         * Hoists the declared names of a VariableDeclaration or BindingElement.
+         *
+         * @param node The declaration to hoist.
+         */
+        function hoistBindingElement(node) {
+            if (ts.isBindingPattern(node.name)) {
+                for (var _i = 0, _a = node.name.elements; _i < _a.length; _i++) {
+                    var element = _a[_i];
+                    if (!ts.isOmittedExpression(element)) {
+                        hoistBindingElement(element);
+                    }
+                }
+            }
+            else {
+                hoistVariableDeclaration(ts.getSynthesizedClone(node.name));
+            }
+        }
+        /**
+         * Determines whether a VariableDeclarationList should be hoisted.
+         *
+         * @param node The node to test.
+         */
+        function shouldHoistVariableDeclarationList(node) {
+            // hoist only non-block scoped declarations or block scoped declarations parented by source file
+            return (ts.getEmitFlags(node) & 16777216 /* NoHoisting */) === 0
+                && (enclosingBlockScopedContainer.kind === 261 /* SourceFile */
+                    || (ts.getOriginalNode(node).flags & 3 /* BlockScoped */) === 0);
+        }
+        /**
+         * Transform an initialized variable declaration into an expression.
+         *
+         * @param node The node to transform.
+         * @param isExportedDeclaration A value indicating whether the variable is exported.
+         */
+        function transformInitializedVariable(node, isExportedDeclaration) {
+            var createAssignment = isExportedDeclaration ? createExportedVariableAssignment : createNonExportedVariableAssignment;
+            return ts.isBindingPattern(node.name)
+                ? ts.flattenVariableDestructuringToExpression(node, hoistVariableDeclaration, createAssignment, destructuringVisitor)
+                : createAssignment(node.name, ts.visitNode(node.initializer, destructuringVisitor, ts.isExpression));
+        }
+        /**
+         * Creates an assignment expression for an exported variable declaration.
+         *
+         * @param name The name of the variable.
+         * @param value The value of the variable's initializer.
+         * @param location The source map location for the assignment.
+         */
+        function createExportedVariableAssignment(name, value, location) {
+            return createVariableAssignment(name, value, location, /*isExportedDeclaration*/ true);
+        }
+        /**
+         * Creates an assignment expression for a non-exported variable declaration.
+         *
+         * @param name The name of the variable.
+         * @param value The value of the variable's initializer.
+         * @param location The source map location for the assignment.
+         */
+        function createNonExportedVariableAssignment(name, value, location) {
+            return createVariableAssignment(name, value, location, /*isExportedDeclaration*/ false);
+        }
+        /**
+         * Creates an assignment expression for a variable declaration.
+         *
+         * @param name The name of the variable.
+         * @param value The value of the variable's initializer.
+         * @param location The source map location for the assignment.
+         * @param isExportedDeclaration A value indicating whether the variable is exported.
+         */
+        function createVariableAssignment(name, value, location, isExportedDeclaration) {
+            hoistVariableDeclaration(ts.getSynthesizedClone(name));
+            return isExportedDeclaration
+                ? createExportExpression(name, preventSubstitution(ts.createAssignment(name, value, location)))
+                : preventSubstitution(ts.createAssignment(name, value, location));
+        }
+        /**
+         * Visits a MergeDeclarationMarker used as a placeholder for the beginning of a merged
+         * and transformed declaration.
+         *
+         * @param node The node to visit.
+         */
+        function visitMergeDeclarationMarker(node) {
+            // For an EnumDeclaration or ModuleDeclaration that merges with a preceeding
+            // declaration we do not emit a leading variable declaration. To preserve the
+            // begin/end semantics of the declararation and to properly handle exports
+            // we wrapped the leading variable declaration in a `MergeDeclarationMarker`.
+            //
+            // 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 === 205 /* VariableStatement */) {
+                var id = ts.getOriginalNodeId(node);
+                var isExportedDeclaration = ts.hasModifier(node.original, 1 /* Export */);
+                deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node.original, isExportedDeclaration);
+            }
+            return node;
+        }
+        /**
+         * Determines whether a node has an associated EndOfDeclarationMarker.
+         *
+         * @param node The node to test.
+         */
+        function hasAssociatedEndOfDeclarationMarker(node) {
+            return (ts.getEmitFlags(node) & 33554432 /* HasEndOfDeclarationMarker */) !== 0;
+        }
+        /**
+         * Visits a DeclarationMarker used as a placeholder for the end of a transformed
+         * declaration.
+         *
+         * @param node The node to visit.
+         */
+        function visitEndOfDeclarationMarker(node) {
+            // For some transformations we emit an `EndOfDeclarationMarker` to mark the actual
+            // end of the transformed declaration. We use this marker to emit any deferred exports
+            // of the declaration.
+            var id = ts.getOriginalNodeId(node);
+            var statements = deferredExports[id];
+            if (statements) {
+                delete deferredExports[id];
+                return ts.append(statements, node);
+            }
+            return node;
+        }
+        /**
+         * Appends the exports of an ImportDeclaration to a statement list, returning the
+         * statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param decl The declaration whose exports are to be recorded.
+         */
+        function appendExportsOfImportDeclaration(statements, decl) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            var importClause = decl.importClause;
+            if (!importClause) {
+                return statements;
+            }
+            if (importClause.name) {
+                statements = appendExportsOfDeclaration(statements, importClause);
+            }
+            var namedBindings = importClause.namedBindings;
+            if (namedBindings) {
+                switch (namedBindings.kind) {
+                    case 237 /* NamespaceImport */:
+                        statements = appendExportsOfDeclaration(statements, namedBindings);
+                        break;
+                    case 238 /* NamedImports */:
+                        for (var _i = 0, _a = namedBindings.elements; _i < _a.length; _i++) {
+                            var importBinding = _a[_i];
+                            statements = appendExportsOfDeclaration(statements, importBinding);
+                        }
+                        break;
+                }
+            }
+            return statements;
+        }
+        /**
+         * Appends the export of an ImportEqualsDeclaration to a statement list, returning the
+         * statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param decl The declaration whose exports are to be recorded.
+         */
+        function appendExportsOfImportEqualsDeclaration(statements, decl) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            return appendExportsOfDeclaration(statements, decl);
+        }
+        /**
+         * Appends the exports of a VariableStatement to a statement list, returning the statement
+         * list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param node The VariableStatement whose exports are to be recorded.
+         * @param exportSelf A value indicating whether to also export each VariableDeclaration of
+         * `nodes` declaration list.
+         */
+        function appendExportsOfVariableStatement(statements, node, exportSelf) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
+                var decl = _a[_i];
+                if (decl.initializer || exportSelf) {
+                    statements = appendExportsOfBindingElement(statements, decl, exportSelf);
+                }
+            }
+            return statements;
+        }
+        /**
+         * Appends the exports of a VariableDeclaration or BindingElement to a statement list,
+         * returning the statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param decl The declaration whose exports are to be recorded.
+         * @param exportSelf A value indicating whether to also export the declaration itself.
+         */
+        function appendExportsOfBindingElement(statements, decl, exportSelf) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            if (ts.isBindingPattern(decl.name)) {
+                for (var _i = 0, _a = decl.name.elements; _i < _a.length; _i++) {
+                    var element = _a[_i];
+                    if (!ts.isOmittedExpression(element)) {
+                        statements = appendExportsOfBindingElement(statements, element, exportSelf);
+                    }
+                }
+            }
+            else if (!ts.isGeneratedIdentifier(decl.name)) {
+                var excludeName = void 0;
+                if (exportSelf) {
+                    statements = appendExportStatement(statements, decl.name, ts.getLocalName(decl));
+                    excludeName = decl.name.text;
+                }
+                statements = appendExportsOfDeclaration(statements, decl, excludeName);
+            }
+            return statements;
+        }
+        /**
+         * Appends the exports of a ClassDeclaration or FunctionDeclaration to a statement list,
+         * returning the statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param decl The declaration whose exports are to be recorded.
+         */
+        function appendExportsOfHoistedDeclaration(statements, decl) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            var excludeName;
+            if (ts.hasModifier(decl, 1 /* Export */)) {
+                var exportName = ts.hasModifier(decl, 512 /* Default */) ? ts.createLiteral("default") : decl.name;
+                statements = appendExportStatement(statements, exportName, ts.getLocalName(decl));
+                excludeName = exportName.text;
+            }
+            if (decl.name) {
+                statements = appendExportsOfDeclaration(statements, decl, excludeName);
+            }
+            return statements;
+        }
+        /**
+         * Appends the exports of a declaration to a statement list, returning the statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param decl The declaration to export.
+         * @param excludeName An optional name to exclude from exports.
+         */
+        function appendExportsOfDeclaration(statements, decl, excludeName) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            var name = ts.getDeclarationName(decl);
+            var exportSpecifiers = moduleInfo.exportSpecifiers[name.text];
+            if (exportSpecifiers) {
+                for (var _i = 0, exportSpecifiers_1 = exportSpecifiers; _i < exportSpecifiers_1.length; _i++) {
+                    var exportSpecifier = exportSpecifiers_1[_i];
+                    if (exportSpecifier.name.text !== excludeName) {
+                        statements = appendExportStatement(statements, exportSpecifier.name, name);
+                    }
+                }
+            }
+            return statements;
+        }
+        /**
+         * Appends the down-level representation of an export to a statement list, returning the
+         * statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param exportName The name of the export.
+         * @param expression The expression to export.
+         * @param allowComments Whether to allow comments on the export.
+         */
+        function appendExportStatement(statements, exportName, expression, allowComments) {
+            statements = ts.append(statements, createExportStatement(exportName, expression, allowComments));
+            return statements;
+        }
+        /**
+         * Creates a call to the current file's export function to export a value.
+         *
+         * @param name The bound name of the export.
+         * @param value The exported value.
+         * @param allowComments An optional value indicating whether to emit comments for the statement.
+         */
+        function createExportStatement(name, value, allowComments) {
+            var statement = ts.createStatement(createExportExpression(name, value));
+            ts.startOnNewLine(statement);
+            if (!allowComments) {
+                ts.setEmitFlags(statement, 49152 /* NoComments */);
+            }
+            return statement;
+        }
+        /**
+         * Creates a call to the current file's export function to export a value.
+         *
+         * @param name The bound name of the export.
+         * @param value The exported value.
+         */
+        function createExportExpression(name, value) {
+            var exportName = ts.isIdentifier(name) ? ts.createLiteral(name) : name;
+            return ts.createCall(exportFunction, /*typeArguments*/ undefined, [exportName, value]);
+        }
+        //
+        // Top-Level or Nested Source Element Visitors
+        //
+        /**
+         * Visit nested elements at the top-level of a module.
+         *
+         * @param node The node to visit.
+         */
+        function nestedElementVisitor(node) {
+            switch (node.kind) {
+                case 205 /* VariableStatement */:
+                    return visitVariableStatement(node);
+                case 225 /* FunctionDeclaration */:
+                    return visitFunctionDeclaration(node);
+                case 226 /* ClassDeclaration */:
+                    return visitClassDeclaration(node);
+                case 211 /* ForStatement */:
+                    return visitForStatement(node);
+                case 212 /* ForInStatement */:
+                    return visitForInStatement(node);
+                case 213 /* ForOfStatement */:
+                    return visitForOfStatement(node);
+                case 209 /* DoStatement */:
+                    return visitDoStatement(node);
+                case 210 /* WhileStatement */:
+                    return visitWhileStatement(node);
+                case 219 /* LabeledStatement */:
+                    return visitLabeledStatement(node);
+                case 217 /* WithStatement */:
+                    return visitWithStatement(node);
+                case 218 /* SwitchStatement */:
+                    return visitSwitchStatement(node);
+                case 232 /* CaseBlock */:
+                    return visitCaseBlock(node);
+                case 253 /* CaseClause */:
+                    return visitCaseClause(node);
+                case 254 /* DefaultClause */:
+                    return visitDefaultClause(node);
+                case 221 /* TryStatement */:
+                    return visitTryStatement(node);
+                case 256 /* CatchClause */:
+                    return visitCatchClause(node);
+                case 204 /* Block */:
+                    return visitBlock(node);
+                case 294 /* MergeDeclarationMarker */:
+                    return visitMergeDeclarationMarker(node);
+                case 295 /* EndOfDeclarationMarker */:
+                    return visitEndOfDeclarationMarker(node);
+                default:
+                    return destructuringVisitor(node);
+            }
+        }
+        /**
+         * Visits the body of a ForStatement to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitForStatement(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.updateFor(node, visitForInitializer(node.initializer), ts.visitNode(node.condition, destructuringVisitor, ts.isExpression, /*optional*/ true), ts.visitNode(node.incrementor, destructuringVisitor, ts.isExpression, /*optional*/ true), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement));
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        /**
+         * Visits the body of a ForInStatement to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitForInStatement(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.updateForIn(node, visitForInitializer(node.initializer), ts.visitNode(node.expression, destructuringVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, /*optional*/ false, ts.liftToBlock));
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        /**
+         * Visits the body of a ForOfStatement to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitForOfStatement(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.updateForOf(node, visitForInitializer(node.initializer), ts.visitNode(node.expression, destructuringVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, /*optional*/ false, ts.liftToBlock));
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        /**
+         * Determines whether to hoist the initializer of a ForStatement, ForInStatement, or
+         * ForOfStatement.
+         *
+         * @param node The node to test.
+         */
+        function shouldHoistForInitializer(node) {
+            return ts.isVariableDeclarationList(node)
+                && shouldHoistVariableDeclarationList(node);
+        }
+        /**
+         * Visits the initializer of a ForStatement, ForInStatement, or ForOfStatement
+         *
+         * @param node The node to visit.
+         */
+        function visitForInitializer(node) {
+            if (shouldHoistForInitializer(node)) {
+                var expressions = void 0;
+                for (var _i = 0, _a = node.declarations; _i < _a.length; _i++) {
+                    var variable = _a[_i];
+                    expressions = ts.append(expressions, transformInitializedVariable(variable, /*isExportedDeclaration*/ false));
+                }
+                return expressions ? ts.inlineExpressions(expressions) : ts.createOmittedExpression();
+            }
+            else {
+                return ts.visitEachChild(node, nestedElementVisitor, context);
+            }
+        }
+        /**
+         * Visits the body of a DoStatement to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitDoStatement(node) {
+            return ts.updateDo(node, ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, /*optional*/ false, ts.liftToBlock), ts.visitNode(node.expression, destructuringVisitor, ts.isExpression));
+        }
+        /**
+         * Visits the body of a WhileStatement to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitWhileStatement(node) {
+            return ts.updateWhile(node, ts.visitNode(node.expression, destructuringVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, /*optional*/ false, ts.liftToBlock));
+        }
+        /**
+         * Visits the body of a LabeledStatement to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitLabeledStatement(node) {
+            return ts.updateLabel(node, node.label, ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, /*optional*/ false, ts.liftToBlock));
+        }
+        /**
+         * Visits the body of a WithStatement to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitWithStatement(node) {
+            return ts.updateWith(node, ts.visitNode(node.expression, destructuringVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, /*optional*/ false, ts.liftToBlock));
+        }
+        /**
+         * Visits the body of a SwitchStatement to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitSwitchStatement(node) {
+            return ts.updateSwitch(node, ts.visitNode(node.expression, destructuringVisitor, ts.isExpression), ts.visitNode(node.caseBlock, nestedElementVisitor, ts.isCaseBlock));
+        }
+        /**
+         * Visits the body of a CaseBlock to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitCaseBlock(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.updateCaseBlock(node, ts.visitNodes(node.clauses, nestedElementVisitor, ts.isCaseOrDefaultClause));
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        /**
+         * Visits the body of a CaseClause to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitCaseClause(node) {
+            return ts.updateCaseClause(node, ts.visitNode(node.expression, destructuringVisitor, ts.isExpression), ts.visitNodes(node.statements, nestedElementVisitor, ts.isStatement));
+        }
+        /**
+         * Visits the body of a DefaultClause to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitDefaultClause(node) {
+            return ts.visitEachChild(node, nestedElementVisitor, context);
+        }
+        /**
+         * Visits the body of a TryStatement to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitTryStatement(node) {
+            return ts.visitEachChild(node, nestedElementVisitor, context);
+        }
+        /**
+         * Visits the body of a CatchClause to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitCatchClause(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.updateCatchClause(node, node.variableDeclaration, ts.visitNode(node.block, nestedElementVisitor, ts.isBlock));
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        /**
+         * Visits the body of a Block to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitBlock(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.visitEachChild(node, nestedElementVisitor, context);
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        //
+        // Destructuring Assignment Visitors
+        //
+        /**
+         * Visit nodes to flatten destructuring assignments to exported symbols.
+         *
+         * @param node The node to visit.
+         */
+        function destructuringVisitor(node) {
+            if (node.transformFlags & 16384 /* DestructuringAssignment */
+                && node.kind === 192 /* BinaryExpression */) {
+                return visitDestructuringAssignment(node);
+            }
+            else if (node.transformFlags & 32768 /* ContainsDestructuringAssignment */) {
+                return ts.visitEachChild(node, destructuringVisitor, context);
+            }
+            else {
+                return node;
+            }
+        }
+        /**
+         * Visits a DestructuringAssignment to flatten destructuring to exported symbols.
+         *
+         * @param node The node to visit.
+         */
+        function visitDestructuringAssignment(node) {
+            if (hasExportedReferenceInDestructuringTarget(node.left)) {
+                return ts.flattenDestructuringAssignment(context, node, /*needsValue*/ true, hoistVariableDeclaration, destructuringVisitor);
+            }
+            return ts.visitEachChild(node, destructuringVisitor, context);
+        }
+        /**
+         * Determines whether the target of a destructuring assigment refers to an exported symbol.
+         *
+         * @param node The destructuring target.
+         */
+        function hasExportedReferenceInDestructuringTarget(node) {
+            if (ts.isAssignmentExpression(node)) {
+                return hasExportedReferenceInDestructuringTarget(node.left);
+            }
+            else if (ts.isSpreadExpression(node)) {
+                return hasExportedReferenceInDestructuringTarget(node.expression);
+            }
+            else if (ts.isObjectLiteralExpression(node)) {
+                return ts.some(node.properties, hasExportedReferenceInDestructuringTarget);
+            }
+            else if (ts.isArrayLiteralExpression(node)) {
+                return ts.some(node.elements, hasExportedReferenceInDestructuringTarget);
+            }
+            else if (ts.isShorthandPropertyAssignment(node)) {
+                return hasExportedReferenceInDestructuringTarget(node.name);
+            }
+            else if (ts.isPropertyAssignment(node)) {
+                return hasExportedReferenceInDestructuringTarget(node.initializer);
+            }
+            else if (ts.isIdentifier(node)) {
+                var container = resolver.getReferencedExportContainer(node);
+                return container !== undefined && container.kind === 261 /* SourceFile */;
+            }
+            else {
+                return false;
+            }
+        }
+        //
+        // Modifier Visitors
+        //
+        /**
+         * Visit nodes to elide module-specific modifiers.
+         *
+         * @param node The node to visit.
+         */
+        function modifierVisitor(node) {
+            switch (node.kind) {
+                case 83 /* ExportKeyword */:
+                case 78 /* DefaultKeyword */:
+                    return undefined;
+            }
+            return node;
+        }
+        //
+        // Emit Notification
+        //
+        /**
+         * Hook for node emit notifications.
+         *
+         * @param emitContext A context hint for the emitter.
+         * @param node The node to emit.
+         * @param emit A callback used to emit the node in the printer.
+         */
+        function onEmitNode(emitContext, node, emitCallback) {
+            if (node.kind === 261 /* SourceFile */) {
+                var id = ts.getOriginalNodeId(node);
+                currentSourceFile = node;
+                moduleInfo = moduleInfoMap[id];
+                exportFunction = exportFunctionsMap[id];
+                noSubstitution = noSubstitutionMap[id];
+                if (noSubstitution) {
+                    delete noSubstitutionMap[id];
+                }
+                previousOnEmitNode(emitContext, node, emitCallback);
+                currentSourceFile = undefined;
+                moduleInfo = undefined;
+                exportFunction = undefined;
+                noSubstitution = undefined;
+            }
+            else {
+                previousOnEmitNode(emitContext, node, emitCallback);
+            }
+        }
+        //
+        // Substitutions
+        //
+        /**
+         * Hooks node substitutions.
+         *
+         * @param emitContext A context hint for the emitter.
+         * @param node The node to substitute.
+         */
+        function onSubstituteNode(emitContext, node) {
+            node = previousOnSubstituteNode(emitContext, node);
+            if (isSubstitutionPrevented(node)) {
+                return node;
+            }
+            if (emitContext === 1 /* Expression */) {
+                return substituteExpression(node);
+            }
+            return node;
+        }
+        /**
+         * Substitute the expression, if necessary.
+         *
+         * @param node The node to substitute.
+         */
+        function substituteExpression(node) {
+            switch (node.kind) {
+                case 70 /* Identifier */:
+                    return substituteExpressionIdentifier(node);
+                case 192 /* BinaryExpression */:
+                    return substituteBinaryExpression(node);
+                case 190 /* PrefixUnaryExpression */:
+                case 191 /* PostfixUnaryExpression */:
+                    return substituteUnaryExpression(node);
+            }
+            return node;
+        }
+        /**
+         * Substitution for an Identifier expression that may contain an imported or exported symbol.
+         *
+         * @param node The node to substitute.
+         */
+        function substituteExpressionIdentifier(node) {
+            // When we see an identifier in an expression position that
+            // points to an imported symbol, we should substitute a qualified
+            // reference to the imported symbol if one is needed.
+            //
+            // - We do not substitute generated identifiers for any reason.
+            // - We do not substitute identifiers tagged with the LocalName flag.
+            if (!ts.isGeneratedIdentifier(node) && !ts.isLocalName(node)) {
+                var importDeclaration = resolver.getReferencedImportDeclaration(node);
+                if (importDeclaration) {
+                    if (ts.isImportClause(importDeclaration)) {
+                        return ts.createPropertyAccess(ts.getGeneratedNameForNode(importDeclaration.parent), ts.createIdentifier("default"), 
+                        /*location*/ node);
+                    }
+                    else if (ts.isImportSpecifier(importDeclaration)) {
+                        return ts.createPropertyAccess(ts.getGeneratedNameForNode(importDeclaration.parent.parent.parent), ts.getSynthesizedClone(importDeclaration.propertyName || importDeclaration.name), 
+                        /*location*/ node);
+                    }
+                }
+            }
+            return node;
+        }
+        /**
+         * Substitution for a BinaryExpression that may contain an imported or exported symbol.
+         *
+         * @param node The node to substitute.
+         */
+        function substituteBinaryExpression(node) {
+            // When we see an assignment expression whose left-hand side is an exported symbol,
+            // we should ensure all exports of that symbol are updated with the correct value.
+            //
+            // - We do not substitute generated identifiers for any reason.
+            // - We do not substitute identifiers tagged with the LocalName flag.
+            // - We do not substitute identifiers that were originally the name of an enum or
+            //   namespace due to how they are transformed in TypeScript.
+            // - We only substitute identifiers that are exported at the top level.
+            if (ts.isAssignmentOperator(node.operatorToken.kind)
+                && ts.isIdentifier(node.left)
+                && !ts.isGeneratedIdentifier(node.left)
+                && !ts.isLocalName(node.left)
+                && !ts.isDeclarationNameOfEnumOrNamespace(node.left)) {
+                var exportedNames = getExports(node.left);
+                if (exportedNames) {
+                    // For each additional export of the declaration, apply an export assignment.
+                    var expression = node;
+                    for (var _i = 0, exportedNames_1 = exportedNames; _i < exportedNames_1.length; _i++) {
+                        var exportName = exportedNames_1[_i];
+                        expression = createExportExpression(exportName, preventSubstitution(expression));
+                    }
+                    return expression;
+                }
+            }
+            return node;
+        }
+        /**
+         * Substitution for a UnaryExpression that may contain an imported or exported symbol.
+         *
+         * @param node The node to substitute.
+         */
+        function substituteUnaryExpression(node) {
+            // When we see a prefix or postfix increment expression whose operand is an exported
+            // symbol, we should ensure all exports of that symbol are updated with the correct
+            // value.
+            //
+            // - We do not substitute generated identifiers for any reason.
+            // - We do not substitute identifiers tagged with the LocalName flag.
+            // - We do not substitute identifiers that were originally the name of an enum or
+            //   namespace due to how they are transformed in TypeScript.
+            // - We only substitute identifiers that are exported at the top level.
+            if ((node.operator === 42 /* PlusPlusToken */ || node.operator === 43 /* MinusMinusToken */)
+                && ts.isIdentifier(node.operand)
+                && !ts.isGeneratedIdentifier(node.operand)
+                && !ts.isLocalName(node.operand)
+                && !ts.isDeclarationNameOfEnumOrNamespace(node.operand)) {
+                var exportedNames = getExports(node.operand);
+                if (exportedNames) {
+                    var expression = node.kind === 191 /* PostfixUnaryExpression */
+                        ? ts.createPrefix(node.operator, node.operand, 
+                        /*location*/ node)
+                        : node;
+                    for (var _i = 0, exportedNames_2 = exportedNames; _i < exportedNames_2.length; _i++) {
+                        var exportName = exportedNames_2[_i];
+                        expression = createExportExpression(exportName, preventSubstitution(expression));
+                    }
+                    if (node.kind === 191 /* PostfixUnaryExpression */) {
+                        expression = node.operator === 42 /* PlusPlusToken */
+                            ? ts.createSubtract(preventSubstitution(expression), ts.createLiteral(1))
+                            : ts.createAdd(preventSubstitution(expression), ts.createLiteral(1));
+                    }
+                    return expression;
+                }
+            }
+            return node;
+        }
+        /**
+         * Gets the exports of a name.
+         *
+         * @param name The name.
+         */
+        function getExports(name) {
+            var exportedNames;
+            if (!ts.isGeneratedIdentifier(name)) {
+                var valueDeclaration = resolver.getReferencedImportDeclaration(name)
+                    || resolver.getReferencedValueDeclaration(name);
+                if (valueDeclaration) {
+                    var exportContainer = resolver.getReferencedExportContainer(name, /*prefixLocals*/ false);
+                    if (exportContainer && exportContainer.kind === 261 /* SourceFile */) {
+                        exportedNames = ts.append(exportedNames, ts.getDeclarationName(valueDeclaration));
+                    }
+                    exportedNames = ts.addRange(exportedNames, moduleInfo && moduleInfo.exportedBindings[ts.getOriginalNodeId(valueDeclaration)]);
+                }
+            }
+            return exportedNames;
+        }
+        /**
+         * Prevent substitution of a node for this transformer.
+         *
+         * @param node The node which should not be substituted.
+         */
+        function preventSubstitution(node) {
+            if (noSubstitution === undefined)
+                noSubstitution = ts.createMap();
+            noSubstitution[ts.getNodeId(node)] = true;
+            return node;
+        }
+        /**
+         * Determines whether a node should not be substituted.
+         *
+         * @param node The node to test.
+         */
+        function isSubstitutionPrevented(node) {
+            return noSubstitution && node.id && noSubstitution[node.id];
+        }
+    }
+    ts.transformSystemModule = transformSystemModule;
+})(ts || (ts = {}));
+/// <reference path="../../factory.ts" />
+/// <reference path="../../visitor.ts" />
+/*@internal*/
+var ts;
+(function (ts) {
+    function transformModule(context) {
+        var transformModuleDelegates = ts.createMap((_a = {},
+            _a[ts.ModuleKind.None] = transformCommonJSModule,
+            _a[ts.ModuleKind.CommonJS] = transformCommonJSModule,
+            _a[ts.ModuleKind.AMD] = transformAMDModule,
+            _a[ts.ModuleKind.UMD] = transformUMDModule,
+            _a));
+        var startLexicalEnvironment = context.startLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration;
+        var compilerOptions = context.getCompilerOptions();
+        var resolver = context.getEmitResolver();
+        var host = context.getEmitHost();
+        var languageVersion = ts.getEmitScriptTarget(compilerOptions);
+        var moduleKind = ts.getEmitModuleKind(compilerOptions);
+        var previousOnSubstituteNode = context.onSubstituteNode;
+        var previousOnEmitNode = context.onEmitNode;
+        context.onSubstituteNode = onSubstituteNode;
+        context.onEmitNode = onEmitNode;
+        context.enableSubstitution(70 /* Identifier */); // Substitutes expression identifiers with imported/exported symbols.
+        context.enableSubstitution(192 /* BinaryExpression */); // Substitutes assignments to exported symbols.
+        context.enableSubstitution(190 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(191 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(258 /* ShorthandPropertyAssignment */); // Substitutes shorthand property assignments for imported/exported symbols.
+        context.enableEmitNotification(261 /* SourceFile */); // Restore state when substituting nodes in a file.
+        var moduleInfoMap = ts.createMap(); // The ExternalModuleInfo for each file.
+        var deferredExports = ts.createMap(); // Exports to defer until an EndOfDeclarationMarker is found.
+        var currentSourceFile; // The current file.
+        var currentModuleInfo; // The ExternalModuleInfo for the current file.
+        var noSubstitution; // Set of nodes for which substitution rules should be ignored.
+        return transformSourceFile;
+        /**
+         * Transforms the module aspects of a SourceFile.
+         *
+         * @param node The SourceFile node.
+         */
+        function transformSourceFile(node) {
+            if (ts.isDeclarationFile(node)
+                || !(ts.isExternalModule(node)
+                    || compilerOptions.isolatedModules)) {
+                return node;
+            }
+            currentSourceFile = node;
+            currentModuleInfo = moduleInfoMap[ts.getOriginalNodeId(node)] = ts.collectExternalModuleInfo(node, resolver);
+            // Perform the transformation.
+            var transformModule = transformModuleDelegates[moduleKind] || transformModuleDelegates[ts.ModuleKind.None];
+            var updated = transformModule(node);
+            currentSourceFile = undefined;
+            currentModuleInfo = undefined;
+            return ts.aggregateTransformFlags(updated);
+        }
+        /**
+         * Transforms a SourceFile into a CommonJS module.
+         *
+         * @param node The SourceFile node.
+         */
+        function transformCommonJSModule(node) {
+            startLexicalEnvironment();
+            var statements = [];
+            var statementOffset = ts.addPrologueDirectives(statements, node.statements, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict, sourceElementVisitor);
+            ts.addRange(statements, ts.visitNodes(node.statements, sourceElementVisitor, ts.isStatement, statementOffset));
+            ts.addRange(statements, endLexicalEnvironment());
+            addExportEqualsIfNeeded(statements, /*emitAsReturn*/ false);
+            var updated = ts.updateSourceFileNode(node, ts.createNodeArray(statements, node.statements));
+            if (currentModuleInfo.hasExportStarsToExportValues) {
+                ts.setEmitFlags(updated, 2 /* EmitExportStar */ | ts.getEmitFlags(node));
+            }
+            return updated;
+        }
+        /**
+         * Transforms a SourceFile into an AMD module.
+         *
+         * @param node The SourceFile node.
+         */
+        function transformAMDModule(node) {
+            var define = ts.createIdentifier("define");
+            var moduleName = ts.tryGetModuleNameFromFile(node, host, compilerOptions);
+            return transformAsynchronousModule(node, define, moduleName, /*includeNonAmdDependencies*/ true);
+        }
+        /**
+         * Transforms a SourceFile into a UMD module.
+         *
+         * @param node The SourceFile node.
+         */
+        function transformUMDModule(node) {
+            var define = ts.createIdentifier("define");
+            ts.setEmitFlags(define, 16 /* UMDDefine */);
+            return transformAsynchronousModule(node, define, /*moduleName*/ undefined, /*includeNonAmdDependencies*/ false);
+        }
+        /**
+         * Transforms a SourceFile into an AMD or UMD module.
+         *
+         * @param node The SourceFile node.
+         * @param define The expression used to define the module.
+         * @param moduleName An expression for the module name, if available.
+         * @param includeNonAmdDependencies A value indicating whether to incldue any non-AMD dependencies.
+         */
+        function transformAsynchronousModule(node, define, moduleName, includeNonAmdDependencies) {
+            // An AMD define function has the following shape:
+            //
+            //     define(id?, dependencies?, factory);
+            //
+            // This has the shape of the following:
+            //
+            //     define(name, ["module1", "module2"], function (module1Alias) { ... }
+            //
+            // The location of the alias in the parameter list in the factory function needs to
+            // match the position of the module name in the dependency list.
+            //
+            // To ensure this is true in cases of modules with no aliases, e.g.:
+            //
+            //     import "module"
+            //
+            // or
+            //
+            //     /// <amd-dependency path= "a.css" />
+            //
+            // we need to add modules without alias names to the end of the dependencies list
+            var _a = collectAsynchronousDependencies(node, includeNonAmdDependencies), aliasedModuleNames = _a.aliasedModuleNames, unaliasedModuleNames = _a.unaliasedModuleNames, importAliasNames = _a.importAliasNames;
+            // Create an updated SourceFile:
+            //
+            //     define(moduleName?, ["module1", "module2"], function ...
+            return ts.updateSourceFileNode(node, ts.createNodeArray([
+                ts.createStatement(ts.createCall(define, 
+                /*typeArguments*/ undefined, (moduleName ? [moduleName] : []).concat([
+                    // Add the dependency array argument:
+                    //
+                    //     ["require", "exports", module1", "module2", ...]
+                    ts.createArrayLiteral([
+                        ts.createLiteral("require"),
+                        ts.createLiteral("exports")
+                    ].concat(aliasedModuleNames, unaliasedModuleNames)),
+                    // Add the module body function argument:
+                    //
+                    //     function (require, exports, module1, module2) ...
+                    ts.createFunctionExpression(
+                    /*modifiers*/ undefined, 
+                    /*asteriskToken*/ undefined, 
+                    /*name*/ undefined, 
+                    /*typeParameters*/ undefined, [
+                        ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "require"),
+                        ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "exports")
+                    ].concat(importAliasNames), 
+                    /*type*/ undefined, transformAsynchronousModuleBody(node))
+                ])))
+            ], 
+            /*location*/ node.statements));
+        }
+        /**
+         * Collect the additional asynchronous dependencies for the module.
+         *
+         * @param node The source file.
+         * @param includeNonAmdDependencies A value indicating whether to include non-AMD dependencies.
+         */
+        function collectAsynchronousDependencies(node, includeNonAmdDependencies) {
+            // names of modules with corresponding parameter in the factory function
+            var aliasedModuleNames = [];
+            // names of modules with no corresponding parameters in factory function
+            var unaliasedModuleNames = [];
+            // names of the parameters in the factory function; these
+            // parameters need to match the indexes of the corresponding
+            // module names in aliasedModuleNames.
+            var importAliasNames = [];
+            // Fill in amd-dependency tags
+            for (var _i = 0, _a = node.amdDependencies; _i < _a.length; _i++) {
+                var amdDependency = _a[_i];
+                if (amdDependency.name) {
+                    aliasedModuleNames.push(ts.createLiteral(amdDependency.path));
+                    importAliasNames.push(ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, amdDependency.name));
+                }
+                else {
+                    unaliasedModuleNames.push(ts.createLiteral(amdDependency.path));
+                }
+            }
+            for (var _b = 0, _c = currentModuleInfo.externalImports; _b < _c.length; _b++) {
+                var importNode = _c[_b];
+                // Find the name of the external module
+                var externalModuleName = ts.getExternalModuleNameLiteral(importNode, currentSourceFile, host, resolver, compilerOptions);
+                // Find the name of the module alias, if there is one
+                var importAliasName = ts.getLocalNameForExternalImport(importNode, currentSourceFile);
+                if (includeNonAmdDependencies && importAliasName) {
+                    // Set emitFlags on the name of the classDeclaration
+                    // This is so that when printer will not substitute the identifier
+                    ts.setEmitFlags(importAliasName, 128 /* NoSubstitution */);
+                    aliasedModuleNames.push(externalModuleName);
+                    importAliasNames.push(ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, importAliasName));
+                }
+                else {
+                    unaliasedModuleNames.push(externalModuleName);
+                }
+            }
+            return { aliasedModuleNames: aliasedModuleNames, unaliasedModuleNames: unaliasedModuleNames, importAliasNames: importAliasNames };
+        }
+        /**
+         * Transforms a SourceFile into an AMD or UMD module body.
+         *
+         * @param node The SourceFile node.
+         */
+        function transformAsynchronousModuleBody(node) {
+            startLexicalEnvironment();
+            var statements = [];
+            var statementOffset = ts.addPrologueDirectives(statements, node.statements, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict, sourceElementVisitor);
+            // Visit each statement of the module body.
+            ts.addRange(statements, ts.visitNodes(node.statements, sourceElementVisitor, ts.isStatement, statementOffset));
+            // End the lexical environment for the module body
+            // and merge any new lexical declarations.
+            ts.addRange(statements, endLexicalEnvironment());
+            // Append the 'export =' statement if provided.
+            addExportEqualsIfNeeded(statements, /*emitAsReturn*/ true);
+            var body = ts.createBlock(statements, /*location*/ undefined, /*multiLine*/ true);
+            if (currentModuleInfo.hasExportStarsToExportValues) {
+                // If we have any `export * from ...` declarations
+                // we need to inform the emitter to add the __export helper.
+                ts.setEmitFlags(body, 2 /* EmitExportStar */);
+            }
+            return body;
+        }
+        /**
+         * Adds the down-level representation of `export=` to the statement list if one exists
+         * in the source file.
+         *
+         * @param statements The Statement list to modify.
+         * @param emitAsReturn A value indicating whether to emit the `export=` statement as a
+         * return statement.
+         */
+        function addExportEqualsIfNeeded(statements, emitAsReturn) {
+            if (currentModuleInfo.exportEquals) {
+                if (emitAsReturn) {
+                    var statement = ts.createReturn(currentModuleInfo.exportEquals.expression, 
+                    /*location*/ currentModuleInfo.exportEquals);
+                    ts.setEmitFlags(statement, 12288 /* NoTokenSourceMaps */ | 49152 /* NoComments */);
+                    statements.push(statement);
+                }
+                else {
+                    var statement = ts.createStatement(ts.createAssignment(ts.createPropertyAccess(ts.createIdentifier("module"), "exports"), currentModuleInfo.exportEquals.expression), 
+                    /*location*/ currentModuleInfo.exportEquals);
+                    ts.setEmitFlags(statement, 49152 /* NoComments */);
+                    statements.push(statement);
+                }
+            }
+        }
+        //
+        // Top-Level Source Element Visitors
+        //
+        /**
+         * Visits a node at the top level of the source file.
+         *
+         * @param node The node to visit.
+         */
+        function sourceElementVisitor(node) {
+            switch (node.kind) {
+                case 235 /* ImportDeclaration */:
+                    return visitImportDeclaration(node);
+                case 234 /* ImportEqualsDeclaration */:
+                    return visitImportEqualsDeclaration(node);
+                case 241 /* ExportDeclaration */:
+                    return visitExportDeclaration(node);
+                case 240 /* ExportAssignment */:
+                    return visitExportAssignment(node);
+                case 205 /* VariableStatement */:
+                    return visitVariableStatement(node);
+                case 225 /* FunctionDeclaration */:
+                    return visitFunctionDeclaration(node);
+                case 226 /* ClassDeclaration */:
+                    return visitClassDeclaration(node);
+                case 294 /* MergeDeclarationMarker */:
+                    return visitMergeDeclarationMarker(node);
+                case 295 /* EndOfDeclarationMarker */:
+                    return visitEndOfDeclarationMarker(node);
+                default:
+                    // This visitor does not descend into the tree, as export/import statements
+                    // are only transformed at the top level of a file.
+                    return node;
+            }
+        }
+        /**
+         * Visits an ImportDeclaration node.
+         *
+         * @param node The node to visit.
+         */
+        function visitImportDeclaration(node) {
+            var statements;
+            var namespaceDeclaration = ts.getNamespaceDeclarationNode(node);
+            if (moduleKind !== ts.ModuleKind.AMD) {
+                if (!node.importClause) {
+                    // import "mod";
+                    return ts.createStatement(createRequireCall(node), /*location*/ node);
+                }
+                else {
+                    var variables = [];
+                    if (namespaceDeclaration && !ts.isDefaultImport(node)) {
+                        // import * as n from "mod";
+                        variables.push(ts.createVariableDeclaration(ts.getSynthesizedClone(namespaceDeclaration.name), 
+                        /*type*/ undefined, createRequireCall(node)));
+                    }
+                    else {
+                        // import d from "mod";
+                        // import { x, y } from "mod";
+                        // import d, { x, y } from "mod";
+                        // import d, * as n from "mod";
+                        variables.push(ts.createVariableDeclaration(ts.getGeneratedNameForNode(node), 
+                        /*type*/ undefined, createRequireCall(node)));
+                        if (namespaceDeclaration && ts.isDefaultImport(node)) {
+                            variables.push(ts.createVariableDeclaration(ts.getSynthesizedClone(namespaceDeclaration.name), 
+                            /*type*/ undefined, ts.getGeneratedNameForNode(node)));
+                        }
+                    }
+                    statements = ts.append(statements, ts.createVariableStatement(
+                    /*modifiers*/ undefined, ts.createVariableDeclarationList(variables, 
+                    /*location*/ undefined, languageVersion >= 2 /* ES2015 */ ? 2 /* Const */ : 0 /* None */), 
+                    /*location*/ node));
+                }
+            }
+            else if (namespaceDeclaration && ts.isDefaultImport(node)) {
+                // import d, * as n from "mod";
+                statements = ts.append(statements, ts.createVariableStatement(
+                /*modifiers*/ undefined, ts.createVariableDeclarationList([
+                    ts.createVariableDeclaration(ts.getSynthesizedClone(namespaceDeclaration.name), 
+                    /*type*/ undefined, ts.getGeneratedNameForNode(node), 
+                    /*location*/ node)
+                ], 
+                /*location*/ undefined, languageVersion >= 2 /* ES2015 */ ? 2 /* Const */ : 0 /* None */)));
+            }
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfImportDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfImportDeclaration(statements, node);
+            }
+            return ts.singleOrMany(statements);
+        }
+        /**
+         * Creates a `require()` call to import an external module.
+         *
+         * @param importNode The declararation to import.
+         */
+        function createRequireCall(importNode) {
+            var moduleName = ts.getExternalModuleNameLiteral(importNode, currentSourceFile, host, resolver, compilerOptions);
+            var args = [];
+            if (moduleName) {
+                args.push(moduleName);
+            }
+            return ts.createCall(ts.createIdentifier("require"), /*typeArguments*/ undefined, args);
+        }
+        /**
+         * Visits an ImportEqualsDeclaration node.
+         *
+         * @param node The node to visit.
+         */
+        function visitImportEqualsDeclaration(node) {
+            ts.Debug.assert(ts.isExternalModuleImportEqualsDeclaration(node), "import= for internal module references should be handled in an earlier transformer.");
+            var statements;
+            if (moduleKind !== ts.ModuleKind.AMD) {
+                if (ts.hasModifier(node, 1 /* Export */)) {
+                    statements = ts.append(statements, ts.createStatement(createExportExpression(node.name, createRequireCall(node)), 
+                    /*location*/ node));
+                }
+                else {
+                    statements = ts.append(statements, ts.createVariableStatement(
+                    /*modifiers*/ undefined, ts.createVariableDeclarationList([
+                        ts.createVariableDeclaration(ts.getSynthesizedClone(node.name), 
+                        /*type*/ undefined, createRequireCall(node))
+                    ], 
+                    /*location*/ undefined, 
+                    /*flags*/ languageVersion >= 2 /* ES2015 */ ? 2 /* Const */ : 0 /* None */), 
+                    /*location*/ node));
+                }
+            }
+            else {
+                if (ts.hasModifier(node, 1 /* Export */)) {
+                    statements = ts.append(statements, ts.createStatement(createExportExpression(ts.getExportName(node), ts.getLocalName(node)), 
+                    /*location*/ node));
+                }
+            }
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfImportEqualsDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfImportEqualsDeclaration(statements, node);
+            }
+            return ts.singleOrMany(statements);
+        }
+        /**
+         * Visits an ExportDeclaration node.
+         *
+         * @param The node to visit.
+         */
+        function visitExportDeclaration(node) {
+            if (!node.moduleSpecifier) {
+                // Elide export declarations with no module specifier as they are handled
+                // elsewhere.
+                return undefined;
+            }
+            var generatedName = ts.getGeneratedNameForNode(node);
+            if (node.exportClause) {
+                var statements = [];
+                // export { x, y } from "mod";
+                if (moduleKind !== ts.ModuleKind.AMD) {
+                    statements.push(ts.createVariableStatement(
+                    /*modifiers*/ undefined, ts.createVariableDeclarationList([
+                        ts.createVariableDeclaration(generatedName, 
+                        /*type*/ undefined, createRequireCall(node))
+                    ]), 
+                    /*location*/ node));
+                }
+                for (var _i = 0, _a = node.exportClause.elements; _i < _a.length; _i++) {
+                    var specifier = _a[_i];
+                    var exportedValue = ts.createPropertyAccess(generatedName, specifier.propertyName || specifier.name);
+                    statements.push(ts.createStatement(createExportExpression(ts.getExportName(specifier), exportedValue), 
+                    /*location*/ specifier));
+                }
+                return ts.singleOrMany(statements);
+            }
+            else {
+                // export * from "mod";
+                return ts.createStatement(ts.createCall(ts.createIdentifier("__export"), 
+                /*typeArguments*/ undefined, [
+                    moduleKind !== ts.ModuleKind.AMD
+                        ? createRequireCall(node)
+                        : generatedName
+                ]), 
+                /*location*/ node);
+            }
+        }
+        /**
+         * Visits an ExportAssignment node.
+         *
+         * @param node The node to visit.
+         */
+        function visitExportAssignment(node) {
+            if (node.isExportEquals) {
+                return undefined;
+            }
+            var statements;
+            var original = node.original;
+            if (original && hasAssociatedEndOfDeclarationMarker(original)) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportStatement(deferredExports[id], ts.createIdentifier("default"), node.expression, /*location*/ node, /*allowComments*/ true);
+            }
+            else {
+                statements = appendExportStatement(statements, ts.createIdentifier("default"), node.expression, /*location*/ node, /*allowComments*/ true);
+            }
+            return ts.singleOrMany(statements);
+        }
+        /**
+         * Visits a FunctionDeclaration node.
+         *
+         * @param node The node to visit.
+         */
+        function visitFunctionDeclaration(node) {
+            var statements;
+            if (ts.hasModifier(node, 1 /* Export */)) {
+                statements = ts.append(statements, ts.setOriginalNode(ts.createFunctionDeclaration(
+                /*decorators*/ undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, ts.getDeclarationName(node, /*allowComments*/ true, /*allowSourceMaps*/ true), 
+                /*typeParameters*/ undefined, node.parameters, 
+                /*type*/ undefined, node.body, 
+                /*location*/ node), 
+                /*original*/ node));
+            }
+            else {
+                statements = ts.append(statements, node);
+            }
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfHoistedDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfHoistedDeclaration(statements, node);
+            }
+            return ts.singleOrMany(statements);
+        }
+        /**
+         * Visits a ClassDeclaration node.
+         *
+         * @param node The node to visit.
+         */
+        function visitClassDeclaration(node) {
+            var statements;
+            if (ts.hasModifier(node, 1 /* Export */)) {
+                statements = ts.append(statements, ts.setOriginalNode(ts.createClassDeclaration(
+                /*decorators*/ undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), ts.getDeclarationName(node, /*allowComments*/ true, /*allowSourceMaps*/ true), 
+                /*typeParameters*/ undefined, node.heritageClauses, node.members, 
+                /*location*/ node), 
+                /*original*/ node));
+            }
+            else {
+                statements = ts.append(statements, node);
+            }
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfHoistedDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfHoistedDeclaration(statements, node);
+            }
+            return ts.singleOrMany(statements);
+        }
+        /**
+         * Visits a VariableStatement node.
+         *
+         * @param node The node to visit.
+         */
+        function visitVariableStatement(node) {
+            var statements;
+            var variables;
+            var expressions;
+            if (ts.hasModifier(node, 1 /* Export */)) {
+                var modifiers = void 0;
+                // If we're exporting these variables, then these just become assignments to 'exports.x'.
+                // We only want to emit assignments for variables with initializers.
+                for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
+                    var variable = _a[_i];
+                    if (ts.isIdentifier(variable.name) && ts.isLocalName(variable.name)) {
+                        if (!modifiers) {
+                            modifiers = ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier);
+                        }
+                        variables = ts.append(variables, variable);
+                    }
+                    else if (variable.initializer) {
+                        expressions = ts.append(expressions, transformInitializedVariable(variable));
+                    }
+                }
+                if (variables) {
+                    statements = ts.append(statements, ts.updateVariableStatement(node, modifiers, ts.updateVariableDeclarationList(node.declarationList, variables)));
+                }
+                if (expressions) {
+                    statements = ts.append(statements, ts.createStatement(ts.inlineExpressions(expressions), /*location*/ node));
+                }
+            }
+            else {
+                statements = ts.append(statements, node);
+            }
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfVariableStatement(statements, node);
+            }
+            return ts.singleOrMany(statements);
+        }
+        /**
+         * Transforms an exported variable with an initializer into an expression.
+         *
+         * @param node The node to transform.
+         */
+        function transformInitializedVariable(node) {
+            if (ts.isBindingPattern(node.name)) {
+                return ts.flattenVariableDestructuringToExpression(node, hoistVariableDeclaration, createExportExpression);
+            }
+            else {
+                return ts.createAssignment(ts.createPropertyAccess(ts.createIdentifier("exports"), node.name, 
+                /*location*/ node.name), node.initializer);
+            }
+        }
+        /**
+         * Visits a MergeDeclarationMarker used as a placeholder for the beginning of a merged
+         * and transformed declaration.
+         *
+         * @param node The node to visit.
+         */
+        function visitMergeDeclarationMarker(node) {
+            // For an EnumDeclaration or ModuleDeclaration that merges with a preceeding
+            // declaration we do not emit a leading variable declaration. To preserve the
+            // begin/end semantics of the declararation and to properly handle exports
+            // we wrapped the leading variable declaration in a `MergeDeclarationMarker`.
+            //
+            // To balance the declaration, add the exports of the elided variable
+            // statement.
+            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 205 /* VariableStatement */) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node.original);
+            }
+            return node;
+        }
+        /**
+         * Determines whether a node has an associated EndOfDeclarationMarker.
+         *
+         * @param node The node to test.
+         */
+        function hasAssociatedEndOfDeclarationMarker(node) {
+            return (ts.getEmitFlags(node) & 33554432 /* HasEndOfDeclarationMarker */) !== 0;
+        }
+        /**
+         * Visits a DeclarationMarker used as a placeholder for the end of a transformed
+         * declaration.
+         *
+         * @param node The node to visit.
+         */
+        function visitEndOfDeclarationMarker(node) {
+            // For some transformations we emit an `EndOfDeclarationMarker` to mark the actual
+            // end of the transformed declaration. We use this marker to emit any deferred exports
+            // of the declaration.
+            var id = ts.getOriginalNodeId(node);
+            var statements = deferredExports[id];
+            if (statements) {
+                delete deferredExports[id];
+                return ts.append(statements, node);
+            }
+            return node;
+        }
+        /**
+         * Appends the exports of an ImportDeclaration to a statement list, returning the
+         * statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param decl The declaration whose exports are to be recorded.
+         */
+        function appendExportsOfImportDeclaration(statements, decl) {
+            if (currentModuleInfo.exportEquals) {
+                return statements;
+            }
+            var importClause = decl.importClause;
+            if (!importClause) {
+                return statements;
+            }
+            if (importClause.name) {
+                statements = appendExportsOfDeclaration(statements, importClause);
+            }
+            var namedBindings = importClause.namedBindings;
+            if (namedBindings) {
+                switch (namedBindings.kind) {
+                    case 237 /* NamespaceImport */:
+                        statements = appendExportsOfDeclaration(statements, namedBindings);
+                        break;
+                    case 238 /* NamedImports */:
+                        for (var _i = 0, _a = namedBindings.elements; _i < _a.length; _i++) {
+                            var importBinding = _a[_i];
+                            statements = appendExportsOfDeclaration(statements, importBinding);
+                        }
+                        break;
+                }
+            }
+            return statements;
+        }
+        /**
+         * Appends the exports of an ImportEqualsDeclaration to a statement list, returning the
+         * statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param decl The declaration whose exports are to be recorded.
+         */
+        function appendExportsOfImportEqualsDeclaration(statements, decl) {
+            if (currentModuleInfo.exportEquals) {
+                return statements;
+            }
+            return appendExportsOfDeclaration(statements, decl);
+        }
+        /**
+         * Appends the exports of a VariableStatement to a statement list, returning the statement
+         * list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param node The VariableStatement whose exports are to be recorded.
+         */
+        function appendExportsOfVariableStatement(statements, node) {
+            if (currentModuleInfo.exportEquals) {
+                return statements;
+            }
+            for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
+                var decl = _a[_i];
+                statements = appendExportsOfBindingElement(statements, decl);
+            }
+            return statements;
+        }
+        /**
+         * Appends the exports of a VariableDeclaration or BindingElement to a statement list,
+         * returning the statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param decl The declaration whose exports are to be recorded.
+         */
+        function appendExportsOfBindingElement(statements, decl) {
+            if (currentModuleInfo.exportEquals) {
+                return statements;
+            }
+            if (ts.isBindingPattern(decl.name)) {
+                for (var _i = 0, _a = decl.name.elements; _i < _a.length; _i++) {
+                    var element = _a[_i];
+                    if (!ts.isOmittedExpression(element)) {
+                        statements = appendExportsOfBindingElement(statements, element);
+                    }
+                }
+            }
+            else if (!ts.isGeneratedIdentifier(decl.name)) {
+                statements = appendExportsOfDeclaration(statements, decl);
+            }
+            return statements;
+        }
+        /**
+         * Appends the exports of a ClassDeclaration or FunctionDeclaration to a statement list,
+         * returning the statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param decl The declaration whose exports are to be recorded.
+         */
+        function appendExportsOfHoistedDeclaration(statements, decl) {
+            if (currentModuleInfo.exportEquals) {
+                return statements;
+            }
+            if (ts.hasModifier(decl, 1 /* Export */)) {
+                var exportName = ts.hasModifier(decl, 512 /* Default */) ? ts.createIdentifier("default") : decl.name;
+                statements = appendExportStatement(statements, exportName, ts.getLocalName(decl), /*location*/ decl);
+            }
+            if (decl.name) {
+                statements = appendExportsOfDeclaration(statements, decl);
+            }
+            return statements;
+        }
+        /**
+         * Appends the exports of a declaration to a statement list, returning the statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param decl The declaration to export.
+         */
+        function appendExportsOfDeclaration(statements, decl) {
+            var name = ts.getDeclarationName(decl);
+            var exportSpecifiers = currentModuleInfo.exportSpecifiers[name.text];
+            if (exportSpecifiers) {
+                for (var _i = 0, exportSpecifiers_2 = exportSpecifiers; _i < exportSpecifiers_2.length; _i++) {
+                    var exportSpecifier = exportSpecifiers_2[_i];
+                    statements = appendExportStatement(statements, exportSpecifier.name, name, /*location*/ exportSpecifier.name);
+                }
+            }
+            return statements;
+        }
+        /**
+         * Appends the down-level representation of an export to a statement list, returning the
+         * statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param exportName The name of the export.
+         * @param expression The expression to export.
+         * @param location The location to use for source maps and comments for the export.
+         * @param allowComments Whether to allow comments on the export.
+         */
+        function appendExportStatement(statements, exportName, expression, location, allowComments) {
+            if (exportName.text === "default") {
+                var sourceFile = ts.getOriginalNode(currentSourceFile, ts.isSourceFile);
+                if (sourceFile && !sourceFile.symbol.exports["___esModule"]) {
+                    if (languageVersion === 0 /* ES3 */) {
+                        statements = ts.append(statements, ts.createStatement(createExportExpression(ts.createIdentifier("__esModule"), ts.createLiteral(true))));
+                    }
+                    else {
+                        statements = ts.append(statements, ts.createStatement(ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Object"), "defineProperty"), 
+                        /*typeArguments*/ undefined, [
+                            ts.createIdentifier("exports"),
+                            ts.createLiteral("__esModule"),
+                            ts.createObjectLiteral([
+                                ts.createPropertyAssignment("value", ts.createLiteral(true))
+                            ])
+                        ])));
+                    }
+                }
+            }
+            statements = ts.append(statements, createExportStatement(exportName, expression, location, allowComments));
+            return statements;
+        }
+        /**
+         * Creates a call to the current file's export function to export a value.
+         *
+         * @param name The bound name of the export.
+         * @param value The exported value.
+         * @param location The location to use for source maps and comments for the export.
+         * @param allowComments An optional value indicating whether to emit comments for the statement.
+         */
+        function createExportStatement(name, value, location, allowComments) {
+            var statement = ts.createStatement(createExportExpression(name, value), location);
+            ts.startOnNewLine(statement);
+            if (!allowComments) {
+                ts.setEmitFlags(statement, 49152 /* NoComments */);
+            }
+            return statement;
+        }
+        /**
+         * Creates a call to the current file's export function to export a value.
+         *
+         * @param name The bound name of the export.
+         * @param value The exported value.
+         * @param location The location to use for source maps and comments for the export.
+         */
+        function createExportExpression(name, value, location) {
+            return ts.createAssignment(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.getSynthesizedClone(name)), value, location);
+        }
+        //
+        // Modifier Visitors
+        //
+        /**
+         * Visit nodes to elide module-specific modifiers.
+         *
+         * @param node The node to visit.
+         */
+        function modifierVisitor(node) {
+            // Elide module-specific modifiers.
+            switch (node.kind) {
+                case 83 /* ExportKeyword */:
+                case 78 /* DefaultKeyword */:
+                    return undefined;
+            }
+            return node;
+        }
+        //
+        // Emit Notification
+        //
+        /**
+         * Hook for node emit notifications.
+         *
+         * @param emitContext A context hint for the emitter.
+         * @param node The node to emit.
+         * @param emit A callback used to emit the node in the printer.
+         */
+        function onEmitNode(emitContext, node, emitCallback) {
+            if (node.kind === 261 /* SourceFile */) {
+                currentSourceFile = node;
+                currentModuleInfo = moduleInfoMap[ts.getOriginalNodeId(currentSourceFile)];
+                noSubstitution = ts.createMap();
+                previousOnEmitNode(emitContext, node, emitCallback);
+                currentSourceFile = undefined;
+                currentModuleInfo = undefined;
+                noSubstitution = undefined;
+            }
+            else {
+                previousOnEmitNode(emitContext, node, emitCallback);
+            }
+        }
+        //
+        // Substitutions
+        //
+        /**
+         * Hooks node substitutions.
+         *
+         * @param emitContext A context hint for the emitter.
+         * @param node The node to substitute.
+         */
+        function onSubstituteNode(emitContext, node) {
+            node = previousOnSubstituteNode(emitContext, node);
+            if (node.id && noSubstitution[node.id]) {
+                return node;
+            }
+            if (emitContext === 1 /* Expression */) {
+                return substituteExpression(node);
+            }
+            else if (ts.isShorthandPropertyAssignment(node)) {
+                return substituteShorthandPropertyAssignment(node);
+            }
+            return node;
+        }
+        /**
+         * Substitution for a ShorthandPropertyAssignment whose declaration name is an imported
+         * or exported symbol.
+         *
+         * @param node The node to substitute.
+         */
+        function substituteShorthandPropertyAssignment(node) {
+            var name = node.name;
+            var exportedOrImportedName = substituteExpressionIdentifier(name);
+            if (exportedOrImportedName !== name) {
+                // A shorthand property with an assignment initializer is probably part of a
+                // destructuring assignment
+                if (node.objectAssignmentInitializer) {
+                    var initializer = ts.createAssignment(exportedOrImportedName, node.objectAssignmentInitializer);
+                    return ts.createPropertyAssignment(name, initializer, /*location*/ node);
+                }
+                return ts.createPropertyAssignment(name, exportedOrImportedName, /*location*/ node);
+            }
+            return node;
+        }
+        /**
+         * Substitution for an Expression that may contain an imported or exported symbol.
+         *
+         * @param node The node to substitute.
+         */
+        function substituteExpression(node) {
+            switch (node.kind) {
+                case 70 /* Identifier */:
+                    return substituteExpressionIdentifier(node);
+                case 192 /* BinaryExpression */:
+                    return substituteBinaryExpression(node);
+                case 191 /* PostfixUnaryExpression */:
+                case 190 /* PrefixUnaryExpression */:
+                    return substituteUnaryExpression(node);
+            }
+            return node;
+        }
+        /**
+         * Substitution for an Identifier expression that may contain an imported or exported
+         * symbol.
+         *
+         * @param node The node to substitute.
+         */
+        function substituteExpressionIdentifier(node) {
+            if (!ts.isGeneratedIdentifier(node) && !ts.isLocalName(node)) {
+                var exportContainer = resolver.getReferencedExportContainer(node, ts.isExportName(node));
+                if (exportContainer && exportContainer.kind === 261 /* SourceFile */) {
+                    return ts.createPropertyAccess(ts.createIdentifier("exports"), ts.getSynthesizedClone(node), 
+                    /*location*/ node);
+                }
+                var importDeclaration = resolver.getReferencedImportDeclaration(node);
+                if (importDeclaration) {
+                    if (ts.isImportClause(importDeclaration)) {
+                        return ts.createPropertyAccess(ts.getGeneratedNameForNode(importDeclaration.parent), ts.createIdentifier("default"), 
+                        /*location*/ node);
+                    }
+                    else if (ts.isImportSpecifier(importDeclaration)) {
+                        var name_36 = importDeclaration.propertyName || importDeclaration.name;
+                        return ts.createPropertyAccess(ts.getGeneratedNameForNode(importDeclaration.parent.parent.parent), ts.getSynthesizedClone(name_36), 
+                        /*location*/ node);
+                    }
+                }
+            }
+            return node;
+        }
+        /**
+         * Substitution for a BinaryExpression that may contain an imported or exported symbol.
+         *
+         * @param node The node to substitute.
+         */
+        function substituteBinaryExpression(node) {
+            // When we see an assignment expression whose left-hand side is an exported symbol,
+            // we should ensure all exports of that symbol are updated with the correct value.
+            //
+            // - We do not substitute generated identifiers for any reason.
+            // - We do not substitute identifiers tagged with the LocalName flag.
+            // - We do not substitute identifiers that were originally the name of an enum or
+            //   namespace due to how they are transformed in TypeScript.
+            // - We only substitute identifiers that are exported at the top level.
+            if (ts.isAssignmentOperator(node.operatorToken.kind)
+                && ts.isIdentifier(node.left)
+                && !ts.isGeneratedIdentifier(node.left)
+                && !ts.isLocalName(node.left)
+                && !ts.isDeclarationNameOfEnumOrNamespace(node.left)) {
+                var exportedNames = getExports(node.left);
+                if (exportedNames) {
+                    // For each additional export of the declaration, apply an export assignment.
+                    var expression = node;
+                    for (var _i = 0, exportedNames_3 = exportedNames; _i < exportedNames_3.length; _i++) {
+                        var exportName = exportedNames_3[_i];
+                        // Mark the node to prevent triggering this rule again.
+                        noSubstitution[ts.getNodeId(expression)] = true;
+                        expression = createExportExpression(exportName, expression, /*location*/ node);
+                    }
+                    return expression;
+                }
+            }
+            return node;
+        }
+        /**
+         * Substitution for a UnaryExpression that may contain an imported or exported symbol.
+         *
+         * @param node The node to substitute.
+         */
+        function substituteUnaryExpression(node) {
+            // When we see a prefix or postfix increment expression whose operand is an exported
+            // symbol, we should ensure all exports of that symbol are updated with the correct
+            // value.
+            //
+            // - We do not substitute generated identifiers for any reason.
+            // - We do not substitute identifiers tagged with the LocalName flag.
+            // - We do not substitute identifiers that were originally the name of an enum or
+            //   namespace due to how they are transformed in TypeScript.
+            // - We only substitute identifiers that are exported at the top level.
+            if ((node.operator === 42 /* PlusPlusToken */ || node.operator === 43 /* MinusMinusToken */)
+                && ts.isIdentifier(node.operand)
+                && !ts.isGeneratedIdentifier(node.operand)
+                && !ts.isLocalName(node.operand)
+                && !ts.isDeclarationNameOfEnumOrNamespace(node.operand)) {
+                var exportedNames = getExports(node.operand);
+                if (exportedNames) {
+                    var expression = node.kind === 191 /* PostfixUnaryExpression */
+                        ? ts.createBinary(node.operand, ts.createToken(node.operator === 42 /* PlusPlusToken */ ? 58 /* PlusEqualsToken */ : 59 /* MinusEqualsToken */), ts.createLiteral(1), 
+                        /*location*/ node)
+                        : node;
+                    for (var _i = 0, exportedNames_4 = exportedNames; _i < exportedNames_4.length; _i++) {
+                        var exportName = exportedNames_4[_i];
+                        // Mark the node to prevent triggering this rule again.
+                        noSubstitution[ts.getNodeId(expression)] = true;
+                        expression = createExportExpression(exportName, expression);
+                    }
+                    return expression;
+                }
+            }
+            return node;
+        }
+        /**
+         * Gets the additional exports of a name.
+         *
+         * @param name The name.
+         */
+        function getExports(name) {
+            if (!ts.isGeneratedIdentifier(name)) {
+                var valueDeclaration = resolver.getReferencedImportDeclaration(name)
+                    || resolver.getReferencedValueDeclaration(name);
+                if (valueDeclaration) {
+                    return currentModuleInfo
+                        && currentModuleInfo.exportedBindings[ts.getOriginalNodeId(valueDeclaration)];
+                }
+            }
+        }
+        var _a;
+    }
+    ts.transformModule = transformModule;
+})(ts || (ts = {}));
 /// <reference path="visitor.ts" />
 /// <reference path="transformers/ts.ts" />
 /// <reference path="transformers/jsx.ts" />
+/// <reference path="transformers/esnext.ts" />
 /// <reference path="transformers/es2017.ts" />
 /// <reference path="transformers/es2016.ts" />
 /// <reference path="transformers/es2015.ts" />
@@ -53723,10 +56084,12 @@ var ts;
         var moduleKind = ts.getEmitModuleKind(compilerOptions);
         var transformers = [];
         transformers.push(ts.transformTypeScript);
-        transformers.push(moduleTransformerMap[moduleKind] || moduleTransformerMap[ts.ModuleKind.None]);
         if (jsx === 2 /* React */) {
             transformers.push(ts.transformJsx);
         }
+        if (languageVersion < 5 /* ESNext */) {
+            transformers.push(ts.transformESNext);
+        }
         if (languageVersion < 4 /* ES2017 */) {
             transformers.push(ts.transformES2017);
         }
@@ -53737,6 +56100,9 @@ var ts;
             transformers.push(ts.transformES2015);
             transformers.push(ts.transformGenerators);
         }
+        transformers.push(moduleTransformerMap[moduleKind] || moduleTransformerMap[ts.ModuleKind.None]);
+        // The ES5 transformer is last so that it can substitute expressions like `exports.default`
+        // for ES3.
         if (languageVersion < 1 /* ES5 */) {
             transformers.push(ts.transformES5);
         }
@@ -53754,7 +56120,7 @@ var ts;
     function transformFiles(resolver, host, sourceFiles, transformers) {
         var lexicalEnvironmentVariableDeclarationsStack = [];
         var lexicalEnvironmentFunctionDeclarationsStack = [];
-        var enabledSyntaxKindFeatures = new Array(289 /* Count */);
+        var enabledSyntaxKindFeatures = new Array(296 /* Count */);
         var lexicalEnvironmentStackOffset = 0;
         var hoistedVariableDeclarations;
         var hoistedFunctionDeclarations;
@@ -54154,7 +56520,7 @@ var ts;
                 var emitNode = node.emitNode;
                 var emitFlags = emitNode && emitNode.flags;
                 var _a = emitNode && emitNode.sourceMapRange || node, pos = _a.pos, end = _a.end;
-                if (node.kind !== 287 /* NotEmittedStatement */
+                if (node.kind !== 292 /* NotEmittedStatement */
                     && (emitFlags & 512 /* NoLeadingSourceMap */) === 0
                     && pos >= 0) {
                     emitPos(ts.skipTrivia(currentSourceText, pos));
@@ -54167,7 +56533,7 @@ var ts;
                 else {
                     emitCallback(emitContext, node);
                 }
-                if (node.kind !== 287 /* NotEmittedStatement */
+                if (node.kind !== 292 /* NotEmittedStatement */
                     && (emitFlags & 1024 /* NoTrailingSourceMap */) === 0
                     && end >= 0) {
                     emitPos(end);
@@ -54346,7 +56712,7 @@ var ts;
                     if (extendedDiagnostics) {
                         ts.performance.mark("preEmitNodeWithComment");
                     }
-                    var isEmittedNode = node.kind !== 287 /* NotEmittedStatement */;
+                    var isEmittedNode = node.kind !== 292 /* NotEmittedStatement */;
                     var skipLeadingComments = pos < 0 || (emitFlags & 16384 /* NoLeadingComments */) !== 0;
                     var skipTrailingComments = end < 0 || (emitFlags & 32768 /* NoTrailingComments */) !== 0;
                     // Emit leading comments if the position is not synthesized and the node
@@ -54365,7 +56731,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 === 220 /* VariableDeclarationList */) {
+                        if (node.kind === 224 /* VariableDeclarationList */) {
                             declarationListContainerEnd = end;
                         }
                     }
@@ -54619,7 +56985,7 @@ var ts;
         var isCurrentFileExternalModule;
         var reportedDeclarationError = false;
         var errorNameNode;
-        var emitJsDocComments = compilerOptions.removeComments ? function () { } : writeJsDocComments;
+        var emitJsDocComments = compilerOptions.removeComments ? ts.noop : writeJsDocComments;
         var emit = compilerOptions.stripInternal ? stripInternal : emitNode;
         var noDeclare;
         var moduleElementDeclarationEmitInfo = [];
@@ -54675,7 +57041,7 @@ var ts;
                 var oldWriter = writer;
                 ts.forEach(moduleElementDeclarationEmitInfo, function (aliasEmitInfo) {
                     if (aliasEmitInfo.isVisible && !aliasEmitInfo.asynchronousOutput) {
-                        ts.Debug.assert(aliasEmitInfo.node.kind === 231 /* ImportDeclaration */);
+                        ts.Debug.assert(aliasEmitInfo.node.kind === 235 /* ImportDeclaration */);
                         createAndSetNewTextWriterWithSymbolWriter();
                         ts.Debug.assert(aliasEmitInfo.indent === 0 || (aliasEmitInfo.indent === 1 && isBundledEmit));
                         for (var i = 0; i < aliasEmitInfo.indent; i++) {
@@ -54749,10 +57115,10 @@ var ts;
             var oldWriter = writer;
             ts.forEach(nodes, function (declaration) {
                 var nodeToCheck;
-                if (declaration.kind === 219 /* VariableDeclaration */) {
+                if (declaration.kind === 223 /* VariableDeclaration */) {
                     nodeToCheck = declaration.parent.parent;
                 }
-                else if (declaration.kind === 234 /* NamedImports */ || declaration.kind === 235 /* ImportSpecifier */ || declaration.kind === 232 /* ImportClause */) {
+                else if (declaration.kind === 238 /* NamedImports */ || declaration.kind === 239 /* ImportSpecifier */ || declaration.kind === 236 /* ImportClause */) {
                     ts.Debug.fail("We should be getting ImportDeclaration instead to write");
                 }
                 else {
@@ -54770,7 +57136,7 @@ var ts;
                 // Writing of function bar would mark alias declaration foo as visible but we haven't yet visited that declaration so do nothing,
                 // we would write alias foo declaration when we visit it since it would now be marked as visible
                 if (moduleElementEmitInfo) {
-                    if (moduleElementEmitInfo.node.kind === 231 /* ImportDeclaration */) {
+                    if (moduleElementEmitInfo.node.kind === 235 /* ImportDeclaration */) {
                         // we have to create asynchronous output only after we have collected complete information
                         // because it is possible to enable multiple bindings as asynchronously visible
                         moduleElementEmitInfo.isVisible = true;
@@ -54780,12 +57146,12 @@ var ts;
                         for (var declarationIndent = moduleElementEmitInfo.indent; declarationIndent; declarationIndent--) {
                             increaseIndent();
                         }
-                        if (nodeToCheck.kind === 226 /* ModuleDeclaration */) {
+                        if (nodeToCheck.kind === 230 /* ModuleDeclaration */) {
                             ts.Debug.assert(asynchronousSubModuleDeclarationEmitInfo === undefined);
                             asynchronousSubModuleDeclarationEmitInfo = [];
                         }
                         writeModuleElement(nodeToCheck);
-                        if (nodeToCheck.kind === 226 /* ModuleDeclaration */) {
+                        if (nodeToCheck.kind === 230 /* ModuleDeclaration */) {
                             moduleElementEmitInfo.subModuleElementDeclarationEmitInfo = asynchronousSubModuleDeclarationEmitInfo;
                             asynchronousSubModuleDeclarationEmitInfo = undefined;
                         }
@@ -54903,43 +57269,49 @@ var ts;
         function emitType(type) {
             switch (type.kind) {
                 case 118 /* AnyKeyword */:
-                case 133 /* StringKeyword */:
-                case 131 /* NumberKeyword */:
+                case 134 /* StringKeyword */:
+                case 132 /* NumberKeyword */:
                 case 121 /* BooleanKeyword */:
-                case 134 /* SymbolKeyword */:
+                case 135 /* SymbolKeyword */:
                 case 104 /* VoidKeyword */:
-                case 136 /* UndefinedKeyword */:
+                case 137 /* UndefinedKeyword */:
                 case 94 /* NullKeyword */:
-                case 128 /* NeverKeyword */:
-                case 166 /* ThisType */:
-                case 167 /* LiteralType */:
+                case 129 /* NeverKeyword */:
+                case 167 /* ThisType */:
+                case 171 /* LiteralType */:
                     return writeTextOfNode(currentText, type);
-                case 195 /* ExpressionWithTypeArguments */:
+                case 199 /* ExpressionWithTypeArguments */:
                     return emitExpressionWithTypeArguments(type);
-                case 156 /* TypeReference */:
+                case 157 /* TypeReference */:
                     return emitTypeReference(type);
-                case 159 /* TypeQuery */:
+                case 160 /* TypeQuery */:
                     return emitTypeQuery(type);
-                case 161 /* ArrayType */:
+                case 162 /* ArrayType */:
                     return emitArrayType(type);
-                case 162 /* TupleType */:
+                case 163 /* TupleType */:
                     return emitTupleType(type);
-                case 163 /* UnionType */:
+                case 164 /* UnionType */:
                     return emitUnionType(type);
-                case 164 /* IntersectionType */:
+                case 165 /* IntersectionType */:
                     return emitIntersectionType(type);
-                case 165 /* ParenthesizedType */:
+                case 166 /* ParenthesizedType */:
                     return emitParenType(type);
-                case 157 /* FunctionType */:
-                case 158 /* ConstructorType */:
+                case 168 /* TypeOperator */:
+                    return emitTypeOperator(type);
+                case 169 /* IndexedAccessType */:
+                    return emitIndexedAccessType(type);
+                case 170 /* MappedType */:
+                    return emitMappedType(type);
+                case 158 /* FunctionType */:
+                case 159 /* ConstructorType */:
                     return emitSignatureDeclarationWithJsDocComments(type);
-                case 160 /* TypeLiteral */:
+                case 161 /* TypeLiteral */:
                     return emitTypeLiteral(type);
                 case 70 /* Identifier */:
                     return emitEntityName(type);
-                case 140 /* QualifiedName */:
+                case 141 /* QualifiedName */:
                     return emitEntityName(type);
-                case 155 /* TypePredicate */:
+                case 156 /* TypePredicate */:
                     return emitTypePredicate(type);
             }
             function writeEntityName(entityName) {
@@ -54947,8 +57319,8 @@ var ts;
                     writeTextOfNode(currentText, entityName);
                 }
                 else {
-                    var left = entityName.kind === 140 /* QualifiedName */ ? entityName.left : entityName.expression;
-                    var right = entityName.kind === 140 /* QualifiedName */ ? entityName.right : entityName.name;
+                    var left = entityName.kind === 141 /* QualifiedName */ ? entityName.left : entityName.expression;
+                    var right = entityName.kind === 141 /* QualifiedName */ ? entityName.right : entityName.name;
                     writeEntityName(left);
                     write(".");
                     writeTextOfNode(currentText, right);
@@ -54957,14 +57329,14 @@ var ts;
             function emitEntityName(entityName) {
                 var visibilityResult = resolver.isEntityNameVisible(entityName, 
                 // Aliases can be written asynchronously so use correct enclosing declaration
-                entityName.parent.kind === 230 /* ImportEqualsDeclaration */ ? entityName.parent : enclosingDeclaration);
+                entityName.parent.kind === 234 /* ImportEqualsDeclaration */ ? entityName.parent : enclosingDeclaration);
                 handleSymbolAccessibilityError(visibilityResult);
                 recordTypeReferenceDirectivesIfNecessary(resolver.getTypeReferenceDirectivesForEntityName(entityName));
                 writeEntityName(entityName);
             }
             function emitExpressionWithTypeArguments(node) {
                 if (ts.isEntityNameExpression(node.expression)) {
-                    ts.Debug.assert(node.expression.kind === 70 /* Identifier */ || node.expression.kind === 173 /* PropertyAccessExpression */);
+                    ts.Debug.assert(node.expression.kind === 70 /* Identifier */ || node.expression.kind === 177 /* PropertyAccessExpression */);
                     emitEntityName(node.expression);
                     if (node.typeArguments) {
                         write("<");
@@ -55010,6 +57382,42 @@ var ts;
                 emitType(type.type);
                 write(")");
             }
+            function emitTypeOperator(type) {
+                write(ts.tokenToString(type.operator));
+                write(" ");
+                emitType(type.type);
+            }
+            function emitIndexedAccessType(node) {
+                emitType(node.objectType);
+                write("[");
+                emitType(node.indexType);
+                write("]");
+            }
+            function emitMappedType(node) {
+                var prevEnclosingDeclaration = enclosingDeclaration;
+                enclosingDeclaration = node;
+                write("{");
+                writeLine();
+                increaseIndent();
+                if (node.readonlyToken) {
+                    write("readonly ");
+                }
+                write("[");
+                writeEntityName(node.typeParameter.name);
+                write(" in ");
+                emitType(node.typeParameter.constraint);
+                write("]");
+                if (node.questionToken) {
+                    write("?");
+                }
+                write(": ");
+                emitType(node.type);
+                write(";");
+                writeLine();
+                decreaseIndent();
+                write("}");
+                enclosingDeclaration = prevEnclosingDeclaration;
+            }
             function emitTypeLiteral(type) {
                 write("{");
                 if (type.members.length) {
@@ -55043,9 +57451,9 @@ var ts;
             var count = 0;
             while (true) {
                 count++;
-                var name_40 = baseName + "_" + count;
-                if (!(name_40 in currentIdentifiers)) {
-                    return name_40;
+                var name_37 = baseName + "_" + count;
+                if (!(name_37 in currentIdentifiers)) {
+                    return name_37;
                 }
             }
         }
@@ -55092,10 +57500,10 @@ var ts;
             if (isModuleElementVisible) {
                 writeModuleElement(node);
             }
-            else if (node.kind === 230 /* ImportEqualsDeclaration */ ||
-                (node.parent.kind === 256 /* SourceFile */ && isCurrentFileExternalModule)) {
+            else if (node.kind === 234 /* ImportEqualsDeclaration */ ||
+                (node.parent.kind === 261 /* SourceFile */ && isCurrentFileExternalModule)) {
                 var isVisible = void 0;
-                if (asynchronousSubModuleDeclarationEmitInfo && node.parent.kind !== 256 /* SourceFile */) {
+                if (asynchronousSubModuleDeclarationEmitInfo && node.parent.kind !== 261 /* SourceFile */) {
                     // Import declaration of another module that is visited async so lets put it in right spot
                     asynchronousSubModuleDeclarationEmitInfo.push({
                         node: node,
@@ -55105,7 +57513,7 @@ var ts;
                     });
                 }
                 else {
-                    if (node.kind === 231 /* ImportDeclaration */) {
+                    if (node.kind === 235 /* ImportDeclaration */) {
                         var importDeclaration = node;
                         if (importDeclaration.importClause) {
                             isVisible = (importDeclaration.importClause.name && resolver.isDeclarationVisible(importDeclaration.importClause)) ||
@@ -55123,23 +57531,23 @@ var ts;
         }
         function writeModuleElement(node) {
             switch (node.kind) {
-                case 221 /* FunctionDeclaration */:
+                case 225 /* FunctionDeclaration */:
                     return writeFunctionDeclaration(node);
-                case 201 /* VariableStatement */:
+                case 205 /* VariableStatement */:
                     return writeVariableStatement(node);
-                case 223 /* InterfaceDeclaration */:
+                case 227 /* InterfaceDeclaration */:
                     return writeInterfaceDeclaration(node);
-                case 222 /* ClassDeclaration */:
+                case 226 /* ClassDeclaration */:
                     return writeClassDeclaration(node);
-                case 224 /* TypeAliasDeclaration */:
+                case 228 /* TypeAliasDeclaration */:
                     return writeTypeAliasDeclaration(node);
-                case 225 /* EnumDeclaration */:
+                case 229 /* EnumDeclaration */:
                     return writeEnumDeclaration(node);
-                case 226 /* ModuleDeclaration */:
+                case 230 /* ModuleDeclaration */:
                     return writeModuleDeclaration(node);
-                case 230 /* ImportEqualsDeclaration */:
+                case 234 /* ImportEqualsDeclaration */:
                     return writeImportEqualsDeclaration(node);
-                case 231 /* ImportDeclaration */:
+                case 235 /* ImportDeclaration */:
                     return writeImportDeclaration(node);
                 default:
                     ts.Debug.fail("Unknown symbol kind");
@@ -55147,7 +57555,7 @@ var ts;
         }
         function emitModuleElementDeclarationFlags(node) {
             // If the node is parented in the current source file we need to emit export declare or just export
-            if (node.parent.kind === 256 /* SourceFile */) {
+            if (node.parent.kind === 261 /* SourceFile */) {
                 var modifiers = ts.getModifierFlags(node);
                 // If the node is exported
                 if (modifiers & 1 /* Export */) {
@@ -55156,7 +57564,7 @@ var ts;
                 if (modifiers & 512 /* Default */) {
                     write("default ");
                 }
-                else if (node.kind !== 223 /* InterfaceDeclaration */ && !noDeclare) {
+                else if (node.kind !== 227 /* InterfaceDeclaration */ && !noDeclare) {
                     write("declare ");
                 }
             }
@@ -55208,7 +57616,7 @@ var ts;
         }
         function isVisibleNamedBinding(namedBindings) {
             if (namedBindings) {
-                if (namedBindings.kind === 233 /* NamespaceImport */) {
+                if (namedBindings.kind === 237 /* NamespaceImport */) {
                     return resolver.isDeclarationVisible(namedBindings);
                 }
                 else {
@@ -55232,7 +57640,7 @@ var ts;
                         // If the default binding was emitted, write the separated
                         write(", ");
                     }
-                    if (node.importClause.namedBindings.kind === 233 /* NamespaceImport */) {
+                    if (node.importClause.namedBindings.kind === 237 /* NamespaceImport */) {
                         write("* as ");
                         writeTextOfNode(currentText, node.importClause.namedBindings.name);
                     }
@@ -55253,13 +57661,13 @@ var ts;
             // the only case when it is not true is when we call it to emit correct name for module augmentation - d.ts files with just module augmentations are not considered
             // external modules since they are indistinguishable from script files with ambient modules. To fix this in such d.ts files we'll emit top level 'export {}'
             // so compiler will treat them as external modules.
-            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || parent.kind !== 226 /* ModuleDeclaration */;
+            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || parent.kind !== 230 /* ModuleDeclaration */;
             var moduleSpecifier;
-            if (parent.kind === 230 /* ImportEqualsDeclaration */) {
+            if (parent.kind === 234 /* ImportEqualsDeclaration */) {
                 var node = parent;
                 moduleSpecifier = ts.getExternalModuleImportEqualsDeclarationExpression(node);
             }
-            else if (parent.kind === 226 /* ModuleDeclaration */) {
+            else if (parent.kind === 230 /* ModuleDeclaration */) {
                 moduleSpecifier = parent.name;
             }
             else {
@@ -55329,7 +57737,7 @@ var ts;
                     writeTextOfNode(currentText, node.name);
                 }
             }
-            while (node.body && node.body.kind !== 227 /* ModuleBlock */) {
+            while (node.body && node.body.kind !== 231 /* ModuleBlock */) {
                 node = node.body;
                 write(".");
                 writeTextOfNode(currentText, node.name);
@@ -55399,7 +57807,7 @@ var ts;
             writeLine();
         }
         function isPrivateMethodTypeParameter(node) {
-            return node.parent.kind === 148 /* MethodDeclaration */ && ts.hasModifier(node.parent, 8 /* Private */);
+            return node.parent.kind === 149 /* MethodDeclaration */ && ts.hasModifier(node.parent, 8 /* Private */);
         }
         function emitTypeParameters(typeParameters) {
             function emitTypeParameter(node) {
@@ -55410,15 +57818,15 @@ var ts;
                 // If there is constraint present and this is not a type parameter of the private method emit the constraint
                 if (node.constraint && !isPrivateMethodTypeParameter(node)) {
                     write(" extends ");
-                    if (node.parent.kind === 157 /* FunctionType */ ||
-                        node.parent.kind === 158 /* ConstructorType */ ||
-                        (node.parent.parent && node.parent.parent.kind === 160 /* TypeLiteral */)) {
-                        ts.Debug.assert(node.parent.kind === 148 /* MethodDeclaration */ ||
-                            node.parent.kind === 147 /* MethodSignature */ ||
-                            node.parent.kind === 157 /* FunctionType */ ||
-                            node.parent.kind === 158 /* ConstructorType */ ||
-                            node.parent.kind === 152 /* CallSignature */ ||
-                            node.parent.kind === 153 /* ConstructSignature */);
+                    if (node.parent.kind === 158 /* FunctionType */ ||
+                        node.parent.kind === 159 /* ConstructorType */ ||
+                        (node.parent.parent && node.parent.parent.kind === 161 /* TypeLiteral */)) {
+                        ts.Debug.assert(node.parent.kind === 149 /* MethodDeclaration */ ||
+                            node.parent.kind === 148 /* MethodSignature */ ||
+                            node.parent.kind === 158 /* FunctionType */ ||
+                            node.parent.kind === 159 /* ConstructorType */ ||
+                            node.parent.kind === 153 /* CallSignature */ ||
+                            node.parent.kind === 154 /* ConstructSignature */);
                         emitType(node.constraint);
                     }
                     else {
@@ -55429,31 +57837,31 @@ 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 222 /* ClassDeclaration */:
+                        case 226 /* ClassDeclaration */:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_class_has_or_is_using_private_name_1;
                             break;
-                        case 223 /* InterfaceDeclaration */:
+                        case 227 /* InterfaceDeclaration */:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1;
                             break;
-                        case 153 /* ConstructSignature */:
+                        case 154 /* ConstructSignature */:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
                             break;
-                        case 152 /* CallSignature */:
+                        case 153 /* CallSignature */:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
                             break;
-                        case 148 /* MethodDeclaration */:
-                        case 147 /* MethodSignature */:
+                        case 149 /* MethodDeclaration */:
+                        case 148 /* 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 === 222 /* ClassDeclaration */) {
+                            else if (node.parent.parent.kind === 226 /* 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 221 /* FunctionDeclaration */:
+                        case 225 /* FunctionDeclaration */:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_function_has_or_is_using_private_name_1;
                             break;
                         default:
@@ -55491,7 +57899,7 @@ var ts;
                 function getHeritageClauseVisibilityError() {
                     var diagnosticMessage;
                     // Heritage clause is written by user so it can always be named
-                    if (node.parent.parent.kind === 222 /* ClassDeclaration */) {
+                    if (node.parent.parent.kind === 226 /* ClassDeclaration */) {
                         // Class or Interface implemented/extended is inaccessible
                         diagnosticMessage = isImplementsList ?
                             ts.Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_private_name_1 :
@@ -55575,7 +57983,7 @@ var ts;
         function emitVariableDeclaration(node) {
             // If we are emitting property it isn't moduleElement and hence we already know it needs to be emitted
             // so there is no check needed to see if declaration is visible
-            if (node.kind !== 219 /* VariableDeclaration */ || resolver.isDeclarationVisible(node)) {
+            if (node.kind !== 223 /* VariableDeclaration */ || resolver.isDeclarationVisible(node)) {
                 if (ts.isBindingPattern(node.name)) {
                     emitBindingPattern(node.name);
                 }
@@ -55586,11 +57994,11 @@ var ts;
                     writeTextOfNode(currentText, node.name);
                     // If optional property emit ? but in the case of parameterProperty declaration with "?" indicating optional parameter for the constructor
                     // we don't want to emit property declaration with "?"
-                    if ((node.kind === 146 /* PropertyDeclaration */ || node.kind === 145 /* PropertySignature */ ||
-                        (node.kind === 143 /* Parameter */ && !ts.isParameterPropertyDeclaration(node))) && ts.hasQuestionToken(node)) {
+                    if ((node.kind === 147 /* PropertyDeclaration */ || node.kind === 146 /* PropertySignature */ ||
+                        (node.kind === 144 /* Parameter */ && !ts.isParameterPropertyDeclaration(node))) && ts.hasQuestionToken(node)) {
                         write("?");
                     }
-                    if ((node.kind === 146 /* PropertyDeclaration */ || node.kind === 145 /* PropertySignature */) && node.parent.kind === 160 /* TypeLiteral */) {
+                    if ((node.kind === 147 /* PropertyDeclaration */ || node.kind === 146 /* PropertySignature */) && node.parent.kind === 161 /* TypeLiteral */) {
                         emitTypeOfVariableDeclarationFromTypeLiteral(node);
                     }
                     else if (resolver.isLiteralConstDeclaration(node)) {
@@ -55603,14 +58011,14 @@ var ts;
                 }
             }
             function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
-                if (node.kind === 219 /* VariableDeclaration */) {
+                if (node.kind === 223 /* VariableDeclaration */) {
                     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 :
                             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 === 146 /* PropertyDeclaration */ || node.kind === 145 /* PropertySignature */) {
+                else if (node.kind === 147 /* PropertyDeclaration */ || node.kind === 146 /* PropertySignature */) {
                     // TODO(jfreeman): Deal with computed properties in error reporting.
                     if (ts.hasModifier(node, 32 /* Static */)) {
                         return symbolAccessibilityResult.errorModuleName ?
@@ -55619,7 +58027,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 === 222 /* ClassDeclaration */) {
+                    else if (node.parent.kind === 226 /* 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 :
@@ -55651,7 +58059,7 @@ var ts;
                 var elements = [];
                 for (var _i = 0, _a = bindingPattern.elements; _i < _a.length; _i++) {
                     var element = _a[_i];
-                    if (element.kind !== 194 /* OmittedExpression */) {
+                    if (element.kind !== 198 /* OmittedExpression */) {
                         elements.push(element);
                     }
                 }
@@ -55721,7 +58129,7 @@ var ts;
                     var type = getTypeAnnotationFromAccessor(node);
                     if (!type) {
                         // couldn't get type for the first accessor, try the another one
-                        var anotherAccessor = node.kind === 150 /* GetAccessor */ ? accessors.setAccessor : accessors.getAccessor;
+                        var anotherAccessor = node.kind === 151 /* GetAccessor */ ? accessors.setAccessor : accessors.getAccessor;
                         type = getTypeAnnotationFromAccessor(anotherAccessor);
                         if (type) {
                             accessorWithTypeAnnotation = anotherAccessor;
@@ -55734,7 +58142,7 @@ var ts;
             }
             function getTypeAnnotationFromAccessor(accessor) {
                 if (accessor) {
-                    return accessor.kind === 150 /* GetAccessor */
+                    return accessor.kind === 151 /* GetAccessor */
                         ? accessor.type // Getter - return type
                         : accessor.parameters.length > 0
                             ? accessor.parameters[0].type // Setter parameter type
@@ -55743,7 +58151,7 @@ var ts;
             }
             function getAccessorDeclarationTypeVisibilityError(symbolAccessibilityResult) {
                 var diagnosticMessage;
-                if (accessorWithTypeAnnotation.kind === 151 /* SetAccessor */) {
+                if (accessorWithTypeAnnotation.kind === 152 /* SetAccessor */) {
                     // Setters have to have type named and cannot infer it so, the type should always be named
                     if (ts.hasModifier(accessorWithTypeAnnotation.parent, 32 /* Static */)) {
                         diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
@@ -55793,17 +58201,17 @@ var ts;
             // so no need to verify if the declaration is visible
             if (!resolver.isImplementationOfOverload(node)) {
                 emitJsDocComments(node);
-                if (node.kind === 221 /* FunctionDeclaration */) {
+                if (node.kind === 225 /* FunctionDeclaration */) {
                     emitModuleElementDeclarationFlags(node);
                 }
-                else if (node.kind === 148 /* MethodDeclaration */ || node.kind === 149 /* Constructor */) {
+                else if (node.kind === 149 /* MethodDeclaration */ || node.kind === 150 /* Constructor */) {
                     emitClassMemberDeclarationFlags(ts.getModifierFlags(node));
                 }
-                if (node.kind === 221 /* FunctionDeclaration */) {
+                if (node.kind === 225 /* FunctionDeclaration */) {
                     write("function ");
                     writeTextOfNode(currentText, node.name);
                 }
-                else if (node.kind === 149 /* Constructor */) {
+                else if (node.kind === 150 /* Constructor */) {
                     write("constructor");
                 }
                 else {
@@ -55823,17 +58231,17 @@ var ts;
             var prevEnclosingDeclaration = enclosingDeclaration;
             enclosingDeclaration = node;
             var closeParenthesizedFunctionType = false;
-            if (node.kind === 154 /* IndexSignature */) {
+            if (node.kind === 155 /* IndexSignature */) {
                 // Index signature can have readonly modifier
                 emitClassMemberDeclarationFlags(ts.getModifierFlags(node));
                 write("[");
             }
             else {
                 // Construct signature or constructor type write new Signature
-                if (node.kind === 153 /* ConstructSignature */ || node.kind === 158 /* ConstructorType */) {
+                if (node.kind === 154 /* ConstructSignature */ || node.kind === 159 /* ConstructorType */) {
                     write("new ");
                 }
-                else if (node.kind === 157 /* FunctionType */) {
+                else if (node.kind === 158 /* FunctionType */) {
                     var currentOutput = writer.getText();
                     // Do not generate incorrect type when function type with type parameters is type argument
                     // This could happen if user used space between two '<' making it error free
@@ -55848,22 +58256,22 @@ var ts;
             }
             // Parameters
             emitCommaList(node.parameters, emitParameterDeclaration);
-            if (node.kind === 154 /* IndexSignature */) {
+            if (node.kind === 155 /* IndexSignature */) {
                 write("]");
             }
             else {
                 write(")");
             }
             // If this is not a constructor and is not private, emit the return type
-            var isFunctionTypeOrConstructorType = node.kind === 157 /* FunctionType */ || node.kind === 158 /* ConstructorType */;
-            if (isFunctionTypeOrConstructorType || node.parent.kind === 160 /* TypeLiteral */) {
+            var isFunctionTypeOrConstructorType = node.kind === 158 /* FunctionType */ || node.kind === 159 /* ConstructorType */;
+            if (isFunctionTypeOrConstructorType || node.parent.kind === 161 /* TypeLiteral */) {
                 // Emit type literal signature return type only if specified
                 if (node.type) {
                     write(isFunctionTypeOrConstructorType ? " => " : ": ");
                     emitType(node.type);
                 }
             }
-            else if (node.kind !== 149 /* Constructor */ && !ts.hasModifier(node, 8 /* Private */)) {
+            else if (node.kind !== 150 /* Constructor */ && !ts.hasModifier(node, 8 /* Private */)) {
                 writeReturnTypeAtSignature(node, getReturnTypeVisibilityError);
             }
             enclosingDeclaration = prevEnclosingDeclaration;
@@ -55877,26 +58285,26 @@ var ts;
             function getReturnTypeVisibilityError(symbolAccessibilityResult) {
                 var diagnosticMessage;
                 switch (node.kind) {
-                    case 153 /* ConstructSignature */:
+                    case 154 /* 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 152 /* CallSignature */:
+                    case 153 /* 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 154 /* IndexSignature */:
+                    case 155 /* 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 148 /* MethodDeclaration */:
-                    case 147 /* MethodSignature */:
+                    case 149 /* MethodDeclaration */:
+                    case 148 /* MethodSignature */:
                         if (ts.hasModifier(node, 32 /* Static */)) {
                             diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                                 symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
@@ -55904,7 +58312,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 === 222 /* ClassDeclaration */) {
+                        else if (node.parent.kind === 226 /* 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 :
@@ -55918,7 +58326,7 @@ var ts;
                                 ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0;
                         }
                         break;
-                    case 221 /* FunctionDeclaration */:
+                    case 225 /* 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 :
@@ -55953,9 +58361,9 @@ var ts;
                 write("?");
             }
             decreaseIndent();
-            if (node.parent.kind === 157 /* FunctionType */ ||
-                node.parent.kind === 158 /* ConstructorType */ ||
-                node.parent.parent.kind === 160 /* TypeLiteral */) {
+            if (node.parent.kind === 158 /* FunctionType */ ||
+                node.parent.kind === 159 /* ConstructorType */ ||
+                node.parent.parent.kind === 161 /* TypeLiteral */) {
                 emitTypeOfVariableDeclarationFromTypeLiteral(node);
             }
             else if (!ts.hasModifier(node.parent, 8 /* Private */)) {
@@ -55971,24 +58379,24 @@ var ts;
             }
             function getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
                 switch (node.parent.kind) {
-                    case 149 /* Constructor */:
+                    case 150 /* 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 153 /* ConstructSignature */:
+                    case 154 /* ConstructSignature */:
                         // 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 152 /* CallSignature */:
+                    case 153 /* 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 148 /* MethodDeclaration */:
-                    case 147 /* MethodSignature */:
+                    case 149 /* MethodDeclaration */:
+                    case 148 /* MethodSignature */:
                         if (ts.hasModifier(node.parent, 32 /* Static */)) {
                             return symbolAccessibilityResult.errorModuleName ?
                                 symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
@@ -55996,7 +58404,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 === 222 /* ClassDeclaration */) {
+                        else if (node.parent.parent.kind === 226 /* 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 :
@@ -56009,7 +58417,7 @@ 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 221 /* FunctionDeclaration */:
+                    case 225 /* FunctionDeclaration */:
                         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 :
@@ -56021,12 +58429,12 @@ var ts;
             }
             function emitBindingPattern(bindingPattern) {
                 // We have to explicitly emit square bracket and bracket because these tokens are not store inside the node.
-                if (bindingPattern.kind === 168 /* ObjectBindingPattern */) {
+                if (bindingPattern.kind === 172 /* ObjectBindingPattern */) {
                     write("{");
                     emitCommaList(bindingPattern.elements, emitBindingElement);
                     write("}");
                 }
-                else if (bindingPattern.kind === 169 /* ArrayBindingPattern */) {
+                else if (bindingPattern.kind === 173 /* ArrayBindingPattern */) {
                     write("[");
                     var elements = bindingPattern.elements;
                     emitCommaList(elements, emitBindingElement);
@@ -56037,7 +58445,7 @@ var ts;
                 }
             }
             function emitBindingElement(bindingElement) {
-                if (bindingElement.kind === 194 /* OmittedExpression */) {
+                if (bindingElement.kind === 198 /* OmittedExpression */) {
                     // If bindingElement is an omittedExpression (i.e. containing elision),
                     // we will emit blank space (although this may differ from users' original code,
                     // it allows emitSeparatedList to write separator appropriately)
@@ -56046,7 +58454,7 @@ var ts;
                     //      emit    : function foo([ , x,  , ]) {}
                     write(" ");
                 }
-                else if (bindingElement.kind === 170 /* BindingElement */) {
+                else if (bindingElement.kind === 174 /* BindingElement */) {
                     if (bindingElement.propertyName) {
                         // bindingElement has propertyName property in the following case:
                         //      { y: [a,b,c] ...} -> bindingPattern will have a property called propertyName for "y"
@@ -56085,40 +58493,40 @@ var ts;
         }
         function emitNode(node) {
             switch (node.kind) {
-                case 221 /* FunctionDeclaration */:
-                case 226 /* ModuleDeclaration */:
-                case 230 /* ImportEqualsDeclaration */:
-                case 223 /* InterfaceDeclaration */:
-                case 222 /* ClassDeclaration */:
-                case 224 /* TypeAliasDeclaration */:
-                case 225 /* EnumDeclaration */:
+                case 225 /* FunctionDeclaration */:
+                case 230 /* ModuleDeclaration */:
+                case 234 /* ImportEqualsDeclaration */:
+                case 227 /* InterfaceDeclaration */:
+                case 226 /* ClassDeclaration */:
+                case 228 /* TypeAliasDeclaration */:
+                case 229 /* EnumDeclaration */:
                     return emitModuleElement(node, isModuleElementVisible(node));
-                case 201 /* VariableStatement */:
+                case 205 /* VariableStatement */:
                     return emitModuleElement(node, isVariableStatementVisible(node));
-                case 231 /* ImportDeclaration */:
+                case 235 /* ImportDeclaration */:
                     // Import declaration without import clause is visible, otherwise it is not visible
                     return emitModuleElement(node, /*isModuleElementVisible*/ !node.importClause);
-                case 237 /* ExportDeclaration */:
+                case 241 /* ExportDeclaration */:
                     return emitExportDeclaration(node);
-                case 149 /* Constructor */:
-                case 148 /* MethodDeclaration */:
-                case 147 /* MethodSignature */:
+                case 150 /* Constructor */:
+                case 149 /* MethodDeclaration */:
+                case 148 /* MethodSignature */:
                     return writeFunctionDeclaration(node);
-                case 153 /* ConstructSignature */:
-                case 152 /* CallSignature */:
-                case 154 /* IndexSignature */:
+                case 154 /* ConstructSignature */:
+                case 153 /* CallSignature */:
+                case 155 /* IndexSignature */:
                     return emitSignatureDeclarationWithJsDocComments(node);
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
                     return emitAccessorDeclaration(node);
-                case 146 /* PropertyDeclaration */:
-                case 145 /* PropertySignature */:
+                case 147 /* PropertyDeclaration */:
+                case 146 /* PropertySignature */:
                     return emitPropertyDeclaration(node);
-                case 255 /* EnumMember */:
+                case 260 /* EnumMember */:
                     return emitEnumMemberDeclaration(node);
-                case 236 /* ExportAssignment */:
+                case 240 /* ExportAssignment */:
                     return emitExportAssignment(node);
-                case 256 /* SourceFile */:
+                case 261 /* SourceFile */:
                     return emitSourceFile(node);
             }
         }
@@ -56209,6 +58617,7 @@ var ts;
         // This is typically used for JSX spread attributes,
         // and can be used for object literal spread properties.
         var assignHelper = "\nvar __assign = (this && this.__assign) || Object.assign || function(t) {\n    for (var s, i = 1, n = arguments.length; i < n; i++) {\n        s = arguments[i];\n        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))\n            t[p] = s[p];\n    }\n    return t;\n};";
+        var restHelper = "\nvar __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))\n        t[p] = s[p];\n    return t;\n};";
         // emit output for the __decorate helper function
         var decorateHelper = "\nvar __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {\n    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;\n    if (typeof Reflect === \"object\" && typeof Reflect.decorate === \"function\") r = Reflect.decorate(decorators, target, key, desc);\n    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;\n    return c > 3 && r && Object.defineProperty(target, key, r), r;\n};";
         // emit output for the __metadata helper function
@@ -56306,6 +58715,7 @@ var ts;
         var currentFileIdentifiers;
         var extendsEmitted;
         var assignEmitted;
+        var restEmitted;
         var decorateEmitted;
         var paramEmitted;
         var awaiterEmitted;
@@ -56499,7 +58909,7 @@ var ts;
             var kind = node.kind;
             switch (kind) {
                 // Top-level nodes
-                case 256 /* SourceFile */:
+                case 261 /* SourceFile */:
                     return emitSourceFile(node);
             }
         }
@@ -56555,210 +58965,218 @@ var ts;
                 case 123 /* DeclareKeyword */:
                 case 124 /* GetKeyword */:
                 case 125 /* IsKeyword */:
-                case 126 /* ModuleKeyword */:
-                case 127 /* NamespaceKeyword */:
-                case 128 /* NeverKeyword */:
-                case 129 /* ReadonlyKeyword */:
-                case 130 /* RequireKeyword */:
-                case 131 /* NumberKeyword */:
-                case 132 /* SetKeyword */:
-                case 133 /* StringKeyword */:
-                case 134 /* SymbolKeyword */:
-                case 135 /* TypeKeyword */:
-                case 136 /* UndefinedKeyword */:
-                case 137 /* FromKeyword */:
-                case 138 /* GlobalKeyword */:
-                case 139 /* OfKeyword */:
+                case 127 /* ModuleKeyword */:
+                case 128 /* NamespaceKeyword */:
+                case 129 /* NeverKeyword */:
+                case 130 /* ReadonlyKeyword */:
+                case 131 /* RequireKeyword */:
+                case 132 /* NumberKeyword */:
+                case 133 /* SetKeyword */:
+                case 134 /* StringKeyword */:
+                case 135 /* SymbolKeyword */:
+                case 136 /* TypeKeyword */:
+                case 137 /* UndefinedKeyword */:
+                case 138 /* FromKeyword */:
+                case 139 /* GlobalKeyword */:
+                case 140 /* OfKeyword */:
                     writeTokenText(kind);
                     return;
                 // Parse tree nodes
                 // Names
-                case 140 /* QualifiedName */:
+                case 141 /* QualifiedName */:
                     return emitQualifiedName(node);
-                case 141 /* ComputedPropertyName */:
+                case 142 /* ComputedPropertyName */:
                     return emitComputedPropertyName(node);
                 // Signature elements
-                case 142 /* TypeParameter */:
+                case 143 /* TypeParameter */:
                     return emitTypeParameter(node);
-                case 143 /* Parameter */:
+                case 144 /* Parameter */:
                     return emitParameter(node);
-                case 144 /* Decorator */:
+                case 145 /* Decorator */:
                     return emitDecorator(node);
                 // Type members
-                case 145 /* PropertySignature */:
+                case 146 /* PropertySignature */:
                     return emitPropertySignature(node);
-                case 146 /* PropertyDeclaration */:
+                case 147 /* PropertyDeclaration */:
                     return emitPropertyDeclaration(node);
-                case 147 /* MethodSignature */:
+                case 148 /* MethodSignature */:
                     return emitMethodSignature(node);
-                case 148 /* MethodDeclaration */:
+                case 149 /* MethodDeclaration */:
                     return emitMethodDeclaration(node);
-                case 149 /* Constructor */:
+                case 150 /* Constructor */:
                     return emitConstructor(node);
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
                     return emitAccessorDeclaration(node);
-                case 152 /* CallSignature */:
+                case 153 /* CallSignature */:
                     return emitCallSignature(node);
-                case 153 /* ConstructSignature */:
+                case 154 /* ConstructSignature */:
                     return emitConstructSignature(node);
-                case 154 /* IndexSignature */:
+                case 155 /* IndexSignature */:
                     return emitIndexSignature(node);
                 // Types
-                case 155 /* TypePredicate */:
+                case 156 /* TypePredicate */:
                     return emitTypePredicate(node);
-                case 156 /* TypeReference */:
+                case 157 /* TypeReference */:
                     return emitTypeReference(node);
-                case 157 /* FunctionType */:
+                case 158 /* FunctionType */:
                     return emitFunctionType(node);
-                case 158 /* ConstructorType */:
+                case 159 /* ConstructorType */:
                     return emitConstructorType(node);
-                case 159 /* TypeQuery */:
+                case 160 /* TypeQuery */:
                     return emitTypeQuery(node);
-                case 160 /* TypeLiteral */:
+                case 161 /* TypeLiteral */:
                     return emitTypeLiteral(node);
-                case 161 /* ArrayType */:
+                case 162 /* ArrayType */:
                     return emitArrayType(node);
-                case 162 /* TupleType */:
+                case 163 /* TupleType */:
                     return emitTupleType(node);
-                case 163 /* UnionType */:
+                case 164 /* UnionType */:
                     return emitUnionType(node);
-                case 164 /* IntersectionType */:
+                case 165 /* IntersectionType */:
                     return emitIntersectionType(node);
-                case 165 /* ParenthesizedType */:
+                case 166 /* ParenthesizedType */:
                     return emitParenthesizedType(node);
-                case 195 /* ExpressionWithTypeArguments */:
+                case 199 /* ExpressionWithTypeArguments */:
                     return emitExpressionWithTypeArguments(node);
-                case 166 /* ThisType */:
+                case 167 /* ThisType */:
                     return emitThisType();
-                case 167 /* LiteralType */:
+                case 168 /* TypeOperator */:
+                    return emitTypeOperator(node);
+                case 169 /* IndexedAccessType */:
+                    return emitIndexedAccessType(node);
+                case 170 /* MappedType */:
+                    return emitMappedType(node);
+                case 171 /* LiteralType */:
                     return emitLiteralType(node);
                 // Binding patterns
-                case 168 /* ObjectBindingPattern */:
+                case 172 /* ObjectBindingPattern */:
                     return emitObjectBindingPattern(node);
-                case 169 /* ArrayBindingPattern */:
+                case 173 /* ArrayBindingPattern */:
                     return emitArrayBindingPattern(node);
-                case 170 /* BindingElement */:
+                case 174 /* BindingElement */:
                     return emitBindingElement(node);
                 // Misc
-                case 198 /* TemplateSpan */:
+                case 202 /* TemplateSpan */:
                     return emitTemplateSpan(node);
-                case 199 /* SemicolonClassElement */:
+                case 203 /* SemicolonClassElement */:
                     return emitSemicolonClassElement();
                 // Statements
-                case 200 /* Block */:
+                case 204 /* Block */:
                     return emitBlock(node);
-                case 201 /* VariableStatement */:
+                case 205 /* VariableStatement */:
                     return emitVariableStatement(node);
-                case 202 /* EmptyStatement */:
+                case 206 /* EmptyStatement */:
                     return emitEmptyStatement();
-                case 203 /* ExpressionStatement */:
+                case 207 /* ExpressionStatement */:
                     return emitExpressionStatement(node);
-                case 204 /* IfStatement */:
+                case 208 /* IfStatement */:
                     return emitIfStatement(node);
-                case 205 /* DoStatement */:
+                case 209 /* DoStatement */:
                     return emitDoStatement(node);
-                case 206 /* WhileStatement */:
+                case 210 /* WhileStatement */:
                     return emitWhileStatement(node);
-                case 207 /* ForStatement */:
+                case 211 /* ForStatement */:
                     return emitForStatement(node);
-                case 208 /* ForInStatement */:
+                case 212 /* ForInStatement */:
                     return emitForInStatement(node);
-                case 209 /* ForOfStatement */:
+                case 213 /* ForOfStatement */:
                     return emitForOfStatement(node);
-                case 210 /* ContinueStatement */:
+                case 214 /* ContinueStatement */:
                     return emitContinueStatement(node);
-                case 211 /* BreakStatement */:
+                case 215 /* BreakStatement */:
                     return emitBreakStatement(node);
-                case 212 /* ReturnStatement */:
+                case 216 /* ReturnStatement */:
                     return emitReturnStatement(node);
-                case 213 /* WithStatement */:
+                case 217 /* WithStatement */:
                     return emitWithStatement(node);
-                case 214 /* SwitchStatement */:
+                case 218 /* SwitchStatement */:
                     return emitSwitchStatement(node);
-                case 215 /* LabeledStatement */:
+                case 219 /* LabeledStatement */:
                     return emitLabeledStatement(node);
-                case 216 /* ThrowStatement */:
+                case 220 /* ThrowStatement */:
                     return emitThrowStatement(node);
-                case 217 /* TryStatement */:
+                case 221 /* TryStatement */:
                     return emitTryStatement(node);
-                case 218 /* DebuggerStatement */:
+                case 222 /* DebuggerStatement */:
                     return emitDebuggerStatement(node);
                 // Declarations
-                case 219 /* VariableDeclaration */:
+                case 223 /* VariableDeclaration */:
                     return emitVariableDeclaration(node);
-                case 220 /* VariableDeclarationList */:
+                case 224 /* VariableDeclarationList */:
                     return emitVariableDeclarationList(node);
-                case 221 /* FunctionDeclaration */:
+                case 225 /* FunctionDeclaration */:
                     return emitFunctionDeclaration(node);
-                case 222 /* ClassDeclaration */:
+                case 226 /* ClassDeclaration */:
                     return emitClassDeclaration(node);
-                case 223 /* InterfaceDeclaration */:
+                case 227 /* InterfaceDeclaration */:
                     return emitInterfaceDeclaration(node);
-                case 224 /* TypeAliasDeclaration */:
+                case 228 /* TypeAliasDeclaration */:
                     return emitTypeAliasDeclaration(node);
-                case 225 /* EnumDeclaration */:
+                case 229 /* EnumDeclaration */:
                     return emitEnumDeclaration(node);
-                case 226 /* ModuleDeclaration */:
+                case 230 /* ModuleDeclaration */:
                     return emitModuleDeclaration(node);
-                case 227 /* ModuleBlock */:
+                case 231 /* ModuleBlock */:
                     return emitModuleBlock(node);
-                case 228 /* CaseBlock */:
+                case 232 /* CaseBlock */:
                     return emitCaseBlock(node);
-                case 230 /* ImportEqualsDeclaration */:
+                case 234 /* ImportEqualsDeclaration */:
                     return emitImportEqualsDeclaration(node);
-                case 231 /* ImportDeclaration */:
+                case 235 /* ImportDeclaration */:
                     return emitImportDeclaration(node);
-                case 232 /* ImportClause */:
+                case 236 /* ImportClause */:
                     return emitImportClause(node);
-                case 233 /* NamespaceImport */:
+                case 237 /* NamespaceImport */:
                     return emitNamespaceImport(node);
-                case 234 /* NamedImports */:
+                case 238 /* NamedImports */:
                     return emitNamedImports(node);
-                case 235 /* ImportSpecifier */:
+                case 239 /* ImportSpecifier */:
                     return emitImportSpecifier(node);
-                case 236 /* ExportAssignment */:
+                case 240 /* ExportAssignment */:
                     return emitExportAssignment(node);
-                case 237 /* ExportDeclaration */:
+                case 241 /* ExportDeclaration */:
                     return emitExportDeclaration(node);
-                case 238 /* NamedExports */:
+                case 242 /* NamedExports */:
                     return emitNamedExports(node);
-                case 239 /* ExportSpecifier */:
+                case 243 /* ExportSpecifier */:
                     return emitExportSpecifier(node);
-                case 240 /* MissingDeclaration */:
+                case 244 /* MissingDeclaration */:
                     return;
                 // Module references
-                case 241 /* ExternalModuleReference */:
+                case 245 /* ExternalModuleReference */:
                     return emitExternalModuleReference(node);
                 // JSX (non-expression)
                 case 10 /* JsxText */:
                     return emitJsxText(node);
-                case 244 /* JsxOpeningElement */:
+                case 248 /* JsxOpeningElement */:
                     return emitJsxOpeningElement(node);
-                case 245 /* JsxClosingElement */:
+                case 249 /* JsxClosingElement */:
                     return emitJsxClosingElement(node);
-                case 246 /* JsxAttribute */:
+                case 250 /* JsxAttribute */:
                     return emitJsxAttribute(node);
-                case 247 /* JsxSpreadAttribute */:
+                case 251 /* JsxSpreadAttribute */:
                     return emitJsxSpreadAttribute(node);
-                case 248 /* JsxExpression */:
+                case 252 /* JsxExpression */:
                     return emitJsxExpression(node);
                 // Clauses
-                case 249 /* CaseClause */:
+                case 253 /* CaseClause */:
                     return emitCaseClause(node);
-                case 250 /* DefaultClause */:
+                case 254 /* DefaultClause */:
                     return emitDefaultClause(node);
-                case 251 /* HeritageClause */:
+                case 255 /* HeritageClause */:
                     return emitHeritageClause(node);
-                case 252 /* CatchClause */:
+                case 256 /* CatchClause */:
                     return emitCatchClause(node);
                 // Property assignments
-                case 253 /* PropertyAssignment */:
+                case 257 /* PropertyAssignment */:
                     return emitPropertyAssignment(node);
-                case 254 /* ShorthandPropertyAssignment */:
+                case 258 /* ShorthandPropertyAssignment */:
                     return emitShorthandPropertyAssignment(node);
+                case 259 /* SpreadAssignment */:
+                    return emitSpreadAssignment(node);
                 // Enum
-                case 255 /* EnumMember */:
+                case 260 /* EnumMember */:
                     return emitEnumMember(node);
             }
             // If the node is an expression, try to emit it as an expression with
@@ -56795,65 +59213,65 @@ var ts;
                     writeTokenText(kind);
                     return;
                 // Expressions
-                case 171 /* ArrayLiteralExpression */:
+                case 175 /* ArrayLiteralExpression */:
                     return emitArrayLiteralExpression(node);
-                case 172 /* ObjectLiteralExpression */:
+                case 176 /* ObjectLiteralExpression */:
                     return emitObjectLiteralExpression(node);
-                case 173 /* PropertyAccessExpression */:
+                case 177 /* PropertyAccessExpression */:
                     return emitPropertyAccessExpression(node);
-                case 174 /* ElementAccessExpression */:
+                case 178 /* ElementAccessExpression */:
                     return emitElementAccessExpression(node);
-                case 175 /* CallExpression */:
+                case 179 /* CallExpression */:
                     return emitCallExpression(node);
-                case 176 /* NewExpression */:
+                case 180 /* NewExpression */:
                     return emitNewExpression(node);
-                case 177 /* TaggedTemplateExpression */:
+                case 181 /* TaggedTemplateExpression */:
                     return emitTaggedTemplateExpression(node);
-                case 178 /* TypeAssertionExpression */:
+                case 182 /* TypeAssertionExpression */:
                     return emitTypeAssertionExpression(node);
-                case 179 /* ParenthesizedExpression */:
+                case 183 /* ParenthesizedExpression */:
                     return emitParenthesizedExpression(node);
-                case 180 /* FunctionExpression */:
+                case 184 /* FunctionExpression */:
                     return emitFunctionExpression(node);
-                case 181 /* ArrowFunction */:
+                case 185 /* ArrowFunction */:
                     return emitArrowFunction(node);
-                case 182 /* DeleteExpression */:
+                case 186 /* DeleteExpression */:
                     return emitDeleteExpression(node);
-                case 183 /* TypeOfExpression */:
+                case 187 /* TypeOfExpression */:
                     return emitTypeOfExpression(node);
-                case 184 /* VoidExpression */:
+                case 188 /* VoidExpression */:
                     return emitVoidExpression(node);
-                case 185 /* AwaitExpression */:
+                case 189 /* AwaitExpression */:
                     return emitAwaitExpression(node);
-                case 186 /* PrefixUnaryExpression */:
+                case 190 /* PrefixUnaryExpression */:
                     return emitPrefixUnaryExpression(node);
-                case 187 /* PostfixUnaryExpression */:
+                case 191 /* PostfixUnaryExpression */:
                     return emitPostfixUnaryExpression(node);
-                case 188 /* BinaryExpression */:
+                case 192 /* BinaryExpression */:
                     return emitBinaryExpression(node);
-                case 189 /* ConditionalExpression */:
+                case 193 /* ConditionalExpression */:
                     return emitConditionalExpression(node);
-                case 190 /* TemplateExpression */:
+                case 194 /* TemplateExpression */:
                     return emitTemplateExpression(node);
-                case 191 /* YieldExpression */:
+                case 195 /* YieldExpression */:
                     return emitYieldExpression(node);
-                case 192 /* SpreadElementExpression */:
-                    return emitSpreadElementExpression(node);
-                case 193 /* ClassExpression */:
+                case 196 /* SpreadElement */:
+                    return emitSpreadExpression(node);
+                case 197 /* ClassExpression */:
                     return emitClassExpression(node);
-                case 194 /* OmittedExpression */:
+                case 198 /* OmittedExpression */:
                     return;
-                case 196 /* AsExpression */:
+                case 200 /* AsExpression */:
                     return emitAsExpression(node);
-                case 197 /* NonNullExpression */:
+                case 201 /* NonNullExpression */:
                     return emitNonNullExpression(node);
                 // JSX
-                case 242 /* JsxElement */:
+                case 246 /* JsxElement */:
                     return emitJsxElement(node);
-                case 243 /* JsxSelfClosingElement */:
+                case 247 /* JsxSelfClosingElement */:
                     return emitJsxSelfClosingElement(node);
                 // Transformation nodes
-                case 288 /* PartiallyEmittedExpression */:
+                case 293 /* PartiallyEmittedExpression */:
                     return emitPartiallyEmittedExpression(node);
             }
         }
@@ -56979,7 +59397,7 @@ var ts;
         function emitAccessorDeclaration(node) {
             emitDecorators(node, node.decorators);
             emitModifiers(node, node.modifiers);
-            write(node.kind === 150 /* GetAccessor */ ? "get " : "set ");
+            write(node.kind === 151 /* GetAccessor */ ? "get " : "set ");
             emit(node.name);
             emitSignatureAndBody(node, emitSignatureHead);
         }
@@ -57067,6 +59485,39 @@ var ts;
         function emitThisType() {
             write("this");
         }
+        function emitTypeOperator(node) {
+            writeTokenText(node.operator);
+            write(" ");
+            emit(node.type);
+        }
+        function emitIndexedAccessType(node) {
+            emit(node.objectType);
+            write("[");
+            emit(node.indexType);
+            write("]");
+        }
+        function emitMappedType(node) {
+            write("{");
+            writeLine();
+            increaseIndent();
+            if (node.readonlyToken) {
+                write("readonly ");
+            }
+            write("[");
+            emit(node.typeParameter.name);
+            write(" in ");
+            emit(node.typeParameter.constraint);
+            write("]");
+            if (node.questionToken) {
+                write("?");
+            }
+            write(": ");
+            emit(node.type);
+            write(";");
+            writeLine();
+            decreaseIndent();
+            write("}");
+        }
         function emitLiteralType(node) {
             emitExpression(node.literal);
         }
@@ -57253,7 +59704,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 === 186 /* PrefixUnaryExpression */
+            return operand.kind === 190 /* PrefixUnaryExpression */
                 && ((node.operator === 36 /* PlusToken */ && (operand.operator === 36 /* PlusToken */ || operand.operator === 42 /* PlusPlusToken */))
                     || (node.operator === 37 /* MinusToken */ && (operand.operator === 37 /* MinusToken */ || operand.operator === 43 /* MinusMinusToken */)));
         }
@@ -57297,7 +59748,7 @@ var ts;
             write(node.asteriskToken ? "yield*" : "yield");
             emitExpressionWithPrefix(" ", node.expression);
         }
-        function emitSpreadElementExpression(node) {
+        function emitSpreadExpression(node) {
             write("...");
             emitExpression(node.expression);
         }
@@ -57371,7 +59822,7 @@ var ts;
             if (node.elseStatement) {
                 writeLine();
                 writeToken(81 /* ElseKeyword */, node.thenStatement.end, node);
-                if (node.elseStatement.kind === 204 /* IfStatement */) {
+                if (node.elseStatement.kind === 208 /* IfStatement */) {
                     write(" ");
                     emit(node.elseStatement);
                 }
@@ -57433,7 +59884,7 @@ var ts;
         }
         function emitForBinding(node) {
             if (node !== undefined) {
-                if (node.kind === 220 /* VariableDeclarationList */) {
+                if (node.kind === 224 /* VariableDeclarationList */) {
                     emit(node);
                 }
                 else {
@@ -57672,7 +60123,7 @@ var ts;
             write(node.flags & 16 /* Namespace */ ? "namespace " : "module ");
             emit(node.name);
             var body = node.body;
-            while (body.kind === 226 /* ModuleDeclaration */) {
+            while (body.kind === 230 /* ModuleDeclaration */) {
                 write(".");
                 emit(body.name);
                 body = body.body;
@@ -57912,6 +60363,12 @@ var ts;
                 emitExpression(node.objectAssignmentInitializer);
             }
         }
+        function emitSpreadAssignment(node) {
+            if (node.expression) {
+                write("...");
+                emitExpression(node.expression);
+            }
+        }
         //
         // Enum
         //
@@ -57997,10 +60454,17 @@ var ts;
                 extendsEmitted = true;
                 helpersEmitted = true;
             }
-            if (compilerOptions.jsx !== 1 /* Preserve */ && !assignEmitted && (node.flags & 16384 /* HasJsxSpreadAttributes */)) {
+            if ((languageVersion < 5 /* ESNext */ || currentSourceFile.scriptKind === 2 /* JSX */ || currentSourceFile.scriptKind === 4 /* TSX */) &&
+                compilerOptions.jsx !== 1 /* Preserve */ &&
+                !assignEmitted &&
+                node.flags & 16384 /* HasSpreadAttribute */) {
                 writeLines(assignHelper);
                 assignEmitted = true;
             }
+            if (languageVersion < 5 /* ESNext */ && !restEmitted && node.flags & 32768 /* HasRestAttribute */) {
+                writeLines(restHelper);
+                restEmitted = true;
+            }
             if (!decorateEmitted && node.flags & 2048 /* HasDecorators */) {
                 writeLines(decorateHelper);
                 if (compilerOptions.emitDecoratorMetadata) {
@@ -58346,7 +60810,7 @@ var ts;
                 && !ts.rangeEndIsOnSameLineAsRangeStart(node1, node2, currentSourceFile);
         }
         function skipSynthesizedParentheses(node) {
-            while (node.kind === 179 /* ParenthesizedExpression */ && ts.nodeIsSynthesized(node)) {
+            while (node.kind === 183 /* ParenthesizedExpression */ && ts.nodeIsSynthesized(node)) {
                 node = node.expression;
             }
             return node;
@@ -58409,10 +60873,10 @@ var ts;
         */
         function makeTempVariableName(flags) {
             if (flags && !(tempFlags & flags)) {
-                var name_41 = flags === 268435456 /* _i */ ? "_i" : "_n";
-                if (isUniqueName(name_41)) {
+                var name_38 = flags === 268435456 /* _i */ ? "_i" : "_n";
+                if (isUniqueName(name_38)) {
                     tempFlags |= flags;
-                    return name_41;
+                    return name_38;
                 }
             }
             while (true) {
@@ -58420,11 +60884,11 @@ var ts;
                 tempFlags++;
                 // Skip over 'i' and 'n'
                 if (count !== 8 && count !== 13) {
-                    var name_42 = count < 26
+                    var name_39 = count < 26
                         ? "_" + String.fromCharCode(97 /* a */ + count)
                         : "_" + (count - 26);
-                    if (isUniqueName(name_42)) {
-                        return name_42;
+                    if (isUniqueName(name_39)) {
+                        return name_39;
                     }
                 }
             }
@@ -58473,17 +60937,17 @@ var ts;
             switch (node.kind) {
                 case 70 /* Identifier */:
                     return makeUniqueName(getTextOfNode(node));
-                case 226 /* ModuleDeclaration */:
-                case 225 /* EnumDeclaration */:
+                case 230 /* ModuleDeclaration */:
+                case 229 /* EnumDeclaration */:
                     return generateNameForModuleOrEnum(node);
-                case 231 /* ImportDeclaration */:
-                case 237 /* ExportDeclaration */:
+                case 235 /* ImportDeclaration */:
+                case 241 /* ExportDeclaration */:
                     return generateNameForImportOrExportDeclaration(node);
-                case 221 /* FunctionDeclaration */:
-                case 222 /* ClassDeclaration */:
-                case 236 /* ExportAssignment */:
+                case 225 /* FunctionDeclaration */:
+                case 226 /* ClassDeclaration */:
+                case 240 /* ExportAssignment */:
                     return generateNameForExportDefault();
-                case 193 /* ClassExpression */:
+                case 197 /* ClassExpression */:
                     return generateNameForClassExpression();
                 default:
                     return makeTempVariableName(0 /* Auto */);
@@ -58650,7 +61114,7 @@ var ts;
 var ts;
 (function (ts) {
     /** The version of the TypeScript compiler release */
-    ts.version = "2.1.0";
+    ts.version = "2.2.0";
     var emptyArray = [];
     function findConfigFile(searchPath, fileExists, configName) {
         if (configName === void 0) { configName = "tsconfig.json"; }
@@ -58876,11 +61340,11 @@ var ts;
         }
         var resolutions = [];
         var cache = ts.createMap();
-        for (var _i = 0, names_2 = names; _i < names_2.length; _i++) {
-            var name_43 = names_2[_i];
-            var result = name_43 in cache
-                ? cache[name_43]
-                : cache[name_43] = loader(name_43, containingFile);
+        for (var _i = 0, names_1 = names; _i < names_1.length; _i++) {
+            var name_40 = names_1[_i];
+            var result = name_40 in cache
+                ? cache[name_40]
+                : cache[name_40] = loader(name_40, containingFile);
             resolutions.push(result);
         }
         return resolutions;
@@ -58901,7 +61365,7 @@ var ts;
         // - This calls resolveModuleNames, and then calls findSourceFile for each resolved module.
         // As all these operations happen - and are nested - within the createProgram call, they close over the below variables.
         // The current resolution depth is tracked by incrementing/decrementing as the depth first search progresses.
-        var maxNodeModulesJsDepth = typeof options.maxNodeModuleJsDepth === "number" ? options.maxNodeModuleJsDepth : 0;
+        var maxNodeModuleJsDepth = typeof options.maxNodeModuleJsDepth === "number" ? options.maxNodeModuleJsDepth : 0;
         var currentNodeModulesDepth = 0;
         // If a module has some of its imports skipped due to being at the depth limit under node_modules, then track
         // this, as it may be imported at a shallower depth later, and then it will need its skipped imports processed.
@@ -58918,7 +61382,15 @@ var ts;
         var hasEmitBlockingDiagnostics = ts.createFileMap(getCanonicalFileName);
         var resolveModuleNamesWorker;
         if (host.resolveModuleNames) {
-            resolveModuleNamesWorker = function (moduleNames, containingFile) { return host.resolveModuleNames(moduleNames, containingFile); };
+            resolveModuleNamesWorker = function (moduleNames, containingFile) { return host.resolveModuleNames(moduleNames, containingFile).map(function (resolved) {
+                // An older host may have omitted extension, in which case we should infer it from the file extension of resolvedFileName.
+                if (!resolved || resolved.extension !== undefined) {
+                    return resolved;
+                }
+                var withExtension = ts.clone(resolved);
+                withExtension.extension = ts.extensionFromPath(resolved.resolvedFileName);
+                return withExtension;
+            }); };
         }
         else {
             var loader_1 = function (moduleName, containingFile) { return ts.resolveModuleName(moduleName, containingFile, options, host).resolvedModule; };
@@ -58991,6 +61463,7 @@ var ts;
             getTypeCount: function () { return getDiagnosticsProducingTypeChecker().getTypeCount(); },
             getFileProcessingDiagnostics: function () { return fileProcessingDiagnostics; },
             getResolvedTypeReferenceDirectives: function () { return resolvedTypeReferenceDirectives; },
+            isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
             dropDiagnosticsProducingTypeChecker: dropDiagnosticsProducingTypeChecker
         };
         verifyCompilerOptions();
@@ -58998,13 +61471,14 @@ var ts;
         ts.performance.measure("Program", "beforeProgram", "afterProgram");
         return program;
         function getCommonSourceDirectory() {
-            if (typeof commonSourceDirectory === "undefined") {
-                if (options.rootDir && checkSourceFilesBelongToPath(files, options.rootDir)) {
+            if (commonSourceDirectory === undefined) {
+                var emittedFiles = ts.filterSourceFilesInDirectory(files, isSourceFileFromExternalLibrary);
+                if (options.rootDir && checkSourceFilesBelongToPath(emittedFiles, options.rootDir)) {
                     // If a rootDir is specified and is valid use it as the commonSourceDirectory
                     commonSourceDirectory = ts.getNormalizedAbsolutePath(options.rootDir, currentDirectory);
                 }
                 else {
-                    commonSourceDirectory = computeCommonSourceDirectory(files);
+                    commonSourceDirectory = computeCommonSourceDirectory(emittedFiles);
                 }
                 if (commonSourceDirectory && commonSourceDirectory[commonSourceDirectory.length - 1] !== ts.directorySeparator) {
                     // Make sure directory path ends with directory separator so this string can directly
@@ -59027,6 +61501,112 @@ var ts;
             }
             return classifiableNames;
         }
+        function resolveModuleNamesReusingOldState(moduleNames, containingFile, file, oldProgramState) {
+            if (!oldProgramState && !file.ambientModuleNames.length) {
+                // if old program state is not supplied and file does not contain locally defined ambient modules
+                // then the best we can do is fallback to the default logic
+                return resolveModuleNamesWorker(moduleNames, containingFile);
+            }
+            // at this point we know that either
+            // - file has local declarations for ambient modules
+            // OR
+            // - old program state is available
+            // OR
+            // - both of items above
+            // With this it is possible that we can tell how some module names from the initial list will be resolved
+            // without doing actual resolution (in particular if some name was resolved to ambient module).
+            // Such names should be excluded from the list of module names that will be provided to `resolveModuleNamesWorker`
+            // since we don't want to resolve them again.
+            // this is a list of modules for which we cannot predict resolution so they should be actually resolved
+            var unknownModuleNames;
+            // this is a list of combined results assembles from predicted and resolved results.
+            // Order in this list matches the order in the original list of module names `moduleNames` which is important
+            // so later we can split results to resolutions of modules and resolutions of module augmentations.
+            var result;
+            // a transient placeholder that is used to mark predicted resolution in the result list
+            var predictedToResolveToAmbientModuleMarker = {};
+            for (var i = 0; i < moduleNames.length; i++) {
+                var moduleName = moduleNames[i];
+                // module name is known to be resolved to ambient module if
+                // - module name is contained in the list of ambient modules that are locally declared in the file
+                // - in the old program module name was resolved to ambient module whose declaration is in non-modified file
+                //   (so the same module declaration will land in the new program)
+                var isKnownToResolveToAmbientModule = false;
+                if (ts.contains(file.ambientModuleNames, moduleName)) {
+                    isKnownToResolveToAmbientModule = true;
+                    if (ts.isTraceEnabled(options, host)) {
+                        ts.trace(host, ts.Diagnostics.Module_0_was_resolved_as_locally_declared_ambient_module_in_file_1, moduleName, containingFile);
+                    }
+                }
+                else {
+                    isKnownToResolveToAmbientModule = checkModuleNameResolvedToAmbientModuleInNonModifiedFile(moduleName, oldProgramState);
+                }
+                if (isKnownToResolveToAmbientModule) {
+                    if (!unknownModuleNames) {
+                        // found a first module name for which result can be prediced
+                        // this means that this module name should not be passed to `resolveModuleNamesWorker`.
+                        // We'll use a separate list for module names that are definitely unknown.
+                        result = new Array(moduleNames.length);
+                        // copy all module names that appear before the current one in the list
+                        // since they are known to be unknown
+                        unknownModuleNames = moduleNames.slice(0, i);
+                    }
+                    // mark prediced resolution in the result list
+                    result[i] = predictedToResolveToAmbientModuleMarker;
+                }
+                else if (unknownModuleNames) {
+                    // found unknown module name and we are already using separate list for those - add it to the list
+                    unknownModuleNames.push(moduleName);
+                }
+            }
+            if (!unknownModuleNames) {
+                // we've looked throught the list but have not seen any predicted resolution
+                // use default logic
+                return resolveModuleNamesWorker(moduleNames, containingFile);
+            }
+            var resolutions = unknownModuleNames.length
+                ? resolveModuleNamesWorker(unknownModuleNames, containingFile)
+                : emptyArray;
+            // combine results of resolutions and predicted results
+            var j = 0;
+            for (var i = 0; i < result.length; i++) {
+                if (result[i] == predictedToResolveToAmbientModuleMarker) {
+                    result[i] = undefined;
+                }
+                else {
+                    result[i] = resolutions[j];
+                    j++;
+                }
+            }
+            ts.Debug.assert(j === resolutions.length);
+            return result;
+            function checkModuleNameResolvedToAmbientModuleInNonModifiedFile(moduleName, oldProgramState) {
+                if (!oldProgramState) {
+                    return false;
+                }
+                var resolutionToFile = ts.getResolvedModule(oldProgramState.file, moduleName);
+                if (resolutionToFile) {
+                    // module used to be resolved to file - ignore it
+                    return false;
+                }
+                var ambientModule = oldProgram.getTypeChecker().tryFindAmbientModuleWithoutAugmentations(moduleName);
+                if (!(ambientModule && ambientModule.declarations)) {
+                    return false;
+                }
+                // at least one of declarations should come from non-modified source file
+                var firstUnmodifiedFile = ts.forEach(ambientModule.declarations, function (d) {
+                    var f = ts.getSourceFileOfNode(d);
+                    return !ts.contains(oldProgramState.modifiedFilePaths, f.path) && f;
+                });
+                if (!firstUnmodifiedFile) {
+                    return false;
+                }
+                if (ts.isTraceEnabled(options, host)) {
+                    ts.trace(host, ts.Diagnostics.Module_0_was_resolved_as_ambient_module_declared_in_1_since_this_file_was_not_modified, moduleName, firstUnmodifiedFile.fileName);
+                }
+                return true;
+            }
+        }
         function tryReuseStructureFromOldProgram() {
             if (!oldProgram) {
                 return false;
@@ -59034,21 +61614,7 @@ var ts;
             // check properties that can affect structure of the program or module resolution strategy
             // if any of these properties has changed - structure cannot be reused
             var oldOptions = oldProgram.getCompilerOptions();
-            if ((oldOptions.module !== options.module) ||
-                (oldOptions.moduleResolution !== options.moduleResolution) ||
-                (oldOptions.noResolve !== options.noResolve) ||
-                (oldOptions.target !== options.target) ||
-                (oldOptions.noLib !== options.noLib) ||
-                (oldOptions.jsx !== options.jsx) ||
-                (oldOptions.allowJs !== options.allowJs) ||
-                (oldOptions.rootDir !== options.rootDir) ||
-                (oldOptions.configFilePath !== options.configFilePath) ||
-                (oldOptions.baseUrl !== options.baseUrl) ||
-                (oldOptions.maxNodeModuleJsDepth !== options.maxNodeModuleJsDepth) ||
-                !ts.arrayIsEqualTo(oldOptions.lib, options.lib) ||
-                !ts.arrayIsEqualTo(oldOptions.typeRoots, oldOptions.typeRoots) ||
-                !ts.arrayIsEqualTo(oldOptions.rootDirs, options.rootDirs) ||
-                !ts.equalOwnProperties(oldOptions.paths, options.paths)) {
+            if (ts.changesAffectModuleResolution(oldOptions, options)) {
                 return false;
             }
             ts.Debug.assert(!oldProgram.structureIsReused);
@@ -59099,29 +61665,8 @@ var ts;
                         // 'types' references has changed
                         return false;
                     }
-                    var newSourceFilePath = ts.getNormalizedAbsolutePath(newSourceFile.fileName, currentDirectory);
-                    if (resolveModuleNamesWorker) {
-                        var moduleNames = ts.map(ts.concatenate(newSourceFile.imports, newSourceFile.moduleAugmentations), getTextOfLiteral);
-                        var resolutions = resolveModuleNamesWorker(moduleNames, newSourceFilePath);
-                        // ensure that module resolution results are still correct
-                        var resolutionsChanged = ts.hasChangesInResolutions(moduleNames, resolutions, oldSourceFile.resolvedModules, ts.moduleResolutionIsEqualTo);
-                        if (resolutionsChanged) {
-                            return false;
-                        }
-                    }
-                    if (resolveTypeReferenceDirectiveNamesWorker) {
-                        var typesReferenceDirectives = ts.map(newSourceFile.typeReferenceDirectives, function (x) { return x.fileName; });
-                        var resolutions = resolveTypeReferenceDirectiveNamesWorker(typesReferenceDirectives, newSourceFilePath);
-                        // ensure that types resolutions are still correct
-                        var resolutionsChanged = ts.hasChangesInResolutions(typesReferenceDirectives, resolutions, oldSourceFile.resolvedTypeReferenceDirectiveNames, ts.typeDirectiveIsEqualTo);
-                        if (resolutionsChanged) {
-                            return false;
-                        }
-                    }
-                    // pass the cache of module/types resolutions from the old source file
-                    newSourceFile.resolvedModules = oldSourceFile.resolvedModules;
-                    newSourceFile.resolvedTypeReferenceDirectiveNames = oldSourceFile.resolvedTypeReferenceDirectiveNames;
-                    modifiedSourceFiles.push(newSourceFile);
+                    // tentatively approve the file
+                    modifiedSourceFiles.push({ oldFile: oldSourceFile, newFile: newSourceFile });
                 }
                 else {
                     // file has no changes - use it as is
@@ -59130,15 +61675,42 @@ var ts;
                 // if file has passed all checks it should be safe to reuse it
                 newSourceFiles.push(newSourceFile);
             }
+            var modifiedFilePaths = modifiedSourceFiles.map(function (f) { return f.newFile.path; });
+            // try to verify results of module resolution
+            for (var _b = 0, modifiedSourceFiles_1 = modifiedSourceFiles; _b < modifiedSourceFiles_1.length; _b++) {
+                var _c = modifiedSourceFiles_1[_b], oldSourceFile = _c.oldFile, newSourceFile = _c.newFile;
+                var newSourceFilePath = ts.getNormalizedAbsolutePath(newSourceFile.fileName, currentDirectory);
+                if (resolveModuleNamesWorker) {
+                    var moduleNames = ts.map(ts.concatenate(newSourceFile.imports, newSourceFile.moduleAugmentations), getTextOfLiteral);
+                    var resolutions = resolveModuleNamesReusingOldState(moduleNames, newSourceFilePath, newSourceFile, { file: oldSourceFile, program: oldProgram, modifiedFilePaths: modifiedFilePaths });
+                    // ensure that module resolution results are still correct
+                    var resolutionsChanged = ts.hasChangesInResolutions(moduleNames, resolutions, oldSourceFile.resolvedModules, ts.moduleResolutionIsEqualTo);
+                    if (resolutionsChanged) {
+                        return false;
+                    }
+                }
+                if (resolveTypeReferenceDirectiveNamesWorker) {
+                    var typesReferenceDirectives = ts.map(newSourceFile.typeReferenceDirectives, function (x) { return x.fileName; });
+                    var resolutions = resolveTypeReferenceDirectiveNamesWorker(typesReferenceDirectives, newSourceFilePath);
+                    // ensure that types resolutions are still correct
+                    var resolutionsChanged = ts.hasChangesInResolutions(typesReferenceDirectives, resolutions, oldSourceFile.resolvedTypeReferenceDirectiveNames, ts.typeDirectiveIsEqualTo);
+                    if (resolutionsChanged) {
+                        return false;
+                    }
+                }
+                // pass the cache of module/types resolutions from the old source file
+                newSourceFile.resolvedModules = oldSourceFile.resolvedModules;
+                newSourceFile.resolvedTypeReferenceDirectiveNames = oldSourceFile.resolvedTypeReferenceDirectiveNames;
+            }
             // update fileName -> file mapping
             for (var i = 0, len = newSourceFiles.length; i < len; i++) {
                 filesByName.set(filePaths[i], newSourceFiles[i]);
             }
             files = newSourceFiles;
             fileProcessingDiagnostics = oldProgram.getFileProcessingDiagnostics();
-            for (var _b = 0, modifiedSourceFiles_1 = modifiedSourceFiles; _b < modifiedSourceFiles_1.length; _b++) {
-                var modifiedFile = modifiedSourceFiles_1[_b];
-                fileProcessingDiagnostics.reattachFileDiagnostics(modifiedFile);
+            for (var _d = 0, modifiedSourceFiles_2 = modifiedSourceFiles; _d < modifiedSourceFiles_2.length; _d++) {
+                var modifiedFile = modifiedSourceFiles_2[_d];
+                fileProcessingDiagnostics.reattachFileDiagnostics(modifiedFile.newFile);
             }
             resolvedTypeReferenceDirectives = oldProgram.getResolvedTypeReferenceDirectives();
             oldProgram.structureIsReused = true;
@@ -59154,11 +61726,14 @@ var ts;
                 getSourceFile: program.getSourceFile,
                 getSourceFileByPath: program.getSourceFileByPath,
                 getSourceFiles: program.getSourceFiles,
-                isSourceFileFromExternalLibrary: function (file) { return !!sourceFilesFoundSearchingNodeModules[file.path]; },
+                isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
                 writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }),
                 isEmitBlocked: isEmitBlocked,
             };
         }
+        function isSourceFileFromExternalLibrary(file) {
+            return sourceFilesFoundSearchingNodeModules[file.path];
+        }
         function getDiagnosticsProducingTypeChecker() {
             return diagnosticsProducingTypeChecker || (diagnosticsProducingTypeChecker = ts.createTypeChecker(program, /*produceDiagnostics:*/ true));
         }
@@ -59247,6 +61822,14 @@ var ts;
             }
         }
         function getSyntacticDiagnosticsForFile(sourceFile) {
+            // For JavaScript files, we report semantic errors for using TypeScript-only
+            // constructs from within a JavaScript file as syntactic errors.
+            if (ts.isSourceFileJavaScript(sourceFile)) {
+                if (!sourceFile.additionalSyntacticDiagnostics) {
+                    sourceFile.additionalSyntacticDiagnostics = getJavaScriptSyntacticDiagnosticsForFile(sourceFile);
+                }
+                return ts.concatenate(sourceFile.additionalSyntacticDiagnostics, sourceFile.parseDiagnostics);
+            }
             return sourceFile.parseDiagnostics;
         }
         function runWithCancellationToken(func) {
@@ -59275,179 +61858,180 @@ var ts;
                 var typeChecker = getDiagnosticsProducingTypeChecker();
                 ts.Debug.assert(!!sourceFile.bindDiagnostics);
                 var bindDiagnostics = sourceFile.bindDiagnostics;
-                // For JavaScript files, we don't want to report the normal typescript semantic errors.
-                // Instead, we just report errors for using TypeScript-only constructs from within a
-                // JavaScript file.
-                var checkDiagnostics = ts.isSourceFileJavaScript(sourceFile) ?
-                    getJavaScriptSemanticDiagnosticsForFile(sourceFile) :
-                    typeChecker.getDiagnostics(sourceFile, cancellationToken);
+                // For JavaScript files, we don't want to report semantic errors.
+                // Instead, we'll report errors for using TypeScript-only constructs from within a
+                // JavaScript file when we get syntactic diagnostics for the file.
+                var checkDiagnostics = ts.isSourceFileJavaScript(sourceFile) ? [] : typeChecker.getDiagnostics(sourceFile, cancellationToken);
                 var fileProcessingDiagnosticsInFile = fileProcessingDiagnostics.getDiagnostics(sourceFile.fileName);
                 var programDiagnosticsInFile = programDiagnostics.getDiagnostics(sourceFile.fileName);
                 return bindDiagnostics.concat(checkDiagnostics, fileProcessingDiagnosticsInFile, programDiagnosticsInFile);
             });
         }
-        function getJavaScriptSemanticDiagnosticsForFile(sourceFile) {
+        function getJavaScriptSyntacticDiagnosticsForFile(sourceFile) {
             return runWithCancellationToken(function () {
                 var diagnostics = [];
+                var parent = sourceFile;
                 walk(sourceFile);
                 return diagnostics;
                 function walk(node) {
-                    if (!node) {
-                        return false;
+                    // 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 144 /* Parameter */:
+                        case 147 /* PropertyDeclaration */:
+                            if (parent.questionToken === node) {
+                                diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, "?"));
+                                return;
+                            }
+                        // Pass through
+                        case 149 /* MethodDeclaration */:
+                        case 148 /* MethodSignature */:
+                        case 150 /* Constructor */:
+                        case 151 /* GetAccessor */:
+                        case 152 /* SetAccessor */:
+                        case 184 /* FunctionExpression */:
+                        case 225 /* FunctionDeclaration */:
+                        case 185 /* ArrowFunction */:
+                        case 225 /* FunctionDeclaration */:
+                        case 223 /* VariableDeclaration */:
+                            // type annotation
+                            if (parent.type === node) {
+                                diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.types_can_only_be_used_in_a_ts_file));
+                                return;
+                            }
                     }
                     switch (node.kind) {
-                        case 230 /* ImportEqualsDeclaration */:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.import_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 236 /* ExportAssignment */:
+                        case 234 /* ImportEqualsDeclaration */:
+                            diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.import_can_only_be_used_in_a_ts_file));
+                            return;
+                        case 240 /* ExportAssignment */:
                             if (node.isExportEquals) {
-                                diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.export_can_only_be_used_in_a_ts_file));
-                                return true;
+                                diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.export_can_only_be_used_in_a_ts_file));
+                                return;
                             }
                             break;
-                        case 222 /* ClassDeclaration */:
-                            var classDeclaration = node;
-                            if (checkModifiers(classDeclaration.modifiers) ||
-                                checkTypeParameters(classDeclaration.typeParameters)) {
-                                return true;
-                            }
-                            break;
-                        case 251 /* HeritageClause */:
+                        case 255 /* HeritageClause */:
                             var heritageClause = node;
                             if (heritageClause.token === 107 /* ImplementsKeyword */) {
-                                diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.implements_clauses_can_only_be_used_in_a_ts_file));
-                                return true;
+                                diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.implements_clauses_can_only_be_used_in_a_ts_file));
+                                return;
                             }
                             break;
-                        case 223 /* InterfaceDeclaration */:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.interface_declarations_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 226 /* ModuleDeclaration */:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.module_declarations_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 224 /* TypeAliasDeclaration */:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.type_aliases_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 148 /* MethodDeclaration */:
-                        case 147 /* MethodSignature */:
-                        case 149 /* Constructor */:
-                        case 150 /* GetAccessor */:
-                        case 151 /* SetAccessor */:
-                        case 180 /* FunctionExpression */:
-                        case 221 /* FunctionDeclaration */:
-                        case 181 /* ArrowFunction */:
-                        case 221 /* FunctionDeclaration */:
-                            var functionDeclaration = node;
-                            if (checkModifiers(functionDeclaration.modifiers) ||
-                                checkTypeParameters(functionDeclaration.typeParameters) ||
-                                checkTypeAnnotation(functionDeclaration.type)) {
-                                return true;
+                        case 227 /* InterfaceDeclaration */:
+                            diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.interface_declarations_can_only_be_used_in_a_ts_file));
+                            return;
+                        case 230 /* ModuleDeclaration */:
+                            diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.module_declarations_can_only_be_used_in_a_ts_file));
+                            return;
+                        case 228 /* TypeAliasDeclaration */:
+                            diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.type_aliases_can_only_be_used_in_a_ts_file));
+                            return;
+                        case 229 /* EnumDeclaration */:
+                            diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.enum_declarations_can_only_be_used_in_a_ts_file));
+                            return;
+                        case 182 /* TypeAssertionExpression */:
+                            var typeAssertionExpression = node;
+                            diagnostics.push(createDiagnosticForNode(typeAssertionExpression.type, ts.Diagnostics.type_assertion_expressions_can_only_be_used_in_a_ts_file));
+                            return;
+                    }
+                    var prevParent = parent;
+                    parent = node;
+                    ts.forEachChild(node, walk, walkArray);
+                    parent = prevParent;
+                }
+                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));
+                    }
+                    switch (parent.kind) {
+                        case 226 /* ClassDeclaration */:
+                        case 149 /* MethodDeclaration */:
+                        case 148 /* MethodSignature */:
+                        case 150 /* Constructor */:
+                        case 151 /* GetAccessor */:
+                        case 152 /* SetAccessor */:
+                        case 184 /* FunctionExpression */:
+                        case 225 /* FunctionDeclaration */:
+                        case 185 /* ArrowFunction */:
+                        case 225 /* FunctionDeclaration */:
+                            // 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;
+                            }
+                        // pass through
+                        case 205 /* VariableStatement */:
+                            // Check modifiers
+                            if (nodes === parent.modifiers) {
+                                return checkModifiers(nodes, parent.kind === 205 /* VariableStatement */);
                             }
                             break;
-                        case 201 /* VariableStatement */:
-                            var variableStatement = node;
-                            if (checkModifiers(variableStatement.modifiers)) {
-                                return true;
-                            }
-                            break;
-                        case 219 /* VariableDeclaration */:
-                            var variableDeclaration = node;
-                            if (checkTypeAnnotation(variableDeclaration.type)) {
-                                return true;
-                            }
-                            break;
-                        case 175 /* CallExpression */:
-                        case 176 /* NewExpression */:
-                            var expression = node;
-                            if (expression.typeArguments && expression.typeArguments.length > 0) {
-                                var start = expression.typeArguments.pos;
-                                diagnostics.push(ts.createFileDiagnostic(sourceFile, start, expression.typeArguments.end - start, ts.Diagnostics.type_arguments_can_only_be_used_in_a_ts_file));
-                                return true;
-                            }
-                            break;
-                        case 143 /* Parameter */:
-                            var parameter = node;
-                            if (parameter.modifiers) {
-                                var start = parameter.modifiers.pos;
-                                diagnostics.push(ts.createFileDiagnostic(sourceFile, start, parameter.modifiers.end - start, ts.Diagnostics.parameter_modifiers_can_only_be_used_in_a_ts_file));
-                                return true;
-                            }
-                            if (parameter.questionToken) {
-                                diagnostics.push(ts.createDiagnosticForNode(parameter.questionToken, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, "?"));
-                                return true;
-                            }
-                            if (parameter.type) {
-                                diagnostics.push(ts.createDiagnosticForNode(parameter.type, ts.Diagnostics.types_can_only_be_used_in_a_ts_file));
-                                return true;
-                            }
-                            break;
-                        case 146 /* PropertyDeclaration */:
-                            var propertyDeclaration = node;
-                            if (propertyDeclaration.modifiers) {
-                                for (var _i = 0, _a = propertyDeclaration.modifiers; _i < _a.length; _i++) {
+                        case 147 /* 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 !== 114 /* StaticKeyword */) {
-                                        diagnostics.push(ts.createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
-                                        return true;
+                                        diagnostics.push(createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
                                     }
                                 }
-                            }
-                            if (checkTypeAnnotation(node.type)) {
-                                return true;
+                                return;
                             }
                             break;
-                        case 225 /* EnumDeclaration */:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.enum_declarations_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 178 /* TypeAssertionExpression */:
-                            var typeAssertionExpression = node;
-                            diagnostics.push(ts.createDiagnosticForNode(typeAssertionExpression.type, ts.Diagnostics.type_assertion_expressions_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 144 /* Decorator */:
-                            if (!options.experimentalDecorators) {
-                                diagnostics.push(ts.createDiagnosticForNode(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));
+                        case 144 /* 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;
                             }
-                            return true;
-                    }
-                    return ts.forEachChild(node, walk);
-                }
-                function checkTypeParameters(typeParameters) {
-                    if (typeParameters) {
-                        var start = typeParameters.pos;
-                        diagnostics.push(ts.createFileDiagnostic(sourceFile, start, typeParameters.end - start, ts.Diagnostics.type_parameter_declarations_can_only_be_used_in_a_ts_file));
-                        return true;
-                    }
-                    return false;
-                }
-                function checkTypeAnnotation(type) {
-                    if (type) {
-                        diagnostics.push(ts.createDiagnosticForNode(type, ts.Diagnostics.types_can_only_be_used_in_a_ts_file));
-                        return true;
-                    }
-                    return false;
-                }
-                function checkModifiers(modifiers) {
-                    if (modifiers) {
-                        for (var _i = 0, modifiers_1 = modifiers; _i < modifiers_1.length; _i++) {
-                            var modifier = modifiers_1[_i];
-                            switch (modifier.kind) {
-                                case 113 /* PublicKeyword */:
-                                case 111 /* PrivateKeyword */:
-                                case 112 /* ProtectedKeyword */:
-                                case 129 /* ReadonlyKeyword */:
-                                case 123 /* DeclareKeyword */:
-                                    diagnostics.push(ts.createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
-                                    return true;
-                                // These are all legal modifiers.
-                                case 114 /* StaticKeyword */:
-                                case 83 /* ExportKeyword */:
-                                case 75 /* ConstKeyword */:
-                                case 78 /* DefaultKeyword */:
-                                case 116 /* AbstractKeyword */:
+                            break;
+                        case 179 /* CallExpression */:
+                        case 180 /* NewExpression */:
+                        case 199 /* ExpressionWithTypeArguments */:
+                            // Check type arguments
+                            if (nodes === parent.typeArguments) {
+                                diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.type_arguments_can_only_be_used_in_a_ts_file));
+                                return;
                             }
+                            break;
+                    }
+                    for (var _b = 0, nodes_4 = nodes; _b < nodes_4.length; _b++) {
+                        var node = nodes_4[_b];
+                        walk(node);
+                    }
+                }
+                function checkModifiers(modifiers, isConstValid) {
+                    for (var _i = 0, modifiers_1 = modifiers; _i < modifiers_1.length; _i++) {
+                        var modifier = modifiers_1[_i];
+                        switch (modifier.kind) {
+                            case 75 /* ConstKeyword */:
+                                if (isConstValid) {
+                                    continue;
+                                }
+                            // Fallthrough to report error
+                            case 113 /* PublicKeyword */:
+                            case 111 /* PrivateKeyword */:
+                            case 112 /* ProtectedKeyword */:
+                            case 130 /* ReadonlyKeyword */:
+                            case 123 /* DeclareKeyword */:
+                            case 116 /* 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 114 /* StaticKeyword */:
+                            case 83 /* ExportKeyword */:
+                            case 78 /* DefaultKeyword */:
                         }
                     }
-                    return false;
+                }
+                function createDiagnosticForNodeArray(nodes, message, arg0, arg1, arg2) {
+                    var start = nodes.pos;
+                    return ts.createFileDiagnostic(sourceFile, start, nodes.end - start, message, arg0, arg1, arg2);
+                }
+                // Since these are syntactic diagnostics, parent might not have been set
+                // this means the sourceFile cannot be infered from the node
+                function createDiagnosticForNode(node, message, arg0, arg1, arg2) {
+                    return ts.createDiagnosticForNodeInSourceFile(sourceFile, node, message, arg0, arg1, arg2);
                 }
             });
         }
@@ -59455,8 +62039,7 @@ var ts;
             return runWithCancellationToken(function () {
                 var resolver = getDiagnosticsProducingTypeChecker().getEmitResolver(sourceFile, cancellationToken);
                 // Don't actually write any files since we're just getting diagnostics.
-                var writeFile = function () { };
-                return ts.getDeclarationDiagnostics(getEmitHost(writeFile), resolver, sourceFile);
+                return ts.getDeclarationDiagnostics(getEmitHost(ts.noop), resolver, sourceFile);
             });
         }
         function getDeclarationDiagnosticsForFile(sourceFile, cancellationToken) {
@@ -59473,9 +62056,6 @@ var ts;
             ts.addRange(allDiagnostics, getDiagnosticsProducingTypeChecker().getGlobalDiagnostics());
             return ts.sortAndDeduplicateDiagnostics(allDiagnostics);
         }
-        function hasExtension(fileName) {
-            return ts.getBaseFileName(fileName).indexOf(".") >= 0;
-        }
         function processRootFile(fileName, isDefaultLib) {
             processSourceFile(ts.normalizePath(fileName), isDefaultLib);
         }
@@ -59494,16 +62074,21 @@ var ts;
             }
             var isJavaScriptFile = ts.isSourceFileJavaScript(file);
             var isExternalModuleFile = ts.isExternalModule(file);
+            var isDtsFile = ts.isDeclarationFile(file);
             var imports;
             var moduleAugmentations;
+            var ambientModules;
             // If we are importing helpers, we need to add a synthetic reference to resolve the
             // helpers library.
             if (options.importHelpers
                 && (options.isolatedModules || isExternalModuleFile)
                 && !file.isDeclarationFile) {
-                var externalHelpersModuleReference = ts.createNode(9 /* StringLiteral */);
+                // synthesize 'import "tslib"' declaration
+                var externalHelpersModuleReference = ts.createSynthesizedNode(9 /* StringLiteral */);
                 externalHelpersModuleReference.text = ts.externalHelpersModuleNameText;
-                externalHelpersModuleReference.parent = file;
+                var importDecl = ts.createSynthesizedNode(235 /* ImportDeclaration */);
+                importDecl.parent = file;
+                externalHelpersModuleReference.parent = importDecl;
                 imports = [externalHelpersModuleReference];
             }
             for (var _i = 0, _a = file.statements; _i < _a.length; _i++) {
@@ -59515,12 +62100,13 @@ var ts;
             }
             file.imports = imports || emptyArray;
             file.moduleAugmentations = moduleAugmentations || emptyArray;
+            file.ambientModuleNames = ambientModules || emptyArray;
             return;
             function collectModuleReferences(node, inAmbientModule) {
                 switch (node.kind) {
-                    case 231 /* ImportDeclaration */:
-                    case 230 /* ImportEqualsDeclaration */:
-                    case 237 /* ExportDeclaration */:
+                    case 235 /* ImportDeclaration */:
+                    case 234 /* ImportEqualsDeclaration */:
+                    case 241 /* ExportDeclaration */:
                         var moduleNameExpr = ts.getExternalModuleName(node);
                         if (!moduleNameExpr || moduleNameExpr.kind !== 9 /* StringLiteral */) {
                             break;
@@ -59535,7 +62121,7 @@ var ts;
                             (imports || (imports = [])).push(moduleNameExpr);
                         }
                         break;
-                    case 226 /* ModuleDeclaration */:
+                    case 230 /* ModuleDeclaration */:
                         if (ts.isAmbientModule(node) && (inAmbientModule || ts.hasModifier(node, 2 /* Ambient */) || ts.isDeclarationFile(file))) {
                             var moduleName = node.name;
                             // Ambient module declarations can be interpreted as augmentations for some existing external modules.
@@ -59547,6 +62133,10 @@ var ts;
                                 (moduleAugmentations || (moduleAugmentations = [])).push(moduleName);
                             }
                             else if (!inAmbientModule) {
+                                if (isDtsFile) {
+                                    // for global .d.ts files record name of ambient module
+                                    (ambientModules || (ambientModules = [])).push(moduleName.text);
+                                }
                                 // An AmbientExternalModuleDeclaration declares an external module.
                                 // This type of declaration is permitted only in the global module.
                                 // The StringLiteral must specify a top - level external module name.
@@ -59572,13 +62162,10 @@ var ts;
                 }
             }
         }
-        /**
-          * 'isReference' indicates whether the file was brought in via a reference directive (rather than an import declaration)
-          */
         function processSourceFile(fileName, isDefaultLib, refFile, refPos, refEnd) {
             var diagnosticArgument;
             var diagnostic;
-            if (hasExtension(fileName)) {
+            if (ts.hasExtension(fileName)) {
                 if (!options.allowNonTsExtensions && !ts.forEach(supportedExtensions, function (extension) { return ts.fileExtensionIs(host.getCanonicalFileName(fileName), extension); })) {
                     diagnostic = ts.Diagnostics.File_0_has_unsupported_extension_The_only_supported_extensions_are_1;
                     diagnosticArgument = [fileName, "'" + supportedExtensions.join("', '") + "'"];
@@ -59644,7 +62231,7 @@ var ts;
                     processImportedModules(file_1);
                 }
                 else if (file_1 && modulesWithElidedImports[file_1.path]) {
-                    if (currentNodeModulesDepth < maxNodeModulesJsDepth) {
+                    if (currentNodeModulesDepth < maxNodeModuleJsDepth) {
                         modulesWithElidedImports[file_1.path] = false;
                         processImportedModules(file_1);
                     }
@@ -59725,9 +62312,12 @@ var ts;
                     // If we already resolved to this file, it must have been a secondary reference. Check file contents
                     // for sameness and possibly issue an error
                     if (previousResolution) {
-                        var otherFileText = host.readFile(resolvedTypeReferenceDirective.resolvedFileName);
-                        if (otherFileText !== getSourceFile(previousResolution.resolvedFileName).text) {
-                            fileProcessingDiagnostics.add(createDiagnostic(refFile, refPos, refEnd, ts.Diagnostics.Conflicting_definitions_for_0_found_at_1_and_2_Consider_installing_a_specific_version_of_this_library_to_resolve_the_conflict, typeReferenceDirective, resolvedTypeReferenceDirective.resolvedFileName, previousResolution.resolvedFileName));
+                        // Don't bother reading the file again if it's the same file.
+                        if (resolvedTypeReferenceDirective.resolvedFileName !== previousResolution.resolvedFileName) {
+                            var otherFileText = host.readFile(resolvedTypeReferenceDirective.resolvedFileName);
+                            if (otherFileText !== getSourceFile(previousResolution.resolvedFileName).text) {
+                                fileProcessingDiagnostics.add(createDiagnostic(refFile, refPos, refEnd, ts.Diagnostics.Conflicting_definitions_for_0_found_at_1_and_2_Consider_installing_a_specific_version_of_this_library_to_resolve_the_conflict, typeReferenceDirective, resolvedTypeReferenceDirective.resolvedFileName, previousResolution.resolvedFileName));
+                            }
                         }
                         // don't overwrite previous resolution result
                         saveResolution = false;
@@ -59764,29 +62354,39 @@ var ts;
             collectExternalModuleReferences(file);
             if (file.imports.length || file.moduleAugmentations.length) {
                 file.resolvedModules = ts.createMap();
-                var moduleNames = ts.map(ts.concatenate(file.imports, file.moduleAugmentations), getTextOfLiteral);
-                var resolutions = resolveModuleNamesWorker(moduleNames, ts.getNormalizedAbsolutePath(file.fileName, currentDirectory));
+                // Because global augmentation doesn't have string literal name, we can check for global augmentation as such.
+                var nonGlobalAugmentation = ts.filter(file.moduleAugmentations, function (moduleAugmentation) { return moduleAugmentation.kind === 9 /* StringLiteral */; });
+                var moduleNames = ts.map(ts.concatenate(file.imports, nonGlobalAugmentation), getTextOfLiteral);
+                var resolutions = resolveModuleNamesReusingOldState(moduleNames, ts.getNormalizedAbsolutePath(file.fileName, currentDirectory), file);
+                ts.Debug.assert(resolutions.length === moduleNames.length);
                 for (var i = 0; i < moduleNames.length; i++) {
                     var resolution = resolutions[i];
                     ts.setResolvedModule(file, moduleNames[i], resolution);
+                    if (!resolution) {
+                        continue;
+                    }
+                    var isFromNodeModulesSearch = resolution.isExternalLibraryImport;
+                    var isJsFileFromNodeModules = isFromNodeModulesSearch && !ts.extensionIsTypeScript(resolution.extension);
+                    var resolvedFileName = resolution.resolvedFileName;
+                    if (isFromNodeModulesSearch) {
+                        currentNodeModulesDepth++;
+                    }
                     // add file to program only if:
                     // - resolution was successful
                     // - noResolve is falsy
                     // - module name comes from the list of imports
                     // - it's not a top level JavaScript module that exceeded the search max
-                    var isFromNodeModulesSearch = resolution && resolution.isExternalLibraryImport;
-                    var isJsFileFromNodeModules = isFromNodeModulesSearch && ts.hasJavaScriptFileExtension(resolution.resolvedFileName);
-                    if (isFromNodeModulesSearch) {
-                        currentNodeModulesDepth++;
-                    }
-                    var elideImport = isJsFileFromNodeModules && currentNodeModulesDepth > maxNodeModulesJsDepth;
-                    var shouldAddFile = resolution && !options.noResolve && i < file.imports.length && !elideImport;
+                    var elideImport = isJsFileFromNodeModules && currentNodeModulesDepth > maxNodeModuleJsDepth;
+                    // Don't add the file if it has a bad extension (e.g. 'tsx' if we don't have '--allowJs')
+                    // This may still end up being an untyped module -- the file won't be included but imports will be allowed.
+                    var shouldAddFile = resolvedFileName && !getResolutionDiagnostic(options, resolution) && !options.noResolve && i < file.imports.length && !elideImport;
                     if (elideImport) {
                         modulesWithElidedImports[file.path] = true;
                     }
                     else if (shouldAddFile) {
-                        findSourceFile(resolution.resolvedFileName, ts.toPath(resolution.resolvedFileName, currentDirectory, getCanonicalFileName), 
-                        /*isDefaultLib*/ false, file, ts.skipTrivia(file.text, file.imports[i].pos), file.imports[i].end);
+                        var path = ts.toPath(resolvedFileName, currentDirectory, getCanonicalFileName);
+                        var pos = ts.skipTrivia(file.text, file.imports[i].pos);
+                        findSourceFile(resolvedFileName, path, /*isDefaultLib*/ false, file, pos, file.imports[i].end);
                     }
                     if (isFromNodeModulesSearch) {
                         currentNodeModulesDepth--;
@@ -59797,7 +62397,6 @@ var ts;
                 // no imports - drop cached module resolutions
                 file.resolvedModules = undefined;
             }
-            return;
         }
         function computeCommonSourceDirectory(sourceFiles) {
             var fileNames = [];
@@ -59958,7 +62557,15 @@ var ts;
                 !options.experimentalDecorators) {
                 programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "emitDecoratorMetadata", "experimentalDecorators"));
             }
-            if (options.reactNamespace && !ts.isIdentifierText(options.reactNamespace, languageVersion)) {
+            if (options.jsxFactory) {
+                if (options.reactNamespace) {
+                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "reactNamespace", "jsxFactory"));
+                }
+                if (!ts.parseIsolatedEntityName(options.jsxFactory, languageVersion)) {
+                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Invalid_value_for_jsxFactory_0_is_not_a_valid_identifier_or_qualified_name, options.jsxFactory));
+                }
+            }
+            else if (options.reactNamespace && !ts.isIdentifierText(options.reactNamespace, languageVersion)) {
                 programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Invalid_value_for_reactNamespace_0_is_not_a_valid_identifier, options.reactNamespace));
             }
             // If the emit is enabled make sure that every output file is unique and not overwriting any of the input files
@@ -59976,12 +62583,18 @@ var ts;
                     var emitFilePath = ts.toPath(emitFileName, currentDirectory, getCanonicalFileName);
                     // Report error if the output overwrites input file
                     if (filesByName.contains(emitFilePath)) {
-                        createEmitBlockingDiagnostics(emitFileName, ts.Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file);
+                        var chain_1;
+                        if (!options.configFilePath) {
+                            // The program is from either an inferred project or an external project
+                            chain_1 = 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_1 = ts.chainDiagnosticMessages(chain_1, ts.Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
+                        blockEmittingOfFile(emitFileName, ts.createCompilerDiagnosticFromMessageChain(chain_1));
                     }
                     // Report error if multiple files write into same file
                     if (emitFilesSeen.contains(emitFilePath)) {
                         // Already seen the same emit file - report error
-                        createEmitBlockingDiagnostics(emitFileName, ts.Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files);
+                        blockEmittingOfFile(emitFileName, ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files, emitFileName));
                     }
                     else {
                         emitFilesSeen.set(emitFilePath, true);
@@ -59989,12 +62602,40 @@ var ts;
                 }
             }
         }
-        function createEmitBlockingDiagnostics(emitFileName, message) {
+        function blockEmittingOfFile(emitFileName, diag) {
             hasEmitBlockingDiagnostics.set(ts.toPath(emitFileName, currentDirectory, getCanonicalFileName), true);
-            programDiagnostics.add(ts.createCompilerDiagnostic(message, emitFileName));
+            programDiagnostics.add(diag);
         }
     }
     ts.createProgram = createProgram;
+    /* @internal */
+    /**
+     * Returns a DiagnosticMessage if we won't include a resolved module due to its extension.
+     * The DiagnosticMessage's parameters are the imported module name, and the filename it resolved to.
+     * This returns a diagnostic even if the module will be an untyped module.
+     */
+    function getResolutionDiagnostic(options, _a) {
+        var extension = _a.extension;
+        switch (extension) {
+            case ts.Extension.Ts:
+            case ts.Extension.Dts:
+                // These are always allowed.
+                return undefined;
+            case ts.Extension.Tsx:
+                return needJsx();
+            case ts.Extension.Jsx:
+                return needJsx() || needAllowJs();
+            case ts.Extension.Js:
+                return needAllowJs();
+        }
+        function needJsx() {
+            return options.jsx ? undefined : ts.Diagnostics.Module_0_was_resolved_to_1_but_jsx_is_not_set;
+        }
+        function needAllowJs() {
+            return options.allowJs ? undefined : ts.Diagnostics.Module_0_was_resolved_to_1_but_allowJs_is_not_set;
+        }
+    }
+    ts.getResolutionDiagnostic = getResolutionDiagnostic;
 })(ts || (ts = {}));
 /// <reference path="sys.ts"/>
 /// <reference path="types.ts"/>
@@ -60075,6 +62716,11 @@ var ts;
             type: "string",
             description: ts.Diagnostics.Specify_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit
         },
+        {
+            name: "jsxFactory",
+            type: "string",
+            description: ts.Diagnostics.Specify_the_JSX_factory_function_to_use_when_targeting_react_JSX_emit_e_g_React_createElement_or_h
+        },
         {
             name: "listFiles",
             type: "boolean",
@@ -60263,6 +62909,7 @@ var ts;
                 "es2015": 2 /* ES2015 */,
                 "es2016": 3 /* ES2016 */,
                 "es2017": 4 /* ES2017 */,
+                "esnext": 5 /* ESNext */,
             }),
             description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015,
             paramType: ts.Diagnostics.VERSION,
@@ -60426,7 +63073,8 @@ var ts;
                     "es2015.symbol.wellknown": "lib.es2015.symbol.wellknown.d.ts",
                     "es2016.array.include": "lib.es2016.array.include.d.ts",
                     "es2017.object": "lib.es2017.object.d.ts",
-                    "es2017.sharedmemory": "lib.es2017.sharedmemory.d.ts"
+                    "es2017.sharedmemory": "lib.es2017.sharedmemory.d.ts",
+                    "es2017.string": "lib.es2017.string.d.ts",
                 }),
             },
             description: ts.Diagnostics.Specify_library_files_to_be_included_in_the_compilation_Colon
@@ -60580,7 +63228,13 @@ var ts;
                                     i++;
                                     break;
                                 case "boolean":
-                                    options[opt.name] = true;
+                                    // boolean flag has optional value true, false, others
+                                    var optValue = args[i];
+                                    options[opt.name] = optValue !== "false";
+                                    // consume next argument as boolean flag value
+                                    if (optValue === "false" || optValue === "true") {
+                                        i++;
+                                    }
                                     break;
                                 case "string":
                                     options[opt.name] = args[i] || "";
@@ -60717,11 +63371,11 @@ var ts;
         function serializeCompilerOptions(options) {
             var result = ts.createMap();
             var optionsNameMap = getOptionNameMap().optionNameMap;
-            for (var name_44 in options) {
-                if (ts.hasProperty(options, name_44)) {
+            for (var name_41 in options) {
+                if (ts.hasProperty(options, name_41)) {
                     // tsconfig only options cannot be specified via command line,
                     // so we can assume that only types that can appear here string | number | boolean
-                    switch (name_44) {
+                    switch (name_41) {
                         case "init":
                         case "watch":
                         case "version":
@@ -60729,14 +63383,14 @@ var ts;
                         case "project":
                             break;
                         default:
-                            var value = options[name_44];
-                            var optionDefinition = optionsNameMap[name_44.toLowerCase()];
+                            var value = options[name_41];
+                            var optionDefinition = optionsNameMap[name_41.toLowerCase()];
                             if (optionDefinition) {
                                 var customTypeMap = getCustomTypeMapOfCommandLineOption(optionDefinition);
                                 if (!customTypeMap) {
                                     // There is no map associated with this compiler option then use the value as-is
                                     // This is the case if the value is expect to be string, number, boolean or list of string
-                                    result[name_44] = value;
+                                    result[name_41] = value;
                                 }
                                 else {
                                     if (optionDefinition.type === "list") {
@@ -60745,11 +63399,11 @@ var ts;
                                             var element = _a[_i];
                                             convertedValue.push(getNameOfCompilerOptionValue(element, customTypeMap));
                                         }
-                                        result[name_44] = convertedValue;
+                                        result[name_41] = convertedValue;
                                     }
                                     else {
                                         // There is a typeMap associated with this command-line option so use it to map value back to its name
-                                        result[name_44] = getNameOfCompilerOptionValue(value, customTypeMap);
+                                        result[name_41] = getNameOfCompilerOptionValue(value, customTypeMap);
                                     }
                                 }
                             }
@@ -60879,6 +63533,9 @@ var ts;
             if (ts.hasProperty(json, "files")) {
                 if (ts.isArray(json["files"])) {
                     fileNames = json["files"];
+                    if (fileNames.length === 0) {
+                        errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.The_files_list_in_config_file_0_is_empty, configFileName || "tsconfig.json"));
+                    }
                 }
                 else {
                     errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "files", "Array"));
@@ -60916,7 +63573,11 @@ var ts;
             if (fileNames === undefined && includeSpecs === undefined) {
                 includeSpecs = ["**/*"];
             }
-            return matchFileNames(fileNames, includeSpecs, excludeSpecs, basePath, options, host, errors);
+            var result = matchFileNames(fileNames, includeSpecs, excludeSpecs, basePath, options, host, errors);
+            if (result.fileNames.length === 0 && !ts.hasProperty(json, "files") && resolutionStack.length === 0) {
+                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2, configFileName || "tsconfig.json", JSON.stringify(includeSpecs || []), JSON.stringify(excludeSpecs || [])));
+            }
+            return result;
         }
         var _b;
     }
@@ -60952,9 +63613,7 @@ var ts;
         return options;
     }
     function convertTypingOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName) {
-        var options = ts.getBaseFileName(configFileName) === "jsconfig.json"
-            ? { enableAutoDiscovery: true, include: [], exclude: [] }
-            : { enableAutoDiscovery: false, include: [], exclude: [] };
+        var options = { enableAutoDiscovery: ts.getBaseFileName(configFileName) === "jsconfig.json", include: [], exclude: [] };
         convertOptionsFromJson(ts.typingOptionDeclarations, jsonOptions, basePath, options, ts.Diagnostics.Unknown_typing_option_0, errors);
         return options;
     }
@@ -61186,6 +63845,7 @@ var ts;
         //
         //  /a/b/**/d   - Watch /a/b recursively to catch changes to any d in any subfolder recursively
         //  /a/b/*/d    - Watch /a/b recursively to catch any d in any immediate subfolder, even if a new subfolder is added
+        //  /a/b        - Watch /a/b recursively to catch changes to anything in any recursive subfoler
         //
         // We watch a directory without recursion if it contains a wildcard in the file segment of
         // the pattern:
@@ -61199,14 +63859,13 @@ var ts;
             var recursiveKeys = [];
             for (var _i = 0, include_1 = include; _i < include_1.length; _i++) {
                 var file = include_1[_i];
-                var name_45 = ts.normalizePath(ts.combinePaths(path, file));
-                if (excludeRegex && excludeRegex.test(name_45)) {
+                var spec = ts.normalizePath(ts.combinePaths(path, file));
+                if (excludeRegex && excludeRegex.test(spec)) {
                     continue;
                 }
-                var match = wildcardDirectoryPattern.exec(name_45);
+                var match = getWildcardDirectoryFromSpec(spec, useCaseSensitiveFileNames);
                 if (match) {
-                    var key = useCaseSensitiveFileNames ? match[0] : match[0].toLowerCase();
-                    var flags = watchRecursivePattern.test(name_45) ? 1 /* Recursive */ : 0 /* None */;
+                    var key = match.key, flags = match.flags;
                     var existingFlags = wildcardDirectories[key];
                     if (existingFlags === undefined || existingFlags < flags) {
                         wildcardDirectories[key] = flags;
@@ -61228,6 +63887,19 @@ var ts;
         }
         return wildcardDirectories;
     }
+    function getWildcardDirectoryFromSpec(spec, useCaseSensitiveFileNames) {
+        var match = wildcardDirectoryPattern.exec(spec);
+        if (match) {
+            return {
+                key: useCaseSensitiveFileNames ? match[0] : match[0].toLowerCase(),
+                flags: watchRecursivePattern.test(spec) ? 1 /* Recursive */ : 0 /* None */
+            };
+        }
+        if (ts.isImplicitGlob(spec)) {
+            return { key: spec, flags: 1 /* Recursive */ };
+        }
+        return undefined;
+    }
     /**
      * Determines whether a literal or wildcard file has already been included that has a higher
      * extension priority.
@@ -61331,12 +64003,13 @@ var ts;
         HighlightSpanKind.reference = "reference";
         HighlightSpanKind.writtenReference = "writtenReference";
     })(HighlightSpanKind = ts.HighlightSpanKind || (ts.HighlightSpanKind = {}));
+    var IndentStyle;
     (function (IndentStyle) {
         IndentStyle[IndentStyle["None"] = 0] = "None";
         IndentStyle[IndentStyle["Block"] = 1] = "Block";
         IndentStyle[IndentStyle["Smart"] = 2] = "Smart";
-    })(ts.IndentStyle || (ts.IndentStyle = {}));
-    var IndentStyle = ts.IndentStyle;
+    })(IndentStyle = ts.IndentStyle || (ts.IndentStyle = {}));
+    var SymbolDisplayPartKind;
     (function (SymbolDisplayPartKind) {
         SymbolDisplayPartKind[SymbolDisplayPartKind["aliasName"] = 0] = "aliasName";
         SymbolDisplayPartKind[SymbolDisplayPartKind["className"] = 1] = "className";
@@ -61360,14 +64033,14 @@ var ts;
         SymbolDisplayPartKind[SymbolDisplayPartKind["enumMemberName"] = 19] = "enumMemberName";
         SymbolDisplayPartKind[SymbolDisplayPartKind["functionName"] = 20] = "functionName";
         SymbolDisplayPartKind[SymbolDisplayPartKind["regularExpressionLiteral"] = 21] = "regularExpressionLiteral";
-    })(ts.SymbolDisplayPartKind || (ts.SymbolDisplayPartKind = {}));
-    var SymbolDisplayPartKind = ts.SymbolDisplayPartKind;
+    })(SymbolDisplayPartKind = ts.SymbolDisplayPartKind || (ts.SymbolDisplayPartKind = {}));
+    var OutputFileType;
     (function (OutputFileType) {
         OutputFileType[OutputFileType["JavaScript"] = 0] = "JavaScript";
         OutputFileType[OutputFileType["SourceMap"] = 1] = "SourceMap";
         OutputFileType[OutputFileType["Declaration"] = 2] = "Declaration";
-    })(ts.OutputFileType || (ts.OutputFileType = {}));
-    var OutputFileType = ts.OutputFileType;
+    })(OutputFileType = ts.OutputFileType || (ts.OutputFileType = {}));
+    var EndOfLineState;
     (function (EndOfLineState) {
         EndOfLineState[EndOfLineState["None"] = 0] = "None";
         EndOfLineState[EndOfLineState["InMultiLineCommentTrivia"] = 1] = "InMultiLineCommentTrivia";
@@ -61376,8 +64049,8 @@ var ts;
         EndOfLineState[EndOfLineState["InTemplateHeadOrNoSubstitutionTemplate"] = 4] = "InTemplateHeadOrNoSubstitutionTemplate";
         EndOfLineState[EndOfLineState["InTemplateMiddleOrTail"] = 5] = "InTemplateMiddleOrTail";
         EndOfLineState[EndOfLineState["InTemplateSubstitutionPosition"] = 6] = "InTemplateSubstitutionPosition";
-    })(ts.EndOfLineState || (ts.EndOfLineState = {}));
-    var EndOfLineState = ts.EndOfLineState;
+    })(EndOfLineState = ts.EndOfLineState || (ts.EndOfLineState = {}));
+    var TokenClass;
     (function (TokenClass) {
         TokenClass[TokenClass["Punctuation"] = 0] = "Punctuation";
         TokenClass[TokenClass["Keyword"] = 1] = "Keyword";
@@ -61388,8 +64061,7 @@ var ts;
         TokenClass[TokenClass["NumberLiteral"] = 6] = "NumberLiteral";
         TokenClass[TokenClass["StringLiteral"] = 7] = "StringLiteral";
         TokenClass[TokenClass["RegExpLiteral"] = 8] = "RegExpLiteral";
-    })(ts.TokenClass || (ts.TokenClass = {}));
-    var TokenClass = ts.TokenClass;
+    })(TokenClass = ts.TokenClass || (ts.TokenClass = {}));
     // TODO: move these to enums
     var ScriptElementKind;
     (function (ScriptElementKind) {
@@ -61496,6 +64168,7 @@ var ts;
     ClassificationTypeNames.jsxText = "jsx text";
     ClassificationTypeNames.jsxAttributeStringLiteralValue = "jsx attribute string literal value";
     ts.ClassificationTypeNames = ClassificationTypeNames;
+    var ClassificationType;
     (function (ClassificationType) {
         ClassificationType[ClassificationType["comment"] = 1] = "comment";
         ClassificationType[ClassificationType["identifier"] = 2] = "identifier";
@@ -61521,52 +64194,51 @@ var ts;
         ClassificationType[ClassificationType["jsxAttribute"] = 22] = "jsxAttribute";
         ClassificationType[ClassificationType["jsxText"] = 23] = "jsxText";
         ClassificationType[ClassificationType["jsxAttributeStringLiteralValue"] = 24] = "jsxAttributeStringLiteralValue";
-    })(ts.ClassificationType || (ts.ClassificationType = {}));
-    var ClassificationType = ts.ClassificationType;
+    })(ClassificationType = ts.ClassificationType || (ts.ClassificationType = {}));
 })(ts || (ts = {}));
 // These utilities are common to multiple language service features.
 /* @internal */
 var ts;
 (function (ts) {
-    ts.scanner = ts.createScanner(4 /* Latest */, /*skipTrivia*/ true);
+    ts.scanner = ts.createScanner(5 /* Latest */, /*skipTrivia*/ true);
     ts.emptyArray = [];
+    var SemanticMeaning;
     (function (SemanticMeaning) {
         SemanticMeaning[SemanticMeaning["None"] = 0] = "None";
         SemanticMeaning[SemanticMeaning["Value"] = 1] = "Value";
         SemanticMeaning[SemanticMeaning["Type"] = 2] = "Type";
         SemanticMeaning[SemanticMeaning["Namespace"] = 4] = "Namespace";
         SemanticMeaning[SemanticMeaning["All"] = 7] = "All";
-    })(ts.SemanticMeaning || (ts.SemanticMeaning = {}));
-    var SemanticMeaning = ts.SemanticMeaning;
+    })(SemanticMeaning = ts.SemanticMeaning || (ts.SemanticMeaning = {}));
     function getMeaningFromDeclaration(node) {
         switch (node.kind) {
-            case 143 /* Parameter */:
-            case 219 /* VariableDeclaration */:
-            case 170 /* BindingElement */:
-            case 146 /* PropertyDeclaration */:
-            case 145 /* PropertySignature */:
-            case 253 /* PropertyAssignment */:
-            case 254 /* ShorthandPropertyAssignment */:
-            case 255 /* EnumMember */:
-            case 148 /* MethodDeclaration */:
-            case 147 /* MethodSignature */:
-            case 149 /* Constructor */:
-            case 150 /* GetAccessor */:
-            case 151 /* SetAccessor */:
-            case 221 /* FunctionDeclaration */:
-            case 180 /* FunctionExpression */:
-            case 181 /* ArrowFunction */:
-            case 252 /* CatchClause */:
+            case 144 /* Parameter */:
+            case 223 /* VariableDeclaration */:
+            case 174 /* BindingElement */:
+            case 147 /* PropertyDeclaration */:
+            case 146 /* PropertySignature */:
+            case 257 /* PropertyAssignment */:
+            case 258 /* ShorthandPropertyAssignment */:
+            case 260 /* EnumMember */:
+            case 149 /* MethodDeclaration */:
+            case 148 /* MethodSignature */:
+            case 150 /* Constructor */:
+            case 151 /* GetAccessor */:
+            case 152 /* SetAccessor */:
+            case 225 /* FunctionDeclaration */:
+            case 184 /* FunctionExpression */:
+            case 185 /* ArrowFunction */:
+            case 256 /* CatchClause */:
                 return 1 /* Value */;
-            case 142 /* TypeParameter */:
-            case 223 /* InterfaceDeclaration */:
-            case 224 /* TypeAliasDeclaration */:
-            case 160 /* TypeLiteral */:
+            case 143 /* TypeParameter */:
+            case 227 /* InterfaceDeclaration */:
+            case 228 /* TypeAliasDeclaration */:
+            case 161 /* TypeLiteral */:
                 return 2 /* Type */;
-            case 222 /* ClassDeclaration */:
-            case 225 /* EnumDeclaration */:
+            case 226 /* ClassDeclaration */:
+            case 229 /* EnumDeclaration */:
                 return 1 /* Value */ | 2 /* Type */;
-            case 226 /* ModuleDeclaration */:
+            case 230 /* ModuleDeclaration */:
                 if (ts.isAmbientModule(node)) {
                     return 4 /* Namespace */ | 1 /* Value */;
                 }
@@ -61576,22 +64248,22 @@ var ts;
                 else {
                     return 4 /* Namespace */;
                 }
-            case 234 /* NamedImports */:
-            case 235 /* ImportSpecifier */:
-            case 230 /* ImportEqualsDeclaration */:
-            case 231 /* ImportDeclaration */:
-            case 236 /* ExportAssignment */:
-            case 237 /* ExportDeclaration */:
+            case 238 /* NamedImports */:
+            case 239 /* ImportSpecifier */:
+            case 234 /* ImportEqualsDeclaration */:
+            case 235 /* ImportDeclaration */:
+            case 240 /* ExportAssignment */:
+            case 241 /* ExportDeclaration */:
                 return 1 /* Value */ | 2 /* Type */ | 4 /* Namespace */;
             // An external module can be a Value
-            case 256 /* SourceFile */:
+            case 261 /* SourceFile */:
                 return 4 /* Namespace */ | 1 /* Value */;
         }
         return 1 /* Value */ | 2 /* Type */ | 4 /* Namespace */;
     }
     ts.getMeaningFromDeclaration = getMeaningFromDeclaration;
     function getMeaningFromLocation(node) {
-        if (node.parent.kind === 236 /* ExportAssignment */) {
+        if (node.parent.kind === 240 /* ExportAssignment */) {
             return 1 /* Value */ | 2 /* Type */ | 4 /* Namespace */;
         }
         else if (isInRightSideOfImport(node)) {
@@ -61616,15 +64288,15 @@ var ts;
         //     import a = |b|; // Namespace
         //     import a = |b.c|; // Value, type, namespace
         //     import a = |b.c|.d; // Namespace
-        if (node.parent.kind === 140 /* QualifiedName */ &&
+        if (node.parent.kind === 141 /* QualifiedName */ &&
             node.parent.right === node &&
-            node.parent.parent.kind === 230 /* ImportEqualsDeclaration */) {
+            node.parent.parent.kind === 234 /* ImportEqualsDeclaration */) {
             return 1 /* Value */ | 2 /* Type */ | 4 /* Namespace */;
         }
         return 4 /* Namespace */;
     }
     function isInRightSideOfImport(node) {
-        while (node.parent.kind === 140 /* QualifiedName */) {
+        while (node.parent.kind === 141 /* QualifiedName */) {
             node = node.parent;
         }
         return ts.isInternalModuleImportEqualsDeclaration(node.parent) && node.parent.moduleReference === node;
@@ -61635,27 +64307,27 @@ var ts;
     function isQualifiedNameNamespaceReference(node) {
         var root = node;
         var isLastClause = true;
-        if (root.parent.kind === 140 /* QualifiedName */) {
-            while (root.parent && root.parent.kind === 140 /* QualifiedName */) {
+        if (root.parent.kind === 141 /* QualifiedName */) {
+            while (root.parent && root.parent.kind === 141 /* QualifiedName */) {
                 root = root.parent;
             }
             isLastClause = root.right === node;
         }
-        return root.parent.kind === 156 /* TypeReference */ && !isLastClause;
+        return root.parent.kind === 157 /* TypeReference */ && !isLastClause;
     }
     function isPropertyAccessNamespaceReference(node) {
         var root = node;
         var isLastClause = true;
-        if (root.parent.kind === 173 /* PropertyAccessExpression */) {
-            while (root.parent && root.parent.kind === 173 /* PropertyAccessExpression */) {
+        if (root.parent.kind === 177 /* PropertyAccessExpression */) {
+            while (root.parent && root.parent.kind === 177 /* PropertyAccessExpression */) {
                 root = root.parent;
             }
             isLastClause = root.name === node;
         }
-        if (!isLastClause && root.parent.kind === 195 /* ExpressionWithTypeArguments */ && root.parent.parent.kind === 251 /* HeritageClause */) {
+        if (!isLastClause && root.parent.kind === 199 /* ExpressionWithTypeArguments */ && root.parent.parent.kind === 255 /* HeritageClause */) {
             var decl = root.parent.parent.parent;
-            return (decl.kind === 222 /* ClassDeclaration */ && root.parent.parent.token === 107 /* ImplementsKeyword */) ||
-                (decl.kind === 223 /* InterfaceDeclaration */ && root.parent.parent.token === 84 /* ExtendsKeyword */);
+            return (decl.kind === 226 /* ClassDeclaration */ && root.parent.parent.token === 107 /* ImplementsKeyword */) ||
+                (decl.kind === 227 /* InterfaceDeclaration */ && root.parent.parent.token === 84 /* ExtendsKeyword */);
         }
         return false;
     }
@@ -61663,17 +64335,17 @@ var ts;
         if (ts.isRightSideOfQualifiedNameOrPropertyAccess(node)) {
             node = node.parent;
         }
-        return node.parent.kind === 156 /* TypeReference */ ||
-            (node.parent.kind === 195 /* ExpressionWithTypeArguments */ && !ts.isExpressionWithTypeArgumentsInClassExtendsClause(node.parent)) ||
+        return node.parent.kind === 157 /* TypeReference */ ||
+            (node.parent.kind === 199 /* ExpressionWithTypeArguments */ && !ts.isExpressionWithTypeArgumentsInClassExtendsClause(node.parent)) ||
             (node.kind === 98 /* ThisKeyword */ && !ts.isPartOfExpression(node)) ||
-            node.kind === 166 /* ThisType */;
+            node.kind === 167 /* ThisType */;
     }
     function isCallExpressionTarget(node) {
-        return isCallOrNewExpressionTarget(node, 175 /* CallExpression */);
+        return isCallOrNewExpressionTarget(node, 179 /* CallExpression */);
     }
     ts.isCallExpressionTarget = isCallExpressionTarget;
     function isNewExpressionTarget(node) {
-        return isCallOrNewExpressionTarget(node, 176 /* NewExpression */);
+        return isCallOrNewExpressionTarget(node, 180 /* NewExpression */);
     }
     ts.isNewExpressionTarget = isNewExpressionTarget;
     function isCallOrNewExpressionTarget(node, kind) {
@@ -61686,7 +64358,7 @@ var ts;
     ts.climbPastPropertyAccess = climbPastPropertyAccess;
     function getTargetLabel(referenceNode, labelName) {
         while (referenceNode) {
-            if (referenceNode.kind === 215 /* LabeledStatement */ && referenceNode.label.text === labelName) {
+            if (referenceNode.kind === 219 /* LabeledStatement */ && referenceNode.label.text === labelName) {
                 return referenceNode.label;
             }
             referenceNode = referenceNode.parent;
@@ -61696,13 +64368,13 @@ var ts;
     ts.getTargetLabel = getTargetLabel;
     function isJumpStatementTarget(node) {
         return node.kind === 70 /* Identifier */ &&
-            (node.parent.kind === 211 /* BreakStatement */ || node.parent.kind === 210 /* ContinueStatement */) &&
+            (node.parent.kind === 215 /* BreakStatement */ || node.parent.kind === 214 /* ContinueStatement */) &&
             node.parent.label === node;
     }
     ts.isJumpStatementTarget = isJumpStatementTarget;
     function isLabelOfLabeledStatement(node) {
         return node.kind === 70 /* Identifier */ &&
-            node.parent.kind === 215 /* LabeledStatement */ &&
+            node.parent.kind === 219 /* LabeledStatement */ &&
             node.parent.label === node;
     }
     function isLabelName(node) {
@@ -61710,15 +64382,15 @@ var ts;
     }
     ts.isLabelName = isLabelName;
     function isRightSideOfQualifiedName(node) {
-        return node.parent.kind === 140 /* QualifiedName */ && node.parent.right === node;
+        return node.parent.kind === 141 /* QualifiedName */ && node.parent.right === node;
     }
     ts.isRightSideOfQualifiedName = isRightSideOfQualifiedName;
     function isRightSideOfPropertyAccess(node) {
-        return node && node.parent && node.parent.kind === 173 /* PropertyAccessExpression */ && node.parent.name === node;
+        return node && node.parent && node.parent.kind === 177 /* PropertyAccessExpression */ && node.parent.name === node;
     }
     ts.isRightSideOfPropertyAccess = isRightSideOfPropertyAccess;
     function isNameOfModuleDeclaration(node) {
-        return node.parent.kind === 226 /* ModuleDeclaration */ && node.parent.name === node;
+        return node.parent.kind === 230 /* ModuleDeclaration */ && node.parent.name === node;
     }
     ts.isNameOfModuleDeclaration = isNameOfModuleDeclaration;
     function isNameOfFunctionDeclaration(node) {
@@ -61729,19 +64401,19 @@ var ts;
     function isLiteralNameOfPropertyDeclarationOrIndexAccess(node) {
         if (node.kind === 9 /* StringLiteral */ || node.kind === 8 /* NumericLiteral */) {
             switch (node.parent.kind) {
-                case 146 /* PropertyDeclaration */:
-                case 145 /* PropertySignature */:
-                case 253 /* PropertyAssignment */:
-                case 255 /* EnumMember */:
-                case 148 /* MethodDeclaration */:
-                case 147 /* MethodSignature */:
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
-                case 226 /* ModuleDeclaration */:
+                case 147 /* PropertyDeclaration */:
+                case 146 /* PropertySignature */:
+                case 257 /* PropertyAssignment */:
+                case 260 /* EnumMember */:
+                case 149 /* MethodDeclaration */:
+                case 148 /* MethodSignature */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
+                case 230 /* ModuleDeclaration */:
                     return node.parent.name === node;
-                case 174 /* ElementAccessExpression */:
+                case 178 /* ElementAccessExpression */:
                     return node.parent.argumentExpression === node;
-                case 141 /* ComputedPropertyName */:
+                case 142 /* ComputedPropertyName */:
                     return true;
             }
         }
@@ -61790,17 +64462,17 @@ var ts;
                 return undefined;
             }
             switch (node.kind) {
-                case 256 /* SourceFile */:
-                case 148 /* MethodDeclaration */:
-                case 147 /* MethodSignature */:
-                case 221 /* FunctionDeclaration */:
-                case 180 /* FunctionExpression */:
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
-                case 222 /* ClassDeclaration */:
-                case 223 /* InterfaceDeclaration */:
-                case 225 /* EnumDeclaration */:
-                case 226 /* ModuleDeclaration */:
+                case 261 /* SourceFile */:
+                case 149 /* MethodDeclaration */:
+                case 148 /* MethodSignature */:
+                case 225 /* FunctionDeclaration */:
+                case 184 /* FunctionExpression */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
+                case 226 /* ClassDeclaration */:
+                case 227 /* InterfaceDeclaration */:
+                case 229 /* EnumDeclaration */:
+                case 230 /* ModuleDeclaration */:
                     return node;
             }
         }
@@ -61808,46 +64480,46 @@ var ts;
     ts.getContainerNode = getContainerNode;
     function getNodeKind(node) {
         switch (node.kind) {
-            case 256 /* SourceFile */:
+            case 261 /* SourceFile */:
                 return ts.isExternalModule(node) ? ts.ScriptElementKind.moduleElement : ts.ScriptElementKind.scriptElement;
-            case 226 /* ModuleDeclaration */:
+            case 230 /* ModuleDeclaration */:
                 return ts.ScriptElementKind.moduleElement;
-            case 222 /* ClassDeclaration */:
-            case 193 /* ClassExpression */:
+            case 226 /* ClassDeclaration */:
+            case 197 /* ClassExpression */:
                 return ts.ScriptElementKind.classElement;
-            case 223 /* InterfaceDeclaration */: return ts.ScriptElementKind.interfaceElement;
-            case 224 /* TypeAliasDeclaration */: return ts.ScriptElementKind.typeElement;
-            case 225 /* EnumDeclaration */: return ts.ScriptElementKind.enumElement;
-            case 219 /* VariableDeclaration */:
+            case 227 /* InterfaceDeclaration */: return ts.ScriptElementKind.interfaceElement;
+            case 228 /* TypeAliasDeclaration */: return ts.ScriptElementKind.typeElement;
+            case 229 /* EnumDeclaration */: return ts.ScriptElementKind.enumElement;
+            case 223 /* VariableDeclaration */:
                 return getKindOfVariableDeclaration(node);
-            case 170 /* BindingElement */:
+            case 174 /* BindingElement */:
                 return getKindOfVariableDeclaration(ts.getRootDeclaration(node));
-            case 181 /* ArrowFunction */:
-            case 221 /* FunctionDeclaration */:
-            case 180 /* FunctionExpression */:
+            case 185 /* ArrowFunction */:
+            case 225 /* FunctionDeclaration */:
+            case 184 /* FunctionExpression */:
                 return ts.ScriptElementKind.functionElement;
-            case 150 /* GetAccessor */: return ts.ScriptElementKind.memberGetAccessorElement;
-            case 151 /* SetAccessor */: return ts.ScriptElementKind.memberSetAccessorElement;
-            case 148 /* MethodDeclaration */:
-            case 147 /* MethodSignature */:
+            case 151 /* GetAccessor */: return ts.ScriptElementKind.memberGetAccessorElement;
+            case 152 /* SetAccessor */: return ts.ScriptElementKind.memberSetAccessorElement;
+            case 149 /* MethodDeclaration */:
+            case 148 /* MethodSignature */:
                 return ts.ScriptElementKind.memberFunctionElement;
-            case 146 /* PropertyDeclaration */:
-            case 145 /* PropertySignature */:
+            case 147 /* PropertyDeclaration */:
+            case 146 /* PropertySignature */:
                 return ts.ScriptElementKind.memberVariableElement;
-            case 154 /* IndexSignature */: return ts.ScriptElementKind.indexSignatureElement;
-            case 153 /* ConstructSignature */: return ts.ScriptElementKind.constructSignatureElement;
-            case 152 /* CallSignature */: return ts.ScriptElementKind.callSignatureElement;
-            case 149 /* Constructor */: return ts.ScriptElementKind.constructorImplementationElement;
-            case 142 /* TypeParameter */: return ts.ScriptElementKind.typeParameterElement;
-            case 255 /* EnumMember */: return ts.ScriptElementKind.enumMemberElement;
-            case 143 /* Parameter */: return ts.hasModifier(node, 92 /* ParameterPropertyModifier */) ? ts.ScriptElementKind.memberVariableElement : ts.ScriptElementKind.parameterElement;
-            case 230 /* ImportEqualsDeclaration */:
-            case 235 /* ImportSpecifier */:
-            case 232 /* ImportClause */:
-            case 239 /* ExportSpecifier */:
-            case 233 /* NamespaceImport */:
+            case 155 /* IndexSignature */: return ts.ScriptElementKind.indexSignatureElement;
+            case 154 /* ConstructSignature */: return ts.ScriptElementKind.constructSignatureElement;
+            case 153 /* CallSignature */: return ts.ScriptElementKind.callSignatureElement;
+            case 150 /* Constructor */: return ts.ScriptElementKind.constructorImplementationElement;
+            case 143 /* TypeParameter */: return ts.ScriptElementKind.typeParameterElement;
+            case 260 /* EnumMember */: return ts.ScriptElementKind.enumMemberElement;
+            case 144 /* Parameter */: return ts.hasModifier(node, 92 /* ParameterPropertyModifier */) ? ts.ScriptElementKind.memberVariableElement : ts.ScriptElementKind.parameterElement;
+            case 234 /* ImportEqualsDeclaration */:
+            case 239 /* ImportSpecifier */:
+            case 236 /* ImportClause */:
+            case 243 /* ExportSpecifier */:
+            case 237 /* NamespaceImport */:
                 return ts.ScriptElementKind.alias;
-            case 279 /* JSDocTypedefTag */:
+            case 284 /* JSDocTypedefTag */:
                 return ts.ScriptElementKind.typeElement;
             default:
                 return ts.ScriptElementKind.unknown;
@@ -61862,7 +64534,7 @@ var ts;
     }
     ts.getNodeKind = getNodeKind;
     function getStringLiteralTypeForNode(node, typeChecker) {
-        var searchNode = node.parent.kind === 167 /* LiteralType */ ? node.parent : node;
+        var searchNode = node.parent.kind === 171 /* LiteralType */ ? node.parent : node;
         var type = typeChecker.getTypeAtLocation(searchNode);
         if (type && type.flags & 32 /* StringLiteral */) {
             return type;
@@ -61877,7 +64549,7 @@ var ts;
                 return true;
             case 70 /* Identifier */:
                 // 'this' as a parameter
-                return ts.identifierIsThisKeyword(node) && node.parent.kind === 143 /* Parameter */;
+                return ts.identifierIsThisKeyword(node) && node.parent.kind === 144 /* Parameter */;
             default:
                 return false;
         }
@@ -61922,42 +64594,42 @@ var ts;
             return false;
         }
         switch (n.kind) {
-            case 222 /* ClassDeclaration */:
-            case 223 /* InterfaceDeclaration */:
-            case 225 /* EnumDeclaration */:
-            case 172 /* ObjectLiteralExpression */:
-            case 168 /* ObjectBindingPattern */:
-            case 160 /* TypeLiteral */:
-            case 200 /* Block */:
-            case 227 /* ModuleBlock */:
-            case 228 /* CaseBlock */:
-            case 234 /* NamedImports */:
-            case 238 /* NamedExports */:
+            case 226 /* ClassDeclaration */:
+            case 227 /* InterfaceDeclaration */:
+            case 229 /* EnumDeclaration */:
+            case 176 /* ObjectLiteralExpression */:
+            case 172 /* ObjectBindingPattern */:
+            case 161 /* TypeLiteral */:
+            case 204 /* Block */:
+            case 231 /* ModuleBlock */:
+            case 232 /* CaseBlock */:
+            case 238 /* NamedImports */:
+            case 242 /* NamedExports */:
                 return nodeEndsWith(n, 17 /* CloseBraceToken */, sourceFile);
-            case 252 /* CatchClause */:
+            case 256 /* CatchClause */:
                 return isCompletedNode(n.block, sourceFile);
-            case 176 /* NewExpression */:
+            case 180 /* NewExpression */:
                 if (!n.arguments) {
                     return true;
                 }
             // fall through
-            case 175 /* CallExpression */:
-            case 179 /* ParenthesizedExpression */:
-            case 165 /* ParenthesizedType */:
+            case 179 /* CallExpression */:
+            case 183 /* ParenthesizedExpression */:
+            case 166 /* ParenthesizedType */:
                 return nodeEndsWith(n, 19 /* CloseParenToken */, sourceFile);
-            case 157 /* FunctionType */:
-            case 158 /* ConstructorType */:
+            case 158 /* FunctionType */:
+            case 159 /* ConstructorType */:
                 return isCompletedNode(n.type, sourceFile);
-            case 149 /* Constructor */:
-            case 150 /* GetAccessor */:
-            case 151 /* SetAccessor */:
-            case 221 /* FunctionDeclaration */:
-            case 180 /* FunctionExpression */:
-            case 148 /* MethodDeclaration */:
-            case 147 /* MethodSignature */:
-            case 153 /* ConstructSignature */:
-            case 152 /* CallSignature */:
-            case 181 /* ArrowFunction */:
+            case 150 /* Constructor */:
+            case 151 /* GetAccessor */:
+            case 152 /* SetAccessor */:
+            case 225 /* FunctionDeclaration */:
+            case 184 /* FunctionExpression */:
+            case 149 /* MethodDeclaration */:
+            case 148 /* MethodSignature */:
+            case 154 /* ConstructSignature */:
+            case 153 /* CallSignature */:
+            case 185 /* ArrowFunction */:
                 if (n.body) {
                     return isCompletedNode(n.body, sourceFile);
                 }
@@ -61967,67 +64639,67 @@ var ts;
                 // Even though type parameters can be unclosed, we can get away with
                 // having at least a closing paren.
                 return hasChildOfKind(n, 19 /* CloseParenToken */, sourceFile);
-            case 226 /* ModuleDeclaration */:
+            case 230 /* ModuleDeclaration */:
                 return n.body && isCompletedNode(n.body, sourceFile);
-            case 204 /* IfStatement */:
+            case 208 /* IfStatement */:
                 if (n.elseStatement) {
                     return isCompletedNode(n.elseStatement, sourceFile);
                 }
                 return isCompletedNode(n.thenStatement, sourceFile);
-            case 203 /* ExpressionStatement */:
+            case 207 /* ExpressionStatement */:
                 return isCompletedNode(n.expression, sourceFile) ||
                     hasChildOfKind(n, 24 /* SemicolonToken */);
-            case 171 /* ArrayLiteralExpression */:
-            case 169 /* ArrayBindingPattern */:
-            case 174 /* ElementAccessExpression */:
-            case 141 /* ComputedPropertyName */:
-            case 162 /* TupleType */:
+            case 175 /* ArrayLiteralExpression */:
+            case 173 /* ArrayBindingPattern */:
+            case 178 /* ElementAccessExpression */:
+            case 142 /* ComputedPropertyName */:
+            case 163 /* TupleType */:
                 return nodeEndsWith(n, 21 /* CloseBracketToken */, sourceFile);
-            case 154 /* IndexSignature */:
+            case 155 /* IndexSignature */:
                 if (n.type) {
                     return isCompletedNode(n.type, sourceFile);
                 }
                 return hasChildOfKind(n, 21 /* CloseBracketToken */, sourceFile);
-            case 249 /* CaseClause */:
-            case 250 /* DefaultClause */:
+            case 253 /* CaseClause */:
+            case 254 /* DefaultClause */:
                 // there is no such thing as terminator token for CaseClause/DefaultClause so for simplicity always consider them non-completed
                 return false;
-            case 207 /* ForStatement */:
-            case 208 /* ForInStatement */:
-            case 209 /* ForOfStatement */:
-            case 206 /* WhileStatement */:
+            case 211 /* ForStatement */:
+            case 212 /* ForInStatement */:
+            case 213 /* ForOfStatement */:
+            case 210 /* WhileStatement */:
                 return isCompletedNode(n.statement, sourceFile);
-            case 205 /* DoStatement */:
+            case 209 /* DoStatement */:
                 // rough approximation: if DoStatement has While keyword - then if node is completed is checking the presence of ')';
                 var hasWhileKeyword = findChildOfKind(n, 105 /* WhileKeyword */, sourceFile);
                 if (hasWhileKeyword) {
                     return nodeEndsWith(n, 19 /* CloseParenToken */, sourceFile);
                 }
                 return isCompletedNode(n.statement, sourceFile);
-            case 159 /* TypeQuery */:
+            case 160 /* TypeQuery */:
                 return isCompletedNode(n.exprName, sourceFile);
-            case 183 /* TypeOfExpression */:
-            case 182 /* DeleteExpression */:
-            case 184 /* VoidExpression */:
-            case 191 /* YieldExpression */:
-            case 192 /* SpreadElementExpression */:
+            case 187 /* TypeOfExpression */:
+            case 186 /* DeleteExpression */:
+            case 188 /* VoidExpression */:
+            case 195 /* YieldExpression */:
+            case 196 /* SpreadElement */:
                 var unaryWordExpression = n;
                 return isCompletedNode(unaryWordExpression.expression, sourceFile);
-            case 177 /* TaggedTemplateExpression */:
+            case 181 /* TaggedTemplateExpression */:
                 return isCompletedNode(n.template, sourceFile);
-            case 190 /* TemplateExpression */:
+            case 194 /* TemplateExpression */:
                 var lastSpan = ts.lastOrUndefined(n.templateSpans);
                 return isCompletedNode(lastSpan, sourceFile);
-            case 198 /* TemplateSpan */:
+            case 202 /* TemplateSpan */:
                 return ts.nodeIsPresent(n.literal);
-            case 237 /* ExportDeclaration */:
-            case 231 /* ImportDeclaration */:
+            case 241 /* ExportDeclaration */:
+            case 235 /* ImportDeclaration */:
                 return ts.nodeIsPresent(n.moduleSpecifier);
-            case 186 /* PrefixUnaryExpression */:
+            case 190 /* PrefixUnaryExpression */:
                 return isCompletedNode(n.operand, sourceFile);
-            case 188 /* BinaryExpression */:
+            case 192 /* BinaryExpression */:
                 return isCompletedNode(n.right, sourceFile);
-            case 189 /* ConditionalExpression */:
+            case 193 /* ConditionalExpression */:
                 return isCompletedNode(n.whenFalse, sourceFile);
             default:
                 return true;
@@ -62083,7 +64755,7 @@ var ts;
         // for the position of the relevant node (or comma).
         var syntaxList = ts.forEach(node.parent.getChildren(), function (c) {
             // find syntax list that covers the span of the node
-            if (c.kind === 286 /* SyntaxList */ && c.pos <= node.pos && c.end >= node.end) {
+            if (c.kind === 291 /* SyntaxList */ && c.pos <= node.pos && c.end >= node.end) {
                 return c;
             }
         });
@@ -62255,7 +64927,7 @@ var ts;
                     }
                 }
             }
-            ts.Debug.assert(startNode !== undefined || n.kind === 256 /* SourceFile */);
+            ts.Debug.assert(startNode !== undefined || n.kind === 261 /* SourceFile */);
             // 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.
@@ -62314,17 +64986,17 @@ var ts;
             return true;
         }
         // <div> { | </div> or <div a={| </div>
-        if (token.kind === 26 /* LessThanToken */ && token.parent.kind === 248 /* JsxExpression */) {
+        if (token.kind === 26 /* LessThanToken */ && token.parent.kind === 252 /* JsxExpression */) {
             return true;
         }
         // <div> {
         // |
         // } < /div>
-        if (token && token.kind === 17 /* CloseBraceToken */ && token.parent.kind === 248 /* JsxExpression */) {
+        if (token && token.kind === 17 /* CloseBraceToken */ && token.parent.kind === 252 /* JsxExpression */) {
             return true;
         }
         // <div>|</div>
-        if (token.kind === 26 /* LessThanToken */ && token.parent.kind === 245 /* JsxClosingElement */) {
+        if (token.kind === 26 /* LessThanToken */ && token.parent.kind === 249 /* JsxClosingElement */) {
             return true;
         }
         return false;
@@ -62436,17 +65108,17 @@ var ts;
     }
     ts.getNodeModifiers = getNodeModifiers;
     function getTypeArgumentOrTypeParameterList(node) {
-        if (node.kind === 156 /* TypeReference */ || node.kind === 175 /* CallExpression */) {
+        if (node.kind === 157 /* TypeReference */ || node.kind === 179 /* CallExpression */) {
             return node.typeArguments;
         }
-        if (ts.isFunctionLike(node) || node.kind === 222 /* ClassDeclaration */ || node.kind === 223 /* InterfaceDeclaration */) {
+        if (ts.isFunctionLike(node) || node.kind === 226 /* ClassDeclaration */ || node.kind === 227 /* InterfaceDeclaration */) {
             return node.typeParameters;
         }
         return undefined;
     }
     ts.getTypeArgumentOrTypeParameterList = getTypeArgumentOrTypeParameterList;
     function isToken(n) {
-        return n.kind >= 0 /* FirstToken */ && n.kind <= 139 /* LastToken */;
+        return n.kind >= 0 /* FirstToken */ && n.kind <= 140 /* LastToken */;
     }
     ts.isToken = isToken;
     function isWord(kind) {
@@ -62505,18 +65177,18 @@ var ts;
     }
     ts.compareDataObjects = compareDataObjects;
     function isArrayLiteralOrObjectLiteralDestructuringPattern(node) {
-        if (node.kind === 171 /* ArrayLiteralExpression */ ||
-            node.kind === 172 /* ObjectLiteralExpression */) {
+        if (node.kind === 175 /* ArrayLiteralExpression */ ||
+            node.kind === 176 /* ObjectLiteralExpression */) {
             // [a,b,c] from:
             // [a, b, c] = someExpression;
-            if (node.parent.kind === 188 /* BinaryExpression */ &&
+            if (node.parent.kind === 192 /* BinaryExpression */ &&
                 node.parent.left === node &&
                 node.parent.operatorToken.kind === 57 /* EqualsToken */) {
                 return true;
             }
             // [a, b, c] from:
             // for([a, b, c] of expression)
-            if (node.parent.kind === 209 /* ForOfStatement */ &&
+            if (node.parent.kind === 213 /* ForOfStatement */ &&
                 node.parent.initializer === node) {
                 return true;
             }
@@ -62524,7 +65196,7 @@ var ts;
             // [x, [a, b, c] ] = someExpression
             // or
             // {x, a: {a, b, c} } = someExpression
-            if (isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.kind === 253 /* PropertyAssignment */ ? node.parent.parent : node.parent)) {
+            if (isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.kind === 257 /* PropertyAssignment */ ? node.parent.parent : node.parent)) {
                 return true;
             }
         }
@@ -62557,7 +65229,7 @@ var ts;
 /* @internal */
 (function (ts) {
     function isFirstDeclarationOfSymbolParameter(symbol) {
-        return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === 143 /* Parameter */;
+        return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === 144 /* Parameter */;
     }
     ts.isFirstDeclarationOfSymbolParameter = isFirstDeclarationOfSymbolParameter;
     var displayPartWriter = getDisplayPartWriter();
@@ -62579,8 +65251,8 @@ var ts;
             increaseIndent: function () { indent++; },
             decreaseIndent: function () { indent--; },
             clear: resetWriter,
-            trackSymbol: function () { },
-            reportInaccessibleThisError: function () { }
+            trackSymbol: ts.noop,
+            reportInaccessibleThisError: ts.noop
         };
         function writeIndent() {
             if (lineStart) {
@@ -62737,7 +65409,7 @@ var ts;
             return location.getText();
         }
         else if (ts.isStringOrNumericLiteral(location.kind) &&
-            location.parent.kind === 141 /* ComputedPropertyName */) {
+            location.parent.kind === 142 /* ComputedPropertyName */) {
             return location.text;
         }
         // Try to get the local symbol if we're dealing with an 'export default'
@@ -62749,7 +65421,7 @@ var ts;
     ts.getDeclaredName = getDeclaredName;
     function isImportOrExportSpecifierName(location) {
         return location.parent &&
-            (location.parent.kind === 235 /* ImportSpecifier */ || location.parent.kind === 239 /* ExportSpecifier */) &&
+            (location.parent.kind === 239 /* ImportSpecifier */ || location.parent.kind === 243 /* ExportSpecifier */) &&
             location.parent.propertyName === location;
     }
     ts.isImportOrExportSpecifierName = isImportOrExportSpecifierName;
@@ -62821,7 +65493,7 @@ var ts;
 (function (ts) {
     /// Classifier
     function createClassifier() {
-        var scanner = ts.createScanner(4 /* Latest */, /*skipTrivia*/ false);
+        var scanner = ts.createScanner(5 /* Latest */, /*skipTrivia*/ false);
         /// We do not have a full parser support to know when we should parse a regex or not
         /// If we consider every slash token to be a regex, we could be missing cases like "1/2/3", where
         /// we have a series of divide operator. this list allows us to be more accurate by ruling out
@@ -62864,7 +65536,7 @@ var ts;
         function canFollow(keyword1, keyword2) {
             if (ts.isAccessibilityModifier(keyword1)) {
                 if (keyword2 === 124 /* GetKeyword */ ||
-                    keyword2 === 132 /* SetKeyword */ ||
+                    keyword2 === 133 /* SetKeyword */ ||
                     keyword2 === 122 /* ConstructorKeyword */ ||
                     keyword2 === 114 /* StaticKeyword */) {
                     // Allow things like "public get", "public constructor" and "public static".
@@ -63023,10 +65695,10 @@ var ts;
                         angleBracketStack--;
                     }
                     else if (token === 118 /* AnyKeyword */ ||
-                        token === 133 /* StringKeyword */ ||
-                        token === 131 /* NumberKeyword */ ||
+                        token === 134 /* StringKeyword */ ||
+                        token === 132 /* NumberKeyword */ ||
                         token === 121 /* BooleanKeyword */ ||
-                        token === 134 /* SymbolKeyword */) {
+                        token === 135 /* 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,
@@ -63198,7 +65870,7 @@ var ts;
             }
         }
         function isKeyword(token) {
-            return token >= 71 /* FirstKeyword */ && token <= 139 /* LastKeyword */;
+            return token >= 71 /* FirstKeyword */ && token <= 140 /* LastKeyword */;
         }
         function classFromKind(token) {
             if (isKeyword(token)) {
@@ -63255,10 +65927,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 226 /* ModuleDeclaration */:
-            case 222 /* ClassDeclaration */:
-            case 223 /* InterfaceDeclaration */:
-            case 221 /* FunctionDeclaration */:
+            case 230 /* ModuleDeclaration */:
+            case 226 /* ClassDeclaration */:
+            case 227 /* InterfaceDeclaration */:
+            case 225 /* FunctionDeclaration */:
                 cancellationToken.throwIfCancellationRequested();
         }
     }
@@ -63309,7 +65981,7 @@ var ts;
              */
             function hasValueSideModule(symbol) {
                 return ts.forEach(symbol.declarations, function (declaration) {
-                    return declaration.kind === 226 /* ModuleDeclaration */ &&
+                    return declaration.kind === 230 /* ModuleDeclaration */ &&
                         ts.getModuleInstanceState(declaration) === 1 /* Instantiated */;
                 });
             }
@@ -63388,8 +66060,8 @@ var ts;
         var spanStart = span.start;
         var spanLength = span.length;
         // Make a scanner we can get trivia from.
-        var triviaScanner = ts.createScanner(4 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
-        var mergeConflictScanner = ts.createScanner(4 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
+        var triviaScanner = ts.createScanner(5 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
+        var mergeConflictScanner = ts.createScanner(5 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
         var result = [];
         processElement(sourceFile);
         return { spans: result, endOfLineState: 0 /* None */ };
@@ -63473,16 +66145,16 @@ var ts;
                     pushClassification(tag.tagName.pos, tag.tagName.end - tag.tagName.pos, 18 /* docCommentTagName */);
                     pos = tag.tagName.end;
                     switch (tag.kind) {
-                        case 275 /* JSDocParameterTag */:
+                        case 280 /* JSDocParameterTag */:
                             processJSDocParameterTag(tag);
                             break;
-                        case 278 /* JSDocTemplateTag */:
+                        case 283 /* JSDocTemplateTag */:
                             processJSDocTemplateTag(tag);
                             break;
-                        case 277 /* JSDocTypeTag */:
+                        case 282 /* JSDocTypeTag */:
                             processElement(tag.typeExpression);
                             break;
-                        case 276 /* JSDocReturnTag */:
+                        case 281 /* JSDocReturnTag */:
                             processElement(tag.typeExpression);
                             break;
                     }
@@ -63569,22 +66241,22 @@ var ts;
         }
         function tryClassifyJsxElementName(token) {
             switch (token.parent && token.parent.kind) {
-                case 244 /* JsxOpeningElement */:
+                case 248 /* JsxOpeningElement */:
                     if (token.parent.tagName === token) {
                         return 19 /* jsxOpenTagName */;
                     }
                     break;
-                case 245 /* JsxClosingElement */:
+                case 249 /* JsxClosingElement */:
                     if (token.parent.tagName === token) {
                         return 20 /* jsxCloseTagName */;
                     }
                     break;
-                case 243 /* JsxSelfClosingElement */:
+                case 247 /* JsxSelfClosingElement */:
                     if (token.parent.tagName === token) {
                         return 21 /* jsxSelfClosingTagName */;
                     }
                     break;
-                case 246 /* JsxAttribute */:
+                case 250 /* JsxAttribute */:
                     if (token.parent.name === token) {
                         return 22 /* jsxAttribute */;
                     }
@@ -63612,17 +66284,17 @@ var ts;
                 if (token) {
                     if (tokenKind === 57 /* EqualsToken */) {
                         // the '=' in a variable declaration is special cased here.
-                        if (token.parent.kind === 219 /* VariableDeclaration */ ||
-                            token.parent.kind === 146 /* PropertyDeclaration */ ||
-                            token.parent.kind === 143 /* Parameter */ ||
-                            token.parent.kind === 246 /* JsxAttribute */) {
+                        if (token.parent.kind === 223 /* VariableDeclaration */ ||
+                            token.parent.kind === 147 /* PropertyDeclaration */ ||
+                            token.parent.kind === 144 /* Parameter */ ||
+                            token.parent.kind === 250 /* JsxAttribute */) {
                             return 5 /* operator */;
                         }
                     }
-                    if (token.parent.kind === 188 /* BinaryExpression */ ||
-                        token.parent.kind === 186 /* PrefixUnaryExpression */ ||
-                        token.parent.kind === 187 /* PostfixUnaryExpression */ ||
-                        token.parent.kind === 189 /* ConditionalExpression */) {
+                    if (token.parent.kind === 192 /* BinaryExpression */ ||
+                        token.parent.kind === 190 /* PrefixUnaryExpression */ ||
+                        token.parent.kind === 191 /* PostfixUnaryExpression */ ||
+                        token.parent.kind === 193 /* ConditionalExpression */) {
                         return 5 /* operator */;
                     }
                 }
@@ -63632,7 +66304,7 @@ var ts;
                 return 4 /* numericLiteral */;
             }
             else if (tokenKind === 9 /* StringLiteral */) {
-                return token.parent.kind === 246 /* JsxAttribute */ ? 24 /* jsxAttributeStringLiteralValue */ : 6 /* stringLiteral */;
+                return token.parent.kind === 250 /* JsxAttribute */ ? 24 /* jsxAttributeStringLiteralValue */ : 6 /* stringLiteral */;
             }
             else if (tokenKind === 11 /* RegularExpressionLiteral */) {
                 // TODO: we should get another classification type for these literals.
@@ -63648,32 +66320,32 @@ var ts;
             else if (tokenKind === 70 /* Identifier */) {
                 if (token) {
                     switch (token.parent.kind) {
-                        case 222 /* ClassDeclaration */:
+                        case 226 /* ClassDeclaration */:
                             if (token.parent.name === token) {
                                 return 11 /* className */;
                             }
                             return;
-                        case 142 /* TypeParameter */:
+                        case 143 /* TypeParameter */:
                             if (token.parent.name === token) {
                                 return 15 /* typeParameterName */;
                             }
                             return;
-                        case 223 /* InterfaceDeclaration */:
+                        case 227 /* InterfaceDeclaration */:
                             if (token.parent.name === token) {
                                 return 13 /* interfaceName */;
                             }
                             return;
-                        case 225 /* EnumDeclaration */:
+                        case 229 /* EnumDeclaration */:
                             if (token.parent.name === token) {
                                 return 12 /* enumName */;
                             }
                             return;
-                        case 226 /* ModuleDeclaration */:
+                        case 230 /* ModuleDeclaration */:
                             if (token.parent.name === token) {
                                 return 14 /* moduleName */;
                             }
                             return;
-                        case 143 /* Parameter */:
+                        case 144 /* Parameter */:
                             if (token.parent.name === token) {
                                 return ts.isThisIdentifier(token) ? 3 /* keyword */ : 17 /* parameterName */;
                             }
@@ -63733,7 +66405,7 @@ var ts;
             else {
                 if (!symbols || symbols.length === 0) {
                     if (sourceFile.languageVariant === 1 /* JSX */ &&
-                        location.parent && location.parent.kind === 245 /* JsxClosingElement */) {
+                        location.parent && location.parent.kind === 249 /* JsxClosingElement */) {
                         // 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.
                         // For example:
@@ -63760,14 +66432,14 @@ var ts;
             function getJavaScriptCompletionEntries(sourceFile, position, uniqueNames) {
                 var entries = [];
                 var nameTable = ts.getNameTable(sourceFile);
-                for (var name_46 in nameTable) {
+                for (var name_42 in nameTable) {
                     // Skip identifiers produced only from the current location
-                    if (nameTable[name_46] === position) {
+                    if (nameTable[name_42] === position) {
                         continue;
                     }
-                    if (!uniqueNames[name_46]) {
-                        uniqueNames[name_46] = name_46;
-                        var displayName = getCompletionEntryDisplayName(ts.unescapeIdentifier(name_46), compilerOptions.target, /*performCharacterChecks*/ true);
+                    if (!uniqueNames[name_42]) {
+                        uniqueNames[name_42] = name_42;
+                        var displayName = getCompletionEntryDisplayName(ts.unescapeIdentifier(name_42), compilerOptions.target, /*performCharacterChecks*/ true);
                         if (displayName) {
                             var entry = {
                                 name: displayName,
@@ -63827,8 +66499,8 @@ var ts;
                 if (!node || node.kind !== 9 /* StringLiteral */) {
                     return undefined;
                 }
-                if (node.parent.kind === 253 /* PropertyAssignment */ &&
-                    node.parent.parent.kind === 172 /* ObjectLiteralExpression */ &&
+                if (node.parent.kind === 257 /* PropertyAssignment */ &&
+                    node.parent.parent.kind === 176 /* ObjectLiteralExpression */ &&
                     node.parent.name === node) {
                     // Get quoted name of properties of the object literal expression
                     // i.e. interface ConfigFiles {
@@ -63853,7 +66525,7 @@ var ts;
                     // a['/*completion position*/']
                     return getStringLiteralCompletionEntriesFromElementAccess(node.parent);
                 }
-                else if (node.parent.kind === 231 /* ImportDeclaration */ || ts.isExpressionOfExternalModuleImportEqualsDeclaration(node) || ts.isRequireCall(node.parent, false)) {
+                else if (node.parent.kind === 235 /* ImportDeclaration */ || ts.isExpressionOfExternalModuleImportEqualsDeclaration(node) || ts.isRequireCall(node.parent, false)) {
                     // Get all known external module names or complete a path to a module
                     // i.e. import * as ns from "/*completion position*/";
                     //      import x = require("/*completion position*/");
@@ -63925,7 +66597,7 @@ var ts;
                 if (!type) {
                     return;
                 }
-                if (type.flags & 524288 /* Union */) {
+                if (type.flags & 65536 /* Union */) {
                     ts.forEach(type.types, function (t) { return addStringLiteralCompletionsFromType(t, result); });
                 }
                 else {
@@ -64280,11 +66952,11 @@ var ts;
                     if (currentConfigPath) {
                         paths.push(currentConfigPath);
                         currentDir = ts.getDirectoryPath(currentConfigPath);
-                        var parent_16 = ts.getDirectoryPath(currentDir);
-                        if (currentDir === parent_16) {
+                        var parent_14 = ts.getDirectoryPath(currentDir);
+                        if (currentDir === parent_14) {
                             break;
                         }
-                        currentDir = parent_16;
+                        currentDir = parent_14;
                     }
                     else {
                         break;
@@ -64436,9 +67108,9 @@ var ts;
                         isJsDocTagName = true;
                     }
                     switch (tag.kind) {
-                        case 277 /* JSDocTypeTag */:
-                        case 275 /* JSDocParameterTag */:
-                        case 276 /* JSDocReturnTag */:
+                        case 282 /* JSDocTypeTag */:
+                        case 280 /* JSDocParameterTag */:
+                        case 281 /* JSDocReturnTag */:
                             var tagWithExpression = tag;
                             if (tagWithExpression.typeExpression) {
                                 insideJsDocTagExpression = tagWithExpression.typeExpression.pos < position && position < tagWithExpression.typeExpression.end;
@@ -64483,13 +67155,13 @@ var ts;
                     log("Returning an empty list because completion was requested in an invalid position.");
                     return undefined;
                 }
-                var parent_17 = contextToken.parent, kind = contextToken.kind;
+                var parent_15 = contextToken.parent, kind = contextToken.kind;
                 if (kind === 22 /* DotToken */) {
-                    if (parent_17.kind === 173 /* PropertyAccessExpression */) {
+                    if (parent_15.kind === 177 /* PropertyAccessExpression */) {
                         node = contextToken.parent.expression;
                         isRightOfDot = true;
                     }
-                    else if (parent_17.kind === 140 /* QualifiedName */) {
+                    else if (parent_15.kind === 141 /* QualifiedName */) {
                         node = contextToken.parent.left;
                         isRightOfDot = true;
                     }
@@ -64504,7 +67176,7 @@ var ts;
                         isRightOfOpenTag = true;
                         location = contextToken;
                     }
-                    else if (kind === 40 /* SlashToken */ && contextToken.parent.kind === 245 /* JsxClosingElement */) {
+                    else if (kind === 40 /* SlashToken */ && contextToken.parent.kind === 249 /* JsxClosingElement */) {
                         isStartingCloseTag = true;
                         location = contextToken;
                     }
@@ -64553,7 +67225,7 @@ var ts;
                 isGlobalCompletion = false;
                 isMemberCompletion = true;
                 isNewIdentifierLocation = false;
-                if (node.kind === 70 /* Identifier */ || node.kind === 140 /* QualifiedName */ || node.kind === 173 /* PropertyAccessExpression */) {
+                if (node.kind === 70 /* Identifier */ || node.kind === 141 /* QualifiedName */ || node.kind === 177 /* PropertyAccessExpression */) {
                     var symbol = typeChecker.getSymbolAtLocation(node);
                     // This is an alias, follow what it aliases
                     if (symbol && symbol.flags & 8388608 /* Alias */) {
@@ -64581,7 +67253,7 @@ var ts;
                             symbols.push(symbol);
                         }
                     }
-                    if (isJavaScriptFile && type.flags & 524288 /* Union */) {
+                    if (isJavaScriptFile && type.flags & 65536 /* Union */) {
                         // In javascript files, for union types, we don't just get the members that
                         // the individual types have in common, we also include all the members that
                         // each individual type has.  This is because we're going to add all identifiers
@@ -64609,7 +67281,7 @@ var ts;
                 }
                 if (jsxContainer = tryGetContainingJsxElement(contextToken)) {
                     var attrsType = void 0;
-                    if ((jsxContainer.kind === 243 /* JsxSelfClosingElement */) || (jsxContainer.kind === 244 /* JsxOpeningElement */)) {
+                    if ((jsxContainer.kind === 247 /* JsxSelfClosingElement */) || (jsxContainer.kind === 248 /* JsxOpeningElement */)) {
                         // Cursor is inside a JSX self-closing element or opening element
                         attrsType = typeChecker.getJsxElementAttributesType(jsxContainer);
                         if (attrsType) {
@@ -64657,9 +67329,9 @@ var ts;
                 var scopeNode = getScopeNode(contextToken, adjustedPosition, sourceFile) || sourceFile;
                 if (scopeNode) {
                     isGlobalCompletion =
-                        scopeNode.kind === 256 /* SourceFile */ ||
-                            scopeNode.kind === 190 /* TemplateExpression */ ||
-                            scopeNode.kind === 248 /* JsxExpression */ ||
+                        scopeNode.kind === 261 /* SourceFile */ ||
+                            scopeNode.kind === 194 /* TemplateExpression */ ||
+                            scopeNode.kind === 252 /* JsxExpression */ ||
                             ts.isStatement(scopeNode);
                 }
                 /// TODO filter meaning based on the current context
@@ -64692,11 +67364,11 @@ var ts;
                     return true;
                 }
                 if (contextToken.kind === 28 /* GreaterThanToken */ && contextToken.parent) {
-                    if (contextToken.parent.kind === 244 /* JsxOpeningElement */) {
+                    if (contextToken.parent.kind === 248 /* JsxOpeningElement */) {
                         return true;
                     }
-                    if (contextToken.parent.kind === 245 /* JsxClosingElement */ || contextToken.parent.kind === 243 /* JsxSelfClosingElement */) {
-                        return contextToken.parent.parent && contextToken.parent.parent.kind === 242 /* JsxElement */;
+                    if (contextToken.parent.kind === 249 /* JsxClosingElement */ || contextToken.parent.kind === 247 /* JsxSelfClosingElement */) {
+                        return contextToken.parent.parent && contextToken.parent.parent.kind === 246 /* JsxElement */;
                     }
                 }
                 return false;
@@ -64706,40 +67378,40 @@ var ts;
                     var containingNodeKind = previousToken.parent.kind;
                     switch (previousToken.kind) {
                         case 25 /* CommaToken */:
-                            return containingNodeKind === 175 /* CallExpression */ // func( a, |
-                                || containingNodeKind === 149 /* Constructor */ // constructor( a, |   /* public, protected, private keywords are allowed here, so show completion */
-                                || containingNodeKind === 176 /* NewExpression */ // new C(a, |
-                                || containingNodeKind === 171 /* ArrayLiteralExpression */ // [a, |
-                                || containingNodeKind === 188 /* BinaryExpression */ // const x = (a, |
-                                || containingNodeKind === 157 /* FunctionType */; // var x: (s: string, list|
+                            return containingNodeKind === 179 /* CallExpression */ // func( a, |
+                                || containingNodeKind === 150 /* Constructor */ // constructor( a, |   /* public, protected, private keywords are allowed here, so show completion */
+                                || containingNodeKind === 180 /* NewExpression */ // new C(a, |
+                                || containingNodeKind === 175 /* ArrayLiteralExpression */ // [a, |
+                                || containingNodeKind === 192 /* BinaryExpression */ // const x = (a, |
+                                || containingNodeKind === 158 /* FunctionType */; // var x: (s: string, list|
                         case 18 /* OpenParenToken */:
-                            return containingNodeKind === 175 /* CallExpression */ // func( |
-                                || containingNodeKind === 149 /* Constructor */ // constructor( |
-                                || containingNodeKind === 176 /* NewExpression */ // new C(a|
-                                || containingNodeKind === 179 /* ParenthesizedExpression */ // const x = (a|
-                                || containingNodeKind === 165 /* ParenthesizedType */; // function F(pred: (a| /* this can become an arrow function, where 'a' is the argument */
+                            return containingNodeKind === 179 /* CallExpression */ // func( |
+                                || containingNodeKind === 150 /* Constructor */ // constructor( |
+                                || containingNodeKind === 180 /* NewExpression */ // new C(a|
+                                || containingNodeKind === 183 /* ParenthesizedExpression */ // const x = (a|
+                                || containingNodeKind === 166 /* ParenthesizedType */; // function F(pred: (a| /* this can become an arrow function, where 'a' is the argument */
                         case 20 /* OpenBracketToken */:
-                            return containingNodeKind === 171 /* ArrayLiteralExpression */ // [ |
-                                || containingNodeKind === 154 /* IndexSignature */ // [ | : string ]
-                                || containingNodeKind === 141 /* ComputedPropertyName */; // [ |    /* this can become an index signature */
-                        case 126 /* ModuleKeyword */: // module |
-                        case 127 /* NamespaceKeyword */:
+                            return containingNodeKind === 175 /* ArrayLiteralExpression */ // [ |
+                                || containingNodeKind === 155 /* IndexSignature */ // [ | : string ]
+                                || containingNodeKind === 142 /* ComputedPropertyName */; // [ |    /* this can become an index signature */
+                        case 127 /* ModuleKeyword */: // module |
+                        case 128 /* NamespaceKeyword */:
                             return true;
                         case 22 /* DotToken */:
-                            return containingNodeKind === 226 /* ModuleDeclaration */; // module A.|
+                            return containingNodeKind === 230 /* ModuleDeclaration */; // module A.|
                         case 16 /* OpenBraceToken */:
-                            return containingNodeKind === 222 /* ClassDeclaration */; // class A{ |
+                            return containingNodeKind === 226 /* ClassDeclaration */; // class A{ |
                         case 57 /* EqualsToken */:
-                            return containingNodeKind === 219 /* VariableDeclaration */ // const x = a|
-                                || containingNodeKind === 188 /* BinaryExpression */; // x = a|
+                            return containingNodeKind === 223 /* VariableDeclaration */ // const x = a|
+                                || containingNodeKind === 192 /* BinaryExpression */; // x = a|
                         case 13 /* TemplateHead */:
-                            return containingNodeKind === 190 /* TemplateExpression */; // `aa ${|
+                            return containingNodeKind === 194 /* TemplateExpression */; // `aa ${|
                         case 14 /* TemplateMiddle */:
-                            return containingNodeKind === 198 /* TemplateSpan */; // `aa ${10} dd ${|
+                            return containingNodeKind === 202 /* TemplateSpan */; // `aa ${10} dd ${|
                         case 113 /* PublicKeyword */:
                         case 111 /* PrivateKeyword */:
                         case 112 /* ProtectedKeyword */:
-                            return containingNodeKind === 146 /* PropertyDeclaration */; // class A{ public |
+                            return containingNodeKind === 147 /* PropertyDeclaration */; // class A{ public |
                     }
                     // Previous token may have been a keyword that was converted to an identifier.
                     switch (previousToken.getText()) {
@@ -64782,7 +67454,7 @@ var ts;
                 isMemberCompletion = true;
                 var typeForObject;
                 var existingMembers;
-                if (objectLikeContainer.kind === 172 /* ObjectLiteralExpression */) {
+                if (objectLikeContainer.kind === 176 /* ObjectLiteralExpression */) {
                     // We are completing on contextual types, but may also include properties
                     // other than those within the declared type.
                     isNewIdentifierLocation = true;
@@ -64792,7 +67464,7 @@ var ts;
                     typeForObject = typeForObject && typeForObject.getNonNullableType();
                     existingMembers = objectLikeContainer.properties;
                 }
-                else if (objectLikeContainer.kind === 168 /* ObjectBindingPattern */) {
+                else if (objectLikeContainer.kind === 172 /* ObjectBindingPattern */) {
                     // We are *only* completing on properties from the type being destructured.
                     isNewIdentifierLocation = false;
                     var rootDeclaration = ts.getRootDeclaration(objectLikeContainer.parent);
@@ -64803,11 +67475,11 @@ var ts;
                         // 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 = !!(rootDeclaration.initializer || rootDeclaration.type);
-                        if (!canGetType && rootDeclaration.kind === 143 /* Parameter */) {
+                        if (!canGetType && rootDeclaration.kind === 144 /* Parameter */) {
                             if (ts.isExpression(rootDeclaration.parent)) {
                                 canGetType = !!typeChecker.getContextualType(rootDeclaration.parent);
                             }
-                            else if (rootDeclaration.parent.kind === 148 /* MethodDeclaration */ || rootDeclaration.parent.kind === 151 /* SetAccessor */) {
+                            else if (rootDeclaration.parent.kind === 149 /* MethodDeclaration */ || rootDeclaration.parent.kind === 152 /* SetAccessor */) {
                                 canGetType = ts.isExpression(rootDeclaration.parent.parent) && !!typeChecker.getContextualType(rootDeclaration.parent.parent);
                             }
                         }
@@ -64849,9 +67521,9 @@ var ts;
              * @returns true if 'symbols' was successfully populated; false otherwise.
              */
             function tryGetImportOrExportClauseCompletionSymbols(namedImportsOrExports) {
-                var declarationKind = namedImportsOrExports.kind === 234 /* NamedImports */ ?
-                    231 /* ImportDeclaration */ :
-                    237 /* ExportDeclaration */;
+                var declarationKind = namedImportsOrExports.kind === 238 /* NamedImports */ ?
+                    235 /* ImportDeclaration */ :
+                    241 /* ExportDeclaration */;
                 var importOrExportDeclaration = ts.getAncestor(namedImportsOrExports, declarationKind);
                 var moduleSpecifier = importOrExportDeclaration.moduleSpecifier;
                 if (!moduleSpecifier) {
@@ -64876,9 +67548,9 @@ var ts;
                     switch (contextToken.kind) {
                         case 16 /* OpenBraceToken */: // const x = { |
                         case 25 /* CommaToken */:
-                            var parent_18 = contextToken.parent;
-                            if (parent_18 && (parent_18.kind === 172 /* ObjectLiteralExpression */ || parent_18.kind === 168 /* ObjectBindingPattern */)) {
-                                return parent_18;
+                            var parent_16 = contextToken.parent;
+                            if (parent_16 && (parent_16.kind === 176 /* ObjectLiteralExpression */ || parent_16.kind === 172 /* ObjectBindingPattern */)) {
+                                return parent_16;
                             }
                             break;
                     }
@@ -64895,8 +67567,8 @@ var ts;
                         case 16 /* OpenBraceToken */: // import { |
                         case 25 /* CommaToken */:
                             switch (contextToken.parent.kind) {
-                                case 234 /* NamedImports */:
-                                case 238 /* NamedExports */:
+                                case 238 /* NamedImports */:
+                                case 242 /* NamedExports */:
                                     return contextToken.parent;
                             }
                     }
@@ -64905,37 +67577,37 @@ var ts;
             }
             function tryGetContainingJsxElement(contextToken) {
                 if (contextToken) {
-                    var parent_19 = contextToken.parent;
+                    var parent_17 = contextToken.parent;
                     switch (contextToken.kind) {
                         case 27 /* LessThanSlashToken */:
                         case 40 /* SlashToken */:
                         case 70 /* Identifier */:
-                        case 246 /* JsxAttribute */:
-                        case 247 /* JsxSpreadAttribute */:
-                            if (parent_19 && (parent_19.kind === 243 /* JsxSelfClosingElement */ || parent_19.kind === 244 /* JsxOpeningElement */)) {
-                                return parent_19;
+                        case 250 /* JsxAttribute */:
+                        case 251 /* JsxSpreadAttribute */:
+                            if (parent_17 && (parent_17.kind === 247 /* JsxSelfClosingElement */ || parent_17.kind === 248 /* JsxOpeningElement */)) {
+                                return parent_17;
                             }
-                            else if (parent_19.kind === 246 /* JsxAttribute */) {
-                                return parent_19.parent;
+                            else if (parent_17.kind === 250 /* JsxAttribute */) {
+                                return parent_17.parent;
                             }
                             break;
                         // The context token is the closing } or " of an attribute, which means
                         // its parent is a JsxExpression, whose parent is a JsxAttribute,
                         // whose parent is a JsxOpeningLikeElement
                         case 9 /* StringLiteral */:
-                            if (parent_19 && ((parent_19.kind === 246 /* JsxAttribute */) || (parent_19.kind === 247 /* JsxSpreadAttribute */))) {
-                                return parent_19.parent;
+                            if (parent_17 && ((parent_17.kind === 250 /* JsxAttribute */) || (parent_17.kind === 251 /* JsxSpreadAttribute */))) {
+                                return parent_17.parent;
                             }
                             break;
                         case 17 /* CloseBraceToken */:
-                            if (parent_19 &&
-                                parent_19.kind === 248 /* JsxExpression */ &&
-                                parent_19.parent &&
-                                (parent_19.parent.kind === 246 /* JsxAttribute */)) {
-                                return parent_19.parent.parent;
+                            if (parent_17 &&
+                                parent_17.kind === 252 /* JsxExpression */ &&
+                                parent_17.parent &&
+                                (parent_17.parent.kind === 250 /* JsxAttribute */)) {
+                                return parent_17.parent.parent;
                             }
-                            if (parent_19 && parent_19.kind === 247 /* JsxSpreadAttribute */) {
-                                return parent_19.parent;
+                            if (parent_17 && parent_17.kind === 251 /* JsxSpreadAttribute */) {
+                                return parent_17.parent;
                             }
                             break;
                     }
@@ -64944,16 +67616,16 @@ var ts;
             }
             function isFunction(kind) {
                 switch (kind) {
-                    case 180 /* FunctionExpression */:
-                    case 181 /* ArrowFunction */:
-                    case 221 /* FunctionDeclaration */:
-                    case 148 /* MethodDeclaration */:
-                    case 147 /* MethodSignature */:
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
-                    case 152 /* CallSignature */:
-                    case 153 /* ConstructSignature */:
-                    case 154 /* IndexSignature */:
+                    case 184 /* FunctionExpression */:
+                    case 185 /* ArrowFunction */:
+                    case 225 /* FunctionDeclaration */:
+                    case 149 /* MethodDeclaration */:
+                    case 148 /* MethodSignature */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* SetAccessor */:
+                    case 153 /* CallSignature */:
+                    case 154 /* ConstructSignature */:
+                    case 155 /* IndexSignature */:
                         return true;
                 }
                 return false;
@@ -64965,66 +67637,66 @@ var ts;
                 var containingNodeKind = contextToken.parent.kind;
                 switch (contextToken.kind) {
                     case 25 /* CommaToken */:
-                        return containingNodeKind === 219 /* VariableDeclaration */ ||
-                            containingNodeKind === 220 /* VariableDeclarationList */ ||
-                            containingNodeKind === 201 /* VariableStatement */ ||
-                            containingNodeKind === 225 /* EnumDeclaration */ ||
+                        return containingNodeKind === 223 /* VariableDeclaration */ ||
+                            containingNodeKind === 224 /* VariableDeclarationList */ ||
+                            containingNodeKind === 205 /* VariableStatement */ ||
+                            containingNodeKind === 229 /* EnumDeclaration */ ||
                             isFunction(containingNodeKind) ||
-                            containingNodeKind === 222 /* ClassDeclaration */ ||
-                            containingNodeKind === 193 /* ClassExpression */ ||
-                            containingNodeKind === 223 /* InterfaceDeclaration */ ||
-                            containingNodeKind === 169 /* ArrayBindingPattern */ ||
-                            containingNodeKind === 224 /* TypeAliasDeclaration */; // type Map, K, |
+                            containingNodeKind === 226 /* ClassDeclaration */ ||
+                            containingNodeKind === 197 /* ClassExpression */ ||
+                            containingNodeKind === 227 /* InterfaceDeclaration */ ||
+                            containingNodeKind === 173 /* ArrayBindingPattern */ ||
+                            containingNodeKind === 228 /* TypeAliasDeclaration */; // type Map, K, |
                     case 22 /* DotToken */:
-                        return containingNodeKind === 169 /* ArrayBindingPattern */; // var [.|
+                        return containingNodeKind === 173 /* ArrayBindingPattern */; // var [.|
                     case 55 /* ColonToken */:
-                        return containingNodeKind === 170 /* BindingElement */; // var {x :html|
+                        return containingNodeKind === 174 /* BindingElement */; // var {x :html|
                     case 20 /* OpenBracketToken */:
-                        return containingNodeKind === 169 /* ArrayBindingPattern */; // var [x|
+                        return containingNodeKind === 173 /* ArrayBindingPattern */; // var [x|
                     case 18 /* OpenParenToken */:
-                        return containingNodeKind === 252 /* CatchClause */ ||
+                        return containingNodeKind === 256 /* CatchClause */ ||
                             isFunction(containingNodeKind);
                     case 16 /* OpenBraceToken */:
-                        return containingNodeKind === 225 /* EnumDeclaration */ ||
-                            containingNodeKind === 223 /* InterfaceDeclaration */ ||
-                            containingNodeKind === 160 /* TypeLiteral */; // const x : { |
+                        return containingNodeKind === 229 /* EnumDeclaration */ ||
+                            containingNodeKind === 227 /* InterfaceDeclaration */ ||
+                            containingNodeKind === 161 /* TypeLiteral */; // const x : { |
                     case 24 /* SemicolonToken */:
-                        return containingNodeKind === 145 /* PropertySignature */ &&
+                        return containingNodeKind === 146 /* PropertySignature */ &&
                             contextToken.parent && contextToken.parent.parent &&
-                            (contextToken.parent.parent.kind === 223 /* InterfaceDeclaration */ ||
-                                contextToken.parent.parent.kind === 160 /* TypeLiteral */); // const x : { a; |
+                            (contextToken.parent.parent.kind === 227 /* InterfaceDeclaration */ ||
+                                contextToken.parent.parent.kind === 161 /* TypeLiteral */); // const x : { a; |
                     case 26 /* LessThanToken */:
-                        return containingNodeKind === 222 /* ClassDeclaration */ ||
-                            containingNodeKind === 193 /* ClassExpression */ ||
-                            containingNodeKind === 223 /* InterfaceDeclaration */ ||
-                            containingNodeKind === 224 /* TypeAliasDeclaration */ ||
+                        return containingNodeKind === 226 /* ClassDeclaration */ ||
+                            containingNodeKind === 197 /* ClassExpression */ ||
+                            containingNodeKind === 227 /* InterfaceDeclaration */ ||
+                            containingNodeKind === 228 /* TypeAliasDeclaration */ ||
                             isFunction(containingNodeKind);
                     case 114 /* StaticKeyword */:
-                        return containingNodeKind === 146 /* PropertyDeclaration */;
+                        return containingNodeKind === 147 /* PropertyDeclaration */;
                     case 23 /* DotDotDotToken */:
-                        return containingNodeKind === 143 /* Parameter */ ||
+                        return containingNodeKind === 144 /* Parameter */ ||
                             (contextToken.parent && contextToken.parent.parent &&
-                                contextToken.parent.parent.kind === 169 /* ArrayBindingPattern */); // var [...z|
+                                contextToken.parent.parent.kind === 173 /* ArrayBindingPattern */); // var [...z|
                     case 113 /* PublicKeyword */:
                     case 111 /* PrivateKeyword */:
                     case 112 /* ProtectedKeyword */:
-                        return containingNodeKind === 143 /* Parameter */;
+                        return containingNodeKind === 144 /* Parameter */;
                     case 117 /* AsKeyword */:
-                        return containingNodeKind === 235 /* ImportSpecifier */ ||
-                            containingNodeKind === 239 /* ExportSpecifier */ ||
-                            containingNodeKind === 233 /* NamespaceImport */;
+                        return containingNodeKind === 239 /* ImportSpecifier */ ||
+                            containingNodeKind === 243 /* ExportSpecifier */ ||
+                            containingNodeKind === 237 /* NamespaceImport */;
                     case 74 /* ClassKeyword */:
                     case 82 /* EnumKeyword */:
                     case 108 /* InterfaceKeyword */:
                     case 88 /* FunctionKeyword */:
                     case 103 /* VarKeyword */:
                     case 124 /* GetKeyword */:
-                    case 132 /* SetKeyword */:
+                    case 133 /* SetKeyword */:
                     case 90 /* ImportKeyword */:
                     case 109 /* LetKeyword */:
                     case 75 /* ConstKeyword */:
                     case 115 /* YieldKeyword */:
-                    case 135 /* TypeKeyword */:
+                    case 136 /* TypeKeyword */:
                         return true;
                 }
                 // Previous token may have been a keyword that was converted to an identifier.
@@ -65072,8 +67744,8 @@ var ts;
                     if (element.getStart() <= position && position <= element.getEnd()) {
                         continue;
                     }
-                    var name_47 = element.propertyName || element.name;
-                    existingImportsOrExports[name_47.text] = true;
+                    var name_43 = element.propertyName || element.name;
+                    existingImportsOrExports[name_43.text] = true;
                 }
                 if (!ts.someProperties(existingImportsOrExports)) {
                     return ts.filter(exportsOfModule, function (e) { return e.name !== "default"; });
@@ -65094,10 +67766,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 !== 253 /* PropertyAssignment */ &&
-                        m.kind !== 254 /* ShorthandPropertyAssignment */ &&
-                        m.kind !== 170 /* BindingElement */ &&
-                        m.kind !== 148 /* MethodDeclaration */) {
+                    if (m.kind !== 257 /* PropertyAssignment */ &&
+                        m.kind !== 258 /* ShorthandPropertyAssignment */ &&
+                        m.kind !== 174 /* BindingElement */ &&
+                        m.kind !== 149 /* MethodDeclaration */ &&
+                        m.kind !== 151 /* GetAccessor */ &&
+                        m.kind !== 152 /* SetAccessor */) {
                         continue;
                     }
                     // If this is the current item we are editing right now, do not filter it out
@@ -65105,7 +67779,7 @@ var ts;
                         continue;
                     }
                     var existingName = void 0;
-                    if (m.kind === 170 /* BindingElement */ && m.propertyName) {
+                    if (m.kind === 174 /* BindingElement */ && m.propertyName) {
                         // include only identifiers in completion list
                         if (m.propertyName.kind === 70 /* Identifier */) {
                             existingName = m.propertyName.text;
@@ -65135,7 +67809,7 @@ var ts;
                     if (attr.getStart() <= position && position <= attr.getEnd()) {
                         continue;
                     }
-                    if (attr.kind === 246 /* JsxAttribute */) {
+                    if (attr.kind === 250 /* JsxAttribute */) {
                         seenNames[attr.name.text] = true;
                     }
                 }
@@ -65185,7 +67859,7 @@ var ts;
         }
         // A cache of completion entries for keywords, these do not change between sessions
         var keywordCompletions = [];
-        for (var i = 71 /* FirstKeyword */; i <= 139 /* LastKeyword */; i++) {
+        for (var i = 71 /* FirstKeyword */; i <= 140 /* LastKeyword */; i++) {
             keywordCompletions.push({
                 name: ts.tokenToString(i),
                 kind: ts.ScriptElementKind.keyword,
@@ -65262,7 +67936,7 @@ var ts;
             function getSemanticDocumentHighlights(node) {
                 if (node.kind === 70 /* Identifier */ ||
                     node.kind === 98 /* ThisKeyword */ ||
-                    node.kind === 166 /* ThisType */ ||
+                    node.kind === 167 /* ThisType */ ||
                     node.kind === 96 /* SuperKeyword */ ||
                     node.kind === 9 /* StringLiteral */ ||
                     ts.isLiteralNameOfPropertyDeclarationOrIndexAccess(node)) {
@@ -65316,75 +67990,75 @@ var ts;
                         switch (node.kind) {
                             case 89 /* IfKeyword */:
                             case 81 /* ElseKeyword */:
-                                if (hasKind(node.parent, 204 /* IfStatement */)) {
+                                if (hasKind(node.parent, 208 /* IfStatement */)) {
                                     return getIfElseOccurrences(node.parent);
                                 }
                                 break;
                             case 95 /* ReturnKeyword */:
-                                if (hasKind(node.parent, 212 /* ReturnStatement */)) {
+                                if (hasKind(node.parent, 216 /* ReturnStatement */)) {
                                     return getReturnOccurrences(node.parent);
                                 }
                                 break;
                             case 99 /* ThrowKeyword */:
-                                if (hasKind(node.parent, 216 /* ThrowStatement */)) {
+                                if (hasKind(node.parent, 220 /* ThrowStatement */)) {
                                     return getThrowOccurrences(node.parent);
                                 }
                                 break;
                             case 73 /* CatchKeyword */:
-                                if (hasKind(parent(parent(node)), 217 /* TryStatement */)) {
+                                if (hasKind(parent(parent(node)), 221 /* TryStatement */)) {
                                     return getTryCatchFinallyOccurrences(node.parent.parent);
                                 }
                                 break;
                             case 101 /* TryKeyword */:
                             case 86 /* FinallyKeyword */:
-                                if (hasKind(parent(node), 217 /* TryStatement */)) {
+                                if (hasKind(parent(node), 221 /* TryStatement */)) {
                                     return getTryCatchFinallyOccurrences(node.parent);
                                 }
                                 break;
                             case 97 /* SwitchKeyword */:
-                                if (hasKind(node.parent, 214 /* SwitchStatement */)) {
+                                if (hasKind(node.parent, 218 /* SwitchStatement */)) {
                                     return getSwitchCaseDefaultOccurrences(node.parent);
                                 }
                                 break;
                             case 72 /* CaseKeyword */:
                             case 78 /* DefaultKeyword */:
-                                if (hasKind(parent(parent(parent(node))), 214 /* SwitchStatement */)) {
+                                if (hasKind(parent(parent(parent(node))), 218 /* SwitchStatement */)) {
                                     return getSwitchCaseDefaultOccurrences(node.parent.parent.parent);
                                 }
                                 break;
                             case 71 /* BreakKeyword */:
                             case 76 /* ContinueKeyword */:
-                                if (hasKind(node.parent, 211 /* BreakStatement */) || hasKind(node.parent, 210 /* ContinueStatement */)) {
+                                if (hasKind(node.parent, 215 /* BreakStatement */) || hasKind(node.parent, 214 /* ContinueStatement */)) {
                                     return getBreakOrContinueStatementOccurrences(node.parent);
                                 }
                                 break;
                             case 87 /* ForKeyword */:
-                                if (hasKind(node.parent, 207 /* ForStatement */) ||
-                                    hasKind(node.parent, 208 /* ForInStatement */) ||
-                                    hasKind(node.parent, 209 /* ForOfStatement */)) {
+                                if (hasKind(node.parent, 211 /* ForStatement */) ||
+                                    hasKind(node.parent, 212 /* ForInStatement */) ||
+                                    hasKind(node.parent, 213 /* ForOfStatement */)) {
                                     return getLoopBreakContinueOccurrences(node.parent);
                                 }
                                 break;
                             case 105 /* WhileKeyword */:
                             case 80 /* DoKeyword */:
-                                if (hasKind(node.parent, 206 /* WhileStatement */) || hasKind(node.parent, 205 /* DoStatement */)) {
+                                if (hasKind(node.parent, 210 /* WhileStatement */) || hasKind(node.parent, 209 /* DoStatement */)) {
                                     return getLoopBreakContinueOccurrences(node.parent);
                                 }
                                 break;
                             case 122 /* ConstructorKeyword */:
-                                if (hasKind(node.parent, 149 /* Constructor */)) {
+                                if (hasKind(node.parent, 150 /* Constructor */)) {
                                     return getConstructorOccurrences(node.parent);
                                 }
                                 break;
                             case 124 /* GetKeyword */:
-                            case 132 /* SetKeyword */:
-                                if (hasKind(node.parent, 150 /* GetAccessor */) || hasKind(node.parent, 151 /* SetAccessor */)) {
+                            case 133 /* SetKeyword */:
+                                if (hasKind(node.parent, 151 /* GetAccessor */) || hasKind(node.parent, 152 /* SetAccessor */)) {
                                     return getGetAndSetOccurrences(node.parent);
                                 }
                                 break;
                             default:
                                 if (ts.isModifierKind(node.kind) && node.parent &&
-                                    (ts.isDeclaration(node.parent) || node.parent.kind === 201 /* VariableStatement */)) {
+                                    (ts.isDeclaration(node.parent) || node.parent.kind === 205 /* VariableStatement */)) {
                                     return getModifierOccurrences(node.kind, node.parent);
                                 }
                         }
@@ -65400,10 +68074,10 @@ var ts;
                     aggregate(node);
                     return statementAccumulator;
                     function aggregate(node) {
-                        if (node.kind === 216 /* ThrowStatement */) {
+                        if (node.kind === 220 /* ThrowStatement */) {
                             statementAccumulator.push(node);
                         }
-                        else if (node.kind === 217 /* TryStatement */) {
+                        else if (node.kind === 221 /* TryStatement */) {
                             var tryStatement = node;
                             if (tryStatement.catchClause) {
                                 aggregate(tryStatement.catchClause);
@@ -65430,19 +68104,19 @@ var ts;
                 function getThrowStatementOwner(throwStatement) {
                     var child = throwStatement;
                     while (child.parent) {
-                        var parent_20 = child.parent;
-                        if (ts.isFunctionBlock(parent_20) || parent_20.kind === 256 /* SourceFile */) {
-                            return parent_20;
+                        var parent_18 = child.parent;
+                        if (ts.isFunctionBlock(parent_18) || parent_18.kind === 261 /* SourceFile */) {
+                            return parent_18;
                         }
                         // A throw-statement is only owned by a try-statement if the try-statement has
                         // a catch clause, and if the throw-statement occurs within the try block.
-                        if (parent_20.kind === 217 /* TryStatement */) {
-                            var tryStatement = parent_20;
+                        if (parent_18.kind === 221 /* TryStatement */) {
+                            var tryStatement = parent_18;
                             if (tryStatement.tryBlock === child && tryStatement.catchClause) {
                                 return child;
                             }
                         }
-                        child = parent_20;
+                        child = parent_18;
                     }
                     return undefined;
                 }
@@ -65451,7 +68125,7 @@ var ts;
                     aggregate(node);
                     return statementAccumulator;
                     function aggregate(node) {
-                        if (node.kind === 211 /* BreakStatement */ || node.kind === 210 /* ContinueStatement */) {
+                        if (node.kind === 215 /* BreakStatement */ || node.kind === 214 /* ContinueStatement */) {
                             statementAccumulator.push(node);
                         }
                         else if (!ts.isFunctionLike(node)) {
@@ -65466,16 +68140,16 @@ var ts;
                 function getBreakOrContinueOwner(statement) {
                     for (var node_1 = statement.parent; node_1; node_1 = node_1.parent) {
                         switch (node_1.kind) {
-                            case 214 /* SwitchStatement */:
-                                if (statement.kind === 210 /* ContinueStatement */) {
+                            case 218 /* SwitchStatement */:
+                                if (statement.kind === 214 /* ContinueStatement */) {
                                     continue;
                                 }
                             // Fall through.
-                            case 207 /* ForStatement */:
-                            case 208 /* ForInStatement */:
-                            case 209 /* ForOfStatement */:
-                            case 206 /* WhileStatement */:
-                            case 205 /* DoStatement */:
+                            case 211 /* ForStatement */:
+                            case 212 /* ForInStatement */:
+                            case 213 /* ForOfStatement */:
+                            case 210 /* WhileStatement */:
+                            case 209 /* DoStatement */:
                                 if (!statement.label || isLabeledBy(node_1, statement.label.text)) {
                                     return node_1;
                                 }
@@ -65494,24 +68168,24 @@ var ts;
                     var container = declaration.parent;
                     // Make sure we only highlight the keyword when it makes sense to do so.
                     if (ts.isAccessibilityModifier(modifier)) {
-                        if (!(container.kind === 222 /* ClassDeclaration */ ||
-                            container.kind === 193 /* ClassExpression */ ||
-                            (declaration.kind === 143 /* Parameter */ && hasKind(container, 149 /* Constructor */)))) {
+                        if (!(container.kind === 226 /* ClassDeclaration */ ||
+                            container.kind === 197 /* ClassExpression */ ||
+                            (declaration.kind === 144 /* Parameter */ && hasKind(container, 150 /* Constructor */)))) {
                             return undefined;
                         }
                     }
                     else if (modifier === 114 /* StaticKeyword */) {
-                        if (!(container.kind === 222 /* ClassDeclaration */ || container.kind === 193 /* ClassExpression */)) {
+                        if (!(container.kind === 226 /* ClassDeclaration */ || container.kind === 197 /* ClassExpression */)) {
                             return undefined;
                         }
                     }
                     else if (modifier === 83 /* ExportKeyword */ || modifier === 123 /* DeclareKeyword */) {
-                        if (!(container.kind === 227 /* ModuleBlock */ || container.kind === 256 /* SourceFile */)) {
+                        if (!(container.kind === 231 /* ModuleBlock */ || container.kind === 261 /* SourceFile */)) {
                             return undefined;
                         }
                     }
                     else if (modifier === 116 /* AbstractKeyword */) {
-                        if (!(container.kind === 222 /* ClassDeclaration */ || declaration.kind === 222 /* ClassDeclaration */)) {
+                        if (!(container.kind === 226 /* ClassDeclaration */ || declaration.kind === 226 /* ClassDeclaration */)) {
                             return undefined;
                         }
                     }
@@ -65523,8 +68197,8 @@ var ts;
                     var modifierFlag = getFlagFromModifier(modifier);
                     var nodes;
                     switch (container.kind) {
-                        case 227 /* ModuleBlock */:
-                        case 256 /* SourceFile */:
+                        case 231 /* ModuleBlock */:
+                        case 261 /* SourceFile */:
                             // Container is either a class declaration or the declaration is a classDeclaration
                             if (modifierFlag & 128 /* Abstract */) {
                                 nodes = declaration.members.concat(declaration);
@@ -65533,17 +68207,17 @@ var ts;
                                 nodes = container.statements;
                             }
                             break;
-                        case 149 /* Constructor */:
+                        case 150 /* Constructor */:
                             nodes = container.parameters.concat(container.parent.members);
                             break;
-                        case 222 /* ClassDeclaration */:
-                        case 193 /* ClassExpression */:
+                        case 226 /* ClassDeclaration */:
+                        case 197 /* ClassExpression */:
                             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 & 28 /* AccessibilityModifier */) {
                                 var constructor = ts.forEach(container.members, function (member) {
-                                    return member.kind === 149 /* Constructor */ && member;
+                                    return member.kind === 150 /* Constructor */ && member;
                                 });
                                 if (constructor) {
                                     nodes = nodes.concat(constructor.parameters);
@@ -65596,13 +68270,13 @@ var ts;
                 }
                 function getGetAndSetOccurrences(accessorDeclaration) {
                     var keywords = [];
-                    tryPushAccessorKeyword(accessorDeclaration.symbol, 150 /* GetAccessor */);
-                    tryPushAccessorKeyword(accessorDeclaration.symbol, 151 /* SetAccessor */);
+                    tryPushAccessorKeyword(accessorDeclaration.symbol, 151 /* GetAccessor */);
+                    tryPushAccessorKeyword(accessorDeclaration.symbol, 152 /* SetAccessor */);
                     return ts.map(keywords, getHighlightSpanForNode);
                     function tryPushAccessorKeyword(accessorSymbol, accessorKind) {
                         var accessor = ts.getDeclarationOfKind(accessorSymbol, accessorKind);
                         if (accessor) {
-                            ts.forEach(accessor.getChildren(), function (child) { return pushKeywordIf(keywords, child, 124 /* GetKeyword */, 132 /* SetKeyword */); });
+                            ts.forEach(accessor.getChildren(), function (child) { return pushKeywordIf(keywords, child, 124 /* GetKeyword */, 133 /* SetKeyword */); });
                         }
                     }
                 }
@@ -65620,7 +68294,7 @@ var ts;
                     var keywords = [];
                     if (pushKeywordIf(keywords, loopNode.getFirstToken(), 87 /* ForKeyword */, 105 /* WhileKeyword */, 80 /* DoKeyword */)) {
                         // If we succeeded and got a do-while loop, then start looking for a 'while' keyword.
-                        if (loopNode.kind === 205 /* DoStatement */) {
+                        if (loopNode.kind === 209 /* DoStatement */) {
                             var loopTokens = loopNode.getChildren();
                             for (var i = loopTokens.length - 1; i >= 0; i--) {
                                 if (pushKeywordIf(keywords, loopTokens[i], 105 /* WhileKeyword */)) {
@@ -65641,13 +68315,13 @@ var ts;
                     var owner = getBreakOrContinueOwner(breakOrContinueStatement);
                     if (owner) {
                         switch (owner.kind) {
-                            case 207 /* ForStatement */:
-                            case 208 /* ForInStatement */:
-                            case 209 /* ForOfStatement */:
-                            case 205 /* DoStatement */:
-                            case 206 /* WhileStatement */:
+                            case 211 /* ForStatement */:
+                            case 212 /* ForInStatement */:
+                            case 213 /* ForOfStatement */:
+                            case 209 /* DoStatement */:
+                            case 210 /* WhileStatement */:
                                 return getLoopBreakContinueOccurrences(owner);
-                            case 214 /* SwitchStatement */:
+                            case 218 /* SwitchStatement */:
                                 return getSwitchCaseDefaultOccurrences(owner);
                         }
                     }
@@ -65701,7 +68375,7 @@ var ts;
                 function getReturnOccurrences(returnStatement) {
                     var func = ts.getContainingFunction(returnStatement);
                     // If we didn't find a containing function with a block body, bail out.
-                    if (!(func && hasKind(func.body, 200 /* Block */))) {
+                    if (!(func && hasKind(func.body, 204 /* Block */))) {
                         return undefined;
                     }
                     var keywords = [];
@@ -65717,7 +68391,7 @@ var ts;
                 function getIfElseOccurrences(ifStatement) {
                     var keywords = [];
                     // Traverse upwards through all parent if-statements linked by their else-branches.
-                    while (hasKind(ifStatement.parent, 204 /* IfStatement */) && ifStatement.parent.elseStatement === ifStatement) {
+                    while (hasKind(ifStatement.parent, 208 /* IfStatement */) && ifStatement.parent.elseStatement === ifStatement) {
                         ifStatement = ifStatement.parent;
                     }
                     // Now traverse back down through the else branches, aggregating if/else keywords of if-statements.
@@ -65730,7 +68404,7 @@ var ts;
                                 break;
                             }
                         }
-                        if (!hasKind(ifStatement.elseStatement, 204 /* IfStatement */)) {
+                        if (!hasKind(ifStatement.elseStatement, 208 /* IfStatement */)) {
                             break;
                         }
                         ifStatement = ifStatement.elseStatement;
@@ -65773,7 +68447,7 @@ var ts;
          * Note: 'node' cannot be a SourceFile.
          */
         function isLabeledBy(node, labelName) {
-            for (var owner = node.parent; owner.kind === 215 /* LabeledStatement */; owner = owner.parent) {
+            for (var owner = node.parent; owner.kind === 219 /* LabeledStatement */; owner = owner.parent) {
                 if (owner.label.text === labelName) {
                     return true;
                 }
@@ -66007,12 +68681,12 @@ var ts;
             function getAliasSymbolForPropertyNameSymbol(symbol, location) {
                 if (symbol.flags & 8388608 /* Alias */) {
                     // Default import get alias
-                    var defaultImport = ts.getDeclarationOfKind(symbol, 232 /* ImportClause */);
+                    var defaultImport = ts.getDeclarationOfKind(symbol, 236 /* ImportClause */);
                     if (defaultImport) {
                         return typeChecker.getAliasedSymbol(symbol);
                     }
-                    var importOrExportSpecifier = ts.forEach(symbol.declarations, function (declaration) { return (declaration.kind === 235 /* ImportSpecifier */ ||
-                        declaration.kind === 239 /* ExportSpecifier */) ? declaration : undefined; });
+                    var importOrExportSpecifier = ts.forEach(symbol.declarations, function (declaration) { return (declaration.kind === 239 /* ImportSpecifier */ ||
+                        declaration.kind === 243 /* ExportSpecifier */) ? declaration : undefined; });
                     if (importOrExportSpecifier &&
                         // export { a }
                         (!importOrExportSpecifier.propertyName ||
@@ -66020,7 +68694,7 @@ var ts;
                             importOrExportSpecifier.propertyName === location)) {
                         // If Import specifier -> get alias
                         // else Export specifier -> get local target
-                        return importOrExportSpecifier.kind === 235 /* ImportSpecifier */ ?
+                        return importOrExportSpecifier.kind === 239 /* ImportSpecifier */ ?
                             typeChecker.getAliasedSymbol(symbol) :
                             typeChecker.getExportSpecifierLocalTargetSymbol(importOrExportSpecifier);
                     }
@@ -66035,14 +68709,14 @@ var ts;
                     typeChecker.getPropertySymbolOfDestructuringAssignment(location);
             }
             function isObjectBindingPatternElementWithoutPropertyName(symbol) {
-                var bindingElement = ts.getDeclarationOfKind(symbol, 170 /* BindingElement */);
+                var bindingElement = ts.getDeclarationOfKind(symbol, 174 /* BindingElement */);
                 return bindingElement &&
-                    bindingElement.parent.kind === 168 /* ObjectBindingPattern */ &&
+                    bindingElement.parent.kind === 172 /* ObjectBindingPattern */ &&
                     !bindingElement.propertyName;
             }
             function getPropertySymbolOfObjectBindingPatternWithoutPropertyName(symbol) {
                 if (isObjectBindingPatternElementWithoutPropertyName(symbol)) {
-                    var bindingElement = ts.getDeclarationOfKind(symbol, 170 /* BindingElement */);
+                    var bindingElement = ts.getDeclarationOfKind(symbol, 174 /* BindingElement */);
                     var typeOfPattern = typeChecker.getTypeAtLocation(bindingElement.parent);
                     return typeOfPattern && typeChecker.getPropertyOfType(typeOfPattern, bindingElement.name.text);
                 }
@@ -66072,14 +68746,14 @@ 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 valueDeclaration = symbol.valueDeclaration;
-                if (valueDeclaration && (valueDeclaration.kind === 180 /* FunctionExpression */ || valueDeclaration.kind === 193 /* ClassExpression */)) {
+                if (valueDeclaration && (valueDeclaration.kind === 184 /* FunctionExpression */ || valueDeclaration.kind === 197 /* ClassExpression */)) {
                     return valueDeclaration;
                 }
                 // If this is private property or method, the scope is the containing class
                 if (symbol.flags & (4 /* Property */ | 8192 /* Method */)) {
                     var privateDeclaration = ts.forEach(symbol.getDeclarations(), function (d) { return (ts.getModifierFlags(d) & 8 /* Private */) ? d : undefined; });
                     if (privateDeclaration) {
-                        return ts.getAncestor(privateDeclaration, 222 /* ClassDeclaration */);
+                        return ts.getAncestor(privateDeclaration, 226 /* ClassDeclaration */);
                     }
                 }
                 // If the symbol is an import we would like to find it if we are looking for what it imports.
@@ -66110,7 +68784,7 @@ var ts;
                             // Different declarations have different containers, bail out
                             return undefined;
                         }
-                        if (container.kind === 256 /* SourceFile */ && !ts.isExternalModule(container)) {
+                        if (container.kind === 261 /* SourceFile */ && !ts.isExternalModule(container)) {
                             // This is a global variable and not an external module, any declaration defined
                             // within this scope is visible outside the file
                             return undefined;
@@ -66141,8 +68815,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), 4 /* Latest */)) &&
-                        (endPosition === sourceLength || !ts.isIdentifierPart(text.charCodeAt(endPosition), 4 /* Latest */))) {
+                    if ((position === 0 || !ts.isIdentifierPart(text.charCodeAt(position - 1), 5 /* Latest */)) &&
+                        (endPosition === sourceLength || !ts.isIdentifierPart(text.charCodeAt(endPosition), 5 /* Latest */))) {
                         // Found a real match.  Keep searching.
                         positions.push(position);
                     }
@@ -66274,7 +68948,7 @@ var ts;
                                 if (localParentType.symbol && localParentType.symbol.flags & (32 /* Class */ | 64 /* Interface */) && localParentType.symbol !== searchSymbol.parent) {
                                     return [localParentType.symbol];
                                 }
-                                else if (localParentType.flags & 1572864 /* UnionOrIntersection */) {
+                                else if (localParentType.flags & 196608 /* UnionOrIntersection */) {
                                     return getSymbolsForClassAndInterfaceComponents(localParentType);
                                 }
                             }
@@ -66314,14 +68988,14 @@ var ts;
                     var result = [];
                     for (var _i = 0, _a = classSymbol.members["__constructor"].declarations; _i < _a.length; _i++) {
                         var decl = _a[_i];
-                        ts.Debug.assert(decl.kind === 149 /* Constructor */);
+                        ts.Debug.assert(decl.kind === 150 /* Constructor */);
                         var ctrKeyword = decl.getChildAt(0);
                         ts.Debug.assert(ctrKeyword.kind === 122 /* ConstructorKeyword */);
                         result.push(ctrKeyword);
                     }
                     ts.forEachProperty(classSymbol.exports, function (member) {
                         var decl = member.valueDeclaration;
-                        if (decl && decl.kind === 148 /* MethodDeclaration */) {
+                        if (decl && decl.kind === 149 /* MethodDeclaration */) {
                             var body = decl.body;
                             if (body) {
                                 forEachDescendantOfKind(body, 98 /* ThisKeyword */, function (thisKeyword) {
@@ -66344,7 +69018,7 @@ var ts;
                     var result = [];
                     for (var _i = 0, _a = ctr.declarations; _i < _a.length; _i++) {
                         var decl = _a[_i];
-                        ts.Debug.assert(decl.kind === 149 /* Constructor */);
+                        ts.Debug.assert(decl.kind === 150 /* Constructor */);
                         var body = decl.body;
                         if (body) {
                             forEachDescendantOfKind(body, 96 /* SuperKeyword */, function (node) {
@@ -66386,7 +69060,7 @@ var ts;
                     result.push(getReferenceEntryFromNode(refNode.parent));
                 }
                 else if (refNode.kind === 70 /* Identifier */) {
-                    if (refNode.parent.kind === 254 /* ShorthandPropertyAssignment */) {
+                    if (refNode.parent.kind === 258 /* ShorthandPropertyAssignment */) {
                         // Go ahead and dereference the shorthand assignment by going to its definition
                         getReferenceEntriesForShorthandPropertyAssignment(refNode, typeChecker, result);
                     }
@@ -66399,24 +69073,24 @@ var ts;
                     // If we got a type reference, try and see if the reference applies to any expressions that can implement an interface
                     var containingTypeReference = getContainingTypeReference(refNode);
                     if (containingTypeReference) {
-                        var parent_21 = containingTypeReference.parent;
-                        if (ts.isVariableLike(parent_21) && parent_21.type === containingTypeReference && parent_21.initializer && isImplementationExpression(parent_21.initializer)) {
-                            maybeAdd(getReferenceEntryFromNode(parent_21.initializer));
+                        var parent_19 = containingTypeReference.parent;
+                        if (ts.isVariableLike(parent_19) && parent_19.type === containingTypeReference && parent_19.initializer && isImplementationExpression(parent_19.initializer)) {
+                            maybeAdd(getReferenceEntryFromNode(parent_19.initializer));
                         }
-                        else if (ts.isFunctionLike(parent_21) && parent_21.type === containingTypeReference && parent_21.body) {
-                            if (parent_21.body.kind === 200 /* Block */) {
-                                ts.forEachReturnStatement(parent_21.body, function (returnStatement) {
+                        else if (ts.isFunctionLike(parent_19) && parent_19.type === containingTypeReference && parent_19.body) {
+                            if (parent_19.body.kind === 204 /* Block */) {
+                                ts.forEachReturnStatement(parent_19.body, function (returnStatement) {
                                     if (returnStatement.expression && isImplementationExpression(returnStatement.expression)) {
                                         maybeAdd(getReferenceEntryFromNode(returnStatement.expression));
                                     }
                                 });
                             }
-                            else if (isImplementationExpression(parent_21.body)) {
-                                maybeAdd(getReferenceEntryFromNode(parent_21.body));
+                            else if (isImplementationExpression(parent_19.body)) {
+                                maybeAdd(getReferenceEntryFromNode(parent_19.body));
                             }
                         }
-                        else if (ts.isAssertionExpression(parent_21) && isImplementationExpression(parent_21.expression)) {
-                            maybeAdd(getReferenceEntryFromNode(parent_21.expression));
+                        else if (ts.isAssertionExpression(parent_19) && isImplementationExpression(parent_19.expression)) {
+                            maybeAdd(getReferenceEntryFromNode(parent_19.expression));
                         }
                     }
                 }
@@ -66438,7 +69112,7 @@ var ts;
                     if (componentType.symbol && componentType.symbol.getFlags() & (32 /* Class */ | 64 /* Interface */)) {
                         result.push(componentType.symbol);
                     }
-                    if (componentType.getFlags() & 1572864 /* UnionOrIntersection */) {
+                    if (componentType.getFlags() & 196608 /* UnionOrIntersection */) {
                         getSymbolsForClassAndInterfaceComponents(componentType, result);
                     }
                 }
@@ -66456,12 +69130,12 @@ var ts;
             }
             function getContainingClassIfInHeritageClause(node) {
                 if (node && node.parent) {
-                    if (node.kind === 195 /* ExpressionWithTypeArguments */
-                        && node.parent.kind === 251 /* HeritageClause */
+                    if (node.kind === 199 /* ExpressionWithTypeArguments */
+                        && node.parent.kind === 255 /* HeritageClause */
                         && ts.isClassLike(node.parent.parent)) {
                         return node.parent.parent;
                     }
-                    else if (node.kind === 70 /* Identifier */ || node.kind === 173 /* PropertyAccessExpression */) {
+                    else if (node.kind === 70 /* Identifier */ || node.kind === 177 /* PropertyAccessExpression */) {
                         return getContainingClassIfInHeritageClause(node.parent);
                     }
                 }
@@ -66472,14 +69146,14 @@ var ts;
              */
             function isImplementationExpression(node) {
                 // Unwrap parentheses
-                if (node.kind === 179 /* ParenthesizedExpression */) {
+                if (node.kind === 183 /* ParenthesizedExpression */) {
                     return isImplementationExpression(node.expression);
                 }
-                return node.kind === 181 /* ArrowFunction */ ||
-                    node.kind === 180 /* FunctionExpression */ ||
-                    node.kind === 172 /* ObjectLiteralExpression */ ||
-                    node.kind === 193 /* ClassExpression */ ||
-                    node.kind === 171 /* ArrayLiteralExpression */;
+                return node.kind === 185 /* ArrowFunction */ ||
+                    node.kind === 184 /* FunctionExpression */ ||
+                    node.kind === 176 /* ObjectLiteralExpression */ ||
+                    node.kind === 197 /* ClassExpression */ ||
+                    node.kind === 175 /* ArrayLiteralExpression */;
             }
             /**
              * Determines if the parent symbol occurs somewhere in the child's ancestry. If the parent symbol
@@ -66528,7 +69202,7 @@ var ts;
                             }
                             return searchTypeReference(ts.getClassExtendsHeritageClauseElement(declaration));
                         }
-                        else if (declaration.kind === 223 /* InterfaceDeclaration */) {
+                        else if (declaration.kind === 227 /* InterfaceDeclaration */) {
                             if (parentIsInterface) {
                                 return ts.forEach(ts.getInterfaceBaseTypeNodes(declaration), searchTypeReference);
                             }
@@ -66556,13 +69230,13 @@ var ts;
                 // Whether 'super' occurs in a static context within a class.
                 var staticFlag = 32 /* Static */;
                 switch (searchSpaceNode.kind) {
-                    case 146 /* PropertyDeclaration */:
-                    case 145 /* PropertySignature */:
-                    case 148 /* MethodDeclaration */:
-                    case 147 /* MethodSignature */:
-                    case 149 /* Constructor */:
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
+                    case 147 /* PropertyDeclaration */:
+                    case 146 /* PropertySignature */:
+                    case 149 /* MethodDeclaration */:
+                    case 148 /* MethodSignature */:
+                    case 150 /* Constructor */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* SetAccessor */:
                         staticFlag &= ts.getModifierFlags(searchSpaceNode);
                         searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class
                         break;
@@ -66594,27 +69268,27 @@ var ts;
                 // Whether 'this' occurs in a static context within a class.
                 var staticFlag = 32 /* Static */;
                 switch (searchSpaceNode.kind) {
-                    case 148 /* MethodDeclaration */:
-                    case 147 /* MethodSignature */:
+                    case 149 /* MethodDeclaration */:
+                    case 148 /* MethodSignature */:
                         if (ts.isObjectLiteralMethod(searchSpaceNode)) {
                             break;
                         }
                     // fall through
-                    case 146 /* PropertyDeclaration */:
-                    case 145 /* PropertySignature */:
-                    case 149 /* Constructor */:
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
+                    case 147 /* PropertyDeclaration */:
+                    case 146 /* PropertySignature */:
+                    case 150 /* Constructor */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* SetAccessor */:
                         staticFlag &= ts.getModifierFlags(searchSpaceNode);
                         searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class
                         break;
-                    case 256 /* SourceFile */:
+                    case 261 /* SourceFile */:
                         if (ts.isExternalModule(searchSpaceNode)) {
                             return undefined;
                         }
                     // Fall through
-                    case 221 /* FunctionDeclaration */:
-                    case 180 /* FunctionExpression */:
+                    case 225 /* FunctionDeclaration */:
+                    case 184 /* 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.
@@ -66623,7 +69297,7 @@ var ts;
                 }
                 var references = [];
                 var possiblePositions;
-                if (searchSpaceNode.kind === 256 /* SourceFile */) {
+                if (searchSpaceNode.kind === 261 /* SourceFile */) {
                     ts.forEach(sourceFiles, function (sourceFile) {
                         possiblePositions = getPossibleSymbolReferencePositions(sourceFile, "this", sourceFile.getStart(), sourceFile.getEnd());
                         getThisReferencesInFile(sourceFile, sourceFile, possiblePositions, references);
@@ -66657,28 +69331,28 @@ var ts;
                         }
                         var container = ts.getThisContainer(node, /* includeArrowFunctions */ false);
                         switch (searchSpaceNode.kind) {
-                            case 180 /* FunctionExpression */:
-                            case 221 /* FunctionDeclaration */:
+                            case 184 /* FunctionExpression */:
+                            case 225 /* FunctionDeclaration */:
                                 if (searchSpaceNode.symbol === container.symbol) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
-                            case 148 /* MethodDeclaration */:
-                            case 147 /* MethodSignature */:
+                            case 149 /* MethodDeclaration */:
+                            case 148 /* MethodSignature */:
                                 if (ts.isObjectLiteralMethod(searchSpaceNode) && searchSpaceNode.symbol === container.symbol) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
-                            case 193 /* ClassExpression */:
-                            case 222 /* ClassDeclaration */:
+                            case 197 /* ClassExpression */:
+                            case 226 /* ClassDeclaration */:
                                 // Make sure the container belongs to the same class
                                 // and has the appropriate static modifier from the original container.
                                 if (container.parent && searchSpaceNode.symbol === container.parent.symbol && (ts.getModifierFlags(container) & 32 /* Static */) === staticFlag) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
-                            case 256 /* SourceFile */:
-                                if (container.kind === 256 /* SourceFile */ && !ts.isExternalModule(container)) {
+                            case 261 /* SourceFile */:
+                                if (container.kind === 261 /* SourceFile */ && !ts.isExternalModule(container)) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
@@ -66718,8 +69392,8 @@ var ts;
                         if (!node_2 || node_2.kind !== 9 /* StringLiteral */) {
                             return;
                         }
-                        var type_1 = ts.getStringLiteralTypeForNode(node_2, typeChecker);
-                        if (type_1 === searchType) {
+                        var type_2 = ts.getStringLiteralTypeForNode(node_2, typeChecker);
+                        if (type_2 === searchType) {
                             references.push(getReferenceEntryFromNode(node_2));
                         }
                     }
@@ -66732,7 +69406,7 @@ var ts;
                 // Search the property symbol
                 //      for ( { property: p2 } of elems) { }
                 var containingObjectLiteralElement = getContainingObjectLiteralElement(location);
-                if (containingObjectLiteralElement && containingObjectLiteralElement.kind !== 254 /* ShorthandPropertyAssignment */) {
+                if (containingObjectLiteralElement && containingObjectLiteralElement.kind !== 258 /* ShorthandPropertyAssignment */) {
                     var propertySymbol = getPropertySymbolOfDestructuringAssignment(location);
                     if (propertySymbol) {
                         result.push(propertySymbol);
@@ -66780,7 +69454,7 @@ var ts;
                 // we should include both parameter declaration symbol and property declaration symbol
                 // Parameter Declaration symbol is only visible within function scope, so the symbol is stored in constructor.locals.
                 // Property Declaration symbol is a member of the class, so the symbol is stored in its class Declaration.symbol.members
-                if (symbol.valueDeclaration && symbol.valueDeclaration.kind === 143 /* Parameter */ &&
+                if (symbol.valueDeclaration && symbol.valueDeclaration.kind === 144 /* Parameter */ &&
                     ts.isParameterPropertyDeclaration(symbol.valueDeclaration)) {
                     result = result.concat(typeChecker.getSymbolsOfParameterPropertyDeclaration(symbol.valueDeclaration, symbol.name));
                 }
@@ -66835,7 +69509,7 @@ var ts;
                             getPropertySymbolFromTypeReference(ts.getClassExtendsHeritageClauseElement(declaration));
                             ts.forEach(ts.getClassImplementsHeritageClauseElements(declaration), getPropertySymbolFromTypeReference);
                         }
-                        else if (declaration.kind === 223 /* InterfaceDeclaration */) {
+                        else if (declaration.kind === 227 /* InterfaceDeclaration */) {
                             ts.forEach(ts.getInterfaceBaseTypeNodes(declaration), getPropertySymbolFromTypeReference);
                         }
                     });
@@ -66919,7 +69593,7 @@ var ts;
                 });
             }
             function getNameFromObjectLiteralElement(node) {
-                if (node.name.kind === 141 /* ComputedPropertyName */) {
+                if (node.name.kind === 142 /* ComputedPropertyName */) {
                     var nameExpression = node.name.expression;
                     // treat computed property names where expression is string/numeric literal as just string/numeric literal
                     if (ts.isStringOrNumericLiteral(nameExpression.kind)) {
@@ -66939,7 +69613,7 @@ var ts;
                     if (symbol_2) {
                         result_4.push(symbol_2);
                     }
-                    if (contextualType.flags & 524288 /* Union */) {
+                    if (contextualType.flags & 65536 /* Union */) {
                         ts.forEach(contextualType.types, function (t) {
                             var symbol = t.getProperty(name);
                             if (symbol) {
@@ -67001,7 +69675,7 @@ var ts;
                 if (node.initializer) {
                     return true;
                 }
-                else if (node.kind === 219 /* VariableDeclaration */) {
+                else if (node.kind === 223 /* VariableDeclaration */) {
                     var parentStatement = getParentStatementOfVariableDeclaration(node);
                     return parentStatement && ts.hasModifier(parentStatement, 2 /* Ambient */);
                 }
@@ -67011,18 +69685,18 @@ var ts;
             }
             else {
                 switch (node.kind) {
-                    case 222 /* ClassDeclaration */:
-                    case 193 /* ClassExpression */:
-                    case 225 /* EnumDeclaration */:
-                    case 226 /* ModuleDeclaration */:
+                    case 226 /* ClassDeclaration */:
+                    case 197 /* ClassExpression */:
+                    case 229 /* EnumDeclaration */:
+                    case 230 /* ModuleDeclaration */:
                         return true;
                 }
             }
             return false;
         }
         function getParentStatementOfVariableDeclaration(node) {
-            if (node.parent && node.parent.parent && node.parent.parent.kind === 201 /* VariableStatement */) {
-                ts.Debug.assert(node.parent.kind === 220 /* VariableDeclarationList */);
+            if (node.parent && node.parent.parent && node.parent.parent.kind === 205 /* VariableStatement */) {
+                ts.Debug.assert(node.parent.kind === 224 /* VariableDeclarationList */);
                 return node.parent.parent;
             }
         }
@@ -67061,10 +69735,10 @@ var ts;
             }
             var parent = node.parent;
             if (parent) {
-                if (parent.kind === 187 /* PostfixUnaryExpression */ || parent.kind === 186 /* PrefixUnaryExpression */) {
+                if (parent.kind === 191 /* PostfixUnaryExpression */ || parent.kind === 190 /* PrefixUnaryExpression */) {
                     return true;
                 }
-                else if (parent.kind === 188 /* BinaryExpression */ && parent.left === node) {
+                else if (parent.kind === 192 /* BinaryExpression */ && parent.left === node) {
                     var operator = parent.operatorToken.kind;
                     return 57 /* FirstAssignment */ <= operator && operator <= 69 /* LastAssignment */;
                 }
@@ -67086,7 +69760,7 @@ var ts;
             switch (node.kind) {
                 case 9 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
-                    if (node.parent.kind === 141 /* ComputedPropertyName */) {
+                    if (node.parent.kind === 142 /* ComputedPropertyName */) {
                         return isObjectLiteralPropertyDeclaration(node.parent.parent) ? node.parent.parent : undefined;
                     }
                 // intential fall through
@@ -67097,11 +69771,11 @@ var ts;
         }
         function isObjectLiteralPropertyDeclaration(node) {
             switch (node.kind) {
-                case 253 /* PropertyAssignment */:
-                case 254 /* ShorthandPropertyAssignment */:
-                case 148 /* MethodDeclaration */:
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
+                case 257 /* PropertyAssignment */:
+                case 258 /* ShorthandPropertyAssignment */:
+                case 149 /* MethodDeclaration */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
                     return true;
             }
             return false;
@@ -67176,7 +69850,7 @@ var ts;
                 //
                 if (node.kind === 70 /* Identifier */ &&
                     (node.parent === declaration ||
-                        (declaration.kind === 235 /* ImportSpecifier */ && declaration.parent && declaration.parent.kind === 234 /* NamedImports */))) {
+                        (declaration.kind === 239 /* ImportSpecifier */ && declaration.parent && declaration.parent.kind === 238 /* NamedImports */))) {
                     symbol = typeChecker.getAliasedSymbol(symbol);
                 }
             }
@@ -67185,7 +69859,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 === 254 /* ShorthandPropertyAssignment */) {
+            if (node.parent.kind === 258 /* ShorthandPropertyAssignment */) {
                 var shorthandSymbol = typeChecker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration);
                 if (!shorthandSymbol) {
                     return [];
@@ -67213,7 +69887,7 @@ var ts;
             if (!type) {
                 return undefined;
             }
-            if (type.flags & 524288 /* Union */ && !(type.flags & 16 /* Enum */)) {
+            if (type.flags & 65536 /* Union */ && !(type.flags & 16 /* Enum */)) {
                 var result_5 = [];
                 ts.forEach(type.types, function (t) {
                     if (t.symbol) {
@@ -67268,8 +69942,8 @@ var ts;
                 var declarations = [];
                 var definition;
                 ts.forEach(signatureDeclarations, function (d) {
-                    if ((selectConstructors && d.kind === 149 /* Constructor */) ||
-                        (!selectConstructors && (d.kind === 221 /* FunctionDeclaration */ || d.kind === 148 /* MethodDeclaration */ || d.kind === 147 /* MethodSignature */))) {
+                    if ((selectConstructors && d.kind === 150 /* Constructor */) ||
+                        (!selectConstructors && (d.kind === 225 /* FunctionDeclaration */ || d.kind === 149 /* MethodDeclaration */ || d.kind === 148 /* MethodSignature */))) {
                         declarations.push(d);
                         if (d.body)
                             definition = d;
@@ -67349,7 +70023,7 @@ var ts;
         function getImplementationAtPosition(typeChecker, cancellationToken, sourceFiles, node) {
             // 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 === 254 /* ShorthandPropertyAssignment */) {
+            if (node.parent.kind === 258 /* ShorthandPropertyAssignment */) {
                 var result = [];
                 ts.FindAllReferences.getReferenceEntriesForShorthandPropertyAssignment(node, typeChecker, result);
                 return result.length > 0 ? result : undefined;
@@ -67515,19 +70189,19 @@ var ts;
             var commentOwner;
             findOwner: for (commentOwner = tokenAtPos; commentOwner; commentOwner = commentOwner.parent) {
                 switch (commentOwner.kind) {
-                    case 221 /* FunctionDeclaration */:
-                    case 148 /* MethodDeclaration */:
-                    case 149 /* Constructor */:
-                    case 222 /* ClassDeclaration */:
-                    case 201 /* VariableStatement */:
+                    case 225 /* FunctionDeclaration */:
+                    case 149 /* MethodDeclaration */:
+                    case 150 /* Constructor */:
+                    case 226 /* ClassDeclaration */:
+                    case 205 /* VariableStatement */:
                         break findOwner;
-                    case 256 /* SourceFile */:
+                    case 261 /* SourceFile */:
                         return undefined;
-                    case 226 /* ModuleDeclaration */:
+                    case 230 /* 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 { }'.
-                        if (commentOwner.parent.kind === 226 /* ModuleDeclaration */) {
+                        if (commentOwner.parent.kind === 230 /* ModuleDeclaration */) {
                             return undefined;
                         }
                         break findOwner;
@@ -67568,7 +70242,7 @@ var ts;
             if (ts.isFunctionLike(commentOwner)) {
                 return commentOwner.parameters;
             }
-            if (commentOwner.kind === 201 /* VariableStatement */) {
+            if (commentOwner.kind === 205 /* VariableStatement */) {
                 var varStatement = commentOwner;
                 var varDeclarations = varStatement.declarationList.declarations;
                 if (varDeclarations.length === 1 && varDeclarations[0].initializer) {
@@ -67586,17 +70260,17 @@ var ts;
          * @returns the parameters of a signature found on the RHS if one exists; otherwise 'emptyArray'.
          */
         function getParametersFromRightHandSideOfAssignment(rightHandSide) {
-            while (rightHandSide.kind === 179 /* ParenthesizedExpression */) {
+            while (rightHandSide.kind === 183 /* ParenthesizedExpression */) {
                 rightHandSide = rightHandSide.expression;
             }
             switch (rightHandSide.kind) {
-                case 180 /* FunctionExpression */:
-                case 181 /* ArrowFunction */:
+                case 184 /* FunctionExpression */:
+                case 185 /* ArrowFunction */:
                     return rightHandSide.parameters;
-                case 193 /* ClassExpression */:
+                case 197 /* ClassExpression */:
                     for (var _i = 0, _a = rightHandSide.members; _i < _a.length; _i++) {
                         var member = _a[_i];
-                        if (member.kind === 149 /* Constructor */) {
+                        if (member.kind === 150 /* Constructor */) {
                             return member.parameters;
                         }
                     }
@@ -67622,6 +70296,16 @@ var ts;
         // that we are confident require typings
         var safeList;
         var EmptySafeList = ts.createMap();
+        /* @internal */
+        JsTyping.nodeCoreModuleList = [
+            "buffer", "querystring", "events", "http", "cluster",
+            "zlib", "os", "https", "punycode", "repl", "readline",
+            "vm", "child_process", "url", "dns", "net",
+            "dgram", "fs", "path", "string_decoder", "tls",
+            "crypto", "stream", "util", "assert", "tty", "domain",
+            "constants", "process", "v8", "timers", "console"
+        ];
+        var nodeCoreModules = ts.arrayToMap(JsTyping.nodeCoreModuleList, function (x) { return x; });
         /**
          * @param host is the object providing I/O related operations.
          * @param fileNames are the file names that belong to the same project
@@ -67631,7 +70315,7 @@ var ts;
          * @param typingOptions are used to customize the typing inference process
          * @param compilerOptions are used as a source for typing inference
          */
-        function discoverTypings(host, fileNames, projectRootPath, safeListPath, packageNameToTypingLocation, typingOptions) {
+        function discoverTypings(host, fileNames, projectRootPath, safeListPath, packageNameToTypingLocation, typingOptions, unresolvedImports) {
             // A typing name to typing file path mapping
             var inferredTypings = ts.createMap();
             if (!typingOptions || !typingOptions.enableAutoDiscovery) {
@@ -67653,7 +70337,7 @@ var ts;
             mergeTypings(typingOptions.include);
             exclude = typingOptions.exclude || [];
             var possibleSearchDirs = ts.map(fileNames, ts.getDirectoryPath);
-            if (projectRootPath !== undefined) {
+            if (projectRootPath) {
                 possibleSearchDirs.push(projectRootPath);
             }
             searchDirs = ts.deduplicate(possibleSearchDirs);
@@ -67667,15 +70351,25 @@ var ts;
                 getTypingNamesFromNodeModuleFolder(nodeModulesPath);
             }
             getTypingNamesFromSourceFileNames(fileNames);
+            // add typings for unresolved imports
+            if (unresolvedImports) {
+                for (var _a = 0, unresolvedImports_1 = unresolvedImports; _a < unresolvedImports_1.length; _a++) {
+                    var moduleId = unresolvedImports_1[_a];
+                    var typingName = moduleId in nodeCoreModules ? "node" : moduleId;
+                    if (!(typingName in inferredTypings)) {
+                        inferredTypings[typingName] = undefined;
+                    }
+                }
+            }
             // Add the cached typing locations for inferred typings that are already installed
-            for (var name_48 in packageNameToTypingLocation) {
-                if (name_48 in inferredTypings && !inferredTypings[name_48]) {
-                    inferredTypings[name_48] = packageNameToTypingLocation[name_48];
+            for (var name_44 in packageNameToTypingLocation) {
+                if (name_44 in inferredTypings && !inferredTypings[name_44]) {
+                    inferredTypings[name_44] = packageNameToTypingLocation[name_44];
                 }
             }
             // Remove typings that the user has added to the exclude list
-            for (var _a = 0, exclude_1 = exclude; _a < exclude_1.length; _a++) {
-                var excludeTypingName = exclude_1[_a];
+            for (var _b = 0, exclude_1 = exclude; _b < exclude_1.length; _b++) {
+                var excludeTypingName = exclude_1[_b];
                 delete inferredTypings[excludeTypingName];
             }
             var newTypingNames = [];
@@ -67707,10 +70401,12 @@ var ts;
              * Get the typing info from common package manager json files like package.json or bower.json
              */
             function getTypingNamesFromJson(jsonPath, filesToWatch) {
+                if (host.fileExists(jsonPath)) {
+                    filesToWatch.push(jsonPath);
+                }
                 var result = ts.readConfigFile(jsonPath, function (path) { return host.readFile(path); });
                 if (result.config) {
                     var jsonConfig = result.config;
-                    filesToWatch.push(jsonPath);
                     if (jsonConfig.dependencies) {
                         mergeTypings(ts.getOwnKeys(jsonConfig.dependencies));
                     }
@@ -67806,12 +70502,12 @@ var ts;
                     return;
                 }
                 var nameToDeclarations = sourceFile.getNamedDeclarations();
-                for (var name_49 in nameToDeclarations) {
-                    var declarations = nameToDeclarations[name_49];
+                for (var name_45 in nameToDeclarations) {
+                    var declarations = nameToDeclarations[name_45];
                     if (declarations) {
                         // First do a quick check to see if the name of the declaration matches the
                         // last portion of the (possibly) dotted name they're searching for.
-                        var matches = patternMatcher.getMatchesForLastSegmentOfPattern(name_49);
+                        var matches = patternMatcher.getMatchesForLastSegmentOfPattern(name_45);
                         if (!matches) {
                             continue;
                         }
@@ -67824,14 +70520,14 @@ var ts;
                                 if (!containers) {
                                     return undefined;
                                 }
-                                matches = patternMatcher.getMatches(containers, name_49);
+                                matches = patternMatcher.getMatches(containers, name_45);
                                 if (!matches) {
                                     continue;
                                 }
                             }
                             var fileName = sourceFile.fileName;
                             var matchKind = bestMatchKind(matches);
-                            rawItems.push({ name: name_49, fileName: fileName, matchKind: matchKind, isCaseSensitive: allMatchesAreCaseSensitive(matches), declaration: declaration });
+                            rawItems.push({ name: name_45, fileName: fileName, matchKind: matchKind, isCaseSensitive: allMatchesAreCaseSensitive(matches), declaration: declaration });
                         }
                     }
                 }
@@ -67839,7 +70535,7 @@ var ts;
             // Remove imports when the imported declaration is already in the list and has the same name.
             rawItems = ts.filter(rawItems, function (item) {
                 var decl = item.declaration;
-                if (decl.kind === 232 /* ImportClause */ || decl.kind === 235 /* ImportSpecifier */ || decl.kind === 230 /* ImportEqualsDeclaration */) {
+                if (decl.kind === 236 /* ImportClause */ || decl.kind === 239 /* ImportSpecifier */ || decl.kind === 234 /* ImportEqualsDeclaration */) {
                     var importer = checker.getSymbolAtLocation(decl.name);
                     var imported = checker.getAliasedSymbol(importer);
                     return importer.name !== imported.name;
@@ -67881,7 +70577,7 @@ var ts;
                     if (text !== undefined) {
                         containers.unshift(text);
                     }
-                    else if (declaration.name.kind === 141 /* ComputedPropertyName */) {
+                    else if (declaration.name.kind === 142 /* ComputedPropertyName */) {
                         return tryAddComputedPropertyName(declaration.name.expression, containers, /*includeLastPortion*/ true);
                     }
                     else {
@@ -67902,7 +70598,7 @@ var ts;
                     }
                     return true;
                 }
-                if (expression.kind === 173 /* PropertyAccessExpression */) {
+                if (expression.kind === 177 /* PropertyAccessExpression */) {
                     var propertyAccess = expression;
                     if (includeLastPortion) {
                         containers.unshift(propertyAccess.name.text);
@@ -67915,7 +70611,7 @@ var ts;
                 var containers = [];
                 // First, if we started with a computed property name, then add all but the last
                 // portion into the container array.
-                if (declaration.name.kind === 141 /* ComputedPropertyName */) {
+                if (declaration.name.kind === 142 /* ComputedPropertyName */) {
                     if (!tryAddComputedPropertyName(declaration.name.expression, containers, /*includeLastPortion*/ false)) {
                         return undefined;
                     }
@@ -68068,7 +70764,7 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 149 /* Constructor */:
+                case 150 /* 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);
@@ -68080,21 +70776,21 @@ var ts;
                         }
                     }
                     break;
-                case 148 /* MethodDeclaration */:
-                case 150 /* GetAccessor */:
-                case 151 /* SetAccessor */:
-                case 147 /* MethodSignature */:
+                case 149 /* MethodDeclaration */:
+                case 151 /* GetAccessor */:
+                case 152 /* SetAccessor */:
+                case 148 /* MethodSignature */:
                     if (!ts.hasDynamicName(node)) {
                         addNodeWithRecursiveChild(node, node.body);
                     }
                     break;
-                case 146 /* PropertyDeclaration */:
-                case 145 /* PropertySignature */:
+                case 147 /* PropertyDeclaration */:
+                case 146 /* PropertySignature */:
                     if (!ts.hasDynamicName(node)) {
                         addLeafNode(node);
                     }
                     break;
-                case 232 /* ImportClause */:
+                case 236 /* ImportClause */:
                     var importClause = node;
                     // Handle default import case e.g.:
                     //    import d from "mod";
@@ -68106,7 +70802,7 @@ var ts;
                     //    import {a, b as B} from "mod";
                     var namedBindings = importClause.namedBindings;
                     if (namedBindings) {
-                        if (namedBindings.kind === 233 /* NamespaceImport */) {
+                        if (namedBindings.kind === 237 /* NamespaceImport */) {
                             addLeafNode(namedBindings);
                         }
                         else {
@@ -68117,12 +70813,12 @@ var ts;
                         }
                     }
                     break;
-                case 170 /* BindingElement */:
-                case 219 /* VariableDeclaration */:
+                case 174 /* BindingElement */:
+                case 223 /* VariableDeclaration */:
                     var decl = node;
-                    var name_50 = decl.name;
-                    if (ts.isBindingPattern(name_50)) {
-                        addChildrenRecursively(name_50);
+                    var name_46 = decl.name;
+                    if (ts.isBindingPattern(name_46)) {
+                        addChildrenRecursively(name_46);
                     }
                     else if (decl.initializer && isFunctionOrClassExpression(decl.initializer)) {
                         // For `const x = function() {}`, just use the function node, not the const.
@@ -68132,12 +70828,12 @@ var ts;
                         addNodeWithRecursiveChild(decl, decl.initializer);
                     }
                     break;
-                case 181 /* ArrowFunction */:
-                case 221 /* FunctionDeclaration */:
-                case 180 /* FunctionExpression */:
+                case 185 /* ArrowFunction */:
+                case 225 /* FunctionDeclaration */:
+                case 184 /* FunctionExpression */:
                     addNodeWithRecursiveChild(node, node.body);
                     break;
-                case 225 /* EnumDeclaration */:
+                case 229 /* EnumDeclaration */:
                     startNode(node);
                     for (var _d = 0, _e = node.members; _d < _e.length; _d++) {
                         var member = _e[_d];
@@ -68147,9 +70843,9 @@ var ts;
                     }
                     endNode();
                     break;
-                case 222 /* ClassDeclaration */:
-                case 193 /* ClassExpression */:
-                case 223 /* InterfaceDeclaration */:
+                case 226 /* ClassDeclaration */:
+                case 197 /* ClassExpression */:
+                case 227 /* InterfaceDeclaration */:
                     startNode(node);
                     for (var _f = 0, _g = node.members; _f < _g.length; _f++) {
                         var member = _g[_f];
@@ -68157,21 +70853,21 @@ var ts;
                     }
                     endNode();
                     break;
-                case 226 /* ModuleDeclaration */:
+                case 230 /* ModuleDeclaration */:
                     addNodeWithRecursiveChild(node, getInteriorModule(node).body);
                     break;
-                case 239 /* ExportSpecifier */:
-                case 230 /* ImportEqualsDeclaration */:
-                case 154 /* IndexSignature */:
-                case 152 /* CallSignature */:
-                case 153 /* ConstructSignature */:
-                case 224 /* TypeAliasDeclaration */:
+                case 243 /* ExportSpecifier */:
+                case 234 /* ImportEqualsDeclaration */:
+                case 155 /* IndexSignature */:
+                case 153 /* CallSignature */:
+                case 154 /* ConstructSignature */:
+                case 228 /* TypeAliasDeclaration */:
                     addLeafNode(node);
                     break;
                 default:
                     ts.forEach(node.jsDocComments, function (jsDocComment) {
                         ts.forEach(jsDocComment.tags, function (tag) {
-                            if (tag.kind === 279 /* JSDocTypedefTag */) {
+                            if (tag.kind === 284 /* JSDocTypedefTag */) {
                                 addLeafNode(tag);
                             }
                         });
@@ -68222,14 +70918,14 @@ var ts;
             });
             /** a and b have the same name, but they may not be mergeable. */
             function shouldReallyMerge(a, b) {
-                return a.kind === b.kind && (a.kind !== 226 /* ModuleDeclaration */ || areSameModule(a, b));
+                return a.kind === b.kind && (a.kind !== 230 /* ModuleDeclaration */ || areSameModule(a, b));
                 // We use 1 NavNode to represent 'A.B.C', but there are multiple source nodes.
                 // Only merge module nodes that have the same chain. Don't merge 'A.B.C' with 'A'!
                 function areSameModule(a, b) {
                     if (a.body.kind !== b.body.kind) {
                         return false;
                     }
-                    if (a.body.kind !== 226 /* ModuleDeclaration */) {
+                    if (a.body.kind !== 230 /* ModuleDeclaration */) {
                         return true;
                     }
                     return areSameModule(a.body, b.body);
@@ -68289,7 +70985,7 @@ var ts;
          * So `new()` can still come before an `aardvark` method.
          */
         function tryGetName(node) {
-            if (node.kind === 226 /* ModuleDeclaration */) {
+            if (node.kind === 230 /* ModuleDeclaration */) {
                 return getModuleName(node);
             }
             var decl = node;
@@ -68297,18 +70993,18 @@ var ts;
                 return ts.getPropertyNameForPropertyNameNode(decl.name);
             }
             switch (node.kind) {
-                case 180 /* FunctionExpression */:
-                case 181 /* ArrowFunction */:
-                case 193 /* ClassExpression */:
+                case 184 /* FunctionExpression */:
+                case 185 /* ArrowFunction */:
+                case 197 /* ClassExpression */:
                     return getFunctionOrClassName(node);
-                case 279 /* JSDocTypedefTag */:
+                case 284 /* JSDocTypedefTag */:
                     return getJSDocTypedefTagName(node);
                 default:
                     return undefined;
             }
         }
         function getItemName(node) {
-            if (node.kind === 226 /* ModuleDeclaration */) {
+            if (node.kind === 230 /* ModuleDeclaration */) {
                 return getModuleName(node);
             }
             var name = node.name;
@@ -68319,29 +71015,32 @@ var ts;
                 }
             }
             switch (node.kind) {
-                case 256 /* SourceFile */:
+                case 261 /* SourceFile */:
                     var sourceFile = node;
                     return ts.isExternalModule(sourceFile)
                         ? "\"" + ts.escapeString(ts.getBaseFileName(ts.removeFileExtension(ts.normalizePath(sourceFile.fileName)))) + "\""
                         : "<global>";
-                case 181 /* ArrowFunction */:
-                case 221 /* FunctionDeclaration */:
-                case 180 /* FunctionExpression */:
-                case 222 /* ClassDeclaration */:
-                case 193 /* ClassExpression */:
+                case 185 /* ArrowFunction */:
+                case 225 /* FunctionDeclaration */:
+                case 184 /* FunctionExpression */:
+                case 226 /* ClassDeclaration */:
+                case 197 /* ClassExpression */:
                     if (ts.getModifierFlags(node) & 512 /* Default */) {
                         return "default";
                     }
+                    // We may get a string with newlines or other whitespace in the case of an object dereference
+                    // (eg: "app\n.onactivated"), so we should remove the whitespace for readabiltiy in the
+                    // navigation bar.
                     return getFunctionOrClassName(node);
-                case 149 /* Constructor */:
+                case 150 /* Constructor */:
                     return "constructor";
-                case 153 /* ConstructSignature */:
+                case 154 /* ConstructSignature */:
                     return "new()";
-                case 152 /* CallSignature */:
+                case 153 /* CallSignature */:
                     return "()";
-                case 154 /* IndexSignature */:
+                case 155 /* IndexSignature */:
                     return "[]";
-                case 279 /* JSDocTypedefTag */:
+                case 284 /* JSDocTypedefTag */:
                     return getJSDocTypedefTagName(node);
                 default:
                     return "<unknown>";
@@ -68353,7 +71052,7 @@ var ts;
             }
             else {
                 var parentNode = node.parent && node.parent.parent;
-                if (parentNode && parentNode.kind === 201 /* VariableStatement */) {
+                if (parentNode && parentNode.kind === 205 /* VariableStatement */) {
                     if (parentNode.declarationList.declarations.length > 0) {
                         var nameIdentifier = parentNode.declarationList.declarations[0].name;
                         if (nameIdentifier.kind === 70 /* Identifier */) {
@@ -68382,24 +71081,24 @@ var ts;
             return topLevel;
             function isTopLevel(item) {
                 switch (navigationBarNodeKind(item)) {
-                    case 222 /* ClassDeclaration */:
-                    case 193 /* ClassExpression */:
-                    case 225 /* EnumDeclaration */:
-                    case 223 /* InterfaceDeclaration */:
-                    case 226 /* ModuleDeclaration */:
-                    case 256 /* SourceFile */:
-                    case 224 /* TypeAliasDeclaration */:
-                    case 279 /* JSDocTypedefTag */:
+                    case 226 /* ClassDeclaration */:
+                    case 197 /* ClassExpression */:
+                    case 229 /* EnumDeclaration */:
+                    case 227 /* InterfaceDeclaration */:
+                    case 230 /* ModuleDeclaration */:
+                    case 261 /* SourceFile */:
+                    case 228 /* TypeAliasDeclaration */:
+                    case 284 /* JSDocTypedefTag */:
                         return true;
-                    case 149 /* Constructor */:
-                    case 148 /* MethodDeclaration */:
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
-                    case 219 /* VariableDeclaration */:
+                    case 150 /* Constructor */:
+                    case 149 /* MethodDeclaration */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* SetAccessor */:
+                    case 223 /* VariableDeclaration */:
                         return hasSomeImportantChild(item);
-                    case 181 /* ArrowFunction */:
-                    case 221 /* FunctionDeclaration */:
-                    case 180 /* FunctionExpression */:
+                    case 185 /* ArrowFunction */:
+                    case 225 /* FunctionDeclaration */:
+                    case 184 /* FunctionExpression */:
                         return isTopLevelFunctionDeclaration(item);
                     default:
                         return false;
@@ -68409,10 +71108,10 @@ var ts;
                         return false;
                     }
                     switch (navigationBarNodeKind(item.parent)) {
-                        case 227 /* ModuleBlock */:
-                        case 256 /* SourceFile */:
-                        case 148 /* MethodDeclaration */:
-                        case 149 /* Constructor */:
+                        case 231 /* ModuleBlock */:
+                        case 261 /* SourceFile */:
+                        case 149 /* MethodDeclaration */:
+                        case 150 /* Constructor */:
                             return true;
                         default:
                             return hasSomeImportantChild(item);
@@ -68421,7 +71120,7 @@ var ts;
                 function hasSomeImportantChild(item) {
                     return ts.forEach(item.children, function (child) {
                         var childKind = navigationBarNodeKind(child);
-                        return childKind !== 219 /* VariableDeclaration */ && childKind !== 170 /* BindingElement */;
+                        return childKind !== 223 /* VariableDeclaration */ && childKind !== 174 /* BindingElement */;
                     });
                 }
             }
@@ -68479,7 +71178,7 @@ var ts;
             // Otherwise, we need to aggregate each identifier to build up the qualified name.
             var result = [];
             result.push(moduleDeclaration.name.text);
-            while (moduleDeclaration.body && moduleDeclaration.body.kind === 226 /* ModuleDeclaration */) {
+            while (moduleDeclaration.body && moduleDeclaration.body.kind === 230 /* ModuleDeclaration */) {
                 moduleDeclaration = moduleDeclaration.body;
                 result.push(moduleDeclaration.name.text);
             }
@@ -68490,13 +71189,13 @@ var ts;
          * We store 'A' as associated with a NavNode, and use getModuleName to traverse down again.
          */
         function getInteriorModule(decl) {
-            return decl.body.kind === 226 /* ModuleDeclaration */ ? getInteriorModule(decl.body) : decl;
+            return decl.body.kind === 230 /* ModuleDeclaration */ ? getInteriorModule(decl.body) : decl;
         }
         function isComputedProperty(member) {
-            return !member.name || member.name.kind === 141 /* ComputedPropertyName */;
+            return !member.name || member.name.kind === 142 /* ComputedPropertyName */;
         }
         function getNodeSpan(node) {
-            return node.kind === 256 /* SourceFile */
+            return node.kind === 261 /* SourceFile */
                 ? ts.createTextSpanFromBounds(node.getFullStart(), node.getEnd())
                 : ts.createTextSpanFromBounds(node.getStart(curSourceFile), node.getEnd());
         }
@@ -68504,14 +71203,14 @@ var ts;
             if (node.name && ts.getFullWidth(node.name) > 0) {
                 return ts.declarationNameToString(node.name);
             }
-            else if (node.parent.kind === 219 /* VariableDeclaration */) {
+            else if (node.parent.kind === 223 /* VariableDeclaration */) {
                 return ts.declarationNameToString(node.parent.name);
             }
-            else if (node.parent.kind === 188 /* BinaryExpression */ &&
+            else if (node.parent.kind === 192 /* BinaryExpression */ &&
                 node.parent.operatorToken.kind === 57 /* EqualsToken */) {
-                return nodeText(node.parent.left);
+                return nodeText(node.parent.left).replace(whiteSpaceRegex, "");
             }
-            else if (node.parent.kind === 253 /* PropertyAssignment */ && node.parent.name) {
+            else if (node.parent.kind === 257 /* PropertyAssignment */ && node.parent.name) {
                 return nodeText(node.parent.name);
             }
             else if (ts.getModifierFlags(node) & 512 /* Default */) {
@@ -68522,8 +71221,22 @@ var ts;
             }
         }
         function isFunctionOrClassExpression(node) {
-            return node.kind === 180 /* FunctionExpression */ || node.kind === 181 /* ArrowFunction */ || node.kind === 193 /* ClassExpression */;
+            return node.kind === 184 /* FunctionExpression */ || node.kind === 185 /* ArrowFunction */ || node.kind === 197 /* ClassExpression */;
         }
+        /**
+         * Matches all whitespace characters in a string. Eg:
+         *
+         * "app.
+         *
+         * onactivated"
+         *
+         * matches because of the newline, whereas
+         *
+         * "app.onactivated"
+         *
+         * does not match.
+         */
+        var whiteSpaceRegex = /\s+/g;
     })(NavigationBar = ts.NavigationBar || (ts.NavigationBar = {}));
 })(ts || (ts = {}));
 /* @internal */
@@ -68598,7 +71311,7 @@ var ts;
                 }
             }
             function autoCollapse(node) {
-                return ts.isFunctionBlock(node) && node.parent.kind !== 181 /* ArrowFunction */;
+                return ts.isFunctionBlock(node) && node.parent.kind !== 185 /* ArrowFunction */;
             }
             var depth = 0;
             var maxDepth = 20;
@@ -68610,30 +71323,30 @@ var ts;
                     addOutliningForLeadingCommentsForNode(n);
                 }
                 switch (n.kind) {
-                    case 200 /* Block */:
+                    case 204 /* Block */:
                         if (!ts.isFunctionBlock(n)) {
-                            var parent_22 = n.parent;
+                            var parent_20 = n.parent;
                             var openBrace = ts.findChildOfKind(n, 16 /* OpenBraceToken */, sourceFile);
                             var closeBrace = ts.findChildOfKind(n, 17 /* CloseBraceToken */, 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.
-                            if (parent_22.kind === 205 /* DoStatement */ ||
-                                parent_22.kind === 208 /* ForInStatement */ ||
-                                parent_22.kind === 209 /* ForOfStatement */ ||
-                                parent_22.kind === 207 /* ForStatement */ ||
-                                parent_22.kind === 204 /* IfStatement */ ||
-                                parent_22.kind === 206 /* WhileStatement */ ||
-                                parent_22.kind === 213 /* WithStatement */ ||
-                                parent_22.kind === 252 /* CatchClause */) {
-                                addOutliningSpan(parent_22, openBrace, closeBrace, autoCollapse(n));
+                            if (parent_20.kind === 209 /* DoStatement */ ||
+                                parent_20.kind === 212 /* ForInStatement */ ||
+                                parent_20.kind === 213 /* ForOfStatement */ ||
+                                parent_20.kind === 211 /* ForStatement */ ||
+                                parent_20.kind === 208 /* IfStatement */ ||
+                                parent_20.kind === 210 /* WhileStatement */ ||
+                                parent_20.kind === 217 /* WithStatement */ ||
+                                parent_20.kind === 256 /* CatchClause */) {
+                                addOutliningSpan(parent_20, openBrace, closeBrace, autoCollapse(n));
                                 break;
                             }
-                            if (parent_22.kind === 217 /* TryStatement */) {
+                            if (parent_20.kind === 221 /* TryStatement */) {
                                 // Could be the try-block, or the finally-block.
-                                var tryStatement = parent_22;
+                                var tryStatement = parent_20;
                                 if (tryStatement.tryBlock === n) {
-                                    addOutliningSpan(parent_22, openBrace, closeBrace, autoCollapse(n));
+                                    addOutliningSpan(parent_20, openBrace, closeBrace, autoCollapse(n));
                                     break;
                                 }
                                 else if (tryStatement.finallyBlock === n) {
@@ -68656,23 +71369,23 @@ var ts;
                             break;
                         }
                     // Fallthrough.
-                    case 227 /* ModuleBlock */: {
+                    case 231 /* ModuleBlock */: {
                         var openBrace = ts.findChildOfKind(n, 16 /* OpenBraceToken */, sourceFile);
                         var closeBrace = ts.findChildOfKind(n, 17 /* CloseBraceToken */, sourceFile);
                         addOutliningSpan(n.parent, openBrace, closeBrace, autoCollapse(n));
                         break;
                     }
-                    case 222 /* ClassDeclaration */:
-                    case 223 /* InterfaceDeclaration */:
-                    case 225 /* EnumDeclaration */:
-                    case 172 /* ObjectLiteralExpression */:
-                    case 228 /* CaseBlock */: {
+                    case 226 /* ClassDeclaration */:
+                    case 227 /* InterfaceDeclaration */:
+                    case 229 /* EnumDeclaration */:
+                    case 176 /* ObjectLiteralExpression */:
+                    case 232 /* CaseBlock */: {
                         var openBrace = ts.findChildOfKind(n, 16 /* OpenBraceToken */, sourceFile);
                         var closeBrace = ts.findChildOfKind(n, 17 /* CloseBraceToken */, sourceFile);
                         addOutliningSpan(n, openBrace, closeBrace, autoCollapse(n));
                         break;
                     }
-                    case 171 /* ArrayLiteralExpression */:
+                    case 175 /* ArrayLiteralExpression */:
                         var openBracket = ts.findChildOfKind(n, 20 /* OpenBracketToken */, sourceFile);
                         var closeBracket = ts.findChildOfKind(n, 21 /* CloseBracketToken */, sourceFile);
                         addOutliningSpan(n, openBracket, closeBracket, autoCollapse(n));
@@ -68692,13 +71405,13 @@ var ts;
 var ts;
 (function (ts) {
     // Note(cyrusn): this enum is ordered from strongest match type to weakest match type.
+    var PatternMatchKind;
     (function (PatternMatchKind) {
         PatternMatchKind[PatternMatchKind["exact"] = 0] = "exact";
         PatternMatchKind[PatternMatchKind["prefix"] = 1] = "prefix";
         PatternMatchKind[PatternMatchKind["substring"] = 2] = "substring";
         PatternMatchKind[PatternMatchKind["camelCase"] = 3] = "camelCase";
-    })(ts.PatternMatchKind || (ts.PatternMatchKind = {}));
-    var PatternMatchKind = ts.PatternMatchKind;
+    })(PatternMatchKind = ts.PatternMatchKind || (ts.PatternMatchKind = {}));
     function createPatternMatch(kind, punctuationStripped, isCaseSensitive, camelCaseWeight) {
         return {
             kind: kind,
@@ -69029,7 +71742,7 @@ var ts;
         if (ch >= 65 /* A */ && ch <= 90 /* Z */) {
             return true;
         }
-        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 4 /* Latest */)) {
+        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 5 /* Latest */)) {
             return false;
         }
         // TODO: find a way to determine this for any unicode characters in a
@@ -69042,7 +71755,7 @@ var ts;
         if (ch >= 97 /* a */ && ch <= 122 /* z */) {
             return true;
         }
-        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 4 /* Latest */)) {
+        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 5 /* Latest */)) {
             return false;
         }
         // TODO: find a way to determine this for any unicode characters in a
@@ -69320,7 +72033,7 @@ var ts;
             if (token === 123 /* DeclareKeyword */) {
                 // declare module "mod"
                 token = nextToken();
-                if (token === 126 /* ModuleKeyword */) {
+                if (token === 127 /* ModuleKeyword */) {
                     token = nextToken();
                     if (token === 9 /* StringLiteral */) {
                         recordAmbientExternalModule();
@@ -69345,7 +72058,7 @@ var ts;
                 else {
                     if (token === 70 /* Identifier */ || ts.isKeyword(token)) {
                         token = nextToken();
-                        if (token === 137 /* FromKeyword */) {
+                        if (token === 138 /* FromKeyword */) {
                             token = nextToken();
                             if (token === 9 /* StringLiteral */) {
                                 // import d from "mod";
@@ -69376,7 +72089,7 @@ var ts;
                         }
                         if (token === 17 /* CloseBraceToken */) {
                             token = nextToken();
-                            if (token === 137 /* FromKeyword */) {
+                            if (token === 138 /* FromKeyword */) {
                                 token = nextToken();
                                 if (token === 9 /* StringLiteral */) {
                                     // import {a as A} from "mod";
@@ -69392,7 +72105,7 @@ var ts;
                             token = nextToken();
                             if (token === 70 /* Identifier */ || ts.isKeyword(token)) {
                                 token = nextToken();
-                                if (token === 137 /* FromKeyword */) {
+                                if (token === 138 /* FromKeyword */) {
                                     token = nextToken();
                                     if (token === 9 /* StringLiteral */) {
                                         // import * as NS from "mod"
@@ -69422,7 +72135,7 @@ var ts;
                     }
                     if (token === 17 /* CloseBraceToken */) {
                         token = nextToken();
-                        if (token === 137 /* FromKeyword */) {
+                        if (token === 138 /* FromKeyword */) {
                             token = nextToken();
                             if (token === 9 /* StringLiteral */) {
                                 // export {a as A} from "mod";
@@ -69434,7 +72147,7 @@ var ts;
                 }
                 else if (token === 38 /* AsteriskToken */) {
                     token = nextToken();
-                    if (token === 137 /* FromKeyword */) {
+                    if (token === 138 /* FromKeyword */) {
                         token = nextToken();
                         if (token === 9 /* StringLiteral */) {
                             // export * from "mod"
@@ -69459,7 +72172,7 @@ var ts;
         }
         function tryConsumeRequireCall(skipCurrentToken) {
             var token = skipCurrentToken ? nextToken() : ts.scanner.getToken();
-            if (token === 130 /* RequireKeyword */) {
+            if (token === 131 /* RequireKeyword */) {
                 token = nextToken();
                 if (token === 18 /* OpenParenToken */) {
                     token = nextToken();
@@ -69814,12 +72527,12 @@ var ts;
         //    return null;
         // }
         var emptyArray = [];
+        var ArgumentListKind;
         (function (ArgumentListKind) {
             ArgumentListKind[ArgumentListKind["TypeArguments"] = 0] = "TypeArguments";
             ArgumentListKind[ArgumentListKind["CallArguments"] = 1] = "CallArguments";
             ArgumentListKind[ArgumentListKind["TaggedTemplateArguments"] = 2] = "TaggedTemplateArguments";
-        })(SignatureHelp.ArgumentListKind || (SignatureHelp.ArgumentListKind = {}));
-        var ArgumentListKind = SignatureHelp.ArgumentListKind;
+        })(ArgumentListKind = SignatureHelp.ArgumentListKind || (SignatureHelp.ArgumentListKind = {}));
         function getSignatureHelpItems(program, sourceFile, position, cancellationToken) {
             var typeChecker = program.getTypeChecker();
             // Decide whether to show signature help
@@ -69850,7 +72563,7 @@ var ts;
         }
         SignatureHelp.getSignatureHelpItems = getSignatureHelpItems;
         function createJavaScriptSignatureHelpItems(argumentInfo, program) {
-            if (argumentInfo.invocation.kind !== 175 /* CallExpression */) {
+            if (argumentInfo.invocation.kind !== 179 /* CallExpression */) {
                 return undefined;
             }
             // See if we can find some symbol with the call expression name that has call signatures.
@@ -69858,7 +72571,7 @@ var ts;
             var expression = callExpression.expression;
             var name = expression.kind === 70 /* Identifier */
                 ? expression
-                : expression.kind === 173 /* PropertyAccessExpression */
+                : expression.kind === 177 /* PropertyAccessExpression */
                     ? expression.name
                     : undefined;
             if (!name || !name.text) {
@@ -69891,7 +72604,7 @@ var ts;
          * in the argument of an invocation; returns undefined otherwise.
          */
         function getImmediatelyContainingArgumentInfo(node, position, sourceFile) {
-            if (node.parent.kind === 175 /* CallExpression */ || node.parent.kind === 176 /* NewExpression */) {
+            if (node.parent.kind === 179 /* CallExpression */ || node.parent.kind === 180 /* NewExpression */) {
                 var callExpression = node.parent;
                 // There are 3 cases to handle:
                 //   1. The token introduces a list, and should begin a sig help session
@@ -69945,25 +72658,25 @@ var ts;
                 }
                 return undefined;
             }
-            else if (node.kind === 12 /* NoSubstitutionTemplateLiteral */ && node.parent.kind === 177 /* TaggedTemplateExpression */) {
+            else if (node.kind === 12 /* NoSubstitutionTemplateLiteral */ && node.parent.kind === 181 /* TaggedTemplateExpression */) {
                 // Check if we're actually inside the template;
                 // otherwise we'll fall out and return undefined.
                 if (ts.isInsideTemplateLiteral(node, position)) {
                     return getArgumentListInfoForTemplate(node.parent, /*argumentIndex*/ 0, sourceFile);
                 }
             }
-            else if (node.kind === 13 /* TemplateHead */ && node.parent.parent.kind === 177 /* TaggedTemplateExpression */) {
+            else if (node.kind === 13 /* TemplateHead */ && node.parent.parent.kind === 181 /* TaggedTemplateExpression */) {
                 var templateExpression = node.parent;
                 var tagExpression = templateExpression.parent;
-                ts.Debug.assert(templateExpression.kind === 190 /* TemplateExpression */);
+                ts.Debug.assert(templateExpression.kind === 194 /* TemplateExpression */);
                 var argumentIndex = ts.isInsideTemplateLiteral(node, position) ? 0 : 1;
                 return getArgumentListInfoForTemplate(tagExpression, argumentIndex, sourceFile);
             }
-            else if (node.parent.kind === 198 /* TemplateSpan */ && node.parent.parent.parent.kind === 177 /* TaggedTemplateExpression */) {
+            else if (node.parent.kind === 202 /* TemplateSpan */ && node.parent.parent.parent.kind === 181 /* TaggedTemplateExpression */) {
                 var templateSpan = node.parent;
                 var templateExpression = templateSpan.parent;
                 var tagExpression = templateExpression.parent;
-                ts.Debug.assert(templateExpression.kind === 190 /* TemplateExpression */);
+                ts.Debug.assert(templateExpression.kind === 194 /* TemplateExpression */);
                 // If we're just after a template tail, don't show signature help.
                 if (node.kind === 15 /* TemplateTail */ && !ts.isInsideTemplateLiteral(node, position)) {
                     return undefined;
@@ -70081,7 +72794,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 === 190 /* TemplateExpression */) {
+            if (template.kind === 194 /* TemplateExpression */) {
                 var lastSpan = ts.lastOrUndefined(template.templateSpans);
                 if (lastSpan.literal.getFullWidth() === 0) {
                     applicableSpanEnd = ts.skipTrivia(sourceFile.text, applicableSpanEnd, /*stopAfterLineBreak*/ false);
@@ -70090,7 +72803,7 @@ var ts;
             return ts.createTextSpan(applicableSpanStart, applicableSpanEnd - applicableSpanStart);
         }
         function getContainingArgumentInfo(node, position, sourceFile) {
-            for (var n = node; n.kind !== 256 /* SourceFile */; n = n.parent) {
+            for (var n = node; n.kind !== 261 /* SourceFile */; n = n.parent) {
                 if (ts.isFunctionBlock(n)) {
                     return undefined;
                 }
@@ -70150,7 +72863,9 @@ var ts;
                 if (callTargetDisplayParts) {
                     ts.addRange(prefixDisplayParts, callTargetDisplayParts);
                 }
+                var isVariadic;
                 if (isTypeParameterList) {
+                    isVariadic = false; // type parameter lists are not variadic
                     prefixDisplayParts.push(ts.punctuationPart(26 /* LessThanToken */));
                     var typeParameters = candidateSignature.typeParameters;
                     signatureHelpParameters = typeParameters && typeParameters.length > 0 ? ts.map(typeParameters, createSignatureHelpParameterForTypeParameter) : emptyArray;
@@ -70161,6 +72876,7 @@ var ts;
                     ts.addRange(suffixDisplayParts, parameterParts);
                 }
                 else {
+                    isVariadic = candidateSignature.hasRestParameter;
                     var typeParameterParts = ts.mapToDisplayParts(function (writer) {
                         return typeChecker.getSymbolDisplayBuilder().buildDisplayForTypeParametersAndDelimiters(candidateSignature.typeParameters, writer, invocation);
                     });
@@ -70175,7 +72891,7 @@ var ts;
                 });
                 ts.addRange(suffixDisplayParts, returnTypeParts);
                 return {
-                    isVariadic: candidateSignature.hasRestParameter,
+                    isVariadic: isVariadic,
                     prefixDisplayParts: prefixDisplayParts,
                     suffixDisplayParts: suffixDisplayParts,
                     separatorDisplayParts: [ts.punctuationPart(25 /* CommaToken */), ts.spacePart()],
@@ -70232,7 +72948,7 @@ var ts;
         function getSymbolKind(typeChecker, symbol, location) {
             var flags = symbol.getFlags();
             if (flags & 32 /* Class */)
-                return ts.getDeclarationOfKind(symbol, 193 /* ClassExpression */) ?
+                return ts.getDeclarationOfKind(symbol, 197 /* ClassExpression */) ?
                     ts.ScriptElementKind.localClassElement : ts.ScriptElementKind.classElement;
             if (flags & 384 /* Enum */)
                 return ts.ScriptElementKind.enumElement;
@@ -70338,7 +73054,7 @@ var ts;
                 var signature = void 0;
                 type = isThisExpression ? typeChecker.getTypeAtLocation(location) : typeChecker.getTypeOfSymbolAtLocation(symbol, location);
                 if (type) {
-                    if (location.parent && location.parent.kind === 173 /* PropertyAccessExpression */) {
+                    if (location.parent && location.parent.kind === 177 /* 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)) {
@@ -70347,7 +73063,7 @@ var ts;
                     }
                     // try get the call/construct signature from the type if it matches
                     var callExpression = void 0;
-                    if (location.kind === 175 /* CallExpression */ || location.kind === 176 /* NewExpression */) {
+                    if (location.kind === 179 /* CallExpression */ || location.kind === 180 /* NewExpression */) {
                         callExpression = location;
                     }
                     else if (ts.isCallExpressionTarget(location) || ts.isNewExpressionTarget(location)) {
@@ -70360,7 +73076,7 @@ var ts;
                             // Use the first candidate:
                             signature = candidateSignatures[0];
                         }
-                        var useConstructSignatures = callExpression.kind === 176 /* NewExpression */ || callExpression.expression.kind === 96 /* SuperKeyword */;
+                        var useConstructSignatures = callExpression.kind === 180 /* NewExpression */ || callExpression.expression.kind === 96 /* 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
@@ -70400,7 +73116,7 @@ var ts;
                                         displayParts.push(ts.keywordPart(93 /* NewKeyword */));
                                         displayParts.push(ts.spacePart());
                                     }
-                                    if (!(type.flags & 2097152 /* Anonymous */) && type.symbol) {
+                                    if (!(type.flags & 32768 /* Object */ && type.objectFlags & 16 /* Anonymous */) && type.symbol) {
                                         ts.addRange(displayParts, ts.symbolToDisplayParts(typeChecker, type.symbol, enclosingDeclaration, /*meaning*/ undefined, 1 /* WriteTypeParametersOrArguments */));
                                     }
                                     addSignatureDisplayParts(signature, allSignatures, 8 /* WriteArrowStyleSignature */);
@@ -70413,24 +73129,24 @@ var ts;
                         }
                     }
                     else if ((ts.isNameOfFunctionDeclaration(location) && !(symbol.flags & 98304 /* Accessor */)) ||
-                        (location.kind === 122 /* ConstructorKeyword */ && location.parent.kind === 149 /* Constructor */)) {
+                        (location.kind === 122 /* ConstructorKeyword */ && location.parent.kind === 150 /* Constructor */)) {
                         // get the signature from the declaration and write it
                         var functionDeclaration = location.parent;
-                        var allSignatures = functionDeclaration.kind === 149 /* Constructor */ ? type.getNonNullableType().getConstructSignatures() : type.getNonNullableType().getCallSignatures();
+                        var allSignatures = functionDeclaration.kind === 150 /* Constructor */ ? type.getNonNullableType().getConstructSignatures() : type.getNonNullableType().getCallSignatures();
                         if (!typeChecker.isImplementationOfOverload(functionDeclaration)) {
                             signature = typeChecker.getSignatureFromDeclaration(functionDeclaration);
                         }
                         else {
                             signature = allSignatures[0];
                         }
-                        if (functionDeclaration.kind === 149 /* Constructor */) {
+                        if (functionDeclaration.kind === 150 /* Constructor */) {
                             // show (constructor) Type(...) signature
                             symbolKind = ts.ScriptElementKind.constructorImplementationElement;
                             addPrefixForAnyFunctionOrVar(type.symbol, symbolKind);
                         }
                         else {
                             // (function/method) symbol(..signature)
-                            addPrefixForAnyFunctionOrVar(functionDeclaration.kind === 152 /* CallSignature */ &&
+                            addPrefixForAnyFunctionOrVar(functionDeclaration.kind === 153 /* CallSignature */ &&
                                 !(type.symbol.flags & 2048 /* TypeLiteral */ || type.symbol.flags & 4096 /* ObjectLiteral */) ? type.symbol : symbol, symbolKind);
                         }
                         addSignatureDisplayParts(signature, allSignatures);
@@ -70439,7 +73155,7 @@ var ts;
                 }
             }
             if (symbolFlags & 32 /* Class */ && !hasAddedSymbolInfo && !isThisExpression) {
-                if (ts.getDeclarationOfKind(symbol, 193 /* ClassExpression */)) {
+                if (ts.getDeclarationOfKind(symbol, 197 /* 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>
@@ -70462,7 +73178,7 @@ var ts;
             }
             if (symbolFlags & 524288 /* TypeAlias */) {
                 addNewLineIfDisplayPartsExist();
-                displayParts.push(ts.keywordPart(135 /* TypeKeyword */));
+                displayParts.push(ts.keywordPart(136 /* TypeKeyword */));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 writeTypeParametersOfSymbol(symbol, sourceFile);
@@ -70483,9 +73199,9 @@ var ts;
             }
             if (symbolFlags & 1536 /* Module */) {
                 addNewLineIfDisplayPartsExist();
-                var declaration = ts.getDeclarationOfKind(symbol, 226 /* ModuleDeclaration */);
+                var declaration = ts.getDeclarationOfKind(symbol, 230 /* ModuleDeclaration */);
                 var isNamespace = declaration && declaration.name && declaration.name.kind === 70 /* Identifier */;
-                displayParts.push(ts.keywordPart(isNamespace ? 127 /* NamespaceKeyword */ : 126 /* ModuleKeyword */));
+                displayParts.push(ts.keywordPart(isNamespace ? 128 /* NamespaceKeyword */ : 127 /* ModuleKeyword */));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
             }
@@ -70496,36 +73212,36 @@ var ts;
                 displayParts.push(ts.punctuationPart(19 /* CloseParenToken */));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
-                displayParts.push(ts.spacePart());
-                displayParts.push(ts.keywordPart(91 /* InKeyword */));
-                displayParts.push(ts.spacePart());
                 if (symbol.parent) {
                     // Class/Interface type parameter
+                    addInPrefix();
                     addFullSymbolName(symbol.parent, enclosingDeclaration);
                     writeTypeParametersOfSymbol(symbol.parent, enclosingDeclaration);
                 }
                 else {
                     // Method/function type parameter
-                    var declaration = ts.getDeclarationOfKind(symbol, 142 /* TypeParameter */);
+                    var declaration = ts.getDeclarationOfKind(symbol, 143 /* TypeParameter */);
                     ts.Debug.assert(declaration !== undefined);
                     declaration = declaration.parent;
                     if (declaration) {
                         if (ts.isFunctionLikeKind(declaration.kind)) {
+                            addInPrefix();
                             var signature = typeChecker.getSignatureFromDeclaration(declaration);
-                            if (declaration.kind === 153 /* ConstructSignature */) {
+                            if (declaration.kind === 154 /* ConstructSignature */) {
                                 displayParts.push(ts.keywordPart(93 /* NewKeyword */));
                                 displayParts.push(ts.spacePart());
                             }
-                            else if (declaration.kind !== 152 /* CallSignature */ && declaration.name) {
+                            else if (declaration.kind !== 153 /* CallSignature */ && declaration.name) {
                                 addFullSymbolName(declaration.symbol);
                             }
                             ts.addRange(displayParts, ts.signatureToDisplayParts(typeChecker, signature, sourceFile, 32 /* WriteTypeArgumentsOfSignature */));
                         }
-                        else {
+                        else if (declaration.kind === 228 /* TypeAliasDeclaration */) {
                             // Type alias type parameter
                             // For example
                             //      type list<T> = T[];  // Both T will go through same code path
-                            displayParts.push(ts.keywordPart(135 /* TypeKeyword */));
+                            addInPrefix();
+                            displayParts.push(ts.keywordPart(136 /* TypeKeyword */));
                             displayParts.push(ts.spacePart());
                             addFullSymbolName(declaration.symbol);
                             writeTypeParametersOfSymbol(declaration.symbol, sourceFile);
@@ -70536,7 +73252,7 @@ var ts;
             if (symbolFlags & 8 /* EnumMember */) {
                 addPrefixForAnyFunctionOrVar(symbol, "enum member");
                 var declaration = symbol.declarations[0];
-                if (declaration.kind === 255 /* EnumMember */) {
+                if (declaration.kind === 260 /* EnumMember */) {
                     var constantValue = typeChecker.getConstantValue(declaration);
                     if (constantValue !== undefined) {
                         displayParts.push(ts.spacePart());
@@ -70548,10 +73264,10 @@ var ts;
             }
             if (symbolFlags & 8388608 /* Alias */) {
                 addNewLineIfDisplayPartsExist();
-                if (symbol.declarations[0].kind === 229 /* NamespaceExportDeclaration */) {
+                if (symbol.declarations[0].kind === 233 /* NamespaceExportDeclaration */) {
                     displayParts.push(ts.keywordPart(83 /* ExportKeyword */));
                     displayParts.push(ts.spacePart());
-                    displayParts.push(ts.keywordPart(127 /* NamespaceKeyword */));
+                    displayParts.push(ts.keywordPart(128 /* NamespaceKeyword */));
                 }
                 else {
                     displayParts.push(ts.keywordPart(90 /* ImportKeyword */));
@@ -70559,13 +73275,13 @@ var ts;
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 ts.forEach(symbol.declarations, function (declaration) {
-                    if (declaration.kind === 230 /* ImportEqualsDeclaration */) {
+                    if (declaration.kind === 234 /* ImportEqualsDeclaration */) {
                         var importEqualsDeclaration = declaration;
                         if (ts.isExternalModuleImportEqualsDeclaration(importEqualsDeclaration)) {
                             displayParts.push(ts.spacePart());
                             displayParts.push(ts.operatorPart(57 /* EqualsToken */));
                             displayParts.push(ts.spacePart());
-                            displayParts.push(ts.keywordPart(130 /* RequireKeyword */));
+                            displayParts.push(ts.keywordPart(131 /* RequireKeyword */));
                             displayParts.push(ts.punctuationPart(18 /* OpenParenToken */));
                             displayParts.push(ts.displayPart(ts.getTextOfNode(ts.getExternalModuleImportEqualsDeclarationExpression(importEqualsDeclaration)), ts.SymbolDisplayPartKind.stringLiteral));
                             displayParts.push(ts.punctuationPart(19 /* CloseParenToken */));
@@ -70632,10 +73348,10 @@ var ts;
                     // For some special property access expressions like `experts.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 === 256 /* SourceFile */; })) {
+                    if (symbol.parent && ts.forEach(symbol.parent.declarations, function (declaration) { return declaration.kind === 261 /* SourceFile */; })) {
                         for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                             var declaration = _a[_i];
-                            if (!declaration.parent || declaration.parent.kind !== 188 /* BinaryExpression */) {
+                            if (!declaration.parent || declaration.parent.kind !== 192 /* BinaryExpression */) {
                                 continue;
                             }
                             var rhsSymbol = typeChecker.getSymbolAtLocation(declaration.parent.right);
@@ -70656,6 +73372,11 @@ var ts;
                     displayParts.push(ts.lineBreakPart());
                 }
             }
+            function addInPrefix() {
+                displayParts.push(ts.spacePart());
+                displayParts.push(ts.keywordPart(91 /* InKeyword */));
+                displayParts.push(ts.spacePart());
+            }
             function addFullSymbolName(symbol, enclosingDeclaration) {
                 var fullSymbolDisplayParts = ts.symbolToDisplayParts(typeChecker, symbol, enclosingDeclaration || sourceFile, /*meaning*/ undefined, 1 /* WriteTypeParametersOrArguments */ | 2 /* UseOnlyExternalAliasing */);
                 ts.addRange(displayParts, fullSymbolDisplayParts);
@@ -70711,16 +73432,16 @@ var ts;
             }
             return ts.forEach(symbol.declarations, function (declaration) {
                 // Function expressions are local
-                if (declaration.kind === 180 /* FunctionExpression */) {
+                if (declaration.kind === 184 /* FunctionExpression */) {
                     return true;
                 }
-                if (declaration.kind !== 219 /* VariableDeclaration */ && declaration.kind !== 221 /* FunctionDeclaration */) {
+                if (declaration.kind !== 223 /* VariableDeclaration */ && declaration.kind !== 225 /* FunctionDeclaration */) {
                     return false;
                 }
                 // If the parent is not sourceFile or module block it is local variable
-                for (var parent_23 = declaration.parent; !ts.isFunctionBlock(parent_23); parent_23 = parent_23.parent) {
+                for (var parent_21 = declaration.parent; !ts.isFunctionBlock(parent_21); parent_21 = parent_21.parent) {
                     // Reached source file or module block
-                    if (parent_23.kind === 256 /* SourceFile */ || parent_23.kind === 227 /* ModuleBlock */) {
+                    if (parent_21.kind === 261 /* SourceFile */ || parent_21.kind === 231 /* ModuleBlock */) {
                         return false;
                     }
                 }
@@ -70831,7 +73552,7 @@ var ts;
             return typeof o.type === "object" && !ts.forEachProperty(o.type, function (v) { return typeof v !== "number"; });
         });
         options = ts.clone(options);
-        var _loop_2 = function (opt) {
+        var _loop_4 = function (opt) {
             if (!ts.hasProperty(options, opt.name)) {
                 return "continue";
             }
@@ -70850,7 +73571,7 @@ var ts;
         };
         for (var _i = 0, commandLineOptionsStringToEnum_1 = commandLineOptionsStringToEnum; _i < commandLineOptionsStringToEnum_1.length; _i++) {
             var opt = commandLineOptionsStringToEnum_1[_i];
-            _loop_2(opt);
+            _loop_4(opt);
         }
         return options;
     }
@@ -70862,8 +73583,8 @@ var ts;
 (function (ts) {
     var formatting;
     (function (formatting) {
-        var standardScanner = ts.createScanner(4 /* Latest */, /*skipTrivia*/ false, 0 /* Standard */);
-        var jsxScanner = ts.createScanner(4 /* Latest */, /*skipTrivia*/ false, 1 /* JSX */);
+        var standardScanner = ts.createScanner(5 /* Latest */, /*skipTrivia*/ false, 0 /* Standard */);
+        var jsxScanner = ts.createScanner(5 /* Latest */, /*skipTrivia*/ false, 1 /* JSX */);
         /**
          * Scanner that is currently used for formatting
          */
@@ -70958,10 +73679,10 @@ var ts;
             function shouldRescanJsxIdentifier(node) {
                 if (node.parent) {
                     switch (node.parent.kind) {
-                        case 246 /* JsxAttribute */:
-                        case 244 /* JsxOpeningElement */:
-                        case 245 /* JsxClosingElement */:
-                        case 243 /* JsxSelfClosingElement */:
+                        case 250 /* JsxAttribute */:
+                        case 248 /* JsxOpeningElement */:
+                        case 249 /* JsxClosingElement */:
+                        case 247 /* JsxSelfClosingElement */:
                             return node.kind === 70 /* Identifier */;
                     }
                 }
@@ -71196,14 +73917,14 @@ var ts;
 (function (ts) {
     var formatting;
     (function (formatting) {
+        var FormattingRequestKind;
         (function (FormattingRequestKind) {
             FormattingRequestKind[FormattingRequestKind["FormatDocument"] = 0] = "FormatDocument";
             FormattingRequestKind[FormattingRequestKind["FormatSelection"] = 1] = "FormatSelection";
             FormattingRequestKind[FormattingRequestKind["FormatOnEnter"] = 2] = "FormatOnEnter";
             FormattingRequestKind[FormattingRequestKind["FormatOnSemicolon"] = 3] = "FormatOnSemicolon";
             FormattingRequestKind[FormattingRequestKind["FormatOnClosingCurlyBrace"] = 4] = "FormatOnClosingCurlyBrace";
-        })(formatting.FormattingRequestKind || (formatting.FormattingRequestKind = {}));
-        var FormattingRequestKind = formatting.FormattingRequestKind;
+        })(FormattingRequestKind = formatting.FormattingRequestKind || (formatting.FormattingRequestKind = {}));
     })(formatting = ts.formatting || (ts.formatting = {}));
 })(ts || (ts = {}));
 ///<reference path='references.ts' />
@@ -71235,13 +73956,13 @@ var ts;
 (function (ts) {
     var formatting;
     (function (formatting) {
+        var RuleAction;
         (function (RuleAction) {
             RuleAction[RuleAction["Ignore"] = 1] = "Ignore";
             RuleAction[RuleAction["Space"] = 2] = "Space";
             RuleAction[RuleAction["NewLine"] = 4] = "NewLine";
             RuleAction[RuleAction["Delete"] = 8] = "Delete";
-        })(formatting.RuleAction || (formatting.RuleAction = {}));
-        var RuleAction = formatting.RuleAction;
+        })(RuleAction = formatting.RuleAction || (formatting.RuleAction = {}));
     })(formatting = ts.formatting || (ts.formatting = {}));
 })(ts || (ts = {}));
 ///<reference path='references.ts' />
@@ -71282,11 +74003,11 @@ var ts;
 (function (ts) {
     var formatting;
     (function (formatting) {
+        var RuleFlags;
         (function (RuleFlags) {
             RuleFlags[RuleFlags["None"] = 0] = "None";
             RuleFlags[RuleFlags["CanDeleteNewLines"] = 1] = "CanDeleteNewLines";
-        })(formatting.RuleFlags || (formatting.RuleFlags = {}));
-        var RuleFlags = formatting.RuleFlags;
+        })(RuleFlags = formatting.RuleFlags || (formatting.RuleFlags = {}));
     })(formatting = ts.formatting || (ts.formatting = {}));
 })(ts || (ts = {}));
 ///<reference path='references.ts' />
@@ -71437,7 +74158,7 @@ var ts;
                 this.SpaceAfterTryFinally = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([101 /* TryKeyword */, 86 /* FinallyKeyword */]), 16 /* OpenBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
                 //      get x() {}
                 //      set x(val) {}
-                this.SpaceAfterGetSetInMember = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([124 /* GetKeyword */, 132 /* SetKeyword */]), 70 /* Identifier */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2 /* Space */));
+                this.SpaceAfterGetSetInMember = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([124 /* GetKeyword */, 133 /* SetKeyword */]), 70 /* Identifier */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2 /* Space */));
                 // Special case for binary operators (that are keywords). For these we have to add a space and shouldn't follow any user options.
                 this.SpaceBeforeBinaryKeywordOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryKeywordOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
                 this.SpaceAfterBinaryKeywordOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.BinaryKeywordOperators, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
@@ -71445,10 +74166,10 @@ var ts;
                 // Treat constructor as an identifier in a function declaration, and remove spaces between constructor and following left parentheses
                 this.NoSpaceAfterConstructor = new formatting.Rule(formatting.RuleDescriptor.create1(122 /* ConstructorKeyword */, 18 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
                 // Use of module as a function call. e.g.: import m2 = module("m2");
-                this.NoSpaceAfterModuleImport = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([126 /* ModuleKeyword */, 130 /* RequireKeyword */]), 18 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceAfterModuleImport = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([127 /* ModuleKeyword */, 131 /* RequireKeyword */]), 18 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
                 // Add a space around certain TypeScript keywords
-                this.SpaceAfterCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([116 /* AbstractKeyword */, 74 /* ClassKeyword */, 123 /* DeclareKeyword */, 78 /* DefaultKeyword */, 82 /* EnumKeyword */, 83 /* ExportKeyword */, 84 /* ExtendsKeyword */, 124 /* GetKeyword */, 107 /* ImplementsKeyword */, 90 /* ImportKeyword */, 108 /* InterfaceKeyword */, 126 /* ModuleKeyword */, 127 /* NamespaceKeyword */, 111 /* PrivateKeyword */, 113 /* PublicKeyword */, 112 /* ProtectedKeyword */, 132 /* SetKeyword */, 114 /* StaticKeyword */, 135 /* TypeKeyword */, 137 /* FromKeyword */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
-                this.SpaceBeforeCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([84 /* ExtendsKeyword */, 107 /* ImplementsKeyword */, 137 /* FromKeyword */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
+                this.SpaceAfterCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([116 /* AbstractKeyword */, 74 /* ClassKeyword */, 123 /* DeclareKeyword */, 78 /* DefaultKeyword */, 82 /* EnumKeyword */, 83 /* ExportKeyword */, 84 /* ExtendsKeyword */, 124 /* GetKeyword */, 107 /* ImplementsKeyword */, 90 /* ImportKeyword */, 108 /* InterfaceKeyword */, 127 /* ModuleKeyword */, 128 /* NamespaceKeyword */, 111 /* PrivateKeyword */, 113 /* PublicKeyword */, 112 /* ProtectedKeyword */, 133 /* SetKeyword */, 114 /* StaticKeyword */, 136 /* TypeKeyword */, 138 /* FromKeyword */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
+                this.SpaceBeforeCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([84 /* ExtendsKeyword */, 107 /* ImplementsKeyword */, 138 /* FromKeyword */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.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" {
                 this.SpaceAfterModuleName = new formatting.Rule(formatting.RuleDescriptor.create1(9 /* StringLiteral */, 16 /* OpenBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsModuleDeclContext), 2 /* Space */));
                 // Lambda expressions
@@ -71468,7 +74189,7 @@ var ts;
                 // decorators
                 this.SpaceBeforeAt = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 56 /* AtToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
                 this.NoSpaceAfterAt = new formatting.Rule(formatting.RuleDescriptor.create3(56 /* AtToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
-                this.SpaceAfterDecorator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([116 /* AbstractKeyword */, 70 /* Identifier */, 83 /* ExportKeyword */, 78 /* DefaultKeyword */, 74 /* ClassKeyword */, 114 /* StaticKeyword */, 113 /* PublicKeyword */, 111 /* PrivateKeyword */, 112 /* ProtectedKeyword */, 124 /* GetKeyword */, 132 /* SetKeyword */, 20 /* OpenBracketToken */, 38 /* AsteriskToken */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsEndOfDecoratorContextOnSameLine), 2 /* Space */));
+                this.SpaceAfterDecorator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([116 /* AbstractKeyword */, 70 /* Identifier */, 83 /* ExportKeyword */, 78 /* DefaultKeyword */, 74 /* ClassKeyword */, 114 /* StaticKeyword */, 113 /* PublicKeyword */, 111 /* PrivateKeyword */, 112 /* ProtectedKeyword */, 124 /* GetKeyword */, 133 /* SetKeyword */, 20 /* OpenBracketToken */, 38 /* AsteriskToken */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsEndOfDecoratorContextOnSameLine), 2 /* Space */));
                 this.NoSpaceBetweenFunctionKeywordAndStar = new formatting.Rule(formatting.RuleDescriptor.create1(88 /* FunctionKeyword */, 38 /* AsteriskToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclarationOrFunctionExpressionContext), 8 /* Delete */));
                 this.SpaceAfterStarInGeneratorDeclaration = new formatting.Rule(formatting.RuleDescriptor.create3(38 /* AsteriskToken */, formatting.Shared.TokenRange.FromTokens([70 /* Identifier */, 18 /* OpenParenToken */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclarationOrFunctionExpressionContext), 2 /* Space */));
                 this.NoSpaceBetweenYieldKeywordAndStar = new formatting.Rule(formatting.RuleDescriptor.create1(115 /* YieldKeyword */, 38 /* AsteriskToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsYieldOrYieldStarWithOperand), 8 /* Delete */));
@@ -71596,9 +74317,9 @@ var ts;
             }
             Rules.prototype.getRuleName = function (rule) {
                 var o = this;
-                for (var name_51 in o) {
-                    if (o[name_51] === rule) {
-                        return name_51;
+                for (var name_47 in o) {
+                    if (o[name_47] === rule) {
+                        return name_47;
                     }
                 }
                 throw new Error("Unknown rule");
@@ -71607,42 +74328,42 @@ var ts;
             /// Contexts
             ///
             Rules.IsForContext = function (context) {
-                return context.contextNode.kind === 207 /* ForStatement */;
+                return context.contextNode.kind === 211 /* ForStatement */;
             };
             Rules.IsNotForContext = function (context) {
                 return !Rules.IsForContext(context);
             };
             Rules.IsBinaryOpContext = function (context) {
                 switch (context.contextNode.kind) {
-                    case 188 /* BinaryExpression */:
-                    case 189 /* ConditionalExpression */:
-                    case 196 /* AsExpression */:
-                    case 239 /* ExportSpecifier */:
-                    case 235 /* ImportSpecifier */:
-                    case 155 /* TypePredicate */:
-                    case 163 /* UnionType */:
-                    case 164 /* IntersectionType */:
+                    case 192 /* BinaryExpression */:
+                    case 193 /* ConditionalExpression */:
+                    case 200 /* AsExpression */:
+                    case 243 /* ExportSpecifier */:
+                    case 239 /* ImportSpecifier */:
+                    case 156 /* TypePredicate */:
+                    case 164 /* UnionType */:
+                    case 165 /* IntersectionType */:
                         return true;
                     // equals in binding elements: function foo([[x, y] = [1, 2]])
-                    case 170 /* BindingElement */:
+                    case 174 /* BindingElement */:
                     // equals in type X = ...
-                    case 224 /* TypeAliasDeclaration */:
+                    case 228 /* TypeAliasDeclaration */:
                     // equal in import a = module('a');
-                    case 230 /* ImportEqualsDeclaration */:
+                    case 234 /* ImportEqualsDeclaration */:
                     // equal in let a = 0;
-                    case 219 /* VariableDeclaration */:
+                    case 223 /* VariableDeclaration */:
                     // equal in p = 0;
-                    case 143 /* Parameter */:
-                    case 255 /* EnumMember */:
-                    case 146 /* PropertyDeclaration */:
-                    case 145 /* PropertySignature */:
+                    case 144 /* Parameter */:
+                    case 260 /* EnumMember */:
+                    case 147 /* PropertyDeclaration */:
+                    case 146 /* PropertySignature */:
                         return context.currentTokenSpan.kind === 57 /* EqualsToken */ || context.nextTokenSpan.kind === 57 /* EqualsToken */;
                     // "in" keyword in for (let x in []) { }
-                    case 208 /* ForInStatement */:
+                    case 212 /* ForInStatement */:
                         return context.currentTokenSpan.kind === 91 /* InKeyword */ || context.nextTokenSpan.kind === 91 /* InKeyword */;
                     // Technically, "of" is not a binary operator, but format it the same way as "in"
-                    case 209 /* ForOfStatement */:
-                        return context.currentTokenSpan.kind === 139 /* OfKeyword */ || context.nextTokenSpan.kind === 139 /* OfKeyword */;
+                    case 213 /* ForOfStatement */:
+                        return context.currentTokenSpan.kind === 140 /* OfKeyword */ || context.nextTokenSpan.kind === 140 /* OfKeyword */;
                 }
                 return false;
             };
@@ -71650,7 +74371,7 @@ var ts;
                 return !Rules.IsBinaryOpContext(context);
             };
             Rules.IsConditionalOperatorContext = function (context) {
-                return context.contextNode.kind === 189 /* ConditionalExpression */;
+                return context.contextNode.kind === 193 /* ConditionalExpression */;
             };
             Rules.IsSameLineTokenOrBeforeMultilineBlockContext = function (context) {
                 //// This check is mainly used inside SpaceBeforeOpenBraceInControl and SpaceBeforeOpenBraceInFunction.
@@ -71694,97 +74415,97 @@ var ts;
                     return true;
                 }
                 switch (node.kind) {
-                    case 200 /* Block */:
-                    case 228 /* CaseBlock */:
-                    case 172 /* ObjectLiteralExpression */:
-                    case 227 /* ModuleBlock */:
+                    case 204 /* Block */:
+                    case 232 /* CaseBlock */:
+                    case 176 /* ObjectLiteralExpression */:
+                    case 231 /* ModuleBlock */:
                         return true;
                 }
                 return false;
             };
             Rules.IsFunctionDeclContext = function (context) {
                 switch (context.contextNode.kind) {
-                    case 221 /* FunctionDeclaration */:
-                    case 148 /* MethodDeclaration */:
-                    case 147 /* MethodSignature */:
+                    case 225 /* FunctionDeclaration */:
+                    case 149 /* MethodDeclaration */:
+                    case 148 /* MethodSignature */:
                     // case SyntaxKind.MemberFunctionDeclaration:
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* SetAccessor */:
                     // case SyntaxKind.MethodSignature:
-                    case 152 /* CallSignature */:
-                    case 180 /* FunctionExpression */:
-                    case 149 /* Constructor */:
-                    case 181 /* ArrowFunction */:
+                    case 153 /* CallSignature */:
+                    case 184 /* FunctionExpression */:
+                    case 150 /* Constructor */:
+                    case 185 /* ArrowFunction */:
                     // case SyntaxKind.ConstructorDeclaration:
                     // case SyntaxKind.SimpleArrowFunctionExpression:
                     // case SyntaxKind.ParenthesizedArrowFunctionExpression:
-                    case 223 /* InterfaceDeclaration */:
+                    case 227 /* InterfaceDeclaration */:
                         return true;
                 }
                 return false;
             };
             Rules.IsFunctionDeclarationOrFunctionExpressionContext = function (context) {
-                return context.contextNode.kind === 221 /* FunctionDeclaration */ || context.contextNode.kind === 180 /* FunctionExpression */;
+                return context.contextNode.kind === 225 /* FunctionDeclaration */ || context.contextNode.kind === 184 /* FunctionExpression */;
             };
             Rules.IsTypeScriptDeclWithBlockContext = function (context) {
                 return Rules.NodeIsTypeScriptDeclWithBlockContext(context.contextNode);
             };
             Rules.NodeIsTypeScriptDeclWithBlockContext = function (node) {
                 switch (node.kind) {
-                    case 222 /* ClassDeclaration */:
-                    case 193 /* ClassExpression */:
-                    case 223 /* InterfaceDeclaration */:
-                    case 225 /* EnumDeclaration */:
-                    case 160 /* TypeLiteral */:
-                    case 226 /* ModuleDeclaration */:
-                    case 237 /* ExportDeclaration */:
-                    case 238 /* NamedExports */:
-                    case 231 /* ImportDeclaration */:
-                    case 234 /* NamedImports */:
+                    case 226 /* ClassDeclaration */:
+                    case 197 /* ClassExpression */:
+                    case 227 /* InterfaceDeclaration */:
+                    case 229 /* EnumDeclaration */:
+                    case 161 /* TypeLiteral */:
+                    case 230 /* ModuleDeclaration */:
+                    case 241 /* ExportDeclaration */:
+                    case 242 /* NamedExports */:
+                    case 235 /* ImportDeclaration */:
+                    case 238 /* NamedImports */:
                         return true;
                 }
                 return false;
             };
             Rules.IsAfterCodeBlockContext = function (context) {
                 switch (context.currentTokenParent.kind) {
-                    case 222 /* ClassDeclaration */:
-                    case 226 /* ModuleDeclaration */:
-                    case 225 /* EnumDeclaration */:
-                    case 200 /* Block */:
-                    case 252 /* CatchClause */:
-                    case 227 /* ModuleBlock */:
-                    case 214 /* SwitchStatement */:
+                    case 226 /* ClassDeclaration */:
+                    case 230 /* ModuleDeclaration */:
+                    case 229 /* EnumDeclaration */:
+                    case 204 /* Block */:
+                    case 256 /* CatchClause */:
+                    case 231 /* ModuleBlock */:
+                    case 218 /* SwitchStatement */:
                         return true;
                 }
                 return false;
             };
             Rules.IsControlDeclContext = function (context) {
                 switch (context.contextNode.kind) {
-                    case 204 /* IfStatement */:
-                    case 214 /* SwitchStatement */:
-                    case 207 /* ForStatement */:
-                    case 208 /* ForInStatement */:
-                    case 209 /* ForOfStatement */:
-                    case 206 /* WhileStatement */:
-                    case 217 /* TryStatement */:
-                    case 205 /* DoStatement */:
-                    case 213 /* WithStatement */:
+                    case 208 /* IfStatement */:
+                    case 218 /* SwitchStatement */:
+                    case 211 /* ForStatement */:
+                    case 212 /* ForInStatement */:
+                    case 213 /* ForOfStatement */:
+                    case 210 /* WhileStatement */:
+                    case 221 /* TryStatement */:
+                    case 209 /* DoStatement */:
+                    case 217 /* WithStatement */:
                     // TODO
                     // case SyntaxKind.ElseClause:
-                    case 252 /* CatchClause */:
+                    case 256 /* CatchClause */:
                         return true;
                     default:
                         return false;
                 }
             };
             Rules.IsObjectContext = function (context) {
-                return context.contextNode.kind === 172 /* ObjectLiteralExpression */;
+                return context.contextNode.kind === 176 /* ObjectLiteralExpression */;
             };
             Rules.IsFunctionCallContext = function (context) {
-                return context.contextNode.kind === 175 /* CallExpression */;
+                return context.contextNode.kind === 179 /* CallExpression */;
             };
             Rules.IsNewContext = function (context) {
-                return context.contextNode.kind === 176 /* NewExpression */;
+                return context.contextNode.kind === 180 /* NewExpression */;
             };
             Rules.IsFunctionCallOrNewContext = function (context) {
                 return Rules.IsFunctionCallContext(context) || Rules.IsNewContext(context);
@@ -71796,25 +74517,25 @@ var ts;
                 return context.nextTokenSpan.kind !== 21 /* CloseBracketToken */;
             };
             Rules.IsArrowFunctionContext = function (context) {
-                return context.contextNode.kind === 181 /* ArrowFunction */;
+                return context.contextNode.kind === 185 /* ArrowFunction */;
             };
             Rules.IsNonJsxSameLineTokenContext = function (context) {
                 return context.TokensAreOnSameLine() && context.contextNode.kind !== 10 /* JsxText */;
             };
             Rules.IsNonJsxElementContext = function (context) {
-                return context.contextNode.kind !== 242 /* JsxElement */;
+                return context.contextNode.kind !== 246 /* JsxElement */;
             };
             Rules.IsJsxExpressionContext = function (context) {
-                return context.contextNode.kind === 248 /* JsxExpression */;
+                return context.contextNode.kind === 252 /* JsxExpression */;
             };
             Rules.IsNextTokenParentJsxAttribute = function (context) {
-                return context.nextTokenParent.kind === 246 /* JsxAttribute */;
+                return context.nextTokenParent.kind === 250 /* JsxAttribute */;
             };
             Rules.IsJsxAttributeContext = function (context) {
-                return context.contextNode.kind === 246 /* JsxAttribute */;
+                return context.contextNode.kind === 250 /* JsxAttribute */;
             };
             Rules.IsJsxSelfClosingElementContext = function (context) {
-                return context.contextNode.kind === 243 /* JsxSelfClosingElement */;
+                return context.contextNode.kind === 247 /* JsxSelfClosingElement */;
             };
             Rules.IsNotBeforeBlockInFunctionDeclarationContext = function (context) {
                 return !Rules.IsFunctionDeclContext(context) && !Rules.IsBeforeBlockContext(context);
@@ -71829,41 +74550,41 @@ var ts;
                 while (ts.isPartOfExpression(node)) {
                     node = node.parent;
                 }
-                return node.kind === 144 /* Decorator */;
+                return node.kind === 145 /* Decorator */;
             };
             Rules.IsStartOfVariableDeclarationList = function (context) {
-                return context.currentTokenParent.kind === 220 /* VariableDeclarationList */ &&
+                return context.currentTokenParent.kind === 224 /* VariableDeclarationList */ &&
                     context.currentTokenParent.getStart(context.sourceFile) === context.currentTokenSpan.pos;
             };
             Rules.IsNotFormatOnEnter = function (context) {
                 return context.formattingRequestKind !== 2 /* FormatOnEnter */;
             };
             Rules.IsModuleDeclContext = function (context) {
-                return context.contextNode.kind === 226 /* ModuleDeclaration */;
+                return context.contextNode.kind === 230 /* ModuleDeclaration */;
             };
             Rules.IsObjectTypeContext = function (context) {
-                return context.contextNode.kind === 160 /* TypeLiteral */; // && context.contextNode.parent.kind !== SyntaxKind.InterfaceDeclaration;
+                return context.contextNode.kind === 161 /* TypeLiteral */; // && context.contextNode.parent.kind !== SyntaxKind.InterfaceDeclaration;
             };
             Rules.IsTypeArgumentOrParameterOrAssertion = function (token, parent) {
                 if (token.kind !== 26 /* LessThanToken */ && token.kind !== 28 /* GreaterThanToken */) {
                     return false;
                 }
                 switch (parent.kind) {
-                    case 156 /* TypeReference */:
-                    case 178 /* TypeAssertionExpression */:
-                    case 222 /* ClassDeclaration */:
-                    case 193 /* ClassExpression */:
-                    case 223 /* InterfaceDeclaration */:
-                    case 221 /* FunctionDeclaration */:
-                    case 180 /* FunctionExpression */:
-                    case 181 /* ArrowFunction */:
-                    case 148 /* MethodDeclaration */:
-                    case 147 /* MethodSignature */:
-                    case 152 /* CallSignature */:
-                    case 153 /* ConstructSignature */:
-                    case 175 /* CallExpression */:
-                    case 176 /* NewExpression */:
-                    case 195 /* ExpressionWithTypeArguments */:
+                    case 157 /* TypeReference */:
+                    case 182 /* TypeAssertionExpression */:
+                    case 226 /* ClassDeclaration */:
+                    case 197 /* ClassExpression */:
+                    case 227 /* InterfaceDeclaration */:
+                    case 225 /* FunctionDeclaration */:
+                    case 184 /* FunctionExpression */:
+                    case 185 /* ArrowFunction */:
+                    case 149 /* MethodDeclaration */:
+                    case 148 /* MethodSignature */:
+                    case 153 /* CallSignature */:
+                    case 154 /* ConstructSignature */:
+                    case 179 /* CallExpression */:
+                    case 180 /* NewExpression */:
+                    case 199 /* ExpressionWithTypeArguments */:
                         return true;
                     default:
                         return false;
@@ -71874,13 +74595,13 @@ var ts;
                     Rules.IsTypeArgumentOrParameterOrAssertion(context.nextTokenSpan, context.nextTokenParent);
             };
             Rules.IsTypeAssertionContext = function (context) {
-                return context.contextNode.kind === 178 /* TypeAssertionExpression */;
+                return context.contextNode.kind === 182 /* TypeAssertionExpression */;
             };
             Rules.IsVoidOpContext = function (context) {
-                return context.currentTokenSpan.kind === 104 /* VoidKeyword */ && context.currentTokenParent.kind === 184 /* VoidExpression */;
+                return context.currentTokenSpan.kind === 104 /* VoidKeyword */ && context.currentTokenParent.kind === 188 /* VoidExpression */;
             };
             Rules.IsYieldOrYieldStarWithOperand = function (context) {
-                return context.contextNode.kind === 191 /* YieldExpression */ && context.contextNode.expression !== undefined;
+                return context.contextNode.kind === 195 /* YieldExpression */ && context.contextNode.expression !== undefined;
             };
             return Rules;
         }());
@@ -71904,7 +74625,7 @@ var ts;
                 return result;
             };
             RulesMap.prototype.Initialize = function (rules) {
-                this.mapRowLength = 139 /* LastToken */ + 1;
+                this.mapRowLength = 140 /* LastToken */ + 1;
                 this.map = new Array(this.mapRowLength * this.mapRowLength); // new Array<RulesBucket>(this.mapRowLength * this.mapRowLength);
                 // This array is used only during construction of the rulesbucket in the map
                 var rulesBucketConstructionStateList = new Array(this.map.length); // new Array<RulesBucketConstructionState>(this.map.length);
@@ -71918,7 +74639,7 @@ var ts;
                 });
             };
             RulesMap.prototype.GetRuleBucketIndex = function (row, column) {
-                ts.Debug.assert(row <= 139 /* LastKeyword */ && column <= 139 /* LastKeyword */, "Must compute formatting context from tokens");
+                ts.Debug.assert(row <= 140 /* LastKeyword */ && column <= 140 /* LastKeyword */, "Must compute formatting context from tokens");
                 var rulesBucketIndex = (row * this.mapRowLength) + column;
                 return rulesBucketIndex;
             };
@@ -71955,6 +74676,7 @@ var ts;
         formatting.RulesMap = RulesMap;
         var MaskBitSize = 5;
         var Mask = 0x1f;
+        var RulesPosition;
         (function (RulesPosition) {
             RulesPosition[RulesPosition["IgnoreRulesSpecific"] = 0] = "IgnoreRulesSpecific";
             RulesPosition[RulesPosition["IgnoreRulesAny"] = MaskBitSize * 1] = "IgnoreRulesAny";
@@ -71962,8 +74684,7 @@ var ts;
             RulesPosition[RulesPosition["ContextRulesAny"] = MaskBitSize * 3] = "ContextRulesAny";
             RulesPosition[RulesPosition["NoContextRulesSpecific"] = MaskBitSize * 4] = "NoContextRulesSpecific";
             RulesPosition[RulesPosition["NoContextRulesAny"] = MaskBitSize * 5] = "NoContextRulesAny";
-        })(formatting.RulesPosition || (formatting.RulesPosition = {}));
-        var RulesPosition = formatting.RulesPosition;
+        })(RulesPosition = formatting.RulesPosition || (formatting.RulesPosition = {}));
         var RulesBucketConstructionState = (function () {
             function RulesBucketConstructionState() {
                 //// The Rules list contains all the inserted rules into a rulebucket in the following order:
@@ -72099,7 +74820,7 @@ var ts;
                 }
                 TokenAllAccess.prototype.GetTokens = function () {
                     var result = [];
-                    for (var token = 0 /* FirstToken */; token <= 139 /* LastToken */; token++) {
+                    for (var token = 0 /* FirstToken */; token <= 140 /* LastToken */; token++) {
                         result.push(token);
                     }
                     return result;
@@ -72143,9 +74864,9 @@ var ts;
             }());
             TokenRange.Any = TokenRange.AllTokens();
             TokenRange.AnyIncludingMultilineComments = TokenRange.FromTokens(TokenRange.Any.GetTokens().concat([3 /* MultiLineCommentTrivia */]));
-            TokenRange.Keywords = TokenRange.FromRange(71 /* FirstKeyword */, 139 /* LastKeyword */);
+            TokenRange.Keywords = TokenRange.FromRange(71 /* FirstKeyword */, 140 /* LastKeyword */);
             TokenRange.BinaryOperators = TokenRange.FromRange(26 /* FirstBinaryOperator */, 69 /* LastBinaryOperator */);
-            TokenRange.BinaryKeywordOperators = TokenRange.FromTokens([91 /* InKeyword */, 92 /* InstanceOfKeyword */, 139 /* OfKeyword */, 117 /* AsKeyword */, 125 /* IsKeyword */]);
+            TokenRange.BinaryKeywordOperators = TokenRange.FromTokens([91 /* InKeyword */, 92 /* InstanceOfKeyword */, 140 /* OfKeyword */, 117 /* AsKeyword */, 125 /* IsKeyword */]);
             TokenRange.UnaryPrefixOperators = TokenRange.FromTokens([42 /* PlusPlusToken */, 43 /* MinusMinusToken */, 51 /* TildeToken */, 50 /* ExclamationToken */]);
             TokenRange.UnaryPrefixExpressions = TokenRange.FromTokens([8 /* NumericLiteral */, 70 /* Identifier */, 18 /* OpenParenToken */, 20 /* OpenBracketToken */, 16 /* OpenBraceToken */, 98 /* ThisKeyword */, 93 /* NewKeyword */]);
             TokenRange.UnaryPreincrementExpressions = TokenRange.FromTokens([70 /* Identifier */, 18 /* OpenParenToken */, 98 /* ThisKeyword */, 93 /* NewKeyword */]);
@@ -72153,7 +74874,7 @@ var ts;
             TokenRange.UnaryPredecrementExpressions = TokenRange.FromTokens([70 /* Identifier */, 18 /* OpenParenToken */, 98 /* ThisKeyword */, 93 /* NewKeyword */]);
             TokenRange.UnaryPostdecrementExpressions = TokenRange.FromTokens([70 /* Identifier */, 19 /* CloseParenToken */, 21 /* CloseBracketToken */, 93 /* NewKeyword */]);
             TokenRange.Comments = TokenRange.FromTokens([2 /* SingleLineCommentTrivia */, 3 /* MultiLineCommentTrivia */]);
-            TokenRange.TypeNames = TokenRange.FromTokens([70 /* Identifier */, 131 /* NumberKeyword */, 133 /* StringKeyword */, 121 /* BooleanKeyword */, 134 /* SymbolKeyword */, 104 /* VoidKeyword */, 118 /* AnyKeyword */]);
+            TokenRange.TypeNames = TokenRange.FromTokens([70 /* Identifier */, 132 /* NumberKeyword */, 134 /* StringKeyword */, 121 /* BooleanKeyword */, 135 /* SymbolKeyword */, 104 /* VoidKeyword */, 118 /* AnyKeyword */]);
             Shared.TokenRange = TokenRange;
         })(Shared = formatting.Shared || (formatting.Shared = {}));
     })(formatting = ts.formatting || (ts.formatting = {}));
@@ -72412,17 +75133,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 222 /* ClassDeclaration */:
-                case 223 /* InterfaceDeclaration */:
+                case 226 /* ClassDeclaration */:
+                case 227 /* InterfaceDeclaration */:
                     return ts.rangeContainsRange(parent.members, node);
-                case 226 /* ModuleDeclaration */:
+                case 230 /* ModuleDeclaration */:
                     var body = parent.body;
-                    return body && body.kind === 227 /* ModuleBlock */ && ts.rangeContainsRange(body.statements, node);
-                case 256 /* SourceFile */:
-                case 200 /* Block */:
-                case 227 /* ModuleBlock */:
+                    return body && body.kind === 231 /* ModuleBlock */ && ts.rangeContainsRange(body.statements, node);
+                case 261 /* SourceFile */:
+                case 204 /* Block */:
+                case 231 /* ModuleBlock */:
                     return ts.rangeContainsRange(parent.statements, node);
-                case 252 /* CatchClause */:
+                case 256 /* CatchClause */:
                     return ts.rangeContainsRange(parent.block.statements, node);
             }
             return false;
@@ -72627,20 +75348,20 @@ var ts;
                     return node.modifiers[0].kind;
                 }
                 switch (node.kind) {
-                    case 222 /* ClassDeclaration */: return 74 /* ClassKeyword */;
-                    case 223 /* InterfaceDeclaration */: return 108 /* InterfaceKeyword */;
-                    case 221 /* FunctionDeclaration */: return 88 /* FunctionKeyword */;
-                    case 225 /* EnumDeclaration */: return 225 /* EnumDeclaration */;
-                    case 150 /* GetAccessor */: return 124 /* GetKeyword */;
-                    case 151 /* SetAccessor */: return 132 /* SetKeyword */;
-                    case 148 /* MethodDeclaration */:
+                    case 226 /* ClassDeclaration */: return 74 /* ClassKeyword */;
+                    case 227 /* InterfaceDeclaration */: return 108 /* InterfaceKeyword */;
+                    case 225 /* FunctionDeclaration */: return 88 /* FunctionKeyword */;
+                    case 229 /* EnumDeclaration */: return 229 /* EnumDeclaration */;
+                    case 151 /* GetAccessor */: return 124 /* GetKeyword */;
+                    case 152 /* SetAccessor */: return 133 /* SetKeyword */;
+                    case 149 /* MethodDeclaration */:
                         if (node.asteriskToken) {
                             return 38 /* AsteriskToken */;
                         } /*
                     fall-through
                     */
-                    case 146 /* PropertyDeclaration */:
-                    case 143 /* Parameter */:
+                    case 147 /* PropertyDeclaration */:
+                    case 144 /* Parameter */:
                         return node.name.kind;
                 }
             }
@@ -72784,11 +75505,11 @@ var ts;
                         consumeTokenAndAdvanceScanner(tokenInfo, node, parentDynamicIndentation, child);
                         return inheritedIndentation;
                     }
-                    var effectiveParentStartLine = child.kind === 144 /* Decorator */ ? childStartLine : undecoratedParentStartLine;
+                    var effectiveParentStartLine = child.kind === 145 /* Decorator */ ? childStartLine : undecoratedParentStartLine;
                     var childIndentation = computeIndentation(child, childStartLine, childIndentationAmount, node, parentDynamicIndentation, effectiveParentStartLine);
                     processNode(child, childContextNode, childStartLine, undecoratedChildStartLine, childIndentation.indentation, childIndentation.delta);
                     childContextNode = node;
-                    if (isFirstListItem && parent.kind === 171 /* ArrayLiteralExpression */ && inheritedIndentation === -1 /* Unknown */) {
+                    if (isFirstListItem && parent.kind === 175 /* ArrayLiteralExpression */ && inheritedIndentation === -1 /* Unknown */) {
                         inheritedIndentation = childIndentation.indentation;
                     }
                     return inheritedIndentation;
@@ -73133,12 +75854,12 @@ var ts;
         }
         function getOpenTokenForList(node, list) {
             switch (node.kind) {
-                case 149 /* Constructor */:
-                case 221 /* FunctionDeclaration */:
-                case 180 /* FunctionExpression */:
-                case 148 /* MethodDeclaration */:
-                case 147 /* MethodSignature */:
-                case 181 /* ArrowFunction */:
+                case 150 /* Constructor */:
+                case 225 /* FunctionDeclaration */:
+                case 184 /* FunctionExpression */:
+                case 149 /* MethodDeclaration */:
+                case 148 /* MethodSignature */:
+                case 185 /* ArrowFunction */:
                     if (node.typeParameters === list) {
                         return 26 /* LessThanToken */;
                     }
@@ -73146,8 +75867,8 @@ var ts;
                         return 18 /* OpenParenToken */;
                     }
                     break;
-                case 175 /* CallExpression */:
-                case 176 /* NewExpression */:
+                case 179 /* CallExpression */:
+                case 180 /* NewExpression */:
                     if (node.typeArguments === list) {
                         return 26 /* LessThanToken */;
                     }
@@ -73155,7 +75876,7 @@ var ts;
                         return 18 /* OpenParenToken */;
                     }
                     break;
-                case 156 /* TypeReference */:
+                case 157 /* TypeReference */:
                     if (node.typeArguments === list) {
                         return 26 /* LessThanToken */;
                     }
@@ -73271,7 +75992,7 @@ var ts;
                     var lineStart = ts.getLineStartPositionForPosition(current_1, sourceFile);
                     return SmartIndenter.findFirstNonWhitespaceColumn(lineStart, current_1, sourceFile, options);
                 }
-                if (precedingToken.kind === 25 /* CommaToken */ && precedingToken.parent.kind !== 188 /* BinaryExpression */) {
+                if (precedingToken.kind === 25 /* CommaToken */ && precedingToken.parent.kind !== 192 /* 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 */) {
@@ -73394,7 +76115,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 === 256 /* SourceFile */ || !parentAndChildShareLine);
+                    (parent.kind === 261 /* SourceFile */ || !parentAndChildShareLine);
                 if (!useActualIndentation) {
                     return -1 /* Unknown */;
                 }
@@ -73427,7 +76148,7 @@ var ts;
                 return sourceFile.getLineAndCharacterOfPosition(n.getStart(sourceFile));
             }
             function childStartsOnTheSameLineWithElseInIfStatement(parent, child, childStartLine, sourceFile) {
-                if (parent.kind === 204 /* IfStatement */ && parent.elseStatement === child) {
+                if (parent.kind === 208 /* IfStatement */ && parent.elseStatement === child) {
                     var elseKeyword = ts.findChildOfKind(parent, 81 /* ElseKeyword */, sourceFile);
                     ts.Debug.assert(elseKeyword !== undefined);
                     var elseKeywordStartLine = getStartLineAndCharacterForNode(elseKeyword, sourceFile).line;
@@ -73439,23 +76160,23 @@ var ts;
             function getContainingList(node, sourceFile) {
                 if (node.parent) {
                     switch (node.parent.kind) {
-                        case 156 /* TypeReference */:
+                        case 157 /* TypeReference */:
                             if (node.parent.typeArguments &&
                                 ts.rangeContainsStartEnd(node.parent.typeArguments, node.getStart(sourceFile), node.getEnd())) {
                                 return node.parent.typeArguments;
                             }
                             break;
-                        case 172 /* ObjectLiteralExpression */:
+                        case 176 /* ObjectLiteralExpression */:
                             return node.parent.properties;
-                        case 171 /* ArrayLiteralExpression */:
+                        case 175 /* ArrayLiteralExpression */:
                             return node.parent.elements;
-                        case 221 /* FunctionDeclaration */:
-                        case 180 /* FunctionExpression */:
-                        case 181 /* ArrowFunction */:
-                        case 148 /* MethodDeclaration */:
-                        case 147 /* MethodSignature */:
-                        case 152 /* CallSignature */:
-                        case 153 /* ConstructSignature */: {
+                        case 225 /* FunctionDeclaration */:
+                        case 184 /* FunctionExpression */:
+                        case 185 /* ArrowFunction */:
+                        case 149 /* MethodDeclaration */:
+                        case 148 /* MethodSignature */:
+                        case 153 /* CallSignature */:
+                        case 154 /* ConstructSignature */: {
                             var start = node.getStart(sourceFile);
                             if (node.parent.typeParameters &&
                                 ts.rangeContainsStartEnd(node.parent.typeParameters, start, node.getEnd())) {
@@ -73466,8 +76187,8 @@ var ts;
                             }
                             break;
                         }
-                        case 176 /* NewExpression */:
-                        case 175 /* CallExpression */: {
+                        case 180 /* NewExpression */:
+                        case 179 /* CallExpression */: {
                             var start = node.getStart(sourceFile);
                             if (node.parent.typeArguments &&
                                 ts.rangeContainsStartEnd(node.parent.typeArguments, start, node.getEnd())) {
@@ -73497,8 +76218,8 @@ var ts;
                 if (node.kind === 19 /* CloseParenToken */) {
                     return -1 /* Unknown */;
                 }
-                if (node.parent && (node.parent.kind === 175 /* CallExpression */ ||
-                    node.parent.kind === 176 /* NewExpression */) &&
+                if (node.parent && (node.parent.kind === 179 /* CallExpression */ ||
+                    node.parent.kind === 180 /* NewExpression */) &&
                     node.parent.expression !== node) {
                     var fullCallOrNewExpression = node.parent.expression;
                     var startingExpression = getStartingExpression(fullCallOrNewExpression);
@@ -73516,10 +76237,10 @@ var ts;
                 function getStartingExpression(node) {
                     while (true) {
                         switch (node.kind) {
-                            case 175 /* CallExpression */:
-                            case 176 /* NewExpression */:
-                            case 173 /* PropertyAccessExpression */:
-                            case 174 /* ElementAccessExpression */:
+                            case 179 /* CallExpression */:
+                            case 180 /* NewExpression */:
+                            case 177 /* PropertyAccessExpression */:
+                            case 178 /* ElementAccessExpression */:
                                 node = node.expression;
                                 break;
                             default:
@@ -73583,48 +76304,48 @@ var ts;
             SmartIndenter.findFirstNonWhitespaceColumn = findFirstNonWhitespaceColumn;
             function nodeContentIsAlwaysIndented(kind) {
                 switch (kind) {
-                    case 203 /* ExpressionStatement */:
-                    case 222 /* ClassDeclaration */:
-                    case 193 /* ClassExpression */:
-                    case 223 /* InterfaceDeclaration */:
-                    case 225 /* EnumDeclaration */:
-                    case 224 /* TypeAliasDeclaration */:
-                    case 171 /* ArrayLiteralExpression */:
-                    case 200 /* Block */:
-                    case 227 /* ModuleBlock */:
-                    case 172 /* ObjectLiteralExpression */:
-                    case 160 /* TypeLiteral */:
-                    case 162 /* TupleType */:
-                    case 228 /* CaseBlock */:
-                    case 250 /* DefaultClause */:
-                    case 249 /* CaseClause */:
-                    case 179 /* ParenthesizedExpression */:
-                    case 173 /* PropertyAccessExpression */:
-                    case 175 /* CallExpression */:
-                    case 176 /* NewExpression */:
-                    case 201 /* VariableStatement */:
-                    case 219 /* VariableDeclaration */:
-                    case 236 /* ExportAssignment */:
-                    case 212 /* ReturnStatement */:
-                    case 189 /* ConditionalExpression */:
-                    case 169 /* ArrayBindingPattern */:
-                    case 168 /* ObjectBindingPattern */:
-                    case 244 /* JsxOpeningElement */:
-                    case 243 /* JsxSelfClosingElement */:
-                    case 248 /* JsxExpression */:
-                    case 147 /* MethodSignature */:
-                    case 152 /* CallSignature */:
-                    case 153 /* ConstructSignature */:
-                    case 143 /* Parameter */:
-                    case 157 /* FunctionType */:
-                    case 158 /* ConstructorType */:
-                    case 165 /* ParenthesizedType */:
-                    case 177 /* TaggedTemplateExpression */:
-                    case 185 /* AwaitExpression */:
-                    case 238 /* NamedExports */:
-                    case 234 /* NamedImports */:
-                    case 239 /* ExportSpecifier */:
-                    case 235 /* ImportSpecifier */:
+                    case 207 /* ExpressionStatement */:
+                    case 226 /* ClassDeclaration */:
+                    case 197 /* ClassExpression */:
+                    case 227 /* InterfaceDeclaration */:
+                    case 229 /* EnumDeclaration */:
+                    case 228 /* TypeAliasDeclaration */:
+                    case 175 /* ArrayLiteralExpression */:
+                    case 204 /* Block */:
+                    case 231 /* ModuleBlock */:
+                    case 176 /* ObjectLiteralExpression */:
+                    case 161 /* TypeLiteral */:
+                    case 163 /* TupleType */:
+                    case 232 /* CaseBlock */:
+                    case 254 /* DefaultClause */:
+                    case 253 /* CaseClause */:
+                    case 183 /* ParenthesizedExpression */:
+                    case 177 /* PropertyAccessExpression */:
+                    case 179 /* CallExpression */:
+                    case 180 /* NewExpression */:
+                    case 205 /* VariableStatement */:
+                    case 223 /* VariableDeclaration */:
+                    case 240 /* ExportAssignment */:
+                    case 216 /* ReturnStatement */:
+                    case 193 /* ConditionalExpression */:
+                    case 173 /* ArrayBindingPattern */:
+                    case 172 /* ObjectBindingPattern */:
+                    case 248 /* JsxOpeningElement */:
+                    case 247 /* JsxSelfClosingElement */:
+                    case 252 /* JsxExpression */:
+                    case 148 /* MethodSignature */:
+                    case 153 /* CallSignature */:
+                    case 154 /* ConstructSignature */:
+                    case 144 /* Parameter */:
+                    case 158 /* FunctionType */:
+                    case 159 /* ConstructorType */:
+                    case 166 /* ParenthesizedType */:
+                    case 181 /* TaggedTemplateExpression */:
+                    case 189 /* AwaitExpression */:
+                    case 242 /* NamedExports */:
+                    case 238 /* NamedImports */:
+                    case 243 /* ExportSpecifier */:
+                    case 239 /* ImportSpecifier */:
                         return true;
                 }
                 return false;
@@ -73633,27 +76354,27 @@ var ts;
             function nodeWillIndentChild(parent, child, indentByDefault) {
                 var childKind = child ? child.kind : 0 /* Unknown */;
                 switch (parent.kind) {
-                    case 205 /* DoStatement */:
-                    case 206 /* WhileStatement */:
-                    case 208 /* ForInStatement */:
-                    case 209 /* ForOfStatement */:
-                    case 207 /* ForStatement */:
-                    case 204 /* IfStatement */:
-                    case 221 /* FunctionDeclaration */:
-                    case 180 /* FunctionExpression */:
-                    case 148 /* MethodDeclaration */:
-                    case 181 /* ArrowFunction */:
-                    case 149 /* Constructor */:
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
-                        return childKind !== 200 /* Block */;
-                    case 237 /* ExportDeclaration */:
-                        return childKind !== 238 /* NamedExports */;
-                    case 231 /* ImportDeclaration */:
-                        return childKind !== 232 /* ImportClause */ ||
-                            (child.namedBindings && child.namedBindings.kind !== 234 /* NamedImports */);
-                    case 242 /* JsxElement */:
-                        return childKind !== 245 /* JsxClosingElement */;
+                    case 209 /* DoStatement */:
+                    case 210 /* WhileStatement */:
+                    case 212 /* ForInStatement */:
+                    case 213 /* ForOfStatement */:
+                    case 211 /* ForStatement */:
+                    case 208 /* IfStatement */:
+                    case 225 /* FunctionDeclaration */:
+                    case 184 /* FunctionExpression */:
+                    case 149 /* MethodDeclaration */:
+                    case 185 /* ArrowFunction */:
+                    case 150 /* Constructor */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* SetAccessor */:
+                        return childKind !== 204 /* Block */;
+                    case 241 /* ExportDeclaration */:
+                        return childKind !== 242 /* NamedExports */;
+                    case 235 /* ImportDeclaration */:
+                        return childKind !== 236 /* ImportClause */ ||
+                            (child.namedBindings && child.namedBindings.kind !== 238 /* NamedImports */);
+                    case 246 /* JsxElement */:
+                        return childKind !== 249 /* JsxClosingElement */;
                 }
                 // No explicit rule for given nodes so the result will follow the default value argument
                 return indentByDefault;
@@ -73743,7 +76464,7 @@ var ts;
                 }
                 // figure out if the this access is actuall inside the supercall
                 // i.e. super(this.a), since in that case we won't suggest a fix
-                if (superCall.expression && superCall.expression.kind == 175 /* CallExpression */) {
+                if (superCall.expression && superCall.expression.kind == 179 /* CallExpression */) {
                     var arguments_1 = superCall.expression.arguments;
                     for (var i = 0; i < arguments_1.length; i++) {
                         if (arguments_1[i].expression === token) {
@@ -73767,7 +76488,7 @@ var ts;
                         changes: changes
                     }];
                 function findSuperCall(n) {
-                    if (n.kind === 203 /* ExpressionStatement */ && ts.isSuperCall(n.expression)) {
+                    if (n.kind === 207 /* ExpressionStatement */ && ts.isSuperCall(n.expression)) {
                         return n;
                     }
                     if (ts.isFunctionLike(n)) {
@@ -73812,7 +76533,7 @@ var ts;
     /** The version of the language service API */
     ts.servicesVersion = "0.5";
     function createNode(kind, pos, end, parent) {
-        var node = kind >= 140 /* FirstNode */ ? new NodeObject(kind, pos, end) :
+        var node = kind >= 141 /* FirstNode */ ? new NodeObject(kind, pos, end) :
             kind === 70 /* Identifier */ ? new IdentifierObject(70 /* Identifier */, pos, end) :
                 new TokenObject(kind, pos, end);
         node.parent = parent;
@@ -73824,7 +76545,6 @@ var ts;
             this.end = end;
             this.flags = 0 /* None */;
             this.transformFlags = undefined;
-            this.excludeTransformFlags = undefined;
             this.parent = undefined;
             this.kind = kind;
         }
@@ -73871,11 +76591,11 @@ var ts;
             return pos;
         };
         NodeObject.prototype.createSyntaxList = function (nodes) {
-            var list = createNode(286 /* SyntaxList */, nodes.pos, nodes.end, this);
+            var list = createNode(291 /* SyntaxList */, nodes.pos, nodes.end, this);
             list._children = [];
             var pos = nodes.pos;
-            for (var _i = 0, nodes_4 = nodes; _i < nodes_4.length; _i++) {
-                var node = nodes_4[_i];
+            for (var _i = 0, nodes_5 = nodes; _i < nodes_5.length; _i++) {
+                var node = nodes_5[_i];
                 if (pos < node.pos) {
                     pos = this.addSyntheticNodes(list._children, pos, node.pos);
                 }
@@ -73890,11 +76610,11 @@ var ts;
         NodeObject.prototype.createChildren = function (sourceFile) {
             var _this = this;
             var children;
-            if (this.kind >= 140 /* FirstNode */) {
+            if (this.kind >= 141 /* FirstNode */) {
                 ts.scanner.setText((sourceFile || this.getSourceFile()).text);
                 children = [];
                 var pos_3 = this.pos;
-                var useJSDocScanner_1 = this.kind >= 273 /* FirstJSDocTagNode */ && this.kind <= 285 /* LastJSDocTagNode */;
+                var useJSDocScanner_1 = this.kind >= 278 /* FirstJSDocTagNode */ && this.kind <= 290 /* LastJSDocTagNode */;
                 var processNode = function (node) {
                     var isJSDocTagNode = ts.isJSDocTag(node);
                     if (!isJSDocTagNode && pos_3 < node.pos) {
@@ -73952,7 +76672,7 @@ var ts;
                 return undefined;
             }
             var child = children[0];
-            return child.kind < 140 /* FirstNode */ ? child : child.getFirstToken(sourceFile);
+            return child.kind < 141 /* FirstNode */ ? child : child.getFirstToken(sourceFile);
         };
         NodeObject.prototype.getLastToken = function (sourceFile) {
             var children = this.getChildren(sourceFile);
@@ -73960,7 +76680,7 @@ var ts;
             if (!child) {
                 return undefined;
             }
-            return child.kind < 140 /* FirstNode */ ? child : child.getLastToken(sourceFile);
+            return child.kind < 141 /* FirstNode */ ? child : child.getLastToken(sourceFile);
         };
         return NodeObject;
     }());
@@ -74088,7 +76808,7 @@ var ts;
             return this.checker.getIndexTypeOfType(this, 1 /* Number */);
         };
         TypeObject.prototype.getBaseTypes = function () {
-            return this.flags & (32768 /* Class */ | 65536 /* Interface */)
+            return this.flags & 32768 /* Object */ && this.objectFlags & (1 /* Class */ | 2 /* Interface */)
                 ? this.checker.getBaseTypes(this)
                 : undefined;
         };
@@ -74163,9 +76883,9 @@ var ts;
                     if (result_6 !== undefined) {
                         return result_6;
                     }
-                    if (declaration.name.kind === 141 /* ComputedPropertyName */) {
+                    if (declaration.name.kind === 142 /* ComputedPropertyName */) {
                         var expr = declaration.name.expression;
-                        if (expr.kind === 173 /* PropertyAccessExpression */) {
+                        if (expr.kind === 177 /* PropertyAccessExpression */) {
                             return expr.name.text;
                         }
                         return getTextOfIdentifierOrLiteral(expr);
@@ -74185,10 +76905,10 @@ var ts;
             }
             function visit(node) {
                 switch (node.kind) {
-                    case 221 /* FunctionDeclaration */:
-                    case 180 /* FunctionExpression */:
-                    case 148 /* MethodDeclaration */:
-                    case 147 /* MethodSignature */:
+                    case 225 /* FunctionDeclaration */:
+                    case 184 /* FunctionExpression */:
+                    case 149 /* MethodDeclaration */:
+                    case 148 /* MethodSignature */:
                         var functionDeclaration = node;
                         var declarationName = getDeclarationName(functionDeclaration);
                         if (declarationName) {
@@ -74208,32 +76928,32 @@ var ts;
                             ts.forEachChild(node, visit);
                         }
                         break;
-                    case 222 /* ClassDeclaration */:
-                    case 193 /* ClassExpression */:
-                    case 223 /* InterfaceDeclaration */:
-                    case 224 /* TypeAliasDeclaration */:
-                    case 225 /* EnumDeclaration */:
-                    case 226 /* ModuleDeclaration */:
-                    case 230 /* ImportEqualsDeclaration */:
-                    case 239 /* ExportSpecifier */:
-                    case 235 /* ImportSpecifier */:
-                    case 230 /* ImportEqualsDeclaration */:
-                    case 232 /* ImportClause */:
-                    case 233 /* NamespaceImport */:
-                    case 150 /* GetAccessor */:
-                    case 151 /* SetAccessor */:
-                    case 160 /* TypeLiteral */:
+                    case 226 /* ClassDeclaration */:
+                    case 197 /* ClassExpression */:
+                    case 227 /* InterfaceDeclaration */:
+                    case 228 /* TypeAliasDeclaration */:
+                    case 229 /* EnumDeclaration */:
+                    case 230 /* ModuleDeclaration */:
+                    case 234 /* ImportEqualsDeclaration */:
+                    case 243 /* ExportSpecifier */:
+                    case 239 /* ImportSpecifier */:
+                    case 234 /* ImportEqualsDeclaration */:
+                    case 236 /* ImportClause */:
+                    case 237 /* NamespaceImport */:
+                    case 151 /* GetAccessor */:
+                    case 152 /* SetAccessor */:
+                    case 161 /* TypeLiteral */:
                         addDeclaration(node);
                         ts.forEachChild(node, visit);
                         break;
-                    case 143 /* Parameter */:
+                    case 144 /* Parameter */:
                         // Only consider parameter properties
                         if (!ts.hasModifier(node, 92 /* ParameterPropertyModifier */)) {
                             break;
                         }
                     // fall through
-                    case 219 /* VariableDeclaration */:
-                    case 170 /* BindingElement */: {
+                    case 223 /* VariableDeclaration */:
+                    case 174 /* BindingElement */: {
                         var decl = node;
                         if (ts.isBindingPattern(decl.name)) {
                             ts.forEachChild(decl.name, visit);
@@ -74242,19 +76962,19 @@ var ts;
                         if (decl.initializer)
                             visit(decl.initializer);
                     }
-                    case 255 /* EnumMember */:
-                    case 146 /* PropertyDeclaration */:
-                    case 145 /* PropertySignature */:
+                    case 260 /* EnumMember */:
+                    case 147 /* PropertyDeclaration */:
+                    case 146 /* PropertySignature */:
                         addDeclaration(node);
                         break;
-                    case 237 /* ExportDeclaration */:
+                    case 241 /* 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 231 /* ImportDeclaration */:
+                    case 235 /* ImportDeclaration */:
                         var importClause = node.importClause;
                         if (importClause) {
                             // Handle default import case e.g.:
@@ -74266,7 +76986,7 @@ var ts;
                             //    import * as NS from "mod";
                             //    import {a, b as B} from "mod";
                             if (importClause.namedBindings) {
-                                if (importClause.namedBindings.kind === 233 /* NamespaceImport */) {
+                                if (importClause.namedBindings.kind === 237 /* NamespaceImport */) {
                                     addDeclaration(importClause.namedBindings);
                                 }
                                 else {
@@ -74421,7 +77141,7 @@ var ts;
             var sourceFile;
             if (this.currentFileName !== fileName) {
                 // This is a new file, just parse it
-                sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, 4 /* Latest */, version, /*setNodeParents*/ true, scriptKind);
+                sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, 5 /* Latest */, version, /*setNodeParents*/ true, scriptKind);
             }
             else if (this.currentFileVersion !== version) {
                 // This is the same file, just a newer version. Incrementally parse the file.
@@ -74599,7 +77319,7 @@ var ts;
                 useCaseSensitiveFileNames: function () { return useCaseSensitivefileNames; },
                 getNewLine: function () { return ts.getNewLineOrDefaultFromHost(host); },
                 getDefaultLibFileName: function (options) { return host.getDefaultLibFileName(options); },
-                writeFile: function () { },
+                writeFile: ts.noop,
                 getCurrentDirectory: function () { return currentDirectory; },
                 fileExists: function (fileName) {
                     // stub missing host functionality
@@ -74796,10 +77516,10 @@ var ts;
                 // Try getting just type at this position and show
                 switch (node.kind) {
                     case 70 /* Identifier */:
-                    case 173 /* PropertyAccessExpression */:
-                    case 140 /* QualifiedName */:
+                    case 177 /* PropertyAccessExpression */:
+                    case 141 /* QualifiedName */:
                     case 98 /* ThisKeyword */:
-                    case 166 /* ThisType */:
+                    case 167 /* ThisType */:
                     case 96 /* SuperKeyword */:
                         // For the identifiers/this/super etc get the type at position
                         var type = typeChecker.getTypeAtLocation(node);
@@ -74942,15 +77662,15 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 173 /* PropertyAccessExpression */:
-                case 140 /* QualifiedName */:
+                case 177 /* PropertyAccessExpression */:
+                case 141 /* QualifiedName */:
                 case 9 /* StringLiteral */:
                 case 85 /* FalseKeyword */:
                 case 100 /* TrueKeyword */:
                 case 94 /* NullKeyword */:
                 case 96 /* SuperKeyword */:
                 case 98 /* ThisKeyword */:
-                case 166 /* ThisType */:
+                case 167 /* ThisType */:
                 case 70 /* Identifier */:
                     break;
                 // Cant create the text span
@@ -74967,7 +77687,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 === 226 /* ModuleDeclaration */ &&
+                    if (nodeForStartPos.parent.parent.kind === 230 /* ModuleDeclaration */ &&
                         nodeForStartPos.parent.parent.body === nodeForStartPos.parent) {
                         // Use parent module declarations name for start pos
                         nodeForStartPos = nodeForStartPos.parent.parent.name;
@@ -75351,7 +78071,7 @@ var ts;
                     // then we want 'something' to be in the name table.  Similarly, if we have
                     // "a['propname']" then we want to store "propname" in the name table.
                     if (ts.isDeclarationName(node) ||
-                        node.parent.kind === 241 /* ExternalModuleReference */ ||
+                        node.parent.kind === 245 /* ExternalModuleReference */ ||
                         isArgumentOfElementAccessExpression(node) ||
                         ts.isLiteralComputedPropertyDeclarationName(node)) {
                         nameTable[node.text] = nameTable[node.text] === undefined ? node.pos : -1;
@@ -75371,7 +78091,7 @@ var ts;
     function isArgumentOfElementAccessExpression(node) {
         return node &&
             node.parent &&
-            node.parent.kind === 174 /* ElementAccessExpression */ &&
+            node.parent.kind === 178 /* ElementAccessExpression */ &&
             node.parent.argumentExpression === node;
     }
     /**
@@ -75455,113 +78175,113 @@ var ts;
             function spanInNode(node) {
                 if (node) {
                     switch (node.kind) {
-                        case 201 /* VariableStatement */:
+                        case 205 /* VariableStatement */:
                             // Span on first variable declaration
                             return spanInVariableDeclaration(node.declarationList.declarations[0]);
-                        case 219 /* VariableDeclaration */:
-                        case 146 /* PropertyDeclaration */:
-                        case 145 /* PropertySignature */:
+                        case 223 /* VariableDeclaration */:
+                        case 147 /* PropertyDeclaration */:
+                        case 146 /* PropertySignature */:
                             return spanInVariableDeclaration(node);
-                        case 143 /* Parameter */:
+                        case 144 /* Parameter */:
                             return spanInParameterDeclaration(node);
-                        case 221 /* FunctionDeclaration */:
-                        case 148 /* MethodDeclaration */:
-                        case 147 /* MethodSignature */:
-                        case 150 /* GetAccessor */:
-                        case 151 /* SetAccessor */:
-                        case 149 /* Constructor */:
-                        case 180 /* FunctionExpression */:
-                        case 181 /* ArrowFunction */:
+                        case 225 /* FunctionDeclaration */:
+                        case 149 /* MethodDeclaration */:
+                        case 148 /* MethodSignature */:
+                        case 151 /* GetAccessor */:
+                        case 152 /* SetAccessor */:
+                        case 150 /* Constructor */:
+                        case 184 /* FunctionExpression */:
+                        case 185 /* ArrowFunction */:
                             return spanInFunctionDeclaration(node);
-                        case 200 /* Block */:
+                        case 204 /* Block */:
                             if (ts.isFunctionBlock(node)) {
                                 return spanInFunctionBlock(node);
                             }
                         // Fall through
-                        case 227 /* ModuleBlock */:
+                        case 231 /* ModuleBlock */:
                             return spanInBlock(node);
-                        case 252 /* CatchClause */:
+                        case 256 /* CatchClause */:
                             return spanInBlock(node.block);
-                        case 203 /* ExpressionStatement */:
+                        case 207 /* ExpressionStatement */:
                             // span on the expression
                             return textSpan(node.expression);
-                        case 212 /* ReturnStatement */:
+                        case 216 /* ReturnStatement */:
                             // span on return keyword and expression if present
                             return textSpan(node.getChildAt(0), node.expression);
-                        case 206 /* WhileStatement */:
+                        case 210 /* WhileStatement */:
                             // Span on while(...)
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 205 /* DoStatement */:
+                        case 209 /* DoStatement */:
                             // span in statement of the do statement
                             return spanInNode(node.statement);
-                        case 218 /* DebuggerStatement */:
+                        case 222 /* DebuggerStatement */:
                             // span on debugger keyword
                             return textSpan(node.getChildAt(0));
-                        case 204 /* IfStatement */:
+                        case 208 /* IfStatement */:
                             // set on if(..) span
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 215 /* LabeledStatement */:
+                        case 219 /* LabeledStatement */:
                             // span in statement
                             return spanInNode(node.statement);
-                        case 211 /* BreakStatement */:
-                        case 210 /* ContinueStatement */:
+                        case 215 /* BreakStatement */:
+                        case 214 /* ContinueStatement */:
                             // On break or continue keyword and label if present
                             return textSpan(node.getChildAt(0), node.label);
-                        case 207 /* ForStatement */:
+                        case 211 /* ForStatement */:
                             return spanInForStatement(node);
-                        case 208 /* ForInStatement */:
+                        case 212 /* ForInStatement */:
                             // span of for (a in ...)
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 209 /* ForOfStatement */:
+                        case 213 /* ForOfStatement */:
                             // span in initializer
                             return spanInInitializerOfForLike(node);
-                        case 214 /* SwitchStatement */:
+                        case 218 /* SwitchStatement */:
                             // span on switch(...)
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 249 /* CaseClause */:
-                        case 250 /* DefaultClause */:
+                        case 253 /* CaseClause */:
+                        case 254 /* DefaultClause */:
                             // span in first statement of the clause
                             return spanInNode(node.statements[0]);
-                        case 217 /* TryStatement */:
+                        case 221 /* TryStatement */:
                             // span in try block
                             return spanInBlock(node.tryBlock);
-                        case 216 /* ThrowStatement */:
+                        case 220 /* ThrowStatement */:
                             // span in throw ...
                             return textSpan(node, node.expression);
-                        case 236 /* ExportAssignment */:
+                        case 240 /* ExportAssignment */:
                             // span on export = id
                             return textSpan(node, node.expression);
-                        case 230 /* ImportEqualsDeclaration */:
+                        case 234 /* ImportEqualsDeclaration */:
                             // import statement without including semicolon
                             return textSpan(node, node.moduleReference);
-                        case 231 /* ImportDeclaration */:
+                        case 235 /* ImportDeclaration */:
                             // import statement without including semicolon
                             return textSpan(node, node.moduleSpecifier);
-                        case 237 /* ExportDeclaration */:
+                        case 241 /* ExportDeclaration */:
                             // import statement without including semicolon
                             return textSpan(node, node.moduleSpecifier);
-                        case 226 /* ModuleDeclaration */:
+                        case 230 /* ModuleDeclaration */:
                             // span on complete module if it is instantiated
                             if (ts.getModuleInstanceState(node) !== 1 /* Instantiated */) {
                                 return undefined;
                             }
-                        case 222 /* ClassDeclaration */:
-                        case 225 /* EnumDeclaration */:
-                        case 255 /* EnumMember */:
-                        case 170 /* BindingElement */:
+                        case 226 /* ClassDeclaration */:
+                        case 229 /* EnumDeclaration */:
+                        case 260 /* EnumMember */:
+                        case 174 /* BindingElement */:
                             // span on complete node
                             return textSpan(node);
-                        case 213 /* WithStatement */:
+                        case 217 /* WithStatement */:
                             // span in statement
                             return spanInNode(node.statement);
-                        case 144 /* Decorator */:
+                        case 145 /* Decorator */:
                             return spanInNodeArray(node.parent.decorators);
-                        case 168 /* ObjectBindingPattern */:
-                        case 169 /* ArrayBindingPattern */:
+                        case 172 /* ObjectBindingPattern */:
+                        case 173 /* ArrayBindingPattern */:
                             return spanInBindingPattern(node);
                         // No breakpoint in interface, type alias
-                        case 223 /* InterfaceDeclaration */:
-                        case 224 /* TypeAliasDeclaration */:
+                        case 227 /* InterfaceDeclaration */:
+                        case 228 /* TypeAliasDeclaration */:
                             return undefined;
                         // Tokens:
                         case 24 /* SemicolonToken */:
@@ -75591,7 +78311,7 @@ var ts;
                         case 73 /* CatchKeyword */:
                         case 86 /* FinallyKeyword */:
                             return spanInNextNode(node);
-                        case 139 /* OfKeyword */:
+                        case 140 /* OfKeyword */:
                             return spanInOfKeyword(node);
                         default:
                             // Destructuring pattern in destructuring assignment
@@ -75604,13 +78324,13 @@ var ts;
                             // a or ...c  or d: x from
                             // [a, b, ...c] or { a, b } or { d: x } from destructuring pattern
                             if ((node.kind === 70 /* Identifier */ ||
-                                node.kind == 192 /* SpreadElementExpression */ ||
-                                node.kind === 253 /* PropertyAssignment */ ||
-                                node.kind === 254 /* ShorthandPropertyAssignment */) &&
+                                node.kind == 196 /* SpreadElement */ ||
+                                node.kind === 257 /* PropertyAssignment */ ||
+                                node.kind === 258 /* ShorthandPropertyAssignment */) &&
                                 ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent)) {
                                 return textSpan(node);
                             }
-                            if (node.kind === 188 /* BinaryExpression */) {
+                            if (node.kind === 192 /* BinaryExpression */) {
                                 var binaryExpression = node;
                                 // Set breakpoint in destructuring pattern if its destructuring assignment
                                 // [a, b, c] or {a, b, c} of
@@ -75633,22 +78353,22 @@ var ts;
                             }
                             if (ts.isPartOfExpression(node)) {
                                 switch (node.parent.kind) {
-                                    case 205 /* DoStatement */:
+                                    case 209 /* DoStatement */:
                                         // Set span as if on while keyword
                                         return spanInPreviousNode(node);
-                                    case 144 /* Decorator */:
+                                    case 145 /* Decorator */:
                                         // Set breakpoint on the decorator emit
                                         return spanInNode(node.parent);
-                                    case 207 /* ForStatement */:
-                                    case 209 /* ForOfStatement */:
+                                    case 211 /* ForStatement */:
+                                    case 213 /* ForOfStatement */:
                                         return textSpan(node);
-                                    case 188 /* BinaryExpression */:
+                                    case 192 /* BinaryExpression */:
                                         if (node.parent.operatorToken.kind === 25 /* CommaToken */) {
                                             // If this is a comma expression, the breakpoint is possible in this expression
                                             return textSpan(node);
                                         }
                                         break;
-                                    case 181 /* ArrowFunction */:
+                                    case 185 /* ArrowFunction */:
                                         if (node.parent.body === node) {
                                             // If this is body of arrow function, it is allowed to have the breakpoint
                                             return textSpan(node);
@@ -75657,13 +78377,13 @@ var ts;
                                 }
                             }
                             // If this is name of property assignment, set breakpoint in the initializer
-                            if (node.parent.kind === 253 /* PropertyAssignment */ &&
+                            if (node.parent.kind === 257 /* PropertyAssignment */ &&
                                 node.parent.name === node &&
                                 !ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.parent)) {
                                 return spanInNode(node.parent.initializer);
                             }
                             // Breakpoint in type assertion goes to its operand
-                            if (node.parent.kind === 178 /* TypeAssertionExpression */ && node.parent.type === node) {
+                            if (node.parent.kind === 182 /* TypeAssertionExpression */ && node.parent.type === node) {
                                 return spanInNextNode(node.parent.type);
                             }
                             // return type of function go to previous token
@@ -75671,8 +78391,8 @@ var ts;
                                 return spanInPreviousNode(node);
                             }
                             // initializer of variable/parameter declaration go to previous node
-                            if ((node.parent.kind === 219 /* VariableDeclaration */ ||
-                                node.parent.kind === 143 /* Parameter */)) {
+                            if ((node.parent.kind === 223 /* VariableDeclaration */ ||
+                                node.parent.kind === 144 /* Parameter */)) {
                                 var paramOrVarDecl = node.parent;
                                 if (paramOrVarDecl.initializer === node ||
                                     paramOrVarDecl.type === node ||
@@ -75680,7 +78400,7 @@ var ts;
                                     return spanInPreviousNode(node);
                                 }
                             }
-                            if (node.parent.kind === 188 /* BinaryExpression */) {
+                            if (node.parent.kind === 192 /* BinaryExpression */) {
                                 var binaryExpression = node.parent;
                                 if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(binaryExpression.left) &&
                                     (binaryExpression.right === node ||
@@ -75706,7 +78426,7 @@ var ts;
                 }
                 function spanInVariableDeclaration(variableDeclaration) {
                     // If declaration of for in statement, just set the span in parent
-                    if (variableDeclaration.parent.parent.kind === 208 /* ForInStatement */) {
+                    if (variableDeclaration.parent.parent.kind === 212 /* ForInStatement */) {
                         return spanInNode(variableDeclaration.parent.parent);
                     }
                     // If this is a destructuring pattern, set breakpoint in binding pattern
@@ -75717,7 +78437,7 @@ var ts;
                     // or its declaration from 'for of'
                     if (variableDeclaration.initializer ||
                         ts.hasModifier(variableDeclaration, 1 /* Export */) ||
-                        variableDeclaration.parent.parent.kind === 209 /* ForOfStatement */) {
+                        variableDeclaration.parent.parent.kind === 213 /* ForOfStatement */) {
                         return textSpanFromVariableDeclaration(variableDeclaration);
                     }
                     var declarations = variableDeclaration.parent.declarations;
@@ -75757,7 +78477,7 @@ var ts;
                 }
                 function canFunctionHaveSpanInWholeDeclaration(functionDeclaration) {
                     return ts.hasModifier(functionDeclaration, 1 /* Export */) ||
-                        (functionDeclaration.parent.kind === 222 /* ClassDeclaration */ && functionDeclaration.kind !== 149 /* Constructor */);
+                        (functionDeclaration.parent.kind === 226 /* ClassDeclaration */ && functionDeclaration.kind !== 150 /* Constructor */);
                 }
                 function spanInFunctionDeclaration(functionDeclaration) {
                     // No breakpoints in the function signature
@@ -75780,25 +78500,25 @@ var ts;
                 }
                 function spanInBlock(block) {
                     switch (block.parent.kind) {
-                        case 226 /* ModuleDeclaration */:
+                        case 230 /* ModuleDeclaration */:
                             if (ts.getModuleInstanceState(block.parent) !== 1 /* Instantiated */) {
                                 return undefined;
                             }
                         // Set on parent if on same line otherwise on first statement
-                        case 206 /* WhileStatement */:
-                        case 204 /* IfStatement */:
-                        case 208 /* ForInStatement */:
+                        case 210 /* WhileStatement */:
+                        case 208 /* IfStatement */:
+                        case 212 /* 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 207 /* ForStatement */:
-                        case 209 /* ForOfStatement */:
+                        case 211 /* ForStatement */:
+                        case 213 /* 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 === 220 /* VariableDeclarationList */) {
+                    if (forLikeStatement.initializer.kind === 224 /* VariableDeclarationList */) {
                         // Declaration list - set breakpoint in first declaration
                         var variableDeclarationList = forLikeStatement.initializer;
                         if (variableDeclarationList.declarations.length > 0) {
@@ -75823,23 +78543,23 @@ var ts;
                 }
                 function spanInBindingPattern(bindingPattern) {
                     // Set breakpoint in first binding element
-                    var firstBindingElement = ts.forEach(bindingPattern.elements, function (element) { return element.kind !== 194 /* OmittedExpression */ ? element : undefined; });
+                    var firstBindingElement = ts.forEach(bindingPattern.elements, function (element) { return element.kind !== 198 /* OmittedExpression */ ? element : undefined; });
                     if (firstBindingElement) {
                         return spanInNode(firstBindingElement);
                     }
                     // Empty binding pattern of binding element, set breakpoint on binding element
-                    if (bindingPattern.parent.kind === 170 /* BindingElement */) {
+                    if (bindingPattern.parent.kind === 174 /* BindingElement */) {
                         return textSpan(bindingPattern.parent);
                     }
                     // Variable declaration is used as the span
                     return textSpanFromVariableDeclaration(bindingPattern.parent);
                 }
                 function spanInArrayLiteralOrObjectLiteralDestructuringPattern(node) {
-                    ts.Debug.assert(node.kind !== 169 /* ArrayBindingPattern */ && node.kind !== 168 /* ObjectBindingPattern */);
-                    var elements = node.kind === 171 /* ArrayLiteralExpression */ ?
+                    ts.Debug.assert(node.kind !== 173 /* ArrayBindingPattern */ && node.kind !== 172 /* ObjectBindingPattern */);
+                    var elements = node.kind === 175 /* ArrayLiteralExpression */ ?
                         node.elements :
                         node.properties;
-                    var firstBindingElement = ts.forEach(elements, function (element) { return element.kind !== 194 /* OmittedExpression */ ? element : undefined; });
+                    var firstBindingElement = ts.forEach(elements, function (element) { return element.kind !== 198 /* OmittedExpression */ ? element : undefined; });
                     if (firstBindingElement) {
                         return spanInNode(firstBindingElement);
                     }
@@ -75847,18 +78567,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 === 188 /* BinaryExpression */ ? node.parent : node);
+                    return textSpan(node.parent.kind === 192 /* BinaryExpression */ ? node.parent : node);
                 }
                 // Tokens:
                 function spanInOpenBraceToken(node) {
                     switch (node.parent.kind) {
-                        case 225 /* EnumDeclaration */:
+                        case 229 /* EnumDeclaration */:
                             var enumDeclaration = node.parent;
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), enumDeclaration.members.length ? enumDeclaration.members[0] : enumDeclaration.getLastToken(sourceFile));
-                        case 222 /* ClassDeclaration */:
+                        case 226 /* ClassDeclaration */:
                             var classDeclaration = node.parent;
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), classDeclaration.members.length ? classDeclaration.members[0] : classDeclaration.getLastToken(sourceFile));
-                        case 228 /* CaseBlock */:
+                        case 232 /* CaseBlock */:
                             return spanInNodeIfStartsOnSameLine(node.parent.parent, node.parent.clauses[0]);
                     }
                     // Default to parent node
@@ -75866,24 +78586,24 @@ var ts;
                 }
                 function spanInCloseBraceToken(node) {
                     switch (node.parent.kind) {
-                        case 227 /* ModuleBlock */:
+                        case 231 /* ModuleBlock */:
                             // If this is not an instantiated module block, no bp span
                             if (ts.getModuleInstanceState(node.parent.parent) !== 1 /* Instantiated */) {
                                 return undefined;
                             }
-                        case 225 /* EnumDeclaration */:
-                        case 222 /* ClassDeclaration */:
+                        case 229 /* EnumDeclaration */:
+                        case 226 /* ClassDeclaration */:
                             // Span on close brace token
                             return textSpan(node);
-                        case 200 /* Block */:
+                        case 204 /* Block */:
                             if (ts.isFunctionBlock(node.parent)) {
                                 // Span on close brace token
                                 return textSpan(node);
                             }
                         // fall through
-                        case 252 /* CatchClause */:
+                        case 256 /* CatchClause */:
                             return spanInNode(ts.lastOrUndefined(node.parent.statements));
-                        case 228 /* CaseBlock */:
+                        case 232 /* CaseBlock */:
                             // breakpoint in last statement of the last clause
                             var caseBlock = node.parent;
                             var lastClause = ts.lastOrUndefined(caseBlock.clauses);
@@ -75891,7 +78611,7 @@ var ts;
                                 return spanInNode(ts.lastOrUndefined(lastClause.statements));
                             }
                             return undefined;
-                        case 168 /* ObjectBindingPattern */:
+                        case 172 /* 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);
@@ -75907,7 +78627,7 @@ var ts;
                 }
                 function spanInCloseBracketToken(node) {
                     switch (node.parent.kind) {
-                        case 169 /* ArrayBindingPattern */:
+                        case 173 /* 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);
@@ -75922,12 +78642,12 @@ var ts;
                     }
                 }
                 function spanInOpenParenToken(node) {
-                    if (node.parent.kind === 205 /* DoStatement */ ||
-                        node.parent.kind === 175 /* CallExpression */ ||
-                        node.parent.kind === 176 /* NewExpression */) {
+                    if (node.parent.kind === 209 /* DoStatement */ ||
+                        node.parent.kind === 179 /* CallExpression */ ||
+                        node.parent.kind === 180 /* NewExpression */) {
                         return spanInPreviousNode(node);
                     }
-                    if (node.parent.kind === 179 /* ParenthesizedExpression */) {
+                    if (node.parent.kind === 183 /* ParenthesizedExpression */) {
                         return spanInNextNode(node);
                     }
                     // Default to parent node
@@ -75936,21 +78656,21 @@ var ts;
                 function spanInCloseParenToken(node) {
                     // Is this close paren token of parameter list, set span in previous token
                     switch (node.parent.kind) {
-                        case 180 /* FunctionExpression */:
-                        case 221 /* FunctionDeclaration */:
-                        case 181 /* ArrowFunction */:
-                        case 148 /* MethodDeclaration */:
-                        case 147 /* MethodSignature */:
-                        case 150 /* GetAccessor */:
-                        case 151 /* SetAccessor */:
-                        case 149 /* Constructor */:
-                        case 206 /* WhileStatement */:
-                        case 205 /* DoStatement */:
-                        case 207 /* ForStatement */:
-                        case 209 /* ForOfStatement */:
-                        case 175 /* CallExpression */:
-                        case 176 /* NewExpression */:
-                        case 179 /* ParenthesizedExpression */:
+                        case 184 /* FunctionExpression */:
+                        case 225 /* FunctionDeclaration */:
+                        case 185 /* ArrowFunction */:
+                        case 149 /* MethodDeclaration */:
+                        case 148 /* MethodSignature */:
+                        case 151 /* GetAccessor */:
+                        case 152 /* SetAccessor */:
+                        case 150 /* Constructor */:
+                        case 210 /* WhileStatement */:
+                        case 209 /* DoStatement */:
+                        case 211 /* ForStatement */:
+                        case 213 /* ForOfStatement */:
+                        case 179 /* CallExpression */:
+                        case 180 /* NewExpression */:
+                        case 183 /* ParenthesizedExpression */:
                             return spanInPreviousNode(node);
                         // Default to parent node
                         default:
@@ -75960,20 +78680,20 @@ var ts;
                 function spanInColonToken(node) {
                     // Is this : specifying return annotation of the function declaration
                     if (ts.isFunctionLike(node.parent) ||
-                        node.parent.kind === 253 /* PropertyAssignment */ ||
-                        node.parent.kind === 143 /* Parameter */) {
+                        node.parent.kind === 257 /* PropertyAssignment */ ||
+                        node.parent.kind === 144 /* Parameter */) {
                         return spanInPreviousNode(node);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInGreaterThanOrLessThanToken(node) {
-                    if (node.parent.kind === 178 /* TypeAssertionExpression */) {
+                    if (node.parent.kind === 182 /* TypeAssertionExpression */) {
                         return spanInNextNode(node);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInWhileKeyword(node) {
-                    if (node.parent.kind === 205 /* DoStatement */) {
+                    if (node.parent.kind === 209 /* DoStatement */) {
                         // Set span on while expression
                         return textSpanEndingAtNextToken(node, node.parent.expression);
                     }
@@ -75981,7 +78701,7 @@ var ts;
                     return spanInNode(node.parent);
                 }
                 function spanInOfKeyword(node) {
-                    if (node.parent.kind === 209 /* ForOfStatement */) {
+                    if (node.parent.kind === 213 /* ForOfStatement */) {
                         // Set using next token
                         return spanInNextNode(node);
                     }
@@ -76063,7 +78783,7 @@ var ts;
                     var resolutionsInFile = JSON.parse(_this.shimHost.getModuleResolutionsForFile(containingFile));
                     return ts.map(moduleNames, function (name) {
                         var result = ts.getProperty(resolutionsInFile, name);
-                        return result ? { resolvedFileName: result } : undefined;
+                        return result ? { resolvedFileName: result, extension: ts.extensionFromPath(result), isExternalLibraryImport: false } : undefined;
                     });
                 };
             }
@@ -76619,8 +79339,15 @@ var ts;
             return this.forwardJSONCall("resolveModuleName('" + fileName + "')", function () {
                 var compilerOptions = JSON.parse(compilerOptionsJson);
                 var result = ts.resolveModuleName(moduleName, ts.normalizeSlashes(fileName), compilerOptions, _this.host);
+                var resolvedFileName = result.resolvedModule ? result.resolvedModule.resolvedFileName : undefined;
+                if (resolvedFileName && !compilerOptions.allowJs && ts.fileExtensionIs(resolvedFileName, ".js")) {
+                    return {
+                        resolvedFileName: undefined,
+                        failedLookupLocations: []
+                    };
+                }
                 return {
-                    resolvedFileName: result.resolvedModule ? result.resolvedModule.resolvedFileName : undefined,
+                    resolvedFileName: resolvedFileName,
                     failedLookupLocations: result.failedLookupLocations
                 };
             });
@@ -76706,7 +79433,7 @@ var ts;
             var getCanonicalFileName = ts.createGetCanonicalFileName(/*useCaseSensitivefileNames:*/ false);
             return this.forwardJSONCall("discoverTypings()", function () {
                 var info = JSON.parse(discoverTypingsJson);
-                return ts.JsTyping.discoverTypings(_this.host, info.fileNames, ts.toPath(info.projectRootPath, info.projectRootPath, getCanonicalFileName), ts.toPath(info.safeListPath, info.safeListPath, getCanonicalFileName), info.packageNameToTypingLocation, info.typingOptions);
+                return ts.JsTyping.discoverTypings(_this.host, info.fileNames, ts.toPath(info.projectRootPath, info.projectRootPath, getCanonicalFileName), ts.toPath(info.safeListPath, info.safeListPath, getCanonicalFileName), info.packageNameToTypingLocation, info.typingOptions, info.unresolvedImports);
             });
         };
         return CoreServicesShimObject;
@@ -76789,11 +79516,7 @@ var TypeScript;
         Services.TypeScriptServicesFactory = ts.TypeScriptServicesFactory;
     })(Services = TypeScript.Services || (TypeScript.Services = {}));
 })(TypeScript || (TypeScript = {}));
-/* tslint:disable:no-unused-variable */
 // 'toolsVersion' gets consumed by the managed side, so it's not unused.
 // TODO: it should be moved into a namespace though.
 /* @internal */
-var toolsVersion = "2.1";
-/* tslint:enable:no-unused-variable */
-
-//# sourceMappingURL=typescriptServices.js.map
+var toolsVersion = "2.2";
diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js
index 147b38fde19..12fae035226 100644
--- a/lib/typingsInstaller.js
+++ b/lib/typingsInstaller.js
@@ -20,462 +20,19 @@ var __extends = (this && this.__extends) || function (d, b) {
 };
 var ts;
 (function (ts) {
-    (function (SyntaxKind) {
-        SyntaxKind[SyntaxKind["Unknown"] = 0] = "Unknown";
-        SyntaxKind[SyntaxKind["EndOfFileToken"] = 1] = "EndOfFileToken";
-        SyntaxKind[SyntaxKind["SingleLineCommentTrivia"] = 2] = "SingleLineCommentTrivia";
-        SyntaxKind[SyntaxKind["MultiLineCommentTrivia"] = 3] = "MultiLineCommentTrivia";
-        SyntaxKind[SyntaxKind["NewLineTrivia"] = 4] = "NewLineTrivia";
-        SyntaxKind[SyntaxKind["WhitespaceTrivia"] = 5] = "WhitespaceTrivia";
-        SyntaxKind[SyntaxKind["ShebangTrivia"] = 6] = "ShebangTrivia";
-        SyntaxKind[SyntaxKind["ConflictMarkerTrivia"] = 7] = "ConflictMarkerTrivia";
-        SyntaxKind[SyntaxKind["NumericLiteral"] = 8] = "NumericLiteral";
-        SyntaxKind[SyntaxKind["StringLiteral"] = 9] = "StringLiteral";
-        SyntaxKind[SyntaxKind["JsxText"] = 10] = "JsxText";
-        SyntaxKind[SyntaxKind["RegularExpressionLiteral"] = 11] = "RegularExpressionLiteral";
-        SyntaxKind[SyntaxKind["NoSubstitutionTemplateLiteral"] = 12] = "NoSubstitutionTemplateLiteral";
-        SyntaxKind[SyntaxKind["TemplateHead"] = 13] = "TemplateHead";
-        SyntaxKind[SyntaxKind["TemplateMiddle"] = 14] = "TemplateMiddle";
-        SyntaxKind[SyntaxKind["TemplateTail"] = 15] = "TemplateTail";
-        SyntaxKind[SyntaxKind["OpenBraceToken"] = 16] = "OpenBraceToken";
-        SyntaxKind[SyntaxKind["CloseBraceToken"] = 17] = "CloseBraceToken";
-        SyntaxKind[SyntaxKind["OpenParenToken"] = 18] = "OpenParenToken";
-        SyntaxKind[SyntaxKind["CloseParenToken"] = 19] = "CloseParenToken";
-        SyntaxKind[SyntaxKind["OpenBracketToken"] = 20] = "OpenBracketToken";
-        SyntaxKind[SyntaxKind["CloseBracketToken"] = 21] = "CloseBracketToken";
-        SyntaxKind[SyntaxKind["DotToken"] = 22] = "DotToken";
-        SyntaxKind[SyntaxKind["DotDotDotToken"] = 23] = "DotDotDotToken";
-        SyntaxKind[SyntaxKind["SemicolonToken"] = 24] = "SemicolonToken";
-        SyntaxKind[SyntaxKind["CommaToken"] = 25] = "CommaToken";
-        SyntaxKind[SyntaxKind["LessThanToken"] = 26] = "LessThanToken";
-        SyntaxKind[SyntaxKind["LessThanSlashToken"] = 27] = "LessThanSlashToken";
-        SyntaxKind[SyntaxKind["GreaterThanToken"] = 28] = "GreaterThanToken";
-        SyntaxKind[SyntaxKind["LessThanEqualsToken"] = 29] = "LessThanEqualsToken";
-        SyntaxKind[SyntaxKind["GreaterThanEqualsToken"] = 30] = "GreaterThanEqualsToken";
-        SyntaxKind[SyntaxKind["EqualsEqualsToken"] = 31] = "EqualsEqualsToken";
-        SyntaxKind[SyntaxKind["ExclamationEqualsToken"] = 32] = "ExclamationEqualsToken";
-        SyntaxKind[SyntaxKind["EqualsEqualsEqualsToken"] = 33] = "EqualsEqualsEqualsToken";
-        SyntaxKind[SyntaxKind["ExclamationEqualsEqualsToken"] = 34] = "ExclamationEqualsEqualsToken";
-        SyntaxKind[SyntaxKind["EqualsGreaterThanToken"] = 35] = "EqualsGreaterThanToken";
-        SyntaxKind[SyntaxKind["PlusToken"] = 36] = "PlusToken";
-        SyntaxKind[SyntaxKind["MinusToken"] = 37] = "MinusToken";
-        SyntaxKind[SyntaxKind["AsteriskToken"] = 38] = "AsteriskToken";
-        SyntaxKind[SyntaxKind["AsteriskAsteriskToken"] = 39] = "AsteriskAsteriskToken";
-        SyntaxKind[SyntaxKind["SlashToken"] = 40] = "SlashToken";
-        SyntaxKind[SyntaxKind["PercentToken"] = 41] = "PercentToken";
-        SyntaxKind[SyntaxKind["PlusPlusToken"] = 42] = "PlusPlusToken";
-        SyntaxKind[SyntaxKind["MinusMinusToken"] = 43] = "MinusMinusToken";
-        SyntaxKind[SyntaxKind["LessThanLessThanToken"] = 44] = "LessThanLessThanToken";
-        SyntaxKind[SyntaxKind["GreaterThanGreaterThanToken"] = 45] = "GreaterThanGreaterThanToken";
-        SyntaxKind[SyntaxKind["GreaterThanGreaterThanGreaterThanToken"] = 46] = "GreaterThanGreaterThanGreaterThanToken";
-        SyntaxKind[SyntaxKind["AmpersandToken"] = 47] = "AmpersandToken";
-        SyntaxKind[SyntaxKind["BarToken"] = 48] = "BarToken";
-        SyntaxKind[SyntaxKind["CaretToken"] = 49] = "CaretToken";
-        SyntaxKind[SyntaxKind["ExclamationToken"] = 50] = "ExclamationToken";
-        SyntaxKind[SyntaxKind["TildeToken"] = 51] = "TildeToken";
-        SyntaxKind[SyntaxKind["AmpersandAmpersandToken"] = 52] = "AmpersandAmpersandToken";
-        SyntaxKind[SyntaxKind["BarBarToken"] = 53] = "BarBarToken";
-        SyntaxKind[SyntaxKind["QuestionToken"] = 54] = "QuestionToken";
-        SyntaxKind[SyntaxKind["ColonToken"] = 55] = "ColonToken";
-        SyntaxKind[SyntaxKind["AtToken"] = 56] = "AtToken";
-        SyntaxKind[SyntaxKind["EqualsToken"] = 57] = "EqualsToken";
-        SyntaxKind[SyntaxKind["PlusEqualsToken"] = 58] = "PlusEqualsToken";
-        SyntaxKind[SyntaxKind["MinusEqualsToken"] = 59] = "MinusEqualsToken";
-        SyntaxKind[SyntaxKind["AsteriskEqualsToken"] = 60] = "AsteriskEqualsToken";
-        SyntaxKind[SyntaxKind["AsteriskAsteriskEqualsToken"] = 61] = "AsteriskAsteriskEqualsToken";
-        SyntaxKind[SyntaxKind["SlashEqualsToken"] = 62] = "SlashEqualsToken";
-        SyntaxKind[SyntaxKind["PercentEqualsToken"] = 63] = "PercentEqualsToken";
-        SyntaxKind[SyntaxKind["LessThanLessThanEqualsToken"] = 64] = "LessThanLessThanEqualsToken";
-        SyntaxKind[SyntaxKind["GreaterThanGreaterThanEqualsToken"] = 65] = "GreaterThanGreaterThanEqualsToken";
-        SyntaxKind[SyntaxKind["GreaterThanGreaterThanGreaterThanEqualsToken"] = 66] = "GreaterThanGreaterThanGreaterThanEqualsToken";
-        SyntaxKind[SyntaxKind["AmpersandEqualsToken"] = 67] = "AmpersandEqualsToken";
-        SyntaxKind[SyntaxKind["BarEqualsToken"] = 68] = "BarEqualsToken";
-        SyntaxKind[SyntaxKind["CaretEqualsToken"] = 69] = "CaretEqualsToken";
-        SyntaxKind[SyntaxKind["Identifier"] = 70] = "Identifier";
-        SyntaxKind[SyntaxKind["BreakKeyword"] = 71] = "BreakKeyword";
-        SyntaxKind[SyntaxKind["CaseKeyword"] = 72] = "CaseKeyword";
-        SyntaxKind[SyntaxKind["CatchKeyword"] = 73] = "CatchKeyword";
-        SyntaxKind[SyntaxKind["ClassKeyword"] = 74] = "ClassKeyword";
-        SyntaxKind[SyntaxKind["ConstKeyword"] = 75] = "ConstKeyword";
-        SyntaxKind[SyntaxKind["ContinueKeyword"] = 76] = "ContinueKeyword";
-        SyntaxKind[SyntaxKind["DebuggerKeyword"] = 77] = "DebuggerKeyword";
-        SyntaxKind[SyntaxKind["DefaultKeyword"] = 78] = "DefaultKeyword";
-        SyntaxKind[SyntaxKind["DeleteKeyword"] = 79] = "DeleteKeyword";
-        SyntaxKind[SyntaxKind["DoKeyword"] = 80] = "DoKeyword";
-        SyntaxKind[SyntaxKind["ElseKeyword"] = 81] = "ElseKeyword";
-        SyntaxKind[SyntaxKind["EnumKeyword"] = 82] = "EnumKeyword";
-        SyntaxKind[SyntaxKind["ExportKeyword"] = 83] = "ExportKeyword";
-        SyntaxKind[SyntaxKind["ExtendsKeyword"] = 84] = "ExtendsKeyword";
-        SyntaxKind[SyntaxKind["FalseKeyword"] = 85] = "FalseKeyword";
-        SyntaxKind[SyntaxKind["FinallyKeyword"] = 86] = "FinallyKeyword";
-        SyntaxKind[SyntaxKind["ForKeyword"] = 87] = "ForKeyword";
-        SyntaxKind[SyntaxKind["FunctionKeyword"] = 88] = "FunctionKeyword";
-        SyntaxKind[SyntaxKind["IfKeyword"] = 89] = "IfKeyword";
-        SyntaxKind[SyntaxKind["ImportKeyword"] = 90] = "ImportKeyword";
-        SyntaxKind[SyntaxKind["InKeyword"] = 91] = "InKeyword";
-        SyntaxKind[SyntaxKind["InstanceOfKeyword"] = 92] = "InstanceOfKeyword";
-        SyntaxKind[SyntaxKind["NewKeyword"] = 93] = "NewKeyword";
-        SyntaxKind[SyntaxKind["NullKeyword"] = 94] = "NullKeyword";
-        SyntaxKind[SyntaxKind["ReturnKeyword"] = 95] = "ReturnKeyword";
-        SyntaxKind[SyntaxKind["SuperKeyword"] = 96] = "SuperKeyword";
-        SyntaxKind[SyntaxKind["SwitchKeyword"] = 97] = "SwitchKeyword";
-        SyntaxKind[SyntaxKind["ThisKeyword"] = 98] = "ThisKeyword";
-        SyntaxKind[SyntaxKind["ThrowKeyword"] = 99] = "ThrowKeyword";
-        SyntaxKind[SyntaxKind["TrueKeyword"] = 100] = "TrueKeyword";
-        SyntaxKind[SyntaxKind["TryKeyword"] = 101] = "TryKeyword";
-        SyntaxKind[SyntaxKind["TypeOfKeyword"] = 102] = "TypeOfKeyword";
-        SyntaxKind[SyntaxKind["VarKeyword"] = 103] = "VarKeyword";
-        SyntaxKind[SyntaxKind["VoidKeyword"] = 104] = "VoidKeyword";
-        SyntaxKind[SyntaxKind["WhileKeyword"] = 105] = "WhileKeyword";
-        SyntaxKind[SyntaxKind["WithKeyword"] = 106] = "WithKeyword";
-        SyntaxKind[SyntaxKind["ImplementsKeyword"] = 107] = "ImplementsKeyword";
-        SyntaxKind[SyntaxKind["InterfaceKeyword"] = 108] = "InterfaceKeyword";
-        SyntaxKind[SyntaxKind["LetKeyword"] = 109] = "LetKeyword";
-        SyntaxKind[SyntaxKind["PackageKeyword"] = 110] = "PackageKeyword";
-        SyntaxKind[SyntaxKind["PrivateKeyword"] = 111] = "PrivateKeyword";
-        SyntaxKind[SyntaxKind["ProtectedKeyword"] = 112] = "ProtectedKeyword";
-        SyntaxKind[SyntaxKind["PublicKeyword"] = 113] = "PublicKeyword";
-        SyntaxKind[SyntaxKind["StaticKeyword"] = 114] = "StaticKeyword";
-        SyntaxKind[SyntaxKind["YieldKeyword"] = 115] = "YieldKeyword";
-        SyntaxKind[SyntaxKind["AbstractKeyword"] = 116] = "AbstractKeyword";
-        SyntaxKind[SyntaxKind["AsKeyword"] = 117] = "AsKeyword";
-        SyntaxKind[SyntaxKind["AnyKeyword"] = 118] = "AnyKeyword";
-        SyntaxKind[SyntaxKind["AsyncKeyword"] = 119] = "AsyncKeyword";
-        SyntaxKind[SyntaxKind["AwaitKeyword"] = 120] = "AwaitKeyword";
-        SyntaxKind[SyntaxKind["BooleanKeyword"] = 121] = "BooleanKeyword";
-        SyntaxKind[SyntaxKind["ConstructorKeyword"] = 122] = "ConstructorKeyword";
-        SyntaxKind[SyntaxKind["DeclareKeyword"] = 123] = "DeclareKeyword";
-        SyntaxKind[SyntaxKind["GetKeyword"] = 124] = "GetKeyword";
-        SyntaxKind[SyntaxKind["IsKeyword"] = 125] = "IsKeyword";
-        SyntaxKind[SyntaxKind["ModuleKeyword"] = 126] = "ModuleKeyword";
-        SyntaxKind[SyntaxKind["NamespaceKeyword"] = 127] = "NamespaceKeyword";
-        SyntaxKind[SyntaxKind["NeverKeyword"] = 128] = "NeverKeyword";
-        SyntaxKind[SyntaxKind["ReadonlyKeyword"] = 129] = "ReadonlyKeyword";
-        SyntaxKind[SyntaxKind["RequireKeyword"] = 130] = "RequireKeyword";
-        SyntaxKind[SyntaxKind["NumberKeyword"] = 131] = "NumberKeyword";
-        SyntaxKind[SyntaxKind["SetKeyword"] = 132] = "SetKeyword";
-        SyntaxKind[SyntaxKind["StringKeyword"] = 133] = "StringKeyword";
-        SyntaxKind[SyntaxKind["SymbolKeyword"] = 134] = "SymbolKeyword";
-        SyntaxKind[SyntaxKind["TypeKeyword"] = 135] = "TypeKeyword";
-        SyntaxKind[SyntaxKind["UndefinedKeyword"] = 136] = "UndefinedKeyword";
-        SyntaxKind[SyntaxKind["FromKeyword"] = 137] = "FromKeyword";
-        SyntaxKind[SyntaxKind["GlobalKeyword"] = 138] = "GlobalKeyword";
-        SyntaxKind[SyntaxKind["OfKeyword"] = 139] = "OfKeyword";
-        SyntaxKind[SyntaxKind["QualifiedName"] = 140] = "QualifiedName";
-        SyntaxKind[SyntaxKind["ComputedPropertyName"] = 141] = "ComputedPropertyName";
-        SyntaxKind[SyntaxKind["TypeParameter"] = 142] = "TypeParameter";
-        SyntaxKind[SyntaxKind["Parameter"] = 143] = "Parameter";
-        SyntaxKind[SyntaxKind["Decorator"] = 144] = "Decorator";
-        SyntaxKind[SyntaxKind["PropertySignature"] = 145] = "PropertySignature";
-        SyntaxKind[SyntaxKind["PropertyDeclaration"] = 146] = "PropertyDeclaration";
-        SyntaxKind[SyntaxKind["MethodSignature"] = 147] = "MethodSignature";
-        SyntaxKind[SyntaxKind["MethodDeclaration"] = 148] = "MethodDeclaration";
-        SyntaxKind[SyntaxKind["Constructor"] = 149] = "Constructor";
-        SyntaxKind[SyntaxKind["GetAccessor"] = 150] = "GetAccessor";
-        SyntaxKind[SyntaxKind["SetAccessor"] = 151] = "SetAccessor";
-        SyntaxKind[SyntaxKind["CallSignature"] = 152] = "CallSignature";
-        SyntaxKind[SyntaxKind["ConstructSignature"] = 153] = "ConstructSignature";
-        SyntaxKind[SyntaxKind["IndexSignature"] = 154] = "IndexSignature";
-        SyntaxKind[SyntaxKind["TypePredicate"] = 155] = "TypePredicate";
-        SyntaxKind[SyntaxKind["TypeReference"] = 156] = "TypeReference";
-        SyntaxKind[SyntaxKind["FunctionType"] = 157] = "FunctionType";
-        SyntaxKind[SyntaxKind["ConstructorType"] = 158] = "ConstructorType";
-        SyntaxKind[SyntaxKind["TypeQuery"] = 159] = "TypeQuery";
-        SyntaxKind[SyntaxKind["TypeLiteral"] = 160] = "TypeLiteral";
-        SyntaxKind[SyntaxKind["ArrayType"] = 161] = "ArrayType";
-        SyntaxKind[SyntaxKind["TupleType"] = 162] = "TupleType";
-        SyntaxKind[SyntaxKind["UnionType"] = 163] = "UnionType";
-        SyntaxKind[SyntaxKind["IntersectionType"] = 164] = "IntersectionType";
-        SyntaxKind[SyntaxKind["ParenthesizedType"] = 165] = "ParenthesizedType";
-        SyntaxKind[SyntaxKind["ThisType"] = 166] = "ThisType";
-        SyntaxKind[SyntaxKind["LiteralType"] = 167] = "LiteralType";
-        SyntaxKind[SyntaxKind["ObjectBindingPattern"] = 168] = "ObjectBindingPattern";
-        SyntaxKind[SyntaxKind["ArrayBindingPattern"] = 169] = "ArrayBindingPattern";
-        SyntaxKind[SyntaxKind["BindingElement"] = 170] = "BindingElement";
-        SyntaxKind[SyntaxKind["ArrayLiteralExpression"] = 171] = "ArrayLiteralExpression";
-        SyntaxKind[SyntaxKind["ObjectLiteralExpression"] = 172] = "ObjectLiteralExpression";
-        SyntaxKind[SyntaxKind["PropertyAccessExpression"] = 173] = "PropertyAccessExpression";
-        SyntaxKind[SyntaxKind["ElementAccessExpression"] = 174] = "ElementAccessExpression";
-        SyntaxKind[SyntaxKind["CallExpression"] = 175] = "CallExpression";
-        SyntaxKind[SyntaxKind["NewExpression"] = 176] = "NewExpression";
-        SyntaxKind[SyntaxKind["TaggedTemplateExpression"] = 177] = "TaggedTemplateExpression";
-        SyntaxKind[SyntaxKind["TypeAssertionExpression"] = 178] = "TypeAssertionExpression";
-        SyntaxKind[SyntaxKind["ParenthesizedExpression"] = 179] = "ParenthesizedExpression";
-        SyntaxKind[SyntaxKind["FunctionExpression"] = 180] = "FunctionExpression";
-        SyntaxKind[SyntaxKind["ArrowFunction"] = 181] = "ArrowFunction";
-        SyntaxKind[SyntaxKind["DeleteExpression"] = 182] = "DeleteExpression";
-        SyntaxKind[SyntaxKind["TypeOfExpression"] = 183] = "TypeOfExpression";
-        SyntaxKind[SyntaxKind["VoidExpression"] = 184] = "VoidExpression";
-        SyntaxKind[SyntaxKind["AwaitExpression"] = 185] = "AwaitExpression";
-        SyntaxKind[SyntaxKind["PrefixUnaryExpression"] = 186] = "PrefixUnaryExpression";
-        SyntaxKind[SyntaxKind["PostfixUnaryExpression"] = 187] = "PostfixUnaryExpression";
-        SyntaxKind[SyntaxKind["BinaryExpression"] = 188] = "BinaryExpression";
-        SyntaxKind[SyntaxKind["ConditionalExpression"] = 189] = "ConditionalExpression";
-        SyntaxKind[SyntaxKind["TemplateExpression"] = 190] = "TemplateExpression";
-        SyntaxKind[SyntaxKind["YieldExpression"] = 191] = "YieldExpression";
-        SyntaxKind[SyntaxKind["SpreadElementExpression"] = 192] = "SpreadElementExpression";
-        SyntaxKind[SyntaxKind["ClassExpression"] = 193] = "ClassExpression";
-        SyntaxKind[SyntaxKind["OmittedExpression"] = 194] = "OmittedExpression";
-        SyntaxKind[SyntaxKind["ExpressionWithTypeArguments"] = 195] = "ExpressionWithTypeArguments";
-        SyntaxKind[SyntaxKind["AsExpression"] = 196] = "AsExpression";
-        SyntaxKind[SyntaxKind["NonNullExpression"] = 197] = "NonNullExpression";
-        SyntaxKind[SyntaxKind["TemplateSpan"] = 198] = "TemplateSpan";
-        SyntaxKind[SyntaxKind["SemicolonClassElement"] = 199] = "SemicolonClassElement";
-        SyntaxKind[SyntaxKind["Block"] = 200] = "Block";
-        SyntaxKind[SyntaxKind["VariableStatement"] = 201] = "VariableStatement";
-        SyntaxKind[SyntaxKind["EmptyStatement"] = 202] = "EmptyStatement";
-        SyntaxKind[SyntaxKind["ExpressionStatement"] = 203] = "ExpressionStatement";
-        SyntaxKind[SyntaxKind["IfStatement"] = 204] = "IfStatement";
-        SyntaxKind[SyntaxKind["DoStatement"] = 205] = "DoStatement";
-        SyntaxKind[SyntaxKind["WhileStatement"] = 206] = "WhileStatement";
-        SyntaxKind[SyntaxKind["ForStatement"] = 207] = "ForStatement";
-        SyntaxKind[SyntaxKind["ForInStatement"] = 208] = "ForInStatement";
-        SyntaxKind[SyntaxKind["ForOfStatement"] = 209] = "ForOfStatement";
-        SyntaxKind[SyntaxKind["ContinueStatement"] = 210] = "ContinueStatement";
-        SyntaxKind[SyntaxKind["BreakStatement"] = 211] = "BreakStatement";
-        SyntaxKind[SyntaxKind["ReturnStatement"] = 212] = "ReturnStatement";
-        SyntaxKind[SyntaxKind["WithStatement"] = 213] = "WithStatement";
-        SyntaxKind[SyntaxKind["SwitchStatement"] = 214] = "SwitchStatement";
-        SyntaxKind[SyntaxKind["LabeledStatement"] = 215] = "LabeledStatement";
-        SyntaxKind[SyntaxKind["ThrowStatement"] = 216] = "ThrowStatement";
-        SyntaxKind[SyntaxKind["TryStatement"] = 217] = "TryStatement";
-        SyntaxKind[SyntaxKind["DebuggerStatement"] = 218] = "DebuggerStatement";
-        SyntaxKind[SyntaxKind["VariableDeclaration"] = 219] = "VariableDeclaration";
-        SyntaxKind[SyntaxKind["VariableDeclarationList"] = 220] = "VariableDeclarationList";
-        SyntaxKind[SyntaxKind["FunctionDeclaration"] = 221] = "FunctionDeclaration";
-        SyntaxKind[SyntaxKind["ClassDeclaration"] = 222] = "ClassDeclaration";
-        SyntaxKind[SyntaxKind["InterfaceDeclaration"] = 223] = "InterfaceDeclaration";
-        SyntaxKind[SyntaxKind["TypeAliasDeclaration"] = 224] = "TypeAliasDeclaration";
-        SyntaxKind[SyntaxKind["EnumDeclaration"] = 225] = "EnumDeclaration";
-        SyntaxKind[SyntaxKind["ModuleDeclaration"] = 226] = "ModuleDeclaration";
-        SyntaxKind[SyntaxKind["ModuleBlock"] = 227] = "ModuleBlock";
-        SyntaxKind[SyntaxKind["CaseBlock"] = 228] = "CaseBlock";
-        SyntaxKind[SyntaxKind["NamespaceExportDeclaration"] = 229] = "NamespaceExportDeclaration";
-        SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 230] = "ImportEqualsDeclaration";
-        SyntaxKind[SyntaxKind["ImportDeclaration"] = 231] = "ImportDeclaration";
-        SyntaxKind[SyntaxKind["ImportClause"] = 232] = "ImportClause";
-        SyntaxKind[SyntaxKind["NamespaceImport"] = 233] = "NamespaceImport";
-        SyntaxKind[SyntaxKind["NamedImports"] = 234] = "NamedImports";
-        SyntaxKind[SyntaxKind["ImportSpecifier"] = 235] = "ImportSpecifier";
-        SyntaxKind[SyntaxKind["ExportAssignment"] = 236] = "ExportAssignment";
-        SyntaxKind[SyntaxKind["ExportDeclaration"] = 237] = "ExportDeclaration";
-        SyntaxKind[SyntaxKind["NamedExports"] = 238] = "NamedExports";
-        SyntaxKind[SyntaxKind["ExportSpecifier"] = 239] = "ExportSpecifier";
-        SyntaxKind[SyntaxKind["MissingDeclaration"] = 240] = "MissingDeclaration";
-        SyntaxKind[SyntaxKind["ExternalModuleReference"] = 241] = "ExternalModuleReference";
-        SyntaxKind[SyntaxKind["JsxElement"] = 242] = "JsxElement";
-        SyntaxKind[SyntaxKind["JsxSelfClosingElement"] = 243] = "JsxSelfClosingElement";
-        SyntaxKind[SyntaxKind["JsxOpeningElement"] = 244] = "JsxOpeningElement";
-        SyntaxKind[SyntaxKind["JsxClosingElement"] = 245] = "JsxClosingElement";
-        SyntaxKind[SyntaxKind["JsxAttribute"] = 246] = "JsxAttribute";
-        SyntaxKind[SyntaxKind["JsxSpreadAttribute"] = 247] = "JsxSpreadAttribute";
-        SyntaxKind[SyntaxKind["JsxExpression"] = 248] = "JsxExpression";
-        SyntaxKind[SyntaxKind["CaseClause"] = 249] = "CaseClause";
-        SyntaxKind[SyntaxKind["DefaultClause"] = 250] = "DefaultClause";
-        SyntaxKind[SyntaxKind["HeritageClause"] = 251] = "HeritageClause";
-        SyntaxKind[SyntaxKind["CatchClause"] = 252] = "CatchClause";
-        SyntaxKind[SyntaxKind["PropertyAssignment"] = 253] = "PropertyAssignment";
-        SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 254] = "ShorthandPropertyAssignment";
-        SyntaxKind[SyntaxKind["EnumMember"] = 255] = "EnumMember";
-        SyntaxKind[SyntaxKind["SourceFile"] = 256] = "SourceFile";
-        SyntaxKind[SyntaxKind["JSDocTypeExpression"] = 257] = "JSDocTypeExpression";
-        SyntaxKind[SyntaxKind["JSDocAllType"] = 258] = "JSDocAllType";
-        SyntaxKind[SyntaxKind["JSDocUnknownType"] = 259] = "JSDocUnknownType";
-        SyntaxKind[SyntaxKind["JSDocArrayType"] = 260] = "JSDocArrayType";
-        SyntaxKind[SyntaxKind["JSDocUnionType"] = 261] = "JSDocUnionType";
-        SyntaxKind[SyntaxKind["JSDocTupleType"] = 262] = "JSDocTupleType";
-        SyntaxKind[SyntaxKind["JSDocNullableType"] = 263] = "JSDocNullableType";
-        SyntaxKind[SyntaxKind["JSDocNonNullableType"] = 264] = "JSDocNonNullableType";
-        SyntaxKind[SyntaxKind["JSDocRecordType"] = 265] = "JSDocRecordType";
-        SyntaxKind[SyntaxKind["JSDocRecordMember"] = 266] = "JSDocRecordMember";
-        SyntaxKind[SyntaxKind["JSDocTypeReference"] = 267] = "JSDocTypeReference";
-        SyntaxKind[SyntaxKind["JSDocOptionalType"] = 268] = "JSDocOptionalType";
-        SyntaxKind[SyntaxKind["JSDocFunctionType"] = 269] = "JSDocFunctionType";
-        SyntaxKind[SyntaxKind["JSDocVariadicType"] = 270] = "JSDocVariadicType";
-        SyntaxKind[SyntaxKind["JSDocConstructorType"] = 271] = "JSDocConstructorType";
-        SyntaxKind[SyntaxKind["JSDocThisType"] = 272] = "JSDocThisType";
-        SyntaxKind[SyntaxKind["JSDocComment"] = 273] = "JSDocComment";
-        SyntaxKind[SyntaxKind["JSDocTag"] = 274] = "JSDocTag";
-        SyntaxKind[SyntaxKind["JSDocParameterTag"] = 275] = "JSDocParameterTag";
-        SyntaxKind[SyntaxKind["JSDocReturnTag"] = 276] = "JSDocReturnTag";
-        SyntaxKind[SyntaxKind["JSDocTypeTag"] = 277] = "JSDocTypeTag";
-        SyntaxKind[SyntaxKind["JSDocTemplateTag"] = 278] = "JSDocTemplateTag";
-        SyntaxKind[SyntaxKind["JSDocTypedefTag"] = 279] = "JSDocTypedefTag";
-        SyntaxKind[SyntaxKind["JSDocPropertyTag"] = 280] = "JSDocPropertyTag";
-        SyntaxKind[SyntaxKind["JSDocTypeLiteral"] = 281] = "JSDocTypeLiteral";
-        SyntaxKind[SyntaxKind["JSDocLiteralType"] = 282] = "JSDocLiteralType";
-        SyntaxKind[SyntaxKind["JSDocNullKeyword"] = 283] = "JSDocNullKeyword";
-        SyntaxKind[SyntaxKind["JSDocUndefinedKeyword"] = 284] = "JSDocUndefinedKeyword";
-        SyntaxKind[SyntaxKind["JSDocNeverKeyword"] = 285] = "JSDocNeverKeyword";
-        SyntaxKind[SyntaxKind["SyntaxList"] = 286] = "SyntaxList";
-        SyntaxKind[SyntaxKind["NotEmittedStatement"] = 287] = "NotEmittedStatement";
-        SyntaxKind[SyntaxKind["PartiallyEmittedExpression"] = 288] = "PartiallyEmittedExpression";
-        SyntaxKind[SyntaxKind["Count"] = 289] = "Count";
-        SyntaxKind[SyntaxKind["FirstAssignment"] = 57] = "FirstAssignment";
-        SyntaxKind[SyntaxKind["LastAssignment"] = 69] = "LastAssignment";
-        SyntaxKind[SyntaxKind["FirstCompoundAssignment"] = 58] = "FirstCompoundAssignment";
-        SyntaxKind[SyntaxKind["LastCompoundAssignment"] = 69] = "LastCompoundAssignment";
-        SyntaxKind[SyntaxKind["FirstReservedWord"] = 71] = "FirstReservedWord";
-        SyntaxKind[SyntaxKind["LastReservedWord"] = 106] = "LastReservedWord";
-        SyntaxKind[SyntaxKind["FirstKeyword"] = 71] = "FirstKeyword";
-        SyntaxKind[SyntaxKind["LastKeyword"] = 139] = "LastKeyword";
-        SyntaxKind[SyntaxKind["FirstFutureReservedWord"] = 107] = "FirstFutureReservedWord";
-        SyntaxKind[SyntaxKind["LastFutureReservedWord"] = 115] = "LastFutureReservedWord";
-        SyntaxKind[SyntaxKind["FirstTypeNode"] = 155] = "FirstTypeNode";
-        SyntaxKind[SyntaxKind["LastTypeNode"] = 167] = "LastTypeNode";
-        SyntaxKind[SyntaxKind["FirstPunctuation"] = 16] = "FirstPunctuation";
-        SyntaxKind[SyntaxKind["LastPunctuation"] = 69] = "LastPunctuation";
-        SyntaxKind[SyntaxKind["FirstToken"] = 0] = "FirstToken";
-        SyntaxKind[SyntaxKind["LastToken"] = 139] = "LastToken";
-        SyntaxKind[SyntaxKind["FirstTriviaToken"] = 2] = "FirstTriviaToken";
-        SyntaxKind[SyntaxKind["LastTriviaToken"] = 7] = "LastTriviaToken";
-        SyntaxKind[SyntaxKind["FirstLiteralToken"] = 8] = "FirstLiteralToken";
-        SyntaxKind[SyntaxKind["LastLiteralToken"] = 12] = "LastLiteralToken";
-        SyntaxKind[SyntaxKind["FirstTemplateToken"] = 12] = "FirstTemplateToken";
-        SyntaxKind[SyntaxKind["LastTemplateToken"] = 15] = "LastTemplateToken";
-        SyntaxKind[SyntaxKind["FirstBinaryOperator"] = 26] = "FirstBinaryOperator";
-        SyntaxKind[SyntaxKind["LastBinaryOperator"] = 69] = "LastBinaryOperator";
-        SyntaxKind[SyntaxKind["FirstNode"] = 140] = "FirstNode";
-        SyntaxKind[SyntaxKind["FirstJSDocNode"] = 257] = "FirstJSDocNode";
-        SyntaxKind[SyntaxKind["LastJSDocNode"] = 282] = "LastJSDocNode";
-        SyntaxKind[SyntaxKind["FirstJSDocTagNode"] = 273] = "FirstJSDocTagNode";
-        SyntaxKind[SyntaxKind["LastJSDocTagNode"] = 285] = "LastJSDocTagNode";
-    })(ts.SyntaxKind || (ts.SyntaxKind = {}));
-    var SyntaxKind = ts.SyntaxKind;
-    (function (NodeFlags) {
-        NodeFlags[NodeFlags["None"] = 0] = "None";
-        NodeFlags[NodeFlags["Let"] = 1] = "Let";
-        NodeFlags[NodeFlags["Const"] = 2] = "Const";
-        NodeFlags[NodeFlags["NestedNamespace"] = 4] = "NestedNamespace";
-        NodeFlags[NodeFlags["Synthesized"] = 8] = "Synthesized";
-        NodeFlags[NodeFlags["Namespace"] = 16] = "Namespace";
-        NodeFlags[NodeFlags["ExportContext"] = 32] = "ExportContext";
-        NodeFlags[NodeFlags["ContainsThis"] = 64] = "ContainsThis";
-        NodeFlags[NodeFlags["HasImplicitReturn"] = 128] = "HasImplicitReturn";
-        NodeFlags[NodeFlags["HasExplicitReturn"] = 256] = "HasExplicitReturn";
-        NodeFlags[NodeFlags["GlobalAugmentation"] = 512] = "GlobalAugmentation";
-        NodeFlags[NodeFlags["HasClassExtends"] = 1024] = "HasClassExtends";
-        NodeFlags[NodeFlags["HasDecorators"] = 2048] = "HasDecorators";
-        NodeFlags[NodeFlags["HasParamDecorators"] = 4096] = "HasParamDecorators";
-        NodeFlags[NodeFlags["HasAsyncFunctions"] = 8192] = "HasAsyncFunctions";
-        NodeFlags[NodeFlags["HasJsxSpreadAttributes"] = 16384] = "HasJsxSpreadAttributes";
-        NodeFlags[NodeFlags["DisallowInContext"] = 32768] = "DisallowInContext";
-        NodeFlags[NodeFlags["YieldContext"] = 65536] = "YieldContext";
-        NodeFlags[NodeFlags["DecoratorContext"] = 131072] = "DecoratorContext";
-        NodeFlags[NodeFlags["AwaitContext"] = 262144] = "AwaitContext";
-        NodeFlags[NodeFlags["ThisNodeHasError"] = 524288] = "ThisNodeHasError";
-        NodeFlags[NodeFlags["JavaScriptFile"] = 1048576] = "JavaScriptFile";
-        NodeFlags[NodeFlags["ThisNodeOrAnySubNodesHasError"] = 2097152] = "ThisNodeOrAnySubNodesHasError";
-        NodeFlags[NodeFlags["HasAggregatedChildData"] = 4194304] = "HasAggregatedChildData";
-        NodeFlags[NodeFlags["BlockScoped"] = 3] = "BlockScoped";
-        NodeFlags[NodeFlags["ReachabilityCheckFlags"] = 384] = "ReachabilityCheckFlags";
-        NodeFlags[NodeFlags["EmitHelperFlags"] = 31744] = "EmitHelperFlags";
-        NodeFlags[NodeFlags["ReachabilityAndEmitFlags"] = 32128] = "ReachabilityAndEmitFlags";
-        NodeFlags[NodeFlags["ContextFlags"] = 1540096] = "ContextFlags";
-        NodeFlags[NodeFlags["TypeExcludesFlags"] = 327680] = "TypeExcludesFlags";
-    })(ts.NodeFlags || (ts.NodeFlags = {}));
-    var NodeFlags = ts.NodeFlags;
-    (function (ModifierFlags) {
-        ModifierFlags[ModifierFlags["None"] = 0] = "None";
-        ModifierFlags[ModifierFlags["Export"] = 1] = "Export";
-        ModifierFlags[ModifierFlags["Ambient"] = 2] = "Ambient";
-        ModifierFlags[ModifierFlags["Public"] = 4] = "Public";
-        ModifierFlags[ModifierFlags["Private"] = 8] = "Private";
-        ModifierFlags[ModifierFlags["Protected"] = 16] = "Protected";
-        ModifierFlags[ModifierFlags["Static"] = 32] = "Static";
-        ModifierFlags[ModifierFlags["Readonly"] = 64] = "Readonly";
-        ModifierFlags[ModifierFlags["Abstract"] = 128] = "Abstract";
-        ModifierFlags[ModifierFlags["Async"] = 256] = "Async";
-        ModifierFlags[ModifierFlags["Default"] = 512] = "Default";
-        ModifierFlags[ModifierFlags["Const"] = 2048] = "Const";
-        ModifierFlags[ModifierFlags["HasComputedFlags"] = 536870912] = "HasComputedFlags";
-        ModifierFlags[ModifierFlags["AccessibilityModifier"] = 28] = "AccessibilityModifier";
-        ModifierFlags[ModifierFlags["ParameterPropertyModifier"] = 92] = "ParameterPropertyModifier";
-        ModifierFlags[ModifierFlags["NonPublicAccessibilityModifier"] = 24] = "NonPublicAccessibilityModifier";
-        ModifierFlags[ModifierFlags["TypeScriptModifier"] = 2270] = "TypeScriptModifier";
-    })(ts.ModifierFlags || (ts.ModifierFlags = {}));
-    var ModifierFlags = ts.ModifierFlags;
-    (function (JsxFlags) {
-        JsxFlags[JsxFlags["None"] = 0] = "None";
-        JsxFlags[JsxFlags["IntrinsicNamedElement"] = 1] = "IntrinsicNamedElement";
-        JsxFlags[JsxFlags["IntrinsicIndexedElement"] = 2] = "IntrinsicIndexedElement";
-        JsxFlags[JsxFlags["IntrinsicElement"] = 3] = "IntrinsicElement";
-    })(ts.JsxFlags || (ts.JsxFlags = {}));
-    var JsxFlags = ts.JsxFlags;
-    (function (RelationComparisonResult) {
-        RelationComparisonResult[RelationComparisonResult["Succeeded"] = 1] = "Succeeded";
-        RelationComparisonResult[RelationComparisonResult["Failed"] = 2] = "Failed";
-        RelationComparisonResult[RelationComparisonResult["FailedAndReported"] = 3] = "FailedAndReported";
-    })(ts.RelationComparisonResult || (ts.RelationComparisonResult = {}));
-    var RelationComparisonResult = ts.RelationComparisonResult;
-    (function (GeneratedIdentifierKind) {
-        GeneratedIdentifierKind[GeneratedIdentifierKind["None"] = 0] = "None";
-        GeneratedIdentifierKind[GeneratedIdentifierKind["Auto"] = 1] = "Auto";
-        GeneratedIdentifierKind[GeneratedIdentifierKind["Loop"] = 2] = "Loop";
-        GeneratedIdentifierKind[GeneratedIdentifierKind["Unique"] = 3] = "Unique";
-        GeneratedIdentifierKind[GeneratedIdentifierKind["Node"] = 4] = "Node";
-    })(ts.GeneratedIdentifierKind || (ts.GeneratedIdentifierKind = {}));
-    var GeneratedIdentifierKind = ts.GeneratedIdentifierKind;
-    (function (FlowFlags) {
-        FlowFlags[FlowFlags["Unreachable"] = 1] = "Unreachable";
-        FlowFlags[FlowFlags["Start"] = 2] = "Start";
-        FlowFlags[FlowFlags["BranchLabel"] = 4] = "BranchLabel";
-        FlowFlags[FlowFlags["LoopLabel"] = 8] = "LoopLabel";
-        FlowFlags[FlowFlags["Assignment"] = 16] = "Assignment";
-        FlowFlags[FlowFlags["TrueCondition"] = 32] = "TrueCondition";
-        FlowFlags[FlowFlags["FalseCondition"] = 64] = "FalseCondition";
-        FlowFlags[FlowFlags["SwitchClause"] = 128] = "SwitchClause";
-        FlowFlags[FlowFlags["ArrayMutation"] = 256] = "ArrayMutation";
-        FlowFlags[FlowFlags["Referenced"] = 512] = "Referenced";
-        FlowFlags[FlowFlags["Shared"] = 1024] = "Shared";
-        FlowFlags[FlowFlags["Label"] = 12] = "Label";
-        FlowFlags[FlowFlags["Condition"] = 96] = "Condition";
-    })(ts.FlowFlags || (ts.FlowFlags = {}));
-    var FlowFlags = ts.FlowFlags;
     var OperationCanceledException = (function () {
         function OperationCanceledException() {
         }
         return OperationCanceledException;
     }());
     ts.OperationCanceledException = OperationCanceledException;
+    var ExitStatus;
     (function (ExitStatus) {
         ExitStatus[ExitStatus["Success"] = 0] = "Success";
         ExitStatus[ExitStatus["DiagnosticsPresent_OutputsSkipped"] = 1] = "DiagnosticsPresent_OutputsSkipped";
         ExitStatus[ExitStatus["DiagnosticsPresent_OutputsGenerated"] = 2] = "DiagnosticsPresent_OutputsGenerated";
-    })(ts.ExitStatus || (ts.ExitStatus = {}));
-    var ExitStatus = ts.ExitStatus;
-    (function (TypeFormatFlags) {
-        TypeFormatFlags[TypeFormatFlags["None"] = 0] = "None";
-        TypeFormatFlags[TypeFormatFlags["WriteArrayAsGenericType"] = 1] = "WriteArrayAsGenericType";
-        TypeFormatFlags[TypeFormatFlags["UseTypeOfFunction"] = 2] = "UseTypeOfFunction";
-        TypeFormatFlags[TypeFormatFlags["NoTruncation"] = 4] = "NoTruncation";
-        TypeFormatFlags[TypeFormatFlags["WriteArrowStyleSignature"] = 8] = "WriteArrowStyleSignature";
-        TypeFormatFlags[TypeFormatFlags["WriteOwnNameForAnyLike"] = 16] = "WriteOwnNameForAnyLike";
-        TypeFormatFlags[TypeFormatFlags["WriteTypeArgumentsOfSignature"] = 32] = "WriteTypeArgumentsOfSignature";
-        TypeFormatFlags[TypeFormatFlags["InElementType"] = 64] = "InElementType";
-        TypeFormatFlags[TypeFormatFlags["UseFullyQualifiedType"] = 128] = "UseFullyQualifiedType";
-        TypeFormatFlags[TypeFormatFlags["InFirstTypeArgument"] = 256] = "InFirstTypeArgument";
-        TypeFormatFlags[TypeFormatFlags["InTypeAlias"] = 512] = "InTypeAlias";
-        TypeFormatFlags[TypeFormatFlags["UseTypeAliasValue"] = 1024] = "UseTypeAliasValue";
-    })(ts.TypeFormatFlags || (ts.TypeFormatFlags = {}));
-    var TypeFormatFlags = ts.TypeFormatFlags;
-    (function (SymbolFormatFlags) {
-        SymbolFormatFlags[SymbolFormatFlags["None"] = 0] = "None";
-        SymbolFormatFlags[SymbolFormatFlags["WriteTypeParametersOrArguments"] = 1] = "WriteTypeParametersOrArguments";
-        SymbolFormatFlags[SymbolFormatFlags["UseOnlyExternalAliasing"] = 2] = "UseOnlyExternalAliasing";
-    })(ts.SymbolFormatFlags || (ts.SymbolFormatFlags = {}));
-    var SymbolFormatFlags = ts.SymbolFormatFlags;
-    (function (SymbolAccessibility) {
-        SymbolAccessibility[SymbolAccessibility["Accessible"] = 0] = "Accessible";
-        SymbolAccessibility[SymbolAccessibility["NotAccessible"] = 1] = "NotAccessible";
-        SymbolAccessibility[SymbolAccessibility["CannotBeNamed"] = 2] = "CannotBeNamed";
-    })(ts.SymbolAccessibility || (ts.SymbolAccessibility = {}));
-    var SymbolAccessibility = ts.SymbolAccessibility;
-    (function (TypePredicateKind) {
-        TypePredicateKind[TypePredicateKind["This"] = 0] = "This";
-        TypePredicateKind[TypePredicateKind["Identifier"] = 1] = "Identifier";
-    })(ts.TypePredicateKind || (ts.TypePredicateKind = {}));
-    var TypePredicateKind = ts.TypePredicateKind;
+    })(ExitStatus = ts.ExitStatus || (ts.ExitStatus = {}));
+    var TypeReferenceSerializationKind;
     (function (TypeReferenceSerializationKind) {
         TypeReferenceSerializationKind[TypeReferenceSerializationKind["Unknown"] = 0] = "Unknown";
         TypeReferenceSerializationKind[TypeReferenceSerializationKind["TypeWithConstructSignatureAndValue"] = 1] = "TypeWithConstructSignatureAndValue";
@@ -488,179 +45,19 @@ var ts;
         TypeReferenceSerializationKind[TypeReferenceSerializationKind["Promise"] = 8] = "Promise";
         TypeReferenceSerializationKind[TypeReferenceSerializationKind["TypeWithCallSignature"] = 9] = "TypeWithCallSignature";
         TypeReferenceSerializationKind[TypeReferenceSerializationKind["ObjectType"] = 10] = "ObjectType";
-    })(ts.TypeReferenceSerializationKind || (ts.TypeReferenceSerializationKind = {}));
-    var TypeReferenceSerializationKind = ts.TypeReferenceSerializationKind;
-    (function (SymbolFlags) {
-        SymbolFlags[SymbolFlags["None"] = 0] = "None";
-        SymbolFlags[SymbolFlags["FunctionScopedVariable"] = 1] = "FunctionScopedVariable";
-        SymbolFlags[SymbolFlags["BlockScopedVariable"] = 2] = "BlockScopedVariable";
-        SymbolFlags[SymbolFlags["Property"] = 4] = "Property";
-        SymbolFlags[SymbolFlags["EnumMember"] = 8] = "EnumMember";
-        SymbolFlags[SymbolFlags["Function"] = 16] = "Function";
-        SymbolFlags[SymbolFlags["Class"] = 32] = "Class";
-        SymbolFlags[SymbolFlags["Interface"] = 64] = "Interface";
-        SymbolFlags[SymbolFlags["ConstEnum"] = 128] = "ConstEnum";
-        SymbolFlags[SymbolFlags["RegularEnum"] = 256] = "RegularEnum";
-        SymbolFlags[SymbolFlags["ValueModule"] = 512] = "ValueModule";
-        SymbolFlags[SymbolFlags["NamespaceModule"] = 1024] = "NamespaceModule";
-        SymbolFlags[SymbolFlags["TypeLiteral"] = 2048] = "TypeLiteral";
-        SymbolFlags[SymbolFlags["ObjectLiteral"] = 4096] = "ObjectLiteral";
-        SymbolFlags[SymbolFlags["Method"] = 8192] = "Method";
-        SymbolFlags[SymbolFlags["Constructor"] = 16384] = "Constructor";
-        SymbolFlags[SymbolFlags["GetAccessor"] = 32768] = "GetAccessor";
-        SymbolFlags[SymbolFlags["SetAccessor"] = 65536] = "SetAccessor";
-        SymbolFlags[SymbolFlags["Signature"] = 131072] = "Signature";
-        SymbolFlags[SymbolFlags["TypeParameter"] = 262144] = "TypeParameter";
-        SymbolFlags[SymbolFlags["TypeAlias"] = 524288] = "TypeAlias";
-        SymbolFlags[SymbolFlags["ExportValue"] = 1048576] = "ExportValue";
-        SymbolFlags[SymbolFlags["ExportType"] = 2097152] = "ExportType";
-        SymbolFlags[SymbolFlags["ExportNamespace"] = 4194304] = "ExportNamespace";
-        SymbolFlags[SymbolFlags["Alias"] = 8388608] = "Alias";
-        SymbolFlags[SymbolFlags["Instantiated"] = 16777216] = "Instantiated";
-        SymbolFlags[SymbolFlags["Merged"] = 33554432] = "Merged";
-        SymbolFlags[SymbolFlags["Transient"] = 67108864] = "Transient";
-        SymbolFlags[SymbolFlags["Prototype"] = 134217728] = "Prototype";
-        SymbolFlags[SymbolFlags["SyntheticProperty"] = 268435456] = "SyntheticProperty";
-        SymbolFlags[SymbolFlags["Optional"] = 536870912] = "Optional";
-        SymbolFlags[SymbolFlags["ExportStar"] = 1073741824] = "ExportStar";
-        SymbolFlags[SymbolFlags["Enum"] = 384] = "Enum";
-        SymbolFlags[SymbolFlags["Variable"] = 3] = "Variable";
-        SymbolFlags[SymbolFlags["Value"] = 107455] = "Value";
-        SymbolFlags[SymbolFlags["Type"] = 793064] = "Type";
-        SymbolFlags[SymbolFlags["Namespace"] = 1920] = "Namespace";
-        SymbolFlags[SymbolFlags["Module"] = 1536] = "Module";
-        SymbolFlags[SymbolFlags["Accessor"] = 98304] = "Accessor";
-        SymbolFlags[SymbolFlags["FunctionScopedVariableExcludes"] = 107454] = "FunctionScopedVariableExcludes";
-        SymbolFlags[SymbolFlags["BlockScopedVariableExcludes"] = 107455] = "BlockScopedVariableExcludes";
-        SymbolFlags[SymbolFlags["ParameterExcludes"] = 107455] = "ParameterExcludes";
-        SymbolFlags[SymbolFlags["PropertyExcludes"] = 0] = "PropertyExcludes";
-        SymbolFlags[SymbolFlags["EnumMemberExcludes"] = 900095] = "EnumMemberExcludes";
-        SymbolFlags[SymbolFlags["FunctionExcludes"] = 106927] = "FunctionExcludes";
-        SymbolFlags[SymbolFlags["ClassExcludes"] = 899519] = "ClassExcludes";
-        SymbolFlags[SymbolFlags["InterfaceExcludes"] = 792968] = "InterfaceExcludes";
-        SymbolFlags[SymbolFlags["RegularEnumExcludes"] = 899327] = "RegularEnumExcludes";
-        SymbolFlags[SymbolFlags["ConstEnumExcludes"] = 899967] = "ConstEnumExcludes";
-        SymbolFlags[SymbolFlags["ValueModuleExcludes"] = 106639] = "ValueModuleExcludes";
-        SymbolFlags[SymbolFlags["NamespaceModuleExcludes"] = 0] = "NamespaceModuleExcludes";
-        SymbolFlags[SymbolFlags["MethodExcludes"] = 99263] = "MethodExcludes";
-        SymbolFlags[SymbolFlags["GetAccessorExcludes"] = 41919] = "GetAccessorExcludes";
-        SymbolFlags[SymbolFlags["SetAccessorExcludes"] = 74687] = "SetAccessorExcludes";
-        SymbolFlags[SymbolFlags["TypeParameterExcludes"] = 530920] = "TypeParameterExcludes";
-        SymbolFlags[SymbolFlags["TypeAliasExcludes"] = 793064] = "TypeAliasExcludes";
-        SymbolFlags[SymbolFlags["AliasExcludes"] = 8388608] = "AliasExcludes";
-        SymbolFlags[SymbolFlags["ModuleMember"] = 8914931] = "ModuleMember";
-        SymbolFlags[SymbolFlags["ExportHasLocal"] = 944] = "ExportHasLocal";
-        SymbolFlags[SymbolFlags["HasExports"] = 1952] = "HasExports";
-        SymbolFlags[SymbolFlags["HasMembers"] = 6240] = "HasMembers";
-        SymbolFlags[SymbolFlags["BlockScoped"] = 418] = "BlockScoped";
-        SymbolFlags[SymbolFlags["PropertyOrAccessor"] = 98308] = "PropertyOrAccessor";
-        SymbolFlags[SymbolFlags["Export"] = 7340032] = "Export";
-        SymbolFlags[SymbolFlags["ClassMember"] = 106500] = "ClassMember";
-        SymbolFlags[SymbolFlags["Classifiable"] = 788448] = "Classifiable";
-    })(ts.SymbolFlags || (ts.SymbolFlags = {}));
-    var SymbolFlags = ts.SymbolFlags;
-    (function (NodeCheckFlags) {
-        NodeCheckFlags[NodeCheckFlags["TypeChecked"] = 1] = "TypeChecked";
-        NodeCheckFlags[NodeCheckFlags["LexicalThis"] = 2] = "LexicalThis";
-        NodeCheckFlags[NodeCheckFlags["CaptureThis"] = 4] = "CaptureThis";
-        NodeCheckFlags[NodeCheckFlags["SuperInstance"] = 256] = "SuperInstance";
-        NodeCheckFlags[NodeCheckFlags["SuperStatic"] = 512] = "SuperStatic";
-        NodeCheckFlags[NodeCheckFlags["ContextChecked"] = 1024] = "ContextChecked";
-        NodeCheckFlags[NodeCheckFlags["AsyncMethodWithSuper"] = 2048] = "AsyncMethodWithSuper";
-        NodeCheckFlags[NodeCheckFlags["AsyncMethodWithSuperBinding"] = 4096] = "AsyncMethodWithSuperBinding";
-        NodeCheckFlags[NodeCheckFlags["CaptureArguments"] = 8192] = "CaptureArguments";
-        NodeCheckFlags[NodeCheckFlags["EnumValuesComputed"] = 16384] = "EnumValuesComputed";
-        NodeCheckFlags[NodeCheckFlags["LexicalModuleMergesWithClass"] = 32768] = "LexicalModuleMergesWithClass";
-        NodeCheckFlags[NodeCheckFlags["LoopWithCapturedBlockScopedBinding"] = 65536] = "LoopWithCapturedBlockScopedBinding";
-        NodeCheckFlags[NodeCheckFlags["CapturedBlockScopedBinding"] = 131072] = "CapturedBlockScopedBinding";
-        NodeCheckFlags[NodeCheckFlags["BlockScopedBindingInLoop"] = 262144] = "BlockScopedBindingInLoop";
-        NodeCheckFlags[NodeCheckFlags["ClassWithBodyScopedClassBinding"] = 524288] = "ClassWithBodyScopedClassBinding";
-        NodeCheckFlags[NodeCheckFlags["BodyScopedClassBinding"] = 1048576] = "BodyScopedClassBinding";
-        NodeCheckFlags[NodeCheckFlags["NeedsLoopOutParameter"] = 2097152] = "NeedsLoopOutParameter";
-        NodeCheckFlags[NodeCheckFlags["AssignmentsMarked"] = 4194304] = "AssignmentsMarked";
-        NodeCheckFlags[NodeCheckFlags["ClassWithConstructorReference"] = 8388608] = "ClassWithConstructorReference";
-        NodeCheckFlags[NodeCheckFlags["ConstructorReferenceInClass"] = 16777216] = "ConstructorReferenceInClass";
-    })(ts.NodeCheckFlags || (ts.NodeCheckFlags = {}));
-    var NodeCheckFlags = ts.NodeCheckFlags;
-    (function (TypeFlags) {
-        TypeFlags[TypeFlags["Any"] = 1] = "Any";
-        TypeFlags[TypeFlags["String"] = 2] = "String";
-        TypeFlags[TypeFlags["Number"] = 4] = "Number";
-        TypeFlags[TypeFlags["Boolean"] = 8] = "Boolean";
-        TypeFlags[TypeFlags["Enum"] = 16] = "Enum";
-        TypeFlags[TypeFlags["StringLiteral"] = 32] = "StringLiteral";
-        TypeFlags[TypeFlags["NumberLiteral"] = 64] = "NumberLiteral";
-        TypeFlags[TypeFlags["BooleanLiteral"] = 128] = "BooleanLiteral";
-        TypeFlags[TypeFlags["EnumLiteral"] = 256] = "EnumLiteral";
-        TypeFlags[TypeFlags["ESSymbol"] = 512] = "ESSymbol";
-        TypeFlags[TypeFlags["Void"] = 1024] = "Void";
-        TypeFlags[TypeFlags["Undefined"] = 2048] = "Undefined";
-        TypeFlags[TypeFlags["Null"] = 4096] = "Null";
-        TypeFlags[TypeFlags["Never"] = 8192] = "Never";
-        TypeFlags[TypeFlags["TypeParameter"] = 16384] = "TypeParameter";
-        TypeFlags[TypeFlags["Class"] = 32768] = "Class";
-        TypeFlags[TypeFlags["Interface"] = 65536] = "Interface";
-        TypeFlags[TypeFlags["Reference"] = 131072] = "Reference";
-        TypeFlags[TypeFlags["Tuple"] = 262144] = "Tuple";
-        TypeFlags[TypeFlags["Union"] = 524288] = "Union";
-        TypeFlags[TypeFlags["Intersection"] = 1048576] = "Intersection";
-        TypeFlags[TypeFlags["Anonymous"] = 2097152] = "Anonymous";
-        TypeFlags[TypeFlags["Instantiated"] = 4194304] = "Instantiated";
-        TypeFlags[TypeFlags["ObjectLiteral"] = 8388608] = "ObjectLiteral";
-        TypeFlags[TypeFlags["FreshLiteral"] = 16777216] = "FreshLiteral";
-        TypeFlags[TypeFlags["ContainsWideningType"] = 33554432] = "ContainsWideningType";
-        TypeFlags[TypeFlags["ContainsObjectLiteral"] = 67108864] = "ContainsObjectLiteral";
-        TypeFlags[TypeFlags["ContainsAnyFunctionType"] = 134217728] = "ContainsAnyFunctionType";
-        TypeFlags[TypeFlags["Nullable"] = 6144] = "Nullable";
-        TypeFlags[TypeFlags["Literal"] = 480] = "Literal";
-        TypeFlags[TypeFlags["StringOrNumberLiteral"] = 96] = "StringOrNumberLiteral";
-        TypeFlags[TypeFlags["DefinitelyFalsy"] = 7392] = "DefinitelyFalsy";
-        TypeFlags[TypeFlags["PossiblyFalsy"] = 7406] = "PossiblyFalsy";
-        TypeFlags[TypeFlags["Intrinsic"] = 16015] = "Intrinsic";
-        TypeFlags[TypeFlags["Primitive"] = 8190] = "Primitive";
-        TypeFlags[TypeFlags["StringLike"] = 34] = "StringLike";
-        TypeFlags[TypeFlags["NumberLike"] = 340] = "NumberLike";
-        TypeFlags[TypeFlags["BooleanLike"] = 136] = "BooleanLike";
-        TypeFlags[TypeFlags["EnumLike"] = 272] = "EnumLike";
-        TypeFlags[TypeFlags["ObjectType"] = 2588672] = "ObjectType";
-        TypeFlags[TypeFlags["UnionOrIntersection"] = 1572864] = "UnionOrIntersection";
-        TypeFlags[TypeFlags["StructuredType"] = 4161536] = "StructuredType";
-        TypeFlags[TypeFlags["StructuredOrTypeParameter"] = 4177920] = "StructuredOrTypeParameter";
-        TypeFlags[TypeFlags["Narrowable"] = 4178943] = "Narrowable";
-        TypeFlags[TypeFlags["NotUnionOrUnit"] = 2589185] = "NotUnionOrUnit";
-        TypeFlags[TypeFlags["RequiresWidening"] = 100663296] = "RequiresWidening";
-        TypeFlags[TypeFlags["PropagatingFlags"] = 234881024] = "PropagatingFlags";
-    })(ts.TypeFlags || (ts.TypeFlags = {}));
-    var TypeFlags = ts.TypeFlags;
-    (function (SignatureKind) {
-        SignatureKind[SignatureKind["Call"] = 0] = "Call";
-        SignatureKind[SignatureKind["Construct"] = 1] = "Construct";
-    })(ts.SignatureKind || (ts.SignatureKind = {}));
-    var SignatureKind = ts.SignatureKind;
-    (function (IndexKind) {
-        IndexKind[IndexKind["String"] = 0] = "String";
-        IndexKind[IndexKind["Number"] = 1] = "Number";
-    })(ts.IndexKind || (ts.IndexKind = {}));
-    var IndexKind = ts.IndexKind;
-    (function (SpecialPropertyAssignmentKind) {
-        SpecialPropertyAssignmentKind[SpecialPropertyAssignmentKind["None"] = 0] = "None";
-        SpecialPropertyAssignmentKind[SpecialPropertyAssignmentKind["ExportsProperty"] = 1] = "ExportsProperty";
-        SpecialPropertyAssignmentKind[SpecialPropertyAssignmentKind["ModuleExports"] = 2] = "ModuleExports";
-        SpecialPropertyAssignmentKind[SpecialPropertyAssignmentKind["PrototypeProperty"] = 3] = "PrototypeProperty";
-        SpecialPropertyAssignmentKind[SpecialPropertyAssignmentKind["ThisProperty"] = 4] = "ThisProperty";
-    })(ts.SpecialPropertyAssignmentKind || (ts.SpecialPropertyAssignmentKind = {}));
-    var SpecialPropertyAssignmentKind = ts.SpecialPropertyAssignmentKind;
+    })(TypeReferenceSerializationKind = ts.TypeReferenceSerializationKind || (ts.TypeReferenceSerializationKind = {}));
+    var DiagnosticCategory;
     (function (DiagnosticCategory) {
         DiagnosticCategory[DiagnosticCategory["Warning"] = 0] = "Warning";
         DiagnosticCategory[DiagnosticCategory["Error"] = 1] = "Error";
         DiagnosticCategory[DiagnosticCategory["Message"] = 2] = "Message";
-    })(ts.DiagnosticCategory || (ts.DiagnosticCategory = {}));
-    var DiagnosticCategory = ts.DiagnosticCategory;
+    })(DiagnosticCategory = ts.DiagnosticCategory || (ts.DiagnosticCategory = {}));
+    var ModuleResolutionKind;
     (function (ModuleResolutionKind) {
         ModuleResolutionKind[ModuleResolutionKind["Classic"] = 1] = "Classic";
         ModuleResolutionKind[ModuleResolutionKind["NodeJs"] = 2] = "NodeJs";
-    })(ts.ModuleResolutionKind || (ts.ModuleResolutionKind = {}));
-    var ModuleResolutionKind = ts.ModuleResolutionKind;
+    })(ModuleResolutionKind = ts.ModuleResolutionKind || (ts.ModuleResolutionKind = {}));
+    var ModuleKind;
     (function (ModuleKind) {
         ModuleKind[ModuleKind["None"] = 0] = "None";
         ModuleKind[ModuleKind["CommonJS"] = 1] = "CommonJS";
@@ -668,266 +65,16 @@ var ts;
         ModuleKind[ModuleKind["UMD"] = 3] = "UMD";
         ModuleKind[ModuleKind["System"] = 4] = "System";
         ModuleKind[ModuleKind["ES2015"] = 5] = "ES2015";
-    })(ts.ModuleKind || (ts.ModuleKind = {}));
-    var ModuleKind = ts.ModuleKind;
-    (function (JsxEmit) {
-        JsxEmit[JsxEmit["None"] = 0] = "None";
-        JsxEmit[JsxEmit["Preserve"] = 1] = "Preserve";
-        JsxEmit[JsxEmit["React"] = 2] = "React";
-    })(ts.JsxEmit || (ts.JsxEmit = {}));
-    var JsxEmit = ts.JsxEmit;
-    (function (NewLineKind) {
-        NewLineKind[NewLineKind["CarriageReturnLineFeed"] = 0] = "CarriageReturnLineFeed";
-        NewLineKind[NewLineKind["LineFeed"] = 1] = "LineFeed";
-    })(ts.NewLineKind || (ts.NewLineKind = {}));
-    var NewLineKind = ts.NewLineKind;
-    (function (ScriptKind) {
-        ScriptKind[ScriptKind["Unknown"] = 0] = "Unknown";
-        ScriptKind[ScriptKind["JS"] = 1] = "JS";
-        ScriptKind[ScriptKind["JSX"] = 2] = "JSX";
-        ScriptKind[ScriptKind["TS"] = 3] = "TS";
-        ScriptKind[ScriptKind["TSX"] = 4] = "TSX";
-    })(ts.ScriptKind || (ts.ScriptKind = {}));
-    var ScriptKind = ts.ScriptKind;
-    (function (ScriptTarget) {
-        ScriptTarget[ScriptTarget["ES3"] = 0] = "ES3";
-        ScriptTarget[ScriptTarget["ES5"] = 1] = "ES5";
-        ScriptTarget[ScriptTarget["ES2015"] = 2] = "ES2015";
-        ScriptTarget[ScriptTarget["ES2016"] = 3] = "ES2016";
-        ScriptTarget[ScriptTarget["ES2017"] = 4] = "ES2017";
-        ScriptTarget[ScriptTarget["Latest"] = 4] = "Latest";
-    })(ts.ScriptTarget || (ts.ScriptTarget = {}));
-    var ScriptTarget = ts.ScriptTarget;
-    (function (LanguageVariant) {
-        LanguageVariant[LanguageVariant["Standard"] = 0] = "Standard";
-        LanguageVariant[LanguageVariant["JSX"] = 1] = "JSX";
-    })(ts.LanguageVariant || (ts.LanguageVariant = {}));
-    var LanguageVariant = ts.LanguageVariant;
-    (function (DiagnosticStyle) {
-        DiagnosticStyle[DiagnosticStyle["Simple"] = 0] = "Simple";
-        DiagnosticStyle[DiagnosticStyle["Pretty"] = 1] = "Pretty";
-    })(ts.DiagnosticStyle || (ts.DiagnosticStyle = {}));
-    var DiagnosticStyle = ts.DiagnosticStyle;
-    (function (WatchDirectoryFlags) {
-        WatchDirectoryFlags[WatchDirectoryFlags["None"] = 0] = "None";
-        WatchDirectoryFlags[WatchDirectoryFlags["Recursive"] = 1] = "Recursive";
-    })(ts.WatchDirectoryFlags || (ts.WatchDirectoryFlags = {}));
-    var WatchDirectoryFlags = ts.WatchDirectoryFlags;
-    (function (CharacterCodes) {
-        CharacterCodes[CharacterCodes["nullCharacter"] = 0] = "nullCharacter";
-        CharacterCodes[CharacterCodes["maxAsciiCharacter"] = 127] = "maxAsciiCharacter";
-        CharacterCodes[CharacterCodes["lineFeed"] = 10] = "lineFeed";
-        CharacterCodes[CharacterCodes["carriageReturn"] = 13] = "carriageReturn";
-        CharacterCodes[CharacterCodes["lineSeparator"] = 8232] = "lineSeparator";
-        CharacterCodes[CharacterCodes["paragraphSeparator"] = 8233] = "paragraphSeparator";
-        CharacterCodes[CharacterCodes["nextLine"] = 133] = "nextLine";
-        CharacterCodes[CharacterCodes["space"] = 32] = "space";
-        CharacterCodes[CharacterCodes["nonBreakingSpace"] = 160] = "nonBreakingSpace";
-        CharacterCodes[CharacterCodes["enQuad"] = 8192] = "enQuad";
-        CharacterCodes[CharacterCodes["emQuad"] = 8193] = "emQuad";
-        CharacterCodes[CharacterCodes["enSpace"] = 8194] = "enSpace";
-        CharacterCodes[CharacterCodes["emSpace"] = 8195] = "emSpace";
-        CharacterCodes[CharacterCodes["threePerEmSpace"] = 8196] = "threePerEmSpace";
-        CharacterCodes[CharacterCodes["fourPerEmSpace"] = 8197] = "fourPerEmSpace";
-        CharacterCodes[CharacterCodes["sixPerEmSpace"] = 8198] = "sixPerEmSpace";
-        CharacterCodes[CharacterCodes["figureSpace"] = 8199] = "figureSpace";
-        CharacterCodes[CharacterCodes["punctuationSpace"] = 8200] = "punctuationSpace";
-        CharacterCodes[CharacterCodes["thinSpace"] = 8201] = "thinSpace";
-        CharacterCodes[CharacterCodes["hairSpace"] = 8202] = "hairSpace";
-        CharacterCodes[CharacterCodes["zeroWidthSpace"] = 8203] = "zeroWidthSpace";
-        CharacterCodes[CharacterCodes["narrowNoBreakSpace"] = 8239] = "narrowNoBreakSpace";
-        CharacterCodes[CharacterCodes["ideographicSpace"] = 12288] = "ideographicSpace";
-        CharacterCodes[CharacterCodes["mathematicalSpace"] = 8287] = "mathematicalSpace";
-        CharacterCodes[CharacterCodes["ogham"] = 5760] = "ogham";
-        CharacterCodes[CharacterCodes["_"] = 95] = "_";
-        CharacterCodes[CharacterCodes["$"] = 36] = "$";
-        CharacterCodes[CharacterCodes["_0"] = 48] = "_0";
-        CharacterCodes[CharacterCodes["_1"] = 49] = "_1";
-        CharacterCodes[CharacterCodes["_2"] = 50] = "_2";
-        CharacterCodes[CharacterCodes["_3"] = 51] = "_3";
-        CharacterCodes[CharacterCodes["_4"] = 52] = "_4";
-        CharacterCodes[CharacterCodes["_5"] = 53] = "_5";
-        CharacterCodes[CharacterCodes["_6"] = 54] = "_6";
-        CharacterCodes[CharacterCodes["_7"] = 55] = "_7";
-        CharacterCodes[CharacterCodes["_8"] = 56] = "_8";
-        CharacterCodes[CharacterCodes["_9"] = 57] = "_9";
-        CharacterCodes[CharacterCodes["a"] = 97] = "a";
-        CharacterCodes[CharacterCodes["b"] = 98] = "b";
-        CharacterCodes[CharacterCodes["c"] = 99] = "c";
-        CharacterCodes[CharacterCodes["d"] = 100] = "d";
-        CharacterCodes[CharacterCodes["e"] = 101] = "e";
-        CharacterCodes[CharacterCodes["f"] = 102] = "f";
-        CharacterCodes[CharacterCodes["g"] = 103] = "g";
-        CharacterCodes[CharacterCodes["h"] = 104] = "h";
-        CharacterCodes[CharacterCodes["i"] = 105] = "i";
-        CharacterCodes[CharacterCodes["j"] = 106] = "j";
-        CharacterCodes[CharacterCodes["k"] = 107] = "k";
-        CharacterCodes[CharacterCodes["l"] = 108] = "l";
-        CharacterCodes[CharacterCodes["m"] = 109] = "m";
-        CharacterCodes[CharacterCodes["n"] = 110] = "n";
-        CharacterCodes[CharacterCodes["o"] = 111] = "o";
-        CharacterCodes[CharacterCodes["p"] = 112] = "p";
-        CharacterCodes[CharacterCodes["q"] = 113] = "q";
-        CharacterCodes[CharacterCodes["r"] = 114] = "r";
-        CharacterCodes[CharacterCodes["s"] = 115] = "s";
-        CharacterCodes[CharacterCodes["t"] = 116] = "t";
-        CharacterCodes[CharacterCodes["u"] = 117] = "u";
-        CharacterCodes[CharacterCodes["v"] = 118] = "v";
-        CharacterCodes[CharacterCodes["w"] = 119] = "w";
-        CharacterCodes[CharacterCodes["x"] = 120] = "x";
-        CharacterCodes[CharacterCodes["y"] = 121] = "y";
-        CharacterCodes[CharacterCodes["z"] = 122] = "z";
-        CharacterCodes[CharacterCodes["A"] = 65] = "A";
-        CharacterCodes[CharacterCodes["B"] = 66] = "B";
-        CharacterCodes[CharacterCodes["C"] = 67] = "C";
-        CharacterCodes[CharacterCodes["D"] = 68] = "D";
-        CharacterCodes[CharacterCodes["E"] = 69] = "E";
-        CharacterCodes[CharacterCodes["F"] = 70] = "F";
-        CharacterCodes[CharacterCodes["G"] = 71] = "G";
-        CharacterCodes[CharacterCodes["H"] = 72] = "H";
-        CharacterCodes[CharacterCodes["I"] = 73] = "I";
-        CharacterCodes[CharacterCodes["J"] = 74] = "J";
-        CharacterCodes[CharacterCodes["K"] = 75] = "K";
-        CharacterCodes[CharacterCodes["L"] = 76] = "L";
-        CharacterCodes[CharacterCodes["M"] = 77] = "M";
-        CharacterCodes[CharacterCodes["N"] = 78] = "N";
-        CharacterCodes[CharacterCodes["O"] = 79] = "O";
-        CharacterCodes[CharacterCodes["P"] = 80] = "P";
-        CharacterCodes[CharacterCodes["Q"] = 81] = "Q";
-        CharacterCodes[CharacterCodes["R"] = 82] = "R";
-        CharacterCodes[CharacterCodes["S"] = 83] = "S";
-        CharacterCodes[CharacterCodes["T"] = 84] = "T";
-        CharacterCodes[CharacterCodes["U"] = 85] = "U";
-        CharacterCodes[CharacterCodes["V"] = 86] = "V";
-        CharacterCodes[CharacterCodes["W"] = 87] = "W";
-        CharacterCodes[CharacterCodes["X"] = 88] = "X";
-        CharacterCodes[CharacterCodes["Y"] = 89] = "Y";
-        CharacterCodes[CharacterCodes["Z"] = 90] = "Z";
-        CharacterCodes[CharacterCodes["ampersand"] = 38] = "ampersand";
-        CharacterCodes[CharacterCodes["asterisk"] = 42] = "asterisk";
-        CharacterCodes[CharacterCodes["at"] = 64] = "at";
-        CharacterCodes[CharacterCodes["backslash"] = 92] = "backslash";
-        CharacterCodes[CharacterCodes["backtick"] = 96] = "backtick";
-        CharacterCodes[CharacterCodes["bar"] = 124] = "bar";
-        CharacterCodes[CharacterCodes["caret"] = 94] = "caret";
-        CharacterCodes[CharacterCodes["closeBrace"] = 125] = "closeBrace";
-        CharacterCodes[CharacterCodes["closeBracket"] = 93] = "closeBracket";
-        CharacterCodes[CharacterCodes["closeParen"] = 41] = "closeParen";
-        CharacterCodes[CharacterCodes["colon"] = 58] = "colon";
-        CharacterCodes[CharacterCodes["comma"] = 44] = "comma";
-        CharacterCodes[CharacterCodes["dot"] = 46] = "dot";
-        CharacterCodes[CharacterCodes["doubleQuote"] = 34] = "doubleQuote";
-        CharacterCodes[CharacterCodes["equals"] = 61] = "equals";
-        CharacterCodes[CharacterCodes["exclamation"] = 33] = "exclamation";
-        CharacterCodes[CharacterCodes["greaterThan"] = 62] = "greaterThan";
-        CharacterCodes[CharacterCodes["hash"] = 35] = "hash";
-        CharacterCodes[CharacterCodes["lessThan"] = 60] = "lessThan";
-        CharacterCodes[CharacterCodes["minus"] = 45] = "minus";
-        CharacterCodes[CharacterCodes["openBrace"] = 123] = "openBrace";
-        CharacterCodes[CharacterCodes["openBracket"] = 91] = "openBracket";
-        CharacterCodes[CharacterCodes["openParen"] = 40] = "openParen";
-        CharacterCodes[CharacterCodes["percent"] = 37] = "percent";
-        CharacterCodes[CharacterCodes["plus"] = 43] = "plus";
-        CharacterCodes[CharacterCodes["question"] = 63] = "question";
-        CharacterCodes[CharacterCodes["semicolon"] = 59] = "semicolon";
-        CharacterCodes[CharacterCodes["singleQuote"] = 39] = "singleQuote";
-        CharacterCodes[CharacterCodes["slash"] = 47] = "slash";
-        CharacterCodes[CharacterCodes["tilde"] = 126] = "tilde";
-        CharacterCodes[CharacterCodes["backspace"] = 8] = "backspace";
-        CharacterCodes[CharacterCodes["formFeed"] = 12] = "formFeed";
-        CharacterCodes[CharacterCodes["byteOrderMark"] = 65279] = "byteOrderMark";
-        CharacterCodes[CharacterCodes["tab"] = 9] = "tab";
-        CharacterCodes[CharacterCodes["verticalTab"] = 11] = "verticalTab";
-    })(ts.CharacterCodes || (ts.CharacterCodes = {}));
-    var CharacterCodes = ts.CharacterCodes;
-    (function (TransformFlags) {
-        TransformFlags[TransformFlags["None"] = 0] = "None";
-        TransformFlags[TransformFlags["TypeScript"] = 1] = "TypeScript";
-        TransformFlags[TransformFlags["ContainsTypeScript"] = 2] = "ContainsTypeScript";
-        TransformFlags[TransformFlags["Jsx"] = 4] = "Jsx";
-        TransformFlags[TransformFlags["ContainsJsx"] = 8] = "ContainsJsx";
-        TransformFlags[TransformFlags["ES2017"] = 16] = "ES2017";
-        TransformFlags[TransformFlags["ContainsES2017"] = 32] = "ContainsES2017";
-        TransformFlags[TransformFlags["ES2016"] = 64] = "ES2016";
-        TransformFlags[TransformFlags["ContainsES2016"] = 128] = "ContainsES2016";
-        TransformFlags[TransformFlags["ES2015"] = 256] = "ES2015";
-        TransformFlags[TransformFlags["ContainsES2015"] = 512] = "ContainsES2015";
-        TransformFlags[TransformFlags["DestructuringAssignment"] = 1024] = "DestructuringAssignment";
-        TransformFlags[TransformFlags["Generator"] = 2048] = "Generator";
-        TransformFlags[TransformFlags["ContainsGenerator"] = 4096] = "ContainsGenerator";
-        TransformFlags[TransformFlags["ContainsDecorators"] = 8192] = "ContainsDecorators";
-        TransformFlags[TransformFlags["ContainsPropertyInitializer"] = 16384] = "ContainsPropertyInitializer";
-        TransformFlags[TransformFlags["ContainsLexicalThis"] = 32768] = "ContainsLexicalThis";
-        TransformFlags[TransformFlags["ContainsCapturedLexicalThis"] = 65536] = "ContainsCapturedLexicalThis";
-        TransformFlags[TransformFlags["ContainsLexicalThisInComputedPropertyName"] = 131072] = "ContainsLexicalThisInComputedPropertyName";
-        TransformFlags[TransformFlags["ContainsDefaultValueAssignments"] = 262144] = "ContainsDefaultValueAssignments";
-        TransformFlags[TransformFlags["ContainsParameterPropertyAssignments"] = 524288] = "ContainsParameterPropertyAssignments";
-        TransformFlags[TransformFlags["ContainsSpreadElementExpression"] = 1048576] = "ContainsSpreadElementExpression";
-        TransformFlags[TransformFlags["ContainsComputedPropertyName"] = 2097152] = "ContainsComputedPropertyName";
-        TransformFlags[TransformFlags["ContainsBlockScopedBinding"] = 4194304] = "ContainsBlockScopedBinding";
-        TransformFlags[TransformFlags["ContainsBindingPattern"] = 8388608] = "ContainsBindingPattern";
-        TransformFlags[TransformFlags["ContainsYield"] = 16777216] = "ContainsYield";
-        TransformFlags[TransformFlags["ContainsHoistedDeclarationOrCompletion"] = 33554432] = "ContainsHoistedDeclarationOrCompletion";
-        TransformFlags[TransformFlags["HasComputedFlags"] = 536870912] = "HasComputedFlags";
-        TransformFlags[TransformFlags["AssertTypeScript"] = 3] = "AssertTypeScript";
-        TransformFlags[TransformFlags["AssertJsx"] = 12] = "AssertJsx";
-        TransformFlags[TransformFlags["AssertES2017"] = 48] = "AssertES2017";
-        TransformFlags[TransformFlags["AssertES2016"] = 192] = "AssertES2016";
-        TransformFlags[TransformFlags["AssertES2015"] = 768] = "AssertES2015";
-        TransformFlags[TransformFlags["AssertGenerator"] = 6144] = "AssertGenerator";
-        TransformFlags[TransformFlags["NodeExcludes"] = 536874325] = "NodeExcludes";
-        TransformFlags[TransformFlags["ArrowFunctionExcludes"] = 592227669] = "ArrowFunctionExcludes";
-        TransformFlags[TransformFlags["FunctionExcludes"] = 592293205] = "FunctionExcludes";
-        TransformFlags[TransformFlags["ConstructorExcludes"] = 591760725] = "ConstructorExcludes";
-        TransformFlags[TransformFlags["MethodOrAccessorExcludes"] = 591760725] = "MethodOrAccessorExcludes";
-        TransformFlags[TransformFlags["ClassExcludes"] = 539749717] = "ClassExcludes";
-        TransformFlags[TransformFlags["ModuleExcludes"] = 574729557] = "ModuleExcludes";
-        TransformFlags[TransformFlags["TypeExcludes"] = -3] = "TypeExcludes";
-        TransformFlags[TransformFlags["ObjectLiteralExcludes"] = 539110741] = "ObjectLiteralExcludes";
-        TransformFlags[TransformFlags["ArrayLiteralOrCallOrNewExcludes"] = 537922901] = "ArrayLiteralOrCallOrNewExcludes";
-        TransformFlags[TransformFlags["VariableDeclarationListExcludes"] = 545262933] = "VariableDeclarationListExcludes";
-        TransformFlags[TransformFlags["ParameterExcludes"] = 545262933] = "ParameterExcludes";
-        TransformFlags[TransformFlags["TypeScriptClassSyntaxMask"] = 548864] = "TypeScriptClassSyntaxMask";
-        TransformFlags[TransformFlags["ES2015FunctionSyntaxMask"] = 327680] = "ES2015FunctionSyntaxMask";
-    })(ts.TransformFlags || (ts.TransformFlags = {}));
-    var TransformFlags = ts.TransformFlags;
-    (function (EmitFlags) {
-        EmitFlags[EmitFlags["EmitEmitHelpers"] = 1] = "EmitEmitHelpers";
-        EmitFlags[EmitFlags["EmitExportStar"] = 2] = "EmitExportStar";
-        EmitFlags[EmitFlags["EmitSuperHelper"] = 4] = "EmitSuperHelper";
-        EmitFlags[EmitFlags["EmitAdvancedSuperHelper"] = 8] = "EmitAdvancedSuperHelper";
-        EmitFlags[EmitFlags["UMDDefine"] = 16] = "UMDDefine";
-        EmitFlags[EmitFlags["SingleLine"] = 32] = "SingleLine";
-        EmitFlags[EmitFlags["AdviseOnEmitNode"] = 64] = "AdviseOnEmitNode";
-        EmitFlags[EmitFlags["NoSubstitution"] = 128] = "NoSubstitution";
-        EmitFlags[EmitFlags["CapturesThis"] = 256] = "CapturesThis";
-        EmitFlags[EmitFlags["NoLeadingSourceMap"] = 512] = "NoLeadingSourceMap";
-        EmitFlags[EmitFlags["NoTrailingSourceMap"] = 1024] = "NoTrailingSourceMap";
-        EmitFlags[EmitFlags["NoSourceMap"] = 1536] = "NoSourceMap";
-        EmitFlags[EmitFlags["NoNestedSourceMaps"] = 2048] = "NoNestedSourceMaps";
-        EmitFlags[EmitFlags["NoTokenLeadingSourceMaps"] = 4096] = "NoTokenLeadingSourceMaps";
-        EmitFlags[EmitFlags["NoTokenTrailingSourceMaps"] = 8192] = "NoTokenTrailingSourceMaps";
-        EmitFlags[EmitFlags["NoTokenSourceMaps"] = 12288] = "NoTokenSourceMaps";
-        EmitFlags[EmitFlags["NoLeadingComments"] = 16384] = "NoLeadingComments";
-        EmitFlags[EmitFlags["NoTrailingComments"] = 32768] = "NoTrailingComments";
-        EmitFlags[EmitFlags["NoComments"] = 49152] = "NoComments";
-        EmitFlags[EmitFlags["NoNestedComments"] = 65536] = "NoNestedComments";
-        EmitFlags[EmitFlags["ExportName"] = 131072] = "ExportName";
-        EmitFlags[EmitFlags["LocalName"] = 262144] = "LocalName";
-        EmitFlags[EmitFlags["Indented"] = 524288] = "Indented";
-        EmitFlags[EmitFlags["NoIndentation"] = 1048576] = "NoIndentation";
-        EmitFlags[EmitFlags["AsyncFunctionBody"] = 2097152] = "AsyncFunctionBody";
-        EmitFlags[EmitFlags["ReuseTempVariableScope"] = 4194304] = "ReuseTempVariableScope";
-        EmitFlags[EmitFlags["CustomPrologue"] = 8388608] = "CustomPrologue";
-    })(ts.EmitFlags || (ts.EmitFlags = {}));
-    var EmitFlags = ts.EmitFlags;
-    (function (EmitContext) {
-        EmitContext[EmitContext["SourceFile"] = 0] = "SourceFile";
-        EmitContext[EmitContext["Expression"] = 1] = "Expression";
-        EmitContext[EmitContext["IdentifierName"] = 2] = "IdentifierName";
-        EmitContext[EmitContext["Unspecified"] = 3] = "Unspecified";
-    })(ts.EmitContext || (ts.EmitContext = {}));
-    var EmitContext = ts.EmitContext;
+    })(ModuleKind = ts.ModuleKind || (ts.ModuleKind = {}));
+    var Extension;
+    (function (Extension) {
+        Extension[Extension["Ts"] = 0] = "Ts";
+        Extension[Extension["Tsx"] = 1] = "Tsx";
+        Extension[Extension["Dts"] = 2] = "Dts";
+        Extension[Extension["Js"] = 3] = "Js";
+        Extension[Extension["Jsx"] = 4] = "Jsx";
+        Extension[Extension["LastTypeScriptExtension"] = 2] = "LastTypeScriptExtension";
+    })(Extension = ts.Extension || (ts.Extension = {}));
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -990,12 +137,6 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    (function (Ternary) {
-        Ternary[Ternary["False"] = 0] = "False";
-        Ternary[Ternary["Maybe"] = 1] = "Maybe";
-        Ternary[Ternary["True"] = -1] = "True";
-    })(ts.Ternary || (ts.Ternary = {}));
-    var Ternary = ts.Ternary;
     var createObject = Object.create;
     ts.collator = typeof Intl === "object" && typeof Intl.Collator === "function" ? new Intl.Collator() : undefined;
     function createMap(template) {
@@ -1060,12 +201,6 @@ var ts;
         return getCanonicalFileName(nonCanonicalizedPath);
     }
     ts.toPath = toPath;
-    (function (Comparison) {
-        Comparison[Comparison["LessThan"] = -1] = "LessThan";
-        Comparison[Comparison["EqualTo"] = 0] = "EqualTo";
-        Comparison[Comparison["GreaterThan"] = 1] = "GreaterThan";
-    })(ts.Comparison || (ts.Comparison = {}));
-    var Comparison = ts.Comparison;
     function forEach(array, callback) {
         if (array) {
             for (var i = 0, len = array.length; i < len; i++) {
@@ -1078,6 +213,13 @@ var ts;
         return undefined;
     }
     ts.forEach = forEach;
+    function zipWith(arrayA, arrayB, callback) {
+        Debug.assert(arrayA.length === arrayB.length);
+        for (var i = 0; i < arrayA.length; i++) {
+            callback(arrayA[i], arrayB[i], i);
+        }
+    }
+    ts.zipWith = zipWith;
     function every(array, callback) {
         if (array) {
             for (var i = 0, len = array.length; i < len; i++) {
@@ -1337,20 +479,25 @@ var ts;
     ts.mapObject = mapObject;
     function some(array, predicate) {
         if (array) {
-            for (var _i = 0, array_5 = array; _i < array_5.length; _i++) {
-                var v = array_5[_i];
-                if (!predicate || predicate(v)) {
-                    return true;
+            if (predicate) {
+                for (var _i = 0, array_5 = array; _i < array_5.length; _i++) {
+                    var v = array_5[_i];
+                    if (predicate(v)) {
+                        return true;
+                    }
                 }
             }
+            else {
+                return array.length > 0;
+            }
         }
         return false;
     }
     ts.some = some;
     function concatenate(array1, array2) {
-        if (!array2 || !array2.length)
+        if (!some(array2))
             return array1;
-        if (!array1 || !array1.length)
+        if (!some(array1))
             return array2;
         return array1.concat(array2);
     }
@@ -1373,6 +520,41 @@ var ts;
         return result;
     }
     ts.deduplicate = deduplicate;
+    function arrayIsEqualTo(array1, array2, equaler) {
+        if (!array1 || !array2) {
+            return array1 === array2;
+        }
+        if (array1.length !== array2.length) {
+            return false;
+        }
+        for (var i = 0; i < array1.length; i++) {
+            var equals = equaler ? equaler(array1[i], array2[i]) : array1[i] === array2[i];
+            if (!equals) {
+                return false;
+            }
+        }
+        return true;
+    }
+    ts.arrayIsEqualTo = arrayIsEqualTo;
+    function changesAffectModuleResolution(oldOptions, newOptions) {
+        return !oldOptions ||
+            (oldOptions.module !== newOptions.module) ||
+            (oldOptions.moduleResolution !== newOptions.moduleResolution) ||
+            (oldOptions.noResolve !== newOptions.noResolve) ||
+            (oldOptions.target !== newOptions.target) ||
+            (oldOptions.noLib !== newOptions.noLib) ||
+            (oldOptions.jsx !== newOptions.jsx) ||
+            (oldOptions.allowJs !== newOptions.allowJs) ||
+            (oldOptions.rootDir !== newOptions.rootDir) ||
+            (oldOptions.configFilePath !== newOptions.configFilePath) ||
+            (oldOptions.baseUrl !== newOptions.baseUrl) ||
+            (oldOptions.maxNodeModuleJsDepth !== newOptions.maxNodeModuleJsDepth) ||
+            !arrayIsEqualTo(oldOptions.lib, newOptions.lib) ||
+            !arrayIsEqualTo(oldOptions.typeRoots, newOptions.typeRoots) ||
+            !arrayIsEqualTo(oldOptions.rootDirs, newOptions.rootDirs) ||
+            !equalOwnProperties(oldOptions.paths, newOptions.paths);
+    }
+    ts.changesAffectModuleResolution = changesAffectModuleResolution;
     function compact(array) {
         var result;
         if (array) {
@@ -1391,6 +573,26 @@ var ts;
         return result || array;
     }
     ts.compact = compact;
+    function relativeComplement(arrayA, arrayB, comparer, offsetA, offsetB) {
+        if (comparer === void 0) { comparer = compareValues; }
+        if (offsetA === void 0) { offsetA = 0; }
+        if (offsetB === void 0) { offsetB = 0; }
+        if (!arrayB || !arrayA || arrayB.length === 0 || arrayA.length === 0)
+            return arrayB;
+        var result = [];
+        outer: for (; offsetB < arrayB.length; offsetB++) {
+            inner: for (; offsetA < arrayA.length; offsetA++) {
+                switch (comparer(arrayB[offsetB], arrayA[offsetA])) {
+                    case -1: break inner;
+                    case 0: continue outer;
+                    case 1: continue inner;
+                }
+            }
+            result.push(arrayB[offsetB]);
+        }
+        return result;
+    }
+    ts.relativeComplement = relativeComplement;
     function sum(array, prop) {
         var result = 0;
         for (var _i = 0, array_7 = array; _i < array_7.length; _i++) {
@@ -1400,15 +602,23 @@ var ts;
         return result;
     }
     ts.sum = sum;
+    function append(to, value) {
+        if (value === undefined)
+            return to;
+        if (to === undefined)
+            to = [];
+        to.push(value);
+        return to;
+    }
+    ts.append = append;
     function addRange(to, from) {
-        if (to && from) {
-            for (var _i = 0, from_1 = from; _i < from_1.length; _i++) {
-                var v = from_1[_i];
-                if (v !== undefined) {
-                    to.push(v);
-                }
-            }
+        if (from === undefined)
+            return to;
+        for (var _i = 0, from_1 = from; _i < from_1.length; _i++) {
+            var v = from_1[_i];
+            to = append(to, v);
         }
+        return to;
     }
     ts.addRange = addRange;
     function rangeEquals(array1, array2, pos, end) {
@@ -1427,6 +637,12 @@ var ts;
             : undefined;
     }
     ts.firstOrUndefined = firstOrUndefined;
+    function lastOrUndefined(array) {
+        return array && array.length > 0
+            ? array[array.length - 1]
+            : undefined;
+    }
+    ts.lastOrUndefined = lastOrUndefined;
     function singleOrUndefined(array) {
         return array && array.length === 1
             ? array[0]
@@ -1439,17 +655,17 @@ var ts;
             : array;
     }
     ts.singleOrMany = singleOrMany;
-    function lastOrUndefined(array) {
-        return array && array.length > 0
-            ? array[array.length - 1]
-            : undefined;
+    function replaceElement(array, index, value) {
+        var result = array.slice(0);
+        result[index] = value;
+        return result;
     }
-    ts.lastOrUndefined = lastOrUndefined;
-    function binarySearch(array, value, comparer) {
+    ts.replaceElement = replaceElement;
+    function binarySearch(array, value, comparer, offset) {
         if (!array || array.length === 0) {
             return -1;
         }
-        var low = 0;
+        var low = offset || 0;
         var high = array.length - 1;
         comparer = comparer !== undefined
             ? comparer
@@ -1683,6 +899,12 @@ var ts;
         return Array.isArray ? Array.isArray(value) : value instanceof Array;
     }
     ts.isArray = isArray;
+    function noop() { }
+    ts.noop = noop;
+    function notImplemented() {
+        throw new Error("Not implemented");
+    }
+    ts.notImplemented = notImplemented;
     function memoize(callback) {
         var value;
         return function () {
@@ -1798,6 +1020,17 @@ var ts;
         };
     }
     ts.createCompilerDiagnostic = createCompilerDiagnostic;
+    function createCompilerDiagnosticFromMessageChain(chain) {
+        return {
+            file: undefined,
+            start: undefined,
+            length: undefined,
+            code: chain.code,
+            category: chain.category,
+            messageText: chain.next ? chain : chain.messageText
+        };
+    }
+    ts.createCompilerDiagnosticFromMessageChain = createCompilerDiagnosticFromMessageChain;
     function chainDiagnosticMessages(details, message) {
         var text = getLocaleSpecificMessage(message);
         if (arguments.length > 2) {
@@ -2190,6 +1423,10 @@ var ts;
         return expectedPos >= 0 && str.indexOf(suffix, expectedPos) === expectedPos;
     }
     ts.endsWith = endsWith;
+    function hasExtension(fileName) {
+        return getBaseFileName(fileName).indexOf(".") >= 0;
+    }
+    ts.hasExtension = hasExtension;
     function fileExtensionIs(path, extension) {
         return path.length > extension.length && endsWith(path, extension);
     }
@@ -2217,68 +1454,83 @@ var ts;
         var doubleAsteriskRegexFragment = usage === "exclude" ? "(/.+?)?" : "(/[^/.][^/]*)*?";
         var pattern = "";
         var hasWrittenSubpattern = false;
-        spec: for (var _i = 0, specs_1 = specs; _i < specs_1.length; _i++) {
+        for (var _i = 0, specs_1 = specs; _i < specs_1.length; _i++) {
             var spec = specs_1[_i];
             if (!spec) {
                 continue;
             }
-            var subpattern = "";
-            var hasRecursiveDirectoryWildcard = false;
-            var hasWrittenComponent = false;
-            var components = getNormalizedPathComponents(spec, basePath);
-            if (usage !== "exclude" && components[components.length - 1] === "**") {
-                continue spec;
-            }
-            components[0] = removeTrailingDirectorySeparator(components[0]);
-            var optionalCount = 0;
-            for (var _a = 0, components_1 = components; _a < components_1.length; _a++) {
-                var component = components_1[_a];
-                if (component === "**") {
-                    if (hasRecursiveDirectoryWildcard) {
-                        continue spec;
-                    }
-                    subpattern += doubleAsteriskRegexFragment;
-                    hasRecursiveDirectoryWildcard = true;
-                    hasWrittenComponent = true;
-                }
-                else {
-                    if (usage === "directories") {
-                        subpattern += "(";
-                        optionalCount++;
-                    }
-                    if (hasWrittenComponent) {
-                        subpattern += ts.directorySeparator;
-                    }
-                    if (usage !== "exclude") {
-                        if (component.charCodeAt(0) === 42) {
-                            subpattern += "([^./]" + singleAsteriskRegexFragment + ")?";
-                            component = component.substr(1);
-                        }
-                        else if (component.charCodeAt(0) === 63) {
-                            subpattern += "[^./]";
-                            component = component.substr(1);
-                        }
-                    }
-                    subpattern += component.replace(reservedCharacterPattern, replaceWildcardCharacter);
-                    hasWrittenComponent = true;
-                }
-            }
-            while (optionalCount > 0) {
-                subpattern += ")?";
-                optionalCount--;
+            var subPattern = getSubPatternFromSpec(spec, basePath, usage, singleAsteriskRegexFragment, doubleAsteriskRegexFragment, replaceWildcardCharacter);
+            if (subPattern === undefined) {
+                continue;
             }
             if (hasWrittenSubpattern) {
                 pattern += "|";
             }
-            pattern += "(" + subpattern + ")";
+            pattern += "(" + subPattern + ")";
             hasWrittenSubpattern = true;
         }
         if (!pattern) {
             return undefined;
         }
-        return "^(" + pattern + (usage === "exclude" ? ")($|/)" : ")$");
+        var terminator = usage === "exclude" ? "($|/)" : "$";
+        return "^(" + pattern + ")" + terminator;
     }
     ts.getRegularExpressionForWildcard = getRegularExpressionForWildcard;
+    function isImplicitGlob(lastPathComponent) {
+        return !/[.*?]/.test(lastPathComponent);
+    }
+    ts.isImplicitGlob = isImplicitGlob;
+    function getSubPatternFromSpec(spec, basePath, usage, singleAsteriskRegexFragment, doubleAsteriskRegexFragment, replaceWildcardCharacter) {
+        var subpattern = "";
+        var hasRecursiveDirectoryWildcard = false;
+        var hasWrittenComponent = false;
+        var components = getNormalizedPathComponents(spec, basePath);
+        var lastComponent = lastOrUndefined(components);
+        if (usage !== "exclude" && lastComponent === "**") {
+            return undefined;
+        }
+        components[0] = removeTrailingDirectorySeparator(components[0]);
+        if (isImplicitGlob(lastComponent)) {
+            components.push("**", "*");
+        }
+        var optionalCount = 0;
+        for (var _i = 0, components_1 = components; _i < components_1.length; _i++) {
+            var component = components_1[_i];
+            if (component === "**") {
+                if (hasRecursiveDirectoryWildcard) {
+                    return undefined;
+                }
+                subpattern += doubleAsteriskRegexFragment;
+                hasRecursiveDirectoryWildcard = true;
+            }
+            else {
+                if (usage === "directories") {
+                    subpattern += "(";
+                    optionalCount++;
+                }
+                if (hasWrittenComponent) {
+                    subpattern += ts.directorySeparator;
+                }
+                if (usage !== "exclude") {
+                    if (component.charCodeAt(0) === 42) {
+                        subpattern += "([^./]" + singleAsteriskRegexFragment + ")?";
+                        component = component.substr(1);
+                    }
+                    else if (component.charCodeAt(0) === 63) {
+                        subpattern += "[^./]";
+                        component = component.substr(1);
+                    }
+                }
+                subpattern += component.replace(reservedCharacterPattern, replaceWildcardCharacter);
+            }
+            hasWrittenComponent = true;
+        }
+        while (optionalCount > 0) {
+            subpattern += ")?";
+            optionalCount--;
+        }
+        return subpattern;
+    }
     function replaceWildCardCharacterFiles(match) {
         return replaceWildcardCharacter(match, singleAsteriskRegexFragmentFiles);
     }
@@ -2345,25 +1597,30 @@ var ts;
             for (var _i = 0, includes_1 = includes; _i < includes_1.length; _i++) {
                 var include = includes_1[_i];
                 var absolute = isRootedDiskPath(include) ? include : normalizePath(combinePaths(path, include));
-                var wildcardOffset = indexOfAnyCharCode(absolute, wildcardCharCodes);
-                var includeBasePath = wildcardOffset < 0
-                    ? removeTrailingDirectorySeparator(getDirectoryPath(absolute))
-                    : absolute.substring(0, absolute.lastIndexOf(ts.directorySeparator, wildcardOffset));
-                includeBasePaths.push(includeBasePath);
+                includeBasePaths.push(getIncludeBasePath(absolute));
             }
             includeBasePaths.sort(useCaseSensitiveFileNames ? compareStrings : compareStringsCaseInsensitive);
-            include: for (var i = 0; i < includeBasePaths.length; i++) {
-                var includeBasePath = includeBasePaths[i];
-                for (var j = 0; j < basePaths.length; j++) {
-                    if (containsPath(basePaths[j], includeBasePath, path, !useCaseSensitiveFileNames)) {
-                        continue include;
-                    }
+            var _loop_1 = function (includeBasePath) {
+                if (ts.every(basePaths, function (basePath) { return !containsPath(basePath, includeBasePath, path, !useCaseSensitiveFileNames); })) {
+                    basePaths.push(includeBasePath);
                 }
-                basePaths.push(includeBasePath);
+            };
+            for (var _a = 0, includeBasePaths_1 = includeBasePaths; _a < includeBasePaths_1.length; _a++) {
+                var includeBasePath = includeBasePaths_1[_a];
+                _loop_1(includeBasePath);
             }
         }
         return basePaths;
     }
+    function getIncludeBasePath(absolute) {
+        var wildcardOffset = indexOfAnyCharCode(absolute, wildcardCharCodes);
+        if (wildcardOffset < 0) {
+            return !hasExtension(absolute)
+                ? absolute
+                : removeTrailingDirectorySeparator(getDirectoryPath(absolute));
+        }
+        return absolute.substring(0, absolute.lastIndexOf(ts.directorySeparator, wildcardOffset));
+    }
     function ensureScriptKind(fileName, scriptKind) {
         return (scriptKind || getScriptKindFromFileName(fileName)) || 3;
     }
@@ -2413,14 +1670,6 @@ var ts;
         return false;
     }
     ts.isSupportedSourceFileName = isSupportedSourceFileName;
-    (function (ExtensionPriority) {
-        ExtensionPriority[ExtensionPriority["TypeScriptFiles"] = 0] = "TypeScriptFiles";
-        ExtensionPriority[ExtensionPriority["DeclarationAndJavaScriptFiles"] = 2] = "DeclarationAndJavaScriptFiles";
-        ExtensionPriority[ExtensionPriority["Limit"] = 5] = "Limit";
-        ExtensionPriority[ExtensionPriority["Highest"] = 0] = "Highest";
-        ExtensionPriority[ExtensionPriority["Lowest"] = 2] = "Lowest";
-    })(ts.ExtensionPriority || (ts.ExtensionPriority = {}));
-    var ExtensionPriority = ts.ExtensionPriority;
     function getExtensionPriority(path, supportedExtensions) {
         for (var i = supportedExtensions.length - 1; i >= 0; i--) {
             if (fileExtensionIs(path, supportedExtensions[i])) {
@@ -2471,10 +1720,6 @@ var ts;
         return path.substring(0, path.length - extension.length);
     }
     ts.removeExtension = removeExtension;
-    function isJsxOrTsxExtension(ext) {
-        return ext === ".jsx" || ext === ".tsx";
-    }
-    ts.isJsxOrTsxExtension = isJsxOrTsxExtension;
     function changeExtension(path, newExtension) {
         return (removeFileExtension(path) + newExtension);
     }
@@ -2509,13 +1754,6 @@ var ts;
         getTypeConstructor: function () { return Type; },
         getSignatureConstructor: function () { return Signature; }
     };
-    (function (AssertionLevel) {
-        AssertionLevel[AssertionLevel["None"] = 0] = "None";
-        AssertionLevel[AssertionLevel["Normal"] = 1] = "Normal";
-        AssertionLevel[AssertionLevel["Aggressive"] = 2] = "Aggressive";
-        AssertionLevel[AssertionLevel["VeryAggressive"] = 3] = "VeryAggressive";
-    })(ts.AssertionLevel || (ts.AssertionLevel = {}));
-    var AssertionLevel = ts.AssertionLevel;
     var Debug;
     (function (Debug) {
         Debug.currentAssertionLevel = 0;
@@ -2627,6 +1865,36 @@ var ts;
         return !(pos >= 0);
     }
     ts.positionIsSynthesized = positionIsSynthesized;
+    function extensionIsTypeScript(ext) {
+        return ext <= ts.Extension.LastTypeScriptExtension;
+    }
+    ts.extensionIsTypeScript = extensionIsTypeScript;
+    function extensionFromPath(path) {
+        var ext = tryGetExtensionFromPath(path);
+        if (ext !== undefined) {
+            return ext;
+        }
+        Debug.fail("File " + path + " has unknown extension.");
+    }
+    ts.extensionFromPath = extensionFromPath;
+    function tryGetExtensionFromPath(path) {
+        if (fileExtensionIs(path, ".d.ts")) {
+            return ts.Extension.Dts;
+        }
+        if (fileExtensionIs(path, ".ts")) {
+            return ts.Extension.Ts;
+        }
+        if (fileExtensionIs(path, ".tsx")) {
+            return ts.Extension.Tsx;
+        }
+        if (fileExtensionIs(path, ".js")) {
+            return ts.Extension.Js;
+        }
+        if (fileExtensionIs(path, ".jsx")) {
+            return ts.Extension.Jsx;
+        }
+    }
+    ts.tryGetExtensionFromPath = tryGetExtensionFromPath;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -2900,11 +2168,6 @@ var ts;
             function readDirectory(path, extensions, excludes, includes) {
                 return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), getAccessibleFileSystemEntries);
             }
-            var FileSystemEntryKind;
-            (function (FileSystemEntryKind) {
-                FileSystemEntryKind[FileSystemEntryKind["File"] = 0] = "File";
-                FileSystemEntryKind[FileSystemEntryKind["Directory"] = 1] = "Directory";
-            })(FileSystemEntryKind || (FileSystemEntryKind = {}));
             function fileSystemEntryExists(path, entryKind) {
                 try {
                     var stat = _fs.statSync(path);
@@ -2926,6 +2189,7 @@ var ts;
             function getDirectories(path) {
                 return ts.filter(_fs.readdirSync(path), function (dir) { return fileSystemEntryExists(ts.combinePaths(path, dir), 1); });
             }
+            var noOpFileWatcher = { close: ts.noop };
             var nodeSystem = {
                 args: process.argv.slice(2),
                 newLine: _os.EOL,
@@ -2935,7 +2199,7 @@ var ts;
                 },
                 readFile: readFile,
                 writeFile: writeFile,
-                watchFile: function (fileName, callback) {
+                watchFile: function (fileName, callback, pollingInterval) {
                     if (useNonPollingWatchers) {
                         var watchedFile_1 = watchedFileSet.addFile(fileName, callback);
                         return {
@@ -2943,7 +2207,7 @@ var ts;
                         };
                     }
                     else {
-                        _fs.watchFile(fileName, { persistent: true, interval: 250 }, fileChanged);
+                        _fs.watchFile(fileName, { persistent: true, interval: pollingInterval || 250 }, fileChanged);
                         return {
                             close: function () { return _fs.unwatchFile(fileName, fileChanged); }
                         };
@@ -2958,7 +2222,7 @@ var ts;
                 watchDirectory: function (directoryName, callback, recursive) {
                     var options;
                     if (!directoryExists(directoryName)) {
-                        return;
+                        return noOpFileWatcher;
                     }
                     if (isNode4OrLater() && (process.platform === "win32" || process.platform === "darwin")) {
                         options = { persistent: true, recursive: !!recursive };
@@ -3035,7 +2299,9 @@ var ts;
                     }
                     catch (e) {
                     }
-                }
+                },
+                setTimeout: setTimeout,
+                clearTimeout: clearTimeout
             };
             return nodeSystem;
         }
@@ -3153,7 +2419,7 @@ var ts;
         A_set_accessor_parameter_cannot_have_an_initializer: { code: 1052, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_parameter_cannot_have_an_initializer_1052", message: "A 'set' accessor parameter cannot have an initializer." },
         A_set_accessor_cannot_have_rest_parameter: { code: 1053, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_cannot_have_rest_parameter_1053", message: "A 'set' accessor cannot have rest parameter." },
         A_get_accessor_cannot_have_parameters: { code: 1054, category: ts.DiagnosticCategory.Error, key: "A_get_accessor_cannot_have_parameters_1054", message: "A 'get' accessor cannot have parameters." },
-        Type_0_is_not_a_valid_async_function_return_type: { code: 1055, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_a_valid_async_function_return_type_1055", message: "Type '{0}' is not a valid async function return type." },
+        Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value: { code: 1055, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Prom_1055", message: "Type '{0}' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value." },
         Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher: { code: 1056, category: ts.DiagnosticCategory.Error, key: "Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher_1056", message: "Accessors are only available when targeting ECMAScript 5 and higher." },
         An_async_function_or_method_must_have_a_valid_awaitable_return_type: { code: 1057, category: ts.DiagnosticCategory.Error, key: "An_async_function_or_method_must_have_a_valid_awaitable_return_type_1057", message: "An async function or method must have a valid awaitable return type." },
         Operand_for_await_does_not_have_a_valid_callable_then_member: { code: 1058, category: ts.DiagnosticCategory.Error, key: "Operand_for_await_does_not_have_a_valid_callable_then_member_1058", message: "Operand for 'await' does not have a valid callable 'then' member." },
@@ -3263,7 +2529,6 @@ var ts;
         Module_0_has_no_default_export: { code: 1192, category: ts.DiagnosticCategory.Error, key: "Module_0_has_no_default_export_1192", message: "Module '{0}' has no default export." },
         An_export_declaration_cannot_have_modifiers: { code: 1193, category: ts.DiagnosticCategory.Error, key: "An_export_declaration_cannot_have_modifiers_1193", message: "An export declaration cannot have modifiers." },
         Export_declarations_are_not_permitted_in_a_namespace: { code: 1194, category: ts.DiagnosticCategory.Error, key: "Export_declarations_are_not_permitted_in_a_namespace_1194", message: "Export declarations are not permitted in a namespace." },
-        Catch_clause_variable_name_must_be_an_identifier: { code: 1195, category: ts.DiagnosticCategory.Error, key: "Catch_clause_variable_name_must_be_an_identifier_1195", message: "Catch clause variable name must be an identifier." },
         Catch_clause_variable_cannot_have_a_type_annotation: { code: 1196, category: ts.DiagnosticCategory.Error, key: "Catch_clause_variable_cannot_have_a_type_annotation_1196", message: "Catch clause variable cannot have a type annotation." },
         Catch_clause_variable_cannot_have_an_initializer: { code: 1197, category: ts.DiagnosticCategory.Error, key: "Catch_clause_variable_cannot_have_an_initializer_1197", message: "Catch clause variable cannot have an initializer." },
         An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive: { code: 1198, category: ts.DiagnosticCategory.Error, key: "An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive_1198", message: "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive." },
@@ -3381,14 +2646,14 @@ var ts;
         Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1: { code: 2353, category: ts.DiagnosticCategory.Error, key: "Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1_2353", message: "Object literal may only specify known properties, and '{0}' does not exist in type '{1}'." },
         A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value: { code: 2355, category: ts.DiagnosticCategory.Error, key: "A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value_2355", message: "A function whose declared type is neither 'void' nor 'any' must return a value." },
         An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type: { code: 2356, category: ts.DiagnosticCategory.Error, key: "An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type_2356", message: "An arithmetic operand must be of type 'any', 'number' or an enum type." },
-        The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer: { code: 2357, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer_2357", message: "The operand of an increment or decrement operator must be a variable, property or indexer." },
+        The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_or_a_property_access: { code: 2357, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_or_a_property_access_2357", message: "The operand of an increment or decrement operator must be a variable or a property access." },
         The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2358, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_paramete_2358", message: "The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter." },
         The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_Function_interface_type: { code: 2359, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_F_2359", message: "The right-hand side of an 'instanceof' expression must be of type 'any' or of a type assignable to the 'Function' interface type." },
         The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol: { code: 2360, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol_2360", message: "The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'." },
         The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2361, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter_2361", message: "The right-hand side of an 'in' expression must be of type 'any', an object type or a type parameter" },
         The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2362, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type_2362", message: "The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
         The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2363, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type_2363", message: "The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
-        Invalid_left_hand_side_of_assignment_expression: { code: 2364, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_of_assignment_expression_2364", message: "Invalid left-hand side of assignment expression." },
+        The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access: { code: 2364, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access_2364", message: "The left-hand side of an assignment expression must be a variable or a property access." },
         Operator_0_cannot_be_applied_to_types_1_and_2: { code: 2365, category: ts.DiagnosticCategory.Error, key: "Operator_0_cannot_be_applied_to_types_1_and_2_2365", message: "Operator '{0}' cannot be applied to types '{1}' and '{2}'." },
         Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined: { code: 2366, category: ts.DiagnosticCategory.Error, key: "Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined_2366", message: "Function lacks ending return statement and return type does not include 'undefined'." },
         Type_parameter_name_cannot_be_0: { code: 2368, category: ts.DiagnosticCategory.Error, key: "Type_parameter_name_cannot_be_0_2368", message: "Type parameter name cannot be '{0}'" },
@@ -3428,7 +2693,7 @@ var ts;
         Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2: { code: 2403, category: ts.DiagnosticCategory.Error, key: "Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_t_2403", message: "Subsequent variable declarations must have the same type.  Variable '{0}' must be of type '{1}', but here has type '{2}'." },
         The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation: { code: 2404, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation_2404", message: "The left-hand side of a 'for...in' statement cannot use a type annotation." },
         The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any: { code: 2405, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any_2405", message: "The left-hand side of a 'for...in' statement must be of type 'string' or 'any'." },
-        Invalid_left_hand_side_in_for_in_statement: { code: 2406, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_in_for_in_statement_2406", message: "Invalid left-hand side in 'for...in' statement." },
+        The_left_hand_side_of_a_for_in_statement_must_be_a_variable_or_a_property_access: { code: 2406, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_must_be_a_variable_or_a_property_access_2406", message: "The left-hand side of a 'for...in' statement must be a variable or a property access." },
         The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2407, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter_2407", message: "The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter." },
         Setters_cannot_return_a_value: { code: 2408, category: ts.DiagnosticCategory.Error, key: "Setters_cannot_return_a_value_2408", message: "Setters cannot return a value." },
         Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class: { code: 2409, category: ts.DiagnosticCategory.Error, key: "Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class_2409", message: "Return type of constructor signature must be assignable to the instance type of the class" },
@@ -3466,8 +2731,6 @@ var ts;
         Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1: { code: 2446, category: ts.DiagnosticCategory.Error, key: "Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1_2446", message: "Property '{0}' is protected and only accessible through an instance of class '{1}'." },
         The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead: { code: 2447, category: ts.DiagnosticCategory.Error, key: "The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead_2447", message: "The '{0}' operator is not allowed for boolean types. Consider using '{1}' instead." },
         Block_scoped_variable_0_used_before_its_declaration: { code: 2448, category: ts.DiagnosticCategory.Error, key: "Block_scoped_variable_0_used_before_its_declaration_2448", message: "Block-scoped variable '{0}' used before its declaration." },
-        The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property: { code: 2449, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property_2449", message: "The operand of an increment or decrement operator cannot be a constant or a read-only property." },
-        Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property: { code: 2450, category: ts.DiagnosticCategory.Error, key: "Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property_2450", message: "Left-hand side of assignment expression cannot be a constant or a read-only property." },
         Cannot_redeclare_block_scoped_variable_0: { code: 2451, category: ts.DiagnosticCategory.Error, key: "Cannot_redeclare_block_scoped_variable_0_2451", message: "Cannot redeclare block-scoped variable '{0}'." },
         An_enum_member_cannot_have_a_numeric_name: { code: 2452, category: ts.DiagnosticCategory.Error, key: "An_enum_member_cannot_have_a_numeric_name_2452", message: "An enum member cannot have a numeric name." },
         The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_type_arguments_explicitly: { code: 2453, category: ts.DiagnosticCategory.Error, key: "The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_typ_2453", message: "The type argument for type parameter '{0}' cannot be inferred from the usage. Consider specifying the type arguments explicitly." },
@@ -3479,7 +2742,7 @@ var ts;
         Type_0_has_no_property_1_and_no_string_index_signature: { code: 2459, category: ts.DiagnosticCategory.Error, key: "Type_0_has_no_property_1_and_no_string_index_signature_2459", message: "Type '{0}' has no property '{1}' and no string index signature." },
         Type_0_has_no_property_1: { code: 2460, category: ts.DiagnosticCategory.Error, key: "Type_0_has_no_property_1_2460", message: "Type '{0}' has no property '{1}'." },
         Type_0_is_not_an_array_type: { code: 2461, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_an_array_type_2461", message: "Type '{0}' is not an array type." },
-        A_rest_element_must_be_last_in_an_array_destructuring_pattern: { code: 2462, category: ts.DiagnosticCategory.Error, key: "A_rest_element_must_be_last_in_an_array_destructuring_pattern_2462", message: "A rest element must be last in an array destructuring pattern" },
+        A_rest_element_must_be_last_in_a_destructuring_pattern: { code: 2462, category: ts.DiagnosticCategory.Error, key: "A_rest_element_must_be_last_in_a_destructuring_pattern_2462", message: "A rest element must be last in a destructuring pattern" },
         A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature: { code: 2463, category: ts.DiagnosticCategory.Error, key: "A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature_2463", message: "A binding pattern parameter cannot be optional in an implementation signature." },
         A_computed_property_name_must_be_of_type_string_number_symbol_or_any: { code: 2464, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_must_be_of_type_string_number_symbol_or_any_2464", message: "A computed property name must be of type 'string', 'number', 'symbol', or 'any'." },
         this_cannot_be_referenced_in_a_computed_property_name: { code: 2465, category: ts.DiagnosticCategory.Error, key: "this_cannot_be_referenced_in_a_computed_property_name_2465", message: "'this' cannot be referenced in a computed property name." },
@@ -3501,9 +2764,7 @@ var ts;
         Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1: { code: 2481, category: ts.DiagnosticCategory.Error, key: "Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1_2481", message: "Cannot initialize outer scoped variable '{0}' in the same scope as block scoped declaration '{1}'." },
         The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation: { code: 2483, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation_2483", message: "The left-hand side of a 'for...of' statement cannot use a type annotation." },
         Export_declaration_conflicts_with_exported_declaration_of_0: { code: 2484, category: ts.DiagnosticCategory.Error, key: "Export_declaration_conflicts_with_exported_declaration_of_0_2484", message: "Export declaration conflicts with exported declaration of '{0}'" },
-        The_left_hand_side_of_a_for_of_statement_cannot_be_a_constant_or_a_read_only_property: { code: 2485, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_cannot_be_a_constant_or_a_read_only_property_2485", message: "The left-hand side of a 'for...of' statement cannot be a constant or a read-only property." },
-        The_left_hand_side_of_a_for_in_statement_cannot_be_a_constant_or_a_read_only_property: { code: 2486, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_be_a_constant_or_a_read_only_property_2486", message: "The left-hand side of a 'for...in' statement cannot be a constant or a read-only property." },
-        Invalid_left_hand_side_in_for_of_statement: { code: 2487, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_in_for_of_statement_2487", message: "Invalid left-hand side in 'for...of' statement." },
+        The_left_hand_side_of_a_for_of_statement_must_be_a_variable_or_a_property_access: { code: 2487, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_must_be_a_variable_or_a_property_access_2487", message: "The left-hand side of a 'for...of' statement must be a variable or a property access." },
         Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator: { code: 2488, category: ts.DiagnosticCategory.Error, key: "Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator_2488", message: "Type must have a '[Symbol.iterator]()' method that returns an iterator." },
         An_iterator_must_have_a_next_method: { code: 2489, category: ts.DiagnosticCategory.Error, key: "An_iterator_must_have_a_next_method_2489", message: "An iterator must have a 'next()' method." },
         The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: { code: 2490, category: ts.DiagnosticCategory.Error, key: "The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property_2490", message: "The type returned by the 'next()' method of an iterator must have a 'value' property." },
@@ -3550,6 +2811,13 @@ var ts;
         Object_is_possibly_null_or_undefined: { code: 2533, category: ts.DiagnosticCategory.Error, key: "Object_is_possibly_null_or_undefined_2533", message: "Object is possibly 'null' or 'undefined'." },
         A_function_returning_never_cannot_have_a_reachable_end_point: { code: 2534, category: ts.DiagnosticCategory.Error, key: "A_function_returning_never_cannot_have_a_reachable_end_point_2534", message: "A function returning 'never' cannot have a reachable end point." },
         Enum_type_0_has_members_with_initializers_that_are_not_literals: { code: 2535, category: ts.DiagnosticCategory.Error, key: "Enum_type_0_has_members_with_initializers_that_are_not_literals_2535", message: "Enum type '{0}' has members with initializers that are not literals." },
+        Type_0_is_not_constrained_to_keyof_1: { code: 2536, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_constrained_to_keyof_1_2536", message: "Type '{0}' is not constrained to 'keyof {1}'." },
+        Type_0_has_no_matching_index_signature_for_type_1: { code: 2537, category: ts.DiagnosticCategory.Error, key: "Type_0_has_no_matching_index_signature_for_type_1_2537", message: "Type '{0}' has no matching index signature for type '{1}'." },
+        Type_0_cannot_be_used_as_an_index_type: { code: 2538, category: ts.DiagnosticCategory.Error, key: "Type_0_cannot_be_used_as_an_index_type_2538", message: "Type '{0}' cannot be used as an index type." },
+        Cannot_assign_to_0_because_it_is_not_a_variable: { code: 2539, category: ts.DiagnosticCategory.Error, key: "Cannot_assign_to_0_because_it_is_not_a_variable_2539", message: "Cannot assign to '{0}' because it is not a variable." },
+        Cannot_assign_to_0_because_it_is_a_constant_or_a_read_only_property: { code: 2540, category: ts.DiagnosticCategory.Error, key: "Cannot_assign_to_0_because_it_is_a_constant_or_a_read_only_property_2540", message: "Cannot assign to '{0}' because it is a constant or a read-only property." },
+        The_target_of_an_assignment_must_be_a_variable_or_a_property_access: { code: 2541, category: ts.DiagnosticCategory.Error, key: "The_target_of_an_assignment_must_be_a_variable_or_a_property_access_2541", message: "The target of an assignment must be a variable or a property access." },
+        Index_signature_in_type_0_only_permits_reading: { code: 2542, category: ts.DiagnosticCategory.Error, key: "Index_signature_in_type_0_only_permits_reading_2542", message: "Index signature in type '{0}' only permits reading." },
         JSX_element_attributes_type_0_may_not_be_a_union_type: { code: 2600, category: ts.DiagnosticCategory.Error, key: "JSX_element_attributes_type_0_may_not_be_a_union_type_2600", message: "JSX element attributes type '{0}' may not be a union type." },
         The_return_type_of_a_JSX_element_constructor_must_return_an_object_type: { code: 2601, category: ts.DiagnosticCategory.Error, key: "The_return_type_of_a_JSX_element_constructor_must_return_an_object_type_2601", message: "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: { code: 2602, category: ts.DiagnosticCategory.Error, key: "JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist_2602", message: "JSX element implicitly has type 'any' because the global type 'JSX.Element' does not exist." },
@@ -3573,6 +2841,7 @@ var ts;
         Cannot_find_name_0_Did_you_mean_the_static_member_1_0: { code: 2662, category: ts.DiagnosticCategory.Error, key: "Cannot_find_name_0_Did_you_mean_the_static_member_1_0_2662", message: "Cannot find name '{0}'. Did you mean the static member '{1}.{0}'?" },
         Cannot_find_name_0_Did_you_mean_the_instance_member_this_0: { code: 2663, category: ts.DiagnosticCategory.Error, key: "Cannot_find_name_0_Did_you_mean_the_instance_member_this_0_2663", message: "Cannot find name '{0}'. Did you mean the instance member 'this.{0}'?" },
         Invalid_module_name_in_augmentation_module_0_cannot_be_found: { code: 2664, category: ts.DiagnosticCategory.Error, key: "Invalid_module_name_in_augmentation_module_0_cannot_be_found_2664", message: "Invalid module name in augmentation, module '{0}' cannot be found." },
+        Invalid_module_name_in_augmentation_Module_0_resolves_to_an_untyped_module_at_1_which_cannot_be_augmented: { code: 2665, category: ts.DiagnosticCategory.Error, key: "Invalid_module_name_in_augmentation_Module_0_resolves_to_an_untyped_module_at_1_which_cannot_be_augm_2665", message: "Invalid module name in augmentation. Module '{0}' resolves to an untyped module at '{1}', which cannot be augmented." },
         Exports_and_export_assignments_are_not_permitted_in_module_augmentations: { code: 2666, category: ts.DiagnosticCategory.Error, key: "Exports_and_export_assignments_are_not_permitted_in_module_augmentations_2666", message: "Exports and export assignments are not permitted in module augmentations." },
         Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_module: { code: 2667, category: ts.DiagnosticCategory.Error, key: "Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_mod_2667", message: "Imports are not permitted in module augmentations. Consider moving them to the enclosing external module." },
         export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always_visible: { code: 2668, category: ts.DiagnosticCategory.Error, key: "export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always__2668", message: "'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible." },
@@ -3604,6 +2873,10 @@ var ts;
         Namespace_0_has_no_exported_member_1: { code: 2694, category: ts.DiagnosticCategory.Error, key: "Namespace_0_has_no_exported_member_1_2694", message: "Namespace '{0}' has no exported member '{1}'." },
         Left_side_of_comma_operator_is_unused_and_has_no_side_effects: { code: 2695, category: ts.DiagnosticCategory.Error, key: "Left_side_of_comma_operator_is_unused_and_has_no_side_effects_2695", message: "Left side of comma operator is unused and has no side effects." },
         The_Object_type_is_assignable_to_very_few_other_types_Did_you_mean_to_use_the_any_type_instead: { code: 2696, category: ts.DiagnosticCategory.Error, key: "The_Object_type_is_assignable_to_very_few_other_types_Did_you_mean_to_use_the_any_type_instead_2696", message: "The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?" },
+        An_async_function_or_method_must_return_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES2015_in_your_lib_option: { code: 2697, category: ts.DiagnosticCategory.Error, key: "An_async_function_or_method_must_return_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_in_2697", message: "An async function or method must return a 'Promise'. Make sure you have a declaration for 'Promise' or include 'ES2015' in your `--lib` option." },
+        Spread_types_may_only_be_created_from_object_types: { code: 2698, category: ts.DiagnosticCategory.Error, key: "Spread_types_may_only_be_created_from_object_types_2698", message: "Spread types may only be created from object types." },
+        Rest_types_may_only_be_created_from_object_types: { code: 2700, category: ts.DiagnosticCategory.Error, key: "Rest_types_may_only_be_created_from_object_types_2700", message: "Rest types may only be created from object types." },
+        An_object_rest_element_must_be_an_identifier: { code: 2701, category: ts.DiagnosticCategory.Error, key: "An_object_rest_element_must_be_an_identifier_2701", message: "An object rest element must be an identifier." },
         Import_declaration_0_is_using_private_name_1: { code: 4000, category: ts.DiagnosticCategory.Error, key: "Import_declaration_0_is_using_private_name_1_4000", message: "Import declaration '{0}' is using private name '{1}'." },
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", message: "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: { code: 4004, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", message: "Type parameter '{0}' of exported interface has or is using private name '{1}'." },
@@ -3703,6 +2976,7 @@ var ts;
         Substitution_0_for_pattern_1_has_incorrect_type_expected_string_got_2: { code: 5064, category: ts.DiagnosticCategory.Error, key: "Substitution_0_for_pattern_1_has_incorrect_type_expected_string_got_2_5064", message: "Substitution '{0}' for pattern '{1}' has incorrect type, expected 'string', got '{2}'." },
         File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0: { code: 5065, category: ts.DiagnosticCategory.Error, key: "File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildca_5065", message: "File specification cannot contain a parent directory ('..') that appears after a recursive directory wildcard ('**'): '{0}'." },
         Substitutions_for_pattern_0_shouldn_t_be_an_empty_array: { code: 5066, category: ts.DiagnosticCategory.Error, key: "Substitutions_for_pattern_0_shouldn_t_be_an_empty_array_5066", message: "Substitutions for pattern '{0}' shouldn't be an empty array." },
+        Invalid_value_for_jsxFactory_0_is_not_a_valid_identifier_or_qualified_name: { code: 5067, category: ts.DiagnosticCategory.Error, key: "Invalid_value_for_jsxFactory_0_is_not_a_valid_identifier_or_qualified_name_5067", message: "Invalid value for 'jsxFactory'. '{0}' is not a valid identifier or qualified-name." },
         Concatenate_and_emit_output_to_single_file: { code: 6001, category: ts.DiagnosticCategory.Message, key: "Concatenate_and_emit_output_to_single_file_6001", message: "Concatenate and emit output to single file." },
         Generates_corresponding_d_ts_file: { code: 6002, category: ts.DiagnosticCategory.Message, key: "Generates_corresponding_d_ts_file_6002", message: "Generates corresponding '.d.ts' file." },
         Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations: { code: 6003, category: ts.DiagnosticCategory.Message, key: "Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations_6003", message: "Specify the location where debugger should locate map files instead of generated locations." },
@@ -3786,7 +3060,7 @@ var ts;
         File_0_exist_use_it_as_a_name_resolution_result: { code: 6097, category: ts.DiagnosticCategory.Message, key: "File_0_exist_use_it_as_a_name_resolution_result_6097", message: "File '{0}' exist - use it as a name resolution result." },
         Loading_module_0_from_node_modules_folder: { code: 6098, category: ts.DiagnosticCategory.Message, key: "Loading_module_0_from_node_modules_folder_6098", message: "Loading module '{0}' from 'node_modules' folder." },
         Found_package_json_at_0: { code: 6099, category: ts.DiagnosticCategory.Message, key: "Found_package_json_at_0_6099", message: "Found 'package.json' at '{0}'." },
-        package_json_does_not_have_types_field: { code: 6100, category: ts.DiagnosticCategory.Message, key: "package_json_does_not_have_types_field_6100", message: "'package.json' does not have 'types' field." },
+        package_json_does_not_have_a_types_or_main_field: { code: 6100, category: ts.DiagnosticCategory.Message, key: "package_json_does_not_have_a_types_or_main_field_6100", message: "'package.json' does not have a 'types' or 'main' field." },
         package_json_has_0_field_1_that_references_2: { code: 6101, category: ts.DiagnosticCategory.Message, key: "package_json_has_0_field_1_that_references_2_6101", message: "'package.json' has '{0}' field '{1}' that references '{2}'." },
         Allow_javascript_files_to_be_compiled: { code: 6102, category: ts.DiagnosticCategory.Message, key: "Allow_javascript_files_to_be_compiled_6102", message: "Allow javascript files to be compiled." },
         Option_0_should_have_array_of_strings_as_a_value: { code: 6103, category: ts.DiagnosticCategory.Error, key: "Option_0_should_have_array_of_strings_as_a_value_6103", message: "Option '{0}' should have array of strings as a value." },
@@ -3823,11 +3097,16 @@ var ts;
         Report_errors_on_unused_locals: { code: 6134, category: ts.DiagnosticCategory.Message, key: "Report_errors_on_unused_locals_6134", message: "Report errors on unused locals." },
         Report_errors_on_unused_parameters: { code: 6135, category: ts.DiagnosticCategory.Message, key: "Report_errors_on_unused_parameters_6135", message: "Report errors on unused parameters." },
         The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files: { code: 6136, category: ts.DiagnosticCategory.Message, key: "The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files_6136", message: "The maximum dependency depth to search under node_modules and load JavaScript files" },
-        No_types_specified_in_package_json_but_allowJs_is_set_so_returning_main_value_of_0: { code: 6137, category: ts.DiagnosticCategory.Message, key: "No_types_specified_in_package_json_but_allowJs_is_set_so_returning_main_value_of_0_6137", message: "No types specified in 'package.json' but 'allowJs' is set, so returning 'main' value of '{0}'" },
+        No_types_specified_in_package_json_so_returning_main_value_of_0: { code: 6137, category: ts.DiagnosticCategory.Message, key: "No_types_specified_in_package_json_so_returning_main_value_of_0_6137", message: "No types specified in 'package.json', so returning 'main' value of '{0}'" },
         Property_0_is_declared_but_never_used: { code: 6138, category: ts.DiagnosticCategory.Error, key: "Property_0_is_declared_but_never_used_6138", message: "Property '{0}' is declared but never used." },
         Import_emit_helpers_from_tslib: { code: 6139, category: ts.DiagnosticCategory.Message, key: "Import_emit_helpers_from_tslib_6139", message: "Import emit helpers from 'tslib'." },
         Auto_discovery_for_typings_is_enabled_in_project_0_Running_extra_resolution_pass_for_module_1_using_cache_location_2: { code: 6140, category: ts.DiagnosticCategory.Error, key: "Auto_discovery_for_typings_is_enabled_in_project_0_Running_extra_resolution_pass_for_module_1_using__6140", message: "Auto discovery for typings is enabled in project '{0}'. Running extra resolution pass for module '{1}' using cache location '{2}'." },
         Parse_in_strict_mode_and_emit_use_strict_for_each_source_file: { code: 6141, category: ts.DiagnosticCategory.Message, key: "Parse_in_strict_mode_and_emit_use_strict_for_each_source_file_6141", message: "Parse in strict mode and emit \"use strict\" for each source file" },
+        Module_0_was_resolved_to_1_but_jsx_is_not_set: { code: 6142, category: ts.DiagnosticCategory.Error, key: "Module_0_was_resolved_to_1_but_jsx_is_not_set_6142", message: "Module '{0}' was resolved to '{1}', but '--jsx' is not set." },
+        Module_0_was_resolved_to_1_but_allowJs_is_not_set: { code: 6143, category: ts.DiagnosticCategory.Error, key: "Module_0_was_resolved_to_1_but_allowJs_is_not_set_6143", message: "Module '{0}' was resolved to '{1}', but '--allowJs' is not set." },
+        Module_0_was_resolved_as_locally_declared_ambient_module_in_file_1: { code: 6144, category: ts.DiagnosticCategory.Message, key: "Module_0_was_resolved_as_locally_declared_ambient_module_in_file_1_6144", message: "Module '{0}' was resolved as locally declared ambient module in file '{1}'." },
+        Module_0_was_resolved_as_ambient_module_declared_in_1_since_this_file_was_not_modified: { code: 6145, category: ts.DiagnosticCategory.Message, key: "Module_0_was_resolved_as_ambient_module_declared_in_1_since_this_file_was_not_modified_6145", message: "Module '{0}' was resolved as ambient module declared in '{1}' since this file was not modified." },
+        Specify_the_JSX_factory_function_to_use_when_targeting_react_JSX_emit_e_g_React_createElement_or_h: { code: 6146, category: ts.DiagnosticCategory.Message, key: "Specify_the_JSX_factory_function_to_use_when_targeting_react_JSX_emit_e_g_React_createElement_or_h_6146", message: "Specify the JSX factory function to use when targeting 'react' JSX emit, e.g. 'React.createElement' or 'h'." },
         Variable_0_implicitly_has_an_1_type: { code: 7005, category: ts.DiagnosticCategory.Error, key: "Variable_0_implicitly_has_an_1_type_7005", message: "Variable '{0}' implicitly has an '{1}' type." },
         Parameter_0_implicitly_has_an_1_type: { code: 7006, category: ts.DiagnosticCategory.Error, key: "Parameter_0_implicitly_has_an_1_type_7006", message: "Parameter '{0}' implicitly has an '{1}' type." },
         Member_0_implicitly_has_an_1_type: { code: 7008, category: ts.DiagnosticCategory.Error, key: "Member_0_implicitly_has_an_1_type_7008", message: "Member '{0}' implicitly has an '{1}' type." },
@@ -3836,7 +3115,8 @@ var ts;
         Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type: { code: 7011, category: ts.DiagnosticCategory.Error, key: "Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type_7011", message: "Function expression, which lacks return-type annotation, implicitly has an '{0}' return type." },
         Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7013, category: ts.DiagnosticCategory.Error, key: "Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type_7013", message: "Construct signature, which lacks return-type annotation, implicitly has an 'any' return type." },
         Element_implicitly_has_an_any_type_because_index_expression_is_not_of_type_number: { code: 7015, category: ts.DiagnosticCategory.Error, key: "Element_implicitly_has_an_any_type_because_index_expression_is_not_of_type_number_7015", message: "Element implicitly has an 'any' type because index expression is not of type 'number'." },
-        Index_signature_of_object_type_implicitly_has_an_any_type: { code: 7017, category: ts.DiagnosticCategory.Error, key: "Index_signature_of_object_type_implicitly_has_an_any_type_7017", message: "Index signature of object type implicitly has an 'any' type." },
+        Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type: { code: 7016, category: ts.DiagnosticCategory.Error, key: "Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type_7016", message: "Could not find a declaration file for module '{0}'. '{1}' implicitly has an 'any' type." },
+        Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature: { code: 7017, category: ts.DiagnosticCategory.Error, key: "Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_7017", message: "Element implicitly has an 'any' type because type '{0}' has no index signature." },
         Object_literal_s_property_0_implicitly_has_an_1_type: { code: 7018, category: ts.DiagnosticCategory.Error, key: "Object_literal_s_property_0_implicitly_has_an_1_type_7018", message: "Object literal's property '{0}' implicitly has an '{1}' type." },
         Rest_parameter_0_implicitly_has_an_any_type: { code: 7019, category: ts.DiagnosticCategory.Error, key: "Rest_parameter_0_implicitly_has_an_any_type_7019", message: "Rest parameter '{0}' implicitly has an 'any[]' type." },
         Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7020, category: ts.DiagnosticCategory.Error, key: "Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type_7020", message: "Call signature, which lacks return-type annotation, implicitly has an 'any' return type." },
@@ -3883,6 +3163,8 @@ var ts;
         Unknown_typing_option_0: { code: 17010, category: ts.DiagnosticCategory.Error, key: "Unknown_typing_option_0_17010", message: "Unknown typing option '{0}'." },
         Circularity_detected_while_resolving_configuration_Colon_0: { code: 18000, category: ts.DiagnosticCategory.Error, key: "Circularity_detected_while_resolving_configuration_Colon_0_18000", message: "Circularity detected while resolving configuration: {0}" },
         The_path_in_an_extends_options_must_be_relative_or_rooted: { code: 18001, category: ts.DiagnosticCategory.Error, key: "The_path_in_an_extends_options_must_be_relative_or_rooted_18001", message: "The path in an 'extends' options must be relative or rooted." },
+        The_files_list_in_config_file_0_is_empty: { code: 18002, category: ts.DiagnosticCategory.Error, key: "The_files_list_in_config_file_0_is_empty_18002", message: "The 'files' list in config file '{0}' is empty." },
+        No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2: { code: 18003, category: ts.DiagnosticCategory.Error, key: "No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2_18003", message: "No inputs were found in config file '{0}'. Specified 'include' paths were '{1}' and 'exclude' paths were '{2}'." },
         Add_missing_super_call: { code: 90001, category: ts.DiagnosticCategory.Message, key: "Add_missing_super_call_90001", message: "Add missing 'super()' call." },
         Make_super_call_the_first_statement_in_the_constructor: { code: 90002, category: ts.DiagnosticCategory.Message, key: "Make_super_call_the_first_statement_in_the_constructor_90002", message: "Make 'super()' call the first statement in the constructor." },
         Change_extends_to_implements: { code: 90003, category: ts.DiagnosticCategory.Message, key: "Change_extends_to_implements_90003", message: "Change 'extends' to 'implements'" },
@@ -3890,6 +3172,8 @@ var ts;
         Implement_interface_on_reference: { code: 90005, category: ts.DiagnosticCategory.Message, key: "Implement_interface_on_reference_90005", message: "Implement interface on reference" },
         Implement_interface_on_class: { code: 90006, category: ts.DiagnosticCategory.Message, key: "Implement_interface_on_class_90006", message: "Implement interface on class" },
         Implement_inherited_abstract_class: { code: 90007, category: ts.DiagnosticCategory.Message, key: "Implement_inherited_abstract_class_90007", message: "Implement inherited abstract class" },
+        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: { code: 90009, category: ts.DiagnosticCategory.Error, key: "Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript__90009", message: "Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig" },
+        Type_0_is_not_assignable_to_type_1_Two_different_types_with_this_name_exist_but_they_are_unrelated: { code: 90010, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_assignable_to_type_1_Two_different_types_with_this_name_exist_but_they_are_unrelated_90010", message: "Type '{0}' is not assignable to type '{1}'. Two different types with this name exist, but they are unrelated." },
     };
 })(ts || (ts = {}));
 var ts;
@@ -3922,7 +3206,7 @@ var ts;
         "false": 85,
         "finally": 86,
         "for": 87,
-        "from": 137,
+        "from": 138,
         "function": 88,
         "get": 124,
         "if": 89,
@@ -3932,34 +3216,35 @@ var ts;
         "instanceof": 92,
         "interface": 108,
         "is": 125,
+        "keyof": 126,
         "let": 109,
-        "module": 126,
-        "namespace": 127,
-        "never": 128,
+        "module": 127,
+        "namespace": 128,
+        "never": 129,
         "new": 93,
         "null": 94,
-        "number": 131,
+        "number": 132,
         "package": 110,
         "private": 111,
         "protected": 112,
         "public": 113,
-        "readonly": 129,
-        "require": 130,
-        "global": 138,
+        "readonly": 130,
+        "require": 131,
+        "global": 139,
         "return": 95,
-        "set": 132,
+        "set": 133,
         "static": 114,
-        "string": 133,
+        "string": 134,
         "super": 96,
         "switch": 97,
-        "symbol": 134,
+        "symbol": 135,
         "this": 98,
         "throw": 99,
         "true": 100,
         "try": 101,
-        "type": 135,
+        "type": 136,
         "typeof": 102,
-        "undefined": 136,
+        "undefined": 137,
         "var": 103,
         "void": 104,
         "while": 105,
@@ -3967,7 +3252,7 @@ var ts;
         "yield": 115,
         "async": 119,
         "await": 120,
-        "of": 139,
+        "of": 140,
         "{": 16,
         "}": 17,
         "(": 18,
@@ -5350,10 +4635,13 @@ var ts;
                 case 44:
                     pos++;
                     return token = 25;
+                case 46:
+                    pos++;
+                    return token = 22;
             }
-            if (isIdentifierStart(ch, 4)) {
+            if (isIdentifierStart(ch, 5)) {
                 pos++;
-                while (isIdentifierPart(text.charCodeAt(pos), 4) && pos < end) {
+                while (isIdentifierPart(text.charCodeAt(pos), 5) && pos < end) {
                     pos++;
                 }
                 return token = 70;
@@ -5512,6 +4800,11 @@ var ts;
             type: "string",
             description: ts.Diagnostics.Specify_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit
         },
+        {
+            name: "jsxFactory",
+            type: "string",
+            description: ts.Diagnostics.Specify_the_JSX_factory_function_to_use_when_targeting_react_JSX_emit_e_g_React_createElement_or_h
+        },
         {
             name: "listFiles",
             type: "boolean",
@@ -5699,6 +4992,7 @@ var ts;
                 "es2015": 2,
                 "es2016": 3,
                 "es2017": 4,
+                "esnext": 5,
             }),
             description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015,
             paramType: ts.Diagnostics.VERSION,
@@ -5855,7 +5149,8 @@ var ts;
                     "es2015.symbol.wellknown": "lib.es2015.symbol.wellknown.d.ts",
                     "es2016.array.include": "lib.es2016.array.include.d.ts",
                     "es2017.object": "lib.es2017.object.d.ts",
-                    "es2017.sharedmemory": "lib.es2017.sharedmemory.d.ts"
+                    "es2017.sharedmemory": "lib.es2017.sharedmemory.d.ts",
+                    "es2017.string": "lib.es2017.string.d.ts",
                 }),
             },
             description: ts.Diagnostics.Specify_library_files_to_be_included_in_the_compilation_Colon
@@ -6000,7 +5295,11 @@ var ts;
                                     i++;
                                     break;
                                 case "boolean":
-                                    options[opt.name] = true;
+                                    var optValue = args[i];
+                                    options[opt.name] = optValue !== "false";
+                                    if (optValue === "false" || optValue === "true") {
+                                        i++;
+                                    }
                                     break;
                                 case "string":
                                     options[opt.name] = args[i] || "";
@@ -6259,6 +5558,9 @@ var ts;
             if (ts.hasProperty(json, "files")) {
                 if (ts.isArray(json["files"])) {
                     fileNames = json["files"];
+                    if (fileNames.length === 0) {
+                        errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.The_files_list_in_config_file_0_is_empty, configFileName || "tsconfig.json"));
+                    }
                 }
                 else {
                     errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "files", "Array"));
@@ -6295,7 +5597,11 @@ var ts;
             if (fileNames === undefined && includeSpecs === undefined) {
                 includeSpecs = ["**/*"];
             }
-            return matchFileNames(fileNames, includeSpecs, excludeSpecs, basePath, options, host, errors);
+            var result = matchFileNames(fileNames, includeSpecs, excludeSpecs, basePath, options, host, errors);
+            if (result.fileNames.length === 0 && !ts.hasProperty(json, "files") && resolutionStack.length === 0) {
+                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2, configFileName || "tsconfig.json", JSON.stringify(includeSpecs || []), JSON.stringify(excludeSpecs || [])));
+            }
+            return result;
         }
         var _b;
     }
@@ -6331,9 +5637,7 @@ var ts;
         return options;
     }
     function convertTypingOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName) {
-        var options = ts.getBaseFileName(configFileName) === "jsconfig.json"
-            ? { enableAutoDiscovery: true, include: [], exclude: [] }
-            : { enableAutoDiscovery: false, include: [], exclude: [] };
+        var options = { enableAutoDiscovery: ts.getBaseFileName(configFileName) === "jsconfig.json", include: [], exclude: [] };
         convertOptionsFromJson(ts.typingOptionDeclarations, jsonOptions, basePath, options, ts.Diagnostics.Unknown_typing_option_0, errors);
         return options;
     }
@@ -6464,14 +5768,13 @@ var ts;
             var recursiveKeys = [];
             for (var _i = 0, include_1 = include; _i < include_1.length; _i++) {
                 var file = include_1[_i];
-                var name_6 = ts.normalizePath(ts.combinePaths(path, file));
-                if (excludeRegex && excludeRegex.test(name_6)) {
+                var spec = ts.normalizePath(ts.combinePaths(path, file));
+                if (excludeRegex && excludeRegex.test(spec)) {
                     continue;
                 }
-                var match = wildcardDirectoryPattern.exec(name_6);
+                var match = getWildcardDirectoryFromSpec(spec, useCaseSensitiveFileNames);
                 if (match) {
-                    var key = useCaseSensitiveFileNames ? match[0] : match[0].toLowerCase();
-                    var flags = watchRecursivePattern.test(name_6) ? 1 : 0;
+                    var key = match.key, flags = match.flags;
                     var existingFlags = wildcardDirectories[key];
                     if (existingFlags === undefined || existingFlags < flags) {
                         wildcardDirectories[key] = flags;
@@ -6492,6 +5795,19 @@ var ts;
         }
         return wildcardDirectories;
     }
+    function getWildcardDirectoryFromSpec(spec, useCaseSensitiveFileNames) {
+        var match = wildcardDirectoryPattern.exec(spec);
+        if (match) {
+            return {
+                key: useCaseSensitiveFileNames ? match[0] : match[0].toLowerCase(),
+                flags: watchRecursivePattern.test(spec) ? 1 : 0
+            };
+        }
+        if (ts.isImplicitGlob(spec)) {
+            return { key: spec, flags: 1 };
+        }
+        return undefined;
+    }
     function hasFileWithHigherPriorityExtension(file, literalFiles, wildcardFiles, extensions, keyMapper) {
         var extensionPriority = ts.getExtensionPriority(file, extensions);
         var adjustedExtensionPriority = ts.adjustExtensionPriority(extensionPriority);
@@ -6532,7 +5848,16 @@ var ts;
         ;
         var safeList;
         var EmptySafeList = ts.createMap();
-        function discoverTypings(host, fileNames, projectRootPath, safeListPath, packageNameToTypingLocation, typingOptions) {
+        JsTyping.nodeCoreModuleList = [
+            "buffer", "querystring", "events", "http", "cluster",
+            "zlib", "os", "https", "punycode", "repl", "readline",
+            "vm", "child_process", "url", "dns", "net",
+            "dgram", "fs", "path", "string_decoder", "tls",
+            "crypto", "stream", "util", "assert", "tty", "domain",
+            "constants", "process", "v8", "timers", "console"
+        ];
+        var nodeCoreModules = ts.arrayToMap(JsTyping.nodeCoreModuleList, function (x) { return x; });
+        function discoverTypings(host, fileNames, projectRootPath, safeListPath, packageNameToTypingLocation, typingOptions, unresolvedImports) {
             var inferredTypings = ts.createMap();
             if (!typingOptions || !typingOptions.enableAutoDiscovery) {
                 return { cachedTypingPaths: [], newTypingNames: [], filesToWatch: [] };
@@ -6551,7 +5876,7 @@ var ts;
             mergeTypings(typingOptions.include);
             exclude = typingOptions.exclude || [];
             var possibleSearchDirs = ts.map(fileNames, ts.getDirectoryPath);
-            if (projectRootPath !== undefined) {
+            if (projectRootPath) {
                 possibleSearchDirs.push(projectRootPath);
             }
             searchDirs = ts.deduplicate(possibleSearchDirs);
@@ -6565,13 +5890,22 @@ var ts;
                 getTypingNamesFromNodeModuleFolder(nodeModulesPath);
             }
             getTypingNamesFromSourceFileNames(fileNames);
-            for (var name_7 in packageNameToTypingLocation) {
-                if (name_7 in inferredTypings && !inferredTypings[name_7]) {
-                    inferredTypings[name_7] = packageNameToTypingLocation[name_7];
+            if (unresolvedImports) {
+                for (var _a = 0, unresolvedImports_1 = unresolvedImports; _a < unresolvedImports_1.length; _a++) {
+                    var moduleId = unresolvedImports_1[_a];
+                    var typingName = moduleId in nodeCoreModules ? "node" : moduleId;
+                    if (!(typingName in inferredTypings)) {
+                        inferredTypings[typingName] = undefined;
+                    }
                 }
             }
-            for (var _a = 0, exclude_1 = exclude; _a < exclude_1.length; _a++) {
-                var excludeTypingName = exclude_1[_a];
+            for (var name_6 in packageNameToTypingLocation) {
+                if (name_6 in inferredTypings && !inferredTypings[name_6]) {
+                    inferredTypings[name_6] = packageNameToTypingLocation[name_6];
+                }
+            }
+            for (var _b = 0, exclude_1 = exclude; _b < exclude_1.length; _b++) {
+                var excludeTypingName = exclude_1[_b];
                 delete inferredTypings[excludeTypingName];
             }
             var newTypingNames = [];
@@ -6597,10 +5931,12 @@ var ts;
                 }
             }
             function getTypingNamesFromJson(jsonPath, filesToWatch) {
+                if (host.fileExists(jsonPath)) {
+                    filesToWatch.push(jsonPath);
+                }
                 var result = ts.readConfigFile(jsonPath, function (path) { return host.readFile(path); });
                 if (result.config) {
                     var jsonConfig = result.config;
-                    filesToWatch.push(jsonPath);
                     if (jsonConfig.dependencies) {
                         mergeTypings(ts.getOwnKeys(jsonConfig.dependencies));
                     }
@@ -6666,6 +6002,32 @@ var ts;
     })(JsTyping = ts.JsTyping || (ts.JsTyping = {}));
 })(ts || (ts = {}));
 var ts;
+(function (ts) {
+    var server;
+    (function (server) {
+        server.ActionSet = "action::set";
+        server.ActionInvalidate = "action::invalidate";
+        server.EventInstall = "event::install";
+        var Arguments;
+        (function (Arguments) {
+            Arguments.GlobalCacheLocation = "--globalTypingsCacheLocation";
+            Arguments.LogFile = "--logFile";
+            Arguments.EnableTelemetry = "--enableTelemetry";
+        })(Arguments = server.Arguments || (server.Arguments = {}));
+        function hasArgument(argumentName) {
+            return ts.sys.args.indexOf(argumentName) >= 0;
+        }
+        server.hasArgument = hasArgument;
+        function findArgument(argumentName) {
+            var index = ts.sys.args.indexOf(argumentName);
+            return index >= 0 && index < ts.sys.args.length - 1
+                ? ts.sys.args[index + 1]
+                : undefined;
+        }
+        server.findArgument = findArgument;
+    })(server = ts.server || (ts.server = {}));
+})(ts || (ts = {}));
+var ts;
 (function (ts) {
     function trace(host) {
         host.trace(ts.formatMessage.apply(undefined, arguments));
@@ -6675,24 +6037,50 @@ var ts;
         return compilerOptions.traceResolution && host.trace !== undefined;
     }
     ts.isTraceEnabled = isTraceEnabled;
-    function createResolvedModule(resolvedFileName, isExternalLibraryImport, failedLookupLocations) {
-        return { resolvedModule: resolvedFileName ? { resolvedFileName: resolvedFileName, isExternalLibraryImport: isExternalLibraryImport } : undefined, failedLookupLocations: failedLookupLocations };
+    function resolvedTypeScriptOnly(resolved) {
+        if (!resolved) {
+            return undefined;
+        }
+        ts.Debug.assert(ts.extensionIsTypeScript(resolved.extension));
+        return resolved.path;
+    }
+    function resolvedFromAnyFile(path) {
+        return { path: path, extension: ts.extensionFromPath(path) };
+    }
+    function resolvedModuleFromResolved(_a, isExternalLibraryImport) {
+        var path = _a.path, extension = _a.extension;
+        return { resolvedFileName: path, extension: extension, isExternalLibraryImport: isExternalLibraryImport };
+    }
+    function createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations) {
+        return { resolvedModule: resolved && resolvedModuleFromResolved(resolved, isExternalLibraryImport), failedLookupLocations: failedLookupLocations };
     }
-    ts.createResolvedModule = createResolvedModule;
     function moduleHasNonRelativeName(moduleName) {
         return !(ts.isRootedDiskPath(moduleName) || ts.isExternalModuleNameRelative(moduleName));
     }
-    function tryReadTypesSection(packageJsonPath, baseDirectory, state) {
+    function tryReadTypesSection(extensions, packageJsonPath, baseDirectory, state) {
         var jsonContent = readJson(packageJsonPath, state.host);
+        switch (extensions) {
+            case 2:
+            case 0:
+                return tryReadFromField("typings") || tryReadFromField("types");
+            case 1:
+                if (typeof jsonContent.main === "string") {
+                    if (state.traceEnabled) {
+                        trace(state.host, ts.Diagnostics.No_types_specified_in_package_json_so_returning_main_value_of_0, jsonContent.main);
+                    }
+                    return ts.normalizePath(ts.combinePaths(baseDirectory, jsonContent.main));
+                }
+                return undefined;
+        }
         function tryReadFromField(fieldName) {
             if (ts.hasProperty(jsonContent, fieldName)) {
                 var typesFile = jsonContent[fieldName];
                 if (typeof typesFile === "string") {
-                    var typesFilePath_1 = ts.normalizePath(ts.combinePaths(baseDirectory, typesFile));
+                    var typesFilePath = ts.normalizePath(ts.combinePaths(baseDirectory, typesFile));
                     if (state.traceEnabled) {
-                        trace(state.host, ts.Diagnostics.package_json_has_0_field_1_that_references_2, fieldName, typesFile, typesFilePath_1);
+                        trace(state.host, ts.Diagnostics.package_json_has_0_field_1_that_references_2, fieldName, typesFile, typesFilePath);
                     }
-                    return typesFilePath_1;
+                    return typesFilePath;
                 }
                 else {
                     if (state.traceEnabled) {
@@ -6701,18 +6089,6 @@ var ts;
                 }
             }
         }
-        var typesFilePath = tryReadFromField("typings") || tryReadFromField("types");
-        if (typesFilePath) {
-            return typesFilePath;
-        }
-        if (state.compilerOptions.allowJs && jsonContent.main && typeof jsonContent.main === "string") {
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.No_types_specified_in_package_json_but_allowJs_is_set_so_returning_main_value_of_0, jsonContent.main);
-            }
-            var mainFilePath = ts.normalizePath(ts.combinePaths(baseDirectory, jsonContent.main));
-            return mainFilePath;
-        }
-        return undefined;
     }
     function readJson(path, host) {
         try {
@@ -6723,7 +6099,6 @@ var ts;
             return {};
         }
     }
-    var typeReferenceExtensions = [".d.ts"];
     function getEffectiveTypeRoots(options, host) {
         if (options.typeRoots) {
             return options.typeRoots;
@@ -6735,7 +6110,9 @@ var ts;
         else if (host.getCurrentDirectory) {
             currentDirectory = host.getCurrentDirectory();
         }
-        return currentDirectory !== undefined && getDefaultTypeRoots(currentDirectory, host);
+        if (currentDirectory !== undefined) {
+            return getDefaultTypeRoots(currentDirectory, host);
+        }
     }
     ts.getEffectiveTypeRoots = getEffectiveTypeRoots;
     function getDefaultTypeRoots(currentDirectory, host) {
@@ -6743,17 +6120,12 @@ var ts;
             return [ts.combinePaths(currentDirectory, nodeModulesAtTypes)];
         }
         var typeRoots;
-        while (true) {
-            var atTypes = ts.combinePaths(currentDirectory, nodeModulesAtTypes);
+        forEachAncestorDirectory(currentDirectory, function (directory) {
+            var atTypes = ts.combinePaths(directory, nodeModulesAtTypes);
             if (host.directoryExists(atTypes)) {
                 (typeRoots || (typeRoots = [])).push(atTypes);
             }
-            var parent_1 = ts.getDirectoryPath(currentDirectory);
-            if (parent_1 === currentDirectory) {
-                break;
-            }
-            currentDirectory = parent_1;
-        }
+        });
         return typeRoots;
     }
     var nodeModulesAtTypes = ts.combinePaths("node_modules", "@types");
@@ -6762,7 +6134,6 @@ var ts;
         var moduleResolutionState = {
             compilerOptions: options,
             host: host,
-            skipTsx: true,
             traceEnabled: traceEnabled
         };
         var typeRoots = getEffectiveTypeRoots(options, host);
@@ -6785,62 +6156,57 @@ var ts;
             }
         }
         var failedLookupLocations = [];
-        if (typeRoots && typeRoots.length) {
+        var resolved = primaryLookup();
+        var primary = true;
+        if (!resolved) {
+            resolved = secondaryLookup();
+            primary = false;
+        }
+        var resolvedTypeReferenceDirective;
+        if (resolved) {
+            resolved = realpath(resolved, host, traceEnabled);
             if (traceEnabled) {
-                trace(host, ts.Diagnostics.Resolving_with_primary_search_path_0, typeRoots.join(", "));
+                trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolved, primary);
             }
-            var primarySearchPaths = typeRoots;
-            for (var _i = 0, primarySearchPaths_1 = primarySearchPaths; _i < primarySearchPaths_1.length; _i++) {
-                var typeRoot = primarySearchPaths_1[_i];
-                var candidate = ts.combinePaths(typeRoot, typeReferenceDirectiveName);
-                var candidateDirectory = ts.getDirectoryPath(candidate);
-                var resolvedFile_1 = loadNodeModuleFromDirectory(typeReferenceExtensions, candidate, failedLookupLocations, !directoryProbablyExists(candidateDirectory, host), moduleResolutionState);
-                if (resolvedFile_1) {
-                    if (traceEnabled) {
-                        trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFile_1, true);
-                    }
-                    return {
-                        resolvedTypeReferenceDirective: { primary: true, resolvedFileName: resolvedFile_1 },
-                        failedLookupLocations: failedLookupLocations
-                    };
+            resolvedTypeReferenceDirective = { primary: primary, resolvedFileName: resolved };
+        }
+        return { resolvedTypeReferenceDirective: resolvedTypeReferenceDirective, failedLookupLocations: failedLookupLocations };
+        function primaryLookup() {
+            if (typeRoots && typeRoots.length) {
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Resolving_with_primary_search_path_0, typeRoots.join(", "));
+                }
+                return ts.forEach(typeRoots, function (typeRoot) {
+                    var candidate = ts.combinePaths(typeRoot, typeReferenceDirectiveName);
+                    var candidateDirectory = ts.getDirectoryPath(candidate);
+                    return resolvedTypeScriptOnly(loadNodeModuleFromDirectory(2, candidate, failedLookupLocations, !directoryProbablyExists(candidateDirectory, host), moduleResolutionState));
+                });
+            }
+            else {
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Root_directory_cannot_be_determined_skipping_primary_search_paths);
                 }
             }
         }
-        else {
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Root_directory_cannot_be_determined_skipping_primary_search_paths);
-            }
-        }
-        var resolvedFile;
-        var initialLocationForSecondaryLookup;
-        if (containingFile) {
-            initialLocationForSecondaryLookup = ts.getDirectoryPath(containingFile);
-        }
-        if (initialLocationForSecondaryLookup !== undefined) {
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Looking_up_in_node_modules_folder_initial_location_0, initialLocationForSecondaryLookup);
-            }
-            resolvedFile = loadModuleFromNodeModules(typeReferenceDirectiveName, initialLocationForSecondaryLookup, failedLookupLocations, moduleResolutionState, false);
-            if (traceEnabled) {
-                if (resolvedFile) {
-                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFile, false);
+        function secondaryLookup() {
+            var resolvedFile;
+            var initialLocationForSecondaryLookup = containingFile && ts.getDirectoryPath(containingFile);
+            if (initialLocationForSecondaryLookup !== undefined) {
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Looking_up_in_node_modules_folder_initial_location_0, initialLocationForSecondaryLookup);
                 }
-                else {
+                resolvedFile = resolvedTypeScriptOnly(loadModuleFromNodeModules(2, typeReferenceDirectiveName, initialLocationForSecondaryLookup, failedLookupLocations, moduleResolutionState));
+                if (!resolvedFile && traceEnabled) {
                     trace(host, ts.Diagnostics.Type_reference_directive_0_was_not_resolved, typeReferenceDirectiveName);
                 }
+                return resolvedFile;
+            }
+            else {
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_modules_folder);
+                }
             }
         }
-        else {
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_modules_folder);
-            }
-        }
-        return {
-            resolvedTypeReferenceDirective: resolvedFile
-                ? { primary: false, resolvedFileName: resolvedFile }
-                : undefined,
-            failedLookupLocations: failedLookupLocations
-        };
     }
     ts.resolveTypeReferenceDirective = resolveTypeReferenceDirective;
     function getAutomaticTypeDirectiveNames(options, host) {
@@ -6907,15 +6273,15 @@ var ts;
         return result;
     }
     ts.resolveModuleName = resolveModuleName;
-    function tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, loader, failedLookupLocations, supportedExtensions, state) {
+    function tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, loader, failedLookupLocations, state) {
         if (moduleHasNonRelativeName(moduleName)) {
-            return tryLoadModuleUsingBaseUrl(moduleName, loader, failedLookupLocations, supportedExtensions, state);
+            return tryLoadModuleUsingBaseUrl(extensions, moduleName, loader, failedLookupLocations, state);
         }
         else {
-            return tryLoadModuleUsingRootDirs(moduleName, containingDirectory, loader, failedLookupLocations, supportedExtensions, state);
+            return tryLoadModuleUsingRootDirs(extensions, moduleName, containingDirectory, loader, failedLookupLocations, state);
         }
     }
-    function tryLoadModuleUsingRootDirs(moduleName, containingDirectory, loader, failedLookupLocations, supportedExtensions, state) {
+    function tryLoadModuleUsingRootDirs(extensions, moduleName, containingDirectory, loader, failedLookupLocations, state) {
         if (!state.compilerOptions.rootDirs) {
             return undefined;
         }
@@ -6949,7 +6315,7 @@ var ts;
             if (state.traceEnabled) {
                 trace(state.host, ts.Diagnostics.Loading_0_from_the_root_dir_1_candidate_location_2, suffix, matchedNormalizedPrefix, candidate);
             }
-            var resolvedFileName = loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(containingDirectory, state.host), state);
+            var resolvedFileName = loader(extensions, candidate, failedLookupLocations, !directoryProbablyExists(containingDirectory, state.host), state);
             if (resolvedFileName) {
                 return resolvedFileName;
             }
@@ -6966,7 +6332,7 @@ var ts;
                     trace(state.host, ts.Diagnostics.Loading_0_from_the_root_dir_1_candidate_location_2, suffix, rootDir, candidate_1);
                 }
                 var baseDirectory = ts.getDirectoryPath(candidate_1);
-                var resolvedFileName_1 = loader(candidate_1, supportedExtensions, failedLookupLocations, !directoryProbablyExists(baseDirectory, state.host), state);
+                var resolvedFileName_1 = loader(extensions, candidate_1, failedLookupLocations, !directoryProbablyExists(baseDirectory, state.host), state);
                 if (resolvedFileName_1) {
                     return resolvedFileName_1;
                 }
@@ -6977,7 +6343,7 @@ var ts;
         }
         return undefined;
     }
-    function tryLoadModuleUsingBaseUrl(moduleName, loader, failedLookupLocations, supportedExtensions, state) {
+    function tryLoadModuleUsingBaseUrl(extensions, moduleName, loader, failedLookupLocations, state) {
         if (!state.compilerOptions.baseUrl) {
             return undefined;
         }
@@ -6992,77 +6358,87 @@ var ts;
             matchedPattern = ts.matchPatternOrExact(ts.getOwnKeys(state.compilerOptions.paths), moduleName);
         }
         if (matchedPattern) {
-            var matchedStar = typeof matchedPattern === "string" ? undefined : ts.matchedText(matchedPattern, moduleName);
+            var matchedStar_1 = typeof matchedPattern === "string" ? undefined : ts.matchedText(matchedPattern, moduleName);
             var matchedPatternText = typeof matchedPattern === "string" ? matchedPattern : ts.patternText(matchedPattern);
             if (state.traceEnabled) {
                 trace(state.host, ts.Diagnostics.Module_name_0_matched_pattern_1, moduleName, matchedPatternText);
             }
-            for (var _i = 0, _a = state.compilerOptions.paths[matchedPatternText]; _i < _a.length; _i++) {
-                var subst = _a[_i];
-                var path = matchedStar ? subst.replace("*", matchedStar) : subst;
+            return ts.forEach(state.compilerOptions.paths[matchedPatternText], function (subst) {
+                var path = matchedStar_1 ? subst.replace("*", matchedStar_1) : subst;
                 var candidate = ts.normalizePath(ts.combinePaths(state.compilerOptions.baseUrl, path));
                 if (state.traceEnabled) {
                     trace(state.host, ts.Diagnostics.Trying_substitution_0_candidate_module_location_Colon_1, subst, path);
                 }
-                var resolvedFileName = loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
-                if (resolvedFileName) {
-                    return resolvedFileName;
+                var tsExtension = ts.tryGetExtensionFromPath(candidate);
+                if (tsExtension !== undefined) {
+                    var path_1 = tryFile(candidate, failedLookupLocations, false, state);
+                    return path_1 && { path: path_1, extension: tsExtension };
                 }
-            }
-            return undefined;
+                return loader(extensions, candidate, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
+            });
         }
         else {
             var candidate = ts.normalizePath(ts.combinePaths(state.compilerOptions.baseUrl, moduleName));
             if (state.traceEnabled) {
                 trace(state.host, ts.Diagnostics.Resolving_module_name_0_relative_to_base_url_1_2, moduleName, state.compilerOptions.baseUrl, candidate);
             }
-            return loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
+            return loader(extensions, candidate, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
         }
     }
     function nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host) {
         var containingDirectory = ts.getDirectoryPath(containingFile);
-        var supportedExtensions = ts.getSupportedExtensions(compilerOptions);
         var traceEnabled = isTraceEnabled(compilerOptions, host);
         var failedLookupLocations = [];
-        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, skipTsx: false };
-        var resolvedFileName = tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, nodeLoadModuleByRelativeName, failedLookupLocations, supportedExtensions, state);
-        var isExternalLibraryImport = false;
-        if (!resolvedFileName) {
+        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled };
+        var result = tryResolve(0) || tryResolve(1);
+        if (result) {
+            var resolved = result.resolved, isExternalLibraryImport = result.isExternalLibraryImport;
+            return createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations);
+        }
+        return { resolvedModule: undefined, failedLookupLocations: failedLookupLocations };
+        function tryResolve(extensions) {
+            var resolved = tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, nodeLoadModuleByRelativeName, failedLookupLocations, state);
+            if (resolved) {
+                return { resolved: resolved, isExternalLibraryImport: false };
+            }
             if (moduleHasNonRelativeName(moduleName)) {
                 if (traceEnabled) {
                     trace(host, ts.Diagnostics.Loading_module_0_from_node_modules_folder, moduleName);
                 }
-                resolvedFileName = loadModuleFromNodeModules(moduleName, containingDirectory, failedLookupLocations, state, false);
-                isExternalLibraryImport = resolvedFileName !== undefined;
+                var resolved_1 = loadModuleFromNodeModules(extensions, moduleName, containingDirectory, failedLookupLocations, state);
+                return resolved_1 && { resolved: { path: realpath(resolved_1.path, host, traceEnabled), extension: resolved_1.extension }, isExternalLibraryImport: true };
             }
             else {
                 var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
-                resolvedFileName = nodeLoadModuleByRelativeName(candidate, supportedExtensions, failedLookupLocations, false, state);
+                var resolved_2 = nodeLoadModuleByRelativeName(extensions, candidate, failedLookupLocations, false, state);
+                return resolved_2 && { resolved: resolved_2, isExternalLibraryImport: false };
             }
         }
-        if (resolvedFileName && host.realpath) {
-            var originalFileName = resolvedFileName;
-            resolvedFileName = ts.normalizePath(host.realpath(resolvedFileName));
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Resolving_real_path_for_0_result_1, originalFileName, resolvedFileName);
-            }
-        }
-        return createResolvedModule(resolvedFileName, isExternalLibraryImport, failedLookupLocations);
     }
     ts.nodeModuleNameResolver = nodeModuleNameResolver;
-    function nodeLoadModuleByRelativeName(candidate, supportedExtensions, failedLookupLocations, onlyRecordFailures, state) {
+    function realpath(path, host, traceEnabled) {
+        if (!host.realpath) {
+            return path;
+        }
+        var real = ts.normalizePath(host.realpath(path));
+        if (traceEnabled) {
+            trace(host, ts.Diagnostics.Resolving_real_path_for_0_result_1, path, real);
+        }
+        return real;
+    }
+    function nodeLoadModuleByRelativeName(extensions, candidate, failedLookupLocations, onlyRecordFailures, state) {
         if (state.traceEnabled) {
             trace(state.host, ts.Diagnostics.Loading_module_as_file_Slash_folder_candidate_module_location_0, candidate);
         }
-        var resolvedFileName = !ts.pathEndsWithDirectorySeparator(candidate) && loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, onlyRecordFailures, state);
-        return resolvedFileName || loadNodeModuleFromDirectory(supportedExtensions, candidate, failedLookupLocations, onlyRecordFailures, state);
+        var resolvedFromFile = !ts.pathEndsWithDirectorySeparator(candidate) && loadModuleFromFile(extensions, candidate, failedLookupLocations, onlyRecordFailures, state);
+        return resolvedFromFile || loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, onlyRecordFailures, state);
     }
     function directoryProbablyExists(directoryName, host) {
         return !host.directoryExists || host.directoryExists(directoryName);
     }
     ts.directoryProbablyExists = directoryProbablyExists;
-    function loadModuleFromFile(candidate, extensions, failedLookupLocation, onlyRecordFailures, state) {
-        var resolvedByAddingExtension = tryAddingExtensions(candidate, extensions, failedLookupLocation, onlyRecordFailures, state);
+    function loadModuleFromFile(extensions, candidate, failedLookupLocations, onlyRecordFailures, state) {
+        var resolvedByAddingExtension = tryAddingExtensions(candidate, extensions, failedLookupLocations, onlyRecordFailures, state);
         if (resolvedByAddingExtension) {
             return resolvedByAddingExtension;
         }
@@ -7072,21 +6448,30 @@ var ts;
                 var extension = candidate.substring(extensionless.length);
                 trace(state.host, ts.Diagnostics.File_name_0_has_a_1_extension_stripping_it, candidate, extension);
             }
-            return tryAddingExtensions(extensionless, extensions, failedLookupLocation, onlyRecordFailures, state);
+            return tryAddingExtensions(extensionless, extensions, failedLookupLocations, onlyRecordFailures, state);
         }
     }
-    function tryAddingExtensions(candidate, extensions, failedLookupLocation, onlyRecordFailures, state) {
+    function tryAddingExtensions(candidate, extensions, failedLookupLocations, onlyRecordFailures, state) {
         if (!onlyRecordFailures) {
             var directory = ts.getDirectoryPath(candidate);
             if (directory) {
                 onlyRecordFailures = !directoryProbablyExists(directory, state.host);
             }
         }
-        return ts.forEach(extensions, function (ext) {
-            return !(state.skipTsx && ts.isJsxOrTsxExtension(ext)) && tryFile(candidate + ext, failedLookupLocation, onlyRecordFailures, state);
-        });
+        switch (extensions) {
+            case 2:
+                return tryExtension(".d.ts", ts.Extension.Dts);
+            case 0:
+                return tryExtension(".ts", ts.Extension.Ts) || tryExtension(".tsx", ts.Extension.Tsx) || tryExtension(".d.ts", ts.Extension.Dts);
+            case 1:
+                return tryExtension(".js", ts.Extension.Js) || tryExtension(".jsx", ts.Extension.Jsx);
+        }
+        function tryExtension(ext, extension) {
+            var path = tryFile(candidate + ext, failedLookupLocations, onlyRecordFailures, state);
+            return path && { path: path, extension: extension };
+        }
     }
-    function tryFile(fileName, failedLookupLocation, onlyRecordFailures, state) {
+    function tryFile(fileName, failedLookupLocations, onlyRecordFailures, state) {
         if (!onlyRecordFailures && state.host.fileExists(fileName)) {
             if (state.traceEnabled) {
                 trace(state.host, ts.Diagnostics.File_0_exist_use_it_as_a_name_resolution_result, fileName);
@@ -7097,29 +6482,32 @@ var ts;
             if (state.traceEnabled) {
                 trace(state.host, ts.Diagnostics.File_0_does_not_exist, fileName);
             }
-            failedLookupLocation.push(fileName);
+            failedLookupLocations.push(fileName);
             return undefined;
         }
     }
-    function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocation, onlyRecordFailures, state) {
+    function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, onlyRecordFailures, state) {
         var packageJsonPath = pathToPackageJson(candidate);
         var directoryExists = !onlyRecordFailures && directoryProbablyExists(candidate, state.host);
         if (directoryExists && state.host.fileExists(packageJsonPath)) {
             if (state.traceEnabled) {
                 trace(state.host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath);
             }
-            var typesFile = tryReadTypesSection(packageJsonPath, candidate, state);
+            var typesFile = tryReadTypesSection(extensions, packageJsonPath, candidate, state);
             if (typesFile) {
                 var onlyRecordFailures_1 = !directoryProbablyExists(ts.getDirectoryPath(typesFile), state.host);
-                var result = tryFile(typesFile, failedLookupLocation, onlyRecordFailures_1, state) ||
-                    tryAddingExtensions(typesFile, extensions, failedLookupLocation, onlyRecordFailures_1, state);
-                if (result) {
-                    return result;
+                var fromFile = tryFile(typesFile, failedLookupLocations, onlyRecordFailures_1, state);
+                if (fromFile) {
+                    return resolvedFromAnyFile(fromFile);
+                }
+                var x = tryAddingExtensions(typesFile, 0, failedLookupLocations, onlyRecordFailures_1, state);
+                if (x) {
+                    return x;
                 }
             }
             else {
                 if (state.traceEnabled) {
-                    trace(state.host, ts.Diagnostics.package_json_does_not_have_types_field);
+                    trace(state.host, ts.Diagnostics.package_json_does_not_have_a_types_or_main_field);
                 }
             }
         }
@@ -7127,95 +6515,96 @@ var ts;
             if (state.traceEnabled) {
                 trace(state.host, ts.Diagnostics.File_0_does_not_exist, packageJsonPath);
             }
-            failedLookupLocation.push(packageJsonPath);
+            failedLookupLocations.push(packageJsonPath);
         }
-        return loadModuleFromFile(ts.combinePaths(candidate, "index"), extensions, failedLookupLocation, !directoryExists, state);
+        return loadModuleFromFile(extensions, ts.combinePaths(candidate, "index"), failedLookupLocations, !directoryExists, state);
     }
     function pathToPackageJson(directory) {
         return ts.combinePaths(directory, "package.json");
     }
-    function loadModuleFromNodeModulesFolder(moduleName, directory, failedLookupLocations, state) {
+    function loadModuleFromNodeModulesFolder(extensions, moduleName, directory, failedLookupLocations, state) {
         var nodeModulesFolder = ts.combinePaths(directory, "node_modules");
         var nodeModulesFolderExists = directoryProbablyExists(nodeModulesFolder, state.host);
         var candidate = ts.normalizePath(ts.combinePaths(nodeModulesFolder, moduleName));
-        var supportedExtensions = ts.getSupportedExtensions(state.compilerOptions);
-        var result = loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, !nodeModulesFolderExists, state);
-        if (result) {
-            return result;
-        }
-        result = loadNodeModuleFromDirectory(supportedExtensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state);
-        if (result) {
-            return result;
-        }
+        return loadModuleFromFile(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state) ||
+            loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state);
     }
-    function loadModuleFromNodeModules(moduleName, directory, failedLookupLocations, state, checkOneLevel) {
-        return loadModuleFromNodeModulesWorker(moduleName, directory, failedLookupLocations, state, checkOneLevel, false);
+    function loadModuleFromNodeModules(extensions, moduleName, directory, failedLookupLocations, state) {
+        return loadModuleFromNodeModulesWorker(extensions, moduleName, directory, failedLookupLocations, state, false);
     }
-    ts.loadModuleFromNodeModules = loadModuleFromNodeModules;
     function loadModuleFromNodeModulesAtTypes(moduleName, directory, failedLookupLocations, state) {
-        return loadModuleFromNodeModulesWorker(moduleName, directory, failedLookupLocations, state, false, true);
+        return loadModuleFromNodeModulesWorker(2, moduleName, directory, failedLookupLocations, state, true);
     }
-    function loadModuleFromNodeModulesWorker(moduleName, directory, failedLookupLocations, state, checkOneLevel, typesOnly) {
-        directory = ts.normalizeSlashes(directory);
-        while (true) {
-            var baseName = ts.getBaseFileName(directory);
-            if (baseName !== "node_modules") {
-                var packageResult = void 0;
-                if (!typesOnly) {
-                    packageResult = loadModuleFromNodeModulesFolder(moduleName, directory, failedLookupLocations, state);
-                    if (packageResult && ts.hasTypeScriptFileExtension(packageResult)) {
-                        return packageResult;
-                    }
-                }
-                var typesResult = loadModuleFromNodeModulesFolder(ts.combinePaths("@types", moduleName), directory, failedLookupLocations, state);
-                if (typesResult || packageResult) {
-                    return typesResult || packageResult;
-                }
+    function loadModuleFromNodeModulesWorker(extensions, moduleName, directory, failedLookupLocations, state, typesOnly) {
+        return forEachAncestorDirectory(ts.normalizeSlashes(directory), function (ancestorDirectory) {
+            if (ts.getBaseFileName(ancestorDirectory) !== "node_modules") {
+                return loadModuleFromNodeModulesOneLevel(extensions, moduleName, ancestorDirectory, failedLookupLocations, state, typesOnly);
             }
-            var parentPath = ts.getDirectoryPath(directory);
-            if (parentPath === directory || checkOneLevel) {
-                break;
-            }
-            directory = parentPath;
+        });
+    }
+    function loadModuleFromNodeModulesOneLevel(extensions, moduleName, directory, failedLookupLocations, state, typesOnly) {
+        if (typesOnly === void 0) { typesOnly = false; }
+        var packageResult = typesOnly ? undefined : loadModuleFromNodeModulesFolder(extensions, moduleName, directory, failedLookupLocations, state);
+        if (packageResult) {
+            return packageResult;
+        }
+        if (extensions !== 1) {
+            return loadModuleFromNodeModulesFolder(2, ts.combinePaths("@types", moduleName), directory, failedLookupLocations, state);
         }
-        return undefined;
     }
     function classicNameResolver(moduleName, containingFile, compilerOptions, host) {
         var traceEnabled = isTraceEnabled(compilerOptions, host);
-        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, skipTsx: !compilerOptions.jsx };
+        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled };
         var failedLookupLocations = [];
-        var supportedExtensions = ts.getSupportedExtensions(compilerOptions);
         var containingDirectory = ts.getDirectoryPath(containingFile);
-        var resolvedFileName = tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, loadModuleFromFile, failedLookupLocations, supportedExtensions, state);
-        if (resolvedFileName) {
-            return createResolvedModule(resolvedFileName, false, failedLookupLocations);
+        var resolved = tryResolve(0) || tryResolve(1);
+        return createResolvedModuleWithFailedLookupLocations(resolved, false, failedLookupLocations);
+        function tryResolve(extensions) {
+            var resolvedUsingSettings = tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, loadModuleFromFile, failedLookupLocations, state);
+            if (resolvedUsingSettings) {
+                return resolvedUsingSettings;
+            }
+            if (moduleHasNonRelativeName(moduleName)) {
+                var resolved_3 = forEachAncestorDirectory(containingDirectory, function (directory) {
+                    var searchName = ts.normalizePath(ts.combinePaths(directory, moduleName));
+                    return loadModuleFromFile(extensions, searchName, failedLookupLocations, false, state);
+                });
+                if (resolved_3) {
+                    return resolved_3;
+                }
+                if (extensions === 0) {
+                    return loadModuleFromNodeModulesAtTypes(moduleName, containingDirectory, failedLookupLocations, state);
+                }
+            }
+            else {
+                var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
+                return loadModuleFromFile(extensions, candidate, failedLookupLocations, false, state);
+            }
         }
-        var referencedSourceFile;
-        if (moduleHasNonRelativeName(moduleName)) {
-            referencedSourceFile = referencedSourceFile = loadModuleFromAncestorDirectories(moduleName, containingDirectory, supportedExtensions, failedLookupLocations, state) ||
-                loadModuleFromNodeModulesAtTypes(moduleName, containingDirectory, failedLookupLocations, state);
-        }
-        else {
-            var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
-            referencedSourceFile = loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, false, state);
-        }
-        return referencedSourceFile
-            ? { resolvedModule: { resolvedFileName: referencedSourceFile }, failedLookupLocations: failedLookupLocations }
-            : { resolvedModule: undefined, failedLookupLocations: failedLookupLocations };
     }
     ts.classicNameResolver = classicNameResolver;
-    function loadModuleFromAncestorDirectories(moduleName, containingDirectory, supportedExtensions, failedLookupLocations, state) {
+    function loadModuleFromGlobalCache(moduleName, projectName, compilerOptions, host, globalCache) {
+        var traceEnabled = isTraceEnabled(compilerOptions, host);
+        if (traceEnabled) {
+            trace(host, ts.Diagnostics.Auto_discovery_for_typings_is_enabled_in_project_0_Running_extra_resolution_pass_for_module_1_using_cache_location_2, projectName, moduleName, globalCache);
+        }
+        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled };
+        var failedLookupLocations = [];
+        var resolved = loadModuleFromNodeModulesOneLevel(2, moduleName, globalCache, failedLookupLocations, state);
+        return createResolvedModuleWithFailedLookupLocations(resolved, true, failedLookupLocations);
+    }
+    ts.loadModuleFromGlobalCache = loadModuleFromGlobalCache;
+    function forEachAncestorDirectory(directory, callback) {
         while (true) {
-            var searchName = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
-            var referencedSourceFile = loadModuleFromFile(searchName, supportedExtensions, failedLookupLocations, false, state);
-            if (referencedSourceFile) {
-                return referencedSourceFile;
+            var result = callback(directory);
+            if (result !== undefined) {
+                return result;
             }
-            var parentPath = ts.getDirectoryPath(containingDirectory);
-            if (parentPath === containingDirectory) {
+            var parentPath = ts.getDirectoryPath(directory);
+            if (parentPath === directory) {
                 return undefined;
             }
-            containingDirectory = parentPath;
+            directory = parentPath;
         }
     }
 })(ts || (ts = {}));
@@ -7227,24 +6616,27 @@ var ts;
         (function (typingsInstaller) {
             var nullLog = {
                 isEnabled: function () { return false; },
-                writeLine: function () { }
+                writeLine: ts.noop
             };
             function typingToFileName(cachePath, packageName, installTypingHost) {
                 var result = ts.resolveModuleName(packageName, ts.combinePaths(cachePath, "index.d.ts"), { moduleResolution: ts.ModuleResolutionKind.NodeJs }, installTypingHost);
                 return result.resolvedModule && result.resolvedModule.resolvedFileName;
             }
+            var PackageNameValidationResult;
             (function (PackageNameValidationResult) {
                 PackageNameValidationResult[PackageNameValidationResult["Ok"] = 0] = "Ok";
                 PackageNameValidationResult[PackageNameValidationResult["ScopedPackagesNotSupported"] = 1] = "ScopedPackagesNotSupported";
-                PackageNameValidationResult[PackageNameValidationResult["NameTooLong"] = 2] = "NameTooLong";
-                PackageNameValidationResult[PackageNameValidationResult["NameStartsWithDot"] = 3] = "NameStartsWithDot";
-                PackageNameValidationResult[PackageNameValidationResult["NameStartsWithUnderscore"] = 4] = "NameStartsWithUnderscore";
-                PackageNameValidationResult[PackageNameValidationResult["NameContainsNonURISafeCharacters"] = 5] = "NameContainsNonURISafeCharacters";
-            })(typingsInstaller.PackageNameValidationResult || (typingsInstaller.PackageNameValidationResult = {}));
-            var PackageNameValidationResult = typingsInstaller.PackageNameValidationResult;
+                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 = typingsInstaller.PackageNameValidationResult || (typingsInstaller.PackageNameValidationResult = {}));
             typingsInstaller.MaxPackageNameLength = 214;
             function validatePackageName(packageName) {
-                ts.Debug.assert(!!packageName, "Package name is not specified");
+                if (!packageName) {
+                    return PackageNameValidationResult.EmptyName;
+                }
                 if (packageName.length > typingsInstaller.MaxPackageNameLength) {
                     return PackageNameValidationResult.NameTooLong;
                 }
@@ -7263,14 +6655,14 @@ var ts;
                 return PackageNameValidationResult.Ok;
             }
             typingsInstaller.validatePackageName = validatePackageName;
-            typingsInstaller.NpmViewRequest = "npm view";
-            typingsInstaller.NpmInstallRequest = "npm install";
             var TypingsInstaller = (function () {
-                function TypingsInstaller(globalCachePath, safeListPath, throttleLimit, log) {
+                function TypingsInstaller(installTypingHost, globalCachePath, safeListPath, throttleLimit, telemetryEnabled, log) {
                     if (log === void 0) { log = nullLog; }
+                    this.installTypingHost = installTypingHost;
                     this.globalCachePath = globalCachePath;
                     this.safeListPath = safeListPath;
                     this.throttleLimit = throttleLimit;
+                    this.telemetryEnabled = telemetryEnabled;
                     this.log = log;
                     this.packageNameToTypingLocation = ts.createMap();
                     this.missingTypingsSet = ts.createMap();
@@ -7282,10 +6674,8 @@ var ts;
                     if (this.log.isEnabled()) {
                         this.log.writeLine("Global cache location '" + globalCachePath + "', safe file path '" + safeListPath + "'");
                     }
-                }
-                TypingsInstaller.prototype.init = function () {
                     this.processCacheLocation(this.globalCachePath);
-                };
+                }
                 TypingsInstaller.prototype.closeProject = function (req) {
                     this.closeWatchers(req.projectName);
                 };
@@ -7319,7 +6709,7 @@ var ts;
                         }
                         this.processCacheLocation(req.cachePath);
                     }
-                    var discoverTypingsResult = ts.JsTyping.discoverTypings(this.installTypingHost, req.fileNames, req.projectRootPath, this.safeListPath, this.packageNameToTypingLocation, req.typingOptions);
+                    var discoverTypingsResult = ts.JsTyping.discoverTypings(this.installTypingHost, req.fileNames, req.projectRootPath, this.safeListPath, this.packageNameToTypingLocation, req.typingOptions, req.unresolvedImports);
                     if (this.log.isEnabled()) {
                         this.log.writeLine("Finished typings discovery: " + JSON.stringify(discoverTypingsResult));
                     }
@@ -7396,12 +6786,22 @@ var ts;
                         }
                         var validationResult = validatePackageName(typing);
                         if (validationResult === PackageNameValidationResult.Ok) {
-                            result.push(typing);
+                            if (typing in this.typesRegistry) {
+                                result.push(typing);
+                            }
+                            else {
+                                if (this.log.isEnabled()) {
+                                    this.log.writeLine("Entry for package '" + typing + "' does not exist in local types registry - skipping...");
+                                }
+                            }
                         }
                         else {
                             this.missingTypingsSet[typing] = true;
                             if (this.log.isEnabled()) {
                                 switch (validationResult) {
+                                    case PackageNameValidationResult.EmptyName:
+                                        this.log.writeLine("Package name '" + typing + "' cannot be empty");
+                                        break;
                                     case PackageNameValidationResult.NameTooLong:
                                         this.log.writeLine("Package name '" + typing + "' should be less than " + typingsInstaller.MaxPackageNameLength + " characters");
                                         break;
@@ -7423,19 +6823,8 @@ var ts;
                     }
                     return result;
                 };
-                TypingsInstaller.prototype.installTypings = function (req, cachePath, currentlyCachedTypings, typingsToInstall) {
-                    var _this = this;
-                    if (this.log.isEnabled()) {
-                        this.log.writeLine("Installing typings " + JSON.stringify(typingsToInstall));
-                    }
-                    typingsToInstall = this.filterTypings(typingsToInstall);
-                    if (typingsToInstall.length === 0) {
-                        if (this.log.isEnabled()) {
-                            this.log.writeLine("All typings are known to be missing or invalid - no need to go any further");
-                        }
-                        return;
-                    }
-                    var npmConfigPath = ts.combinePaths(cachePath, "package.json");
+                TypingsInstaller.prototype.ensurePackageDirectoryExists = function (directory) {
+                    var npmConfigPath = ts.combinePaths(directory, "package.json");
                     if (this.log.isEnabled()) {
                         this.log.writeLine("Npm config file: " + npmConfigPath);
                     }
@@ -7443,22 +6832,54 @@ var ts;
                         if (this.log.isEnabled()) {
                             this.log.writeLine("Npm config file: '" + npmConfigPath + "' is missing, creating new one...");
                         }
-                        this.ensureDirectoryExists(cachePath, this.installTypingHost);
+                        this.ensureDirectoryExists(directory, this.installTypingHost);
                         this.installTypingHost.writeFile(npmConfigPath, "{}");
                     }
-                    this.runInstall(cachePath, typingsToInstall, function (installedTypings) {
+                };
+                TypingsInstaller.prototype.installTypings = function (req, cachePath, currentlyCachedTypings, typingsToInstall) {
+                    var _this = this;
+                    if (this.log.isEnabled()) {
+                        this.log.writeLine("Installing typings " + JSON.stringify(typingsToInstall));
+                    }
+                    var filteredTypings = this.filterTypings(typingsToInstall);
+                    var scopedTypings = filteredTypings.map(function (x) { return "@types/" + x; });
+                    if (scopedTypings.length === 0) {
+                        if (this.log.isEnabled()) {
+                            this.log.writeLine("All typings are known to be missing or invalid - no need to go any further");
+                        }
+                        return;
+                    }
+                    this.ensurePackageDirectoryExists(cachePath);
+                    var requestId = this.installRunCount;
+                    this.installRunCount++;
+                    this.installTypingsAsync(requestId, scopedTypings, cachePath, function (ok) {
+                        if (_this.telemetryEnabled) {
+                            _this.sendResponse({
+                                kind: server.EventInstall,
+                                packagesToInstall: scopedTypings,
+                                installSuccess: ok
+                            });
+                        }
+                        if (!ok) {
+                            if (_this.log.isEnabled()) {
+                                _this.log.writeLine("install request failed, marking packages as missing to prevent repeated requests: " + JSON.stringify(filteredTypings));
+                            }
+                            for (var _i = 0, filteredTypings_1 = filteredTypings; _i < filteredTypings_1.length; _i++) {
+                                var typing = filteredTypings_1[_i];
+                                _this.missingTypingsSet[typing] = true;
+                            }
+                            return;
+                        }
                         if (_this.log.isEnabled()) {
-                            _this.log.writeLine("Requested to install typings " + JSON.stringify(typingsToInstall) + ", installed typings " + JSON.stringify(installedTypings));
+                            _this.log.writeLine("Requested to install typings " + JSON.stringify(scopedTypings) + ", installed typings " + JSON.stringify(scopedTypings));
                         }
-                        var installedPackages = ts.createMap();
                         var installedTypingFiles = [];
-                        for (var _i = 0, installedTypings_1 = installedTypings; _i < installedTypings_1.length; _i++) {
-                            var t = installedTypings_1[_i];
+                        for (var _a = 0, scopedTypings_1 = scopedTypings; _a < scopedTypings_1.length; _a++) {
+                            var t = scopedTypings_1[_a];
                             var packageName = ts.getBaseFileName(t);
                             if (!packageName) {
                                 continue;
                             }
-                            installedPackages[packageName] = true;
                             var typingFile = typingToFileName(cachePath, packageName, _this.installTypingHost);
                             if (!typingFile) {
                                 continue;
@@ -7471,49 +6892,9 @@ var ts;
                         if (_this.log.isEnabled()) {
                             _this.log.writeLine("Installed typing files " + JSON.stringify(installedTypingFiles));
                         }
-                        for (var _a = 0, typingsToInstall_2 = typingsToInstall; _a < typingsToInstall_2.length; _a++) {
-                            var toInstall = typingsToInstall_2[_a];
-                            if (!installedPackages[toInstall]) {
-                                if (_this.log.isEnabled()) {
-                                    _this.log.writeLine("New missing typing package '" + toInstall + "'");
-                                }
-                                _this.missingTypingsSet[toInstall] = true;
-                            }
-                        }
                         _this.sendResponse(_this.createSetTypings(req, currentlyCachedTypings.concat(installedTypingFiles)));
                     });
                 };
-                TypingsInstaller.prototype.runInstall = function (cachePath, typingsToInstall, postInstallAction) {
-                    var requestId = this.installRunCount;
-                    this.installRunCount++;
-                    var execInstallCmdCount = 0;
-                    var filteredTypings = [];
-                    for (var _i = 0, typingsToInstall_3 = typingsToInstall; _i < typingsToInstall_3.length; _i++) {
-                        var typing = typingsToInstall_3[_i];
-                        filterExistingTypings(this, typing);
-                    }
-                    function filterExistingTypings(self, typing) {
-                        self.execAsync(typingsInstaller.NpmViewRequest, requestId, [typing], cachePath, function (ok) {
-                            if (ok) {
-                                filteredTypings.push(typing);
-                            }
-                            execInstallCmdCount++;
-                            if (execInstallCmdCount === typingsToInstall.length) {
-                                installFilteredTypings(self, filteredTypings);
-                            }
-                        });
-                    }
-                    function installFilteredTypings(self, filteredTypings) {
-                        if (filteredTypings.length === 0) {
-                            postInstallAction([]);
-                            return;
-                        }
-                        var scopedTypings = filteredTypings.map(function (t) { return "@types/" + t; });
-                        self.execAsync(typingsInstaller.NpmInstallRequest, requestId, scopedTypings, cachePath, function (ok) {
-                            postInstallAction(ok ? scopedTypings : []);
-                        });
-                    }
-                };
                 TypingsInstaller.prototype.ensureDirectoryExists = function (directory, host) {
                     var directoryName = ts.getDirectoryPath(directory);
                     if (!host.directoryExists(directoryName)) {
@@ -7537,9 +6918,11 @@ var ts;
                             if (_this.log.isEnabled()) {
                                 _this.log.writeLine("Got FS notification for " + f + ", handler is already invoked '" + isInvoked + "'");
                             }
-                            _this.sendResponse({ projectName: projectName, kind: "invalidate" });
-                            isInvoked = true;
-                        });
+                            if (!isInvoked) {
+                                _this.sendResponse({ projectName: projectName, kind: server.ActionInvalidate });
+                                isInvoked = true;
+                            }
+                        }, 2000);
                         watchers.push(w);
                     }
                     this.projectWatchers[projectName] = watchers;
@@ -7550,19 +6933,20 @@ var ts;
                         typingOptions: request.typingOptions,
                         compilerOptions: request.compilerOptions,
                         typings: typings,
-                        kind: "set"
+                        unresolvedImports: request.unresolvedImports,
+                        kind: server.ActionSet
                     };
                 };
-                TypingsInstaller.prototype.execAsync = function (requestKind, requestId, args, cwd, onRequestCompleted) {
-                    this.pendingRunRequests.unshift({ requestKind: requestKind, requestId: requestId, args: args, cwd: cwd, onRequestCompleted: onRequestCompleted });
+                TypingsInstaller.prototype.installTypingsAsync = function (requestId, args, cwd, onRequestCompleted) {
+                    this.pendingRunRequests.unshift({ requestId: requestId, args: args, cwd: cwd, onRequestCompleted: onRequestCompleted });
                     this.executeWithThrottling();
                 };
                 TypingsInstaller.prototype.executeWithThrottling = function () {
                     var _this = this;
-                    var _loop_1 = function () {
+                    var _loop_2 = function () {
                         this_1.inFlightRequestCount++;
                         var request = this_1.pendingRunRequests.pop();
-                        this_1.executeRequest(request.requestKind, request.requestId, request.args, request.cwd, function (ok) {
+                        this_1.installWorker(request.requestId, request.args, request.cwd, function (ok) {
                             _this.inFlightRequestCount--;
                             request.onRequestCompleted(ok);
                             _this.executeWithThrottling();
@@ -7570,7 +6954,7 @@ var ts;
                     };
                     var this_1 = this;
                     while (this.inFlightRequestCount < this.throttleLimit && this.pendingRunRequests.length) {
-                        _loop_1();
+                        _loop_2();
                     }
                 };
                 return TypingsInstaller;
@@ -7607,22 +6991,56 @@ var ts;
                     return "npm";
                 }
             }
+            function loadTypesRegistryFile(typesRegistryFilePath, host, log) {
+                if (!host.fileExists(typesRegistryFilePath)) {
+                    if (log.isEnabled()) {
+                        log.writeLine("Types registry file '" + typesRegistryFilePath + "' does not exist");
+                    }
+                    return ts.createMap();
+                }
+                try {
+                    var content = JSON.parse(host.readFile(typesRegistryFilePath));
+                    return ts.createMap(content.entries);
+                }
+                catch (e) {
+                    if (log.isEnabled()) {
+                        log.writeLine("Error when loading types registry file '" + typesRegistryFilePath + "': " + e.message + ", " + e.stack);
+                    }
+                    return ts.createMap();
+                }
+            }
+            var TypesRegistryPackageName = "types-registry";
+            function getTypesRegistryFileLocation(globalTypingsCacheLocation) {
+                return ts.combinePaths(ts.normalizeSlashes(globalTypingsCacheLocation), "node_modules/" + TypesRegistryPackageName + "/index.json");
+            }
             var NodeTypingsInstaller = (function (_super) {
                 __extends(NodeTypingsInstaller, _super);
-                function NodeTypingsInstaller(globalTypingsCacheLocation, throttleLimit, log) {
-                    var _this = _super.call(this, globalTypingsCacheLocation, ts.toPath("typingSafeList.json", __dirname, ts.createGetCanonicalFileName(ts.sys.useCaseSensitiveFileNames)), throttleLimit, log) || this;
-                    _this.installTypingHost = ts.sys;
+                function NodeTypingsInstaller(globalTypingsCacheLocation, throttleLimit, telemetryEnabled, log) {
+                    var _this = _super.call(this, ts.sys, globalTypingsCacheLocation, ts.toPath("typingSafeList.json", __dirname, ts.createGetCanonicalFileName(ts.sys.useCaseSensitiveFileNames)), throttleLimit, telemetryEnabled, log) || this;
                     if (_this.log.isEnabled()) {
                         _this.log.writeLine("Process id: " + process.pid);
                     }
                     _this.npmPath = getNPMLocation(process.argv[0]);
-                    _this.exec = require("child_process").exec;
-                    _this.httpGet = require("http").get;
+                    var execSync;
+                    (_a = require("child_process"), _this.exec = _a.exec, execSync = _a.execSync, _a);
+                    _this.ensurePackageDirectoryExists(globalTypingsCacheLocation);
+                    try {
+                        if (_this.log.isEnabled()) {
+                            _this.log.writeLine("Updating " + TypesRegistryPackageName + " npm package...");
+                        }
+                        execSync(_this.npmPath + " install " + TypesRegistryPackageName, { cwd: globalTypingsCacheLocation, stdio: "ignore" });
+                    }
+                    catch (e) {
+                        if (_this.log.isEnabled()) {
+                            _this.log.writeLine("Error updating " + TypesRegistryPackageName + " package: " + e.message);
+                        }
+                    }
+                    _this.typesRegistry = loadTypesRegistryFile(getTypesRegistryFileLocation(globalTypingsCacheLocation), _this.installTypingHost, _this.log);
                     return _this;
+                    var _a;
                 }
-                NodeTypingsInstaller.prototype.init = function () {
+                NodeTypingsInstaller.prototype.listen = function () {
                     var _this = this;
-                    _super.prototype.init.call(this);
                     process.on("message", function (req) {
                         switch (req.kind) {
                             case "discover":
@@ -7642,66 +7060,26 @@ var ts;
                         this.log.writeLine("Response has been sent.");
                     }
                 };
-                NodeTypingsInstaller.prototype.executeRequest = function (requestKind, requestId, args, cwd, onRequestCompleted) {
+                NodeTypingsInstaller.prototype.installWorker = function (requestId, args, cwd, onRequestCompleted) {
                     var _this = this;
                     if (this.log.isEnabled()) {
-                        this.log.writeLine("#" + requestId + " executing " + requestKind + ", arguments'" + JSON.stringify(args) + "'.");
-                    }
-                    switch (requestKind) {
-                        case typingsInstaller.NpmViewRequest:
-                            {
-                                ts.Debug.assert(args.length === 1);
-                                var url_1 = "http://registry.npmjs.org/@types%2f" + args[0];
-                                var start_2 = Date.now();
-                                this.httpGet(url_1, function (response) {
-                                    var ok = false;
-                                    if (_this.log.isEnabled()) {
-                                        _this.log.writeLine(requestKind + " #" + requestId + " request to " + url_1 + ":: status code " + response.statusCode + ", status message '" + response.statusMessage + "', took " + (Date.now() - start_2) + " ms");
-                                    }
-                                    switch (response.statusCode) {
-                                        case 200:
-                                        case 301:
-                                        case 302:
-                                            ok = true;
-                                            break;
-                                    }
-                                    response.destroy();
-                                    onRequestCompleted(ok);
-                                }).on("error", function (err) {
-                                    if (_this.log.isEnabled()) {
-                                        _this.log.writeLine(requestKind + " #" + requestId + " query to npm registry failed with error " + err.message + ", stack " + err.stack);
-                                    }
-                                    onRequestCompleted(false);
-                                });
-                            }
-                            break;
-                        case typingsInstaller.NpmInstallRequest:
-                            {
-                                var command = this.npmPath + " install " + args.join(" ") + " --save-dev";
-                                var start_3 = Date.now();
-                                this.exec(command, { cwd: cwd }, function (_err, stdout, stderr) {
-                                    if (_this.log.isEnabled()) {
-                                        _this.log.writeLine(requestKind + " #" + requestId + " took: " + (Date.now() - start_3) + " ms" + ts.sys.newLine + "stdout: " + stdout + ts.sys.newLine + "stderr: " + stderr);
-                                    }
-                                    onRequestCompleted(!!stdout);
-                                });
-                            }
-                            break;
-                        default:
-                            ts.Debug.assert(false, "Unknown request kind " + requestKind);
+                        this.log.writeLine("#" + requestId + " with arguments'" + JSON.stringify(args) + "'.");
                     }
+                    var command = this.npmPath + " install " + args.join(" ") + " --save-dev";
+                    var start = Date.now();
+                    this.exec(command, { cwd: cwd }, function (err, stdout, stderr) {
+                        if (_this.log.isEnabled()) {
+                            _this.log.writeLine("npm install #" + requestId + " took: " + (Date.now() - start) + " ms" + ts.sys.newLine + "stdout: " + stdout + ts.sys.newLine + "stderr: " + stderr);
+                        }
+                        onRequestCompleted(!err);
+                    });
                 };
                 return NodeTypingsInstaller;
             }(typingsInstaller.TypingsInstaller));
             typingsInstaller.NodeTypingsInstaller = NodeTypingsInstaller;
-            function findArgument(argumentName) {
-                var index = ts.sys.args.indexOf(argumentName);
-                return index >= 0 && index < ts.sys.args.length - 1
-                    ? ts.sys.args[index + 1]
-                    : undefined;
-            }
-            var logFilePath = findArgument("--logFile");
-            var globalTypingsCacheLocation = findArgument("--globalTypingsCacheLocation");
+            var logFilePath = server.findArgument(server.Arguments.LogFile);
+            var globalTypingsCacheLocation = server.findArgument(server.Arguments.GlobalCacheLocation);
+            var telemetryEnabled = server.hasArgument(server.Arguments.EnableTelemetry);
             var log = new FileLog(logFilePath);
             if (log.isEnabled()) {
                 process.on("uncaughtException", function (e) {
@@ -7714,10 +7092,8 @@ var ts;
                 }
                 process.exit(0);
             });
-            var installer = new NodeTypingsInstaller(globalTypingsCacheLocation, 5, log);
-            installer.init();
+            var installer = new NodeTypingsInstaller(globalTypingsCacheLocation, 5, telemetryEnabled, log);
+            installer.listen();
         })(typingsInstaller = server.typingsInstaller || (server.typingsInstaller = {}));
     })(server = ts.server || (ts.server = {}));
 })(ts || (ts = {}));
-
-//# sourceMappingURL=typingsInstaller.js.map
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 8f05f5f4e9f..89ed65805d8 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -17261,7 +17261,11 @@ namespace ts {
             // based on whether the remaining type is the same as the initial type.
             let arrayType = arrayOrStringType;
             if (arrayOrStringType.flags & TypeFlags.Union) {
-                arrayType = getUnionType(filter((arrayOrStringType as UnionType).types, t => !(t.flags & TypeFlags.StringLike)), /*subtypeReduction*/ true);
+                const arrayTypes = (arrayOrStringType as UnionType).types;
+                const filteredTypes = filter(arrayTypes, t => !(t.flags & TypeFlags.StringLike));
+                if (filteredTypes !== arrayTypes) {
+                    arrayType = getUnionType(filteredTypes, /*subtypeReduction*/ true);
+                }
             }
             else if (arrayOrStringType.flags & TypeFlags.StringLike) {
                 arrayType = neverType;
diff --git a/tests/cases/compiler/forOfStringConstituents.ts b/tests/cases/compiler/forOfStringConstituents.ts
new file mode 100644
index 00000000000..224fb5396bd
--- /dev/null
+++ b/tests/cases/compiler/forOfStringConstituents.ts
@@ -0,0 +1,8 @@
+interface A { x: 0; y: C[]; }
+interface B { x: 1; y: CD[]; }
+interface C { x: 2; }
+interface D { x: 3; }
+type AB = A | B;
+type CD = C | D;
+declare let x: AB, y: CD;
+for (y of x.y);
\ No newline at end of file

From db4ea4a0085b1d5a2a3a185f1503954bd817b44e Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Mon, 14 Nov 2016 15:25:29 -0800
Subject: [PATCH 227/421] Update baselines

---
 .../reference/forOfStringConstituents.js      | 15 +++++++
 .../reference/forOfStringConstituents.symbols | 43 +++++++++++++++++++
 .../reference/forOfStringConstituents.types   | 43 +++++++++++++++++++
 3 files changed, 101 insertions(+)
 create mode 100644 tests/baselines/reference/forOfStringConstituents.js
 create mode 100644 tests/baselines/reference/forOfStringConstituents.symbols
 create mode 100644 tests/baselines/reference/forOfStringConstituents.types

diff --git a/tests/baselines/reference/forOfStringConstituents.js b/tests/baselines/reference/forOfStringConstituents.js
new file mode 100644
index 00000000000..0f0d86d8cc6
--- /dev/null
+++ b/tests/baselines/reference/forOfStringConstituents.js
@@ -0,0 +1,15 @@
+//// [forOfStringConstituents.ts]
+interface A { x: 0; y: C[]; }
+interface B { x: 1; y: CD[]; }
+interface C { x: 2; }
+interface D { x: 3; }
+type AB = A | B;
+type CD = C | D;
+declare let x: AB, y: CD;
+for (y of x.y);
+
+//// [forOfStringConstituents.js]
+for (var _i = 0, _a = x.y; _i < _a.length; _i++) {
+    y = _a[_i];
+    ;
+}
diff --git a/tests/baselines/reference/forOfStringConstituents.symbols b/tests/baselines/reference/forOfStringConstituents.symbols
new file mode 100644
index 00000000000..226f8e35a55
--- /dev/null
+++ b/tests/baselines/reference/forOfStringConstituents.symbols
@@ -0,0 +1,43 @@
+=== tests/cases/compiler/forOfStringConstituents.ts ===
+interface A { x: 0; y: C[]; }
+>A : Symbol(A, Decl(forOfStringConstituents.ts, 0, 0))
+>x : Symbol(A.x, Decl(forOfStringConstituents.ts, 0, 13))
+>y : Symbol(A.y, Decl(forOfStringConstituents.ts, 0, 19))
+>C : Symbol(C, Decl(forOfStringConstituents.ts, 1, 30))
+
+interface B { x: 1; y: CD[]; }
+>B : Symbol(B, Decl(forOfStringConstituents.ts, 0, 29))
+>x : Symbol(B.x, Decl(forOfStringConstituents.ts, 1, 13))
+>y : Symbol(B.y, Decl(forOfStringConstituents.ts, 1, 19))
+>CD : Symbol(CD, Decl(forOfStringConstituents.ts, 4, 16))
+
+interface C { x: 2; }
+>C : Symbol(C, Decl(forOfStringConstituents.ts, 1, 30))
+>x : Symbol(C.x, Decl(forOfStringConstituents.ts, 2, 13))
+
+interface D { x: 3; }
+>D : Symbol(D, Decl(forOfStringConstituents.ts, 2, 21))
+>x : Symbol(D.x, Decl(forOfStringConstituents.ts, 3, 13))
+
+type AB = A | B;
+>AB : Symbol(AB, Decl(forOfStringConstituents.ts, 3, 21))
+>A : Symbol(A, Decl(forOfStringConstituents.ts, 0, 0))
+>B : Symbol(B, Decl(forOfStringConstituents.ts, 0, 29))
+
+type CD = C | D;
+>CD : Symbol(CD, Decl(forOfStringConstituents.ts, 4, 16))
+>C : Symbol(C, Decl(forOfStringConstituents.ts, 1, 30))
+>D : Symbol(D, Decl(forOfStringConstituents.ts, 2, 21))
+
+declare let x: AB, y: CD;
+>x : Symbol(x, Decl(forOfStringConstituents.ts, 6, 11))
+>AB : Symbol(AB, Decl(forOfStringConstituents.ts, 3, 21))
+>y : Symbol(y, Decl(forOfStringConstituents.ts, 6, 18))
+>CD : Symbol(CD, Decl(forOfStringConstituents.ts, 4, 16))
+
+for (y of x.y);
+>y : Symbol(y, Decl(forOfStringConstituents.ts, 6, 18))
+>x.y : Symbol(y, Decl(forOfStringConstituents.ts, 0, 19), Decl(forOfStringConstituents.ts, 1, 19))
+>x : Symbol(x, Decl(forOfStringConstituents.ts, 6, 11))
+>y : Symbol(y, Decl(forOfStringConstituents.ts, 0, 19), Decl(forOfStringConstituents.ts, 1, 19))
+
diff --git a/tests/baselines/reference/forOfStringConstituents.types b/tests/baselines/reference/forOfStringConstituents.types
new file mode 100644
index 00000000000..2bd2a1abd4e
--- /dev/null
+++ b/tests/baselines/reference/forOfStringConstituents.types
@@ -0,0 +1,43 @@
+=== tests/cases/compiler/forOfStringConstituents.ts ===
+interface A { x: 0; y: C[]; }
+>A : A
+>x : 0
+>y : C[]
+>C : C
+
+interface B { x: 1; y: CD[]; }
+>B : B
+>x : 1
+>y : CD[]
+>CD : CD
+
+interface C { x: 2; }
+>C : C
+>x : 2
+
+interface D { x: 3; }
+>D : D
+>x : 3
+
+type AB = A | B;
+>AB : AB
+>A : A
+>B : B
+
+type CD = C | D;
+>CD : CD
+>C : C
+>D : D
+
+declare let x: AB, y: CD;
+>x : AB
+>AB : AB
+>y : CD
+>CD : CD
+
+for (y of x.y);
+>y : CD
+>x.y : C[] | CD[]
+>x : AB
+>y : C[] | CD[]
+

From cb1bb19358fbc0d6e85e6915b3c3e4de59ce1fa2 Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Mon, 14 Nov 2016 15:26:33 -0800
Subject: [PATCH 228/421] Update comment

---
 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 89ed65805d8..396715bfa45 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -17257,10 +17257,10 @@ namespace ts {
         function checkElementTypeOfArrayOrString(arrayOrStringType: Type, errorNode: Node): Type {
             Debug.assert(languageVersion < ScriptTarget.ES2015);
 
-            // After we remove all types that are StringLike, we will know if there was a string constituent
-            // based on whether the remaining type is the same as the initial type.
             let arrayType = arrayOrStringType;
             if (arrayOrStringType.flags & TypeFlags.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.
                 const arrayTypes = (arrayOrStringType as UnionType).types;
                 const filteredTypes = filter(arrayTypes, t => !(t.flags & TypeFlags.StringLike));
                 if (filteredTypes !== arrayTypes) {

From bb218107a923ff3c5a7e41e9903c15e9c0a837a0 Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Mon, 14 Nov 2016 15:50:47 -0800
Subject: [PATCH 229/421] Fix missing alias for decorated classes in es5

---
 src/compiler/checker.ts                                   | 3 +--
 tests/baselines/reference/es6modulekindWithES5Target11.js | 7 ++++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 396715bfa45..ae5b71368e2 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -9936,8 +9936,7 @@ namespace 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 (languageVersion === ScriptTarget.ES2015
-                    && declaration.kind === SyntaxKind.ClassDeclaration
+                if (declaration.kind === SyntaxKind.ClassDeclaration
                     && nodeIsDecorated(declaration)) {
                     let container = getContainingClass(node);
                     while (container !== undefined) {
diff --git a/tests/baselines/reference/es6modulekindWithES5Target11.js b/tests/baselines/reference/es6modulekindWithES5Target11.js
index 1268c33697a..4ec0802a5f5 100644
--- a/tests/baselines/reference/es6modulekindWithES5Target11.js
+++ b/tests/baselines/reference/es6modulekindWithES5Target11.js
@@ -16,16 +16,17 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var C = (function () {
+var C = C_1 = (function () {
     function C() {
         this.p = 1;
     }
-    C.x = function () { return C.y; };
+    C.x = function () { return C_1.y; };
     C.prototype.method = function () { };
     return C;
 }());
 C.y = 1;
-C = __decorate([
+C = C_1 = __decorate([
     foo
 ], C);
 export default C;
+var C_1;

From 6f274eaabeee8d46440d42d61cf2bbbbf7b430fe Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 14 Nov 2016 16:17:59 -0800
Subject: [PATCH 230/421] Spread+rest fixes

1. Rename finds identifiers in spread assignment expressions.
2. Spreads with computed properties of type number or any no longer
crash the compiler.
3. Rest emit uses indexOf === -1 instead of !indexOf to filter properties.
4. Rest emit correctly refers to computed properties' generated temps.
---
 src/compiler/checker.ts                    | 14 ++++--
 src/compiler/emitter.ts                    |  2 +-
 src/compiler/transformers/destructuring.ts | 58 ++++++++++++++++------
 src/compiler/utilities.ts                  |  1 +
 4 files changed, 53 insertions(+), 22 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index d34efcbe1bf..039944bd6f0 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -11164,10 +11164,10 @@ namespace ts {
             return links.resolvedType;
         }
 
-        function getObjectLiteralIndexInfo(node: ObjectLiteralExpression, properties: Symbol[], kind: IndexKind): IndexInfo {
+        function getObjectLiteralIndexInfo(propertyNodes: NodeArray<ObjectLiteralElementLike>, offset: number, properties: Symbol[], kind: IndexKind): IndexInfo {
             const propTypes: Type[] = [];
             for (let i = 0; i < properties.length; i++) {
-                if (kind === IndexKind.String || isNumericName(node.properties[i].name)) {
+                if (kind === IndexKind.String || isNumericName(propertyNodes[i + offset].name)) {
                     propTypes.push(getTypeOfSymbol(properties[i]));
                 }
             }
@@ -11193,7 +11193,10 @@ namespace ts {
             let hasComputedStringProperty = false;
             let hasComputedNumberProperty = false;
 
-            for (const memberDecl of node.properties) {
+            let i = 0;
+            let offset = 0;
+            for (i = 0; i < node.properties.length; i++) {
+                const memberDecl = node.properties[i];
                 let member = memberDecl.symbol;
                 if (memberDecl.kind === SyntaxKind.PropertyAssignment ||
                     memberDecl.kind === SyntaxKind.ShorthandPropertyAssignment ||
@@ -11262,6 +11265,7 @@ namespace ts {
                         return unknownType;
                     }
                     spread = getSpreadType(spread, type, /*isFromObjectLiteral*/ false);
+                    offset = i + 1;
                     continue;
                 }
                 else {
@@ -11315,8 +11319,8 @@ namespace ts {
             return createObjectLiteralType();
 
             function createObjectLiteralType() {
-                const stringIndexInfo = hasComputedStringProperty ? getObjectLiteralIndexInfo(node, propertiesArray, IndexKind.String) : undefined;
-                const numberIndexInfo = hasComputedNumberProperty ? getObjectLiteralIndexInfo(node, propertiesArray, IndexKind.Number) : undefined;
+                const stringIndexInfo = hasComputedStringProperty ? getObjectLiteralIndexInfo(node.properties, offset, propertiesArray, IndexKind.String) : undefined;
+                const numberIndexInfo = hasComputedNumberProperty ? getObjectLiteralIndexInfo(node.properties, offset, propertiesArray, IndexKind.Number) : undefined;
                 const result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
                 const freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : TypeFlags.FreshLiteral;
                 result.flags |= TypeFlags.ContainsObjectLiteral | freshObjectLiteralFlag | (typeFlags & TypeFlags.PropagatingFlags);
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index a18146bdaa1..84d5462914c 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -45,7 +45,7 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         const restHelper = `
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && !e.indexOf(p))
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) === -1)
         t[p] = s[p];
     return t;
 };`;
diff --git a/src/compiler/transformers/destructuring.ts b/src/compiler/transformers/destructuring.ts
index a8c00776741..692d021eb5e 100644
--- a/src/compiler/transformers/destructuring.ts
+++ b/src/compiler/transformers/destructuring.ts
@@ -304,17 +304,19 @@ namespace ts {
             if (properties.length !== 1) {
                 // For anything but a single element destructuring we need to generate a temporary
                 // to ensure value is evaluated exactly once.
-                // When doing so we want to hightlight the passed in source map node since thats the one needing this temp assignment
+                // When doing so we want to highlight the passed in source map node since that's the one needing this temp assignment
                 value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ true, location, emitTempVariableAssignment);
             }
 
             let bindingElements: ObjectLiteralElementLike[] = [];
+            let computedTempVariables: Expression[];
             for (let i = 0; i < properties.length; i++) {
                 const p = properties[i];
                 if (p.kind === SyntaxKind.PropertyAssignment || p.kind === SyntaxKind.ShorthandPropertyAssignment) {
                     if (!transformRest ||
                         p.transformFlags & TransformFlags.ContainsSpreadExpression ||
-                        (p.kind === SyntaxKind.PropertyAssignment && p.initializer.transformFlags & TransformFlags.ContainsSpreadExpression)) {
+                        (p.kind === SyntaxKind.PropertyAssignment && p.initializer.transformFlags & TransformFlags.ContainsSpreadExpression) ||
+                        isComputedPropertyName(p.name)) {
                         if (bindingElements.length) {
                             emitRestAssignment(bindingElements, value, location, target);
                             bindingElements = [];
@@ -322,7 +324,11 @@ namespace ts {
                         const propName = <Identifier | LiteralExpression>(<PropertyAssignment>p).name;
                         const bindingTarget = p.kind === SyntaxKind.ShorthandPropertyAssignment ? <ShorthandPropertyAssignment>p : (<PropertyAssignment>p).initializer || propName;
                         // Assignment for bindingTarget = value.propName should highlight whole property, hence use p as source map node
-                        emitDestructuringAssignment(bindingTarget, createDestructuringPropertyAccess(value, propName), p);
+                        const propAccess = createDestructuringPropertyAccess(value, propName);
+                        if (isComputedPropertyName(propName)) {
+                            (computedTempVariables = computedTempVariables || []).push((propAccess as ElementAccessExpression).argumentExpression);
+                        }
+                        emitDestructuringAssignment(bindingTarget, propAccess, p);
                     }
                     else {
                         bindingElements.push(p);
@@ -336,7 +342,7 @@ namespace ts {
                         bindingElements = [];
                     }
                     const propName = (p as SpreadAssignment).expression as Identifier;
-                    const restCall = createRestCall(value, target.properties, p => p.name, target);
+                    const restCall = createRestCall(value, target.properties, p => p.name, target, computedTempVariables);
                     emitDestructuringAssignment(propName, restCall, p);
                 }
             }
@@ -413,17 +419,28 @@ namespace ts {
 
         /** Given value: o, propName: p, pattern: { a, b, ...p } from the original statement
          * `{ a, b, ...p } = o`, create `p = __rest(o, ["a", "b"]);`*/
-        function createRestCall<T extends Node>(value: Expression, elements: T[], getPropertyName: (element: T) => PropertyName, location: TextRange): Expression {
-            const propertyNames: LiteralExpression[] = [];
+        function createRestCall<T extends Node>(value: Expression, elements: T[], getPropertyName: (element: T) => PropertyName, location: TextRange, computedTempVariables: Expression[]): Expression {
+            const propertyNames: Expression[] = [];
             for (let i = 0; i < elements.length - 1; i++) {
-                if (isOmittedExpression(elements[i])) {
+                const element = elements[i];
+                if (isOmittedExpression(element)) {
                     continue;
                 }
-                const str = <StringLiteral>createSynthesizedNode(SyntaxKind.StringLiteral);
-                str.pos = location.pos;
-                str.end = location.end;
-                str.text = getTextOfPropertyName(getPropertyName(elements[i]));
-                propertyNames.push(str);
+                if (isComputedPropertyName(getPropertyName(element))) {
+                    // get the temp name and put that in there instead, like `_tmp + ""`
+                    const stringifiedTemp = <StringLiteral>createSynthesizedNode(SyntaxKind.StringLiteral);
+                    stringifiedTemp.pos = location.pos;
+                    stringifiedTemp.end = location.end;
+                    stringifiedTemp.text = "";
+                    propertyNames.push(createBinary(computedTempVariables.shift(), SyntaxKind.PlusToken, stringifiedTemp));
+                }
+                else {
+                    const str = <StringLiteral>createSynthesizedNode(SyntaxKind.StringLiteral);
+                    str.pos = location.pos;
+                    str.end = location.end;
+                    str.text = getTextOfPropertyName(getPropertyName(element));
+                    propertyNames.push(str);
+                }
             }
             const args = createSynthesizedNodeArray([value, createArrayLiteral(propertyNames, location)]);
             return createCall(createIdentifier("__rest"), undefined, args);
@@ -522,6 +539,7 @@ namespace ts {
             const elements = name.elements;
             const numElements = elements.length;
             let bindingElements: BindingElement[] = [];
+            let computedTempVariables: Expression[];
             for (let i = 0; i < numElements; i++) {
                 const element = elements[i];
                 if (isOmittedExpression(element)) {
@@ -533,12 +551,15 @@ namespace ts {
                         bindingElements = [];
                     }
                     const restCall = createRestCall(value,
-                                                    name.elements,
+                                                    elements, // name.elements,
                                                     element => (element as BindingElement).propertyName || <Identifier>(element as BindingElement).name,
-                                                    name);
+                                                    name,
+                                                    computedTempVariables);
                     emitBindingElement(element, restCall);
                 }
-                else if (transformRest && !(element.transformFlags & TransformFlags.ContainsSpreadExpression)) {
+                else if (transformRest &&
+                         !(element.transformFlags & TransformFlags.ContainsSpreadExpression) &&
+                         !isComputedPropertyName(element.propertyName || element.name)) {
                     // do not emit until we have a complete bundle of ES2015 syntax
                     bindingElements.push(element);
                 }
@@ -548,8 +569,13 @@ namespace ts {
                         bindingElements = [];
                     }
                     // Rewrite element to a declaration with an initializer that fetches property
+                    // TODO: Probably save the result of createDestructuringPropertyAccess if propName is a computed property
                     const propName = element.propertyName || <Identifier>element.name;
-                    emitBindingElement(element, createDestructuringPropertyAccess(value, propName));
+                    const propAccess = createDestructuringPropertyAccess(value, propName);
+                    if (isComputedPropertyName(propName)) {
+                        (computedTempVariables = computedTempVariables || []).push((propAccess as ElementAccessExpression).argumentExpression);
+                    }
+                    emitBindingElement(element, propAccess);
                 }
             }
             if (bindingElements.length) {
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index a9f2429d376..ed15264ba16 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -1262,6 +1262,7 @@ namespace ts {
                     case SyntaxKind.Decorator:
                     case SyntaxKind.JsxExpression:
                     case SyntaxKind.JsxSpreadAttribute:
+                    case SyntaxKind.SpreadAssignment:
                         return true;
                     case SyntaxKind.ExpressionWithTypeArguments:
                         return (<ExpressionWithTypeArguments>parent).expression === node && isExpressionWithTypeArgumentsInClassExtendsClause(parent);

From fe66d9ef9fe9b5cadd1e9da50c8ba329cd2856c0 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 14 Nov 2016 16:23:40 -0800
Subject: [PATCH 231/421] Add spread tests and update rest tests

---
 .../conformance/types/rest/objectRest.ts      |  7 ++++++-
 .../spread/objectSpreadComputedProperty.ts    |  9 +++++++++
 .../fourslash/renameObjectSpreadAssignment.ts | 20 +++++++++++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 tests/cases/conformance/types/spread/objectSpreadComputedProperty.ts
 create mode 100644 tests/cases/fourslash/renameObjectSpreadAssignment.ts

diff --git a/tests/cases/conformance/types/rest/objectRest.ts b/tests/cases/conformance/types/rest/objectRest.ts
index f1a77b1c129..3f7be177c7b 100644
--- a/tests/cases/conformance/types/rest/objectRest.ts
+++ b/tests/cases/conformance/types/rest/objectRest.ts
@@ -1,5 +1,5 @@
 // @target: es2015
-let o = { a: 1, b: 'no' }
+var o = { a: 1, b: 'no' }
 var { ...clone } = o;
 var { a, ...justB } = o;
 var { a, b: renamed, ...empty } = o;
@@ -31,3 +31,8 @@ class Removable {
 }
 var removable = new Removable();
 var { removed, ...removableRest } = removable;
+
+let computed = 'b';
+let computed2 = 'a';
+var { [computed]: stillNotGreat, [computed2]: soSo,  ...o } = o;
+({ [computed]: stillNotGreat, [computed2]: soSo, ...o } = o);
diff --git a/tests/cases/conformance/types/spread/objectSpreadComputedProperty.ts b/tests/cases/conformance/types/spread/objectSpreadComputedProperty.ts
new file mode 100644
index 00000000000..7e2182a2f1d
--- /dev/null
+++ b/tests/cases/conformance/types/spread/objectSpreadComputedProperty.ts
@@ -0,0 +1,9 @@
+// fixes #12200
+function f() {
+    let n: number = 12;
+    let m: number = 13;
+    let a: any = null;
+    const o1 = { ...{}, [n]: n };
+    const o2 = { ...{}, [a]: n };
+    const o3 = { [a]: n, ...{}, [n]: n, ...{}, [m]: m };
+}
diff --git a/tests/cases/fourslash/renameObjectSpreadAssignment.ts b/tests/cases/fourslash/renameObjectSpreadAssignment.ts
new file mode 100644
index 00000000000..9cf0b6ebf81
--- /dev/null
+++ b/tests/cases/fourslash/renameObjectSpreadAssignment.ts
@@ -0,0 +1,20 @@
+/// <reference path='fourslash.ts'/>
+
+////interface A1 { a: number };
+////interface A2 { a?: number };
+////let [|a1|]: A1;
+////let [|a2|]: A2;
+////let a12 = { ...[|a1|], ...[|a2|] };
+const ranges = test.ranges();
+verify.assertHasRanges(ranges);
+
+// rename a1
+goTo.position(ranges[0].start);
+verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false, [ranges[0], ranges[2]]);
+goTo.position(ranges[2].start);
+verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false, [ranges[0], ranges[2]]);
+// rename a2
+goTo.position(ranges[1].start);
+verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false, [ranges[1], ranges[3]]);
+goTo.position(ranges[3].start);
+verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false, [ranges[1], ranges[3]]);

From 7c72f3db0205f2360055629f63d9b30dc65b6c15 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 14 Nov 2016 16:24:02 -0800
Subject: [PATCH 232/421] Update baselines

---
 tests/baselines/reference/objectRest.js       | 29 +++++---
 tests/baselines/reference/objectRest.symbols  | 41 ++++++++---
 tests/baselines/reference/objectRest.types    | 35 ++++++++--
 .../reference/objectRestAssignment.js         |  2 +-
 .../reference/objectRestAssignment.symbols    |  5 ++
 .../reference/objectRestAssignment.types      | 10 +--
 tests/baselines/reference/objectRestForOf.js  |  2 +-
 .../reference/objectRestForOf.symbols         |  2 +
 .../baselines/reference/objectRestForOf.types |  4 +-
 .../baselines/reference/objectRestNegative.js |  2 +-
 .../reference/objectRestParameter.js          |  2 +-
 .../baselines/reference/objectSpread.symbols  | 36 ++++++++++
 tests/baselines/reference/objectSpread.types  | 68 +++++++++----------
 .../reference/objectSpreadComputedProperty.js | 31 +++++++++
 .../objectSpreadComputedProperty.symbols      | 34 ++++++++++
 .../objectSpreadComputedProperty.types        | 44 ++++++++++++
 .../objectSpreadIndexSignature.symbols        |  3 +
 .../objectSpreadIndexSignature.types          |  6 +-
 .../reference/objectSpreadNoTransform.symbols |  2 +
 .../reference/objectSpreadNoTransform.types   |  4 +-
 .../reference/objectSpreadStrictNull.symbols  | 21 ++++++
 .../reference/objectSpreadStrictNull.types    | 42 ++++++------
 22 files changed, 332 insertions(+), 93 deletions(-)
 create mode 100644 tests/baselines/reference/objectSpreadComputedProperty.js
 create mode 100644 tests/baselines/reference/objectSpreadComputedProperty.symbols
 create mode 100644 tests/baselines/reference/objectSpreadComputedProperty.types

diff --git a/tests/baselines/reference/objectRest.js b/tests/baselines/reference/objectRest.js
index a295ff7b9f1..2f18d23e9e5 100644
--- a/tests/baselines/reference/objectRest.js
+++ b/tests/baselines/reference/objectRest.js
@@ -1,5 +1,5 @@
 //// [objectRest.ts]
-let o = { a: 1, b: 'no' }
+var o = { a: 1, b: 'no' }
 var { ...clone } = o;
 var { a, ...justB } = o;
 var { a, b: renamed, ...empty } = o;
@@ -31,31 +31,36 @@ class Removable {
 }
 var removable = new Removable();
 var { removed, ...removableRest } = removable;
+
+let computed = 'b';
+let computed2 = 'a';
+var { [computed]: stillNotGreat, [computed2]: soSo,  ...o } = o;
+({ [computed]: stillNotGreat, [computed2]: soSo, ...o } = o);
 
 
 //// [objectRest.js]
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && !e.indexOf(p))
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) === -1)
         t[p] = s[p];
     return t;
 };
-let o = { a: 1, b: 'no' };
+var o = { a: 1, b: 'no' };
 var clone = __rest(o, []);
 var { a } = o, justB = __rest(o, ["a"]);
 var { a, b: renamed } = o, empty = __rest(o, ["a", "b"]);
-var { ['b']: renamed } = o, justA = __rest(o, ["b"]);
+var _a = 'b', renamed = o[_a], justA = __rest(o, [_a + ""]);
 var { 'b': renamed } = o, justA = __rest(o, ["b"]);
 var { b: { '0': n, '1': oooo } } = o, justA = __rest(o, ["b"]);
 let o2 = { c: 'terrible idea?', d: 'yes' };
 var { d: renamed } = o2, d = __rest(o2, ["d"]);
 let nestedrest;
-var { x } = nestedrest, _a = nestedrest.n1, { y } = _a, _b = _a.n2, { z } = _b, nr = __rest(_b.n3, []), restrest = __rest(nestedrest, ["x", "n1"]);
+var { x } = nestedrest, _b = nestedrest.n1, { y } = _b, _c = _b.n2, { z } = _c, nr = __rest(_c.n3, []), restrest = __rest(nestedrest, ["x", "n1"]);
 let complex;
-var _c = complex.x, { ka } = _c, nested = __rest(_c, ["ka"]), { y: other } = complex, rest = __rest(complex, ["x", "y"]);
-(_d = complex.x, { ka } = _d, nested = __rest(_d, ["ka"]), { y: other } = complex, rest = __rest(complex, ["x", "y"]), complex);
-var _e = { x: 1, y: 2 }, { x } = _e, fresh = __rest(_e, ["x"]);
-(_f = { x: 1, y: 2 }, { x } = _f, fresh = __rest(_f, ["x"]), _f);
+var _d = complex.x, { ka } = _d, nested = __rest(_d, ["ka"]), { y: other } = complex, rest = __rest(complex, ["x", "y"]);
+(_e = complex.x, { ka } = _e, nested = __rest(_e, ["ka"]), { y: other } = complex, rest = __rest(complex, ["x", "y"]), complex);
+var _f = { x: 1, y: 2 }, { x } = _f, fresh = __rest(_f, ["x"]);
+(_g = { x: 1, y: 2 }, { x } = _g, fresh = __rest(_g, ["x"]), _g);
 class Removable {
     set z(value) { }
     get both() { return 12; }
@@ -64,4 +69,8 @@ class Removable {
 }
 var removable = new Removable();
 var { removed } = removable, removableRest = __rest(removable, ["removed"]);
-var _d, _f;
+let computed = 'b';
+let computed2 = 'a';
+var _h = computed, stillNotGreat = o[_h], _j = computed2, soSo = o[_j], o = __rest(o, [_h + "", _j + ""]);
+(_k = computed, stillNotGreat = o[_k], _l = computed2, soSo = o[_l], o = __rest(o, [_k + "", _l + ""]), o);
+var _e, _g, _k, _l;
diff --git a/tests/baselines/reference/objectRest.symbols b/tests/baselines/reference/objectRest.symbols
index 427656248ee..325258aa8cd 100644
--- a/tests/baselines/reference/objectRest.symbols
+++ b/tests/baselines/reference/objectRest.symbols
@@ -1,42 +1,42 @@
 === tests/cases/conformance/types/rest/objectRest.ts ===
-let o = { a: 1, b: 'no' }
->o : Symbol(o, Decl(objectRest.ts, 0, 3))
+var o = { a: 1, b: 'no' }
+>o : Symbol(o, Decl(objectRest.ts, 0, 3), Decl(objectRest.ts, 35, 51))
 >a : Symbol(a, Decl(objectRest.ts, 0, 9))
 >b : Symbol(b, Decl(objectRest.ts, 0, 15))
 
 var { ...clone } = o;
 >clone : Symbol(clone, Decl(objectRest.ts, 1, 5))
->o : Symbol(o, Decl(objectRest.ts, 0, 3))
+>o : Symbol(o, Decl(objectRest.ts, 0, 3), Decl(objectRest.ts, 35, 51))
 
 var { a, ...justB } = o;
 >a : Symbol(a, Decl(objectRest.ts, 2, 5), Decl(objectRest.ts, 3, 5))
 >justB : Symbol(justB, Decl(objectRest.ts, 2, 8))
->o : Symbol(o, Decl(objectRest.ts, 0, 3))
+>o : Symbol(o, Decl(objectRest.ts, 0, 3), Decl(objectRest.ts, 35, 51))
 
 var { a, b: renamed, ...empty } = o;
 >a : Symbol(a, Decl(objectRest.ts, 2, 5), Decl(objectRest.ts, 3, 5))
 >b : Symbol(b, Decl(objectRest.ts, 0, 15))
 >renamed : Symbol(renamed, Decl(objectRest.ts, 3, 8), Decl(objectRest.ts, 4, 5), Decl(objectRest.ts, 5, 5), Decl(objectRest.ts, 9, 5))
 >empty : Symbol(empty, Decl(objectRest.ts, 3, 20))
->o : Symbol(o, Decl(objectRest.ts, 0, 3))
+>o : Symbol(o, Decl(objectRest.ts, 0, 3), Decl(objectRest.ts, 35, 51))
 
 var { ['b']: renamed, ...justA } = o;
 >'b' : Symbol(renamed, Decl(objectRest.ts, 3, 8), Decl(objectRest.ts, 4, 5), Decl(objectRest.ts, 5, 5), Decl(objectRest.ts, 9, 5))
 >renamed : Symbol(renamed, Decl(objectRest.ts, 3, 8), Decl(objectRest.ts, 4, 5), Decl(objectRest.ts, 5, 5), Decl(objectRest.ts, 9, 5))
 >justA : Symbol(justA, Decl(objectRest.ts, 4, 21), Decl(objectRest.ts, 5, 19), Decl(objectRest.ts, 6, 31))
->o : Symbol(o, Decl(objectRest.ts, 0, 3))
+>o : Symbol(o, Decl(objectRest.ts, 0, 3), Decl(objectRest.ts, 35, 51))
 
 var { 'b': renamed, ...justA } = o;
 >renamed : Symbol(renamed, Decl(objectRest.ts, 3, 8), Decl(objectRest.ts, 4, 5), Decl(objectRest.ts, 5, 5), Decl(objectRest.ts, 9, 5))
 >justA : Symbol(justA, Decl(objectRest.ts, 4, 21), Decl(objectRest.ts, 5, 19), Decl(objectRest.ts, 6, 31))
->o : Symbol(o, Decl(objectRest.ts, 0, 3))
+>o : Symbol(o, Decl(objectRest.ts, 0, 3), Decl(objectRest.ts, 35, 51))
 
 var { b: { '0': n, '1': oooo }, ...justA } = o;
 >b : Symbol(b, Decl(objectRest.ts, 0, 15))
 >n : Symbol(n, Decl(objectRest.ts, 6, 10))
 >oooo : Symbol(oooo, Decl(objectRest.ts, 6, 18))
 >justA : Symbol(justA, Decl(objectRest.ts, 4, 21), Decl(objectRest.ts, 5, 19), Decl(objectRest.ts, 6, 31))
->o : Symbol(o, Decl(objectRest.ts, 0, 3))
+>o : Symbol(o, Decl(objectRest.ts, 0, 3), Decl(objectRest.ts, 35, 51))
 
 let o2 = { c: 'terrible idea?', d: 'yes' };
 >o2 : Symbol(o2, Decl(objectRest.ts, 8, 3))
@@ -91,8 +91,10 @@ var { x: { ka, ...nested }, y: other, ...rest } = complex;
 ({x: { ka, ...nested }, y: other, ...rest} = complex);
 >x : Symbol(x, Decl(objectRest.ts, 16, 2))
 >ka : Symbol(ka, Decl(objectRest.ts, 16, 6))
+>nested : Symbol(nested, Decl(objectRest.ts, 15, 14))
 >y : Symbol(y, Decl(objectRest.ts, 16, 23))
 >other : Symbol(other, Decl(objectRest.ts, 15, 27))
+>rest : Symbol(rest, Decl(objectRest.ts, 15, 37))
 >complex : Symbol(complex, Decl(objectRest.ts, 14, 3))
 
 var { x, ...fresh } = { x: 1, y: 2 };
@@ -103,6 +105,7 @@ var { x, ...fresh } = { x: 1, y: 2 };
 
 ({ x, ...fresh } = { x: 1, y: 2 });
 >x : Symbol(x, Decl(objectRest.ts, 18, 2))
+>fresh : Symbol(fresh, Decl(objectRest.ts, 17, 8))
 >x : Symbol(x, Decl(objectRest.ts, 18, 20))
 >y : Symbol(y, Decl(objectRest.ts, 18, 26))
 
@@ -144,3 +147,25 @@ var { removed, ...removableRest } = removable;
 >removableRest : Symbol(removableRest, Decl(objectRest.ts, 31, 14))
 >removable : Symbol(removable, Decl(objectRest.ts, 30, 3))
 
+let computed = 'b';
+>computed : Symbol(computed, Decl(objectRest.ts, 33, 3))
+
+let computed2 = 'a';
+>computed2 : Symbol(computed2, Decl(objectRest.ts, 34, 3))
+
+var { [computed]: stillNotGreat, [computed2]: soSo,  ...o } = o;
+>computed : Symbol(computed, Decl(objectRest.ts, 33, 3))
+>stillNotGreat : Symbol(stillNotGreat, Decl(objectRest.ts, 35, 5))
+>computed2 : Symbol(computed2, Decl(objectRest.ts, 34, 3))
+>soSo : Symbol(soSo, Decl(objectRest.ts, 35, 32))
+>o : Symbol(o, Decl(objectRest.ts, 0, 3), Decl(objectRest.ts, 35, 51))
+>o : Symbol(o, Decl(objectRest.ts, 0, 3), Decl(objectRest.ts, 35, 51))
+
+({ [computed]: stillNotGreat, [computed2]: soSo, ...o } = o);
+>computed : Symbol(computed, Decl(objectRest.ts, 33, 3))
+>stillNotGreat : Symbol(stillNotGreat, Decl(objectRest.ts, 35, 5))
+>computed2 : Symbol(computed2, Decl(objectRest.ts, 34, 3))
+>soSo : Symbol(soSo, Decl(objectRest.ts, 35, 32))
+>o : Symbol(o, Decl(objectRest.ts, 0, 3), Decl(objectRest.ts, 35, 51))
+>o : Symbol(o, Decl(objectRest.ts, 0, 3), Decl(objectRest.ts, 35, 51))
+
diff --git a/tests/baselines/reference/objectRest.types b/tests/baselines/reference/objectRest.types
index 95e378359c8..7d833543747 100644
--- a/tests/baselines/reference/objectRest.types
+++ b/tests/baselines/reference/objectRest.types
@@ -1,5 +1,5 @@
 === tests/cases/conformance/types/rest/objectRest.ts ===
-let o = { a: 1, b: 'no' }
+var o = { a: 1, b: 'no' }
 >o : { a: number; b: string; }
 >{ a: 1, b: 'no' } : { a: number; b: string; }
 >a : number
@@ -101,10 +101,10 @@ var { x: { ka, ...nested }, y: other, ...rest } = complex;
 >x : { ki: any; ka: any; }
 >{ ka, ...nested } : { ki: any; ka: any; }
 >ka : any
->nested : any
+>nested : { ki: any; }
 >y : number
 >other : number
->rest : any
+>rest : {}
 >complex : { x: { ka: any; ki: any; }; y: number; }
 
 var { x, ...fresh } = { x: 1, y: 2 };
@@ -121,7 +121,7 @@ var { x, ...fresh } = { x: 1, y: 2 };
 >{ x, ...fresh } = { x: 1, y: 2 } : { x: number; y: number; }
 >{ x, ...fresh } : { y: number; x: number; }
 >x : number
->fresh : any
+>fresh : { y: number; }
 >{ x: 1, y: 2 } : { x: number; y: number; }
 >x : number
 >1 : 1
@@ -168,3 +168,30 @@ var { removed, ...removableRest } = removable;
 >removableRest : { both: number; remainder: string; }
 >removable : Removable
 
+let computed = 'b';
+>computed : string
+>'b' : "b"
+
+let computed2 = 'a';
+>computed2 : string
+>'a' : "a"
+
+var { [computed]: stillNotGreat, [computed2]: soSo,  ...o } = o;
+>computed : string
+>stillNotGreat : any
+>computed2 : string
+>soSo : any
+>o : { a: number; b: string; }
+>o : { a: number; b: string; }
+
+({ [computed]: stillNotGreat, [computed2]: soSo, ...o } = o);
+>({ [computed]: stillNotGreat, [computed2]: soSo, ...o } = o) : { a: number; b: string; }
+>{ [computed]: stillNotGreat, [computed2]: soSo, ...o } = o : { a: number; b: string; }
+>{ [computed]: stillNotGreat, [computed2]: soSo, ...o } : { a: number; b: string; }
+>computed : string
+>stillNotGreat : any
+>computed2 : string
+>soSo : any
+>o : { a: number; b: string; }
+>o : { a: number; b: string; }
+
diff --git a/tests/baselines/reference/objectRestAssignment.js b/tests/baselines/reference/objectRestAssignment.js
index 41620d59b58..51d9aea192f 100644
--- a/tests/baselines/reference/objectRestAssignment.js
+++ b/tests/baselines/reference/objectRestAssignment.js
@@ -17,7 +17,7 @@ var { a: [{ ...nested2 }, ...y], b: { z, ...c }, ...rest2 } = overEmit;
 //// [objectRestAssignment.js]
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && !e.indexOf(p))
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) === -1)
         t[p] = s[p];
     return t;
 };
diff --git a/tests/baselines/reference/objectRestAssignment.symbols b/tests/baselines/reference/objectRestAssignment.symbols
index 4cb27e6e7ec..82324873283 100644
--- a/tests/baselines/reference/objectRestAssignment.symbols
+++ b/tests/baselines/reference/objectRestAssignment.symbols
@@ -22,8 +22,10 @@ let complex: { x: { ka, ki }, y: number };
 ({x: { ka, ...nested }, y: other, ...rest} = complex);
 >x : Symbol(x, Decl(objectRestAssignment.ts, 5, 2))
 >ka : Symbol(ka, Decl(objectRestAssignment.ts, 5, 6))
+>nested : Symbol(nested, Decl(objectRestAssignment.ts, 1, 3))
 >y : Symbol(y, Decl(objectRestAssignment.ts, 5, 23))
 >other : Symbol(other, Decl(objectRestAssignment.ts, 2, 3))
+>rest : Symbol(rest, Decl(objectRestAssignment.ts, 3, 3))
 >complex : Symbol(complex, Decl(objectRestAssignment.ts, 4, 3))
 
 // should be:
@@ -52,8 +54,11 @@ var { a: [{ ...nested2 }, ...y], b: { z, ...c }, ...rest2 } = overEmit;
 
 ({ a: [{ ...nested2 }, ...y], b: { z, ...c }, ...rest2 } = overEmit);
 >a : Symbol(a, Decl(objectRestAssignment.ts, 12, 2))
+>nested2 : Symbol(nested2, Decl(objectRestAssignment.ts, 11, 11))
 >y : Symbol(y, Decl(objectRestAssignment.ts, 11, 25))
 >b : Symbol(b, Decl(objectRestAssignment.ts, 12, 29))
 >z : Symbol(z, Decl(objectRestAssignment.ts, 12, 34))
+>c : Symbol(c, Decl(objectRestAssignment.ts, 11, 40))
+>rest2 : Symbol(rest2, Decl(objectRestAssignment.ts, 11, 48))
 >overEmit : Symbol(overEmit, Decl(objectRestAssignment.ts, 8, 3))
 
diff --git a/tests/baselines/reference/objectRestAssignment.types b/tests/baselines/reference/objectRestAssignment.types
index 38aa00ce61d..b51260736ad 100644
--- a/tests/baselines/reference/objectRestAssignment.types
+++ b/tests/baselines/reference/objectRestAssignment.types
@@ -26,10 +26,10 @@ let complex: { x: { ka, ki }, y: number };
 >x : { ki: any; ka: any; }
 >{ ka, ...nested } : { ki: any; ka: any; }
 >ka : any
->nested : any
+>nested : { ki: any; }
 >y : number
 >other : number
->rest : any
+>rest : {}
 >complex : { x: { ka: any; ki: any; }; y: number; }
 
 // should be:
@@ -63,13 +63,13 @@ var { a: [{ ...nested2 }, ...y], b: { z, ...c }, ...rest2 } = overEmit;
 >a : { ka: string; x: string; }[]
 >[{ ...nested2 }, ...y] : { ka: string; x: string; }[]
 >{ ...nested2 } : { ka: string; x: string; }
->nested2 : any
+>nested2 : { ka: string; x: string; }
 >...y : { ka: string; x: string; }
 >y : { ka: string; x: string; }[]
 >b : { ki: string; ku: string; z: string; }
 >{ z, ...c } : { ki: string; ku: string; z: string; }
 >z : string
->c : any
->rest2 : any
+>c : { ki: string; ku: string; }
+>rest2 : { ke: string; ko: string; }
 >overEmit : { a: { ka: string; x: string; }[]; b: { z: string; ki: string; ku: string; }; ke: string; ko: string; }
 
diff --git a/tests/baselines/reference/objectRestForOf.js b/tests/baselines/reference/objectRestForOf.js
index 26ebd8f8229..dacf4d28165 100644
--- a/tests/baselines/reference/objectRestForOf.js
+++ b/tests/baselines/reference/objectRestForOf.js
@@ -25,7 +25,7 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
 };
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && !e.indexOf(p))
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) === -1)
         t[p] = s[p];
     return t;
 };
diff --git a/tests/baselines/reference/objectRestForOf.symbols b/tests/baselines/reference/objectRestForOf.symbols
index ec0ccde740d..f3786fed55f 100644
--- a/tests/baselines/reference/objectRestForOf.symbols
+++ b/tests/baselines/reference/objectRestForOf.symbols
@@ -23,6 +23,7 @@ let rrestOff: { y: string };
 for ({ x: xx, ...rrestOff } of array ) {
 >x : Symbol(x, Decl(objectRestForOf.ts, 6, 6))
 >xx : Symbol(xx, Decl(objectRestForOf.ts, 4, 3))
+>rrestOff : Symbol(rrestOff, Decl(objectRestForOf.ts, 5, 3))
 >array : Symbol(array, Decl(objectRestForOf.ts, 0, 3))
 
     [xx, rrestOff];
@@ -35,6 +36,7 @@ for (const norest of array.map(a => ({ ...a, x: 'a string' }))) {
 >array : Symbol(array, Decl(objectRestForOf.ts, 0, 3))
 >map : Symbol(Array.map, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >a : Symbol(a, Decl(objectRestForOf.ts, 9, 31))
+>a : Symbol(a, Decl(objectRestForOf.ts, 9, 31))
 >x : Symbol(x, Decl(objectRestForOf.ts, 9, 44))
 
     [norest.x, norest.y];
diff --git a/tests/baselines/reference/objectRestForOf.types b/tests/baselines/reference/objectRestForOf.types
index e8c3b4a82ab..2fde7566c74 100644
--- a/tests/baselines/reference/objectRestForOf.types
+++ b/tests/baselines/reference/objectRestForOf.types
@@ -25,7 +25,7 @@ for ({ x: xx, ...rrestOff } of array ) {
 >{ x: xx, ...rrestOff } : { y: string; x: number; }
 >x : { x: number; y: string; }
 >xx : number
->rrestOff : any
+>rrestOff : { y: string; }
 >array : { x: number; y: string; }[]
 
     [xx, rrestOff];
@@ -43,7 +43,7 @@ for (const norest of array.map(a => ({ ...a, x: 'a string' }))) {
 >a : { x: number; y: string; }
 >({ ...a, x: 'a string' }) : { x: string; y: string; }
 >{ ...a, x: 'a string' } : { x: string; y: string; }
->a : any
+>a : { x: number; y: string; }
 >x : string
 >'a string' : "a string"
 
diff --git a/tests/baselines/reference/objectRestNegative.js b/tests/baselines/reference/objectRestNegative.js
index 8692850dbdd..57f7b2076a3 100644
--- a/tests/baselines/reference/objectRestNegative.js
+++ b/tests/baselines/reference/objectRestNegative.js
@@ -15,7 +15,7 @@ let rest: { b: string }
 //// [objectRestNegative.js]
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && !e.indexOf(p))
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) === -1)
         t[p] = s[p];
     return t;
 };
diff --git a/tests/baselines/reference/objectRestParameter.js b/tests/baselines/reference/objectRestParameter.js
index 49434f24eec..3f2aad88e8d 100644
--- a/tests/baselines/reference/objectRestParameter.js
+++ b/tests/baselines/reference/objectRestParameter.js
@@ -11,7 +11,7 @@ suddenly(({ x: { z = 12, ...nested }, ...rest } = { x: { z: 1, ka: 1 }, y: 'noo'
 //// [objectRestParameter.js]
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && !e.indexOf(p))
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) === -1)
         t[p] = s[p];
     return t;
 };
diff --git a/tests/baselines/reference/objectSpread.symbols b/tests/baselines/reference/objectSpread.symbols
index 9946b313f52..0b2fce46b0d 100644
--- a/tests/baselines/reference/objectSpread.symbols
+++ b/tests/baselines/reference/objectSpread.symbols
@@ -21,6 +21,7 @@ let addAfter: { a: number, b: string, c: boolean } =
 >c : Symbol(c, Decl(objectSpread.ts, 4, 37))
 
     { ...o, c: false }
+>o : Symbol(o, Decl(objectSpread.ts, 0, 3))
 >c : Symbol(c, Decl(objectSpread.ts, 5, 11))
 
 let addBefore: { a: number, b: string, c: boolean } =
@@ -31,6 +32,7 @@ let addBefore: { a: number, b: string, c: boolean } =
 
     { c: false, ...o }
 >c : Symbol(c, Decl(objectSpread.ts, 7, 5))
+>o : Symbol(o, Decl(objectSpread.ts, 0, 3))
 
 // Note: ignore still changes the order that properties are printed
 let ignore: { a: number, b: string } =
@@ -40,6 +42,7 @@ let ignore: { a: number, b: string } =
 
     { b: 'ignored', ...o }
 >b : Symbol(b, Decl(objectSpread.ts, 10, 5))
+>o : Symbol(o, Decl(objectSpread.ts, 0, 3))
 
 let override: { a: number, b: string } =
 >override : Symbol(override, Decl(objectSpread.ts, 11, 3))
@@ -47,6 +50,7 @@ let override: { a: number, b: string } =
 >b : Symbol(b, Decl(objectSpread.ts, 11, 26))
 
     { ...o, b: 'override' }
+>o : Symbol(o, Decl(objectSpread.ts, 0, 3))
 >b : Symbol(b, Decl(objectSpread.ts, 12, 11))
 
 let nested: { a: number, b: boolean, c: string } =
@@ -68,6 +72,9 @@ let combined: { a: number, b: string, c: boolean } =
 >c : Symbol(c, Decl(objectSpread.ts, 15, 37))
 
     { ...o, ...o2 }
+>o : Symbol(o, Decl(objectSpread.ts, 0, 3))
+>o2 : Symbol(o2, Decl(objectSpread.ts, 1, 3))
+
 let combinedBefore: { a: number, b: string, c: boolean } =
 >combinedBefore : Symbol(combinedBefore, Decl(objectSpread.ts, 17, 3))
 >a : Symbol(a, Decl(objectSpread.ts, 17, 21))
@@ -76,6 +83,8 @@ let combinedBefore: { a: number, b: string, c: boolean } =
 
     { b: 'ok', ...o, ...o2 }
 >b : Symbol(b, Decl(objectSpread.ts, 18, 5))
+>o : Symbol(o, Decl(objectSpread.ts, 0, 3))
+>o2 : Symbol(o2, Decl(objectSpread.ts, 1, 3))
 
 let combinedMid: { a: number, b: string, c: boolean } =
 >combinedMid : Symbol(combinedMid, Decl(objectSpread.ts, 19, 3))
@@ -84,7 +93,9 @@ let combinedMid: { a: number, b: string, c: boolean } =
 >c : Symbol(c, Decl(objectSpread.ts, 19, 40))
 
     { ...o, b: 'ok', ...o2 }
+>o : Symbol(o, Decl(objectSpread.ts, 0, 3))
 >b : Symbol(b, Decl(objectSpread.ts, 20, 11))
+>o2 : Symbol(o2, Decl(objectSpread.ts, 1, 3))
 
 let combinedAfter: { a: number, b: string, c: boolean } =
 >combinedAfter : Symbol(combinedAfter, Decl(objectSpread.ts, 21, 3))
@@ -93,6 +104,8 @@ let combinedAfter: { a: number, b: string, c: boolean } =
 >c : Symbol(c, Decl(objectSpread.ts, 21, 42))
 
     { ...o, ...o2, b: 'ok' }
+>o : Symbol(o, Decl(objectSpread.ts, 0, 3))
+>o2 : Symbol(o2, Decl(objectSpread.ts, 1, 3))
 >b : Symbol(b, Decl(objectSpread.ts, 22, 18))
 
 let combinedNested: { a: number, b: boolean, c: string, d: string } =
@@ -130,6 +143,7 @@ let propertyNested: { a: { a: number, b: string } } =
 
     { a: { ... o } }
 >a : Symbol(a, Decl(objectSpread.ts, 28, 5))
+>o : Symbol(o, Decl(objectSpread.ts, 0, 3))
 
 // accessors don't copy the descriptor
 // (which means that readonly getters become read/write properties)
@@ -143,6 +157,7 @@ let getter: { a: number, c: number } =
 >c : Symbol(c, Decl(objectSpread.ts, 32, 24))
 
     { ...op, c: 7 }
+>op : Symbol(op, Decl(objectSpread.ts, 31, 3))
 >c : Symbol(c, Decl(objectSpread.ts, 33, 12))
 
 getter.a = 12;
@@ -160,6 +175,7 @@ let anything: any;
 
 let spreadAny = { ...anything };
 >spreadAny : Symbol(spreadAny, Decl(objectSpread.ts, 41, 3))
+>anything : Symbol(anything, Decl(objectSpread.ts, 40, 3))
 
 // methods are not enumerable
 class C { p = 1; m() { } }
@@ -175,12 +191,14 @@ let c: C = new C()
 let spreadC: { p: number } = { ...c }
 >spreadC : Symbol(spreadC, Decl(objectSpread.ts, 46, 3))
 >p : Symbol(p, Decl(objectSpread.ts, 46, 14))
+>c : Symbol(c, Decl(objectSpread.ts, 45, 3))
 
 // own methods are enumerable
 let cplus: { p: number, plus(): void } = { ...c, plus() { return this.p + 1; } };
 >cplus : Symbol(cplus, Decl(objectSpread.ts, 49, 3))
 >p : Symbol(p, Decl(objectSpread.ts, 49, 12))
 >plus : Symbol(plus, Decl(objectSpread.ts, 49, 23))
+>c : Symbol(c, Decl(objectSpread.ts, 45, 3))
 >plus : Symbol(plus, Decl(objectSpread.ts, 49, 48))
 >this : Symbol(__object, Decl(objectSpread.ts, 41, 15))
 
@@ -196,6 +214,7 @@ let changeTypeAfter: { a: string, b: string } =
 >b : Symbol(b, Decl(objectSpread.ts, 53, 33))
 
     { ...o, a: 'wrong type?' }
+>o : Symbol(o, Decl(objectSpread.ts, 0, 3))
 >a : Symbol(a, Decl(objectSpread.ts, 54, 11))
 
 let changeTypeBefore: { a: number, b: string } =
@@ -205,6 +224,7 @@ let changeTypeBefore: { a: number, b: string } =
 
     { a: 'wrong type?', ...o };
 >a : Symbol(a, Decl(objectSpread.ts, 56, 5))
+>o : Symbol(o, Decl(objectSpread.ts, 0, 3))
 
 let changeTypeBoth: { a: string, b: number } =
 >changeTypeBoth : Symbol(changeTypeBoth, Decl(objectSpread.ts, 57, 3))
@@ -212,6 +232,8 @@ let changeTypeBoth: { a: string, b: number } =
 >b : Symbol(b, Decl(objectSpread.ts, 57, 32))
 
     { ...o, ...swap };
+>o : Symbol(o, Decl(objectSpread.ts, 0, 3))
+>swap : Symbol(swap, Decl(objectSpread.ts, 2, 3))
 
 // optional
 let definiteBoolean: { sn: boolean };
@@ -233,14 +255,23 @@ let optionalNumber: { sn?: number };
 let optionalUnionStops: { sn: string | number | boolean } = { ...definiteBoolean, ...definiteString, ...optionalNumber };
 >optionalUnionStops : Symbol(optionalUnionStops, Decl(objectSpread.ts, 65, 3))
 >sn : Symbol(sn, Decl(objectSpread.ts, 65, 25))
+>definiteBoolean : Symbol(definiteBoolean, Decl(objectSpread.ts, 61, 3))
+>definiteString : Symbol(definiteString, Decl(objectSpread.ts, 62, 3))
+>optionalNumber : Symbol(optionalNumber, Decl(objectSpread.ts, 64, 3))
 
 let optionalUnionDuplicates: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...optionalString, ...optionalNumber };
 >optionalUnionDuplicates : Symbol(optionalUnionDuplicates, Decl(objectSpread.ts, 66, 3))
 >sn : Symbol(sn, Decl(objectSpread.ts, 66, 30))
+>definiteBoolean : Symbol(definiteBoolean, Decl(objectSpread.ts, 61, 3))
+>definiteString : Symbol(definiteString, Decl(objectSpread.ts, 62, 3))
+>optionalString : Symbol(optionalString, Decl(objectSpread.ts, 63, 3))
+>optionalNumber : Symbol(optionalNumber, Decl(objectSpread.ts, 64, 3))
 
 let allOptional: { sn?: string | number } = { ...optionalString, ...optionalNumber };
 >allOptional : Symbol(allOptional, Decl(objectSpread.ts, 67, 3))
 >sn : Symbol(sn, Decl(objectSpread.ts, 67, 18))
+>optionalString : Symbol(optionalString, Decl(objectSpread.ts, 63, 3))
+>optionalNumber : Symbol(optionalNumber, Decl(objectSpread.ts, 64, 3))
 
 // computed property
 let computedFirst: { a: number, b: string, "before everything": number } =
@@ -250,6 +281,7 @@ let computedFirst: { a: number, b: string, "before everything": number } =
 
     { ['before everything']: 12, ...o, b: 'yes' }
 >'before everything' : Symbol(['before everything'], Decl(objectSpread.ts, 71, 5))
+>o : Symbol(o, Decl(objectSpread.ts, 0, 3))
 >b : Symbol(b, Decl(objectSpread.ts, 71, 38))
 
 let computedMiddle: { a: number, b: string, c: boolean, "in the middle": number } =
@@ -259,8 +291,10 @@ let computedMiddle: { a: number, b: string, c: boolean, "in the middle": number
 >c : Symbol(c, Decl(objectSpread.ts, 72, 43))
 
     { ...o, ['in the middle']: 13, b: 'maybe?', ...o2 }
+>o : Symbol(o, Decl(objectSpread.ts, 0, 3))
 >'in the middle' : Symbol(['in the middle'], Decl(objectSpread.ts, 73, 11))
 >b : Symbol(b, Decl(objectSpread.ts, 73, 34))
+>o2 : Symbol(o2, Decl(objectSpread.ts, 1, 3))
 
 let computedAfter: { a: number, b: string, "at the end": number } =
 >computedAfter : Symbol(computedAfter, Decl(objectSpread.ts, 74, 3))
@@ -268,6 +302,7 @@ let computedAfter: { a: number, b: string, "at the end": number } =
 >b : Symbol(b, Decl(objectSpread.ts, 74, 31))
 
     { ...o, b: 'yeah', ['at the end']: 14 }
+>o : Symbol(o, Decl(objectSpread.ts, 0, 3))
 >b : Symbol(b, Decl(objectSpread.ts, 75, 11))
 >'at the end' : Symbol(['at the end'], Decl(objectSpread.ts, 75, 22))
 
@@ -279,6 +314,7 @@ let shortCutted: { a: number, b: string } = { ...o, a }
 >shortCutted : Symbol(shortCutted, Decl(objectSpread.ts, 78, 3))
 >a : Symbol(a, Decl(objectSpread.ts, 78, 18))
 >b : Symbol(b, Decl(objectSpread.ts, 78, 29))
+>o : Symbol(o, Decl(objectSpread.ts, 0, 3))
 >a : Symbol(a, Decl(objectSpread.ts, 78, 51))
 
 
diff --git a/tests/baselines/reference/objectSpread.types b/tests/baselines/reference/objectSpread.types
index a1c70720d12..a571bd0bb63 100644
--- a/tests/baselines/reference/objectSpread.types
+++ b/tests/baselines/reference/objectSpread.types
@@ -32,7 +32,7 @@ let addAfter: { a: number, b: string, c: boolean } =
 
     { ...o, c: false }
 >{ ...o, c: false } : { c: false; a: number; b: string; }
->o : any
+>o : { a: number; b: string; }
 >c : boolean
 >false : false
 
@@ -46,7 +46,7 @@ let addBefore: { a: number, b: string, c: boolean } =
 >{ c: false, ...o } : { a: number; b: string; c: false; }
 >c : boolean
 >false : false
->o : any
+>o : { a: number; b: string; }
 
 // Note: ignore still changes the order that properties are printed
 let ignore: { a: number, b: string } =
@@ -58,7 +58,7 @@ let ignore: { a: number, b: string } =
 >{ b: 'ignored', ...o } : { a: number; b: string; }
 >b : string
 >'ignored' : "ignored"
->o : any
+>o : { a: number; b: string; }
 
 let override: { a: number, b: string } =
 >override : { a: number; b: string; }
@@ -67,7 +67,7 @@ let override: { a: number, b: string } =
 
     { ...o, b: 'override' }
 >{ ...o, b: 'override' } : { b: string; a: number; }
->o : any
+>o : { a: number; b: string; }
 >b : string
 >'override' : "override"
 
@@ -98,8 +98,8 @@ let combined: { a: number, b: string, c: boolean } =
 
     { ...o, ...o2 }
 >{ ...o, ...o2 } : { b: string; c: boolean; a: number; }
->o : any
->o2 : any
+>o : { a: number; b: string; }
+>o2 : { b: string; c: boolean; }
 
 let combinedBefore: { a: number, b: string, c: boolean } =
 >combinedBefore : { a: number; b: string; c: boolean; }
@@ -111,8 +111,8 @@ let combinedBefore: { a: number, b: string, c: boolean } =
 >{ b: 'ok', ...o, ...o2 } : { b: string; c: boolean; a: number; }
 >b : string
 >'ok' : "ok"
->o : any
->o2 : any
+>o : { a: number; b: string; }
+>o2 : { b: string; c: boolean; }
 
 let combinedMid: { a: number, b: string, c: boolean } =
 >combinedMid : { a: number; b: string; c: boolean; }
@@ -122,10 +122,10 @@ let combinedMid: { a: number, b: string, c: boolean } =
 
     { ...o, b: 'ok', ...o2 }
 >{ ...o, b: 'ok', ...o2 } : { b: string; c: boolean; a: number; }
->o : any
+>o : { a: number; b: string; }
 >b : string
 >'ok' : "ok"
->o2 : any
+>o2 : { b: string; c: boolean; }
 
 let combinedAfter: { a: number, b: string, c: boolean } =
 >combinedAfter : { a: number; b: string; c: boolean; }
@@ -135,8 +135,8 @@ let combinedAfter: { a: number, b: string, c: boolean } =
 
     { ...o, ...o2, b: 'ok' }
 >{ ...o, ...o2, b: 'ok' } : { b: string; c: boolean; a: number; }
->o : any
->o2 : any
+>o : { a: number; b: string; }
+>o2 : { b: string; c: boolean; }
 >b : string
 >'ok' : "ok"
 
@@ -195,7 +195,7 @@ let propertyNested: { a: { a: number, b: string } } =
 >{ a: { ... o } } : { a: { a: number; b: string; }; }
 >a : { a: number; b: string; }
 >{ ... o } : { a: number; b: string; }
->o : any
+>o : { a: number; b: string; }
 
 // accessors don't copy the descriptor
 // (which means that readonly getters become read/write properties)
@@ -212,7 +212,7 @@ let getter: { a: number, c: number } =
 
     { ...op, c: 7 }
 >{ ...op, c: 7 } : { c: number; readonly a: number; }
->op : any
+>op : { readonly a: number; }
 >c : number
 >7 : 7
 
@@ -256,7 +256,7 @@ let spreadC: { p: number } = { ...c }
 >spreadC : { p: number; }
 >p : number
 >{ ...c } : { p: number; }
->c : any
+>c : C
 
 // own methods are enumerable
 let cplus: { p: number, plus(): void } = { ...c, plus() { return this.p + 1; } };
@@ -264,7 +264,7 @@ let cplus: { p: number, plus(): void } = { ...c, plus() { return this.p + 1; } }
 >p : number
 >plus : () => void
 >{ ...c, plus() { return this.p + 1; } } : { plus(): any; p: number; }
->c : any
+>c : C
 >plus : () => any
 >this.p + 1 : any
 >this.p : any
@@ -286,7 +286,7 @@ let changeTypeAfter: { a: string, b: string } =
 
     { ...o, a: 'wrong type?' }
 >{ ...o, a: 'wrong type?' } : { a: string; b: string; }
->o : any
+>o : { a: number; b: string; }
 >a : string
 >'wrong type?' : "wrong type?"
 
@@ -299,7 +299,7 @@ let changeTypeBefore: { a: number, b: string } =
 >{ a: 'wrong type?', ...o } : { a: number; b: string; }
 >a : string
 >'wrong type?' : "wrong type?"
->o : any
+>o : { a: number; b: string; }
 
 let changeTypeBoth: { a: string, b: number } =
 >changeTypeBoth : { a: string; b: number; }
@@ -308,8 +308,8 @@ let changeTypeBoth: { a: string, b: number } =
 
     { ...o, ...swap };
 >{ ...o, ...swap } : { a: string; b: number; }
->o : any
->swap : any
+>o : { a: number; b: string; }
+>swap : { a: string; b: number; }
 
 // optional
 let definiteBoolean: { sn: boolean };
@@ -332,25 +332,25 @@ let optionalUnionStops: { sn: string | number | boolean } = { ...definiteBoolean
 >optionalUnionStops : { sn: string | number | boolean; }
 >sn : string | number | boolean
 >{ ...definiteBoolean, ...definiteString, ...optionalNumber } : { sn: string | number; }
->definiteBoolean : any
->definiteString : any
->optionalNumber : any
+>definiteBoolean : { sn: boolean; }
+>definiteString : { sn: string; }
+>optionalNumber : { sn?: number; }
 
 let optionalUnionDuplicates: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...optionalString, ...optionalNumber };
 >optionalUnionDuplicates : { sn: string | number; }
 >sn : string | number
 >{ ...definiteBoolean, ...definiteString, ...optionalString, ...optionalNumber } : { sn: string | number; }
->definiteBoolean : any
->definiteString : any
->optionalString : any
->optionalNumber : any
+>definiteBoolean : { sn: boolean; }
+>definiteString : { sn: string; }
+>optionalString : { sn?: string; }
+>optionalNumber : { sn?: number; }
 
 let allOptional: { sn?: string | number } = { ...optionalString, ...optionalNumber };
 >allOptional : { sn?: string | number; }
 >sn : string | number
 >{ ...optionalString, ...optionalNumber } : { sn?: string | number; }
->optionalString : any
->optionalNumber : any
+>optionalString : { sn?: string; }
+>optionalNumber : { sn?: number; }
 
 // computed property
 let computedFirst: { a: number, b: string, "before everything": number } =
@@ -362,7 +362,7 @@ let computedFirst: { a: number, b: string, "before everything": number } =
 >{ ['before everything']: 12, ...o, b: 'yes' } : { b: string; a: number; ['before everything']: number; }
 >'before everything' : "before everything"
 >12 : 12
->o : any
+>o : { a: number; b: string; }
 >b : string
 >'yes' : "yes"
 
@@ -374,12 +374,12 @@ let computedMiddle: { a: number, b: string, c: boolean, "in the middle": number
 
     { ...o, ['in the middle']: 13, b: 'maybe?', ...o2 }
 >{ ...o, ['in the middle']: 13, b: 'maybe?', ...o2 } : { b: string; c: boolean; ['in the middle']: number; a: number; }
->o : any
+>o : { a: number; b: string; }
 >'in the middle' : "in the middle"
 >13 : 13
 >b : string
 >'maybe?' : "maybe?"
->o2 : any
+>o2 : { b: string; c: boolean; }
 
 let computedAfter: { a: number, b: string, "at the end": number } =
 >computedAfter : { a: number; b: string; "at the end": number; }
@@ -388,7 +388,7 @@ let computedAfter: { a: number, b: string, "at the end": number } =
 
     { ...o, b: 'yeah', ['at the end']: 14 }
 >{ ...o, b: 'yeah', ['at the end']: 14 } : { b: string; ['at the end']: number; a: number; }
->o : any
+>o : { a: number; b: string; }
 >b : string
 >'yeah' : "yeah"
 >'at the end' : "at the end"
@@ -404,7 +404,7 @@ let shortCutted: { a: number, b: string } = { ...o, a }
 >a : number
 >b : string
 >{ ...o, a } : { a: number; b: string; }
->o : any
+>o : { a: number; b: string; }
 >a : number
 
 
diff --git a/tests/baselines/reference/objectSpreadComputedProperty.js b/tests/baselines/reference/objectSpreadComputedProperty.js
new file mode 100644
index 00000000000..90a22ce6ff5
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadComputedProperty.js
@@ -0,0 +1,31 @@
+//// [objectSpreadComputedProperty.ts]
+// fixes #12200
+function f() {
+    let n: number = 12;
+    let m: number = 13;
+    let a: any = null;
+    const o1 = { ...{}, [n]: n };
+    const o2 = { ...{}, [a]: n };
+    const o3 = { [a]: n, ...{}, [n]: n, ...{}, [m]: m };
+}
+
+
+//// [objectSpreadComputedProperty.js]
+var __assign = (this && this.__assign) || Object.assign || function(t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+        s = arguments[i];
+        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+            t[p] = s[p];
+    }
+    return t;
+};
+// fixes #12200
+function f() {
+    var n = 12;
+    var m = 13;
+    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 _a, _b, _c, _d, _e;
+}
diff --git a/tests/baselines/reference/objectSpreadComputedProperty.symbols b/tests/baselines/reference/objectSpreadComputedProperty.symbols
new file mode 100644
index 00000000000..57a0db0962b
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadComputedProperty.symbols
@@ -0,0 +1,34 @@
+=== tests/cases/conformance/types/spread/objectSpreadComputedProperty.ts ===
+// fixes #12200
+function f() {
+>f : Symbol(f, Decl(objectSpreadComputedProperty.ts, 0, 0))
+
+    let n: number = 12;
+>n : Symbol(n, Decl(objectSpreadComputedProperty.ts, 2, 7))
+
+    let m: number = 13;
+>m : Symbol(m, Decl(objectSpreadComputedProperty.ts, 3, 7))
+
+    let a: any = null;
+>a : Symbol(a, Decl(objectSpreadComputedProperty.ts, 4, 7))
+
+    const o1 = { ...{}, [n]: n };
+>o1 : Symbol(o1, Decl(objectSpreadComputedProperty.ts, 5, 9))
+>n : Symbol(n, Decl(objectSpreadComputedProperty.ts, 2, 7))
+>n : Symbol(n, Decl(objectSpreadComputedProperty.ts, 2, 7))
+
+    const o2 = { ...{}, [a]: n };
+>o2 : Symbol(o2, Decl(objectSpreadComputedProperty.ts, 6, 9))
+>a : Symbol(a, Decl(objectSpreadComputedProperty.ts, 4, 7))
+>n : Symbol(n, Decl(objectSpreadComputedProperty.ts, 2, 7))
+
+    const o3 = { [a]: n, ...{}, [n]: n, ...{}, [m]: m };
+>o3 : Symbol(o3, Decl(objectSpreadComputedProperty.ts, 7, 9))
+>a : Symbol(a, Decl(objectSpreadComputedProperty.ts, 4, 7))
+>n : Symbol(n, Decl(objectSpreadComputedProperty.ts, 2, 7))
+>n : Symbol(n, Decl(objectSpreadComputedProperty.ts, 2, 7))
+>n : Symbol(n, Decl(objectSpreadComputedProperty.ts, 2, 7))
+>m : Symbol(m, Decl(objectSpreadComputedProperty.ts, 3, 7))
+>m : Symbol(m, Decl(objectSpreadComputedProperty.ts, 3, 7))
+}
+
diff --git a/tests/baselines/reference/objectSpreadComputedProperty.types b/tests/baselines/reference/objectSpreadComputedProperty.types
new file mode 100644
index 00000000000..287936d4354
--- /dev/null
+++ b/tests/baselines/reference/objectSpreadComputedProperty.types
@@ -0,0 +1,44 @@
+=== tests/cases/conformance/types/spread/objectSpreadComputedProperty.ts ===
+// fixes #12200
+function f() {
+>f : () => void
+
+    let n: number = 12;
+>n : number
+>12 : 12
+
+    let m: number = 13;
+>m : number
+>13 : 13
+
+    let a: any = null;
+>a : any
+>null : null
+
+    const o1 = { ...{}, [n]: n };
+>o1 : {}
+>{ ...{}, [n]: n } : {}
+>{} : {}
+>n : number
+>n : number
+
+    const o2 = { ...{}, [a]: n };
+>o2 : {}
+>{ ...{}, [a]: n } : {}
+>{} : {}
+>a : any
+>n : number
+
+    const o3 = { [a]: n, ...{}, [n]: n, ...{}, [m]: m };
+>o3 : {}
+>{ [a]: n, ...{}, [n]: n, ...{}, [m]: m } : {}
+>a : any
+>n : number
+>{} : {}
+>n : number
+>n : number
+>{} : {}
+>m : number
+>m : number
+}
+
diff --git a/tests/baselines/reference/objectSpreadIndexSignature.symbols b/tests/baselines/reference/objectSpreadIndexSignature.symbols
index c51e7f4532f..cd64b157196 100644
--- a/tests/baselines/reference/objectSpreadIndexSignature.symbols
+++ b/tests/baselines/reference/objectSpreadIndexSignature.symbols
@@ -27,6 +27,7 @@ let indexed2: Indexed2;
 
 let i = { ...indexed, b: 11 };
 >i : Symbol(i, Decl(objectSpreadIndexSignature.ts, 10, 3))
+>indexed : Symbol(indexed, Decl(objectSpreadIndexSignature.ts, 8, 3))
 >b : Symbol(b, Decl(objectSpreadIndexSignature.ts, 10, 21))
 
 // only indexed has indexer, so i[101]: any
@@ -35,6 +36,8 @@ i[101];
 
 let ii = { ...indexed, ...indexed2 };
 >ii : Symbol(ii, Decl(objectSpreadIndexSignature.ts, 13, 3))
+>indexed : Symbol(indexed, Decl(objectSpreadIndexSignature.ts, 8, 3))
+>indexed2 : Symbol(indexed2, Decl(objectSpreadIndexSignature.ts, 9, 3))
 
 // both have indexer, so i[1001]: number | boolean
 ii[1001];
diff --git a/tests/baselines/reference/objectSpreadIndexSignature.types b/tests/baselines/reference/objectSpreadIndexSignature.types
index 79a515e7374..5eebc2ffa02 100644
--- a/tests/baselines/reference/objectSpreadIndexSignature.types
+++ b/tests/baselines/reference/objectSpreadIndexSignature.types
@@ -28,7 +28,7 @@ let indexed2: Indexed2;
 let i = { ...indexed, b: 11 };
 >i : { b: number; a: number; }
 >{ ...indexed, b: 11 } : { b: number; a: number; }
->indexed : any
+>indexed : Indexed
 >b : number
 >11 : 11
 
@@ -41,8 +41,8 @@ i[101];
 let ii = { ...indexed, ...indexed2 };
 >ii : { [x: string]: number | boolean; c: boolean; a: number; }
 >{ ...indexed, ...indexed2 } : { [x: string]: number | boolean; c: boolean; a: number; }
->indexed : any
->indexed2 : any
+>indexed : Indexed
+>indexed2 : Indexed2
 
 // both have indexer, so i[1001]: number | boolean
 ii[1001];
diff --git a/tests/baselines/reference/objectSpreadNoTransform.symbols b/tests/baselines/reference/objectSpreadNoTransform.symbols
index d7dac11a530..78423330dbb 100644
--- a/tests/baselines/reference/objectSpreadNoTransform.symbols
+++ b/tests/baselines/reference/objectSpreadNoTransform.symbols
@@ -7,6 +7,7 @@ const y = { a: 'yes', b: 'no' };
 const o = { x: 1, ...y };
 >o : Symbol(o, Decl(objectSpreadNoTransform.ts, 1, 5))
 >x : Symbol(x, Decl(objectSpreadNoTransform.ts, 1, 11))
+>y : Symbol(y, Decl(objectSpreadNoTransform.ts, 0, 5))
 
 var b;
 >b : Symbol(b, Decl(objectSpreadNoTransform.ts, 2, 3))
@@ -16,5 +17,6 @@ var rest;
 
 ({ b, ...rest } = o);
 >b : Symbol(b, Decl(objectSpreadNoTransform.ts, 4, 2))
+>rest : Symbol(rest, Decl(objectSpreadNoTransform.ts, 3, 3))
 >o : Symbol(o, Decl(objectSpreadNoTransform.ts, 1, 5))
 
diff --git a/tests/baselines/reference/objectSpreadNoTransform.types b/tests/baselines/reference/objectSpreadNoTransform.types
index 0a6c867e8fe..ae89a3a7993 100644
--- a/tests/baselines/reference/objectSpreadNoTransform.types
+++ b/tests/baselines/reference/objectSpreadNoTransform.types
@@ -12,7 +12,7 @@ const o = { x: 1, ...y };
 >{ x: 1, ...y } : { a: string; b: string; x: number; }
 >x : number
 >1 : 1
->y : any
+>y : { a: string; b: string; }
 
 var b;
 >b : any
@@ -25,6 +25,6 @@ var rest;
 >{ b, ...rest } = o : { a: string; b: string; x: number; }
 >{ b, ...rest } : any
 >b : any
->rest : any
+>rest : undefined
 >o : { a: string; b: string; x: number; }
 
diff --git a/tests/baselines/reference/objectSpreadStrictNull.symbols b/tests/baselines/reference/objectSpreadStrictNull.symbols
index 85def473ce4..2586d4ddbd3 100644
--- a/tests/baselines/reference/objectSpreadStrictNull.symbols
+++ b/tests/baselines/reference/objectSpreadStrictNull.symbols
@@ -31,30 +31,51 @@ function f(
     let optionalUnionStops: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...optionalNumber };
 >optionalUnionStops : Symbol(optionalUnionStops, Decl(objectSpreadStrictNull.ts, 9, 7))
 >sn : Symbol(sn, Decl(objectSpreadStrictNull.ts, 9, 29))
+>definiteBoolean : Symbol(definiteBoolean, Decl(objectSpreadStrictNull.ts, 1, 11))
+>definiteString : Symbol(definiteString, Decl(objectSpreadStrictNull.ts, 2, 37))
+>optionalNumber : Symbol(optionalNumber, Decl(objectSpreadStrictNull.ts, 4, 36))
 
     let optionalUnionDuplicates: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...optionalString, ...optionalNumber };
 >optionalUnionDuplicates : Symbol(optionalUnionDuplicates, Decl(objectSpreadStrictNull.ts, 10, 7))
 >sn : Symbol(sn, Decl(objectSpreadStrictNull.ts, 10, 34))
+>definiteBoolean : Symbol(definiteBoolean, Decl(objectSpreadStrictNull.ts, 1, 11))
+>definiteString : Symbol(definiteString, Decl(objectSpreadStrictNull.ts, 2, 37))
+>optionalString : Symbol(optionalString, Decl(objectSpreadStrictNull.ts, 3, 35))
+>optionalNumber : Symbol(optionalNumber, Decl(objectSpreadStrictNull.ts, 4, 36))
 
     let allOptional: { sn?: string | number } = { ...optionalString, ...optionalNumber };
 >allOptional : Symbol(allOptional, Decl(objectSpreadStrictNull.ts, 11, 7))
 >sn : Symbol(sn, Decl(objectSpreadStrictNull.ts, 11, 22))
+>optionalString : Symbol(optionalString, Decl(objectSpreadStrictNull.ts, 3, 35))
+>optionalNumber : Symbol(optionalNumber, Decl(objectSpreadStrictNull.ts, 4, 36))
 
     // undefined
     let undefinedUnionStops: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...undefinedNumber };
 >undefinedUnionStops : Symbol(undefinedUnionStops, Decl(objectSpreadStrictNull.ts, 14, 7))
 >sn : Symbol(sn, Decl(objectSpreadStrictNull.ts, 14, 30))
+>definiteBoolean : Symbol(definiteBoolean, Decl(objectSpreadStrictNull.ts, 1, 11))
+>definiteString : Symbol(definiteString, Decl(objectSpreadStrictNull.ts, 2, 37))
+>undefinedNumber : Symbol(undefinedNumber, Decl(objectSpreadStrictNull.ts, 6, 48))
 
     let undefinedUnionDuplicates: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...undefinedString, ...undefinedNumber };
 >undefinedUnionDuplicates : Symbol(undefinedUnionDuplicates, Decl(objectSpreadStrictNull.ts, 15, 7))
 >sn : Symbol(sn, Decl(objectSpreadStrictNull.ts, 15, 35))
+>definiteBoolean : Symbol(definiteBoolean, Decl(objectSpreadStrictNull.ts, 1, 11))
+>definiteString : Symbol(definiteString, Decl(objectSpreadStrictNull.ts, 2, 37))
+>undefinedString : Symbol(undefinedString, Decl(objectSpreadStrictNull.ts, 5, 36))
+>undefinedNumber : Symbol(undefinedNumber, Decl(objectSpreadStrictNull.ts, 6, 48))
 
     let allUndefined: { sn: string | number | undefined } = { ...undefinedString, ...undefinedNumber };
 >allUndefined : Symbol(allUndefined, Decl(objectSpreadStrictNull.ts, 16, 7))
 >sn : Symbol(sn, Decl(objectSpreadStrictNull.ts, 16, 23))
+>undefinedString : Symbol(undefinedString, Decl(objectSpreadStrictNull.ts, 5, 36))
+>undefinedNumber : Symbol(undefinedNumber, Decl(objectSpreadStrictNull.ts, 6, 48))
 
     let undefinedWithOptionalContinues: { sn: string | number | boolean } = { ...definiteBoolean, ...undefinedString, ...optionalNumber };
 >undefinedWithOptionalContinues : Symbol(undefinedWithOptionalContinues, Decl(objectSpreadStrictNull.ts, 18, 7))
 >sn : Symbol(sn, Decl(objectSpreadStrictNull.ts, 18, 41))
+>definiteBoolean : Symbol(definiteBoolean, Decl(objectSpreadStrictNull.ts, 1, 11))
+>undefinedString : Symbol(undefinedString, Decl(objectSpreadStrictNull.ts, 5, 36))
+>optionalNumber : Symbol(optionalNumber, Decl(objectSpreadStrictNull.ts, 4, 36))
 }
 
diff --git a/tests/baselines/reference/objectSpreadStrictNull.types b/tests/baselines/reference/objectSpreadStrictNull.types
index a91295b2bca..c9ed742c6b6 100644
--- a/tests/baselines/reference/objectSpreadStrictNull.types
+++ b/tests/baselines/reference/objectSpreadStrictNull.types
@@ -32,57 +32,57 @@ function f(
 >optionalUnionStops : { sn: string | number; }
 >sn : string | number
 >{ ...definiteBoolean, ...definiteString, ...optionalNumber } : { sn: string | number; }
->definiteBoolean : any
->definiteString : any
->optionalNumber : any
+>definiteBoolean : { sn: boolean; }
+>definiteString : { sn: string; }
+>optionalNumber : { sn?: number | undefined; }
 
     let optionalUnionDuplicates: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...optionalString, ...optionalNumber };
 >optionalUnionDuplicates : { sn: string | number; }
 >sn : string | number
 >{ ...definiteBoolean, ...definiteString, ...optionalString, ...optionalNumber } : { sn: string | number; }
->definiteBoolean : any
->definiteString : any
->optionalString : any
->optionalNumber : any
+>definiteBoolean : { sn: boolean; }
+>definiteString : { sn: string; }
+>optionalString : { sn?: string | undefined; }
+>optionalNumber : { sn?: number | undefined; }
 
     let allOptional: { sn?: string | number } = { ...optionalString, ...optionalNumber };
 >allOptional : { sn?: string | number | undefined; }
 >sn : string | number | undefined
 >{ ...optionalString, ...optionalNumber } : { sn?: string | number | undefined; }
->optionalString : any
->optionalNumber : any
+>optionalString : { sn?: string | undefined; }
+>optionalNumber : { sn?: number | undefined; }
 
     // undefined
     let undefinedUnionStops: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...undefinedNumber };
 >undefinedUnionStops : { sn: string | number; }
 >sn : string | number
 >{ ...definiteBoolean, ...definiteString, ...undefinedNumber } : { sn: string | number; }
->definiteBoolean : any
->definiteString : any
->undefinedNumber : any
+>definiteBoolean : { sn: boolean; }
+>definiteString : { sn: string; }
+>undefinedNumber : { sn: number | undefined; }
 
     let undefinedUnionDuplicates: { sn: string | number } = { ...definiteBoolean, ...definiteString, ...undefinedString, ...undefinedNumber };
 >undefinedUnionDuplicates : { sn: string | number; }
 >sn : string | number
 >{ ...definiteBoolean, ...definiteString, ...undefinedString, ...undefinedNumber } : { sn: string | number; }
->definiteBoolean : any
->definiteString : any
->undefinedString : any
->undefinedNumber : any
+>definiteBoolean : { sn: boolean; }
+>definiteString : { sn: string; }
+>undefinedString : { sn: string | undefined; }
+>undefinedNumber : { sn: number | undefined; }
 
     let allUndefined: { sn: string | number | undefined } = { ...undefinedString, ...undefinedNumber };
 >allUndefined : { sn: string | number | undefined; }
 >sn : string | number | undefined
 >{ ...undefinedString, ...undefinedNumber } : { sn: string | number | undefined; }
->undefinedString : any
->undefinedNumber : any
+>undefinedString : { sn: string | undefined; }
+>undefinedNumber : { sn: number | undefined; }
 
     let undefinedWithOptionalContinues: { sn: string | number | boolean } = { ...definiteBoolean, ...undefinedString, ...optionalNumber };
 >undefinedWithOptionalContinues : { sn: string | number | boolean; }
 >sn : string | number | boolean
 >{ ...definiteBoolean, ...undefinedString, ...optionalNumber } : { sn: string | number | boolean; }
->definiteBoolean : any
->undefinedString : any
->optionalNumber : any
+>definiteBoolean : { sn: boolean; }
+>undefinedString : { sn: string | undefined; }
+>optionalNumber : { sn?: number | undefined; }
 }
 

From 60d5195112ee7ab80ba01a3fbd874b7566158c01 Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Mon, 14 Nov 2016 16:56:59 -0800
Subject: [PATCH 233/421] Update baselines, fix assignment check for object
 rest.

---
 Jakefile.js                                   |  2 +-
 src/compiler/checker.ts                       |  6 ++--
 src/compiler/diagnosticMessages.json          |  2 +-
 src/compiler/factory.ts                       | 28 ++++++-------------
 src/compiler/transformers/destructuring.ts    |  4 +++
 src/compiler/types.ts                         |  2 +-
 src/compiler/utilities.ts                     | 23 ---------------
 src/harness/runner.ts                         |  4 +++
 .../reference/objectRestAssignment.js         |  6 ++--
 .../reference/objectRestNegative.errors.txt   |  4 +--
 .../baselines/reference/objectRestNegative.js |  2 +-
 11 files changed, 27 insertions(+), 56 deletions(-)

diff --git a/Jakefile.js b/Jakefile.js
index 2e5d660c4f1..132a99e5087 100644
--- a/Jakefile.js
+++ b/Jakefile.js
@@ -640,7 +640,7 @@ task("importDefinitelyTypedTests", [importDefinitelyTypedTestsJs], function () {
 
 // Local target to build the compiler and services
 var tscFile = path.join(builtLocalDirectory, compilerFilename);
-compileFile(tscFile, compilerSources, [builtLocalDirectory, copyright].concat(compilerSources), [copyright], /*useBuiltCompiler:*/ false);
+compileFile(tscFile, compilerSources, [builtLocalDirectory, copyright].concat(compilerSources), [copyright], /*useBuiltCompiler:*/ false, { noMapRoot: true });
 
 var servicesFile = path.join(builtLocalDirectory, "typescriptServices.js");
 var servicesFileInBrowserTest = path.join(builtLocalDirectory, "typescriptServicesInBrowserTest.js");
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 396715bfa45..730a435e67f 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -3081,7 +3081,7 @@ namespace ts {
                     }
                     const literalMembers: PropertyName[] = [];
                     for (const element of pattern.elements) {
-                        if (element.kind !== SyntaxKind.OmittedExpression && !(element as BindingElement).dotDotDotToken) {
+                        if (!(element as BindingElement).dotDotDotToken) {
                             literalMembers.push(element.propertyName || element.name as Identifier);
                         }
                     }
@@ -14199,9 +14199,7 @@ namespace ts {
                 }
             }
             else if (property.kind === SyntaxKind.SpreadAssignment) {
-                if (property.expression.kind !== SyntaxKind.Identifier) {
-                    error(property.expression, Diagnostics.An_object_rest_element_must_be_an_identifier);
-                }
+                checkReferenceExpression(property.expression, Diagnostics.The_target_of_an_object_rest_assignment_must_be_a_variable_or_a_property_access);
             }
             else {
                 error(property, Diagnostics.Property_assignment_expected);
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index be33335021b..a163a3bb641 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -1991,7 +1991,7 @@
         "category": "Error",
         "code": 2700
     },
-    "An object rest element must be an identifier.": {
+    "The target of an object rest assignment must be a variable or a property access.": {
         "category": "Error",
         "code": 2701
     },
diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index c107263b9d8..d690eb84c78 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -3284,9 +3284,9 @@ namespace ts {
             return bindingElement.right;
         }
 
-        if (isSpreadExpression(bindingElement) && isBindingOrAssignmentElement(bindingElement.expression)) {
+        if (isSpreadExpression(bindingElement)) {
             // Recovery consistent with existing emit.
-            return getInitializerOfBindingOrAssignmentElement(bindingElement.expression);
+            return getInitializerOfBindingOrAssignmentElement(<BindingOrAssignmentElement>bindingElement.expression);
         }
     }
 
@@ -3327,9 +3327,7 @@ namespace ts {
                     // `b.c` in `({ a: b.c = 1 } = ...)`
                     // `b[0]` in `({ a: b[0] } = ...)`
                     // `b[0]` in `({ a: b[0] = 1 } = ...)`
-                    return isBindingOrAssignmentElement(bindingElement.initializer)
-                        ? getTargetOfBindingOrAssignmentElement(bindingElement.initializer)
-                        : undefined;
+                    return getTargetOfBindingOrAssignmentElement(<BindingOrAssignmentElement>bindingElement.initializer);
 
                 case SyntaxKind.ShorthandPropertyAssignment:
                     // `a` in `({ a } = ...)`
@@ -3338,9 +3336,7 @@ namespace ts {
 
                 case SyntaxKind.SpreadAssignment:
                     // `a` in `({ ...a } = ...)`
-                    return isBindingOrAssignmentElement(bindingElement.expression)
-                        ? getTargetOfBindingOrAssignmentElement(bindingElement.expression)
-                        : undefined;
+                    return getTargetOfBindingOrAssignmentElement(<BindingOrAssignmentElement>bindingElement.expression);
             }
 
             // no target
@@ -3353,16 +3349,12 @@ namespace ts {
             // `[a]` in `[[a] = 1] = ...`
             // `a.b` in `[a.b = 1] = ...`
             // `a[0]` in `[a[0] = 1] = ...`
-            return isBindingOrAssignmentElement(bindingElement.left)
-                ? getTargetOfBindingOrAssignmentElement(bindingElement.left)
-                : undefined;
+            return getTargetOfBindingOrAssignmentElement(<BindingOrAssignmentElement>bindingElement.left);
         }
 
         if (isSpreadExpression(bindingElement)) {
             // `a` in `[...a] = ...`
-            return isBindingOrAssignmentElement(bindingElement.expression)
-                ? getTargetOfBindingOrAssignmentElement(bindingElement.expression)
-                : undefined;
+            return getTargetOfBindingOrAssignmentElement(<BindingOrAssignmentElement>bindingElement.expression);
         }
 
         // `a` in `[a] = ...`
@@ -3442,18 +3434,14 @@ namespace ts {
             case SyntaxKind.ArrayLiteralExpression:
                 // `a` in `{a}`
                 // `a` in `[a]`
-                return map(name.elements, convertToBindingOrAssignmentElement);
+                return <BindingOrAssignmentElement[]>name.elements;
 
             case SyntaxKind.ObjectLiteralExpression:
                 // `a` in `{a}`
-                return filter(name.properties, isBindingOrAssignmentElement);
+                return <BindingOrAssignmentElement[]>name.properties;
         }
     }
 
-    function convertToBindingOrAssignmentElement(node: Node) {
-        return isBindingOrAssignmentElement(node) ? node : createOmittedExpression(node);
-    }
-
     export function convertToArrayAssignmentElement(element: BindingOrAssignmentElement) {
         if (isBindingElement(element)) {
             if (element.dotDotDotToken) {
diff --git a/src/compiler/transformers/destructuring.ts b/src/compiler/transformers/destructuring.ts
index b8da29ae291..433305ca6b2 100644
--- a/src/compiler/transformers/destructuring.ts
+++ b/src/compiler/transformers/destructuring.ts
@@ -292,6 +292,10 @@ namespace ts {
                 // can perform the ObjectRest destructuring in a different declaration
                 if (element.transformFlags & TransformFlags.ContainsObjectRest) {
                     const temp = createTempVariable(/*recordTempVariable*/ undefined);
+                    if (!host.recordTempVariablesInLine) {
+                        host.context.hoistVariableDeclaration(temp);
+                    }
+
                     restContainingElements = append(restContainingElements, <[Identifier, BindingOrAssignmentElement]>[temp, element]);
                     bindingElements = append(bindingElements, host.createArrayBindingOrAssignmentElement(temp));
                 }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 52b8eeb0fd3..8a6e74030d5 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -734,7 +734,7 @@ namespace ts {
         elements: NodeArray<ArrayBindingElement>;
     }
 
-    export type BindingPattern = (ObjectBindingPattern | ArrayBindingPattern) & { elements: NodeArray<ArrayBindingElement>; };
+    export type BindingPattern = ObjectBindingPattern | ArrayBindingPattern;
 
     export type ArrayBindingElement = BindingElement | OmittedExpression;
 
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 52efb88f8c5..317cad49def 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -3975,29 +3975,6 @@ namespace ts {
         return false;
     }
 
-    /**
-     * Determines whether a node is a BindingOrAssignmentElement
-     */
-    export function isBindingOrAssignmentElement(node: Node): node is BindingOrAssignmentElement {
-        switch (node.kind) {
-            case SyntaxKind.VariableDeclaration:
-            case SyntaxKind.Parameter:
-            case SyntaxKind.BindingElement:
-            case SyntaxKind.PropertyAssignment:
-            case SyntaxKind.ShorthandPropertyAssignment:
-            case SyntaxKind.SpreadAssignment:
-            case SyntaxKind.OmittedExpression:
-            case SyntaxKind.ArrayLiteralExpression:
-            case SyntaxKind.ObjectLiteralExpression:
-            case SyntaxKind.PropertyAccessExpression:
-            case SyntaxKind.ElementAccessExpression:
-            case SyntaxKind.Identifier:
-            case SyntaxKind.SpreadElement:
-                return true;
-        }
-        return isAssignmentExpression(node, /*excludeCompoundAssignment*/ true);
-    }
-
     /**
      * Determines whether a node is a BindingOrAssignmentPattern
      */
diff --git a/src/harness/runner.ts b/src/harness/runner.ts
index 3db1da627bc..3ad6269e52f 100644
--- a/src/harness/runner.ts
+++ b/src/harness/runner.ts
@@ -61,6 +61,10 @@ function createRunner(kind: TestRunnerKind): RunnerBase {
     }
 }
 
+if (Harness.IO.tryEnableSourceMapsForHost && /^development$/i.test(Harness.IO.getEnvironmentVariable("NODE_ENV"))) {
+    Harness.IO.tryEnableSourceMapsForHost();
+}
+
 // users can define tests to run in mytest.config that will override cmd line args, otherwise use cmd line args (test.config), otherwise no options
 
 const mytestconfigFileName = "mytest.config";
diff --git a/tests/baselines/reference/objectRestAssignment.js b/tests/baselines/reference/objectRestAssignment.js
index d4d266d3fe5..50d38c178a9 100644
--- a/tests/baselines/reference/objectRestAssignment.js
+++ b/tests/baselines/reference/objectRestAssignment.js
@@ -30,6 +30,6 @@ let complex;
 // should be:
 let overEmit;
 // var _g = overEmit.a, [_h, ...y] = _g, nested2 = __rest(_h, []), _j = overEmit.b, { z } = _j, c = __rest(_j, ["z"]), rest2 = __rest(overEmit, ["a", "b"]);
-var _b = overEmit.a, [_c, ...y] = _b, nested2 = __rest(_c, []), _d = overEmit.b, { z } = _d, c = __rest(_d, ["z"]), rest2 = __rest(overEmit, ["a", "b"]);
-(_e = overEmit.a, [_f, ...y] = _e, nested2 = __rest(_f, []), _g = overEmit.b, { z } = _g, c = __rest(_g, ["z"]), rest2 = __rest(overEmit, ["a", "b"]));
-var _a, _e, _g;
+var [_b, ...y] = overEmit.a, nested2 = __rest(_b, []), _c = overEmit.b, { z } = _c, c = __rest(_c, ["z"]), rest2 = __rest(overEmit, ["a", "b"]);
+([_d, ...y] = overEmit.a, nested2 = __rest(_d, []), _e = overEmit.b, { z } = _e, c = __rest(_e, ["z"]), rest2 = __rest(overEmit, ["a", "b"]));
+var _a, _d, _e;
diff --git a/tests/baselines/reference/objectRestNegative.errors.txt b/tests/baselines/reference/objectRestNegative.errors.txt
index b8144e3209b..793a7d31fc8 100644
--- a/tests/baselines/reference/objectRestNegative.errors.txt
+++ b/tests/baselines/reference/objectRestNegative.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/conformance/types/rest/objectRestNegative.ts(2,10): error TS2462: A rest element must be last in a destructuring pattern
 tests/cases/conformance/types/rest/objectRestNegative.ts(3,31): error TS2462: A rest element must be last in a destructuring pattern
 tests/cases/conformance/types/rest/objectRestNegative.ts(6,17): error TS2700: Rest types may only be created from object types.
-tests/cases/conformance/types/rest/objectRestNegative.ts(11,9): error TS2701: An object rest element must be an identifier.
+tests/cases/conformance/types/rest/objectRestNegative.ts(11,9): error TS2701: The target of an object rest assignment must be a variable or a property access.
 
 
 ==== tests/cases/conformance/types/rest/objectRestNegative.ts (4 errors) ====
@@ -23,5 +23,5 @@ tests/cases/conformance/types/rest/objectRestNegative.ts(11,9): error TS2701: An
     let rest: { b: string }
     ({a, ...rest.b + rest.b} = o);
             ~~~~~~~~~~~~~~~
-!!! error TS2701: An object rest element must be an identifier.
+!!! error TS2701: The target of an object rest assignment must be a variable or a property access.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/objectRestNegative.js b/tests/baselines/reference/objectRestNegative.js
index 76e3cd765db..c9f0dba32c1 100644
--- a/tests/baselines/reference/objectRestNegative.js
+++ b/tests/baselines/reference/objectRestNegative.js
@@ -29,4 +29,4 @@ function generic(t) {
     return rest;
 }
 var rest;
-(a = o.a, o, o);
+(a = o.a, o, rest.b + rest.b = __rest(o, ["a"]));

From cbdde421e63ce508b1a258ac8fe35d350f5218c8 Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Mon, 14 Nov 2016 17:06:10 -0800
Subject: [PATCH 234/421] Moved the parenthesizing functions to make the diff
 easier to read

---
 src/compiler/factory.ts | 804 ++++++++++++++++++++--------------------
 1 file changed, 401 insertions(+), 403 deletions(-)

diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index d690eb84c78..919864628da 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -2424,6 +2424,407 @@ namespace ts {
         return node;
     }
 
+    /**
+     * Wraps the operand to a BinaryExpression in parentheses if they are needed to preserve the intended
+     * order of operations.
+     *
+     * @param binaryOperator The operator for the BinaryExpression.
+     * @param operand The operand for the BinaryExpression.
+     * @param isLeftSideOfBinary A value indicating whether the operand is the left side of the
+     *                           BinaryExpression.
+     */
+    export function parenthesizeBinaryOperand(binaryOperator: SyntaxKind, operand: Expression, isLeftSideOfBinary: boolean, leftOperand?: Expression) {
+        const skipped = skipPartiallyEmittedExpressions(operand);
+
+        // If the resulting expression is already parenthesized, we do not need to do any further processing.
+        if (skipped.kind === SyntaxKind.ParenthesizedExpression) {
+            return operand;
+        }
+
+        return binaryOperandNeedsParentheses(binaryOperator, operand, isLeftSideOfBinary, leftOperand)
+            ? createParen(operand)
+            : operand;
+    }
+
+    /**
+     * Determines whether the operand to a BinaryExpression needs to be parenthesized.
+     *
+     * @param binaryOperator The operator for the BinaryExpression.
+     * @param operand The operand for the BinaryExpression.
+     * @param isLeftSideOfBinary A value indicating whether the operand is the left side of the
+     *                           BinaryExpression.
+     */
+    function binaryOperandNeedsParentheses(binaryOperator: SyntaxKind, operand: Expression, isLeftSideOfBinary: boolean, leftOperand: Expression) {
+        // If the operand has lower precedence, then it needs to be parenthesized to preserve the
+        // intent of the expression. For example, if the operand is `a + b` and the operator is
+        // `*`, then we need to parenthesize the operand to preserve the intended order of
+        // operations: `(a + b) * x`.
+        //
+        // If the operand has higher precedence, then it does not need to be parenthesized. For
+        // example, if the operand is `a * b` and the operator is `+`, then we do not need to
+        // parenthesize to preserve the intended order of operations: `a * b + x`.
+        //
+        // If the operand has the same precedence, then we need to check the associativity of
+        // the operator based on whether this is the left or right operand of the expression.
+        //
+        // For example, if `a / d` is on the right of operator `*`, we need to parenthesize
+        // to preserve the intended order of operations: `x * (a / d)`
+        //
+        // If `a ** d` is on the left of operator `**`, we need to parenthesize to preserve
+        // the intended order of operations: `(a ** b) ** c`
+        const binaryOperatorPrecedence = getOperatorPrecedence(SyntaxKind.BinaryExpression, binaryOperator);
+        const binaryOperatorAssociativity = getOperatorAssociativity(SyntaxKind.BinaryExpression, binaryOperator);
+        const emittedOperand = skipPartiallyEmittedExpressions(operand);
+        const operandPrecedence = getExpressionPrecedence(emittedOperand);
+        switch (compareValues(operandPrecedence, binaryOperatorPrecedence)) {
+            case Comparison.LessThan:
+                // If the operand is the right side of a right-associative binary operation
+                // and is a yield expression, then we do not need parentheses.
+                if (!isLeftSideOfBinary
+                    && binaryOperatorAssociativity === Associativity.Right
+                    && operand.kind === SyntaxKind.YieldExpression) {
+                    return false;
+                }
+
+                return true;
+
+            case Comparison.GreaterThan:
+                return false;
+
+            case Comparison.EqualTo:
+                if (isLeftSideOfBinary) {
+                    // No need to parenthesize the left operand when the binary operator is
+                    // left associative:
+                    //  (a*b)/x    ->  a*b/x
+                    //  (a**b)/x   ->  a**b/x
+                    //
+                    // Parentheses are needed for the left operand when the binary operator is
+                    // right associative:
+                    //  (a/b)**x   ->  (a/b)**x
+                    //  (a**b)**x  ->  (a**b)**x
+                    return binaryOperatorAssociativity === Associativity.Right;
+                }
+                else {
+                    if (isBinaryExpression(emittedOperand)
+                        && emittedOperand.operatorToken.kind === binaryOperator) {
+                        // No need to parenthesize the right operand when the binary operator and
+                        // operand are the same and one of the following:
+                        //  x*(a*b)     => x*a*b
+                        //  x|(a|b)     => x|a|b
+                        //  x&(a&b)     => x&a&b
+                        //  x^(a^b)     => x^a^b
+                        if (operatorHasAssociativeProperty(binaryOperator)) {
+                            return false;
+                        }
+
+                        // No need to parenthesize the right operand when the binary operator
+                        // is plus (+) if both the left and right operands consist solely of either
+                        // literals of the same kind or binary plus (+) expressions for literals of
+                        // the same kind (recursively).
+                        //  "a"+(1+2)       => "a"+(1+2)
+                        //  "a"+("b"+"c")   => "a"+"b"+"c"
+                        if (binaryOperator === SyntaxKind.PlusToken) {
+                            const leftKind = leftOperand ? getLiteralKindOfBinaryPlusOperand(leftOperand) : SyntaxKind.Unknown;
+                            if (isLiteralKind(leftKind) && leftKind === getLiteralKindOfBinaryPlusOperand(emittedOperand)) {
+                                return false;
+                            }
+                        }
+                    }
+
+                    // No need to parenthesize the right operand when the operand is right
+                    // associative:
+                    //  x/(a**b)    -> x/a**b
+                    //  x**(a**b)   -> x**a**b
+                    //
+                    // Parentheses are needed for the right operand when the operand is left
+                    // associative:
+                    //  x/(a*b)     -> x/(a*b)
+                    //  x**(a/b)    -> x**(a/b)
+                    const operandAssociativity = getExpressionAssociativity(emittedOperand);
+                    return operandAssociativity === Associativity.Left;
+                }
+        }
+    }
+
+    /**
+     * Determines whether a binary operator is mathematically associative.
+     *
+     * @param binaryOperator The binary operator.
+     */
+    function operatorHasAssociativeProperty(binaryOperator: SyntaxKind) {
+        // The following operators are associative in JavaScript:
+        //  (a*b)*c     -> a*(b*c)  -> a*b*c
+        //  (a|b)|c     -> a|(b|c)  -> a|b|c
+        //  (a&b)&c     -> a&(b&c)  -> a&b&c
+        //  (a^b)^c     -> a^(b^c)  -> a^b^c
+        //
+        // While addition is associative in mathematics, JavaScript's `+` is not
+        // guaranteed to be associative as it is overloaded with string concatenation.
+        return binaryOperator === SyntaxKind.AsteriskToken
+            || binaryOperator === SyntaxKind.BarToken
+            || binaryOperator === SyntaxKind.AmpersandToken
+            || binaryOperator === SyntaxKind.CaretToken;
+    }
+
+    interface BinaryPlusExpression extends BinaryExpression {
+        cachedLiteralKind: SyntaxKind;
+    }
+
+    /**
+     * This function determines whether an expression consists of a homogeneous set of
+     * literal expressions or binary plus expressions that all share the same literal kind.
+     * It is used to determine whether the right-hand operand of a binary plus expression can be
+     * emitted without parentheses.
+     */
+    function getLiteralKindOfBinaryPlusOperand(node: Expression): SyntaxKind {
+        node = skipPartiallyEmittedExpressions(node);
+
+        if (isLiteralKind(node.kind)) {
+            return node.kind;
+        }
+
+        if (node.kind === SyntaxKind.BinaryExpression && (<BinaryExpression>node).operatorToken.kind === SyntaxKind.PlusToken) {
+            if ((<BinaryPlusExpression>node).cachedLiteralKind !== undefined) {
+                return (<BinaryPlusExpression>node).cachedLiteralKind;
+            }
+
+            const leftKind = getLiteralKindOfBinaryPlusOperand((<BinaryExpression>node).left);
+            const literalKind = isLiteralKind(leftKind)
+                && leftKind === getLiteralKindOfBinaryPlusOperand((<BinaryExpression>node).right)
+                    ? leftKind
+                    : SyntaxKind.Unknown;
+
+            (<BinaryPlusExpression>node).cachedLiteralKind = literalKind;
+            return literalKind;
+        }
+
+        return SyntaxKind.Unknown;
+    }
+
+    /**
+     * Wraps an expression in parentheses if it is needed in order to use the expression
+     * as the expression of a NewExpression node.
+     *
+     * @param expression The Expression node.
+     */
+    export function parenthesizeForNew(expression: Expression): LeftHandSideExpression {
+        const emittedExpression = skipPartiallyEmittedExpressions(expression);
+        switch (emittedExpression.kind) {
+            case SyntaxKind.CallExpression:
+                return createParen(expression);
+
+            case SyntaxKind.NewExpression:
+                return (<NewExpression>emittedExpression).arguments
+                    ? <LeftHandSideExpression>expression
+                    : createParen(expression);
+        }
+
+        return parenthesizeForAccess(expression);
+    }
+
+    /**
+     * Wraps an expression in parentheses if it is needed in order to use the expression for
+     * property or element access.
+     *
+     * @param expr The expression node.
+     */
+    export function parenthesizeForAccess(expression: Expression): LeftHandSideExpression {
+        // isLeftHandSideExpression is almost the correct criterion for when it is not necessary
+        // to parenthesize the expression before a dot. The known exceptions are:
+        //
+        //    NewExpression:
+        //       new C.x        -> not the same as (new C).x
+        //    NumericLiteral
+        //       1.x            -> not the same as (1).x
+        //
+        const emittedExpression = skipPartiallyEmittedExpressions(expression);
+        if (isLeftHandSideExpression(emittedExpression)
+            && (emittedExpression.kind !== SyntaxKind.NewExpression || (<NewExpression>emittedExpression).arguments)
+            && emittedExpression.kind !== SyntaxKind.NumericLiteral) {
+            return <LeftHandSideExpression>expression;
+        }
+
+        return createParen(expression, /*location*/ expression);
+    }
+
+    export function parenthesizePostfixOperand(operand: Expression) {
+        return isLeftHandSideExpression(operand)
+            ? <LeftHandSideExpression>operand
+            : createParen(operand, /*location*/ operand);
+    }
+
+    export function parenthesizePrefixOperand(operand: Expression) {
+        return isUnaryExpression(operand)
+            ? <UnaryExpression>operand
+            : createParen(operand, /*location*/ operand);
+    }
+
+    function parenthesizeListElements(elements: NodeArray<Expression>) {
+        let result: Expression[];
+        for (let i = 0; i < elements.length; i++) {
+            const element = parenthesizeExpressionForList(elements[i]);
+            if (result !== undefined || element !== elements[i]) {
+                if (result === undefined) {
+                    result = elements.slice(0, i);
+                }
+
+                result.push(element);
+            }
+        }
+
+        if (result !== undefined) {
+            return createNodeArray(result, elements, elements.hasTrailingComma);
+        }
+
+        return elements;
+    }
+
+    export function parenthesizeExpressionForList(expression: Expression) {
+        const emittedExpression = skipPartiallyEmittedExpressions(expression);
+        const expressionPrecedence = getExpressionPrecedence(emittedExpression);
+        const commaPrecedence = getOperatorPrecedence(SyntaxKind.BinaryExpression, SyntaxKind.CommaToken);
+        return expressionPrecedence > commaPrecedence
+            ? expression
+            : createParen(expression, /*location*/ expression);
+    }
+
+    export function parenthesizeExpressionForExpressionStatement(expression: Expression) {
+        const emittedExpression = skipPartiallyEmittedExpressions(expression);
+        if (isCallExpression(emittedExpression)) {
+            const callee = emittedExpression.expression;
+            const kind = skipPartiallyEmittedExpressions(callee).kind;
+            if (kind === SyntaxKind.FunctionExpression || kind === SyntaxKind.ArrowFunction) {
+                const mutableCall = getMutableClone(emittedExpression);
+                mutableCall.expression = createParen(callee, /*location*/ callee);
+                return recreatePartiallyEmittedExpressions(expression, mutableCall);
+            }
+        }
+        else {
+            const leftmostExpressionKind = getLeftmostExpression(emittedExpression).kind;
+            if (leftmostExpressionKind === SyntaxKind.ObjectLiteralExpression || leftmostExpressionKind === SyntaxKind.FunctionExpression) {
+                return createParen(expression, /*location*/ expression);
+            }
+        }
+
+        return expression;
+    }
+
+    /**
+     * Clones a series of not-emitted expressions with a new inner expression.
+     *
+     * @param originalOuterExpression The original outer expression.
+     * @param newInnerExpression The new inner expression.
+     */
+    function recreatePartiallyEmittedExpressions(originalOuterExpression: Expression, newInnerExpression: Expression) {
+        if (isPartiallyEmittedExpression(originalOuterExpression)) {
+            const clone = getMutableClone(originalOuterExpression);
+            clone.expression = recreatePartiallyEmittedExpressions(clone.expression, newInnerExpression);
+            return clone;
+        }
+
+        return newInnerExpression;
+    }
+
+    function getLeftmostExpression(node: Expression): Expression {
+        while (true) {
+            switch (node.kind) {
+                case SyntaxKind.PostfixUnaryExpression:
+                    node = (<PostfixUnaryExpression>node).operand;
+                    continue;
+
+                case SyntaxKind.BinaryExpression:
+                    node = (<BinaryExpression>node).left;
+                    continue;
+
+                case SyntaxKind.ConditionalExpression:
+                    node = (<ConditionalExpression>node).condition;
+                    continue;
+
+                case SyntaxKind.CallExpression:
+                case SyntaxKind.ElementAccessExpression:
+                case SyntaxKind.PropertyAccessExpression:
+                    node = (<CallExpression | PropertyAccessExpression | ElementAccessExpression>node).expression;
+                    continue;
+
+                case SyntaxKind.PartiallyEmittedExpression:
+                    node = (<PartiallyEmittedExpression>node).expression;
+                    continue;
+            }
+
+            return node;
+        }
+    }
+
+    export function parenthesizeConciseBody(body: ConciseBody): ConciseBody {
+        const emittedBody = skipPartiallyEmittedExpressions(body);
+        if (emittedBody.kind === SyntaxKind.ObjectLiteralExpression) {
+            return createParen(<Expression>body, /*location*/ body);
+        }
+
+        return body;
+    }
+
+    export const enum OuterExpressionKinds {
+        Parentheses = 1 << 0,
+        Assertions = 1 << 1,
+        PartiallyEmittedExpressions = 1 << 2,
+
+        All = Parentheses | Assertions | PartiallyEmittedExpressions
+    }
+
+    export function skipOuterExpressions(node: Expression, kinds?: OuterExpressionKinds): Expression;
+    export function skipOuterExpressions(node: Node, kinds?: OuterExpressionKinds): Node;
+    export function skipOuterExpressions(node: Node, kinds = OuterExpressionKinds.All) {
+        let previousNode: Node;
+        do {
+            previousNode = node;
+            if (kinds & OuterExpressionKinds.Parentheses) {
+                node = skipParentheses(node);
+            }
+
+            if (kinds & OuterExpressionKinds.Assertions) {
+                node = skipAssertions(node);
+            }
+
+            if (kinds & OuterExpressionKinds.PartiallyEmittedExpressions) {
+                node = skipPartiallyEmittedExpressions(node);
+            }
+        }
+        while (previousNode !== node);
+
+        return node;
+    }
+
+    export function skipParentheses(node: Expression): Expression;
+    export function skipParentheses(node: Node): Node;
+    export function skipParentheses(node: Node): Node {
+        while (node.kind === SyntaxKind.ParenthesizedExpression) {
+            node = (<ParenthesizedExpression>node).expression;
+        }
+
+        return node;
+    }
+
+    export function skipAssertions(node: Expression): Expression;
+    export function skipAssertions(node: Node): Node;
+    export function skipAssertions(node: Node): Node {
+        while (isAssertionExpression(node)) {
+            node = (<AssertionExpression>node).expression;
+        }
+
+        return node;
+    }
+
+    export function skipPartiallyEmittedExpressions(node: Expression): Expression;
+    export function skipPartiallyEmittedExpressions(node: Node): Node;
+    export function skipPartiallyEmittedExpressions(node: Node) {
+        while (node.kind === SyntaxKind.PartiallyEmittedExpression) {
+            node = (<PartiallyEmittedExpression>node).expression;
+        }
+
+        return node;
+    }
+
     export function startOnNewLine<T extends Node>(node: T): T {
         node.startsOnNewLine = true;
         return node;
@@ -3508,407 +3909,4 @@ namespace ts {
         Debug.assertNode(node, isExpression);
         return <Expression>node;
     }
-
-    // Parenthesizing
-
-    /**
-     * Wraps the operand to a BinaryExpression in parentheses if they are needed to preserve the intended
-     * order of operations.
-     *
-     * @param binaryOperator The operator for the BinaryExpression.
-     * @param operand The operand for the BinaryExpression.
-     * @param isLeftSideOfBinary A value indicating whether the operand is the left side of the
-     *                           BinaryExpression.
-     */
-    export function parenthesizeBinaryOperand(binaryOperator: SyntaxKind, operand: Expression, isLeftSideOfBinary: boolean, leftOperand?: Expression) {
-        const skipped = skipPartiallyEmittedExpressions(operand);
-
-        // If the resulting expression is already parenthesized, we do not need to do any further processing.
-        if (skipped.kind === SyntaxKind.ParenthesizedExpression) {
-            return operand;
-        }
-
-        return binaryOperandNeedsParentheses(binaryOperator, operand, isLeftSideOfBinary, leftOperand)
-            ? createParen(operand)
-            : operand;
-    }
-
-    /**
-     * Determines whether the operand to a BinaryExpression needs to be parenthesized.
-     *
-     * @param binaryOperator The operator for the BinaryExpression.
-     * @param operand The operand for the BinaryExpression.
-     * @param isLeftSideOfBinary A value indicating whether the operand is the left side of the
-     *                           BinaryExpression.
-     */
-    function binaryOperandNeedsParentheses(binaryOperator: SyntaxKind, operand: Expression, isLeftSideOfBinary: boolean, leftOperand: Expression) {
-        // If the operand has lower precedence, then it needs to be parenthesized to preserve the
-        // intent of the expression. For example, if the operand is `a + b` and the operator is
-        // `*`, then we need to parenthesize the operand to preserve the intended order of
-        // operations: `(a + b) * x`.
-        //
-        // If the operand has higher precedence, then it does not need to be parenthesized. For
-        // example, if the operand is `a * b` and the operator is `+`, then we do not need to
-        // parenthesize to preserve the intended order of operations: `a * b + x`.
-        //
-        // If the operand has the same precedence, then we need to check the associativity of
-        // the operator based on whether this is the left or right operand of the expression.
-        //
-        // For example, if `a / d` is on the right of operator `*`, we need to parenthesize
-        // to preserve the intended order of operations: `x * (a / d)`
-        //
-        // If `a ** d` is on the left of operator `**`, we need to parenthesize to preserve
-        // the intended order of operations: `(a ** b) ** c`
-        const binaryOperatorPrecedence = getOperatorPrecedence(SyntaxKind.BinaryExpression, binaryOperator);
-        const binaryOperatorAssociativity = getOperatorAssociativity(SyntaxKind.BinaryExpression, binaryOperator);
-        const emittedOperand = skipPartiallyEmittedExpressions(operand);
-        const operandPrecedence = getExpressionPrecedence(emittedOperand);
-        switch (compareValues(operandPrecedence, binaryOperatorPrecedence)) {
-            case Comparison.LessThan:
-                // If the operand is the right side of a right-associative binary operation
-                // and is a yield expression, then we do not need parentheses.
-                if (!isLeftSideOfBinary
-                    && binaryOperatorAssociativity === Associativity.Right
-                    && operand.kind === SyntaxKind.YieldExpression) {
-                    return false;
-                }
-
-                return true;
-
-            case Comparison.GreaterThan:
-                return false;
-
-            case Comparison.EqualTo:
-                if (isLeftSideOfBinary) {
-                    // No need to parenthesize the left operand when the binary operator is
-                    // left associative:
-                    //  (a*b)/x    ->  a*b/x
-                    //  (a**b)/x   ->  a**b/x
-                    //
-                    // Parentheses are needed for the left operand when the binary operator is
-                    // right associative:
-                    //  (a/b)**x   ->  (a/b)**x
-                    //  (a**b)**x  ->  (a**b)**x
-                    return binaryOperatorAssociativity === Associativity.Right;
-                }
-                else {
-                    if (isBinaryExpression(emittedOperand)
-                        && emittedOperand.operatorToken.kind === binaryOperator) {
-                        // No need to parenthesize the right operand when the binary operator and
-                        // operand are the same and one of the following:
-                        //  x*(a*b)     => x*a*b
-                        //  x|(a|b)     => x|a|b
-                        //  x&(a&b)     => x&a&b
-                        //  x^(a^b)     => x^a^b
-                        if (operatorHasAssociativeProperty(binaryOperator)) {
-                            return false;
-                        }
-
-                        // No need to parenthesize the right operand when the binary operator
-                        // is plus (+) if both the left and right operands consist solely of either
-                        // literals of the same kind or binary plus (+) expressions for literals of
-                        // the same kind (recursively).
-                        //  "a"+(1+2)       => "a"+(1+2)
-                        //  "a"+("b"+"c")   => "a"+"b"+"c"
-                        if (binaryOperator === SyntaxKind.PlusToken) {
-                            const leftKind = leftOperand ? getLiteralKindOfBinaryPlusOperand(leftOperand) : SyntaxKind.Unknown;
-                            if (isLiteralKind(leftKind) && leftKind === getLiteralKindOfBinaryPlusOperand(emittedOperand)) {
-                                return false;
-                            }
-                        }
-                    }
-
-                    // No need to parenthesize the right operand when the operand is right
-                    // associative:
-                    //  x/(a**b)    -> x/a**b
-                    //  x**(a**b)   -> x**a**b
-                    //
-                    // Parentheses are needed for the right operand when the operand is left
-                    // associative:
-                    //  x/(a*b)     -> x/(a*b)
-                    //  x**(a/b)    -> x**(a/b)
-                    const operandAssociativity = getExpressionAssociativity(emittedOperand);
-                    return operandAssociativity === Associativity.Left;
-                }
-        }
-    }
-
-    /**
-     * Determines whether a binary operator is mathematically associative.
-     *
-     * @param binaryOperator The binary operator.
-     */
-    function operatorHasAssociativeProperty(binaryOperator: SyntaxKind) {
-        // The following operators are associative in JavaScript:
-        //  (a*b)*c     -> a*(b*c)  -> a*b*c
-        //  (a|b)|c     -> a|(b|c)  -> a|b|c
-        //  (a&b)&c     -> a&(b&c)  -> a&b&c
-        //  (a^b)^c     -> a^(b^c)  -> a^b^c
-        //
-        // While addition is associative in mathematics, JavaScript's `+` is not
-        // guaranteed to be associative as it is overloaded with string concatenation.
-        return binaryOperator === SyntaxKind.AsteriskToken
-            || binaryOperator === SyntaxKind.BarToken
-            || binaryOperator === SyntaxKind.AmpersandToken
-            || binaryOperator === SyntaxKind.CaretToken;
-    }
-
-    interface BinaryPlusExpression extends BinaryExpression {
-        cachedLiteralKind: SyntaxKind;
-    }
-
-    /**
-     * This function determines whether an expression consists of a homogeneous set of
-     * literal expressions or binary plus expressions that all share the same literal kind.
-     * It is used to determine whether the right-hand operand of a binary plus expression can be
-     * emitted without parentheses.
-     */
-    function getLiteralKindOfBinaryPlusOperand(node: Expression): SyntaxKind {
-        node = skipPartiallyEmittedExpressions(node);
-
-        if (isLiteralKind(node.kind)) {
-            return node.kind;
-        }
-
-        if (node.kind === SyntaxKind.BinaryExpression && (<BinaryExpression>node).operatorToken.kind === SyntaxKind.PlusToken) {
-            if ((<BinaryPlusExpression>node).cachedLiteralKind !== undefined) {
-                return (<BinaryPlusExpression>node).cachedLiteralKind;
-            }
-
-            const leftKind = getLiteralKindOfBinaryPlusOperand((<BinaryExpression>node).left);
-            const literalKind = isLiteralKind(leftKind)
-                && leftKind === getLiteralKindOfBinaryPlusOperand((<BinaryExpression>node).right)
-                    ? leftKind
-                    : SyntaxKind.Unknown;
-
-            (<BinaryPlusExpression>node).cachedLiteralKind = literalKind;
-            return literalKind;
-        }
-
-        return SyntaxKind.Unknown;
-    }
-
-    /**
-     * Wraps an expression in parentheses if it is needed in order to use the expression
-     * as the expression of a NewExpression node.
-     *
-     * @param expression The Expression node.
-     */
-    export function parenthesizeForNew(expression: Expression): LeftHandSideExpression {
-        const emittedExpression = skipPartiallyEmittedExpressions(expression);
-        switch (emittedExpression.kind) {
-            case SyntaxKind.CallExpression:
-                return createParen(expression);
-
-            case SyntaxKind.NewExpression:
-                return (<NewExpression>emittedExpression).arguments
-                    ? <LeftHandSideExpression>expression
-                    : createParen(expression);
-        }
-
-        return parenthesizeForAccess(expression);
-    }
-
-    /**
-     * Wraps an expression in parentheses if it is needed in order to use the expression for
-     * property or element access.
-     *
-     * @param expr The expression node.
-     */
-    export function parenthesizeForAccess(expression: Expression): LeftHandSideExpression {
-        // isLeftHandSideExpression is almost the correct criterion for when it is not necessary
-        // to parenthesize the expression before a dot. The known exceptions are:
-        //
-        //    NewExpression:
-        //       new C.x        -> not the same as (new C).x
-        //    NumericLiteral
-        //       1.x            -> not the same as (1).x
-        //
-        const emittedExpression = skipPartiallyEmittedExpressions(expression);
-        if (isLeftHandSideExpression(emittedExpression)
-            && (emittedExpression.kind !== SyntaxKind.NewExpression || (<NewExpression>emittedExpression).arguments)
-            && emittedExpression.kind !== SyntaxKind.NumericLiteral) {
-            return <LeftHandSideExpression>expression;
-        }
-
-        return createParen(expression, /*location*/ expression);
-    }
-
-    export function parenthesizePostfixOperand(operand: Expression) {
-        return isLeftHandSideExpression(operand)
-            ? <LeftHandSideExpression>operand
-            : createParen(operand, /*location*/ operand);
-    }
-
-    export function parenthesizePrefixOperand(operand: Expression) {
-        return isUnaryExpression(operand)
-            ? <UnaryExpression>operand
-            : createParen(operand, /*location*/ operand);
-    }
-
-    function parenthesizeListElements(elements: NodeArray<Expression>) {
-        let result: Expression[];
-        for (let i = 0; i < elements.length; i++) {
-            const element = parenthesizeExpressionForList(elements[i]);
-            if (result !== undefined || element !== elements[i]) {
-                if (result === undefined) {
-                    result = elements.slice(0, i);
-                }
-
-                result.push(element);
-            }
-        }
-
-        if (result !== undefined) {
-            return createNodeArray(result, elements, elements.hasTrailingComma);
-        }
-
-        return elements;
-    }
-
-    export function parenthesizeExpressionForList(expression: Expression) {
-        const emittedExpression = skipPartiallyEmittedExpressions(expression);
-        const expressionPrecedence = getExpressionPrecedence(emittedExpression);
-        const commaPrecedence = getOperatorPrecedence(SyntaxKind.BinaryExpression, SyntaxKind.CommaToken);
-        return expressionPrecedence > commaPrecedence
-            ? expression
-            : createParen(expression, /*location*/ expression);
-    }
-
-    export function parenthesizeExpressionForExpressionStatement(expression: Expression) {
-        const emittedExpression = skipPartiallyEmittedExpressions(expression);
-        if (isCallExpression(emittedExpression)) {
-            const callee = emittedExpression.expression;
-            const kind = skipPartiallyEmittedExpressions(callee).kind;
-            if (kind === SyntaxKind.FunctionExpression || kind === SyntaxKind.ArrowFunction) {
-                const mutableCall = getMutableClone(emittedExpression);
-                mutableCall.expression = createParen(callee, /*location*/ callee);
-                return recreatePartiallyEmittedExpressions(expression, mutableCall);
-            }
-        }
-        else {
-            const leftmostExpressionKind = getLeftmostExpression(emittedExpression).kind;
-            if (leftmostExpressionKind === SyntaxKind.ObjectLiteralExpression || leftmostExpressionKind === SyntaxKind.FunctionExpression) {
-                return createParen(expression, /*location*/ expression);
-            }
-        }
-
-        return expression;
-    }
-
-    /**
-     * Clones a series of not-emitted expressions with a new inner expression.
-     *
-     * @param originalOuterExpression The original outer expression.
-     * @param newInnerExpression The new inner expression.
-     */
-    function recreatePartiallyEmittedExpressions(originalOuterExpression: Expression, newInnerExpression: Expression) {
-        if (isPartiallyEmittedExpression(originalOuterExpression)) {
-            const clone = getMutableClone(originalOuterExpression);
-            clone.expression = recreatePartiallyEmittedExpressions(clone.expression, newInnerExpression);
-            return clone;
-        }
-
-        return newInnerExpression;
-    }
-
-    function getLeftmostExpression(node: Expression): Expression {
-        while (true) {
-            switch (node.kind) {
-                case SyntaxKind.PostfixUnaryExpression:
-                    node = (<PostfixUnaryExpression>node).operand;
-                    continue;
-
-                case SyntaxKind.BinaryExpression:
-                    node = (<BinaryExpression>node).left;
-                    continue;
-
-                case SyntaxKind.ConditionalExpression:
-                    node = (<ConditionalExpression>node).condition;
-                    continue;
-
-                case SyntaxKind.CallExpression:
-                case SyntaxKind.ElementAccessExpression:
-                case SyntaxKind.PropertyAccessExpression:
-                    node = (<CallExpression | PropertyAccessExpression | ElementAccessExpression>node).expression;
-                    continue;
-
-                case SyntaxKind.PartiallyEmittedExpression:
-                    node = (<PartiallyEmittedExpression>node).expression;
-                    continue;
-            }
-
-            return node;
-        }
-    }
-
-    export function parenthesizeConciseBody(body: ConciseBody): ConciseBody {
-        const emittedBody = skipPartiallyEmittedExpressions(body);
-        if (emittedBody.kind === SyntaxKind.ObjectLiteralExpression) {
-            return createParen(<Expression>body, /*location*/ body);
-        }
-
-        return body;
-    }
-
-    export const enum OuterExpressionKinds {
-        Parentheses = 1 << 0,
-        Assertions = 1 << 1,
-        PartiallyEmittedExpressions = 1 << 2,
-
-        All = Parentheses | Assertions | PartiallyEmittedExpressions
-    }
-
-    export function skipOuterExpressions(node: Expression, kinds?: OuterExpressionKinds): Expression;
-    export function skipOuterExpressions(node: Node, kinds?: OuterExpressionKinds): Node;
-    export function skipOuterExpressions(node: Node, kinds = OuterExpressionKinds.All) {
-        let previousNode: Node;
-        do {
-            previousNode = node;
-            if (kinds & OuterExpressionKinds.Parentheses) {
-                node = skipParentheses(node);
-            }
-
-            if (kinds & OuterExpressionKinds.Assertions) {
-                node = skipAssertions(node);
-            }
-
-            if (kinds & OuterExpressionKinds.PartiallyEmittedExpressions) {
-                node = skipPartiallyEmittedExpressions(node);
-            }
-        }
-        while (previousNode !== node);
-
-        return node;
-    }
-
-    export function skipParentheses(node: Expression): Expression;
-    export function skipParentheses(node: Node): Node;
-    export function skipParentheses(node: Node): Node {
-        while (node.kind === SyntaxKind.ParenthesizedExpression) {
-            node = (<ParenthesizedExpression>node).expression;
-        }
-
-        return node;
-    }
-
-    export function skipAssertions(node: Expression): Expression;
-    export function skipAssertions(node: Node): Node;
-    export function skipAssertions(node: Node): Node {
-        while (isAssertionExpression(node)) {
-            node = (<AssertionExpression>node).expression;
-        }
-
-        return node;
-    }
-
-    export function skipPartiallyEmittedExpressions(node: Expression): Expression;
-    export function skipPartiallyEmittedExpressions(node: Node): Node;
-    export function skipPartiallyEmittedExpressions(node: Node) {
-        while (node.kind === SyntaxKind.PartiallyEmittedExpression) {
-            node = (<PartiallyEmittedExpression>node).expression;
-        }
-
-        return node;
-    }
 }

From 6d28595e5a2ef4a396f83ba92c3d6ac3eaace31e Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Mon, 14 Nov 2016 17:06:46 -0800
Subject: [PATCH 235/421] Add repro test

---
 .../compiler/typePredicateStructuralMatch.ts  | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 tests/cases/compiler/typePredicateStructuralMatch.ts

diff --git a/tests/cases/compiler/typePredicateStructuralMatch.ts b/tests/cases/compiler/typePredicateStructuralMatch.ts
new file mode 100644
index 00000000000..690e5f62b27
--- /dev/null
+++ b/tests/cases/compiler/typePredicateStructuralMatch.ts
@@ -0,0 +1,26 @@
+// Repro from #12235
+
+getResults1([]);
+getResults1({data: []});
+
+getResults2([]);
+getResults2({data: []});
+
+type Result = { value: string };
+type Results = Result[];
+
+function isResponseInData<T>(value: T | { data: T}): value is { data: T } {
+    return value.hasOwnProperty('data');
+}
+
+function getResults1(value: Results | { data: Results }): Results {
+    return isResponseInData(value) ? value.data : value;
+}
+
+function isPlainResponse<T>(value: T | { data: T}): value is T {
+    return !value.hasOwnProperty('data');
+}
+
+function getResults2(value: Results | { data: Results }): Results {
+    return isPlainResponse(value) ? value : value.data;
+}
\ No newline at end of file

From 2bcb6e9812659095d2a60cd53bb4a73f286ed74c Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Mon, 14 Nov 2016 17:06:57 -0800
Subject: [PATCH 236/421] Accept baselines

---
 .../typePredicateStructuralMatch.errors.txt   | 36 +++++++++++++++
 .../reference/typePredicateStructuralMatch.js | 46 +++++++++++++++++++
 2 files changed, 82 insertions(+)
 create mode 100644 tests/baselines/reference/typePredicateStructuralMatch.errors.txt
 create mode 100644 tests/baselines/reference/typePredicateStructuralMatch.js

diff --git a/tests/baselines/reference/typePredicateStructuralMatch.errors.txt b/tests/baselines/reference/typePredicateStructuralMatch.errors.txt
new file mode 100644
index 00000000000..72cf04ddeb0
--- /dev/null
+++ b/tests/baselines/reference/typePredicateStructuralMatch.errors.txt
@@ -0,0 +1,36 @@
+tests/cases/compiler/typePredicateStructuralMatch.ts(17,12): error TS2322: Type 'Result[] | { data: Result[]; }' is not assignable to type 'Result[]'.
+  Type '{ data: Result[]; }' is not assignable to type 'Result[]'.
+    Property 'length' is missing in type '{ data: Result[]; }'.
+
+
+==== tests/cases/compiler/typePredicateStructuralMatch.ts (1 errors) ====
+    // Repro from #12235
+    
+    getResults1([]);
+    getResults1({data: []});
+    
+    getResults2([]);
+    getResults2({data: []});
+    
+    type Result = { value: string };
+    type Results = Result[];
+    
+    function isResponseInData<T>(value: T | { data: T}): value is { data: T } {
+        return value.hasOwnProperty('data');
+    }
+    
+    function getResults1(value: Results | { data: Results }): Results {
+        return isResponseInData(value) ? value.data : value;
+               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2322: Type 'Result[] | { data: Result[]; }' is not assignable to type 'Result[]'.
+!!! error TS2322:   Type '{ data: Result[]; }' is not assignable to type 'Result[]'.
+!!! error TS2322:     Property 'length' is missing in type '{ data: Result[]; }'.
+    }
+    
+    function isPlainResponse<T>(value: T | { data: T}): value is T {
+        return !value.hasOwnProperty('data');
+    }
+    
+    function getResults2(value: Results | { data: Results }): Results {
+        return isPlainResponse(value) ? value : value.data;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/typePredicateStructuralMatch.js b/tests/baselines/reference/typePredicateStructuralMatch.js
new file mode 100644
index 00000000000..682fac5536e
--- /dev/null
+++ b/tests/baselines/reference/typePredicateStructuralMatch.js
@@ -0,0 +1,46 @@
+//// [typePredicateStructuralMatch.ts]
+// Repro from #12235
+
+getResults1([]);
+getResults1({data: []});
+
+getResults2([]);
+getResults2({data: []});
+
+type Result = { value: string };
+type Results = Result[];
+
+function isResponseInData<T>(value: T | { data: T}): value is { data: T } {
+    return value.hasOwnProperty('data');
+}
+
+function getResults1(value: Results | { data: Results }): Results {
+    return isResponseInData(value) ? value.data : value;
+}
+
+function isPlainResponse<T>(value: T | { data: T}): value is T {
+    return !value.hasOwnProperty('data');
+}
+
+function getResults2(value: Results | { data: Results }): Results {
+    return isPlainResponse(value) ? value : value.data;
+}
+
+//// [typePredicateStructuralMatch.js]
+// Repro from #12235
+getResults1([]);
+getResults1({ data: [] });
+getResults2([]);
+getResults2({ data: [] });
+function isResponseInData(value) {
+    return value.hasOwnProperty('data');
+}
+function getResults1(value) {
+    return isResponseInData(value) ? value.data : value;
+}
+function isPlainResponse(value) {
+    return !value.hasOwnProperty('data');
+}
+function getResults2(value) {
+    return isPlainResponse(value) ? value : value.data;
+}

From d2c0952801dcefec7becaeb7f6f7822617e3dae0 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Mon, 14 Nov 2016 17:13:49 -0800
Subject: [PATCH 237/421] Revert type predicates to not have instanceof special
 casing

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 396715bfa45..4df456bc411 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -9721,20 +9721,20 @@ namespace ts {
                 }
 
                 if (targetType) {
-                    return getNarrowedType(type, targetType, assumeTrue);
+                    return getNarrowedType(type, targetType, assumeTrue, isTypeInstanceOf);
                 }
 
                 return type;
             }
 
-            function getNarrowedType(type: Type, candidate: Type, assumeTrue: boolean) {
+            function getNarrowedType(type: Type, candidate: Type, assumeTrue: boolean, isRelated: (source: Type, target: Type) => boolean) {
                 if (!assumeTrue) {
-                    return filterType(type, t => !isTypeInstanceOf(t, candidate));
+                    return filterType(type, t => !isRelated(t, candidate));
                 }
                 // If the current type is a union type, remove all constituents that couldn't be instances of
                 // the candidate type. If one or more constituents remain, return a union of those.
                 if (type.flags & TypeFlags.Union) {
-                    const assignableType = filterType(type, t => isTypeInstanceOf(t, candidate));
+                    const assignableType = filterType(type, t => isRelated(t, candidate));
                     if (!(assignableType.flags & TypeFlags.Never)) {
                         return assignableType;
                     }
@@ -9770,7 +9770,7 @@ namespace ts {
                     const predicateArgument = callExpression.arguments[predicate.parameterIndex];
                     if (predicateArgument) {
                         if (isMatchingReference(reference, predicateArgument)) {
-                            return getNarrowedType(type, predicate.type, assumeTrue);
+                            return getNarrowedType(type, predicate.type, assumeTrue, isTypeSubtypeOf);
                         }
                         if (containsMatchingReference(reference, predicateArgument)) {
                             return declaredType;
@@ -9783,7 +9783,7 @@ namespace ts {
                         const accessExpression = invokedExpression as ElementAccessExpression | PropertyAccessExpression;
                         const possibleReference = skipParentheses(accessExpression.expression);
                         if (isMatchingReference(reference, possibleReference)) {
-                            return getNarrowedType(type, predicate.type, assumeTrue);
+                            return getNarrowedType(type, predicate.type, assumeTrue, isTypeSubtypeOf);
                         }
                         if (containsMatchingReference(reference, possibleReference)) {
                             return declaredType;

From b6b43610357ccefb797b6f500ca42680681c693c Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Mon, 14 Nov 2016 17:14:09 -0800
Subject: [PATCH 238/421] Accept new baselines

---
 .../controlFlowBinaryOrExpression.symbols     |  28 ++---
 .../controlFlowBinaryOrExpression.types       |   8 +-
 ...fWithStructurallyIdenticalTypes.errors.txt |  76 ++++++++++++
 .../typePredicateStructuralMatch.errors.txt   |  36 ------
 .../typePredicateStructuralMatch.symbols      |  91 +++++++++++++++
 .../typePredicateStructuralMatch.types        | 110 ++++++++++++++++++
 6 files changed, 295 insertions(+), 54 deletions(-)
 create mode 100644 tests/baselines/reference/instanceofWithStructurallyIdenticalTypes.errors.txt
 delete mode 100644 tests/baselines/reference/typePredicateStructuralMatch.errors.txt
 create mode 100644 tests/baselines/reference/typePredicateStructuralMatch.symbols
 create mode 100644 tests/baselines/reference/typePredicateStructuralMatch.types

diff --git a/tests/baselines/reference/controlFlowBinaryOrExpression.symbols b/tests/baselines/reference/controlFlowBinaryOrExpression.symbols
index 217e11dc95d..5251973005f 100644
--- a/tests/baselines/reference/controlFlowBinaryOrExpression.symbols
+++ b/tests/baselines/reference/controlFlowBinaryOrExpression.symbols
@@ -64,25 +64,13 @@ if (isNodeList(sourceObj)) {
 >sourceObj : Symbol(sourceObj, Decl(controlFlowBinaryOrExpression.ts, 23, 3))
 
     sourceObj.length;
->sourceObj.length : Symbol(NodeList.length, Decl(controlFlowBinaryOrExpression.ts, 10, 27))
+>sourceObj.length : Symbol(length, Decl(controlFlowBinaryOrExpression.ts, 10, 27), Decl(controlFlowBinaryOrExpression.ts, 14, 33))
 >sourceObj : Symbol(sourceObj, Decl(controlFlowBinaryOrExpression.ts, 23, 3))
->length : Symbol(NodeList.length, Decl(controlFlowBinaryOrExpression.ts, 10, 27))
+>length : Symbol(length, Decl(controlFlowBinaryOrExpression.ts, 10, 27), Decl(controlFlowBinaryOrExpression.ts, 14, 33))
 }
 
 if (isHTMLCollection(sourceObj)) {
 >isHTMLCollection : Symbol(isHTMLCollection, Decl(controlFlowBinaryOrExpression.ts, 18, 67))
->sourceObj : Symbol(sourceObj, Decl(controlFlowBinaryOrExpression.ts, 23, 3))
-
-    sourceObj.length;
->sourceObj.length : Symbol(HTMLCollection.length, Decl(controlFlowBinaryOrExpression.ts, 14, 33))
->sourceObj : Symbol(sourceObj, Decl(controlFlowBinaryOrExpression.ts, 23, 3))
->length : Symbol(HTMLCollection.length, Decl(controlFlowBinaryOrExpression.ts, 14, 33))
-}
-
-if (isNodeList(sourceObj) || isHTMLCollection(sourceObj)) {
->isNodeList : Symbol(isNodeList, Decl(controlFlowBinaryOrExpression.ts, 16, 1))
->sourceObj : Symbol(sourceObj, Decl(controlFlowBinaryOrExpression.ts, 23, 3))
->isHTMLCollection : Symbol(isHTMLCollection, Decl(controlFlowBinaryOrExpression.ts, 18, 67))
 >sourceObj : Symbol(sourceObj, Decl(controlFlowBinaryOrExpression.ts, 23, 3))
 
     sourceObj.length;
@@ -91,3 +79,15 @@ if (isNodeList(sourceObj) || isHTMLCollection(sourceObj)) {
 >length : Symbol(length, Decl(controlFlowBinaryOrExpression.ts, 10, 27), Decl(controlFlowBinaryOrExpression.ts, 14, 33))
 }
 
+if (isNodeList(sourceObj) || isHTMLCollection(sourceObj)) {
+>isNodeList : Symbol(isNodeList, Decl(controlFlowBinaryOrExpression.ts, 16, 1))
+>sourceObj : Symbol(sourceObj, Decl(controlFlowBinaryOrExpression.ts, 23, 3))
+>isHTMLCollection : Symbol(isHTMLCollection, Decl(controlFlowBinaryOrExpression.ts, 18, 67))
+>sourceObj : Symbol(sourceObj, Decl(controlFlowBinaryOrExpression.ts, 23, 3))
+
+    sourceObj.length;
+>sourceObj.length : Symbol(NodeList.length, Decl(controlFlowBinaryOrExpression.ts, 10, 27))
+>sourceObj : Symbol(sourceObj, Decl(controlFlowBinaryOrExpression.ts, 23, 3))
+>length : Symbol(NodeList.length, Decl(controlFlowBinaryOrExpression.ts, 10, 27))
+}
+
diff --git a/tests/baselines/reference/controlFlowBinaryOrExpression.types b/tests/baselines/reference/controlFlowBinaryOrExpression.types
index 3634a322396..e843844ebf1 100644
--- a/tests/baselines/reference/controlFlowBinaryOrExpression.types
+++ b/tests/baselines/reference/controlFlowBinaryOrExpression.types
@@ -80,7 +80,7 @@ if (isNodeList(sourceObj)) {
 
     sourceObj.length;
 >sourceObj.length : number
->sourceObj : NodeList
+>sourceObj : NodeList | HTMLCollection
 >length : number
 }
 
@@ -91,7 +91,7 @@ if (isHTMLCollection(sourceObj)) {
 
     sourceObj.length;
 >sourceObj.length : number
->sourceObj : HTMLCollection
+>sourceObj : NodeList | HTMLCollection
 >length : number
 }
 
@@ -102,11 +102,11 @@ if (isNodeList(sourceObj) || isHTMLCollection(sourceObj)) {
 >sourceObj : NodeList | HTMLCollection | { a: string; }
 >isHTMLCollection(sourceObj) : boolean
 >isHTMLCollection : (sourceObj: any) => sourceObj is HTMLCollection
->sourceObj : HTMLCollection | { a: string; }
+>sourceObj : { a: string; }
 
     sourceObj.length;
 >sourceObj.length : number
->sourceObj : NodeList | HTMLCollection
+>sourceObj : NodeList
 >length : number
 }
 
diff --git a/tests/baselines/reference/instanceofWithStructurallyIdenticalTypes.errors.txt b/tests/baselines/reference/instanceofWithStructurallyIdenticalTypes.errors.txt
new file mode 100644
index 00000000000..3f1e210d7b4
--- /dev/null
+++ b/tests/baselines/reference/instanceofWithStructurallyIdenticalTypes.errors.txt
@@ -0,0 +1,76 @@
+tests/cases/compiler/instanceofWithStructurallyIdenticalTypes.ts(32,18): error TS2339: Property 'item' does not exist on type 'never'.
+
+
+==== tests/cases/compiler/instanceofWithStructurallyIdenticalTypes.ts (1 errors) ====
+    // Repro from #7271
+    
+    class C1 { item: string }
+    class C2 { item: string[] }
+    class C3 { item: string }
+    
+    function foo1(x: C1 | C2 | C3): string {
+        if (x instanceof C1) {
+            return x.item;
+        }
+        else if (x instanceof C2) {
+            return x.item[0];
+        }
+        else if (x instanceof C3) {
+            return x.item;
+        }
+        return "error";
+    }
+    
+    function isC1(c: C1 | C2 | C3): c is C1 { return c instanceof C1 }
+    function isC2(c: C1 | C2 | C3): c is C2 { return c instanceof C2 }
+    function isC3(c: C1 | C2 | C3): c is C3 { return c instanceof C3 }
+    
+    function foo2(x: C1 | C2 | C3): string {
+        if (isC1(x)) {
+            return x.item;
+        }
+        else if (isC2(x)) {
+            return x.item[0];
+        }
+        else if (isC3(x)) {
+            return x.item;
+                     ~~~~
+!!! error TS2339: Property 'item' does not exist on type 'never'.
+        }
+        return "error";
+    }
+    
+    // More tests
+    
+    class A { a: string }
+    class A1 extends A { }
+    class A2 { a: string }
+    class B extends A { b: string }
+    
+    function goo(x: A) {
+        if (x instanceof A) {
+            x;  // A
+        }
+        else {
+            x;  // never
+        }
+        if (x instanceof A1) {
+            x;  // A1
+        }
+        else {
+            x;  // A
+        }
+        if (x instanceof A2) {
+            x;  // A2
+        }
+        else {
+            x;  // A
+        }
+        if (x instanceof B) {
+            x;  // B
+        }
+        else {
+            x;  // A
+        }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/typePredicateStructuralMatch.errors.txt b/tests/baselines/reference/typePredicateStructuralMatch.errors.txt
deleted file mode 100644
index 72cf04ddeb0..00000000000
--- a/tests/baselines/reference/typePredicateStructuralMatch.errors.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-tests/cases/compiler/typePredicateStructuralMatch.ts(17,12): error TS2322: Type 'Result[] | { data: Result[]; }' is not assignable to type 'Result[]'.
-  Type '{ data: Result[]; }' is not assignable to type 'Result[]'.
-    Property 'length' is missing in type '{ data: Result[]; }'.
-
-
-==== tests/cases/compiler/typePredicateStructuralMatch.ts (1 errors) ====
-    // Repro from #12235
-    
-    getResults1([]);
-    getResults1({data: []});
-    
-    getResults2([]);
-    getResults2({data: []});
-    
-    type Result = { value: string };
-    type Results = Result[];
-    
-    function isResponseInData<T>(value: T | { data: T}): value is { data: T } {
-        return value.hasOwnProperty('data');
-    }
-    
-    function getResults1(value: Results | { data: Results }): Results {
-        return isResponseInData(value) ? value.data : value;
-               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2322: Type 'Result[] | { data: Result[]; }' is not assignable to type 'Result[]'.
-!!! error TS2322:   Type '{ data: Result[]; }' is not assignable to type 'Result[]'.
-!!! error TS2322:     Property 'length' is missing in type '{ data: Result[]; }'.
-    }
-    
-    function isPlainResponse<T>(value: T | { data: T}): value is T {
-        return !value.hasOwnProperty('data');
-    }
-    
-    function getResults2(value: Results | { data: Results }): Results {
-        return isPlainResponse(value) ? value : value.data;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/typePredicateStructuralMatch.symbols b/tests/baselines/reference/typePredicateStructuralMatch.symbols
new file mode 100644
index 00000000000..59d548d4bfc
--- /dev/null
+++ b/tests/baselines/reference/typePredicateStructuralMatch.symbols
@@ -0,0 +1,91 @@
+=== tests/cases/compiler/typePredicateStructuralMatch.ts ===
+// Repro from #12235
+
+getResults1([]);
+>getResults1 : Symbol(getResults1, Decl(typePredicateStructuralMatch.ts, 13, 1))
+
+getResults1({data: []});
+>getResults1 : Symbol(getResults1, Decl(typePredicateStructuralMatch.ts, 13, 1))
+>data : Symbol(data, Decl(typePredicateStructuralMatch.ts, 3, 13))
+
+getResults2([]);
+>getResults2 : Symbol(getResults2, Decl(typePredicateStructuralMatch.ts, 21, 1))
+
+getResults2({data: []});
+>getResults2 : Symbol(getResults2, Decl(typePredicateStructuralMatch.ts, 21, 1))
+>data : Symbol(data, Decl(typePredicateStructuralMatch.ts, 6, 13))
+
+type Result = { value: string };
+>Result : Symbol(Result, Decl(typePredicateStructuralMatch.ts, 6, 24))
+>value : Symbol(value, Decl(typePredicateStructuralMatch.ts, 8, 15))
+
+type Results = Result[];
+>Results : Symbol(Results, Decl(typePredicateStructuralMatch.ts, 8, 32))
+>Result : Symbol(Result, Decl(typePredicateStructuralMatch.ts, 6, 24))
+
+function isResponseInData<T>(value: T | { data: T}): value is { data: T } {
+>isResponseInData : Symbol(isResponseInData, Decl(typePredicateStructuralMatch.ts, 9, 24))
+>T : Symbol(T, Decl(typePredicateStructuralMatch.ts, 11, 26))
+>value : Symbol(value, Decl(typePredicateStructuralMatch.ts, 11, 29))
+>T : Symbol(T, Decl(typePredicateStructuralMatch.ts, 11, 26))
+>data : Symbol(data, Decl(typePredicateStructuralMatch.ts, 11, 41))
+>T : Symbol(T, Decl(typePredicateStructuralMatch.ts, 11, 26))
+>value : Symbol(value, Decl(typePredicateStructuralMatch.ts, 11, 29))
+>data : Symbol(data, Decl(typePredicateStructuralMatch.ts, 11, 63))
+>T : Symbol(T, Decl(typePredicateStructuralMatch.ts, 11, 26))
+
+    return value.hasOwnProperty('data');
+>value.hasOwnProperty : Symbol(Object.hasOwnProperty, Decl(lib.d.ts, --, --))
+>value : Symbol(value, Decl(typePredicateStructuralMatch.ts, 11, 29))
+>hasOwnProperty : Symbol(Object.hasOwnProperty, Decl(lib.d.ts, --, --))
+}
+
+function getResults1(value: Results | { data: Results }): Results {
+>getResults1 : Symbol(getResults1, Decl(typePredicateStructuralMatch.ts, 13, 1))
+>value : Symbol(value, Decl(typePredicateStructuralMatch.ts, 15, 21))
+>Results : Symbol(Results, Decl(typePredicateStructuralMatch.ts, 8, 32))
+>data : Symbol(data, Decl(typePredicateStructuralMatch.ts, 15, 39))
+>Results : Symbol(Results, Decl(typePredicateStructuralMatch.ts, 8, 32))
+>Results : Symbol(Results, Decl(typePredicateStructuralMatch.ts, 8, 32))
+
+    return isResponseInData(value) ? value.data : value;
+>isResponseInData : Symbol(isResponseInData, Decl(typePredicateStructuralMatch.ts, 9, 24))
+>value : Symbol(value, Decl(typePredicateStructuralMatch.ts, 15, 21))
+>value.data : Symbol(data, Decl(typePredicateStructuralMatch.ts, 15, 39))
+>value : Symbol(value, Decl(typePredicateStructuralMatch.ts, 15, 21))
+>data : Symbol(data, Decl(typePredicateStructuralMatch.ts, 15, 39))
+>value : Symbol(value, Decl(typePredicateStructuralMatch.ts, 15, 21))
+}
+
+function isPlainResponse<T>(value: T | { data: T}): value is T {
+>isPlainResponse : Symbol(isPlainResponse, Decl(typePredicateStructuralMatch.ts, 17, 1))
+>T : Symbol(T, Decl(typePredicateStructuralMatch.ts, 19, 25))
+>value : Symbol(value, Decl(typePredicateStructuralMatch.ts, 19, 28))
+>T : Symbol(T, Decl(typePredicateStructuralMatch.ts, 19, 25))
+>data : Symbol(data, Decl(typePredicateStructuralMatch.ts, 19, 40))
+>T : Symbol(T, Decl(typePredicateStructuralMatch.ts, 19, 25))
+>value : Symbol(value, Decl(typePredicateStructuralMatch.ts, 19, 28))
+>T : Symbol(T, Decl(typePredicateStructuralMatch.ts, 19, 25))
+
+    return !value.hasOwnProperty('data');
+>value.hasOwnProperty : Symbol(Object.hasOwnProperty, Decl(lib.d.ts, --, --))
+>value : Symbol(value, Decl(typePredicateStructuralMatch.ts, 19, 28))
+>hasOwnProperty : Symbol(Object.hasOwnProperty, Decl(lib.d.ts, --, --))
+}
+
+function getResults2(value: Results | { data: Results }): Results {
+>getResults2 : Symbol(getResults2, Decl(typePredicateStructuralMatch.ts, 21, 1))
+>value : Symbol(value, Decl(typePredicateStructuralMatch.ts, 23, 21))
+>Results : Symbol(Results, Decl(typePredicateStructuralMatch.ts, 8, 32))
+>data : Symbol(data, Decl(typePredicateStructuralMatch.ts, 23, 39))
+>Results : Symbol(Results, Decl(typePredicateStructuralMatch.ts, 8, 32))
+>Results : Symbol(Results, Decl(typePredicateStructuralMatch.ts, 8, 32))
+
+    return isPlainResponse(value) ? value : value.data;
+>isPlainResponse : Symbol(isPlainResponse, Decl(typePredicateStructuralMatch.ts, 17, 1))
+>value : Symbol(value, Decl(typePredicateStructuralMatch.ts, 23, 21))
+>value : Symbol(value, Decl(typePredicateStructuralMatch.ts, 23, 21))
+>value.data : Symbol(data, Decl(typePredicateStructuralMatch.ts, 23, 39))
+>value : Symbol(value, Decl(typePredicateStructuralMatch.ts, 23, 21))
+>data : Symbol(data, Decl(typePredicateStructuralMatch.ts, 23, 39))
+}
diff --git a/tests/baselines/reference/typePredicateStructuralMatch.types b/tests/baselines/reference/typePredicateStructuralMatch.types
new file mode 100644
index 00000000000..9f7a129da15
--- /dev/null
+++ b/tests/baselines/reference/typePredicateStructuralMatch.types
@@ -0,0 +1,110 @@
+=== tests/cases/compiler/typePredicateStructuralMatch.ts ===
+// Repro from #12235
+
+getResults1([]);
+>getResults1([]) : Result[]
+>getResults1 : (value: Result[] | { data: Result[]; }) => Result[]
+>[] : undefined[]
+
+getResults1({data: []});
+>getResults1({data: []}) : Result[]
+>getResults1 : (value: Result[] | { data: Result[]; }) => Result[]
+>{data: []} : { data: undefined[]; }
+>data : undefined[]
+>[] : undefined[]
+
+getResults2([]);
+>getResults2([]) : Result[]
+>getResults2 : (value: Result[] | { data: Result[]; }) => Result[]
+>[] : undefined[]
+
+getResults2({data: []});
+>getResults2({data: []}) : Result[]
+>getResults2 : (value: Result[] | { data: Result[]; }) => Result[]
+>{data: []} : { data: undefined[]; }
+>data : undefined[]
+>[] : undefined[]
+
+type Result = { value: string };
+>Result : Result
+>value : string
+
+type Results = Result[];
+>Results : Result[]
+>Result : Result
+
+function isResponseInData<T>(value: T | { data: T}): value is { data: T } {
+>isResponseInData : <T>(value: T | { data: T; }) => value is { data: T; }
+>T : T
+>value : T | { data: T; }
+>T : T
+>data : T
+>T : T
+>value : any
+>data : T
+>T : T
+
+    return value.hasOwnProperty('data');
+>value.hasOwnProperty('data') : boolean
+>value.hasOwnProperty : (v: string) => boolean
+>value : T | { data: T; }
+>hasOwnProperty : (v: string) => boolean
+>'data' : "data"
+}
+
+function getResults1(value: Results | { data: Results }): Results {
+>getResults1 : (value: Result[] | { data: Result[]; }) => Result[]
+>value : Result[] | { data: Result[]; }
+>Results : Result[]
+>data : Result[]
+>Results : Result[]
+>Results : Result[]
+
+    return isResponseInData(value) ? value.data : value;
+>isResponseInData(value) ? value.data : value : Result[]
+>isResponseInData(value) : boolean
+>isResponseInData : <T>(value: T | { data: T; }) => value is { data: T; }
+>value : Result[] | { data: Result[]; }
+>value.data : Result[]
+>value : { data: Result[]; }
+>data : Result[]
+>value : Result[]
+}
+
+function isPlainResponse<T>(value: T | { data: T}): value is T {
+>isPlainResponse : <T>(value: T | { data: T; }) => value is T
+>T : T
+>value : T | { data: T; }
+>T : T
+>data : T
+>T : T
+>value : any
+>T : T
+
+    return !value.hasOwnProperty('data');
+>!value.hasOwnProperty('data') : boolean
+>value.hasOwnProperty('data') : boolean
+>value.hasOwnProperty : (v: string) => boolean
+>value : T | { data: T; }
+>hasOwnProperty : (v: string) => boolean
+>'data' : "data"
+}
+
+function getResults2(value: Results | { data: Results }): Results {
+>getResults2 : (value: Result[] | { data: Result[]; }) => Result[]
+>value : Result[] | { data: Result[]; }
+>Results : Result[]
+>data : Result[]
+>Results : Result[]
+>Results : Result[]
+
+    return isPlainResponse(value) ? value : value.data;
+>isPlainResponse(value) ? value : value.data : Result[]
+>isPlainResponse(value) : boolean
+>isPlainResponse : <T>(value: T | { data: T; }) => value is T
+>value : Result[] | { data: Result[]; }
+>value : Result[]
+>value.data : Result[]
+>value : { data: Result[]; }
+>data : Result[]
+}

From ddcd22e4de4b604ee4ef532f48e3371fb4473352 Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Mon, 14 Nov 2016 18:30:42 -0800
Subject: [PATCH 239/421] Removed esnext dependency on
 convertForOf/transformFunctionBody in factory

---
 src/compiler/factory.ts                    |   4 +-
 src/compiler/transformers/destructuring.ts |  10 +-
 src/compiler/transformers/esnext.ts        | 305 +++++++++++++--------
 src/compiler/utilities.ts                  |   6 +
 4 files changed, 204 insertions(+), 121 deletions(-)

diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index 919864628da..5727081dc78 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -1528,6 +1528,8 @@ namespace ts {
         return <Expression>createBinary(left, SyntaxKind.LessThanToken, right, location);
     }
 
+    export function createAssignment(left: ObjectLiteralExpression | ArrayLiteralExpression, right: Expression, location?: TextRange): DestructuringAssignment;
+    export function createAssignment(left: Expression, right: Expression, location?: TextRange): BinaryExpression;
     export function createAssignment(left: Expression, right: Expression, location?: TextRange) {
         return createBinary(left, SyntaxKind.EqualsToken, right, location);
     }
@@ -2345,7 +2347,7 @@ namespace ts {
         if (isBlock(node)) {
             return node;
         }
-        return createBlock([createReturn(node, node)], node);
+        return createBlock([createReturn(node, node)], node, /*multiLine*/ true);
     }
 
     function isUseStrictPrologue(node: ExpressionStatement): boolean {
diff --git a/src/compiler/transformers/destructuring.ts b/src/compiler/transformers/destructuring.ts
index 433305ca6b2..30484ffaf5c 100644
--- a/src/compiler/transformers/destructuring.ts
+++ b/src/compiler/transformers/destructuring.ts
@@ -54,7 +54,7 @@ namespace ts {
             }
         }
 
-        const expressions: Expression[] = [];
+        let expressions: Expression[];
         const host: FlattenHost = {
             context,
             level,
@@ -92,17 +92,21 @@ namespace ts {
         flattenBindingOrAssignmentElement(host, node, value, location, /*skipInitializer*/ isDestructuringAssignment(node));
 
         if (value && needsValue) {
+            if (!some(expressions)) {
+                return value;
+            }
+
             expressions.push(value);
         }
 
-        return aggregateTransformFlags(inlineExpressions(expressions));
+        return aggregateTransformFlags(inlineExpressions(expressions)) || createOmittedExpression();
 
         function emitExpression(expression: Expression) {
             // NOTE: this completely disables source maps, but aligns with the behavior of
             //       `emitAssignment` in the old emitter.
             setEmitFlags(expression, EmitFlags.NoNestedSourceMaps);
             aggregateTransformFlags(expression);
-            expressions.push(expression);
+            expressions = append(expressions, expression);
         }
 
         function emitBindingOrAssignment(target: BindingOrAssignmentElementTarget, value: Expression, location: TextRange, original: Node) {
diff --git a/src/compiler/transformers/esnext.ts b/src/compiler/transformers/esnext.ts
index fb854318e69..85dd29d0725 100644
--- a/src/compiler/transformers/esnext.ts
+++ b/src/compiler/transformers/esnext.ts
@@ -4,6 +4,9 @@
 /*@internal*/
 namespace ts {
     export function transformESNext(context: TransformationContext) {
+        const {
+            endLexicalEnvironment
+        } = context;
         let currentSourceFile: SourceFile;
         return transformSourceFile;
 
@@ -37,6 +40,14 @@ namespace ts {
                 case SyntaxKind.ObjectBindingPattern:
                 case SyntaxKind.ArrayBindingPattern:
                     return node;
+                case SyntaxKind.Constructor:
+                    return visitConstructorDeclaration(node as ConstructorDeclaration);
+                case SyntaxKind.MethodDeclaration:
+                    return visitMethodDeclaration(node as MethodDeclaration);
+                case SyntaxKind.GetAccessor:
+                    return visitGetAccessorDeclaration(node as GetAccessorDeclaration);
+                case SyntaxKind.SetAccessor:
+                    return visitSetAccessorDeclaration(node as SetAccessorDeclaration);
                 case SyntaxKind.FunctionDeclaration:
                     return visitFunctionDeclaration(node as FunctionDeclaration);
                 case SyntaxKind.FunctionExpression:
@@ -134,7 +145,7 @@ namespace ts {
          * @param node A BinaryExpression node.
          */
         function visitBinaryExpression(node: BinaryExpression, needsDestructuringValue: boolean): Expression {
-            if (isDestructuringAssignment(node) && node.left.transformFlags & TransformFlags.ContainsESNext) {
+            if (isDestructuringAssignment(node) && node.left.transformFlags & TransformFlags.ContainsObjectRest) {
                 return flattenDestructuringAssignment(
                     context,
                     node,
@@ -144,7 +155,6 @@ namespace ts {
                     visitor
                 );
             }
-
             return visitEachChild(node, visitor, context);
         }
 
@@ -155,8 +165,15 @@ namespace ts {
          */
         function visitVariableDeclaration(node: VariableDeclaration): 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.AssertESNext) {
-                return flattenDestructuringBinding(context, node, /*boundValue*/ undefined, /*skipInitializer*/ false, /*recordTempVariablesInLine*/ true, FlattenLevel.ObjectRest, visitor);
+            if (isBindingPattern(node.name) && node.name.transformFlags & TransformFlags.ContainsObjectRest) {
+                return flattenDestructuringBinding(
+                    context,
+                    node,
+                    /*boundValue*/ undefined,
+                    /*skipInitializer*/ false,
+                    /*recordTempVariablesInLine*/ true,
+                    FlattenLevel.ObjectRest,
+                    visitor);
             }
             return visitEachChild(node, visitor, context);
         }
@@ -167,140 +184,194 @@ namespace ts {
          * @param node A ForOfStatement.
          */
         function visitForOfStatement(node: ForOfStatement): VisitResult<Statement> {
-            // The following ESNext code:
-            //
-            //    for (let { x, y, ...rest } of expr) { }
-            //
-            // should be emitted as
-            //
-            //    for (var _a of expr) {
-            //        let { x, y } = _a, rest = __rest(_a, ["x", "y"]);
-            //    }
-            //
-            // where _a is a temp emitted to capture the RHS.
-            // When the left hand side is an expression instead of a let declaration,
-            // the `let` before the `{ x, y }` is not emitted.
-            // When the left hand side is a let/const, the v is renamed if there is
-            // another v in scope.
-            // Note that all assignments to the LHS are emitted in the body, including
-            // all destructuring.
-            // Note also that because an extra statement is needed to assign to the LHS,
-            // for-of bodies are always emitted as blocks.
-
-            // for (<init> of <expression>) <statement>
-            // where <init> is [let] variabledeclarationlist | expression
-            const initializer = node.initializer;
-            if (!isRestBindingPattern(initializer) && !isRestAssignment(initializer)) {
-                return visitEachChild(node, visitor, context);
+            let leadingStatements: Statement[];
+            let temp: Identifier;
+            const initializer = skipParentheses(node.initializer);
+            if (initializer.transformFlags & TransformFlags.ContainsObjectRest) {
+                if (isVariableDeclarationList(initializer)) {
+                    temp = createTempVariable(/*recordTempVariable*/ undefined);
+                    const firstDeclaration = firstOrUndefined(initializer.declarations);
+                    const declarations = flattenDestructuringBinding(
+                        context,
+                        firstDeclaration,
+                        temp,
+                        /*skipInitializer*/ true,
+                        /*recordTempVariablesInLine*/ true,
+                        FlattenLevel.ObjectRest,
+                        visitor
+                    );
+                    if (some(declarations)) {
+                        const statement = createVariableStatement(
+                            /*modifiers*/ undefined,
+                            updateVariableDeclarationList(initializer, declarations),
+                            /*location*/ initializer
+                        );
+                        leadingStatements = append(leadingStatements, statement);
+                    }
+                }
+                else if (isAssignmentPattern(initializer)) {
+                    temp = createTempVariable(/*recordTempVariable*/ undefined);
+                    const expression = flattenDestructuringAssignment(
+                        context,
+                        aggregateTransformFlags(createAssignment(initializer, temp, /*location*/ node.initializer)),
+                        /*needsValue*/ false,
+                        FlattenLevel.ObjectRest,
+                        /*createAssignmentCallback*/ undefined,
+                        visitor
+                    );
+                    leadingStatements = append(leadingStatements, createStatement(expression, /*location*/ node.initializer));
+                }
             }
-
-            return convertForOf(node, undefined, visitor, noop, context, /*transformRest*/ true);
-        }
-
-        function isRestBindingPattern(initializer: ForInitializer) {
-            if (isVariableDeclarationList(initializer)) {
-                const declaration = firstOrUndefined(initializer.declarations);
-                return declaration && declaration.name &&
-                    declaration.name.kind === SyntaxKind.ObjectBindingPattern &&
-                    !!(declaration.name.transformFlags & TransformFlags.ContainsObjectRest);
+            if (temp) {
+                const expression = visitNode(node.expression, visitor, isExpression);
+                const statement = visitNode(node.statement, visitor, isStatement);
+                const block = isBlock(statement)
+                    ? updateBlock(statement, createNodeArray(concatenate(leadingStatements, statement.statements), statement.statements))
+                    : createBlock(append(leadingStatements, statement), statement, /*multiLine*/ true);
+                return updateForOf(
+                    node,
+                    createVariableDeclarationList(
+                        [
+                            createVariableDeclaration(temp, /*type*/ undefined, /*initializer*/ undefined, node.initializer)
+                        ],
+                        node.initializer,
+                        NodeFlags.Let
+                    ),
+                    expression,
+                    block
+                );
             }
-            return false;
-        }
-
-        function isRestAssignment(initializer: ForInitializer) {
-            return initializer.kind === SyntaxKind.ObjectLiteralExpression &&
-                initializer.transformFlags & TransformFlags.ContainsObjectRest;
+            return visitEachChild(node, visitor, context);
         }
 
         function visitParameter(node: ParameterDeclaration): ParameterDeclaration {
-            if (isObjectRestParameter(node)) {
+            if (node.transformFlags & TransformFlags.ContainsObjectRest) {
                 // Binding patterns are converted into a generated name and are
                 // evaluated inside the function body.
-                return setOriginalNode(
-                    createParameter(
-                        /*decorators*/ undefined,
-                        /*modifiers*/ undefined,
-                        /*dotDotDotToken*/ undefined,
-                        getGeneratedNameForNode(node),
-                        /*questionToken*/ undefined,
-                        /*type*/ undefined,
-                        node.initializer,
-                        /*location*/ node
-                    ),
-                    /*original*/ node
+                return updateParameter(
+                    node,
+                    /*decorators*/ undefined,
+                    /*modifiers*/ undefined,
+                    node.dotDotDotToken,
+                    getGeneratedNameForNode(node),
+                    /*type*/ undefined,
+                    visitNode(node.initializer, visitor, isExpression)
                 );
             }
-            else {
-                return node;
-            }
+            return visitEachChild(node, visitor, context);
         }
 
-        function isObjectRestParameter(node: ParameterDeclaration) {
-            return node.name &&
-                node.name.kind === SyntaxKind.ObjectBindingPattern &&
-                !!(node.name.transformFlags & TransformFlags.ContainsObjectRest);
+        function visitConstructorDeclaration(node: ConstructorDeclaration) {
+            return updateConstructor(
+                node,
+                /*decorators*/ undefined,
+                node.modifiers,
+                visitParameterList(node.parameters, visitor, context),
+                transformFunctionBody(node)
+            );
         }
 
-        function visitFunctionDeclaration(node: FunctionDeclaration): FunctionDeclaration {
-            const hasRest = forEach(node.parameters, isObjectRestParameter);
-            const body = hasRest ?
-                transformFunctionBody(node, visitor, currentSourceFile, context, noop, /*convertObjectRest*/ true) as Block :
-                visitEachChild(node.body, visitor, context);
+        function visitGetAccessorDeclaration(node: GetAccessorDeclaration) {
+            return updateGetAccessor(
+                node,
+                /*decorators*/ undefined,
+                node.modifiers,
+                visitNode(node.name, visitor, isPropertyName),
+                visitParameterList(node.parameters, visitor, context),
+                /*type*/ undefined,
+                transformFunctionBody(node)
+            );
+        }
 
-            return setOriginalNode(
-                createFunctionDeclaration(
-                    /*decorators*/ undefined,
-                    node.modifiers,
-                    node.asteriskToken,
-                    node.name,
-                    /*typeParameters*/ undefined,
-                    visitNodes(node.parameters, visitor, isParameter),
-                    /*type*/ undefined,
-                    body,
-                    /*location*/ node
-                ),
-                /*original*/ node);
+        function visitSetAccessorDeclaration(node: SetAccessorDeclaration) {
+            return updateSetAccessor(
+                node,
+                /*decorators*/ undefined,
+                node.modifiers,
+                visitNode(node.name, visitor, isPropertyName),
+                visitParameterList(node.parameters, visitor, context),
+                transformFunctionBody(node)
+            );
+        }
+
+        function visitMethodDeclaration(node: MethodDeclaration) {
+            return updateMethod(
+                node,
+                /*decorators*/ undefined,
+                node.modifiers,
+                visitNode(node.name, visitor, isPropertyName),
+                /*typeParameters*/ undefined,
+                visitParameterList(node.parameters, visitor, context),
+                /*type*/ undefined,
+                transformFunctionBody(node)
+            );
+        }
+
+        function visitFunctionDeclaration(node: FunctionDeclaration) {
+            return updateFunctionDeclaration(
+                node,
+                /*decorators*/ undefined,
+                node.modifiers,
+                node.name,
+                /*typeParameters*/ undefined,
+                visitParameterList(node.parameters, visitor, context),
+                /*type*/ undefined,
+                transformFunctionBody(node)
+            );
         }
 
         function visitArrowFunction(node: ArrowFunction) {
-            const hasRest = forEach(node.parameters, isObjectRestParameter);
-            const body = hasRest ?
-                transformFunctionBody(node, visitor, currentSourceFile, context, noop, /*convertObjectRest*/ true) as Block :
-                visitEachChild(node.body, visitor, context);
-            const func = setOriginalNode(
-                createArrowFunction(
-                    /*modifiers*/ undefined,
-                    /*typeParameters*/ undefined,
-                    visitNodes(node.parameters, visitor, isParameter),
-                    /*type*/ undefined,
-                    node.equalsGreaterThanToken,
-                    body,
-                    /*location*/ node
-                ),
-                /*original*/ node
+            return updateArrowFunction(
+                node,
+                node.modifiers,
+                /*typeParameters*/ undefined,
+                visitParameterList(node.parameters, visitor, context),
+                /*type*/ undefined,
+                transformFunctionBody(node)
             );
-            setEmitFlags(func, EmitFlags.CapturesThis);
-            return func;
         }
 
-        function visitFunctionExpression(node: FunctionExpression): Expression {
-            const hasRest = forEach(node.parameters, isObjectRestParameter);
-            const body = hasRest ?
-                transformFunctionBody(node, visitor, currentSourceFile, context, noop, /*convertObjectRest*/ true) as Block :
-                visitEachChild(node.body, visitor, context);
-            return setOriginalNode(
-                createFunctionExpression(
-                    /*modifiers*/ undefined,
-                    node.asteriskToken,
-                    name,
-                    /*typeParameters*/ undefined,
-                    visitNodes(node.parameters, visitor, isParameter),
-                    /*type*/ undefined,
-                    body,
-                    /*location*/ node
-                ),
-                /*original*/ node
+        function visitFunctionExpression(node: FunctionExpression) {
+            return updateFunctionExpression(
+                node,
+                node.modifiers,
+                node.name,
+                /*typeParameters*/ undefined,
+                visitParameterList(node.parameters, visitor, context),
+                /*type*/ undefined,
+                transformFunctionBody(node)
             );
         }
+
+        function transformFunctionBody(node: FunctionDeclaration | FunctionExpression | ConstructorDeclaration | MethodDeclaration | AccessorDeclaration): FunctionBody;
+        function transformFunctionBody(node: ArrowFunction): ConciseBody;
+        function transformFunctionBody(node: FunctionLikeDeclaration): ConciseBody {
+            let leadingStatements: Statement[];
+            for (const parameter of node.parameters) {
+                if (parameter.transformFlags & TransformFlags.ContainsObjectRest) {
+                    const temp = getGeneratedNameForNode(parameter);
+                    const declarations = flattenDestructuringBinding(context, parameter, temp, /*skipInitializer*/ true, /*recordTempVariablesInLine*/ true, FlattenLevel.ObjectRest, visitor);
+                    if (some(declarations)) {
+                        const statement = createVariableStatement(
+                            /*modifiers*/ undefined,
+                            createVariableDeclarationList(
+                                declarations
+                            )
+                        );
+                        setEmitFlags(statement, EmitFlags.CustomPrologue);
+                        leadingStatements = append(leadingStatements, statement);
+                    }
+                }
+            }
+
+            const body = visitNode(node.body, visitor, isConciseBody);
+            const trailingStatements = endLexicalEnvironment();
+            if (some(leadingStatements) || some(trailingStatements)) {
+                const block = convertToFunctionBody(body);
+                return updateBlock(block, createNodeArray(concatenate(concatenate(leadingStatements, block.statements), trailingStatements), block.statements));
+            }
+
+            return body;
+        }
     }
 }
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 317cad49def..dd2afc38cbf 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -3950,6 +3950,12 @@ namespace ts {
         return false;
     }
 
+    export function isAssignmentPattern(node: Node): node is AssignmentPattern {
+        const kind = node.kind;
+        return kind === SyntaxKind.ArrayLiteralExpression
+            || kind === SyntaxKind.ObjectLiteralExpression;
+    }
+
     export function isBindingElement(node: Node): node is BindingElement {
         return node.kind === SyntaxKind.BindingElement;
     }

From dff9849ac935c13f7cb184192ec40151a916c7f0 Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Mon, 14 Nov 2016 18:33:21 -0800
Subject: [PATCH 240/421] Make multiLine optional in convertToFunctionBody

---
 src/compiler/factory.ts             | 4 ++--
 src/compiler/transformers/esnext.ts | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index 5727081dc78..9c23cfd9b97 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -2343,11 +2343,11 @@ namespace ts {
         return qualifiedName;
     }
 
-    export function convertToFunctionBody(node: ConciseBody) {
+    export function convertToFunctionBody(node: ConciseBody, multiLine?: boolean) {
         if (isBlock(node)) {
             return node;
         }
-        return createBlock([createReturn(node, node)], node, /*multiLine*/ true);
+        return createBlock([createReturn(node, node)], node, multiLine);
     }
 
     function isUseStrictPrologue(node: ExpressionStatement): boolean {
diff --git a/src/compiler/transformers/esnext.ts b/src/compiler/transformers/esnext.ts
index 85dd29d0725..2a7fb855a92 100644
--- a/src/compiler/transformers/esnext.ts
+++ b/src/compiler/transformers/esnext.ts
@@ -363,14 +363,12 @@ namespace ts {
                     }
                 }
             }
-
             const body = visitNode(node.body, visitor, isConciseBody);
             const trailingStatements = endLexicalEnvironment();
             if (some(leadingStatements) || some(trailingStatements)) {
-                const block = convertToFunctionBody(body);
+                const block = convertToFunctionBody(body, /*multiLine*/ true);
                 return updateBlock(block, createNodeArray(concatenate(concatenate(leadingStatements, block.statements), trailingStatements), block.statements));
             }
-
             return body;
         }
     }

From b9fa06f90bfee906e998ec47da73139482e6b58e Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 15 Nov 2016 09:10:55 -0800
Subject: [PATCH 241/421] Address PR commennts

Update baselines with smaller emit as part of that.
---
 src/compiler/checker.ts                        |  3 +--
 src/compiler/emitter.ts                        |  2 +-
 src/compiler/transformers/destructuring.ts     | 18 +++++-------------
 tests/baselines/reference/objectRest.js        |  2 +-
 .../reference/objectRestAssignment.js          |  2 +-
 tests/baselines/reference/objectRestForOf.js   |  2 +-
 .../baselines/reference/objectRestNegative.js  |  2 +-
 .../baselines/reference/objectRestParameter.js |  2 +-
 8 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 039944bd6f0..a4d818b4ace 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -11193,9 +11193,8 @@ namespace ts {
             let hasComputedStringProperty = false;
             let hasComputedNumberProperty = false;
 
-            let i = 0;
             let offset = 0;
-            for (i = 0; i < node.properties.length; i++) {
+            for (let i = 0; i < node.properties.length; i++) {
                 const memberDecl = node.properties[i];
                 let member = memberDecl.symbol;
                 if (memberDecl.kind === SyntaxKind.PropertyAssignment ||
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 84d5462914c..d9ccc1e3c59 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -45,7 +45,7 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         const restHelper = `
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) === -1)
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
         t[p] = s[p];
     return t;
 };`;
diff --git a/src/compiler/transformers/destructuring.ts b/src/compiler/transformers/destructuring.ts
index 692d021eb5e..90729a59b43 100644
--- a/src/compiler/transformers/destructuring.ts
+++ b/src/compiler/transformers/destructuring.ts
@@ -326,7 +326,7 @@ namespace ts {
                         // Assignment for bindingTarget = value.propName should highlight whole property, hence use p as source map node
                         const propAccess = createDestructuringPropertyAccess(value, propName);
                         if (isComputedPropertyName(propName)) {
-                            (computedTempVariables = computedTempVariables || []).push((propAccess as ElementAccessExpression).argumentExpression);
+                            computedTempVariables = append(computedTempVariables, (propAccess as ElementAccessExpression).argumentExpression);
                         }
                         emitDestructuringAssignment(bindingTarget, propAccess, p);
                     }
@@ -428,18 +428,11 @@ namespace ts {
                 }
                 if (isComputedPropertyName(getPropertyName(element))) {
                     // get the temp name and put that in there instead, like `_tmp + ""`
-                    const stringifiedTemp = <StringLiteral>createSynthesizedNode(SyntaxKind.StringLiteral);
-                    stringifiedTemp.pos = location.pos;
-                    stringifiedTemp.end = location.end;
-                    stringifiedTemp.text = "";
-                    propertyNames.push(createBinary(computedTempVariables.shift(), SyntaxKind.PlusToken, stringifiedTemp));
+                    propertyNames.push(createBinary(computedTempVariables.shift(), SyntaxKind.PlusToken, createLiteral("")));
                 }
                 else {
-                    const str = <StringLiteral>createSynthesizedNode(SyntaxKind.StringLiteral);
-                    str.pos = location.pos;
-                    str.end = location.end;
-                    str.text = getTextOfPropertyName(getPropertyName(element));
-                    propertyNames.push(str);
+                    const propName = getTextOfPropertyName(getPropertyName(element));
+                    propertyNames.push(createLiteral(propName, location));
                 }
             }
             const args = createSynthesizedNodeArray([value, createArrayLiteral(propertyNames, location)]);
@@ -569,11 +562,10 @@ namespace ts {
                         bindingElements = [];
                     }
                     // Rewrite element to a declaration with an initializer that fetches property
-                    // TODO: Probably save the result of createDestructuringPropertyAccess if propName is a computed property
                     const propName = element.propertyName || <Identifier>element.name;
                     const propAccess = createDestructuringPropertyAccess(value, propName);
                     if (isComputedPropertyName(propName)) {
-                        (computedTempVariables = computedTempVariables || []).push((propAccess as ElementAccessExpression).argumentExpression);
+                        computedTempVariables = append(computedTempVariables, (propAccess as ElementAccessExpression).argumentExpression);
                     }
                     emitBindingElement(element, propAccess);
                 }
diff --git a/tests/baselines/reference/objectRest.js b/tests/baselines/reference/objectRest.js
index 2f18d23e9e5..46255b24d70 100644
--- a/tests/baselines/reference/objectRest.js
+++ b/tests/baselines/reference/objectRest.js
@@ -41,7 +41,7 @@ var { [computed]: stillNotGreat, [computed2]: soSo,  ...o } = o;
 //// [objectRest.js]
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) === -1)
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
         t[p] = s[p];
     return t;
 };
diff --git a/tests/baselines/reference/objectRestAssignment.js b/tests/baselines/reference/objectRestAssignment.js
index 51d9aea192f..ae908eaa662 100644
--- a/tests/baselines/reference/objectRestAssignment.js
+++ b/tests/baselines/reference/objectRestAssignment.js
@@ -17,7 +17,7 @@ var { a: [{ ...nested2 }, ...y], b: { z, ...c }, ...rest2 } = overEmit;
 //// [objectRestAssignment.js]
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) === -1)
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
         t[p] = s[p];
     return t;
 };
diff --git a/tests/baselines/reference/objectRestForOf.js b/tests/baselines/reference/objectRestForOf.js
index dacf4d28165..00c3f79f296 100644
--- a/tests/baselines/reference/objectRestForOf.js
+++ b/tests/baselines/reference/objectRestForOf.js
@@ -25,7 +25,7 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
 };
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) === -1)
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
         t[p] = s[p];
     return t;
 };
diff --git a/tests/baselines/reference/objectRestNegative.js b/tests/baselines/reference/objectRestNegative.js
index 57f7b2076a3..767e0a98448 100644
--- a/tests/baselines/reference/objectRestNegative.js
+++ b/tests/baselines/reference/objectRestNegative.js
@@ -15,7 +15,7 @@ let rest: { b: string }
 //// [objectRestNegative.js]
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) === -1)
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
         t[p] = s[p];
     return t;
 };
diff --git a/tests/baselines/reference/objectRestParameter.js b/tests/baselines/reference/objectRestParameter.js
index 3f2aad88e8d..f8a4f2955d3 100644
--- a/tests/baselines/reference/objectRestParameter.js
+++ b/tests/baselines/reference/objectRestParameter.js
@@ -11,7 +11,7 @@ suddenly(({ x: { z = 12, ...nested }, ...rest } = { x: { z: 1, ka: 1 }, y: 'noo'
 //// [objectRestParameter.js]
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) === -1)
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
         t[p] = s[p];
     return t;
 };

From b4d3bca32b59dbb4005f89154ba2a9654658a735 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 15 Nov 2016 09:50:29 -0800
Subject: [PATCH 242/421] Object rest emit for method and accessor parameters

I missed these before, so emit was incorrect for object rest in a method
or accessor parameter.
---
 src/compiler/binder.ts              | 10 ++++
 src/compiler/transformers/esnext.ts | 75 +++++++++++++++++++++++------
 2 files changed, 69 insertions(+), 16 deletions(-)

diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index 961ca205281..6b480699a55 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -2771,6 +2771,11 @@ namespace ts {
             transformFlags |= TransformFlags.AssertTypeScript;
         }
 
+        // a method declaration with object rest destructuring is ES Next syntax
+        if (subtreeFlags & TransformFlags.ContainsSpreadExpression) {
+            transformFlags |= TransformFlags.AssertESNext;
+        }
+
         // An async method declaration is ES2017 syntax.
         if (hasModifier(node, ModifierFlags.Async)) {
             transformFlags |= TransformFlags.AssertES2017;
@@ -2797,6 +2802,11 @@ namespace ts {
             transformFlags |= TransformFlags.AssertTypeScript;
         }
 
+        // a method declaration with object rest destructuring is ES Next syntax
+        if (subtreeFlags & TransformFlags.ContainsSpreadExpression) {
+            transformFlags |= TransformFlags.AssertESNext;
+        }
+
         node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
         return transformFlags & ~TransformFlags.MethodOrAccessorExcludes;
     }
diff --git a/src/compiler/transformers/esnext.ts b/src/compiler/transformers/esnext.ts
index 1fad209bdb3..0db09d79570 100644
--- a/src/compiler/transformers/esnext.ts
+++ b/src/compiler/transformers/esnext.ts
@@ -46,6 +46,11 @@ namespace ts {
                     return visitFunctionExpression(node as FunctionExpression);
                 case SyntaxKind.ArrowFunction:
                     return visitArrowFunction(node as ArrowFunction);
+                case SyntaxKind.MethodDeclaration:
+                    return visitMethodDeclaration(node as MethodDeclaration);
+                case SyntaxKind.GetAccessor:
+                case SyntaxKind.SetAccessor:
+                    return visitAccessorDeclaration(node as AccessorDeclaration);
                 case SyntaxKind.Parameter:
                     return visitParameter(node as ParameterDeclaration);
                 default:
@@ -208,11 +213,6 @@ namespace ts {
         }
 
         function visitFunctionDeclaration(node: FunctionDeclaration): FunctionDeclaration {
-            const hasRest = forEach(node.parameters, isObjectRestParameter);
-            const body = hasRest ?
-                transformFunctionBody(node, visitor, currentSourceFile, context, noop, /*convertObjectRest*/ true) as Block :
-                visitEachChild(node.body, visitor, context);
-
             return setOriginalNode(
                 createFunctionDeclaration(
                     /*decorators*/ undefined,
@@ -222,17 +222,13 @@ namespace ts {
                     /*typeParameters*/ undefined,
                     visitNodes(node.parameters, visitor, isParameter),
                     /*type*/ undefined,
-                    body,
+                    transformFunctionBodyIfNeeded(node),
                     /*location*/ node
                 ),
                 /*original*/ node);
         }
 
         function visitArrowFunction(node: ArrowFunction) {
-            const hasRest = forEach(node.parameters, isObjectRestParameter);
-            const body = hasRest ?
-                transformFunctionBody(node, visitor, currentSourceFile, context, noop, /*convertObjectRest*/ true) as Block :
-                visitEachChild(node.body, visitor, context);
             const func = setOriginalNode(
                 createArrowFunction(
                     /*modifiers*/ undefined,
@@ -240,7 +236,7 @@ namespace ts {
                     visitNodes(node.parameters, visitor, isParameter),
                     /*type*/ undefined,
                     node.equalsGreaterThanToken,
-                    body,
+                    transformFunctionBodyIfNeeded(node),
                     /*location*/ node
                 ),
                 /*original*/ node
@@ -250,10 +246,6 @@ namespace ts {
         }
 
         function visitFunctionExpression(node: FunctionExpression): Expression {
-            const hasRest = forEach(node.parameters, isObjectRestParameter);
-            const body = hasRest ?
-                transformFunctionBody(node, visitor, currentSourceFile, context, noop, /*convertObjectRest*/ true) as Block :
-                visitEachChild(node.body, visitor, context);
             return setOriginalNode(
                 createFunctionExpression(
                     /*modifiers*/ undefined,
@@ -262,11 +254,62 @@ namespace ts {
                     /*typeParameters*/ undefined,
                     visitNodes(node.parameters, visitor, isParameter),
                     /*type*/ undefined,
-                    body,
+                    transformFunctionBodyIfNeeded(node),
                     /*location*/ node
                 ),
                 /*original*/ node
             );
         }
+
+        function visitMethodDeclaration(node: MethodDeclaration): MethodDeclaration {
+            return setOriginalNode(
+                createMethod(
+                    /*decorators*/ undefined,
+                    node.modifiers,
+                    node.asteriskToken,
+                    node.name,
+                    /*typeParameters*/ undefined,
+                    visitNodes(node.parameters, visitor, isParameter),
+                    /*type*/ undefined,
+                    transformFunctionBodyIfNeeded(node),
+                    /*location*/ node
+                ),
+                /*original*/ node);
+        }
+
+        function visitAccessorDeclaration(node: AccessorDeclaration): AccessorDeclaration {
+            if (node.kind === SyntaxKind.GetAccessor) {
+                return setOriginalNode(
+                    createGetAccessor(
+                        /*decorators*/ undefined,
+                        node.modifiers,
+                        node.name,
+                        visitNodes(node.parameters, visitor, isParameter),
+                        /*type*/ undefined,
+                        transformFunctionBodyIfNeeded(node),
+                        /*location*/ node
+                    ),
+                    /*original*/ node);
+            }
+            else {
+                return setOriginalNode(
+                    createSetAccessor(
+                        /*decorators*/ undefined,
+                        node.modifiers,
+                        node.name,
+                        visitNodes(node.parameters, visitor, isParameter),
+                        transformFunctionBodyIfNeeded(node),
+                        /*location*/ node
+                    ),
+                    /*original*/ node);
+            }
+        }
+
+        function transformFunctionBodyIfNeeded(node: FunctionLikeDeclaration): Block {
+            const hasRest = forEach(node.parameters, isObjectRestParameter);
+            return hasRest ?
+                transformFunctionBody(node, visitor, currentSourceFile, context, noop, /*convertObjectRest*/ true) :
+                visitEachChild(node.body, visitor, context) as Block;
+        }
     }
 }

From 498d978c216701e25046da7b3e5eda13f55f4a6f Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 15 Nov 2016 09:55:56 -0800
Subject: [PATCH 243/421] Test object rest parameter emit: methods/accessors

---
 .../reference/objectRestParameter.js          | 19 +++++++++++++++
 .../reference/objectRestParameter.symbols     | 23 +++++++++++++++++++
 .../reference/objectRestParameter.types       | 23 +++++++++++++++++++
 .../types/rest/objectRestParameter.ts         |  9 ++++++++
 4 files changed, 74 insertions(+)

diff --git a/tests/baselines/reference/objectRestParameter.js b/tests/baselines/reference/objectRestParameter.js
index 49434f24eec..a05448a8be2 100644
--- a/tests/baselines/reference/objectRestParameter.js
+++ b/tests/baselines/reference/objectRestParameter.js
@@ -6,6 +6,15 @@ declare function suddenly(f: (a: { x: { z, ka }, y: string }) => void);
 suddenly(({ x: a, ...rest }) => rest.y);
 suddenly(({ x: { z = 12, ...nested }, ...rest } = { x: { z: 1, ka: 1 }, y: 'noo' }) => rest.y + nested.ka);
 
+class C {
+    m({ a, ...clone }: { a: number, b: string}): void {
+        // actually, never mind, don't clone
+    }
+    set p({ a, ...clone }: { a: number, b: string}) {
+        // actually, never mind, don't clone
+    }
+}
+
 
 
 //// [objectRestParameter.js]
@@ -26,3 +35,13 @@ suddenly((_a = { x: { z: 1, ka: 1 }, y: 'noo' }) => {
     var _b = _a.x, { z = 12 } = _b, nested = __rest(_b, ["z"]), rest = __rest(_a, ["x"]);
     return rest.y + nested.ka;
 });
+class C {
+    m(_a) {
+        var { a } = _a, clone = __rest(_a, ["a"]);
+        // actually, never mind, don't clone
+    }
+    set p(_a) {
+        var { a } = _a, clone = __rest(_a, ["a"]);
+        // actually, never mind, don't clone
+    }
+}
diff --git a/tests/baselines/reference/objectRestParameter.symbols b/tests/baselines/reference/objectRestParameter.symbols
index 9569dc53d3a..c43a8ba5a04 100644
--- a/tests/baselines/reference/objectRestParameter.symbols
+++ b/tests/baselines/reference/objectRestParameter.symbols
@@ -42,4 +42,27 @@ suddenly(({ x: { z = 12, ...nested }, ...rest } = { x: { z: 1, ka: 1 }, y: 'noo'
 >nested : Symbol(nested, Decl(objectRestParameter.ts, 5, 24))
 >ka : Symbol(ka, Decl(objectRestParameter.ts, 3, 42))
 
+class C {
+>C : Symbol(C, Decl(objectRestParameter.ts, 5, 107))
+
+    m({ a, ...clone }: { a: number, b: string}): void {
+>m : Symbol(C.m, Decl(objectRestParameter.ts, 7, 9))
+>a : Symbol(a, Decl(objectRestParameter.ts, 8, 7))
+>clone : Symbol(clone, Decl(objectRestParameter.ts, 8, 10))
+>a : Symbol(a, Decl(objectRestParameter.ts, 8, 24))
+>b : Symbol(b, Decl(objectRestParameter.ts, 8, 35))
+
+        // actually, never mind, don't clone
+    }
+    set p({ a, ...clone }: { a: number, b: string}) {
+>p : Symbol(C.p, Decl(objectRestParameter.ts, 10, 5))
+>a : Symbol(a, Decl(objectRestParameter.ts, 11, 11))
+>clone : Symbol(clone, Decl(objectRestParameter.ts, 11, 14))
+>a : Symbol(a, Decl(objectRestParameter.ts, 11, 28))
+>b : Symbol(b, Decl(objectRestParameter.ts, 11, 39))
+
+        // actually, never mind, don't clone
+    }
+}
+
 
diff --git a/tests/baselines/reference/objectRestParameter.types b/tests/baselines/reference/objectRestParameter.types
index c634c9c5cd5..56e7352870f 100644
--- a/tests/baselines/reference/objectRestParameter.types
+++ b/tests/baselines/reference/objectRestParameter.types
@@ -53,4 +53,27 @@ suddenly(({ x: { z = 12, ...nested }, ...rest } = { x: { z: 1, ka: 1 }, y: 'noo'
 >nested : { ka: any; }
 >ka : any
 
+class C {
+>C : C
+
+    m({ a, ...clone }: { a: number, b: string}): void {
+>m : ({a, ...clone}: { a: number; b: string; }) => void
+>a : number
+>clone : { b: string; }
+>a : number
+>b : string
+
+        // actually, never mind, don't clone
+    }
+    set p({ a, ...clone }: { a: number, b: string}) {
+>p : { a: number; b: string; }
+>a : number
+>clone : { b: string; }
+>a : number
+>b : string
+
+        // actually, never mind, don't clone
+    }
+}
+
 
diff --git a/tests/cases/conformance/types/rest/objectRestParameter.ts b/tests/cases/conformance/types/rest/objectRestParameter.ts
index 5b47442f047..a9c17a29d14 100644
--- a/tests/cases/conformance/types/rest/objectRestParameter.ts
+++ b/tests/cases/conformance/types/rest/objectRestParameter.ts
@@ -6,3 +6,12 @@ declare function suddenly(f: (a: { x: { z, ka }, y: string }) => void);
 suddenly(({ x: a, ...rest }) => rest.y);
 suddenly(({ x: { z = 12, ...nested }, ...rest } = { x: { z: 1, ka: 1 }, y: 'noo' }) => rest.y + nested.ka);
 
+class C {
+    m({ a, ...clone }: { a: number, b: string}): void {
+        // actually, never mind, don't clone
+    }
+    set p({ a, ...clone }: { a: number, b: string}) {
+        // actually, never mind, don't clone
+    }
+}
+

From 47f331926e4f4e14f3bbbdf79d31e7bc8f72e838 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 15 Nov 2016 10:58:33 -0800
Subject: [PATCH 244/421] Improve rest/spread emit for symbols

Previously, symbols were not handled.
---
 src/compiler/emitter.ts                    | 6 ++++++
 src/compiler/transformers/destructuring.ts | 9 ++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index d9ccc1e3c59..02b6876a5d8 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -38,6 +38,9 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         s = arguments[i];
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
+        if (typeof Object.getOwnPropertySymbols === "function")
+            for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++)
+                t[i] = s[i];
     }
     return t;
 };`;
@@ -47,6 +50,9 @@ var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
         t[p] = s[p];
+    if (typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++) if (e.indexOf(s[i]) > 0)
+            t[i] = s[i];
     return t;
 };`;
 
diff --git a/src/compiler/transformers/destructuring.ts b/src/compiler/transformers/destructuring.ts
index 90729a59b43..4e56cb71a12 100644
--- a/src/compiler/transformers/destructuring.ts
+++ b/src/compiler/transformers/destructuring.ts
@@ -428,7 +428,14 @@ namespace ts {
                 }
                 if (isComputedPropertyName(getPropertyName(element))) {
                     // get the temp name and put that in there instead, like `_tmp + ""`
-                    propertyNames.push(createBinary(computedTempVariables.shift(), SyntaxKind.PlusToken, createLiteral("")));
+                    const temp = computedTempVariables.shift();
+                    propertyNames.push(createConditional(createBinary(createTypeOf(temp),
+                                                                      SyntaxKind.EqualsEqualsEqualsToken,
+                                                                      createLiteral("symbol")),
+                                                         createToken(SyntaxKind.QuestionToken),
+                                                         temp,
+                                                         createToken(SyntaxKind.ColonToken),
+                                                         createBinary(temp, SyntaxKind.PlusToken, createLiteral(""))));
                 }
                 else {
                     const propName = getTextOfPropertyName(getPropertyName(element));

From 0690bf4ca17b8ab1253f996580671b87e4b16d3d Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 15 Nov 2016 10:59:09 -0800
Subject: [PATCH 245/421] Update baselines

---
 tests/baselines/reference/importHelpersInTsx.js          | 3 +++
 tests/baselines/reference/objectRest.js                  | 9 ++++++---
 tests/baselines/reference/objectRestAssignment.js        | 3 +++
 tests/baselines/reference/objectRestForOf.js             | 6 ++++++
 tests/baselines/reference/objectRestNegative.js          | 3 +++
 tests/baselines/reference/objectRestParameter.js         | 3 +++
 tests/baselines/reference/objectSpread.js                | 3 +++
 .../baselines/reference/objectSpreadComputedProperty.js  | 3 +++
 tests/baselines/reference/objectSpreadIndexSignature.js  | 3 +++
 tests/baselines/reference/objectSpreadNegative.js        | 3 +++
 tests/baselines/reference/objectSpreadNegativeParse.js   | 3 +++
 tests/baselines/reference/objectSpreadStrictNull.js      | 3 +++
 tests/baselines/reference/reactNamespaceJSXEmit.js       | 3 +++
 tests/baselines/reference/tsxExternalModuleEmit2.js      | 3 +++
 tests/baselines/reference/tsxReactEmit2.js               | 3 +++
 tests/baselines/reference/tsxReactEmit4.js               | 3 +++
 tests/baselines/reference/tsxReactEmit5.js               | 3 +++
 tests/baselines/reference/tsxReactEmit6.js               | 3 +++
 18 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/tests/baselines/reference/importHelpersInTsx.js b/tests/baselines/reference/importHelpersInTsx.js
index 29e43e191e8..104a81ce708 100644
--- a/tests/baselines/reference/importHelpersInTsx.js
+++ b/tests/baselines/reference/importHelpersInTsx.js
@@ -29,6 +29,9 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         s = arguments[i];
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
+        if (typeof Object.getOwnPropertySymbols === "function")
+            for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++)
+                t[i] = s[i];
     }
     return t;
 };
diff --git a/tests/baselines/reference/objectRest.js b/tests/baselines/reference/objectRest.js
index 46255b24d70..be67699f2f2 100644
--- a/tests/baselines/reference/objectRest.js
+++ b/tests/baselines/reference/objectRest.js
@@ -43,13 +43,16 @@ var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
         t[p] = s[p];
+    if (typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++) if (e.indexOf(s[i]) > 0)
+            t[i] = s[i];
     return t;
 };
 var o = { a: 1, b: 'no' };
 var clone = __rest(o, []);
 var { a } = o, justB = __rest(o, ["a"]);
 var { a, b: renamed } = o, empty = __rest(o, ["a", "b"]);
-var _a = 'b', renamed = o[_a], justA = __rest(o, [_a + ""]);
+var _a = 'b', renamed = o[_a], justA = __rest(o, [typeof _a === "symbol" ? _a : _a + ""]);
 var { 'b': renamed } = o, justA = __rest(o, ["b"]);
 var { b: { '0': n, '1': oooo } } = o, justA = __rest(o, ["b"]);
 let o2 = { c: 'terrible idea?', d: 'yes' };
@@ -71,6 +74,6 @@ var removable = new Removable();
 var { removed } = removable, removableRest = __rest(removable, ["removed"]);
 let computed = 'b';
 let computed2 = 'a';
-var _h = computed, stillNotGreat = o[_h], _j = computed2, soSo = o[_j], o = __rest(o, [_h + "", _j + ""]);
-(_k = computed, stillNotGreat = o[_k], _l = computed2, soSo = o[_l], o = __rest(o, [_k + "", _l + ""]), o);
+var _h = computed, stillNotGreat = o[_h], _j = computed2, soSo = o[_j], o = __rest(o, [typeof _h === "symbol" ? _h : _h + "", typeof _j === "symbol" ? _j : _j + ""]);
+(_k = computed, stillNotGreat = o[_k], _l = computed2, soSo = o[_l], o = __rest(o, [typeof _k === "symbol" ? _k : _k + "", typeof _l === "symbol" ? _l : _l + ""]), o);
 var _e, _g, _k, _l;
diff --git a/tests/baselines/reference/objectRestAssignment.js b/tests/baselines/reference/objectRestAssignment.js
index ae908eaa662..b3d47638aef 100644
--- a/tests/baselines/reference/objectRestAssignment.js
+++ b/tests/baselines/reference/objectRestAssignment.js
@@ -19,6 +19,9 @@ var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
         t[p] = s[p];
+    if (typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++) if (e.indexOf(s[i]) > 0)
+            t[i] = s[i];
     return t;
 };
 let ka;
diff --git a/tests/baselines/reference/objectRestForOf.js b/tests/baselines/reference/objectRestForOf.js
index 00c3f79f296..7e76a27afbc 100644
--- a/tests/baselines/reference/objectRestForOf.js
+++ b/tests/baselines/reference/objectRestForOf.js
@@ -20,6 +20,9 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         s = arguments[i];
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
+        if (typeof Object.getOwnPropertySymbols === "function")
+            for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++)
+                t[i] = s[i];
     }
     return t;
 };
@@ -27,6 +30,9 @@ var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
         t[p] = s[p];
+    if (typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++) if (e.indexOf(s[i]) > 0)
+            t[i] = s[i];
     return t;
 };
 let array;
diff --git a/tests/baselines/reference/objectRestNegative.js b/tests/baselines/reference/objectRestNegative.js
index 767e0a98448..0c3188ed499 100644
--- a/tests/baselines/reference/objectRestNegative.js
+++ b/tests/baselines/reference/objectRestNegative.js
@@ -17,6 +17,9 @@ var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
         t[p] = s[p];
+    if (typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++) if (e.indexOf(s[i]) > 0)
+            t[i] = s[i];
     return t;
 };
 var o = { a: 1, b: 'no' };
diff --git a/tests/baselines/reference/objectRestParameter.js b/tests/baselines/reference/objectRestParameter.js
index f8a4f2955d3..e7741e9298d 100644
--- a/tests/baselines/reference/objectRestParameter.js
+++ b/tests/baselines/reference/objectRestParameter.js
@@ -13,6 +13,9 @@ var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
         t[p] = s[p];
+    if (typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++) if (e.indexOf(s[i]) > 0)
+            t[i] = s[i];
     return t;
 };
 function cloneAgain(_a) {
diff --git a/tests/baselines/reference/objectSpread.js b/tests/baselines/reference/objectSpread.js
index d1de48c5cab..492c926914a 100644
--- a/tests/baselines/reference/objectSpread.js
+++ b/tests/baselines/reference/objectSpread.js
@@ -87,6 +87,9 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         s = arguments[i];
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
+        if (typeof Object.getOwnPropertySymbols === "function")
+            for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++)
+                t[i] = s[i];
     }
     return t;
 };
diff --git a/tests/baselines/reference/objectSpreadComputedProperty.js b/tests/baselines/reference/objectSpreadComputedProperty.js
index 90a22ce6ff5..db0b3d18668 100644
--- a/tests/baselines/reference/objectSpreadComputedProperty.js
+++ b/tests/baselines/reference/objectSpreadComputedProperty.js
@@ -16,6 +16,9 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         s = arguments[i];
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
+        if (typeof Object.getOwnPropertySymbols === "function")
+            for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++)
+                t[i] = s[i];
     }
     return t;
 };
diff --git a/tests/baselines/reference/objectSpreadIndexSignature.js b/tests/baselines/reference/objectSpreadIndexSignature.js
index 22e92e6a844..500d592f185 100644
--- a/tests/baselines/reference/objectSpreadIndexSignature.js
+++ b/tests/baselines/reference/objectSpreadIndexSignature.js
@@ -23,6 +23,9 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         s = arguments[i];
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
+        if (typeof Object.getOwnPropertySymbols === "function")
+            for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++)
+                t[i] = s[i];
     }
     return t;
 };
diff --git a/tests/baselines/reference/objectSpreadNegative.js b/tests/baselines/reference/objectSpreadNegative.js
index 6287f4559a7..828f3966819 100644
--- a/tests/baselines/reference/objectSpreadNegative.js
+++ b/tests/baselines/reference/objectSpreadNegative.js
@@ -77,6 +77,9 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         s = arguments[i];
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
+        if (typeof Object.getOwnPropertySymbols === "function")
+            for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++)
+                t[i] = s[i];
     }
     return t;
 };
diff --git a/tests/baselines/reference/objectSpreadNegativeParse.js b/tests/baselines/reference/objectSpreadNegativeParse.js
index 297c56c3e62..da7fd0ca0d6 100644
--- a/tests/baselines/reference/objectSpreadNegativeParse.js
+++ b/tests/baselines/reference/objectSpreadNegativeParse.js
@@ -11,6 +11,9 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         s = arguments[i];
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
+        if (typeof Object.getOwnPropertySymbols === "function")
+            for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++)
+                t[i] = s[i];
     }
     return t;
 };
diff --git a/tests/baselines/reference/objectSpreadStrictNull.js b/tests/baselines/reference/objectSpreadStrictNull.js
index 84604d728cd..4618b981478 100644
--- a/tests/baselines/reference/objectSpreadStrictNull.js
+++ b/tests/baselines/reference/objectSpreadStrictNull.js
@@ -27,6 +27,9 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         s = arguments[i];
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
+        if (typeof Object.getOwnPropertySymbols === "function")
+            for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++)
+                t[i] = s[i];
     }
     return t;
 };
diff --git a/tests/baselines/reference/reactNamespaceJSXEmit.js b/tests/baselines/reference/reactNamespaceJSXEmit.js
index 3a21504bb80..f8ba072c891 100644
--- a/tests/baselines/reference/reactNamespaceJSXEmit.js
+++ b/tests/baselines/reference/reactNamespaceJSXEmit.js
@@ -18,6 +18,9 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         s = arguments[i];
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
+        if (typeof Object.getOwnPropertySymbols === "function")
+            for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++)
+                t[i] = s[i];
     }
     return t;
 };
diff --git a/tests/baselines/reference/tsxExternalModuleEmit2.js b/tests/baselines/reference/tsxExternalModuleEmit2.js
index 6c01a48af78..442617f883a 100644
--- a/tests/baselines/reference/tsxExternalModuleEmit2.js
+++ b/tests/baselines/reference/tsxExternalModuleEmit2.js
@@ -24,6 +24,9 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         s = arguments[i];
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
+        if (typeof Object.getOwnPropertySymbols === "function")
+            for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++)
+                t[i] = s[i];
     }
     return t;
 };
diff --git a/tests/baselines/reference/tsxReactEmit2.js b/tests/baselines/reference/tsxReactEmit2.js
index 80e3215e2b6..08a6ee696d7 100644
--- a/tests/baselines/reference/tsxReactEmit2.js
+++ b/tests/baselines/reference/tsxReactEmit2.js
@@ -21,6 +21,9 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         s = arguments[i];
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
+        if (typeof Object.getOwnPropertySymbols === "function")
+            for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++)
+                t[i] = s[i];
     }
     return t;
 };
diff --git a/tests/baselines/reference/tsxReactEmit4.js b/tests/baselines/reference/tsxReactEmit4.js
index 33c835d1ab2..fe6692296ac 100644
--- a/tests/baselines/reference/tsxReactEmit4.js
+++ b/tests/baselines/reference/tsxReactEmit4.js
@@ -23,6 +23,9 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         s = arguments[i];
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
+        if (typeof Object.getOwnPropertySymbols === "function")
+            for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++)
+                t[i] = s[i];
     }
     return t;
 };
diff --git a/tests/baselines/reference/tsxReactEmit5.js b/tests/baselines/reference/tsxReactEmit5.js
index c3e58d0a0da..0226f5d7e81 100644
--- a/tests/baselines/reference/tsxReactEmit5.js
+++ b/tests/baselines/reference/tsxReactEmit5.js
@@ -28,6 +28,9 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         s = arguments[i];
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
+        if (typeof Object.getOwnPropertySymbols === "function")
+            for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++)
+                t[i] = s[i];
     }
     return t;
 };
diff --git a/tests/baselines/reference/tsxReactEmit6.js b/tests/baselines/reference/tsxReactEmit6.js
index 85aa8c123c9..b406010ae79 100644
--- a/tests/baselines/reference/tsxReactEmit6.js
+++ b/tests/baselines/reference/tsxReactEmit6.js
@@ -33,6 +33,9 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         s = arguments[i];
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
+        if (typeof Object.getOwnPropertySymbols === "function")
+            for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++)
+                t[i] = s[i];
     }
     return t;
 };

From c011b36d2ecfb2713b61a5e0bb366d2ba55a7a35 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 15 Nov 2016 11:21:23 -0800
Subject: [PATCH 246/421] Update baseline of newly merged test

---
 tests/baselines/reference/objectRest2.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/baselines/reference/objectRest2.js b/tests/baselines/reference/objectRest2.js
index e21c8c79853..2cb4aa6dbc1 100644
--- a/tests/baselines/reference/objectRest2.js
+++ b/tests/baselines/reference/objectRest2.js
@@ -20,6 +20,9 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         s = arguments[i];
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
+        if (typeof Object.getOwnPropertySymbols === "function")
+            for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++)
+                t[i] = s[i];
     }
     return t;
 };

From bb46e789d546f27d42eac730ff6a92c4fc6b4733 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 15 Nov 2016 11:31:21 -0800
Subject: [PATCH 247/421] Fix spread/rest emit for symbols.

It used the index of the symbol property as the name, not the symbol
itself.
---
 src/compiler/emitter.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 02b6876a5d8..eacfd1f0b67 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -39,8 +39,8 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
         if (typeof Object.getOwnPropertySymbols === "function")
-            for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++)
-                t[i] = s[i];
+            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
+                t[p[i]] = s[p[i]];
     }
     return t;
 };`;
@@ -51,8 +51,8 @@ var __rest = (this && this.__rest) || function (s, e) {
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
         t[p] = s[p];
     if (typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++) if (e.indexOf(s[i]) > 0)
-            t[i] = s[i];
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
+            t[p[i]] = s[p[i]];
     return t;
 };`;
 

From 6c1f7331cbcc43fc9480e6a2e6d0cae6dad0fdff Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 15 Nov 2016 11:33:08 -0800
Subject: [PATCH 248/421] Update baselines with fixed emit

---
 tests/baselines/reference/importHelpersInTsx.js           | 4 ++--
 tests/baselines/reference/objectRest.js                   | 4 ++--
 tests/baselines/reference/objectRest2.js                  | 4 ++--
 tests/baselines/reference/objectRestAssignment.js         | 4 ++--
 tests/baselines/reference/objectRestForOf.js              | 8 ++++----
 tests/baselines/reference/objectRestNegative.js           | 4 ++--
 tests/baselines/reference/objectRestParameter.js          | 4 ++--
 tests/baselines/reference/objectSpread.js                 | 4 ++--
 tests/baselines/reference/objectSpreadComputedProperty.js | 4 ++--
 tests/baselines/reference/objectSpreadIndexSignature.js   | 4 ++--
 tests/baselines/reference/objectSpreadNegative.js         | 4 ++--
 tests/baselines/reference/objectSpreadNegativeParse.js    | 4 ++--
 tests/baselines/reference/objectSpreadStrictNull.js       | 4 ++--
 tests/baselines/reference/reactNamespaceJSXEmit.js        | 4 ++--
 tests/baselines/reference/tsxExternalModuleEmit2.js       | 4 ++--
 tests/baselines/reference/tsxReactEmit2.js                | 4 ++--
 tests/baselines/reference/tsxReactEmit4.js                | 4 ++--
 tests/baselines/reference/tsxReactEmit5.js                | 4 ++--
 tests/baselines/reference/tsxReactEmit6.js                | 4 ++--
 19 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/tests/baselines/reference/importHelpersInTsx.js b/tests/baselines/reference/importHelpersInTsx.js
index 104a81ce708..d1fe0df2c51 100644
--- a/tests/baselines/reference/importHelpersInTsx.js
+++ b/tests/baselines/reference/importHelpersInTsx.js
@@ -30,8 +30,8 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
         if (typeof Object.getOwnPropertySymbols === "function")
-            for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++)
-                t[i] = s[i];
+            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
+                t[p[i]] = s[p[i]];
     }
     return t;
 };
diff --git a/tests/baselines/reference/objectRest.js b/tests/baselines/reference/objectRest.js
index be67699f2f2..2144fb9271c 100644
--- a/tests/baselines/reference/objectRest.js
+++ b/tests/baselines/reference/objectRest.js
@@ -44,8 +44,8 @@ var __rest = (this && this.__rest) || function (s, e) {
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
         t[p] = s[p];
     if (typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++) if (e.indexOf(s[i]) > 0)
-            t[i] = s[i];
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
+            t[p[i]] = s[p[i]];
     return t;
 };
 var o = { a: 1, b: 'no' };
diff --git a/tests/baselines/reference/objectRest2.js b/tests/baselines/reference/objectRest2.js
index 2cb4aa6dbc1..5e3f17b857f 100644
--- a/tests/baselines/reference/objectRest2.js
+++ b/tests/baselines/reference/objectRest2.js
@@ -21,8 +21,8 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
         if (typeof Object.getOwnPropertySymbols === "function")
-            for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++)
-                t[i] = s[i];
+            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
+                t[p[i]] = s[p[i]];
     }
     return t;
 };
diff --git a/tests/baselines/reference/objectRestAssignment.js b/tests/baselines/reference/objectRestAssignment.js
index b3d47638aef..7aec259c69b 100644
--- a/tests/baselines/reference/objectRestAssignment.js
+++ b/tests/baselines/reference/objectRestAssignment.js
@@ -20,8 +20,8 @@ var __rest = (this && this.__rest) || function (s, e) {
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
         t[p] = s[p];
     if (typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++) if (e.indexOf(s[i]) > 0)
-            t[i] = s[i];
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
+            t[p[i]] = s[p[i]];
     return t;
 };
 let ka;
diff --git a/tests/baselines/reference/objectRestForOf.js b/tests/baselines/reference/objectRestForOf.js
index 7e76a27afbc..0fa589737bf 100644
--- a/tests/baselines/reference/objectRestForOf.js
+++ b/tests/baselines/reference/objectRestForOf.js
@@ -21,8 +21,8 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
         if (typeof Object.getOwnPropertySymbols === "function")
-            for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++)
-                t[i] = s[i];
+            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
+                t[p[i]] = s[p[i]];
     }
     return t;
 };
@@ -31,8 +31,8 @@ var __rest = (this && this.__rest) || function (s, e) {
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
         t[p] = s[p];
     if (typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++) if (e.indexOf(s[i]) > 0)
-            t[i] = s[i];
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
+            t[p[i]] = s[p[i]];
     return t;
 };
 let array;
diff --git a/tests/baselines/reference/objectRestNegative.js b/tests/baselines/reference/objectRestNegative.js
index 0c3188ed499..22af1f8715b 100644
--- a/tests/baselines/reference/objectRestNegative.js
+++ b/tests/baselines/reference/objectRestNegative.js
@@ -18,8 +18,8 @@ var __rest = (this && this.__rest) || function (s, e) {
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
         t[p] = s[p];
     if (typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++) if (e.indexOf(s[i]) > 0)
-            t[i] = s[i];
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
+            t[p[i]] = s[p[i]];
     return t;
 };
 var o = { a: 1, b: 'no' };
diff --git a/tests/baselines/reference/objectRestParameter.js b/tests/baselines/reference/objectRestParameter.js
index e7741e9298d..f7241135486 100644
--- a/tests/baselines/reference/objectRestParameter.js
+++ b/tests/baselines/reference/objectRestParameter.js
@@ -14,8 +14,8 @@ var __rest = (this && this.__rest) || function (s, e) {
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
         t[p] = s[p];
     if (typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++) if (e.indexOf(s[i]) > 0)
-            t[i] = s[i];
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
+            t[p[i]] = s[p[i]];
     return t;
 };
 function cloneAgain(_a) {
diff --git a/tests/baselines/reference/objectSpread.js b/tests/baselines/reference/objectSpread.js
index d4bd2caf48c..dc49d1f40ff 100644
--- a/tests/baselines/reference/objectSpread.js
+++ b/tests/baselines/reference/objectSpread.js
@@ -88,8 +88,8 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
         if (typeof Object.getOwnPropertySymbols === "function")
-            for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++)
-                t[i] = s[i];
+            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
+                t[p[i]] = s[p[i]];
     }
     return t;
 };
diff --git a/tests/baselines/reference/objectSpreadComputedProperty.js b/tests/baselines/reference/objectSpreadComputedProperty.js
index db0b3d18668..6f27e696ae7 100644
--- a/tests/baselines/reference/objectSpreadComputedProperty.js
+++ b/tests/baselines/reference/objectSpreadComputedProperty.js
@@ -17,8 +17,8 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
         if (typeof Object.getOwnPropertySymbols === "function")
-            for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++)
-                t[i] = s[i];
+            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
+                t[p[i]] = s[p[i]];
     }
     return t;
 };
diff --git a/tests/baselines/reference/objectSpreadIndexSignature.js b/tests/baselines/reference/objectSpreadIndexSignature.js
index 500d592f185..ffe88a89c9a 100644
--- a/tests/baselines/reference/objectSpreadIndexSignature.js
+++ b/tests/baselines/reference/objectSpreadIndexSignature.js
@@ -24,8 +24,8 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
         if (typeof Object.getOwnPropertySymbols === "function")
-            for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++)
-                t[i] = s[i];
+            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
+                t[p[i]] = s[p[i]];
     }
     return t;
 };
diff --git a/tests/baselines/reference/objectSpreadNegative.js b/tests/baselines/reference/objectSpreadNegative.js
index 828f3966819..472a0857169 100644
--- a/tests/baselines/reference/objectSpreadNegative.js
+++ b/tests/baselines/reference/objectSpreadNegative.js
@@ -78,8 +78,8 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
         if (typeof Object.getOwnPropertySymbols === "function")
-            for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++)
-                t[i] = s[i];
+            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
+                t[p[i]] = s[p[i]];
     }
     return t;
 };
diff --git a/tests/baselines/reference/objectSpreadNegativeParse.js b/tests/baselines/reference/objectSpreadNegativeParse.js
index da7fd0ca0d6..4076ab1c3a0 100644
--- a/tests/baselines/reference/objectSpreadNegativeParse.js
+++ b/tests/baselines/reference/objectSpreadNegativeParse.js
@@ -12,8 +12,8 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
         if (typeof Object.getOwnPropertySymbols === "function")
-            for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++)
-                t[i] = s[i];
+            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
+                t[p[i]] = s[p[i]];
     }
     return t;
 };
diff --git a/tests/baselines/reference/objectSpreadStrictNull.js b/tests/baselines/reference/objectSpreadStrictNull.js
index 4618b981478..fc0d4a80564 100644
--- a/tests/baselines/reference/objectSpreadStrictNull.js
+++ b/tests/baselines/reference/objectSpreadStrictNull.js
@@ -28,8 +28,8 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
         if (typeof Object.getOwnPropertySymbols === "function")
-            for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++)
-                t[i] = s[i];
+            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
+                t[p[i]] = s[p[i]];
     }
     return t;
 };
diff --git a/tests/baselines/reference/reactNamespaceJSXEmit.js b/tests/baselines/reference/reactNamespaceJSXEmit.js
index f8ba072c891..48e514c2538 100644
--- a/tests/baselines/reference/reactNamespaceJSXEmit.js
+++ b/tests/baselines/reference/reactNamespaceJSXEmit.js
@@ -19,8 +19,8 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
         if (typeof Object.getOwnPropertySymbols === "function")
-            for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++)
-                t[i] = s[i];
+            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
+                t[p[i]] = s[p[i]];
     }
     return t;
 };
diff --git a/tests/baselines/reference/tsxExternalModuleEmit2.js b/tests/baselines/reference/tsxExternalModuleEmit2.js
index 442617f883a..d3a6591cdaa 100644
--- a/tests/baselines/reference/tsxExternalModuleEmit2.js
+++ b/tests/baselines/reference/tsxExternalModuleEmit2.js
@@ -25,8 +25,8 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
         if (typeof Object.getOwnPropertySymbols === "function")
-            for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++)
-                t[i] = s[i];
+            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
+                t[p[i]] = s[p[i]];
     }
     return t;
 };
diff --git a/tests/baselines/reference/tsxReactEmit2.js b/tests/baselines/reference/tsxReactEmit2.js
index 08a6ee696d7..4ddf442b53f 100644
--- a/tests/baselines/reference/tsxReactEmit2.js
+++ b/tests/baselines/reference/tsxReactEmit2.js
@@ -22,8 +22,8 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
         if (typeof Object.getOwnPropertySymbols === "function")
-            for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++)
-                t[i] = s[i];
+            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
+                t[p[i]] = s[p[i]];
     }
     return t;
 };
diff --git a/tests/baselines/reference/tsxReactEmit4.js b/tests/baselines/reference/tsxReactEmit4.js
index fe6692296ac..8ccc940880f 100644
--- a/tests/baselines/reference/tsxReactEmit4.js
+++ b/tests/baselines/reference/tsxReactEmit4.js
@@ -24,8 +24,8 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
         if (typeof Object.getOwnPropertySymbols === "function")
-            for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++)
-                t[i] = s[i];
+            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
+                t[p[i]] = s[p[i]];
     }
     return t;
 };
diff --git a/tests/baselines/reference/tsxReactEmit5.js b/tests/baselines/reference/tsxReactEmit5.js
index 0226f5d7e81..6e4d43dd676 100644
--- a/tests/baselines/reference/tsxReactEmit5.js
+++ b/tests/baselines/reference/tsxReactEmit5.js
@@ -29,8 +29,8 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
         if (typeof Object.getOwnPropertySymbols === "function")
-            for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++)
-                t[i] = s[i];
+            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
+                t[p[i]] = s[p[i]];
     }
     return t;
 };
diff --git a/tests/baselines/reference/tsxReactEmit6.js b/tests/baselines/reference/tsxReactEmit6.js
index b406010ae79..4c951354aa8 100644
--- a/tests/baselines/reference/tsxReactEmit6.js
+++ b/tests/baselines/reference/tsxReactEmit6.js
@@ -34,8 +34,8 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
         if (typeof Object.getOwnPropertySymbols === "function")
-            for (var i = 0, s = Object.getOwnPropertySymbols(s); i < s.length; i++)
-                t[i] = s[i];
+            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
+                t[p[i]] = s[p[i]];
     }
     return t;
 };

From fe3f88cd08aa18e8cef2c820c0bae801791bfbbc Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Tue, 15 Nov 2016 12:14:02 -0800
Subject: [PATCH 249/421] Properly handle identity relation for mapped types

---
 src/compiler/checker.ts | 66 +++++++++++++++++++++++++++--------------
 1 file changed, 43 insertions(+), 23 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index ae5b71368e2..766d4c073f7 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -4550,6 +4550,10 @@ namespace ts {
                     unknownType);
         }
 
+        function getErasedTemplateTypeFromMappedType(type: MappedType) {
+            return instantiateType(getTemplateTypeFromMappedType(type), createUnaryTypeMapper(getTypeParameterFromMappedType(type), anyType));
+        }
+
         function isGenericMappedType(type: Type) {
             if (getObjectFlags(type) & ObjectFlags.Mapped) {
                 const constraintType = getConstraintTypeFromMappedType(<MappedType>type);
@@ -7190,29 +7194,18 @@ namespace ts {
                             return result;
                         }
                     }
-                    if (isGenericMappedType(target)) {
-                        // A type [P in S]: X is related to a type [P in T]: Y if T is related to S and X is related to Y.
-                        if (isGenericMappedType(source)) {
-                            if ((result = isRelatedTo(getConstraintTypeFromMappedType(<MappedType>target), getConstraintTypeFromMappedType(<MappedType>source), reportErrors)) &&
-                                (result = isRelatedTo(getTemplateTypeFromMappedType(<MappedType>source), getTemplateTypeFromMappedType(<MappedType>target), reportErrors))) {
-                                return result;
-                            }
-                        }
-                    }
-                    else {
-                        // Even if relationship doesn't hold for unions, intersections, or generic type references,
-                        // it may hold in a structural comparison.
-                        const apparentSource = getApparentType(source);
-                        // In a check of the form X = A & B, we will have previously checked if A relates to X or B relates
-                        // to X. Failing both of those we want to check if the aggregation of A and B's members structurally
-                        // relates to X. Thus, we include intersection types on the source side here.
-                        if (apparentSource.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 && !(source.flags & TypeFlags.Primitive);
-                            if (result = objectTypeRelatedTo(apparentSource, source, target, reportStructuralErrors)) {
-                                errorInfo = saveErrorInfo;
-                                return result;
-                            }
+                    // Even if relationship doesn't hold for unions, intersections, or generic type references,
+                    // it may hold in a structural comparison.
+                    const apparentSource = getApparentType(source);
+                    // In a check of the form X = A & B, we will have previously checked if A relates to X or B relates
+                    // to X. Failing both of those we want to check if the aggregation of A and B's members structurally
+                    // relates to X. Thus, we include intersection types on the source side here.
+                    if (apparentSource.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 && !(source.flags & TypeFlags.Primitive);
+                        if (result = objectTypeRelatedTo(apparentSource, source, target, reportStructuralErrors)) {
+                            errorInfo = saveErrorInfo;
+                            return result;
                         }
                     }
                 }
@@ -7441,6 +7434,9 @@ namespace ts {
                 if (expandingFlags === 3) {
                     result = Ternary.Maybe;
                 }
+                else if (isGenericMappedType(source) || isGenericMappedType(target)) {
+                    result = mappedTypeRelatedTo(source, target, reportErrors);
+                }
                 else {
                     result = propertiesRelatedTo(source, target, reportErrors);
                     if (result) {
@@ -7472,6 +7468,30 @@ namespace ts {
                 return result;
             }
 
+            // A type [P in S]: X is related to a type [P in T]: Y if T is related to S and X is related to Y.
+            function mappedTypeRelatedTo(source: Type, target: Type, reportErrors: boolean): Ternary {
+                if (isGenericMappedType(source) && isGenericMappedType(target)) {
+                    let result: Ternary;
+                    if (relation === identityRelation) {
+                        const readonlyMatches = !(<MappedType>source).declaration.readonlyToken === !(<MappedType>target).declaration.readonlyToken;
+                        const optionalMatches = !(<MappedType>source).declaration.questionToken === !(<MappedType>target).declaration.questionToken;
+                        if (readonlyMatches && optionalMatches) {
+                            if (result = isRelatedTo(getConstraintTypeFromMappedType(<MappedType>target), getConstraintTypeFromMappedType(<MappedType>source), reportErrors)) {
+                                return result & isRelatedTo(getErasedTemplateTypeFromMappedType(<MappedType>source), getErasedTemplateTypeFromMappedType(<MappedType>target), reportErrors);
+                            }
+                        }
+                    }
+                    else {
+                        if (relation === comparableRelation || !(<MappedType>source).declaration.questionToken || (<MappedType>target).declaration.questionToken) {
+                            if (result = isRelatedTo(getConstraintTypeFromMappedType(<MappedType>target), getConstraintTypeFromMappedType(<MappedType>source), reportErrors)) {
+                                return result & isRelatedTo(getTemplateTypeFromMappedType(<MappedType>source), getTemplateTypeFromMappedType(<MappedType>target), reportErrors);
+                            }
+                        }
+                    }
+                }
+                return Ternary.False;
+            }
+
             function propertiesRelatedTo(source: Type, target: Type, reportErrors: boolean): Ternary {
                 if (relation === identityRelation) {
                     return propertiesIdenticalTo(source, target);

From d32196ff3640f487c69fffc9e4e8f04e93524cb4 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Tue, 15 Nov 2016 12:14:46 -0800
Subject: [PATCH 250/421] Add predefined mapped types and revise Object.freeze

---
 src/lib/es5.d.ts | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/lib/es5.d.ts b/src/lib/es5.d.ts
index 2c457a432c6..e402a96fade 100644
--- a/src/lib/es5.d.ts
+++ b/src/lib/es5.d.ts
@@ -180,7 +180,7 @@ interface ObjectConstructor {
       * Prevents the modification of existing property attributes and values, and prevents the addition of new properties.
       * @param o Object on which to lock the attributes.
       */
-    freeze<T>(o: T): T;
+    freeze<T>(o: T): Readonly<T>;
 
     /**
       * Prevents the addition of new properties to an object.
@@ -1343,6 +1343,34 @@ interface ArrayLike<T> {
     readonly [n: number]: T;
 }
 
+/**
+ * Make all properties in T optional
+ */
+type Partial<T> = {
+    [P in keyof T]?: T[P];
+};
+
+/**
+ * Make all properties in T readonly
+ */
+type Readonly<T> = {
+    readonly [P in keyof T]: T[P];
+};
+
+/**
+ * From T pick a set of properties K
+ */
+type Pick<T, K extends keyof T> = {
+    [P in K]: T[P];
+}
+
+/**
+ * Construct a type with a set of properties K of type T
+ */
+type Record<K extends string | number, T> = {
+    [P in K]: T;
+}
+
 /**
   * Represents a raw buffer of binary data, which is used to store data for the
   * different typed arrays. ArrayBuffers cannot be read from or written to directly,

From 04a0f55e96989cb6b9c59b40b4d2d83aab2d506e Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Tue, 15 Nov 2016 12:15:11 -0800
Subject: [PATCH 251/421] Revise tests

---
 .../types/mapped/mappedTypeErrors.ts          | 39 +++++++++++--------
 .../conformance/types/mapped/mappedTypes2.ts  | 23 +++++------
 2 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/tests/cases/conformance/types/mapped/mappedTypeErrors.ts b/tests/cases/conformance/types/mapped/mappedTypeErrors.ts
index fce80872185..c507bf64a6e 100644
--- a/tests/cases/conformance/types/mapped/mappedTypeErrors.ts
+++ b/tests/cases/conformance/types/mapped/mappedTypeErrors.ts
@@ -1,22 +1,6 @@
 // @strictNullChecks: true
 // @declaration: true
 
-type Partial<T> = {
-    [P in keyof T]?: T[P];
-};
-
-type Readonly<T> = {
-    readonly [P in keyof T]: T[P];
-};
-
-type Pick<T, K extends keyof T> = {
-    [P in K]: T[P];
-}
-
-type Record<K extends string | number, T> = {
-    [_ in K]: T;
-}
-
 interface Shape {
     name: string;
     width: number;
@@ -33,6 +17,8 @@ interface Point {
     y: number;
 }
 
+// Constraint checking
+
 type T00 = { [P in P]: string };  // Error
 type T01 = { [P in Date]: number };  // Error
 type T02 = Record<Date, number>;  // Error
@@ -59,4 +45,25 @@ function f3<T extends keyof Shape>(x: T) {
 
 function f4<T extends keyof Named>(x: T) {
     let y: Pick<Shape, T>;
+}
+
+// Type identity checking
+
+function f10<T>() {
+    type K = keyof T;
+    var x: { [P in keyof T]: T[P] };
+    var x: { [Q in keyof T]: T[Q] };
+    var x: { [R in K]: T[R] };
+}
+
+function f11<T>() {
+    var x: { [P in keyof T]: T[P] };
+    var x: { [P in keyof T]?: T[P] };  // Error
+    var x: { readonly [P in keyof T]: T[P] };  // Error
+    var x: { readonly [P in keyof T]?: T[P] };  // Error
+}
+
+function f12<T>() {
+    var x: { [P in keyof T]: T[P] };
+    var x: { [P in keyof T]: T[P][] };  // Error
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/types/mapped/mappedTypes2.ts b/tests/cases/conformance/types/mapped/mappedTypes2.ts
index 84bffe2ea17..7f5841410e4 100644
--- a/tests/cases/conformance/types/mapped/mappedTypes2.ts
+++ b/tests/cases/conformance/types/mapped/mappedTypes2.ts
@@ -1,20 +1,15 @@
 // @strictNullChecks: true
 // @declaration: true
 
-type Partial<T> = {
-    [P in keyof T]?: T[P];
-};
-
-type Readonly<T> = {
-    readonly [P in keyof T]: T[P];
-};
-
-type Pick<T, K extends keyof T> = {
-    [P in K]: T[P];
-}
-
-type Record<K extends string | number, T> = {
-    [_ in K]: T;
+function verifyLibTypes<T, K extends keyof T, U>() {
+    var x1: Partial<T>;
+    var x1: { [P in keyof T]?: T[P] };
+    var x2: Readonly<T>;
+    var x2: { readonly [P in keyof T]: T[P] };
+    var x3: Pick<T, K>;
+    var x3: { [P in K]: T[P] };
+    var x4: Record<K, U>;
+    var x4: { [P in K]: U };
 }
 
 type Proxy<T> = {

From 997c5862529f2d2406df9faa7c4985ddd91b0421 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Tue, 15 Nov 2016 12:15:42 -0800
Subject: [PATCH 252/421] Accept new baselines

---
 .../reference/mappedTypeErrors.errors.txt     |  71 ++--
 tests/baselines/reference/mappedTypeErrors.js |  70 ++--
 tests/baselines/reference/mappedTypes2.js     |  46 +-
 .../baselines/reference/mappedTypes2.symbols  | 393 +++++++++---------
 tests/baselines/reference/mappedTypes2.types  |  43 +-
 5 files changed, 334 insertions(+), 289 deletions(-)

diff --git a/tests/baselines/reference/mappedTypeErrors.errors.txt b/tests/baselines/reference/mappedTypeErrors.errors.txt
index 4efcc579ba8..0e1198285ba 100644
--- a/tests/baselines/reference/mappedTypeErrors.errors.txt
+++ b/tests/baselines/reference/mappedTypeErrors.errors.txt
@@ -1,41 +1,29 @@
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(34,20): error TS2313: Type parameter 'P' has a circular constraint.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(35,20): error TS2322: Type 'Date' is not assignable to type 'string | number'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(20,20): error TS2313: Type parameter 'P' has a circular constraint.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(21,20): error TS2322: Type 'Date' is not assignable to type 'string | number'.
   Type 'Date' is not assignable to type 'number'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(36,19): error TS2344: Type 'Date' does not satisfy the constraint 'string | number'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(22,19): error TS2344: Type 'Date' does not satisfy the constraint 'string | number'.
   Type 'Date' is not assignable to type 'number'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(39,24): error TS2344: Type '"foo"' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(40,24): error TS2344: Type '"name" | "foo"' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(25,24): error TS2344: Type '"foo"' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(26,24): error TS2344: Type '"name" | "foo"' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
   Type '"foo"' is not assignable to type '"name" | "width" | "height" | "visible"'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(42,24): error TS2344: Type '"x" | "y"' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(28,24): error TS2344: Type '"x" | "y"' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
   Type '"x"' is not assignable to type '"name" | "width" | "height" | "visible"'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(44,24): error TS2344: Type 'undefined' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(47,24): error TS2344: Type 'T' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(30,24): error TS2344: Type 'undefined' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(33,24): error TS2344: Type 'T' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
   Type 'T' is not assignable to type '"visible"'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(51,24): error TS2344: Type 'T' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(37,24): error TS2344: Type 'T' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
   Type 'string | number' is not assignable to type '"name" | "width" | "height" | "visible"'.
     Type 'string' is not assignable to type '"name" | "width" | "height" | "visible"'.
       Type 'T' is not assignable to type '"visible"'.
         Type 'string | number' is not assignable to type '"visible"'.
           Type 'string' is not assignable to type '"visible"'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(59,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ [P in keyof T]?: T[P]; }'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(60,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ readonly [P in keyof T]: T[P]; }'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(61,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ readonly [P in keyof T]?: T[P]; }'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(66,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ [P in keyof T]: T[P][]; }'.
 
 
-==== tests/cases/conformance/types/mapped/mappedTypeErrors.ts (9 errors) ====
-    
-    type Partial<T> = {
-        [P in keyof T]?: T[P];
-    };
-    
-    type Readonly<T> = {
-        readonly [P in keyof T]: T[P];
-    };
-    
-    type Pick<T, K extends keyof T> = {
-        [P in K]: T[P];
-    }
-    
-    type Record<K extends string | number, T> = {
-        [_ in K]: T;
-    }
+==== tests/cases/conformance/types/mapped/mappedTypeErrors.ts (13 errors) ====
     
     interface Shape {
         name: string;
@@ -53,6 +41,8 @@ tests/cases/conformance/types/mapped/mappedTypeErrors.ts(51,24): error TS2344: T
         y: number;
     }
     
+    // Constraint checking
+    
     type T00 = { [P in P]: string };  // Error
                        ~
 !!! error TS2313: Type parameter 'P' has a circular constraint.
@@ -107,4 +97,33 @@ tests/cases/conformance/types/mapped/mappedTypeErrors.ts(51,24): error TS2344: T
     
     function f4<T extends keyof Named>(x: T) {
         let y: Pick<Shape, T>;
+    }
+    
+    // Type identity checking
+    
+    function f10<T>() {
+        type K = keyof T;
+        var x: { [P in keyof T]: T[P] };
+        var x: { [Q in keyof T]: T[Q] };
+        var x: { [R in K]: T[R] };
+    }
+    
+    function f11<T>() {
+        var x: { [P in keyof T]: T[P] };
+        var x: { [P in keyof T]?: T[P] };  // Error
+            ~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ [P in keyof T]?: T[P]; }'.
+        var x: { readonly [P in keyof T]: T[P] };  // Error
+            ~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ readonly [P in keyof T]: T[P]; }'.
+        var x: { readonly [P in keyof T]?: T[P] };  // Error
+            ~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ readonly [P in keyof T]?: T[P]; }'.
+    }
+    
+    function f12<T>() {
+        var x: { [P in keyof T]: T[P] };
+        var x: { [P in keyof T]: T[P][] };  // Error
+            ~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ [P in keyof T]: T[P][]; }'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/mappedTypeErrors.js b/tests/baselines/reference/mappedTypeErrors.js
index b2c8dc2e84a..fe03b5c9593 100644
--- a/tests/baselines/reference/mappedTypeErrors.js
+++ b/tests/baselines/reference/mappedTypeErrors.js
@@ -1,21 +1,5 @@
 //// [mappedTypeErrors.ts]
 
-type Partial<T> = {
-    [P in keyof T]?: T[P];
-};
-
-type Readonly<T> = {
-    readonly [P in keyof T]: T[P];
-};
-
-type Pick<T, K extends keyof T> = {
-    [P in K]: T[P];
-}
-
-type Record<K extends string | number, T> = {
-    [_ in K]: T;
-}
-
 interface Shape {
     name: string;
     width: number;
@@ -32,6 +16,8 @@ interface Point {
     y: number;
 }
 
+// Constraint checking
+
 type T00 = { [P in P]: string };  // Error
 type T01 = { [P in Date]: number };  // Error
 type T02 = Record<Date, number>;  // Error
@@ -58,6 +44,27 @@ function f3<T extends keyof Shape>(x: T) {
 
 function f4<T extends keyof Named>(x: T) {
     let y: Pick<Shape, T>;
+}
+
+// Type identity checking
+
+function f10<T>() {
+    type K = keyof T;
+    var x: { [P in keyof T]: T[P] };
+    var x: { [Q in keyof T]: T[Q] };
+    var x: { [R in K]: T[R] };
+}
+
+function f11<T>() {
+    var x: { [P in keyof T]: T[P] };
+    var x: { [P in keyof T]?: T[P] };  // Error
+    var x: { readonly [P in keyof T]: T[P] };  // Error
+    var x: { readonly [P in keyof T]?: T[P] };  // Error
+}
+
+function f12<T>() {
+    var x: { [P in keyof T]: T[P] };
+    var x: { [P in keyof T]: T[P][] };  // Error
 }
 
 //// [mappedTypeErrors.js]
@@ -73,21 +80,25 @@ function f3(x) {
 function f4(x) {
     var y;
 }
+// Type identity checking
+function f10() {
+    var x;
+    var x;
+    var x;
+}
+function f11() {
+    var x;
+    var x; // Error
+    var x; // Error
+    var x; // Error
+}
+function f12() {
+    var x;
+    var x; // Error
+}
 
 
 //// [mappedTypeErrors.d.ts]
-declare type Partial<T> = {
-    [P in keyof T]?: T[P];
-};
-declare type Readonly<T> = {
-    readonly [P in keyof T]: T[P];
-};
-declare type Pick<T, K extends keyof T> = {
-    [P in K]: T[P];
-};
-declare type Record<K extends string | number, T> = {
-    [_ in K]: T;
-};
 interface Shape {
     name: string;
     width: number;
@@ -119,3 +130,6 @@ declare function f1<T>(x: T): void;
 declare function f2<T extends string | number>(x: T): void;
 declare function f3<T extends keyof Shape>(x: T): void;
 declare function f4<T extends keyof Named>(x: T): void;
+declare function f10<T>(): void;
+declare function f11<T>(): void;
+declare function f12<T>(): void;
diff --git a/tests/baselines/reference/mappedTypes2.js b/tests/baselines/reference/mappedTypes2.js
index 8796244c390..25bb3fb6ded 100644
--- a/tests/baselines/reference/mappedTypes2.js
+++ b/tests/baselines/reference/mappedTypes2.js
@@ -1,19 +1,14 @@
 //// [mappedTypes2.ts]
 
-type Partial<T> = {
-    [P in keyof T]?: T[P];
-};
-
-type Readonly<T> = {
-    readonly [P in keyof T]: T[P];
-};
-
-type Pick<T, K extends keyof T> = {
-    [P in K]: T[P];
-}
-
-type Record<K extends string | number, T> = {
-    [_ in K]: T;
+function verifyLibTypes<T, K extends keyof T, U>() {
+    var x1: Partial<T>;
+    var x1: { [P in keyof T]?: T[P] };
+    var x2: Readonly<T>;
+    var x2: { readonly [P in keyof T]: T[P] };
+    var x3: Pick<T, K>;
+    var x3: { [P in K]: T[P] };
+    var x4: Record<K, U>;
+    var x4: { [P in K]: U };
 }
 
 type Proxy<T> = {
@@ -95,6 +90,16 @@ function f6(shape: DeepReadonly<Shape>) {
 }
 
 //// [mappedTypes2.js]
+function verifyLibTypes() {
+    var x1;
+    var x1;
+    var x2;
+    var x2;
+    var x3;
+    var x3;
+    var x4;
+    var x4;
+}
 function f0(s1, s2) {
     assign(s1, { name: "circle" });
     assign(s2, { width: 10, height: 20 });
@@ -129,18 +134,7 @@ function f6(shape) {
 
 
 //// [mappedTypes2.d.ts]
-declare type Partial<T> = {
-    [P in keyof T]?: T[P];
-};
-declare type Readonly<T> = {
-    readonly [P in keyof T]: T[P];
-};
-declare type Pick<T, K extends keyof T> = {
-    [P in K]: T[P];
-};
-declare type Record<K extends string | number, T> = {
-    [_ in K]: T;
-};
+declare function verifyLibTypes<T, K extends keyof T, U>(): void;
 declare type Proxy<T> = {
     get(): T;
     set(value: T): void;
diff --git a/tests/baselines/reference/mappedTypes2.symbols b/tests/baselines/reference/mappedTypes2.symbols
index bc823ed0081..a610658869e 100644
--- a/tests/baselines/reference/mappedTypes2.symbols
+++ b/tests/baselines/reference/mappedTypes2.symbols
@@ -1,331 +1,340 @@
 === tests/cases/conformance/types/mapped/mappedTypes2.ts ===
 
-type Partial<T> = {
->Partial : Symbol(Partial, Decl(mappedTypes2.ts, 0, 0))
->T : Symbol(T, Decl(mappedTypes2.ts, 1, 13))
+function verifyLibTypes<T, K extends keyof T, U>() {
+>verifyLibTypes : Symbol(verifyLibTypes, Decl(mappedTypes2.ts, 0, 0))
+>T : Symbol(T, Decl(mappedTypes2.ts, 1, 24))
+>K : Symbol(K, Decl(mappedTypes2.ts, 1, 26))
+>T : Symbol(T, Decl(mappedTypes2.ts, 1, 24))
+>U : Symbol(U, Decl(mappedTypes2.ts, 1, 45))
 
-    [P in keyof T]?: T[P];
->P : Symbol(P, Decl(mappedTypes2.ts, 2, 5))
->T : Symbol(T, Decl(mappedTypes2.ts, 1, 13))
->T : Symbol(T, Decl(mappedTypes2.ts, 1, 13))
->P : Symbol(P, Decl(mappedTypes2.ts, 2, 5))
+    var x1: Partial<T>;
+>x1 : Symbol(x1, Decl(mappedTypes2.ts, 2, 7), Decl(mappedTypes2.ts, 3, 7))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+>T : Symbol(T, Decl(mappedTypes2.ts, 1, 24))
 
-};
+    var x1: { [P in keyof T]?: T[P] };
+>x1 : Symbol(x1, Decl(mappedTypes2.ts, 2, 7), Decl(mappedTypes2.ts, 3, 7))
+>P : Symbol(P, Decl(mappedTypes2.ts, 3, 15))
+>T : Symbol(T, Decl(mappedTypes2.ts, 1, 24))
+>T : Symbol(T, Decl(mappedTypes2.ts, 1, 24))
+>P : Symbol(P, Decl(mappedTypes2.ts, 3, 15))
 
-type Readonly<T> = {
->Readonly : Symbol(Readonly, Decl(mappedTypes2.ts, 3, 2))
->T : Symbol(T, Decl(mappedTypes2.ts, 5, 14))
+    var x2: Readonly<T>;
+>x2 : Symbol(x2, Decl(mappedTypes2.ts, 4, 7), Decl(mappedTypes2.ts, 5, 7))
+>Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
+>T : Symbol(T, Decl(mappedTypes2.ts, 1, 24))
 
-    readonly [P in keyof T]: T[P];
->P : Symbol(P, Decl(mappedTypes2.ts, 6, 14))
->T : Symbol(T, Decl(mappedTypes2.ts, 5, 14))
->T : Symbol(T, Decl(mappedTypes2.ts, 5, 14))
->P : Symbol(P, Decl(mappedTypes2.ts, 6, 14))
+    var x2: { readonly [P in keyof T]: T[P] };
+>x2 : Symbol(x2, Decl(mappedTypes2.ts, 4, 7), Decl(mappedTypes2.ts, 5, 7))
+>P : Symbol(P, Decl(mappedTypes2.ts, 5, 24))
+>T : Symbol(T, Decl(mappedTypes2.ts, 1, 24))
+>T : Symbol(T, Decl(mappedTypes2.ts, 1, 24))
+>P : Symbol(P, Decl(mappedTypes2.ts, 5, 24))
 
-};
+    var x3: Pick<T, K>;
+>x3 : Symbol(x3, Decl(mappedTypes2.ts, 6, 7), Decl(mappedTypes2.ts, 7, 7))
+>Pick : Symbol(Pick, Decl(lib.d.ts, --, --))
+>T : Symbol(T, Decl(mappedTypes2.ts, 1, 24))
+>K : Symbol(K, Decl(mappedTypes2.ts, 1, 26))
 
-type Pick<T, K extends keyof T> = {
->Pick : Symbol(Pick, Decl(mappedTypes2.ts, 7, 2))
->T : Symbol(T, Decl(mappedTypes2.ts, 9, 10))
->K : Symbol(K, Decl(mappedTypes2.ts, 9, 12))
->T : Symbol(T, Decl(mappedTypes2.ts, 9, 10))
+    var x3: { [P in K]: T[P] };
+>x3 : Symbol(x3, Decl(mappedTypes2.ts, 6, 7), Decl(mappedTypes2.ts, 7, 7))
+>P : Symbol(P, Decl(mappedTypes2.ts, 7, 15))
+>K : Symbol(K, Decl(mappedTypes2.ts, 1, 26))
+>T : Symbol(T, Decl(mappedTypes2.ts, 1, 24))
+>P : Symbol(P, Decl(mappedTypes2.ts, 7, 15))
 
-    [P in K]: T[P];
->P : Symbol(P, Decl(mappedTypes2.ts, 10, 5))
->K : Symbol(K, Decl(mappedTypes2.ts, 9, 12))
->T : Symbol(T, Decl(mappedTypes2.ts, 9, 10))
->P : Symbol(P, Decl(mappedTypes2.ts, 10, 5))
-}
+    var x4: Record<K, U>;
+>x4 : Symbol(x4, Decl(mappedTypes2.ts, 8, 7), Decl(mappedTypes2.ts, 9, 7))
+>Record : Symbol(Record, Decl(lib.d.ts, --, --))
+>K : Symbol(K, Decl(mappedTypes2.ts, 1, 26))
+>U : Symbol(U, Decl(mappedTypes2.ts, 1, 45))
 
-type Record<K extends string | number, T> = {
->Record : Symbol(Record, Decl(mappedTypes2.ts, 11, 1))
->K : Symbol(K, Decl(mappedTypes2.ts, 13, 12))
->T : Symbol(T, Decl(mappedTypes2.ts, 13, 38))
-
-    [_ in K]: T;
->_ : Symbol(_, Decl(mappedTypes2.ts, 14, 5))
->K : Symbol(K, Decl(mappedTypes2.ts, 13, 12))
->T : Symbol(T, Decl(mappedTypes2.ts, 13, 38))
+    var x4: { [P in K]: U };
+>x4 : Symbol(x4, Decl(mappedTypes2.ts, 8, 7), Decl(mappedTypes2.ts, 9, 7))
+>P : Symbol(P, Decl(mappedTypes2.ts, 9, 15))
+>K : Symbol(K, Decl(mappedTypes2.ts, 1, 26))
+>U : Symbol(U, Decl(mappedTypes2.ts, 1, 45))
 }
 
 type Proxy<T> = {
->Proxy : Symbol(Proxy, Decl(mappedTypes2.ts, 15, 1))
->T : Symbol(T, Decl(mappedTypes2.ts, 17, 11))
+>Proxy : Symbol(Proxy, Decl(mappedTypes2.ts, 10, 1))
+>T : Symbol(T, Decl(mappedTypes2.ts, 12, 11))
 
     get(): T;
->get : Symbol(get, Decl(mappedTypes2.ts, 17, 17))
->T : Symbol(T, Decl(mappedTypes2.ts, 17, 11))
+>get : Symbol(get, Decl(mappedTypes2.ts, 12, 17))
+>T : Symbol(T, Decl(mappedTypes2.ts, 12, 11))
 
     set(value: T): void;
->set : Symbol(set, Decl(mappedTypes2.ts, 18, 13))
->value : Symbol(value, Decl(mappedTypes2.ts, 19, 8))
->T : Symbol(T, Decl(mappedTypes2.ts, 17, 11))
+>set : Symbol(set, Decl(mappedTypes2.ts, 13, 13))
+>value : Symbol(value, Decl(mappedTypes2.ts, 14, 8))
+>T : Symbol(T, Decl(mappedTypes2.ts, 12, 11))
 }
 
 type Proxify<T> = {
->Proxify : Symbol(Proxify, Decl(mappedTypes2.ts, 20, 1))
->T : Symbol(T, Decl(mappedTypes2.ts, 22, 13))
+>Proxify : Symbol(Proxify, Decl(mappedTypes2.ts, 15, 1))
+>T : Symbol(T, Decl(mappedTypes2.ts, 17, 13))
 
     [P in keyof T]: Proxy<T[P]>;
->P : Symbol(P, Decl(mappedTypes2.ts, 23, 5))
->T : Symbol(T, Decl(mappedTypes2.ts, 22, 13))
->Proxy : Symbol(Proxy, Decl(mappedTypes2.ts, 15, 1))
->T : Symbol(T, Decl(mappedTypes2.ts, 22, 13))
->P : Symbol(P, Decl(mappedTypes2.ts, 23, 5))
+>P : Symbol(P, Decl(mappedTypes2.ts, 18, 5))
+>T : Symbol(T, Decl(mappedTypes2.ts, 17, 13))
+>Proxy : Symbol(Proxy, Decl(mappedTypes2.ts, 10, 1))
+>T : Symbol(T, Decl(mappedTypes2.ts, 17, 13))
+>P : Symbol(P, Decl(mappedTypes2.ts, 18, 5))
 }
 
 type DeepReadonly<T> = {
->DeepReadonly : Symbol(DeepReadonly, Decl(mappedTypes2.ts, 24, 1))
->T : Symbol(T, Decl(mappedTypes2.ts, 26, 18))
+>DeepReadonly : Symbol(DeepReadonly, Decl(mappedTypes2.ts, 19, 1))
+>T : Symbol(T, Decl(mappedTypes2.ts, 21, 18))
 
     readonly [P in keyof T]: DeepReadonly<T[P]>;
->P : Symbol(P, Decl(mappedTypes2.ts, 27, 14))
->T : Symbol(T, Decl(mappedTypes2.ts, 26, 18))
->DeepReadonly : Symbol(DeepReadonly, Decl(mappedTypes2.ts, 24, 1))
->T : Symbol(T, Decl(mappedTypes2.ts, 26, 18))
->P : Symbol(P, Decl(mappedTypes2.ts, 27, 14))
+>P : Symbol(P, Decl(mappedTypes2.ts, 22, 14))
+>T : Symbol(T, Decl(mappedTypes2.ts, 21, 18))
+>DeepReadonly : Symbol(DeepReadonly, Decl(mappedTypes2.ts, 19, 1))
+>T : Symbol(T, Decl(mappedTypes2.ts, 21, 18))
+>P : Symbol(P, Decl(mappedTypes2.ts, 22, 14))
 
 };
 
 declare function assign<T>(obj: T, props: Partial<T>): void;
->assign : Symbol(assign, Decl(mappedTypes2.ts, 28, 2))
->T : Symbol(T, Decl(mappedTypes2.ts, 30, 24))
->obj : Symbol(obj, Decl(mappedTypes2.ts, 30, 27))
->T : Symbol(T, Decl(mappedTypes2.ts, 30, 24))
->props : Symbol(props, Decl(mappedTypes2.ts, 30, 34))
->Partial : Symbol(Partial, Decl(mappedTypes2.ts, 0, 0))
->T : Symbol(T, Decl(mappedTypes2.ts, 30, 24))
+>assign : Symbol(assign, Decl(mappedTypes2.ts, 23, 2))
+>T : Symbol(T, Decl(mappedTypes2.ts, 25, 24))
+>obj : Symbol(obj, Decl(mappedTypes2.ts, 25, 27))
+>T : Symbol(T, Decl(mappedTypes2.ts, 25, 24))
+>props : Symbol(props, Decl(mappedTypes2.ts, 25, 34))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+>T : Symbol(T, Decl(mappedTypes2.ts, 25, 24))
 
 declare function freeze<T>(obj: T): Readonly<T>;
->freeze : Symbol(freeze, Decl(mappedTypes2.ts, 30, 60))
->T : Symbol(T, Decl(mappedTypes2.ts, 31, 24))
->obj : Symbol(obj, Decl(mappedTypes2.ts, 31, 27))
->T : Symbol(T, Decl(mappedTypes2.ts, 31, 24))
->Readonly : Symbol(Readonly, Decl(mappedTypes2.ts, 3, 2))
->T : Symbol(T, Decl(mappedTypes2.ts, 31, 24))
+>freeze : Symbol(freeze, Decl(mappedTypes2.ts, 25, 60))
+>T : Symbol(T, Decl(mappedTypes2.ts, 26, 24))
+>obj : Symbol(obj, Decl(mappedTypes2.ts, 26, 27))
+>T : Symbol(T, Decl(mappedTypes2.ts, 26, 24))
+>Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
+>T : Symbol(T, Decl(mappedTypes2.ts, 26, 24))
 
 declare function pick<T, K extends keyof T>(obj: T, ...keys: K[]): Pick<T, K>;
->pick : Symbol(pick, Decl(mappedTypes2.ts, 31, 48))
->T : Symbol(T, Decl(mappedTypes2.ts, 32, 22))
->K : Symbol(K, Decl(mappedTypes2.ts, 32, 24))
->T : Symbol(T, Decl(mappedTypes2.ts, 32, 22))
->obj : Symbol(obj, Decl(mappedTypes2.ts, 32, 44))
->T : Symbol(T, Decl(mappedTypes2.ts, 32, 22))
->keys : Symbol(keys, Decl(mappedTypes2.ts, 32, 51))
->K : Symbol(K, Decl(mappedTypes2.ts, 32, 24))
->Pick : Symbol(Pick, Decl(mappedTypes2.ts, 7, 2))
->T : Symbol(T, Decl(mappedTypes2.ts, 32, 22))
->K : Symbol(K, Decl(mappedTypes2.ts, 32, 24))
+>pick : Symbol(pick, Decl(mappedTypes2.ts, 26, 48))
+>T : Symbol(T, Decl(mappedTypes2.ts, 27, 22))
+>K : Symbol(K, Decl(mappedTypes2.ts, 27, 24))
+>T : Symbol(T, Decl(mappedTypes2.ts, 27, 22))
+>obj : Symbol(obj, Decl(mappedTypes2.ts, 27, 44))
+>T : Symbol(T, Decl(mappedTypes2.ts, 27, 22))
+>keys : Symbol(keys, Decl(mappedTypes2.ts, 27, 51))
+>K : Symbol(K, Decl(mappedTypes2.ts, 27, 24))
+>Pick : Symbol(Pick, Decl(lib.d.ts, --, --))
+>T : Symbol(T, Decl(mappedTypes2.ts, 27, 22))
+>K : Symbol(K, Decl(mappedTypes2.ts, 27, 24))
 
 declare function mapObject<K extends string | number, T, U>(obj: Record<K, T>, f: (x: T) => U): Record<K, U>;
->mapObject : Symbol(mapObject, Decl(mappedTypes2.ts, 32, 78))
->K : Symbol(K, Decl(mappedTypes2.ts, 33, 27))
->T : Symbol(T, Decl(mappedTypes2.ts, 33, 53))
->U : Symbol(U, Decl(mappedTypes2.ts, 33, 56))
->obj : Symbol(obj, Decl(mappedTypes2.ts, 33, 60))
->Record : Symbol(Record, Decl(mappedTypes2.ts, 11, 1))
->K : Symbol(K, Decl(mappedTypes2.ts, 33, 27))
->T : Symbol(T, Decl(mappedTypes2.ts, 33, 53))
->f : Symbol(f, Decl(mappedTypes2.ts, 33, 78))
->x : Symbol(x, Decl(mappedTypes2.ts, 33, 83))
->T : Symbol(T, Decl(mappedTypes2.ts, 33, 53))
->U : Symbol(U, Decl(mappedTypes2.ts, 33, 56))
->Record : Symbol(Record, Decl(mappedTypes2.ts, 11, 1))
->K : Symbol(K, Decl(mappedTypes2.ts, 33, 27))
->U : Symbol(U, Decl(mappedTypes2.ts, 33, 56))
+>mapObject : Symbol(mapObject, Decl(mappedTypes2.ts, 27, 78))
+>K : Symbol(K, Decl(mappedTypes2.ts, 28, 27))
+>T : Symbol(T, Decl(mappedTypes2.ts, 28, 53))
+>U : Symbol(U, Decl(mappedTypes2.ts, 28, 56))
+>obj : Symbol(obj, Decl(mappedTypes2.ts, 28, 60))
+>Record : Symbol(Record, Decl(lib.d.ts, --, --))
+>K : Symbol(K, Decl(mappedTypes2.ts, 28, 27))
+>T : Symbol(T, Decl(mappedTypes2.ts, 28, 53))
+>f : Symbol(f, Decl(mappedTypes2.ts, 28, 78))
+>x : Symbol(x, Decl(mappedTypes2.ts, 28, 83))
+>T : Symbol(T, Decl(mappedTypes2.ts, 28, 53))
+>U : Symbol(U, Decl(mappedTypes2.ts, 28, 56))
+>Record : Symbol(Record, Decl(lib.d.ts, --, --))
+>K : Symbol(K, Decl(mappedTypes2.ts, 28, 27))
+>U : Symbol(U, Decl(mappedTypes2.ts, 28, 56))
 
 declare function proxify<T>(obj: T): Proxify<T>;
->proxify : Symbol(proxify, Decl(mappedTypes2.ts, 33, 109))
->T : Symbol(T, Decl(mappedTypes2.ts, 34, 25))
->obj : Symbol(obj, Decl(mappedTypes2.ts, 34, 28))
->T : Symbol(T, Decl(mappedTypes2.ts, 34, 25))
->Proxify : Symbol(Proxify, Decl(mappedTypes2.ts, 20, 1))
->T : Symbol(T, Decl(mappedTypes2.ts, 34, 25))
+>proxify : Symbol(proxify, Decl(mappedTypes2.ts, 28, 109))
+>T : Symbol(T, Decl(mappedTypes2.ts, 29, 25))
+>obj : Symbol(obj, Decl(mappedTypes2.ts, 29, 28))
+>T : Symbol(T, Decl(mappedTypes2.ts, 29, 25))
+>Proxify : Symbol(Proxify, Decl(mappedTypes2.ts, 15, 1))
+>T : Symbol(T, Decl(mappedTypes2.ts, 29, 25))
 
 interface Shape {
->Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 48))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 29, 48))
 
     name: string;
->name : Symbol(Shape.name, Decl(mappedTypes2.ts, 36, 17))
+>name : Symbol(Shape.name, Decl(mappedTypes2.ts, 31, 17))
 
     width: number;
->width : Symbol(Shape.width, Decl(mappedTypes2.ts, 37, 17))
+>width : Symbol(Shape.width, Decl(mappedTypes2.ts, 32, 17))
 
     height: number;
->height : Symbol(Shape.height, Decl(mappedTypes2.ts, 38, 18))
+>height : Symbol(Shape.height, Decl(mappedTypes2.ts, 33, 18))
 
     visible: boolean;
->visible : Symbol(Shape.visible, Decl(mappedTypes2.ts, 39, 19))
+>visible : Symbol(Shape.visible, Decl(mappedTypes2.ts, 34, 19))
 }
 
 interface PartialShape {
->PartialShape : Symbol(PartialShape, Decl(mappedTypes2.ts, 41, 1))
+>PartialShape : Symbol(PartialShape, Decl(mappedTypes2.ts, 36, 1))
 
     name?: string;
->name : Symbol(PartialShape.name, Decl(mappedTypes2.ts, 43, 24))
+>name : Symbol(PartialShape.name, Decl(mappedTypes2.ts, 38, 24))
 
     width?: number;
->width : Symbol(PartialShape.width, Decl(mappedTypes2.ts, 44, 18))
+>width : Symbol(PartialShape.width, Decl(mappedTypes2.ts, 39, 18))
 
     height?: number;
->height : Symbol(PartialShape.height, Decl(mappedTypes2.ts, 45, 19))
+>height : Symbol(PartialShape.height, Decl(mappedTypes2.ts, 40, 19))
 
     visible?: boolean;
->visible : Symbol(PartialShape.visible, Decl(mappedTypes2.ts, 46, 20))
+>visible : Symbol(PartialShape.visible, Decl(mappedTypes2.ts, 41, 20))
 }
 
 interface ReadonlyShape {
->ReadonlyShape : Symbol(ReadonlyShape, Decl(mappedTypes2.ts, 48, 1))
+>ReadonlyShape : Symbol(ReadonlyShape, Decl(mappedTypes2.ts, 43, 1))
 
     readonly name: string;
->name : Symbol(ReadonlyShape.name, Decl(mappedTypes2.ts, 50, 25))
+>name : Symbol(ReadonlyShape.name, Decl(mappedTypes2.ts, 45, 25))
 
     readonly width: number;
->width : Symbol(ReadonlyShape.width, Decl(mappedTypes2.ts, 51, 26))
+>width : Symbol(ReadonlyShape.width, Decl(mappedTypes2.ts, 46, 26))
 
     readonly height: number;
->height : Symbol(ReadonlyShape.height, Decl(mappedTypes2.ts, 52, 27))
+>height : Symbol(ReadonlyShape.height, Decl(mappedTypes2.ts, 47, 27))
 
     readonly visible: boolean;
->visible : Symbol(ReadonlyShape.visible, Decl(mappedTypes2.ts, 53, 28))
+>visible : Symbol(ReadonlyShape.visible, Decl(mappedTypes2.ts, 48, 28))
 }
 
 function f0(s1: Shape, s2: Shape) {
->f0 : Symbol(f0, Decl(mappedTypes2.ts, 55, 1))
->s1 : Symbol(s1, Decl(mappedTypes2.ts, 57, 12))
->Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 48))
->s2 : Symbol(s2, Decl(mappedTypes2.ts, 57, 22))
->Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 48))
+>f0 : Symbol(f0, Decl(mappedTypes2.ts, 50, 1))
+>s1 : Symbol(s1, Decl(mappedTypes2.ts, 52, 12))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 29, 48))
+>s2 : Symbol(s2, Decl(mappedTypes2.ts, 52, 22))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 29, 48))
 
     assign(s1, { name: "circle" });
->assign : Symbol(assign, Decl(mappedTypes2.ts, 28, 2))
->s1 : Symbol(s1, Decl(mappedTypes2.ts, 57, 12))
->name : Symbol(name, Decl(mappedTypes2.ts, 58, 16))
+>assign : Symbol(assign, Decl(mappedTypes2.ts, 23, 2))
+>s1 : Symbol(s1, Decl(mappedTypes2.ts, 52, 12))
+>name : Symbol(name, Decl(mappedTypes2.ts, 53, 16))
 
     assign(s2, { width: 10, height: 20 });
->assign : Symbol(assign, Decl(mappedTypes2.ts, 28, 2))
->s2 : Symbol(s2, Decl(mappedTypes2.ts, 57, 22))
->width : Symbol(width, Decl(mappedTypes2.ts, 59, 16))
->height : Symbol(height, Decl(mappedTypes2.ts, 59, 27))
+>assign : Symbol(assign, Decl(mappedTypes2.ts, 23, 2))
+>s2 : Symbol(s2, Decl(mappedTypes2.ts, 52, 22))
+>width : Symbol(width, Decl(mappedTypes2.ts, 54, 16))
+>height : Symbol(height, Decl(mappedTypes2.ts, 54, 27))
 }
 
 function f1(shape: Shape) {
->f1 : Symbol(f1, Decl(mappedTypes2.ts, 60, 1))
->shape : Symbol(shape, Decl(mappedTypes2.ts, 62, 12))
->Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 48))
+>f1 : Symbol(f1, Decl(mappedTypes2.ts, 55, 1))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 57, 12))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 29, 48))
 
     var frozen: ReadonlyShape;
->frozen : Symbol(frozen, Decl(mappedTypes2.ts, 63, 7), Decl(mappedTypes2.ts, 64, 7), Decl(mappedTypes2.ts, 65, 7))
->ReadonlyShape : Symbol(ReadonlyShape, Decl(mappedTypes2.ts, 48, 1))
+>frozen : Symbol(frozen, Decl(mappedTypes2.ts, 58, 7), Decl(mappedTypes2.ts, 59, 7), Decl(mappedTypes2.ts, 60, 7))
+>ReadonlyShape : Symbol(ReadonlyShape, Decl(mappedTypes2.ts, 43, 1))
 
     var frozen: Readonly<Shape>;
->frozen : Symbol(frozen, Decl(mappedTypes2.ts, 63, 7), Decl(mappedTypes2.ts, 64, 7), Decl(mappedTypes2.ts, 65, 7))
->Readonly : Symbol(Readonly, Decl(mappedTypes2.ts, 3, 2))
->Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 48))
+>frozen : Symbol(frozen, Decl(mappedTypes2.ts, 58, 7), Decl(mappedTypes2.ts, 59, 7), Decl(mappedTypes2.ts, 60, 7))
+>Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 29, 48))
 
     var frozen = freeze(shape);
->frozen : Symbol(frozen, Decl(mappedTypes2.ts, 63, 7), Decl(mappedTypes2.ts, 64, 7), Decl(mappedTypes2.ts, 65, 7))
->freeze : Symbol(freeze, Decl(mappedTypes2.ts, 30, 60))
->shape : Symbol(shape, Decl(mappedTypes2.ts, 62, 12))
+>frozen : Symbol(frozen, Decl(mappedTypes2.ts, 58, 7), Decl(mappedTypes2.ts, 59, 7), Decl(mappedTypes2.ts, 60, 7))
+>freeze : Symbol(freeze, Decl(mappedTypes2.ts, 25, 60))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 57, 12))
 }
 
 function f2(shape: Shape) {
->f2 : Symbol(f2, Decl(mappedTypes2.ts, 66, 1))
->shape : Symbol(shape, Decl(mappedTypes2.ts, 68, 12))
->Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 48))
+>f2 : Symbol(f2, Decl(mappedTypes2.ts, 61, 1))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 63, 12))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 29, 48))
 
     var partial: PartialShape;
->partial : Symbol(partial, Decl(mappedTypes2.ts, 69, 7), Decl(mappedTypes2.ts, 70, 7), Decl(mappedTypes2.ts, 71, 7))
->PartialShape : Symbol(PartialShape, Decl(mappedTypes2.ts, 41, 1))
+>partial : Symbol(partial, Decl(mappedTypes2.ts, 64, 7), Decl(mappedTypes2.ts, 65, 7), Decl(mappedTypes2.ts, 66, 7))
+>PartialShape : Symbol(PartialShape, Decl(mappedTypes2.ts, 36, 1))
 
     var partial: Partial<Shape>;
->partial : Symbol(partial, Decl(mappedTypes2.ts, 69, 7), Decl(mappedTypes2.ts, 70, 7), Decl(mappedTypes2.ts, 71, 7))
->Partial : Symbol(Partial, Decl(mappedTypes2.ts, 0, 0))
->Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 48))
+>partial : Symbol(partial, Decl(mappedTypes2.ts, 64, 7), Decl(mappedTypes2.ts, 65, 7), Decl(mappedTypes2.ts, 66, 7))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 29, 48))
 
     var partial: Partial<Shape> = {};
->partial : Symbol(partial, Decl(mappedTypes2.ts, 69, 7), Decl(mappedTypes2.ts, 70, 7), Decl(mappedTypes2.ts, 71, 7))
->Partial : Symbol(Partial, Decl(mappedTypes2.ts, 0, 0))
->Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 48))
+>partial : Symbol(partial, Decl(mappedTypes2.ts, 64, 7), Decl(mappedTypes2.ts, 65, 7), Decl(mappedTypes2.ts, 66, 7))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 29, 48))
 }
 
 function f3(shape: Shape) {
->f3 : Symbol(f3, Decl(mappedTypes2.ts, 72, 1))
->shape : Symbol(shape, Decl(mappedTypes2.ts, 74, 12))
->Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 48))
+>f3 : Symbol(f3, Decl(mappedTypes2.ts, 67, 1))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 69, 12))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 29, 48))
 
     const x = pick(shape, "name", "visible");  // { name: string, visible: boolean }
->x : Symbol(x, Decl(mappedTypes2.ts, 75, 9))
->pick : Symbol(pick, Decl(mappedTypes2.ts, 31, 48))
->shape : Symbol(shape, Decl(mappedTypes2.ts, 74, 12))
+>x : Symbol(x, Decl(mappedTypes2.ts, 70, 9))
+>pick : Symbol(pick, Decl(mappedTypes2.ts, 26, 48))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 69, 12))
 }
 
 function f4() {
->f4 : Symbol(f4, Decl(mappedTypes2.ts, 76, 1))
+>f4 : Symbol(f4, Decl(mappedTypes2.ts, 71, 1))
 
     const rec = { foo: "hello", bar: "world", baz: "bye" };
->rec : Symbol(rec, Decl(mappedTypes2.ts, 79, 9))
->foo : Symbol(foo, Decl(mappedTypes2.ts, 79, 17))
->bar : Symbol(bar, Decl(mappedTypes2.ts, 79, 31))
->baz : Symbol(baz, Decl(mappedTypes2.ts, 79, 45))
+>rec : Symbol(rec, Decl(mappedTypes2.ts, 74, 9))
+>foo : Symbol(foo, Decl(mappedTypes2.ts, 74, 17))
+>bar : Symbol(bar, Decl(mappedTypes2.ts, 74, 31))
+>baz : Symbol(baz, Decl(mappedTypes2.ts, 74, 45))
 
     const lengths = mapObject(rec, s => s.length);  // { foo: number, bar: number, baz: number }
->lengths : Symbol(lengths, Decl(mappedTypes2.ts, 80, 9))
->mapObject : Symbol(mapObject, Decl(mappedTypes2.ts, 32, 78))
->rec : Symbol(rec, Decl(mappedTypes2.ts, 79, 9))
->s : Symbol(s, Decl(mappedTypes2.ts, 80, 34))
+>lengths : Symbol(lengths, Decl(mappedTypes2.ts, 75, 9))
+>mapObject : Symbol(mapObject, Decl(mappedTypes2.ts, 27, 78))
+>rec : Symbol(rec, Decl(mappedTypes2.ts, 74, 9))
+>s : Symbol(s, Decl(mappedTypes2.ts, 75, 34))
 >s.length : Symbol(String.length, Decl(lib.d.ts, --, --))
->s : Symbol(s, Decl(mappedTypes2.ts, 80, 34))
+>s : Symbol(s, Decl(mappedTypes2.ts, 75, 34))
 >length : Symbol(String.length, Decl(lib.d.ts, --, --))
 }
 
 function f5(shape: Shape) {
->f5 : Symbol(f5, Decl(mappedTypes2.ts, 81, 1))
->shape : Symbol(shape, Decl(mappedTypes2.ts, 83, 12))
->Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 48))
+>f5 : Symbol(f5, Decl(mappedTypes2.ts, 76, 1))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 78, 12))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 29, 48))
 
     const p = proxify(shape);
->p : Symbol(p, Decl(mappedTypes2.ts, 84, 9))
->proxify : Symbol(proxify, Decl(mappedTypes2.ts, 33, 109))
->shape : Symbol(shape, Decl(mappedTypes2.ts, 83, 12))
+>p : Symbol(p, Decl(mappedTypes2.ts, 79, 9))
+>proxify : Symbol(proxify, Decl(mappedTypes2.ts, 28, 109))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 78, 12))
 
     let name = p.name.get();
->name : Symbol(name, Decl(mappedTypes2.ts, 85, 7))
->p.name.get : Symbol(get, Decl(mappedTypes2.ts, 17, 17))
+>name : Symbol(name, Decl(mappedTypes2.ts, 80, 7))
+>p.name.get : Symbol(get, Decl(mappedTypes2.ts, 12, 17))
 >p.name : Symbol(name)
->p : Symbol(p, Decl(mappedTypes2.ts, 84, 9))
+>p : Symbol(p, Decl(mappedTypes2.ts, 79, 9))
 >name : Symbol(name)
->get : Symbol(get, Decl(mappedTypes2.ts, 17, 17))
+>get : Symbol(get, Decl(mappedTypes2.ts, 12, 17))
 
     p.visible.set(false);
->p.visible.set : Symbol(set, Decl(mappedTypes2.ts, 18, 13))
+>p.visible.set : Symbol(set, Decl(mappedTypes2.ts, 13, 13))
 >p.visible : Symbol(visible)
->p : Symbol(p, Decl(mappedTypes2.ts, 84, 9))
+>p : Symbol(p, Decl(mappedTypes2.ts, 79, 9))
 >visible : Symbol(visible)
->set : Symbol(set, Decl(mappedTypes2.ts, 18, 13))
+>set : Symbol(set, Decl(mappedTypes2.ts, 13, 13))
 }
 
 function f6(shape: DeepReadonly<Shape>) {
->f6 : Symbol(f6, Decl(mappedTypes2.ts, 87, 1))
->shape : Symbol(shape, Decl(mappedTypes2.ts, 89, 12))
->DeepReadonly : Symbol(DeepReadonly, Decl(mappedTypes2.ts, 24, 1))
->Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 48))
+>f6 : Symbol(f6, Decl(mappedTypes2.ts, 82, 1))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 84, 12))
+>DeepReadonly : Symbol(DeepReadonly, Decl(mappedTypes2.ts, 19, 1))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 29, 48))
 
     let name = shape.name;  // DeepReadonly<string>
->name : Symbol(name, Decl(mappedTypes2.ts, 90, 7))
+>name : Symbol(name, Decl(mappedTypes2.ts, 85, 7))
 >shape.name : Symbol(name)
->shape : Symbol(shape, Decl(mappedTypes2.ts, 89, 12))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 84, 12))
 >name : Symbol(name)
 
     let length = name.length;  // DeepReadonly<number>
->length : Symbol(length, Decl(mappedTypes2.ts, 91, 7))
+>length : Symbol(length, Decl(mappedTypes2.ts, 86, 7))
 >name.length : Symbol(length)
->name : Symbol(name, Decl(mappedTypes2.ts, 90, 7))
+>name : Symbol(name, Decl(mappedTypes2.ts, 85, 7))
 >length : Symbol(length)
 
     let toString = length.toString;  // DeepReadonly<(radix?: number) => string>
->toString : Symbol(toString, Decl(mappedTypes2.ts, 92, 7))
+>toString : Symbol(toString, Decl(mappedTypes2.ts, 87, 7))
 >length.toString : Symbol(toString)
->length : Symbol(length, Decl(mappedTypes2.ts, 91, 7))
+>length : Symbol(length, Decl(mappedTypes2.ts, 86, 7))
 >toString : Symbol(toString)
 }
diff --git a/tests/baselines/reference/mappedTypes2.types b/tests/baselines/reference/mappedTypes2.types
index e3b67647993..8c487288a6f 100644
--- a/tests/baselines/reference/mappedTypes2.types
+++ b/tests/baselines/reference/mappedTypes2.types
@@ -1,51 +1,60 @@
 === tests/cases/conformance/types/mapped/mappedTypes2.ts ===
 
-type Partial<T> = {
+function verifyLibTypes<T, K extends keyof T, U>() {
+>verifyLibTypes : <T, K extends keyof T, U>() => void
+>T : T
+>K : K
+>T : T
+>U : U
+
+    var x1: Partial<T>;
+>x1 : Partial<T>
 >Partial : Partial<T>
 >T : T
 
-    [P in keyof T]?: T[P];
+    var x1: { [P in keyof T]?: T[P] };
+>x1 : Partial<T>
 >P : P
 >T : T
 >T : T
 >P : P
 
-};
-
-type Readonly<T> = {
+    var x2: Readonly<T>;
+>x2 : Readonly<T>
 >Readonly : Readonly<T>
 >T : T
 
-    readonly [P in keyof T]: T[P];
+    var x2: { readonly [P in keyof T]: T[P] };
+>x2 : Readonly<T>
 >P : P
 >T : T
 >T : T
 >P : P
 
-};
-
-type Pick<T, K extends keyof T> = {
+    var x3: Pick<T, K>;
+>x3 : Pick<T, K>
 >Pick : Pick<T, K>
 >T : T
 >K : K
->T : T
 
-    [P in K]: T[P];
+    var x3: { [P in K]: T[P] };
+>x3 : Pick<T, K>
 >P : P
 >K : K
 >T : T
 >P : P
-}
 
-type Record<K extends string | number, T> = {
+    var x4: Record<K, U>;
+>x4 : Record<K, U>
 >Record : Record<K, T>
 >K : K
->T : T
+>U : U
 
-    [_ in K]: T;
->_ : _
+    var x4: { [P in K]: U };
+>x4 : Record<K, U>
+>P : P
 >K : K
->T : T
+>U : U
 }
 
 type Proxy<T> = {

From 98e192f3571c87936524c9c1865b33916dad6eb0 Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Tue, 15 Nov 2016 12:32:43 -0800
Subject: [PATCH 253/421] Move transformFunctionBody back into es2015

---
 src/compiler/factory.ts                       |  561 +------
 src/compiler/transformers/es2015.ts           |  518 +++++-
 src/compiler/transformers/es2016.ts           |  113 +-
 src/compiler/transformers/esnext.ts           |  110 +-
 src/compiler/types.ts                         |   56 +-
 tests/baselines/reference/objectRestForOf.js  |    8 +-
 ...ngForObjectBindingPatternDefaultValues2.js |   27 +-
 ...rObjectBindingPatternDefaultValues2.js.map |    2 +-
 ...BindingPatternDefaultValues2.sourcemap.txt | 1485 ++++++++---------
 9 files changed, 1405 insertions(+), 1475 deletions(-)

diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index 9c23cfd9b97..44db12f7b6c 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -648,7 +648,7 @@ namespace ts {
 
     export function createConditional(condition: Expression, questionToken: QuestionToken, whenTrue: Expression, colonToken: ColonToken, whenFalse: Expression, location?: TextRange) {
         const node = <ConditionalExpression>createNode(SyntaxKind.ConditionalExpression, location);
-        node.condition = condition;
+        node.condition = parenthesizeForConditionalHead(condition);
         node.questionToken = questionToken;
         node.whenTrue = whenTrue;
         node.colonToken = colonToken;
@@ -2603,6 +2603,16 @@ namespace ts {
         return SyntaxKind.Unknown;
     }
 
+    export function parenthesizeForConditionalHead(condition: Expression) {
+        const conditionalPrecedence = getOperatorPrecedence(SyntaxKind.ConditionalExpression, SyntaxKind.QuestionToken);
+        const emittedCondition = skipPartiallyEmittedExpressions(condition);
+        const conditionPrecedence = getExpressionPrecedence(emittedCondition);
+        if (compareValues(conditionPrecedence, conditionalPrecedence) === Comparison.LessThan) {
+            return createParen(condition);
+        }
+        return condition;
+    }
+
     /**
      * Wraps an expression in parentheses if it is needed in order to use the expression
      * as the expression of a NewExpression node.
@@ -3102,555 +3112,6 @@ namespace ts {
         return tryGetModuleNameFromFile(resolver.getExternalModuleFileFromDeclaration(declaration), host, compilerOptions);
     }
 
-    /**
-     * Transforms the body of a function-like node.
-     *
-     * @param node A function-like node.
-     */
-    export function transformFunctionBody(node: FunctionLikeDeclaration,
-                                          visitor: (node: Node) => VisitResult<Node>,
-                                          currentSourceFile: SourceFile,
-                                          context: TransformationContext,
-                                          enableSubstitutionsForCapturedThis: () => void,
-                                          convertObjectRest?: boolean) {
-        let multiLine = false; // indicates whether the block *must* be emitted as multiple lines
-        let singleLine = false; // indicates whether the block *may* be emitted as a single line
-        let statementsLocation: TextRange;
-        let closeBraceLocation: TextRange;
-
-        const statements: Statement[] = [];
-        const body = node.body;
-        let statementOffset: number;
-
-        context.startLexicalEnvironment();
-        if (isBlock(body)) {
-            // ensureUseStrict is false because no new prologue-directive should be added.
-            // addPrologueDirectives will simply put already-existing directives at the beginning of the target statement-array
-            statementOffset = addPrologueDirectives(statements, body.statements, /*ensureUseStrict*/ false, visitor);
-        }
-
-        addCaptureThisForNodeIfNeeded(statements, node, enableSubstitutionsForCapturedThis);
-        addDefaultValueAssignmentsIfNeeded(context, statements, node, visitor, convertObjectRest);
-        addRestParameterIfNeeded(statements, node, /*inConstructorWithSynthesizedSuper*/ false);
-
-        // If we added any generated statements, this must be a multi-line block.
-        if (!multiLine && statements.length > 0) {
-            multiLine = true;
-        }
-
-        if (isBlock(body)) {
-            statementsLocation = body.statements;
-            addRange(statements, visitNodes(body.statements, visitor, isStatement, statementOffset));
-
-            // If the original body was a multi-line block, this must be a multi-line block.
-            if (!multiLine && body.multiLine) {
-                multiLine = true;
-            }
-        }
-        else {
-            Debug.assert(node.kind === SyntaxKind.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
-            // being emitted for the end position only.
-            statementsLocation = moveRangeEnd(body, -1);
-
-            const equalsGreaterThanToken = (<ArrowFunction>node).equalsGreaterThanToken;
-            if (!nodeIsSynthesized(equalsGreaterThanToken) && !nodeIsSynthesized(body)) {
-                if (rangeEndIsOnSameLineAsRangeStart(equalsGreaterThanToken, body, currentSourceFile)) {
-                    singleLine = true;
-                }
-                else {
-                    multiLine = true;
-                }
-            }
-
-            const expression = visitNode(body, visitor, isExpression);
-            const returnStatement = createReturn(expression, /*location*/ body);
-            setEmitFlags(returnStatement, EmitFlags.NoTokenSourceMaps | EmitFlags.NoTrailingSourceMap | EmitFlags.NoTrailingComments);
-            statements.push(returnStatement);
-
-            // To align with the source map emit for the old emitter, we set a custom
-            // source map location for the close brace.
-            closeBraceLocation = body;
-        }
-
-        const lexicalEnvironment = context.endLexicalEnvironment();
-        addRange(statements, lexicalEnvironment);
-
-        // If we added any final generated statements, this must be a multi-line block
-        if (!multiLine && lexicalEnvironment && lexicalEnvironment.length) {
-            multiLine = true;
-        }
-
-        const block = createBlock(createNodeArray(statements, statementsLocation), node.body, multiLine);
-        if (!multiLine && singleLine) {
-            setEmitFlags(block, EmitFlags.SingleLine);
-        }
-
-        if (closeBraceLocation) {
-            setTokenSourceMapRange(block, SyntaxKind.CloseBraceToken, closeBraceLocation);
-        }
-
-        setOriginalNode(block, node.body);
-        return block;
-    }
-
-    /**
-     * Adds a statement to capture the `this` of a function declaration if it is needed.
-     *
-     * @param statements The statements for the new function body.
-     * @param node A node.
-     */
-    export function addCaptureThisForNodeIfNeeded(statements: Statement[], node: Node, enableSubstitutionsForCapturedThis: () => void): void {
-        if (node.transformFlags & TransformFlags.ContainsCapturedLexicalThis && node.kind !== SyntaxKind.ArrowFunction) {
-            captureThisForNode(statements, node, createThis(), enableSubstitutionsForCapturedThis);
-        }
-    }
-
-    export function captureThisForNode(statements: Statement[], node: Node, initializer: Expression | undefined, enableSubstitutionsForCapturedThis?: () => void, originalStatement?: Statement): void {
-        enableSubstitutionsForCapturedThis();
-        const captureThisStatement = createVariableStatement(
-            /*modifiers*/ undefined,
-            createVariableDeclarationList([
-                createVariableDeclaration(
-                    "_this",
-                    /*type*/ undefined,
-                    initializer
-                )
-            ]),
-            originalStatement
-        );
-
-        setEmitFlags(captureThisStatement, EmitFlags.NoComments | EmitFlags.CustomPrologue);
-        setSourceMapRange(captureThisStatement, node);
-        statements.push(captureThisStatement);
-    }
-
-    /**
-     * Gets a value indicating whether we need to add default value assignments for a
-     * function-like node.
-     *
-     * @param node A function-like node.
-     */
-    function shouldAddDefaultValueAssignments(node: FunctionLikeDeclaration): boolean {
-        return (node.transformFlags & TransformFlags.ContainsDefaultValueAssignments) !== 0;
-    }
-
-    /**
-     * Adds statements to the body of a function-like node if it contains parameters with
-     * binding patterns or initializers.
-     *
-     * @param statements The statements for the new function body.
-     * @param node A function-like node.
-     */
-    export function addDefaultValueAssignmentsIfNeeded(context: TransformationContext,
-                                                       statements: Statement[],
-                                                       node: FunctionLikeDeclaration,
-                                                       visitor: (node: Node) => VisitResult<Node>,
-                                                       convertObjectRest: boolean): void {
-        if (!shouldAddDefaultValueAssignments(node)) {
-            return;
-        }
-
-        for (const parameter of node.parameters) {
-            const { name, initializer, dotDotDotToken } = parameter;
-
-            // A rest parameter cannot have a binding pattern or an initializer,
-            // so let's just ignore it.
-            if (dotDotDotToken) {
-                continue;
-            }
-
-            if (isBindingPattern(name)) {
-                addDefaultValueAssignmentForBindingPattern(context, statements, parameter, name, initializer, visitor, convertObjectRest);
-            }
-            else if (initializer) {
-                addDefaultValueAssignmentForInitializer(statements, parameter, name, initializer, visitor);
-            }
-        }
-    }
-
-    /**
-     * Adds statements to the body of a function-like node for parameters with binding patterns
-     *
-     * @param statements The statements for the new function body.
-     * @param parameter The parameter for the function.
-     * @param name The name of the parameter.
-     * @param initializer The initializer for the parameter.
-     */
-    function addDefaultValueAssignmentForBindingPattern(context: TransformationContext,
-                                                        statements: Statement[],
-                                                        parameter: ParameterDeclaration,
-                                                        name: BindingPattern, initializer: Expression,
-                                                        visitor: (node: Node) => VisitResult<Node>,
-                                                        convertObjectRest: boolean): void {
-        const temp = getGeneratedNameForNode(parameter);
-
-        // In cases where a binding pattern is simply '[]' or '{}',
-        // we usually don't want to emit a var declaration; however, in the presence
-        // of an initializer, we must emit that expression to preserve side effects.
-        if (name.elements.length > 0) {
-            statements.push(
-                setEmitFlags(
-                    createVariableStatement(
-                        /*modifiers*/ undefined,
-                        createVariableDeclarationList(
-                            flattenDestructuringBinding(
-                                context,
-                                parameter,
-                                temp,
-                                /*skipInitializer*/ convertObjectRest,
-                                /*recordTempVariablesInLine*/ true,
-                                convertObjectRest
-                                    ? FlattenLevel.ObjectRest
-                                    : FlattenLevel.All,
-                                visitor
-                            )
-                        )
-                    ),
-                    EmitFlags.CustomPrologue
-                )
-            );
-        }
-        else if (initializer) {
-            statements.push(
-                setEmitFlags(
-                    createStatement(
-                        createAssignment(
-                            temp,
-                            visitNode(initializer, visitor, isExpression)
-                        )
-                    ),
-                    EmitFlags.CustomPrologue
-                )
-            );
-        }
-    }
-
-    /**
-     * Adds statements to the body of a function-like node for parameters with initializers.
-     *
-     * @param statements The statements for the new function body.
-     * @param parameter The parameter for the function.
-     * @param name The name of the parameter.
-     * @param initializer The initializer for the parameter.
-     */
-    function addDefaultValueAssignmentForInitializer(statements: Statement[],
-                                                     parameter: ParameterDeclaration,
-                                                     name: Identifier,
-                                                     initializer: Expression,
-                                                     visitor: (node: Node) => VisitResult<Node>): void {
-        initializer = visitNode(initializer, visitor, isExpression);
-        const statement = createIf(
-            createStrictEquality(
-                getSynthesizedClone(name),
-                createVoidZero()
-            ),
-            setEmitFlags(
-                createBlock([
-                    createStatement(
-                        createAssignment(
-                            setEmitFlags(getMutableClone(name), EmitFlags.NoSourceMap),
-                            setEmitFlags(initializer, EmitFlags.NoSourceMap | getEmitFlags(initializer)),
-                            /*location*/ parameter
-                        )
-                    )
-                ], /*location*/ parameter),
-                EmitFlags.SingleLine | EmitFlags.NoTrailingSourceMap | EmitFlags.NoTokenSourceMaps
-            ),
-            /*elseStatement*/ undefined,
-            /*location*/ parameter
-        );
-        statement.startsOnNewLine = true;
-        setEmitFlags(statement, EmitFlags.NoTokenSourceMaps | EmitFlags.NoTrailingSourceMap | EmitFlags.CustomPrologue);
-        statements.push(statement);
-    }
-
-    /**
-     * Gets a value indicating whether we need to add statements to handle a rest parameter.
-     *
-     * @param node A ParameterDeclaration node.
-     * @param inConstructorWithSynthesizedSuper A value indicating whether the parameter is
-     *                                          part of a constructor declaration with a
-     *                                          synthesized call to `super`
-     */
-    function shouldAddRestParameter(node: ParameterDeclaration, inConstructorWithSynthesizedSuper: boolean) {
-        return node && node.dotDotDotToken && node.name.kind === SyntaxKind.Identifier && !inConstructorWithSynthesizedSuper;
-    }
-
-    /**
-     * Adds statements to the body of a function-like node if it contains a rest parameter.
-     *
-     * @param statements The statements for the new function body.
-     * @param node A function-like node.
-     * @param inConstructorWithSynthesizedSuper A value indicating whether the parameter is
-     *                                          part of a constructor declaration with a
-     *                                          synthesized call to `super`
-     */
-    export function addRestParameterIfNeeded(statements: Statement[], node: FunctionLikeDeclaration, inConstructorWithSynthesizedSuper: boolean): void {
-        const parameter = lastOrUndefined(node.parameters);
-        if (!shouldAddRestParameter(parameter, inConstructorWithSynthesizedSuper)) {
-            return;
-        }
-
-        // `declarationName` is the name of the local declaration for the parameter.
-        const declarationName = getMutableClone(<Identifier>parameter.name);
-        setEmitFlags(declarationName, EmitFlags.NoSourceMap);
-
-        // `expressionName` is the name of the parameter used in expressions.
-        const expressionName = getSynthesizedClone(<Identifier>parameter.name);
-        const restIndex = node.parameters.length - 1;
-        const temp = createLoopVariable();
-
-        // var param = [];
-        statements.push(
-            setEmitFlags(
-                createVariableStatement(
-                    /*modifiers*/ undefined,
-                    createVariableDeclarationList([
-                        createVariableDeclaration(
-                            declarationName,
-                            /*type*/ undefined,
-                            createArrayLiteral([])
-                        )
-                    ]),
-                    /*location*/ parameter
-                ),
-                EmitFlags.CustomPrologue
-            )
-        );
-
-        // for (var _i = restIndex; _i < arguments.length; _i++) {
-        //   param[_i - restIndex] = arguments[_i];
-        // }
-        const forStatement = createFor(
-            createVariableDeclarationList([
-                createVariableDeclaration(temp, /*type*/ undefined, createLiteral(restIndex))
-            ], /*location*/ parameter),
-            createLessThan(
-                temp,
-                createPropertyAccess(createIdentifier("arguments"), "length"),
-                /*location*/ parameter
-            ),
-            createPostfixIncrement(temp, /*location*/ parameter),
-            createBlock([
-                startOnNewLine(
-                    createStatement(
-                        createAssignment(
-                            createElementAccess(
-                                expressionName,
-                                createSubtract(temp, createLiteral(restIndex))
-                            ),
-                            createElementAccess(createIdentifier("arguments"), temp)
-                        ),
-                        /*location*/ parameter
-                    )
-                )
-            ])
-        );
-
-        setEmitFlags(forStatement, EmitFlags.CustomPrologue);
-        startOnNewLine(forStatement);
-        statements.push(forStatement);
-    }
-
-    export function convertForOf(node: ForOfStatement, convertedLoopBodyStatements: Statement[],
-                                 visitor: (node: Node) => VisitResult<Node>,
-                                 enableSubstitutionsForBlockScopedBindings: () => void,
-                                 context: TransformationContext,
-                                 convertObjectRest?: boolean): ForStatement | ForOfStatement {
-        // The following ES6 code:
-        //
-        //    for (let v of expr) { }
-        //
-        // should be emitted as
-        //
-        //    for (var _i = 0, _a = expr; _i < _a.length; _i++) {
-        //        var v = _a[_i];
-        //    }
-        //
-        // where _a and _i are temps emitted to capture the RHS and the counter,
-        // respectively.
-        // When the left hand side is an expression instead of a let declaration,
-        // the "let v" is not emitted.
-        // When the left hand side is a let/const, the v is renamed if there is
-        // another v in scope.
-        // Note that all assignments to the LHS are emitted in the body, including
-        // all destructuring.
-        // Note also that because an extra statement is needed to assign to the LHS,
-        // for-of bodies are always emitted as blocks.
-
-        const expression = visitNode(node.expression, visitor, isExpression);
-        const initializer = node.initializer;
-        const statements: Statement[] = [];
-
-        // In the case where the user wrote an identifier as the RHS, like this:
-        //
-        //     for (let v of arr) { }
-        //
-        // we don't want to emit a temporary variable for the RHS, just use it directly.
-        const counter = convertObjectRest ? undefined : createLoopVariable();
-        const rhsReference = expression.kind === SyntaxKind.Identifier
-            ? createUniqueName((<Identifier>expression).text)
-            : createTempVariable(/*recordTempVariable*/ undefined);
-        const elementAccess = convertObjectRest ? rhsReference : createElementAccess(rhsReference, counter);
-
-        // Initialize LHS
-        // var v = _a[_i];
-        if (isVariableDeclarationList(initializer)) {
-            if (initializer.flags & NodeFlags.BlockScoped) {
-                enableSubstitutionsForBlockScopedBindings();
-            }
-
-            const firstOriginalDeclaration = firstOrUndefined(initializer.declarations);
-            if (firstOriginalDeclaration && isBindingPattern(firstOriginalDeclaration.name)) {
-                // This works whether the declaration is a var, let, or const.
-                // It will use rhsIterationValue _a[_i] as the initializer.
-                const declarations = flattenDestructuringBinding(
-                    context,
-                    firstOriginalDeclaration,
-                    elementAccess,
-                    /*skipInitializer*/ false,
-                    /*recordTempVariablesInLine*/ true,
-                    convertObjectRest
-                        ? FlattenLevel.ObjectRest
-                        : FlattenLevel.All,
-                    visitor
-                );
-
-                const declarationList = createVariableDeclarationList(declarations, /*location*/ initializer);
-                setOriginalNode(declarationList, initializer);
-
-                // Adjust the source map range for the first declaration to align with the old
-                // emitter.
-                const firstDeclaration = declarations[0];
-                const lastDeclaration = lastOrUndefined(declarations);
-                setSourceMapRange(declarationList, createRange(firstDeclaration.pos, lastDeclaration.end));
-
-                statements.push(
-                    createVariableStatement(
-                        /*modifiers*/ undefined,
-                        declarationList
-                    )
-                );
-            }
-            else {
-                // The following call does not include the initializer, so we have
-                // to emit it separately.
-                statements.push(
-                    createVariableStatement(
-                        /*modifiers*/ undefined,
-                        setOriginalNode(
-                            createVariableDeclarationList([
-                                createVariableDeclaration(
-                                    firstOriginalDeclaration ? firstOriginalDeclaration.name : createTempVariable(/*recordTempVariable*/ undefined),
-                                    /*type*/ undefined,
-                                    createElementAccess(rhsReference, counter)
-                                )
-                            ], /*location*/ moveRangePos(initializer, -1)),
-                            initializer
-                        ),
-                        /*location*/ moveRangeEnd(initializer, -1)
-                    )
-                );
-            }
-        }
-        else {
-            // Initializer is an expression. Emit the expression in the body, so that it's
-            // evaluated on every iteration.
-            const assignment = createAssignment(initializer, elementAccess);
-            if (isDestructuringAssignment(assignment)) {
-                // This is a destructuring pattern, so we flatten the destructuring instead.
-                statements.push(
-                    createStatement(
-                        flattenDestructuringAssignment(
-                            context,
-                            assignment,
-                            /*needsValue*/ false,
-                            convertObjectRest
-                                ? FlattenLevel.ObjectRest
-                                : FlattenLevel.All,
-                            /*createAssignmentCallback*/ undefined,
-                            visitor
-                        )
-                    )
-                );
-            }
-            else {
-                // Currently there is not way to check that assignment is binary expression of destructing assignment
-                // so we have to cast never type to binaryExpression
-                (<BinaryExpression>assignment).end = initializer.end;
-                statements.push(createStatement(assignment, /*location*/ moveRangeEnd(initializer, -1)));
-            }
-        }
-
-        let bodyLocation: TextRange;
-        let statementsLocation: TextRange;
-        if (convertedLoopBodyStatements) {
-            addRange(statements, convertedLoopBodyStatements);
-        }
-        else {
-            const statement = visitNode(node.statement, visitor, isStatement);
-            if (isBlock(statement)) {
-                addRange(statements, statement.statements);
-                bodyLocation = statement;
-                statementsLocation = statement.statements;
-            }
-            else {
-                statements.push(statement);
-            }
-        }
-
-        // The old emitter does not emit source maps for the expression
-        setEmitFlags(expression, EmitFlags.NoSourceMap | getEmitFlags(expression));
-
-        // The old emitter does not emit source maps for the block.
-        // We add the location to preserve comments.
-        const body = createBlock(
-            createNodeArray(statements, /*location*/ statementsLocation),
-            /*location*/ bodyLocation
-        );
-
-        setEmitFlags(body, EmitFlags.NoSourceMap | EmitFlags.NoTokenSourceMaps);
-
-        let forStatement: ForStatement | ForOfStatement;
-        if (convertObjectRest) {
-            forStatement = createForOf(
-                createVariableDeclarationList([
-                    createVariableDeclaration(rhsReference, /*type*/ undefined, /*initializer*/ undefined, /*location*/ node.expression)
-                ], /*location*/ node.expression),
-                node.expression,
-                body,
-                /*location*/ node
-            );
-        }
-        else {
-            forStatement = createFor(
-                setEmitFlags(
-                    createVariableDeclarationList([
-                        createVariableDeclaration(counter, /*type*/ undefined, createLiteral(0), /*location*/ moveRangePos(node.expression, -1)),
-                        createVariableDeclaration(rhsReference, /*type*/ undefined, expression, /*location*/ node.expression)
-                    ], /*location*/ node.expression),
-                    EmitFlags.NoHoisting
-                ),
-                createLessThan(
-                    counter,
-                    createPropertyAccess(rhsReference, "length"),
-                    /*location*/ node.expression
-                ),
-                createPostfixIncrement(counter, /*location*/ node.expression),
-                body,
-                /*location*/ node
-            );
-        }
-
-        // Disable trailing source maps for the OpenParenToken to align source map emit with the old emitter.
-        setEmitFlags(forStatement, EmitFlags.NoTokenTrailingSourceMaps);
-        return forStatement;
-    }
-
     /**
      * Gets the initializer of an BindingOrAssignmentElement.
      */
diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts
index 29107e149f4..0085fcef1bc 100644
--- a/src/compiler/transformers/es2015.ts
+++ b/src/compiler/transformers/es2015.ts
@@ -861,7 +861,7 @@ namespace ts {
             }
 
             if (constructor) {
-                addDefaultValueAssignmentsIfNeeded(context, statements, constructor, visitor, /*convertObjectRest*/ false);
+                addDefaultValueAssignmentsIfNeeded(statements, constructor);
                 addRestParameterIfNeeded(statements, constructor, hasSynthesizedSuper);
                 Debug.assert(statementOffset >= 0, "statementOffset not initialized correctly!");
 
@@ -954,7 +954,7 @@ namespace ts {
             // If this isn't a derived class, just capture 'this' for arrow functions if necessary.
             if (!hasExtendsClause) {
                 if (ctor) {
-                    addCaptureThisForNodeIfNeeded(statements, ctor, enableSubstitutionsForCapturedThis);
+                    addCaptureThisForNodeIfNeeded(statements, ctor);
                 }
                 return SuperCaptureResult.NoReplacement;
             }
@@ -1016,7 +1016,7 @@ namespace ts {
             }
 
             // Perform the capture.
-            captureThisForNode(statements, ctor, superCallExpression, enableSubstitutionsForCapturedThis, firstStatement);
+            captureThisForNode(statements, ctor, superCallExpression, firstStatement);
 
             // If we're actually replacing the original statement, we need to signal this to the caller.
             if (superCallExpression) {
@@ -1085,6 +1085,250 @@ namespace ts {
             }
         }
 
+        /**
+         * Gets a value indicating whether we need to add default value assignments for a
+         * function-like node.
+         *
+         * @param node A function-like node.
+         */
+        function shouldAddDefaultValueAssignments(node: FunctionLikeDeclaration): boolean {
+            return (node.transformFlags & TransformFlags.ContainsDefaultValueAssignments) !== 0;
+        }
+
+        /**
+         * Adds statements to the body of a function-like node if it contains parameters with
+         * binding patterns or initializers.
+         *
+         * @param statements The statements for the new function body.
+         * @param node A function-like node.
+         */
+        function addDefaultValueAssignmentsIfNeeded(statements: Statement[], node: FunctionLikeDeclaration): void {
+            if (!shouldAddDefaultValueAssignments(node)) {
+                return;
+            }
+
+            for (const parameter of node.parameters) {
+                const { name, initializer, dotDotDotToken } = parameter;
+
+                // A rest parameter cannot have a binding pattern or an initializer,
+                // so let's just ignore it.
+                if (dotDotDotToken) {
+                    continue;
+                }
+
+                if (isBindingPattern(name)) {
+                    addDefaultValueAssignmentForBindingPattern(statements, parameter, name, initializer);
+                }
+                else if (initializer) {
+                    addDefaultValueAssignmentForInitializer(statements, parameter, name, initializer);
+                }
+            }
+        }
+
+        /**
+         * Adds statements to the body of a function-like node for parameters with binding patterns
+         *
+         * @param statements The statements for the new function body.
+         * @param parameter The parameter for the function.
+         * @param name The name of the parameter.
+         * @param initializer The initializer for the parameter.
+         */
+        function addDefaultValueAssignmentForBindingPattern(statements: Statement[], parameter: ParameterDeclaration, name: BindingPattern, initializer: Expression): void {
+            const temp = getGeneratedNameForNode(parameter);
+
+            // In cases where a binding pattern is simply '[]' or '{}',
+            // we usually don't want to emit a var declaration; however, in the presence
+            // of an initializer, we must emit that expression to preserve side effects.
+            if (name.elements.length > 0) {
+                statements.push(
+                    setEmitFlags(
+                        createVariableStatement(
+                            /*modifiers*/ undefined,
+                            createVariableDeclarationList(
+                                flattenDestructuringBinding(
+                                    context,
+                                    parameter,
+                                    temp,
+                                    /*skipInitializer*/ false,
+                                    /*recordTempVariablesInLine*/ true,
+                                    FlattenLevel.All,
+                                    visitor
+                                )
+                            )
+                        ),
+                        EmitFlags.CustomPrologue
+                    )
+                );
+            }
+            else if (initializer) {
+                statements.push(
+                    setEmitFlags(
+                        createStatement(
+                            createAssignment(
+                                temp,
+                                visitNode(initializer, visitor, isExpression)
+                            )
+                        ),
+                        EmitFlags.CustomPrologue
+                    )
+                );
+            }
+        }
+
+        /**
+         * Adds statements to the body of a function-like node for parameters with initializers.
+         *
+         * @param statements The statements for the new function body.
+         * @param parameter The parameter for the function.
+         * @param name The name of the parameter.
+         * @param initializer The initializer for the parameter.
+         */
+        function addDefaultValueAssignmentForInitializer(statements: Statement[], parameter: ParameterDeclaration, name: Identifier, initializer: Expression): void {
+            initializer = visitNode(initializer, visitor, isExpression);
+            const statement = createIf(
+                createStrictEquality(
+                    getSynthesizedClone(name),
+                    createVoidZero()
+                ),
+                setEmitFlags(
+                    createBlock([
+                        createStatement(
+                            createAssignment(
+                                setEmitFlags(getMutableClone(name), EmitFlags.NoSourceMap),
+                                setEmitFlags(initializer, EmitFlags.NoSourceMap | getEmitFlags(initializer)),
+                                /*location*/ parameter
+                            )
+                        )
+                    ], /*location*/ parameter),
+                    EmitFlags.SingleLine | EmitFlags.NoTrailingSourceMap | EmitFlags.NoTokenSourceMaps
+                ),
+                /*elseStatement*/ undefined,
+                /*location*/ parameter
+            );
+            statement.startsOnNewLine = true;
+            setEmitFlags(statement, EmitFlags.NoTokenSourceMaps | EmitFlags.NoTrailingSourceMap | EmitFlags.CustomPrologue);
+            statements.push(statement);
+        }
+
+        /**
+         * Gets a value indicating whether we need to add statements to handle a rest parameter.
+         *
+         * @param node A ParameterDeclaration node.
+         * @param inConstructorWithSynthesizedSuper A value indicating whether the parameter is
+         *                                          part of a constructor declaration with a
+         *                                          synthesized call to `super`
+         */
+        function shouldAddRestParameter(node: ParameterDeclaration, inConstructorWithSynthesizedSuper: boolean) {
+            return node && node.dotDotDotToken && node.name.kind === SyntaxKind.Identifier && !inConstructorWithSynthesizedSuper;
+        }
+
+        /**
+         * Adds statements to the body of a function-like node if it contains a rest parameter.
+         *
+         * @param statements The statements for the new function body.
+         * @param node A function-like node.
+         * @param inConstructorWithSynthesizedSuper A value indicating whether the parameter is
+         *                                          part of a constructor declaration with a
+         *                                          synthesized call to `super`
+         */
+        function addRestParameterIfNeeded(statements: Statement[], node: FunctionLikeDeclaration, inConstructorWithSynthesizedSuper: boolean): void {
+            const parameter = lastOrUndefined(node.parameters);
+            if (!shouldAddRestParameter(parameter, inConstructorWithSynthesizedSuper)) {
+                return;
+            }
+
+            // `declarationName` is the name of the local declaration for the parameter.
+            const declarationName = getMutableClone(<Identifier>parameter.name);
+            setEmitFlags(declarationName, EmitFlags.NoSourceMap);
+
+            // `expressionName` is the name of the parameter used in expressions.
+            const expressionName = getSynthesizedClone(<Identifier>parameter.name);
+            const restIndex = node.parameters.length - 1;
+            const temp = createLoopVariable();
+
+            // var param = [];
+            statements.push(
+                setEmitFlags(
+                    createVariableStatement(
+                        /*modifiers*/ undefined,
+                        createVariableDeclarationList([
+                            createVariableDeclaration(
+                                declarationName,
+                                /*type*/ undefined,
+                                createArrayLiteral([])
+                            )
+                        ]),
+                        /*location*/ parameter
+                    ),
+                    EmitFlags.CustomPrologue
+                )
+            );
+
+            // for (var _i = restIndex; _i < arguments.length; _i++) {
+            //   param[_i - restIndex] = arguments[_i];
+            // }
+            const forStatement = createFor(
+                createVariableDeclarationList([
+                    createVariableDeclaration(temp, /*type*/ undefined, createLiteral(restIndex))
+                ], /*location*/ parameter),
+                createLessThan(
+                    temp,
+                    createPropertyAccess(createIdentifier("arguments"), "length"),
+                    /*location*/ parameter
+                ),
+                createPostfixIncrement(temp, /*location*/ parameter),
+                createBlock([
+                    startOnNewLine(
+                        createStatement(
+                            createAssignment(
+                                createElementAccess(
+                                    expressionName,
+                                    createSubtract(temp, createLiteral(restIndex))
+                                ),
+                                createElementAccess(createIdentifier("arguments"), temp)
+                            ),
+                            /*location*/ parameter
+                        )
+                    )
+                ])
+            );
+
+            setEmitFlags(forStatement, EmitFlags.CustomPrologue);
+            startOnNewLine(forStatement);
+            statements.push(forStatement);
+        }
+
+        /**
+         * Adds a statement to capture the `this` of a function declaration if it is needed.
+         *
+         * @param statements The statements for the new function body.
+         * @param node A node.
+         */
+        function addCaptureThisForNodeIfNeeded(statements: Statement[], node: Node): void {
+            if (node.transformFlags & TransformFlags.ContainsCapturedLexicalThis && node.kind !== SyntaxKind.ArrowFunction) {
+                captureThisForNode(statements, node, createThis());
+            }
+        }
+
+        function captureThisForNode(statements: Statement[], node: Node, initializer: Expression | undefined, originalStatement?: Statement): void {
+            enableSubstitutionsForCapturedThis();
+            const captureThisStatement = createVariableStatement(
+                /*modifiers*/ undefined,
+                createVariableDeclarationList([
+                    createVariableDeclaration(
+                        "_this",
+                        /*type*/ undefined,
+                        initializer
+                    )
+                ]),
+                originalStatement
+            );
+
+            setEmitFlags(captureThisStatement, EmitFlags.NoComments | EmitFlags.CustomPrologue);
+            setSourceMapRange(captureThisStatement, node);
+            statements.push(captureThisStatement);
+        }
+
         /**
          * Adds statements to the class body function for a class to define the members of the
          * class.
@@ -1282,7 +1526,7 @@ namespace ts {
                     /*typeParameters*/ undefined,
                     visitNodes(node.parameters, visitor, isParameter),
                     /*type*/ undefined,
-                    transformFunctionBody(node, visitor, currentSourceFile, context, enableSubstitutionsForCapturedThis),
+                    transformFunctionBody(node),
                     /*location*/ node
                 ),
                 /*original*/ node);
@@ -1309,7 +1553,7 @@ namespace ts {
                     /*typeParameters*/ undefined,
                     visitNodes(node.parameters, visitor, isParameter),
                     /*type*/ undefined,
-                    saveStateAndInvoke(node, node => transformFunctionBody(node, visitor, currentSourceFile, context, enableSubstitutionsForCapturedThis)),
+                    saveStateAndInvoke(node, transformFunctionBody),
                     location
                 ),
                 /*original*/ node
@@ -1319,6 +1563,96 @@ namespace ts {
             return expression;
         }
 
+        /**
+         * Transforms the body of a function-like node.
+         *
+         * @param node A function-like node.
+         */
+        function transformFunctionBody(node: FunctionLikeDeclaration) {
+            let multiLine = false; // indicates whether the block *must* be emitted as multiple lines
+            let singleLine = false; // indicates whether the block *may* be emitted as a single line
+            let statementsLocation: TextRange;
+            let closeBraceLocation: TextRange;
+
+            const statements: Statement[] = [];
+            const body = node.body;
+            let statementOffset: number;
+
+            context.startLexicalEnvironment();
+            if (isBlock(body)) {
+                // ensureUseStrict is false because no new prologue-directive should be added.
+                // addPrologueDirectives will simply put already-existing directives at the beginning of the target statement-array
+                statementOffset = addPrologueDirectives(statements, body.statements, /*ensureUseStrict*/ false, visitor);
+            }
+
+            addCaptureThisForNodeIfNeeded(statements, node);
+            addDefaultValueAssignmentsIfNeeded(statements, node);
+            addRestParameterIfNeeded(statements, node, /*inConstructorWithSynthesizedSuper*/ false);
+
+            // If we added any generated statements, this must be a multi-line block.
+            if (!multiLine && statements.length > 0) {
+                multiLine = true;
+            }
+
+            if (isBlock(body)) {
+                statementsLocation = body.statements;
+                addRange(statements, visitNodes(body.statements, visitor, isStatement, statementOffset));
+
+                // If the original body was a multi-line block, this must be a multi-line block.
+                if (!multiLine && body.multiLine) {
+                    multiLine = true;
+                }
+            }
+            else {
+                Debug.assert(node.kind === SyntaxKind.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
+                // being emitted for the end position only.
+                statementsLocation = moveRangeEnd(body, -1);
+
+                const equalsGreaterThanToken = (<ArrowFunction>node).equalsGreaterThanToken;
+                if (!nodeIsSynthesized(equalsGreaterThanToken) && !nodeIsSynthesized(body)) {
+                    if (rangeEndIsOnSameLineAsRangeStart(equalsGreaterThanToken, body, currentSourceFile)) {
+                        singleLine = true;
+                    }
+                    else {
+                        multiLine = true;
+                    }
+                }
+
+                const expression = visitNode(body, visitor, isExpression);
+                const returnStatement = createReturn(expression, /*location*/ body);
+                setEmitFlags(returnStatement, EmitFlags.NoTokenSourceMaps | EmitFlags.NoTrailingSourceMap | EmitFlags.NoTrailingComments);
+                statements.push(returnStatement);
+
+                // To align with the source map emit for the old emitter, we set a custom
+                // source map location for the close brace.
+                closeBraceLocation = body;
+            }
+
+            const lexicalEnvironment = context.endLexicalEnvironment();
+            addRange(statements, lexicalEnvironment);
+
+            // If we added any final generated statements, this must be a multi-line block
+            if (!multiLine && lexicalEnvironment && lexicalEnvironment.length) {
+                multiLine = true;
+            }
+
+            const block = createBlock(createNodeArray(statements, statementsLocation), node.body, multiLine);
+            if (!multiLine && singleLine) {
+                setEmitFlags(block, EmitFlags.SingleLine);
+            }
+
+            if (closeBraceLocation) {
+                setTokenSourceMapRange(block, SyntaxKind.CloseBraceToken, closeBraceLocation);
+            }
+
+            setOriginalNode(block, node.body);
+            return block;
+        }
+
         /**
          * Visits an ExpressionStatement that contains a destructuring assignment.
          *
@@ -1606,7 +1940,177 @@ namespace ts {
         }
 
         function convertForOfToFor(node: ForOfStatement, convertedLoopBodyStatements: Statement[]): ForStatement {
-            return <ForStatement>convertForOf(node, convertedLoopBodyStatements, visitor, enableSubstitutionsForBlockScopedBindings, context, /*transformRest*/ false);
+            // The following ES6 code:
+            //
+            //    for (let v of expr) { }
+            //
+            // should be emitted as
+            //
+            //    for (var _i = 0, _a = expr; _i < _a.length; _i++) {
+            //        var v = _a[_i];
+            //    }
+            //
+            // where _a and _i are temps emitted to capture the RHS and the counter,
+            // respectively.
+            // When the left hand side is an expression instead of a let declaration,
+            // the "let v" is not emitted.
+            // When the left hand side is a let/const, the v is renamed if there is
+            // another v in scope.
+            // Note that all assignments to the LHS are emitted in the body, including
+            // all destructuring.
+            // Note also that because an extra statement is needed to assign to the LHS,
+            // for-of bodies are always emitted as blocks.
+
+            const expression = visitNode(node.expression, visitor, isExpression);
+            const initializer = node.initializer;
+            const statements: Statement[] = [];
+
+            // In the case where the user wrote an identifier as the RHS, like this:
+            //
+            //     for (let v of arr) { }
+            //
+            // we don't want to emit a temporary variable for the RHS, just use it directly.
+            const counter = createLoopVariable();
+            const rhsReference = expression.kind === SyntaxKind.Identifier
+                ? createUniqueName((<Identifier>expression).text)
+                : createTempVariable(/*recordTempVariable*/ undefined);
+            const elementAccess = createElementAccess(rhsReference, counter);
+
+            // Initialize LHS
+            // var v = _a[_i];
+            if (isVariableDeclarationList(initializer)) {
+                if (initializer.flags & NodeFlags.BlockScoped) {
+                    enableSubstitutionsForBlockScopedBindings();
+                }
+
+                const firstOriginalDeclaration = firstOrUndefined(initializer.declarations);
+                if (firstOriginalDeclaration && isBindingPattern(firstOriginalDeclaration.name)) {
+                    // This works whether the declaration is a var, let, or const.
+                    // It will use rhsIterationValue _a[_i] as the initializer.
+                    const declarations = flattenDestructuringBinding(
+                        context,
+                        firstOriginalDeclaration,
+                        elementAccess,
+                        /*skipInitializer*/ false,
+                        /*recordTempVariablesInLine*/ true,
+                        FlattenLevel.All,
+                        visitor
+                    );
+
+                    const declarationList = createVariableDeclarationList(declarations, /*location*/ initializer);
+                    setOriginalNode(declarationList, initializer);
+
+                    // Adjust the source map range for the first declaration to align with the old
+                    // emitter.
+                    const firstDeclaration = declarations[0];
+                    const lastDeclaration = lastOrUndefined(declarations);
+                    setSourceMapRange(declarationList, createRange(firstDeclaration.pos, lastDeclaration.end));
+
+                    statements.push(
+                        createVariableStatement(
+                            /*modifiers*/ undefined,
+                            declarationList
+                        )
+                    );
+                }
+                else {
+                    // The following call does not include the initializer, so we have
+                    // to emit it separately.
+                    statements.push(
+                        createVariableStatement(
+                            /*modifiers*/ undefined,
+                            setOriginalNode(
+                                createVariableDeclarationList([
+                                    createVariableDeclaration(
+                                        firstOriginalDeclaration ? firstOriginalDeclaration.name : createTempVariable(/*recordTempVariable*/ undefined),
+                                        /*type*/ undefined,
+                                        createElementAccess(rhsReference, counter)
+                                    )
+                                ], /*location*/ moveRangePos(initializer, -1)),
+                                initializer
+                            ),
+                            /*location*/ moveRangeEnd(initializer, -1)
+                        )
+                    );
+                }
+            }
+            else {
+                // Initializer is an expression. Emit the expression in the body, so that it's
+                // evaluated on every iteration.
+                const assignment = createAssignment(initializer, elementAccess);
+                if (isDestructuringAssignment(assignment)) {
+                    // This is a destructuring pattern, so we flatten the destructuring instead.
+                    statements.push(
+                        createStatement(
+                            flattenDestructuringAssignment(
+                                context,
+                                assignment,
+                                /*needsValue*/ false,
+                                FlattenLevel.All,
+                                /*createAssignmentCallback*/ undefined,
+                                visitor
+                            )
+                        )
+                    );
+                }
+                else {
+                    // Currently there is not way to check that assignment is binary expression of destructing assignment
+                    // so we have to cast never type to binaryExpression
+                    (<BinaryExpression>assignment).end = initializer.end;
+                    statements.push(createStatement(assignment, /*location*/ moveRangeEnd(initializer, -1)));
+                }
+            }
+
+            let bodyLocation: TextRange;
+            let statementsLocation: TextRange;
+            if (convertedLoopBodyStatements) {
+                addRange(statements, convertedLoopBodyStatements);
+            }
+            else {
+                const statement = visitNode(node.statement, visitor, isStatement);
+                if (isBlock(statement)) {
+                    addRange(statements, statement.statements);
+                    bodyLocation = statement;
+                    statementsLocation = statement.statements;
+                }
+                else {
+                    statements.push(statement);
+                }
+            }
+
+            // The old emitter does not emit source maps for the expression
+            setEmitFlags(expression, EmitFlags.NoSourceMap | getEmitFlags(expression));
+
+            // The old emitter does not emit source maps for the block.
+            // We add the location to preserve comments.
+            const body = createBlock(
+                createNodeArray(statements, /*location*/ statementsLocation),
+                /*location*/ bodyLocation
+            );
+
+            setEmitFlags(body, EmitFlags.NoSourceMap | EmitFlags.NoTokenSourceMaps);
+
+            const forStatement = createFor(
+                setEmitFlags(
+                    createVariableDeclarationList([
+                        createVariableDeclaration(counter, /*type*/ undefined, createLiteral(0), /*location*/ moveRangePos(node.expression, -1)),
+                        createVariableDeclaration(rhsReference, /*type*/ undefined, expression, /*location*/ node.expression)
+                    ], /*location*/ node.expression),
+                    EmitFlags.NoHoisting
+                ),
+                createLessThan(
+                    counter,
+                    createPropertyAccess(rhsReference, "length"),
+                    /*location*/ node.expression
+                ),
+                createPostfixIncrement(counter, /*location*/ node.expression),
+                body,
+                /*location*/ node
+            );
+
+            // Disable trailing source maps for the OpenParenToken to align source map emit with the old emitter.
+            setEmitFlags(forStatement, EmitFlags.NoTokenTrailingSourceMaps);
+            return forStatement;
         }
 
         /**
@@ -2592,7 +3096,7 @@ namespace ts {
             const statements: Statement[] = [];
             startLexicalEnvironment();
             addRange(statements, prologue);
-            addCaptureThisForNodeIfNeeded(statements, node, enableSubstitutionsForCapturedThis);
+            addCaptureThisForNodeIfNeeded(statements, node);
             addRange(statements, visitNodes(createNodeArray(remaining), visitor, isStatement));
             addRange(statements, endLexicalEnvironment());
             const clone = getMutableClone(node);
diff --git a/src/compiler/transformers/es2016.ts b/src/compiler/transformers/es2016.ts
index 56d7fb0249a..5959753fcef 100644
--- a/src/compiler/transformers/es2016.ts
+++ b/src/compiler/transformers/es2016.ts
@@ -17,84 +17,75 @@ namespace ts {
         }
 
         function visitor(node: Node): VisitResult<Node> {
-            if (node.transformFlags & TransformFlags.ES2016) {
-                return visitorWorker(node);
-            }
-            else if (node.transformFlags & TransformFlags.ContainsES2016) {
-                return visitEachChild(node, visitor, context);
-            }
-            else {
+            if ((node.transformFlags & TransformFlags.ContainsES2016) === 0) {
                 return node;
             }
-        }
-
-        function visitorWorker(node: Node): VisitResult<Node> {
             switch (node.kind) {
                 case SyntaxKind.BinaryExpression:
                     return visitBinaryExpression(<BinaryExpression>node);
                 default:
-                    Debug.failBadSyntaxKind(node);
                     return visitEachChild(node, visitor, context);
             }
         }
 
         function visitBinaryExpression(node: BinaryExpression): Expression {
-            // We are here because ES2016 adds support for the exponentiation operator.
+            switch (node.operatorToken.kind) {
+                case SyntaxKind.AsteriskAsteriskEqualsToken:
+                    return visitExponentiationAssignmentExpression(node);
+                case SyntaxKind.AsteriskAsteriskToken:
+                    return visitExponentiationExpression(node);
+                default:
+                    return visitEachChild(node, visitor, context);
+            }
+        }
+
+        function visitExponentiationAssignmentExpression(node: BinaryExpression) {
+            let target: Expression;
+            let value: Expression;
             const left = visitNode(node.left, visitor, isExpression);
             const right = visitNode(node.right, visitor, isExpression);
-            if (node.operatorToken.kind === SyntaxKind.AsteriskAsteriskEqualsToken) {
-                let target: Expression;
-                let value: Expression;
-                if (isElementAccessExpression(left)) {
-                    // Transforms `a[x] **= b` into `(_a = a)[_x = x] = Math.pow(_a[_x], b)`
-                    const expressionTemp = createTempVariable(hoistVariableDeclaration);
-
-                    const argumentExpressionTemp = createTempVariable(hoistVariableDeclaration);
-
-                    target = createElementAccess(
-                        createAssignment(expressionTemp, left.expression, /*location*/ left.expression),
-                        createAssignment(argumentExpressionTemp, left.argumentExpression, /*location*/ left.argumentExpression),
-                        /*location*/ left
-                    );
-
-                    value = createElementAccess(
-                        expressionTemp,
-                        argumentExpressionTemp,
-                        /*location*/ left
-                    );
-                }
-                else if (isPropertyAccessExpression(left)) {
-                    // Transforms `a.x **= b` into `(_a = a).x = Math.pow(_a.x, b)`
-                    const expressionTemp = createTempVariable(hoistVariableDeclaration);
-
-                    target = createPropertyAccess(
-                        createAssignment(expressionTemp, left.expression, /*location*/ left.expression),
-                        left.name,
-                        /*location*/ left
-                    );
-
-                    value = createPropertyAccess(
-                        expressionTemp,
-                        left.name,
-                        /*location*/ left
-                    );
-                }
-                else {
-                    // Transforms `a **= b` into `a = Math.pow(a, b)`
-                    target = left;
-                    value = left;
-                }
-
-                return createAssignment(target, createMathPow(value, right, /*location*/ node), /*location*/ node);
+            if (isElementAccessExpression(left)) {
+                // Transforms `a[x] **= b` into `(_a = a)[_x = x] = Math.pow(_a[_x], b)`
+                const expressionTemp = createTempVariable(hoistVariableDeclaration);
+                const argumentExpressionTemp = createTempVariable(hoistVariableDeclaration);
+                target = createElementAccess(
+                    createAssignment(expressionTemp, left.expression, /*location*/ left.expression),
+                    createAssignment(argumentExpressionTemp, left.argumentExpression, /*location*/ left.argumentExpression),
+                    /*location*/ left
+                );
+                value = createElementAccess(
+                    expressionTemp,
+                    argumentExpressionTemp,
+                    /*location*/ left
+                );
             }
-            else if (node.operatorToken.kind === SyntaxKind.AsteriskAsteriskToken) {
-                // Transforms `a ** b` into `Math.pow(a, b)`
-                return createMathPow(left, right, /*location*/ node);
+            else if (isPropertyAccessExpression(left)) {
+                // Transforms `a.x **= b` into `(_a = a).x = Math.pow(_a.x, b)`
+                const expressionTemp = createTempVariable(hoistVariableDeclaration);
+                target = createPropertyAccess(
+                    createAssignment(expressionTemp, left.expression, /*location*/ left.expression),
+                    left.name,
+                    /*location*/ left
+                );
+                value = createPropertyAccess(
+                    expressionTemp,
+                    left.name,
+                    /*location*/ left
+                );
             }
             else {
-                Debug.failBadSyntaxKind(node);
-                return visitEachChild(node, visitor, context);
+                // Transforms `a **= b` into `a = Math.pow(a, b)`
+                target = left;
+                value = left;
             }
+            return createAssignment(target, createMathPow(value, right, /*location*/ node), /*location*/ node);
+        }
+
+        function visitExponentiationExpression(node: BinaryExpression) {
+            // Transforms `a ** b` into `Math.pow(a, b)`
+            const left = visitNode(node.left, visitor, isExpression);
+            const right = visitNode(node.right, visitor, isExpression);
+            return createMathPow(left, right, /*location*/ node);
         }
     }
 }
diff --git a/src/compiler/transformers/esnext.ts b/src/compiler/transformers/esnext.ts
index 2a7fb855a92..757fd7957c9 100644
--- a/src/compiler/transformers/esnext.ts
+++ b/src/compiler/transformers/esnext.ts
@@ -7,39 +7,38 @@ namespace ts {
         const {
             endLexicalEnvironment
         } = context;
-        let currentSourceFile: SourceFile;
         return transformSourceFile;
 
         function transformSourceFile(node: SourceFile) {
-            currentSourceFile = node;
             return visitEachChild(node, visitor, context);
         }
 
         function visitor(node: Node): VisitResult<Node> {
-            if (node.transformFlags & TransformFlags.ESNext) {
-                return visitorWorker(node);
-            }
-            else if (node.transformFlags & TransformFlags.ContainsESNext) {
-                return visitNodeContainingESNext(node);
-            }
-            else {
-                return node;
-            }
+            return visitorWorker(node, /*noDestructuringValue*/ false);
         }
 
-        function visitorWorker(node: Node): VisitResult<Node> {
+        function visitorNoDestructuringValue(node: Node): VisitResult<Node> {
+            return visitorWorker(node, /*noDestructuringValue*/ true);
+        }
+
+        function visitorWorker(node: Node, noDestructuringValue: boolean): VisitResult<Node> {
+            if ((node.transformFlags & TransformFlags.ContainsESNext) === 0) {
+                return node;
+            }
+
             switch (node.kind) {
                 case SyntaxKind.ObjectLiteralExpression:
                     return visitObjectLiteralExpression(node as ObjectLiteralExpression);
                 case SyntaxKind.BinaryExpression:
-                    return visitBinaryExpression(node as BinaryExpression, /*needsDestructuringValue*/ true);
+                    return visitBinaryExpression(node as BinaryExpression, noDestructuringValue);
                 case SyntaxKind.VariableDeclaration:
                     return visitVariableDeclaration(node as VariableDeclaration);
                 case SyntaxKind.ForOfStatement:
                     return visitForOfStatement(node as ForOfStatement);
-                case SyntaxKind.ObjectBindingPattern:
-                case SyntaxKind.ArrayBindingPattern:
-                    return node;
+                case SyntaxKind.ForStatement:
+                    return visitForStatement(node as ForStatement);
+                case SyntaxKind.VoidExpression:
+                    return visitVoidExpression(node as VoidExpression);
                 case SyntaxKind.Constructor:
                     return visitConstructorDeclaration(node as ConstructorDeclaration);
                 case SyntaxKind.MethodDeclaration:
@@ -56,20 +55,13 @@ namespace ts {
                     return visitArrowFunction(node as ArrowFunction);
                 case SyntaxKind.Parameter:
                     return visitParameter(node as ParameterDeclaration);
-                default:
-                    Debug.failBadSyntaxKind(node);
-                    return visitEachChild(node, visitor, context);
-            }
-        }
-
-        function visitNodeContainingESNext(node: Node) {
-            switch (node.kind) {
                 case SyntaxKind.ExpressionStatement:
                     return visitExpressionStatement(node as ExpressionStatement);
                 case SyntaxKind.ParenthesizedExpression:
-                    return visitParenthesizedExpression(node as ParenthesizedExpression, /*needsDestructuringValue*/ true);
+                    return visitParenthesizedExpression(node as ParenthesizedExpression, noDestructuringValue);
+                default:
+                    return visitEachChild(node, visitor, context);
             }
-            return visitEachChild(node, visitor, context);
         }
 
         function chunkObjectLiteralElements(elements: ObjectLiteralElement[]): Expression[] {
@@ -105,38 +97,27 @@ namespace ts {
         }
 
         function visitObjectLiteralExpression(node: ObjectLiteralExpression): Expression {
-            // 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});
-            // If the first element is a spread element, then the first argument to __assign is {}:
-            //     { ...o, a, b, ...o2 } => __assign({}, o, {a, b}, o2)
-            const objects = chunkObjectLiteralElements(node.properties);
-            if (objects.length && objects[0].kind !== SyntaxKind.ObjectLiteralExpression) {
-                objects.unshift(createObjectLiteral());
+            if (node.transformFlags & TransformFlags.ContainsObjectSpread) {
+                // 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});
+                // If the first element is a spread element, then the first argument to __assign is {}:
+                //     { ...o, a, b, ...o2 } => __assign({}, o, {a, b}, o2)
+                const objects = chunkObjectLiteralElements(node.properties);
+                if (objects.length && objects[0].kind !== SyntaxKind.ObjectLiteralExpression) {
+                    objects.unshift(createObjectLiteral());
+                }
+                return createCall(createIdentifier("__assign"), undefined, objects);
             }
-            return createCall(createIdentifier("__assign"), undefined, objects);
+            return visitEachChild(node, visitor, context);
         }
 
         function visitExpressionStatement(node: ExpressionStatement): ExpressionStatement {
-            switch (node.expression.kind) {
-                case SyntaxKind.ParenthesizedExpression:
-                    return updateStatement(node, visitParenthesizedExpression(<ParenthesizedExpression>node.expression, /*needsDestructuringValue*/ false));
-                case SyntaxKind.BinaryExpression:
-                    return updateStatement(node, visitBinaryExpression(<BinaryExpression>node.expression, /*needsDestructuringValue*/ false));
-            }
-            return visitEachChild(node, visitor, context);
+            return visitEachChild(node, visitorNoDestructuringValue, context);
         }
 
-        function visitParenthesizedExpression(node: ParenthesizedExpression, needsDestructuringValue: boolean): ParenthesizedExpression {
-            if (!needsDestructuringValue) {
-                switch (node.expression.kind) {
-                    case SyntaxKind.ParenthesizedExpression:
-                        return updateParen(node, visitParenthesizedExpression(<ParenthesizedExpression>node.expression, /*needsDestructuringValue*/ false));
-                    case SyntaxKind.BinaryExpression:
-                        return updateParen(node, visitBinaryExpression(<BinaryExpression>node.expression, /*needsDestructuringValue*/ false));
-                }
-            }
-            return visitEachChild(node, visitor, context);
+        function visitParenthesizedExpression(node: ParenthesizedExpression, noDestructuringValue: boolean): ParenthesizedExpression {
+            return visitEachChild(node, noDestructuringValue ? visitorNoDestructuringValue : visitor, context);
         }
 
         /**
@@ -144,17 +125,24 @@ namespace ts {
          *
          * @param node A BinaryExpression node.
          */
-        function visitBinaryExpression(node: BinaryExpression, needsDestructuringValue: boolean): Expression {
+        function visitBinaryExpression(node: BinaryExpression, noDestructuringValue: boolean): Expression {
             if (isDestructuringAssignment(node) && node.left.transformFlags & TransformFlags.ContainsObjectRest) {
                 return flattenDestructuringAssignment(
                     context,
                     node,
-                    needsDestructuringValue,
+                    !noDestructuringValue,
                     FlattenLevel.ObjectRest,
                     /*createAssignmentCallback*/ undefined,
                     visitor
                 );
             }
+            else if (node.operatorToken.kind === SyntaxKind.CommaToken) {
+                return updateBinary(
+                    node,
+                    visitNode(node.left, visitorNoDestructuringValue, isExpression),
+                    visitNode(node.right, noDestructuringValue ? visitorNoDestructuringValue : visitor, isExpression)
+                );
+            }
             return visitEachChild(node, visitor, context);
         }
 
@@ -178,6 +166,20 @@ namespace ts {
             return visitEachChild(node, visitor, context);
         }
 
+        function visitForStatement(node: ForStatement): VisitResult<Statement> {
+            return updateFor(
+                node,
+                visitNode(node.initializer, visitorNoDestructuringValue, isForInitializer),
+                visitNode(node.condition, visitor, isExpression),
+                visitNode(node.incrementor, visitor, isExpression),
+                visitNode(node.statement, visitor, isStatement)
+            );
+        }
+
+        function visitVoidExpression(node: VoidExpression) {
+            return visitEachChild(node, visitorNoDestructuringValue, context);
+        }
+
         /**
          * Visits a ForOfStatement and converts it into a ES2015-compatible ForOfStatement.
          *
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 8a6e74030d5..b22fba32da9 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -2721,7 +2721,7 @@ namespace ts {
         resolvedSignature?: Signature;    // Cached signature of signature node or call expression
         resolvedSymbol?: Symbol;          // Cached name resolution result
         resolvedIndexInfo?: IndexInfo;    // Cached indexing info resolution result
-        maybeTypePredicate?: boolean;     // Cached check whether call expression might reference a type predicate 
+        maybeTypePredicate?: boolean;     // Cached check whether call expression might reference a type predicate
         enumMemberValue?: number;         // Constant value of enum member
         isVisible?: boolean;              // Is this node visible
         hasReportedStatementInAmbientContext?: boolean;  // Cache boolean if we report statements in ambient context
@@ -3558,36 +3558,34 @@ namespace ts {
         TypeScript = 1 << 0,
         ContainsTypeScript = 1 << 1,
         ContainsJsx = 1 << 2,
-        ESNext = 1 << 3,
-        ContainsESNext = 1 << 4,
-        ContainsES2017 = 1 << 5,
-        ES2016 = 1 << 6,
-        ContainsES2016 = 1 << 7,
-        ES2015 = 1 << 8,
-        ContainsES2015 = 1 << 9,
-        Generator = 1 << 10,
-        ContainsGenerator = 1 << 11,
-        DestructuringAssignment = 1 << 12,
-        ContainsDestructuringAssignment = 1 << 13,
+        ContainsESNext = 1 << 3,
+        ContainsES2017 = 1 << 4,
+        ContainsES2016 = 1 << 5,
+        ES2015 = 1 << 6,
+        ContainsES2015 = 1 << 7,
+        Generator = 1 << 8,
+        ContainsGenerator = 1 << 9,
+        DestructuringAssignment = 1 << 10,
+        ContainsDestructuringAssignment = 1 << 11,
 
         // Markers
         // - Flags used to indicate that a subtree contains a specific transformation.
-        ContainsDecorators = 1 << 14,
-        ContainsPropertyInitializer = 1 << 15,
-        ContainsLexicalThis = 1 << 16,
-        ContainsCapturedLexicalThis = 1 << 17,
-        ContainsLexicalThisInComputedPropertyName = 1 << 18,
-        ContainsDefaultValueAssignments = 1 << 19,
-        ContainsParameterPropertyAssignments = 1 << 20,
-        ContainsSpread = 1 << 21,
+        ContainsDecorators = 1 << 12,
+        ContainsPropertyInitializer = 1 << 13,
+        ContainsLexicalThis = 1 << 14,
+        ContainsCapturedLexicalThis = 1 << 15,
+        ContainsLexicalThisInComputedPropertyName = 1 << 16,
+        ContainsDefaultValueAssignments = 1 << 17,
+        ContainsParameterPropertyAssignments = 1 << 18,
+        ContainsSpread = 1 << 19,
+        ContainsObjectSpread = 1 << 20,
         ContainsRest = ContainsSpread,
-        ContainsObjectSpread = 1 << 22,
         ContainsObjectRest = ContainsObjectSpread,
-        ContainsComputedPropertyName = 1 << 23,
-        ContainsBlockScopedBinding = 1 << 24,
-        ContainsBindingPattern = 1 << 25,
-        ContainsYield = 1 << 26,
-        ContainsHoistedDeclarationOrCompletion = 1 << 27,
+        ContainsComputedPropertyName = 1 << 21,
+        ContainsBlockScopedBinding = 1 << 22,
+        ContainsBindingPattern = 1 << 23,
+        ContainsYield = 1 << 24,
+        ContainsHoistedDeclarationOrCompletion = 1 << 25,
 
         HasComputedFlags = 1 << 29, // Transform flags have been computed.
 
@@ -3595,9 +3593,9 @@ namespace ts {
         // - Bitmasks that are used to assert facts about the syntax of a node and its subtree.
         AssertTypeScript = TypeScript | ContainsTypeScript,
         AssertJsx = ContainsJsx,
-        AssertESNext = ESNext | ContainsESNext,
+        AssertESNext = ContainsESNext,
         AssertES2017 = ContainsES2017,
-        AssertES2016 = ES2016 | ContainsES2016,
+        AssertES2016 = ContainsES2016,
         AssertES2015 = ES2015 | ContainsES2015,
         AssertGenerator = Generator | ContainsGenerator,
         AssertDestructuringAssignment = DestructuringAssignment | ContainsDestructuringAssignment,
@@ -3605,7 +3603,7 @@ namespace ts {
         // Scope Exclusions
         // - Bitmasks that exclude flags from propagating out of a specific context
         //   into the subtree flags of their container.
-        NodeExcludes = TypeScript | ESNext | ES2016 | ES2015 | DestructuringAssignment | Generator | HasComputedFlags,
+        NodeExcludes = TypeScript | ES2015 | DestructuringAssignment | Generator | HasComputedFlags,
         ArrowFunctionExcludes = NodeExcludes | ContainsDecorators | ContainsDefaultValueAssignments | ContainsLexicalThis | ContainsParameterPropertyAssignments | ContainsBlockScopedBinding | ContainsYield | ContainsHoistedDeclarationOrCompletion | ContainsBindingPattern | ContainsObjectRest,
         FunctionExcludes = NodeExcludes | ContainsDecorators | ContainsDefaultValueAssignments | ContainsCapturedLexicalThis | ContainsLexicalThis | ContainsParameterPropertyAssignments | ContainsBlockScopedBinding | ContainsYield | ContainsHoistedDeclarationOrCompletion | ContainsBindingPattern | ContainsObjectRest,
         ConstructorExcludes = NodeExcludes | ContainsDefaultValueAssignments | ContainsLexicalThis | ContainsCapturedLexicalThis | ContainsBlockScopedBinding | ContainsYield | ContainsHoistedDeclarationOrCompletion | ContainsBindingPattern | ContainsObjectRest,
diff --git a/tests/baselines/reference/objectRestForOf.js b/tests/baselines/reference/objectRestForOf.js
index 26ebd8f8229..f8872ffbae4 100644
--- a/tests/baselines/reference/objectRestForOf.js
+++ b/tests/baselines/reference/objectRestForOf.js
@@ -30,14 +30,14 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 let array;
-for (var array_1 of array) {
-    var { x } = array_1, restOf = __rest(array_1, ["x"]);
+for (let _a of array) {
+    let { x } = _a, restOf = __rest(_a, ["x"]);
     [x, restOf];
 }
 let xx;
 let rrestOff;
-for (var array_2 of array) {
-    ({ x: xx } = array_2, rrestOff = __rest(array_2, ["x"]));
+for (let _b of array) {
+    ({ x: xx } = _b, rrestOff = __rest(_b, ["x"]));
     [xx, rrestOff];
 }
 for (const norest of array.map(a => (__assign({}, a, { x: 'a string' })))) {
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js
index 8355d61d9c3..9f7a70699bd 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js
@@ -194,13 +194,13 @@ for (_b = getRobot(), _c = _b.name, nameA = _c === void 0 ? "noName" : _c, _b, i
 for (_d = { name: "trimmer", skill: "trimming" }, _e = _d.name, nameA = _e === void 0 ? "noName" : _e, _d, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for (_f = multiRobot.skills, _g = _f === void 0 ? { primary: "none", secondary: "none" } : _f, _h = _g.primary, primaryA = _h === void 0 ? "primary" : _h, _j = _g.secondary, secondaryA = _j === void 0 ? "secondary" : _j, multiRobot, multiRobot, i = 0; i < 1; i++) {
+for (_f = multiRobot.skills, _g = _f === void 0 ? { primary: "none", secondary: "none" } : _f, _h = _g.primary, primaryA = _h === void 0 ? "primary" : _h, _j = _g.secondary, secondaryA = _j === void 0 ? "secondary" : _j, multiRobot, i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for (_k = getMultiRobot(), (_l = _k.skills, _m = _l === void 0 ? { primary: "none", secondary: "none" } : _l, _o = _m.primary, primaryA = _o === void 0 ? "primary" : _o, _p = _m.secondary, secondaryA = _p === void 0 ? "secondary" : _p, _k), _k, i = 0; i < 1; i++) {
+for (_k = getMultiRobot(), _l = _k.skills, _m = _l === void 0 ? { primary: "none", secondary: "none" } : _l, _o = _m.primary, primaryA = _o === void 0 ? "primary" : _o, _p = _m.secondary, secondaryA = _p === void 0 ? "secondary" : _p, _k, i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for (_q = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, (_r = _q.skills, _s = _r === void 0 ? { primary: "none", secondary: "none" } : _r, _t = _s.primary, primaryA = _t === void 0 ? "primary" : _t, _u = _s.secondary, secondaryA = _u === void 0 ? "secondary" : _u, _q), _q,
+for (_q = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _r = _q.skills, _s = _r === void 0 ? { primary: "none", secondary: "none" } : _r, _t = _s.primary, primaryA = _t === void 0 ? "primary" : _t, _u = _s.secondary, secondaryA = _u === void 0 ? "secondary" : _u, _q,
     i = 0; i < 1; i++) {
     console.log(primaryA);
 }
@@ -213,13 +213,13 @@ for (_w = getRobot(), _x = _w.name, name = _x === void 0 ? "noName" : _x, _w, i
 for (_y = { name: "trimmer", skill: "trimming" }, _z = _y.name, name = _z === void 0 ? "noName" : _z, _y, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for (_0 = multiRobot.skills, _1 = _0 === void 0 ? { primary: "none", secondary: "none" } : _0, _2 = _1.primary, primary = _2 === void 0 ? "primary" : _2, _3 = _1.secondary, secondary = _3 === void 0 ? "secondary" : _3, multiRobot, multiRobot, i = 0; i < 1; i++) {
+for (_0 = multiRobot.skills, _1 = _0 === void 0 ? { primary: "none", secondary: "none" } : _0, _2 = _1.primary, primary = _2 === void 0 ? "primary" : _2, _3 = _1.secondary, secondary = _3 === void 0 ? "secondary" : _3, multiRobot, i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for (_4 = getMultiRobot(), (_5 = _4.skills, _6 = _5 === void 0 ? { primary: "none", secondary: "none" } : _5, _7 = _6.primary, primary = _7 === void 0 ? "primary" : _7, _8 = _6.secondary, secondary = _8 === void 0 ? "secondary" : _8, _4), _4, i = 0; i < 1; i++) {
+for (_4 = getMultiRobot(), _5 = _4.skills, _6 = _5 === void 0 ? { primary: "none", secondary: "none" } : _5, _7 = _6.primary, primary = _7 === void 0 ? "primary" : _7, _8 = _6.secondary, secondary = _8 === void 0 ? "secondary" : _8, _4, i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for (_9 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, (_10 = _9.skills, _11 = _10 === void 0 ? { primary: "none", secondary: "none" } : _10, _12 = _11.primary, primary = _12 === void 0 ? "primary" : _12, _13 = _11.secondary, secondary = _13 === void 0 ? "secondary" : _13, _9), _9,
+for (_9 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _10 = _9.skills, _11 = _10 === void 0 ? { primary: "none", secondary: "none" } : _10, _12 = _11.primary, primary = _12 === void 0 ? "primary" : _12, _13 = _11.secondary, secondary = _13 === void 0 ? "secondary" : _13, _9,
     i = 0; i < 1; i++) {
     console.log(primaryA);
 }
@@ -232,13 +232,13 @@ for (_16 = getRobot(), _17 = _16.name, nameA = _17 === void 0 ? "noName" : _17,
 for (_19 = { name: "trimmer", skill: "trimming" }, _20 = _19.name, nameA = _20 === void 0 ? "noName" : _20, _21 = _19.skill, skillA = _21 === void 0 ? "skill" : _21, _19, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for (_22 = multiRobot.name, nameA = _22 === void 0 ? "noName" : _22, _23 = multiRobot.skills, _24 = _23 === void 0 ? { primary: "none", secondary: "none" } : _23, _25 = _24.primary, primaryA = _25 === void 0 ? "primary" : _25, _26 = _24.secondary, secondaryA = _26 === void 0 ? "secondary" : _26, multiRobot, multiRobot, i = 0; i < 1; i++) {
+for (_22 = multiRobot.name, nameA = _22 === void 0 ? "noName" : _22, _23 = multiRobot.skills, _24 = _23 === void 0 ? { primary: "none", secondary: "none" } : _23, _25 = _24.primary, primaryA = _25 === void 0 ? "primary" : _25, _26 = _24.secondary, secondaryA = _26 === void 0 ? "secondary" : _26, multiRobot, i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for (_27 = getMultiRobot(), (_28 = _27.name, nameA = _28 === void 0 ? "noName" : _28, _29 = _27.skills, _30 = _29 === void 0 ? { primary: "none", secondary: "none" } : _29, _31 = _30.primary, primaryA = _31 === void 0 ? "primary" : _31, _32 = _30.secondary, secondaryA = _32 === void 0 ? "secondary" : _32, _27), _27, i = 0; i < 1; i++) {
+for (_27 = getMultiRobot(), _28 = _27.name, nameA = _28 === void 0 ? "noName" : _28, _29 = _27.skills, _30 = _29 === void 0 ? { primary: "none", secondary: "none" } : _29, _31 = _30.primary, primaryA = _31 === void 0 ? "primary" : _31, _32 = _30.secondary, secondaryA = _32 === void 0 ? "secondary" : _32, _27, i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for (_33 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, (_34 = _33.name, nameA = _34 === void 0 ? "noName" : _34, _35 = _33.skills, _36 = _35 === void 0 ? { primary: "none", secondary: "none" } : _35, _37 = _36.primary, primaryA = _37 === void 0 ? "primary" : _37, _38 = _36.secondary, secondaryA = _38 === void 0 ? "secondary" : _38, _33), _33,
+for (_33 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _34 = _33.name, nameA = _34 === void 0 ? "noName" : _34, _35 = _33.skills, _36 = _35 === void 0 ? { primary: "none", secondary: "none" } : _35, _37 = _36.primary, primaryA = _37 === void 0 ? "primary" : _37, _38 = _36.secondary, secondaryA = _38 === void 0 ? "secondary" : _38, _33,
     i = 0; i < 1; i++) {
     console.log(primaryA);
 }
@@ -251,16 +251,15 @@ for (_41 = getRobot(), _42 = _41.name, name = _42 === void 0 ? "noName" : _42, _
 for (_44 = { name: "trimmer", skill: "trimming" }, _45 = _44.name, name = _45 === void 0 ? "noName" : _45, _46 = _44.skill, skill = _46 === void 0 ? "skill" : _46, _44, i = 0; i < 1; i++) {
     console.log(nameA);
 }
-for (_47 = multiRobot.name, name = _47 === void 0 ? "noName" : _47, _48 = multiRobot.skills, _49 = _48 === void 0 ? { primary: "none", secondary: "none" } : _48, _50 = _49.primary, primary = _50 === void 0 ? "primary" : _50, _51 = _49.secondary, secondary = _51 === void 0 ? "secondary" : _51, multiRobot, multiRobot, i = 0; i < 1; i++) {
+for (_47 = multiRobot.name, name = _47 === void 0 ? "noName" : _47, _48 = multiRobot.skills, _49 = _48 === void 0 ? { primary: "none", secondary: "none" } : _48, _50 = _49.primary, primary = _50 === void 0 ? "primary" : _50, _51 = _49.secondary, secondary = _51 === void 0 ? "secondary" : _51, multiRobot, i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for (_52 = getMultiRobot(), (_53 = _52.name, name = _53 === void 0 ? "noName" : _53, _54 = _52.skills, _55 = _54 === void 0 ? { primary: "none", secondary: "none" } : _54, _56 = _55.primary, primary = _56 === void 0 ? "primary" : _56, _57 = _55.secondary, secondary = _57 === void 0 ? "secondary" : _57, _52), _52, i = 0; i < 1; i++) {
+for (_52 = getMultiRobot(), _53 = _52.name, name = _53 === void 0 ? "noName" : _53, _54 = _52.skills, _55 = _54 === void 0 ? { primary: "none", secondary: "none" } : _54, _56 = _55.primary, primary = _56 === void 0 ? "primary" : _56, _57 = _55.secondary, secondary = _57 === void 0 ? "secondary" : _57, _52, i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-for (_58 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, (_59 = _58.name, name = _59 === void 0 ? "noName" : _59, _60 = _58.skills, _61 = _60 === void 0 ? { primary: "none", secondary: "none" } : _60, _62 = _61.primary, primary = _62 === void 0 ? "primary" : _62, _63 = _61.secondary, secondary = _63 === void 0 ? "secondary" : _63, _58), _58,
+for (_58 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _59 = _58.name, name = _59 === void 0 ? "noName" : _59, _60 = _58.skills, _61 = _60 === void 0 ? { primary: "none", secondary: "none" } : _60, _62 = _61.primary, primary = _62 === void 0 ? "primary" : _62, _63 = _61.secondary, secondary = _63 === void 0 ? "secondary" : _63, _58,
     i = 0; i < 1; i++) {
     console.log(primaryA);
 }
-var _k, _q, _4, _9, _27, _33, _52, _58;
-var _a, _b, _c, _d, _e, _f, _g, _h, _j, _l, _m, _o, _p, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _5, _6, _7, _8, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _28, _29, _30, _31, _32, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _53, _54, _55, _56, _57, _59, _60, _61, _62, _63;
+var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63;
 //# sourceMappingURL=sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js.map b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js.map
index 56f8aa0f607..dd248e89944 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js.map
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js.map]
-{"version":3,"file":"sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.ts"],"names":[],"mappings":"AAgBA,IAAI,KAAK,GAAU,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;AACtD,IAAI,UAAU,GAAe,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,CAAC;AACjG;IACI,MAAM,CAAC,KAAK,CAAC;AACjB,CAAC;AACD;IACI,MAAM,CAAC,UAAU,CAAC;AACtB,CAAC;AAED,IAAI,KAAa,EAAE,QAAgB,EAAE,UAAkB,EAAE,CAAS,EAAE,MAAc,CAAC;AACnF,IAAI,IAAY,EAAE,OAAe,EAAE,SAAiB,EAAE,KAAa,CAAC;AAEpE,GAAG,CAAC,CAAE,eAAsB,EAAtB,qCAAsB,EAAK,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACxD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,eAAsC,EAArC,YAAsB,EAAtB,qCAAsB,MAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,2CAAyE,EAAxE,YAAsB,EAAtB,qCAAsB,MAAoD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CACA,sBAG0C,EAH1C,gEAG0C,EAFtC,eAA6B,EAA7B,yCAA6B,EAC7B,iBAAmC,EAAnC,6CAAmC,EAEvC,UAAU,EAAV,UAAU,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,oBAKc,GAJf,cAG0C,EAH1C,gEAG0C,EAFtC,eAA6B,EAA7B,yCAA6B,EAC7B,iBAAmC,EAAnC,6CAAmC,WAEtB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,8EAKoF,GAJrF,cAG0C,EAH1C,gEAG0C,EAFtC,eAA6B,EAA7B,yCAA6B,EAC7B,iBAAmC,EAAnC,6CAAmC;IAGvC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AAED,GAAG,CAAC,CAAG,eAAe,EAAf,oCAAe,EAAK,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAClD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,eAAgC,EAA9B,YAAe,EAAf,oCAAe,MAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACvD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,2CAAmE,EAAjE,YAAe,EAAf,oCAAe,MAAoD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC1F,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CACA,sBAG0C,EAH1C,gEAG0C,EAFtC,eAAmB,EAAnB,wCAAmB,EACnB,iBAAuB,EAAvB,4CAAuB,EAE3B,UAAU,EAAV,UAAU,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,oBAKc,GAJf,cAG0C,EAH1C,gEAG0C,EAFtC,eAAmB,EAAnB,wCAAmB,EACnB,iBAAuB,EAAvB,4CAAuB,WAEV,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,8EAKoF,GAJrF,eAG0C,EAH1C,mEAG0C,EAFtC,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB;IAG3B,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AAGD,GAAG,CAAC,CAAE,gBAAsB,EAAtB,uCAAsB,EAAE,iBAAuB,EAAvB,uCAAuB,EAAK,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,gBAA+D,EAA9D,cAAsB,EAAtB,uCAAsB,EAAE,eAAuB,EAAvB,uCAAuB,OAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACtF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,4CAAkG,EAAjG,cAAsB,EAAtB,uCAAsB,EAAE,eAAuB,EAAvB,uCAAuB,OAAoD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACzH,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CACA,qBAAsB,EAAtB,uCAAsB,EACtB,uBAG0C,EAH1C,mEAG0C,EAFtC,iBAA6B,EAA7B,2CAA6B,EAC7B,mBAAmC,EAAnC,+CAAmC,EAEvC,UAAU,EAAV,UAAU,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,qBAMc,GALf,cAAsB,EAAtB,uCAAsB,EACtB,gBAG0C,EAH1C,mEAG0C,EAFtC,iBAA6B,EAA7B,2CAA6B,EAC7B,mBAAmC,EAAnC,+CAAmC,aAEtB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,+EAMoF,GALrF,cAAsB,EAAtB,uCAAsB,EACtB,gBAG0C,EAH1C,mEAG0C,EAFtC,iBAA6B,EAA7B,2CAA6B,EAC7B,mBAAmC,EAAnC,+CAAmC;IAGvC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AAED,GAAG,CAAC,CAAG,gBAAe,EAAf,sCAAe,EAAE,iBAAe,EAAf,sCAAe,EAAK,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACnE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,gBAAiD,EAA/C,cAAe,EAAf,sCAAe,EAAE,eAAe,EAAf,sCAAe,OAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACxE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,4CAAoF,EAAlF,cAAe,EAAf,sCAAe,EAAE,eAAe,EAAf,sCAAe,OAAoD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC3G,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CACA,qBAAe,EAAf,sCAAe,EACf,uBAG0C,EAH1C,mEAG0C,EAFtC,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB,EAE3B,UAAU,EAAV,UAAU,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,qBAMc,GALf,cAAe,EAAf,sCAAe,EACf,gBAG0C,EAH1C,mEAG0C,EAFtC,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB,aAEV,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,+EAMoF,GALrF,cAAe,EAAf,sCAAe,EACf,gBAG0C,EAH1C,mEAG0C,EAFtC,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB;IAG3B,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js","sourceRoot":"","sources":["sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.ts"],"names":[],"mappings":"AAgBA,IAAI,KAAK,GAAU,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;AACtD,IAAI,UAAU,GAAe,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,CAAC;AACjG;IACI,MAAM,CAAC,KAAK,CAAC;AACjB,CAAC;AACD;IACI,MAAM,CAAC,UAAU,CAAC;AACtB,CAAC;AAED,IAAI,KAAa,EAAE,QAAgB,EAAE,UAAkB,EAAE,CAAS,EAAE,MAAc,CAAC;AACnF,IAAI,IAAY,EAAE,OAAe,EAAE,SAAiB,EAAE,KAAa,CAAC;AAEpE,GAAG,CAAC,CAAE,eAAsB,EAAtB,qCAAsB,EAAK,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACxD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,eAAsC,EAArC,YAAsB,EAAtB,qCAAsB,MAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC7D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,2CAAyE,EAAxE,YAAsB,EAAtB,qCAAsB,MAAoD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CACA,sBAG0C,EAH1C,gEAG0C,EAFtC,eAA6B,EAA7B,yCAA6B,EAC7B,iBAAmC,EAAnC,6CAAmC,EAEvC,UAAU,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,oBAKc,EAJf,cAG0C,EAH1C,gEAG0C,EAFtC,eAA6B,EAA7B,yCAA6B,EAC7B,iBAAmC,EAAnC,6CAAmC,MAEtB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,8EAKoF,EAJrF,cAG0C,EAH1C,gEAG0C,EAFtC,eAA6B,EAA7B,yCAA6B,EAC7B,iBAAmC,EAAnC,6CAAmC;IAGvC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AAED,GAAG,CAAC,CAAG,eAAe,EAAf,oCAAe,EAAK,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAClD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,eAAgC,EAA9B,YAAe,EAAf,oCAAe,MAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACvD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,2CAAmE,EAAjE,YAAe,EAAf,oCAAe,MAAoD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC1F,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CACA,sBAG0C,EAH1C,gEAG0C,EAFtC,eAAmB,EAAnB,wCAAmB,EACnB,iBAAuB,EAAvB,4CAAuB,EAE3B,UAAU,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,oBAKc,EAJf,cAG0C,EAH1C,gEAG0C,EAFtC,eAAmB,EAAnB,wCAAmB,EACnB,iBAAuB,EAAvB,4CAAuB,MAEV,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,8EAKoF,EAJrF,eAG0C,EAH1C,mEAG0C,EAFtC,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB;IAG3B,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AAGD,GAAG,CAAC,CAAE,gBAAsB,EAAtB,uCAAsB,EAAE,iBAAuB,EAAvB,uCAAuB,EAAK,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACjF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,gBAA+D,EAA9D,cAAsB,EAAtB,uCAAsB,EAAE,eAAuB,EAAvB,uCAAuB,OAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACtF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,4CAAkG,EAAjG,cAAsB,EAAtB,uCAAsB,EAAE,eAAuB,EAAvB,uCAAuB,OAAoD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACzH,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CACA,qBAAsB,EAAtB,uCAAsB,EACtB,uBAG0C,EAH1C,mEAG0C,EAFtC,iBAA6B,EAA7B,2CAA6B,EAC7B,mBAAmC,EAAnC,+CAAmC,EAEvC,UAAU,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,qBAMc,EALf,cAAsB,EAAtB,uCAAsB,EACtB,gBAG0C,EAH1C,mEAG0C,EAFtC,iBAA6B,EAA7B,2CAA6B,EAC7B,mBAAmC,EAAnC,+CAAmC,OAEtB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,+EAMoF,EALrF,cAAsB,EAAtB,uCAAsB,EACtB,gBAG0C,EAH1C,mEAG0C,EAFtC,iBAA6B,EAA7B,2CAA6B,EAC7B,mBAAmC,EAAnC,+CAAmC;IAGvC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AAED,GAAG,CAAC,CAAG,gBAAe,EAAf,sCAAe,EAAE,iBAAe,EAAf,sCAAe,EAAK,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACnE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,gBAAiD,EAA/C,cAAe,EAAf,sCAAe,EAAE,eAAe,EAAf,sCAAe,OAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACxE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CAAC,4CAAoF,EAAlF,cAAe,EAAf,sCAAe,EAAE,eAAe,EAAf,sCAAe,OAAoD,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAC3G,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AACD,GAAG,CAAC,CACA,qBAAe,EAAf,sCAAe,EACf,uBAG0C,EAH1C,mEAG0C,EAFtC,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB,EAE3B,UAAU,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,qBAMc,EALf,cAAe,EAAf,sCAAe,EACf,gBAG0C,EAH1C,mEAG0C,EAFtC,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB,OAEV,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC;AACD,GAAG,CAAC,CAAC,+EAMoF,EALrF,cAAe,EAAf,sCAAe,EACf,gBAG0C,EAH1C,mEAG0C,EAFtC,iBAAmB,EAAnB,0CAAmB,EACnB,mBAAuB,EAAvB,8CAAuB;IAG3B,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.sourcemap.txt
index 9e0e92d4a68..97271e8f3d0 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.sourcemap.txt
@@ -594,14 +594,14 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(19, 1) Source(37, 1) + SourceIndex(0)
 2 >Emitted(19, 2) Source(37, 2) + SourceIndex(0)
 ---
->>>for (_f = multiRobot.skills, _g = _f === void 0 ? { primary: "none", secondary: "none" } : _f, _h = _g.primary, primaryA = _h === void 0 ? "primary" : _h, _j = _g.secondary, secondaryA = _j === void 0 ? "secondary" : _j, multiRobot, multiRobot, i = 0; i < 1; i++) {
+>>>for (_f = multiRobot.skills, _g = _f === void 0 ? { primary: "none", secondary: "none" } : _f, _h = _g.primary, primaryA = _h === void 0 ? "primary" : _h, _j = _g.secondary, secondaryA = _j === void 0 ? "secondary" : _j, multiRobot, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
@@ -620,20 +620,18 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 16>                                                                                                                                                                                                                           ^^
 17>                                                                                                                                                                                                                             ^^^^^^^^^^
 18>                                                                                                                                                                                                                                       ^^
-19>                                                                                                                                                                                                                                         ^^^^^^^^^^
-20>                                                                                                                                                                                                                                                   ^^
-21>                                                                                                                                                                                                                                                     ^
-22>                                                                                                                                                                                                                                                      ^^^
-23>                                                                                                                                                                                                                                                         ^
-24>                                                                                                                                                                                                                                                          ^^
-25>                                                                                                                                                                                                                                                            ^
-26>                                                                                                                                                                                                                                                             ^^^
-27>                                                                                                                                                                                                                                                                ^
-28>                                                                                                                                                                                                                                                                 ^^
-29>                                                                                                                                                                                                                                                                   ^
-30>                                                                                                                                                                                                                                                                    ^^
-31>                                                                                                                                                                                                                                                                      ^^
-32>                                                                                                                                                                                                                                                                        ^
+19>                                                                                                                                                                                                                                         ^
+20>                                                                                                                                                                                                                                          ^^^
+21>                                                                                                                                                                                                                                             ^
+22>                                                                                                                                                                                                                                              ^^
+23>                                                                                                                                                                                                                                                ^
+24>                                                                                                                                                                                                                                                 ^^^
+25>                                                                                                                                                                                                                                                    ^
+26>                                                                                                                                                                                                                                                     ^^
+27>                                                                                                                                                                                                                                                       ^
+28>                                                                                                                                                                                                                                                        ^^
+29>                                                                                                                                                                                                                                                          ^^
+30>                                                                                                                                                                                                                                                            ^
 1->
   >
 2 >for
@@ -662,21 +660,19 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
   >                                                                                                                                                                                                                               } = { primary: "none", secondary: "none" }
   >                                                                                                                                                                                                                           } = 
 17>                                                                                                                                                                                                                             multiRobot
-18>                                                                                                                                                                                                                                       
-19>                                                                                                                                                                                                                                         multiRobot
-20>                                                                                                                                                                                                                                                   , 
-21>                                                                                                                                                                                                                                                     i
-22>                                                                                                                                                                                                                                                       = 
-23>                                                                                                                                                                                                                                                         0
-24>                                                                                                                                                                                                                                                          ; 
-25>                                                                                                                                                                                                                                                            i
-26>                                                                                                                                                                                                                                                              < 
-27>                                                                                                                                                                                                                                                                1
-28>                                                                                                                                                                                                                                                                 ; 
-29>                                                                                                                                                                                                                                                                   i
-30>                                                                                                                                                                                                                                                                    ++
-31>                                                                                                                                                                                                                                                                      ) 
-32>                                                                                                                                                                                                                                                                        {
+18>                                                                                                                                                                                                                                       , 
+19>                                                                                                                                                                                                                                         i
+20>                                                                                                                                                                                                                                           = 
+21>                                                                                                                                                                                                                                             0
+22>                                                                                                                                                                                                                                              ; 
+23>                                                                                                                                                                                                                                                i
+24>                                                                                                                                                                                                                                                  < 
+25>                                                                                                                                                                                                                                                    1
+26>                                                                                                                                                                                                                                                     ; 
+27>                                                                                                                                                                                                                                                       i
+28>                                                                                                                                                                                                                                                        ++
+29>                                                                                                                                                                                                                                                          ) 
+30>                                                                                                                                                                                                                                                            {
 1->Emitted(20, 1) Source(38, 1) + SourceIndex(0)
 2 >Emitted(20, 4) Source(38, 4) + SourceIndex(0)
 3 >Emitted(20, 5) Source(38, 5) + SourceIndex(0)
@@ -694,21 +690,19 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 15>Emitted(20, 220) Source(41, 44) + SourceIndex(0)
 16>Emitted(20, 222) Source(43, 5) + SourceIndex(0)
 17>Emitted(20, 232) Source(43, 15) + SourceIndex(0)
-18>Emitted(20, 234) Source(43, 5) + SourceIndex(0)
-19>Emitted(20, 244) Source(43, 15) + SourceIndex(0)
-20>Emitted(20, 246) Source(43, 17) + SourceIndex(0)
-21>Emitted(20, 247) Source(43, 18) + SourceIndex(0)
-22>Emitted(20, 250) Source(43, 21) + SourceIndex(0)
-23>Emitted(20, 251) Source(43, 22) + SourceIndex(0)
-24>Emitted(20, 253) Source(43, 24) + SourceIndex(0)
-25>Emitted(20, 254) Source(43, 25) + SourceIndex(0)
-26>Emitted(20, 257) Source(43, 28) + SourceIndex(0)
-27>Emitted(20, 258) Source(43, 29) + SourceIndex(0)
-28>Emitted(20, 260) Source(43, 31) + SourceIndex(0)
-29>Emitted(20, 261) Source(43, 32) + SourceIndex(0)
-30>Emitted(20, 263) Source(43, 34) + SourceIndex(0)
-31>Emitted(20, 265) Source(43, 36) + SourceIndex(0)
-32>Emitted(20, 266) Source(43, 37) + SourceIndex(0)
+18>Emitted(20, 234) Source(43, 17) + SourceIndex(0)
+19>Emitted(20, 235) Source(43, 18) + SourceIndex(0)
+20>Emitted(20, 238) Source(43, 21) + SourceIndex(0)
+21>Emitted(20, 239) Source(43, 22) + SourceIndex(0)
+22>Emitted(20, 241) Source(43, 24) + SourceIndex(0)
+23>Emitted(20, 242) Source(43, 25) + SourceIndex(0)
+24>Emitted(20, 245) Source(43, 28) + SourceIndex(0)
+25>Emitted(20, 246) Source(43, 29) + SourceIndex(0)
+26>Emitted(20, 248) Source(43, 31) + SourceIndex(0)
+27>Emitted(20, 249) Source(43, 32) + SourceIndex(0)
+28>Emitted(20, 251) Source(43, 34) + SourceIndex(0)
+29>Emitted(20, 253) Source(43, 36) + SourceIndex(0)
+30>Emitted(20, 254) Source(43, 37) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -740,44 +734,44 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(22, 1) Source(45, 1) + SourceIndex(0)
 2 >Emitted(22, 2) Source(45, 2) + SourceIndex(0)
 ---
->>>for (_k = getMultiRobot(), (_l = _k.skills, _m = _l === void 0 ? { primary: "none", secondary: "none" } : _l, _o = _m.primary, primaryA = _o === void 0 ? "primary" : _o, _p = _m.secondary, secondaryA = _p === void 0 ? "secondary" : _p, _k), _k, i = 0; i < 1; i++) {
+>>>for (_k = getMultiRobot(), _l = _k.skills, _m = _l === void 0 ? { primary: "none", secondary: "none" } : _l, _o = _m.primary, primaryA = _o === void 0 ? "primary" : _o, _p = _m.secondary, secondaryA = _p === void 0 ? "secondary" : _p, _k, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
 5 >     ^^^^^^^^^^^^^^^^^^^^
-6 >                         ^^^
-7 >                            ^^^^^^^^^^^^^^
-8 >                                          ^^
-9 >                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-10>                                                                                                            ^^
-11>                                                                                                              ^^^^^^^^^^^^^^^
-12>                                                                                                                             ^^
-13>                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-14>                                                                                                                                                                        ^^
-15>                                                                                                                                                                          ^^^^^^^^^^^^^^^^^
-16>                                                                                                                                                                                           ^^
-17>                                                                                                                                                                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-18>                                                                                                                                                                                                                                          ^^^^^^^^^^^
-19>                                                                                                                                                                                                                                                     ^
-20>                                                                                                                                                                                                                                                      ^^^
-21>                                                                                                                                                                                                                                                         ^
-22>                                                                                                                                                                                                                                                          ^^
-23>                                                                                                                                                                                                                                                            ^
-24>                                                                                                                                                                                                                                                             ^^^
-25>                                                                                                                                                                                                                                                                ^
-26>                                                                                                                                                                                                                                                                 ^^
-27>                                                                                                                                                                                                                                                                   ^
-28>                                                                                                                                                                                                                                                                    ^^
-29>                                                                                                                                                                                                                                                                      ^^
-30>                                                                                                                                                                                                                                                                        ^
+6 >                         ^^
+7 >                           ^^^^^^^^^^^^^^
+8 >                                         ^^
+9 >                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                           ^^
+11>                                                                                                             ^^^^^^^^^^^^^^^
+12>                                                                                                                            ^^
+13>                                                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                       ^^
+15>                                                                                                                                                                         ^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                          ^^
+17>                                                                                                                                                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+18>                                                                                                                                                                                                                                         ^^^^^^
+19>                                                                                                                                                                                                                                               ^
+20>                                                                                                                                                                                                                                                ^^^
+21>                                                                                                                                                                                                                                                   ^
+22>                                                                                                                                                                                                                                                    ^^
+23>                                                                                                                                                                                                                                                      ^
+24>                                                                                                                                                                                                                                                       ^^^
+25>                                                                                                                                                                                                                                                          ^
+26>                                                                                                                                                                                                                                                           ^^
+27>                                                                                                                                                                                                                                                             ^
+28>                                                                                                                                                                                                                                                              ^^
+29>                                                                                                                                                                                                                                                                ^^
+30>                                                                                                                                                                                                                                                                  ^
 1->
   >
 2 >for
@@ -790,69 +784,69 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
   >         } = { primary: "none", secondary: "none" }
   >     } = getMultiRobot()
 6 >                         
-7 >                            skills: {
-  >                                    primary: primaryA = "primary",
-  >                                    secondary: secondaryA = "secondary"
-  >                                } = { primary: "none", secondary: "none" }
-8 >                                          
-9 >                                            skills: {
-  >                                                    primary: primaryA = "primary",
-  >                                                    secondary: secondaryA = "secondary"
-  >                                                } = { primary: "none", secondary: "none" }
-10>                                                                                                            
-11>                                                                                                              primary: primaryA = "primary"
-12>                                                                                                                             
-13>                                                                                                                               primary: primaryA = "primary"
-14>                                                                                                                                                                        ,
-  >                                                                                                                                                                                
-15>                                                                                                                                                                          secondary: secondaryA = "secondary"
-16>                                                                                                                                                                                           
-17>                                                                                                                                                                                             secondary: secondaryA = "secondary"
-18>                                                                                                                                                                                                                                          
-  >                                                                                                                                                                                                                                              } = { primary: "none", secondary: "none" }
-  >                                                                                                                                                                                                                                          } = getMultiRobot(), 
-19>                                                                                                                                                                                                                                                     i
-20>                                                                                                                                                                                                                                                       = 
-21>                                                                                                                                                                                                                                                         0
-22>                                                                                                                                                                                                                                                          ; 
-23>                                                                                                                                                                                                                                                            i
-24>                                                                                                                                                                                                                                                              < 
-25>                                                                                                                                                                                                                                                                1
-26>                                                                                                                                                                                                                                                                 ; 
-27>                                                                                                                                                                                                                                                                   i
-28>                                                                                                                                                                                                                                                                    ++
-29>                                                                                                                                                                                                                                                                      ) 
-30>                                                                                                                                                                                                                                                                        {
+7 >                           skills: {
+  >                                   primary: primaryA = "primary",
+  >                                   secondary: secondaryA = "secondary"
+  >                               } = { primary: "none", secondary: "none" }
+8 >                                         
+9 >                                           skills: {
+  >                                                   primary: primaryA = "primary",
+  >                                                   secondary: secondaryA = "secondary"
+  >                                               } = { primary: "none", secondary: "none" }
+10>                                                                                                           
+11>                                                                                                             primary: primaryA = "primary"
+12>                                                                                                                            
+13>                                                                                                                              primary: primaryA = "primary"
+14>                                                                                                                                                                       ,
+  >                                                                                                                                                                               
+15>                                                                                                                                                                         secondary: secondaryA = "secondary"
+16>                                                                                                                                                                                          
+17>                                                                                                                                                                                            secondary: secondaryA = "secondary"
+18>                                                                                                                                                                                                                                         
+  >                                                                                                                                                                                                                                             } = { primary: "none", secondary: "none" }
+  >                                                                                                                                                                                                                                         } = getMultiRobot(), 
+19>                                                                                                                                                                                                                                               i
+20>                                                                                                                                                                                                                                                 = 
+21>                                                                                                                                                                                                                                                   0
+22>                                                                                                                                                                                                                                                    ; 
+23>                                                                                                                                                                                                                                                      i
+24>                                                                                                                                                                                                                                                        < 
+25>                                                                                                                                                                                                                                                          1
+26>                                                                                                                                                                                                                                                           ; 
+27>                                                                                                                                                                                                                                                             i
+28>                                                                                                                                                                                                                                                              ++
+29>                                                                                                                                                                                                                                                                ) 
+30>                                                                                                                                                                                                                                                                  {
 1->Emitted(23, 1) Source(46, 1) + SourceIndex(0)
 2 >Emitted(23, 4) Source(46, 4) + SourceIndex(0)
 3 >Emitted(23, 5) Source(46, 5) + SourceIndex(0)
 4 >Emitted(23, 6) Source(46, 6) + SourceIndex(0)
 5 >Emitted(23, 26) Source(51, 20) + SourceIndex(0)
-6 >Emitted(23, 29) Source(47, 5) + SourceIndex(0)
-7 >Emitted(23, 43) Source(50, 47) + SourceIndex(0)
-8 >Emitted(23, 45) Source(47, 5) + SourceIndex(0)
-9 >Emitted(23, 109) Source(50, 47) + SourceIndex(0)
-10>Emitted(23, 111) Source(48, 9) + SourceIndex(0)
-11>Emitted(23, 126) Source(48, 38) + SourceIndex(0)
-12>Emitted(23, 128) Source(48, 9) + SourceIndex(0)
-13>Emitted(23, 169) Source(48, 38) + SourceIndex(0)
-14>Emitted(23, 171) Source(49, 9) + SourceIndex(0)
-15>Emitted(23, 188) Source(49, 44) + SourceIndex(0)
-16>Emitted(23, 190) Source(49, 9) + SourceIndex(0)
-17>Emitted(23, 235) Source(49, 44) + SourceIndex(0)
-18>Emitted(23, 246) Source(51, 22) + SourceIndex(0)
-19>Emitted(23, 247) Source(51, 23) + SourceIndex(0)
-20>Emitted(23, 250) Source(51, 26) + SourceIndex(0)
-21>Emitted(23, 251) Source(51, 27) + SourceIndex(0)
-22>Emitted(23, 253) Source(51, 29) + SourceIndex(0)
-23>Emitted(23, 254) Source(51, 30) + SourceIndex(0)
-24>Emitted(23, 257) Source(51, 33) + SourceIndex(0)
-25>Emitted(23, 258) Source(51, 34) + SourceIndex(0)
-26>Emitted(23, 260) Source(51, 36) + SourceIndex(0)
-27>Emitted(23, 261) Source(51, 37) + SourceIndex(0)
-28>Emitted(23, 263) Source(51, 39) + SourceIndex(0)
-29>Emitted(23, 265) Source(51, 41) + SourceIndex(0)
-30>Emitted(23, 266) Source(51, 42) + SourceIndex(0)
+6 >Emitted(23, 28) Source(47, 5) + SourceIndex(0)
+7 >Emitted(23, 42) Source(50, 47) + SourceIndex(0)
+8 >Emitted(23, 44) Source(47, 5) + SourceIndex(0)
+9 >Emitted(23, 108) Source(50, 47) + SourceIndex(0)
+10>Emitted(23, 110) Source(48, 9) + SourceIndex(0)
+11>Emitted(23, 125) Source(48, 38) + SourceIndex(0)
+12>Emitted(23, 127) Source(48, 9) + SourceIndex(0)
+13>Emitted(23, 168) Source(48, 38) + SourceIndex(0)
+14>Emitted(23, 170) Source(49, 9) + SourceIndex(0)
+15>Emitted(23, 187) Source(49, 44) + SourceIndex(0)
+16>Emitted(23, 189) Source(49, 9) + SourceIndex(0)
+17>Emitted(23, 234) Source(49, 44) + SourceIndex(0)
+18>Emitted(23, 240) Source(51, 22) + SourceIndex(0)
+19>Emitted(23, 241) Source(51, 23) + SourceIndex(0)
+20>Emitted(23, 244) Source(51, 26) + SourceIndex(0)
+21>Emitted(23, 245) Source(51, 27) + SourceIndex(0)
+22>Emitted(23, 247) Source(51, 29) + SourceIndex(0)
+23>Emitted(23, 248) Source(51, 30) + SourceIndex(0)
+24>Emitted(23, 251) Source(51, 33) + SourceIndex(0)
+25>Emitted(23, 252) Source(51, 34) + SourceIndex(0)
+26>Emitted(23, 254) Source(51, 36) + SourceIndex(0)
+27>Emitted(23, 255) Source(51, 37) + SourceIndex(0)
+28>Emitted(23, 257) Source(51, 39) + SourceIndex(0)
+29>Emitted(23, 259) Source(51, 41) + SourceIndex(0)
+30>Emitted(23, 260) Source(51, 42) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -884,31 +878,31 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(25, 1) Source(53, 1) + SourceIndex(0)
 2 >Emitted(25, 2) Source(53, 2) + SourceIndex(0)
 ---
->>>for (_q = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, (_r = _q.skills, _s = _r === void 0 ? { primary: "none", secondary: "none" } : _r, _t = _s.primary, primaryA = _t === void 0 ? "primary" : _t, _u = _s.secondary, secondaryA = _u === void 0 ? "secondary" : _u, _q), _q,
+>>>for (_q = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _r = _q.skills, _s = _r === void 0 ? { primary: "none", secondary: "none" } : _r, _t = _s.primary, primaryA = _t === void 0 ? "primary" : _t, _u = _s.secondary, secondaryA = _u === void 0 ? "secondary" : _u, _q,
 1->
 2 >^^^
 3 >   ^
 4 >    ^
 5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                                                                   ^^^
-7 >                                                                                      ^^^^^^^^^^^^^^
-8 >                                                                                                    ^^
-9 >                                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-10>                                                                                                                                                                      ^^
-11>                                                                                                                                                                        ^^^^^^^^^^^^^^^
-12>                                                                                                                                                                                       ^^
-13>                                                                                                                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-14>                                                                                                                                                                                                                                  ^^
-15>                                                                                                                                                                                                                                    ^^^^^^^^^^^^^^^^^
-16>                                                                                                                                                                                                                                                     ^^
-17>                                                                                                                                                                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                                                   ^^
+7 >                                                                                     ^^^^^^^^^^^^^^
+8 >                                                                                                   ^^
+9 >                                                                                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                                                                                     ^^
+11>                                                                                                                                                                       ^^^^^^^^^^^^^^^
+12>                                                                                                                                                                                      ^^
+13>                                                                                                                                                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                                                                                 ^^
+15>                                                                                                                                                                                                                                   ^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                                                                                    ^^
+17>                                                                                                                                                                                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
 2 >for
@@ -921,41 +915,41 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
   >         } = { primary: "none", secondary: "none" }
   >     } = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }
 6 >                                                                                   
-7 >                                                                                      skills: {
-  >                                                                                              primary: primaryA = "primary",
-  >                                                                                              secondary: secondaryA = "secondary"
-  >                                                                                          } = { primary: "none", secondary: "none" }
-8 >                                                                                                    
-9 >                                                                                                      skills: {
-  >                                                                                                              primary: primaryA = "primary",
-  >                                                                                                              secondary: secondaryA = "secondary"
-  >                                                                                                          } = { primary: "none", secondary: "none" }
-10>                                                                                                                                                                      
-11>                                                                                                                                                                        primary: primaryA = "primary"
-12>                                                                                                                                                                                       
-13>                                                                                                                                                                                         primary: primaryA = "primary"
-14>                                                                                                                                                                                                                                  ,
-  >                                                                                                                                                                                                                                          
-15>                                                                                                                                                                                                                                    secondary: secondaryA = "secondary"
-16>                                                                                                                                                                                                                                                     
-17>                                                                                                                                                                                                                                                       secondary: secondaryA = "secondary"
+7 >                                                                                     skills: {
+  >                                                                                             primary: primaryA = "primary",
+  >                                                                                             secondary: secondaryA = "secondary"
+  >                                                                                         } = { primary: "none", secondary: "none" }
+8 >                                                                                                   
+9 >                                                                                                     skills: {
+  >                                                                                                             primary: primaryA = "primary",
+  >                                                                                                             secondary: secondaryA = "secondary"
+  >                                                                                                         } = { primary: "none", secondary: "none" }
+10>                                                                                                                                                                     
+11>                                                                                                                                                                       primary: primaryA = "primary"
+12>                                                                                                                                                                                      
+13>                                                                                                                                                                                        primary: primaryA = "primary"
+14>                                                                                                                                                                                                                                 ,
+  >                                                                                                                                                                                                                                         
+15>                                                                                                                                                                                                                                   secondary: secondaryA = "secondary"
+16>                                                                                                                                                                                                                                                    
+17>                                                                                                                                                                                                                                                      secondary: secondaryA = "secondary"
 1->Emitted(26, 1) Source(54, 1) + SourceIndex(0)
 2 >Emitted(26, 4) Source(54, 4) + SourceIndex(0)
 3 >Emitted(26, 5) Source(54, 5) + SourceIndex(0)
 4 >Emitted(26, 6) Source(54, 6) + SourceIndex(0)
 5 >Emitted(26, 84) Source(59, 90) + SourceIndex(0)
-6 >Emitted(26, 87) Source(55, 5) + SourceIndex(0)
-7 >Emitted(26, 101) Source(58, 47) + SourceIndex(0)
-8 >Emitted(26, 103) Source(55, 5) + SourceIndex(0)
-9 >Emitted(26, 167) Source(58, 47) + SourceIndex(0)
-10>Emitted(26, 169) Source(56, 9) + SourceIndex(0)
-11>Emitted(26, 184) Source(56, 38) + SourceIndex(0)
-12>Emitted(26, 186) Source(56, 9) + SourceIndex(0)
-13>Emitted(26, 227) Source(56, 38) + SourceIndex(0)
-14>Emitted(26, 229) Source(57, 9) + SourceIndex(0)
-15>Emitted(26, 246) Source(57, 44) + SourceIndex(0)
-16>Emitted(26, 248) Source(57, 9) + SourceIndex(0)
-17>Emitted(26, 293) Source(57, 44) + SourceIndex(0)
+6 >Emitted(26, 86) Source(55, 5) + SourceIndex(0)
+7 >Emitted(26, 100) Source(58, 47) + SourceIndex(0)
+8 >Emitted(26, 102) Source(55, 5) + SourceIndex(0)
+9 >Emitted(26, 166) Source(58, 47) + SourceIndex(0)
+10>Emitted(26, 168) Source(56, 9) + SourceIndex(0)
+11>Emitted(26, 183) Source(56, 38) + SourceIndex(0)
+12>Emitted(26, 185) Source(56, 9) + SourceIndex(0)
+13>Emitted(26, 226) Source(56, 38) + SourceIndex(0)
+14>Emitted(26, 228) Source(57, 9) + SourceIndex(0)
+15>Emitted(26, 245) Source(57, 44) + SourceIndex(0)
+16>Emitted(26, 247) Source(57, 9) + SourceIndex(0)
+17>Emitted(26, 292) Source(57, 44) + SourceIndex(0)
 ---
 >>>    i = 0; i < 1; i++) {
 1 >^^^^
@@ -1351,14 +1345,14 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(38, 1) Source(72, 1) + SourceIndex(0)
 2 >Emitted(38, 2) Source(72, 2) + SourceIndex(0)
 ---
->>>for (_0 = multiRobot.skills, _1 = _0 === void 0 ? { primary: "none", secondary: "none" } : _0, _2 = _1.primary, primary = _2 === void 0 ? "primary" : _2, _3 = _1.secondary, secondary = _3 === void 0 ? "secondary" : _3, multiRobot, multiRobot, i = 0; i < 1; i++) {
+>>>for (_0 = multiRobot.skills, _1 = _0 === void 0 ? { primary: "none", secondary: "none" } : _0, _2 = _1.primary, primary = _2 === void 0 ? "primary" : _2, _3 = _1.secondary, secondary = _3 === void 0 ? "secondary" : _3, multiRobot, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
@@ -1377,20 +1371,18 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 16>                                                                                                                                                                                                                         ^^
 17>                                                                                                                                                                                                                           ^^^^^^^^^^
 18>                                                                                                                                                                                                                                     ^^
-19>                                                                                                                                                                                                                                       ^^^^^^^^^^
-20>                                                                                                                                                                                                                                                 ^^
-21>                                                                                                                                                                                                                                                   ^
-22>                                                                                                                                                                                                                                                    ^^^
-23>                                                                                                                                                                                                                                                       ^
-24>                                                                                                                                                                                                                                                        ^^
-25>                                                                                                                                                                                                                                                          ^
-26>                                                                                                                                                                                                                                                           ^^^
-27>                                                                                                                                                                                                                                                              ^
-28>                                                                                                                                                                                                                                                               ^^
-29>                                                                                                                                                                                                                                                                 ^
-30>                                                                                                                                                                                                                                                                  ^^
-31>                                                                                                                                                                                                                                                                    ^^
-32>                                                                                                                                                                                                                                                                      ^
+19>                                                                                                                                                                                                                                       ^
+20>                                                                                                                                                                                                                                        ^^^
+21>                                                                                                                                                                                                                                           ^
+22>                                                                                                                                                                                                                                            ^^
+23>                                                                                                                                                                                                                                              ^
+24>                                                                                                                                                                                                                                               ^^^
+25>                                                                                                                                                                                                                                                  ^
+26>                                                                                                                                                                                                                                                   ^^
+27>                                                                                                                                                                                                                                                     ^
+28>                                                                                                                                                                                                                                                      ^^
+29>                                                                                                                                                                                                                                                        ^^
+30>                                                                                                                                                                                                                                                          ^
 1->
   >
 2 >for
@@ -1419,21 +1411,19 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
   >                                                                                                                                                                                                                             } = { primary: "none", secondary: "none" }
   >                                                                                                                                                                                                                         } = 
 17>                                                                                                                                                                                                                           multiRobot
-18>                                                                                                                                                                                                                                     
-19>                                                                                                                                                                                                                                       multiRobot
-20>                                                                                                                                                                                                                                                 , 
-21>                                                                                                                                                                                                                                                   i
-22>                                                                                                                                                                                                                                                     = 
-23>                                                                                                                                                                                                                                                       0
-24>                                                                                                                                                                                                                                                        ; 
-25>                                                                                                                                                                                                                                                          i
-26>                                                                                                                                                                                                                                                            < 
-27>                                                                                                                                                                                                                                                              1
-28>                                                                                                                                                                                                                                                               ; 
-29>                                                                                                                                                                                                                                                                 i
-30>                                                                                                                                                                                                                                                                  ++
-31>                                                                                                                                                                                                                                                                    ) 
-32>                                                                                                                                                                                                                                                                      {
+18>                                                                                                                                                                                                                                     , 
+19>                                                                                                                                                                                                                                       i
+20>                                                                                                                                                                                                                                         = 
+21>                                                                                                                                                                                                                                           0
+22>                                                                                                                                                                                                                                            ; 
+23>                                                                                                                                                                                                                                              i
+24>                                                                                                                                                                                                                                                < 
+25>                                                                                                                                                                                                                                                  1
+26>                                                                                                                                                                                                                                                   ; 
+27>                                                                                                                                                                                                                                                     i
+28>                                                                                                                                                                                                                                                      ++
+29>                                                                                                                                                                                                                                                        ) 
+30>                                                                                                                                                                                                                                                          {
 1->Emitted(39, 1) Source(73, 1) + SourceIndex(0)
 2 >Emitted(39, 4) Source(73, 4) + SourceIndex(0)
 3 >Emitted(39, 5) Source(73, 5) + SourceIndex(0)
@@ -1451,21 +1441,19 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 15>Emitted(39, 218) Source(76, 32) + SourceIndex(0)
 16>Emitted(39, 220) Source(78, 5) + SourceIndex(0)
 17>Emitted(39, 230) Source(78, 15) + SourceIndex(0)
-18>Emitted(39, 232) Source(78, 5) + SourceIndex(0)
-19>Emitted(39, 242) Source(78, 15) + SourceIndex(0)
-20>Emitted(39, 244) Source(78, 17) + SourceIndex(0)
-21>Emitted(39, 245) Source(78, 18) + SourceIndex(0)
-22>Emitted(39, 248) Source(78, 21) + SourceIndex(0)
-23>Emitted(39, 249) Source(78, 22) + SourceIndex(0)
-24>Emitted(39, 251) Source(78, 24) + SourceIndex(0)
-25>Emitted(39, 252) Source(78, 25) + SourceIndex(0)
-26>Emitted(39, 255) Source(78, 28) + SourceIndex(0)
-27>Emitted(39, 256) Source(78, 29) + SourceIndex(0)
-28>Emitted(39, 258) Source(78, 31) + SourceIndex(0)
-29>Emitted(39, 259) Source(78, 32) + SourceIndex(0)
-30>Emitted(39, 261) Source(78, 34) + SourceIndex(0)
-31>Emitted(39, 263) Source(78, 36) + SourceIndex(0)
-32>Emitted(39, 264) Source(78, 37) + SourceIndex(0)
+18>Emitted(39, 232) Source(78, 17) + SourceIndex(0)
+19>Emitted(39, 233) Source(78, 18) + SourceIndex(0)
+20>Emitted(39, 236) Source(78, 21) + SourceIndex(0)
+21>Emitted(39, 237) Source(78, 22) + SourceIndex(0)
+22>Emitted(39, 239) Source(78, 24) + SourceIndex(0)
+23>Emitted(39, 240) Source(78, 25) + SourceIndex(0)
+24>Emitted(39, 243) Source(78, 28) + SourceIndex(0)
+25>Emitted(39, 244) Source(78, 29) + SourceIndex(0)
+26>Emitted(39, 246) Source(78, 31) + SourceIndex(0)
+27>Emitted(39, 247) Source(78, 32) + SourceIndex(0)
+28>Emitted(39, 249) Source(78, 34) + SourceIndex(0)
+29>Emitted(39, 251) Source(78, 36) + SourceIndex(0)
+30>Emitted(39, 252) Source(78, 37) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -1497,44 +1485,44 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(41, 1) Source(80, 1) + SourceIndex(0)
 2 >Emitted(41, 2) Source(80, 2) + SourceIndex(0)
 ---
->>>for (_4 = getMultiRobot(), (_5 = _4.skills, _6 = _5 === void 0 ? { primary: "none", secondary: "none" } : _5, _7 = _6.primary, primary = _7 === void 0 ? "primary" : _7, _8 = _6.secondary, secondary = _8 === void 0 ? "secondary" : _8, _4), _4, i = 0; i < 1; i++) {
+>>>for (_4 = getMultiRobot(), _5 = _4.skills, _6 = _5 === void 0 ? { primary: "none", secondary: "none" } : _5, _7 = _6.primary, primary = _7 === void 0 ? "primary" : _7, _8 = _6.secondary, secondary = _8 === void 0 ? "secondary" : _8, _4, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
 5 >     ^^^^^^^^^^^^^^^^^^^^
-6 >                         ^^^
-7 >                            ^^^^^^^^^^^^^^
-8 >                                          ^^
-9 >                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-10>                                                                                                            ^^
-11>                                                                                                              ^^^^^^^^^^^^^^^
-12>                                                                                                                             ^^
-13>                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-14>                                                                                                                                                                       ^^
-15>                                                                                                                                                                         ^^^^^^^^^^^^^^^^^
-16>                                                                                                                                                                                          ^^
-17>                                                                                                                                                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-18>                                                                                                                                                                                                                                        ^^^^^^^^^^^
-19>                                                                                                                                                                                                                                                   ^
-20>                                                                                                                                                                                                                                                    ^^^
-21>                                                                                                                                                                                                                                                       ^
-22>                                                                                                                                                                                                                                                        ^^
-23>                                                                                                                                                                                                                                                          ^
-24>                                                                                                                                                                                                                                                           ^^^
-25>                                                                                                                                                                                                                                                              ^
-26>                                                                                                                                                                                                                                                               ^^
-27>                                                                                                                                                                                                                                                                 ^
-28>                                                                                                                                                                                                                                                                  ^^
-29>                                                                                                                                                                                                                                                                    ^^
-30>                                                                                                                                                                                                                                                                      ^
+6 >                         ^^
+7 >                           ^^^^^^^^^^^^^^
+8 >                                         ^^
+9 >                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                           ^^
+11>                                                                                                             ^^^^^^^^^^^^^^^
+12>                                                                                                                            ^^
+13>                                                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                      ^^
+15>                                                                                                                                                                        ^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                         ^^
+17>                                                                                                                                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+18>                                                                                                                                                                                                                                       ^^^^^^
+19>                                                                                                                                                                                                                                             ^
+20>                                                                                                                                                                                                                                              ^^^
+21>                                                                                                                                                                                                                                                 ^
+22>                                                                                                                                                                                                                                                  ^^
+23>                                                                                                                                                                                                                                                    ^
+24>                                                                                                                                                                                                                                                     ^^^
+25>                                                                                                                                                                                                                                                        ^
+26>                                                                                                                                                                                                                                                         ^^
+27>                                                                                                                                                                                                                                                           ^
+28>                                                                                                                                                                                                                                                            ^^
+29>                                                                                                                                                                                                                                                              ^^
+30>                                                                                                                                                                                                                                                                ^
 1->
   >
 2 >for
@@ -1547,69 +1535,69 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
   >         } = { primary: "none", secondary: "none" }
   >     } = getMultiRobot()
 6 >                         
-7 >                            skills: {
-  >                                    primary = "primary",
-  >                                    secondary = "secondary"
-  >                                } = { primary: "none", secondary: "none" }
-8 >                                          
-9 >                                            skills: {
-  >                                                    primary = "primary",
-  >                                                    secondary = "secondary"
-  >                                                } = { primary: "none", secondary: "none" }
-10>                                                                                                            
-11>                                                                                                              primary = "primary"
-12>                                                                                                                             
-13>                                                                                                                               primary = "primary"
-14>                                                                                                                                                                       ,
-  >                                                                                                                                                                               
-15>                                                                                                                                                                         secondary = "secondary"
-16>                                                                                                                                                                                          
-17>                                                                                                                                                                                            secondary = "secondary"
-18>                                                                                                                                                                                                                                        
-  >                                                                                                                                                                                                                                            } = { primary: "none", secondary: "none" }
-  >                                                                                                                                                                                                                                        } = getMultiRobot(), 
-19>                                                                                                                                                                                                                                                   i
-20>                                                                                                                                                                                                                                                     = 
-21>                                                                                                                                                                                                                                                       0
-22>                                                                                                                                                                                                                                                        ; 
-23>                                                                                                                                                                                                                                                          i
-24>                                                                                                                                                                                                                                                            < 
-25>                                                                                                                                                                                                                                                              1
-26>                                                                                                                                                                                                                                                               ; 
-27>                                                                                                                                                                                                                                                                 i
-28>                                                                                                                                                                                                                                                                  ++
-29>                                                                                                                                                                                                                                                                    ) 
-30>                                                                                                                                                                                                                                                                      {
+7 >                           skills: {
+  >                                   primary = "primary",
+  >                                   secondary = "secondary"
+  >                               } = { primary: "none", secondary: "none" }
+8 >                                         
+9 >                                           skills: {
+  >                                                   primary = "primary",
+  >                                                   secondary = "secondary"
+  >                                               } = { primary: "none", secondary: "none" }
+10>                                                                                                           
+11>                                                                                                             primary = "primary"
+12>                                                                                                                            
+13>                                                                                                                              primary = "primary"
+14>                                                                                                                                                                      ,
+  >                                                                                                                                                                              
+15>                                                                                                                                                                        secondary = "secondary"
+16>                                                                                                                                                                                         
+17>                                                                                                                                                                                           secondary = "secondary"
+18>                                                                                                                                                                                                                                       
+  >                                                                                                                                                                                                                                           } = { primary: "none", secondary: "none" }
+  >                                                                                                                                                                                                                                       } = getMultiRobot(), 
+19>                                                                                                                                                                                                                                             i
+20>                                                                                                                                                                                                                                               = 
+21>                                                                                                                                                                                                                                                 0
+22>                                                                                                                                                                                                                                                  ; 
+23>                                                                                                                                                                                                                                                    i
+24>                                                                                                                                                                                                                                                      < 
+25>                                                                                                                                                                                                                                                        1
+26>                                                                                                                                                                                                                                                         ; 
+27>                                                                                                                                                                                                                                                           i
+28>                                                                                                                                                                                                                                                            ++
+29>                                                                                                                                                                                                                                                              ) 
+30>                                                                                                                                                                                                                                                                {
 1->Emitted(42, 1) Source(81, 1) + SourceIndex(0)
 2 >Emitted(42, 4) Source(81, 4) + SourceIndex(0)
 3 >Emitted(42, 5) Source(81, 5) + SourceIndex(0)
 4 >Emitted(42, 6) Source(81, 6) + SourceIndex(0)
 5 >Emitted(42, 26) Source(86, 20) + SourceIndex(0)
-6 >Emitted(42, 29) Source(82, 5) + SourceIndex(0)
-7 >Emitted(42, 43) Source(85, 47) + SourceIndex(0)
-8 >Emitted(42, 45) Source(82, 5) + SourceIndex(0)
-9 >Emitted(42, 109) Source(85, 47) + SourceIndex(0)
-10>Emitted(42, 111) Source(83, 9) + SourceIndex(0)
-11>Emitted(42, 126) Source(83, 28) + SourceIndex(0)
-12>Emitted(42, 128) Source(83, 9) + SourceIndex(0)
-13>Emitted(42, 168) Source(83, 28) + SourceIndex(0)
-14>Emitted(42, 170) Source(84, 9) + SourceIndex(0)
-15>Emitted(42, 187) Source(84, 32) + SourceIndex(0)
-16>Emitted(42, 189) Source(84, 9) + SourceIndex(0)
-17>Emitted(42, 233) Source(84, 32) + SourceIndex(0)
-18>Emitted(42, 244) Source(86, 22) + SourceIndex(0)
-19>Emitted(42, 245) Source(86, 23) + SourceIndex(0)
-20>Emitted(42, 248) Source(86, 26) + SourceIndex(0)
-21>Emitted(42, 249) Source(86, 27) + SourceIndex(0)
-22>Emitted(42, 251) Source(86, 29) + SourceIndex(0)
-23>Emitted(42, 252) Source(86, 30) + SourceIndex(0)
-24>Emitted(42, 255) Source(86, 33) + SourceIndex(0)
-25>Emitted(42, 256) Source(86, 34) + SourceIndex(0)
-26>Emitted(42, 258) Source(86, 36) + SourceIndex(0)
-27>Emitted(42, 259) Source(86, 37) + SourceIndex(0)
-28>Emitted(42, 261) Source(86, 39) + SourceIndex(0)
-29>Emitted(42, 263) Source(86, 41) + SourceIndex(0)
-30>Emitted(42, 264) Source(86, 42) + SourceIndex(0)
+6 >Emitted(42, 28) Source(82, 5) + SourceIndex(0)
+7 >Emitted(42, 42) Source(85, 47) + SourceIndex(0)
+8 >Emitted(42, 44) Source(82, 5) + SourceIndex(0)
+9 >Emitted(42, 108) Source(85, 47) + SourceIndex(0)
+10>Emitted(42, 110) Source(83, 9) + SourceIndex(0)
+11>Emitted(42, 125) Source(83, 28) + SourceIndex(0)
+12>Emitted(42, 127) Source(83, 9) + SourceIndex(0)
+13>Emitted(42, 167) Source(83, 28) + SourceIndex(0)
+14>Emitted(42, 169) Source(84, 9) + SourceIndex(0)
+15>Emitted(42, 186) Source(84, 32) + SourceIndex(0)
+16>Emitted(42, 188) Source(84, 9) + SourceIndex(0)
+17>Emitted(42, 232) Source(84, 32) + SourceIndex(0)
+18>Emitted(42, 238) Source(86, 22) + SourceIndex(0)
+19>Emitted(42, 239) Source(86, 23) + SourceIndex(0)
+20>Emitted(42, 242) Source(86, 26) + SourceIndex(0)
+21>Emitted(42, 243) Source(86, 27) + SourceIndex(0)
+22>Emitted(42, 245) Source(86, 29) + SourceIndex(0)
+23>Emitted(42, 246) Source(86, 30) + SourceIndex(0)
+24>Emitted(42, 249) Source(86, 33) + SourceIndex(0)
+25>Emitted(42, 250) Source(86, 34) + SourceIndex(0)
+26>Emitted(42, 252) Source(86, 36) + SourceIndex(0)
+27>Emitted(42, 253) Source(86, 37) + SourceIndex(0)
+28>Emitted(42, 255) Source(86, 39) + SourceIndex(0)
+29>Emitted(42, 257) Source(86, 41) + SourceIndex(0)
+30>Emitted(42, 258) Source(86, 42) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -1641,31 +1629,31 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(44, 1) Source(88, 1) + SourceIndex(0)
 2 >Emitted(44, 2) Source(88, 2) + SourceIndex(0)
 ---
->>>for (_9 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, (_10 = _9.skills, _11 = _10 === void 0 ? { primary: "none", secondary: "none" } : _10, _12 = _11.primary, primary = _12 === void 0 ? "primary" : _12, _13 = _11.secondary, secondary = _13 === void 0 ? "secondary" : _13, _9), _9,
+>>>for (_9 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _10 = _9.skills, _11 = _10 === void 0 ? { primary: "none", secondary: "none" } : _10, _12 = _11.primary, primary = _12 === void 0 ? "primary" : _12, _13 = _11.secondary, secondary = _13 === void 0 ? "secondary" : _13, _9,
 1->
 2 >^^^
 3 >   ^
 4 >    ^
 5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                                                                   ^^^
-7 >                                                                                      ^^^^^^^^^^^^^^^
-8 >                                                                                                     ^^
-9 >                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-10>                                                                                                                                                                          ^^
-11>                                                                                                                                                                            ^^^^^^^^^^^^^^^^^
-12>                                                                                                                                                                                             ^^
-13>                                                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-14>                                                                                                                                                                                                                                         ^^
-15>                                                                                                                                                                                                                                           ^^^^^^^^^^^^^^^^^^^
-16>                                                                                                                                                                                                                                                              ^^
-17>                                                                                                                                                                                                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                                                   ^^
+7 >                                                                                     ^^^^^^^^^^^^^^^
+8 >                                                                                                    ^^
+9 >                                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                                                                                         ^^
+11>                                                                                                                                                                           ^^^^^^^^^^^^^^^^^
+12>                                                                                                                                                                                            ^^
+13>                                                                                                                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                                                                                        ^^
+15>                                                                                                                                                                                                                                          ^^^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                                                                                             ^^
+17>                                                                                                                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
 2 >for
@@ -1678,41 +1666,41 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
   >         } = { primary: "none", secondary: "none" }
   >     } = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }
 6 >                                                                                   
-7 >                                                                                      skills: {
-  >                                                                                              primary = "primary",
-  >                                                                                              secondary = "secondary"
-  >                                                                                          } = { primary: "none", secondary: "none" }
-8 >                                                                                                     
-9 >                                                                                                       skills: {
-  >                                                                                                               primary = "primary",
-  >                                                                                                               secondary = "secondary"
-  >                                                                                                           } = { primary: "none", secondary: "none" }
-10>                                                                                                                                                                          
-11>                                                                                                                                                                            primary = "primary"
-12>                                                                                                                                                                                             
-13>                                                                                                                                                                                               primary = "primary"
-14>                                                                                                                                                                                                                                         ,
-  >                                                                                                                                                                                                                                                 
-15>                                                                                                                                                                                                                                           secondary = "secondary"
-16>                                                                                                                                                                                                                                                              
-17>                                                                                                                                                                                                                                                                secondary = "secondary"
+7 >                                                                                     skills: {
+  >                                                                                             primary = "primary",
+  >                                                                                             secondary = "secondary"
+  >                                                                                         } = { primary: "none", secondary: "none" }
+8 >                                                                                                    
+9 >                                                                                                      skills: {
+  >                                                                                                              primary = "primary",
+  >                                                                                                              secondary = "secondary"
+  >                                                                                                          } = { primary: "none", secondary: "none" }
+10>                                                                                                                                                                         
+11>                                                                                                                                                                           primary = "primary"
+12>                                                                                                                                                                                            
+13>                                                                                                                                                                                              primary = "primary"
+14>                                                                                                                                                                                                                                        ,
+  >                                                                                                                                                                                                                                                
+15>                                                                                                                                                                                                                                          secondary = "secondary"
+16>                                                                                                                                                                                                                                                             
+17>                                                                                                                                                                                                                                                               secondary = "secondary"
 1->Emitted(45, 1) Source(89, 1) + SourceIndex(0)
 2 >Emitted(45, 4) Source(89, 4) + SourceIndex(0)
 3 >Emitted(45, 5) Source(89, 5) + SourceIndex(0)
 4 >Emitted(45, 6) Source(89, 6) + SourceIndex(0)
 5 >Emitted(45, 84) Source(94, 90) + SourceIndex(0)
-6 >Emitted(45, 87) Source(90, 5) + SourceIndex(0)
-7 >Emitted(45, 102) Source(93, 47) + SourceIndex(0)
-8 >Emitted(45, 104) Source(90, 5) + SourceIndex(0)
-9 >Emitted(45, 171) Source(93, 47) + SourceIndex(0)
-10>Emitted(45, 173) Source(91, 9) + SourceIndex(0)
-11>Emitted(45, 190) Source(91, 28) + SourceIndex(0)
-12>Emitted(45, 192) Source(91, 9) + SourceIndex(0)
-13>Emitted(45, 234) Source(91, 28) + SourceIndex(0)
-14>Emitted(45, 236) Source(92, 9) + SourceIndex(0)
-15>Emitted(45, 255) Source(92, 32) + SourceIndex(0)
-16>Emitted(45, 257) Source(92, 9) + SourceIndex(0)
-17>Emitted(45, 303) Source(92, 32) + SourceIndex(0)
+6 >Emitted(45, 86) Source(90, 5) + SourceIndex(0)
+7 >Emitted(45, 101) Source(93, 47) + SourceIndex(0)
+8 >Emitted(45, 103) Source(90, 5) + SourceIndex(0)
+9 >Emitted(45, 170) Source(93, 47) + SourceIndex(0)
+10>Emitted(45, 172) Source(91, 9) + SourceIndex(0)
+11>Emitted(45, 189) Source(91, 28) + SourceIndex(0)
+12>Emitted(45, 191) Source(91, 9) + SourceIndex(0)
+13>Emitted(45, 233) Source(91, 28) + SourceIndex(0)
+14>Emitted(45, 235) Source(92, 9) + SourceIndex(0)
+15>Emitted(45, 254) Source(92, 32) + SourceIndex(0)
+16>Emitted(45, 256) Source(92, 9) + SourceIndex(0)
+17>Emitted(45, 302) Source(92, 32) + SourceIndex(0)
 ---
 >>>    i = 0; i < 1; i++) {
 1 >^^^^
@@ -2145,14 +2133,14 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(57, 1) Source(108, 1) + SourceIndex(0)
 2 >Emitted(57, 2) Source(108, 2) + SourceIndex(0)
 ---
->>>for (_22 = multiRobot.name, nameA = _22 === void 0 ? "noName" : _22, _23 = multiRobot.skills, _24 = _23 === void 0 ? { primary: "none", secondary: "none" } : _23, _25 = _24.primary, primaryA = _25 === void 0 ? "primary" : _25, _26 = _24.secondary, secondaryA = _26 === void 0 ? "secondary" : _26, multiRobot, multiRobot, i = 0; i < 1; i++) {
+>>>for (_22 = multiRobot.name, nameA = _22 === void 0 ? "noName" : _22, _23 = multiRobot.skills, _24 = _23 === void 0 ? { primary: "none", secondary: "none" } : _23, _25 = _24.primary, primaryA = _25 === void 0 ? "primary" : _25, _26 = _24.secondary, secondaryA = _26 === void 0 ? "secondary" : _26, multiRobot, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
@@ -2175,20 +2163,18 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 20>                                                                                                                                                                                                                                                                                                       ^^
 21>                                                                                                                                                                                                                                                                                                         ^^^^^^^^^^
 22>                                                                                                                                                                                                                                                                                                                   ^^
-23>                                                                                                                                                                                                                                                                                                                     ^^^^^^^^^^
-24>                                                                                                                                                                                                                                                                                                                               ^^
-25>                                                                                                                                                                                                                                                                                                                                 ^
-26>                                                                                                                                                                                                                                                                                                                                  ^^^
-27>                                                                                                                                                                                                                                                                                                                                     ^
-28>                                                                                                                                                                                                                                                                                                                                      ^^
-29>                                                                                                                                                                                                                                                                                                                                        ^
-30>                                                                                                                                                                                                                                                                                                                                         ^^^
-31>                                                                                                                                                                                                                                                                                                                                            ^
-32>                                                                                                                                                                                                                                                                                                                                             ^^
-33>                                                                                                                                                                                                                                                                                                                                               ^
-34>                                                                                                                                                                                                                                                                                                                                                ^^
-35>                                                                                                                                                                                                                                                                                                                                                  ^^
-36>                                                                                                                                                                                                                                                                                                                                                    ^
+23>                                                                                                                                                                                                                                                                                                                     ^
+24>                                                                                                                                                                                                                                                                                                                      ^^^
+25>                                                                                                                                                                                                                                                                                                                         ^
+26>                                                                                                                                                                                                                                                                                                                          ^^
+27>                                                                                                                                                                                                                                                                                                                            ^
+28>                                                                                                                                                                                                                                                                                                                             ^^^
+29>                                                                                                                                                                                                                                                                                                                                ^
+30>                                                                                                                                                                                                                                                                                                                                 ^^
+31>                                                                                                                                                                                                                                                                                                                                   ^
+32>                                                                                                                                                                                                                                                                                                                                    ^^
+33>                                                                                                                                                                                                                                                                                                                                      ^^
+34>                                                                                                                                                                                                                                                                                                                                        ^
 1->
   >
 2 >for
@@ -2222,21 +2208,19 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
   >                                                                                                                                                                                                                                                                                                           } = { primary: "none", secondary: "none" }
   >                                                                                                                                                                                                                                                                                                       } = 
 21>                                                                                                                                                                                                                                                                                                         multiRobot
-22>                                                                                                                                                                                                                                                                                                                   
-23>                                                                                                                                                                                                                                                                                                                     multiRobot
-24>                                                                                                                                                                                                                                                                                                                               , 
-25>                                                                                                                                                                                                                                                                                                                                 i
-26>                                                                                                                                                                                                                                                                                                                                   = 
-27>                                                                                                                                                                                                                                                                                                                                     0
-28>                                                                                                                                                                                                                                                                                                                                      ; 
-29>                                                                                                                                                                                                                                                                                                                                        i
-30>                                                                                                                                                                                                                                                                                                                                          < 
-31>                                                                                                                                                                                                                                                                                                                                            1
-32>                                                                                                                                                                                                                                                                                                                                             ; 
-33>                                                                                                                                                                                                                                                                                                                                               i
-34>                                                                                                                                                                                                                                                                                                                                                ++
-35>                                                                                                                                                                                                                                                                                                                                                  ) 
-36>                                                                                                                                                                                                                                                                                                                                                    {
+22>                                                                                                                                                                                                                                                                                                                   , 
+23>                                                                                                                                                                                                                                                                                                                     i
+24>                                                                                                                                                                                                                                                                                                                       = 
+25>                                                                                                                                                                                                                                                                                                                         0
+26>                                                                                                                                                                                                                                                                                                                          ; 
+27>                                                                                                                                                                                                                                                                                                                            i
+28>                                                                                                                                                                                                                                                                                                                              < 
+29>                                                                                                                                                                                                                                                                                                                                1
+30>                                                                                                                                                                                                                                                                                                                                 ; 
+31>                                                                                                                                                                                                                                                                                                                                   i
+32>                                                                                                                                                                                                                                                                                                                                    ++
+33>                                                                                                                                                                                                                                                                                                                                      ) 
+34>                                                                                                                                                                                                                                                                                                                                        {
 1->Emitted(58, 1) Source(109, 1) + SourceIndex(0)
 2 >Emitted(58, 4) Source(109, 4) + SourceIndex(0)
 3 >Emitted(58, 5) Source(109, 5) + SourceIndex(0)
@@ -2258,21 +2242,19 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 19>Emitted(58, 296) Source(113, 44) + SourceIndex(0)
 20>Emitted(58, 298) Source(115, 5) + SourceIndex(0)
 21>Emitted(58, 308) Source(115, 15) + SourceIndex(0)
-22>Emitted(58, 310) Source(115, 5) + SourceIndex(0)
-23>Emitted(58, 320) Source(115, 15) + SourceIndex(0)
-24>Emitted(58, 322) Source(115, 17) + SourceIndex(0)
-25>Emitted(58, 323) Source(115, 18) + SourceIndex(0)
-26>Emitted(58, 326) Source(115, 21) + SourceIndex(0)
-27>Emitted(58, 327) Source(115, 22) + SourceIndex(0)
-28>Emitted(58, 329) Source(115, 24) + SourceIndex(0)
-29>Emitted(58, 330) Source(115, 25) + SourceIndex(0)
-30>Emitted(58, 333) Source(115, 28) + SourceIndex(0)
-31>Emitted(58, 334) Source(115, 29) + SourceIndex(0)
-32>Emitted(58, 336) Source(115, 31) + SourceIndex(0)
-33>Emitted(58, 337) Source(115, 32) + SourceIndex(0)
-34>Emitted(58, 339) Source(115, 34) + SourceIndex(0)
-35>Emitted(58, 341) Source(115, 36) + SourceIndex(0)
-36>Emitted(58, 342) Source(115, 37) + SourceIndex(0)
+22>Emitted(58, 310) Source(115, 17) + SourceIndex(0)
+23>Emitted(58, 311) Source(115, 18) + SourceIndex(0)
+24>Emitted(58, 314) Source(115, 21) + SourceIndex(0)
+25>Emitted(58, 315) Source(115, 22) + SourceIndex(0)
+26>Emitted(58, 317) Source(115, 24) + SourceIndex(0)
+27>Emitted(58, 318) Source(115, 25) + SourceIndex(0)
+28>Emitted(58, 321) Source(115, 28) + SourceIndex(0)
+29>Emitted(58, 322) Source(115, 29) + SourceIndex(0)
+30>Emitted(58, 324) Source(115, 31) + SourceIndex(0)
+31>Emitted(58, 325) Source(115, 32) + SourceIndex(0)
+32>Emitted(58, 327) Source(115, 34) + SourceIndex(0)
+33>Emitted(58, 329) Source(115, 36) + SourceIndex(0)
+34>Emitted(58, 330) Source(115, 37) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -2304,48 +2286,48 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(60, 1) Source(117, 1) + SourceIndex(0)
 2 >Emitted(60, 2) Source(117, 2) + SourceIndex(0)
 ---
->>>for (_27 = getMultiRobot(), (_28 = _27.name, nameA = _28 === void 0 ? "noName" : _28, _29 = _27.skills, _30 = _29 === void 0 ? { primary: "none", secondary: "none" } : _29, _31 = _30.primary, primaryA = _31 === void 0 ? "primary" : _31, _32 = _30.secondary, secondaryA = _32 === void 0 ? "secondary" : _32, _27), _27, i = 0; i < 1; i++) {
+>>>for (_27 = getMultiRobot(), _28 = _27.name, nameA = _28 === void 0 ? "noName" : _28, _29 = _27.skills, _30 = _29 === void 0 ? { primary: "none", secondary: "none" } : _29, _31 = _30.primary, primaryA = _31 === void 0 ? "primary" : _31, _32 = _30.secondary, secondaryA = _32 === void 0 ? "secondary" : _32, _27, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
 5 >     ^^^^^^^^^^^^^^^^^^^^^
-6 >                          ^^^
-7 >                             ^^^^^^^^^^^^^^
-8 >                                           ^^
-9 >                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-10>                                                                                    ^^
-11>                                                                                      ^^^^^^^^^^^^^^^^
-12>                                                                                                      ^^
-13>                                                                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-14>                                                                                                                                                                           ^^
-15>                                                                                                                                                                             ^^^^^^^^^^^^^^^^^
-16>                                                                                                                                                                                              ^^
-17>                                                                                                                                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-18>                                                                                                                                                                                                                                           ^^
-19>                                                                                                                                                                                                                                             ^^^^^^^^^^^^^^^^^^^
-20>                                                                                                                                                                                                                                                                ^^
-21>                                                                                                                                                                                                                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-22>                                                                                                                                                                                                                                                                                                                 ^^^^^^^^^^^^^
-23>                                                                                                                                                                                                                                                                                                                              ^
-24>                                                                                                                                                                                                                                                                                                                               ^^^
-25>                                                                                                                                                                                                                                                                                                                                  ^
-26>                                                                                                                                                                                                                                                                                                                                   ^^
-27>                                                                                                                                                                                                                                                                                                                                     ^
-28>                                                                                                                                                                                                                                                                                                                                      ^^^
-29>                                                                                                                                                                                                                                                                                                                                         ^
-30>                                                                                                                                                                                                                                                                                                                                          ^^
-31>                                                                                                                                                                                                                                                                                                                                            ^
-32>                                                                                                                                                                                                                                                                                                                                             ^^
-33>                                                                                                                                                                                                                                                                                                                                               ^^
-34>                                                                                                                                                                                                                                                                                                                                                 ^
+6 >                          ^^
+7 >                            ^^^^^^^^^^^^^^
+8 >                                          ^^
+9 >                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                   ^^
+11>                                                                                     ^^^^^^^^^^^^^^^^
+12>                                                                                                     ^^
+13>                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                          ^^
+15>                                                                                                                                                                            ^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                             ^^
+17>                                                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+18>                                                                                                                                                                                                                                          ^^
+19>                                                                                                                                                                                                                                            ^^^^^^^^^^^^^^^^^^^
+20>                                                                                                                                                                                                                                                               ^^
+21>                                                                                                                                                                                                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+22>                                                                                                                                                                                                                                                                                                                ^^^^^^^
+23>                                                                                                                                                                                                                                                                                                                       ^
+24>                                                                                                                                                                                                                                                                                                                        ^^^
+25>                                                                                                                                                                                                                                                                                                                           ^
+26>                                                                                                                                                                                                                                                                                                                            ^^
+27>                                                                                                                                                                                                                                                                                                                              ^
+28>                                                                                                                                                                                                                                                                                                                               ^^^
+29>                                                                                                                                                                                                                                                                                                                                  ^
+30>                                                                                                                                                                                                                                                                                                                                   ^^
+31>                                                                                                                                                                                                                                                                                                                                     ^
+32>                                                                                                                                                                                                                                                                                                                                      ^^
+33>                                                                                                                                                                                                                                                                                                                                        ^^
+34>                                                                                                                                                                                                                                                                                                                                          ^
 1->
   >
 2 >for
@@ -2359,78 +2341,78 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
   >         } = { primary: "none", secondary: "none" }
   >     } = getMultiRobot()
 6 >                          
-7 >                             name: nameA = "noName"
-8 >                                           
-9 >                                             name: nameA = "noName"
-10>                                                                                    ,
-  >                                                                                        
-11>                                                                                      skills: {
-  >                                                                                              primary: primaryA = "primary",
-  >                                                                                              secondary: secondaryA = "secondary"
-  >                                                                                          } = { primary: "none", secondary: "none" }
-12>                                                                                                      
-13>                                                                                                        skills: {
-  >                                                                                                                primary: primaryA = "primary",
-  >                                                                                                                secondary: secondaryA = "secondary"
-  >                                                                                                            } = { primary: "none", secondary: "none" }
-14>                                                                                                                                                                           
-15>                                                                                                                                                                             primary: primaryA = "primary"
-16>                                                                                                                                                                                              
-17>                                                                                                                                                                                                primary: primaryA = "primary"
-18>                                                                                                                                                                                                                                           ,
-  >                                                                                                                                                                                                                                                   
-19>                                                                                                                                                                                                                                             secondary: secondaryA = "secondary"
-20>                                                                                                                                                                                                                                                                
-21>                                                                                                                                                                                                                                                                  secondary: secondaryA = "secondary"
-22>                                                                                                                                                                                                                                                                                                                 
-  >                                                                                                                                                                                                                                                                                                                     } = { primary: "none", secondary: "none" }
-  >                                                                                                                                                                                                                                                                                                                 } = getMultiRobot(), 
-23>                                                                                                                                                                                                                                                                                                                              i
-24>                                                                                                                                                                                                                                                                                                                                = 
-25>                                                                                                                                                                                                                                                                                                                                  0
-26>                                                                                                                                                                                                                                                                                                                                   ; 
-27>                                                                                                                                                                                                                                                                                                                                     i
-28>                                                                                                                                                                                                                                                                                                                                       < 
-29>                                                                                                                                                                                                                                                                                                                                         1
-30>                                                                                                                                                                                                                                                                                                                                          ; 
-31>                                                                                                                                                                                                                                                                                                                                            i
-32>                                                                                                                                                                                                                                                                                                                                             ++
-33>                                                                                                                                                                                                                                                                                                                                               ) 
-34>                                                                                                                                                                                                                                                                                                                                                 {
+7 >                            name: nameA = "noName"
+8 >                                          
+9 >                                            name: nameA = "noName"
+10>                                                                                   ,
+  >                                                                                       
+11>                                                                                     skills: {
+  >                                                                                             primary: primaryA = "primary",
+  >                                                                                             secondary: secondaryA = "secondary"
+  >                                                                                         } = { primary: "none", secondary: "none" }
+12>                                                                                                     
+13>                                                                                                       skills: {
+  >                                                                                                               primary: primaryA = "primary",
+  >                                                                                                               secondary: secondaryA = "secondary"
+  >                                                                                                           } = { primary: "none", secondary: "none" }
+14>                                                                                                                                                                          
+15>                                                                                                                                                                            primary: primaryA = "primary"
+16>                                                                                                                                                                                             
+17>                                                                                                                                                                                               primary: primaryA = "primary"
+18>                                                                                                                                                                                                                                          ,
+  >                                                                                                                                                                                                                                                  
+19>                                                                                                                                                                                                                                            secondary: secondaryA = "secondary"
+20>                                                                                                                                                                                                                                                               
+21>                                                                                                                                                                                                                                                                 secondary: secondaryA = "secondary"
+22>                                                                                                                                                                                                                                                                                                                
+  >                                                                                                                                                                                                                                                                                                                    } = { primary: "none", secondary: "none" }
+  >                                                                                                                                                                                                                                                                                                                } = getMultiRobot(), 
+23>                                                                                                                                                                                                                                                                                                                       i
+24>                                                                                                                                                                                                                                                                                                                         = 
+25>                                                                                                                                                                                                                                                                                                                           0
+26>                                                                                                                                                                                                                                                                                                                            ; 
+27>                                                                                                                                                                                                                                                                                                                              i
+28>                                                                                                                                                                                                                                                                                                                                < 
+29>                                                                                                                                                                                                                                                                                                                                  1
+30>                                                                                                                                                                                                                                                                                                                                   ; 
+31>                                                                                                                                                                                                                                                                                                                                     i
+32>                                                                                                                                                                                                                                                                                                                                      ++
+33>                                                                                                                                                                                                                                                                                                                                        ) 
+34>                                                                                                                                                                                                                                                                                                                                          {
 1->Emitted(61, 1) Source(118, 1) + SourceIndex(0)
 2 >Emitted(61, 4) Source(118, 4) + SourceIndex(0)
 3 >Emitted(61, 5) Source(118, 5) + SourceIndex(0)
 4 >Emitted(61, 6) Source(118, 6) + SourceIndex(0)
 5 >Emitted(61, 27) Source(124, 20) + SourceIndex(0)
-6 >Emitted(61, 30) Source(119, 5) + SourceIndex(0)
-7 >Emitted(61, 44) Source(119, 27) + SourceIndex(0)
-8 >Emitted(61, 46) Source(119, 5) + SourceIndex(0)
-9 >Emitted(61, 85) Source(119, 27) + SourceIndex(0)
-10>Emitted(61, 87) Source(120, 5) + SourceIndex(0)
-11>Emitted(61, 103) Source(123, 47) + SourceIndex(0)
-12>Emitted(61, 105) Source(120, 5) + SourceIndex(0)
-13>Emitted(61, 172) Source(123, 47) + SourceIndex(0)
-14>Emitted(61, 174) Source(121, 9) + SourceIndex(0)
-15>Emitted(61, 191) Source(121, 38) + SourceIndex(0)
-16>Emitted(61, 193) Source(121, 9) + SourceIndex(0)
-17>Emitted(61, 236) Source(121, 38) + SourceIndex(0)
-18>Emitted(61, 238) Source(122, 9) + SourceIndex(0)
-19>Emitted(61, 257) Source(122, 44) + SourceIndex(0)
-20>Emitted(61, 259) Source(122, 9) + SourceIndex(0)
-21>Emitted(61, 306) Source(122, 44) + SourceIndex(0)
-22>Emitted(61, 319) Source(124, 22) + SourceIndex(0)
-23>Emitted(61, 320) Source(124, 23) + SourceIndex(0)
-24>Emitted(61, 323) Source(124, 26) + SourceIndex(0)
-25>Emitted(61, 324) Source(124, 27) + SourceIndex(0)
-26>Emitted(61, 326) Source(124, 29) + SourceIndex(0)
-27>Emitted(61, 327) Source(124, 30) + SourceIndex(0)
-28>Emitted(61, 330) Source(124, 33) + SourceIndex(0)
-29>Emitted(61, 331) Source(124, 34) + SourceIndex(0)
-30>Emitted(61, 333) Source(124, 36) + SourceIndex(0)
-31>Emitted(61, 334) Source(124, 37) + SourceIndex(0)
-32>Emitted(61, 336) Source(124, 39) + SourceIndex(0)
-33>Emitted(61, 338) Source(124, 41) + SourceIndex(0)
-34>Emitted(61, 339) Source(124, 42) + SourceIndex(0)
+6 >Emitted(61, 29) Source(119, 5) + SourceIndex(0)
+7 >Emitted(61, 43) Source(119, 27) + SourceIndex(0)
+8 >Emitted(61, 45) Source(119, 5) + SourceIndex(0)
+9 >Emitted(61, 84) Source(119, 27) + SourceIndex(0)
+10>Emitted(61, 86) Source(120, 5) + SourceIndex(0)
+11>Emitted(61, 102) Source(123, 47) + SourceIndex(0)
+12>Emitted(61, 104) Source(120, 5) + SourceIndex(0)
+13>Emitted(61, 171) Source(123, 47) + SourceIndex(0)
+14>Emitted(61, 173) Source(121, 9) + SourceIndex(0)
+15>Emitted(61, 190) Source(121, 38) + SourceIndex(0)
+16>Emitted(61, 192) Source(121, 9) + SourceIndex(0)
+17>Emitted(61, 235) Source(121, 38) + SourceIndex(0)
+18>Emitted(61, 237) Source(122, 9) + SourceIndex(0)
+19>Emitted(61, 256) Source(122, 44) + SourceIndex(0)
+20>Emitted(61, 258) Source(122, 9) + SourceIndex(0)
+21>Emitted(61, 305) Source(122, 44) + SourceIndex(0)
+22>Emitted(61, 312) Source(124, 22) + SourceIndex(0)
+23>Emitted(61, 313) Source(124, 23) + SourceIndex(0)
+24>Emitted(61, 316) Source(124, 26) + SourceIndex(0)
+25>Emitted(61, 317) Source(124, 27) + SourceIndex(0)
+26>Emitted(61, 319) Source(124, 29) + SourceIndex(0)
+27>Emitted(61, 320) Source(124, 30) + SourceIndex(0)
+28>Emitted(61, 323) Source(124, 33) + SourceIndex(0)
+29>Emitted(61, 324) Source(124, 34) + SourceIndex(0)
+30>Emitted(61, 326) Source(124, 36) + SourceIndex(0)
+31>Emitted(61, 327) Source(124, 37) + SourceIndex(0)
+32>Emitted(61, 329) Source(124, 39) + SourceIndex(0)
+33>Emitted(61, 331) Source(124, 41) + SourceIndex(0)
+34>Emitted(61, 332) Source(124, 42) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -2462,35 +2444,35 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(63, 1) Source(126, 1) + SourceIndex(0)
 2 >Emitted(63, 2) Source(126, 2) + SourceIndex(0)
 ---
->>>for (_33 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, (_34 = _33.name, nameA = _34 === void 0 ? "noName" : _34, _35 = _33.skills, _36 = _35 === void 0 ? { primary: "none", secondary: "none" } : _35, _37 = _36.primary, primaryA = _37 === void 0 ? "primary" : _37, _38 = _36.secondary, secondaryA = _38 === void 0 ? "secondary" : _38, _33), _33,
+>>>for (_33 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _34 = _33.name, nameA = _34 === void 0 ? "noName" : _34, _35 = _33.skills, _36 = _35 === void 0 ? { primary: "none", secondary: "none" } : _35, _37 = _36.primary, primaryA = _37 === void 0 ? "primary" : _37, _38 = _36.secondary, secondaryA = _38 === void 0 ? "secondary" : _38, _33,
 1->
 2 >^^^
 3 >   ^
 4 >    ^
 5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                                                                    ^^^
-7 >                                                                                       ^^^^^^^^^^^^^^
-8 >                                                                                                     ^^
-9 >                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-10>                                                                                                                                              ^^
-11>                                                                                                                                                ^^^^^^^^^^^^^^^^
-12>                                                                                                                                                                ^^
-13>                                                                                                                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-14>                                                                                                                                                                                                                                     ^^
-15>                                                                                                                                                                                                                                       ^^^^^^^^^^^^^^^^^
-16>                                                                                                                                                                                                                                                        ^^
-17>                                                                                                                                                                                                                                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-18>                                                                                                                                                                                                                                                                                                     ^^
-19>                                                                                                                                                                                                                                                                                                       ^^^^^^^^^^^^^^^^^^^
-20>                                                                                                                                                                                                                                                                                                                          ^^
-21>                                                                                                                                                                                                                                                                                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                                                    ^^
+7 >                                                                                      ^^^^^^^^^^^^^^
+8 >                                                                                                    ^^
+9 >                                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                                                             ^^
+11>                                                                                                                                               ^^^^^^^^^^^^^^^^
+12>                                                                                                                                                               ^^
+13>                                                                                                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                                                                                    ^^
+15>                                                                                                                                                                                                                                      ^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                                                                                       ^^
+17>                                                                                                                                                                                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+18>                                                                                                                                                                                                                                                                                                    ^^
+19>                                                                                                                                                                                                                                                                                                      ^^^^^^^^^^^^^^^^^^^
+20>                                                                                                                                                                                                                                                                                                                         ^^
+21>                                                                                                                                                                                                                                                                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
 2 >for
@@ -2504,50 +2486,50 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
   >         } = { primary: "none", secondary: "none" }
   >     } = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }
 6 >                                                                                    
-7 >                                                                                       name: nameA = "noName"
-8 >                                                                                                     
-9 >                                                                                                       name: nameA = "noName"
-10>                                                                                                                                              ,
-  >                                                                                                                                                  
-11>                                                                                                                                                skills: {
-  >                                                                                                                                                        primary: primaryA = "primary",
-  >                                                                                                                                                        secondary: secondaryA = "secondary"
-  >                                                                                                                                                    } = { primary: "none", secondary: "none" }
-12>                                                                                                                                                                
-13>                                                                                                                                                                  skills: {
-  >                                                                                                                                                                          primary: primaryA = "primary",
-  >                                                                                                                                                                          secondary: secondaryA = "secondary"
-  >                                                                                                                                                                      } = { primary: "none", secondary: "none" }
-14>                                                                                                                                                                                                                                     
-15>                                                                                                                                                                                                                                       primary: primaryA = "primary"
-16>                                                                                                                                                                                                                                                        
-17>                                                                                                                                                                                                                                                          primary: primaryA = "primary"
-18>                                                                                                                                                                                                                                                                                                     ,
-  >                                                                                                                                                                                                                                                                                                             
-19>                                                                                                                                                                                                                                                                                                       secondary: secondaryA = "secondary"
-20>                                                                                                                                                                                                                                                                                                                          
-21>                                                                                                                                                                                                                                                                                                                            secondary: secondaryA = "secondary"
+7 >                                                                                      name: nameA = "noName"
+8 >                                                                                                    
+9 >                                                                                                      name: nameA = "noName"
+10>                                                                                                                                             ,
+  >                                                                                                                                                 
+11>                                                                                                                                               skills: {
+  >                                                                                                                                                       primary: primaryA = "primary",
+  >                                                                                                                                                       secondary: secondaryA = "secondary"
+  >                                                                                                                                                   } = { primary: "none", secondary: "none" }
+12>                                                                                                                                                               
+13>                                                                                                                                                                 skills: {
+  >                                                                                                                                                                         primary: primaryA = "primary",
+  >                                                                                                                                                                         secondary: secondaryA = "secondary"
+  >                                                                                                                                                                     } = { primary: "none", secondary: "none" }
+14>                                                                                                                                                                                                                                    
+15>                                                                                                                                                                                                                                      primary: primaryA = "primary"
+16>                                                                                                                                                                                                                                                       
+17>                                                                                                                                                                                                                                                         primary: primaryA = "primary"
+18>                                                                                                                                                                                                                                                                                                    ,
+  >                                                                                                                                                                                                                                                                                                            
+19>                                                                                                                                                                                                                                                                                                      secondary: secondaryA = "secondary"
+20>                                                                                                                                                                                                                                                                                                                         
+21>                                                                                                                                                                                                                                                                                                                           secondary: secondaryA = "secondary"
 1->Emitted(64, 1) Source(127, 1) + SourceIndex(0)
 2 >Emitted(64, 4) Source(127, 4) + SourceIndex(0)
 3 >Emitted(64, 5) Source(127, 5) + SourceIndex(0)
 4 >Emitted(64, 6) Source(127, 6) + SourceIndex(0)
 5 >Emitted(64, 85) Source(133, 90) + SourceIndex(0)
-6 >Emitted(64, 88) Source(128, 5) + SourceIndex(0)
-7 >Emitted(64, 102) Source(128, 27) + SourceIndex(0)
-8 >Emitted(64, 104) Source(128, 5) + SourceIndex(0)
-9 >Emitted(64, 143) Source(128, 27) + SourceIndex(0)
-10>Emitted(64, 145) Source(129, 5) + SourceIndex(0)
-11>Emitted(64, 161) Source(132, 47) + SourceIndex(0)
-12>Emitted(64, 163) Source(129, 5) + SourceIndex(0)
-13>Emitted(64, 230) Source(132, 47) + SourceIndex(0)
-14>Emitted(64, 232) Source(130, 9) + SourceIndex(0)
-15>Emitted(64, 249) Source(130, 38) + SourceIndex(0)
-16>Emitted(64, 251) Source(130, 9) + SourceIndex(0)
-17>Emitted(64, 294) Source(130, 38) + SourceIndex(0)
-18>Emitted(64, 296) Source(131, 9) + SourceIndex(0)
-19>Emitted(64, 315) Source(131, 44) + SourceIndex(0)
-20>Emitted(64, 317) Source(131, 9) + SourceIndex(0)
-21>Emitted(64, 364) Source(131, 44) + SourceIndex(0)
+6 >Emitted(64, 87) Source(128, 5) + SourceIndex(0)
+7 >Emitted(64, 101) Source(128, 27) + SourceIndex(0)
+8 >Emitted(64, 103) Source(128, 5) + SourceIndex(0)
+9 >Emitted(64, 142) Source(128, 27) + SourceIndex(0)
+10>Emitted(64, 144) Source(129, 5) + SourceIndex(0)
+11>Emitted(64, 160) Source(132, 47) + SourceIndex(0)
+12>Emitted(64, 162) Source(129, 5) + SourceIndex(0)
+13>Emitted(64, 229) Source(132, 47) + SourceIndex(0)
+14>Emitted(64, 231) Source(130, 9) + SourceIndex(0)
+15>Emitted(64, 248) Source(130, 38) + SourceIndex(0)
+16>Emitted(64, 250) Source(130, 9) + SourceIndex(0)
+17>Emitted(64, 293) Source(130, 38) + SourceIndex(0)
+18>Emitted(64, 295) Source(131, 9) + SourceIndex(0)
+19>Emitted(64, 314) Source(131, 44) + SourceIndex(0)
+20>Emitted(64, 316) Source(131, 9) + SourceIndex(0)
+21>Emitted(64, 363) Source(131, 44) + SourceIndex(0)
 ---
 >>>    i = 0; i < 1; i++) {
 1 >^^^^
@@ -2979,14 +2961,14 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(76, 1) Source(146, 1) + SourceIndex(0)
 2 >Emitted(76, 2) Source(146, 2) + SourceIndex(0)
 ---
->>>for (_47 = multiRobot.name, name = _47 === void 0 ? "noName" : _47, _48 = multiRobot.skills, _49 = _48 === void 0 ? { primary: "none", secondary: "none" } : _48, _50 = _49.primary, primary = _50 === void 0 ? "primary" : _50, _51 = _49.secondary, secondary = _51 === void 0 ? "secondary" : _51, multiRobot, multiRobot, i = 0; i < 1; i++) {
+>>>for (_47 = multiRobot.name, name = _47 === void 0 ? "noName" : _47, _48 = multiRobot.skills, _49 = _48 === void 0 ? { primary: "none", secondary: "none" } : _48, _50 = _49.primary, primary = _50 === void 0 ? "primary" : _50, _51 = _49.secondary, secondary = _51 === void 0 ? "secondary" : _51, multiRobot, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
@@ -3009,20 +2991,18 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 20>                                                                                                                                                                                                                                                                                                    ^^
 21>                                                                                                                                                                                                                                                                                                      ^^^^^^^^^^
 22>                                                                                                                                                                                                                                                                                                                ^^
-23>                                                                                                                                                                                                                                                                                                                  ^^^^^^^^^^
-24>                                                                                                                                                                                                                                                                                                                            ^^
-25>                                                                                                                                                                                                                                                                                                                              ^
-26>                                                                                                                                                                                                                                                                                                                               ^^^
-27>                                                                                                                                                                                                                                                                                                                                  ^
-28>                                                                                                                                                                                                                                                                                                                                   ^^
-29>                                                                                                                                                                                                                                                                                                                                     ^
-30>                                                                                                                                                                                                                                                                                                                                      ^^^
-31>                                                                                                                                                                                                                                                                                                                                         ^
-32>                                                                                                                                                                                                                                                                                                                                          ^^
-33>                                                                                                                                                                                                                                                                                                                                            ^
-34>                                                                                                                                                                                                                                                                                                                                             ^^
-35>                                                                                                                                                                                                                                                                                                                                               ^^
-36>                                                                                                                                                                                                                                                                                                                                                 ^
+23>                                                                                                                                                                                                                                                                                                                  ^
+24>                                                                                                                                                                                                                                                                                                                   ^^^
+25>                                                                                                                                                                                                                                                                                                                      ^
+26>                                                                                                                                                                                                                                                                                                                       ^^
+27>                                                                                                                                                                                                                                                                                                                         ^
+28>                                                                                                                                                                                                                                                                                                                          ^^^
+29>                                                                                                                                                                                                                                                                                                                             ^
+30>                                                                                                                                                                                                                                                                                                                              ^^
+31>                                                                                                                                                                                                                                                                                                                                ^
+32>                                                                                                                                                                                                                                                                                                                                 ^^
+33>                                                                                                                                                                                                                                                                                                                                   ^^
+34>                                                                                                                                                                                                                                                                                                                                     ^
 1->
   >
 2 >for
@@ -3056,21 +3036,19 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
   >                                                                                                                                                                                                                                                                                                        } = { primary: "none", secondary: "none" }
   >                                                                                                                                                                                                                                                                                                    } = 
 21>                                                                                                                                                                                                                                                                                                      multiRobot
-22>                                                                                                                                                                                                                                                                                                                
-23>                                                                                                                                                                                                                                                                                                                  multiRobot
-24>                                                                                                                                                                                                                                                                                                                            , 
-25>                                                                                                                                                                                                                                                                                                                              i
-26>                                                                                                                                                                                                                                                                                                                                = 
-27>                                                                                                                                                                                                                                                                                                                                  0
-28>                                                                                                                                                                                                                                                                                                                                   ; 
-29>                                                                                                                                                                                                                                                                                                                                     i
-30>                                                                                                                                                                                                                                                                                                                                       < 
-31>                                                                                                                                                                                                                                                                                                                                         1
-32>                                                                                                                                                                                                                                                                                                                                          ; 
-33>                                                                                                                                                                                                                                                                                                                                            i
-34>                                                                                                                                                                                                                                                                                                                                             ++
-35>                                                                                                                                                                                                                                                                                                                                               ) 
-36>                                                                                                                                                                                                                                                                                                                                                 {
+22>                                                                                                                                                                                                                                                                                                                , 
+23>                                                                                                                                                                                                                                                                                                                  i
+24>                                                                                                                                                                                                                                                                                                                    = 
+25>                                                                                                                                                                                                                                                                                                                      0
+26>                                                                                                                                                                                                                                                                                                                       ; 
+27>                                                                                                                                                                                                                                                                                                                         i
+28>                                                                                                                                                                                                                                                                                                                           < 
+29>                                                                                                                                                                                                                                                                                                                             1
+30>                                                                                                                                                                                                                                                                                                                              ; 
+31>                                                                                                                                                                                                                                                                                                                                i
+32>                                                                                                                                                                                                                                                                                                                                 ++
+33>                                                                                                                                                                                                                                                                                                                                   ) 
+34>                                                                                                                                                                                                                                                                                                                                     {
 1->Emitted(77, 1) Source(147, 1) + SourceIndex(0)
 2 >Emitted(77, 4) Source(147, 4) + SourceIndex(0)
 3 >Emitted(77, 5) Source(147, 5) + SourceIndex(0)
@@ -3092,21 +3070,19 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 19>Emitted(77, 293) Source(151, 32) + SourceIndex(0)
 20>Emitted(77, 295) Source(153, 5) + SourceIndex(0)
 21>Emitted(77, 305) Source(153, 15) + SourceIndex(0)
-22>Emitted(77, 307) Source(153, 5) + SourceIndex(0)
-23>Emitted(77, 317) Source(153, 15) + SourceIndex(0)
-24>Emitted(77, 319) Source(153, 17) + SourceIndex(0)
-25>Emitted(77, 320) Source(153, 18) + SourceIndex(0)
-26>Emitted(77, 323) Source(153, 21) + SourceIndex(0)
-27>Emitted(77, 324) Source(153, 22) + SourceIndex(0)
-28>Emitted(77, 326) Source(153, 24) + SourceIndex(0)
-29>Emitted(77, 327) Source(153, 25) + SourceIndex(0)
-30>Emitted(77, 330) Source(153, 28) + SourceIndex(0)
-31>Emitted(77, 331) Source(153, 29) + SourceIndex(0)
-32>Emitted(77, 333) Source(153, 31) + SourceIndex(0)
-33>Emitted(77, 334) Source(153, 32) + SourceIndex(0)
-34>Emitted(77, 336) Source(153, 34) + SourceIndex(0)
-35>Emitted(77, 338) Source(153, 36) + SourceIndex(0)
-36>Emitted(77, 339) Source(153, 37) + SourceIndex(0)
+22>Emitted(77, 307) Source(153, 17) + SourceIndex(0)
+23>Emitted(77, 308) Source(153, 18) + SourceIndex(0)
+24>Emitted(77, 311) Source(153, 21) + SourceIndex(0)
+25>Emitted(77, 312) Source(153, 22) + SourceIndex(0)
+26>Emitted(77, 314) Source(153, 24) + SourceIndex(0)
+27>Emitted(77, 315) Source(153, 25) + SourceIndex(0)
+28>Emitted(77, 318) Source(153, 28) + SourceIndex(0)
+29>Emitted(77, 319) Source(153, 29) + SourceIndex(0)
+30>Emitted(77, 321) Source(153, 31) + SourceIndex(0)
+31>Emitted(77, 322) Source(153, 32) + SourceIndex(0)
+32>Emitted(77, 324) Source(153, 34) + SourceIndex(0)
+33>Emitted(77, 326) Source(153, 36) + SourceIndex(0)
+34>Emitted(77, 327) Source(153, 37) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -3138,48 +3114,48 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(79, 1) Source(155, 1) + SourceIndex(0)
 2 >Emitted(79, 2) Source(155, 2) + SourceIndex(0)
 ---
->>>for (_52 = getMultiRobot(), (_53 = _52.name, name = _53 === void 0 ? "noName" : _53, _54 = _52.skills, _55 = _54 === void 0 ? { primary: "none", secondary: "none" } : _54, _56 = _55.primary, primary = _56 === void 0 ? "primary" : _56, _57 = _55.secondary, secondary = _57 === void 0 ? "secondary" : _57, _52), _52, i = 0; i < 1; i++) {
+>>>for (_52 = getMultiRobot(), _53 = _52.name, name = _53 === void 0 ? "noName" : _53, _54 = _52.skills, _55 = _54 === void 0 ? { primary: "none", secondary: "none" } : _54, _56 = _55.primary, primary = _56 === void 0 ? "primary" : _56, _57 = _55.secondary, secondary = _57 === void 0 ? "secondary" : _57, _52, i = 0; i < 1; i++) {
 1->
 2 >^^^
 3 >   ^
 4 >    ^
 5 >     ^^^^^^^^^^^^^^^^^^^^^
-6 >                          ^^^
-7 >                             ^^^^^^^^^^^^^^
-8 >                                           ^^
-9 >                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-10>                                                                                   ^^
-11>                                                                                     ^^^^^^^^^^^^^^^^
-12>                                                                                                     ^^
-13>                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-14>                                                                                                                                                                          ^^
-15>                                                                                                                                                                            ^^^^^^^^^^^^^^^^^
-16>                                                                                                                                                                                             ^^
-17>                                                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-18>                                                                                                                                                                                                                                         ^^
-19>                                                                                                                                                                                                                                           ^^^^^^^^^^^^^^^^^^^
-20>                                                                                                                                                                                                                                                              ^^
-21>                                                                                                                                                                                                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-22>                                                                                                                                                                                                                                                                                                              ^^^^^^^^^^^^^
-23>                                                                                                                                                                                                                                                                                                                           ^
-24>                                                                                                                                                                                                                                                                                                                            ^^^
-25>                                                                                                                                                                                                                                                                                                                               ^
-26>                                                                                                                                                                                                                                                                                                                                ^^
-27>                                                                                                                                                                                                                                                                                                                                  ^
-28>                                                                                                                                                                                                                                                                                                                                   ^^^
-29>                                                                                                                                                                                                                                                                                                                                      ^
-30>                                                                                                                                                                                                                                                                                                                                       ^^
-31>                                                                                                                                                                                                                                                                                                                                         ^
-32>                                                                                                                                                                                                                                                                                                                                          ^^
-33>                                                                                                                                                                                                                                                                                                                                            ^^
-34>                                                                                                                                                                                                                                                                                                                                              ^
+6 >                          ^^
+7 >                            ^^^^^^^^^^^^^^
+8 >                                          ^^
+9 >                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                  ^^
+11>                                                                                    ^^^^^^^^^^^^^^^^
+12>                                                                                                    ^^
+13>                                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                         ^^
+15>                                                                                                                                                                           ^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                            ^^
+17>                                                                                                                                                                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+18>                                                                                                                                                                                                                                        ^^
+19>                                                                                                                                                                                                                                          ^^^^^^^^^^^^^^^^^^^
+20>                                                                                                                                                                                                                                                             ^^
+21>                                                                                                                                                                                                                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+22>                                                                                                                                                                                                                                                                                                             ^^^^^^^
+23>                                                                                                                                                                                                                                                                                                                    ^
+24>                                                                                                                                                                                                                                                                                                                     ^^^
+25>                                                                                                                                                                                                                                                                                                                        ^
+26>                                                                                                                                                                                                                                                                                                                         ^^
+27>                                                                                                                                                                                                                                                                                                                           ^
+28>                                                                                                                                                                                                                                                                                                                            ^^^
+29>                                                                                                                                                                                                                                                                                                                               ^
+30>                                                                                                                                                                                                                                                                                                                                ^^
+31>                                                                                                                                                                                                                                                                                                                                  ^
+32>                                                                                                                                                                                                                                                                                                                                   ^^
+33>                                                                                                                                                                                                                                                                                                                                     ^^
+34>                                                                                                                                                                                                                                                                                                                                       ^
 1->
   >
 2 >for
@@ -3193,78 +3169,78 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
   >         } = { primary: "none", secondary: "none" }
   >     } = getMultiRobot()
 6 >                          
-7 >                             name = "noName"
-8 >                                           
-9 >                                             name = "noName"
-10>                                                                                   ,
-  >                                                                                       
-11>                                                                                     skills: {
-  >                                                                                             primary = "primary",
-  >                                                                                             secondary = "secondary"
-  >                                                                                         } = { primary: "none", secondary: "none" }
-12>                                                                                                     
-13>                                                                                                       skills: {
-  >                                                                                                               primary = "primary",
-  >                                                                                                               secondary = "secondary"
-  >                                                                                                           } = { primary: "none", secondary: "none" }
-14>                                                                                                                                                                          
-15>                                                                                                                                                                            primary = "primary"
-16>                                                                                                                                                                                             
-17>                                                                                                                                                                                               primary = "primary"
-18>                                                                                                                                                                                                                                         ,
-  >                                                                                                                                                                                                                                                 
-19>                                                                                                                                                                                                                                           secondary = "secondary"
-20>                                                                                                                                                                                                                                                              
-21>                                                                                                                                                                                                                                                                secondary = "secondary"
-22>                                                                                                                                                                                                                                                                                                              
-  >                                                                                                                                                                                                                                                                                                                  } = { primary: "none", secondary: "none" }
-  >                                                                                                                                                                                                                                                                                                              } = getMultiRobot(), 
-23>                                                                                                                                                                                                                                                                                                                           i
-24>                                                                                                                                                                                                                                                                                                                             = 
-25>                                                                                                                                                                                                                                                                                                                               0
-26>                                                                                                                                                                                                                                                                                                                                ; 
-27>                                                                                                                                                                                                                                                                                                                                  i
-28>                                                                                                                                                                                                                                                                                                                                    < 
-29>                                                                                                                                                                                                                                                                                                                                      1
-30>                                                                                                                                                                                                                                                                                                                                       ; 
-31>                                                                                                                                                                                                                                                                                                                                         i
-32>                                                                                                                                                                                                                                                                                                                                          ++
-33>                                                                                                                                                                                                                                                                                                                                            ) 
-34>                                                                                                                                                                                                                                                                                                                                              {
+7 >                            name = "noName"
+8 >                                          
+9 >                                            name = "noName"
+10>                                                                                  ,
+  >                                                                                      
+11>                                                                                    skills: {
+  >                                                                                            primary = "primary",
+  >                                                                                            secondary = "secondary"
+  >                                                                                        } = { primary: "none", secondary: "none" }
+12>                                                                                                    
+13>                                                                                                      skills: {
+  >                                                                                                              primary = "primary",
+  >                                                                                                              secondary = "secondary"
+  >                                                                                                          } = { primary: "none", secondary: "none" }
+14>                                                                                                                                                                         
+15>                                                                                                                                                                           primary = "primary"
+16>                                                                                                                                                                                            
+17>                                                                                                                                                                                              primary = "primary"
+18>                                                                                                                                                                                                                                        ,
+  >                                                                                                                                                                                                                                                
+19>                                                                                                                                                                                                                                          secondary = "secondary"
+20>                                                                                                                                                                                                                                                             
+21>                                                                                                                                                                                                                                                               secondary = "secondary"
+22>                                                                                                                                                                                                                                                                                                             
+  >                                                                                                                                                                                                                                                                                                                 } = { primary: "none", secondary: "none" }
+  >                                                                                                                                                                                                                                                                                                             } = getMultiRobot(), 
+23>                                                                                                                                                                                                                                                                                                                    i
+24>                                                                                                                                                                                                                                                                                                                      = 
+25>                                                                                                                                                                                                                                                                                                                        0
+26>                                                                                                                                                                                                                                                                                                                         ; 
+27>                                                                                                                                                                                                                                                                                                                           i
+28>                                                                                                                                                                                                                                                                                                                             < 
+29>                                                                                                                                                                                                                                                                                                                               1
+30>                                                                                                                                                                                                                                                                                                                                ; 
+31>                                                                                                                                                                                                                                                                                                                                  i
+32>                                                                                                                                                                                                                                                                                                                                   ++
+33>                                                                                                                                                                                                                                                                                                                                     ) 
+34>                                                                                                                                                                                                                                                                                                                                       {
 1->Emitted(80, 1) Source(156, 1) + SourceIndex(0)
 2 >Emitted(80, 4) Source(156, 4) + SourceIndex(0)
 3 >Emitted(80, 5) Source(156, 5) + SourceIndex(0)
 4 >Emitted(80, 6) Source(156, 6) + SourceIndex(0)
 5 >Emitted(80, 27) Source(162, 20) + SourceIndex(0)
-6 >Emitted(80, 30) Source(157, 5) + SourceIndex(0)
-7 >Emitted(80, 44) Source(157, 20) + SourceIndex(0)
-8 >Emitted(80, 46) Source(157, 5) + SourceIndex(0)
-9 >Emitted(80, 84) Source(157, 20) + SourceIndex(0)
-10>Emitted(80, 86) Source(158, 5) + SourceIndex(0)
-11>Emitted(80, 102) Source(161, 47) + SourceIndex(0)
-12>Emitted(80, 104) Source(158, 5) + SourceIndex(0)
-13>Emitted(80, 171) Source(161, 47) + SourceIndex(0)
-14>Emitted(80, 173) Source(159, 9) + SourceIndex(0)
-15>Emitted(80, 190) Source(159, 28) + SourceIndex(0)
-16>Emitted(80, 192) Source(159, 9) + SourceIndex(0)
-17>Emitted(80, 234) Source(159, 28) + SourceIndex(0)
-18>Emitted(80, 236) Source(160, 9) + SourceIndex(0)
-19>Emitted(80, 255) Source(160, 32) + SourceIndex(0)
-20>Emitted(80, 257) Source(160, 9) + SourceIndex(0)
-21>Emitted(80, 303) Source(160, 32) + SourceIndex(0)
-22>Emitted(80, 316) Source(162, 22) + SourceIndex(0)
-23>Emitted(80, 317) Source(162, 23) + SourceIndex(0)
-24>Emitted(80, 320) Source(162, 26) + SourceIndex(0)
-25>Emitted(80, 321) Source(162, 27) + SourceIndex(0)
-26>Emitted(80, 323) Source(162, 29) + SourceIndex(0)
-27>Emitted(80, 324) Source(162, 30) + SourceIndex(0)
-28>Emitted(80, 327) Source(162, 33) + SourceIndex(0)
-29>Emitted(80, 328) Source(162, 34) + SourceIndex(0)
-30>Emitted(80, 330) Source(162, 36) + SourceIndex(0)
-31>Emitted(80, 331) Source(162, 37) + SourceIndex(0)
-32>Emitted(80, 333) Source(162, 39) + SourceIndex(0)
-33>Emitted(80, 335) Source(162, 41) + SourceIndex(0)
-34>Emitted(80, 336) Source(162, 42) + SourceIndex(0)
+6 >Emitted(80, 29) Source(157, 5) + SourceIndex(0)
+7 >Emitted(80, 43) Source(157, 20) + SourceIndex(0)
+8 >Emitted(80, 45) Source(157, 5) + SourceIndex(0)
+9 >Emitted(80, 83) Source(157, 20) + SourceIndex(0)
+10>Emitted(80, 85) Source(158, 5) + SourceIndex(0)
+11>Emitted(80, 101) Source(161, 47) + SourceIndex(0)
+12>Emitted(80, 103) Source(158, 5) + SourceIndex(0)
+13>Emitted(80, 170) Source(161, 47) + SourceIndex(0)
+14>Emitted(80, 172) Source(159, 9) + SourceIndex(0)
+15>Emitted(80, 189) Source(159, 28) + SourceIndex(0)
+16>Emitted(80, 191) Source(159, 9) + SourceIndex(0)
+17>Emitted(80, 233) Source(159, 28) + SourceIndex(0)
+18>Emitted(80, 235) Source(160, 9) + SourceIndex(0)
+19>Emitted(80, 254) Source(160, 32) + SourceIndex(0)
+20>Emitted(80, 256) Source(160, 9) + SourceIndex(0)
+21>Emitted(80, 302) Source(160, 32) + SourceIndex(0)
+22>Emitted(80, 309) Source(162, 22) + SourceIndex(0)
+23>Emitted(80, 310) Source(162, 23) + SourceIndex(0)
+24>Emitted(80, 313) Source(162, 26) + SourceIndex(0)
+25>Emitted(80, 314) Source(162, 27) + SourceIndex(0)
+26>Emitted(80, 316) Source(162, 29) + SourceIndex(0)
+27>Emitted(80, 317) Source(162, 30) + SourceIndex(0)
+28>Emitted(80, 320) Source(162, 33) + SourceIndex(0)
+29>Emitted(80, 321) Source(162, 34) + SourceIndex(0)
+30>Emitted(80, 323) Source(162, 36) + SourceIndex(0)
+31>Emitted(80, 324) Source(162, 37) + SourceIndex(0)
+32>Emitted(80, 326) Source(162, 39) + SourceIndex(0)
+33>Emitted(80, 328) Source(162, 41) + SourceIndex(0)
+34>Emitted(80, 329) Source(162, 42) + SourceIndex(0)
 ---
 >>>    console.log(primaryA);
 1 >^^^^
@@ -3296,35 +3272,35 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(82, 1) Source(164, 1) + SourceIndex(0)
 2 >Emitted(82, 2) Source(164, 2) + SourceIndex(0)
 ---
->>>for (_58 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, (_59 = _58.name, name = _59 === void 0 ? "noName" : _59, _60 = _58.skills, _61 = _60 === void 0 ? { primary: "none", secondary: "none" } : _60, _62 = _61.primary, primary = _62 === void 0 ? "primary" : _62, _63 = _61.secondary, secondary = _63 === void 0 ? "secondary" : _63, _58), _58,
+>>>for (_58 = { name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }, _59 = _58.name, name = _59 === void 0 ? "noName" : _59, _60 = _58.skills, _61 = _60 === void 0 ? { primary: "none", secondary: "none" } : _60, _62 = _61.primary, primary = _62 === void 0 ? "primary" : _62, _63 = _61.secondary, secondary = _63 === void 0 ? "secondary" : _63, _58,
 1->
 2 >^^^
 3 >   ^
 4 >    ^
 5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-6 >                                                                                    ^^^
-7 >                                                                                       ^^^^^^^^^^^^^^
-8 >                                                                                                     ^^
-9 >                                                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-10>                                                                                                                                             ^^
-11>                                                                                                                                               ^^^^^^^^^^^^^^^^
-12>                                                                                                                                                               ^^
-13>                                                                                                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-14>                                                                                                                                                                                                                                    ^^
-15>                                                                                                                                                                                                                                      ^^^^^^^^^^^^^^^^^
-16>                                                                                                                                                                                                                                                       ^^
-17>                                                                                                                                                                                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-18>                                                                                                                                                                                                                                                                                                   ^^
-19>                                                                                                                                                                                                                                                                                                     ^^^^^^^^^^^^^^^^^^^
-20>                                                                                                                                                                                                                                                                                                                        ^^
-21>                                                                                                                                                                                                                                                                                                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 >                                                                                    ^^
+7 >                                                                                      ^^^^^^^^^^^^^^
+8 >                                                                                                    ^^
+9 >                                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10>                                                                                                                                            ^^
+11>                                                                                                                                              ^^^^^^^^^^^^^^^^
+12>                                                                                                                                                              ^^
+13>                                                                                                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14>                                                                                                                                                                                                                                   ^^
+15>                                                                                                                                                                                                                                     ^^^^^^^^^^^^^^^^^
+16>                                                                                                                                                                                                                                                      ^^
+17>                                                                                                                                                                                                                                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+18>                                                                                                                                                                                                                                                                                                  ^^
+19>                                                                                                                                                                                                                                                                                                    ^^^^^^^^^^^^^^^^^^^
+20>                                                                                                                                                                                                                                                                                                                       ^^
+21>                                                                                                                                                                                                                                                                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
 2 >for
@@ -3338,50 +3314,50 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
   >         } = { primary: "none", secondary: "none" }
   >     } = <MultiRobot>{ name: "trimmer", skills: { primary: "trimming", secondary: "edging" } }
 6 >                                                                                    
-7 >                                                                                       name = "noName"
-8 >                                                                                                     
-9 >                                                                                                       name = "noName"
-10>                                                                                                                                             ,
-  >                                                                                                                                                 
-11>                                                                                                                                               skills: {
-  >                                                                                                                                                       primary = "primary",
-  >                                                                                                                                                       secondary = "secondary"
-  >                                                                                                                                                   } = { primary: "none", secondary: "none" }
-12>                                                                                                                                                               
-13>                                                                                                                                                                 skills: {
-  >                                                                                                                                                                         primary = "primary",
-  >                                                                                                                                                                         secondary = "secondary"
-  >                                                                                                                                                                     } = { primary: "none", secondary: "none" }
-14>                                                                                                                                                                                                                                    
-15>                                                                                                                                                                                                                                      primary = "primary"
-16>                                                                                                                                                                                                                                                       
-17>                                                                                                                                                                                                                                                         primary = "primary"
-18>                                                                                                                                                                                                                                                                                                   ,
-  >                                                                                                                                                                                                                                                                                                           
-19>                                                                                                                                                                                                                                                                                                     secondary = "secondary"
-20>                                                                                                                                                                                                                                                                                                                        
-21>                                                                                                                                                                                                                                                                                                                          secondary = "secondary"
+7 >                                                                                      name = "noName"
+8 >                                                                                                    
+9 >                                                                                                      name = "noName"
+10>                                                                                                                                            ,
+  >                                                                                                                                                
+11>                                                                                                                                              skills: {
+  >                                                                                                                                                      primary = "primary",
+  >                                                                                                                                                      secondary = "secondary"
+  >                                                                                                                                                  } = { primary: "none", secondary: "none" }
+12>                                                                                                                                                              
+13>                                                                                                                                                                skills: {
+  >                                                                                                                                                                        primary = "primary",
+  >                                                                                                                                                                        secondary = "secondary"
+  >                                                                                                                                                                    } = { primary: "none", secondary: "none" }
+14>                                                                                                                                                                                                                                   
+15>                                                                                                                                                                                                                                     primary = "primary"
+16>                                                                                                                                                                                                                                                      
+17>                                                                                                                                                                                                                                                        primary = "primary"
+18>                                                                                                                                                                                                                                                                                                  ,
+  >                                                                                                                                                                                                                                                                                                          
+19>                                                                                                                                                                                                                                                                                                    secondary = "secondary"
+20>                                                                                                                                                                                                                                                                                                                       
+21>                                                                                                                                                                                                                                                                                                                         secondary = "secondary"
 1->Emitted(83, 1) Source(165, 1) + SourceIndex(0)
 2 >Emitted(83, 4) Source(165, 4) + SourceIndex(0)
 3 >Emitted(83, 5) Source(165, 5) + SourceIndex(0)
 4 >Emitted(83, 6) Source(165, 6) + SourceIndex(0)
 5 >Emitted(83, 85) Source(171, 90) + SourceIndex(0)
-6 >Emitted(83, 88) Source(166, 5) + SourceIndex(0)
-7 >Emitted(83, 102) Source(166, 20) + SourceIndex(0)
-8 >Emitted(83, 104) Source(166, 5) + SourceIndex(0)
-9 >Emitted(83, 142) Source(166, 20) + SourceIndex(0)
-10>Emitted(83, 144) Source(167, 5) + SourceIndex(0)
-11>Emitted(83, 160) Source(170, 47) + SourceIndex(0)
-12>Emitted(83, 162) Source(167, 5) + SourceIndex(0)
-13>Emitted(83, 229) Source(170, 47) + SourceIndex(0)
-14>Emitted(83, 231) Source(168, 9) + SourceIndex(0)
-15>Emitted(83, 248) Source(168, 28) + SourceIndex(0)
-16>Emitted(83, 250) Source(168, 9) + SourceIndex(0)
-17>Emitted(83, 292) Source(168, 28) + SourceIndex(0)
-18>Emitted(83, 294) Source(169, 9) + SourceIndex(0)
-19>Emitted(83, 313) Source(169, 32) + SourceIndex(0)
-20>Emitted(83, 315) Source(169, 9) + SourceIndex(0)
-21>Emitted(83, 361) Source(169, 32) + SourceIndex(0)
+6 >Emitted(83, 87) Source(166, 5) + SourceIndex(0)
+7 >Emitted(83, 101) Source(166, 20) + SourceIndex(0)
+8 >Emitted(83, 103) Source(166, 5) + SourceIndex(0)
+9 >Emitted(83, 141) Source(166, 20) + SourceIndex(0)
+10>Emitted(83, 143) Source(167, 5) + SourceIndex(0)
+11>Emitted(83, 159) Source(170, 47) + SourceIndex(0)
+12>Emitted(83, 161) Source(167, 5) + SourceIndex(0)
+13>Emitted(83, 228) Source(170, 47) + SourceIndex(0)
+14>Emitted(83, 230) Source(168, 9) + SourceIndex(0)
+15>Emitted(83, 247) Source(168, 28) + SourceIndex(0)
+16>Emitted(83, 249) Source(168, 9) + SourceIndex(0)
+17>Emitted(83, 291) Source(168, 28) + SourceIndex(0)
+18>Emitted(83, 293) Source(169, 9) + SourceIndex(0)
+19>Emitted(83, 312) Source(169, 32) + SourceIndex(0)
+20>Emitted(83, 314) Source(169, 9) + SourceIndex(0)
+21>Emitted(83, 360) Source(169, 32) + SourceIndex(0)
 ---
 >>>    i = 0; i < 1; i++) {
 1 >^^^^
@@ -3458,13 +3434,12 @@ sourceFile:sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
 1 >Emitted(86, 1) Source(174, 1) + SourceIndex(0)
 2 >Emitted(86, 2) Source(174, 2) + SourceIndex(0)
 ---
->>>var _k, _q, _4, _9, _27, _33, _52, _58;
->>>var _a, _b, _c, _d, _e, _f, _g, _h, _j, _l, _m, _o, _p, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _5, _6, _7, _8, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _28, _29, _30, _31, _32, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _53, _54, _55, _56, _57, _59, _60, _61, _62, _63;
+>>>var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63;
 >>>//# sourceMappingURL=sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.js.map
\ No newline at end of file

From 4c2474463ca9c3fa07ccf82cbf6b64423a9efe01 Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Tue, 15 Nov 2016 12:53:46 -0800
Subject: [PATCH 254/421] ports #12237, #12258 and #12259 into master (#12274)

* treat failures to resolve module name as missing packages (#12237)

* added extra check to prevent multiple installation of the same typing, added version field to telemetry event (#12258)

* added extra check to prevent multiple installation of the same typing, added version field to telemetry event

* use ts.version

* switch to execSync to ensure that no install orders are interleaved (#12259)

* Make sure version is public

* Update file with version string for nightly release
---
 Gulpfile.ts                                   |  4 +-
 Jakefile.js                                   |  4 +-
 src/compiler/core.ts                          |  5 +++
 src/compiler/program.ts                       |  4 --
 src/server/protocol.ts                        |  5 +++
 src/server/server.ts                          |  3 +-
 src/server/types.d.ts                         |  1 +
 .../typingsInstaller/nodeTypingsInstaller.ts  | 38 ++++++++++---------
 .../typingsInstaller/typingsInstaller.ts      | 33 +++++++++-------
 9 files changed, 57 insertions(+), 40 deletions(-)

diff --git a/Gulpfile.ts b/Gulpfile.ts
index d7e20a557fd..054e99c8003 100644
--- a/Gulpfile.ts
+++ b/Gulpfile.ts
@@ -177,7 +177,7 @@ for (const i in libraryTargets) {
 const configureNightlyJs = path.join(scriptsDirectory, "configureNightly.js");
 const configureNightlyTs = path.join(scriptsDirectory, "configureNightly.ts");
 const packageJson = "package.json";
-const programTs = path.join(compilerDirectory, "program.ts");
+const versionFile = path.join(compilerDirectory, "core.ts");
 
 function needsUpdate(source: string | string[], dest: string | string[]): boolean {
     if (typeof source === "string" && typeof dest === "string") {
@@ -285,7 +285,7 @@ gulp.task(configureNightlyJs, false, [], () => {
 
 // Nightly management tasks
 gulp.task("configure-nightly", "Runs scripts/configureNightly.ts to prepare a build for nightly publishing", [configureNightlyJs], (done) => {
-    exec(host, [configureNightlyJs, packageJson, programTs], done, done);
+    exec(host, [configureNightlyJs, packageJson, versionFile], done, done);
 });
 gulp.task("publish-nightly", "Runs `npm publish --tag next` to create a new nightly build on npm", ["LKG"], () => {
     return runSequence("clean", "useDebugMode", "runtests", (done) => {
diff --git a/Jakefile.js b/Jakefile.js
index 2e5d660c4f1..646f6e00bcf 100644
--- a/Jakefile.js
+++ b/Jakefile.js
@@ -593,7 +593,7 @@ task("generate-diagnostics", [diagnosticInfoMapTs]);
 var configureNightlyJs = path.join(scriptsDirectory, "configureNightly.js");
 var configureNightlyTs = path.join(scriptsDirectory, "configureNightly.ts");
 var packageJson = "package.json";
-var programTs = path.join(compilerDirectory, "program.ts");
+var versionFile = path.join(compilerDirectory, "core.ts");
 
 file(configureNightlyTs);
 
@@ -609,7 +609,7 @@ task("setDebugMode", function () {
 });
 
 task("configure-nightly", [configureNightlyJs], function () {
-    var cmd = host + " " + configureNightlyJs + " " + packageJson + " " + programTs;
+    var cmd = host + " " + configureNightlyJs + " " + packageJson + " " + versionFile;
     console.log(cmd);
     exec(cmd);
 }, { async: true });
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index f647480979b..92feb5414ac 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -1,6 +1,11 @@
 /// <reference path="types.ts"/>
 /// <reference path="performance.ts" />
 
+namespace ts {
+    /** The version of the TypeScript compiler release */
+    export const version = "2.2.0";
+}
+
 /* @internal */
 namespace ts {
     /**
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 85c27a63839..041923a8857 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -3,10 +3,6 @@
 /// <reference path="core.ts" />
 
 namespace ts {
-    /** The version of the TypeScript compiler release */
-
-    export const version = "2.2.0";
-
     const emptyArray: any[] = [];
 
     export function findConfigFile(searchPath: string, fileExists: (fileName: string) => boolean, configName = "tsconfig.json"): string {
diff --git a/src/server/protocol.ts b/src/server/protocol.ts
index 0d9a0a76d7a..dad66f3cc71 100644
--- a/src/server/protocol.ts
+++ b/src/server/protocol.ts
@@ -2106,6 +2106,11 @@ namespace ts.server.protocol {
          * true if install request succeeded, otherwise - false
          */
         installSuccess: boolean;
+
+        /**
+         * version of typings installer
+         */
+        typingsInstallerVersion: string;
     }
 
     export interface NavBarResponse extends Response {
diff --git a/src/server/server.ts b/src/server/server.ts
index c561277c7d2..220b0d90c65 100644
--- a/src/server/server.ts
+++ b/src/server/server.ts
@@ -300,7 +300,8 @@ namespace ts.server {
                         telemetryEventName: "typingsInstalled",
                         payload: {
                             installedPackages: response.packagesToInstall.join(","),
-                            installSuccess: response.installSuccess
+                            installSuccess: response.installSuccess,
+                            typingsInstallerVersion: response.typingsInstallerVersion
                         }
                     };
                     const eventName: protocol.TelemetryEventName = "telemetry";
diff --git a/src/server/types.d.ts b/src/server/types.d.ts
index 3fd90e7fd3e..a4032bf062e 100644
--- a/src/server/types.d.ts
+++ b/src/server/types.d.ts
@@ -69,6 +69,7 @@ declare namespace ts.server {
         readonly packagesToInstall: ReadonlyArray<string>;
         readonly kind: EventInstall;
         readonly installSuccess: boolean;
+        readonly typingsInstallerVersion: string;
     }
 
     export interface InstallTypingHost extends JsTyping.TypingResolutionHost {
diff --git a/src/server/typingsInstaller/nodeTypingsInstaller.ts b/src/server/typingsInstaller/nodeTypingsInstaller.ts
index 74311dae4e2..bdfdda3033c 100644
--- a/src/server/typingsInstaller/nodeTypingsInstaller.ts
+++ b/src/server/typingsInstaller/nodeTypingsInstaller.ts
@@ -61,17 +61,12 @@ namespace ts.server.typingsInstaller {
         return combinePaths(normalizeSlashes(globalTypingsCacheLocation), `node_modules/${TypesRegistryPackageName}/index.json`);
     }
 
-
-    type Exec = {
-        (command: string, options: { cwd: string }, callback?: (error: Error, stdout: string, stderr: string) => void): any
-    };
-
     type ExecSync = {
-        (command: string, options: { cwd: string, stdio: "ignore" }): any
-    };
+        (command: string, options: { cwd: string, stdio?: "ignore" }): any
+    }
 
     export class NodeTypingsInstaller extends TypingsInstaller {
-        private readonly exec: Exec;
+        private readonly execSync: ExecSync;
         private readonly npmPath: string;
         readonly typesRegistry: Map<void>;
 
@@ -87,8 +82,7 @@ namespace ts.server.typingsInstaller {
                 this.log.writeLine(`Process id: ${process.pid}`);
             }
             this.npmPath = getNPMLocation(process.argv[0]);
-            let execSync: ExecSync;
-            ({ exec: this.exec, execSync } = require("child_process"));
+            ({ execSync: this.execSync } = require("child_process"));
 
             this.ensurePackageDirectoryExists(globalTypingsCacheLocation);
 
@@ -96,7 +90,7 @@ namespace ts.server.typingsInstaller {
                 if (this.log.isEnabled()) {
                     this.log.writeLine(`Updating ${TypesRegistryPackageName} npm package...`);
                 }
-                execSync(`${this.npmPath} install ${TypesRegistryPackageName}`, { cwd: globalTypingsCacheLocation, stdio: "ignore" });
+                this.execSync(`${this.npmPath} install ${TypesRegistryPackageName}`, { cwd: globalTypingsCacheLocation, stdio: "ignore" });
             }
             catch (e) {
                 if (this.log.isEnabled()) {
@@ -135,13 +129,21 @@ namespace ts.server.typingsInstaller {
             }
             const command = `${this.npmPath} install ${args.join(" ")} --save-dev`;
             const start = Date.now();
-            this.exec(command, { cwd }, (err, stdout, stderr) => {
-                if (this.log.isEnabled()) {
-                    this.log.writeLine(`npm install #${requestId} took: ${Date.now() - start} ms${sys.newLine}stdout: ${stdout}${sys.newLine}stderr: ${stderr}`);
-                }
-                // treat absence of error as success
-                onRequestCompleted(!err);
-            });
+            let stdout: Buffer;
+            let stderr: Buffer;
+            let hasError = false;
+            try {
+                stdout = this.execSync(command, { cwd });
+            }
+            catch (e) {
+                stdout = e.stdout;
+                stderr = e.stderr;
+                hasError = true;
+            }
+            if (this.log.isEnabled()) {
+                this.log.writeLine(`npm install #${requestId} took: ${Date.now() - start} ms${sys.newLine}stdout: ${stdout && stdout.toString()}${sys.newLine}stderr: ${stderr && stderr.toString()}`);
+            }
+            onRequestCompleted(!hasError);
         }
     }
 
diff --git a/src/server/typingsInstaller/typingsInstaller.ts b/src/server/typingsInstaller/typingsInstaller.ts
index 2ea0296e22a..677e2c7bba0 100644
--- a/src/server/typingsInstaller/typingsInstaller.ts
+++ b/src/server/typingsInstaller/typingsInstaller.ts
@@ -19,9 +19,17 @@ namespace ts.server.typingsInstaller {
         writeLine: noop
     };
 
-    function typingToFileName(cachePath: string, packageName: string, installTypingHost: InstallTypingHost): string {
-        const result = resolveModuleName(packageName, combinePaths(cachePath, "index.d.ts"), { moduleResolution: ModuleResolutionKind.NodeJs }, installTypingHost);
-        return result.resolvedModule && result.resolvedModule.resolvedFileName;
+    function typingToFileName(cachePath: string, packageName: string, installTypingHost: InstallTypingHost, log: Log): string {
+        try {
+            const result = resolveModuleName(packageName, combinePaths(cachePath, "index.d.ts"), { moduleResolution: ModuleResolutionKind.NodeJs }, installTypingHost);
+            return result.resolvedModule && result.resolvedModule.resolvedFileName;
+        }
+        catch (e) {
+            if (log.isEnabled()) {
+                log.writeLine(`Failed to resolve ${packageName} in folder '${cachePath}': ${(<Error>e).message}`);
+            }
+            return undefined;
+        }
     }
 
     export enum PackageNameValidationResult {
@@ -192,8 +200,9 @@ namespace ts.server.typingsInstaller {
                         if (!packageName) {
                             continue;
                         }
-                        const typingFile = typingToFileName(cacheLocation, packageName, this.installTypingHost);
+                        const typingFile = typingToFileName(cacheLocation, packageName, this.installTypingHost, this.log);
                         if (!typingFile) {
+                            this.missingTypingsSet[packageName] = true;
                             continue;
                         }
                         const existingTypingFile = this.packageNameToTypingLocation[packageName];
@@ -224,7 +233,7 @@ namespace ts.server.typingsInstaller {
             }
             const result: string[] = [];
             for (const typing of typingsToInstall) {
-                if (this.missingTypingsSet[typing]) {
+                if (this.missingTypingsSet[typing] || this.packageNameToTypingLocation[typing]) {
                     continue;
                 }
                 const validationResult = validatePackageName(typing);
@@ -305,7 +314,8 @@ namespace ts.server.typingsInstaller {
                     this.sendResponse(<TypingsInstallEvent>{
                         kind: EventInstall,
                         packagesToInstall: scopedTypings,
-                        installSuccess: ok
+                        installSuccess: ok,
+                        typingsInstallerVersion: ts.version // qualified explicitly to prevent occasional shadowing
                     });
                 }
 
@@ -321,16 +331,13 @@ namespace ts.server.typingsInstaller {
 
                 // TODO: watch project directory
                 if (this.log.isEnabled()) {
-                    this.log.writeLine(`Requested to install typings ${JSON.stringify(scopedTypings)}, installed typings ${JSON.stringify(scopedTypings)}`);
+                    this.log.writeLine(`Installed typings ${JSON.stringify(scopedTypings)}`);
                 }
                 const installedTypingFiles: string[] = [];
-                for (const t of scopedTypings) {
-                    const packageName = getBaseFileName(t);
-                    if (!packageName) {
-                        continue;
-                    }
-                    const typingFile = typingToFileName(cachePath, packageName, this.installTypingHost);
+                for (const packageName of filteredTypings) {
+                    const typingFile = typingToFileName(cachePath, packageName, this.installTypingHost, this.log);
                     if (!typingFile) {
+                        this.missingTypingsSet[packageName] = true;
                         continue;
                     }
                     if (!this.packageNameToTypingLocation[packageName]) {

From e389e08f710665035ac2c1ff2b99ce1e9a0a4d1d Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Tue, 15 Nov 2016 14:04:07 -0800
Subject: [PATCH 255/421] Fix argument list for new containing yield

---
 src/compiler/transformers/generators.ts       | 28 +++++++++++++------
 .../es5-asyncFunctionNewExpressions.js        | 12 ++++----
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/compiler/transformers/generators.ts b/src/compiler/transformers/generators.ts
index 7c9cde59fde..e60d62207e8 100644
--- a/src/compiler/transformers/generators.ts
+++ b/src/compiler/transformers/generators.ts
@@ -946,7 +946,7 @@ namespace ts {
          * @param node The node to visit.
          */
         function visitArrayLiteralExpression(node: ArrayLiteralExpression) {
-            return visitElements(node.elements, node.multiLine);
+            return visitElements(node.elements, /*leadingElement*/ undefined, /*location*/ undefined, node.multiLine);
         }
 
         /**
@@ -956,7 +956,7 @@ namespace ts {
          * @param elements The elements to visit.
          * @param multiLine Whether array literals created should be emitted on multiple lines.
          */
-        function visitElements(elements: NodeArray<Expression>, _multiLine?: boolean) {
+        function visitElements(elements: NodeArray<Expression>, leadingElement?: Expression, location?: TextRange, multiLine?: boolean) {
             // [source]
             //      ar = [1, yield, 2];
             //
@@ -971,18 +971,22 @@ namespace ts {
             const temp = declareLocal();
             let hasAssignedTemp = false;
             if (numInitialElements > 0) {
+                const initialElements = visitNodes(elements, visitor, isExpression, 0, numInitialElements);
                 emitAssignment(temp,
                     createArrayLiteral(
-                        visitNodes(elements, visitor, isExpression, 0, numInitialElements)
+                        leadingElement
+                            ? [leadingElement, ...initialElements]
+                            : initialElements
                     )
                 );
+                leadingElement = undefined;
                 hasAssignedTemp = true;
             }
 
             const expressions = reduceLeft(elements, reduceElement, <Expression[]>[], numInitialElements);
             return hasAssignedTemp
-                ? createArrayConcat(temp, [createArrayLiteral(expressions)])
-                : createArrayLiteral(expressions);
+                ? createArrayConcat(temp, [createArrayLiteral(expressions, /*location*/ undefined, multiLine)])
+                : createArrayLiteral(leadingElement ? [leadingElement, ...expressions] : expressions, location, multiLine);
 
             function reduceElement(expressions: Expression[], element: Expression) {
                 if (containsYield(element) && expressions.length > 0) {
@@ -991,11 +995,16 @@ namespace ts {
                         hasAssignedTemp
                             ? createArrayConcat(
                                 temp,
-                                [createArrayLiteral(expressions)]
+                                [createArrayLiteral(expressions, /*location*/ undefined, multiLine)]
+                            )
+                            : createArrayLiteral(
+                                leadingElement ? [leadingElement, ...expressions] : expressions,
+                                /*location*/ undefined,
+                                multiLine
                             )
-                            : createArrayLiteral(expressions)
                     );
                     hasAssignedTemp = true;
+                    leadingElement = undefined;
                     expressions = [];
                 }
 
@@ -1131,7 +1140,10 @@ namespace ts {
                         createFunctionApply(
                             cacheExpression(visitNode(target, visitor, isExpression)),
                             thisArg,
-                            visitElements(node.arguments)
+                            visitElements(
+                                node.arguments,
+                                /*leadingElement*/ createVoidZero()
+                            )
                         ),
                         /*typeArguments*/ undefined,
                         [],
diff --git a/tests/baselines/reference/es5-asyncFunctionNewExpressions.js b/tests/baselines/reference/es5-asyncFunctionNewExpressions.js
index 486bf0fdd7f..0fb1140f129 100644
--- a/tests/baselines/reference/es5-asyncFunctionNewExpressions.js
+++ b/tests/baselines/reference/es5-asyncFunctionNewExpressions.js
@@ -119,7 +119,7 @@ function newExpression2() {
                     _a = x.bind;
                     return [4 /*yield*/, y];
                 case 1:
-                    new (_a.apply(x, [_c.sent(), z]))();
+                    new (_a.apply(x, [void 0, _c.sent(), z]))();
                     return [2 /*return*/];
             }
         });
@@ -132,7 +132,7 @@ function newExpression3() {
             switch (_c.label) {
                 case 0:
                     _a = x.bind;
-                    _b = [y];
+                    _b = [void 0, y];
                     return [4 /*yield*/, z];
                 case 1:
                     new (_a.apply(x, _b.concat([_c.sent()])))();
@@ -280,7 +280,7 @@ function newExpression13() {
                     _b = (_a = x.a).bind;
                     return [4 /*yield*/, y];
                 case 1:
-                    new (_b.apply(_a, [_d.sent(), z]))();
+                    new (_b.apply(_a, [void 0, _d.sent(), z]))();
                     return [2 /*return*/];
             }
         });
@@ -293,7 +293,7 @@ function newExpression14() {
             switch (_d.label) {
                 case 0:
                     _b = (_a = x.a).bind;
-                    _c = [y];
+                    _c = [void 0, y];
                     return [4 /*yield*/, z];
                 case 1:
                     new (_b.apply(_a, _c.concat([_d.sent()])))();
@@ -362,7 +362,7 @@ function newExpression19() {
                     _b = (_a = x[a]).bind;
                     return [4 /*yield*/, y];
                 case 1:
-                    new (_b.apply(_a, [_d.sent(), z]))();
+                    new (_b.apply(_a, [void 0, _d.sent(), z]))();
                     return [2 /*return*/];
             }
         });
@@ -375,7 +375,7 @@ function newExpression20() {
             switch (_d.label) {
                 case 0:
                     _b = (_a = x[a]).bind;
-                    _c = [y];
+                    _c = [void 0, y];
                     return [4 /*yield*/, z];
                 case 1:
                     new (_b.apply(_a, _c.concat([_d.sent()])))();

From a0da47fc8906d57b5f39e4be1aa5a6c867ddc021 Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Tue, 15 Nov 2016 18:09:47 -0800
Subject: [PATCH 256/421] Added missing places for visitParameterList

---
 src/compiler/transformer.ts             |  82 ++++++++----
 src/compiler/transformers/es2015.ts     |  66 +++++----
 src/compiler/transformers/es2017.ts     |  17 ++-
 src/compiler/transformers/esnext.ts     |   6 +
 src/compiler/transformers/generators.ts |  10 +-
 src/compiler/transformers/ts.ts         | 171 ++++++++----------------
 src/compiler/types.ts                   |   3 +
 src/compiler/visitor.ts                 |  27 +++-
 8 files changed, 192 insertions(+), 190 deletions(-)

diff --git a/src/compiler/transformer.ts b/src/compiler/transformer.ts
index b005b1906f6..b4a06c72a23 100644
--- a/src/compiler/transformer.ts
+++ b/src/compiler/transformer.ts
@@ -154,14 +154,16 @@ namespace ts {
      * @param transforms An array of Transformers.
      */
     export function transformFiles(resolver: EmitResolver, host: EmitHost, sourceFiles: SourceFile[], transformers: Transformer[]): TransformationResult {
-        const lexicalEnvironmentVariableDeclarationsStack: VariableDeclaration[][] = [];
-        const lexicalEnvironmentFunctionDeclarationsStack: FunctionDeclaration[][] = [];
         const enabledSyntaxKindFeatures = new Array<SyntaxKindFeatureFlags>(SyntaxKind.Count);
 
+        let scopeModificationDisabled = false;
+
         let lexicalEnvironmentStackOffset = 0;
-        let hoistedVariableDeclarations: VariableDeclaration[];
-        let hoistedFunctionDeclarations: FunctionDeclaration[];
-        let lexicalEnvironmentDisabled: boolean;
+        let lexicalEnvironmentVariableDeclarations: VariableDeclaration[];
+        let lexicalEnvironmentFunctionDeclarations: FunctionDeclaration[];
+        let lexicalEnvironmentVariableDeclarationsStack: VariableDeclaration[][] = [];
+        let lexicalEnvironmentFunctionDeclarationsStack: FunctionDeclaration[][] = [];
+        let lexicalEnvironmentSuspended = false;
 
         // The transformation context is provided to each transformer as part of transformer
         // initialization.
@@ -169,10 +171,12 @@ namespace ts {
             getCompilerOptions: () => host.getCompilerOptions(),
             getEmitResolver: () => resolver,
             getEmitHost: () => host,
+            startLexicalEnvironment,
+            suspendLexicalEnvironment,
+            resumeLexicalEnvironment,
+            endLexicalEnvironment,
             hoistVariableDeclaration,
             hoistFunctionDeclaration,
-            startLexicalEnvironment,
-            endLexicalEnvironment,
             onSubstituteNode: (_emitContext, node) => node,
             enableSubstitution,
             isSubstitutionEnabled,
@@ -188,7 +192,7 @@ namespace ts {
         const transformed = map(sourceFiles, transformSourceFile);
 
         // Disable modification of the lexical environment.
-        lexicalEnvironmentDisabled = true;
+        scopeModificationDisabled = true;
 
         return {
             transformed,
@@ -283,13 +287,13 @@ namespace ts {
          * Records a hoisted variable declaration for the provided name within a lexical environment.
          */
         function hoistVariableDeclaration(name: Identifier): void {
-            Debug.assert(!lexicalEnvironmentDisabled, "Cannot modify the lexical environment during the print phase.");
+            Debug.assert(!scopeModificationDisabled, "Cannot modify the lexical environment during the print phase.");
             const decl = createVariableDeclaration(name);
-            if (!hoistedVariableDeclarations) {
-                hoistedVariableDeclarations = [decl];
+            if (!lexicalEnvironmentVariableDeclarations) {
+                lexicalEnvironmentVariableDeclarations = [decl];
             }
             else {
-                hoistedVariableDeclarations.push(decl);
+                lexicalEnvironmentVariableDeclarations.push(decl);
             }
         }
 
@@ -297,12 +301,12 @@ namespace ts {
          * Records a hoisted function declaration within a lexical environment.
          */
         function hoistFunctionDeclaration(func: FunctionDeclaration): void {
-            Debug.assert(!lexicalEnvironmentDisabled, "Cannot modify the lexical environment during the print phase.");
-            if (!hoistedFunctionDeclarations) {
-                hoistedFunctionDeclarations = [func];
+            Debug.assert(!scopeModificationDisabled, "Cannot modify the lexical environment during the print phase.");
+            if (!lexicalEnvironmentFunctionDeclarations) {
+                lexicalEnvironmentFunctionDeclarations = [func];
             }
             else {
-                hoistedFunctionDeclarations.push(func);
+                lexicalEnvironmentFunctionDeclarations.push(func);
             }
         }
 
@@ -311,17 +315,32 @@ namespace ts {
          * are pushed onto a stack, and the related storage variables are reset.
          */
         function startLexicalEnvironment(): void {
-            Debug.assert(!lexicalEnvironmentDisabled, "Cannot start a lexical environment during the print phase.");
+            Debug.assert(!scopeModificationDisabled, "Cannot start a lexical environment during the print phase.");
+            Debug.assert(!lexicalEnvironmentSuspended, "Lexical environment is suspended.");
 
             // Save the current lexical environment. Rather than resizing the array we adjust the
             // stack size variable. This allows us to reuse existing array slots we've
             // already allocated between transformations to avoid allocation and GC overhead during
             // transformation.
-            lexicalEnvironmentVariableDeclarationsStack[lexicalEnvironmentStackOffset] = hoistedVariableDeclarations;
-            lexicalEnvironmentFunctionDeclarationsStack[lexicalEnvironmentStackOffset] = hoistedFunctionDeclarations;
+            lexicalEnvironmentVariableDeclarationsStack[lexicalEnvironmentStackOffset] = lexicalEnvironmentVariableDeclarations;
+            lexicalEnvironmentFunctionDeclarationsStack[lexicalEnvironmentStackOffset] = lexicalEnvironmentFunctionDeclarations;
             lexicalEnvironmentStackOffset++;
-            hoistedVariableDeclarations = undefined;
-            hoistedFunctionDeclarations = undefined;
+            lexicalEnvironmentVariableDeclarations = undefined;
+            lexicalEnvironmentFunctionDeclarations = undefined;
+        }
+
+        /** Suspends the current lexical environment, usually after visiting a parameter list. */
+        function suspendLexicalEnvironment(): void {
+            Debug.assert(!scopeModificationDisabled, "Cannot suspend a lexical environment during the print phase.");
+            Debug.assert(!lexicalEnvironmentSuspended, "Lexical environment is already suspended.");
+            lexicalEnvironmentSuspended = true;
+        }
+
+        /** Resumes a suspended lexical environment, usually before visiting a function body. */
+        function resumeLexicalEnvironment(): void {
+            Debug.assert(!scopeModificationDisabled, "Cannot resume a lexical environment during the print phase.");
+            Debug.assert(lexicalEnvironmentSuspended, "Lexical environment is not suspended suspended.");
+            lexicalEnvironmentSuspended = false;
         }
 
         /**
@@ -329,18 +348,19 @@ namespace ts {
          * any hoisted declarations added in this environment are returned.
          */
         function endLexicalEnvironment(): Statement[] {
-            Debug.assert(!lexicalEnvironmentDisabled, "Cannot end a lexical environment during the print phase.");
+            Debug.assert(!scopeModificationDisabled, "Cannot end a lexical environment during the print phase.");
+            Debug.assert(!lexicalEnvironmentSuspended, "Lexical environment is suspended.");
 
             let statements: Statement[];
-            if (hoistedVariableDeclarations || hoistedFunctionDeclarations) {
-                if (hoistedFunctionDeclarations) {
-                    statements = [...hoistedFunctionDeclarations];
+            if (lexicalEnvironmentVariableDeclarations || lexicalEnvironmentFunctionDeclarations) {
+                if (lexicalEnvironmentFunctionDeclarations) {
+                    statements = [...lexicalEnvironmentFunctionDeclarations];
                 }
 
-                if (hoistedVariableDeclarations) {
+                if (lexicalEnvironmentVariableDeclarations) {
                     const statement = createVariableStatement(
                         /*modifiers*/ undefined,
-                        createVariableDeclarationList(hoistedVariableDeclarations)
+                        createVariableDeclarationList(lexicalEnvironmentVariableDeclarations)
                     );
 
                     if (!statements) {
@@ -354,8 +374,12 @@ namespace ts {
 
             // Restore the previous lexical environment.
             lexicalEnvironmentStackOffset--;
-            hoistedVariableDeclarations = lexicalEnvironmentVariableDeclarationsStack[lexicalEnvironmentStackOffset];
-            hoistedFunctionDeclarations = lexicalEnvironmentFunctionDeclarationsStack[lexicalEnvironmentStackOffset];
+            lexicalEnvironmentVariableDeclarations = lexicalEnvironmentVariableDeclarationsStack[lexicalEnvironmentStackOffset];
+            lexicalEnvironmentFunctionDeclarations = lexicalEnvironmentFunctionDeclarationsStack[lexicalEnvironmentStackOffset];
+            if (lexicalEnvironmentStackOffset === 0) {
+                lexicalEnvironmentVariableDeclarationsStack = [];
+                lexicalEnvironmentFunctionDeclarationsStack = [];
+            }
             return statements;
         }
     }
diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts
index dc238f27ed0..f95559518dd 100644
--- a/src/compiler/transformers/es2015.ts
+++ b/src/compiler/transformers/es2015.ts
@@ -166,6 +166,7 @@ namespace ts {
     export function transformES2015(context: TransformationContext) {
         const {
             startLexicalEnvironment,
+            resumeLexicalEnvironment,
             endLexicalEnvironment,
             hoistVariableDeclaration,
         } = context;
@@ -822,17 +823,14 @@ namespace ts {
          * @param hasSynthesizedSuper A value indicating whether the constructor starts with a
          *                            synthesized `super` call.
          */
-        function transformConstructorParameters(constructor: ConstructorDeclaration, hasSynthesizedSuper: boolean): ParameterDeclaration[] {
+        function transformConstructorParameters(constructor: ConstructorDeclaration, hasSynthesizedSuper: boolean) {
             // If the TypeScript transformer needed to synthesize a constructor for property
             // initializers, it would have also added a synthetic `...args` parameter and
             // `super` call.
             // If this is the case, we do not include the synthetic `...args` parameter and
             // will instead use the `arguments` object in ES5/3.
-            if (constructor && !hasSynthesizedSuper) {
-                return visitNodes(constructor.parameters, visitor, isParameter);
-            }
-
-            return [];
+            return visitParameterList(constructor && !hasSynthesizedSuper && constructor.parameters, visitor, context)
+                || <ParameterDeclaration[]>[];
         }
 
         /**
@@ -846,7 +844,7 @@ namespace ts {
          */
         function transformConstructorBody(constructor: ConstructorDeclaration | undefined, node: ClassDeclaration | ClassExpression, extendsClauseElement: ExpressionWithTypeArguments, hasSynthesizedSuper: boolean) {
             const statements: Statement[] = [];
-            startLexicalEnvironment();
+            resumeLexicalEnvironment();
 
             let statementOffset = -1;
             if (hasSynthesizedSuper) {
@@ -1504,8 +1502,17 @@ namespace ts {
             if (node.transformFlags & TransformFlags.ContainsLexicalThis) {
                 enableSubstitutionsForCapturedThis();
             }
-
-            const func = transformFunctionLikeToExpression(node, /*location*/ node, /*name*/ undefined);
+            const func = createFunctionExpression(
+                /*modifiers*/ undefined,
+                /*asteriskToken*/ undefined,
+                /*name*/ undefined,
+                /*typeParameters*/ undefined,
+                visitParameterList(node.parameters, visitor, context),
+                /*type*/ undefined,
+                transformFunctionBody(node),
+                node
+            );
+            setOriginalNode(func, node);
             setEmitFlags(func, EmitFlags.CapturesThis);
             return func;
         }
@@ -1516,7 +1523,17 @@ namespace ts {
          * @param node a FunctionExpression node.
          */
         function visitFunctionExpression(node: FunctionExpression): Expression {
-            return transformFunctionLikeToExpression(node, /*location*/ node, node.name);
+            return updateFunctionExpression(
+                node,
+                /*modifiers*/ undefined,
+                node.name,
+                /*typeParameters*/ undefined,
+                visitParameterList(node.parameters, visitor, context),
+                /*type*/ undefined,
+                node.transformFlags & TransformFlags.ES2015
+                    ? transformFunctionBody(node)
+                    : visitFunctionBody(node.body, visitor, context)
+            );
         }
 
         /**
@@ -1525,19 +1542,18 @@ namespace ts {
          * @param node a FunctionDeclaration node.
          */
         function visitFunctionDeclaration(node: FunctionDeclaration): FunctionDeclaration {
-            return setOriginalNode(
-                createFunctionDeclaration(
-                    /*decorators*/ undefined,
-                    node.modifiers,
-                    node.asteriskToken,
-                    node.name,
-                    /*typeParameters*/ undefined,
-                    visitNodes(node.parameters, visitor, isParameter),
-                    /*type*/ undefined,
-                    transformFunctionBody(node),
-                    /*location*/ node
-                ),
-                /*original*/ node);
+            return updateFunctionDeclaration(
+                node,
+                /*decorators*/ undefined,
+                node.modifiers,
+                node.name,
+                /*typeParameters*/ undefined,
+                visitParameterList(node.parameters, visitor, context),
+                /*type*/ undefined,
+                node.transformFlags & TransformFlags.ES2015
+                    ? transformFunctionBody(node)
+                    : visitFunctionBody(node.body, visitor, context)
+            );
         }
 
         /**
@@ -1559,7 +1575,7 @@ namespace ts {
                     node.asteriskToken,
                     name,
                     /*typeParameters*/ undefined,
-                    visitNodes(node.parameters, visitor, isParameter),
+                    visitParameterList(node.parameters, visitor, context),
                     /*type*/ undefined,
                     saveStateAndInvoke(node, transformFunctionBody),
                     location
@@ -1586,7 +1602,7 @@ namespace ts {
             const body = node.body;
             let statementOffset: number;
 
-            context.startLexicalEnvironment();
+            resumeLexicalEnvironment();
             if (isBlock(body)) {
                 // ensureUseStrict is false because no new prologue-directive should be added.
                 // addPrologueDirectives will simply put already-existing directives at the beginning of the target statement-array
diff --git a/src/compiler/transformers/es2017.ts b/src/compiler/transformers/es2017.ts
index 0990e9c454f..35de10a5a59 100644
--- a/src/compiler/transformers/es2017.ts
+++ b/src/compiler/transformers/es2017.ts
@@ -14,6 +14,7 @@ namespace ts {
 
         const {
             startLexicalEnvironment,
+            resumeLexicalEnvironment,
             endLexicalEnvironment,
         } = context;
 
@@ -51,18 +52,14 @@ namespace ts {
             }
 
             currentSourceFileExternalHelpersModuleName = node.externalHelpersModuleName;
-
             return visitEachChild(node, visitor, context);
         }
 
         function visitor(node: Node): VisitResult<Node> {
-            if (node.transformFlags & TransformFlags.ContainsES2017) {
-                return visitorWorker(node);
+            if ((node.transformFlags & TransformFlags.ContainsES2017) === 0) {
+                return node;
             }
-            return node;
-        }
 
-        function visitorWorker(node: Node): VisitResult<Node> {
             switch (node.kind) {
                 case SyntaxKind.AsyncKeyword:
                     // ES2017 async modifier should be elided for targets < ES2017
@@ -149,7 +146,7 @@ namespace ts {
                 visitNodes(node.modifiers, visitor, isModifier),
                 node.name,
                 /*typeParameters*/ undefined,
-                visitNodes(node.parameters, visitor, isParameter),
+                visitParameterList(node.parameters, visitor, context),
                 /*type*/ undefined,
                 isAsyncFunctionLike(node)
                     ? transformAsyncFunctionBody(node)
@@ -174,7 +171,7 @@ namespace ts {
                 /*modifiers*/ undefined,
                 node.name,
                 /*typeParameters*/ undefined,
-                visitNodes(node.parameters, visitor, isParameter),
+                visitParameterList(node.parameters, visitor, context),
                 /*type*/ undefined,
                 isAsyncFunctionLike(node)
                     ? transformAsyncFunctionBody(node)
@@ -192,7 +189,7 @@ namespace ts {
                 node,
                 visitNodes(node.modifiers, visitor, isModifier),
                 /*typeParameters*/ undefined,
-                visitNodes(node.parameters, visitor, isParameter),
+                visitParameterList(node.parameters, visitor, context),
                 /*type*/ undefined,
                 isAsyncFunctionLike(node)
                     ? transformAsyncFunctionBody(node)
@@ -203,6 +200,8 @@ namespace ts {
         function transformAsyncFunctionBody(node: MethodDeclaration | AccessorDeclaration | FunctionDeclaration | FunctionExpression): FunctionBody;
         function transformAsyncFunctionBody(node: ArrowFunction): ConciseBody;
         function transformAsyncFunctionBody(node: FunctionLikeDeclaration): ConciseBody {
+            resumeLexicalEnvironment();
+
             const original = getOriginalNode(node, isFunctionLike);
             const nodeType = original.type;
             const promiseConstructor = languageVersion < ScriptTarget.ES2015 ? getPromiseConstructor(nodeType) : undefined;
diff --git a/src/compiler/transformers/esnext.ts b/src/compiler/transformers/esnext.ts
index 4f16d221a56..933ae88b58a 100644
--- a/src/compiler/transformers/esnext.ts
+++ b/src/compiler/transformers/esnext.ts
@@ -5,11 +5,16 @@
 namespace ts {
     export function transformESNext(context: TransformationContext) {
         const {
+            resumeLexicalEnvironment,
             endLexicalEnvironment
         } = context;
         return transformSourceFile;
 
         function transformSourceFile(node: SourceFile) {
+            if (isDeclarationFile(node)) {
+                return node;
+            }
+
             return visitEachChild(node, visitor, context);
         }
 
@@ -343,6 +348,7 @@ namespace ts {
         function transformFunctionBody(node: FunctionDeclaration | FunctionExpression | ConstructorDeclaration | MethodDeclaration | AccessorDeclaration): FunctionBody;
         function transformFunctionBody(node: ArrowFunction): ConciseBody;
         function transformFunctionBody(node: FunctionLikeDeclaration): ConciseBody {
+            resumeLexicalEnvironment();
             let leadingStatements: Statement[];
             for (const parameter of node.parameters) {
                 if (parameter.transformFlags & TransformFlags.ContainsObjectRest) {
diff --git a/src/compiler/transformers/generators.ts b/src/compiler/transformers/generators.ts
index 7c9cde59fde..666baf7d123 100644
--- a/src/compiler/transformers/generators.ts
+++ b/src/compiler/transformers/generators.ts
@@ -227,7 +227,7 @@ namespace ts {
 
     export function transformGenerators(context: TransformationContext) {
         const {
-            startLexicalEnvironment,
+            resumeLexicalEnvironment,
             endLexicalEnvironment,
             hoistFunctionDeclaration,
             hoistVariableDeclaration,
@@ -449,11 +449,11 @@ namespace ts {
                 node = setOriginalNode(
                     createFunctionDeclaration(
                         /*decorators*/ undefined,
-                        /*modifiers*/ undefined,
+                        node.modifiers,
                         /*asteriskToken*/ undefined,
                         node.name,
                         /*typeParameters*/ undefined,
-                        node.parameters,
+                        visitParameterList(node.parameters, visitor, context),
                         /*type*/ undefined,
                         transformGeneratorFunctionBody(node.body),
                         /*location*/ node
@@ -500,7 +500,7 @@ namespace ts {
                         /*asteriskToken*/ undefined,
                         node.name,
                         /*typeParameters*/ undefined,
-                        node.parameters,
+                        visitParameterList(node.parameters, visitor, context),
                         /*type*/ undefined,
                         transformGeneratorFunctionBody(node.body),
                         /*location*/ node
@@ -578,7 +578,7 @@ namespace ts {
             state = createTempVariable(/*recordTempVariable*/ undefined);
 
             // Build the generator
-            startLexicalEnvironment();
+            resumeLexicalEnvironment();
 
             const statementOffset = addPrologueDirectives(statements, body.statements, /*ensureUseStrict*/ false, visitor);
 
diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
index 1c74b49da5c..a596169ae93 100644
--- a/src/compiler/transformers/ts.ts
+++ b/src/compiler/transformers/ts.ts
@@ -21,6 +21,7 @@ namespace ts {
     export function transformTypeScript(context: TransformationContext) {
         const {
             startLexicalEnvironment,
+            resumeLexicalEnvironment,
             endLexicalEnvironment,
             hoistVariableDeclaration,
         } = context;
@@ -885,9 +886,8 @@ namespace ts {
             // 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 constructor
-                ? visitNodes(constructor.parameters, visitor, isParameter)
-                : <ParameterDeclaration[]>[];
+            return visitParameterList(constructor && constructor.parameters, visitor, context)
+                || <ParameterDeclaration[]>[];
         }
 
         /**
@@ -902,8 +902,7 @@ namespace ts {
             const statements: Statement[] = [];
             let indexOfFirstStatement = 0;
 
-            // The body of a constructor is a new lexical environment
-            startLexicalEnvironment();
+            resumeLexicalEnvironment();
 
             if (constructor) {
                 indexOfFirstStatement = addPrologueDirectivesAndInitialSuperCall(constructor, statements);
@@ -2053,26 +2052,23 @@ namespace ts {
             if (!shouldEmitFunctionLikeDeclaration(node)) {
                 return undefined;
             }
-
-            const method = createMethod(
+            const updated = updateMethod(
+                node,
                 /*decorators*/ undefined,
                 visitNodes(node.modifiers, modifierVisitor, isModifier),
-                node.asteriskToken,
                 visitPropertyNameOfClassElement(node),
                 /*typeParameters*/ undefined,
-                visitNodes(node.parameters, visitor, isParameter),
+                visitParameterList(node.parameters, visitor, context),
                 /*type*/ undefined,
-                transformFunctionBody(node),
-                /*location*/ node
+                visitFunctionBody(node.body, visitor, context)
             );
-
-            // While we emit the source map for the node after skipping decorators and modifiers,
-            // we need to emit the comments for the original range.
-            setCommentRange(method, node);
-            setSourceMapRange(method, moveRangePastDecorators(node));
-            setOriginalNode(method, node);
-
-            return method;
+            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.
+                setCommentRange(updated, node);
+                setSourceMapRange(updated, moveRangePastDecorators(node));
+            }
+            return updated;
         }
 
         /**
@@ -2098,24 +2094,22 @@ namespace ts {
             if (!shouldEmitAccessorDeclaration(node)) {
                 return undefined;
             }
-
-            const accessor = createGetAccessor(
+            const updated = updateGetAccessor(
+                node,
                 /*decorators*/ undefined,
                 visitNodes(node.modifiers, modifierVisitor, isModifier),
                 visitPropertyNameOfClassElement(node),
-                visitNodes(node.parameters, visitor, isParameter),
+                visitParameterList(node.parameters, visitor, context),
                 /*type*/ undefined,
-                node.body ? visitEachChild(node.body, visitor, context) : createBlock([]),
-                /*location*/ node
+                visitFunctionBody(node.body, visitor, context) || createBlock([])
             );
-
-            // While we emit the source map for the node after skipping decorators and modifiers,
-            // we need to emit the comments for the original range.
-            setOriginalNode(accessor, node);
-            setCommentRange(accessor, node);
-            setSourceMapRange(accessor, moveRangePastDecorators(node));
-
-            return accessor;
+            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.
+                setCommentRange(updated, node);
+                setSourceMapRange(updated, moveRangePastDecorators(node));
+            }
+            return updated;
         }
 
         /**
@@ -2131,23 +2125,21 @@ namespace ts {
             if (!shouldEmitAccessorDeclaration(node)) {
                 return undefined;
             }
-
-            const accessor = createSetAccessor(
+            const updated = updateSetAccessor(
+                node,
                 /*decorators*/ undefined,
                 visitNodes(node.modifiers, modifierVisitor, isModifier),
                 visitPropertyNameOfClassElement(node),
-                visitNodes(node.parameters, visitor, isParameter),
-                node.body ? visitEachChild(node.body, visitor, context) : createBlock([]),
-                /*location*/ node
+                visitParameterList(node.parameters, visitor, context),
+                visitFunctionBody(node.body, visitor, context) || createBlock([])
             );
-
-            // While we emit the source map for the node after skipping decorators and modifiers,
-            // we need to emit the comments for the original range.
-            setOriginalNode(accessor, node);
-            setCommentRange(accessor, node);
-            setSourceMapRange(accessor, moveRangePastDecorators(node));
-
-            return accessor;
+            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.
+                setCommentRange(updated, node);
+                setSourceMapRange(updated, moveRangePastDecorators(node));
+            }
+            return updated;
         }
 
         /**
@@ -2164,27 +2156,22 @@ namespace ts {
             if (!shouldEmitFunctionLikeDeclaration(node)) {
                 return createNotEmittedStatement(node);
             }
-
-            const func = createFunctionDeclaration(
+            const updated = updateFunctionDeclaration(
+                node,
                 /*decorators*/ undefined,
                 visitNodes(node.modifiers, modifierVisitor, isModifier),
-                node.asteriskToken,
                 node.name,
                 /*typeParameters*/ undefined,
-                visitNodes(node.parameters, visitor, isParameter),
+                visitParameterList(node.parameters, visitor, context),
                 /*type*/ undefined,
-                transformFunctionBody(node),
-                /*location*/ node
+                visitFunctionBody(node.body, visitor, context) || createBlock([])
             );
-            setOriginalNode(func, node);
-
             if (isNamespaceExport(node)) {
-                const statements: Statement[] = [func];
+                const statements: Statement[] = [updated];
                 addExportMemberAssignment(statements, node);
                 return statements;
             }
-
-            return func;
+            return updated;
         }
 
         /**
@@ -2199,21 +2186,16 @@ namespace ts {
             if (nodeIsMissing(node.body)) {
                 return createOmittedExpression();
             }
-
-            const func = createFunctionExpression(
+            const updated = updateFunctionExpression(
+                node,
                 visitNodes(node.modifiers, modifierVisitor, isModifier),
-                node.asteriskToken,
                 node.name,
                 /*typeParameters*/ undefined,
-                visitNodes(node.parameters, visitor, isParameter),
+                visitParameterList(node.parameters, visitor, context),
                 /*type*/ undefined,
-                transformFunctionBody(node),
-                /*location*/ node
+                visitFunctionBody(node.body, visitor, context)
             );
-
-            setOriginalNode(func, node);
-
-            return func;
+            return updated;
         }
 
         /**
@@ -2222,62 +2204,15 @@ namespace ts {
          * - The node has type annotations
          */
         function visitArrowFunction(node: ArrowFunction) {
-            const func = createArrowFunction(
+            const updated = updateArrowFunction(
+                node,
                 visitNodes(node.modifiers, modifierVisitor, isModifier),
                 /*typeParameters*/ undefined,
-                visitNodes(node.parameters, visitor, isParameter),
+                visitParameterList(node.parameters, visitor, context),
                 /*type*/ undefined,
-                node.equalsGreaterThanToken,
-                transformConciseBody(node),
-                /*location*/ node
+                visitFunctionBody(node.body, visitor, context)
             );
-
-            setOriginalNode(func, node);
-
-            return func;
-        }
-
-        function transformFunctionBody(node: MethodDeclaration | AccessorDeclaration | FunctionDeclaration | FunctionExpression): FunctionBody {
-            return transformFunctionBodyWorker(node.body);
-        }
-
-        function transformFunctionBodyWorker(body: Block, start = 0) {
-            const savedCurrentScope = currentScope;
-            const savedCurrentScopeFirstDeclarationsOfName = currentScopeFirstDeclarationsOfName;
-            currentScope = body;
-            currentScopeFirstDeclarationsOfName = createMap<Node>();
-            startLexicalEnvironment();
-
-            const statements = visitNodes(body.statements, visitor, isStatement, start);
-            const visited = updateBlock(body, statements);
-            const declarations = endLexicalEnvironment();
-            currentScope = savedCurrentScope;
-            currentScopeFirstDeclarationsOfName = savedCurrentScopeFirstDeclarationsOfName;
-            return mergeFunctionBodyLexicalEnvironment(visited, declarations);
-        }
-
-        function transformConciseBody(node: ArrowFunction): ConciseBody {
-            return transformConciseBodyWorker(node.body, /*forceBlockFunctionBody*/ false);
-        }
-
-        function transformConciseBodyWorker(body: Block | Expression, forceBlockFunctionBody: boolean) {
-            if (isBlock(body)) {
-                return transformFunctionBodyWorker(body);
-            }
-            else {
-                startLexicalEnvironment();
-                const visited: Expression | Block = visitNode(body, visitor, isConciseBody);
-                const declarations = endLexicalEnvironment();
-                const merged = mergeFunctionBodyLexicalEnvironment(visited, declarations);
-                if (forceBlockFunctionBody && !isBlock(merged)) {
-                    return createBlock([
-                        createReturn(<Expression>merged)
-                    ]);
-                }
-                else {
-                    return merged;
-                }
-            }
+            return updated;
         }
 
         /**
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index f99a644137a..deb6f350c14 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -3681,6 +3681,9 @@ namespace ts {
         /** Starts a new lexical environment. */
         startLexicalEnvironment(): void;
 
+        suspendLexicalEnvironment(): void;
+        resumeLexicalEnvironment(): void;
+
         /** Ends a lexical environment, returning any declarations. */
         endLexicalEnvironment(): Statement[];
     }
diff --git a/src/compiler/visitor.ts b/src/compiler/visitor.ts
index 825e0b45e45..e75fdcb488b 100644
--- a/src/compiler/visitor.ts
+++ b/src/compiler/visitor.ts
@@ -665,21 +665,40 @@ namespace ts {
         return updated || nodes;
     }
 
-    export function visitLexicalEnvironment(nodes: NodeArray<Statement>, visitor: (node: Node) => VisitResult<Node>, context: LexicalEnvironment, start?: number) {
+    /**
+     * Starts a new lexical environment and visits a statement list, ending the lexical environment
+     * and merging hoisted declarations upon completion.
+     */
+    export function visitLexicalEnvironment(statements: NodeArray<Statement>, visitor: (node: Node) => VisitResult<Node>, context: LexicalEnvironment, start?: number) {
         context.startLexicalEnvironment();
-        const updated = visitNodes(nodes, visitor, isStatement, start);
+        statements = visitNodes(statements, visitor, isStatement, start);
         const declarations = context.endLexicalEnvironment();
-        return createNodeArray(concatenate(updated, declarations), updated);
+        return createNodeArray(concatenate(statements, declarations), statements);
     }
 
+    /**
+     * Starts a new lexical environment and visits a parameter list, suspending the lexical
+     * environment upon completion.
+     */
     export function visitParameterList(nodes: NodeArray<ParameterDeclaration>, visitor: (node: Node) => VisitResult<Node>, context: LexicalEnvironment) {
         context.startLexicalEnvironment();
-        return visitNodes(nodes, visitor, isParameter);
+        const updated = visitNodes(nodes, visitor, isParameter);
+        context.suspendLexicalEnvironment();
+        return updated;
     }
 
+    /**
+     * Resumes a suspended lexical environment and visits a function body, ending the lexical
+     * environment and merging hoisted declarations upon completion.
+     */
     export function visitFunctionBody(node: FunctionBody, visitor: (node: Node) => VisitResult<Node>, context: LexicalEnvironment): FunctionBody;
+    /**
+     * Resumes a suspended lexical environment and visits a concise body, ending the lexical
+     * environment and merging hoisted declarations upon completion.
+     */
     export function visitFunctionBody(node: ConciseBody, visitor: (node: Node) => VisitResult<Node>, context: LexicalEnvironment): ConciseBody;
     export function visitFunctionBody(node: ConciseBody, visitor: (node: Node) => VisitResult<Node>, context: LexicalEnvironment) {
+        context.resumeLexicalEnvironment();
         const visited = visitNode(node, visitor, isConciseBody);
         const declarations = context.endLexicalEnvironment();
         if (some(declarations)) {

From c5ab4735ac01d316e4384e5ea398bd8d271c2ff0 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Wed, 16 Nov 2016 06:48:51 -0800
Subject: [PATCH 257/421] Resolve upfront so recursive mapped types appear
 empty

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 44bbfbc9ad5..846bb288d6b 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -4489,6 +4489,8 @@ namespace ts {
             const members: SymbolTable = createMap<Symbol>();
             let stringIndexInfo: IndexInfo;
             let numberIndexInfo: IndexInfo;
+            // Resolve upfront such that recursive references see an empty object type.
+            setStructuredTypeMembers(type, emptySymbols, emptyArray, emptyArray, undefined, undefined);
             // In { [P in K]: T }, we refer to P as the type parameter type, K as the constraint type,
             // and T as the template type.
             const typeParameter = getTypeParameterFromMappedType(type);

From c00a04d781dae1dff928174427e926f5b144c706 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Wed, 16 Nov 2016 06:49:04 -0800
Subject: [PATCH 258/421] Add tests

---
 .../types/mapped/recursiveMappedTypes.ts          | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 tests/cases/conformance/types/mapped/recursiveMappedTypes.ts

diff --git a/tests/cases/conformance/types/mapped/recursiveMappedTypes.ts b/tests/cases/conformance/types/mapped/recursiveMappedTypes.ts
new file mode 100644
index 00000000000..7a78ad9dc4a
--- /dev/null
+++ b/tests/cases/conformance/types/mapped/recursiveMappedTypes.ts
@@ -0,0 +1,15 @@
+// @declaration: true
+
+// Recursive mapped types simply appear empty
+
+type Recurse = {
+    [K in keyof Recurse]: Recurse[K]
+}
+
+type Recurse1 = {
+    [K in keyof Recurse2]: Recurse2[K]
+}
+
+type Recurse2 = {
+    [K in keyof Recurse1]: Recurse1[K]
+}
\ No newline at end of file

From 78726aeb3d46b4535a2f2a49b321c6ad1f413b1a Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Wed, 16 Nov 2016 06:49:15 -0800
Subject: [PATCH 259/421] Accept new baselines

---
 .../reference/recursiveMappedTypes.js         | 30 +++++++++++++++++
 .../reference/recursiveMappedTypes.symbols    | 33 +++++++++++++++++++
 .../reference/recursiveMappedTypes.types      | 33 +++++++++++++++++++
 3 files changed, 96 insertions(+)
 create mode 100644 tests/baselines/reference/recursiveMappedTypes.js
 create mode 100644 tests/baselines/reference/recursiveMappedTypes.symbols
 create mode 100644 tests/baselines/reference/recursiveMappedTypes.types

diff --git a/tests/baselines/reference/recursiveMappedTypes.js b/tests/baselines/reference/recursiveMappedTypes.js
new file mode 100644
index 00000000000..dfe69457ed7
--- /dev/null
+++ b/tests/baselines/reference/recursiveMappedTypes.js
@@ -0,0 +1,30 @@
+//// [recursiveMappedTypes.ts]
+
+// Recursive mapped types simply appear empty
+
+type Recurse = {
+    [K in keyof Recurse]: Recurse[K]
+}
+
+type Recurse1 = {
+    [K in keyof Recurse2]: Recurse2[K]
+}
+
+type Recurse2 = {
+    [K in keyof Recurse1]: Recurse1[K]
+}
+
+//// [recursiveMappedTypes.js]
+// Recursive mapped types simply appear empty
+
+
+//// [recursiveMappedTypes.d.ts]
+declare type Recurse = {
+    [K in keyof Recurse]: Recurse[K];
+};
+declare type Recurse1 = {
+    [K in keyof Recurse2]: Recurse2[K];
+};
+declare type Recurse2 = {
+    [K in keyof Recurse1]: Recurse1[K];
+};
diff --git a/tests/baselines/reference/recursiveMappedTypes.symbols b/tests/baselines/reference/recursiveMappedTypes.symbols
new file mode 100644
index 00000000000..ae4ca8d9cc9
--- /dev/null
+++ b/tests/baselines/reference/recursiveMappedTypes.symbols
@@ -0,0 +1,33 @@
+=== tests/cases/conformance/types/mapped/recursiveMappedTypes.ts ===
+
+// Recursive mapped types simply appear empty
+
+type Recurse = {
+>Recurse : Symbol(Recurse, Decl(recursiveMappedTypes.ts, 0, 0))
+
+    [K in keyof Recurse]: Recurse[K]
+>K : Symbol(K, Decl(recursiveMappedTypes.ts, 4, 5))
+>Recurse : Symbol(Recurse, Decl(recursiveMappedTypes.ts, 0, 0))
+>Recurse : Symbol(Recurse, Decl(recursiveMappedTypes.ts, 0, 0))
+>K : Symbol(K, Decl(recursiveMappedTypes.ts, 4, 5))
+}
+
+type Recurse1 = {
+>Recurse1 : Symbol(Recurse1, Decl(recursiveMappedTypes.ts, 5, 1))
+
+    [K in keyof Recurse2]: Recurse2[K]
+>K : Symbol(K, Decl(recursiveMappedTypes.ts, 8, 5))
+>Recurse2 : Symbol(Recurse2, Decl(recursiveMappedTypes.ts, 9, 1))
+>Recurse2 : Symbol(Recurse2, Decl(recursiveMappedTypes.ts, 9, 1))
+>K : Symbol(K, Decl(recursiveMappedTypes.ts, 8, 5))
+}
+
+type Recurse2 = {
+>Recurse2 : Symbol(Recurse2, Decl(recursiveMappedTypes.ts, 9, 1))
+
+    [K in keyof Recurse1]: Recurse1[K]
+>K : Symbol(K, Decl(recursiveMappedTypes.ts, 12, 5))
+>Recurse1 : Symbol(Recurse1, Decl(recursiveMappedTypes.ts, 5, 1))
+>Recurse1 : Symbol(Recurse1, Decl(recursiveMappedTypes.ts, 5, 1))
+>K : Symbol(K, Decl(recursiveMappedTypes.ts, 12, 5))
+}
diff --git a/tests/baselines/reference/recursiveMappedTypes.types b/tests/baselines/reference/recursiveMappedTypes.types
new file mode 100644
index 00000000000..2c60bc8b68a
--- /dev/null
+++ b/tests/baselines/reference/recursiveMappedTypes.types
@@ -0,0 +1,33 @@
+=== tests/cases/conformance/types/mapped/recursiveMappedTypes.ts ===
+
+// Recursive mapped types simply appear empty
+
+type Recurse = {
+>Recurse : Recurse
+
+    [K in keyof Recurse]: Recurse[K]
+>K : K
+>Recurse : Recurse
+>Recurse : Recurse
+>K : K
+}
+
+type Recurse1 = {
+>Recurse1 : Recurse1
+
+    [K in keyof Recurse2]: Recurse2[K]
+>K : K
+>Recurse2 : Recurse2
+>Recurse2 : Recurse2
+>K : K
+}
+
+type Recurse2 = {
+>Recurse2 : Recurse2
+
+    [K in keyof Recurse1]: Recurse1[K]
+>K : K
+>Recurse1 : Recurse1
+>Recurse1 : Recurse1
+>K : K
+}

From cd023b271554983276f432c2d8830302617255dc Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Wed, 16 Nov 2016 10:06:16 -0800
Subject: [PATCH 260/421] PR Feedback

---
 src/compiler/transformer.ts                | 16 ++++-----
 src/compiler/transformers/destructuring.ts | 39 +++++-----------------
 src/compiler/transformers/es2015.ts        |  4 +--
 3 files changed, 18 insertions(+), 41 deletions(-)

diff --git a/src/compiler/transformer.ts b/src/compiler/transformer.ts
index b4a06c72a23..fbf8eb9e762 100644
--- a/src/compiler/transformer.ts
+++ b/src/compiler/transformer.ts
@@ -156,7 +156,7 @@ namespace ts {
     export function transformFiles(resolver: EmitResolver, host: EmitHost, sourceFiles: SourceFile[], transformers: Transformer[]): TransformationResult {
         const enabledSyntaxKindFeatures = new Array<SyntaxKindFeatureFlags>(SyntaxKind.Count);
 
-        let scopeModificationDisabled = false;
+        let lexicalEnvironmentDisabled = false;
 
         let lexicalEnvironmentStackOffset = 0;
         let lexicalEnvironmentVariableDeclarations: VariableDeclaration[];
@@ -192,7 +192,7 @@ namespace ts {
         const transformed = map(sourceFiles, transformSourceFile);
 
         // Disable modification of the lexical environment.
-        scopeModificationDisabled = true;
+        lexicalEnvironmentDisabled = true;
 
         return {
             transformed,
@@ -287,7 +287,7 @@ namespace ts {
          * Records a hoisted variable declaration for the provided name within a lexical environment.
          */
         function hoistVariableDeclaration(name: Identifier): void {
-            Debug.assert(!scopeModificationDisabled, "Cannot modify the lexical environment during the print phase.");
+            Debug.assert(!lexicalEnvironmentDisabled, "Cannot modify the lexical environment during the print phase.");
             const decl = createVariableDeclaration(name);
             if (!lexicalEnvironmentVariableDeclarations) {
                 lexicalEnvironmentVariableDeclarations = [decl];
@@ -301,7 +301,7 @@ namespace ts {
          * Records a hoisted function declaration within a lexical environment.
          */
         function hoistFunctionDeclaration(func: FunctionDeclaration): void {
-            Debug.assert(!scopeModificationDisabled, "Cannot modify the lexical environment during the print phase.");
+            Debug.assert(!lexicalEnvironmentDisabled, "Cannot modify the lexical environment during the print phase.");
             if (!lexicalEnvironmentFunctionDeclarations) {
                 lexicalEnvironmentFunctionDeclarations = [func];
             }
@@ -315,7 +315,7 @@ namespace ts {
          * are pushed onto a stack, and the related storage variables are reset.
          */
         function startLexicalEnvironment(): void {
-            Debug.assert(!scopeModificationDisabled, "Cannot start a lexical environment during the print phase.");
+            Debug.assert(!lexicalEnvironmentDisabled, "Cannot start a lexical environment during the print phase.");
             Debug.assert(!lexicalEnvironmentSuspended, "Lexical environment is suspended.");
 
             // Save the current lexical environment. Rather than resizing the array we adjust the
@@ -331,14 +331,14 @@ namespace ts {
 
         /** Suspends the current lexical environment, usually after visiting a parameter list. */
         function suspendLexicalEnvironment(): void {
-            Debug.assert(!scopeModificationDisabled, "Cannot suspend a lexical environment during the print phase.");
+            Debug.assert(!lexicalEnvironmentDisabled, "Cannot suspend a lexical environment during the print phase.");
             Debug.assert(!lexicalEnvironmentSuspended, "Lexical environment is already suspended.");
             lexicalEnvironmentSuspended = true;
         }
 
         /** Resumes a suspended lexical environment, usually before visiting a function body. */
         function resumeLexicalEnvironment(): void {
-            Debug.assert(!scopeModificationDisabled, "Cannot resume a lexical environment during the print phase.");
+            Debug.assert(!lexicalEnvironmentDisabled, "Cannot resume a lexical environment during the print phase.");
             Debug.assert(lexicalEnvironmentSuspended, "Lexical environment is not suspended suspended.");
             lexicalEnvironmentSuspended = false;
         }
@@ -348,7 +348,7 @@ namespace ts {
          * any hoisted declarations added in this environment are returned.
          */
         function endLexicalEnvironment(): Statement[] {
-            Debug.assert(!scopeModificationDisabled, "Cannot end a lexical environment during the print phase.");
+            Debug.assert(!lexicalEnvironmentDisabled, "Cannot end a lexical environment during the print phase.");
             Debug.assert(!lexicalEnvironmentSuspended, "Lexical environment is suspended.");
 
             let statements: Statement[];
diff --git a/src/compiler/transformers/destructuring.ts b/src/compiler/transformers/destructuring.ts
index 6159cd55a4c..3e63542ab7e 100644
--- a/src/compiler/transformers/destructuring.ts
+++ b/src/compiler/transformers/destructuring.ts
@@ -6,7 +6,7 @@ namespace ts {
     interface FlattenContext {
         context: TransformationContext;
         level: FlattenLevel;
-        doNotRecordTempVariablesInLine: boolean;
+        hoistTempVariables: boolean;
         emitExpression: (value: Expression) => void;
         emitBindingOrAssignment: (target: BindingOrAssignmentElementTarget, value: Expression, location: TextRange, original: Node) => void;
         createArrayBindingOrAssignmentPattern: (elements: BindingOrAssignmentElement[]) => ArrayBindingOrAssignmentPattern;
@@ -57,7 +57,7 @@ namespace ts {
         const flattenContext: FlattenContext = {
             context,
             level,
-            doNotRecordTempVariablesInLine: true,
+            hoistTempVariables: true,
             emitExpression,
             emitBindingOrAssignment,
             createArrayBindingOrAssignmentPattern: makeArrayAssignmentPattern,
@@ -126,7 +126,7 @@ namespace ts {
      * @param context The transformation context.
      * @param boundValue The value bound to the declaration.
      * @param skipInitializer A value indicating whether to ignore the initializer of `node`.
-     * @param doNotRecordTempVariablesInLine Indicates whether temporary variables should not be recored in-line.
+     * @param hoistTempVariables Indicates whether temporary variables should not be recorded in-line.
      * @param level Indicates the extent to which flattening should occur.
      */
     export function flattenDestructuringBinding(
@@ -135,16 +135,15 @@ namespace ts {
         context: TransformationContext,
         level: FlattenLevel,
         rval?: Expression,
-        doNotRecordTempVariablesInLine?: boolean,
+        hoistTempVariables?: boolean,
         skipInitializer?: boolean): VariableDeclaration[] {
-
         let pendingExpressions: Expression[];
         const pendingDeclarations: { pendingExpressions?: Expression[], name: BindingName, value: Expression, location?: TextRange, original?: Node; }[] = [];
         const declarations: VariableDeclaration[] = [];
         const flattenContext: FlattenContext = {
             context,
             level,
-            doNotRecordTempVariablesInLine,
+            hoistTempVariables,
             emitExpression,
             emitBindingOrAssignment,
             createArrayBindingOrAssignmentPattern: makeArrayBindingPattern,
@@ -152,12 +151,10 @@ namespace ts {
             createArrayBindingOrAssignmentElement: makeBindingElement,
             visitor
         };
-
         flattenBindingOrAssignmentElement(flattenContext, node, rval, node, skipInitializer);
-
         if (pendingExpressions) {
             const temp = createTempVariable(/*recordTempVariable*/ undefined);
-            if (doNotRecordTempVariablesInLine) {
+            if (hoistTempVariables) {
                 const value = inlineExpressions(pendingExpressions);
                 pendingExpressions = undefined;
                 emitBindingOrAssignment(temp, value, /*location*/ undefined, /*original*/ undefined);
@@ -173,7 +170,6 @@ namespace ts {
                 pendingDeclaration.value = temp;
             }
         }
-
         for (const { pendingExpressions, name, value, location, original } of pendingDeclarations) {
             const variable = createVariableDeclaration(
                 name,
@@ -187,7 +183,6 @@ namespace ts {
             aggregateTransformFlags(variable);
             declarations.push(variable);
         }
-
         return declarations;
 
         function emitExpression(value: Expression) {
@@ -330,7 +325,7 @@ namespace ts {
                 // can perform the ObjectRest destructuring in a different declaration
                 if (element.transformFlags & TransformFlags.ContainsObjectRest) {
                     const temp = createTempVariable(/*recordTempVariable*/ undefined);
-                    if (flattenContext.doNotRecordTempVariablesInLine) {
+                    if (flattenContext.hoistTempVariables) {
                         flattenContext.context.hoistVariableDeclaration(temp);
                     }
 
@@ -419,7 +414,7 @@ namespace ts {
         }
         else {
             const temp = createTempVariable(/*recordTempVariable*/ undefined);
-            if (flattenContext.doNotRecordTempVariablesInLine) {
+            if (flattenContext.hoistTempVariables) {
                 flattenContext.context.hoistVariableDeclaration(temp);
                 flattenContext.emitExpression(createAssignment(temp, value, location));
             }
@@ -430,46 +425,28 @@ namespace ts {
         }
     }
 
-    /**
-     * Creates an ArrayBindingPattern from an array of BindingOrAssignmentElement nodes.
-     */
     function makeArrayBindingPattern(elements: BindingOrAssignmentElement[]) {
         Debug.assertEachNode(elements, isArrayBindingElement);
         return createArrayBindingPattern(<ArrayBindingElement[]>elements);
     }
 
-    /**
-     * Creates an ArrayLiteralExpression assignment pattern from an array of BindingOrAssignmentElement nodes.
-     */
     function makeArrayAssignmentPattern(elements: BindingOrAssignmentElement[]) {
         return createArrayLiteral(map(elements, convertToArrayAssignmentElement));
     }
 
-    /**
-     * Creates an ObjectBindingPattern from an array of BindingOrAssignmentElement nodes.
-     */
     function makeObjectBindingPattern(elements: BindingOrAssignmentElement[]) {
         Debug.assertEachNode(elements, isBindingElement);
         return createObjectBindingPattern(<BindingElement[]>elements);
     }
 
-    /**
-     * Creates an ObjectLiteralExpression assignment pattern from an array of BindingOrAssignmentElement nodes.
-     */
     function makeObjectAssignmentPattern(elements: BindingOrAssignmentElement[]) {
         return createObjectLiteral(map(elements, convertToObjectAssignmentElement));
     }
 
-    /**
-     * Creates a BindingElement for a name.
-     */
     function makeBindingElement(name: Identifier) {
         return createBindingElement(/*propertyName*/ undefined, /*dotDotDotToken*/ undefined, name);
     }
 
-    /**
-     * Creates an assignment element for a name.
-     */
     function makeAssignmentElement(name: Identifier) {
         return name;
     }
diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts
index f95559518dd..ca83b40dc68 100644
--- a/src/compiler/transformers/es2015.ts
+++ b/src/compiler/transformers/es2015.ts
@@ -1896,7 +1896,7 @@ namespace ts {
         function visitVariableDeclaration(node: VariableDeclaration): VisitResult<VariableDeclaration> {
             // If we are here it is because the name contains a binding pattern.
             if (isBindingPattern(node.name)) {
-                const doNotRecordTempVariablesInLine = enclosingVariableStatement
+                const hoistTempVariables = enclosingVariableStatement
                     && hasModifier(enclosingVariableStatement, ModifierFlags.Export);
                 return flattenDestructuringBinding(
                     node,
@@ -1904,7 +1904,7 @@ namespace ts {
                     context,
                     FlattenLevel.All,
                     /*value*/ undefined,
-                    doNotRecordTempVariablesInLine
+                    hoistTempVariables
                 );
             }
 

From 8d24712d8563b4d260da250db5a78dba3414f490 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 16 Nov 2016 10:14:16 -0800
Subject: [PATCH 261/421] Improve __assign emit:remove getOwnPropertySymbols

Since __assign defaults to Object.assign if present, our own helper will
never be used in ES6 and higher, and `getOwnPropertySymbols` is not
needed in ES5 and below because symbols don't exist there.
---
 src/compiler/emitter.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index eacfd1f0b67..3441644f92b 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -38,9 +38,6 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         s = arguments[i];
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
-        if (typeof Object.getOwnPropertySymbols === "function")
-            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
-                t[p[i]] = s[p[i]];
     }
     return t;
 };`;

From e7bfd02ca9f5ee39cd44b29d9ce450e99b311363 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 16 Nov 2016 10:15:57 -0800
Subject: [PATCH 262/421] Update baselines with new __assign emit

---
 tests/baselines/reference/importHelpersInTsx.js           | 3 ---
 tests/baselines/reference/objectRest2.js                  | 3 ---
 tests/baselines/reference/objectRestForOf.js              | 3 ---
 tests/baselines/reference/objectSpread.js                 | 3 ---
 tests/baselines/reference/objectSpreadComputedProperty.js | 3 ---
 tests/baselines/reference/objectSpreadIndexSignature.js   | 3 ---
 tests/baselines/reference/objectSpreadNegative.js         | 3 ---
 tests/baselines/reference/objectSpreadNegativeParse.js    | 3 ---
 tests/baselines/reference/objectSpreadStrictNull.js       | 3 ---
 tests/baselines/reference/reactNamespaceJSXEmit.js        | 3 ---
 tests/baselines/reference/tsxExternalModuleEmit2.js       | 3 ---
 tests/baselines/reference/tsxReactEmit2.js                | 3 ---
 tests/baselines/reference/tsxReactEmit4.js                | 3 ---
 tests/baselines/reference/tsxReactEmit5.js                | 3 ---
 tests/baselines/reference/tsxReactEmit6.js                | 3 ---
 15 files changed, 45 deletions(-)

diff --git a/tests/baselines/reference/importHelpersInTsx.js b/tests/baselines/reference/importHelpersInTsx.js
index d1fe0df2c51..29e43e191e8 100644
--- a/tests/baselines/reference/importHelpersInTsx.js
+++ b/tests/baselines/reference/importHelpersInTsx.js
@@ -29,9 +29,6 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         s = arguments[i];
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
-        if (typeof Object.getOwnPropertySymbols === "function")
-            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
-                t[p[i]] = s[p[i]];
     }
     return t;
 };
diff --git a/tests/baselines/reference/objectRest2.js b/tests/baselines/reference/objectRest2.js
index 5e3f17b857f..e21c8c79853 100644
--- a/tests/baselines/reference/objectRest2.js
+++ b/tests/baselines/reference/objectRest2.js
@@ -20,9 +20,6 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         s = arguments[i];
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
-        if (typeof Object.getOwnPropertySymbols === "function")
-            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
-                t[p[i]] = s[p[i]];
     }
     return t;
 };
diff --git a/tests/baselines/reference/objectRestForOf.js b/tests/baselines/reference/objectRestForOf.js
index 0fa589737bf..370e0a706a8 100644
--- a/tests/baselines/reference/objectRestForOf.js
+++ b/tests/baselines/reference/objectRestForOf.js
@@ -20,9 +20,6 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         s = arguments[i];
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
-        if (typeof Object.getOwnPropertySymbols === "function")
-            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
-                t[p[i]] = s[p[i]];
     }
     return t;
 };
diff --git a/tests/baselines/reference/objectSpread.js b/tests/baselines/reference/objectSpread.js
index dc49d1f40ff..4305e17ab31 100644
--- a/tests/baselines/reference/objectSpread.js
+++ b/tests/baselines/reference/objectSpread.js
@@ -87,9 +87,6 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         s = arguments[i];
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
-        if (typeof Object.getOwnPropertySymbols === "function")
-            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
-                t[p[i]] = s[p[i]];
     }
     return t;
 };
diff --git a/tests/baselines/reference/objectSpreadComputedProperty.js b/tests/baselines/reference/objectSpreadComputedProperty.js
index 6f27e696ae7..90a22ce6ff5 100644
--- a/tests/baselines/reference/objectSpreadComputedProperty.js
+++ b/tests/baselines/reference/objectSpreadComputedProperty.js
@@ -16,9 +16,6 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         s = arguments[i];
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
-        if (typeof Object.getOwnPropertySymbols === "function")
-            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
-                t[p[i]] = s[p[i]];
     }
     return t;
 };
diff --git a/tests/baselines/reference/objectSpreadIndexSignature.js b/tests/baselines/reference/objectSpreadIndexSignature.js
index ffe88a89c9a..22e92e6a844 100644
--- a/tests/baselines/reference/objectSpreadIndexSignature.js
+++ b/tests/baselines/reference/objectSpreadIndexSignature.js
@@ -23,9 +23,6 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         s = arguments[i];
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
-        if (typeof Object.getOwnPropertySymbols === "function")
-            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
-                t[p[i]] = s[p[i]];
     }
     return t;
 };
diff --git a/tests/baselines/reference/objectSpreadNegative.js b/tests/baselines/reference/objectSpreadNegative.js
index 472a0857169..6287f4559a7 100644
--- a/tests/baselines/reference/objectSpreadNegative.js
+++ b/tests/baselines/reference/objectSpreadNegative.js
@@ -77,9 +77,6 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         s = arguments[i];
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
-        if (typeof Object.getOwnPropertySymbols === "function")
-            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
-                t[p[i]] = s[p[i]];
     }
     return t;
 };
diff --git a/tests/baselines/reference/objectSpreadNegativeParse.js b/tests/baselines/reference/objectSpreadNegativeParse.js
index 4076ab1c3a0..297c56c3e62 100644
--- a/tests/baselines/reference/objectSpreadNegativeParse.js
+++ b/tests/baselines/reference/objectSpreadNegativeParse.js
@@ -11,9 +11,6 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         s = arguments[i];
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
-        if (typeof Object.getOwnPropertySymbols === "function")
-            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
-                t[p[i]] = s[p[i]];
     }
     return t;
 };
diff --git a/tests/baselines/reference/objectSpreadStrictNull.js b/tests/baselines/reference/objectSpreadStrictNull.js
index fc0d4a80564..84604d728cd 100644
--- a/tests/baselines/reference/objectSpreadStrictNull.js
+++ b/tests/baselines/reference/objectSpreadStrictNull.js
@@ -27,9 +27,6 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         s = arguments[i];
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
-        if (typeof Object.getOwnPropertySymbols === "function")
-            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
-                t[p[i]] = s[p[i]];
     }
     return t;
 };
diff --git a/tests/baselines/reference/reactNamespaceJSXEmit.js b/tests/baselines/reference/reactNamespaceJSXEmit.js
index 48e514c2538..3a21504bb80 100644
--- a/tests/baselines/reference/reactNamespaceJSXEmit.js
+++ b/tests/baselines/reference/reactNamespaceJSXEmit.js
@@ -18,9 +18,6 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         s = arguments[i];
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
-        if (typeof Object.getOwnPropertySymbols === "function")
-            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
-                t[p[i]] = s[p[i]];
     }
     return t;
 };
diff --git a/tests/baselines/reference/tsxExternalModuleEmit2.js b/tests/baselines/reference/tsxExternalModuleEmit2.js
index d3a6591cdaa..6c01a48af78 100644
--- a/tests/baselines/reference/tsxExternalModuleEmit2.js
+++ b/tests/baselines/reference/tsxExternalModuleEmit2.js
@@ -24,9 +24,6 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         s = arguments[i];
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
-        if (typeof Object.getOwnPropertySymbols === "function")
-            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
-                t[p[i]] = s[p[i]];
     }
     return t;
 };
diff --git a/tests/baselines/reference/tsxReactEmit2.js b/tests/baselines/reference/tsxReactEmit2.js
index 4ddf442b53f..80e3215e2b6 100644
--- a/tests/baselines/reference/tsxReactEmit2.js
+++ b/tests/baselines/reference/tsxReactEmit2.js
@@ -21,9 +21,6 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         s = arguments[i];
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
-        if (typeof Object.getOwnPropertySymbols === "function")
-            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
-                t[p[i]] = s[p[i]];
     }
     return t;
 };
diff --git a/tests/baselines/reference/tsxReactEmit4.js b/tests/baselines/reference/tsxReactEmit4.js
index 8ccc940880f..33c835d1ab2 100644
--- a/tests/baselines/reference/tsxReactEmit4.js
+++ b/tests/baselines/reference/tsxReactEmit4.js
@@ -23,9 +23,6 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         s = arguments[i];
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
-        if (typeof Object.getOwnPropertySymbols === "function")
-            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
-                t[p[i]] = s[p[i]];
     }
     return t;
 };
diff --git a/tests/baselines/reference/tsxReactEmit5.js b/tests/baselines/reference/tsxReactEmit5.js
index 6e4d43dd676..c3e58d0a0da 100644
--- a/tests/baselines/reference/tsxReactEmit5.js
+++ b/tests/baselines/reference/tsxReactEmit5.js
@@ -28,9 +28,6 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         s = arguments[i];
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
-        if (typeof Object.getOwnPropertySymbols === "function")
-            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
-                t[p[i]] = s[p[i]];
     }
     return t;
 };
diff --git a/tests/baselines/reference/tsxReactEmit6.js b/tests/baselines/reference/tsxReactEmit6.js
index 4c951354aa8..85aa8c123c9 100644
--- a/tests/baselines/reference/tsxReactEmit6.js
+++ b/tests/baselines/reference/tsxReactEmit6.js
@@ -33,9 +33,6 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         s = arguments[i];
         for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
             t[p] = s[p];
-        if (typeof Object.getOwnPropertySymbols === "function")
-            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
-                t[p[i]] = s[p[i]];
     }
     return t;
 };

From d775f0f569226d3cbee44ebdc982989ddc527549 Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Wed, 16 Nov 2016 11:54:02 -0800
Subject: [PATCH 263/421] Improve diagnostic messages for imported helpers

---
 src/compiler/binder.ts                        |  23 ----
 src/compiler/checker.ts                       | 122 ++++++++++--------
 src/compiler/diagnosticMessages.json          |   8 ++
 src/compiler/types.ts                         |  45 ++++---
 src/compiler/utilities.ts                     |   4 +
 .../importHelpersNoHelpers.errors.txt         |  32 +++--
 .../importHelpersNoModule.errors.txt          |   7 +-
 7 files changed, 133 insertions(+), 108 deletions(-)

diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index 1afe51db021..4bcf5b929a8 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -518,7 +518,6 @@ namespace ts {
                 hasExplicitReturn = false;
                 bindChildren(node);
                 // Reset all reachability check related flags on node (for incremental scenarios)
-                // Reset all emit helper flags on node (for incremental scenarios)
                 node.flags &= ~NodeFlags.ReachabilityAndEmitFlags;
                 if (!(currentFlow.flags & FlowFlags.Unreachable) && containerFlags & ContainerFlags.IsFunctionLike && nodeIsPresent((<FunctionLikeDeclaration>node).body)) {
                     node.flags |= NodeFlags.HasImplicitReturn;
@@ -1950,9 +1949,6 @@ namespace ts {
                     return bindParameter(<ParameterDeclaration>node);
                 case SyntaxKind.VariableDeclaration:
                 case SyntaxKind.BindingElement:
-                    if ((node as BindingElement).dotDotDotToken && node.parent.kind === SyntaxKind.ObjectBindingPattern) {
-                        emitFlags |= NodeFlags.HasRestAttribute;
-                    }
                     return bindVariableDeclarationOrBindingElement(<VariableDeclaration | BindingElement>node);
                 case SyntaxKind.PropertyDeclaration:
                 case SyntaxKind.PropertySignature:
@@ -1980,7 +1976,6 @@ namespace ts {
                         }
                         root = root.parent;
                     }
-                    emitFlags |= hasRest ? NodeFlags.HasRestAttribute : NodeFlags.HasSpreadAttribute;
                     return;
 
                 case SyntaxKind.CallSignature:
@@ -2236,15 +2231,6 @@ namespace ts {
         }
 
         function bindClassLikeDeclaration(node: ClassLikeDeclaration) {
-            if (!isDeclarationFile(file) && !isInAmbientContext(node)) {
-                if (getClassExtendsHeritageClauseElement(node) !== undefined) {
-                    emitFlags |= NodeFlags.HasClassExtends;
-                }
-                if (nodeIsDecorated(node)) {
-                    emitFlags |= NodeFlags.HasDecorators;
-                }
-            }
-
             if (node.kind === SyntaxKind.ClassDeclaration) {
                 bindBlockScopedDeclaration(node, SymbolFlags.Class, SymbolFlags.ClassExcludes);
             }
@@ -2314,12 +2300,6 @@ namespace ts {
         }
 
         function bindParameter(node: ParameterDeclaration) {
-            if (!isDeclarationFile(file) &&
-                !isInAmbientContext(node) &&
-                nodeIsDecorated(node)) {
-                emitFlags |= (NodeFlags.HasDecorators | NodeFlags.HasParamDecorators);
-            }
-
             if (inStrictMode) {
                 // It is a SyntaxError if the identifier eval or arguments appears within a FormalParameterList of a
                 // strict mode FunctionLikeDeclaration or FunctionExpression(13.1)
@@ -2377,9 +2357,6 @@ namespace ts {
                 if (isAsyncFunctionLike(node)) {
                     emitFlags |= NodeFlags.HasAsyncFunctions;
                 }
-                if (nodeIsDecorated(node)) {
-                    emitFlags |= NodeFlags.HasDecorators;
-                }
             }
 
             if (currentFlow && isObjectLiteralOrClassExpressionMethod(node)) {
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 7132aedb324..d9ce0fc95dd 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -38,6 +38,8 @@ namespace ts {
         // is because diagnostics can be quite expensive, and we want to allow hosts to bail out if
         // they no longer need the information (for example, if the user started editing again).
         let cancellationToken: CancellationToken;
+        let requestedExternalEmitHelpers: ExternalEmitHelpers;
+        let externalHelpersModule: Symbol;
 
         const Symbol = objectAllocator.getSymbolConstructor();
         const Type = objectAllocator.getTypeConstructor();
@@ -11272,6 +11274,9 @@ namespace ts {
                     member = prop;
                 }
                 else if (memberDecl.kind === SyntaxKind.SpreadAssignment) {
+                    if (languageVersion < ScriptTarget.ESNext) {
+                        checkExternalEmitHelpers(memberDecl, ExternalEmitHelpers.Assign);
+                    }
                     if (propertiesArray.length > 0) {
                         spread = getSpreadType(spread, createObjectLiteralType(), /*isFromObjectLiteral*/ true);
                         propertiesArray = [];
@@ -11459,6 +11464,9 @@ namespace ts {
         }
 
         function checkJsxSpreadAttribute(node: JsxSpreadAttribute, elementAttributesType: Type, nameTable: Map<boolean>) {
+            if (compilerOptions.jsx === JsxEmit.React) {
+                checkExternalEmitHelpers(node, ExternalEmitHelpers.Assign);
+            }
             const type = checkExpression(node.expression);
             const props = getPropertiesOfType(type);
             for (const prop of props) {
@@ -14223,6 +14231,9 @@ namespace ts {
                 }
             }
             else if (property.kind === SyntaxKind.SpreadAssignment) {
+                if (languageVersion < ScriptTarget.ESNext) {
+                    checkExternalEmitHelpers(property, ExternalEmitHelpers.Rest);
+                }
                 checkReferenceExpression(property.expression, Diagnostics.The_target_of_an_object_rest_assignment_must_be_a_variable_or_a_property_access);
             }
             else {
@@ -15107,6 +15118,13 @@ namespace ts {
                 checkGrammarFunctionLikeDeclaration(<FunctionLikeDeclaration>node);
             }
 
+            if (isAsyncFunctionLike(node) && languageVersion < ScriptTarget.ES2017) {
+                checkExternalEmitHelpers(node, ExternalEmitHelpers.Awaiter);
+                if (languageVersion < ScriptTarget.ES2015) {
+                    checkExternalEmitHelpers(node, ExternalEmitHelpers.Generator);
+                }
+            }
+
             checkTypeParameters(node.typeParameters);
 
             forEach(node.parameters, checkParameter);
@@ -16242,7 +16260,15 @@ namespace ts {
                 error(node, 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);
             }
 
+            const firstDecorator = node.decorators[0];
+            checkExternalEmitHelpers(firstDecorator, ExternalEmitHelpers.Decorate);
+            if (node.kind === SyntaxKind.Parameter) {
+                checkExternalEmitHelpers(firstDecorator, ExternalEmitHelpers.Param);
+            }
+
             if (compilerOptions.emitDecoratorMetadata) {
+                checkExternalEmitHelpers(firstDecorator, ExternalEmitHelpers.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 SyntaxKind.ClassDeclaration:
@@ -16629,7 +16655,7 @@ namespace ts {
         }
 
         function checkCollisionWithGlobalPromiseInGeneratedCode(node: Node, name: Identifier): void {
-            if (!needCollisionCheckForIdentifier(node, name, "Promise")) {
+            if (languageVersion >= ScriptTarget.ES2017 || !needCollisionCheckForIdentifier(node, name, "Promise")) {
                 return;
             }
 
@@ -16806,6 +16832,9 @@ namespace ts {
             }
 
             if (node.kind === SyntaxKind.BindingElement) {
+                if (node.parent.kind === SyntaxKind.ObjectBindingPattern && languageVersion < ScriptTarget.ESNext) {
+                    checkExternalEmitHelpers(node, ExternalEmitHelpers.Rest);
+                }
                 // check computed properties inside property names of binding elements
                 if (node.propertyName && node.propertyName.kind === SyntaxKind.ComputedPropertyName) {
                     checkComputedPropertyName(<ComputedPropertyName>node.propertyName);
@@ -17724,6 +17753,10 @@ namespace ts {
 
             const baseTypeNode = getClassExtendsHeritageClauseElement(node);
             if (baseTypeNode) {
+                if (languageVersion < ScriptTarget.ES2015) {
+                    checkExternalEmitHelpers(baseTypeNode.parent, ExternalEmitHelpers.Extends);
+                }
+
                 const baseTypes = getBaseTypes(type);
                 if (baseTypes.length && produceDiagnostics) {
                     const baseType = baseTypes[0];
@@ -20164,8 +20197,6 @@ namespace ts {
 
             // Initialize global symbol table
             let augmentations: LiteralExpression[][];
-            let requestedExternalEmitHelpers: NodeFlags = 0;
-            let firstFileRequestingExternalHelpers: SourceFile;
             for (const file of host.getSourceFiles()) {
                 if (!isExternalOrCommonJsModule(file)) {
                     mergeSymbolTable(globals, file.locals);
@@ -20185,15 +20216,6 @@ namespace ts {
                         }
                     }
                 }
-                if ((compilerOptions.isolatedModules || isExternalModule(file)) && !file.isDeclarationFile) {
-                    const fileRequestedExternalEmitHelpers = file.flags & NodeFlags.EmitHelperFlags;
-                    if (fileRequestedExternalEmitHelpers) {
-                        requestedExternalEmitHelpers |= fileRequestedExternalEmitHelpers;
-                        if (firstFileRequestingExternalHelpers === undefined) {
-                            firstFileRequestingExternalHelpers = file;
-                        }
-                    }
-                }
             }
 
             if (augmentations) {
@@ -20259,57 +20281,51 @@ namespace ts {
             const symbol = getGlobalSymbol("ReadonlyArray", SymbolFlags.Type, /*diagnostic*/ undefined);
             globalReadonlyArrayType = symbol && <GenericType>getTypeOfGlobalSymbol(symbol, /*arity*/ 1);
             anyReadonlyArrayType = globalReadonlyArrayType ? createTypeFromGenericGlobalType(globalReadonlyArrayType, [anyType]) : anyArrayType;
+        }
 
-            // If we have specified that we are importing helpers, we should report global
-            // errors if we cannot resolve the helpers external module, or if it does not have
-            // the necessary helpers exported.
-            if (compilerOptions.importHelpers && firstFileRequestingExternalHelpers) {
-                // Find the first reference to the helpers module.
-                const helpersModule = resolveExternalModule(
-                    firstFileRequestingExternalHelpers,
-                    externalHelpersModuleNameText,
-                    Diagnostics.Cannot_find_module_0,
-                    /*errorNode*/ undefined);
-
-                // If we found the module, report errors if it does not have the necessary exports.
-                if (helpersModule) {
-                    const exports = helpersModule.exports;
-                    if (requestedExternalEmitHelpers & NodeFlags.HasClassExtends && languageVersion < ScriptTarget.ES2015) {
-                        verifyHelperSymbol(exports, "__extends", SymbolFlags.Value);
-                    }
-                    if (requestedExternalEmitHelpers & NodeFlags.HasSpreadAttribute &&
-                        (languageVersion < ScriptTarget.ESNext || compilerOptions.jsx === JsxEmit.React)) {
-                        verifyHelperSymbol(exports, "__assign", SymbolFlags.Value);
-                    }
-                    if (languageVersion < ScriptTarget.ESNext && requestedExternalEmitHelpers & NodeFlags.HasRestAttribute) {
-                        verifyHelperSymbol(exports, "__rest", SymbolFlags.Value);
-                    }
-                    if (requestedExternalEmitHelpers & NodeFlags.HasDecorators) {
-                        verifyHelperSymbol(exports, "__decorate", SymbolFlags.Value);
-                        if (compilerOptions.emitDecoratorMetadata) {
-                            verifyHelperSymbol(exports, "__metadata", SymbolFlags.Value);
-                        }
-                    }
-                    if (requestedExternalEmitHelpers & NodeFlags.HasParamDecorators) {
-                        verifyHelperSymbol(exports, "__param", SymbolFlags.Value);
-                    }
-                    if (requestedExternalEmitHelpers & NodeFlags.HasAsyncFunctions) {
-                        verifyHelperSymbol(exports, "__awaiter", SymbolFlags.Value);
-                        if (languageVersion < ScriptTarget.ES2015) {
-                            verifyHelperSymbol(exports, "__generator", SymbolFlags.Value);
+        function checkExternalEmitHelpers(location: Node, helpers: ExternalEmitHelpers) {
+            if ((requestedExternalEmitHelpers & helpers) !== helpers && compilerOptions.importHelpers) {
+                const sourceFile = getSourceFileOfNode(location);
+                if (isEffectiveExternalModule(sourceFile, compilerOptions)) {
+                    const helpersModule = resolveHelpersModule(sourceFile, location);
+                    if (helpersModule !== unknownSymbol) {
+                        const uncheckedHelpers = helpers & ~requestedExternalEmitHelpers;
+                        for (let helper = ExternalEmitHelpers.FirstEmitHelper; helper <= ExternalEmitHelpers.LastEmitHelper; helper <<= 1) {
+                            if (uncheckedHelpers & helper) {
+                                const name = getHelperName(helper);
+                                const symbol = getSymbol(helpersModule.exports, escapeIdentifier(name), SymbolFlags.Value);
+                                if (!symbol) {
+                                    error(location, Diagnostics.This_syntax_requires_an_imported_helper_named_1_but_module_0_has_no_exported_member_1, externalHelpersModuleNameText, name);
+                                }
+                            }
                         }
                     }
+                    requestedExternalEmitHelpers |= helpers;
                 }
             }
         }
 
-        function verifyHelperSymbol(symbols: SymbolTable, name: string, meaning: SymbolFlags) {
-            const symbol = getSymbol(symbols, escapeIdentifier(name), meaning);
-            if (!symbol) {
-                error(/*location*/ undefined, Diagnostics.Module_0_has_no_exported_member_1, externalHelpersModuleNameText, name);
+        function getHelperName(helper: ExternalEmitHelpers) {
+            switch (helper) {
+                case ExternalEmitHelpers.Extends: return "__extends";
+                case ExternalEmitHelpers.Assign: return "__assign";
+                case ExternalEmitHelpers.Rest: return "__rest";
+                case ExternalEmitHelpers.Decorate: return "__decorate";
+                case ExternalEmitHelpers.Metadata: return "__metadata";
+                case ExternalEmitHelpers.Param: return "__param";
+                case ExternalEmitHelpers.Awaiter: return "__awaiter";
+                case ExternalEmitHelpers.Generator: return "__generator";
             }
         }
 
+        function resolveHelpersModule(node: SourceFile, errorNode: Node) {
+            if (!externalHelpersModule) {
+                externalHelpersModule = resolveExternalModule(node, externalHelpersModuleNameText, Diagnostics.This_syntax_requires_an_imported_helper_but_module_0_cannot_be_found, errorNode) || unknownSymbol;
+            }
+            return externalHelpersModule;
+        }
+
+
         function createInstantiatedPromiseLikeType(): ObjectType {
             const promiseLikeType = getGlobalPromiseLikeType();
             if (promiseLikeType !== emptyGenericType) {
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index a163a3bb641..bb8f50c879c 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -1023,6 +1023,10 @@
         "category": "Error",
         "code": 2342
     },
+    "This syntax requires an imported helper named '{1}', but module '{0}' has no exported member '{1}'.": {
+        "category": "Error",
+        "code": 2343
+    },
     "Type '{0}' does not satisfy the constraint '{1}'.": {
         "category": "Error",
         "code": 2344
@@ -1063,6 +1067,10 @@
         "category": "Error",
         "code": 2353
     },
+    "This syntax requires an imported helper but module '{0}' cannot be found.": {
+        "category": "Error",
+        "code": 2354
+    },
     "A function whose declared type is neither 'void' nor 'any' must return a value.": {
         "category": "Error",
         "code": 2355
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index af46cb2173c..9330c54fa76 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -417,26 +417,20 @@ namespace ts {
         HasImplicitReturn =  1 << 7,  // If function implicitly returns on one of codepaths (initialized by binding)
         HasExplicitReturn =  1 << 8,  // If function has explicit reachable return on one of codepaths (initialized by binding)
         GlobalAugmentation = 1 << 9,  // Set if module declaration is an augmentation for the global scope
-        HasClassExtends =    1 << 10, // If the file has a non-ambient class with an extends clause in ES5 or lower (initialized by binding)
-        HasDecorators =      1 << 11, // If the file has decorators (initialized by binding)
-        HasParamDecorators = 1 << 12, // If the file has parameter decorators (initialized by binding)
-        HasAsyncFunctions =  1 << 13, // If the file has async functions (initialized by binding)
-        HasSpreadAttribute = 1 << 14, // If the file as JSX spread attributes (initialized by binding)
-        HasRestAttribute =   1 << 15, // If the file has object destructure elements
-        DisallowInContext =  1 << 16, // If node was parsed in a context where 'in-expressions' are not allowed
-        YieldContext =       1 << 17, // If node was parsed in the 'yield' context created when parsing a generator
-        DecoratorContext =   1 << 18, // If node was parsed as part of a decorator
-        AwaitContext =       1 << 19, // If node was parsed in the 'await' context created when parsing an async function
-        ThisNodeHasError =   1 << 20, // If the parser encountered an error when parsing the code that created this node
-        JavaScriptFile =     1 << 21, // If node was parsed in a JavaScript
-        ThisNodeOrAnySubNodesHasError = 1 << 22, // If this node or any of its children had an error
-        HasAggregatedChildData = 1 << 23, // If we've computed data from children and cached it in this node
+        HasAsyncFunctions =  1 << 10, // If the file has async functions (initialized by binding)
+        DisallowInContext =  1 << 11, // If node was parsed in a context where 'in-expressions' are not allowed
+        YieldContext =       1 << 12, // If node was parsed in the 'yield' context created when parsing a generator
+        DecoratorContext =   1 << 13, // If node was parsed as part of a decorator
+        AwaitContext =       1 << 14, // If node was parsed in the 'await' context created when parsing an async function
+        ThisNodeHasError =   1 << 15, // If the parser encountered an error when parsing the code that created this node
+        JavaScriptFile =     1 << 16, // If node was parsed in a JavaScript
+        ThisNodeOrAnySubNodesHasError = 1 << 17, // If this node or any of its children had an error
+        HasAggregatedChildData = 1 << 18, // If we've computed data from children and cached it in this node
 
         BlockScoped = Let | Const,
 
         ReachabilityCheckFlags = HasImplicitReturn | HasExplicitReturn,
-        EmitHelperFlags = HasClassExtends | HasDecorators | HasParamDecorators | HasAsyncFunctions | HasSpreadAttribute | HasRestAttribute,
-        ReachabilityAndEmitFlags = ReachabilityCheckFlags | EmitHelperFlags,
+        ReachabilityAndEmitFlags = ReachabilityCheckFlags | HasAsyncFunctions,
 
         // Parsing context flags
         ContextFlags = DisallowInContext | YieldContext | DecoratorContext | AwaitContext | JavaScriptFile,
@@ -3687,6 +3681,25 @@ namespace ts {
         readonly priority?: number; // Helpers with a higher priority are emitted earlier than other helpers on the node.
     }
 
+    /**
+     * Used by the checker, this enum keeps track of external emit helpers that should be type
+     * checked.
+     */
+    /* @internal */
+    export const enum ExternalEmitHelpers {
+        Extends = 1 << 0,           // __extends (used by the ES2015 class transformation)
+        Assign = 1 << 1,            // __assign (used by Jsx and ESNext object spread transformations)
+        Rest = 1 << 2,              // __rest (used by ESNext object rest transformation)
+        Decorate = 1 << 3,          // __decorate (used by TypeScript decorators transformation)
+        Metadata = 1 << 4,          // __metadata (used by TypeScript decorators transformation)
+        Param = 1 << 5,             // __param (used by TypeScript decorators transformation)
+        Awaiter = 1 << 6,           // __awaiter (used by ES2017 async functions transformation)
+        Generator = 1 << 7,         // __generator (used by ES2015 generator transformation)
+
+        FirstEmitHelper = Extends,
+        LastEmitHelper = Generator
+    }
+
     /* @internal */
     export const enum EmitContext {
         SourceFile,         // Emitting a SourceFile
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index bfabb3b1e4a..e5e42f93a4b 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -423,6 +423,10 @@ namespace ts {
         return false;
     }
 
+    export function isEffectiveExternalModule(node: SourceFile, compilerOptions: CompilerOptions) {
+        return isExternalModule(node) || compilerOptions.isolatedModules;
+    }
+
     export function isBlockScope(node: Node, parentNode: Node) {
         switch (node.kind) {
             case SyntaxKind.SourceFile:
diff --git a/tests/baselines/reference/importHelpersNoHelpers.errors.txt b/tests/baselines/reference/importHelpersNoHelpers.errors.txt
index fa9a935c8d8..a0c089a9ddc 100644
--- a/tests/baselines/reference/importHelpersNoHelpers.errors.txt
+++ b/tests/baselines/reference/importHelpersNoHelpers.errors.txt
@@ -1,32 +1,38 @@
-error TS2305: Module 'tslib' has no exported member '__assign'.
-error TS2305: Module 'tslib' has no exported member '__decorate'.
-error TS2305: Module 'tslib' has no exported member '__extends'.
-error TS2305: Module 'tslib' has no exported member '__metadata'.
-error TS2305: Module 'tslib' has no exported member '__param'.
-error TS2305: Module 'tslib' has no exported member '__rest'.
+tests/cases/compiler/external.ts(2,16): error TS2343: This syntax requires an imported helper named '__extends', but module 'tslib' has no exported member '__extends'.
+tests/cases/compiler/external.ts(6,1): error TS2343: This syntax requires an imported helper named '__decorate', but module 'tslib' has no exported member '__decorate'.
+tests/cases/compiler/external.ts(6,1): error TS2343: This syntax requires an imported helper named '__metadata', but module 'tslib' has no exported member '__metadata'.
+tests/cases/compiler/external.ts(8,12): error TS2343: This syntax requires an imported helper named '__param', but module 'tslib' has no exported member '__param'.
+tests/cases/compiler/external.ts(13,13): error TS2343: This syntax requires an imported helper named '__assign', but module 'tslib' has no exported member '__assign'.
+tests/cases/compiler/external.ts(14,12): error TS2343: This syntax requires an imported helper named '__rest', but module 'tslib' has no exported member '__rest'.
 
 
-!!! error TS2305: Module 'tslib' has no exported member '__assign'.
-!!! error TS2305: Module 'tslib' has no exported member '__decorate'.
-!!! error TS2305: Module 'tslib' has no exported member '__extends'.
-!!! error TS2305: Module 'tslib' has no exported member '__metadata'.
-!!! error TS2305: Module 'tslib' has no exported member '__param'.
-!!! error TS2305: Module 'tslib' has no exported member '__rest'.
-==== tests/cases/compiler/external.ts (0 errors) ====
+==== tests/cases/compiler/external.ts (6 errors) ====
     export class A { }
     export class B extends A { }
+                   ~~~~~~~~~
+!!! error TS2343: This syntax requires an imported helper named '__extends', but module 'tslib' has no exported member '__extends'.
     
     declare var dec: any;
     
     @dec
+    ~~~~
+!!! error TS2343: This syntax requires an imported helper named '__decorate', but module 'tslib' has no exported member '__decorate'.
+    ~~~~
+!!! error TS2343: This syntax requires an imported helper named '__metadata', but module 'tslib' has no exported member '__metadata'.
     class C {
         method(@dec x: number) {
+               ~~~~
+!!! error TS2343: This syntax requires an imported helper named '__param', but module 'tslib' has no exported member '__param'.
         }
     }
     
     const o = { a: 1 };
     const y = { ...o };
+                ~~~~
+!!! error TS2343: This syntax requires an imported helper named '__assign', but module 'tslib' has no exported member '__assign'.
     const { ...x } = y;
+               ~
+!!! error TS2343: This syntax requires an imported helper named '__rest', but module 'tslib' has no exported member '__rest'.
     
 ==== tests/cases/compiler/script.ts (0 errors) ====
     class A { }
diff --git a/tests/baselines/reference/importHelpersNoModule.errors.txt b/tests/baselines/reference/importHelpersNoModule.errors.txt
index d59fd0537ca..b6786ec3635 100644
--- a/tests/baselines/reference/importHelpersNoModule.errors.txt
+++ b/tests/baselines/reference/importHelpersNoModule.errors.txt
@@ -1,10 +1,11 @@
-error TS2307: Cannot find module 'tslib'.
+tests/cases/compiler/external.ts(2,16): error TS2354: This syntax requires an imported helper but module 'tslib' cannot be found.
 
 
-!!! error TS2307: Cannot find module 'tslib'.
-==== tests/cases/compiler/external.ts (0 errors) ====
+==== tests/cases/compiler/external.ts (1 errors) ====
     export class A { }
     export class B extends A { }
+                   ~~~~~~~~~
+!!! error TS2354: This syntax requires an imported helper but module 'tslib' cannot be found.
     
     declare var dec: any;
     

From 4e954a1962a75d25efa345cfe42b41256dd47ee4 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Wed, 16 Nov 2016 13:25:48 -0800
Subject: [PATCH 264/421] Update issue template

---
 issue_template.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/issue_template.md b/issue_template.md
index fcd995317f5..4d397a0afd6 100644
--- a/issue_template.md
+++ b/issue_template.md
@@ -2,7 +2,7 @@
 <!-- QUESTIONS: This is not a general support forum! Ask Qs at http://stackoverflow.com/questions/tagged/typescript -->
 <!-- SUGGESTIONS: See https://github.com/Microsoft/TypeScript-wiki/blob/master/Writing-Good-Design-Proposals.md -->
 
-**TypeScript Version:**  2.0.3 / nightly (2.1.0-dev.201xxxxx)
+**TypeScript Version:**  2.1.1 / nightly (2.2.0-dev.201xxxxx)
 
 **Code**
 
@@ -13,4 +13,4 @@
 
 **Expected behavior:**
 
-**Actual behavior:** 
+**Actual behavior:**

From 641948fb0cec0c27a3764b34ff947dd0f6d3b3be Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 16 Nov 2016 13:38:25 -0800
Subject: [PATCH 265/421] Test assignability checking of object rests

---
 .../reference/objectRestNegative.errors.txt   | 21 +++++++++++++++----
 .../baselines/reference/objectRestNegative.js |  9 ++++++++
 .../reference/objectSpreadNoTransform.js      |  2 +-
 .../reference/objectSpreadNoTransform.symbols |  2 +-
 .../reference/objectSpreadNoTransform.types   |  4 ++--
 .../types/rest/objectRestNegative.ts          |  6 ++++++
 .../types/spread/objectSpreadNoTransform.ts   |  2 +-
 7 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/tests/baselines/reference/objectRestNegative.errors.txt b/tests/baselines/reference/objectRestNegative.errors.txt
index 793a7d31fc8..345e99723bd 100644
--- a/tests/baselines/reference/objectRestNegative.errors.txt
+++ b/tests/baselines/reference/objectRestNegative.errors.txt
@@ -1,14 +1,27 @@
 tests/cases/conformance/types/rest/objectRestNegative.ts(2,10): error TS2462: A rest element must be last in a destructuring pattern
-tests/cases/conformance/types/rest/objectRestNegative.ts(3,31): error TS2462: A rest element must be last in a destructuring pattern
-tests/cases/conformance/types/rest/objectRestNegative.ts(6,17): error TS2700: Rest types may only be created from object types.
-tests/cases/conformance/types/rest/objectRestNegative.ts(11,9): error TS2701: The target of an object rest assignment must be a variable or a property access.
+tests/cases/conformance/types/rest/objectRestNegative.ts(6,10): error TS2322: Type '{ a: number; }' is not assignable to type '{ a: string; }'.
+  Types of property 'a' are incompatible.
+    Type 'number' is not assignable to type 'string'.
+tests/cases/conformance/types/rest/objectRestNegative.ts(9,31): error TS2462: A rest element must be last in a destructuring pattern
+tests/cases/conformance/types/rest/objectRestNegative.ts(12,17): error TS2700: Rest types may only be created from object types.
+tests/cases/conformance/types/rest/objectRestNegative.ts(17,9): error TS2701: The target of an object rest assignment must be a variable or a property access.
 
 
-==== tests/cases/conformance/types/rest/objectRestNegative.ts (4 errors) ====
+==== tests/cases/conformance/types/rest/objectRestNegative.ts (5 errors) ====
     let o = { a: 1, b: 'no' };
     var { ...mustBeLast, a } = o;
              ~~~~~~~~~~
 !!! error TS2462: A rest element must be last in a destructuring pattern
+    
+    var b: string;
+    let notAssignable: { a: string };
+    ({ b, ...notAssignable } = o);
+             ~~~~~~~~~~~~~
+!!! error TS2322: Type '{ a: number; }' is not assignable to type '{ a: string; }'.
+!!! error TS2322:   Types of property 'a' are incompatible.
+!!! error TS2322:     Type 'number' is not assignable to type 'string'.
+    
+    
     function stillMustBeLast({ ...mustBeLast, a }: { a: number, b: string }): void {
                                   ~~~~~~~~~~
 !!! error TS2462: A rest element must be last in a destructuring pattern
diff --git a/tests/baselines/reference/objectRestNegative.js b/tests/baselines/reference/objectRestNegative.js
index a2da998cf8a..f8c5b72ada5 100644
--- a/tests/baselines/reference/objectRestNegative.js
+++ b/tests/baselines/reference/objectRestNegative.js
@@ -1,6 +1,12 @@
 //// [objectRestNegative.ts]
 let o = { a: 1, b: 'no' };
 var { ...mustBeLast, a } = o;
+
+var b: string;
+let notAssignable: { a: string };
+({ b, ...notAssignable } = o);
+
+
 function stillMustBeLast({ ...mustBeLast, a }: { a: number, b: string }): void {
 }
 function generic<T extends { x, y }>(t: T) {
@@ -24,6 +30,9 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 var o = { a: 1, b: 'no' };
 var a = o.a;
+var b;
+var notAssignable;
+(b = o.b, o, notAssignable = __rest(o, ["b"]));
 function stillMustBeLast(_a) {
     var a = _a.a;
 }
diff --git a/tests/baselines/reference/objectSpreadNoTransform.js b/tests/baselines/reference/objectSpreadNoTransform.js
index 3442d086409..5ad9c01e599 100644
--- a/tests/baselines/reference/objectSpreadNoTransform.js
+++ b/tests/baselines/reference/objectSpreadNoTransform.js
@@ -2,7 +2,7 @@
 const y = { a: 'yes', b: 'no' };
 const o = { x: 1, ...y };
 var b;
-var rest;
+var rest: any;
 ({ b, ...rest } = o);
 
 
diff --git a/tests/baselines/reference/objectSpreadNoTransform.symbols b/tests/baselines/reference/objectSpreadNoTransform.symbols
index 78423330dbb..b2062697cdd 100644
--- a/tests/baselines/reference/objectSpreadNoTransform.symbols
+++ b/tests/baselines/reference/objectSpreadNoTransform.symbols
@@ -12,7 +12,7 @@ const o = { x: 1, ...y };
 var b;
 >b : Symbol(b, Decl(objectSpreadNoTransform.ts, 2, 3))
 
-var rest;
+var rest: any;
 >rest : Symbol(rest, Decl(objectSpreadNoTransform.ts, 3, 3))
 
 ({ b, ...rest } = o);
diff --git a/tests/baselines/reference/objectSpreadNoTransform.types b/tests/baselines/reference/objectSpreadNoTransform.types
index ae89a3a7993..bb09fd418c2 100644
--- a/tests/baselines/reference/objectSpreadNoTransform.types
+++ b/tests/baselines/reference/objectSpreadNoTransform.types
@@ -17,7 +17,7 @@ const o = { x: 1, ...y };
 var b;
 >b : any
 
-var rest;
+var rest: any;
 >rest : any
 
 ({ b, ...rest } = o);
@@ -25,6 +25,6 @@ var rest;
 >{ b, ...rest } = o : { a: string; b: string; x: number; }
 >{ b, ...rest } : any
 >b : any
->rest : undefined
+>rest : any
 >o : { a: string; b: string; x: number; }
 
diff --git a/tests/cases/conformance/types/rest/objectRestNegative.ts b/tests/cases/conformance/types/rest/objectRestNegative.ts
index 75cbe9a55e4..c224c8cd30e 100644
--- a/tests/cases/conformance/types/rest/objectRestNegative.ts
+++ b/tests/cases/conformance/types/rest/objectRestNegative.ts
@@ -1,5 +1,11 @@
 let o = { a: 1, b: 'no' };
 var { ...mustBeLast, a } = o;
+
+var b: string;
+let notAssignable: { a: string };
+({ b, ...notAssignable } = o);
+
+
 function stillMustBeLast({ ...mustBeLast, a }: { a: number, b: string }): void {
 }
 function generic<T extends { x, y }>(t: T) {
diff --git a/tests/cases/conformance/types/spread/objectSpreadNoTransform.ts b/tests/cases/conformance/types/spread/objectSpreadNoTransform.ts
index 36c75e70887..86bcb7eeee5 100644
--- a/tests/cases/conformance/types/spread/objectSpreadNoTransform.ts
+++ b/tests/cases/conformance/types/spread/objectSpreadNoTransform.ts
@@ -2,5 +2,5 @@
 const y = { a: 'yes', b: 'no' };
 const o = { x: 1, ...y };
 var b;
-var rest;
+var rest: any;
 ({ b, ...rest } = o);

From 074014e03989edf37bbf270e26846fca88da1aee Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 16 Nov 2016 13:39:00 -0800
Subject: [PATCH 266/421] Check assignability: rest destructuring assignment

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 7132aedb324..b2555b7d21d 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -14188,12 +14188,13 @@ namespace ts {
         function checkObjectLiteralAssignment(node: ObjectLiteralExpression, sourceType: Type): Type {
             const properties = node.properties;
             for (const p of properties) {
-                checkObjectLiteralDestructuringPropertyAssignment(sourceType, p);
+                checkObjectLiteralDestructuringPropertyAssignment(sourceType, p, properties);
             }
             return sourceType;
         }
 
-        function checkObjectLiteralDestructuringPropertyAssignment(objectLiteralType: Type, property: ObjectLiteralElementLike) {
+        /** Note: If property cannot be a SpreadAssignment, then allProperties does not need to be provided */
+        function checkObjectLiteralDestructuringPropertyAssignment(objectLiteralType: Type, property: ObjectLiteralElementLike, allProperties?: ObjectLiteralElementLike[]) {
             if (property.kind === SyntaxKind.PropertyAssignment || property.kind === SyntaxKind.ShorthandPropertyAssignment) {
                 const name = <PropertyName>(<PropertyAssignment>property).name;
                 if (name.kind === SyntaxKind.ComputedPropertyName) {
@@ -14223,7 +14224,14 @@ namespace ts {
                 }
             }
             else if (property.kind === SyntaxKind.SpreadAssignment) {
-                checkReferenceExpression(property.expression, Diagnostics.The_target_of_an_object_rest_assignment_must_be_a_variable_or_a_property_access);
+                const nonRestNames: PropertyName[] = [];
+                if (allProperties) {
+                    for (let i = 0; i < allProperties.length - 1; i++) {
+                        nonRestNames.push(allProperties[i].name);
+                    }
+                }
+                const type = getRestType(objectLiteralType, nonRestNames, objectLiteralType.symbol);
+                return checkDestructuringAssignment(property.expression, type);
             }
             else {
                 error(property, Diagnostics.Property_assignment_expected);
@@ -14321,7 +14329,10 @@ namespace ts {
 
         function checkReferenceAssignment(target: Expression, sourceType: Type, contextualMapper?: TypeMapper): Type {
             const targetType = checkExpression(target, contextualMapper);
-            if (checkReferenceExpression(target, Diagnostics.The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access)) {
+            const error = target.parent.kind === SyntaxKind.SpreadAssignment ?
+                Diagnostics.The_target_of_an_object_rest_assignment_must_be_a_variable_or_a_property_access :
+                Diagnostics.The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access;
+            if (checkReferenceExpression(target, error)) {
                 checkTypeAssignableTo(sourceType, targetType, target, /*headMessage*/ undefined);
             }
             return sourceType;

From 6f409b580e7ee65c90b1a825e98a21acb59c0909 Mon Sep 17 00:00:00 2001
From: Zhengbo Li <zhengbli@microsoft.com>
Date: Wed, 16 Nov 2016 14:13:29 -0800
Subject: [PATCH 267/421] Fix grammar issue (#12096)

* Fix grammar issue

* Improve the error message

* cr feedback
---
 src/compiler/commandLineParser.ts               | 2 +-
 src/compiler/diagnosticMessages.json            | 2 +-
 src/harness/unittests/configurationExtension.ts | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index df9c3c4abdd..26877de43c4 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -884,7 +884,7 @@ namespace ts {
         function tryExtendsName(extendedConfig: string): [string[], string[], string[], CompilerOptions] {
             // If the path isn't a rooted or relative path, don't try to resolve it (we reserve the right to special case module-id like paths in the future)
             if (!(isRootedDiskPath(extendedConfig) || startsWith(normalizeSlashes(extendedConfig), "./") || startsWith(normalizeSlashes(extendedConfig), "../"))) {
-                errors.push(createCompilerDiagnostic(Diagnostics.The_path_in_an_extends_options_must_be_relative_or_rooted));
+                errors.push(createCompilerDiagnostic(Diagnostics.A_path_in_an_extends_option_must_be_relative_or_rooted_but_0_is_not, extendedConfig));
                 return;
             }
             let extendedConfigPath = toPath(extendedConfig, basePath, getCanonicalFileName);
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index a163a3bb641..68fe659e81f 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -3142,7 +3142,7 @@
         "category": "Error",
         "code": 18000
     },
-    "The path in an 'extends' options must be relative or rooted.": {
+    "A path in an 'extends' option must be relative or rooted, but '{0}' is not.": {
         "category": "Error",
         "code": 18001
     },
diff --git a/src/harness/unittests/configurationExtension.ts b/src/harness/unittests/configurationExtension.ts
index 4537dc77576..8e845925eb2 100644
--- a/src/harness/unittests/configurationExtension.ts
+++ b/src/harness/unittests/configurationExtension.ts
@@ -179,7 +179,7 @@ namespace ts {
                 testFailure("can error when 'extends' is neither relative nor rooted.", "extends2.json", [{
                     code: 18001,
                     category: DiagnosticCategory.Error,
-                    messageText: `The path in an 'extends' options must be relative or rooted.`
+                    messageText: `A path in an 'extends' option must be relative or rooted, but 'configs/base' is not.`
                 }]);
             });
         });

From c7b0083820740b3078b1ce5503dee06099eba5eb Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 16 Nov 2016 15:15:30 -0800
Subject: [PATCH 268/421] Test widen literal types of parameter properties

---
 ...alTypesWidenInParameterPosition.errors.txt | 15 ++++++++++++
 .../literalTypesWidenInParameterPosition.js   | 23 +++++++++++++++++++
 .../literalTypesWidenInParameterPosition.ts   |  8 +++++++
 3 files changed, 46 insertions(+)
 create mode 100644 tests/baselines/reference/literalTypesWidenInParameterPosition.errors.txt
 create mode 100644 tests/baselines/reference/literalTypesWidenInParameterPosition.js
 create mode 100644 tests/cases/conformance/types/literal/literalTypesWidenInParameterPosition.ts

diff --git a/tests/baselines/reference/literalTypesWidenInParameterPosition.errors.txt b/tests/baselines/reference/literalTypesWidenInParameterPosition.errors.txt
new file mode 100644
index 00000000000..69d7196b978
--- /dev/null
+++ b/tests/baselines/reference/literalTypesWidenInParameterPosition.errors.txt
@@ -0,0 +1,15 @@
+tests/cases/conformance/types/literal/literalTypesWidenInParameterPosition.ts(4,9): error TS2322: Type '5' is not assignable to type '1'.
+
+
+==== tests/cases/conformance/types/literal/literalTypesWidenInParameterPosition.ts (1 errors) ====
+    class D {
+        readonly noWiden = 1
+        constructor(readonly widen = 2) {
+            this.noWiden = 5; // error
+            ~~~~~~~~~~~~
+!!! error TS2322: Type '5' is not assignable to type '1'.
+            this.widen = 6; // ok
+        }
+    }
+    new D(7); // ok
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/literalTypesWidenInParameterPosition.js b/tests/baselines/reference/literalTypesWidenInParameterPosition.js
new file mode 100644
index 00000000000..2c1d165b6ec
--- /dev/null
+++ b/tests/baselines/reference/literalTypesWidenInParameterPosition.js
@@ -0,0 +1,23 @@
+//// [literalTypesWidenInParameterPosition.ts]
+class D {
+    readonly noWiden = 1
+    constructor(readonly widen = 2) {
+        this.noWiden = 5; // error
+        this.widen = 6; // ok
+    }
+}
+new D(7); // ok
+
+
+//// [literalTypesWidenInParameterPosition.js]
+var D = (function () {
+    function D(widen) {
+        if (widen === void 0) { widen = 2; }
+        this.widen = widen;
+        this.noWiden = 1;
+        this.noWiden = 5; // error
+        this.widen = 6; // ok
+    }
+    return D;
+}());
+new D(7); // ok
diff --git a/tests/cases/conformance/types/literal/literalTypesWidenInParameterPosition.ts b/tests/cases/conformance/types/literal/literalTypesWidenInParameterPosition.ts
new file mode 100644
index 00000000000..f1d0a9b428a
--- /dev/null
+++ b/tests/cases/conformance/types/literal/literalTypesWidenInParameterPosition.ts
@@ -0,0 +1,8 @@
+class D {
+    readonly noWiden = 1
+    constructor(readonly widen = 2) {
+        this.noWiden = 5; // error
+        this.widen = 6; // ok
+    }
+}
+new D(7); // ok

From 5dbe5f4fbdb7c91598441bffdee7577a71471c2c Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 16 Nov 2016 15:24:42 -0800
Subject: [PATCH 269/421] Widen literal types of parameter properties

---
 src/compiler/checker.ts   | 2 +-
 src/compiler/utilities.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 7132aedb324..b466bf7afb6 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -14744,7 +14744,7 @@ namespace ts {
         function checkDeclarationInitializer(declaration: VariableLikeDeclaration) {
             const type = checkExpressionCached(declaration.initializer);
             return getCombinedNodeFlags(declaration) & NodeFlags.Const ||
-                getCombinedModifierFlags(declaration) & ModifierFlags.Readonly ||
+                getCombinedModifierFlags(declaration) & ModifierFlags.Readonly && !isParameterPropertyDeclaration(declaration) ||
                 isTypeAssertion(declaration.initializer) ? type : getWidenedLiteralType(type);
         }
 
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index bfabb3b1e4a..546416884f1 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -4497,7 +4497,7 @@ namespace ts {
         }
     }
 
-    export function isParameterPropertyDeclaration(node: ParameterDeclaration): boolean {
+    export function isParameterPropertyDeclaration(node: Node): boolean {
         return hasModifier(node, ModifierFlags.ParameterPropertyModifier) && node.parent.kind === SyntaxKind.Constructor && isClassLike(node.parent.parent);
     }
 

From 52ec508e27fccd8a1d7c601918b70417086b9798 Mon Sep 17 00:00:00 2001
From: Paul van Brenk <paul.van.brenk@outlook.com>
Date: Wed, 16 Nov 2016 16:01:16 -0800
Subject: [PATCH 270/421] Code fix for missing imports (#11768)

* Add codefix for missing imports + tests

* Re-order and cleanup

* refactor

* make tests pass

* Make import specifier for new imports more comprehensive

* Fix existing import cases

* refactor

* Fix multiple import statement case

* add multiple code fixes and code action filtering and polishing

* not using the generic verify method for import fixes.

* Correct insert position for new imports

* improve the code action filtering logic

* Fix line ending issue

* cache where we can
---
 src/compiler/checker.ts                       |   9 +-
 src/compiler/core.ts                          |   8 +
 src/compiler/diagnosticMessages.json          |  12 +
 src/compiler/moduleNameResolver.ts            |   2 +-
 src/compiler/types.ts                         |   4 +-
 src/harness/fourslash.ts                      |  38 +-
 src/services/codefixes/codeFixProvider.ts     |   4 +-
 src/services/codefixes/fixes.ts               |   3 +-
 src/services/codefixes/importFixes.ts         | 591 ++++++++++++++++++
 src/services/services.ts                      |  23 +-
 src/services/types.ts                         |   1 +
 tests/cases/fourslash/fourslash.ts            |   1 +
 .../importNameCodeFixExistingImport0.ts       |  10 +
 .../importNameCodeFixExistingImport1.ts       |  11 +
 .../importNameCodeFixExistingImport10.ts      |  21 +
 .../importNameCodeFixExistingImport11.ts      |  20 +
 .../importNameCodeFixExistingImport12.ts      |  12 +
 .../importNameCodeFixExistingImport2.ts       |  16 +
 .../importNameCodeFixExistingImport3.ts       |  18 +
 .../importNameCodeFixExistingImport4.ts       |  14 +
 .../importNameCodeFixExistingImport5.ts       |  12 +
 .../importNameCodeFixExistingImport6.ts       |  13 +
 .../importNameCodeFixExistingImport7.ts       |  10 +
 .../importNameCodeFixExistingImport8.ts       |  12 +
 .../importNameCodeFixExistingImport9.ts       |  17 +
 .../importNameCodeFixExistingImportEquals0.ts |  18 +
 .../importNameCodeFixNewImportAmbient0.ts     |  15 +
 .../importNameCodeFixNewImportAmbient1.ts     |  28 +
 .../importNameCodeFixNewImportAmbient2.ts     |  21 +
 .../importNameCodeFixNewImportAmbient3.ts     |  30 +
 .../importNameCodeFixNewImportBaseUrl0.ts     |  19 +
 .../importNameCodeFixNewImportDefault0.ts     |  12 +
 .../importNameCodeFixNewImportFile0.ts        |  13 +
 .../importNameCodeFixNewImportFile1.ts        |  18 +
 .../importNameCodeFixNewImportFile2.ts        |  13 +
 .../importNameCodeFixNewImportNodeModules0.ts |  19 +
 .../importNameCodeFixNewImportNodeModules1.ts |  16 +
 .../importNameCodeFixNewImportNodeModules2.ts |  25 +
 .../importNameCodeFixNewImportNodeModules3.ts |  14 +
 .../importNameCodeFixNewImportPaths0.ts       |  22 +
 .../importNameCodeFixNewImportPaths1.ts       |  22 +
 .../importNameCodeFixNewImportRootDirs0.ts    |  23 +
 .../importNameCodeFixNewImportTypeRoots0.ts   |  22 +
 .../importNameCodeFixOptionalImport0.ts       |  20 +
 .../importNameCodeFixOptionalImport1.ts       |  20 +
 tests/cases/fourslash/server/codefix.ts       |   2 +-
 46 files changed, 1265 insertions(+), 9 deletions(-)
 create mode 100644 src/services/codefixes/importFixes.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixExistingImport0.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixExistingImport1.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixExistingImport10.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixExistingImport11.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixExistingImport12.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixExistingImport2.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixExistingImport3.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixExistingImport4.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixExistingImport5.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixExistingImport6.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixExistingImport7.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixExistingImport8.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixExistingImport9.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixExistingImportEquals0.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixNewImportAmbient0.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixNewImportAmbient1.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixNewImportAmbient2.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixNewImportAmbient3.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixNewImportBaseUrl0.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixNewImportDefault0.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixNewImportFile0.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixNewImportFile1.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixNewImportFile2.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixNewImportNodeModules0.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixNewImportNodeModules1.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixNewImportNodeModules2.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixNewImportNodeModules3.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixNewImportPaths0.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixNewImportPaths1.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixNewImportRootDirs0.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixNewImportTypeRoots0.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixOptionalImport0.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixOptionalImport1.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index b466bf7afb6..3d25fc8bbbb 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -104,10 +104,10 @@ namespace ts {
             getEmitResolver,
             getExportsOfModule: getExportsOfModuleAsArray,
             getAmbientModules,
-
             getJsxElementAttributesType,
             getJsxIntrinsicTagNames,
             isOptionalParameter,
+            tryGetMemberInModuleExports,
             tryFindAmbientModuleWithoutAugmentations: moduleName => {
                 // we deliberately exclude augmentations
                 // since we are only interested in declarations of the module itself
@@ -1483,6 +1483,13 @@ namespace ts {
             return symbolsToArray(getExportsOfModule(moduleSymbol));
         }
 
+        function tryGetMemberInModuleExports(memberName: string, moduleSymbol: Symbol): Symbol | undefined {
+            const symbolTable = getExportsOfModule(moduleSymbol);
+            if (symbolTable) {
+                return symbolTable[memberName];
+            }
+        }
+
         function getExportsOfSymbol(symbol: Symbol): SymbolTable {
             return symbol.flags & SymbolFlags.Module ? getExportsOfModule(symbol) : symbol.exports || emptySymbols;
         }
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index 10509309e80..89057dd2939 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -1391,6 +1391,14 @@ namespace ts {
             getEmitScriptTarget(compilerOptions) >= ScriptTarget.ES2015 ? ModuleKind.ES2015 : ModuleKind.CommonJS;
     }
 
+    export function getEmitModuleResolutionKind(compilerOptions: CompilerOptions) {
+        let moduleResolution = compilerOptions.moduleResolution;
+        if (moduleResolution === undefined) {
+            moduleResolution = getEmitModuleKind(compilerOptions) === ModuleKind.CommonJS ? ModuleResolutionKind.NodeJs : ModuleResolutionKind.Classic;
+        }
+        return moduleResolution;
+    }
+
     /* @internal */
     export function hasZeroOrOneAsteriskCharacter(str: string): boolean {
         let seenAsterisk = false;
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 68fe659e81f..2dd4e76f8f4 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -3190,5 +3190,17 @@
     "Type '{0}' is not assignable to type '{1}'. Two different types with this name exist, but they are unrelated.": {
         "category": "Error",
         "code": 90010
+    },
+    "Import {0} from {1}": {
+        "category": "Message",
+        "code": 90013
+    },
+    "Change {0} to {1}": {
+        "category": "Message",
+        "code": 90014
+    },
+    "Add {0} to existing import declaration from {1}": {
+        "category": "Message",
+        "code": 90015
     }
 }
diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
index 2d7f1277776..0daca9156d1 100644
--- a/src/compiler/moduleNameResolver.ts
+++ b/src/compiler/moduleNameResolver.ts
@@ -61,7 +61,7 @@ namespace ts {
         return { resolvedModule: resolved && resolvedModuleFromResolved(resolved, isExternalLibraryImport), failedLookupLocations };
     }
 
-    function moduleHasNonRelativeName(moduleName: string): boolean {
+    export function moduleHasNonRelativeName(moduleName: string): boolean {
         return !(isRootedDiskPath(moduleName) || isExternalModuleNameRelative(moduleName));
     }
 
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index af46cb2173c..b5e3eefbb2d 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -2371,6 +2371,8 @@ namespace ts {
         isOptionalParameter(node: ParameterDeclaration): boolean;
         getAmbientModules(): Symbol[];
 
+        tryGetMemberInModuleExports(memberName: string, moduleSymbol: Symbol): Symbol | undefined;
+
         /* @internal */ tryFindAmbientModuleWithoutAugmentations(moduleName: string): Symbol;
 
         // Should not be called directly.  Should only be accessed through the Program instance.
@@ -3190,7 +3192,7 @@ namespace ts {
         target?: ScriptTarget;
         traceResolution?: boolean;
         types?: string[];
-        /** Paths used to used to compute primary types search locations */
+        /** Paths used to compute primary types search locations */
         typeRoots?: string[];
         /*@internal*/ version?: boolean;
         /*@internal*/ watch?: boolean;
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
index f4fc7b8f009..1486ea2253f 100644
--- a/src/harness/fourslash.ts
+++ b/src/harness/fourslash.ts
@@ -2046,6 +2046,34 @@ namespace FourSlash {
             }
         }
 
+        public verifyImportFixAtPosition(expectedTextArray: string[], errorCode?: number) {
+            const ranges = this.getRanges();
+            if (ranges.length == 0) {
+                this.raiseError("At least one range should be specified in the testfile.");
+            }
+
+            const codeFixes = this.getCodeFixes(errorCode);
+
+            if (!codeFixes || codeFixes.length == 0) {
+                this.raiseError("No codefixes returned.");
+            }
+
+            const actualTextArray: string[] = [];
+            const scriptInfo = this.languageServiceAdapterHost.getScriptInfo(codeFixes[0].changes[0].fileName);
+            const originalContent = scriptInfo.content;
+            for (const codeFix of codeFixes) {
+                this.applyEdits(codeFix.changes[0].fileName, codeFix.changes[0].textChanges, /*isFormattingEdit*/ false);
+                actualTextArray.push(this.normalizeNewlines(this.rangeText(ranges[0])));
+                scriptInfo.updateContent(originalContent);
+            }
+            const sortedExpectedArray = ts.map(expectedTextArray, str => this.normalizeNewlines(str)).sort();
+            const sortedActualArray = actualTextArray.sort();
+            if (!ts.arrayIsEqualTo(sortedExpectedArray, sortedActualArray)) {
+                this.raiseError(
+                    `Actual text array doesn't match expected text array. \nActual: \n"${sortedActualArray.join("\n\n")}"\n---\nExpected: \n'${sortedExpectedArray.join("\n\n")}'`);
+            }
+        }
+
         public verifyDocCommentTemplate(expected?: ts.TextInsertion) {
             const name = "verifyDocCommentTemplate";
             const actual = this.languageService.getDocCommentTemplateAtPosition(this.activeFile.fileName, this.currentCaretPosition);
@@ -2079,6 +2107,10 @@ namespace FourSlash {
             });
         }
 
+        private normalizeNewlines(str: string) {
+            return str.replace(/\r?\n/g, "\n");
+        }
+
         public verifyBraceCompletionAtPosition(negative: boolean, openingBrace: string) {
 
             const openBraceMap = ts.createMap<ts.CharacterCodes>({
@@ -2606,7 +2638,7 @@ ${code}
                                 resetLocalData();
                             }
 
-                            currentFileName = basePath + "/" + value;
+                            currentFileName = ts.isRootedDiskPath(value) ? value : basePath + "/" + value;
                             currentFileOptions[key] = value;
                         }
                         else {
@@ -3303,6 +3335,10 @@ namespace FourSlashInterface {
             this.state.verifyCodeFixAtPosition(expectedText, errorCode);
         }
 
+        public importFixAtPosition(expectedTextArray: string[], errorCode?: number): void {
+            this.state.verifyImportFixAtPosition(expectedTextArray, errorCode);
+        }
+
         public navigationBar(json: any) {
             this.state.verifyNavigationBar(json);
         }
diff --git a/src/services/codefixes/codeFixProvider.ts b/src/services/codefixes/codeFixProvider.ts
index c61cbe1b19e..e4489fc2dca 100644
--- a/src/services/codefixes/codeFixProvider.ts
+++ b/src/services/codefixes/codeFixProvider.ts
@@ -1,4 +1,4 @@
-/* @internal */
+/* @internal */
 namespace ts {
     export interface CodeFix {
         errorCodes: number[];
@@ -11,6 +11,8 @@ namespace ts {
         span: TextSpan;
         program: Program;
         newLineCharacter: string;
+        host: LanguageServiceHost;
+        cancellationToken: CancellationToken;
     }
 
     export namespace codefix {
diff --git a/src/services/codefixes/fixes.ts b/src/services/codefixes/fixes.ts
index ae13a965838..a38b196cb00 100644
--- a/src/services/codefixes/fixes.ts
+++ b/src/services/codefixes/fixes.ts
@@ -1,2 +1,3 @@
 ///<reference path='superFixes.ts' />
-///<reference path='unusedIdentifierFixes.ts' />
\ No newline at end of file
+///<reference path='importFixes.ts' />
+///<reference path='unusedIdentifierFixes.ts' />
diff --git a/src/services/codefixes/importFixes.ts b/src/services/codefixes/importFixes.ts
new file mode 100644
index 00000000000..4adda19689d
--- /dev/null
+++ b/src/services/codefixes/importFixes.ts
@@ -0,0 +1,591 @@
+/* @internal */
+namespace ts.codefix {
+
+    type ImportCodeActionKind = "CodeChange" | "InsertingIntoExistingImport" | "NewImport";
+    interface ImportCodeAction extends CodeAction {
+        kind: ImportCodeActionKind,
+        moduleSpecifier?: string
+    }
+
+    enum ModuleSpecifierComparison {
+        Better,
+        Equal,
+        Worse
+    }
+
+    class ImportCodeActionMap {
+        private symbolIdToActionMap = createMap<ImportCodeAction[]>();
+
+        addAction(symbolId: number, newAction: ImportCodeAction) {
+            if (!newAction) {
+                return;
+            }
+
+            if (!this.symbolIdToActionMap[symbolId]) {
+                this.symbolIdToActionMap[symbolId] = [newAction];
+                return;
+            }
+
+            if (newAction.kind === "CodeChange") {
+                this.symbolIdToActionMap[symbolId].push(newAction);
+                return;
+            }
+
+            const updatedNewImports: ImportCodeAction[] = [];
+            for (const existingAction of this.symbolIdToActionMap[symbolId]) {
+                if (existingAction.kind === "CodeChange") {
+                    // only import actions should compare
+                    updatedNewImports.push(existingAction);
+                    continue;
+                }
+
+                switch (this.compareModuleSpecifiers(existingAction.moduleSpecifier, newAction.moduleSpecifier)) {
+                    case ModuleSpecifierComparison.Better:
+                        // the new one is not worth considering if it is a new improt.
+                        // However if it is instead a insertion into existing import, the user might want to use
+                        // the module specifier even it is worse by our standards. So keep it.
+                        if (newAction.kind === "NewImport") {
+                            return;
+                        }
+                    case ModuleSpecifierComparison.Equal:
+                        // the current one is safe. But it is still possible that the new one is worse
+                        // than another existing one. For example, you may have new imports from "./foo/bar"
+                        // and "bar", when the new one is "bar/bar2" and the current one is "./foo/bar". The new
+                        // one and the current one are not comparable (one relative path and one absolute path),
+                        // but the new one is worse than the other one, so should not add to the list.  
+                        updatedNewImports.push(existingAction);
+                        break;
+                    case ModuleSpecifierComparison.Worse:
+                        // the existing one is worse, remove from the list.
+                        continue;
+                }
+            }
+            // if we reach here, it means the new one is better or equal to all of the existing ones.
+            updatedNewImports.push(newAction);
+            this.symbolIdToActionMap[symbolId] = updatedNewImports;
+        }
+
+        addActions(symbolId: number, newActions: ImportCodeAction[]) {
+            for (const newAction of newActions) {
+                this.addAction(symbolId, newAction);
+            }
+        }
+
+        getAllActions() {
+            let result: ImportCodeAction[] = [];
+            for (const symbolId in this.symbolIdToActionMap) {
+                result = concatenate(result, this.symbolIdToActionMap[symbolId]);
+            }
+            return result;
+        }
+
+        private compareModuleSpecifiers(moduleSpecifier1: string, moduleSpecifier2: string): ModuleSpecifierComparison {
+            if (moduleSpecifier1 === moduleSpecifier2) {
+                return ModuleSpecifierComparison.Equal;
+            }
+
+            // if moduleSpecifier1 (ms1) is a substring of ms2, then it is better
+            if (moduleSpecifier2.indexOf(moduleSpecifier1) === 0) {
+                return ModuleSpecifierComparison.Better;
+            }
+
+            if (moduleSpecifier1.indexOf(moduleSpecifier2) === 0) {
+                return ModuleSpecifierComparison.Worse;
+            }
+
+            // if both are relative paths, and ms1 has fewer levels, then it is better
+            if (isExternalModuleNameRelative(moduleSpecifier1) && isExternalModuleNameRelative(moduleSpecifier2)) {
+                const regex = new RegExp(directorySeparator, "g");
+                const moduleSpecifier1LevelCount = (moduleSpecifier1.match(regex) || []).length;
+                const moduleSpecifier2LevelCount = (moduleSpecifier2.match(regex) || []).length;
+
+                return moduleSpecifier1LevelCount < moduleSpecifier2LevelCount
+                    ? ModuleSpecifierComparison.Better
+                    : moduleSpecifier1LevelCount === moduleSpecifier2LevelCount
+                        ? ModuleSpecifierComparison.Equal
+                        : ModuleSpecifierComparison.Worse;
+            }
+
+            // the equal cases include when the two specifiers are not comparable.
+            return ModuleSpecifierComparison.Equal;
+        }
+    }
+
+    registerCodeFix({
+        errorCodes: [Diagnostics.Cannot_find_name_0.code],
+        getCodeActions: (context: CodeFixContext) => {
+            const sourceFile = context.sourceFile;
+            const checker = context.program.getTypeChecker();
+            const allSourceFiles = context.program.getSourceFiles();
+            const useCaseSensitiveFileNames = context.host.useCaseSensitiveFileNames ? context.host.useCaseSensitiveFileNames() : false;
+
+            const token = getTokenAtPosition(sourceFile, context.span.start);
+            const name = token.getText();
+            const symbolIdActionMap = new ImportCodeActionMap();
+
+            // this is a module id -> module import declaration map
+            const cachedImportDeclarations = createMap<(ImportDeclaration | ImportEqualsDeclaration)[]>();
+            let cachedNewImportInsertPosition: number;
+
+            const allPotentialModules = checker.getAmbientModules();
+            for (const otherSourceFile of allSourceFiles) {
+                if (otherSourceFile !== sourceFile && isExternalOrCommonJsModule(otherSourceFile)) {
+                    allPotentialModules.push(otherSourceFile.symbol);
+                }
+            }
+
+            const currentTokenMeaning = getMeaningFromLocation(token);
+            for (const moduleSymbol of allPotentialModules) {
+                context.cancellationToken.throwIfCancellationRequested();
+
+                // check the default export
+                const defaultExport = checker.tryGetMemberInModuleExports("default", moduleSymbol);
+                if (defaultExport) {
+                    const localSymbol = getLocalSymbolForExportDefault(defaultExport);
+                    if (localSymbol && localSymbol.name === name && checkSymbolHasMeaning(localSymbol, currentTokenMeaning)) {
+                        // check if this symbol is already used
+                        const symbolId = getUniqueSymbolId(localSymbol);
+                        symbolIdActionMap.addActions(symbolId, getCodeActionForImport(moduleSymbol, /*isDefaultExport*/ true));
+                    }
+                }
+
+                // check exports with the same name
+                const exportSymbolWithIdenticalName = checker.tryGetMemberInModuleExports(name, moduleSymbol);
+                if (exportSymbolWithIdenticalName && checkSymbolHasMeaning(exportSymbolWithIdenticalName, currentTokenMeaning)) {
+                    const symbolId = getUniqueSymbolId(exportSymbolWithIdenticalName);
+                    symbolIdActionMap.addActions(symbolId, getCodeActionForImport(moduleSymbol));
+                }
+            }
+
+            return symbolIdActionMap.getAllActions();
+
+            function getImportDeclarations(moduleSymbol: Symbol) {
+                const moduleSymbolId = getUniqueSymbolId(moduleSymbol);
+
+                if (cachedImportDeclarations[moduleSymbolId]) {
+                    return cachedImportDeclarations[moduleSymbolId];
+                }
+
+                const existingDeclarations: (ImportDeclaration | ImportEqualsDeclaration)[] = [];
+                for (const importModuleSpecifier of sourceFile.imports) {
+                    const importSymbol = checker.getSymbolAtLocation(importModuleSpecifier);
+                    if (importSymbol === moduleSymbol) {
+                        existingDeclarations.push(getImportDeclaration(importModuleSpecifier));
+                    }
+                }
+                cachedImportDeclarations[moduleSymbolId] = existingDeclarations;
+                return existingDeclarations;
+
+                function getImportDeclaration(moduleSpecifier: LiteralExpression) {
+                    let node: Node = moduleSpecifier;
+                    while (node) {
+                        if (node.kind === SyntaxKind.ImportDeclaration) {
+                            return <ImportDeclaration>node;
+                        }
+                        if (node.kind === SyntaxKind.ImportEqualsDeclaration) {
+                            return <ImportEqualsDeclaration>node;
+                        }
+                        node = node.parent;
+                    }
+                    return undefined;
+                }
+            }
+
+            function getUniqueSymbolId(symbol: Symbol) {
+                if (symbol.flags & SymbolFlags.Alias) {
+                    return getSymbolId(checker.getAliasedSymbol(symbol));
+                }
+                return getSymbolId(symbol);
+            }
+
+            function checkSymbolHasMeaning(symbol: Symbol, meaning: SemanticMeaning) {
+                const declarations = symbol.getDeclarations();
+                return declarations ? some(symbol.declarations, decl => !!(getMeaningFromDeclaration(decl) & meaning)) : false;
+            }
+
+            function getCodeActionForImport(moduleSymbol: Symbol, isDefault?: boolean): ImportCodeAction[] {
+                const existingDeclarations = getImportDeclarations(moduleSymbol);
+                if (existingDeclarations.length > 0) {
+                    // With an existing import statement, there are more than one actions the user can do.
+                    return getCodeActionsForExistingImport(existingDeclarations);
+                }
+                else {
+                    return [getCodeActionForNewImport()];
+                }
+
+
+
+                function getCodeActionsForExistingImport(declarations: (ImportDeclaration | ImportEqualsDeclaration)[]): ImportCodeAction[] {
+                    const actions: ImportCodeAction[] = [];
+
+                    // It is possible that multiple import statements with the same specifier exist in the file.
+                    // e.g.
+                    //
+                    //     import * as ns from "foo";
+                    //     import { member1, member2 } from "foo";
+                    //
+                    //     member3/**/ <-- cusor here
+                    //
+                    // in this case we should provie 2 actions:
+                    //     1. change "member3" to "ns.member3"
+                    //     2. add "member3" to the second import statement's import list
+                    // and it is up to the user to decide which one fits best.
+                    let namespaceImportDeclaration: ImportDeclaration | ImportEqualsDeclaration;
+                    let namedImportDeclaration: ImportDeclaration;
+                    let existingModuleSpecifier: string;
+                    for (const declaration of declarations) {
+                        if (declaration.kind === SyntaxKind.ImportDeclaration) {
+                            const namedBindings = declaration.importClause && declaration.importClause.namedBindings;
+                            if (namedBindings && namedBindings.kind === SyntaxKind.NamespaceImport) {
+                                // case:
+                                // import * as ns from "foo"
+                                namespaceImportDeclaration = declaration;
+                            }
+                            else {
+                                // cases:
+                                // import default from "foo"
+                                // import { bar } from "foo" or combination with the first one
+                                // import "foo"
+                                namedImportDeclaration = declaration;
+                            }
+                            existingModuleSpecifier = declaration.moduleSpecifier.getText();
+                        }
+                        else {
+                            // case:
+                            // import foo = require("foo")
+                            namespaceImportDeclaration = declaration;
+                            existingModuleSpecifier = getModuleSpecifierFromImportEqualsDeclaration(declaration);
+                        }
+                    }
+
+                    if (namespaceImportDeclaration) {
+                        actions.push(getCodeActionForNamespaceImport(namespaceImportDeclaration));
+                    }
+
+                    if (namedImportDeclaration && namedImportDeclaration.importClause &&
+                        (namedImportDeclaration.importClause.name || namedImportDeclaration.importClause.namedBindings)) {
+                        /**
+                         * If the existing import declaration already has a named import list, just
+                         * insert the identifier into that list.
+                         */
+                        const textChange = getTextChangeForImportClause(namedImportDeclaration.importClause);
+                        const moduleSpecifierWithoutQuotes = stripQuotes(namedImportDeclaration.moduleSpecifier.getText());
+                        actions.push(createCodeAction(
+                            Diagnostics.Add_0_to_existing_import_declaration_from_1,
+                            [name, moduleSpecifierWithoutQuotes],
+                            textChange.newText,
+                            textChange.span,
+                            sourceFile.fileName,
+                            "InsertingIntoExistingImport",
+                            moduleSpecifierWithoutQuotes
+                        ));
+                    }
+                    else {
+                        // we need to create a new import statement, but the existing module specifier can be reused.
+                        actions.push(getCodeActionForNewImport(existingModuleSpecifier));
+                    }
+                    return actions;
+
+                    function getModuleSpecifierFromImportEqualsDeclaration(declaration: ImportEqualsDeclaration) {
+                        if (declaration.moduleReference && declaration.moduleReference.kind === SyntaxKind.ExternalModuleReference) {
+                            return declaration.moduleReference.expression.getText();
+                        }
+                        return declaration.moduleReference.getText();
+                    }
+
+                    function getTextChangeForImportClause(importClause: ImportClause): TextChange {
+                        const newImportText = isDefault ? `default as ${name}` : name;
+                        const importList = <NamedImports>importClause.namedBindings;
+                        // case 1:
+                        // original text: import default from "module"
+                        // change to: import default, { name } from "module"
+                        if (!importList && importClause.name) {
+                            const start = importClause.name.getEnd();
+                            return {
+                                newText: `, { ${newImportText} }`,
+                                span: { start, length: 0 }
+                            };
+                        }
+
+                        // case 2:
+                        // original text: import {} from "module"
+                        // change to: import { name } from "module"
+                        if (importList.elements.length === 0) {
+                            const start = importList.getStart();
+                            return {
+                                newText: `{ ${newImportText} }`,
+                                span: { start, length: importList.getEnd() - start }
+                            };
+                        }
+
+                        // case 3:
+                        // original text: import { foo, bar } from "module"
+                        // change to: import { foo, bar, name } from "module"
+                        const insertPoint = importList.elements[importList.elements.length - 1].getEnd();
+                        /**
+                         * If the import list has one import per line, preserve that. Otherwise, insert on same line as last element
+                         *     import {
+                         *         foo
+                         *     } from "./module";
+                         */
+                        const startLine = getLineOfLocalPosition(sourceFile, importList.getStart());
+                        const endLine = getLineOfLocalPosition(sourceFile, importList.getEnd());
+                        const oneImportPerLine = endLine - startLine > importList.elements.length;
+
+                        return {
+                            newText: `,${oneImportPerLine ? context.newLineCharacter : " "}${newImportText}`,
+                            span: { start: insertPoint, length: 0 }
+                        };
+                    }
+
+                    function getCodeActionForNamespaceImport(declaration: ImportDeclaration | ImportEqualsDeclaration): ImportCodeAction {
+                        let namespacePrefix: string;
+                        if (declaration.kind === SyntaxKind.ImportDeclaration) {
+                            namespacePrefix = (<NamespaceImport>declaration.importClause.namedBindings).name.getText();
+                        }
+                        else {
+                            namespacePrefix = declaration.name.getText();
+                        }
+                        namespacePrefix = stripQuotes(namespacePrefix);
+
+                        /**
+                         * Cases:
+                         *     import * as ns from "mod"
+                         *     import default, * as ns from "mod"
+                         *     import ns = require("mod")
+                         *
+                         * Because there is no import list, we alter the reference to include the
+                         * namespace instead of altering the import declaration. For example, "foo" would
+                         * become "ns.foo"
+                         */
+                        return createCodeAction(
+                            Diagnostics.Change_0_to_1,
+                            [name, `${namespacePrefix}.${name}`],
+                            `${namespacePrefix}.`,
+                            { start: token.getStart(), length: 0 },
+                            sourceFile.fileName,
+                            "CodeChange"
+                        );
+                    }
+                }
+
+                function getCodeActionForNewImport(moduleSpecifier?: string): ImportCodeAction {
+                    if (!cachedNewImportInsertPosition) {
+                        // insert after any existing imports
+                        let lastModuleSpecifierEnd = -1;
+                        for (const moduleSpecifier of sourceFile.imports) {
+                            const end = moduleSpecifier.getEnd();
+                            if (!lastModuleSpecifierEnd || end > lastModuleSpecifierEnd) {
+                                lastModuleSpecifierEnd = end;
+                            }
+                        }
+                        cachedNewImportInsertPosition = lastModuleSpecifierEnd > 0 ? sourceFile.getLineEndOfPosition(lastModuleSpecifierEnd) : sourceFile.getStart();
+                    }
+
+                    const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames);
+                    const moduleSpecifierWithoutQuotes = stripQuotes(moduleSpecifier || getModuleSpecifierForNewImport());
+                    const importStatementText = isDefault
+                        ? `import ${name} from "${moduleSpecifierWithoutQuotes}"`
+                        : `import { ${name} } from "${moduleSpecifierWithoutQuotes}"`;
+
+                    // if this file doesn't have any import statements, insert an import statement and then insert a new line
+                    // between the only import statement and user code. Otherwise just insert the statement because chances
+                    // are there are already a new line seperating code and import statements.
+                    const newText = cachedNewImportInsertPosition === sourceFile.getStart()
+                        ? `${importStatementText};${context.newLineCharacter}${context.newLineCharacter}`
+                        : `${context.newLineCharacter}${importStatementText};`;
+
+                    return createCodeAction(
+                        Diagnostics.Import_0_from_1,
+                        [name, `"${moduleSpecifierWithoutQuotes}"`],
+                        newText,
+                        { start: cachedNewImportInsertPosition, length: 0 },
+                        sourceFile.fileName,
+                        "NewImport",
+                        moduleSpecifierWithoutQuotes
+                    );
+
+                    function getModuleSpecifierForNewImport() {
+                        const fileName = sourceFile.path;
+                        const moduleFileName = moduleSymbol.valueDeclaration.getSourceFile().path;
+                        const sourceDirectory = getDirectoryPath(fileName);
+                        const options = context.program.getCompilerOptions();
+
+                        return tryGetModuleNameFromAmbientModule() ||
+                            tryGetModuleNameFromBaseUrl() ||
+                            tryGetModuleNameFromRootDirs() ||
+                            tryGetModuleNameFromTypeRoots() ||
+                            tryGetModuleNameAsNodeModule() ||
+                            removeFileExtension(getRelativePath(moduleFileName, sourceDirectory));
+
+                        function tryGetModuleNameFromAmbientModule(): string {
+                            if (moduleSymbol.valueDeclaration.kind !== SyntaxKind.SourceFile) {
+                                return moduleSymbol.name;
+                            }
+                        }
+
+                        function tryGetModuleNameFromBaseUrl() {
+                            if (!options.baseUrl) {
+                                return undefined;
+                            }
+
+                            const normalizedBaseUrl = toPath(options.baseUrl, getDirectoryPath(options.baseUrl), getCanonicalFileName);
+                            let relativeName = tryRemoveParentDirectoryName(moduleFileName, normalizedBaseUrl);
+                            if (!relativeName) {
+                                return undefined;
+                            }
+
+                            relativeName = removeExtensionAndIndexPostFix(relativeName);
+
+                            if (options.paths) {
+                                for (const key in options.paths) {
+                                    for (const pattern of options.paths[key]) {
+                                        const indexOfStar = pattern.indexOf("*");
+                                        if (indexOfStar === 0 && pattern.length === 1) {
+                                            continue;
+                                        }
+                                        else if (indexOfStar !== -1) {
+                                            const prefix = pattern.substr(0, indexOfStar);
+                                            const suffix = pattern.substr(indexOfStar + 1);
+                                            if (relativeName.length >= prefix.length + suffix.length &&
+                                                startsWith(relativeName, prefix) &&
+                                                endsWith(relativeName, suffix)) {
+                                                const matchedStar = relativeName.substr(prefix.length, relativeName.length - suffix.length);
+                                                return key.replace("\*", matchedStar);
+                                            }
+                                        }
+                                        else if (pattern === relativeName) {
+                                            return key;
+                                        }
+                                    }
+                                }
+                            }
+
+                            return relativeName;
+                        }
+
+                        function tryGetModuleNameFromRootDirs() {
+                            if (options.rootDirs) {
+                                const normalizedRootDirs = map(options.rootDirs, rootDir => toPath(rootDir, /*basePath*/ undefined, getCanonicalFileName));
+                                const normalizedTargetPath = getPathRelativeToRootDirs(moduleFileName, normalizedRootDirs);
+                                const normalizedSourcePath = getPathRelativeToRootDirs(sourceDirectory, normalizedRootDirs);
+                                if (normalizedTargetPath !== undefined) {
+                                    const relativePath = normalizedSourcePath !== undefined ? getRelativePath(normalizedTargetPath, normalizedSourcePath) : normalizedTargetPath;
+                                    return removeFileExtension(relativePath);
+                                }
+                            }
+                            return undefined;
+                        }
+
+                        function tryGetModuleNameFromTypeRoots() {
+                            const typeRoots = getEffectiveTypeRoots(options, context.host);
+                            if (typeRoots) {
+                                const normalizedTypeRoots = map(typeRoots, typeRoot => toPath(typeRoot, /*basePath*/ undefined, getCanonicalFileName));
+                                for (const typeRoot of normalizedTypeRoots) {
+                                    if (startsWith(moduleFileName, typeRoot)) {
+                                        let relativeFileName = moduleFileName.substring(typeRoot.length + 1);
+                                        return removeExtensionAndIndexPostFix(relativeFileName);
+                                    }
+                                }
+                            }
+                        }
+
+                        function tryGetModuleNameAsNodeModule() {
+                            if (getEmitModuleResolutionKind(options) !== ModuleResolutionKind.NodeJs) {
+                                // nothing to do here
+                                return undefined;
+                            }
+
+                            const indexOfNodeModules = moduleFileName.indexOf("node_modules");
+                            if (indexOfNodeModules < 0) {
+                                return undefined;
+                            }
+
+                            let relativeFileName: string;
+                            if (sourceDirectory.indexOf(moduleFileName.substring(0, indexOfNodeModules - 1)) === 0) {
+                                // if node_modules folder is in this folder or any of its parent folder, no need to keep it.
+                                relativeFileName = moduleFileName.substring(indexOfNodeModules + 13 /* "node_modules\".length */);
+                            }
+                            else {
+                                relativeFileName = getRelativePath(moduleFileName, sourceDirectory);
+                            }
+
+                            relativeFileName = removeFileExtension(relativeFileName);
+                            if (endsWith(relativeFileName, "/index")) {
+                                relativeFileName = getDirectoryPath(relativeFileName);
+                            }
+                            else {
+                                try {
+                                    const moduleDirectory = getDirectoryPath(moduleFileName);
+                                    const packageJsonContent = JSON.parse(context.host.readFile(combinePaths(moduleDirectory, "package.json")));
+                                    if (packageJsonContent) {
+                                        const mainFile = packageJsonContent.main || packageJsonContent.typings;
+                                        if (mainFile) {
+                                            const mainExportFile = toPath(mainFile, moduleDirectory, getCanonicalFileName);
+                                            if (removeFileExtension(mainExportFile) === removeFileExtension(moduleFileName)) {
+                                                relativeFileName = getDirectoryPath(relativeFileName);
+                                            }
+                                        }
+                                    }
+                                }
+                                catch (e) { }
+                            }
+
+                            return relativeFileName;
+                        }
+                    }
+
+                    function getPathRelativeToRootDirs(path: Path, rootDirs: Path[]) {
+                        for (const rootDir of rootDirs) {
+                            const relativeName = tryRemoveParentDirectoryName(path, rootDir);
+                            if (relativeName !== undefined) {
+                                return relativeName;
+                            }
+                        }
+                        return undefined;
+                    }
+
+                    function removeExtensionAndIndexPostFix(fileName: string) {
+                        fileName = removeFileExtension(fileName);
+                        if (endsWith(fileName, "/index")) {
+                            fileName = fileName.substr(0, fileName.length - 6/* "/index".length */);
+                        }
+                        return fileName;
+                    }
+
+                    function getRelativePath(path: string, directoryPath: string) {
+                        const relativePath = getRelativePathToDirectoryOrUrl(directoryPath, path, directoryPath, getCanonicalFileName, false);
+                        return moduleHasNonRelativeName(relativePath) ? "./" + relativePath : relativePath;
+                    }
+
+                    function tryRemoveParentDirectoryName(path: Path, parentDirectory: Path) {
+                        const index = path.indexOf(parentDirectory);
+                        if (index === 0) {
+                            return endsWith(parentDirectory, directorySeparator)
+                                ? path.substring(parentDirectory.length)
+                                : path.substring(parentDirectory.length + 1);
+                        }
+                        return undefined;
+                    }
+                }
+
+            }
+
+            function createCodeAction(
+                description: DiagnosticMessage,
+                diagnosticArgs: string[],
+                newText: string,
+                span: TextSpan,
+                fileName: string,
+                kind: ImportCodeActionKind,
+                moduleSpecifier?: string): ImportCodeAction {
+                return {
+                    description: formatMessage.apply(undefined, [undefined, description].concat(<any[]>diagnosticArgs)),
+                    changes: [{ fileName, textChanges: [{ newText, span }] }],
+                    kind,
+                    moduleSpecifier
+                };
+            }
+        }
+    });
+}
diff --git a/src/services/services.ts b/src/services/services.ts
index 3c0b7838314..ef50f4b5a2f 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -1,4 +1,4 @@
-/// <reference path="..\compiler\program.ts"/>
+/// <reference path="..\compiler\program.ts"/>
 /// <reference path="..\compiler\commandLineParser.ts"/>
 
 /// <reference path='types.ts' />
@@ -492,6 +492,23 @@ namespace ts {
             return ts.getPositionOfLineAndCharacter(this, line, character);
         }
 
+        public getLineEndOfPosition(pos: number): number {
+            const { line } = this.getLineAndCharacterOfPosition(pos);
+            const lineStarts = this.getLineStarts();
+
+            let lastCharPos: number;
+            if (line + 1 >= lineStarts.length) {
+                lastCharPos = this.getEnd();
+            }
+            if (!lastCharPos) {
+                lastCharPos = lineStarts[line + 1] - 1;
+            }
+
+            const fullText = this.getFullText();
+            // if the new line is "\r\n", we should return the last non-new-line-character position
+            return fullText[lastCharPos] === "\n" && fullText[lastCharPos - 1] === "\r" ? lastCharPos - 1 : lastCharPos;
+        }
+
         public getNamedDeclarations(): Map<Declaration[]> {
             if (!this.namedDeclarations) {
                 this.namedDeclarations = this.computeNamedDeclarations();
@@ -1676,7 +1693,9 @@ namespace ts {
                     sourceFile: sourceFile,
                     span: span,
                     program: program,
-                    newLineCharacter: newLineChar
+                    newLineCharacter: newLineChar,
+                    host: host,
+                    cancellationToken: cancellationToken
                 };
 
                 const fixes = codefix.getFixes(context);
diff --git a/src/services/types.ts b/src/services/types.ts
index 4e04df3fc7c..6a0e6e886b5 100644
--- a/src/services/types.ts
+++ b/src/services/types.ts
@@ -53,6 +53,7 @@ namespace ts {
         /* @internal */ getNamedDeclarations(): Map<Declaration[]>;
 
         getLineAndCharacterOfPosition(pos: number): LineAndCharacter;
+        getLineEndOfPosition(pos: number): number;
         getLineStarts(): number[];
         getPositionOfLineAndCharacter(line: number, character: number): number;
         update(newText: string, textChangeRange: TextChangeRange): SourceFile;
diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts
index 295b8e422b9..35c68b49fd8 100644
--- a/tests/cases/fourslash/fourslash.ts
+++ b/tests/cases/fourslash/fourslash.ts
@@ -211,6 +211,7 @@ declare namespace FourSlashInterface {
         DocCommentTemplate(expectedText: string, expectedOffset: number, empty?: boolean): void;
         noDocCommentTemplate(): void;
         codeFixAtPosition(expectedText: string, errorCode?: number): void;
+        importFixAtPosition(expectedTextArray: string[], errorCode?: number): void;
 
         navigationBar(json: any): void;
         navigationTree(json: any): void;
diff --git a/tests/cases/fourslash/importNameCodeFixExistingImport0.ts b/tests/cases/fourslash/importNameCodeFixExistingImport0.ts
new file mode 100644
index 00000000000..5e5be220688
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixExistingImport0.ts
@@ -0,0 +1,10 @@
+/// <reference path="fourslash.ts" />
+
+//// import [|{ v1 }|] from "./module";
+//// f1/*0*/();
+
+// @Filename: module.ts
+//// export function f1() {}
+//// export var v1 = 5;
+
+verify.importFixAtPosition([`{ v1, f1 }`]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/importNameCodeFixExistingImport1.ts b/tests/cases/fourslash/importNameCodeFixExistingImport1.ts
new file mode 100644
index 00000000000..9571d0fcf57
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixExistingImport1.ts
@@ -0,0 +1,11 @@
+/// <reference path="fourslash.ts" />
+
+//// import d, [|{ v1 }|] from "./module";
+//// f1/*0*/();
+
+// @Filename: module.ts
+//// export function f1() {}
+//// export var v1 = 5;
+//// export default var d1 = 6;
+
+verify.importFixAtPosition([`{ v1, f1 }`]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/importNameCodeFixExistingImport10.ts b/tests/cases/fourslash/importNameCodeFixExistingImport10.ts
new file mode 100644
index 00000000000..25246e70123
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixExistingImport10.ts
@@ -0,0 +1,21 @@
+/// <reference path="fourslash.ts" />
+
+//// import [|{
+////     v1,
+////     v2
+//// }|] from "./module";
+//// f1/*0*/();
+
+// @Filename: module.ts
+//// export function f1() {}
+//// export var v1 = 5;
+//// export var v2 = 5;
+//// export var v3 = 5;
+
+verify.importFixAtPosition([
+`{
+    v1,
+    v2,
+f1
+}`
+]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/importNameCodeFixExistingImport11.ts b/tests/cases/fourslash/importNameCodeFixExistingImport11.ts
new file mode 100644
index 00000000000..304ffb896df
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixExistingImport11.ts
@@ -0,0 +1,20 @@
+/// <reference path="fourslash.ts" />
+
+////import [|{
+////    v1, v2,
+////    v3
+////}|] from "./module";
+////f1/*0*/();
+
+// @Filename: module.ts
+//// export function f1() {}
+//// export var v1 = 5;
+//// export var v2 = 5;
+//// export var v3 = 5;
+
+verify.importFixAtPosition([
+`{
+    v1, v2,
+    v3, f1
+}`
+]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/importNameCodeFixExistingImport12.ts b/tests/cases/fourslash/importNameCodeFixExistingImport12.ts
new file mode 100644
index 00000000000..e00dee504c5
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixExistingImport12.ts
@@ -0,0 +1,12 @@
+/// <reference path="fourslash.ts" />
+
+//// import [|{}|] from "./module";
+//// f1/*0*/();
+
+// @Filename: module.ts
+//// export function f1() {}
+//// export var v1 = 5;
+//// export var v2 = 5;
+//// export var v3 = 5;
+
+verify.importFixAtPosition([`{ f1 }`]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/importNameCodeFixExistingImport2.ts b/tests/cases/fourslash/importNameCodeFixExistingImport2.ts
new file mode 100644
index 00000000000..6a92976f4ef
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixExistingImport2.ts
@@ -0,0 +1,16 @@
+/// <reference path="fourslash.ts" />
+
+//// [|import * as ns from "./module";
+//// f1/*0*/();|]
+
+// @Filename: module.ts
+//// export function f1() {}
+//// export var v1 = 5;
+
+verify.importFixAtPosition([
+`import * as ns from "./module";
+import { f1 } from "./module";
+f1();`,
+`import * as ns from "./module";
+ns.f1();`
+]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/importNameCodeFixExistingImport3.ts b/tests/cases/fourslash/importNameCodeFixExistingImport3.ts
new file mode 100644
index 00000000000..bc00e8d420a
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixExistingImport3.ts
@@ -0,0 +1,18 @@
+/// <reference path="fourslash.ts" />
+
+//// [|import d, * as ns from "./module"   ;
+//// f1/*0*/();|]
+
+// @Filename: module.ts
+//// export function f1() {}
+//// export var v1 = 5;
+//// export default var d1 = 6;
+
+// Test with some extra spaces before the semicolon
+verify.importFixAtPosition([
+`import d, * as ns from "./module"   ;
+ns.f1();`,
+`import d, * as ns from "./module"   ;
+import { f1 } from "./module";
+f1();`,
+]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/importNameCodeFixExistingImport4.ts b/tests/cases/fourslash/importNameCodeFixExistingImport4.ts
new file mode 100644
index 00000000000..d93cb73664e
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixExistingImport4.ts
@@ -0,0 +1,14 @@
+/// <reference path="fourslash.ts" />
+
+//// [|import d from "./module";
+//// f1/*0*/();|]
+
+// @Filename: module.ts
+//// export function f1() {}
+//// export var v1 = 5;
+//// export default var d1 = 6;
+
+verify.importFixAtPosition([
+`import d, { f1 } from "./module";
+f1();`
+]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/importNameCodeFixExistingImport5.ts b/tests/cases/fourslash/importNameCodeFixExistingImport5.ts
new file mode 100644
index 00000000000..ed9297124d9
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixExistingImport5.ts
@@ -0,0 +1,12 @@
+/// <reference path="fourslash.ts" />
+
+//// [|import "./module";
+//// f1/*0*/();|]
+
+// @Filename: module.ts
+//// export function f1() {}
+//// export var v1 = 5;
+
+verify.importFixAtPosition([`import "./module";
+import { f1 } from "./module";
+f1();`]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/importNameCodeFixExistingImport6.ts b/tests/cases/fourslash/importNameCodeFixExistingImport6.ts
new file mode 100644
index 00000000000..7ae157a51ce
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixExistingImport6.ts
@@ -0,0 +1,13 @@
+/// <reference path="fourslash.ts" />
+
+//// import [|{ v1 }|] from "fake-module";
+//// f1/*0*/();
+
+// @Filename: ../package.json
+//// { "dependencies": { "fake-module": "latest" } }
+
+// @Filename: ../node_modules/fake-module/index.ts
+//// export var v1 = 5;
+//// export function f1();
+
+verify.importFixAtPosition([`{ v1, f1 }`]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/importNameCodeFixExistingImport7.ts b/tests/cases/fourslash/importNameCodeFixExistingImport7.ts
new file mode 100644
index 00000000000..249929eabc7
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixExistingImport7.ts
@@ -0,0 +1,10 @@
+/// <reference path="fourslash.ts" />
+
+//// import [|{ v1 }|] from "../other_dir/module";
+//// f1/*0*/();
+
+// @Filename: ../other_dir/module.ts
+//// export var v1 = 5;
+//// export function f1();
+
+verify.importFixAtPosition([`{ v1, f1 }`]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/importNameCodeFixExistingImport8.ts b/tests/cases/fourslash/importNameCodeFixExistingImport8.ts
new file mode 100644
index 00000000000..da7beaa0a47
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixExistingImport8.ts
@@ -0,0 +1,12 @@
+/// <reference path="fourslash.ts" />
+
+//// import [|{v1, v2, v3,}|] from "./module";
+//// f1/*0*/();
+
+// @Filename: module.ts
+//// export function f1() {}
+//// export var v1 = 5;
+//// export var v2 = 5;
+//// export var v3 = 5;
+
+verify.importFixAtPosition([`{v1, v2, v3, f1,}`]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/importNameCodeFixExistingImport9.ts b/tests/cases/fourslash/importNameCodeFixExistingImport9.ts
new file mode 100644
index 00000000000..05d17927454
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixExistingImport9.ts
@@ -0,0 +1,17 @@
+/// <reference path="fourslash.ts" />
+
+//// import [|{
+////     v1
+//// }|] from "./module";
+//// f1/*0*/();
+
+// @Filename: module.ts
+//// export function f1() {}
+//// export var v1 = 5;
+
+verify.importFixAtPosition([
+`{
+    v1,
+f1
+}`
+]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/importNameCodeFixExistingImportEquals0.ts b/tests/cases/fourslash/importNameCodeFixExistingImportEquals0.ts
new file mode 100644
index 00000000000..f431e6356d1
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixExistingImportEquals0.ts
@@ -0,0 +1,18 @@
+/// <reference path="fourslash.ts" />
+
+//// [|import ns = require("ambient-module");
+//// var x = v1/*0*/ + 5;|]
+
+// @Filename: ambientModule.ts
+//// declare module "ambient-module" {
+////    export function f1();
+////    export var v1;
+//// }
+
+verify.importFixAtPosition([
+`import ns = require("ambient-module");
+var x = ns.v1 + 5;`,
+`import ns = require("ambient-module");
+import { v1 } from "ambient-module";
+var x = v1 + 5;`,
+]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportAmbient0.ts b/tests/cases/fourslash/importNameCodeFixNewImportAmbient0.ts
new file mode 100644
index 00000000000..1d7b5bc3e7f
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixNewImportAmbient0.ts
@@ -0,0 +1,15 @@
+/// <reference path="fourslash.ts" />
+
+//// [|f1/*0*/();|]
+
+// @Filename: ambientModule.ts
+//// declare module "ambient-module" {
+////    export function f1();
+////    export var v1;
+//// }
+
+verify.importFixAtPosition([
+`import { f1 } from "ambient-module";
+
+f1();`
+]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportAmbient1.ts b/tests/cases/fourslash/importNameCodeFixNewImportAmbient1.ts
new file mode 100644
index 00000000000..60504c89711
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixNewImportAmbient1.ts
@@ -0,0 +1,28 @@
+/// <reference path="fourslash.ts" />
+
+//// import d from "other-ambient-module";
+//// [|import * as ns from "yet-another-ambient-module";
+//// var x = v1/*0*/ + 5;|]
+
+// @Filename: ambientModule.ts
+//// declare module "ambient-module" {
+////    export function f1();
+////    export var v1;
+//// }
+
+// @Filename: otherAmbientModule.ts
+//// declare module "other-ambient-module" {
+////    export default function f2();
+//// }
+
+// @Filename: yetAnotherAmbientModule.ts
+//// declare module "yet-another-ambient-module" {
+////    export function f3();
+////    export var v3;
+//// }
+
+verify.importFixAtPosition([
+`import * as ns from "yet-another-ambient-module";
+import { v1 } from "ambient-module";
+var x = v1 + 5;`
+]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportAmbient2.ts b/tests/cases/fourslash/importNameCodeFixNewImportAmbient2.ts
new file mode 100644
index 00000000000..999da4bffbb
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixNewImportAmbient2.ts
@@ -0,0 +1,21 @@
+/// <reference path="fourslash.ts" />
+
+////[|/*
+//// * I'm a license or something
+//// */
+////f1/*0*/();|]
+
+// @Filename: ambientModule.ts
+//// declare module "ambient-module" {
+////    export function f1();
+////    export var v1;
+//// }
+
+verify.importFixAtPosition([
+`/*
+ * I'm a license or something
+ */
+import { f1 } from "ambient-module";
+
+f1();`
+]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportAmbient3.ts b/tests/cases/fourslash/importNameCodeFixNewImportAmbient3.ts
new file mode 100644
index 00000000000..648293cce2e
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixNewImportAmbient3.ts
@@ -0,0 +1,30 @@
+/// <reference path="fourslash.ts" />
+
+//// let a = "I am a non-trivial statement that appears before imports";
+//// import d from "other-ambient-module"
+//// [|import * as ns from "yet-another-ambient-module"
+//// var x = v1/*0*/ + 5;|]
+
+// @Filename: ambientModule.ts
+//// declare module "ambient-module" {
+////    export function f1();
+////    export var v1;
+//// }
+
+// @Filename: otherAmbientModule.ts
+//// declare module "other-ambient-module" {
+////    export default function f2();
+//// }
+
+// @Filename: yetAnotherAmbientModule.ts
+//// declare module "yet-another-ambient-module" {
+////    export function f3();
+////    export var v3;
+//// }
+
+// test cases when there are no semicolons at the line end
+verify.importFixAtPosition([
+`import * as ns from "yet-another-ambient-module"
+import { v1 } from "ambient-module";
+var x = v1 + 5;`
+]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportBaseUrl0.ts b/tests/cases/fourslash/importNameCodeFixNewImportBaseUrl0.ts
new file mode 100644
index 00000000000..e15c2cf4399
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixNewImportBaseUrl0.ts
@@ -0,0 +1,19 @@
+/// <reference path="fourslash.ts" />
+
+//// [|f1/*0*/();|]
+
+// @Filename: tsconfig.json
+//// {
+////     "compilerOptions": {
+////         "baseUrl": "./a"
+////     }
+//// }
+
+// @Filename: a/b.ts
+//// export function f1() { };
+
+verify.importFixAtPosition([
+`import { f1 } from "b";
+
+f1();`
+]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportDefault0.ts b/tests/cases/fourslash/importNameCodeFixNewImportDefault0.ts
new file mode 100644
index 00000000000..3efe023e922
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixNewImportDefault0.ts
@@ -0,0 +1,12 @@
+/// <reference path="fourslash.ts" />
+
+//// [|f1/*0*/();|]
+
+// @Filename: module.ts
+//// export default function f1() { };
+
+verify.importFixAtPosition([
+`import f1 from "./module";
+
+f1();`
+]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportFile0.ts b/tests/cases/fourslash/importNameCodeFixNewImportFile0.ts
new file mode 100644
index 00000000000..2372110437a
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixNewImportFile0.ts
@@ -0,0 +1,13 @@
+/// <reference path="fourslash.ts" />
+
+//// [|f1/*0*/();|]
+
+// @Filename: module.ts
+//// export function f1() {}
+//// export var v1 = 5;
+
+verify.importFixAtPosition([
+`import { f1 } from "./module";
+
+f1();`
+]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportFile1.ts b/tests/cases/fourslash/importNameCodeFixNewImportFile1.ts
new file mode 100644
index 00000000000..0223d96e018
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixNewImportFile1.ts
@@ -0,0 +1,18 @@
+/// <reference path="fourslash.ts" />
+
+//// [|/// <reference path="./tripleSlashReference.ts" />
+//// f1/*0*/();|]
+
+// @Filename: module.ts
+//// export function f1() {}
+//// export var v1 = 5;
+
+// @Filename: tripleSlashReference.ts
+//// var x = 5;/*dummy*/
+
+verify.importFixAtPosition([
+`/// <reference path="./tripleSlashReference.ts" />
+import { f1 } from "./module";
+
+f1();`
+]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportFile2.ts b/tests/cases/fourslash/importNameCodeFixNewImportFile2.ts
new file mode 100644
index 00000000000..ca9330e9846
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixNewImportFile2.ts
@@ -0,0 +1,13 @@
+/// <reference path="fourslash.ts" />
+
+//// [|f1/*0*/();|]
+
+// @Filename: ../../other_dir/module.ts
+//// export var v1 = 5;
+//// export function f1();
+
+verify.importFixAtPosition([
+`import { f1 } from "../../other_dir/module";
+
+f1();`
+]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportNodeModules0.ts b/tests/cases/fourslash/importNameCodeFixNewImportNodeModules0.ts
new file mode 100644
index 00000000000..6013f865ddf
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixNewImportNodeModules0.ts
@@ -0,0 +1,19 @@
+/// <reference path="fourslash.ts" />
+
+//// [|f1/*0*/();|]
+
+// @Filename: ../package.json
+//// { "dependencies": { "fake-module": "latest" } }
+
+// @Filename: ../node_modules/fake-module/index.ts
+//// export var v1 = 5;
+//// export function f1();
+
+// @Filename: ../node_modules/fake-module/package.json
+//// {}
+
+verify.importFixAtPosition([
+`import { f1 } from "fake-module";
+
+f1();`
+]);
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportNodeModules1.ts b/tests/cases/fourslash/importNameCodeFixNewImportNodeModules1.ts
new file mode 100644
index 00000000000..6bffe41b27a
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixNewImportNodeModules1.ts
@@ -0,0 +1,16 @@
+/// <reference path="fourslash.ts" />
+
+//// [|f1/*0*/();|]
+
+// @Filename: ../package.json
+//// { "dependencies": { "fake-module": "latest" } }
+
+// @Filename: ../node_modules/fake-module/nested.ts
+//// export var v1 = 5;
+//// export function f1();
+
+verify.importFixAtPosition([
+`import { f1 } from "fake-module/nested";
+
+f1();`
+]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportNodeModules2.ts b/tests/cases/fourslash/importNameCodeFixNewImportNodeModules2.ts
new file mode 100644
index 00000000000..ff48fbe182c
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixNewImportNodeModules2.ts
@@ -0,0 +1,25 @@
+/// <reference path="fourslash.ts" />
+
+//// [|f1/*0*/();|]
+
+// @Filename: ../package.json
+//// { "dependencies": { "fake-module": "latest" } }
+
+// @Filename: ../node_modules/fake-module/notindex.d.ts
+//// export var v1 = 5;
+//// export function f1();
+
+// @Filename: ../node_modules/fake-module/notindex.js
+//// module.exports = {
+////    v1: 5,
+////    f1: function () {}
+//// };
+
+// @Filename: ../node_modules/fake-module/package.json
+//// { "main":"./notindex.js", "typings":"./notindex.d.ts" }
+
+verify.importFixAtPosition([
+`import { f1 } from "fake-module";
+
+f1();`
+]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportNodeModules3.ts b/tests/cases/fourslash/importNameCodeFixNewImportNodeModules3.ts
new file mode 100644
index 00000000000..b1143cb4b41
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixNewImportNodeModules3.ts
@@ -0,0 +1,14 @@
+/// <reference path="fourslash.ts" />
+
+// @Filename: /a.ts
+//// [|f1/*0*/();|]
+
+// @Filename: /node_modules/@types/random/index.d.ts
+//// export var v1 = 5;
+//// export function f1();
+
+verify.importFixAtPosition([
+`import { f1 } from "random";
+
+f1();`
+]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportPaths0.ts b/tests/cases/fourslash/importNameCodeFixNewImportPaths0.ts
new file mode 100644
index 00000000000..93cd6f92ef5
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixNewImportPaths0.ts
@@ -0,0 +1,22 @@
+/// <reference path="fourslash.ts" />
+
+//// [|foo/*0*/();|]
+
+// @Filename: folder_a/f2.ts
+//// export function foo() {};
+
+// @Filename: tsconfig.json
+//// {
+////     "compilerOptions": {
+////         "baseUrl": ".",
+////         "paths": {
+////             "a": [ "folder_a/f2" ]
+////         }
+////     }
+//// }
+
+verify.importFixAtPosition([
+`import { foo } from "a";
+
+foo();`
+]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportPaths1.ts b/tests/cases/fourslash/importNameCodeFixNewImportPaths1.ts
new file mode 100644
index 00000000000..bb0f1e6705a
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixNewImportPaths1.ts
@@ -0,0 +1,22 @@
+/// <reference path="fourslash.ts" />
+
+//// [|foo/*0*/();|]
+
+// @Filename: folder_b/f2.ts
+//// export function foo() {};
+
+// @Filename: tsconfig.json
+//// {
+////     "compilerOptions": {
+////         "baseUrl": ".",
+////         "paths": {
+////             "b/*": [ "folder_b/*" ]
+////         }
+////     }
+//// }
+
+verify.importFixAtPosition([
+`import { foo } from "b/f2";
+
+foo();`
+]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportRootDirs0.ts b/tests/cases/fourslash/importNameCodeFixNewImportRootDirs0.ts
new file mode 100644
index 00000000000..ae8ef03ccac
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixNewImportRootDirs0.ts
@@ -0,0 +1,23 @@
+/// <reference path="fourslash.ts" />
+
+// @Filename: a/f1.ts
+//// [|foo/*0*/();|]
+
+// @Filename: b/c/f2.ts
+//// export function foo() {};
+
+// @Filename: tsconfig.json
+//// {
+////     "compilerOptions": {
+////         "rootDirs": [
+////             "a",
+////             "b/c"
+////         ]
+////     }
+//// }
+
+verify.importFixAtPosition([
+`import { foo } from "./f2";
+
+foo();`
+]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportTypeRoots0.ts b/tests/cases/fourslash/importNameCodeFixNewImportTypeRoots0.ts
new file mode 100644
index 00000000000..a6eb6a90759
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixNewImportTypeRoots0.ts
@@ -0,0 +1,22 @@
+/// <reference path="fourslash.ts" />
+
+// @Filename: a/f1.ts
+//// [|foo/*0*/();|]
+
+// @Filename: types/random/index.ts
+//// export function foo() {};
+
+// @Filename: tsconfig.json
+//// {
+////     "compilerOptions": {
+////         "typeRoots": [
+////             "./types"
+////         ]
+////     }
+//// }
+
+verify.importFixAtPosition([
+`import { foo } from "random";
+
+foo();`
+]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/importNameCodeFixOptionalImport0.ts b/tests/cases/fourslash/importNameCodeFixOptionalImport0.ts
new file mode 100644
index 00000000000..30b482a94d7
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixOptionalImport0.ts
@@ -0,0 +1,20 @@
+/// <reference path="fourslash.ts" />
+
+// @Filename: a/f1.ts
+//// [|import * as ns from "./foo";
+//// foo/*0*/();|]
+
+// @Filename: a/foo/bar.ts
+//// export function foo() {};
+
+// @Filename: a/foo.ts
+//// export { foo } from "./foo/bar"; 
+
+verify.importFixAtPosition([
+`import * as ns from "./foo";
+import { foo } from "./foo";
+foo();`,
+
+`import * as ns from "./foo";
+ns.foo();`,
+]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/importNameCodeFixOptionalImport1.ts b/tests/cases/fourslash/importNameCodeFixOptionalImport1.ts
new file mode 100644
index 00000000000..343b0692260
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixOptionalImport1.ts
@@ -0,0 +1,20 @@
+/// <reference path="fourslash.ts" />
+
+// @Filename: a/f1.ts
+//// [|foo/*0*/();|]
+
+// @Filename: a/node_modules/bar/index.ts
+//// export function foo() {};
+
+// @Filename: a/foo.ts
+//// export { foo } from "bar"; 
+
+verify.importFixAtPosition([
+`import { foo } from "./foo";
+
+foo();`,
+
+`import { foo } from "bar";
+
+foo();`,
+]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/server/codefix.ts b/tests/cases/fourslash/server/codefix.ts
index 7fbe2cb4fd7..9d0f42c9e4c 100644
--- a/tests/cases/fourslash/server/codefix.ts
+++ b/tests/cases/fourslash/server/codefix.ts
@@ -1,4 +1,4 @@
-/// <reference path='fourslash.ts' />
+/// <reference path='../fourslash.ts' />
 
 ////class Base{
 ////}

From 29481f67f4ea767cf6a4c56201710a7250dd2a10 Mon Sep 17 00:00:00 2001
From: Ryan Cavanaugh <RyanCavanaugh@users.noreply.github.com>
Date: Wed, 16 Nov 2016 16:25:23 -0800
Subject: [PATCH 271/421] Revert "fix #11670, support type guards in
 NumberConstructor (#11722)"

This reverts commit 4fbbbed321baa58418b9379b418278d31400fe3e.
---
 src/lib/es2015.core.d.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/es2015.core.d.ts b/src/lib/es2015.core.d.ts
index 28f2e12248b..356512ecf58 100644
--- a/src/lib/es2015.core.d.ts
+++ b/src/lib/es2015.core.d.ts
@@ -205,13 +205,13 @@ interface NumberConstructor {
       * number. Only finite values of the type number, result in true.
       * @param number A numeric value.
       */
-    isFinite(value: any): value is number;
+    isFinite(number: number): boolean;
 
     /**
       * Returns true if the value passed is an integer, false otherwise.
       * @param number A numeric value.
       */
-    isInteger(value: any): value is number;
+    isInteger(number: number): boolean;
 
     /**
       * Returns a Boolean value that indicates whether a value is the reserved value NaN (not a
@@ -219,13 +219,13 @@ interface NumberConstructor {
       * to a number. Only values of the type number, that are also NaN, result in true.
       * @param number A numeric value.
       */
-    isNaN(value: any): value is number;
+    isNaN(number: number): boolean;
 
     /**
       * Returns true if the value passed is a safe integer.
       * @param number A numeric value.
       */
-    isSafeInteger(value: any): value is number;
+    isSafeInteger(number: number): boolean;
 
     /**
       * The value of the largest integer n such that n and n + 1 are both exactly representable as

From 3e52f3dfe9ee5922ef4305b1c39bdbca33d0f5f8 Mon Sep 17 00:00:00 2001
From: Anton Khlynovskiy <subzey@gmail.com>
Date: Thu, 17 Nov 2016 22:06:45 +0300
Subject: [PATCH 272/421] Codegen: Do not subtract 0 in arguments to rest array
 loop

---
 src/compiler/transformers/es2015.ts           |  4 +++-
 .../reference/accessorWithRestParam.js        |  4 ++--
 ...patWithCallSignaturesWithRestParameters.js |  6 +++---
 .../reference/baseTypeAfterDerivedType.js     |  2 +-
 .../checkSuperCallBeforeThisAccessing5.js     |  2 +-
 .../checkSuperCallBeforeThisAccessing6.js     |  2 +-
 .../checkSuperCallBeforeThisAccessing8.js     |  2 +-
 .../collisionArgumentsArrowFunctions.js       |  2 +-
 .../collisionArgumentsClassConstructor.js     |  2 +-
 .../collisionArgumentsClassMethod.js          |  2 +-
 .../reference/collisionArgumentsFunction.js   |  2 +-
 .../collisionArgumentsFunctionExpressions.js  |  2 +-
 .../collisionRestParameterArrowFunctions.js   |  2 +-
 .../collisionRestParameterClassConstructor.js |  2 +-
 .../collisionRestParameterClassMethod.js      |  2 +-
 .../collisionRestParameterFunction.js         |  2 +-
 ...llisionRestParameterFunctionExpressions.js |  2 +-
 .../collisionRestParameterUnderscoreIUsage.js |  2 +-
 ...constructorWithIncompleteTypeAnnotation.js |  2 +-
 .../reference/contextuallyTypedIife.js        |  6 +++---
 .../contextuallyTypingRestParameters.js       |  2 +-
 ...RestParametersOfFunctionAndFunctionType.js |  2 +-
 ...ingOptionalBindingParametersInOverloads.js |  4 ++--
 .../reference/defaultExportWithOverloads01.js |  2 +-
 .../destructuringParameterDeclaration4.js     | 14 ++++++-------
 .../destructuringParameterDeclaration6.js     |  6 +++---
 ...detachedCommentAtStartOfLambdaFunction1.js |  2 +-
 ...detachedCommentAtStartOfLambdaFunction2.js |  2 +-
 .../disallowLineTerminatorBeforeArrow.js      |  4 ++--
 .../emitDecoratorMetadata_restArgs.js         |  8 ++++----
 .../reference/emitRestParametersFunction.js   |  2 +-
 .../emitRestParametersFunctionExpression.js   |  6 +++---
 .../emitRestParametersFunctionProperty.js     |  2 +-
 .../reference/emitRestParametersMethod.js     |  6 +++---
 .../emitSkipsThisWithRestParameter.js         |  2 +-
 tests/baselines/reference/es6ClassTest2.js    |  2 +-
 .../reference/es6modulekindWithES5Target6.js  |  2 +-
 .../reference/fatarrowfunctionsErrors.js      |  4 ++--
 .../fatarrowfunctionsOptionalArgs.js          | 20 +++++++++----------
 .../fatarrowfunctionsOptionalArgsErrors1.js   |  6 +++---
 .../fatarrowfunctionsOptionalArgsErrors3.js   |  2 +-
 .../fatarrowfunctionsOptionalArgsErrors4.js   |  2 +-
 tests/baselines/reference/functionCall10.js   |  2 +-
 ...tionOverloadsRecursiveGenericReturnType.js |  2 +-
 tests/baselines/reference/genericRestArgs.js  |  2 +-
 ...icitAnyDeclareFunctionWithoutFormalType.js |  2 +-
 .../inheritedConstructorWithRestParams.js     |  2 +-
 tests/baselines/reference/newWithSpread.js    |  2 +-
 tests/baselines/reference/newWithSpreadES5.js |  2 +-
 .../noImplicitAnyParametersInBareFunctions.js |  4 ++--
 .../noImplicitAnyParametersInClass.js         |  8 ++++----
 .../noImplicitAnyParametersInModule.js        |  4 ++--
 tests/baselines/reference/nonArrayRestArgs.js |  2 +-
 .../optionalBindingParametersInOverloads1.js  |  2 +-
 .../optionalBindingParametersInOverloads2.js  |  2 +-
 .../overloadGenericFunctionWithRestArgs.js    |  2 +-
 .../parenthesizedContexualTyping2.js          |  2 +-
 tests/baselines/reference/parser509668.js     |  2 +-
 .../parserMemberAccessorDeclaration18.js      |  2 +-
 .../reference/parserParameterList10.js        |  2 +-
 .../reference/parserParameterList11.js        |  2 +-
 .../reference/parserParameterList9.js         |  2 +-
 ...tatedFunctionInferenceWithTypeParameter.js |  2 +-
 .../reference/restArgAssignmentCompat.js      |  2 +-
 .../baselines/reference/restArgMissingName.js |  2 +-
 .../reference/restParamAsOptional.js          |  4 ++--
 .../baselines/reference/restParamModifier2.js |  2 +-
 .../restParameterAssignmentCompatibility.js   |  2 +-
 .../restParameterNoTypeAnnotation.js          |  2 +-
 ...estParameterWithoutAnnotationIsAnyArray.js | 10 +++++-----
 .../restParametersOfNonArrayTypes.js          | 10 +++++-----
 .../restParametersOfNonArrayTypes2.js         | 20 +++++++++----------
 .../restParametersWithArrayTypeAnnotations.js | 20 +++++++++----------
 .../reference/restParamsWithNonRestParams.js  |  2 +-
 .../stringLiteralTypeIsSubtypeOfString.js     |  2 +-
 .../stringLiteralTypesOverloads03.js          |  4 ++--
 .../reference/subtypingWithCallSignatures2.js |  4 ++--
 .../reference/subtypingWithCallSignatures3.js |  4 ++--
 ...taggedTemplateStringsHexadecimalEscapes.js |  2 +-
 ...sPlainCharactersThatArePartsOfEscapes01.js |  2 +-
 ...gedTemplateStringsWithMultilineTemplate.js |  2 +-
 ...dTemplateStringsWithOverloadResolution1.js |  2 +-
 ...dTemplateStringsWithOverloadResolution2.js |  4 ++--
 ...tionExpressionsInSubstitutionExpression.js |  2 +-
 ...taggedTemplateStringsWithUnicodeEscapes.js |  2 +-
 ...gedTemplateStringsWithWhitespaceEscapes.js |  2 +-
 ...gCommasInFunctionParametersAndArguments.js |  2 +-
 .../typeArgumentsWithStringLiteralTypes01.js  |  2 +-
 .../reference/typeGuardFunctionErrors.js      |  2 +-
 .../reference/undeclaredModuleError.js        |  2 +-
 .../reference/unionTypeCallSignatures3.js     |  2 +-
 .../unusedParametersWithUnderscore.js         |  4 ++--
 .../varArgConstructorMemberParameter.js       |  4 ++--
 .../reference/varArgParamTypeCheck.js         |  2 +-
 .../reference/varArgWithNoParamName.js        |  2 +-
 tests/baselines/reference/vararg.js           |  2 +-
 96 files changed, 170 insertions(+), 168 deletions(-)

diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts
index 838e58ae99b..bc9341a4b4f 100644
--- a/src/compiler/transformers/es2015.ts
+++ b/src/compiler/transformers/es2015.ts
@@ -1306,7 +1306,9 @@ namespace ts {
                             createAssignment(
                                 createElementAccess(
                                     expressionName,
-                                    createSubtract(temp, createLiteral(restIndex))
+                                    restIndex === 0
+                                        ? temp
+                                        : createSubtract(temp, createLiteral(restIndex))
                                 ),
                                 createElementAccess(createIdentifier("arguments"), temp)
                             ),
diff --git a/tests/baselines/reference/accessorWithRestParam.js b/tests/baselines/reference/accessorWithRestParam.js
index a58a7db1c52..871f3ed00ef 100644
--- a/tests/baselines/reference/accessorWithRestParam.js
+++ b/tests/baselines/reference/accessorWithRestParam.js
@@ -13,7 +13,7 @@ var C = (function () {
         set: function () {
             var v = [];
             for (var _i = 0; _i < arguments.length; _i++) {
-                v[_i - 0] = arguments[_i];
+                v[_i] = arguments[_i];
             }
         },
         enumerable: true,
@@ -23,7 +23,7 @@ var C = (function () {
         set: function () {
             var v2 = [];
             for (var _i = 0; _i < arguments.length; _i++) {
-                v2[_i - 0] = arguments[_i];
+                v2[_i] = arguments[_i];
             }
         },
         enumerable: true,
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignaturesWithRestParameters.js b/tests/baselines/reference/assignmentCompatWithCallSignaturesWithRestParameters.js
index f4cf5cc79e2..ec86f218ac0 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignaturesWithRestParameters.js
+++ b/tests/baselines/reference/assignmentCompatWithCallSignaturesWithRestParameters.js
@@ -52,14 +52,14 @@ a = function () { return 1; }; // ok, same number of required params
 a = function () {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i - 0] = arguments[_i];
+        args[_i] = arguments[_i];
     }
     return 1;
 }; // ok, same number of required params
 a = function () {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i - 0] = arguments[_i];
+        args[_i] = arguments[_i];
     }
     return 1;
 }; // error, type mismatch
@@ -72,7 +72,7 @@ a2 = function () { return 1; }; // ok, fewer required params
 a2 = function () {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i - 0] = arguments[_i];
+        args[_i] = arguments[_i];
     }
     return 1;
 }; // ok, fewer required params
diff --git a/tests/baselines/reference/baseTypeAfterDerivedType.js b/tests/baselines/reference/baseTypeAfterDerivedType.js
index b80b62712f5..c4ca7cf7b33 100644
--- a/tests/baselines/reference/baseTypeAfterDerivedType.js
+++ b/tests/baselines/reference/baseTypeAfterDerivedType.js
@@ -23,7 +23,7 @@ var Derived2 = (function () {
     Derived2.prototype.method = function () {
         var args = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i - 0] = arguments[_i];
+            args[_i] = arguments[_i];
         }
     };
     return Derived2;
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js
index 8c7f18b77f6..4cce975d6d9 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js
@@ -17,7 +17,7 @@ var Based = (function () {
     function Based() {
         var arg = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            arg[_i - 0] = arguments[_i];
+            arg[_i] = arguments[_i];
         }
     }
     return Based;
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.js
index cc8912230ab..782e3236271 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.js
@@ -20,7 +20,7 @@ var Base = (function () {
     function Base() {
         var arg = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            arg[_i - 0] = arguments[_i];
+            arg[_i] = arguments[_i];
         }
     }
     return Base;
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.js
index 25a480b9b57..5dd3708a3bb 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.js
@@ -20,7 +20,7 @@ var Base = (function () {
     function Base() {
         var arg = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            arg[_i - 0] = arguments[_i];
+            arg[_i] = arguments[_i];
         }
     }
     return Base;
diff --git a/tests/baselines/reference/collisionArgumentsArrowFunctions.js b/tests/baselines/reference/collisionArgumentsArrowFunctions.js
index 0aa939e1a2d..3e56b8b2f9c 100644
--- a/tests/baselines/reference/collisionArgumentsArrowFunctions.js
+++ b/tests/baselines/reference/collisionArgumentsArrowFunctions.js
@@ -37,7 +37,7 @@ var f1NoError = function (arguments) {
 var f2 = function () {
     var restParameters = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        restParameters[_i - 0] = arguments[_i];
+        restParameters[_i] = arguments[_i];
     }
     var arguments = 10; // No Error
 };
diff --git a/tests/baselines/reference/collisionArgumentsClassConstructor.js b/tests/baselines/reference/collisionArgumentsClassConstructor.js
index 570b10d39d3..57ffa88f4e1 100644
--- a/tests/baselines/reference/collisionArgumentsClassConstructor.js
+++ b/tests/baselines/reference/collisionArgumentsClassConstructor.js
@@ -118,7 +118,7 @@ var c2 = (function () {
     function c2() {
         var restParameters = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            restParameters[_i - 0] = arguments[_i];
+            restParameters[_i] = arguments[_i];
         }
         var arguments = 10; // no error
     }
diff --git a/tests/baselines/reference/collisionArgumentsClassMethod.js b/tests/baselines/reference/collisionArgumentsClassMethod.js
index a20e0385e6a..85610926e35 100644
--- a/tests/baselines/reference/collisionArgumentsClassMethod.js
+++ b/tests/baselines/reference/collisionArgumentsClassMethod.js
@@ -94,7 +94,7 @@ var c3 = (function () {
     c3.prototype.foo = function () {
         var restParameters = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            restParameters[_i - 0] = arguments[_i];
+            restParameters[_i] = arguments[_i];
         }
         var arguments = 10; // no error
     };
diff --git a/tests/baselines/reference/collisionArgumentsFunction.js b/tests/baselines/reference/collisionArgumentsFunction.js
index 9ce4a5ab0e2..c6a26baa495 100644
--- a/tests/baselines/reference/collisionArgumentsFunction.js
+++ b/tests/baselines/reference/collisionArgumentsFunction.js
@@ -66,7 +66,7 @@ function f1NoError(arguments) {
 function f3() {
     var restParameters = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        restParameters[_i - 0] = arguments[_i];
+        restParameters[_i] = arguments[_i];
     }
     var arguments = 10; // no error
 }
diff --git a/tests/baselines/reference/collisionArgumentsFunctionExpressions.js b/tests/baselines/reference/collisionArgumentsFunctionExpressions.js
index 405ceb625c3..b3389ddbf4a 100644
--- a/tests/baselines/reference/collisionArgumentsFunctionExpressions.js
+++ b/tests/baselines/reference/collisionArgumentsFunctionExpressions.js
@@ -56,7 +56,7 @@ function foo() {
     function f3() {
         var restParameters = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            restParameters[_i - 0] = arguments[_i];
+            restParameters[_i] = arguments[_i];
         }
         var arguments = 10; // no error
     }
diff --git a/tests/baselines/reference/collisionRestParameterArrowFunctions.js b/tests/baselines/reference/collisionRestParameterArrowFunctions.js
index 39d449555db..3e20f48a4d0 100644
--- a/tests/baselines/reference/collisionRestParameterArrowFunctions.js
+++ b/tests/baselines/reference/collisionRestParameterArrowFunctions.js
@@ -27,7 +27,7 @@ var f1NoError = function (_i) {
 var f2 = function () {
     var restParameters = [];
     for (var _a = 0; _a < arguments.length; _a++) {
-        restParameters[_a - 0] = arguments[_a];
+        restParameters[_a] = arguments[_a];
     }
     var _i = 10; // No Error
 };
diff --git a/tests/baselines/reference/collisionRestParameterClassConstructor.js b/tests/baselines/reference/collisionRestParameterClassConstructor.js
index 82d2ddc0896..f97e49531f6 100644
--- a/tests/baselines/reference/collisionRestParameterClassConstructor.js
+++ b/tests/baselines/reference/collisionRestParameterClassConstructor.js
@@ -88,7 +88,7 @@ var c2 = (function () {
     function c2() {
         var restParameters = [];
         for (var _a = 0; _a < arguments.length; _a++) {
-            restParameters[_a - 0] = arguments[_a];
+            restParameters[_a] = arguments[_a];
         }
         var _i = 10; // no error
     }
diff --git a/tests/baselines/reference/collisionRestParameterClassMethod.js b/tests/baselines/reference/collisionRestParameterClassMethod.js
index eb92faa7b2a..cda717c79ab 100644
--- a/tests/baselines/reference/collisionRestParameterClassMethod.js
+++ b/tests/baselines/reference/collisionRestParameterClassMethod.js
@@ -70,7 +70,7 @@ var c3 = (function () {
     c3.prototype.foo = function () {
         var restParameters = [];
         for (var _a = 0; _a < arguments.length; _a++) {
-            restParameters[_a - 0] = arguments[_a];
+            restParameters[_a] = arguments[_a];
         }
         var _i = 10; // no error
     };
diff --git a/tests/baselines/reference/collisionRestParameterFunction.js b/tests/baselines/reference/collisionRestParameterFunction.js
index 8660e8f5db0..651062a696c 100644
--- a/tests/baselines/reference/collisionRestParameterFunction.js
+++ b/tests/baselines/reference/collisionRestParameterFunction.js
@@ -48,7 +48,7 @@ function f1NoError(_i) {
 function f3() {
     var restParameters = [];
     for (var _a = 0; _a < arguments.length; _a++) {
-        restParameters[_a - 0] = arguments[_a];
+        restParameters[_a] = arguments[_a];
     }
     var _i = 10; // no error
 }
diff --git a/tests/baselines/reference/collisionRestParameterFunctionExpressions.js b/tests/baselines/reference/collisionRestParameterFunctionExpressions.js
index 22709b087eb..87bafea09bd 100644
--- a/tests/baselines/reference/collisionRestParameterFunctionExpressions.js
+++ b/tests/baselines/reference/collisionRestParameterFunctionExpressions.js
@@ -39,7 +39,7 @@ function foo() {
     function f3() {
         var restParameters = [];
         for (var _a = 0; _a < arguments.length; _a++) {
-            restParameters[_a - 0] = arguments[_a];
+            restParameters[_a] = arguments[_a];
         }
         var _i = 10; // no error
     }
diff --git a/tests/baselines/reference/collisionRestParameterUnderscoreIUsage.js b/tests/baselines/reference/collisionRestParameterUnderscoreIUsage.js
index 97e82a1523f..1d7f9f43f7c 100644
--- a/tests/baselines/reference/collisionRestParameterUnderscoreIUsage.js
+++ b/tests/baselines/reference/collisionRestParameterUnderscoreIUsage.js
@@ -14,7 +14,7 @@ var Foo = (function () {
     function Foo() {
         var args = [];
         for (var _a = 0; _a < arguments.length; _a++) {
-            args[_a - 0] = arguments[_a];
+            args[_a] = arguments[_a];
         }
         console.log(_i); // This should result in error
     }
diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js
index 1ee309b0eb4..d4cd737ab46 100644
--- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js
+++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js
@@ -297,7 +297,7 @@ var TypeScriptAllInOne;
         Program.Main = function () {
             var args = [];
             for (var _i = 0; _i < arguments.length; _i++) {
-                args[_i - 0] = arguments[_i];
+                args[_i] = arguments[_i];
             }
             try {
                 var bfs = new BasicFeatures();
diff --git a/tests/baselines/reference/contextuallyTypedIife.js b/tests/baselines/reference/contextuallyTypedIife.js
index 0a84e45e30b..d2eaaf9c2d5 100644
--- a/tests/baselines/reference/contextuallyTypedIife.js
+++ b/tests/baselines/reference/contextuallyTypedIife.js
@@ -57,21 +57,21 @@ let eleven = (o => o.a(11))({ a: function(n) { return n; } });
 (function () {
     var numbers = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        numbers[_i - 0] = arguments[_i];
+        numbers[_i] = arguments[_i];
     }
     return numbers.every(function (n) { return n > 0; });
 })(5, 6, 7);
 (function () {
     var mixed = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        mixed[_i - 0] = arguments[_i];
+        mixed[_i] = arguments[_i];
     }
     return mixed.every(function (n) { return !!n; });
 })(5, 'oops', 'oh no');
 (function () {
     var noNumbers = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        noNumbers[_i - 0] = arguments[_i];
+        noNumbers[_i] = arguments[_i];
     }
     return noNumbers.some(function (n) { return n > 0; });
 })();
diff --git a/tests/baselines/reference/contextuallyTypingRestParameters.js b/tests/baselines/reference/contextuallyTypingRestParameters.js
index 17561f5d7fc..8a1f2ffbdfb 100644
--- a/tests/baselines/reference/contextuallyTypingRestParameters.js
+++ b/tests/baselines/reference/contextuallyTypingRestParameters.js
@@ -11,7 +11,7 @@ var x: (...y: string[]) => void = function (.../*3*/y) {
 var x = function () {
     var y = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        y[_i - 0] = arguments[_i];
+        y[_i] = arguments[_i];
     }
     var t = y;
     var x2 = t; // This should be error
diff --git a/tests/baselines/reference/declFileRestParametersOfFunctionAndFunctionType.js b/tests/baselines/reference/declFileRestParametersOfFunctionAndFunctionType.js
index 563551d67a8..894f50fc5ab 100644
--- a/tests/baselines/reference/declFileRestParametersOfFunctionAndFunctionType.js
+++ b/tests/baselines/reference/declFileRestParametersOfFunctionAndFunctionType.js
@@ -14,7 +14,7 @@ var f6 = () => { return [<any>10]; }
 function f1() {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i - 0] = arguments[_i];
+        args[_i] = arguments[_i];
     }
 }
 function f2(x) { }
diff --git a/tests/baselines/reference/declarationEmitDestructuringOptionalBindingParametersInOverloads.js b/tests/baselines/reference/declarationEmitDestructuringOptionalBindingParametersInOverloads.js
index a3cdee31222..941bb383f81 100644
--- a/tests/baselines/reference/declarationEmitDestructuringOptionalBindingParametersInOverloads.js
+++ b/tests/baselines/reference/declarationEmitDestructuringOptionalBindingParametersInOverloads.js
@@ -13,13 +13,13 @@ function foo2(...rest: any[]) {
 function foo() {
     var rest = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        rest[_i - 0] = arguments[_i];
+        rest[_i] = arguments[_i];
     }
 }
 function foo2() {
     var rest = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        rest[_i - 0] = arguments[_i];
+        rest[_i] = arguments[_i];
     }
 }
 
diff --git a/tests/baselines/reference/defaultExportWithOverloads01.js b/tests/baselines/reference/defaultExportWithOverloads01.js
index f88d60182db..770b685378d 100644
--- a/tests/baselines/reference/defaultExportWithOverloads01.js
+++ b/tests/baselines/reference/defaultExportWithOverloads01.js
@@ -10,7 +10,7 @@ export default function f(...args: any[]) {
 function f() {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i - 0] = arguments[_i];
+        args[_i] = arguments[_i];
     }
 }
 Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/destructuringParameterDeclaration4.js b/tests/baselines/reference/destructuringParameterDeclaration4.js
index 44838d600d8..52007df17c9 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration4.js
+++ b/tests/baselines/reference/destructuringParameterDeclaration4.js
@@ -43,31 +43,31 @@ foo1(1, 2, "string", E1.a, E.b);  // Error
 function a0() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 } // Error, rest parameter must be array type
 function a1() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 }
 function a2() {
     var a = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        a[_i - 0] = arguments[_i];
+        a[_i] = arguments[_i];
     }
 } // Error, rest parameter must be array type
 function a3() {
     var b = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        b[_i - 0] = arguments[_i];
+        b[_i] = arguments[_i];
     }
 } // Error, can't be optional
 function a4() {
     var b = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        b[_i - 0] = arguments[_i];
+        b[_i] = arguments[_i];
     }
 } // Error, can't have initializer
 function a5(_a) {
@@ -86,7 +86,7 @@ var C = (function () {
     function C() {
         var temp = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            temp[_i - 0] = arguments[_i];
+            temp[_i] = arguments[_i];
         }
         this.temp = temp;
     } // Error, rest parameter can't have properties
@@ -96,7 +96,7 @@ var C = (function () {
 function foo1() {
     var a = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        a[_i - 0] = arguments[_i];
+        a[_i] = arguments[_i];
     }
 }
 foo1(1, 2, "string", E1.a, E.b); // Error
diff --git a/tests/baselines/reference/destructuringParameterDeclaration6.js b/tests/baselines/reference/destructuringParameterDeclaration6.js
index 03307415b65..a8c7f65211f 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration6.js
+++ b/tests/baselines/reference/destructuringParameterDeclaration6.js
@@ -40,20 +40,20 @@ while (, )
 function a5() {
     var  = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        [_i - 0] = arguments[_i];
+        [_i] = arguments[_i];
     }
 }
 while () { }
 function a6() {
     var public = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        public[_i - 0] = arguments[_i];
+        public[_i] = arguments[_i];
     }
 }
 function a7() {
     var a = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        a[_i - 0] = arguments[_i];
+        a[_i] = arguments[_i];
     }
 }
 a({ "while": 1 });
diff --git a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.js b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.js
index 51ae4090ae1..495ac29f269 100644
--- a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.js
+++ b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.js
@@ -19,7 +19,7 @@ var TestFile = (function () {
         return function () {
             var x = [];
             for (var _i = 0; _i < arguments.length; _i++) {
-                x[_i - 0] = arguments[_i];
+                x[_i] = arguments[_i];
             }
             /// <summary>Test summary</summary>
             /// <param name="message" type="String" />
diff --git a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.js b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.js
index 22dfe4bbc44..e6ced9a8a42 100644
--- a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.js
+++ b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.js
@@ -23,7 +23,7 @@ var TestFile = (function () {
             /// <returns type="Function" />
             var x = [];
             for (var _i = 0; _i < arguments.length; _i++) {
-                x[_i - 0] = arguments[_i];
+                x[_i] = arguments[_i];
             }
             return message + _this.name;
         };
diff --git a/tests/baselines/reference/disallowLineTerminatorBeforeArrow.js b/tests/baselines/reference/disallowLineTerminatorBeforeArrow.js
index 0c6b98def4f..9f0d04d301c 100644
--- a/tests/baselines/reference/disallowLineTerminatorBeforeArrow.js
+++ b/tests/baselines/reference/disallowLineTerminatorBeforeArrow.js
@@ -92,13 +92,13 @@ var f4 = function (x, y) {
 var f5 = function () {
     var rest = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        rest[_i - 0] = arguments[_i];
+        rest[_i] = arguments[_i];
     }
 };
 var f6 = function () {
     var rest = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        rest[_i - 0] = arguments[_i];
+        rest[_i] = arguments[_i];
     }
 };
 var f7 = function (x, y, z) {
diff --git a/tests/baselines/reference/emitDecoratorMetadata_restArgs.js b/tests/baselines/reference/emitDecoratorMetadata_restArgs.js
index ec8240b2642..4bc1f023212 100644
--- a/tests/baselines/reference/emitDecoratorMetadata_restArgs.js
+++ b/tests/baselines/reference/emitDecoratorMetadata_restArgs.js
@@ -32,13 +32,13 @@ var A = (function () {
     function A() {
         var args = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i - 0] = arguments[_i];
+            args[_i] = arguments[_i];
         }
     }
     A.prototype.method = function () {
         var args = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i - 0] = arguments[_i];
+            args[_i] = arguments[_i];
         }
     };
     return A;
@@ -57,13 +57,13 @@ var B = (function () {
     function B() {
         var args = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i - 0] = arguments[_i];
+            args[_i] = arguments[_i];
         }
     }
     B.prototype.method = function () {
         var args = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i - 0] = arguments[_i];
+            args[_i] = arguments[_i];
         }
     };
     return B;
diff --git a/tests/baselines/reference/emitRestParametersFunction.js b/tests/baselines/reference/emitRestParametersFunction.js
index 01116f2ac92..dff77ad4b55 100644
--- a/tests/baselines/reference/emitRestParametersFunction.js
+++ b/tests/baselines/reference/emitRestParametersFunction.js
@@ -6,7 +6,7 @@ function foo(x: number, y: string, ...rest) { }
 function bar() {
     var rest = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        rest[_i - 0] = arguments[_i];
+        rest[_i] = arguments[_i];
     }
 }
 function foo(x, y) {
diff --git a/tests/baselines/reference/emitRestParametersFunctionExpression.js b/tests/baselines/reference/emitRestParametersFunctionExpression.js
index da87cc79f2d..55d4b505808 100644
--- a/tests/baselines/reference/emitRestParametersFunctionExpression.js
+++ b/tests/baselines/reference/emitRestParametersFunctionExpression.js
@@ -9,7 +9,7 @@ var funcExp3 = (function (...rest) { })()
 var funcExp = function () {
     var rest = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        rest[_i - 0] = arguments[_i];
+        rest[_i] = arguments[_i];
     }
 };
 var funcExp1 = function (X) {
@@ -21,12 +21,12 @@ var funcExp1 = function (X) {
 var funcExp2 = function () {
     var rest = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        rest[_i - 0] = arguments[_i];
+        rest[_i] = arguments[_i];
     }
 };
 var funcExp3 = (function () {
     var rest = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        rest[_i - 0] = arguments[_i];
+        rest[_i] = arguments[_i];
     }
 })();
diff --git a/tests/baselines/reference/emitRestParametersFunctionProperty.js b/tests/baselines/reference/emitRestParametersFunctionProperty.js
index 4fd60a9269d..99d004daeb2 100644
--- a/tests/baselines/reference/emitRestParametersFunctionProperty.js
+++ b/tests/baselines/reference/emitRestParametersFunctionProperty.js
@@ -13,7 +13,7 @@ var obj2 = {
     func: function () {
         var rest = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            rest[_i - 0] = arguments[_i];
+            rest[_i] = arguments[_i];
         }
     }
 };
diff --git a/tests/baselines/reference/emitRestParametersMethod.js b/tests/baselines/reference/emitRestParametersMethod.js
index 1dec771cde8..fed2138f36b 100644
--- a/tests/baselines/reference/emitRestParametersMethod.js
+++ b/tests/baselines/reference/emitRestParametersMethod.js
@@ -24,7 +24,7 @@ var C = (function () {
     C.prototype.bar = function () {
         var rest = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            rest[_i - 0] = arguments[_i];
+            rest[_i] = arguments[_i];
         }
     };
     C.prototype.foo = function (x) {
@@ -39,13 +39,13 @@ var D = (function () {
     function D() {
         var rest = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            rest[_i - 0] = arguments[_i];
+            rest[_i] = arguments[_i];
         }
     }
     D.prototype.bar = function () {
         var rest = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            rest[_i - 0] = arguments[_i];
+            rest[_i] = arguments[_i];
         }
     };
     D.prototype.foo = function (x) {
diff --git a/tests/baselines/reference/emitSkipsThisWithRestParameter.js b/tests/baselines/reference/emitSkipsThisWithRestParameter.js
index d1e99f9409d..5645a7e0636 100644
--- a/tests/baselines/reference/emitSkipsThisWithRestParameter.js
+++ b/tests/baselines/reference/emitSkipsThisWithRestParameter.js
@@ -11,7 +11,7 @@ function rebase(fn) {
     return function () {
         var args = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i - 0] = arguments[_i];
+            args[_i] = arguments[_i];
         }
         return fn.apply(this, [this].concat(args));
     };
diff --git a/tests/baselines/reference/es6ClassTest2.js b/tests/baselines/reference/es6ClassTest2.js
index de5657b087e..533b332422d 100644
--- a/tests/baselines/reference/es6ClassTest2.js
+++ b/tests/baselines/reference/es6ClassTest2.js
@@ -236,7 +236,7 @@ var SplatMonster = (function () {
     function SplatMonster() {
         var args = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i - 0] = arguments[_i];
+            args[_i] = arguments[_i];
         }
     }
     SplatMonster.prototype.roar = function (name) {
diff --git a/tests/baselines/reference/es6modulekindWithES5Target6.js b/tests/baselines/reference/es6modulekindWithES5Target6.js
index d305c60e54e..cff2327dacb 100644
--- a/tests/baselines/reference/es6modulekindWithES5Target6.js
+++ b/tests/baselines/reference/es6modulekindWithES5Target6.js
@@ -17,7 +17,7 @@ export function f1(d) {
 export function f2() {
     var arg = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        arg[_i - 0] = arguments[_i];
+        arg[_i] = arguments[_i];
     }
 }
 export default function f3(d) {
diff --git a/tests/baselines/reference/fatarrowfunctionsErrors.js b/tests/baselines/reference/fatarrowfunctionsErrors.js
index ced4660d8d1..0f318f1aa84 100644
--- a/tests/baselines/reference/fatarrowfunctionsErrors.js
+++ b/tests/baselines/reference/fatarrowfunctionsErrors.js
@@ -16,7 +16,7 @@ var x4= (...a: any[]) { };
 foo(function () {
     var Far = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        Far[_i - 0] = arguments[_i];
+        Far[_i] = arguments[_i];
     }
     return 0;
 });
@@ -36,6 +36,6 @@ var x3 = function (a) { };
 var x4 = function () {
     var a = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        a[_i - 0] = arguments[_i];
+        a[_i] = arguments[_i];
     }
 };
diff --git a/tests/baselines/reference/fatarrowfunctionsOptionalArgs.js b/tests/baselines/reference/fatarrowfunctionsOptionalArgs.js
index e6e43f8bbf4..f7e49680f8a 100644
--- a/tests/baselines/reference/fatarrowfunctionsOptionalArgs.js
+++ b/tests/baselines/reference/fatarrowfunctionsOptionalArgs.js
@@ -159,7 +159,7 @@ foo(
 (function () {
     var arg = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        arg[_i - 0] = arguments[_i];
+        arg[_i] = arguments[_i];
     }
     return 8;
 });
@@ -203,7 +203,7 @@ foo(
 (function () {
     var arg = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        arg[_i - 0] = arguments[_i];
+        arg[_i] = arguments[_i];
     }
     return 28;
 });
@@ -226,7 +226,7 @@ false ? function (arg) {
 false ? function () {
     var arg = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        arg[_i - 0] = arguments[_i];
+        arg[_i] = arguments[_i];
     }
     return 48;
 } : null;
@@ -247,7 +247,7 @@ false ? (function (arg) {
 false ? (function () {
     var arg = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        arg[_i - 0] = arguments[_i];
+        arg[_i] = arguments[_i];
     }
     return 58;
 }) : null;
@@ -268,7 +268,7 @@ false ? null : function (arg) {
 false ? null : function () {
     var arg = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        arg[_i - 0] = arguments[_i];
+        arg[_i] = arguments[_i];
     }
     return 68;
 };
@@ -294,7 +294,7 @@ false ? null : function () {
 (function () {
     var arg = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        arg[_i - 0] = arguments[_i];
+        arg[_i] = arguments[_i];
     }
     return 96;
 }) instanceof Function;
@@ -326,13 +326,13 @@ false ? null : function () {
 (function () {
     var arg = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        arg[_i - 0] = arguments[_i];
+        arg[_i] = arguments[_i];
     }
     return 0;
 }) + '' + (function () {
     var arg = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        arg[_i - 0] = arguments[_i];
+        arg[_i] = arguments[_i];
     }
     return 107;
 });
@@ -354,7 +354,7 @@ false ? null : function () {
 function foo() {
     var arg = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        arg[_i - 0] = arguments[_i];
+        arg[_i] = arguments[_i];
     }
 }
 foo(function (a) { return 110; }, (function (a) { return 111; }), function (a) {
@@ -371,7 +371,7 @@ foo(function (a) { return 110; }, (function (a) { return 111; }), function (a) {
 }, function () {
     var a = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        a[_i - 0] = arguments[_i];
+        a[_i] = arguments[_i];
     }
     return 119;
 }, function (a, b) {
diff --git a/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors1.js b/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors1.js
index 4d27f8230eb..edbc897922c 100644
--- a/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors1.js
+++ b/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors1.js
@@ -12,21 +12,21 @@
 (function () {
     var arg = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        arg[_i - 0] = arguments[_i];
+        arg[_i] = arguments[_i];
     }
     return 102;
 });
 (function () {
     var arg = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        arg[_i - 0] = arguments[_i];
+        arg[_i] = arguments[_i];
     }
     return 103;
 });
 (function () {
     var arg = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        arg[_i - 0] = arguments[_i];
+        arg[_i] = arguments[_i];
     }
     return 104;
 });
diff --git a/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors3.js b/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors3.js
index 665c5244016..d5d4b099a06 100644
--- a/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors3.js
+++ b/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors3.js
@@ -6,7 +6,7 @@
 (function () {
     var  = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        [_i - 0] = arguments[_i];
+        [_i] = arguments[_i];
     }
     return 105;
 });
diff --git a/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors4.js b/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors4.js
index dfd7e9f74dc..0fbf4b7486e 100644
--- a/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors4.js
+++ b/tests/baselines/reference/fatarrowfunctionsOptionalArgsErrors4.js
@@ -56,7 +56,7 @@ foo(function (a) { return 110; }, (function (a) { return 111; }), function (a) {
 }, function () {
     var a = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        a[_i - 0] = arguments[_i];
+        a[_i] = arguments[_i];
     }
     return 119;
 }, function (a, b) {
diff --git a/tests/baselines/reference/functionCall10.js b/tests/baselines/reference/functionCall10.js
index 9d5cb33a56a..51ed76990b3 100644
--- a/tests/baselines/reference/functionCall10.js
+++ b/tests/baselines/reference/functionCall10.js
@@ -10,7 +10,7 @@ foo(1, 'bar');
 function foo() {
     var a = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        a[_i - 0] = arguments[_i];
+        a[_i] = arguments[_i];
     }
 }
 ;
diff --git a/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.js b/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.js
index 1d38d65ad38..b616d18c974 100644
--- a/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.js
+++ b/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.js
@@ -28,7 +28,7 @@ var A = (function () {
 function Choice() {
     var v_args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        v_args[_i - 0] = arguments[_i];
+        v_args[_i] = arguments[_i];
     }
     return new A();
 }
diff --git a/tests/baselines/reference/genericRestArgs.js b/tests/baselines/reference/genericRestArgs.js
index 75c88d7cbf2..1cfeb61e169 100644
--- a/tests/baselines/reference/genericRestArgs.js
+++ b/tests/baselines/reference/genericRestArgs.js
@@ -16,7 +16,7 @@ var a2Gc = makeArrayG<any[]>(1, ""); // error
 function makeArrayG() {
     var items = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        items[_i - 0] = arguments[_i];
+        items[_i] = arguments[_i];
     }
     return items;
 }
diff --git a/tests/baselines/reference/implicitAnyDeclareFunctionWithoutFormalType.js b/tests/baselines/reference/implicitAnyDeclareFunctionWithoutFormalType.js
index c13479daff3..0b2ba6191ef 100644
--- a/tests/baselines/reference/implicitAnyDeclareFunctionWithoutFormalType.js
+++ b/tests/baselines/reference/implicitAnyDeclareFunctionWithoutFormalType.js
@@ -22,7 +22,7 @@ function func2(a, b, c) { }
 function func3() {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i - 0] = arguments[_i];
+        args[_i] = arguments[_i];
     }
 }
 ; // error at "args" 
diff --git a/tests/baselines/reference/inheritedConstructorWithRestParams.js b/tests/baselines/reference/inheritedConstructorWithRestParams.js
index c9db1756676..6a30836d728 100644
--- a/tests/baselines/reference/inheritedConstructorWithRestParams.js
+++ b/tests/baselines/reference/inheritedConstructorWithRestParams.js
@@ -24,7 +24,7 @@ var Base = (function () {
     function Base() {
         var a = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            a[_i - 0] = arguments[_i];
+            a[_i] = arguments[_i];
         }
     }
     return Base;
diff --git a/tests/baselines/reference/newWithSpread.js b/tests/baselines/reference/newWithSpread.js
index 91c502e50b9..c6ea3b44c15 100644
--- a/tests/baselines/reference/newWithSpread.js
+++ b/tests/baselines/reference/newWithSpread.js
@@ -107,7 +107,7 @@ function f(x, y) {
 function f2() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 }
 var B = (function () {
diff --git a/tests/baselines/reference/newWithSpreadES5.js b/tests/baselines/reference/newWithSpreadES5.js
index 92904062d0a..125ac9f0412 100644
--- a/tests/baselines/reference/newWithSpreadES5.js
+++ b/tests/baselines/reference/newWithSpreadES5.js
@@ -106,7 +106,7 @@ function f(x, y) {
 function f2() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 }
 var B = (function () {
diff --git a/tests/baselines/reference/noImplicitAnyParametersInBareFunctions.js b/tests/baselines/reference/noImplicitAnyParametersInBareFunctions.js
index 8efe32d3140..3b0b630b537 100644
--- a/tests/baselines/reference/noImplicitAnyParametersInBareFunctions.js
+++ b/tests/baselines/reference/noImplicitAnyParametersInBareFunctions.js
@@ -59,7 +59,7 @@ function f5(x, y, z) { }
 function f6() {
     var r = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        r[_i - 0] = arguments[_i];
+        r[_i] = arguments[_i];
     }
 }
 // Implicit-'any'/'any[]' errors for x, r.
@@ -82,7 +82,7 @@ var f12 = function (x, y, z) { return ""; };
 var f13 = function () {
     var r = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        r[_i - 0] = arguments[_i];
+        r[_i] = arguments[_i];
     }
     return "";
 };
diff --git a/tests/baselines/reference/noImplicitAnyParametersInClass.js b/tests/baselines/reference/noImplicitAnyParametersInClass.js
index 0e247936529..4ad093f56be 100644
--- a/tests/baselines/reference/noImplicitAnyParametersInClass.js
+++ b/tests/baselines/reference/noImplicitAnyParametersInClass.js
@@ -107,7 +107,7 @@ var C = (function () {
         this.pub_f13 = function () {
             var r = [];
             for (var _i = 0; _i < arguments.length; _i++) {
-                r[_i - 0] = arguments[_i];
+                r[_i] = arguments[_i];
             }
             return "";
         };
@@ -131,7 +131,7 @@ var C = (function () {
         this.priv_f13 = function () {
             var r = [];
             for (var _i = 0; _i < arguments.length; _i++) {
-                r[_i - 0] = arguments[_i];
+                r[_i] = arguments[_i];
             }
             return "";
         };
@@ -158,7 +158,7 @@ var C = (function () {
     C.prototype.pub_f6 = function () {
         var r = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            r[_i - 0] = arguments[_i];
+            r[_i] = arguments[_i];
         }
     };
     // Implicit-'any'/'any[]' errors for x, r.
@@ -184,7 +184,7 @@ var C = (function () {
     C.prototype.priv_f6 = function () {
         var r = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            r[_i - 0] = arguments[_i];
+            r[_i] = arguments[_i];
         }
     };
     // Implicit-'any'/'any[]' errors for x, r.
diff --git a/tests/baselines/reference/noImplicitAnyParametersInModule.js b/tests/baselines/reference/noImplicitAnyParametersInModule.js
index e7f30205559..1866696fe34 100644
--- a/tests/baselines/reference/noImplicitAnyParametersInModule.js
+++ b/tests/baselines/reference/noImplicitAnyParametersInModule.js
@@ -63,7 +63,7 @@ var M;
     function m_f6() {
         var r = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            r[_i - 0] = arguments[_i];
+            r[_i] = arguments[_i];
         }
     }
     // Implicit-'any'/'any[]' errors for x and r.
@@ -86,7 +86,7 @@ var M;
     var m_f13 = function () {
         var r = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            r[_i - 0] = arguments[_i];
+            r[_i] = arguments[_i];
         }
         return "";
     };
diff --git a/tests/baselines/reference/nonArrayRestArgs.js b/tests/baselines/reference/nonArrayRestArgs.js
index d16b7dea346..813f7141b5c 100644
--- a/tests/baselines/reference/nonArrayRestArgs.js
+++ b/tests/baselines/reference/nonArrayRestArgs.js
@@ -8,7 +8,7 @@ function foo(...rest: number) { // error
 function foo() {
     var rest = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        rest[_i - 0] = arguments[_i];
+        rest[_i] = arguments[_i];
     }
     var x = rest[0];
     return x;
diff --git a/tests/baselines/reference/optionalBindingParametersInOverloads1.js b/tests/baselines/reference/optionalBindingParametersInOverloads1.js
index 3658efa72c6..9fd64d0da9e 100644
--- a/tests/baselines/reference/optionalBindingParametersInOverloads1.js
+++ b/tests/baselines/reference/optionalBindingParametersInOverloads1.js
@@ -13,7 +13,7 @@ foo([false, 0, ""]);
 function foo() {
     var rest = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        rest[_i - 0] = arguments[_i];
+        rest[_i] = arguments[_i];
     }
 }
 foo(["", 0, false]);
diff --git a/tests/baselines/reference/optionalBindingParametersInOverloads2.js b/tests/baselines/reference/optionalBindingParametersInOverloads2.js
index 1ddfdae4f07..033d81993f5 100644
--- a/tests/baselines/reference/optionalBindingParametersInOverloads2.js
+++ b/tests/baselines/reference/optionalBindingParametersInOverloads2.js
@@ -13,7 +13,7 @@ foo({ x: false, y: 0, z: "" });
 function foo() {
     var rest = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        rest[_i - 0] = arguments[_i];
+        rest[_i] = arguments[_i];
     }
 }
 foo({ x: "", y: 0, z: false });
diff --git a/tests/baselines/reference/overloadGenericFunctionWithRestArgs.js b/tests/baselines/reference/overloadGenericFunctionWithRestArgs.js
index 356cece5ab6..e83f33f3ad0 100644
--- a/tests/baselines/reference/overloadGenericFunctionWithRestArgs.js
+++ b/tests/baselines/reference/overloadGenericFunctionWithRestArgs.js
@@ -24,7 +24,7 @@ var A = (function () {
 function Choice() {
     var v_args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        v_args[_i - 0] = arguments[_i];
+        v_args[_i] = arguments[_i];
     }
     return new A();
 }
diff --git a/tests/baselines/reference/parenthesizedContexualTyping2.js b/tests/baselines/reference/parenthesizedContexualTyping2.js
index 993a10ba49c..48b9355ca31 100644
--- a/tests/baselines/reference/parenthesizedContexualTyping2.js
+++ b/tests/baselines/reference/parenthesizedContexualTyping2.js
@@ -45,7 +45,7 @@ var obj2: ObjType = ({ x: x => (x, undefined), y: y => (y, undefined) });
 function fun() {
     var rest = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        rest[_i - 0] = arguments[_i];
+        rest[_i] = arguments[_i];
     }
     return undefined;
 }
diff --git a/tests/baselines/reference/parser509668.js b/tests/baselines/reference/parser509668.js
index c767aea676a..5dfdc7d1e31 100644
--- a/tests/baselines/reference/parser509668.js
+++ b/tests/baselines/reference/parser509668.js
@@ -10,7 +10,7 @@ var Foo3 = (function () {
     function Foo3() {
         var args = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i - 0] = arguments[_i];
+            args[_i] = arguments[_i];
         }
         this.args = args;
     }
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration18.js b/tests/baselines/reference/parserMemberAccessorDeclaration18.js
index e25aa69f465..c6c902d4915 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration18.js
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration18.js
@@ -11,7 +11,7 @@ var C = (function () {
         set: function () {
             var a = [];
             for (var _i = 0; _i < arguments.length; _i++) {
-                a[_i - 0] = arguments[_i];
+                a[_i] = arguments[_i];
             }
         },
         enumerable: true,
diff --git a/tests/baselines/reference/parserParameterList10.js b/tests/baselines/reference/parserParameterList10.js
index 93ed8c60e8b..f899901728c 100644
--- a/tests/baselines/reference/parserParameterList10.js
+++ b/tests/baselines/reference/parserParameterList10.js
@@ -10,7 +10,7 @@ var C = (function () {
     C.prototype.foo = function () {
         var bar = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            bar[_i - 0] = arguments[_i];
+            bar[_i] = arguments[_i];
         }
     };
     return C;
diff --git a/tests/baselines/reference/parserParameterList11.js b/tests/baselines/reference/parserParameterList11.js
index a56e8b58c20..c736e5fddb6 100644
--- a/tests/baselines/reference/parserParameterList11.js
+++ b/tests/baselines/reference/parserParameterList11.js
@@ -5,7 +5,7 @@
 (function () {
     var arg = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        arg[_i - 0] = arguments[_i];
+        arg[_i] = arguments[_i];
     }
     return 102;
 });
diff --git a/tests/baselines/reference/parserParameterList9.js b/tests/baselines/reference/parserParameterList9.js
index ec08b48f572..3ccc1d02025 100644
--- a/tests/baselines/reference/parserParameterList9.js
+++ b/tests/baselines/reference/parserParameterList9.js
@@ -10,7 +10,7 @@ var C = (function () {
     C.prototype.foo = function () {
         var bar = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            bar[_i - 0] = arguments[_i];
+            bar[_i] = arguments[_i];
         }
     };
     return C;
diff --git a/tests/baselines/reference/partiallyAnnotatedFunctionInferenceWithTypeParameter.js b/tests/baselines/reference/partiallyAnnotatedFunctionInferenceWithTypeParameter.js
index d485fb11d7f..d20b35625e9 100644
--- a/tests/baselines/reference/partiallyAnnotatedFunctionInferenceWithTypeParameter.js
+++ b/tests/baselines/reference/partiallyAnnotatedFunctionInferenceWithTypeParameter.js
@@ -63,7 +63,7 @@ test(function (t1) { });
 test(function () {
     var ts = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        ts[_i - 0] = arguments[_i];
+        ts[_i] = arguments[_i];
     }
 });
 // source function has rest arg
diff --git a/tests/baselines/reference/restArgAssignmentCompat.js b/tests/baselines/reference/restArgAssignmentCompat.js
index 3f8749f332d..b679f56a881 100644
--- a/tests/baselines/reference/restArgAssignmentCompat.js
+++ b/tests/baselines/reference/restArgAssignmentCompat.js
@@ -13,7 +13,7 @@ n([4], 'foo');
 function f() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
     x.forEach(function (n, i) { return void ('item ' + i + ' = ' + n); });
 }
diff --git a/tests/baselines/reference/restArgMissingName.js b/tests/baselines/reference/restArgMissingName.js
index b87800c7dac..f4ec647f7e4 100644
--- a/tests/baselines/reference/restArgMissingName.js
+++ b/tests/baselines/reference/restArgMissingName.js
@@ -6,6 +6,6 @@ function sum (...) {}
 function sum() {
     var  = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        [_i - 0] = arguments[_i];
+        [_i] = arguments[_i];
     }
 }
diff --git a/tests/baselines/reference/restParamAsOptional.js b/tests/baselines/reference/restParamAsOptional.js
index eb224b84c33..2f6da684c0e 100644
--- a/tests/baselines/reference/restParamAsOptional.js
+++ b/tests/baselines/reference/restParamAsOptional.js
@@ -6,12 +6,12 @@ function f2(...x = []) { }
 function f() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 }
 function f2() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 }
diff --git a/tests/baselines/reference/restParamModifier2.js b/tests/baselines/reference/restParamModifier2.js
index a11b78a2376..e98aef3f9ad 100644
--- a/tests/baselines/reference/restParamModifier2.js
+++ b/tests/baselines/reference/restParamModifier2.js
@@ -8,7 +8,7 @@ var C = (function () {
     function C() {
         var rest = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            rest[_i - 0] = arguments[_i];
+            rest[_i] = arguments[_i];
         }
         this.rest = rest;
     }
diff --git a/tests/baselines/reference/restParameterAssignmentCompatibility.js b/tests/baselines/reference/restParameterAssignmentCompatibility.js
index 0821cf18277..01472c78c1e 100644
--- a/tests/baselines/reference/restParameterAssignmentCompatibility.js
+++ b/tests/baselines/reference/restParameterAssignmentCompatibility.js
@@ -33,7 +33,7 @@ var T = (function () {
     T.prototype.m = function () {
         var p3 = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            p3[_i - 0] = arguments[_i];
+            p3[_i] = arguments[_i];
         }
     };
     return T;
diff --git a/tests/baselines/reference/restParameterNoTypeAnnotation.js b/tests/baselines/reference/restParameterNoTypeAnnotation.js
index 95e092fdd43..b22b531675d 100644
--- a/tests/baselines/reference/restParameterNoTypeAnnotation.js
+++ b/tests/baselines/reference/restParameterNoTypeAnnotation.js
@@ -9,7 +9,7 @@ function foo(...rest) {
 function foo() {
     var rest = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        rest[_i - 0] = arguments[_i];
+        rest[_i] = arguments[_i];
     }
     var x = rest[0];
     return x;
diff --git a/tests/baselines/reference/restParameterWithoutAnnotationIsAnyArray.js b/tests/baselines/reference/restParameterWithoutAnnotationIsAnyArray.js
index c6b5fa2ae41..5c1db2c62e1 100644
--- a/tests/baselines/reference/restParameterWithoutAnnotationIsAnyArray.js
+++ b/tests/baselines/reference/restParameterWithoutAnnotationIsAnyArray.js
@@ -31,13 +31,13 @@ var b = {
 function foo() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 }
 var f = function foo() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 };
 var f2 = function () {
@@ -52,7 +52,7 @@ var C = (function () {
     C.prototype.foo = function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     };
     return C;
@@ -62,7 +62,7 @@ var b = {
     foo: function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     },
     a: function foo() {
@@ -74,7 +74,7 @@ var b = {
     b: function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     }
 };
diff --git a/tests/baselines/reference/restParametersOfNonArrayTypes.js b/tests/baselines/reference/restParametersOfNonArrayTypes.js
index 5400a8b43cc..67145167720 100644
--- a/tests/baselines/reference/restParametersOfNonArrayTypes.js
+++ b/tests/baselines/reference/restParametersOfNonArrayTypes.js
@@ -30,13 +30,13 @@ var b = {
 function foo() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 }
 var f = function foo() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 };
 var f2 = function () {
@@ -51,7 +51,7 @@ var C = (function () {
     C.prototype.foo = function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     };
     return C;
@@ -61,7 +61,7 @@ var b = {
     foo: function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     },
     a: function foo() {
@@ -73,7 +73,7 @@ var b = {
     b: function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     }
 };
diff --git a/tests/baselines/reference/restParametersOfNonArrayTypes2.js b/tests/baselines/reference/restParametersOfNonArrayTypes2.js
index d405c13db5a..7df2458a27b 100644
--- a/tests/baselines/reference/restParametersOfNonArrayTypes2.js
+++ b/tests/baselines/reference/restParametersOfNonArrayTypes2.js
@@ -62,13 +62,13 @@ var b2 = {
 function foo() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 }
 var f = function foo() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 };
 var f2 = function () {
@@ -83,7 +83,7 @@ var C = (function () {
     C.prototype.foo = function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     };
     return C;
@@ -93,7 +93,7 @@ var b = {
     foo: function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     },
     a: function foo() {
@@ -105,20 +105,20 @@ var b = {
     b: function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     }
 };
 function foo2() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 }
 var f3 = function foo() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 };
 var f4 = function () {
@@ -133,7 +133,7 @@ var C2 = (function () {
     C2.prototype.foo = function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     };
     return C2;
@@ -143,7 +143,7 @@ var b2 = {
     foo: function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     },
     a: function foo() {
@@ -155,7 +155,7 @@ var b2 = {
     b: function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     }
 };
diff --git a/tests/baselines/reference/restParametersWithArrayTypeAnnotations.js b/tests/baselines/reference/restParametersWithArrayTypeAnnotations.js
index 3f1cf33e7ba..1004fdfcbcb 100644
--- a/tests/baselines/reference/restParametersWithArrayTypeAnnotations.js
+++ b/tests/baselines/reference/restParametersWithArrayTypeAnnotations.js
@@ -57,13 +57,13 @@ var b2 = {
 function foo() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 }
 var f = function foo() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 };
 var f2 = function () {
@@ -78,7 +78,7 @@ var C = (function () {
     C.prototype.foo = function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     };
     return C;
@@ -88,7 +88,7 @@ var b = {
     foo: function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     },
     a: function foo() {
@@ -100,20 +100,20 @@ var b = {
     b: function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     }
 };
 function foo2() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 }
 var f3 = function foo() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 };
 var f4 = function () {
@@ -128,7 +128,7 @@ var C2 = (function () {
     C2.prototype.foo = function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     };
     return C2;
@@ -138,7 +138,7 @@ var b2 = {
     foo: function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     },
     a: function foo() {
@@ -150,7 +150,7 @@ var b2 = {
     b: function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
     }
 };
diff --git a/tests/baselines/reference/restParamsWithNonRestParams.js b/tests/baselines/reference/restParamsWithNonRestParams.js
index 6b0caa72394..7b16959143a 100644
--- a/tests/baselines/reference/restParamsWithNonRestParams.js
+++ b/tests/baselines/reference/restParamsWithNonRestParams.js
@@ -10,7 +10,7 @@ foo3(); // error but shouldn't be
 function foo() {
     var b = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        b[_i - 0] = arguments[_i];
+        b[_i] = arguments[_i];
     }
 }
 foo(); // ok
diff --git a/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.js b/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.js
index 78417b9a082..55ea1335771 100644
--- a/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.js
+++ b/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.js
@@ -120,7 +120,7 @@ var C = (function () {
     C.prototype.concat = function () {
         var strings = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            strings[_i - 0] = arguments[_i];
+            strings[_i] = arguments[_i];
         }
         return null;
     };
diff --git a/tests/baselines/reference/stringLiteralTypesOverloads03.js b/tests/baselines/reference/stringLiteralTypesOverloads03.js
index c1e79160880..4fdfd4f85d0 100644
--- a/tests/baselines/reference/stringLiteralTypesOverloads03.js
+++ b/tests/baselines/reference/stringLiteralTypesOverloads03.js
@@ -52,7 +52,7 @@ var helloOrWorld;
 function f() {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i - 0] = arguments[_i];
+        args[_i] = arguments[_i];
     }
     return undefined;
 }
@@ -62,7 +62,7 @@ var fResult3 = f(helloOrWorld);
 function g() {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i - 0] = arguments[_i];
+        args[_i] = arguments[_i];
     }
     return undefined;
 }
diff --git a/tests/baselines/reference/subtypingWithCallSignatures2.js b/tests/baselines/reference/subtypingWithCallSignatures2.js
index 843a727c33e..3b5fada2012 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures2.js
+++ b/tests/baselines/reference/subtypingWithCallSignatures2.js
@@ -253,14 +253,14 @@ var r9b = [r9arg2, r9arg1];
 var r10arg1 = function () {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
     return x[0];
 };
 var r10arg2 = function () {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
     return null;
 };
diff --git a/tests/baselines/reference/subtypingWithCallSignatures3.js b/tests/baselines/reference/subtypingWithCallSignatures3.js
index a9e7d01aab6..4ac7d3a7f24 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures3.js
+++ b/tests/baselines/reference/subtypingWithCallSignatures3.js
@@ -170,14 +170,14 @@ var Errors;
     var r4arg = function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
         return null;
     };
     var r4arg2 = function () {
         var x = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            x[_i - 0] = arguments[_i];
+            x[_i] = arguments[_i];
         }
         return null;
     };
diff --git a/tests/baselines/reference/taggedTemplateStringsHexadecimalEscapes.js b/tests/baselines/reference/taggedTemplateStringsHexadecimalEscapes.js
index e4482ded0c2..3df09abb2db 100644
--- a/tests/baselines/reference/taggedTemplateStringsHexadecimalEscapes.js
+++ b/tests/baselines/reference/taggedTemplateStringsHexadecimalEscapes.js
@@ -8,7 +8,7 @@ f `\x0D${ "Interrupted CRLF" }\x0A`;
 function f() {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i - 0] = arguments[_i];
+        args[_i] = arguments[_i];
     }
 }
 (_a = ["\r", "\n"], _a.raw = ["\\x0D", "\\x0A"], f(_a, "Interrupted CRLF"));
diff --git a/tests/baselines/reference/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes01.js b/tests/baselines/reference/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes01.js
index 9450e939f2f..33c2914e3e8 100644
--- a/tests/baselines/reference/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes01.js
+++ b/tests/baselines/reference/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes01.js
@@ -11,7 +11,7 @@ f `0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 2028 2029 0085 t v f b r
 function f() {
     var x = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        x[_i - 0] = arguments[_i];
+        x[_i] = arguments[_i];
     }
 }
 (_a = ["0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 2028 2029 0085 t v f b r n"], _a.raw = ["0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 2028 2029 0085 t v f b r n"], f(_a));
diff --git a/tests/baselines/reference/taggedTemplateStringsWithMultilineTemplate.js b/tests/baselines/reference/taggedTemplateStringsWithMultilineTemplate.js
index cee9d1efce4..9ffc0cadfef 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithMultilineTemplate.js
+++ b/tests/baselines/reference/taggedTemplateStringsWithMultilineTemplate.js
@@ -11,7 +11,7 @@ f `
 function f() {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i - 0] = arguments[_i];
+        args[_i] = arguments[_i];
     }
 }
 (_a = ["\n\n"], _a.raw = ["\n\\\n\n"], f(_a));
diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.js b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.js
index 4245b0cb0f4..19211c2fa8a 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.js
+++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution1.js
@@ -26,7 +26,7 @@ var z = foo `${1}${2}${3}`;  // any (with error)
 function foo() {
     var stuff = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        stuff[_i - 0] = arguments[_i];
+        stuff[_i] = arguments[_i];
     }
     return undefined;
 }
diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2.js b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2.js
index c16bfa5454f..fdac55da181 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2.js
+++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2.js
@@ -22,7 +22,7 @@ var d = foo2([], 1);
 function foo1() {
     var stuff = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        stuff[_i - 0] = arguments[_i];
+        stuff[_i] = arguments[_i];
     }
     return undefined;
 }
@@ -31,7 +31,7 @@ var b = foo1([], 1);
 function foo2() {
     var stuff = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        stuff[_i - 0] = arguments[_i];
+        stuff[_i] = arguments[_i];
     }
     return undefined;
 }
diff --git a/tests/baselines/reference/taggedTemplateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpression.js b/tests/baselines/reference/taggedTemplateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpression.js
index f7523eb9870..334f61e453d 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpression.js
+++ b/tests/baselines/reference/taggedTemplateStringsWithTypeErrorInFunctionExpressionsInSubstitutionExpression.js
@@ -10,7 +10,7 @@ foo `${function (x: number) { x = "bad"; } }`;
 function foo() {
     var rest = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        rest[_i - 0] = arguments[_i];
+        rest[_i] = arguments[_i];
     }
 }
 (_a = ["", ""], _a.raw = ["", ""], foo(_a, function (x) { x = "bad"; }));
diff --git a/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.js b/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.js
index ae73b0b227e..6a04b082e1f 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.js
+++ b/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.js
@@ -8,7 +8,7 @@ f `'\u{1f4a9}'${ " should be converted to " }'\uD83D\uDCA9'`;
 function f() {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i - 0] = arguments[_i];
+        args[_i] = arguments[_i];
     }
 }
 (_a = ["'\uD83D\uDCA9'", "'\uD83D\uDCA9'"], _a.raw = ["'\\u{1f4a9}'", "'\\uD83D\\uDCA9'"], f(_a, " should be converted to "));
diff --git a/tests/baselines/reference/taggedTemplateStringsWithWhitespaceEscapes.js b/tests/baselines/reference/taggedTemplateStringsWithWhitespaceEscapes.js
index 65af8da59f9..e8f219fd125 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithWhitespaceEscapes.js
+++ b/tests/baselines/reference/taggedTemplateStringsWithWhitespaceEscapes.js
@@ -8,7 +8,7 @@ f `\t\n\v\f\r\\`;
 function f() {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i - 0] = arguments[_i];
+        args[_i] = arguments[_i];
     }
 }
 (_a = ["\t\n\v\f\r\\"], _a.raw = ["\\t\\n\\v\\f\\r\\\\"], f(_a));
diff --git a/tests/baselines/reference/trailingCommasInFunctionParametersAndArguments.js b/tests/baselines/reference/trailingCommasInFunctionParametersAndArguments.js
index 6f30140c63e..495e9354024 100644
--- a/tests/baselines/reference/trailingCommasInFunctionParametersAndArguments.js
+++ b/tests/baselines/reference/trailingCommasInFunctionParametersAndArguments.js
@@ -35,7 +35,7 @@ f1(1);
 function f2() {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i - 0] = arguments[_i];
+        args[_i] = arguments[_i];
     }
 }
 f2.apply(void 0, []);
diff --git a/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.js b/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.js
index c07dd225396..74a609694aa 100644
--- a/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.js
+++ b/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.js
@@ -122,7 +122,7 @@ function fun2(x, y) {
 function fun3() {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i - 0] = arguments[_i];
+        args[_i] = arguments[_i];
     }
     return args[+randBool()];
 }
diff --git a/tests/baselines/reference/typeGuardFunctionErrors.js b/tests/baselines/reference/typeGuardFunctionErrors.js
index 244b0df3333..99c25faaa88 100644
--- a/tests/baselines/reference/typeGuardFunctionErrors.js
+++ b/tests/baselines/reference/typeGuardFunctionErrors.js
@@ -264,7 +264,7 @@ C;
 function b4() {
     var a = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        a[_i - 0] = arguments[_i];
+        a[_i] = arguments[_i];
     }
     return true;
 }
diff --git a/tests/baselines/reference/undeclaredModuleError.js b/tests/baselines/reference/undeclaredModuleError.js
index c9a43ab4ce6..88f5e3ab352 100644
--- a/tests/baselines/reference/undeclaredModuleError.js
+++ b/tests/baselines/reference/undeclaredModuleError.js
@@ -22,7 +22,7 @@ define(["require", "exports", "fs"], function (require, exports, fs) {
     function join() {
         var paths = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            paths[_i - 0] = arguments[_i];
+            paths[_i] = arguments[_i];
         }
     }
     function instrumentFile(covFileDir, covFileName, originalFilePath) {
diff --git a/tests/baselines/reference/unionTypeCallSignatures3.js b/tests/baselines/reference/unionTypeCallSignatures3.js
index 2dae152e474..b3c24a0e60a 100644
--- a/tests/baselines/reference/unionTypeCallSignatures3.js
+++ b/tests/baselines/reference/unionTypeCallSignatures3.js
@@ -18,7 +18,7 @@ function f2(s) { }
 function f3() {
     var s = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        s[_i - 0] = arguments[_i];
+        s[_i] = arguments[_i];
     }
 }
 function f4(s, s2) { }
diff --git a/tests/baselines/reference/unusedParametersWithUnderscore.js b/tests/baselines/reference/unusedParametersWithUnderscore.js
index 2899d347c66..02d5da33395 100644
--- a/tests/baselines/reference/unusedParametersWithUnderscore.js
+++ b/tests/baselines/reference/unusedParametersWithUnderscore.js
@@ -35,13 +35,13 @@ function f3(_c) {
 function f4() {
     var arg = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        arg[_i - 0] = arguments[_i];
+        arg[_i] = arguments[_i];
     }
 }
 function f5() {
     var _arg = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        _arg[_i - 0] = arguments[_i];
+        _arg[_i] = arguments[_i];
     }
 }
 function f6(arg, _arg) {
diff --git a/tests/baselines/reference/varArgConstructorMemberParameter.js b/tests/baselines/reference/varArgConstructorMemberParameter.js
index 2715ed9e542..0d80c2b4dbb 100644
--- a/tests/baselines/reference/varArgConstructorMemberParameter.js
+++ b/tests/baselines/reference/varArgConstructorMemberParameter.js
@@ -17,7 +17,7 @@ var Foo1 = (function () {
     function Foo1() {
         var args = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i - 0] = arguments[_i];
+            args[_i] = arguments[_i];
         }
     }
     return Foo1;
@@ -32,7 +32,7 @@ var Foo3 = (function () {
     function Foo3() {
         var args = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i - 0] = arguments[_i];
+            args[_i] = arguments[_i];
         }
         this.args = args;
     }
diff --git a/tests/baselines/reference/varArgParamTypeCheck.js b/tests/baselines/reference/varArgParamTypeCheck.js
index c2a33416436..2807ca97058 100644
--- a/tests/baselines/reference/varArgParamTypeCheck.js
+++ b/tests/baselines/reference/varArgParamTypeCheck.js
@@ -25,7 +25,7 @@ sequence(
 function sequence() {
     var sequences = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        sequences[_i - 0] = arguments[_i];
+        sequences[_i] = arguments[_i];
     }
 }
 function callback(clb) {
diff --git a/tests/baselines/reference/varArgWithNoParamName.js b/tests/baselines/reference/varArgWithNoParamName.js
index 05a9695770a..3aa9fcbabb0 100644
--- a/tests/baselines/reference/varArgWithNoParamName.js
+++ b/tests/baselines/reference/varArgWithNoParamName.js
@@ -5,6 +5,6 @@ function t1(...) {}
 function t1() {
     var  = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        [_i - 0] = arguments[_i];
+        [_i] = arguments[_i];
     }
 }
diff --git a/tests/baselines/reference/vararg.js b/tests/baselines/reference/vararg.js
index 015c8c9957a..bd4a79b4626 100644
--- a/tests/baselines/reference/vararg.js
+++ b/tests/baselines/reference/vararg.js
@@ -65,7 +65,7 @@ var M;
         C.prototype.fonly = function () {
             var rest = [];
             for (var _i = 0; _i < arguments.length; _i++) {
-                rest[_i - 0] = arguments[_i];
+                rest[_i] = arguments[_i];
             }
             builder = "";
             for (var i = 0; i < rest.length; i++) {

From ad9ad8f948bf2cb7c03fc152e81cb8c911990a8d Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Thu, 17 Nov 2016 11:08:11 -0800
Subject: [PATCH 273/421] Clean up
 getJSDocTypeForVariableLikeDeclarationFromJSDocComment

Yeah, that name is way too long.
---
 src/compiler/checker.ts   | 23 ++---------------------
 src/compiler/utilities.ts | 37 ++++++++++++++++++++++++-------------
 2 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index b466bf7afb6..26dd39d6b92 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -3156,30 +3156,11 @@ namespace ts {
 
         function getJSDocTypeForVariableLikeDeclarationFromJSDocComment(declaration: VariableLikeDeclaration): JSDocType {
             // First, see if this node has an @type annotation on it directly.
-            const typeTag = getJSDocTypeTag(declaration);
+            const typeTag = getJSDocTypeTag(declaration, true);
             if (typeTag && typeTag.typeExpression) {
                 return typeTag.typeExpression.type;
             }
 
-            if (declaration.kind === SyntaxKind.VariableDeclaration &&
-                declaration.parent.kind === SyntaxKind.VariableDeclarationList &&
-                declaration.parent.parent.kind === SyntaxKind.VariableStatement) {
-
-                // @type annotation might have been on the variable statement, try that instead.
-                const annotation = getJSDocTypeTag(declaration.parent.parent);
-                if (annotation && annotation.typeExpression) {
-                    return annotation.typeExpression.type;
-                }
-            }
-            else if (declaration.kind === SyntaxKind.Parameter) {
-                // If it's a parameter, see if the parent has a jsdoc comment with an @param
-                // annotation.
-                const paramTag = getCorrespondingJSDocParameterTag(<ParameterDeclaration>declaration);
-                if (paramTag && paramTag.typeExpression) {
-                    return paramTag.typeExpression.type;
-                }
-            }
-
             return undefined;
         }
 
@@ -13551,7 +13532,7 @@ namespace ts {
         // the destructured type into the contained binding elements.
         function assignBindingElementTypes(node: VariableLikeDeclaration) {
             if (isBindingPattern(node.name)) {
-                for (const element of (<BindingPattern>node.name).elements) {
+                for (const element of node.name.elements) {
                     if (!isOmittedExpression(element)) {
                         if (element.name.kind === SyntaxKind.Identifier) {
                             getSymbolLinks(getSymbolOfNode(element)).type = getTypeForBindingElement(element);
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 158da8e8f0b..16255dfdde7 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -1449,10 +1449,16 @@ namespace ts {
         }, tags => tags);
     }
 
-    function getJSDocs<T>(node: Node, checkParentVariableStatement: boolean, getDocs: (docs: JSDoc[]) => T[], getTags: (tags: JSDocTag[]) => T[]): T[] {
+    function getJSDocs<T>(node: Node,
+                          checkParentVariableStatement: boolean,
+                          getDocContent: (docs: JSDoc[]) => T[],
+                          getTagContent: (tags: JSDocTag[]) => T[]): T[] {
         // TODO: A lot of this work should be cached, maybe. I guess it's only used in services right now...
+                              // This will be hard because it may need to cache parentvariable versions and nonparent versions
+                              // maybe I should eliminate checkParent first ...
         let result: T[] = undefined;
         // prepend documentation from parent sources
+                              // TODO: Probably always want checkParent=true, right?
         if (checkParentVariableStatement) {
             // Try to recognize this pattern when node is initializer of variable declaration and JSDoc comments are on containing variable statement.
             // /**
@@ -1472,11 +1478,11 @@ namespace ts {
                     isVariableOfVariableDeclarationStatement ? node.parent.parent :
                         undefined;
             if (variableStatementNode) {
-                result = concatenate(result, getJSDocs(variableStatementNode, checkParentVariableStatement, getDocs, getTags));
+                result = concatenate(result, getJSDocs(variableStatementNode, checkParentVariableStatement, getDocContent, getTagContent));
             }
             if (node.kind === SyntaxKind.ModuleDeclaration &&
                 node.parent && node.parent.kind === SyntaxKind.ModuleDeclaration) {
-                result = concatenate(result, getJSDocs(node.parent, checkParentVariableStatement, getDocs, getTags));
+                result = concatenate(result, getJSDocs(node.parent, checkParentVariableStatement, getDocContent, getTagContent));
             }
 
             // Also recognize when the node is the RHS of an assignment expression
@@ -1487,33 +1493,34 @@ namespace ts {
                 (parent as BinaryExpression).operatorToken.kind === SyntaxKind.EqualsToken &&
                 parent.parent.kind === SyntaxKind.ExpressionStatement;
             if (isSourceOfAssignmentExpressionStatement) {
-                result = concatenate(result, getJSDocs(parent.parent, checkParentVariableStatement, getDocs, getTags));
+                result = concatenate(result, getJSDocs(parent.parent, checkParentVariableStatement, getDocContent, getTagContent));
             }
 
             const isPropertyAssignmentExpression = parent && parent.kind === SyntaxKind.PropertyAssignment;
             if (isPropertyAssignmentExpression) {
-                result = concatenate(result, getJSDocs(parent, checkParentVariableStatement, getDocs, getTags));
+                result = concatenate(result, getJSDocs(parent, checkParentVariableStatement, getDocContent, getTagContent));
             }
 
             // Pull parameter comments from declaring function as well
             if (node.kind === SyntaxKind.Parameter) {
                 const paramTags = getJSDocParameterTag(node as ParameterDeclaration, checkParentVariableStatement);
                 if (paramTags) {
-                    result = concatenate(result, getTags(paramTags));
+                    result = concatenate(result, getTagContent(paramTags));
                 }
             }
         }
 
         if (isVariableLike(node) && node.initializer) {
-            result = concatenate(result, getJSDocs(node.initializer, /*checkParentVariableStatement*/ false, getDocs, getTags));
+            // TODO: Does this really need to be called for everything?
+            result = concatenate(result, getJSDocs(node.initializer, /*checkParentVariableStatement*/ false, getDocContent, getTagContent));
         }
 
         if (node.jsDocComments) {
             if (result) {
-                result = concatenate(result, getDocs(node.jsDocComments));
+                result = concatenate(result, getDocContent(node.jsDocComments));
             }
             else {
-                return getDocs(node.jsDocComments);
+                return getDocContent(node.jsDocComments);
             }
         }
 
@@ -1521,6 +1528,7 @@ namespace ts {
     }
 
     function getJSDocParameterTag(param: ParameterDeclaration, checkParentVariableStatement: boolean): JSDocTag[] {
+        // TODO: getCorrespondingJSDocParameterTag is basically the same as this, except worse. (and typed, singleton return)
         const func = param.parent as FunctionLikeDeclaration;
         const tags = getJSDocTags(func, checkParentVariableStatement);
         if (!param.name) {
@@ -1545,16 +1553,19 @@ namespace ts {
         }
     }
 
-    export function getJSDocTypeTag(node: Node): JSDocTypeTag {
-        return <JSDocTypeTag>getJSDocTag(node, SyntaxKind.JSDocTypeTag, /*checkParentVariableStatement*/ false);
+    export function getJSDocTypeTag(node: Node, checkParentVariableStatement?: boolean): JSDocTypeTag | JSDocParameterTag {
+        // TODO: Get rid of the second parameter again
+        // TODO: Don't call getJSDocTag twice. Call a version that allows you to retrieve either kind.
+        return getJSDocTag(node, SyntaxKind.JSDocTypeTag, checkParentVariableStatement) as JSDocTypeTag ||
+            node.kind === SyntaxKind.Parameter && firstOrUndefined(getJSDocParameterTag(node as ParameterDeclaration, checkParentVariableStatement)) as JSDocParameterTag;
     }
 
     export function getJSDocReturnTag(node: Node): JSDocReturnTag {
-        return <JSDocReturnTag>getJSDocTag(node, SyntaxKind.JSDocReturnTag, /*checkParentVariableStatement*/ true);
+        return getJSDocTag(node, SyntaxKind.JSDocReturnTag, /*checkParentVariableStatement*/ true) as JSDocReturnTag;
     }
 
     export function getJSDocTemplateTag(node: Node): JSDocTemplateTag {
-        return <JSDocTemplateTag>getJSDocTag(node, SyntaxKind.JSDocTemplateTag, /*checkParentVariableStatement*/ false);
+        return getJSDocTag(node, SyntaxKind.JSDocTemplateTag, /*checkParentVariableStatement*/ false) as JSDocTemplateTag;
     }
 
     export function getCorrespondingJSDocParameterTag(parameter: ParameterDeclaration): JSDocParameterTag {

From 5a05b94fb5e03eed15f6b687f6ec490c5d685aa5 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Thu, 17 Nov 2016 13:27:57 -0800
Subject: [PATCH 274/421] Clean up getJSDocs

1. Get rid of parent check.
2. Use a couple of nested functions, one of them a recursive worker.
---
 src/compiler/checker.ts   |  27 +++------
 src/compiler/utilities.ts | 118 ++++++++++++++++++--------------------
 src/services/jsDoc.ts     |   2 +-
 3 files changed, 67 insertions(+), 80 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 26dd39d6b92..53571e265ea 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -3148,19 +3148,10 @@ namespace ts {
         }
 
         function getTypeForVariableLikeDeclarationFromJSDocComment(declaration: VariableLikeDeclaration) {
-            const jsDocType = getJSDocTypeForVariableLikeDeclarationFromJSDocComment(declaration);
-            if (jsDocType) {
-                return getTypeFromTypeNode(jsDocType);
+            const jsdocType = getJSDocType(declaration);
+            if (jsdocType) {
+                return getTypeFromTypeNode(jsdocType);
             }
-        }
-
-        function getJSDocTypeForVariableLikeDeclarationFromJSDocComment(declaration: VariableLikeDeclaration): JSDocType {
-            // First, see if this node has an @type annotation on it directly.
-            const typeTag = getJSDocTypeTag(declaration, true);
-            if (typeTag && typeTag.typeExpression) {
-                return typeTag.typeExpression.type;
-            }
-
             return undefined;
         }
 
@@ -3426,9 +3417,9 @@ namespace ts {
                     declaration.kind === SyntaxKind.PropertyAccessExpression && declaration.parent.kind === SyntaxKind.BinaryExpression) {
                     // Use JS Doc type if present on parent expression statement
                     if (declaration.flags & NodeFlags.JavaScriptFile) {
-                        const typeTag = getJSDocTypeTag(declaration.parent);
-                        if (typeTag && typeTag.typeExpression) {
-                            return links.type = getTypeFromTypeNode(typeTag.typeExpression.type);
+                        const jsdocType = getJSDocType(declaration.parent);
+                        if (jsdocType) {
+                            return links.type = getTypeFromTypeNode(jsdocType);
                         }
                     }
                     const declaredTypes = map(symbol.declarations,
@@ -10296,9 +10287,9 @@ namespace ts {
         }
 
         function getTypeForThisExpressionFromJSDoc(node: Node) {
-            const typeTag = getJSDocTypeTag(node);
-            if (typeTag && typeTag.typeExpression && typeTag.typeExpression.type && typeTag.typeExpression.type.kind === SyntaxKind.JSDocFunctionType) {
-                const jsDocFunctionType = <JSDocFunctionType>typeTag.typeExpression.type;
+            const jsdocType = getJSDocType(node);
+            if (jsdocType && jsdocType.kind === SyntaxKind.JSDocFunctionType) {
+                const jsDocFunctionType = <JSDocFunctionType>jsdocType;
                 if (jsDocFunctionType.parameters.length > 0 && jsDocFunctionType.parameters[0].type.kind === SyntaxKind.JSDocThisType) {
                     return getTypeFromTypeNode(jsDocFunctionType.parameters[0].type);
                 }
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 16255dfdde7..a0ac380711c 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -1416,12 +1416,12 @@ namespace ts {
             (<JSDocFunctionType>node).parameters[0].type.kind === SyntaxKind.JSDocConstructorType;
     }
 
-    function getJSDocTag(node: Node, kind: SyntaxKind, checkParentVariableStatement: boolean): JSDocTag {
+    function getJSDocTag(node: Node, kind: SyntaxKind): JSDocTag {
         if (!node) {
             return undefined;
         }
 
-        const jsDocTags = getJSDocTags(node, checkParentVariableStatement);
+        const jsDocTags = getJSDocTags(node);
         if (!jsDocTags) {
             return undefined;
         }
@@ -1433,12 +1433,12 @@ namespace ts {
         }
     }
 
-    export function getJSDocComments(node: Node, checkParentVariableStatement: boolean): string[] {
-        return getJSDocs(node, checkParentVariableStatement, docs => map(docs, doc => doc.comment), tags => map(tags, tag => tag.comment));
+    export function getJSDocComments(node: Node): string[] {
+        return getJSDocs(node, docs => map(docs, doc => doc.comment), tags => map(tags, tag => tag.comment));
     }
 
-    function getJSDocTags(node: Node, checkParentVariableStatement: boolean): JSDocTag[] {
-        return getJSDocs(node, checkParentVariableStatement, docs => {
+    function getJSDocTags(node: Node): JSDocTag[] {
+        return getJSDocs(node, docs => {
             const result: JSDocTag[] = [];
             for (const doc of docs) {
                 if (doc.tags) {
@@ -1449,17 +1449,16 @@ namespace ts {
         }, tags => tags);
     }
 
-    function getJSDocs<T>(node: Node,
-                          checkParentVariableStatement: boolean,
-                          getDocContent: (docs: JSDoc[]) => T[],
-                          getTagContent: (tags: JSDocTag[]) => T[]): T[] {
-        // TODO: A lot of this work should be cached, maybe. I guess it's only used in services right now...
-                              // This will be hard because it may need to cache parentvariable versions and nonparent versions
-                              // maybe I should eliminate checkParent first ...
-        let result: T[] = undefined;
-        // prepend documentation from parent sources
-                              // TODO: Probably always want checkParent=true, right?
-        if (checkParentVariableStatement) {
+    function getJSDocs<T>(node: Node, getContent: (docs: JSDoc[]) => T[], getContentFromParam: (tags: JSDocTag[]) => T[]): T[] {
+        return getJSDocsWorker(node);
+
+        function getJSDocsWorker(node: Node) {
+            // TODO: A lot of this work should be cached, maybe. I guess it's only used in services right now...
+            // This will be hard because it may need to cache parentvariable versions and nonparent versions
+            // maybe I should eliminate checkParent first ...
+            const parent = node.parent;
+            let result: T[] = undefined;
+
             // Try to recognize this pattern when node is initializer of variable declaration and JSDoc comments are on containing variable statement.
             // /**
             //   * @param {number} name
@@ -1467,70 +1466,61 @@ namespace ts {
             //   */
             // var x = function(name) { return name.length; }
             const isInitializerOfVariableDeclarationInStatement =
-                isVariableLike(node.parent) &&
-                (node.parent).initializer === node &&
-                node.parent.parent.parent.kind === SyntaxKind.VariableStatement;
+                isVariableLike(parent) &&
+                parent.initializer === node &&
+                parent.parent.parent.kind === SyntaxKind.VariableStatement;
             const isVariableOfVariableDeclarationStatement = isVariableLike(node) &&
-                node.parent.parent.kind === SyntaxKind.VariableStatement;
-
+                parent.parent.kind === SyntaxKind.VariableStatement;
             const variableStatementNode =
-                isInitializerOfVariableDeclarationInStatement ? node.parent.parent.parent :
-                    isVariableOfVariableDeclarationStatement ? node.parent.parent :
-                        undefined;
+                isInitializerOfVariableDeclarationInStatement ? parent.parent.parent :
+                isVariableOfVariableDeclarationStatement ? parent.parent :
+                undefined;
             if (variableStatementNode) {
-                result = concatenate(result, getJSDocs(variableStatementNode, checkParentVariableStatement, getDocContent, getTagContent));
-            }
-            if (node.kind === SyntaxKind.ModuleDeclaration &&
-                node.parent && node.parent.kind === SyntaxKind.ModuleDeclaration) {
-                result = concatenate(result, getJSDocs(node.parent, checkParentVariableStatement, getDocContent, getTagContent));
+                result = concatenate(result, getJSDocsWorker(variableStatementNode));
             }
 
             // Also recognize when the node is the RHS of an assignment expression
-            const parent = node.parent;
             const isSourceOfAssignmentExpressionStatement =
                 parent && parent.parent &&
                 parent.kind === SyntaxKind.BinaryExpression &&
                 (parent as BinaryExpression).operatorToken.kind === SyntaxKind.EqualsToken &&
                 parent.parent.kind === SyntaxKind.ExpressionStatement;
             if (isSourceOfAssignmentExpressionStatement) {
-                result = concatenate(result, getJSDocs(parent.parent, checkParentVariableStatement, getDocContent, getTagContent));
+                result = concatenate(result, getJSDocsWorker(parent.parent));
             }
 
+            const isModuleDeclaration = node.kind === SyntaxKind.ModuleDeclaration &&
+                parent && parent.kind === SyntaxKind.ModuleDeclaration;
             const isPropertyAssignmentExpression = parent && parent.kind === SyntaxKind.PropertyAssignment;
-            if (isPropertyAssignmentExpression) {
-                result = concatenate(result, getJSDocs(parent, checkParentVariableStatement, getDocContent, getTagContent));
+            if (isModuleDeclaration || isPropertyAssignmentExpression) {
+                result = concatenate(result, getJSDocsWorker(parent));
             }
 
             // Pull parameter comments from declaring function as well
             if (node.kind === SyntaxKind.Parameter) {
-                const paramTags = getJSDocParameterTag(node as ParameterDeclaration, checkParentVariableStatement);
-                if (paramTags) {
-                    result = concatenate(result, getTagContent(paramTags));
-                }
+                result = concatenate(result, getContentFromParam(getJSDocParameterTag(node as ParameterDeclaration)));
             }
+
+            if (isVariableLike(node) && node.initializer) {
+                result = concatenate(result, getOwnJSDocs(node.initializer));
+            }
+
+            result = concatenate(result, getOwnJSDocs(node));
+
+            return result;
         }
 
-        if (isVariableLike(node) && node.initializer) {
-            // TODO: Does this really need to be called for everything?
-            result = concatenate(result, getJSDocs(node.initializer, /*checkParentVariableStatement*/ false, getDocContent, getTagContent));
-        }
-
-        if (node.jsDocComments) {
-            if (result) {
-                result = concatenate(result, getDocContent(node.jsDocComments));
-            }
-            else {
-                return getDocContent(node.jsDocComments);
+        function getOwnJSDocs(node: Node) {
+            if (node.jsDocComments) {
+                return getContent(node.jsDocComments);
             }
         }
-
-        return result;
     }
 
-    function getJSDocParameterTag(param: ParameterDeclaration, checkParentVariableStatement: boolean): JSDocTag[] {
+    function getJSDocParameterTag(param: ParameterDeclaration): JSDocTag[] {
         // TODO: getCorrespondingJSDocParameterTag is basically the same as this, except worse. (and typed, singleton return)
         const func = param.parent as FunctionLikeDeclaration;
-        const tags = getJSDocTags(func, checkParentVariableStatement);
+        const tags = getJSDocTags(func);
         if (!param.name) {
             // this is an anonymous jsdoc param from a `function(type1, type2): type3` specification
             const i = func.parameters.indexOf(param);
@@ -1553,19 +1543,25 @@ namespace ts {
         }
     }
 
-    export function getJSDocTypeTag(node: Node, checkParentVariableStatement?: boolean): JSDocTypeTag | JSDocParameterTag {
-        // TODO: Get rid of the second parameter again
-        // TODO: Don't call getJSDocTag twice. Call a version that allows you to retrieve either kind.
-        return getJSDocTag(node, SyntaxKind.JSDocTypeTag, checkParentVariableStatement) as JSDocTypeTag ||
-            node.kind === SyntaxKind.Parameter && firstOrUndefined(getJSDocParameterTag(node as ParameterDeclaration, checkParentVariableStatement)) as JSDocParameterTag;
+    export function getJSDocType(node: Node): JSDocType {
+        // TODO: If you have to call getparamtag, you really want the first with a typeExpression, not the first one.
+        let tag: JSDocTypeTag | JSDocParameterTag = getJSDocTag(node, SyntaxKind.JSDocTypeTag) as JSDocTypeTag;
+        if (!tag && node.kind === SyntaxKind.Parameter) {
+            const paramTags = getJSDocParameterTag(node as ParameterDeclaration);
+            if (paramTags) {
+                tag = find(paramTags, tag => !!(tag as JSDocParameterTag).typeExpression) as JSDocParameterTag;
+            }
+        }
+
+        return tag && tag.typeExpression && tag.typeExpression.type;
     }
 
     export function getJSDocReturnTag(node: Node): JSDocReturnTag {
-        return getJSDocTag(node, SyntaxKind.JSDocReturnTag, /*checkParentVariableStatement*/ true) as JSDocReturnTag;
+        return getJSDocTag(node, SyntaxKind.JSDocReturnTag) as JSDocReturnTag;
     }
 
     export function getJSDocTemplateTag(node: Node): JSDocTemplateTag {
-        return getJSDocTag(node, SyntaxKind.JSDocTemplateTag, /*checkParentVariableStatement*/ false) as JSDocTemplateTag;
+        return getJSDocTag(node, SyntaxKind.JSDocTemplateTag) as JSDocTemplateTag;
     }
 
     export function getCorrespondingJSDocParameterTag(parameter: ParameterDeclaration): JSDocParameterTag {
@@ -1574,7 +1570,7 @@ namespace ts {
             // annotation.
             const parameterName = (<Identifier>parameter.name).text;
 
-            const jsDocTags = getJSDocTags(parameter.parent, /*checkParentVariableStatement*/ true);
+            const jsDocTags = getJSDocTags(parameter.parent);
             if (!jsDocTags) {
                 return undefined;
             }
diff --git a/src/services/jsDoc.ts b/src/services/jsDoc.ts
index 5e2f5e7b4c9..24e99cf5c77 100644
--- a/src/services/jsDoc.ts
+++ b/src/services/jsDoc.ts
@@ -52,7 +52,7 @@ namespace ts.JsDoc {
         // from Array<T> - Array<string> and Array<number>
         const documentationComment = <SymbolDisplayPart[]>[];
         forEachUnique(declarations, declaration => {
-            const comments = getJSDocComments(declaration, /*checkParentVariableStatement*/ true);
+            const comments = getJSDocComments(declaration);
             if (!comments) {
                 return;
             }

From ddffe209f9ab8ee31cae9088688e34cadf255da3 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Thu, 17 Nov 2016 14:26:38 -0800
Subject: [PATCH 275/421] Clean up getJSDocParameterTag

And delete its near-duplicate which was much less correct. The callers
that had to switch are slightly more complex and more correct now.
---
 src/compiler/checker.ts   | 17 ++++++------
 src/compiler/utilities.ts | 56 +++++++++------------------------------
 2 files changed, 22 insertions(+), 51 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 53571e265ea..0803814bc14 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -4854,15 +4854,16 @@ namespace ts {
                 if (node.type && node.type.kind === SyntaxKind.JSDocOptionalType) {
                     return true;
                 }
+                const paramTags = getJSDocParameterTag(node);
+                if (paramTags) {
+                    for (const paramTag of paramTags) {
+                        if (paramTag.isBracketed) {
+                            return true;
+                        }
 
-                const paramTag = getCorrespondingJSDocParameterTag(node);
-                if (paramTag) {
-                    if (paramTag.isBracketed) {
-                        return true;
-                    }
-
-                    if (paramTag.typeExpression) {
-                        return paramTag.typeExpression.type.kind === SyntaxKind.JSDocOptionalType;
+                        if (paramTag.typeExpression) {
+                            return paramTag.typeExpression.type.kind === SyntaxKind.JSDocOptionalType;
+                        }
                     }
                 }
             }
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index a0ac380711c..243d4f4c519 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -1498,16 +1498,14 @@ namespace ts {
 
             // Pull parameter comments from declaring function as well
             if (node.kind === SyntaxKind.Parameter) {
-                result = concatenate(result, getContentFromParam(getJSDocParameterTag(node as ParameterDeclaration)));
+                result = concatenate(result, getContentFromParam(getJSDocParameterTag(node)));
             }
 
             if (isVariableLike(node) && node.initializer) {
                 result = concatenate(result, getOwnJSDocs(node.initializer));
             }
 
-            result = concatenate(result, getOwnJSDocs(node));
-
-            return result;
+            return concatenate(result, getOwnJSDocs(node));
         }
 
         function getOwnJSDocs(node: Node) {
@@ -1517,24 +1515,23 @@ namespace ts {
         }
     }
 
-    function getJSDocParameterTag(param: ParameterDeclaration): JSDocTag[] {
-        // TODO: getCorrespondingJSDocParameterTag is basically the same as this, except worse. (and typed, singleton return)
+    export function getJSDocParameterTag(param: Node): JSDocParameterTag[] {
+        if (!isParameter(param)) {
+            return undefined;
+        }
         const func = param.parent as FunctionLikeDeclaration;
         const tags = getJSDocTags(func);
         if (!param.name) {
             // this is an anonymous jsdoc param from a `function(type1, type2): type3` specification
             const i = func.parameters.indexOf(param);
-            const paramTags = filter(tags, tag => tag.kind === SyntaxKind.JSDocParameterTag);
+            const paramTags = filter(tags, tag => tag.kind === SyntaxKind.JSDocParameterTag) as JSDocParameterTag[];
             if (paramTags && 0 <= i && i < paramTags.length) {
                 return [paramTags[i]];
             }
         }
         else if (param.name.kind === SyntaxKind.Identifier) {
             const name = (param.name as Identifier).text;
-            const paramTags = filter(tags, tag => tag.kind === SyntaxKind.JSDocParameterTag && (tag as JSDocParameterTag).parameterName.text === name);
-            if (paramTags) {
-                return paramTags;
-            }
+            return filter(tags as JSDocParameterTag[], tag => tag.kind === SyntaxKind.JSDocParameterTag && tag.parameterName.text === name);
         }
         else {
             // TODO: it's a destructured parameter, so it should look up an "object type" series of multiple lines
@@ -1544,12 +1541,11 @@ namespace ts {
     }
 
     export function getJSDocType(node: Node): JSDocType {
-        // TODO: If you have to call getparamtag, you really want the first with a typeExpression, not the first one.
         let tag: JSDocTypeTag | JSDocParameterTag = getJSDocTag(node, SyntaxKind.JSDocTypeTag) as JSDocTypeTag;
         if (!tag && node.kind === SyntaxKind.Parameter) {
-            const paramTags = getJSDocParameterTag(node as ParameterDeclaration);
+            const paramTags = getJSDocParameterTag(node);
             if (paramTags) {
-                tag = find(paramTags, tag => !!(tag as JSDocParameterTag).typeExpression) as JSDocParameterTag;
+                tag = find(paramTags, tag => !!tag.typeExpression);
             }
         }
 
@@ -1564,29 +1560,6 @@ namespace ts {
         return getJSDocTag(node, SyntaxKind.JSDocTemplateTag) as JSDocTemplateTag;
     }
 
-    export function getCorrespondingJSDocParameterTag(parameter: ParameterDeclaration): JSDocParameterTag {
-        if (parameter.name && parameter.name.kind === SyntaxKind.Identifier) {
-            // If it's a parameter, see if the parent has a jsdoc comment with an @param
-            // annotation.
-            const parameterName = (<Identifier>parameter.name).text;
-
-            const jsDocTags = getJSDocTags(parameter.parent);
-            if (!jsDocTags) {
-                return undefined;
-            }
-            for (const tag of jsDocTags) {
-                if (tag.kind === SyntaxKind.JSDocParameterTag) {
-                    const parameterTag = <JSDocParameterTag>tag;
-                    if (parameterTag.parameterName.text === parameterName) {
-                        return parameterTag;
-                    }
-                }
-            }
-        }
-
-        return undefined;
-    }
-
     export function hasRestParameter(s: SignatureDeclaration): boolean {
         return isRestParameter(lastOrUndefined(s.parameters));
     }
@@ -1597,14 +1570,11 @@ namespace ts {
 
     export function isRestParameter(node: ParameterDeclaration) {
         if (node && (node.flags & NodeFlags.JavaScriptFile)) {
-            if (node.type && node.type.kind === SyntaxKind.JSDocVariadicType) {
+            if (node.type && node.type.kind === SyntaxKind.JSDocVariadicType ||
+                forEach(getJSDocParameterTag(node),
+                        t => t.typeExpression && t.typeExpression.type.kind === SyntaxKind.JSDocVariadicType)) {
                 return true;
             }
-
-            const paramTag = getCorrespondingJSDocParameterTag(node);
-            if (paramTag && paramTag.typeExpression) {
-                return paramTag.typeExpression.type.kind === SyntaxKind.JSDocVariadicType;
-            }
         }
         return isDeclaredRestParam(node);
     }

From a2b13d05f2bb3e6111d9dfe923bfd3329068ef6b Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Thu, 17 Nov 2016 15:12:32 -0800
Subject: [PATCH 276/421] pass project name as a constructor parameter (#12333)

---
 .../unittests/tsserverProjectSystem.ts        |  2 +
 src/server/editorServices.ts                  | 12 ++--
 src/server/project.ts                         | 59 +++++++++----------
 3 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
index 32a78a07811..ce5bec05b56 100644
--- a/src/harness/unittests/tsserverProjectSystem.ts
+++ b/src/harness/unittests/tsserverProjectSystem.ts
@@ -1614,6 +1614,7 @@ namespace ts.projectSystem {
                     return;
                 }
                 assert.equal(e.eventName, server.ProjectLanguageServiceStateEvent);
+                assert.equal(e.data.project.getProjectName(), config.path, "project name");
                 lastEvent = <server.ProjectLanguageServiceStateEvent>e;
             });
             session.executeCommand(<protocol.OpenRequest>{
@@ -1628,6 +1629,7 @@ namespace ts.projectSystem {
             assert.isFalse(project.languageServiceEnabled, "Language service enabled");
             assert.isTrue(!!lastEvent, "should receive event");
             assert.equal(lastEvent.data.project, project, "project name");
+            assert.equal(lastEvent.data.project.getProjectName(), config.path, "config path");
             assert.isFalse(lastEvent.data.languageServiceEnabled, "Language service state");
 
             host.reloadFS([f1, f2, configWithExclude]);
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index f69b5c11547..6a7cb049296 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -470,7 +470,7 @@ namespace ts.server {
 
         private onTypeRootFileChanged(project: ConfiguredProject, fileName: string) {
             this.logger.info(`Type root file ${fileName} changed`);
-            this.throttledOperations.schedule(project.configFileName + " * type root", /*delay*/ 250, () => {
+            this.throttledOperations.schedule(project.getConfigFilePath() + " * type root", /*delay*/ 250, () => {
                 project.updateTypes();
                 this.updateConfiguredProject(project); // TODO: Figure out why this is needed (should be redundant?)
                 this.refreshInferredProjects();
@@ -492,13 +492,13 @@ namespace ts.server {
 
             this.logger.info(`Detected source file changes: ${fileName}`);
             this.throttledOperations.schedule(
-                project.configFileName,
+                project.getConfigFilePath(),
                 /*delay*/250,
                 () => this.handleChangeInSourceFileForConfiguredProject(project, fileName));
         }
 
         private handleChangeInSourceFileForConfiguredProject(project: ConfiguredProject, triggerFile: string) {
-            const { projectOptions, configFileErrors } = this.convertConfigFileContentToProjectOptions(project.configFileName);
+            const { projectOptions, configFileErrors } = this.convertConfigFileContentToProjectOptions(project.getConfigFilePath());
             this.reportConfigFileDiagnostics(project.getProjectName(), configFileErrors, triggerFile);
 
             const newRootFiles = projectOptions.files.map((f => this.getCanonicalFileName(f)));
@@ -520,7 +520,7 @@ namespace ts.server {
         }
 
         private onConfigChangedForConfiguredProject(project: ConfiguredProject) {
-            this.logger.info(`Config file changed: ${project.configFileName}`);
+            this.logger.info(`Config file changed: ${project.getConfigFilePath()}`);
             this.updateConfiguredProject(project);
             this.refreshInferredProjects();
         }
@@ -1009,13 +1009,13 @@ namespace ts.server {
         }
 
         private updateConfiguredProject(project: ConfiguredProject) {
-            if (!this.host.fileExists(project.configFileName)) {
+            if (!this.host.fileExists(project.getConfigFilePath())) {
                 this.logger.info("Config file deleted");
                 this.removeProject(project);
                 return;
             }
 
-            const { success, projectOptions, configFileErrors } = this.convertConfigFileContentToProjectOptions(project.configFileName);
+            const { success, projectOptions, configFileErrors } = this.convertConfigFileContentToProjectOptions(project.getConfigFilePath());
             if (!success) {
                 // reset project settings to default
                 this.updateNonInferredProject(project, [], fileNamePropertyReader, {}, {}, /*compileOnSave*/false, configFileErrors);
diff --git a/src/server/project.ts b/src/server/project.ts
index 3e5c810e805..82ecc6f3644 100644
--- a/src/server/project.ts
+++ b/src/server/project.ts
@@ -229,6 +229,7 @@ namespace ts.server {
         }
 
         constructor(
+            private readonly projectName: string,
             readonly projectKind: ProjectKind,
             readonly projectService: ProjectService,
             private documentRegistry: ts.DocumentRegistry,
@@ -307,7 +308,9 @@ namespace ts.server {
             this.projectService.onUpdateLanguageServiceStateForProject(this, /*languageServiceEnabled*/ false);
         }
 
-        abstract getProjectName(): string;
+        getProjectName() {
+            return this.projectName;
+        }
         abstract getProjectRootPath(): string | undefined;
         abstract getTypingOptions(): TypingOptions;
 
@@ -759,31 +762,27 @@ namespace ts.server {
 
     export class InferredProject extends Project {
 
-        private static NextId = 1;
-
-        /**
-         * Unique name that identifies this particular inferred project
-         */
-        private readonly inferredProjectName: string;
+        private static newName = (() => {
+            let nextId = 1;
+            return () => {
+                const id = nextId;
+                nextId++;
+                return makeInferredProjectName(id);
+            }
+        })();
 
         // Used to keep track of what directories are watched for this project
         directoriesWatchedForTsconfig: string[] = [];
 
         constructor(projectService: ProjectService, documentRegistry: ts.DocumentRegistry, compilerOptions: CompilerOptions) {
-            super(ProjectKind.Inferred,
+            super(InferredProject.newName(),
+                ProjectKind.Inferred,
                 projectService,
                 documentRegistry,
                 /*files*/ undefined,
                 /*languageServiceEnabled*/ true,
                 compilerOptions,
                 /*compileOnSaveEnabled*/ false);
-
-            this.inferredProjectName = makeInferredProjectName(InferredProject.NextId);
-            InferredProject.NextId++;
-        }
-
-        getProjectName() {
-            return this.inferredProjectName;
         }
 
         getProjectRootPath() {
@@ -822,7 +821,7 @@ namespace ts.server {
         /** Used for configured projects which may have multiple open roots */
         openRefCount = 0;
 
-        constructor(readonly configFileName: NormalizedPath,
+        constructor(configFileName: NormalizedPath,
             projectService: ProjectService,
             documentRegistry: ts.DocumentRegistry,
             hasExplicitListOfFiles: boolean,
@@ -830,11 +829,15 @@ namespace ts.server {
             private wildcardDirectories: Map<WatchDirectoryFlags>,
             languageServiceEnabled: boolean,
             public compileOnSaveEnabled: boolean) {
-            super(ProjectKind.Configured, projectService, documentRegistry, hasExplicitListOfFiles, languageServiceEnabled, compilerOptions, compileOnSaveEnabled);
+            super(configFileName, ProjectKind.Configured, projectService, documentRegistry, hasExplicitListOfFiles, languageServiceEnabled, compilerOptions, compileOnSaveEnabled);
+        }
+
+        getConfigFilePath() {
+            return this.getProjectName();
         }
 
         getProjectRootPath() {
-            return getDirectoryPath(this.configFileName);
+            return getDirectoryPath(this.getConfigFilePath());
         }
 
         setProjectErrors(projectErrors: Diagnostic[]) {
@@ -849,12 +852,8 @@ namespace ts.server {
             return this.typingOptions;
         }
 
-        getProjectName() {
-            return this.configFileName;
-        }
-
         watchConfigFile(callback: (project: ConfiguredProject) => void) {
-            this.projectFileWatcher = this.projectService.host.watchFile(this.configFileName, _ => callback(this));
+            this.projectFileWatcher = this.projectService.host.watchFile(this.getConfigFilePath(), _ => callback(this));
         }
 
         watchTypeRoots(callback: (project: ConfiguredProject, path: string) => void) {
@@ -872,7 +871,7 @@ namespace ts.server {
                 return;
             }
 
-            const directoryToWatch = getDirectoryPath(this.configFileName);
+            const directoryToWatch = getDirectoryPath(this.getConfigFilePath());
             this.projectService.logger.info(`Add recursive watcher for: ${directoryToWatch}`);
             this.directoryWatcher = this.projectService.host.watchDirectory(directoryToWatch, path => callback(this, path), /*recursive*/ true);
         }
@@ -881,7 +880,7 @@ namespace ts.server {
             if (!this.wildcardDirectories) {
                 return;
             }
-            const configDirectoryPath = getDirectoryPath(this.configFileName);
+            const configDirectoryPath = getDirectoryPath(this.getConfigFilePath());
             this.directoriesWatchedForWildcards = reduceProperties(this.wildcardDirectories, (watchers, flag, directory) => {
                 if (comparePaths(configDirectoryPath, directory, ".", !this.projectService.host.useCaseSensitiveFileNames) !== Comparison.EqualTo) {
                     const recursive = (flag & WatchDirectoryFlags.Recursive) !== 0;
@@ -941,14 +940,14 @@ namespace ts.server {
 
     export class ExternalProject extends Project {
         private typingOptions: TypingOptions;
-        constructor(readonly externalProjectName: string,
+        constructor(externalProjectName: string,
             projectService: ProjectService,
             documentRegistry: ts.DocumentRegistry,
             compilerOptions: CompilerOptions,
             languageServiceEnabled: boolean,
             public compileOnSaveEnabled: boolean,
             private readonly projectFilePath?: string) {
-            super(ProjectKind.External, projectService, documentRegistry, /*hasExplicitListOfFiles*/ true, languageServiceEnabled, compilerOptions, compileOnSaveEnabled);
+            super(externalProjectName, ProjectKind.External, projectService, documentRegistry, /*hasExplicitListOfFiles*/ true, languageServiceEnabled, compilerOptions, compileOnSaveEnabled);
         }
 
         getProjectRootPath() {
@@ -958,7 +957,7 @@ namespace ts.server {
             // if the projectFilePath is not given, we make the assumption that the project name
             // is the path of the project file. AS the project name is provided by VS, we need to
             // normalize slashes before using it as a file name.
-            return getDirectoryPath(normalizeSlashes(this.externalProjectName));
+            return getDirectoryPath(normalizeSlashes(this.getProjectName()));
         }
 
         getTypingOptions() {
@@ -992,9 +991,5 @@ namespace ts.server {
             }
             this.typingOptions = newTypingOptions;
         }
-
-        getProjectName() {
-            return this.externalProjectName;
-        }
     }
 }
\ No newline at end of file

From e81cfa10d6c670381ee0bb9823632df34bf57ab2 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Thu, 17 Nov 2016 15:32:16 -0800
Subject: [PATCH 277/421] Clean cache code and streamline other code

Cache only uses one property now. getJSDocs isn't generic and doesn't
take a function parameter any more. The code is overall easier to read.
---
 src/compiler/types.ts     |  1 +
 src/compiler/utilities.ts | 83 +++++++++++++++++----------------------
 2 files changed, 36 insertions(+), 48 deletions(-)

diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index af46cb2173c..8b648000273 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -498,6 +498,7 @@ namespace ts {
         /* @internal */ original?: Node;                // The original node if this is an updated node.
         /* @internal */ startsOnNewLine?: boolean;      // Whether a synthesized node should start on a new line (used by transforms).
         /* @internal */ jsDocComments?: JSDoc[];        // JSDoc for the node, if it has any.
+        /* @internal */ jsDocCache?: (JSDoc | JSDocParameterTag)[]; // JSDoc for the node, plus JSDoc retrieved from its parents
         /* @internal */ symbol?: Symbol;                // Symbol declared by node (initialized by binding)
         /* @internal */ locals?: SymbolTable;           // Locals associated with node (initialized by binding)
         /* @internal */ nextContainer?: Node;           // Next container in declaration order (initialized by binding)
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 243d4f4c519..e5fd8b067b0 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -1416,49 +1416,42 @@ namespace ts {
             (<JSDocFunctionType>node).parameters[0].type.kind === SyntaxKind.JSDocConstructorType;
     }
 
-    function getJSDocTag(node: Node, kind: SyntaxKind): JSDocTag {
-        if (!node) {
-            return undefined;
-        }
-
-        const jsDocTags = getJSDocTags(node);
-        if (!jsDocTags) {
-            return undefined;
-        }
-
-        for (const tag of jsDocTags) {
-            if (tag.kind === kind) {
-                return tag;
-            }
-        }
-    }
-
     export function getJSDocComments(node: Node): string[] {
-        return getJSDocs(node, docs => map(docs, doc => doc.comment), tags => map(tags, tag => tag.comment));
+        return map(getJSDocs(node), doc => doc.comment);
     }
 
-    function getJSDocTags(node: Node): JSDocTag[] {
-        return getJSDocs(node, docs => {
+    function getJSDocTags(node: Node, kind: SyntaxKind): JSDocTag[] {
+        const docs = getJSDocs(node);
+        if (docs) {
             const result: JSDocTag[] = [];
             for (const doc of docs) {
-                if (doc.tags) {
-                    result.push(...doc.tags);
+                if (doc.kind === SyntaxKind.JSDocParameterTag) {
+                    if (doc.kind === kind) {
+                        result.push(doc as JSDocParameterTag);
+                    }
+                }
+                else {
+                    result.push(...filter((doc as JSDoc).tags, tag => tag.kind === kind));
                 }
             }
             return result;
-        }, tags => tags);
+        }
     }
 
-    function getJSDocs<T>(node: Node, getContent: (docs: JSDoc[]) => T[], getContentFromParam: (tags: JSDocTag[]) => T[]): T[] {
-        return getJSDocsWorker(node);
+    function getFirstJSDocTag(node: Node, kind: SyntaxKind): JSDocTag {
+        return node && firstOrUndefined(getJSDocTags(node, kind));
+    }
+
+   function getJSDocs(node: Node): (JSDoc | JSDocParameterTag)[] {
+        let cache: (JSDoc | JSDocParameterTag)[] = node.jsDocCache;
+        if (!cache) {
+            getJSDocsWorker(node);
+            node.jsDocCache = cache;
+        }
+        return cache;
 
         function getJSDocsWorker(node: Node) {
-            // TODO: A lot of this work should be cached, maybe. I guess it's only used in services right now...
-            // This will be hard because it may need to cache parentvariable versions and nonparent versions
-            // maybe I should eliminate checkParent first ...
             const parent = node.parent;
-            let result: T[] = undefined;
-
             // Try to recognize this pattern when node is initializer of variable declaration and JSDoc comments are on containing variable statement.
             // /**
             //   * @param {number} name
@@ -1476,7 +1469,7 @@ namespace ts {
                 isVariableOfVariableDeclarationStatement ? parent.parent :
                 undefined;
             if (variableStatementNode) {
-                result = concatenate(result, getJSDocsWorker(variableStatementNode));
+                getJSDocsWorker(variableStatementNode);
             }
 
             // Also recognize when the node is the RHS of an assignment expression
@@ -1486,32 +1479,26 @@ namespace ts {
                 (parent as BinaryExpression).operatorToken.kind === SyntaxKind.EqualsToken &&
                 parent.parent.kind === SyntaxKind.ExpressionStatement;
             if (isSourceOfAssignmentExpressionStatement) {
-                result = concatenate(result, getJSDocsWorker(parent.parent));
+                getJSDocsWorker(parent.parent);
             }
 
             const isModuleDeclaration = node.kind === SyntaxKind.ModuleDeclaration &&
                 parent && parent.kind === SyntaxKind.ModuleDeclaration;
             const isPropertyAssignmentExpression = parent && parent.kind === SyntaxKind.PropertyAssignment;
             if (isModuleDeclaration || isPropertyAssignmentExpression) {
-                result = concatenate(result, getJSDocsWorker(parent));
+                getJSDocsWorker(parent);
             }
 
             // Pull parameter comments from declaring function as well
             if (node.kind === SyntaxKind.Parameter) {
-                result = concatenate(result, getContentFromParam(getJSDocParameterTag(node)));
+                cache = concatenate(cache, getJSDocParameterTag(node));
             }
 
             if (isVariableLike(node) && node.initializer) {
-                result = concatenate(result, getOwnJSDocs(node.initializer));
+                cache = concatenate(cache, node.initializer.jsDocComments);
             }
 
-            return concatenate(result, getOwnJSDocs(node));
-        }
-
-        function getOwnJSDocs(node: Node) {
-            if (node.jsDocComments) {
-                return getContent(node.jsDocComments);
-            }
+            cache = concatenate(cache, node.jsDocComments);
         }
     }
 
@@ -1520,18 +1507,18 @@ namespace ts {
             return undefined;
         }
         const func = param.parent as FunctionLikeDeclaration;
-        const tags = getJSDocTags(func);
+        const tags = getJSDocTags(func, SyntaxKind.JSDocParameterTag) as JSDocParameterTag[];
         if (!param.name) {
             // this is an anonymous jsdoc param from a `function(type1, type2): type3` specification
             const i = func.parameters.indexOf(param);
-            const paramTags = filter(tags, tag => tag.kind === SyntaxKind.JSDocParameterTag) as JSDocParameterTag[];
+            const paramTags = filter(tags, tag => tag.kind === SyntaxKind.JSDocParameterTag);
             if (paramTags && 0 <= i && i < paramTags.length) {
                 return [paramTags[i]];
             }
         }
         else if (param.name.kind === SyntaxKind.Identifier) {
             const name = (param.name as Identifier).text;
-            return filter(tags as JSDocParameterTag[], tag => tag.kind === SyntaxKind.JSDocParameterTag && tag.parameterName.text === name);
+            return filter(tags, tag => tag.kind === SyntaxKind.JSDocParameterTag && tag.parameterName.text === name);
         }
         else {
             // TODO: it's a destructured parameter, so it should look up an "object type" series of multiple lines
@@ -1541,7 +1528,7 @@ namespace ts {
     }
 
     export function getJSDocType(node: Node): JSDocType {
-        let tag: JSDocTypeTag | JSDocParameterTag = getJSDocTag(node, SyntaxKind.JSDocTypeTag) as JSDocTypeTag;
+        let tag: JSDocTypeTag | JSDocParameterTag = getFirstJSDocTag(node, SyntaxKind.JSDocTypeTag) as JSDocTypeTag;
         if (!tag && node.kind === SyntaxKind.Parameter) {
             const paramTags = getJSDocParameterTag(node);
             if (paramTags) {
@@ -1553,11 +1540,11 @@ namespace ts {
     }
 
     export function getJSDocReturnTag(node: Node): JSDocReturnTag {
-        return getJSDocTag(node, SyntaxKind.JSDocReturnTag) as JSDocReturnTag;
+        return getFirstJSDocTag(node, SyntaxKind.JSDocReturnTag) as JSDocReturnTag;
     }
 
     export function getJSDocTemplateTag(node: Node): JSDocTemplateTag {
-        return getJSDocTag(node, SyntaxKind.JSDocTemplateTag) as JSDocTemplateTag;
+        return getFirstJSDocTag(node, SyntaxKind.JSDocTemplateTag) as JSDocTemplateTag;
     }
 
     export function hasRestParameter(s: SignatureDeclaration): boolean {

From 2646828198fb468eabec12ebc6a9446d4e9a7cce Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Thu, 17 Nov 2016 20:18:00 -0800
Subject: [PATCH 278/421] Type relations for generic mapped types

---
 src/compiler/checker.ts              | 112 ++++++++++++++++++++-------
 src/compiler/diagnosticMessages.json |   2 +-
 src/compiler/types.ts                |   4 +-
 3 files changed, 86 insertions(+), 32 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 3d25fc8bbbb..5ea185556f7 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -120,6 +120,7 @@ namespace ts {
         const intersectionTypes = createMap<IntersectionType>();
         const stringLiteralTypes = createMap<LiteralType>();
         const numericLiteralTypes = createMap<LiteralType>();
+        const indexedAccessTypes = createMap<IndexedAccessType>();
         const evolvingArrayTypes: EvolvingArrayType[] = [];
 
         const unknownSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "unknown");
@@ -5907,6 +5908,7 @@ namespace ts {
 
         function getIndexType(type: Type): Type {
             return type.flags & TypeFlags.TypeParameter ? getIndexTypeForTypeParameter(<TypeParameter>type) :
+                getObjectFlags(type) & ObjectFlags.Mapped ? getConstraintTypeFromMappedType(<MappedType>type) :
                 type.flags & TypeFlags.Any || getIndexInfoOfType(type, IndexKind.String) ? stringOrNumberType :
                 getIndexInfoOfType(type, IndexKind.Number) ? getUnionType([numberType, getLiteralTypeFromPropertyNames(type)]) :
                 getLiteralTypeFromPropertyNames(type);
@@ -5920,18 +5922,13 @@ namespace ts {
             return links.resolvedType;
         }
 
-        function createIndexedAccessType(objectType: Type, indexType: TypeParameter) {
+        function createIndexedAccessType(objectType: Type, indexType: Type) {
             const type = <IndexedAccessType>createType(TypeFlags.IndexedAccess);
             type.objectType = objectType;
             type.indexType = indexType;
             return type;
         }
 
-        function getIndexedAccessTypeForTypeParameter(objectType: Type, indexType: TypeParameter) {
-            const indexedAccessTypes = indexType.resolvedIndexedAccessTypes || (indexType.resolvedIndexedAccessTypes = []);
-            return indexedAccessTypes[objectType.id] || (indexedAccessTypes[objectType.id] = createIndexedAccessType(objectType, indexType));
-        }
-
         function getPropertyTypeForIndexType(objectType: Type, indexType: Type, accessNode: ElementAccessExpression | IndexedAccessTypeNode, cacheSymbol: boolean) {
             const accessExpression = accessNode && accessNode.kind === SyntaxKind.ElementAccessExpression ? <ElementAccessExpression>accessNode : undefined;
             const propName = indexType.flags & (TypeFlags.StringLiteral | TypeFlags.NumberLiteral | TypeFlags.EnumLiteral) ?
@@ -5995,13 +5992,41 @@ namespace ts {
             return unknownType;
         }
 
+        function getIndexedAccessForMappedType(type: MappedType, indexType: Type, accessNode?: ElementAccessExpression | IndexedAccessTypeNode) {
+            const accessExpression = accessNode && accessNode.kind === SyntaxKind.ElementAccessExpression ? <ElementAccessExpression>accessNode : undefined;
+            if (accessExpression && isAssignmentTarget(accessExpression) && type.declaration.readonlyToken) {
+                error(accessExpression, Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(type));
+                return unknownType;
+            }
+            const mapper = createUnaryTypeMapper(getTypeParameterFromMappedType(type), indexType);
+            const templateMapper = type.mapper ? combineTypeMappers(type.mapper, mapper) : mapper;
+            return addOptionality(instantiateType(getTemplateTypeFromMappedType(type), templateMapper), !!type.declaration.questionToken);
+        }
+
         function getIndexedAccessType(objectType: Type, indexType: Type, accessNode?: ElementAccessExpression | IndexedAccessTypeNode) {
-            if (indexType.flags & TypeFlags.TypeParameter) {
-                if (accessNode && !isTypeAssignableTo(getConstraintOfTypeParameter(<TypeParameter>indexType) || emptyObjectType, getIndexType(objectType))) {
-                    error(accessNode, Diagnostics.Type_0_is_not_constrained_to_keyof_1, typeToString(indexType), typeToString(objectType));
-                    return unknownType;
+            if (indexType.flags & TypeFlags.TypeParameter ||
+                objectType.flags & TypeFlags.TypeParameter && indexType.flags & TypeFlags.Index ||
+                isGenericMappedType(objectType)) {
+                // If either the object type or the index type are type parameters, or if the object type is a mapped
+                // type with a generic constraint, we are performing a higher-order index access where we cannot
+                // meaningfully access the properties of the object type. In those cases, we first check that the
+                // index type is assignable to 'keyof T' for the object type.
+                if (accessNode) {
+                    const keyType = indexType.flags & TypeFlags.TypeParameter ? getConstraintOfTypeParameter(<TypeParameter>indexType) || emptyObjectType : indexType;
+                    if (!isTypeAssignableTo(keyType, getIndexType(objectType))) {
+                        error(accessNode, Diagnostics.Type_0_cannot_be_used_to_index_type_1, typeToString(indexType), typeToString(objectType));
+                        return unknownType;
+                    }
                 }
-                return getIndexedAccessTypeForTypeParameter(objectType, <TypeParameter>indexType);
+                // If the object type is a mapped type { [P in K]: E }, we 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)) {
+                    return getIndexedAccessForMappedType(<MappedType>objectType, indexType, accessNode);
+                }
+                // Otherwise we defer the operation by creating an indexed access type.
+                const id = objectType.id + "," + indexType.id;
+                return indexedAccessTypes[id] || (indexedAccessTypes[id] = createIndexedAccessType(objectType, indexType));
             }
             const apparentType = getApparentType(objectType);
             if (indexType.flags & TypeFlags.Union && !(indexType.flags & TypeFlags.Primitive)) {
@@ -7153,12 +7178,24 @@ namespace ts {
                 }
 
                 if (target.flags & TypeFlags.TypeParameter) {
-                    // Given a type parameter K with a constraint keyof T, a type S is
-                    // assignable to K if S is assignable to keyof T.
-                    const constraint = getConstraintOfTypeParameter(<TypeParameter>target);
-                    if (constraint && constraint.flags & TypeFlags.Index) {
-                        if (result = isRelatedTo(source, constraint, reportErrors)) {
-                            return result;
+                    // A source type { [P in keyof T]: X } is related to a target type T if X is related to T[P].
+                    if (getObjectFlags(source) & ObjectFlags.Mapped && getConstraintTypeFromMappedType(<MappedType>source) === getIndexType(target)) {
+                        if (!(<MappedType>source).declaration.questionToken) {
+                            const templateType = getTemplateTypeFromMappedType(<MappedType>source);
+                            const indexedAccessType = getIndexedAccessType(target, getTypeParameterFromMappedType(<MappedType>source));
+                            if (result = isRelatedTo(templateType, indexedAccessType, reportErrors)) {
+                                return result;
+                            }
+                        }
+                    }
+                    else {
+                        // Given a type parameter K with a constraint keyof T, a type S is
+                        // assignable to K if S is assignable to keyof T.
+                        const constraint = getConstraintOfTypeParameter(<TypeParameter>target);
+                        if (constraint && constraint.flags & TypeFlags.Index) {
+                            if (result = isRelatedTo(source, constraint, reportErrors)) {
+                                return result;
+                            }
                         }
                     }
                 }
@@ -7178,22 +7215,41 @@ namespace ts {
                         }
                     }
                 }
+                else if (target.flags & TypeFlags.IndexedAccess) {
+                    // if we have indexed access types with identical index types, see if relationship holds for
+                    // the two object types.
+                    if (source.flags & TypeFlags.IndexedAccess && (<IndexedAccessType>source).indexType === (<IndexedAccessType>target).indexType) {
+                        if (result = isRelatedTo((<IndexedAccessType>source).objectType, (<IndexedAccessType>target).objectType, reportErrors)) {
+                            return result;
+                        }
+                    }
+                }
 
                 if (source.flags & TypeFlags.TypeParameter) {
-                    let constraint = getConstraintOfTypeParameter(<TypeParameter>source);
-
-                    if (!constraint || constraint.flags & TypeFlags.Any) {
-                        constraint = emptyObjectType;
+                    // A source type T is related to a target type { [P in keyof T]: X } if T[P] is related to X.
+                    if (getObjectFlags(target) & ObjectFlags.Mapped && getConstraintTypeFromMappedType(<MappedType>target) === getIndexType(source)) {
+                        const indexedAccessType = getIndexedAccessType(source, getTypeParameterFromMappedType(<MappedType>target));
+                        const templateType = getTemplateTypeFromMappedType(<MappedType>target);
+                        if (result = isRelatedTo(indexedAccessType, templateType, reportErrors)) {
+                            return result;
+                        }
                     }
+                    else {
+                        let constraint = getConstraintOfTypeParameter(<TypeParameter>source);
 
-                    // The constraint may need to be further instantiated with its 'this' type.
-                    constraint = getTypeWithThisArgument(constraint, source);
+                        if (!constraint || constraint.flags & TypeFlags.Any) {
+                            constraint = emptyObjectType;
+                        }
 
-                    // Report constraint errors only if the constraint is not the empty object type
-                    const reportConstraintErrors = reportErrors && constraint !== emptyObjectType;
-                    if (result = isRelatedTo(constraint, target, reportConstraintErrors)) {
-                        errorInfo = saveErrorInfo;
-                        return result;
+                        // The constraint may need to be further instantiated with its 'this' type.
+                        constraint = getTypeWithThisArgument(constraint, source);
+
+                        // Report constraint errors only if the constraint is not the empty object type
+                        const reportConstraintErrors = reportErrors && constraint !== emptyObjectType;
+                        if (result = isRelatedTo(constraint, target, reportConstraintErrors)) {
+                            errorInfo = saveErrorInfo;
+                            return result;
+                        }
                     }
                 }
                 else {
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 2dd4e76f8f4..68e7bb6e982 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -1731,7 +1731,7 @@
         "category": "Error",
         "code": 2535
     },
-    "Type '{0}' is not constrained to 'keyof {1}'.": {
+    "Type '{0}' cannot be used to index type '{1}'.": {
         "category": "Error",
         "code": 2536
     },
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index b5e3eefbb2d..2b8b6fe294e 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -2974,8 +2974,6 @@ namespace ts {
         /* @internal */
         resolvedIndexType: IndexType;
         /* @internal */
-        resolvedIndexedAccessTypes: IndexedAccessType[];
-        /* @internal */
         isThisType?: boolean;
     }
 
@@ -2985,7 +2983,7 @@ namespace ts {
 
     export interface IndexedAccessType extends Type {
         objectType: Type;
-        indexType: TypeParameter;
+        indexType: Type;
     }
 
     export const enum SignatureKind {

From 63387bb5e00d14642c6ca52470297dd5b14c8211 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Fri, 18 Nov 2016 06:13:04 -0800
Subject: [PATCH 279/421] Error on circular constraints in mapped types

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 5ea185556f7..f6689471cd8 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -6059,6 +6059,9 @@ namespace ts {
                 type.aliasSymbol = getAliasSymbolForTypeNode(node);
                 type.aliasTypeArguments = getAliasTypeArgumentsForTypeNode(node);
                 links.resolvedType = type;
+                // Eagerly resolve the constraint type which forces an error if the constraint type circularly
+                // references itself through one or more type aliases.
+                getConstraintTypeFromMappedType(type);
             }
             return links.resolvedType;
         }

From 79bdc267456fcf2a7f39013c07c84931f595ac79 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Fri, 18 Nov 2016 06:27:24 -0800
Subject: [PATCH 280/421] Accept new baselines

---
 .../reference/recursiveMappedTypes.errors.txt | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 tests/baselines/reference/recursiveMappedTypes.errors.txt

diff --git a/tests/baselines/reference/recursiveMappedTypes.errors.txt b/tests/baselines/reference/recursiveMappedTypes.errors.txt
new file mode 100644
index 00000000000..3dd6a55cf8c
--- /dev/null
+++ b/tests/baselines/reference/recursiveMappedTypes.errors.txt
@@ -0,0 +1,26 @@
+tests/cases/conformance/types/mapped/recursiveMappedTypes.ts(4,6): error TS2456: Type alias 'Recurse' circularly references itself.
+tests/cases/conformance/types/mapped/recursiveMappedTypes.ts(8,6): error TS2456: Type alias 'Recurse1' circularly references itself.
+tests/cases/conformance/types/mapped/recursiveMappedTypes.ts(12,6): error TS2456: Type alias 'Recurse2' circularly references itself.
+
+
+==== tests/cases/conformance/types/mapped/recursiveMappedTypes.ts (3 errors) ====
+    
+    // Recursive mapped types simply appear empty
+    
+    type Recurse = {
+         ~~~~~~~
+!!! error TS2456: Type alias 'Recurse' circularly references itself.
+        [K in keyof Recurse]: Recurse[K]
+    }
+    
+    type Recurse1 = {
+         ~~~~~~~~
+!!! error TS2456: Type alias 'Recurse1' circularly references itself.
+        [K in keyof Recurse2]: Recurse2[K]
+    }
+    
+    type Recurse2 = {
+         ~~~~~~~~
+!!! error TS2456: Type alias 'Recurse2' circularly references itself.
+        [K in keyof Recurse1]: Recurse1[K]
+    }
\ No newline at end of file

From 075a3eb98fd5d639732bc6d47ee9c287c8cd6c64 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Fri, 18 Nov 2016 06:27:45 -0800
Subject: [PATCH 281/421] Add new tests

---
 .../mappedTypeRelationships.errors.txt        | 165 ++++++++++++++++
 .../reference/mappedTypeRelationships.js      | 182 ++++++++++++++++++
 .../types/mapped/mappedTypeRelationships.ts   |  90 +++++++++
 3 files changed, 437 insertions(+)
 create mode 100644 tests/baselines/reference/mappedTypeRelationships.errors.txt
 create mode 100644 tests/baselines/reference/mappedTypeRelationships.js
 create mode 100644 tests/cases/conformance/types/mapped/mappedTypeRelationships.ts

diff --git a/tests/baselines/reference/mappedTypeRelationships.errors.txt b/tests/baselines/reference/mappedTypeRelationships.errors.txt
new file mode 100644
index 00000000000..adafbc5f3a7
--- /dev/null
+++ b/tests/baselines/reference/mappedTypeRelationships.errors.txt
@@ -0,0 +1,165 @@
+tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(12,5): error TS2322: Type 'T[keyof T]' is not assignable to type 'U[keyof T]'.
+  Type 'T' is not assignable to type 'U'.
+tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(17,5): error TS2322: Type 'T[K]' is not assignable to type 'U[K]'.
+  Type 'T' is not assignable to type 'U'.
+tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(21,5): error TS2536: Type 'keyof U' cannot be used to index type 'T'.
+tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(22,12): error TS2536: Type 'keyof U' cannot be used to index type 'T'.
+tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(26,5): error TS2536: Type 'K' cannot be used to index type 'T'.
+tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(27,12): error TS2536: Type 'K' cannot be used to index type 'T'.
+tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(31,5): error TS2322: Type 'T[keyof T] | undefined' is not assignable to type 'T[keyof T]'.
+  Type 'undefined' is not assignable to type 'T[keyof T]'.
+tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(36,5): error TS2322: Type 'T[K] | undefined' is not assignable to type 'T[K]'.
+  Type 'undefined' is not assignable to type 'T[K]'.
+tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(41,5): error TS2322: Type 'U[keyof T] | undefined' is not assignable to type 'T[keyof T]'.
+  Type 'undefined' is not assignable to type 'T[keyof T]'.
+tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(42,5): error TS2322: Type 'T[keyof T]' is not assignable to type 'U[keyof T] | undefined'.
+  Type 'T[keyof T]' is not assignable to type 'U[keyof T]'.
+    Type 'T' is not assignable to type 'U'.
+tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(46,5): error TS2322: Type 'U[K] | undefined' is not assignable to type 'T[K]'.
+  Type 'undefined' is not assignable to type 'T[K]'.
+tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(47,5): error TS2322: Type 'T[K]' is not assignable to type 'U[K] | undefined'.
+  Type 'T[K]' is not assignable to type 'U[K]'.
+    Type 'T' is not assignable to type 'U'.
+tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(52,5): error TS2542: Index signature in type 'Readonly<T>' only permits reading.
+tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(57,5): error TS2542: Index signature in type 'Readonly<T>' only permits reading.
+tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(62,5): error TS2542: Index signature in type 'Readonly<U>' only permits reading.
+tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(67,5): error TS2542: Index signature in type 'Readonly<U>' only permits reading.
+tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(71,5): error TS2322: Type 'Partial<T>' is not assignable to type 'T'.
+tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(76,5): error TS2322: Type 'Partial<T>' is not assignable to type 'T'.
+
+
+==== tests/cases/conformance/types/mapped/mappedTypeRelationships.ts (18 errors) ====
+    
+    function f1<T>(x: T, k: keyof T) {
+        return x[k];
+    }
+    
+    function f2<T, K extends keyof T>(x: T, k: K) {
+        return x[k];
+    }
+    
+    function f3<T, U extends T>(x: T, y: U, k: keyof T) {
+        x[k] = y[k];
+        y[k] = x[k];  // Error
+        ~~~~
+!!! error TS2322: Type 'T[keyof T]' is not assignable to type 'U[keyof T]'.
+!!! error TS2322:   Type 'T' is not assignable to type 'U'.
+    }
+    
+    function f4<T, U extends T, K extends keyof T>(x: T, y: U, k: K) {
+        x[k] = y[k];
+        y[k] = x[k];  // Error
+        ~~~~
+!!! error TS2322: Type 'T[K]' is not assignable to type 'U[K]'.
+!!! error TS2322:   Type 'T' is not assignable to type 'U'.
+    }
+    
+    function f5<T, U extends T>(x: T, y: U, k: keyof U) {
+        x[k] = y[k];  // Error
+        ~~~~
+!!! error TS2536: Type 'keyof U' cannot be used to index type 'T'.
+        y[k] = x[k];  // Error
+               ~~~~
+!!! error TS2536: Type 'keyof U' cannot be used to index type 'T'.
+    }
+    
+    function f6<T, U extends T, K extends keyof U>(x: T, y: U, k: K) {
+        x[k] = y[k];  // Error
+        ~~~~
+!!! error TS2536: Type 'K' cannot be used to index type 'T'.
+        y[k] = x[k];  // Error
+               ~~~~
+!!! error TS2536: Type 'K' cannot be used to index type 'T'.
+    }
+    
+    function f10<T>(x: T, y: Partial<T>, k: keyof T) {
+        x[k] = y[k];  // Error
+        ~~~~
+!!! error TS2322: Type 'T[keyof T] | undefined' is not assignable to type 'T[keyof T]'.
+!!! error TS2322:   Type 'undefined' is not assignable to type 'T[keyof T]'.
+        y[k] = x[k];
+    }
+    
+    function f11<T, K extends keyof T>(x: T, y: Partial<T>, k: K) {
+        x[k] = y[k];  // Error
+        ~~~~
+!!! error TS2322: Type 'T[K] | undefined' is not assignable to type 'T[K]'.
+!!! error TS2322:   Type 'undefined' is not assignable to type 'T[K]'.
+        y[k] = x[k];
+    }
+    
+    function f12<T, U extends T>(x: T, y: Partial<U>, k: keyof T) {
+        x[k] = y[k];  // Error
+        ~~~~
+!!! error TS2322: Type 'U[keyof T] | undefined' is not assignable to type 'T[keyof T]'.
+!!! error TS2322:   Type 'undefined' is not assignable to type 'T[keyof T]'.
+        y[k] = x[k];  // Error
+        ~~~~
+!!! error TS2322: Type 'T[keyof T]' is not assignable to type 'U[keyof T] | undefined'.
+!!! error TS2322:   Type 'T[keyof T]' is not assignable to type 'U[keyof T]'.
+!!! error TS2322:     Type 'T' is not assignable to type 'U'.
+    }
+    
+    function f13<T, U extends T, K extends keyof T>(x: T, y: Partial<U>, k: K) {
+        x[k] = y[k];  // Error
+        ~~~~
+!!! error TS2322: Type 'U[K] | undefined' is not assignable to type 'T[K]'.
+!!! error TS2322:   Type 'undefined' is not assignable to type 'T[K]'.
+        y[k] = x[k];  // Error
+        ~~~~
+!!! error TS2322: Type 'T[K]' is not assignable to type 'U[K] | undefined'.
+!!! error TS2322:   Type 'T[K]' is not assignable to type 'U[K]'.
+!!! error TS2322:     Type 'T' is not assignable to type 'U'.
+    }
+    
+    function f20<T>(x: T, y: Readonly<T>, k: keyof T) {
+        x[k] = y[k];
+        y[k] = x[k];  // Error
+        ~~~~
+!!! error TS2542: Index signature in type 'Readonly<T>' only permits reading.
+    }
+    
+    function f21<T, K extends keyof T>(x: T, y: Readonly<T>, k: K) {
+        x[k] = y[k];
+        y[k] = x[k];  // Error
+        ~~~~
+!!! error TS2542: Index signature in type 'Readonly<T>' only permits reading.
+    }
+    
+    function f22<T, U extends T>(x: T, y: Readonly<U>, k: keyof T) {
+        x[k] = y[k];
+        y[k] = x[k];  // Error
+        ~~~~
+!!! error TS2542: Index signature in type 'Readonly<U>' only permits reading.
+    }
+    
+    function f23<T, U extends T, K extends keyof T>(x: T, y: Readonly<U>, k: K) {
+        x[k] = y[k];
+        y[k] = x[k];  // Error
+        ~~~~
+!!! error TS2542: Index signature in type 'Readonly<U>' only permits reading.
+    }
+    
+    function f30<T>(x: T, y: Partial<T>) {
+        x = y;  // Error
+        ~
+!!! error TS2322: Type 'Partial<T>' is not assignable to type 'T'.
+        y = x;
+    }
+    
+    function f31<T>(x: T, y: Partial<T>) {
+        x = y;  // Error
+        ~
+!!! error TS2322: Type 'Partial<T>' is not assignable to type 'T'.
+        y = x;
+    }
+    
+    function f40<T>(x: T, y: Readonly<T>) {
+        x = y;
+        y = x;
+    }
+    
+    function f41<T>(x: T, y: Readonly<T>) {
+        x = y;
+        y = x;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/mappedTypeRelationships.js b/tests/baselines/reference/mappedTypeRelationships.js
new file mode 100644
index 00000000000..fcad6973ab7
--- /dev/null
+++ b/tests/baselines/reference/mappedTypeRelationships.js
@@ -0,0 +1,182 @@
+//// [mappedTypeRelationships.ts]
+
+function f1<T>(x: T, k: keyof T) {
+    return x[k];
+}
+
+function f2<T, K extends keyof T>(x: T, k: K) {
+    return x[k];
+}
+
+function f3<T, U extends T>(x: T, y: U, k: keyof T) {
+    x[k] = y[k];
+    y[k] = x[k];  // Error
+}
+
+function f4<T, U extends T, K extends keyof T>(x: T, y: U, k: K) {
+    x[k] = y[k];
+    y[k] = x[k];  // Error
+}
+
+function f5<T, U extends T>(x: T, y: U, k: keyof U) {
+    x[k] = y[k];  // Error
+    y[k] = x[k];  // Error
+}
+
+function f6<T, U extends T, K extends keyof U>(x: T, y: U, k: K) {
+    x[k] = y[k];  // Error
+    y[k] = x[k];  // Error
+}
+
+function f10<T>(x: T, y: Partial<T>, k: keyof T) {
+    x[k] = y[k];  // Error
+    y[k] = x[k];
+}
+
+function f11<T, K extends keyof T>(x: T, y: Partial<T>, k: K) {
+    x[k] = y[k];  // Error
+    y[k] = x[k];
+}
+
+function f12<T, U extends T>(x: T, y: Partial<U>, k: keyof T) {
+    x[k] = y[k];  // Error
+    y[k] = x[k];  // Error
+}
+
+function f13<T, U extends T, K extends keyof T>(x: T, y: Partial<U>, k: K) {
+    x[k] = y[k];  // Error
+    y[k] = x[k];  // Error
+}
+
+function f20<T>(x: T, y: Readonly<T>, k: keyof T) {
+    x[k] = y[k];
+    y[k] = x[k];  // Error
+}
+
+function f21<T, K extends keyof T>(x: T, y: Readonly<T>, k: K) {
+    x[k] = y[k];
+    y[k] = x[k];  // Error
+}
+
+function f22<T, U extends T>(x: T, y: Readonly<U>, k: keyof T) {
+    x[k] = y[k];
+    y[k] = x[k];  // Error
+}
+
+function f23<T, U extends T, K extends keyof T>(x: T, y: Readonly<U>, k: K) {
+    x[k] = y[k];
+    y[k] = x[k];  // Error
+}
+
+function f30<T>(x: T, y: Partial<T>) {
+    x = y;  // Error
+    y = x;
+}
+
+function f31<T>(x: T, y: Partial<T>) {
+    x = y;  // Error
+    y = x;
+}
+
+function f40<T>(x: T, y: Readonly<T>) {
+    x = y;
+    y = x;
+}
+
+function f41<T>(x: T, y: Readonly<T>) {
+    x = y;
+    y = x;
+}
+
+//// [mappedTypeRelationships.js]
+function f1(x, k) {
+    return x[k];
+}
+function f2(x, k) {
+    return x[k];
+}
+function f3(x, y, k) {
+    x[k] = y[k];
+    y[k] = x[k]; // Error
+}
+function f4(x, y, k) {
+    x[k] = y[k];
+    y[k] = x[k]; // Error
+}
+function f5(x, y, k) {
+    x[k] = y[k]; // Error
+    y[k] = x[k]; // Error
+}
+function f6(x, y, k) {
+    x[k] = y[k]; // Error
+    y[k] = x[k]; // Error
+}
+function f10(x, y, k) {
+    x[k] = y[k]; // Error
+    y[k] = x[k];
+}
+function f11(x, y, k) {
+    x[k] = y[k]; // Error
+    y[k] = x[k];
+}
+function f12(x, y, k) {
+    x[k] = y[k]; // Error
+    y[k] = x[k]; // Error
+}
+function f13(x, y, k) {
+    x[k] = y[k]; // Error
+    y[k] = x[k]; // Error
+}
+function f20(x, y, k) {
+    x[k] = y[k];
+    y[k] = x[k]; // Error
+}
+function f21(x, y, k) {
+    x[k] = y[k];
+    y[k] = x[k]; // Error
+}
+function f22(x, y, k) {
+    x[k] = y[k];
+    y[k] = x[k]; // Error
+}
+function f23(x, y, k) {
+    x[k] = y[k];
+    y[k] = x[k]; // Error
+}
+function f30(x, y) {
+    x = y; // Error
+    y = x;
+}
+function f31(x, y) {
+    x = y; // Error
+    y = x;
+}
+function f40(x, y) {
+    x = y;
+    y = x;
+}
+function f41(x, y) {
+    x = y;
+    y = x;
+}
+
+
+//// [mappedTypeRelationships.d.ts]
+declare function f1<T>(x: T, k: keyof T): T[keyof T];
+declare function f2<T, K extends keyof T>(x: T, k: K): T[K];
+declare function f3<T, U extends T>(x: T, y: U, k: keyof T): void;
+declare function f4<T, U extends T, K extends keyof T>(x: T, y: U, k: K): void;
+declare function f5<T, U extends T>(x: T, y: U, k: keyof U): void;
+declare function f6<T, U extends T, K extends keyof U>(x: T, y: U, k: K): void;
+declare function f10<T>(x: T, y: Partial<T>, k: keyof T): void;
+declare function f11<T, K extends keyof T>(x: T, y: Partial<T>, k: K): void;
+declare function f12<T, U extends T>(x: T, y: Partial<U>, k: keyof T): void;
+declare function f13<T, U extends T, K extends keyof T>(x: T, y: Partial<U>, k: K): void;
+declare function f20<T>(x: T, y: Readonly<T>, k: keyof T): void;
+declare function f21<T, K extends keyof T>(x: T, y: Readonly<T>, k: K): void;
+declare function f22<T, U extends T>(x: T, y: Readonly<U>, k: keyof T): void;
+declare function f23<T, U extends T, K extends keyof T>(x: T, y: Readonly<U>, k: K): void;
+declare function f30<T>(x: T, y: Partial<T>): void;
+declare function f31<T>(x: T, y: Partial<T>): void;
+declare function f40<T>(x: T, y: Readonly<T>): void;
+declare function f41<T>(x: T, y: Readonly<T>): void;
diff --git a/tests/cases/conformance/types/mapped/mappedTypeRelationships.ts b/tests/cases/conformance/types/mapped/mappedTypeRelationships.ts
new file mode 100644
index 00000000000..7bc1c1a1670
--- /dev/null
+++ b/tests/cases/conformance/types/mapped/mappedTypeRelationships.ts
@@ -0,0 +1,90 @@
+// @strictNullChecks: true
+// @declaration: true
+
+function f1<T>(x: T, k: keyof T) {
+    return x[k];
+}
+
+function f2<T, K extends keyof T>(x: T, k: K) {
+    return x[k];
+}
+
+function f3<T, U extends T>(x: T, y: U, k: keyof T) {
+    x[k] = y[k];
+    y[k] = x[k];  // Error
+}
+
+function f4<T, U extends T, K extends keyof T>(x: T, y: U, k: K) {
+    x[k] = y[k];
+    y[k] = x[k];  // Error
+}
+
+function f5<T, U extends T>(x: T, y: U, k: keyof U) {
+    x[k] = y[k];  // Error
+    y[k] = x[k];  // Error
+}
+
+function f6<T, U extends T, K extends keyof U>(x: T, y: U, k: K) {
+    x[k] = y[k];  // Error
+    y[k] = x[k];  // Error
+}
+
+function f10<T>(x: T, y: Partial<T>, k: keyof T) {
+    x[k] = y[k];  // Error
+    y[k] = x[k];
+}
+
+function f11<T, K extends keyof T>(x: T, y: Partial<T>, k: K) {
+    x[k] = y[k];  // Error
+    y[k] = x[k];
+}
+
+function f12<T, U extends T>(x: T, y: Partial<U>, k: keyof T) {
+    x[k] = y[k];  // Error
+    y[k] = x[k];  // Error
+}
+
+function f13<T, U extends T, K extends keyof T>(x: T, y: Partial<U>, k: K) {
+    x[k] = y[k];  // Error
+    y[k] = x[k];  // Error
+}
+
+function f20<T>(x: T, y: Readonly<T>, k: keyof T) {
+    x[k] = y[k];
+    y[k] = x[k];  // Error
+}
+
+function f21<T, K extends keyof T>(x: T, y: Readonly<T>, k: K) {
+    x[k] = y[k];
+    y[k] = x[k];  // Error
+}
+
+function f22<T, U extends T>(x: T, y: Readonly<U>, k: keyof T) {
+    x[k] = y[k];
+    y[k] = x[k];  // Error
+}
+
+function f23<T, U extends T, K extends keyof T>(x: T, y: Readonly<U>, k: K) {
+    x[k] = y[k];
+    y[k] = x[k];  // Error
+}
+
+function f30<T>(x: T, y: Partial<T>) {
+    x = y;  // Error
+    y = x;
+}
+
+function f31<T>(x: T, y: Partial<T>) {
+    x = y;  // Error
+    y = x;
+}
+
+function f40<T>(x: T, y: Readonly<T>) {
+    x = y;
+    y = x;
+}
+
+function f41<T>(x: T, y: Readonly<T>) {
+    x = y;
+    y = x;
+}
\ No newline at end of file

From aa0d2ce2eea83ddc67d45af74bb3e7eb55710d16 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Fri, 18 Nov 2016 06:55:03 -0800
Subject: [PATCH 282/421] Make "exclude" default to empty if "include" is
 present.

---
 src/compiler/commandLineParser.ts   |  4 +--
 src/harness/unittests/matchFiles.ts | 48 ++++++++++++++++++++---------
 2 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index 26877de43c4..7a6476818f7 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -951,8 +951,8 @@ namespace ts {
                 errors.push(createCompilerDiagnostic(Diagnostics.Unknown_option_excludes_Did_you_mean_exclude));
             }
             else {
-                // By default, exclude common package folders and the outDir
-                excludeSpecs = ["node_modules", "bower_components", "jspm_packages"];
+                // If no includes were specified, exclude common package folders and the outDir
+                excludeSpecs = includeSpecs ? [] : ["node_modules", "bower_components", "jspm_packages"];
 
                 const outDir = json["compilerOptions"] && json["compilerOptions"]["outDir"];
                 if (outDir) {
diff --git a/src/harness/unittests/matchFiles.ts b/src/harness/unittests/matchFiles.ts
index b514ac142c5..c562fcefe91 100644
--- a/src/harness/unittests/matchFiles.ts
+++ b/src/harness/unittests/matchFiles.ts
@@ -89,8 +89,6 @@ namespace ts {
         "c:/dev/g.min.js/.g/g.ts"
     ]);
 
-    const defaultExcludes = ["node_modules", "bower_components", "jspm_packages"];
-
     function assertParsed(actual: ts.ParsedCommandLine, expected: ts.ParsedCommandLine): void {
         assert.deepEqual(actual.fileNames, expected.fileNames);
         assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
@@ -98,6 +96,23 @@ namespace ts {
     }
 
     describe("matchFiles", () => {
+        it("with defaults", () => {
+            const json = {};
+            const expected: ts.ParsedCommandLine = {
+                options: {},
+                errors: [],
+                fileNames: [
+                    "c:/dev/a.ts",
+                    "c:/dev/b.ts"
+                ],
+                wildcardDirectories: {
+                    "c:/dev": ts.WatchDirectoryFlags.Recursive
+                },
+            };
+            const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveCommonFoldersHost, caseInsensitiveBasePath);
+            assertParsed(actual, expected);
+        });
+
         describe("with literal file list", () => {
             it("without exclusions", () => {
                 const json = {
@@ -192,7 +207,7 @@ namespace ts {
                     options: {},
                     errors: [
                         ts.createCompilerDiagnostic(ts.Diagnostics.No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2,
-                            caseInsensitiveTsconfigPath, JSON.stringify(json.include), JSON.stringify(defaultExcludes))
+                            caseInsensitiveTsconfigPath, JSON.stringify(json.include), "[]")
                     ],
                     fileNames: [],
                     wildcardDirectories: {},
@@ -211,7 +226,7 @@ namespace ts {
                     options: {},
                     errors: [
                         ts.createCompilerDiagnostic(ts.Diagnostics.No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2,
-                            caseInsensitiveTsconfigPath, JSON.stringify(json.include), JSON.stringify(defaultExcludes))
+                            caseInsensitiveTsconfigPath, JSON.stringify(json.include), "[]")
                     ],
                     fileNames: [],
                     wildcardDirectories: {},
@@ -330,7 +345,10 @@ namespace ts {
                     errors: [],
                     fileNames: [
                         "c:/dev/a.ts",
-                        "c:/dev/b.ts"
+                        "c:/dev/b.ts",
+                        "c:/dev/bower_components/a.ts",
+                        "c:/dev/jspm_packages/a.ts",
+                        "c:/dev/node_modules/a.ts"
                     ],
                     wildcardDirectories: {},
                 };
@@ -372,8 +390,7 @@ namespace ts {
                         "node_modules/a.ts",
                         "bower_components/a.ts",
                         "jspm_packages/a.ts"
-                    ],
-                    exclude: <string[]>[]
+                    ]
                 };
                 const expected: ts.ParsedCommandLine = {
                     options: {},
@@ -530,7 +547,7 @@ namespace ts {
                     options: {},
                     errors: [
                         ts.createCompilerDiagnostic(ts.Diagnostics.No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2,
-                            caseInsensitiveTsconfigPath, JSON.stringify(json.include), JSON.stringify(defaultExcludes))
+                            caseInsensitiveTsconfigPath, JSON.stringify(json.include), "[]")
                     ],
                     fileNames: [],
                     wildcardDirectories: {
@@ -600,7 +617,10 @@ namespace ts {
                     options: {},
                     errors: [],
                     fileNames: [
-                        "c:/dev/a.ts"
+                        "c:/dev/a.ts",
+                        "c:/dev/bower_components/a.ts",
+                        "c:/dev/jspm_packages/a.ts",
+                        "c:/dev/node_modules/a.ts"
                     ],
                     wildcardDirectories: {
                         "c:/dev": ts.WatchDirectoryFlags.Recursive
@@ -671,7 +691,7 @@ namespace ts {
                     },
                     errors: [
                         ts.createCompilerDiagnostic(ts.Diagnostics.No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2,
-                            caseInsensitiveTsconfigPath, JSON.stringify(json.include), JSON.stringify(defaultExcludes))
+                            caseInsensitiveTsconfigPath, JSON.stringify(json.include), "[]")
                     ],
                     fileNames: [],
                     wildcardDirectories: {
@@ -980,7 +1000,7 @@ namespace ts {
                         errors: [
                             ts.createCompilerDiagnostic(ts.Diagnostics.File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0, "**"),
                             ts.createCompilerDiagnostic(ts.Diagnostics.No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2,
-                                caseInsensitiveTsconfigPath, JSON.stringify(json.include), JSON.stringify(defaultExcludes))
+                                caseInsensitiveTsconfigPath, JSON.stringify(json.include), "[]")
                         ],
                         fileNames: [],
                         wildcardDirectories: {}
@@ -1022,7 +1042,7 @@ namespace ts {
                         errors: [
                             ts.createCompilerDiagnostic(ts.Diagnostics.File_specification_cannot_contain_multiple_recursive_directory_wildcards_Asterisk_Asterisk_Colon_0, "**/x/**/*"),
                             ts.createCompilerDiagnostic(ts.Diagnostics.No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2,
-                                caseInsensitiveTsconfigPath, JSON.stringify(json.include), JSON.stringify(defaultExcludes))
+                                caseInsensitiveTsconfigPath, JSON.stringify(json.include), "[]")
                         ],
                         fileNames: [],
                         wildcardDirectories: {}
@@ -1071,7 +1091,7 @@ namespace ts {
                         errors: [
                             ts.createCompilerDiagnostic(ts.Diagnostics.File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0, "**/../*"),
                             ts.createCompilerDiagnostic(ts.Diagnostics.No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2,
-                                caseInsensitiveTsconfigPath, JSON.stringify(json.include), JSON.stringify(defaultExcludes))
+                                caseInsensitiveTsconfigPath, JSON.stringify(json.include), "[]")
                         ],
                         fileNames: [],
                         wildcardDirectories: {}
@@ -1091,7 +1111,7 @@ namespace ts {
                         errors: [
                             ts.createCompilerDiagnostic(ts.Diagnostics.File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0, "**/y/../*"),
                             ts.createCompilerDiagnostic(ts.Diagnostics.No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2,
-                                caseInsensitiveTsconfigPath, JSON.stringify(json.include), JSON.stringify(defaultExcludes))
+                                caseInsensitiveTsconfigPath, JSON.stringify(json.include), "[]")
                         ],
                         fileNames: [],
                         wildcardDirectories: {}

From d8b0f239f1a47300c5e22e05c5d64abe534a5c90 Mon Sep 17 00:00:00 2001
From: Myles Megyesi <mylesmegyesi@users.noreply.github.com>
Date: Wed, 16 Nov 2016 16:59:15 -0600
Subject: [PATCH 283/421] Fixes error message when Type is used as a Namespace

Fixes #12075
---
 src/compiler/checker.ts                             | 13 +++++++++++++
 src/compiler/diagnosticMessages.json                |  4 ++++
 .../invalidImportAliasIdentifiers.errors.txt        |  4 ++--
 .../invalidUseOfTypeAsNamespace.errors.txt          | 11 +++++++++++
 .../reference/invalidUseOfTypeAsNamespace.js        |  8 ++++++++
 ...ictModeReservedWordInClassDeclaration.errors.txt |  8 ++++----
 tests/cases/compiler/invalidUseOfTypeAsNamespace.ts |  4 ++++
 7 files changed, 46 insertions(+), 6 deletions(-)
 create mode 100644 tests/baselines/reference/invalidUseOfTypeAsNamespace.errors.txt
 create mode 100644 tests/baselines/reference/invalidUseOfTypeAsNamespace.js
 create mode 100644 tests/cases/compiler/invalidUseOfTypeAsNamespace.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 3d25fc8bbbb..fdd5a28a143 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -922,6 +922,7 @@ namespace ts {
                     if (!errorLocation ||
                         !checkAndReportErrorForMissingPrefix(errorLocation, name, nameArg) &&
                         !checkAndReportErrorForExtendingInterface(errorLocation) &&
+                        !checkAndReportErrorForUsingTypeAsNamespace(errorLocation, name, meaning) &&
                         !checkAndReportErrorForUsingTypeAsValue(errorLocation, name, meaning)) {
                         error(errorLocation, nameNotFoundMessage, typeof nameArg === "string" ? nameArg : declarationNameToString(nameArg));
                     }
@@ -1032,6 +1033,18 @@ namespace ts {
             }
         }
 
+        function checkAndReportErrorForUsingTypeAsNamespace(errorLocation: Node, name: string, meaning: SymbolFlags): boolean {
+            if (meaning === SymbolFlags.Namespace) {
+                const symbol = resolveSymbol(resolveName(errorLocation, name, SymbolFlags.Type & ~SymbolFlags.Value, /*nameNotFoundMessage*/undefined, /*nameArg*/ undefined));
+                if (symbol) {
+                    error(errorLocation, Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_namespace_here, name);
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
         function checkAndReportErrorForUsingTypeAsValue(errorLocation: Node, name: string, meaning: SymbolFlags): boolean {
             if (meaning & (SymbolFlags.Value & ~SymbolFlags.NamespaceModule)) {
                 const symbol = resolveSymbol(resolveName(errorLocation, name, SymbolFlags.Type & ~SymbolFlags.Value, /*nameNotFoundMessage*/undefined, /*nameArg*/ undefined));
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 2dd4e76f8f4..245c4bdc736 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -1995,6 +1995,10 @@
         "category": "Error",
         "code": 2701
     },
+    "'{0}' only refers to a type, but is being used as a namespace here.": {
+        "category": "Error",
+        "code": 2702
+    },
 
     "Import declaration '{0}' is using private name '{1}'.": {
         "category": "Error",
diff --git a/tests/baselines/reference/invalidImportAliasIdentifiers.errors.txt b/tests/baselines/reference/invalidImportAliasIdentifiers.errors.txt
index bf5cf5c0f12..c69cc85ad9d 100644
--- a/tests/baselines/reference/invalidImportAliasIdentifiers.errors.txt
+++ b/tests/baselines/reference/invalidImportAliasIdentifiers.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/conformance/internalModules/importDeclarations/invalidImportAliasIdentifiers.ts(5,12): error TS2503: Cannot find namespace 'V'.
 tests/cases/conformance/internalModules/importDeclarations/invalidImportAliasIdentifiers.ts(11,12): error TS2503: Cannot find namespace 'C'.
-tests/cases/conformance/internalModules/importDeclarations/invalidImportAliasIdentifiers.ts(23,12): error TS2693: 'I' only refers to a type, but is being used as a value here.
+tests/cases/conformance/internalModules/importDeclarations/invalidImportAliasIdentifiers.ts(23,12): error TS2702: 'I' only refers to a type, but is being used as a namespace here.
 
 
 ==== tests/cases/conformance/internalModules/importDeclarations/invalidImportAliasIdentifiers.ts (3 errors) ====
@@ -32,5 +32,5 @@ tests/cases/conformance/internalModules/importDeclarations/invalidImportAliasIde
     
     import i = I;
                ~
-!!! error TS2693: 'I' only refers to a type, but is being used as a value here.
+!!! error TS2702: 'I' only refers to a type, but is being used as a namespace here.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/invalidUseOfTypeAsNamespace.errors.txt b/tests/baselines/reference/invalidUseOfTypeAsNamespace.errors.txt
new file mode 100644
index 00000000000..0353d46d632
--- /dev/null
+++ b/tests/baselines/reference/invalidUseOfTypeAsNamespace.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/compiler/invalidUseOfTypeAsNamespace.ts(4,16): error TS2702: 'OhNo' only refers to a type, but is being used as a namespace here.
+
+
+==== tests/cases/compiler/invalidUseOfTypeAsNamespace.ts (1 errors) ====
+    interface OhNo {
+    }
+    
+    declare let y: OhNo.hello;
+                   ~~~~
+!!! error TS2702: 'OhNo' only refers to a type, but is being used as a namespace here.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/invalidUseOfTypeAsNamespace.js b/tests/baselines/reference/invalidUseOfTypeAsNamespace.js
new file mode 100644
index 00000000000..3b598fdea9c
--- /dev/null
+++ b/tests/baselines/reference/invalidUseOfTypeAsNamespace.js
@@ -0,0 +1,8 @@
+//// [invalidUseOfTypeAsNamespace.ts]
+interface OhNo {
+}
+
+declare let y: OhNo.hello;
+
+
+//// [invalidUseOfTypeAsNamespace.js]
diff --git a/tests/baselines/reference/strictModeReservedWordInClassDeclaration.errors.txt b/tests/baselines/reference/strictModeReservedWordInClassDeclaration.errors.txt
index 0dff64c9a31..fafffb563ea 100644
--- a/tests/baselines/reference/strictModeReservedWordInClassDeclaration.errors.txt
+++ b/tests/baselines/reference/strictModeReservedWordInClassDeclaration.errors.txt
@@ -16,9 +16,9 @@ tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts(21,9): error TS
 tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts(21,17): error TS1213: Identifier expected. 'private' is a reserved word in strict mode. Class definitions are automatically in strict mode.
 tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts(23,20): error TS1213: Identifier expected. 'public' is a reserved word in strict mode. Class definitions are automatically in strict mode.
 tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts(25,20): error TS1213: Identifier expected. 'public' is a reserved word in strict mode. Class definitions are automatically in strict mode.
-tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts(25,20): error TS2693: 'public' only refers to a type, but is being used as a value here.
+tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts(25,20): error TS2702: 'public' only refers to a type, but is being used as a namespace here.
 tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts(26,21): error TS1213: Identifier expected. 'public' is a reserved word in strict mode. Class definitions are automatically in strict mode.
-tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts(26,21): error TS2693: 'public' only refers to a type, but is being used as a value here.
+tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts(26,21): error TS2702: 'public' only refers to a type, but is being used as a namespace here.
 tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts(27,17): error TS1213: Identifier expected. 'package' is a reserved word in strict mode. Class definitions are automatically in strict mode.
 tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts(27,17): error TS2304: Cannot find name 'package'.
 tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts(28,17): error TS1213: Identifier expected. 'package' is a reserved word in strict mode. Class definitions are automatically in strict mode.
@@ -88,12 +88,12 @@ tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts(28,17): error T
                        ~~~~~~
 !!! error TS1213: Identifier expected. 'public' is a reserved word in strict mode. Class definitions are automatically in strict mode.
                        ~~~~~~
-!!! error TS2693: 'public' only refers to a type, but is being used as a value here.
+!!! error TS2702: 'public' only refers to a type, but is being used as a namespace here.
     class F1 implements public.private.implements { }
                         ~~~~~~
 !!! error TS1213: Identifier expected. 'public' is a reserved word in strict mode. Class definitions are automatically in strict mode.
                         ~~~~~~
-!!! error TS2693: 'public' only refers to a type, but is being used as a value here.
+!!! error TS2702: 'public' only refers to a type, but is being used as a namespace here.
     class G extends package { }
                     ~~~~~~~
 !!! error TS1213: Identifier expected. 'package' is a reserved word in strict mode. Class definitions are automatically in strict mode.
diff --git a/tests/cases/compiler/invalidUseOfTypeAsNamespace.ts b/tests/cases/compiler/invalidUseOfTypeAsNamespace.ts
new file mode 100644
index 00000000000..5391715cb3a
--- /dev/null
+++ b/tests/cases/compiler/invalidUseOfTypeAsNamespace.ts
@@ -0,0 +1,4 @@
+interface OhNo {
+}
+
+declare let y: OhNo.hello;

From cbde25f2298d4d3f5c47ea62877bc9017dedddaf Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Fri, 18 Nov 2016 11:01:28 -0800
Subject: [PATCH 284/421] Handle the scenario when heritage clause of interface
 is not entity name expression Fixes #12291

---
 src/compiler/declarationEmitter.ts             |  5 ++++-
 ...hNonEntityNameExpressionHeritage.errors.txt |  9 +++++++++
 ...rfaceWithNonEntityNameExpressionHeritage.js | 18 ++++++++++++++++++
 ...rfaceWithNonEntityNameExpressionHeritage.ts |  4 ++++
 4 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 tests/baselines/reference/declarationEmitInterfaceWithNonEntityNameExpressionHeritage.errors.txt
 create mode 100644 tests/baselines/reference/declarationEmitInterfaceWithNonEntityNameExpressionHeritage.js
 create mode 100644 tests/cases/compiler/declarationEmitInterfaceWithNonEntityNameExpressionHeritage.ts

diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts
index 7d2f61b6d6f..a7f24dc6321 100644
--- a/src/compiler/declarationEmitter.ts
+++ b/src/compiler/declarationEmitter.ts
@@ -1143,7 +1143,10 @@ namespace ts {
             const prevEnclosingDeclaration = enclosingDeclaration;
             enclosingDeclaration = node;
             emitTypeParameters(node.typeParameters);
-            emitHeritageClause(getInterfaceBaseTypeNodes(node), /*isImplementsList*/ false);
+            const interfaceExtendsTypes = filter(getInterfaceBaseTypeNodes(node), base => isEntityNameExpression(base.expression));
+            if (interfaceExtendsTypes && interfaceExtendsTypes.length) {
+                emitHeritageClause(interfaceExtendsTypes, /*isImplementsList*/ false);
+            }
             write(" {");
             writeLine();
             increaseIndent();
diff --git a/tests/baselines/reference/declarationEmitInterfaceWithNonEntityNameExpressionHeritage.errors.txt b/tests/baselines/reference/declarationEmitInterfaceWithNonEntityNameExpressionHeritage.errors.txt
new file mode 100644
index 00000000000..7dc3a70fdc7
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitInterfaceWithNonEntityNameExpressionHeritage.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/compiler/declarationEmitInterfaceWithNonEntityNameExpressionHeritage.ts(3,25): error TS2499: An interface can only extend an identifier/qualified-name with optional type arguments.
+
+
+==== tests/cases/compiler/declarationEmitInterfaceWithNonEntityNameExpressionHeritage.ts (1 errors) ====
+    
+    class A { }
+    interface Class extends (typeof A) { }
+                            ~~~~~~~~~~
+!!! error TS2499: An interface can only extend an identifier/qualified-name with optional type arguments.
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitInterfaceWithNonEntityNameExpressionHeritage.js b/tests/baselines/reference/declarationEmitInterfaceWithNonEntityNameExpressionHeritage.js
new file mode 100644
index 00000000000..ef2d2e479b0
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitInterfaceWithNonEntityNameExpressionHeritage.js
@@ -0,0 +1,18 @@
+//// [declarationEmitInterfaceWithNonEntityNameExpressionHeritage.ts]
+
+class A { }
+interface Class extends (typeof A) { }
+
+//// [declarationEmitInterfaceWithNonEntityNameExpressionHeritage.js]
+var A = (function () {
+    function A() {
+    }
+    return A;
+}());
+
+
+//// [declarationEmitInterfaceWithNonEntityNameExpressionHeritage.d.ts]
+declare class A {
+}
+interface Class {
+}
diff --git a/tests/cases/compiler/declarationEmitInterfaceWithNonEntityNameExpressionHeritage.ts b/tests/cases/compiler/declarationEmitInterfaceWithNonEntityNameExpressionHeritage.ts
new file mode 100644
index 00000000000..762adaad657
--- /dev/null
+++ b/tests/cases/compiler/declarationEmitInterfaceWithNonEntityNameExpressionHeritage.ts
@@ -0,0 +1,4 @@
+// @declaration: true
+
+class A { }
+interface Class extends (typeof A) { }
\ No newline at end of file

From 2376e30410e112689acbd3268ee94aa113546c56 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Fri, 18 Nov 2016 13:30:56 -0800
Subject: [PATCH 285/421] Support apparent types for T[K] indexed access types

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index f6689471cd8..024c3d4a983 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -4666,13 +4666,22 @@ namespace ts {
             return type.resolvedApparentType;
         }
 
+        /**
+         * The apparent type of an indexed access T[K] is the type of T's string index signature, if any.
+         */
+        function getApparentTypeOfIndexedAccess(type: IndexedAccessType) {
+            return getIndexTypeOfType(getApparentType(type.objectType), IndexKind.String) || type;
+        }
+
         /**
          * For a type parameter, return the base constraint of the type parameter. For the string, number,
          * boolean, and symbol primitive types, return the corresponding object types. Otherwise return the
          * type itself. Note that the apparent type of a union type is the union type itself.
          */
         function getApparentType(type: Type): Type {
-            const t = type.flags & TypeFlags.TypeParameter ? getApparentTypeOfTypeParameter(<TypeParameter>type) : type;
+            const t = type.flags & TypeFlags.TypeParameter ? getApparentTypeOfTypeParameter(<TypeParameter>type) :
+                type.flags & TypeFlags.IndexedAccess ? getApparentTypeOfIndexedAccess(<IndexedAccessType>type) :
+                type;
             return t.flags & TypeFlags.StringLike ? globalStringType :
                 t.flags & TypeFlags.NumberLike ? globalNumberType :
                 t.flags & TypeFlags.BooleanLike ? globalBooleanType :

From a78999078173b6ce5243f77493a86091108ae774 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Fri, 18 Nov 2016 13:31:10 -0800
Subject: [PATCH 286/421] Add tests

---
 .../mappedTypeRelationships.errors.txt        | 18 ++++++++++
 .../reference/mappedTypeRelationships.js      | 34 +++++++++++++++++++
 .../types/mapped/mappedTypeRelationships.ts   | 18 ++++++++++
 3 files changed, 70 insertions(+)

diff --git a/tests/baselines/reference/mappedTypeRelationships.errors.txt b/tests/baselines/reference/mappedTypeRelationships.errors.txt
index adafbc5f3a7..e8e0371ed9a 100644
--- a/tests/baselines/reference/mappedTypeRelationships.errors.txt
+++ b/tests/baselines/reference/mappedTypeRelationships.errors.txt
@@ -162,4 +162,22 @@ tests/cases/conformance/types/mapped/mappedTypeRelationships.ts(76,5): error TS2
     function f41<T>(x: T, y: Readonly<T>) {
         x = y;
         y = x;
+    }
+    
+    type Item = {
+        name: string;
+    }
+    
+    type ItemMap = {
+        [x: string]: Item;
+    }
+    
+    function f50<T extends ItemMap>(obj: T, key: keyof T) {
+        let item: Item = obj[key];
+        return obj[key].name;
+    }
+    
+    function f51<T extends ItemMap, K extends keyof T>(obj: T, key: K) {
+        let item: Item = obj[key];
+        return obj[key].name;
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/mappedTypeRelationships.js b/tests/baselines/reference/mappedTypeRelationships.js
index fcad6973ab7..a81ff973da8 100644
--- a/tests/baselines/reference/mappedTypeRelationships.js
+++ b/tests/baselines/reference/mappedTypeRelationships.js
@@ -86,6 +86,24 @@ function f40<T>(x: T, y: Readonly<T>) {
 function f41<T>(x: T, y: Readonly<T>) {
     x = y;
     y = x;
+}
+
+type Item = {
+    name: string;
+}
+
+type ItemMap = {
+    [x: string]: Item;
+}
+
+function f50<T extends ItemMap>(obj: T, key: keyof T) {
+    let item: Item = obj[key];
+    return obj[key].name;
+}
+
+function f51<T extends ItemMap, K extends keyof T>(obj: T, key: K) {
+    let item: Item = obj[key];
+    return obj[key].name;
 }
 
 //// [mappedTypeRelationships.js]
@@ -159,6 +177,14 @@ function f41(x, y) {
     x = y;
     y = x;
 }
+function f50(obj, key) {
+    var item = obj[key];
+    return obj[key].name;
+}
+function f51(obj, key) {
+    var item = obj[key];
+    return obj[key].name;
+}
 
 
 //// [mappedTypeRelationships.d.ts]
@@ -180,3 +206,11 @@ declare function f30<T>(x: T, y: Partial<T>): void;
 declare function f31<T>(x: T, y: Partial<T>): void;
 declare function f40<T>(x: T, y: Readonly<T>): void;
 declare function f41<T>(x: T, y: Readonly<T>): void;
+declare type Item = {
+    name: string;
+};
+declare type ItemMap = {
+    [x: string]: Item;
+};
+declare function f50<T extends ItemMap>(obj: T, key: keyof T): string;
+declare function f51<T extends ItemMap, K extends keyof T>(obj: T, key: K): string;
diff --git a/tests/cases/conformance/types/mapped/mappedTypeRelationships.ts b/tests/cases/conformance/types/mapped/mappedTypeRelationships.ts
index 7bc1c1a1670..4af71fbea08 100644
--- a/tests/cases/conformance/types/mapped/mappedTypeRelationships.ts
+++ b/tests/cases/conformance/types/mapped/mappedTypeRelationships.ts
@@ -87,4 +87,22 @@ function f40<T>(x: T, y: Readonly<T>) {
 function f41<T>(x: T, y: Readonly<T>) {
     x = y;
     y = x;
+}
+
+type Item = {
+    name: string;
+}
+
+type ItemMap = {
+    [x: string]: Item;
+}
+
+function f50<T extends ItemMap>(obj: T, key: keyof T) {
+    let item: Item = obj[key];
+    return obj[key].name;
+}
+
+function f51<T extends ItemMap, K extends keyof T>(obj: T, key: K) {
+    let item: Item = obj[key];
+    return obj[key].name;
 }
\ No newline at end of file

From 9945529875ec5346686d92ac5b4fca69f04b73ff Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Fri, 18 Nov 2016 13:39:11 -0800
Subject: [PATCH 287/421] use location of config file as initial location for
 automatic type reference inclusion if possible (#12341)

---
 src/compiler/program.ts                       |  3 ++-
 .../unittests/tsserverProjectSystem.ts        | 24 +++++++++++++++++++
 .../reference/library-reference-13.trace.json |  2 +-
 ...mMultipleNodeModulesDirectories.trace.json |  6 ++---
 4 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 041923a8857..73976d5d02e 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -364,7 +364,8 @@ namespace ts {
 
             if (typeReferences.length) {
                 // This containingFilename needs to match with the one used in managed-side
-                const containingFilename = combinePaths(host.getCurrentDirectory(), "__inferred type names__.ts");
+                const containingDirectory = options.configFilePath ? getDirectoryPath(options.configFilePath) : host.getCurrentDirectory();
+                const containingFilename = combinePaths(containingDirectory, "__inferred type names__.ts");
                 const resolutions = resolveTypeReferenceDirectiveNamesWorker(typeReferences, containingFilename);
                 for (let i = 0; i < typeReferences.length; i++) {
                     processTypeReferenceDirective(typeReferences[i], resolutions[i]);
diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
index ce5bec05b56..e9b6ccb7884 100644
--- a/src/harness/unittests/tsserverProjectSystem.ts
+++ b/src/harness/unittests/tsserverProjectSystem.ts
@@ -2339,6 +2339,30 @@ namespace ts.projectSystem {
             projectService.openExternalProject({ rootFiles: toExternalFiles([f1.path, config.path]), options: {}, projectFileName: projectName });
             projectService.checkNumberOfProjects({ configuredProjects: 1 });
         });
+
+        it("types should load from config file path if config exists", () => {
+            const f1 = {
+                path: "/a/b/app.ts",
+                content: "let x = 1"
+            };
+            const config = {
+                path: "/a/b/tsconfig.json",
+                content: JSON.stringify({ compilerOptions: { types: ["node"], typeRoots: [] } })
+            };
+            const node = {
+                path: "/a/b/node_modules/@types/node/index.d.ts",
+                content: "declare var process: any"
+            };
+            const cwd = {
+                path: "/a/c"
+            };
+            debugger;
+            const host = createServerHost([f1, config, node, cwd], { currentDirectory: cwd.path });
+            const projectService = createProjectService(host);
+            projectService.openClientFile(f1.path);
+            projectService.checkNumberOfProjects({ configuredProjects: 1 });
+            checkProjectActualFiles(projectService.configuredProjects[0], [f1.path, node.path]);
+        });
     });
 
     describe("add the missing module file for inferred project", () => {
diff --git a/tests/baselines/reference/library-reference-13.trace.json b/tests/baselines/reference/library-reference-13.trace.json
index 86f7a5a505d..338cefbc47e 100644
--- a/tests/baselines/reference/library-reference-13.trace.json
+++ b/tests/baselines/reference/library-reference-13.trace.json
@@ -1,5 +1,5 @@
 [
-    "======== Resolving type reference directive 'jquery', containing file '/__inferred type names__.ts', root directory '/a/types'. ========",
+    "======== Resolving type reference directive 'jquery', containing file '/a/__inferred type names__.ts', root directory '/a/types'. ========",
     "Resolving with primary search path '/a/types'",
     "File '/a/types/jquery/package.json' does not exist.",
     "File '/a/types/jquery/index.d.ts' exist - use it as a name resolution result.",
diff --git a/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.trace.json b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.trace.json
index d5d9e86e33b..b38bb7c0acd 100644
--- a/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.trace.json
+++ b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.trace.json
@@ -149,19 +149,19 @@
     "File '/node_modules/abc/index.js' does not exist.",
     "File '/node_modules/abc/index.jsx' does not exist.",
     "======== Module name 'abc' was not resolved. ========",
-    "======== Resolving type reference directive 'grumpy', containing file '/src/__inferred type names__.ts', root directory '/foo/node_modules/@types,/node_modules/@types'. ========",
+    "======== Resolving type reference directive 'grumpy', containing file '/foo/bar/__inferred type names__.ts', root directory '/foo/node_modules/@types,/node_modules/@types'. ========",
     "Resolving with primary search path '/foo/node_modules/@types, /node_modules/@types'",
     "File '/foo/node_modules/@types/grumpy/package.json' does not exist.",
     "File '/foo/node_modules/@types/grumpy/index.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/foo/node_modules/@types/grumpy/index.d.ts', result '/foo/node_modules/@types/grumpy/index.d.ts'",
     "======== Type reference directive 'grumpy' was successfully resolved to '/foo/node_modules/@types/grumpy/index.d.ts', primary: true. ========",
-    "======== Resolving type reference directive 'sneezy', containing file '/src/__inferred type names__.ts', root directory '/foo/node_modules/@types,/node_modules/@types'. ========",
+    "======== Resolving type reference directive 'sneezy', containing file '/foo/bar/__inferred type names__.ts', root directory '/foo/node_modules/@types,/node_modules/@types'. ========",
     "Resolving with primary search path '/foo/node_modules/@types, /node_modules/@types'",
     "File '/foo/node_modules/@types/sneezy/package.json' does not exist.",
     "File '/foo/node_modules/@types/sneezy/index.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/foo/node_modules/@types/sneezy/index.d.ts', result '/foo/node_modules/@types/sneezy/index.d.ts'",
     "======== Type reference directive 'sneezy' was successfully resolved to '/foo/node_modules/@types/sneezy/index.d.ts', primary: true. ========",
-    "======== Resolving type reference directive 'dopey', containing file '/src/__inferred type names__.ts', root directory '/foo/node_modules/@types,/node_modules/@types'. ========",
+    "======== Resolving type reference directive 'dopey', containing file '/foo/bar/__inferred type names__.ts', root directory '/foo/node_modules/@types,/node_modules/@types'. ========",
     "Resolving with primary search path '/foo/node_modules/@types, /node_modules/@types'",
     "File '/foo/node_modules/@types/dopey/package.json' does not exist.",
     "File '/foo/node_modules/@types/dopey/index.d.ts' does not exist.",

From 8674d92bdbfac3afc1c711de6f0bcff45675cba9 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Fri, 18 Nov 2016 13:51:44 -0800
Subject: [PATCH 288/421] Disable evolving types with implicit any

That is, without --noImplicitAny
---
 src/compiler/checker.ts                       |   6 +-
 .../baselines/reference/controlFlowLetVar.js  | 247 --------------
 .../reference/controlFlowLetVar.symbols       | 263 ---------------
 .../reference/controlFlowLetVar.types         | 306 ------------------
 tests/cases/compiler/controlFlowLetVar.ts     | 129 --------
 5 files changed, 4 insertions(+), 947 deletions(-)
 delete mode 100644 tests/baselines/reference/controlFlowLetVar.js
 delete mode 100644 tests/baselines/reference/controlFlowLetVar.symbols
 delete mode 100644 tests/baselines/reference/controlFlowLetVar.types
 delete mode 100644 tests/cases/compiler/controlFlowLetVar.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 3d25fc8bbbb..e1ef19998d0 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -3238,9 +3238,11 @@ namespace ts {
                 return addOptionality(getTypeFromTypeNode(declaration.type), /*optional*/ declaration.questionToken && includeOptionality);
             }
 
-            if (declaration.kind === SyntaxKind.VariableDeclaration && !isBindingPattern(declaration.name) &&
+            if (compilerOptions.noImplicitAny &&
+                declaration.kind === SyntaxKind.VariableDeclaration && !isBindingPattern(declaration.name) &&
                 !(getCombinedModifierFlags(declaration) & ModifierFlags.Export) && !isInAmbientContext(declaration)) {
-                // Use control flow tracked 'any' type for non-ambient, non-exported var or let variables with no
+                // If --noImplicitAny is on,
+                // use control flow tracked 'any' type for non-ambient, non-exported var or let variables with no
                 // initializer or a 'null' or 'undefined' initializer.
                 if (!(getCombinedNodeFlags(declaration) & NodeFlags.Const) && (!declaration.initializer || isNullOrUndefined(declaration.initializer))) {
                     return autoType;
diff --git a/tests/baselines/reference/controlFlowLetVar.js b/tests/baselines/reference/controlFlowLetVar.js
deleted file mode 100644
index 24ad95259b1..00000000000
--- a/tests/baselines/reference/controlFlowLetVar.js
+++ /dev/null
@@ -1,247 +0,0 @@
-//// [controlFlowLetVar.ts]
-
-declare let cond: boolean;
-
-// CFA for 'let' with no type annotation and initializer
-function f1() {
-    let x;
-    if (cond) {
-        x = 1;
-    }
-    if (cond) {
-        x = "hello";
-    }
-    const y = x;  // string | number | undefined
-}
-
-// CFA for 'let' with no type annotation and 'undefined' initializer
-function f2() {
-    let x = undefined;
-    if (cond) {
-        x = 1;
-    }
-    if (cond) {
-        x = "hello";
-    }
-    const y = x;  // string | number | undefined
-}
-
-// CFA for 'let' with no type annotation and 'null' initializer
-function f3() {
-    let x = null;
-    if (cond) {
-        x = 1;
-    }
-    if (cond) {
-        x = "hello";
-    }
-    const y = x;  // string | number | null
-}
-
-// No CFA for 'let' with with type annotation
-function f4() {
-    let x: any;
-    if (cond) {
-        x = 1;
-    }
-    if (cond) {
-        x = "hello";
-    }
-    const y = x;  // any
-}
-
-// CFA for 'var' with no type annotation and initializer
-function f5() {
-    var x;
-    if (cond) {
-        x = 1;
-    }
-    if (cond) {
-        x = "hello";
-    }
-    const y = x;  // string | number | undefined
-}
-
-// CFA for 'var' with no type annotation and 'undefined' initializer
-function f6() {
-    var x = undefined;
-    if (cond) {
-        x = 1;
-    }
-    if (cond) {
-        x = "hello";
-    }
-    const y = x;  // string | number | undefined
-}
-
-// CFA for 'var' with no type annotation and 'null' initializer
-function f7() {
-    var x = null;
-    if (cond) {
-        x = 1;
-    }
-    if (cond) {
-        x = "hello";
-    }
-    const y = x;  // string | number | null
-}
-
-// No CFA for 'var' with with type annotation
-function f8() {
-    var x: any;
-    if (cond) {
-        x = 1;
-    }
-    if (cond) {
-        x = "hello";
-    }
-    const y = x;  // any
-}
-
-// No CFA for captured outer variables
-function f9() {
-    let x;
-    if (cond) {
-        x = 1;
-    }
-    if (cond) {
-        x = "hello";
-    }
-    const y = x;  // string | number | undefined
-    function f() {
-        const z = x;  // any
-    }
-}
-
-// No CFA for captured outer variables
-function f10() {
-    let x;
-    if (cond) {
-        x = 1;
-    }
-    if (cond) {
-        x = "hello";
-    }
-    const y = x;  // string | number | undefined
-    const f = () => {
-        const z = x;  // any
-    };
-}
-
-//// [controlFlowLetVar.js]
-// CFA for 'let' with no type annotation and initializer
-function f1() {
-    var x;
-    if (cond) {
-        x = 1;
-    }
-    if (cond) {
-        x = "hello";
-    }
-    var y = x; // string | number | undefined
-}
-// CFA for 'let' with no type annotation and 'undefined' initializer
-function f2() {
-    var x = undefined;
-    if (cond) {
-        x = 1;
-    }
-    if (cond) {
-        x = "hello";
-    }
-    var y = x; // string | number | undefined
-}
-// CFA for 'let' with no type annotation and 'null' initializer
-function f3() {
-    var x = null;
-    if (cond) {
-        x = 1;
-    }
-    if (cond) {
-        x = "hello";
-    }
-    var y = x; // string | number | null
-}
-// No CFA for 'let' with with type annotation
-function f4() {
-    var x;
-    if (cond) {
-        x = 1;
-    }
-    if (cond) {
-        x = "hello";
-    }
-    var y = x; // any
-}
-// CFA for 'var' with no type annotation and initializer
-function f5() {
-    var x;
-    if (cond) {
-        x = 1;
-    }
-    if (cond) {
-        x = "hello";
-    }
-    var y = x; // string | number | undefined
-}
-// CFA for 'var' with no type annotation and 'undefined' initializer
-function f6() {
-    var x = undefined;
-    if (cond) {
-        x = 1;
-    }
-    if (cond) {
-        x = "hello";
-    }
-    var y = x; // string | number | undefined
-}
-// CFA for 'var' with no type annotation and 'null' initializer
-function f7() {
-    var x = null;
-    if (cond) {
-        x = 1;
-    }
-    if (cond) {
-        x = "hello";
-    }
-    var y = x; // string | number | null
-}
-// No CFA for 'var' with with type annotation
-function f8() {
-    var x;
-    if (cond) {
-        x = 1;
-    }
-    if (cond) {
-        x = "hello";
-    }
-    var y = x; // any
-}
-// No CFA for captured outer variables
-function f9() {
-    var x;
-    if (cond) {
-        x = 1;
-    }
-    if (cond) {
-        x = "hello";
-    }
-    var y = x; // string | number | undefined
-    function f() {
-        var z = x; // any
-    }
-}
-// No CFA for captured outer variables
-function f10() {
-    var x;
-    if (cond) {
-        x = 1;
-    }
-    if (cond) {
-        x = "hello";
-    }
-    var y = x; // string | number | undefined
-    var f = function () {
-        var z = x; // any
-    };
-}
diff --git a/tests/baselines/reference/controlFlowLetVar.symbols b/tests/baselines/reference/controlFlowLetVar.symbols
deleted file mode 100644
index f58edd781b7..00000000000
--- a/tests/baselines/reference/controlFlowLetVar.symbols
+++ /dev/null
@@ -1,263 +0,0 @@
-=== tests/cases/compiler/controlFlowLetVar.ts ===
-
-declare let cond: boolean;
->cond : Symbol(cond, Decl(controlFlowLetVar.ts, 1, 11))
-
-// CFA for 'let' with no type annotation and initializer
-function f1() {
->f1 : Symbol(f1, Decl(controlFlowLetVar.ts, 1, 26))
-
-    let x;
->x : Symbol(x, Decl(controlFlowLetVar.ts, 5, 7))
-
-    if (cond) {
->cond : Symbol(cond, Decl(controlFlowLetVar.ts, 1, 11))
-
-        x = 1;
->x : Symbol(x, Decl(controlFlowLetVar.ts, 5, 7))
-    }
-    if (cond) {
->cond : Symbol(cond, Decl(controlFlowLetVar.ts, 1, 11))
-
-        x = "hello";
->x : Symbol(x, Decl(controlFlowLetVar.ts, 5, 7))
-    }
-    const y = x;  // string | number | undefined
->y : Symbol(y, Decl(controlFlowLetVar.ts, 12, 9))
->x : Symbol(x, Decl(controlFlowLetVar.ts, 5, 7))
-}
-
-// CFA for 'let' with no type annotation and 'undefined' initializer
-function f2() {
->f2 : Symbol(f2, Decl(controlFlowLetVar.ts, 13, 1))
-
-    let x = undefined;
->x : Symbol(x, Decl(controlFlowLetVar.ts, 17, 7))
->undefined : Symbol(undefined)
-
-    if (cond) {
->cond : Symbol(cond, Decl(controlFlowLetVar.ts, 1, 11))
-
-        x = 1;
->x : Symbol(x, Decl(controlFlowLetVar.ts, 17, 7))
-    }
-    if (cond) {
->cond : Symbol(cond, Decl(controlFlowLetVar.ts, 1, 11))
-
-        x = "hello";
->x : Symbol(x, Decl(controlFlowLetVar.ts, 17, 7))
-    }
-    const y = x;  // string | number | undefined
->y : Symbol(y, Decl(controlFlowLetVar.ts, 24, 9))
->x : Symbol(x, Decl(controlFlowLetVar.ts, 17, 7))
-}
-
-// CFA for 'let' with no type annotation and 'null' initializer
-function f3() {
->f3 : Symbol(f3, Decl(controlFlowLetVar.ts, 25, 1))
-
-    let x = null;
->x : Symbol(x, Decl(controlFlowLetVar.ts, 29, 7))
-
-    if (cond) {
->cond : Symbol(cond, Decl(controlFlowLetVar.ts, 1, 11))
-
-        x = 1;
->x : Symbol(x, Decl(controlFlowLetVar.ts, 29, 7))
-    }
-    if (cond) {
->cond : Symbol(cond, Decl(controlFlowLetVar.ts, 1, 11))
-
-        x = "hello";
->x : Symbol(x, Decl(controlFlowLetVar.ts, 29, 7))
-    }
-    const y = x;  // string | number | null
->y : Symbol(y, Decl(controlFlowLetVar.ts, 36, 9))
->x : Symbol(x, Decl(controlFlowLetVar.ts, 29, 7))
-}
-
-// No CFA for 'let' with with type annotation
-function f4() {
->f4 : Symbol(f4, Decl(controlFlowLetVar.ts, 37, 1))
-
-    let x: any;
->x : Symbol(x, Decl(controlFlowLetVar.ts, 41, 7))
-
-    if (cond) {
->cond : Symbol(cond, Decl(controlFlowLetVar.ts, 1, 11))
-
-        x = 1;
->x : Symbol(x, Decl(controlFlowLetVar.ts, 41, 7))
-    }
-    if (cond) {
->cond : Symbol(cond, Decl(controlFlowLetVar.ts, 1, 11))
-
-        x = "hello";
->x : Symbol(x, Decl(controlFlowLetVar.ts, 41, 7))
-    }
-    const y = x;  // any
->y : Symbol(y, Decl(controlFlowLetVar.ts, 48, 9))
->x : Symbol(x, Decl(controlFlowLetVar.ts, 41, 7))
-}
-
-// CFA for 'var' with no type annotation and initializer
-function f5() {
->f5 : Symbol(f5, Decl(controlFlowLetVar.ts, 49, 1))
-
-    var x;
->x : Symbol(x, Decl(controlFlowLetVar.ts, 53, 7))
-
-    if (cond) {
->cond : Symbol(cond, Decl(controlFlowLetVar.ts, 1, 11))
-
-        x = 1;
->x : Symbol(x, Decl(controlFlowLetVar.ts, 53, 7))
-    }
-    if (cond) {
->cond : Symbol(cond, Decl(controlFlowLetVar.ts, 1, 11))
-
-        x = "hello";
->x : Symbol(x, Decl(controlFlowLetVar.ts, 53, 7))
-    }
-    const y = x;  // string | number | undefined
->y : Symbol(y, Decl(controlFlowLetVar.ts, 60, 9))
->x : Symbol(x, Decl(controlFlowLetVar.ts, 53, 7))
-}
-
-// CFA for 'var' with no type annotation and 'undefined' initializer
-function f6() {
->f6 : Symbol(f6, Decl(controlFlowLetVar.ts, 61, 1))
-
-    var x = undefined;
->x : Symbol(x, Decl(controlFlowLetVar.ts, 65, 7))
->undefined : Symbol(undefined)
-
-    if (cond) {
->cond : Symbol(cond, Decl(controlFlowLetVar.ts, 1, 11))
-
-        x = 1;
->x : Symbol(x, Decl(controlFlowLetVar.ts, 65, 7))
-    }
-    if (cond) {
->cond : Symbol(cond, Decl(controlFlowLetVar.ts, 1, 11))
-
-        x = "hello";
->x : Symbol(x, Decl(controlFlowLetVar.ts, 65, 7))
-    }
-    const y = x;  // string | number | undefined
->y : Symbol(y, Decl(controlFlowLetVar.ts, 72, 9))
->x : Symbol(x, Decl(controlFlowLetVar.ts, 65, 7))
-}
-
-// CFA for 'var' with no type annotation and 'null' initializer
-function f7() {
->f7 : Symbol(f7, Decl(controlFlowLetVar.ts, 73, 1))
-
-    var x = null;
->x : Symbol(x, Decl(controlFlowLetVar.ts, 77, 7))
-
-    if (cond) {
->cond : Symbol(cond, Decl(controlFlowLetVar.ts, 1, 11))
-
-        x = 1;
->x : Symbol(x, Decl(controlFlowLetVar.ts, 77, 7))
-    }
-    if (cond) {
->cond : Symbol(cond, Decl(controlFlowLetVar.ts, 1, 11))
-
-        x = "hello";
->x : Symbol(x, Decl(controlFlowLetVar.ts, 77, 7))
-    }
-    const y = x;  // string | number | null
->y : Symbol(y, Decl(controlFlowLetVar.ts, 84, 9))
->x : Symbol(x, Decl(controlFlowLetVar.ts, 77, 7))
-}
-
-// No CFA for 'var' with with type annotation
-function f8() {
->f8 : Symbol(f8, Decl(controlFlowLetVar.ts, 85, 1))
-
-    var x: any;
->x : Symbol(x, Decl(controlFlowLetVar.ts, 89, 7))
-
-    if (cond) {
->cond : Symbol(cond, Decl(controlFlowLetVar.ts, 1, 11))
-
-        x = 1;
->x : Symbol(x, Decl(controlFlowLetVar.ts, 89, 7))
-    }
-    if (cond) {
->cond : Symbol(cond, Decl(controlFlowLetVar.ts, 1, 11))
-
-        x = "hello";
->x : Symbol(x, Decl(controlFlowLetVar.ts, 89, 7))
-    }
-    const y = x;  // any
->y : Symbol(y, Decl(controlFlowLetVar.ts, 96, 9))
->x : Symbol(x, Decl(controlFlowLetVar.ts, 89, 7))
-}
-
-// No CFA for captured outer variables
-function f9() {
->f9 : Symbol(f9, Decl(controlFlowLetVar.ts, 97, 1))
-
-    let x;
->x : Symbol(x, Decl(controlFlowLetVar.ts, 101, 7))
-
-    if (cond) {
->cond : Symbol(cond, Decl(controlFlowLetVar.ts, 1, 11))
-
-        x = 1;
->x : Symbol(x, Decl(controlFlowLetVar.ts, 101, 7))
-    }
-    if (cond) {
->cond : Symbol(cond, Decl(controlFlowLetVar.ts, 1, 11))
-
-        x = "hello";
->x : Symbol(x, Decl(controlFlowLetVar.ts, 101, 7))
-    }
-    const y = x;  // string | number | undefined
->y : Symbol(y, Decl(controlFlowLetVar.ts, 108, 9))
->x : Symbol(x, Decl(controlFlowLetVar.ts, 101, 7))
-
-    function f() {
->f : Symbol(f, Decl(controlFlowLetVar.ts, 108, 16))
-
-        const z = x;  // any
->z : Symbol(z, Decl(controlFlowLetVar.ts, 110, 13))
->x : Symbol(x, Decl(controlFlowLetVar.ts, 101, 7))
-    }
-}
-
-// No CFA for captured outer variables
-function f10() {
->f10 : Symbol(f10, Decl(controlFlowLetVar.ts, 112, 1))
-
-    let x;
->x : Symbol(x, Decl(controlFlowLetVar.ts, 116, 7))
-
-    if (cond) {
->cond : Symbol(cond, Decl(controlFlowLetVar.ts, 1, 11))
-
-        x = 1;
->x : Symbol(x, Decl(controlFlowLetVar.ts, 116, 7))
-    }
-    if (cond) {
->cond : Symbol(cond, Decl(controlFlowLetVar.ts, 1, 11))
-
-        x = "hello";
->x : Symbol(x, Decl(controlFlowLetVar.ts, 116, 7))
-    }
-    const y = x;  // string | number | undefined
->y : Symbol(y, Decl(controlFlowLetVar.ts, 123, 9))
->x : Symbol(x, Decl(controlFlowLetVar.ts, 116, 7))
-
-    const f = () => {
->f : Symbol(f, Decl(controlFlowLetVar.ts, 124, 9))
-
-        const z = x;  // any
->z : Symbol(z, Decl(controlFlowLetVar.ts, 125, 13))
->x : Symbol(x, Decl(controlFlowLetVar.ts, 116, 7))
-
-    };
-}
diff --git a/tests/baselines/reference/controlFlowLetVar.types b/tests/baselines/reference/controlFlowLetVar.types
deleted file mode 100644
index 09f0ea83488..00000000000
--- a/tests/baselines/reference/controlFlowLetVar.types
+++ /dev/null
@@ -1,306 +0,0 @@
-=== tests/cases/compiler/controlFlowLetVar.ts ===
-
-declare let cond: boolean;
->cond : boolean
-
-// CFA for 'let' with no type annotation and initializer
-function f1() {
->f1 : () => void
-
-    let x;
->x : any
-
-    if (cond) {
->cond : boolean
-
-        x = 1;
->x = 1 : 1
->x : any
->1 : 1
-    }
-    if (cond) {
->cond : boolean
-
-        x = "hello";
->x = "hello" : "hello"
->x : any
->"hello" : "hello"
-    }
-    const y = x;  // string | number | undefined
->y : string | number | undefined
->x : string | number | undefined
-}
-
-// CFA for 'let' with no type annotation and 'undefined' initializer
-function f2() {
->f2 : () => void
-
-    let x = undefined;
->x : any
->undefined : undefined
-
-    if (cond) {
->cond : boolean
-
-        x = 1;
->x = 1 : 1
->x : any
->1 : 1
-    }
-    if (cond) {
->cond : boolean
-
-        x = "hello";
->x = "hello" : "hello"
->x : any
->"hello" : "hello"
-    }
-    const y = x;  // string | number | undefined
->y : string | number | undefined
->x : string | number | undefined
-}
-
-// CFA for 'let' with no type annotation and 'null' initializer
-function f3() {
->f3 : () => void
-
-    let x = null;
->x : any
->null : null
-
-    if (cond) {
->cond : boolean
-
-        x = 1;
->x = 1 : 1
->x : any
->1 : 1
-    }
-    if (cond) {
->cond : boolean
-
-        x = "hello";
->x = "hello" : "hello"
->x : any
->"hello" : "hello"
-    }
-    const y = x;  // string | number | null
->y : string | number | null
->x : string | number | null
-}
-
-// No CFA for 'let' with with type annotation
-function f4() {
->f4 : () => void
-
-    let x: any;
->x : any
-
-    if (cond) {
->cond : boolean
-
-        x = 1;
->x = 1 : 1
->x : any
->1 : 1
-    }
-    if (cond) {
->cond : boolean
-
-        x = "hello";
->x = "hello" : "hello"
->x : any
->"hello" : "hello"
-    }
-    const y = x;  // any
->y : any
->x : any
-}
-
-// CFA for 'var' with no type annotation and initializer
-function f5() {
->f5 : () => void
-
-    var x;
->x : any
-
-    if (cond) {
->cond : boolean
-
-        x = 1;
->x = 1 : 1
->x : any
->1 : 1
-    }
-    if (cond) {
->cond : boolean
-
-        x = "hello";
->x = "hello" : "hello"
->x : any
->"hello" : "hello"
-    }
-    const y = x;  // string | number | undefined
->y : string | number | undefined
->x : string | number | undefined
-}
-
-// CFA for 'var' with no type annotation and 'undefined' initializer
-function f6() {
->f6 : () => void
-
-    var x = undefined;
->x : any
->undefined : undefined
-
-    if (cond) {
->cond : boolean
-
-        x = 1;
->x = 1 : 1
->x : any
->1 : 1
-    }
-    if (cond) {
->cond : boolean
-
-        x = "hello";
->x = "hello" : "hello"
->x : any
->"hello" : "hello"
-    }
-    const y = x;  // string | number | undefined
->y : string | number | undefined
->x : string | number | undefined
-}
-
-// CFA for 'var' with no type annotation and 'null' initializer
-function f7() {
->f7 : () => void
-
-    var x = null;
->x : any
->null : null
-
-    if (cond) {
->cond : boolean
-
-        x = 1;
->x = 1 : 1
->x : any
->1 : 1
-    }
-    if (cond) {
->cond : boolean
-
-        x = "hello";
->x = "hello" : "hello"
->x : any
->"hello" : "hello"
-    }
-    const y = x;  // string | number | null
->y : string | number | null
->x : string | number | null
-}
-
-// No CFA for 'var' with with type annotation
-function f8() {
->f8 : () => void
-
-    var x: any;
->x : any
-
-    if (cond) {
->cond : boolean
-
-        x = 1;
->x = 1 : 1
->x : any
->1 : 1
-    }
-    if (cond) {
->cond : boolean
-
-        x = "hello";
->x = "hello" : "hello"
->x : any
->"hello" : "hello"
-    }
-    const y = x;  // any
->y : any
->x : any
-}
-
-// No CFA for captured outer variables
-function f9() {
->f9 : () => void
-
-    let x;
->x : any
-
-    if (cond) {
->cond : boolean
-
-        x = 1;
->x = 1 : 1
->x : any
->1 : 1
-    }
-    if (cond) {
->cond : boolean
-
-        x = "hello";
->x = "hello" : "hello"
->x : any
->"hello" : "hello"
-    }
-    const y = x;  // string | number | undefined
->y : string | number | undefined
->x : string | number | undefined
-
-    function f() {
->f : () => void
-
-        const z = x;  // any
->z : any
->x : any
-    }
-}
-
-// No CFA for captured outer variables
-function f10() {
->f10 : () => void
-
-    let x;
->x : any
-
-    if (cond) {
->cond : boolean
-
-        x = 1;
->x = 1 : 1
->x : any
->1 : 1
-    }
-    if (cond) {
->cond : boolean
-
-        x = "hello";
->x = "hello" : "hello"
->x : any
->"hello" : "hello"
-    }
-    const y = x;  // string | number | undefined
->y : string | number | undefined
->x : string | number | undefined
-
-    const f = () => {
->f : () => void
->() => {        const z = x;  // any    } : () => void
-
-        const z = x;  // any
->z : any
->x : any
-
-    };
-}
diff --git a/tests/cases/compiler/controlFlowLetVar.ts b/tests/cases/compiler/controlFlowLetVar.ts
deleted file mode 100644
index a56a3382642..00000000000
--- a/tests/cases/compiler/controlFlowLetVar.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-// @strictNullChecks: true
-
-declare let cond: boolean;
-
-// CFA for 'let' with no type annotation and initializer
-function f1() {
-    let x;
-    if (cond) {
-        x = 1;
-    }
-    if (cond) {
-        x = "hello";
-    }
-    const y = x;  // string | number | undefined
-}
-
-// CFA for 'let' with no type annotation and 'undefined' initializer
-function f2() {
-    let x = undefined;
-    if (cond) {
-        x = 1;
-    }
-    if (cond) {
-        x = "hello";
-    }
-    const y = x;  // string | number | undefined
-}
-
-// CFA for 'let' with no type annotation and 'null' initializer
-function f3() {
-    let x = null;
-    if (cond) {
-        x = 1;
-    }
-    if (cond) {
-        x = "hello";
-    }
-    const y = x;  // string | number | null
-}
-
-// No CFA for 'let' with with type annotation
-function f4() {
-    let x: any;
-    if (cond) {
-        x = 1;
-    }
-    if (cond) {
-        x = "hello";
-    }
-    const y = x;  // any
-}
-
-// CFA for 'var' with no type annotation and initializer
-function f5() {
-    var x;
-    if (cond) {
-        x = 1;
-    }
-    if (cond) {
-        x = "hello";
-    }
-    const y = x;  // string | number | undefined
-}
-
-// CFA for 'var' with no type annotation and 'undefined' initializer
-function f6() {
-    var x = undefined;
-    if (cond) {
-        x = 1;
-    }
-    if (cond) {
-        x = "hello";
-    }
-    const y = x;  // string | number | undefined
-}
-
-// CFA for 'var' with no type annotation and 'null' initializer
-function f7() {
-    var x = null;
-    if (cond) {
-        x = 1;
-    }
-    if (cond) {
-        x = "hello";
-    }
-    const y = x;  // string | number | null
-}
-
-// No CFA for 'var' with with type annotation
-function f8() {
-    var x: any;
-    if (cond) {
-        x = 1;
-    }
-    if (cond) {
-        x = "hello";
-    }
-    const y = x;  // any
-}
-
-// No CFA for captured outer variables
-function f9() {
-    let x;
-    if (cond) {
-        x = 1;
-    }
-    if (cond) {
-        x = "hello";
-    }
-    const y = x;  // string | number | undefined
-    function f() {
-        const z = x;  // any
-    }
-}
-
-// No CFA for captured outer variables
-function f10() {
-    let x;
-    if (cond) {
-        x = 1;
-    }
-    if (cond) {
-        x = "hello";
-    }
-    const y = x;  // string | number | undefined
-    const f = () => {
-        const z = x;  // any
-    };
-}
\ No newline at end of file

From a4d584f14a02f18aacc5cd1cff52ee6aabba33d0 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Fri, 18 Nov 2016 13:53:18 -0800
Subject: [PATCH 289/421] Update baselines to have no evolving types

---
 .../asiPreventsParsingAsTypeAlias01.types     |   6 +-
 .../reference/assignEveryTypeToAny.types      |   4 +-
 .../reference/capturedLetConstInLoop3.types   |  24 ++--
 .../capturedLetConstInLoop3_ES6.types         |  24 ++--
 .../reference/capturedLetConstInLoop4.types   |  32 ++---
 .../capturedLetConstInLoop4_ES6.types         |  32 ++---
 .../reference/capturedLetConstInLoop9.types   |   2 +-
 .../capturedLetConstInLoop9_ES6.types         |   2 +-
 .../commentsArgumentsOfCallExpression2.types  |   6 +-
 .../compoundAssignmentLHSIsReference.types    |  36 ++---
 .../constraintSatisfactionWithAny.types       |  30 ++--
 .../reference/controlFlowCaching.errors.txt   | 128 ------------------
 .../reference/downlevelLetConst14.types       |  10 +-
 .../reference/downlevelLetConst15.types       |  10 +-
 tests/baselines/reference/forIn.errors.txt    |  11 +-
 .../initializePropertiesWithRenamedLet.types  |  14 +-
 .../baselines/reference/json.stringify.types  |   2 +-
 .../reference/localClassesInLoop.types        |  12 +-
 .../reference/localClassesInLoop_ES6.types    |  12 +-
 .../nestedBlockScopedBindings3.types          |  40 +++---
 .../nestedBlockScopedBindings4.types          |  56 ++++----
 .../nestedBlockScopedBindings6.types          |  24 ++--
 tests/baselines/reference/null.types          |   6 +-
 .../objectLiteralShorthandProperties.types    |  18 +--
 .../objectLiteralShorthandPropertiesES6.types |  18 +--
 .../reference/objectSpreadNoTransform.types   |   2 +-
 .../parserAmbiguityWithBinaryOperator1.types  |  12 +-
 .../parserAmbiguityWithBinaryOperator2.types  |  12 +-
 .../parserAmbiguityWithBinaryOperator3.types  |  12 +-
 .../reference/parserForStatement2.errors.txt  |   8 +-
 .../reference/parserharness.errors.txt        |  11 +-
 .../protoAsIndexInIndexExpression.types       |   4 +-
 .../strictNullChecksNoWidening.types          |   6 +-
 tests/baselines/reference/tsxEmit1.types      |  16 +--
 tests/baselines/reference/tsxEmit2.types      |  28 ++--
 tests/baselines/reference/tsxReactEmit1.types |  16 +--
 tests/baselines/reference/tsxReactEmit2.types |  28 ++--
 tests/baselines/reference/tsxReactEmit5.types |   2 +-
 tests/baselines/reference/tsxReactEmit6.types |   2 +-
 ...WithUndefinedCallResolutionData.errors.txt |  15 --
 tests/baselines/reference/typedArrays.types   |  36 ++---
 .../reference/unusedSwitchStatment.errors.txt |   5 +-
 42 files changed, 302 insertions(+), 472 deletions(-)
 delete mode 100644 tests/baselines/reference/controlFlowCaching.errors.txt
 delete mode 100644 tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.errors.txt

diff --git a/tests/baselines/reference/asiPreventsParsingAsTypeAlias01.types b/tests/baselines/reference/asiPreventsParsingAsTypeAlias01.types
index c2d9213ca60..7492a698e3a 100644
--- a/tests/baselines/reference/asiPreventsParsingAsTypeAlias01.types
+++ b/tests/baselines/reference/asiPreventsParsingAsTypeAlias01.types
@@ -10,10 +10,10 @@ var Foo;
 >Foo : any
 
 type
->type : undefined
+>type : any
 
 Foo = string;
->Foo = string : undefined
+>Foo = string : any
 >Foo : any
->string : undefined
+>string : any
 
diff --git a/tests/baselines/reference/assignEveryTypeToAny.types b/tests/baselines/reference/assignEveryTypeToAny.types
index fd1dccefae0..cfc24e1da65 100644
--- a/tests/baselines/reference/assignEveryTypeToAny.types
+++ b/tests/baselines/reference/assignEveryTypeToAny.types
@@ -59,9 +59,9 @@ var e = undefined;
 >undefined : undefined
 
 x = e;
->x = e : undefined
+>x = e : any
 >x : any
->e : undefined
+>e : any
 
 var e2: typeof undefined;
 >e2 : any
diff --git a/tests/baselines/reference/capturedLetConstInLoop3.types b/tests/baselines/reference/capturedLetConstInLoop3.types
index 1fee8db67c4..8ce40ab5f1b 100644
--- a/tests/baselines/reference/capturedLetConstInLoop3.types
+++ b/tests/baselines/reference/capturedLetConstInLoop3.types
@@ -179,7 +179,7 @@ function foo3(x) {
     use(v);
 >use(v) : any
 >use : (a: any) => any
->v : undefined
+>v : any
 }
 
 function foo4(x) {
@@ -283,8 +283,8 @@ function foo6(x) {
 >y : any
 
         var v = x;
->v : undefined
->x : undefined
+>v : any
+>x : any
 
         (function() { return x + y + v });
 >(function() { return x + y + v }) : () => any
@@ -293,7 +293,7 @@ function foo6(x) {
 >x + y : any
 >x : any
 >y : any
->v : undefined
+>v : any
 
         (() => x + y + v);
 >(() => x + y + v) : () => any
@@ -302,13 +302,13 @@ function foo6(x) {
 >x + y : any
 >x : any
 >y : any
->v : undefined
+>v : any
     }
     
     use(v)
 >use(v) : any
 >use : (a: any) => any
->v : undefined
+>v : any
 }
 
 function foo7(x) {
@@ -321,8 +321,8 @@ function foo7(x) {
 >y : any
 
         var v = x;
->v : undefined
->x : undefined
+>v : any
+>x : any
 
         (function() { return x + y + v });
 >(function() { return x + y + v }) : () => any
@@ -331,7 +331,7 @@ function foo7(x) {
 >x + y : any
 >x : any
 >y : any
->v : undefined
+>v : any
 
         (() => x + y + v);
 >(() => x + y + v) : () => any
@@ -340,7 +340,7 @@ function foo7(x) {
 >x + y : any
 >x : any
 >y : any
->v : undefined
+>v : any
 
     } while (1 === 1);
 >1 === 1 : boolean
@@ -350,7 +350,7 @@ function foo7(x) {
     use(v);
 >use(v) : any
 >use : (a: any) => any
->v : undefined
+>v : any
 }
 
 
@@ -574,7 +574,7 @@ function foo3_c(x) {
     use(v);
 >use(v) : any
 >use : (a: any) => any
->v : undefined
+>v : any
 }
 
 function foo4_c(x) {
diff --git a/tests/baselines/reference/capturedLetConstInLoop3_ES6.types b/tests/baselines/reference/capturedLetConstInLoop3_ES6.types
index bfd279afdff..9c11ae62574 100644
--- a/tests/baselines/reference/capturedLetConstInLoop3_ES6.types
+++ b/tests/baselines/reference/capturedLetConstInLoop3_ES6.types
@@ -180,7 +180,7 @@ function foo3(x) {
     use(v);
 >use(v) : any
 >use : (a: any) => any
->v : undefined
+>v : any
 }
 
 function foo4(x) {
@@ -284,8 +284,8 @@ function foo6(x) {
 >y : any
 
         var v = x;
->v : undefined
->x : undefined
+>v : any
+>x : any
 
         (function() { return x + y + v });
 >(function() { return x + y + v }) : () => any
@@ -294,7 +294,7 @@ function foo6(x) {
 >x + y : any
 >x : any
 >y : any
->v : undefined
+>v : any
 
         (() => x + y + v);
 >(() => x + y + v) : () => any
@@ -303,13 +303,13 @@ function foo6(x) {
 >x + y : any
 >x : any
 >y : any
->v : undefined
+>v : any
     }
     
     use(v)
 >use(v) : any
 >use : (a: any) => any
->v : undefined
+>v : any
 }
 
 function foo7(x) {
@@ -322,8 +322,8 @@ function foo7(x) {
 >y : any
 
         var v = x;
->v : undefined
->x : undefined
+>v : any
+>x : any
 
         (function() { return x + y + v });
 >(function() { return x + y + v }) : () => any
@@ -332,7 +332,7 @@ function foo7(x) {
 >x + y : any
 >x : any
 >y : any
->v : undefined
+>v : any
 
         (() => x + y + v);
 >(() => x + y + v) : () => any
@@ -341,7 +341,7 @@ function foo7(x) {
 >x + y : any
 >x : any
 >y : any
->v : undefined
+>v : any
 
     } while (1 === 1);
 >1 === 1 : boolean
@@ -351,7 +351,7 @@ function foo7(x) {
     use(v);
 >use(v) : any
 >use : (a: any) => any
->v : undefined
+>v : any
 }
 
 
@@ -575,7 +575,7 @@ function foo3_c(x) {
     use(v);
 >use(v) : any
 >use : (a: any) => any
->v : undefined
+>v : any
 }
 
 function foo4_c(x) {
diff --git a/tests/baselines/reference/capturedLetConstInLoop4.types b/tests/baselines/reference/capturedLetConstInLoop4.types
index 0feff77f604..2c48463adec 100644
--- a/tests/baselines/reference/capturedLetConstInLoop4.types
+++ b/tests/baselines/reference/capturedLetConstInLoop4.types
@@ -17,12 +17,12 @@ export function exportedFoo() {
 >v0 : any
 >v00 : string
 >v1 : number
->v2 : undefined
->v3 : undefined
+>v2 : any
+>v3 : any
 >v4 : number
 >v5 : number
->v6 : undefined
->v7 : undefined
+>v6 : any
+>v7 : any
 >v8 : number
 }
 
@@ -103,15 +103,15 @@ while (1 === 1) {
 >x : any
 
     var v2 = x;
->v2 : undefined
->x : undefined
+>v2 : any
+>x : any
 
     (function() { return x + v2});
 >(function() { return x + v2}) : () => any
 >function() { return x + v2} : () => any
 >x + v2 : any
 >x : any
->v2 : undefined
+>v2 : any
 
     (() => x);
 >(() => x) : () => any
@@ -124,15 +124,15 @@ do {
 >x : any
 
     var v3 = x;
->v3 : undefined
->x : undefined
+>v3 : any
+>x : any
 
     (function() { return x + v3});
 >(function() { return x + v3}) : () => any
 >function() { return x + v3} : () => any
 >x + v3 : any
 >x : any
->v3 : undefined
+>v3 : any
 
     (() => x);
 >(() => x) : () => any
@@ -216,8 +216,8 @@ while (1 === 1) {
 >y : any
 
     var v6 = x;
->v6 : undefined
->x : undefined
+>v6 : any
+>x : any
 
     (function() { return x + y + v6});
 >(function() { return x + y + v6}) : () => any
@@ -226,7 +226,7 @@ while (1 === 1) {
 >x + y : any
 >x : any
 >y : any
->v6 : undefined
+>v6 : any
 
     (() => x + y);
 >(() => x + y) : () => any
@@ -242,8 +242,8 @@ do {
 >y : any
 
     var v7 = x;
->v7 : undefined
->x : undefined
+>v7 : any
+>x : any
 
     (function() { return x + y + v7});
 >(function() { return x + y + v7}) : () => any
@@ -252,7 +252,7 @@ do {
 >x + y : any
 >x : any
 >y : any
->v7 : undefined
+>v7 : any
 
     (() => x + y);
 >(() => x + y) : () => any
diff --git a/tests/baselines/reference/capturedLetConstInLoop4_ES6.types b/tests/baselines/reference/capturedLetConstInLoop4_ES6.types
index 301a6ef90f1..32af60f24e4 100644
--- a/tests/baselines/reference/capturedLetConstInLoop4_ES6.types
+++ b/tests/baselines/reference/capturedLetConstInLoop4_ES6.types
@@ -17,12 +17,12 @@ export function exportedFoo() {
 >v0 : any
 >v00 : string
 >v1 : number
->v2 : undefined
->v3 : undefined
+>v2 : any
+>v3 : any
 >v4 : number
 >v5 : number
->v6 : undefined
->v7 : undefined
+>v6 : any
+>v7 : any
 >v8 : number
 }
 
@@ -103,15 +103,15 @@ while (1 === 1) {
 >x : any
 
     var v2 = x;
->v2 : undefined
->x : undefined
+>v2 : any
+>x : any
 
     (function() { return x + v2});
 >(function() { return x + v2}) : () => any
 >function() { return x + v2} : () => any
 >x + v2 : any
 >x : any
->v2 : undefined
+>v2 : any
 
     (() => x);
 >(() => x) : () => any
@@ -124,15 +124,15 @@ do {
 >x : any
 
     var v3 = x;
->v3 : undefined
->x : undefined
+>v3 : any
+>x : any
 
     (function() { return x + v3});
 >(function() { return x + v3}) : () => any
 >function() { return x + v3} : () => any
 >x + v3 : any
 >x : any
->v3 : undefined
+>v3 : any
 
     (() => x);
 >(() => x) : () => any
@@ -216,8 +216,8 @@ while (1 === 1) {
 >y : any
 
     var v6 = x;
->v6 : undefined
->x : undefined
+>v6 : any
+>x : any
 
     (function() { return x + y + v6});
 >(function() { return x + y + v6}) : () => any
@@ -226,7 +226,7 @@ while (1 === 1) {
 >x + y : any
 >x : any
 >y : any
->v6 : undefined
+>v6 : any
 
     (() => x + y);
 >(() => x + y) : () => any
@@ -242,8 +242,8 @@ do {
 >y : any
 
     var v7 = x;
->v7 : undefined
->x : undefined
+>v7 : any
+>x : any
 
     (function() { return x + y + v7});
 >(function() { return x + y + v7}) : () => any
@@ -252,7 +252,7 @@ do {
 >x + y : any
 >x : any
 >y : any
->v7 : undefined
+>v7 : any
 
     (() => x + y);
 >(() => x + y) : () => any
diff --git a/tests/baselines/reference/capturedLetConstInLoop9.types b/tests/baselines/reference/capturedLetConstInLoop9.types
index 453176a40c9..486697b8d84 100644
--- a/tests/baselines/reference/capturedLetConstInLoop9.types
+++ b/tests/baselines/reference/capturedLetConstInLoop9.types
@@ -39,7 +39,7 @@ for (let x = 0; x < 1; ++x) {
     }
 
     switch (x) {
->x : undefined
+>x : any
 
         case 1:
 >1 : 1
diff --git a/tests/baselines/reference/capturedLetConstInLoop9_ES6.types b/tests/baselines/reference/capturedLetConstInLoop9_ES6.types
index df118279f30..be4457315ee 100644
--- a/tests/baselines/reference/capturedLetConstInLoop9_ES6.types
+++ b/tests/baselines/reference/capturedLetConstInLoop9_ES6.types
@@ -40,7 +40,7 @@ for (let x = 0; x < 1; ++x) {
     }
 
     switch (x) {
->x : undefined
+>x : any
 
         case 1:
 >1 : 1
diff --git a/tests/baselines/reference/commentsArgumentsOfCallExpression2.types b/tests/baselines/reference/commentsArgumentsOfCallExpression2.types
index bc6bf5baa90..7ec29aa9124 100644
--- a/tests/baselines/reference/commentsArgumentsOfCallExpression2.types
+++ b/tests/baselines/reference/commentsArgumentsOfCallExpression2.types
@@ -17,7 +17,7 @@ foo(/*c2*/ 1, /*d2*/ 1 + 2, /*e1*/ a + b);
 >1 : 1
 >2 : 2
 >a + b : any
->a : undefined
+>a : any
 >b : any
 
 foo(/*c3*/ function () { }, /*d2*/() => { }, /*e2*/ a + /*e3*/ b);
@@ -26,7 +26,7 @@ foo(/*c3*/ function () { }, /*d2*/() => { }, /*e2*/ a + /*e3*/ b);
 >function () { } : () => void
 >() => { } : () => void
 >a + /*e3*/ b : any
->a : undefined
+>a : any
 >b : any
 
 foo(/*c3*/ function () { }, /*d3*/() => { }, /*e3*/(a + b));
@@ -36,7 +36,7 @@ foo(/*c3*/ function () { }, /*d3*/() => { }, /*e3*/(a + b));
 >() => { } : () => void
 >(a + b) : any
 >a + b : any
->a : undefined
+>a : any
 >b : any
 
 foo(
diff --git a/tests/baselines/reference/compoundAssignmentLHSIsReference.types b/tests/baselines/reference/compoundAssignmentLHSIsReference.types
index a82eb17426d..4816307f508 100644
--- a/tests/baselines/reference/compoundAssignmentLHSIsReference.types
+++ b/tests/baselines/reference/compoundAssignmentLHSIsReference.types
@@ -9,12 +9,12 @@ var x1: number;
 x1 *= value;
 >x1 *= value : number
 >x1 : number
->value : undefined
+>value : any
 
 x1 += value;
->x1 += value : number
+>x1 += value : any
 >x1 : number
->value : undefined
+>value : any
 
 function fn1(x2: number) {
 >fn1 : (x2: number) => void
@@ -41,41 +41,41 @@ x3.a *= value;
 >x3.a : number
 >x3 : { a: number; }
 >a : number
->value : undefined
+>value : any
 
 x3.a += value;
->x3.a += value : number
+>x3.a += value : any
 >x3.a : number
 >x3 : { a: number; }
 >a : number
->value : undefined
+>value : any
 
 x3['a'] *= value;
 >x3['a'] *= value : number
 >x3['a'] : number
 >x3 : { a: number; }
 >'a' : "a"
->value : undefined
+>value : any
 
 x3['a'] += value;
->x3['a'] += value : number
+>x3['a'] += value : any
 >x3['a'] : number
 >x3 : { a: number; }
 >'a' : "a"
->value : undefined
+>value : any
 
 // parentheses, the contained expression is reference
 (x1) *= value;
 >(x1) *= value : number
 >(x1) : number
 >x1 : number
->value : undefined
+>value : any
 
 (x1) += value;
->(x1) += value : number
+>(x1) += value : any
 >(x1) : number
 >x1 : number
->value : undefined
+>value : any
 
 function fn2(x4: number) {
 >fn2 : (x4: number) => void
@@ -100,15 +100,15 @@ function fn2(x4: number) {
 >x3.a : number
 >x3 : { a: number; }
 >a : number
->value : undefined
+>value : any
 
 (x3.a) += value;
->(x3.a) += value : number
+>(x3.a) += value : any
 >(x3.a) : number
 >x3.a : number
 >x3 : { a: number; }
 >a : number
->value : undefined
+>value : any
 
 (x3['a']) *= value;
 >(x3['a']) *= value : number
@@ -116,13 +116,13 @@ function fn2(x4: number) {
 >x3['a'] : number
 >x3 : { a: number; }
 >'a' : "a"
->value : undefined
+>value : any
 
 (x3['a']) += value;
->(x3['a']) += value : number
+>(x3['a']) += value : any
 >(x3['a']) : number
 >x3['a'] : number
 >x3 : { a: number; }
 >'a' : "a"
->value : undefined
+>value : any
 
diff --git a/tests/baselines/reference/constraintSatisfactionWithAny.types b/tests/baselines/reference/constraintSatisfactionWithAny.types
index 2f9c7553288..f3363fe1a90 100644
--- a/tests/baselines/reference/constraintSatisfactionWithAny.types
+++ b/tests/baselines/reference/constraintSatisfactionWithAny.types
@@ -35,20 +35,20 @@ var a;
 >a : any
 
 foo(a);
->foo(a) : undefined
+>foo(a) : any
 >foo : <T extends String>(x: T) => T
->a : undefined
+>a : any
 
 foo2(a);
->foo2(a) : undefined
+>foo2(a) : any
 >foo2 : <T extends { x: number; }>(x: T) => T
->a : undefined
+>a : any
 
 //foo3(a);
 foo4(a);
->foo4(a) : undefined
+>foo4(a) : any
 >foo4 : <T extends <T>(x: T) => void>(x: T) => T
->a : undefined
+>a : any
 
 var b: number;
 >b : number
@@ -84,10 +84,10 @@ class C<T extends String> {
 }
 
 var c1 = new C(a);
->c1 : C<undefined>
->new C(a) : C<undefined>
+>c1 : C<any>
+>new C(a) : C<any>
 >C : typeof C
->a : undefined
+>a : any
 
 var c2 = new C<any>(b);
 >c2 : C<any>
@@ -106,10 +106,10 @@ class C2<T extends { x: number }> {
 }
 
 var c3 = new C2(a);
->c3 : C2<undefined>
->new C2(a) : C2<undefined>
+>c3 : C2<any>
+>new C2(a) : C2<any>
 >C2 : typeof C2
->a : undefined
+>a : any
 
 var c4 = new C2<any>(b);
 >c4 : C2<any>
@@ -138,10 +138,10 @@ class C4<T extends <T>(x:T) => T> {
 }
 
 var c7 = new C4(a);
->c7 : C4<undefined>
->new C4(a) : C4<undefined>
+>c7 : C4<any>
+>new C4(a) : C4<any>
 >C4 : typeof C4
->a : undefined
+>a : any
 
 var c8 = new C4<any>(b);
 >c8 : C4<any>
diff --git a/tests/baselines/reference/controlFlowCaching.errors.txt b/tests/baselines/reference/controlFlowCaching.errors.txt
deleted file mode 100644
index 1086695313e..00000000000
--- a/tests/baselines/reference/controlFlowCaching.errors.txt
+++ /dev/null
@@ -1,128 +0,0 @@
-tests/cases/compiler/controlFlowCaching.ts(38,17): error TS2532: Object is possibly 'undefined'.
-tests/cases/compiler/controlFlowCaching.ts(38,29): error TS2339: Property 'y' does not exist on type 'never'.
-tests/cases/compiler/controlFlowCaching.ts(40,17): error TS2532: Object is possibly 'undefined'.
-tests/cases/compiler/controlFlowCaching.ts(40,29): error TS2339: Property 'x' does not exist on type 'never'.
-tests/cases/compiler/controlFlowCaching.ts(42,17): error TS2532: Object is possibly 'undefined'.
-tests/cases/compiler/controlFlowCaching.ts(42,29): error TS2339: Property 'y' does not exist on type 'never'.
-tests/cases/compiler/controlFlowCaching.ts(44,17): error TS2532: Object is possibly 'undefined'.
-tests/cases/compiler/controlFlowCaching.ts(44,29): error TS2339: Property 'y' does not exist on type 'never'.
-tests/cases/compiler/controlFlowCaching.ts(46,17): error TS2532: Object is possibly 'undefined'.
-tests/cases/compiler/controlFlowCaching.ts(46,29): error TS2339: Property 'y' does not exist on type 'never'.
-tests/cases/compiler/controlFlowCaching.ts(48,17): error TS2532: Object is possibly 'undefined'.
-tests/cases/compiler/controlFlowCaching.ts(48,29): error TS2339: Property 'y' does not exist on type 'never'.
-tests/cases/compiler/controlFlowCaching.ts(53,5): error TS2532: Object is possibly 'undefined'.
-tests/cases/compiler/controlFlowCaching.ts(53,14): error TS2339: Property 'y' does not exist on type 'never'.
-tests/cases/compiler/controlFlowCaching.ts(55,14): error TS2678: Type '"start"' is not comparable to type 'undefined'.
-tests/cases/compiler/controlFlowCaching.ts(58,14): error TS2678: Type '"end"' is not comparable to type 'undefined'.
-tests/cases/compiler/controlFlowCaching.ts(61,14): error TS2678: Type '"middle"' is not comparable to type 'undefined'.
-tests/cases/compiler/controlFlowCaching.ts(62,13): error TS2532: Object is possibly 'undefined'.
-tests/cases/compiler/controlFlowCaching.ts(62,25): error TS2339: Property 'y' does not exist on type 'never'.
-
-
-==== tests/cases/compiler/controlFlowCaching.ts (19 errors) ====
-    
-    // Repro for #8401
-    
-    function f(dim, offsets, arr, acommon, centerAnchorLimit, g, has, lin) {
-        var isRtl = this._isRtl();  // chart mirroring
-        // prepare variable
-        var o = this.opt, ta = this.chart.theme.axis, position = o.position,
-            leftBottom = position !== "rightOrTop", rotation = o.rotation % 360,
-            start, stop, titlePos, titleRotation = 0, titleOffset, axisVector, tickVector, anchorOffset, labelOffset, labelAlign,
-            labelGap = this.chart.theme.axis.tick.labelGap,
-            taFont = o.font || (ta.majorTick && ta.majorTick.font) || (ta.tick && ta.tick.font),
-            taTitleFont = o.titleFont || (ta.title && ta.title.font),
-            taFontColor = o.fontColor || (ta.majorTick && ta.majorTick.fontColor) || (ta.tick && ta.tick.fontColor) || "black",
-            taTitleFontColor = o.titleFontColor || (ta.title && ta.title.fontColor) || "black",
-            taTitleGap = (o.titleGap == 0) ? 0 : o.titleGap || (ta.title && ta.title.gap) || 15,
-            taTitleOrientation = o.titleOrientation || (ta.title && ta.title.orientation) || "axis",
-            taMajorTick = this.chart.theme.getTick("major", o),
-            taMinorTick = this.chart.theme.getTick("minor", o),
-            taMicroTick = this.chart.theme.getTick("micro", o),
-    
-            taStroke = "stroke" in o ? o.stroke : ta.stroke,
-            size = taFont ? g.normalizedLength(g.splitFontString(taFont).size) : 0,
-            cosr = Math.abs(Math.cos(rotation * Math.PI / 180)),
-            sinr = Math.abs(Math.sin(rotation * Math.PI / 180)),
-            tsize = taTitleFont ? g.normalizedLength(g.splitFontString(taTitleFont).size) : 0;
-        if (rotation < 0) {
-            rotation += 360;
-        }
-        var cachedLabelW = this._getMaxLabelSize();
-        cachedLabelW = cachedLabelW && cachedLabelW.majLabelW;
-        titleOffset = size * cosr + (cachedLabelW || 0) * sinr + labelGap + Math.max(taMajorTick.length > 0 ? taMajorTick.length : 0,
-            taMinorTick.length > 0 ? taMinorTick.length : 0) +
-            tsize + taTitleGap;
-        axisVector = { x: isRtl ? -1 : 1, y: 0 };     // chart mirroring
-        switch (rotation) {
-            default:
-                if (rotation < (90 - centerAnchorLimit)) {
-                    labelOffset.y = leftBottom ? size : 0;
-                    ~~~~~~~~~~~
-!!! error TS2532: Object is possibly 'undefined'.
-                                ~
-!!! error TS2339: Property 'y' does not exist on type 'never'.
-                } else if (rotation < (90 + centerAnchorLimit)) {
-                    labelOffset.x = -size * 0.4;
-                    ~~~~~~~~~~~
-!!! error TS2532: Object is possibly 'undefined'.
-                                ~
-!!! error TS2339: Property 'x' does not exist on type 'never'.
-                } else if (rotation < 180) {
-                    labelOffset.y = leftBottom ? 0 : -size;
-                    ~~~~~~~~~~~
-!!! error TS2532: Object is possibly 'undefined'.
-                                ~
-!!! error TS2339: Property 'y' does not exist on type 'never'.
-                } else if (rotation < (270 - centerAnchorLimit)) {
-                    labelOffset.y = leftBottom ? 0 : -size;
-                    ~~~~~~~~~~~
-!!! error TS2532: Object is possibly 'undefined'.
-                                ~
-!!! error TS2339: Property 'y' does not exist on type 'never'.
-                } else if (rotation < (270 + centerAnchorLimit)) {
-                    labelOffset.y = leftBottom ? size * 0.4 : 0;
-                    ~~~~~~~~~~~
-!!! error TS2532: Object is possibly 'undefined'.
-                                ~
-!!! error TS2339: Property 'y' does not exist on type 'never'.
-                } else {
-                    labelOffset.y = leftBottom ? size : 0;
-                    ~~~~~~~~~~~
-!!! error TS2532: Object is possibly 'undefined'.
-                                ~
-!!! error TS2339: Property 'y' does not exist on type 'never'.
-                }
-        }
-    
-        titleRotation = (taTitleOrientation && taTitleOrientation == "away") ? 180 : 0;
-        titlePos.y = offsets.t - titleOffset + (titleRotation ? 0 : tsize);
-        ~~~~~~~~
-!!! error TS2532: Object is possibly 'undefined'.
-                 ~
-!!! error TS2339: Property 'y' does not exist on type 'never'.
-        switch (labelAlign) {
-            case "start":
-                 ~~~~~~~
-!!! error TS2678: Type '"start"' is not comparable to type 'undefined'.
-                labelAlign = "end";
-                break;
-            case "end":
-                 ~~~~~
-!!! error TS2678: Type '"end"' is not comparable to type 'undefined'.
-                labelAlign = "start";
-                break;
-            case "middle":
-                 ~~~~~~~~
-!!! error TS2678: Type '"middle"' is not comparable to type 'undefined'.
-                labelOffset.y -= size;
-                ~~~~~~~~~~~
-!!! error TS2532: Object is possibly 'undefined'.
-                            ~
-!!! error TS2339: Property 'y' does not exist on type 'never'.
-                break;
-        }
-    
-        let _ = rotation;
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/downlevelLetConst14.types b/tests/baselines/reference/downlevelLetConst14.types
index 493c17b97cd..29c87e76cce 100644
--- a/tests/baselines/reference/downlevelLetConst14.types
+++ b/tests/baselines/reference/downlevelLetConst14.types
@@ -77,22 +77,22 @@ use(x);
 use(z0);
 >use(z0) : any
 >use : (a: any) => any
->z0 : undefined
+>z0 : any
 
 use(z1);
 >use(z1) : any
 >use : (a: any) => any
->z1 : undefined
+>z1 : any
 
 use(z2);
 >use(z2) : any
 >use : (a: any) => any
->z2 : undefined
+>z2 : any
 
 use(z3);
 >use(z3) : any
 >use : (a: any) => any
->z3 : undefined
+>z3 : any
 
 var z6;
 >z6 : any
@@ -149,7 +149,7 @@ use(y);
 use(z6);
 >use(z6) : any
 >use : (a: any) => any
->z6 : undefined
+>z6 : any
 
 var z = false;
 >z : boolean
diff --git a/tests/baselines/reference/downlevelLetConst15.types b/tests/baselines/reference/downlevelLetConst15.types
index 6d224b6310d..9e58c648821 100644
--- a/tests/baselines/reference/downlevelLetConst15.types
+++ b/tests/baselines/reference/downlevelLetConst15.types
@@ -83,22 +83,22 @@ use(x);
 use(z0);
 >use(z0) : any
 >use : (a: any) => any
->z0 : undefined
+>z0 : any
 
 use(z1);
 >use(z1) : any
 >use : (a: any) => any
->z1 : undefined
+>z1 : any
 
 use(z2);
 >use(z2) : any
 >use : (a: any) => any
->z2 : undefined
+>z2 : any
 
 use(z3);
 >use(z3) : any
 >use : (a: any) => any
->z3 : undefined
+>z3 : any
 
 var z6;
 >z6 : any
@@ -155,7 +155,7 @@ use(y);
 use(z6);
 >use(z6) : any
 >use : (a: any) => any
->z6 : undefined
+>z6 : any
 
 var z = false;
 >z : boolean
diff --git a/tests/baselines/reference/forIn.errors.txt b/tests/baselines/reference/forIn.errors.txt
index a7dd629698a..ccc1423f1aa 100644
--- a/tests/baselines/reference/forIn.errors.txt
+++ b/tests/baselines/reference/forIn.errors.txt
@@ -1,24 +1,17 @@
 tests/cases/compiler/forIn.ts(2,10): error TS2404: The left-hand side of a 'for...in' statement cannot use a type annotation.
-tests/cases/compiler/forIn.ts(2,22): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
-tests/cases/compiler/forIn.ts(7,15): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
-tests/cases/compiler/forIn.ts(18,15): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
 tests/cases/compiler/forIn.ts(20,4): error TS2304: Cannot find name 'k'.
 
 
-==== tests/cases/compiler/forIn.ts (5 errors) ====
+==== tests/cases/compiler/forIn.ts (2 errors) ====
     var arr = null;
     for (var i:number in arr) { // error
              ~
 !!! error TS2404: The left-hand side of a 'for...in' statement cannot use a type annotation.
-                         ~~~
-!!! error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
         var x1 = arr[i];
         var y1 = arr[i];
     }
     
     for (var j in arr) { // ok
-                  ~~~
-!!! error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
         var x2 = arr[j];
         var y2 = arr[j];
     }
@@ -30,8 +23,6 @@ tests/cases/compiler/forIn.ts(20,4): error TS2304: Cannot find name 'k'.
     }
     
     for (var l in arr) { 
-                  ~~~
-!!! error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
        // error in the body
        k[l] = 1;
        ~
diff --git a/tests/baselines/reference/initializePropertiesWithRenamedLet.types b/tests/baselines/reference/initializePropertiesWithRenamedLet.types
index d6937da8983..65ea68059a7 100644
--- a/tests/baselines/reference/initializePropertiesWithRenamedLet.types
+++ b/tests/baselines/reference/initializePropertiesWithRenamedLet.types
@@ -10,15 +10,15 @@ if (true) {
 >x0 : any
 
     var obj1 = { x0: x0 };
->obj1 : { x0: undefined; }
->{ x0: x0 } : { x0: undefined; }
->x0 : undefined
->x0 : undefined
+>obj1 : { x0: any; }
+>{ x0: x0 } : { x0: any; }
+>x0 : any
+>x0 : any
 
     var obj2 = { x0 };
->obj2 : { x0: undefined; }
->{ x0 } : { x0: undefined; }
->x0 : undefined
+>obj2 : { x0: any; }
+>{ x0 } : { x0: any; }
+>x0 : any
 }
 
 var x, y, z;
diff --git a/tests/baselines/reference/json.stringify.types b/tests/baselines/reference/json.stringify.types
index 8ff84885d9c..b063b06d8d0 100644
--- a/tests/baselines/reference/json.stringify.types
+++ b/tests/baselines/reference/json.stringify.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/json.stringify.ts ===
 
 var value = null;
->value : any
+>value : null
 >null : null
 
 JSON.stringify(value, undefined, 2);
diff --git a/tests/baselines/reference/localClassesInLoop.types b/tests/baselines/reference/localClassesInLoop.types
index 88050445898..c88bfc0435d 100644
--- a/tests/baselines/reference/localClassesInLoop.types
+++ b/tests/baselines/reference/localClassesInLoop.types
@@ -35,12 +35,12 @@ use(data[0]() === data[1]());
 >use(data[0]() === data[1]()) : any
 >use : (a: any) => any
 >data[0]() === data[1]() : boolean
->data[0]() : typeof C
->data[0] : () => typeof C
->data : (() => typeof C)[]
+>data[0]() : any
+>data[0] : any
+>data : any[]
 >0 : 0
->data[1]() : typeof C
->data[1] : () => typeof C
->data : (() => typeof C)[]
+>data[1]() : any
+>data[1] : any
+>data : any[]
 >1 : 1
 
diff --git a/tests/baselines/reference/localClassesInLoop_ES6.types b/tests/baselines/reference/localClassesInLoop_ES6.types
index 390f4b8b1dd..9d487f6c600 100644
--- a/tests/baselines/reference/localClassesInLoop_ES6.types
+++ b/tests/baselines/reference/localClassesInLoop_ES6.types
@@ -36,12 +36,12 @@ use(data[0]() === data[1]());
 >use(data[0]() === data[1]()) : any
 >use : (a: any) => any
 >data[0]() === data[1]() : boolean
->data[0]() : typeof C
->data[0] : () => typeof C
->data : (() => typeof C)[]
+>data[0]() : any
+>data[0] : any
+>data : any[]
 >0 : 0
->data[1]() : typeof C
->data[1] : () => typeof C
->data : (() => typeof C)[]
+>data[1]() : any
+>data[1] : any
+>data : any[]
 >1 : 1
 
diff --git a/tests/baselines/reference/nestedBlockScopedBindings3.types b/tests/baselines/reference/nestedBlockScopedBindings3.types
index ca13759bac4..0de8123861d 100644
--- a/tests/baselines/reference/nestedBlockScopedBindings3.types
+++ b/tests/baselines/reference/nestedBlockScopedBindings3.types
@@ -31,7 +31,7 @@ function a1() {
     for (let x; x < 1;) {
 >x : any
 >x < 1 : boolean
->x : undefined
+>x : any
 >1 : 1
 
         () => x;
@@ -53,24 +53,24 @@ function a2() {
     for (let x; x < 1;) {
 >x : any
 >x < 1 : boolean
->x : number
+>x : any
 >1 : 1
 
         x = x + 1;
->x = x + 1 : number
+>x = x + 1 : any
+>x : any
+>x + 1 : any
 >x : any
->x + 1 : number
->x : number
 >1 : 1
     }
     for (let x;;) {
 >x : any
 
         x = x + 2;
->x = x + 2 : number
+>x = x + 2 : any
+>x : any
+>x + 2 : any
 >x : any
->x + 2 : number
->x : number
 >2 : 2
     }
 }
@@ -82,14 +82,14 @@ function a3() {
     for (let x; x < 1;) {
 >x : any
 >x < 1 : boolean
->x : number
+>x : any
 >1 : 1
 
         x = x + 1;
->x = x + 1 : number
+>x = x + 1 : any
+>x : any
+>x + 1 : any
 >x : any
->x + 1 : number
->x : number
 >1 : 1
     }
     switch (1) {
@@ -111,14 +111,14 @@ function a4() {
     for (let x; x < 1;) {
 >x : any
 >x < 1 : boolean
->x : number
+>x : any
 >1 : 1
 
         x = x + 1;
->x = x + 1 : number
+>x = x + 1 : any
+>x : any
+>x + 1 : any
 >x : any
->x + 1 : number
->x : number
 >1 : 1
 
         () => x;
@@ -145,14 +145,14 @@ function a5() {
     for (let x; x < 1;) {
 >x : any
 >x < 1 : boolean
->x : number
+>x : any
 >1 : 1
 
         x = x + 1;
->x = x + 1 : number
+>x = x + 1 : any
+>x : any
+>x + 1 : any
 >x : any
->x + 1 : number
->x : number
 >1 : 1
 
         () => x;
diff --git a/tests/baselines/reference/nestedBlockScopedBindings4.types b/tests/baselines/reference/nestedBlockScopedBindings4.types
index 9e0147f25f7..65b5d73db9d 100644
--- a/tests/baselines/reference/nestedBlockScopedBindings4.types
+++ b/tests/baselines/reference/nestedBlockScopedBindings4.types
@@ -5,24 +5,24 @@ function a0() {
     for (let x; x < 1;) {
 >x : any
 >x < 1 : boolean
->x : number
+>x : any
 >1 : 1
 
         x = x + 1;
->x = x + 1 : number
+>x = x + 1 : any
+>x : any
+>x + 1 : any
 >x : any
->x + 1 : number
->x : number
 >1 : 1
     }
     for (let x;;) {
 >x : any
 
         x = x + 2;
->x = x + 2 : number
+>x = x + 2 : any
+>x : any
+>x + 2 : any
 >x : any
->x + 2 : number
->x : number
 >2 : 2
     }
 }
@@ -33,14 +33,14 @@ function a1() {
     for (let x; x < 1;) {
 >x : any
 >x < 1 : boolean
->x : number
+>x : any
 >1 : 1
 
         x = x + 1;
->x = x + 1 : number
+>x = x + 1 : any
+>x : any
+>x + 1 : any
 >x : any
->x + 1 : number
->x : number
 >1 : 1
 
         () => x;
@@ -51,10 +51,10 @@ function a1() {
 >x : any
 
         x = x + 2;
->x = x + 2 : number
+>x = x + 2 : any
+>x : any
+>x + 2 : any
 >x : any
->x + 2 : number
->x : number
 >2 : 2
     }
 }
@@ -65,24 +65,24 @@ function a2() {
     for (let x; x < 1;) {
 >x : any
 >x < 1 : boolean
->x : number
+>x : any
 >1 : 1
 
         x = x + 1;
->x = x + 1 : number
+>x = x + 1 : any
+>x : any
+>x + 1 : any
 >x : any
->x + 1 : number
->x : number
 >1 : 1
     }
     for (let x;;) {
 >x : any
 
         x = x + 2;
->x = x + 2 : number
+>x = x + 2 : any
+>x : any
+>x + 2 : any
 >x : any
->x + 2 : number
->x : number
 >2 : 2
 
         () => x;
@@ -98,14 +98,14 @@ function a3() {
     for (let x; x < 1;) {
 >x : any
 >x < 1 : boolean
->x : number
+>x : any
 >1 : 1
 
         x = x + 1;
->x = x + 1 : number
+>x = x + 1 : any
+>x : any
+>x + 1 : any
 >x : any
->x + 1 : number
->x : number
 >1 : 1
 
         () => x;
@@ -116,10 +116,10 @@ function a3() {
 >x : any
 
         x = x + 2;
->x = x + 2 : number
+>x = x + 2 : any
+>x : any
+>x + 2 : any
 >x : any
->x + 2 : number
->x : number
 >2 : 2
 
         () => x;
diff --git a/tests/baselines/reference/nestedBlockScopedBindings6.types b/tests/baselines/reference/nestedBlockScopedBindings6.types
index bf38f46d508..865dea31e37 100644
--- a/tests/baselines/reference/nestedBlockScopedBindings6.types
+++ b/tests/baselines/reference/nestedBlockScopedBindings6.types
@@ -18,10 +18,10 @@ function a0() {
 >x : any
 
         x = x + 2;
->x = x + 2 : number
+>x = x + 2 : any
+>x : any
+>x + 2 : any
 >x : any
->x + 2 : number
->x : number
 >2 : 2
     }
 }
@@ -49,10 +49,10 @@ function a1() {
 >x : any
 
         x = x + 2;
->x = x + 2 : number
+>x = x + 2 : any
+>x : any
+>x + 2 : any
 >x : any
->x + 2 : number
->x : number
 >2 : 2
     }
 }
@@ -76,10 +76,10 @@ function a2() {
 >x : any
 
         x = x + 2;
->x = x + 2 : number
+>x = x + 2 : any
+>x : any
+>x + 2 : any
 >x : any
->x + 2 : number
->x : number
 >2 : 2
 
         () => x;
@@ -111,10 +111,10 @@ function a3() {
 >x : any
 
         x = x + 2;
->x = x + 2 : number
+>x = x + 2 : any
+>x : any
+>x + 2 : any
 >x : any
->x + 2 : number
->x : number
 >2 : 2
 
         () => x;
diff --git a/tests/baselines/reference/null.types b/tests/baselines/reference/null.types
index ab5ae728dea..35c084c3cbf 100644
--- a/tests/baselines/reference/null.types
+++ b/tests/baselines/reference/null.types
@@ -5,10 +5,10 @@ var x=null;
 >null : null
 
 var y=3+x;  
->y : number
->3+x : number
+>y : any
+>3+x : any
 >3 : 3
->x : null
+>x : any
 
 var z=3+null; 
 >z : number
diff --git a/tests/baselines/reference/objectLiteralShorthandProperties.types b/tests/baselines/reference/objectLiteralShorthandProperties.types
index 168fcc07af7..4f4482906aa 100644
--- a/tests/baselines/reference/objectLiteralShorthandProperties.types
+++ b/tests/baselines/reference/objectLiteralShorthandProperties.types
@@ -5,35 +5,35 @@ var a, b, c;
 >c : any
 
 var x1 = {
->x1 : { a: undefined; }
->{    a} : { a: undefined; }
+>x1 : { a: any; }
+>{    a} : { a: any; }
 
     a
->a : undefined
+>a : any
 
 };
 
 var x2 = {
->x2 : { a: undefined; }
->{    a,} : { a: undefined; }
+>x2 : { a: any; }
+>{    a,} : { a: any; }
 
     a,
->a : undefined
+>a : any
 }
 
 var x3 = {
 >x3 : any
->{    a: 0,    b,    c,    d() { },    x3,    parent: x3} : { a: number; b: undefined; c: undefined; d(): void; x3: any; parent: any; }
+>{    a: 0,    b,    c,    d() { },    x3,    parent: x3} : { a: number; b: any; c: any; d(): void; x3: any; parent: any; }
 
     a: 0,
 >a : number
 >0 : 0
 
     b,
->b : undefined
+>b : any
 
     c,
->c : undefined
+>c : any
 
     d() { },
 >d : () => void
diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesES6.types b/tests/baselines/reference/objectLiteralShorthandPropertiesES6.types
index 80cbe304040..1565be04625 100644
--- a/tests/baselines/reference/objectLiteralShorthandPropertiesES6.types
+++ b/tests/baselines/reference/objectLiteralShorthandPropertiesES6.types
@@ -5,35 +5,35 @@ var a, b, c;
 >c : any
 
 var x1 = {
->x1 : { a: undefined; }
->{    a} : { a: undefined; }
+>x1 : { a: any; }
+>{    a} : { a: any; }
 
     a
->a : undefined
+>a : any
 
 };
 
 var x2 = {
->x2 : { a: undefined; }
->{    a,} : { a: undefined; }
+>x2 : { a: any; }
+>{    a,} : { a: any; }
 
     a,
->a : undefined
+>a : any
 }
 
 var x3 = {
 >x3 : any
->{    a: 0,    b,    c,    d() { },    x3,    parent: x3} : { a: number; b: undefined; c: undefined; d(): void; x3: any; parent: any; }
+>{    a: 0,    b,    c,    d() { },    x3,    parent: x3} : { a: number; b: any; c: any; d(): void; x3: any; parent: any; }
 
     a: 0,
 >a : number
 >0 : 0
 
     b,
->b : undefined
+>b : any
 
     c,
->c : undefined
+>c : any
 
     d() { },
 >d : () => void
diff --git a/tests/baselines/reference/objectSpreadNoTransform.types b/tests/baselines/reference/objectSpreadNoTransform.types
index ae89a3a7993..c7cfdf8f006 100644
--- a/tests/baselines/reference/objectSpreadNoTransform.types
+++ b/tests/baselines/reference/objectSpreadNoTransform.types
@@ -25,6 +25,6 @@ var rest;
 >{ b, ...rest } = o : { a: string; b: string; x: number; }
 >{ b, ...rest } : any
 >b : any
->rest : undefined
+>rest : any
 >o : { a: string; b: string; x: number; }
 
diff --git a/tests/baselines/reference/parserAmbiguityWithBinaryOperator1.types b/tests/baselines/reference/parserAmbiguityWithBinaryOperator1.types
index ca7d65c9c34..234375fb46d 100644
--- a/tests/baselines/reference/parserAmbiguityWithBinaryOperator1.types
+++ b/tests/baselines/reference/parserAmbiguityWithBinaryOperator1.types
@@ -10,12 +10,12 @@ function f1() {
     if (a < b || b > (c + 1)) { }
 >a < b || b > (c + 1) : boolean
 >a < b : boolean
->a : undefined
->b : undefined
+>a : any
+>b : any
 >b > (c + 1) : boolean
->b : undefined
->(c + 1) : number
->c + 1 : number
->c : undefined
+>b : any
+>(c + 1) : any
+>c + 1 : any
+>c : any
 >1 : 1
 }
diff --git a/tests/baselines/reference/parserAmbiguityWithBinaryOperator2.types b/tests/baselines/reference/parserAmbiguityWithBinaryOperator2.types
index f4c1c2ac690..ed3b4b903bb 100644
--- a/tests/baselines/reference/parserAmbiguityWithBinaryOperator2.types
+++ b/tests/baselines/reference/parserAmbiguityWithBinaryOperator2.types
@@ -10,12 +10,12 @@ function f() {
     if (a < b && b > (c + 1)) { }
 >a < b && b > (c + 1) : boolean
 >a < b : boolean
->a : undefined
->b : undefined
+>a : any
+>b : any
 >b > (c + 1) : boolean
->b : undefined
->(c + 1) : number
->c + 1 : number
->c : undefined
+>b : any
+>(c + 1) : any
+>c + 1 : any
+>c : any
 >1 : 1
 }
diff --git a/tests/baselines/reference/parserAmbiguityWithBinaryOperator3.types b/tests/baselines/reference/parserAmbiguityWithBinaryOperator3.types
index b1129656342..61601d8bdf6 100644
--- a/tests/baselines/reference/parserAmbiguityWithBinaryOperator3.types
+++ b/tests/baselines/reference/parserAmbiguityWithBinaryOperator3.types
@@ -10,13 +10,13 @@ function f() {
     if (a < b && b < (c + 1)) { }
 >a < b && b < (c + 1) : boolean
 >a < b : boolean
->a : undefined
->b : undefined
+>a : any
+>b : any
 >b < (c + 1) : boolean
->b : undefined
->(c + 1) : number
->c + 1 : number
->c : undefined
+>b : any
+>(c + 1) : any
+>c + 1 : any
+>c : any
 >1 : 1
 }
 
diff --git a/tests/baselines/reference/parserForStatement2.errors.txt b/tests/baselines/reference/parserForStatement2.errors.txt
index 68ab999b657..59d6dd6dec8 100644
--- a/tests/baselines/reference/parserForStatement2.errors.txt
+++ b/tests/baselines/reference/parserForStatement2.errors.txt
@@ -1,17 +1,11 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement2.ts(4,13): error TS2538: Type 'undefined' cannot be used as an index type.
-tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement2.ts(4,20): error TS2538: Type 'undefined' cannot be used as an index type.
 tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement2.ts(4,30): error TS2304: Cannot find name 'd'.
 
 
-==== tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement2.ts (3 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement2.ts (1 errors) ====
     var a;
     var b = [];
     var c;
     for (a in b[c] = b[c] || [], d) {
-                ~
-!!! error TS2538: Type 'undefined' cannot be used as an index type.
-                       ~
-!!! error TS2538: Type 'undefined' cannot be used as an index type.
                                  ~
 !!! error TS2304: Cannot find name 'd'.
     
diff --git a/tests/baselines/reference/parserharness.errors.txt b/tests/baselines/reference/parserharness.errors.txt
index 90ac8e0e760..d3d0c4056a1 100644
--- a/tests/baselines/reference/parserharness.errors.txt
+++ b/tests/baselines/reference/parserharness.errors.txt
@@ -25,9 +25,6 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(776,42): e
 tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(781,23): error TS2503: Cannot find namespace 'TypeScript'.
 tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(794,49): error TS2304: Cannot find name 'TypeScript'.
 tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(795,49): error TS2304: Cannot find name 'TypeScript'.
-tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(820,31): error TS2339: Property 'length' does not exist on type 'null'.
-tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(976,28): error TS2339: Property 'length' does not exist on type 'null'.
-tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(977,82): error TS2339: Property 'join' does not exist on type 'null'.
 tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(987,53): error TS2304: Cannot find name 'TypeScript'.
 tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(987,89): error TS2304: Cannot find name 'TypeScript'.
 tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(987,115): error TS2503: Cannot find namespace 'TypeScript'.
@@ -113,7 +110,7 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(1787,68):
 tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32): error TS2304: Cannot find name 'Diff'.
 
 
-==== tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts (113 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts (110 errors) ====
     //
     // Copyright (c) Microsoft Corporation.  All rights reserved.
     // 
@@ -988,8 +985,6 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32):
                     })
     
                     return errors.length === 0;
-                                  ~~~~~~
-!!! error TS2339: Property 'length' does not exist on type 'null'.
                 }
     
                 public isSubtypeOf(other: Type) {
@@ -1146,11 +1141,7 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32):
                     })
     
                     if (errors.length > 0)
-                               ~~~~~~
-!!! error TS2339: Property 'length' does not exist on type 'null'.
                         throw new Error("Type definition contains errors: " + errors.join(","));
-                                                                                     ~~~~
-!!! error TS2339: Property 'join' does not exist on type 'null'.
     
                     var matchingIdentifiers: Type[] = [];
     
diff --git a/tests/baselines/reference/protoAsIndexInIndexExpression.types b/tests/baselines/reference/protoAsIndexInIndexExpression.types
index 6d1374d1f78..b761aa2c7a7 100644
--- a/tests/baselines/reference/protoAsIndexInIndexExpression.types
+++ b/tests/baselines/reference/protoAsIndexInIndexExpression.types
@@ -14,11 +14,11 @@ var WorkspacePrototype = {
     }
 };
 WorkspacePrototype['__proto__'] = EntityPrototype;
->WorkspacePrototype['__proto__'] = EntityPrototype : undefined
+>WorkspacePrototype['__proto__'] = EntityPrototype : any
 >WorkspacePrototype['__proto__'] : any
 >WorkspacePrototype : { serialize: () => any; }
 >'__proto__' : "___proto__"
->EntityPrototype : undefined
+>EntityPrototype : any
 
 var o = {
 >o : { "__proto__": number; }
diff --git a/tests/baselines/reference/strictNullChecksNoWidening.types b/tests/baselines/reference/strictNullChecksNoWidening.types
index e24797850ee..a544f9cef94 100644
--- a/tests/baselines/reference/strictNullChecksNoWidening.types
+++ b/tests/baselines/reference/strictNullChecksNoWidening.types
@@ -1,11 +1,11 @@
 === tests/cases/conformance/types/typeRelationships/widenedTypes/strictNullChecksNoWidening.ts ===
 
 var a1 = null;
->a1 : any
+>a1 : null
 >null : null
 
 var a2 = undefined;
->a2 : any
+>a2 : undefined
 >undefined : undefined
 
 var a3 = void 0;
@@ -14,7 +14,7 @@ var a3 = void 0;
 >0 : 0
 
 var b1 = [];
->b1 : any[]
+>b1 : never[]
 >[] : never[]
 
 var b2 = [,];
diff --git a/tests/baselines/reference/tsxEmit1.types b/tests/baselines/reference/tsxEmit1.types
index c3ca7a2b1b0..84f00b4758a 100644
--- a/tests/baselines/reference/tsxEmit1.types
+++ b/tests/baselines/reference/tsxEmit1.types
@@ -61,7 +61,7 @@ var selfClosed7 = <div x={p} y='p' />;
 ><div x={p} y='p' /> : JSX.Element
 >div : any
 >x : any
->p : undefined
+>p : any
 >y : any
 
 var openClosed1 = <div></div>;
@@ -82,7 +82,7 @@ var openClosed3 = <div n='m'>{p}</div>;
 ><div n='m'>{p}</div> : JSX.Element
 >div : any
 >n : any
->p : undefined
+>p : any
 >div : any
 
 var openClosed4 = <div n='m'>{p < p}</div>;
@@ -91,8 +91,8 @@ var openClosed4 = <div n='m'>{p < p}</div>;
 >div : any
 >n : any
 >p < p : boolean
->p : undefined
->p : undefined
+>p : any
+>p : any
 >div : any
 
 var openClosed5 = <div n='m'>{p > p}</div>;
@@ -101,8 +101,8 @@ var openClosed5 = <div n='m'>{p > p}</div>;
 >div : any
 >n : any
 >p > p : boolean
->p : undefined
->p : undefined
+>p : any
+>p : any
 >div : any
 
 class SomeClass {
@@ -180,7 +180,7 @@ var whitespace2 = <div>  {p}    </div>;
 >whitespace2 : JSX.Element
 ><div>  {p}    </div> : JSX.Element
 >div : any
->p : undefined
+>p : any
 >div : any
 
 var whitespace3 = <div>  
@@ -189,7 +189,7 @@ var whitespace3 = <div>
 >div : any
 
       {p}    
->p : undefined
+>p : any
 
       </div>;
 >div : any
diff --git a/tests/baselines/reference/tsxEmit2.types b/tests/baselines/reference/tsxEmit2.types
index d306dc9ffe0..5b267d8b802 100644
--- a/tests/baselines/reference/tsxEmit2.types
+++ b/tests/baselines/reference/tsxEmit2.types
@@ -22,16 +22,16 @@ var spreads1 = <div {...p1}>{p2}</div>;
 >spreads1 : JSX.Element
 ><div {...p1}>{p2}</div> : JSX.Element
 >div : any
->p1 : undefined
->p2 : undefined
+>p1 : any
+>p2 : any
 >div : any
 
 var spreads2 = <div {...p1}>{p2}</div>;
 >spreads2 : JSX.Element
 ><div {...p1}>{p2}</div> : JSX.Element
 >div : any
->p1 : undefined
->p2 : undefined
+>p1 : any
+>p2 : any
 >div : any
 
 var spreads3 = <div x={p3} {...p1}>{p2}</div>;
@@ -39,19 +39,19 @@ var spreads3 = <div x={p3} {...p1}>{p2}</div>;
 ><div x={p3} {...p1}>{p2}</div> : JSX.Element
 >div : any
 >x : any
->p3 : undefined
->p1 : undefined
->p2 : undefined
+>p3 : any
+>p1 : any
+>p2 : any
 >div : any
 
 var spreads4 = <div {...p1} x={p3} >{p2}</div>;
 >spreads4 : JSX.Element
 ><div {...p1} x={p3} >{p2}</div> : JSX.Element
 >div : any
->p1 : undefined
+>p1 : any
 >x : any
->p3 : undefined
->p2 : undefined
+>p3 : any
+>p2 : any
 >div : any
 
 var spreads5 = <div x={p2} {...p1} y={p3}>{p2}</div>;
@@ -59,10 +59,10 @@ var spreads5 = <div x={p2} {...p1} y={p3}>{p2}</div>;
 ><div x={p2} {...p1} y={p3}>{p2}</div> : JSX.Element
 >div : any
 >x : any
->p2 : undefined
->p1 : undefined
+>p2 : any
+>p1 : any
 >y : any
->p3 : undefined
->p2 : undefined
+>p3 : any
+>p2 : any
 >div : any
 
diff --git a/tests/baselines/reference/tsxReactEmit1.types b/tests/baselines/reference/tsxReactEmit1.types
index b2cb2f73eba..8eb14e91963 100644
--- a/tests/baselines/reference/tsxReactEmit1.types
+++ b/tests/baselines/reference/tsxReactEmit1.types
@@ -63,7 +63,7 @@ var selfClosed7 = <div x={p} y='p' b />;
 ><div x={p} y='p' b /> : JSX.Element
 >div : any
 >x : any
->p : undefined
+>p : any
 >y : any
 >b : any
 
@@ -85,7 +85,7 @@ var openClosed3 = <div n='m'>{p}</div>;
 ><div n='m'>{p}</div> : JSX.Element
 >div : any
 >n : any
->p : undefined
+>p : any
 >div : any
 
 var openClosed4 = <div n='m'>{p < p}</div>;
@@ -94,8 +94,8 @@ var openClosed4 = <div n='m'>{p < p}</div>;
 >div : any
 >n : any
 >p < p : boolean
->p : undefined
->p : undefined
+>p : any
+>p : any
 >div : any
 
 var openClosed5 = <div n='m' b>{p > p}</div>;
@@ -105,8 +105,8 @@ var openClosed5 = <div n='m' b>{p > p}</div>;
 >n : any
 >b : any
 >p > p : boolean
->p : undefined
->p : undefined
+>p : any
+>p : any
 >div : any
 
 class SomeClass {
@@ -184,7 +184,7 @@ var whitespace2 = <div>  {p}    </div>;
 >whitespace2 : JSX.Element
 ><div>  {p}    </div> : JSX.Element
 >div : any
->p : undefined
+>p : any
 >div : any
 
 var whitespace3 = <div>  
@@ -193,7 +193,7 @@ var whitespace3 = <div>
 >div : any
 
       {p}    
->p : undefined
+>p : any
 
       </div>;
 >div : any
diff --git a/tests/baselines/reference/tsxReactEmit2.types b/tests/baselines/reference/tsxReactEmit2.types
index b05764e996f..928eeecadfa 100644
--- a/tests/baselines/reference/tsxReactEmit2.types
+++ b/tests/baselines/reference/tsxReactEmit2.types
@@ -24,16 +24,16 @@ var spreads1 = <div {...p1}>{p2}</div>;
 >spreads1 : JSX.Element
 ><div {...p1}>{p2}</div> : JSX.Element
 >div : any
->p1 : undefined
->p2 : undefined
+>p1 : any
+>p2 : any
 >div : any
 
 var spreads2 = <div {...p1}>{p2}</div>;
 >spreads2 : JSX.Element
 ><div {...p1}>{p2}</div> : JSX.Element
 >div : any
->p1 : undefined
->p2 : undefined
+>p1 : any
+>p2 : any
 >div : any
 
 var spreads3 = <div x={p3} {...p1}>{p2}</div>;
@@ -41,19 +41,19 @@ var spreads3 = <div x={p3} {...p1}>{p2}</div>;
 ><div x={p3} {...p1}>{p2}</div> : JSX.Element
 >div : any
 >x : any
->p3 : undefined
->p1 : undefined
->p2 : undefined
+>p3 : any
+>p1 : any
+>p2 : any
 >div : any
 
 var spreads4 = <div {...p1} x={p3} >{p2}</div>;
 >spreads4 : JSX.Element
 ><div {...p1} x={p3} >{p2}</div> : JSX.Element
 >div : any
->p1 : undefined
+>p1 : any
 >x : any
->p3 : undefined
->p2 : undefined
+>p3 : any
+>p2 : any
 >div : any
 
 var spreads5 = <div x={p2} {...p1} y={p3}>{p2}</div>;
@@ -61,10 +61,10 @@ var spreads5 = <div x={p2} {...p1} y={p3}>{p2}</div>;
 ><div x={p2} {...p1} y={p3}>{p2}</div> : JSX.Element
 >div : any
 >x : any
->p2 : undefined
->p1 : undefined
+>p2 : any
+>p1 : any
 >y : any
->p3 : undefined
->p2 : undefined
+>p3 : any
+>p2 : any
 >div : any
 
diff --git a/tests/baselines/reference/tsxReactEmit5.types b/tests/baselines/reference/tsxReactEmit5.types
index 73e7e6ff391..fb1c6594f30 100644
--- a/tests/baselines/reference/tsxReactEmit5.types
+++ b/tests/baselines/reference/tsxReactEmit5.types
@@ -32,6 +32,6 @@ var spread1 = <div x='' {...foo} y='' />;
 ><div x='' {...foo} y='' /> : JSX.Element
 >div : any
 >x : any
->foo : undefined
+>foo : any
 >y : any
 
diff --git a/tests/baselines/reference/tsxReactEmit6.types b/tests/baselines/reference/tsxReactEmit6.types
index ae56de052cc..b8a307eb9d7 100644
--- a/tests/baselines/reference/tsxReactEmit6.types
+++ b/tests/baselines/reference/tsxReactEmit6.types
@@ -35,7 +35,7 @@ namespace M {
 ><div x='' {...foo} y='' /> : JSX.Element
 >div : any
 >x : any
->foo : undefined
+>foo : any
 >y : any
 
 	// Quotes
diff --git a/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.errors.txt b/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.errors.txt
deleted file mode 100644
index 3f8cdf56c3d..00000000000
--- a/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-tests/cases/compiler/file1.ts(3,12): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
-
-
-==== tests/cases/compiler/file2.ts (0 errors) ====
-    import f = require('./file1');
-    f.foo();
-    
-==== tests/cases/compiler/file1.ts (1 errors) ====
-    export function foo() {
-    var classes = undefined;
-        return new classes(null);
-               ~~~~~~~~~~~~~~~~~
-!!! error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/typedArrays.types b/tests/baselines/reference/typedArrays.types
index cd2103f6461..444d6a74e43 100644
--- a/tests/baselines/reference/typedArrays.types
+++ b/tests/baselines/reference/typedArrays.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/typedArrays.ts ===
 
 function CreateTypedArrayTypes() {
->CreateTypedArrayTypes : () => (Int8ArrayConstructor | Uint8ArrayConstructor | Int16ArrayConstructor | Uint16ArrayConstructor | Int32ArrayConstructor | Uint32ArrayConstructor | Float32ArrayConstructor | Float64ArrayConstructor | Uint8ClampedArrayConstructor)[]
+>CreateTypedArrayTypes : () => any[]
 
     var typedArrays = [];
 >typedArrays : any[]
@@ -71,11 +71,11 @@ function CreateTypedArrayTypes() {
 >Uint8ClampedArray : Uint8ClampedArrayConstructor
 
     return typedArrays;
->typedArrays : (Int8ArrayConstructor | Uint8ArrayConstructor | Int16ArrayConstructor | Uint16ArrayConstructor | Int32ArrayConstructor | Uint32ArrayConstructor | Float32ArrayConstructor | Float64ArrayConstructor | Uint8ClampedArrayConstructor)[]
+>typedArrays : any[]
 }
 
 function CreateTypedArrayInstancesFromLength(obj: number) {
->CreateTypedArrayInstancesFromLength : (obj: number) => (Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array)[]
+>CreateTypedArrayInstancesFromLength : (obj: number) => any[]
 >obj : number
 
     var typedArrays = [];
@@ -164,11 +164,11 @@ function CreateTypedArrayInstancesFromLength(obj: number) {
 >obj : number
 
     return typedArrays;
->typedArrays : (Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array)[]
+>typedArrays : any[]
 }
 
 function CreateTypedArrayInstancesFromArray(obj: number[]) {
->CreateTypedArrayInstancesFromArray : (obj: number[]) => (Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array)[]
+>CreateTypedArrayInstancesFromArray : (obj: number[]) => any[]
 >obj : number[]
 
     var typedArrays = [];
@@ -257,11 +257,11 @@ function CreateTypedArrayInstancesFromArray(obj: number[]) {
 >obj : number[]
 
     return typedArrays;
->typedArrays : (Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array)[]
+>typedArrays : any[]
 }
 
 function CreateIntegerTypedArraysFromArray2(obj:number[]) {
->CreateIntegerTypedArraysFromArray2 : (obj: number[]) => (Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array)[]
+>CreateIntegerTypedArraysFromArray2 : (obj: number[]) => any[]
 >obj : number[]
 
     var typedArrays = [];
@@ -368,11 +368,11 @@ function CreateIntegerTypedArraysFromArray2(obj:number[]) {
 >obj : number[]
 
     return typedArrays;
->typedArrays : (Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array)[]
+>typedArrays : any[]
 }
 
 function CreateIntegerTypedArraysFromArrayLike(obj:ArrayLike<number>) {
->CreateIntegerTypedArraysFromArrayLike : (obj: ArrayLike<number>) => (Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array)[]
+>CreateIntegerTypedArraysFromArrayLike : (obj: ArrayLike<number>) => any[]
 >obj : ArrayLike<number>
 >ArrayLike : ArrayLike<T>
 
@@ -480,11 +480,11 @@ function CreateIntegerTypedArraysFromArrayLike(obj:ArrayLike<number>) {
 >obj : ArrayLike<number>
 
     return typedArrays;
->typedArrays : (Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array)[]
+>typedArrays : any[]
 }
 
 function CreateTypedArraysOf(obj) {
->CreateTypedArraysOf : (obj: any) => (Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array)[]
+>CreateTypedArraysOf : (obj: any) => any[]
 >obj : any
 
     var typedArrays = [];
@@ -600,11 +600,11 @@ function CreateTypedArraysOf(obj) {
 >obj : any
 
     return typedArrays;
->typedArrays : (Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array)[]
+>typedArrays : any[]
 }
 
 function CreateTypedArraysOf2() {
->CreateTypedArraysOf2 : () => (Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array)[]
+>CreateTypedArraysOf2 : () => any[]
 
     var typedArrays = [];
 >typedArrays : any[]
@@ -737,11 +737,11 @@ function CreateTypedArraysOf2() {
 >4 : 4
 
     return typedArrays;
->typedArrays : (Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array)[]
+>typedArrays : any[]
 }
 
 function CreateTypedArraysFromMapFn(obj:ArrayLike<number>, mapFn: (n:number, v:number)=> number) {
->CreateTypedArraysFromMapFn : (obj: ArrayLike<number>, mapFn: (n: number, v: number) => number) => (Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array)[]
+>CreateTypedArraysFromMapFn : (obj: ArrayLike<number>, mapFn: (n: number, v: number) => number) => any[]
 >obj : ArrayLike<number>
 >ArrayLike : ArrayLike<T>
 >mapFn : (n: number, v: number) => number
@@ -861,11 +861,11 @@ function CreateTypedArraysFromMapFn(obj:ArrayLike<number>, mapFn: (n:number, v:n
 >mapFn : (n: number, v: number) => number
 
     return typedArrays;
->typedArrays : (Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array)[]
+>typedArrays : any[]
 }
 
 function CreateTypedArraysFromThisObj(obj:ArrayLike<number>, mapFn: (n:number, v:number)=> number, thisArg: {}) {
->CreateTypedArraysFromThisObj : (obj: ArrayLike<number>, mapFn: (n: number, v: number) => number, thisArg: {}) => (Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array)[]
+>CreateTypedArraysFromThisObj : (obj: ArrayLike<number>, mapFn: (n: number, v: number) => number, thisArg: {}) => any[]
 >obj : ArrayLike<number>
 >ArrayLike : ArrayLike<T>
 >mapFn : (n: number, v: number) => number
@@ -995,5 +995,5 @@ function CreateTypedArraysFromThisObj(obj:ArrayLike<number>, mapFn: (n:number, v
 >thisArg : {}
 
     return typedArrays;
->typedArrays : (Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array)[]
+>typedArrays : any[]
 }
diff --git a/tests/baselines/reference/unusedSwitchStatment.errors.txt b/tests/baselines/reference/unusedSwitchStatment.errors.txt
index 591e9deca7a..a22c252f60d 100644
--- a/tests/baselines/reference/unusedSwitchStatment.errors.txt
+++ b/tests/baselines/reference/unusedSwitchStatment.errors.txt
@@ -4,10 +4,9 @@ tests/cases/compiler/unusedSwitchStatment.ts(7,15): error TS6133: 'c' is declare
 tests/cases/compiler/unusedSwitchStatment.ts(10,13): error TS6133: 'z' is declared but never used.
 tests/cases/compiler/unusedSwitchStatment.ts(15,10): error TS2678: Type '0' is not comparable to type '2'.
 tests/cases/compiler/unusedSwitchStatment.ts(17,10): error TS2678: Type '1' is not comparable to type '2'.
-tests/cases/compiler/unusedSwitchStatment.ts(18,9): error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type.
 
 
-==== tests/cases/compiler/unusedSwitchStatment.ts (7 errors) ====
+==== tests/cases/compiler/unusedSwitchStatment.ts (6 errors) ====
     
     switch (1) {
         case 0:
@@ -38,6 +37,4 @@ tests/cases/compiler/unusedSwitchStatment.ts(18,9): error TS2356: An arithmetic
              ~
 !!! error TS2678: Type '1' is not comparable to type '2'.
             x++;
-            ~
-!!! error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type.
     }
\ No newline at end of file

From aa556502f334d58ceec8d0b8b6abf11c8c83fd8d Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Fri, 18 Nov 2016 14:01:59 -0800
Subject: [PATCH 290/421] Handle when type alias's type parameter extends type
 that wont get emitted in .d.ts Fixes #12326

---
 src/compiler/declarationEmitter.ts                    |  4 ++++
 src/compiler/diagnosticMessages.json                  |  4 ++++
 ...liasTypeParameterExtendingUnknownSymbol.errors.txt | 11 +++++++++++
 ...mitTypeAliasTypeParameterExtendingUnknownSymbol.js |  5 +++++
 ...mitTypeAliasTypeParameterExtendingUnknownSymbol.ts |  3 +++
 5 files changed, 27 insertions(+)
 create mode 100644 tests/baselines/reference/declarationEmitTypeAliasTypeParameterExtendingUnknownSymbol.errors.txt
 create mode 100644 tests/baselines/reference/declarationEmitTypeAliasTypeParameterExtendingUnknownSymbol.js
 create mode 100644 tests/cases/compiler/declarationEmitTypeAliasTypeParameterExtendingUnknownSymbol.ts

diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts
index a7f24dc6321..99a26a13920 100644
--- a/src/compiler/declarationEmitter.ts
+++ b/src/compiler/declarationEmitter.ts
@@ -1037,6 +1037,10 @@ namespace ts {
                             diagnosticMessage = Diagnostics.Type_parameter_0_of_exported_function_has_or_is_using_private_name_1;
                             break;
 
+                        case SyntaxKind.TypeAliasDeclaration:
+                            diagnosticMessage = Diagnostics.Type_parameter_0_of_exported_type_alias_has_or_is_using_private_name_1;
+                            break;
+
                         default:
                             Debug.fail("This is unknown parent for type parameter: " + node.parent.kind);
                     }
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 2dd4e76f8f4..dc3341a5a6f 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -2276,6 +2276,10 @@
         "category": "Error",
         "code": 4082
     },
+    "Type parameter '{0}' of exported type alias has or is using private name '{1}'.": {
+        "category": "Error",
+        "code": 4083
+    },
     "Conflicting definitions for '{0}' found at '{1}' and '{2}'. Consider installing a specific version of this library to resolve the conflict.": {
         "category": "Message",
         "code": 4090
diff --git a/tests/baselines/reference/declarationEmitTypeAliasTypeParameterExtendingUnknownSymbol.errors.txt b/tests/baselines/reference/declarationEmitTypeAliasTypeParameterExtendingUnknownSymbol.errors.txt
new file mode 100644
index 00000000000..af0bcad47fa
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitTypeAliasTypeParameterExtendingUnknownSymbol.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/compiler/declarationEmitTypeAliasTypeParameterExtendingUnknownSymbol.ts(2,18): error TS2304: Cannot find name 'Unknown'.
+tests/cases/compiler/declarationEmitTypeAliasTypeParameterExtendingUnknownSymbol.ts(2,18): error TS4083: Type parameter 'T' of exported type alias has or is using private name 'Unknown'.
+
+
+==== tests/cases/compiler/declarationEmitTypeAliasTypeParameterExtendingUnknownSymbol.ts (2 errors) ====
+    
+    type A<T extends Unknown> = {}
+                     ~~~~~~~
+!!! error TS2304: Cannot find name 'Unknown'.
+                     ~~~~~~~
+!!! error TS4083: Type parameter 'T' of exported type alias has or is using private name 'Unknown'.
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitTypeAliasTypeParameterExtendingUnknownSymbol.js b/tests/baselines/reference/declarationEmitTypeAliasTypeParameterExtendingUnknownSymbol.js
new file mode 100644
index 00000000000..eedcc6eccb7
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitTypeAliasTypeParameterExtendingUnknownSymbol.js
@@ -0,0 +1,5 @@
+//// [declarationEmitTypeAliasTypeParameterExtendingUnknownSymbol.ts]
+
+type A<T extends Unknown> = {}
+
+//// [declarationEmitTypeAliasTypeParameterExtendingUnknownSymbol.js]
diff --git a/tests/cases/compiler/declarationEmitTypeAliasTypeParameterExtendingUnknownSymbol.ts b/tests/cases/compiler/declarationEmitTypeAliasTypeParameterExtendingUnknownSymbol.ts
new file mode 100644
index 00000000000..07b3b01e1cf
--- /dev/null
+++ b/tests/cases/compiler/declarationEmitTypeAliasTypeParameterExtendingUnknownSymbol.ts
@@ -0,0 +1,3 @@
+// @declaration: true
+
+type A<T extends Unknown> = {}
\ No newline at end of file

From 7750fe1a7c85b9c278a575fe1e3e491ef6ce239d Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Fri, 18 Nov 2016 14:13:56 -0800
Subject: [PATCH 291/421] Always enable evolving types in Javascript files

---
 src/compiler/checker.ts                       |   4 +-
 .../reference/controlFlowJavascript.js        | 203 ++++++++++++++
 .../reference/controlFlowJavascript.symbols   | 216 +++++++++++++++
 .../reference/controlFlowJavascript.types     | 252 ++++++++++++++++++
 tests/cases/compiler/controlFlowJavascript.ts | 107 ++++++++
 5 files changed, 780 insertions(+), 2 deletions(-)
 create mode 100644 tests/baselines/reference/controlFlowJavascript.js
 create mode 100644 tests/baselines/reference/controlFlowJavascript.symbols
 create mode 100644 tests/baselines/reference/controlFlowJavascript.types
 create mode 100644 tests/cases/compiler/controlFlowJavascript.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index e1ef19998d0..6928ce73d31 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -3238,10 +3238,10 @@ namespace ts {
                 return addOptionality(getTypeFromTypeNode(declaration.type), /*optional*/ declaration.questionToken && includeOptionality);
             }
 
-            if (compilerOptions.noImplicitAny &&
+            if ((compilerOptions.noImplicitAny || declaration.flags & NodeFlags.JavaScriptFile) &&
                 declaration.kind === SyntaxKind.VariableDeclaration && !isBindingPattern(declaration.name) &&
                 !(getCombinedModifierFlags(declaration) & ModifierFlags.Export) && !isInAmbientContext(declaration)) {
-                // If --noImplicitAny is on,
+                // 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
                 // initializer or a 'null' or 'undefined' initializer.
                 if (!(getCombinedNodeFlags(declaration) & NodeFlags.Const) && (!declaration.initializer || isNullOrUndefined(declaration.initializer))) {
diff --git a/tests/baselines/reference/controlFlowJavascript.js b/tests/baselines/reference/controlFlowJavascript.js
new file mode 100644
index 00000000000..66518a6567a
--- /dev/null
+++ b/tests/baselines/reference/controlFlowJavascript.js
@@ -0,0 +1,203 @@
+//// [controlFlowJavascript.js]
+
+let cond = true;
+
+// CFA for 'let' and no initializer
+function f1() {
+    let x;
+    if (cond) {
+        x = 1;
+    }
+    if (cond) {
+        x = "hello";
+    }
+    const y = x;  // string | number | undefined
+}
+
+// CFA for 'let' and 'undefined' initializer
+function f2() {
+    let x = undefined;
+    if (cond) {
+        x = 1;
+    }
+    if (cond) {
+        x = "hello";
+    }
+    const y = x;  // string | number | undefined
+}
+
+// CFA for 'let' and 'null' initializer
+function f3() {
+    let x = null;
+    if (cond) {
+        x = 1;
+    }
+    if (cond) {
+        x = "hello";
+    }
+    const y = x;  // string | number | null
+}
+
+// CFA for 'var' with no initializer
+function f5() {
+    var x;
+    if (cond) {
+        x = 1;
+    }
+    if (cond) {
+        x = "hello";
+    }
+    const y = x;  // string | number | undefined
+}
+
+// CFA for 'var' with 'undefined' initializer
+function f6() {
+    var x = undefined;
+    if (cond) {
+        x = 1;
+    }
+    if (cond) {
+        x = "hello";
+    }
+    const y = x;  // string | number | undefined
+}
+
+// CFA for 'var' with 'null' initializer
+function f7() {
+    var x = null;
+    if (cond) {
+        x = 1;
+    }
+    if (cond) {
+        x = "hello";
+    }
+    const y = x;  // string | number | null
+}
+
+// No CFA for captured outer variables
+function f9() {
+    let x;
+    if (cond) {
+        x = 1;
+    }
+    if (cond) {
+        x = "hello";
+    }
+    const y = x;  // string | number | undefined
+    function f() {
+        const z = x;  // any
+    }
+}
+
+// No CFA for captured outer variables
+function f10() {
+    let x;
+    if (cond) {
+        x = 1;
+    }
+    if (cond) {
+        x = "hello";
+    }
+    const y = x;  // string | number | undefined
+    const f = () => {
+        const z = x;  // any
+    };
+}
+
+
+//// [out.js]
+var cond = true;
+// CFA for 'let' and no initializer
+function f1() {
+    var x;
+    if (cond) {
+        x = 1;
+    }
+    if (cond) {
+        x = "hello";
+    }
+    var y = x; // string | number | undefined
+}
+// CFA for 'let' and 'undefined' initializer
+function f2() {
+    var x = undefined;
+    if (cond) {
+        x = 1;
+    }
+    if (cond) {
+        x = "hello";
+    }
+    var y = x; // string | number | undefined
+}
+// CFA for 'let' and 'null' initializer
+function f3() {
+    var x = null;
+    if (cond) {
+        x = 1;
+    }
+    if (cond) {
+        x = "hello";
+    }
+    var y = x; // string | number | null
+}
+// CFA for 'var' with no initializer
+function f5() {
+    var x;
+    if (cond) {
+        x = 1;
+    }
+    if (cond) {
+        x = "hello";
+    }
+    var y = x; // string | number | undefined
+}
+// CFA for 'var' with 'undefined' initializer
+function f6() {
+    var x = undefined;
+    if (cond) {
+        x = 1;
+    }
+    if (cond) {
+        x = "hello";
+    }
+    var y = x; // string | number | undefined
+}
+// CFA for 'var' with 'null' initializer
+function f7() {
+    var x = null;
+    if (cond) {
+        x = 1;
+    }
+    if (cond) {
+        x = "hello";
+    }
+    var y = x; // string | number | null
+}
+// No CFA for captured outer variables
+function f9() {
+    var x;
+    if (cond) {
+        x = 1;
+    }
+    if (cond) {
+        x = "hello";
+    }
+    var y = x; // string | number | undefined
+    function f() {
+        var z = x; // any
+    }
+}
+// No CFA for captured outer variables
+function f10() {
+    var x;
+    if (cond) {
+        x = 1;
+    }
+    if (cond) {
+        x = "hello";
+    }
+    var y = x; // string | number | undefined
+    var f = function () {
+        var z = x; // any
+    };
+}
diff --git a/tests/baselines/reference/controlFlowJavascript.symbols b/tests/baselines/reference/controlFlowJavascript.symbols
new file mode 100644
index 00000000000..b3316de3b4e
--- /dev/null
+++ b/tests/baselines/reference/controlFlowJavascript.symbols
@@ -0,0 +1,216 @@
+=== tests/cases/compiler/controlFlowJavascript.js ===
+
+let cond = true;
+>cond : Symbol(cond, Decl(controlFlowJavascript.js, 1, 3))
+
+// CFA for 'let' and no initializer
+function f1() {
+>f1 : Symbol(f1, Decl(controlFlowJavascript.js, 1, 16))
+
+    let x;
+>x : Symbol(x, Decl(controlFlowJavascript.js, 5, 7))
+
+    if (cond) {
+>cond : Symbol(cond, Decl(controlFlowJavascript.js, 1, 3))
+
+        x = 1;
+>x : Symbol(x, Decl(controlFlowJavascript.js, 5, 7))
+    }
+    if (cond) {
+>cond : Symbol(cond, Decl(controlFlowJavascript.js, 1, 3))
+
+        x = "hello";
+>x : Symbol(x, Decl(controlFlowJavascript.js, 5, 7))
+    }
+    const y = x;  // string | number | undefined
+>y : Symbol(y, Decl(controlFlowJavascript.js, 12, 9))
+>x : Symbol(x, Decl(controlFlowJavascript.js, 5, 7))
+}
+
+// CFA for 'let' and 'undefined' initializer
+function f2() {
+>f2 : Symbol(f2, Decl(controlFlowJavascript.js, 13, 1))
+
+    let x = undefined;
+>x : Symbol(x, Decl(controlFlowJavascript.js, 17, 7))
+>undefined : Symbol(undefined)
+
+    if (cond) {
+>cond : Symbol(cond, Decl(controlFlowJavascript.js, 1, 3))
+
+        x = 1;
+>x : Symbol(x, Decl(controlFlowJavascript.js, 17, 7))
+    }
+    if (cond) {
+>cond : Symbol(cond, Decl(controlFlowJavascript.js, 1, 3))
+
+        x = "hello";
+>x : Symbol(x, Decl(controlFlowJavascript.js, 17, 7))
+    }
+    const y = x;  // string | number | undefined
+>y : Symbol(y, Decl(controlFlowJavascript.js, 24, 9))
+>x : Symbol(x, Decl(controlFlowJavascript.js, 17, 7))
+}
+
+// CFA for 'let' and 'null' initializer
+function f3() {
+>f3 : Symbol(f3, Decl(controlFlowJavascript.js, 25, 1))
+
+    let x = null;
+>x : Symbol(x, Decl(controlFlowJavascript.js, 29, 7))
+
+    if (cond) {
+>cond : Symbol(cond, Decl(controlFlowJavascript.js, 1, 3))
+
+        x = 1;
+>x : Symbol(x, Decl(controlFlowJavascript.js, 29, 7))
+    }
+    if (cond) {
+>cond : Symbol(cond, Decl(controlFlowJavascript.js, 1, 3))
+
+        x = "hello";
+>x : Symbol(x, Decl(controlFlowJavascript.js, 29, 7))
+    }
+    const y = x;  // string | number | null
+>y : Symbol(y, Decl(controlFlowJavascript.js, 36, 9))
+>x : Symbol(x, Decl(controlFlowJavascript.js, 29, 7))
+}
+
+// CFA for 'var' with no initializer
+function f5() {
+>f5 : Symbol(f5, Decl(controlFlowJavascript.js, 37, 1))
+
+    var x;
+>x : Symbol(x, Decl(controlFlowJavascript.js, 41, 7))
+
+    if (cond) {
+>cond : Symbol(cond, Decl(controlFlowJavascript.js, 1, 3))
+
+        x = 1;
+>x : Symbol(x, Decl(controlFlowJavascript.js, 41, 7))
+    }
+    if (cond) {
+>cond : Symbol(cond, Decl(controlFlowJavascript.js, 1, 3))
+
+        x = "hello";
+>x : Symbol(x, Decl(controlFlowJavascript.js, 41, 7))
+    }
+    const y = x;  // string | number | undefined
+>y : Symbol(y, Decl(controlFlowJavascript.js, 48, 9))
+>x : Symbol(x, Decl(controlFlowJavascript.js, 41, 7))
+}
+
+// CFA for 'var' with 'undefined' initializer
+function f6() {
+>f6 : Symbol(f6, Decl(controlFlowJavascript.js, 49, 1))
+
+    var x = undefined;
+>x : Symbol(x, Decl(controlFlowJavascript.js, 53, 7))
+>undefined : Symbol(undefined)
+
+    if (cond) {
+>cond : Symbol(cond, Decl(controlFlowJavascript.js, 1, 3))
+
+        x = 1;
+>x : Symbol(x, Decl(controlFlowJavascript.js, 53, 7))
+    }
+    if (cond) {
+>cond : Symbol(cond, Decl(controlFlowJavascript.js, 1, 3))
+
+        x = "hello";
+>x : Symbol(x, Decl(controlFlowJavascript.js, 53, 7))
+    }
+    const y = x;  // string | number | undefined
+>y : Symbol(y, Decl(controlFlowJavascript.js, 60, 9))
+>x : Symbol(x, Decl(controlFlowJavascript.js, 53, 7))
+}
+
+// CFA for 'var' with 'null' initializer
+function f7() {
+>f7 : Symbol(f7, Decl(controlFlowJavascript.js, 61, 1))
+
+    var x = null;
+>x : Symbol(x, Decl(controlFlowJavascript.js, 65, 7))
+
+    if (cond) {
+>cond : Symbol(cond, Decl(controlFlowJavascript.js, 1, 3))
+
+        x = 1;
+>x : Symbol(x, Decl(controlFlowJavascript.js, 65, 7))
+    }
+    if (cond) {
+>cond : Symbol(cond, Decl(controlFlowJavascript.js, 1, 3))
+
+        x = "hello";
+>x : Symbol(x, Decl(controlFlowJavascript.js, 65, 7))
+    }
+    const y = x;  // string | number | null
+>y : Symbol(y, Decl(controlFlowJavascript.js, 72, 9))
+>x : Symbol(x, Decl(controlFlowJavascript.js, 65, 7))
+}
+
+// No CFA for captured outer variables
+function f9() {
+>f9 : Symbol(f9, Decl(controlFlowJavascript.js, 73, 1))
+
+    let x;
+>x : Symbol(x, Decl(controlFlowJavascript.js, 77, 7))
+
+    if (cond) {
+>cond : Symbol(cond, Decl(controlFlowJavascript.js, 1, 3))
+
+        x = 1;
+>x : Symbol(x, Decl(controlFlowJavascript.js, 77, 7))
+    }
+    if (cond) {
+>cond : Symbol(cond, Decl(controlFlowJavascript.js, 1, 3))
+
+        x = "hello";
+>x : Symbol(x, Decl(controlFlowJavascript.js, 77, 7))
+    }
+    const y = x;  // string | number | undefined
+>y : Symbol(y, Decl(controlFlowJavascript.js, 84, 9))
+>x : Symbol(x, Decl(controlFlowJavascript.js, 77, 7))
+
+    function f() {
+>f : Symbol(f, Decl(controlFlowJavascript.js, 84, 16))
+
+        const z = x;  // any
+>z : Symbol(z, Decl(controlFlowJavascript.js, 86, 13))
+>x : Symbol(x, Decl(controlFlowJavascript.js, 77, 7))
+    }
+}
+
+// No CFA for captured outer variables
+function f10() {
+>f10 : Symbol(f10, Decl(controlFlowJavascript.js, 88, 1))
+
+    let x;
+>x : Symbol(x, Decl(controlFlowJavascript.js, 92, 7))
+
+    if (cond) {
+>cond : Symbol(cond, Decl(controlFlowJavascript.js, 1, 3))
+
+        x = 1;
+>x : Symbol(x, Decl(controlFlowJavascript.js, 92, 7))
+    }
+    if (cond) {
+>cond : Symbol(cond, Decl(controlFlowJavascript.js, 1, 3))
+
+        x = "hello";
+>x : Symbol(x, Decl(controlFlowJavascript.js, 92, 7))
+    }
+    const y = x;  // string | number | undefined
+>y : Symbol(y, Decl(controlFlowJavascript.js, 99, 9))
+>x : Symbol(x, Decl(controlFlowJavascript.js, 92, 7))
+
+    const f = () => {
+>f : Symbol(f, Decl(controlFlowJavascript.js, 100, 9))
+
+        const z = x;  // any
+>z : Symbol(z, Decl(controlFlowJavascript.js, 101, 13))
+>x : Symbol(x, Decl(controlFlowJavascript.js, 92, 7))
+
+    };
+}
+
diff --git a/tests/baselines/reference/controlFlowJavascript.types b/tests/baselines/reference/controlFlowJavascript.types
new file mode 100644
index 00000000000..0b88c62cb78
--- /dev/null
+++ b/tests/baselines/reference/controlFlowJavascript.types
@@ -0,0 +1,252 @@
+=== tests/cases/compiler/controlFlowJavascript.js ===
+
+let cond = true;
+>cond : boolean
+>true : true
+
+// CFA for 'let' and no initializer
+function f1() {
+>f1 : () => void
+
+    let x;
+>x : any
+
+    if (cond) {
+>cond : boolean
+
+        x = 1;
+>x = 1 : 1
+>x : any
+>1 : 1
+    }
+    if (cond) {
+>cond : boolean
+
+        x = "hello";
+>x = "hello" : "hello"
+>x : any
+>"hello" : "hello"
+    }
+    const y = x;  // string | number | undefined
+>y : string | number
+>x : string | number
+}
+
+// CFA for 'let' and 'undefined' initializer
+function f2() {
+>f2 : () => void
+
+    let x = undefined;
+>x : any
+>undefined : undefined
+
+    if (cond) {
+>cond : boolean
+
+        x = 1;
+>x = 1 : 1
+>x : any
+>1 : 1
+    }
+    if (cond) {
+>cond : boolean
+
+        x = "hello";
+>x = "hello" : "hello"
+>x : any
+>"hello" : "hello"
+    }
+    const y = x;  // string | number | undefined
+>y : string | number
+>x : string | number
+}
+
+// CFA for 'let' and 'null' initializer
+function f3() {
+>f3 : () => void
+
+    let x = null;
+>x : any
+>null : null
+
+    if (cond) {
+>cond : boolean
+
+        x = 1;
+>x = 1 : 1
+>x : any
+>1 : 1
+    }
+    if (cond) {
+>cond : boolean
+
+        x = "hello";
+>x = "hello" : "hello"
+>x : any
+>"hello" : "hello"
+    }
+    const y = x;  // string | number | null
+>y : string | number
+>x : string | number
+}
+
+// CFA for 'var' with no initializer
+function f5() {
+>f5 : () => void
+
+    var x;
+>x : any
+
+    if (cond) {
+>cond : boolean
+
+        x = 1;
+>x = 1 : 1
+>x : any
+>1 : 1
+    }
+    if (cond) {
+>cond : boolean
+
+        x = "hello";
+>x = "hello" : "hello"
+>x : any
+>"hello" : "hello"
+    }
+    const y = x;  // string | number | undefined
+>y : string | number
+>x : string | number
+}
+
+// CFA for 'var' with 'undefined' initializer
+function f6() {
+>f6 : () => void
+
+    var x = undefined;
+>x : any
+>undefined : undefined
+
+    if (cond) {
+>cond : boolean
+
+        x = 1;
+>x = 1 : 1
+>x : any
+>1 : 1
+    }
+    if (cond) {
+>cond : boolean
+
+        x = "hello";
+>x = "hello" : "hello"
+>x : any
+>"hello" : "hello"
+    }
+    const y = x;  // string | number | undefined
+>y : string | number
+>x : string | number
+}
+
+// CFA for 'var' with 'null' initializer
+function f7() {
+>f7 : () => void
+
+    var x = null;
+>x : any
+>null : null
+
+    if (cond) {
+>cond : boolean
+
+        x = 1;
+>x = 1 : 1
+>x : any
+>1 : 1
+    }
+    if (cond) {
+>cond : boolean
+
+        x = "hello";
+>x = "hello" : "hello"
+>x : any
+>"hello" : "hello"
+    }
+    const y = x;  // string | number | null
+>y : string | number
+>x : string | number
+}
+
+// No CFA for captured outer variables
+function f9() {
+>f9 : () => void
+
+    let x;
+>x : any
+
+    if (cond) {
+>cond : boolean
+
+        x = 1;
+>x = 1 : 1
+>x : any
+>1 : 1
+    }
+    if (cond) {
+>cond : boolean
+
+        x = "hello";
+>x = "hello" : "hello"
+>x : any
+>"hello" : "hello"
+    }
+    const y = x;  // string | number | undefined
+>y : string | number
+>x : string | number
+
+    function f() {
+>f : () => void
+
+        const z = x;  // any
+>z : any
+>x : any
+    }
+}
+
+// No CFA for captured outer variables
+function f10() {
+>f10 : () => void
+
+    let x;
+>x : any
+
+    if (cond) {
+>cond : boolean
+
+        x = 1;
+>x = 1 : 1
+>x : any
+>1 : 1
+    }
+    if (cond) {
+>cond : boolean
+
+        x = "hello";
+>x = "hello" : "hello"
+>x : any
+>"hello" : "hello"
+    }
+    const y = x;  // string | number | undefined
+>y : string | number
+>x : string | number
+
+    const f = () => {
+>f : () => void
+>() => {        const z = x;  // any    } : () => void
+
+        const z = x;  // any
+>z : any
+>x : any
+
+    };
+}
+
diff --git a/tests/cases/compiler/controlFlowJavascript.ts b/tests/cases/compiler/controlFlowJavascript.ts
new file mode 100644
index 00000000000..b2886a2233a
--- /dev/null
+++ b/tests/cases/compiler/controlFlowJavascript.ts
@@ -0,0 +1,107 @@
+// @allowJs: true
+// @Filename: controlFlowJavascript.js
+// @out: out.js
+
+let cond = true;
+
+// CFA for 'let' and no initializer
+function f1() {
+    let x;
+    if (cond) {
+        x = 1;
+    }
+    if (cond) {
+        x = "hello";
+    }
+    const y = x;  // string | number | undefined
+}
+
+// CFA for 'let' and 'undefined' initializer
+function f2() {
+    let x = undefined;
+    if (cond) {
+        x = 1;
+    }
+    if (cond) {
+        x = "hello";
+    }
+    const y = x;  // string | number | undefined
+}
+
+// CFA for 'let' and 'null' initializer
+function f3() {
+    let x = null;
+    if (cond) {
+        x = 1;
+    }
+    if (cond) {
+        x = "hello";
+    }
+    const y = x;  // string | number | null
+}
+
+// CFA for 'var' with no initializer
+function f5() {
+    var x;
+    if (cond) {
+        x = 1;
+    }
+    if (cond) {
+        x = "hello";
+    }
+    const y = x;  // string | number | undefined
+}
+
+// CFA for 'var' with 'undefined' initializer
+function f6() {
+    var x = undefined;
+    if (cond) {
+        x = 1;
+    }
+    if (cond) {
+        x = "hello";
+    }
+    const y = x;  // string | number | undefined
+}
+
+// CFA for 'var' with 'null' initializer
+function f7() {
+    var x = null;
+    if (cond) {
+        x = 1;
+    }
+    if (cond) {
+        x = "hello";
+    }
+    const y = x;  // string | number | null
+}
+
+// No CFA for captured outer variables
+function f9() {
+    let x;
+    if (cond) {
+        x = 1;
+    }
+    if (cond) {
+        x = "hello";
+    }
+    const y = x;  // string | number | undefined
+    function f() {
+        const z = x;  // any
+    }
+}
+
+// No CFA for captured outer variables
+function f10() {
+    let x;
+    if (cond) {
+        x = 1;
+    }
+    if (cond) {
+        x = "hello";
+    }
+    const y = x;  // string | number | undefined
+    const f = () => {
+        const z = x;  // any
+    };
+}

From ab84cd0647719a468e4bd6f7b911a094fe7c685d Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Fri, 18 Nov 2016 15:03:40 -0800
Subject: [PATCH 292/421] Improve readability of types and names

---
 src/compiler/checker.ts   |  2 +-
 src/compiler/types.ts     |  2 +-
 src/compiler/utilities.ts | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 0803814bc14..94bbd8823e9 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -4854,7 +4854,7 @@ namespace ts {
                 if (node.type && node.type.kind === SyntaxKind.JSDocOptionalType) {
                     return true;
                 }
-                const paramTags = getJSDocParameterTag(node);
+                const paramTags = getJSDocParameterTags(node);
                 if (paramTags) {
                     for (const paramTag of paramTags) {
                         if (paramTag.isBracketed) {
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 8b648000273..51805228e48 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -498,7 +498,7 @@ namespace ts {
         /* @internal */ original?: Node;                // The original node if this is an updated node.
         /* @internal */ startsOnNewLine?: boolean;      // Whether a synthesized node should start on a new line (used by transforms).
         /* @internal */ jsDocComments?: JSDoc[];        // JSDoc for the node, if it has any.
-        /* @internal */ jsDocCache?: (JSDoc | JSDocParameterTag)[]; // JSDoc for the node, plus JSDoc retrieved from its parents
+        /* @internal */ jsDocCache?: (JSDoc | JSDocTag)[]; // JSDoc for the node, plus JSDoc and tags retrieved from its parents
         /* @internal */ symbol?: Symbol;                // Symbol declared by node (initialized by binding)
         /* @internal */ locals?: SymbolTable;           // Locals associated with node (initialized by binding)
         /* @internal */ nextContainer?: Node;           // Next container in declaration order (initialized by binding)
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index e5fd8b067b0..08eaa8033ae 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -1427,7 +1427,7 @@ namespace ts {
             for (const doc of docs) {
                 if (doc.kind === SyntaxKind.JSDocParameterTag) {
                     if (doc.kind === kind) {
-                        result.push(doc as JSDocParameterTag);
+                        result.push(doc as JSDocTag);
                     }
                 }
                 else {
@@ -1442,8 +1442,8 @@ namespace ts {
         return node && firstOrUndefined(getJSDocTags(node, kind));
     }
 
-   function getJSDocs(node: Node): (JSDoc | JSDocParameterTag)[] {
-        let cache: (JSDoc | JSDocParameterTag)[] = node.jsDocCache;
+   function getJSDocs(node: Node): (JSDoc | JSDocTag)[] {
+        let cache: (JSDoc | JSDocTag)[] = node.jsDocCache;
         if (!cache) {
             getJSDocsWorker(node);
             node.jsDocCache = cache;
@@ -1491,7 +1491,7 @@ namespace ts {
 
             // Pull parameter comments from declaring function as well
             if (node.kind === SyntaxKind.Parameter) {
-                cache = concatenate(cache, getJSDocParameterTag(node));
+                cache = concatenate(cache, getJSDocParameterTags(node));
             }
 
             if (isVariableLike(node) && node.initializer) {
@@ -1502,7 +1502,7 @@ namespace ts {
         }
     }
 
-    export function getJSDocParameterTag(param: Node): JSDocParameterTag[] {
+    export function getJSDocParameterTags(param: Node): JSDocParameterTag[] {
         if (!isParameter(param)) {
             return undefined;
         }
@@ -1530,7 +1530,7 @@ namespace ts {
     export function getJSDocType(node: Node): JSDocType {
         let tag: JSDocTypeTag | JSDocParameterTag = getFirstJSDocTag(node, SyntaxKind.JSDocTypeTag) as JSDocTypeTag;
         if (!tag && node.kind === SyntaxKind.Parameter) {
-            const paramTags = getJSDocParameterTag(node);
+            const paramTags = getJSDocParameterTags(node);
             if (paramTags) {
                 tag = find(paramTags, tag => !!tag.typeExpression);
             }
@@ -1558,7 +1558,7 @@ namespace ts {
     export function isRestParameter(node: ParameterDeclaration) {
         if (node && (node.flags & NodeFlags.JavaScriptFile)) {
             if (node.type && node.type.kind === SyntaxKind.JSDocVariadicType ||
-                forEach(getJSDocParameterTag(node),
+                forEach(getJSDocParameterTags(node),
                         t => t.typeExpression && t.typeExpression.type.kind === SyntaxKind.JSDocVariadicType)) {
                 return true;
             }

From 7caee79ce7aa698a84f98f7a88796d56c5e90624 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Fri, 18 Nov 2016 15:10:19 -0800
Subject: [PATCH 293/421] Rename getJSDocComments -> getCommentsFromJSDoc

---
 src/compiler/utilities.ts | 2 +-
 src/services/jsDoc.ts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 08eaa8033ae..5669ac9be8d 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -1416,7 +1416,7 @@ namespace ts {
             (<JSDocFunctionType>node).parameters[0].type.kind === SyntaxKind.JSDocConstructorType;
     }
 
-    export function getJSDocComments(node: Node): string[] {
+    export function getCommentsFromJSDoc(node: Node): string[] {
         return map(getJSDocs(node), doc => doc.comment);
     }
 
diff --git a/src/services/jsDoc.ts b/src/services/jsDoc.ts
index 24e99cf5c77..3369ac23223 100644
--- a/src/services/jsDoc.ts
+++ b/src/services/jsDoc.ts
@@ -52,7 +52,7 @@ namespace ts.JsDoc {
         // from Array<T> - Array<string> and Array<number>
         const documentationComment = <SymbolDisplayPart[]>[];
         forEachUnique(declarations, declaration => {
-            const comments = getJSDocComments(declaration);
+            const comments = getCommentsFromJSDoc(declaration);
             if (!comments) {
                 return;
             }

From 91e6bce34c3a2d771b815cd73c176018186b31b5 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Fri, 18 Nov 2016 15:44:15 -0800
Subject: [PATCH 294/421] Address PR comments

---
 src/compiler/binder.ts        |  4 ++--
 src/compiler/parser.ts        | 20 ++++++++++----------
 src/compiler/types.ts         |  4 ++--
 src/compiler/utilities.ts     | 12 ++++++------
 src/services/navigationBar.ts |  4 ++--
 src/services/services.ts      |  6 +++---
 src/services/utilities.ts     |  8 ++++----
 7 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index 1afe51db021..c2bfce10e57 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -599,8 +599,8 @@ namespace ts {
             // Binding of JsDocComment should be done before the current block scope container changes.
             // because the scope of JsDocComment should not be affected by whether the current node is a
             // container or not.
-            if (isInJavaScriptFile(node) && node.jsDocComments) {
-                forEach(node.jsDocComments, bind);
+            if (isInJavaScriptFile(node) && node.jsDoc) {
+                forEach(node.jsDoc, bind);
             }
             if (checkUnreachable(node)) {
                 bindEachChild(node);
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index a3c21eaf8dc..d286a9d9dac 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -689,10 +689,10 @@ namespace ts {
                         continue;
                     }
 
-                    if (!node.jsDocComments) {
-                        node.jsDocComments = [];
+                    if (!node.jsDoc) {
+                        node.jsDoc = [];
                     }
-                    node.jsDocComments.push(jsDoc);
+                    node.jsDoc.push(jsDoc);
                 }
             }
 
@@ -719,11 +719,11 @@ namespace ts {
                     const saveParent = parent;
                     parent = n;
                     forEachChild(n, visitNode);
-                    if (n.jsDocComments) {
-                        for (const jsDocComment of n.jsDocComments) {
-                            jsDocComment.parent = n;
-                            parent = jsDocComment;
-                            forEachChild(jsDocComment, visitNode);
+                    if (n.jsDoc) {
+                        for (const jsDoc of n.jsDoc) {
+                            jsDoc.parent = n;
+                            parent = jsDoc;
+                            forEachChild(jsDoc, visitNode);
                         }
                     }
                     parent = saveParent;
@@ -6954,8 +6954,8 @@ namespace ts {
                 }
 
                 forEachChild(node, visitNode, visitArray);
-                if (node.jsDocComments) {
-                    for (const jsDocComment of node.jsDocComments) {
+                if (node.jsDoc) {
+                    for (const jsDocComment of node.jsDoc) {
                         forEachChild(jsDocComment, visitNode, visitArray);
                     }
                 }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 51805228e48..2a4b9e66d82 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -497,8 +497,8 @@ namespace ts {
         parent?: Node;                                  // Parent node (initialized by binding)
         /* @internal */ original?: Node;                // The original node if this is an updated node.
         /* @internal */ startsOnNewLine?: boolean;      // Whether a synthesized node should start on a new line (used by transforms).
-        /* @internal */ jsDocComments?: JSDoc[];        // JSDoc for the node, if it has any.
-        /* @internal */ jsDocCache?: (JSDoc | JSDocTag)[]; // JSDoc for the node, plus JSDoc and tags retrieved from its parents
+        /* @internal */ jsDoc?: JSDoc[];                // JSDoc that directly precedes this node
+        /* @internal */ jsDocCache?: (JSDoc | JSDocTag)[]; // All JSDoc that applies to the node, including parent docs and @param tags
         /* @internal */ symbol?: Symbol;                // Symbol declared by node (initialized by binding)
         /* @internal */ locals?: SymbolTable;           // Locals associated with node (initialized by binding)
         /* @internal */ nextContainer?: Node;           // Next container in declaration order (initialized by binding)
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 5669ac9be8d..1d14854cd1f 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -239,7 +239,7 @@ namespace ts {
         return !nodeIsMissing(node);
     }
 
-    export function getTokenPosOfNode(node: Node, sourceFile?: SourceFile, includeJsDocComment?: boolean): number {
+    export function getTokenPosOfNode(node: Node, sourceFile?: SourceFile, includeJsDoc?: boolean): number {
         // With nodes that have no width (i.e. 'Missing' nodes), we actually *don't*
         // want to skip trivia because this will launch us forward to the next token.
         if (nodeIsMissing(node)) {
@@ -250,8 +250,8 @@ namespace ts {
             return skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos, /*stopAfterLineBreak*/ false, /*stopAtComments*/ true);
         }
 
-        if (includeJsDocComment && node.jsDocComments && node.jsDocComments.length > 0) {
-            return getTokenPosOfNode(node.jsDocComments[0]);
+        if (includeJsDoc && node.jsDoc && node.jsDoc.length > 0) {
+            return getTokenPosOfNode(node.jsDoc[0]);
         }
 
         // For a syntax list, it is possible that one of its children has JSDocComment nodes, while
@@ -259,7 +259,7 @@ namespace ts {
         // 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 === SyntaxKind.SyntaxList && (<SyntaxList>node)._children.length > 0) {
-            return getTokenPosOfNode((<SyntaxList>node)._children[0], sourceFile, includeJsDocComment);
+            return getTokenPosOfNode((<SyntaxList>node)._children[0], sourceFile, includeJsDoc);
         }
 
         return skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos);
@@ -1495,10 +1495,10 @@ namespace ts {
             }
 
             if (isVariableLike(node) && node.initializer) {
-                cache = concatenate(cache, node.initializer.jsDocComments);
+                cache = concatenate(cache, node.initializer.jsDoc);
             }
 
-            cache = concatenate(cache, node.jsDocComments);
+            cache = concatenate(cache, node.jsDoc);
         }
     }
 
diff --git a/src/services/navigationBar.ts b/src/services/navigationBar.ts
index 51ce9b6001d..1cbaa3d640f 100644
--- a/src/services/navigationBar.ts
+++ b/src/services/navigationBar.ts
@@ -225,8 +225,8 @@ namespace ts.NavigationBar {
                 break;
 
             default:
-                forEach(node.jsDocComments, jsDocComment => {
-                    forEach(jsDocComment.tags, tag => {
+                forEach(node.jsDoc, jsDoc => {
+                    forEach(jsDoc.tags, tag => {
                         if (tag.kind === SyntaxKind.JSDocTypedefTag) {
                             addLeafNode(tag);
                         }
diff --git a/src/services/services.ts b/src/services/services.ts
index 3c0b7838314..f826a8850fe 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -1956,9 +1956,9 @@ namespace ts {
                     break;
                 default:
                     forEachChild(node, walk);
-                    if (node.jsDocComments) {
-                        for (const jsDocComment of node.jsDocComments) {
-                            forEachChild(jsDocComment, walk);
+                    if (node.jsDoc) {
+                        for (const jsDoc of node.jsDoc) {
+                            forEachChild(jsDoc, walk);
                         }
                     }
             }
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
index 82b13f82327..e19fdc0a84a 100644
--- a/src/services/utilities.ts
+++ b/src/services/utilities.ts
@@ -951,10 +951,10 @@ namespace ts {
         }
 
         if (node) {
-            if (node.jsDocComments) {
-                for (const jsDocComment of node.jsDocComments) {
-                    if (jsDocComment.tags) {
-                        for (const tag of jsDocComment.tags) {
+            if (node.jsDoc) {
+                for (const jsDoc of node.jsDoc) {
+                    if (jsDoc.tags) {
+                        for (const tag of jsDoc.tags) {
                             if (tag.pos <= position && position <= tag.end) {
                                 return tag;
                             }

From 0c5429d3b704e557c5be8573a6faba4da30f10a2 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Fri, 18 Nov 2016 15:48:31 -0800
Subject: [PATCH 295/421] Add missed jsDoc rename in services' Node
 implementation

Why would you implement an interface using a *class*?
---
 src/services/services.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/services/services.ts b/src/services/services.ts
index f826a8850fe..847967b2be9 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -45,7 +45,7 @@ namespace ts {
         public end: number;
         public flags: NodeFlags;
         public parent: Node;
-        public jsDocComments: JSDoc[];
+        public jsDoc: JSDoc[];
         public original: Node;
         public transformFlags: TransformFlags;
         private _children: Node[];
@@ -154,8 +154,8 @@ namespace ts {
                     pos = nodes.end;
                 };
                 // jsDocComments need to be the first children
-                if (this.jsDocComments) {
-                    for (const jsDocComment of this.jsDocComments) {
+                if (this.jsDoc) {
+                    for (const jsDocComment of this.jsDoc) {
                         processNode(jsDocComment);
                     }
                 }

From 5a9451ae238925d27f7ba14c58083339605c30a9 Mon Sep 17 00:00:00 2001
From: Jason Ramsay <jasonra@microsoft.com>
Date: Fri, 18 Nov 2016 17:46:06 -0800
Subject: [PATCH 296/421] Rename typingOptions.enableAutoDiscovery to
 typeAcquisition.enable

---
 Jakefile.js                                   |  2 +-
 src/compiler/commandLineParser.ts             | 24 ++---
 src/compiler/diagnosticMessages.json          |  2 +-
 src/compiler/types.ts                         |  8 +-
 src/harness/tsconfig.json                     |  2 +-
 ...n.ts => convertTypeAcquisitionFromJson.ts} | 90 +++++++++----------
 .../unittests/tsserverProjectSystem.ts        |  8 +-
 src/harness/unittests/typingsInstaller.ts     | 52 +++++------
 src/server/editorServices.ts                  | 24 ++---
 src/server/lsHost.ts                          |  2 +-
 src/server/project.ts                         | 44 ++++-----
 src/server/protocol.ts                        |  4 +-
 src/server/server.ts                          |  4 +-
 src/server/types.d.ts                         |  4 +-
 src/server/typingsCache.ts                    | 22 ++---
 .../typingsInstaller/typingsInstaller.ts      |  4 +-
 src/server/utilities.ts                       |  6 +-
 src/services/jsTyping.ts                      | 10 +--
 src/services/shims.ts                         |  6 +-
 19 files changed, 159 insertions(+), 159 deletions(-)
 rename src/harness/unittests/{convertTypingOptionsFromJson.ts => convertTypeAcquisitionFromJson.ts} (63%)

diff --git a/Jakefile.js b/Jakefile.js
index 087bbb67511..dcdebdf8ea5 100644
--- a/Jakefile.js
+++ b/Jakefile.js
@@ -256,7 +256,7 @@ var harnessSources = harnessCoreSources.concat([
     "commandLineParsing.ts",
     "configurationExtension.ts",
     "convertCompilerOptionsFromJson.ts",
-    "convertTypingOptionsFromJson.ts",
+    "convertTypeAcquisitionFromJson.ts",
     "tsserverProjectSystem.ts",
     "compileOnSave.ts",
     "typingsInstaller.ts",
diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index 26877de43c4..d54af31a985 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -462,9 +462,9 @@ namespace ts {
     ];
 
     /* @internal */
-    export let typingOptionDeclarations: CommandLineOption[] = [
+    export let typeAcquisitionDeclarations: CommandLineOption[] = [
         {
-            name: "enableAutoDiscovery",
+            name: "enable",
             type: "boolean",
         },
         {
@@ -835,7 +835,7 @@ namespace ts {
             return {
                 options: {},
                 fileNames: [],
-                typingOptions: {},
+                typeAcquisition: {},
                 raw: json,
                 errors: [createCompilerDiagnostic(Diagnostics.Circularity_detected_while_resolving_configuration_Colon_0, [...resolutionStack, resolvedPath].join(" -> "))],
                 wildcardDirectories: {}
@@ -843,7 +843,7 @@ namespace ts {
         }
 
         let options: CompilerOptions = convertCompilerOptionsFromJsonWorker(json["compilerOptions"], basePath, errors, configFileName);
-        const typingOptions: TypingOptions = convertTypingOptionsFromJsonWorker(json["typingOptions"], basePath, errors, configFileName);
+        const typeAcquisition: TypeAcquisition = convertTypeAcquisitionFromJsonWorker(json["typeAcquisition"], basePath, errors, configFileName);
 
         if (json["extends"]) {
             let [include, exclude, files, baseOptions]: [string[], string[], string[], CompilerOptions] = [undefined, undefined, undefined, {}];
@@ -874,7 +874,7 @@ namespace ts {
         return {
             options,
             fileNames,
-            typingOptions,
+            typeAcquisition,
             raw: json,
             errors,
             wildcardDirectories,
@@ -996,9 +996,9 @@ namespace ts {
         return { options, errors };
     }
 
-    export function convertTypingOptionsFromJson(jsonOptions: any, basePath: string, configFileName?: string): { options: TypingOptions, errors: Diagnostic[] } {
+    export function convertTypeAcquisitionFromJson(jsonOptions: any, basePath: string, configFileName?: string): { options: TypeAcquisition, errors: Diagnostic[] } {
         const errors: Diagnostic[] = [];
-        const options = convertTypingOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName);
+        const options = convertTypeAcquisitionFromJsonWorker(jsonOptions, basePath, errors, configFileName);
         return { options, errors };
     }
 
@@ -1012,16 +1012,16 @@ namespace ts {
         return options;
     }
 
-    function convertTypingOptionsFromJsonWorker(jsonOptions: any,
-        basePath: string, errors: Diagnostic[], configFileName?: string): TypingOptions {
+    function convertTypeAcquisitionFromJsonWorker(jsonOptions: any,
+        basePath: string, errors: Diagnostic[], configFileName?: string): TypeAcquisition {
 
-        const options: TypingOptions = { enableAutoDiscovery: getBaseFileName(configFileName) === "jsconfig.json", include: [], exclude: [] };
-        convertOptionsFromJson(typingOptionDeclarations, jsonOptions, basePath, options, Diagnostics.Unknown_typing_option_0, errors);
+        const options: TypeAcquisition = { enable: getBaseFileName(configFileName) === "jsconfig.json", include: [], exclude: [] };
+        convertOptionsFromJson(typeAcquisitionDeclarations, jsonOptions, basePath, options, Diagnostics.Unknown_type_acquisition_option_0, errors);
         return options;
     }
 
     function convertOptionsFromJson(optionDeclarations: CommandLineOption[], jsonOptions: any, basePath: string,
-        defaultOptions: CompilerOptions | TypingOptions, diagnosticMessage: DiagnosticMessage, errors: Diagnostic[]) {
+        defaultOptions: CompilerOptions | TypeAcquisition, diagnosticMessage: DiagnosticMessage, errors: Diagnostic[]) {
 
         if (!jsonOptions) {
             return;
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 7f12558cee5..b823b1ed6b3 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -3137,7 +3137,7 @@
         "category": "Error",
         "code": 17009
     },
-    "Unknown typing option '{0}'.": {
+    "Unknown type acquisition option '{0}'.": {
         "category": "Error",
         "code": 17010
     },
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 2b8b6fe294e..5cd5b15d653 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -3198,8 +3198,8 @@ namespace ts {
         [option: string]: CompilerOptionsValue | undefined;
     }
 
-    export interface TypingOptions {
-        enableAutoDiscovery?: boolean;
+    export interface TypeAcquisition {
+        enable?: boolean;
         include?: string[];
         exclude?: string[];
         [option: string]: string[] | boolean | undefined;
@@ -3210,7 +3210,7 @@ namespace ts {
         projectRootPath: string;                        // The path to the project root directory
         safeListPath: string;                           // The path used to retrieve the safe list
         packageNameToTypingLocation: Map<string>;       // The map of package names to their cached typing locations
-        typingOptions: TypingOptions;                   // Used to customize the typing inference process
+        typeAcquisition: TypeAcquisition;               // Used to customize the type acquisition process
         compilerOptions: CompilerOptions;               // Used as a source for typing inference
         unresolvedImports: ReadonlyArray<string>;       // List of unresolved module ids from imports
     }
@@ -3275,7 +3275,7 @@ namespace ts {
     /** Either a parsed command line or a parsed tsconfig.json */
     export interface ParsedCommandLine {
         options: CompilerOptions;
-        typingOptions?: TypingOptions;
+        typeAcquisition?: TypeAcquisition;
         fileNames: string[];
         raw?: any;
         errors: Diagnostic[];
diff --git a/src/harness/tsconfig.json b/src/harness/tsconfig.json
index d3a814f26ca..f4057057e4e 100644
--- a/src/harness/tsconfig.json
+++ b/src/harness/tsconfig.json
@@ -108,7 +108,7 @@
         "./unittests/commandLineParsing.ts",
         "./unittests/configurationExtension.ts",
         "./unittests/convertCompilerOptionsFromJson.ts",
-        "./unittests/convertTypingOptionsFromJson.ts",
+        "./unittests/convertTypeAcquisitionFromJson.ts",
         "./unittests/tsserverProjectSystem.ts",
         "./unittests/matchFiles.ts",
         "./unittests/initializeTSConfig.ts",
diff --git a/src/harness/unittests/convertTypingOptionsFromJson.ts b/src/harness/unittests/convertTypeAcquisitionFromJson.ts
similarity index 63%
rename from src/harness/unittests/convertTypingOptionsFromJson.ts
rename to src/harness/unittests/convertTypeAcquisitionFromJson.ts
index 439409b24b7..a935c3c0e66 100644
--- a/src/harness/unittests/convertTypingOptionsFromJson.ts
+++ b/src/harness/unittests/convertTypeAcquisitionFromJson.ts
@@ -2,12 +2,12 @@
 /// <reference path="..\..\compiler\commandLineParser.ts" />
 
 namespace ts {
-    describe("convertTypingOptionsFromJson", () => {
-        function assertTypingOptions(json: any, configFileName: string, expectedResult: { typingOptions: TypingOptions, errors: Diagnostic[] }) {
-            const { options: actualTypingOptions, errors: actualErrors } = convertTypingOptionsFromJson(json["typingOptions"], "/apath/", configFileName);
-            const parsedTypingOptions = JSON.stringify(actualTypingOptions);
-            const expectedTypingOptions = JSON.stringify(expectedResult.typingOptions);
-            assert.equal(parsedTypingOptions, expectedTypingOptions);
+    describe("convertTypeAcquisitionFromJson", () => {
+        function assertTypeAcquisition(json: any, configFileName: string, expectedResult: { typeAcquisition: TypeAcquisition, errors: Diagnostic[] }) {
+            const { options: actualTypeAcquisition, errors: actualErrors } = convertTypeAcquisitionFromJson(json["typeAcquisition"], "/apath/", configFileName);
+            const parsedTypeAcquisition = JSON.stringify(actualTypeAcquisition);
+            const expectedTypeAcquisition = JSON.stringify(expectedResult.typeAcquisition);
+            assert.equal(parsedTypeAcquisition, expectedTypeAcquisition);
 
             const expectedErrors = expectedResult.errors;
             assert.isTrue(expectedResult.errors.length === actualErrors.length, `Expected error: ${JSON.stringify(expectedResult.errors)}. Actual error: ${JSON.stringify(actualErrors)}.`);
@@ -21,20 +21,20 @@ namespace ts {
 
         // tsconfig.json
         it("Convert correctly format tsconfig.json to typing-options ", () => {
-            assertTypingOptions(
+            assertTypeAcquisition(
                 {
-                    "typingOptions":
+                    "typeAcquisition":
                     {
-                        "enableAutoDiscovery": true,
+                        "enable": true,
                         "include": ["0.d.ts", "1.d.ts"],
                         "exclude": ["0.js", "1.js"]
                     }
                 },
                 "tsconfig.json",
                 {
-                    typingOptions:
+                    typeAcquisition:
                     {
-                        enableAutoDiscovery: true,
+                        enable: true,
                         include: ["0.d.ts", "1.d.ts"],
                         exclude: ["0.js", "1.js"]
                     },
@@ -43,24 +43,24 @@ namespace ts {
         });
 
         it("Convert incorrect format tsconfig.json to typing-options ", () => {
-            assertTypingOptions(
+            assertTypeAcquisition(
                 {
-                    "typingOptions":
+                    "typeAcquisition":
                     {
                         "enableAutoDiscovy": true,
                     }
                 }, "tsconfig.json",
                 {
-                    typingOptions:
+                    typeAcquisition:
                     {
-                        enableAutoDiscovery: false,
+                        enable: false,
                         include: [],
                         exclude: []
                     },
                     errors: [
                         {
-                            category: Diagnostics.Unknown_typing_option_0.category,
-                            code: Diagnostics.Unknown_typing_option_0.code,
+                            category: Diagnostics.Unknown_type_acquisition_option_0.category,
+                            code: Diagnostics.Unknown_type_acquisition_option_0.code,
                             file: undefined,
                             start: 0,
                             length: 0,
@@ -71,11 +71,11 @@ namespace ts {
         });
 
         it("Convert default tsconfig.json to typing-options ", () => {
-            assertTypingOptions({}, "tsconfig.json",
+            assertTypeAcquisition({}, "tsconfig.json",
                 {
-                    typingOptions:
+                    typeAcquisition:
                     {
-                        enableAutoDiscovery: false,
+                        enable: false,
                         include: [],
                         exclude: []
                     },
@@ -83,18 +83,18 @@ namespace ts {
                 });
         });
 
-        it("Convert tsconfig.json with only enableAutoDiscovery property to typing-options ", () => {
-            assertTypingOptions(
+        it("Convert tsconfig.json with only enable property to typing-options ", () => {
+            assertTypeAcquisition(
                 {
-                    "typingOptions":
+                    "typeAcquisition":
                     {
-                        "enableAutoDiscovery": true
+                        "enable": true
                     }
                 }, "tsconfig.json",
                 {
-                    typingOptions:
+                    typeAcquisition:
                     {
-                        enableAutoDiscovery: true,
+                        enable: true,
                         include: [],
                         exclude: []
                     },
@@ -104,19 +104,19 @@ namespace ts {
 
         // jsconfig.json
         it("Convert jsconfig.json to typing-options ", () => {
-            assertTypingOptions(
+            assertTypeAcquisition(
                 {
-                    "typingOptions":
+                    "typeAcquisition":
                     {
-                        "enableAutoDiscovery": false,
+                        "enable": false,
                         "include": ["0.d.ts"],
                         "exclude": ["0.js"]
                     }
                 }, "jsconfig.json",
                 {
-                    typingOptions:
+                    typeAcquisition:
                     {
-                        enableAutoDiscovery: false,
+                        enable: false,
                         include: ["0.d.ts"],
                         exclude: ["0.js"]
                     },
@@ -125,11 +125,11 @@ namespace ts {
         });
 
         it("Convert default jsconfig.json to typing-options ", () => {
-            assertTypingOptions({ }, "jsconfig.json",
+            assertTypeAcquisition({ }, "jsconfig.json",
                 {
-                    typingOptions:
+                    typeAcquisition:
                     {
-                        enableAutoDiscovery: true,
+                        enable: true,
                         include: [],
                         exclude: []
                     },
@@ -138,24 +138,24 @@ namespace ts {
         });
 
         it("Convert incorrect format jsconfig.json to typing-options ", () => {
-            assertTypingOptions(
+            assertTypeAcquisition(
                 {
-                    "typingOptions":
+                    "typeAcquisition":
                     {
                         "enableAutoDiscovy": true,
                     }
                 }, "jsconfig.json",
                 {
-                    typingOptions:
+                    typeAcquisition:
                     {
-                        enableAutoDiscovery: true,
+                        enable: true,
                         include: [],
                         exclude: []
                     },
                     errors: [
                         {
                             category: Diagnostics.Unknown_compiler_option_0.category,
-                            code: Diagnostics.Unknown_typing_option_0.code,
+                            code: Diagnostics.Unknown_type_acquisition_option_0.code,
                             file: undefined,
                             start: 0,
                             length: 0,
@@ -165,18 +165,18 @@ namespace ts {
                 });
         });
 
-        it("Convert jsconfig.json with only enableAutoDiscovery property to typing-options ", () => {
-            assertTypingOptions(
+        it("Convert jsconfig.json with only enable property to typing-options ", () => {
+            assertTypeAcquisition(
                 {
-                    "typingOptions":
+                    "typeAcquisition":
                     {
-                        "enableAutoDiscovery": false
+                        "enable": false
                     }
                 }, "jsconfig.json",
                 {
-                    typingOptions:
+                    typeAcquisition:
                     {
-                        enableAutoDiscovery: false,
+                        enable: false,
                         include: [],
                         exclude: []
                     },
diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
index e9b6ccb7884..7aed5f81908 100644
--- a/src/harness/unittests/tsserverProjectSystem.ts
+++ b/src/harness/unittests/tsserverProjectSystem.ts
@@ -90,8 +90,8 @@ namespace ts.projectSystem {
             this.projectService.updateTypingsForProject(response);
         }
 
-        enqueueInstallTypingsRequest(project: server.Project, typingOptions: TypingOptions, unresolvedImports: server.SortedReadonlyArray<string>) {
-            const request = server.createInstallTypingsRequest(project, typingOptions, unresolvedImports, this.globalTypingsCacheLocation);
+        enqueueInstallTypingsRequest(project: server.Project, typeAcquisition: TypeAcquisition, unresolvedImports: server.SortedReadonlyArray<string>) {
+            const request = server.createInstallTypingsRequest(project, typeAcquisition, unresolvedImports, this.globalTypingsCacheLocation);
             this.install(request);
         }
 
@@ -1726,8 +1726,8 @@ namespace ts.projectSystem {
                 options: {}
             });
             projectService.checkNumberOfProjects({ externalProjects: 1 });
-            const typingOptions = projectService.externalProjects[0].getTypingOptions();
-            assert.isTrue(typingOptions.enableAutoDiscovery, "Typing autodiscovery should be enabled");
+            const typeAcquisition = projectService.externalProjects[0].getTypeAcquisition();
+            assert.isTrue(typeAcquisition.enable, "Typine acquisition should be enabled");
         });
     });
 
diff --git a/src/harness/unittests/typingsInstaller.ts b/src/harness/unittests/typingsInstaller.ts
index 2dda506ad58..aea9f4eb9ed 100644
--- a/src/harness/unittests/typingsInstaller.ts
+++ b/src/harness/unittests/typingsInstaller.ts
@@ -57,8 +57,8 @@ namespace ts.projectSystem {
                     compilerOptions: {
                         allowJs: true
                     },
-                    typingOptions: {
-                        enableAutoDiscovery: true
+                    typeAcquisition: {
+                        enable: true
                     }
                 })
             };
@@ -145,7 +145,7 @@ namespace ts.projectSystem {
             checkProjectActualFiles(p, [file1.path, jquery.path]);
         });
 
-        it("external project - no typing options, no .d.ts/js files", () => {
+        it("external project - no type acquisition, no .d.ts/js files", () => {
             const file1 = {
                 path: "/a/b/app.ts",
                 content: ""
@@ -173,7 +173,7 @@ namespace ts.projectSystem {
             projectService.checkNumberOfProjects({ externalProjects: 1 });
         });
 
-        it("external project - no autoDiscovery in typing options, no .d.ts/js files", () => {
+        it("external project - no auto in typing acquisition, no .d.ts/js files", () => {
             const file1 = {
                 path: "/a/b/app.ts",
                 content: ""
@@ -194,11 +194,11 @@ namespace ts.projectSystem {
                 projectFileName,
                 options: {},
                 rootFiles: [toExternalFile(file1.path)],
-                typingOptions: { include: ["jquery"] }
+                typeAcquisition: { include: ["jquery"] }
             });
             installer.checkPendingCommands(/*expectedCount*/ 0);
             // by default auto discovery will kick in if project contain only .js/.d.ts files
-            // in this case project contain only ts files - no auto discovery even if typing options is set
+            // in this case project contain only ts files - no auto discovery even if type acquisition is set
             projectService.checkNumberOfProjects({ externalProjects: 1 });
         });
 
@@ -217,9 +217,9 @@ namespace ts.projectSystem {
                 constructor() {
                     super(host, { typesRegistry: createTypesRegistry("jquery") });
                 }
-                enqueueInstallTypingsRequest(project: server.Project, typingOptions: TypingOptions, unresolvedImports: server.SortedReadonlyArray<string>) {
+                enqueueInstallTypingsRequest(project: server.Project, typeAcquisition: TypeAcquisition, unresolvedImports: server.SortedReadonlyArray<string>) {
                     enqueueIsCalled = true;
-                    super.enqueueInstallTypingsRequest(project, typingOptions, unresolvedImports);
+                    super.enqueueInstallTypingsRequest(project, typeAcquisition, unresolvedImports);
                 }
                 installWorker(_requestId: number, _args: string[], _cwd: string, cb: TI.RequestCompletedAction): void {
                     const installedTypings = ["@types/node"];
@@ -234,17 +234,17 @@ namespace ts.projectSystem {
                 projectFileName,
                 options: {},
                 rootFiles: [toExternalFile(file1.path)],
-                typingOptions: { enableAutoDiscovery: true, include: ["jquery"] }
+                typeAcquisition: { enable: true, include: ["jquery"] }
             });
 
             assert.isTrue(enqueueIsCalled, "expected enqueueIsCalled to be true");
             installer.installAll(/*expectedCount*/ 1);
 
-            // autoDiscovery is set in typing options - use it even if project contains only .ts files
+            // auto is set in type acquisition - use it even if project contains only .ts files
             projectService.checkNumberOfProjects({ externalProjects: 1 });
         });
 
-        it("external project - no typing options, with only js, jsx, d.ts files", () => {
+        it("external project - no type acquisition, with only js, jsx, d.ts files", () => {
             // Tests:
             // 1. react typings are installed for .jsx
             // 2. loose files names are matched against safe list for typings if
@@ -288,7 +288,7 @@ namespace ts.projectSystem {
                 projectFileName,
                 options: { allowJS: true, moduleResolution: ModuleResolutionKind.NodeJs },
                 rootFiles: [toExternalFile(file1.path), toExternalFile(file2.path), toExternalFile(file3.path)],
-                typingOptions: {}
+                typeAcquisition: {}
             });
 
             const p = projectService.externalProjects[0];
@@ -301,7 +301,7 @@ namespace ts.projectSystem {
             checkProjectActualFiles(p, [file1.path, file2.path, file3.path, lodash.path, react.path]);
         });
 
-        it("external project - no typing options, with js & ts files", () => {
+        it("external project - no type acquisition, with js & ts files", () => {
             // Tests:
             // 1. No typings are included for JS projects when the project contains ts files
             const file1 = {
@@ -319,9 +319,9 @@ namespace ts.projectSystem {
                 constructor() {
                     super(host, { typesRegistry: createTypesRegistry("jquery") });
                 }
-                enqueueInstallTypingsRequest(project: server.Project, typingOptions: TypingOptions, unresolvedImports: server.SortedReadonlyArray<string>) {
+                enqueueInstallTypingsRequest(project: server.Project, typeAcquisition: TypeAcquisition, unresolvedImports: server.SortedReadonlyArray<string>) {
                     enqueueIsCalled = true;
-                    super.enqueueInstallTypingsRequest(project, typingOptions, unresolvedImports);
+                    super.enqueueInstallTypingsRequest(project, typeAcquisition, unresolvedImports);
                 }
                 installWorker(_requestId: number, _args: string[], _cwd: string, cb: TI.RequestCompletedAction): void {
                     const installedTypings: string[] = [];
@@ -336,7 +336,7 @@ namespace ts.projectSystem {
                 projectFileName,
                 options: { allowJS: true, moduleResolution: ModuleResolutionKind.NodeJs },
                 rootFiles: [toExternalFile(file1.path), toExternalFile(file2.path)],
-                typingOptions: {}
+                typeAcquisition: {}
             });
 
             const p = projectService.externalProjects[0];
@@ -349,11 +349,11 @@ namespace ts.projectSystem {
             checkProjectActualFiles(p, [file1.path, file2.path]);
         });
 
-        it("external project - with typing options, with only js, d.ts files", () => {
+        it("external project - with type acquisition, with only js, d.ts files", () => {
             // Tests:
-            // 1. Safelist matching, typing options includes/excludes and package.json typings are all acquired
-            // 2. Types for safelist matches are not included when they also appear in the typing option exclude list
-            // 3. Multiple includes and excludes are respected in typing options
+            // 1. Safelist matching, type acquisition includes/excludes and package.json typings are all acquired
+            // 2. Types for safelist matches are not included when they also appear in the type acquisition exclude list
+            // 3. Multiple includes and excludes are respected in type acquisition
             const file1 = {
                 path: "/a/b/lodash.js",
                 content: ""
@@ -411,7 +411,7 @@ namespace ts.projectSystem {
                 projectFileName,
                 options: { allowJS: true, moduleResolution: ModuleResolutionKind.NodeJs },
                 rootFiles: [toExternalFile(file1.path), toExternalFile(file2.path), toExternalFile(file3.path)],
-                typingOptions: { include: ["jquery", "moment"], exclude: ["lodash"] }
+                typeAcquisition: { include: ["jquery", "moment"], exclude: ["lodash"] }
             });
 
             const p = projectService.externalProjects[0];
@@ -486,7 +486,7 @@ namespace ts.projectSystem {
                 projectFileName,
                 options: { allowJS: true, moduleResolution: ModuleResolutionKind.NodeJs },
                 rootFiles: [toExternalFile(lodashJs.path), toExternalFile(commanderJs.path), toExternalFile(file3.path)],
-                typingOptions: { include: ["jquery", "moment"] }
+                typeAcquisition: { include: ["jquery", "moment"] }
             });
 
             const p = projectService.externalProjects[0];
@@ -572,7 +572,7 @@ namespace ts.projectSystem {
                 projectFileName: projectFileName1,
                 options: { allowJS: true, moduleResolution: ModuleResolutionKind.NodeJs },
                 rootFiles: [toExternalFile(lodashJs.path), toExternalFile(commanderJs.path), toExternalFile(file3.path)],
-                typingOptions: { include: ["jquery", "cordova"] }
+                typeAcquisition: { include: ["jquery", "cordova"] }
             });
 
             installer.checkPendingCommands(/*expectedCount*/ 1);
@@ -584,7 +584,7 @@ namespace ts.projectSystem {
                 projectFileName: projectFileName2,
                 options: { allowJS: true, moduleResolution: ModuleResolutionKind.NodeJs },
                 rootFiles: [toExternalFile(file3.path)],
-                typingOptions: { include: ["grunt", "gulp"] }
+                typeAcquisition: { include: ["grunt", "gulp"] }
             });
             assert.equal(installer.pendingRunRequests.length, 1, "expect one throttled request");
 
@@ -930,7 +930,7 @@ namespace ts.projectSystem {
             const host = createServerHost([f]);
             const cache = createMap<string>();
             for (const name of JsTyping.nodeCoreModuleList) {
-                const result = JsTyping.discoverTypings(host, [f.path], getDirectoryPath(<Path>f.path), /*safeListPath*/ undefined, cache, { enableAutoDiscovery: true }, [name, "somename"]);
+                const result = JsTyping.discoverTypings(host, [f.path], getDirectoryPath(<Path>f.path), /*safeListPath*/ undefined, cache, { enable: true }, [name, "somename"]);
                 assert.deepEqual(result.newTypingNames.sort(), ["node", "somename"]);
             }
         });
@@ -946,7 +946,7 @@ namespace ts.projectSystem {
             };
             const host = createServerHost([f, node]);
             const cache = createMap<string>({ "node": node.path });
-            const result = JsTyping.discoverTypings(host, [f.path], getDirectoryPath(<Path>f.path), /*safeListPath*/ undefined, cache, { enableAutoDiscovery: true }, ["fs", "bar"]);
+            const result = JsTyping.discoverTypings(host, [f.path], getDirectoryPath(<Path>f.path), /*safeListPath*/ undefined, cache, { enable: true }, ["fs", "bar"]);
             assert.deepEqual(result.cachedTypingPaths, [node.path]);
             assert.deepEqual(result.newTypingNames, ["bar"]);
         });
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index 6a7cb049296..49111d4a67f 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -317,7 +317,7 @@ namespace ts.server {
             }
             switch (response.kind) {
                 case ActionSet:
-                    this.typingsCache.updateTypingsForProject(response.projectName, response.compilerOptions, response.typingOptions, response.unresolvedImports, response.typings);
+                    this.typingsCache.updateTypingsForProject(response.projectName, response.compilerOptions, response.typeAcquisition, response.unresolvedImports, response.typings);
                     break;
                 case ActionInvalidate:
                     this.typingsCache.deleteTypingsForProject(response.projectName);
@@ -821,7 +821,7 @@ namespace ts.server {
                 compilerOptions: parsedCommandLine.options,
                 configHasFilesProperty: config["files"] !== undefined,
                 wildcardDirectories: createMap(parsedCommandLine.wildcardDirectories),
-                typingOptions: parsedCommandLine.typingOptions,
+                typeAcquisition: parsedCommandLine.typeAcquisition,
                 compileOnSave: parsedCommandLine.compileOnSave
             };
             return { success: true, projectOptions, configFileErrors: errors };
@@ -845,7 +845,7 @@ namespace ts.server {
             return false;
         }
 
-        private createAndAddExternalProject(projectFileName: string, files: protocol.ExternalFile[], options: protocol.ExternalProjectCompilerOptions, typingOptions: TypingOptions) {
+        private createAndAddExternalProject(projectFileName: string, files: protocol.ExternalFile[], options: protocol.ExternalProjectCompilerOptions, typeAcquisition: TypeAcquisition) {
             const compilerOptions = convertCompilerOptions(options);
             const project = new ExternalProject(
                 projectFileName,
@@ -855,7 +855,7 @@ namespace ts.server {
                 /*languageServiceEnabled*/ !this.exceededTotalSizeLimitForNonTsFiles(compilerOptions, files, externalFilePropertyReader),
                 options.compileOnSave === undefined ? true : options.compileOnSave);
 
-            this.addFilesToProjectAndUpdateGraph(project, files, externalFilePropertyReader, /*clientFileName*/ undefined, typingOptions, /*configFileErrors*/ undefined);
+            this.addFilesToProjectAndUpdateGraph(project, files, externalFilePropertyReader, /*clientFileName*/ undefined, typeAcquisition, /*configFileErrors*/ undefined);
             this.externalProjects.push(project);
             return project;
         }
@@ -883,7 +883,7 @@ namespace ts.server {
                 /*languageServiceEnabled*/ !sizeLimitExceeded,
                 projectOptions.compileOnSave === undefined ? false : projectOptions.compileOnSave);
 
-            this.addFilesToProjectAndUpdateGraph(project, projectOptions.files, fileNamePropertyReader, clientFileName, projectOptions.typingOptions, configFileErrors);
+            this.addFilesToProjectAndUpdateGraph(project, projectOptions.files, fileNamePropertyReader, clientFileName, projectOptions.typeAcquisition, configFileErrors);
 
             project.watchConfigFile(project => this.onConfigChangedForConfiguredProject(project));
             if (!sizeLimitExceeded) {
@@ -902,7 +902,7 @@ namespace ts.server {
             }
         }
 
-        private addFilesToProjectAndUpdateGraph<T>(project: ConfiguredProject | ExternalProject, files: T[], propertyReader: FilePropertyReader<T>, clientFileName: string, typingOptions: TypingOptions, configFileErrors: Diagnostic[]): void {
+        private addFilesToProjectAndUpdateGraph<T>(project: ConfiguredProject | ExternalProject, files: T[], propertyReader: FilePropertyReader<T>, clientFileName: string, typeAcquisition: TypeAcquisition, configFileErrors: Diagnostic[]): void {
             let errors: Diagnostic[];
             for (const f of files) {
                 const rootFilename = propertyReader.getFileName(f);
@@ -917,7 +917,7 @@ namespace ts.server {
                 }
             }
             project.setProjectErrors(concatenate(configFileErrors, errors));
-            project.setTypingOptions(typingOptions);
+            project.setTypeAcquisition(typeAcquisition);
             project.updateGraph();
         }
 
@@ -934,7 +934,7 @@ namespace ts.server {
             };
         }
 
-        private updateNonInferredProject<T>(project: ExternalProject | ConfiguredProject, newUncheckedFiles: T[], propertyReader: FilePropertyReader<T>, newOptions: CompilerOptions, newTypingOptions: TypingOptions, compileOnSave: boolean, configFileErrors: Diagnostic[]) {
+        private updateNonInferredProject<T>(project: ExternalProject | ConfiguredProject, newUncheckedFiles: T[], propertyReader: FilePropertyReader<T>, newOptions: CompilerOptions, newTypeAcquisition: TypeAcquisition, compileOnSave: boolean, configFileErrors: Diagnostic[]) {
             const oldRootScriptInfos = project.getRootScriptInfos();
             const newRootScriptInfos: ScriptInfo[] = [];
             const newRootScriptInfoMap: NormalizedPathMap<ScriptInfo> = createNormalizedPathMap<ScriptInfo>();
@@ -996,7 +996,7 @@ namespace ts.server {
             }
 
             project.setCompilerOptions(newOptions);
-            (<ExternalProject | ConfiguredProject>project).setTypingOptions(newTypingOptions);
+            (<ExternalProject | ConfiguredProject>project).setTypeAcquisition(newTypeAcquisition);
 
             // VS only set the CompileOnSaveEnabled option in the request if the option was changed recently
             // therefore if it is undefined, it should not be updated.
@@ -1036,7 +1036,7 @@ namespace ts.server {
                     project.enableLanguageService();
                 }
                 this.watchConfigDirectoryForProject(project, projectOptions);
-                this.updateNonInferredProject(project, projectOptions.files, fileNamePropertyReader, projectOptions.compilerOptions, projectOptions.typingOptions, projectOptions.compileOnSave, configFileErrors);
+                this.updateNonInferredProject(project, projectOptions.files, fileNamePropertyReader, projectOptions.compilerOptions, projectOptions.typeAcquisition, projectOptions.compileOnSave, configFileErrors);
             }
         }
 
@@ -1340,7 +1340,7 @@ namespace ts.server {
             if (externalProject) {
                 if (!tsConfigFiles) {
                     // external project already exists and not config files were added - update the project and return;
-                    this.updateNonInferredProject(externalProject, proj.rootFiles, externalFilePropertyReader, convertCompilerOptions(proj.options), proj.typingOptions, proj.options.compileOnSave, /*configFileErrors*/ undefined);
+                    this.updateNonInferredProject(externalProject, proj.rootFiles, externalFilePropertyReader, convertCompilerOptions(proj.options), proj.typeAcquisition, proj.options.compileOnSave, /*configFileErrors*/ undefined);
                     return;
                 }
                 // some config files were added to external project (that previously were not there)
@@ -1400,7 +1400,7 @@ namespace ts.server {
             else {
                 // no config files - remove the item from the collection
                 delete this.externalProjectToConfiguredProjectMap[proj.projectFileName];
-                this.createAndAddExternalProject(proj.projectFileName, rootFiles, proj.options, proj.typingOptions);
+                this.createAndAddExternalProject(proj.projectFileName, rootFiles, proj.options, proj.typeAcquisition);
             }
             this.refreshInferredProjects();
         }
diff --git a/src/server/lsHost.ts b/src/server/lsHost.ts
index 8f57cbf4074..aa37008ff66 100644
--- a/src/server/lsHost.ts
+++ b/src/server/lsHost.ts
@@ -23,7 +23,7 @@ namespace ts.server {
             }
 
             this.resolveModuleName = (moduleName, containingFile, compilerOptions, host) => {
-                const globalCache = this.project.getTypingOptions().enableAutoDiscovery
+                const globalCache = this.project.getTypeAcquisition().enable
                     ? this.project.projectService.typingsInstaller.globalTypingsCacheLocation
                     : undefined;
                 const primaryResult = resolveModuleName(moduleName, containingFile, compilerOptions, host);
diff --git a/src/server/project.ts b/src/server/project.ts
index 82ecc6f3644..c37dd6e135a 100644
--- a/src/server/project.ts
+++ b/src/server/project.ts
@@ -312,7 +312,7 @@ namespace ts.server {
             return this.projectName;
         }
         abstract getProjectRootPath(): string | undefined;
-        abstract getTypingOptions(): TypingOptions;
+        abstract getTypeAcquisition(): TypeAcquisition;
 
         getSourceFile(path: Path) {
             if (!this.program) {
@@ -802,9 +802,9 @@ namespace ts.server {
             }
         }
 
-        getTypingOptions(): TypingOptions {
+        getTypeAcquisition(): TypeAcquisition {
             return {
-                enableAutoDiscovery: allRootFilesAreJsOrDts(this),
+                enable: allRootFilesAreJsOrDts(this),
                 include: [],
                 exclude: []
             };
@@ -812,7 +812,7 @@ namespace ts.server {
     }
 
     export class ConfiguredProject extends Project {
-        private typingOptions: TypingOptions;
+        private typeAcquisition: TypeAcquisition;
         private projectFileWatcher: FileWatcher;
         private directoryWatcher: FileWatcher;
         private directoriesWatchedForWildcards: Map<FileWatcher>;
@@ -844,12 +844,12 @@ namespace ts.server {
             this.projectErrors = projectErrors;
         }
 
-        setTypingOptions(newTypingOptions: TypingOptions): void {
-            this.typingOptions = newTypingOptions;
+        setTypeAcquisition(newTypeAcquisition: TypeAcquisition): void {
+            this.typeAcquisition = newTypeAcquisition;
         }
 
-        getTypingOptions() {
-            return this.typingOptions;
+        getTypeAcquisition() {
+            return this.typeAcquisition;
         }
 
         watchConfigFile(callback: (project: ConfiguredProject) => void) {
@@ -939,7 +939,7 @@ namespace ts.server {
     }
 
     export class ExternalProject extends Project {
-        private typingOptions: TypingOptions;
+        private typeAcquisition: TypeAcquisition;
         constructor(externalProjectName: string,
             projectService: ProjectService,
             documentRegistry: ts.DocumentRegistry,
@@ -960,36 +960,36 @@ namespace ts.server {
             return getDirectoryPath(normalizeSlashes(this.getProjectName()));
         }
 
-        getTypingOptions() {
-            return this.typingOptions;
+        getTypeAcquisition() {
+            return this.typeAcquisition;
         }
 
         setProjectErrors(projectErrors: Diagnostic[]) {
             this.projectErrors = projectErrors;
         }
 
-        setTypingOptions(newTypingOptions: TypingOptions): void {
-            if (!newTypingOptions) {
+        setTypeAcquisition(newTypeAcquisition: TypeAcquisition): void {
+            if (!newTypeAcquisition) {
                 // set default typings options
-                newTypingOptions = {
-                    enableAutoDiscovery: allRootFilesAreJsOrDts(this),
+                newTypeAcquisition = {
+                    enable: allRootFilesAreJsOrDts(this),
                     include: [],
                     exclude: []
                 };
             }
             else {
-                if (newTypingOptions.enableAutoDiscovery === undefined) {
+                if (newTypeAcquisition.enable === undefined) {
                     // if autoDiscovery was not specified by the caller - set it based on the content of the project
-                    newTypingOptions.enableAutoDiscovery = allRootFilesAreJsOrDts(this);
+                    newTypeAcquisition.enable = allRootFilesAreJsOrDts(this);
                 }
-                if (!newTypingOptions.include) {
-                    newTypingOptions.include = [];
+                if (!newTypeAcquisition.include) {
+                    newTypeAcquisition.include = [];
                 }
-                if (!newTypingOptions.exclude) {
-                    newTypingOptions.exclude = [];
+                if (!newTypeAcquisition.exclude) {
+                    newTypeAcquisition.exclude = [];
                 }
             }
-            this.typingOptions = newTypingOptions;
+            this.typeAcquisition = newTypeAcquisition;
         }
     }
 }
\ No newline at end of file
diff --git a/src/server/protocol.ts b/src/server/protocol.ts
index dad66f3cc71..f25ed190c08 100644
--- a/src/server/protocol.ts
+++ b/src/server/protocol.ts
@@ -861,9 +861,9 @@ namespace ts.server.protocol {
          */
         options: ExternalProjectCompilerOptions;
         /**
-         * Explicitly specified typing options for the project
+         * Explicitly specified type acquisition for the project
          */
-        typingOptions?: TypingOptions;
+        typeAcquisition?: TypeAcquisition;
     }
 
     export interface CompileOnSaveMixin {
diff --git a/src/server/server.ts b/src/server/server.ts
index 220b0d90c65..da928c57485 100644
--- a/src/server/server.ts
+++ b/src/server/server.ts
@@ -275,8 +275,8 @@ namespace ts.server {
             this.installer.send({ projectName: p.getProjectName(), kind: "closeProject" });
         }
 
-        enqueueInstallTypingsRequest(project: Project, typingOptions: TypingOptions, unresolvedImports: SortedReadonlyArray<string>): void {
-            const request = createInstallTypingsRequest(project, typingOptions, unresolvedImports);
+        enqueueInstallTypingsRequest(project: Project, typeAcquisition: TypeAcquisition, unresolvedImports: SortedReadonlyArray<string>): void {
+            const request = createInstallTypingsRequest(project, typeAcquisition, unresolvedImports);
             if (this.logger.hasLevel(LogLevel.verbose)) {
                 if (this.logger.hasLevel(LogLevel.verbose)) {
                     this.logger.info(`Scheduling throttled operation: ${JSON.stringify(request)}`);
diff --git a/src/server/types.d.ts b/src/server/types.d.ts
index a4032bf062e..77e9e762b59 100644
--- a/src/server/types.d.ts
+++ b/src/server/types.d.ts
@@ -31,7 +31,7 @@ declare namespace ts.server {
         readonly fileNames: string[];
         readonly projectRootPath: ts.Path;
         readonly compilerOptions: ts.CompilerOptions;
-        readonly typingOptions: ts.TypingOptions;
+        readonly typeAcquisition: ts.TypeAcquisition;
         readonly unresolvedImports: SortedReadonlyArray<string>;
         readonly cachePath?: string;
         readonly kind: "discover";
@@ -54,7 +54,7 @@ declare namespace ts.server {
     }
 
     export interface SetTypings extends ProjectResponse {
-        readonly typingOptions: ts.TypingOptions;
+        readonly typeAcquisition: ts.TypeAcquisition;
         readonly compilerOptions: ts.CompilerOptions;
         readonly typings: string[];
         readonly unresolvedImports: SortedReadonlyArray<string>;
diff --git a/src/server/typingsCache.ts b/src/server/typingsCache.ts
index 9013622e24a..8b03d59003c 100644
--- a/src/server/typingsCache.ts
+++ b/src/server/typingsCache.ts
@@ -2,7 +2,7 @@
 
 namespace ts.server {
     export interface ITypingsInstaller {
-        enqueueInstallTypingsRequest(p: Project, typingOptions: TypingOptions, unresolvedImports: SortedReadonlyArray<string>): void;
+        enqueueInstallTypingsRequest(p: Project, typeAcquisition: TypeAcquisition, unresolvedImports: SortedReadonlyArray<string>): void;
         attach(projectService: ProjectService): void;
         onProjectClosed(p: Project): void;
         readonly globalTypingsCacheLocation: string;
@@ -16,7 +16,7 @@ namespace ts.server {
     };
 
     class TypingsCacheEntry {
-        readonly typingOptions: TypingOptions;
+        readonly typeAcquisition: TypeAcquisition;
         readonly compilerOptions: CompilerOptions;
         readonly typings: SortedReadonlyArray<string>;
         readonly unresolvedImports: SortedReadonlyArray<string>;
@@ -52,8 +52,8 @@ namespace ts.server {
         return unique === 0;
     }
 
-    function typingOptionsChanged(opt1: TypingOptions, opt2: TypingOptions): boolean {
-        return opt1.enableAutoDiscovery !== opt2.enableAutoDiscovery ||
+    function typeAcquisitionChanged(opt1: TypeAcquisition, opt2: TypeAcquisition): boolean {
+        return opt1.enable !== opt2.enable ||
             !setIsEqualTo(opt1.include, opt2.include) ||
             !setIsEqualTo(opt1.exclude, opt2.exclude);
     }
@@ -77,9 +77,9 @@ namespace ts.server {
         }
 
         getTypingsForProject(project: Project, unresolvedImports: SortedReadonlyArray<string>, forceRefresh: boolean): SortedReadonlyArray<string> {
-            const typingOptions = project.getTypingOptions();
+            const typeAcquisition = project.getTypeAcquisition();
 
-            if (!typingOptions || !typingOptions.enableAutoDiscovery) {
+            if (!typeAcquisition || !typeAcquisition.enable) {
                 return <any>emptyArray;
             }
 
@@ -87,28 +87,28 @@ namespace ts.server {
             const result: SortedReadonlyArray<string> = entry ? entry.typings : <any>emptyArray;
             if (forceRefresh ||
                 !entry ||
-                typingOptionsChanged(typingOptions, entry.typingOptions) ||
+                typeAcquisitionChanged(typeAcquisition, entry.typeAcquisition) ||
                 compilerOptionsChanged(project.getCompilerOptions(), entry.compilerOptions) ||
                 unresolvedImportsChanged(unresolvedImports, entry.unresolvedImports)) {
                 // Note: entry is now poisoned since it does not really contain typings for a given combination of compiler options\typings options.
                 // instead it acts as a placeholder to prevent issuing multiple requests
                 this.perProjectCache[project.getProjectName()] = {
                     compilerOptions: project.getCompilerOptions(),
-                    typingOptions,
+                    typeAcquisition,
                     typings: result,
                     unresolvedImports,
                     poisoned: true
                 };
                 // something has been changed, issue a request to update typings
-                this.installer.enqueueInstallTypingsRequest(project, typingOptions, unresolvedImports);
+                this.installer.enqueueInstallTypingsRequest(project, typeAcquisition, unresolvedImports);
             }
             return result;
         }
 
-        updateTypingsForProject(projectName: string, compilerOptions: CompilerOptions, typingOptions: TypingOptions, unresolvedImports: SortedReadonlyArray<string>, newTypings: string[]) {
+        updateTypingsForProject(projectName: string, compilerOptions: CompilerOptions, typeAcquisition: TypeAcquisition, unresolvedImports: SortedReadonlyArray<string>, newTypings: string[]) {
             this.perProjectCache[projectName] = {
                 compilerOptions,
-                typingOptions,
+                typeAcquisition,
                 typings: toSortedReadonlyArray(newTypings),
                 unresolvedImports,
                 poisoned: false
diff --git a/src/server/typingsInstaller/typingsInstaller.ts b/src/server/typingsInstaller/typingsInstaller.ts
index 677e2c7bba0..25d53e14e75 100644
--- a/src/server/typingsInstaller/typingsInstaller.ts
+++ b/src/server/typingsInstaller/typingsInstaller.ts
@@ -150,7 +150,7 @@ namespace ts.server.typingsInstaller {
                 req.projectRootPath,
                 this.safeListPath,
                 this.packageNameToTypingLocation,
-                req.typingOptions,
+                req.typeAcquisition,
                 req.unresolvedImports);
 
             if (this.log.isEnabled()) {
@@ -391,7 +391,7 @@ namespace ts.server.typingsInstaller {
         private createSetTypings(request: DiscoverTypings, typings: string[]): SetTypings {
             return {
                 projectName: request.projectName,
-                typingOptions: request.typingOptions,
+                typeAcquisition: request.typeAcquisition,
                 compilerOptions: request.compilerOptions,
                 typings,
                 unresolvedImports: request.unresolvedImports,
diff --git a/src/server/utilities.ts b/src/server/utilities.ts
index a52e5848de9..fd370da7fa1 100644
--- a/src/server/utilities.ts
+++ b/src/server/utilities.ts
@@ -46,12 +46,12 @@ namespace ts.server {
         }
     }
 
-    export function createInstallTypingsRequest(project: Project, typingOptions: TypingOptions, unresolvedImports: SortedReadonlyArray<string>, cachePath?: string): DiscoverTypings {
+    export function createInstallTypingsRequest(project: Project, typeAcquisition: TypeAcquisition, unresolvedImports: SortedReadonlyArray<string>, cachePath?: string): DiscoverTypings {
         return {
             projectName: project.getProjectName(),
             fileNames: project.getFileNames(/*excludeFilesFromExternalLibraries*/ true),
             compilerOptions: project.getCompilerOptions(),
-            typingOptions,
+            typeAcquisition,
             unresolvedImports,
             projectRootPath: getProjectRootPath(project),
             cachePath,
@@ -171,7 +171,7 @@ namespace ts.server {
         files?: string[];
         wildcardDirectories?: Map<WatchDirectoryFlags>;
         compilerOptions?: CompilerOptions;
-        typingOptions?: TypingOptions;
+        typeAcquisition?: TypeAcquisition;
         compileOnSave?: boolean;
     }
 
diff --git a/src/services/jsTyping.ts b/src/services/jsTyping.ts
index 316dcd355c2..04ac60c4e74 100644
--- a/src/services/jsTyping.ts
+++ b/src/services/jsTyping.ts
@@ -48,7 +48,7 @@ namespace ts.JsTyping {
      * @param projectRootPath is the path to the project root directory
      * @param safeListPath is the path used to retrieve the safe list
      * @param packageNameToTypingLocation is the map of package names to their cached typing locations
-     * @param typingOptions are used to customize the typing inference process
+     * @param typeAcquisition is used to customize the typing acquisition process
      * @param compilerOptions are used as a source for typing inference
      */
     export function discoverTypings(
@@ -57,14 +57,14 @@ namespace ts.JsTyping {
         projectRootPath: Path,
         safeListPath: Path,
         packageNameToTypingLocation: Map<string>,
-        typingOptions: TypingOptions,
+        typeAcquisition: TypeAcquisition,
         unresolvedImports: ReadonlyArray<string>):
         { cachedTypingPaths: string[], newTypingNames: string[], filesToWatch: string[] } {
 
         // A typing name to typing file path mapping
         const inferredTypings = createMap<string>();
 
-        if (!typingOptions || !typingOptions.enableAutoDiscovery) {
+        if (!typeAcquisition || !typeAcquisition.enable) {
             return { cachedTypingPaths: [], newTypingNames: [], filesToWatch: [] };
         }
 
@@ -84,8 +84,8 @@ namespace ts.JsTyping {
         let searchDirs: string[] = [];
         let exclude: string[] = [];
 
-        mergeTypings(typingOptions.include);
-        exclude = typingOptions.exclude || [];
+        mergeTypings(typeAcquisition.include);
+        exclude = typeAcquisition.exclude || [];
 
         const possibleSearchDirs = map(fileNames, getDirectoryPath);
         if (projectRootPath) {
diff --git a/src/services/shims.ts b/src/services/shims.ts
index 1c8132793a3..6184f1e2ff3 100644
--- a/src/services/shims.ts
+++ b/src/services/shims.ts
@@ -1138,7 +1138,7 @@ namespace ts {
                     if (result.error) {
                         return {
                             options: {},
-                            typingOptions: {},
+                            typeAcquisition: {},
                             files: [],
                             raw: {},
                             errors: [realizeDiagnostic(result.error, "\r\n")]
@@ -1150,7 +1150,7 @@ namespace ts {
 
                     return {
                         options: configFile.options,
-                        typingOptions: configFile.typingOptions,
+                        typeAcquisition: configFile.typeAcquisition,
                         files: configFile.fileNames,
                         raw: configFile.raw,
                         errors: realizeDiagnostics(configFile.errors, "\r\n")
@@ -1175,7 +1175,7 @@ namespace ts {
                     toPath(info.projectRootPath, info.projectRootPath, getCanonicalFileName),
                     toPath(info.safeListPath, info.safeListPath, getCanonicalFileName),
                     info.packageNameToTypingLocation,
-                    info.typingOptions,
+                    info.typeAcquisition,
                     info.unresolvedImports);
             });
         }

From eaf791e32841c815aecc26d98ad31564673a5695 Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Fri, 18 Nov 2016 22:53:38 -0800
Subject: [PATCH 297/421] update to tslint@next

---
 scripts/parallel-lint.js                      | 22 +++++++++++--------
 scripts/tslint/booleanTriviaRule.ts           |  2 +-
 scripts/tslint/nextLineRule.ts                |  2 +-
 scripts/tslint/noInOperatorRule.ts            |  2 +-
 scripts/tslint/noIncrementDecrementRule.ts    |  2 +-
 .../tslint/noTypeAssertionWhitespaceRule.ts   |  2 +-
 .../objectLiteralSurroundingSpaceRule.ts      |  2 +-
 scripts/tslint/preferConstRule.ts             |  2 +-
 scripts/tslint/typeOperatorSpacingRule.ts     |  2 +-
 9 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/scripts/parallel-lint.js b/scripts/parallel-lint.js
index a9aec06c2df..aec9960ce47 100644
--- a/scripts/parallel-lint.js
+++ b/scripts/parallel-lint.js
@@ -1,26 +1,29 @@
-var Linter = require("tslint");
+var tslint = require("tslint");
 var fs = require("fs");
 
 function getLinterOptions() {
     return {
-        configuration: require("../tslint.json"),
         formatter: "prose",
         formattersDirectory: undefined,
         rulesDirectory: "built/local/tslint"
     };
 }
-
-function lintFileContents(options, path, contents) {
-    var ll = new Linter(path, contents, options);
-    return ll.lint();
+function getLinterConfiguration() {
+    return require("../tslint.json");
 }
 
-function lintFileAsync(options, path, cb) {
+function lintFileContents(options, configuration, path, contents) {
+    var ll = new tslint.Linter(options);
+    ll.lint(path, contents, configuration);
+    return ll.getResult();
+}
+
+function lintFileAsync(options, configuration, path, cb) {
     fs.readFile(path, "utf8", function (err, contents) {
         if (err) {
             return cb(err);
         }
-        var result = lintFileContents(options, path, contents);
+        var result = lintFileContents(options, configuration, path, contents);
         cb(undefined, result);
     });
 }
@@ -30,7 +33,8 @@ process.on("message", function (data) {
         case "file":
             var target = data.name;
             var lintOptions = getLinterOptions();
-            lintFileAsync(lintOptions, target, function (err, result) {
+            var lintConfiguration = getLinterConfiguration();
+            lintFileAsync(lintOptions, lintConfiguration, target, function (err, result) {
                 if (err) {
                     process.send({ kind: "error", error: err.toString() });
                     return;
diff --git a/scripts/tslint/booleanTriviaRule.ts b/scripts/tslint/booleanTriviaRule.ts
index b626b7560a6..db6abcbf17b 100644
--- a/scripts/tslint/booleanTriviaRule.ts
+++ b/scripts/tslint/booleanTriviaRule.ts
@@ -1,4 +1,4 @@
-import * as Lint from "tslint/lib/lint";
+import * as Lint from "tslint/lib";
 import * as ts from "typescript";
 
 export class Rule extends Lint.Rules.AbstractRule {
diff --git a/scripts/tslint/nextLineRule.ts b/scripts/tslint/nextLineRule.ts
index d25652f7bce..2dee393bd84 100644
--- a/scripts/tslint/nextLineRule.ts
+++ b/scripts/tslint/nextLineRule.ts
@@ -1,4 +1,4 @@
-import * as Lint from "tslint/lib/lint";
+import * as Lint from "tslint/lib";
 import * as ts from "typescript";
 
 const OPTION_CATCH = "check-catch";
diff --git a/scripts/tslint/noInOperatorRule.ts b/scripts/tslint/noInOperatorRule.ts
index 527e8c1b895..307f0dffd6a 100644
--- a/scripts/tslint/noInOperatorRule.ts
+++ b/scripts/tslint/noInOperatorRule.ts
@@ -1,4 +1,4 @@
-import * as Lint from "tslint/lib/lint";
+import * as Lint from "tslint/lib";
 import * as ts from "typescript";
 
 
diff --git a/scripts/tslint/noIncrementDecrementRule.ts b/scripts/tslint/noIncrementDecrementRule.ts
index f5c90abe893..2a957b36af5 100644
--- a/scripts/tslint/noIncrementDecrementRule.ts
+++ b/scripts/tslint/noIncrementDecrementRule.ts
@@ -1,4 +1,4 @@
-import * as Lint from "tslint/lib/lint";
+import * as Lint from "tslint/lib";
 import * as ts from "typescript";
 
 
diff --git a/scripts/tslint/noTypeAssertionWhitespaceRule.ts b/scripts/tslint/noTypeAssertionWhitespaceRule.ts
index e75964b9e7e..5368dcf74ba 100644
--- a/scripts/tslint/noTypeAssertionWhitespaceRule.ts
+++ b/scripts/tslint/noTypeAssertionWhitespaceRule.ts
@@ -1,4 +1,4 @@
-import * as Lint from "tslint/lib/lint";
+import * as Lint from "tslint/lib";
 import * as ts from "typescript";
 
 
diff --git a/scripts/tslint/objectLiteralSurroundingSpaceRule.ts b/scripts/tslint/objectLiteralSurroundingSpaceRule.ts
index b527746bf51..a705e56c969 100644
--- a/scripts/tslint/objectLiteralSurroundingSpaceRule.ts
+++ b/scripts/tslint/objectLiteralSurroundingSpaceRule.ts
@@ -1,4 +1,4 @@
-import * as Lint from "tslint/lib/lint";
+import * as Lint from "tslint/lib";
 import * as ts from "typescript";
 
 
diff --git a/scripts/tslint/preferConstRule.ts b/scripts/tslint/preferConstRule.ts
index 445fbe2e72a..28d7446b290 100644
--- a/scripts/tslint/preferConstRule.ts
+++ b/scripts/tslint/preferConstRule.ts
@@ -1,4 +1,4 @@
-import * as Lint from "tslint/lib/lint";
+import * as Lint from "tslint/lib";
 import * as ts from "typescript";
 
 export class Rule extends Lint.Rules.AbstractRule {
diff --git a/scripts/tslint/typeOperatorSpacingRule.ts b/scripts/tslint/typeOperatorSpacingRule.ts
index 559d1b34937..50f2971a0ee 100644
--- a/scripts/tslint/typeOperatorSpacingRule.ts
+++ b/scripts/tslint/typeOperatorSpacingRule.ts
@@ -1,4 +1,4 @@
-import * as Lint from "tslint/lib/lint";
+import * as Lint from "tslint/lib";
 import * as ts from "typescript";
 
 

From c96bc89982d2d6f98f6d258a90bca66950222978 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A1s=20Parditka?= <andraaspar@gmail.com>
Date: Sat, 19 Nov 2016 11:13:36 +0100
Subject: [PATCH 298/421] Fix issue #12260.

Fixed tsserver crashing on Android (Termux).
---
 src/server/server.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/server/server.ts b/src/server/server.ts
index 220b0d90c65..afe0382084c 100644
--- a/src/server/server.ts
+++ b/src/server/server.ts
@@ -31,6 +31,7 @@ namespace ts.server {
                     os.tmpdir();
                 break;
             case "linux":
+            case "android":
                 basePath = (os.homedir && os.homedir()) ||
                     process.env.HOME ||
                     ((process.env.LOGNAME || process.env.USER) && `/home/${process.env.LOGNAME || process.env.USER}`) ||
@@ -598,4 +599,4 @@ namespace ts.server {
     (process as any).noAsar = true;
     // Start listening
     ioSession.listen();
-}
\ No newline at end of file
+}

From dcd225a8923bbb6fc4f168d41e7ab644bf8ce481 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sat, 19 Nov 2016 09:03:23 -0800
Subject: [PATCH 299/421] Fix comparable relation for keyof T Treat keyof T as
 string | number for purposes of indexing Allow indexed access types with
 for-in and in operator

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 024c3d4a983..ccd731e7a2c 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -6037,11 +6037,12 @@ namespace ts {
                 const id = objectType.id + "," + indexType.id;
                 return indexedAccessTypes[id] || (indexedAccessTypes[id] = createIndexedAccessType(objectType, indexType));
             }
-            const apparentType = getApparentType(objectType);
-            if (indexType.flags & TypeFlags.Union && !(indexType.flags & TypeFlags.Primitive)) {
+            const apparentObjectType = getApparentType(objectType);
+            const apparentIndexType = indexType.flags & TypeFlags.Index ? stringOrNumberType : indexType;
+            if (apparentIndexType.flags & TypeFlags.Union && !(apparentIndexType.flags & TypeFlags.Primitive)) {
                 const propTypes: Type[] = [];
-                for (const t of (<UnionType>indexType).types) {
-                    const propType = getPropertyTypeForIndexType(apparentType, t, accessNode, /*cacheSymbol*/ false);
+                for (const t of (<UnionType>apparentIndexType).types) {
+                    const propType = getPropertyTypeForIndexType(apparentObjectType, t, accessNode, /*cacheSymbol*/ false);
                     if (propType === unknownType) {
                         return unknownType;
                     }
@@ -6049,7 +6050,7 @@ namespace ts {
                 }
                 return getUnionType(propTypes);
             }
-            return getPropertyTypeForIndexType(apparentType, indexType, accessNode, /*cacheSymbol*/ true);
+            return getPropertyTypeForIndexType(apparentObjectType, apparentIndexType, accessNode, /*cacheSymbol*/ true);
         }
 
         function getTypeFromIndexedAccessTypeNode(node: IndexedAccessTypeNode) {
@@ -7123,7 +7124,10 @@ namespace ts {
 
                 if (source.flags & TypeFlags.Index) {
                     // A keyof T is related to a union type containing both string and number
-                    if (maybeTypeOfKind(target, TypeFlags.String) && maybeTypeOfKind(target, TypeFlags.Number)) {
+                    const related = relation === comparableRelation ?
+                        maybeTypeOfKind(target, TypeFlags.String | TypeFlags.Number) :
+                        maybeTypeOfKind(target, TypeFlags.String) && maybeTypeOfKind(target, TypeFlags.Number);
+                    if (related) {
                         return Ternary.True;
                     }
                 }
@@ -14254,7 +14258,7 @@ namespace ts {
             if (!isTypeAnyOrAllConstituentTypesHaveKind(leftType, TypeFlags.StringLike | TypeFlags.NumberLike | TypeFlags.ESSymbol)) {
                 error(left, Diagnostics.The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol);
             }
-            if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, TypeFlags.Object | TypeFlags.TypeParameter)) {
+            if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, TypeFlags.Object | TypeFlags.TypeParameter | TypeFlags.IndexedAccess)) {
                 error(right, Diagnostics.The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter);
             }
             return booleanType;
@@ -17148,7 +17152,7 @@ namespace ts {
             const rightType = checkNonNullExpression(node.expression);
             // unknownType is returned i.e. if node.expression is identifier whose name cannot be resolved
             // in this case error about missing name is already reported - do not report extra one
-            if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, TypeFlags.Object | TypeFlags.TypeParameter)) {
+            if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, TypeFlags.Object | TypeFlags.TypeParameter | TypeFlags.IndexedAccess)) {
                 error(node.expression, Diagnostics.The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter);
             }
 

From 443abe53730aeaefd2b1f1777dac51cc32f418b3 Mon Sep 17 00:00:00 2001
From: Marius Schulz <marius.schulz@me.com>
Date: Sat, 19 Nov 2016 22:30:18 +0100
Subject: [PATCH 300/421] =?UTF-8?q?Allow=20one=20leading=20ignored=20?=
 =?UTF-8?q?=E2=80=9C|=E2=80=9D=20or=20=E2=80=9C&=E2=80=9D=20in=20a=20type?=
 =?UTF-8?q?=20position?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/compiler/parser.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index b08f75b0f5b..55d267cb53a 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -2615,6 +2615,7 @@ namespace ts {
         }
 
         function parseUnionOrIntersectionType(kind: SyntaxKind, parseConstituentType: () => TypeNode, operator: SyntaxKind): TypeNode {
+            parseOptional(operator);
             let type = parseConstituentType();
             if (token() === operator) {
                 const types = createNodeArray<TypeNode>([type], type.pos);

From e45c5dbceab76db9932f93dab4dd9aa70dcdf3c3 Mon Sep 17 00:00:00 2001
From: Marius Schulz <marius.schulz@me.com>
Date: Sat, 19 Nov 2016 22:30:33 +0100
Subject: [PATCH 301/421] Add tests and accept new baselines

---
 .../intersectionTypeWithLeadingOperator.js          |  8 ++++++++
 .../intersectionTypeWithLeadingOperator.symbols     | 13 +++++++++++++
 .../intersectionTypeWithLeadingOperator.types       | 13 +++++++++++++
 .../reference/unionTypeWithLeadingOperator.js       |  8 ++++++++
 .../reference/unionTypeWithLeadingOperator.symbols  | 13 +++++++++++++
 .../reference/unionTypeWithLeadingOperator.types    | 13 +++++++++++++
 .../compiler/intersectionTypeWithLeadingOperator.ts |  4 ++++
 .../cases/compiler/unionTypeWithLeadingOperator.ts  |  4 ++++
 8 files changed, 76 insertions(+)
 create mode 100644 tests/baselines/reference/intersectionTypeWithLeadingOperator.js
 create mode 100644 tests/baselines/reference/intersectionTypeWithLeadingOperator.symbols
 create mode 100644 tests/baselines/reference/intersectionTypeWithLeadingOperator.types
 create mode 100644 tests/baselines/reference/unionTypeWithLeadingOperator.js
 create mode 100644 tests/baselines/reference/unionTypeWithLeadingOperator.symbols
 create mode 100644 tests/baselines/reference/unionTypeWithLeadingOperator.types
 create mode 100644 tests/cases/compiler/intersectionTypeWithLeadingOperator.ts
 create mode 100644 tests/cases/compiler/unionTypeWithLeadingOperator.ts

diff --git a/tests/baselines/reference/intersectionTypeWithLeadingOperator.js b/tests/baselines/reference/intersectionTypeWithLeadingOperator.js
new file mode 100644
index 00000000000..03f17c08788
--- /dev/null
+++ b/tests/baselines/reference/intersectionTypeWithLeadingOperator.js
@@ -0,0 +1,8 @@
+//// [intersectionTypeWithLeadingOperator.ts]
+type A = & string;
+type B =
+  & { foo: string }
+  & { bar: number };
+
+
+//// [intersectionTypeWithLeadingOperator.js]
diff --git a/tests/baselines/reference/intersectionTypeWithLeadingOperator.symbols b/tests/baselines/reference/intersectionTypeWithLeadingOperator.symbols
new file mode 100644
index 00000000000..43e0db684dc
--- /dev/null
+++ b/tests/baselines/reference/intersectionTypeWithLeadingOperator.symbols
@@ -0,0 +1,13 @@
+=== tests/cases/compiler/intersectionTypeWithLeadingOperator.ts ===
+type A = & string;
+>A : Symbol(A, Decl(intersectionTypeWithLeadingOperator.ts, 0, 0))
+
+type B =
+>B : Symbol(B, Decl(intersectionTypeWithLeadingOperator.ts, 0, 18))
+
+  & { foo: string }
+>foo : Symbol(foo, Decl(intersectionTypeWithLeadingOperator.ts, 2, 5))
+
+  & { bar: number };
+>bar : Symbol(bar, Decl(intersectionTypeWithLeadingOperator.ts, 3, 5))
+
diff --git a/tests/baselines/reference/intersectionTypeWithLeadingOperator.types b/tests/baselines/reference/intersectionTypeWithLeadingOperator.types
new file mode 100644
index 00000000000..f2fad709dce
--- /dev/null
+++ b/tests/baselines/reference/intersectionTypeWithLeadingOperator.types
@@ -0,0 +1,13 @@
+=== tests/cases/compiler/intersectionTypeWithLeadingOperator.ts ===
+type A = & string;
+>A : string
+
+type B =
+>B : B
+
+  & { foo: string }
+>foo : string
+
+  & { bar: number };
+>bar : number
+
diff --git a/tests/baselines/reference/unionTypeWithLeadingOperator.js b/tests/baselines/reference/unionTypeWithLeadingOperator.js
new file mode 100644
index 00000000000..b6a40440a48
--- /dev/null
+++ b/tests/baselines/reference/unionTypeWithLeadingOperator.js
@@ -0,0 +1,8 @@
+//// [unionTypeWithLeadingOperator.ts]
+type A = | string;
+type B =
+  | { type: "INCREMENT" }
+  | { type: "DECREMENT" };
+
+
+//// [unionTypeWithLeadingOperator.js]
diff --git a/tests/baselines/reference/unionTypeWithLeadingOperator.symbols b/tests/baselines/reference/unionTypeWithLeadingOperator.symbols
new file mode 100644
index 00000000000..97fdcdda8e0
--- /dev/null
+++ b/tests/baselines/reference/unionTypeWithLeadingOperator.symbols
@@ -0,0 +1,13 @@
+=== tests/cases/compiler/unionTypeWithLeadingOperator.ts ===
+type A = | string;
+>A : Symbol(A, Decl(unionTypeWithLeadingOperator.ts, 0, 0))
+
+type B =
+>B : Symbol(B, Decl(unionTypeWithLeadingOperator.ts, 0, 18))
+
+  | { type: "INCREMENT" }
+>type : Symbol(type, Decl(unionTypeWithLeadingOperator.ts, 2, 5))
+
+  | { type: "DECREMENT" };
+>type : Symbol(type, Decl(unionTypeWithLeadingOperator.ts, 3, 5))
+
diff --git a/tests/baselines/reference/unionTypeWithLeadingOperator.types b/tests/baselines/reference/unionTypeWithLeadingOperator.types
new file mode 100644
index 00000000000..db92c6e8eb6
--- /dev/null
+++ b/tests/baselines/reference/unionTypeWithLeadingOperator.types
@@ -0,0 +1,13 @@
+=== tests/cases/compiler/unionTypeWithLeadingOperator.ts ===
+type A = | string;
+>A : string
+
+type B =
+>B : B
+
+  | { type: "INCREMENT" }
+>type : "INCREMENT"
+
+  | { type: "DECREMENT" };
+>type : "DECREMENT"
+
diff --git a/tests/cases/compiler/intersectionTypeWithLeadingOperator.ts b/tests/cases/compiler/intersectionTypeWithLeadingOperator.ts
new file mode 100644
index 00000000000..9f64cad38dc
--- /dev/null
+++ b/tests/cases/compiler/intersectionTypeWithLeadingOperator.ts
@@ -0,0 +1,4 @@
+type A = & string;
+type B =
+  & { foo: string }
+  & { bar: number };
diff --git a/tests/cases/compiler/unionTypeWithLeadingOperator.ts b/tests/cases/compiler/unionTypeWithLeadingOperator.ts
new file mode 100644
index 00000000000..08a876493d0
--- /dev/null
+++ b/tests/cases/compiler/unionTypeWithLeadingOperator.ts
@@ -0,0 +1,4 @@
+type A = | string;
+type B =
+  | { type: "INCREMENT" }
+  | { type: "DECREMENT" };

From a439e6213883a310bbeefb7cac7777f4cff6f04c Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sat, 19 Nov 2016 15:10:22 -0800
Subject: [PATCH 302/421] Add tests

---
 .../types/keyof/keyofAndIndexedAccess.ts      | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts b/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
index 1e874aaf80f..522bfe34e15 100644
--- a/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
+++ b/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
@@ -181,6 +181,46 @@ function f40(c: C) {
     let z: Z = c["z"];
 }
 
+function f50<T>(k: keyof T, s: string, n: number) {
+    const x1 = s as keyof T;
+    const x2 = n as keyof T;
+    const x3 = k as string;
+    const x4 = k as number;
+    const x5 = k as string | number;
+}
+
+function f51<T, K extends keyof T>(k: K, s: string, n: number) {
+    const x1 = s as keyof T;
+    const x2 = n as keyof T;
+    const x3 = k as string;
+    const x4 = k as number;
+    const x5 = k as string | number;
+}
+
+function f52<T>(obj: { [x: string]: boolean }, k: keyof T, s: string, n: number) {
+    const x1 = obj[s];
+    const x2 = obj[n];
+    const x3 = obj[k];
+}
+
+function f53<T, K extends keyof T>(obj: { [x: string]: boolean }, k: K, s: string, n: number) {
+    const x1 = obj[s];
+    const x2 = obj[n];
+    const x3 = obj[k];
+}
+
+function f54<T>(obj: T, key: keyof T) {
+    for (let s in obj[key]) {
+    }
+    const b = "foo" in obj[key];
+}
+
+function f55<T, K extends keyof T>(obj: T, key: K) {
+    for (let s in obj[key]) {
+    }
+    const b = "foo" in obj[key];
+}
+
 // Repros from #12011
 
 class Base {

From 4ce494a27d7727847eb94b508677ea981de8692c Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sat, 19 Nov 2016 15:10:35 -0800
Subject: [PATCH 303/421] Accept new baselines

---
 .../reference/keyofAndIndexedAccess.js        |  84 +++++++
 .../reference/keyofAndIndexedAccess.symbols   | 230 +++++++++++++++---
 .../reference/keyofAndIndexedAccess.types     | 182 ++++++++++++++
 3 files changed, 460 insertions(+), 36 deletions(-)

diff --git a/tests/baselines/reference/keyofAndIndexedAccess.js b/tests/baselines/reference/keyofAndIndexedAccess.js
index dd59a5a1b4c..eef81f4d5f7 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.js
+++ b/tests/baselines/reference/keyofAndIndexedAccess.js
@@ -181,6 +181,46 @@ function f40(c: C) {
     let z: Z = c["z"];
 }
 
+function f50<T>(k: keyof T, s: string, n: number) {
+    const x1 = s as keyof T;
+    const x2 = n as keyof T;
+    const x3 = k as string;
+    const x4 = k as number;
+    const x5 = k as string | number;
+}
+
+function f51<T, K extends keyof T>(k: K, s: string, n: number) {
+    const x1 = s as keyof T;
+    const x2 = n as keyof T;
+    const x3 = k as string;
+    const x4 = k as number;
+    const x5 = k as string | number;
+}
+
+function f52<T>(obj: { [x: string]: boolean }, k: keyof T, s: string, n: number) {
+    const x1 = obj[s];
+    const x2 = obj[n];
+    const x3 = obj[k];
+}
+
+function f53<T, K extends keyof T>(obj: { [x: string]: boolean }, k: K, s: string, n: number) {
+    const x1 = obj[s];
+    const x2 = obj[n];
+    const x3 = obj[k];
+}
+
+function f54<T>(obj: T, key: keyof T) {
+    for (let s in obj[key]) {
+    }
+    const b = "foo" in obj[key];
+}
+
+function f55<T, K extends keyof T>(obj: T, key: K) {
+    for (let s in obj[key]) {
+    }
+    const b = "foo" in obj[key];
+}
+
 // Repros from #12011
 
 class Base {
@@ -329,6 +369,40 @@ function f40(c) {
     var y = c["y"];
     var z = c["z"];
 }
+function f50(k, s, n) {
+    var x1 = s;
+    var x2 = n;
+    var x3 = k;
+    var x4 = k;
+    var x5 = k;
+}
+function f51(k, s, n) {
+    var x1 = s;
+    var x2 = n;
+    var x3 = k;
+    var x4 = k;
+    var x5 = k;
+}
+function f52(obj, k, s, n) {
+    var x1 = obj[s];
+    var x2 = obj[n];
+    var x3 = obj[k];
+}
+function f53(obj, k, s, n) {
+    var x1 = obj[s];
+    var x2 = obj[n];
+    var x3 = obj[k];
+}
+function f54(obj, key) {
+    for (var s in obj[key]) {
+    }
+    var b = "foo" in obj[key];
+}
+function f55(obj, key) {
+    for (var s in obj[key]) {
+    }
+    var b = "foo" in obj[key];
+}
 // Repros from #12011
 var Base = (function () {
     function Base() {
@@ -454,6 +528,16 @@ declare class C {
     private z;
 }
 declare function f40(c: C): void;
+declare function f50<T>(k: keyof T, s: string, n: number): void;
+declare function f51<T, K extends keyof T>(k: K, s: string, n: number): void;
+declare function f52<T>(obj: {
+    [x: string]: boolean;
+}, k: keyof T, s: string, n: number): void;
+declare function f53<T, K extends keyof T>(obj: {
+    [x: string]: boolean;
+}, k: K, s: string, n: number): void;
+declare function f54<T>(obj: T, key: keyof T): void;
+declare function f55<T, K extends keyof T>(obj: T, key: K): void;
 declare class Base {
     get<K extends keyof this>(prop: K): this[K];
     set<K extends keyof this>(prop: K, value: this[K]): void;
diff --git a/tests/baselines/reference/keyofAndIndexedAccess.symbols b/tests/baselines/reference/keyofAndIndexedAccess.symbols
index a76cf32b8d2..0b10e368821 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.symbols
+++ b/tests/baselines/reference/keyofAndIndexedAccess.symbols
@@ -626,84 +626,242 @@ function f40(c: C) {
 >"z" : Symbol(C.z, Decl(keyofAndIndexedAccess.ts, 167, 24))
 }
 
+function f50<T>(k: keyof T, s: string, n: number) {
+>f50 : Symbol(f50, Decl(keyofAndIndexedAccess.ts, 180, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 182, 13))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 182, 16))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 182, 13))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 182, 27))
+>n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 182, 38))
+
+    const x1 = s as keyof T;
+>x1 : Symbol(x1, Decl(keyofAndIndexedAccess.ts, 183, 9))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 182, 27))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 182, 13))
+
+    const x2 = n as keyof T;
+>x2 : Symbol(x2, Decl(keyofAndIndexedAccess.ts, 184, 9))
+>n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 182, 38))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 182, 13))
+
+    const x3 = k as string;
+>x3 : Symbol(x3, Decl(keyofAndIndexedAccess.ts, 185, 9))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 182, 16))
+
+    const x4 = k as number;
+>x4 : Symbol(x4, Decl(keyofAndIndexedAccess.ts, 186, 9))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 182, 16))
+
+    const x5 = k as string | number;
+>x5 : Symbol(x5, Decl(keyofAndIndexedAccess.ts, 187, 9))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 182, 16))
+}
+
+function f51<T, K extends keyof T>(k: K, s: string, n: number) {
+>f51 : Symbol(f51, Decl(keyofAndIndexedAccess.ts, 188, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 190, 13))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 190, 15))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 190, 13))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 190, 35))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 190, 15))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 190, 40))
+>n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 190, 51))
+
+    const x1 = s as keyof T;
+>x1 : Symbol(x1, Decl(keyofAndIndexedAccess.ts, 191, 9))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 190, 40))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 190, 13))
+
+    const x2 = n as keyof T;
+>x2 : Symbol(x2, Decl(keyofAndIndexedAccess.ts, 192, 9))
+>n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 190, 51))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 190, 13))
+
+    const x3 = k as string;
+>x3 : Symbol(x3, Decl(keyofAndIndexedAccess.ts, 193, 9))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 190, 35))
+
+    const x4 = k as number;
+>x4 : Symbol(x4, Decl(keyofAndIndexedAccess.ts, 194, 9))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 190, 35))
+
+    const x5 = k as string | number;
+>x5 : Symbol(x5, Decl(keyofAndIndexedAccess.ts, 195, 9))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 190, 35))
+}
+
+function f52<T>(obj: { [x: string]: boolean }, k: keyof T, s: string, n: number) {
+>f52 : Symbol(f52, Decl(keyofAndIndexedAccess.ts, 196, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 198, 13))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 198, 16))
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 198, 24))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 198, 46))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 198, 13))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 198, 58))
+>n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 198, 69))
+
+    const x1 = obj[s];
+>x1 : Symbol(x1, Decl(keyofAndIndexedAccess.ts, 199, 9))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 198, 16))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 198, 58))
+
+    const x2 = obj[n];
+>x2 : Symbol(x2, Decl(keyofAndIndexedAccess.ts, 200, 9))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 198, 16))
+>n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 198, 69))
+
+    const x3 = obj[k];
+>x3 : Symbol(x3, Decl(keyofAndIndexedAccess.ts, 201, 9))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 198, 16))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 198, 46))
+}
+
+function f53<T, K extends keyof T>(obj: { [x: string]: boolean }, k: K, s: string, n: number) {
+>f53 : Symbol(f53, Decl(keyofAndIndexedAccess.ts, 202, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 204, 13))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 204, 15))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 204, 13))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 204, 35))
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 204, 43))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 204, 65))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 204, 15))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 204, 71))
+>n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 204, 82))
+
+    const x1 = obj[s];
+>x1 : Symbol(x1, Decl(keyofAndIndexedAccess.ts, 205, 9))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 204, 35))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 204, 71))
+
+    const x2 = obj[n];
+>x2 : Symbol(x2, Decl(keyofAndIndexedAccess.ts, 206, 9))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 204, 35))
+>n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 204, 82))
+
+    const x3 = obj[k];
+>x3 : Symbol(x3, Decl(keyofAndIndexedAccess.ts, 207, 9))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 204, 35))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 204, 65))
+}
+
+function f54<T>(obj: T, key: keyof T) {
+>f54 : Symbol(f54, Decl(keyofAndIndexedAccess.ts, 208, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 210, 13))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 210, 16))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 210, 13))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 210, 23))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 210, 13))
+
+    for (let s in obj[key]) {
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 211, 12))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 210, 16))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 210, 23))
+    }
+    const b = "foo" in obj[key];
+>b : Symbol(b, Decl(keyofAndIndexedAccess.ts, 213, 9))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 210, 16))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 210, 23))
+}
+
+function f55<T, K extends keyof T>(obj: T, key: K) {
+>f55 : Symbol(f55, Decl(keyofAndIndexedAccess.ts, 214, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 216, 13))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 216, 15))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 216, 13))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 216, 35))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 216, 13))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 216, 42))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 216, 15))
+
+    for (let s in obj[key]) {
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 217, 12))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 216, 35))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 216, 42))
+    }
+    const b = "foo" in obj[key];
+>b : Symbol(b, Decl(keyofAndIndexedAccess.ts, 219, 9))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 216, 35))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 216, 42))
+}
+
 // Repros from #12011
 
 class Base {
->Base : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 180, 1))
+>Base : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 220, 1))
 
     get<K extends keyof this>(prop: K) {
->get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 184, 12))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 185, 8))
->prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 185, 30))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 185, 8))
+>get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 224, 12))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 225, 8))
+>prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 225, 30))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 225, 8))
 
         return this[prop];
->this : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 180, 1))
->prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 185, 30))
+>this : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 220, 1))
+>prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 225, 30))
     }
     set<K extends keyof this>(prop: K, value: this[K]) {
->set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 187, 5))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 188, 8))
->prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 188, 30))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 188, 8))
->value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 188, 38))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 188, 8))
+>set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 227, 5))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 228, 8))
+>prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 228, 30))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 228, 8))
+>value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 228, 38))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 228, 8))
 
         this[prop] = value;
->this : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 180, 1))
->prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 188, 30))
->value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 188, 38))
+>this : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 220, 1))
+>prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 228, 30))
+>value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 228, 38))
     }
 }
 
 class Person extends Base {
->Person : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 191, 1))
->Base : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 180, 1))
+>Person : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 231, 1))
+>Base : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 220, 1))
 
     parts: number;
->parts : Symbol(Person.parts, Decl(keyofAndIndexedAccess.ts, 193, 27))
+>parts : Symbol(Person.parts, Decl(keyofAndIndexedAccess.ts, 233, 27))
 
     constructor(parts: number) {
->parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 195, 16))
+>parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 235, 16))
 
         super();
->super : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 180, 1))
+>super : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 220, 1))
 
         this.set("parts", parts);
->this.set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 187, 5))
->this : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 191, 1))
->set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 187, 5))
->parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 195, 16))
+>this.set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 227, 5))
+>this : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 231, 1))
+>set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 227, 5))
+>parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 235, 16))
     }
     getParts() {
->getParts : Symbol(Person.getParts, Decl(keyofAndIndexedAccess.ts, 198, 5))
+>getParts : Symbol(Person.getParts, Decl(keyofAndIndexedAccess.ts, 238, 5))
 
         return this.get("parts")
->this.get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 184, 12))
->this : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 191, 1))
->get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 184, 12))
+>this.get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 224, 12))
+>this : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 231, 1))
+>get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 224, 12))
     }
 }
 
 class OtherPerson {
->OtherPerson : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 202, 1))
+>OtherPerson : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 242, 1))
 
     parts: number;
->parts : Symbol(OtherPerson.parts, Decl(keyofAndIndexedAccess.ts, 204, 19))
+>parts : Symbol(OtherPerson.parts, Decl(keyofAndIndexedAccess.ts, 244, 19))
 
     constructor(parts: number) {
->parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 206, 16))
+>parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 246, 16))
 
         setProperty(this, "parts", parts);
 >setProperty : Symbol(setProperty, Decl(keyofAndIndexedAccess.ts, 79, 1))
->this : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 202, 1))
->parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 206, 16))
+>this : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 242, 1))
+>parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 246, 16))
     }
     getParts() {
->getParts : Symbol(OtherPerson.getParts, Decl(keyofAndIndexedAccess.ts, 208, 5))
+>getParts : Symbol(OtherPerson.getParts, Decl(keyofAndIndexedAccess.ts, 248, 5))
 
         return getProperty(this, "parts")
 >getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->this : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 202, 1))
+>this : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 242, 1))
     }
 }
diff --git a/tests/baselines/reference/keyofAndIndexedAccess.types b/tests/baselines/reference/keyofAndIndexedAccess.types
index c252ea4e2bd..020ac114126 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.types
+++ b/tests/baselines/reference/keyofAndIndexedAccess.types
@@ -737,6 +737,188 @@ function f40(c: C) {
 >"z" : "z"
 }
 
+function f50<T>(k: keyof T, s: string, n: number) {
+>f50 : <T>(k: keyof T, s: string, n: number) => void
+>T : T
+>k : keyof T
+>T : T
+>s : string
+>n : number
+
+    const x1 = s as keyof T;
+>x1 : keyof T
+>s as keyof T : keyof T
+>s : string
+>T : T
+
+    const x2 = n as keyof T;
+>x2 : keyof T
+>n as keyof T : keyof T
+>n : number
+>T : T
+
+    const x3 = k as string;
+>x3 : string
+>k as string : string
+>k : keyof T
+
+    const x4 = k as number;
+>x4 : number
+>k as number : number
+>k : keyof T
+
+    const x5 = k as string | number;
+>x5 : string | number
+>k as string | number : string | number
+>k : keyof T
+}
+
+function f51<T, K extends keyof T>(k: K, s: string, n: number) {
+>f51 : <T, K extends keyof T>(k: K, s: string, n: number) => void
+>T : T
+>K : K
+>T : T
+>k : K
+>K : K
+>s : string
+>n : number
+
+    const x1 = s as keyof T;
+>x1 : keyof T
+>s as keyof T : keyof T
+>s : string
+>T : T
+
+    const x2 = n as keyof T;
+>x2 : keyof T
+>n as keyof T : keyof T
+>n : number
+>T : T
+
+    const x3 = k as string;
+>x3 : string
+>k as string : string
+>k : K
+
+    const x4 = k as number;
+>x4 : number
+>k as number : number
+>k : K
+
+    const x5 = k as string | number;
+>x5 : string | number
+>k as string | number : string | number
+>k : K
+}
+
+function f52<T>(obj: { [x: string]: boolean }, k: keyof T, s: string, n: number) {
+>f52 : <T>(obj: { [x: string]: boolean; }, k: keyof T, s: string, n: number) => void
+>T : T
+>obj : { [x: string]: boolean; }
+>x : string
+>k : keyof T
+>T : T
+>s : string
+>n : number
+
+    const x1 = obj[s];
+>x1 : boolean
+>obj[s] : boolean
+>obj : { [x: string]: boolean; }
+>s : string
+
+    const x2 = obj[n];
+>x2 : boolean
+>obj[n] : boolean
+>obj : { [x: string]: boolean; }
+>n : number
+
+    const x3 = obj[k];
+>x3 : boolean
+>obj[k] : boolean
+>obj : { [x: string]: boolean; }
+>k : keyof T
+}
+
+function f53<T, K extends keyof T>(obj: { [x: string]: boolean }, k: K, s: string, n: number) {
+>f53 : <T, K extends keyof T>(obj: { [x: string]: boolean; }, k: K, s: string, n: number) => void
+>T : T
+>K : K
+>T : T
+>obj : { [x: string]: boolean; }
+>x : string
+>k : K
+>K : K
+>s : string
+>n : number
+
+    const x1 = obj[s];
+>x1 : boolean
+>obj[s] : boolean
+>obj : { [x: string]: boolean; }
+>s : string
+
+    const x2 = obj[n];
+>x2 : boolean
+>obj[n] : boolean
+>obj : { [x: string]: boolean; }
+>n : number
+
+    const x3 = obj[k];
+>x3 : { [x: string]: boolean; }[K]
+>obj[k] : { [x: string]: boolean; }[K]
+>obj : { [x: string]: boolean; }
+>k : K
+}
+
+function f54<T>(obj: T, key: keyof T) {
+>f54 : <T>(obj: T, key: keyof T) => void
+>T : T
+>obj : T
+>T : T
+>key : keyof T
+>T : T
+
+    for (let s in obj[key]) {
+>s : string
+>obj[key] : T[keyof T]
+>obj : T
+>key : keyof T
+    }
+    const b = "foo" in obj[key];
+>b : boolean
+>"foo" in obj[key] : boolean
+>"foo" : "foo"
+>obj[key] : T[keyof T]
+>obj : T
+>key : keyof T
+}
+
+function f55<T, K extends keyof T>(obj: T, key: K) {
+>f55 : <T, K extends keyof T>(obj: T, key: K) => void
+>T : T
+>K : K
+>T : T
+>obj : T
+>T : T
+>key : K
+>K : K
+
+    for (let s in obj[key]) {
+>s : string
+>obj[key] : T[K]
+>obj : T
+>key : K
+    }
+    const b = "foo" in obj[key];
+>b : boolean
+>"foo" in obj[key] : boolean
+>"foo" : "foo"
+>obj[key] : T[K]
+>obj : T
+>key : K
+}
+
 // Repros from #12011
 
 class Base {

From cd70f22b8806f519ded4caa4acf33f63bce97d57 Mon Sep 17 00:00:00 2001
From: Marius Schulz <marius.schulz@me.com>
Date: Sun, 20 Nov 2016 10:48:03 +0100
Subject: [PATCH 304/421] =?UTF-8?q?Add=20=E2=80=9C|=E2=80=9D=20and=20?=
 =?UTF-8?q?=E2=80=9C&=E2=80=9D=20to=20list=20of=20tokens=20that=20start=20?=
 =?UTF-8?q?a=20type?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 55d267cb53a..5117129a573 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -2556,6 +2556,8 @@ namespace ts {
                 case SyntaxKind.OpenBraceToken:
                 case SyntaxKind.OpenBracketToken:
                 case SyntaxKind.LessThanToken:
+                case SyntaxKind.BarToken:
+                case SyntaxKind.AmpersandToken:
                 case SyntaxKind.NewKeyword:
                 case SyntaxKind.StringLiteral:
                 case SyntaxKind.NumericLiteral:

From 4ed3225c06af34b5657d1a82f2f49f4b07b3a961 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sun, 20 Nov 2016 08:13:39 -0800
Subject: [PATCH 305/421] Add optimized getTypeOfExpression function

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 5f77f8952bb..68b1f7ef4d9 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -9000,7 +9000,7 @@ namespace ts {
 
         function getTypeWithDefault(type: Type, defaultExpression: Expression) {
             if (defaultExpression) {
-                const defaultType = checkExpression(defaultExpression);
+                const defaultType = getTypeOfExpression(defaultExpression);
                 return getUnionType([getTypeWithFacts(type, TypeFacts.NEUndefined), defaultType]);
             }
             return type;
@@ -9027,7 +9027,7 @@ namespace ts {
         function getAssignedTypeOfBinaryExpression(node: BinaryExpression): Type {
             return node.parent.kind === SyntaxKind.ArrayLiteralExpression || node.parent.kind === SyntaxKind.PropertyAssignment ?
                 getTypeWithDefault(getAssignedType(node), node.right) :
-                checkExpression(node.right);
+                getTypeOfExpression(node.right);
         }
 
         function getAssignedTypeOfArrayLiteralElement(node: ArrayLiteralExpression, element: Expression): Type {
@@ -9085,7 +9085,7 @@ namespace ts {
             // from its initializer, we'll already have cached the type. Otherwise we compute it now
             // without caching such that transient types are reflected.
             const links = getNodeLinks(node);
-            return links.resolvedType || checkExpression(node);
+            return links.resolvedType || getTypeOfExpression(node);
         }
 
         function getInitialTypeOfVariableDeclaration(node: VariableDeclaration) {
@@ -9145,7 +9145,7 @@ namespace ts {
 
         function getTypeOfSwitchClause(clause: CaseClause | DefaultClause) {
             if (clause.kind === SyntaxKind.CaseClause) {
-                const caseType = getRegularTypeOfLiteralType(checkExpression((<CaseClause>clause).expression));
+                const caseType = getRegularTypeOfLiteralType(getTypeOfExpression((<CaseClause>clause).expression));
                 return isUnitType(caseType) ? caseType : undefined;
             }
             return neverType;
@@ -9250,7 +9250,7 @@ namespace ts {
         // we defer subtype reduction until the evolving array type is finalized into a manifest
         // array type.
         function addEvolvingArrayElementType(evolvingArrayType: EvolvingArrayType, node: Expression): EvolvingArrayType {
-            const elementType = getBaseTypeOfLiteralType(checkExpression(node));
+            const elementType = getBaseTypeOfLiteralType(getTypeOfExpression(node));
             return isTypeSubsetOf(elementType, evolvingArrayType.elementType) ? evolvingArrayType : getEvolvingArrayType(getUnionType([evolvingArrayType.elementType, elementType]));
         }
 
@@ -9311,7 +9311,7 @@ namespace ts {
                 (<BinaryExpression>parent.parent).operatorToken.kind === SyntaxKind.EqualsToken &&
                 (<BinaryExpression>parent.parent).left === parent &&
                 !isAssignmentTarget(parent.parent) &&
-                isTypeAnyOrAllConstituentTypesHaveKind(checkExpression((<ElementAccessExpression>parent).argumentExpression), TypeFlags.NumberLike | TypeFlags.Undefined);
+                isTypeAnyOrAllConstituentTypesHaveKind(getTypeOfExpression((<ElementAccessExpression>parent).argumentExpression), TypeFlags.NumberLike | TypeFlags.Undefined);
             return isLengthPushOrUnshift || isElementAssignment;
         }
 
@@ -9473,7 +9473,7 @@ namespace ts {
                             }
                         }
                         else {
-                            const indexType = checkExpression((<ElementAccessExpression>(<BinaryExpression>node).left).argumentExpression);
+                            const indexType = getTypeOfExpression((<ElementAccessExpression>(<BinaryExpression>node).left).argumentExpression);
                             if (isTypeAnyOrAllConstituentTypesHaveKind(indexType, TypeFlags.NumberLike | TypeFlags.Undefined)) {
                                 evolvedType = addEvolvingArrayElementType(evolvedType, (<BinaryExpression>node).right);
                             }
@@ -9698,7 +9698,7 @@ namespace ts {
                 if (operator === SyntaxKind.ExclamationEqualsToken || operator === SyntaxKind.ExclamationEqualsEqualsToken) {
                     assumeTrue = !assumeTrue;
                 }
-                const valueType = checkExpression(value);
+                const valueType = getTypeOfExpression(value);
                 if (valueType.flags & TypeFlags.Nullable) {
                     if (!strictNullChecks) {
                         return type;
@@ -9785,7 +9785,7 @@ namespace ts {
                 }
 
                 // Check that right operand is a function type with a prototype property
-                const rightType = checkExpression(expr.right);
+                const rightType = getTypeOfExpression(expr.right);
                 if (!isTypeSubtypeOf(rightType, globalFunctionType)) {
                     return type;
                 }
@@ -9926,7 +9926,7 @@ namespace ts {
                     location = location.parent;
                 }
                 if (isPartOfExpression(location) && !isAssignmentTarget(location)) {
-                    const type = checkExpression(<Expression>location);
+                    const type = getTypeOfExpression(<Expression>location);
                     if (getExportSymbolOfValueSymbolIfExported(getNodeLinks(location).resolvedSymbol) === symbol) {
                         return type;
                     }
@@ -10794,7 +10794,7 @@ namespace ts {
 
                 // In an assignment expression, the right operand is contextually typed by the type of the left operand.
                 if (node === binaryExpression.right) {
-                    return checkExpression(binaryExpression.left);
+                    return getTypeOfExpression(binaryExpression.left);
                 }
             }
             else if (operator === SyntaxKind.BarBarToken) {
@@ -10802,7 +10802,7 @@ namespace ts {
                 // expression has no contextual type, the right operand is contextually typed by the type of the left operand.
                 let type = getContextualType(binaryExpression);
                 if (!type && node === binaryExpression.right) {
-                    type = checkExpression(binaryExpression.left);
+                    type = getTypeOfExpression(binaryExpression.left);
                 }
                 return type;
             }
@@ -12173,7 +12173,7 @@ namespace ts {
                         if (node.kind === SyntaxKind.ForInStatement &&
                             child === (<ForInStatement>node).statement &&
                             getForInVariableSymbol(<ForInStatement>node) === symbol &&
-                            hasNumericPropertyNames(checkExpression((<ForInStatement>node).expression))) {
+                            hasNumericPropertyNames(getTypeOfExpression((<ForInStatement>node).expression))) {
                             return true;
                         }
                         child = node;
@@ -13809,7 +13809,7 @@ namespace ts {
             if (!node.possiblyExhaustive) {
                 return false;
             }
-            const type = checkExpression(node.expression);
+            const type = getTypeOfExpression(node.expression);
             if (!isLiteralType(type)) {
                 return false;
             }
@@ -14901,6 +14901,24 @@ namespace ts {
             return type;
         }
 
+        // Returns the type of an expression. Unlike checkExpression, this function is simply concerned
+        // with computing the type and may not fully check all contained sub-expressions for errors.
+        function getTypeOfExpression(node: Expression) {
+            // 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 (node.kind === SyntaxKind.CallExpression && (<CallExpression>node).expression.kind !== SyntaxKind.SuperKeyword) {
+                const funcType = checkNonNullExpression((<CallExpression>node).expression);
+                const signature = getSingleCallSignature(funcType);
+                if (signature && !signature.typeParameters) {
+                    return getReturnTypeOfSignature(signature);
+                }
+            }
+            // Otherwise simply call checkExpression. Ideally, the entire family of checkXXX functions
+            // should have a parameter that indicates whether full error checking is required such that
+            // we can perform the optimizations locally.
+            return checkExpression(node);
+        }
+
         // 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
@@ -18283,7 +18301,7 @@ namespace ts {
                                     }
                                 }
 
-                                enumType = checkExpression(expression);
+                                enumType = getTypeOfExpression(expression);
                                 // allow references to constant members of other enums
                                 if (!(enumType.symbol && (enumType.symbol.flags & SymbolFlags.Enum))) {
                                     return undefined;
@@ -19453,7 +19471,7 @@ namespace ts {
                     // fallthrough
 
                 case SyntaxKind.SuperKeyword:
-                    const type = isPartOfExpression(node) ? checkExpression(<Expression>node) : getTypeFromTypeNode(<TypeNode>node);
+                    const type = isPartOfExpression(node) ? getTypeOfExpression(<Expression>node) : getTypeFromTypeNode(<TypeNode>node);
                     return type.symbol;
 
                 case SyntaxKind.ThisType:
@@ -19483,7 +19501,7 @@ namespace ts {
                 case SyntaxKind.NumericLiteral:
                     // index access
                     if (node.parent.kind === SyntaxKind.ElementAccessExpression && (<ElementAccessExpression>node.parent).argumentExpression === node) {
-                        const objectType = checkExpression((<ElementAccessExpression>node.parent).expression);
+                        const objectType = getTypeOfExpression((<ElementAccessExpression>node.parent).expression);
                         if (objectType === unknownType) return undefined;
                         const apparentType = getApparentType(objectType);
                         if (apparentType === unknownType) return undefined;
@@ -19522,7 +19540,7 @@ namespace ts {
             }
 
             if (isPartOfExpression(node)) {
-                return getTypeOfExpression(<Expression>node);
+                return getRegularTypeOfExpression(<Expression>node);
             }
 
             if (isExpressionWithTypeArgumentsInClassExtendsClause(node)) {
@@ -19584,7 +19602,7 @@ namespace ts {
             // If this is from "for" initializer
             //     for ({a } = elems[0];.....) { }
             if (expr.parent.kind === SyntaxKind.BinaryExpression) {
-                const iteratedType = checkExpression((<BinaryExpression>expr.parent).right);
+                const iteratedType = getTypeOfExpression((<BinaryExpression>expr.parent).right);
                 return checkDestructuringAssignment(expr, iteratedType || unknownType);
             }
             // If this is from nested object binding pattern
@@ -19614,11 +19632,11 @@ namespace ts {
             return typeOfObjectLiteral && getPropertyOfType(typeOfObjectLiteral, location.text);
         }
 
-        function getTypeOfExpression(expr: Expression): Type {
+        function getRegularTypeOfExpression(expr: Expression): Type {
             if (isRightSideOfQualifiedNameOrPropertyAccess(expr)) {
                 expr = <Expression>expr.parent;
             }
-            return getRegularTypeOfLiteralType(checkExpression(expr));
+            return getRegularTypeOfLiteralType(getTypeOfExpression(expr));
         }
 
         /**
@@ -20045,7 +20063,7 @@ namespace ts {
         }
 
         function writeTypeOfExpression(expr: Expression, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter) {
-            const type = getWidenedType(getTypeOfExpression(expr));
+            const type = getWidenedType(getRegularTypeOfExpression(expr));
             getSymbolDisplayBuilder().buildTypeDisplay(type, writer, enclosingDeclaration, flags);
         }
 

From d71c2dd03009549a393369a7328b17fe92b6f880 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sun, 20 Nov 2016 08:55:09 -0800
Subject: [PATCH 306/421] Accept new baselines

---
 tests/baselines/reference/ambientRequireFunction.types | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/baselines/reference/ambientRequireFunction.types b/tests/baselines/reference/ambientRequireFunction.types
index 7b01a59268f..e0341d97ec3 100644
--- a/tests/baselines/reference/ambientRequireFunction.types
+++ b/tests/baselines/reference/ambientRequireFunction.types
@@ -3,7 +3,7 @@
 
 const fs = require("fs");
 >fs : typeof "fs"
->require("fs") : typeof "fs"
+>require("fs") : any
 >require : (moduleName: string) => any
 >"fs" : "fs"
 

From c1c12c75f78c854edeb2309076e07ef950f71885 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sun, 20 Nov 2016 08:55:20 -0800
Subject: [PATCH 307/421] Add regression test

---
 .../controlFlowSelfReferentialLoop.errors.txt | 188 ++++++++++++++++
 .../controlFlowSelfReferentialLoop.js         | 207 ++++++++++++++++++
 .../controlFlowSelfReferentialLoop.ts         | 102 +++++++++
 3 files changed, 497 insertions(+)
 create mode 100644 tests/baselines/reference/controlFlowSelfReferentialLoop.errors.txt
 create mode 100644 tests/baselines/reference/controlFlowSelfReferentialLoop.js
 create mode 100644 tests/cases/compiler/controlFlowSelfReferentialLoop.ts

diff --git a/tests/baselines/reference/controlFlowSelfReferentialLoop.errors.txt b/tests/baselines/reference/controlFlowSelfReferentialLoop.errors.txt
new file mode 100644
index 00000000000..deef6403761
--- /dev/null
+++ b/tests/baselines/reference/controlFlowSelfReferentialLoop.errors.txt
@@ -0,0 +1,188 @@
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(6,17): error TS7006: Parameter 'a' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(6,19): error TS7006: Parameter 'b' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(6,21): error TS7006: Parameter 'c' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(6,23): error TS7006: Parameter 'd' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(6,25): error TS7006: Parameter 'x' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(6,27): error TS7006: Parameter 's' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(6,29): error TS7006: Parameter 'ac' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(10,17): error TS7006: Parameter 'a' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(10,19): error TS7006: Parameter 'b' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(10,21): error TS7006: Parameter 'c' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(10,23): error TS7006: Parameter 'd' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(10,25): error TS7006: Parameter 'x' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(10,27): error TS7006: Parameter 's' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(10,29): error TS7006: Parameter 'ac' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(14,17): error TS7006: Parameter 'a' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(14,19): error TS7006: Parameter 'b' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(14,21): error TS7006: Parameter 'c' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(14,23): error TS7006: Parameter 'd' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(14,25): error TS7006: Parameter 'x' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(14,27): error TS7006: Parameter 's' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(14,29): error TS7006: Parameter 'ac' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(18,17): error TS7006: Parameter 'a' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(18,19): error TS7006: Parameter 'b' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(18,21): error TS7006: Parameter 'c' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(18,23): error TS7006: Parameter 'd' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(18,25): error TS7006: Parameter 'x' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(18,27): error TS7006: Parameter 's' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(18,29): error TS7006: Parameter 'ac' implicitly has an 'any' type.
+
+
+==== tests/cases/compiler/controlFlowSelfReferentialLoop.ts (28 errors) ====
+    
+    // Repro from #12319
+    
+    function md5(string:string): void {
+    
+        function FF(a,b,c,d,x,s,ac) {
+                    ~
+!!! error TS7006: Parameter 'a' implicitly has an 'any' type.
+                      ~
+!!! error TS7006: Parameter 'b' implicitly has an 'any' type.
+                        ~
+!!! error TS7006: Parameter 'c' implicitly has an 'any' type.
+                          ~
+!!! error TS7006: Parameter 'd' implicitly has an 'any' type.
+                            ~
+!!! error TS7006: Parameter 'x' implicitly has an 'any' type.
+                              ~
+!!! error TS7006: Parameter 's' implicitly has an 'any' type.
+                                ~~
+!!! error TS7006: Parameter 'ac' implicitly has an 'any' type.
+            return 0;
+        };
+    
+        function GG(a,b,c,d,x,s,ac) {
+                    ~
+!!! error TS7006: Parameter 'a' implicitly has an 'any' type.
+                      ~
+!!! error TS7006: Parameter 'b' implicitly has an 'any' type.
+                        ~
+!!! error TS7006: Parameter 'c' implicitly has an 'any' type.
+                          ~
+!!! error TS7006: Parameter 'd' implicitly has an 'any' type.
+                            ~
+!!! error TS7006: Parameter 'x' implicitly has an 'any' type.
+                              ~
+!!! error TS7006: Parameter 's' implicitly has an 'any' type.
+                                ~~
+!!! error TS7006: Parameter 'ac' implicitly has an 'any' type.
+            return 0;
+        };
+    
+        function HH(a,b,c,d,x,s,ac) {
+                    ~
+!!! error TS7006: Parameter 'a' implicitly has an 'any' type.
+                      ~
+!!! error TS7006: Parameter 'b' implicitly has an 'any' type.
+                        ~
+!!! error TS7006: Parameter 'c' implicitly has an 'any' type.
+                          ~
+!!! error TS7006: Parameter 'd' implicitly has an 'any' type.
+                            ~
+!!! error TS7006: Parameter 'x' implicitly has an 'any' type.
+                              ~
+!!! error TS7006: Parameter 's' implicitly has an 'any' type.
+                                ~~
+!!! error TS7006: Parameter 'ac' implicitly has an 'any' type.
+            return 0;
+        };
+    
+        function II(a,b,c,d,x,s,ac) {
+                    ~
+!!! error TS7006: Parameter 'a' implicitly has an 'any' type.
+                      ~
+!!! error TS7006: Parameter 'b' implicitly has an 'any' type.
+                        ~
+!!! error TS7006: Parameter 'c' implicitly has an 'any' type.
+                          ~
+!!! error TS7006: Parameter 'd' implicitly has an 'any' type.
+                            ~
+!!! error TS7006: Parameter 'x' implicitly has an 'any' type.
+                              ~
+!!! error TS7006: Parameter 's' implicitly has an 'any' type.
+                                ~~
+!!! error TS7006: Parameter 'ac' implicitly has an 'any' type.
+            return 0;
+        };
+    
+        var x=Array();
+        var k,AA,BB,CC,DD,a,b,c,d;
+        var S11=7, S12=12, S13=17, S14=22;
+        var S21=5, S22=9 , S23=14, S24=20;
+        var S31=4, S32=11, S33=16, S34=23;
+        var S41=6, S42=10, S43=15, S44=21;
+    
+        x = [1];
+    
+        a = 0x67452301; b = 0xEFCDAB89; c = 0x98BADCFE; d = 0x10325476;
+    
+        for (k=0;k<x.length;k+=16) {
+            AA=a; BB=b; CC=c; DD=d;
+            a=FF(a,b,c,d,x[k+0], S11,0xD76AA478);
+            d=FF(d,a,b,c,x[k+1], S12,0xE8C7B756);
+            c=FF(c,d,a,b,x[k+2], S13,0x242070DB);
+            b=FF(b,c,d,a,x[k+3], S14,0xC1BDCEEE);
+            a=FF(a,b,c,d,x[k+4], S11,0xF57C0FAF);
+            d=FF(d,a,b,c,x[k+5], S12,0x4787C62A);
+            c=FF(c,d,a,b,x[k+6], S13,0xA8304613);
+            b=FF(b,c,d,a,x[k+7], S14,0xFD469501);
+            a=FF(a,b,c,d,x[k+8], S11,0x698098D8);
+            d=FF(d,a,b,c,x[k+9], S12,0x8B44F7AF);
+            c=FF(c,d,a,b,x[k+10],S13,0xFFFF5BB1);
+            b=FF(b,c,d,a,x[k+11],S14,0x895CD7BE);
+            a=FF(a,b,c,d,x[k+12],S11,0x6B901122);
+            d=FF(d,a,b,c,x[k+13],S12,0xFD987193);
+            c=FF(c,d,a,b,x[k+14],S13,0xA679438E);
+            b=FF(b,c,d,a,x[k+15],S14,0x49B40821);
+            a=GG(a,b,c,d,x[k+1], S21,0xF61E2562);
+            d=GG(d,a,b,c,x[k+6], S22,0xC040B340);
+            c=GG(c,d,a,b,x[k+11],S23,0x265E5A51);
+            b=GG(b,c,d,a,x[k+0], S24,0xE9B6C7AA);
+            a=GG(a,b,c,d,x[k+5], S21,0xD62F105D);
+            d=GG(d,a,b,c,x[k+10],S22,0x2441453);
+            c=GG(c,d,a,b,x[k+15],S23,0xD8A1E681);
+            b=GG(b,c,d,a,x[k+4], S24,0xE7D3FBC8);
+            a=GG(a,b,c,d,x[k+9], S21,0x21E1CDE6);
+            d=GG(d,a,b,c,x[k+14],S22,0xC33707D6);
+            c=GG(c,d,a,b,x[k+3], S23,0xF4D50D87);
+            b=GG(b,c,d,a,x[k+8], S24,0x455A14ED);
+            a=GG(a,b,c,d,x[k+13],S21,0xA9E3E905);
+            d=GG(d,a,b,c,x[k+2], S22,0xFCEFA3F8);
+            c=GG(c,d,a,b,x[k+7], S23,0x676F02D9);
+            b=GG(b,c,d,a,x[k+12],S24,0x8D2A4C8A);
+            a=HH(a,b,c,d,x[k+5], S31,0xFFFA3942);
+            d=HH(d,a,b,c,x[k+8], S32,0x8771F681);
+            c=HH(c,d,a,b,x[k+11],S33,0x6D9D6122);
+            b=HH(b,c,d,a,x[k+14],S34,0xFDE5380C);
+            a=HH(a,b,c,d,x[k+1], S31,0xA4BEEA44);
+            d=HH(d,a,b,c,x[k+4], S32,0x4BDECFA9);
+            c=HH(c,d,a,b,x[k+7], S33,0xF6BB4B60);
+            b=HH(b,c,d,a,x[k+10],S34,0xBEBFBC70);
+            a=HH(a,b,c,d,x[k+13],S31,0x289B7EC6);
+            d=HH(d,a,b,c,x[k+0], S32,0xEAA127FA);
+            c=HH(c,d,a,b,x[k+3], S33,0xD4EF3085);
+            b=HH(b,c,d,a,x[k+6], S34,0x4881D05);
+            a=HH(a,b,c,d,x[k+9], S31,0xD9D4D039);
+            d=HH(d,a,b,c,x[k+12],S32,0xE6DB99E5);
+            c=HH(c,d,a,b,x[k+15],S33,0x1FA27CF8);
+            b=HH(b,c,d,a,x[k+2], S34,0xC4AC5665);
+            a=II(a,b,c,d,x[k+0], S41,0xF4292244);
+            d=II(d,a,b,c,x[k+7], S42,0x432AFF97);
+            c=II(c,d,a,b,x[k+14],S43,0xAB9423A7);
+            b=II(b,c,d,a,x[k+5], S44,0xFC93A039);
+            a=II(a,b,c,d,x[k+12],S41,0x655B59C3);
+            d=II(d,a,b,c,x[k+3], S42,0x8F0CCC92);
+            c=II(c,d,a,b,x[k+10],S43,0xFFEFF47D);
+            b=II(b,c,d,a,x[k+1], S44,0x85845DD1);
+            a=II(a,b,c,d,x[k+8], S41,0x6FA87E4F);
+            d=II(d,a,b,c,x[k+15],S42,0xFE2CE6E0);
+            c=II(c,d,a,b,x[k+6], S43,0xA3014314);
+            b=II(b,c,d,a,x[k+13],S44,0x4E0811A1);
+            a=II(a,b,c,d,x[k+4], S41,0xF7537E82);
+            d=II(d,a,b,c,x[k+11],S42,0xBD3AF235);
+            c=II(c,d,a,b,x[k+2], S43,0x2AD7D2BB);
+            b=II(b,c,d,a,x[k+9], S44,0xEB86D391);
+        }
+    }
+    export default md5;
\ No newline at end of file
diff --git a/tests/baselines/reference/controlFlowSelfReferentialLoop.js b/tests/baselines/reference/controlFlowSelfReferentialLoop.js
new file mode 100644
index 00000000000..f7dbc0a2324
--- /dev/null
+++ b/tests/baselines/reference/controlFlowSelfReferentialLoop.js
@@ -0,0 +1,207 @@
+//// [controlFlowSelfReferentialLoop.ts]
+
+// Repro from #12319
+
+function md5(string:string): void {
+
+    function FF(a,b,c,d,x,s,ac) {
+        return 0;
+    };
+
+    function GG(a,b,c,d,x,s,ac) {
+        return 0;
+    };
+
+    function HH(a,b,c,d,x,s,ac) {
+        return 0;
+    };
+
+    function II(a,b,c,d,x,s,ac) {
+        return 0;
+    };
+
+    var x=Array();
+    var k,AA,BB,CC,DD,a,b,c,d;
+    var S11=7, S12=12, S13=17, S14=22;
+    var S21=5, S22=9 , S23=14, S24=20;
+    var S31=4, S32=11, S33=16, S34=23;
+    var S41=6, S42=10, S43=15, S44=21;
+
+    x = [1];
+
+    a = 0x67452301; b = 0xEFCDAB89; c = 0x98BADCFE; d = 0x10325476;
+
+    for (k=0;k<x.length;k+=16) {
+        AA=a; BB=b; CC=c; DD=d;
+        a=FF(a,b,c,d,x[k+0], S11,0xD76AA478);
+        d=FF(d,a,b,c,x[k+1], S12,0xE8C7B756);
+        c=FF(c,d,a,b,x[k+2], S13,0x242070DB);
+        b=FF(b,c,d,a,x[k+3], S14,0xC1BDCEEE);
+        a=FF(a,b,c,d,x[k+4], S11,0xF57C0FAF);
+        d=FF(d,a,b,c,x[k+5], S12,0x4787C62A);
+        c=FF(c,d,a,b,x[k+6], S13,0xA8304613);
+        b=FF(b,c,d,a,x[k+7], S14,0xFD469501);
+        a=FF(a,b,c,d,x[k+8], S11,0x698098D8);
+        d=FF(d,a,b,c,x[k+9], S12,0x8B44F7AF);
+        c=FF(c,d,a,b,x[k+10],S13,0xFFFF5BB1);
+        b=FF(b,c,d,a,x[k+11],S14,0x895CD7BE);
+        a=FF(a,b,c,d,x[k+12],S11,0x6B901122);
+        d=FF(d,a,b,c,x[k+13],S12,0xFD987193);
+        c=FF(c,d,a,b,x[k+14],S13,0xA679438E);
+        b=FF(b,c,d,a,x[k+15],S14,0x49B40821);
+        a=GG(a,b,c,d,x[k+1], S21,0xF61E2562);
+        d=GG(d,a,b,c,x[k+6], S22,0xC040B340);
+        c=GG(c,d,a,b,x[k+11],S23,0x265E5A51);
+        b=GG(b,c,d,a,x[k+0], S24,0xE9B6C7AA);
+        a=GG(a,b,c,d,x[k+5], S21,0xD62F105D);
+        d=GG(d,a,b,c,x[k+10],S22,0x2441453);
+        c=GG(c,d,a,b,x[k+15],S23,0xD8A1E681);
+        b=GG(b,c,d,a,x[k+4], S24,0xE7D3FBC8);
+        a=GG(a,b,c,d,x[k+9], S21,0x21E1CDE6);
+        d=GG(d,a,b,c,x[k+14],S22,0xC33707D6);
+        c=GG(c,d,a,b,x[k+3], S23,0xF4D50D87);
+        b=GG(b,c,d,a,x[k+8], S24,0x455A14ED);
+        a=GG(a,b,c,d,x[k+13],S21,0xA9E3E905);
+        d=GG(d,a,b,c,x[k+2], S22,0xFCEFA3F8);
+        c=GG(c,d,a,b,x[k+7], S23,0x676F02D9);
+        b=GG(b,c,d,a,x[k+12],S24,0x8D2A4C8A);
+        a=HH(a,b,c,d,x[k+5], S31,0xFFFA3942);
+        d=HH(d,a,b,c,x[k+8], S32,0x8771F681);
+        c=HH(c,d,a,b,x[k+11],S33,0x6D9D6122);
+        b=HH(b,c,d,a,x[k+14],S34,0xFDE5380C);
+        a=HH(a,b,c,d,x[k+1], S31,0xA4BEEA44);
+        d=HH(d,a,b,c,x[k+4], S32,0x4BDECFA9);
+        c=HH(c,d,a,b,x[k+7], S33,0xF6BB4B60);
+        b=HH(b,c,d,a,x[k+10],S34,0xBEBFBC70);
+        a=HH(a,b,c,d,x[k+13],S31,0x289B7EC6);
+        d=HH(d,a,b,c,x[k+0], S32,0xEAA127FA);
+        c=HH(c,d,a,b,x[k+3], S33,0xD4EF3085);
+        b=HH(b,c,d,a,x[k+6], S34,0x4881D05);
+        a=HH(a,b,c,d,x[k+9], S31,0xD9D4D039);
+        d=HH(d,a,b,c,x[k+12],S32,0xE6DB99E5);
+        c=HH(c,d,a,b,x[k+15],S33,0x1FA27CF8);
+        b=HH(b,c,d,a,x[k+2], S34,0xC4AC5665);
+        a=II(a,b,c,d,x[k+0], S41,0xF4292244);
+        d=II(d,a,b,c,x[k+7], S42,0x432AFF97);
+        c=II(c,d,a,b,x[k+14],S43,0xAB9423A7);
+        b=II(b,c,d,a,x[k+5], S44,0xFC93A039);
+        a=II(a,b,c,d,x[k+12],S41,0x655B59C3);
+        d=II(d,a,b,c,x[k+3], S42,0x8F0CCC92);
+        c=II(c,d,a,b,x[k+10],S43,0xFFEFF47D);
+        b=II(b,c,d,a,x[k+1], S44,0x85845DD1);
+        a=II(a,b,c,d,x[k+8], S41,0x6FA87E4F);
+        d=II(d,a,b,c,x[k+15],S42,0xFE2CE6E0);
+        c=II(c,d,a,b,x[k+6], S43,0xA3014314);
+        b=II(b,c,d,a,x[k+13],S44,0x4E0811A1);
+        a=II(a,b,c,d,x[k+4], S41,0xF7537E82);
+        d=II(d,a,b,c,x[k+11],S42,0xBD3AF235);
+        c=II(c,d,a,b,x[k+2], S43,0x2AD7D2BB);
+        b=II(b,c,d,a,x[k+9], S44,0xEB86D391);
+    }
+}
+export default md5;
+
+//// [controlFlowSelfReferentialLoop.js]
+// Repro from #12319
+"use strict";
+function md5(string) {
+    function FF(a, b, c, d, x, s, ac) {
+        return 0;
+    }
+    ;
+    function GG(a, b, c, d, x, s, ac) {
+        return 0;
+    }
+    ;
+    function HH(a, b, c, d, x, s, ac) {
+        return 0;
+    }
+    ;
+    function II(a, b, c, d, x, s, ac) {
+        return 0;
+    }
+    ;
+    var x = Array();
+    var k, AA, BB, CC, DD, a, b, c, d;
+    var S11 = 7, S12 = 12, S13 = 17, S14 = 22;
+    var S21 = 5, S22 = 9, S23 = 14, S24 = 20;
+    var S31 = 4, S32 = 11, S33 = 16, S34 = 23;
+    var S41 = 6, S42 = 10, S43 = 15, S44 = 21;
+    x = [1];
+    a = 0x67452301;
+    b = 0xEFCDAB89;
+    c = 0x98BADCFE;
+    d = 0x10325476;
+    for (k = 0; k < x.length; k += 16) {
+        AA = a;
+        BB = b;
+        CC = c;
+        DD = d;
+        a = FF(a, b, c, d, x[k + 0], S11, 0xD76AA478);
+        d = FF(d, a, b, c, x[k + 1], S12, 0xE8C7B756);
+        c = FF(c, d, a, b, x[k + 2], S13, 0x242070DB);
+        b = FF(b, c, d, a, x[k + 3], S14, 0xC1BDCEEE);
+        a = FF(a, b, c, d, x[k + 4], S11, 0xF57C0FAF);
+        d = FF(d, a, b, c, x[k + 5], S12, 0x4787C62A);
+        c = FF(c, d, a, b, x[k + 6], S13, 0xA8304613);
+        b = FF(b, c, d, a, x[k + 7], S14, 0xFD469501);
+        a = FF(a, b, c, d, x[k + 8], S11, 0x698098D8);
+        d = FF(d, a, b, c, x[k + 9], S12, 0x8B44F7AF);
+        c = FF(c, d, a, b, x[k + 10], S13, 0xFFFF5BB1);
+        b = FF(b, c, d, a, x[k + 11], S14, 0x895CD7BE);
+        a = FF(a, b, c, d, x[k + 12], S11, 0x6B901122);
+        d = FF(d, a, b, c, x[k + 13], S12, 0xFD987193);
+        c = FF(c, d, a, b, x[k + 14], S13, 0xA679438E);
+        b = FF(b, c, d, a, x[k + 15], S14, 0x49B40821);
+        a = GG(a, b, c, d, x[k + 1], S21, 0xF61E2562);
+        d = GG(d, a, b, c, x[k + 6], S22, 0xC040B340);
+        c = GG(c, d, a, b, x[k + 11], S23, 0x265E5A51);
+        b = GG(b, c, d, a, x[k + 0], S24, 0xE9B6C7AA);
+        a = GG(a, b, c, d, x[k + 5], S21, 0xD62F105D);
+        d = GG(d, a, b, c, x[k + 10], S22, 0x2441453);
+        c = GG(c, d, a, b, x[k + 15], S23, 0xD8A1E681);
+        b = GG(b, c, d, a, x[k + 4], S24, 0xE7D3FBC8);
+        a = GG(a, b, c, d, x[k + 9], S21, 0x21E1CDE6);
+        d = GG(d, a, b, c, x[k + 14], S22, 0xC33707D6);
+        c = GG(c, d, a, b, x[k + 3], S23, 0xF4D50D87);
+        b = GG(b, c, d, a, x[k + 8], S24, 0x455A14ED);
+        a = GG(a, b, c, d, x[k + 13], S21, 0xA9E3E905);
+        d = GG(d, a, b, c, x[k + 2], S22, 0xFCEFA3F8);
+        c = GG(c, d, a, b, x[k + 7], S23, 0x676F02D9);
+        b = GG(b, c, d, a, x[k + 12], S24, 0x8D2A4C8A);
+        a = HH(a, b, c, d, x[k + 5], S31, 0xFFFA3942);
+        d = HH(d, a, b, c, x[k + 8], S32, 0x8771F681);
+        c = HH(c, d, a, b, x[k + 11], S33, 0x6D9D6122);
+        b = HH(b, c, d, a, x[k + 14], S34, 0xFDE5380C);
+        a = HH(a, b, c, d, x[k + 1], S31, 0xA4BEEA44);
+        d = HH(d, a, b, c, x[k + 4], S32, 0x4BDECFA9);
+        c = HH(c, d, a, b, x[k + 7], S33, 0xF6BB4B60);
+        b = HH(b, c, d, a, x[k + 10], S34, 0xBEBFBC70);
+        a = HH(a, b, c, d, x[k + 13], S31, 0x289B7EC6);
+        d = HH(d, a, b, c, x[k + 0], S32, 0xEAA127FA);
+        c = HH(c, d, a, b, x[k + 3], S33, 0xD4EF3085);
+        b = HH(b, c, d, a, x[k + 6], S34, 0x4881D05);
+        a = HH(a, b, c, d, x[k + 9], S31, 0xD9D4D039);
+        d = HH(d, a, b, c, x[k + 12], S32, 0xE6DB99E5);
+        c = HH(c, d, a, b, x[k + 15], S33, 0x1FA27CF8);
+        b = HH(b, c, d, a, x[k + 2], S34, 0xC4AC5665);
+        a = II(a, b, c, d, x[k + 0], S41, 0xF4292244);
+        d = II(d, a, b, c, x[k + 7], S42, 0x432AFF97);
+        c = II(c, d, a, b, x[k + 14], S43, 0xAB9423A7);
+        b = II(b, c, d, a, x[k + 5], S44, 0xFC93A039);
+        a = II(a, b, c, d, x[k + 12], S41, 0x655B59C3);
+        d = II(d, a, b, c, x[k + 3], S42, 0x8F0CCC92);
+        c = II(c, d, a, b, x[k + 10], S43, 0xFFEFF47D);
+        b = II(b, c, d, a, x[k + 1], S44, 0x85845DD1);
+        a = II(a, b, c, d, x[k + 8], S41, 0x6FA87E4F);
+        d = II(d, a, b, c, x[k + 15], S42, 0xFE2CE6E0);
+        c = II(c, d, a, b, x[k + 6], S43, 0xA3014314);
+        b = II(b, c, d, a, x[k + 13], S44, 0x4E0811A1);
+        a = II(a, b, c, d, x[k + 4], S41, 0xF7537E82);
+        d = II(d, a, b, c, x[k + 11], S42, 0xBD3AF235);
+        c = II(c, d, a, b, x[k + 2], S43, 0x2AD7D2BB);
+        b = II(b, c, d, a, x[k + 9], S44, 0xEB86D391);
+    }
+}
+exports.__esModule = true;
+exports["default"] = md5;
diff --git a/tests/cases/compiler/controlFlowSelfReferentialLoop.ts b/tests/cases/compiler/controlFlowSelfReferentialLoop.ts
new file mode 100644
index 00000000000..361d3a557b4
--- /dev/null
+++ b/tests/cases/compiler/controlFlowSelfReferentialLoop.ts
@@ -0,0 +1,102 @@
+// @noimplicitany: true
+
+// Repro from #12319
+
+function md5(string:string): void {
+
+    function FF(a,b,c,d,x,s,ac) {
+        return 0;
+    };
+
+    function GG(a,b,c,d,x,s,ac) {
+        return 0;
+    };
+
+    function HH(a,b,c,d,x,s,ac) {
+        return 0;
+    };
+
+    function II(a,b,c,d,x,s,ac) {
+        return 0;
+    };
+
+    var x=Array();
+    var k,AA,BB,CC,DD,a,b,c,d;
+    var S11=7, S12=12, S13=17, S14=22;
+    var S21=5, S22=9 , S23=14, S24=20;
+    var S31=4, S32=11, S33=16, S34=23;
+    var S41=6, S42=10, S43=15, S44=21;
+
+    x = [1];
+
+    a = 0x67452301; b = 0xEFCDAB89; c = 0x98BADCFE; d = 0x10325476;
+
+    for (k=0;k<x.length;k+=16) {
+        AA=a; BB=b; CC=c; DD=d;
+        a=FF(a,b,c,d,x[k+0], S11,0xD76AA478);
+        d=FF(d,a,b,c,x[k+1], S12,0xE8C7B756);
+        c=FF(c,d,a,b,x[k+2], S13,0x242070DB);
+        b=FF(b,c,d,a,x[k+3], S14,0xC1BDCEEE);
+        a=FF(a,b,c,d,x[k+4], S11,0xF57C0FAF);
+        d=FF(d,a,b,c,x[k+5], S12,0x4787C62A);
+        c=FF(c,d,a,b,x[k+6], S13,0xA8304613);
+        b=FF(b,c,d,a,x[k+7], S14,0xFD469501);
+        a=FF(a,b,c,d,x[k+8], S11,0x698098D8);
+        d=FF(d,a,b,c,x[k+9], S12,0x8B44F7AF);
+        c=FF(c,d,a,b,x[k+10],S13,0xFFFF5BB1);
+        b=FF(b,c,d,a,x[k+11],S14,0x895CD7BE);
+        a=FF(a,b,c,d,x[k+12],S11,0x6B901122);
+        d=FF(d,a,b,c,x[k+13],S12,0xFD987193);
+        c=FF(c,d,a,b,x[k+14],S13,0xA679438E);
+        b=FF(b,c,d,a,x[k+15],S14,0x49B40821);
+        a=GG(a,b,c,d,x[k+1], S21,0xF61E2562);
+        d=GG(d,a,b,c,x[k+6], S22,0xC040B340);
+        c=GG(c,d,a,b,x[k+11],S23,0x265E5A51);
+        b=GG(b,c,d,a,x[k+0], S24,0xE9B6C7AA);
+        a=GG(a,b,c,d,x[k+5], S21,0xD62F105D);
+        d=GG(d,a,b,c,x[k+10],S22,0x2441453);
+        c=GG(c,d,a,b,x[k+15],S23,0xD8A1E681);
+        b=GG(b,c,d,a,x[k+4], S24,0xE7D3FBC8);
+        a=GG(a,b,c,d,x[k+9], S21,0x21E1CDE6);
+        d=GG(d,a,b,c,x[k+14],S22,0xC33707D6);
+        c=GG(c,d,a,b,x[k+3], S23,0xF4D50D87);
+        b=GG(b,c,d,a,x[k+8], S24,0x455A14ED);
+        a=GG(a,b,c,d,x[k+13],S21,0xA9E3E905);
+        d=GG(d,a,b,c,x[k+2], S22,0xFCEFA3F8);
+        c=GG(c,d,a,b,x[k+7], S23,0x676F02D9);
+        b=GG(b,c,d,a,x[k+12],S24,0x8D2A4C8A);
+        a=HH(a,b,c,d,x[k+5], S31,0xFFFA3942);
+        d=HH(d,a,b,c,x[k+8], S32,0x8771F681);
+        c=HH(c,d,a,b,x[k+11],S33,0x6D9D6122);
+        b=HH(b,c,d,a,x[k+14],S34,0xFDE5380C);
+        a=HH(a,b,c,d,x[k+1], S31,0xA4BEEA44);
+        d=HH(d,a,b,c,x[k+4], S32,0x4BDECFA9);
+        c=HH(c,d,a,b,x[k+7], S33,0xF6BB4B60);
+        b=HH(b,c,d,a,x[k+10],S34,0xBEBFBC70);
+        a=HH(a,b,c,d,x[k+13],S31,0x289B7EC6);
+        d=HH(d,a,b,c,x[k+0], S32,0xEAA127FA);
+        c=HH(c,d,a,b,x[k+3], S33,0xD4EF3085);
+        b=HH(b,c,d,a,x[k+6], S34,0x4881D05);
+        a=HH(a,b,c,d,x[k+9], S31,0xD9D4D039);
+        d=HH(d,a,b,c,x[k+12],S32,0xE6DB99E5);
+        c=HH(c,d,a,b,x[k+15],S33,0x1FA27CF8);
+        b=HH(b,c,d,a,x[k+2], S34,0xC4AC5665);
+        a=II(a,b,c,d,x[k+0], S41,0xF4292244);
+        d=II(d,a,b,c,x[k+7], S42,0x432AFF97);
+        c=II(c,d,a,b,x[k+14],S43,0xAB9423A7);
+        b=II(b,c,d,a,x[k+5], S44,0xFC93A039);
+        a=II(a,b,c,d,x[k+12],S41,0x655B59C3);
+        d=II(d,a,b,c,x[k+3], S42,0x8F0CCC92);
+        c=II(c,d,a,b,x[k+10],S43,0xFFEFF47D);
+        b=II(b,c,d,a,x[k+1], S44,0x85845DD1);
+        a=II(a,b,c,d,x[k+8], S41,0x6FA87E4F);
+        d=II(d,a,b,c,x[k+15],S42,0xFE2CE6E0);
+        c=II(c,d,a,b,x[k+6], S43,0xA3014314);
+        b=II(b,c,d,a,x[k+13],S44,0x4E0811A1);
+        a=II(a,b,c,d,x[k+4], S41,0xF7537E82);
+        d=II(d,a,b,c,x[k+11],S42,0xBD3AF235);
+        c=II(c,d,a,b,x[k+2], S43,0x2AD7D2BB);
+        b=II(b,c,d,a,x[k+9], S44,0xEB86D391);
+    }
+}
+export default md5;
\ No newline at end of file

From d040db42f51593ee5695a6a24a3ae595ee8aec1d Mon Sep 17 00:00:00 2001
From: Marius Schulz <marius.schulz@me.com>
Date: Sun, 20 Nov 2016 22:26:32 +0100
Subject: [PATCH 308/421] Add test for proper tuple type handling

---
 .../reference/intersectionTypeWithLeadingOperator.js       | 2 ++
 .../reference/intersectionTypeWithLeadingOperator.symbols  | 7 +++++++
 .../reference/intersectionTypeWithLeadingOperator.types    | 7 +++++++
 tests/baselines/reference/unionTypeWithLeadingOperator.js  | 2 ++
 .../reference/unionTypeWithLeadingOperator.symbols         | 3 +++
 .../baselines/reference/unionTypeWithLeadingOperator.types | 3 +++
 .../cases/compiler/intersectionTypeWithLeadingOperator.ts  | 2 ++
 tests/cases/compiler/unionTypeWithLeadingOperator.ts       | 2 ++
 8 files changed, 28 insertions(+)

diff --git a/tests/baselines/reference/intersectionTypeWithLeadingOperator.js b/tests/baselines/reference/intersectionTypeWithLeadingOperator.js
index 03f17c08788..61b034f1e03 100644
--- a/tests/baselines/reference/intersectionTypeWithLeadingOperator.js
+++ b/tests/baselines/reference/intersectionTypeWithLeadingOperator.js
@@ -3,6 +3,8 @@ type A = & string;
 type B =
   & { foo: string }
   & { bar: number };
+
+type C = [& { foo: 1 } & { bar: 2 }, & { foo: 3 } & { bar: 4 }];
 
 
 //// [intersectionTypeWithLeadingOperator.js]
diff --git a/tests/baselines/reference/intersectionTypeWithLeadingOperator.symbols b/tests/baselines/reference/intersectionTypeWithLeadingOperator.symbols
index 43e0db684dc..f6648183bb6 100644
--- a/tests/baselines/reference/intersectionTypeWithLeadingOperator.symbols
+++ b/tests/baselines/reference/intersectionTypeWithLeadingOperator.symbols
@@ -11,3 +11,10 @@ type B =
   & { bar: number };
 >bar : Symbol(bar, Decl(intersectionTypeWithLeadingOperator.ts, 3, 5))
 
+type C = [& { foo: 1 } & { bar: 2 }, & { foo: 3 } & { bar: 4 }];
+>C : Symbol(C, Decl(intersectionTypeWithLeadingOperator.ts, 3, 20))
+>foo : Symbol(foo, Decl(intersectionTypeWithLeadingOperator.ts, 5, 13))
+>bar : Symbol(bar, Decl(intersectionTypeWithLeadingOperator.ts, 5, 26))
+>foo : Symbol(foo, Decl(intersectionTypeWithLeadingOperator.ts, 5, 40))
+>bar : Symbol(bar, Decl(intersectionTypeWithLeadingOperator.ts, 5, 53))
+
diff --git a/tests/baselines/reference/intersectionTypeWithLeadingOperator.types b/tests/baselines/reference/intersectionTypeWithLeadingOperator.types
index f2fad709dce..9961f051f7f 100644
--- a/tests/baselines/reference/intersectionTypeWithLeadingOperator.types
+++ b/tests/baselines/reference/intersectionTypeWithLeadingOperator.types
@@ -11,3 +11,10 @@ type B =
   & { bar: number };
 >bar : number
 
+type C = [& { foo: 1 } & { bar: 2 }, & { foo: 3 } & { bar: 4 }];
+>C : [{ foo: 1; } & { bar: 2; }, { foo: 3; } & { bar: 4; }]
+>foo : 1
+>bar : 2
+>foo : 3
+>bar : 4
+
diff --git a/tests/baselines/reference/unionTypeWithLeadingOperator.js b/tests/baselines/reference/unionTypeWithLeadingOperator.js
index b6a40440a48..0fb366d538e 100644
--- a/tests/baselines/reference/unionTypeWithLeadingOperator.js
+++ b/tests/baselines/reference/unionTypeWithLeadingOperator.js
@@ -3,6 +3,8 @@ type A = | string;
 type B =
   | { type: "INCREMENT" }
   | { type: "DECREMENT" };
+
+type C = [| 0 | 1, | "foo" | "bar"];
 
 
 //// [unionTypeWithLeadingOperator.js]
diff --git a/tests/baselines/reference/unionTypeWithLeadingOperator.symbols b/tests/baselines/reference/unionTypeWithLeadingOperator.symbols
index 97fdcdda8e0..8c15d299c48 100644
--- a/tests/baselines/reference/unionTypeWithLeadingOperator.symbols
+++ b/tests/baselines/reference/unionTypeWithLeadingOperator.symbols
@@ -11,3 +11,6 @@ type B =
   | { type: "DECREMENT" };
 >type : Symbol(type, Decl(unionTypeWithLeadingOperator.ts, 3, 5))
 
+type C = [| 0 | 1, | "foo" | "bar"];
+>C : Symbol(C, Decl(unionTypeWithLeadingOperator.ts, 3, 26))
+
diff --git a/tests/baselines/reference/unionTypeWithLeadingOperator.types b/tests/baselines/reference/unionTypeWithLeadingOperator.types
index db92c6e8eb6..2ca15fb54a2 100644
--- a/tests/baselines/reference/unionTypeWithLeadingOperator.types
+++ b/tests/baselines/reference/unionTypeWithLeadingOperator.types
@@ -11,3 +11,6 @@ type B =
   | { type: "DECREMENT" };
 >type : "DECREMENT"
 
+type C = [| 0 | 1, | "foo" | "bar"];
+>C : [0 | 1, "foo" | "bar"]
+
diff --git a/tests/cases/compiler/intersectionTypeWithLeadingOperator.ts b/tests/cases/compiler/intersectionTypeWithLeadingOperator.ts
index 9f64cad38dc..4138dee4261 100644
--- a/tests/cases/compiler/intersectionTypeWithLeadingOperator.ts
+++ b/tests/cases/compiler/intersectionTypeWithLeadingOperator.ts
@@ -2,3 +2,5 @@ type A = & string;
 type B =
   & { foo: string }
   & { bar: number };
+
+type C = [& { foo: 1 } & { bar: 2 }, & { foo: 3 } & { bar: 4 }];
diff --git a/tests/cases/compiler/unionTypeWithLeadingOperator.ts b/tests/cases/compiler/unionTypeWithLeadingOperator.ts
index 08a876493d0..9f6d272ce7c 100644
--- a/tests/cases/compiler/unionTypeWithLeadingOperator.ts
+++ b/tests/cases/compiler/unionTypeWithLeadingOperator.ts
@@ -2,3 +2,5 @@ type A = | string;
 type B =
   | { type: "INCREMENT" }
   | { type: "DECREMENT" };
+
+type C = [| 0 | 1, | "foo" | "bar"];

From 110c3ac6ace8d7498518d1836a644bdf740c9bfc Mon Sep 17 00:00:00 2001
From: Zhengbo Li <zhengbli@microsoft.com>
Date: Mon, 21 Nov 2016 10:30:38 -0800
Subject: [PATCH 309/421] Add locale options to tsserver (#12369)

* add locale options to tsserver

* make sys an argument

* fix mistakes and address code review
---
 src/compiler/tsc.ts       | 62 +---------------------------
 src/compiler/utilities.ts | 85 ++++++++++++++++++++++++++++++++++-----
 src/server/server.ts      |  5 +++
 3 files changed, 82 insertions(+), 70 deletions(-)

diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts
index 10d4a0c1d36..a7304eebe4b 100644
--- a/src/compiler/tsc.ts
+++ b/src/compiler/tsc.ts
@@ -43,66 +43,6 @@ namespace ts {
         }
     }
 
-    /**
-     * Checks to see if the locale is in the appropriate format,
-     * and if it is, attempts to set the appropriate language.
-     */
-    function validateLocaleAndSetLanguage(locale: string, errors: Diagnostic[]): boolean {
-        const matchResult = /^([a-z]+)([_\-]([a-z]+))?$/.exec(locale.toLowerCase());
-
-        if (!matchResult) {
-            errors.push(createCompilerDiagnostic(Diagnostics.Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1, "en", "ja-jp"));
-            return false;
-        }
-
-        const language = matchResult[1];
-        const territory = matchResult[3];
-
-        // First try the entire locale, then fall back to just language if that's all we have.
-        // Either ways do not fail, and fallback to the English diagnostic strings.
-        if (!trySetLanguageAndTerritory(language, territory, errors)) {
-            trySetLanguageAndTerritory(language, undefined, errors);
-        }
-
-        return true;
-    }
-
-    function trySetLanguageAndTerritory(language: string, territory: string, errors: Diagnostic[]): boolean {
-        const compilerFilePath = normalizePath(sys.getExecutingFilePath());
-        const containingDirectoryPath = getDirectoryPath(compilerFilePath);
-
-        let filePath = combinePaths(containingDirectoryPath, language);
-
-        if (territory) {
-            filePath = filePath + "-" + territory;
-        }
-
-        filePath = sys.resolvePath(combinePaths(filePath, "diagnosticMessages.generated.json"));
-
-        if (!sys.fileExists(filePath)) {
-            return false;
-        }
-
-        // TODO: Add codePage support for readFile?
-        let fileContents = "";
-        try {
-            fileContents = sys.readFile(filePath);
-        }
-        catch (e) {
-            errors.push(createCompilerDiagnostic(Diagnostics.Unable_to_open_file_0, filePath));
-            return false;
-        }
-        try {
-            ts.localizedDiagnosticMessages = JSON.parse(fileContents);
-        }
-        catch (e) {
-            errors.push(createCompilerDiagnostic(Diagnostics.Corrupted_locale_file_0, filePath));
-            return false;
-        }
-
-        return true;
-    }
-
     function countLines(program: Program): number {
         let count = 0;
         forEach(program.getSourceFiles(), file => {
@@ -263,7 +203,7 @@ namespace ts {
                 reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_current_host_does_not_support_the_0_option, "--locale"), /* host */ undefined);
                 return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
             }
-            validateLocaleAndSetLanguage(commandLine.options.locale, commandLine.errors);
+            validateLocaleAndSetLanguage(commandLine.options.locale, sys, commandLine.errors);
         }
 
         // If there are any errors due to command line parsing and/or
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 546416884f1..09318fbe41d 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -472,15 +472,15 @@ namespace ts {
 
     export function getTextOfPropertyName(name: PropertyName): string {
         switch (name.kind) {
-        case SyntaxKind.Identifier:
-            return (<Identifier>name).text;
-        case SyntaxKind.StringLiteral:
-        case SyntaxKind.NumericLiteral:
-            return (<LiteralExpression>name).text;
-        case SyntaxKind.ComputedPropertyName:
-            if (isStringOrNumericLiteral((<ComputedPropertyName>name).expression)) {
-                return (<LiteralExpression>(<ComputedPropertyName>name).expression).text;
-            }
+            case SyntaxKind.Identifier:
+                return (<Identifier>name).text;
+            case SyntaxKind.StringLiteral:
+            case SyntaxKind.NumericLiteral:
+                return (<LiteralExpression>name).text;
+            case SyntaxKind.ComputedPropertyName:
+                if (isStringOrNumericLiteral((<ComputedPropertyName>name).expression)) {
+                    return (<LiteralExpression>(<ComputedPropertyName>name).expression).text;
+                }
         }
 
         return undefined;
@@ -4554,4 +4554,71 @@ namespace ts {
 
         return flags;
     }
+
+    /**
+      * Checks to see if the locale is in the appropriate format,
+      * and if it is, attempts to set the appropriate language.
+      */
+    export function validateLocaleAndSetLanguage(
+        locale: string,
+        sys: { getExecutingFilePath(): string, resolvePath(path: string): string, fileExists(fileName: string): boolean, readFile(fileName: string): string },
+        errors?: Diagnostic[]) {
+        const matchResult = /^([a-z]+)([_\-]([a-z]+))?$/.exec(locale.toLowerCase());
+
+        if (!matchResult) {
+            if (errors) {
+                errors.push(createCompilerDiagnostic(Diagnostics.Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1, "en", "ja-jp"));
+            }
+            return;
+        }
+
+        const language = matchResult[1];
+        const territory = matchResult[3];
+
+        // First try the entire locale, then fall back to just language if that's all we have.
+        // Either ways do not fail, and fallback to the English diagnostic strings.
+        if (!trySetLanguageAndTerritory(language, territory, errors)) {
+            trySetLanguageAndTerritory(language, /*territory*/ undefined, errors);
+        }
+
+        function trySetLanguageAndTerritory(language: string, territory: string, errors?: Diagnostic[]): boolean {
+            const compilerFilePath = normalizePath(sys.getExecutingFilePath());
+            const containingDirectoryPath = getDirectoryPath(compilerFilePath);
+
+            let filePath = combinePaths(containingDirectoryPath, language);
+
+            if (territory) {
+                filePath = filePath + "-" + territory;
+            }
+
+            filePath = sys.resolvePath(combinePaths(filePath, "diagnosticMessages.generated.json"));
+
+            if (!sys.fileExists(filePath)) {
+                return false;
+            }
+
+            // TODO: Add codePage support for readFile?
+            let fileContents = "";
+            try {
+                fileContents = sys.readFile(filePath);
+            }
+            catch (e) {
+                if (errors) {
+                    errors.push(createCompilerDiagnostic(Diagnostics.Unable_to_open_file_0, filePath));
+                }
+                return false;
+            }
+            try {
+                ts.localizedDiagnosticMessages = JSON.parse(fileContents);
+            }
+            catch (e) {
+                if (errors) {
+                    errors.push(createCompilerDiagnostic(Diagnostics.Corrupted_locale_file_0, filePath));
+                }
+                return false;
+            }
+
+            return true;
+        }
+    }
 }
diff --git a/src/server/server.ts b/src/server/server.ts
index afe0382084c..1d013c8c62a 100644
--- a/src/server/server.ts
+++ b/src/server/server.ts
@@ -578,6 +578,11 @@ namespace ts.server {
         }
     }
 
+    const localeStr = findArgument("--locale");
+    if (localeStr) {
+        validateLocaleAndSetLanguage(localeStr, sys);
+    }
+
     const useSingleInferredProject = hasArgument("--useSingleInferredProject");
     const disableAutomaticTypingAcquisition = hasArgument("--disableAutomaticTypingAcquisition");
     const telemetryEnabled = hasArgument(Arguments.EnableTelemetry);

From 7c1f33f9136775646b45ffe0b8dae0657985abd0 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Mon, 21 Nov 2016 10:42:54 -0800
Subject: [PATCH 310/421] Fix lint errors

---
 src/services/codefixes/importFixes.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/services/codefixes/importFixes.ts b/src/services/codefixes/importFixes.ts
index 4adda19689d..bda310f2d33 100644
--- a/src/services/codefixes/importFixes.ts
+++ b/src/services/codefixes/importFixes.ts
@@ -52,7 +52,7 @@ namespace ts.codefix {
                         // than another existing one. For example, you may have new imports from "./foo/bar"
                         // and "bar", when the new one is "bar/bar2" and the current one is "./foo/bar". The new
                         // one and the current one are not comparable (one relative path and one absolute path),
-                        // but the new one is worse than the other one, so should not add to the list.  
+                        // but the new one is worse than the other one, so should not add to the list.
                         updatedNewImports.push(existingAction);
                         break;
                     case ModuleSpecifierComparison.Worse:
@@ -145,7 +145,7 @@ namespace ts.codefix {
                     if (localSymbol && localSymbol.name === name && checkSymbolHasMeaning(localSymbol, currentTokenMeaning)) {
                         // check if this symbol is already used
                         const symbolId = getUniqueSymbolId(localSymbol);
-                        symbolIdActionMap.addActions(symbolId, getCodeActionForImport(moduleSymbol, /*isDefaultExport*/ true));
+                        symbolIdActionMap.addActions(symbolId, getCodeActionForImport(moduleSymbol, /*isDefault*/ true));
                     }
                 }
 
@@ -483,7 +483,7 @@ namespace ts.codefix {
                                 const normalizedTypeRoots = map(typeRoots, typeRoot => toPath(typeRoot, /*basePath*/ undefined, getCanonicalFileName));
                                 for (const typeRoot of normalizedTypeRoots) {
                                     if (startsWith(moduleFileName, typeRoot)) {
-                                        let relativeFileName = moduleFileName.substring(typeRoot.length + 1);
+                                        const relativeFileName = moduleFileName.substring(typeRoot.length + 1);
                                         return removeExtensionAndIndexPostFix(relativeFileName);
                                     }
                                 }

From b060107b516b04c37081419770374a62b99c2bed Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Mon, 21 Nov 2016 11:34:09 -0800
Subject: [PATCH 311/421] recompute character to column when comparing
 indentations (#12375)

recompute character to column when comparing indentations
---
 src/services/formatting/formatting.ts    | 15 ++++++++++++++-
 tests/cases/fourslash/formatWithTabs.ts  | 16 ++++++++++++++++
 tests/cases/fourslash/formatWithTabs2.ts | 16 ++++++++++++++++
 3 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 tests/cases/fourslash/formatWithTabs.ts
 create mode 100644 tests/cases/fourslash/formatWithTabs2.ts

diff --git a/src/services/formatting/formatting.ts b/src/services/formatting/formatting.ts
index 7f594ad82b1..bcd8cebb017 100644
--- a/src/services/formatting/formatting.ts
+++ b/src/services/formatting/formatting.ts
@@ -886,12 +886,25 @@ namespace ts.formatting {
             else {
                 const tokenStart = sourceFile.getLineAndCharacterOfPosition(pos);
                 const startLinePosition = getStartPositionOfLine(tokenStart.line, sourceFile);
-                if (indentation !== tokenStart.character || indentationIsDifferent(indentationString, startLinePosition)) {
+                if (indentation !== characterToColumn(startLinePosition, tokenStart.character) || indentationIsDifferent(indentationString, startLinePosition)) {
                     recordReplace(startLinePosition, tokenStart.character, indentationString);
                 }
             }
         }
 
+        function characterToColumn(startLinePosition: number, characterInLine: number): number {
+            let column = 0;
+            for (let i = 0; i < characterInLine; i++) {
+                if (sourceFile.text.charCodeAt(startLinePosition + i) === CharacterCodes.tab) {
+                    column += options.tabSize - column % options.tabSize;
+                }
+                else {
+                    column++;
+                }
+            }
+            return column;
+        }
+
         function indentationIsDifferent(indentationString: string, startLinePosition: number): boolean {
             return indentationString !== sourceFile.text.substr(startLinePosition, indentationString.length);
         }
diff --git a/tests/cases/fourslash/formatWithTabs.ts b/tests/cases/fourslash/formatWithTabs.ts
new file mode 100644
index 00000000000..c33808bd26a
--- /dev/null
+++ b/tests/cases/fourslash/formatWithTabs.ts
@@ -0,0 +1,16 @@
+/// <reference path="fourslash.ts"/>
+
+////const foo = [
+////		1
+////];
+
+const options = format.copyFormatOptions();
+options.IndentSize = 2;
+options.TabSize = 2;
+options.ConvertTabsToSpaces = false;
+format.setFormatOptions(options);
+format.document();
+verify.currentFileContentIs(
+`const foo = [
+	1
+];`);
\ No newline at end of file
diff --git a/tests/cases/fourslash/formatWithTabs2.ts b/tests/cases/fourslash/formatWithTabs2.ts
new file mode 100644
index 00000000000..cda82b9cf80
--- /dev/null
+++ b/tests/cases/fourslash/formatWithTabs2.ts
@@ -0,0 +1,16 @@
+/// <reference path="fourslash.ts"/>
+
+////const foo = [
+//// 	1
+////];
+
+const options = format.copyFormatOptions();
+options.IndentSize = 2;
+options.TabSize = 2;
+options.ConvertTabsToSpaces = false;
+format.setFormatOptions(options);
+format.document();
+verify.currentFileContentIs(
+`const foo = [
+	1
+];`);
\ No newline at end of file

From 76ceab97dd744de160f28e2ec7412a6de4ca73dd Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Mon, 21 Nov 2016 11:41:51 -0800
Subject: [PATCH 312/421] Make keyof T a string-like type

---
 src/compiler/checker.ts | 26 +++++++-------------------
 src/compiler/types.ts   |  2 +-
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index fdb9f928928..3c8c0be77c7 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -142,7 +142,6 @@ namespace ts {
         const voidType = createIntrinsicType(TypeFlags.Void, "void");
         const neverType = createIntrinsicType(TypeFlags.Never, "never");
         const silentNeverType = createIntrinsicType(TypeFlags.Never, "never");
-        const stringOrNumberType = getUnionType([stringType, numberType]);
 
         const emptyObjectType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
 
@@ -3219,6 +3218,8 @@ namespace ts {
 
             // A variable declared in a for..in statement is always of type string
             if (declaration.parent.parent.kind === SyntaxKind.ForInStatement) {
+                // const indexType = getIndexType(checkNonNullExpression((<ForInStatement>declaration.parent.parent).expression));
+                // return indexType.flags & TypeFlags.Index ? indexType : stringType;
                 return stringType;
             }
 
@@ -4688,7 +4689,6 @@ namespace ts {
                 t.flags & TypeFlags.NumberLike ? globalNumberType :
                 t.flags & TypeFlags.BooleanLike ? globalBooleanType :
                 t.flags & TypeFlags.ESSymbol ? getGlobalESSymbolType() :
-                t.flags & TypeFlags.Index ? stringOrNumberType :
                 t;
         }
 
@@ -5920,8 +5920,7 @@ namespace ts {
         function getIndexType(type: Type): Type {
             return type.flags & TypeFlags.TypeParameter ? getIndexTypeForTypeParameter(<TypeParameter>type) :
                 getObjectFlags(type) & ObjectFlags.Mapped ? getConstraintTypeFromMappedType(<MappedType>type) :
-                type.flags & TypeFlags.Any || getIndexInfoOfType(type, IndexKind.String) ? stringOrNumberType :
-                getIndexInfoOfType(type, IndexKind.Number) ? getUnionType([numberType, getLiteralTypeFromPropertyNames(type)]) :
+                type.flags & TypeFlags.Any || getIndexInfoOfType(type, IndexKind.String) ? stringType :
                 getLiteralTypeFromPropertyNames(type);
         }
 
@@ -6040,10 +6039,9 @@ namespace ts {
                 return indexedAccessTypes[id] || (indexedAccessTypes[id] = createIndexedAccessType(objectType, indexType));
             }
             const apparentObjectType = getApparentType(objectType);
-            const apparentIndexType = indexType.flags & TypeFlags.Index ? stringOrNumberType : indexType;
-            if (apparentIndexType.flags & TypeFlags.Union && !(apparentIndexType.flags & TypeFlags.Primitive)) {
+            if (indexType.flags & TypeFlags.Union && !(indexType.flags & TypeFlags.Primitive)) {
                 const propTypes: Type[] = [];
-                for (const t of (<UnionType>apparentIndexType).types) {
+                for (const t of (<UnionType>indexType).types) {
                     const propType = getPropertyTypeForIndexType(apparentObjectType, t, accessNode, /*cacheSymbol*/ false);
                     if (propType === unknownType) {
                         return unknownType;
@@ -6052,7 +6050,7 @@ namespace ts {
                 }
                 return getUnionType(propTypes);
             }
-            return getPropertyTypeForIndexType(apparentObjectType, apparentIndexType, accessNode, /*cacheSymbol*/ true);
+            return getPropertyTypeForIndexType(apparentObjectType, indexType, accessNode, /*cacheSymbol*/ true);
         }
 
         function getTypeFromIndexedAccessTypeNode(node: IndexedAccessTypeNode) {
@@ -7124,16 +7122,6 @@ namespace ts {
 
                 if (isSimpleTypeRelatedTo(source, target, relation, reportErrors ? reportError : undefined)) return Ternary.True;
 
-                if (source.flags & TypeFlags.Index) {
-                    // A keyof T is related to a union type containing both string and number
-                    const related = relation === comparableRelation ?
-                        maybeTypeOfKind(target, TypeFlags.String | TypeFlags.Number) :
-                        maybeTypeOfKind(target, TypeFlags.String) && maybeTypeOfKind(target, TypeFlags.Number);
-                    if (related) {
-                        return Ternary.True;
-                    }
-                }
-
                 if (getObjectFlags(source) & ObjectFlags.ObjectLiteral && source.flags & TypeFlags.FreshLiteral) {
                     if (hasExcessProperties(<FreshObjectLiteralType>source, target, reportErrors)) {
                         if (reportErrors) {
@@ -15654,7 +15642,7 @@ namespace ts {
             const type = <MappedType>getTypeFromMappedTypeNode(node);
             const constraintType = getConstraintTypeFromMappedType(type);
             const keyType = constraintType.flags & TypeFlags.TypeParameter ? getApparentTypeOfTypeParameter(<TypeParameter>constraintType) : constraintType;
-            checkTypeAssignableTo(keyType, stringOrNumberType, node.typeParameter.constraint);
+            checkTypeAssignableTo(keyType, stringType, node.typeParameter.constraint);
         }
 
         function isPrivateWithinAmbient(node: Node): boolean {
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 2b8b6fe294e..e79e136ac32 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -2789,7 +2789,7 @@ namespace ts {
         Intrinsic = Any | String | Number | Boolean | BooleanLiteral | ESSymbol | Void | Undefined | Null | Never,
         /* @internal */
         Primitive = String | Number | Boolean | Enum | ESSymbol | Void | Undefined | Null | Literal,
-        StringLike = String | StringLiteral,
+        StringLike = String | StringLiteral | Index,
         NumberLike = Number | NumberLiteral | Enum | EnumLiteral,
         BooleanLike = Boolean | BooleanLiteral,
         EnumLike = Enum | EnumLiteral,

From 854a20f1febb50bfa4d814572adc777e8609b226 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Mon, 21 Nov 2016 11:42:21 -0800
Subject: [PATCH 313/421] Update Record<K, T> type

---
 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 e402a96fade..7ee47817802 100644
--- a/src/lib/es5.d.ts
+++ b/src/lib/es5.d.ts
@@ -1367,7 +1367,7 @@ type Pick<T, K extends keyof T> = {
 /**
  * Construct a type with a set of properties K of type T
  */
-type Record<K extends string | number, T> = {
+type Record<K extends string, T> = {
     [P in K]: T;
 }
 

From 5498a95245183dab4e0d6be25de6912361101017 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Mon, 21 Nov 2016 11:42:38 -0800
Subject: [PATCH 314/421] Update tests

---
 .../types/keyof/keyofAndIndexedAccess.ts      | 22 +++++--------------
 .../types/mapped/mappedTypeErrors.ts          |  5 +++--
 .../conformance/types/mapped/mappedTypes1.ts  |  8 ++-----
 .../conformance/types/mapped/mappedTypes2.ts  |  2 +-
 4 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts b/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
index 522bfe34e15..690154cb7ac 100644
--- a/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
+++ b/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
@@ -95,22 +95,18 @@ function f10(shape: Shape) {
 
 function f11(a: Shape[]) {
     let len = getProperty(a, "length");  // number
-    let shape = getProperty(a, 1000);    // Shape
-    setProperty(a, 1000, getProperty(a, 1001));
+    setProperty(a, "length", len);
 }
 
 function f12(t: [Shape, boolean]) {
     let len = getProperty(t, "length");
-    let s1 = getProperty(t, 0);    // Shape
     let s2 = getProperty(t, "0");  // Shape
-    let b1 = getProperty(t, 1);    // boolean
     let b2 = getProperty(t, "1");  // boolean
-    let x1 = getProperty(t, 2);    // Shape | boolean
 }
 
 function f13(foo: any, bar: any) {
     let x = getProperty(foo, "x");  // any
-    let y = getProperty(foo, 100);  // any
+    let y = getProperty(foo, "100");  // any
     let z = getProperty(foo, bar);  // any
 }
 
@@ -181,20 +177,14 @@ function f40(c: C) {
     let z: Z = c["z"];
 }
 
-function f50<T>(k: keyof T, s: string, n: number) {
+function f50<T>(k: keyof T, s: string) {
     const x1 = s as keyof T;
-    const x2 = n as keyof T;
-    const x3 = k as string;
-    const x4 = k as number;
-    const x5 = k as string | number;
+    const x2 = k as string;
 }
 
-function f51<T, K extends keyof T>(k: K, s: string, n: number) {
+function f51<T, K extends keyof T>(k: K, s: string) {
     const x1 = s as keyof T;
-    const x2 = n as keyof T;
-    const x3 = k as string;
-    const x4 = k as number;
-    const x5 = k as string | number;
+    const x2 = k as string;
 }
 
 function f52<T>(obj: { [x: string]: boolean }, k: keyof T, s: string, n: number) {
diff --git a/tests/cases/conformance/types/mapped/mappedTypeErrors.ts b/tests/cases/conformance/types/mapped/mappedTypeErrors.ts
index c507bf64a6e..b318cde3aab 100644
--- a/tests/cases/conformance/types/mapped/mappedTypeErrors.ts
+++ b/tests/cases/conformance/types/mapped/mappedTypeErrors.ts
@@ -20,8 +20,9 @@ interface Point {
 // Constraint checking
 
 type T00 = { [P in P]: string };  // Error
-type T01 = { [P in Date]: number };  // Error
-type T02 = Record<Date, number>;  // Error
+type T01 = { [P in number]: string };  // Error
+type T02 = { [P in Date]: number };  // Error
+type T03 = Record<Date, number>;  // Error
 
 type T10 = Pick<Shape, "name">;
 type T11 = Pick<Shape, "foo">;  // Error
diff --git a/tests/cases/conformance/types/mapped/mappedTypes1.ts b/tests/cases/conformance/types/mapped/mappedTypes1.ts
index bfc68aaa59d..d090b731518 100644
--- a/tests/cases/conformance/types/mapped/mappedTypes1.ts
+++ b/tests/cases/conformance/types/mapped/mappedTypes1.ts
@@ -27,13 +27,9 @@ type T37 = { [P in keyof symbol]: void };
 type T38 = { [P in keyof never]: void };
 
 type T40 = { [P in string]: void };
-type T41 = { [P in number]: void };
-type T42 = { [P in string | number]: void };
-type T43 = { [P in "a" | "b" | 0 | 1]: void };
+type T43 = { [P in "a" | "b"]: void };
 type T44 = { [P in "a" | "b" | "0" | "1"]: void };
-type T45 = { [P in "a" | "b" | "0" | "1" | 0 | 1]: void };
-type T46 = { [P in number | "a" | "b" | 0 | 1]: void };
-type T47 = { [P in string | number | "a" | "b" | 0 | 1]: void };
+type T47 = { [P in string | "a" | "b" | "0" | "1"]: void };
 
 declare function f1<T1>(): { [P in keyof T1]: void };
 declare function f2<T1 extends string>(): { [P in keyof T1]: void };
diff --git a/tests/cases/conformance/types/mapped/mappedTypes2.ts b/tests/cases/conformance/types/mapped/mappedTypes2.ts
index 7f5841410e4..e72a0c0a892 100644
--- a/tests/cases/conformance/types/mapped/mappedTypes2.ts
+++ b/tests/cases/conformance/types/mapped/mappedTypes2.ts
@@ -28,7 +28,7 @@ type DeepReadonly<T> = {
 declare function assign<T>(obj: T, props: Partial<T>): void;
 declare function freeze<T>(obj: T): Readonly<T>;
 declare function pick<T, K extends keyof T>(obj: T, ...keys: K[]): Pick<T, K>;
-declare function mapObject<K extends string | number, T, U>(obj: Record<K, T>, f: (x: T) => U): Record<K, U>;
+declare function mapObject<K extends string, T, U>(obj: Record<K, T>, f: (x: T) => U): Record<K, U>;
 declare function proxify<T>(obj: T): Proxify<T>;
 
 interface Shape {

From c5558482b7f2e3a8bc7b99ae1540c089b3e4d142 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Mon, 21 Nov 2016 11:43:15 -0800
Subject: [PATCH 315/421] Accept new baselines

---
 .../reference/keyofAndIndexedAccess.js        |  48 +-
 .../reference/keyofAndIndexedAccess.symbols   | 621 ++++++++----------
 .../reference/keyofAndIndexedAccess.types     | 107 +--
 .../reference/mappedTypeErrors.errors.txt     |  42 +-
 tests/baselines/reference/mappedTypeErrors.js |  10 +-
 tests/baselines/reference/mappedTypes1.js     |  25 +-
 .../baselines/reference/mappedTypes1.symbols  |  64 +-
 tests/baselines/reference/mappedTypes1.types  |  24 +-
 tests/baselines/reference/mappedTypes2.js     |   4 +-
 .../baselines/reference/mappedTypes2.symbols  |  24 +-
 tests/baselines/reference/mappedTypes2.types  |   6 +-
 11 files changed, 398 insertions(+), 577 deletions(-)

diff --git a/tests/baselines/reference/keyofAndIndexedAccess.js b/tests/baselines/reference/keyofAndIndexedAccess.js
index eef81f4d5f7..017669603a4 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.js
+++ b/tests/baselines/reference/keyofAndIndexedAccess.js
@@ -95,22 +95,18 @@ function f10(shape: Shape) {
 
 function f11(a: Shape[]) {
     let len = getProperty(a, "length");  // number
-    let shape = getProperty(a, 1000);    // Shape
-    setProperty(a, 1000, getProperty(a, 1001));
+    setProperty(a, "length", len);
 }
 
 function f12(t: [Shape, boolean]) {
     let len = getProperty(t, "length");
-    let s1 = getProperty(t, 0);    // Shape
     let s2 = getProperty(t, "0");  // Shape
-    let b1 = getProperty(t, 1);    // boolean
     let b2 = getProperty(t, "1");  // boolean
-    let x1 = getProperty(t, 2);    // Shape | boolean
 }
 
 function f13(foo: any, bar: any) {
     let x = getProperty(foo, "x");  // any
-    let y = getProperty(foo, 100);  // any
+    let y = getProperty(foo, "100");  // any
     let z = getProperty(foo, bar);  // any
 }
 
@@ -181,20 +177,14 @@ function f40(c: C) {
     let z: Z = c["z"];
 }
 
-function f50<T>(k: keyof T, s: string, n: number) {
+function f50<T>(k: keyof T, s: string) {
     const x1 = s as keyof T;
-    const x2 = n as keyof T;
-    const x3 = k as string;
-    const x4 = k as number;
-    const x5 = k as string | number;
+    const x2 = k as string;
 }
 
-function f51<T, K extends keyof T>(k: K, s: string, n: number) {
+function f51<T, K extends keyof T>(k: K, s: string) {
     const x1 = s as keyof T;
-    const x2 = n as keyof T;
-    const x3 = k as string;
-    const x4 = k as number;
-    const x5 = k as string | number;
+    const x2 = k as string;
 }
 
 function f52<T>(obj: { [x: string]: boolean }, k: keyof T, s: string, n: number) {
@@ -297,20 +287,16 @@ function f10(shape) {
 }
 function f11(a) {
     var len = getProperty(a, "length"); // number
-    var shape = getProperty(a, 1000); // Shape
-    setProperty(a, 1000, getProperty(a, 1001));
+    setProperty(a, "length", len);
 }
 function f12(t) {
     var len = getProperty(t, "length");
-    var s1 = getProperty(t, 0); // Shape
     var s2 = getProperty(t, "0"); // Shape
-    var b1 = getProperty(t, 1); // boolean
     var b2 = getProperty(t, "1"); // boolean
-    var x1 = getProperty(t, 2); // Shape | boolean
 }
 function f13(foo, bar) {
     var x = getProperty(foo, "x"); // any
-    var y = getProperty(foo, 100); // any
+    var y = getProperty(foo, "100"); // any
     var z = getProperty(foo, bar); // any
 }
 var Component = (function () {
@@ -369,19 +355,13 @@ function f40(c) {
     var y = c["y"];
     var z = c["z"];
 }
-function f50(k, s, n) {
+function f50(k, s) {
     var x1 = s;
-    var x2 = n;
-    var x3 = k;
-    var x4 = k;
-    var x5 = k;
+    var x2 = k;
 }
-function f51(k, s, n) {
+function f51(k, s) {
     var x1 = s;
-    var x2 = n;
-    var x3 = k;
-    var x4 = k;
-    var x5 = k;
+    var x2 = k;
 }
 function f52(obj, k, s, n) {
     var x1 = obj[s];
@@ -528,8 +508,8 @@ declare class C {
     private z;
 }
 declare function f40(c: C): void;
-declare function f50<T>(k: keyof T, s: string, n: number): void;
-declare function f51<T, K extends keyof T>(k: K, s: string, n: number): void;
+declare function f50<T>(k: keyof T, s: string): void;
+declare function f51<T, K extends keyof T>(k: K, s: string): void;
 declare function f52<T>(obj: {
     [x: string]: boolean;
 }, k: keyof T, s: string, n: number): void;
diff --git a/tests/baselines/reference/keyofAndIndexedAccess.symbols b/tests/baselines/reference/keyofAndIndexedAccess.symbols
index 0b10e368821..8a2f1052d13 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.symbols
+++ b/tests/baselines/reference/keyofAndIndexedAccess.symbols
@@ -299,569 +299,520 @@ function f11(a: Shape[]) {
 >getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
 >a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 94, 13))
 
-    let shape = getProperty(a, 1000);    // Shape
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 96, 7))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 94, 13))
-
-    setProperty(a, 1000, getProperty(a, 1001));
+    setProperty(a, "length", len);
 >setProperty : Symbol(setProperty, Decl(keyofAndIndexedAccess.ts, 79, 1))
 >a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 94, 13))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 94, 13))
+>len : Symbol(len, Decl(keyofAndIndexedAccess.ts, 95, 7))
 }
 
 function f12(t: [Shape, boolean]) {
->f12 : Symbol(f12, Decl(keyofAndIndexedAccess.ts, 98, 1))
->t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 100, 13))
+>f12 : Symbol(f12, Decl(keyofAndIndexedAccess.ts, 97, 1))
+>t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 99, 13))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 
     let len = getProperty(t, "length");
->len : Symbol(len, Decl(keyofAndIndexedAccess.ts, 101, 7))
+>len : Symbol(len, Decl(keyofAndIndexedAccess.ts, 100, 7))
 >getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 100, 13))
-
-    let s1 = getProperty(t, 0);    // Shape
->s1 : Symbol(s1, Decl(keyofAndIndexedAccess.ts, 102, 7))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 100, 13))
+>t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 99, 13))
 
     let s2 = getProperty(t, "0");  // Shape
->s2 : Symbol(s2, Decl(keyofAndIndexedAccess.ts, 103, 7))
+>s2 : Symbol(s2, Decl(keyofAndIndexedAccess.ts, 101, 7))
 >getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 100, 13))
-
-    let b1 = getProperty(t, 1);    // boolean
->b1 : Symbol(b1, Decl(keyofAndIndexedAccess.ts, 104, 7))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 100, 13))
+>t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 99, 13))
 
     let b2 = getProperty(t, "1");  // boolean
->b2 : Symbol(b2, Decl(keyofAndIndexedAccess.ts, 105, 7))
+>b2 : Symbol(b2, Decl(keyofAndIndexedAccess.ts, 102, 7))
 >getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 100, 13))
-
-    let x1 = getProperty(t, 2);    // Shape | boolean
->x1 : Symbol(x1, Decl(keyofAndIndexedAccess.ts, 106, 7))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 100, 13))
+>t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 99, 13))
 }
 
 function f13(foo: any, bar: any) {
->f13 : Symbol(f13, Decl(keyofAndIndexedAccess.ts, 107, 1))
->foo : Symbol(foo, Decl(keyofAndIndexedAccess.ts, 109, 13))
->bar : Symbol(bar, Decl(keyofAndIndexedAccess.ts, 109, 22))
+>f13 : Symbol(f13, Decl(keyofAndIndexedAccess.ts, 103, 1))
+>foo : Symbol(foo, Decl(keyofAndIndexedAccess.ts, 105, 13))
+>bar : Symbol(bar, Decl(keyofAndIndexedAccess.ts, 105, 22))
 
     let x = getProperty(foo, "x");  // any
->x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 110, 7))
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 106, 7))
 >getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->foo : Symbol(foo, Decl(keyofAndIndexedAccess.ts, 109, 13))
+>foo : Symbol(foo, Decl(keyofAndIndexedAccess.ts, 105, 13))
 
-    let y = getProperty(foo, 100);  // any
->y : Symbol(y, Decl(keyofAndIndexedAccess.ts, 111, 7))
+    let y = getProperty(foo, "100");  // any
+>y : Symbol(y, Decl(keyofAndIndexedAccess.ts, 107, 7))
 >getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->foo : Symbol(foo, Decl(keyofAndIndexedAccess.ts, 109, 13))
+>foo : Symbol(foo, Decl(keyofAndIndexedAccess.ts, 105, 13))
 
     let z = getProperty(foo, bar);  // any
->z : Symbol(z, Decl(keyofAndIndexedAccess.ts, 112, 7))
+>z : Symbol(z, Decl(keyofAndIndexedAccess.ts, 108, 7))
 >getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->foo : Symbol(foo, Decl(keyofAndIndexedAccess.ts, 109, 13))
->bar : Symbol(bar, Decl(keyofAndIndexedAccess.ts, 109, 22))
+>foo : Symbol(foo, Decl(keyofAndIndexedAccess.ts, 105, 13))
+>bar : Symbol(bar, Decl(keyofAndIndexedAccess.ts, 105, 22))
 }
 
 class Component<PropType> {
->Component : Symbol(Component, Decl(keyofAndIndexedAccess.ts, 113, 1))
->PropType : Symbol(PropType, Decl(keyofAndIndexedAccess.ts, 115, 16))
+>Component : Symbol(Component, Decl(keyofAndIndexedAccess.ts, 109, 1))
+>PropType : Symbol(PropType, Decl(keyofAndIndexedAccess.ts, 111, 16))
 
     props: PropType;
->props : Symbol(Component.props, Decl(keyofAndIndexedAccess.ts, 115, 27))
->PropType : Symbol(PropType, Decl(keyofAndIndexedAccess.ts, 115, 16))
+>props : Symbol(Component.props, Decl(keyofAndIndexedAccess.ts, 111, 27))
+>PropType : Symbol(PropType, Decl(keyofAndIndexedAccess.ts, 111, 16))
 
     getProperty<K extends keyof PropType>(key: K) {
->getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 116, 20))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 117, 16))
->PropType : Symbol(PropType, Decl(keyofAndIndexedAccess.ts, 115, 16))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 117, 42))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 117, 16))
+>getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 112, 20))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 113, 16))
+>PropType : Symbol(PropType, Decl(keyofAndIndexedAccess.ts, 111, 16))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 113, 42))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 113, 16))
 
         return this.props[key];
->this.props : Symbol(Component.props, Decl(keyofAndIndexedAccess.ts, 115, 27))
->this : Symbol(Component, Decl(keyofAndIndexedAccess.ts, 113, 1))
->props : Symbol(Component.props, Decl(keyofAndIndexedAccess.ts, 115, 27))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 117, 42))
+>this.props : Symbol(Component.props, Decl(keyofAndIndexedAccess.ts, 111, 27))
+>this : Symbol(Component, Decl(keyofAndIndexedAccess.ts, 109, 1))
+>props : Symbol(Component.props, Decl(keyofAndIndexedAccess.ts, 111, 27))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 113, 42))
     }
     setProperty<K extends keyof PropType>(key: K, value: PropType[K]) {
->setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 119, 5))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 120, 16))
->PropType : Symbol(PropType, Decl(keyofAndIndexedAccess.ts, 115, 16))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 120, 42))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 120, 16))
->value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 120, 49))
->PropType : Symbol(PropType, Decl(keyofAndIndexedAccess.ts, 115, 16))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 120, 16))
+>setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 115, 5))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 116, 16))
+>PropType : Symbol(PropType, Decl(keyofAndIndexedAccess.ts, 111, 16))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 116, 42))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 116, 16))
+>value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 116, 49))
+>PropType : Symbol(PropType, Decl(keyofAndIndexedAccess.ts, 111, 16))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 116, 16))
 
         this.props[key] = value;
->this.props : Symbol(Component.props, Decl(keyofAndIndexedAccess.ts, 115, 27))
->this : Symbol(Component, Decl(keyofAndIndexedAccess.ts, 113, 1))
->props : Symbol(Component.props, Decl(keyofAndIndexedAccess.ts, 115, 27))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 120, 42))
->value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 120, 49))
+>this.props : Symbol(Component.props, Decl(keyofAndIndexedAccess.ts, 111, 27))
+>this : Symbol(Component, Decl(keyofAndIndexedAccess.ts, 109, 1))
+>props : Symbol(Component.props, Decl(keyofAndIndexedAccess.ts, 111, 27))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 116, 42))
+>value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 116, 49))
     }
 }
 
 function f20(component: Component<Shape>) {
->f20 : Symbol(f20, Decl(keyofAndIndexedAccess.ts, 123, 1))
->component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 125, 13))
->Component : Symbol(Component, Decl(keyofAndIndexedAccess.ts, 113, 1))
+>f20 : Symbol(f20, Decl(keyofAndIndexedAccess.ts, 119, 1))
+>component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 121, 13))
+>Component : Symbol(Component, Decl(keyofAndIndexedAccess.ts, 109, 1))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 
     let name = component.getProperty("name");  // string
->name : Symbol(name, Decl(keyofAndIndexedAccess.ts, 126, 7))
->component.getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 116, 20))
->component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 125, 13))
->getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 116, 20))
+>name : Symbol(name, Decl(keyofAndIndexedAccess.ts, 122, 7))
+>component.getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 112, 20))
+>component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 121, 13))
+>getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 112, 20))
 
     let widthOrHeight = component.getProperty(cond ? "width" : "height");  // number
->widthOrHeight : Symbol(widthOrHeight, Decl(keyofAndIndexedAccess.ts, 127, 7))
->component.getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 116, 20))
->component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 125, 13))
->getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 116, 20))
+>widthOrHeight : Symbol(widthOrHeight, Decl(keyofAndIndexedAccess.ts, 123, 7))
+>component.getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 112, 20))
+>component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 121, 13))
+>getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 112, 20))
 >cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 75, 11))
 
     let nameOrVisible = component.getProperty(cond ? "name" : "visible");  // string | boolean
->nameOrVisible : Symbol(nameOrVisible, Decl(keyofAndIndexedAccess.ts, 128, 7))
->component.getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 116, 20))
->component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 125, 13))
->getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 116, 20))
+>nameOrVisible : Symbol(nameOrVisible, Decl(keyofAndIndexedAccess.ts, 124, 7))
+>component.getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 112, 20))
+>component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 121, 13))
+>getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 112, 20))
 >cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 75, 11))
 
     component.setProperty("name", "rectangle");
->component.setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 119, 5))
->component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 125, 13))
->setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 119, 5))
+>component.setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 115, 5))
+>component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 121, 13))
+>setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 115, 5))
 
     component.setProperty(cond ? "width" : "height", 10)
->component.setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 119, 5))
->component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 125, 13))
->setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 119, 5))
+>component.setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 115, 5))
+>component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 121, 13))
+>setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 115, 5))
 >cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 75, 11))
 
     component.setProperty(cond ? "name" : "visible", true);  // Technically not safe
->component.setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 119, 5))
->component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 125, 13))
->setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 119, 5))
+>component.setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 115, 5))
+>component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 121, 13))
+>setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 115, 5))
 >cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 75, 11))
 }
 
 function pluck<T, K extends keyof T>(array: T[], key: K) {
->pluck : Symbol(pluck, Decl(keyofAndIndexedAccess.ts, 132, 1))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 134, 15))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 134, 17))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 134, 15))
->array : Symbol(array, Decl(keyofAndIndexedAccess.ts, 134, 37))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 134, 15))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 134, 48))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 134, 17))
+>pluck : Symbol(pluck, Decl(keyofAndIndexedAccess.ts, 128, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 130, 15))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 130, 17))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 130, 15))
+>array : Symbol(array, Decl(keyofAndIndexedAccess.ts, 130, 37))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 130, 15))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 130, 48))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 130, 17))
 
     return array.map(x => x[key]);
 >array.map : Symbol(Array.map, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->array : Symbol(array, Decl(keyofAndIndexedAccess.ts, 134, 37))
+>array : Symbol(array, Decl(keyofAndIndexedAccess.ts, 130, 37))
 >map : Symbol(Array.map, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 135, 21))
->x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 135, 21))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 134, 48))
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 131, 21))
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 131, 21))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 130, 48))
 }
 
 function f30(shapes: Shape[]) {
->f30 : Symbol(f30, Decl(keyofAndIndexedAccess.ts, 136, 1))
->shapes : Symbol(shapes, Decl(keyofAndIndexedAccess.ts, 138, 13))
+>f30 : Symbol(f30, Decl(keyofAndIndexedAccess.ts, 132, 1))
+>shapes : Symbol(shapes, Decl(keyofAndIndexedAccess.ts, 134, 13))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 
     let names = pluck(shapes, "name");    // string[]
->names : Symbol(names, Decl(keyofAndIndexedAccess.ts, 139, 7))
->pluck : Symbol(pluck, Decl(keyofAndIndexedAccess.ts, 132, 1))
->shapes : Symbol(shapes, Decl(keyofAndIndexedAccess.ts, 138, 13))
+>names : Symbol(names, Decl(keyofAndIndexedAccess.ts, 135, 7))
+>pluck : Symbol(pluck, Decl(keyofAndIndexedAccess.ts, 128, 1))
+>shapes : Symbol(shapes, Decl(keyofAndIndexedAccess.ts, 134, 13))
 
     let widths = pluck(shapes, "width");  // number[]
->widths : Symbol(widths, Decl(keyofAndIndexedAccess.ts, 140, 7))
->pluck : Symbol(pluck, Decl(keyofAndIndexedAccess.ts, 132, 1))
->shapes : Symbol(shapes, Decl(keyofAndIndexedAccess.ts, 138, 13))
+>widths : Symbol(widths, Decl(keyofAndIndexedAccess.ts, 136, 7))
+>pluck : Symbol(pluck, Decl(keyofAndIndexedAccess.ts, 128, 1))
+>shapes : Symbol(shapes, Decl(keyofAndIndexedAccess.ts, 134, 13))
 
     let nameOrVisibles = pluck(shapes, cond ? "name" : "visible");  // (string | boolean)[]
->nameOrVisibles : Symbol(nameOrVisibles, Decl(keyofAndIndexedAccess.ts, 141, 7))
->pluck : Symbol(pluck, Decl(keyofAndIndexedAccess.ts, 132, 1))
->shapes : Symbol(shapes, Decl(keyofAndIndexedAccess.ts, 138, 13))
+>nameOrVisibles : Symbol(nameOrVisibles, Decl(keyofAndIndexedAccess.ts, 137, 7))
+>pluck : Symbol(pluck, Decl(keyofAndIndexedAccess.ts, 128, 1))
+>shapes : Symbol(shapes, Decl(keyofAndIndexedAccess.ts, 134, 13))
 >cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 75, 11))
 }
 
 function f31<K extends keyof Shape>(key: K) {
->f31 : Symbol(f31, Decl(keyofAndIndexedAccess.ts, 142, 1))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 144, 13))
+>f31 : Symbol(f31, Decl(keyofAndIndexedAccess.ts, 138, 1))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 140, 13))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 144, 36))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 144, 13))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 140, 36))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 140, 13))
 
     const shape: Shape = { name: "foo", width: 5, height: 10, visible: true };
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 145, 9))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 141, 9))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
->name : Symbol(name, Decl(keyofAndIndexedAccess.ts, 145, 26))
->width : Symbol(width, Decl(keyofAndIndexedAccess.ts, 145, 39))
->height : Symbol(height, Decl(keyofAndIndexedAccess.ts, 145, 49))
->visible : Symbol(visible, Decl(keyofAndIndexedAccess.ts, 145, 61))
+>name : Symbol(name, Decl(keyofAndIndexedAccess.ts, 141, 26))
+>width : Symbol(width, Decl(keyofAndIndexedAccess.ts, 141, 39))
+>height : Symbol(height, Decl(keyofAndIndexedAccess.ts, 141, 49))
+>visible : Symbol(visible, Decl(keyofAndIndexedAccess.ts, 141, 61))
 
     return shape[key];  // Shape[K]
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 145, 9))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 144, 36))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 141, 9))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 140, 36))
 }
 
 function f32<K extends "width" | "height">(key: K) {
->f32 : Symbol(f32, Decl(keyofAndIndexedAccess.ts, 147, 1))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 149, 13))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 149, 43))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 149, 13))
+>f32 : Symbol(f32, Decl(keyofAndIndexedAccess.ts, 143, 1))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 145, 13))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 145, 43))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 145, 13))
 
     const shape: Shape = { name: "foo", width: 5, height: 10, visible: true };
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 150, 9))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 146, 9))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
->name : Symbol(name, Decl(keyofAndIndexedAccess.ts, 150, 26))
->width : Symbol(width, Decl(keyofAndIndexedAccess.ts, 150, 39))
->height : Symbol(height, Decl(keyofAndIndexedAccess.ts, 150, 49))
->visible : Symbol(visible, Decl(keyofAndIndexedAccess.ts, 150, 61))
+>name : Symbol(name, Decl(keyofAndIndexedAccess.ts, 146, 26))
+>width : Symbol(width, Decl(keyofAndIndexedAccess.ts, 146, 39))
+>height : Symbol(height, Decl(keyofAndIndexedAccess.ts, 146, 49))
+>visible : Symbol(visible, Decl(keyofAndIndexedAccess.ts, 146, 61))
 
     return shape[key];  // Shape[K]
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 150, 9))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 149, 43))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 146, 9))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 145, 43))
 }
 
 function f33<S extends Shape, K extends keyof S>(shape: S, key: K) {
->f33 : Symbol(f33, Decl(keyofAndIndexedAccess.ts, 152, 1))
->S : Symbol(S, Decl(keyofAndIndexedAccess.ts, 154, 13))
+>f33 : Symbol(f33, Decl(keyofAndIndexedAccess.ts, 148, 1))
+>S : Symbol(S, Decl(keyofAndIndexedAccess.ts, 150, 13))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 154, 29))
->S : Symbol(S, Decl(keyofAndIndexedAccess.ts, 154, 13))
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 154, 49))
->S : Symbol(S, Decl(keyofAndIndexedAccess.ts, 154, 13))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 154, 58))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 154, 29))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 150, 29))
+>S : Symbol(S, Decl(keyofAndIndexedAccess.ts, 150, 13))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 150, 49))
+>S : Symbol(S, Decl(keyofAndIndexedAccess.ts, 150, 13))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 150, 58))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 150, 29))
 
     let name = getProperty(shape, "name");
->name : Symbol(name, Decl(keyofAndIndexedAccess.ts, 155, 7))
+>name : Symbol(name, Decl(keyofAndIndexedAccess.ts, 151, 7))
 >getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 154, 49))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 150, 49))
 
     let prop = getProperty(shape, key);
->prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 156, 7))
+>prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 152, 7))
 >getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 154, 49))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 154, 58))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 150, 49))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 150, 58))
 
     return prop;
->prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 156, 7))
+>prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 152, 7))
 }
 
 function f34(ts: TaggedShape) {
->f34 : Symbol(f34, Decl(keyofAndIndexedAccess.ts, 158, 1))
->ts : Symbol(ts, Decl(keyofAndIndexedAccess.ts, 160, 13))
+>f34 : Symbol(f34, Decl(keyofAndIndexedAccess.ts, 154, 1))
+>ts : Symbol(ts, Decl(keyofAndIndexedAccess.ts, 156, 13))
 >TaggedShape : Symbol(TaggedShape, Decl(keyofAndIndexedAccess.ts, 6, 1))
 
     let tag1 = f33(ts, "tag");
->tag1 : Symbol(tag1, Decl(keyofAndIndexedAccess.ts, 161, 7))
->f33 : Symbol(f33, Decl(keyofAndIndexedAccess.ts, 152, 1))
->ts : Symbol(ts, Decl(keyofAndIndexedAccess.ts, 160, 13))
+>tag1 : Symbol(tag1, Decl(keyofAndIndexedAccess.ts, 157, 7))
+>f33 : Symbol(f33, Decl(keyofAndIndexedAccess.ts, 148, 1))
+>ts : Symbol(ts, Decl(keyofAndIndexedAccess.ts, 156, 13))
 
     let tag2 = getProperty(ts, "tag");
->tag2 : Symbol(tag2, Decl(keyofAndIndexedAccess.ts, 162, 7))
+>tag2 : Symbol(tag2, Decl(keyofAndIndexedAccess.ts, 158, 7))
 >getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->ts : Symbol(ts, Decl(keyofAndIndexedAccess.ts, 160, 13))
+>ts : Symbol(ts, Decl(keyofAndIndexedAccess.ts, 156, 13))
 }
 
 class C {
->C : Symbol(C, Decl(keyofAndIndexedAccess.ts, 163, 1))
+>C : Symbol(C, Decl(keyofAndIndexedAccess.ts, 159, 1))
 
     public x: string;
->x : Symbol(C.x, Decl(keyofAndIndexedAccess.ts, 165, 9))
+>x : Symbol(C.x, Decl(keyofAndIndexedAccess.ts, 161, 9))
 
     protected y: string;
->y : Symbol(C.y, Decl(keyofAndIndexedAccess.ts, 166, 21))
+>y : Symbol(C.y, Decl(keyofAndIndexedAccess.ts, 162, 21))
 
     private z: string;
->z : Symbol(C.z, Decl(keyofAndIndexedAccess.ts, 167, 24))
+>z : Symbol(C.z, Decl(keyofAndIndexedAccess.ts, 163, 24))
 }
 
 // Indexed access expressions have always permitted access to private and protected members.
 // For consistency we also permit such access in indexed access types.
 function f40(c: C) {
->f40 : Symbol(f40, Decl(keyofAndIndexedAccess.ts, 169, 1))
->c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 173, 13))
->C : Symbol(C, Decl(keyofAndIndexedAccess.ts, 163, 1))
+>f40 : Symbol(f40, Decl(keyofAndIndexedAccess.ts, 165, 1))
+>c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 169, 13))
+>C : Symbol(C, Decl(keyofAndIndexedAccess.ts, 159, 1))
 
     type X = C["x"];
->X : Symbol(X, Decl(keyofAndIndexedAccess.ts, 173, 20))
->C : Symbol(C, Decl(keyofAndIndexedAccess.ts, 163, 1))
+>X : Symbol(X, Decl(keyofAndIndexedAccess.ts, 169, 20))
+>C : Symbol(C, Decl(keyofAndIndexedAccess.ts, 159, 1))
 
     type Y = C["y"];
->Y : Symbol(Y, Decl(keyofAndIndexedAccess.ts, 174, 20))
->C : Symbol(C, Decl(keyofAndIndexedAccess.ts, 163, 1))
+>Y : Symbol(Y, Decl(keyofAndIndexedAccess.ts, 170, 20))
+>C : Symbol(C, Decl(keyofAndIndexedAccess.ts, 159, 1))
 
     type Z = C["z"];
->Z : Symbol(Z, Decl(keyofAndIndexedAccess.ts, 175, 20))
->C : Symbol(C, Decl(keyofAndIndexedAccess.ts, 163, 1))
+>Z : Symbol(Z, Decl(keyofAndIndexedAccess.ts, 171, 20))
+>C : Symbol(C, Decl(keyofAndIndexedAccess.ts, 159, 1))
 
     let x: X = c["x"];
->x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 177, 7))
->X : Symbol(X, Decl(keyofAndIndexedAccess.ts, 173, 20))
->c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 173, 13))
->"x" : Symbol(C.x, Decl(keyofAndIndexedAccess.ts, 165, 9))
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 173, 7))
+>X : Symbol(X, Decl(keyofAndIndexedAccess.ts, 169, 20))
+>c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 169, 13))
+>"x" : Symbol(C.x, Decl(keyofAndIndexedAccess.ts, 161, 9))
 
     let y: Y = c["y"];
->y : Symbol(y, Decl(keyofAndIndexedAccess.ts, 178, 7))
->Y : Symbol(Y, Decl(keyofAndIndexedAccess.ts, 174, 20))
->c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 173, 13))
->"y" : Symbol(C.y, Decl(keyofAndIndexedAccess.ts, 166, 21))
+>y : Symbol(y, Decl(keyofAndIndexedAccess.ts, 174, 7))
+>Y : Symbol(Y, Decl(keyofAndIndexedAccess.ts, 170, 20))
+>c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 169, 13))
+>"y" : Symbol(C.y, Decl(keyofAndIndexedAccess.ts, 162, 21))
 
     let z: Z = c["z"];
->z : Symbol(z, Decl(keyofAndIndexedAccess.ts, 179, 7))
->Z : Symbol(Z, Decl(keyofAndIndexedAccess.ts, 175, 20))
->c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 173, 13))
->"z" : Symbol(C.z, Decl(keyofAndIndexedAccess.ts, 167, 24))
+>z : Symbol(z, Decl(keyofAndIndexedAccess.ts, 175, 7))
+>Z : Symbol(Z, Decl(keyofAndIndexedAccess.ts, 171, 20))
+>c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 169, 13))
+>"z" : Symbol(C.z, Decl(keyofAndIndexedAccess.ts, 163, 24))
 }
 
-function f50<T>(k: keyof T, s: string, n: number) {
->f50 : Symbol(f50, Decl(keyofAndIndexedAccess.ts, 180, 1))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 182, 13))
->k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 182, 16))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 182, 13))
->s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 182, 27))
->n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 182, 38))
+function f50<T>(k: keyof T, s: string) {
+>f50 : Symbol(f50, Decl(keyofAndIndexedAccess.ts, 176, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 178, 13))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 178, 16))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 178, 13))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 178, 27))
 
     const x1 = s as keyof T;
->x1 : Symbol(x1, Decl(keyofAndIndexedAccess.ts, 183, 9))
->s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 182, 27))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 182, 13))
+>x1 : Symbol(x1, Decl(keyofAndIndexedAccess.ts, 179, 9))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 178, 27))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 178, 13))
 
-    const x2 = n as keyof T;
->x2 : Symbol(x2, Decl(keyofAndIndexedAccess.ts, 184, 9))
->n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 182, 38))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 182, 13))
-
-    const x3 = k as string;
->x3 : Symbol(x3, Decl(keyofAndIndexedAccess.ts, 185, 9))
->k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 182, 16))
-
-    const x4 = k as number;
->x4 : Symbol(x4, Decl(keyofAndIndexedAccess.ts, 186, 9))
->k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 182, 16))
-
-    const x5 = k as string | number;
->x5 : Symbol(x5, Decl(keyofAndIndexedAccess.ts, 187, 9))
->k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 182, 16))
+    const x2 = k as string;
+>x2 : Symbol(x2, Decl(keyofAndIndexedAccess.ts, 180, 9))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 178, 16))
 }
 
-function f51<T, K extends keyof T>(k: K, s: string, n: number) {
->f51 : Symbol(f51, Decl(keyofAndIndexedAccess.ts, 188, 1))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 190, 13))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 190, 15))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 190, 13))
->k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 190, 35))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 190, 15))
->s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 190, 40))
->n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 190, 51))
+function f51<T, K extends keyof T>(k: K, s: string) {
+>f51 : Symbol(f51, Decl(keyofAndIndexedAccess.ts, 181, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 183, 13))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 183, 15))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 183, 13))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 183, 35))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 183, 15))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 183, 40))
 
     const x1 = s as keyof T;
->x1 : Symbol(x1, Decl(keyofAndIndexedAccess.ts, 191, 9))
->s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 190, 40))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 190, 13))
+>x1 : Symbol(x1, Decl(keyofAndIndexedAccess.ts, 184, 9))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 183, 40))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 183, 13))
 
-    const x2 = n as keyof T;
->x2 : Symbol(x2, Decl(keyofAndIndexedAccess.ts, 192, 9))
->n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 190, 51))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 190, 13))
-
-    const x3 = k as string;
->x3 : Symbol(x3, Decl(keyofAndIndexedAccess.ts, 193, 9))
->k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 190, 35))
-
-    const x4 = k as number;
->x4 : Symbol(x4, Decl(keyofAndIndexedAccess.ts, 194, 9))
->k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 190, 35))
-
-    const x5 = k as string | number;
->x5 : Symbol(x5, Decl(keyofAndIndexedAccess.ts, 195, 9))
->k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 190, 35))
+    const x2 = k as string;
+>x2 : Symbol(x2, Decl(keyofAndIndexedAccess.ts, 185, 9))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 183, 35))
 }
 
 function f52<T>(obj: { [x: string]: boolean }, k: keyof T, s: string, n: number) {
->f52 : Symbol(f52, Decl(keyofAndIndexedAccess.ts, 196, 1))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 198, 13))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 198, 16))
->x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 198, 24))
->k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 198, 46))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 198, 13))
->s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 198, 58))
->n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 198, 69))
+>f52 : Symbol(f52, Decl(keyofAndIndexedAccess.ts, 186, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 188, 13))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 188, 16))
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 188, 24))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 188, 46))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 188, 13))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 188, 58))
+>n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 188, 69))
 
     const x1 = obj[s];
->x1 : Symbol(x1, Decl(keyofAndIndexedAccess.ts, 199, 9))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 198, 16))
->s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 198, 58))
+>x1 : Symbol(x1, Decl(keyofAndIndexedAccess.ts, 189, 9))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 188, 16))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 188, 58))
 
     const x2 = obj[n];
->x2 : Symbol(x2, Decl(keyofAndIndexedAccess.ts, 200, 9))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 198, 16))
->n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 198, 69))
+>x2 : Symbol(x2, Decl(keyofAndIndexedAccess.ts, 190, 9))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 188, 16))
+>n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 188, 69))
 
     const x3 = obj[k];
->x3 : Symbol(x3, Decl(keyofAndIndexedAccess.ts, 201, 9))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 198, 16))
->k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 198, 46))
+>x3 : Symbol(x3, Decl(keyofAndIndexedAccess.ts, 191, 9))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 188, 16))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 188, 46))
 }
 
 function f53<T, K extends keyof T>(obj: { [x: string]: boolean }, k: K, s: string, n: number) {
->f53 : Symbol(f53, Decl(keyofAndIndexedAccess.ts, 202, 1))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 204, 13))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 204, 15))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 204, 13))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 204, 35))
->x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 204, 43))
->k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 204, 65))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 204, 15))
->s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 204, 71))
->n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 204, 82))
+>f53 : Symbol(f53, Decl(keyofAndIndexedAccess.ts, 192, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 194, 13))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 194, 15))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 194, 13))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 194, 35))
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 194, 43))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 194, 65))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 194, 15))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 194, 71))
+>n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 194, 82))
 
     const x1 = obj[s];
->x1 : Symbol(x1, Decl(keyofAndIndexedAccess.ts, 205, 9))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 204, 35))
->s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 204, 71))
+>x1 : Symbol(x1, Decl(keyofAndIndexedAccess.ts, 195, 9))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 194, 35))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 194, 71))
 
     const x2 = obj[n];
->x2 : Symbol(x2, Decl(keyofAndIndexedAccess.ts, 206, 9))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 204, 35))
->n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 204, 82))
+>x2 : Symbol(x2, Decl(keyofAndIndexedAccess.ts, 196, 9))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 194, 35))
+>n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 194, 82))
 
     const x3 = obj[k];
->x3 : Symbol(x3, Decl(keyofAndIndexedAccess.ts, 207, 9))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 204, 35))
->k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 204, 65))
+>x3 : Symbol(x3, Decl(keyofAndIndexedAccess.ts, 197, 9))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 194, 35))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 194, 65))
 }
 
 function f54<T>(obj: T, key: keyof T) {
->f54 : Symbol(f54, Decl(keyofAndIndexedAccess.ts, 208, 1))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 210, 13))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 210, 16))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 210, 13))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 210, 23))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 210, 13))
+>f54 : Symbol(f54, Decl(keyofAndIndexedAccess.ts, 198, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 200, 13))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 200, 16))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 200, 13))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 200, 23))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 200, 13))
 
     for (let s in obj[key]) {
->s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 211, 12))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 210, 16))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 210, 23))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 201, 12))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 200, 16))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 200, 23))
     }
     const b = "foo" in obj[key];
->b : Symbol(b, Decl(keyofAndIndexedAccess.ts, 213, 9))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 210, 16))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 210, 23))
+>b : Symbol(b, Decl(keyofAndIndexedAccess.ts, 203, 9))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 200, 16))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 200, 23))
 }
 
 function f55<T, K extends keyof T>(obj: T, key: K) {
->f55 : Symbol(f55, Decl(keyofAndIndexedAccess.ts, 214, 1))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 216, 13))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 216, 15))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 216, 13))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 216, 35))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 216, 13))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 216, 42))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 216, 15))
+>f55 : Symbol(f55, Decl(keyofAndIndexedAccess.ts, 204, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 206, 13))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 206, 15))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 206, 13))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 206, 35))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 206, 13))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 206, 42))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 206, 15))
 
     for (let s in obj[key]) {
->s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 217, 12))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 216, 35))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 216, 42))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 207, 12))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 206, 35))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 206, 42))
     }
     const b = "foo" in obj[key];
->b : Symbol(b, Decl(keyofAndIndexedAccess.ts, 219, 9))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 216, 35))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 216, 42))
+>b : Symbol(b, Decl(keyofAndIndexedAccess.ts, 209, 9))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 206, 35))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 206, 42))
 }
 
 // Repros from #12011
 
 class Base {
->Base : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 220, 1))
+>Base : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 210, 1))
 
     get<K extends keyof this>(prop: K) {
->get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 224, 12))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 225, 8))
->prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 225, 30))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 225, 8))
+>get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 214, 12))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 215, 8))
+>prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 215, 30))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 215, 8))
 
         return this[prop];
->this : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 220, 1))
->prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 225, 30))
+>this : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 210, 1))
+>prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 215, 30))
     }
     set<K extends keyof this>(prop: K, value: this[K]) {
->set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 227, 5))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 228, 8))
->prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 228, 30))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 228, 8))
->value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 228, 38))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 228, 8))
+>set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 217, 5))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 218, 8))
+>prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 218, 30))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 218, 8))
+>value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 218, 38))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 218, 8))
 
         this[prop] = value;
->this : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 220, 1))
->prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 228, 30))
->value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 228, 38))
+>this : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 210, 1))
+>prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 218, 30))
+>value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 218, 38))
     }
 }
 
 class Person extends Base {
->Person : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 231, 1))
->Base : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 220, 1))
+>Person : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 221, 1))
+>Base : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 210, 1))
 
     parts: number;
->parts : Symbol(Person.parts, Decl(keyofAndIndexedAccess.ts, 233, 27))
+>parts : Symbol(Person.parts, Decl(keyofAndIndexedAccess.ts, 223, 27))
 
     constructor(parts: number) {
->parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 235, 16))
+>parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 225, 16))
 
         super();
->super : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 220, 1))
+>super : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 210, 1))
 
         this.set("parts", parts);
->this.set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 227, 5))
->this : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 231, 1))
->set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 227, 5))
->parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 235, 16))
+>this.set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 217, 5))
+>this : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 221, 1))
+>set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 217, 5))
+>parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 225, 16))
     }
     getParts() {
->getParts : Symbol(Person.getParts, Decl(keyofAndIndexedAccess.ts, 238, 5))
+>getParts : Symbol(Person.getParts, Decl(keyofAndIndexedAccess.ts, 228, 5))
 
         return this.get("parts")
->this.get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 224, 12))
->this : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 231, 1))
->get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 224, 12))
+>this.get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 214, 12))
+>this : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 221, 1))
+>get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 214, 12))
     }
 }
 
 class OtherPerson {
->OtherPerson : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 242, 1))
+>OtherPerson : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 232, 1))
 
     parts: number;
->parts : Symbol(OtherPerson.parts, Decl(keyofAndIndexedAccess.ts, 244, 19))
+>parts : Symbol(OtherPerson.parts, Decl(keyofAndIndexedAccess.ts, 234, 19))
 
     constructor(parts: number) {
->parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 246, 16))
+>parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 236, 16))
 
         setProperty(this, "parts", parts);
 >setProperty : Symbol(setProperty, Decl(keyofAndIndexedAccess.ts, 79, 1))
->this : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 242, 1))
->parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 246, 16))
+>this : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 232, 1))
+>parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 236, 16))
     }
     getParts() {
->getParts : Symbol(OtherPerson.getParts, Decl(keyofAndIndexedAccess.ts, 248, 5))
+>getParts : Symbol(OtherPerson.getParts, Decl(keyofAndIndexedAccess.ts, 238, 5))
 
         return getProperty(this, "parts")
 >getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->this : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 242, 1))
+>this : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 232, 1))
     }
 }
diff --git a/tests/baselines/reference/keyofAndIndexedAccess.types b/tests/baselines/reference/keyofAndIndexedAccess.types
index 020ac114126..4c09909c0fd 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.types
+++ b/tests/baselines/reference/keyofAndIndexedAccess.types
@@ -54,10 +54,10 @@ const enum E { A, B, C }
 >C : E.C
 
 type K00 = keyof any;  // string | number
->K00 : string | number
+>K00 : string
 
 type K01 = keyof string;  // number | "toString" | "charAt" | ...
->K01 : number | "length" | "toString" | "concat" | "slice" | "indexOf" | "lastIndexOf" | "charAt" | "charCodeAt" | "localeCompare" | "match" | "replace" | "search" | "split" | "substring" | "toLowerCase" | "toLocaleLowerCase" | "toUpperCase" | "toLocaleUpperCase" | "trim" | "substr" | "valueOf"
+>K01 : "length" | "toString" | "concat" | "slice" | "indexOf" | "lastIndexOf" | "charAt" | "charCodeAt" | "localeCompare" | "match" | "replace" | "search" | "split" | "substring" | "toLowerCase" | "toLocaleLowerCase" | "toUpperCase" | "toLocaleUpperCase" | "trim" | "substr" | "valueOf"
 
 type K02 = keyof number;  // "toString" | "toFixed" | "toExponential" | ...
 >K02 : "toString" | "toLocaleString" | "valueOf" | "toFixed" | "toExponential" | "toPrecision"
@@ -83,11 +83,11 @@ type K10 = keyof Shape;  // "name" | "width" | "height" | "visible"
 >Shape : Shape
 
 type K11 = keyof Shape[];  // number | "length" | "toString" | ...
->K11 : number | "length" | "toString" | "toLocaleString" | "push" | "pop" | "concat" | "join" | "reverse" | "shift" | "slice" | "sort" | "splice" | "unshift" | "indexOf" | "lastIndexOf" | "every" | "some" | "forEach" | "map" | "filter" | "reduce" | "reduceRight"
+>K11 : "length" | "toString" | "toLocaleString" | "push" | "pop" | "concat" | "join" | "reverse" | "shift" | "slice" | "sort" | "splice" | "unshift" | "indexOf" | "lastIndexOf" | "every" | "some" | "forEach" | "map" | "filter" | "reduce" | "reduceRight"
 >Shape : Shape
 
 type K12 = keyof Dictionary<Shape>;  // string | number
->K12 : string | number
+>K12 : string
 >Dictionary : Dictionary<T>
 >Shape : Shape
 
@@ -103,7 +103,7 @@ type K15 = keyof E;  // "toString" | "toFixed" | "toExponential" | ...
 >E : E
 
 type K16 = keyof [string, number];  // number | "0" | "1" | "length" | "toString" | ...
->K16 : number | "0" | "1" | "length" | "toString" | "toLocaleString" | "push" | "pop" | "concat" | "join" | "reverse" | "shift" | "slice" | "sort" | "splice" | "unshift" | "indexOf" | "lastIndexOf" | "every" | "some" | "forEach" | "map" | "filter" | "reduce" | "reduceRight"
+>K16 : "0" | "1" | "length" | "toString" | "toLocaleString" | "push" | "pop" | "concat" | "join" | "reverse" | "shift" | "slice" | "sort" | "splice" | "unshift" | "indexOf" | "lastIndexOf" | "every" | "some" | "forEach" | "map" | "filter" | "reduce" | "reduceRight"
 
 type K17 = keyof (Shape | Item);  // "name"
 >K17 : "name"
@@ -126,7 +126,7 @@ type K20 = KeyOf<Shape>;  // "name" | "width" | "height" | "visible"
 >Shape : Shape
 
 type K21 = KeyOf<Dictionary<Shape>>;  // string | number
->K21 : string | number
+>K21 : string
 >KeyOf : keyof T
 >Dictionary : Dictionary<T>
 >Shape : Shape
@@ -328,22 +328,12 @@ function f11(a: Shape[]) {
 >a : Shape[]
 >"length" : "length"
 
-    let shape = getProperty(a, 1000);    // Shape
->shape : Shape
->getProperty(a, 1000) : Shape
->getProperty : <T, K extends keyof T>(obj: T, key: K) => T[K]
->a : Shape[]
->1000 : 1000
-
-    setProperty(a, 1000, getProperty(a, 1001));
->setProperty(a, 1000, getProperty(a, 1001)) : void
+    setProperty(a, "length", len);
+>setProperty(a, "length", len) : void
 >setProperty : <T, K extends keyof T>(obj: T, key: K, value: T[K]) => void
 >a : Shape[]
->1000 : 1000
->getProperty(a, 1001) : Shape
->getProperty : <T, K extends keyof T>(obj: T, key: K) => T[K]
->a : Shape[]
->1001 : 1001
+>"length" : "length"
+>len : number
 }
 
 function f12(t: [Shape, boolean]) {
@@ -358,13 +348,6 @@ function f12(t: [Shape, boolean]) {
 >t : [Shape, boolean]
 >"length" : "length"
 
-    let s1 = getProperty(t, 0);    // Shape
->s1 : Shape
->getProperty(t, 0) : Shape
->getProperty : <T, K extends keyof T>(obj: T, key: K) => T[K]
->t : [Shape, boolean]
->0 : 0
-
     let s2 = getProperty(t, "0");  // Shape
 >s2 : Shape
 >getProperty(t, "0") : Shape
@@ -372,26 +355,12 @@ function f12(t: [Shape, boolean]) {
 >t : [Shape, boolean]
 >"0" : "0"
 
-    let b1 = getProperty(t, 1);    // boolean
->b1 : boolean
->getProperty(t, 1) : boolean
->getProperty : <T, K extends keyof T>(obj: T, key: K) => T[K]
->t : [Shape, boolean]
->1 : 1
-
     let b2 = getProperty(t, "1");  // boolean
 >b2 : boolean
 >getProperty(t, "1") : boolean
 >getProperty : <T, K extends keyof T>(obj: T, key: K) => T[K]
 >t : [Shape, boolean]
 >"1" : "1"
-
-    let x1 = getProperty(t, 2);    // Shape | boolean
->x1 : boolean | Shape
->getProperty(t, 2) : boolean | Shape
->getProperty : <T, K extends keyof T>(obj: T, key: K) => T[K]
->t : [Shape, boolean]
->2 : 2
 }
 
 function f13(foo: any, bar: any) {
@@ -406,12 +375,12 @@ function f13(foo: any, bar: any) {
 >foo : any
 >"x" : "x"
 
-    let y = getProperty(foo, 100);  // any
+    let y = getProperty(foo, "100");  // any
 >y : any
->getProperty(foo, 100) : any
+>getProperty(foo, "100") : any
 >getProperty : <T, K extends keyof T>(obj: T, key: K) => T[K]
 >foo : any
->100 : 100
+>"100" : "100"
 
     let z = getProperty(foo, bar);  // any
 >z : any
@@ -737,13 +706,12 @@ function f40(c: C) {
 >"z" : "z"
 }
 
-function f50<T>(k: keyof T, s: string, n: number) {
->f50 : <T>(k: keyof T, s: string, n: number) => void
+function f50<T>(k: keyof T, s: string) {
+>f50 : <T>(k: keyof T, s: string) => void
 >T : T
 >k : keyof T
 >T : T
 >s : string
->n : number
 
     const x1 = s as keyof T;
 >x1 : keyof T
@@ -751,37 +719,20 @@ function f50<T>(k: keyof T, s: string, n: number) {
 >s : string
 >T : T
 
-    const x2 = n as keyof T;
->x2 : keyof T
->n as keyof T : keyof T
->n : number
->T : T
-
-    const x3 = k as string;
->x3 : string
+    const x2 = k as string;
+>x2 : string
 >k as string : string
->k : keyof T
-
-    const x4 = k as number;
->x4 : number
->k as number : number
->k : keyof T
-
-    const x5 = k as string | number;
->x5 : string | number
->k as string | number : string | number
 >k : keyof T
 }
 
-function f51<T, K extends keyof T>(k: K, s: string, n: number) {
->f51 : <T, K extends keyof T>(k: K, s: string, n: number) => void
+function f51<T, K extends keyof T>(k: K, s: string) {
+>f51 : <T, K extends keyof T>(k: K, s: string) => void
 >T : T
 >K : K
 >T : T
 >k : K
 >K : K
 >s : string
->n : number
 
     const x1 = s as keyof T;
 >x1 : keyof T
@@ -789,25 +740,9 @@ function f51<T, K extends keyof T>(k: K, s: string, n: number) {
 >s : string
 >T : T
 
-    const x2 = n as keyof T;
->x2 : keyof T
->n as keyof T : keyof T
->n : number
->T : T
-
-    const x3 = k as string;
->x3 : string
+    const x2 = k as string;
+>x2 : string
 >k as string : string
->k : K
-
-    const x4 = k as number;
->x4 : number
->k as number : number
->k : K
-
-    const x5 = k as string | number;
->x5 : string | number
->k as string | number : string | number
 >k : K
 }
 
diff --git a/tests/baselines/reference/mappedTypeErrors.errors.txt b/tests/baselines/reference/mappedTypeErrors.errors.txt
index 0e1198285ba..b3cba7eb54d 100644
--- a/tests/baselines/reference/mappedTypeErrors.errors.txt
+++ b/tests/baselines/reference/mappedTypeErrors.errors.txt
@@ -1,29 +1,28 @@
 tests/cases/conformance/types/mapped/mappedTypeErrors.ts(20,20): error TS2313: Type parameter 'P' has a circular constraint.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(21,20): error TS2322: Type 'Date' is not assignable to type 'string | number'.
-  Type 'Date' is not assignable to type 'number'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(22,19): error TS2344: Type 'Date' does not satisfy the constraint 'string | number'.
-  Type 'Date' is not assignable to type 'number'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(25,24): error TS2344: Type '"foo"' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(26,24): error TS2344: Type '"name" | "foo"' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(21,20): error TS2322: Type 'number' is not assignable to type 'string'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(22,20): error TS2322: Type 'Date' is not assignable to type 'string'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(23,19): error TS2344: Type 'Date' does not satisfy the constraint 'string'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(26,24): error TS2344: Type '"foo"' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(27,24): error TS2344: Type '"name" | "foo"' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
   Type '"foo"' is not assignable to type '"name" | "width" | "height" | "visible"'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(28,24): error TS2344: Type '"x" | "y"' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(29,24): error TS2344: Type '"x" | "y"' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
   Type '"x"' is not assignable to type '"name" | "width" | "height" | "visible"'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(30,24): error TS2344: Type 'undefined' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(33,24): error TS2344: Type 'T' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(31,24): error TS2344: Type 'undefined' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(34,24): error TS2344: Type 'T' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
   Type 'T' is not assignable to type '"visible"'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(37,24): error TS2344: Type 'T' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(38,24): error TS2344: Type 'T' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
   Type 'string | number' is not assignable to type '"name" | "width" | "height" | "visible"'.
     Type 'string' is not assignable to type '"name" | "width" | "height" | "visible"'.
       Type 'T' is not assignable to type '"visible"'.
         Type 'string | number' is not assignable to type '"visible"'.
           Type 'string' is not assignable to type '"visible"'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(59,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ [P in keyof T]?: T[P]; }'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(60,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ readonly [P in keyof T]: T[P]; }'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(61,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ readonly [P in keyof T]?: T[P]; }'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(66,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ [P in keyof T]: T[P][]; }'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(60,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ [P in keyof T]?: T[P]; }'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(61,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ readonly [P in keyof T]: T[P]; }'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(62,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ readonly [P in keyof T]?: T[P]; }'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(67,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ [P in keyof T]: T[P][]; }'.
 
 
-==== tests/cases/conformance/types/mapped/mappedTypeErrors.ts (13 errors) ====
+==== tests/cases/conformance/types/mapped/mappedTypeErrors.ts (14 errors) ====
     
     interface Shape {
         name: string;
@@ -46,14 +45,15 @@ tests/cases/conformance/types/mapped/mappedTypeErrors.ts(66,9): error TS2403: Su
     type T00 = { [P in P]: string };  // Error
                        ~
 !!! error TS2313: Type parameter 'P' has a circular constraint.
-    type T01 = { [P in Date]: number };  // Error
+    type T01 = { [P in number]: string };  // Error
+                       ~~~~~~
+!!! error TS2322: Type 'number' is not assignable to type 'string'.
+    type T02 = { [P in Date]: number };  // Error
                        ~~~~
-!!! error TS2322: Type 'Date' is not assignable to type 'string | number'.
-!!! error TS2322:   Type 'Date' is not assignable to type 'number'.
-    type T02 = Record<Date, number>;  // Error
+!!! error TS2322: Type 'Date' is not assignable to type 'string'.
+    type T03 = Record<Date, number>;  // Error
                       ~~~~
-!!! error TS2344: Type 'Date' does not satisfy the constraint 'string | number'.
-!!! error TS2344:   Type 'Date' is not assignable to type 'number'.
+!!! error TS2344: Type 'Date' does not satisfy the constraint 'string'.
     
     type T10 = Pick<Shape, "name">;
     type T11 = Pick<Shape, "foo">;  // Error
diff --git a/tests/baselines/reference/mappedTypeErrors.js b/tests/baselines/reference/mappedTypeErrors.js
index fe03b5c9593..cb840da32f7 100644
--- a/tests/baselines/reference/mappedTypeErrors.js
+++ b/tests/baselines/reference/mappedTypeErrors.js
@@ -19,8 +19,9 @@ interface Point {
 // Constraint checking
 
 type T00 = { [P in P]: string };  // Error
-type T01 = { [P in Date]: number };  // Error
-type T02 = Record<Date, number>;  // Error
+type T01 = { [P in number]: string };  // Error
+type T02 = { [P in Date]: number };  // Error
+type T03 = Record<Date, number>;  // Error
 
 type T10 = Pick<Shape, "name">;
 type T11 = Pick<Shape, "foo">;  // Error
@@ -116,9 +117,12 @@ declare type T00 = {
     [P in P]: string;
 };
 declare type T01 = {
+    [P in number]: string;
+};
+declare type T02 = {
     [P in Date]: number;
 };
-declare type T02 = Record<Date, number>;
+declare type T03 = Record<Date, number>;
 declare type T10 = Pick<Shape, "name">;
 declare type T11 = Pick<Shape, "foo">;
 declare type T12 = Pick<Shape, "name" | "foo">;
diff --git a/tests/baselines/reference/mappedTypes1.js b/tests/baselines/reference/mappedTypes1.js
index 71a8d5abb67..a172b637d1c 100644
--- a/tests/baselines/reference/mappedTypes1.js
+++ b/tests/baselines/reference/mappedTypes1.js
@@ -26,13 +26,9 @@ type T37 = { [P in keyof symbol]: void };
 type T38 = { [P in keyof never]: void };
 
 type T40 = { [P in string]: void };
-type T41 = { [P in number]: void };
-type T42 = { [P in string | number]: void };
-type T43 = { [P in "a" | "b" | 0 | 1]: void };
+type T43 = { [P in "a" | "b"]: void };
 type T44 = { [P in "a" | "b" | "0" | "1"]: void };
-type T45 = { [P in "a" | "b" | "0" | "1" | 0 | 1]: void };
-type T46 = { [P in number | "a" | "b" | 0 | 1]: void };
-type T47 = { [P in string | number | "a" | "b" | 0 | 1]: void };
+type T47 = { [P in string | "a" | "b" | "0" | "1"]: void };
 
 declare function f1<T1>(): { [P in keyof T1]: void };
 declare function f2<T1 extends string>(): { [P in keyof T1]: void };
@@ -114,26 +110,14 @@ declare type T38 = {
 declare type T40 = {
     [P in string]: void;
 };
-declare type T41 = {
-    [P in number]: void;
-};
-declare type T42 = {
-    [P in string | number]: void;
-};
 declare type T43 = {
-    [P in "a" | "b" | 0 | 1]: void;
+    [P in "a" | "b"]: void;
 };
 declare type T44 = {
     [P in "a" | "b" | "0" | "1"]: void;
 };
-declare type T45 = {
-    [P in "a" | "b" | "0" | "1" | 0 | 1]: void;
-};
-declare type T46 = {
-    [P in number | "a" | "b" | 0 | 1]: void;
-};
 declare type T47 = {
-    [P in string | number | "a" | "b" | 0 | 1]: void;
+    [P in string | "a" | "b" | "0" | "1"]: void;
 };
 declare function f1<T1>(): {
     [P in keyof T1]: void;
@@ -146,7 +130,6 @@ declare function f3<T1 extends number>(): {
 };
 declare let x1: {};
 declare let x2: {
-    [x: number]: void;
     toString: void;
     charAt: void;
     charCodeAt: void;
diff --git a/tests/baselines/reference/mappedTypes1.symbols b/tests/baselines/reference/mappedTypes1.symbols
index 908fbb3b0e1..88ced68aa0e 100644
--- a/tests/baselines/reference/mappedTypes1.symbols
+++ b/tests/baselines/reference/mappedTypes1.symbols
@@ -110,61 +110,45 @@ type T40 = { [P in string]: void };
 >T40 : Symbol(T40, Decl(mappedTypes1.ts, 24, 40))
 >P : Symbol(P, Decl(mappedTypes1.ts, 26, 14))
 
-type T41 = { [P in number]: void };
->T41 : Symbol(T41, Decl(mappedTypes1.ts, 26, 35))
+type T43 = { [P in "a" | "b"]: void };
+>T43 : Symbol(T43, Decl(mappedTypes1.ts, 26, 35))
 >P : Symbol(P, Decl(mappedTypes1.ts, 27, 14))
 
-type T42 = { [P in string | number]: void };
->T42 : Symbol(T42, Decl(mappedTypes1.ts, 27, 35))
+type T44 = { [P in "a" | "b" | "0" | "1"]: void };
+>T44 : Symbol(T44, Decl(mappedTypes1.ts, 27, 38))
 >P : Symbol(P, Decl(mappedTypes1.ts, 28, 14))
 
-type T43 = { [P in "a" | "b" | 0 | 1]: void };
->T43 : Symbol(T43, Decl(mappedTypes1.ts, 28, 44))
+type T47 = { [P in string | "a" | "b" | "0" | "1"]: void };
+>T47 : Symbol(T47, Decl(mappedTypes1.ts, 28, 50))
 >P : Symbol(P, Decl(mappedTypes1.ts, 29, 14))
 
-type T44 = { [P in "a" | "b" | "0" | "1"]: void };
->T44 : Symbol(T44, Decl(mappedTypes1.ts, 29, 46))
->P : Symbol(P, Decl(mappedTypes1.ts, 30, 14))
-
-type T45 = { [P in "a" | "b" | "0" | "1" | 0 | 1]: void };
->T45 : Symbol(T45, Decl(mappedTypes1.ts, 30, 50))
->P : Symbol(P, Decl(mappedTypes1.ts, 31, 14))
-
-type T46 = { [P in number | "a" | "b" | 0 | 1]: void };
->T46 : Symbol(T46, Decl(mappedTypes1.ts, 31, 58))
->P : Symbol(P, Decl(mappedTypes1.ts, 32, 14))
-
-type T47 = { [P in string | number | "a" | "b" | 0 | 1]: void };
->T47 : Symbol(T47, Decl(mappedTypes1.ts, 32, 55))
->P : Symbol(P, Decl(mappedTypes1.ts, 33, 14))
-
 declare function f1<T1>(): { [P in keyof T1]: void };
->f1 : Symbol(f1, Decl(mappedTypes1.ts, 33, 64))
->T1 : Symbol(T1, Decl(mappedTypes1.ts, 35, 20))
->P : Symbol(P, Decl(mappedTypes1.ts, 35, 30))
->T1 : Symbol(T1, Decl(mappedTypes1.ts, 35, 20))
+>f1 : Symbol(f1, Decl(mappedTypes1.ts, 29, 59))
+>T1 : Symbol(T1, Decl(mappedTypes1.ts, 31, 20))
+>P : Symbol(P, Decl(mappedTypes1.ts, 31, 30))
+>T1 : Symbol(T1, Decl(mappedTypes1.ts, 31, 20))
 
 declare function f2<T1 extends string>(): { [P in keyof T1]: void };
->f2 : Symbol(f2, Decl(mappedTypes1.ts, 35, 53))
->T1 : Symbol(T1, Decl(mappedTypes1.ts, 36, 20))
->P : Symbol(P, Decl(mappedTypes1.ts, 36, 45))
->T1 : Symbol(T1, Decl(mappedTypes1.ts, 36, 20))
+>f2 : Symbol(f2, Decl(mappedTypes1.ts, 31, 53))
+>T1 : Symbol(T1, Decl(mappedTypes1.ts, 32, 20))
+>P : Symbol(P, Decl(mappedTypes1.ts, 32, 45))
+>T1 : Symbol(T1, Decl(mappedTypes1.ts, 32, 20))
 
 declare function f3<T1 extends number>(): { [P in keyof T1]: void };
->f3 : Symbol(f3, Decl(mappedTypes1.ts, 36, 68))
->T1 : Symbol(T1, Decl(mappedTypes1.ts, 37, 20))
->P : Symbol(P, Decl(mappedTypes1.ts, 37, 45))
->T1 : Symbol(T1, Decl(mappedTypes1.ts, 37, 20))
+>f3 : Symbol(f3, Decl(mappedTypes1.ts, 32, 68))
+>T1 : Symbol(T1, Decl(mappedTypes1.ts, 33, 20))
+>P : Symbol(P, Decl(mappedTypes1.ts, 33, 45))
+>T1 : Symbol(T1, Decl(mappedTypes1.ts, 33, 20))
 
 let x1 = f1();
->x1 : Symbol(x1, Decl(mappedTypes1.ts, 39, 3))
->f1 : Symbol(f1, Decl(mappedTypes1.ts, 33, 64))
+>x1 : Symbol(x1, Decl(mappedTypes1.ts, 35, 3))
+>f1 : Symbol(f1, Decl(mappedTypes1.ts, 29, 59))
 
 let x2 = f2();
->x2 : Symbol(x2, Decl(mappedTypes1.ts, 40, 3))
->f2 : Symbol(f2, Decl(mappedTypes1.ts, 35, 53))
+>x2 : Symbol(x2, Decl(mappedTypes1.ts, 36, 3))
+>f2 : Symbol(f2, Decl(mappedTypes1.ts, 31, 53))
 
 let x3 = f3();
->x3 : Symbol(x3, Decl(mappedTypes1.ts, 41, 3))
->f3 : Symbol(f3, Decl(mappedTypes1.ts, 36, 68))
+>x3 : Symbol(x3, Decl(mappedTypes1.ts, 37, 3))
+>f3 : Symbol(f3, Decl(mappedTypes1.ts, 32, 68))
 
diff --git a/tests/baselines/reference/mappedTypes1.types b/tests/baselines/reference/mappedTypes1.types
index 06aeaa89621..6886810c394 100644
--- a/tests/baselines/reference/mappedTypes1.types
+++ b/tests/baselines/reference/mappedTypes1.types
@@ -112,15 +112,7 @@ type T40 = { [P in string]: void };
 >T40 : T40
 >P : P
 
-type T41 = { [P in number]: void };
->T41 : T41
->P : P
-
-type T42 = { [P in string | number]: void };
->T42 : T42
->P : P
-
-type T43 = { [P in "a" | "b" | 0 | 1]: void };
+type T43 = { [P in "a" | "b"]: void };
 >T43 : T43
 >P : P
 
@@ -128,15 +120,7 @@ type T44 = { [P in "a" | "b" | "0" | "1"]: void };
 >T44 : T44
 >P : P
 
-type T45 = { [P in "a" | "b" | "0" | "1" | 0 | 1]: void };
->T45 : T45
->P : P
-
-type T46 = { [P in number | "a" | "b" | 0 | 1]: void };
->T46 : T46
->P : P
-
-type T47 = { [P in string | number | "a" | "b" | 0 | 1]: void };
+type T47 = { [P in string | "a" | "b" | "0" | "1"]: void };
 >T47 : T47
 >P : P
 
@@ -164,8 +148,8 @@ let x1 = f1();
 >f1 : <T1>() => { [P in keyof T1]: void; }
 
 let x2 = f2();
->x2 : { [x: number]: void; toString: void; charAt: void; charCodeAt: void; concat: void; indexOf: void; lastIndexOf: void; localeCompare: void; match: void; replace: void; search: void; slice: void; split: void; substring: void; toLowerCase: void; toLocaleLowerCase: void; toUpperCase: void; toLocaleUpperCase: void; trim: void; length: void; substr: void; valueOf: void; }
->f2() : { [x: number]: void; toString: void; charAt: void; charCodeAt: void; concat: void; indexOf: void; lastIndexOf: void; localeCompare: void; match: void; replace: void; search: void; slice: void; split: void; substring: void; toLowerCase: void; toLocaleLowerCase: void; toUpperCase: void; toLocaleUpperCase: void; trim: void; length: void; substr: void; valueOf: void; }
+>x2 : { toString: void; charAt: void; charCodeAt: void; concat: void; indexOf: void; lastIndexOf: void; localeCompare: void; match: void; replace: void; search: void; slice: void; split: void; substring: void; toLowerCase: void; toLocaleLowerCase: void; toUpperCase: void; toLocaleUpperCase: void; trim: void; length: void; substr: void; valueOf: void; }
+>f2() : { toString: void; charAt: void; charCodeAt: void; concat: void; indexOf: void; lastIndexOf: void; localeCompare: void; match: void; replace: void; search: void; slice: void; split: void; substring: void; toLowerCase: void; toLocaleLowerCase: void; toUpperCase: void; toLocaleUpperCase: void; trim: void; length: void; substr: void; valueOf: void; }
 >f2 : <T1 extends string>() => { [P in keyof T1]: void; }
 
 let x3 = f3();
diff --git a/tests/baselines/reference/mappedTypes2.js b/tests/baselines/reference/mappedTypes2.js
index 25bb3fb6ded..580cb36c741 100644
--- a/tests/baselines/reference/mappedTypes2.js
+++ b/tests/baselines/reference/mappedTypes2.js
@@ -27,7 +27,7 @@ type DeepReadonly<T> = {
 declare function assign<T>(obj: T, props: Partial<T>): void;
 declare function freeze<T>(obj: T): Readonly<T>;
 declare function pick<T, K extends keyof T>(obj: T, ...keys: K[]): Pick<T, K>;
-declare function mapObject<K extends string | number, T, U>(obj: Record<K, T>, f: (x: T) => U): Record<K, U>;
+declare function mapObject<K extends string, T, U>(obj: Record<K, T>, f: (x: T) => U): Record<K, U>;
 declare function proxify<T>(obj: T): Proxify<T>;
 
 interface Shape {
@@ -148,7 +148,7 @@ declare type DeepReadonly<T> = {
 declare function assign<T>(obj: T, props: Partial<T>): void;
 declare function freeze<T>(obj: T): Readonly<T>;
 declare function pick<T, K extends keyof T>(obj: T, ...keys: K[]): Pick<T, K>;
-declare function mapObject<K extends string | number, T, U>(obj: Record<K, T>, f: (x: T) => U): Record<K, U>;
+declare function mapObject<K extends string, T, U>(obj: Record<K, T>, f: (x: T) => U): Record<K, U>;
 declare function proxify<T>(obj: T): Proxify<T>;
 interface Shape {
     name: string;
diff --git a/tests/baselines/reference/mappedTypes2.symbols b/tests/baselines/reference/mappedTypes2.symbols
index a610658869e..1b6fe299140 100644
--- a/tests/baselines/reference/mappedTypes2.symbols
+++ b/tests/baselines/reference/mappedTypes2.symbols
@@ -126,25 +126,25 @@ declare function pick<T, K extends keyof T>(obj: T, ...keys: K[]): Pick<T, K>;
 >T : Symbol(T, Decl(mappedTypes2.ts, 27, 22))
 >K : Symbol(K, Decl(mappedTypes2.ts, 27, 24))
 
-declare function mapObject<K extends string | number, T, U>(obj: Record<K, T>, f: (x: T) => U): Record<K, U>;
+declare function mapObject<K extends string, T, U>(obj: Record<K, T>, f: (x: T) => U): Record<K, U>;
 >mapObject : Symbol(mapObject, Decl(mappedTypes2.ts, 27, 78))
 >K : Symbol(K, Decl(mappedTypes2.ts, 28, 27))
->T : Symbol(T, Decl(mappedTypes2.ts, 28, 53))
->U : Symbol(U, Decl(mappedTypes2.ts, 28, 56))
->obj : Symbol(obj, Decl(mappedTypes2.ts, 28, 60))
+>T : Symbol(T, Decl(mappedTypes2.ts, 28, 44))
+>U : Symbol(U, Decl(mappedTypes2.ts, 28, 47))
+>obj : Symbol(obj, Decl(mappedTypes2.ts, 28, 51))
 >Record : Symbol(Record, Decl(lib.d.ts, --, --))
 >K : Symbol(K, Decl(mappedTypes2.ts, 28, 27))
->T : Symbol(T, Decl(mappedTypes2.ts, 28, 53))
->f : Symbol(f, Decl(mappedTypes2.ts, 28, 78))
->x : Symbol(x, Decl(mappedTypes2.ts, 28, 83))
->T : Symbol(T, Decl(mappedTypes2.ts, 28, 53))
->U : Symbol(U, Decl(mappedTypes2.ts, 28, 56))
+>T : Symbol(T, Decl(mappedTypes2.ts, 28, 44))
+>f : Symbol(f, Decl(mappedTypes2.ts, 28, 69))
+>x : Symbol(x, Decl(mappedTypes2.ts, 28, 74))
+>T : Symbol(T, Decl(mappedTypes2.ts, 28, 44))
+>U : Symbol(U, Decl(mappedTypes2.ts, 28, 47))
 >Record : Symbol(Record, Decl(lib.d.ts, --, --))
 >K : Symbol(K, Decl(mappedTypes2.ts, 28, 27))
->U : Symbol(U, Decl(mappedTypes2.ts, 28, 56))
+>U : Symbol(U, Decl(mappedTypes2.ts, 28, 47))
 
 declare function proxify<T>(obj: T): Proxify<T>;
->proxify : Symbol(proxify, Decl(mappedTypes2.ts, 28, 109))
+>proxify : Symbol(proxify, Decl(mappedTypes2.ts, 28, 100))
 >T : Symbol(T, Decl(mappedTypes2.ts, 29, 25))
 >obj : Symbol(obj, Decl(mappedTypes2.ts, 29, 28))
 >T : Symbol(T, Decl(mappedTypes2.ts, 29, 25))
@@ -295,7 +295,7 @@ function f5(shape: Shape) {
 
     const p = proxify(shape);
 >p : Symbol(p, Decl(mappedTypes2.ts, 79, 9))
->proxify : Symbol(proxify, Decl(mappedTypes2.ts, 28, 109))
+>proxify : Symbol(proxify, Decl(mappedTypes2.ts, 28, 100))
 >shape : Symbol(shape, Decl(mappedTypes2.ts, 78, 12))
 
     let name = p.name.get();
diff --git a/tests/baselines/reference/mappedTypes2.types b/tests/baselines/reference/mappedTypes2.types
index 8c487288a6f..14ca77e4680 100644
--- a/tests/baselines/reference/mappedTypes2.types
+++ b/tests/baselines/reference/mappedTypes2.types
@@ -126,8 +126,8 @@ declare function pick<T, K extends keyof T>(obj: T, ...keys: K[]): Pick<T, K>;
 >T : T
 >K : K
 
-declare function mapObject<K extends string | number, T, U>(obj: Record<K, T>, f: (x: T) => U): Record<K, U>;
->mapObject : <K extends string | number, T, U>(obj: Record<K, T>, f: (x: T) => U) => Record<K, U>
+declare function mapObject<K extends string, T, U>(obj: Record<K, T>, f: (x: T) => U): Record<K, U>;
+>mapObject : <K extends string, T, U>(obj: Record<K, T>, f: (x: T) => U) => Record<K, U>
 >K : K
 >T : T
 >U : U
@@ -297,7 +297,7 @@ function f4() {
     const lengths = mapObject(rec, s => s.length);  // { foo: number, bar: number, baz: number }
 >lengths : Record<"foo" | "bar" | "baz", number>
 >mapObject(rec, s => s.length) : Record<"foo" | "bar" | "baz", number>
->mapObject : <K extends string | number, T, U>(obj: Record<K, T>, f: (x: T) => U) => Record<K, U>
+>mapObject : <K extends string, T, U>(obj: Record<K, T>, f: (x: T) => U) => Record<K, U>
 >rec : { foo: string; bar: string; baz: string; }
 >s => s.length : (s: string) => number
 >s : string

From 4c6b94f16fbf9752181178a95bb3f53e9d2f6ef2 Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Mon, 21 Nov 2016 12:52:13 -0800
Subject: [PATCH 316/421] wrap subexpressions of conditional expressions in
 parens if necessary (#12420)

---
 src/compiler/factory.ts                       | 17 ++++++++---
 .../commaOperatorInConditionalExpression.js   | 14 +++++++++
 ...mmaOperatorInConditionalExpression.symbols | 18 +++++++++++
 ...commaOperatorInConditionalExpression.types | 30 +++++++++++++++++++
 .../commaOperatorInConditionalExpression.ts   |  5 ++++
 5 files changed, 80 insertions(+), 4 deletions(-)
 create mode 100644 tests/baselines/reference/commaOperatorInConditionalExpression.js
 create mode 100644 tests/baselines/reference/commaOperatorInConditionalExpression.symbols
 create mode 100644 tests/baselines/reference/commaOperatorInConditionalExpression.types
 create mode 100644 tests/cases/compiler/commaOperatorInConditionalExpression.ts

diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index d797fff92f4..63333dbe0b2 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -654,16 +654,16 @@ namespace ts {
         if (whenFalse) {
             // second overload
             node.questionToken = <QuestionToken>questionTokenOrWhenTrue;
-            node.whenTrue = whenTrueOrWhenFalse;
+            node.whenTrue = parenthesizeSubexpressionOfConditionalExpression(whenTrueOrWhenFalse);
             node.colonToken = <ColonToken>colonTokenOrLocation;
-            node.whenFalse = whenFalse;
+            node.whenFalse = parenthesizeSubexpressionOfConditionalExpression(whenFalse);
         }
         else {
             // first overload
             node.questionToken = createToken(SyntaxKind.QuestionToken);
-            node.whenTrue = <Expression>questionTokenOrWhenTrue;
+            node.whenTrue = parenthesizeSubexpressionOfConditionalExpression(<Expression>questionTokenOrWhenTrue);
             node.colonToken = createToken(SyntaxKind.ColonToken);
-            node.whenFalse = whenTrueOrWhenFalse;
+            node.whenFalse = parenthesizeSubexpressionOfConditionalExpression(whenTrueOrWhenFalse);
         }
         return node;
     }
@@ -2381,6 +2381,15 @@ namespace ts {
         return condition;
     }
 
+    function parenthesizeSubexpressionOfConditionalExpression(e: Expression): Expression {
+        // per ES grammar both 'whenTrue' and 'whenFalse' parts of conditional expression are assignment expressions
+        // so in case when comma expression is introduced as a part of previous transformations
+        // if should be wrapped in parens since comma operator has the lowest precedence
+        return e.kind === SyntaxKind.BinaryExpression && (<BinaryExpression>e).operatorToken.kind === SyntaxKind.CommaToken
+            ? createParen(e)
+            : e;
+    }
+
     /**
      * Wraps an expression in parentheses if it is needed in order to use the expression
      * as the expression of a NewExpression node.
diff --git a/tests/baselines/reference/commaOperatorInConditionalExpression.js b/tests/baselines/reference/commaOperatorInConditionalExpression.js
new file mode 100644
index 00000000000..be1705936e4
--- /dev/null
+++ b/tests/baselines/reference/commaOperatorInConditionalExpression.js
@@ -0,0 +1,14 @@
+//// [commaOperatorInConditionalExpression.ts]
+function f (m: string) {
+    [1, 2, 3].map(i => {
+        return true? { [m]: i } : { [m]: i + 1 }
+    })
+}
+
+//// [commaOperatorInConditionalExpression.js]
+function f(m) {
+    [1, 2, 3].map(function (i) {
+        return true ? (_a = {}, _a[m] = i, _a) : (_b = {}, _b[m] = i + 1, _b);
+        var _a, _b;
+    });
+}
diff --git a/tests/baselines/reference/commaOperatorInConditionalExpression.symbols b/tests/baselines/reference/commaOperatorInConditionalExpression.symbols
new file mode 100644
index 00000000000..18f749c5c5c
--- /dev/null
+++ b/tests/baselines/reference/commaOperatorInConditionalExpression.symbols
@@ -0,0 +1,18 @@
+=== tests/cases/compiler/commaOperatorInConditionalExpression.ts ===
+function f (m: string) {
+>f : Symbol(f, Decl(commaOperatorInConditionalExpression.ts, 0, 0))
+>m : Symbol(m, Decl(commaOperatorInConditionalExpression.ts, 0, 12))
+
+    [1, 2, 3].map(i => {
+>[1, 2, 3].map : Symbol(Array.map, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>map : Symbol(Array.map, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>i : Symbol(i, Decl(commaOperatorInConditionalExpression.ts, 1, 18))
+
+        return true? { [m]: i } : { [m]: i + 1 }
+>m : Symbol(m, Decl(commaOperatorInConditionalExpression.ts, 0, 12))
+>i : Symbol(i, Decl(commaOperatorInConditionalExpression.ts, 1, 18))
+>m : Symbol(m, Decl(commaOperatorInConditionalExpression.ts, 0, 12))
+>i : Symbol(i, Decl(commaOperatorInConditionalExpression.ts, 1, 18))
+
+    })
+}
diff --git a/tests/baselines/reference/commaOperatorInConditionalExpression.types b/tests/baselines/reference/commaOperatorInConditionalExpression.types
new file mode 100644
index 00000000000..f46282f9b6b
--- /dev/null
+++ b/tests/baselines/reference/commaOperatorInConditionalExpression.types
@@ -0,0 +1,30 @@
+=== tests/cases/compiler/commaOperatorInConditionalExpression.ts ===
+function f (m: string) {
+>f : (m: string) => void
+>m : string
+
+    [1, 2, 3].map(i => {
+>[1, 2, 3].map(i => {        return true? { [m]: i } : { [m]: i + 1 }    }) : { [x: string]: number; }[]
+>[1, 2, 3].map : { <U>(this: [number, number, number, number, number], callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any): [U, U, U, U, U]; <U>(this: [number, number, number, number], callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any): [U, U, U, U]; <U>(this: [number, number, number], callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any): [U, U, U]; <U>(this: [number, number], callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any): [U, U]; <U>(callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any): U[]; }
+>[1, 2, 3] : number[]
+>1 : 1
+>2 : 2
+>3 : 3
+>map : { <U>(this: [number, number, number, number, number], callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any): [U, U, U, U, U]; <U>(this: [number, number, number, number], callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any): [U, U, U, U]; <U>(this: [number, number, number], callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any): [U, U, U]; <U>(this: [number, number], callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any): [U, U]; <U>(callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any): U[]; }
+>i => {        return true? { [m]: i } : { [m]: i + 1 }    } : (i: number) => { [x: string]: number; }
+>i : number
+
+        return true? { [m]: i } : { [m]: i + 1 }
+>true? { [m]: i } : { [m]: i + 1 } : { [x: string]: number; }
+>true : true
+>{ [m]: i } : { [x: string]: number; }
+>m : string
+>i : number
+>{ [m]: i + 1 } : { [x: string]: number; }
+>m : string
+>i + 1 : number
+>i : number
+>1 : 1
+
+    })
+}
diff --git a/tests/cases/compiler/commaOperatorInConditionalExpression.ts b/tests/cases/compiler/commaOperatorInConditionalExpression.ts
new file mode 100644
index 00000000000..a65d8ba1882
--- /dev/null
+++ b/tests/cases/compiler/commaOperatorInConditionalExpression.ts
@@ -0,0 +1,5 @@
+function f (m: string) {
+    [1, 2, 3].map(i => {
+        return true? { [m]: i } : { [m]: i + 1 }
+    })
+}
\ No newline at end of file

From 1710df5f28fed8dfa7630978c873ed1bf6ee3983 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Mon, 21 Nov 2016 12:56:32 -0800
Subject: [PATCH 317/421] Type of for-in variable is keyof T when object type
 is a type parameter

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 3c8c0be77c7..89daf7ea0cb 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -3216,11 +3216,11 @@ namespace ts {
                 }
             }
 
-            // A variable declared in a for..in statement is always of type string
+            // 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 (declaration.parent.parent.kind === SyntaxKind.ForInStatement) {
-                // const indexType = getIndexType(checkNonNullExpression((<ForInStatement>declaration.parent.parent).expression));
-                // return indexType.flags & TypeFlags.Index ? indexType : stringType;
-                return stringType;
+                const indexType = getIndexType(checkNonNullExpression((<ForInStatement>declaration.parent.parent).expression));
+                return indexType.flags & TypeFlags.Index ? indexType : stringType;
             }
 
             if (declaration.parent.parent.kind === SyntaxKind.ForOfStatement) {

From dbc661f88e62ce06c44a6b67b13da40dbf668d10 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Mon, 21 Nov 2016 12:57:43 -0800
Subject: [PATCH 318/421] Accept new baselines

---
 tests/baselines/reference/for-inStatements.errors.txt     | 8 +++++++-
 .../reference/for-inStatementsInvalid.errors.txt          | 8 +++++++-
 tests/baselines/reference/forInStatement3.types           | 2 +-
 tests/baselines/reference/implicitAnyInCatch.types        | 2 +-
 tests/baselines/reference/inOperatorWithGeneric.types     | 2 +-
 .../reference/parserES5ForOfStatement19.errors.txt        | 7 -------
 .../baselines/reference/parserES5ForOfStatement19.symbols | 5 +++++
 tests/baselines/reference/parserES5ForOfStatement19.types | 5 +++++
 .../reference/parserES5ForOfStatement20.errors.txt        | 7 ++-----
 .../baselines/reference/parserForOfStatement19.errors.txt | 7 -------
 tests/baselines/reference/parserForOfStatement19.symbols  | 5 +++++
 tests/baselines/reference/parserForOfStatement19.types    | 5 +++++
 .../baselines/reference/parserForOfStatement20.errors.txt | 7 ++-----
 tests/baselines/reference/recursiveLetConst.errors.txt    | 5 +----
 14 files changed, 42 insertions(+), 33 deletions(-)
 delete mode 100644 tests/baselines/reference/parserES5ForOfStatement19.errors.txt
 create mode 100644 tests/baselines/reference/parserES5ForOfStatement19.symbols
 create mode 100644 tests/baselines/reference/parserES5ForOfStatement19.types
 delete mode 100644 tests/baselines/reference/parserForOfStatement19.errors.txt
 create mode 100644 tests/baselines/reference/parserForOfStatement19.symbols
 create mode 100644 tests/baselines/reference/parserForOfStatement19.types

diff --git a/tests/baselines/reference/for-inStatements.errors.txt b/tests/baselines/reference/for-inStatements.errors.txt
index f0e6c950ebb..c5ca29d2150 100644
--- a/tests/baselines/reference/for-inStatements.errors.txt
+++ b/tests/baselines/reference/for-inStatements.errors.txt
@@ -1,7 +1,9 @@
+tests/cases/conformance/statements/for-inStatements/for-inStatements.ts(33,18): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'string', but here has type 'keyof this'.
+tests/cases/conformance/statements/for-inStatements/for-inStatements.ts(50,18): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'string', but here has type 'keyof this'.
 tests/cases/conformance/statements/for-inStatements/for-inStatements.ts(79,15): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
 
 
-==== tests/cases/conformance/statements/for-inStatements/for-inStatements.ts (1 errors) ====
+==== tests/cases/conformance/statements/for-inStatements/for-inStatements.ts (3 errors) ====
     var aString: string;
     for (aString in {}) { }
     
@@ -35,6 +37,8 @@ tests/cases/conformance/statements/for-inStatements/for-inStatements.ts(79,15):
             for (var x in this.biz()) { }
             for (var x in this.biz) { }
             for (var x in this) { }
+                     ~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'string', but here has type 'keyof this'.
             return null;
         }
     
@@ -52,6 +56,8 @@ tests/cases/conformance/statements/for-inStatements/for-inStatements.ts(79,15):
             for (var x in this.biz()) { }
             for (var x in this.biz) { }
             for (var x in this) { }
+                     ~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'string', but here has type 'keyof this'.
     
             for (var x in super.biz) { }
             for (var x in super.biz()) { }
diff --git a/tests/baselines/reference/for-inStatementsInvalid.errors.txt b/tests/baselines/reference/for-inStatementsInvalid.errors.txt
index 00ab58ab94d..f98349973a3 100644
--- a/tests/baselines/reference/for-inStatementsInvalid.errors.txt
+++ b/tests/baselines/reference/for-inStatementsInvalid.errors.txt
@@ -9,13 +9,15 @@ tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(1
 tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(20,15): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
 tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(22,15): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
 tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(29,23): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
+tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(31,18): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'string', but here has type 'keyof this'.
 tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(38,23): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
 tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(46,23): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
+tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(48,18): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'string', but here has type 'keyof this'.
 tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(51,23): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
 tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(62,15): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
 
 
-==== tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts (15 errors) ====
+==== tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts (17 errors) ====
     var aNumber: number;
     for (aNumber in {}) { }
          ~~~~~~~
@@ -69,6 +71,8 @@ tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(6
 !!! error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
             for (var x in this.biz) { }
             for (var x in this) { }
+                     ~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'string', but here has type 'keyof this'.
             return null;
         }
     
@@ -90,6 +94,8 @@ tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(6
 !!! error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
             for (var x in this.biz) { }
             for (var x in this) { }
+                     ~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'string', but here has type 'keyof this'.
     
             for (var x in super.biz) { }
             for (var x in super.biz()) { }
diff --git a/tests/baselines/reference/forInStatement3.types b/tests/baselines/reference/forInStatement3.types
index d3767790ed2..09e6cf3ad96 100644
--- a/tests/baselines/reference/forInStatement3.types
+++ b/tests/baselines/reference/forInStatement3.types
@@ -8,7 +8,7 @@ function F<T>() {
 >T : T
 
   for (var a in expr) {
->a : string
+>a : keyof T
 >expr : T
   }
 }
diff --git a/tests/baselines/reference/implicitAnyInCatch.types b/tests/baselines/reference/implicitAnyInCatch.types
index d2a1be4a910..93cce09928e 100644
--- a/tests/baselines/reference/implicitAnyInCatch.types
+++ b/tests/baselines/reference/implicitAnyInCatch.types
@@ -22,7 +22,7 @@ class C {
 >temp : () => void
 
         for (var x in this) {
->x : string
+>x : keyof this
 >this : this
         }
     }
diff --git a/tests/baselines/reference/inOperatorWithGeneric.types b/tests/baselines/reference/inOperatorWithGeneric.types
index facdb7b50e2..eba9bf1419b 100644
--- a/tests/baselines/reference/inOperatorWithGeneric.types
+++ b/tests/baselines/reference/inOperatorWithGeneric.types
@@ -9,7 +9,7 @@ class C<T> {
 >T : T
 
         for (var p in x) {
->p : string
+>p : keyof T
 >x : T
         }
     }
diff --git a/tests/baselines/reference/parserES5ForOfStatement19.errors.txt b/tests/baselines/reference/parserES5ForOfStatement19.errors.txt
deleted file mode 100644
index 9d0bb02f1ef..00000000000
--- a/tests/baselines/reference/parserES5ForOfStatement19.errors.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement19.ts(1,16): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
-
-
-==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement19.ts (1 errors) ====
-    for (var of in of) { }
-                   ~~
-!!! error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement19.symbols b/tests/baselines/reference/parserES5ForOfStatement19.symbols
new file mode 100644
index 00000000000..93ba77e3db9
--- /dev/null
+++ b/tests/baselines/reference/parserES5ForOfStatement19.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement19.ts ===
+for (var of in of) { }
+>of : Symbol(of, Decl(parserES5ForOfStatement19.ts, 0, 8))
+>of : Symbol(of, Decl(parserES5ForOfStatement19.ts, 0, 8))
+
diff --git a/tests/baselines/reference/parserES5ForOfStatement19.types b/tests/baselines/reference/parserES5ForOfStatement19.types
new file mode 100644
index 00000000000..13abc7ae757
--- /dev/null
+++ b/tests/baselines/reference/parserES5ForOfStatement19.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement19.ts ===
+for (var of in of) { }
+>of : any
+>of : any
+
diff --git a/tests/baselines/reference/parserES5ForOfStatement20.errors.txt b/tests/baselines/reference/parserES5ForOfStatement20.errors.txt
index 2bfc54590ad..4aee32394b6 100644
--- a/tests/baselines/reference/parserES5ForOfStatement20.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement20.errors.txt
@@ -1,10 +1,7 @@
 tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement20.ts(1,10): error TS1189: The variable declaration of a 'for...in' statement cannot have an initializer.
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement20.ts(1,20): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
 
 
-==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement20.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement20.ts (1 errors) ====
     for (var of = 0 in of) { }
              ~~
-!!! error TS1189: The variable declaration of a 'for...in' statement cannot have an initializer.
-                       ~~
-!!! error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
\ No newline at end of file
+!!! error TS1189: The variable declaration of a 'for...in' statement cannot have an initializer.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserForOfStatement19.errors.txt b/tests/baselines/reference/parserForOfStatement19.errors.txt
deleted file mode 100644
index a111498efe7..00000000000
--- a/tests/baselines/reference/parserForOfStatement19.errors.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement19.ts(1,16): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
-
-
-==== tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement19.ts (1 errors) ====
-    for (var of in of) { }
-                   ~~
-!!! error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserForOfStatement19.symbols b/tests/baselines/reference/parserForOfStatement19.symbols
new file mode 100644
index 00000000000..1e123349e13
--- /dev/null
+++ b/tests/baselines/reference/parserForOfStatement19.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement19.ts ===
+for (var of in of) { }
+>of : Symbol(of, Decl(parserForOfStatement19.ts, 0, 8))
+>of : Symbol(of, Decl(parserForOfStatement19.ts, 0, 8))
+
diff --git a/tests/baselines/reference/parserForOfStatement19.types b/tests/baselines/reference/parserForOfStatement19.types
new file mode 100644
index 00000000000..6fcc5e8f792
--- /dev/null
+++ b/tests/baselines/reference/parserForOfStatement19.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement19.ts ===
+for (var of in of) { }
+>of : any
+>of : any
+
diff --git a/tests/baselines/reference/parserForOfStatement20.errors.txt b/tests/baselines/reference/parserForOfStatement20.errors.txt
index f2b6ac39a83..461f307f6b9 100644
--- a/tests/baselines/reference/parserForOfStatement20.errors.txt
+++ b/tests/baselines/reference/parserForOfStatement20.errors.txt
@@ -1,10 +1,7 @@
 tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement20.ts(1,10): error TS1189: The variable declaration of a 'for...in' statement cannot have an initializer.
-tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement20.ts(1,20): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
 
 
-==== tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement20.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement20.ts (1 errors) ====
     for (var of = 0 in of) { }
              ~~
-!!! error TS1189: The variable declaration of a 'for...in' statement cannot have an initializer.
-                       ~~
-!!! error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
\ No newline at end of file
+!!! error TS1189: The variable declaration of a 'for...in' statement cannot have an initializer.
\ No newline at end of file
diff --git a/tests/baselines/reference/recursiveLetConst.errors.txt b/tests/baselines/reference/recursiveLetConst.errors.txt
index 6d3f15880bb..88ecb379e5e 100644
--- a/tests/baselines/reference/recursiveLetConst.errors.txt
+++ b/tests/baselines/reference/recursiveLetConst.errors.txt
@@ -5,14 +5,13 @@ tests/cases/compiler/recursiveLetConst.ts(5,14): error TS2448: Block-scoped vari
 tests/cases/compiler/recursiveLetConst.ts(6,14): error TS2448: Block-scoped variable 'v' used before its declaration.
 tests/cases/compiler/recursiveLetConst.ts(7,1): error TS7027: Unreachable code detected.
 tests/cases/compiler/recursiveLetConst.ts(7,16): error TS2448: Block-scoped variable 'v' used before its declaration.
-tests/cases/compiler/recursiveLetConst.ts(8,15): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
 tests/cases/compiler/recursiveLetConst.ts(8,15): error TS2448: Block-scoped variable 'v' used before its declaration.
 tests/cases/compiler/recursiveLetConst.ts(9,15): error TS2448: Block-scoped variable 'v' used before its declaration.
 tests/cases/compiler/recursiveLetConst.ts(10,17): error TS2448: Block-scoped variable 'v' used before its declaration.
 tests/cases/compiler/recursiveLetConst.ts(11,11): error TS2448: Block-scoped variable 'x2' used before its declaration.
 
 
-==== tests/cases/compiler/recursiveLetConst.ts (12 errors) ====
+==== tests/cases/compiler/recursiveLetConst.ts (11 errors) ====
     'use strict'
     let x = x + 1;
             ~
@@ -36,8 +35,6 @@ tests/cases/compiler/recursiveLetConst.ts(11,11): error TS2448: Block-scoped var
 !!! error TS2448: Block-scoped variable 'v' used before its declaration.
     for (let v in v) { }
                   ~
-!!! error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
-                  ~
 !!! error TS2448: Block-scoped variable 'v' used before its declaration.
     for (let v of v) { }
                   ~

From b662a8b31906558ec1bd90d8668e78042d2e567c Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Mon, 21 Nov 2016 13:10:42 -0800
Subject: [PATCH 319/421] Add test case

---
 .../reference/keyofAndIndexedAccess.js        | 12 +++
 .../reference/keyofAndIndexedAccess.symbols   | 92 +++++++++++--------
 .../reference/keyofAndIndexedAccess.types     | 23 +++++
 .../types/keyof/keyofAndIndexedAccess.ts      |  6 ++
 4 files changed, 97 insertions(+), 36 deletions(-)

diff --git a/tests/baselines/reference/keyofAndIndexedAccess.js b/tests/baselines/reference/keyofAndIndexedAccess.js
index 017669603a4..1cc8846bbbd 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.js
+++ b/tests/baselines/reference/keyofAndIndexedAccess.js
@@ -211,6 +211,12 @@ function f55<T, K extends keyof T>(obj: T, key: K) {
     const b = "foo" in obj[key];
 }
 
+function f60<T>(source: T, target: T) {
+    for (let k in source) {
+        target[k] = source[k];
+    }
+}
+
 // Repros from #12011
 
 class Base {
@@ -383,6 +389,11 @@ function f55(obj, key) {
     }
     var b = "foo" in obj[key];
 }
+function f60(source, target) {
+    for (var k in source) {
+        target[k] = source[k];
+    }
+}
 // Repros from #12011
 var Base = (function () {
     function Base() {
@@ -518,6 +529,7 @@ declare function f53<T, K extends keyof T>(obj: {
 }, k: K, s: string, n: number): void;
 declare function f54<T>(obj: T, key: keyof T): void;
 declare function f55<T, K extends keyof T>(obj: T, key: K): void;
+declare function f60<T>(source: T, target: T): void;
 declare class Base {
     get<K extends keyof this>(prop: K): this[K];
     set<K extends keyof this>(prop: K, value: this[K]): void;
diff --git a/tests/baselines/reference/keyofAndIndexedAccess.symbols b/tests/baselines/reference/keyofAndIndexedAccess.symbols
index 8a2f1052d13..634dfe09da9 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.symbols
+++ b/tests/baselines/reference/keyofAndIndexedAccess.symbols
@@ -735,84 +735,104 @@ function f55<T, K extends keyof T>(obj: T, key: K) {
 >key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 206, 42))
 }
 
+function f60<T>(source: T, target: T) {
+>f60 : Symbol(f60, Decl(keyofAndIndexedAccess.ts, 210, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 212, 13))
+>source : Symbol(source, Decl(keyofAndIndexedAccess.ts, 212, 16))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 212, 13))
+>target : Symbol(target, Decl(keyofAndIndexedAccess.ts, 212, 26))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 212, 13))
+
+    for (let k in source) {
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 213, 12))
+>source : Symbol(source, Decl(keyofAndIndexedAccess.ts, 212, 16))
+
+        target[k] = source[k];
+>target : Symbol(target, Decl(keyofAndIndexedAccess.ts, 212, 26))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 213, 12))
+>source : Symbol(source, Decl(keyofAndIndexedAccess.ts, 212, 16))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 213, 12))
+    }
+}
+
 // Repros from #12011
 
 class Base {
->Base : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 210, 1))
+>Base : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 216, 1))
 
     get<K extends keyof this>(prop: K) {
->get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 214, 12))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 215, 8))
->prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 215, 30))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 215, 8))
+>get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 220, 12))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 221, 8))
+>prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 221, 30))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 221, 8))
 
         return this[prop];
->this : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 210, 1))
->prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 215, 30))
+>this : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 216, 1))
+>prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 221, 30))
     }
     set<K extends keyof this>(prop: K, value: this[K]) {
->set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 217, 5))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 218, 8))
->prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 218, 30))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 218, 8))
->value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 218, 38))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 218, 8))
+>set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 223, 5))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 224, 8))
+>prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 224, 30))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 224, 8))
+>value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 224, 38))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 224, 8))
 
         this[prop] = value;
->this : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 210, 1))
->prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 218, 30))
->value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 218, 38))
+>this : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 216, 1))
+>prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 224, 30))
+>value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 224, 38))
     }
 }
 
 class Person extends Base {
->Person : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 221, 1))
->Base : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 210, 1))
+>Person : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 227, 1))
+>Base : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 216, 1))
 
     parts: number;
->parts : Symbol(Person.parts, Decl(keyofAndIndexedAccess.ts, 223, 27))
+>parts : Symbol(Person.parts, Decl(keyofAndIndexedAccess.ts, 229, 27))
 
     constructor(parts: number) {
->parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 225, 16))
+>parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 231, 16))
 
         super();
->super : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 210, 1))
+>super : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 216, 1))
 
         this.set("parts", parts);
->this.set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 217, 5))
->this : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 221, 1))
->set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 217, 5))
->parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 225, 16))
+>this.set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 223, 5))
+>this : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 227, 1))
+>set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 223, 5))
+>parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 231, 16))
     }
     getParts() {
->getParts : Symbol(Person.getParts, Decl(keyofAndIndexedAccess.ts, 228, 5))
+>getParts : Symbol(Person.getParts, Decl(keyofAndIndexedAccess.ts, 234, 5))
 
         return this.get("parts")
->this.get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 214, 12))
->this : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 221, 1))
->get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 214, 12))
+>this.get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 220, 12))
+>this : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 227, 1))
+>get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 220, 12))
     }
 }
 
 class OtherPerson {
->OtherPerson : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 232, 1))
+>OtherPerson : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 238, 1))
 
     parts: number;
->parts : Symbol(OtherPerson.parts, Decl(keyofAndIndexedAccess.ts, 234, 19))
+>parts : Symbol(OtherPerson.parts, Decl(keyofAndIndexedAccess.ts, 240, 19))
 
     constructor(parts: number) {
->parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 236, 16))
+>parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 242, 16))
 
         setProperty(this, "parts", parts);
 >setProperty : Symbol(setProperty, Decl(keyofAndIndexedAccess.ts, 79, 1))
->this : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 232, 1))
->parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 236, 16))
+>this : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 238, 1))
+>parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 242, 16))
     }
     getParts() {
->getParts : Symbol(OtherPerson.getParts, Decl(keyofAndIndexedAccess.ts, 238, 5))
+>getParts : Symbol(OtherPerson.getParts, Decl(keyofAndIndexedAccess.ts, 244, 5))
 
         return getProperty(this, "parts")
 >getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->this : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 232, 1))
+>this : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 238, 1))
     }
 }
diff --git a/tests/baselines/reference/keyofAndIndexedAccess.types b/tests/baselines/reference/keyofAndIndexedAccess.types
index 4c09909c0fd..916b82aaf40 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.types
+++ b/tests/baselines/reference/keyofAndIndexedAccess.types
@@ -854,6 +854,29 @@ function f55<T, K extends keyof T>(obj: T, key: K) {
 >key : K
 }
 
+function f60<T>(source: T, target: T) {
+>f60 : <T>(source: T, target: T) => void
+>T : T
+>source : T
+>T : T
+>target : T
+>T : T
+
+    for (let k in source) {
+>k : keyof T
+>source : T
+
+        target[k] = source[k];
+>target[k] = source[k] : T[keyof T]
+>target[k] : T[keyof T]
+>target : T
+>k : keyof T
+>source[k] : T[keyof T]
+>source : T
+>k : keyof T
+    }
+}
+
 // Repros from #12011
 
 class Base {
diff --git a/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts b/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
index 690154cb7ac..b0451b8d55c 100644
--- a/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
+++ b/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
@@ -211,6 +211,12 @@ function f55<T, K extends keyof T>(obj: T, key: K) {
     const b = "foo" in obj[key];
 }
 
+function f60<T>(source: T, target: T) {
+    for (let k in source) {
+        target[k] = source[k];
+    }
+}
+
 // Repros from #12011
 
 class Base {

From 9009da225c75bdb1d100b1f9bb2af6acae29863e Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Mon, 21 Nov 2016 17:25:31 -0800
Subject: [PATCH 320/421] Update baseline-accept configuration

---
 Jakefile.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Jakefile.js b/Jakefile.js
index 087bbb67511..24d1cc3c79e 100644
--- a/Jakefile.js
+++ b/Jakefile.js
@@ -1086,12 +1086,10 @@ task("tests-debug", ["setDebugMode", "tests"]);
 // Makes the test results the new baseline
 desc("Makes the most recent test results the new baseline, overwriting the old baseline");
 task("baseline-accept", function () {
-    acceptBaseline("");
+    acceptBaseline(localBaseline, refBaseline);
 });
 
-function acceptBaseline(containerFolder) {
-    var sourceFolder = path.join(localBaseline, containerFolder);
-    var targetFolder = path.join(refBaseline, containerFolder);
+function acceptBaseline(sourceFolder, targetFolder) {
     console.log('Accept baselines from ' + sourceFolder + ' to ' + targetFolder);
     var files = fs.readdirSync(sourceFolder);
     var deleteEnding = '.delete';
@@ -1115,12 +1113,12 @@ function acceptBaseline(containerFolder) {
 
 desc("Makes the most recent rwc test results the new baseline, overwriting the old baseline");
 task("baseline-accept-rwc", function () {
-    acceptBaseline("rwc");
+    acceptBaseline(localRwcBaseline, refRwcBaseline);
 });
 
 desc("Makes the most recent test262 test results the new baseline, overwriting the old baseline");
 task("baseline-accept-test262", function () {
-    acceptBaseline("test262");
+    acceptBaseline(localTest262Baseline, refTest262Baseline);
 });
 
 

From 843d08b5af6a31c2c3c92f57bfbe0abad6e53e77 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Mon, 21 Nov 2016 17:25:38 -0800
Subject: [PATCH 321/421] increase timeout

---
 Jakefile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jakefile.js b/Jakefile.js
index 24d1cc3c79e..3454ca8ae30 100644
--- a/Jakefile.js
+++ b/Jakefile.js
@@ -930,7 +930,7 @@ function runConsoleTests(defaultReporter, runInParallel) {
     }
 
     if (tests && tests.toLocaleLowerCase() === "rwc") {
-        testTimeout = 400000;
+        testTimeout = 800000;
     }
 
     colors = process.env.colors || process.env.color;

From 5403ce62ed0df80177d664c0ab77d6a62c672d28 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Mon, 21 Nov 2016 17:26:10 -0800
Subject: [PATCH 322/421] normalize path in harness

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

diff --git a/src/harness/harness.ts b/src/harness/harness.ts
index 88346557ba7..26a4a6f963d 100644
--- a/src/harness/harness.ts
+++ b/src/harness/harness.ts
@@ -2015,7 +2015,7 @@ namespace Harness {
 
     export function isDefaultLibraryFile(filePath: string): boolean {
         // We need to make sure that the filePath is prefixed with "lib." not just containing "lib." and end with ".d.ts"
-        const fileName = ts.getBaseFileName(filePath);
+        const fileName = ts.getBaseFileName(ts.normalizeSlashes(filePath));
         return ts.startsWith(fileName, "lib.") && ts.endsWith(fileName, ".d.ts");
     }
 

From b8b6e6149194e6c99b752de469334a676a91a975 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Mon, 21 Nov 2016 17:26:18 -0800
Subject: [PATCH 323/421] handel missing files gracefully

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

diff --git a/src/harness/rwcRunner.ts b/src/harness/rwcRunner.ts
index 9f9bf8589f0..44d2c981c84 100644
--- a/src/harness/rwcRunner.ts
+++ b/src/harness/rwcRunner.ts
@@ -199,7 +199,7 @@ namespace RWC {
                     }
                     // Do not include the library in the baselines to avoid noise
                     const baselineFiles = inputFiles.concat(otherFiles).filter(f => !Harness.isDefaultLibraryFile(f.unitName));
-                    const errors = compilerResult.errors.filter(e => !Harness.isDefaultLibraryFile(e.file.fileName));
+                    const errors = compilerResult.errors.filter(e => e.file && !Harness.isDefaultLibraryFile(e.file.fileName));
                     return Harness.Compiler.getErrorBaseline(baselineFiles, errors);
                 }, baselineOpts);
             });

From 70e130b08cc884c76fb8e7fb09f6bd4799ee7cc2 Mon Sep 17 00:00:00 2001
From: Jason Ramsay <jasonra@microsoft.com>
Date: Mon, 21 Nov 2016 13:42:42 -0800
Subject: [PATCH 324/421] Maintain support for deprecated API
 typingOptions.enableAutoDiscovery

---
 src/compiler/commandLineParser.ts             | 22 +++++++++-
 src/compiler/types.ts                         |  4 ++
 .../convertTypeAcquisitionFromJson.ts         | 41 +++++++++++++++----
 src/server/protocol.ts                        |  4 ++
 src/server/session.ts                         |  6 +++
 5 files changed, 67 insertions(+), 10 deletions(-)

diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index d54af31a985..5e44efc4235 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -463,6 +463,13 @@ namespace ts {
 
     /* @internal */
     export let typeAcquisitionDeclarations: CommandLineOption[] = [
+        {
+            /* @deprecated typingOptions.enableAutoDiscovery
+             * Use typeAcquisition.enable instead.
+             */
+            name: "enableAutoDiscovery",
+            type: "boolean",
+        },
         {
             name: "enable",
             type: "boolean",
@@ -501,6 +508,15 @@ namespace ts {
 
     let optionNameMapCache: OptionNameMap;
 
+    /* @internal */
+    export function replaceEnableAutoDiscoveryWithEnable(typeAcquisition: TypeAcquisition): void {
+        // Replace deprecated typingOptions.enableAutoDiscovery with typeAcquisition.enable
+        if (typeAcquisition && typeAcquisition.enableAutoDiscovery !== undefined && typeAcquisition.enable === undefined) {
+           typeAcquisition.enable = typeAcquisition.enableAutoDiscovery;
+           delete typeAcquisition.enableAutoDiscovery;
+        }
+    }
+
     /* @internal */
     export function getOptionNameMap(): OptionNameMap {
         if (optionNameMapCache) {
@@ -843,7 +859,9 @@ namespace ts {
         }
 
         let options: CompilerOptions = convertCompilerOptionsFromJsonWorker(json["compilerOptions"], basePath, errors, configFileName);
-        const typeAcquisition: TypeAcquisition = convertTypeAcquisitionFromJsonWorker(json["typeAcquisition"], basePath, errors, configFileName);
+        // typingOptions has been deprecated. Use typeAcquisition instead.
+        const jsonOptions = json["typeAcquisition"] || json["typingOptions"];
+        const typeAcquisition: TypeAcquisition = convertTypeAcquisitionFromJsonWorker(jsonOptions, basePath, errors, configFileName);
 
         if (json["extends"]) {
             let [include, exclude, files, baseOptions]: [string[], string[], string[], CompilerOptions] = [undefined, undefined, undefined, {}];
@@ -1016,7 +1034,9 @@ namespace ts {
         basePath: string, errors: Diagnostic[], configFileName?: string): TypeAcquisition {
 
         const options: TypeAcquisition = { enable: getBaseFileName(configFileName) === "jsconfig.json", include: [], exclude: [] };
+        replaceEnableAutoDiscoveryWithEnable(jsonOptions);
         convertOptionsFromJson(typeAcquisitionDeclarations, jsonOptions, basePath, options, Diagnostics.Unknown_type_acquisition_option_0, errors);
+
         return options;
     }
 
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 5cd5b15d653..9c45dd11107 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -3199,6 +3199,10 @@ namespace ts {
     }
 
     export interface TypeAcquisition {
+        /* @deprecated typingOptions.enableAutoDiscovery
+         * Use typeAcquisition.enable instead.
+         */
+        enableAutoDiscovery?: boolean;
         enable?: boolean;
         include?: string[];
         exclude?: string[];
diff --git a/src/harness/unittests/convertTypeAcquisitionFromJson.ts b/src/harness/unittests/convertTypeAcquisitionFromJson.ts
index a935c3c0e66..4c21b7ca2b9 100644
--- a/src/harness/unittests/convertTypeAcquisitionFromJson.ts
+++ b/src/harness/unittests/convertTypeAcquisitionFromJson.ts
@@ -4,7 +4,8 @@
 namespace ts {
     describe("convertTypeAcquisitionFromJson", () => {
         function assertTypeAcquisition(json: any, configFileName: string, expectedResult: { typeAcquisition: TypeAcquisition, errors: Diagnostic[] }) {
-            const { options: actualTypeAcquisition, errors: actualErrors } = convertTypeAcquisitionFromJson(json["typeAcquisition"], "/apath/", configFileName);
+            const jsonOptions = json["typeAcquisition"] || json["typingOptions"];
+            const { options: actualTypeAcquisition, errors: actualErrors } = convertTypeAcquisitionFromJson(jsonOptions, "/apath/", configFileName);
             const parsedTypeAcquisition = JSON.stringify(actualTypeAcquisition);
             const expectedTypeAcquisition = JSON.stringify(expectedResult.typeAcquisition);
             assert.equal(parsedTypeAcquisition, expectedTypeAcquisition);
@@ -20,7 +21,29 @@ namespace ts {
         }
 
         // tsconfig.json
-        it("Convert correctly format tsconfig.json to typing-options ", () => {
+        it("Convert deprecated typingOptions.enableAutoDiscovery format tsconfig.json to typeAcquisition ", () => {
+            assertTypeAcquisition(
+                {
+                    "typingOptions":
+                    {
+                        "enableAutoDiscovery": true,
+                        "include": ["0.d.ts", "1.d.ts"],
+                        "exclude": ["0.js", "1.js"]
+                    }
+                },
+                "tsconfig.json",
+                {
+                    typeAcquisition:
+                    {
+                        enable: true,
+                        include: ["0.d.ts", "1.d.ts"],
+                        exclude: ["0.js", "1.js"]
+                    },
+                    errors: <Diagnostic[]>[]
+            });
+        });
+
+        it("Convert correctly format tsconfig.json to typeAcquisition ", () => {
             assertTypeAcquisition(
                 {
                     "typeAcquisition":
@@ -42,7 +65,7 @@ namespace ts {
             });
         });
 
-        it("Convert incorrect format tsconfig.json to typing-options ", () => {
+        it("Convert incorrect format tsconfig.json to typeAcquisition ", () => {
             assertTypeAcquisition(
                 {
                     "typeAcquisition":
@@ -70,7 +93,7 @@ namespace ts {
                 });
         });
 
-        it("Convert default tsconfig.json to typing-options ", () => {
+        it("Convert default tsconfig.json to typeAcquisition ", () => {
             assertTypeAcquisition({}, "tsconfig.json",
                 {
                     typeAcquisition:
@@ -83,7 +106,7 @@ namespace ts {
                 });
         });
 
-        it("Convert tsconfig.json with only enable property to typing-options ", () => {
+        it("Convert tsconfig.json with only enable property to typeAcquisition ", () => {
             assertTypeAcquisition(
                 {
                     "typeAcquisition":
@@ -103,7 +126,7 @@ namespace ts {
         });
 
         // jsconfig.json
-        it("Convert jsconfig.json to typing-options ", () => {
+        it("Convert jsconfig.json to typeAcquisition ", () => {
             assertTypeAcquisition(
                 {
                     "typeAcquisition":
@@ -124,7 +147,7 @@ namespace ts {
                 });
         });
 
-        it("Convert default jsconfig.json to typing-options ", () => {
+        it("Convert default jsconfig.json to typeAcquisition ", () => {
             assertTypeAcquisition({ }, "jsconfig.json",
                 {
                     typeAcquisition:
@@ -137,7 +160,7 @@ namespace ts {
                 });
         });
 
-        it("Convert incorrect format jsconfig.json to typing-options ", () => {
+        it("Convert incorrect format jsconfig.json to typeAcquisition ", () => {
             assertTypeAcquisition(
                 {
                     "typeAcquisition":
@@ -165,7 +188,7 @@ namespace ts {
                 });
         });
 
-        it("Convert jsconfig.json with only enable property to typing-options ", () => {
+        it("Convert jsconfig.json with only enable property to typeAcquisition ", () => {
             assertTypeAcquisition(
                 {
                     "typeAcquisition":
diff --git a/src/server/protocol.ts b/src/server/protocol.ts
index f25ed190c08..e1735f768e4 100644
--- a/src/server/protocol.ts
+++ b/src/server/protocol.ts
@@ -860,6 +860,10 @@ namespace ts.server.protocol {
          * Compiler options for the project
          */
         options: ExternalProjectCompilerOptions;
+        /**
+         * @deprecated typingOptions. Use typeAcquisition instead
+         */
+        typingOptions?: TypeAcquisition;
         /**
          * Explicitly specified type acquisition for the project
          */
diff --git a/src/server/session.ts b/src/server/session.ts
index 36144b3212d..282964611e4 100644
--- a/src/server/session.ts
+++ b/src/server/session.ts
@@ -1365,6 +1365,12 @@ namespace ts.server {
 
         private handlers = createMap<(request: protocol.Request) => { response?: any, responseRequired?: boolean }>({
             [CommandNames.OpenExternalProject]: (request: protocol.OpenExternalProjectRequest) => {
+                // Replace deprecated typingOptions with typeAcquisition
+                if (request.arguments.typingOptions && !request.arguments.typeAcquisition) {
+                    replaceEnableAutoDiscoveryWithEnable(request.arguments.typingOptions);
+                    request.arguments.typeAcquisition = request.arguments.typingOptions;
+                    delete request.arguments.typingOptions;
+                }
                 this.projectService.openExternalProject(request.arguments);
                 // TODO: report errors
                 return this.requiredResponse(true);

From ab8d6c0dab5e5114292dba0eb437628736fb1bf3 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Mon, 21 Nov 2016 22:45:36 -0800
Subject: [PATCH 325/421] Port lib changes

---
 src/lib/dom.generated.d.ts                    | 4286 +++++++----------
 src/lib/webworker.generated.d.ts              |  214 +-
 .../modularizeLibrary_Dom.iterable.symbols    |    4 +-
 .../modularizeLibrary_Dom.iterable.types      |    4 +-
 4 files changed, 1822 insertions(+), 2686 deletions(-)

diff --git a/src/lib/dom.generated.d.ts b/src/lib/dom.generated.d.ts
index fd77f369fd8..d9825897ebc 100644
--- a/src/lib/dom.generated.d.ts
+++ b/src/lib/dom.generated.d.ts
@@ -76,6 +76,7 @@ interface DoubleRange {
 }
 
 interface EventInit {
+    scoped?: boolean;
     bubbles?: boolean;
     cancelable?: boolean;
 }
@@ -917,15 +918,26 @@ declare var AnimationEvent: {
     new(): AnimationEvent;
 }
 
+interface ApplicationCacheEventMap {
+    "cached": Event;
+    "checking": Event;
+    "downloading": Event;
+    "error": ErrorEvent;
+    "noupdate": Event;
+    "obsolete": Event;
+    "progress": ProgressEvent;
+    "updateready": Event;
+}
+
 interface ApplicationCache extends EventTarget {
-    oncached: (this: this, ev: Event) => any;
-    onchecking: (this: this, ev: Event) => any;
-    ondownloading: (this: this, ev: Event) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
-    onnoupdate: (this: this, ev: Event) => any;
-    onobsolete: (this: this, ev: Event) => any;
-    onprogress: (this: this, ev: ProgressEvent) => any;
-    onupdateready: (this: this, ev: Event) => any;
+    oncached: (this: ApplicationCache, ev: Event) => any;
+    onchecking: (this: ApplicationCache, ev: Event) => any;
+    ondownloading: (this: ApplicationCache, ev: Event) => any;
+    onerror: (this: ApplicationCache, ev: ErrorEvent) => any;
+    onnoupdate: (this: ApplicationCache, ev: Event) => any;
+    onobsolete: (this: ApplicationCache, ev: Event) => any;
+    onprogress: (this: ApplicationCache, ev: ProgressEvent) => any;
+    onupdateready: (this: ApplicationCache, ev: Event) => any;
     readonly status: number;
     abort(): void;
     swapCache(): void;
@@ -936,14 +948,7 @@ interface ApplicationCache extends EventTarget {
     readonly OBSOLETE: number;
     readonly UNCACHED: number;
     readonly UPDATEREADY: number;
-    addEventListener(type: "cached", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "checking", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "downloading", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "noupdate", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "obsolete", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "updateready", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof ApplicationCacheEventMap>(type: K, listener: (this: ApplicationCache, ev: ApplicationCacheEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -996,17 +1001,21 @@ declare var AudioBuffer: {
     new(): AudioBuffer;
 }
 
+interface AudioBufferSourceNodeEventMap {
+    "ended": MediaStreamErrorEvent;
+}
+
 interface AudioBufferSourceNode extends AudioNode {
     buffer: AudioBuffer | null;
     readonly detune: AudioParam;
     loop: boolean;
     loopEnd: number;
     loopStart: number;
-    onended: (this: this, ev: MediaStreamErrorEvent) => any;
+    onended: (this: AudioBufferSourceNode, ev: MediaStreamErrorEvent) => any;
     readonly playbackRate: AudioParam;
     start(when?: number, offset?: number, duration?: number): void;
     stop(when?: number): void;
-    addEventListener(type: "ended", listener: (this: this, ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof AudioBufferSourceNodeEventMap>(type: K, listener: (this: AudioBufferSourceNode, ev: AudioBufferSourceNodeEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -1128,16 +1137,20 @@ declare var AudioTrack: {
     new(): AudioTrack;
 }
 
+interface AudioTrackListEventMap {
+    "addtrack": TrackEvent;
+    "change": Event;
+    "removetrack": TrackEvent;
+}
+
 interface AudioTrackList extends EventTarget {
     readonly length: number;
-    onaddtrack: (this: this, ev: TrackEvent) => any;
-    onchange: (this: this, ev: Event) => any;
-    onremovetrack: (this: this, ev: TrackEvent) => any;
+    onaddtrack: (this: AudioTrackList, ev: TrackEvent) => any;
+    onchange: (this: AudioTrackList, ev: Event) => any;
+    onremovetrack: (this: AudioTrackList, ev: TrackEvent) => any;
     getTrackById(id: string): AudioTrack | null;
     item(index: number): AudioTrack;
-    addEventListener(type: "addtrack", listener: (this: this, ev: TrackEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "removetrack", listener: (this: this, ev: TrackEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof AudioTrackListEventMap>(type: K, listener: (this: AudioTrackList, ev: AudioTrackListEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
     [index: number]: AudioTrack;
 }
@@ -1838,7 +1851,6 @@ interface CharacterData extends Node, ChildNode {
     insertData(offset: number, arg: string): void;
     replaceData(offset: number, count: number, arg: string): void;
     substringData(offset: number, count: number): string;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var CharacterData: {
@@ -2163,6 +2175,8 @@ declare var DOMTokenList: {
 
 interface DataCue extends TextTrackCue {
     data: ArrayBuffer;
+    addEventListener<K extends keyof TextTrackCueEventMap>(type: K, listener: (this: TextTrackCue, ev: TextTrackCueEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var DataCue: {
@@ -2291,7 +2305,98 @@ declare var DeviceRotationRate: {
     new(): DeviceRotationRate;
 }
 
-interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEvent, ParentNode {
+interface DocumentEventMap extends GlobalEventHandlersEventMap {
+    "abort": UIEvent;
+    "activate": UIEvent;
+    "beforeactivate": UIEvent;
+    "beforedeactivate": UIEvent;
+    "blur": FocusEvent;
+    "canplay": Event;
+    "canplaythrough": Event;
+    "change": Event;
+    "click": MouseEvent;
+    "contextmenu": PointerEvent;
+    "dblclick": MouseEvent;
+    "deactivate": UIEvent;
+    "drag": DragEvent;
+    "dragend": DragEvent;
+    "dragenter": DragEvent;
+    "dragleave": DragEvent;
+    "dragover": DragEvent;
+    "dragstart": DragEvent;
+    "drop": DragEvent;
+    "durationchange": Event;
+    "emptied": Event;
+    "ended": MediaStreamErrorEvent;
+    "error": ErrorEvent;
+    "focus": FocusEvent;
+    "fullscreenchange": Event;
+    "fullscreenerror": Event;
+    "input": Event;
+    "invalid": Event;
+    "keydown": KeyboardEvent;
+    "keypress": KeyboardEvent;
+    "keyup": KeyboardEvent;
+    "load": Event;
+    "loadeddata": Event;
+    "loadedmetadata": Event;
+    "loadstart": Event;
+    "mousedown": MouseEvent;
+    "mousemove": MouseEvent;
+    "mouseout": MouseEvent;
+    "mouseover": MouseEvent;
+    "mouseup": MouseEvent;
+    "mousewheel": WheelEvent;
+    "MSContentZoom": UIEvent;
+    "MSGestureChange": MSGestureEvent;
+    "MSGestureDoubleTap": MSGestureEvent;
+    "MSGestureEnd": MSGestureEvent;
+    "MSGestureHold": MSGestureEvent;
+    "MSGestureStart": MSGestureEvent;
+    "MSGestureTap": MSGestureEvent;
+    "MSInertiaStart": MSGestureEvent;
+    "MSManipulationStateChanged": MSManipulationEvent;
+    "MSPointerCancel": MSPointerEvent;
+    "MSPointerDown": MSPointerEvent;
+    "MSPointerEnter": MSPointerEvent;
+    "MSPointerLeave": MSPointerEvent;
+    "MSPointerMove": MSPointerEvent;
+    "MSPointerOut": MSPointerEvent;
+    "MSPointerOver": MSPointerEvent;
+    "MSPointerUp": MSPointerEvent;
+    "mssitemodejumplistitemremoved": MSSiteModeEvent;
+    "msthumbnailclick": MSSiteModeEvent;
+    "pause": Event;
+    "play": Event;
+    "playing": Event;
+    "pointerlockchange": Event;
+    "pointerlockerror": Event;
+    "progress": ProgressEvent;
+    "ratechange": Event;
+    "readystatechange": ProgressEvent;
+    "reset": Event;
+    "scroll": UIEvent;
+    "seeked": Event;
+    "seeking": Event;
+    "select": UIEvent;
+    "selectionchange": Event;
+    "selectstart": Event;
+    "stalled": Event;
+    "stop": Event;
+    "submit": Event;
+    "suspend": Event;
+    "timeupdate": Event;
+    "touchcancel": TouchEvent;
+    "touchend": TouchEvent;
+    "touchmove": TouchEvent;
+    "touchstart": TouchEvent;
+    "volumechange": Event;
+    "waiting": Event;
+    "webkitfullscreenchange": Event;
+    "webkitfullscreenerror": Event;
+}
+
+interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEvent, ParentNode, DocumentOrShadowRoot {
     /**
       * Sets or gets the URL for the current document. 
       */
@@ -2414,294 +2519,294 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * Fires when the user aborts the download.
       * @param ev The event.
       */
-    onabort: (this: this, ev: UIEvent) => any;
+    onabort: (this: Document, ev: UIEvent) => any;
     /**
       * Fires when the object is set as the active element.
       * @param ev The event.
       */
-    onactivate: (this: this, ev: UIEvent) => any;
+    onactivate: (this: Document, ev: UIEvent) => any;
     /**
       * Fires immediately before the object is set as the active element.
       * @param ev The event.
       */
-    onbeforeactivate: (this: this, ev: UIEvent) => any;
+    onbeforeactivate: (this: Document, ev: UIEvent) => any;
     /**
       * Fires immediately before the activeElement is changed from the current object to another object in the parent document.
       * @param ev The event.
       */
-    onbeforedeactivate: (this: this, ev: UIEvent) => any;
+    onbeforedeactivate: (this: Document, ev: UIEvent) => any;
     /** 
       * Fires when the object loses the input focus. 
       * @param ev The focus event.
       */
-    onblur: (this: this, ev: FocusEvent) => any;
+    onblur: (this: Document, ev: FocusEvent) => any;
     /**
       * Occurs when playback is possible, but would require further buffering. 
       * @param ev The event.
       */
-    oncanplay: (this: this, ev: Event) => any;
-    oncanplaythrough: (this: this, ev: Event) => any;
+    oncanplay: (this: Document, ev: Event) => any;
+    oncanplaythrough: (this: Document, ev: Event) => any;
     /**
       * Fires when the contents of the object or selection have changed. 
       * @param ev The event.
       */
-    onchange: (this: this, ev: Event) => any;
+    onchange: (this: Document, ev: Event) => any;
     /**
       * Fires when the user clicks the left mouse button on the object
       * @param ev The mouse event.
       */
-    onclick: (this: this, ev: MouseEvent) => any;
+    onclick: (this: Document, ev: MouseEvent) => any;
     /**
       * Fires when the user clicks the right mouse button in the client area, opening the context menu. 
       * @param ev The mouse event.
       */
-    oncontextmenu: (this: this, ev: PointerEvent) => any;
+    oncontextmenu: (this: Document, ev: PointerEvent) => any;
     /**
       * Fires when the user double-clicks the object.
       * @param ev The mouse event.
       */
-    ondblclick: (this: this, ev: MouseEvent) => any;
+    ondblclick: (this: Document, ev: MouseEvent) => any;
     /**
       * Fires when the activeElement is changed from the current object to another object in the parent document.
       * @param ev The UI Event
       */
-    ondeactivate: (this: this, ev: UIEvent) => any;
+    ondeactivate: (this: Document, ev: UIEvent) => any;
     /**
       * Fires on the source object continuously during a drag operation.
       * @param ev The event.
       */
-    ondrag: (this: this, ev: DragEvent) => any;
+    ondrag: (this: Document, ev: DragEvent) => any;
     /**
       * Fires on the source object when the user releases the mouse at the close of a drag operation.
       * @param ev The event.
       */
-    ondragend: (this: this, ev: DragEvent) => any;
+    ondragend: (this: Document, ev: DragEvent) => any;
     /** 
       * Fires on the target element when the user drags the object to a valid drop target.
       * @param ev The drag event.
       */
-    ondragenter: (this: this, ev: DragEvent) => any;
+    ondragenter: (this: Document, ev: DragEvent) => any;
     /** 
       * Fires on the target object when the user moves the mouse out of a valid drop target during a drag operation.
       * @param ev The drag event.
       */
-    ondragleave: (this: this, ev: DragEvent) => any;
+    ondragleave: (this: Document, ev: DragEvent) => any;
     /**
       * Fires on the target element continuously while the user drags the object over a valid drop target.
       * @param ev The event.
       */
-    ondragover: (this: this, ev: DragEvent) => any;
+    ondragover: (this: Document, ev: DragEvent) => any;
     /**
       * Fires on the source object when the user starts to drag a text selection or selected object. 
       * @param ev The event.
       */
-    ondragstart: (this: this, ev: DragEvent) => any;
-    ondrop: (this: this, ev: DragEvent) => any;
+    ondragstart: (this: Document, ev: DragEvent) => any;
+    ondrop: (this: Document, ev: DragEvent) => any;
     /**
       * Occurs when the duration attribute is updated. 
       * @param ev The event.
       */
-    ondurationchange: (this: this, ev: Event) => any;
+    ondurationchange: (this: Document, ev: Event) => any;
     /**
       * Occurs when the media element is reset to its initial state. 
       * @param ev The event.
       */
-    onemptied: (this: this, ev: Event) => any;
+    onemptied: (this: Document, ev: Event) => any;
     /**
       * Occurs when the end of playback is reached. 
       * @param ev The event
       */
-    onended: (this: this, ev: MediaStreamErrorEvent) => any;
+    onended: (this: Document, ev: MediaStreamErrorEvent) => any;
     /**
       * Fires when an error occurs during object loading.
       * @param ev The event.
       */
-    onerror: (this: this, ev: ErrorEvent) => any;
+    onerror: (this: Document, ev: ErrorEvent) => any;
     /**
       * Fires when the object receives focus. 
       * @param ev The event.
       */
-    onfocus: (this: this, ev: FocusEvent) => any;
-    onfullscreenchange: (this: this, ev: Event) => any;
-    onfullscreenerror: (this: this, ev: Event) => any;
-    oninput: (this: this, ev: Event) => any;
-    oninvalid: (this: this, ev: Event) => any;
+    onfocus: (this: Document, ev: FocusEvent) => any;
+    onfullscreenchange: (this: Document, ev: Event) => any;
+    onfullscreenerror: (this: Document, ev: Event) => any;
+    oninput: (this: Document, ev: Event) => any;
+    oninvalid: (this: Document, ev: Event) => any;
     /**
       * Fires when the user presses a key.
       * @param ev The keyboard event
       */
-    onkeydown: (this: this, ev: KeyboardEvent) => any;
+    onkeydown: (this: Document, ev: KeyboardEvent) => any;
     /**
       * Fires when the user presses an alphanumeric key.
       * @param ev The event.
       */
-    onkeypress: (this: this, ev: KeyboardEvent) => any;
+    onkeypress: (this: Document, ev: KeyboardEvent) => any;
     /**
       * Fires when the user releases a key.
       * @param ev The keyboard event
       */
-    onkeyup: (this: this, ev: KeyboardEvent) => any;
+    onkeyup: (this: Document, ev: KeyboardEvent) => any;
     /**
       * Fires immediately after the browser loads the object. 
       * @param ev The event.
       */
-    onload: (this: this, ev: Event) => any;
+    onload: (this: Document, ev: Event) => any;
     /**
       * Occurs when media data is loaded at the current playback position. 
       * @param ev The event.
       */
-    onloadeddata: (this: this, ev: Event) => any;
+    onloadeddata: (this: Document, ev: Event) => any;
     /**
       * Occurs when the duration and dimensions of the media have been determined.
       * @param ev The event.
       */
-    onloadedmetadata: (this: this, ev: Event) => any;
+    onloadedmetadata: (this: Document, ev: Event) => any;
     /**
       * Occurs when Internet Explorer begins looking for media data. 
       * @param ev The event.
       */
-    onloadstart: (this: this, ev: Event) => any;
+    onloadstart: (this: Document, ev: Event) => any;
     /**
       * Fires when the user clicks the object with either mouse button. 
       * @param ev The mouse event.
       */
-    onmousedown: (this: this, ev: MouseEvent) => any;
+    onmousedown: (this: Document, ev: MouseEvent) => any;
     /**
       * Fires when the user moves the mouse over the object. 
       * @param ev The mouse event.
       */
-    onmousemove: (this: this, ev: MouseEvent) => any;
+    onmousemove: (this: Document, ev: MouseEvent) => any;
     /**
       * Fires when the user moves the mouse pointer outside the boundaries of the object. 
       * @param ev The mouse event.
       */
-    onmouseout: (this: this, ev: MouseEvent) => any;
+    onmouseout: (this: Document, ev: MouseEvent) => any;
     /**
       * Fires when the user moves the mouse pointer into the object.
       * @param ev The mouse event.
       */
-    onmouseover: (this: this, ev: MouseEvent) => any;
+    onmouseover: (this: Document, ev: MouseEvent) => any;
     /**
       * Fires when the user releases a mouse button while the mouse is over the object. 
       * @param ev The mouse event.
       */
-    onmouseup: (this: this, ev: MouseEvent) => any;
+    onmouseup: (this: Document, ev: MouseEvent) => any;
     /**
       * Fires when the wheel button is rotated. 
       * @param ev The mouse event
       */
-    onmousewheel: (this: this, ev: WheelEvent) => any;
-    onmscontentzoom: (this: this, ev: UIEvent) => any;
-    onmsgesturechange: (this: this, ev: MSGestureEvent) => any;
-    onmsgesturedoubletap: (this: this, ev: MSGestureEvent) => any;
-    onmsgestureend: (this: this, ev: MSGestureEvent) => any;
-    onmsgesturehold: (this: this, ev: MSGestureEvent) => any;
-    onmsgesturestart: (this: this, ev: MSGestureEvent) => any;
-    onmsgesturetap: (this: this, ev: MSGestureEvent) => any;
-    onmsinertiastart: (this: this, ev: MSGestureEvent) => any;
-    onmsmanipulationstatechanged: (this: this, ev: MSManipulationEvent) => any;
-    onmspointercancel: (this: this, ev: MSPointerEvent) => any;
-    onmspointerdown: (this: this, ev: MSPointerEvent) => any;
-    onmspointerenter: (this: this, ev: MSPointerEvent) => any;
-    onmspointerleave: (this: this, ev: MSPointerEvent) => any;
-    onmspointermove: (this: this, ev: MSPointerEvent) => any;
-    onmspointerout: (this: this, ev: MSPointerEvent) => any;
-    onmspointerover: (this: this, ev: MSPointerEvent) => any;
-    onmspointerup: (this: this, ev: MSPointerEvent) => any;
+    onmousewheel: (this: Document, ev: WheelEvent) => any;
+    onmscontentzoom: (this: Document, ev: UIEvent) => any;
+    onmsgesturechange: (this: Document, ev: MSGestureEvent) => any;
+    onmsgesturedoubletap: (this: Document, ev: MSGestureEvent) => any;
+    onmsgestureend: (this: Document, ev: MSGestureEvent) => any;
+    onmsgesturehold: (this: Document, ev: MSGestureEvent) => any;
+    onmsgesturestart: (this: Document, ev: MSGestureEvent) => any;
+    onmsgesturetap: (this: Document, ev: MSGestureEvent) => any;
+    onmsinertiastart: (this: Document, ev: MSGestureEvent) => any;
+    onmsmanipulationstatechanged: (this: Document, ev: MSManipulationEvent) => any;
+    onmspointercancel: (this: Document, ev: MSPointerEvent) => any;
+    onmspointerdown: (this: Document, ev: MSPointerEvent) => any;
+    onmspointerenter: (this: Document, ev: MSPointerEvent) => any;
+    onmspointerleave: (this: Document, ev: MSPointerEvent) => any;
+    onmspointermove: (this: Document, ev: MSPointerEvent) => any;
+    onmspointerout: (this: Document, ev: MSPointerEvent) => any;
+    onmspointerover: (this: Document, ev: MSPointerEvent) => any;
+    onmspointerup: (this: Document, ev: MSPointerEvent) => any;
     /**
       * Occurs when an item is removed from a Jump List of a webpage running in Site Mode. 
       * @param ev The event.
       */
-    onmssitemodejumplistitemremoved: (this: this, ev: MSSiteModeEvent) => any;
+    onmssitemodejumplistitemremoved: (this: Document, ev: MSSiteModeEvent) => any;
     /**
       * Occurs when a user clicks a button in a Thumbnail Toolbar of a webpage running in Site Mode.
       * @param ev The event.
       */
-    onmsthumbnailclick: (this: this, ev: MSSiteModeEvent) => any;
+    onmsthumbnailclick: (this: Document, ev: MSSiteModeEvent) => any;
     /**
       * Occurs when playback is paused.
       * @param ev The event.
       */
-    onpause: (this: this, ev: Event) => any;
+    onpause: (this: Document, ev: Event) => any;
     /**
       * Occurs when the play method is requested. 
       * @param ev The event.
       */
-    onplay: (this: this, ev: Event) => any;
+    onplay: (this: Document, ev: Event) => any;
     /**
       * Occurs when the audio or video has started playing. 
       * @param ev The event.
       */
-    onplaying: (this: this, ev: Event) => any;
-    onpointerlockchange: (this: this, ev: Event) => any;
-    onpointerlockerror: (this: this, ev: Event) => any;
+    onplaying: (this: Document, ev: Event) => any;
+    onpointerlockchange: (this: Document, ev: Event) => any;
+    onpointerlockerror: (this: Document, ev: Event) => any;
     /**
       * Occurs to indicate progress while downloading media data. 
       * @param ev The event.
       */
-    onprogress: (this: this, ev: ProgressEvent) => any;
+    onprogress: (this: Document, ev: ProgressEvent) => any;
     /**
       * Occurs when the playback rate is increased or decreased. 
       * @param ev The event.
       */
-    onratechange: (this: this, ev: Event) => any;
+    onratechange: (this: Document, ev: Event) => any;
     /**
       * Fires when the state of the object has changed.
       * @param ev The event
       */
-    onreadystatechange: (this: this, ev: ProgressEvent) => any;
+    onreadystatechange: (this: Document, ev: ProgressEvent) => any;
     /**
       * Fires when the user resets a form. 
       * @param ev The event.
       */
-    onreset: (this: this, ev: Event) => any;
+    onreset: (this: Document, ev: Event) => any;
     /**
       * Fires when the user repositions the scroll box in the scroll bar on the object. 
       * @param ev The event.
       */
-    onscroll: (this: this, ev: UIEvent) => any;
+    onscroll: (this: Document, ev: UIEvent) => any;
     /**
       * Occurs when the seek operation ends. 
       * @param ev The event.
       */
-    onseeked: (this: this, ev: Event) => any;
+    onseeked: (this: Document, ev: Event) => any;
     /**
       * Occurs when the current playback position is moved. 
       * @param ev The event.
       */
-    onseeking: (this: this, ev: Event) => any;
+    onseeking: (this: Document, ev: Event) => any;
     /**
       * Fires when the current selection changes.
       * @param ev The event.
       */
-    onselect: (this: this, ev: UIEvent) => any;
+    onselect: (this: Document, ev: UIEvent) => any;
     /**
       * Fires when the selection state of a document changes.
       * @param ev The event.
       */
-    onselectionchange: (this: this, ev: Event) => any;
-    onselectstart: (this: this, ev: Event) => any;
+    onselectionchange: (this: Document, ev: Event) => any;
+    onselectstart: (this: Document, ev: Event) => any;
     /**
       * Occurs when the download has stopped. 
       * @param ev The event.
       */
-    onstalled: (this: this, ev: Event) => any;
+    onstalled: (this: Document, ev: Event) => any;
     /**
       * Fires when the user clicks the Stop button or leaves the Web page.
       * @param ev The event.
       */
-    onstop: (this: this, ev: Event) => any;
-    onsubmit: (this: this, ev: Event) => any;
+    onstop: (this: Document, ev: Event) => any;
+    onsubmit: (this: Document, ev: Event) => any;
     /**
       * Occurs if the load operation has been intentionally halted. 
       * @param ev The event.
       */
-    onsuspend: (this: this, ev: Event) => any;
+    onsuspend: (this: Document, ev: Event) => any;
     /**
       * Occurs to indicate the current playback position.
       * @param ev The event.
       */
-    ontimeupdate: (this: this, ev: Event) => any;
+    ontimeupdate: (this: Document, ev: Event) => any;
     ontouchcancel: (ev: TouchEvent) => any;
     ontouchend: (ev: TouchEvent) => any;
     ontouchmove: (ev: TouchEvent) => any;
@@ -2710,14 +2815,14 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * Occurs when the volume is changed, or playback is muted or unmuted.
       * @param ev The event.
       */
-    onvolumechange: (this: this, ev: Event) => any;
+    onvolumechange: (this: Document, ev: Event) => any;
     /**
       * Occurs when playback stops because the next frame of a video resource is not available. 
       * @param ev The event.
       */
-    onwaiting: (this: this, ev: Event) => any;
-    onwebkitfullscreenchange: (this: this, ev: Event) => any;
-    onwebkitfullscreenerror: (this: this, ev: Event) => any;
+    onwaiting: (this: Document, ev: Event) => any;
+    onwebkitfullscreenchange: (this: Document, ev: Event) => any;
+    onwebkitfullscreenerror: (this: Document, ev: Event) => any;
     plugins: HTMLCollectionOf<HTMLEmbedElement>;
     readonly pointerLockElement: Element;
     /**
@@ -2788,86 +2893,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * Creates an instance of the element for the specified tag.
       * @param tagName The name of an element.
       */
-    createElement(tagName: "a"): HTMLAnchorElement;
-    createElement(tagName: "applet"): HTMLAppletElement;
-    createElement(tagName: "area"): HTMLAreaElement;
-    createElement(tagName: "audio"): HTMLAudioElement;
-    createElement(tagName: "base"): HTMLBaseElement;
-    createElement(tagName: "basefont"): HTMLBaseFontElement;
-    createElement(tagName: "blockquote"): HTMLQuoteElement;
-    createElement(tagName: "body"): HTMLBodyElement;
-    createElement(tagName: "br"): HTMLBRElement;
-    createElement(tagName: "button"): HTMLButtonElement;
-    createElement(tagName: "canvas"): HTMLCanvasElement;
-    createElement(tagName: "caption"): HTMLTableCaptionElement;
-    createElement(tagName: "col"): HTMLTableColElement;
-    createElement(tagName: "colgroup"): HTMLTableColElement;
-    createElement(tagName: "datalist"): HTMLDataListElement;
-    createElement(tagName: "del"): HTMLModElement;
-    createElement(tagName: "dir"): HTMLDirectoryElement;
-    createElement(tagName: "div"): HTMLDivElement;
-    createElement(tagName: "dl"): HTMLDListElement;
-    createElement(tagName: "embed"): HTMLEmbedElement;
-    createElement(tagName: "fieldset"): HTMLFieldSetElement;
-    createElement(tagName: "font"): HTMLFontElement;
-    createElement(tagName: "form"): HTMLFormElement;
-    createElement(tagName: "frame"): HTMLFrameElement;
-    createElement(tagName: "frameset"): HTMLFrameSetElement;
-    createElement(tagName: "h1"): HTMLHeadingElement;
-    createElement(tagName: "h2"): HTMLHeadingElement;
-    createElement(tagName: "h3"): HTMLHeadingElement;
-    createElement(tagName: "h4"): HTMLHeadingElement;
-    createElement(tagName: "h5"): HTMLHeadingElement;
-    createElement(tagName: "h6"): HTMLHeadingElement;
-    createElement(tagName: "head"): HTMLHeadElement;
-    createElement(tagName: "hr"): HTMLHRElement;
-    createElement(tagName: "html"): HTMLHtmlElement;
-    createElement(tagName: "iframe"): HTMLIFrameElement;
-    createElement(tagName: "img"): HTMLImageElement;
-    createElement(tagName: "input"): HTMLInputElement;
-    createElement(tagName: "ins"): HTMLModElement;
-    createElement(tagName: "isindex"): HTMLUnknownElement;
-    createElement(tagName: "label"): HTMLLabelElement;
-    createElement(tagName: "legend"): HTMLLegendElement;
-    createElement(tagName: "li"): HTMLLIElement;
-    createElement(tagName: "link"): HTMLLinkElement;
-    createElement(tagName: "listing"): HTMLPreElement;
-    createElement(tagName: "map"): HTMLMapElement;
-    createElement(tagName: "marquee"): HTMLMarqueeElement;
-    createElement(tagName: "menu"): HTMLMenuElement;
-    createElement(tagName: "meta"): HTMLMetaElement;
-    createElement(tagName: "meter"): HTMLMeterElement;
-    createElement(tagName: "nextid"): HTMLUnknownElement;
-    createElement(tagName: "object"): HTMLObjectElement;
-    createElement(tagName: "ol"): HTMLOListElement;
-    createElement(tagName: "optgroup"): HTMLOptGroupElement;
-    createElement(tagName: "option"): HTMLOptionElement;
-    createElement(tagName: "p"): HTMLParagraphElement;
-    createElement(tagName: "param"): HTMLParamElement;
-    createElement(tagName: "picture"): HTMLPictureElement;
-    createElement(tagName: "pre"): HTMLPreElement;
-    createElement(tagName: "progress"): HTMLProgressElement;
-    createElement(tagName: "q"): HTMLQuoteElement;
-    createElement(tagName: "script"): HTMLScriptElement;
-    createElement(tagName: "select"): HTMLSelectElement;
-    createElement(tagName: "source"): HTMLSourceElement;
-    createElement(tagName: "span"): HTMLSpanElement;
-    createElement(tagName: "style"): HTMLStyleElement;
-    createElement(tagName: "table"): HTMLTableElement;
-    createElement(tagName: "tbody"): HTMLTableSectionElement;
-    createElement(tagName: "td"): HTMLTableDataCellElement;
-    createElement(tagName: "template"): HTMLTemplateElement;
-    createElement(tagName: "textarea"): HTMLTextAreaElement;
-    createElement(tagName: "tfoot"): HTMLTableSectionElement;
-    createElement(tagName: "th"): HTMLTableHeaderCellElement;
-    createElement(tagName: "thead"): HTMLTableSectionElement;
-    createElement(tagName: "title"): HTMLTitleElement;
-    createElement(tagName: "tr"): HTMLTableRowElement;
-    createElement(tagName: "track"): HTMLTrackElement;
-    createElement(tagName: "ul"): HTMLUListElement;
-    createElement(tagName: "video"): HTMLVideoElement;
-    createElement(tagName: "x-ms-webview"): MSHTMLWebViewElement;
-    createElement(tagName: "xmp"): HTMLPreElement;
+    createElement<K extends keyof HTMLElementTagNameMap>(tagName: K): HTMLElementTagNameMap[K];
     createElement(tagName: string): HTMLElement;
     createElementNS(namespaceURI: "http://www.w3.org/1999/xhtml", qualifiedName: string): HTMLElement
     createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "a"): SVGAElement
@@ -2969,7 +2995,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * @param y The y-offset
       */
     elementFromPoint(x: number, y: number): Element;
-    evaluate(expression: string, contextNode: Node, resolver: XPathNSResolver, type: number, result: XPathResult): XPathResult;
+    evaluate(expression: string, contextNode: Node, resolver: XPathNSResolver | 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.
@@ -3003,182 +3029,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * Retrieves a collection of objects based on the specified element name.
       * @param name Specifies the name of an element.
       */
-    getElementsByTagName(tagname: "a"): NodeListOf<HTMLAnchorElement>;
-    getElementsByTagName(tagname: "abbr"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "acronym"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "address"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "applet"): NodeListOf<HTMLAppletElement>;
-    getElementsByTagName(tagname: "area"): NodeListOf<HTMLAreaElement>;
-    getElementsByTagName(tagname: "article"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "aside"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "audio"): NodeListOf<HTMLAudioElement>;
-    getElementsByTagName(tagname: "b"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "base"): NodeListOf<HTMLBaseElement>;
-    getElementsByTagName(tagname: "basefont"): NodeListOf<HTMLBaseFontElement>;
-    getElementsByTagName(tagname: "bdo"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "big"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "blockquote"): NodeListOf<HTMLQuoteElement>;
-    getElementsByTagName(tagname: "body"): NodeListOf<HTMLBodyElement>;
-    getElementsByTagName(tagname: "br"): NodeListOf<HTMLBRElement>;
-    getElementsByTagName(tagname: "button"): NodeListOf<HTMLButtonElement>;
-    getElementsByTagName(tagname: "canvas"): NodeListOf<HTMLCanvasElement>;
-    getElementsByTagName(tagname: "caption"): NodeListOf<HTMLTableCaptionElement>;
-    getElementsByTagName(tagname: "center"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "circle"): NodeListOf<SVGCircleElement>;
-    getElementsByTagName(tagname: "cite"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "clippath"): NodeListOf<SVGClipPathElement>;
-    getElementsByTagName(tagname: "code"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "col"): NodeListOf<HTMLTableColElement>;
-    getElementsByTagName(tagname: "colgroup"): NodeListOf<HTMLTableColElement>;
-    getElementsByTagName(tagname: "datalist"): NodeListOf<HTMLDataListElement>;
-    getElementsByTagName(tagname: "dd"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "defs"): NodeListOf<SVGDefsElement>;
-    getElementsByTagName(tagname: "del"): NodeListOf<HTMLModElement>;
-    getElementsByTagName(tagname: "desc"): NodeListOf<SVGDescElement>;
-    getElementsByTagName(tagname: "dfn"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "dir"): NodeListOf<HTMLDirectoryElement>;
-    getElementsByTagName(tagname: "div"): NodeListOf<HTMLDivElement>;
-    getElementsByTagName(tagname: "dl"): NodeListOf<HTMLDListElement>;
-    getElementsByTagName(tagname: "dt"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "ellipse"): NodeListOf<SVGEllipseElement>;
-    getElementsByTagName(tagname: "em"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "embed"): NodeListOf<HTMLEmbedElement>;
-    getElementsByTagName(tagname: "feblend"): NodeListOf<SVGFEBlendElement>;
-    getElementsByTagName(tagname: "fecolormatrix"): NodeListOf<SVGFEColorMatrixElement>;
-    getElementsByTagName(tagname: "fecomponenttransfer"): NodeListOf<SVGFEComponentTransferElement>;
-    getElementsByTagName(tagname: "fecomposite"): NodeListOf<SVGFECompositeElement>;
-    getElementsByTagName(tagname: "feconvolvematrix"): NodeListOf<SVGFEConvolveMatrixElement>;
-    getElementsByTagName(tagname: "fediffuselighting"): NodeListOf<SVGFEDiffuseLightingElement>;
-    getElementsByTagName(tagname: "fedisplacementmap"): NodeListOf<SVGFEDisplacementMapElement>;
-    getElementsByTagName(tagname: "fedistantlight"): NodeListOf<SVGFEDistantLightElement>;
-    getElementsByTagName(tagname: "feflood"): NodeListOf<SVGFEFloodElement>;
-    getElementsByTagName(tagname: "fefunca"): NodeListOf<SVGFEFuncAElement>;
-    getElementsByTagName(tagname: "fefuncb"): NodeListOf<SVGFEFuncBElement>;
-    getElementsByTagName(tagname: "fefuncg"): NodeListOf<SVGFEFuncGElement>;
-    getElementsByTagName(tagname: "fefuncr"): NodeListOf<SVGFEFuncRElement>;
-    getElementsByTagName(tagname: "fegaussianblur"): NodeListOf<SVGFEGaussianBlurElement>;
-    getElementsByTagName(tagname: "feimage"): NodeListOf<SVGFEImageElement>;
-    getElementsByTagName(tagname: "femerge"): NodeListOf<SVGFEMergeElement>;
-    getElementsByTagName(tagname: "femergenode"): NodeListOf<SVGFEMergeNodeElement>;
-    getElementsByTagName(tagname: "femorphology"): NodeListOf<SVGFEMorphologyElement>;
-    getElementsByTagName(tagname: "feoffset"): NodeListOf<SVGFEOffsetElement>;
-    getElementsByTagName(tagname: "fepointlight"): NodeListOf<SVGFEPointLightElement>;
-    getElementsByTagName(tagname: "fespecularlighting"): NodeListOf<SVGFESpecularLightingElement>;
-    getElementsByTagName(tagname: "fespotlight"): NodeListOf<SVGFESpotLightElement>;
-    getElementsByTagName(tagname: "fetile"): NodeListOf<SVGFETileElement>;
-    getElementsByTagName(tagname: "feturbulence"): NodeListOf<SVGFETurbulenceElement>;
-    getElementsByTagName(tagname: "fieldset"): NodeListOf<HTMLFieldSetElement>;
-    getElementsByTagName(tagname: "figcaption"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "figure"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "filter"): NodeListOf<SVGFilterElement>;
-    getElementsByTagName(tagname: "font"): NodeListOf<HTMLFontElement>;
-    getElementsByTagName(tagname: "footer"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "foreignobject"): NodeListOf<SVGForeignObjectElement>;
-    getElementsByTagName(tagname: "form"): NodeListOf<HTMLFormElement>;
-    getElementsByTagName(tagname: "frame"): NodeListOf<HTMLFrameElement>;
-    getElementsByTagName(tagname: "frameset"): NodeListOf<HTMLFrameSetElement>;
-    getElementsByTagName(tagname: "g"): NodeListOf<SVGGElement>;
-    getElementsByTagName(tagname: "h1"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(tagname: "h2"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(tagname: "h3"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(tagname: "h4"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(tagname: "h5"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(tagname: "h6"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(tagname: "head"): NodeListOf<HTMLHeadElement>;
-    getElementsByTagName(tagname: "header"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "hgroup"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "hr"): NodeListOf<HTMLHRElement>;
-    getElementsByTagName(tagname: "html"): NodeListOf<HTMLHtmlElement>;
-    getElementsByTagName(tagname: "i"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "iframe"): NodeListOf<HTMLIFrameElement>;
-    getElementsByTagName(tagname: "image"): NodeListOf<SVGImageElement>;
-    getElementsByTagName(tagname: "img"): NodeListOf<HTMLImageElement>;
-    getElementsByTagName(tagname: "input"): NodeListOf<HTMLInputElement>;
-    getElementsByTagName(tagname: "ins"): NodeListOf<HTMLModElement>;
-    getElementsByTagName(tagname: "isindex"): NodeListOf<HTMLUnknownElement>;
-    getElementsByTagName(tagname: "kbd"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "keygen"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "label"): NodeListOf<HTMLLabelElement>;
-    getElementsByTagName(tagname: "legend"): NodeListOf<HTMLLegendElement>;
-    getElementsByTagName(tagname: "li"): NodeListOf<HTMLLIElement>;
-    getElementsByTagName(tagname: "line"): NodeListOf<SVGLineElement>;
-    getElementsByTagName(tagname: "lineargradient"): NodeListOf<SVGLinearGradientElement>;
-    getElementsByTagName(tagname: "link"): NodeListOf<HTMLLinkElement>;
-    getElementsByTagName(tagname: "listing"): NodeListOf<HTMLPreElement>;
-    getElementsByTagName(tagname: "map"): NodeListOf<HTMLMapElement>;
-    getElementsByTagName(tagname: "mark"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "marker"): NodeListOf<SVGMarkerElement>;
-    getElementsByTagName(tagname: "marquee"): NodeListOf<HTMLMarqueeElement>;
-    getElementsByTagName(tagname: "mask"): NodeListOf<SVGMaskElement>;
-    getElementsByTagName(tagname: "menu"): NodeListOf<HTMLMenuElement>;
-    getElementsByTagName(tagname: "meta"): NodeListOf<HTMLMetaElement>;
-    getElementsByTagName(tagname: "metadata"): NodeListOf<SVGMetadataElement>;
-    getElementsByTagName(tagname: "meter"): NodeListOf<HTMLMeterElement>;
-    getElementsByTagName(tagname: "nav"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "nextid"): NodeListOf<HTMLUnknownElement>;
-    getElementsByTagName(tagname: "nobr"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "noframes"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "noscript"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "object"): NodeListOf<HTMLObjectElement>;
-    getElementsByTagName(tagname: "ol"): NodeListOf<HTMLOListElement>;
-    getElementsByTagName(tagname: "optgroup"): NodeListOf<HTMLOptGroupElement>;
-    getElementsByTagName(tagname: "option"): NodeListOf<HTMLOptionElement>;
-    getElementsByTagName(tagname: "p"): NodeListOf<HTMLParagraphElement>;
-    getElementsByTagName(tagname: "param"): NodeListOf<HTMLParamElement>;
-    getElementsByTagName(tagname: "path"): NodeListOf<SVGPathElement>;
-    getElementsByTagName(tagname: "pattern"): NodeListOf<SVGPatternElement>;
-    getElementsByTagName(tagname: "picture"): NodeListOf<HTMLPictureElement>;
-    getElementsByTagName(tagname: "plaintext"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "polygon"): NodeListOf<SVGPolygonElement>;
-    getElementsByTagName(tagname: "polyline"): NodeListOf<SVGPolylineElement>;
-    getElementsByTagName(tagname: "pre"): NodeListOf<HTMLPreElement>;
-    getElementsByTagName(tagname: "progress"): NodeListOf<HTMLProgressElement>;
-    getElementsByTagName(tagname: "q"): NodeListOf<HTMLQuoteElement>;
-    getElementsByTagName(tagname: "radialgradient"): NodeListOf<SVGRadialGradientElement>;
-    getElementsByTagName(tagname: "rect"): NodeListOf<SVGRectElement>;
-    getElementsByTagName(tagname: "rt"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "ruby"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "s"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "samp"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "script"): NodeListOf<HTMLScriptElement>;
-    getElementsByTagName(tagname: "section"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "select"): NodeListOf<HTMLSelectElement>;
-    getElementsByTagName(tagname: "small"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "source"): NodeListOf<HTMLSourceElement>;
-    getElementsByTagName(tagname: "span"): NodeListOf<HTMLSpanElement>;
-    getElementsByTagName(tagname: "stop"): NodeListOf<SVGStopElement>;
-    getElementsByTagName(tagname: "strike"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "strong"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "style"): NodeListOf<HTMLStyleElement>;
-    getElementsByTagName(tagname: "sub"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "sup"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "svg"): NodeListOf<SVGSVGElement>;
-    getElementsByTagName(tagname: "switch"): NodeListOf<SVGSwitchElement>;
-    getElementsByTagName(tagname: "symbol"): NodeListOf<SVGSymbolElement>;
-    getElementsByTagName(tagname: "table"): NodeListOf<HTMLTableElement>;
-    getElementsByTagName(tagname: "tbody"): NodeListOf<HTMLTableSectionElement>;
-    getElementsByTagName(tagname: "td"): NodeListOf<HTMLTableDataCellElement>;
-    getElementsByTagName(tagname: "template"): NodeListOf<HTMLTemplateElement>;
-    getElementsByTagName(tagname: "text"): NodeListOf<SVGTextElement>;
-    getElementsByTagName(tagname: "textpath"): NodeListOf<SVGTextPathElement>;
-    getElementsByTagName(tagname: "textarea"): NodeListOf<HTMLTextAreaElement>;
-    getElementsByTagName(tagname: "tfoot"): NodeListOf<HTMLTableSectionElement>;
-    getElementsByTagName(tagname: "th"): NodeListOf<HTMLTableHeaderCellElement>;
-    getElementsByTagName(tagname: "thead"): NodeListOf<HTMLTableSectionElement>;
-    getElementsByTagName(tagname: "title"): NodeListOf<HTMLTitleElement>;
-    getElementsByTagName(tagname: "tr"): NodeListOf<HTMLTableRowElement>;
-    getElementsByTagName(tagname: "track"): NodeListOf<HTMLTrackElement>;
-    getElementsByTagName(tagname: "tspan"): NodeListOf<SVGTSpanElement>;
-    getElementsByTagName(tagname: "tt"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "u"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "ul"): NodeListOf<HTMLUListElement>;
-    getElementsByTagName(tagname: "use"): NodeListOf<SVGUseElement>;
-    getElementsByTagName(tagname: "var"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "video"): NodeListOf<HTMLVideoElement>;
-    getElementsByTagName(tagname: "view"): NodeListOf<SVGViewElement>;
-    getElementsByTagName(tagname: "wbr"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "x-ms-webview"): NodeListOf<MSHTMLWebViewElement>;
-    getElementsByTagName(tagname: "xmp"): NodeListOf<HTMLPreElement>;
+    getElementsByTagName<K extends keyof ElementListTagNameMap>(tagname: K): ElementListTagNameMap[K];
     getElementsByTagName(tagname: string): NodeListOf<Element>;
     getElementsByTagNameNS(namespaceURI: "http://www.w3.org/1999/xhtml", localName: string): HTMLCollectionOf<HTMLElement>;
     getElementsByTagNameNS(namespaceURI: "http://www.w3.org/2000/svg", localName: string): HTMLCollectionOf<SVGElement>;
@@ -3249,103 +3100,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * @param content The text and HTML tags to write.
       */
     writeln(...content: string[]): void;
-    addEventListener(type: "MSContentZoom", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureChange", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSManipulationStateChanged", listener: (this: this, ev: MSManipulationEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "abort", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "activate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforedeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplay", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplaythrough", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "contextmenu", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "deactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drag", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragend", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragenter", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragleave", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragover", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragstart", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drop", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "durationchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "emptied", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (this: this, ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "fullscreenchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "fullscreenerror", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "input", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "invalid", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "keydown", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keypress", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keyup", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadeddata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadedmetadata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mssitemodejumplistitemremoved", listener: (this: this, ev: MSSiteModeEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "msthumbnailclick", listener: (this: this, ev: MSSiteModeEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pause", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "play", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "playing", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerlockchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerlockerror", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ratechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "readystatechange", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "reset", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "scroll", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeked", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeking", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "select", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "selectionchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "selectstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "stalled", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "stop", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "submit", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "suspend", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeupdate", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "volumechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "waiting", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof DocumentEventMap>(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -3355,7 +3110,6 @@ declare var Document: {
 }
 
 interface DocumentFragment extends Node, NodeSelector, ParentNode {
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var DocumentFragment: {
@@ -3370,7 +3124,6 @@ interface DocumentType extends Node, ChildNode {
     readonly notations: NamedNodeMap;
     readonly publicId: string | null;
     readonly systemId: string | null;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var DocumentType: {
@@ -3423,6 +3176,36 @@ declare var EXT_texture_filter_anisotropic: {
     readonly TEXTURE_MAX_ANISOTROPY_EXT: number;
 }
 
+interface ElementEventMap extends GlobalEventHandlersEventMap {
+    "ariarequest": AriaRequestEvent;
+    "command": CommandEvent;
+    "gotpointercapture": PointerEvent;
+    "lostpointercapture": PointerEvent;
+    "MSGestureChange": MSGestureEvent;
+    "MSGestureDoubleTap": MSGestureEvent;
+    "MSGestureEnd": MSGestureEvent;
+    "MSGestureHold": MSGestureEvent;
+    "MSGestureStart": MSGestureEvent;
+    "MSGestureTap": MSGestureEvent;
+    "MSGotPointerCapture": MSPointerEvent;
+    "MSInertiaStart": MSGestureEvent;
+    "MSLostPointerCapture": MSPointerEvent;
+    "MSPointerCancel": MSPointerEvent;
+    "MSPointerDown": MSPointerEvent;
+    "MSPointerEnter": MSPointerEvent;
+    "MSPointerLeave": MSPointerEvent;
+    "MSPointerMove": MSPointerEvent;
+    "MSPointerOut": MSPointerEvent;
+    "MSPointerOver": MSPointerEvent;
+    "MSPointerUp": MSPointerEvent;
+    "touchcancel": TouchEvent;
+    "touchend": TouchEvent;
+    "touchmove": TouchEvent;
+    "touchstart": TouchEvent;
+    "webkitfullscreenchange": Event;
+    "webkitfullscreenerror": Event;
+}
+
 interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelector, ChildNode, ParentNode {
     readonly classList: DOMTokenList;
     className: string;
@@ -3433,33 +3216,33 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     id: string;
     msContentZoomFactor: number;
     readonly msRegionOverflow: string;
-    onariarequest: (this: this, ev: AriaRequestEvent) => any;
-    oncommand: (this: this, ev: CommandEvent) => any;
-    ongotpointercapture: (this: this, ev: PointerEvent) => any;
-    onlostpointercapture: (this: this, ev: PointerEvent) => any;
-    onmsgesturechange: (this: this, ev: MSGestureEvent) => any;
-    onmsgesturedoubletap: (this: this, ev: MSGestureEvent) => any;
-    onmsgestureend: (this: this, ev: MSGestureEvent) => any;
-    onmsgesturehold: (this: this, ev: MSGestureEvent) => any;
-    onmsgesturestart: (this: this, ev: MSGestureEvent) => any;
-    onmsgesturetap: (this: this, ev: MSGestureEvent) => any;
-    onmsgotpointercapture: (this: this, ev: MSPointerEvent) => any;
-    onmsinertiastart: (this: this, ev: MSGestureEvent) => any;
-    onmslostpointercapture: (this: this, ev: MSPointerEvent) => any;
-    onmspointercancel: (this: this, ev: MSPointerEvent) => any;
-    onmspointerdown: (this: this, ev: MSPointerEvent) => any;
-    onmspointerenter: (this: this, ev: MSPointerEvent) => any;
-    onmspointerleave: (this: this, ev: MSPointerEvent) => any;
-    onmspointermove: (this: this, ev: MSPointerEvent) => any;
-    onmspointerout: (this: this, ev: MSPointerEvent) => any;
-    onmspointerover: (this: this, ev: MSPointerEvent) => any;
-    onmspointerup: (this: this, ev: MSPointerEvent) => any;
+    onariarequest: (this: Element, ev: AriaRequestEvent) => any;
+    oncommand: (this: Element, ev: CommandEvent) => any;
+    ongotpointercapture: (this: Element, ev: PointerEvent) => any;
+    onlostpointercapture: (this: Element, ev: PointerEvent) => any;
+    onmsgesturechange: (this: Element, ev: MSGestureEvent) => any;
+    onmsgesturedoubletap: (this: Element, ev: MSGestureEvent) => any;
+    onmsgestureend: (this: Element, ev: MSGestureEvent) => any;
+    onmsgesturehold: (this: Element, ev: MSGestureEvent) => any;
+    onmsgesturestart: (this: Element, ev: MSGestureEvent) => any;
+    onmsgesturetap: (this: Element, ev: MSGestureEvent) => any;
+    onmsgotpointercapture: (this: Element, ev: MSPointerEvent) => any;
+    onmsinertiastart: (this: Element, ev: MSGestureEvent) => any;
+    onmslostpointercapture: (this: Element, ev: MSPointerEvent) => any;
+    onmspointercancel: (this: Element, ev: MSPointerEvent) => any;
+    onmspointerdown: (this: Element, ev: MSPointerEvent) => any;
+    onmspointerenter: (this: Element, ev: MSPointerEvent) => any;
+    onmspointerleave: (this: Element, ev: MSPointerEvent) => any;
+    onmspointermove: (this: Element, ev: MSPointerEvent) => any;
+    onmspointerout: (this: Element, ev: MSPointerEvent) => any;
+    onmspointerover: (this: Element, ev: MSPointerEvent) => any;
+    onmspointerup: (this: Element, ev: MSPointerEvent) => any;
     ontouchcancel: (ev: TouchEvent) => any;
     ontouchend: (ev: TouchEvent) => any;
     ontouchmove: (ev: TouchEvent) => any;
     ontouchstart: (ev: TouchEvent) => any;
-    onwebkitfullscreenchange: (this: this, ev: Event) => any;
-    onwebkitfullscreenerror: (this: this, ev: Event) => any;
+    onwebkitfullscreenchange: (this: Element, ev: Event) => any;
+    onwebkitfullscreenerror: (this: Element, ev: Event) => any;
     readonly prefix: string | null;
     readonly scrollHeight: number;
     scrollLeft: number;
@@ -3467,188 +3250,16 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     readonly scrollWidth: number;
     readonly tagName: string;
     innerHTML: string;
+    readonly assignedSlot: HTMLSlotElement | null;
+    slot: string;
+    readonly shadowRoot: ShadowRoot | null;
     getAttribute(name: string): string | null;
     getAttributeNS(namespaceURI: string, localName: string): string;
     getAttributeNode(name: string): Attr;
     getAttributeNodeNS(namespaceURI: string, localName: string): Attr;
     getBoundingClientRect(): ClientRect;
     getClientRects(): ClientRectList;
-    getElementsByTagName(name: "a"): NodeListOf<HTMLAnchorElement>;
-    getElementsByTagName(name: "abbr"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "acronym"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "address"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "applet"): NodeListOf<HTMLAppletElement>;
-    getElementsByTagName(name: "area"): NodeListOf<HTMLAreaElement>;
-    getElementsByTagName(name: "article"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "aside"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "audio"): NodeListOf<HTMLAudioElement>;
-    getElementsByTagName(name: "b"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "base"): NodeListOf<HTMLBaseElement>;
-    getElementsByTagName(name: "basefont"): NodeListOf<HTMLBaseFontElement>;
-    getElementsByTagName(name: "bdo"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "big"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "blockquote"): NodeListOf<HTMLQuoteElement>;
-    getElementsByTagName(name: "body"): NodeListOf<HTMLBodyElement>;
-    getElementsByTagName(name: "br"): NodeListOf<HTMLBRElement>;
-    getElementsByTagName(name: "button"): NodeListOf<HTMLButtonElement>;
-    getElementsByTagName(name: "canvas"): NodeListOf<HTMLCanvasElement>;
-    getElementsByTagName(name: "caption"): NodeListOf<HTMLTableCaptionElement>;
-    getElementsByTagName(name: "center"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "circle"): NodeListOf<SVGCircleElement>;
-    getElementsByTagName(name: "cite"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "clippath"): NodeListOf<SVGClipPathElement>;
-    getElementsByTagName(name: "code"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "col"): NodeListOf<HTMLTableColElement>;
-    getElementsByTagName(name: "colgroup"): NodeListOf<HTMLTableColElement>;
-    getElementsByTagName(name: "datalist"): NodeListOf<HTMLDataListElement>;
-    getElementsByTagName(name: "dd"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "defs"): NodeListOf<SVGDefsElement>;
-    getElementsByTagName(name: "del"): NodeListOf<HTMLModElement>;
-    getElementsByTagName(name: "desc"): NodeListOf<SVGDescElement>;
-    getElementsByTagName(name: "dfn"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "dir"): NodeListOf<HTMLDirectoryElement>;
-    getElementsByTagName(name: "div"): NodeListOf<HTMLDivElement>;
-    getElementsByTagName(name: "dl"): NodeListOf<HTMLDListElement>;
-    getElementsByTagName(name: "dt"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "ellipse"): NodeListOf<SVGEllipseElement>;
-    getElementsByTagName(name: "em"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "embed"): NodeListOf<HTMLEmbedElement>;
-    getElementsByTagName(name: "feblend"): NodeListOf<SVGFEBlendElement>;
-    getElementsByTagName(name: "fecolormatrix"): NodeListOf<SVGFEColorMatrixElement>;
-    getElementsByTagName(name: "fecomponenttransfer"): NodeListOf<SVGFEComponentTransferElement>;
-    getElementsByTagName(name: "fecomposite"): NodeListOf<SVGFECompositeElement>;
-    getElementsByTagName(name: "feconvolvematrix"): NodeListOf<SVGFEConvolveMatrixElement>;
-    getElementsByTagName(name: "fediffuselighting"): NodeListOf<SVGFEDiffuseLightingElement>;
-    getElementsByTagName(name: "fedisplacementmap"): NodeListOf<SVGFEDisplacementMapElement>;
-    getElementsByTagName(name: "fedistantlight"): NodeListOf<SVGFEDistantLightElement>;
-    getElementsByTagName(name: "feflood"): NodeListOf<SVGFEFloodElement>;
-    getElementsByTagName(name: "fefunca"): NodeListOf<SVGFEFuncAElement>;
-    getElementsByTagName(name: "fefuncb"): NodeListOf<SVGFEFuncBElement>;
-    getElementsByTagName(name: "fefuncg"): NodeListOf<SVGFEFuncGElement>;
-    getElementsByTagName(name: "fefuncr"): NodeListOf<SVGFEFuncRElement>;
-    getElementsByTagName(name: "fegaussianblur"): NodeListOf<SVGFEGaussianBlurElement>;
-    getElementsByTagName(name: "feimage"): NodeListOf<SVGFEImageElement>;
-    getElementsByTagName(name: "femerge"): NodeListOf<SVGFEMergeElement>;
-    getElementsByTagName(name: "femergenode"): NodeListOf<SVGFEMergeNodeElement>;
-    getElementsByTagName(name: "femorphology"): NodeListOf<SVGFEMorphologyElement>;
-    getElementsByTagName(name: "feoffset"): NodeListOf<SVGFEOffsetElement>;
-    getElementsByTagName(name: "fepointlight"): NodeListOf<SVGFEPointLightElement>;
-    getElementsByTagName(name: "fespecularlighting"): NodeListOf<SVGFESpecularLightingElement>;
-    getElementsByTagName(name: "fespotlight"): NodeListOf<SVGFESpotLightElement>;
-    getElementsByTagName(name: "fetile"): NodeListOf<SVGFETileElement>;
-    getElementsByTagName(name: "feturbulence"): NodeListOf<SVGFETurbulenceElement>;
-    getElementsByTagName(name: "fieldset"): NodeListOf<HTMLFieldSetElement>;
-    getElementsByTagName(name: "figcaption"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "figure"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "filter"): NodeListOf<SVGFilterElement>;
-    getElementsByTagName(name: "font"): NodeListOf<HTMLFontElement>;
-    getElementsByTagName(name: "footer"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "foreignobject"): NodeListOf<SVGForeignObjectElement>;
-    getElementsByTagName(name: "form"): NodeListOf<HTMLFormElement>;
-    getElementsByTagName(name: "frame"): NodeListOf<HTMLFrameElement>;
-    getElementsByTagName(name: "frameset"): NodeListOf<HTMLFrameSetElement>;
-    getElementsByTagName(name: "g"): NodeListOf<SVGGElement>;
-    getElementsByTagName(name: "h1"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(name: "h2"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(name: "h3"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(name: "h4"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(name: "h5"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(name: "h6"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(name: "head"): NodeListOf<HTMLHeadElement>;
-    getElementsByTagName(name: "header"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "hgroup"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "hr"): NodeListOf<HTMLHRElement>;
-    getElementsByTagName(name: "html"): NodeListOf<HTMLHtmlElement>;
-    getElementsByTagName(name: "i"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "iframe"): NodeListOf<HTMLIFrameElement>;
-    getElementsByTagName(name: "image"): NodeListOf<SVGImageElement>;
-    getElementsByTagName(name: "img"): NodeListOf<HTMLImageElement>;
-    getElementsByTagName(name: "input"): NodeListOf<HTMLInputElement>;
-    getElementsByTagName(name: "ins"): NodeListOf<HTMLModElement>;
-    getElementsByTagName(name: "isindex"): NodeListOf<HTMLUnknownElement>;
-    getElementsByTagName(name: "kbd"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "keygen"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "label"): NodeListOf<HTMLLabelElement>;
-    getElementsByTagName(name: "legend"): NodeListOf<HTMLLegendElement>;
-    getElementsByTagName(name: "li"): NodeListOf<HTMLLIElement>;
-    getElementsByTagName(name: "line"): NodeListOf<SVGLineElement>;
-    getElementsByTagName(name: "lineargradient"): NodeListOf<SVGLinearGradientElement>;
-    getElementsByTagName(name: "link"): NodeListOf<HTMLLinkElement>;
-    getElementsByTagName(name: "listing"): NodeListOf<HTMLPreElement>;
-    getElementsByTagName(name: "map"): NodeListOf<HTMLMapElement>;
-    getElementsByTagName(name: "mark"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "marker"): NodeListOf<SVGMarkerElement>;
-    getElementsByTagName(name: "marquee"): NodeListOf<HTMLMarqueeElement>;
-    getElementsByTagName(name: "mask"): NodeListOf<SVGMaskElement>;
-    getElementsByTagName(name: "menu"): NodeListOf<HTMLMenuElement>;
-    getElementsByTagName(name: "meta"): NodeListOf<HTMLMetaElement>;
-    getElementsByTagName(name: "metadata"): NodeListOf<SVGMetadataElement>;
-    getElementsByTagName(name: "meter"): NodeListOf<HTMLMeterElement>;
-    getElementsByTagName(name: "nav"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "nextid"): NodeListOf<HTMLUnknownElement>;
-    getElementsByTagName(name: "nobr"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "noframes"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "noscript"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "object"): NodeListOf<HTMLObjectElement>;
-    getElementsByTagName(name: "ol"): NodeListOf<HTMLOListElement>;
-    getElementsByTagName(name: "optgroup"): NodeListOf<HTMLOptGroupElement>;
-    getElementsByTagName(name: "option"): NodeListOf<HTMLOptionElement>;
-    getElementsByTagName(name: "p"): NodeListOf<HTMLParagraphElement>;
-    getElementsByTagName(name: "param"): NodeListOf<HTMLParamElement>;
-    getElementsByTagName(name: "path"): NodeListOf<SVGPathElement>;
-    getElementsByTagName(name: "pattern"): NodeListOf<SVGPatternElement>;
-    getElementsByTagName(name: "picture"): NodeListOf<HTMLPictureElement>;
-    getElementsByTagName(name: "plaintext"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "polygon"): NodeListOf<SVGPolygonElement>;
-    getElementsByTagName(name: "polyline"): NodeListOf<SVGPolylineElement>;
-    getElementsByTagName(name: "pre"): NodeListOf<HTMLPreElement>;
-    getElementsByTagName(name: "progress"): NodeListOf<HTMLProgressElement>;
-    getElementsByTagName(name: "q"): NodeListOf<HTMLQuoteElement>;
-    getElementsByTagName(name: "radialgradient"): NodeListOf<SVGRadialGradientElement>;
-    getElementsByTagName(name: "rect"): NodeListOf<SVGRectElement>;
-    getElementsByTagName(name: "rt"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "ruby"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "s"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "samp"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "script"): NodeListOf<HTMLScriptElement>;
-    getElementsByTagName(name: "section"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "select"): NodeListOf<HTMLSelectElement>;
-    getElementsByTagName(name: "small"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "source"): NodeListOf<HTMLSourceElement>;
-    getElementsByTagName(name: "span"): NodeListOf<HTMLSpanElement>;
-    getElementsByTagName(name: "stop"): NodeListOf<SVGStopElement>;
-    getElementsByTagName(name: "strike"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "strong"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "style"): NodeListOf<HTMLStyleElement>;
-    getElementsByTagName(name: "sub"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "sup"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "svg"): NodeListOf<SVGSVGElement>;
-    getElementsByTagName(name: "switch"): NodeListOf<SVGSwitchElement>;
-    getElementsByTagName(name: "symbol"): NodeListOf<SVGSymbolElement>;
-    getElementsByTagName(name: "table"): NodeListOf<HTMLTableElement>;
-    getElementsByTagName(name: "tbody"): NodeListOf<HTMLTableSectionElement>;
-    getElementsByTagName(name: "td"): NodeListOf<HTMLTableDataCellElement>;
-    getElementsByTagName(name: "template"): NodeListOf<HTMLTemplateElement>;
-    getElementsByTagName(name: "text"): NodeListOf<SVGTextElement>;
-    getElementsByTagName(name: "textpath"): NodeListOf<SVGTextPathElement>;
-    getElementsByTagName(name: "textarea"): NodeListOf<HTMLTextAreaElement>;
-    getElementsByTagName(name: "tfoot"): NodeListOf<HTMLTableSectionElement>;
-    getElementsByTagName(name: "th"): NodeListOf<HTMLTableHeaderCellElement>;
-    getElementsByTagName(name: "thead"): NodeListOf<HTMLTableSectionElement>;
-    getElementsByTagName(name: "title"): NodeListOf<HTMLTitleElement>;
-    getElementsByTagName(name: "tr"): NodeListOf<HTMLTableRowElement>;
-    getElementsByTagName(name: "track"): NodeListOf<HTMLTrackElement>;
-    getElementsByTagName(name: "tspan"): NodeListOf<SVGTSpanElement>;
-    getElementsByTagName(name: "tt"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "u"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "ul"): NodeListOf<HTMLUListElement>;
-    getElementsByTagName(name: "use"): NodeListOf<SVGUseElement>;
-    getElementsByTagName(name: "var"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "video"): NodeListOf<HTMLVideoElement>;
-    getElementsByTagName(name: "view"): NodeListOf<SVGViewElement>;
-    getElementsByTagName(name: "wbr"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "x-ms-webview"): NodeListOf<MSHTMLWebViewElement>;
-    getElementsByTagName(name: "xmp"): NodeListOf<HTMLPreElement>;
+    getElementsByTagName<K extends keyof ElementListTagNameMap>(name: K): ElementListTagNameMap[K];
     getElementsByTagName(name: string): NodeListOf<Element>;
     getElementsByTagNameNS(namespaceURI: "http://www.w3.org/1999/xhtml", localName: string): HTMLCollectionOf<HTMLElement>;
     getElementsByTagNameNS(namespaceURI: "http://www.w3.org/2000/svg", localName: string): HTMLCollectionOf<SVGElement>;
@@ -3688,42 +3299,8 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     insertAdjacentElement(position: string, insertedElement: Element): Element | null;
     insertAdjacentHTML(where: string, html: string): void;
     insertAdjacentText(where: string, text: string): void;
-    addEventListener(type: "MSGestureChange", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGotPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSLostPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ariarequest", listener: (this: this, ev: AriaRequestEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "command", listener: (this: this, ev: CommandEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "gotpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "lostpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
+    attachShadow(shadowRootInitDict: ShadowRootInit): ShadowRoot;
+    addEventListener<K extends keyof ElementEventMap>(type: K, listener: (this: Element, ev: ElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -3759,10 +3336,12 @@ interface Event {
     readonly target: EventTarget;
     readonly timeStamp: number;
     readonly type: string;
+    readonly scoped: boolean;
     initEvent(eventTypeArg: string, canBubbleArg: boolean, cancelableArg: boolean): void;
     preventDefault(): void;
     stopImmediatePropagation(): void;
     stopPropagation(): void;
+    deepPath(): EventTarget[];
     readonly AT_TARGET: number;
     readonly BUBBLING_PHASE: number;
     readonly CAPTURING_PHASE: number;
@@ -3823,6 +3402,7 @@ interface FileReader extends EventTarget, MSBaseReader {
     readAsBinaryString(blob: Blob): void;
     readAsDataURL(blob: Blob): void;
     readAsText(blob: Blob, encoding?: string): void;
+    addEventListener<K extends keyof MSBaseReaderEventMap>(type: K, listener: (this: MSBaseReader, ev: MSBaseReaderEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -3993,6 +3573,8 @@ interface HTMLAnchorElement extends HTMLElement {
       * Returns a string representation of an object.
       */
     toString(): string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLAnchorElement: {
@@ -4065,6 +3647,8 @@ interface HTMLAppletElement extends HTMLElement {
     useMap: string;
     vspace: number;
     width: number;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLAppletElement: {
@@ -4131,6 +3715,8 @@ interface HTMLAreaElement extends HTMLElement {
       * Returns a string representation of an object.
       */
     toString(): string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLAreaElement: {
@@ -4155,6 +3741,8 @@ declare var HTMLAreasCollection: {
 }
 
 interface HTMLAudioElement extends HTMLMediaElement {
+    addEventListener<K extends keyof HTMLMediaElementEventMap>(type: K, listener: (this: HTMLMediaElement, ev: HTMLMediaElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLAudioElement: {
@@ -4167,6 +3755,8 @@ 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.
       */
     clear: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLBRElement: {
@@ -4183,6 +3773,8 @@ interface HTMLBaseElement extends HTMLElement {
       * Sets or retrieves the window or frame at which to target content.
       */
     target: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLBaseElement: {
@@ -4199,6 +3791,7 @@ interface HTMLBaseFontElement extends HTMLElement, DOML2DeprecatedColorProperty
       * Sets or retrieves the font size of the object.
       */
     size: number;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -4207,6 +3800,27 @@ declare var HTMLBaseFontElement: {
     new(): HTMLBaseFontElement;
 }
 
+interface HTMLBodyElementEventMap extends HTMLElementEventMap {
+    "afterprint": Event;
+    "beforeprint": Event;
+    "beforeunload": BeforeUnloadEvent;
+    "blur": FocusEvent;
+    "error": ErrorEvent;
+    "focus": FocusEvent;
+    "hashchange": HashChangeEvent;
+    "load": Event;
+    "message": MessageEvent;
+    "offline": Event;
+    "online": Event;
+    "orientationchange": Event;
+    "pagehide": PageTransitionEvent;
+    "pageshow": PageTransitionEvent;
+    "popstate": PopStateEvent;
+    "resize": UIEvent;
+    "storage": StorageEvent;
+    "unload": Event;
+}
+
 interface HTMLBodyElement extends HTMLElement {
     aLink: any;
     background: string;
@@ -4214,147 +3828,27 @@ interface HTMLBodyElement extends HTMLElement {
     bgProperties: string;
     link: any;
     noWrap: boolean;
-    onafterprint: (this: this, ev: Event) => any;
-    onbeforeprint: (this: this, ev: Event) => any;
-    onbeforeunload: (this: this, ev: BeforeUnloadEvent) => any;
-    onblur: (this: this, ev: FocusEvent) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
-    onfocus: (this: this, ev: FocusEvent) => any;
-    onhashchange: (this: this, ev: HashChangeEvent) => any;
-    onload: (this: this, ev: Event) => any;
-    onmessage: (this: this, ev: MessageEvent) => any;
-    onoffline: (this: this, ev: Event) => any;
-    ononline: (this: this, ev: Event) => any;
-    onorientationchange: (this: this, ev: Event) => any;
-    onpagehide: (this: this, ev: PageTransitionEvent) => any;
-    onpageshow: (this: this, ev: PageTransitionEvent) => any;
-    onpopstate: (this: this, ev: PopStateEvent) => any;
-    onresize: (this: this, ev: UIEvent) => any;
-    onstorage: (this: this, ev: StorageEvent) => any;
-    onunload: (this: this, ev: Event) => any;
+    onafterprint: (this: HTMLBodyElement, ev: Event) => any;
+    onbeforeprint: (this: HTMLBodyElement, ev: Event) => any;
+    onbeforeunload: (this: HTMLBodyElement, ev: BeforeUnloadEvent) => any;
+    onblur: (this: HTMLBodyElement, ev: FocusEvent) => any;
+    onerror: (this: HTMLBodyElement, ev: ErrorEvent) => any;
+    onfocus: (this: HTMLBodyElement, ev: FocusEvent) => any;
+    onhashchange: (this: HTMLBodyElement, ev: HashChangeEvent) => any;
+    onload: (this: HTMLBodyElement, ev: Event) => any;
+    onmessage: (this: HTMLBodyElement, ev: MessageEvent) => any;
+    onoffline: (this: HTMLBodyElement, ev: Event) => any;
+    ononline: (this: HTMLBodyElement, ev: Event) => any;
+    onorientationchange: (this: HTMLBodyElement, ev: Event) => any;
+    onpagehide: (this: HTMLBodyElement, ev: PageTransitionEvent) => any;
+    onpageshow: (this: HTMLBodyElement, ev: PageTransitionEvent) => any;
+    onpopstate: (this: HTMLBodyElement, ev: PopStateEvent) => any;
+    onresize: (this: HTMLBodyElement, ev: UIEvent) => any;
+    onstorage: (this: HTMLBodyElement, ev: StorageEvent) => any;
+    onunload: (this: HTMLBodyElement, ev: Event) => any;
     text: any;
     vLink: any;
-    addEventListener(type: "MSContentZoom", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureChange", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGotPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSLostPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSManipulationStateChanged", listener: (this: this, ev: MSManipulationEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "abort", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "activate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "afterprint", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ariarequest", listener: (this: this, ev: AriaRequestEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforedeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeprint", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeunload", listener: (this: this, ev: BeforeUnloadEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplay", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplaythrough", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "command", listener: (this: this, ev: CommandEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "contextmenu", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "cuechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "deactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drag", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragend", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragenter", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragleave", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragover", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragstart", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drop", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "durationchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "emptied", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (this: this, ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "gotpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "hashchange", listener: (this: this, ev: HashChangeEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "input", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "invalid", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "keydown", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keypress", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keyup", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadeddata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadedmetadata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "lostpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "message", listener: (this: this, ev: MessageEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseenter", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseleave", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "offline", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "online", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "orientationchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pagehide", listener: (this: this, ev: PageTransitionEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pageshow", listener: (this: this, ev: PageTransitionEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pause", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "play", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "playing", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "popstate", listener: (this: this, ev: PopStateEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ratechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "reset", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "resize", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "scroll", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeked", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeking", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "select", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "selectstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "stalled", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "storage", listener: (this: this, ev: StorageEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "submit", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "suspend", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeupdate", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "unload", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "volumechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "waiting", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLBodyElementEventMap>(type: K, listener: (this: HTMLBodyElement, ev: HTMLBodyElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -4427,6 +3921,8 @@ interface HTMLButtonElement extends HTMLElement {
       * @param error Sets a custom error message that is displayed when a form is submitted.
       */
     setCustomValidity(error: string): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLButtonElement: {
@@ -4460,6 +3956,8 @@ interface HTMLCanvasElement extends HTMLElement {
       */
     toDataURL(type?: string, ...args: any[]): string;
     toBlob(callback: (result: Blob | null) => void, type?: string, ...arguments: any[]): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLCanvasElement: {
@@ -4490,6 +3988,8 @@ declare var HTMLCollection: {
 
 interface HTMLDListElement extends HTMLElement {
     compact: boolean;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLDListElement: {
@@ -4499,6 +3999,8 @@ declare var HTMLDListElement: {
 
 interface HTMLDataListElement extends HTMLElement {
     options: HTMLCollectionOf<HTMLOptionElement>;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLDataListElement: {
@@ -4508,6 +4010,8 @@ declare var HTMLDataListElement: {
 
 interface HTMLDirectoryElement extends HTMLElement {
     compact: boolean;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLDirectoryElement: {
@@ -4524,6 +4028,8 @@ interface HTMLDivElement extends HTMLElement {
       * Sets or retrieves whether the browser automatically performs wordwrap.
       */
     noWrap: boolean;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLDivElement: {
@@ -4532,6 +4038,8 @@ declare var HTMLDivElement: {
 }
 
 interface HTMLDocument extends Document {
+    addEventListener<K extends keyof DocumentEventMap>(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLDocument: {
@@ -4539,6 +4047,76 @@ declare var HTMLDocument: {
     new(): HTMLDocument;
 }
 
+interface HTMLElementEventMap extends ElementEventMap {
+    "abort": UIEvent;
+    "activate": UIEvent;
+    "beforeactivate": UIEvent;
+    "beforecopy": ClipboardEvent;
+    "beforecut": ClipboardEvent;
+    "beforedeactivate": UIEvent;
+    "beforepaste": ClipboardEvent;
+    "blur": FocusEvent;
+    "canplay": Event;
+    "canplaythrough": Event;
+    "change": Event;
+    "click": MouseEvent;
+    "contextmenu": PointerEvent;
+    "copy": ClipboardEvent;
+    "cuechange": Event;
+    "cut": ClipboardEvent;
+    "dblclick": MouseEvent;
+    "deactivate": UIEvent;
+    "drag": DragEvent;
+    "dragend": DragEvent;
+    "dragenter": DragEvent;
+    "dragleave": DragEvent;
+    "dragover": DragEvent;
+    "dragstart": DragEvent;
+    "drop": DragEvent;
+    "durationchange": Event;
+    "emptied": Event;
+    "ended": MediaStreamErrorEvent;
+    "error": ErrorEvent;
+    "focus": FocusEvent;
+    "input": Event;
+    "invalid": Event;
+    "keydown": KeyboardEvent;
+    "keypress": KeyboardEvent;
+    "keyup": KeyboardEvent;
+    "load": Event;
+    "loadeddata": Event;
+    "loadedmetadata": Event;
+    "loadstart": Event;
+    "mousedown": MouseEvent;
+    "mouseenter": MouseEvent;
+    "mouseleave": MouseEvent;
+    "mousemove": MouseEvent;
+    "mouseout": MouseEvent;
+    "mouseover": MouseEvent;
+    "mouseup": MouseEvent;
+    "mousewheel": WheelEvent;
+    "MSContentZoom": UIEvent;
+    "MSManipulationStateChanged": MSManipulationEvent;
+    "paste": ClipboardEvent;
+    "pause": Event;
+    "play": Event;
+    "playing": Event;
+    "progress": ProgressEvent;
+    "ratechange": Event;
+    "reset": Event;
+    "scroll": UIEvent;
+    "seeked": Event;
+    "seeking": Event;
+    "select": UIEvent;
+    "selectstart": Event;
+    "stalled": Event;
+    "submit": Event;
+    "suspend": Event;
+    "timeupdate": Event;
+    "volumechange": Event;
+    "waiting": Event;
+}
+
 interface HTMLElement extends Element {
     accessKey: string;
     readonly children: HTMLCollection;
@@ -4557,73 +4135,73 @@ interface HTMLElement extends Element {
     readonly offsetParent: Element;
     readonly offsetTop: number;
     readonly offsetWidth: number;
-    onabort: (this: this, ev: UIEvent) => any;
-    onactivate: (this: this, ev: UIEvent) => any;
-    onbeforeactivate: (this: this, ev: UIEvent) => any;
-    onbeforecopy: (this: this, ev: ClipboardEvent) => any;
-    onbeforecut: (this: this, ev: ClipboardEvent) => any;
-    onbeforedeactivate: (this: this, ev: UIEvent) => any;
-    onbeforepaste: (this: this, ev: ClipboardEvent) => any;
-    onblur: (this: this, ev: FocusEvent) => any;
-    oncanplay: (this: this, ev: Event) => any;
-    oncanplaythrough: (this: this, ev: Event) => any;
-    onchange: (this: this, ev: Event) => any;
-    onclick: (this: this, ev: MouseEvent) => any;
-    oncontextmenu: (this: this, ev: PointerEvent) => any;
-    oncopy: (this: this, ev: ClipboardEvent) => any;
-    oncuechange: (this: this, ev: Event) => any;
-    oncut: (this: this, ev: ClipboardEvent) => any;
-    ondblclick: (this: this, ev: MouseEvent) => any;
-    ondeactivate: (this: this, ev: UIEvent) => any;
-    ondrag: (this: this, ev: DragEvent) => any;
-    ondragend: (this: this, ev: DragEvent) => any;
-    ondragenter: (this: this, ev: DragEvent) => any;
-    ondragleave: (this: this, ev: DragEvent) => any;
-    ondragover: (this: this, ev: DragEvent) => any;
-    ondragstart: (this: this, ev: DragEvent) => any;
-    ondrop: (this: this, ev: DragEvent) => any;
-    ondurationchange: (this: this, ev: Event) => any;
-    onemptied: (this: this, ev: Event) => any;
-    onended: (this: this, ev: MediaStreamErrorEvent) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
-    onfocus: (this: this, ev: FocusEvent) => any;
-    oninput: (this: this, ev: Event) => any;
-    oninvalid: (this: this, ev: Event) => any;
-    onkeydown: (this: this, ev: KeyboardEvent) => any;
-    onkeypress: (this: this, ev: KeyboardEvent) => any;
-    onkeyup: (this: this, ev: KeyboardEvent) => any;
-    onload: (this: this, ev: Event) => any;
-    onloadeddata: (this: this, ev: Event) => any;
-    onloadedmetadata: (this: this, ev: Event) => any;
-    onloadstart: (this: this, ev: Event) => any;
-    onmousedown: (this: this, ev: MouseEvent) => any;
-    onmouseenter: (this: this, ev: MouseEvent) => any;
-    onmouseleave: (this: this, ev: MouseEvent) => any;
-    onmousemove: (this: this, ev: MouseEvent) => any;
-    onmouseout: (this: this, ev: MouseEvent) => any;
-    onmouseover: (this: this, ev: MouseEvent) => any;
-    onmouseup: (this: this, ev: MouseEvent) => any;
-    onmousewheel: (this: this, ev: WheelEvent) => any;
-    onmscontentzoom: (this: this, ev: UIEvent) => any;
-    onmsmanipulationstatechanged: (this: this, ev: MSManipulationEvent) => any;
-    onpaste: (this: this, ev: ClipboardEvent) => any;
-    onpause: (this: this, ev: Event) => any;
-    onplay: (this: this, ev: Event) => any;
-    onplaying: (this: this, ev: Event) => any;
-    onprogress: (this: this, ev: ProgressEvent) => any;
-    onratechange: (this: this, ev: Event) => any;
-    onreset: (this: this, ev: Event) => any;
-    onscroll: (this: this, ev: UIEvent) => any;
-    onseeked: (this: this, ev: Event) => any;
-    onseeking: (this: this, ev: Event) => any;
-    onselect: (this: this, ev: UIEvent) => any;
-    onselectstart: (this: this, ev: Event) => any;
-    onstalled: (this: this, ev: Event) => any;
-    onsubmit: (this: this, ev: Event) => any;
-    onsuspend: (this: this, ev: Event) => any;
-    ontimeupdate: (this: this, ev: Event) => any;
-    onvolumechange: (this: this, ev: Event) => any;
-    onwaiting: (this: this, ev: Event) => any;
+    onabort: (this: HTMLElement, ev: UIEvent) => any;
+    onactivate: (this: HTMLElement, ev: UIEvent) => any;
+    onbeforeactivate: (this: HTMLElement, ev: UIEvent) => any;
+    onbeforecopy: (this: HTMLElement, ev: ClipboardEvent) => any;
+    onbeforecut: (this: HTMLElement, ev: ClipboardEvent) => any;
+    onbeforedeactivate: (this: HTMLElement, ev: UIEvent) => any;
+    onbeforepaste: (this: HTMLElement, ev: ClipboardEvent) => any;
+    onblur: (this: HTMLElement, ev: FocusEvent) => any;
+    oncanplay: (this: HTMLElement, ev: Event) => any;
+    oncanplaythrough: (this: HTMLElement, ev: Event) => any;
+    onchange: (this: HTMLElement, ev: Event) => any;
+    onclick: (this: HTMLElement, ev: MouseEvent) => any;
+    oncontextmenu: (this: HTMLElement, ev: PointerEvent) => any;
+    oncopy: (this: HTMLElement, ev: ClipboardEvent) => any;
+    oncuechange: (this: HTMLElement, ev: Event) => any;
+    oncut: (this: HTMLElement, ev: ClipboardEvent) => any;
+    ondblclick: (this: HTMLElement, ev: MouseEvent) => any;
+    ondeactivate: (this: HTMLElement, ev: UIEvent) => any;
+    ondrag: (this: HTMLElement, ev: DragEvent) => any;
+    ondragend: (this: HTMLElement, ev: DragEvent) => any;
+    ondragenter: (this: HTMLElement, ev: DragEvent) => any;
+    ondragleave: (this: HTMLElement, ev: DragEvent) => any;
+    ondragover: (this: HTMLElement, ev: DragEvent) => any;
+    ondragstart: (this: HTMLElement, ev: DragEvent) => any;
+    ondrop: (this: HTMLElement, ev: DragEvent) => any;
+    ondurationchange: (this: HTMLElement, ev: Event) => any;
+    onemptied: (this: HTMLElement, ev: Event) => any;
+    onended: (this: HTMLElement, ev: MediaStreamErrorEvent) => any;
+    onerror: (this: HTMLElement, ev: ErrorEvent) => any;
+    onfocus: (this: HTMLElement, ev: FocusEvent) => any;
+    oninput: (this: HTMLElement, ev: Event) => any;
+    oninvalid: (this: HTMLElement, ev: Event) => any;
+    onkeydown: (this: HTMLElement, ev: KeyboardEvent) => any;
+    onkeypress: (this: HTMLElement, ev: KeyboardEvent) => any;
+    onkeyup: (this: HTMLElement, ev: KeyboardEvent) => any;
+    onload: (this: HTMLElement, ev: Event) => any;
+    onloadeddata: (this: HTMLElement, ev: Event) => any;
+    onloadedmetadata: (this: HTMLElement, ev: Event) => any;
+    onloadstart: (this: HTMLElement, ev: Event) => any;
+    onmousedown: (this: HTMLElement, ev: MouseEvent) => any;
+    onmouseenter: (this: HTMLElement, ev: MouseEvent) => any;
+    onmouseleave: (this: HTMLElement, ev: MouseEvent) => any;
+    onmousemove: (this: HTMLElement, ev: MouseEvent) => any;
+    onmouseout: (this: HTMLElement, ev: MouseEvent) => any;
+    onmouseover: (this: HTMLElement, ev: MouseEvent) => any;
+    onmouseup: (this: HTMLElement, ev: MouseEvent) => any;
+    onmousewheel: (this: HTMLElement, ev: WheelEvent) => any;
+    onmscontentzoom: (this: HTMLElement, ev: UIEvent) => any;
+    onmsmanipulationstatechanged: (this: HTMLElement, ev: MSManipulationEvent) => any;
+    onpaste: (this: HTMLElement, ev: ClipboardEvent) => any;
+    onpause: (this: HTMLElement, ev: Event) => any;
+    onplay: (this: HTMLElement, ev: Event) => any;
+    onplaying: (this: HTMLElement, ev: Event) => any;
+    onprogress: (this: HTMLElement, ev: ProgressEvent) => any;
+    onratechange: (this: HTMLElement, ev: Event) => any;
+    onreset: (this: HTMLElement, ev: Event) => any;
+    onscroll: (this: HTMLElement, ev: UIEvent) => any;
+    onseeked: (this: HTMLElement, ev: Event) => any;
+    onseeking: (this: HTMLElement, ev: Event) => any;
+    onselect: (this: HTMLElement, ev: UIEvent) => any;
+    onselectstart: (this: HTMLElement, ev: Event) => any;
+    onstalled: (this: HTMLElement, ev: Event) => any;
+    onsubmit: (this: HTMLElement, ev: Event) => any;
+    onsuspend: (this: HTMLElement, ev: Event) => any;
+    ontimeupdate: (this: HTMLElement, ev: Event) => any;
+    onvolumechange: (this: HTMLElement, ev: Event) => any;
+    onwaiting: (this: HTMLElement, ev: Event) => any;
     outerHTML: string;
     outerText: string;
     spellcheck: boolean;
@@ -4636,109 +4214,7 @@ interface HTMLElement extends Element {
     focus(): void;
     msGetInputContext(): MSInputMethodContext;
     setActive(): void;
-    addEventListener(type: "MSContentZoom", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureChange", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGotPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSLostPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSManipulationStateChanged", listener: (this: this, ev: MSManipulationEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "abort", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "activate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ariarequest", listener: (this: this, ev: AriaRequestEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforedeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplay", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplaythrough", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "command", listener: (this: this, ev: CommandEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "contextmenu", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "cuechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "deactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drag", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragend", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragenter", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragleave", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragover", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragstart", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drop", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "durationchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "emptied", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (this: this, ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "gotpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "input", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "invalid", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "keydown", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keypress", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keyup", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadeddata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadedmetadata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "lostpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseenter", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseleave", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pause", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "play", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "playing", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ratechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "reset", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "scroll", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeked", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeking", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "select", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "selectstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "stalled", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "submit", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "suspend", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeupdate", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "volumechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "waiting", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -4794,6 +4270,7 @@ interface HTMLEmbedElement extends HTMLElement, GetSVGDocument {
       * Sets or retrieves the width of the object.
       */
     width: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -4833,6 +4310,8 @@ interface HTMLFieldSetElement extends HTMLElement {
       * @param error Sets a custom error message that is displayed when a form is submitted.
       */
     setCustomValidity(error: string): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLFieldSetElement: {
@@ -4845,6 +4324,7 @@ interface HTMLFontElement extends HTMLElement, DOML2DeprecatedColorProperty, DOM
       * Sets or retrieves the current typeface family.
       */
     face: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -4920,6 +4400,8 @@ interface HTMLFormElement extends HTMLElement {
       * Fires when a FORM is about to be submitted.
       */
     submit(): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
     [name: string]: any;
 }
 
@@ -4928,6 +4410,10 @@ declare var HTMLFormElement: {
     new(): HTMLFormElement;
 }
 
+interface HTMLFrameElementEventMap extends HTMLElementEventMap {
+    "load": Event;
+}
+
 interface HTMLFrameElement extends HTMLElement, GetSVGDocument {
     /**
       * Specifies the properties of a border drawn around an object.
@@ -4980,7 +4466,7 @@ interface HTMLFrameElement extends HTMLElement, GetSVGDocument {
     /**
       * Raised when the object has been completely received from the server.
       */
-    onload: (this: this, ev: Event) => any;
+    onload: (this: HTMLFrameElement, ev: Event) => any;
     /**
       * Sets or retrieves whether the frame can be scrolled.
       */
@@ -4993,110 +4479,7 @@ interface HTMLFrameElement extends HTMLElement, GetSVGDocument {
       * Sets or retrieves the width of the object.
       */
     width: string | number;
-    addEventListener(type: "MSContentZoom", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureChange", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGotPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSLostPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSManipulationStateChanged", listener: (this: this, ev: MSManipulationEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "abort", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "activate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ariarequest", listener: (this: this, ev: AriaRequestEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforedeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplay", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplaythrough", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "command", listener: (this: this, ev: CommandEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "contextmenu", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "cuechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "deactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drag", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragend", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragenter", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragleave", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragover", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragstart", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drop", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "durationchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "emptied", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (this: this, ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "gotpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "input", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "invalid", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "keydown", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keypress", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keyup", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadeddata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadedmetadata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "lostpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseenter", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseleave", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pause", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "play", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "playing", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ratechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "reset", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "scroll", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeked", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeking", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "select", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "selectstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "stalled", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "submit", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "suspend", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeupdate", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "volumechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "waiting", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLFrameElementEventMap>(type: K, listener: (this: HTMLFrameElement, ev: HTMLFrameElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5105,6 +4488,25 @@ declare var HTMLFrameElement: {
     new(): HTMLFrameElement;
 }
 
+interface HTMLFrameSetElementEventMap extends HTMLElementEventMap {
+    "beforeprint": Event;
+    "beforeunload": BeforeUnloadEvent;
+    "blur": FocusEvent;
+    "error": ErrorEvent;
+    "focus": FocusEvent;
+    "hashchange": HashChangeEvent;
+    "load": Event;
+    "message": MessageEvent;
+    "offline": Event;
+    "online": Event;
+    "orientationchange": Event;
+    "pagehide": PageTransitionEvent;
+    "pageshow": PageTransitionEvent;
+    "resize": UIEvent;
+    "storage": StorageEvent;
+    "unload": Event;
+}
+
 interface HTMLFrameSetElement extends HTMLElement {
     border: string;
     /**
@@ -5124,152 +4526,34 @@ interface HTMLFrameSetElement extends HTMLElement {
       */
     frameSpacing: any;
     name: string;
-    onafterprint: (this: this, ev: Event) => any;
-    onbeforeprint: (this: this, ev: Event) => any;
-    onbeforeunload: (this: this, ev: BeforeUnloadEvent) => any;
+    onafterprint: (this: HTMLFrameSetElement, ev: Event) => any;
+    onbeforeprint: (this: HTMLFrameSetElement, ev: Event) => any;
+    onbeforeunload: (this: HTMLFrameSetElement, ev: BeforeUnloadEvent) => any;
     /**
       * Fires when the object loses the input focus.
       */
-    onblur: (this: this, ev: FocusEvent) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
+    onblur: (this: HTMLFrameSetElement, ev: FocusEvent) => any;
+    onerror: (this: HTMLFrameSetElement, ev: ErrorEvent) => any;
     /**
       * Fires when the object receives focus.
       */
-    onfocus: (this: this, ev: FocusEvent) => any;
-    onhashchange: (this: this, ev: HashChangeEvent) => any;
-    onload: (this: this, ev: Event) => any;
-    onmessage: (this: this, ev: MessageEvent) => any;
-    onoffline: (this: this, ev: Event) => any;
-    ononline: (this: this, ev: Event) => any;
-    onorientationchange: (this: this, ev: Event) => any;
-    onpagehide: (this: this, ev: PageTransitionEvent) => any;
-    onpageshow: (this: this, ev: PageTransitionEvent) => any;
-    onresize: (this: this, ev: UIEvent) => any;
-    onstorage: (this: this, ev: StorageEvent) => any;
-    onunload: (this: this, ev: Event) => any;
+    onfocus: (this: HTMLFrameSetElement, ev: FocusEvent) => any;
+    onhashchange: (this: HTMLFrameSetElement, ev: HashChangeEvent) => any;
+    onload: (this: HTMLFrameSetElement, ev: Event) => any;
+    onmessage: (this: HTMLFrameSetElement, ev: MessageEvent) => any;
+    onoffline: (this: HTMLFrameSetElement, ev: Event) => any;
+    ononline: (this: HTMLFrameSetElement, ev: Event) => any;
+    onorientationchange: (this: HTMLFrameSetElement, ev: Event) => any;
+    onpagehide: (this: HTMLFrameSetElement, ev: PageTransitionEvent) => any;
+    onpageshow: (this: HTMLFrameSetElement, ev: PageTransitionEvent) => any;
+    onresize: (this: HTMLFrameSetElement, ev: UIEvent) => any;
+    onstorage: (this: HTMLFrameSetElement, ev: StorageEvent) => any;
+    onunload: (this: HTMLFrameSetElement, ev: Event) => any;
     /**
       * Sets or retrieves the frame heights of the object.
       */
     rows: string;
-    addEventListener(type: "MSContentZoom", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureChange", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGotPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSLostPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSManipulationStateChanged", listener: (this: this, ev: MSManipulationEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "abort", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "activate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ariarequest", listener: (this: this, ev: AriaRequestEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforedeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeprint", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeunload", listener: (this: this, ev: BeforeUnloadEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplay", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplaythrough", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "command", listener: (this: this, ev: CommandEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "contextmenu", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "cuechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "deactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drag", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragend", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragenter", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragleave", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragover", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragstart", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drop", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "durationchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "emptied", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (this: this, ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "gotpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "hashchange", listener: (this: this, ev: HashChangeEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "input", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "invalid", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "keydown", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keypress", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keyup", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadeddata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadedmetadata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "lostpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "message", listener: (this: this, ev: MessageEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseenter", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseleave", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "offline", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "online", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "orientationchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pagehide", listener: (this: this, ev: PageTransitionEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pageshow", listener: (this: this, ev: PageTransitionEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pause", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "play", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "playing", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ratechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "reset", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "resize", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "scroll", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeked", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeking", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "select", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "selectstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "stalled", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "storage", listener: (this: this, ev: StorageEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "submit", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "suspend", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeupdate", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "unload", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "volumechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "waiting", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLFrameSetElementEventMap>(type: K, listener: (this: HTMLFrameSetElement, ev: HTMLFrameSetElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5291,6 +4575,7 @@ interface HTMLHRElement extends HTMLElement, DOML2DeprecatedColorProperty, DOML2
       * Sets or retrieves the width of the object.
       */
     width: number;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5301,6 +4586,8 @@ declare var HTMLHRElement: {
 
 interface HTMLHeadElement extends HTMLElement {
     profile: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLHeadElement: {
@@ -5313,6 +4600,8 @@ interface HTMLHeadingElement extends HTMLElement {
       * Sets or retrieves a value that indicates the table alignment.
       */
     align: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLHeadingElement: {
@@ -5325,6 +4614,8 @@ interface HTMLHtmlElement extends HTMLElement {
       * Sets or retrieves the DTD version that governs the current document.
       */
     version: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLHtmlElement: {
@@ -5332,6 +4623,10 @@ declare var HTMLHtmlElement: {
     new(): HTMLHtmlElement;
 }
 
+interface HTMLIFrameElementEventMap extends HTMLElementEventMap {
+    "load": Event;
+}
+
 interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
     /**
       * Sets or retrieves how the object is aligned with adjacent text.
@@ -5389,7 +4684,7 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
     /**
       * Raised when the object has been completely received from the server.
       */
-    onload: (this: this, ev: Event) => any;
+    onload: (this: HTMLIFrameElement, ev: Event) => any;
     readonly sandbox: DOMSettableTokenList;
     /**
       * Sets or retrieves whether the frame can be scrolled.
@@ -5407,110 +4702,7 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
       * Sets or retrieves the width of the object.
       */
     width: string;
-    addEventListener(type: "MSContentZoom", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureChange", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGotPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSLostPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSManipulationStateChanged", listener: (this: this, ev: MSManipulationEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "abort", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "activate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ariarequest", listener: (this: this, ev: AriaRequestEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforedeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplay", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplaythrough", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "command", listener: (this: this, ev: CommandEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "contextmenu", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "cuechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "deactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drag", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragend", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragenter", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragleave", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragover", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragstart", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drop", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "durationchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "emptied", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (this: this, ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "gotpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "input", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "invalid", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "keydown", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keypress", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keyup", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadeddata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadedmetadata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "lostpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseenter", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseleave", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pause", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "play", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "playing", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ratechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "reset", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "scroll", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeked", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeking", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "select", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "selectstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "stalled", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "submit", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "suspend", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeupdate", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "volumechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "waiting", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLIFrameElementEventMap>(type: K, listener: (this: HTMLIFrameElement, ev: HTMLIFrameElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5601,6 +4793,8 @@ interface HTMLImageElement extends HTMLElement {
     readonly x: number;
     readonly y: number;
     msGetAsCastingSource(): any;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLImageElement: {
@@ -5812,6 +5006,8 @@ interface HTMLInputElement extends HTMLElement {
       * @param n Value to increment the value by.
       */
     stepUp(n?: number): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLInputElement: {
@@ -5825,6 +5021,8 @@ interface HTMLLIElement extends HTMLElement {
       * Sets or retrieves the value of a list item.
       */
     value: number;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLLIElement: {
@@ -5841,6 +5039,8 @@ interface HTMLLabelElement extends HTMLElement {
       * Sets or retrieves the object to which the given label object is assigned.
       */
     htmlFor: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLLabelElement: {
@@ -5857,6 +5057,8 @@ interface HTMLLegendElement extends HTMLElement {
       * Retrieves a reference to the form that the object is embedded in.
       */
     readonly form: HTMLFormElement;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLLegendElement: {
@@ -5900,6 +5102,7 @@ interface HTMLLinkElement extends HTMLElement, LinkStyle {
     type: string;
     import?: Document;
     integrity: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5917,6 +5120,8 @@ interface HTMLMapElement extends HTMLElement {
       * Sets or retrieves the name of the object.
       */
     name: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLMapElement: {
@@ -5924,6 +5129,12 @@ declare var HTMLMapElement: {
     new(): HTMLMapElement;
 }
 
+interface HTMLMarqueeElementEventMap extends HTMLElementEventMap {
+    "bounce": Event;
+    "finish": Event;
+    "start": Event;
+}
+
 interface HTMLMarqueeElement extends HTMLElement {
     behavior: string;
     bgColor: any;
@@ -5931,9 +5142,9 @@ interface HTMLMarqueeElement extends HTMLElement {
     height: string;
     hspace: number;
     loop: number;
-    onbounce: (this: this, ev: Event) => any;
-    onfinish: (this: this, ev: Event) => any;
-    onstart: (this: this, ev: Event) => any;
+    onbounce: (this: HTMLMarqueeElement, ev: Event) => any;
+    onfinish: (this: HTMLMarqueeElement, ev: Event) => any;
+    onstart: (this: HTMLMarqueeElement, ev: Event) => any;
     scrollAmount: number;
     scrollDelay: number;
     trueSpeed: boolean;
@@ -5941,112 +5152,7 @@ interface HTMLMarqueeElement extends HTMLElement {
     width: string;
     start(): void;
     stop(): void;
-    addEventListener(type: "MSContentZoom", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureChange", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGotPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSLostPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSManipulationStateChanged", listener: (this: this, ev: MSManipulationEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "abort", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "activate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ariarequest", listener: (this: this, ev: AriaRequestEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforedeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "bounce", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplay", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplaythrough", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "command", listener: (this: this, ev: CommandEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "contextmenu", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "cuechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "deactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drag", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragend", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragenter", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragleave", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragover", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragstart", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drop", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "durationchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "emptied", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (this: this, ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "finish", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "gotpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "input", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "invalid", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "keydown", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keypress", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keyup", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadeddata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadedmetadata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "lostpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseenter", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseleave", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pause", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "play", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "playing", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ratechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "reset", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "scroll", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeked", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeking", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "select", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "selectstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "stalled", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "start", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "submit", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "suspend", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeupdate", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "volumechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "waiting", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLMarqueeElementEventMap>(type: K, listener: (this: HTMLMarqueeElement, ev: HTMLMarqueeElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -6055,6 +5161,11 @@ declare var HTMLMarqueeElement: {
     new(): HTMLMarqueeElement;
 }
 
+interface HTMLMediaElementEventMap extends HTMLElementEventMap {
+    "encrypted": MediaEncryptedEvent;
+    "msneedkey": MSMediaKeyNeededEvent;
+}
+
 interface HTMLMediaElement extends HTMLElement {
     /**
       * Returns an AudioTrackList object with the audio tracks for a given video element.
@@ -6144,8 +5255,8 @@ interface HTMLMediaElement extends HTMLElement {
       * Gets the current network activity for the element.
       */
     readonly networkState: number;
-    onencrypted: (this: this, ev: MediaEncryptedEvent) => any;
-    onmsneedkey: (this: this, ev: MSMediaKeyNeededEvent) => any;
+    onencrypted: (this: HTMLMediaElement, ev: MediaEncryptedEvent) => any;
+    onmsneedkey: (this: HTMLMediaElement, ev: MSMediaKeyNeededEvent) => any;
     /**
       * Gets a flag that specifies whether playback is paused.
       */
@@ -6223,111 +5334,7 @@ interface HTMLMediaElement extends HTMLElement {
     readonly NETWORK_IDLE: number;
     readonly NETWORK_LOADING: number;
     readonly NETWORK_NO_SOURCE: number;
-    addEventListener(type: "MSContentZoom", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureChange", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGotPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSLostPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSManipulationStateChanged", listener: (this: this, ev: MSManipulationEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "abort", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "activate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ariarequest", listener: (this: this, ev: AriaRequestEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforedeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplay", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplaythrough", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "command", listener: (this: this, ev: CommandEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "contextmenu", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "cuechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "deactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drag", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragend", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragenter", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragleave", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragover", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragstart", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drop", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "durationchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "emptied", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "encrypted", listener: (this: this, ev: MediaEncryptedEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (this: this, ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "gotpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "input", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "invalid", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "keydown", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keypress", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keyup", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadeddata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadedmetadata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "lostpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseenter", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseleave", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "msneedkey", listener: (this: this, ev: MSMediaKeyNeededEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pause", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "play", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "playing", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ratechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "reset", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "scroll", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeked", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeking", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "select", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "selectstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "stalled", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "submit", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "suspend", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeupdate", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "volumechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "waiting", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLMediaElementEventMap>(type: K, listener: (this: HTMLMediaElement, ev: HTMLMediaElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -6348,6 +5355,8 @@ declare var HTMLMediaElement: {
 interface HTMLMenuElement extends HTMLElement {
     compact: boolean;
     type: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLMenuElement: {
@@ -6380,6 +5389,8 @@ interface HTMLMetaElement extends HTMLElement {
       * Sets or retrieves the URL property that will be loaded after the specified time has elapsed. 
       */
     url: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLMetaElement: {
@@ -6394,6 +5405,8 @@ interface HTMLMeterElement extends HTMLElement {
     min: number;
     optimum: number;
     value: number;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLMeterElement: {
@@ -6410,6 +5423,8 @@ interface HTMLModElement extends HTMLElement {
       * Sets or retrieves the date and time of a modification to the object.
       */
     dateTime: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLModElement: {
@@ -6424,6 +5439,8 @@ interface HTMLOListElement extends HTMLElement {
       */
     start: number;
     type: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLOListElement: {
@@ -6543,6 +5560,7 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
       * @param error Sets a custom error message that is displayed when a form is submitted.
       */
     setCustomValidity(error: string): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -6581,6 +5599,8 @@ interface HTMLOptGroupElement extends HTMLElement {
       * Sets or retrieves the value which is returned to the server when the form control is submitted.
       */
     value: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLOptGroupElement: {
@@ -6618,6 +5638,8 @@ interface HTMLOptionElement extends HTMLElement {
       * Sets or retrieves the value which is returned to the server when the form control is submitted.
       */
     value: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLOptionElement: {
@@ -6644,6 +5666,8 @@ interface HTMLParagraphElement extends HTMLElement {
       */
     align: string;
     clear: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLParagraphElement: {
@@ -6668,6 +5692,8 @@ interface HTMLParamElement extends HTMLElement {
       * Sets or retrieves the data type of the value attribute.
       */
     valueType: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLParamElement: {
@@ -6676,6 +5702,8 @@ declare var HTMLParamElement: {
 }
 
 interface HTMLPictureElement extends HTMLElement {
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLPictureElement: {
@@ -6688,6 +5716,8 @@ interface HTMLPreElement extends HTMLElement {
       * Sets or gets a value that you can use to implement your own width functionality for the object.
       */
     width: number;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLPreElement: {
@@ -6712,6 +5742,8 @@ interface HTMLProgressElement extends HTMLElement {
       * Sets or gets the current value of a progress element. The value must be a non-negative number between 0 and the max value.
       */
     value: number;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLProgressElement: {
@@ -6724,6 +5756,8 @@ interface HTMLQuoteElement extends HTMLElement {
       * Sets or retrieves reference information about the object.
       */
     cite: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLQuoteElement: {
@@ -6762,6 +5796,8 @@ interface HTMLScriptElement extends HTMLElement {
       */
     type: string;
     integrity: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLScriptElement: {
@@ -6856,6 +5892,8 @@ interface HTMLSelectElement extends HTMLElement {
       * @param error Sets a custom error message that is displayed when a form is submitted.
       */
     setCustomValidity(error: string): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
     [name: string]: any;
 }
 
@@ -6880,6 +5918,8 @@ interface HTMLSourceElement extends HTMLElement {
      * Gets or sets the MIME type of a media resource.
      */
     type: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLSourceElement: {
@@ -6888,6 +5928,8 @@ declare var HTMLSourceElement: {
 }
 
 interface HTMLSpanElement extends HTMLElement {
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLSpanElement: {
@@ -6905,6 +5947,7 @@ interface HTMLStyleElement extends HTMLElement, LinkStyle {
       * Retrieves the CSS language in which the style sheet is written.
       */
     type: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -6922,6 +5965,8 @@ interface HTMLTableCaptionElement extends HTMLElement {
       * Sets or retrieves whether the caption appears at the top or bottom of the table.
       */
     vAlign: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLTableCaptionElement: {
@@ -6975,6 +6020,7 @@ interface HTMLTableCellElement extends HTMLElement, HTMLTableAlignment {
       * Sets or retrieves the width of the object.
       */
     width: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -6996,6 +6042,7 @@ interface HTMLTableColElement extends HTMLElement, HTMLTableAlignment {
       * Sets or retrieves the width of the object.
       */
     width: any;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -7116,6 +6163,8 @@ interface HTMLTableElement extends HTMLElement {
       * @param index Number that specifies where to insert the row in the rows collection. The default value is -1, which appends the new row to the end of the rows collection.
       */
     insertRow(index?: number): HTMLTableRowElement;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLTableElement: {
@@ -7167,6 +6216,7 @@ interface HTMLTableRowElement extends HTMLElement, HTMLTableAlignment {
       * @param index Number that specifies where to insert the cell in the tr. The default value is -1, which appends the new cell to the end of the cells collection.
       */
     insertCell(index?: number): HTMLTableDataCellElement;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -7194,6 +6244,7 @@ interface HTMLTableSectionElement extends HTMLElement, HTMLTableAlignment {
       * @param index Number that specifies where to insert the row in the rows collection. The default value is -1, which appends the new row to the end of the rows collection.
       */
     insertRow(index?: number): HTMLTableRowElement;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -7204,6 +6255,8 @@ declare var HTMLTableSectionElement: {
 
 interface HTMLTemplateElement extends HTMLElement {
     readonly content: DocumentFragment;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLTemplateElement: {
@@ -7309,6 +6362,8 @@ interface HTMLTextAreaElement extends HTMLElement {
       * @param end The offset into the text field for the end of the selection.
       */
     setSelectionRange(start: number, end: number): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLTextAreaElement: {
@@ -7321,6 +6376,8 @@ interface HTMLTitleElement extends HTMLElement {
       * Retrieves or sets the text of the object as a string. 
       */
     text: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLTitleElement: {
@@ -7340,6 +6397,8 @@ interface HTMLTrackElement extends HTMLElement {
     readonly LOADED: number;
     readonly LOADING: number;
     readonly NONE: number;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLTrackElement: {
@@ -7354,6 +6413,8 @@ declare var HTMLTrackElement: {
 interface HTMLUListElement extends HTMLElement {
     compact: boolean;
     type: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLUListElement: {
@@ -7362,6 +6423,8 @@ declare var HTMLUListElement: {
 }
 
 interface HTMLUnknownElement extends HTMLElement {
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLUnknownElement: {
@@ -7369,6 +6432,12 @@ declare var HTMLUnknownElement: {
     new(): HTMLUnknownElement;
 }
 
+interface HTMLVideoElementEventMap extends HTMLMediaElementEventMap {
+    "MSVideoFormatChanged": Event;
+    "MSVideoFrameStepCompleted": Event;
+    "MSVideoOptimalLayoutChanged": Event;
+}
+
 interface HTMLVideoElement extends HTMLMediaElement {
     /**
       * Gets or sets the height of the video element.
@@ -7380,9 +6449,9 @@ interface HTMLVideoElement extends HTMLMediaElement {
     msStereo3DPackingMode: string;
     msStereo3DRenderMode: string;
     msZoom: boolean;
-    onMSVideoFormatChanged: (this: this, ev: Event) => any;
-    onMSVideoFrameStepCompleted: (this: this, ev: Event) => any;
-    onMSVideoOptimalLayoutChanged: (this: this, ev: Event) => any;
+    onMSVideoFormatChanged: (this: HTMLVideoElement, ev: Event) => any;
+    onMSVideoFrameStepCompleted: (this: HTMLVideoElement, ev: Event) => any;
+    onMSVideoOptimalLayoutChanged: (this: HTMLVideoElement, ev: Event) => any;
     /**
       * Gets or sets a URL of an image to display, for example, like a movie poster. This can be a still frame from the video, or another image if no video data is available.
       */
@@ -7409,114 +6478,7 @@ interface HTMLVideoElement extends HTMLMediaElement {
     webkitEnterFullscreen(): void;
     webkitExitFullScreen(): void;
     webkitExitFullscreen(): void;
-    addEventListener(type: "MSContentZoom", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureChange", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGotPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSLostPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSManipulationStateChanged", listener: (this: this, ev: MSManipulationEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSVideoFormatChanged", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSVideoFrameStepCompleted", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSVideoOptimalLayoutChanged", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "abort", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "activate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ariarequest", listener: (this: this, ev: AriaRequestEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforedeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplay", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplaythrough", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "command", listener: (this: this, ev: CommandEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "contextmenu", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "cuechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "deactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drag", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragend", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragenter", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragleave", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragover", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragstart", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drop", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "durationchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "emptied", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "encrypted", listener: (this: this, ev: MediaEncryptedEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (this: this, ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "gotpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "input", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "invalid", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "keydown", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keypress", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keyup", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadeddata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadedmetadata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "lostpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseenter", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseleave", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "msneedkey", listener: (this: this, ev: MSMediaKeyNeededEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pause", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "play", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "playing", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ratechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "reset", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "scroll", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeked", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeking", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "select", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "selectstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "stalled", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "submit", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "suspend", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeupdate", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "volumechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "waiting", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLVideoElementEventMap>(type: K, listener: (this: HTMLVideoElement, ev: HTMLVideoElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -7584,11 +6546,16 @@ declare var IDBCursorWithValue: {
     new(): IDBCursorWithValue;
 }
 
+interface IDBDatabaseEventMap {
+    "abort": Event;
+    "error": ErrorEvent;
+}
+
 interface IDBDatabase extends EventTarget {
     readonly name: string;
     readonly objectStoreNames: DOMStringList;
-    onabort: (this: this, ev: Event) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
+    onabort: (this: IDBDatabase, ev: Event) => any;
+    onerror: (this: IDBDatabase, ev: ErrorEvent) => any;
     version: number;
     onversionchange: (ev: IDBVersionChangeEvent) => any;
     close(): void;
@@ -7596,8 +6563,7 @@ interface IDBDatabase extends EventTarget {
     deleteObjectStore(name: string): void;
     transaction(storeNames: string | string[], mode?: string): IDBTransaction;
     addEventListener(type: "versionchange", listener: (ev: IDBVersionChangeEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "abort", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof IDBDatabaseEventMap>(type: K, listener: (this: IDBDatabase, ev: IDBDatabaseEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -7674,13 +6640,15 @@ declare var IDBObjectStore: {
     new(): IDBObjectStore;
 }
 
+interface IDBOpenDBRequestEventMap extends IDBRequestEventMap {
+    "blocked": Event;
+    "upgradeneeded": IDBVersionChangeEvent;
+}
+
 interface IDBOpenDBRequest extends IDBRequest {
-    onblocked: (this: this, ev: Event) => any;
-    onupgradeneeded: (this: this, ev: IDBVersionChangeEvent) => any;
-    addEventListener(type: "blocked", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "success", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "upgradeneeded", listener: (this: this, ev: IDBVersionChangeEvent) => any, useCapture?: boolean): void;
+    onblocked: (this: IDBOpenDBRequest, ev: Event) => any;
+    onupgradeneeded: (this: IDBOpenDBRequest, ev: IDBVersionChangeEvent) => any;
+    addEventListener<K extends keyof IDBOpenDBRequestEventMap>(type: K, listener: (this: IDBOpenDBRequest, ev: IDBOpenDBRequestEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -7689,16 +6657,20 @@ declare var IDBOpenDBRequest: {
     new(): IDBOpenDBRequest;
 }
 
+interface IDBRequestEventMap {
+    "error": ErrorEvent;
+    "success": Event;
+}
+
 interface IDBRequest extends EventTarget {
     readonly error: DOMError;
-    onerror: (this: this, ev: ErrorEvent) => any;
-    onsuccess: (this: this, ev: Event) => any;
+    onerror: (this: IDBRequest, ev: ErrorEvent) => any;
+    onsuccess: (this: IDBRequest, ev: Event) => any;
     readonly readyState: string;
     readonly result: any;
     source: IDBObjectStore | IDBIndex | IDBCursor;
     readonly transaction: IDBTransaction;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "success", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof IDBRequestEventMap>(type: K, listener: (this: IDBRequest, ev: IDBRequestEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -7707,21 +6679,25 @@ declare var IDBRequest: {
     new(): IDBRequest;
 }
 
+interface IDBTransactionEventMap {
+    "abort": Event;
+    "complete": Event;
+    "error": ErrorEvent;
+}
+
 interface IDBTransaction extends EventTarget {
     readonly db: IDBDatabase;
     readonly error: DOMError;
     readonly mode: string;
-    onabort: (this: this, ev: Event) => any;
-    oncomplete: (this: this, ev: Event) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
+    onabort: (this: IDBTransaction, ev: Event) => any;
+    oncomplete: (this: IDBTransaction, ev: Event) => any;
+    onerror: (this: IDBTransaction, ev: ErrorEvent) => any;
     abort(): void;
     objectStore(name: string): IDBObjectStore;
     readonly READ_ONLY: string;
     readonly READ_WRITE: string;
     readonly VERSION_CHANGE: string;
-    addEventListener(type: "abort", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "complete", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof IDBTransactionEventMap>(type: K, listener: (this: IDBTransaction, ev: IDBTransactionEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -7854,18 +6830,22 @@ interface MSApp {
 }
 declare var MSApp: MSApp;
 
+interface MSAppAsyncOperationEventMap {
+    "complete": Event;
+    "error": ErrorEvent;
+}
+
 interface MSAppAsyncOperation extends EventTarget {
     readonly error: DOMError;
-    oncomplete: (this: this, ev: Event) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
+    oncomplete: (this: MSAppAsyncOperation, ev: Event) => any;
+    onerror: (this: MSAppAsyncOperation, ev: ErrorEvent) => any;
     readonly readyState: number;
     readonly result: any;
     start(): void;
     readonly COMPLETED: number;
     readonly ERROR: number;
     readonly STARTED: number;
-    addEventListener(type: "complete", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof MSAppAsyncOperationEventMap>(type: K, listener: (this: MSAppAsyncOperation, ev: MSAppAsyncOperationEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8020,6 +7000,8 @@ interface MSHTMLWebViewElement extends HTMLElement {
     navigateWithHttpRequestMessage(requestMessage: any): void;
     refresh(): void;
     stop(): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var MSHTMLWebViewElement: {
@@ -8027,20 +7009,24 @@ declare var MSHTMLWebViewElement: {
     new(): MSHTMLWebViewElement;
 }
 
+interface MSInputMethodContextEventMap {
+    "MSCandidateWindowHide": Event;
+    "MSCandidateWindowShow": Event;
+    "MSCandidateWindowUpdate": Event;
+}
+
 interface MSInputMethodContext extends EventTarget {
     readonly compositionEndOffset: number;
     readonly compositionStartOffset: number;
-    oncandidatewindowhide: (this: this, ev: Event) => any;
-    oncandidatewindowshow: (this: this, ev: Event) => any;
-    oncandidatewindowupdate: (this: this, ev: Event) => any;
+    oncandidatewindowhide: (this: MSInputMethodContext, ev: Event) => any;
+    oncandidatewindowshow: (this: MSInputMethodContext, ev: Event) => any;
+    oncandidatewindowupdate: (this: MSInputMethodContext, ev: Event) => any;
     readonly target: HTMLElement;
     getCandidateWindowClientRect(): ClientRect;
     getCompositionAlternatives(): string[];
     hasComposition(): boolean;
     isCandidateWindowVisible(): boolean;
-    addEventListener(type: "MSCandidateWindowHide", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSCandidateWindowShow", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSCandidateWindowUpdate", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof MSInputMethodContextEventMap>(type: K, listener: (this: MSInputMethodContext, ev: MSInputMethodContextEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8206,6 +7192,7 @@ interface MSStreamReader extends EventTarget, MSBaseReader {
     readAsBlob(stream: MSStream, size?: number): void;
     readAsDataURL(stream: MSStream, size?: number): void;
     readAsText(stream: MSStream, encoding?: string, size?: number): void;
+    addEventListener<K extends keyof MSBaseReaderEventMap>(type: K, listener: (this: MSBaseReader, ev: MSBaseReaderEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8214,10 +7201,15 @@ declare var MSStreamReader: {
     new(): MSStreamReader;
 }
 
+interface MSWebViewAsyncOperationEventMap {
+    "complete": Event;
+    "error": ErrorEvent;
+}
+
 interface MSWebViewAsyncOperation extends EventTarget {
     readonly error: DOMError;
-    oncomplete: (this: this, ev: Event) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
+    oncomplete: (this: MSWebViewAsyncOperation, ev: Event) => any;
+    onerror: (this: MSWebViewAsyncOperation, ev: ErrorEvent) => any;
     readonly readyState: number;
     readonly result: any;
     readonly target: MSHTMLWebViewElement;
@@ -8229,8 +7221,7 @@ interface MSWebViewAsyncOperation extends EventTarget {
     readonly TYPE_CAPTURE_PREVIEW_TO_RANDOM_ACCESS_STREAM: number;
     readonly TYPE_CREATE_DATA_PACKAGE_FROM_SELECTION: number;
     readonly TYPE_INVOKE_SCRIPT: number;
-    addEventListener(type: "complete", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof MSWebViewAsyncOperationEventMap>(type: K, listener: (this: MSWebViewAsyncOperation, ev: MSWebViewAsyncOperationEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8267,12 +7258,16 @@ declare var MediaDeviceInfo: {
     new(): MediaDeviceInfo;
 }
 
+interface MediaDevicesEventMap {
+    "devicechange": Event;
+}
+
 interface MediaDevices extends EventTarget {
-    ondevicechange: (this: this, ev: Event) => any;
+    ondevicechange: (this: MediaDevices, ev: Event) => any;
     enumerateDevices(): any;
     getSupportedConstraints(): MediaTrackSupportedConstraints;
     getUserMedia(constraints: MediaStreamConstraints): PromiseLike<MediaStream>;
-    addEventListener(type: "devicechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof MediaDevicesEventMap>(type: K, listener: (this: MediaDevices, ev: MediaDevicesEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8422,13 +7417,20 @@ declare var MediaSource: {
     isTypeSupported(type: string): boolean;
 }
 
+interface MediaStreamEventMap {
+    "active": Event;
+    "addtrack": TrackEvent;
+    "inactive": Event;
+    "removetrack": TrackEvent;
+}
+
 interface MediaStream extends EventTarget {
     readonly active: boolean;
     readonly id: string;
-    onactive: (this: this, ev: Event) => any;
-    onaddtrack: (this: this, ev: TrackEvent) => any;
-    oninactive: (this: this, ev: Event) => any;
-    onremovetrack: (this: this, ev: TrackEvent) => any;
+    onactive: (this: MediaStream, ev: Event) => any;
+    onaddtrack: (this: MediaStream, ev: TrackEvent) => any;
+    oninactive: (this: MediaStream, ev: Event) => any;
+    onremovetrack: (this: MediaStream, ev: TrackEvent) => any;
     addTrack(track: MediaStreamTrack): void;
     clone(): MediaStream;
     getAudioTracks(): MediaStreamTrack[];
@@ -8437,10 +7439,7 @@ interface MediaStream extends EventTarget {
     getVideoTracks(): MediaStreamTrack[];
     removeTrack(track: MediaStreamTrack): void;
     stop(): void;
-    addEventListener(type: "active", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "addtrack", listener: (this: this, ev: TrackEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "inactive", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "removetrack", listener: (this: this, ev: TrackEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof MediaStreamEventMap>(type: K, listener: (this: MediaStream, ev: MediaStreamEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8477,16 +7476,23 @@ declare var MediaStreamErrorEvent: {
     new(type: string, eventInitDict?: MediaStreamErrorEventInit): MediaStreamErrorEvent;
 }
 
+interface MediaStreamTrackEventMap {
+    "ended": MediaStreamErrorEvent;
+    "mute": Event;
+    "overconstrained": MediaStreamErrorEvent;
+    "unmute": Event;
+}
+
 interface MediaStreamTrack extends EventTarget {
     enabled: boolean;
     readonly id: string;
     readonly kind: string;
     readonly label: string;
     readonly muted: boolean;
-    onended: (this: this, ev: MediaStreamErrorEvent) => any;
-    onmute: (this: this, ev: Event) => any;
-    onoverconstrained: (this: this, ev: MediaStreamErrorEvent) => any;
-    onunmute: (this: this, ev: Event) => any;
+    onended: (this: MediaStreamTrack, ev: MediaStreamErrorEvent) => any;
+    onmute: (this: MediaStreamTrack, ev: Event) => any;
+    onoverconstrained: (this: MediaStreamTrack, ev: MediaStreamErrorEvent) => any;
+    onunmute: (this: MediaStreamTrack, ev: Event) => any;
     readonly readonly: boolean;
     readonly readyState: string;
     readonly remote: boolean;
@@ -8496,10 +7502,7 @@ interface MediaStreamTrack extends EventTarget {
     getConstraints(): MediaTrackConstraints;
     getSettings(): MediaTrackSettings;
     stop(): void;
-    addEventListener(type: "ended", listener: (this: this, ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mute", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "overconstrained", listener: (this: this, ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "unmute", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof MediaStreamTrackEventMap>(type: K, listener: (this: MediaStreamTrack, ev: MediaStreamTrackEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8540,12 +7543,16 @@ declare var MessageEvent: {
     new(type: string, eventInitDict?: MessageEventInit): MessageEvent;
 }
 
+interface MessagePortEventMap {
+    "message": MessageEvent;
+}
+
 interface MessagePort extends EventTarget {
-    onmessage: (this: this, ev: MessageEvent) => any;
+    onmessage: (this: MessagePort, ev: MessageEvent) => any;
     close(): void;
     postMessage(message?: any, ports?: any): void;
     start(): void;
-    addEventListener(type: "message", listener: (this: this, ev: MessageEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof MessagePortEventMap>(type: K, listener: (this: MessagePort, ev: MessagePortEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8723,7 +7730,6 @@ interface Navigator extends Object, NavigatorID, NavigatorOnLine, NavigatorConte
     msLaunchUri(uri: string, successCallback?: MSLaunchUriCallback, noHandlerCallback?: MSLaunchUriCallback): void;
     requestMediaKeySystemAccess(keySystem: string, supportedConfigurations: MediaKeySystemConfiguration[]): PromiseLike<MediaKeySystemAccess>;
     vibrate(pattern: number | number[]): boolean;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var Navigator: {
@@ -8898,10 +7904,14 @@ declare var OfflineAudioCompletionEvent: {
     new(): OfflineAudioCompletionEvent;
 }
 
+interface OfflineAudioContextEventMap {
+    "complete": Event;
+}
+
 interface OfflineAudioContext extends AudioContext {
-    oncomplete: (this: this, ev: Event) => any;
+    oncomplete: (this: OfflineAudioContext, ev: Event) => any;
     startRendering(): PromiseLike<AudioBuffer>;
-    addEventListener(type: "complete", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof OfflineAudioContextEventMap>(type: K, listener: (this: OfflineAudioContext, ev: OfflineAudioContextEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8910,15 +7920,19 @@ declare var OfflineAudioContext: {
     new(numberOfChannels: number, length: number, sampleRate: number): OfflineAudioContext;
 }
 
+interface OscillatorNodeEventMap {
+    "ended": MediaStreamErrorEvent;
+}
+
 interface OscillatorNode extends AudioNode {
     readonly detune: AudioParam;
     readonly frequency: AudioParam;
-    onended: (this: this, ev: MediaStreamErrorEvent) => any;
+    onended: (this: OscillatorNode, ev: MediaStreamErrorEvent) => any;
     type: string;
     setPeriodicWave(periodicWave: PeriodicWave): void;
     start(when?: number): void;
     stop(when?: number): void;
-    addEventListener(type: "ended", listener: (this: this, ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof OscillatorNodeEventMap>(type: K, listener: (this: OscillatorNode, ev: OscillatorNodeEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9297,9 +8311,14 @@ declare var RTCDTMFToneChangeEvent: {
     new(type: string, eventInitDict: RTCDTMFToneChangeEventInit): RTCDTMFToneChangeEvent;
 }
 
+interface RTCDtlsTransportEventMap {
+    "dtlsstatechange": RTCDtlsTransportStateChangedEvent;
+    "error": ErrorEvent;
+}
+
 interface RTCDtlsTransport extends RTCStatsProvider {
-    ondtlsstatechange: ((this: this, ev: RTCDtlsTransportStateChangedEvent) => any) | null;
-    onerror: ((this: this, ev: ErrorEvent) => any) | null;
+    ondtlsstatechange: ((this: RTCDtlsTransport, ev: RTCDtlsTransportStateChangedEvent) => any) | null;
+    onerror: ((this: RTCDtlsTransport, ev: ErrorEvent) => any) | null;
     readonly state: string;
     readonly transport: RTCIceTransport;
     getLocalParameters(): RTCDtlsParameters;
@@ -9307,8 +8326,7 @@ interface RTCDtlsTransport extends RTCStatsProvider {
     getRemoteParameters(): RTCDtlsParameters | null;
     start(remoteParameters: RTCDtlsParameters): void;
     stop(): void;
-    addEventListener(type: "dtlsstatechange", listener: (this: this, ev: RTCDtlsTransportStateChangedEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof RTCDtlsTransportEventMap>(type: K, listener: (this: RTCDtlsTransport, ev: RTCDtlsTransportEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9326,15 +8344,19 @@ declare var RTCDtlsTransportStateChangedEvent: {
     new(): RTCDtlsTransportStateChangedEvent;
 }
 
+interface RTCDtmfSenderEventMap {
+    "tonechange": RTCDTMFToneChangeEvent;
+}
+
 interface RTCDtmfSender extends EventTarget {
     readonly canInsertDTMF: boolean;
     readonly duration: number;
     readonly interToneGap: number;
-    ontonechange: (this: this, ev: RTCDTMFToneChangeEvent) => any;
+    ontonechange: (this: RTCDtmfSender, ev: RTCDTMFToneChangeEvent) => any;
     readonly sender: RTCRtpSender;
     readonly toneBuffer: string;
     insertDTMF(tones: string, duration?: number, interToneGap?: number): void;
-    addEventListener(type: "tonechange", listener: (this: this, ev: RTCDTMFToneChangeEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof RTCDtmfSenderEventMap>(type: K, listener: (this: RTCDtmfSender, ev: RTCDtmfSenderEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9352,15 +8374,19 @@ declare var RTCIceCandidatePairChangedEvent: {
     new(): RTCIceCandidatePairChangedEvent;
 }
 
+interface RTCIceGathererEventMap {
+    "error": ErrorEvent;
+    "localcandidate": RTCIceGathererEvent;
+}
+
 interface RTCIceGatherer extends RTCStatsProvider {
     readonly component: string;
-    onerror: ((this: this, ev: ErrorEvent) => any) | null;
-    onlocalcandidate: ((this: this, ev: RTCIceGathererEvent) => any) | null;
+    onerror: ((this: RTCIceGatherer, ev: ErrorEvent) => any) | null;
+    onlocalcandidate: ((this: RTCIceGatherer, ev: RTCIceGathererEvent) => any) | null;
     createAssociatedGatherer(): RTCIceGatherer;
     getLocalCandidates(): RTCIceCandidate[];
     getLocalParameters(): RTCIceParameters;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "localcandidate", listener: (this: this, ev: RTCIceGathererEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof RTCIceGathererEventMap>(type: K, listener: (this: RTCIceGatherer, ev: RTCIceGathererEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9378,11 +8404,16 @@ declare var RTCIceGathererEvent: {
     new(): RTCIceGathererEvent;
 }
 
+interface RTCIceTransportEventMap {
+    "candidatepairchange": RTCIceCandidatePairChangedEvent;
+    "icestatechange": RTCIceTransportStateChangedEvent;
+}
+
 interface RTCIceTransport extends RTCStatsProvider {
     readonly component: string;
     readonly iceGatherer: RTCIceGatherer | null;
-    oncandidatepairchange: ((this: this, ev: RTCIceCandidatePairChangedEvent) => any) | null;
-    onicestatechange: ((this: this, ev: RTCIceTransportStateChangedEvent) => any) | null;
+    oncandidatepairchange: ((this: RTCIceTransport, ev: RTCIceCandidatePairChangedEvent) => any) | null;
+    onicestatechange: ((this: RTCIceTransport, ev: RTCIceTransportStateChangedEvent) => any) | null;
     readonly role: string;
     readonly state: string;
     addRemoteCandidate(remoteCandidate: RTCIceCandidate | RTCIceCandidateComplete): void;
@@ -9393,8 +8424,7 @@ interface RTCIceTransport extends RTCStatsProvider {
     setRemoteCandidates(remoteCandidates: RTCIceCandidate[]): void;
     start(gatherer: RTCIceGatherer, remoteParameters: RTCIceParameters, role?: string): void;
     stop(): void;
-    addEventListener(type: "candidatepairchange", listener: (this: this, ev: RTCIceCandidatePairChangedEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "icestatechange", listener: (this: this, ev: RTCIceTransportStateChangedEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof RTCIceTransportEventMap>(type: K, listener: (this: RTCIceTransport, ev: RTCIceTransportEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9412,8 +8442,12 @@ declare var RTCIceTransportStateChangedEvent: {
     new(): RTCIceTransportStateChangedEvent;
 }
 
+interface RTCRtpReceiverEventMap {
+    "error": ErrorEvent;
+}
+
 interface RTCRtpReceiver extends RTCStatsProvider {
-    onerror: ((this: this, ev: ErrorEvent) => any) | null;
+    onerror: ((this: RTCRtpReceiver, ev: ErrorEvent) => any) | null;
     readonly rtcpTransport: RTCDtlsTransport;
     readonly track: MediaStreamTrack | null;
     readonly transport: RTCDtlsTransport | RTCSrtpSdesTransport;
@@ -9422,7 +8456,7 @@ interface RTCRtpReceiver extends RTCStatsProvider {
     requestSendCSRC(csrc: number): void;
     setTransport(transport: RTCDtlsTransport | RTCSrtpSdesTransport, rtcpTransport?: RTCDtlsTransport): void;
     stop(): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof RTCRtpReceiverEventMap>(type: K, listener: (this: RTCRtpReceiver, ev: RTCRtpReceiverEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9432,9 +8466,14 @@ declare var RTCRtpReceiver: {
     getCapabilities(kind?: string): RTCRtpCapabilities;
 }
 
+interface RTCRtpSenderEventMap {
+    "error": ErrorEvent;
+    "ssrcconflict": RTCSsrcConflictEvent;
+}
+
 interface RTCRtpSender extends RTCStatsProvider {
-    onerror: ((this: this, ev: ErrorEvent) => any) | null;
-    onssrcconflict: ((this: this, ev: RTCSsrcConflictEvent) => any) | null;
+    onerror: ((this: RTCRtpSender, ev: ErrorEvent) => any) | null;
+    onssrcconflict: ((this: RTCRtpSender, ev: RTCSsrcConflictEvent) => any) | null;
     readonly rtcpTransport: RTCDtlsTransport;
     readonly track: MediaStreamTrack;
     readonly transport: RTCDtlsTransport | RTCSrtpSdesTransport;
@@ -9442,8 +8481,7 @@ interface RTCRtpSender extends RTCStatsProvider {
     setTrack(track: MediaStreamTrack): void;
     setTransport(transport: RTCDtlsTransport | RTCSrtpSdesTransport, rtcpTransport?: RTCDtlsTransport): void;
     stop(): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ssrcconflict", listener: (this: this, ev: RTCSsrcConflictEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof RTCRtpSenderEventMap>(type: K, listener: (this: RTCRtpSender, ev: RTCRtpSenderEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9453,10 +8491,14 @@ declare var RTCRtpSender: {
     getCapabilities(kind?: string): RTCRtpCapabilities;
 }
 
+interface RTCSrtpSdesTransportEventMap {
+    "error": ErrorEvent;
+}
+
 interface RTCSrtpSdesTransport extends EventTarget {
-    onerror: ((this: this, ev: ErrorEvent) => any) | null;
+    onerror: ((this: RTCSrtpSdesTransport, ev: ErrorEvent) => any) | null;
     readonly transport: RTCIceTransport;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof RTCSrtpSdesTransportEventMap>(type: K, listener: (this: RTCSrtpSdesTransport, ev: RTCSrtpSdesTransportEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9531,6 +8573,7 @@ declare var Range: {
 
 interface SVGAElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGURIReference {
     readonly target: SVGAnimatedString;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9687,6 +8730,7 @@ interface SVGCircleElement extends SVGElement, SVGStylable, SVGTransformable, SV
     readonly cx: SVGAnimatedLength;
     readonly cy: SVGAnimatedLength;
     readonly r: SVGAnimatedLength;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9697,6 +8741,7 @@ declare var SVGCircleElement: {
 
 interface SVGClipPathElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGUnitTypes {
     readonly clipPathUnits: SVGAnimatedEnumeration;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9719,6 +8764,8 @@ interface SVGComponentTransferFunctionElement extends SVGElement {
     readonly SVG_FECOMPONENTTRANSFER_TYPE_LINEAR: number;
     readonly SVG_FECOMPONENTTRANSFER_TYPE_TABLE: number;
     readonly SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN: number;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGComponentTransferFunctionElement: {
@@ -9733,6 +8780,7 @@ declare var SVGComponentTransferFunctionElement: {
 }
 
 interface SVGDefsElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9742,6 +8790,7 @@ declare var SVGDefsElement: {
 }
 
 interface SVGDescElement extends SVGElement, SVGStylable, SVGLangSpace {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9750,67 +8799,35 @@ declare var SVGDescElement: {
     new(): SVGDescElement;
 }
 
+interface SVGElementEventMap extends ElementEventMap {
+    "click": MouseEvent;
+    "dblclick": MouseEvent;
+    "focusin": FocusEvent;
+    "focusout": FocusEvent;
+    "load": Event;
+    "mousedown": MouseEvent;
+    "mousemove": MouseEvent;
+    "mouseout": MouseEvent;
+    "mouseover": MouseEvent;
+    "mouseup": MouseEvent;
+}
+
 interface SVGElement extends Element {
-    onclick: (this: this, ev: MouseEvent) => any;
-    ondblclick: (this: this, ev: MouseEvent) => any;
-    onfocusin: (this: this, ev: FocusEvent) => any;
-    onfocusout: (this: this, ev: FocusEvent) => any;
-    onload: (this: this, ev: Event) => any;
-    onmousedown: (this: this, ev: MouseEvent) => any;
-    onmousemove: (this: this, ev: MouseEvent) => any;
-    onmouseout: (this: this, ev: MouseEvent) => any;
-    onmouseover: (this: this, ev: MouseEvent) => any;
-    onmouseup: (this: this, ev: MouseEvent) => any;
+    onclick: (this: SVGElement, ev: MouseEvent) => any;
+    ondblclick: (this: SVGElement, ev: MouseEvent) => any;
+    onfocusin: (this: SVGElement, ev: FocusEvent) => any;
+    onfocusout: (this: SVGElement, ev: FocusEvent) => any;
+    onload: (this: SVGElement, ev: Event) => any;
+    onmousedown: (this: SVGElement, ev: MouseEvent) => any;
+    onmousemove: (this: SVGElement, ev: MouseEvent) => any;
+    onmouseout: (this: SVGElement, ev: MouseEvent) => any;
+    onmouseover: (this: SVGElement, ev: MouseEvent) => any;
+    onmouseup: (this: SVGElement, ev: MouseEvent) => any;
     readonly ownerSVGElement: SVGSVGElement;
     readonly viewportElement: SVGElement;
     xmlbase: string;
     className: any;
-    addEventListener(type: "MSGestureChange", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGotPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSLostPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ariarequest", listener: (this: this, ev: AriaRequestEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "command", listener: (this: this, ev: CommandEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focusin", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focusout", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "gotpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "lostpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9850,6 +8867,7 @@ interface SVGEllipseElement extends SVGElement, SVGStylable, SVGTransformable, S
     readonly cy: SVGAnimatedLength;
     readonly rx: SVGAnimatedLength;
     readonly ry: SVGAnimatedLength;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9879,6 +8897,7 @@ interface SVGFEBlendElement extends SVGElement, SVGFilterPrimitiveStandardAttrib
     readonly SVG_FEBLEND_MODE_SCREEN: number;
     readonly SVG_FEBLEND_MODE_SOFT_LIGHT: number;
     readonly SVG_FEBLEND_MODE_UNKNOWN: number;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9913,6 +8932,7 @@ interface SVGFEColorMatrixElement extends SVGElement, SVGFilterPrimitiveStandard
     readonly SVG_FECOLORMATRIX_TYPE_MATRIX: number;
     readonly SVG_FECOLORMATRIX_TYPE_SATURATE: number;
     readonly SVG_FECOLORMATRIX_TYPE_UNKNOWN: number;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9928,6 +8948,7 @@ declare var SVGFEColorMatrixElement: {
 
 interface SVGFEComponentTransferElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
     readonly in1: SVGAnimatedString;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9951,6 +8972,7 @@ interface SVGFECompositeElement extends SVGElement, SVGFilterPrimitiveStandardAt
     readonly SVG_FECOMPOSITE_OPERATOR_OVER: number;
     readonly SVG_FECOMPOSITE_OPERATOR_UNKNOWN: number;
     readonly SVG_FECOMPOSITE_OPERATOR_XOR: number;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9983,6 +9005,7 @@ interface SVGFEConvolveMatrixElement extends SVGElement, SVGFilterPrimitiveStand
     readonly SVG_EDGEMODE_NONE: number;
     readonly SVG_EDGEMODE_UNKNOWN: number;
     readonly SVG_EDGEMODE_WRAP: number;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10001,6 +9024,7 @@ interface SVGFEDiffuseLightingElement extends SVGElement, SVGFilterPrimitiveStan
     readonly kernelUnitLengthX: SVGAnimatedNumber;
     readonly kernelUnitLengthY: SVGAnimatedNumber;
     readonly surfaceScale: SVGAnimatedNumber;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10020,6 +9044,7 @@ interface SVGFEDisplacementMapElement extends SVGElement, SVGFilterPrimitiveStan
     readonly SVG_CHANNEL_G: number;
     readonly SVG_CHANNEL_R: number;
     readonly SVG_CHANNEL_UNKNOWN: number;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10036,6 +9061,8 @@ declare var SVGFEDisplacementMapElement: {
 interface SVGFEDistantLightElement extends SVGElement {
     readonly azimuth: SVGAnimatedNumber;
     readonly elevation: SVGAnimatedNumber;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFEDistantLightElement: {
@@ -10044,6 +9071,7 @@ declare var SVGFEDistantLightElement: {
 }
 
 interface SVGFEFloodElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10089,6 +9117,7 @@ interface SVGFEGaussianBlurElement extends SVGElement, SVGFilterPrimitiveStandar
     readonly stdDeviationX: SVGAnimatedNumber;
     readonly stdDeviationY: SVGAnimatedNumber;
     setStdDeviation(stdDeviationX: number, stdDeviationY: number): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10099,6 +9128,7 @@ declare var SVGFEGaussianBlurElement: {
 
 interface SVGFEImageElement extends SVGElement, SVGFilterPrimitiveStandardAttributes, SVGLangSpace, SVGURIReference, SVGExternalResourcesRequired {
     readonly preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10108,6 +9138,7 @@ declare var SVGFEImageElement: {
 }
 
 interface SVGFEMergeElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10118,6 +9149,8 @@ declare var SVGFEMergeElement: {
 
 interface SVGFEMergeNodeElement extends SVGElement {
     readonly in1: SVGAnimatedString;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFEMergeNodeElement: {
@@ -10133,6 +9166,7 @@ interface SVGFEMorphologyElement extends SVGElement, SVGFilterPrimitiveStandardA
     readonly SVG_MORPHOLOGY_OPERATOR_DILATE: number;
     readonly SVG_MORPHOLOGY_OPERATOR_ERODE: number;
     readonly SVG_MORPHOLOGY_OPERATOR_UNKNOWN: number;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10148,6 +9182,7 @@ interface SVGFEOffsetElement extends SVGElement, SVGFilterPrimitiveStandardAttri
     readonly dx: SVGAnimatedNumber;
     readonly dy: SVGAnimatedNumber;
     readonly in1: SVGAnimatedString;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10160,6 +9195,8 @@ interface SVGFEPointLightElement extends SVGElement {
     readonly x: SVGAnimatedNumber;
     readonly y: SVGAnimatedNumber;
     readonly z: SVGAnimatedNumber;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFEPointLightElement: {
@@ -10174,6 +9211,7 @@ interface SVGFESpecularLightingElement extends SVGElement, SVGFilterPrimitiveSta
     readonly specularConstant: SVGAnimatedNumber;
     readonly specularExponent: SVGAnimatedNumber;
     readonly surfaceScale: SVGAnimatedNumber;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10191,6 +9229,8 @@ interface SVGFESpotLightElement extends SVGElement {
     readonly x: SVGAnimatedNumber;
     readonly y: SVGAnimatedNumber;
     readonly z: SVGAnimatedNumber;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFESpotLightElement: {
@@ -10200,6 +9240,7 @@ declare var SVGFESpotLightElement: {
 
 interface SVGFETileElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
     readonly in1: SVGAnimatedString;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10221,6 +9262,7 @@ interface SVGFETurbulenceElement extends SVGElement, SVGFilterPrimitiveStandardA
     readonly SVG_TURBULENCE_TYPE_FRACTALNOISE: number;
     readonly SVG_TURBULENCE_TYPE_TURBULENCE: number;
     readonly SVG_TURBULENCE_TYPE_UNKNOWN: number;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10245,6 +9287,7 @@ interface SVGFilterElement extends SVGElement, SVGUnitTypes, SVGStylable, SVGLan
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
     setFilterRes(filterResX: number, filterResY: number): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10258,6 +9301,7 @@ interface SVGForeignObjectElement extends SVGElement, SVGStylable, SVGTransforma
     readonly width: SVGAnimatedLength;
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10267,6 +9311,7 @@ declare var SVGForeignObjectElement: {
 }
 
 interface SVGGElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10283,6 +9328,7 @@ interface SVGGradientElement extends SVGElement, SVGStylable, SVGExternalResourc
     readonly SVG_SPREADMETHOD_REFLECT: number;
     readonly SVG_SPREADMETHOD_REPEAT: number;
     readonly SVG_SPREADMETHOD_UNKNOWN: number;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10301,6 +9347,7 @@ interface SVGImageElement extends SVGElement, SVGStylable, SVGTransformable, SVG
     readonly width: SVGAnimatedLength;
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10366,6 +9413,7 @@ interface SVGLineElement extends SVGElement, SVGStylable, SVGTransformable, SVGT
     readonly x2: SVGAnimatedLength;
     readonly y1: SVGAnimatedLength;
     readonly y2: SVGAnimatedLength;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10402,6 +9450,7 @@ interface SVGMarkerElement extends SVGElement, SVGStylable, SVGLangSpace, SVGExt
     readonly SVG_MARKER_ORIENT_ANGLE: number;
     readonly SVG_MARKER_ORIENT_AUTO: number;
     readonly SVG_MARKER_ORIENT_UNKNOWN: number;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10423,6 +9472,7 @@ interface SVGMaskElement extends SVGElement, SVGStylable, SVGTests, SVGLangSpace
     readonly width: SVGAnimatedLength;
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10457,6 +9507,8 @@ declare var SVGMatrix: {
 }
 
 interface SVGMetadataElement extends SVGElement {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGMetadataElement: {
@@ -10512,6 +9564,7 @@ interface SVGPathElement extends SVGElement, SVGStylable, SVGTransformable, SVGT
     getPathSegAtLength(distance: number): number;
     getPointAtLength(distance: number): SVGPoint;
     getTotalLength(): number;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10804,6 +9857,7 @@ interface SVGPatternElement extends SVGElement, SVGStylable, SVGTests, SVGLangSp
     readonly width: SVGAnimatedLength;
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10840,6 +9894,7 @@ declare var SVGPointList: {
 }
 
 interface SVGPolygonElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGAnimatedPoints {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10849,6 +9904,7 @@ declare var SVGPolygonElement: {
 }
 
 interface SVGPolylineElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGAnimatedPoints {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10927,6 +9983,7 @@ interface SVGRectElement extends SVGElement, SVGStylable, SVGTransformable, SVGT
     readonly width: SVGAnimatedLength;
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10935,18 +9992,27 @@ declare var SVGRectElement: {
     new(): SVGRectElement;
 }
 
+interface SVGSVGElementEventMap extends SVGElementEventMap {
+    "SVGAbort": Event;
+    "SVGError": Event;
+    "resize": UIEvent;
+    "scroll": UIEvent;
+    "SVGUnload": Event;
+    "SVGZoom": SVGZoomEvent;
+}
+
 interface SVGSVGElement extends SVGElement, DocumentEvent, SVGLocatable, SVGTests, SVGStylable, SVGLangSpace, SVGExternalResourcesRequired, SVGFitToViewBox, SVGZoomAndPan {
     contentScriptType: string;
     contentStyleType: string;
     currentScale: number;
     readonly currentTranslate: SVGPoint;
     readonly height: SVGAnimatedLength;
-    onabort: (this: this, ev: Event) => any;
-    onerror: (this: this, ev: Event) => any;
-    onresize: (this: this, ev: UIEvent) => any;
-    onscroll: (this: this, ev: UIEvent) => any;
-    onunload: (this: this, ev: Event) => any;
-    onzoom: (this: this, ev: SVGZoomEvent) => any;
+    onabort: (this: SVGSVGElement, ev: Event) => any;
+    onerror: (this: SVGSVGElement, ev: Event) => any;
+    onresize: (this: SVGSVGElement, ev: UIEvent) => any;
+    onscroll: (this: SVGSVGElement, ev: UIEvent) => any;
+    onunload: (this: SVGSVGElement, ev: Event) => any;
+    onzoom: (this: SVGSVGElement, ev: SVGZoomEvent) => any;
     readonly pixelUnitToMillimeterX: number;
     readonly pixelUnitToMillimeterY: number;
     readonly screenPixelToMillimeterX: number;
@@ -10978,58 +10044,7 @@ interface SVGSVGElement extends SVGElement, DocumentEvent, SVGLocatable, SVGTest
     unpauseAnimations(): void;
     unsuspendRedraw(suspendHandleID: number): void;
     unsuspendRedrawAll(): void;
-    addEventListener(type: "MSGestureChange", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGotPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSLostPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "SVGAbort", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "SVGError", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "SVGUnload", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "SVGZoom", listener: (this: this, ev: SVGZoomEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ariarequest", listener: (this: this, ev: AriaRequestEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "command", listener: (this: this, ev: CommandEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focusin", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focusout", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "gotpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "lostpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "resize", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "scroll", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGSVGElementEventMap>(type: K, listener: (this: SVGSVGElement, ev: SVGSVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -11040,6 +10055,7 @@ declare var SVGSVGElement: {
 
 interface SVGScriptElement extends SVGElement, SVGExternalResourcesRequired, SVGURIReference {
     type: string;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -11050,6 +10066,7 @@ declare var SVGScriptElement: {
 
 interface SVGStopElement extends SVGElement, SVGStylable {
     readonly offset: SVGAnimatedNumber;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -11079,6 +10096,7 @@ interface SVGStyleElement extends SVGElement, SVGLangSpace {
     media: string;
     title: string;
     type: string;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -11088,6 +10106,7 @@ declare var SVGStyleElement: {
 }
 
 interface SVGSwitchElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -11097,6 +10116,7 @@ declare var SVGSwitchElement: {
 }
 
 interface SVGSymbolElement extends SVGElement, SVGStylable, SVGLangSpace, SVGExternalResourcesRequired, SVGFitToViewBox {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -11128,6 +10148,7 @@ interface SVGTextContentElement extends SVGElement, SVGStylable, SVGTests, SVGLa
     readonly LENGTHADJUST_SPACING: number;
     readonly LENGTHADJUST_SPACINGANDGLYPHS: number;
     readonly LENGTHADJUST_UNKNOWN: number;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -11140,7 +10161,6 @@ declare var SVGTextContentElement: {
 }
 
 interface SVGTextElement extends SVGTextPositioningElement, SVGTransformable {
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGTextElement: {
@@ -11158,7 +10178,6 @@ interface SVGTextPathElement extends SVGTextContentElement, SVGURIReference {
     readonly TEXTPATH_SPACINGTYPE_AUTO: number;
     readonly TEXTPATH_SPACINGTYPE_EXACT: number;
     readonly TEXTPATH_SPACINGTYPE_UNKNOWN: number;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGTextPathElement: {
@@ -11186,6 +10205,7 @@ declare var SVGTextPositioningElement: {
 }
 
 interface SVGTitleElement extends SVGElement, SVGStylable, SVGLangSpace {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -11257,6 +10277,7 @@ interface SVGUseElement extends SVGElement, SVGStylable, SVGTransformable, SVGTe
     readonly width: SVGAnimatedLength;
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -11267,6 +10288,7 @@ declare var SVGUseElement: {
 
 interface SVGViewElement extends SVGElement, SVGExternalResourcesRequired, SVGFitToViewBox, SVGZoomAndPan {
     readonly viewTarget: SVGStringList;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -11298,6 +10320,10 @@ declare var SVGZoomEvent: {
     new(): SVGZoomEvent;
 }
 
+interface ScreenEventMap {
+    "MSOrientationChange": Event;
+}
+
 interface Screen extends EventTarget {
     readonly availHeight: number;
     readonly availWidth: number;
@@ -11310,14 +10336,14 @@ interface Screen extends EventTarget {
     readonly logicalXDPI: number;
     readonly logicalYDPI: number;
     readonly msOrientation: string;
-    onmsorientationchange: (this: this, ev: Event) => any;
+    onmsorientationchange: (this: Screen, ev: Event) => any;
     readonly pixelDepth: number;
     readonly systemXDPI: number;
     readonly systemYDPI: number;
     readonly width: number;
     msLockOrientation(orientations: string | string[]): boolean;
     msUnlockOrientation(): void;
-    addEventListener(type: "MSOrientationChange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof ScreenEventMap>(type: K, listener: (this: Screen, ev: ScreenEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -11336,10 +10362,14 @@ declare var ScriptNotifyEvent: {
     new(): ScriptNotifyEvent;
 }
 
+interface ScriptProcessorNodeEventMap {
+    "audioprocess": AudioProcessingEvent;
+}
+
 interface ScriptProcessorNode extends AudioNode {
     readonly bufferSize: number;
-    onaudioprocess: (this: this, ev: AudioProcessingEvent) => any;
-    addEventListener(type: "audioprocess", listener: (this: this, ev: AudioProcessingEvent) => any, useCapture?: boolean): void;
+    onaudioprocess: (this: ScriptProcessorNode, ev: AudioProcessingEvent) => any;
+    addEventListener<K extends keyof ScriptProcessorNodeEventMap>(type: K, listener: (this: ScriptProcessorNode, ev: ScriptProcessorNodeEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -11521,6 +10551,7 @@ declare var SubtleCrypto: {
 
 interface Text extends CharacterData {
     readonly wholeText: string;
+    readonly assignedSlot: HTMLSlotElement | null;
     splitText(offset: number): Text;
 }
 
@@ -11570,6 +10601,12 @@ declare var TextMetrics: {
     new(): TextMetrics;
 }
 
+interface TextTrackEventMap {
+    "cuechange": Event;
+    "error": ErrorEvent;
+    "load": Event;
+}
+
 interface TextTrack extends EventTarget {
     readonly activeCues: TextTrackCueList;
     readonly cues: TextTrackCueList;
@@ -11578,9 +10615,9 @@ interface TextTrack extends EventTarget {
     readonly label: string;
     readonly language: string;
     mode: any;
-    oncuechange: (this: this, ev: Event) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
-    onload: (this: this, ev: Event) => any;
+    oncuechange: (this: TextTrack, ev: Event) => any;
+    onerror: (this: TextTrack, ev: ErrorEvent) => any;
+    onload: (this: TextTrack, ev: Event) => any;
     readonly readyState: number;
     addCue(cue: TextTrackCue): void;
     removeCue(cue: TextTrackCue): void;
@@ -11591,9 +10628,7 @@ interface TextTrack extends EventTarget {
     readonly LOADING: number;
     readonly NONE: number;
     readonly SHOWING: number;
-    addEventListener(type: "cuechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof TextTrackEventMap>(type: K, listener: (this: TextTrack, ev: TextTrackEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -11609,18 +10644,22 @@ declare var TextTrack: {
     readonly SHOWING: number;
 }
 
+interface TextTrackCueEventMap {
+    "enter": Event;
+    "exit": Event;
+}
+
 interface TextTrackCue extends EventTarget {
     endTime: number;
     id: string;
-    onenter: (this: this, ev: Event) => any;
-    onexit: (this: this, ev: Event) => any;
+    onenter: (this: TextTrackCue, ev: Event) => any;
+    onexit: (this: TextTrackCue, ev: Event) => any;
     pauseOnExit: boolean;
     startTime: number;
     text: string;
     readonly track: TextTrack;
     getCueAsHTML(): DocumentFragment;
-    addEventListener(type: "enter", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "exit", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof TextTrackCueEventMap>(type: K, listener: (this: TextTrackCue, ev: TextTrackCueEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -11641,11 +10680,15 @@ declare var TextTrackCueList: {
     new(): TextTrackCueList;
 }
 
+interface TextTrackListEventMap {
+    "addtrack": TrackEvent;
+}
+
 interface TextTrackList extends EventTarget {
     readonly length: number;
-    onaddtrack: ((this: this, ev: TrackEvent) => any) | null;
+    onaddtrack: ((this: TextTrackList, ev: TrackEvent) => any) | null;
     item(index: number): TextTrack;
-    addEventListener(type: "addtrack", listener: (this: this, ev: TrackEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof TextTrackListEventMap>(type: K, listener: (this: TextTrackList, ev: TextTrackListEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
     [index: number]: TextTrack;
 }
@@ -11835,17 +10878,21 @@ declare var VideoTrack: {
     new(): VideoTrack;
 }
 
+interface VideoTrackListEventMap {
+    "addtrack": TrackEvent;
+    "change": Event;
+    "removetrack": TrackEvent;
+}
+
 interface VideoTrackList extends EventTarget {
     readonly length: number;
-    onaddtrack: (this: this, ev: TrackEvent) => any;
-    onchange: (this: this, ev: Event) => any;
-    onremovetrack: (this: this, ev: TrackEvent) => any;
+    onaddtrack: (this: VideoTrackList, ev: TrackEvent) => any;
+    onchange: (this: VideoTrackList, ev: Event) => any;
+    onremovetrack: (this: VideoTrackList, ev: TrackEvent) => any;
     readonly selectedIndex: number;
     getTrackById(id: string): VideoTrack | null;
     item(index: number): VideoTrack;
-    addEventListener(type: "addtrack", listener: (this: this, ev: TrackEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "removetrack", listener: (this: this, ev: TrackEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof VideoTrackListEventMap>(type: K, listener: (this: VideoTrackList, ev: VideoTrackListEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
     [index: number]: VideoTrack;
 }
@@ -12791,14 +11838,21 @@ declare var WebKitPoint: {
     new(x?: number, y?: number): WebKitPoint;
 }
 
+interface WebSocketEventMap {
+    "close": CloseEvent;
+    "error": ErrorEvent;
+    "message": MessageEvent;
+    "open": Event;
+}
+
 interface WebSocket extends EventTarget {
     binaryType: string;
     readonly bufferedAmount: number;
     readonly extensions: string;
-    onclose: (this: this, ev: CloseEvent) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
-    onmessage: (this: this, ev: MessageEvent) => any;
-    onopen: (this: this, ev: Event) => any;
+    onclose: (this: WebSocket, ev: CloseEvent) => any;
+    onerror: (this: WebSocket, ev: ErrorEvent) => any;
+    onmessage: (this: WebSocket, ev: MessageEvent) => any;
+    onopen: (this: WebSocket, ev: Event) => any;
     readonly protocol: string;
     readonly readyState: number;
     readonly url: string;
@@ -12808,10 +11862,7 @@ interface WebSocket extends EventTarget {
     readonly CLOSING: number;
     readonly CONNECTING: number;
     readonly OPEN: number;
-    addEventListener(type: "close", listener: (this: this, ev: CloseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "message", listener: (this: this, ev: MessageEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "open", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof WebSocketEventMap>(type: K, listener: (this: WebSocket, ev: WebSocketEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -12847,6 +11898,95 @@ declare var WheelEvent: {
     readonly DOM_DELTA_PIXEL: number;
 }
 
+interface WindowEventMap extends GlobalEventHandlersEventMap {
+    "abort": UIEvent;
+    "afterprint": Event;
+    "beforeprint": Event;
+    "beforeunload": BeforeUnloadEvent;
+    "blur": FocusEvent;
+    "canplay": Event;
+    "canplaythrough": Event;
+    "change": Event;
+    "click": MouseEvent;
+    "compassneedscalibration": Event;
+    "contextmenu": PointerEvent;
+    "dblclick": MouseEvent;
+    "devicelight": DeviceLightEvent;
+    "devicemotion": DeviceMotionEvent;
+    "deviceorientation": DeviceOrientationEvent;
+    "drag": DragEvent;
+    "dragend": DragEvent;
+    "dragenter": DragEvent;
+    "dragleave": DragEvent;
+    "dragover": DragEvent;
+    "dragstart": DragEvent;
+    "drop": DragEvent;
+    "durationchange": Event;
+    "emptied": Event;
+    "ended": MediaStreamErrorEvent;
+    "focus": FocusEvent;
+    "hashchange": HashChangeEvent;
+    "input": Event;
+    "invalid": Event;
+    "keydown": KeyboardEvent;
+    "keypress": KeyboardEvent;
+    "keyup": KeyboardEvent;
+    "load": Event;
+    "loadeddata": Event;
+    "loadedmetadata": Event;
+    "loadstart": Event;
+    "message": MessageEvent;
+    "mousedown": MouseEvent;
+    "mouseenter": MouseEvent;
+    "mouseleave": MouseEvent;
+    "mousemove": MouseEvent;
+    "mouseout": MouseEvent;
+    "mouseover": MouseEvent;
+    "mouseup": MouseEvent;
+    "mousewheel": WheelEvent;
+    "MSGestureChange": MSGestureEvent;
+    "MSGestureDoubleTap": MSGestureEvent;
+    "MSGestureEnd": MSGestureEvent;
+    "MSGestureHold": MSGestureEvent;
+    "MSGestureStart": MSGestureEvent;
+    "MSGestureTap": MSGestureEvent;
+    "MSInertiaStart": MSGestureEvent;
+    "MSPointerCancel": MSPointerEvent;
+    "MSPointerDown": MSPointerEvent;
+    "MSPointerEnter": MSPointerEvent;
+    "MSPointerLeave": MSPointerEvent;
+    "MSPointerMove": MSPointerEvent;
+    "MSPointerOut": MSPointerEvent;
+    "MSPointerOver": MSPointerEvent;
+    "MSPointerUp": MSPointerEvent;
+    "offline": Event;
+    "online": Event;
+    "orientationchange": Event;
+    "pagehide": PageTransitionEvent;
+    "pageshow": PageTransitionEvent;
+    "pause": Event;
+    "play": Event;
+    "playing": Event;
+    "popstate": PopStateEvent;
+    "progress": ProgressEvent;
+    "ratechange": Event;
+    "readystatechange": ProgressEvent;
+    "reset": Event;
+    "resize": UIEvent;
+    "scroll": UIEvent;
+    "seeked": Event;
+    "seeking": Event;
+    "select": UIEvent;
+    "stalled": Event;
+    "storage": StorageEvent;
+    "submit": Event;
+    "suspend": Event;
+    "timeupdate": Event;
+    "unload": Event;
+    "volumechange": Event;
+    "waiting": Event;
+}
+
 interface Window extends EventTarget, WindowTimers, WindowSessionStorage, WindowLocalStorage, WindowConsole, GlobalEventHandlers, IDBEnvironment, WindowBase64 {
     readonly applicationCache: ApplicationCache;
     readonly clientInformation: Navigator;
@@ -12871,97 +12011,97 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     name: string;
     readonly navigator: Navigator;
     offscreenBuffering: string | boolean;
-    onabort: (this: this, ev: UIEvent) => any;
-    onafterprint: (this: this, ev: Event) => any;
-    onbeforeprint: (this: this, ev: Event) => any;
-    onbeforeunload: (this: this, ev: BeforeUnloadEvent) => any;
-    onblur: (this: this, ev: FocusEvent) => any;
-    oncanplay: (this: this, ev: Event) => any;
-    oncanplaythrough: (this: this, ev: Event) => any;
-    onchange: (this: this, ev: Event) => any;
-    onclick: (this: this, ev: MouseEvent) => any;
-    oncompassneedscalibration: (this: this, ev: Event) => any;
-    oncontextmenu: (this: this, ev: PointerEvent) => any;
-    ondblclick: (this: this, ev: MouseEvent) => any;
-    ondevicelight: (this: this, ev: DeviceLightEvent) => any;
-    ondevicemotion: (this: this, ev: DeviceMotionEvent) => any;
-    ondeviceorientation: (this: this, ev: DeviceOrientationEvent) => any;
-    ondrag: (this: this, ev: DragEvent) => any;
-    ondragend: (this: this, ev: DragEvent) => any;
-    ondragenter: (this: this, ev: DragEvent) => any;
-    ondragleave: (this: this, ev: DragEvent) => any;
-    ondragover: (this: this, ev: DragEvent) => any;
-    ondragstart: (this: this, ev: DragEvent) => any;
-    ondrop: (this: this, ev: DragEvent) => any;
-    ondurationchange: (this: this, ev: Event) => any;
-    onemptied: (this: this, ev: Event) => any;
-    onended: (this: this, ev: MediaStreamErrorEvent) => any;
+    onabort: (this: Window, ev: UIEvent) => any;
+    onafterprint: (this: Window, ev: Event) => any;
+    onbeforeprint: (this: Window, ev: Event) => any;
+    onbeforeunload: (this: Window, ev: BeforeUnloadEvent) => any;
+    onblur: (this: Window, ev: FocusEvent) => any;
+    oncanplay: (this: Window, ev: Event) => any;
+    oncanplaythrough: (this: Window, ev: Event) => any;
+    onchange: (this: Window, ev: Event) => any;
+    onclick: (this: Window, ev: MouseEvent) => any;
+    oncompassneedscalibration: (this: Window, ev: Event) => any;
+    oncontextmenu: (this: Window, ev: PointerEvent) => any;
+    ondblclick: (this: Window, ev: MouseEvent) => any;
+    ondevicelight: (this: Window, ev: DeviceLightEvent) => any;
+    ondevicemotion: (this: Window, ev: DeviceMotionEvent) => any;
+    ondeviceorientation: (this: Window, ev: DeviceOrientationEvent) => any;
+    ondrag: (this: Window, ev: DragEvent) => any;
+    ondragend: (this: Window, ev: DragEvent) => any;
+    ondragenter: (this: Window, ev: DragEvent) => any;
+    ondragleave: (this: Window, ev: DragEvent) => any;
+    ondragover: (this: Window, ev: DragEvent) => any;
+    ondragstart: (this: Window, ev: DragEvent) => any;
+    ondrop: (this: Window, ev: DragEvent) => any;
+    ondurationchange: (this: Window, ev: Event) => any;
+    onemptied: (this: Window, ev: Event) => any;
+    onended: (this: Window, ev: MediaStreamErrorEvent) => any;
     onerror: ErrorEventHandler;
-    onfocus: (this: this, ev: FocusEvent) => any;
-    onhashchange: (this: this, ev: HashChangeEvent) => any;
-    oninput: (this: this, ev: Event) => any;
-    oninvalid: (this: this, ev: Event) => any;
-    onkeydown: (this: this, ev: KeyboardEvent) => any;
-    onkeypress: (this: this, ev: KeyboardEvent) => any;
-    onkeyup: (this: this, ev: KeyboardEvent) => any;
-    onload: (this: this, ev: Event) => any;
-    onloadeddata: (this: this, ev: Event) => any;
-    onloadedmetadata: (this: this, ev: Event) => any;
-    onloadstart: (this: this, ev: Event) => any;
-    onmessage: (this: this, ev: MessageEvent) => any;
-    onmousedown: (this: this, ev: MouseEvent) => any;
-    onmouseenter: (this: this, ev: MouseEvent) => any;
-    onmouseleave: (this: this, ev: MouseEvent) => any;
-    onmousemove: (this: this, ev: MouseEvent) => any;
-    onmouseout: (this: this, ev: MouseEvent) => any;
-    onmouseover: (this: this, ev: MouseEvent) => any;
-    onmouseup: (this: this, ev: MouseEvent) => any;
-    onmousewheel: (this: this, ev: WheelEvent) => any;
-    onmsgesturechange: (this: this, ev: MSGestureEvent) => any;
-    onmsgesturedoubletap: (this: this, ev: MSGestureEvent) => any;
-    onmsgestureend: (this: this, ev: MSGestureEvent) => any;
-    onmsgesturehold: (this: this, ev: MSGestureEvent) => any;
-    onmsgesturestart: (this: this, ev: MSGestureEvent) => any;
-    onmsgesturetap: (this: this, ev: MSGestureEvent) => any;
-    onmsinertiastart: (this: this, ev: MSGestureEvent) => any;
-    onmspointercancel: (this: this, ev: MSPointerEvent) => any;
-    onmspointerdown: (this: this, ev: MSPointerEvent) => any;
-    onmspointerenter: (this: this, ev: MSPointerEvent) => any;
-    onmspointerleave: (this: this, ev: MSPointerEvent) => any;
-    onmspointermove: (this: this, ev: MSPointerEvent) => any;
-    onmspointerout: (this: this, ev: MSPointerEvent) => any;
-    onmspointerover: (this: this, ev: MSPointerEvent) => any;
-    onmspointerup: (this: this, ev: MSPointerEvent) => any;
-    onoffline: (this: this, ev: Event) => any;
-    ononline: (this: this, ev: Event) => any;
-    onorientationchange: (this: this, ev: Event) => any;
-    onpagehide: (this: this, ev: PageTransitionEvent) => any;
-    onpageshow: (this: this, ev: PageTransitionEvent) => any;
-    onpause: (this: this, ev: Event) => any;
-    onplay: (this: this, ev: Event) => any;
-    onplaying: (this: this, ev: Event) => any;
-    onpopstate: (this: this, ev: PopStateEvent) => any;
-    onprogress: (this: this, ev: ProgressEvent) => any;
-    onratechange: (this: this, ev: Event) => any;
-    onreadystatechange: (this: this, ev: ProgressEvent) => any;
-    onreset: (this: this, ev: Event) => any;
-    onresize: (this: this, ev: UIEvent) => any;
-    onscroll: (this: this, ev: UIEvent) => any;
-    onseeked: (this: this, ev: Event) => any;
-    onseeking: (this: this, ev: Event) => any;
-    onselect: (this: this, ev: UIEvent) => any;
-    onstalled: (this: this, ev: Event) => any;
-    onstorage: (this: this, ev: StorageEvent) => any;
-    onsubmit: (this: this, ev: Event) => any;
-    onsuspend: (this: this, ev: Event) => any;
-    ontimeupdate: (this: this, ev: Event) => any;
+    onfocus: (this: Window, ev: FocusEvent) => any;
+    onhashchange: (this: Window, ev: HashChangeEvent) => any;
+    oninput: (this: Window, ev: Event) => any;
+    oninvalid: (this: Window, ev: Event) => any;
+    onkeydown: (this: Window, ev: KeyboardEvent) => any;
+    onkeypress: (this: Window, ev: KeyboardEvent) => any;
+    onkeyup: (this: Window, ev: KeyboardEvent) => any;
+    onload: (this: Window, ev: Event) => any;
+    onloadeddata: (this: Window, ev: Event) => any;
+    onloadedmetadata: (this: Window, ev: Event) => any;
+    onloadstart: (this: Window, ev: Event) => any;
+    onmessage: (this: Window, ev: MessageEvent) => any;
+    onmousedown: (this: Window, ev: MouseEvent) => any;
+    onmouseenter: (this: Window, ev: MouseEvent) => any;
+    onmouseleave: (this: Window, ev: MouseEvent) => any;
+    onmousemove: (this: Window, ev: MouseEvent) => any;
+    onmouseout: (this: Window, ev: MouseEvent) => any;
+    onmouseover: (this: Window, ev: MouseEvent) => any;
+    onmouseup: (this: Window, ev: MouseEvent) => any;
+    onmousewheel: (this: Window, ev: WheelEvent) => any;
+    onmsgesturechange: (this: Window, ev: MSGestureEvent) => any;
+    onmsgesturedoubletap: (this: Window, ev: MSGestureEvent) => any;
+    onmsgestureend: (this: Window, ev: MSGestureEvent) => any;
+    onmsgesturehold: (this: Window, ev: MSGestureEvent) => any;
+    onmsgesturestart: (this: Window, ev: MSGestureEvent) => any;
+    onmsgesturetap: (this: Window, ev: MSGestureEvent) => any;
+    onmsinertiastart: (this: Window, ev: MSGestureEvent) => any;
+    onmspointercancel: (this: Window, ev: MSPointerEvent) => any;
+    onmspointerdown: (this: Window, ev: MSPointerEvent) => any;
+    onmspointerenter: (this: Window, ev: MSPointerEvent) => any;
+    onmspointerleave: (this: Window, ev: MSPointerEvent) => any;
+    onmspointermove: (this: Window, ev: MSPointerEvent) => any;
+    onmspointerout: (this: Window, ev: MSPointerEvent) => any;
+    onmspointerover: (this: Window, ev: MSPointerEvent) => any;
+    onmspointerup: (this: Window, ev: MSPointerEvent) => any;
+    onoffline: (this: Window, ev: Event) => any;
+    ononline: (this: Window, ev: Event) => any;
+    onorientationchange: (this: Window, ev: Event) => any;
+    onpagehide: (this: Window, ev: PageTransitionEvent) => any;
+    onpageshow: (this: Window, ev: PageTransitionEvent) => any;
+    onpause: (this: Window, ev: Event) => any;
+    onplay: (this: Window, ev: Event) => any;
+    onplaying: (this: Window, ev: Event) => any;
+    onpopstate: (this: Window, ev: PopStateEvent) => any;
+    onprogress: (this: Window, ev: ProgressEvent) => any;
+    onratechange: (this: Window, ev: Event) => any;
+    onreadystatechange: (this: Window, ev: ProgressEvent) => any;
+    onreset: (this: Window, ev: Event) => any;
+    onresize: (this: Window, ev: UIEvent) => any;
+    onscroll: (this: Window, ev: UIEvent) => any;
+    onseeked: (this: Window, ev: Event) => any;
+    onseeking: (this: Window, ev: Event) => any;
+    onselect: (this: Window, ev: UIEvent) => any;
+    onstalled: (this: Window, ev: Event) => any;
+    onstorage: (this: Window, ev: StorageEvent) => any;
+    onsubmit: (this: Window, ev: Event) => any;
+    onsuspend: (this: Window, ev: Event) => any;
+    ontimeupdate: (this: Window, ev: Event) => any;
     ontouchcancel: (ev: TouchEvent) => any;
     ontouchend: (ev: TouchEvent) => any;
     ontouchmove: (ev: TouchEvent) => any;
     ontouchstart: (ev: TouchEvent) => any;
-    onunload: (this: this, ev: Event) => any;
-    onvolumechange: (this: this, ev: Event) => any;
-    onwaiting: (this: this, ev: Event) => any;
+    onunload: (this: Window, ev: Event) => any;
+    onvolumechange: (this: Window, ev: Event) => any;
+    onwaiting: (this: Window, ev: Event) => any;
     opener: any;
     orientation: string | number;
     readonly outerHeight: number;
@@ -13020,101 +12160,7 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     scroll(options?: ScrollToOptions): void;
     scrollTo(options?: ScrollToOptions): void;
     scrollBy(options?: ScrollToOptions): void;
-    addEventListener(type: "MSGestureChange", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "abort", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "afterprint", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeprint", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeunload", listener: (this: this, ev: BeforeUnloadEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplay", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplaythrough", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "compassneedscalibration", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "contextmenu", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "devicelight", listener: (this: this, ev: DeviceLightEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "devicemotion", listener: (this: this, ev: DeviceMotionEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "deviceorientation", listener: (this: this, ev: DeviceOrientationEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drag", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragend", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragenter", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragleave", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragover", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragstart", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drop", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "durationchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "emptied", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (this: this, ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "hashchange", listener: (this: this, ev: HashChangeEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "input", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "invalid", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "keydown", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keypress", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keyup", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadeddata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadedmetadata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "message", listener: (this: this, ev: MessageEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseenter", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseleave", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "offline", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "online", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "orientationchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pagehide", listener: (this: this, ev: PageTransitionEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pageshow", listener: (this: this, ev: PageTransitionEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pause", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "play", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "playing", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "popstate", listener: (this: this, ev: PopStateEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ratechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "readystatechange", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "reset", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "resize", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "scroll", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeked", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeking", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "select", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "stalled", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "storage", listener: (this: this, ev: StorageEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "submit", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "suspend", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeupdate", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "unload", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "volumechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "waiting", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof WindowEventMap>(type: K, listener: (this: Window, ev: WindowEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -13123,12 +12169,15 @@ declare var Window: {
     new(): Window;
 }
 
+interface WorkerEventMap extends AbstractWorkerEventMap {
+    "message": MessageEvent;
+}
+
 interface Worker extends EventTarget, AbstractWorker {
-    onmessage: (this: this, ev: MessageEvent) => any;
+    onmessage: (this: Worker, ev: MessageEvent) => any;
     postMessage(message: any, ports?: any): void;
     terminate(): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "message", listener: (this: this, ev: MessageEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof WorkerEventMap>(type: K, listener: (this: Worker, ev: WorkerEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -13138,6 +12187,8 @@ declare var Worker: {
 }
 
 interface XMLDocument extends Document {
+    addEventListener<K extends keyof DocumentEventMap>(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var XMLDocument: {
@@ -13145,8 +12196,12 @@ declare var XMLDocument: {
     new(): XMLDocument;
 }
 
+interface XMLHttpRequestEventMap extends XMLHttpRequestEventTargetEventMap {
+    "readystatechange": Event;
+}
+
 interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
-    onreadystatechange: (this: this, ev: Event) => any;
+    onreadystatechange: (this: XMLHttpRequest, ev: Event) => any;
     readonly readyState: number;
     readonly response: any;
     readonly responseText: string;
@@ -13174,14 +12229,7 @@ interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
     readonly LOADING: number;
     readonly OPENED: number;
     readonly UNSENT: number;
-    addEventListener(type: "abort", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadend", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "readystatechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeout", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof XMLHttpRequestEventMap>(type: K, listener: (this: XMLHttpRequest, ev: XMLHttpRequestEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -13197,6 +12245,7 @@ declare var XMLHttpRequest: {
 }
 
 interface XMLHttpRequestUpload extends EventTarget, XMLHttpRequestEventTarget {
+    addEventListener<K extends keyof XMLHttpRequestEventTargetEventMap>(type: K, listener: (this: XMLHttpRequestEventTarget, ev: XMLHttpRequestEventTargetEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -13217,7 +12266,7 @@ declare var XMLSerializer: {
 interface XPathEvaluator {
     createExpression(expression: string, resolver: XPathNSResolver): XPathExpression;
     createNSResolver(nodeResolver?: Node): XPathNSResolver;
-    evaluate(expression: string, contextNode: Node, resolver: XPathNSResolver, type: number, result: XPathResult): XPathResult;
+    evaluate(expression: string, contextNode: Node, resolver: XPathNSResolver | null, type: number, result: XPathResult | null): XPathResult;
 }
 
 declare var XPathEvaluator: {
@@ -13226,7 +12275,7 @@ declare var XPathEvaluator: {
 }
 
 interface XPathExpression {
-    evaluate(contextNode: Node, type: number, result: XPathResult): XPathExpression;
+    evaluate(contextNode: Node, type: number, result: XPathResult | null): XPathResult;
 }
 
 declare var XPathExpression: {
@@ -13296,9 +12345,13 @@ declare var XSLTProcessor: {
     new(): XSLTProcessor;
 }
 
+interface AbstractWorkerEventMap {
+    "error": ErrorEvent;
+}
+
 interface AbstractWorker {
-    onerror: (this: this, ev: ErrorEvent) => any;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
+    onerror: (this: AbstractWorker, ev: ErrorEvent) => any;
+    addEventListener<K extends keyof AbstractWorkerEventMap>(type: K, listener: (this: AbstractWorker, ev: AbstractWorkerEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -13409,25 +12462,29 @@ interface GetSVGDocument {
     getSVGDocument(): Document;
 }
 
+interface GlobalEventHandlersEventMap {
+    "pointercancel": PointerEvent;
+    "pointerdown": PointerEvent;
+    "pointerenter": PointerEvent;
+    "pointerleave": PointerEvent;
+    "pointermove": PointerEvent;
+    "pointerout": PointerEvent;
+    "pointerover": PointerEvent;
+    "pointerup": PointerEvent;
+    "wheel": WheelEvent;
+}
+
 interface GlobalEventHandlers {
-    onpointercancel: (this: this, ev: PointerEvent) => any;
-    onpointerdown: (this: this, ev: PointerEvent) => any;
-    onpointerenter: (this: this, ev: PointerEvent) => any;
-    onpointerleave: (this: this, ev: PointerEvent) => any;
-    onpointermove: (this: this, ev: PointerEvent) => any;
-    onpointerout: (this: this, ev: PointerEvent) => any;
-    onpointerover: (this: this, ev: PointerEvent) => any;
-    onpointerup: (this: this, ev: PointerEvent) => any;
-    onwheel: (this: this, ev: WheelEvent) => any;
-    addEventListener(type: "pointercancel", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
+    onpointercancel: (this: GlobalEventHandlers, ev: PointerEvent) => any;
+    onpointerdown: (this: GlobalEventHandlers, ev: PointerEvent) => any;
+    onpointerenter: (this: GlobalEventHandlers, ev: PointerEvent) => any;
+    onpointerleave: (this: GlobalEventHandlers, ev: PointerEvent) => any;
+    onpointermove: (this: GlobalEventHandlers, ev: PointerEvent) => any;
+    onpointerout: (this: GlobalEventHandlers, ev: PointerEvent) => any;
+    onpointerover: (this: GlobalEventHandlers, ev: PointerEvent) => any;
+    onpointerup: (this: GlobalEventHandlers, ev: PointerEvent) => any;
+    onwheel: (this: GlobalEventHandlers, ev: WheelEvent) => any;
+    addEventListener<K extends keyof GlobalEventHandlersEventMap>(type: K, listener: (this: GlobalEventHandlers, ev: GlobalEventHandlersEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -13454,25 +12511,29 @@ interface LinkStyle {
     readonly sheet: StyleSheet;
 }
 
+interface MSBaseReaderEventMap {
+    "abort": Event;
+    "error": ErrorEvent;
+    "load": Event;
+    "loadend": ProgressEvent;
+    "loadstart": Event;
+    "progress": ProgressEvent;
+}
+
 interface MSBaseReader {
-    onabort: (this: this, ev: Event) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
-    onload: (this: this, ev: Event) => any;
-    onloadend: (this: this, ev: ProgressEvent) => any;
-    onloadstart: (this: this, ev: Event) => any;
-    onprogress: (this: this, ev: ProgressEvent) => any;
+    onabort: (this: MSBaseReader, ev: Event) => any;
+    onerror: (this: MSBaseReader, ev: ErrorEvent) => any;
+    onload: (this: MSBaseReader, ev: Event) => any;
+    onloadend: (this: MSBaseReader, ev: ProgressEvent) => any;
+    onloadstart: (this: MSBaseReader, ev: Event) => any;
+    onprogress: (this: MSBaseReader, ev: ProgressEvent) => any;
     readonly readyState: number;
     readonly result: any;
     abort(): void;
     readonly DONE: number;
     readonly EMPTY: number;
     readonly LOADING: number;
-    addEventListener(type: "abort", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadend", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof MSBaseReaderEventMap>(type: K, listener: (this: MSBaseReader, ev: MSBaseReaderEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -13521,359 +12582,9 @@ interface NavigatorUserMedia {
 }
 
 interface NodeSelector {
-    querySelector(selectors: "a"): HTMLAnchorElement | null;
-    querySelector(selectors: "abbr"): HTMLElement | null;
-    querySelector(selectors: "acronym"): HTMLElement | null;
-    querySelector(selectors: "address"): HTMLElement | null;
-    querySelector(selectors: "applet"): HTMLAppletElement | null;
-    querySelector(selectors: "area"): HTMLAreaElement | null;
-    querySelector(selectors: "article"): HTMLElement | null;
-    querySelector(selectors: "aside"): HTMLElement | null;
-    querySelector(selectors: "audio"): HTMLAudioElement | null;
-    querySelector(selectors: "b"): HTMLElement | null;
-    querySelector(selectors: "base"): HTMLBaseElement | null;
-    querySelector(selectors: "basefont"): HTMLBaseFontElement | null;
-    querySelector(selectors: "bdo"): HTMLElement | null;
-    querySelector(selectors: "big"): HTMLElement | null;
-    querySelector(selectors: "blockquote"): HTMLQuoteElement | null;
-    querySelector(selectors: "body"): HTMLBodyElement | null;
-    querySelector(selectors: "br"): HTMLBRElement | null;
-    querySelector(selectors: "button"): HTMLButtonElement | null;
-    querySelector(selectors: "canvas"): HTMLCanvasElement | null;
-    querySelector(selectors: "caption"): HTMLTableCaptionElement | null;
-    querySelector(selectors: "center"): HTMLElement | null;
-    querySelector(selectors: "circle"): SVGCircleElement | null;
-    querySelector(selectors: "cite"): HTMLElement | null;
-    querySelector(selectors: "clippath"): SVGClipPathElement | null;
-    querySelector(selectors: "code"): HTMLElement | null;
-    querySelector(selectors: "col"): HTMLTableColElement | null;
-    querySelector(selectors: "colgroup"): HTMLTableColElement | null;
-    querySelector(selectors: "datalist"): HTMLDataListElement | null;
-    querySelector(selectors: "dd"): HTMLElement | null;
-    querySelector(selectors: "defs"): SVGDefsElement | null;
-    querySelector(selectors: "del"): HTMLModElement | null;
-    querySelector(selectors: "desc"): SVGDescElement | null;
-    querySelector(selectors: "dfn"): HTMLElement | null;
-    querySelector(selectors: "dir"): HTMLDirectoryElement | null;
-    querySelector(selectors: "div"): HTMLDivElement | null;
-    querySelector(selectors: "dl"): HTMLDListElement | null;
-    querySelector(selectors: "dt"): HTMLElement | null;
-    querySelector(selectors: "ellipse"): SVGEllipseElement | null;
-    querySelector(selectors: "em"): HTMLElement | null;
-    querySelector(selectors: "embed"): HTMLEmbedElement | null;
-    querySelector(selectors: "feblend"): SVGFEBlendElement | null;
-    querySelector(selectors: "fecolormatrix"): SVGFEColorMatrixElement | null;
-    querySelector(selectors: "fecomponenttransfer"): SVGFEComponentTransferElement | null;
-    querySelector(selectors: "fecomposite"): SVGFECompositeElement | null;
-    querySelector(selectors: "feconvolvematrix"): SVGFEConvolveMatrixElement | null;
-    querySelector(selectors: "fediffuselighting"): SVGFEDiffuseLightingElement | null;
-    querySelector(selectors: "fedisplacementmap"): SVGFEDisplacementMapElement | null;
-    querySelector(selectors: "fedistantlight"): SVGFEDistantLightElement | null;
-    querySelector(selectors: "feflood"): SVGFEFloodElement | null;
-    querySelector(selectors: "fefunca"): SVGFEFuncAElement | null;
-    querySelector(selectors: "fefuncb"): SVGFEFuncBElement | null;
-    querySelector(selectors: "fefuncg"): SVGFEFuncGElement | null;
-    querySelector(selectors: "fefuncr"): SVGFEFuncRElement | null;
-    querySelector(selectors: "fegaussianblur"): SVGFEGaussianBlurElement | null;
-    querySelector(selectors: "feimage"): SVGFEImageElement | null;
-    querySelector(selectors: "femerge"): SVGFEMergeElement | null;
-    querySelector(selectors: "femergenode"): SVGFEMergeNodeElement | null;
-    querySelector(selectors: "femorphology"): SVGFEMorphologyElement | null;
-    querySelector(selectors: "feoffset"): SVGFEOffsetElement | null;
-    querySelector(selectors: "fepointlight"): SVGFEPointLightElement | null;
-    querySelector(selectors: "fespecularlighting"): SVGFESpecularLightingElement | null;
-    querySelector(selectors: "fespotlight"): SVGFESpotLightElement | null;
-    querySelector(selectors: "fetile"): SVGFETileElement | null;
-    querySelector(selectors: "feturbulence"): SVGFETurbulenceElement | null;
-    querySelector(selectors: "fieldset"): HTMLFieldSetElement | null;
-    querySelector(selectors: "figcaption"): HTMLElement | null;
-    querySelector(selectors: "figure"): HTMLElement | null;
-    querySelector(selectors: "filter"): SVGFilterElement | null;
-    querySelector(selectors: "font"): HTMLFontElement | null;
-    querySelector(selectors: "footer"): HTMLElement | null;
-    querySelector(selectors: "foreignobject"): SVGForeignObjectElement | null;
-    querySelector(selectors: "form"): HTMLFormElement | null;
-    querySelector(selectors: "frame"): HTMLFrameElement | null;
-    querySelector(selectors: "frameset"): HTMLFrameSetElement | null;
-    querySelector(selectors: "g"): SVGGElement | null;
-    querySelector(selectors: "h1"): HTMLHeadingElement | null;
-    querySelector(selectors: "h2"): HTMLHeadingElement | null;
-    querySelector(selectors: "h3"): HTMLHeadingElement | null;
-    querySelector(selectors: "h4"): HTMLHeadingElement | null;
-    querySelector(selectors: "h5"): HTMLHeadingElement | null;
-    querySelector(selectors: "h6"): HTMLHeadingElement | null;
-    querySelector(selectors: "head"): HTMLHeadElement | null;
-    querySelector(selectors: "header"): HTMLElement | null;
-    querySelector(selectors: "hgroup"): HTMLElement | null;
-    querySelector(selectors: "hr"): HTMLHRElement | null;
-    querySelector(selectors: "html"): HTMLHtmlElement | null;
-    querySelector(selectors: "i"): HTMLElement | null;
-    querySelector(selectors: "iframe"): HTMLIFrameElement | null;
-    querySelector(selectors: "image"): SVGImageElement | null;
-    querySelector(selectors: "img"): HTMLImageElement | null;
-    querySelector(selectors: "input"): HTMLInputElement | null;
-    querySelector(selectors: "ins"): HTMLModElement | null;
-    querySelector(selectors: "isindex"): HTMLUnknownElement | null;
-    querySelector(selectors: "kbd"): HTMLElement | null;
-    querySelector(selectors: "keygen"): HTMLElement | null;
-    querySelector(selectors: "label"): HTMLLabelElement | null;
-    querySelector(selectors: "legend"): HTMLLegendElement | null;
-    querySelector(selectors: "li"): HTMLLIElement | null;
-    querySelector(selectors: "line"): SVGLineElement | null;
-    querySelector(selectors: "lineargradient"): SVGLinearGradientElement | null;
-    querySelector(selectors: "link"): HTMLLinkElement | null;
-    querySelector(selectors: "listing"): HTMLPreElement | null;
-    querySelector(selectors: "map"): HTMLMapElement | null;
-    querySelector(selectors: "mark"): HTMLElement | null;
-    querySelector(selectors: "marker"): SVGMarkerElement | null;
-    querySelector(selectors: "marquee"): HTMLMarqueeElement | null;
-    querySelector(selectors: "mask"): SVGMaskElement | null;
-    querySelector(selectors: "menu"): HTMLMenuElement | null;
-    querySelector(selectors: "meta"): HTMLMetaElement | null;
-    querySelector(selectors: "metadata"): SVGMetadataElement | null;
-    querySelector(selectors: "meter"): HTMLMeterElement | null;
-    querySelector(selectors: "nav"): HTMLElement | null;
-    querySelector(selectors: "nextid"): HTMLUnknownElement | null;
-    querySelector(selectors: "nobr"): HTMLElement | null;
-    querySelector(selectors: "noframes"): HTMLElement | null;
-    querySelector(selectors: "noscript"): HTMLElement | null;
-    querySelector(selectors: "object"): HTMLObjectElement | null;
-    querySelector(selectors: "ol"): HTMLOListElement | null;
-    querySelector(selectors: "optgroup"): HTMLOptGroupElement | null;
-    querySelector(selectors: "option"): HTMLOptionElement | null;
-    querySelector(selectors: "p"): HTMLParagraphElement | null;
-    querySelector(selectors: "param"): HTMLParamElement | null;
-    querySelector(selectors: "path"): SVGPathElement | null;
-    querySelector(selectors: "pattern"): SVGPatternElement | null;
-    querySelector(selectors: "picture"): HTMLPictureElement | null;
-    querySelector(selectors: "plaintext"): HTMLElement | null;
-    querySelector(selectors: "polygon"): SVGPolygonElement | null;
-    querySelector(selectors: "polyline"): SVGPolylineElement | null;
-    querySelector(selectors: "pre"): HTMLPreElement | null;
-    querySelector(selectors: "progress"): HTMLProgressElement | null;
-    querySelector(selectors: "q"): HTMLQuoteElement | null;
-    querySelector(selectors: "radialgradient"): SVGRadialGradientElement | null;
-    querySelector(selectors: "rect"): SVGRectElement | null;
-    querySelector(selectors: "rt"): HTMLElement | null;
-    querySelector(selectors: "ruby"): HTMLElement | null;
-    querySelector(selectors: "s"): HTMLElement | null;
-    querySelector(selectors: "samp"): HTMLElement | null;
-    querySelector(selectors: "script"): HTMLScriptElement | null;
-    querySelector(selectors: "section"): HTMLElement | null;
-    querySelector(selectors: "select"): HTMLSelectElement | null;
-    querySelector(selectors: "small"): HTMLElement | null;
-    querySelector(selectors: "source"): HTMLSourceElement | null;
-    querySelector(selectors: "span"): HTMLSpanElement | null;
-    querySelector(selectors: "stop"): SVGStopElement | null;
-    querySelector(selectors: "strike"): HTMLElement | null;
-    querySelector(selectors: "strong"): HTMLElement | null;
-    querySelector(selectors: "style"): HTMLStyleElement | null;
-    querySelector(selectors: "sub"): HTMLElement | null;
-    querySelector(selectors: "sup"): HTMLElement | null;
-    querySelector(selectors: "svg"): SVGSVGElement | null;
-    querySelector(selectors: "switch"): SVGSwitchElement | null;
-    querySelector(selectors: "symbol"): SVGSymbolElement | null;
-    querySelector(selectors: "table"): HTMLTableElement | null;
-    querySelector(selectors: "tbody"): HTMLTableSectionElement | null;
-    querySelector(selectors: "td"): HTMLTableDataCellElement | null;
-    querySelector(selectors: "template"): HTMLTemplateElement | null;
-    querySelector(selectors: "text"): SVGTextElement | null;
-    querySelector(selectors: "textpath"): SVGTextPathElement | null;
-    querySelector(selectors: "textarea"): HTMLTextAreaElement | null;
-    querySelector(selectors: "tfoot"): HTMLTableSectionElement | null;
-    querySelector(selectors: "th"): HTMLTableHeaderCellElement | null;
-    querySelector(selectors: "thead"): HTMLTableSectionElement | null;
-    querySelector(selectors: "title"): HTMLTitleElement | null;
-    querySelector(selectors: "tr"): HTMLTableRowElement | null;
-    querySelector(selectors: "track"): HTMLTrackElement | null;
-    querySelector(selectors: "tspan"): SVGTSpanElement | null;
-    querySelector(selectors: "tt"): HTMLElement | null;
-    querySelector(selectors: "u"): HTMLElement | null;
-    querySelector(selectors: "ul"): HTMLUListElement | null;
-    querySelector(selectors: "use"): SVGUseElement | null;
-    querySelector(selectors: "var"): HTMLElement | null;
-    querySelector(selectors: "video"): HTMLVideoElement | null;
-    querySelector(selectors: "view"): SVGViewElement | null;
-    querySelector(selectors: "wbr"): HTMLElement | null;
-    querySelector(selectors: "x-ms-webview"): MSHTMLWebViewElement | null;
-    querySelector(selectors: "xmp"): HTMLPreElement | null;
+    querySelector<K extends keyof ElementTagNameMap>(selectors: K): ElementTagNameMap[K] | null;
     querySelector(selectors: string): Element | null;
-    querySelectorAll(selectors: "a"): NodeListOf<HTMLAnchorElement>;
-    querySelectorAll(selectors: "abbr"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "acronym"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "address"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "applet"): NodeListOf<HTMLAppletElement>;
-    querySelectorAll(selectors: "area"): NodeListOf<HTMLAreaElement>;
-    querySelectorAll(selectors: "article"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "aside"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "audio"): NodeListOf<HTMLAudioElement>;
-    querySelectorAll(selectors: "b"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "base"): NodeListOf<HTMLBaseElement>;
-    querySelectorAll(selectors: "basefont"): NodeListOf<HTMLBaseFontElement>;
-    querySelectorAll(selectors: "bdo"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "big"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "blockquote"): NodeListOf<HTMLQuoteElement>;
-    querySelectorAll(selectors: "body"): NodeListOf<HTMLBodyElement>;
-    querySelectorAll(selectors: "br"): NodeListOf<HTMLBRElement>;
-    querySelectorAll(selectors: "button"): NodeListOf<HTMLButtonElement>;
-    querySelectorAll(selectors: "canvas"): NodeListOf<HTMLCanvasElement>;
-    querySelectorAll(selectors: "caption"): NodeListOf<HTMLTableCaptionElement>;
-    querySelectorAll(selectors: "center"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "circle"): NodeListOf<SVGCircleElement>;
-    querySelectorAll(selectors: "cite"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "clippath"): NodeListOf<SVGClipPathElement>;
-    querySelectorAll(selectors: "code"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "col"): NodeListOf<HTMLTableColElement>;
-    querySelectorAll(selectors: "colgroup"): NodeListOf<HTMLTableColElement>;
-    querySelectorAll(selectors: "datalist"): NodeListOf<HTMLDataListElement>;
-    querySelectorAll(selectors: "dd"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "defs"): NodeListOf<SVGDefsElement>;
-    querySelectorAll(selectors: "del"): NodeListOf<HTMLModElement>;
-    querySelectorAll(selectors: "desc"): NodeListOf<SVGDescElement>;
-    querySelectorAll(selectors: "dfn"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "dir"): NodeListOf<HTMLDirectoryElement>;
-    querySelectorAll(selectors: "div"): NodeListOf<HTMLDivElement>;
-    querySelectorAll(selectors: "dl"): NodeListOf<HTMLDListElement>;
-    querySelectorAll(selectors: "dt"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "ellipse"): NodeListOf<SVGEllipseElement>;
-    querySelectorAll(selectors: "em"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "embed"): NodeListOf<HTMLEmbedElement>;
-    querySelectorAll(selectors: "feblend"): NodeListOf<SVGFEBlendElement>;
-    querySelectorAll(selectors: "fecolormatrix"): NodeListOf<SVGFEColorMatrixElement>;
-    querySelectorAll(selectors: "fecomponenttransfer"): NodeListOf<SVGFEComponentTransferElement>;
-    querySelectorAll(selectors: "fecomposite"): NodeListOf<SVGFECompositeElement>;
-    querySelectorAll(selectors: "feconvolvematrix"): NodeListOf<SVGFEConvolveMatrixElement>;
-    querySelectorAll(selectors: "fediffuselighting"): NodeListOf<SVGFEDiffuseLightingElement>;
-    querySelectorAll(selectors: "fedisplacementmap"): NodeListOf<SVGFEDisplacementMapElement>;
-    querySelectorAll(selectors: "fedistantlight"): NodeListOf<SVGFEDistantLightElement>;
-    querySelectorAll(selectors: "feflood"): NodeListOf<SVGFEFloodElement>;
-    querySelectorAll(selectors: "fefunca"): NodeListOf<SVGFEFuncAElement>;
-    querySelectorAll(selectors: "fefuncb"): NodeListOf<SVGFEFuncBElement>;
-    querySelectorAll(selectors: "fefuncg"): NodeListOf<SVGFEFuncGElement>;
-    querySelectorAll(selectors: "fefuncr"): NodeListOf<SVGFEFuncRElement>;
-    querySelectorAll(selectors: "fegaussianblur"): NodeListOf<SVGFEGaussianBlurElement>;
-    querySelectorAll(selectors: "feimage"): NodeListOf<SVGFEImageElement>;
-    querySelectorAll(selectors: "femerge"): NodeListOf<SVGFEMergeElement>;
-    querySelectorAll(selectors: "femergenode"): NodeListOf<SVGFEMergeNodeElement>;
-    querySelectorAll(selectors: "femorphology"): NodeListOf<SVGFEMorphologyElement>;
-    querySelectorAll(selectors: "feoffset"): NodeListOf<SVGFEOffsetElement>;
-    querySelectorAll(selectors: "fepointlight"): NodeListOf<SVGFEPointLightElement>;
-    querySelectorAll(selectors: "fespecularlighting"): NodeListOf<SVGFESpecularLightingElement>;
-    querySelectorAll(selectors: "fespotlight"): NodeListOf<SVGFESpotLightElement>;
-    querySelectorAll(selectors: "fetile"): NodeListOf<SVGFETileElement>;
-    querySelectorAll(selectors: "feturbulence"): NodeListOf<SVGFETurbulenceElement>;
-    querySelectorAll(selectors: "fieldset"): NodeListOf<HTMLFieldSetElement>;
-    querySelectorAll(selectors: "figcaption"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "figure"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "filter"): NodeListOf<SVGFilterElement>;
-    querySelectorAll(selectors: "font"): NodeListOf<HTMLFontElement>;
-    querySelectorAll(selectors: "footer"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "foreignobject"): NodeListOf<SVGForeignObjectElement>;
-    querySelectorAll(selectors: "form"): NodeListOf<HTMLFormElement>;
-    querySelectorAll(selectors: "frame"): NodeListOf<HTMLFrameElement>;
-    querySelectorAll(selectors: "frameset"): NodeListOf<HTMLFrameSetElement>;
-    querySelectorAll(selectors: "g"): NodeListOf<SVGGElement>;
-    querySelectorAll(selectors: "h1"): NodeListOf<HTMLHeadingElement>;
-    querySelectorAll(selectors: "h2"): NodeListOf<HTMLHeadingElement>;
-    querySelectorAll(selectors: "h3"): NodeListOf<HTMLHeadingElement>;
-    querySelectorAll(selectors: "h4"): NodeListOf<HTMLHeadingElement>;
-    querySelectorAll(selectors: "h5"): NodeListOf<HTMLHeadingElement>;
-    querySelectorAll(selectors: "h6"): NodeListOf<HTMLHeadingElement>;
-    querySelectorAll(selectors: "head"): NodeListOf<HTMLHeadElement>;
-    querySelectorAll(selectors: "header"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "hgroup"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "hr"): NodeListOf<HTMLHRElement>;
-    querySelectorAll(selectors: "html"): NodeListOf<HTMLHtmlElement>;
-    querySelectorAll(selectors: "i"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "iframe"): NodeListOf<HTMLIFrameElement>;
-    querySelectorAll(selectors: "image"): NodeListOf<SVGImageElement>;
-    querySelectorAll(selectors: "img"): NodeListOf<HTMLImageElement>;
-    querySelectorAll(selectors: "input"): NodeListOf<HTMLInputElement>;
-    querySelectorAll(selectors: "ins"): NodeListOf<HTMLModElement>;
-    querySelectorAll(selectors: "isindex"): NodeListOf<HTMLUnknownElement>;
-    querySelectorAll(selectors: "kbd"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "keygen"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "label"): NodeListOf<HTMLLabelElement>;
-    querySelectorAll(selectors: "legend"): NodeListOf<HTMLLegendElement>;
-    querySelectorAll(selectors: "li"): NodeListOf<HTMLLIElement>;
-    querySelectorAll(selectors: "line"): NodeListOf<SVGLineElement>;
-    querySelectorAll(selectors: "lineargradient"): NodeListOf<SVGLinearGradientElement>;
-    querySelectorAll(selectors: "link"): NodeListOf<HTMLLinkElement>;
-    querySelectorAll(selectors: "listing"): NodeListOf<HTMLPreElement>;
-    querySelectorAll(selectors: "map"): NodeListOf<HTMLMapElement>;
-    querySelectorAll(selectors: "mark"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "marker"): NodeListOf<SVGMarkerElement>;
-    querySelectorAll(selectors: "marquee"): NodeListOf<HTMLMarqueeElement>;
-    querySelectorAll(selectors: "mask"): NodeListOf<SVGMaskElement>;
-    querySelectorAll(selectors: "menu"): NodeListOf<HTMLMenuElement>;
-    querySelectorAll(selectors: "meta"): NodeListOf<HTMLMetaElement>;
-    querySelectorAll(selectors: "metadata"): NodeListOf<SVGMetadataElement>;
-    querySelectorAll(selectors: "meter"): NodeListOf<HTMLMeterElement>;
-    querySelectorAll(selectors: "nav"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "nextid"): NodeListOf<HTMLUnknownElement>;
-    querySelectorAll(selectors: "nobr"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "noframes"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "noscript"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "object"): NodeListOf<HTMLObjectElement>;
-    querySelectorAll(selectors: "ol"): NodeListOf<HTMLOListElement>;
-    querySelectorAll(selectors: "optgroup"): NodeListOf<HTMLOptGroupElement>;
-    querySelectorAll(selectors: "option"): NodeListOf<HTMLOptionElement>;
-    querySelectorAll(selectors: "p"): NodeListOf<HTMLParagraphElement>;
-    querySelectorAll(selectors: "param"): NodeListOf<HTMLParamElement>;
-    querySelectorAll(selectors: "path"): NodeListOf<SVGPathElement>;
-    querySelectorAll(selectors: "pattern"): NodeListOf<SVGPatternElement>;
-    querySelectorAll(selectors: "picture"): NodeListOf<HTMLPictureElement>;
-    querySelectorAll(selectors: "plaintext"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "polygon"): NodeListOf<SVGPolygonElement>;
-    querySelectorAll(selectors: "polyline"): NodeListOf<SVGPolylineElement>;
-    querySelectorAll(selectors: "pre"): NodeListOf<HTMLPreElement>;
-    querySelectorAll(selectors: "progress"): NodeListOf<HTMLProgressElement>;
-    querySelectorAll(selectors: "q"): NodeListOf<HTMLQuoteElement>;
-    querySelectorAll(selectors: "radialgradient"): NodeListOf<SVGRadialGradientElement>;
-    querySelectorAll(selectors: "rect"): NodeListOf<SVGRectElement>;
-    querySelectorAll(selectors: "rt"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "ruby"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "s"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "samp"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "script"): NodeListOf<HTMLScriptElement>;
-    querySelectorAll(selectors: "section"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "select"): NodeListOf<HTMLSelectElement>;
-    querySelectorAll(selectors: "small"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "source"): NodeListOf<HTMLSourceElement>;
-    querySelectorAll(selectors: "span"): NodeListOf<HTMLSpanElement>;
-    querySelectorAll(selectors: "stop"): NodeListOf<SVGStopElement>;
-    querySelectorAll(selectors: "strike"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "strong"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "style"): NodeListOf<HTMLStyleElement>;
-    querySelectorAll(selectors: "sub"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "sup"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "svg"): NodeListOf<SVGSVGElement>;
-    querySelectorAll(selectors: "switch"): NodeListOf<SVGSwitchElement>;
-    querySelectorAll(selectors: "symbol"): NodeListOf<SVGSymbolElement>;
-    querySelectorAll(selectors: "table"): NodeListOf<HTMLTableElement>;
-    querySelectorAll(selectors: "tbody"): NodeListOf<HTMLTableSectionElement>;
-    querySelectorAll(selectors: "td"): NodeListOf<HTMLTableDataCellElement>;
-    querySelectorAll(selectors: "template"): NodeListOf<HTMLTemplateElement>;
-    querySelectorAll(selectors: "text"): NodeListOf<SVGTextElement>;
-    querySelectorAll(selectors: "textpath"): NodeListOf<SVGTextPathElement>;
-    querySelectorAll(selectors: "textarea"): NodeListOf<HTMLTextAreaElement>;
-    querySelectorAll(selectors: "tfoot"): NodeListOf<HTMLTableSectionElement>;
-    querySelectorAll(selectors: "th"): NodeListOf<HTMLTableHeaderCellElement>;
-    querySelectorAll(selectors: "thead"): NodeListOf<HTMLTableSectionElement>;
-    querySelectorAll(selectors: "title"): NodeListOf<HTMLTitleElement>;
-    querySelectorAll(selectors: "tr"): NodeListOf<HTMLTableRowElement>;
-    querySelectorAll(selectors: "track"): NodeListOf<HTMLTrackElement>;
-    querySelectorAll(selectors: "tspan"): NodeListOf<SVGTSpanElement>;
-    querySelectorAll(selectors: "tt"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "u"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "ul"): NodeListOf<HTMLUListElement>;
-    querySelectorAll(selectors: "use"): NodeListOf<SVGUseElement>;
-    querySelectorAll(selectors: "var"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "video"): NodeListOf<HTMLVideoElement>;
-    querySelectorAll(selectors: "view"): NodeListOf<SVGViewElement>;
-    querySelectorAll(selectors: "wbr"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "x-ms-webview"): NodeListOf<MSHTMLWebViewElement>;
-    querySelectorAll(selectors: "xmp"): NodeListOf<HTMLPreElement>;
+    querySelectorAll<K extends keyof ElementListTagNameMap>(selectors: K): ElementListTagNameMap[K];
     querySelectorAll(selectors: string): NodeListOf<Element>;
 }
 
@@ -13973,21 +12684,25 @@ interface WindowTimersExtension {
     setImmediate(handler: any, ...args: any[]): number;
 }
 
+interface XMLHttpRequestEventTargetEventMap {
+    "abort": Event;
+    "error": ErrorEvent;
+    "load": Event;
+    "loadend": ProgressEvent;
+    "loadstart": Event;
+    "progress": ProgressEvent;
+    "timeout": ProgressEvent;
+}
+
 interface XMLHttpRequestEventTarget {
-    onabort: (this: this, ev: Event) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
-    onload: (this: this, ev: Event) => any;
-    onloadend: (this: this, ev: ProgressEvent) => any;
-    onloadstart: (this: this, ev: Event) => any;
-    onprogress: (this: this, ev: ProgressEvent) => any;
-    ontimeout: (this: this, ev: ProgressEvent) => any;
-    addEventListener(type: "abort", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadend", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeout", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
+    onabort: (this: XMLHttpRequestEventTarget, ev: Event) => any;
+    onerror: (this: XMLHttpRequestEventTarget, ev: ErrorEvent) => any;
+    onload: (this: XMLHttpRequestEventTarget, ev: Event) => any;
+    onloadend: (this: XMLHttpRequestEventTarget, ev: ProgressEvent) => any;
+    onloadstart: (this: XMLHttpRequestEventTarget, ev: Event) => any;
+    onprogress: (this: XMLHttpRequestEventTarget, ev: ProgressEvent) => any;
+    ontimeout: (this: XMLHttpRequestEventTarget, ev: ProgressEvent) => any;
+    addEventListener<K extends keyof XMLHttpRequestEventTargetEventMap>(type: K, listener: (this: XMLHttpRequestEventTarget, ev: XMLHttpRequestEventTargetEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -14247,6 +12962,33 @@ interface ParentNode {
     readonly childElementCount: number;
 }
 
+interface DocumentOrShadowRoot {
+    readonly activeElement: Element | null;
+    readonly stylesheets: StyleSheetList;
+    getSelection(): Selection | null;
+    elementFromPoint(x: number, y: number): Element | null;
+    elementsFromPoint(x: number, y: number): Element[];
+}
+
+interface ShadowRoot extends DocumentOrShadowRoot, DocumentFragment {
+    readonly host: Element;
+    innerHTML: string;
+}
+
+interface ShadowRootInit {
+    mode: 'open'|'closed';
+    delegatesFocus?: boolean;
+}
+
+interface HTMLSlotElement extends HTMLElement {
+    name: string;
+    assignedNodes(options?: AssignedNodesOptions): Node[];
+}
+
+interface AssignedNodesOptions {
+    flatten?: boolean;
+}
+
 declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
 
 interface ErrorEventHandler {
@@ -14294,6 +13036,447 @@ interface NavigatorUserMediaErrorCallback {
 interface ForEachCallback {
     (keyId: any, status: string): void;
 }
+interface HTMLElementTagNameMap {
+    "a": HTMLAnchorElement;
+    "applet": HTMLAppletElement;
+    "area": HTMLAreaElement;
+    "audio": HTMLAudioElement;
+    "base": HTMLBaseElement;
+    "basefont": HTMLBaseFontElement;
+    "blockquote": HTMLQuoteElement;
+    "body": HTMLBodyElement;
+    "br": HTMLBRElement;
+    "button": HTMLButtonElement;
+    "canvas": HTMLCanvasElement;
+    "caption": HTMLTableCaptionElement;
+    "col": HTMLTableColElement;
+    "colgroup": HTMLTableColElement;
+    "datalist": HTMLDataListElement;
+    "del": HTMLModElement;
+    "dir": HTMLDirectoryElement;
+    "div": HTMLDivElement;
+    "dl": HTMLDListElement;
+    "embed": HTMLEmbedElement;
+    "fieldset": HTMLFieldSetElement;
+    "font": HTMLFontElement;
+    "form": HTMLFormElement;
+    "frame": HTMLFrameElement;
+    "frameset": HTMLFrameSetElement;
+    "h1": HTMLHeadingElement;
+    "h2": HTMLHeadingElement;
+    "h3": HTMLHeadingElement;
+    "h4": HTMLHeadingElement;
+    "h5": HTMLHeadingElement;
+    "h6": HTMLHeadingElement;
+    "head": HTMLHeadElement;
+    "hr": HTMLHRElement;
+    "html": HTMLHtmlElement;
+    "iframe": HTMLIFrameElement;
+    "img": HTMLImageElement;
+    "input": HTMLInputElement;
+    "ins": HTMLModElement;
+    "isindex": HTMLUnknownElement;
+    "label": HTMLLabelElement;
+    "legend": HTMLLegendElement;
+    "li": HTMLLIElement;
+    "link": HTMLLinkElement;
+    "listing": HTMLPreElement;
+    "map": HTMLMapElement;
+    "marquee": HTMLMarqueeElement;
+    "menu": HTMLMenuElement;
+    "meta": HTMLMetaElement;
+    "meter": HTMLMeterElement;
+    "nextid": HTMLUnknownElement;
+    "object": HTMLObjectElement;
+    "ol": HTMLOListElement;
+    "optgroup": HTMLOptGroupElement;
+    "option": HTMLOptionElement;
+    "p": HTMLParagraphElement;
+    "param": HTMLParamElement;
+    "picture": HTMLPictureElement;
+    "pre": HTMLPreElement;
+    "progress": HTMLProgressElement;
+    "q": HTMLQuoteElement;
+    "script": HTMLScriptElement;
+    "select": HTMLSelectElement;
+    "source": HTMLSourceElement;
+    "span": HTMLSpanElement;
+    "style": HTMLStyleElement;
+    "table": HTMLTableElement;
+    "tbody": HTMLTableSectionElement;
+    "td": HTMLTableDataCellElement;
+    "template": HTMLTemplateElement;
+    "textarea": HTMLTextAreaElement;
+    "tfoot": HTMLTableSectionElement;
+    "th": HTMLTableHeaderCellElement;
+    "thead": HTMLTableSectionElement;
+    "title": HTMLTitleElement;
+    "tr": HTMLTableRowElement;
+    "track": HTMLTrackElement;
+    "ul": HTMLUListElement;
+    "video": HTMLVideoElement;
+    "x-ms-webview": MSHTMLWebViewElement;
+    "xmp": HTMLPreElement;
+}
+
+interface ElementTagNameMap {
+    "a": HTMLAnchorElement;
+    "abbr": HTMLElement;
+    "acronym": HTMLElement;
+    "address": HTMLElement;
+    "applet": HTMLAppletElement;
+    "area": HTMLAreaElement;
+    "article": HTMLElement;
+    "aside": HTMLElement;
+    "audio": HTMLAudioElement;
+    "b": HTMLElement;
+    "base": HTMLBaseElement;
+    "basefont": HTMLBaseFontElement;
+    "bdo": HTMLElement;
+    "big": HTMLElement;
+    "blockquote": HTMLQuoteElement;
+    "body": HTMLBodyElement;
+    "br": HTMLBRElement;
+    "button": HTMLButtonElement;
+    "canvas": HTMLCanvasElement;
+    "caption": HTMLTableCaptionElement;
+    "center": HTMLElement;
+    "circle": SVGCircleElement;
+    "cite": HTMLElement;
+    "clippath": SVGClipPathElement;
+    "code": HTMLElement;
+    "col": HTMLTableColElement;
+    "colgroup": HTMLTableColElement;
+    "datalist": HTMLDataListElement;
+    "dd": HTMLElement;
+    "defs": SVGDefsElement;
+    "del": HTMLModElement;
+    "desc": SVGDescElement;
+    "dfn": HTMLElement;
+    "dir": HTMLDirectoryElement;
+    "div": HTMLDivElement;
+    "dl": HTMLDListElement;
+    "dt": HTMLElement;
+    "ellipse": SVGEllipseElement;
+    "em": HTMLElement;
+    "embed": HTMLEmbedElement;
+    "feblend": SVGFEBlendElement;
+    "fecolormatrix": SVGFEColorMatrixElement;
+    "fecomponenttransfer": SVGFEComponentTransferElement;
+    "fecomposite": SVGFECompositeElement;
+    "feconvolvematrix": SVGFEConvolveMatrixElement;
+    "fediffuselighting": SVGFEDiffuseLightingElement;
+    "fedisplacementmap": SVGFEDisplacementMapElement;
+    "fedistantlight": SVGFEDistantLightElement;
+    "feflood": SVGFEFloodElement;
+    "fefunca": SVGFEFuncAElement;
+    "fefuncb": SVGFEFuncBElement;
+    "fefuncg": SVGFEFuncGElement;
+    "fefuncr": SVGFEFuncRElement;
+    "fegaussianblur": SVGFEGaussianBlurElement;
+    "feimage": SVGFEImageElement;
+    "femerge": SVGFEMergeElement;
+    "femergenode": SVGFEMergeNodeElement;
+    "femorphology": SVGFEMorphologyElement;
+    "feoffset": SVGFEOffsetElement;
+    "fepointlight": SVGFEPointLightElement;
+    "fespecularlighting": SVGFESpecularLightingElement;
+    "fespotlight": SVGFESpotLightElement;
+    "fetile": SVGFETileElement;
+    "feturbulence": SVGFETurbulenceElement;
+    "fieldset": HTMLFieldSetElement;
+    "figcaption": HTMLElement;
+    "figure": HTMLElement;
+    "filter": SVGFilterElement;
+    "font": HTMLFontElement;
+    "footer": HTMLElement;
+    "foreignobject": SVGForeignObjectElement;
+    "form": HTMLFormElement;
+    "frame": HTMLFrameElement;
+    "frameset": HTMLFrameSetElement;
+    "g": SVGGElement;
+    "h1": HTMLHeadingElement;
+    "h2": HTMLHeadingElement;
+    "h3": HTMLHeadingElement;
+    "h4": HTMLHeadingElement;
+    "h5": HTMLHeadingElement;
+    "h6": HTMLHeadingElement;
+    "head": HTMLHeadElement;
+    "header": HTMLElement;
+    "hgroup": HTMLElement;
+    "hr": HTMLHRElement;
+    "html": HTMLHtmlElement;
+    "i": HTMLElement;
+    "iframe": HTMLIFrameElement;
+    "image": SVGImageElement;
+    "img": HTMLImageElement;
+    "input": HTMLInputElement;
+    "ins": HTMLModElement;
+    "isindex": HTMLUnknownElement;
+    "kbd": HTMLElement;
+    "keygen": HTMLElement;
+    "label": HTMLLabelElement;
+    "legend": HTMLLegendElement;
+    "li": HTMLLIElement;
+    "line": SVGLineElement;
+    "lineargradient": SVGLinearGradientElement;
+    "link": HTMLLinkElement;
+    "listing": HTMLPreElement;
+    "map": HTMLMapElement;
+    "mark": HTMLElement;
+    "marker": SVGMarkerElement;
+    "marquee": HTMLMarqueeElement;
+    "mask": SVGMaskElement;
+    "menu": HTMLMenuElement;
+    "meta": HTMLMetaElement;
+    "metadata": SVGMetadataElement;
+    "meter": HTMLMeterElement;
+    "nav": HTMLElement;
+    "nextid": HTMLUnknownElement;
+    "nobr": HTMLElement;
+    "noframes": HTMLElement;
+    "noscript": HTMLElement;
+    "object": HTMLObjectElement;
+    "ol": HTMLOListElement;
+    "optgroup": HTMLOptGroupElement;
+    "option": HTMLOptionElement;
+    "p": HTMLParagraphElement;
+    "param": HTMLParamElement;
+    "path": SVGPathElement;
+    "pattern": SVGPatternElement;
+    "picture": HTMLPictureElement;
+    "plaintext": HTMLElement;
+    "polygon": SVGPolygonElement;
+    "polyline": SVGPolylineElement;
+    "pre": HTMLPreElement;
+    "progress": HTMLProgressElement;
+    "q": HTMLQuoteElement;
+    "radialgradient": SVGRadialGradientElement;
+    "rect": SVGRectElement;
+    "rt": HTMLElement;
+    "ruby": HTMLElement;
+    "s": HTMLElement;
+    "samp": HTMLElement;
+    "script": HTMLScriptElement;
+    "section": HTMLElement;
+    "select": HTMLSelectElement;
+    "small": HTMLElement;
+    "source": HTMLSourceElement;
+    "span": HTMLSpanElement;
+    "stop": SVGStopElement;
+    "strike": HTMLElement;
+    "strong": HTMLElement;
+    "style": HTMLStyleElement;
+    "sub": HTMLElement;
+    "sup": HTMLElement;
+    "svg": SVGSVGElement;
+    "switch": SVGSwitchElement;
+    "symbol": SVGSymbolElement;
+    "table": HTMLTableElement;
+    "tbody": HTMLTableSectionElement;
+    "td": HTMLTableDataCellElement;
+    "template": HTMLTemplateElement;
+    "text": SVGTextElement;
+    "textpath": SVGTextPathElement;
+    "textarea": HTMLTextAreaElement;
+    "tfoot": HTMLTableSectionElement;
+    "th": HTMLTableHeaderCellElement;
+    "thead": HTMLTableSectionElement;
+    "title": HTMLTitleElement;
+    "tr": HTMLTableRowElement;
+    "track": HTMLTrackElement;
+    "tspan": SVGTSpanElement;
+    "tt": HTMLElement;
+    "u": HTMLElement;
+    "ul": HTMLUListElement;
+    "use": SVGUseElement;
+    "var": HTMLElement;
+    "video": HTMLVideoElement;
+    "view": SVGViewElement;
+    "wbr": HTMLElement;
+    "x-ms-webview": MSHTMLWebViewElement;
+    "xmp": HTMLPreElement;
+}
+
+interface ElementListTagNameMap {
+    "a": NodeListOf<HTMLAnchorElement>;
+    "abbr": NodeListOf<HTMLElement>;
+    "acronym": NodeListOf<HTMLElement>;
+    "address": NodeListOf<HTMLElement>;
+    "applet": NodeListOf<HTMLAppletElement>;
+    "area": NodeListOf<HTMLAreaElement>;
+    "article": NodeListOf<HTMLElement>;
+    "aside": NodeListOf<HTMLElement>;
+    "audio": NodeListOf<HTMLAudioElement>;
+    "b": NodeListOf<HTMLElement>;
+    "base": NodeListOf<HTMLBaseElement>;
+    "basefont": NodeListOf<HTMLBaseFontElement>;
+    "bdo": NodeListOf<HTMLElement>;
+    "big": NodeListOf<HTMLElement>;
+    "blockquote": NodeListOf<HTMLQuoteElement>;
+    "body": NodeListOf<HTMLBodyElement>;
+    "br": NodeListOf<HTMLBRElement>;
+    "button": NodeListOf<HTMLButtonElement>;
+    "canvas": NodeListOf<HTMLCanvasElement>;
+    "caption": NodeListOf<HTMLTableCaptionElement>;
+    "center": NodeListOf<HTMLElement>;
+    "circle": NodeListOf<SVGCircleElement>;
+    "cite": NodeListOf<HTMLElement>;
+    "clippath": NodeListOf<SVGClipPathElement>;
+    "code": NodeListOf<HTMLElement>;
+    "col": NodeListOf<HTMLTableColElement>;
+    "colgroup": NodeListOf<HTMLTableColElement>;
+    "datalist": NodeListOf<HTMLDataListElement>;
+    "dd": NodeListOf<HTMLElement>;
+    "defs": NodeListOf<SVGDefsElement>;
+    "del": NodeListOf<HTMLModElement>;
+    "desc": NodeListOf<SVGDescElement>;
+    "dfn": NodeListOf<HTMLElement>;
+    "dir": NodeListOf<HTMLDirectoryElement>;
+    "div": NodeListOf<HTMLDivElement>;
+    "dl": NodeListOf<HTMLDListElement>;
+    "dt": NodeListOf<HTMLElement>;
+    "ellipse": NodeListOf<SVGEllipseElement>;
+    "em": NodeListOf<HTMLElement>;
+    "embed": NodeListOf<HTMLEmbedElement>;
+    "feblend": NodeListOf<SVGFEBlendElement>;
+    "fecolormatrix": NodeListOf<SVGFEColorMatrixElement>;
+    "fecomponenttransfer": NodeListOf<SVGFEComponentTransferElement>;
+    "fecomposite": NodeListOf<SVGFECompositeElement>;
+    "feconvolvematrix": NodeListOf<SVGFEConvolveMatrixElement>;
+    "fediffuselighting": NodeListOf<SVGFEDiffuseLightingElement>;
+    "fedisplacementmap": NodeListOf<SVGFEDisplacementMapElement>;
+    "fedistantlight": NodeListOf<SVGFEDistantLightElement>;
+    "feflood": NodeListOf<SVGFEFloodElement>;
+    "fefunca": NodeListOf<SVGFEFuncAElement>;
+    "fefuncb": NodeListOf<SVGFEFuncBElement>;
+    "fefuncg": NodeListOf<SVGFEFuncGElement>;
+    "fefuncr": NodeListOf<SVGFEFuncRElement>;
+    "fegaussianblur": NodeListOf<SVGFEGaussianBlurElement>;
+    "feimage": NodeListOf<SVGFEImageElement>;
+    "femerge": NodeListOf<SVGFEMergeElement>;
+    "femergenode": NodeListOf<SVGFEMergeNodeElement>;
+    "femorphology": NodeListOf<SVGFEMorphologyElement>;
+    "feoffset": NodeListOf<SVGFEOffsetElement>;
+    "fepointlight": NodeListOf<SVGFEPointLightElement>;
+    "fespecularlighting": NodeListOf<SVGFESpecularLightingElement>;
+    "fespotlight": NodeListOf<SVGFESpotLightElement>;
+    "fetile": NodeListOf<SVGFETileElement>;
+    "feturbulence": NodeListOf<SVGFETurbulenceElement>;
+    "fieldset": NodeListOf<HTMLFieldSetElement>;
+    "figcaption": NodeListOf<HTMLElement>;
+    "figure": NodeListOf<HTMLElement>;
+    "filter": NodeListOf<SVGFilterElement>;
+    "font": NodeListOf<HTMLFontElement>;
+    "footer": NodeListOf<HTMLElement>;
+    "foreignobject": NodeListOf<SVGForeignObjectElement>;
+    "form": NodeListOf<HTMLFormElement>;
+    "frame": NodeListOf<HTMLFrameElement>;
+    "frameset": NodeListOf<HTMLFrameSetElement>;
+    "g": NodeListOf<SVGGElement>;
+    "h1": NodeListOf<HTMLHeadingElement>;
+    "h2": NodeListOf<HTMLHeadingElement>;
+    "h3": NodeListOf<HTMLHeadingElement>;
+    "h4": NodeListOf<HTMLHeadingElement>;
+    "h5": NodeListOf<HTMLHeadingElement>;
+    "h6": NodeListOf<HTMLHeadingElement>;
+    "head": NodeListOf<HTMLHeadElement>;
+    "header": NodeListOf<HTMLElement>;
+    "hgroup": NodeListOf<HTMLElement>;
+    "hr": NodeListOf<HTMLHRElement>;
+    "html": NodeListOf<HTMLHtmlElement>;
+    "i": NodeListOf<HTMLElement>;
+    "iframe": NodeListOf<HTMLIFrameElement>;
+    "image": NodeListOf<SVGImageElement>;
+    "img": NodeListOf<HTMLImageElement>;
+    "input": NodeListOf<HTMLInputElement>;
+    "ins": NodeListOf<HTMLModElement>;
+    "isindex": NodeListOf<HTMLUnknownElement>;
+    "kbd": NodeListOf<HTMLElement>;
+    "keygen": NodeListOf<HTMLElement>;
+    "label": NodeListOf<HTMLLabelElement>;
+    "legend": NodeListOf<HTMLLegendElement>;
+    "li": NodeListOf<HTMLLIElement>;
+    "line": NodeListOf<SVGLineElement>;
+    "lineargradient": NodeListOf<SVGLinearGradientElement>;
+    "link": NodeListOf<HTMLLinkElement>;
+    "listing": NodeListOf<HTMLPreElement>;
+    "map": NodeListOf<HTMLMapElement>;
+    "mark": NodeListOf<HTMLElement>;
+    "marker": NodeListOf<SVGMarkerElement>;
+    "marquee": NodeListOf<HTMLMarqueeElement>;
+    "mask": NodeListOf<SVGMaskElement>;
+    "menu": NodeListOf<HTMLMenuElement>;
+    "meta": NodeListOf<HTMLMetaElement>;
+    "metadata": NodeListOf<SVGMetadataElement>;
+    "meter": NodeListOf<HTMLMeterElement>;
+    "nav": NodeListOf<HTMLElement>;
+    "nextid": NodeListOf<HTMLUnknownElement>;
+    "nobr": NodeListOf<HTMLElement>;
+    "noframes": NodeListOf<HTMLElement>;
+    "noscript": NodeListOf<HTMLElement>;
+    "object": NodeListOf<HTMLObjectElement>;
+    "ol": NodeListOf<HTMLOListElement>;
+    "optgroup": NodeListOf<HTMLOptGroupElement>;
+    "option": NodeListOf<HTMLOptionElement>;
+    "p": NodeListOf<HTMLParagraphElement>;
+    "param": NodeListOf<HTMLParamElement>;
+    "path": NodeListOf<SVGPathElement>;
+    "pattern": NodeListOf<SVGPatternElement>;
+    "picture": NodeListOf<HTMLPictureElement>;
+    "plaintext": NodeListOf<HTMLElement>;
+    "polygon": NodeListOf<SVGPolygonElement>;
+    "polyline": NodeListOf<SVGPolylineElement>;
+    "pre": NodeListOf<HTMLPreElement>;
+    "progress": NodeListOf<HTMLProgressElement>;
+    "q": NodeListOf<HTMLQuoteElement>;
+    "radialgradient": NodeListOf<SVGRadialGradientElement>;
+    "rect": NodeListOf<SVGRectElement>;
+    "rt": NodeListOf<HTMLElement>;
+    "ruby": NodeListOf<HTMLElement>;
+    "s": NodeListOf<HTMLElement>;
+    "samp": NodeListOf<HTMLElement>;
+    "script": NodeListOf<HTMLScriptElement>;
+    "section": NodeListOf<HTMLElement>;
+    "select": NodeListOf<HTMLSelectElement>;
+    "small": NodeListOf<HTMLElement>;
+    "source": NodeListOf<HTMLSourceElement>;
+    "span": NodeListOf<HTMLSpanElement>;
+    "stop": NodeListOf<SVGStopElement>;
+    "strike": NodeListOf<HTMLElement>;
+    "strong": NodeListOf<HTMLElement>;
+    "style": NodeListOf<HTMLStyleElement>;
+    "sub": NodeListOf<HTMLElement>;
+    "sup": NodeListOf<HTMLElement>;
+    "svg": NodeListOf<SVGSVGElement>;
+    "switch": NodeListOf<SVGSwitchElement>;
+    "symbol": NodeListOf<SVGSymbolElement>;
+    "table": NodeListOf<HTMLTableElement>;
+    "tbody": NodeListOf<HTMLTableSectionElement>;
+    "td": NodeListOf<HTMLTableDataCellElement>;
+    "template": NodeListOf<HTMLTemplateElement>;
+    "text": NodeListOf<SVGTextElement>;
+    "textpath": NodeListOf<SVGTextPathElement>;
+    "textarea": NodeListOf<HTMLTextAreaElement>;
+    "tfoot": NodeListOf<HTMLTableSectionElement>;
+    "th": NodeListOf<HTMLTableHeaderCellElement>;
+    "thead": NodeListOf<HTMLTableSectionElement>;
+    "title": NodeListOf<HTMLTitleElement>;
+    "tr": NodeListOf<HTMLTableRowElement>;
+    "track": NodeListOf<HTMLTrackElement>;
+    "tspan": NodeListOf<SVGTSpanElement>;
+    "tt": NodeListOf<HTMLElement>;
+    "u": NodeListOf<HTMLElement>;
+    "ul": NodeListOf<HTMLUListElement>;
+    "use": NodeListOf<SVGUseElement>;
+    "var": NodeListOf<HTMLElement>;
+    "video": NodeListOf<HTMLVideoElement>;
+    "view": NodeListOf<SVGViewElement>;
+    "wbr": NodeListOf<HTMLElement>;
+    "x-ms-webview": NodeListOf<MSHTMLWebViewElement>;
+    "xmp": NodeListOf<HTMLPreElement>;
+}
+
 declare var Audio: {new(src?: string): HTMLAudioElement; };
 declare var Image: {new(width?: number, height?: number): HTMLImageElement; };
 declare var Option: {new(text?: string, value?: string, defaultSelected?: boolean, selected?: boolean): HTMLOptionElement; };
@@ -14468,7 +13651,6 @@ declare function scroll(options?: ScrollToOptions): void;
 declare function scrollTo(options?: ScrollToOptions): void;
 declare function scrollBy(options?: ScrollToOptions): void;
 declare function toString(): string;
-declare function addEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 declare function dispatchEvent(evt: Event): boolean;
 declare function removeEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 declare function clearInterval(handle: number): void;
@@ -14495,101 +13677,7 @@ declare var onwheel: (this: Window, ev: WheelEvent) => any;
 declare var indexedDB: IDBFactory;
 declare function atob(encodedString: string): string;
 declare function btoa(rawString: string): string;
-declare function addEventListener(type: "MSGestureChange", listener: (this: Window, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSGestureDoubleTap", listener: (this: Window, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSGestureEnd", listener: (this: Window, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSGestureHold", listener: (this: Window, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSGestureStart", listener: (this: Window, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSGestureTap", listener: (this: Window, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSInertiaStart", listener: (this: Window, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSPointerCancel", listener: (this: Window, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSPointerDown", listener: (this: Window, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSPointerEnter", listener: (this: Window, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSPointerLeave", listener: (this: Window, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSPointerMove", listener: (this: Window, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSPointerOut", listener: (this: Window, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSPointerOver", listener: (this: Window, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSPointerUp", listener: (this: Window, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "abort", listener: (this: Window, ev: UIEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "afterprint", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "beforeprint", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "beforeunload", listener: (this: Window, ev: BeforeUnloadEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "blur", listener: (this: Window, ev: FocusEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "canplay", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "canplaythrough", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "change", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "click", listener: (this: Window, ev: MouseEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "compassneedscalibration", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "contextmenu", listener: (this: Window, ev: PointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "dblclick", listener: (this: Window, ev: MouseEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "devicelight", listener: (this: Window, ev: DeviceLightEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "devicemotion", listener: (this: Window, ev: DeviceMotionEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "deviceorientation", listener: (this: Window, ev: DeviceOrientationEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "drag", listener: (this: Window, ev: DragEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "dragend", listener: (this: Window, ev: DragEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "dragenter", listener: (this: Window, ev: DragEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "dragleave", listener: (this: Window, ev: DragEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "dragover", listener: (this: Window, ev: DragEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "dragstart", listener: (this: Window, ev: DragEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "drop", listener: (this: Window, ev: DragEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "durationchange", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "emptied", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "ended", listener: (this: Window, ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "focus", listener: (this: Window, ev: FocusEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "hashchange", listener: (this: Window, ev: HashChangeEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "input", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "invalid", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "keydown", listener: (this: Window, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "keypress", listener: (this: Window, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "keyup", listener: (this: Window, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "load", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "loadeddata", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "loadedmetadata", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "loadstart", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "message", listener: (this: Window, ev: MessageEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "mousedown", listener: (this: Window, ev: MouseEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "mouseenter", listener: (this: Window, ev: MouseEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "mouseleave", listener: (this: Window, ev: MouseEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "mousemove", listener: (this: Window, ev: MouseEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "mouseout", listener: (this: Window, ev: MouseEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "mouseover", listener: (this: Window, ev: MouseEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "mouseup", listener: (this: Window, ev: MouseEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "mousewheel", listener: (this: Window, ev: WheelEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "offline", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "online", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "orientationchange", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "pagehide", listener: (this: Window, ev: PageTransitionEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "pageshow", listener: (this: Window, ev: PageTransitionEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "pause", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "play", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "playing", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "pointercancel", listener: (this: Window, ev: PointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "pointerdown", listener: (this: Window, ev: PointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "pointerenter", listener: (this: Window, ev: PointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "pointerleave", listener: (this: Window, ev: PointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "pointermove", listener: (this: Window, ev: PointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "pointerout", listener: (this: Window, ev: PointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "pointerover", listener: (this: Window, ev: PointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "pointerup", listener: (this: Window, ev: PointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "popstate", listener: (this: Window, ev: PopStateEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "progress", listener: (this: Window, ev: ProgressEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "ratechange", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "readystatechange", listener: (this: Window, ev: ProgressEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "reset", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "resize", listener: (this: Window, ev: UIEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "scroll", listener: (this: Window, ev: UIEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "seeked", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "seeking", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "select", listener: (this: Window, ev: UIEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "stalled", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "storage", listener: (this: Window, ev: StorageEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "submit", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "suspend", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "timeupdate", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "unload", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "volumechange", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "waiting", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "wheel", listener: (this: Window, ev: WheelEvent) => any, useCapture?: boolean): void;
+declare function addEventListener<K extends keyof WindowEventMap>(type: K, listener: (this: Window, ev: WindowEventMap[K]) => any, useCapture?: boolean): void;
 declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 type AAGUID = string;
 type AlgorithmIdentifier = string | Algorithm;
diff --git a/src/lib/webworker.generated.d.ts b/src/lib/webworker.generated.d.ts
index 130510334d6..089d0bdc5d5 100644
--- a/src/lib/webworker.generated.d.ts
+++ b/src/lib/webworker.generated.d.ts
@@ -8,6 +8,7 @@ interface Algorithm {
 }
 
 interface EventInit {
+    scoped?: boolean;
     bubbles?: boolean;
     cancelable?: boolean;
 }
@@ -242,10 +243,12 @@ interface Event {
     readonly target: EventTarget;
     readonly timeStamp: number;
     readonly type: string;
+    readonly scoped: boolean;
     initEvent(eventTypeArg: string, canBubbleArg: boolean, cancelableArg: boolean): void;
     preventDefault(): void;
     stopImmediatePropagation(): void;
     stopPropagation(): void;
+    deepPath(): EventTarget[];
     readonly AT_TARGET: number;
     readonly BUBBLING_PHASE: number;
     readonly CAPTURING_PHASE: number;
@@ -298,6 +301,7 @@ interface FileReader extends EventTarget, MSBaseReader {
     readAsBinaryString(blob: Blob): void;
     readAsDataURL(blob: Blob): void;
     readAsText(blob: Blob, encoding?: string): void;
+    addEventListener<K extends keyof MSBaseReaderEventMap>(type: K, listener: (this: MSBaseReader, ev: MSBaseReaderEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -339,11 +343,16 @@ declare var IDBCursorWithValue: {
     new(): IDBCursorWithValue;
 }
 
+interface IDBDatabaseEventMap {
+    "abort": Event;
+    "error": ErrorEvent;
+}
+
 interface IDBDatabase extends EventTarget {
     readonly name: string;
     readonly objectStoreNames: DOMStringList;
-    onabort: (this: this, ev: Event) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
+    onabort: (this: IDBDatabase, ev: Event) => any;
+    onerror: (this: IDBDatabase, ev: ErrorEvent) => any;
     version: number;
     onversionchange: (ev: IDBVersionChangeEvent) => any;
     close(): void;
@@ -351,8 +360,7 @@ interface IDBDatabase extends EventTarget {
     deleteObjectStore(name: string): void;
     transaction(storeNames: string | string[], mode?: string): IDBTransaction;
     addEventListener(type: "versionchange", listener: (ev: IDBVersionChangeEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "abort", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof IDBDatabaseEventMap>(type: K, listener: (this: IDBDatabase, ev: IDBDatabaseEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -429,13 +437,15 @@ declare var IDBObjectStore: {
     new(): IDBObjectStore;
 }
 
+interface IDBOpenDBRequestEventMap extends IDBRequestEventMap {
+    "blocked": Event;
+    "upgradeneeded": IDBVersionChangeEvent;
+}
+
 interface IDBOpenDBRequest extends IDBRequest {
-    onblocked: (this: this, ev: Event) => any;
-    onupgradeneeded: (this: this, ev: IDBVersionChangeEvent) => any;
-    addEventListener(type: "blocked", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "success", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "upgradeneeded", listener: (this: this, ev: IDBVersionChangeEvent) => any, useCapture?: boolean): void;
+    onblocked: (this: IDBOpenDBRequest, ev: Event) => any;
+    onupgradeneeded: (this: IDBOpenDBRequest, ev: IDBVersionChangeEvent) => any;
+    addEventListener<K extends keyof IDBOpenDBRequestEventMap>(type: K, listener: (this: IDBOpenDBRequest, ev: IDBOpenDBRequestEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -444,16 +454,20 @@ declare var IDBOpenDBRequest: {
     new(): IDBOpenDBRequest;
 }
 
+interface IDBRequestEventMap {
+    "error": ErrorEvent;
+    "success": Event;
+}
+
 interface IDBRequest extends EventTarget {
     readonly error: DOMError;
-    onerror: (this: this, ev: ErrorEvent) => any;
-    onsuccess: (this: this, ev: Event) => any;
+    onerror: (this: IDBRequest, ev: ErrorEvent) => any;
+    onsuccess: (this: IDBRequest, ev: Event) => any;
     readonly readyState: string;
     readonly result: any;
     source: IDBObjectStore | IDBIndex | IDBCursor;
     readonly transaction: IDBTransaction;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "success", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof IDBRequestEventMap>(type: K, listener: (this: IDBRequest, ev: IDBRequestEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -462,21 +476,25 @@ declare var IDBRequest: {
     new(): IDBRequest;
 }
 
+interface IDBTransactionEventMap {
+    "abort": Event;
+    "complete": Event;
+    "error": ErrorEvent;
+}
+
 interface IDBTransaction extends EventTarget {
     readonly db: IDBDatabase;
     readonly error: DOMError;
     readonly mode: string;
-    onabort: (this: this, ev: Event) => any;
-    oncomplete: (this: this, ev: Event) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
+    onabort: (this: IDBTransaction, ev: Event) => any;
+    oncomplete: (this: IDBTransaction, ev: Event) => any;
+    onerror: (this: IDBTransaction, ev: ErrorEvent) => any;
     abort(): void;
     objectStore(name: string): IDBObjectStore;
     readonly READ_ONLY: string;
     readonly READ_WRITE: string;
     readonly VERSION_CHANGE: string;
-    addEventListener(type: "abort", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "complete", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof IDBTransactionEventMap>(type: K, listener: (this: IDBTransaction, ev: IDBTransactionEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -533,18 +551,22 @@ interface MSApp {
 }
 declare var MSApp: MSApp;
 
+interface MSAppAsyncOperationEventMap {
+    "complete": Event;
+    "error": ErrorEvent;
+}
+
 interface MSAppAsyncOperation extends EventTarget {
     readonly error: DOMError;
-    oncomplete: (this: this, ev: Event) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
+    oncomplete: (this: MSAppAsyncOperation, ev: Event) => any;
+    onerror: (this: MSAppAsyncOperation, ev: ErrorEvent) => any;
     readonly readyState: number;
     readonly result: any;
     start(): void;
     readonly COMPLETED: number;
     readonly ERROR: number;
     readonly STARTED: number;
-    addEventListener(type: "complete", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof MSAppAsyncOperationEventMap>(type: K, listener: (this: MSAppAsyncOperation, ev: MSAppAsyncOperationEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -584,6 +606,7 @@ interface MSStreamReader extends EventTarget, MSBaseReader {
     readAsBlob(stream: MSStream, size?: number): void;
     readAsDataURL(stream: MSStream, size?: number): void;
     readAsText(stream: MSStream, encoding?: string, size?: number): void;
+    addEventListener<K extends keyof MSBaseReaderEventMap>(type: K, listener: (this: MSBaseReader, ev: MSBaseReaderEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -627,12 +650,16 @@ declare var MessageEvent: {
     new(type: string, eventInitDict?: MessageEventInit): MessageEvent;
 }
 
+interface MessagePortEventMap {
+    "message": MessageEvent;
+}
+
 interface MessagePort extends EventTarget {
-    onmessage: (this: this, ev: MessageEvent) => any;
+    onmessage: (this: MessagePort, ev: MessageEvent) => any;
     close(): void;
     postMessage(message?: any, ports?: any): void;
     start(): void;
-    addEventListener(type: "message", listener: (this: this, ev: MessageEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof MessagePortEventMap>(type: K, listener: (this: MessagePort, ev: MessagePortEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -680,14 +707,21 @@ declare var ProgressEvent: {
     new(type: string, eventInitDict?: ProgressEventInit): ProgressEvent;
 }
 
+interface WebSocketEventMap {
+    "close": CloseEvent;
+    "error": ErrorEvent;
+    "message": MessageEvent;
+    "open": Event;
+}
+
 interface WebSocket extends EventTarget {
     binaryType: string;
     readonly bufferedAmount: number;
     readonly extensions: string;
-    onclose: (this: this, ev: CloseEvent) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
-    onmessage: (this: this, ev: MessageEvent) => any;
-    onopen: (this: this, ev: Event) => any;
+    onclose: (this: WebSocket, ev: CloseEvent) => any;
+    onerror: (this: WebSocket, ev: ErrorEvent) => any;
+    onmessage: (this: WebSocket, ev: MessageEvent) => any;
+    onopen: (this: WebSocket, ev: Event) => any;
     readonly protocol: string;
     readonly readyState: number;
     readonly url: string;
@@ -697,10 +731,7 @@ interface WebSocket extends EventTarget {
     readonly CLOSING: number;
     readonly CONNECTING: number;
     readonly OPEN: number;
-    addEventListener(type: "close", listener: (this: this, ev: CloseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "message", listener: (this: this, ev: MessageEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "open", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof WebSocketEventMap>(type: K, listener: (this: WebSocket, ev: WebSocketEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -713,12 +744,15 @@ declare var WebSocket: {
     readonly OPEN: number;
 }
 
+interface WorkerEventMap extends AbstractWorkerEventMap {
+    "message": MessageEvent;
+}
+
 interface Worker extends EventTarget, AbstractWorker {
-    onmessage: (this: this, ev: MessageEvent) => any;
+    onmessage: (this: Worker, ev: MessageEvent) => any;
     postMessage(message: any, ports?: any): void;
     terminate(): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "message", listener: (this: this, ev: MessageEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof WorkerEventMap>(type: K, listener: (this: Worker, ev: WorkerEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -727,8 +761,12 @@ declare var Worker: {
     new(stringUrl: string): Worker;
 }
 
+interface XMLHttpRequestEventMap extends XMLHttpRequestEventTargetEventMap {
+    "readystatechange": Event;
+}
+
 interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
-    onreadystatechange: (this: this, ev: Event) => any;
+    onreadystatechange: (this: XMLHttpRequest, ev: Event) => any;
     readonly readyState: number;
     readonly response: any;
     readonly responseText: string;
@@ -755,14 +793,7 @@ interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
     readonly LOADING: number;
     readonly OPENED: number;
     readonly UNSENT: number;
-    addEventListener(type: "abort", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadend", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "readystatechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeout", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof XMLHttpRequestEventMap>(type: K, listener: (this: XMLHttpRequest, ev: XMLHttpRequestEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -778,6 +809,7 @@ declare var XMLHttpRequest: {
 }
 
 interface XMLHttpRequestUpload extends EventTarget, XMLHttpRequestEventTarget {
+    addEventListener<K extends keyof XMLHttpRequestEventTargetEventMap>(type: K, listener: (this: XMLHttpRequestEventTarget, ev: XMLHttpRequestEventTargetEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -786,31 +818,39 @@ declare var XMLHttpRequestUpload: {
     new(): XMLHttpRequestUpload;
 }
 
+interface AbstractWorkerEventMap {
+    "error": ErrorEvent;
+}
+
 interface AbstractWorker {
-    onerror: (this: this, ev: ErrorEvent) => any;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
+    onerror: (this: AbstractWorker, ev: ErrorEvent) => any;
+    addEventListener<K extends keyof AbstractWorkerEventMap>(type: K, listener: (this: AbstractWorker, ev: AbstractWorkerEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
+interface MSBaseReaderEventMap {
+    "abort": Event;
+    "error": ErrorEvent;
+    "load": Event;
+    "loadend": ProgressEvent;
+    "loadstart": Event;
+    "progress": ProgressEvent;
+}
+
 interface MSBaseReader {
-    onabort: (this: this, ev: Event) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
-    onload: (this: this, ev: Event) => any;
-    onloadend: (this: this, ev: ProgressEvent) => any;
-    onloadstart: (this: this, ev: Event) => any;
-    onprogress: (this: this, ev: ProgressEvent) => any;
+    onabort: (this: MSBaseReader, ev: Event) => any;
+    onerror: (this: MSBaseReader, ev: ErrorEvent) => any;
+    onload: (this: MSBaseReader, ev: Event) => any;
+    onloadend: (this: MSBaseReader, ev: ProgressEvent) => any;
+    onloadstart: (this: MSBaseReader, ev: Event) => any;
+    onprogress: (this: MSBaseReader, ev: ProgressEvent) => any;
     readonly readyState: number;
     readonly result: any;
     abort(): void;
     readonly DONE: number;
     readonly EMPTY: number;
     readonly LOADING: number;
-    addEventListener(type: "abort", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadend", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof MSBaseReaderEventMap>(type: K, listener: (this: MSBaseReader, ev: MSBaseReaderEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -838,21 +878,25 @@ interface WindowConsole {
     readonly console: Console;
 }
 
+interface XMLHttpRequestEventTargetEventMap {
+    "abort": Event;
+    "error": ErrorEvent;
+    "load": Event;
+    "loadend": ProgressEvent;
+    "loadstart": Event;
+    "progress": ProgressEvent;
+    "timeout": ProgressEvent;
+}
+
 interface XMLHttpRequestEventTarget {
-    onabort: (this: this, ev: Event) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
-    onload: (this: this, ev: Event) => any;
-    onloadend: (this: this, ev: ProgressEvent) => any;
-    onloadstart: (this: this, ev: Event) => any;
-    onprogress: (this: this, ev: ProgressEvent) => any;
-    ontimeout: (this: this, ev: ProgressEvent) => any;
-    addEventListener(type: "abort", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadend", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeout", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
+    onabort: (this: XMLHttpRequestEventTarget, ev: Event) => any;
+    onerror: (this: XMLHttpRequestEventTarget, ev: ErrorEvent) => any;
+    onload: (this: XMLHttpRequestEventTarget, ev: Event) => any;
+    onloadend: (this: XMLHttpRequestEventTarget, ev: ProgressEvent) => any;
+    onloadstart: (this: XMLHttpRequestEventTarget, ev: Event) => any;
+    onprogress: (this: XMLHttpRequestEventTarget, ev: ProgressEvent) => any;
+    ontimeout: (this: XMLHttpRequestEventTarget, ev: ProgressEvent) => any;
+    addEventListener<K extends keyof XMLHttpRequestEventTargetEventMap>(type: K, listener: (this: XMLHttpRequestEventTarget, ev: XMLHttpRequestEventTargetEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -868,15 +912,18 @@ declare var FileReaderSync: {
     new(): FileReaderSync;
 }
 
+interface WorkerGlobalScopeEventMap extends DedicatedWorkerGlobalScopeEventMap {
+    "error": ErrorEvent;
+}
+
 interface WorkerGlobalScope extends EventTarget, WorkerUtils, DedicatedWorkerGlobalScope, WindowConsole {
     readonly location: WorkerLocation;
-    onerror: (this: this, ev: ErrorEvent) => any;
+    onerror: (this: WorkerGlobalScope, ev: ErrorEvent) => any;
     readonly self: WorkerGlobalScope;
     close(): void;
     msWriteProfilerMark(profilerMarkName: string): void;
     toString(): string;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "message", listener: (this: this, ev: MessageEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof WorkerGlobalScopeEventMap>(type: K, listener: (this: WorkerGlobalScope, ev: WorkerGlobalScopeEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -904,7 +951,6 @@ declare var WorkerLocation: {
 
 interface WorkerNavigator extends Object, NavigatorID, NavigatorOnLine {
     readonly hardwareConcurrency: number;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var WorkerNavigator: {
@@ -912,10 +958,14 @@ declare var WorkerNavigator: {
     new(): WorkerNavigator;
 }
 
+interface DedicatedWorkerGlobalScopeEventMap {
+    "message": MessageEvent;
+}
+
 interface DedicatedWorkerGlobalScope {
-    onmessage: (this: this, ev: MessageEvent) => any;
+    onmessage: (this: DedicatedWorkerGlobalScope, ev: MessageEvent) => any;
     postMessage(data: any): void;
-    addEventListener(type: "message", listener: (this: this, ev: MessageEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof DedicatedWorkerGlobalScopeEventMap>(type: K, listener: (this: DedicatedWorkerGlobalScope, ev: DedicatedWorkerGlobalScopeEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -1176,7 +1226,6 @@ declare var self: WorkerGlobalScope;
 declare function close(): void;
 declare function msWriteProfilerMark(profilerMarkName: string): void;
 declare function toString(): string;
-declare function addEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 declare function dispatchEvent(evt: Event): boolean;
 declare function removeEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 declare var indexedDB: IDBFactory;
@@ -1197,8 +1246,7 @@ declare function btoa(rawString: string): string;
 declare var onmessage: (this: WorkerGlobalScope, ev: MessageEvent) => any;
 declare function postMessage(data: any): void;
 declare var console: Console;
-declare function addEventListener(type: "error", listener: (this: WorkerGlobalScope, ev: ErrorEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "message", listener: (this: WorkerGlobalScope, ev: MessageEvent) => any, useCapture?: boolean): void;
+declare function addEventListener<K extends keyof WorkerGlobalScopeEventMap>(type: K, listener: (this: WorkerGlobalScope, ev: WorkerGlobalScopeEventMap[K]) => any, useCapture?: boolean): void;
 declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 type AlgorithmIdentifier = string | Algorithm;
 type IDBKeyPath = string;
diff --git a/tests/baselines/reference/modularizeLibrary_Dom.iterable.symbols b/tests/baselines/reference/modularizeLibrary_Dom.iterable.symbols
index a487763582b..478997ca630 100644
--- a/tests/baselines/reference/modularizeLibrary_Dom.iterable.symbols
+++ b/tests/baselines/reference/modularizeLibrary_Dom.iterable.symbols
@@ -2,9 +2,9 @@
 
 for (const element of document.getElementsByTagName("a")) {
 >element : Symbol(element, Decl(modularizeLibrary_Dom.iterable.ts, 1, 10))
->document.getElementsByTagName : Symbol(Document.getElementsByTagName, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --))
+>document.getElementsByTagName : Symbol(Document.getElementsByTagName, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --))
 >document : Symbol(document, Decl(lib.dom.d.ts, --, --))
->getElementsByTagName : Symbol(Document.getElementsByTagName, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --))
+>getElementsByTagName : Symbol(Document.getElementsByTagName, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --))
 
     element.href;
 >element.href : Symbol(HTMLAnchorElement.href, Decl(lib.dom.d.ts, --, --))
diff --git a/tests/baselines/reference/modularizeLibrary_Dom.iterable.types b/tests/baselines/reference/modularizeLibrary_Dom.iterable.types
index dbce5e17ae2..054923fb5ee 100644
--- a/tests/baselines/reference/modularizeLibrary_Dom.iterable.types
+++ b/tests/baselines/reference/modularizeLibrary_Dom.iterable.types
@@ -3,9 +3,9 @@
 for (const element of document.getElementsByTagName("a")) {
 >element : HTMLAnchorElement
 >document.getElementsByTagName("a") : NodeListOf<HTMLAnchorElement>
->document.getElementsByTagName : { (tagname: "a"): NodeListOf<HTMLAnchorElement>; (tagname: "abbr"): NodeListOf<HTMLElement>; (tagname: "acronym"): NodeListOf<HTMLElement>; (tagname: "address"): NodeListOf<HTMLElement>; (tagname: "applet"): NodeListOf<HTMLAppletElement>; (tagname: "area"): NodeListOf<HTMLAreaElement>; (tagname: "article"): NodeListOf<HTMLElement>; (tagname: "aside"): NodeListOf<HTMLElement>; (tagname: "audio"): NodeListOf<HTMLAudioElement>; (tagname: "b"): NodeListOf<HTMLElement>; (tagname: "base"): NodeListOf<HTMLBaseElement>; (tagname: "basefont"): NodeListOf<HTMLBaseFontElement>; (tagname: "bdo"): NodeListOf<HTMLElement>; (tagname: "big"): NodeListOf<HTMLElement>; (tagname: "blockquote"): NodeListOf<HTMLQuoteElement>; (tagname: "body"): NodeListOf<HTMLBodyElement>; (tagname: "br"): NodeListOf<HTMLBRElement>; (tagname: "button"): NodeListOf<HTMLButtonElement>; (tagname: "canvas"): NodeListOf<HTMLCanvasElement>; (tagname: "caption"): NodeListOf<HTMLTableCaptionElement>; (tagname: "center"): NodeListOf<HTMLElement>; (tagname: "circle"): NodeListOf<SVGCircleElement>; (tagname: "cite"): NodeListOf<HTMLElement>; (tagname: "clippath"): NodeListOf<SVGClipPathElement>; (tagname: "code"): NodeListOf<HTMLElement>; (tagname: "col"): NodeListOf<HTMLTableColElement>; (tagname: "colgroup"): NodeListOf<HTMLTableColElement>; (tagname: "datalist"): NodeListOf<HTMLDataListElement>; (tagname: "dd"): NodeListOf<HTMLElement>; (tagname: "defs"): NodeListOf<SVGDefsElement>; (tagname: "del"): NodeListOf<HTMLModElement>; (tagname: "desc"): NodeListOf<SVGDescElement>; (tagname: "dfn"): NodeListOf<HTMLElement>; (tagname: "dir"): NodeListOf<HTMLDirectoryElement>; (tagname: "div"): NodeListOf<HTMLDivElement>; (tagname: "dl"): NodeListOf<HTMLDListElement>; (tagname: "dt"): NodeListOf<HTMLElement>; (tagname: "ellipse"): NodeListOf<SVGEllipseElement>; (tagname: "em"): NodeListOf<HTMLElement>; (tagname: "embed"): NodeListOf<HTMLEmbedElement>; (tagname: "feblend"): NodeListOf<SVGFEBlendElement>; (tagname: "fecolormatrix"): NodeListOf<SVGFEColorMatrixElement>; (tagname: "fecomponenttransfer"): NodeListOf<SVGFEComponentTransferElement>; (tagname: "fecomposite"): NodeListOf<SVGFECompositeElement>; (tagname: "feconvolvematrix"): NodeListOf<SVGFEConvolveMatrixElement>; (tagname: "fediffuselighting"): NodeListOf<SVGFEDiffuseLightingElement>; (tagname: "fedisplacementmap"): NodeListOf<SVGFEDisplacementMapElement>; (tagname: "fedistantlight"): NodeListOf<SVGFEDistantLightElement>; (tagname: "feflood"): NodeListOf<SVGFEFloodElement>; (tagname: "fefunca"): NodeListOf<SVGFEFuncAElement>; (tagname: "fefuncb"): NodeListOf<SVGFEFuncBElement>; (tagname: "fefuncg"): NodeListOf<SVGFEFuncGElement>; (tagname: "fefuncr"): NodeListOf<SVGFEFuncRElement>; (tagname: "fegaussianblur"): NodeListOf<SVGFEGaussianBlurElement>; (tagname: "feimage"): NodeListOf<SVGFEImageElement>; (tagname: "femerge"): NodeListOf<SVGFEMergeElement>; (tagname: "femergenode"): NodeListOf<SVGFEMergeNodeElement>; (tagname: "femorphology"): NodeListOf<SVGFEMorphologyElement>; (tagname: "feoffset"): NodeListOf<SVGFEOffsetElement>; (tagname: "fepointlight"): NodeListOf<SVGFEPointLightElement>; (tagname: "fespecularlighting"): NodeListOf<SVGFESpecularLightingElement>; (tagname: "fespotlight"): NodeListOf<SVGFESpotLightElement>; (tagname: "fetile"): NodeListOf<SVGFETileElement>; (tagname: "feturbulence"): NodeListOf<SVGFETurbulenceElement>; (tagname: "fieldset"): NodeListOf<HTMLFieldSetElement>; (tagname: "figcaption"): NodeListOf<HTMLElement>; (tagname: "figure"): NodeListOf<HTMLElement>; (tagname: "filter"): NodeListOf<SVGFilterElement>; (tagname: "font"): NodeListOf<HTMLFontElement>; (tagname: "footer"): NodeListOf<HTMLElement>; (tagname: "foreignobject"): NodeListOf<SVGForeignObjectElement>; (tagname: "form"): NodeListOf<HTMLFormElement>; (tagname: "frame"): NodeListOf<HTMLFrameElement>; (tagname: "frameset"): NodeListOf<HTMLFrameSetElement>; (tagname: "g"): NodeListOf<SVGGElement>; (tagname: "h1"): NodeListOf<HTMLHeadingElement>; (tagname: "h2"): NodeListOf<HTMLHeadingElement>; (tagname: "h3"): NodeListOf<HTMLHeadingElement>; (tagname: "h4"): NodeListOf<HTMLHeadingElement>; (tagname: "h5"): NodeListOf<HTMLHeadingElement>; (tagname: "h6"): NodeListOf<HTMLHeadingElement>; (tagname: "head"): NodeListOf<HTMLHeadElement>; (tagname: "header"): NodeListOf<HTMLElement>; (tagname: "hgroup"): NodeListOf<HTMLElement>; (tagname: "hr"): NodeListOf<HTMLHRElement>; (tagname: "html"): NodeListOf<HTMLHtmlElement>; (tagname: "i"): NodeListOf<HTMLElement>; (tagname: "iframe"): NodeListOf<HTMLIFrameElement>; (tagname: "image"): NodeListOf<SVGImageElement>; (tagname: "img"): NodeListOf<HTMLImageElement>; (tagname: "input"): NodeListOf<HTMLInputElement>; (tagname: "ins"): NodeListOf<HTMLModElement>; (tagname: "isindex"): NodeListOf<HTMLUnknownElement>; (tagname: "kbd"): NodeListOf<HTMLElement>; (tagname: "keygen"): NodeListOf<HTMLElement>; (tagname: "label"): NodeListOf<HTMLLabelElement>; (tagname: "legend"): NodeListOf<HTMLLegendElement>; (tagname: "li"): NodeListOf<HTMLLIElement>; (tagname: "line"): NodeListOf<SVGLineElement>; (tagname: "lineargradient"): NodeListOf<SVGLinearGradientElement>; (tagname: "link"): NodeListOf<HTMLLinkElement>; (tagname: "listing"): NodeListOf<HTMLPreElement>; (tagname: "map"): NodeListOf<HTMLMapElement>; (tagname: "mark"): NodeListOf<HTMLElement>; (tagname: "marker"): NodeListOf<SVGMarkerElement>; (tagname: "marquee"): NodeListOf<HTMLMarqueeElement>; (tagname: "mask"): NodeListOf<SVGMaskElement>; (tagname: "menu"): NodeListOf<HTMLMenuElement>; (tagname: "meta"): NodeListOf<HTMLMetaElement>; (tagname: "metadata"): NodeListOf<SVGMetadataElement>; (tagname: "meter"): NodeListOf<HTMLMeterElement>; (tagname: "nav"): NodeListOf<HTMLElement>; (tagname: "nextid"): NodeListOf<HTMLUnknownElement>; (tagname: "nobr"): NodeListOf<HTMLElement>; (tagname: "noframes"): NodeListOf<HTMLElement>; (tagname: "noscript"): NodeListOf<HTMLElement>; (tagname: "object"): NodeListOf<HTMLObjectElement>; (tagname: "ol"): NodeListOf<HTMLOListElement>; (tagname: "optgroup"): NodeListOf<HTMLOptGroupElement>; (tagname: "option"): NodeListOf<HTMLOptionElement>; (tagname: "p"): NodeListOf<HTMLParagraphElement>; (tagname: "param"): NodeListOf<HTMLParamElement>; (tagname: "path"): NodeListOf<SVGPathElement>; (tagname: "pattern"): NodeListOf<SVGPatternElement>; (tagname: "picture"): NodeListOf<HTMLPictureElement>; (tagname: "plaintext"): NodeListOf<HTMLElement>; (tagname: "polygon"): NodeListOf<SVGPolygonElement>; (tagname: "polyline"): NodeListOf<SVGPolylineElement>; (tagname: "pre"): NodeListOf<HTMLPreElement>; (tagname: "progress"): NodeListOf<HTMLProgressElement>; (tagname: "q"): NodeListOf<HTMLQuoteElement>; (tagname: "radialgradient"): NodeListOf<SVGRadialGradientElement>; (tagname: "rect"): NodeListOf<SVGRectElement>; (tagname: "rt"): NodeListOf<HTMLElement>; (tagname: "ruby"): NodeListOf<HTMLElement>; (tagname: "s"): NodeListOf<HTMLElement>; (tagname: "samp"): NodeListOf<HTMLElement>; (tagname: "script"): NodeListOf<HTMLScriptElement>; (tagname: "section"): NodeListOf<HTMLElement>; (tagname: "select"): NodeListOf<HTMLSelectElement>; (tagname: "small"): NodeListOf<HTMLElement>; (tagname: "source"): NodeListOf<HTMLSourceElement>; (tagname: "span"): NodeListOf<HTMLSpanElement>; (tagname: "stop"): NodeListOf<SVGStopElement>; (tagname: "strike"): NodeListOf<HTMLElement>; (tagname: "strong"): NodeListOf<HTMLElement>; (tagname: "style"): NodeListOf<HTMLStyleElement>; (tagname: "sub"): NodeListOf<HTMLElement>; (tagname: "sup"): NodeListOf<HTMLElement>; (tagname: "svg"): NodeListOf<SVGSVGElement>; (tagname: "switch"): NodeListOf<SVGSwitchElement>; (tagname: "symbol"): NodeListOf<SVGSymbolElement>; (tagname: "table"): NodeListOf<HTMLTableElement>; (tagname: "tbody"): NodeListOf<HTMLTableSectionElement>; (tagname: "td"): NodeListOf<HTMLTableDataCellElement>; (tagname: "template"): NodeListOf<HTMLTemplateElement>; (tagname: "text"): NodeListOf<SVGTextElement>; (tagname: "textpath"): NodeListOf<SVGTextPathElement>; (tagname: "textarea"): NodeListOf<HTMLTextAreaElement>; (tagname: "tfoot"): NodeListOf<HTMLTableSectionElement>; (tagname: "th"): NodeListOf<HTMLTableHeaderCellElement>; (tagname: "thead"): NodeListOf<HTMLTableSectionElement>; (tagname: "title"): NodeListOf<HTMLTitleElement>; (tagname: "tr"): NodeListOf<HTMLTableRowElement>; (tagname: "track"): NodeListOf<HTMLTrackElement>; (tagname: "tspan"): NodeListOf<SVGTSpanElement>; (tagname: "tt"): NodeListOf<HTMLElement>; (tagname: "u"): NodeListOf<HTMLElement>; (tagname: "ul"): NodeListOf<HTMLUListElement>; (tagname: "use"): NodeListOf<SVGUseElement>; (tagname: "var"): NodeListOf<HTMLElement>; (tagname: "video"): NodeListOf<HTMLVideoElement>; (tagname: "view"): NodeListOf<SVGViewElement>; (tagname: "wbr"): NodeListOf<HTMLElement>; (tagname: "x-ms-webview"): NodeListOf<MSHTMLWebViewElement>; (tagname: "xmp"): NodeListOf<HTMLPreElement>; (tagname: string): NodeListOf<Element>; }
+>document.getElementsByTagName : { <K extends "a" | "abbr" | "acronym" | "address" | "applet" | "area" | "article" | "aside" | "audio" | "b" | "base" | "basefont" | "bdo" | "big" | "blockquote" | "body" | "br" | "button" | "canvas" | "caption" | "center" | "circle" | "cite" | "clippath" | "code" | "col" | "colgroup" | "datalist" | "dd" | "defs" | "del" | "desc" | "dfn" | "dir" | "div" | "dl" | "dt" | "ellipse" | "em" | "embed" | "feblend" | "fecolormatrix" | "fecomponenttransfer" | "fecomposite" | "feconvolvematrix" | "fediffuselighting" | "fedisplacementmap" | "fedistantlight" | "feflood" | "fefunca" | "fefuncb" | "fefuncg" | "fefuncr" | "fegaussianblur" | "feimage" | "femerge" | "femergenode" | "femorphology" | "feoffset" | "fepointlight" | "fespecularlighting" | "fespotlight" | "fetile" | "feturbulence" | "fieldset" | "figcaption" | "figure" | "filter" | "font" | "footer" | "foreignobject" | "form" | "frame" | "frameset" | "g" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "head" | "header" | "hgroup" | "hr" | "html" | "i" | "iframe" | "image" | "img" | "input" | "ins" | "isindex" | "kbd" | "keygen" | "label" | "legend" | "li" | "line" | "lineargradient" | "link" | "listing" | "map" | "mark" | "marker" | "marquee" | "mask" | "menu" | "meta" | "metadata" | "meter" | "nav" | "nextid" | "nobr" | "noframes" | "noscript" | "object" | "ol" | "optgroup" | "option" | "p" | "param" | "path" | "pattern" | "picture" | "plaintext" | "polygon" | "polyline" | "pre" | "progress" | "q" | "radialgradient" | "rect" | "rt" | "ruby" | "s" | "samp" | "script" | "section" | "select" | "small" | "source" | "span" | "stop" | "strike" | "strong" | "style" | "sub" | "sup" | "svg" | "switch" | "symbol" | "table" | "tbody" | "td" | "template" | "text" | "textpath" | "textarea" | "tfoot" | "th" | "thead" | "title" | "tr" | "track" | "tspan" | "tt" | "u" | "ul" | "use" | "var" | "video" | "view" | "wbr" | "x-ms-webview" | "xmp">(tagname: K): ElementListTagNameMap[K]; (tagname: string): NodeListOf<Element>; }
 >document : Document
->getElementsByTagName : { (tagname: "a"): NodeListOf<HTMLAnchorElement>; (tagname: "abbr"): NodeListOf<HTMLElement>; (tagname: "acronym"): NodeListOf<HTMLElement>; (tagname: "address"): NodeListOf<HTMLElement>; (tagname: "applet"): NodeListOf<HTMLAppletElement>; (tagname: "area"): NodeListOf<HTMLAreaElement>; (tagname: "article"): NodeListOf<HTMLElement>; (tagname: "aside"): NodeListOf<HTMLElement>; (tagname: "audio"): NodeListOf<HTMLAudioElement>; (tagname: "b"): NodeListOf<HTMLElement>; (tagname: "base"): NodeListOf<HTMLBaseElement>; (tagname: "basefont"): NodeListOf<HTMLBaseFontElement>; (tagname: "bdo"): NodeListOf<HTMLElement>; (tagname: "big"): NodeListOf<HTMLElement>; (tagname: "blockquote"): NodeListOf<HTMLQuoteElement>; (tagname: "body"): NodeListOf<HTMLBodyElement>; (tagname: "br"): NodeListOf<HTMLBRElement>; (tagname: "button"): NodeListOf<HTMLButtonElement>; (tagname: "canvas"): NodeListOf<HTMLCanvasElement>; (tagname: "caption"): NodeListOf<HTMLTableCaptionElement>; (tagname: "center"): NodeListOf<HTMLElement>; (tagname: "circle"): NodeListOf<SVGCircleElement>; (tagname: "cite"): NodeListOf<HTMLElement>; (tagname: "clippath"): NodeListOf<SVGClipPathElement>; (tagname: "code"): NodeListOf<HTMLElement>; (tagname: "col"): NodeListOf<HTMLTableColElement>; (tagname: "colgroup"): NodeListOf<HTMLTableColElement>; (tagname: "datalist"): NodeListOf<HTMLDataListElement>; (tagname: "dd"): NodeListOf<HTMLElement>; (tagname: "defs"): NodeListOf<SVGDefsElement>; (tagname: "del"): NodeListOf<HTMLModElement>; (tagname: "desc"): NodeListOf<SVGDescElement>; (tagname: "dfn"): NodeListOf<HTMLElement>; (tagname: "dir"): NodeListOf<HTMLDirectoryElement>; (tagname: "div"): NodeListOf<HTMLDivElement>; (tagname: "dl"): NodeListOf<HTMLDListElement>; (tagname: "dt"): NodeListOf<HTMLElement>; (tagname: "ellipse"): NodeListOf<SVGEllipseElement>; (tagname: "em"): NodeListOf<HTMLElement>; (tagname: "embed"): NodeListOf<HTMLEmbedElement>; (tagname: "feblend"): NodeListOf<SVGFEBlendElement>; (tagname: "fecolormatrix"): NodeListOf<SVGFEColorMatrixElement>; (tagname: "fecomponenttransfer"): NodeListOf<SVGFEComponentTransferElement>; (tagname: "fecomposite"): NodeListOf<SVGFECompositeElement>; (tagname: "feconvolvematrix"): NodeListOf<SVGFEConvolveMatrixElement>; (tagname: "fediffuselighting"): NodeListOf<SVGFEDiffuseLightingElement>; (tagname: "fedisplacementmap"): NodeListOf<SVGFEDisplacementMapElement>; (tagname: "fedistantlight"): NodeListOf<SVGFEDistantLightElement>; (tagname: "feflood"): NodeListOf<SVGFEFloodElement>; (tagname: "fefunca"): NodeListOf<SVGFEFuncAElement>; (tagname: "fefuncb"): NodeListOf<SVGFEFuncBElement>; (tagname: "fefuncg"): NodeListOf<SVGFEFuncGElement>; (tagname: "fefuncr"): NodeListOf<SVGFEFuncRElement>; (tagname: "fegaussianblur"): NodeListOf<SVGFEGaussianBlurElement>; (tagname: "feimage"): NodeListOf<SVGFEImageElement>; (tagname: "femerge"): NodeListOf<SVGFEMergeElement>; (tagname: "femergenode"): NodeListOf<SVGFEMergeNodeElement>; (tagname: "femorphology"): NodeListOf<SVGFEMorphologyElement>; (tagname: "feoffset"): NodeListOf<SVGFEOffsetElement>; (tagname: "fepointlight"): NodeListOf<SVGFEPointLightElement>; (tagname: "fespecularlighting"): NodeListOf<SVGFESpecularLightingElement>; (tagname: "fespotlight"): NodeListOf<SVGFESpotLightElement>; (tagname: "fetile"): NodeListOf<SVGFETileElement>; (tagname: "feturbulence"): NodeListOf<SVGFETurbulenceElement>; (tagname: "fieldset"): NodeListOf<HTMLFieldSetElement>; (tagname: "figcaption"): NodeListOf<HTMLElement>; (tagname: "figure"): NodeListOf<HTMLElement>; (tagname: "filter"): NodeListOf<SVGFilterElement>; (tagname: "font"): NodeListOf<HTMLFontElement>; (tagname: "footer"): NodeListOf<HTMLElement>; (tagname: "foreignobject"): NodeListOf<SVGForeignObjectElement>; (tagname: "form"): NodeListOf<HTMLFormElement>; (tagname: "frame"): NodeListOf<HTMLFrameElement>; (tagname: "frameset"): NodeListOf<HTMLFrameSetElement>; (tagname: "g"): NodeListOf<SVGGElement>; (tagname: "h1"): NodeListOf<HTMLHeadingElement>; (tagname: "h2"): NodeListOf<HTMLHeadingElement>; (tagname: "h3"): NodeListOf<HTMLHeadingElement>; (tagname: "h4"): NodeListOf<HTMLHeadingElement>; (tagname: "h5"): NodeListOf<HTMLHeadingElement>; (tagname: "h6"): NodeListOf<HTMLHeadingElement>; (tagname: "head"): NodeListOf<HTMLHeadElement>; (tagname: "header"): NodeListOf<HTMLElement>; (tagname: "hgroup"): NodeListOf<HTMLElement>; (tagname: "hr"): NodeListOf<HTMLHRElement>; (tagname: "html"): NodeListOf<HTMLHtmlElement>; (tagname: "i"): NodeListOf<HTMLElement>; (tagname: "iframe"): NodeListOf<HTMLIFrameElement>; (tagname: "image"): NodeListOf<SVGImageElement>; (tagname: "img"): NodeListOf<HTMLImageElement>; (tagname: "input"): NodeListOf<HTMLInputElement>; (tagname: "ins"): NodeListOf<HTMLModElement>; (tagname: "isindex"): NodeListOf<HTMLUnknownElement>; (tagname: "kbd"): NodeListOf<HTMLElement>; (tagname: "keygen"): NodeListOf<HTMLElement>; (tagname: "label"): NodeListOf<HTMLLabelElement>; (tagname: "legend"): NodeListOf<HTMLLegendElement>; (tagname: "li"): NodeListOf<HTMLLIElement>; (tagname: "line"): NodeListOf<SVGLineElement>; (tagname: "lineargradient"): NodeListOf<SVGLinearGradientElement>; (tagname: "link"): NodeListOf<HTMLLinkElement>; (tagname: "listing"): NodeListOf<HTMLPreElement>; (tagname: "map"): NodeListOf<HTMLMapElement>; (tagname: "mark"): NodeListOf<HTMLElement>; (tagname: "marker"): NodeListOf<SVGMarkerElement>; (tagname: "marquee"): NodeListOf<HTMLMarqueeElement>; (tagname: "mask"): NodeListOf<SVGMaskElement>; (tagname: "menu"): NodeListOf<HTMLMenuElement>; (tagname: "meta"): NodeListOf<HTMLMetaElement>; (tagname: "metadata"): NodeListOf<SVGMetadataElement>; (tagname: "meter"): NodeListOf<HTMLMeterElement>; (tagname: "nav"): NodeListOf<HTMLElement>; (tagname: "nextid"): NodeListOf<HTMLUnknownElement>; (tagname: "nobr"): NodeListOf<HTMLElement>; (tagname: "noframes"): NodeListOf<HTMLElement>; (tagname: "noscript"): NodeListOf<HTMLElement>; (tagname: "object"): NodeListOf<HTMLObjectElement>; (tagname: "ol"): NodeListOf<HTMLOListElement>; (tagname: "optgroup"): NodeListOf<HTMLOptGroupElement>; (tagname: "option"): NodeListOf<HTMLOptionElement>; (tagname: "p"): NodeListOf<HTMLParagraphElement>; (tagname: "param"): NodeListOf<HTMLParamElement>; (tagname: "path"): NodeListOf<SVGPathElement>; (tagname: "pattern"): NodeListOf<SVGPatternElement>; (tagname: "picture"): NodeListOf<HTMLPictureElement>; (tagname: "plaintext"): NodeListOf<HTMLElement>; (tagname: "polygon"): NodeListOf<SVGPolygonElement>; (tagname: "polyline"): NodeListOf<SVGPolylineElement>; (tagname: "pre"): NodeListOf<HTMLPreElement>; (tagname: "progress"): NodeListOf<HTMLProgressElement>; (tagname: "q"): NodeListOf<HTMLQuoteElement>; (tagname: "radialgradient"): NodeListOf<SVGRadialGradientElement>; (tagname: "rect"): NodeListOf<SVGRectElement>; (tagname: "rt"): NodeListOf<HTMLElement>; (tagname: "ruby"): NodeListOf<HTMLElement>; (tagname: "s"): NodeListOf<HTMLElement>; (tagname: "samp"): NodeListOf<HTMLElement>; (tagname: "script"): NodeListOf<HTMLScriptElement>; (tagname: "section"): NodeListOf<HTMLElement>; (tagname: "select"): NodeListOf<HTMLSelectElement>; (tagname: "small"): NodeListOf<HTMLElement>; (tagname: "source"): NodeListOf<HTMLSourceElement>; (tagname: "span"): NodeListOf<HTMLSpanElement>; (tagname: "stop"): NodeListOf<SVGStopElement>; (tagname: "strike"): NodeListOf<HTMLElement>; (tagname: "strong"): NodeListOf<HTMLElement>; (tagname: "style"): NodeListOf<HTMLStyleElement>; (tagname: "sub"): NodeListOf<HTMLElement>; (tagname: "sup"): NodeListOf<HTMLElement>; (tagname: "svg"): NodeListOf<SVGSVGElement>; (tagname: "switch"): NodeListOf<SVGSwitchElement>; (tagname: "symbol"): NodeListOf<SVGSymbolElement>; (tagname: "table"): NodeListOf<HTMLTableElement>; (tagname: "tbody"): NodeListOf<HTMLTableSectionElement>; (tagname: "td"): NodeListOf<HTMLTableDataCellElement>; (tagname: "template"): NodeListOf<HTMLTemplateElement>; (tagname: "text"): NodeListOf<SVGTextElement>; (tagname: "textpath"): NodeListOf<SVGTextPathElement>; (tagname: "textarea"): NodeListOf<HTMLTextAreaElement>; (tagname: "tfoot"): NodeListOf<HTMLTableSectionElement>; (tagname: "th"): NodeListOf<HTMLTableHeaderCellElement>; (tagname: "thead"): NodeListOf<HTMLTableSectionElement>; (tagname: "title"): NodeListOf<HTMLTitleElement>; (tagname: "tr"): NodeListOf<HTMLTableRowElement>; (tagname: "track"): NodeListOf<HTMLTrackElement>; (tagname: "tspan"): NodeListOf<SVGTSpanElement>; (tagname: "tt"): NodeListOf<HTMLElement>; (tagname: "u"): NodeListOf<HTMLElement>; (tagname: "ul"): NodeListOf<HTMLUListElement>; (tagname: "use"): NodeListOf<SVGUseElement>; (tagname: "var"): NodeListOf<HTMLElement>; (tagname: "video"): NodeListOf<HTMLVideoElement>; (tagname: "view"): NodeListOf<SVGViewElement>; (tagname: "wbr"): NodeListOf<HTMLElement>; (tagname: "x-ms-webview"): NodeListOf<MSHTMLWebViewElement>; (tagname: "xmp"): NodeListOf<HTMLPreElement>; (tagname: string): NodeListOf<Element>; }
+>getElementsByTagName : { <K extends "a" | "abbr" | "acronym" | "address" | "applet" | "area" | "article" | "aside" | "audio" | "b" | "base" | "basefont" | "bdo" | "big" | "blockquote" | "body" | "br" | "button" | "canvas" | "caption" | "center" | "circle" | "cite" | "clippath" | "code" | "col" | "colgroup" | "datalist" | "dd" | "defs" | "del" | "desc" | "dfn" | "dir" | "div" | "dl" | "dt" | "ellipse" | "em" | "embed" | "feblend" | "fecolormatrix" | "fecomponenttransfer" | "fecomposite" | "feconvolvematrix" | "fediffuselighting" | "fedisplacementmap" | "fedistantlight" | "feflood" | "fefunca" | "fefuncb" | "fefuncg" | "fefuncr" | "fegaussianblur" | "feimage" | "femerge" | "femergenode" | "femorphology" | "feoffset" | "fepointlight" | "fespecularlighting" | "fespotlight" | "fetile" | "feturbulence" | "fieldset" | "figcaption" | "figure" | "filter" | "font" | "footer" | "foreignobject" | "form" | "frame" | "frameset" | "g" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "head" | "header" | "hgroup" | "hr" | "html" | "i" | "iframe" | "image" | "img" | "input" | "ins" | "isindex" | "kbd" | "keygen" | "label" | "legend" | "li" | "line" | "lineargradient" | "link" | "listing" | "map" | "mark" | "marker" | "marquee" | "mask" | "menu" | "meta" | "metadata" | "meter" | "nav" | "nextid" | "nobr" | "noframes" | "noscript" | "object" | "ol" | "optgroup" | "option" | "p" | "param" | "path" | "pattern" | "picture" | "plaintext" | "polygon" | "polyline" | "pre" | "progress" | "q" | "radialgradient" | "rect" | "rt" | "ruby" | "s" | "samp" | "script" | "section" | "select" | "small" | "source" | "span" | "stop" | "strike" | "strong" | "style" | "sub" | "sup" | "svg" | "switch" | "symbol" | "table" | "tbody" | "td" | "template" | "text" | "textpath" | "textarea" | "tfoot" | "th" | "thead" | "title" | "tr" | "track" | "tspan" | "tt" | "u" | "ul" | "use" | "var" | "video" | "view" | "wbr" | "x-ms-webview" | "xmp">(tagname: K): ElementListTagNameMap[K]; (tagname: string): NodeListOf<Element>; }
 >"a" : "a"
 
     element.href;

From 8a334ac00d82243b6371db24ee612eef59702e3e Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Mon, 21 Nov 2016 23:13:22 -0800
Subject: [PATCH 326/421] Add special handeling for function and array in
 Object.freeze

---
 src/lib/es5.d.ts                               | 12 ++++++++++++
 .../reference/objectFreeze.errors.txt          | 15 +++++++++++++++
 tests/baselines/reference/objectFreeze.js      | 18 ++++++++++++++++++
 tests/cases/compiler/objectFreeze.ts           |  6 ++++++
 4 files changed, 51 insertions(+)
 create mode 100644 tests/baselines/reference/objectFreeze.errors.txt
 create mode 100644 tests/baselines/reference/objectFreeze.js
 create mode 100644 tests/cases/compiler/objectFreeze.ts

diff --git a/src/lib/es5.d.ts b/src/lib/es5.d.ts
index 7ee47817802..63b60f534af 100644
--- a/src/lib/es5.d.ts
+++ b/src/lib/es5.d.ts
@@ -176,6 +176,18 @@ interface ObjectConstructor {
       */
     seal<T>(o: T): T;
 
+    /**
+      * Prevents the modification of existing property attributes and values, and prevents the addition of new properties.
+      * @param o Object on which to lock the attributes.
+      */
+    freeze<T>(a: T[]): ReadonlyArray<T>;
+
+    /**
+      * Prevents the modification of existing property attributes and values, and prevents the addition of new properties.
+      * @param o Object on which to lock the attributes.
+      */
+    freeze<T, U>(f: (...args: T[]) => U): (...args: T[]) => U;
+
     /**
       * Prevents the modification of existing property attributes and values, and prevents the addition of new properties.
       * @param o Object on which to lock the attributes.
diff --git a/tests/baselines/reference/objectFreeze.errors.txt b/tests/baselines/reference/objectFreeze.errors.txt
new file mode 100644
index 00000000000..e820520ed8a
--- /dev/null
+++ b/tests/baselines/reference/objectFreeze.errors.txt
@@ -0,0 +1,15 @@
+tests/cases/compiler/objectFreeze.ts(5,24): error TS2345: Argument of type '123' is not assignable to parameter of type 'string'.
+tests/cases/compiler/objectFreeze.ts(6,2): error TS1128: Declaration or statement expected.
+
+
+==== tests/cases/compiler/objectFreeze.ts (2 errors) ====
+    class A {
+        constructor(public a1: string) {
+        }
+    }
+    function foo(x = new A(123)) { //should error, 123 is not string
+                           ~~~
+!!! error TS2345: Argument of type '123' is not assignable to parameter of type 'string'.
+    }}
+     ~
+!!! error TS1128: Declaration or statement expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/objectFreeze.js b/tests/baselines/reference/objectFreeze.js
new file mode 100644
index 00000000000..86c2833dabf
--- /dev/null
+++ b/tests/baselines/reference/objectFreeze.js
@@ -0,0 +1,18 @@
+//// [objectFreeze.ts]
+class A {
+    constructor(public a1: string) {
+    }
+}
+function foo(x = new A(123)) { //should error, 123 is not string
+}}
+
+//// [objectFreeze.js]
+var A = (function () {
+    function A(a1) {
+        this.a1 = a1;
+    }
+    return A;
+}());
+function foo(x) {
+    if (x === void 0) { x = new A(123); }
+}
diff --git a/tests/cases/compiler/objectFreeze.ts b/tests/cases/compiler/objectFreeze.ts
new file mode 100644
index 00000000000..e92f9ecd00e
--- /dev/null
+++ b/tests/cases/compiler/objectFreeze.ts
@@ -0,0 +1,6 @@
+class A {
+    constructor(public a1: string) {
+    }
+}
+function foo(x = new A(123)) { //should error, 123 is not string
+}}
\ No newline at end of file

From 72df02cbbd70061574988eef38f9cb775b5bfa61 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Mon, 21 Nov 2016 23:27:18 -0800
Subject: [PATCH 327/421] Add function

---
 src/lib/es5.d.ts                              |  2 +-
 .../reference/objectFreeze.errors.txt         | 27 +++++++++--------
 tests/baselines/reference/objectFreeze.js     | 30 +++++++++----------
 tests/cases/compiler/objectFreeze.ts          | 14 +++++----
 4 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/src/lib/es5.d.ts b/src/lib/es5.d.ts
index 63b60f534af..3ad6046c85e 100644
--- a/src/lib/es5.d.ts
+++ b/src/lib/es5.d.ts
@@ -186,7 +186,7 @@ interface ObjectConstructor {
       * Prevents the modification of existing property attributes and values, and prevents the addition of new properties.
       * @param o Object on which to lock the attributes.
       */
-    freeze<T, U>(f: (...args: T[]) => U): (...args: T[]) => U;
+    freeze<T>(f: (...args: any[]) => T): (...args: any[]) => T;
 
     /**
       * Prevents the modification of existing property attributes and values, and prevents the addition of new properties.
diff --git a/tests/baselines/reference/objectFreeze.errors.txt b/tests/baselines/reference/objectFreeze.errors.txt
index e820520ed8a..0a1a0518829 100644
--- a/tests/baselines/reference/objectFreeze.errors.txt
+++ b/tests/baselines/reference/objectFreeze.errors.txt
@@ -1,15 +1,18 @@
-tests/cases/compiler/objectFreeze.ts(5,24): error TS2345: Argument of type '123' is not assignable to parameter of type 'string'.
-tests/cases/compiler/objectFreeze.ts(6,2): error TS1128: Declaration or statement expected.
+tests/cases/compiler/objectFreeze.ts(5,1): error TS2542: Index signature in type 'ReadonlyArray<number>' only permits reading.
+tests/cases/compiler/objectFreeze.ts(8,3): error TS2540: Cannot assign to 'b' because it is a constant or a read-only property.
 
 
 ==== tests/cases/compiler/objectFreeze.ts (2 errors) ====
-    class A {
-        constructor(public a1: string) {
-        }
-    }
-    function foo(x = new A(123)) { //should error, 123 is not string
-                           ~~~
-!!! error TS2345: Argument of type '123' is not assignable to parameter of type 'string'.
-    }}
-     ~
-!!! error TS1128: Declaration or statement expected.
\ No newline at end of file
+    const f = Object.freeze(function foo(a: number, b: string) { return false; });
+    f(1, "") === false;
+    
+    const a = Object.freeze([1, 2, 3]);
+    a[0] = 1;
+    ~~~~
+!!! error TS2542: Index signature in type 'ReadonlyArray<number>' only permits reading.
+    
+    const o = Object.freeze({ a: 1, b: "string" });
+    o.b = "another";
+      ~
+!!! error TS2540: Cannot assign to 'b' because it is a constant or a read-only property.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/objectFreeze.js b/tests/baselines/reference/objectFreeze.js
index 86c2833dabf..51308c8e07c 100644
--- a/tests/baselines/reference/objectFreeze.js
+++ b/tests/baselines/reference/objectFreeze.js
@@ -1,18 +1,18 @@
 //// [objectFreeze.ts]
-class A {
-    constructor(public a1: string) {
-    }
-}
-function foo(x = new A(123)) { //should error, 123 is not string
-}}
+const f = Object.freeze(function foo(a: number, b: string) { return false; });
+f(1, "") === false;
+
+const a = Object.freeze([1, 2, 3]);
+a[0] = 1;
+
+const o = Object.freeze({ a: 1, b: "string" });
+o.b = "another";
+
 
 //// [objectFreeze.js]
-var A = (function () {
-    function A(a1) {
-        this.a1 = a1;
-    }
-    return A;
-}());
-function foo(x) {
-    if (x === void 0) { x = new A(123); }
-}
+var f = Object.freeze(function foo(a, b) { return false; });
+f(1, "") === false;
+var a = Object.freeze([1, 2, 3]);
+a[0] = 1;
+var o = Object.freeze({ a: 1, b: "string" });
+o.b = "another";
diff --git a/tests/cases/compiler/objectFreeze.ts b/tests/cases/compiler/objectFreeze.ts
index e92f9ecd00e..2c93fc8f075 100644
--- a/tests/cases/compiler/objectFreeze.ts
+++ b/tests/cases/compiler/objectFreeze.ts
@@ -1,6 +1,8 @@
-class A {
-    constructor(public a1: string) {
-    }
-}
-function foo(x = new A(123)) { //should error, 123 is not string
-}}
\ No newline at end of file
+const f = Object.freeze(function foo(a: number, b: string) { return false; });
+f(1, "") === false;
+
+const a = Object.freeze([1, 2, 3]);
+a[0] = 1;
+
+const o = Object.freeze({ a: 1, b: "string" });
+o.b = "another";

From 6a5682c4a3c81382f684029f840cc0e7df6b8a83 Mon Sep 17 00:00:00 2001
From: Ryan Cavanaugh <RyanCavanaugh@users.noreply.github.com>
Date: Tue, 22 Nov 2016 10:52:47 -0800
Subject: [PATCH 328/421] Support JSDoc @augments tag

Fixes #12428
---
 src/compiler/checker.ts                | 12 +++++++++++-
 src/compiler/parser.ts                 | 15 +++++++++++++++
 src/compiler/types.ts                  |  6 ++++++
 src/compiler/utilities.ts              |  4 ++++
 tests/cases/fourslash/jsDocAugments.ts | 23 +++++++++++++++++++++++
 5 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 tests/cases/fourslash/jsDocAugments.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 7f2c85d7a0d..7a361b09869 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -3796,6 +3796,16 @@ namespace ts {
                 }
                 baseType = getReturnTypeOfSignature(constructors[0]);
             }
+
+            // In a JS file, you can use the @augments jsdoc tag to specify a base type with type parameters
+            const valueDecl = type.symbol.valueDeclaration;
+            if (valueDecl && isInJavaScriptFile(valueDecl)) {
+                const augTag = getJSDocAugmentsTag(type.symbol.valueDeclaration);
+                if (augTag) {
+                    baseType = getTypeFromTypeNode(augTag.typeExpression.type);
+                }
+            }
+
             if (baseType === unknownType) {
                 return;
             }
@@ -3804,7 +3814,7 @@ namespace ts {
                 return;
             }
             if (type === baseType || hasBaseType(<InterfaceType>baseType, type)) {
-                error(type.symbol.valueDeclaration, Diagnostics.Type_0_recursively_references_itself_as_a_base_type,
+                error(valueDecl, Diagnostics.Type_0_recursively_references_itself_as_a_base_type,
                     typeToString(type, /*enclosingDeclaration*/ undefined, TypeFormatFlags.WriteArrayAsGenericType));
                 return;
             }
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index d286a9d9dac..0ce21b2d9fe 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -418,6 +418,8 @@ namespace ts {
                 return visitNode(cbNode, (<JSDocReturnTag>node).typeExpression);
             case SyntaxKind.JSDocTypeTag:
                 return visitNode(cbNode, (<JSDocTypeTag>node).typeExpression);
+            case SyntaxKind.JSDocAugmentsTag:
+                return visitNode(cbNode, (<JSDocAugmentsTag>node).typeExpression);
             case SyntaxKind.JSDocTemplateTag:
                 return visitNodes(cbNodes, (<JSDocTemplateTag>node).typeParameters);
             case SyntaxKind.JSDocTypedefTag:
@@ -6426,6 +6428,9 @@ namespace ts {
                     let tag: JSDocTag;
                     if (tagName) {
                         switch (tagName.text) {
+                            case "augments":
+                                tag = parseAugmentsTag(atToken, tagName);
+                                break;
                             case "param":
                                 tag = parseParamTag(atToken, tagName);
                                 break;
@@ -6642,6 +6647,16 @@ namespace ts {
                     return finishNode(result);
                 }
 
+                function parseAugmentsTag(atToken: AtToken, tagName: Identifier): JSDocAugmentsTag {
+                    const typeExpression = tryParseTypeExpression();
+
+                    const result = <JSDocAugmentsTag>createNode(SyntaxKind.JSDocAugmentsTag, atToken.pos);
+                    result.atToken = atToken;
+                    result.tagName = tagName;
+                    result.typeExpression = typeExpression;
+                    return finishNode(result);
+                }
+
                 function parseTypedefTag(atToken: AtToken, tagName: Identifier): JSDocTypedefTag {
                     const typeExpression = tryParseTypeExpression();
                     skipWhitespace();
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 2cbace563a0..176176370e0 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -349,6 +349,7 @@ namespace ts {
         JSDocThisType,
         JSDocComment,
         JSDocTag,
+        JSDocAugmentsTag,
         JSDocParameterTag,
         JSDocReturnTag,
         JSDocTypeTag,
@@ -1989,6 +1990,11 @@ namespace ts {
         kind: SyntaxKind.JSDocTag;
     }
 
+    export interface JSDocAugmentsTag extends JSDocTag {
+        kind: SyntaxKind.JSDocAugmentsTag;
+        typeExpression: JSDocTypeExpression;
+    }
+
     export interface JSDocTemplateTag extends JSDocTag {
         kind: SyntaxKind.JSDocTemplateTag;
         typeParameters: NodeArray<TypeParameterDeclaration>;
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index e313f983fad..363ddf0de80 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -1539,6 +1539,10 @@ namespace ts {
         return tag && tag.typeExpression && tag.typeExpression.type;
     }
 
+    export function getJSDocAugmentsTag(node: Node): JSDocAugmentsTag {
+        return getFirstJSDocTag(node, SyntaxKind.JSDocAugmentsTag) as JSDocAugmentsTag;
+    }
+
     export function getJSDocReturnTag(node: Node): JSDocReturnTag {
         return getFirstJSDocTag(node, SyntaxKind.JSDocReturnTag) as JSDocReturnTag;
     }
diff --git a/tests/cases/fourslash/jsDocAugments.ts b/tests/cases/fourslash/jsDocAugments.ts
new file mode 100644
index 00000000000..24458c529fb
--- /dev/null
+++ b/tests/cases/fourslash/jsDocAugments.ts
@@ -0,0 +1,23 @@
+///<reference path="fourslash.ts" />
+
+// @allowJs: true
+// @Filename: dummy.js
+
+//// /**
+////  * @augments {Thing<string>}
+////  */
+//// class MyStringThing extends Thing {
+////     constructor() {
+////         var x = this.mine;
+////         x/**/;
+////     }
+//// }
+
+// @Filename: declarations.d.ts
+//// declare class Thing<T> {
+////     mine: T;    
+//// }
+
+goTo.marker();
+verify.quickInfoIs("(local var) x: string");
+

From 103090b60ecd2a09f19880cdb5d8c5d4bf9abc18 Mon Sep 17 00:00:00 2001
From: Zhengbo Li <zhengbli@microsoft.com>
Date: Tue, 22 Nov 2016 10:56:46 -0800
Subject: [PATCH 329/421] report config errors when config file changed
 (#12372)

---
 .../unittests/tsserverProjectSystem.ts        | 37 +++++++++++++++++++
 src/server/editorServices.ts                  | 12 ++++--
 2 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
index e9b6ccb7884..bf7be965b50 100644
--- a/src/harness/unittests/tsserverProjectSystem.ts
+++ b/src/harness/unittests/tsserverProjectSystem.ts
@@ -2452,6 +2452,43 @@ namespace ts.projectSystem {
             openFilesForSession([file], session);
             serverEventManager.checkEventCountOfType("configFileDiag", 1);
         });
+
+        it("are generated when the config file changes", () => {
+            const serverEventManager = new TestServerEventManager();
+            const file = {
+                path: "/a/b/app.ts",
+                content: "let x = 10"
+            };
+            const configFile = {
+                path: "/a/b/tsconfig.json",
+                content: `{
+                    "compilerOptions": {}
+                }`
+            };
+
+            const host = createServerHost([file, configFile]);
+            const session = createSession(host, /*typingsInstaller*/ undefined, serverEventManager.handler);
+            openFilesForSession([file], session);
+            serverEventManager.checkEventCountOfType("configFileDiag", 1);
+
+            configFile.content = `{
+                "compilerOptions": {
+                    "haha": 123
+                }
+            }`;
+            host.reloadFS([file, configFile]);
+            host.triggerFileWatcherCallback(configFile.path);
+            host.runQueuedTimeoutCallbacks();
+            serverEventManager.checkEventCountOfType("configFileDiag", 2);
+
+            configFile.content = `{
+                "compilerOptions": {}
+            }`;
+            host.reloadFS([file, configFile]);
+            host.triggerFileWatcherCallback(configFile.path);
+            host.runQueuedTimeoutCallbacks();
+            serverEventManager.checkEventCountOfType("configFileDiag", 3);
+        });
     });
 
     describe("skipLibCheck", () => {
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index 6a7cb049296..2a0e78eaccc 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -520,8 +520,10 @@ namespace ts.server {
         }
 
         private onConfigChangedForConfiguredProject(project: ConfiguredProject) {
-            this.logger.info(`Config file changed: ${project.getConfigFilePath()}`);
-            this.updateConfiguredProject(project);
+            const configFileName = project.getConfigFilePath();
+            this.logger.info(`Config file changed: ${configFileName}`);
+            const configFileErrors = this.updateConfiguredProject(project);
+            this.reportConfigFileDiagnostics(configFileName, configFileErrors, /*triggerFile*/ configFileName);
             this.refreshInferredProjects();
         }
 
@@ -1015,6 +1017,9 @@ namespace ts.server {
                 return;
             }
 
+            // note: the returned "success" is true does not mean the "configFileErrors" is empty.
+            // because we might have tolerated the errors and kept going. So always return the configFileErrors
+            // regardless the "success" here is true or not.
             const { success, projectOptions, configFileErrors } = this.convertConfigFileContentToProjectOptions(project.getConfigFilePath());
             if (!success) {
                 // reset project settings to default
@@ -1026,7 +1031,7 @@ namespace ts.server {
                 project.setCompilerOptions(projectOptions.compilerOptions);
                 if (!project.languageServiceEnabled) {
                     // language service is already disabled
-                    return;
+                    return configFileErrors;
                 }
                 project.disableLanguageService();
                 project.stopWatchingDirectory();
@@ -1038,6 +1043,7 @@ namespace ts.server {
                 this.watchConfigDirectoryForProject(project, projectOptions);
                 this.updateNonInferredProject(project, projectOptions.files, fileNamePropertyReader, projectOptions.compilerOptions, projectOptions.typingOptions, projectOptions.compileOnSave, configFileErrors);
             }
+            return configFileErrors;
         }
 
         createInferredProjectWithRootFileIfNecessary(root: ScriptInfo) {

From 61204cc05df0e6cab10ccebea0193f36adfe9164 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Tue, 22 Nov 2016 14:17:59 -0600
Subject: [PATCH 330/421] Re-add sourceFiles to program emit callback

Addresses https://github.com/Microsoft/TypeScript/issues/12444.
---
 src/compiler/emitter.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index ed7f3ee16a0..90738d828be 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -143,7 +143,7 @@ namespace ts {
 
             // Write the source map
             if (compilerOptions.sourceMap && !compilerOptions.inlineSourceMap) {
-                writeFile(host, emitterDiagnostics, sourceMapFilePath, sourceMap.getText(),  /*writeByteOrderMark*/ false);
+                writeFile(host, emitterDiagnostics, sourceMapFilePath, sourceMap.getText(),  /*writeByteOrderMark*/ false, sourceFiles);
             }
 
             // Record source map data for the test harness.
@@ -152,7 +152,7 @@ namespace ts {
             }
 
             // Write the output file
-            writeFile(host, emitterDiagnostics, jsFilePath, writer.getText(), compilerOptions.emitBOM);
+            writeFile(host, emitterDiagnostics, jsFilePath, writer.getText(), compilerOptions.emitBOM, sourceFiles);
 
             // Reset state
             sourceMap.reset();

From d7dd0289d509c3f0b06a29704b83e519a80d8aec Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Tue, 22 Nov 2016 14:27:39 -0800
Subject: [PATCH 331/421] Distribute isomorphic mapped types over union types

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 0e74cd9db2f..c58fe6e44e2 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -6472,7 +6472,36 @@ namespace ts {
             return result;
         }
 
-        function instantiateMappedType(type: MappedType, mapper: TypeMapper): MappedType {
+        function instantiateMappedType(type: MappedType, mapper: TypeMapper): Type {
+            // Check if we have an isomorphic mapped type, i.e. a type of the form { [P in keyof T]: X } for some
+            // type parameter T. If so, the mapped type is distributive over a union type and when T is instantiated
+            // to a union type A | B, we produce { [P in keyof A]: X } | { [P in keyof B]: X }. Furthermore, for
+            // isomorphic mapped types we leave primitive types alone. For example, when T is instantiated to a
+            // union type A | undefined, we produce { [P in keyof A]: X } | undefined.
+            const constraintType = getConstraintTypeFromMappedType(type);
+            if (constraintType.flags & TypeFlags.Index) {
+                const typeParameter = (<IndexType>constraintType).type;
+                const mappedTypeParameter = mapper(typeParameter);
+                if (typeParameter !== mappedTypeParameter) {
+                    return mapType(mappedTypeParameter, t => {
+                        if (isMappableType(t)) {
+                            const replacementMapper = createUnaryTypeMapper(typeParameter, t);
+                            const combinedMapper = mapper.mappedTypes && mapper.mappedTypes.length === 1 ? replacementMapper : combineTypeMappers(replacementMapper, mapper);
+                            combinedMapper.mappedTypes = mapper.mappedTypes;
+                            return instantiateMappedObjectType(type, combinedMapper);
+                        }
+                        return t;
+                    });
+                }
+            }
+            return instantiateMappedObjectType(type, mapper);
+        }
+
+        function isMappableType(type: Type) {
+            return type.flags & (TypeFlags.TypeParameter | TypeFlags.Object | TypeFlags.Intersection | TypeFlags.IndexedAccess);
+        }
+
+        function instantiateMappedObjectType(type: MappedType, mapper: TypeMapper): Type {
             const result = <MappedType>createObjectType(ObjectFlags.Mapped | ObjectFlags.Instantiated, type.symbol);
             result.declaration = type.declaration;
             result.mapper = type.mapper ? combineTypeMappers(type.mapper, mapper) : mapper;
@@ -7514,25 +7543,30 @@ namespace ts {
 
             // A type [P in S]: X is related to a type [P in T]: Y if T is related to S and X is related to Y.
             function mappedTypeRelatedTo(source: Type, target: Type, reportErrors: boolean): Ternary {
-                if (isGenericMappedType(source) && isGenericMappedType(target)) {
-                    let result: Ternary;
-                    if (relation === identityRelation) {
-                        const readonlyMatches = !(<MappedType>source).declaration.readonlyToken === !(<MappedType>target).declaration.readonlyToken;
-                        const optionalMatches = !(<MappedType>source).declaration.questionToken === !(<MappedType>target).declaration.questionToken;
-                        if (readonlyMatches && optionalMatches) {
-                            if (result = isRelatedTo(getConstraintTypeFromMappedType(<MappedType>target), getConstraintTypeFromMappedType(<MappedType>source), reportErrors)) {
-                                return result & isRelatedTo(getErasedTemplateTypeFromMappedType(<MappedType>source), getErasedTemplateTypeFromMappedType(<MappedType>target), reportErrors);
+                if (isGenericMappedType(target)) {
+                    if (isGenericMappedType(source)) {
+                        let result: Ternary;
+                        if (relation === identityRelation) {
+                            const readonlyMatches = !(<MappedType>source).declaration.readonlyToken === !(<MappedType>target).declaration.readonlyToken;
+                            const optionalMatches = !(<MappedType>source).declaration.questionToken === !(<MappedType>target).declaration.questionToken;
+                            if (readonlyMatches && optionalMatches) {
+                                if (result = isRelatedTo(getConstraintTypeFromMappedType(<MappedType>target), getConstraintTypeFromMappedType(<MappedType>source), reportErrors)) {
+                                    return result & isRelatedTo(getErasedTemplateTypeFromMappedType(<MappedType>source), getErasedTemplateTypeFromMappedType(<MappedType>target), reportErrors);
+                                }
                             }
                         }
-                    }
-                    else {
-                        if (relation === comparableRelation || !(<MappedType>source).declaration.questionToken || (<MappedType>target).declaration.questionToken) {
-                            if (result = isRelatedTo(getConstraintTypeFromMappedType(<MappedType>target), getConstraintTypeFromMappedType(<MappedType>source), reportErrors)) {
-                                return result & isRelatedTo(getTemplateTypeFromMappedType(<MappedType>source), getTemplateTypeFromMappedType(<MappedType>target), reportErrors);
+                        else {
+                            if (relation === comparableRelation || !(<MappedType>source).declaration.questionToken || (<MappedType>target).declaration.questionToken) {
+                                if (result = isRelatedTo(getConstraintTypeFromMappedType(<MappedType>target), getConstraintTypeFromMappedType(<MappedType>source), reportErrors)) {
+                                    return result & isRelatedTo(getTemplateTypeFromMappedType(<MappedType>source), getTemplateTypeFromMappedType(<MappedType>target), reportErrors);
+                                }
                             }
                         }
                     }
                 }
+                else if (relation !== identityRelation && isEmptyObjectType(resolveStructuredTypeMembers(<ObjectType>target))) {
+                    return Ternary.True;
+                }
                 return Ternary.False;
             }
 

From 66f8a406ddd1c09e1e70f6adca2550a7cbf18a71 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Tue, 22 Nov 2016 14:28:21 -0800
Subject: [PATCH 332/421] Update tests

---
 .../conformance/types/mapped/mappedTypes1.ts  |  4 +++-
 .../conformance/types/mapped/mappedTypes2.ts  | 21 ++++++++++++-------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/tests/cases/conformance/types/mapped/mappedTypes1.ts b/tests/cases/conformance/types/mapped/mappedTypes1.ts
index d090b731518..b74872c2bfd 100644
--- a/tests/cases/conformance/types/mapped/mappedTypes1.ts
+++ b/tests/cases/conformance/types/mapped/mappedTypes1.ts
@@ -34,7 +34,9 @@ type T47 = { [P in string | "a" | "b" | "0" | "1"]: void };
 declare function f1<T1>(): { [P in keyof T1]: void };
 declare function f2<T1 extends string>(): { [P in keyof T1]: void };
 declare function f3<T1 extends number>(): { [P in keyof T1]: void };
+declare function f4<T1 extends Number>(): { [P in keyof T1]: void };
 
 let x1 = f1();
 let x2 = f2();
-let x3 = f3();
\ No newline at end of file
+let x3 = f3();
+let x4 = f4();
\ No newline at end of file
diff --git a/tests/cases/conformance/types/mapped/mappedTypes2.ts b/tests/cases/conformance/types/mapped/mappedTypes2.ts
index e72a0c0a892..60db4c1383b 100644
--- a/tests/cases/conformance/types/mapped/mappedTypes2.ts
+++ b/tests/cases/conformance/types/mapped/mappedTypes2.ts
@@ -31,25 +31,30 @@ declare function pick<T, K extends keyof T>(obj: T, ...keys: K[]): Pick<T, K>;
 declare function mapObject<K extends string, T, U>(obj: Record<K, T>, f: (x: T) => U): Record<K, U>;
 declare function proxify<T>(obj: T): Proxify<T>;
 
+interface Point {
+    x: number;
+    y: number;
+}
+
 interface Shape {
     name: string;
     width: number;
     height: number;
-    visible: boolean;
+    location: Point;
 }
 
 interface PartialShape {
     name?: string;
     width?: number;
     height?: number;
-    visible?: boolean;
+    location?: Point;
 }
 
 interface ReadonlyShape {
     readonly name: string;
     readonly width: number;
     readonly height: number;
-    readonly visible: boolean;
+    readonly location: Point;
 }
 
 function f0(s1: Shape, s2: Shape) {
@@ -70,7 +75,7 @@ function f2(shape: Shape) {
 }
 
 function f3(shape: Shape) {
-    const x = pick(shape, "name", "visible");  // { name: string, visible: boolean }
+    const x = pick(shape, "name", "location");  // { name: string, location: Point }
 }
 
 function f4() {
@@ -81,11 +86,11 @@ function f4() {
 function f5(shape: Shape) {
     const p = proxify(shape);
     let name = p.name.get();
-    p.visible.set(false);
+    p.width.set(42);
 }
 
 function f6(shape: DeepReadonly<Shape>) {
-    let name = shape.name;  // DeepReadonly<string>
-    let length = name.length;  // DeepReadonly<number>
-    let toString = length.toString;  // DeepReadonly<(radix?: number) => string>
+    let name = shape.name;  // string
+    let location = shape.location;  // DeepReadonly<Point>
+    let x = location.x;  // number
 }
\ No newline at end of file

From 973fce0f5d9e70861fba9f723de9e848529fa1ba Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Tue, 22 Nov 2016 14:28:34 -0800
Subject: [PATCH 333/421] Accept new baselines

---
 tests/baselines/reference/mappedTypes1.js     |  35 +---
 .../baselines/reference/mappedTypes1.symbols  |  17 +-
 tests/baselines/reference/mappedTypes1.types  |  20 +-
 tests/baselines/reference/mappedTypes2.js     |  41 ++--
 .../baselines/reference/mappedTypes2.symbols  | 191 ++++++++++--------
 tests/baselines/reference/mappedTypes2.types  |  75 ++++---
 6 files changed, 211 insertions(+), 168 deletions(-)

diff --git a/tests/baselines/reference/mappedTypes1.js b/tests/baselines/reference/mappedTypes1.js
index a172b637d1c..1998ad5ab6b 100644
--- a/tests/baselines/reference/mappedTypes1.js
+++ b/tests/baselines/reference/mappedTypes1.js
@@ -33,15 +33,18 @@ type T47 = { [P in string | "a" | "b" | "0" | "1"]: void };
 declare function f1<T1>(): { [P in keyof T1]: void };
 declare function f2<T1 extends string>(): { [P in keyof T1]: void };
 declare function f3<T1 extends number>(): { [P in keyof T1]: void };
+declare function f4<T1 extends Number>(): { [P in keyof T1]: void };
 
 let x1 = f1();
 let x2 = f2();
-let x3 = f3();
+let x3 = f3();
+let x4 = f4();
 
 //// [mappedTypes1.js]
 var x1 = f1();
 var x2 = f2();
 var x3 = f3();
+var x4 = f4();
 
 
 //// [mappedTypes1.d.ts]
@@ -128,31 +131,13 @@ declare function f2<T1 extends string>(): {
 declare function f3<T1 extends number>(): {
     [P in keyof T1]: void;
 };
-declare let x1: {};
-declare let x2: {
-    toString: void;
-    charAt: void;
-    charCodeAt: void;
-    concat: void;
-    indexOf: void;
-    lastIndexOf: void;
-    localeCompare: void;
-    match: void;
-    replace: void;
-    search: void;
-    slice: void;
-    split: void;
-    substring: void;
-    toLowerCase: void;
-    toLocaleLowerCase: void;
-    toUpperCase: void;
-    toLocaleUpperCase: void;
-    trim: void;
-    length: void;
-    substr: void;
-    valueOf: void;
+declare function f4<T1 extends Number>(): {
+    [P in keyof T1]: void;
 };
-declare let x3: {
+declare let x1: {};
+declare let x2: string;
+declare let x3: number;
+declare let x4: {
     toString: void;
     valueOf: void;
     toFixed: void;
diff --git a/tests/baselines/reference/mappedTypes1.symbols b/tests/baselines/reference/mappedTypes1.symbols
index 88ced68aa0e..e8c09b25989 100644
--- a/tests/baselines/reference/mappedTypes1.symbols
+++ b/tests/baselines/reference/mappedTypes1.symbols
@@ -140,15 +140,26 @@ declare function f3<T1 extends number>(): { [P in keyof T1]: void };
 >P : Symbol(P, Decl(mappedTypes1.ts, 33, 45))
 >T1 : Symbol(T1, Decl(mappedTypes1.ts, 33, 20))
 
+declare function f4<T1 extends Number>(): { [P in keyof T1]: void };
+>f4 : Symbol(f4, Decl(mappedTypes1.ts, 33, 68))
+>T1 : Symbol(T1, Decl(mappedTypes1.ts, 34, 20))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>P : Symbol(P, Decl(mappedTypes1.ts, 34, 45))
+>T1 : Symbol(T1, Decl(mappedTypes1.ts, 34, 20))
+
 let x1 = f1();
->x1 : Symbol(x1, Decl(mappedTypes1.ts, 35, 3))
+>x1 : Symbol(x1, Decl(mappedTypes1.ts, 36, 3))
 >f1 : Symbol(f1, Decl(mappedTypes1.ts, 29, 59))
 
 let x2 = f2();
->x2 : Symbol(x2, Decl(mappedTypes1.ts, 36, 3))
+>x2 : Symbol(x2, Decl(mappedTypes1.ts, 37, 3))
 >f2 : Symbol(f2, Decl(mappedTypes1.ts, 31, 53))
 
 let x3 = f3();
->x3 : Symbol(x3, Decl(mappedTypes1.ts, 37, 3))
+>x3 : Symbol(x3, Decl(mappedTypes1.ts, 38, 3))
 >f3 : Symbol(f3, Decl(mappedTypes1.ts, 32, 68))
 
+let x4 = f4();
+>x4 : Symbol(x4, Decl(mappedTypes1.ts, 39, 3))
+>f4 : Symbol(f4, Decl(mappedTypes1.ts, 33, 68))
+
diff --git a/tests/baselines/reference/mappedTypes1.types b/tests/baselines/reference/mappedTypes1.types
index 6886810c394..35d13143bab 100644
--- a/tests/baselines/reference/mappedTypes1.types
+++ b/tests/baselines/reference/mappedTypes1.types
@@ -142,18 +142,30 @@ declare function f3<T1 extends number>(): { [P in keyof T1]: void };
 >P : P
 >T1 : T1
 
+declare function f4<T1 extends Number>(): { [P in keyof T1]: void };
+>f4 : <T1 extends Number>() => { [P in keyof T1]: void; }
+>T1 : T1
+>Number : Number
+>P : P
+>T1 : T1
+
 let x1 = f1();
 >x1 : {}
 >f1() : {}
 >f1 : <T1>() => { [P in keyof T1]: void; }
 
 let x2 = f2();
->x2 : { toString: void; charAt: void; charCodeAt: void; concat: void; indexOf: void; lastIndexOf: void; localeCompare: void; match: void; replace: void; search: void; slice: void; split: void; substring: void; toLowerCase: void; toLocaleLowerCase: void; toUpperCase: void; toLocaleUpperCase: void; trim: void; length: void; substr: void; valueOf: void; }
->f2() : { toString: void; charAt: void; charCodeAt: void; concat: void; indexOf: void; lastIndexOf: void; localeCompare: void; match: void; replace: void; search: void; slice: void; split: void; substring: void; toLowerCase: void; toLocaleLowerCase: void; toUpperCase: void; toLocaleUpperCase: void; trim: void; length: void; substr: void; valueOf: void; }
+>x2 : string
+>f2() : string
 >f2 : <T1 extends string>() => { [P in keyof T1]: void; }
 
 let x3 = f3();
->x3 : { toString: void; valueOf: void; toFixed: void; toExponential: void; toPrecision: void; toLocaleString: void; }
->f3() : { toString: void; valueOf: void; toFixed: void; toExponential: void; toPrecision: void; toLocaleString: void; }
+>x3 : number
+>f3() : number
 >f3 : <T1 extends number>() => { [P in keyof T1]: void; }
 
+let x4 = f4();
+>x4 : { toString: void; valueOf: void; toFixed: void; toExponential: void; toPrecision: void; toLocaleString: void; }
+>f4() : { toString: void; valueOf: void; toFixed: void; toExponential: void; toPrecision: void; toLocaleString: void; }
+>f4 : <T1 extends Number>() => { [P in keyof T1]: void; }
+
diff --git a/tests/baselines/reference/mappedTypes2.js b/tests/baselines/reference/mappedTypes2.js
index 580cb36c741..84d052b6287 100644
--- a/tests/baselines/reference/mappedTypes2.js
+++ b/tests/baselines/reference/mappedTypes2.js
@@ -30,25 +30,30 @@ declare function pick<T, K extends keyof T>(obj: T, ...keys: K[]): Pick<T, K>;
 declare function mapObject<K extends string, T, U>(obj: Record<K, T>, f: (x: T) => U): Record<K, U>;
 declare function proxify<T>(obj: T): Proxify<T>;
 
+interface Point {
+    x: number;
+    y: number;
+}
+
 interface Shape {
     name: string;
     width: number;
     height: number;
-    visible: boolean;
+    location: Point;
 }
 
 interface PartialShape {
     name?: string;
     width?: number;
     height?: number;
-    visible?: boolean;
+    location?: Point;
 }
 
 interface ReadonlyShape {
     readonly name: string;
     readonly width: number;
     readonly height: number;
-    readonly visible: boolean;
+    readonly location: Point;
 }
 
 function f0(s1: Shape, s2: Shape) {
@@ -69,7 +74,7 @@ function f2(shape: Shape) {
 }
 
 function f3(shape: Shape) {
-    const x = pick(shape, "name", "visible");  // { name: string, visible: boolean }
+    const x = pick(shape, "name", "location");  // { name: string, location: Point }
 }
 
 function f4() {
@@ -80,13 +85,13 @@ function f4() {
 function f5(shape: Shape) {
     const p = proxify(shape);
     let name = p.name.get();
-    p.visible.set(false);
+    p.width.set(42);
 }
 
 function f6(shape: DeepReadonly<Shape>) {
-    let name = shape.name;  // DeepReadonly<string>
-    let length = name.length;  // DeepReadonly<number>
-    let toString = length.toString;  // DeepReadonly<(radix?: number) => string>
+    let name = shape.name;  // string
+    let location = shape.location;  // DeepReadonly<Point>
+    let x = location.x;  // number
 }
 
 //// [mappedTypes2.js]
@@ -115,7 +120,7 @@ function f2(shape) {
     var partial = {};
 }
 function f3(shape) {
-    var x = pick(shape, "name", "visible"); // { name: string, visible: boolean }
+    var x = pick(shape, "name", "location"); // { name: string, location: Point }
 }
 function f4() {
     var rec = { foo: "hello", bar: "world", baz: "bye" };
@@ -124,12 +129,12 @@ function f4() {
 function f5(shape) {
     var p = proxify(shape);
     var name = p.name.get();
-    p.visible.set(false);
+    p.width.set(42);
 }
 function f6(shape) {
-    var name = shape.name; // DeepReadonly<string>
-    var length = name.length; // DeepReadonly<number>
-    var toString = length.toString; // DeepReadonly<(radix?: number) => string>
+    var name = shape.name; // string
+    var location = shape.location; // DeepReadonly<Point>
+    var x = location.x; // number
 }
 
 
@@ -150,23 +155,27 @@ declare function freeze<T>(obj: T): Readonly<T>;
 declare function pick<T, K extends keyof T>(obj: T, ...keys: K[]): Pick<T, K>;
 declare function mapObject<K extends string, T, U>(obj: Record<K, T>, f: (x: T) => U): Record<K, U>;
 declare function proxify<T>(obj: T): Proxify<T>;
+interface Point {
+    x: number;
+    y: number;
+}
 interface Shape {
     name: string;
     width: number;
     height: number;
-    visible: boolean;
+    location: Point;
 }
 interface PartialShape {
     name?: string;
     width?: number;
     height?: number;
-    visible?: boolean;
+    location?: Point;
 }
 interface ReadonlyShape {
     readonly name: string;
     readonly width: number;
     readonly height: number;
-    readonly visible: boolean;
+    readonly location: Point;
 }
 declare function f0(s1: Shape, s2: Shape): void;
 declare function f1(shape: Shape): void;
diff --git a/tests/baselines/reference/mappedTypes2.symbols b/tests/baselines/reference/mappedTypes2.symbols
index 1b6fe299140..079a56243c5 100644
--- a/tests/baselines/reference/mappedTypes2.symbols
+++ b/tests/baselines/reference/mappedTypes2.symbols
@@ -151,190 +151,203 @@ declare function proxify<T>(obj: T): Proxify<T>;
 >Proxify : Symbol(Proxify, Decl(mappedTypes2.ts, 15, 1))
 >T : Symbol(T, Decl(mappedTypes2.ts, 29, 25))
 
+interface Point {
+>Point : Symbol(Point, Decl(mappedTypes2.ts, 29, 48))
+
+    x: number;
+>x : Symbol(Point.x, Decl(mappedTypes2.ts, 31, 17))
+
+    y: number;
+>y : Symbol(Point.y, Decl(mappedTypes2.ts, 32, 14))
+}
+
 interface Shape {
->Shape : Symbol(Shape, Decl(mappedTypes2.ts, 29, 48))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 1))
 
     name: string;
->name : Symbol(Shape.name, Decl(mappedTypes2.ts, 31, 17))
+>name : Symbol(Shape.name, Decl(mappedTypes2.ts, 36, 17))
 
     width: number;
->width : Symbol(Shape.width, Decl(mappedTypes2.ts, 32, 17))
+>width : Symbol(Shape.width, Decl(mappedTypes2.ts, 37, 17))
 
     height: number;
->height : Symbol(Shape.height, Decl(mappedTypes2.ts, 33, 18))
+>height : Symbol(Shape.height, Decl(mappedTypes2.ts, 38, 18))
 
-    visible: boolean;
->visible : Symbol(Shape.visible, Decl(mappedTypes2.ts, 34, 19))
+    location: Point;
+>location : Symbol(Shape.location, Decl(mappedTypes2.ts, 39, 19))
+>Point : Symbol(Point, Decl(mappedTypes2.ts, 29, 48))
 }
 
 interface PartialShape {
->PartialShape : Symbol(PartialShape, Decl(mappedTypes2.ts, 36, 1))
+>PartialShape : Symbol(PartialShape, Decl(mappedTypes2.ts, 41, 1))
 
     name?: string;
->name : Symbol(PartialShape.name, Decl(mappedTypes2.ts, 38, 24))
+>name : Symbol(PartialShape.name, Decl(mappedTypes2.ts, 43, 24))
 
     width?: number;
->width : Symbol(PartialShape.width, Decl(mappedTypes2.ts, 39, 18))
+>width : Symbol(PartialShape.width, Decl(mappedTypes2.ts, 44, 18))
 
     height?: number;
->height : Symbol(PartialShape.height, Decl(mappedTypes2.ts, 40, 19))
+>height : Symbol(PartialShape.height, Decl(mappedTypes2.ts, 45, 19))
 
-    visible?: boolean;
->visible : Symbol(PartialShape.visible, Decl(mappedTypes2.ts, 41, 20))
+    location?: Point;
+>location : Symbol(PartialShape.location, Decl(mappedTypes2.ts, 46, 20))
+>Point : Symbol(Point, Decl(mappedTypes2.ts, 29, 48))
 }
 
 interface ReadonlyShape {
->ReadonlyShape : Symbol(ReadonlyShape, Decl(mappedTypes2.ts, 43, 1))
+>ReadonlyShape : Symbol(ReadonlyShape, Decl(mappedTypes2.ts, 48, 1))
 
     readonly name: string;
->name : Symbol(ReadonlyShape.name, Decl(mappedTypes2.ts, 45, 25))
+>name : Symbol(ReadonlyShape.name, Decl(mappedTypes2.ts, 50, 25))
 
     readonly width: number;
->width : Symbol(ReadonlyShape.width, Decl(mappedTypes2.ts, 46, 26))
+>width : Symbol(ReadonlyShape.width, Decl(mappedTypes2.ts, 51, 26))
 
     readonly height: number;
->height : Symbol(ReadonlyShape.height, Decl(mappedTypes2.ts, 47, 27))
+>height : Symbol(ReadonlyShape.height, Decl(mappedTypes2.ts, 52, 27))
 
-    readonly visible: boolean;
->visible : Symbol(ReadonlyShape.visible, Decl(mappedTypes2.ts, 48, 28))
+    readonly location: Point;
+>location : Symbol(ReadonlyShape.location, Decl(mappedTypes2.ts, 53, 28))
+>Point : Symbol(Point, Decl(mappedTypes2.ts, 29, 48))
 }
 
 function f0(s1: Shape, s2: Shape) {
->f0 : Symbol(f0, Decl(mappedTypes2.ts, 50, 1))
->s1 : Symbol(s1, Decl(mappedTypes2.ts, 52, 12))
->Shape : Symbol(Shape, Decl(mappedTypes2.ts, 29, 48))
->s2 : Symbol(s2, Decl(mappedTypes2.ts, 52, 22))
->Shape : Symbol(Shape, Decl(mappedTypes2.ts, 29, 48))
+>f0 : Symbol(f0, Decl(mappedTypes2.ts, 55, 1))
+>s1 : Symbol(s1, Decl(mappedTypes2.ts, 57, 12))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 1))
+>s2 : Symbol(s2, Decl(mappedTypes2.ts, 57, 22))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 1))
 
     assign(s1, { name: "circle" });
 >assign : Symbol(assign, Decl(mappedTypes2.ts, 23, 2))
->s1 : Symbol(s1, Decl(mappedTypes2.ts, 52, 12))
->name : Symbol(name, Decl(mappedTypes2.ts, 53, 16))
+>s1 : Symbol(s1, Decl(mappedTypes2.ts, 57, 12))
+>name : Symbol(name, Decl(mappedTypes2.ts, 58, 16))
 
     assign(s2, { width: 10, height: 20 });
 >assign : Symbol(assign, Decl(mappedTypes2.ts, 23, 2))
->s2 : Symbol(s2, Decl(mappedTypes2.ts, 52, 22))
->width : Symbol(width, Decl(mappedTypes2.ts, 54, 16))
->height : Symbol(height, Decl(mappedTypes2.ts, 54, 27))
+>s2 : Symbol(s2, Decl(mappedTypes2.ts, 57, 22))
+>width : Symbol(width, Decl(mappedTypes2.ts, 59, 16))
+>height : Symbol(height, Decl(mappedTypes2.ts, 59, 27))
 }
 
 function f1(shape: Shape) {
->f1 : Symbol(f1, Decl(mappedTypes2.ts, 55, 1))
->shape : Symbol(shape, Decl(mappedTypes2.ts, 57, 12))
->Shape : Symbol(Shape, Decl(mappedTypes2.ts, 29, 48))
+>f1 : Symbol(f1, Decl(mappedTypes2.ts, 60, 1))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 62, 12))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 1))
 
     var frozen: ReadonlyShape;
->frozen : Symbol(frozen, Decl(mappedTypes2.ts, 58, 7), Decl(mappedTypes2.ts, 59, 7), Decl(mappedTypes2.ts, 60, 7))
->ReadonlyShape : Symbol(ReadonlyShape, Decl(mappedTypes2.ts, 43, 1))
+>frozen : Symbol(frozen, Decl(mappedTypes2.ts, 63, 7), Decl(mappedTypes2.ts, 64, 7), Decl(mappedTypes2.ts, 65, 7))
+>ReadonlyShape : Symbol(ReadonlyShape, Decl(mappedTypes2.ts, 48, 1))
 
     var frozen: Readonly<Shape>;
->frozen : Symbol(frozen, Decl(mappedTypes2.ts, 58, 7), Decl(mappedTypes2.ts, 59, 7), Decl(mappedTypes2.ts, 60, 7))
+>frozen : Symbol(frozen, Decl(mappedTypes2.ts, 63, 7), Decl(mappedTypes2.ts, 64, 7), Decl(mappedTypes2.ts, 65, 7))
 >Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
->Shape : Symbol(Shape, Decl(mappedTypes2.ts, 29, 48))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 1))
 
     var frozen = freeze(shape);
->frozen : Symbol(frozen, Decl(mappedTypes2.ts, 58, 7), Decl(mappedTypes2.ts, 59, 7), Decl(mappedTypes2.ts, 60, 7))
+>frozen : Symbol(frozen, Decl(mappedTypes2.ts, 63, 7), Decl(mappedTypes2.ts, 64, 7), Decl(mappedTypes2.ts, 65, 7))
 >freeze : Symbol(freeze, Decl(mappedTypes2.ts, 25, 60))
->shape : Symbol(shape, Decl(mappedTypes2.ts, 57, 12))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 62, 12))
 }
 
 function f2(shape: Shape) {
->f2 : Symbol(f2, Decl(mappedTypes2.ts, 61, 1))
->shape : Symbol(shape, Decl(mappedTypes2.ts, 63, 12))
->Shape : Symbol(Shape, Decl(mappedTypes2.ts, 29, 48))
+>f2 : Symbol(f2, Decl(mappedTypes2.ts, 66, 1))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 68, 12))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 1))
 
     var partial: PartialShape;
->partial : Symbol(partial, Decl(mappedTypes2.ts, 64, 7), Decl(mappedTypes2.ts, 65, 7), Decl(mappedTypes2.ts, 66, 7))
->PartialShape : Symbol(PartialShape, Decl(mappedTypes2.ts, 36, 1))
+>partial : Symbol(partial, Decl(mappedTypes2.ts, 69, 7), Decl(mappedTypes2.ts, 70, 7), Decl(mappedTypes2.ts, 71, 7))
+>PartialShape : Symbol(PartialShape, Decl(mappedTypes2.ts, 41, 1))
 
     var partial: Partial<Shape>;
->partial : Symbol(partial, Decl(mappedTypes2.ts, 64, 7), Decl(mappedTypes2.ts, 65, 7), Decl(mappedTypes2.ts, 66, 7))
+>partial : Symbol(partial, Decl(mappedTypes2.ts, 69, 7), Decl(mappedTypes2.ts, 70, 7), Decl(mappedTypes2.ts, 71, 7))
 >Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
->Shape : Symbol(Shape, Decl(mappedTypes2.ts, 29, 48))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 1))
 
     var partial: Partial<Shape> = {};
->partial : Symbol(partial, Decl(mappedTypes2.ts, 64, 7), Decl(mappedTypes2.ts, 65, 7), Decl(mappedTypes2.ts, 66, 7))
+>partial : Symbol(partial, Decl(mappedTypes2.ts, 69, 7), Decl(mappedTypes2.ts, 70, 7), Decl(mappedTypes2.ts, 71, 7))
 >Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
->Shape : Symbol(Shape, Decl(mappedTypes2.ts, 29, 48))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 1))
 }
 
 function f3(shape: Shape) {
->f3 : Symbol(f3, Decl(mappedTypes2.ts, 67, 1))
->shape : Symbol(shape, Decl(mappedTypes2.ts, 69, 12))
->Shape : Symbol(Shape, Decl(mappedTypes2.ts, 29, 48))
+>f3 : Symbol(f3, Decl(mappedTypes2.ts, 72, 1))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 74, 12))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 1))
 
-    const x = pick(shape, "name", "visible");  // { name: string, visible: boolean }
->x : Symbol(x, Decl(mappedTypes2.ts, 70, 9))
+    const x = pick(shape, "name", "location");  // { name: string, location: Point }
+>x : Symbol(x, Decl(mappedTypes2.ts, 75, 9))
 >pick : Symbol(pick, Decl(mappedTypes2.ts, 26, 48))
->shape : Symbol(shape, Decl(mappedTypes2.ts, 69, 12))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 74, 12))
 }
 
 function f4() {
->f4 : Symbol(f4, Decl(mappedTypes2.ts, 71, 1))
+>f4 : Symbol(f4, Decl(mappedTypes2.ts, 76, 1))
 
     const rec = { foo: "hello", bar: "world", baz: "bye" };
->rec : Symbol(rec, Decl(mappedTypes2.ts, 74, 9))
->foo : Symbol(foo, Decl(mappedTypes2.ts, 74, 17))
->bar : Symbol(bar, Decl(mappedTypes2.ts, 74, 31))
->baz : Symbol(baz, Decl(mappedTypes2.ts, 74, 45))
+>rec : Symbol(rec, Decl(mappedTypes2.ts, 79, 9))
+>foo : Symbol(foo, Decl(mappedTypes2.ts, 79, 17))
+>bar : Symbol(bar, Decl(mappedTypes2.ts, 79, 31))
+>baz : Symbol(baz, Decl(mappedTypes2.ts, 79, 45))
 
     const lengths = mapObject(rec, s => s.length);  // { foo: number, bar: number, baz: number }
->lengths : Symbol(lengths, Decl(mappedTypes2.ts, 75, 9))
+>lengths : Symbol(lengths, Decl(mappedTypes2.ts, 80, 9))
 >mapObject : Symbol(mapObject, Decl(mappedTypes2.ts, 27, 78))
->rec : Symbol(rec, Decl(mappedTypes2.ts, 74, 9))
->s : Symbol(s, Decl(mappedTypes2.ts, 75, 34))
+>rec : Symbol(rec, Decl(mappedTypes2.ts, 79, 9))
+>s : Symbol(s, Decl(mappedTypes2.ts, 80, 34))
 >s.length : Symbol(String.length, Decl(lib.d.ts, --, --))
->s : Symbol(s, Decl(mappedTypes2.ts, 75, 34))
+>s : Symbol(s, Decl(mappedTypes2.ts, 80, 34))
 >length : Symbol(String.length, Decl(lib.d.ts, --, --))
 }
 
 function f5(shape: Shape) {
->f5 : Symbol(f5, Decl(mappedTypes2.ts, 76, 1))
->shape : Symbol(shape, Decl(mappedTypes2.ts, 78, 12))
->Shape : Symbol(Shape, Decl(mappedTypes2.ts, 29, 48))
+>f5 : Symbol(f5, Decl(mappedTypes2.ts, 81, 1))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 83, 12))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 1))
 
     const p = proxify(shape);
->p : Symbol(p, Decl(mappedTypes2.ts, 79, 9))
+>p : Symbol(p, Decl(mappedTypes2.ts, 84, 9))
 >proxify : Symbol(proxify, Decl(mappedTypes2.ts, 28, 100))
->shape : Symbol(shape, Decl(mappedTypes2.ts, 78, 12))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 83, 12))
 
     let name = p.name.get();
->name : Symbol(name, Decl(mappedTypes2.ts, 80, 7))
+>name : Symbol(name, Decl(mappedTypes2.ts, 85, 7))
 >p.name.get : Symbol(get, Decl(mappedTypes2.ts, 12, 17))
 >p.name : Symbol(name)
->p : Symbol(p, Decl(mappedTypes2.ts, 79, 9))
+>p : Symbol(p, Decl(mappedTypes2.ts, 84, 9))
 >name : Symbol(name)
 >get : Symbol(get, Decl(mappedTypes2.ts, 12, 17))
 
-    p.visible.set(false);
->p.visible.set : Symbol(set, Decl(mappedTypes2.ts, 13, 13))
->p.visible : Symbol(visible)
->p : Symbol(p, Decl(mappedTypes2.ts, 79, 9))
->visible : Symbol(visible)
+    p.width.set(42);
+>p.width.set : Symbol(set, Decl(mappedTypes2.ts, 13, 13))
+>p.width : Symbol(width)
+>p : Symbol(p, Decl(mappedTypes2.ts, 84, 9))
+>width : Symbol(width)
 >set : Symbol(set, Decl(mappedTypes2.ts, 13, 13))
 }
 
 function f6(shape: DeepReadonly<Shape>) {
->f6 : Symbol(f6, Decl(mappedTypes2.ts, 82, 1))
->shape : Symbol(shape, Decl(mappedTypes2.ts, 84, 12))
+>f6 : Symbol(f6, Decl(mappedTypes2.ts, 87, 1))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 89, 12))
 >DeepReadonly : Symbol(DeepReadonly, Decl(mappedTypes2.ts, 19, 1))
->Shape : Symbol(Shape, Decl(mappedTypes2.ts, 29, 48))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 1))
 
-    let name = shape.name;  // DeepReadonly<string>
->name : Symbol(name, Decl(mappedTypes2.ts, 85, 7))
+    let name = shape.name;  // string
+>name : Symbol(name, Decl(mappedTypes2.ts, 90, 7))
 >shape.name : Symbol(name)
->shape : Symbol(shape, Decl(mappedTypes2.ts, 84, 12))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 89, 12))
 >name : Symbol(name)
 
-    let length = name.length;  // DeepReadonly<number>
->length : Symbol(length, Decl(mappedTypes2.ts, 86, 7))
->name.length : Symbol(length)
->name : Symbol(name, Decl(mappedTypes2.ts, 85, 7))
->length : Symbol(length)
+    let location = shape.location;  // DeepReadonly<Point>
+>location : Symbol(location, Decl(mappedTypes2.ts, 91, 7))
+>shape.location : Symbol(location)
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 89, 12))
+>location : Symbol(location)
 
-    let toString = length.toString;  // DeepReadonly<(radix?: number) => string>
->toString : Symbol(toString, Decl(mappedTypes2.ts, 87, 7))
->length.toString : Symbol(toString)
->length : Symbol(length, Decl(mappedTypes2.ts, 86, 7))
->toString : Symbol(toString)
+    let x = location.x;  // number
+>x : Symbol(x, Decl(mappedTypes2.ts, 92, 7))
+>location.x : Symbol(x)
+>location : Symbol(location, Decl(mappedTypes2.ts, 91, 7))
+>x : Symbol(x)
 }
diff --git a/tests/baselines/reference/mappedTypes2.types b/tests/baselines/reference/mappedTypes2.types
index 14ca77e4680..f082069f569 100644
--- a/tests/baselines/reference/mappedTypes2.types
+++ b/tests/baselines/reference/mappedTypes2.types
@@ -151,6 +151,16 @@ declare function proxify<T>(obj: T): Proxify<T>;
 >Proxify : Proxify<T>
 >T : T
 
+interface Point {
+>Point : Point
+
+    x: number;
+>x : number
+
+    y: number;
+>y : number
+}
+
 interface Shape {
 >Shape : Shape
 
@@ -163,8 +173,9 @@ interface Shape {
     height: number;
 >height : number
 
-    visible: boolean;
->visible : boolean
+    location: Point;
+>location : Point
+>Point : Point
 }
 
 interface PartialShape {
@@ -179,8 +190,9 @@ interface PartialShape {
     height?: number;
 >height : number | undefined
 
-    visible?: boolean;
->visible : boolean | undefined
+    location?: Point;
+>location : Point | undefined
+>Point : Point
 }
 
 interface ReadonlyShape {
@@ -195,8 +207,9 @@ interface ReadonlyShape {
     readonly height: number;
 >height : number
 
-    readonly visible: boolean;
->visible : boolean
+    readonly location: Point;
+>location : Point
+>Point : Point
 }
 
 function f0(s1: Shape, s2: Shape) {
@@ -272,13 +285,13 @@ function f3(shape: Shape) {
 >shape : Shape
 >Shape : Shape
 
-    const x = pick(shape, "name", "visible");  // { name: string, visible: boolean }
->x : Pick<Shape, "name" | "visible">
->pick(shape, "name", "visible") : Pick<Shape, "name" | "visible">
+    const x = pick(shape, "name", "location");  // { name: string, location: Point }
+>x : Pick<Shape, "name" | "location">
+>pick(shape, "name", "location") : Pick<Shape, "name" | "location">
 >pick : <T, K extends keyof T>(obj: T, ...keys: K[]) => Pick<T, K>
 >shape : Shape
 >"name" : "name"
->"visible" : "visible"
+>"location" : "location"
 }
 
 function f4() {
@@ -326,14 +339,14 @@ function f5(shape: Shape) {
 >name : Proxy<string>
 >get : () => string
 
-    p.visible.set(false);
->p.visible.set(false) : void
->p.visible.set : (value: boolean) => void
->p.visible : Proxy<boolean>
+    p.width.set(42);
+>p.width.set(42) : void
+>p.width.set : (value: number) => void
+>p.width : Proxy<number>
 >p : Proxify<Shape>
->visible : Proxy<boolean>
->set : (value: boolean) => void
->false : false
+>width : Proxy<number>
+>set : (value: number) => void
+>42 : 42
 }
 
 function f6(shape: DeepReadonly<Shape>) {
@@ -342,21 +355,21 @@ function f6(shape: DeepReadonly<Shape>) {
 >DeepReadonly : DeepReadonly<T>
 >Shape : Shape
 
-    let name = shape.name;  // DeepReadonly<string>
->name : DeepReadonly<string>
->shape.name : DeepReadonly<string>
+    let name = shape.name;  // string
+>name : string
+>shape.name : string
 >shape : DeepReadonly<Shape>
->name : DeepReadonly<string>
+>name : string
 
-    let length = name.length;  // DeepReadonly<number>
->length : DeepReadonly<number>
->name.length : DeepReadonly<number>
->name : DeepReadonly<string>
->length : DeepReadonly<number>
+    let location = shape.location;  // DeepReadonly<Point>
+>location : DeepReadonly<Point>
+>shape.location : DeepReadonly<Point>
+>shape : DeepReadonly<Shape>
+>location : DeepReadonly<Point>
 
-    let toString = length.toString;  // DeepReadonly<(radix?: number) => string>
->toString : DeepReadonly<(radix?: number | undefined) => string>
->length.toString : DeepReadonly<(radix?: number | undefined) => string>
->length : DeepReadonly<number>
->toString : DeepReadonly<(radix?: number | undefined) => string>
+    let x = location.x;  // number
+>x : number
+>location.x : number
+>location : DeepReadonly<Point>
+>x : number
 }

From 43e383f20b996aafe644a665b15f39386d6bc64a Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Tue, 22 Nov 2016 14:28:45 -0800
Subject: [PATCH 334/421] Add more tests

---
 tests/baselines/reference/mappedTypes4.js     | 129 +++++++++++
 .../baselines/reference/mappedTypes4.symbols  | 198 ++++++++++++++++
 tests/baselines/reference/mappedTypes4.types  | 213 ++++++++++++++++++
 .../conformance/types/mapped/mappedTypes4.ts  |  62 +++++
 4 files changed, 602 insertions(+)
 create mode 100644 tests/baselines/reference/mappedTypes4.js
 create mode 100644 tests/baselines/reference/mappedTypes4.symbols
 create mode 100644 tests/baselines/reference/mappedTypes4.types
 create mode 100644 tests/cases/conformance/types/mapped/mappedTypes4.ts

diff --git a/tests/baselines/reference/mappedTypes4.js b/tests/baselines/reference/mappedTypes4.js
new file mode 100644
index 00000000000..bb003b1a1ec
--- /dev/null
+++ b/tests/baselines/reference/mappedTypes4.js
@@ -0,0 +1,129 @@
+//// [mappedTypes4.ts]
+
+type Box<T> = {
+};
+
+type Boxified<T> = {
+    [P in keyof T]: Box<T[P]>;
+};
+
+function boxify<T>(obj: T): Boxified<T> {
+    if (typeof obj === "object") {
+        let result = {} as Boxified<T>;
+        for (let k in obj) {
+            result[k] = { value: obj[k] };
+        }
+        return result;
+    }
+    return <any>obj;
+}
+
+type A = { a: string };
+type B = { b: string };
+type C = { c: string };
+
+function f1(x: A | B | C | undefined) {
+    return boxify(x);
+}
+
+type T00 = Partial<A | B | C>;
+type T01 = Readonly<A | B | C | null | undefined>;
+type T02 = Boxified<A | B[] | C | string>
+type T03 = Readonly<string | number | boolean | null | undefined | void>;
+type T04 = Boxified<string | number | boolean | null | undefined | void>;
+type T05 = Partial<"hello" | "world" | 42>;
+
+type BoxifiedWithSentinel<T, U> = {
+    [P in keyof T]: Box<T[P]> | U;
+}
+
+type T10 = BoxifiedWithSentinel<A | B | C, null>;
+type T11 = BoxifiedWithSentinel<A | B | C, undefined>;
+type T12 = BoxifiedWithSentinel<string, undefined>;
+
+type DeepReadonly<T> = {
+    readonly [P in keyof T]: DeepReadonly<T[P]>;
+};
+
+type Foo = {
+    x: number;
+    y: { a: string, b: number };
+    z: boolean;
+};
+
+type DeepReadonlyFoo = {
+    readonly x: number;
+    readonly y: { readonly a: string, readonly b: number };
+    readonly z: boolean;
+};
+
+var x1: DeepReadonly<Foo>;
+var x1: DeepReadonlyFoo;
+
+//// [mappedTypes4.js]
+function boxify(obj) {
+    if (typeof obj === "object") {
+        var result = {};
+        for (var k in obj) {
+            result[k] = { value: obj[k] };
+        }
+        return result;
+    }
+    return obj;
+}
+function f1(x) {
+    return boxify(x);
+}
+var x1;
+var x1;
+
+
+//// [mappedTypes4.d.ts]
+declare type Box<T> = {};
+declare type Boxified<T> = {
+    [P in keyof T]: Box<T[P]>;
+};
+declare function boxify<T>(obj: T): Boxified<T>;
+declare type A = {
+    a: string;
+};
+declare type B = {
+    b: string;
+};
+declare type C = {
+    c: string;
+};
+declare function f1(x: A | B | C | undefined): Boxified<A> | Boxified<B> | Boxified<C> | undefined;
+declare type T00 = Partial<A | B | C>;
+declare type T01 = Readonly<A | B | C | null | undefined>;
+declare type T02 = Boxified<A | B[] | C | string>;
+declare type T03 = Readonly<string | number | boolean | null | undefined | void>;
+declare type T04 = Boxified<string | number | boolean | null | undefined | void>;
+declare type T05 = Partial<"hello" | "world" | 42>;
+declare type BoxifiedWithSentinel<T, U> = {
+    [P in keyof T]: Box<T[P]> | U;
+};
+declare type T10 = BoxifiedWithSentinel<A | B | C, null>;
+declare type T11 = BoxifiedWithSentinel<A | B | C, undefined>;
+declare type T12 = BoxifiedWithSentinel<string, undefined>;
+declare type DeepReadonly<T> = {
+    readonly [P in keyof T]: DeepReadonly<T[P]>;
+};
+declare type Foo = {
+    x: number;
+    y: {
+        a: string;
+        b: number;
+    };
+    z: boolean;
+};
+declare type DeepReadonlyFoo = {
+    readonly x: number;
+    readonly y: {
+        readonly a: string;
+        readonly b: number;
+    };
+    readonly z: boolean;
+};
+declare var x1: DeepReadonly<Foo>;
+declare var x1: DeepReadonlyFoo;
diff --git a/tests/baselines/reference/mappedTypes4.symbols b/tests/baselines/reference/mappedTypes4.symbols
new file mode 100644
index 00000000000..b57adfe9954
--- /dev/null
+++ b/tests/baselines/reference/mappedTypes4.symbols
@@ -0,0 +1,198 @@
+=== tests/cases/conformance/types/mapped/mappedTypes4.ts ===
+
+type Box<T> = {
+>Box : Symbol(Box, Decl(mappedTypes4.ts, 0, 0))
+>T : Symbol(T, Decl(mappedTypes4.ts, 1, 9))
+
+};
+
+type Boxified<T> = {
+>Boxified : Symbol(Boxified, Decl(mappedTypes4.ts, 2, 2))
+>T : Symbol(T, Decl(mappedTypes4.ts, 4, 14))
+
+    [P in keyof T]: Box<T[P]>;
+>P : Symbol(P, Decl(mappedTypes4.ts, 5, 5))
+>T : Symbol(T, Decl(mappedTypes4.ts, 4, 14))
+>Box : Symbol(Box, Decl(mappedTypes4.ts, 0, 0))
+>T : Symbol(T, Decl(mappedTypes4.ts, 4, 14))
+>P : Symbol(P, Decl(mappedTypes4.ts, 5, 5))
+
+};
+
+function boxify<T>(obj: T): Boxified<T> {
+>boxify : Symbol(boxify, Decl(mappedTypes4.ts, 6, 2))
+>T : Symbol(T, Decl(mappedTypes4.ts, 8, 16))
+>obj : Symbol(obj, Decl(mappedTypes4.ts, 8, 19))
+>T : Symbol(T, Decl(mappedTypes4.ts, 8, 16))
+>Boxified : Symbol(Boxified, Decl(mappedTypes4.ts, 2, 2))
+>T : Symbol(T, Decl(mappedTypes4.ts, 8, 16))
+
+    if (typeof obj === "object") {
+>obj : Symbol(obj, Decl(mappedTypes4.ts, 8, 19))
+
+        let result = {} as Boxified<T>;
+>result : Symbol(result, Decl(mappedTypes4.ts, 10, 11))
+>Boxified : Symbol(Boxified, Decl(mappedTypes4.ts, 2, 2))
+>T : Symbol(T, Decl(mappedTypes4.ts, 8, 16))
+
+        for (let k in obj) {
+>k : Symbol(k, Decl(mappedTypes4.ts, 11, 16))
+>obj : Symbol(obj, Decl(mappedTypes4.ts, 8, 19))
+
+            result[k] = { value: obj[k] };
+>result : Symbol(result, Decl(mappedTypes4.ts, 10, 11))
+>k : Symbol(k, Decl(mappedTypes4.ts, 11, 16))
+>value : Symbol(value, Decl(mappedTypes4.ts, 12, 25))
+>obj : Symbol(obj, Decl(mappedTypes4.ts, 8, 19))
+>k : Symbol(k, Decl(mappedTypes4.ts, 11, 16))
+        }
+        return result;
+>result : Symbol(result, Decl(mappedTypes4.ts, 10, 11))
+    }
+    return <any>obj;
+>obj : Symbol(obj, Decl(mappedTypes4.ts, 8, 19))
+}
+
+type A = { a: string };
+>A : Symbol(A, Decl(mappedTypes4.ts, 17, 1))
+>a : Symbol(a, Decl(mappedTypes4.ts, 19, 10))
+
+type B = { b: string };
+>B : Symbol(B, Decl(mappedTypes4.ts, 19, 23))
+>b : Symbol(b, Decl(mappedTypes4.ts, 20, 10))
+
+type C = { c: string };
+>C : Symbol(C, Decl(mappedTypes4.ts, 20, 23))
+>c : Symbol(c, Decl(mappedTypes4.ts, 21, 10))
+
+function f1(x: A | B | C | undefined) {
+>f1 : Symbol(f1, Decl(mappedTypes4.ts, 21, 23))
+>x : Symbol(x, Decl(mappedTypes4.ts, 23, 12))
+>A : Symbol(A, Decl(mappedTypes4.ts, 17, 1))
+>B : Symbol(B, Decl(mappedTypes4.ts, 19, 23))
+>C : Symbol(C, Decl(mappedTypes4.ts, 20, 23))
+
+    return boxify(x);
+>boxify : Symbol(boxify, Decl(mappedTypes4.ts, 6, 2))
+>x : Symbol(x, Decl(mappedTypes4.ts, 23, 12))
+}
+
+type T00 = Partial<A | B | C>;
+>T00 : Symbol(T00, Decl(mappedTypes4.ts, 25, 1))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+>A : Symbol(A, Decl(mappedTypes4.ts, 17, 1))
+>B : Symbol(B, Decl(mappedTypes4.ts, 19, 23))
+>C : Symbol(C, Decl(mappedTypes4.ts, 20, 23))
+
+type T01 = Readonly<A | B | C | null | undefined>;
+>T01 : Symbol(T01, Decl(mappedTypes4.ts, 27, 30))
+>Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
+>A : Symbol(A, Decl(mappedTypes4.ts, 17, 1))
+>B : Symbol(B, Decl(mappedTypes4.ts, 19, 23))
+>C : Symbol(C, Decl(mappedTypes4.ts, 20, 23))
+
+type T02 = Boxified<A | B[] | C | string>
+>T02 : Symbol(T02, Decl(mappedTypes4.ts, 28, 50))
+>Boxified : Symbol(Boxified, Decl(mappedTypes4.ts, 2, 2))
+>A : Symbol(A, Decl(mappedTypes4.ts, 17, 1))
+>B : Symbol(B, Decl(mappedTypes4.ts, 19, 23))
+>C : Symbol(C, Decl(mappedTypes4.ts, 20, 23))
+
+type T03 = Readonly<string | number | boolean | null | undefined | void>;
+>T03 : Symbol(T03, Decl(mappedTypes4.ts, 29, 41))
+>Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
+
+type T04 = Boxified<string | number | boolean | null | undefined | void>;
+>T04 : Symbol(T04, Decl(mappedTypes4.ts, 30, 73))
+>Boxified : Symbol(Boxified, Decl(mappedTypes4.ts, 2, 2))
+
+type T05 = Partial<"hello" | "world" | 42>;
+>T05 : Symbol(T05, Decl(mappedTypes4.ts, 31, 73))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+
+type BoxifiedWithSentinel<T, U> = {
+>BoxifiedWithSentinel : Symbol(BoxifiedWithSentinel, Decl(mappedTypes4.ts, 32, 43))
+>T : Symbol(T, Decl(mappedTypes4.ts, 34, 26))
+>U : Symbol(U, Decl(mappedTypes4.ts, 34, 28))
+
+    [P in keyof T]: Box<T[P]> | U;
+>P : Symbol(P, Decl(mappedTypes4.ts, 35, 5))
+>T : Symbol(T, Decl(mappedTypes4.ts, 34, 26))
+>Box : Symbol(Box, Decl(mappedTypes4.ts, 0, 0))
+>T : Symbol(T, Decl(mappedTypes4.ts, 34, 26))
+>P : Symbol(P, Decl(mappedTypes4.ts, 35, 5))
+>U : Symbol(U, Decl(mappedTypes4.ts, 34, 28))
+}
+
+type T10 = BoxifiedWithSentinel<A | B | C, null>;
+>T10 : Symbol(T10, Decl(mappedTypes4.ts, 36, 1))
+>BoxifiedWithSentinel : Symbol(BoxifiedWithSentinel, Decl(mappedTypes4.ts, 32, 43))
+>A : Symbol(A, Decl(mappedTypes4.ts, 17, 1))
+>B : Symbol(B, Decl(mappedTypes4.ts, 19, 23))
+>C : Symbol(C, Decl(mappedTypes4.ts, 20, 23))
+
+type T11 = BoxifiedWithSentinel<A | B | C, undefined>;
+>T11 : Symbol(T11, Decl(mappedTypes4.ts, 38, 49))
+>BoxifiedWithSentinel : Symbol(BoxifiedWithSentinel, Decl(mappedTypes4.ts, 32, 43))
+>A : Symbol(A, Decl(mappedTypes4.ts, 17, 1))
+>B : Symbol(B, Decl(mappedTypes4.ts, 19, 23))
+>C : Symbol(C, Decl(mappedTypes4.ts, 20, 23))
+
+type T12 = BoxifiedWithSentinel<string, undefined>;
+>T12 : Symbol(T12, Decl(mappedTypes4.ts, 39, 54))
+>BoxifiedWithSentinel : Symbol(BoxifiedWithSentinel, Decl(mappedTypes4.ts, 32, 43))
+
+type DeepReadonly<T> = {
+>DeepReadonly : Symbol(DeepReadonly, Decl(mappedTypes4.ts, 40, 51))
+>T : Symbol(T, Decl(mappedTypes4.ts, 42, 18))
+
+    readonly [P in keyof T]: DeepReadonly<T[P]>;
+>P : Symbol(P, Decl(mappedTypes4.ts, 43, 14))
+>T : Symbol(T, Decl(mappedTypes4.ts, 42, 18))
+>DeepReadonly : Symbol(DeepReadonly, Decl(mappedTypes4.ts, 40, 51))
+>T : Symbol(T, Decl(mappedTypes4.ts, 42, 18))
+>P : Symbol(P, Decl(mappedTypes4.ts, 43, 14))
+
+};
+
+type Foo = {
+>Foo : Symbol(Foo, Decl(mappedTypes4.ts, 44, 2))
+
+    x: number;
+>x : Symbol(x, Decl(mappedTypes4.ts, 46, 12))
+
+    y: { a: string, b: number };
+>y : Symbol(y, Decl(mappedTypes4.ts, 47, 14))
+>a : Symbol(a, Decl(mappedTypes4.ts, 48, 8))
+>b : Symbol(b, Decl(mappedTypes4.ts, 48, 19))
+
+    z: boolean;
+>z : Symbol(z, Decl(mappedTypes4.ts, 48, 32))
+
+};
+
+type DeepReadonlyFoo = {
+>DeepReadonlyFoo : Symbol(DeepReadonlyFoo, Decl(mappedTypes4.ts, 50, 2))
+
+    readonly x: number;
+>x : Symbol(x, Decl(mappedTypes4.ts, 52, 24))
+
+    readonly y: { readonly a: string, readonly b: number };
+>y : Symbol(y, Decl(mappedTypes4.ts, 53, 23))
+>a : Symbol(a, Decl(mappedTypes4.ts, 54, 17))
+>b : Symbol(b, Decl(mappedTypes4.ts, 54, 37))
+
+    readonly z: boolean;
+>z : Symbol(z, Decl(mappedTypes4.ts, 54, 59))
+
+};
+
+var x1: DeepReadonly<Foo>;
+>x1 : Symbol(x1, Decl(mappedTypes4.ts, 58, 3), Decl(mappedTypes4.ts, 59, 3))
+>DeepReadonly : Symbol(DeepReadonly, Decl(mappedTypes4.ts, 40, 51))
+>Foo : Symbol(Foo, Decl(mappedTypes4.ts, 44, 2))
+
+var x1: DeepReadonlyFoo;
+>x1 : Symbol(x1, Decl(mappedTypes4.ts, 58, 3), Decl(mappedTypes4.ts, 59, 3))
+>DeepReadonlyFoo : Symbol(DeepReadonlyFoo, Decl(mappedTypes4.ts, 50, 2))
+
diff --git a/tests/baselines/reference/mappedTypes4.types b/tests/baselines/reference/mappedTypes4.types
new file mode 100644
index 00000000000..cc492d82120
--- /dev/null
+++ b/tests/baselines/reference/mappedTypes4.types
@@ -0,0 +1,213 @@
+=== tests/cases/conformance/types/mapped/mappedTypes4.ts ===
+
+type Box<T> = {
+>Box : Box<T>
+>T : T
+
+};
+
+type Boxified<T> = {
+>Boxified : Boxified<T>
+>T : T
+
+    [P in keyof T]: Box<T[P]>;
+>P : P
+>T : T
+>Box : Box<T>
+>T : T
+>P : P
+
+};
+
+function boxify<T>(obj: T): Boxified<T> {
+>boxify : <T>(obj: T) => Boxified<T>
+>T : T
+>obj : T
+>T : T
+>Boxified : Boxified<T>
+>T : T
+
+    if (typeof obj === "object") {
+>typeof obj === "object" : boolean
+>typeof obj : string
+>obj : T
+>"object" : "object"
+
+        let result = {} as Boxified<T>;
+>result : Boxified<T>
+>{} as Boxified<T> : Boxified<T>
+>{} : {}
+>Boxified : Boxified<T>
+>T : T
+
+        for (let k in obj) {
+>k : keyof T
+>obj : T
+
+            result[k] = { value: obj[k] };
+>result[k] = { value: obj[k] } : { value: T[keyof T]; }
+>result[k] : Box<T[keyof T]>
+>result : Boxified<T>
+>k : keyof T
+>{ value: obj[k] } : { value: T[keyof T]; }
+>value : T[keyof T]
+>obj[k] : T[keyof T]
+>obj : T
+>k : keyof T
+        }
+        return result;
+>result : Boxified<T>
+    }
+    return <any>obj;
+><any>obj : any
+>obj : never
+}
+
+type A = { a: string };
+>A : A
+>a : string
+
+type B = { b: string };
+>B : B
+>b : string
+
+type C = { c: string };
+>C : C
+>c : string
+
+function f1(x: A | B | C | undefined) {
+>f1 : (x: A | B | C | undefined) => Boxified<A> | Boxified<B> | Boxified<C> | undefined
+>x : A | B | C | undefined
+>A : A
+>B : B
+>C : C
+
+    return boxify(x);
+>boxify(x) : Boxified<A> | Boxified<B> | Boxified<C> | undefined
+>boxify : <T>(obj: T) => Boxified<T>
+>x : A | B | C | undefined
+}
+
+type T00 = Partial<A | B | C>;
+>T00 : Partial<A> | Partial<B> | Partial<C>
+>Partial : Partial<T>
+>A : A
+>B : B
+>C : C
+
+type T01 = Readonly<A | B | C | null | undefined>;
+>T01 : Readonly<A> | Readonly<B> | Readonly<C> | null | undefined
+>Readonly : Readonly<T>
+>A : A
+>B : B
+>C : C
+>null : null
+
+type T02 = Boxified<A | B[] | C | string>
+>T02 : string | Boxified<A> | Boxified<C> | Boxified<B[]>
+>Boxified : Boxified<T>
+>A : A
+>B : B
+>C : C
+
+type T03 = Readonly<string | number | boolean | null | undefined | void>;
+>T03 : string | number | boolean | void | null | undefined
+>Readonly : Readonly<T>
+>null : null
+
+type T04 = Boxified<string | number | boolean | null | undefined | void>;
+>T04 : string | number | boolean | void | null | undefined
+>Boxified : Boxified<T>
+>null : null
+
+type T05 = Partial<"hello" | "world" | 42>;
+>T05 : "hello" | "world" | 42
+>Partial : Partial<T>
+
+type BoxifiedWithSentinel<T, U> = {
+>BoxifiedWithSentinel : BoxifiedWithSentinel<T, U>
+>T : T
+>U : U
+
+    [P in keyof T]: Box<T[P]> | U;
+>P : P
+>T : T
+>Box : Box<T>
+>T : T
+>P : P
+>U : U
+}
+
+type T10 = BoxifiedWithSentinel<A | B | C, null>;
+>T10 : BoxifiedWithSentinel<A, null> | BoxifiedWithSentinel<B, null> | BoxifiedWithSentinel<C, null>
+>BoxifiedWithSentinel : BoxifiedWithSentinel<T, U>
+>A : A
+>B : B
+>C : C
+>null : null
+
+type T11 = BoxifiedWithSentinel<A | B | C, undefined>;
+>T11 : BoxifiedWithSentinel<A, undefined> | BoxifiedWithSentinel<B, undefined> | BoxifiedWithSentinel<C, undefined>
+>BoxifiedWithSentinel : BoxifiedWithSentinel<T, U>
+>A : A
+>B : B
+>C : C
+
+type T12 = BoxifiedWithSentinel<string, undefined>;
+>T12 : string
+>BoxifiedWithSentinel : BoxifiedWithSentinel<T, U>
+
+type DeepReadonly<T> = {
+>DeepReadonly : DeepReadonly<T>
+>T : T
+
+    readonly [P in keyof T]: DeepReadonly<T[P]>;
+>P : P
+>T : T
+>DeepReadonly : DeepReadonly<T>
+>T : T
+>P : P
+
+};
+
+type Foo = {
+>Foo : Foo
+
+    x: number;
+>x : number
+
+    y: { a: string, b: number };
+>y : { a: string; b: number; }
+>a : string
+>b : number
+
+    z: boolean;
+>z : boolean
+
+};
+
+type DeepReadonlyFoo = {
+>DeepReadonlyFoo : DeepReadonlyFoo
+
+    readonly x: number;
+>x : number
+
+    readonly y: { readonly a: string, readonly b: number };
+>y : { readonly a: string; readonly b: number; }
+>a : string
+>b : number
+
+    readonly z: boolean;
+>z : boolean
+
+};
+
+var x1: DeepReadonly<Foo>;
+>x1 : DeepReadonly<Foo>
+>DeepReadonly : DeepReadonly<T>
+>Foo : Foo
+
+var x1: DeepReadonlyFoo;
+>x1 : DeepReadonly<Foo>
+>DeepReadonlyFoo : DeepReadonlyFoo
+
diff --git a/tests/cases/conformance/types/mapped/mappedTypes4.ts b/tests/cases/conformance/types/mapped/mappedTypes4.ts
new file mode 100644
index 00000000000..74b3e395f32
--- /dev/null
+++ b/tests/cases/conformance/types/mapped/mappedTypes4.ts
@@ -0,0 +1,62 @@
+// @strictNullChecks: true
+// @declaration: true
+
+type Box<T> = {
+};
+
+type Boxified<T> = {
+    [P in keyof T]: Box<T[P]>;
+};
+
+function boxify<T>(obj: T): Boxified<T> {
+    if (typeof obj === "object") {
+        let result = {} as Boxified<T>;
+        for (let k in obj) {
+            result[k] = { value: obj[k] };
+        }
+        return result;
+    }
+    return <any>obj;
+}
+
+type A = { a: string };
+type B = { b: string };
+type C = { c: string };
+
+function f1(x: A | B | C | undefined) {
+    return boxify(x);
+}
+
+type T00 = Partial<A | B | C>;
+type T01 = Readonly<A | B | C | null | undefined>;
+type T02 = Boxified<A | B[] | C | string>
+type T03 = Readonly<string | number | boolean | null | undefined | void>;
+type T04 = Boxified<string | number | boolean | null | undefined | void>;
+type T05 = Partial<"hello" | "world" | 42>;
+
+type BoxifiedWithSentinel<T, U> = {
+    [P in keyof T]: Box<T[P]> | U;
+}
+
+type T10 = BoxifiedWithSentinel<A | B | C, null>;
+type T11 = BoxifiedWithSentinel<A | B | C, undefined>;
+type T12 = BoxifiedWithSentinel<string, undefined>;
+
+type DeepReadonly<T> = {
+    readonly [P in keyof T]: DeepReadonly<T[P]>;
+};
+
+type Foo = {
+    x: number;
+    y: { a: string, b: number };
+    z: boolean;
+};
+
+type DeepReadonlyFoo = {
+    readonly x: number;
+    readonly y: { readonly a: string, readonly b: number };
+    readonly z: boolean;
+};
+
+var x1: DeepReadonly<Foo>;
+var x1: DeepReadonlyFoo;
\ No newline at end of file

From 680fb2ea1b745105adadc908e9b1449c71e37978 Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Tue, 22 Nov 2016 14:56:18 -0800
Subject: [PATCH 335/421] add typings installer user agent for npm requests
 (#12446)

* add typings installer user agent for npm requests

* address PR feedback: change name of user agent
---
 src/server/typingsInstaller/nodeTypingsInstaller.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/typingsInstaller/nodeTypingsInstaller.ts b/src/server/typingsInstaller/nodeTypingsInstaller.ts
index bdfdda3033c..235c2f16dad 100644
--- a/src/server/typingsInstaller/nodeTypingsInstaller.ts
+++ b/src/server/typingsInstaller/nodeTypingsInstaller.ts
@@ -127,7 +127,7 @@ namespace ts.server.typingsInstaller {
             if (this.log.isEnabled()) {
                 this.log.writeLine(`#${requestId} with arguments'${JSON.stringify(args)}'.`);
             }
-            const command = `${this.npmPath} install ${args.join(" ")} --save-dev`;
+            const command = `${this.npmPath} install ${args.join(" ")} --save-dev --user-agent="typesInstaller/${version}"`;
             const start = Date.now();
             let stdout: Buffer;
             let stderr: Buffer;

From 2b89d919a0de7167d45a377f69b13c977f4aa94d Mon Sep 17 00:00:00 2001
From: Jason Ramsay <jasonra@microsoft.com>
Date: Tue, 22 Nov 2016 14:47:44 -0800
Subject: [PATCH 336/421] Addressing CR feedback

---
 src/compiler/commandLineParser.ts | 20 +++++++++++++-------
 src/server/editorServices.ts      |  6 ++++++
 src/server/session.ts             |  6 ------
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index 5e44efc4235..414e1f117f5 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -509,12 +509,17 @@ namespace ts {
     let optionNameMapCache: OptionNameMap;
 
     /* @internal */
-    export function replaceEnableAutoDiscoveryWithEnable(typeAcquisition: TypeAcquisition): void {
-        // Replace deprecated typingOptions.enableAutoDiscovery with typeAcquisition.enable
+    export function convertEnableAutoDiscoveryToEnable(typeAcquisition: TypeAcquisition): TypeAcquisition {
+        // Convert deprecated typingOptions.enableAutoDiscovery to typeAcquisition.enable
         if (typeAcquisition && typeAcquisition.enableAutoDiscovery !== undefined && typeAcquisition.enable === undefined) {
-           typeAcquisition.enable = typeAcquisition.enableAutoDiscovery;
-           delete typeAcquisition.enableAutoDiscovery;
+            const result: TypeAcquisition = {
+                enable: typeAcquisition.enableAutoDiscovery,
+                include: typeAcquisition.include || [],
+                exclude: typeAcquisition.exclude || []
+            };
+           return result;
         }
+        return typeAcquisition;
     }
 
     /* @internal */
@@ -859,7 +864,8 @@ namespace ts {
         }
 
         let options: CompilerOptions = convertCompilerOptionsFromJsonWorker(json["compilerOptions"], basePath, errors, configFileName);
-        // typingOptions has been deprecated. Use typeAcquisition instead.
+        // typingOptions has been deprecated and is only supported for backward compatibility purposes.
+        // It should be removed in future releases - use typeAcquisition instead.
         const jsonOptions = json["typeAcquisition"] || json["typingOptions"];
         const typeAcquisition: TypeAcquisition = convertTypeAcquisitionFromJsonWorker(jsonOptions, basePath, errors, configFileName);
 
@@ -1034,8 +1040,8 @@ namespace ts {
         basePath: string, errors: Diagnostic[], configFileName?: string): TypeAcquisition {
 
         const options: TypeAcquisition = { enable: getBaseFileName(configFileName) === "jsconfig.json", include: [], exclude: [] };
-        replaceEnableAutoDiscoveryWithEnable(jsonOptions);
-        convertOptionsFromJson(typeAcquisitionDeclarations, jsonOptions, basePath, options, Diagnostics.Unknown_type_acquisition_option_0, errors);
+        const typeAcquisition = convertEnableAutoDiscoveryToEnable(jsonOptions);
+        convertOptionsFromJson(typeAcquisitionDeclarations, typeAcquisition, basePath, options, Diagnostics.Unknown_type_acquisition_option_0, errors);
 
         return options;
     }
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index 49111d4a67f..5f65140c6dc 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -1316,6 +1316,12 @@ namespace ts.server {
         }
 
         openExternalProject(proj: protocol.ExternalProject): void {
+            // typingOptions has been deprecated and is only supported for backward compatibility
+            // purposes. It should be removed in future releases - use typeAcquisition instead.
+            if (proj.typingOptions && !proj.typeAcquisition) {
+                const typeAcquisition = convertEnableAutoDiscoveryToEnable(proj.typingOptions);
+                proj.typeAcquisition = typeAcquisition;
+            }
             let tsConfigFiles: NormalizedPath[];
             const rootFiles: protocol.ExternalFile[] = [];
             for (const file of proj.rootFiles) {
diff --git a/src/server/session.ts b/src/server/session.ts
index 282964611e4..36144b3212d 100644
--- a/src/server/session.ts
+++ b/src/server/session.ts
@@ -1365,12 +1365,6 @@ namespace ts.server {
 
         private handlers = createMap<(request: protocol.Request) => { response?: any, responseRequired?: boolean }>({
             [CommandNames.OpenExternalProject]: (request: protocol.OpenExternalProjectRequest) => {
-                // Replace deprecated typingOptions with typeAcquisition
-                if (request.arguments.typingOptions && !request.arguments.typeAcquisition) {
-                    replaceEnableAutoDiscoveryWithEnable(request.arguments.typingOptions);
-                    request.arguments.typeAcquisition = request.arguments.typingOptions;
-                    delete request.arguments.typingOptions;
-                }
                 this.projectService.openExternalProject(request.arguments);
                 // TODO: report errors
                 return this.requiredResponse(true);

From 60395565e6fb9767aa6a73a0086238793bb7df58 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Wed, 23 Nov 2016 09:48:25 -0800
Subject: [PATCH 337/421] Handel call and construct signatures

---
 src/lib/es5.d.ts                              | 12 ++++++++++++
 .../reference/objectFreeze.errors.txt         | 12 ++++++++----
 tests/baselines/reference/objectFreeze.js     | 19 +++++++++++++++----
 tests/cases/compiler/objectFreeze.ts          |  8 ++++++--
 4 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/src/lib/es5.d.ts b/src/lib/es5.d.ts
index 3ad6046c85e..097089e371f 100644
--- a/src/lib/es5.d.ts
+++ b/src/lib/es5.d.ts
@@ -182,6 +182,18 @@ interface ObjectConstructor {
       */
     freeze<T>(a: T[]): ReadonlyArray<T>;
 
+    /**
+      * Prevents the modification of existing property attributes and values, and prevents the addition of new properties.
+      * @param o Object on which to lock the attributes.
+      */
+    freeze<T extends (...args: any[]) => any>(f: T): T;
+
+    /**
+      * Prevents the modification of existing property attributes and values, and prevents the addition of new properties.
+      * @param o Object on which to lock the attributes.
+      */
+    freeze<T extends new (...args: any[]) => any>(c: T): T;
+
     /**
       * Prevents the modification of existing property attributes and values, and prevents the addition of new properties.
       * @param o Object on which to lock the attributes.
diff --git a/tests/baselines/reference/objectFreeze.errors.txt b/tests/baselines/reference/objectFreeze.errors.txt
index 0a1a0518829..9c28c62f534 100644
--- a/tests/baselines/reference/objectFreeze.errors.txt
+++ b/tests/baselines/reference/objectFreeze.errors.txt
@@ -1,18 +1,22 @@
-tests/cases/compiler/objectFreeze.ts(5,1): error TS2542: Index signature in type 'ReadonlyArray<number>' only permits reading.
-tests/cases/compiler/objectFreeze.ts(8,3): error TS2540: Cannot assign to 'b' because it is a constant or a read-only property.
+tests/cases/compiler/objectFreeze.ts(9,1): error TS2542: Index signature in type 'ReadonlyArray<number>' only permits reading.
+tests/cases/compiler/objectFreeze.ts(12,3): error TS2540: Cannot assign to 'b' because it is a constant or a read-only property.
 
 
 ==== tests/cases/compiler/objectFreeze.ts (2 errors) ====
     const f = Object.freeze(function foo(a: number, b: string) { return false; });
     f(1, "") === false;
     
+    class C { constructor(a: number) { } }
+    const c = Object.freeze(C);
+    new c(1);
+    
     const a = Object.freeze([1, 2, 3]);
-    a[0] = 1;
+    a[0] = a[2].toString();
     ~~~~
 !!! error TS2542: Index signature in type 'ReadonlyArray<number>' only permits reading.
     
     const o = Object.freeze({ a: 1, b: "string" });
-    o.b = "another";
+    o.b = o.a.toString();
       ~
 !!! error TS2540: Cannot assign to 'b' because it is a constant or a read-only property.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/objectFreeze.js b/tests/baselines/reference/objectFreeze.js
index 51308c8e07c..4c37631bb10 100644
--- a/tests/baselines/reference/objectFreeze.js
+++ b/tests/baselines/reference/objectFreeze.js
@@ -2,17 +2,28 @@
 const f = Object.freeze(function foo(a: number, b: string) { return false; });
 f(1, "") === false;
 
+class C { constructor(a: number) { } }
+const c = Object.freeze(C);
+new c(1);
+
 const a = Object.freeze([1, 2, 3]);
-a[0] = 1;
+a[0] = a[2].toString();
 
 const o = Object.freeze({ a: 1, b: "string" });
-o.b = "another";
+o.b = o.a.toString();
 
 
 //// [objectFreeze.js]
 var f = Object.freeze(function foo(a, b) { return false; });
 f(1, "") === false;
+var C = (function () {
+    function C(a) {
+    }
+    return C;
+}());
+var c = Object.freeze(C);
+new c(1);
 var a = Object.freeze([1, 2, 3]);
-a[0] = 1;
+a[0] = a[2].toString();
 var o = Object.freeze({ a: 1, b: "string" });
-o.b = "another";
+o.b = o.a.toString();
diff --git a/tests/cases/compiler/objectFreeze.ts b/tests/cases/compiler/objectFreeze.ts
index 2c93fc8f075..5e8539831b1 100644
--- a/tests/cases/compiler/objectFreeze.ts
+++ b/tests/cases/compiler/objectFreeze.ts
@@ -1,8 +1,12 @@
 const f = Object.freeze(function foo(a: number, b: string) { return false; });
 f(1, "") === false;
 
+class C { constructor(a: number) { } }
+const c = Object.freeze(C);
+new c(1);
+
 const a = Object.freeze([1, 2, 3]);
-a[0] = 1;
+a[0] = a[2].toString();
 
 const o = Object.freeze({ a: 1, b: "string" });
-o.b = "another";
+o.b = o.a.toString();

From 15d870bdcf6875b3d0824e642ce4aa673826dba6 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Wed, 23 Nov 2016 10:56:42 -0800
Subject: [PATCH 338/421] Use `Function` instead of call and construct
 signatures

---
 src/lib/es5.d.ts | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/lib/es5.d.ts b/src/lib/es5.d.ts
index 097089e371f..1e6b44788b3 100644
--- a/src/lib/es5.d.ts
+++ b/src/lib/es5.d.ts
@@ -186,19 +186,7 @@ interface ObjectConstructor {
       * Prevents the modification of existing property attributes and values, and prevents the addition of new properties.
       * @param o Object on which to lock the attributes.
       */
-    freeze<T extends (...args: any[]) => any>(f: T): T;
-
-    /**
-      * Prevents the modification of existing property attributes and values, and prevents the addition of new properties.
-      * @param o Object on which to lock the attributes.
-      */
-    freeze<T extends new (...args: any[]) => any>(c: T): T;
-
-    /**
-      * Prevents the modification of existing property attributes and values, and prevents the addition of new properties.
-      * @param o Object on which to lock the attributes.
-      */
-    freeze<T>(f: (...args: any[]) => T): (...args: any[]) => T;
+    freeze<T extends Function>(f: T): T;
 
     /**
       * Prevents the modification of existing property attributes and values, and prevents the addition of new properties.

From 4e7313b4f69682df92c48feac6aa50910a592d04 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Wed, 23 Nov 2016 12:20:55 -0800
Subject: [PATCH 339/421] Instead of creating clone of the jsxFactory's leaf
 node, create synthesized node Fixes #12467 This avoid setting original node
 which would be something from isolated parsing and hence not valid when
 resolving expression

---
 src/compiler/factory.ts                       | 14 +++-------
 .../jsxFactoryQualifiedNameWithEs5.js         | 27 +++++++++++++++++++
 .../jsxFactoryQualifiedNameWithEs5.symbols    | 23 ++++++++++++++++
 .../jsxFactoryQualifiedNameWithEs5.types      | 27 +++++++++++++++++++
 .../jsxFactoryQualifiedNameWithEs5.ts         | 17 ++++++++++++
 5 files changed, 98 insertions(+), 10 deletions(-)
 create mode 100644 tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js
 create mode 100644 tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.symbols
 create mode 100644 tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.types
 create mode 100644 tests/cases/compiler/jsxFactoryQualifiedNameWithEs5.ts

diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index 63333dbe0b2..ebcea221f9e 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -1677,16 +1677,10 @@ namespace ts {
 
     function createJsxFactoryExpressionFromEntityName(jsxFactory: EntityName, parent: JsxOpeningLikeElement): Expression {
         if (isQualifiedName(jsxFactory)) {
-            return createPropertyAccess(
-                createJsxFactoryExpressionFromEntityName(
-                    jsxFactory.left,
-                    parent
-                ),
-                setEmitFlags(
-                    getMutableClone(jsxFactory.right),
-                    EmitFlags.NoSourceMap
-                )
-            );
+            const left = createJsxFactoryExpressionFromEntityName(jsxFactory.left, parent);
+            const right = <Identifier>createSynthesizedNode(SyntaxKind.Identifier);
+            right.text = jsxFactory.right.text;
+            return createPropertyAccess(left, right);
         }
         else {
             return createReactNamespace(jsxFactory.text, parent);
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js
new file mode 100644
index 00000000000..ecf7d13d89d
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js
@@ -0,0 +1,27 @@
+//// [index.tsx]
+
+import "./jsx";
+
+var skate: any;
+const React = { createElement: skate.h };
+
+class Component {
+    renderCallback() {
+        return <div>test</div>;
+    }
+};
+
+//// [index.js]
+"use strict";
+require("./jsx");
+var skate;
+var React = { createElement: skate.h };
+var Component = (function () {
+    function Component() {
+    }
+    Component.prototype.renderCallback = function () {
+        return skate.h("div", null, "test");
+    };
+    return Component;
+}());
+;
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.symbols b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.symbols
new file mode 100644
index 00000000000..35879c81ca6
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.symbols
@@ -0,0 +1,23 @@
+=== tests/cases/compiler/index.tsx ===
+
+import "./jsx";
+
+var skate: any;
+>skate : Symbol(skate, Decl(index.tsx, 3, 3))
+
+const React = { createElement: skate.h };
+>React : Symbol(React, Decl(index.tsx, 4, 5))
+>createElement : Symbol(createElement, Decl(index.tsx, 4, 15))
+>skate : Symbol(skate, Decl(index.tsx, 3, 3))
+
+class Component {
+>Component : Symbol(Component, Decl(index.tsx, 4, 41))
+
+    renderCallback() {
+>renderCallback : Symbol(Component.renderCallback, Decl(index.tsx, 6, 17))
+
+        return <div>test</div>;
+>div : Symbol(unknown)
+>div : Symbol(unknown)
+    }
+};
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.types b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.types
new file mode 100644
index 00000000000..21fd4bae84b
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.types
@@ -0,0 +1,27 @@
+=== tests/cases/compiler/index.tsx ===
+
+import "./jsx";
+
+var skate: any;
+>skate : any
+
+const React = { createElement: skate.h };
+>React : { createElement: any; }
+>{ createElement: skate.h } : { createElement: any; }
+>createElement : any
+>skate.h : any
+>skate : any
+>h : any
+
+class Component {
+>Component : Component
+
+    renderCallback() {
+>renderCallback : () => any
+
+        return <div>test</div>;
+><div>test</div> : any
+>div : any
+>div : any
+    }
+};
diff --git a/tests/cases/compiler/jsxFactoryQualifiedNameWithEs5.ts b/tests/cases/compiler/jsxFactoryQualifiedNameWithEs5.ts
new file mode 100644
index 00000000000..86fd9935a1f
--- /dev/null
+++ b/tests/cases/compiler/jsxFactoryQualifiedNameWithEs5.ts
@@ -0,0 +1,17 @@
+//@module: commonjs
+//@target: es5
+//@jsx: react
+//@jsxFactory: skate.h
+//@noEmit: false
+
+// @filename: index.tsx
+import "./jsx";
+
+var skate: any;
+const React = { createElement: skate.h };
+
+class Component {
+    renderCallback() {
+        return <div>test</div>;
+    }
+};
\ No newline at end of file

From 79bf477b675ebf6afb7c68f3784a7e8a294403f8 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Wed, 23 Nov 2016 12:24:44 -0800
Subject: [PATCH 340/421] Revert "Instead of creating clone of the jsxFactory's
 leaf node, create synthesized node"

This reverts commit 4e7313b4f69682df92c48feac6aa50910a592d04.
---
 src/compiler/factory.ts                       | 14 +++++++---
 .../jsxFactoryQualifiedNameWithEs5.js         | 27 -------------------
 .../jsxFactoryQualifiedNameWithEs5.symbols    | 23 ----------------
 .../jsxFactoryQualifiedNameWithEs5.types      | 27 -------------------
 .../jsxFactoryQualifiedNameWithEs5.ts         | 17 ------------
 5 files changed, 10 insertions(+), 98 deletions(-)
 delete mode 100644 tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js
 delete mode 100644 tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.symbols
 delete mode 100644 tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.types
 delete mode 100644 tests/cases/compiler/jsxFactoryQualifiedNameWithEs5.ts

diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index ebcea221f9e..63333dbe0b2 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -1677,10 +1677,16 @@ namespace ts {
 
     function createJsxFactoryExpressionFromEntityName(jsxFactory: EntityName, parent: JsxOpeningLikeElement): Expression {
         if (isQualifiedName(jsxFactory)) {
-            const left = createJsxFactoryExpressionFromEntityName(jsxFactory.left, parent);
-            const right = <Identifier>createSynthesizedNode(SyntaxKind.Identifier);
-            right.text = jsxFactory.right.text;
-            return createPropertyAccess(left, right);
+            return createPropertyAccess(
+                createJsxFactoryExpressionFromEntityName(
+                    jsxFactory.left,
+                    parent
+                ),
+                setEmitFlags(
+                    getMutableClone(jsxFactory.right),
+                    EmitFlags.NoSourceMap
+                )
+            );
         }
         else {
             return createReactNamespace(jsxFactory.text, parent);
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js
deleted file mode 100644
index ecf7d13d89d..00000000000
--- a/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js
+++ /dev/null
@@ -1,27 +0,0 @@
-//// [index.tsx]
-
-import "./jsx";
-
-var skate: any;
-const React = { createElement: skate.h };
-
-class Component {
-    renderCallback() {
-        return <div>test</div>;
-    }
-};
-
-//// [index.js]
-"use strict";
-require("./jsx");
-var skate;
-var React = { createElement: skate.h };
-var Component = (function () {
-    function Component() {
-    }
-    Component.prototype.renderCallback = function () {
-        return skate.h("div", null, "test");
-    };
-    return Component;
-}());
-;
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.symbols b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.symbols
deleted file mode 100644
index 35879c81ca6..00000000000
--- a/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.symbols
+++ /dev/null
@@ -1,23 +0,0 @@
-=== tests/cases/compiler/index.tsx ===
-
-import "./jsx";
-
-var skate: any;
->skate : Symbol(skate, Decl(index.tsx, 3, 3))
-
-const React = { createElement: skate.h };
->React : Symbol(React, Decl(index.tsx, 4, 5))
->createElement : Symbol(createElement, Decl(index.tsx, 4, 15))
->skate : Symbol(skate, Decl(index.tsx, 3, 3))
-
-class Component {
->Component : Symbol(Component, Decl(index.tsx, 4, 41))
-
-    renderCallback() {
->renderCallback : Symbol(Component.renderCallback, Decl(index.tsx, 6, 17))
-
-        return <div>test</div>;
->div : Symbol(unknown)
->div : Symbol(unknown)
-    }
-};
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.types b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.types
deleted file mode 100644
index 21fd4bae84b..00000000000
--- a/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.types
+++ /dev/null
@@ -1,27 +0,0 @@
-=== tests/cases/compiler/index.tsx ===
-
-import "./jsx";
-
-var skate: any;
->skate : any
-
-const React = { createElement: skate.h };
->React : { createElement: any; }
->{ createElement: skate.h } : { createElement: any; }
->createElement : any
->skate.h : any
->skate : any
->h : any
-
-class Component {
->Component : Component
-
-    renderCallback() {
->renderCallback : () => any
-
-        return <div>test</div>;
-><div>test</div> : any
->div : any
->div : any
-    }
-};
diff --git a/tests/cases/compiler/jsxFactoryQualifiedNameWithEs5.ts b/tests/cases/compiler/jsxFactoryQualifiedNameWithEs5.ts
deleted file mode 100644
index 86fd9935a1f..00000000000
--- a/tests/cases/compiler/jsxFactoryQualifiedNameWithEs5.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-//@module: commonjs
-//@target: es5
-//@jsx: react
-//@jsxFactory: skate.h
-//@noEmit: false
-
-// @filename: index.tsx
-import "./jsx";
-
-var skate: any;
-const React = { createElement: skate.h };
-
-class Component {
-    renderCallback() {
-        return <div>test</div>;
-    }
-};
\ No newline at end of file

From 20a8a30b76bf9ca95678951f69a1cc8f418bad71 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Wed, 23 Nov 2016 12:20:55 -0800
Subject: [PATCH 341/421] Instead of creating clone of the jsxFactory's leaf
 node, create synthesized node Fixes #12467 This avoid setting original node
 which would be something from isolated parsing and hence not valid when
 resolving expression

---
 src/compiler/factory.ts                       | 14 +++-------
 .../jsxFactoryQualifiedNameWithEs5.js         | 27 +++++++++++++++++++
 .../jsxFactoryQualifiedNameWithEs5.symbols    | 23 ++++++++++++++++
 .../jsxFactoryQualifiedNameWithEs5.types      | 27 +++++++++++++++++++
 .../jsxFactoryQualifiedNameWithEs5.ts         | 17 ++++++++++++
 5 files changed, 98 insertions(+), 10 deletions(-)
 create mode 100644 tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js
 create mode 100644 tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.symbols
 create mode 100644 tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.types
 create mode 100644 tests/cases/compiler/jsxFactoryQualifiedNameWithEs5.ts

diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index 63333dbe0b2..ebcea221f9e 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -1677,16 +1677,10 @@ namespace ts {
 
     function createJsxFactoryExpressionFromEntityName(jsxFactory: EntityName, parent: JsxOpeningLikeElement): Expression {
         if (isQualifiedName(jsxFactory)) {
-            return createPropertyAccess(
-                createJsxFactoryExpressionFromEntityName(
-                    jsxFactory.left,
-                    parent
-                ),
-                setEmitFlags(
-                    getMutableClone(jsxFactory.right),
-                    EmitFlags.NoSourceMap
-                )
-            );
+            const left = createJsxFactoryExpressionFromEntityName(jsxFactory.left, parent);
+            const right = <Identifier>createSynthesizedNode(SyntaxKind.Identifier);
+            right.text = jsxFactory.right.text;
+            return createPropertyAccess(left, right);
         }
         else {
             return createReactNamespace(jsxFactory.text, parent);
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js
new file mode 100644
index 00000000000..ecf7d13d89d
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js
@@ -0,0 +1,27 @@
+//// [index.tsx]
+
+import "./jsx";
+
+var skate: any;
+const React = { createElement: skate.h };
+
+class Component {
+    renderCallback() {
+        return <div>test</div>;
+    }
+};
+
+//// [index.js]
+"use strict";
+require("./jsx");
+var skate;
+var React = { createElement: skate.h };
+var Component = (function () {
+    function Component() {
+    }
+    Component.prototype.renderCallback = function () {
+        return skate.h("div", null, "test");
+    };
+    return Component;
+}());
+;
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.symbols b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.symbols
new file mode 100644
index 00000000000..35879c81ca6
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.symbols
@@ -0,0 +1,23 @@
+=== tests/cases/compiler/index.tsx ===
+
+import "./jsx";
+
+var skate: any;
+>skate : Symbol(skate, Decl(index.tsx, 3, 3))
+
+const React = { createElement: skate.h };
+>React : Symbol(React, Decl(index.tsx, 4, 5))
+>createElement : Symbol(createElement, Decl(index.tsx, 4, 15))
+>skate : Symbol(skate, Decl(index.tsx, 3, 3))
+
+class Component {
+>Component : Symbol(Component, Decl(index.tsx, 4, 41))
+
+    renderCallback() {
+>renderCallback : Symbol(Component.renderCallback, Decl(index.tsx, 6, 17))
+
+        return <div>test</div>;
+>div : Symbol(unknown)
+>div : Symbol(unknown)
+    }
+};
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.types b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.types
new file mode 100644
index 00000000000..21fd4bae84b
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.types
@@ -0,0 +1,27 @@
+=== tests/cases/compiler/index.tsx ===
+
+import "./jsx";
+
+var skate: any;
+>skate : any
+
+const React = { createElement: skate.h };
+>React : { createElement: any; }
+>{ createElement: skate.h } : { createElement: any; }
+>createElement : any
+>skate.h : any
+>skate : any
+>h : any
+
+class Component {
+>Component : Component
+
+    renderCallback() {
+>renderCallback : () => any
+
+        return <div>test</div>;
+><div>test</div> : any
+>div : any
+>div : any
+    }
+};
diff --git a/tests/cases/compiler/jsxFactoryQualifiedNameWithEs5.ts b/tests/cases/compiler/jsxFactoryQualifiedNameWithEs5.ts
new file mode 100644
index 00000000000..86fd9935a1f
--- /dev/null
+++ b/tests/cases/compiler/jsxFactoryQualifiedNameWithEs5.ts
@@ -0,0 +1,17 @@
+//@module: commonjs
+//@target: es5
+//@jsx: react
+//@jsxFactory: skate.h
+//@noEmit: false
+
+// @filename: index.tsx
+import "./jsx";
+
+var skate: any;
+const React = { createElement: skate.h };
+
+class Component {
+    renderCallback() {
+        return <div>test</div>;
+    }
+};
\ No newline at end of file

From c05bf3b0a2ff5c72b37d271dc557391f66d2c79a Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Wed, 23 Nov 2016 12:34:00 -0800
Subject: [PATCH 342/421] respect casing when comparing names of config files
 (#12474)

---
 .../unittests/tsserverProjectSystem.ts        | 29 +++++++++++++++++++
 src/server/editorServices.ts                  | 10 +++++--
 src/server/project.ts                         |  2 ++
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
index 43f125b0bed..a0a6ac7f01e 100644
--- a/src/harness/unittests/tsserverProjectSystem.ts
+++ b/src/harness/unittests/tsserverProjectSystem.ts
@@ -578,6 +578,35 @@ namespace ts.projectSystem {
             checkWatchedDirectories(host, ["/a/b/c", "/a/b", "/a"]);
         });
 
+        it("can handle tsconfig file name with difference casing", () => {
+            const f1 = {
+                path: "/a/b/app.ts",
+                content: "let x = 1"
+            };
+            const config = {
+                path: "/a/b/tsconfig.json",
+                content: JSON.stringify({
+                    include: []
+                })
+            };
+
+            const host = createServerHost([f1, config], { useCaseSensitiveFileNames: false });
+            const service = createProjectService(host);
+            service.openExternalProject(<protocol.ExternalProject>{
+                projectFileName: "/a/b/project.csproj",
+                rootFiles: toExternalFiles([f1.path, combinePaths(getDirectoryPath(config.path).toUpperCase(), getBaseFileName(config.path))]),
+                options: {}
+            });
+            service.checkNumberOfProjects({ configuredProjects: 1 });
+            checkProjectActualFiles(service.configuredProjects[0], []);
+
+            service.openClientFile(f1.path);
+            service.checkNumberOfProjects({ configuredProjects: 1, inferredProjects: 1 });
+
+            checkProjectActualFiles(service.configuredProjects[0], []);
+            checkProjectActualFiles(service.inferredProjects[0], [f1.path]);
+        })
+
         it("create configured project without file list", () => {
             const configFile: FileOrFolder = {
                 path: "/a/b/tsconfig.json",
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index 881d188307d..df46f32672f 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -257,7 +257,7 @@ namespace ts.server {
 
         private changedFiles: ScriptInfo[];
 
-        private toCanonicalFileName: (f: string) => string;
+        readonly toCanonicalFileName: (f: string) => string;
 
         public lastDeletedFile: ScriptInfo;
 
@@ -777,7 +777,13 @@ namespace ts.server {
         }
 
         private findConfiguredProjectByProjectName(configFileName: NormalizedPath) {
-            return findProjectByName(configFileName, this.configuredProjects);
+            // make sure that casing of config file name is consistent
+            configFileName = asNormalizedPath(this.toCanonicalFileName(configFileName));
+            for (const proj of this.configuredProjects) {
+                if (proj.canonicalConfigFilePath === configFileName) {
+                    return proj;
+                }
+            }
         }
 
         private findExternalProjectByProjectName(projectFileName: string) {
diff --git a/src/server/project.ts b/src/server/project.ts
index c37dd6e135a..c28b29b944b 100644
--- a/src/server/project.ts
+++ b/src/server/project.ts
@@ -817,6 +817,7 @@ namespace ts.server {
         private directoryWatcher: FileWatcher;
         private directoriesWatchedForWildcards: Map<FileWatcher>;
         private typeRootsWatchers: FileWatcher[];
+        readonly canonicalConfigFilePath: NormalizedPath;
 
         /** Used for configured projects which may have multiple open roots */
         openRefCount = 0;
@@ -830,6 +831,7 @@ namespace ts.server {
             languageServiceEnabled: boolean,
             public compileOnSaveEnabled: boolean) {
             super(configFileName, ProjectKind.Configured, projectService, documentRegistry, hasExplicitListOfFiles, languageServiceEnabled, compilerOptions, compileOnSaveEnabled);
+            this.canonicalConfigFilePath = asNormalizedPath(projectService.toCanonicalFileName(configFileName));
         }
 
         getConfigFilePath() {

From cdda5dfd61fd0b3a7288619895ec3f85ebec1c70 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Wed, 23 Nov 2016 18:22:57 -0800
Subject: [PATCH 343/421] keyof T is a literal contextual type

---
 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 6d5a8b74cb3..f0c6e4edb42 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -14870,7 +14870,7 @@ namespace ts {
                     }
                     contextualType = apparentType;
                 }
-                return maybeTypeOfKind(contextualType, TypeFlags.Literal);
+                return maybeTypeOfKind(contextualType, (TypeFlags.Literal | TypeFlags.Index));
             }
             return false;
         }

From 2cec4c5ebb2cfde2119f04b299fc91fdf05f183c Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Wed, 23 Nov 2016 18:28:59 -0800
Subject: [PATCH 344/421] Add regression test

---
 .../keyofIsLiteralContexualType.errors.txt    | 32 +++++++++++++++++++
 .../reference/keyofIsLiteralContexualType.js  | 23 +++++++++++++
 .../compiler/keyofIsLiteralContexualType.ts   | 13 ++++++++
 3 files changed, 68 insertions(+)
 create mode 100644 tests/baselines/reference/keyofIsLiteralContexualType.errors.txt
 create mode 100644 tests/baselines/reference/keyofIsLiteralContexualType.js
 create mode 100644 tests/cases/compiler/keyofIsLiteralContexualType.ts

diff --git a/tests/baselines/reference/keyofIsLiteralContexualType.errors.txt b/tests/baselines/reference/keyofIsLiteralContexualType.errors.txt
new file mode 100644
index 00000000000..8424d528b22
--- /dev/null
+++ b/tests/baselines/reference/keyofIsLiteralContexualType.errors.txt
@@ -0,0 +1,32 @@
+tests/cases/compiler/keyofIsLiteralContexualType.ts(5,9): error TS2322: Type '("a" | "b" | "c")[]' is not assignable to type 'keyof T[]'.
+  Type '"a" | "b" | "c"' is not assignable to type 'keyof T'.
+    Type '"a" | "b" | "c"' is not assignable to type '"a" | "b"'.
+      Type '"c"' is not assignable to type '"a" | "b"'.
+        Type '"c"' is not assignable to type 'keyof T'.
+          Type '"c"' is not assignable to type '"a" | "b"'.
+tests/cases/compiler/keyofIsLiteralContexualType.ts(13,11): error TS2339: Property 'b' does not exist on type 'Pick<{ a: number; b: number; c: number; }, "a" | "c">'.
+
+
+==== tests/cases/compiler/keyofIsLiteralContexualType.ts (2 errors) ====
+    // keyof T is a literal contextual type
+    
+    function foo<T extends { a: string, b: string }>() {
+        let a: (keyof T)[] = ["a", "b"];
+        let b: (keyof T)[] = ["a", "b", "c"];
+            ~
+!!! error TS2322: Type '("a" | "b" | "c")[]' is not assignable to type 'keyof T[]'.
+!!! error TS2322:   Type '"a" | "b" | "c"' is not assignable to type 'keyof T'.
+!!! error TS2322:     Type '"a" | "b" | "c"' is not assignable to type '"a" | "b"'.
+!!! error TS2322:       Type '"c"' is not assignable to type '"a" | "b"'.
+!!! error TS2322:         Type '"c"' is not assignable to type 'keyof T'.
+!!! error TS2322:           Type '"c"' is not assignable to type '"a" | "b"'.
+    }
+    
+    // Repro from #12455
+    
+    declare function pick<T, K extends keyof T>(obj: T, propNames: K[]): Pick<T, K>;
+    
+    let x = pick({ a: 10, b: 20, c: 30 }, ["a", "c"]);
+    let b = x.b;  // Error
+              ~
+!!! error TS2339: Property 'b' does not exist on type 'Pick<{ a: number; b: number; c: number; }, "a" | "c">'.
\ No newline at end of file
diff --git a/tests/baselines/reference/keyofIsLiteralContexualType.js b/tests/baselines/reference/keyofIsLiteralContexualType.js
new file mode 100644
index 00000000000..5325b976174
--- /dev/null
+++ b/tests/baselines/reference/keyofIsLiteralContexualType.js
@@ -0,0 +1,23 @@
+//// [keyofIsLiteralContexualType.ts]
+// keyof T is a literal contextual type
+
+function foo<T extends { a: string, b: string }>() {
+    let a: (keyof T)[] = ["a", "b"];
+    let b: (keyof T)[] = ["a", "b", "c"];
+}
+
+// Repro from #12455
+
+declare function pick<T, K extends keyof T>(obj: T, propNames: K[]): Pick<T, K>;
+
+let x = pick({ a: 10, b: 20, c: 30 }, ["a", "c"]);
+let b = x.b;  // Error
+
+//// [keyofIsLiteralContexualType.js]
+// keyof T is a literal contextual type
+function foo() {
+    var a = ["a", "b"];
+    var b = ["a", "b", "c"];
+}
+var x = pick({ a: 10, b: 20, c: 30 }, ["a", "c"]);
+var b = x.b; // Error
diff --git a/tests/cases/compiler/keyofIsLiteralContexualType.ts b/tests/cases/compiler/keyofIsLiteralContexualType.ts
new file mode 100644
index 00000000000..dd14de92289
--- /dev/null
+++ b/tests/cases/compiler/keyofIsLiteralContexualType.ts
@@ -0,0 +1,13 @@
+// keyof T is a literal contextual type
+
+function foo<T extends { a: string, b: string }>() {
+    let a: (keyof T)[] = ["a", "b"];
+    let b: (keyof T)[] = ["a", "b", "c"];
+}
+
+// Repro from #12455
+
+declare function pick<T, K extends keyof T>(obj: T, propNames: K[]): Pick<T, K>;
+
+let x = pick({ a: 10, b: 20, c: 30 }, ["a", "c"]);
+let b = x.b;  // Error
\ No newline at end of file

From 36ad772c55cfd73f34ccee4e41a5c5a13ff297b7 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Wed, 23 Nov 2016 20:07:53 -0800
Subject: [PATCH 345/421] Type inference for isomorphic mapped types

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 6d5a8b74cb3..f7d01d5480d 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -8425,7 +8425,7 @@ namespace ts {
         // results for union and intersection types for performance reasons.
         function couldContainTypeParameters(type: Type): boolean {
             const objectFlags = getObjectFlags(type);
-            return !!(type.flags & TypeFlags.TypeParameter ||
+            return !!(type.flags & (TypeFlags.TypeParameter | TypeFlags.IndexedAccess) ||
                 objectFlags & ObjectFlags.Reference && forEach((<TypeReference>type).typeArguments, couldContainTypeParameters) ||
                 objectFlags & ObjectFlags.Anonymous && type.symbol && type.symbol.flags & (SymbolFlags.Method | SymbolFlags.TypeLiteral | SymbolFlags.Class) ||
                 objectFlags & ObjectFlags.Mapped ||
@@ -8443,8 +8443,57 @@ namespace ts {
             return type === typeParameter || type.flags & TypeFlags.UnionOrIntersection && forEach((<UnionOrIntersectionType>type).types, t => isTypeParameterAtTopLevel(t, typeParameter));
         }
 
-        function inferTypes(context: InferenceContext, originalSource: Type, originalTarget: Type) {
-            const typeParameters = context.signature.typeParameters;
+        // Infer a suitable input type for an isomorphic mapped type { [P in keyof T]: X }. We construct
+        // an object type with the same set of properties as the source type, where the type of each
+        // property is computed by inferring from the source property type to X for a synthetic type
+        // parameter T[P] (i.e. we treat the type T[P] as the type parameter we're inferring for).
+        function inferTypeForIsomorphicMappedType(source: Type, target: MappedType): Type {
+            if (!isMappableType(source)) {
+                return source;
+            }
+            const typeParameter = getIndexedAccessType((<IndexType>getConstraintTypeFromMappedType(target)).type, getTypeParameterFromMappedType(target));
+            const typeParameterArray = [typeParameter];
+            const typeInferences = createTypeInferencesObject();
+            const typeInferencesArray = [typeInferences];
+            const templateType = getTemplateTypeFromMappedType(target);
+            const properties = getPropertiesOfType(source);
+            const members = createSymbolTable(properties);
+            let hasInferredTypes = false;
+            for (const prop of properties) {
+                const inferredPropType = inferTargetType(getTypeOfSymbol(prop));
+                if (inferredPropType) {
+                    const inferredProp = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | prop.flags & SymbolFlags.Optional, prop.name);
+                    inferredProp.declarations = prop.declarations;
+                    inferredProp.type = inferredPropType;
+                    inferredProp.isReadonly = isReadonlySymbol(prop);
+                    members[prop.name] = inferredProp;
+                    hasInferredTypes = true;
+                }
+            }
+            let indexInfo = getIndexInfoOfType(source, IndexKind.String);
+            if (indexInfo) {
+                const inferredIndexType = inferTargetType(indexInfo.type);
+                if (inferredIndexType) {
+                    indexInfo = createIndexInfo(inferredIndexType, indexInfo.isReadonly);
+                    hasInferredTypes = true;
+                }
+            }
+            return hasInferredTypes ? createAnonymousType(undefined, members, emptyArray, emptyArray, indexInfo, undefined) : source;
+
+            function inferTargetType(sourceType: Type): Type {
+                typeInferences.primary = undefined;
+                typeInferences.secondary = undefined;
+                inferTypes(typeParameterArray, typeInferencesArray, sourceType, templateType);
+                const inferences = typeInferences.primary || typeInferences.secondary;
+                return inferences && getUnionType(inferences, /*subtypeReduction*/ true);
+            }
+        }
+
+        function inferTypesWithContext(context: InferenceContext, originalSource: Type, originalTarget: Type) {
+            inferTypes(context.signature.typeParameters, context.inferences, originalSource, originalTarget);
+        }
+
+        function inferTypes(typeParameters: Type[], typeInferences: TypeInferences[], originalSource: Type, originalTarget: Type) {
             let sourceStack: Type[];
             let targetStack: Type[];
             let depth = 0;
@@ -8512,7 +8561,7 @@ namespace ts {
                         target = removeTypesFromUnionOrIntersection(<UnionOrIntersectionType>target, matchingTypes);
                     }
                 }
-                if (target.flags & TypeFlags.TypeParameter) {
+                if (target.flags & (TypeFlags.TypeParameter | TypeFlags.IndexedAccess)) {
                     // 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).
                     // Because the anyFunctionType is internal, it should not be exposed to the user by adding
@@ -8524,7 +8573,7 @@ namespace ts {
                     }
                     for (let i = 0; i < typeParameters.length; i++) {
                         if (target === typeParameters[i]) {
-                            const inferences = context.inferences[i];
+                            const inferences = typeInferences[i];
                             if (!inferences.isFixed) {
                                 // Any inferences that are made to a type parameter in a union type are inferior
                                 // to inferences made to a flat (non-union) type. This is because if we infer to
@@ -8538,7 +8587,7 @@ namespace ts {
                                 if (!contains(candidates, source)) {
                                     candidates.push(source);
                                 }
-                                if (!isTypeParameterAtTopLevel(originalTarget, <TypeParameter>target)) {
+                                if (target.flags & TypeFlags.TypeParameter && !isTypeParameterAtTopLevel(originalTarget, <TypeParameter>target)) {
                                     inferences.topLevel = false;
                                 }
                             }
@@ -8589,15 +8638,29 @@ namespace ts {
                     if (getObjectFlags(target) & ObjectFlags.Mapped) {
                         const constraintType = getConstraintTypeFromMappedType(<MappedType>target);
                         if (getObjectFlags(source) & ObjectFlags.Mapped) {
+                            // We're inferring from a mapped type to a mapped type, so simply infer from constraint type to
+                            // constraint type and from template type to template type.
                             inferFromTypes(getConstraintTypeFromMappedType(<MappedType>source), constraintType);
                             inferFromTypes(getTemplateTypeFromMappedType(<MappedType>source), getTemplateTypeFromMappedType(<MappedType>target));
                             return;
                         }
                         if (constraintType.flags & TypeFlags.TypeParameter) {
+                            // We're inferring from some source type S to a mapped type { [P in T]: X }, where T is a type
+                            // parameter. Infer from 'keyof S' to T and infer from a union of each property type in S to X.
                             inferFromTypes(getIndexType(source), constraintType);
                             inferFromTypes(getUnionType(map(getPropertiesOfType(source), getTypeOfSymbol)), getTemplateTypeFromMappedType(<MappedType>target));
                             return;
                         }
+                        if (constraintType.flags & TypeFlags.Index) {
+                            // We're inferring from some source type S to an isomorphic mapped type { [P in keyof T]: X },
+                            // where T is a type parameter. Use inferTypeForIsomorphicMappedType to infer a suitable source
+                            // type and then infer from that type to T.
+                            const index = indexOf(typeParameters, (<IndexType>constraintType).type);
+                            if (index >= 0 && !typeInferences[index].isFixed) {
+                                inferFromTypes(inferTypeForIsomorphicMappedType(source, <MappedType>target), typeParameters[index]);
+                            }
+                            return;
+                        }
                     }
                     source = getApparentType(source);
                     if (source.flags & TypeFlags.Object) {
@@ -12458,7 +12521,7 @@ namespace ts {
             const context = createInferenceContext(signature, /*inferUnionTypes*/ true);
             forEachMatchingParameterType(contextualSignature, signature, (source, target) => {
                 // Type parameters from outer context referenced by source type are fixed by instantiation of the source type
-                inferTypes(context, instantiateType(source, contextualMapper), target);
+                inferTypesWithContext(context, instantiateType(source, contextualMapper), target);
             });
             return getSignatureInstantiation(signature, getInferredTypes(context));
         }
@@ -12493,7 +12556,7 @@ namespace ts {
             if (thisType) {
                 const thisArgumentNode = getThisArgumentOfCall(node);
                 const thisArgumentType = thisArgumentNode ? checkExpression(thisArgumentNode) : voidType;
-                inferTypes(context, thisArgumentType, thisType);
+                inferTypesWithContext(context, thisArgumentType, thisType);
             }
 
             // We perform two passes over the arguments. In the first pass we infer from all arguments, but use
@@ -12515,7 +12578,7 @@ namespace ts {
                         argType = checkExpressionWithContextualType(arg, paramType, mapper);
                     }
 
-                    inferTypes(context, argType, paramType);
+                    inferTypesWithContext(context, argType, paramType);
                 }
             }
 
@@ -12530,7 +12593,7 @@ namespace ts {
                     if (excludeArgument[i] === false) {
                         const arg = args[i];
                         const paramType = getTypeAtPosition(signature, i);
-                        inferTypes(context, checkExpressionWithContextualType(arg, paramType, inferenceMapper), paramType);
+                        inferTypesWithContext(context, checkExpressionWithContextualType(arg, paramType, inferenceMapper), paramType);
                     }
                 }
             }
@@ -13617,7 +13680,7 @@ namespace ts {
                 for (let i = 0; i < len; i++) {
                     const declaration = <ParameterDeclaration>signature.parameters[i].valueDeclaration;
                     if (declaration.type) {
-                        inferTypes(mapper.context, getTypeFromTypeNode(declaration.type), getTypeAtPosition(context, i));
+                        inferTypesWithContext(mapper.context, getTypeFromTypeNode(declaration.type), getTypeAtPosition(context, i));
                     }
                 }
             }
@@ -13703,7 +13766,7 @@ namespace ts {
                 // T in the second overload so that we do not infer Base as a candidate for T
                 // (inferring Base would make type argument inference inconsistent between the two
                 // overloads).
-                inferTypes(mapper.context, links.type, instantiateType(contextualType, mapper));
+                inferTypesWithContext(mapper.context, links.type, instantiateType(contextualType, mapper));
             }
         }
 

From 7b37918a1158717d555fcc143aca4b9719ab5e4a Mon Sep 17 00:00:00 2001
From: Charly POLY <cpoly55@gmail.com>
Date: Thu, 24 Nov 2016 10:16:21 +0100
Subject: [PATCH 346/421] doc(compiler/ts): fix documentation typo about
 __decorator code generation When __decorator applied to method, the last
 parameter (descriptor) is null, not undefined

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

diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
index 62b2022b7df..52717a94996 100644
--- a/src/compiler/transformers/ts.ts
+++ b/src/compiler/transformers/ts.ts
@@ -1353,13 +1353,13 @@ namespace ts {
             //       __metadata("design:type", Function),
             //       __metadata("design:paramtypes", [Object]),
             //       __metadata("design:returntype", void 0)
-            //   ], C.prototype, "method", undefined);
+            //   ], C.prototype, "method", null);
             //
             // The emit for an accessor is:
             //
             //   __decorate([
             //       dec
-            //   ], C.prototype, "accessor", undefined);
+            //   ], C.prototype, "accessor", null);
             //
             // The emit for a property is:
             //

From 46ca0ba41eb5bdcdb15f0cc136aacebb86655519 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sat, 26 Nov 2016 09:58:44 -0800
Subject: [PATCH 347/421] Fix multiple 'keyof' issues with 'for-in' and 'in'
 operator

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index f0c6e4edb42..cf430efcbf5 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -3205,7 +3205,7 @@ namespace ts {
             // right hand expression is of a type parameter type.
             if (declaration.parent.parent.kind === SyntaxKind.ForInStatement) {
                 const indexType = getIndexType(checkNonNullExpression((<ForInStatement>declaration.parent.parent).expression));
-                return indexType.flags & TypeFlags.Index ? indexType : stringType;
+                return indexType.flags & (TypeFlags.TypeParameter | TypeFlags.Index) ? indexType : stringType;
             }
 
             if (declaration.parent.parent.kind === SyntaxKind.ForOfStatement) {
@@ -5920,6 +5920,11 @@ namespace ts {
                 getLiteralTypeFromPropertyNames(type);
         }
 
+        function getIndexTypeOrString(type: Type): Type {
+            const indexType = getIndexType(type);
+            return indexType !== neverType ? indexType : stringType;
+        }
+
         function getTypeFromTypeOperatorNode(node: TypeOperatorNode) {
             const links = getNodeLinks(node);
             if (!links.resolvedType) {
@@ -6018,8 +6023,7 @@ namespace ts {
                 // meaningfully access the properties of the object type. In those cases, we first check that the
                 // index type is assignable to 'keyof T' for the object type.
                 if (accessNode) {
-                    const keyType = indexType.flags & TypeFlags.TypeParameter ? getConstraintOfTypeParameter(<TypeParameter>indexType) || emptyObjectType : indexType;
-                    if (!isTypeAssignableTo(keyType, getIndexType(objectType))) {
+                    if (!isTypeAssignableTo(indexType, getIndexType(objectType))) {
                         error(accessNode, Diagnostics.Type_0_cannot_be_used_to_index_type_1, typeToString(indexType), typeToString(objectType));
                         return unknownType;
                     }
@@ -14275,7 +14279,7 @@ namespace ts {
             // The in operator requires the left operand to be of type Any, the String primitive type, or the Number primitive type,
             // and the right operand to be of type Any, an object type, or a type parameter type.
             // The result is always of the Boolean primitive type.
-            if (!isTypeAnyOrAllConstituentTypesHaveKind(leftType, TypeFlags.StringLike | TypeFlags.NumberLike | TypeFlags.ESSymbol)) {
+            if (!(isTypeComparableTo(leftType, stringType) || isTypeOfKind(leftType, TypeFlags.NumberLike | TypeFlags.ESSymbol))) {
                 error(left, Diagnostics.The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol);
             }
             if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, TypeFlags.Object | TypeFlags.TypeParameter | TypeFlags.IndexedAccess)) {
@@ -17166,6 +17170,7 @@ namespace ts {
             // Grammar checking
             checkGrammarForInOrForOfStatement(node);
 
+            const rightType = checkNonNullExpression(node.expression);
             // TypeScript 1.0 spec  (April 2014): 5.4
             // In a 'for-in' statement of the form
             // for (let VarDecl in Expr) Statement
@@ -17176,7 +17181,6 @@ namespace ts {
                 if (variable && isBindingPattern(variable.name)) {
                     error(variable.name, Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
                 }
-
                 checkForInOrForOfVariableDeclaration(node);
             }
             else {
@@ -17189,7 +17193,7 @@ namespace ts {
                 if (varExpr.kind === SyntaxKind.ArrayLiteralExpression || varExpr.kind === SyntaxKind.ObjectLiteralExpression) {
                     error(varExpr, Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
                 }
-                else if (!isTypeAnyOrAllConstituentTypesHaveKind(leftType, TypeFlags.StringLike)) {
+                else if (!isTypeAssignableTo(getIndexTypeOrString(rightType), leftType)) {
                     error(varExpr, Diagnostics.The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any);
                 }
                 else {
@@ -17198,7 +17202,6 @@ namespace ts {
                 }
             }
 
-            const rightType = checkNonNullExpression(node.expression);
             // unknownType is returned i.e. if node.expression is identifier whose name cannot be resolved
             // in this case error about missing name is already reported - do not report extra one
             if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, TypeFlags.Object | TypeFlags.TypeParameter | TypeFlags.IndexedAccess)) {

From a26a3032c8f1d3e9489324a0f3f3e73dea7cf009 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sat, 26 Nov 2016 10:06:21 -0800
Subject: [PATCH 348/421] Accept new baselines

---
 .../reference/inOperatorWithInvalidOperands.errors.txt    | 8 +-------
 tests/baselines/reference/widenedTypes.errors.txt         | 5 +----
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/tests/baselines/reference/inOperatorWithInvalidOperands.errors.txt b/tests/baselines/reference/inOperatorWithInvalidOperands.errors.txt
index 0985157e0da..5aeae5f160e 100644
--- a/tests/baselines/reference/inOperatorWithInvalidOperands.errors.txt
+++ b/tests/baselines/reference/inOperatorWithInvalidOperands.errors.txt
@@ -1,8 +1,6 @@
 tests/cases/conformance/expressions/binaryOperators/inOperator/inOperatorWithInvalidOperands.ts(12,11): error TS2360: The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'.
 tests/cases/conformance/expressions/binaryOperators/inOperator/inOperatorWithInvalidOperands.ts(13,11): error TS2360: The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'.
 tests/cases/conformance/expressions/binaryOperators/inOperator/inOperatorWithInvalidOperands.ts(14,11): error TS2360: The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'.
-tests/cases/conformance/expressions/binaryOperators/inOperator/inOperatorWithInvalidOperands.ts(16,11): error TS2360: The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'.
-tests/cases/conformance/expressions/binaryOperators/inOperator/inOperatorWithInvalidOperands.ts(17,11): error TS2360: The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'.
 tests/cases/conformance/expressions/binaryOperators/inOperator/inOperatorWithInvalidOperands.ts(19,11): error TS2360: The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'.
 tests/cases/conformance/expressions/binaryOperators/inOperator/inOperatorWithInvalidOperands.ts(20,11): error TS2360: The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'.
 tests/cases/conformance/expressions/binaryOperators/inOperator/inOperatorWithInvalidOperands.ts(30,16): error TS2361: The right-hand side of an 'in' expression must be of type 'any', an object type or a type parameter
@@ -19,7 +17,7 @@ tests/cases/conformance/expressions/binaryOperators/inOperator/inOperatorWithInv
 tests/cases/conformance/expressions/binaryOperators/inOperator/inOperatorWithInvalidOperands.ts(43,17): error TS2361: The right-hand side of an 'in' expression must be of type 'any', an object type or a type parameter
 
 
-==== tests/cases/conformance/expressions/binaryOperators/inOperator/inOperatorWithInvalidOperands.ts (19 errors) ====
+==== tests/cases/conformance/expressions/binaryOperators/inOperator/inOperatorWithInvalidOperands.ts (17 errors) ====
     enum E { a }
     
     var x: any;
@@ -42,11 +40,7 @@ tests/cases/conformance/expressions/binaryOperators/inOperator/inOperatorWithInv
 !!! error TS2360: The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'.
     var ra4 = a4 in x;
     var ra5 = null in x;
-              ~~~~
-!!! error TS2360: The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'.
     var ra6 = undefined in x;
-              ~~~~~~~~~
-!!! error TS2360: The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'.
     var ra7 = E.a in x;
     var ra8 = false in x;
               ~~~~~
diff --git a/tests/baselines/reference/widenedTypes.errors.txt b/tests/baselines/reference/widenedTypes.errors.txt
index ea7c2b2f92a..5ea097acf2e 100644
--- a/tests/baselines/reference/widenedTypes.errors.txt
+++ b/tests/baselines/reference/widenedTypes.errors.txt
@@ -1,5 +1,4 @@
 tests/cases/compiler/widenedTypes.ts(2,1): error TS2358: The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter.
-tests/cases/compiler/widenedTypes.ts(5,1): error TS2360: The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'.
 tests/cases/compiler/widenedTypes.ts(6,7): error TS2361: The right-hand side of an 'in' expression must be of type 'any', an object type or a type parameter
 tests/cases/compiler/widenedTypes.ts(8,15): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
 tests/cases/compiler/widenedTypes.ts(10,14): error TS2695: Left side of comma operator is unused and has no side effects.
@@ -12,7 +11,7 @@ tests/cases/compiler/widenedTypes.ts(24,5): error TS2322: Type '{ x: number; y:
     Type 'number' is not assignable to type 'string'.
 
 
-==== tests/cases/compiler/widenedTypes.ts (9 errors) ====
+==== tests/cases/compiler/widenedTypes.ts (8 errors) ====
     
     null instanceof (() => { });
     ~~~~
@@ -20,8 +19,6 @@ tests/cases/compiler/widenedTypes.ts(24,5): error TS2322: Type '{ x: number; y:
     ({}) instanceof null; // Ok because null is a subtype of function
     
     null in {};
-    ~~~~
-!!! error TS2360: The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'.
     "" in null;
           ~~~~
 !!! error TS2361: The right-hand side of an 'in' expression must be of type 'any', an object type or a type parameter

From 12b63d230a1b2afa37ee024a73c39c34e99e6ba3 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sat, 26 Nov 2016 10:06:33 -0800
Subject: [PATCH 349/421] Add regression test

---
 tests/baselines/reference/keyofAndForIn.js    |  81 +++++++++++
 .../baselines/reference/keyofAndForIn.symbols | 125 ++++++++++++++++
 tests/baselines/reference/keyofAndForIn.types | 134 ++++++++++++++++++
 .../conformance/types/keyof/keyofAndForIn.ts  |  36 +++++
 4 files changed, 376 insertions(+)
 create mode 100644 tests/baselines/reference/keyofAndForIn.js
 create mode 100644 tests/baselines/reference/keyofAndForIn.symbols
 create mode 100644 tests/baselines/reference/keyofAndForIn.types
 create mode 100644 tests/cases/conformance/types/keyof/keyofAndForIn.ts

diff --git a/tests/baselines/reference/keyofAndForIn.js b/tests/baselines/reference/keyofAndForIn.js
new file mode 100644
index 00000000000..0debf28b75e
--- /dev/null
+++ b/tests/baselines/reference/keyofAndForIn.js
@@ -0,0 +1,81 @@
+//// [keyofAndForIn.ts]
+
+// Repro from #12513
+
+function f1<K extends string, T>(obj: { [P in K]: T }, k: K) {
+    const b = k in obj;
+    let k1: K;
+    for (k1 in obj) {
+        let x1 = obj[k1];
+    }
+    for (let k2 in obj) {
+        let x2 = obj[k2];
+    }
+}
+
+function f2<T>(obj: { [P in keyof T]: T[P] }, k: keyof T) {
+    const b = k in obj;
+    let k1: keyof T;
+    for (k1 in obj) {
+        let x1 = obj[k1];
+    }
+    for (let k2 in obj) {
+        let x2 = obj[k2];
+    }
+}
+
+function f3<T, K extends keyof T>(obj: { [P in K]: T[P] }, k: K) {
+    const b = k in obj;
+    let k1: K;
+    for (k1 in obj) {
+        let x1 = obj[k1];
+    }
+    for (let k2 in obj) {
+        let x2 = obj[k2];
+    }
+}
+
+//// [keyofAndForIn.js]
+// Repro from #12513
+function f1(obj, k) {
+    var b = k in obj;
+    var k1;
+    for (k1 in obj) {
+        var x1 = obj[k1];
+    }
+    for (var k2 in obj) {
+        var x2 = obj[k2];
+    }
+}
+function f2(obj, k) {
+    var b = k in obj;
+    var k1;
+    for (k1 in obj) {
+        var x1 = obj[k1];
+    }
+    for (var k2 in obj) {
+        var x2 = obj[k2];
+    }
+}
+function f3(obj, k) {
+    var b = k in obj;
+    var k1;
+    for (k1 in obj) {
+        var x1 = obj[k1];
+    }
+    for (var k2 in obj) {
+        var x2 = obj[k2];
+    }
+}
+
+
+//// [keyofAndForIn.d.ts]
+declare function f1<K extends string, T>(obj: {
+    [P in K]: T;
+}, k: K): void;
+declare function f2<T>(obj: {
+    [P in keyof T]: T[P];
+}, k: keyof T): void;
+declare function f3<T, K extends keyof T>(obj: {
+    [P in K]: T[P];
+}, k: K): void;
diff --git a/tests/baselines/reference/keyofAndForIn.symbols b/tests/baselines/reference/keyofAndForIn.symbols
new file mode 100644
index 00000000000..36b5d3e2d72
--- /dev/null
+++ b/tests/baselines/reference/keyofAndForIn.symbols
@@ -0,0 +1,125 @@
+=== tests/cases/conformance/types/keyof/keyofAndForIn.ts ===
+
+// Repro from #12513
+
+function f1<K extends string, T>(obj: { [P in K]: T }, k: K) {
+>f1 : Symbol(f1, Decl(keyofAndForIn.ts, 0, 0))
+>K : Symbol(K, Decl(keyofAndForIn.ts, 3, 12))
+>T : Symbol(T, Decl(keyofAndForIn.ts, 3, 29))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 3, 33))
+>P : Symbol(P, Decl(keyofAndForIn.ts, 3, 41))
+>K : Symbol(K, Decl(keyofAndForIn.ts, 3, 12))
+>T : Symbol(T, Decl(keyofAndForIn.ts, 3, 29))
+>k : Symbol(k, Decl(keyofAndForIn.ts, 3, 54))
+>K : Symbol(K, Decl(keyofAndForIn.ts, 3, 12))
+
+    const b = k in obj;
+>b : Symbol(b, Decl(keyofAndForIn.ts, 4, 9))
+>k : Symbol(k, Decl(keyofAndForIn.ts, 3, 54))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 3, 33))
+
+    let k1: K;
+>k1 : Symbol(k1, Decl(keyofAndForIn.ts, 5, 7))
+>K : Symbol(K, Decl(keyofAndForIn.ts, 3, 12))
+
+    for (k1 in obj) {
+>k1 : Symbol(k1, Decl(keyofAndForIn.ts, 5, 7))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 3, 33))
+
+        let x1 = obj[k1];
+>x1 : Symbol(x1, Decl(keyofAndForIn.ts, 7, 11))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 3, 33))
+>k1 : Symbol(k1, Decl(keyofAndForIn.ts, 5, 7))
+    }
+    for (let k2 in obj) {
+>k2 : Symbol(k2, Decl(keyofAndForIn.ts, 9, 12))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 3, 33))
+
+        let x2 = obj[k2];
+>x2 : Symbol(x2, Decl(keyofAndForIn.ts, 10, 11))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 3, 33))
+>k2 : Symbol(k2, Decl(keyofAndForIn.ts, 9, 12))
+    }
+}
+
+function f2<T>(obj: { [P in keyof T]: T[P] }, k: keyof T) {
+>f2 : Symbol(f2, Decl(keyofAndForIn.ts, 12, 1))
+>T : Symbol(T, Decl(keyofAndForIn.ts, 14, 12))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 14, 15))
+>P : Symbol(P, Decl(keyofAndForIn.ts, 14, 23))
+>T : Symbol(T, Decl(keyofAndForIn.ts, 14, 12))
+>T : Symbol(T, Decl(keyofAndForIn.ts, 14, 12))
+>P : Symbol(P, Decl(keyofAndForIn.ts, 14, 23))
+>k : Symbol(k, Decl(keyofAndForIn.ts, 14, 45))
+>T : Symbol(T, Decl(keyofAndForIn.ts, 14, 12))
+
+    const b = k in obj;
+>b : Symbol(b, Decl(keyofAndForIn.ts, 15, 9))
+>k : Symbol(k, Decl(keyofAndForIn.ts, 14, 45))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 14, 15))
+
+    let k1: keyof T;
+>k1 : Symbol(k1, Decl(keyofAndForIn.ts, 16, 7))
+>T : Symbol(T, Decl(keyofAndForIn.ts, 14, 12))
+
+    for (k1 in obj) {
+>k1 : Symbol(k1, Decl(keyofAndForIn.ts, 16, 7))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 14, 15))
+
+        let x1 = obj[k1];
+>x1 : Symbol(x1, Decl(keyofAndForIn.ts, 18, 11))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 14, 15))
+>k1 : Symbol(k1, Decl(keyofAndForIn.ts, 16, 7))
+    }
+    for (let k2 in obj) {
+>k2 : Symbol(k2, Decl(keyofAndForIn.ts, 20, 12))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 14, 15))
+
+        let x2 = obj[k2];
+>x2 : Symbol(x2, Decl(keyofAndForIn.ts, 21, 11))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 14, 15))
+>k2 : Symbol(k2, Decl(keyofAndForIn.ts, 20, 12))
+    }
+}
+
+function f3<T, K extends keyof T>(obj: { [P in K]: T[P] }, k: K) {
+>f3 : Symbol(f3, Decl(keyofAndForIn.ts, 23, 1))
+>T : Symbol(T, Decl(keyofAndForIn.ts, 25, 12))
+>K : Symbol(K, Decl(keyofAndForIn.ts, 25, 14))
+>T : Symbol(T, Decl(keyofAndForIn.ts, 25, 12))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 25, 34))
+>P : Symbol(P, Decl(keyofAndForIn.ts, 25, 42))
+>K : Symbol(K, Decl(keyofAndForIn.ts, 25, 14))
+>T : Symbol(T, Decl(keyofAndForIn.ts, 25, 12))
+>P : Symbol(P, Decl(keyofAndForIn.ts, 25, 42))
+>k : Symbol(k, Decl(keyofAndForIn.ts, 25, 58))
+>K : Symbol(K, Decl(keyofAndForIn.ts, 25, 14))
+
+    const b = k in obj;
+>b : Symbol(b, Decl(keyofAndForIn.ts, 26, 9))
+>k : Symbol(k, Decl(keyofAndForIn.ts, 25, 58))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 25, 34))
+
+    let k1: K;
+>k1 : Symbol(k1, Decl(keyofAndForIn.ts, 27, 7))
+>K : Symbol(K, Decl(keyofAndForIn.ts, 25, 14))
+
+    for (k1 in obj) {
+>k1 : Symbol(k1, Decl(keyofAndForIn.ts, 27, 7))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 25, 34))
+
+        let x1 = obj[k1];
+>x1 : Symbol(x1, Decl(keyofAndForIn.ts, 29, 11))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 25, 34))
+>k1 : Symbol(k1, Decl(keyofAndForIn.ts, 27, 7))
+    }
+    for (let k2 in obj) {
+>k2 : Symbol(k2, Decl(keyofAndForIn.ts, 31, 12))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 25, 34))
+
+        let x2 = obj[k2];
+>x2 : Symbol(x2, Decl(keyofAndForIn.ts, 32, 11))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 25, 34))
+>k2 : Symbol(k2, Decl(keyofAndForIn.ts, 31, 12))
+    }
+}
diff --git a/tests/baselines/reference/keyofAndForIn.types b/tests/baselines/reference/keyofAndForIn.types
new file mode 100644
index 00000000000..5e992e5d261
--- /dev/null
+++ b/tests/baselines/reference/keyofAndForIn.types
@@ -0,0 +1,134 @@
+=== tests/cases/conformance/types/keyof/keyofAndForIn.ts ===
+
+// Repro from #12513
+
+function f1<K extends string, T>(obj: { [P in K]: T }, k: K) {
+>f1 : <K extends string, T>(obj: { [P in K]: T; }, k: K) => void
+>K : K
+>T : T
+>obj : { [P in K]: T; }
+>P : P
+>K : K
+>T : T
+>k : K
+>K : K
+
+    const b = k in obj;
+>b : boolean
+>k in obj : boolean
+>k : K
+>obj : { [P in K]: T; }
+
+    let k1: K;
+>k1 : K
+>K : K
+
+    for (k1 in obj) {
+>k1 : K
+>obj : { [P in K]: T; }
+
+        let x1 = obj[k1];
+>x1 : T
+>obj[k1] : T
+>obj : { [P in K]: T; }
+>k1 : K
+    }
+    for (let k2 in obj) {
+>k2 : K
+>obj : { [P in K]: T; }
+
+        let x2 = obj[k2];
+>x2 : T
+>obj[k2] : T
+>obj : { [P in K]: T; }
+>k2 : K
+    }
+}
+
+function f2<T>(obj: { [P in keyof T]: T[P] }, k: keyof T) {
+>f2 : <T>(obj: { [P in keyof T]: T[P]; }, k: keyof T) => void
+>T : T
+>obj : { [P in keyof T]: T[P]; }
+>P : P
+>T : T
+>T : T
+>P : P
+>k : keyof T
+>T : T
+
+    const b = k in obj;
+>b : boolean
+>k in obj : boolean
+>k : keyof T
+>obj : { [P in keyof T]: T[P]; }
+
+    let k1: keyof T;
+>k1 : keyof T
+>T : T
+
+    for (k1 in obj) {
+>k1 : keyof T
+>obj : { [P in keyof T]: T[P]; }
+
+        let x1 = obj[k1];
+>x1 : T[keyof T]
+>obj[k1] : T[keyof T]
+>obj : { [P in keyof T]: T[P]; }
+>k1 : keyof T
+    }
+    for (let k2 in obj) {
+>k2 : keyof T
+>obj : { [P in keyof T]: T[P]; }
+
+        let x2 = obj[k2];
+>x2 : T[keyof T]
+>obj[k2] : T[keyof T]
+>obj : { [P in keyof T]: T[P]; }
+>k2 : keyof T
+    }
+}
+
+function f3<T, K extends keyof T>(obj: { [P in K]: T[P] }, k: K) {
+>f3 : <T, K extends keyof T>(obj: { [P in K]: T[P]; }, k: K) => void
+>T : T
+>K : K
+>T : T
+>obj : { [P in K]: T[P]; }
+>P : P
+>K : K
+>T : T
+>P : P
+>k : K
+>K : K
+
+    const b = k in obj;
+>b : boolean
+>k in obj : boolean
+>k : K
+>obj : { [P in K]: T[P]; }
+
+    let k1: K;
+>k1 : K
+>K : K
+
+    for (k1 in obj) {
+>k1 : K
+>obj : { [P in K]: T[P]; }
+
+        let x1 = obj[k1];
+>x1 : T[K]
+>obj[k1] : T[K]
+>obj : { [P in K]: T[P]; }
+>k1 : K
+    }
+    for (let k2 in obj) {
+>k2 : K
+>obj : { [P in K]: T[P]; }
+
+        let x2 = obj[k2];
+>x2 : T[K]
+>obj[k2] : T[K]
+>obj : { [P in K]: T[P]; }
+>k2 : K
+    }
+}
diff --git a/tests/cases/conformance/types/keyof/keyofAndForIn.ts b/tests/cases/conformance/types/keyof/keyofAndForIn.ts
new file mode 100644
index 00000000000..97b8587a243
--- /dev/null
+++ b/tests/cases/conformance/types/keyof/keyofAndForIn.ts
@@ -0,0 +1,36 @@
+// @declaration: true
+
+// Repro from #12513
+
+function f1<K extends string, T>(obj: { [P in K]: T }, k: K) {
+    const b = k in obj;
+    let k1: K;
+    for (k1 in obj) {
+        let x1 = obj[k1];
+    }
+    for (let k2 in obj) {
+        let x2 = obj[k2];
+    }
+}
+
+function f2<T>(obj: { [P in keyof T]: T[P] }, k: keyof T) {
+    const b = k in obj;
+    let k1: keyof T;
+    for (k1 in obj) {
+        let x1 = obj[k1];
+    }
+    for (let k2 in obj) {
+        let x2 = obj[k2];
+    }
+}
+
+function f3<T, K extends keyof T>(obj: { [P in K]: T[P] }, k: K) {
+    const b = k in obj;
+    let k1: K;
+    for (k1 in obj) {
+        let x1 = obj[k1];
+    }
+    for (let k2 in obj) {
+        let x2 = obj[k2];
+    }
+}
\ No newline at end of file

From f2c32d251fe86cd556eea6e749df0db5eb0fde6a Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sat, 26 Nov 2016 12:17:19 -0800
Subject: [PATCH 350/421] Include mapped types in type inference infinite
 recursion check

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index f0c6e4edb42..21cbe7afe1d 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -8586,19 +8586,6 @@ namespace ts {
                     }
                 }
                 else {
-                    if (getObjectFlags(target) & ObjectFlags.Mapped) {
-                        const constraintType = getConstraintTypeFromMappedType(<MappedType>target);
-                        if (getObjectFlags(source) & ObjectFlags.Mapped) {
-                            inferFromTypes(getConstraintTypeFromMappedType(<MappedType>source), constraintType);
-                            inferFromTypes(getTemplateTypeFromMappedType(<MappedType>source), getTemplateTypeFromMappedType(<MappedType>target));
-                            return;
-                        }
-                        if (constraintType.flags & TypeFlags.TypeParameter) {
-                            inferFromTypes(getIndexType(source), constraintType);
-                            inferFromTypes(getUnionType(map(getPropertiesOfType(source), getTypeOfSymbol)), getTemplateTypeFromMappedType(<MappedType>target));
-                            return;
-                        }
-                    }
                     source = getApparentType(source);
                     if (source.flags & TypeFlags.Object) {
                         if (isInProcess(source, target)) {
@@ -8619,15 +8606,32 @@ namespace ts {
                         sourceStack[depth] = source;
                         targetStack[depth] = target;
                         depth++;
-                        inferFromProperties(source, target);
-                        inferFromSignatures(source, target, SignatureKind.Call);
-                        inferFromSignatures(source, target, SignatureKind.Construct);
-                        inferFromIndexTypes(source, target);
+                        inferFromObjectTypes(source, target);
                         depth--;
                     }
                 }
             }
 
+            function inferFromObjectTypes(source: Type, target: Type) {
+                if (getObjectFlags(target) & ObjectFlags.Mapped) {
+                    const constraintType = getConstraintTypeFromMappedType(<MappedType>target);
+                    if (getObjectFlags(source) & ObjectFlags.Mapped) {
+                        inferFromTypes(getConstraintTypeFromMappedType(<MappedType>source), constraintType);
+                        inferFromTypes(getTemplateTypeFromMappedType(<MappedType>source), getTemplateTypeFromMappedType(<MappedType>target));
+                        return;
+                    }
+                    if (constraintType.flags & TypeFlags.TypeParameter) {
+                        inferFromTypes(getIndexType(source), constraintType);
+                        inferFromTypes(getUnionType(map(getPropertiesOfType(source), getTypeOfSymbol)), getTemplateTypeFromMappedType(<MappedType>target));
+                        return;
+                    }
+                }
+                inferFromProperties(source, target);
+                inferFromSignatures(source, target, SignatureKind.Call);
+                inferFromSignatures(source, target, SignatureKind.Construct);
+                inferFromIndexTypes(source, target);
+            }
+
             function inferFromProperties(source: Type, target: Type) {
                 const properties = getPropertiesOfObjectType(target);
                 for (const targetProp of properties) {

From d1393a60d48a7420cc7a38ccead8da4751e8a7d8 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sat, 26 Nov 2016 12:22:29 -0800
Subject: [PATCH 351/421] Add regression test

---
 .../mappedTypeInferenceCircularity.js         | 12 +++++++++
 .../mappedTypeInferenceCircularity.symbols    | 26 ++++++++++++++++++
 .../mappedTypeInferenceCircularity.types      | 27 +++++++++++++++++++
 .../mappedTypeInferenceCircularity.ts         |  7 +++++
 4 files changed, 72 insertions(+)
 create mode 100644 tests/baselines/reference/mappedTypeInferenceCircularity.js
 create mode 100644 tests/baselines/reference/mappedTypeInferenceCircularity.symbols
 create mode 100644 tests/baselines/reference/mappedTypeInferenceCircularity.types
 create mode 100644 tests/cases/compiler/mappedTypeInferenceCircularity.ts

diff --git a/tests/baselines/reference/mappedTypeInferenceCircularity.js b/tests/baselines/reference/mappedTypeInferenceCircularity.js
new file mode 100644
index 00000000000..d5918d342f6
--- /dev/null
+++ b/tests/baselines/reference/mappedTypeInferenceCircularity.js
@@ -0,0 +1,12 @@
+//// [mappedTypeInferenceCircularity.ts]
+// Repro from #12511
+
+type HTML = { [K in 'div']: Block<HTML> };
+type Block<P> = <T>(func: HTML) => {};
+
+declare var h: HTML;
+h.div(h);
+
+//// [mappedTypeInferenceCircularity.js]
+// Repro from #12511
+h.div(h);
diff --git a/tests/baselines/reference/mappedTypeInferenceCircularity.symbols b/tests/baselines/reference/mappedTypeInferenceCircularity.symbols
new file mode 100644
index 00000000000..33dceb5cd76
--- /dev/null
+++ b/tests/baselines/reference/mappedTypeInferenceCircularity.symbols
@@ -0,0 +1,26 @@
+=== tests/cases/compiler/mappedTypeInferenceCircularity.ts ===
+// Repro from #12511
+
+type HTML = { [K in 'div']: Block<HTML> };
+>HTML : Symbol(HTML, Decl(mappedTypeInferenceCircularity.ts, 0, 0))
+>K : Symbol(K, Decl(mappedTypeInferenceCircularity.ts, 2, 15))
+>Block : Symbol(Block, Decl(mappedTypeInferenceCircularity.ts, 2, 42))
+>HTML : Symbol(HTML, Decl(mappedTypeInferenceCircularity.ts, 0, 0))
+
+type Block<P> = <T>(func: HTML) => {};
+>Block : Symbol(Block, Decl(mappedTypeInferenceCircularity.ts, 2, 42))
+>P : Symbol(P, Decl(mappedTypeInferenceCircularity.ts, 3, 11))
+>T : Symbol(T, Decl(mappedTypeInferenceCircularity.ts, 3, 17))
+>func : Symbol(func, Decl(mappedTypeInferenceCircularity.ts, 3, 20))
+>HTML : Symbol(HTML, Decl(mappedTypeInferenceCircularity.ts, 0, 0))
+
+declare var h: HTML;
+>h : Symbol(h, Decl(mappedTypeInferenceCircularity.ts, 5, 11))
+>HTML : Symbol(HTML, Decl(mappedTypeInferenceCircularity.ts, 0, 0))
+
+h.div(h);
+>h.div : Symbol(div)
+>h : Symbol(h, Decl(mappedTypeInferenceCircularity.ts, 5, 11))
+>div : Symbol(div)
+>h : Symbol(h, Decl(mappedTypeInferenceCircularity.ts, 5, 11))
+
diff --git a/tests/baselines/reference/mappedTypeInferenceCircularity.types b/tests/baselines/reference/mappedTypeInferenceCircularity.types
new file mode 100644
index 00000000000..451da474756
--- /dev/null
+++ b/tests/baselines/reference/mappedTypeInferenceCircularity.types
@@ -0,0 +1,27 @@
+=== tests/cases/compiler/mappedTypeInferenceCircularity.ts ===
+// Repro from #12511
+
+type HTML = { [K in 'div']: Block<HTML> };
+>HTML : HTML
+>K : K
+>Block : Block<P>
+>HTML : HTML
+
+type Block<P> = <T>(func: HTML) => {};
+>Block : Block<P>
+>P : P
+>T : T
+>func : HTML
+>HTML : HTML
+
+declare var h: HTML;
+>h : HTML
+>HTML : HTML
+
+h.div(h);
+>h.div(h) : {}
+>h.div : Block<HTML>
+>h : HTML
+>div : Block<HTML>
+>h : HTML
+
diff --git a/tests/cases/compiler/mappedTypeInferenceCircularity.ts b/tests/cases/compiler/mappedTypeInferenceCircularity.ts
new file mode 100644
index 00000000000..56fe08c5fe2
--- /dev/null
+++ b/tests/cases/compiler/mappedTypeInferenceCircularity.ts
@@ -0,0 +1,7 @@
+// Repro from #12511
+
+type HTML = { [K in 'div']: Block<HTML> };
+type Block<P> = <T>(func: HTML) => {};
+
+declare var h: HTML;
+h.div(h);
\ No newline at end of file

From ecd10be1775e12f1e921654cec4a60cb067b5740 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sun, 27 Nov 2016 12:48:59 -0800
Subject: [PATCH 352/421] Reorder type inference cases

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index fcf90a11da2..2feb6b3f9c3 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -8668,11 +8668,14 @@ namespace ts {
             function inferFromObjectTypes(source: Type, target: Type) {
                 if (getObjectFlags(target) & ObjectFlags.Mapped) {
                     const constraintType = getConstraintTypeFromMappedType(<MappedType>target);
-                    if (getObjectFlags(source) & ObjectFlags.Mapped) {
-                        // We're inferring from a mapped type to a mapped type, so simply infer from constraint type to
-                        // constraint type and from template type to template type.
-                        inferFromTypes(getConstraintTypeFromMappedType(<MappedType>source), constraintType);
-                        inferFromTypes(getTemplateTypeFromMappedType(<MappedType>source), getTemplateTypeFromMappedType(<MappedType>target));
+                    if (constraintType.flags & TypeFlags.Index) {
+                        // We're inferring from some source type S to an isomorphic mapped type { [P in keyof T]: X },
+                        // where T is a type parameter. Use inferTypeForIsomorphicMappedType to infer a suitable source
+                        // type and then infer from that type to T.
+                        const index = indexOf(typeParameters, (<IndexType>constraintType).type);
+                        if (index >= 0 && !typeInferences[index].isFixed) {
+                            inferFromTypes(inferTypeForIsomorphicMappedType(source, <MappedType>target), typeParameters[index]);
+                        }
                         return;
                     }
                     if (constraintType.flags & TypeFlags.TypeParameter) {
@@ -8682,14 +8685,11 @@ namespace ts {
                         inferFromTypes(getUnionType(map(getPropertiesOfType(source), getTypeOfSymbol)), getTemplateTypeFromMappedType(<MappedType>target));
                         return;
                     }
-                    if (constraintType.flags & TypeFlags.Index) {
-                        // We're inferring from some source type S to an isomorphic mapped type { [P in keyof T]: X },
-                        // where T is a type parameter. Use inferTypeForIsomorphicMappedType to infer a suitable source
-                        // type and then infer from that type to T.
-                        const index = indexOf(typeParameters, (<IndexType>constraintType).type);
-                        if (index >= 0 && !typeInferences[index].isFixed) {
-                            inferFromTypes(inferTypeForIsomorphicMappedType(source, <MappedType>target), typeParameters[index]);
-                        }
+                    if (getObjectFlags(source) & ObjectFlags.Mapped) {
+                        // We're inferring from a mapped type to a mapped type, so simply infer from constraint type to
+                        // constraint type and from template type to template type.
+                        inferFromTypes(getConstraintTypeFromMappedType(<MappedType>source), constraintType);
+                        inferFromTypes(getTemplateTypeFromMappedType(<MappedType>source), getTemplateTypeFromMappedType(<MappedType>target));
                         return;
                     }
                 }

From 997184708dd8df4e410f6c8d4d56badef83b427b Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sun, 27 Nov 2016 12:49:27 -0800
Subject: [PATCH 353/421] Add tests

---
 .../isomorphicMappedTypeInference.js          | 222 ++++++++++
 .../isomorphicMappedTypeInference.symbols     | 334 +++++++++++++++
 .../isomorphicMappedTypeInference.types       | 405 ++++++++++++++++++
 .../mapped/isomorphicMappedTypeInference.ts   | 107 +++++
 4 files changed, 1068 insertions(+)
 create mode 100644 tests/baselines/reference/isomorphicMappedTypeInference.js
 create mode 100644 tests/baselines/reference/isomorphicMappedTypeInference.symbols
 create mode 100644 tests/baselines/reference/isomorphicMappedTypeInference.types
 create mode 100644 tests/cases/conformance/types/mapped/isomorphicMappedTypeInference.ts

diff --git a/tests/baselines/reference/isomorphicMappedTypeInference.js b/tests/baselines/reference/isomorphicMappedTypeInference.js
new file mode 100644
index 00000000000..0fc646043dc
--- /dev/null
+++ b/tests/baselines/reference/isomorphicMappedTypeInference.js
@@ -0,0 +1,222 @@
+//// [isomorphicMappedTypeInference.ts]
+
+type Box<T> = {
+    value: T;
+}
+
+type Boxified<T> = {
+    [P in keyof T]: Box<T[P]>;
+}
+
+function box<T>(x: T): Box<T> {
+    return { value: x };
+}
+
+function unbox<T>(x: Box<T>): T {
+    return x.value;
+}
+
+function boxify<T>(obj: T): Boxified<T> {
+    let result = {} as Boxified<T>;
+    for (let k in obj) {
+        result[k] = box(obj[k]);
+    }
+    return result;
+}
+
+function unboxify<T>(obj: Boxified<T>): T {
+    let result = {} as T;
+    for (let k in obj) {
+        result[k] = unbox(obj[k]);
+    }
+    return result;
+}
+
+function assignBoxified<T>(obj: Boxified<T>, values: T) {
+    for (let k in values) {
+        obj[k].value = values[k];
+    }
+}
+
+function f1() {
+    let v = {
+        a: 42,
+        b: "hello",
+        c: true
+    };
+    let b = boxify(v);
+    let x: number = b.a.value;
+}
+
+function f2() {
+    let b = {
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    };
+    let v = unboxify(b);
+    let x: number = v.a;
+}
+
+function f3() {
+    let b = {
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    };
+    assignBoxified(b, { c: false });
+}
+
+function f4() {
+    let b = {
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    };
+    b = boxify(unboxify(b));
+    b = unboxify(boxify(b));
+}
+
+function makeRecord<T, K extends string>(obj: { [P in K]: T }) {
+    return obj;
+}
+
+function f5(s: string) {
+    let b = makeRecord({
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    });
+    let v = unboxify(b);
+    let x: string | number | boolean = v.a;
+}
+
+function makeDictionary<T>(obj: { [x: string]: T }) {
+    return obj;
+}
+
+function f6(s: string) {
+    let b = makeDictionary({
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    });
+    let v = unboxify(b);
+    let x: string | number | boolean = v[s];
+}
+
+//// [isomorphicMappedTypeInference.js]
+function box(x) {
+    return { value: x };
+}
+function unbox(x) {
+    return x.value;
+}
+function boxify(obj) {
+    var result = {};
+    for (var k in obj) {
+        result[k] = box(obj[k]);
+    }
+    return result;
+}
+function unboxify(obj) {
+    var result = {};
+    for (var k in obj) {
+        result[k] = unbox(obj[k]);
+    }
+    return result;
+}
+function assignBoxified(obj, values) {
+    for (var k in values) {
+        obj[k].value = values[k];
+    }
+}
+function f1() {
+    var v = {
+        a: 42,
+        b: "hello",
+        c: true
+    };
+    var b = boxify(v);
+    var x = b.a.value;
+}
+function f2() {
+    var b = {
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    };
+    var v = unboxify(b);
+    var x = v.a;
+}
+function f3() {
+    var b = {
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    };
+    assignBoxified(b, { c: false });
+}
+function f4() {
+    var b = {
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    };
+    b = boxify(unboxify(b));
+    b = unboxify(boxify(b));
+}
+function makeRecord(obj) {
+    return obj;
+}
+function f5(s) {
+    var b = makeRecord({
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    });
+    var v = unboxify(b);
+    var x = v.a;
+}
+function makeDictionary(obj) {
+    return obj;
+}
+function f6(s) {
+    var b = makeDictionary({
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    });
+    var v = unboxify(b);
+    var x = v[s];
+}
+
+
+//// [isomorphicMappedTypeInference.d.ts]
+declare type Box<T> = {
+    value: T;
+};
+declare type Boxified<T> = {
+    [P in keyof T]: Box<T[P]>;
+};
+declare function box<T>(x: T): Box<T>;
+declare function unbox<T>(x: Box<T>): T;
+declare function boxify<T>(obj: T): Boxified<T>;
+declare function unboxify<T>(obj: Boxified<T>): T;
+declare function assignBoxified<T>(obj: Boxified<T>, values: T): void;
+declare function f1(): void;
+declare function f2(): void;
+declare function f3(): void;
+declare function f4(): void;
+declare function makeRecord<T, K extends string>(obj: {
+    [P in K]: T;
+}): {
+    [P in K]: T;
+};
+declare function f5(s: string): void;
+declare function makeDictionary<T>(obj: {
+    [x: string]: T;
+}): {
+    [x: string]: T;
+};
+declare function f6(s: string): void;
diff --git a/tests/baselines/reference/isomorphicMappedTypeInference.symbols b/tests/baselines/reference/isomorphicMappedTypeInference.symbols
new file mode 100644
index 00000000000..62dcc6316bc
--- /dev/null
+++ b/tests/baselines/reference/isomorphicMappedTypeInference.symbols
@@ -0,0 +1,334 @@
+=== tests/cases/conformance/types/mapped/isomorphicMappedTypeInference.ts ===
+
+type Box<T> = {
+>Box : Symbol(Box, Decl(isomorphicMappedTypeInference.ts, 0, 0))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 1, 9))
+
+    value: T;
+>value : Symbol(value, Decl(isomorphicMappedTypeInference.ts, 1, 15))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 1, 9))
+}
+
+type Boxified<T> = {
+>Boxified : Symbol(Boxified, Decl(isomorphicMappedTypeInference.ts, 3, 1))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 5, 14))
+
+    [P in keyof T]: Box<T[P]>;
+>P : Symbol(P, Decl(isomorphicMappedTypeInference.ts, 6, 5))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 5, 14))
+>Box : Symbol(Box, Decl(isomorphicMappedTypeInference.ts, 0, 0))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 5, 14))
+>P : Symbol(P, Decl(isomorphicMappedTypeInference.ts, 6, 5))
+}
+
+function box<T>(x: T): Box<T> {
+>box : Symbol(box, Decl(isomorphicMappedTypeInference.ts, 7, 1))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 9, 13))
+>x : Symbol(x, Decl(isomorphicMappedTypeInference.ts, 9, 16))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 9, 13))
+>Box : Symbol(Box, Decl(isomorphicMappedTypeInference.ts, 0, 0))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 9, 13))
+
+    return { value: x };
+>value : Symbol(value, Decl(isomorphicMappedTypeInference.ts, 10, 12))
+>x : Symbol(x, Decl(isomorphicMappedTypeInference.ts, 9, 16))
+}
+
+function unbox<T>(x: Box<T>): T {
+>unbox : Symbol(unbox, Decl(isomorphicMappedTypeInference.ts, 11, 1))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 13, 15))
+>x : Symbol(x, Decl(isomorphicMappedTypeInference.ts, 13, 18))
+>Box : Symbol(Box, Decl(isomorphicMappedTypeInference.ts, 0, 0))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 13, 15))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 13, 15))
+
+    return x.value;
+>x.value : Symbol(value, Decl(isomorphicMappedTypeInference.ts, 1, 15))
+>x : Symbol(x, Decl(isomorphicMappedTypeInference.ts, 13, 18))
+>value : Symbol(value, Decl(isomorphicMappedTypeInference.ts, 1, 15))
+}
+
+function boxify<T>(obj: T): Boxified<T> {
+>boxify : Symbol(boxify, Decl(isomorphicMappedTypeInference.ts, 15, 1))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 17, 16))
+>obj : Symbol(obj, Decl(isomorphicMappedTypeInference.ts, 17, 19))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 17, 16))
+>Boxified : Symbol(Boxified, Decl(isomorphicMappedTypeInference.ts, 3, 1))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 17, 16))
+
+    let result = {} as Boxified<T>;
+>result : Symbol(result, Decl(isomorphicMappedTypeInference.ts, 18, 7))
+>Boxified : Symbol(Boxified, Decl(isomorphicMappedTypeInference.ts, 3, 1))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 17, 16))
+
+    for (let k in obj) {
+>k : Symbol(k, Decl(isomorphicMappedTypeInference.ts, 19, 12))
+>obj : Symbol(obj, Decl(isomorphicMappedTypeInference.ts, 17, 19))
+
+        result[k] = box(obj[k]);
+>result : Symbol(result, Decl(isomorphicMappedTypeInference.ts, 18, 7))
+>k : Symbol(k, Decl(isomorphicMappedTypeInference.ts, 19, 12))
+>box : Symbol(box, Decl(isomorphicMappedTypeInference.ts, 7, 1))
+>obj : Symbol(obj, Decl(isomorphicMappedTypeInference.ts, 17, 19))
+>k : Symbol(k, Decl(isomorphicMappedTypeInference.ts, 19, 12))
+    }
+    return result;
+>result : Symbol(result, Decl(isomorphicMappedTypeInference.ts, 18, 7))
+}
+
+function unboxify<T>(obj: Boxified<T>): T {
+>unboxify : Symbol(unboxify, Decl(isomorphicMappedTypeInference.ts, 23, 1))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 25, 18))
+>obj : Symbol(obj, Decl(isomorphicMappedTypeInference.ts, 25, 21))
+>Boxified : Symbol(Boxified, Decl(isomorphicMappedTypeInference.ts, 3, 1))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 25, 18))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 25, 18))
+
+    let result = {} as T;
+>result : Symbol(result, Decl(isomorphicMappedTypeInference.ts, 26, 7))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 25, 18))
+
+    for (let k in obj) {
+>k : Symbol(k, Decl(isomorphicMappedTypeInference.ts, 27, 12))
+>obj : Symbol(obj, Decl(isomorphicMappedTypeInference.ts, 25, 21))
+
+        result[k] = unbox(obj[k]);
+>result : Symbol(result, Decl(isomorphicMappedTypeInference.ts, 26, 7))
+>k : Symbol(k, Decl(isomorphicMappedTypeInference.ts, 27, 12))
+>unbox : Symbol(unbox, Decl(isomorphicMappedTypeInference.ts, 11, 1))
+>obj : Symbol(obj, Decl(isomorphicMappedTypeInference.ts, 25, 21))
+>k : Symbol(k, Decl(isomorphicMappedTypeInference.ts, 27, 12))
+    }
+    return result;
+>result : Symbol(result, Decl(isomorphicMappedTypeInference.ts, 26, 7))
+}
+
+function assignBoxified<T>(obj: Boxified<T>, values: T) {
+>assignBoxified : Symbol(assignBoxified, Decl(isomorphicMappedTypeInference.ts, 31, 1))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 33, 24))
+>obj : Symbol(obj, Decl(isomorphicMappedTypeInference.ts, 33, 27))
+>Boxified : Symbol(Boxified, Decl(isomorphicMappedTypeInference.ts, 3, 1))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 33, 24))
+>values : Symbol(values, Decl(isomorphicMappedTypeInference.ts, 33, 44))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 33, 24))
+
+    for (let k in values) {
+>k : Symbol(k, Decl(isomorphicMappedTypeInference.ts, 34, 12))
+>values : Symbol(values, Decl(isomorphicMappedTypeInference.ts, 33, 44))
+
+        obj[k].value = values[k];
+>obj[k].value : Symbol(value, Decl(isomorphicMappedTypeInference.ts, 1, 15))
+>obj : Symbol(obj, Decl(isomorphicMappedTypeInference.ts, 33, 27))
+>k : Symbol(k, Decl(isomorphicMappedTypeInference.ts, 34, 12))
+>value : Symbol(value, Decl(isomorphicMappedTypeInference.ts, 1, 15))
+>values : Symbol(values, Decl(isomorphicMappedTypeInference.ts, 33, 44))
+>k : Symbol(k, Decl(isomorphicMappedTypeInference.ts, 34, 12))
+    }
+}
+
+function f1() {
+>f1 : Symbol(f1, Decl(isomorphicMappedTypeInference.ts, 37, 1))
+
+    let v = {
+>v : Symbol(v, Decl(isomorphicMappedTypeInference.ts, 40, 7))
+
+        a: 42,
+>a : Symbol(a, Decl(isomorphicMappedTypeInference.ts, 40, 13))
+
+        b: "hello",
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 41, 14))
+
+        c: true
+>c : Symbol(c, Decl(isomorphicMappedTypeInference.ts, 42, 19))
+
+    };
+    let b = boxify(v);
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 45, 7))
+>boxify : Symbol(boxify, Decl(isomorphicMappedTypeInference.ts, 15, 1))
+>v : Symbol(v, Decl(isomorphicMappedTypeInference.ts, 40, 7))
+
+    let x: number = b.a.value;
+>x : Symbol(x, Decl(isomorphicMappedTypeInference.ts, 46, 7))
+>b.a.value : Symbol(value, Decl(isomorphicMappedTypeInference.ts, 1, 15))
+>b.a : Symbol(a)
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 45, 7))
+>a : Symbol(a)
+>value : Symbol(value, Decl(isomorphicMappedTypeInference.ts, 1, 15))
+}
+
+function f2() {
+>f2 : Symbol(f2, Decl(isomorphicMappedTypeInference.ts, 47, 1))
+
+    let b = {
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 50, 7))
+
+        a: box(42),
+>a : Symbol(a, Decl(isomorphicMappedTypeInference.ts, 50, 13))
+>box : Symbol(box, Decl(isomorphicMappedTypeInference.ts, 7, 1))
+
+        b: box("hello"),
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 51, 19))
+>box : Symbol(box, Decl(isomorphicMappedTypeInference.ts, 7, 1))
+
+        c: box(true)
+>c : Symbol(c, Decl(isomorphicMappedTypeInference.ts, 52, 24))
+>box : Symbol(box, Decl(isomorphicMappedTypeInference.ts, 7, 1))
+
+    };
+    let v = unboxify(b);
+>v : Symbol(v, Decl(isomorphicMappedTypeInference.ts, 55, 7))
+>unboxify : Symbol(unboxify, Decl(isomorphicMappedTypeInference.ts, 23, 1))
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 50, 7))
+
+    let x: number = v.a;
+>x : Symbol(x, Decl(isomorphicMappedTypeInference.ts, 56, 7))
+>v.a : Symbol(a, Decl(isomorphicMappedTypeInference.ts, 50, 13))
+>v : Symbol(v, Decl(isomorphicMappedTypeInference.ts, 55, 7))
+>a : Symbol(a, Decl(isomorphicMappedTypeInference.ts, 50, 13))
+}
+
+function f3() {
+>f3 : Symbol(f3, Decl(isomorphicMappedTypeInference.ts, 57, 1))
+
+    let b = {
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 60, 7))
+
+        a: box(42),
+>a : Symbol(a, Decl(isomorphicMappedTypeInference.ts, 60, 13))
+>box : Symbol(box, Decl(isomorphicMappedTypeInference.ts, 7, 1))
+
+        b: box("hello"),
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 61, 19))
+>box : Symbol(box, Decl(isomorphicMappedTypeInference.ts, 7, 1))
+
+        c: box(true)
+>c : Symbol(c, Decl(isomorphicMappedTypeInference.ts, 62, 24))
+>box : Symbol(box, Decl(isomorphicMappedTypeInference.ts, 7, 1))
+
+    };
+    assignBoxified(b, { c: false });
+>assignBoxified : Symbol(assignBoxified, Decl(isomorphicMappedTypeInference.ts, 31, 1))
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 60, 7))
+>c : Symbol(c, Decl(isomorphicMappedTypeInference.ts, 65, 23))
+}
+
+function f4() {
+>f4 : Symbol(f4, Decl(isomorphicMappedTypeInference.ts, 66, 1))
+
+    let b = {
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 69, 7))
+
+        a: box(42),
+>a : Symbol(a, Decl(isomorphicMappedTypeInference.ts, 69, 13))
+>box : Symbol(box, Decl(isomorphicMappedTypeInference.ts, 7, 1))
+
+        b: box("hello"),
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 70, 19))
+>box : Symbol(box, Decl(isomorphicMappedTypeInference.ts, 7, 1))
+
+        c: box(true)
+>c : Symbol(c, Decl(isomorphicMappedTypeInference.ts, 71, 24))
+>box : Symbol(box, Decl(isomorphicMappedTypeInference.ts, 7, 1))
+
+    };
+    b = boxify(unboxify(b));
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 69, 7))
+>boxify : Symbol(boxify, Decl(isomorphicMappedTypeInference.ts, 15, 1))
+>unboxify : Symbol(unboxify, Decl(isomorphicMappedTypeInference.ts, 23, 1))
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 69, 7))
+
+    b = unboxify(boxify(b));
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 69, 7))
+>unboxify : Symbol(unboxify, Decl(isomorphicMappedTypeInference.ts, 23, 1))
+>boxify : Symbol(boxify, Decl(isomorphicMappedTypeInference.ts, 15, 1))
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 69, 7))
+}
+
+function makeRecord<T, K extends string>(obj: { [P in K]: T }) {
+>makeRecord : Symbol(makeRecord, Decl(isomorphicMappedTypeInference.ts, 76, 1))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 78, 20))
+>K : Symbol(K, Decl(isomorphicMappedTypeInference.ts, 78, 22))
+>obj : Symbol(obj, Decl(isomorphicMappedTypeInference.ts, 78, 41))
+>P : Symbol(P, Decl(isomorphicMappedTypeInference.ts, 78, 49))
+>K : Symbol(K, Decl(isomorphicMappedTypeInference.ts, 78, 22))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 78, 20))
+
+    return obj;
+>obj : Symbol(obj, Decl(isomorphicMappedTypeInference.ts, 78, 41))
+}
+
+function f5(s: string) {
+>f5 : Symbol(f5, Decl(isomorphicMappedTypeInference.ts, 80, 1))
+>s : Symbol(s, Decl(isomorphicMappedTypeInference.ts, 82, 12))
+
+    let b = makeRecord({
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 83, 7))
+>makeRecord : Symbol(makeRecord, Decl(isomorphicMappedTypeInference.ts, 76, 1))
+
+        a: box(42),
+>a : Symbol(a, Decl(isomorphicMappedTypeInference.ts, 83, 24))
+>box : Symbol(box, Decl(isomorphicMappedTypeInference.ts, 7, 1))
+
+        b: box("hello"),
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 84, 19))
+>box : Symbol(box, Decl(isomorphicMappedTypeInference.ts, 7, 1))
+
+        c: box(true)
+>c : Symbol(c, Decl(isomorphicMappedTypeInference.ts, 85, 24))
+>box : Symbol(box, Decl(isomorphicMappedTypeInference.ts, 7, 1))
+
+    });
+    let v = unboxify(b);
+>v : Symbol(v, Decl(isomorphicMappedTypeInference.ts, 88, 7))
+>unboxify : Symbol(unboxify, Decl(isomorphicMappedTypeInference.ts, 23, 1))
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 83, 7))
+
+    let x: string | number | boolean = v.a;
+>x : Symbol(x, Decl(isomorphicMappedTypeInference.ts, 89, 7))
+>v.a : Symbol(a)
+>v : Symbol(v, Decl(isomorphicMappedTypeInference.ts, 88, 7))
+>a : Symbol(a)
+}
+
+function makeDictionary<T>(obj: { [x: string]: T }) {
+>makeDictionary : Symbol(makeDictionary, Decl(isomorphicMappedTypeInference.ts, 90, 1))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 92, 24))
+>obj : Symbol(obj, Decl(isomorphicMappedTypeInference.ts, 92, 27))
+>x : Symbol(x, Decl(isomorphicMappedTypeInference.ts, 92, 35))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 92, 24))
+
+    return obj;
+>obj : Symbol(obj, Decl(isomorphicMappedTypeInference.ts, 92, 27))
+}
+
+function f6(s: string) {
+>f6 : Symbol(f6, Decl(isomorphicMappedTypeInference.ts, 94, 1))
+>s : Symbol(s, Decl(isomorphicMappedTypeInference.ts, 96, 12))
+
+    let b = makeDictionary({
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 97, 7))
+>makeDictionary : Symbol(makeDictionary, Decl(isomorphicMappedTypeInference.ts, 90, 1))
+
+        a: box(42),
+>a : Symbol(a, Decl(isomorphicMappedTypeInference.ts, 97, 28))
+>box : Symbol(box, Decl(isomorphicMappedTypeInference.ts, 7, 1))
+
+        b: box("hello"),
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 98, 19))
+>box : Symbol(box, Decl(isomorphicMappedTypeInference.ts, 7, 1))
+
+        c: box(true)
+>c : Symbol(c, Decl(isomorphicMappedTypeInference.ts, 99, 24))
+>box : Symbol(box, Decl(isomorphicMappedTypeInference.ts, 7, 1))
+
+    });
+    let v = unboxify(b);
+>v : Symbol(v, Decl(isomorphicMappedTypeInference.ts, 102, 7))
+>unboxify : Symbol(unboxify, Decl(isomorphicMappedTypeInference.ts, 23, 1))
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 97, 7))
+
+    let x: string | number | boolean = v[s];
+>x : Symbol(x, Decl(isomorphicMappedTypeInference.ts, 103, 7))
+>v : Symbol(v, Decl(isomorphicMappedTypeInference.ts, 102, 7))
+>s : Symbol(s, Decl(isomorphicMappedTypeInference.ts, 96, 12))
+}
diff --git a/tests/baselines/reference/isomorphicMappedTypeInference.types b/tests/baselines/reference/isomorphicMappedTypeInference.types
new file mode 100644
index 00000000000..00a80639f73
--- /dev/null
+++ b/tests/baselines/reference/isomorphicMappedTypeInference.types
@@ -0,0 +1,405 @@
+=== tests/cases/conformance/types/mapped/isomorphicMappedTypeInference.ts ===
+
+type Box<T> = {
+>Box : Box<T>
+>T : T
+
+    value: T;
+>value : T
+>T : T
+}
+
+type Boxified<T> = {
+>Boxified : Boxified<T>
+>T : T
+
+    [P in keyof T]: Box<T[P]>;
+>P : P
+>T : T
+>Box : Box<T>
+>T : T
+>P : P
+}
+
+function box<T>(x: T): Box<T> {
+>box : <T>(x: T) => Box<T>
+>T : T
+>x : T
+>T : T
+>Box : Box<T>
+>T : T
+
+    return { value: x };
+>{ value: x } : { value: T; }
+>value : T
+>x : T
+}
+
+function unbox<T>(x: Box<T>): T {
+>unbox : <T>(x: Box<T>) => T
+>T : T
+>x : Box<T>
+>Box : Box<T>
+>T : T
+>T : T
+
+    return x.value;
+>x.value : T
+>x : Box<T>
+>value : T
+}
+
+function boxify<T>(obj: T): Boxified<T> {
+>boxify : <T>(obj: T) => Boxified<T>
+>T : T
+>obj : T
+>T : T
+>Boxified : Boxified<T>
+>T : T
+
+    let result = {} as Boxified<T>;
+>result : Boxified<T>
+>{} as Boxified<T> : Boxified<T>
+>{} : {}
+>Boxified : Boxified<T>
+>T : T
+
+    for (let k in obj) {
+>k : keyof T
+>obj : T
+
+        result[k] = box(obj[k]);
+>result[k] = box(obj[k]) : Box<T[keyof T]>
+>result[k] : Box<T[keyof T]>
+>result : Boxified<T>
+>k : keyof T
+>box(obj[k]) : Box<T[keyof T]>
+>box : <T>(x: T) => Box<T>
+>obj[k] : T[keyof T]
+>obj : T
+>k : keyof T
+    }
+    return result;
+>result : Boxified<T>
+}
+
+function unboxify<T>(obj: Boxified<T>): T {
+>unboxify : <T>(obj: Boxified<T>) => T
+>T : T
+>obj : Boxified<T>
+>Boxified : Boxified<T>
+>T : T
+>T : T
+
+    let result = {} as T;
+>result : T
+>{} as T : T
+>{} : {}
+>T : T
+
+    for (let k in obj) {
+>k : keyof T
+>obj : Boxified<T>
+
+        result[k] = unbox(obj[k]);
+>result[k] = unbox(obj[k]) : T[keyof T]
+>result[k] : T[keyof T]
+>result : T
+>k : keyof T
+>unbox(obj[k]) : T[keyof T]
+>unbox : <T>(x: Box<T>) => T
+>obj[k] : Box<T[keyof T]>
+>obj : Boxified<T>
+>k : keyof T
+    }
+    return result;
+>result : T
+}
+
+function assignBoxified<T>(obj: Boxified<T>, values: T) {
+>assignBoxified : <T>(obj: Boxified<T>, values: T) => void
+>T : T
+>obj : Boxified<T>
+>Boxified : Boxified<T>
+>T : T
+>values : T
+>T : T
+
+    for (let k in values) {
+>k : keyof T
+>values : T
+
+        obj[k].value = values[k];
+>obj[k].value = values[k] : T[keyof T]
+>obj[k].value : T[keyof T]
+>obj[k] : Box<T[keyof T]>
+>obj : Boxified<T>
+>k : keyof T
+>value : T[keyof T]
+>values[k] : T[keyof T]
+>values : T
+>k : keyof T
+    }
+}
+
+function f1() {
+>f1 : () => void
+
+    let v = {
+>v : { a: number; b: string; c: boolean; }
+>{        a: 42,        b: "hello",        c: true    } : { a: number; b: string; c: boolean; }
+
+        a: 42,
+>a : number
+>42 : 42
+
+        b: "hello",
+>b : string
+>"hello" : "hello"
+
+        c: true
+>c : boolean
+>true : true
+
+    };
+    let b = boxify(v);
+>b : Boxified<{ a: number; b: string; c: boolean; }>
+>boxify(v) : Boxified<{ a: number; b: string; c: boolean; }>
+>boxify : <T>(obj: T) => Boxified<T>
+>v : { a: number; b: string; c: boolean; }
+
+    let x: number = b.a.value;
+>x : number
+>b.a.value : number
+>b.a : Box<number>
+>b : Boxified<{ a: number; b: string; c: boolean; }>
+>a : Box<number>
+>value : number
+}
+
+function f2() {
+>f2 : () => void
+
+    let b = {
+>b : { a: Box<number>; b: Box<string>; c: Box<boolean>; }
+>{        a: box(42),        b: box("hello"),        c: box(true)    } : { a: Box<number>; b: Box<string>; c: Box<boolean>; }
+
+        a: box(42),
+>a : Box<number>
+>box(42) : Box<number>
+>box : <T>(x: T) => Box<T>
+>42 : 42
+
+        b: box("hello"),
+>b : Box<string>
+>box("hello") : Box<string>
+>box : <T>(x: T) => Box<T>
+>"hello" : "hello"
+
+        c: box(true)
+>c : Box<boolean>
+>box(true) : Box<boolean>
+>box : <T>(x: T) => Box<T>
+>true : true
+
+    };
+    let v = unboxify(b);
+>v : { a: number; b: string; c: boolean; }
+>unboxify(b) : { a: number; b: string; c: boolean; }
+>unboxify : <T>(obj: Boxified<T>) => T
+>b : { a: Box<number>; b: Box<string>; c: Box<boolean>; }
+
+    let x: number = v.a;
+>x : number
+>v.a : number
+>v : { a: number; b: string; c: boolean; }
+>a : number
+}
+
+function f3() {
+>f3 : () => void
+
+    let b = {
+>b : { a: Box<number>; b: Box<string>; c: Box<boolean>; }
+>{        a: box(42),        b: box("hello"),        c: box(true)    } : { a: Box<number>; b: Box<string>; c: Box<boolean>; }
+
+        a: box(42),
+>a : Box<number>
+>box(42) : Box<number>
+>box : <T>(x: T) => Box<T>
+>42 : 42
+
+        b: box("hello"),
+>b : Box<string>
+>box("hello") : Box<string>
+>box : <T>(x: T) => Box<T>
+>"hello" : "hello"
+
+        c: box(true)
+>c : Box<boolean>
+>box(true) : Box<boolean>
+>box : <T>(x: T) => Box<T>
+>true : true
+
+    };
+    assignBoxified(b, { c: false });
+>assignBoxified(b, { c: false }) : void
+>assignBoxified : <T>(obj: Boxified<T>, values: T) => void
+>b : { a: Box<number>; b: Box<string>; c: Box<boolean>; }
+>{ c: false } : { c: false; }
+>c : boolean
+>false : false
+}
+
+function f4() {
+>f4 : () => void
+
+    let b = {
+>b : { a: Box<number>; b: Box<string>; c: Box<boolean>; }
+>{        a: box(42),        b: box("hello"),        c: box(true)    } : { a: Box<number>; b: Box<string>; c: Box<boolean>; }
+
+        a: box(42),
+>a : Box<number>
+>box(42) : Box<number>
+>box : <T>(x: T) => Box<T>
+>42 : 42
+
+        b: box("hello"),
+>b : Box<string>
+>box("hello") : Box<string>
+>box : <T>(x: T) => Box<T>
+>"hello" : "hello"
+
+        c: box(true)
+>c : Box<boolean>
+>box(true) : Box<boolean>
+>box : <T>(x: T) => Box<T>
+>true : true
+
+    };
+    b = boxify(unboxify(b));
+>b = boxify(unboxify(b)) : Boxified<{ a: number; b: string; c: boolean; }>
+>b : { a: Box<number>; b: Box<string>; c: Box<boolean>; }
+>boxify(unboxify(b)) : Boxified<{ a: number; b: string; c: boolean; }>
+>boxify : <T>(obj: T) => Boxified<T>
+>unboxify(b) : { a: number; b: string; c: boolean; }
+>unboxify : <T>(obj: Boxified<T>) => T
+>b : { a: Box<number>; b: Box<string>; c: Box<boolean>; }
+
+    b = unboxify(boxify(b));
+>b = unboxify(boxify(b)) : { a: Box<number>; b: Box<string>; c: Box<boolean>; }
+>b : { a: Box<number>; b: Box<string>; c: Box<boolean>; }
+>unboxify(boxify(b)) : { a: Box<number>; b: Box<string>; c: Box<boolean>; }
+>unboxify : <T>(obj: Boxified<T>) => T
+>boxify(b) : Boxified<{ a: Box<number>; b: Box<string>; c: Box<boolean>; }>
+>boxify : <T>(obj: T) => Boxified<T>
+>b : { a: Box<number>; b: Box<string>; c: Box<boolean>; }
+}
+
+function makeRecord<T, K extends string>(obj: { [P in K]: T }) {
+>makeRecord : <T, K extends string>(obj: { [P in K]: T; }) => { [P in K]: T; }
+>T : T
+>K : K
+>obj : { [P in K]: T; }
+>P : P
+>K : K
+>T : T
+
+    return obj;
+>obj : { [P in K]: T; }
+}
+
+function f5(s: string) {
+>f5 : (s: string) => void
+>s : string
+
+    let b = makeRecord({
+>b : { a: Box<number> | Box<string> | Box<boolean>; b: Box<number> | Box<string> | Box<boolean>; c: Box<number> | Box<string> | Box<boolean>; }
+>makeRecord({        a: box(42),        b: box("hello"),        c: box(true)    }) : { a: Box<number> | Box<string> | Box<boolean>; b: Box<number> | Box<string> | Box<boolean>; c: Box<number> | Box<string> | Box<boolean>; }
+>makeRecord : <T, K extends string>(obj: { [P in K]: T; }) => { [P in K]: T; }
+>{        a: box(42),        b: box("hello"),        c: box(true)    } : { a: Box<number>; b: Box<string>; c: Box<boolean>; }
+
+        a: box(42),
+>a : Box<number>
+>box(42) : Box<number>
+>box : <T>(x: T) => Box<T>
+>42 : 42
+
+        b: box("hello"),
+>b : Box<string>
+>box("hello") : Box<string>
+>box : <T>(x: T) => Box<T>
+>"hello" : "hello"
+
+        c: box(true)
+>c : Box<boolean>
+>box(true) : Box<boolean>
+>box : <T>(x: T) => Box<T>
+>true : true
+
+    });
+    let v = unboxify(b);
+>v : { a: string | number | boolean; b: string | number | boolean; c: string | number | boolean; }
+>unboxify(b) : { a: string | number | boolean; b: string | number | boolean; c: string | number | boolean; }
+>unboxify : <T>(obj: Boxified<T>) => T
+>b : { a: Box<number> | Box<string> | Box<boolean>; b: Box<number> | Box<string> | Box<boolean>; c: Box<number> | Box<string> | Box<boolean>; }
+
+    let x: string | number | boolean = v.a;
+>x : string | number | boolean
+>v.a : string | number | boolean
+>v : { a: string | number | boolean; b: string | number | boolean; c: string | number | boolean; }
+>a : string | number | boolean
+}
+
+function makeDictionary<T>(obj: { [x: string]: T }) {
+>makeDictionary : <T>(obj: { [x: string]: T; }) => { [x: string]: T; }
+>T : T
+>obj : { [x: string]: T; }
+>x : string
+>T : T
+
+    return obj;
+>obj : { [x: string]: T; }
+}
+
+function f6(s: string) {
+>f6 : (s: string) => void
+>s : string
+
+    let b = makeDictionary({
+>b : { [x: string]: Box<number> | Box<string> | Box<boolean>; }
+>makeDictionary({        a: box(42),        b: box("hello"),        c: box(true)    }) : { [x: string]: Box<number> | Box<string> | Box<boolean>; }
+>makeDictionary : <T>(obj: { [x: string]: T; }) => { [x: string]: T; }
+>{        a: box(42),        b: box("hello"),        c: box(true)    } : { a: Box<number>; b: Box<string>; c: Box<boolean>; }
+
+        a: box(42),
+>a : Box<number>
+>box(42) : Box<number>
+>box : <T>(x: T) => Box<T>
+>42 : 42
+
+        b: box("hello"),
+>b : Box<string>
+>box("hello") : Box<string>
+>box : <T>(x: T) => Box<T>
+>"hello" : "hello"
+
+        c: box(true)
+>c : Box<boolean>
+>box(true) : Box<boolean>
+>box : <T>(x: T) => Box<T>
+>true : true
+
+    });
+    let v = unboxify(b);
+>v : { [x: string]: string | number | boolean; }
+>unboxify(b) : { [x: string]: string | number | boolean; }
+>unboxify : <T>(obj: Boxified<T>) => T
+>b : { [x: string]: Box<number> | Box<string> | Box<boolean>; }
+
+    let x: string | number | boolean = v[s];
+>x : string | number | boolean
+>v[s] : string | number | boolean
+>v : { [x: string]: string | number | boolean; }
+>s : string
+}
diff --git a/tests/cases/conformance/types/mapped/isomorphicMappedTypeInference.ts b/tests/cases/conformance/types/mapped/isomorphicMappedTypeInference.ts
new file mode 100644
index 00000000000..19a0c4889a5
--- /dev/null
+++ b/tests/cases/conformance/types/mapped/isomorphicMappedTypeInference.ts
@@ -0,0 +1,107 @@
+// @noimplicitany: true
+// @declaration: true
+
+type Box<T> = {
+    value: T;
+}
+
+type Boxified<T> = {
+    [P in keyof T]: Box<T[P]>;
+}
+
+function box<T>(x: T): Box<T> {
+    return { value: x };
+}
+
+function unbox<T>(x: Box<T>): T {
+    return x.value;
+}
+
+function boxify<T>(obj: T): Boxified<T> {
+    let result = {} as Boxified<T>;
+    for (let k in obj) {
+        result[k] = box(obj[k]);
+    }
+    return result;
+}
+
+function unboxify<T>(obj: Boxified<T>): T {
+    let result = {} as T;
+    for (let k in obj) {
+        result[k] = unbox(obj[k]);
+    }
+    return result;
+}
+
+function assignBoxified<T>(obj: Boxified<T>, values: T) {
+    for (let k in values) {
+        obj[k].value = values[k];
+    }
+}
+
+function f1() {
+    let v = {
+        a: 42,
+        b: "hello",
+        c: true
+    };
+    let b = boxify(v);
+    let x: number = b.a.value;
+}
+
+function f2() {
+    let b = {
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    };
+    let v = unboxify(b);
+    let x: number = v.a;
+}
+
+function f3() {
+    let b = {
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    };
+    assignBoxified(b, { c: false });
+}
+
+function f4() {
+    let b = {
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    };
+    b = boxify(unboxify(b));
+    b = unboxify(boxify(b));
+}
+
+function makeRecord<T, K extends string>(obj: { [P in K]: T }) {
+    return obj;
+}
+
+function f5(s: string) {
+    let b = makeRecord({
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    });
+    let v = unboxify(b);
+    let x: string | number | boolean = v.a;
+}
+
+function makeDictionary<T>(obj: { [x: string]: T }) {
+    return obj;
+}
+
+function f6(s: string) {
+    let b = makeDictionary({
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    });
+    let v = unboxify(b);
+    let x: string | number | boolean = v[s];
+}
\ No newline at end of file

From 8ee5f7d64f1ede8d16d01d1ca4d1004e8d68f25b Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sun, 27 Nov 2016 19:49:57 -0800
Subject: [PATCH 354/421] Remove unused case in type inference

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 2feb6b3f9c3..71dc4ec826e 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -8685,13 +8685,6 @@ namespace ts {
                         inferFromTypes(getUnionType(map(getPropertiesOfType(source), getTypeOfSymbol)), getTemplateTypeFromMappedType(<MappedType>target));
                         return;
                     }
-                    if (getObjectFlags(source) & ObjectFlags.Mapped) {
-                        // We're inferring from a mapped type to a mapped type, so simply infer from constraint type to
-                        // constraint type and from template type to template type.
-                        inferFromTypes(getConstraintTypeFromMappedType(<MappedType>source), constraintType);
-                        inferFromTypes(getTemplateTypeFromMappedType(<MappedType>source), getTemplateTypeFromMappedType(<MappedType>target));
-                        return;
-                    }
                 }
                 inferFromProperties(source, target);
                 inferFromSignatures(source, target, SignatureKind.Call);

From 9970606f355bd1fdc2ce0a5ce03716415f8391ef Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sun, 27 Nov 2016 19:58:05 -0800
Subject: [PATCH 355/421] Remove unused code in resolveMappedTypeMembers

---
 src/compiler/checker.ts | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 71dc4ec826e..d454465a7ca 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -4494,7 +4494,6 @@ namespace ts {
         function resolveMappedTypeMembers(type: MappedType) {
             const members: SymbolTable = createMap<Symbol>();
             let stringIndexInfo: IndexInfo;
-            let numberIndexInfo: IndexInfo;
             // Resolve upfront such that recursive references see an empty object type.
             setStructuredTypeMembers(type, emptySymbols, emptyArray, emptyArray, undefined, undefined);
             // In { [P in K]: T }, we refer to P as the type parameter type, K as the constraint type,
@@ -4529,16 +4528,8 @@ namespace ts {
                 else if (t.flags & TypeFlags.String) {
                     stringIndexInfo = createIndexInfo(propType, isReadonly);
                 }
-                else if (t.flags & TypeFlags.Number) {
-                    numberIndexInfo = createIndexInfo(propType, isReadonly);
-                }
             });
-            // If we created both a string and a numeric string index signature, and if the two index
-            // signatures have identical types, discard the redundant numeric index signature.
-            if (stringIndexInfo && numberIndexInfo && isTypeIdenticalTo(stringIndexInfo.type, numberIndexInfo.type)) {
-                numberIndexInfo = undefined;
-            }
-            setStructuredTypeMembers(type, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
+            setStructuredTypeMembers(type, members, emptyArray, emptyArray, stringIndexInfo, undefined);
         }
 
         function getTypeParameterFromMappedType(type: MappedType) {

From 8b7252c4b0faad318a37dd609bfcf7db71154236 Mon Sep 17 00:00:00 2001
From: Ethan Resnick <ethan.resnick@gmail.com>
Date: Mon, 28 Nov 2016 04:21:33 -0800
Subject: [PATCH 356/421] Update keyof tests to reflect #12425

Removes number from all the keyof types, and adds a test that numeric
indexes are ignored.
---
 .../reference/keyofAndIndexedAccess.js        |  21 +-
 .../reference/keyofAndIndexedAccess.symbols   | 870 +++++++++---------
 .../reference/keyofAndIndexedAccess.types     |  24 +-
 .../types/keyof/keyofAndIndexedAccess.ts      |  16 +-
 4 files changed, 482 insertions(+), 449 deletions(-)

diff --git a/tests/baselines/reference/keyofAndIndexedAccess.js b/tests/baselines/reference/keyofAndIndexedAccess.js
index 1cc8846bbbd..8d8f125f39e 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.js
+++ b/tests/baselines/reference/keyofAndIndexedAccess.js
@@ -21,11 +21,12 @@ class Options {
 }
 
 type Dictionary<T> = { [x: string]: T };
+type NumericallyIndexed<T> = { [x: number]: T };
 
 const enum E { A, B, C }
 
-type K00 = keyof any;  // string | number
-type K01 = keyof string;  // number | "toString" | "charAt" | ...
+type K00 = keyof any;  // string
+type K01 = keyof string;  // "toString" | "charAt" | ...
 type K02 = keyof number;  // "toString" | "toFixed" | "toExponential" | ...
 type K03 = keyof boolean;  // "valueOf"
 type K04 = keyof void;  // never
@@ -34,19 +35,20 @@ type K06 = keyof null;  // never
 type K07 = keyof never;  // never
 
 type K10 = keyof Shape;  // "name" | "width" | "height" | "visible"
-type K11 = keyof Shape[];  // number | "length" | "toString" | ...
-type K12 = keyof Dictionary<Shape>;  // string | number
+type K11 = keyof Shape[];  // "length" | "toString" | ...
+type K12 = keyof Dictionary<Shape>;  // string
 type K13 = keyof {};  // never
 type K14 = keyof Object;  // "constructor" | "toString" | ...
 type K15 = keyof E;  // "toString" | "toFixed" | "toExponential" | ...
-type K16 = keyof [string, number];  // number | "0" | "1" | "length" | "toString" | ...
+type K16 = keyof [string, number];  // "0" | "1" | "length" | "toString" | ...
 type K17 = keyof (Shape | Item);  // "name"
 type K18 = keyof (Shape & Item);  // "name" | "width" | "height" | "visible" | "price"
+type K19 = keyof NumericallyIndexed<Shape> // never
 
 type KeyOf<T> = keyof T;
 
 type K20 = KeyOf<Shape>;  // "name" | "width" | "height" | "visible"
-type K21 = KeyOf<Dictionary<Shape>>;  // string | number
+type K21 = KeyOf<Dictionary<Shape>>;  // string
 
 type NAME = "name";
 type WIDTH_OR_HEIGHT = "width" | "height";
@@ -247,7 +249,8 @@ class OtherPerson {
     getParts() {
         return getProperty(this, "parts")
     }
-}
+}
+
 
 //// [keyofAndIndexedAccess.js]
 var __extends = (this && this.__extends) || function (d, b) {
@@ -449,6 +452,9 @@ declare class Options {
 declare type Dictionary<T> = {
     [x: string]: T;
 };
+declare type NumericallyIndexed<T> = {
+    [x: number]: T;
+};
 declare const enum E {
     A = 0,
     B = 1,
@@ -471,6 +477,7 @@ declare type K15 = keyof E;
 declare type K16 = keyof [string, number];
 declare type K17 = keyof (Shape | Item);
 declare type K18 = keyof (Shape & Item);
+declare type K19 = keyof NumericallyIndexed<Shape>;
 declare type KeyOf<T> = keyof T;
 declare type K20 = KeyOf<Shape>;
 declare type K21 = KeyOf<Dictionary<Shape>>;
diff --git a/tests/baselines/reference/keyofAndIndexedAccess.symbols b/tests/baselines/reference/keyofAndIndexedAccess.symbols
index 634dfe09da9..2371bf419c8 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.symbols
+++ b/tests/baselines/reference/keyofAndIndexedAccess.symbols
@@ -47,792 +47,804 @@ type Dictionary<T> = { [x: string]: T };
 >x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 21, 24))
 >T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 21, 16))
 
+type NumericallyIndexed<T> = { [x: number]: T };
+>NumericallyIndexed : Symbol(NumericallyIndexed, Decl(keyofAndIndexedAccess.ts, 21, 40))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 22, 24))
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 22, 32))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 22, 24))
+
 const enum E { A, B, C }
->E : Symbol(E, Decl(keyofAndIndexedAccess.ts, 21, 40))
->A : Symbol(E.A, Decl(keyofAndIndexedAccess.ts, 23, 14))
->B : Symbol(E.B, Decl(keyofAndIndexedAccess.ts, 23, 17))
->C : Symbol(E.C, Decl(keyofAndIndexedAccess.ts, 23, 20))
+>E : Symbol(E, Decl(keyofAndIndexedAccess.ts, 22, 48))
+>A : Symbol(E.A, Decl(keyofAndIndexedAccess.ts, 24, 14))
+>B : Symbol(E.B, Decl(keyofAndIndexedAccess.ts, 24, 17))
+>C : Symbol(E.C, Decl(keyofAndIndexedAccess.ts, 24, 20))
 
-type K00 = keyof any;  // string | number
->K00 : Symbol(K00, Decl(keyofAndIndexedAccess.ts, 23, 24))
+type K00 = keyof any;  // string
+>K00 : Symbol(K00, Decl(keyofAndIndexedAccess.ts, 24, 24))
 
-type K01 = keyof string;  // number | "toString" | "charAt" | ...
->K01 : Symbol(K01, Decl(keyofAndIndexedAccess.ts, 25, 21))
+type K01 = keyof string;  // "toString" | "charAt" | ...
+>K01 : Symbol(K01, Decl(keyofAndIndexedAccess.ts, 26, 21))
 
 type K02 = keyof number;  // "toString" | "toFixed" | "toExponential" | ...
->K02 : Symbol(K02, Decl(keyofAndIndexedAccess.ts, 26, 24))
+>K02 : Symbol(K02, Decl(keyofAndIndexedAccess.ts, 27, 24))
 
 type K03 = keyof boolean;  // "valueOf"
->K03 : Symbol(K03, Decl(keyofAndIndexedAccess.ts, 27, 24))
+>K03 : Symbol(K03, Decl(keyofAndIndexedAccess.ts, 28, 24))
 
 type K04 = keyof void;  // never
->K04 : Symbol(K04, Decl(keyofAndIndexedAccess.ts, 28, 25))
+>K04 : Symbol(K04, Decl(keyofAndIndexedAccess.ts, 29, 25))
 
 type K05 = keyof undefined;  // never
->K05 : Symbol(K05, Decl(keyofAndIndexedAccess.ts, 29, 22))
+>K05 : Symbol(K05, Decl(keyofAndIndexedAccess.ts, 30, 22))
 
 type K06 = keyof null;  // never
->K06 : Symbol(K06, Decl(keyofAndIndexedAccess.ts, 30, 27))
+>K06 : Symbol(K06, Decl(keyofAndIndexedAccess.ts, 31, 27))
 
 type K07 = keyof never;  // never
->K07 : Symbol(K07, Decl(keyofAndIndexedAccess.ts, 31, 22))
+>K07 : Symbol(K07, Decl(keyofAndIndexedAccess.ts, 32, 22))
 
 type K10 = keyof Shape;  // "name" | "width" | "height" | "visible"
->K10 : Symbol(K10, Decl(keyofAndIndexedAccess.ts, 32, 23))
+>K10 : Symbol(K10, Decl(keyofAndIndexedAccess.ts, 33, 23))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 
-type K11 = keyof Shape[];  // number | "length" | "toString" | ...
->K11 : Symbol(K11, Decl(keyofAndIndexedAccess.ts, 34, 23))
+type K11 = keyof Shape[];  // "length" | "toString" | ...
+>K11 : Symbol(K11, Decl(keyofAndIndexedAccess.ts, 35, 23))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 
-type K12 = keyof Dictionary<Shape>;  // string | number
->K12 : Symbol(K12, Decl(keyofAndIndexedAccess.ts, 35, 25))
+type K12 = keyof Dictionary<Shape>;  // string
+>K12 : Symbol(K12, Decl(keyofAndIndexedAccess.ts, 36, 25))
 >Dictionary : Symbol(Dictionary, Decl(keyofAndIndexedAccess.ts, 19, 1))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 
 type K13 = keyof {};  // never
->K13 : Symbol(K13, Decl(keyofAndIndexedAccess.ts, 36, 35))
+>K13 : Symbol(K13, Decl(keyofAndIndexedAccess.ts, 37, 35))
 
 type K14 = keyof Object;  // "constructor" | "toString" | ...
->K14 : Symbol(K14, Decl(keyofAndIndexedAccess.ts, 37, 20))
+>K14 : Symbol(K14, Decl(keyofAndIndexedAccess.ts, 38, 20))
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 type K15 = keyof E;  // "toString" | "toFixed" | "toExponential" | ...
->K15 : Symbol(K15, Decl(keyofAndIndexedAccess.ts, 38, 24))
->E : Symbol(E, Decl(keyofAndIndexedAccess.ts, 21, 40))
+>K15 : Symbol(K15, Decl(keyofAndIndexedAccess.ts, 39, 24))
+>E : Symbol(E, Decl(keyofAndIndexedAccess.ts, 22, 48))
 
-type K16 = keyof [string, number];  // number | "0" | "1" | "length" | "toString" | ...
->K16 : Symbol(K16, Decl(keyofAndIndexedAccess.ts, 39, 19))
+type K16 = keyof [string, number];  // "0" | "1" | "length" | "toString" | ...
+>K16 : Symbol(K16, Decl(keyofAndIndexedAccess.ts, 40, 19))
 
 type K17 = keyof (Shape | Item);  // "name"
->K17 : Symbol(K17, Decl(keyofAndIndexedAccess.ts, 40, 34))
+>K17 : Symbol(K17, Decl(keyofAndIndexedAccess.ts, 41, 34))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 >Item : Symbol(Item, Decl(keyofAndIndexedAccess.ts, 10, 1))
 
 type K18 = keyof (Shape & Item);  // "name" | "width" | "height" | "visible" | "price"
->K18 : Symbol(K18, Decl(keyofAndIndexedAccess.ts, 41, 32))
+>K18 : Symbol(K18, Decl(keyofAndIndexedAccess.ts, 42, 32))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 >Item : Symbol(Item, Decl(keyofAndIndexedAccess.ts, 10, 1))
 
-type KeyOf<T> = keyof T;
->KeyOf : Symbol(KeyOf, Decl(keyofAndIndexedAccess.ts, 42, 32))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 44, 11))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 44, 11))
-
-type K20 = KeyOf<Shape>;  // "name" | "width" | "height" | "visible"
->K20 : Symbol(K20, Decl(keyofAndIndexedAccess.ts, 44, 24))
->KeyOf : Symbol(KeyOf, Decl(keyofAndIndexedAccess.ts, 42, 32))
+type K19 = keyof NumericallyIndexed<Shape> // never
+>K19 : Symbol(K19, Decl(keyofAndIndexedAccess.ts, 43, 32))
+>NumericallyIndexed : Symbol(NumericallyIndexed, Decl(keyofAndIndexedAccess.ts, 21, 40))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 
-type K21 = KeyOf<Dictionary<Shape>>;  // string | number
->K21 : Symbol(K21, Decl(keyofAndIndexedAccess.ts, 46, 24))
->KeyOf : Symbol(KeyOf, Decl(keyofAndIndexedAccess.ts, 42, 32))
+type KeyOf<T> = keyof T;
+>KeyOf : Symbol(KeyOf, Decl(keyofAndIndexedAccess.ts, 44, 42))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 46, 11))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 46, 11))
+
+type K20 = KeyOf<Shape>;  // "name" | "width" | "height" | "visible"
+>K20 : Symbol(K20, Decl(keyofAndIndexedAccess.ts, 46, 24))
+>KeyOf : Symbol(KeyOf, Decl(keyofAndIndexedAccess.ts, 44, 42))
+>Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
+
+type K21 = KeyOf<Dictionary<Shape>>;  // string
+>K21 : Symbol(K21, Decl(keyofAndIndexedAccess.ts, 48, 24))
+>KeyOf : Symbol(KeyOf, Decl(keyofAndIndexedAccess.ts, 44, 42))
 >Dictionary : Symbol(Dictionary, Decl(keyofAndIndexedAccess.ts, 19, 1))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 
 type NAME = "name";
->NAME : Symbol(NAME, Decl(keyofAndIndexedAccess.ts, 47, 36))
+>NAME : Symbol(NAME, Decl(keyofAndIndexedAccess.ts, 49, 36))
 
 type WIDTH_OR_HEIGHT = "width" | "height";
->WIDTH_OR_HEIGHT : Symbol(WIDTH_OR_HEIGHT, Decl(keyofAndIndexedAccess.ts, 49, 19))
+>WIDTH_OR_HEIGHT : Symbol(WIDTH_OR_HEIGHT, Decl(keyofAndIndexedAccess.ts, 51, 19))
 
 type Q10 = Shape["name"];  // string
->Q10 : Symbol(Q10, Decl(keyofAndIndexedAccess.ts, 50, 42))
+>Q10 : Symbol(Q10, Decl(keyofAndIndexedAccess.ts, 52, 42))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 
 type Q11 = Shape["width" | "height"];  // number
->Q11 : Symbol(Q11, Decl(keyofAndIndexedAccess.ts, 52, 25))
+>Q11 : Symbol(Q11, Decl(keyofAndIndexedAccess.ts, 54, 25))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 
 type Q12 = Shape["name" | "visible"];  // string | boolean
->Q12 : Symbol(Q12, Decl(keyofAndIndexedAccess.ts, 53, 37))
+>Q12 : Symbol(Q12, Decl(keyofAndIndexedAccess.ts, 55, 37))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 
 type Q20 = Shape[NAME];  // string
->Q20 : Symbol(Q20, Decl(keyofAndIndexedAccess.ts, 54, 37))
+>Q20 : Symbol(Q20, Decl(keyofAndIndexedAccess.ts, 56, 37))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
->NAME : Symbol(NAME, Decl(keyofAndIndexedAccess.ts, 47, 36))
+>NAME : Symbol(NAME, Decl(keyofAndIndexedAccess.ts, 49, 36))
 
 type Q21 = Shape[WIDTH_OR_HEIGHT];  // number
->Q21 : Symbol(Q21, Decl(keyofAndIndexedAccess.ts, 56, 23))
+>Q21 : Symbol(Q21, Decl(keyofAndIndexedAccess.ts, 58, 23))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
->WIDTH_OR_HEIGHT : Symbol(WIDTH_OR_HEIGHT, Decl(keyofAndIndexedAccess.ts, 49, 19))
+>WIDTH_OR_HEIGHT : Symbol(WIDTH_OR_HEIGHT, Decl(keyofAndIndexedAccess.ts, 51, 19))
 
 type Q30 = [string, number][0];  // string
->Q30 : Symbol(Q30, Decl(keyofAndIndexedAccess.ts, 57, 34))
+>Q30 : Symbol(Q30, Decl(keyofAndIndexedAccess.ts, 59, 34))
 
 type Q31 = [string, number][1];  // number
->Q31 : Symbol(Q31, Decl(keyofAndIndexedAccess.ts, 59, 31))
+>Q31 : Symbol(Q31, Decl(keyofAndIndexedAccess.ts, 61, 31))
 
 type Q32 = [string, number][2];  // string | number
->Q32 : Symbol(Q32, Decl(keyofAndIndexedAccess.ts, 60, 31))
+>Q32 : Symbol(Q32, Decl(keyofAndIndexedAccess.ts, 62, 31))
 
 type Q33 = [string, number][E.A];  // string
->Q33 : Symbol(Q33, Decl(keyofAndIndexedAccess.ts, 61, 31))
->E : Symbol(E, Decl(keyofAndIndexedAccess.ts, 21, 40))
->A : Symbol(E.A, Decl(keyofAndIndexedAccess.ts, 23, 14))
+>Q33 : Symbol(Q33, Decl(keyofAndIndexedAccess.ts, 63, 31))
+>E : Symbol(E, Decl(keyofAndIndexedAccess.ts, 22, 48))
+>A : Symbol(E.A, Decl(keyofAndIndexedAccess.ts, 24, 14))
 
 type Q34 = [string, number][E.B];  // number
->Q34 : Symbol(Q34, Decl(keyofAndIndexedAccess.ts, 62, 33))
->E : Symbol(E, Decl(keyofAndIndexedAccess.ts, 21, 40))
->B : Symbol(E.B, Decl(keyofAndIndexedAccess.ts, 23, 17))
+>Q34 : Symbol(Q34, Decl(keyofAndIndexedAccess.ts, 64, 33))
+>E : Symbol(E, Decl(keyofAndIndexedAccess.ts, 22, 48))
+>B : Symbol(E.B, Decl(keyofAndIndexedAccess.ts, 24, 17))
 
 type Q35 = [string, number][E.C];  // string | number
->Q35 : Symbol(Q35, Decl(keyofAndIndexedAccess.ts, 63, 33))
->E : Symbol(E, Decl(keyofAndIndexedAccess.ts, 21, 40))
->C : Symbol(E.C, Decl(keyofAndIndexedAccess.ts, 23, 20))
+>Q35 : Symbol(Q35, Decl(keyofAndIndexedAccess.ts, 65, 33))
+>E : Symbol(E, Decl(keyofAndIndexedAccess.ts, 22, 48))
+>C : Symbol(E.C, Decl(keyofAndIndexedAccess.ts, 24, 20))
 
 type Q36 = [string, number]["0"];  // string
->Q36 : Symbol(Q36, Decl(keyofAndIndexedAccess.ts, 64, 33))
+>Q36 : Symbol(Q36, Decl(keyofAndIndexedAccess.ts, 66, 33))
 
 type Q37 = [string, number]["1"];  // string
->Q37 : Symbol(Q37, Decl(keyofAndIndexedAccess.ts, 65, 33))
+>Q37 : Symbol(Q37, Decl(keyofAndIndexedAccess.ts, 67, 33))
 
 type Q40 = (Shape | Options)["visible"];  // boolean | "yes" | "no"
->Q40 : Symbol(Q40, Decl(keyofAndIndexedAccess.ts, 66, 33))
+>Q40 : Symbol(Q40, Decl(keyofAndIndexedAccess.ts, 68, 33))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 >Options : Symbol(Options, Decl(keyofAndIndexedAccess.ts, 15, 1))
 
 type Q41 = (Shape & Options)["visible"];  // true & "yes" | true & "no" | false & "yes" | false & "no"
->Q41 : Symbol(Q41, Decl(keyofAndIndexedAccess.ts, 68, 40))
+>Q41 : Symbol(Q41, Decl(keyofAndIndexedAccess.ts, 70, 40))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 >Options : Symbol(Options, Decl(keyofAndIndexedAccess.ts, 15, 1))
 
 type Q50 = Dictionary<Shape>["howdy"];  // Shape
->Q50 : Symbol(Q50, Decl(keyofAndIndexedAccess.ts, 69, 40))
+>Q50 : Symbol(Q50, Decl(keyofAndIndexedAccess.ts, 71, 40))
 >Dictionary : Symbol(Dictionary, Decl(keyofAndIndexedAccess.ts, 19, 1))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 
 type Q51 = Dictionary<Shape>[123];  // Shape
->Q51 : Symbol(Q51, Decl(keyofAndIndexedAccess.ts, 71, 38))
+>Q51 : Symbol(Q51, Decl(keyofAndIndexedAccess.ts, 73, 38))
 >Dictionary : Symbol(Dictionary, Decl(keyofAndIndexedAccess.ts, 19, 1))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 
 type Q52 = Dictionary<Shape>[E.B];  // Shape
->Q52 : Symbol(Q52, Decl(keyofAndIndexedAccess.ts, 72, 34))
+>Q52 : Symbol(Q52, Decl(keyofAndIndexedAccess.ts, 74, 34))
 >Dictionary : Symbol(Dictionary, Decl(keyofAndIndexedAccess.ts, 19, 1))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
->E : Symbol(E, Decl(keyofAndIndexedAccess.ts, 21, 40))
->B : Symbol(E.B, Decl(keyofAndIndexedAccess.ts, 23, 17))
+>E : Symbol(E, Decl(keyofAndIndexedAccess.ts, 22, 48))
+>B : Symbol(E.B, Decl(keyofAndIndexedAccess.ts, 24, 17))
 
 declare let cond: boolean;
->cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 75, 11))
+>cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 77, 11))
 
 function getProperty<T, K extends keyof T>(obj: T, key: K) {
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 77, 21))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 77, 23))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 77, 21))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 77, 43))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 77, 21))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 77, 50))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 77, 23))
+>getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 77, 26))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 79, 21))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 79, 23))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 79, 21))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 79, 43))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 79, 21))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 79, 50))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 79, 23))
 
     return obj[key];
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 77, 43))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 77, 50))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 79, 43))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 79, 50))
 }
 
 function setProperty<T, K extends keyof T>(obj: T, key: K, value: T[K]) {
->setProperty : Symbol(setProperty, Decl(keyofAndIndexedAccess.ts, 79, 1))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 81, 21))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 81, 23))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 81, 21))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 81, 43))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 81, 21))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 81, 50))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 81, 23))
->value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 81, 58))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 81, 21))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 81, 23))
+>setProperty : Symbol(setProperty, Decl(keyofAndIndexedAccess.ts, 81, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 83, 21))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 83, 23))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 83, 21))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 83, 43))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 83, 21))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 83, 50))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 83, 23))
+>value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 83, 58))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 83, 21))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 83, 23))
 
     obj[key] = value;
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 81, 43))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 81, 50))
->value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 81, 58))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 83, 43))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 83, 50))
+>value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 83, 58))
 }
 
 function f10(shape: Shape) {
->f10 : Symbol(f10, Decl(keyofAndIndexedAccess.ts, 83, 1))
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 85, 13))
+>f10 : Symbol(f10, Decl(keyofAndIndexedAccess.ts, 85, 1))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 87, 13))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 
     let name = getProperty(shape, "name");  // string
->name : Symbol(name, Decl(keyofAndIndexedAccess.ts, 86, 7))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 85, 13))
+>name : Symbol(name, Decl(keyofAndIndexedAccess.ts, 88, 7))
+>getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 77, 26))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 87, 13))
 
     let widthOrHeight = getProperty(shape, cond ? "width" : "height");  // number
->widthOrHeight : Symbol(widthOrHeight, Decl(keyofAndIndexedAccess.ts, 87, 7))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 85, 13))
->cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 75, 11))
+>widthOrHeight : Symbol(widthOrHeight, Decl(keyofAndIndexedAccess.ts, 89, 7))
+>getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 77, 26))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 87, 13))
+>cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 77, 11))
 
     let nameOrVisible = getProperty(shape, cond ? "name" : "visible");  // string | boolean
->nameOrVisible : Symbol(nameOrVisible, Decl(keyofAndIndexedAccess.ts, 88, 7))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 85, 13))
->cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 75, 11))
+>nameOrVisible : Symbol(nameOrVisible, Decl(keyofAndIndexedAccess.ts, 90, 7))
+>getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 77, 26))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 87, 13))
+>cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 77, 11))
 
     setProperty(shape, "name", "rectangle");
->setProperty : Symbol(setProperty, Decl(keyofAndIndexedAccess.ts, 79, 1))
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 85, 13))
+>setProperty : Symbol(setProperty, Decl(keyofAndIndexedAccess.ts, 81, 1))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 87, 13))
 
     setProperty(shape, cond ? "width" : "height", 10);
->setProperty : Symbol(setProperty, Decl(keyofAndIndexedAccess.ts, 79, 1))
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 85, 13))
->cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 75, 11))
+>setProperty : Symbol(setProperty, Decl(keyofAndIndexedAccess.ts, 81, 1))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 87, 13))
+>cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 77, 11))
 
     setProperty(shape, cond ? "name" : "visible", true);  // Technically not safe
->setProperty : Symbol(setProperty, Decl(keyofAndIndexedAccess.ts, 79, 1))
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 85, 13))
->cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 75, 11))
+>setProperty : Symbol(setProperty, Decl(keyofAndIndexedAccess.ts, 81, 1))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 87, 13))
+>cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 77, 11))
 }
 
 function f11(a: Shape[]) {
->f11 : Symbol(f11, Decl(keyofAndIndexedAccess.ts, 92, 1))
->a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 94, 13))
+>f11 : Symbol(f11, Decl(keyofAndIndexedAccess.ts, 94, 1))
+>a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 96, 13))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 
     let len = getProperty(a, "length");  // number
->len : Symbol(len, Decl(keyofAndIndexedAccess.ts, 95, 7))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 94, 13))
+>len : Symbol(len, Decl(keyofAndIndexedAccess.ts, 97, 7))
+>getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 77, 26))
+>a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 96, 13))
 
     setProperty(a, "length", len);
->setProperty : Symbol(setProperty, Decl(keyofAndIndexedAccess.ts, 79, 1))
->a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 94, 13))
->len : Symbol(len, Decl(keyofAndIndexedAccess.ts, 95, 7))
+>setProperty : Symbol(setProperty, Decl(keyofAndIndexedAccess.ts, 81, 1))
+>a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 96, 13))
+>len : Symbol(len, Decl(keyofAndIndexedAccess.ts, 97, 7))
 }
 
 function f12(t: [Shape, boolean]) {
->f12 : Symbol(f12, Decl(keyofAndIndexedAccess.ts, 97, 1))
->t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 99, 13))
+>f12 : Symbol(f12, Decl(keyofAndIndexedAccess.ts, 99, 1))
+>t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 101, 13))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 
     let len = getProperty(t, "length");
->len : Symbol(len, Decl(keyofAndIndexedAccess.ts, 100, 7))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 99, 13))
+>len : Symbol(len, Decl(keyofAndIndexedAccess.ts, 102, 7))
+>getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 77, 26))
+>t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 101, 13))
 
     let s2 = getProperty(t, "0");  // Shape
->s2 : Symbol(s2, Decl(keyofAndIndexedAccess.ts, 101, 7))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 99, 13))
+>s2 : Symbol(s2, Decl(keyofAndIndexedAccess.ts, 103, 7))
+>getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 77, 26))
+>t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 101, 13))
 
     let b2 = getProperty(t, "1");  // boolean
->b2 : Symbol(b2, Decl(keyofAndIndexedAccess.ts, 102, 7))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 99, 13))
+>b2 : Symbol(b2, Decl(keyofAndIndexedAccess.ts, 104, 7))
+>getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 77, 26))
+>t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 101, 13))
 }
 
 function f13(foo: any, bar: any) {
->f13 : Symbol(f13, Decl(keyofAndIndexedAccess.ts, 103, 1))
->foo : Symbol(foo, Decl(keyofAndIndexedAccess.ts, 105, 13))
->bar : Symbol(bar, Decl(keyofAndIndexedAccess.ts, 105, 22))
+>f13 : Symbol(f13, Decl(keyofAndIndexedAccess.ts, 105, 1))
+>foo : Symbol(foo, Decl(keyofAndIndexedAccess.ts, 107, 13))
+>bar : Symbol(bar, Decl(keyofAndIndexedAccess.ts, 107, 22))
 
     let x = getProperty(foo, "x");  // any
->x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 106, 7))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->foo : Symbol(foo, Decl(keyofAndIndexedAccess.ts, 105, 13))
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 108, 7))
+>getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 77, 26))
+>foo : Symbol(foo, Decl(keyofAndIndexedAccess.ts, 107, 13))
 
     let y = getProperty(foo, "100");  // any
->y : Symbol(y, Decl(keyofAndIndexedAccess.ts, 107, 7))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->foo : Symbol(foo, Decl(keyofAndIndexedAccess.ts, 105, 13))
+>y : Symbol(y, Decl(keyofAndIndexedAccess.ts, 109, 7))
+>getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 77, 26))
+>foo : Symbol(foo, Decl(keyofAndIndexedAccess.ts, 107, 13))
 
     let z = getProperty(foo, bar);  // any
->z : Symbol(z, Decl(keyofAndIndexedAccess.ts, 108, 7))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->foo : Symbol(foo, Decl(keyofAndIndexedAccess.ts, 105, 13))
->bar : Symbol(bar, Decl(keyofAndIndexedAccess.ts, 105, 22))
+>z : Symbol(z, Decl(keyofAndIndexedAccess.ts, 110, 7))
+>getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 77, 26))
+>foo : Symbol(foo, Decl(keyofAndIndexedAccess.ts, 107, 13))
+>bar : Symbol(bar, Decl(keyofAndIndexedAccess.ts, 107, 22))
 }
 
 class Component<PropType> {
->Component : Symbol(Component, Decl(keyofAndIndexedAccess.ts, 109, 1))
->PropType : Symbol(PropType, Decl(keyofAndIndexedAccess.ts, 111, 16))
+>Component : Symbol(Component, Decl(keyofAndIndexedAccess.ts, 111, 1))
+>PropType : Symbol(PropType, Decl(keyofAndIndexedAccess.ts, 113, 16))
 
     props: PropType;
->props : Symbol(Component.props, Decl(keyofAndIndexedAccess.ts, 111, 27))
->PropType : Symbol(PropType, Decl(keyofAndIndexedAccess.ts, 111, 16))
+>props : Symbol(Component.props, Decl(keyofAndIndexedAccess.ts, 113, 27))
+>PropType : Symbol(PropType, Decl(keyofAndIndexedAccess.ts, 113, 16))
 
     getProperty<K extends keyof PropType>(key: K) {
->getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 112, 20))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 113, 16))
->PropType : Symbol(PropType, Decl(keyofAndIndexedAccess.ts, 111, 16))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 113, 42))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 113, 16))
+>getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 114, 20))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 115, 16))
+>PropType : Symbol(PropType, Decl(keyofAndIndexedAccess.ts, 113, 16))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 115, 42))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 115, 16))
 
         return this.props[key];
->this.props : Symbol(Component.props, Decl(keyofAndIndexedAccess.ts, 111, 27))
->this : Symbol(Component, Decl(keyofAndIndexedAccess.ts, 109, 1))
->props : Symbol(Component.props, Decl(keyofAndIndexedAccess.ts, 111, 27))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 113, 42))
+>this.props : Symbol(Component.props, Decl(keyofAndIndexedAccess.ts, 113, 27))
+>this : Symbol(Component, Decl(keyofAndIndexedAccess.ts, 111, 1))
+>props : Symbol(Component.props, Decl(keyofAndIndexedAccess.ts, 113, 27))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 115, 42))
     }
     setProperty<K extends keyof PropType>(key: K, value: PropType[K]) {
->setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 115, 5))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 116, 16))
->PropType : Symbol(PropType, Decl(keyofAndIndexedAccess.ts, 111, 16))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 116, 42))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 116, 16))
->value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 116, 49))
->PropType : Symbol(PropType, Decl(keyofAndIndexedAccess.ts, 111, 16))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 116, 16))
+>setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 117, 5))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 118, 16))
+>PropType : Symbol(PropType, Decl(keyofAndIndexedAccess.ts, 113, 16))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 118, 42))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 118, 16))
+>value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 118, 49))
+>PropType : Symbol(PropType, Decl(keyofAndIndexedAccess.ts, 113, 16))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 118, 16))
 
         this.props[key] = value;
->this.props : Symbol(Component.props, Decl(keyofAndIndexedAccess.ts, 111, 27))
->this : Symbol(Component, Decl(keyofAndIndexedAccess.ts, 109, 1))
->props : Symbol(Component.props, Decl(keyofAndIndexedAccess.ts, 111, 27))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 116, 42))
->value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 116, 49))
+>this.props : Symbol(Component.props, Decl(keyofAndIndexedAccess.ts, 113, 27))
+>this : Symbol(Component, Decl(keyofAndIndexedAccess.ts, 111, 1))
+>props : Symbol(Component.props, Decl(keyofAndIndexedAccess.ts, 113, 27))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 118, 42))
+>value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 118, 49))
     }
 }
 
 function f20(component: Component<Shape>) {
->f20 : Symbol(f20, Decl(keyofAndIndexedAccess.ts, 119, 1))
->component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 121, 13))
->Component : Symbol(Component, Decl(keyofAndIndexedAccess.ts, 109, 1))
+>f20 : Symbol(f20, Decl(keyofAndIndexedAccess.ts, 121, 1))
+>component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 123, 13))
+>Component : Symbol(Component, Decl(keyofAndIndexedAccess.ts, 111, 1))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 
     let name = component.getProperty("name");  // string
->name : Symbol(name, Decl(keyofAndIndexedAccess.ts, 122, 7))
->component.getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 112, 20))
->component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 121, 13))
->getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 112, 20))
+>name : Symbol(name, Decl(keyofAndIndexedAccess.ts, 124, 7))
+>component.getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 114, 20))
+>component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 123, 13))
+>getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 114, 20))
 
     let widthOrHeight = component.getProperty(cond ? "width" : "height");  // number
->widthOrHeight : Symbol(widthOrHeight, Decl(keyofAndIndexedAccess.ts, 123, 7))
->component.getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 112, 20))
->component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 121, 13))
->getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 112, 20))
->cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 75, 11))
+>widthOrHeight : Symbol(widthOrHeight, Decl(keyofAndIndexedAccess.ts, 125, 7))
+>component.getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 114, 20))
+>component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 123, 13))
+>getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 114, 20))
+>cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 77, 11))
 
     let nameOrVisible = component.getProperty(cond ? "name" : "visible");  // string | boolean
->nameOrVisible : Symbol(nameOrVisible, Decl(keyofAndIndexedAccess.ts, 124, 7))
->component.getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 112, 20))
->component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 121, 13))
->getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 112, 20))
->cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 75, 11))
+>nameOrVisible : Symbol(nameOrVisible, Decl(keyofAndIndexedAccess.ts, 126, 7))
+>component.getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 114, 20))
+>component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 123, 13))
+>getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 114, 20))
+>cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 77, 11))
 
     component.setProperty("name", "rectangle");
->component.setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 115, 5))
->component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 121, 13))
->setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 115, 5))
+>component.setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 117, 5))
+>component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 123, 13))
+>setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 117, 5))
 
     component.setProperty(cond ? "width" : "height", 10)
->component.setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 115, 5))
->component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 121, 13))
->setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 115, 5))
->cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 75, 11))
+>component.setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 117, 5))
+>component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 123, 13))
+>setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 117, 5))
+>cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 77, 11))
 
     component.setProperty(cond ? "name" : "visible", true);  // Technically not safe
->component.setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 115, 5))
->component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 121, 13))
->setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 115, 5))
->cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 75, 11))
+>component.setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 117, 5))
+>component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 123, 13))
+>setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 117, 5))
+>cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 77, 11))
 }
 
 function pluck<T, K extends keyof T>(array: T[], key: K) {
->pluck : Symbol(pluck, Decl(keyofAndIndexedAccess.ts, 128, 1))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 130, 15))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 130, 17))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 130, 15))
->array : Symbol(array, Decl(keyofAndIndexedAccess.ts, 130, 37))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 130, 15))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 130, 48))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 130, 17))
+>pluck : Symbol(pluck, Decl(keyofAndIndexedAccess.ts, 130, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 132, 15))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 132, 17))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 132, 15))
+>array : Symbol(array, Decl(keyofAndIndexedAccess.ts, 132, 37))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 132, 15))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 132, 48))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 132, 17))
 
     return array.map(x => x[key]);
 >array.map : Symbol(Array.map, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->array : Symbol(array, Decl(keyofAndIndexedAccess.ts, 130, 37))
+>array : Symbol(array, Decl(keyofAndIndexedAccess.ts, 132, 37))
 >map : Symbol(Array.map, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 131, 21))
->x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 131, 21))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 130, 48))
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 133, 21))
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 133, 21))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 132, 48))
 }
 
 function f30(shapes: Shape[]) {
->f30 : Symbol(f30, Decl(keyofAndIndexedAccess.ts, 132, 1))
->shapes : Symbol(shapes, Decl(keyofAndIndexedAccess.ts, 134, 13))
+>f30 : Symbol(f30, Decl(keyofAndIndexedAccess.ts, 134, 1))
+>shapes : Symbol(shapes, Decl(keyofAndIndexedAccess.ts, 136, 13))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 
     let names = pluck(shapes, "name");    // string[]
->names : Symbol(names, Decl(keyofAndIndexedAccess.ts, 135, 7))
->pluck : Symbol(pluck, Decl(keyofAndIndexedAccess.ts, 128, 1))
->shapes : Symbol(shapes, Decl(keyofAndIndexedAccess.ts, 134, 13))
+>names : Symbol(names, Decl(keyofAndIndexedAccess.ts, 137, 7))
+>pluck : Symbol(pluck, Decl(keyofAndIndexedAccess.ts, 130, 1))
+>shapes : Symbol(shapes, Decl(keyofAndIndexedAccess.ts, 136, 13))
 
     let widths = pluck(shapes, "width");  // number[]
->widths : Symbol(widths, Decl(keyofAndIndexedAccess.ts, 136, 7))
->pluck : Symbol(pluck, Decl(keyofAndIndexedAccess.ts, 128, 1))
->shapes : Symbol(shapes, Decl(keyofAndIndexedAccess.ts, 134, 13))
+>widths : Symbol(widths, Decl(keyofAndIndexedAccess.ts, 138, 7))
+>pluck : Symbol(pluck, Decl(keyofAndIndexedAccess.ts, 130, 1))
+>shapes : Symbol(shapes, Decl(keyofAndIndexedAccess.ts, 136, 13))
 
     let nameOrVisibles = pluck(shapes, cond ? "name" : "visible");  // (string | boolean)[]
->nameOrVisibles : Symbol(nameOrVisibles, Decl(keyofAndIndexedAccess.ts, 137, 7))
->pluck : Symbol(pluck, Decl(keyofAndIndexedAccess.ts, 128, 1))
->shapes : Symbol(shapes, Decl(keyofAndIndexedAccess.ts, 134, 13))
->cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 75, 11))
+>nameOrVisibles : Symbol(nameOrVisibles, Decl(keyofAndIndexedAccess.ts, 139, 7))
+>pluck : Symbol(pluck, Decl(keyofAndIndexedAccess.ts, 130, 1))
+>shapes : Symbol(shapes, Decl(keyofAndIndexedAccess.ts, 136, 13))
+>cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 77, 11))
 }
 
 function f31<K extends keyof Shape>(key: K) {
->f31 : Symbol(f31, Decl(keyofAndIndexedAccess.ts, 138, 1))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 140, 13))
+>f31 : Symbol(f31, Decl(keyofAndIndexedAccess.ts, 140, 1))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 142, 13))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 140, 36))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 140, 13))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 142, 36))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 142, 13))
 
     const shape: Shape = { name: "foo", width: 5, height: 10, visible: true };
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 141, 9))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 143, 9))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
->name : Symbol(name, Decl(keyofAndIndexedAccess.ts, 141, 26))
->width : Symbol(width, Decl(keyofAndIndexedAccess.ts, 141, 39))
->height : Symbol(height, Decl(keyofAndIndexedAccess.ts, 141, 49))
->visible : Symbol(visible, Decl(keyofAndIndexedAccess.ts, 141, 61))
+>name : Symbol(name, Decl(keyofAndIndexedAccess.ts, 143, 26))
+>width : Symbol(width, Decl(keyofAndIndexedAccess.ts, 143, 39))
+>height : Symbol(height, Decl(keyofAndIndexedAccess.ts, 143, 49))
+>visible : Symbol(visible, Decl(keyofAndIndexedAccess.ts, 143, 61))
 
     return shape[key];  // Shape[K]
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 141, 9))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 140, 36))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 143, 9))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 142, 36))
 }
 
 function f32<K extends "width" | "height">(key: K) {
->f32 : Symbol(f32, Decl(keyofAndIndexedAccess.ts, 143, 1))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 145, 13))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 145, 43))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 145, 13))
+>f32 : Symbol(f32, Decl(keyofAndIndexedAccess.ts, 145, 1))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 147, 13))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 147, 43))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 147, 13))
 
     const shape: Shape = { name: "foo", width: 5, height: 10, visible: true };
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 146, 9))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 148, 9))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
->name : Symbol(name, Decl(keyofAndIndexedAccess.ts, 146, 26))
->width : Symbol(width, Decl(keyofAndIndexedAccess.ts, 146, 39))
->height : Symbol(height, Decl(keyofAndIndexedAccess.ts, 146, 49))
->visible : Symbol(visible, Decl(keyofAndIndexedAccess.ts, 146, 61))
+>name : Symbol(name, Decl(keyofAndIndexedAccess.ts, 148, 26))
+>width : Symbol(width, Decl(keyofAndIndexedAccess.ts, 148, 39))
+>height : Symbol(height, Decl(keyofAndIndexedAccess.ts, 148, 49))
+>visible : Symbol(visible, Decl(keyofAndIndexedAccess.ts, 148, 61))
 
     return shape[key];  // Shape[K]
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 146, 9))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 145, 43))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 148, 9))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 147, 43))
 }
 
 function f33<S extends Shape, K extends keyof S>(shape: S, key: K) {
->f33 : Symbol(f33, Decl(keyofAndIndexedAccess.ts, 148, 1))
->S : Symbol(S, Decl(keyofAndIndexedAccess.ts, 150, 13))
+>f33 : Symbol(f33, Decl(keyofAndIndexedAccess.ts, 150, 1))
+>S : Symbol(S, Decl(keyofAndIndexedAccess.ts, 152, 13))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 150, 29))
->S : Symbol(S, Decl(keyofAndIndexedAccess.ts, 150, 13))
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 150, 49))
->S : Symbol(S, Decl(keyofAndIndexedAccess.ts, 150, 13))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 150, 58))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 150, 29))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 152, 29))
+>S : Symbol(S, Decl(keyofAndIndexedAccess.ts, 152, 13))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 152, 49))
+>S : Symbol(S, Decl(keyofAndIndexedAccess.ts, 152, 13))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 152, 58))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 152, 29))
 
     let name = getProperty(shape, "name");
->name : Symbol(name, Decl(keyofAndIndexedAccess.ts, 151, 7))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 150, 49))
+>name : Symbol(name, Decl(keyofAndIndexedAccess.ts, 153, 7))
+>getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 77, 26))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 152, 49))
 
     let prop = getProperty(shape, key);
->prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 152, 7))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 150, 49))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 150, 58))
+>prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 154, 7))
+>getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 77, 26))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 152, 49))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 152, 58))
 
     return prop;
->prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 152, 7))
+>prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 154, 7))
 }
 
 function f34(ts: TaggedShape) {
->f34 : Symbol(f34, Decl(keyofAndIndexedAccess.ts, 154, 1))
->ts : Symbol(ts, Decl(keyofAndIndexedAccess.ts, 156, 13))
+>f34 : Symbol(f34, Decl(keyofAndIndexedAccess.ts, 156, 1))
+>ts : Symbol(ts, Decl(keyofAndIndexedAccess.ts, 158, 13))
 >TaggedShape : Symbol(TaggedShape, Decl(keyofAndIndexedAccess.ts, 6, 1))
 
     let tag1 = f33(ts, "tag");
->tag1 : Symbol(tag1, Decl(keyofAndIndexedAccess.ts, 157, 7))
->f33 : Symbol(f33, Decl(keyofAndIndexedAccess.ts, 148, 1))
->ts : Symbol(ts, Decl(keyofAndIndexedAccess.ts, 156, 13))
+>tag1 : Symbol(tag1, Decl(keyofAndIndexedAccess.ts, 159, 7))
+>f33 : Symbol(f33, Decl(keyofAndIndexedAccess.ts, 150, 1))
+>ts : Symbol(ts, Decl(keyofAndIndexedAccess.ts, 158, 13))
 
     let tag2 = getProperty(ts, "tag");
->tag2 : Symbol(tag2, Decl(keyofAndIndexedAccess.ts, 158, 7))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->ts : Symbol(ts, Decl(keyofAndIndexedAccess.ts, 156, 13))
+>tag2 : Symbol(tag2, Decl(keyofAndIndexedAccess.ts, 160, 7))
+>getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 77, 26))
+>ts : Symbol(ts, Decl(keyofAndIndexedAccess.ts, 158, 13))
 }
 
 class C {
->C : Symbol(C, Decl(keyofAndIndexedAccess.ts, 159, 1))
+>C : Symbol(C, Decl(keyofAndIndexedAccess.ts, 161, 1))
 
     public x: string;
->x : Symbol(C.x, Decl(keyofAndIndexedAccess.ts, 161, 9))
+>x : Symbol(C.x, Decl(keyofAndIndexedAccess.ts, 163, 9))
 
     protected y: string;
->y : Symbol(C.y, Decl(keyofAndIndexedAccess.ts, 162, 21))
+>y : Symbol(C.y, Decl(keyofAndIndexedAccess.ts, 164, 21))
 
     private z: string;
->z : Symbol(C.z, Decl(keyofAndIndexedAccess.ts, 163, 24))
+>z : Symbol(C.z, Decl(keyofAndIndexedAccess.ts, 165, 24))
 }
 
 // Indexed access expressions have always permitted access to private and protected members.
 // For consistency we also permit such access in indexed access types.
 function f40(c: C) {
->f40 : Symbol(f40, Decl(keyofAndIndexedAccess.ts, 165, 1))
->c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 169, 13))
->C : Symbol(C, Decl(keyofAndIndexedAccess.ts, 159, 1))
+>f40 : Symbol(f40, Decl(keyofAndIndexedAccess.ts, 167, 1))
+>c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 171, 13))
+>C : Symbol(C, Decl(keyofAndIndexedAccess.ts, 161, 1))
 
     type X = C["x"];
->X : Symbol(X, Decl(keyofAndIndexedAccess.ts, 169, 20))
->C : Symbol(C, Decl(keyofAndIndexedAccess.ts, 159, 1))
+>X : Symbol(X, Decl(keyofAndIndexedAccess.ts, 171, 20))
+>C : Symbol(C, Decl(keyofAndIndexedAccess.ts, 161, 1))
 
     type Y = C["y"];
->Y : Symbol(Y, Decl(keyofAndIndexedAccess.ts, 170, 20))
->C : Symbol(C, Decl(keyofAndIndexedAccess.ts, 159, 1))
+>Y : Symbol(Y, Decl(keyofAndIndexedAccess.ts, 172, 20))
+>C : Symbol(C, Decl(keyofAndIndexedAccess.ts, 161, 1))
 
     type Z = C["z"];
->Z : Symbol(Z, Decl(keyofAndIndexedAccess.ts, 171, 20))
->C : Symbol(C, Decl(keyofAndIndexedAccess.ts, 159, 1))
+>Z : Symbol(Z, Decl(keyofAndIndexedAccess.ts, 173, 20))
+>C : Symbol(C, Decl(keyofAndIndexedAccess.ts, 161, 1))
 
     let x: X = c["x"];
->x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 173, 7))
->X : Symbol(X, Decl(keyofAndIndexedAccess.ts, 169, 20))
->c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 169, 13))
->"x" : Symbol(C.x, Decl(keyofAndIndexedAccess.ts, 161, 9))
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 175, 7))
+>X : Symbol(X, Decl(keyofAndIndexedAccess.ts, 171, 20))
+>c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 171, 13))
+>"x" : Symbol(C.x, Decl(keyofAndIndexedAccess.ts, 163, 9))
 
     let y: Y = c["y"];
->y : Symbol(y, Decl(keyofAndIndexedAccess.ts, 174, 7))
->Y : Symbol(Y, Decl(keyofAndIndexedAccess.ts, 170, 20))
->c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 169, 13))
->"y" : Symbol(C.y, Decl(keyofAndIndexedAccess.ts, 162, 21))
+>y : Symbol(y, Decl(keyofAndIndexedAccess.ts, 176, 7))
+>Y : Symbol(Y, Decl(keyofAndIndexedAccess.ts, 172, 20))
+>c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 171, 13))
+>"y" : Symbol(C.y, Decl(keyofAndIndexedAccess.ts, 164, 21))
 
     let z: Z = c["z"];
->z : Symbol(z, Decl(keyofAndIndexedAccess.ts, 175, 7))
->Z : Symbol(Z, Decl(keyofAndIndexedAccess.ts, 171, 20))
->c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 169, 13))
->"z" : Symbol(C.z, Decl(keyofAndIndexedAccess.ts, 163, 24))
+>z : Symbol(z, Decl(keyofAndIndexedAccess.ts, 177, 7))
+>Z : Symbol(Z, Decl(keyofAndIndexedAccess.ts, 173, 20))
+>c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 171, 13))
+>"z" : Symbol(C.z, Decl(keyofAndIndexedAccess.ts, 165, 24))
 }
 
 function f50<T>(k: keyof T, s: string) {
->f50 : Symbol(f50, Decl(keyofAndIndexedAccess.ts, 176, 1))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 178, 13))
->k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 178, 16))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 178, 13))
->s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 178, 27))
+>f50 : Symbol(f50, Decl(keyofAndIndexedAccess.ts, 178, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 180, 13))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 180, 16))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 180, 13))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 180, 27))
 
     const x1 = s as keyof T;
->x1 : Symbol(x1, Decl(keyofAndIndexedAccess.ts, 179, 9))
->s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 178, 27))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 178, 13))
+>x1 : Symbol(x1, Decl(keyofAndIndexedAccess.ts, 181, 9))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 180, 27))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 180, 13))
 
     const x2 = k as string;
->x2 : Symbol(x2, Decl(keyofAndIndexedAccess.ts, 180, 9))
->k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 178, 16))
+>x2 : Symbol(x2, Decl(keyofAndIndexedAccess.ts, 182, 9))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 180, 16))
 }
 
 function f51<T, K extends keyof T>(k: K, s: string) {
->f51 : Symbol(f51, Decl(keyofAndIndexedAccess.ts, 181, 1))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 183, 13))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 183, 15))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 183, 13))
->k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 183, 35))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 183, 15))
->s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 183, 40))
+>f51 : Symbol(f51, Decl(keyofAndIndexedAccess.ts, 183, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 185, 13))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 185, 15))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 185, 13))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 185, 35))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 185, 15))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 185, 40))
 
     const x1 = s as keyof T;
->x1 : Symbol(x1, Decl(keyofAndIndexedAccess.ts, 184, 9))
->s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 183, 40))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 183, 13))
+>x1 : Symbol(x1, Decl(keyofAndIndexedAccess.ts, 186, 9))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 185, 40))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 185, 13))
 
     const x2 = k as string;
->x2 : Symbol(x2, Decl(keyofAndIndexedAccess.ts, 185, 9))
->k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 183, 35))
+>x2 : Symbol(x2, Decl(keyofAndIndexedAccess.ts, 187, 9))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 185, 35))
 }
 
 function f52<T>(obj: { [x: string]: boolean }, k: keyof T, s: string, n: number) {
->f52 : Symbol(f52, Decl(keyofAndIndexedAccess.ts, 186, 1))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 188, 13))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 188, 16))
->x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 188, 24))
->k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 188, 46))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 188, 13))
->s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 188, 58))
->n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 188, 69))
+>f52 : Symbol(f52, Decl(keyofAndIndexedAccess.ts, 188, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 190, 13))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 190, 16))
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 190, 24))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 190, 46))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 190, 13))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 190, 58))
+>n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 190, 69))
 
     const x1 = obj[s];
->x1 : Symbol(x1, Decl(keyofAndIndexedAccess.ts, 189, 9))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 188, 16))
->s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 188, 58))
+>x1 : Symbol(x1, Decl(keyofAndIndexedAccess.ts, 191, 9))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 190, 16))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 190, 58))
 
     const x2 = obj[n];
->x2 : Symbol(x2, Decl(keyofAndIndexedAccess.ts, 190, 9))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 188, 16))
->n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 188, 69))
+>x2 : Symbol(x2, Decl(keyofAndIndexedAccess.ts, 192, 9))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 190, 16))
+>n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 190, 69))
 
     const x3 = obj[k];
->x3 : Symbol(x3, Decl(keyofAndIndexedAccess.ts, 191, 9))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 188, 16))
->k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 188, 46))
+>x3 : Symbol(x3, Decl(keyofAndIndexedAccess.ts, 193, 9))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 190, 16))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 190, 46))
 }
 
 function f53<T, K extends keyof T>(obj: { [x: string]: boolean }, k: K, s: string, n: number) {
->f53 : Symbol(f53, Decl(keyofAndIndexedAccess.ts, 192, 1))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 194, 13))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 194, 15))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 194, 13))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 194, 35))
->x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 194, 43))
->k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 194, 65))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 194, 15))
->s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 194, 71))
->n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 194, 82))
+>f53 : Symbol(f53, Decl(keyofAndIndexedAccess.ts, 194, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 196, 13))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 196, 15))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 196, 13))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 196, 35))
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 196, 43))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 196, 65))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 196, 15))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 196, 71))
+>n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 196, 82))
 
     const x1 = obj[s];
->x1 : Symbol(x1, Decl(keyofAndIndexedAccess.ts, 195, 9))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 194, 35))
->s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 194, 71))
+>x1 : Symbol(x1, Decl(keyofAndIndexedAccess.ts, 197, 9))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 196, 35))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 196, 71))
 
     const x2 = obj[n];
->x2 : Symbol(x2, Decl(keyofAndIndexedAccess.ts, 196, 9))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 194, 35))
->n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 194, 82))
+>x2 : Symbol(x2, Decl(keyofAndIndexedAccess.ts, 198, 9))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 196, 35))
+>n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 196, 82))
 
     const x3 = obj[k];
->x3 : Symbol(x3, Decl(keyofAndIndexedAccess.ts, 197, 9))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 194, 35))
->k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 194, 65))
+>x3 : Symbol(x3, Decl(keyofAndIndexedAccess.ts, 199, 9))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 196, 35))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 196, 65))
 }
 
 function f54<T>(obj: T, key: keyof T) {
->f54 : Symbol(f54, Decl(keyofAndIndexedAccess.ts, 198, 1))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 200, 13))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 200, 16))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 200, 13))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 200, 23))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 200, 13))
+>f54 : Symbol(f54, Decl(keyofAndIndexedAccess.ts, 200, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 202, 13))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 202, 16))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 202, 13))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 202, 23))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 202, 13))
 
     for (let s in obj[key]) {
->s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 201, 12))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 200, 16))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 200, 23))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 203, 12))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 202, 16))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 202, 23))
     }
     const b = "foo" in obj[key];
->b : Symbol(b, Decl(keyofAndIndexedAccess.ts, 203, 9))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 200, 16))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 200, 23))
+>b : Symbol(b, Decl(keyofAndIndexedAccess.ts, 205, 9))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 202, 16))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 202, 23))
 }
 
 function f55<T, K extends keyof T>(obj: T, key: K) {
->f55 : Symbol(f55, Decl(keyofAndIndexedAccess.ts, 204, 1))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 206, 13))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 206, 15))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 206, 13))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 206, 35))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 206, 13))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 206, 42))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 206, 15))
+>f55 : Symbol(f55, Decl(keyofAndIndexedAccess.ts, 206, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 208, 13))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 208, 15))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 208, 13))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 208, 35))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 208, 13))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 208, 42))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 208, 15))
 
     for (let s in obj[key]) {
->s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 207, 12))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 206, 35))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 206, 42))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 209, 12))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 208, 35))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 208, 42))
     }
     const b = "foo" in obj[key];
->b : Symbol(b, Decl(keyofAndIndexedAccess.ts, 209, 9))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 206, 35))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 206, 42))
+>b : Symbol(b, Decl(keyofAndIndexedAccess.ts, 211, 9))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 208, 35))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 208, 42))
 }
 
 function f60<T>(source: T, target: T) {
->f60 : Symbol(f60, Decl(keyofAndIndexedAccess.ts, 210, 1))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 212, 13))
->source : Symbol(source, Decl(keyofAndIndexedAccess.ts, 212, 16))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 212, 13))
->target : Symbol(target, Decl(keyofAndIndexedAccess.ts, 212, 26))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 212, 13))
+>f60 : Symbol(f60, Decl(keyofAndIndexedAccess.ts, 212, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 214, 13))
+>source : Symbol(source, Decl(keyofAndIndexedAccess.ts, 214, 16))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 214, 13))
+>target : Symbol(target, Decl(keyofAndIndexedAccess.ts, 214, 26))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 214, 13))
 
     for (let k in source) {
->k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 213, 12))
->source : Symbol(source, Decl(keyofAndIndexedAccess.ts, 212, 16))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 215, 12))
+>source : Symbol(source, Decl(keyofAndIndexedAccess.ts, 214, 16))
 
         target[k] = source[k];
->target : Symbol(target, Decl(keyofAndIndexedAccess.ts, 212, 26))
->k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 213, 12))
->source : Symbol(source, Decl(keyofAndIndexedAccess.ts, 212, 16))
->k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 213, 12))
+>target : Symbol(target, Decl(keyofAndIndexedAccess.ts, 214, 26))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 215, 12))
+>source : Symbol(source, Decl(keyofAndIndexedAccess.ts, 214, 16))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 215, 12))
     }
 }
 
 // Repros from #12011
 
 class Base {
->Base : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 216, 1))
+>Base : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 218, 1))
 
     get<K extends keyof this>(prop: K) {
->get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 220, 12))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 221, 8))
->prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 221, 30))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 221, 8))
+>get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 222, 12))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 223, 8))
+>prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 223, 30))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 223, 8))
 
         return this[prop];
->this : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 216, 1))
->prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 221, 30))
+>this : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 218, 1))
+>prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 223, 30))
     }
     set<K extends keyof this>(prop: K, value: this[K]) {
->set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 223, 5))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 224, 8))
->prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 224, 30))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 224, 8))
->value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 224, 38))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 224, 8))
+>set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 225, 5))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 226, 8))
+>prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 226, 30))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 226, 8))
+>value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 226, 38))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 226, 8))
 
         this[prop] = value;
->this : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 216, 1))
->prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 224, 30))
->value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 224, 38))
+>this : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 218, 1))
+>prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 226, 30))
+>value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 226, 38))
     }
 }
 
 class Person extends Base {
->Person : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 227, 1))
->Base : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 216, 1))
+>Person : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 229, 1))
+>Base : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 218, 1))
 
     parts: number;
->parts : Symbol(Person.parts, Decl(keyofAndIndexedAccess.ts, 229, 27))
+>parts : Symbol(Person.parts, Decl(keyofAndIndexedAccess.ts, 231, 27))
 
     constructor(parts: number) {
->parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 231, 16))
+>parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 233, 16))
 
         super();
->super : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 216, 1))
+>super : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 218, 1))
 
         this.set("parts", parts);
->this.set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 223, 5))
->this : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 227, 1))
->set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 223, 5))
->parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 231, 16))
+>this.set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 225, 5))
+>this : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 229, 1))
+>set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 225, 5))
+>parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 233, 16))
     }
     getParts() {
->getParts : Symbol(Person.getParts, Decl(keyofAndIndexedAccess.ts, 234, 5))
+>getParts : Symbol(Person.getParts, Decl(keyofAndIndexedAccess.ts, 236, 5))
 
         return this.get("parts")
->this.get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 220, 12))
->this : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 227, 1))
->get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 220, 12))
+>this.get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 222, 12))
+>this : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 229, 1))
+>get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 222, 12))
     }
 }
 
 class OtherPerson {
->OtherPerson : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 238, 1))
+>OtherPerson : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 240, 1))
 
     parts: number;
->parts : Symbol(OtherPerson.parts, Decl(keyofAndIndexedAccess.ts, 240, 19))
+>parts : Symbol(OtherPerson.parts, Decl(keyofAndIndexedAccess.ts, 242, 19))
 
     constructor(parts: number) {
->parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 242, 16))
+>parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 244, 16))
 
         setProperty(this, "parts", parts);
->setProperty : Symbol(setProperty, Decl(keyofAndIndexedAccess.ts, 79, 1))
->this : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 238, 1))
->parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 242, 16))
+>setProperty : Symbol(setProperty, Decl(keyofAndIndexedAccess.ts, 81, 1))
+>this : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 240, 1))
+>parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 244, 16))
     }
     getParts() {
->getParts : Symbol(OtherPerson.getParts, Decl(keyofAndIndexedAccess.ts, 244, 5))
+>getParts : Symbol(OtherPerson.getParts, Decl(keyofAndIndexedAccess.ts, 246, 5))
 
         return getProperty(this, "parts")
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->this : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 238, 1))
+>getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 77, 26))
+>this : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 240, 1))
     }
 }
+
diff --git a/tests/baselines/reference/keyofAndIndexedAccess.types b/tests/baselines/reference/keyofAndIndexedAccess.types
index 916b82aaf40..587100496e9 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.types
+++ b/tests/baselines/reference/keyofAndIndexedAccess.types
@@ -47,16 +47,22 @@ type Dictionary<T> = { [x: string]: T };
 >x : string
 >T : T
 
+type NumericallyIndexed<T> = { [x: number]: T };
+>NumericallyIndexed : NumericallyIndexed<T>
+>T : T
+>x : number
+>T : T
+
 const enum E { A, B, C }
 >E : E
 >A : E.A
 >B : E.B
 >C : E.C
 
-type K00 = keyof any;  // string | number
+type K00 = keyof any;  // string
 >K00 : string
 
-type K01 = keyof string;  // number | "toString" | "charAt" | ...
+type K01 = keyof string;  // "toString" | "charAt" | ...
 >K01 : "length" | "toString" | "concat" | "slice" | "indexOf" | "lastIndexOf" | "charAt" | "charCodeAt" | "localeCompare" | "match" | "replace" | "search" | "split" | "substring" | "toLowerCase" | "toLocaleLowerCase" | "toUpperCase" | "toLocaleUpperCase" | "trim" | "substr" | "valueOf"
 
 type K02 = keyof number;  // "toString" | "toFixed" | "toExponential" | ...
@@ -82,11 +88,11 @@ type K10 = keyof Shape;  // "name" | "width" | "height" | "visible"
 >K10 : "name" | "width" | "height" | "visible"
 >Shape : Shape
 
-type K11 = keyof Shape[];  // number | "length" | "toString" | ...
+type K11 = keyof Shape[];  // "length" | "toString" | ...
 >K11 : "length" | "toString" | "toLocaleString" | "push" | "pop" | "concat" | "join" | "reverse" | "shift" | "slice" | "sort" | "splice" | "unshift" | "indexOf" | "lastIndexOf" | "every" | "some" | "forEach" | "map" | "filter" | "reduce" | "reduceRight"
 >Shape : Shape
 
-type K12 = keyof Dictionary<Shape>;  // string | number
+type K12 = keyof Dictionary<Shape>;  // string
 >K12 : string
 >Dictionary : Dictionary<T>
 >Shape : Shape
@@ -102,7 +108,7 @@ type K15 = keyof E;  // "toString" | "toFixed" | "toExponential" | ...
 >K15 : "toString" | "toLocaleString" | "valueOf" | "toFixed" | "toExponential" | "toPrecision"
 >E : E
 
-type K16 = keyof [string, number];  // number | "0" | "1" | "length" | "toString" | ...
+type K16 = keyof [string, number];  // "0" | "1" | "length" | "toString" | ...
 >K16 : "0" | "1" | "length" | "toString" | "toLocaleString" | "push" | "pop" | "concat" | "join" | "reverse" | "shift" | "slice" | "sort" | "splice" | "unshift" | "indexOf" | "lastIndexOf" | "every" | "some" | "forEach" | "map" | "filter" | "reduce" | "reduceRight"
 
 type K17 = keyof (Shape | Item);  // "name"
@@ -115,6 +121,11 @@ type K18 = keyof (Shape & Item);  // "name" | "width" | "height" | "visible" | "
 >Shape : Shape
 >Item : Item
 
+type K19 = keyof NumericallyIndexed<Shape> // never
+>K19 : never
+>NumericallyIndexed : NumericallyIndexed<T>
+>Shape : Shape
+
 type KeyOf<T> = keyof T;
 >KeyOf : keyof T
 >T : T
@@ -125,7 +136,7 @@ type K20 = KeyOf<Shape>;  // "name" | "width" | "height" | "visible"
 >KeyOf : keyof T
 >Shape : Shape
 
-type K21 = KeyOf<Dictionary<Shape>>;  // string | number
+type K21 = KeyOf<Dictionary<Shape>>;  // string
 >K21 : string
 >KeyOf : keyof T
 >Dictionary : Dictionary<T>
@@ -970,3 +981,4 @@ class OtherPerson {
 >"parts" : "parts"
     }
 }
+
diff --git a/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts b/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
index b0451b8d55c..9aa05798607 100644
--- a/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
+++ b/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
@@ -21,11 +21,12 @@ class Options {
 }
 
 type Dictionary<T> = { [x: string]: T };
+type NumericallyIndexed<T> = { [x: number]: T };
 
 const enum E { A, B, C }
 
-type K00 = keyof any;  // string | number
-type K01 = keyof string;  // number | "toString" | "charAt" | ...
+type K00 = keyof any;  // string
+type K01 = keyof string;  // "toString" | "charAt" | ...
 type K02 = keyof number;  // "toString" | "toFixed" | "toExponential" | ...
 type K03 = keyof boolean;  // "valueOf"
 type K04 = keyof void;  // never
@@ -34,19 +35,20 @@ type K06 = keyof null;  // never
 type K07 = keyof never;  // never
 
 type K10 = keyof Shape;  // "name" | "width" | "height" | "visible"
-type K11 = keyof Shape[];  // number | "length" | "toString" | ...
-type K12 = keyof Dictionary<Shape>;  // string | number
+type K11 = keyof Shape[];  // "length" | "toString" | ...
+type K12 = keyof Dictionary<Shape>;  // string
 type K13 = keyof {};  // never
 type K14 = keyof Object;  // "constructor" | "toString" | ...
 type K15 = keyof E;  // "toString" | "toFixed" | "toExponential" | ...
-type K16 = keyof [string, number];  // number | "0" | "1" | "length" | "toString" | ...
+type K16 = keyof [string, number];  // "0" | "1" | "length" | "toString" | ...
 type K17 = keyof (Shape | Item);  // "name"
 type K18 = keyof (Shape & Item);  // "name" | "width" | "height" | "visible" | "price"
+type K19 = keyof NumericallyIndexed<Shape> // never
 
 type KeyOf<T> = keyof T;
 
 type K20 = KeyOf<Shape>;  // "name" | "width" | "height" | "visible"
-type K21 = KeyOf<Dictionary<Shape>>;  // string | number
+type K21 = KeyOf<Dictionary<Shape>>;  // string
 
 type NAME = "name";
 type WIDTH_OR_HEIGHT = "width" | "height";
@@ -247,4 +249,4 @@ class OtherPerson {
     getParts() {
         return getProperty(this, "parts")
     }
-}
\ No newline at end of file
+}

From 3e1b443d77f732c402be3241190704933c0bf892 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Mon, 28 Nov 2016 09:34:50 -0800
Subject: [PATCH 357/421] Deduplicate intersection types before distributing
 over union types

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index e016d493046..7101d0b3d61 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -5637,6 +5637,7 @@ namespace ts {
             containsString?: boolean;
             containsNumber?: boolean;
             containsStringOrNumberLiteral?: boolean;
+            unionIndex?: number;
         }
 
         function binarySearchTypes(types: Type[], type: Type): number {
@@ -5831,6 +5832,9 @@ namespace ts {
                 typeSet.containsAny = true;
             }
             else if (!(type.flags & TypeFlags.Never) && (strictNullChecks || !(type.flags & TypeFlags.Nullable)) && !contains(typeSet, type)) {
+                if (type.flags & TypeFlags.Union && typeSet.unionIndex === undefined) {
+                    typeSet.unionIndex = typeSet.length;
+                }
                 typeSet.push(type);
             }
         }
@@ -5857,15 +5861,6 @@ namespace ts {
             if (types.length === 0) {
                 return emptyObjectType;
             }
-            for (let i = 0; i < types.length; i++) {
-                const type = types[i];
-                if (type.flags & TypeFlags.Union) {
-                    // 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.
-                    return getUnionType(map((<UnionType>type).types, t => getIntersectionType(replaceElement(types, i, t))),
-                        /*subtypeReduction*/ false, aliasSymbol, aliasTypeArguments);
-                }
-            }
             const typeSet = [] as TypeSet;
             addTypesToIntersection(typeSet, types);
             if (typeSet.containsAny) {
@@ -5874,6 +5869,14 @@ namespace ts {
             if (typeSet.length === 1) {
                 return typeSet[0];
             }
+            const unionIndex = typeSet.unionIndex;
+            if (unionIndex !== undefined) {
+                // 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.
+                const unionType = <UnionType>typeSet[unionIndex];
+                return getUnionType(map(unionType.types, t => getIntersectionType(replaceElement(typeSet, unionIndex, t))),
+                    /*subtypeReduction*/ false, aliasSymbol, aliasTypeArguments);
+            }
             const id = getTypeListId(typeSet);
             let type = intersectionTypes[id];
             if (!type) {

From 0be4edefca502037390f0eaee3cd88823a4e3556 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Mon, 28 Nov 2016 09:35:03 -0800
Subject: [PATCH 358/421] Add regression test

---
 .../intersectionTypeNormalization.js          |  50 ++++++++
 .../intersectionTypeNormalization.symbols     | 110 +++++++++++++++++
 .../intersectionTypeNormalization.types       | 111 ++++++++++++++++++
 .../compiler/intersectionTypeNormalization.ts |  45 +++++++
 4 files changed, 316 insertions(+)

diff --git a/tests/baselines/reference/intersectionTypeNormalization.js b/tests/baselines/reference/intersectionTypeNormalization.js
index 8309b17f198..f6eea23e98e 100644
--- a/tests/baselines/reference/intersectionTypeNormalization.js
+++ b/tests/baselines/reference/intersectionTypeNormalization.js
@@ -58,6 +58,51 @@ function getValueAsString(value: IntersectionFail): string {
         return '' + value.num;
     }
     return value.str;
+}
+
+// Repro from #12535
+
+namespace enums {
+    export const enum A {
+        a1,
+        a2,
+        a3,
+       // ... elements omitted for the sake of clarity
+        a75,
+        a76,
+        a77,
+    }
+    export const enum B {
+        b1,
+        b2,
+       // ... elements omitted for the sake of clarity
+        b86,
+        b87,
+    }
+    export const enum C {
+        c1,
+        c2,
+       // ... elements omitted for the sake of clarity
+        c210,
+        c211,
+    }
+    export type Genre = A | B | C;
+}
+
+type Foo = {
+    genreId: enums.Genre;
+};
+
+type Bar = {
+    genreId: enums.Genre;
+};
+
+type FooBar = Foo & Bar;
+
+function foo(so: any) {
+    const val = so as FooBar;
+    const isGenre = val.genreId;
+    return isGenre;
 }
 
 //// [intersectionTypeNormalization.js]
@@ -77,3 +122,8 @@ function getValueAsString(value) {
     }
     return value.str;
 }
+function foo(so) {
+    var val = so;
+    var isGenre = val.genreId;
+    return isGenre;
+}
diff --git a/tests/baselines/reference/intersectionTypeNormalization.symbols b/tests/baselines/reference/intersectionTypeNormalization.symbols
index a5a00c70407..fd81eac6d18 100644
--- a/tests/baselines/reference/intersectionTypeNormalization.symbols
+++ b/tests/baselines/reference/intersectionTypeNormalization.symbols
@@ -240,3 +240,113 @@ function getValueAsString(value: IntersectionFail): string {
 >value : Symbol(value, Decl(intersectionTypeNormalization.ts, 54, 26))
 >str : Symbol(str, Decl(intersectionTypeNormalization.ts, 47, 35))
 }
+
+// Repro from #12535
+
+namespace enums {
+>enums : Symbol(enums, Decl(intersectionTypeNormalization.ts, 59, 1))
+
+    export const enum A {
+>A : Symbol(A, Decl(intersectionTypeNormalization.ts, 63, 17))
+
+        a1,
+>a1 : Symbol(A.a1, Decl(intersectionTypeNormalization.ts, 64, 25))
+
+        a2,
+>a2 : Symbol(A.a2, Decl(intersectionTypeNormalization.ts, 65, 11))
+
+        a3,
+>a3 : Symbol(A.a3, Decl(intersectionTypeNormalization.ts, 66, 11))
+
+       // ... elements omitted for the sake of clarity
+        a75,
+>a75 : Symbol(A.a75, Decl(intersectionTypeNormalization.ts, 67, 11))
+
+        a76,
+>a76 : Symbol(A.a76, Decl(intersectionTypeNormalization.ts, 69, 12))
+
+        a77,
+>a77 : Symbol(A.a77, Decl(intersectionTypeNormalization.ts, 70, 12))
+    }
+    export const enum B {
+>B : Symbol(B, Decl(intersectionTypeNormalization.ts, 72, 5))
+
+        b1,
+>b1 : Symbol(B.b1, Decl(intersectionTypeNormalization.ts, 73, 25))
+
+        b2,
+>b2 : Symbol(B.b2, Decl(intersectionTypeNormalization.ts, 74, 11))
+
+       // ... elements omitted for the sake of clarity
+        b86,
+>b86 : Symbol(B.b86, Decl(intersectionTypeNormalization.ts, 75, 11))
+
+        b87,
+>b87 : Symbol(B.b87, Decl(intersectionTypeNormalization.ts, 77, 12))
+    }
+    export const enum C {
+>C : Symbol(C, Decl(intersectionTypeNormalization.ts, 79, 5))
+
+        c1,
+>c1 : Symbol(C.c1, Decl(intersectionTypeNormalization.ts, 80, 25))
+
+        c2,
+>c2 : Symbol(C.c2, Decl(intersectionTypeNormalization.ts, 81, 11))
+
+       // ... elements omitted for the sake of clarity
+        c210,
+>c210 : Symbol(C.c210, Decl(intersectionTypeNormalization.ts, 82, 11))
+
+        c211,
+>c211 : Symbol(C.c211, Decl(intersectionTypeNormalization.ts, 84, 13))
+    }
+    export type Genre = A | B | C;
+>Genre : Symbol(Genre, Decl(intersectionTypeNormalization.ts, 86, 5))
+>A : Symbol(A, Decl(intersectionTypeNormalization.ts, 63, 17))
+>B : Symbol(B, Decl(intersectionTypeNormalization.ts, 72, 5))
+>C : Symbol(C, Decl(intersectionTypeNormalization.ts, 79, 5))
+}
+
+type Foo = {
+>Foo : Symbol(Foo, Decl(intersectionTypeNormalization.ts, 88, 1))
+
+    genreId: enums.Genre;
+>genreId : Symbol(genreId, Decl(intersectionTypeNormalization.ts, 90, 12))
+>enums : Symbol(enums, Decl(intersectionTypeNormalization.ts, 59, 1))
+>Genre : Symbol(enums.Genre, Decl(intersectionTypeNormalization.ts, 86, 5))
+
+};
+
+type Bar = {
+>Bar : Symbol(Bar, Decl(intersectionTypeNormalization.ts, 92, 2))
+
+    genreId: enums.Genre;
+>genreId : Symbol(genreId, Decl(intersectionTypeNormalization.ts, 94, 12))
+>enums : Symbol(enums, Decl(intersectionTypeNormalization.ts, 59, 1))
+>Genre : Symbol(enums.Genre, Decl(intersectionTypeNormalization.ts, 86, 5))
+
+};
+
+type FooBar = Foo & Bar;
+>FooBar : Symbol(FooBar, Decl(intersectionTypeNormalization.ts, 96, 2))
+>Foo : Symbol(Foo, Decl(intersectionTypeNormalization.ts, 88, 1))
+>Bar : Symbol(Bar, Decl(intersectionTypeNormalization.ts, 92, 2))
+
+function foo(so: any) {
+>foo : Symbol(foo, Decl(intersectionTypeNormalization.ts, 98, 24))
+>so : Symbol(so, Decl(intersectionTypeNormalization.ts, 100, 13))
+
+    const val = so as FooBar;
+>val : Symbol(val, Decl(intersectionTypeNormalization.ts, 101, 9))
+>so : Symbol(so, Decl(intersectionTypeNormalization.ts, 100, 13))
+>FooBar : Symbol(FooBar, Decl(intersectionTypeNormalization.ts, 96, 2))
+
+    const isGenre = val.genreId;
+>isGenre : Symbol(isGenre, Decl(intersectionTypeNormalization.ts, 102, 9))
+>val.genreId : Symbol(genreId, Decl(intersectionTypeNormalization.ts, 90, 12), Decl(intersectionTypeNormalization.ts, 94, 12))
+>val : Symbol(val, Decl(intersectionTypeNormalization.ts, 101, 9))
+>genreId : Symbol(genreId, Decl(intersectionTypeNormalization.ts, 90, 12), Decl(intersectionTypeNormalization.ts, 94, 12))
+
+    return isGenre;
+>isGenre : Symbol(isGenre, Decl(intersectionTypeNormalization.ts, 102, 9))
+}
diff --git a/tests/baselines/reference/intersectionTypeNormalization.types b/tests/baselines/reference/intersectionTypeNormalization.types
index 99d0ecb1f3a..3ffe7484afe 100644
--- a/tests/baselines/reference/intersectionTypeNormalization.types
+++ b/tests/baselines/reference/intersectionTypeNormalization.types
@@ -244,3 +244,114 @@ function getValueAsString(value: IntersectionFail): string {
 >value : { kind: "string"; str: string; } & ToString
 >str : string
 }
+
+// Repro from #12535
+
+namespace enums {
+>enums : typeof enums
+
+    export const enum A {
+>A : A
+
+        a1,
+>a1 : A.a1
+
+        a2,
+>a2 : A.a2
+
+        a3,
+>a3 : A.a3
+
+       // ... elements omitted for the sake of clarity
+        a75,
+>a75 : A.a75
+
+        a76,
+>a76 : A.a76
+
+        a77,
+>a77 : A.a77
+    }
+    export const enum B {
+>B : B
+
+        b1,
+>b1 : B.b1
+
+        b2,
+>b2 : B.b2
+
+       // ... elements omitted for the sake of clarity
+        b86,
+>b86 : B.b86
+
+        b87,
+>b87 : B.b87
+    }
+    export const enum C {
+>C : C
+
+        c1,
+>c1 : C.c1
+
+        c2,
+>c2 : C.c2
+
+       // ... elements omitted for the sake of clarity
+        c210,
+>c210 : C.c210
+
+        c211,
+>c211 : C.c211
+    }
+    export type Genre = A | B | C;
+>Genre : Genre
+>A : A
+>B : B
+>C : C
+}
+
+type Foo = {
+>Foo : Foo
+
+    genreId: enums.Genre;
+>genreId : enums.Genre
+>enums : any
+>Genre : enums.Genre
+
+};
+
+type Bar = {
+>Bar : Bar
+
+    genreId: enums.Genre;
+>genreId : enums.Genre
+>enums : any
+>Genre : enums.Genre
+
+};
+
+type FooBar = Foo & Bar;
+>FooBar : FooBar
+>Foo : Foo
+>Bar : Bar
+
+function foo(so: any) {
+>foo : (so: any) => enums.Genre
+>so : any
+
+    const val = so as FooBar;
+>val : FooBar
+>so as FooBar : FooBar
+>so : any
+>FooBar : FooBar
+
+    const isGenre = val.genreId;
+>isGenre : enums.Genre
+>val.genreId : enums.Genre
+>val : FooBar
+>genreId : enums.Genre
+
+    return isGenre;
+>isGenre : enums.Genre
+}
diff --git a/tests/cases/compiler/intersectionTypeNormalization.ts b/tests/cases/compiler/intersectionTypeNormalization.ts
index f31c3d49014..3d07aeb1a23 100644
--- a/tests/cases/compiler/intersectionTypeNormalization.ts
+++ b/tests/cases/compiler/intersectionTypeNormalization.ts
@@ -57,4 +57,49 @@ function getValueAsString(value: IntersectionFail): string {
         return '' + value.num;
     }
     return value.str;
+}
+
+// Repro from #12535
+
+namespace enums {
+    export const enum A {
+        a1,
+        a2,
+        a3,
+       // ... elements omitted for the sake of clarity
+        a75,
+        a76,
+        a77,
+    }
+    export const enum B {
+        b1,
+        b2,
+       // ... elements omitted for the sake of clarity
+        b86,
+        b87,
+    }
+    export const enum C {
+        c1,
+        c2,
+       // ... elements omitted for the sake of clarity
+        c210,
+        c211,
+    }
+    export type Genre = A | B | C;
+}
+
+type Foo = {
+    genreId: enums.Genre;
+};
+
+type Bar = {
+    genreId: enums.Genre;
+};
+
+type FooBar = Foo & Bar;
+
+function foo(so: any) {
+    const val = so as FooBar;
+    const isGenre = val.genreId;
+    return isGenre;
 }
\ No newline at end of file

From 9065b501723fbd57a2baa9f1be0a938c85606fd6 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Mon, 28 Nov 2016 10:53:25 -0800
Subject: [PATCH 359/421] getRegularTypeOfLiteralType before exhaustive switch
 check

---
 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 7101d0b3d61..719ba724f42 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -13850,7 +13850,7 @@ namespace ts {
             if (!switchTypes.length) {
                 return false;
             }
-            return eachTypeContainedIn(type, switchTypes);
+            return eachTypeContainedIn(mapType(type, getRegularTypeOfLiteralType), switchTypes);
         }
 
         function functionHasImplicitReturn(func: FunctionLikeDeclaration) {

From 2b0721672ce46cbd42fdfc70656e3ea277ee8c22 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Mon, 28 Nov 2016 11:01:19 -0800
Subject: [PATCH 360/421] Add regression test

---
 ...xhaustiveSwitchWithWideningLiteralTypes.js | 39 ++++++++++++++++++
 ...tiveSwitchWithWideningLiteralTypes.symbols | 33 +++++++++++++++
 ...ustiveSwitchWithWideningLiteralTypes.types | 40 +++++++++++++++++++
 ...xhaustiveSwitchWithWideningLiteralTypes.ts | 18 +++++++++
 4 files changed, 130 insertions(+)
 create mode 100644 tests/baselines/reference/exhaustiveSwitchWithWideningLiteralTypes.js
 create mode 100644 tests/baselines/reference/exhaustiveSwitchWithWideningLiteralTypes.symbols
 create mode 100644 tests/baselines/reference/exhaustiveSwitchWithWideningLiteralTypes.types
 create mode 100644 tests/cases/compiler/exhaustiveSwitchWithWideningLiteralTypes.ts

diff --git a/tests/baselines/reference/exhaustiveSwitchWithWideningLiteralTypes.js b/tests/baselines/reference/exhaustiveSwitchWithWideningLiteralTypes.js
new file mode 100644
index 00000000000..218d760d6c5
--- /dev/null
+++ b/tests/baselines/reference/exhaustiveSwitchWithWideningLiteralTypes.js
@@ -0,0 +1,39 @@
+//// [exhaustiveSwitchWithWideningLiteralTypes.ts]
+
+// Repro from #12529
+
+class A {
+    readonly kind = "A"; // (property) A.kind: "A"
+}
+
+class B {
+    readonly kind = "B"; // (property) B.kind: "B"
+}
+
+function f(value: A | B): number {
+    switch(value.kind) {
+        case "A": return 0;
+        case "B": return 1;
+    }
+}
+
+//// [exhaustiveSwitchWithWideningLiteralTypes.js]
+// Repro from #12529
+var A = (function () {
+    function A() {
+        this.kind = "A"; // (property) A.kind: "A"
+    }
+    return A;
+}());
+var B = (function () {
+    function B() {
+        this.kind = "B"; // (property) B.kind: "B"
+    }
+    return B;
+}());
+function f(value) {
+    switch (value.kind) {
+        case "A": return 0;
+        case "B": return 1;
+    }
+}
diff --git a/tests/baselines/reference/exhaustiveSwitchWithWideningLiteralTypes.symbols b/tests/baselines/reference/exhaustiveSwitchWithWideningLiteralTypes.symbols
new file mode 100644
index 00000000000..929a394dc7b
--- /dev/null
+++ b/tests/baselines/reference/exhaustiveSwitchWithWideningLiteralTypes.symbols
@@ -0,0 +1,33 @@
+=== tests/cases/compiler/exhaustiveSwitchWithWideningLiteralTypes.ts ===
+
+// Repro from #12529
+
+class A {
+>A : Symbol(A, Decl(exhaustiveSwitchWithWideningLiteralTypes.ts, 0, 0))
+
+    readonly kind = "A"; // (property) A.kind: "A"
+>kind : Symbol(A.kind, Decl(exhaustiveSwitchWithWideningLiteralTypes.ts, 3, 9))
+}
+
+class B {
+>B : Symbol(B, Decl(exhaustiveSwitchWithWideningLiteralTypes.ts, 5, 1))
+
+    readonly kind = "B"; // (property) B.kind: "B"
+>kind : Symbol(B.kind, Decl(exhaustiveSwitchWithWideningLiteralTypes.ts, 7, 9))
+}
+
+function f(value: A | B): number {
+>f : Symbol(f, Decl(exhaustiveSwitchWithWideningLiteralTypes.ts, 9, 1))
+>value : Symbol(value, Decl(exhaustiveSwitchWithWideningLiteralTypes.ts, 11, 11))
+>A : Symbol(A, Decl(exhaustiveSwitchWithWideningLiteralTypes.ts, 0, 0))
+>B : Symbol(B, Decl(exhaustiveSwitchWithWideningLiteralTypes.ts, 5, 1))
+
+    switch(value.kind) {
+>value.kind : Symbol(kind, Decl(exhaustiveSwitchWithWideningLiteralTypes.ts, 3, 9), Decl(exhaustiveSwitchWithWideningLiteralTypes.ts, 7, 9))
+>value : Symbol(value, Decl(exhaustiveSwitchWithWideningLiteralTypes.ts, 11, 11))
+>kind : Symbol(kind, Decl(exhaustiveSwitchWithWideningLiteralTypes.ts, 3, 9), Decl(exhaustiveSwitchWithWideningLiteralTypes.ts, 7, 9))
+
+        case "A": return 0;
+        case "B": return 1;
+    }
+}
diff --git a/tests/baselines/reference/exhaustiveSwitchWithWideningLiteralTypes.types b/tests/baselines/reference/exhaustiveSwitchWithWideningLiteralTypes.types
new file mode 100644
index 00000000000..3955c80ff1e
--- /dev/null
+++ b/tests/baselines/reference/exhaustiveSwitchWithWideningLiteralTypes.types
@@ -0,0 +1,40 @@
+=== tests/cases/compiler/exhaustiveSwitchWithWideningLiteralTypes.ts ===
+
+// Repro from #12529
+
+class A {
+>A : A
+
+    readonly kind = "A"; // (property) A.kind: "A"
+>kind : "A"
+>"A" : "A"
+}
+
+class B {
+>B : B
+
+    readonly kind = "B"; // (property) B.kind: "B"
+>kind : "B"
+>"B" : "B"
+}
+
+function f(value: A | B): number {
+>f : (value: A | B) => number
+>value : A | B
+>A : A
+>B : B
+
+    switch(value.kind) {
+>value.kind : "A" | "B"
+>value : A | B
+>kind : "A" | "B"
+
+        case "A": return 0;
+>"A" : "A"
+>0 : 0
+
+        case "B": return 1;
+>"B" : "B"
+>1 : 1
+    }
+}
diff --git a/tests/cases/compiler/exhaustiveSwitchWithWideningLiteralTypes.ts b/tests/cases/compiler/exhaustiveSwitchWithWideningLiteralTypes.ts
new file mode 100644
index 00000000000..14183a5de59
--- /dev/null
+++ b/tests/cases/compiler/exhaustiveSwitchWithWideningLiteralTypes.ts
@@ -0,0 +1,18 @@
+// @strictNullChecks: true
+
+// Repro from #12529
+
+class A {
+    readonly kind = "A"; // (property) A.kind: "A"
+}
+
+class B {
+    readonly kind = "B"; // (property) B.kind: "B"
+}
+
+function f(value: A | B): number {
+    switch(value.kind) {
+        case "A": return 0;
+        case "B": return 1;
+    }
+}
\ No newline at end of file

From 143fc9164f0466618910da58827f20f8b126dccc Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Mon, 28 Nov 2016 17:30:26 -0800
Subject: [PATCH 361/421] Revert
 https://github.com/Microsoft/TypeScript/pull/12207

---
 src/lib/es2017.object.d.ts                    |  2 +-
 .../useObjectValuesAndEntries1.types          | 30 +++++++++----------
 .../useObjectValuesAndEntries4.types          |  8 ++---
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/lib/es2017.object.d.ts b/src/lib/es2017.object.d.ts
index c219f467ac9..c15e21364d2 100644
--- a/src/lib/es2017.object.d.ts
+++ b/src/lib/es2017.object.d.ts
@@ -9,6 +9,6 @@ interface ObjectConstructor {
       * Returns an array of key/values of the enumerable properties 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.
       */
-    entries<T extends { [key: string]: any }, K extends keyof T>(o: T): [keyof T, T[K]][];
+    entries<T>(o: { [s: string]: T }): [string, T][];
     entries(o: any): [string, any][];
 }
diff --git a/tests/baselines/reference/useObjectValuesAndEntries1.types b/tests/baselines/reference/useObjectValuesAndEntries1.types
index f04201450c0..d9ccc019f75 100644
--- a/tests/baselines/reference/useObjectValuesAndEntries1.types
+++ b/tests/baselines/reference/useObjectValuesAndEntries1.types
@@ -22,38 +22,38 @@ for (var x of Object.values(o)) {
 }
 
 var entries = Object.entries(o);  // <-- entries: ['a' | 'b', number][]
->entries : ["a" | "b", number][]
->Object.entries(o) : ["a" | "b", number][]
->Object.entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
+>entries : [string, number][]
+>Object.entries(o) : [string, number][]
+>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
 >Object : ObjectConstructor
->entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
+>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
 >o : { a: number; b: number; }
 
 var entries1 = Object.entries(1); // <-- entries: [string, any][]
 >entries1 : [string, any][]
 >Object.entries(1) : [string, any][]
->Object.entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
+>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
 >Object : ObjectConstructor
->entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
+>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
 >1 : 1
 
 var entries2 = Object.entries({a: true, b: 2}) // ['a' | 'b', number | boolean][]
->entries2 : ["a" | "b", number | boolean][]
->Object.entries({a: true, b: 2}) : ["a" | "b", number | boolean][]
->Object.entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
+>entries2 : [string, number | boolean][]
+>Object.entries({a: true, b: 2}) : [string, number | boolean][]
+>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
 >Object : ObjectConstructor
->entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
->{a: true, b: 2} : { a: true; b: number; }
+>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
+>{a: true, b: 2} : { a: true; b: 2; }
 >a : boolean
 >true : true
 >b : number
 >2 : 2
 
 var entries3 = Object.entries({}) // [never, any][]
->entries3 : [never, any][]
->Object.entries({}) : [never, any][]
->Object.entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
+>entries3 : [string, {}][]
+>Object.entries({}) : [string, {}][]
+>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
 >Object : ObjectConstructor
->entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
+>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
 >{} : {}
 
diff --git a/tests/baselines/reference/useObjectValuesAndEntries4.types b/tests/baselines/reference/useObjectValuesAndEntries4.types
index d68193993e2..05af55d42cb 100644
--- a/tests/baselines/reference/useObjectValuesAndEntries4.types
+++ b/tests/baselines/reference/useObjectValuesAndEntries4.types
@@ -22,10 +22,10 @@ for (var x of Object.values(o)) {
 }
 
 var entries = Object.entries(o);
->entries : ["a" | "b", number][]
->Object.entries(o) : ["a" | "b", number][]
->Object.entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
+>entries : [string, number][]
+>Object.entries(o) : [string, number][]
+>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
 >Object : ObjectConstructor
->entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
+>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
 >o : { a: number; b: number; }
 

From 82e84e272e3bda490577b030cf7ced0658f31e72 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Mon, 28 Nov 2016 17:30:37 -0800
Subject: [PATCH 362/421] Make sure all overloads have comments

---
 src/lib/es2017.object.d.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/lib/es2017.object.d.ts b/src/lib/es2017.object.d.ts
index c15e21364d2..80c2161506a 100644
--- a/src/lib/es2017.object.d.ts
+++ b/src/lib/es2017.object.d.ts
@@ -4,11 +4,22 @@ interface ObjectConstructor {
       * @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.
       */
     values<T>(o: { [s: string]: T }): T[];
+
+    /**
+      * Returns an array of values of the enumerable properties 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.
+      */
     values(o: any): any[];
+
     /**
       * Returns an array of key/values of the enumerable properties 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.
       */
     entries<T>(o: { [s: string]: T }): [string, T][];
+
+    /**
+      * Returns an array of key/values of the enumerable properties 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.
+      */
     entries(o: any): [string, any][];
 }

From f2e30f66936d4e4192aa0bb32049d7e64db10f59 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Tue, 29 Nov 2016 00:04:20 -0800
Subject: [PATCH 363/421] Allow union and intersection as targets for object
 spread and rest, and distribute spread&rest over unions

---
 src/compiler/checker.ts                       |  31 ++++-
 .../restIntersectionOrIntersection.js         |  29 +++++
 .../restIntersectionOrIntersection.symbols    |  38 ++++++
 .../restIntersectionOrIntersection.types      |  38 ++++++
 .../restInvalidArgumentType.errors.txt        | 110 +++++++++++++++++
 .../reference/restInvalidArgumentType.js      | 115 ++++++++++++++++++
 .../baselines/reference/spreadIntersection.js |  23 ++++
 .../reference/spreadIntersection.symbols      |  26 ++++
 .../reference/spreadIntersection.types        |  29 +++++
 .../spreadInvalidArgumentType.errors.txt      | 110 +++++++++++++++++
 .../reference/spreadInvalidArgumentType.js    | 114 +++++++++++++++++
 tests/baselines/reference/spreadUnion.js      |  28 +++++
 tests/baselines/reference/spreadUnion.symbols |  38 ++++++
 tests/baselines/reference/spreadUnion.types   |  42 +++++++
 .../restIntersectionOrIntersection.ts         |  10 ++
 .../cases/compiler/restInvalidArgumentType.ts |  59 +++++++++
 tests/cases/compiler/spreadIntersection.ts    |   7 ++
 .../compiler/spreadInvalidArgumentType.ts     |  59 +++++++++
 tests/cases/compiler/spreadUnion.ts           |  10 ++
 19 files changed, 911 insertions(+), 5 deletions(-)
 create mode 100644 tests/baselines/reference/restIntersectionOrIntersection.js
 create mode 100644 tests/baselines/reference/restIntersectionOrIntersection.symbols
 create mode 100644 tests/baselines/reference/restIntersectionOrIntersection.types
 create mode 100644 tests/baselines/reference/restInvalidArgumentType.errors.txt
 create mode 100644 tests/baselines/reference/restInvalidArgumentType.js
 create mode 100644 tests/baselines/reference/spreadIntersection.js
 create mode 100644 tests/baselines/reference/spreadIntersection.symbols
 create mode 100644 tests/baselines/reference/spreadIntersection.types
 create mode 100644 tests/baselines/reference/spreadInvalidArgumentType.errors.txt
 create mode 100644 tests/baselines/reference/spreadInvalidArgumentType.js
 create mode 100644 tests/baselines/reference/spreadUnion.js
 create mode 100644 tests/baselines/reference/spreadUnion.symbols
 create mode 100644 tests/baselines/reference/spreadUnion.types
 create mode 100644 tests/cases/compiler/restIntersectionOrIntersection.ts
 create mode 100644 tests/cases/compiler/restInvalidArgumentType.ts
 create mode 100644 tests/cases/compiler/spreadIntersection.ts
 create mode 100644 tests/cases/compiler/spreadInvalidArgumentType.ts
 create mode 100644 tests/cases/compiler/spreadUnion.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 527735a3b0f..e937f6d9b97 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -3054,7 +3054,10 @@ namespace ts {
         }
 
         function getRestType(source: Type, properties: PropertyName[], symbol: Symbol): Type {
-            Debug.assert(!!(source.flags & TypeFlags.Object), "Rest types only support object types right now.");
+            if (source.flags & TypeFlags.Union) {
+                return getUnionType(map((<UnionType>source).types, t => getRestType(t, properties, symbol)));
+            }
+
             const members = createMap<Symbol>();
             const names = createMap<true>();
             for (const name of properties) {
@@ -3095,7 +3098,7 @@ namespace ts {
             let type: Type;
             if (pattern.kind === SyntaxKind.ObjectBindingPattern) {
                 if (declaration.dotDotDotToken) {
-                    if (!(parentType.flags & TypeFlags.Object)) {
+                    if (isInvalidValidSpreadType(parentType)) {
                         error(declaration, Diagnostics.Rest_types_may_only_be_created_from_object_types);
                         return unknownType;
                     }
@@ -6102,11 +6105,19 @@ namespace ts {
          * this function should be called in a left folding style, with left = previous result of getSpreadType
          * and right = the new element to be spread.
          */
-        function getSpreadType(left: Type, right: Type, isFromObjectLiteral: boolean): ResolvedType | IntrinsicType {
-            Debug.assert(!!(left.flags & (TypeFlags.Object | TypeFlags.Any)) && !!(right.flags & (TypeFlags.Object | TypeFlags.Any)), "Only object types may be spread.");
+        function getSpreadType(left: Type, right: Type, isFromObjectLiteral: boolean): Type  {
             if (left.flags & TypeFlags.Any || right.flags & TypeFlags.Any) {
                 return anyType;
             }
+
+            if (left.flags & TypeFlags.Union) {
+                return getUnionType(map((<UnionType>left).types, t => getSpreadType(t, right, isFromObjectLiteral)));
+            }
+
+            if (right.flags & TypeFlags.Union) {
+                return getUnionType(map((<UnionType>right).types, t => getSpreadType(left, t, isFromObjectLiteral)));
+            }
+
             const members = createMap<Symbol>();
             const skippedPrivateMembers = createMap<boolean>();
             let stringIndexInfo: IndexInfo;
@@ -11438,7 +11449,7 @@ namespace ts {
                         typeFlags = 0;
                     }
                     const type = checkExpression((memberDecl as SpreadAssignment).expression);
-                    if (!(type.flags & (TypeFlags.Object | TypeFlags.Any))) {
+                    if (!(type.flags & TypeFlags.Any) && isInvalidValidSpreadType(type)) {
                         error(memberDecl, Diagnostics.Spread_types_may_only_be_created_from_object_types);
                         return unknownType;
                     }
@@ -11516,6 +11527,16 @@ namespace ts {
             }
        }
 
+        function isInvalidValidSpreadType(type: Type): boolean {
+            if (type.flags & TypeFlags.Object) {
+                return isGenericMappedType(type);
+            }
+            else if (type.flags & TypeFlags.UnionOrIntersection) {
+                return forEach((<UnionOrIntersectionType>type).types, isInvalidValidSpreadType);
+            }
+            return true;
+        }
+
         function checkJsxSelfClosingElement(node: JsxSelfClosingElement) {
             checkJsxOpeningLikeElement(node);
             return jsxElementType || anyType;
diff --git a/tests/baselines/reference/restIntersectionOrIntersection.js b/tests/baselines/reference/restIntersectionOrIntersection.js
new file mode 100644
index 00000000000..a60a5acbd93
--- /dev/null
+++ b/tests/baselines/reference/restIntersectionOrIntersection.js
@@ -0,0 +1,29 @@
+//// [restIntersectionOrIntersection.ts]
+var intersection: { x: number, y: number } & { w: string, z: string };
+var union: { a: number, c: boolean } | { a: string, b: string };
+
+
+var rest1: { y: number, w: string, z: string };
+var {x, ...rest1 } = intersection;
+
+var rest2: { c: boolean } | { b: string };
+var {a, ...rest2 } = union;
+
+
+
+//// [restIntersectionOrIntersection.js]
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
+            t[p[i]] = s[p[i]];
+    return t;
+};
+var intersection;
+var union;
+var rest1;
+var x = intersection.x, rest1 = __rest(intersection, ["x"]);
+var rest2;
+var a = union.a, rest2 = __rest(union, ["a"]);
diff --git a/tests/baselines/reference/restIntersectionOrIntersection.symbols b/tests/baselines/reference/restIntersectionOrIntersection.symbols
new file mode 100644
index 00000000000..f2eb4f16014
--- /dev/null
+++ b/tests/baselines/reference/restIntersectionOrIntersection.symbols
@@ -0,0 +1,38 @@
+=== tests/cases/compiler/restIntersectionOrIntersection.ts ===
+var intersection: { x: number, y: number } & { w: string, z: string };
+>intersection : Symbol(intersection, Decl(restIntersectionOrIntersection.ts, 0, 3))
+>x : Symbol(x, Decl(restIntersectionOrIntersection.ts, 0, 19))
+>y : Symbol(y, Decl(restIntersectionOrIntersection.ts, 0, 30))
+>w : Symbol(w, Decl(restIntersectionOrIntersection.ts, 0, 46))
+>z : Symbol(z, Decl(restIntersectionOrIntersection.ts, 0, 57))
+
+var union: { a: number, c: boolean } | { a: string, b: string };
+>union : Symbol(union, Decl(restIntersectionOrIntersection.ts, 1, 3))
+>a : Symbol(a, Decl(restIntersectionOrIntersection.ts, 1, 12))
+>c : Symbol(c, Decl(restIntersectionOrIntersection.ts, 1, 23))
+>a : Symbol(a, Decl(restIntersectionOrIntersection.ts, 1, 40))
+>b : Symbol(b, Decl(restIntersectionOrIntersection.ts, 1, 51))
+
+
+var rest1: { y: number, w: string, z: string };
+>rest1 : Symbol(rest1, Decl(restIntersectionOrIntersection.ts, 4, 3), Decl(restIntersectionOrIntersection.ts, 5, 7))
+>y : Symbol(y, Decl(restIntersectionOrIntersection.ts, 4, 12))
+>w : Symbol(w, Decl(restIntersectionOrIntersection.ts, 4, 23))
+>z : Symbol(z, Decl(restIntersectionOrIntersection.ts, 4, 34))
+
+var {x, ...rest1 } = intersection;
+>x : Symbol(x, Decl(restIntersectionOrIntersection.ts, 5, 5))
+>rest1 : Symbol(rest1, Decl(restIntersectionOrIntersection.ts, 4, 3), Decl(restIntersectionOrIntersection.ts, 5, 7))
+>intersection : Symbol(intersection, Decl(restIntersectionOrIntersection.ts, 0, 3))
+
+var rest2: { c: boolean } | { b: string };
+>rest2 : Symbol(rest2, Decl(restIntersectionOrIntersection.ts, 7, 3), Decl(restIntersectionOrIntersection.ts, 8, 7))
+>c : Symbol(c, Decl(restIntersectionOrIntersection.ts, 7, 12))
+>b : Symbol(b, Decl(restIntersectionOrIntersection.ts, 7, 29))
+
+var {a, ...rest2 } = union;
+>a : Symbol(a, Decl(restIntersectionOrIntersection.ts, 8, 5))
+>rest2 : Symbol(rest2, Decl(restIntersectionOrIntersection.ts, 7, 3), Decl(restIntersectionOrIntersection.ts, 8, 7))
+>union : Symbol(union, Decl(restIntersectionOrIntersection.ts, 1, 3))
+
+
diff --git a/tests/baselines/reference/restIntersectionOrIntersection.types b/tests/baselines/reference/restIntersectionOrIntersection.types
new file mode 100644
index 00000000000..c87769ff3cc
--- /dev/null
+++ b/tests/baselines/reference/restIntersectionOrIntersection.types
@@ -0,0 +1,38 @@
+=== tests/cases/compiler/restIntersectionOrIntersection.ts ===
+var intersection: { x: number, y: number } & { w: string, z: string };
+>intersection : { x: number; y: number; } & { w: string; z: string; }
+>x : number
+>y : number
+>w : string
+>z : string
+
+var union: { a: number, c: boolean } | { a: string, b: string };
+>union : { a: number; c: boolean; } | { a: string; b: string; }
+>a : number
+>c : boolean
+>a : string
+>b : string
+
+
+var rest1: { y: number, w: string, z: string };
+>rest1 : { y: number; w: string; z: string; }
+>y : number
+>w : string
+>z : string
+
+var {x, ...rest1 } = intersection;
+>x : number
+>rest1 : { y: number; w: string; z: string; }
+>intersection : { x: number; y: number; } & { w: string; z: string; }
+
+var rest2: { c: boolean } | { b: string };
+>rest2 : { c: boolean; } | { b: string; }
+>c : boolean
+>b : string
+
+var {a, ...rest2 } = union;
+>a : string | number
+>rest2 : { c: boolean; } | { b: string; }
+>union : { a: number; c: boolean; } | { a: string; b: string; }
+
+
diff --git a/tests/baselines/reference/restInvalidArgumentType.errors.txt b/tests/baselines/reference/restInvalidArgumentType.errors.txt
new file mode 100644
index 00000000000..e7cf1ba6f9f
--- /dev/null
+++ b/tests/baselines/reference/restInvalidArgumentType.errors.txt
@@ -0,0 +1,110 @@
+tests/cases/compiler/restInvalidArgumentType.ts(31,13): error TS2700: Rest types may only be created from object types.
+tests/cases/compiler/restInvalidArgumentType.ts(33,13): error TS2700: Rest types may only be created from object types.
+tests/cases/compiler/restInvalidArgumentType.ts(35,13): error TS2700: Rest types may only be created from object types.
+tests/cases/compiler/restInvalidArgumentType.ts(36,13): error TS2700: Rest types may only be created from object types.
+tests/cases/compiler/restInvalidArgumentType.ts(38,13): error TS2700: Rest types may only be created from object types.
+tests/cases/compiler/restInvalidArgumentType.ts(41,13): error TS2700: Rest types may only be created from object types.
+tests/cases/compiler/restInvalidArgumentType.ts(42,13): error TS2700: Rest types may only be created from object types.
+tests/cases/compiler/restInvalidArgumentType.ts(44,13): error TS2700: Rest types may only be created from object types.
+tests/cases/compiler/restInvalidArgumentType.ts(45,13): error TS2700: Rest types may only be created from object types.
+tests/cases/compiler/restInvalidArgumentType.ts(47,13): error TS2700: Rest types may only be created from object types.
+tests/cases/compiler/restInvalidArgumentType.ts(48,13): error TS2700: Rest types may only be created from object types.
+tests/cases/compiler/restInvalidArgumentType.ts(50,13): error TS2700: Rest types may only be created from object types.
+tests/cases/compiler/restInvalidArgumentType.ts(51,13): error TS2700: Rest types may only be created from object types.
+tests/cases/compiler/restInvalidArgumentType.ts(55,13): error TS2700: Rest types may only be created from object types.
+tests/cases/compiler/restInvalidArgumentType.ts(56,13): error TS2700: Rest types may only be created from object types.
+tests/cases/compiler/restInvalidArgumentType.ts(58,13): error TS2700: Rest types may only be created from object types.
+
+
+==== tests/cases/compiler/restInvalidArgumentType.ts (16 errors) ====
+    enum E { v1, v2 };
+    
+    function f<T extends { b: string }>(p1: T, p2: T[]) {
+        var t: T;
+    
+        var i: T["b"];
+        var k: keyof T;
+    
+        var mapped_generic: {[P in keyof T]: T[P]};
+        var mapped: {[P in "b"]: T[P]};
+    
+        var union_generic: T | { a: number };
+        var union_primitive: { a: number } | number;
+    
+        var intersection_generic: T & { a: number };
+        var intersection_premitive: { a: number } | string;
+    
+        var num: number;
+        var str: number;
+    
+        var u: undefined;
+        var n: null;
+    
+        var a: any;
+    
+        var literal_string: "string";
+        var literal_number: 42;
+    
+        var e: E;
+    
+        var {...r1} = p1;   // Error, generic type paramterre
+                ~~
+!!! error TS2700: Rest types may only be created from object types.
+        var {...r2} = p2;   // OK
+        var {...r3} = t;   // Error, generic type paramter
+                ~~
+!!! error TS2700: Rest types may only be created from object types.
+    
+        var {...r4} = i;   // Error, index access
+                ~~
+!!! error TS2700: Rest types may only be created from object types.
+        var {...r5} = k;   // Error, index
+                ~~
+!!! error TS2700: Rest types may only be created from object types.
+    
+        var {...r6} = mapped_generic; // Error, generic mapped object type
+                ~~
+!!! error TS2700: Rest types may only be created from object types.
+        var {...r7} = mapped;  // OK, non-generic mapped type
+    
+        var {...r8} = union_generic;  // Error, union with generic type parameter
+                ~~
+!!! error TS2700: Rest types may only be created from object types.
+        var {...r9} = union_primitive;  // Error, union with generic type parameter
+                ~~
+!!! error TS2700: Rest types may only be created from object types.
+    
+        var {...r10} = intersection_generic;  // Error, intersection with generic type parameter
+                ~~~
+!!! error TS2700: Rest types may only be created from object types.
+        var {...r11} = intersection_premitive;  // Error, intersection with generic type parameter
+                ~~~
+!!! error TS2700: Rest types may only be created from object types.
+    
+        var {...r12} = num;  // Error
+                ~~~
+!!! error TS2700: Rest types may only be created from object types.
+        var {...r13} = str;  // Error
+                ~~~
+!!! error TS2700: Rest types may only be created from object types.
+    
+        var {...r14} = u;  // Error
+                ~~~
+!!! error TS2700: Rest types may only be created from object types.
+        var {...r15} = n;  // Error
+                ~~~
+!!! error TS2700: Rest types may only be created from object types.
+    
+        var {...r16} = a;  // OK
+    
+        var {...r17} = literal_string;  // Error
+                ~~~
+!!! error TS2700: Rest types may only be created from object types.
+        var {...r18} = literal_number;  // Error
+                ~~~
+!!! error TS2700: Rest types may only be created from object types.
+    
+        var {...r19} = e;  // Error, enum
+                ~~~
+!!! error TS2700: Rest types may only be created from object types.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/restInvalidArgumentType.js b/tests/baselines/reference/restInvalidArgumentType.js
new file mode 100644
index 00000000000..23b46a2f775
--- /dev/null
+++ b/tests/baselines/reference/restInvalidArgumentType.js
@@ -0,0 +1,115 @@
+//// [restInvalidArgumentType.ts]
+enum E { v1, v2 };
+
+function f<T extends { b: string }>(p1: T, p2: T[]) {
+    var t: T;
+
+    var i: T["b"];
+    var k: keyof T;
+
+    var mapped_generic: {[P in keyof T]: T[P]};
+    var mapped: {[P in "b"]: T[P]};
+
+    var union_generic: T | { a: number };
+    var union_primitive: { a: number } | number;
+
+    var intersection_generic: T & { a: number };
+    var intersection_premitive: { a: number } | string;
+
+    var num: number;
+    var str: number;
+
+    var u: undefined;
+    var n: null;
+
+    var a: any;
+
+    var literal_string: "string";
+    var literal_number: 42;
+
+    var e: E;
+
+    var {...r1} = p1;   // Error, generic type paramterre
+    var {...r2} = p2;   // OK
+    var {...r3} = t;   // Error, generic type paramter
+
+    var {...r4} = i;   // Error, index access
+    var {...r5} = k;   // Error, index
+
+    var {...r6} = mapped_generic; // Error, generic mapped object type
+    var {...r7} = mapped;  // OK, non-generic mapped type
+
+    var {...r8} = union_generic;  // Error, union with generic type parameter
+    var {...r9} = union_primitive;  // Error, union with generic type parameter
+
+    var {...r10} = intersection_generic;  // Error, intersection with generic type parameter
+    var {...r11} = intersection_premitive;  // Error, intersection with generic type parameter
+
+    var {...r12} = num;  // Error
+    var {...r13} = str;  // Error
+
+    var {...r14} = u;  // Error
+    var {...r15} = n;  // Error
+
+    var {...r16} = a;  // OK
+
+    var {...r17} = literal_string;  // Error
+    var {...r18} = literal_number;  // Error
+
+    var {...r19} = e;  // Error, enum
+}
+
+//// [restInvalidArgumentType.js]
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
+            t[p[i]] = s[p[i]];
+    return t;
+};
+var E;
+(function (E) {
+    E[E["v1"] = 0] = "v1";
+    E[E["v2"] = 1] = "v2";
+})(E || (E = {}));
+;
+function f(p1, p2) {
+    var t;
+    var i;
+    var k;
+    var mapped_generic;
+    var mapped;
+    var union_generic;
+    var union_primitive;
+    var intersection_generic;
+    var intersection_premitive;
+    var num;
+    var str;
+    var u;
+    var n;
+    var a;
+    var literal_string;
+    var literal_number;
+    var e;
+    var r1 = __rest(p1, []); // Error, generic type paramterre
+    var r2 = __rest(p2, []); // OK
+    var r3 = __rest(t, []); // Error, generic type paramter
+    var r4 = __rest(i, []); // Error, index access
+    var r5 = __rest(k, []); // Error, index
+    var r6 = __rest(mapped_generic, []); // Error, generic mapped object type
+    var r7 = __rest(mapped, []); // OK, non-generic mapped type
+    var r8 = __rest(union_generic, []); // Error, union with generic type parameter
+    var r9 = __rest(union_primitive, []); // Error, union with generic type parameter
+    var r10 = __rest(intersection_generic, []); // Error, intersection with generic type parameter
+    var r11 = __rest(intersection_premitive, []); // Error, intersection with generic type parameter
+    var r12 = __rest(num, []); // Error
+    var r13 = __rest(str, []); // Error
+    var r14 = __rest(u, []); // Error
+    var r15 = __rest(n, []); // Error
+    var r16 = __rest(a, []); // OK
+    var r17 = __rest(literal_string, []); // Error
+    var r18 = __rest(literal_number, []); // Error
+    var r19 = __rest(e, []); // Error, enum
+}
diff --git a/tests/baselines/reference/spreadIntersection.js b/tests/baselines/reference/spreadIntersection.js
new file mode 100644
index 00000000000..b3fa9f0c2fb
--- /dev/null
+++ b/tests/baselines/reference/spreadIntersection.js
@@ -0,0 +1,23 @@
+//// [spreadIntersection.ts]
+var intersection: { a: number } & { b: string };
+
+var o1: { a: number, b: string };
+var o1 = { ...intersection };
+
+var o2: { a: number, b: string, c: boolean };
+var o2 = { ...intersection, c: false };
+
+//// [spreadIntersection.js]
+var __assign = (this && this.__assign) || Object.assign || function(t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+        s = arguments[i];
+        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+            t[p] = s[p];
+    }
+    return t;
+};
+var intersection;
+var o1;
+var o1 = __assign({}, intersection);
+var o2;
+var o2 = __assign({}, intersection, { c: false });
diff --git a/tests/baselines/reference/spreadIntersection.symbols b/tests/baselines/reference/spreadIntersection.symbols
new file mode 100644
index 00000000000..1f6b3c12de1
--- /dev/null
+++ b/tests/baselines/reference/spreadIntersection.symbols
@@ -0,0 +1,26 @@
+=== tests/cases/compiler/spreadIntersection.ts ===
+var intersection: { a: number } & { b: string };
+>intersection : Symbol(intersection, Decl(spreadIntersection.ts, 0, 3))
+>a : Symbol(a, Decl(spreadIntersection.ts, 0, 19))
+>b : Symbol(b, Decl(spreadIntersection.ts, 0, 35))
+
+var o1: { a: number, b: string };
+>o1 : Symbol(o1, Decl(spreadIntersection.ts, 2, 3), Decl(spreadIntersection.ts, 3, 3))
+>a : Symbol(a, Decl(spreadIntersection.ts, 2, 9))
+>b : Symbol(b, Decl(spreadIntersection.ts, 2, 20))
+
+var o1 = { ...intersection };
+>o1 : Symbol(o1, Decl(spreadIntersection.ts, 2, 3), Decl(spreadIntersection.ts, 3, 3))
+>intersection : Symbol(intersection, Decl(spreadIntersection.ts, 0, 3))
+
+var o2: { a: number, b: string, c: boolean };
+>o2 : Symbol(o2, Decl(spreadIntersection.ts, 5, 3), Decl(spreadIntersection.ts, 6, 3))
+>a : Symbol(a, Decl(spreadIntersection.ts, 5, 9))
+>b : Symbol(b, Decl(spreadIntersection.ts, 5, 20))
+>c : Symbol(c, Decl(spreadIntersection.ts, 5, 31))
+
+var o2 = { ...intersection, c: false };
+>o2 : Symbol(o2, Decl(spreadIntersection.ts, 5, 3), Decl(spreadIntersection.ts, 6, 3))
+>intersection : Symbol(intersection, Decl(spreadIntersection.ts, 0, 3))
+>c : Symbol(c, Decl(spreadIntersection.ts, 6, 27))
+
diff --git a/tests/baselines/reference/spreadIntersection.types b/tests/baselines/reference/spreadIntersection.types
new file mode 100644
index 00000000000..c3c6b99adee
--- /dev/null
+++ b/tests/baselines/reference/spreadIntersection.types
@@ -0,0 +1,29 @@
+=== tests/cases/compiler/spreadIntersection.ts ===
+var intersection: { a: number } & { b: string };
+>intersection : { a: number; } & { b: string; }
+>a : number
+>b : string
+
+var o1: { a: number, b: string };
+>o1 : { a: number; b: string; }
+>a : number
+>b : string
+
+var o1 = { ...intersection };
+>o1 : { a: number; b: string; }
+>{ ...intersection } : { a: number; b: string; }
+>intersection : { a: number; } & { b: string; }
+
+var o2: { a: number, b: string, c: boolean };
+>o2 : { a: number; b: string; c: boolean; }
+>a : number
+>b : string
+>c : boolean
+
+var o2 = { ...intersection, c: false };
+>o2 : { a: number; b: string; c: boolean; }
+>{ ...intersection, c: false } : { c: boolean; a: number; b: string; }
+>intersection : { a: number; } & { b: string; }
+>c : boolean
+>false : false
+
diff --git a/tests/baselines/reference/spreadInvalidArgumentType.errors.txt b/tests/baselines/reference/spreadInvalidArgumentType.errors.txt
new file mode 100644
index 00000000000..34356e53813
--- /dev/null
+++ b/tests/baselines/reference/spreadInvalidArgumentType.errors.txt
@@ -0,0 +1,110 @@
+tests/cases/compiler/spreadInvalidArgumentType.ts(31,16): error TS2698: Spread types may only be created from object types.
+tests/cases/compiler/spreadInvalidArgumentType.ts(33,16): error TS2698: Spread types may only be created from object types.
+tests/cases/compiler/spreadInvalidArgumentType.ts(35,16): error TS2698: Spread types may only be created from object types.
+tests/cases/compiler/spreadInvalidArgumentType.ts(36,16): error TS2698: Spread types may only be created from object types.
+tests/cases/compiler/spreadInvalidArgumentType.ts(38,16): error TS2698: Spread types may only be created from object types.
+tests/cases/compiler/spreadInvalidArgumentType.ts(41,16): error TS2698: Spread types may only be created from object types.
+tests/cases/compiler/spreadInvalidArgumentType.ts(42,16): error TS2698: Spread types may only be created from object types.
+tests/cases/compiler/spreadInvalidArgumentType.ts(44,17): error TS2698: Spread types may only be created from object types.
+tests/cases/compiler/spreadInvalidArgumentType.ts(45,17): error TS2698: Spread types may only be created from object types.
+tests/cases/compiler/spreadInvalidArgumentType.ts(47,17): error TS2698: Spread types may only be created from object types.
+tests/cases/compiler/spreadInvalidArgumentType.ts(48,17): error TS2698: Spread types may only be created from object types.
+tests/cases/compiler/spreadInvalidArgumentType.ts(50,17): error TS2698: Spread types may only be created from object types.
+tests/cases/compiler/spreadInvalidArgumentType.ts(51,17): error TS2698: Spread types may only be created from object types.
+tests/cases/compiler/spreadInvalidArgumentType.ts(55,17): error TS2698: Spread types may only be created from object types.
+tests/cases/compiler/spreadInvalidArgumentType.ts(56,17): error TS2698: Spread types may only be created from object types.
+tests/cases/compiler/spreadInvalidArgumentType.ts(58,17): error TS2698: Spread types may only be created from object types.
+
+
+==== tests/cases/compiler/spreadInvalidArgumentType.ts (16 errors) ====
+    enum E { v1, v2 };
+    
+    function f<T extends { b: string }>(p1: T, p2: T[]) {
+        var t: T;
+    
+        var i: T["b"];
+        var k: keyof T;
+    
+        var mapped_generic: {[P in keyof T]: T[P]};
+        var mapped: {[P in "b"]: T[P]};
+    
+        var union_generic: T | { a: number };
+        var union_primitive: { a: number } | number;
+    
+        var intersection_generic: T & { a: number };
+        var intersection_premitive: { a: number } | string;
+    
+        var num: number;
+        var str: number;
+    
+        var u: undefined;
+        var n: null;
+    
+        var a: any;
+    
+        var literal_string: "string";
+        var literal_number: 42;
+    
+        var e: E;
+    
+        var o1 = { ...p1 };   // Error, generic type paramterre
+                   ~~~~~
+!!! error TS2698: Spread types may only be created from object types.
+        var o2 = { ...p2 };   // OK
+        var o3 = { ...t };   // Error, generic type paramter
+                   ~~~~
+!!! error TS2698: Spread types may only be created from object types.
+    
+        var o4 = { ...i };   // Error, index access
+                   ~~~~
+!!! error TS2698: Spread types may only be created from object types.
+        var o5 = { ...k };   // Error, index
+                   ~~~~
+!!! error TS2698: Spread types may only be created from object types.
+    
+        var o6 = { ...mapped_generic }; // Error, generic mapped object type
+                   ~~~~~~~~~~~~~~~~~
+!!! error TS2698: Spread types may only be created from object types.
+        var o7 = { ...mapped };  // OK, non-generic mapped type
+    
+        var o8 = { ...union_generic };  // Error, union with generic type parameter
+                   ~~~~~~~~~~~~~~~~
+!!! error TS2698: Spread types may only be created from object types.
+        var o9 = { ...union_primitive };  // Error, union with generic type parameter
+                   ~~~~~~~~~~~~~~~~~~
+!!! error TS2698: Spread types may only be created from object types.
+    
+        var o10 = { ...intersection_generic };  // Error, intersection with generic type parameter
+                    ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2698: Spread types may only be created from object types.
+        var o11 = { ...intersection_premitive };  // Error, intersection with generic type parameter
+                    ~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2698: Spread types may only be created from object types.
+    
+        var o12 = { ...num };  // Error
+                    ~~~~~~
+!!! error TS2698: Spread types may only be created from object types.
+        var o13 = { ...str };  // Error
+                    ~~~~~~
+!!! error TS2698: Spread types may only be created from object types.
+    
+        var o14 = { ...u };  // Error
+                    ~~~~
+!!! error TS2698: Spread types may only be created from object types.
+        var o15 = { ...n };  // Error
+                    ~~~~
+!!! error TS2698: Spread types may only be created from object types.
+    
+        var o16 = { ...a };  // OK
+    
+        var o17 = { ...literal_string };  // Error
+                    ~~~~~~~~~~~~~~~~~
+!!! error TS2698: Spread types may only be created from object types.
+        var o18 = { ...literal_number };  // Error
+                    ~~~~~~~~~~~~~~~~~
+!!! error TS2698: Spread types may only be created from object types.
+    
+        var o19 = { ...e };  // Error, enum
+                    ~~~~
+!!! error TS2698: Spread types may only be created from object types.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/spreadInvalidArgumentType.js b/tests/baselines/reference/spreadInvalidArgumentType.js
new file mode 100644
index 00000000000..ecea599842e
--- /dev/null
+++ b/tests/baselines/reference/spreadInvalidArgumentType.js
@@ -0,0 +1,114 @@
+//// [spreadInvalidArgumentType.ts]
+enum E { v1, v2 };
+
+function f<T extends { b: string }>(p1: T, p2: T[]) {
+    var t: T;
+
+    var i: T["b"];
+    var k: keyof T;
+
+    var mapped_generic: {[P in keyof T]: T[P]};
+    var mapped: {[P in "b"]: T[P]};
+
+    var union_generic: T | { a: number };
+    var union_primitive: { a: number } | number;
+
+    var intersection_generic: T & { a: number };
+    var intersection_premitive: { a: number } | string;
+
+    var num: number;
+    var str: number;
+
+    var u: undefined;
+    var n: null;
+
+    var a: any;
+
+    var literal_string: "string";
+    var literal_number: 42;
+
+    var e: E;
+
+    var o1 = { ...p1 };   // Error, generic type paramterre
+    var o2 = { ...p2 };   // OK
+    var o3 = { ...t };   // Error, generic type paramter
+
+    var o4 = { ...i };   // Error, index access
+    var o5 = { ...k };   // Error, index
+
+    var o6 = { ...mapped_generic }; // Error, generic mapped object type
+    var o7 = { ...mapped };  // OK, non-generic mapped type
+
+    var o8 = { ...union_generic };  // Error, union with generic type parameter
+    var o9 = { ...union_primitive };  // Error, union with generic type parameter
+
+    var o10 = { ...intersection_generic };  // Error, intersection with generic type parameter
+    var o11 = { ...intersection_premitive };  // Error, intersection with generic type parameter
+
+    var o12 = { ...num };  // Error
+    var o13 = { ...str };  // Error
+
+    var o14 = { ...u };  // Error
+    var o15 = { ...n };  // Error
+
+    var o16 = { ...a };  // OK
+
+    var o17 = { ...literal_string };  // Error
+    var o18 = { ...literal_number };  // Error
+
+    var o19 = { ...e };  // Error, enum
+}
+
+//// [spreadInvalidArgumentType.js]
+var __assign = (this && this.__assign) || Object.assign || function(t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+        s = arguments[i];
+        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+            t[p] = s[p];
+    }
+    return t;
+};
+var E;
+(function (E) {
+    E[E["v1"] = 0] = "v1";
+    E[E["v2"] = 1] = "v2";
+})(E || (E = {}));
+;
+function f(p1, p2) {
+    var t;
+    var i;
+    var k;
+    var mapped_generic;
+    var mapped;
+    var union_generic;
+    var union_primitive;
+    var intersection_generic;
+    var intersection_premitive;
+    var num;
+    var str;
+    var u;
+    var n;
+    var a;
+    var literal_string;
+    var literal_number;
+    var e;
+    var o1 = __assign({}, p1); // Error, generic type paramterre
+    var o2 = __assign({}, p2); // OK
+    var o3 = __assign({}, t); // Error, generic type paramter
+    var o4 = __assign({}, i); // Error, index access
+    var o5 = __assign({}, k); // Error, index
+    var o6 = __assign({}, mapped_generic); // Error, generic mapped object type
+    var o7 = __assign({}, mapped); // OK, non-generic mapped type
+    var o8 = __assign({}, union_generic); // Error, union with generic type parameter
+    var o9 = __assign({}, union_primitive); // Error, union with generic type parameter
+    var o10 = __assign({}, intersection_generic); // Error, intersection with generic type parameter
+    var o11 = __assign({}, intersection_premitive); // Error, intersection with generic type parameter
+    var o12 = __assign({}, num); // Error
+    var o13 = __assign({}, str); // Error
+    var o14 = __assign({}, u); // Error
+    var o15 = __assign({}, n); // Error
+    var o16 = __assign({}, a); // OK
+    var o17 = __assign({}, literal_string); // Error
+    var o18 = __assign({}, literal_number); // Error
+    var o19 = __assign({}, e); // Error, enum
+}
diff --git a/tests/baselines/reference/spreadUnion.js b/tests/baselines/reference/spreadUnion.js
new file mode 100644
index 00000000000..2691a3acdcc
--- /dev/null
+++ b/tests/baselines/reference/spreadUnion.js
@@ -0,0 +1,28 @@
+//// [spreadUnion.ts]
+var union: { a: number } | { b: string };
+
+var o3: { a: number } | { b: string };
+var o3 =  { ...union };
+
+var o4: { a: boolean } | { b: string , a: boolean};
+var o4 =  { ...union, a: false };
+
+var o5: { a: number } | { b: string } | { a: number, b: string };
+var o5 =  { ...union, ...union };
+
+//// [spreadUnion.js]
+var __assign = (this && this.__assign) || Object.assign || function(t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+        s = arguments[i];
+        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+            t[p] = s[p];
+    }
+    return t;
+};
+var union;
+var o3;
+var o3 = __assign({}, union);
+var o4;
+var o4 = __assign({}, union, { a: false });
+var o5;
+var o5 = __assign({}, union, union);
diff --git a/tests/baselines/reference/spreadUnion.symbols b/tests/baselines/reference/spreadUnion.symbols
new file mode 100644
index 00000000000..40a63d56d49
--- /dev/null
+++ b/tests/baselines/reference/spreadUnion.symbols
@@ -0,0 +1,38 @@
+=== tests/cases/compiler/spreadUnion.ts ===
+var union: { a: number } | { b: string };
+>union : Symbol(union, Decl(spreadUnion.ts, 0, 3))
+>a : Symbol(a, Decl(spreadUnion.ts, 0, 12))
+>b : Symbol(b, Decl(spreadUnion.ts, 0, 28))
+
+var o3: { a: number } | { b: string };
+>o3 : Symbol(o3, Decl(spreadUnion.ts, 2, 3), Decl(spreadUnion.ts, 3, 3))
+>a : Symbol(a, Decl(spreadUnion.ts, 2, 9))
+>b : Symbol(b, Decl(spreadUnion.ts, 2, 25))
+
+var o3 =  { ...union };
+>o3 : Symbol(o3, Decl(spreadUnion.ts, 2, 3), Decl(spreadUnion.ts, 3, 3))
+>union : Symbol(union, Decl(spreadUnion.ts, 0, 3))
+
+var o4: { a: boolean } | { b: string , a: boolean};
+>o4 : Symbol(o4, Decl(spreadUnion.ts, 5, 3), Decl(spreadUnion.ts, 6, 3))
+>a : Symbol(a, Decl(spreadUnion.ts, 5, 9))
+>b : Symbol(b, Decl(spreadUnion.ts, 5, 26))
+>a : Symbol(a, Decl(spreadUnion.ts, 5, 38))
+
+var o4 =  { ...union, a: false };
+>o4 : Symbol(o4, Decl(spreadUnion.ts, 5, 3), Decl(spreadUnion.ts, 6, 3))
+>union : Symbol(union, Decl(spreadUnion.ts, 0, 3))
+>a : Symbol(a, Decl(spreadUnion.ts, 6, 21))
+
+var o5: { a: number } | { b: string } | { a: number, b: string };
+>o5 : Symbol(o5, Decl(spreadUnion.ts, 8, 3), Decl(spreadUnion.ts, 9, 3))
+>a : Symbol(a, Decl(spreadUnion.ts, 8, 9))
+>b : Symbol(b, Decl(spreadUnion.ts, 8, 25))
+>a : Symbol(a, Decl(spreadUnion.ts, 8, 41))
+>b : Symbol(b, Decl(spreadUnion.ts, 8, 52))
+
+var o5 =  { ...union, ...union };
+>o5 : Symbol(o5, Decl(spreadUnion.ts, 8, 3), Decl(spreadUnion.ts, 9, 3))
+>union : Symbol(union, Decl(spreadUnion.ts, 0, 3))
+>union : Symbol(union, Decl(spreadUnion.ts, 0, 3))
+
diff --git a/tests/baselines/reference/spreadUnion.types b/tests/baselines/reference/spreadUnion.types
new file mode 100644
index 00000000000..9e5ac1cffd5
--- /dev/null
+++ b/tests/baselines/reference/spreadUnion.types
@@ -0,0 +1,42 @@
+=== tests/cases/compiler/spreadUnion.ts ===
+var union: { a: number } | { b: string };
+>union : { a: number; } | { b: string; }
+>a : number
+>b : string
+
+var o3: { a: number } | { b: string };
+>o3 : { a: number; } | { b: string; }
+>a : number
+>b : string
+
+var o3 =  { ...union };
+>o3 : { a: number; } | { b: string; }
+>{ ...union } : { a: number; } | { b: string; }
+>union : { a: number; } | { b: string; }
+
+var o4: { a: boolean } | { b: string , a: boolean};
+>o4 : { a: boolean; } | { b: string; a: boolean; }
+>a : boolean
+>b : string
+>a : boolean
+
+var o4 =  { ...union, a: false };
+>o4 : { a: boolean; } | { b: string; a: boolean; }
+>{ ...union, a: false } : { a: boolean; } | { a: boolean; b: string; }
+>union : { a: number; } | { b: string; }
+>a : boolean
+>false : false
+
+var o5: { a: number } | { b: string } | { a: number, b: string };
+>o5 : { a: number; } | { b: string; } | { a: number; b: string; }
+>a : number
+>b : string
+>a : number
+>b : string
+
+var o5 =  { ...union, ...union };
+>o5 : { a: number; } | { b: string; } | { a: number; b: string; }
+>{ ...union, ...union } : { a: number; } | { b: string; a: number; } | { a: number; b: string; } | { b: string; }
+>union : { a: number; } | { b: string; }
+>union : { a: number; } | { b: string; }
+
diff --git a/tests/cases/compiler/restIntersectionOrIntersection.ts b/tests/cases/compiler/restIntersectionOrIntersection.ts
new file mode 100644
index 00000000000..6d06ed5ebc2
--- /dev/null
+++ b/tests/cases/compiler/restIntersectionOrIntersection.ts
@@ -0,0 +1,10 @@
+var intersection: { x: number, y: number } & { w: string, z: string };
+var union: { a: number, c: boolean } | { a: string, b: string };
+
+
+var rest1: { y: number, w: string, z: string };
+var {x, ...rest1 } = intersection;
+
+var rest2: { c: boolean } | { b: string };
+var {a, ...rest2 } = union;
+
diff --git a/tests/cases/compiler/restInvalidArgumentType.ts b/tests/cases/compiler/restInvalidArgumentType.ts
new file mode 100644
index 00000000000..7f7037bbb33
--- /dev/null
+++ b/tests/cases/compiler/restInvalidArgumentType.ts
@@ -0,0 +1,59 @@
+enum E { v1, v2 };
+
+function f<T extends { b: string }>(p1: T, p2: T[]) {
+    var t: T;
+
+    var i: T["b"];
+    var k: keyof T;
+
+    var mapped_generic: {[P in keyof T]: T[P]};
+    var mapped: {[P in "b"]: T[P]};
+
+    var union_generic: T | { a: number };
+    var union_primitive: { a: number } | number;
+
+    var intersection_generic: T & { a: number };
+    var intersection_premitive: { a: number } | string;
+
+    var num: number;
+    var str: number;
+
+    var u: undefined;
+    var n: null;
+
+    var a: any;
+
+    var literal_string: "string";
+    var literal_number: 42;
+
+    var e: E;
+
+    var {...r1} = p1;   // Error, generic type paramterre
+    var {...r2} = p2;   // OK
+    var {...r3} = t;   // Error, generic type paramter
+
+    var {...r4} = i;   // Error, index access
+    var {...r5} = k;   // Error, index
+
+    var {...r6} = mapped_generic; // Error, generic mapped object type
+    var {...r7} = mapped;  // OK, non-generic mapped type
+
+    var {...r8} = union_generic;  // Error, union with generic type parameter
+    var {...r9} = union_primitive;  // Error, union with generic type parameter
+
+    var {...r10} = intersection_generic;  // Error, intersection with generic type parameter
+    var {...r11} = intersection_premitive;  // Error, intersection with generic type parameter
+
+    var {...r12} = num;  // Error
+    var {...r13} = str;  // Error
+
+    var {...r14} = u;  // Error
+    var {...r15} = n;  // Error
+
+    var {...r16} = a;  // OK
+
+    var {...r17} = literal_string;  // Error
+    var {...r18} = literal_number;  // Error
+
+    var {...r19} = e;  // Error, enum
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/spreadIntersection.ts b/tests/cases/compiler/spreadIntersection.ts
new file mode 100644
index 00000000000..3b397dc40cc
--- /dev/null
+++ b/tests/cases/compiler/spreadIntersection.ts
@@ -0,0 +1,7 @@
+var intersection: { a: number } & { b: string };
+
+var o1: { a: number, b: string };
+var o1 = { ...intersection };
+
+var o2: { a: number, b: string, c: boolean };
+var o2 = { ...intersection, c: false };
\ No newline at end of file
diff --git a/tests/cases/compiler/spreadInvalidArgumentType.ts b/tests/cases/compiler/spreadInvalidArgumentType.ts
new file mode 100644
index 00000000000..bb8f4894711
--- /dev/null
+++ b/tests/cases/compiler/spreadInvalidArgumentType.ts
@@ -0,0 +1,59 @@
+enum E { v1, v2 };
+
+function f<T extends { b: string }>(p1: T, p2: T[]) {
+    var t: T;
+
+    var i: T["b"];
+    var k: keyof T;
+
+    var mapped_generic: {[P in keyof T]: T[P]};
+    var mapped: {[P in "b"]: T[P]};
+
+    var union_generic: T | { a: number };
+    var union_primitive: { a: number } | number;
+
+    var intersection_generic: T & { a: number };
+    var intersection_premitive: { a: number } | string;
+
+    var num: number;
+    var str: number;
+
+    var u: undefined;
+    var n: null;
+
+    var a: any;
+
+    var literal_string: "string";
+    var literal_number: 42;
+
+    var e: E;
+
+    var o1 = { ...p1 };   // Error, generic type paramterre
+    var o2 = { ...p2 };   // OK
+    var o3 = { ...t };   // Error, generic type paramter
+
+    var o4 = { ...i };   // Error, index access
+    var o5 = { ...k };   // Error, index
+
+    var o6 = { ...mapped_generic }; // Error, generic mapped object type
+    var o7 = { ...mapped };  // OK, non-generic mapped type
+
+    var o8 = { ...union_generic };  // Error, union with generic type parameter
+    var o9 = { ...union_primitive };  // Error, union with generic type parameter
+
+    var o10 = { ...intersection_generic };  // Error, intersection with generic type parameter
+    var o11 = { ...intersection_premitive };  // Error, intersection with generic type parameter
+
+    var o12 = { ...num };  // Error
+    var o13 = { ...str };  // Error
+
+    var o14 = { ...u };  // Error
+    var o15 = { ...n };  // Error
+
+    var o16 = { ...a };  // OK
+
+    var o17 = { ...literal_string };  // Error
+    var o18 = { ...literal_number };  // Error
+
+    var o19 = { ...e };  // Error, enum
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/spreadUnion.ts b/tests/cases/compiler/spreadUnion.ts
new file mode 100644
index 00000000000..ef8440122ed
--- /dev/null
+++ b/tests/cases/compiler/spreadUnion.ts
@@ -0,0 +1,10 @@
+var union: { a: number } | { b: string };
+
+var o3: { a: number } | { b: string };
+var o3 =  { ...union };
+
+var o4: { a: boolean } | { b: string , a: boolean};
+var o4 =  { ...union, a: false };
+
+var o5: { a: number } | { b: string } | { a: number, b: string };
+var o5 =  { ...union, ...union };
\ No newline at end of file

From 5c10764d9bafbc8fc056b380c597d00ced22e8b9 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Tue, 29 Nov 2016 00:13:04 -0800
Subject: [PATCH 364/421] Fix function name

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index e937f6d9b97..5b3f789732b 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -3098,7 +3098,7 @@ namespace ts {
             let type: Type;
             if (pattern.kind === SyntaxKind.ObjectBindingPattern) {
                 if (declaration.dotDotDotToken) {
-                    if (isInvalidValidSpreadType(parentType)) {
+                    if (isInvalidSpreadType(parentType)) {
                         error(declaration, Diagnostics.Rest_types_may_only_be_created_from_object_types);
                         return unknownType;
                     }
@@ -11449,7 +11449,7 @@ namespace ts {
                         typeFlags = 0;
                     }
                     const type = checkExpression((memberDecl as SpreadAssignment).expression);
-                    if (!(type.flags & TypeFlags.Any) && isInvalidValidSpreadType(type)) {
+                    if (!(type.flags & TypeFlags.Any) && isInvalidSpreadType(type)) {
                         error(memberDecl, Diagnostics.Spread_types_may_only_be_created_from_object_types);
                         return unknownType;
                     }
@@ -11527,12 +11527,12 @@ namespace ts {
             }
        }
 
-        function isInvalidValidSpreadType(type: Type): boolean {
+        function isInvalidSpreadType(type: Type): boolean {
             if (type.flags & TypeFlags.Object) {
                 return isGenericMappedType(type);
             }
             else if (type.flags & TypeFlags.UnionOrIntersection) {
-                return forEach((<UnionOrIntersectionType>type).types, isInvalidValidSpreadType);
+                return forEach((<UnionOrIntersectionType>type).types, isInvalidSpreadType);
             }
             return true;
         }

From 1418fd170d17692d44370831779934fba7c2665d Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Tue, 29 Nov 2016 10:14:22 -0800
Subject: [PATCH 365/421] send begin/end notifications when installing types
 packages (#12551)

---
 .../unittests/tsserverProjectSystem.ts        |   3 +-
 src/harness/unittests/typingsInstaller.ts     | 114 ++++++++++++++++--
 src/server/protocol.ts                        |  34 ++++++
 src/server/server.ts                          |  39 +++++-
 src/server/shared.ts                          |   3 +-
 src/server/types.d.ts                         |  22 +++-
 .../typingsInstaller/nodeTypingsInstaller.ts  |   8 +-
 .../typingsInstaller/typingsInstaller.ts      |  84 +++++++------
 8 files changed, 243 insertions(+), 64 deletions(-)

diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
index a0a6ac7f01e..368d2a660d4 100644
--- a/src/harness/unittests/tsserverProjectSystem.ts
+++ b/src/harness/unittests/tsserverProjectSystem.ts
@@ -51,9 +51,8 @@ namespace ts.projectSystem {
             throttleLimit: number,
             installTypingHost: server.ServerHost,
             readonly typesRegistry = createMap<void>(),
-            telemetryEnabled?: boolean,
             log?: TI.Log) {
-            super(installTypingHost, globalTypingsCacheLocation, safeList.path, throttleLimit, telemetryEnabled, log);
+            super(installTypingHost, globalTypingsCacheLocation, safeList.path, throttleLimit, log);
         }
 
         safeFileList = safeList.path;
diff --git a/src/harness/unittests/typingsInstaller.ts b/src/harness/unittests/typingsInstaller.ts
index aea9f4eb9ed..62d2f7ac801 100644
--- a/src/harness/unittests/typingsInstaller.ts
+++ b/src/harness/unittests/typingsInstaller.ts
@@ -20,13 +20,12 @@ namespace ts.projectSystem {
     }
 
     class Installer extends TestTypingsInstaller {
-        constructor(host: server.ServerHost, p?: InstallerParams, telemetryEnabled?: boolean, log?: TI.Log) {
+        constructor(host: server.ServerHost, p?: InstallerParams, log?: TI.Log) {
             super(
                 (p && p.globalTypingsCacheLocation) || "/a/data",
                 (p && p.throttleLimit) || 5,
                 host,
                 (p && p.typesRegistry),
-                telemetryEnabled,
                 log);
         }
 
@@ -36,7 +35,7 @@ namespace ts.projectSystem {
         }
     }
 
-    function executeCommand(self: Installer, host: TestServerHost, installedTypings: string[], typingFiles: FileOrFolder[], cb: TI.RequestCompletedAction): void {
+    function executeCommand(self: Installer, host: TestServerHost, installedTypings: string[] | string, typingFiles: FileOrFolder[], cb: TI.RequestCompletedAction): void {
         self.addPostExecAction(installedTypings, success => {
             for (const file of typingFiles) {
                 host.createFileOrFolder(file, /*createParentDirectory*/ true);
@@ -907,7 +906,7 @@ namespace ts.projectSystem {
             const host = createServerHost([f1, packageJson]);
             const installer = new (class extends Installer {
                 constructor() {
-                    super(host, { globalTypingsCacheLocation: "/tmp" }, /*telemetryEnabled*/ false, { isEnabled: () => true, writeLine: msg => messages.push(msg) });
+                    super(host, { globalTypingsCacheLocation: "/tmp" }, { isEnabled: () => true, writeLine: msg => messages.push(msg) });
                 }
                 installWorker(_requestId: number, _args: string[], _cwd: string, _cb: server.typingsInstaller.RequestCompletedAction) {
                     assert(false, "runCommand should not be invoked");
@@ -971,15 +970,18 @@ namespace ts.projectSystem {
             let seenTelemetryEvent = false;
             const installer = new (class extends Installer {
                 constructor() {
-                    super(host, { globalTypingsCacheLocation: cachePath, typesRegistry: createTypesRegistry("commander") }, /*telemetryEnabled*/ true);
+                    super(host, { globalTypingsCacheLocation: cachePath, typesRegistry: createTypesRegistry("commander") });
                 }
                 installWorker(_requestId: number, _args: string[], _cwd: string, cb: server.typingsInstaller.RequestCompletedAction) {
                     const installedTypings = ["@types/commander"];
                     const typingFiles = [commander];
                     executeCommand(this, host, installedTypings, typingFiles, cb);
                 }
-                sendResponse(response: server.SetTypings | server.InvalidateCachedTypings | server.TypingsInstallEvent) {
-                    if (response.kind === server.EventInstall) {
+                sendResponse(response: server.SetTypings | server.InvalidateCachedTypings | server.BeginInstallTypes | server.EndInstallTypes) {
+                    if (response.kind === server.EventBeginInstallTypes) {
+                        return;
+                    }
+                    if (response.kind === server.EventEndInstallTypes) {
                         assert.deepEqual(response.packagesToInstall, ["@types/commander"]);
                         seenTelemetryEvent = true;
                         return;
@@ -997,4 +999,102 @@ namespace ts.projectSystem {
             checkProjectActualFiles(projectService.inferredProjects[0], [f1.path, commander.path]);
         });
     });
+
+    describe("progress notifications", () => {
+        it ("should be sent for success", () => {
+            const f1 = {
+                path: "/a/app.js",
+                content: ""
+            };
+            const package = {
+                path: "/a/package.json",
+                content: JSON.stringify({ dependencies: { "commander": "1.0.0" } })
+            };
+            const cachePath = "/a/cache/";
+            const commander = {
+                path: cachePath + "node_modules/@types/commander/index.d.ts",
+                content: "export let x: number"
+            };
+            const host = createServerHost([f1, package]);
+            let beginEvent: server.BeginInstallTypes;
+            let endEvent: server.EndInstallTypes;
+            const installer = new (class extends Installer {
+                constructor() {
+                    super(host, { globalTypingsCacheLocation: cachePath, typesRegistry: createTypesRegistry("commander") });
+                }
+                installWorker(_requestId: number, _args: string[], _cwd: string, cb: server.typingsInstaller.RequestCompletedAction) {
+                    const installedTypings = ["@types/commander"];
+                    const typingFiles = [commander];
+                    executeCommand(this, host, installedTypings, typingFiles, cb);
+                }
+                sendResponse(response: server.SetTypings | server.InvalidateCachedTypings | server.BeginInstallTypes | server.EndInstallTypes) {
+                    if (response.kind === server.EventBeginInstallTypes) {
+                        beginEvent = response;
+                        return;
+                    }
+                    if (response.kind === server.EventEndInstallTypes) {
+                        endEvent = response;
+                        return;
+                    }
+                    super.sendResponse(response);
+                }
+            })();
+            const projectService = createProjectService(host, { typingsInstaller: installer });
+            projectService.openClientFile(f1.path);
+
+            installer.installAll(/*expectedCount*/ 1);
+
+            assert.isTrue(!!beginEvent);
+            assert.isTrue(!!endEvent);
+            assert.isTrue(beginEvent.eventId === endEvent.eventId);
+            assert.isTrue(endEvent.installSuccess);
+            checkNumberOfProjects(projectService, { inferredProjects: 1 });
+            checkProjectActualFiles(projectService.inferredProjects[0], [f1.path, commander.path]);
+        });
+
+        it ("should be sent for error", () => {
+            const f1 = {
+                path: "/a/app.js",
+                content: ""
+            };
+            const package = {
+                path: "/a/package.json",
+                content: JSON.stringify({ dependencies: { "commander": "1.0.0" } })
+            };
+            const cachePath = "/a/cache/";
+            const host = createServerHost([f1, package]);
+            let beginEvent: server.BeginInstallTypes;
+            let endEvent: server.EndInstallTypes;
+            const installer = new (class extends Installer {
+                constructor() {
+                    super(host, { globalTypingsCacheLocation: cachePath, typesRegistry: createTypesRegistry("commander") });
+                }
+                installWorker(_requestId: number, _args: string[], _cwd: string, cb: server.typingsInstaller.RequestCompletedAction) {
+                    executeCommand(this, host, "", [], cb);
+                }
+                sendResponse(response: server.SetTypings | server.InvalidateCachedTypings | server.BeginInstallTypes | server.EndInstallTypes) {
+                    if (response.kind === server.EventBeginInstallTypes) {
+                        beginEvent = response;
+                        return;
+                    }
+                    if (response.kind === server.EventEndInstallTypes) {
+                        endEvent = response;
+                        return;
+                    }
+                    super.sendResponse(response);
+                }
+            })();
+            const projectService = createProjectService(host, { typingsInstaller: installer });
+            projectService.openClientFile(f1.path);
+
+            installer.installAll(/*expectedCount*/ 1);
+
+            assert.isTrue(!!beginEvent);
+            assert.isTrue(!!endEvent);
+            assert.isTrue(beginEvent.eventId === endEvent.eventId);
+            assert.isFalse(endEvent.installSuccess);
+            checkNumberOfProjects(projectService, { inferredProjects: 1 });
+            checkProjectActualFiles(projectService.inferredProjects[0], [f1.path]);
+        });
+    });
 }
\ No newline at end of file
diff --git a/src/server/protocol.ts b/src/server/protocol.ts
index e1735f768e4..1e29b029104 100644
--- a/src/server/protocol.ts
+++ b/src/server/protocol.ts
@@ -2117,6 +2117,40 @@ namespace ts.server.protocol {
         typingsInstallerVersion: string;
     }
 
+    export type BeginInstallTypesEventName = "beginInstallTypes";
+    export type EndInstallTypesEventName = "endInstallTypes";
+
+    export interface BeginInstallTypesEvent extends Event {
+        event: BeginInstallTypesEventName;
+        body: BeginInstallTypesEventBody;
+    }
+
+    export interface EndInstallTypesEvent extends Event {
+        event: EndInstallTypesEventName;
+        body: EndInstallTypesEventBody;
+    }
+
+    export interface InstallTypesEventBody {
+        /**
+         * correlation id to match begin and end events
+         */
+        eventId: number;
+        /**
+         * list of packages to install
+         */
+        packages: ReadonlyArray<string>;
+    }
+
+    export interface BeginInstallTypesEventBody extends InstallTypesEventBody {
+    }
+
+    export interface EndInstallTypesEventBody extends InstallTypesEventBody {
+        /**
+         * true if installation succeeded, otherwise false
+         */
+        success: boolean;
+    }
+
     export interface NavBarResponse extends Response {
         body?: NavigationBarItem[];
     }
diff --git a/src/server/server.ts b/src/server/server.ts
index d5ccea4cd32..7367741b9ea 100644
--- a/src/server/server.ts
+++ b/src/server/server.ts
@@ -198,7 +198,7 @@ namespace ts.server {
         private socket: NodeSocket;
         private projectService: ProjectService;
         private throttledOperations: ThrottledOperations;
-        private telemetrySender: EventSender;
+        private eventSender: EventSender;
 
         constructor(
             private readonly telemetryEnabled: boolean,
@@ -231,7 +231,7 @@ namespace ts.server {
         }
 
         setTelemetrySender(telemetrySender: EventSender) {
-            this.telemetrySender = telemetrySender;
+            this.eventSender = telemetrySender;
         }
 
         attach(projectService: ProjectService) {
@@ -291,12 +291,30 @@ namespace ts.server {
             });
         }
 
-        private handleMessage(response: SetTypings | InvalidateCachedTypings | TypingsInstallEvent) {
+        private handleMessage(response: SetTypings | InvalidateCachedTypings | BeginInstallTypes | EndInstallTypes) {
             if (this.logger.hasLevel(LogLevel.verbose)) {
                 this.logger.info(`Received response: ${JSON.stringify(response)}`);
             }
-            if (response.kind === EventInstall) {
-                if (this.telemetrySender) {
+
+            if (response.kind === EventBeginInstallTypes) {
+                if (!this.eventSender) {
+                    return;
+                }
+                const body: protocol.BeginInstallTypesEventBody = {
+                    eventId: response.eventId,
+                    packages: response.packagesToInstall,
+                };
+                const eventName: protocol.BeginInstallTypesEventName = "beginInstallTypes";
+                this.eventSender.event(body, eventName);
+
+                return;
+            }
+
+            if (response.kind === EventEndInstallTypes) {
+                if (!this.eventSender) {
+                    return;
+                }
+                if (this.telemetryEnabled) {
                     const body: protocol.TypingsInstalledTelemetryEventBody = {
                         telemetryEventName: "typingsInstalled",
                         payload: {
@@ -306,10 +324,19 @@ namespace ts.server {
                         }
                     };
                     const eventName: protocol.TelemetryEventName = "telemetry";
-                    this.telemetrySender.event(body, eventName);
+                    this.eventSender.event(body, eventName);
                 }
+
+                const body: protocol.EndInstallTypesEventBody = {
+                    eventId: response.eventId,
+                    packages: response.packagesToInstall,
+                    success: response.installSuccess,
+                };
+                const eventName: protocol.EndInstallTypesEventName = "endInstallTypes";
+                this.eventSender.event(body, eventName);
                 return;
             }
+
             this.projectService.updateTypingsForProject(response);
             if (response.kind == ActionSet && this.socket) {
                 this.sendEvent(0, "setTypings", response);
diff --git a/src/server/shared.ts b/src/server/shared.ts
index 81a1f7fb55b..c56d4098e75 100644
--- a/src/server/shared.ts
+++ b/src/server/shared.ts
@@ -3,7 +3,8 @@
 namespace ts.server {
     export const ActionSet: ActionSet = "action::set";
     export const ActionInvalidate: ActionInvalidate = "action::invalidate";
-    export const EventInstall: EventInstall = "event::install";
+    export const EventBeginInstallTypes: EventBeginInstallTypes = "event::beginInstallTypes";
+    export const EventEndInstallTypes: EventEndInstallTypes = "event::endInstallTypes";
 
     export namespace Arguments {
         export const GlobalCacheLocation = "--globalTypingsCacheLocation";
diff --git a/src/server/types.d.ts b/src/server/types.d.ts
index 77e9e762b59..9f53fa8def1 100644
--- a/src/server/types.d.ts
+++ b/src/server/types.d.ts
@@ -43,10 +43,11 @@ declare namespace ts.server {
 
     export type ActionSet = "action::set";
     export type ActionInvalidate = "action::invalidate";
-    export type EventInstall = "event::install";
+    export type EventBeginInstallTypes = "event::beginInstallTypes";
+    export type EventEndInstallTypes = "event::endInstallTypes";
 
     export interface TypingInstallerResponse {
-        readonly kind: ActionSet | ActionInvalidate | EventInstall;
+        readonly kind: ActionSet | ActionInvalidate | EventBeginInstallTypes | EventEndInstallTypes;
     }
 
     export interface ProjectResponse extends TypingInstallerResponse {
@@ -65,11 +66,20 @@ declare namespace ts.server {
         readonly kind: ActionInvalidate;
     }
 
-    export interface TypingsInstallEvent extends TypingInstallerResponse {
-        readonly packagesToInstall: ReadonlyArray<string>;
-        readonly kind: EventInstall;
-        readonly installSuccess: boolean;
+    export interface InstallTypes extends ProjectResponse {
+        readonly kind: EventBeginInstallTypes | EventEndInstallTypes;
+        readonly eventId: number;
         readonly typingsInstallerVersion: string;
+        readonly packagesToInstall: ReadonlyArray<string>;
+    }
+
+    export interface BeginInstallTypes extends InstallTypes {
+        readonly kind: EventBeginInstallTypes;
+    }
+
+    export interface EndInstallTypes extends InstallTypes {
+        readonly kind: EventEndInstallTypes;
+        readonly installSuccess: boolean;
     }
 
     export interface InstallTypingHost extends JsTyping.TypingResolutionHost {
diff --git a/src/server/typingsInstaller/nodeTypingsInstaller.ts b/src/server/typingsInstaller/nodeTypingsInstaller.ts
index 235c2f16dad..19f794ad57c 100644
--- a/src/server/typingsInstaller/nodeTypingsInstaller.ts
+++ b/src/server/typingsInstaller/nodeTypingsInstaller.ts
@@ -70,13 +70,12 @@ namespace ts.server.typingsInstaller {
         private readonly npmPath: string;
         readonly typesRegistry: Map<void>;
 
-        constructor(globalTypingsCacheLocation: string, throttleLimit: number, telemetryEnabled: boolean, log: Log) {
+        constructor(globalTypingsCacheLocation: string, throttleLimit: number, log: Log) {
             super(
                 sys,
                 globalTypingsCacheLocation,
                 toPath("typingSafeList.json", __dirname, createGetCanonicalFileName(sys.useCaseSensitiveFileNames)),
                 throttleLimit,
-                telemetryEnabled,
                 log);
             if (this.log.isEnabled()) {
                 this.log.writeLine(`Process id: ${process.pid}`);
@@ -113,7 +112,7 @@ namespace ts.server.typingsInstaller {
             });
         }
 
-        protected sendResponse(response: SetTypings | InvalidateCachedTypings) {
+        protected sendResponse(response: SetTypings | InvalidateCachedTypings | BeginInstallTypes | EndInstallTypes) {
             if (this.log.isEnabled()) {
                 this.log.writeLine(`Sending response: ${JSON.stringify(response)}`);
             }
@@ -149,7 +148,6 @@ namespace ts.server.typingsInstaller {
 
     const logFilePath = findArgument(server.Arguments.LogFile);
     const globalTypingsCacheLocation = findArgument(server.Arguments.GlobalCacheLocation);
-    const telemetryEnabled = hasArgument(server.Arguments.EnableTelemetry);
 
     const log = new FileLog(logFilePath);
     if (log.isEnabled()) {
@@ -163,6 +161,6 @@ namespace ts.server.typingsInstaller {
         }
         process.exit(0);
     });
-    const installer = new NodeTypingsInstaller(globalTypingsCacheLocation, /*throttleLimit*/5, telemetryEnabled, log);
+    const installer = new NodeTypingsInstaller(globalTypingsCacheLocation, /*throttleLimit*/5, log);
     installer.listen();
 }
\ No newline at end of file
diff --git a/src/server/typingsInstaller/typingsInstaller.ts b/src/server/typingsInstaller/typingsInstaller.ts
index 25d53e14e75..7a09c1f6c21 100644
--- a/src/server/typingsInstaller/typingsInstaller.ts
+++ b/src/server/typingsInstaller/typingsInstaller.ts
@@ -97,7 +97,6 @@ namespace ts.server.typingsInstaller {
             readonly globalCachePath: string,
             readonly safeListPath: Path,
             readonly throttleLimit: number,
-            readonly telemetryEnabled: boolean,
             protected readonly log = nullLog) {
             if (this.log.isEnabled()) {
                 this.log.writeLine(`Global cache location '${globalCachePath}', safe file path '${safeListPath}'`);
@@ -309,47 +308,58 @@ namespace ts.server.typingsInstaller {
             const requestId = this.installRunCount;
             this.installRunCount++;
 
+            // send progress event
+            this.sendResponse(<BeginInstallTypes>{
+                kind: EventBeginInstallTypes,
+                eventId: requestId,
+                typingsInstallerVersion: ts.version, // qualified explicitly to prevent occasional shadowing
+                projectName: req.projectName
+            });
+
             this.installTypingsAsync(requestId, scopedTypings, cachePath, ok => {
-                if (this.telemetryEnabled) {
-                    this.sendResponse(<TypingsInstallEvent>{
-                        kind: EventInstall,
+                try {
+                    if (!ok) {
+                        if (this.log.isEnabled()) {
+                            this.log.writeLine(`install request failed, marking packages as missing to prevent repeated requests: ${JSON.stringify(filteredTypings)}`);
+                        }
+                        for (const typing of filteredTypings) {
+                            this.missingTypingsSet[typing] = true;
+                        }
+                        return;
+                    }
+
+                    // TODO: watch project directory
+                    if (this.log.isEnabled()) {
+                        this.log.writeLine(`Installed typings ${JSON.stringify(scopedTypings)}`);
+                    }
+                    const installedTypingFiles: string[] = [];
+                    for (const packageName of filteredTypings) {
+                        const typingFile = typingToFileName(cachePath, packageName, this.installTypingHost, this.log);
+                        if (!typingFile) {
+                            this.missingTypingsSet[packageName] = true;
+                            continue;
+                        }
+                        if (!this.packageNameToTypingLocation[packageName]) {
+                            this.packageNameToTypingLocation[packageName] = typingFile;
+                        }
+                        installedTypingFiles.push(typingFile);
+                    }
+                    if (this.log.isEnabled()) {
+                        this.log.writeLine(`Installed typing files ${JSON.stringify(installedTypingFiles)}`);
+                    }
+
+                    this.sendResponse(this.createSetTypings(req, currentlyCachedTypings.concat(installedTypingFiles)));
+                }
+                finally {
+                    this.sendResponse(<EndInstallTypes>{
+                        kind: EventEndInstallTypes,
+                        eventId: requestId,
+                        projectName: req.projectName,
                         packagesToInstall: scopedTypings,
                         installSuccess: ok,
                         typingsInstallerVersion: ts.version // qualified explicitly to prevent occasional shadowing
                     });
                 }
-
-                if (!ok) {
-                    if (this.log.isEnabled()) {
-                        this.log.writeLine(`install request failed, marking packages as missing to prevent repeated requests: ${JSON.stringify(filteredTypings)}`);
-                    }
-                    for (const typing of filteredTypings) {
-                        this.missingTypingsSet[typing] = true;
-                    }
-                    return;
-                }
-
-                // TODO: watch project directory
-                if (this.log.isEnabled()) {
-                    this.log.writeLine(`Installed typings ${JSON.stringify(scopedTypings)}`);
-                }
-                const installedTypingFiles: string[] = [];
-                for (const packageName of filteredTypings) {
-                    const typingFile = typingToFileName(cachePath, packageName, this.installTypingHost, this.log);
-                    if (!typingFile) {
-                        this.missingTypingsSet[packageName] = true;
-                        continue;
-                    }
-                    if (!this.packageNameToTypingLocation[packageName]) {
-                        this.packageNameToTypingLocation[packageName] = typingFile;
-                    }
-                    installedTypingFiles.push(typingFile);
-                }
-                if (this.log.isEnabled()) {
-                    this.log.writeLine(`Installed typing files ${JSON.stringify(installedTypingFiles)}`);
-                }
-
-                this.sendResponse(this.createSetTypings(req, currentlyCachedTypings.concat(installedTypingFiles)));
             });
         }
 
@@ -417,6 +427,6 @@ namespace ts.server.typingsInstaller {
         }
 
         protected abstract installWorker(requestId: number, args: string[], cwd: string, onRequestCompleted: RequestCompletedAction): void;
-        protected abstract sendResponse(response: SetTypings | InvalidateCachedTypings | TypingsInstallEvent): void;
+        protected abstract sendResponse(response: SetTypings | InvalidateCachedTypings | BeginInstallTypes | EndInstallTypes): void;
     }
 }
\ No newline at end of file

From 5c4f145d6adb073e9f1dd9aeaaa6ac85da76f09e Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Tue, 29 Nov 2016 10:36:55 -0800
Subject: [PATCH 366/421] Change name of the function

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 5b3f789732b..47ea4442e9e 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -3098,7 +3098,7 @@ namespace ts {
             let type: Type;
             if (pattern.kind === SyntaxKind.ObjectBindingPattern) {
                 if (declaration.dotDotDotToken) {
-                    if (isInvalidSpreadType(parentType)) {
+                    if (!isValidSpreadType(parentType)) {
                         error(declaration, Diagnostics.Rest_types_may_only_be_created_from_object_types);
                         return unknownType;
                     }
@@ -11449,7 +11449,7 @@ namespace ts {
                         typeFlags = 0;
                     }
                     const type = checkExpression((memberDecl as SpreadAssignment).expression);
-                    if (!(type.flags & TypeFlags.Any) && isInvalidSpreadType(type)) {
+                    if (!isValidSpreadType(type)) {
                         error(memberDecl, Diagnostics.Spread_types_may_only_be_created_from_object_types);
                         return unknownType;
                     }
@@ -11527,14 +11527,21 @@ namespace ts {
             }
        }
 
-        function isInvalidSpreadType(type: Type): boolean {
+        function isValidSpreadType(type: Type): boolean {
+            if (type.flags & TypeFlags.Any) {
+                return true;
+            }
             if (type.flags & TypeFlags.Object) {
-                return isGenericMappedType(type);
+                return !isGenericMappedType(type);
             }
             else if (type.flags & TypeFlags.UnionOrIntersection) {
-                return forEach((<UnionOrIntersectionType>type).types, isInvalidSpreadType);
+                for (const t of (<UnionOrIntersectionType>type).types) {
+                    if (!isValidSpreadType(t)) {
+                        return false;
+                    }
+                }
             }
-            return true;
+            return false;
         }
 
         function checkJsxSelfClosingElement(node: JsxSelfClosingElement) {

From 216f2861335f303cc2fb1abdf18480426cd114c3 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Tue, 29 Nov 2016 12:25:10 -0800
Subject: [PATCH 367/421] Handel null and undefined in object spread and rest

---
 src/compiler/checker.ts                       | 30 ++++++-
 .../reference/objectSpreadNegative.errors.txt |  8 +-
 .../restInvalidArgumentType.errors.txt        | 12 +--
 .../reference/restInvalidArgumentType.js      |  8 +-
 tests/baselines/reference/restUnion.js        | 36 ++++++++
 tests/baselines/reference/restUnion.symbols   | 44 ++++++++++
 tests/baselines/reference/restUnion.types     | 45 ++++++++++
 tests/baselines/reference/restUnion2.js       | 38 +++++++++
 tests/baselines/reference/restUnion2.symbols  | 52 ++++++++++++
 tests/baselines/reference/restUnion2.types    | 55 ++++++++++++
 .../spreadInvalidArgumentType.errors.txt      | 12 +--
 .../reference/spreadInvalidArgumentType.js    |  8 +-
 tests/baselines/reference/spreadUnion2.js     | 49 +++++++++++
 .../baselines/reference/spreadUnion2.symbols  | 74 ++++++++++++++++
 tests/baselines/reference/spreadUnion2.types  | 84 +++++++++++++++++++
 .../cases/compiler/restInvalidArgumentType.ts |  4 +-
 tests/cases/compiler/restUnion.ts             | 14 ++++
 tests/cases/compiler/restUnion2.ts            | 19 +++++
 .../compiler/spreadInvalidArgumentType.ts     |  4 +-
 tests/cases/compiler/spreadUnion2.ts          | 25 ++++++
 20 files changed, 580 insertions(+), 41 deletions(-)
 create mode 100644 tests/baselines/reference/restUnion.js
 create mode 100644 tests/baselines/reference/restUnion.symbols
 create mode 100644 tests/baselines/reference/restUnion.types
 create mode 100644 tests/baselines/reference/restUnion2.js
 create mode 100644 tests/baselines/reference/restUnion2.symbols
 create mode 100644 tests/baselines/reference/restUnion2.types
 create mode 100644 tests/baselines/reference/spreadUnion2.js
 create mode 100644 tests/baselines/reference/spreadUnion2.symbols
 create mode 100644 tests/baselines/reference/spreadUnion2.types
 create mode 100644 tests/cases/compiler/restUnion.ts
 create mode 100644 tests/cases/compiler/restUnion2.ts
 create mode 100644 tests/cases/compiler/spreadUnion2.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 47ea4442e9e..8177939fe61 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -3055,7 +3055,10 @@ namespace ts {
 
         function getRestType(source: Type, properties: PropertyName[], symbol: Symbol): Type {
             if (source.flags & TypeFlags.Union) {
-                return getUnionType(map((<UnionType>source).types, t => getRestType(t, properties, symbol)));
+                const types = filter((<UnionType>source).types, t => !(t.flags & TypeFlags.Nullable));
+                if (types.length) {
+                    return getUnionType(map(types, t => getRestType(t, properties, symbol)));
+                }
             }
 
             const members = createMap<Symbol>();
@@ -6111,11 +6114,29 @@ namespace ts {
             }
 
             if (left.flags & TypeFlags.Union) {
-                return getUnionType(map((<UnionType>left).types, t => getSpreadType(t, right, isFromObjectLiteral)));
+                const types = filter((<UnionType>left).types, t => !(t.flags & TypeFlags.Nullable));
+                if (types.length) {
+                    return getUnionType(map(types, t => getSpreadType(t, right, isFromObjectLiteral)));
+                }
+                else {
+                    left = emptyObjectType
+                }
+            }
+            else if (left.flags & TypeFlags.Nullable) {
+                left = emptyObjectType;
             }
 
             if (right.flags & TypeFlags.Union) {
-                return getUnionType(map((<UnionType>right).types, t => getSpreadType(left, t, isFromObjectLiteral)));
+                const types = filter((<UnionType>right).types, t => !(t.flags & TypeFlags.Nullable));
+                if (types.length) {
+                    return getUnionType(map(types, t => getSpreadType(left, t, isFromObjectLiteral)));
+                }
+                else {
+                    right = emptyObjectType
+                }
+            }
+            else if (right.flags & TypeFlags.Nullable) {
+                right = emptyObjectType;
             }
 
             const members = createMap<Symbol>();
@@ -11528,7 +11549,7 @@ namespace ts {
        }
 
         function isValidSpreadType(type: Type): boolean {
-            if (type.flags & TypeFlags.Any) {
+            if (type.flags & (TypeFlags.Any | TypeFlags.Null | TypeFlags.Undefined)) {
                 return true;
             }
             if (type.flags & TypeFlags.Object) {
@@ -11540,6 +11561,7 @@ namespace ts {
                         return false;
                     }
                 }
+                return true;
             }
             return false;
         }
diff --git a/tests/baselines/reference/objectSpreadNegative.errors.txt b/tests/baselines/reference/objectSpreadNegative.errors.txt
index dc6a356708f..e92b685b910 100644
--- a/tests/baselines/reference/objectSpreadNegative.errors.txt
+++ b/tests/baselines/reference/objectSpreadNegative.errors.txt
@@ -7,8 +7,6 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(25,1): error TS2322
   Property 's' is missing in type '{ b: boolean; }'.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(28,36): error TS2300: Duplicate identifier 'b'.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(28,53): error TS2300: Duplicate identifier 'b'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(32,20): error TS2698: Spread types may only be created from object types.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(33,24): error TS2698: Spread types may only be created from object types.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(34,19): error TS2698: Spread types may only be created from object types.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(35,19): error TS2698: Spread types may only be created from object types.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(37,20): error TS2698: Spread types may only be created from object types.
@@ -20,7 +18,7 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(58,14): error TS269
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(61,14): error TS2698: Spread types may only be created from object types.
 
 
-==== tests/cases/conformance/types/spread/objectSpreadNegative.ts (17 errors) ====
+==== tests/cases/conformance/types/spread/objectSpreadNegative.ts (15 errors) ====
     let o = { a: 1, b: 'no' }
     
     /// private propagates
@@ -68,11 +66,7 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(61,14): error TS269
     
     // null, undefined and primitives are not allowed
     let spreadNull = { ...null };
-                       ~~~~~~~
-!!! error TS2698: Spread types may only be created from object types.
     let spreadUndefind = { ...undefined };
-                           ~~~~~~~~~~~~
-!!! error TS2698: Spread types may only be created from object types.
     let spreadNum = { ...12 };
                       ~~~~~
 !!! error TS2698: Spread types may only be created from object types.
diff --git a/tests/baselines/reference/restInvalidArgumentType.errors.txt b/tests/baselines/reference/restInvalidArgumentType.errors.txt
index e7cf1ba6f9f..fff2c7b3563 100644
--- a/tests/baselines/reference/restInvalidArgumentType.errors.txt
+++ b/tests/baselines/reference/restInvalidArgumentType.errors.txt
@@ -9,14 +9,12 @@ tests/cases/compiler/restInvalidArgumentType.ts(44,13): error TS2700: Rest types
 tests/cases/compiler/restInvalidArgumentType.ts(45,13): error TS2700: Rest types may only be created from object types.
 tests/cases/compiler/restInvalidArgumentType.ts(47,13): error TS2700: Rest types may only be created from object types.
 tests/cases/compiler/restInvalidArgumentType.ts(48,13): error TS2700: Rest types may only be created from object types.
-tests/cases/compiler/restInvalidArgumentType.ts(50,13): error TS2700: Rest types may only be created from object types.
-tests/cases/compiler/restInvalidArgumentType.ts(51,13): error TS2700: Rest types may only be created from object types.
 tests/cases/compiler/restInvalidArgumentType.ts(55,13): error TS2700: Rest types may only be created from object types.
 tests/cases/compiler/restInvalidArgumentType.ts(56,13): error TS2700: Rest types may only be created from object types.
 tests/cases/compiler/restInvalidArgumentType.ts(58,13): error TS2700: Rest types may only be created from object types.
 
 
-==== tests/cases/compiler/restInvalidArgumentType.ts (16 errors) ====
+==== tests/cases/compiler/restInvalidArgumentType.ts (14 errors) ====
     enum E { v1, v2 };
     
     function f<T extends { b: string }>(p1: T, p2: T[]) {
@@ -88,12 +86,8 @@ tests/cases/compiler/restInvalidArgumentType.ts(58,13): error TS2700: Rest types
                 ~~~
 !!! error TS2700: Rest types may only be created from object types.
     
-        var {...r14} = u;  // Error
-                ~~~
-!!! error TS2700: Rest types may only be created from object types.
-        var {...r15} = n;  // Error
-                ~~~
-!!! error TS2700: Rest types may only be created from object types.
+        var {...r14} = u;  // OK
+        var {...r15} = n;  // OK
     
         var {...r16} = a;  // OK
     
diff --git a/tests/baselines/reference/restInvalidArgumentType.js b/tests/baselines/reference/restInvalidArgumentType.js
index 23b46a2f775..22a547880eb 100644
--- a/tests/baselines/reference/restInvalidArgumentType.js
+++ b/tests/baselines/reference/restInvalidArgumentType.js
@@ -48,8 +48,8 @@ function f<T extends { b: string }>(p1: T, p2: T[]) {
     var {...r12} = num;  // Error
     var {...r13} = str;  // Error
 
-    var {...r14} = u;  // Error
-    var {...r15} = n;  // Error
+    var {...r14} = u;  // OK
+    var {...r15} = n;  // OK
 
     var {...r16} = a;  // OK
 
@@ -106,8 +106,8 @@ function f(p1, p2) {
     var r11 = __rest(intersection_premitive, []); // Error, intersection with generic type parameter
     var r12 = __rest(num, []); // Error
     var r13 = __rest(str, []); // Error
-    var r14 = __rest(u, []); // Error
-    var r15 = __rest(n, []); // Error
+    var r14 = __rest(u, []); // OK
+    var r15 = __rest(n, []); // OK
     var r16 = __rest(a, []); // OK
     var r17 = __rest(literal_string, []); // Error
     var r18 = __rest(literal_number, []); // Error
diff --git a/tests/baselines/reference/restUnion.js b/tests/baselines/reference/restUnion.js
new file mode 100644
index 00000000000..beaf514808b
--- /dev/null
+++ b/tests/baselines/reference/restUnion.js
@@ -0,0 +1,36 @@
+//// [restUnion.ts]
+var union: { a: number, c: boolean } | { a: string, b: string };
+
+var rest1: { c: boolean } | { b: string };
+var {a, ...rest1 } = union;
+
+
+var undefinedUnion: { n: number } | undefined;
+var rest2: {};
+var {n, ...rest2 } = undefinedUnion;
+
+
+var nullUnion: { n: number } | null;
+var rest3: {};
+var {n, ...rest3 } = nullUnion;
+
+
+//// [restUnion.js]
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
+            t[p[i]] = s[p[i]];
+    return t;
+};
+var union;
+var rest1;
+var a = union.a, rest1 = __rest(union, ["a"]);
+var undefinedUnion;
+var rest2;
+var n = undefinedUnion.n, rest2 = __rest(undefinedUnion, ["n"]);
+var nullUnion;
+var rest3;
+var n = nullUnion.n, rest3 = __rest(nullUnion, ["n"]);
diff --git a/tests/baselines/reference/restUnion.symbols b/tests/baselines/reference/restUnion.symbols
new file mode 100644
index 00000000000..660c85badb4
--- /dev/null
+++ b/tests/baselines/reference/restUnion.symbols
@@ -0,0 +1,44 @@
+=== tests/cases/compiler/restUnion.ts ===
+var union: { a: number, c: boolean } | { a: string, b: string };
+>union : Symbol(union, Decl(restUnion.ts, 0, 3))
+>a : Symbol(a, Decl(restUnion.ts, 0, 12))
+>c : Symbol(c, Decl(restUnion.ts, 0, 23))
+>a : Symbol(a, Decl(restUnion.ts, 0, 40))
+>b : Symbol(b, Decl(restUnion.ts, 0, 51))
+
+var rest1: { c: boolean } | { b: string };
+>rest1 : Symbol(rest1, Decl(restUnion.ts, 2, 3), Decl(restUnion.ts, 3, 7))
+>c : Symbol(c, Decl(restUnion.ts, 2, 12))
+>b : Symbol(b, Decl(restUnion.ts, 2, 29))
+
+var {a, ...rest1 } = union;
+>a : Symbol(a, Decl(restUnion.ts, 3, 5))
+>rest1 : Symbol(rest1, Decl(restUnion.ts, 2, 3), Decl(restUnion.ts, 3, 7))
+>union : Symbol(union, Decl(restUnion.ts, 0, 3))
+
+
+var undefinedUnion: { n: number } | undefined;
+>undefinedUnion : Symbol(undefinedUnion, Decl(restUnion.ts, 6, 3))
+>n : Symbol(n, Decl(restUnion.ts, 6, 21))
+
+var rest2: {};
+>rest2 : Symbol(rest2, Decl(restUnion.ts, 7, 3), Decl(restUnion.ts, 8, 7))
+
+var {n, ...rest2 } = undefinedUnion;
+>n : Symbol(n, Decl(restUnion.ts, 8, 5), Decl(restUnion.ts, 13, 5))
+>rest2 : Symbol(rest2, Decl(restUnion.ts, 7, 3), Decl(restUnion.ts, 8, 7))
+>undefinedUnion : Symbol(undefinedUnion, Decl(restUnion.ts, 6, 3))
+
+
+var nullUnion: { n: number } | null;
+>nullUnion : Symbol(nullUnion, Decl(restUnion.ts, 11, 3))
+>n : Symbol(n, Decl(restUnion.ts, 11, 16))
+
+var rest3: {};
+>rest3 : Symbol(rest3, Decl(restUnion.ts, 12, 3), Decl(restUnion.ts, 13, 7))
+
+var {n, ...rest3 } = nullUnion;
+>n : Symbol(n, Decl(restUnion.ts, 8, 5), Decl(restUnion.ts, 13, 5))
+>rest3 : Symbol(rest3, Decl(restUnion.ts, 12, 3), Decl(restUnion.ts, 13, 7))
+>nullUnion : Symbol(nullUnion, Decl(restUnion.ts, 11, 3))
+
diff --git a/tests/baselines/reference/restUnion.types b/tests/baselines/reference/restUnion.types
new file mode 100644
index 00000000000..9837466684b
--- /dev/null
+++ b/tests/baselines/reference/restUnion.types
@@ -0,0 +1,45 @@
+=== tests/cases/compiler/restUnion.ts ===
+var union: { a: number, c: boolean } | { a: string, b: string };
+>union : { a: number; c: boolean; } | { a: string; b: string; }
+>a : number
+>c : boolean
+>a : string
+>b : string
+
+var rest1: { c: boolean } | { b: string };
+>rest1 : { c: boolean; } | { b: string; }
+>c : boolean
+>b : string
+
+var {a, ...rest1 } = union;
+>a : string | number
+>rest1 : { c: boolean; } | { b: string; }
+>union : { a: number; c: boolean; } | { a: string; b: string; }
+
+
+var undefinedUnion: { n: number } | undefined;
+>undefinedUnion : { n: number; }
+>n : number
+
+var rest2: {};
+>rest2 : {}
+
+var {n, ...rest2 } = undefinedUnion;
+>n : number
+>rest2 : {}
+>undefinedUnion : { n: number; }
+
+
+var nullUnion: { n: number } | null;
+>nullUnion : { n: number; }
+>n : number
+>null : null
+
+var rest3: {};
+>rest3 : {}
+
+var {n, ...rest3 } = nullUnion;
+>n : number
+>rest3 : {}
+>nullUnion : { n: number; }
+
diff --git a/tests/baselines/reference/restUnion2.js b/tests/baselines/reference/restUnion2.js
new file mode 100644
index 00000000000..d7466981645
--- /dev/null
+++ b/tests/baselines/reference/restUnion2.js
@@ -0,0 +1,38 @@
+//// [restUnion2.ts]
+
+declare const undefinedUnion: { n: number } | undefined;
+var rest2: { n: number };
+var {...rest2 } = undefinedUnion;
+
+
+declare const nullUnion: { n: number } | null;
+var rest3: { n: number };
+var {...rest3 } = nullUnion;
+
+
+declare const nullAndUndefinedUnion: null | undefined;
+var rest4: { };
+var {...rest4 } = nullAndUndefinedUnion;
+
+declare const unionWithIntersection: ({ n: number } & { s: string }) & undefined | null;
+var rest5: { n: number, s: string };
+var {...rest5 } = unionWithIntersection;
+
+//// [restUnion2.js]
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
+            t[p[i]] = s[p[i]];
+    return t;
+};
+var rest2;
+var rest2 = __rest(undefinedUnion, []);
+var rest3;
+var rest3 = __rest(nullUnion, []);
+var rest4;
+var rest4 = __rest(nullAndUndefinedUnion, []);
+var rest5;
+var rest5 = __rest(unionWithIntersection, []);
diff --git a/tests/baselines/reference/restUnion2.symbols b/tests/baselines/reference/restUnion2.symbols
new file mode 100644
index 00000000000..20a113a23b4
--- /dev/null
+++ b/tests/baselines/reference/restUnion2.symbols
@@ -0,0 +1,52 @@
+=== tests/cases/compiler/restUnion2.ts ===
+
+declare const undefinedUnion: { n: number } | undefined;
+>undefinedUnion : Symbol(undefinedUnion, Decl(restUnion2.ts, 1, 13))
+>n : Symbol(n, Decl(restUnion2.ts, 1, 31))
+
+var rest2: { n: number };
+>rest2 : Symbol(rest2, Decl(restUnion2.ts, 2, 3), Decl(restUnion2.ts, 3, 5))
+>n : Symbol(n, Decl(restUnion2.ts, 2, 12))
+
+var {...rest2 } = undefinedUnion;
+>rest2 : Symbol(rest2, Decl(restUnion2.ts, 2, 3), Decl(restUnion2.ts, 3, 5))
+>undefinedUnion : Symbol(undefinedUnion, Decl(restUnion2.ts, 1, 13))
+
+
+declare const nullUnion: { n: number } | null;
+>nullUnion : Symbol(nullUnion, Decl(restUnion2.ts, 6, 13))
+>n : Symbol(n, Decl(restUnion2.ts, 6, 26))
+
+var rest3: { n: number };
+>rest3 : Symbol(rest3, Decl(restUnion2.ts, 7, 3), Decl(restUnion2.ts, 8, 5))
+>n : Symbol(n, Decl(restUnion2.ts, 7, 12))
+
+var {...rest3 } = nullUnion;
+>rest3 : Symbol(rest3, Decl(restUnion2.ts, 7, 3), Decl(restUnion2.ts, 8, 5))
+>nullUnion : Symbol(nullUnion, Decl(restUnion2.ts, 6, 13))
+
+
+declare const nullAndUndefinedUnion: null | undefined;
+>nullAndUndefinedUnion : Symbol(nullAndUndefinedUnion, Decl(restUnion2.ts, 11, 13))
+
+var rest4: { };
+>rest4 : Symbol(rest4, Decl(restUnion2.ts, 12, 3), Decl(restUnion2.ts, 13, 5))
+
+var {...rest4 } = nullAndUndefinedUnion;
+>rest4 : Symbol(rest4, Decl(restUnion2.ts, 12, 3), Decl(restUnion2.ts, 13, 5))
+>nullAndUndefinedUnion : Symbol(nullAndUndefinedUnion, Decl(restUnion2.ts, 11, 13))
+
+declare const unionWithIntersection: ({ n: number } & { s: string }) & undefined | null;
+>unionWithIntersection : Symbol(unionWithIntersection, Decl(restUnion2.ts, 15, 13))
+>n : Symbol(n, Decl(restUnion2.ts, 15, 39))
+>s : Symbol(s, Decl(restUnion2.ts, 15, 55))
+
+var rest5: { n: number, s: string };
+>rest5 : Symbol(rest5, Decl(restUnion2.ts, 16, 3), Decl(restUnion2.ts, 17, 5))
+>n : Symbol(n, Decl(restUnion2.ts, 16, 12))
+>s : Symbol(s, Decl(restUnion2.ts, 16, 23))
+
+var {...rest5 } = unionWithIntersection;
+>rest5 : Symbol(rest5, Decl(restUnion2.ts, 16, 3), Decl(restUnion2.ts, 17, 5))
+>unionWithIntersection : Symbol(unionWithIntersection, Decl(restUnion2.ts, 15, 13))
+
diff --git a/tests/baselines/reference/restUnion2.types b/tests/baselines/reference/restUnion2.types
new file mode 100644
index 00000000000..81b768777fd
--- /dev/null
+++ b/tests/baselines/reference/restUnion2.types
@@ -0,0 +1,55 @@
+=== tests/cases/compiler/restUnion2.ts ===
+
+declare const undefinedUnion: { n: number } | undefined;
+>undefinedUnion : { n: number; } | undefined
+>n : number
+
+var rest2: { n: number };
+>rest2 : { n: number; }
+>n : number
+
+var {...rest2 } = undefinedUnion;
+>rest2 : { n: number; }
+>undefinedUnion : { n: number; } | undefined
+
+
+declare const nullUnion: { n: number } | null;
+>nullUnion : { n: number; } | null
+>n : number
+>null : null
+
+var rest3: { n: number };
+>rest3 : { n: number; }
+>n : number
+
+var {...rest3 } = nullUnion;
+>rest3 : { n: number; }
+>nullUnion : { n: number; } | null
+
+
+declare const nullAndUndefinedUnion: null | undefined;
+>nullAndUndefinedUnion : null | undefined
+>null : null
+
+var rest4: { };
+>rest4 : {}
+
+var {...rest4 } = nullAndUndefinedUnion;
+>rest4 : {}
+>nullAndUndefinedUnion : null | undefined
+
+declare const unionWithIntersection: ({ n: number } & { s: string }) & undefined | null;
+>unionWithIntersection : ({ n: number; } & { s: string; } & undefined) | null
+>n : number
+>s : string
+>null : null
+
+var rest5: { n: number, s: string };
+>rest5 : { n: number; s: string; }
+>n : number
+>s : string
+
+var {...rest5 } = unionWithIntersection;
+>rest5 : { n: number; s: string; }
+>unionWithIntersection : ({ n: number; } & { s: string; } & undefined) | null
+
diff --git a/tests/baselines/reference/spreadInvalidArgumentType.errors.txt b/tests/baselines/reference/spreadInvalidArgumentType.errors.txt
index 34356e53813..5088390f9ee 100644
--- a/tests/baselines/reference/spreadInvalidArgumentType.errors.txt
+++ b/tests/baselines/reference/spreadInvalidArgumentType.errors.txt
@@ -9,14 +9,12 @@ tests/cases/compiler/spreadInvalidArgumentType.ts(44,17): error TS2698: Spread t
 tests/cases/compiler/spreadInvalidArgumentType.ts(45,17): error TS2698: Spread types may only be created from object types.
 tests/cases/compiler/spreadInvalidArgumentType.ts(47,17): error TS2698: Spread types may only be created from object types.
 tests/cases/compiler/spreadInvalidArgumentType.ts(48,17): error TS2698: Spread types may only be created from object types.
-tests/cases/compiler/spreadInvalidArgumentType.ts(50,17): error TS2698: Spread types may only be created from object types.
-tests/cases/compiler/spreadInvalidArgumentType.ts(51,17): error TS2698: Spread types may only be created from object types.
 tests/cases/compiler/spreadInvalidArgumentType.ts(55,17): error TS2698: Spread types may only be created from object types.
 tests/cases/compiler/spreadInvalidArgumentType.ts(56,17): error TS2698: Spread types may only be created from object types.
 tests/cases/compiler/spreadInvalidArgumentType.ts(58,17): error TS2698: Spread types may only be created from object types.
 
 
-==== tests/cases/compiler/spreadInvalidArgumentType.ts (16 errors) ====
+==== tests/cases/compiler/spreadInvalidArgumentType.ts (14 errors) ====
     enum E { v1, v2 };
     
     function f<T extends { b: string }>(p1: T, p2: T[]) {
@@ -88,12 +86,8 @@ tests/cases/compiler/spreadInvalidArgumentType.ts(58,17): error TS2698: Spread t
                     ~~~~~~
 !!! error TS2698: Spread types may only be created from object types.
     
-        var o14 = { ...u };  // Error
-                    ~~~~
-!!! error TS2698: Spread types may only be created from object types.
-        var o15 = { ...n };  // Error
-                    ~~~~
-!!! error TS2698: Spread types may only be created from object types.
+        var o14 = { ...u };  // OK
+        var o15 = { ...n };  // OK
     
         var o16 = { ...a };  // OK
     
diff --git a/tests/baselines/reference/spreadInvalidArgumentType.js b/tests/baselines/reference/spreadInvalidArgumentType.js
index ecea599842e..26f958f224d 100644
--- a/tests/baselines/reference/spreadInvalidArgumentType.js
+++ b/tests/baselines/reference/spreadInvalidArgumentType.js
@@ -48,8 +48,8 @@ function f<T extends { b: string }>(p1: T, p2: T[]) {
     var o12 = { ...num };  // Error
     var o13 = { ...str };  // Error
 
-    var o14 = { ...u };  // Error
-    var o15 = { ...n };  // Error
+    var o14 = { ...u };  // OK
+    var o15 = { ...n };  // OK
 
     var o16 = { ...a };  // OK
 
@@ -105,8 +105,8 @@ function f(p1, p2) {
     var o11 = __assign({}, intersection_premitive); // Error, intersection with generic type parameter
     var o12 = __assign({}, num); // Error
     var o13 = __assign({}, str); // Error
-    var o14 = __assign({}, u); // Error
-    var o15 = __assign({}, n); // Error
+    var o14 = __assign({}, u); // OK
+    var o15 = __assign({}, n); // OK
     var o16 = __assign({}, a); // OK
     var o17 = __assign({}, literal_string); // Error
     var o18 = __assign({}, literal_number); // Error
diff --git a/tests/baselines/reference/spreadUnion2.js b/tests/baselines/reference/spreadUnion2.js
new file mode 100644
index 00000000000..6c7527af9dd
--- /dev/null
+++ b/tests/baselines/reference/spreadUnion2.js
@@ -0,0 +1,49 @@
+//// [spreadUnion2.ts]
+
+declare const undefinedUnion: { a: number } | undefined;
+declare const nullUnion: { b: number } | null;
+declare const nullAndUndefinedUnion: null | undefined;
+
+var o1: { a: number };
+var o1 = { ...undefinedUnion };
+
+var o2: { b: number };
+var o2 = { ...nullUnion };
+
+var o3: { a: number, b: number };
+var o3 = { ...undefinedUnion, ...nullUnion };
+var o3 = { ...nullUnion, ...undefinedUnion };
+
+var o4: { a: number };
+var o4 = { ...undefinedUnion, ...undefinedUnion };
+
+var o5: { b: number };
+var o5 = { ...nullUnion, ...nullUnion };
+
+var o6: { };
+var o6 = { ...nullAndUndefinedUnion, ...nullAndUndefinedUnion };
+var o6 = { ...nullAndUndefinedUnion };
+
+//// [spreadUnion2.js]
+var __assign = (this && this.__assign) || Object.assign || function(t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+        s = arguments[i];
+        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+            t[p] = s[p];
+    }
+    return t;
+};
+var o1;
+var o1 = __assign({}, undefinedUnion);
+var o2;
+var o2 = __assign({}, nullUnion);
+var o3;
+var o3 = __assign({}, undefinedUnion, nullUnion);
+var o3 = __assign({}, nullUnion, undefinedUnion);
+var o4;
+var o4 = __assign({}, undefinedUnion, undefinedUnion);
+var o5;
+var o5 = __assign({}, nullUnion, nullUnion);
+var o6;
+var o6 = __assign({}, nullAndUndefinedUnion, nullAndUndefinedUnion);
+var o6 = __assign({}, nullAndUndefinedUnion);
diff --git a/tests/baselines/reference/spreadUnion2.symbols b/tests/baselines/reference/spreadUnion2.symbols
new file mode 100644
index 00000000000..cc2c194f2a6
--- /dev/null
+++ b/tests/baselines/reference/spreadUnion2.symbols
@@ -0,0 +1,74 @@
+=== tests/cases/compiler/spreadUnion2.ts ===
+
+declare const undefinedUnion: { a: number } | undefined;
+>undefinedUnion : Symbol(undefinedUnion, Decl(spreadUnion2.ts, 1, 13))
+>a : Symbol(a, Decl(spreadUnion2.ts, 1, 31))
+
+declare const nullUnion: { b: number } | null;
+>nullUnion : Symbol(nullUnion, Decl(spreadUnion2.ts, 2, 13))
+>b : Symbol(b, Decl(spreadUnion2.ts, 2, 26))
+
+declare const nullAndUndefinedUnion: null | undefined;
+>nullAndUndefinedUnion : Symbol(nullAndUndefinedUnion, Decl(spreadUnion2.ts, 3, 13))
+
+var o1: { a: number };
+>o1 : Symbol(o1, Decl(spreadUnion2.ts, 5, 3), Decl(spreadUnion2.ts, 6, 3))
+>a : Symbol(a, Decl(spreadUnion2.ts, 5, 9))
+
+var o1 = { ...undefinedUnion };
+>o1 : Symbol(o1, Decl(spreadUnion2.ts, 5, 3), Decl(spreadUnion2.ts, 6, 3))
+>undefinedUnion : Symbol(undefinedUnion, Decl(spreadUnion2.ts, 1, 13))
+
+var o2: { b: number };
+>o2 : Symbol(o2, Decl(spreadUnion2.ts, 8, 3), Decl(spreadUnion2.ts, 9, 3))
+>b : Symbol(b, Decl(spreadUnion2.ts, 8, 9))
+
+var o2 = { ...nullUnion };
+>o2 : Symbol(o2, Decl(spreadUnion2.ts, 8, 3), Decl(spreadUnion2.ts, 9, 3))
+>nullUnion : Symbol(nullUnion, Decl(spreadUnion2.ts, 2, 13))
+
+var o3: { a: number, b: number };
+>o3 : Symbol(o3, Decl(spreadUnion2.ts, 11, 3), Decl(spreadUnion2.ts, 12, 3), Decl(spreadUnion2.ts, 13, 3))
+>a : Symbol(a, Decl(spreadUnion2.ts, 11, 9))
+>b : Symbol(b, Decl(spreadUnion2.ts, 11, 20))
+
+var o3 = { ...undefinedUnion, ...nullUnion };
+>o3 : Symbol(o3, Decl(spreadUnion2.ts, 11, 3), Decl(spreadUnion2.ts, 12, 3), Decl(spreadUnion2.ts, 13, 3))
+>undefinedUnion : Symbol(undefinedUnion, Decl(spreadUnion2.ts, 1, 13))
+>nullUnion : Symbol(nullUnion, Decl(spreadUnion2.ts, 2, 13))
+
+var o3 = { ...nullUnion, ...undefinedUnion };
+>o3 : Symbol(o3, Decl(spreadUnion2.ts, 11, 3), Decl(spreadUnion2.ts, 12, 3), Decl(spreadUnion2.ts, 13, 3))
+>nullUnion : Symbol(nullUnion, Decl(spreadUnion2.ts, 2, 13))
+>undefinedUnion : Symbol(undefinedUnion, Decl(spreadUnion2.ts, 1, 13))
+
+var o4: { a: number };
+>o4 : Symbol(o4, Decl(spreadUnion2.ts, 15, 3), Decl(spreadUnion2.ts, 16, 3))
+>a : Symbol(a, Decl(spreadUnion2.ts, 15, 9))
+
+var o4 = { ...undefinedUnion, ...undefinedUnion };
+>o4 : Symbol(o4, Decl(spreadUnion2.ts, 15, 3), Decl(spreadUnion2.ts, 16, 3))
+>undefinedUnion : Symbol(undefinedUnion, Decl(spreadUnion2.ts, 1, 13))
+>undefinedUnion : Symbol(undefinedUnion, Decl(spreadUnion2.ts, 1, 13))
+
+var o5: { b: number };
+>o5 : Symbol(o5, Decl(spreadUnion2.ts, 18, 3), Decl(spreadUnion2.ts, 19, 3))
+>b : Symbol(b, Decl(spreadUnion2.ts, 18, 9))
+
+var o5 = { ...nullUnion, ...nullUnion };
+>o5 : Symbol(o5, Decl(spreadUnion2.ts, 18, 3), Decl(spreadUnion2.ts, 19, 3))
+>nullUnion : Symbol(nullUnion, Decl(spreadUnion2.ts, 2, 13))
+>nullUnion : Symbol(nullUnion, Decl(spreadUnion2.ts, 2, 13))
+
+var o6: { };
+>o6 : Symbol(o6, Decl(spreadUnion2.ts, 21, 3), Decl(spreadUnion2.ts, 22, 3), Decl(spreadUnion2.ts, 23, 3))
+
+var o6 = { ...nullAndUndefinedUnion, ...nullAndUndefinedUnion };
+>o6 : Symbol(o6, Decl(spreadUnion2.ts, 21, 3), Decl(spreadUnion2.ts, 22, 3), Decl(spreadUnion2.ts, 23, 3))
+>nullAndUndefinedUnion : Symbol(nullAndUndefinedUnion, Decl(spreadUnion2.ts, 3, 13))
+>nullAndUndefinedUnion : Symbol(nullAndUndefinedUnion, Decl(spreadUnion2.ts, 3, 13))
+
+var o6 = { ...nullAndUndefinedUnion };
+>o6 : Symbol(o6, Decl(spreadUnion2.ts, 21, 3), Decl(spreadUnion2.ts, 22, 3), Decl(spreadUnion2.ts, 23, 3))
+>nullAndUndefinedUnion : Symbol(nullAndUndefinedUnion, Decl(spreadUnion2.ts, 3, 13))
+
diff --git a/tests/baselines/reference/spreadUnion2.types b/tests/baselines/reference/spreadUnion2.types
new file mode 100644
index 00000000000..cf90381ca77
--- /dev/null
+++ b/tests/baselines/reference/spreadUnion2.types
@@ -0,0 +1,84 @@
+=== tests/cases/compiler/spreadUnion2.ts ===
+
+declare const undefinedUnion: { a: number } | undefined;
+>undefinedUnion : { a: number; } | undefined
+>a : number
+
+declare const nullUnion: { b: number } | null;
+>nullUnion : { b: number; } | null
+>b : number
+>null : null
+
+declare const nullAndUndefinedUnion: null | undefined;
+>nullAndUndefinedUnion : null | undefined
+>null : null
+
+var o1: { a: number };
+>o1 : { a: number; }
+>a : number
+
+var o1 = { ...undefinedUnion };
+>o1 : { a: number; }
+>{ ...undefinedUnion } : { a: number; }
+>undefinedUnion : { a: number; } | undefined
+
+var o2: { b: number };
+>o2 : { b: number; }
+>b : number
+
+var o2 = { ...nullUnion };
+>o2 : { b: number; }
+>{ ...nullUnion } : { b: number; }
+>nullUnion : { b: number; } | null
+
+var o3: { a: number, b: number };
+>o3 : { a: number; b: number; }
+>a : number
+>b : number
+
+var o3 = { ...undefinedUnion, ...nullUnion };
+>o3 : { a: number; b: number; }
+>{ ...undefinedUnion, ...nullUnion } : { b: number; a: number; }
+>undefinedUnion : { a: number; } | undefined
+>nullUnion : { b: number; } | null
+
+var o3 = { ...nullUnion, ...undefinedUnion };
+>o3 : { a: number; b: number; }
+>{ ...nullUnion, ...undefinedUnion } : { a: number; b: number; }
+>nullUnion : { b: number; } | null
+>undefinedUnion : { a: number; } | undefined
+
+var o4: { a: number };
+>o4 : { a: number; }
+>a : number
+
+var o4 = { ...undefinedUnion, ...undefinedUnion };
+>o4 : { a: number; }
+>{ ...undefinedUnion, ...undefinedUnion } : { a: number; }
+>undefinedUnion : { a: number; } | undefined
+>undefinedUnion : { a: number; } | undefined
+
+var o5: { b: number };
+>o5 : { b: number; }
+>b : number
+
+var o5 = { ...nullUnion, ...nullUnion };
+>o5 : { b: number; }
+>{ ...nullUnion, ...nullUnion } : { b: number; }
+>nullUnion : { b: number; } | null
+>nullUnion : { b: number; } | null
+
+var o6: { };
+>o6 : {}
+
+var o6 = { ...nullAndUndefinedUnion, ...nullAndUndefinedUnion };
+>o6 : {}
+>{ ...nullAndUndefinedUnion, ...nullAndUndefinedUnion } : {}
+>nullAndUndefinedUnion : null | undefined
+>nullAndUndefinedUnion : null | undefined
+
+var o6 = { ...nullAndUndefinedUnion };
+>o6 : {}
+>{ ...nullAndUndefinedUnion } : {}
+>nullAndUndefinedUnion : null | undefined
+
diff --git a/tests/cases/compiler/restInvalidArgumentType.ts b/tests/cases/compiler/restInvalidArgumentType.ts
index 7f7037bbb33..488f546e231 100644
--- a/tests/cases/compiler/restInvalidArgumentType.ts
+++ b/tests/cases/compiler/restInvalidArgumentType.ts
@@ -47,8 +47,8 @@ function f<T extends { b: string }>(p1: T, p2: T[]) {
     var {...r12} = num;  // Error
     var {...r13} = str;  // Error
 
-    var {...r14} = u;  // Error
-    var {...r15} = n;  // Error
+    var {...r14} = u;  // OK
+    var {...r15} = n;  // OK
 
     var {...r16} = a;  // OK
 
diff --git a/tests/cases/compiler/restUnion.ts b/tests/cases/compiler/restUnion.ts
new file mode 100644
index 00000000000..c838b37340f
--- /dev/null
+++ b/tests/cases/compiler/restUnion.ts
@@ -0,0 +1,14 @@
+var union: { a: number, c: boolean } | { a: string, b: string };
+
+var rest1: { c: boolean } | { b: string };
+var {a, ...rest1 } = union;
+
+
+var undefinedUnion: { n: number } | undefined;
+var rest2: {};
+var {n, ...rest2 } = undefinedUnion;
+
+
+var nullUnion: { n: number } | null;
+var rest3: {};
+var {n, ...rest3 } = nullUnion;
diff --git a/tests/cases/compiler/restUnion2.ts b/tests/cases/compiler/restUnion2.ts
new file mode 100644
index 00000000000..83d94e03a73
--- /dev/null
+++ b/tests/cases/compiler/restUnion2.ts
@@ -0,0 +1,19 @@
+// @strictNullChecks: true
+
+declare const undefinedUnion: { n: number } | undefined;
+var rest2: { n: number };
+var {...rest2 } = undefinedUnion;
+
+
+declare const nullUnion: { n: number } | null;
+var rest3: { n: number };
+var {...rest3 } = nullUnion;
+
+
+declare const nullAndUndefinedUnion: null | undefined;
+var rest4: { };
+var {...rest4 } = nullAndUndefinedUnion;
+
+declare const unionWithIntersection: ({ n: number } & { s: string }) & undefined | null;
+var rest5: { n: number, s: string };
+var {...rest5 } = unionWithIntersection;
\ No newline at end of file
diff --git a/tests/cases/compiler/spreadInvalidArgumentType.ts b/tests/cases/compiler/spreadInvalidArgumentType.ts
index bb8f4894711..2ac6aa921f4 100644
--- a/tests/cases/compiler/spreadInvalidArgumentType.ts
+++ b/tests/cases/compiler/spreadInvalidArgumentType.ts
@@ -47,8 +47,8 @@ function f<T extends { b: string }>(p1: T, p2: T[]) {
     var o12 = { ...num };  // Error
     var o13 = { ...str };  // Error
 
-    var o14 = { ...u };  // Error
-    var o15 = { ...n };  // Error
+    var o14 = { ...u };  // OK
+    var o15 = { ...n };  // OK
 
     var o16 = { ...a };  // OK
 
diff --git a/tests/cases/compiler/spreadUnion2.ts b/tests/cases/compiler/spreadUnion2.ts
new file mode 100644
index 00000000000..25dba81c0df
--- /dev/null
+++ b/tests/cases/compiler/spreadUnion2.ts
@@ -0,0 +1,25 @@
+// @strictNullChecks: true
+
+declare const undefinedUnion: { a: number } | undefined;
+declare const nullUnion: { b: number } | null;
+declare const nullAndUndefinedUnion: null | undefined;
+
+var o1: { a: number };
+var o1 = { ...undefinedUnion };
+
+var o2: { b: number };
+var o2 = { ...nullUnion };
+
+var o3: { a: number, b: number };
+var o3 = { ...undefinedUnion, ...nullUnion };
+var o3 = { ...nullUnion, ...undefinedUnion };
+
+var o4: { a: number };
+var o4 = { ...undefinedUnion, ...undefinedUnion };
+
+var o5: { b: number };
+var o5 = { ...nullUnion, ...nullUnion };
+
+var o6: { };
+var o6 = { ...nullAndUndefinedUnion, ...nullAndUndefinedUnion };
+var o6 = { ...nullAndUndefinedUnion };
\ No newline at end of file

From 86b48e3f89ada9fc29dee0e20c814830683a3bd2 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Tue, 29 Nov 2016 12:26:57 -0800
Subject: [PATCH 368/421] Handel null and undefined in `__rest`

---
 src/compiler/transformers/destructuring.ts                  | 2 +-
 tests/baselines/reference/objectRest.js                     | 2 +-
 tests/baselines/reference/objectRestAssignment.js           | 2 +-
 tests/baselines/reference/objectRestForOf.js                | 2 +-
 tests/baselines/reference/objectRestNegative.js             | 2 +-
 tests/baselines/reference/objectRestParameter.js            | 2 +-
 tests/baselines/reference/restIntersectionOrIntersection.js | 2 +-
 tests/baselines/reference/restInvalidArgumentType.js        | 2 +-
 tests/baselines/reference/restUnion.js                      | 2 +-
 tests/baselines/reference/restUnion2.js                     | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/compiler/transformers/destructuring.ts b/src/compiler/transformers/destructuring.ts
index 43590791c83..8e32259ff0f 100644
--- a/src/compiler/transformers/destructuring.ts
+++ b/src/compiler/transformers/destructuring.ts
@@ -459,7 +459,7 @@ namespace ts {
                 var t = {};
                 for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
                     t[p] = s[p];
-                if (typeof Object.getOwnPropertySymbols === "function")
+                if (s != null && typeof Object.getOwnPropertySymbols === "function")
                     for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
                         t[p[i]] = s[p[i]];
                 return t;
diff --git a/tests/baselines/reference/objectRest.js b/tests/baselines/reference/objectRest.js
index 85d8a6a573e..e6d45c7a98a 100644
--- a/tests/baselines/reference/objectRest.js
+++ b/tests/baselines/reference/objectRest.js
@@ -43,7 +43,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
         t[p] = s[p];
-    if (typeof Object.getOwnPropertySymbols === "function")
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
         for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
             t[p[i]] = s[p[i]];
     return t;
diff --git a/tests/baselines/reference/objectRestAssignment.js b/tests/baselines/reference/objectRestAssignment.js
index 66ee00f6696..cbdff663c26 100644
--- a/tests/baselines/reference/objectRestAssignment.js
+++ b/tests/baselines/reference/objectRestAssignment.js
@@ -19,7 +19,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
         t[p] = s[p];
-    if (typeof Object.getOwnPropertySymbols === "function")
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
         for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
             t[p[i]] = s[p[i]];
     return t;
diff --git a/tests/baselines/reference/objectRestForOf.js b/tests/baselines/reference/objectRestForOf.js
index b4e33550cb0..fd81f77512e 100644
--- a/tests/baselines/reference/objectRestForOf.js
+++ b/tests/baselines/reference/objectRestForOf.js
@@ -27,7 +27,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
         t[p] = s[p];
-    if (typeof Object.getOwnPropertySymbols === "function")
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
         for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
             t[p[i]] = s[p[i]];
     return t;
diff --git a/tests/baselines/reference/objectRestNegative.js b/tests/baselines/reference/objectRestNegative.js
index f8c5b72ada5..915e0a0e867 100644
--- a/tests/baselines/reference/objectRestNegative.js
+++ b/tests/baselines/reference/objectRestNegative.js
@@ -23,7 +23,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
         t[p] = s[p];
-    if (typeof Object.getOwnPropertySymbols === "function")
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
         for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
             t[p[i]] = s[p[i]];
     return t;
diff --git a/tests/baselines/reference/objectRestParameter.js b/tests/baselines/reference/objectRestParameter.js
index 87419bd06e9..14e84eddfce 100644
--- a/tests/baselines/reference/objectRestParameter.js
+++ b/tests/baselines/reference/objectRestParameter.js
@@ -22,7 +22,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
         t[p] = s[p];
-    if (typeof Object.getOwnPropertySymbols === "function")
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
         for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
             t[p[i]] = s[p[i]];
     return t;
diff --git a/tests/baselines/reference/restIntersectionOrIntersection.js b/tests/baselines/reference/restIntersectionOrIntersection.js
index a60a5acbd93..0697e579ecd 100644
--- a/tests/baselines/reference/restIntersectionOrIntersection.js
+++ b/tests/baselines/reference/restIntersectionOrIntersection.js
@@ -16,7 +16,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
         t[p] = s[p];
-    if (typeof Object.getOwnPropertySymbols === "function")
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
         for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
             t[p[i]] = s[p[i]];
     return t;
diff --git a/tests/baselines/reference/restInvalidArgumentType.js b/tests/baselines/reference/restInvalidArgumentType.js
index 22a547880eb..48e4e11e805 100644
--- a/tests/baselines/reference/restInvalidArgumentType.js
+++ b/tests/baselines/reference/restInvalidArgumentType.js
@@ -64,7 +64,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
         t[p] = s[p];
-    if (typeof Object.getOwnPropertySymbols === "function")
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
         for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
             t[p[i]] = s[p[i]];
     return t;
diff --git a/tests/baselines/reference/restUnion.js b/tests/baselines/reference/restUnion.js
index beaf514808b..09a6243d2a9 100644
--- a/tests/baselines/reference/restUnion.js
+++ b/tests/baselines/reference/restUnion.js
@@ -20,7 +20,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
         t[p] = s[p];
-    if (typeof Object.getOwnPropertySymbols === "function")
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
         for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
             t[p[i]] = s[p[i]];
     return t;
diff --git a/tests/baselines/reference/restUnion2.js b/tests/baselines/reference/restUnion2.js
index d7466981645..44a0acfbcf8 100644
--- a/tests/baselines/reference/restUnion2.js
+++ b/tests/baselines/reference/restUnion2.js
@@ -23,7 +23,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
         t[p] = s[p];
-    if (typeof Object.getOwnPropertySymbols === "function")
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
         for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
             t[p[i]] = s[p[i]];
     return t;

From 9ab55c157666c6c5ad72cc6d81f44e3335461816 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Tue, 29 Nov 2016 12:27:56 -0800
Subject: [PATCH 369/421] change test

---
 tests/cases/compiler/restIntersectionOrIntersection.ts | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tests/cases/compiler/restIntersectionOrIntersection.ts b/tests/cases/compiler/restIntersectionOrIntersection.ts
index 6d06ed5ebc2..5fca2dafc36 100644
--- a/tests/cases/compiler/restIntersectionOrIntersection.ts
+++ b/tests/cases/compiler/restIntersectionOrIntersection.ts
@@ -1,10 +1,4 @@
 var intersection: { x: number, y: number } & { w: string, z: string };
-var union: { a: number, c: boolean } | { a: string, b: string };
-
 
 var rest1: { y: number, w: string, z: string };
 var {x, ...rest1 } = intersection;
-
-var rest2: { c: boolean } | { b: string };
-var {a, ...rest2 } = union;
-

From e4f0a50a7cf9f212d7102756e336472af89d2fa7 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Tue, 29 Nov 2016 12:29:40 -0800
Subject: [PATCH 370/421] Update test name

---
 ...nOrIntersection.js => restIntersection.js} | 13 +------
 .../reference/restIntersection.symbols        | 19 ++++++++++
 .../reference/restIntersection.types          | 19 ++++++++++
 .../restIntersectionOrIntersection.symbols    | 38 -------------------
 .../restIntersectionOrIntersection.types      | 38 -------------------
 ...nOrIntersection.ts => restIntersection.ts} |  0
 6 files changed, 40 insertions(+), 87 deletions(-)
 rename tests/baselines/reference/{restIntersectionOrIntersection.js => restIntersection.js} (67%)
 create mode 100644 tests/baselines/reference/restIntersection.symbols
 create mode 100644 tests/baselines/reference/restIntersection.types
 delete mode 100644 tests/baselines/reference/restIntersectionOrIntersection.symbols
 delete mode 100644 tests/baselines/reference/restIntersectionOrIntersection.types
 rename tests/cases/compiler/{restIntersectionOrIntersection.ts => restIntersection.ts} (100%)

diff --git a/tests/baselines/reference/restIntersectionOrIntersection.js b/tests/baselines/reference/restIntersection.js
similarity index 67%
rename from tests/baselines/reference/restIntersectionOrIntersection.js
rename to tests/baselines/reference/restIntersection.js
index 0697e579ecd..d1f9aa3094c 100644
--- a/tests/baselines/reference/restIntersectionOrIntersection.js
+++ b/tests/baselines/reference/restIntersection.js
@@ -1,17 +1,11 @@
-//// [restIntersectionOrIntersection.ts]
+//// [restIntersection.ts]
 var intersection: { x: number, y: number } & { w: string, z: string };
-var union: { a: number, c: boolean } | { a: string, b: string };
-
 
 var rest1: { y: number, w: string, z: string };
 var {x, ...rest1 } = intersection;
-
-var rest2: { c: boolean } | { b: string };
-var {a, ...rest2 } = union;
-
 
 
-//// [restIntersectionOrIntersection.js]
+//// [restIntersection.js]
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
@@ -22,8 +16,5 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 var intersection;
-var union;
 var rest1;
 var x = intersection.x, rest1 = __rest(intersection, ["x"]);
-var rest2;
-var a = union.a, rest2 = __rest(union, ["a"]);
diff --git a/tests/baselines/reference/restIntersection.symbols b/tests/baselines/reference/restIntersection.symbols
new file mode 100644
index 00000000000..75f91d243e2
--- /dev/null
+++ b/tests/baselines/reference/restIntersection.symbols
@@ -0,0 +1,19 @@
+=== tests/cases/compiler/restIntersection.ts ===
+var intersection: { x: number, y: number } & { w: string, z: string };
+>intersection : Symbol(intersection, Decl(restIntersection.ts, 0, 3))
+>x : Symbol(x, Decl(restIntersection.ts, 0, 19))
+>y : Symbol(y, Decl(restIntersection.ts, 0, 30))
+>w : Symbol(w, Decl(restIntersection.ts, 0, 46))
+>z : Symbol(z, Decl(restIntersection.ts, 0, 57))
+
+var rest1: { y: number, w: string, z: string };
+>rest1 : Symbol(rest1, Decl(restIntersection.ts, 2, 3), Decl(restIntersection.ts, 3, 7))
+>y : Symbol(y, Decl(restIntersection.ts, 2, 12))
+>w : Symbol(w, Decl(restIntersection.ts, 2, 23))
+>z : Symbol(z, Decl(restIntersection.ts, 2, 34))
+
+var {x, ...rest1 } = intersection;
+>x : Symbol(x, Decl(restIntersection.ts, 3, 5))
+>rest1 : Symbol(rest1, Decl(restIntersection.ts, 2, 3), Decl(restIntersection.ts, 3, 7))
+>intersection : Symbol(intersection, Decl(restIntersection.ts, 0, 3))
+
diff --git a/tests/baselines/reference/restIntersection.types b/tests/baselines/reference/restIntersection.types
new file mode 100644
index 00000000000..5779349ba29
--- /dev/null
+++ b/tests/baselines/reference/restIntersection.types
@@ -0,0 +1,19 @@
+=== tests/cases/compiler/restIntersection.ts ===
+var intersection: { x: number, y: number } & { w: string, z: string };
+>intersection : { x: number; y: number; } & { w: string; z: string; }
+>x : number
+>y : number
+>w : string
+>z : string
+
+var rest1: { y: number, w: string, z: string };
+>rest1 : { y: number; w: string; z: string; }
+>y : number
+>w : string
+>z : string
+
+var {x, ...rest1 } = intersection;
+>x : number
+>rest1 : { y: number; w: string; z: string; }
+>intersection : { x: number; y: number; } & { w: string; z: string; }
+
diff --git a/tests/baselines/reference/restIntersectionOrIntersection.symbols b/tests/baselines/reference/restIntersectionOrIntersection.symbols
deleted file mode 100644
index f2eb4f16014..00000000000
--- a/tests/baselines/reference/restIntersectionOrIntersection.symbols
+++ /dev/null
@@ -1,38 +0,0 @@
-=== tests/cases/compiler/restIntersectionOrIntersection.ts ===
-var intersection: { x: number, y: number } & { w: string, z: string };
->intersection : Symbol(intersection, Decl(restIntersectionOrIntersection.ts, 0, 3))
->x : Symbol(x, Decl(restIntersectionOrIntersection.ts, 0, 19))
->y : Symbol(y, Decl(restIntersectionOrIntersection.ts, 0, 30))
->w : Symbol(w, Decl(restIntersectionOrIntersection.ts, 0, 46))
->z : Symbol(z, Decl(restIntersectionOrIntersection.ts, 0, 57))
-
-var union: { a: number, c: boolean } | { a: string, b: string };
->union : Symbol(union, Decl(restIntersectionOrIntersection.ts, 1, 3))
->a : Symbol(a, Decl(restIntersectionOrIntersection.ts, 1, 12))
->c : Symbol(c, Decl(restIntersectionOrIntersection.ts, 1, 23))
->a : Symbol(a, Decl(restIntersectionOrIntersection.ts, 1, 40))
->b : Symbol(b, Decl(restIntersectionOrIntersection.ts, 1, 51))
-
-
-var rest1: { y: number, w: string, z: string };
->rest1 : Symbol(rest1, Decl(restIntersectionOrIntersection.ts, 4, 3), Decl(restIntersectionOrIntersection.ts, 5, 7))
->y : Symbol(y, Decl(restIntersectionOrIntersection.ts, 4, 12))
->w : Symbol(w, Decl(restIntersectionOrIntersection.ts, 4, 23))
->z : Symbol(z, Decl(restIntersectionOrIntersection.ts, 4, 34))
-
-var {x, ...rest1 } = intersection;
->x : Symbol(x, Decl(restIntersectionOrIntersection.ts, 5, 5))
->rest1 : Symbol(rest1, Decl(restIntersectionOrIntersection.ts, 4, 3), Decl(restIntersectionOrIntersection.ts, 5, 7))
->intersection : Symbol(intersection, Decl(restIntersectionOrIntersection.ts, 0, 3))
-
-var rest2: { c: boolean } | { b: string };
->rest2 : Symbol(rest2, Decl(restIntersectionOrIntersection.ts, 7, 3), Decl(restIntersectionOrIntersection.ts, 8, 7))
->c : Symbol(c, Decl(restIntersectionOrIntersection.ts, 7, 12))
->b : Symbol(b, Decl(restIntersectionOrIntersection.ts, 7, 29))
-
-var {a, ...rest2 } = union;
->a : Symbol(a, Decl(restIntersectionOrIntersection.ts, 8, 5))
->rest2 : Symbol(rest2, Decl(restIntersectionOrIntersection.ts, 7, 3), Decl(restIntersectionOrIntersection.ts, 8, 7))
->union : Symbol(union, Decl(restIntersectionOrIntersection.ts, 1, 3))
-
-
diff --git a/tests/baselines/reference/restIntersectionOrIntersection.types b/tests/baselines/reference/restIntersectionOrIntersection.types
deleted file mode 100644
index c87769ff3cc..00000000000
--- a/tests/baselines/reference/restIntersectionOrIntersection.types
+++ /dev/null
@@ -1,38 +0,0 @@
-=== tests/cases/compiler/restIntersectionOrIntersection.ts ===
-var intersection: { x: number, y: number } & { w: string, z: string };
->intersection : { x: number; y: number; } & { w: string; z: string; }
->x : number
->y : number
->w : string
->z : string
-
-var union: { a: number, c: boolean } | { a: string, b: string };
->union : { a: number; c: boolean; } | { a: string; b: string; }
->a : number
->c : boolean
->a : string
->b : string
-
-
-var rest1: { y: number, w: string, z: string };
->rest1 : { y: number; w: string; z: string; }
->y : number
->w : string
->z : string
-
-var {x, ...rest1 } = intersection;
->x : number
->rest1 : { y: number; w: string; z: string; }
->intersection : { x: number; y: number; } & { w: string; z: string; }
-
-var rest2: { c: boolean } | { b: string };
->rest2 : { c: boolean; } | { b: string; }
->c : boolean
->b : string
-
-var {a, ...rest2 } = union;
->a : string | number
->rest2 : { c: boolean; } | { b: string; }
->union : { a: number; c: boolean; } | { a: string; b: string; }
-
-
diff --git a/tests/cases/compiler/restIntersectionOrIntersection.ts b/tests/cases/compiler/restIntersection.ts
similarity index 100%
rename from tests/cases/compiler/restIntersectionOrIntersection.ts
rename to tests/cases/compiler/restIntersection.ts

From f55b3ef87a8263c44ab41d728c4669363dfa772c Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Tue, 29 Nov 2016 12:48:41 -0800
Subject: [PATCH 371/421] Preserve modifiers in isomorphic mapped types

---
 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 527735a3b0f..46f10488779 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -4497,12 +4497,14 @@ namespace ts {
             // Resolve upfront such that recursive references see an empty object type.
             setStructuredTypeMembers(type, emptySymbols, emptyArray, emptyArray, undefined, undefined);
             // In { [P in K]: T }, we refer to P as the type parameter type, K as the constraint type,
-            // and T as the template type.
+            // and T as the template type. If K is of the form 'keyof S', the mapped type and S are
+            // isomorphic and we copy property modifiers from corresponding properties in S.
             const typeParameter = getTypeParameterFromMappedType(type);
             const constraintType = getConstraintTypeFromMappedType(type);
+            const isomorphicType = getIsomorphicTypeFromMappedType(type);
             const templateType = getTemplateTypeFromMappedType(type);
-            const isReadonly = !!type.declaration.readonlyToken;
-            const isOptional = !!type.declaration.questionToken;
+            const templateReadonly = !!type.declaration.readonlyToken;
+            const templateOptional = !!type.declaration.questionToken;
             // First, if the constraint type is a type parameter, obtain the base constraint. Then,
             // if the key type is a 'keyof X', obtain 'keyof C' where C is the base constraint of X.
             // Finally, iterate over the constituents of the resulting iteration type.
@@ -4515,18 +4517,19 @@ namespace ts {
                 const iterationMapper = createUnaryTypeMapper(typeParameter, t);
                 const templateMapper = type.mapper ? combineTypeMappers(type.mapper, iterationMapper) : iterationMapper;
                 const propType = instantiateType(templateType, templateMapper);
-                // If the current iteration type constituent is a literal type, create a property.
-                // Otherwise, for type string create a string index signature and for type number
-                // create a numeric index signature.
-                if (t.flags & (TypeFlags.StringLiteral | TypeFlags.NumberLiteral | TypeFlags.EnumLiteral)) {
+                // If the current iteration type constituent is a string literal type, create a property.
+                // Otherwise, for type string create a string index signature.
+                if (t.flags & TypeFlags.StringLiteral) {
                     const propName = (<LiteralType>t).text;
+                    const isomorphicProp = isomorphicType && getPropertyOfType(isomorphicType, propName);
+                    const isOptional = templateOptional || !!(isomorphicProp && isomorphicProp.flags & SymbolFlags.Optional);
                     const prop = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | (isOptional ? SymbolFlags.Optional : 0), propName);
                     prop.type = addOptionality(propType, isOptional);
-                    prop.isReadonly = isReadonly;
+                    prop.isReadonly = templateReadonly || isomorphicProp && isReadonlySymbol(isomorphicProp);
                     members[propName] = prop;
                 }
                 else if (t.flags & TypeFlags.String) {
-                    stringIndexInfo = createIndexInfo(propType, isReadonly);
+                    stringIndexInfo = createIndexInfo(propType, templateReadonly);
                 }
             });
             setStructuredTypeMembers(type, members, emptyArray, emptyArray, stringIndexInfo, undefined);
@@ -4549,6 +4552,11 @@ namespace ts {
                     unknownType);
         }
 
+        function getIsomorphicTypeFromMappedType(type: MappedType) {
+            const constraint = getConstraintDeclaration(getTypeParameterFromMappedType(type));
+            return constraint.kind === SyntaxKind.TypeOperator ? instantiateType(getTypeFromTypeNode((<TypeOperatorNode>constraint).type), type.mapper || identityMapper) : undefined;
+        }
+
         function getErasedTemplateTypeFromMappedType(type: MappedType) {
             return instantiateType(getTemplateTypeFromMappedType(type), createUnaryTypeMapper(getTypeParameterFromMappedType(type), anyType));
         }

From f366ae0332425a3c031d71580d5d5406f92efdb1 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Tue, 29 Nov 2016 12:48:55 -0800
Subject: [PATCH 372/421] Add tests

---
 .../reference/mappedTypeModifiers.js          |  73 +++++++++
 .../reference/mappedTypeModifiers.symbols     | 148 ++++++++++++++++++
 .../reference/mappedTypeModifiers.types       | 148 ++++++++++++++++++
 .../types/mapped/mappedTypeModifiers.ts       |  42 +++++
 4 files changed, 411 insertions(+)
 create mode 100644 tests/baselines/reference/mappedTypeModifiers.js
 create mode 100644 tests/baselines/reference/mappedTypeModifiers.symbols
 create mode 100644 tests/baselines/reference/mappedTypeModifiers.types
 create mode 100644 tests/cases/conformance/types/mapped/mappedTypeModifiers.ts

diff --git a/tests/baselines/reference/mappedTypeModifiers.js b/tests/baselines/reference/mappedTypeModifiers.js
new file mode 100644
index 00000000000..8f3f7ba5416
--- /dev/null
+++ b/tests/baselines/reference/mappedTypeModifiers.js
@@ -0,0 +1,73 @@
+//// [mappedTypeModifiers.ts]
+
+type T = { a: number, b: string };
+type U = { a: number | undefined, b: string | undefined };
+type P = { a?: number, b?: string };
+type R = { readonly a: number, readonly b: string };
+type PR = { readonly a?: number, readonly b?: string };
+
+// Validate they all have the same keys
+var v00: "a" | "b";
+var v00: keyof T;
+var v00: keyof U;
+var v00: keyof P;
+var v00: keyof R;
+var v00: keyof PR;
+
+// Validate that non-isomorphic mapped types strip modifiers
+var v01: T;
+var v01: Pick<R, keyof T>;
+var v01: Pick<Readonly<T>, keyof T>;
+
+// Validate that non-isomorphic mapped types strip modifiers
+var v02: U;
+var v02: Pick<P, keyof T>;
+var v02: Pick<PR, keyof T>;
+var v02: Pick<Partial<T>, keyof T>;
+var v02: Pick<Partial<Readonly<T>>, keyof T>;
+
+// Validate that isomorphic mapped types preserve optional modifier
+var v03: P;
+var v03: Partial<T>;
+
+// Validate that isomorphic mapped types preserve readonly modifier
+var v04: R;
+var v04: Readonly<T>;
+
+// Validate that isomorphic mapped types preserve both partial and readonly modifiers
+var v05: PR;
+var v05: Partial<R>;
+var v05: Readonly<P>;
+var v05: Partial<Readonly<T>>;
+var v05: Readonly<Partial<T>>;
+
+//// [mappedTypeModifiers.js]
+// Validate they all have the same keys
+var v00;
+var v00;
+var v00;
+var v00;
+var v00;
+var v00;
+// Validate that non-isomorphic mapped types strip modifiers
+var v01;
+var v01;
+var v01;
+// Validate that non-isomorphic mapped types strip modifiers
+var v02;
+var v02;
+var v02;
+var v02;
+var v02;
+// Validate that isomorphic mapped types preserve optional modifier
+var v03;
+var v03;
+// Validate that isomorphic mapped types preserve readonly modifier
+var v04;
+var v04;
+// Validate that isomorphic mapped types preserve both partial and readonly modifiers
+var v05;
+var v05;
+var v05;
+var v05;
+var v05;
diff --git a/tests/baselines/reference/mappedTypeModifiers.symbols b/tests/baselines/reference/mappedTypeModifiers.symbols
new file mode 100644
index 00000000000..6799d13d1ac
--- /dev/null
+++ b/tests/baselines/reference/mappedTypeModifiers.symbols
@@ -0,0 +1,148 @@
+=== tests/cases/conformance/types/mapped/mappedTypeModifiers.ts ===
+
+type T = { a: number, b: string };
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
+>a : Symbol(a, Decl(mappedTypeModifiers.ts, 1, 10))
+>b : Symbol(b, Decl(mappedTypeModifiers.ts, 1, 21))
+
+type U = { a: number | undefined, b: string | undefined };
+>U : Symbol(U, Decl(mappedTypeModifiers.ts, 1, 34))
+>a : Symbol(a, Decl(mappedTypeModifiers.ts, 2, 10))
+>b : Symbol(b, Decl(mappedTypeModifiers.ts, 2, 33))
+
+type P = { a?: number, b?: string };
+>P : Symbol(P, Decl(mappedTypeModifiers.ts, 2, 58))
+>a : Symbol(a, Decl(mappedTypeModifiers.ts, 3, 10))
+>b : Symbol(b, Decl(mappedTypeModifiers.ts, 3, 22))
+
+type R = { readonly a: number, readonly b: string };
+>R : Symbol(R, Decl(mappedTypeModifiers.ts, 3, 36))
+>a : Symbol(a, Decl(mappedTypeModifiers.ts, 4, 10))
+>b : Symbol(b, Decl(mappedTypeModifiers.ts, 4, 30))
+
+type PR = { readonly a?: number, readonly b?: string };
+>PR : Symbol(PR, Decl(mappedTypeModifiers.ts, 4, 52))
+>a : Symbol(a, Decl(mappedTypeModifiers.ts, 5, 11))
+>b : Symbol(b, Decl(mappedTypeModifiers.ts, 5, 32))
+
+// Validate they all have the same keys
+var v00: "a" | "b";
+>v00 : Symbol(v00, Decl(mappedTypeModifiers.ts, 8, 3), Decl(mappedTypeModifiers.ts, 9, 3), Decl(mappedTypeModifiers.ts, 10, 3), Decl(mappedTypeModifiers.ts, 11, 3), Decl(mappedTypeModifiers.ts, 12, 3), Decl(mappedTypeModifiers.ts, 13, 3))
+
+var v00: keyof T;
+>v00 : Symbol(v00, Decl(mappedTypeModifiers.ts, 8, 3), Decl(mappedTypeModifiers.ts, 9, 3), Decl(mappedTypeModifiers.ts, 10, 3), Decl(mappedTypeModifiers.ts, 11, 3), Decl(mappedTypeModifiers.ts, 12, 3), Decl(mappedTypeModifiers.ts, 13, 3))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
+
+var v00: keyof U;
+>v00 : Symbol(v00, Decl(mappedTypeModifiers.ts, 8, 3), Decl(mappedTypeModifiers.ts, 9, 3), Decl(mappedTypeModifiers.ts, 10, 3), Decl(mappedTypeModifiers.ts, 11, 3), Decl(mappedTypeModifiers.ts, 12, 3), Decl(mappedTypeModifiers.ts, 13, 3))
+>U : Symbol(U, Decl(mappedTypeModifiers.ts, 1, 34))
+
+var v00: keyof P;
+>v00 : Symbol(v00, Decl(mappedTypeModifiers.ts, 8, 3), Decl(mappedTypeModifiers.ts, 9, 3), Decl(mappedTypeModifiers.ts, 10, 3), Decl(mappedTypeModifiers.ts, 11, 3), Decl(mappedTypeModifiers.ts, 12, 3), Decl(mappedTypeModifiers.ts, 13, 3))
+>P : Symbol(P, Decl(mappedTypeModifiers.ts, 2, 58))
+
+var v00: keyof R;
+>v00 : Symbol(v00, Decl(mappedTypeModifiers.ts, 8, 3), Decl(mappedTypeModifiers.ts, 9, 3), Decl(mappedTypeModifiers.ts, 10, 3), Decl(mappedTypeModifiers.ts, 11, 3), Decl(mappedTypeModifiers.ts, 12, 3), Decl(mappedTypeModifiers.ts, 13, 3))
+>R : Symbol(R, Decl(mappedTypeModifiers.ts, 3, 36))
+
+var v00: keyof PR;
+>v00 : Symbol(v00, Decl(mappedTypeModifiers.ts, 8, 3), Decl(mappedTypeModifiers.ts, 9, 3), Decl(mappedTypeModifiers.ts, 10, 3), Decl(mappedTypeModifiers.ts, 11, 3), Decl(mappedTypeModifiers.ts, 12, 3), Decl(mappedTypeModifiers.ts, 13, 3))
+>PR : Symbol(PR, Decl(mappedTypeModifiers.ts, 4, 52))
+
+// Validate that non-isomorphic mapped types strip modifiers
+var v01: T;
+>v01 : Symbol(v01, Decl(mappedTypeModifiers.ts, 16, 3), Decl(mappedTypeModifiers.ts, 17, 3), Decl(mappedTypeModifiers.ts, 18, 3))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
+
+var v01: Pick<R, keyof T>;
+>v01 : Symbol(v01, Decl(mappedTypeModifiers.ts, 16, 3), Decl(mappedTypeModifiers.ts, 17, 3), Decl(mappedTypeModifiers.ts, 18, 3))
+>Pick : Symbol(Pick, Decl(lib.d.ts, --, --))
+>R : Symbol(R, Decl(mappedTypeModifiers.ts, 3, 36))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
+
+var v01: Pick<Readonly<T>, keyof T>;
+>v01 : Symbol(v01, Decl(mappedTypeModifiers.ts, 16, 3), Decl(mappedTypeModifiers.ts, 17, 3), Decl(mappedTypeModifiers.ts, 18, 3))
+>Pick : Symbol(Pick, Decl(lib.d.ts, --, --))
+>Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
+
+// Validate that non-isomorphic mapped types strip modifiers
+var v02: U;
+>v02 : Symbol(v02, Decl(mappedTypeModifiers.ts, 21, 3), Decl(mappedTypeModifiers.ts, 22, 3), Decl(mappedTypeModifiers.ts, 23, 3), Decl(mappedTypeModifiers.ts, 24, 3), Decl(mappedTypeModifiers.ts, 25, 3))
+>U : Symbol(U, Decl(mappedTypeModifiers.ts, 1, 34))
+
+var v02: Pick<P, keyof T>;
+>v02 : Symbol(v02, Decl(mappedTypeModifiers.ts, 21, 3), Decl(mappedTypeModifiers.ts, 22, 3), Decl(mappedTypeModifiers.ts, 23, 3), Decl(mappedTypeModifiers.ts, 24, 3), Decl(mappedTypeModifiers.ts, 25, 3))
+>Pick : Symbol(Pick, Decl(lib.d.ts, --, --))
+>P : Symbol(P, Decl(mappedTypeModifiers.ts, 2, 58))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
+
+var v02: Pick<PR, keyof T>;
+>v02 : Symbol(v02, Decl(mappedTypeModifiers.ts, 21, 3), Decl(mappedTypeModifiers.ts, 22, 3), Decl(mappedTypeModifiers.ts, 23, 3), Decl(mappedTypeModifiers.ts, 24, 3), Decl(mappedTypeModifiers.ts, 25, 3))
+>Pick : Symbol(Pick, Decl(lib.d.ts, --, --))
+>PR : Symbol(PR, Decl(mappedTypeModifiers.ts, 4, 52))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
+
+var v02: Pick<Partial<T>, keyof T>;
+>v02 : Symbol(v02, Decl(mappedTypeModifiers.ts, 21, 3), Decl(mappedTypeModifiers.ts, 22, 3), Decl(mappedTypeModifiers.ts, 23, 3), Decl(mappedTypeModifiers.ts, 24, 3), Decl(mappedTypeModifiers.ts, 25, 3))
+>Pick : Symbol(Pick, Decl(lib.d.ts, --, --))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
+
+var v02: Pick<Partial<Readonly<T>>, keyof T>;
+>v02 : Symbol(v02, Decl(mappedTypeModifiers.ts, 21, 3), Decl(mappedTypeModifiers.ts, 22, 3), Decl(mappedTypeModifiers.ts, 23, 3), Decl(mappedTypeModifiers.ts, 24, 3), Decl(mappedTypeModifiers.ts, 25, 3))
+>Pick : Symbol(Pick, Decl(lib.d.ts, --, --))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+>Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
+
+// Validate that isomorphic mapped types preserve optional modifier
+var v03: P;
+>v03 : Symbol(v03, Decl(mappedTypeModifiers.ts, 28, 3), Decl(mappedTypeModifiers.ts, 29, 3))
+>P : Symbol(P, Decl(mappedTypeModifiers.ts, 2, 58))
+
+var v03: Partial<T>;
+>v03 : Symbol(v03, Decl(mappedTypeModifiers.ts, 28, 3), Decl(mappedTypeModifiers.ts, 29, 3))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
+
+// Validate that isomorphic mapped types preserve readonly modifier
+var v04: R;
+>v04 : Symbol(v04, Decl(mappedTypeModifiers.ts, 32, 3), Decl(mappedTypeModifiers.ts, 33, 3))
+>R : Symbol(R, Decl(mappedTypeModifiers.ts, 3, 36))
+
+var v04: Readonly<T>;
+>v04 : Symbol(v04, Decl(mappedTypeModifiers.ts, 32, 3), Decl(mappedTypeModifiers.ts, 33, 3))
+>Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
+
+// Validate that isomorphic mapped types preserve both partial and readonly modifiers
+var v05: PR;
+>v05 : Symbol(v05, Decl(mappedTypeModifiers.ts, 36, 3), Decl(mappedTypeModifiers.ts, 37, 3), Decl(mappedTypeModifiers.ts, 38, 3), Decl(mappedTypeModifiers.ts, 39, 3), Decl(mappedTypeModifiers.ts, 40, 3))
+>PR : Symbol(PR, Decl(mappedTypeModifiers.ts, 4, 52))
+
+var v05: Partial<R>;
+>v05 : Symbol(v05, Decl(mappedTypeModifiers.ts, 36, 3), Decl(mappedTypeModifiers.ts, 37, 3), Decl(mappedTypeModifiers.ts, 38, 3), Decl(mappedTypeModifiers.ts, 39, 3), Decl(mappedTypeModifiers.ts, 40, 3))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+>R : Symbol(R, Decl(mappedTypeModifiers.ts, 3, 36))
+
+var v05: Readonly<P>;
+>v05 : Symbol(v05, Decl(mappedTypeModifiers.ts, 36, 3), Decl(mappedTypeModifiers.ts, 37, 3), Decl(mappedTypeModifiers.ts, 38, 3), Decl(mappedTypeModifiers.ts, 39, 3), Decl(mappedTypeModifiers.ts, 40, 3))
+>Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
+>P : Symbol(P, Decl(mappedTypeModifiers.ts, 2, 58))
+
+var v05: Partial<Readonly<T>>;
+>v05 : Symbol(v05, Decl(mappedTypeModifiers.ts, 36, 3), Decl(mappedTypeModifiers.ts, 37, 3), Decl(mappedTypeModifiers.ts, 38, 3), Decl(mappedTypeModifiers.ts, 39, 3), Decl(mappedTypeModifiers.ts, 40, 3))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+>Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
+
+var v05: Readonly<Partial<T>>;
+>v05 : Symbol(v05, Decl(mappedTypeModifiers.ts, 36, 3), Decl(mappedTypeModifiers.ts, 37, 3), Decl(mappedTypeModifiers.ts, 38, 3), Decl(mappedTypeModifiers.ts, 39, 3), Decl(mappedTypeModifiers.ts, 40, 3))
+>Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
+
diff --git a/tests/baselines/reference/mappedTypeModifiers.types b/tests/baselines/reference/mappedTypeModifiers.types
new file mode 100644
index 00000000000..5c713991f75
--- /dev/null
+++ b/tests/baselines/reference/mappedTypeModifiers.types
@@ -0,0 +1,148 @@
+=== tests/cases/conformance/types/mapped/mappedTypeModifiers.ts ===
+
+type T = { a: number, b: string };
+>T : T
+>a : number
+>b : string
+
+type U = { a: number | undefined, b: string | undefined };
+>U : U
+>a : number | undefined
+>b : string | undefined
+
+type P = { a?: number, b?: string };
+>P : P
+>a : number | undefined
+>b : string | undefined
+
+type R = { readonly a: number, readonly b: string };
+>R : R
+>a : number
+>b : string
+
+type PR = { readonly a?: number, readonly b?: string };
+>PR : PR
+>a : number | undefined
+>b : string | undefined
+
+// Validate they all have the same keys
+var v00: "a" | "b";
+>v00 : "a" | "b"
+
+var v00: keyof T;
+>v00 : "a" | "b"
+>T : T
+
+var v00: keyof U;
+>v00 : "a" | "b"
+>U : U
+
+var v00: keyof P;
+>v00 : "a" | "b"
+>P : P
+
+var v00: keyof R;
+>v00 : "a" | "b"
+>R : R
+
+var v00: keyof PR;
+>v00 : "a" | "b"
+>PR : PR
+
+// Validate that non-isomorphic mapped types strip modifiers
+var v01: T;
+>v01 : T
+>T : T
+
+var v01: Pick<R, keyof T>;
+>v01 : T
+>Pick : Pick<T, K>
+>R : R
+>T : T
+
+var v01: Pick<Readonly<T>, keyof T>;
+>v01 : T
+>Pick : Pick<T, K>
+>Readonly : Readonly<T>
+>T : T
+>T : T
+
+// Validate that non-isomorphic mapped types strip modifiers
+var v02: U;
+>v02 : U
+>U : U
+
+var v02: Pick<P, keyof T>;
+>v02 : U
+>Pick : Pick<T, K>
+>P : P
+>T : T
+
+var v02: Pick<PR, keyof T>;
+>v02 : U
+>Pick : Pick<T, K>
+>PR : PR
+>T : T
+
+var v02: Pick<Partial<T>, keyof T>;
+>v02 : U
+>Pick : Pick<T, K>
+>Partial : Partial<T>
+>T : T
+>T : T
+
+var v02: Pick<Partial<Readonly<T>>, keyof T>;
+>v02 : U
+>Pick : Pick<T, K>
+>Partial : Partial<T>
+>Readonly : Readonly<T>
+>T : T
+>T : T
+
+// Validate that isomorphic mapped types preserve optional modifier
+var v03: P;
+>v03 : P
+>P : P
+
+var v03: Partial<T>;
+>v03 : P
+>Partial : Partial<T>
+>T : T
+
+// Validate that isomorphic mapped types preserve readonly modifier
+var v04: R;
+>v04 : R
+>R : R
+
+var v04: Readonly<T>;
+>v04 : R
+>Readonly : Readonly<T>
+>T : T
+
+// Validate that isomorphic mapped types preserve both partial and readonly modifiers
+var v05: PR;
+>v05 : PR
+>PR : PR
+
+var v05: Partial<R>;
+>v05 : PR
+>Partial : Partial<T>
+>R : R
+
+var v05: Readonly<P>;
+>v05 : PR
+>Readonly : Readonly<T>
+>P : P
+
+var v05: Partial<Readonly<T>>;
+>v05 : PR
+>Partial : Partial<T>
+>Readonly : Readonly<T>
+>T : T
+
+var v05: Readonly<Partial<T>>;
+>v05 : PR
+>Readonly : Readonly<T>
+>Partial : Partial<T>
+>T : T
+
diff --git a/tests/cases/conformance/types/mapped/mappedTypeModifiers.ts b/tests/cases/conformance/types/mapped/mappedTypeModifiers.ts
new file mode 100644
index 00000000000..947f0c579a1
--- /dev/null
+++ b/tests/cases/conformance/types/mapped/mappedTypeModifiers.ts
@@ -0,0 +1,42 @@
+// @strictNullChecks: true
+
+type T = { a: number, b: string };
+type U = { a: number | undefined, b: string | undefined };
+type P = { a?: number, b?: string };
+type R = { readonly a: number, readonly b: string };
+type PR = { readonly a?: number, readonly b?: string };
+
+// Validate they all have the same keys
+var v00: "a" | "b";
+var v00: keyof T;
+var v00: keyof U;
+var v00: keyof P;
+var v00: keyof R;
+var v00: keyof PR;
+
+// Validate that non-isomorphic mapped types strip modifiers
+var v01: T;
+var v01: Pick<R, keyof T>;
+var v01: Pick<Readonly<T>, keyof T>;
+
+// Validate that non-isomorphic mapped types strip modifiers
+var v02: U;
+var v02: Pick<P, keyof T>;
+var v02: Pick<PR, keyof T>;
+var v02: Pick<Partial<T>, keyof T>;
+var v02: Pick<Partial<Readonly<T>>, keyof T>;
+
+// Validate that isomorphic mapped types preserve optional modifier
+var v03: P;
+var v03: Partial<T>;
+
+// Validate that isomorphic mapped types preserve readonly modifier
+var v04: R;
+var v04: Readonly<T>;
+
+// Validate that isomorphic mapped types preserve both partial and readonly modifiers
+var v05: PR;
+var v05: Partial<R>;
+var v05: Readonly<P>;
+var v05: Partial<Readonly<T>>;
+var v05: Readonly<Partial<T>>;
\ No newline at end of file

From 17b6645a7090589c0adc6b84243ee7dc1e39fbb2 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Tue, 29 Nov 2016 13:37:02 -0800
Subject: [PATCH 373/421] add missing semicolons

---
 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 8177939fe61..936afefce9b 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -6119,7 +6119,7 @@ namespace ts {
                     return getUnionType(map(types, t => getSpreadType(t, right, isFromObjectLiteral)));
                 }
                 else {
-                    left = emptyObjectType
+                    left = emptyObjectType;
                 }
             }
             else if (left.flags & TypeFlags.Nullable) {
@@ -6132,7 +6132,7 @@ namespace ts {
                     return getUnionType(map(types, t => getSpreadType(left, t, isFromObjectLiteral)));
                 }
                 else {
-                    right = emptyObjectType
+                    right = emptyObjectType;
                 }
             }
             else if (right.flags & TypeFlags.Nullable) {

From 51f5ef67525ae68acdbb55f626f3ff81dff76d7a Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Tue, 29 Nov 2016 13:37:21 -0800
Subject: [PATCH 374/421] Update test

---
 .../reference/objectSpreadNegative.errors.txt | 22 +++++++++----------
 .../reference/objectSpreadNegative.js         |  8 ++-----
 .../types/spread/objectSpreadNegative.ts      |  4 +---
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/tests/baselines/reference/objectSpreadNegative.errors.txt b/tests/baselines/reference/objectSpreadNegative.errors.txt
index e92b685b910..17f07bc06a2 100644
--- a/tests/baselines/reference/objectSpreadNegative.errors.txt
+++ b/tests/baselines/reference/objectSpreadNegative.errors.txt
@@ -7,15 +7,15 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(25,1): error TS2322
   Property 's' is missing in type '{ b: boolean; }'.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(28,36): error TS2300: Duplicate identifier 'b'.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(28,53): error TS2300: Duplicate identifier 'b'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(34,19): error TS2698: Spread types may only be created from object types.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(35,19): error TS2698: Spread types may only be created from object types.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(37,20): error TS2698: Spread types may only be created from object types.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(39,19): error TS2698: Spread types may only be created from object types.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(44,1): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type '{}' has no compatible call signatures.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(48,12): error TS2339: Property 'b' does not exist on type '{}'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(54,9): error TS2339: Property 'm' does not exist on type '{ p: number; }'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(58,14): error TS2698: Spread types may only be created from object types.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(61,14): error TS2698: Spread types may only be created from object types.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(32,19): error TS2698: Spread types may only be created from object types.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(33,19): error TS2698: Spread types may only be created from object types.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(35,20): error TS2698: Spread types may only be created from object types.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(37,19): error TS2698: Spread types may only be created from object types.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(42,1): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type '{}' has no compatible call signatures.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(46,12): error TS2339: Property 'b' does not exist on type '{}'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(52,9): error TS2339: Property 'm' does not exist on type '{ p: number; }'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(56,14): error TS2698: Spread types may only be created from object types.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(59,14): error TS2698: Spread types may only be created from object types.
 
 
 ==== tests/cases/conformance/types/spread/objectSpreadNegative.ts (15 errors) ====
@@ -64,9 +64,7 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(61,14): error TS269
 !!! error TS2300: Duplicate identifier 'b'.
     let duplicatedSpread = { ...o, ...o }
     
-    // null, undefined and primitives are not allowed
-    let spreadNull = { ...null };
-    let spreadUndefind = { ...undefined };
+    // primitives are not allowed
     let spreadNum = { ...12 };
                       ~~~~~
 !!! error TS2698: Spread types may only be created from object types.
diff --git a/tests/baselines/reference/objectSpreadNegative.js b/tests/baselines/reference/objectSpreadNegative.js
index 6287f4559a7..dff84355370 100644
--- a/tests/baselines/reference/objectSpreadNegative.js
+++ b/tests/baselines/reference/objectSpreadNegative.js
@@ -29,9 +29,7 @@ spread = b; // error, missing 's'
 let duplicated = { b: 'bad', ...o, b: 'bad', ...o2, b: 'bad' }
 let duplicatedSpread = { ...o, ...o }
 
-// null, undefined and primitives are not allowed
-let spreadNull = { ...null };
-let spreadUndefind = { ...undefined };
+// primitives are not allowed
 let spreadNum = { ...12 };
 let spreadSum = { ...1 + 1 };
 spreadSum.toFixed(); // error, no methods from number
@@ -108,9 +106,7 @@ 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);
-// null, undefined and primitives are not allowed
-var spreadNull = __assign({}, null);
-var spreadUndefind = __assign({}, undefined);
+// primitives are not allowed
 var spreadNum = __assign({}, 12);
 var spreadSum = __assign({}, 1 + 1);
 spreadSum.toFixed(); // error, no methods from number
diff --git a/tests/cases/conformance/types/spread/objectSpreadNegative.ts b/tests/cases/conformance/types/spread/objectSpreadNegative.ts
index 3cd819d0613..6d1e0dde429 100644
--- a/tests/cases/conformance/types/spread/objectSpreadNegative.ts
+++ b/tests/cases/conformance/types/spread/objectSpreadNegative.ts
@@ -29,9 +29,7 @@ spread = b; // error, missing 's'
 let duplicated = { b: 'bad', ...o, b: 'bad', ...o2, b: 'bad' }
 let duplicatedSpread = { ...o, ...o }
 
-// null, undefined and primitives are not allowed
-let spreadNull = { ...null };
-let spreadUndefind = { ...undefined };
+// primitives are not allowed
 let spreadNum = { ...12 };
 let spreadSum = { ...1 + 1 };
 spreadSum.toFixed(); // error, no methods from number

From fe55edc38e69daaca26efd35bdf40bcb8d173bb4 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 29 Nov 2016 13:46:00 -0800
Subject: [PATCH 375/421] Rest in an untyped binding pattern should be any

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 527735a3b0f..65bc52fde1f 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -3099,6 +3099,15 @@ namespace ts {
                         error(declaration, Diagnostics.Rest_types_may_only_be_created_from_object_types);
                         return unknownType;
                     }
+                    const parent = pattern.parent as VariableLikeDeclaration;
+                        if (parent.kind === SyntaxKind.Parameter &&
+                            !parent.type &&
+                            !parent.initializer &&
+                            !getContextuallyTypedParameterType(parent as ParameterDeclaration)) {
+                            // if this type came from examining the structure of the pattern --
+                            // there was no other information -- then it is not sufficient to determine the rest type, so just return any
+                        return anyType;
+                    }
                     const literalMembers: PropertyName[] = [];
                     for (const element of pattern.elements) {
                         if (!(element as BindingElement).dotDotDotToken) {

From f85ca9c395fa3f6e130b945d6f54471a4b8fac00 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 29 Nov 2016 13:50:56 -0800
Subject: [PATCH 376/421] Test that rest of untyped binding pattern is any

---
 tests/baselines/reference/objectRest.js          | 6 ++++++
 tests/baselines/reference/objectRest.symbols     | 6 ++++++
 tests/baselines/reference/objectRest.types       | 8 ++++++++
 tests/cases/conformance/types/rest/objectRest.ts | 2 ++
 4 files changed, 22 insertions(+)

diff --git a/tests/baselines/reference/objectRest.js b/tests/baselines/reference/objectRest.js
index 85d8a6a573e..f1265fd7e9f 100644
--- a/tests/baselines/reference/objectRest.js
+++ b/tests/baselines/reference/objectRest.js
@@ -36,6 +36,8 @@ let computed = 'b';
 let computed2 = 'a';
 var { [computed]: stillNotGreat, [computed2]: soSo,  ...o } = o;
 ({ [computed]: stillNotGreat, [computed2]: soSo, ...o } = o);
+
+var noContextualType = ({ aNumber = 12, ...notEmptyObject }) => aNumber;
 
 
 //// [objectRest.js]
@@ -76,4 +78,8 @@ let computed = 'b';
 let computed2 = 'a';
 var _g = computed, stillNotGreat = o[_g], _h = computed2, soSo = o[_h], o = __rest(o, [typeof _g === "symbol" ? _g : _g + "", typeof _h === "symbol" ? _h : _h + ""]);
 (_j = computed, stillNotGreat = o[_j], _k = computed2, soSo = o[_k], o = __rest(o, [typeof _j === "symbol" ? _j : _j + "", typeof _k === "symbol" ? _k : _k + ""]));
+var noContextualType = (_a) => {
+    var { aNumber = 12 } = _a, notEmptyObject = __rest(_a, ["aNumber"]);
+    return aNumber;
+};
 var _d, _f, _j, _k;
diff --git a/tests/baselines/reference/objectRest.symbols b/tests/baselines/reference/objectRest.symbols
index 325258aa8cd..6b20982f04d 100644
--- a/tests/baselines/reference/objectRest.symbols
+++ b/tests/baselines/reference/objectRest.symbols
@@ -169,3 +169,9 @@ var { [computed]: stillNotGreat, [computed2]: soSo,  ...o } = o;
 >o : Symbol(o, Decl(objectRest.ts, 0, 3), Decl(objectRest.ts, 35, 51))
 >o : Symbol(o, Decl(objectRest.ts, 0, 3), Decl(objectRest.ts, 35, 51))
 
+var noContextualType = ({ aNumber = 12, ...notEmptyObject }) => aNumber;
+>noContextualType : Symbol(noContextualType, Decl(objectRest.ts, 38, 3))
+>aNumber : Symbol(aNumber, Decl(objectRest.ts, 38, 25))
+>notEmptyObject : Symbol(notEmptyObject, Decl(objectRest.ts, 38, 39))
+>aNumber : Symbol(aNumber, Decl(objectRest.ts, 38, 25))
+
diff --git a/tests/baselines/reference/objectRest.types b/tests/baselines/reference/objectRest.types
index 7d833543747..386c55ac818 100644
--- a/tests/baselines/reference/objectRest.types
+++ b/tests/baselines/reference/objectRest.types
@@ -195,3 +195,11 @@ var { [computed]: stillNotGreat, [computed2]: soSo,  ...o } = o;
 >o : { a: number; b: string; }
 >o : { a: number; b: string; }
 
+var noContextualType = ({ aNumber = 12, ...notEmptyObject }) => aNumber;
+>noContextualType : ({aNumber, ...notEmptyObject}: { aNumber?: number; }) => number
+>({ aNumber = 12, ...notEmptyObject }) => aNumber : ({aNumber, ...notEmptyObject}: { aNumber?: number; }) => number
+>aNumber : number
+>12 : 12
+>notEmptyObject : any
+>aNumber : number
+
diff --git a/tests/cases/conformance/types/rest/objectRest.ts b/tests/cases/conformance/types/rest/objectRest.ts
index 3f7be177c7b..fe92bb53566 100644
--- a/tests/cases/conformance/types/rest/objectRest.ts
+++ b/tests/cases/conformance/types/rest/objectRest.ts
@@ -36,3 +36,5 @@ let computed = 'b';
 let computed2 = 'a';
 var { [computed]: stillNotGreat, [computed2]: soSo,  ...o } = o;
 ({ [computed]: stillNotGreat, [computed2]: soSo, ...o } = o);
+
+var noContextualType = ({ aNumber = 12, ...notEmptyObject }) => aNumber;

From 3cd17316282efa0cd87c5dbaa5755b700614b626 Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa@umich.edu>
Date: Tue, 29 Nov 2016 15:59:28 -0600
Subject: [PATCH 377/421] abstract accessors can't have implementations

---
 src/compiler/checker.ts                       |  3 +++
 src/compiler/diagnosticMessages.json          |  4 +++
 .../classAbstractAccessor.errors.txt          | 22 +++++++++++++++
 .../reference/classAbstractAccessor.js        | 27 +++++++++++++++++++
 .../classAbstractAccessor.ts                  |  6 +++++
 5 files changed, 62 insertions(+)
 create mode 100644 tests/baselines/reference/classAbstractAccessor.errors.txt
 create mode 100644 tests/baselines/reference/classAbstractAccessor.js
 create mode 100644 tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAccessor.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 527735a3b0f..53b3bdea3ce 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -21239,6 +21239,9 @@ namespace ts {
             else if (accessor.body === undefined && !(getModifierFlags(accessor) & ModifierFlags.Abstract)) {
                 return grammarErrorAtPos(getSourceFileOfNode(accessor), accessor.end - 1, ";".length, Diagnostics._0_expected, "{");
             }
+            else if (accessor.body && getModifierFlags(accessor) & ModifierFlags.Abstract) {
+                return grammarErrorOnNode(accessor, Diagnostics.An_abstract_accessor_cannot_have_an_implementation);
+            }
             else if (accessor.typeParameters) {
                 return grammarErrorOnNode(accessor.name, Diagnostics.An_accessor_cannot_have_type_parameters);
             }
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 5a22d7d40d5..8f3b9beb888 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -851,6 +851,10 @@
         "category": "Error",
         "code": 1317
     },
+    "An abstract accessor cannot have an implementation.": {
+        "category": "Error",
+        "code": 1318
+    },
     "Duplicate identifier '{0}'.": {
         "category": "Error",
         "code": 2300
diff --git a/tests/baselines/reference/classAbstractAccessor.errors.txt b/tests/baselines/reference/classAbstractAccessor.errors.txt
new file mode 100644
index 00000000000..178a2445cce
--- /dev/null
+++ b/tests/baselines/reference/classAbstractAccessor.errors.txt
@@ -0,0 +1,22 @@
+tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAccessor.ts(2,17): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAccessor.ts(3,17): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAccessor.ts(4,17): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAccessor.ts(5,17): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+
+
+==== tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAccessor.ts (4 errors) ====
+    abstract class A {
+       abstract get a();
+                    ~
+!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+       abstract get aa() { return 1; } // error
+                    ~~
+!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+       abstract set b(x: string);
+                    ~
+!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+       abstract set bb(x: string) {} // error
+                    ~~
+!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/classAbstractAccessor.js b/tests/baselines/reference/classAbstractAccessor.js
new file mode 100644
index 00000000000..d953a4ac0c2
--- /dev/null
+++ b/tests/baselines/reference/classAbstractAccessor.js
@@ -0,0 +1,27 @@
+//// [classAbstractAccessor.ts]
+abstract class A {
+   abstract get a();
+   abstract get aa() { return 1; } // error
+   abstract set b(x: string);
+   abstract set bb(x: string) {} // error
+}
+
+
+//// [classAbstractAccessor.js]
+var A = (function () {
+    function A() {
+    }
+    Object.defineProperty(A.prototype, "aa", {
+        get: function () { return 1; } // error
+        ,
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(A.prototype, "bb", {
+        set: function (x) { } // error
+        ,
+        enumerable: true,
+        configurable: true
+    });
+    return A;
+}());
diff --git a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAccessor.ts b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAccessor.ts
new file mode 100644
index 00000000000..64d087f361f
--- /dev/null
+++ b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAccessor.ts
@@ -0,0 +1,6 @@
+abstract class A {
+   abstract get a();
+   abstract get aa() { return 1; } // error
+   abstract set b(x: string);
+   abstract set bb(x: string) {} // error
+}

From 4b0697ff9d368225aae2d3c743de5e33566037d4 Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa@umich.edu>
Date: Tue, 29 Nov 2016 16:04:56 -0600
Subject: [PATCH 378/421] fix test

---
 .../reference/classAbstractAccessor.errors.txt  | 17 ++++++-----------
 .../reference/classAbstractAccessor.js          |  1 +
 .../classAbstractAccessor.ts                    |  2 ++
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/tests/baselines/reference/classAbstractAccessor.errors.txt b/tests/baselines/reference/classAbstractAccessor.errors.txt
index 178a2445cce..b43cfa9d7f1 100644
--- a/tests/baselines/reference/classAbstractAccessor.errors.txt
+++ b/tests/baselines/reference/classAbstractAccessor.errors.txt
@@ -1,22 +1,17 @@
-tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAccessor.ts(2,17): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAccessor.ts(3,17): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAccessor.ts(4,17): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAccessor.ts(5,17): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAccessor.ts(4,17): error TS1318: An abstract accessor cannot have an implementation.
+tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAccessor.ts(6,17): error TS1318: An abstract accessor cannot have an implementation.
 
 
-==== tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAccessor.ts (4 errors) ====
+==== tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAccessor.ts (2 errors) ====
+    
     abstract class A {
        abstract get a();
-                    ~
-!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
        abstract get aa() { return 1; } // error
                     ~~
-!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+!!! error TS1318: An abstract accessor cannot have an implementation.
        abstract set b(x: string);
-                    ~
-!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
        abstract set bb(x: string) {} // error
                     ~~
-!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+!!! error TS1318: An abstract accessor cannot have an implementation.
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/classAbstractAccessor.js b/tests/baselines/reference/classAbstractAccessor.js
index d953a4ac0c2..a1edf0cb88d 100644
--- a/tests/baselines/reference/classAbstractAccessor.js
+++ b/tests/baselines/reference/classAbstractAccessor.js
@@ -1,4 +1,5 @@
 //// [classAbstractAccessor.ts]
+
 abstract class A {
    abstract get a();
    abstract get aa() { return 1; } // error
diff --git a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAccessor.ts b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAccessor.ts
index 64d087f361f..2c59b6f93cc 100644
--- a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAccessor.ts
+++ b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAccessor.ts
@@ -1,3 +1,5 @@
+// @target: es5
+
 abstract class A {
    abstract get a();
    abstract get aa() { return 1; } // error

From 65e98c84d59bb90f450c5c58949cc47d33cdfb0c Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Tue, 29 Nov 2016 14:06:10 -0800
Subject: [PATCH 379/421] Add more tests

---
 .../reference/mappedTypeModifiers.js          | 108 ++++++--
 .../reference/mappedTypeModifiers.symbols     | 249 ++++++++++++++---
 .../reference/mappedTypeModifiers.types       | 261 ++++++++++++++----
 .../types/mapped/mappedTypeModifiers.ts       |  79 ++++--
 4 files changed, 571 insertions(+), 126 deletions(-)

diff --git a/tests/baselines/reference/mappedTypeModifiers.js b/tests/baselines/reference/mappedTypeModifiers.js
index 8f3f7ba5416..8489194f95a 100644
--- a/tests/baselines/reference/mappedTypeModifiers.js
+++ b/tests/baselines/reference/mappedTypeModifiers.js
@@ -1,45 +1,88 @@
 //// [mappedTypeModifiers.ts]
 
 type T = { a: number, b: string };
-type U = { a: number | undefined, b: string | undefined };
-type P = { a?: number, b?: string };
-type R = { readonly a: number, readonly b: string };
-type PR = { readonly a?: number, readonly b?: string };
+type TU = { a: number | undefined, b: string | undefined };
+type TP = { a?: number, b?: string };
+type TR = { readonly a: number, readonly b: string };
+type TPR = { readonly a?: number, readonly b?: string };
 
 // Validate they all have the same keys
 var v00: "a" | "b";
 var v00: keyof T;
-var v00: keyof U;
-var v00: keyof P;
-var v00: keyof R;
-var v00: keyof PR;
+var v00: keyof TU;
+var v00: keyof TP;
+var v00: keyof TR;
+var v00: keyof TPR;
 
 // Validate that non-isomorphic mapped types strip modifiers
 var v01: T;
-var v01: Pick<R, keyof T>;
+var v01: Pick<TR, keyof T>;
 var v01: Pick<Readonly<T>, keyof T>;
 
 // Validate that non-isomorphic mapped types strip modifiers
-var v02: U;
-var v02: Pick<P, keyof T>;
-var v02: Pick<PR, keyof T>;
+var v02: TU;
+var v02: Pick<TP, keyof T>;
+var v02: Pick<TPR, keyof T>;
 var v02: Pick<Partial<T>, keyof T>;
 var v02: Pick<Partial<Readonly<T>>, keyof T>;
 
 // Validate that isomorphic mapped types preserve optional modifier
-var v03: P;
+var v03: TP;
 var v03: Partial<T>;
 
 // Validate that isomorphic mapped types preserve readonly modifier
-var v04: R;
+var v04: TR;
 var v04: Readonly<T>;
 
 // Validate that isomorphic mapped types preserve both partial and readonly modifiers
-var v05: PR;
-var v05: Partial<R>;
-var v05: Readonly<P>;
+var v05: TPR;
+var v05: Partial<TR>;
+var v05: Readonly<TP>;
 var v05: Partial<Readonly<T>>;
-var v05: Readonly<Partial<T>>;
+var v05: Readonly<Partial<T>>;
+
+type Boxified<T> = { [P in keyof T]: { x: T[P] } };
+
+type B = { a: { x: number }, b: { x: string } };
+type BU = { a: { x: number } | undefined, b: { x: string } | undefined };
+type BP = { a?: { x: number }, b?: { x: string } };
+type BR = { readonly a: { x: number }, readonly b: { x: string } };
+type BPR = { readonly a?: { x: number }, readonly b?: { x: string } };
+
+// Validate they all have the same keys
+var b00: "a" | "b";
+var b00: keyof B;
+var b00: keyof BU;
+var b00: keyof BP;
+var b00: keyof BR;
+var b00: keyof BPR;
+
+// Validate that non-isomorphic mapped types strip modifiers
+var b01: B;
+var b01: Pick<BR, keyof B>;
+var b01: Pick<Readonly<BR>, keyof B>;
+
+// Validate that non-isomorphic mapped types strip modifiers
+var b02: BU;
+var b02: Pick<BP, keyof B>;
+var b02: Pick<BPR, keyof B>;
+var b02: Pick<Partial<B>, keyof B>;
+var b02: Pick<Partial<Readonly<B>>, keyof B>;
+
+// Validate that isomorphic mapped types preserve optional modifier
+var b03: BP;
+var b03: Partial<B>;
+
+// Validate that isomorphic mapped types preserve readonly modifier
+var b04: BR;
+var b04: Readonly<B>;
+
+// Validate that isomorphic mapped types preserve both partial and readonly modifiers
+var b05: BPR;
+var b05: Partial<BR>;
+var b05: Readonly<BP>;
+var b05: Partial<Readonly<B>>;
+var b05: Readonly<Partial<B>>;
 
 //// [mappedTypeModifiers.js]
 // Validate they all have the same keys
@@ -71,3 +114,32 @@ var v05;
 var v05;
 var v05;
 var v05;
+// Validate they all have the same keys
+var b00;
+var b00;
+var b00;
+var b00;
+var b00;
+var b00;
+// Validate that non-isomorphic mapped types strip modifiers
+var b01;
+var b01;
+var b01;
+// Validate that non-isomorphic mapped types strip modifiers
+var b02;
+var b02;
+var b02;
+var b02;
+var b02;
+// Validate that isomorphic mapped types preserve optional modifier
+var b03;
+var b03;
+// Validate that isomorphic mapped types preserve readonly modifier
+var b04;
+var b04;
+// Validate that isomorphic mapped types preserve both partial and readonly modifiers
+var b05;
+var b05;
+var b05;
+var b05;
+var b05;
diff --git a/tests/baselines/reference/mappedTypeModifiers.symbols b/tests/baselines/reference/mappedTypeModifiers.symbols
index 6799d13d1ac..8be2f53cec1 100644
--- a/tests/baselines/reference/mappedTypeModifiers.symbols
+++ b/tests/baselines/reference/mappedTypeModifiers.symbols
@@ -5,25 +5,25 @@ type T = { a: number, b: string };
 >a : Symbol(a, Decl(mappedTypeModifiers.ts, 1, 10))
 >b : Symbol(b, Decl(mappedTypeModifiers.ts, 1, 21))
 
-type U = { a: number | undefined, b: string | undefined };
->U : Symbol(U, Decl(mappedTypeModifiers.ts, 1, 34))
->a : Symbol(a, Decl(mappedTypeModifiers.ts, 2, 10))
->b : Symbol(b, Decl(mappedTypeModifiers.ts, 2, 33))
+type TU = { a: number | undefined, b: string | undefined };
+>TU : Symbol(TU, Decl(mappedTypeModifiers.ts, 1, 34))
+>a : Symbol(a, Decl(mappedTypeModifiers.ts, 2, 11))
+>b : Symbol(b, Decl(mappedTypeModifiers.ts, 2, 34))
 
-type P = { a?: number, b?: string };
->P : Symbol(P, Decl(mappedTypeModifiers.ts, 2, 58))
->a : Symbol(a, Decl(mappedTypeModifiers.ts, 3, 10))
->b : Symbol(b, Decl(mappedTypeModifiers.ts, 3, 22))
+type TP = { a?: number, b?: string };
+>TP : Symbol(TP, Decl(mappedTypeModifiers.ts, 2, 59))
+>a : Symbol(a, Decl(mappedTypeModifiers.ts, 3, 11))
+>b : Symbol(b, Decl(mappedTypeModifiers.ts, 3, 23))
 
-type R = { readonly a: number, readonly b: string };
->R : Symbol(R, Decl(mappedTypeModifiers.ts, 3, 36))
->a : Symbol(a, Decl(mappedTypeModifiers.ts, 4, 10))
->b : Symbol(b, Decl(mappedTypeModifiers.ts, 4, 30))
+type TR = { readonly a: number, readonly b: string };
+>TR : Symbol(TR, Decl(mappedTypeModifiers.ts, 3, 37))
+>a : Symbol(a, Decl(mappedTypeModifiers.ts, 4, 11))
+>b : Symbol(b, Decl(mappedTypeModifiers.ts, 4, 31))
 
-type PR = { readonly a?: number, readonly b?: string };
->PR : Symbol(PR, Decl(mappedTypeModifiers.ts, 4, 52))
->a : Symbol(a, Decl(mappedTypeModifiers.ts, 5, 11))
->b : Symbol(b, Decl(mappedTypeModifiers.ts, 5, 32))
+type TPR = { readonly a?: number, readonly b?: string };
+>TPR : Symbol(TPR, Decl(mappedTypeModifiers.ts, 4, 53))
+>a : Symbol(a, Decl(mappedTypeModifiers.ts, 5, 12))
+>b : Symbol(b, Decl(mappedTypeModifiers.ts, 5, 33))
 
 // Validate they all have the same keys
 var v00: "a" | "b";
@@ -33,31 +33,31 @@ var v00: keyof T;
 >v00 : Symbol(v00, Decl(mappedTypeModifiers.ts, 8, 3), Decl(mappedTypeModifiers.ts, 9, 3), Decl(mappedTypeModifiers.ts, 10, 3), Decl(mappedTypeModifiers.ts, 11, 3), Decl(mappedTypeModifiers.ts, 12, 3), Decl(mappedTypeModifiers.ts, 13, 3))
 >T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
 
-var v00: keyof U;
+var v00: keyof TU;
 >v00 : Symbol(v00, Decl(mappedTypeModifiers.ts, 8, 3), Decl(mappedTypeModifiers.ts, 9, 3), Decl(mappedTypeModifiers.ts, 10, 3), Decl(mappedTypeModifiers.ts, 11, 3), Decl(mappedTypeModifiers.ts, 12, 3), Decl(mappedTypeModifiers.ts, 13, 3))
->U : Symbol(U, Decl(mappedTypeModifiers.ts, 1, 34))
+>TU : Symbol(TU, Decl(mappedTypeModifiers.ts, 1, 34))
 
-var v00: keyof P;
+var v00: keyof TP;
 >v00 : Symbol(v00, Decl(mappedTypeModifiers.ts, 8, 3), Decl(mappedTypeModifiers.ts, 9, 3), Decl(mappedTypeModifiers.ts, 10, 3), Decl(mappedTypeModifiers.ts, 11, 3), Decl(mappedTypeModifiers.ts, 12, 3), Decl(mappedTypeModifiers.ts, 13, 3))
->P : Symbol(P, Decl(mappedTypeModifiers.ts, 2, 58))
+>TP : Symbol(TP, Decl(mappedTypeModifiers.ts, 2, 59))
 
-var v00: keyof R;
+var v00: keyof TR;
 >v00 : Symbol(v00, Decl(mappedTypeModifiers.ts, 8, 3), Decl(mappedTypeModifiers.ts, 9, 3), Decl(mappedTypeModifiers.ts, 10, 3), Decl(mappedTypeModifiers.ts, 11, 3), Decl(mappedTypeModifiers.ts, 12, 3), Decl(mappedTypeModifiers.ts, 13, 3))
->R : Symbol(R, Decl(mappedTypeModifiers.ts, 3, 36))
+>TR : Symbol(TR, Decl(mappedTypeModifiers.ts, 3, 37))
 
-var v00: keyof PR;
+var v00: keyof TPR;
 >v00 : Symbol(v00, Decl(mappedTypeModifiers.ts, 8, 3), Decl(mappedTypeModifiers.ts, 9, 3), Decl(mappedTypeModifiers.ts, 10, 3), Decl(mappedTypeModifiers.ts, 11, 3), Decl(mappedTypeModifiers.ts, 12, 3), Decl(mappedTypeModifiers.ts, 13, 3))
->PR : Symbol(PR, Decl(mappedTypeModifiers.ts, 4, 52))
+>TPR : Symbol(TPR, Decl(mappedTypeModifiers.ts, 4, 53))
 
 // Validate that non-isomorphic mapped types strip modifiers
 var v01: T;
 >v01 : Symbol(v01, Decl(mappedTypeModifiers.ts, 16, 3), Decl(mappedTypeModifiers.ts, 17, 3), Decl(mappedTypeModifiers.ts, 18, 3))
 >T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
 
-var v01: Pick<R, keyof T>;
+var v01: Pick<TR, keyof T>;
 >v01 : Symbol(v01, Decl(mappedTypeModifiers.ts, 16, 3), Decl(mappedTypeModifiers.ts, 17, 3), Decl(mappedTypeModifiers.ts, 18, 3))
 >Pick : Symbol(Pick, Decl(lib.d.ts, --, --))
->R : Symbol(R, Decl(mappedTypeModifiers.ts, 3, 36))
+>TR : Symbol(TR, Decl(mappedTypeModifiers.ts, 3, 37))
 >T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
 
 var v01: Pick<Readonly<T>, keyof T>;
@@ -68,20 +68,20 @@ var v01: Pick<Readonly<T>, keyof T>;
 >T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
 
 // Validate that non-isomorphic mapped types strip modifiers
-var v02: U;
+var v02: TU;
 >v02 : Symbol(v02, Decl(mappedTypeModifiers.ts, 21, 3), Decl(mappedTypeModifiers.ts, 22, 3), Decl(mappedTypeModifiers.ts, 23, 3), Decl(mappedTypeModifiers.ts, 24, 3), Decl(mappedTypeModifiers.ts, 25, 3))
->U : Symbol(U, Decl(mappedTypeModifiers.ts, 1, 34))
+>TU : Symbol(TU, Decl(mappedTypeModifiers.ts, 1, 34))
 
-var v02: Pick<P, keyof T>;
+var v02: Pick<TP, keyof T>;
 >v02 : Symbol(v02, Decl(mappedTypeModifiers.ts, 21, 3), Decl(mappedTypeModifiers.ts, 22, 3), Decl(mappedTypeModifiers.ts, 23, 3), Decl(mappedTypeModifiers.ts, 24, 3), Decl(mappedTypeModifiers.ts, 25, 3))
 >Pick : Symbol(Pick, Decl(lib.d.ts, --, --))
->P : Symbol(P, Decl(mappedTypeModifiers.ts, 2, 58))
+>TP : Symbol(TP, Decl(mappedTypeModifiers.ts, 2, 59))
 >T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
 
-var v02: Pick<PR, keyof T>;
+var v02: Pick<TPR, keyof T>;
 >v02 : Symbol(v02, Decl(mappedTypeModifiers.ts, 21, 3), Decl(mappedTypeModifiers.ts, 22, 3), Decl(mappedTypeModifiers.ts, 23, 3), Decl(mappedTypeModifiers.ts, 24, 3), Decl(mappedTypeModifiers.ts, 25, 3))
 >Pick : Symbol(Pick, Decl(lib.d.ts, --, --))
->PR : Symbol(PR, Decl(mappedTypeModifiers.ts, 4, 52))
+>TPR : Symbol(TPR, Decl(mappedTypeModifiers.ts, 4, 53))
 >T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
 
 var v02: Pick<Partial<T>, keyof T>;
@@ -100,9 +100,9 @@ var v02: Pick<Partial<Readonly<T>>, keyof T>;
 >T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
 
 // Validate that isomorphic mapped types preserve optional modifier
-var v03: P;
+var v03: TP;
 >v03 : Symbol(v03, Decl(mappedTypeModifiers.ts, 28, 3), Decl(mappedTypeModifiers.ts, 29, 3))
->P : Symbol(P, Decl(mappedTypeModifiers.ts, 2, 58))
+>TP : Symbol(TP, Decl(mappedTypeModifiers.ts, 2, 59))
 
 var v03: Partial<T>;
 >v03 : Symbol(v03, Decl(mappedTypeModifiers.ts, 28, 3), Decl(mappedTypeModifiers.ts, 29, 3))
@@ -110,9 +110,9 @@ var v03: Partial<T>;
 >T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
 
 // Validate that isomorphic mapped types preserve readonly modifier
-var v04: R;
+var v04: TR;
 >v04 : Symbol(v04, Decl(mappedTypeModifiers.ts, 32, 3), Decl(mappedTypeModifiers.ts, 33, 3))
->R : Symbol(R, Decl(mappedTypeModifiers.ts, 3, 36))
+>TR : Symbol(TR, Decl(mappedTypeModifiers.ts, 3, 37))
 
 var v04: Readonly<T>;
 >v04 : Symbol(v04, Decl(mappedTypeModifiers.ts, 32, 3), Decl(mappedTypeModifiers.ts, 33, 3))
@@ -120,19 +120,19 @@ var v04: Readonly<T>;
 >T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
 
 // Validate that isomorphic mapped types preserve both partial and readonly modifiers
-var v05: PR;
+var v05: TPR;
 >v05 : Symbol(v05, Decl(mappedTypeModifiers.ts, 36, 3), Decl(mappedTypeModifiers.ts, 37, 3), Decl(mappedTypeModifiers.ts, 38, 3), Decl(mappedTypeModifiers.ts, 39, 3), Decl(mappedTypeModifiers.ts, 40, 3))
->PR : Symbol(PR, Decl(mappedTypeModifiers.ts, 4, 52))
+>TPR : Symbol(TPR, Decl(mappedTypeModifiers.ts, 4, 53))
 
-var v05: Partial<R>;
+var v05: Partial<TR>;
 >v05 : Symbol(v05, Decl(mappedTypeModifiers.ts, 36, 3), Decl(mappedTypeModifiers.ts, 37, 3), Decl(mappedTypeModifiers.ts, 38, 3), Decl(mappedTypeModifiers.ts, 39, 3), Decl(mappedTypeModifiers.ts, 40, 3))
 >Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
->R : Symbol(R, Decl(mappedTypeModifiers.ts, 3, 36))
+>TR : Symbol(TR, Decl(mappedTypeModifiers.ts, 3, 37))
 
-var v05: Readonly<P>;
+var v05: Readonly<TP>;
 >v05 : Symbol(v05, Decl(mappedTypeModifiers.ts, 36, 3), Decl(mappedTypeModifiers.ts, 37, 3), Decl(mappedTypeModifiers.ts, 38, 3), Decl(mappedTypeModifiers.ts, 39, 3), Decl(mappedTypeModifiers.ts, 40, 3))
 >Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
->P : Symbol(P, Decl(mappedTypeModifiers.ts, 2, 58))
+>TP : Symbol(TP, Decl(mappedTypeModifiers.ts, 2, 59))
 
 var v05: Partial<Readonly<T>>;
 >v05 : Symbol(v05, Decl(mappedTypeModifiers.ts, 36, 3), Decl(mappedTypeModifiers.ts, 37, 3), Decl(mappedTypeModifiers.ts, 38, 3), Decl(mappedTypeModifiers.ts, 39, 3), Decl(mappedTypeModifiers.ts, 40, 3))
@@ -146,3 +146,168 @@ var v05: Readonly<Partial<T>>;
 >Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
 >T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
 
+type Boxified<T> = { [P in keyof T]: { x: T[P] } };
+>Boxified : Symbol(Boxified, Decl(mappedTypeModifiers.ts, 40, 30))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 42, 14))
+>P : Symbol(P, Decl(mappedTypeModifiers.ts, 42, 22))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 42, 14))
+>x : Symbol(x, Decl(mappedTypeModifiers.ts, 42, 38))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 42, 14))
+>P : Symbol(P, Decl(mappedTypeModifiers.ts, 42, 22))
+
+type B = { a: { x: number }, b: { x: string } };
+>B : Symbol(B, Decl(mappedTypeModifiers.ts, 42, 51))
+>a : Symbol(a, Decl(mappedTypeModifiers.ts, 44, 10))
+>x : Symbol(x, Decl(mappedTypeModifiers.ts, 44, 15))
+>b : Symbol(b, Decl(mappedTypeModifiers.ts, 44, 28))
+>x : Symbol(x, Decl(mappedTypeModifiers.ts, 44, 33))
+
+type BU = { a: { x: number } | undefined, b: { x: string } | undefined };
+>BU : Symbol(BU, Decl(mappedTypeModifiers.ts, 44, 48))
+>a : Symbol(a, Decl(mappedTypeModifiers.ts, 45, 11))
+>x : Symbol(x, Decl(mappedTypeModifiers.ts, 45, 16))
+>b : Symbol(b, Decl(mappedTypeModifiers.ts, 45, 41))
+>x : Symbol(x, Decl(mappedTypeModifiers.ts, 45, 46))
+
+type BP = { a?: { x: number }, b?: { x: string } };
+>BP : Symbol(BP, Decl(mappedTypeModifiers.ts, 45, 73))
+>a : Symbol(a, Decl(mappedTypeModifiers.ts, 46, 11))
+>x : Symbol(x, Decl(mappedTypeModifiers.ts, 46, 17))
+>b : Symbol(b, Decl(mappedTypeModifiers.ts, 46, 30))
+>x : Symbol(x, Decl(mappedTypeModifiers.ts, 46, 36))
+
+type BR = { readonly a: { x: number }, readonly b: { x: string } };
+>BR : Symbol(BR, Decl(mappedTypeModifiers.ts, 46, 51))
+>a : Symbol(a, Decl(mappedTypeModifiers.ts, 47, 11))
+>x : Symbol(x, Decl(mappedTypeModifiers.ts, 47, 25))
+>b : Symbol(b, Decl(mappedTypeModifiers.ts, 47, 38))
+>x : Symbol(x, Decl(mappedTypeModifiers.ts, 47, 52))
+
+type BPR = { readonly a?: { x: number }, readonly b?: { x: string } };
+>BPR : Symbol(BPR, Decl(mappedTypeModifiers.ts, 47, 67))
+>a : Symbol(a, Decl(mappedTypeModifiers.ts, 48, 12))
+>x : Symbol(x, Decl(mappedTypeModifiers.ts, 48, 27))
+>b : Symbol(b, Decl(mappedTypeModifiers.ts, 48, 40))
+>x : Symbol(x, Decl(mappedTypeModifiers.ts, 48, 55))
+
+// Validate they all have the same keys
+var b00: "a" | "b";
+>b00 : Symbol(b00, Decl(mappedTypeModifiers.ts, 51, 3), Decl(mappedTypeModifiers.ts, 52, 3), Decl(mappedTypeModifiers.ts, 53, 3), Decl(mappedTypeModifiers.ts, 54, 3), Decl(mappedTypeModifiers.ts, 55, 3), Decl(mappedTypeModifiers.ts, 56, 3))
+
+var b00: keyof B;
+>b00 : Symbol(b00, Decl(mappedTypeModifiers.ts, 51, 3), Decl(mappedTypeModifiers.ts, 52, 3), Decl(mappedTypeModifiers.ts, 53, 3), Decl(mappedTypeModifiers.ts, 54, 3), Decl(mappedTypeModifiers.ts, 55, 3), Decl(mappedTypeModifiers.ts, 56, 3))
+>B : Symbol(B, Decl(mappedTypeModifiers.ts, 42, 51))
+
+var b00: keyof BU;
+>b00 : Symbol(b00, Decl(mappedTypeModifiers.ts, 51, 3), Decl(mappedTypeModifiers.ts, 52, 3), Decl(mappedTypeModifiers.ts, 53, 3), Decl(mappedTypeModifiers.ts, 54, 3), Decl(mappedTypeModifiers.ts, 55, 3), Decl(mappedTypeModifiers.ts, 56, 3))
+>BU : Symbol(BU, Decl(mappedTypeModifiers.ts, 44, 48))
+
+var b00: keyof BP;
+>b00 : Symbol(b00, Decl(mappedTypeModifiers.ts, 51, 3), Decl(mappedTypeModifiers.ts, 52, 3), Decl(mappedTypeModifiers.ts, 53, 3), Decl(mappedTypeModifiers.ts, 54, 3), Decl(mappedTypeModifiers.ts, 55, 3), Decl(mappedTypeModifiers.ts, 56, 3))
+>BP : Symbol(BP, Decl(mappedTypeModifiers.ts, 45, 73))
+
+var b00: keyof BR;
+>b00 : Symbol(b00, Decl(mappedTypeModifiers.ts, 51, 3), Decl(mappedTypeModifiers.ts, 52, 3), Decl(mappedTypeModifiers.ts, 53, 3), Decl(mappedTypeModifiers.ts, 54, 3), Decl(mappedTypeModifiers.ts, 55, 3), Decl(mappedTypeModifiers.ts, 56, 3))
+>BR : Symbol(BR, Decl(mappedTypeModifiers.ts, 46, 51))
+
+var b00: keyof BPR;
+>b00 : Symbol(b00, Decl(mappedTypeModifiers.ts, 51, 3), Decl(mappedTypeModifiers.ts, 52, 3), Decl(mappedTypeModifiers.ts, 53, 3), Decl(mappedTypeModifiers.ts, 54, 3), Decl(mappedTypeModifiers.ts, 55, 3), Decl(mappedTypeModifiers.ts, 56, 3))
+>BPR : Symbol(BPR, Decl(mappedTypeModifiers.ts, 47, 67))
+
+// Validate that non-isomorphic mapped types strip modifiers
+var b01: B;
+>b01 : Symbol(b01, Decl(mappedTypeModifiers.ts, 59, 3), Decl(mappedTypeModifiers.ts, 60, 3), Decl(mappedTypeModifiers.ts, 61, 3))
+>B : Symbol(B, Decl(mappedTypeModifiers.ts, 42, 51))
+
+var b01: Pick<BR, keyof B>;
+>b01 : Symbol(b01, Decl(mappedTypeModifiers.ts, 59, 3), Decl(mappedTypeModifiers.ts, 60, 3), Decl(mappedTypeModifiers.ts, 61, 3))
+>Pick : Symbol(Pick, Decl(lib.d.ts, --, --))
+>BR : Symbol(BR, Decl(mappedTypeModifiers.ts, 46, 51))
+>B : Symbol(B, Decl(mappedTypeModifiers.ts, 42, 51))
+
+var b01: Pick<Readonly<BR>, keyof B>;
+>b01 : Symbol(b01, Decl(mappedTypeModifiers.ts, 59, 3), Decl(mappedTypeModifiers.ts, 60, 3), Decl(mappedTypeModifiers.ts, 61, 3))
+>Pick : Symbol(Pick, Decl(lib.d.ts, --, --))
+>Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
+>BR : Symbol(BR, Decl(mappedTypeModifiers.ts, 46, 51))
+>B : Symbol(B, Decl(mappedTypeModifiers.ts, 42, 51))
+
+// Validate that non-isomorphic mapped types strip modifiers
+var b02: BU;
+>b02 : Symbol(b02, Decl(mappedTypeModifiers.ts, 64, 3), Decl(mappedTypeModifiers.ts, 65, 3), Decl(mappedTypeModifiers.ts, 66, 3), Decl(mappedTypeModifiers.ts, 67, 3), Decl(mappedTypeModifiers.ts, 68, 3))
+>BU : Symbol(BU, Decl(mappedTypeModifiers.ts, 44, 48))
+
+var b02: Pick<BP, keyof B>;
+>b02 : Symbol(b02, Decl(mappedTypeModifiers.ts, 64, 3), Decl(mappedTypeModifiers.ts, 65, 3), Decl(mappedTypeModifiers.ts, 66, 3), Decl(mappedTypeModifiers.ts, 67, 3), Decl(mappedTypeModifiers.ts, 68, 3))
+>Pick : Symbol(Pick, Decl(lib.d.ts, --, --))
+>BP : Symbol(BP, Decl(mappedTypeModifiers.ts, 45, 73))
+>B : Symbol(B, Decl(mappedTypeModifiers.ts, 42, 51))
+
+var b02: Pick<BPR, keyof B>;
+>b02 : Symbol(b02, Decl(mappedTypeModifiers.ts, 64, 3), Decl(mappedTypeModifiers.ts, 65, 3), Decl(mappedTypeModifiers.ts, 66, 3), Decl(mappedTypeModifiers.ts, 67, 3), Decl(mappedTypeModifiers.ts, 68, 3))
+>Pick : Symbol(Pick, Decl(lib.d.ts, --, --))
+>BPR : Symbol(BPR, Decl(mappedTypeModifiers.ts, 47, 67))
+>B : Symbol(B, Decl(mappedTypeModifiers.ts, 42, 51))
+
+var b02: Pick<Partial<B>, keyof B>;
+>b02 : Symbol(b02, Decl(mappedTypeModifiers.ts, 64, 3), Decl(mappedTypeModifiers.ts, 65, 3), Decl(mappedTypeModifiers.ts, 66, 3), Decl(mappedTypeModifiers.ts, 67, 3), Decl(mappedTypeModifiers.ts, 68, 3))
+>Pick : Symbol(Pick, Decl(lib.d.ts, --, --))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+>B : Symbol(B, Decl(mappedTypeModifiers.ts, 42, 51))
+>B : Symbol(B, Decl(mappedTypeModifiers.ts, 42, 51))
+
+var b02: Pick<Partial<Readonly<B>>, keyof B>;
+>b02 : Symbol(b02, Decl(mappedTypeModifiers.ts, 64, 3), Decl(mappedTypeModifiers.ts, 65, 3), Decl(mappedTypeModifiers.ts, 66, 3), Decl(mappedTypeModifiers.ts, 67, 3), Decl(mappedTypeModifiers.ts, 68, 3))
+>Pick : Symbol(Pick, Decl(lib.d.ts, --, --))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+>Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
+>B : Symbol(B, Decl(mappedTypeModifiers.ts, 42, 51))
+>B : Symbol(B, Decl(mappedTypeModifiers.ts, 42, 51))
+
+// Validate that isomorphic mapped types preserve optional modifier
+var b03: BP;
+>b03 : Symbol(b03, Decl(mappedTypeModifiers.ts, 71, 3), Decl(mappedTypeModifiers.ts, 72, 3))
+>BP : Symbol(BP, Decl(mappedTypeModifiers.ts, 45, 73))
+
+var b03: Partial<B>;
+>b03 : Symbol(b03, Decl(mappedTypeModifiers.ts, 71, 3), Decl(mappedTypeModifiers.ts, 72, 3))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+>B : Symbol(B, Decl(mappedTypeModifiers.ts, 42, 51))
+
+// Validate that isomorphic mapped types preserve readonly modifier
+var b04: BR;
+>b04 : Symbol(b04, Decl(mappedTypeModifiers.ts, 75, 3), Decl(mappedTypeModifiers.ts, 76, 3))
+>BR : Symbol(BR, Decl(mappedTypeModifiers.ts, 46, 51))
+
+var b04: Readonly<B>;
+>b04 : Symbol(b04, Decl(mappedTypeModifiers.ts, 75, 3), Decl(mappedTypeModifiers.ts, 76, 3))
+>Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
+>B : Symbol(B, Decl(mappedTypeModifiers.ts, 42, 51))
+
+// Validate that isomorphic mapped types preserve both partial and readonly modifiers
+var b05: BPR;
+>b05 : Symbol(b05, Decl(mappedTypeModifiers.ts, 79, 3), Decl(mappedTypeModifiers.ts, 80, 3), Decl(mappedTypeModifiers.ts, 81, 3), Decl(mappedTypeModifiers.ts, 82, 3), Decl(mappedTypeModifiers.ts, 83, 3))
+>BPR : Symbol(BPR, Decl(mappedTypeModifiers.ts, 47, 67))
+
+var b05: Partial<BR>;
+>b05 : Symbol(b05, Decl(mappedTypeModifiers.ts, 79, 3), Decl(mappedTypeModifiers.ts, 80, 3), Decl(mappedTypeModifiers.ts, 81, 3), Decl(mappedTypeModifiers.ts, 82, 3), Decl(mappedTypeModifiers.ts, 83, 3))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+>BR : Symbol(BR, Decl(mappedTypeModifiers.ts, 46, 51))
+
+var b05: Readonly<BP>;
+>b05 : Symbol(b05, Decl(mappedTypeModifiers.ts, 79, 3), Decl(mappedTypeModifiers.ts, 80, 3), Decl(mappedTypeModifiers.ts, 81, 3), Decl(mappedTypeModifiers.ts, 82, 3), Decl(mappedTypeModifiers.ts, 83, 3))
+>Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
+>BP : Symbol(BP, Decl(mappedTypeModifiers.ts, 45, 73))
+
+var b05: Partial<Readonly<B>>;
+>b05 : Symbol(b05, Decl(mappedTypeModifiers.ts, 79, 3), Decl(mappedTypeModifiers.ts, 80, 3), Decl(mappedTypeModifiers.ts, 81, 3), Decl(mappedTypeModifiers.ts, 82, 3), Decl(mappedTypeModifiers.ts, 83, 3))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+>Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
+>B : Symbol(B, Decl(mappedTypeModifiers.ts, 42, 51))
+
+var b05: Readonly<Partial<B>>;
+>b05 : Symbol(b05, Decl(mappedTypeModifiers.ts, 79, 3), Decl(mappedTypeModifiers.ts, 80, 3), Decl(mappedTypeModifiers.ts, 81, 3), Decl(mappedTypeModifiers.ts, 82, 3), Decl(mappedTypeModifiers.ts, 83, 3))
+>Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+>B : Symbol(B, Decl(mappedTypeModifiers.ts, 42, 51))
+
diff --git a/tests/baselines/reference/mappedTypeModifiers.types b/tests/baselines/reference/mappedTypeModifiers.types
index 5c713991f75..61b9bfc03b2 100644
--- a/tests/baselines/reference/mappedTypeModifiers.types
+++ b/tests/baselines/reference/mappedTypeModifiers.types
@@ -5,23 +5,23 @@ type T = { a: number, b: string };
 >a : number
 >b : string
 
-type U = { a: number | undefined, b: string | undefined };
->U : U
+type TU = { a: number | undefined, b: string | undefined };
+>TU : TU
 >a : number | undefined
 >b : string | undefined
 
-type P = { a?: number, b?: string };
->P : P
+type TP = { a?: number, b?: string };
+>TP : TP
 >a : number | undefined
 >b : string | undefined
 
-type R = { readonly a: number, readonly b: string };
->R : R
+type TR = { readonly a: number, readonly b: string };
+>TR : TR
 >a : number
 >b : string
 
-type PR = { readonly a?: number, readonly b?: string };
->PR : PR
+type TPR = { readonly a?: number, readonly b?: string };
+>TPR : TPR
 >a : number | undefined
 >b : string | undefined
 
@@ -33,31 +33,31 @@ var v00: keyof T;
 >v00 : "a" | "b"
 >T : T
 
-var v00: keyof U;
+var v00: keyof TU;
 >v00 : "a" | "b"
->U : U
+>TU : TU
 
-var v00: keyof P;
+var v00: keyof TP;
 >v00 : "a" | "b"
->P : P
+>TP : TP
 
-var v00: keyof R;
+var v00: keyof TR;
 >v00 : "a" | "b"
->R : R
+>TR : TR
 
-var v00: keyof PR;
+var v00: keyof TPR;
 >v00 : "a" | "b"
->PR : PR
+>TPR : TPR
 
 // Validate that non-isomorphic mapped types strip modifiers
 var v01: T;
 >v01 : T
 >T : T
 
-var v01: Pick<R, keyof T>;
+var v01: Pick<TR, keyof T>;
 >v01 : T
 >Pick : Pick<T, K>
->R : R
+>TR : TR
 >T : T
 
 var v01: Pick<Readonly<T>, keyof T>;
@@ -68,31 +68,31 @@ var v01: Pick<Readonly<T>, keyof T>;
 >T : T
 
 // Validate that non-isomorphic mapped types strip modifiers
-var v02: U;
->v02 : U
->U : U
+var v02: TU;
+>v02 : TU
+>TU : TU
 
-var v02: Pick<P, keyof T>;
->v02 : U
+var v02: Pick<TP, keyof T>;
+>v02 : TU
 >Pick : Pick<T, K>
->P : P
+>TP : TP
 >T : T
 
-var v02: Pick<PR, keyof T>;
->v02 : U
+var v02: Pick<TPR, keyof T>;
+>v02 : TU
 >Pick : Pick<T, K>
->PR : PR
+>TPR : TPR
 >T : T
 
 var v02: Pick<Partial<T>, keyof T>;
->v02 : U
+>v02 : TU
 >Pick : Pick<T, K>
 >Partial : Partial<T>
 >T : T
 >T : T
 
 var v02: Pick<Partial<Readonly<T>>, keyof T>;
->v02 : U
+>v02 : TU
 >Pick : Pick<T, K>
 >Partial : Partial<T>
 >Readonly : Readonly<T>
@@ -100,49 +100,214 @@ var v02: Pick<Partial<Readonly<T>>, keyof T>;
 >T : T
 
 // Validate that isomorphic mapped types preserve optional modifier
-var v03: P;
->v03 : P
->P : P
+var v03: TP;
+>v03 : TP
+>TP : TP
 
 var v03: Partial<T>;
->v03 : P
+>v03 : TP
 >Partial : Partial<T>
 >T : T
 
 // Validate that isomorphic mapped types preserve readonly modifier
-var v04: R;
->v04 : R
->R : R
+var v04: TR;
+>v04 : TR
+>TR : TR
 
 var v04: Readonly<T>;
->v04 : R
+>v04 : TR
 >Readonly : Readonly<T>
 >T : T
 
 // Validate that isomorphic mapped types preserve both partial and readonly modifiers
-var v05: PR;
->v05 : PR
->PR : PR
+var v05: TPR;
+>v05 : TPR
+>TPR : TPR
 
-var v05: Partial<R>;
->v05 : PR
+var v05: Partial<TR>;
+>v05 : TPR
 >Partial : Partial<T>
->R : R
+>TR : TR
 
-var v05: Readonly<P>;
->v05 : PR
+var v05: Readonly<TP>;
+>v05 : TPR
 >Readonly : Readonly<T>
->P : P
+>TP : TP
 
 var v05: Partial<Readonly<T>>;
->v05 : PR
+>v05 : TPR
 >Partial : Partial<T>
 >Readonly : Readonly<T>
 >T : T
 
 var v05: Readonly<Partial<T>>;
->v05 : PR
+>v05 : TPR
 >Readonly : Readonly<T>
 >Partial : Partial<T>
 >T : T
 
+type Boxified<T> = { [P in keyof T]: { x: T[P] } };
+>Boxified : Boxified<T>
+>T : T
+>P : P
+>T : T
+>x : T[P]
+>T : T
+>P : P
+
+type B = { a: { x: number }, b: { x: string } };
+>B : B
+>a : { x: number; }
+>x : number
+>b : { x: string; }
+>x : string
+
+type BU = { a: { x: number } | undefined, b: { x: string } | undefined };
+>BU : BU
+>a : { x: number; } | undefined
+>x : number
+>b : { x: string; } | undefined
+>x : string
+
+type BP = { a?: { x: number }, b?: { x: string } };
+>BP : BP
+>a : { x: number; } | undefined
+>x : number
+>b : { x: string; } | undefined
+>x : string
+
+type BR = { readonly a: { x: number }, readonly b: { x: string } };
+>BR : BR
+>a : { x: number; }
+>x : number
+>b : { x: string; }
+>x : string
+
+type BPR = { readonly a?: { x: number }, readonly b?: { x: string } };
+>BPR : BPR
+>a : { x: number; } | undefined
+>x : number
+>b : { x: string; } | undefined
+>x : string
+
+// Validate they all have the same keys
+var b00: "a" | "b";
+>b00 : "a" | "b"
+
+var b00: keyof B;
+>b00 : "a" | "b"
+>B : B
+
+var b00: keyof BU;
+>b00 : "a" | "b"
+>BU : BU
+
+var b00: keyof BP;
+>b00 : "a" | "b"
+>BP : BP
+
+var b00: keyof BR;
+>b00 : "a" | "b"
+>BR : BR
+
+var b00: keyof BPR;
+>b00 : "a" | "b"
+>BPR : BPR
+
+// Validate that non-isomorphic mapped types strip modifiers
+var b01: B;
+>b01 : B
+>B : B
+
+var b01: Pick<BR, keyof B>;
+>b01 : B
+>Pick : Pick<T, K>
+>BR : BR
+>B : B
+
+var b01: Pick<Readonly<BR>, keyof B>;
+>b01 : B
+>Pick : Pick<T, K>
+>Readonly : Readonly<T>
+>BR : BR
+>B : B
+
+// Validate that non-isomorphic mapped types strip modifiers
+var b02: BU;
+>b02 : BU
+>BU : BU
+
+var b02: Pick<BP, keyof B>;
+>b02 : BU
+>Pick : Pick<T, K>
+>BP : BP
+>B : B
+
+var b02: Pick<BPR, keyof B>;
+>b02 : BU
+>Pick : Pick<T, K>
+>BPR : BPR
+>B : B
+
+var b02: Pick<Partial<B>, keyof B>;
+>b02 : BU
+>Pick : Pick<T, K>
+>Partial : Partial<T>
+>B : B
+>B : B
+
+var b02: Pick<Partial<Readonly<B>>, keyof B>;
+>b02 : BU
+>Pick : Pick<T, K>
+>Partial : Partial<T>
+>Readonly : Readonly<T>
+>B : B
+>B : B
+
+// Validate that isomorphic mapped types preserve optional modifier
+var b03: BP;
+>b03 : BP
+>BP : BP
+
+var b03: Partial<B>;
+>b03 : BP
+>Partial : Partial<T>
+>B : B
+
+// Validate that isomorphic mapped types preserve readonly modifier
+var b04: BR;
+>b04 : BR
+>BR : BR
+
+var b04: Readonly<B>;
+>b04 : BR
+>Readonly : Readonly<T>
+>B : B
+
+// Validate that isomorphic mapped types preserve both partial and readonly modifiers
+var b05: BPR;
+>b05 : BPR
+>BPR : BPR
+
+var b05: Partial<BR>;
+>b05 : BPR
+>Partial : Partial<T>
+>BR : BR
+
+var b05: Readonly<BP>;
+>b05 : BPR
+>Readonly : Readonly<T>
+>BP : BP
+
+var b05: Partial<Readonly<B>>;
+>b05 : BPR
+>Partial : Partial<T>
+>Readonly : Readonly<T>
+>B : B
+
+var b05: Readonly<Partial<B>>;
+>b05 : BPR
+>Readonly : Readonly<T>
+>Partial : Partial<T>
+>B : B
+
diff --git a/tests/cases/conformance/types/mapped/mappedTypeModifiers.ts b/tests/cases/conformance/types/mapped/mappedTypeModifiers.ts
index 947f0c579a1..1e76c5b7452 100644
--- a/tests/cases/conformance/types/mapped/mappedTypeModifiers.ts
+++ b/tests/cases/conformance/types/mapped/mappedTypeModifiers.ts
@@ -1,42 +1,85 @@
 // @strictNullChecks: true
 
 type T = { a: number, b: string };
-type U = { a: number | undefined, b: string | undefined };
-type P = { a?: number, b?: string };
-type R = { readonly a: number, readonly b: string };
-type PR = { readonly a?: number, readonly b?: string };
+type TU = { a: number | undefined, b: string | undefined };
+type TP = { a?: number, b?: string };
+type TR = { readonly a: number, readonly b: string };
+type TPR = { readonly a?: number, readonly b?: string };
 
 // Validate they all have the same keys
 var v00: "a" | "b";
 var v00: keyof T;
-var v00: keyof U;
-var v00: keyof P;
-var v00: keyof R;
-var v00: keyof PR;
+var v00: keyof TU;
+var v00: keyof TP;
+var v00: keyof TR;
+var v00: keyof TPR;
 
 // Validate that non-isomorphic mapped types strip modifiers
 var v01: T;
-var v01: Pick<R, keyof T>;
+var v01: Pick<TR, keyof T>;
 var v01: Pick<Readonly<T>, keyof T>;
 
 // Validate that non-isomorphic mapped types strip modifiers
-var v02: U;
-var v02: Pick<P, keyof T>;
-var v02: Pick<PR, keyof T>;
+var v02: TU;
+var v02: Pick<TP, keyof T>;
+var v02: Pick<TPR, keyof T>;
 var v02: Pick<Partial<T>, keyof T>;
 var v02: Pick<Partial<Readonly<T>>, keyof T>;
 
 // Validate that isomorphic mapped types preserve optional modifier
-var v03: P;
+var v03: TP;
 var v03: Partial<T>;
 
 // Validate that isomorphic mapped types preserve readonly modifier
-var v04: R;
+var v04: TR;
 var v04: Readonly<T>;
 
 // Validate that isomorphic mapped types preserve both partial and readonly modifiers
-var v05: PR;
-var v05: Partial<R>;
-var v05: Readonly<P>;
+var v05: TPR;
+var v05: Partial<TR>;
+var v05: Readonly<TP>;
 var v05: Partial<Readonly<T>>;
-var v05: Readonly<Partial<T>>;
\ No newline at end of file
+var v05: Readonly<Partial<T>>;
+
+type Boxified<T> = { [P in keyof T]: { x: T[P] } };
+
+type B = { a: { x: number }, b: { x: string } };
+type BU = { a: { x: number } | undefined, b: { x: string } | undefined };
+type BP = { a?: { x: number }, b?: { x: string } };
+type BR = { readonly a: { x: number }, readonly b: { x: string } };
+type BPR = { readonly a?: { x: number }, readonly b?: { x: string } };
+
+// Validate they all have the same keys
+var b00: "a" | "b";
+var b00: keyof B;
+var b00: keyof BU;
+var b00: keyof BP;
+var b00: keyof BR;
+var b00: keyof BPR;
+
+// Validate that non-isomorphic mapped types strip modifiers
+var b01: B;
+var b01: Pick<BR, keyof B>;
+var b01: Pick<Readonly<BR>, keyof B>;
+
+// Validate that non-isomorphic mapped types strip modifiers
+var b02: BU;
+var b02: Pick<BP, keyof B>;
+var b02: Pick<BPR, keyof B>;
+var b02: Pick<Partial<B>, keyof B>;
+var b02: Pick<Partial<Readonly<B>>, keyof B>;
+
+// Validate that isomorphic mapped types preserve optional modifier
+var b03: BP;
+var b03: Partial<B>;
+
+// Validate that isomorphic mapped types preserve readonly modifier
+var b04: BR;
+var b04: Readonly<B>;
+
+// Validate that isomorphic mapped types preserve both partial and readonly modifiers
+var b05: BPR;
+var b05: Partial<BR>;
+var b05: Readonly<BP>;
+var b05: Partial<Readonly<B>>;
+var b05: Readonly<Partial<B>>;
\ No newline at end of file

From 2178d5526f7b930a47bac4ef1b0f83d4ceb917bf Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Tue, 29 Nov 2016 16:30:27 -0800
Subject: [PATCH 380/421] extract filterNullableTypes

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 936afefce9b..c0a487ffa0f 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -3055,7 +3055,7 @@ namespace ts {
 
         function getRestType(source: Type, properties: PropertyName[], symbol: Symbol): Type {
             if (source.flags & TypeFlags.Union) {
-                const types = filter((<UnionType>source).types, t => !(t.flags & TypeFlags.Nullable));
+                const types = filterNulableTypes(<UnionType>source);
                 if (types.length) {
                     return getUnionType(map(types, t => getRestType(t, properties, symbol)));
                 }
@@ -6103,6 +6103,10 @@ namespace ts {
             return symbol ? getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol) : undefined;
         }
 
+        function filterNulableTypes(union: UnionType): Type[] {
+            return filter(union.types, t => !(t.flags & TypeFlags.Nullable));
+        }
+
         /**
          * Since the source of spread types are object literals, which are not binary,
          * this function should be called in a left folding style, with left = previous result of getSpreadType
@@ -6114,7 +6118,7 @@ namespace ts {
             }
 
             if (left.flags & TypeFlags.Union) {
-                const types = filter((<UnionType>left).types, t => !(t.flags & TypeFlags.Nullable));
+                const types = filterNulableTypes(<UnionType>left);
                 if (types.length) {
                     return getUnionType(map(types, t => getSpreadType(t, right, isFromObjectLiteral)));
                 }
@@ -6127,7 +6131,7 @@ namespace ts {
             }
 
             if (right.flags & TypeFlags.Union) {
-                const types = filter((<UnionType>right).types, t => !(t.flags & TypeFlags.Nullable));
+                const types = filterNulableTypes(<UnionType>right);
                 if (types.length) {
                     return getUnionType(map(types, t => getSpreadType(left, t, isFromObjectLiteral)));
                 }

From 21526833252bf6f9137c73b7bb6b4c3256df6d2f Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Tue, 29 Nov 2016 16:55:50 -0800
Subject: [PATCH 381/421] Simplify logic

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index c0a487ffa0f..56112fe7e86 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -3054,11 +3054,13 @@ namespace ts {
         }
 
         function getRestType(source: Type, properties: PropertyName[], symbol: Symbol): Type {
+            source = filterType(source, t => !(t.flags & TypeFlags.Nullable));
+            if (source.flags & TypeFlags.Never) {
+                return emptyObjectType;
+            }
+
             if (source.flags & TypeFlags.Union) {
-                const types = filterNulableTypes(<UnionType>source);
-                if (types.length) {
-                    return getUnionType(map(types, t => getRestType(t, properties, symbol)));
-                }
+                return mapType(source, t => getRestType(t, properties, symbol));
             }
 
             const members = createMap<Symbol>();
@@ -6103,10 +6105,6 @@ namespace ts {
             return symbol ? getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol) : undefined;
         }
 
-        function filterNulableTypes(union: UnionType): Type[] {
-            return filter(union.types, t => !(t.flags & TypeFlags.Nullable));
-        }
-
         /**
          * Since the source of spread types are object literals, which are not binary,
          * this function should be called in a left folding style, with left = previous result of getSpreadType
@@ -6116,31 +6114,19 @@ namespace ts {
             if (left.flags & TypeFlags.Any || right.flags & TypeFlags.Any) {
                 return anyType;
             }
-
+            left = filterType(left, t => !(t.flags & TypeFlags.Nullable));
+            if (left.flags & TypeFlags.Never) {
+                return right;
+            }
+            right = filterType(right, t => !(t.flags & TypeFlags.Nullable));
+            if (right.flags & TypeFlags.Never) {
+                return left;
+            }
             if (left.flags & TypeFlags.Union) {
-                const types = filterNulableTypes(<UnionType>left);
-                if (types.length) {
-                    return getUnionType(map(types, t => getSpreadType(t, right, isFromObjectLiteral)));
-                }
-                else {
-                    left = emptyObjectType;
-                }
+                return mapType(left, t => getSpreadType(t, right, isFromObjectLiteral));
             }
-            else if (left.flags & TypeFlags.Nullable) {
-                left = emptyObjectType;
-            }
-
             if (right.flags & TypeFlags.Union) {
-                const types = filterNulableTypes(<UnionType>right);
-                if (types.length) {
-                    return getUnionType(map(types, t => getSpreadType(left, t, isFromObjectLiteral)));
-                }
-                else {
-                    right = emptyObjectType;
-                }
-            }
-            else if (right.flags & TypeFlags.Nullable) {
-                right = emptyObjectType;
+                return mapType(right, t => getSpreadType(left, t, isFromObjectLiteral));
             }
 
             const members = createMap<Symbol>();

From 505c153fed9e45905c8e9d61f7a8d6fae3d11c29 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Tue, 29 Nov 2016 16:57:37 -0800
Subject: [PATCH 382/421] Simplify isValidSpreadType

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 56112fe7e86..7dc1ea57708 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -11539,21 +11539,9 @@ namespace ts {
        }
 
         function isValidSpreadType(type: Type): boolean {
-            if (type.flags & (TypeFlags.Any | TypeFlags.Null | TypeFlags.Undefined)) {
-                return true;
-            }
-            if (type.flags & TypeFlags.Object) {
-                return !isGenericMappedType(type);
-            }
-            else if (type.flags & TypeFlags.UnionOrIntersection) {
-                for (const t of (<UnionOrIntersectionType>type).types) {
-                    if (!isValidSpreadType(t)) {
-                        return false;
-                    }
-                }
-                return true;
-            }
-            return false;
+            return !!(type.flags & (TypeFlags.Any | TypeFlags.Null | TypeFlags.Undefined) ||
+                type.flags & TypeFlags.Object && !isGenericMappedType(type) ||
+                type.flags & TypeFlags.UnionOrIntersection && !forEach((<UnionOrIntersectionType>type).types, t => !isValidSpreadType(t)));
         }
 
         function checkJsxSelfClosingElement(node: JsxSelfClosingElement) {

From f6f866e88cf557ef748900ebf6e4b8585eea7934 Mon Sep 17 00:00:00 2001
From: zhengbli <zhengbli@microsoft.com>
Date: Tue, 29 Nov 2016 23:30:14 -0800
Subject: [PATCH 383/421] Reset the noEmitForJsFiles option when updating
 compiler options (#12570)

---
 .../unittests/tsserverProjectSystem.ts        | 59 +++++++++++++++++++
 src/server/project.ts                         | 11 +++-
 2 files changed, 67 insertions(+), 3 deletions(-)

diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
index 368d2a660d4..3e9fd7a70e4 100644
--- a/src/harness/unittests/tsserverProjectSystem.ts
+++ b/src/harness/unittests/tsserverProjectSystem.ts
@@ -2728,6 +2728,65 @@ namespace ts.projectSystem {
                 arguments: { projectFileName: projectName }
             }).response;
             assert.isTrue(diags.length === 0);
+
+            session.executeCommand(<server.protocol.SetCompilerOptionsForInferredProjectsRequest>{
+                type: "request",
+                command: server.CommandNames.CompilerOptionsForInferredProjects,
+                seq: 3,
+                arguments: { options: { module: ModuleKind.CommonJS } }
+            });
+            const diagsAfterUpdate = session.executeCommand(<server.protocol.CompilerOptionsDiagnosticsRequest>{
+                type: "request",
+                command: server.CommandNames.CompilerOptionsDiagnosticsFull,
+                seq: 4,
+                arguments: { projectFileName: projectName }
+            }).response;
+            assert.isTrue(diagsAfterUpdate.length === 0);
+        });
+
+        it("for external project", () => {
+            const f1 = {
+                path: "/a/b/f1.js",
+                content: "function test1() { }"
+            };
+            const host = createServerHost([f1, libFile]);
+            const session = createSession(host);
+            const projectService = session.getProjectService();
+            const projectFileName = "/a/b/project.csproj";
+            const externalFiles = toExternalFiles([f1.path]);
+            projectService.openExternalProject(<protocol.ExternalProject>{
+                projectFileName,
+                rootFiles: externalFiles,
+                options: {}
+            });
+
+            checkNumberOfProjects(projectService, { externalProjects: 1 });
+
+            const diags = session.executeCommand(<server.protocol.CompilerOptionsDiagnosticsRequest>{
+                type: "request",
+                command: server.CommandNames.CompilerOptionsDiagnosticsFull,
+                seq: 2,
+                arguments: { projectFileName }
+            }).response;
+            assert.isTrue(diags.length === 0);
+
+            session.executeCommand(<server.protocol.OpenExternalProjectRequest>{
+                type: "request",
+                command: server.CommandNames.OpenExternalProject,
+                seq: 3,
+                arguments: {
+                    projectFileName,
+                    rootFiles: externalFiles,
+                    options: { module: ModuleKind.CommonJS }
+                }
+            });
+            const diagsAfterUpdate = session.executeCommand(<server.protocol.CompilerOptionsDiagnosticsRequest>{
+                type: "request",
+                command: server.CommandNames.CompilerOptionsDiagnosticsFull,
+                seq: 4,
+                arguments: { projectFileName }
+            }).response;
+            assert.isTrue(diagsAfterUpdate.length === 0);
         });
     });
 
diff --git a/src/server/project.ts b/src/server/project.ts
index c28b29b944b..049f61269f8 100644
--- a/src/server/project.ts
+++ b/src/server/project.ts
@@ -248,9 +248,7 @@ namespace ts.server {
                 this.compilerOptions.allowNonTsExtensions = true;
             }
 
-            if (this.projectKind === ProjectKind.Inferred || this.projectKind === ProjectKind.External) {
-                this.compilerOptions.noEmitForJsFiles = true;
-            }
+            this.setInternalCompilerOptionsForEmittingJsFiles();
 
             this.lsHost = new LSHost(this.projectService.host, this, this.projectService.cancellationToken);
             this.lsHost.setCompilationSettings(this.compilerOptions);
@@ -266,6 +264,12 @@ namespace ts.server {
             this.markAsDirty();
         }
 
+        private setInternalCompilerOptionsForEmittingJsFiles() {
+            if (this.projectKind === ProjectKind.Inferred || this.projectKind === ProjectKind.External) {
+                this.compilerOptions.noEmitForJsFiles = true;
+            }
+        }
+
         getProjectErrors() {
             return this.projectErrors;
         }
@@ -637,6 +641,7 @@ namespace ts.server {
                     this.lastCachedUnresolvedImportsList = undefined;
                 }
                 this.compilerOptions = compilerOptions;
+                this.setInternalCompilerOptionsForEmittingJsFiles();
                 this.lsHost.setCompilationSettings(compilerOptions);
 
                 this.markAsDirty();

From e14412af0e606be6dfcd0a9cdb4b3538317f3828 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Wed, 30 Nov 2016 10:23:33 -0800
Subject: [PATCH 384/421] Improve handling of modifiers in mapped type
 inference

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index dbaf4ed034e..367f64a9b90 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -4532,7 +4532,7 @@ namespace ts {
                     const isomorphicProp = isomorphicType && getPropertyOfType(isomorphicType, propName);
                     const isOptional = templateOptional || !!(isomorphicProp && isomorphicProp.flags & SymbolFlags.Optional);
                     const prop = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | (isOptional ? SymbolFlags.Optional : 0), propName);
-                    prop.type = addOptionality(propType, isOptional);
+                    prop.type = propType;
                     prop.isReadonly = templateReadonly || isomorphicProp && isReadonlySymbol(isomorphicProp);
                     members[propName] = prop;
                 }
@@ -4556,7 +4556,7 @@ namespace ts {
         function getTemplateTypeFromMappedType(type: MappedType) {
             return type.templateType ||
                 (type.templateType = type.declaration.type ?
-                    instantiateType(getTypeFromTypeNode(type.declaration.type), type.mapper || identityMapper) :
+                    instantiateType(addOptionality(getTypeFromTypeNode(type.declaration.type), !!type.declaration.questionToken), type.mapper || identityMapper) :
                     unknownType);
         }
 
@@ -6021,7 +6021,7 @@ namespace ts {
             }
             const mapper = createUnaryTypeMapper(getTypeParameterFromMappedType(type), indexType);
             const templateMapper = type.mapper ? combineTypeMappers(type.mapper, mapper) : mapper;
-            return addOptionality(instantiateType(getTemplateTypeFromMappedType(type), templateMapper), !!type.declaration.questionToken);
+            return instantiateType(getTemplateTypeFromMappedType(type), templateMapper);
         }
 
         function getIndexedAccessType(objectType: Type, indexType: Type, accessNode?: ElementAccessExpression | IndexedAccessTypeNode) {
@@ -8484,16 +8484,18 @@ namespace ts {
             const typeInferences = createTypeInferencesObject();
             const typeInferencesArray = [typeInferences];
             const templateType = getTemplateTypeFromMappedType(target);
+            const readonlyMask = target.declaration.readonlyToken ? false : true;
+            const optionalMask = target.declaration.questionToken ? 0 : SymbolFlags.Optional;
             const properties = getPropertiesOfType(source);
             const members = createSymbolTable(properties);
             let hasInferredTypes = false;
             for (const prop of properties) {
                 const inferredPropType = inferTargetType(getTypeOfSymbol(prop));
                 if (inferredPropType) {
-                    const inferredProp = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | prop.flags & SymbolFlags.Optional, prop.name);
+                    const inferredProp = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | prop.flags & optionalMask, prop.name);
                     inferredProp.declarations = prop.declarations;
                     inferredProp.type = inferredPropType;
-                    inferredProp.isReadonly = isReadonlySymbol(prop);
+                    inferredProp.isReadonly = readonlyMask && isReadonlySymbol(prop);
                     members[prop.name] = inferredProp;
                     hasInferredTypes = true;
                 }
@@ -8502,7 +8504,7 @@ namespace ts {
             if (indexInfo) {
                 const inferredIndexType = inferTargetType(indexInfo.type);
                 if (inferredIndexType) {
-                    indexInfo = createIndexInfo(inferredIndexType, indexInfo.isReadonly);
+                    indexInfo = createIndexInfo(inferredIndexType, readonlyMask && indexInfo.isReadonly);
                     hasInferredTypes = true;
                 }
             }

From 3870351f056ae7fe5258189d62cb6cb8dc2f0485 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Wed, 30 Nov 2016 10:24:02 -0800
Subject: [PATCH 385/421] Accept new baselines

---
 tests/baselines/reference/mappedTypeErrors.errors.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/baselines/reference/mappedTypeErrors.errors.txt b/tests/baselines/reference/mappedTypeErrors.errors.txt
index b3cba7eb54d..945652bf929 100644
--- a/tests/baselines/reference/mappedTypeErrors.errors.txt
+++ b/tests/baselines/reference/mappedTypeErrors.errors.txt
@@ -16,9 +16,9 @@ tests/cases/conformance/types/mapped/mappedTypeErrors.ts(38,24): error TS2344: T
       Type 'T' is not assignable to type '"visible"'.
         Type 'string | number' is not assignable to type '"visible"'.
           Type 'string' is not assignable to type '"visible"'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(60,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ [P in keyof T]?: T[P]; }'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(60,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ [P in keyof T]?: T[P] | undefined; }'.
 tests/cases/conformance/types/mapped/mappedTypeErrors.ts(61,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ readonly [P in keyof T]: T[P]; }'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(62,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ readonly [P in keyof T]?: T[P]; }'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(62,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ readonly [P in keyof T]?: T[P] | undefined; }'.
 tests/cases/conformance/types/mapped/mappedTypeErrors.ts(67,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ [P in keyof T]: T[P][]; }'.
 
 
@@ -112,13 +112,13 @@ tests/cases/conformance/types/mapped/mappedTypeErrors.ts(67,9): error TS2403: Su
         var x: { [P in keyof T]: T[P] };
         var x: { [P in keyof T]?: T[P] };  // Error
             ~
-!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ [P in keyof T]?: T[P]; }'.
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ [P in keyof T]?: T[P] | undefined; }'.
         var x: { readonly [P in keyof T]: T[P] };  // Error
             ~
 !!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ readonly [P in keyof T]: T[P]; }'.
         var x: { readonly [P in keyof T]?: T[P] };  // Error
             ~
-!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ readonly [P in keyof T]?: T[P]; }'.
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ readonly [P in keyof T]?: T[P] | undefined; }'.
     }
     
     function f12<T>() {

From 2517187c4a5d01198b60d954b6fb6439c4509236 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Wed, 30 Nov 2016 10:24:19 -0800
Subject: [PATCH 386/421] Add tests

---
 .../isomorphicMappedTypeInference.js          | 34 ++++++++++
 .../isomorphicMappedTypeInference.symbols     | 61 ++++++++++++++++++
 .../isomorphicMappedTypeInference.types       | 64 +++++++++++++++++++
 .../mapped/isomorphicMappedTypeInference.ts   | 16 +++++
 4 files changed, 175 insertions(+)

diff --git a/tests/baselines/reference/isomorphicMappedTypeInference.js b/tests/baselines/reference/isomorphicMappedTypeInference.js
index 0fc646043dc..87f3e1c4017 100644
--- a/tests/baselines/reference/isomorphicMappedTypeInference.js
+++ b/tests/baselines/reference/isomorphicMappedTypeInference.js
@@ -103,6 +103,21 @@ function f6(s: string) {
     });
     let v = unboxify(b);
     let x: string | number | boolean = v[s];
+}
+
+declare function validate<T>(obj: { [P in keyof T]?: T[P] }): T;
+declare function clone<T>(obj: { readonly [P in keyof T]: T[P] }): T;
+declare function validateAndClone<T>(obj: { readonly [P in keyof T]?: T[P] }): T;
+
+type Foo = {
+    a?: number;
+    readonly b: string;
+}
+
+function f10(foo: Foo) {
+    let x = validate(foo);  // { a: number, readonly b: string }
+    let y = clone(foo);  // { a?: number, b: string }
+    let z = validateAndClone(foo);  // { a: number, b: string }
 }
 
 //// [isomorphicMappedTypeInference.js]
@@ -190,6 +205,11 @@ function f6(s) {
     var v = unboxify(b);
     var x = v[s];
 }
+function f10(foo) {
+    var x = validate(foo); // { a: number, readonly b: string }
+    var y = clone(foo); // { a?: number, b: string }
+    var z = validateAndClone(foo); // { a: number, b: string }
+}
 
 
 //// [isomorphicMappedTypeInference.d.ts]
@@ -220,3 +240,17 @@ declare function makeDictionary<T>(obj: {
     [x: string]: T;
 };
 declare function f6(s: string): void;
+declare function validate<T>(obj: {
+    [P in keyof T]?: T[P];
+}): T;
+declare function clone<T>(obj: {
+    readonly [P in keyof T]: T[P];
+}): T;
+declare function validateAndClone<T>(obj: {
+    readonly [P in keyof T]?: T[P];
+}): T;
+declare type Foo = {
+    a?: number;
+    readonly b: string;
+};
+declare function f10(foo: Foo): void;
diff --git a/tests/baselines/reference/isomorphicMappedTypeInference.symbols b/tests/baselines/reference/isomorphicMappedTypeInference.symbols
index 62dcc6316bc..3e8a92e7691 100644
--- a/tests/baselines/reference/isomorphicMappedTypeInference.symbols
+++ b/tests/baselines/reference/isomorphicMappedTypeInference.symbols
@@ -332,3 +332,64 @@ function f6(s: string) {
 >v : Symbol(v, Decl(isomorphicMappedTypeInference.ts, 102, 7))
 >s : Symbol(s, Decl(isomorphicMappedTypeInference.ts, 96, 12))
 }
+
+declare function validate<T>(obj: { [P in keyof T]?: T[P] }): T;
+>validate : Symbol(validate, Decl(isomorphicMappedTypeInference.ts, 104, 1))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 106, 26))
+>obj : Symbol(obj, Decl(isomorphicMappedTypeInference.ts, 106, 29))
+>P : Symbol(P, Decl(isomorphicMappedTypeInference.ts, 106, 37))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 106, 26))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 106, 26))
+>P : Symbol(P, Decl(isomorphicMappedTypeInference.ts, 106, 37))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 106, 26))
+
+declare function clone<T>(obj: { readonly [P in keyof T]: T[P] }): T;
+>clone : Symbol(clone, Decl(isomorphicMappedTypeInference.ts, 106, 64))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 107, 23))
+>obj : Symbol(obj, Decl(isomorphicMappedTypeInference.ts, 107, 26))
+>P : Symbol(P, Decl(isomorphicMappedTypeInference.ts, 107, 43))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 107, 23))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 107, 23))
+>P : Symbol(P, Decl(isomorphicMappedTypeInference.ts, 107, 43))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 107, 23))
+
+declare function validateAndClone<T>(obj: { readonly [P in keyof T]?: T[P] }): T;
+>validateAndClone : Symbol(validateAndClone, Decl(isomorphicMappedTypeInference.ts, 107, 69))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 108, 34))
+>obj : Symbol(obj, Decl(isomorphicMappedTypeInference.ts, 108, 37))
+>P : Symbol(P, Decl(isomorphicMappedTypeInference.ts, 108, 54))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 108, 34))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 108, 34))
+>P : Symbol(P, Decl(isomorphicMappedTypeInference.ts, 108, 54))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 108, 34))
+
+type Foo = {
+>Foo : Symbol(Foo, Decl(isomorphicMappedTypeInference.ts, 108, 81))
+
+    a?: number;
+>a : Symbol(a, Decl(isomorphicMappedTypeInference.ts, 110, 12))
+
+    readonly b: string;
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 111, 15))
+}
+
+function f10(foo: Foo) {
+>f10 : Symbol(f10, Decl(isomorphicMappedTypeInference.ts, 113, 1))
+>foo : Symbol(foo, Decl(isomorphicMappedTypeInference.ts, 115, 13))
+>Foo : Symbol(Foo, Decl(isomorphicMappedTypeInference.ts, 108, 81))
+
+    let x = validate(foo);  // { a: number, readonly b: string }
+>x : Symbol(x, Decl(isomorphicMappedTypeInference.ts, 116, 7))
+>validate : Symbol(validate, Decl(isomorphicMappedTypeInference.ts, 104, 1))
+>foo : Symbol(foo, Decl(isomorphicMappedTypeInference.ts, 115, 13))
+
+    let y = clone(foo);  // { a?: number, b: string }
+>y : Symbol(y, Decl(isomorphicMappedTypeInference.ts, 117, 7))
+>clone : Symbol(clone, Decl(isomorphicMappedTypeInference.ts, 106, 64))
+>foo : Symbol(foo, Decl(isomorphicMappedTypeInference.ts, 115, 13))
+
+    let z = validateAndClone(foo);  // { a: number, b: string }
+>z : Symbol(z, Decl(isomorphicMappedTypeInference.ts, 118, 7))
+>validateAndClone : Symbol(validateAndClone, Decl(isomorphicMappedTypeInference.ts, 107, 69))
+>foo : Symbol(foo, Decl(isomorphicMappedTypeInference.ts, 115, 13))
+}
diff --git a/tests/baselines/reference/isomorphicMappedTypeInference.types b/tests/baselines/reference/isomorphicMappedTypeInference.types
index 00a80639f73..eee2d6cbe7d 100644
--- a/tests/baselines/reference/isomorphicMappedTypeInference.types
+++ b/tests/baselines/reference/isomorphicMappedTypeInference.types
@@ -403,3 +403,67 @@ function f6(s: string) {
 >v : { [x: string]: string | number | boolean; }
 >s : string
 }
+
+declare function validate<T>(obj: { [P in keyof T]?: T[P] }): T;
+>validate : <T>(obj: { [P in keyof T]?: T[P] | undefined; }) => T
+>T : T
+>obj : { [P in keyof T]?: T[P] | undefined; }
+>P : P
+>T : T
+>T : T
+>P : P
+>T : T
+
+declare function clone<T>(obj: { readonly [P in keyof T]: T[P] }): T;
+>clone : <T>(obj: { readonly [P in keyof T]: T[P]; }) => T
+>T : T
+>obj : { readonly [P in keyof T]: T[P]; }
+>P : P
+>T : T
+>T : T
+>P : P
+>T : T
+
+declare function validateAndClone<T>(obj: { readonly [P in keyof T]?: T[P] }): T;
+>validateAndClone : <T>(obj: { readonly [P in keyof T]?: T[P] | undefined; }) => T
+>T : T
+>obj : { readonly [P in keyof T]?: T[P] | undefined; }
+>P : P
+>T : T
+>T : T
+>P : P
+>T : T
+
+type Foo = {
+>Foo : Foo
+
+    a?: number;
+>a : number | undefined
+
+    readonly b: string;
+>b : string
+}
+
+function f10(foo: Foo) {
+>f10 : (foo: Foo) => void
+>foo : Foo
+>Foo : Foo
+
+    let x = validate(foo);  // { a: number, readonly b: string }
+>x : { a: number; readonly b: string; }
+>validate(foo) : { a: number; readonly b: string; }
+>validate : <T>(obj: { [P in keyof T]?: T[P] | undefined; }) => T
+>foo : Foo
+
+    let y = clone(foo);  // { a?: number, b: string }
+>y : { a?: number | undefined; b: string; }
+>clone(foo) : { a?: number | undefined; b: string; }
+>clone : <T>(obj: { readonly [P in keyof T]: T[P]; }) => T
+>foo : Foo
+
+    let z = validateAndClone(foo);  // { a: number, b: string }
+>z : { a: number; b: string; }
+>validateAndClone(foo) : { a: number; b: string; }
+>validateAndClone : <T>(obj: { readonly [P in keyof T]?: T[P] | undefined; }) => T
+>foo : Foo
+}
diff --git a/tests/cases/conformance/types/mapped/isomorphicMappedTypeInference.ts b/tests/cases/conformance/types/mapped/isomorphicMappedTypeInference.ts
index 19a0c4889a5..4aab2d95ba3 100644
--- a/tests/cases/conformance/types/mapped/isomorphicMappedTypeInference.ts
+++ b/tests/cases/conformance/types/mapped/isomorphicMappedTypeInference.ts
@@ -1,3 +1,4 @@
+// @strictNullChecks: true
 // @noimplicitany: true
 // @declaration: true
 
@@ -104,4 +105,19 @@ function f6(s: string) {
     });
     let v = unboxify(b);
     let x: string | number | boolean = v[s];
+}
+
+declare function validate<T>(obj: { [P in keyof T]?: T[P] }): T;
+declare function clone<T>(obj: { readonly [P in keyof T]: T[P] }): T;
+declare function validateAndClone<T>(obj: { readonly [P in keyof T]?: T[P] }): T;
+
+type Foo = {
+    a?: number;
+    readonly b: string;
+}
+
+function f10(foo: Foo) {
+    let x = validate(foo);  // { a: number, readonly b: string }
+    let y = clone(foo);  // { a?: number, b: string }
+    let z = validateAndClone(foo);  // { a: number, b: string }
 }
\ No newline at end of file

From 99f352f295e678a1bc46af54be0fa75683a2c41c Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 30 Nov 2016 10:44:00 -0800
Subject: [PATCH 387/421] Rest of untyped binding pattern is string-indexed
 type

This is more correct than any and the code is more elegant as well.
---
 src/compiler/checker.ts | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 65bc52fde1f..c4920c29770 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -3099,15 +3099,6 @@ namespace ts {
                         error(declaration, Diagnostics.Rest_types_may_only_be_created_from_object_types);
                         return unknownType;
                     }
-                    const parent = pattern.parent as VariableLikeDeclaration;
-                        if (parent.kind === SyntaxKind.Parameter &&
-                            !parent.type &&
-                            !parent.initializer &&
-                            !getContextuallyTypedParameterType(parent as ParameterDeclaration)) {
-                            // if this type came from examining the structure of the pattern --
-                            // there was no other information -- then it is not sufficient to determine the rest type, so just return any
-                        return anyType;
-                    }
                     const literalMembers: PropertyName[] = [];
                     for (const element of pattern.elements) {
                         if (!(element as BindingElement).dotDotDotToken) {
@@ -3318,14 +3309,19 @@ namespace ts {
         // Return the type implied by an object binding pattern
         function getTypeFromObjectBindingPattern(pattern: ObjectBindingPattern, includePatternInType: boolean, reportErrors: boolean): Type {
             const members = createMap<Symbol>();
+            let stringIndexInfo: IndexInfo;
             let hasComputedProperties = false;
             forEach(pattern.elements, e => {
                 const name = e.propertyName || <Identifier>e.name;
-                if (isComputedNonLiteralName(name) || e.dotDotDotToken) {
-                    // do not include computed properties or rests in the implied type
+                if (isComputedNonLiteralName(name)) {
+                    // do not include computed properties in the implied type
                     hasComputedProperties = true;
                     return;
                 }
+                if (e.dotDotDotToken) {
+                    stringIndexInfo = createIndexInfo(anyType, /*isReadonly*/ false);
+                    return;
+                }
 
                 const text = getTextOfPropertyName(name);
                 const flags = SymbolFlags.Property | SymbolFlags.Transient | (e.initializer ? SymbolFlags.Optional : 0);
@@ -3334,7 +3330,7 @@ namespace ts {
                 symbol.bindingElement = e;
                 members[symbol.name] = symbol;
             });
-            const result = createAnonymousType(undefined, members, emptyArray, emptyArray, undefined, undefined);
+            const result = createAnonymousType(undefined, members, emptyArray, emptyArray, stringIndexInfo, undefined);
             if (includePatternInType) {
                 result.pattern = pattern;
             }
@@ -11422,7 +11418,8 @@ namespace ts {
                         if (impliedProp) {
                             prop.flags |= impliedProp.flags & SymbolFlags.Optional;
                         }
-                        else if (!compilerOptions.suppressExcessPropertyErrors) {
+
+                        else if (!compilerOptions.suppressExcessPropertyErrors && !getIndexInfoOfType(contextualType, IndexKind.String)) {
                             error(memberDecl.name, Diagnostics.Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1,
                                 symbolToString(member), typeToString(contextualType));
                         }

From 074ed9f8d6fa937986f3ecf37130dd0eac11a15a Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 30 Nov 2016 10:44:56 -0800
Subject: [PATCH 388/421] Update baselines

---
 tests/baselines/reference/objectRest.types | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/baselines/reference/objectRest.types b/tests/baselines/reference/objectRest.types
index 386c55ac818..bc1ca95af9a 100644
--- a/tests/baselines/reference/objectRest.types
+++ b/tests/baselines/reference/objectRest.types
@@ -196,10 +196,10 @@ var { [computed]: stillNotGreat, [computed2]: soSo,  ...o } = o;
 >o : { a: number; b: string; }
 
 var noContextualType = ({ aNumber = 12, ...notEmptyObject }) => aNumber;
->noContextualType : ({aNumber, ...notEmptyObject}: { aNumber?: number; }) => number
->({ aNumber = 12, ...notEmptyObject }) => aNumber : ({aNumber, ...notEmptyObject}: { aNumber?: number; }) => number
+>noContextualType : ({aNumber, ...notEmptyObject}: { [x: string]: any; aNumber?: number; }) => number
+>({ aNumber = 12, ...notEmptyObject }) => aNumber : ({aNumber, ...notEmptyObject}: { [x: string]: any; aNumber?: number; }) => number
 >aNumber : number
 >12 : 12
->notEmptyObject : any
+>notEmptyObject : { [x: string]: any; }
 >aNumber : number
 

From f6ace2d83df99b016d6aaf986d330f2f23ee6dfa Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 30 Nov 2016 13:14:08 -0800
Subject: [PATCH 389/421] Rest of untyped binding pattern is back to any

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index c4920c29770..cb8f049f3a9 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -3106,6 +3106,12 @@ namespace ts {
                         }
                     }
                     type = getRestType(parentType, literalMembers, declaration.symbol);
+                    if (getPropertiesOfObjectType(type).length === 0 && getIndexTypeOfType(type, IndexKind.String) === anyType) {
+                        if (compilerOptions.noImplicitAny) {
+                            reportImplicitAnyError(declaration, anyType);
+                        }
+                        return anyType;
+                    }
                 }
                 else {
                     // Use explicitly specified property name ({ p: xxx } form), or otherwise the implied name ({ p } form)

From 8e648f9f6d7cf7f0b39ab4bd776e5a0dba24cdc3 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 30 Nov 2016 13:14:52 -0800
Subject: [PATCH 390/421] Add property access and --noImplicitAny tests

And update baselines
---
 tests/baselines/reference/objectRest.js             |  4 ++--
 tests/baselines/reference/objectRest.symbols        |  3 ++-
 tests/baselines/reference/objectRest.types          | 12 ++++++++----
 .../reference/objectRestNegative.errors.txt         | 13 ++++++++++++-
 tests/baselines/reference/objectRestNegative.js     |  6 ++++++
 tests/cases/conformance/types/rest/objectRest.ts    |  2 +-
 .../conformance/types/rest/objectRestNegative.ts    |  3 +++
 7 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/tests/baselines/reference/objectRest.js b/tests/baselines/reference/objectRest.js
index f1265fd7e9f..448b54a8610 100644
--- a/tests/baselines/reference/objectRest.js
+++ b/tests/baselines/reference/objectRest.js
@@ -37,7 +37,7 @@ let computed2 = 'a';
 var { [computed]: stillNotGreat, [computed2]: soSo,  ...o } = o;
 ({ [computed]: stillNotGreat, [computed2]: soSo, ...o } = o);
 
-var noContextualType = ({ aNumber = 12, ...notEmptyObject }) => aNumber;
+var noContextualType = ({ aNumber = 12, ...notEmptyObject }) => aNumber + notEmptyObject.anythingGoes;
 
 
 //// [objectRest.js]
@@ -80,6 +80,6 @@ var _g = computed, stillNotGreat = o[_g], _h = computed2, soSo = o[_h], o = __re
 (_j = computed, stillNotGreat = o[_j], _k = computed2, soSo = o[_k], o = __rest(o, [typeof _j === "symbol" ? _j : _j + "", typeof _k === "symbol" ? _k : _k + ""]));
 var noContextualType = (_a) => {
     var { aNumber = 12 } = _a, notEmptyObject = __rest(_a, ["aNumber"]);
-    return aNumber;
+    return aNumber + notEmptyObject.anythingGoes;
 };
 var _d, _f, _j, _k;
diff --git a/tests/baselines/reference/objectRest.symbols b/tests/baselines/reference/objectRest.symbols
index 6b20982f04d..5bacb33f5da 100644
--- a/tests/baselines/reference/objectRest.symbols
+++ b/tests/baselines/reference/objectRest.symbols
@@ -169,9 +169,10 @@ var { [computed]: stillNotGreat, [computed2]: soSo,  ...o } = o;
 >o : Symbol(o, Decl(objectRest.ts, 0, 3), Decl(objectRest.ts, 35, 51))
 >o : Symbol(o, Decl(objectRest.ts, 0, 3), Decl(objectRest.ts, 35, 51))
 
-var noContextualType = ({ aNumber = 12, ...notEmptyObject }) => aNumber;
+var noContextualType = ({ aNumber = 12, ...notEmptyObject }) => aNumber + notEmptyObject.anythingGoes;
 >noContextualType : Symbol(noContextualType, Decl(objectRest.ts, 38, 3))
 >aNumber : Symbol(aNumber, Decl(objectRest.ts, 38, 25))
 >notEmptyObject : Symbol(notEmptyObject, Decl(objectRest.ts, 38, 39))
 >aNumber : Symbol(aNumber, Decl(objectRest.ts, 38, 25))
+>notEmptyObject : Symbol(notEmptyObject, Decl(objectRest.ts, 38, 39))
 
diff --git a/tests/baselines/reference/objectRest.types b/tests/baselines/reference/objectRest.types
index bc1ca95af9a..4122e4a1535 100644
--- a/tests/baselines/reference/objectRest.types
+++ b/tests/baselines/reference/objectRest.types
@@ -195,11 +195,15 @@ var { [computed]: stillNotGreat, [computed2]: soSo,  ...o } = o;
 >o : { a: number; b: string; }
 >o : { a: number; b: string; }
 
-var noContextualType = ({ aNumber = 12, ...notEmptyObject }) => aNumber;
->noContextualType : ({aNumber, ...notEmptyObject}: { [x: string]: any; aNumber?: number; }) => number
->({ aNumber = 12, ...notEmptyObject }) => aNumber : ({aNumber, ...notEmptyObject}: { [x: string]: any; aNumber?: number; }) => number
+var noContextualType = ({ aNumber = 12, ...notEmptyObject }) => aNumber + notEmptyObject.anythingGoes;
+>noContextualType : ({aNumber, ...notEmptyObject}: { [x: string]: any; aNumber?: number; }) => any
+>({ aNumber = 12, ...notEmptyObject }) => aNumber + notEmptyObject.anythingGoes : ({aNumber, ...notEmptyObject}: { [x: string]: any; aNumber?: number; }) => any
 >aNumber : number
 >12 : 12
->notEmptyObject : { [x: string]: any; }
+>notEmptyObject : any
+>aNumber + notEmptyObject.anythingGoes : any
 >aNumber : number
+>notEmptyObject.anythingGoes : any
+>notEmptyObject : any
+>anythingGoes : any
 
diff --git a/tests/baselines/reference/objectRestNegative.errors.txt b/tests/baselines/reference/objectRestNegative.errors.txt
index 345e99723bd..325b30b8a7e 100644
--- a/tests/baselines/reference/objectRestNegative.errors.txt
+++ b/tests/baselines/reference/objectRestNegative.errors.txt
@@ -3,11 +3,14 @@ tests/cases/conformance/types/rest/objectRestNegative.ts(6,10): error TS2322: Ty
   Types of property 'a' are incompatible.
     Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/rest/objectRestNegative.ts(9,31): error TS2462: A rest element must be last in a destructuring pattern
+tests/cases/conformance/types/rest/objectRestNegative.ts(11,30): error TS7008: Member 'x' implicitly has an 'any' type.
+tests/cases/conformance/types/rest/objectRestNegative.ts(11,33): error TS7008: Member 'y' implicitly has an 'any' type.
 tests/cases/conformance/types/rest/objectRestNegative.ts(12,17): error TS2700: Rest types may only be created from object types.
 tests/cases/conformance/types/rest/objectRestNegative.ts(17,9): error TS2701: The target of an object rest assignment must be a variable or a property access.
+tests/cases/conformance/types/rest/objectRestNegative.ts(19,44): error TS7031: Binding element 'implicitlyAny' implicitly has an 'any' type.
 
 
-==== tests/cases/conformance/types/rest/objectRestNegative.ts (5 errors) ====
+==== tests/cases/conformance/types/rest/objectRestNegative.ts (8 errors) ====
     let o = { a: 1, b: 'no' };
     var { ...mustBeLast, a } = o;
              ~~~~~~~~~~
@@ -27,6 +30,10 @@ tests/cases/conformance/types/rest/objectRestNegative.ts(17,9): error TS2701: Th
 !!! error TS2462: A rest element must be last in a destructuring pattern
     }
     function generic<T extends { x, y }>(t: T) {
+                                 ~~
+!!! error TS7008: Member 'x' implicitly has an 'any' type.
+                                    ~
+!!! error TS7008: Member 'y' implicitly has an 'any' type.
         let { x, ...rest } = t;
                     ~~~~
 !!! error TS2700: Rest types may only be created from object types.
@@ -37,4 +44,8 @@ tests/cases/conformance/types/rest/objectRestNegative.ts(17,9): error TS2701: Th
     ({a, ...rest.b + rest.b} = o);
             ~~~~~~~~~~~~~~~
 !!! error TS2701: The target of an object rest assignment must be a variable or a property access.
+    
+    var noContextualType = ({ aNumber = 12, ...implicitlyAny }) => aNumber + implicitlyAny.anythingGoes;
+                                               ~~~~~~~~~~~~~
+!!! error TS7031: Binding element 'implicitlyAny' implicitly has an 'any' type.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/objectRestNegative.js b/tests/baselines/reference/objectRestNegative.js
index f8c5b72ada5..ece890544c3 100644
--- a/tests/baselines/reference/objectRestNegative.js
+++ b/tests/baselines/reference/objectRestNegative.js
@@ -16,6 +16,8 @@ function generic<T extends { x, y }>(t: T) {
 
 let rest: { b: string }
 ({a, ...rest.b + rest.b} = o);
+
+var noContextualType = ({ aNumber = 12, ...implicitlyAny }) => aNumber + implicitlyAny.anythingGoes;
 
 
 //// [objectRestNegative.js]
@@ -42,3 +44,7 @@ function generic(t) {
 }
 var rest;
 (a = o.a, o, rest.b + rest.b = __rest(o, ["a"]));
+var noContextualType = function (_a) {
+    var _b = _a.aNumber, aNumber = _b === void 0 ? 12 : _b, implicitlyAny = __rest(_a, ["aNumber"]);
+    return aNumber + implicitlyAny.anythingGoes;
+};
diff --git a/tests/cases/conformance/types/rest/objectRest.ts b/tests/cases/conformance/types/rest/objectRest.ts
index fe92bb53566..5891ce2414b 100644
--- a/tests/cases/conformance/types/rest/objectRest.ts
+++ b/tests/cases/conformance/types/rest/objectRest.ts
@@ -37,4 +37,4 @@ let computed2 = 'a';
 var { [computed]: stillNotGreat, [computed2]: soSo,  ...o } = o;
 ({ [computed]: stillNotGreat, [computed2]: soSo, ...o } = o);
 
-var noContextualType = ({ aNumber = 12, ...notEmptyObject }) => aNumber;
+var noContextualType = ({ aNumber = 12, ...notEmptyObject }) => aNumber + notEmptyObject.anythingGoes;
diff --git a/tests/cases/conformance/types/rest/objectRestNegative.ts b/tests/cases/conformance/types/rest/objectRestNegative.ts
index c224c8cd30e..c0477e71db5 100644
--- a/tests/cases/conformance/types/rest/objectRestNegative.ts
+++ b/tests/cases/conformance/types/rest/objectRestNegative.ts
@@ -1,3 +1,4 @@
+// @noImplicitAny: true
 let o = { a: 1, b: 'no' };
 var { ...mustBeLast, a } = o;
 
@@ -15,3 +16,5 @@ function generic<T extends { x, y }>(t: T) {
 
 let rest: { b: string }
 ({a, ...rest.b + rest.b} = o);
+
+var noContextualType = ({ aNumber = 12, ...implicitlyAny }) => aNumber + implicitlyAny.anythingGoes;

From adf9b26f50763ac9989d3a61df56bb74fc9007b1 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Wed, 30 Nov 2016 16:28:26 -0800
Subject: [PATCH 391/421] Handle parameter type error for index signature in
 declaration emit Fixes #12572

---
 src/compiler/declarationEmitter.ts              |  6 ++++++
 src/compiler/diagnosticMessages.json            |  8 ++++++++
 .../declarationEmitIndexTypeNotFound.errors.txt | 17 +++++++++++++++++
 .../declarationEmitIndexTypeNotFound.js         |  9 +++++++++
 .../declarationEmitIndexTypeNotFound.ts         |  5 +++++
 5 files changed, 45 insertions(+)
 create mode 100644 tests/baselines/reference/declarationEmitIndexTypeNotFound.errors.txt
 create mode 100644 tests/baselines/reference/declarationEmitIndexTypeNotFound.js
 create mode 100644 tests/cases/compiler/declarationEmitIndexTypeNotFound.ts

diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts
index fd2740f20c2..38e0db0ba6b 100644
--- a/src/compiler/declarationEmitter.ts
+++ b/src/compiler/declarationEmitter.ts
@@ -1625,6 +1625,12 @@ namespace ts {
                             Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                             Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
 
+                    case SyntaxKind.IndexSignature:
+                        // Interfaces cannot have parameter types that cannot be named
+                        return symbolAccessibilityResult.errorModuleName ?
+                            Diagnostics.Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
+                            Diagnostics.Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_private_name_1;
+
                     case SyntaxKind.MethodDeclaration:
                     case SyntaxKind.MethodSignature:
                         if (hasModifier(node.parent, ModifierFlags.Static)) {
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 007986e23be..5f49c54a2af 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -2300,6 +2300,14 @@
         "category": "Message",
         "code": 4090
     },
+    "Parameter '{0}' of index signature from exported interface has or is using name '{1}' from private module '{2}'.": {
+        "category": "Error",
+        "code": 4091
+    },
+    "Parameter '{0}' of index signature from exported interface has or is using private name '{1}'.": {
+        "category": "Error",
+        "code": 4092
+    },
 
     "The current host does not support the '{0}' option.": {
         "category": "Error",
diff --git a/tests/baselines/reference/declarationEmitIndexTypeNotFound.errors.txt b/tests/baselines/reference/declarationEmitIndexTypeNotFound.errors.txt
new file mode 100644
index 00000000000..ffbfd25fa94
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitIndexTypeNotFound.errors.txt
@@ -0,0 +1,17 @@
+tests/cases/compiler/declarationEmitIndexTypeNotFound.ts(3,6): error TS1023: An index signature parameter type must be 'string' or 'number'.
+tests/cases/compiler/declarationEmitIndexTypeNotFound.ts(3,13): error TS2304: Cannot find name 'TypeNotFound'.
+tests/cases/compiler/declarationEmitIndexTypeNotFound.ts(3,13): error TS4092: Parameter 'index' of index signature from exported interface has or is using private name 'TypeNotFound'.
+
+
+==== tests/cases/compiler/declarationEmitIndexTypeNotFound.ts (3 errors) ====
+    
+    export interface Test {
+        [index: TypeNotFound]: any;
+         ~~~~~
+!!! error TS1023: An index signature parameter type must be 'string' or 'number'.
+                ~~~~~~~~~~~~
+!!! error TS2304: Cannot find name 'TypeNotFound'.
+                ~~~~~~~~~~~~
+!!! error TS4092: Parameter 'index' of index signature from exported interface has or is using private name 'TypeNotFound'.
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitIndexTypeNotFound.js b/tests/baselines/reference/declarationEmitIndexTypeNotFound.js
new file mode 100644
index 00000000000..22100e5cb72
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitIndexTypeNotFound.js
@@ -0,0 +1,9 @@
+//// [declarationEmitIndexTypeNotFound.ts]
+
+export interface Test {
+    [index: TypeNotFound]: any;
+}
+
+
+//// [declarationEmitIndexTypeNotFound.js]
+"use strict";
diff --git a/tests/cases/compiler/declarationEmitIndexTypeNotFound.ts b/tests/cases/compiler/declarationEmitIndexTypeNotFound.ts
new file mode 100644
index 00000000000..de3316cd56f
--- /dev/null
+++ b/tests/cases/compiler/declarationEmitIndexTypeNotFound.ts
@@ -0,0 +1,5 @@
+// @declaration: true
+
+export interface Test {
+    [index: TypeNotFound]: any;
+}

From ddf03bae3c8cb330b7a485c621d917878aaf36c8 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 30 Nov 2016 17:25:44 -0800
Subject: [PATCH 392/421] Rest of untyped binding pattern is back to str index
 sig

---
 src/compiler/checker.ts | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index cb8f049f3a9..c4920c29770 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -3106,12 +3106,6 @@ namespace ts {
                         }
                     }
                     type = getRestType(parentType, literalMembers, declaration.symbol);
-                    if (getPropertiesOfObjectType(type).length === 0 && getIndexTypeOfType(type, IndexKind.String) === anyType) {
-                        if (compilerOptions.noImplicitAny) {
-                            reportImplicitAnyError(declaration, anyType);
-                        }
-                        return anyType;
-                    }
                 }
                 else {
                     // Use explicitly specified property name ({ p: xxx } form), or otherwise the implied name ({ p } form)

From 77226318ef839c16390974a8f20635af512367f2 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 30 Nov 2016 17:26:30 -0800
Subject: [PATCH 393/421] Update baselines

---
 tests/baselines/reference/objectRest.js            |  4 ++--
 tests/baselines/reference/objectRest.symbols       |  2 +-
 tests/baselines/reference/objectRest.types         | 14 +++++++-------
 .../reference/objectRestNegative.errors.txt        |  8 ++++----
 tests/baselines/reference/objectRestNegative.js    |  6 +++---
 tests/cases/conformance/types/rest/objectRest.ts   |  2 +-
 .../conformance/types/rest/objectRestNegative.ts   |  2 +-
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/tests/baselines/reference/objectRest.js b/tests/baselines/reference/objectRest.js
index 448b54a8610..272a73661ac 100644
--- a/tests/baselines/reference/objectRest.js
+++ b/tests/baselines/reference/objectRest.js
@@ -37,7 +37,7 @@ let computed2 = 'a';
 var { [computed]: stillNotGreat, [computed2]: soSo,  ...o } = o;
 ({ [computed]: stillNotGreat, [computed2]: soSo, ...o } = o);
 
-var noContextualType = ({ aNumber = 12, ...notEmptyObject }) => aNumber + notEmptyObject.anythingGoes;
+var noContextualType = ({ aNumber = 12, ...notEmptyObject }) => aNumber + notEmptyObject['anythingGoes'];
 
 
 //// [objectRest.js]
@@ -80,6 +80,6 @@ var _g = computed, stillNotGreat = o[_g], _h = computed2, soSo = o[_h], o = __re
 (_j = computed, stillNotGreat = o[_j], _k = computed2, soSo = o[_k], o = __rest(o, [typeof _j === "symbol" ? _j : _j + "", typeof _k === "symbol" ? _k : _k + ""]));
 var noContextualType = (_a) => {
     var { aNumber = 12 } = _a, notEmptyObject = __rest(_a, ["aNumber"]);
-    return aNumber + notEmptyObject.anythingGoes;
+    return aNumber + notEmptyObject['anythingGoes'];
 };
 var _d, _f, _j, _k;
diff --git a/tests/baselines/reference/objectRest.symbols b/tests/baselines/reference/objectRest.symbols
index 5bacb33f5da..46309392135 100644
--- a/tests/baselines/reference/objectRest.symbols
+++ b/tests/baselines/reference/objectRest.symbols
@@ -169,7 +169,7 @@ var { [computed]: stillNotGreat, [computed2]: soSo,  ...o } = o;
 >o : Symbol(o, Decl(objectRest.ts, 0, 3), Decl(objectRest.ts, 35, 51))
 >o : Symbol(o, Decl(objectRest.ts, 0, 3), Decl(objectRest.ts, 35, 51))
 
-var noContextualType = ({ aNumber = 12, ...notEmptyObject }) => aNumber + notEmptyObject.anythingGoes;
+var noContextualType = ({ aNumber = 12, ...notEmptyObject }) => aNumber + notEmptyObject['anythingGoes'];
 >noContextualType : Symbol(noContextualType, Decl(objectRest.ts, 38, 3))
 >aNumber : Symbol(aNumber, Decl(objectRest.ts, 38, 25))
 >notEmptyObject : Symbol(notEmptyObject, Decl(objectRest.ts, 38, 39))
diff --git a/tests/baselines/reference/objectRest.types b/tests/baselines/reference/objectRest.types
index 4122e4a1535..1dc05741713 100644
--- a/tests/baselines/reference/objectRest.types
+++ b/tests/baselines/reference/objectRest.types
@@ -195,15 +195,15 @@ var { [computed]: stillNotGreat, [computed2]: soSo,  ...o } = o;
 >o : { a: number; b: string; }
 >o : { a: number; b: string; }
 
-var noContextualType = ({ aNumber = 12, ...notEmptyObject }) => aNumber + notEmptyObject.anythingGoes;
+var noContextualType = ({ aNumber = 12, ...notEmptyObject }) => aNumber + notEmptyObject['anythingGoes'];
 >noContextualType : ({aNumber, ...notEmptyObject}: { [x: string]: any; aNumber?: number; }) => any
->({ aNumber = 12, ...notEmptyObject }) => aNumber + notEmptyObject.anythingGoes : ({aNumber, ...notEmptyObject}: { [x: string]: any; aNumber?: number; }) => any
+>({ aNumber = 12, ...notEmptyObject }) => aNumber + notEmptyObject['anythingGoes'] : ({aNumber, ...notEmptyObject}: { [x: string]: any; aNumber?: number; }) => any
 >aNumber : number
 >12 : 12
->notEmptyObject : any
->aNumber + notEmptyObject.anythingGoes : any
+>notEmptyObject : { [x: string]: any; }
+>aNumber + notEmptyObject['anythingGoes'] : any
 >aNumber : number
->notEmptyObject.anythingGoes : any
->notEmptyObject : any
->anythingGoes : any
+>notEmptyObject['anythingGoes'] : any
+>notEmptyObject : { [x: string]: any; }
+>'anythingGoes' : "anythingGoes"
 
diff --git a/tests/baselines/reference/objectRestNegative.errors.txt b/tests/baselines/reference/objectRestNegative.errors.txt
index 325b30b8a7e..6e65af4bdc1 100644
--- a/tests/baselines/reference/objectRestNegative.errors.txt
+++ b/tests/baselines/reference/objectRestNegative.errors.txt
@@ -7,7 +7,7 @@ tests/cases/conformance/types/rest/objectRestNegative.ts(11,30): error TS7008: M
 tests/cases/conformance/types/rest/objectRestNegative.ts(11,33): error TS7008: Member 'y' implicitly has an 'any' type.
 tests/cases/conformance/types/rest/objectRestNegative.ts(12,17): error TS2700: Rest types may only be created from object types.
 tests/cases/conformance/types/rest/objectRestNegative.ts(17,9): error TS2701: The target of an object rest assignment must be a variable or a property access.
-tests/cases/conformance/types/rest/objectRestNegative.ts(19,44): error TS7031: Binding element 'implicitlyAny' implicitly has an 'any' type.
+tests/cases/conformance/types/rest/objectRestNegative.ts(19,90): error TS2339: Property 'anythingGoes' does not exist on type '{ [x: string]: any; }'.
 
 
 ==== tests/cases/conformance/types/rest/objectRestNegative.ts (8 errors) ====
@@ -45,7 +45,7 @@ tests/cases/conformance/types/rest/objectRestNegative.ts(19,44): error TS7031: B
             ~~~~~~~~~~~~~~~
 !!! error TS2701: The target of an object rest assignment must be a variable or a property access.
     
-    var noContextualType = ({ aNumber = 12, ...implicitlyAny }) => aNumber + implicitlyAny.anythingGoes;
-                                               ~~~~~~~~~~~~~
-!!! error TS7031: Binding element 'implicitlyAny' implicitly has an 'any' type.
+    var noContextualType = ({ aNumber = 12, ...notEmptyObject }) => aNumber + notEmptyObject.anythingGoes;
+                                                                                             ~~~~~~~~~~~~
+!!! error TS2339: Property 'anythingGoes' does not exist on type '{ [x: string]: any; }'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/objectRestNegative.js b/tests/baselines/reference/objectRestNegative.js
index ece890544c3..4a6ea6f7257 100644
--- a/tests/baselines/reference/objectRestNegative.js
+++ b/tests/baselines/reference/objectRestNegative.js
@@ -17,7 +17,7 @@ function generic<T extends { x, y }>(t: T) {
 let rest: { b: string }
 ({a, ...rest.b + rest.b} = o);
 
-var noContextualType = ({ aNumber = 12, ...implicitlyAny }) => aNumber + implicitlyAny.anythingGoes;
+var noContextualType = ({ aNumber = 12, ...notEmptyObject }) => aNumber + notEmptyObject.anythingGoes;
 
 
 //// [objectRestNegative.js]
@@ -45,6 +45,6 @@ function generic(t) {
 var rest;
 (a = o.a, o, rest.b + rest.b = __rest(o, ["a"]));
 var noContextualType = function (_a) {
-    var _b = _a.aNumber, aNumber = _b === void 0 ? 12 : _b, implicitlyAny = __rest(_a, ["aNumber"]);
-    return aNumber + implicitlyAny.anythingGoes;
+    var _b = _a.aNumber, aNumber = _b === void 0 ? 12 : _b, notEmptyObject = __rest(_a, ["aNumber"]);
+    return aNumber + notEmptyObject.anythingGoes;
 };
diff --git a/tests/cases/conformance/types/rest/objectRest.ts b/tests/cases/conformance/types/rest/objectRest.ts
index 5891ce2414b..2fba5d0b6dc 100644
--- a/tests/cases/conformance/types/rest/objectRest.ts
+++ b/tests/cases/conformance/types/rest/objectRest.ts
@@ -37,4 +37,4 @@ let computed2 = 'a';
 var { [computed]: stillNotGreat, [computed2]: soSo,  ...o } = o;
 ({ [computed]: stillNotGreat, [computed2]: soSo, ...o } = o);
 
-var noContextualType = ({ aNumber = 12, ...notEmptyObject }) => aNumber + notEmptyObject.anythingGoes;
+var noContextualType = ({ aNumber = 12, ...notEmptyObject }) => aNumber + notEmptyObject['anythingGoes'];
diff --git a/tests/cases/conformance/types/rest/objectRestNegative.ts b/tests/cases/conformance/types/rest/objectRestNegative.ts
index c0477e71db5..4f4667fe65a 100644
--- a/tests/cases/conformance/types/rest/objectRestNegative.ts
+++ b/tests/cases/conformance/types/rest/objectRestNegative.ts
@@ -17,4 +17,4 @@ function generic<T extends { x, y }>(t: T) {
 let rest: { b: string }
 ({a, ...rest.b + rest.b} = o);
 
-var noContextualType = ({ aNumber = 12, ...implicitlyAny }) => aNumber + implicitlyAny.anythingGoes;
+var noContextualType = ({ aNumber = 12, ...notEmptyObject }) => aNumber + notEmptyObject.anythingGoes;

From 86f69f13fa84e859eceb2b3c8abb60cdd400cd03 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Wed, 30 Nov 2016 10:35:44 -0800
Subject: [PATCH 394/421] Add test for the decorated method beginning with
 underscore

---
 .../decoratorWithUnderscoreMethod.js          | 37 +++++++++++++++
 .../decoratorWithUnderscoreMethod.symbols     | 42 +++++++++++++++++
 .../decoratorWithUnderscoreMethod.types       | 46 +++++++++++++++++++
 .../compiler/decoratorWithUnderscoreMethod.ts | 18 ++++++++
 4 files changed, 143 insertions(+)
 create mode 100644 tests/baselines/reference/decoratorWithUnderscoreMethod.js
 create mode 100644 tests/baselines/reference/decoratorWithUnderscoreMethod.symbols
 create mode 100644 tests/baselines/reference/decoratorWithUnderscoreMethod.types
 create mode 100644 tests/cases/compiler/decoratorWithUnderscoreMethod.ts

diff --git a/tests/baselines/reference/decoratorWithUnderscoreMethod.js b/tests/baselines/reference/decoratorWithUnderscoreMethod.js
new file mode 100644
index 00000000000..03037980ee7
--- /dev/null
+++ b/tests/baselines/reference/decoratorWithUnderscoreMethod.js
@@ -0,0 +1,37 @@
+//// [decoratorWithUnderscoreMethod.ts]
+
+declare var console : { log(arg: string): void };
+function dec(): Function {
+    return function (target: any, propKey: string, descr: PropertyDescriptor): void {
+        console.log(target[propKey]);
+        //logs undefined
+        //propKey has three underscores as prefix, but the method has only two underscores
+    };
+}
+
+class A {
+    @dec()
+    private __foo(bar: string): void {
+        // do something with bar
+    }
+}
+
+//// [decoratorWithUnderscoreMethod.js]
+function dec() {
+    return function (target, propKey, descr) {
+        console.log(target[propKey]);
+        //logs undefined
+        //propKey has three underscores as prefix, but the method has only two underscores
+    };
+}
+var A = (function () {
+    function A() {
+    }
+    A.prototype.__foo = function (bar) {
+        // do something with bar
+    };
+    return A;
+}());
+__decorate([
+    dec()
+], A.prototype, "___foo");
diff --git a/tests/baselines/reference/decoratorWithUnderscoreMethod.symbols b/tests/baselines/reference/decoratorWithUnderscoreMethod.symbols
new file mode 100644
index 00000000000..a512bde71f6
--- /dev/null
+++ b/tests/baselines/reference/decoratorWithUnderscoreMethod.symbols
@@ -0,0 +1,42 @@
+=== tests/cases/compiler/decoratorWithUnderscoreMethod.ts ===
+
+declare var console : { log(arg: string): void };
+>console : Symbol(console, Decl(decoratorWithUnderscoreMethod.ts, 1, 11))
+>log : Symbol(log, Decl(decoratorWithUnderscoreMethod.ts, 1, 23))
+>arg : Symbol(arg, Decl(decoratorWithUnderscoreMethod.ts, 1, 28))
+
+function dec(): Function {
+>dec : Symbol(dec, Decl(decoratorWithUnderscoreMethod.ts, 1, 49))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+
+    return function (target: any, propKey: string, descr: PropertyDescriptor): void {
+>target : Symbol(target, Decl(decoratorWithUnderscoreMethod.ts, 3, 21))
+>propKey : Symbol(propKey, Decl(decoratorWithUnderscoreMethod.ts, 3, 33))
+>descr : Symbol(descr, Decl(decoratorWithUnderscoreMethod.ts, 3, 50))
+>PropertyDescriptor : Symbol(PropertyDescriptor, Decl(lib.d.ts, --, --))
+
+        console.log(target[propKey]);
+>console.log : Symbol(log, Decl(decoratorWithUnderscoreMethod.ts, 1, 23))
+>console : Symbol(console, Decl(decoratorWithUnderscoreMethod.ts, 1, 11))
+>log : Symbol(log, Decl(decoratorWithUnderscoreMethod.ts, 1, 23))
+>target : Symbol(target, Decl(decoratorWithUnderscoreMethod.ts, 3, 21))
+>propKey : Symbol(propKey, Decl(decoratorWithUnderscoreMethod.ts, 3, 33))
+
+        //logs undefined
+        //propKey has three underscores as prefix, but the method has only two underscores
+    };
+}
+
+class A {
+>A : Symbol(A, Decl(decoratorWithUnderscoreMethod.ts, 8, 1))
+
+    @dec()
+>dec : Symbol(dec, Decl(decoratorWithUnderscoreMethod.ts, 1, 49))
+
+    private __foo(bar: string): void {
+>__foo : Symbol(A.__foo, Decl(decoratorWithUnderscoreMethod.ts, 10, 9))
+>bar : Symbol(bar, Decl(decoratorWithUnderscoreMethod.ts, 12, 18))
+
+        // do something with bar
+    }
+}
diff --git a/tests/baselines/reference/decoratorWithUnderscoreMethod.types b/tests/baselines/reference/decoratorWithUnderscoreMethod.types
new file mode 100644
index 00000000000..1ce08dc8a9e
--- /dev/null
+++ b/tests/baselines/reference/decoratorWithUnderscoreMethod.types
@@ -0,0 +1,46 @@
+=== tests/cases/compiler/decoratorWithUnderscoreMethod.ts ===
+
+declare var console : { log(arg: string): void };
+>console : { log(arg: string): void; }
+>log : (arg: string) => void
+>arg : string
+
+function dec(): Function {
+>dec : () => Function
+>Function : Function
+
+    return function (target: any, propKey: string, descr: PropertyDescriptor): void {
+>function (target: any, propKey: string, descr: PropertyDescriptor): void {        console.log(target[propKey]);        //logs undefined        //propKey has three underscores as prefix, but the method has only two underscores    } : (target: any, propKey: string, descr: PropertyDescriptor) => void
+>target : any
+>propKey : string
+>descr : PropertyDescriptor
+>PropertyDescriptor : PropertyDescriptor
+
+        console.log(target[propKey]);
+>console.log(target[propKey]) : void
+>console.log : (arg: string) => void
+>console : { log(arg: string): void; }
+>log : (arg: string) => void
+>target[propKey] : any
+>target : any
+>propKey : string
+
+        //logs undefined
+        //propKey has three underscores as prefix, but the method has only two underscores
+    };
+}
+
+class A {
+>A : A
+
+    @dec()
+>dec() : Function
+>dec : () => Function
+
+    private __foo(bar: string): void {
+>__foo : (bar: string) => void
+>bar : string
+
+        // do something with bar
+    }
+}
diff --git a/tests/cases/compiler/decoratorWithUnderscoreMethod.ts b/tests/cases/compiler/decoratorWithUnderscoreMethod.ts
new file mode 100644
index 00000000000..e6551c91284
--- /dev/null
+++ b/tests/cases/compiler/decoratorWithUnderscoreMethod.ts
@@ -0,0 +1,18 @@
+// @noemithelpers: true
+// @experimentaldecorators: true
+
+declare var console : { log(arg: string): void };
+function dec(): Function {
+    return function (target: any, propKey: string, descr: PropertyDescriptor): void {
+        console.log(target[propKey]);
+        //logs undefined
+        //propKey has three underscores as prefix, but the method has only two underscores
+    };
+}
+
+class A {
+    @dec()
+    private __foo(bar: string): void {
+        // do something with bar
+    }
+}
\ No newline at end of file

From e5b5fe1bd7784e63cc57214eafe845c222af0891 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Wed, 30 Nov 2016 10:51:35 -0800
Subject: [PATCH 395/421] When creating string literal for property access,
 unescape the identifier text Fixes #12562

---
 src/compiler/transformers/ts.ts                            | 2 +-
 tests/baselines/reference/decoratorWithUnderscoreMethod.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
index 52717a94996..6af8a263599 100644
--- a/src/compiler/transformers/ts.ts
+++ b/src/compiler/transformers/ts.ts
@@ -1905,7 +1905,7 @@ namespace ts {
                     : (<ComputedPropertyName>name).expression;
             }
             else if (isIdentifier(name)) {
-                return createLiteral(name.text);
+                return createLiteral(unescapeIdentifier(name.text));
             }
             else {
                 return getSynthesizedClone(name);
diff --git a/tests/baselines/reference/decoratorWithUnderscoreMethod.js b/tests/baselines/reference/decoratorWithUnderscoreMethod.js
index 03037980ee7..bf79890263b 100644
--- a/tests/baselines/reference/decoratorWithUnderscoreMethod.js
+++ b/tests/baselines/reference/decoratorWithUnderscoreMethod.js
@@ -34,4 +34,4 @@ var A = (function () {
 }());
 __decorate([
     dec()
-], A.prototype, "___foo");
+], A.prototype, "__foo");

From edb376db013d1334deeead800ceb9574f412d387 Mon Sep 17 00:00:00 2001
From: arusakov <a_s_rusakov@mail.ru>
Date: Fri, 2 Dec 2016 18:34:48 +0300
Subject: [PATCH 396/421] Update cli --target description (es2016 and 2017)

---
 src/compiler/commandLineParser.ts    | 2 +-
 src/compiler/diagnosticMessages.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index 3c6a86134ea..e9f9ff210a9 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -272,7 +272,7 @@ namespace ts {
                 "es2017": ScriptTarget.ES2017,
                 "esnext": ScriptTarget.ESNext,
             }),
-            description: Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015,
+            description: Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_ES2015_ES2016_ES2017_or_ESNEXT,
             paramType: Diagnostics.VERSION,
         },
         {
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 5f49c54a2af..4d42c77e566 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -2473,7 +2473,7 @@
         "category": "Message",
         "code": 6012
     },
-    "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES2015'": {
+    "Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', or 'ESNEXT'": {
         "category": "Message",
         "code": 6015
     },

From 3b1d6c969d90b8d41b5bdfce13bc1955512b53de Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Fri, 2 Dec 2016 14:29:03 -0800
Subject: [PATCH 397/421] Treat indexed access types T[K] as type variables

---
 src/compiler/checker.ts | 161 +++++++++++++++++++++-------------------
 src/compiler/types.ts   |  25 ++++---
 2 files changed, 99 insertions(+), 87 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 02cde0d4412..81f982e4dc0 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -4513,10 +4513,10 @@ namespace ts {
             setStructuredTypeMembers(type, emptySymbols, emptyArray, emptyArray, undefined, undefined);
             // In { [P in K]: T }, we refer to P as the type parameter type, K as the constraint type,
             // and T as the template type. If K is of the form 'keyof S', the mapped type and S are
-            // isomorphic and we copy property modifiers from corresponding properties in S.
+            // homomorphic and we copy property modifiers from corresponding properties in S.
             const typeParameter = getTypeParameterFromMappedType(type);
             const constraintType = getConstraintTypeFromMappedType(type);
-            const isomorphicType = getIsomorphicTypeFromMappedType(type);
+            const homomorphicType = getHomomorphicTypeFromMappedType(type);
             const templateType = getTemplateTypeFromMappedType(type);
             const templateReadonly = !!type.declaration.readonlyToken;
             const templateOptional = !!type.declaration.questionToken;
@@ -4536,11 +4536,11 @@ namespace ts {
                 // Otherwise, for type string create a string index signature.
                 if (t.flags & TypeFlags.StringLiteral) {
                     const propName = (<LiteralType>t).text;
-                    const isomorphicProp = isomorphicType && getPropertyOfType(isomorphicType, propName);
-                    const isOptional = templateOptional || !!(isomorphicProp && isomorphicProp.flags & SymbolFlags.Optional);
+                    const homomorphicProp = homomorphicType && getPropertyOfType(homomorphicType, propName);
+                    const isOptional = templateOptional || !!(homomorphicProp && homomorphicProp.flags & SymbolFlags.Optional);
                     const prop = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | (isOptional ? SymbolFlags.Optional : 0), propName);
                     prop.type = propType;
-                    prop.isReadonly = templateReadonly || isomorphicProp && isReadonlySymbol(isomorphicProp);
+                    prop.isReadonly = templateReadonly || homomorphicProp && isReadonlySymbol(homomorphicProp);
                     members[propName] = prop;
                 }
                 else if (t.flags & TypeFlags.String) {
@@ -4567,7 +4567,7 @@ namespace ts {
                     unknownType);
         }
 
-        function getIsomorphicTypeFromMappedType(type: MappedType) {
+        function getHomomorphicTypeFromMappedType(type: MappedType) {
             const constraint = getConstraintDeclaration(getTypeParameterFromMappedType(type));
             return constraint.kind === SyntaxKind.TypeOperator ? instantiateType(getTypeFromTypeNode((<TypeOperatorNode>constraint).type), type.mapper || identityMapper) : undefined;
         }
@@ -5912,7 +5912,7 @@ namespace ts {
             return links.resolvedType;
         }
 
-        function getIndexTypeForTypeParameter(type: TypeParameter) {
+        function getIndexTypeForTypeVariable(type: TypeVariable) {
             if (!type.resolvedIndexType) {
                 type.resolvedIndexType = <IndexType>createType(TypeFlags.Index);
                 type.resolvedIndexType.type = type;
@@ -5931,7 +5931,7 @@ namespace ts {
         }
 
         function getIndexType(type: Type): Type {
-            return type.flags & TypeFlags.TypeParameter ? getIndexTypeForTypeParameter(<TypeParameter>type) :
+            return type.flags & TypeFlags.TypeVariable ? getIndexTypeForTypeVariable(<TypeVariable>type) :
                 getObjectFlags(type) & ObjectFlags.Mapped ? getConstraintTypeFromMappedType(<MappedType>type) :
                 type.flags & TypeFlags.Any || getIndexInfoOfType(type, IndexKind.String) ? stringType :
                 getLiteralTypeFromPropertyNames(type);
@@ -6032,13 +6032,14 @@ namespace ts {
         }
 
         function getIndexedAccessType(objectType: Type, indexType: Type, accessNode?: ElementAccessExpression | IndexedAccessTypeNode) {
-            if (indexType.flags & TypeFlags.TypeParameter ||
-                objectType.flags & TypeFlags.TypeParameter && indexType.flags & TypeFlags.Index ||
+            if (indexType.flags & TypeFlags.TypeVariable ||
+                objectType.flags & TypeFlags.TypeVariable && indexType.flags & TypeFlags.Index ||
                 isGenericMappedType(objectType)) {
-                // If either the object type or the index type are type parameters, or if the object type is a mapped
-                // type with a generic constraint, we are performing a higher-order index access where we cannot
-                // meaningfully access the properties of the object type. In those cases, we first check that the
-                // index type is assignable to 'keyof T' for the object type.
+                // If the object type is a type variable (a type parameter or another indexed access type), if the
+                // index type is a type variable or an index type, or if the object type is a mapped type with a
+                // generic constraint, we are performing a higher-order index access where we cannot meaningfully
+                // access the properties of the object type. In those cases, we first check that the index type is
+                // assignable to 'keyof T' for the object type.
                 if (accessNode) {
                     if (!isTypeAssignableTo(indexType, getIndexType(objectType))) {
                         error(accessNode, Diagnostics.Type_0_cannot_be_used_to_index_type_1, typeToString(indexType), typeToString(objectType));
@@ -6531,19 +6532,19 @@ namespace ts {
         }
 
         function instantiateMappedType(type: MappedType, mapper: TypeMapper): Type {
-            // Check if we have an isomorphic mapped type, i.e. a type of the form { [P in keyof T]: X } for some
-            // type parameter T. If so, the mapped type is distributive over a union type and when T is instantiated
+            // Check if we have a homomorphic mapped type, i.e. a type of the form { [P in keyof T]: X } for some
+            // type variable T. If so, the mapped type is distributive over a union type and when T is instantiated
             // to a union type A | B, we produce { [P in keyof A]: X } | { [P in keyof B]: X }. Furthermore, for
-            // isomorphic mapped types we leave primitive types alone. For example, when T is instantiated to a
+            // homomorphic mapped types we leave primitive types alone. For example, when T is instantiated to a
             // union type A | undefined, we produce { [P in keyof A]: X } | undefined.
             const constraintType = getConstraintTypeFromMappedType(type);
             if (constraintType.flags & TypeFlags.Index) {
-                const typeParameter = (<IndexType>constraintType).type;
-                const mappedTypeParameter = mapper(typeParameter);
-                if (typeParameter !== mappedTypeParameter) {
-                    return mapType(mappedTypeParameter, t => {
+                const typeVariable = <TypeParameter>(<IndexType>constraintType).type;
+                const mappedTypeVariable = instantiateType(typeVariable, mapper);
+                if (typeVariable !== mappedTypeVariable) {
+                    return mapType(mappedTypeVariable, t => {
                         if (isMappableType(t)) {
-                            const replacementMapper = createUnaryTypeMapper(typeParameter, t);
+                            const replacementMapper = createUnaryTypeMapper(typeVariable, t);
                             const combinedMapper = mapper.mappedTypes && mapper.mappedTypes.length === 1 ? replacementMapper : combineTypeMappers(replacementMapper, mapper);
                             combinedMapper.mappedTypes = mapper.mappedTypes;
                             return instantiateMappedObjectType(type, combinedMapper);
@@ -7274,10 +7275,12 @@ namespace ts {
                     }
                     // Given a type parameter T with a constraint C, a type S is assignable to
                     // keyof T if S is assignable to keyof C.
-                    const constraint = getConstraintOfTypeParameter((<IndexType>target).type);
-                    if (constraint) {
-                        if (result = isRelatedTo(source, getIndexType(constraint), reportErrors)) {
-                            return result;
+                    if ((<IndexType>target).type.flags & TypeFlags.TypeParameter) {
+                        const constraint = getConstraintOfTypeParameter(<TypeParameter>(<IndexType>target).type);
+                        if (constraint) {
+                            if (result = isRelatedTo(source, getIndexType(constraint), reportErrors)) {
+                                return result;
+                            }
                         }
                     }
                 }
@@ -8458,69 +8461,68 @@ namespace ts {
         // 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.
-        function couldContainTypeParameters(type: Type): boolean {
+        function couldContainTypeVariables(type: Type): boolean {
             const objectFlags = getObjectFlags(type);
-            return !!(type.flags & (TypeFlags.TypeParameter | TypeFlags.IndexedAccess) ||
-                objectFlags & ObjectFlags.Reference && forEach((<TypeReference>type).typeArguments, couldContainTypeParameters) ||
+            return !!(type.flags & TypeFlags.TypeVariable ||
+                objectFlags & ObjectFlags.Reference && forEach((<TypeReference>type).typeArguments, couldContainTypeVariables) ||
                 objectFlags & ObjectFlags.Anonymous && type.symbol && type.symbol.flags & (SymbolFlags.Method | SymbolFlags.TypeLiteral | SymbolFlags.Class) ||
                 objectFlags & ObjectFlags.Mapped ||
-                type.flags & TypeFlags.UnionOrIntersection && couldUnionOrIntersectionContainTypeParameters(<UnionOrIntersectionType>type));
+                type.flags & TypeFlags.UnionOrIntersection && couldUnionOrIntersectionContainTypeVariables(<UnionOrIntersectionType>type));
         }
 
-        function couldUnionOrIntersectionContainTypeParameters(type: UnionOrIntersectionType): boolean {
-            if (type.couldContainTypeParameters === undefined) {
-                type.couldContainTypeParameters = forEach(type.types, couldContainTypeParameters);
+        function couldUnionOrIntersectionContainTypeVariables(type: UnionOrIntersectionType): boolean {
+            if (type.couldContainTypeVariables === undefined) {
+                type.couldContainTypeVariables = forEach(type.types, couldContainTypeVariables);
             }
-            return type.couldContainTypeParameters;
+            return type.couldContainTypeVariables;
         }
 
         function isTypeParameterAtTopLevel(type: Type, typeParameter: TypeParameter): boolean {
             return type === typeParameter || type.flags & TypeFlags.UnionOrIntersection && forEach((<UnionOrIntersectionType>type).types, t => isTypeParameterAtTopLevel(t, typeParameter));
         }
 
-        // Infer a suitable input type for an isomorphic mapped type { [P in keyof T]: X }. We construct
+        // Infer a suitable input type for a homomorphic mapped type { [P in keyof T]: X }. We construct
         // an object type with the same set of properties as the source type, where the type of each
-        // property is computed by inferring from the source property type to X for a synthetic type
-        // parameter T[P] (i.e. we treat the type T[P] as the type parameter we're inferring for).
-        function inferTypeForIsomorphicMappedType(source: Type, target: MappedType): Type {
-            if (!isMappableType(source)) {
-                return source;
+        // property is computed by inferring from the source property type to X for the type
+        // variable T[P] (i.e. we treat the type T[P] as the type variable we're inferring for).
+        function inferTypeForHomomorphicMappedType(source: Type, target: MappedType): Type {
+            const properties = getPropertiesOfType(source);
+            let indexInfo = getIndexInfoOfType(source, IndexKind.String);
+            if (properties.length === 0 && !indexInfo) {
+                return undefined;
             }
-            const typeParameter = getIndexedAccessType((<IndexType>getConstraintTypeFromMappedType(target)).type, getTypeParameterFromMappedType(target));
-            const typeParameterArray = [typeParameter];
+            const typeVariable = <TypeVariable>getIndexedAccessType((<IndexType>getConstraintTypeFromMappedType(target)).type, getTypeParameterFromMappedType(target));
+            const typeVariableArray = [typeVariable];
             const typeInferences = createTypeInferencesObject();
             const typeInferencesArray = [typeInferences];
             const templateType = getTemplateTypeFromMappedType(target);
             const readonlyMask = target.declaration.readonlyToken ? false : true;
             const optionalMask = target.declaration.questionToken ? 0 : SymbolFlags.Optional;
-            const properties = getPropertiesOfType(source);
             const members = createSymbolTable(properties);
-            let hasInferredTypes = false;
             for (const prop of properties) {
                 const inferredPropType = inferTargetType(getTypeOfSymbol(prop));
-                if (inferredPropType) {
-                    const inferredProp = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | prop.flags & optionalMask, prop.name);
-                    inferredProp.declarations = prop.declarations;
-                    inferredProp.type = inferredPropType;
-                    inferredProp.isReadonly = readonlyMask && isReadonlySymbol(prop);
-                    members[prop.name] = inferredProp;
-                    hasInferredTypes = true;
+                if (!inferredPropType) {
+                    return undefined;
                 }
+                const inferredProp = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | prop.flags & optionalMask, prop.name);
+                inferredProp.declarations = prop.declarations;
+                inferredProp.type = inferredPropType;
+                inferredProp.isReadonly = readonlyMask && isReadonlySymbol(prop);
+                members[prop.name] = inferredProp;
             }
-            let indexInfo = getIndexInfoOfType(source, IndexKind.String);
             if (indexInfo) {
                 const inferredIndexType = inferTargetType(indexInfo.type);
-                if (inferredIndexType) {
-                    indexInfo = createIndexInfo(inferredIndexType, readonlyMask && indexInfo.isReadonly);
-                    hasInferredTypes = true;
+                if (!inferredIndexType) {
+                    return undefined;
                 }
+                indexInfo = createIndexInfo(inferredIndexType, readonlyMask && indexInfo.isReadonly);
             }
-            return hasInferredTypes ? createAnonymousType(undefined, members, emptyArray, emptyArray, indexInfo, undefined) : source;
+            return createAnonymousType(undefined, members, emptyArray, emptyArray, indexInfo, undefined);
 
             function inferTargetType(sourceType: Type): Type {
                 typeInferences.primary = undefined;
                 typeInferences.secondary = undefined;
-                inferTypes(typeParameterArray, typeInferencesArray, sourceType, templateType);
+                inferTypes(typeVariableArray, typeInferencesArray, sourceType, templateType);
                 const inferences = typeInferences.primary || typeInferences.secondary;
                 return inferences && getUnionType(inferences, /*subtypeReduction*/ true);
             }
@@ -8530,7 +8532,7 @@ namespace ts {
             inferTypes(context.signature.typeParameters, context.inferences, originalSource, originalTarget);
         }
 
-        function inferTypes(typeParameters: Type[], typeInferences: TypeInferences[], originalSource: Type, originalTarget: Type) {
+        function inferTypes(typeVariables: TypeVariable[], typeInferences: TypeInferences[], originalSource: Type, originalTarget: Type) {
             let sourceStack: Type[];
             let targetStack: Type[];
             let depth = 0;
@@ -8548,7 +8550,7 @@ namespace ts {
             }
 
             function inferFromTypes(source: Type, target: Type) {
-                if (!couldContainTypeParameters(target)) {
+                if (!couldContainTypeVariables(target)) {
                     return;
                 }
                 if (source.aliasSymbol && source.aliasTypeArguments && source.aliasSymbol === target.aliasSymbol) {
@@ -8598,7 +8600,7 @@ namespace ts {
                         target = removeTypesFromUnionOrIntersection(<UnionOrIntersectionType>target, matchingTypes);
                     }
                 }
-                if (target.flags & (TypeFlags.TypeParameter | TypeFlags.IndexedAccess)) {
+                if (target.flags & TypeFlags.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).
                     // Because the anyFunctionType is internal, it should not be exposed to the user by adding
@@ -8608,8 +8610,8 @@ namespace ts {
                     if (source.flags & TypeFlags.ContainsAnyFunctionType) {
                         return;
                     }
-                    for (let i = 0; i < typeParameters.length; i++) {
-                        if (target === typeParameters[i]) {
+                    for (let i = 0; i < typeVariables.length; i++) {
+                        if (target === typeVariables[i]) {
                             const inferences = typeInferences[i];
                             if (!inferences.isFixed) {
                                 // Any inferences that are made to a type parameter in a union type are inferior
@@ -8643,24 +8645,24 @@ namespace ts {
                 }
                 else if (target.flags & TypeFlags.UnionOrIntersection) {
                     const targetTypes = (<UnionOrIntersectionType>target).types;
-                    let typeParameterCount = 0;
-                    let typeParameter: TypeParameter;
-                    // First infer to each type in union or intersection that isn't a type parameter
+                    let typeVariableCount = 0;
+                    let typeVariable: TypeVariable;
+                    // First infer to each type in union or intersection that isn't a type variable
                     for (const t of targetTypes) {
-                        if (t.flags & TypeFlags.TypeParameter && contains(typeParameters, t)) {
-                            typeParameter = <TypeParameter>t;
-                            typeParameterCount++;
+                        if (t.flags & TypeFlags.TypeVariable && contains(typeVariables, t)) {
+                            typeVariable = <TypeVariable>t;
+                            typeVariableCount++;
                         }
                         else {
                             inferFromTypes(source, t);
                         }
                     }
-                    // Next, if target containings a single naked type parameter, make a secondary inference to that type
-                    // parameter. This gives meaningful results for union types in co-variant positions and intersection
+                    // Next, if target containings a single naked type variable, make a secondary inference to that type
+                    // variable. This gives meaningful results for union types in co-variant positions and intersection
                     // types in contra-variant positions (such as callback parameters).
-                    if (typeParameterCount === 1) {
+                    if (typeVariableCount === 1) {
                         inferiority++;
-                        inferFromTypes(source, typeParameter);
+                        inferFromTypes(source, typeVariable);
                         inferiority--;
                     }
                 }
@@ -8702,12 +8704,15 @@ namespace ts {
                 if (getObjectFlags(target) & ObjectFlags.Mapped) {
                     const constraintType = getConstraintTypeFromMappedType(<MappedType>target);
                     if (constraintType.flags & TypeFlags.Index) {
-                        // We're inferring from some source type S to an isomorphic mapped type { [P in keyof T]: X },
-                        // where T is a type parameter. Use inferTypeForIsomorphicMappedType to infer a suitable source
+                        // We're inferring from some source type S to a homomorphic mapped type { [P in keyof T]: X },
+                        // where T is a type variable. Use inferTypeForHomomorphicMappedType to infer a suitable source
                         // type and then infer from that type to T.
-                        const index = indexOf(typeParameters, (<IndexType>constraintType).type);
+                        const index = indexOf(typeVariables, (<IndexType>constraintType).type);
                         if (index >= 0 && !typeInferences[index].isFixed) {
-                            inferFromTypes(inferTypeForIsomorphicMappedType(source, <MappedType>target), typeParameters[index]);
+                            const inferredType = inferTypeForHomomorphicMappedType(source, <MappedType>target);
+                            if (inferredType) {
+                                inferFromTypes(inferredType, typeVariables[index]);
+                            }
                         }
                         return;
                     }
@@ -14388,7 +14393,7 @@ namespace ts {
             if (!(isTypeComparableTo(leftType, stringType) || isTypeOfKind(leftType, TypeFlags.NumberLike | TypeFlags.ESSymbol))) {
                 error(left, Diagnostics.The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol);
             }
-            if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, TypeFlags.Object | TypeFlags.TypeParameter | TypeFlags.IndexedAccess)) {
+            if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, TypeFlags.Object | TypeFlags.TypeVariable)) {
                 error(right, Diagnostics.The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter);
             }
             return booleanType;
@@ -17331,7 +17336,7 @@ namespace ts {
 
             // unknownType is returned i.e. if node.expression is identifier whose name cannot be resolved
             // in this case error about missing name is already reported - do not report extra one
-            if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, TypeFlags.Object | TypeFlags.TypeParameter | TypeFlags.IndexedAccess)) {
+            if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, TypeFlags.Object | TypeFlags.TypeVariable)) {
                 error(node.expression, Diagnostics.The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter);
             }
 
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index bc400df257d..aa96b35d758 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -2797,6 +2797,7 @@ namespace ts {
         UnionOrIntersection = Union | Intersection,
         StructuredType = Object | Union | Intersection,
         StructuredOrTypeParameter = StructuredType | TypeParameter | Index,
+        TypeVariable = TypeParameter | IndexedAccess,
 
         // 'Narrowable' types are types where narrowing actually narrows.
         // This *should* be every type other than null, undefined, void, and never
@@ -2907,7 +2908,7 @@ namespace ts {
         /* @internal */
         resolvedProperties: SymbolTable;  // Cache of resolved properties
         /* @internal */
-        couldContainTypeParameters: boolean;
+        couldContainTypeVariables: boolean;
     }
 
     export interface UnionType extends UnionOrIntersectionType { }
@@ -2963,8 +2964,13 @@ namespace ts {
         iteratorElementType?: Type;
     }
 
+    export interface TypeVariable extends Type {
+        /* @internal */
+        resolvedIndexType: IndexType;
+    }
+
     // Type parameters (TypeFlags.TypeParameter)
-    export interface TypeParameter extends Type {
+    export interface TypeParameter extends TypeVariable {
         constraint: Type;        // Constraint
         /* @internal */
         target?: TypeParameter;  // Instantiation target
@@ -2973,20 +2979,21 @@ namespace ts {
         /* @internal */
         resolvedApparentType: Type;
         /* @internal */
-        resolvedIndexType: IndexType;
-        /* @internal */
         isThisType?: boolean;
     }
 
-    export interface IndexType extends Type {
-        type: TypeParameter;
-    }
-
-    export interface IndexedAccessType extends Type {
+    // Indexed access types (TypeFlags.IndexedAccess)
+    // Possible forms are T[xxx], xxx[T], or xxx[keyof T], where T is a type variable
+    export interface IndexedAccessType extends TypeVariable {
         objectType: Type;
         indexType: Type;
     }
 
+    // keyof T types (TypeFlags.Index)
+    export interface IndexType extends Type {
+        type: TypeVariable;
+    }
+
     export const enum SignatureKind {
         Call,
         Construct,

From b3b23597a8362c1501b810ecd67048a39ee7794d Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Fri, 2 Dec 2016 14:29:23 -0800
Subject: [PATCH 398/421] Accept new baselines

---
 tests/baselines/reference/keyofAndIndexedAccess.types | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/baselines/reference/keyofAndIndexedAccess.types b/tests/baselines/reference/keyofAndIndexedAccess.types
index 587100496e9..fa54c614f07 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.types
+++ b/tests/baselines/reference/keyofAndIndexedAccess.types
@@ -826,7 +826,7 @@ function f54<T>(obj: T, key: keyof T) {
 >T : T
 
     for (let s in obj[key]) {
->s : string
+>s : keyof T[keyof T]
 >obj[key] : T[keyof T]
 >obj : T
 >key : keyof T
@@ -851,7 +851,7 @@ function f55<T, K extends keyof T>(obj: T, key: K) {
 >K : K
 
     for (let s in obj[key]) {
->s : string
+>s : keyof T[K]
 >obj[key] : T[K]
 >obj : T
 >key : K

From 1e2425ebfce32a5207578214bf15c5591778a0a7 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Fri, 2 Dec 2016 14:50:14 -0800
Subject: [PATCH 399/421] Add tests

---
 .../types/keyof/keyofAndIndexedAccess.ts      | 42 +++++++++++++++++++
 .../mapped/isomorphicMappedTypeInference.ts   | 27 +++++++++++-
 2 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts b/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
index 9aa05798607..3cad745402f 100644
--- a/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
+++ b/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
@@ -250,3 +250,45 @@ class OtherPerson {
         return getProperty(this, "parts")
     }
 }
+
+// Modified repro from #12544
+
+function path<T, K1 extends keyof T>(obj: T, key1: K1): T[K1];
+function path<T, K1 extends keyof T, K2 extends keyof T[K1]>(obj: T, key1: K1, key2: K2): T[K1][K2];
+function path<T, K1 extends keyof T, K2 extends keyof T[K1], K3 extends keyof T[K1][K2]>(obj: T, key1: K1, key2: K2, key3: K3): T[K1][K2][K3];
+function path(obj: any, ...keys: (string | number)[]): any;
+function path(obj: any, ...keys: (string | number)[]): any {
+    let result = obj;
+    for (let k of keys) {
+        result = result[k];
+    }
+    return result;
+}
+
+type Thing = {
+    a: { x: number, y: string },
+    b: boolean
+};
+
+
+function f1(thing: Thing) {
+    let x1 = path(thing, 'a');  // { x: number, y: string }
+    let x2 = path(thing, 'a', 'y');  // string
+    let x3 = path(thing, 'b');  // boolean
+    let x4 = path(thing, ...['a', 'x']);  // any
+}
+
+// Repro from comment in #12114
+
+const assignTo2 = <T, K1 extends keyof T, K2 extends keyof T[K1]>(object: T, key1: K1, key2: K2) =>
+    (value: T[K1][K2]) => object[key1][key2] = value;
+
+// Modified repro from #12573
+
+declare function one<T>(handler: (t: T) => void): T
+var empty = one(() => {}) // inferred as {}, expected
+
+type Handlers<T> = { [K in keyof T]: (t: T[K]) => void }
+declare function on<T>(handlerHash: Handlers<T>): T
+var hashOfEmpty1 = on({ test: () => {} });  // {}
+var hashOfEmpty2 = on({ test: (x: boolean) => {} });  // { test: boolean }
\ No newline at end of file
diff --git a/tests/cases/conformance/types/mapped/isomorphicMappedTypeInference.ts b/tests/cases/conformance/types/mapped/isomorphicMappedTypeInference.ts
index 4aab2d95ba3..330d99dd7f1 100644
--- a/tests/cases/conformance/types/mapped/isomorphicMappedTypeInference.ts
+++ b/tests/cases/conformance/types/mapped/isomorphicMappedTypeInference.ts
@@ -120,4 +120,29 @@ function f10(foo: Foo) {
     let x = validate(foo);  // { a: number, readonly b: string }
     let y = clone(foo);  // { a?: number, b: string }
     let z = validateAndClone(foo);  // { a: number, b: string }
-}
\ No newline at end of file
+}
+
+// Repro from #12606
+
+type Func<T> = (...args: any[]) => T;
+type Spec<T> = {
+    [P in keyof T]: Func<T[P]> | Spec<T[P]> ;
+};
+
+/**
+ * Given a spec object recursively mapping properties to functions, creates a function
+ * producing an object of the same structure, by mapping each property to the result
+ * of calling its associated function with the supplied arguments.
+ */
+declare function applySpec<T>(obj: Spec<T>): (...args: any[]) => T;
+
+// Infers g1: (...args: any[]) => { sum: number, nested: { mul: string } }
+var g1 = applySpec({
+    sum: (a: any) => 3,
+    nested: {
+        mul: (b: any) => "n"
+    }
+});
+
+// Infers g2: (...args: any[]) => { foo: { bar: { baz: boolean } } }
+var g2 = applySpec({ foo: { bar: { baz: (x: any) => true } } });
\ No newline at end of file

From fe0b66a00c5e11cd593ab99c99e8ab4262973e80 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Fri, 2 Dec 2016 14:50:21 -0800
Subject: [PATCH 400/421] Accept new baselines

---
 .../isomorphicMappedTypeInference.js          |  59 ++++-
 .../isomorphicMappedTypeInference.symbols     |  66 ++++++
 .../isomorphicMappedTypeInference.types       |  79 +++++++
 .../reference/keyofAndIndexedAccess.js        |  91 +++++++-
 .../reference/keyofAndIndexedAccess.symbols   | 193 +++++++++++++++
 .../reference/keyofAndIndexedAccess.types     | 220 ++++++++++++++++++
 6 files changed, 706 insertions(+), 2 deletions(-)

diff --git a/tests/baselines/reference/isomorphicMappedTypeInference.js b/tests/baselines/reference/isomorphicMappedTypeInference.js
index 87f3e1c4017..0ed2285ed04 100644
--- a/tests/baselines/reference/isomorphicMappedTypeInference.js
+++ b/tests/baselines/reference/isomorphicMappedTypeInference.js
@@ -118,7 +118,32 @@ function f10(foo: Foo) {
     let x = validate(foo);  // { a: number, readonly b: string }
     let y = clone(foo);  // { a?: number, b: string }
     let z = validateAndClone(foo);  // { a: number, b: string }
-}
+}
+
+// Repro from #12606
+
+type Func<T> = (...args: any[]) => T;
+type Spec<T> = {
+    [P in keyof T]: Func<T[P]> | Spec<T[P]> ;
+};
+
+/**
+ * Given a spec object recursively mapping properties to functions, creates a function
+ * producing an object of the same structure, by mapping each property to the result
+ * of calling its associated function with the supplied arguments.
+ */
+declare function applySpec<T>(obj: Spec<T>): (...args: any[]) => T;
+
+// Infers g1: (...args: any[]) => { sum: number, nested: { mul: string } }
+var g1 = applySpec({
+    sum: (a: any) => 3,
+    nested: {
+        mul: (b: any) => "n"
+    }
+});
+
+// Infers g2: (...args: any[]) => { foo: { bar: { baz: boolean } } }
+var g2 = applySpec({ foo: { bar: { baz: (x: any) => true } } });
 
 //// [isomorphicMappedTypeInference.js]
 function box(x) {
@@ -210,6 +235,15 @@ function f10(foo) {
     var y = clone(foo); // { a?: number, b: string }
     var z = validateAndClone(foo); // { a: number, b: string }
 }
+// Infers g1: (...args: any[]) => { sum: number, nested: { mul: string } }
+var g1 = applySpec({
+    sum: function (a) { return 3; },
+    nested: {
+        mul: function (b) { return "n"; }
+    }
+});
+// Infers g2: (...args: any[]) => { foo: { bar: { baz: boolean } } }
+var g2 = applySpec({ foo: { bar: { baz: function (x) { return true; } } } });
 
 
 //// [isomorphicMappedTypeInference.d.ts]
@@ -254,3 +288,26 @@ declare type Foo = {
     readonly b: string;
 };
 declare function f10(foo: Foo): void;
+declare type Func<T> = (...args: any[]) => T;
+declare type Spec<T> = {
+    [P in keyof T]: Func<T[P]> | Spec<T[P]>;
+};
+/**
+ * Given a spec object recursively mapping properties to functions, creates a function
+ * producing an object of the same structure, by mapping each property to the result
+ * of calling its associated function with the supplied arguments.
+ */
+declare function applySpec<T>(obj: Spec<T>): (...args: any[]) => T;
+declare var g1: (...args: any[]) => {
+    sum: number;
+    nested: {
+        mul: string;
+    };
+};
+declare var g2: (...args: any[]) => {
+    foo: {
+        bar: {
+            baz: boolean;
+        };
+    };
+};
diff --git a/tests/baselines/reference/isomorphicMappedTypeInference.symbols b/tests/baselines/reference/isomorphicMappedTypeInference.symbols
index 3e8a92e7691..92bcbb697ec 100644
--- a/tests/baselines/reference/isomorphicMappedTypeInference.symbols
+++ b/tests/baselines/reference/isomorphicMappedTypeInference.symbols
@@ -393,3 +393,69 @@ function f10(foo: Foo) {
 >validateAndClone : Symbol(validateAndClone, Decl(isomorphicMappedTypeInference.ts, 107, 69))
 >foo : Symbol(foo, Decl(isomorphicMappedTypeInference.ts, 115, 13))
 }
+
+// Repro from #12606
+
+type Func<T> = (...args: any[]) => T;
+>Func : Symbol(Func, Decl(isomorphicMappedTypeInference.ts, 119, 1))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 123, 10))
+>args : Symbol(args, Decl(isomorphicMappedTypeInference.ts, 123, 16))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 123, 10))
+
+type Spec<T> = {
+>Spec : Symbol(Spec, Decl(isomorphicMappedTypeInference.ts, 123, 37))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 124, 10))
+
+    [P in keyof T]: Func<T[P]> | Spec<T[P]> ;
+>P : Symbol(P, Decl(isomorphicMappedTypeInference.ts, 125, 5))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 124, 10))
+>Func : Symbol(Func, Decl(isomorphicMappedTypeInference.ts, 119, 1))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 124, 10))
+>P : Symbol(P, Decl(isomorphicMappedTypeInference.ts, 125, 5))
+>Spec : Symbol(Spec, Decl(isomorphicMappedTypeInference.ts, 123, 37))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 124, 10))
+>P : Symbol(P, Decl(isomorphicMappedTypeInference.ts, 125, 5))
+
+};
+
+/**
+ * Given a spec object recursively mapping properties to functions, creates a function
+ * producing an object of the same structure, by mapping each property to the result
+ * of calling its associated function with the supplied arguments.
+ */
+declare function applySpec<T>(obj: Spec<T>): (...args: any[]) => T;
+>applySpec : Symbol(applySpec, Decl(isomorphicMappedTypeInference.ts, 126, 2))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 133, 27))
+>obj : Symbol(obj, Decl(isomorphicMappedTypeInference.ts, 133, 30))
+>Spec : Symbol(Spec, Decl(isomorphicMappedTypeInference.ts, 123, 37))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 133, 27))
+>args : Symbol(args, Decl(isomorphicMappedTypeInference.ts, 133, 46))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 133, 27))
+
+// Infers g1: (...args: any[]) => { sum: number, nested: { mul: string } }
+var g1 = applySpec({
+>g1 : Symbol(g1, Decl(isomorphicMappedTypeInference.ts, 136, 3))
+>applySpec : Symbol(applySpec, Decl(isomorphicMappedTypeInference.ts, 126, 2))
+
+    sum: (a: any) => 3,
+>sum : Symbol(sum, Decl(isomorphicMappedTypeInference.ts, 136, 20))
+>a : Symbol(a, Decl(isomorphicMappedTypeInference.ts, 137, 10))
+
+    nested: {
+>nested : Symbol(nested, Decl(isomorphicMappedTypeInference.ts, 137, 23))
+
+        mul: (b: any) => "n"
+>mul : Symbol(mul, Decl(isomorphicMappedTypeInference.ts, 138, 13))
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 139, 14))
+    }
+});
+
+// Infers g2: (...args: any[]) => { foo: { bar: { baz: boolean } } }
+var g2 = applySpec({ foo: { bar: { baz: (x: any) => true } } });
+>g2 : Symbol(g2, Decl(isomorphicMappedTypeInference.ts, 144, 3))
+>applySpec : Symbol(applySpec, Decl(isomorphicMappedTypeInference.ts, 126, 2))
+>foo : Symbol(foo, Decl(isomorphicMappedTypeInference.ts, 144, 20))
+>bar : Symbol(bar, Decl(isomorphicMappedTypeInference.ts, 144, 27))
+>baz : Symbol(baz, Decl(isomorphicMappedTypeInference.ts, 144, 34))
+>x : Symbol(x, Decl(isomorphicMappedTypeInference.ts, 144, 41))
+
diff --git a/tests/baselines/reference/isomorphicMappedTypeInference.types b/tests/baselines/reference/isomorphicMappedTypeInference.types
index eee2d6cbe7d..b4d1383071b 100644
--- a/tests/baselines/reference/isomorphicMappedTypeInference.types
+++ b/tests/baselines/reference/isomorphicMappedTypeInference.types
@@ -467,3 +467,82 @@ function f10(foo: Foo) {
 >validateAndClone : <T>(obj: { readonly [P in keyof T]?: T[P] | undefined; }) => T
 >foo : Foo
 }
+
+// Repro from #12606
+
+type Func<T> = (...args: any[]) => T;
+>Func : Func<T>
+>T : T
+>args : any[]
+>T : T
+
+type Spec<T> = {
+>Spec : Spec<T>
+>T : T
+
+    [P in keyof T]: Func<T[P]> | Spec<T[P]> ;
+>P : P
+>T : T
+>Func : Func<T>
+>T : T
+>P : P
+>Spec : Spec<T>
+>T : T
+>P : P
+
+};
+
+/**
+ * Given a spec object recursively mapping properties to functions, creates a function
+ * producing an object of the same structure, by mapping each property to the result
+ * of calling its associated function with the supplied arguments.
+ */
+declare function applySpec<T>(obj: Spec<T>): (...args: any[]) => T;
+>applySpec : <T>(obj: Spec<T>) => (...args: any[]) => T
+>T : T
+>obj : Spec<T>
+>Spec : Spec<T>
+>T : T
+>args : any[]
+>T : T
+
+// Infers g1: (...args: any[]) => { sum: number, nested: { mul: string } }
+var g1 = applySpec({
+>g1 : (...args: any[]) => { sum: number; nested: { mul: string; }; }
+>applySpec({    sum: (a: any) => 3,    nested: {        mul: (b: any) => "n"    }}) : (...args: any[]) => { sum: number; nested: { mul: string; }; }
+>applySpec : <T>(obj: Spec<T>) => (...args: any[]) => T
+>{    sum: (a: any) => 3,    nested: {        mul: (b: any) => "n"    }} : { sum: (a: any) => number; nested: { mul: (b: any) => string; }; }
+
+    sum: (a: any) => 3,
+>sum : (a: any) => number
+>(a: any) => 3 : (a: any) => number
+>a : any
+>3 : 3
+
+    nested: {
+>nested : { mul: (b: any) => string; }
+>{        mul: (b: any) => "n"    } : { mul: (b: any) => string; }
+
+        mul: (b: any) => "n"
+>mul : (b: any) => string
+>(b: any) => "n" : (b: any) => string
+>b : any
+>"n" : "n"
+    }
+});
+
+// Infers g2: (...args: any[]) => { foo: { bar: { baz: boolean } } }
+var g2 = applySpec({ foo: { bar: { baz: (x: any) => true } } });
+>g2 : (...args: any[]) => { foo: { bar: { baz: boolean; }; }; }
+>applySpec({ foo: { bar: { baz: (x: any) => true } } }) : (...args: any[]) => { foo: { bar: { baz: boolean; }; }; }
+>applySpec : <T>(obj: Spec<T>) => (...args: any[]) => T
+>{ foo: { bar: { baz: (x: any) => true } } } : { foo: { bar: { baz: (x: any) => boolean; }; }; }
+>foo : { bar: { baz: (x: any) => boolean; }; }
+>{ bar: { baz: (x: any) => true } } : { bar: { baz: (x: any) => boolean; }; }
+>bar : { baz: (x: any) => boolean; }
+>{ baz: (x: any) => true } : { baz: (x: any) => boolean; }
+>baz : (x: any) => boolean
+>(x: any) => true : (x: any) => boolean
+>x : any
+>true : true
+
diff --git a/tests/baselines/reference/keyofAndIndexedAccess.js b/tests/baselines/reference/keyofAndIndexedAccess.js
index 8d8f125f39e..0e630be9a43 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.js
+++ b/tests/baselines/reference/keyofAndIndexedAccess.js
@@ -250,7 +250,48 @@ class OtherPerson {
         return getProperty(this, "parts")
     }
 }
-
+
+// Modified repro from #12544
+
+function path<T, K1 extends keyof T>(obj: T, key1: K1): T[K1];
+function path<T, K1 extends keyof T, K2 extends keyof T[K1]>(obj: T, key1: K1, key2: K2): T[K1][K2];
+function path<T, K1 extends keyof T, K2 extends keyof T[K1], K3 extends keyof T[K1][K2]>(obj: T, key1: K1, key2: K2, key3: K3): T[K1][K2][K3];
+function path(obj: any, ...keys: (string | number)[]): any;
+function path(obj: any, ...keys: (string | number)[]): any {
+    let result = obj;
+    for (let k of keys) {
+        result = result[k];
+    }
+    return result;
+}
+
+type Thing = {
+    a: { x: number, y: string },
+    b: boolean
+};
+
+
+function f1(thing: Thing) {
+    let x1 = path(thing, 'a');  // { x: number, y: string }
+    let x2 = path(thing, 'a', 'y');  // string
+    let x3 = path(thing, 'b');  // boolean
+    let x4 = path(thing, ...['a', 'x']);  // any
+}
+
+// Repro from comment in #12114
+
+const assignTo2 = <T, K1 extends keyof T, K2 extends keyof T[K1]>(object: T, key1: K1, key2: K2) =>
+    (value: T[K1][K2]) => object[key1][key2] = value;
+
+// Modified repro from #12573
+
+declare function one<T>(handler: (t: T) => void): T
+var empty = one(() => {}) // inferred as {}, expected
+
+type Handlers<T> = { [K in keyof T]: (t: T[K]) => void }
+declare function on<T>(handlerHash: Handlers<T>): T
+var hashOfEmpty1 = on({ test: () => {} });  // {}
+var hashOfEmpty2 = on({ test: (x: boolean) => {} });  // { test: boolean }
 
 //// [keyofAndIndexedAccess.js]
 var __extends = (this && this.__extends) || function (d, b) {
@@ -430,6 +471,31 @@ var OtherPerson = (function () {
     };
     return OtherPerson;
 }());
+function path(obj) {
+    var keys = [];
+    for (var _i = 1; _i < arguments.length; _i++) {
+        keys[_i - 1] = arguments[_i];
+    }
+    var result = obj;
+    for (var _a = 0, keys_1 = keys; _a < keys_1.length; _a++) {
+        var k = keys_1[_a];
+        result = result[k];
+    }
+    return result;
+}
+function f1(thing) {
+    var x1 = path(thing, 'a'); // { x: number, y: string }
+    var x2 = path(thing, 'a', 'y'); // string
+    var x3 = path(thing, 'b'); // boolean
+    var x4 = path.apply(void 0, [thing].concat(['a', 'x'])); // any
+}
+// Repro from comment in #12114
+var assignTo2 = function (object, key1, key2) {
+    return function (value) { return object[key1][key2] = value; };
+};
+var empty = one(function () { }); // inferred as {}, expected
+var hashOfEmpty1 = on({ test: function () { } }); // {}
+var hashOfEmpty2 = on({ test: function (x) { } }); // { test: boolean }
 
 
 //// [keyofAndIndexedAccess.d.ts]
@@ -551,3 +617,26 @@ declare class OtherPerson {
     constructor(parts: number);
     getParts(): number;
 }
+declare function path<T, K1 extends keyof T>(obj: T, key1: K1): T[K1];
+declare function path<T, K1 extends keyof T, K2 extends keyof T[K1]>(obj: T, key1: K1, key2: K2): T[K1][K2];
+declare function path<T, K1 extends keyof T, K2 extends keyof T[K1], K3 extends keyof T[K1][K2]>(obj: T, key1: K1, key2: K2, key3: K3): T[K1][K2][K3];
+declare function path(obj: any, ...keys: (string | number)[]): any;
+declare type Thing = {
+    a: {
+        x: number;
+        y: string;
+    };
+    b: boolean;
+};
+declare function f1(thing: Thing): void;
+declare const assignTo2: <T, K1 extends keyof T, K2 extends keyof T[K1]>(object: T, key1: K1, key2: K2) => (value: T[K1][K2]) => T[K1][K2];
+declare function one<T>(handler: (t: T) => void): T;
+declare var empty: {};
+declare type Handlers<T> = {
+    [K in keyof T]: (t: T[K]) => void;
+};
+declare function on<T>(handlerHash: Handlers<T>): T;
+declare var hashOfEmpty1: {};
+declare var hashOfEmpty2: {
+    test: boolean;
+};
diff --git a/tests/baselines/reference/keyofAndIndexedAccess.symbols b/tests/baselines/reference/keyofAndIndexedAccess.symbols
index 2371bf419c8..e67db316dad 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.symbols
+++ b/tests/baselines/reference/keyofAndIndexedAccess.symbols
@@ -848,3 +848,196 @@ class OtherPerson {
     }
 }
 
+// Modified repro from #12544
+
+function path<T, K1 extends keyof T>(obj: T, key1: K1): T[K1];
+>path : Symbol(path, Decl(keyofAndIndexedAccess.ts, 250, 1), Decl(keyofAndIndexedAccess.ts, 254, 62), Decl(keyofAndIndexedAccess.ts, 255, 100), Decl(keyofAndIndexedAccess.ts, 256, 142), Decl(keyofAndIndexedAccess.ts, 257, 59))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 254, 14))
+>K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 254, 16))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 254, 14))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 254, 37))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 254, 14))
+>key1 : Symbol(key1, Decl(keyofAndIndexedAccess.ts, 254, 44))
+>K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 254, 16))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 254, 14))
+>K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 254, 16))
+
+function path<T, K1 extends keyof T, K2 extends keyof T[K1]>(obj: T, key1: K1, key2: K2): T[K1][K2];
+>path : Symbol(path, Decl(keyofAndIndexedAccess.ts, 250, 1), Decl(keyofAndIndexedAccess.ts, 254, 62), Decl(keyofAndIndexedAccess.ts, 255, 100), Decl(keyofAndIndexedAccess.ts, 256, 142), Decl(keyofAndIndexedAccess.ts, 257, 59))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 255, 14))
+>K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 255, 16))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 255, 14))
+>K2 : Symbol(K2, Decl(keyofAndIndexedAccess.ts, 255, 36))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 255, 14))
+>K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 255, 16))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 255, 61))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 255, 14))
+>key1 : Symbol(key1, Decl(keyofAndIndexedAccess.ts, 255, 68))
+>K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 255, 16))
+>key2 : Symbol(key2, Decl(keyofAndIndexedAccess.ts, 255, 78))
+>K2 : Symbol(K2, Decl(keyofAndIndexedAccess.ts, 255, 36))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 255, 14))
+>K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 255, 16))
+>K2 : Symbol(K2, Decl(keyofAndIndexedAccess.ts, 255, 36))
+
+function path<T, K1 extends keyof T, K2 extends keyof T[K1], K3 extends keyof T[K1][K2]>(obj: T, key1: K1, key2: K2, key3: K3): T[K1][K2][K3];
+>path : Symbol(path, Decl(keyofAndIndexedAccess.ts, 250, 1), Decl(keyofAndIndexedAccess.ts, 254, 62), Decl(keyofAndIndexedAccess.ts, 255, 100), Decl(keyofAndIndexedAccess.ts, 256, 142), Decl(keyofAndIndexedAccess.ts, 257, 59))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 256, 14))
+>K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 256, 16))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 256, 14))
+>K2 : Symbol(K2, Decl(keyofAndIndexedAccess.ts, 256, 36))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 256, 14))
+>K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 256, 16))
+>K3 : Symbol(K3, Decl(keyofAndIndexedAccess.ts, 256, 60))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 256, 14))
+>K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 256, 16))
+>K2 : Symbol(K2, Decl(keyofAndIndexedAccess.ts, 256, 36))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 256, 89))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 256, 14))
+>key1 : Symbol(key1, Decl(keyofAndIndexedAccess.ts, 256, 96))
+>K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 256, 16))
+>key2 : Symbol(key2, Decl(keyofAndIndexedAccess.ts, 256, 106))
+>K2 : Symbol(K2, Decl(keyofAndIndexedAccess.ts, 256, 36))
+>key3 : Symbol(key3, Decl(keyofAndIndexedAccess.ts, 256, 116))
+>K3 : Symbol(K3, Decl(keyofAndIndexedAccess.ts, 256, 60))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 256, 14))
+>K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 256, 16))
+>K2 : Symbol(K2, Decl(keyofAndIndexedAccess.ts, 256, 36))
+>K3 : Symbol(K3, Decl(keyofAndIndexedAccess.ts, 256, 60))
+
+function path(obj: any, ...keys: (string | number)[]): any;
+>path : Symbol(path, Decl(keyofAndIndexedAccess.ts, 250, 1), Decl(keyofAndIndexedAccess.ts, 254, 62), Decl(keyofAndIndexedAccess.ts, 255, 100), Decl(keyofAndIndexedAccess.ts, 256, 142), Decl(keyofAndIndexedAccess.ts, 257, 59))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 257, 14))
+>keys : Symbol(keys, Decl(keyofAndIndexedAccess.ts, 257, 23))
+
+function path(obj: any, ...keys: (string | number)[]): any {
+>path : Symbol(path, Decl(keyofAndIndexedAccess.ts, 250, 1), Decl(keyofAndIndexedAccess.ts, 254, 62), Decl(keyofAndIndexedAccess.ts, 255, 100), Decl(keyofAndIndexedAccess.ts, 256, 142), Decl(keyofAndIndexedAccess.ts, 257, 59))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 258, 14))
+>keys : Symbol(keys, Decl(keyofAndIndexedAccess.ts, 258, 23))
+
+    let result = obj;
+>result : Symbol(result, Decl(keyofAndIndexedAccess.ts, 259, 7))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 258, 14))
+
+    for (let k of keys) {
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 260, 12))
+>keys : Symbol(keys, Decl(keyofAndIndexedAccess.ts, 258, 23))
+
+        result = result[k];
+>result : Symbol(result, Decl(keyofAndIndexedAccess.ts, 259, 7))
+>result : Symbol(result, Decl(keyofAndIndexedAccess.ts, 259, 7))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 260, 12))
+    }
+    return result;
+>result : Symbol(result, Decl(keyofAndIndexedAccess.ts, 259, 7))
+}
+
+type Thing = {
+>Thing : Symbol(Thing, Decl(keyofAndIndexedAccess.ts, 264, 1))
+
+    a: { x: number, y: string },
+>a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 266, 14))
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 267, 8))
+>y : Symbol(y, Decl(keyofAndIndexedAccess.ts, 267, 19))
+
+    b: boolean
+>b : Symbol(b, Decl(keyofAndIndexedAccess.ts, 267, 32))
+
+};
+
+
+function f1(thing: Thing) {
+>f1 : Symbol(f1, Decl(keyofAndIndexedAccess.ts, 269, 2))
+>thing : Symbol(thing, Decl(keyofAndIndexedAccess.ts, 272, 12))
+>Thing : Symbol(Thing, Decl(keyofAndIndexedAccess.ts, 264, 1))
+
+    let x1 = path(thing, 'a');  // { x: number, y: string }
+>x1 : Symbol(x1, Decl(keyofAndIndexedAccess.ts, 273, 7))
+>path : Symbol(path, Decl(keyofAndIndexedAccess.ts, 250, 1), Decl(keyofAndIndexedAccess.ts, 254, 62), Decl(keyofAndIndexedAccess.ts, 255, 100), Decl(keyofAndIndexedAccess.ts, 256, 142), Decl(keyofAndIndexedAccess.ts, 257, 59))
+>thing : Symbol(thing, Decl(keyofAndIndexedAccess.ts, 272, 12))
+
+    let x2 = path(thing, 'a', 'y');  // string
+>x2 : Symbol(x2, Decl(keyofAndIndexedAccess.ts, 274, 7))
+>path : Symbol(path, Decl(keyofAndIndexedAccess.ts, 250, 1), Decl(keyofAndIndexedAccess.ts, 254, 62), Decl(keyofAndIndexedAccess.ts, 255, 100), Decl(keyofAndIndexedAccess.ts, 256, 142), Decl(keyofAndIndexedAccess.ts, 257, 59))
+>thing : Symbol(thing, Decl(keyofAndIndexedAccess.ts, 272, 12))
+
+    let x3 = path(thing, 'b');  // boolean
+>x3 : Symbol(x3, Decl(keyofAndIndexedAccess.ts, 275, 7))
+>path : Symbol(path, Decl(keyofAndIndexedAccess.ts, 250, 1), Decl(keyofAndIndexedAccess.ts, 254, 62), Decl(keyofAndIndexedAccess.ts, 255, 100), Decl(keyofAndIndexedAccess.ts, 256, 142), Decl(keyofAndIndexedAccess.ts, 257, 59))
+>thing : Symbol(thing, Decl(keyofAndIndexedAccess.ts, 272, 12))
+
+    let x4 = path(thing, ...['a', 'x']);  // any
+>x4 : Symbol(x4, Decl(keyofAndIndexedAccess.ts, 276, 7))
+>path : Symbol(path, Decl(keyofAndIndexedAccess.ts, 250, 1), Decl(keyofAndIndexedAccess.ts, 254, 62), Decl(keyofAndIndexedAccess.ts, 255, 100), Decl(keyofAndIndexedAccess.ts, 256, 142), Decl(keyofAndIndexedAccess.ts, 257, 59))
+>thing : Symbol(thing, Decl(keyofAndIndexedAccess.ts, 272, 12))
+}
+
+// Repro from comment in #12114
+
+const assignTo2 = <T, K1 extends keyof T, K2 extends keyof T[K1]>(object: T, key1: K1, key2: K2) =>
+>assignTo2 : Symbol(assignTo2, Decl(keyofAndIndexedAccess.ts, 281, 5))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 281, 19))
+>K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 281, 21))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 281, 19))
+>K2 : Symbol(K2, Decl(keyofAndIndexedAccess.ts, 281, 41))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 281, 19))
+>K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 281, 21))
+>object : Symbol(object, Decl(keyofAndIndexedAccess.ts, 281, 66))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 281, 19))
+>key1 : Symbol(key1, Decl(keyofAndIndexedAccess.ts, 281, 76))
+>K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 281, 21))
+>key2 : Symbol(key2, Decl(keyofAndIndexedAccess.ts, 281, 86))
+>K2 : Symbol(K2, Decl(keyofAndIndexedAccess.ts, 281, 41))
+
+    (value: T[K1][K2]) => object[key1][key2] = value;
+>value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 282, 5))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 281, 19))
+>K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 281, 21))
+>K2 : Symbol(K2, Decl(keyofAndIndexedAccess.ts, 281, 41))
+>object : Symbol(object, Decl(keyofAndIndexedAccess.ts, 281, 66))
+>key1 : Symbol(key1, Decl(keyofAndIndexedAccess.ts, 281, 76))
+>key2 : Symbol(key2, Decl(keyofAndIndexedAccess.ts, 281, 86))
+>value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 282, 5))
+
+// Modified repro from #12573
+
+declare function one<T>(handler: (t: T) => void): T
+>one : Symbol(one, Decl(keyofAndIndexedAccess.ts, 282, 53))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 286, 21))
+>handler : Symbol(handler, Decl(keyofAndIndexedAccess.ts, 286, 24))
+>t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 286, 34))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 286, 21))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 286, 21))
+
+var empty = one(() => {}) // inferred as {}, expected
+>empty : Symbol(empty, Decl(keyofAndIndexedAccess.ts, 287, 3))
+>one : Symbol(one, Decl(keyofAndIndexedAccess.ts, 282, 53))
+
+type Handlers<T> = { [K in keyof T]: (t: T[K]) => void }
+>Handlers : Symbol(Handlers, Decl(keyofAndIndexedAccess.ts, 287, 25))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 289, 14))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 289, 22))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 289, 14))
+>t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 289, 38))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 289, 14))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 289, 22))
+
+declare function on<T>(handlerHash: Handlers<T>): T
+>on : Symbol(on, Decl(keyofAndIndexedAccess.ts, 289, 56))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 290, 20))
+>handlerHash : Symbol(handlerHash, Decl(keyofAndIndexedAccess.ts, 290, 23))
+>Handlers : Symbol(Handlers, Decl(keyofAndIndexedAccess.ts, 287, 25))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 290, 20))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 290, 20))
+
+var hashOfEmpty1 = on({ test: () => {} });  // {}
+>hashOfEmpty1 : Symbol(hashOfEmpty1, Decl(keyofAndIndexedAccess.ts, 291, 3))
+>on : Symbol(on, Decl(keyofAndIndexedAccess.ts, 289, 56))
+>test : Symbol(test, Decl(keyofAndIndexedAccess.ts, 291, 23))
+
+var hashOfEmpty2 = on({ test: (x: boolean) => {} });  // { test: boolean }
+>hashOfEmpty2 : Symbol(hashOfEmpty2, Decl(keyofAndIndexedAccess.ts, 292, 3))
+>on : Symbol(on, Decl(keyofAndIndexedAccess.ts, 289, 56))
+>test : Symbol(test, Decl(keyofAndIndexedAccess.ts, 292, 23))
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 292, 31))
+
diff --git a/tests/baselines/reference/keyofAndIndexedAccess.types b/tests/baselines/reference/keyofAndIndexedAccess.types
index fa54c614f07..9e1e7d4b4d1 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.types
+++ b/tests/baselines/reference/keyofAndIndexedAccess.types
@@ -982,3 +982,223 @@ class OtherPerson {
     }
 }
 
+// Modified repro from #12544
+
+function path<T, K1 extends keyof T>(obj: T, key1: K1): T[K1];
+>path : { <T, K1 extends keyof T>(obj: T, key1: K1): T[K1]; <T, K1 extends keyof T, K2 extends keyof T[K1]>(obj: T, key1: K1, key2: K2): T[K1][K2]; <T, K1 extends keyof T, K2 extends keyof T[K1], K3 extends keyof T[K1][K2]>(obj: T, key1: K1, key2: K2, key3: K3): T[K1][K2][K3]; (obj: any, ...keys: (string | number)[]): any; }
+>T : T
+>K1 : K1
+>T : T
+>obj : T
+>T : T
+>key1 : K1
+>K1 : K1
+>T : T
+>K1 : K1
+
+function path<T, K1 extends keyof T, K2 extends keyof T[K1]>(obj: T, key1: K1, key2: K2): T[K1][K2];
+>path : { <T, K1 extends keyof T>(obj: T, key1: K1): T[K1]; <T, K1 extends keyof T, K2 extends keyof T[K1]>(obj: T, key1: K1, key2: K2): T[K1][K2]; <T, K1 extends keyof T, K2 extends keyof T[K1], K3 extends keyof T[K1][K2]>(obj: T, key1: K1, key2: K2, key3: K3): T[K1][K2][K3]; (obj: any, ...keys: (string | number)[]): any; }
+>T : T
+>K1 : K1
+>T : T
+>K2 : K2
+>T : T
+>K1 : K1
+>obj : T
+>T : T
+>key1 : K1
+>K1 : K1
+>key2 : K2
+>K2 : K2
+>T : T
+>K1 : K1
+>K2 : K2
+
+function path<T, K1 extends keyof T, K2 extends keyof T[K1], K3 extends keyof T[K1][K2]>(obj: T, key1: K1, key2: K2, key3: K3): T[K1][K2][K3];
+>path : { <T, K1 extends keyof T>(obj: T, key1: K1): T[K1]; <T, K1 extends keyof T, K2 extends keyof T[K1]>(obj: T, key1: K1, key2: K2): T[K1][K2]; <T, K1 extends keyof T, K2 extends keyof T[K1], K3 extends keyof T[K1][K2]>(obj: T, key1: K1, key2: K2, key3: K3): T[K1][K2][K3]; (obj: any, ...keys: (string | number)[]): any; }
+>T : T
+>K1 : K1
+>T : T
+>K2 : K2
+>T : T
+>K1 : K1
+>K3 : K3
+>T : T
+>K1 : K1
+>K2 : K2
+>obj : T
+>T : T
+>key1 : K1
+>K1 : K1
+>key2 : K2
+>K2 : K2
+>key3 : K3
+>K3 : K3
+>T : T
+>K1 : K1
+>K2 : K2
+>K3 : K3
+
+function path(obj: any, ...keys: (string | number)[]): any;
+>path : { <T, K1 extends keyof T>(obj: T, key1: K1): T[K1]; <T, K1 extends keyof T, K2 extends keyof T[K1]>(obj: T, key1: K1, key2: K2): T[K1][K2]; <T, K1 extends keyof T, K2 extends keyof T[K1], K3 extends keyof T[K1][K2]>(obj: T, key1: K1, key2: K2, key3: K3): T[K1][K2][K3]; (obj: any, ...keys: (string | number)[]): any; }
+>obj : any
+>keys : (string | number)[]
+
+function path(obj: any, ...keys: (string | number)[]): any {
+>path : { <T, K1 extends keyof T>(obj: T, key1: K1): T[K1]; <T, K1 extends keyof T, K2 extends keyof T[K1]>(obj: T, key1: K1, key2: K2): T[K1][K2]; <T, K1 extends keyof T, K2 extends keyof T[K1], K3 extends keyof T[K1][K2]>(obj: T, key1: K1, key2: K2, key3: K3): T[K1][K2][K3]; (obj: any, ...keys: (string | number)[]): any; }
+>obj : any
+>keys : (string | number)[]
+
+    let result = obj;
+>result : any
+>obj : any
+
+    for (let k of keys) {
+>k : string | number
+>keys : (string | number)[]
+
+        result = result[k];
+>result = result[k] : any
+>result : any
+>result[k] : any
+>result : any
+>k : string | number
+    }
+    return result;
+>result : any
+}
+
+type Thing = {
+>Thing : Thing
+
+    a: { x: number, y: string },
+>a : { x: number; y: string; }
+>x : number
+>y : string
+
+    b: boolean
+>b : boolean
+
+};
+
+
+function f1(thing: Thing) {
+>f1 : (thing: Thing) => void
+>thing : Thing
+>Thing : Thing
+
+    let x1 = path(thing, 'a');  // { x: number, y: string }
+>x1 : { x: number; y: string; }
+>path(thing, 'a') : { x: number; y: string; }
+>path : { <T, K1 extends keyof T>(obj: T, key1: K1): T[K1]; <T, K1 extends keyof T, K2 extends keyof T[K1]>(obj: T, key1: K1, key2: K2): T[K1][K2]; <T, K1 extends keyof T, K2 extends keyof T[K1], K3 extends keyof T[K1][K2]>(obj: T, key1: K1, key2: K2, key3: K3): T[K1][K2][K3]; (obj: any, ...keys: (string | number)[]): any; }
+>thing : Thing
+>'a' : "a"
+
+    let x2 = path(thing, 'a', 'y');  // string
+>x2 : string
+>path(thing, 'a', 'y') : string
+>path : { <T, K1 extends keyof T>(obj: T, key1: K1): T[K1]; <T, K1 extends keyof T, K2 extends keyof T[K1]>(obj: T, key1: K1, key2: K2): T[K1][K2]; <T, K1 extends keyof T, K2 extends keyof T[K1], K3 extends keyof T[K1][K2]>(obj: T, key1: K1, key2: K2, key3: K3): T[K1][K2][K3]; (obj: any, ...keys: (string | number)[]): any; }
+>thing : Thing
+>'a' : "a"
+>'y' : "y"
+
+    let x3 = path(thing, 'b');  // boolean
+>x3 : boolean
+>path(thing, 'b') : boolean
+>path : { <T, K1 extends keyof T>(obj: T, key1: K1): T[K1]; <T, K1 extends keyof T, K2 extends keyof T[K1]>(obj: T, key1: K1, key2: K2): T[K1][K2]; <T, K1 extends keyof T, K2 extends keyof T[K1], K3 extends keyof T[K1][K2]>(obj: T, key1: K1, key2: K2, key3: K3): T[K1][K2][K3]; (obj: any, ...keys: (string | number)[]): any; }
+>thing : Thing
+>'b' : "b"
+
+    let x4 = path(thing, ...['a', 'x']);  // any
+>x4 : any
+>path(thing, ...['a', 'x']) : any
+>path : { <T, K1 extends keyof T>(obj: T, key1: K1): T[K1]; <T, K1 extends keyof T, K2 extends keyof T[K1]>(obj: T, key1: K1, key2: K2): T[K1][K2]; <T, K1 extends keyof T, K2 extends keyof T[K1], K3 extends keyof T[K1][K2]>(obj: T, key1: K1, key2: K2, key3: K3): T[K1][K2][K3]; (obj: any, ...keys: (string | number)[]): any; }
+>thing : Thing
+>...['a', 'x'] : string
+>['a', 'x'] : string[]
+>'a' : "a"
+>'x' : "x"
+}
+
+// Repro from comment in #12114
+
+const assignTo2 = <T, K1 extends keyof T, K2 extends keyof T[K1]>(object: T, key1: K1, key2: K2) =>
+>assignTo2 : <T, K1 extends keyof T, K2 extends keyof T[K1]>(object: T, key1: K1, key2: K2) => (value: T[K1][K2]) => T[K1][K2]
+><T, K1 extends keyof T, K2 extends keyof T[K1]>(object: T, key1: K1, key2: K2) =>    (value: T[K1][K2]) => object[key1][key2] = value : <T, K1 extends keyof T, K2 extends keyof T[K1]>(object: T, key1: K1, key2: K2) => (value: T[K1][K2]) => T[K1][K2]
+>T : T
+>K1 : K1
+>T : T
+>K2 : K2
+>T : T
+>K1 : K1
+>object : T
+>T : T
+>key1 : K1
+>K1 : K1
+>key2 : K2
+>K2 : K2
+
+    (value: T[K1][K2]) => object[key1][key2] = value;
+>(value: T[K1][K2]) => object[key1][key2] = value : (value: T[K1][K2]) => T[K1][K2]
+>value : T[K1][K2]
+>T : T
+>K1 : K1
+>K2 : K2
+>object[key1][key2] = value : T[K1][K2]
+>object[key1][key2] : T[K1][K2]
+>object[key1] : T[K1]
+>object : T
+>key1 : K1
+>key2 : K2
+>value : T[K1][K2]
+
+// Modified repro from #12573
+
+declare function one<T>(handler: (t: T) => void): T
+>one : <T>(handler: (t: T) => void) => T
+>T : T
+>handler : (t: T) => void
+>t : T
+>T : T
+>T : T
+
+var empty = one(() => {}) // inferred as {}, expected
+>empty : {}
+>one(() => {}) : {}
+>one : <T>(handler: (t: T) => void) => T
+>() => {} : () => void
+
+type Handlers<T> = { [K in keyof T]: (t: T[K]) => void }
+>Handlers : Handlers<T>
+>T : T
+>K : K
+>T : T
+>t : T[K]
+>T : T
+>K : K
+
+declare function on<T>(handlerHash: Handlers<T>): T
+>on : <T>(handlerHash: Handlers<T>) => T
+>T : T
+>handlerHash : Handlers<T>
+>Handlers : Handlers<T>
+>T : T
+>T : T
+
+var hashOfEmpty1 = on({ test: () => {} });  // {}
+>hashOfEmpty1 : {}
+>on({ test: () => {} }) : {}
+>on : <T>(handlerHash: Handlers<T>) => T
+>{ test: () => {} } : { test: () => void; }
+>test : () => void
+>() => {} : () => void
+
+var hashOfEmpty2 = on({ test: (x: boolean) => {} });  // { test: boolean }
+>hashOfEmpty2 : { test: boolean; }
+>on({ test: (x: boolean) => {} }) : { test: boolean; }
+>on : <T>(handlerHash: Handlers<T>) => T
+>{ test: (x: boolean) => {} } : { test: (x: boolean) => void; }
+>test : (x: boolean) => void
+>(x: boolean) => {} : (x: boolean) => void
+>x : boolean
+

From 931006338a2cfd6c8adea893dd5732e1051a5577 Mon Sep 17 00:00:00 2001
From: Mattias Buelens <mattias.buelens@gmail.com>
Date: Sat, 3 Dec 2016 17:52:04 +0100
Subject: [PATCH 401/421] Fix elided syntax kinds falling through to
 visitConstructor in TypeScript transformer.

---
 src/compiler/transformers/ts.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
index 6af8a263599..749ea46c8f2 100644
--- a/src/compiler/transformers/ts.ts
+++ b/src/compiler/transformers/ts.ts
@@ -345,6 +345,7 @@ namespace ts {
 
                 case SyntaxKind.PropertyDeclaration:
                     // TypeScript property declarations are elided.
+                    return undefined;
 
                 case SyntaxKind.Constructor:
                     return visitConstructor(<ConstructorDeclaration>node);

From c538f1fdf7311e63775d10e44b2e7011e30e462e Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sat, 3 Dec 2016 11:03:18 -0800
Subject: [PATCH 402/421] Classify mapped type inferences as secondary

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 81f982e4dc0..adeb7a76376 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -8706,12 +8706,15 @@ namespace ts {
                     if (constraintType.flags & TypeFlags.Index) {
                         // We're inferring from some source type S to a homomorphic mapped type { [P in keyof T]: X },
                         // where T is a type variable. Use inferTypeForHomomorphicMappedType to infer a suitable source
-                        // type and then infer from that type to T.
+                        // type and then make a secondary inference from that type to T. We make a secondary inference
+                        // such that direct inferences to T get priority over inferences to Partial<T>, for example.
                         const index = indexOf(typeVariables, (<IndexType>constraintType).type);
                         if (index >= 0 && !typeInferences[index].isFixed) {
                             const inferredType = inferTypeForHomomorphicMappedType(source, <MappedType>target);
                             if (inferredType) {
+                                inferiority++;
                                 inferFromTypes(inferredType, typeVariables[index]);
+                                inferiority--;
                             }
                         }
                         return;

From 773c9a734fa297be2b7b3d73e6c8260b1ad1f396 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sat, 3 Dec 2016 11:03:40 -0800
Subject: [PATCH 403/421] Add tests

---
 .../mapped/isomorphicMappedTypeInference.ts     |  9 ++++++++-
 .../types/mapped/mappedTypeErrors.ts            | 17 +++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/tests/cases/conformance/types/mapped/isomorphicMappedTypeInference.ts b/tests/cases/conformance/types/mapped/isomorphicMappedTypeInference.ts
index 330d99dd7f1..14bb765a840 100644
--- a/tests/cases/conformance/types/mapped/isomorphicMappedTypeInference.ts
+++ b/tests/cases/conformance/types/mapped/isomorphicMappedTypeInference.ts
@@ -145,4 +145,11 @@ var g1 = applySpec({
 });
 
 // Infers g2: (...args: any[]) => { foo: { bar: { baz: boolean } } }
-var g2 = applySpec({ foo: { bar: { baz: (x: any) => true } } });
\ No newline at end of file
+var g2 = applySpec({ foo: { bar: { baz: (x: any) => true } } });
+
+// Repro from #12633
+
+const foo = <T>(object: T, partial: Partial<T>) => object;
+let o = {a: 5, b: 7};
+foo(o, {b: 9});
+o = foo(o, {b: 9});
\ No newline at end of file
diff --git a/tests/cases/conformance/types/mapped/mappedTypeErrors.ts b/tests/cases/conformance/types/mapped/mappedTypeErrors.ts
index b318cde3aab..a198d4e0dc1 100644
--- a/tests/cases/conformance/types/mapped/mappedTypeErrors.ts
+++ b/tests/cases/conformance/types/mapped/mappedTypeErrors.ts
@@ -67,4 +67,21 @@ function f11<T>() {
 function f12<T>() {
     var x: { [P in keyof T]: T[P] };
     var x: { [P in keyof T]: T[P][] };  // Error
+}
+
+// Check that inferences to mapped types are secondary
+
+declare function objAndReadonly<T>(primary: T, secondary: Readonly<T>): T;
+declare function objAndPartial<T>(primary: T, secondary: Partial<T>): T;
+
+function f20() {
+    let x1 = objAndReadonly({ x: 0, y: 0 }, { x: 1 });  // Error
+    let x2 = objAndReadonly({ x: 0, y: 0 }, { x: 1, y: 1 });
+    let x3 = objAndReadonly({ x: 0, y: 0 }, { x: 1, y: 1, z: 1 });  // Error
+}
+
+function f21() {
+    let x1 = objAndPartial({ x: 0, y: 0 }, { x: 1 });
+    let x2 = objAndPartial({ x: 0, y: 0 }, { x: 1, y: 1 });
+    let x3 = objAndPartial({ x: 0, y: 0 }, { x: 1, y: 1, z: 1 });  // Error
 }
\ No newline at end of file

From 970c4aa4f7dbba9bddc24df43136ee86df03a1dc Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sat, 3 Dec 2016 11:03:46 -0800
Subject: [PATCH 404/421] Accept new baselines

---
 .../isomorphicMappedTypeInference.js          | 19 ++++++++-
 .../isomorphicMappedTypeInference.symbols     | 28 +++++++++++++
 .../isomorphicMappedTypeInference.types       | 39 +++++++++++++++++++
 .../reference/mappedTypeErrors.errors.txt     | 34 +++++++++++++++-
 tests/baselines/reference/mappedTypeErrors.js | 31 +++++++++++++++
 5 files changed, 149 insertions(+), 2 deletions(-)

diff --git a/tests/baselines/reference/isomorphicMappedTypeInference.js b/tests/baselines/reference/isomorphicMappedTypeInference.js
index 0ed2285ed04..560c926877a 100644
--- a/tests/baselines/reference/isomorphicMappedTypeInference.js
+++ b/tests/baselines/reference/isomorphicMappedTypeInference.js
@@ -143,7 +143,14 @@ var g1 = applySpec({
 });
 
 // Infers g2: (...args: any[]) => { foo: { bar: { baz: boolean } } }
-var g2 = applySpec({ foo: { bar: { baz: (x: any) => true } } });
+var g2 = applySpec({ foo: { bar: { baz: (x: any) => true } } });
+
+// Repro from #12633
+
+const foo = <T>(object: T, partial: Partial<T>) => object;
+let o = {a: 5, b: 7};
+foo(o, {b: 9});
+o = foo(o, {b: 9});
 
 //// [isomorphicMappedTypeInference.js]
 function box(x) {
@@ -244,6 +251,11 @@ var g1 = applySpec({
 });
 // Infers g2: (...args: any[]) => { foo: { bar: { baz: boolean } } }
 var g2 = applySpec({ foo: { bar: { baz: function (x) { return true; } } } });
+// Repro from #12633
+var foo = function (object, partial) { return object; };
+var o = { a: 5, b: 7 };
+foo(o, { b: 9 });
+o = foo(o, { b: 9 });
 
 
 //// [isomorphicMappedTypeInference.d.ts]
@@ -311,3 +323,8 @@ declare var g2: (...args: any[]) => {
         };
     };
 };
+declare const foo: <T>(object: T, partial: Partial<T>) => T;
+declare let o: {
+    a: number;
+    b: number;
+};
diff --git a/tests/baselines/reference/isomorphicMappedTypeInference.symbols b/tests/baselines/reference/isomorphicMappedTypeInference.symbols
index 92bcbb697ec..93ce825c35d 100644
--- a/tests/baselines/reference/isomorphicMappedTypeInference.symbols
+++ b/tests/baselines/reference/isomorphicMappedTypeInference.symbols
@@ -459,3 +459,31 @@ var g2 = applySpec({ foo: { bar: { baz: (x: any) => true } } });
 >baz : Symbol(baz, Decl(isomorphicMappedTypeInference.ts, 144, 34))
 >x : Symbol(x, Decl(isomorphicMappedTypeInference.ts, 144, 41))
 
+// Repro from #12633
+
+const foo = <T>(object: T, partial: Partial<T>) => object;
+>foo : Symbol(foo, Decl(isomorphicMappedTypeInference.ts, 148, 5))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 148, 13))
+>object : Symbol(object, Decl(isomorphicMappedTypeInference.ts, 148, 16))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 148, 13))
+>partial : Symbol(partial, Decl(isomorphicMappedTypeInference.ts, 148, 26))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 148, 13))
+>object : Symbol(object, Decl(isomorphicMappedTypeInference.ts, 148, 16))
+
+let o = {a: 5, b: 7};
+>o : Symbol(o, Decl(isomorphicMappedTypeInference.ts, 149, 3))
+>a : Symbol(a, Decl(isomorphicMappedTypeInference.ts, 149, 9))
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 149, 14))
+
+foo(o, {b: 9});
+>foo : Symbol(foo, Decl(isomorphicMappedTypeInference.ts, 148, 5))
+>o : Symbol(o, Decl(isomorphicMappedTypeInference.ts, 149, 3))
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 150, 8))
+
+o = foo(o, {b: 9});
+>o : Symbol(o, Decl(isomorphicMappedTypeInference.ts, 149, 3))
+>foo : Symbol(foo, Decl(isomorphicMappedTypeInference.ts, 148, 5))
+>o : Symbol(o, Decl(isomorphicMappedTypeInference.ts, 149, 3))
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 151, 12))
+
diff --git a/tests/baselines/reference/isomorphicMappedTypeInference.types b/tests/baselines/reference/isomorphicMappedTypeInference.types
index b4d1383071b..ca20e06e113 100644
--- a/tests/baselines/reference/isomorphicMappedTypeInference.types
+++ b/tests/baselines/reference/isomorphicMappedTypeInference.types
@@ -546,3 +546,42 @@ var g2 = applySpec({ foo: { bar: { baz: (x: any) => true } } });
 >x : any
 >true : true
 
+// Repro from #12633
+
+const foo = <T>(object: T, partial: Partial<T>) => object;
+>foo : <T>(object: T, partial: Partial<T>) => T
+><T>(object: T, partial: Partial<T>) => object : <T>(object: T, partial: Partial<T>) => T
+>T : T
+>object : T
+>T : T
+>partial : Partial<T>
+>Partial : Partial<T>
+>T : T
+>object : T
+
+let o = {a: 5, b: 7};
+>o : { a: number; b: number; }
+>{a: 5, b: 7} : { a: number; b: number; }
+>a : number
+>5 : 5
+>b : number
+>7 : 7
+
+foo(o, {b: 9});
+>foo(o, {b: 9}) : { a: number; b: number; }
+>foo : <T>(object: T, partial: Partial<T>) => T
+>o : { a: number; b: number; }
+>{b: 9} : { b: number; }
+>b : number
+>9 : 9
+
+o = foo(o, {b: 9});
+>o = foo(o, {b: 9}) : { a: number; b: number; }
+>o : { a: number; b: number; }
+>foo(o, {b: 9}) : { a: number; b: number; }
+>foo : <T>(object: T, partial: Partial<T>) => T
+>o : { a: number; b: number; }
+>{b: 9} : { b: number; }
+>b : number
+>9 : 9
+
diff --git a/tests/baselines/reference/mappedTypeErrors.errors.txt b/tests/baselines/reference/mappedTypeErrors.errors.txt
index 945652bf929..918c6627f66 100644
--- a/tests/baselines/reference/mappedTypeErrors.errors.txt
+++ b/tests/baselines/reference/mappedTypeErrors.errors.txt
@@ -20,9 +20,15 @@ tests/cases/conformance/types/mapped/mappedTypeErrors.ts(60,9): error TS2403: Su
 tests/cases/conformance/types/mapped/mappedTypeErrors.ts(61,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ readonly [P in keyof T]: T[P]; }'.
 tests/cases/conformance/types/mapped/mappedTypeErrors.ts(62,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ readonly [P in keyof T]?: T[P] | undefined; }'.
 tests/cases/conformance/types/mapped/mappedTypeErrors.ts(67,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ [P in keyof T]: T[P][]; }'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(76,45): error TS2345: Argument of type '{ x: number; }' is not assignable to parameter of type 'Readonly<{ x: number; y: number; }>'.
+  Property 'y' is missing in type '{ x: number; }'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(78,59): error TS2345: Argument of type '{ x: number; y: number; z: number; }' is not assignable to parameter of type 'Readonly<{ x: number; y: number; }>'.
+  Object literal may only specify known properties, and 'z' does not exist in type 'Readonly<{ x: number; y: number; }>'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(84,58): error TS2345: Argument of type '{ x: number; y: number; z: number; }' is not assignable to parameter of type 'Partial<{ x: number; y: number; }>'.
+  Object literal may only specify known properties, and 'z' does not exist in type 'Partial<{ x: number; y: number; }>'.
 
 
-==== tests/cases/conformance/types/mapped/mappedTypeErrors.ts (14 errors) ====
+==== tests/cases/conformance/types/mapped/mappedTypeErrors.ts (17 errors) ====
     
     interface Shape {
         name: string;
@@ -126,4 +132,30 @@ tests/cases/conformance/types/mapped/mappedTypeErrors.ts(67,9): error TS2403: Su
         var x: { [P in keyof T]: T[P][] };  // Error
             ~
 !!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ [P in keyof T]: T[P][]; }'.
+    }
+    
+    // Check that inferences to mapped types are secondary
+    
+    declare function objAndReadonly<T>(primary: T, secondary: Readonly<T>): T;
+    declare function objAndPartial<T>(primary: T, secondary: Partial<T>): T;
+    
+    function f20() {
+        let x1 = objAndReadonly({ x: 0, y: 0 }, { x: 1 });  // Error
+                                                ~~~~~~~~
+!!! error TS2345: Argument of type '{ x: number; }' is not assignable to parameter of type 'Readonly<{ x: number; y: number; }>'.
+!!! error TS2345:   Property 'y' is missing in type '{ x: number; }'.
+        let x2 = objAndReadonly({ x: 0, y: 0 }, { x: 1, y: 1 });
+        let x3 = objAndReadonly({ x: 0, y: 0 }, { x: 1, y: 1, z: 1 });  // Error
+                                                              ~~~~
+!!! error TS2345: Argument of type '{ x: number; y: number; z: number; }' is not assignable to parameter of type 'Readonly<{ x: number; y: number; }>'.
+!!! error TS2345:   Object literal may only specify known properties, and 'z' does not exist in type 'Readonly<{ x: number; y: number; }>'.
+    }
+    
+    function f21() {
+        let x1 = objAndPartial({ x: 0, y: 0 }, { x: 1 });
+        let x2 = objAndPartial({ x: 0, y: 0 }, { x: 1, y: 1 });
+        let x3 = objAndPartial({ x: 0, y: 0 }, { x: 1, y: 1, z: 1 });  // Error
+                                                             ~~~~
+!!! error TS2345: Argument of type '{ x: number; y: number; z: number; }' is not assignable to parameter of type 'Partial<{ x: number; y: number; }>'.
+!!! error TS2345:   Object literal may only specify known properties, and 'z' does not exist in type 'Partial<{ x: number; y: number; }>'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/mappedTypeErrors.js b/tests/baselines/reference/mappedTypeErrors.js
index cb840da32f7..4d2eadbafe9 100644
--- a/tests/baselines/reference/mappedTypeErrors.js
+++ b/tests/baselines/reference/mappedTypeErrors.js
@@ -66,6 +66,23 @@ function f11<T>() {
 function f12<T>() {
     var x: { [P in keyof T]: T[P] };
     var x: { [P in keyof T]: T[P][] };  // Error
+}
+
+// Check that inferences to mapped types are secondary
+
+declare function objAndReadonly<T>(primary: T, secondary: Readonly<T>): T;
+declare function objAndPartial<T>(primary: T, secondary: Partial<T>): T;
+
+function f20() {
+    let x1 = objAndReadonly({ x: 0, y: 0 }, { x: 1 });  // Error
+    let x2 = objAndReadonly({ x: 0, y: 0 }, { x: 1, y: 1 });
+    let x3 = objAndReadonly({ x: 0, y: 0 }, { x: 1, y: 1, z: 1 });  // Error
+}
+
+function f21() {
+    let x1 = objAndPartial({ x: 0, y: 0 }, { x: 1 });
+    let x2 = objAndPartial({ x: 0, y: 0 }, { x: 1, y: 1 });
+    let x3 = objAndPartial({ x: 0, y: 0 }, { x: 1, y: 1, z: 1 });  // Error
 }
 
 //// [mappedTypeErrors.js]
@@ -97,6 +114,16 @@ function f12() {
     var x;
     var x; // Error
 }
+function f20() {
+    var x1 = objAndReadonly({ x: 0, y: 0 }, { x: 1 }); // Error
+    var x2 = objAndReadonly({ x: 0, y: 0 }, { x: 1, y: 1 });
+    var x3 = objAndReadonly({ x: 0, y: 0 }, { x: 1, y: 1, z: 1 }); // Error
+}
+function f21() {
+    var x1 = objAndPartial({ x: 0, y: 0 }, { x: 1 });
+    var x2 = objAndPartial({ x: 0, y: 0 }, { x: 1, y: 1 });
+    var x3 = objAndPartial({ x: 0, y: 0 }, { x: 1, y: 1, z: 1 }); // Error
+}
 
 
 //// [mappedTypeErrors.d.ts]
@@ -137,3 +164,7 @@ declare function f4<T extends keyof Named>(x: T): void;
 declare function f10<T>(): void;
 declare function f11<T>(): void;
 declare function f12<T>(): void;
+declare function objAndReadonly<T>(primary: T, secondary: Readonly<T>): T;
+declare function objAndPartial<T>(primary: T, secondary: Partial<T>): T;
+declare function f20(): void;
+declare function f21(): void;

From b8762111118f50ac2f7624a4e8508bff1257c41b Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sat, 3 Dec 2016 17:18:43 -0800
Subject: [PATCH 405/421] Property handle union/intersection types in type
 variable checks

---
 src/compiler/checker.ts | 23 ++++++++++-------------
 src/compiler/types.ts   |  4 +++-
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 81f982e4dc0..dc208f5613e 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -4523,7 +4523,7 @@ namespace ts {
             // First, if the constraint type is a type parameter, obtain the base constraint. Then,
             // if the key type is a 'keyof X', obtain 'keyof C' where C is the base constraint of X.
             // Finally, iterate over the constituents of the resulting iteration type.
-            const keyType = constraintType.flags & TypeFlags.TypeParameter ? getApparentType(constraintType) : constraintType;
+            const keyType = constraintType.flags & TypeFlags.TypeVariable ? getApparentType(constraintType) : constraintType;
             const iterationType = keyType.flags & TypeFlags.Index ? getIndexType(getApparentType((<IndexType>keyType).type)) : keyType;
             forEachType(iterationType, t => {
                 // Create a mapper from T to the current iteration type constituent. Then, if the
@@ -4579,7 +4579,7 @@ namespace ts {
         function isGenericMappedType(type: Type) {
             if (getObjectFlags(type) & ObjectFlags.Mapped) {
                 const constraintType = getConstraintTypeFromMappedType(<MappedType>type);
-                return !!(constraintType.flags & (TypeFlags.TypeParameter | TypeFlags.Index));
+                return maybeTypeOfKind(constraintType, TypeFlags.TypeVariable | TypeFlags.Index);
             }
             return false;
         }
@@ -5912,7 +5912,7 @@ namespace ts {
             return links.resolvedType;
         }
 
-        function getIndexTypeForTypeVariable(type: TypeVariable) {
+        function getIndexTypeForGenericType(type: TypeVariable | UnionOrIntersectionType) {
             if (!type.resolvedIndexType) {
                 type.resolvedIndexType = <IndexType>createType(TypeFlags.Index);
                 type.resolvedIndexType.type = type;
@@ -5931,7 +5931,7 @@ namespace ts {
         }
 
         function getIndexType(type: Type): Type {
-            return type.flags & TypeFlags.TypeVariable ? getIndexTypeForTypeVariable(<TypeVariable>type) :
+            return maybeTypeOfKind(type, TypeFlags.TypeVariable) ? getIndexTypeForGenericType(<TypeVariable | UnionOrIntersectionType>type) :
                 getObjectFlags(type) & ObjectFlags.Mapped ? getConstraintTypeFromMappedType(<MappedType>type) :
                 type.flags & TypeFlags.Any || getIndexInfoOfType(type, IndexKind.String) ? stringType :
                 getLiteralTypeFromPropertyNames(type);
@@ -6032,14 +6032,11 @@ namespace ts {
         }
 
         function getIndexedAccessType(objectType: Type, indexType: Type, accessNode?: ElementAccessExpression | IndexedAccessTypeNode) {
-            if (indexType.flags & TypeFlags.TypeVariable ||
-                objectType.flags & TypeFlags.TypeVariable && indexType.flags & TypeFlags.Index ||
-                isGenericMappedType(objectType)) {
-                // If the object type is a type variable (a type parameter or another indexed access type), if the
-                // index type is a type variable or an index type, or if the object type is a mapped type with a
-                // generic constraint, we are performing a higher-order index access where we cannot meaningfully
-                // access the properties of the object type. In those cases, we first check that the index type is
-                // assignable to 'keyof T' for the object type.
+            if (maybeTypeOfKind(indexType, TypeFlags.TypeVariable | TypeFlags.Index) || isGenericMappedType(objectType)) {
+                // If the index type is generic or if the object type is a mapped type with a generic constraint,
+                // we are performing a higher-order index access where we cannot meaningfully access the properties
+                // of the object type. In those cases, we first check that the index type is assignable to 'keyof T'
+                // for the object type.
                 if (accessNode) {
                     if (!isTypeAssignableTo(indexType, getIndexType(objectType))) {
                         error(accessNode, Diagnostics.Type_0_cannot_be_used_to_index_type_1, typeToString(indexType), typeToString(objectType));
@@ -6539,7 +6536,7 @@ namespace ts {
             // union type A | undefined, we produce { [P in keyof A]: X } | undefined.
             const constraintType = getConstraintTypeFromMappedType(type);
             if (constraintType.flags & TypeFlags.Index) {
-                const typeVariable = <TypeParameter>(<IndexType>constraintType).type;
+                const typeVariable = (<IndexType>constraintType).type;
                 const mappedTypeVariable = instantiateType(typeVariable, mapper);
                 if (typeVariable !== mappedTypeVariable) {
                     return mapType(mappedTypeVariable, t => {
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index aa96b35d758..0ad84d11c35 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -2908,6 +2908,8 @@ namespace ts {
         /* @internal */
         resolvedProperties: SymbolTable;  // Cache of resolved properties
         /* @internal */
+        resolvedIndexType: IndexType;
+        /* @internal */
         couldContainTypeVariables: boolean;
     }
 
@@ -2991,7 +2993,7 @@ namespace ts {
 
     // keyof T types (TypeFlags.Index)
     export interface IndexType extends Type {
-        type: TypeVariable;
+        type: TypeVariable | UnionOrIntersectionType;
     }
 
     export const enum SignatureKind {

From b4836e3d3d9bf47951d0e8357c164dd36415b1f0 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sat, 3 Dec 2016 17:19:10 -0800
Subject: [PATCH 406/421] Add tests

---
 .../types/keyof/keyofAndIndexedAccess.ts      | 65 ++++++++++++++++++-
 .../keyof/keyofAndIndexedAccessErrors.ts      | 11 ++++
 2 files changed, 75 insertions(+), 1 deletion(-)

diff --git a/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts b/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
index 3cad745402f..3a2bb912c19 100644
--- a/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
+++ b/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
@@ -1,3 +1,4 @@
+// @strictNullChecks: true
 // @declaration: true
 
 class Shape {
@@ -219,6 +220,36 @@ function f60<T>(source: T, target: T) {
     }
 }
 
+function f70(func: <T, U>(k1: keyof (T | U), k2: keyof (T & U)) => void) {
+    func<{ a: any, b: any }, { a: any, c: any }>('a', 'a');
+    func<{ a: any, b: any }, { a: any, c: any }>('a', 'b');
+    func<{ a: any, b: any }, { a: any, c: any }>('a', 'c');
+}
+
+function f71(func: <T, U>(x: T, y: U) => Partial<T & U>) {
+    let x = func({ a: 1, b: "hello" }, { c: true });
+    x.a;  // number | undefined
+    x.b;  // string | undefined
+    x.c;  // boolean | undefined
+}
+
+function f72(func: <T, U, K extends keyof T | keyof U>(x: T, y: U, k: K) => (T & U)[K]) {
+    let a = func({ a: 1, b: "hello" }, { c: true }, 'a');  // number
+    let b = func({ a: 1, b: "hello" }, { c: true }, 'b');  // string
+    let c = func({ a: 1, b: "hello" }, { c: true }, 'c');  // boolean
+}
+
+function f73(func: <T, U, K extends keyof (T & U)>(x: T, y: U, k: K) => (T & U)[K]) {
+    let a = func({ a: 1, b: "hello" }, { c: true }, 'a');  // number
+    let b = func({ a: 1, b: "hello" }, { c: true }, 'b');  // string
+    let c = func({ a: 1, b: "hello" }, { c: true }, 'c');  // boolean
+}
+
+function f74(func: <T, U, K extends keyof (T | U)>(x: T, y: U, k: K) => (T | U)[K]) {
+    let a = func({ a: 1, b: "hello" }, { a: 2, b: true }, 'a');  // number
+    let b = func({ a: 1, b: "hello" }, { a: 2, b: true }, 'b');  // string | boolean
+}
+
 // Repros from #12011
 
 class Base {
@@ -291,4 +322,36 @@ var empty = one(() => {}) // inferred as {}, expected
 type Handlers<T> = { [K in keyof T]: (t: T[K]) => void }
 declare function on<T>(handlerHash: Handlers<T>): T
 var hashOfEmpty1 = on({ test: () => {} });  // {}
-var hashOfEmpty2 = on({ test: (x: boolean) => {} });  // { test: boolean }
\ No newline at end of file
+var hashOfEmpty2 = on({ test: (x: boolean) => {} });  // { test: boolean }
+
+// Repro from #12624
+
+interface Options1<Data, Computed> {
+    data?: Data
+    computed?: Computed;
+}
+
+declare class Component1<Data, Computed> {
+    constructor(options: Options1<Data, Computed>);
+    get<K extends keyof (Data & Computed)>(key: K): (Data & Computed)[K];
+}
+
+let c1 = new Component1({
+    data: {
+        hello: ""
+    }
+});
+
+c1.get("hello");
+
+// Repro from #12625
+
+interface Options2<Data, Computed> {
+    data?: Data
+    computed?: Computed;
+}
+
+declare class Component2<Data, Computed> {
+    constructor(options: Options2<Data, Computed>);
+    get<K extends keyof Data | keyof Computed>(key: K): (Data & Computed)[K];
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts b/tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts
index bc2ddc31a19..cbbc9a52200 100644
--- a/tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts
+++ b/tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts
@@ -65,4 +65,15 @@ function f10(shape: Shape) {
     setProperty(shape, "name", "rectangle");
     setProperty(shape, "size", 10);  // Error
     setProperty(shape, cond ? "name" : "size", 10);  // Error
+}
+
+function f20<T, U>(k1: keyof (T | U), k2: keyof (T & U), o1: T | U, o2: T & U) {
+    o1[k1];
+    o1[k2];   // Error
+    o2[k1];
+    o2[k2];
+    o1 = o2;
+    o2 = o1;  // Error
+    k1 = k2;  // Error
+    k2 = k1;
 }
\ No newline at end of file

From 3aa05b27e93291e965bca53395f3099f735c0bf9 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sat, 3 Dec 2016 17:19:30 -0800
Subject: [PATCH 407/421] Accept new baselines

---
 .../reference/keyofAndIndexedAccess.js        | 119 +++-
 .../reference/keyofAndIndexedAccess.symbols   | 615 +++++++++++++-----
 .../reference/keyofAndIndexedAccess.types     | 362 ++++++++++-
 .../keyofAndIndexedAccessErrors.errors.txt    |  26 +-
 .../reference/keyofAndIndexedAccessErrors.js  |  21 +
 5 files changed, 971 insertions(+), 172 deletions(-)

diff --git a/tests/baselines/reference/keyofAndIndexedAccess.js b/tests/baselines/reference/keyofAndIndexedAccess.js
index 0e630be9a43..1a0b90f3163 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.js
+++ b/tests/baselines/reference/keyofAndIndexedAccess.js
@@ -219,6 +219,36 @@ function f60<T>(source: T, target: T) {
     }
 }
 
+function f70(func: <T, U>(k1: keyof (T | U), k2: keyof (T & U)) => void) {
+    func<{ a: any, b: any }, { a: any, c: any }>('a', 'a');
+    func<{ a: any, b: any }, { a: any, c: any }>('a', 'b');
+    func<{ a: any, b: any }, { a: any, c: any }>('a', 'c');
+}
+
+function f71(func: <T, U>(x: T, y: U) => Partial<T & U>) {
+    let x = func({ a: 1, b: "hello" }, { c: true });
+    x.a;  // number | undefined
+    x.b;  // string | undefined
+    x.c;  // boolean | undefined
+}
+
+function f72(func: <T, U, K extends keyof T | keyof U>(x: T, y: U, k: K) => (T & U)[K]) {
+    let a = func({ a: 1, b: "hello" }, { c: true }, 'a');  // number
+    let b = func({ a: 1, b: "hello" }, { c: true }, 'b');  // string
+    let c = func({ a: 1, b: "hello" }, { c: true }, 'c');  // boolean
+}
+
+function f73(func: <T, U, K extends keyof (T & U)>(x: T, y: U, k: K) => (T & U)[K]) {
+    let a = func({ a: 1, b: "hello" }, { c: true }, 'a');  // number
+    let b = func({ a: 1, b: "hello" }, { c: true }, 'b');  // string
+    let c = func({ a: 1, b: "hello" }, { c: true }, 'c');  // boolean
+}
+
+function f74(func: <T, U, K extends keyof (T | U)>(x: T, y: U, k: K) => (T | U)[K]) {
+    let a = func({ a: 1, b: "hello" }, { a: 2, b: true }, 'a');  // number
+    let b = func({ a: 1, b: "hello" }, { a: 2, b: true }, 'b');  // string | boolean
+}
+
 // Repros from #12011
 
 class Base {
@@ -291,7 +321,39 @@ var empty = one(() => {}) // inferred as {}, expected
 type Handlers<T> = { [K in keyof T]: (t: T[K]) => void }
 declare function on<T>(handlerHash: Handlers<T>): T
 var hashOfEmpty1 = on({ test: () => {} });  // {}
-var hashOfEmpty2 = on({ test: (x: boolean) => {} });  // { test: boolean }
+var hashOfEmpty2 = on({ test: (x: boolean) => {} });  // { test: boolean }
+
+// Repro from #12624
+
+interface Options1<Data, Computed> {
+    data?: Data
+    computed?: Computed;
+}
+
+declare class Component1<Data, Computed> {
+    constructor(options: Options1<Data, Computed>);
+    get<K extends keyof (Data & Computed)>(key: K): (Data & Computed)[K];
+}
+
+let c1 = new Component1({
+    data: {
+        hello: ""
+    }
+});
+
+c1.get("hello");
+
+// Repro from #12625
+
+interface Options2<Data, Computed> {
+    data?: Data
+    computed?: Computed;
+}
+
+declare class Component2<Data, Computed> {
+    constructor(options: Options2<Data, Computed>);
+    get<K extends keyof Data | keyof Computed>(key: K): (Data & Computed)[K];
+}
 
 //// [keyofAndIndexedAccess.js]
 var __extends = (this && this.__extends) || function (d, b) {
@@ -438,6 +500,31 @@ function f60(source, target) {
         target[k] = source[k];
     }
 }
+function f70(func) {
+    func('a', 'a');
+    func('a', 'b');
+    func('a', 'c');
+}
+function f71(func) {
+    var x = func({ a: 1, b: "hello" }, { c: true });
+    x.a; // number | undefined
+    x.b; // string | undefined
+    x.c; // boolean | undefined
+}
+function f72(func) {
+    var a = func({ a: 1, b: "hello" }, { c: true }, 'a'); // number
+    var b = func({ a: 1, b: "hello" }, { c: true }, 'b'); // string
+    var c = func({ a: 1, b: "hello" }, { c: true }, 'c'); // boolean
+}
+function f73(func) {
+    var a = func({ a: 1, b: "hello" }, { c: true }, 'a'); // number
+    var b = func({ a: 1, b: "hello" }, { c: true }, 'b'); // string
+    var c = func({ a: 1, b: "hello" }, { c: true }, 'c'); // boolean
+}
+function f74(func) {
+    var a = func({ a: 1, b: "hello" }, { a: 2, b: true }, 'a'); // number
+    var b = func({ a: 1, b: "hello" }, { a: 2, b: true }, 'b'); // string | boolean
+}
 // Repros from #12011
 var Base = (function () {
     function Base() {
@@ -496,6 +583,12 @@ var assignTo2 = function (object, key1, key2) {
 var empty = one(function () { }); // inferred as {}, expected
 var hashOfEmpty1 = on({ test: function () { } }); // {}
 var hashOfEmpty2 = on({ test: function (x) { } }); // { test: boolean }
+var c1 = new Component1({
+    data: {
+        hello: ""
+    }
+});
+c1.get("hello");
 
 
 //// [keyofAndIndexedAccess.d.ts]
@@ -603,6 +696,11 @@ declare function f53<T, K extends keyof T>(obj: {
 declare function f54<T>(obj: T, key: keyof T): void;
 declare function f55<T, K extends keyof T>(obj: T, key: K): void;
 declare function f60<T>(source: T, target: T): void;
+declare function f70(func: <T, U>(k1: keyof (T | U), k2: keyof (T & U)) => void): void;
+declare function f71(func: <T, U>(x: T, y: U) => Partial<T & U>): void;
+declare function f72(func: <T, U, K extends keyof T | keyof U>(x: T, y: U, k: K) => (T & U)[K]): void;
+declare function f73(func: <T, U, K extends keyof (T & U)>(x: T, y: U, k: K) => (T & U)[K]): void;
+declare function f74(func: <T, U, K extends keyof (T | U)>(x: T, y: U, k: K) => (T | U)[K]): void;
 declare class Base {
     get<K extends keyof this>(prop: K): this[K];
     set<K extends keyof this>(prop: K, value: this[K]): void;
@@ -640,3 +738,22 @@ declare var hashOfEmpty1: {};
 declare var hashOfEmpty2: {
     test: boolean;
 };
+interface Options1<Data, Computed> {
+    data?: Data;
+    computed?: Computed;
+}
+declare class Component1<Data, Computed> {
+    constructor(options: Options1<Data, Computed>);
+    get<K extends keyof (Data & Computed)>(key: K): (Data & Computed)[K];
+}
+declare let c1: Component1<{
+    hello: string;
+}, {}>;
+interface Options2<Data, Computed> {
+    data?: Data;
+    computed?: Computed;
+}
+declare class Component2<Data, Computed> {
+    constructor(options: Options2<Data, Computed>);
+    get<K extends keyof Data | keyof Computed>(key: K): (Data & Computed)[K];
+}
diff --git a/tests/baselines/reference/keyofAndIndexedAccess.symbols b/tests/baselines/reference/keyofAndIndexedAccess.symbols
index e67db316dad..bc9e53cdd7e 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.symbols
+++ b/tests/baselines/reference/keyofAndIndexedAccess.symbols
@@ -766,278 +766,557 @@ function f60<T>(source: T, target: T) {
     }
 }
 
+function f70(func: <T, U>(k1: keyof (T | U), k2: keyof (T & U)) => void) {
+>f70 : Symbol(f70, Decl(keyofAndIndexedAccess.ts, 218, 1))
+>func : Symbol(func, Decl(keyofAndIndexedAccess.ts, 220, 13))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 220, 20))
+>U : Symbol(U, Decl(keyofAndIndexedAccess.ts, 220, 22))
+>k1 : Symbol(k1, Decl(keyofAndIndexedAccess.ts, 220, 26))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 220, 20))
+>U : Symbol(U, Decl(keyofAndIndexedAccess.ts, 220, 22))
+>k2 : Symbol(k2, Decl(keyofAndIndexedAccess.ts, 220, 44))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 220, 20))
+>U : Symbol(U, Decl(keyofAndIndexedAccess.ts, 220, 22))
+
+    func<{ a: any, b: any }, { a: any, c: any }>('a', 'a');
+>func : Symbol(func, Decl(keyofAndIndexedAccess.ts, 220, 13))
+>a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 221, 10))
+>b : Symbol(b, Decl(keyofAndIndexedAccess.ts, 221, 18))
+>a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 221, 30))
+>c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 221, 38))
+
+    func<{ a: any, b: any }, { a: any, c: any }>('a', 'b');
+>func : Symbol(func, Decl(keyofAndIndexedAccess.ts, 220, 13))
+>a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 222, 10))
+>b : Symbol(b, Decl(keyofAndIndexedAccess.ts, 222, 18))
+>a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 222, 30))
+>c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 222, 38))
+
+    func<{ a: any, b: any }, { a: any, c: any }>('a', 'c');
+>func : Symbol(func, Decl(keyofAndIndexedAccess.ts, 220, 13))
+>a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 223, 10))
+>b : Symbol(b, Decl(keyofAndIndexedAccess.ts, 223, 18))
+>a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 223, 30))
+>c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 223, 38))
+}
+
+function f71(func: <T, U>(x: T, y: U) => Partial<T & U>) {
+>f71 : Symbol(f71, Decl(keyofAndIndexedAccess.ts, 224, 1))
+>func : Symbol(func, Decl(keyofAndIndexedAccess.ts, 226, 13))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 226, 20))
+>U : Symbol(U, Decl(keyofAndIndexedAccess.ts, 226, 22))
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 226, 26))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 226, 20))
+>y : Symbol(y, Decl(keyofAndIndexedAccess.ts, 226, 31))
+>U : Symbol(U, Decl(keyofAndIndexedAccess.ts, 226, 22))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 226, 20))
+>U : Symbol(U, Decl(keyofAndIndexedAccess.ts, 226, 22))
+
+    let x = func({ a: 1, b: "hello" }, { c: true });
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 227, 7))
+>func : Symbol(func, Decl(keyofAndIndexedAccess.ts, 226, 13))
+>a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 227, 18))
+>b : Symbol(b, Decl(keyofAndIndexedAccess.ts, 227, 24))
+>c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 227, 40))
+
+    x.a;  // number | undefined
+>x.a : Symbol(a)
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 227, 7))
+>a : Symbol(a)
+
+    x.b;  // string | undefined
+>x.b : Symbol(b)
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 227, 7))
+>b : Symbol(b)
+
+    x.c;  // boolean | undefined
+>x.c : Symbol(c)
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 227, 7))
+>c : Symbol(c)
+}
+
+function f72(func: <T, U, K extends keyof T | keyof U>(x: T, y: U, k: K) => (T & U)[K]) {
+>f72 : Symbol(f72, Decl(keyofAndIndexedAccess.ts, 231, 1))
+>func : Symbol(func, Decl(keyofAndIndexedAccess.ts, 233, 13))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 233, 20))
+>U : Symbol(U, Decl(keyofAndIndexedAccess.ts, 233, 22))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 233, 25))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 233, 20))
+>U : Symbol(U, Decl(keyofAndIndexedAccess.ts, 233, 22))
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 233, 55))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 233, 20))
+>y : Symbol(y, Decl(keyofAndIndexedAccess.ts, 233, 60))
+>U : Symbol(U, Decl(keyofAndIndexedAccess.ts, 233, 22))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 233, 66))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 233, 25))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 233, 20))
+>U : Symbol(U, Decl(keyofAndIndexedAccess.ts, 233, 22))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 233, 25))
+
+    let a = func({ a: 1, b: "hello" }, { c: true }, 'a');  // number
+>a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 234, 7))
+>func : Symbol(func, Decl(keyofAndIndexedAccess.ts, 233, 13))
+>a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 234, 18))
+>b : Symbol(b, Decl(keyofAndIndexedAccess.ts, 234, 24))
+>c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 234, 40))
+
+    let b = func({ a: 1, b: "hello" }, { c: true }, 'b');  // string
+>b : Symbol(b, Decl(keyofAndIndexedAccess.ts, 235, 7))
+>func : Symbol(func, Decl(keyofAndIndexedAccess.ts, 233, 13))
+>a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 235, 18))
+>b : Symbol(b, Decl(keyofAndIndexedAccess.ts, 235, 24))
+>c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 235, 40))
+
+    let c = func({ a: 1, b: "hello" }, { c: true }, 'c');  // boolean
+>c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 236, 7))
+>func : Symbol(func, Decl(keyofAndIndexedAccess.ts, 233, 13))
+>a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 236, 18))
+>b : Symbol(b, Decl(keyofAndIndexedAccess.ts, 236, 24))
+>c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 236, 40))
+}
+
+function f73(func: <T, U, K extends keyof (T & U)>(x: T, y: U, k: K) => (T & U)[K]) {
+>f73 : Symbol(f73, Decl(keyofAndIndexedAccess.ts, 237, 1))
+>func : Symbol(func, Decl(keyofAndIndexedAccess.ts, 239, 13))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 239, 20))
+>U : Symbol(U, Decl(keyofAndIndexedAccess.ts, 239, 22))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 239, 25))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 239, 20))
+>U : Symbol(U, Decl(keyofAndIndexedAccess.ts, 239, 22))
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 239, 51))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 239, 20))
+>y : Symbol(y, Decl(keyofAndIndexedAccess.ts, 239, 56))
+>U : Symbol(U, Decl(keyofAndIndexedAccess.ts, 239, 22))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 239, 62))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 239, 25))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 239, 20))
+>U : Symbol(U, Decl(keyofAndIndexedAccess.ts, 239, 22))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 239, 25))
+
+    let a = func({ a: 1, b: "hello" }, { c: true }, 'a');  // number
+>a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 240, 7))
+>func : Symbol(func, Decl(keyofAndIndexedAccess.ts, 239, 13))
+>a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 240, 18))
+>b : Symbol(b, Decl(keyofAndIndexedAccess.ts, 240, 24))
+>c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 240, 40))
+
+    let b = func({ a: 1, b: "hello" }, { c: true }, 'b');  // string
+>b : Symbol(b, Decl(keyofAndIndexedAccess.ts, 241, 7))
+>func : Symbol(func, Decl(keyofAndIndexedAccess.ts, 239, 13))
+>a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 241, 18))
+>b : Symbol(b, Decl(keyofAndIndexedAccess.ts, 241, 24))
+>c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 241, 40))
+
+    let c = func({ a: 1, b: "hello" }, { c: true }, 'c');  // boolean
+>c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 242, 7))
+>func : Symbol(func, Decl(keyofAndIndexedAccess.ts, 239, 13))
+>a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 242, 18))
+>b : Symbol(b, Decl(keyofAndIndexedAccess.ts, 242, 24))
+>c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 242, 40))
+}
+
+function f74(func: <T, U, K extends keyof (T | U)>(x: T, y: U, k: K) => (T | U)[K]) {
+>f74 : Symbol(f74, Decl(keyofAndIndexedAccess.ts, 243, 1))
+>func : Symbol(func, Decl(keyofAndIndexedAccess.ts, 245, 13))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 245, 20))
+>U : Symbol(U, Decl(keyofAndIndexedAccess.ts, 245, 22))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 245, 25))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 245, 20))
+>U : Symbol(U, Decl(keyofAndIndexedAccess.ts, 245, 22))
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 245, 51))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 245, 20))
+>y : Symbol(y, Decl(keyofAndIndexedAccess.ts, 245, 56))
+>U : Symbol(U, Decl(keyofAndIndexedAccess.ts, 245, 22))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 245, 62))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 245, 25))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 245, 20))
+>U : Symbol(U, Decl(keyofAndIndexedAccess.ts, 245, 22))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 245, 25))
+
+    let a = func({ a: 1, b: "hello" }, { a: 2, b: true }, 'a');  // number
+>a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 246, 7))
+>func : Symbol(func, Decl(keyofAndIndexedAccess.ts, 245, 13))
+>a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 246, 18))
+>b : Symbol(b, Decl(keyofAndIndexedAccess.ts, 246, 24))
+>a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 246, 40))
+>b : Symbol(b, Decl(keyofAndIndexedAccess.ts, 246, 46))
+
+    let b = func({ a: 1, b: "hello" }, { a: 2, b: true }, 'b');  // string | boolean
+>b : Symbol(b, Decl(keyofAndIndexedAccess.ts, 247, 7))
+>func : Symbol(func, Decl(keyofAndIndexedAccess.ts, 245, 13))
+>a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 247, 18))
+>b : Symbol(b, Decl(keyofAndIndexedAccess.ts, 247, 24))
+>a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 247, 40))
+>b : Symbol(b, Decl(keyofAndIndexedAccess.ts, 247, 46))
+}
+
 // Repros from #12011
 
 class Base {
->Base : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 218, 1))
+>Base : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 248, 1))
 
     get<K extends keyof this>(prop: K) {
->get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 222, 12))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 223, 8))
->prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 223, 30))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 223, 8))
+>get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 252, 12))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 253, 8))
+>prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 253, 30))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 253, 8))
 
         return this[prop];
->this : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 218, 1))
->prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 223, 30))
+>this : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 248, 1))
+>prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 253, 30))
     }
     set<K extends keyof this>(prop: K, value: this[K]) {
->set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 225, 5))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 226, 8))
->prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 226, 30))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 226, 8))
->value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 226, 38))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 226, 8))
+>set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 255, 5))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 256, 8))
+>prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 256, 30))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 256, 8))
+>value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 256, 38))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 256, 8))
 
         this[prop] = value;
->this : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 218, 1))
->prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 226, 30))
->value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 226, 38))
+>this : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 248, 1))
+>prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 256, 30))
+>value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 256, 38))
     }
 }
 
 class Person extends Base {
->Person : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 229, 1))
->Base : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 218, 1))
+>Person : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 259, 1))
+>Base : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 248, 1))
 
     parts: number;
->parts : Symbol(Person.parts, Decl(keyofAndIndexedAccess.ts, 231, 27))
+>parts : Symbol(Person.parts, Decl(keyofAndIndexedAccess.ts, 261, 27))
 
     constructor(parts: number) {
->parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 233, 16))
+>parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 263, 16))
 
         super();
->super : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 218, 1))
+>super : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 248, 1))
 
         this.set("parts", parts);
->this.set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 225, 5))
->this : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 229, 1))
->set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 225, 5))
->parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 233, 16))
+>this.set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 255, 5))
+>this : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 259, 1))
+>set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 255, 5))
+>parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 263, 16))
     }
     getParts() {
->getParts : Symbol(Person.getParts, Decl(keyofAndIndexedAccess.ts, 236, 5))
+>getParts : Symbol(Person.getParts, Decl(keyofAndIndexedAccess.ts, 266, 5))
 
         return this.get("parts")
->this.get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 222, 12))
->this : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 229, 1))
->get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 222, 12))
+>this.get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 252, 12))
+>this : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 259, 1))
+>get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 252, 12))
     }
 }
 
 class OtherPerson {
->OtherPerson : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 240, 1))
+>OtherPerson : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 270, 1))
 
     parts: number;
->parts : Symbol(OtherPerson.parts, Decl(keyofAndIndexedAccess.ts, 242, 19))
+>parts : Symbol(OtherPerson.parts, Decl(keyofAndIndexedAccess.ts, 272, 19))
 
     constructor(parts: number) {
->parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 244, 16))
+>parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 274, 16))
 
         setProperty(this, "parts", parts);
 >setProperty : Symbol(setProperty, Decl(keyofAndIndexedAccess.ts, 81, 1))
->this : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 240, 1))
->parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 244, 16))
+>this : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 270, 1))
+>parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 274, 16))
     }
     getParts() {
->getParts : Symbol(OtherPerson.getParts, Decl(keyofAndIndexedAccess.ts, 246, 5))
+>getParts : Symbol(OtherPerson.getParts, Decl(keyofAndIndexedAccess.ts, 276, 5))
 
         return getProperty(this, "parts")
 >getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 77, 26))
->this : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 240, 1))
+>this : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 270, 1))
     }
 }
 
 // Modified repro from #12544
 
 function path<T, K1 extends keyof T>(obj: T, key1: K1): T[K1];
->path : Symbol(path, Decl(keyofAndIndexedAccess.ts, 250, 1), Decl(keyofAndIndexedAccess.ts, 254, 62), Decl(keyofAndIndexedAccess.ts, 255, 100), Decl(keyofAndIndexedAccess.ts, 256, 142), Decl(keyofAndIndexedAccess.ts, 257, 59))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 254, 14))
->K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 254, 16))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 254, 14))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 254, 37))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 254, 14))
->key1 : Symbol(key1, Decl(keyofAndIndexedAccess.ts, 254, 44))
->K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 254, 16))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 254, 14))
->K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 254, 16))
+>path : Symbol(path, Decl(keyofAndIndexedAccess.ts, 280, 1), Decl(keyofAndIndexedAccess.ts, 284, 62), Decl(keyofAndIndexedAccess.ts, 285, 100), Decl(keyofAndIndexedAccess.ts, 286, 142), Decl(keyofAndIndexedAccess.ts, 287, 59))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 284, 14))
+>K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 284, 16))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 284, 14))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 284, 37))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 284, 14))
+>key1 : Symbol(key1, Decl(keyofAndIndexedAccess.ts, 284, 44))
+>K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 284, 16))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 284, 14))
+>K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 284, 16))
 
 function path<T, K1 extends keyof T, K2 extends keyof T[K1]>(obj: T, key1: K1, key2: K2): T[K1][K2];
->path : Symbol(path, Decl(keyofAndIndexedAccess.ts, 250, 1), Decl(keyofAndIndexedAccess.ts, 254, 62), Decl(keyofAndIndexedAccess.ts, 255, 100), Decl(keyofAndIndexedAccess.ts, 256, 142), Decl(keyofAndIndexedAccess.ts, 257, 59))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 255, 14))
->K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 255, 16))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 255, 14))
->K2 : Symbol(K2, Decl(keyofAndIndexedAccess.ts, 255, 36))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 255, 14))
->K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 255, 16))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 255, 61))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 255, 14))
->key1 : Symbol(key1, Decl(keyofAndIndexedAccess.ts, 255, 68))
->K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 255, 16))
->key2 : Symbol(key2, Decl(keyofAndIndexedAccess.ts, 255, 78))
->K2 : Symbol(K2, Decl(keyofAndIndexedAccess.ts, 255, 36))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 255, 14))
->K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 255, 16))
->K2 : Symbol(K2, Decl(keyofAndIndexedAccess.ts, 255, 36))
+>path : Symbol(path, Decl(keyofAndIndexedAccess.ts, 280, 1), Decl(keyofAndIndexedAccess.ts, 284, 62), Decl(keyofAndIndexedAccess.ts, 285, 100), Decl(keyofAndIndexedAccess.ts, 286, 142), Decl(keyofAndIndexedAccess.ts, 287, 59))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 285, 14))
+>K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 285, 16))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 285, 14))
+>K2 : Symbol(K2, Decl(keyofAndIndexedAccess.ts, 285, 36))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 285, 14))
+>K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 285, 16))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 285, 61))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 285, 14))
+>key1 : Symbol(key1, Decl(keyofAndIndexedAccess.ts, 285, 68))
+>K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 285, 16))
+>key2 : Symbol(key2, Decl(keyofAndIndexedAccess.ts, 285, 78))
+>K2 : Symbol(K2, Decl(keyofAndIndexedAccess.ts, 285, 36))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 285, 14))
+>K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 285, 16))
+>K2 : Symbol(K2, Decl(keyofAndIndexedAccess.ts, 285, 36))
 
 function path<T, K1 extends keyof T, K2 extends keyof T[K1], K3 extends keyof T[K1][K2]>(obj: T, key1: K1, key2: K2, key3: K3): T[K1][K2][K3];
->path : Symbol(path, Decl(keyofAndIndexedAccess.ts, 250, 1), Decl(keyofAndIndexedAccess.ts, 254, 62), Decl(keyofAndIndexedAccess.ts, 255, 100), Decl(keyofAndIndexedAccess.ts, 256, 142), Decl(keyofAndIndexedAccess.ts, 257, 59))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 256, 14))
->K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 256, 16))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 256, 14))
->K2 : Symbol(K2, Decl(keyofAndIndexedAccess.ts, 256, 36))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 256, 14))
->K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 256, 16))
->K3 : Symbol(K3, Decl(keyofAndIndexedAccess.ts, 256, 60))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 256, 14))
->K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 256, 16))
->K2 : Symbol(K2, Decl(keyofAndIndexedAccess.ts, 256, 36))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 256, 89))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 256, 14))
->key1 : Symbol(key1, Decl(keyofAndIndexedAccess.ts, 256, 96))
->K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 256, 16))
->key2 : Symbol(key2, Decl(keyofAndIndexedAccess.ts, 256, 106))
->K2 : Symbol(K2, Decl(keyofAndIndexedAccess.ts, 256, 36))
->key3 : Symbol(key3, Decl(keyofAndIndexedAccess.ts, 256, 116))
->K3 : Symbol(K3, Decl(keyofAndIndexedAccess.ts, 256, 60))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 256, 14))
->K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 256, 16))
->K2 : Symbol(K2, Decl(keyofAndIndexedAccess.ts, 256, 36))
->K3 : Symbol(K3, Decl(keyofAndIndexedAccess.ts, 256, 60))
+>path : Symbol(path, Decl(keyofAndIndexedAccess.ts, 280, 1), Decl(keyofAndIndexedAccess.ts, 284, 62), Decl(keyofAndIndexedAccess.ts, 285, 100), Decl(keyofAndIndexedAccess.ts, 286, 142), Decl(keyofAndIndexedAccess.ts, 287, 59))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 286, 14))
+>K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 286, 16))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 286, 14))
+>K2 : Symbol(K2, Decl(keyofAndIndexedAccess.ts, 286, 36))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 286, 14))
+>K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 286, 16))
+>K3 : Symbol(K3, Decl(keyofAndIndexedAccess.ts, 286, 60))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 286, 14))
+>K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 286, 16))
+>K2 : Symbol(K2, Decl(keyofAndIndexedAccess.ts, 286, 36))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 286, 89))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 286, 14))
+>key1 : Symbol(key1, Decl(keyofAndIndexedAccess.ts, 286, 96))
+>K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 286, 16))
+>key2 : Symbol(key2, Decl(keyofAndIndexedAccess.ts, 286, 106))
+>K2 : Symbol(K2, Decl(keyofAndIndexedAccess.ts, 286, 36))
+>key3 : Symbol(key3, Decl(keyofAndIndexedAccess.ts, 286, 116))
+>K3 : Symbol(K3, Decl(keyofAndIndexedAccess.ts, 286, 60))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 286, 14))
+>K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 286, 16))
+>K2 : Symbol(K2, Decl(keyofAndIndexedAccess.ts, 286, 36))
+>K3 : Symbol(K3, Decl(keyofAndIndexedAccess.ts, 286, 60))
 
 function path(obj: any, ...keys: (string | number)[]): any;
->path : Symbol(path, Decl(keyofAndIndexedAccess.ts, 250, 1), Decl(keyofAndIndexedAccess.ts, 254, 62), Decl(keyofAndIndexedAccess.ts, 255, 100), Decl(keyofAndIndexedAccess.ts, 256, 142), Decl(keyofAndIndexedAccess.ts, 257, 59))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 257, 14))
->keys : Symbol(keys, Decl(keyofAndIndexedAccess.ts, 257, 23))
+>path : Symbol(path, Decl(keyofAndIndexedAccess.ts, 280, 1), Decl(keyofAndIndexedAccess.ts, 284, 62), Decl(keyofAndIndexedAccess.ts, 285, 100), Decl(keyofAndIndexedAccess.ts, 286, 142), Decl(keyofAndIndexedAccess.ts, 287, 59))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 287, 14))
+>keys : Symbol(keys, Decl(keyofAndIndexedAccess.ts, 287, 23))
 
 function path(obj: any, ...keys: (string | number)[]): any {
->path : Symbol(path, Decl(keyofAndIndexedAccess.ts, 250, 1), Decl(keyofAndIndexedAccess.ts, 254, 62), Decl(keyofAndIndexedAccess.ts, 255, 100), Decl(keyofAndIndexedAccess.ts, 256, 142), Decl(keyofAndIndexedAccess.ts, 257, 59))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 258, 14))
->keys : Symbol(keys, Decl(keyofAndIndexedAccess.ts, 258, 23))
+>path : Symbol(path, Decl(keyofAndIndexedAccess.ts, 280, 1), Decl(keyofAndIndexedAccess.ts, 284, 62), Decl(keyofAndIndexedAccess.ts, 285, 100), Decl(keyofAndIndexedAccess.ts, 286, 142), Decl(keyofAndIndexedAccess.ts, 287, 59))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 288, 14))
+>keys : Symbol(keys, Decl(keyofAndIndexedAccess.ts, 288, 23))
 
     let result = obj;
->result : Symbol(result, Decl(keyofAndIndexedAccess.ts, 259, 7))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 258, 14))
+>result : Symbol(result, Decl(keyofAndIndexedAccess.ts, 289, 7))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 288, 14))
 
     for (let k of keys) {
->k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 260, 12))
->keys : Symbol(keys, Decl(keyofAndIndexedAccess.ts, 258, 23))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 290, 12))
+>keys : Symbol(keys, Decl(keyofAndIndexedAccess.ts, 288, 23))
 
         result = result[k];
->result : Symbol(result, Decl(keyofAndIndexedAccess.ts, 259, 7))
->result : Symbol(result, Decl(keyofAndIndexedAccess.ts, 259, 7))
->k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 260, 12))
+>result : Symbol(result, Decl(keyofAndIndexedAccess.ts, 289, 7))
+>result : Symbol(result, Decl(keyofAndIndexedAccess.ts, 289, 7))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 290, 12))
     }
     return result;
->result : Symbol(result, Decl(keyofAndIndexedAccess.ts, 259, 7))
+>result : Symbol(result, Decl(keyofAndIndexedAccess.ts, 289, 7))
 }
 
 type Thing = {
->Thing : Symbol(Thing, Decl(keyofAndIndexedAccess.ts, 264, 1))
+>Thing : Symbol(Thing, Decl(keyofAndIndexedAccess.ts, 294, 1))
 
     a: { x: number, y: string },
->a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 266, 14))
->x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 267, 8))
->y : Symbol(y, Decl(keyofAndIndexedAccess.ts, 267, 19))
+>a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 296, 14))
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 297, 8))
+>y : Symbol(y, Decl(keyofAndIndexedAccess.ts, 297, 19))
 
     b: boolean
->b : Symbol(b, Decl(keyofAndIndexedAccess.ts, 267, 32))
+>b : Symbol(b, Decl(keyofAndIndexedAccess.ts, 297, 32))
 
 };
 
 
 function f1(thing: Thing) {
->f1 : Symbol(f1, Decl(keyofAndIndexedAccess.ts, 269, 2))
->thing : Symbol(thing, Decl(keyofAndIndexedAccess.ts, 272, 12))
->Thing : Symbol(Thing, Decl(keyofAndIndexedAccess.ts, 264, 1))
+>f1 : Symbol(f1, Decl(keyofAndIndexedAccess.ts, 299, 2))
+>thing : Symbol(thing, Decl(keyofAndIndexedAccess.ts, 302, 12))
+>Thing : Symbol(Thing, Decl(keyofAndIndexedAccess.ts, 294, 1))
 
     let x1 = path(thing, 'a');  // { x: number, y: string }
->x1 : Symbol(x1, Decl(keyofAndIndexedAccess.ts, 273, 7))
->path : Symbol(path, Decl(keyofAndIndexedAccess.ts, 250, 1), Decl(keyofAndIndexedAccess.ts, 254, 62), Decl(keyofAndIndexedAccess.ts, 255, 100), Decl(keyofAndIndexedAccess.ts, 256, 142), Decl(keyofAndIndexedAccess.ts, 257, 59))
->thing : Symbol(thing, Decl(keyofAndIndexedAccess.ts, 272, 12))
+>x1 : Symbol(x1, Decl(keyofAndIndexedAccess.ts, 303, 7))
+>path : Symbol(path, Decl(keyofAndIndexedAccess.ts, 280, 1), Decl(keyofAndIndexedAccess.ts, 284, 62), Decl(keyofAndIndexedAccess.ts, 285, 100), Decl(keyofAndIndexedAccess.ts, 286, 142), Decl(keyofAndIndexedAccess.ts, 287, 59))
+>thing : Symbol(thing, Decl(keyofAndIndexedAccess.ts, 302, 12))
 
     let x2 = path(thing, 'a', 'y');  // string
->x2 : Symbol(x2, Decl(keyofAndIndexedAccess.ts, 274, 7))
->path : Symbol(path, Decl(keyofAndIndexedAccess.ts, 250, 1), Decl(keyofAndIndexedAccess.ts, 254, 62), Decl(keyofAndIndexedAccess.ts, 255, 100), Decl(keyofAndIndexedAccess.ts, 256, 142), Decl(keyofAndIndexedAccess.ts, 257, 59))
->thing : Symbol(thing, Decl(keyofAndIndexedAccess.ts, 272, 12))
+>x2 : Symbol(x2, Decl(keyofAndIndexedAccess.ts, 304, 7))
+>path : Symbol(path, Decl(keyofAndIndexedAccess.ts, 280, 1), Decl(keyofAndIndexedAccess.ts, 284, 62), Decl(keyofAndIndexedAccess.ts, 285, 100), Decl(keyofAndIndexedAccess.ts, 286, 142), Decl(keyofAndIndexedAccess.ts, 287, 59))
+>thing : Symbol(thing, Decl(keyofAndIndexedAccess.ts, 302, 12))
 
     let x3 = path(thing, 'b');  // boolean
->x3 : Symbol(x3, Decl(keyofAndIndexedAccess.ts, 275, 7))
->path : Symbol(path, Decl(keyofAndIndexedAccess.ts, 250, 1), Decl(keyofAndIndexedAccess.ts, 254, 62), Decl(keyofAndIndexedAccess.ts, 255, 100), Decl(keyofAndIndexedAccess.ts, 256, 142), Decl(keyofAndIndexedAccess.ts, 257, 59))
->thing : Symbol(thing, Decl(keyofAndIndexedAccess.ts, 272, 12))
+>x3 : Symbol(x3, Decl(keyofAndIndexedAccess.ts, 305, 7))
+>path : Symbol(path, Decl(keyofAndIndexedAccess.ts, 280, 1), Decl(keyofAndIndexedAccess.ts, 284, 62), Decl(keyofAndIndexedAccess.ts, 285, 100), Decl(keyofAndIndexedAccess.ts, 286, 142), Decl(keyofAndIndexedAccess.ts, 287, 59))
+>thing : Symbol(thing, Decl(keyofAndIndexedAccess.ts, 302, 12))
 
     let x4 = path(thing, ...['a', 'x']);  // any
->x4 : Symbol(x4, Decl(keyofAndIndexedAccess.ts, 276, 7))
->path : Symbol(path, Decl(keyofAndIndexedAccess.ts, 250, 1), Decl(keyofAndIndexedAccess.ts, 254, 62), Decl(keyofAndIndexedAccess.ts, 255, 100), Decl(keyofAndIndexedAccess.ts, 256, 142), Decl(keyofAndIndexedAccess.ts, 257, 59))
->thing : Symbol(thing, Decl(keyofAndIndexedAccess.ts, 272, 12))
+>x4 : Symbol(x4, Decl(keyofAndIndexedAccess.ts, 306, 7))
+>path : Symbol(path, Decl(keyofAndIndexedAccess.ts, 280, 1), Decl(keyofAndIndexedAccess.ts, 284, 62), Decl(keyofAndIndexedAccess.ts, 285, 100), Decl(keyofAndIndexedAccess.ts, 286, 142), Decl(keyofAndIndexedAccess.ts, 287, 59))
+>thing : Symbol(thing, Decl(keyofAndIndexedAccess.ts, 302, 12))
 }
 
 // Repro from comment in #12114
 
 const assignTo2 = <T, K1 extends keyof T, K2 extends keyof T[K1]>(object: T, key1: K1, key2: K2) =>
->assignTo2 : Symbol(assignTo2, Decl(keyofAndIndexedAccess.ts, 281, 5))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 281, 19))
->K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 281, 21))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 281, 19))
->K2 : Symbol(K2, Decl(keyofAndIndexedAccess.ts, 281, 41))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 281, 19))
->K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 281, 21))
->object : Symbol(object, Decl(keyofAndIndexedAccess.ts, 281, 66))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 281, 19))
->key1 : Symbol(key1, Decl(keyofAndIndexedAccess.ts, 281, 76))
->K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 281, 21))
->key2 : Symbol(key2, Decl(keyofAndIndexedAccess.ts, 281, 86))
->K2 : Symbol(K2, Decl(keyofAndIndexedAccess.ts, 281, 41))
+>assignTo2 : Symbol(assignTo2, Decl(keyofAndIndexedAccess.ts, 311, 5))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 311, 19))
+>K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 311, 21))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 311, 19))
+>K2 : Symbol(K2, Decl(keyofAndIndexedAccess.ts, 311, 41))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 311, 19))
+>K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 311, 21))
+>object : Symbol(object, Decl(keyofAndIndexedAccess.ts, 311, 66))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 311, 19))
+>key1 : Symbol(key1, Decl(keyofAndIndexedAccess.ts, 311, 76))
+>K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 311, 21))
+>key2 : Symbol(key2, Decl(keyofAndIndexedAccess.ts, 311, 86))
+>K2 : Symbol(K2, Decl(keyofAndIndexedAccess.ts, 311, 41))
 
     (value: T[K1][K2]) => object[key1][key2] = value;
->value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 282, 5))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 281, 19))
->K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 281, 21))
->K2 : Symbol(K2, Decl(keyofAndIndexedAccess.ts, 281, 41))
->object : Symbol(object, Decl(keyofAndIndexedAccess.ts, 281, 66))
->key1 : Symbol(key1, Decl(keyofAndIndexedAccess.ts, 281, 76))
->key2 : Symbol(key2, Decl(keyofAndIndexedAccess.ts, 281, 86))
->value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 282, 5))
+>value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 312, 5))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 311, 19))
+>K1 : Symbol(K1, Decl(keyofAndIndexedAccess.ts, 311, 21))
+>K2 : Symbol(K2, Decl(keyofAndIndexedAccess.ts, 311, 41))
+>object : Symbol(object, Decl(keyofAndIndexedAccess.ts, 311, 66))
+>key1 : Symbol(key1, Decl(keyofAndIndexedAccess.ts, 311, 76))
+>key2 : Symbol(key2, Decl(keyofAndIndexedAccess.ts, 311, 86))
+>value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 312, 5))
 
 // Modified repro from #12573
 
 declare function one<T>(handler: (t: T) => void): T
->one : Symbol(one, Decl(keyofAndIndexedAccess.ts, 282, 53))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 286, 21))
->handler : Symbol(handler, Decl(keyofAndIndexedAccess.ts, 286, 24))
->t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 286, 34))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 286, 21))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 286, 21))
+>one : Symbol(one, Decl(keyofAndIndexedAccess.ts, 312, 53))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 316, 21))
+>handler : Symbol(handler, Decl(keyofAndIndexedAccess.ts, 316, 24))
+>t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 316, 34))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 316, 21))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 316, 21))
 
 var empty = one(() => {}) // inferred as {}, expected
->empty : Symbol(empty, Decl(keyofAndIndexedAccess.ts, 287, 3))
->one : Symbol(one, Decl(keyofAndIndexedAccess.ts, 282, 53))
+>empty : Symbol(empty, Decl(keyofAndIndexedAccess.ts, 317, 3))
+>one : Symbol(one, Decl(keyofAndIndexedAccess.ts, 312, 53))
 
 type Handlers<T> = { [K in keyof T]: (t: T[K]) => void }
->Handlers : Symbol(Handlers, Decl(keyofAndIndexedAccess.ts, 287, 25))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 289, 14))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 289, 22))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 289, 14))
->t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 289, 38))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 289, 14))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 289, 22))
+>Handlers : Symbol(Handlers, Decl(keyofAndIndexedAccess.ts, 317, 25))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 319, 14))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 319, 22))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 319, 14))
+>t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 319, 38))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 319, 14))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 319, 22))
 
 declare function on<T>(handlerHash: Handlers<T>): T
->on : Symbol(on, Decl(keyofAndIndexedAccess.ts, 289, 56))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 290, 20))
->handlerHash : Symbol(handlerHash, Decl(keyofAndIndexedAccess.ts, 290, 23))
->Handlers : Symbol(Handlers, Decl(keyofAndIndexedAccess.ts, 287, 25))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 290, 20))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 290, 20))
+>on : Symbol(on, Decl(keyofAndIndexedAccess.ts, 319, 56))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 320, 20))
+>handlerHash : Symbol(handlerHash, Decl(keyofAndIndexedAccess.ts, 320, 23))
+>Handlers : Symbol(Handlers, Decl(keyofAndIndexedAccess.ts, 317, 25))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 320, 20))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 320, 20))
 
 var hashOfEmpty1 = on({ test: () => {} });  // {}
->hashOfEmpty1 : Symbol(hashOfEmpty1, Decl(keyofAndIndexedAccess.ts, 291, 3))
->on : Symbol(on, Decl(keyofAndIndexedAccess.ts, 289, 56))
->test : Symbol(test, Decl(keyofAndIndexedAccess.ts, 291, 23))
+>hashOfEmpty1 : Symbol(hashOfEmpty1, Decl(keyofAndIndexedAccess.ts, 321, 3))
+>on : Symbol(on, Decl(keyofAndIndexedAccess.ts, 319, 56))
+>test : Symbol(test, Decl(keyofAndIndexedAccess.ts, 321, 23))
 
 var hashOfEmpty2 = on({ test: (x: boolean) => {} });  // { test: boolean }
->hashOfEmpty2 : Symbol(hashOfEmpty2, Decl(keyofAndIndexedAccess.ts, 292, 3))
->on : Symbol(on, Decl(keyofAndIndexedAccess.ts, 289, 56))
->test : Symbol(test, Decl(keyofAndIndexedAccess.ts, 292, 23))
->x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 292, 31))
+>hashOfEmpty2 : Symbol(hashOfEmpty2, Decl(keyofAndIndexedAccess.ts, 322, 3))
+>on : Symbol(on, Decl(keyofAndIndexedAccess.ts, 319, 56))
+>test : Symbol(test, Decl(keyofAndIndexedAccess.ts, 322, 23))
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 322, 31))
 
+// Repro from #12624
+
+interface Options1<Data, Computed> {
+>Options1 : Symbol(Options1, Decl(keyofAndIndexedAccess.ts, 322, 52))
+>Data : Symbol(Data, Decl(keyofAndIndexedAccess.ts, 326, 19))
+>Computed : Symbol(Computed, Decl(keyofAndIndexedAccess.ts, 326, 24))
+
+    data?: Data
+>data : Symbol(Options1.data, Decl(keyofAndIndexedAccess.ts, 326, 36))
+>Data : Symbol(Data, Decl(keyofAndIndexedAccess.ts, 326, 19))
+
+    computed?: Computed;
+>computed : Symbol(Options1.computed, Decl(keyofAndIndexedAccess.ts, 327, 15))
+>Computed : Symbol(Computed, Decl(keyofAndIndexedAccess.ts, 326, 24))
+}
+
+declare class Component1<Data, Computed> {
+>Component1 : Symbol(Component1, Decl(keyofAndIndexedAccess.ts, 329, 1))
+>Data : Symbol(Data, Decl(keyofAndIndexedAccess.ts, 331, 25))
+>Computed : Symbol(Computed, Decl(keyofAndIndexedAccess.ts, 331, 30))
+
+    constructor(options: Options1<Data, Computed>);
+>options : Symbol(options, Decl(keyofAndIndexedAccess.ts, 332, 16))
+>Options1 : Symbol(Options1, Decl(keyofAndIndexedAccess.ts, 322, 52))
+>Data : Symbol(Data, Decl(keyofAndIndexedAccess.ts, 331, 25))
+>Computed : Symbol(Computed, Decl(keyofAndIndexedAccess.ts, 331, 30))
+
+    get<K extends keyof (Data & Computed)>(key: K): (Data & Computed)[K];
+>get : Symbol(Component1.get, Decl(keyofAndIndexedAccess.ts, 332, 51))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 333, 8))
+>Data : Symbol(Data, Decl(keyofAndIndexedAccess.ts, 331, 25))
+>Computed : Symbol(Computed, Decl(keyofAndIndexedAccess.ts, 331, 30))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 333, 43))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 333, 8))
+>Data : Symbol(Data, Decl(keyofAndIndexedAccess.ts, 331, 25))
+>Computed : Symbol(Computed, Decl(keyofAndIndexedAccess.ts, 331, 30))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 333, 8))
+}
+
+let c1 = new Component1({
+>c1 : Symbol(c1, Decl(keyofAndIndexedAccess.ts, 336, 3))
+>Component1 : Symbol(Component1, Decl(keyofAndIndexedAccess.ts, 329, 1))
+
+    data: {
+>data : Symbol(data, Decl(keyofAndIndexedAccess.ts, 336, 25))
+
+        hello: ""
+>hello : Symbol(hello, Decl(keyofAndIndexedAccess.ts, 337, 11))
+    }
+});
+
+c1.get("hello");
+>c1.get : Symbol(Component1.get, Decl(keyofAndIndexedAccess.ts, 332, 51))
+>c1 : Symbol(c1, Decl(keyofAndIndexedAccess.ts, 336, 3))
+>get : Symbol(Component1.get, Decl(keyofAndIndexedAccess.ts, 332, 51))
+
+// Repro from #12625
+
+interface Options2<Data, Computed> {
+>Options2 : Symbol(Options2, Decl(keyofAndIndexedAccess.ts, 342, 16))
+>Data : Symbol(Data, Decl(keyofAndIndexedAccess.ts, 346, 19))
+>Computed : Symbol(Computed, Decl(keyofAndIndexedAccess.ts, 346, 24))
+
+    data?: Data
+>data : Symbol(Options2.data, Decl(keyofAndIndexedAccess.ts, 346, 36))
+>Data : Symbol(Data, Decl(keyofAndIndexedAccess.ts, 346, 19))
+
+    computed?: Computed;
+>computed : Symbol(Options2.computed, Decl(keyofAndIndexedAccess.ts, 347, 15))
+>Computed : Symbol(Computed, Decl(keyofAndIndexedAccess.ts, 346, 24))
+}
+
+declare class Component2<Data, Computed> {
+>Component2 : Symbol(Component2, Decl(keyofAndIndexedAccess.ts, 349, 1))
+>Data : Symbol(Data, Decl(keyofAndIndexedAccess.ts, 351, 25))
+>Computed : Symbol(Computed, Decl(keyofAndIndexedAccess.ts, 351, 30))
+
+    constructor(options: Options2<Data, Computed>);
+>options : Symbol(options, Decl(keyofAndIndexedAccess.ts, 352, 16))
+>Options2 : Symbol(Options2, Decl(keyofAndIndexedAccess.ts, 342, 16))
+>Data : Symbol(Data, Decl(keyofAndIndexedAccess.ts, 351, 25))
+>Computed : Symbol(Computed, Decl(keyofAndIndexedAccess.ts, 351, 30))
+
+    get<K extends keyof Data | keyof Computed>(key: K): (Data & Computed)[K];
+>get : Symbol(Component2.get, Decl(keyofAndIndexedAccess.ts, 352, 51))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 353, 8))
+>Data : Symbol(Data, Decl(keyofAndIndexedAccess.ts, 351, 25))
+>Computed : Symbol(Computed, Decl(keyofAndIndexedAccess.ts, 351, 30))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 353, 47))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 353, 8))
+>Data : Symbol(Data, Decl(keyofAndIndexedAccess.ts, 351, 25))
+>Computed : Symbol(Computed, Decl(keyofAndIndexedAccess.ts, 351, 30))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 353, 8))
+}
diff --git a/tests/baselines/reference/keyofAndIndexedAccess.types b/tests/baselines/reference/keyofAndIndexedAccess.types
index 9e1e7d4b4d1..7cd4b434af6 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.types
+++ b/tests/baselines/reference/keyofAndIndexedAccess.types
@@ -780,8 +780,8 @@ function f52<T>(obj: { [x: string]: boolean }, k: keyof T, s: string, n: number)
 >n : number
 
     const x3 = obj[k];
->x3 : boolean
->obj[k] : boolean
+>x3 : { [x: string]: boolean; }[keyof T]
+>obj[k] : { [x: string]: boolean; }[keyof T]
 >obj : { [x: string]: boolean; }
 >k : keyof T
 }
@@ -888,6 +888,264 @@ function f60<T>(source: T, target: T) {
     }
 }
 
+function f70(func: <T, U>(k1: keyof (T | U), k2: keyof (T & U)) => void) {
+>f70 : (func: <T, U>(k1: keyof (T | U), k2: keyof (T & U)) => void) => void
+>func : <T, U>(k1: keyof (T | U), k2: keyof (T & U)) => void
+>T : T
+>U : U
+>k1 : keyof (T | U)
+>T : T
+>U : U
+>k2 : keyof (T & U)
+>T : T
+>U : U
+
+    func<{ a: any, b: any }, { a: any, c: any }>('a', 'a');
+>func<{ a: any, b: any }, { a: any, c: any }>('a', 'a') : void
+>func : <T, U>(k1: keyof (T | U), k2: keyof (T & U)) => void
+>a : any
+>b : any
+>a : any
+>c : any
+>'a' : "a"
+>'a' : "a"
+
+    func<{ a: any, b: any }, { a: any, c: any }>('a', 'b');
+>func<{ a: any, b: any }, { a: any, c: any }>('a', 'b') : void
+>func : <T, U>(k1: keyof (T | U), k2: keyof (T & U)) => void
+>a : any
+>b : any
+>a : any
+>c : any
+>'a' : "a"
+>'b' : "b"
+
+    func<{ a: any, b: any }, { a: any, c: any }>('a', 'c');
+>func<{ a: any, b: any }, { a: any, c: any }>('a', 'c') : void
+>func : <T, U>(k1: keyof (T | U), k2: keyof (T & U)) => void
+>a : any
+>b : any
+>a : any
+>c : any
+>'a' : "a"
+>'c' : "c"
+}
+
+function f71(func: <T, U>(x: T, y: U) => Partial<T & U>) {
+>f71 : (func: <T, U>(x: T, y: U) => Partial<T & U>) => void
+>func : <T, U>(x: T, y: U) => Partial<T & U>
+>T : T
+>U : U
+>x : T
+>T : T
+>y : U
+>U : U
+>Partial : Partial<T>
+>T : T
+>U : U
+
+    let x = func({ a: 1, b: "hello" }, { c: true });
+>x : Partial<{ a: number; b: string; } & { c: boolean; }>
+>func({ a: 1, b: "hello" }, { c: true }) : Partial<{ a: number; b: string; } & { c: boolean; }>
+>func : <T, U>(x: T, y: U) => Partial<T & U>
+>{ a: 1, b: "hello" } : { a: number; b: string; }
+>a : number
+>1 : 1
+>b : string
+>"hello" : "hello"
+>{ c: true } : { c: true; }
+>c : boolean
+>true : true
+
+    x.a;  // number | undefined
+>x.a : number | undefined
+>x : Partial<{ a: number; b: string; } & { c: boolean; }>
+>a : number | undefined
+
+    x.b;  // string | undefined
+>x.b : string | undefined
+>x : Partial<{ a: number; b: string; } & { c: boolean; }>
+>b : string | undefined
+
+    x.c;  // boolean | undefined
+>x.c : boolean | undefined
+>x : Partial<{ a: number; b: string; } & { c: boolean; }>
+>c : boolean | undefined
+}
+
+function f72(func: <T, U, K extends keyof T | keyof U>(x: T, y: U, k: K) => (T & U)[K]) {
+>f72 : (func: <T, U, K extends keyof T | keyof U>(x: T, y: U, k: K) => (T & U)[K]) => void
+>func : <T, U, K extends keyof T | keyof U>(x: T, y: U, k: K) => (T & U)[K]
+>T : T
+>U : U
+>K : K
+>T : T
+>U : U
+>x : T
+>T : T
+>y : U
+>U : U
+>k : K
+>K : K
+>T : T
+>U : U
+>K : K
+
+    let a = func({ a: 1, b: "hello" }, { c: true }, 'a');  // number
+>a : number
+>func({ a: 1, b: "hello" }, { c: true }, 'a') : number
+>func : <T, U, K extends keyof T | keyof U>(x: T, y: U, k: K) => (T & U)[K]
+>{ a: 1, b: "hello" } : { a: number; b: string; }
+>a : number
+>1 : 1
+>b : string
+>"hello" : "hello"
+>{ c: true } : { c: true; }
+>c : boolean
+>true : true
+>'a' : "a"
+
+    let b = func({ a: 1, b: "hello" }, { c: true }, 'b');  // string
+>b : string
+>func({ a: 1, b: "hello" }, { c: true }, 'b') : string
+>func : <T, U, K extends keyof T | keyof U>(x: T, y: U, k: K) => (T & U)[K]
+>{ a: 1, b: "hello" } : { a: number; b: string; }
+>a : number
+>1 : 1
+>b : string
+>"hello" : "hello"
+>{ c: true } : { c: true; }
+>c : boolean
+>true : true
+>'b' : "b"
+
+    let c = func({ a: 1, b: "hello" }, { c: true }, 'c');  // boolean
+>c : boolean
+>func({ a: 1, b: "hello" }, { c: true }, 'c') : boolean
+>func : <T, U, K extends keyof T | keyof U>(x: T, y: U, k: K) => (T & U)[K]
+>{ a: 1, b: "hello" } : { a: number; b: string; }
+>a : number
+>1 : 1
+>b : string
+>"hello" : "hello"
+>{ c: true } : { c: true; }
+>c : boolean
+>true : true
+>'c' : "c"
+}
+
+function f73(func: <T, U, K extends keyof (T & U)>(x: T, y: U, k: K) => (T & U)[K]) {
+>f73 : (func: <T, U, K extends keyof (T & U)>(x: T, y: U, k: K) => (T & U)[K]) => void
+>func : <T, U, K extends keyof (T & U)>(x: T, y: U, k: K) => (T & U)[K]
+>T : T
+>U : U
+>K : K
+>T : T
+>U : U
+>x : T
+>T : T
+>y : U
+>U : U
+>k : K
+>K : K
+>T : T
+>U : U
+>K : K
+
+    let a = func({ a: 1, b: "hello" }, { c: true }, 'a');  // number
+>a : number
+>func({ a: 1, b: "hello" }, { c: true }, 'a') : number
+>func : <T, U, K extends keyof (T & U)>(x: T, y: U, k: K) => (T & U)[K]
+>{ a: 1, b: "hello" } : { a: number; b: string; }
+>a : number
+>1 : 1
+>b : string
+>"hello" : "hello"
+>{ c: true } : { c: true; }
+>c : boolean
+>true : true
+>'a' : "a"
+
+    let b = func({ a: 1, b: "hello" }, { c: true }, 'b');  // string
+>b : string
+>func({ a: 1, b: "hello" }, { c: true }, 'b') : string
+>func : <T, U, K extends keyof (T & U)>(x: T, y: U, k: K) => (T & U)[K]
+>{ a: 1, b: "hello" } : { a: number; b: string; }
+>a : number
+>1 : 1
+>b : string
+>"hello" : "hello"
+>{ c: true } : { c: true; }
+>c : boolean
+>true : true
+>'b' : "b"
+
+    let c = func({ a: 1, b: "hello" }, { c: true }, 'c');  // boolean
+>c : boolean
+>func({ a: 1, b: "hello" }, { c: true }, 'c') : boolean
+>func : <T, U, K extends keyof (T & U)>(x: T, y: U, k: K) => (T & U)[K]
+>{ a: 1, b: "hello" } : { a: number; b: string; }
+>a : number
+>1 : 1
+>b : string
+>"hello" : "hello"
+>{ c: true } : { c: true; }
+>c : boolean
+>true : true
+>'c' : "c"
+}
+
+function f74(func: <T, U, K extends keyof (T | U)>(x: T, y: U, k: K) => (T | U)[K]) {
+>f74 : (func: <T, U, K extends keyof (T | U)>(x: T, y: U, k: K) => (T | U)[K]) => void
+>func : <T, U, K extends keyof (T | U)>(x: T, y: U, k: K) => (T | U)[K]
+>T : T
+>U : U
+>K : K
+>T : T
+>U : U
+>x : T
+>T : T
+>y : U
+>U : U
+>k : K
+>K : K
+>T : T
+>U : U
+>K : K
+
+    let a = func({ a: 1, b: "hello" }, { a: 2, b: true }, 'a');  // number
+>a : number
+>func({ a: 1, b: "hello" }, { a: 2, b: true }, 'a') : number
+>func : <T, U, K extends keyof (T | U)>(x: T, y: U, k: K) => (T | U)[K]
+>{ a: 1, b: "hello" } : { a: number; b: string; }
+>a : number
+>1 : 1
+>b : string
+>"hello" : "hello"
+>{ a: 2, b: true } : { a: number; b: true; }
+>a : number
+>2 : 2
+>b : boolean
+>true : true
+>'a' : "a"
+
+    let b = func({ a: 1, b: "hello" }, { a: 2, b: true }, 'b');  // string | boolean
+>b : string | boolean
+>func({ a: 1, b: "hello" }, { a: 2, b: true }, 'b') : string | boolean
+>func : <T, U, K extends keyof (T | U)>(x: T, y: U, k: K) => (T | U)[K]
+>{ a: 1, b: "hello" } : { a: number; b: string; }
+>a : number
+>1 : 1
+>b : string
+>"hello" : "hello"
+>{ a: 2, b: true } : { a: number; b: true; }
+>a : number
+>2 : 2
+>b : boolean
+>true : true
+>'b' : "b"
+}
+
 // Repros from #12011
 
 class Base {
@@ -1202,3 +1460,103 @@ var hashOfEmpty2 = on({ test: (x: boolean) => {} });  // { test: boolean }
 >(x: boolean) => {} : (x: boolean) => void
 >x : boolean
 
+// Repro from #12624
+
+interface Options1<Data, Computed> {
+>Options1 : Options1<Data, Computed>
+>Data : Data
+>Computed : Computed
+
+    data?: Data
+>data : Data | undefined
+>Data : Data
+
+    computed?: Computed;
+>computed : Computed | undefined
+>Computed : Computed
+}
+
+declare class Component1<Data, Computed> {
+>Component1 : Component1<Data, Computed>
+>Data : Data
+>Computed : Computed
+
+    constructor(options: Options1<Data, Computed>);
+>options : Options1<Data, Computed>
+>Options1 : Options1<Data, Computed>
+>Data : Data
+>Computed : Computed
+
+    get<K extends keyof (Data & Computed)>(key: K): (Data & Computed)[K];
+>get : <K extends keyof (Data & Computed)>(key: K) => (Data & Computed)[K]
+>K : K
+>Data : Data
+>Computed : Computed
+>key : K
+>K : K
+>Data : Data
+>Computed : Computed
+>K : K
+}
+
+let c1 = new Component1({
+>c1 : Component1<{ hello: string; }, {}>
+>new Component1({    data: {        hello: ""    }}) : Component1<{ hello: string; }, {}>
+>Component1 : typeof Component1
+>{    data: {        hello: ""    }} : { data: { hello: string; }; }
+
+    data: {
+>data : { hello: string; }
+>{        hello: ""    } : { hello: string; }
+
+        hello: ""
+>hello : string
+>"" : ""
+    }
+});
+
+c1.get("hello");
+>c1.get("hello") : string
+>c1.get : <K extends "hello">(key: K) => ({ hello: string; } & {})[K]
+>c1 : Component1<{ hello: string; }, {}>
+>get : <K extends "hello">(key: K) => ({ hello: string; } & {})[K]
+>"hello" : "hello"
+
+// Repro from #12625
+
+interface Options2<Data, Computed> {
+>Options2 : Options2<Data, Computed>
+>Data : Data
+>Computed : Computed
+
+    data?: Data
+>data : Data | undefined
+>Data : Data
+
+    computed?: Computed;
+>computed : Computed | undefined
+>Computed : Computed
+}
+
+declare class Component2<Data, Computed> {
+>Component2 : Component2<Data, Computed>
+>Data : Data
+>Computed : Computed
+
+    constructor(options: Options2<Data, Computed>);
+>options : Options2<Data, Computed>
+>Options2 : Options2<Data, Computed>
+>Data : Data
+>Computed : Computed
+
+    get<K extends keyof Data | keyof Computed>(key: K): (Data & Computed)[K];
+>get : <K extends keyof Data | keyof Computed>(key: K) => (Data & Computed)[K]
+>K : K
+>Data : Data
+>Computed : Computed
+>key : K
+>K : K
+>Data : Data
+>Computed : Computed
+>K : K
+}
diff --git a/tests/baselines/reference/keyofAndIndexedAccessErrors.errors.txt b/tests/baselines/reference/keyofAndIndexedAccessErrors.errors.txt
index 23b79c16627..1e88e2abc43 100644
--- a/tests/baselines/reference/keyofAndIndexedAccessErrors.errors.txt
+++ b/tests/baselines/reference/keyofAndIndexedAccessErrors.errors.txt
@@ -21,9 +21,14 @@ tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(64,33): error
 tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(66,24): error TS2345: Argument of type '"size"' is not assignable to parameter of type '"name" | "width" | "height" | "visible"'.
 tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(67,24): error TS2345: Argument of type '"name" | "size"' is not assignable to parameter of type '"name" | "width" | "height" | "visible"'.
   Type '"size"' is not assignable to type '"name" | "width" | "height" | "visible"'.
+tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(72,5): error TS2536: Type 'keyof (T & U)' cannot be used to index type 'T | U'.
+tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(76,5): error TS2322: Type 'T | U' is not assignable to type 'T & U'.
+  Type 'T' is not assignable to type 'T & U'.
+    Type 'T' is not assignable to type 'U'.
+tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(77,5): error TS2322: Type 'keyof (T & U)' is not assignable to type 'keyof (T | U)'.
 
 
-==== tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts (21 errors) ====
+==== tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts (24 errors) ====
     class Shape {
         name: string;
         width: number;
@@ -135,4 +140,23 @@ tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(67,24): error
                            ~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '"name" | "size"' is not assignable to parameter of type '"name" | "width" | "height" | "visible"'.
 !!! error TS2345:   Type '"size"' is not assignable to type '"name" | "width" | "height" | "visible"'.
+    }
+    
+    function f20<T, U>(k1: keyof (T | U), k2: keyof (T & U), o1: T | U, o2: T & U) {
+        o1[k1];
+        o1[k2];   // Error
+        ~~~~~~
+!!! error TS2536: Type 'keyof (T & U)' cannot be used to index type 'T | U'.
+        o2[k1];
+        o2[k2];
+        o1 = o2;
+        o2 = o1;  // Error
+        ~~
+!!! error TS2322: Type 'T | U' is not assignable to type 'T & U'.
+!!! error TS2322:   Type 'T' is not assignable to type 'T & U'.
+!!! error TS2322:     Type 'T' is not assignable to type 'U'.
+        k1 = k2;  // Error
+        ~~
+!!! error TS2322: Type 'keyof (T & U)' is not assignable to type 'keyof (T | U)'.
+        k2 = k1;
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/keyofAndIndexedAccessErrors.js b/tests/baselines/reference/keyofAndIndexedAccessErrors.js
index 145d8e3f148..556aca12971 100644
--- a/tests/baselines/reference/keyofAndIndexedAccessErrors.js
+++ b/tests/baselines/reference/keyofAndIndexedAccessErrors.js
@@ -66,6 +66,17 @@ function f10(shape: Shape) {
     setProperty(shape, "name", "rectangle");
     setProperty(shape, "size", 10);  // Error
     setProperty(shape, cond ? "name" : "size", 10);  // Error
+}
+
+function f20<T, U>(k1: keyof (T | U), k2: keyof (T & U), o1: T | U, o2: T & U) {
+    o1[k1];
+    o1[k2];   // Error
+    o2[k1];
+    o2[k2];
+    o1 = o2;
+    o2 = o1;  // Error
+    k1 = k2;  // Error
+    k2 = k1;
 }
 
 //// [keyofAndIndexedAccessErrors.js]
@@ -88,3 +99,13 @@ function f10(shape) {
     setProperty(shape, "size", 10); // Error
     setProperty(shape, cond ? "name" : "size", 10); // Error
 }
+function f20(k1, k2, o1, o2) {
+    o1[k1];
+    o1[k2]; // Error
+    o2[k1];
+    o2[k2];
+    o1 = o2;
+    o2 = o1; // Error
+    k1 = k2; // Error
+    k2 = k1;
+}

From c52eb6cef3fc149b5e5729de5b2ed11e72e11cab Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sun, 4 Dec 2016 07:43:10 -0800
Subject: [PATCH 408/421] Indexed access any[K] has type any

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

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 912db011904..903c8cfda1c 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -6033,6 +6033,9 @@ namespace ts {
 
         function getIndexedAccessType(objectType: Type, indexType: Type, accessNode?: ElementAccessExpression | IndexedAccessTypeNode) {
             if (maybeTypeOfKind(indexType, TypeFlags.TypeVariable | TypeFlags.Index) || isGenericMappedType(objectType)) {
+                if (objectType.flags & TypeFlags.Any) {
+                    return objectType;
+                }
                 // If the index type is generic or if the object type is a mapped type with a generic constraint,
                 // we are performing a higher-order index access where we cannot meaningfully access the properties
                 // of the object type. In those cases, we first check that the index type is assignable to 'keyof T'

From 95aed3f4ee1cb38ddb87aa7797724fe94739f726 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sun, 4 Dec 2016 07:49:55 -0800
Subject: [PATCH 409/421] Add regression test

---
 .../conformance/types/keyof/keyofAndIndexedAccess.ts  | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts b/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
index 3a2bb912c19..08bcfb28204 100644
--- a/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
+++ b/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
@@ -354,4 +354,15 @@ interface Options2<Data, Computed> {
 declare class Component2<Data, Computed> {
     constructor(options: Options2<Data, Computed>);
     get<K extends keyof Data | keyof Computed>(key: K): (Data & Computed)[K];
+}
+
+// Repro from #12641
+
+interface R {
+    p: number;
+}
+
+function f<K extends keyof R>(p: K) {
+    let a: any;
+    a[p].add;  // any
 }
\ No newline at end of file

From ee172cfa39a6745ac13a300dc176daae462dd0da Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sun, 4 Dec 2016 07:50:10 -0800
Subject: [PATCH 410/421] Accept new baselines

---
 .../reference/keyofAndIndexedAccess.js        | 19 +++++++++++++
 .../reference/keyofAndIndexedAccess.symbols   | 24 +++++++++++++++++
 .../reference/keyofAndIndexedAccess.types     | 27 +++++++++++++++++++
 3 files changed, 70 insertions(+)

diff --git a/tests/baselines/reference/keyofAndIndexedAccess.js b/tests/baselines/reference/keyofAndIndexedAccess.js
index 1a0b90f3163..a9a5ee29993 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.js
+++ b/tests/baselines/reference/keyofAndIndexedAccess.js
@@ -353,6 +353,17 @@ interface Options2<Data, Computed> {
 declare class Component2<Data, Computed> {
     constructor(options: Options2<Data, Computed>);
     get<K extends keyof Data | keyof Computed>(key: K): (Data & Computed)[K];
+}
+
+// Repro from #12641
+
+interface R {
+    p: number;
+}
+
+function f<K extends keyof R>(p: K) {
+    let a: any;
+    a[p].add;  // any
 }
 
 //// [keyofAndIndexedAccess.js]
@@ -589,6 +600,10 @@ var c1 = new Component1({
     }
 });
 c1.get("hello");
+function f(p) {
+    var a;
+    a[p].add; // any
+}
 
 
 //// [keyofAndIndexedAccess.d.ts]
@@ -757,3 +772,7 @@ declare class Component2<Data, Computed> {
     constructor(options: Options2<Data, Computed>);
     get<K extends keyof Data | keyof Computed>(key: K): (Data & Computed)[K];
 }
+interface R {
+    p: number;
+}
+declare function f<K extends keyof R>(p: K): void;
diff --git a/tests/baselines/reference/keyofAndIndexedAccess.symbols b/tests/baselines/reference/keyofAndIndexedAccess.symbols
index bc9e53cdd7e..3d90b4ca276 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.symbols
+++ b/tests/baselines/reference/keyofAndIndexedAccess.symbols
@@ -1320,3 +1320,27 @@ declare class Component2<Data, Computed> {
 >Computed : Symbol(Computed, Decl(keyofAndIndexedAccess.ts, 351, 30))
 >K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 353, 8))
 }
+
+// Repro from #12641
+
+interface R {
+>R : Symbol(R, Decl(keyofAndIndexedAccess.ts, 354, 1))
+
+    p: number;
+>p : Symbol(R.p, Decl(keyofAndIndexedAccess.ts, 358, 13))
+}
+
+function f<K extends keyof R>(p: K) {
+>f : Symbol(f, Decl(keyofAndIndexedAccess.ts, 360, 1))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 362, 11))
+>R : Symbol(R, Decl(keyofAndIndexedAccess.ts, 354, 1))
+>p : Symbol(p, Decl(keyofAndIndexedAccess.ts, 362, 30))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 362, 11))
+
+    let a: any;
+>a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 363, 7))
+
+    a[p].add;  // any
+>a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 363, 7))
+>p : Symbol(p, Decl(keyofAndIndexedAccess.ts, 362, 30))
+}
diff --git a/tests/baselines/reference/keyofAndIndexedAccess.types b/tests/baselines/reference/keyofAndIndexedAccess.types
index 7cd4b434af6..3b984643776 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.types
+++ b/tests/baselines/reference/keyofAndIndexedAccess.types
@@ -1560,3 +1560,30 @@ declare class Component2<Data, Computed> {
 >Computed : Computed
 >K : K
 }
+
+// Repro from #12641
+
+interface R {
+>R : R
+
+    p: number;
+>p : number
+}
+
+function f<K extends keyof R>(p: K) {
+>f : <K extends "p">(p: K) => void
+>K : K
+>R : R
+>p : K
+>K : K
+
+    let a: any;
+>a : any
+
+    a[p].add;  // any
+>a[p].add : any
+>a[p] : any
+>a : any
+>p : K
+>add : any
+}

From 225d6d6aef11484708e319940f148b89edfb6323 Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Mon, 5 Dec 2016 13:40:56 -0800
Subject: [PATCH 411/421] use XDG base directory compatible cache location
 (#12676)

* use XDG base directory compatible cache location

* use ~/Library/Caches on darwin
---
 src/server/server.ts | 45 +++++++++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/server/server.ts b/src/server/server.ts
index 7367741b9ea..a020ef210fe 100644
--- a/src/server/server.ts
+++ b/src/server/server.ts
@@ -20,34 +20,41 @@ namespace ts.server {
     } = require("os");
 
     function getGlobalTypingsCacheLocation() {
-        let basePath: string;
         switch (process.platform) {
-            case "win32":
-                basePath = process.env.LOCALAPPDATA ||
+            case "win32": {
+                const basePath = process.env.LOCALAPPDATA ||
                     process.env.APPDATA ||
                     (os.homedir && os.homedir()) ||
                     process.env.USERPROFILE ||
                     (process.env.HOMEDRIVE && process.env.HOMEPATH && normalizeSlashes(process.env.HOMEDRIVE + process.env.HOMEPATH)) ||
                     os.tmpdir();
-                break;
-            case "linux":
-            case "android":
-                basePath = (os.homedir && os.homedir()) ||
-                    process.env.HOME ||
-                    ((process.env.LOGNAME || process.env.USER) && `/home/${process.env.LOGNAME || process.env.USER}`) ||
-                    os.tmpdir();
-                break;
+                return combinePaths(normalizeSlashes(basePath), "Microsoft/TypeScript");
+            }
             case "darwin":
-                const homeDir = (os.homedir && os.homedir()) ||
-                        process.env.HOME ||
-                        ((process.env.LOGNAME || process.env.USER) && `/Users/${process.env.LOGNAME || process.env.USER}`) ||
-                        os.tmpdir();
-                basePath = combinePaths(homeDir, "Library/Application Support/");
-                break;
+            case "linux":
+            case "android": {
+                const cacheLocation = getNonWindowsCacheLocation(process.platform === "darwin");
+                return combinePaths(cacheLocation, "typescript");
+            }
+            default:
+                Debug.fail(`unsupported platform '${process.platform}'`);
+                return;
         }
+    }
 
-        Debug.assert(basePath !== undefined);
-        return combinePaths(normalizeSlashes(basePath), "Microsoft/TypeScript");
+    function getNonWindowsCacheLocation(platformIsDarwin: boolean) {
+        if (process.env.XDG_CACHE_HOME) {
+            return process.env.XDG_CACHE_HOME;
+        }
+        const usersDir = platformIsDarwin ? "Users" : "home"
+        const homePath = (os.homedir && os.homedir()) ||
+            process.env.HOME ||
+            ((process.env.LOGNAME || process.env.USER) && `/${usersDir}/${process.env.LOGNAME || process.env.USER}`) ||
+            os.tmpdir();
+        const cacheFolder = platformIsDarwin
+            ? "Library/Caches"
+            : ".cache"
+        return combinePaths(normalizeSlashes(homePath), cacheFolder);
     }
 
     interface NodeChildProcess {

From ee0894339d0bb6888a9bd2741b951627b97bfada Mon Sep 17 00:00:00 2001
From: Aluan Haddad <aluanh@gmail.com>
Date: Mon, 5 Dec 2016 18:25:45 -0500
Subject: [PATCH 412/421] Add ReadonlyArray<T>.includes to
 es2016.array.include.d.ts

---
 src/lib/es2016.array.include.d.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/lib/es2016.array.include.d.ts b/src/lib/es2016.array.include.d.ts
index 17b3eaac1d3..fdd9ed4639f 100644
--- a/src/lib/es2016.array.include.d.ts
+++ b/src/lib/es2016.array.include.d.ts
@@ -7,6 +7,15 @@ interface Array<T> {
     includes(searchElement: T, fromIndex?: number): boolean;
 }
 
+interface ReadonlyArray<T> {
+    /**
+      * Determines whether an array includes a certain element, returning true or false as appropriate.
+      * @param searchElement The element to search for.
+      * @param fromIndex The position in this array at which to begin searching for searchElement.
+      */
+    includes(searchElement: T, fromIndex?: number): boolean;
+}
+
 interface Int8Array {
     /**
       * Determines whether an array includes a certain element, returning true or false as appropriate.

From f89156bf55a40a6002c2383926b50f250231146c Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Tue, 6 Dec 2016 10:47:02 -0800
Subject: [PATCH 413/421] Add error for super property before super

---
 src/compiler/checker.ts                       | 48 +++++++++++--------
 src/compiler/transformers/es2015.ts           |  1 -
 .../reference/errorSuperCalls.errors.txt      |  5 +-
 .../reference/superAccess2.errors.txt         | 11 ++++-
 .../superInConstructorParam1.errors.txt       |  5 +-
 .../reference/superNewCall1.errors.txt        |  5 +-
 ...rtyInConstructorBeforeSuperCall.errors.txt | 24 ++++++++++
 ...perPropertyInConstructorBeforeSuperCall.js | 46 ++++++++++++++++++
 .../superWithTypeArgument.errors.txt          |  5 +-
 .../superWithTypeArgument2.errors.txt         |  5 +-
 .../superWithTypeArgument3.errors.txt         |  5 +-
 ...perPropertyInConstructorBeforeSuperCall.ts | 15 ++++++
 12 files changed, 147 insertions(+), 28 deletions(-)
 create mode 100644 tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.errors.txt
 create mode 100644 tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.js
 create mode 100644 tests/cases/conformance/classes/constructorDeclarations/superCalls/superPropertyInConstructorBeforeSuperCall.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 903c8cfda1c..8c08e9b121b 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -10405,6 +10405,29 @@ namespace ts {
             return baseConstructorType === nullWideningType;
         }
 
+        function checkThisBeforeSuper(node: Node, container: Node) {
+            const containingClassDecl = <ClassDeclaration>container.parent;
+            const baseTypeNode = getClassExtendsHeritageClauseElement(containingClassDecl);
+
+            // If a containing class does not have extends clause or the class extends null
+            // skip checking whether super statement is called before "this" accessing.
+            if (baseTypeNode && !classDeclarationExtendsNull(containingClassDecl)) {
+                const superCall = getSuperCallInConstructor(<ConstructorDeclaration>container);
+
+                // We should give an error in the following cases:
+                //      - No super-call
+                //      - "this" is accessing before super-call.
+                //          i.e super(this)
+                //              this.x; super();
+                // We want to make sure that super-call is done before accessing "this" so that
+                // "this" is not accessed as a parameter of the super-call.
+                if (!superCall || superCall.end > node.pos) {
+                    // In ES6, super inside constructor of class-declaration has to precede "this" accessing
+                    error(node, Diagnostics.super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class);
+                }
+            }
+        }
+
         function checkThisExpression(node: Node): Type {
             // Stop at the first arrow function so that we can
             // tell whether 'this' needs to be captured.
@@ -10412,26 +10435,7 @@ namespace ts {
             let needToCaptureLexicalThis = false;
 
             if (container.kind === SyntaxKind.Constructor) {
-                const containingClassDecl = <ClassDeclaration>container.parent;
-                const baseTypeNode = getClassExtendsHeritageClauseElement(containingClassDecl);
-
-                // If a containing class does not have extends clause or the class extends null
-                // skip checking whether super statement is called before "this" accessing.
-                if (baseTypeNode && !classDeclarationExtendsNull(containingClassDecl)) {
-                    const superCall = getSuperCallInConstructor(<ConstructorDeclaration>container);
-
-                    // We should give an error in the following cases:
-                    //      - No super-call
-                    //      - "this" is accessing before super-call.
-                    //          i.e super(this)
-                    //              this.x; super();
-                    // We want to make sure that super-call is done before accessing "this" so that
-                    // "this" is not accessed as a parameter of the super-call.
-                    if (!superCall || superCall.end > node.pos) {
-                        // In ES6, super inside constructor of class-declaration has to precede "this" accessing
-                        error(node, Diagnostics.super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class);
-                    }
-                }
+                checkThisBeforeSuper(node, container);
             }
 
             // Now skip arrow functions to get the "real" owner of 'this'.
@@ -10579,6 +10583,10 @@ namespace ts {
                 return unknownType;
             }
 
+            if (!isCallExpression && container.kind === SyntaxKind.Constructor) {
+                checkThisBeforeSuper(node, container);
+            }
+
             if ((getModifierFlags(container) & ModifierFlags.Static) || isCallExpression) {
                 nodeCheckFlag = NodeCheckFlags.SuperStatic;
             }
diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts
index bc9341a4b4f..c1398f75da6 100644
--- a/src/compiler/transformers/es2015.ts
+++ b/src/compiler/transformers/es2015.ts
@@ -2837,7 +2837,6 @@ namespace ts {
                 //      _super.call(this, a)
                 //      _super.m.call(this, a)
                 //      _super.prototype.m.call(this, a)
-
                 resultingCall = createFunctionCall(
                     visitNode(target, visitor, isExpression),
                     visitNode(thisArg, visitor, isExpression),
diff --git a/tests/baselines/reference/errorSuperCalls.errors.txt b/tests/baselines/reference/errorSuperCalls.errors.txt
index 49bcb4b4d45..ee2ba6d829d 100644
--- a/tests/baselines/reference/errorSuperCalls.errors.txt
+++ b/tests/baselines/reference/errorSuperCalls.errors.txt
@@ -7,6 +7,7 @@ tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(26,9): error T
 tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(30,16): error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors.
 tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(34,9): error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors.
 tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(38,9): error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors.
+tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(46,9): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
 tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(46,14): error TS1034: 'super' must be followed by an argument list or member access.
 tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(58,9): error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors.
 tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(62,9): error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors.
@@ -14,7 +15,7 @@ tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(67,9): error T
 tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(71,9): error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors.
 
 
-==== tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts (14 errors) ====
+==== tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts (15 errors) ====
     //super call in class constructor with no base type
     class NoBase {
         constructor() {
@@ -79,6 +80,8 @@ tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(71,9): error T
         //super call with type arguments 
         constructor() {
             super<string>();
+            ~~~~~
+!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
                  ~
 !!! error TS1034: 'super' must be followed by an argument list or member access.
             super();
diff --git a/tests/baselines/reference/superAccess2.errors.txt b/tests/baselines/reference/superAccess2.errors.txt
index d8b39284f65..c427115574f 100644
--- a/tests/baselines/reference/superAccess2.errors.txt
+++ b/tests/baselines/reference/superAccess2.errors.txt
@@ -2,10 +2,13 @@ tests/cases/compiler/superAccess2.ts(7,15): error TS1034: 'super' must be follow
 tests/cases/compiler/superAccess2.ts(8,17): error TS2338: 'super' property access is permitted only in a constructor, member function, or member accessor of a derived class.
 tests/cases/compiler/superAccess2.ts(8,22): error TS1034: 'super' must be followed by an argument list or member access.
 tests/cases/compiler/superAccess2.ts(11,28): error TS2336: 'super' cannot be referenced in constructor arguments.
+tests/cases/compiler/superAccess2.ts(11,28): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
 tests/cases/compiler/superAccess2.ts(11,33): error TS1034: 'super' must be followed by an argument list or member access.
 tests/cases/compiler/superAccess2.ts(11,40): error TS2336: 'super' cannot be referenced in constructor arguments.
+tests/cases/compiler/superAccess2.ts(11,40): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
 tests/cases/compiler/superAccess2.ts(11,45): error TS1034: 'super' must be followed by an argument list or member access.
 tests/cases/compiler/superAccess2.ts(11,59): error TS2336: 'super' cannot be referenced in constructor arguments.
+tests/cases/compiler/superAccess2.ts(11,59): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
 tests/cases/compiler/superAccess2.ts(11,64): error TS1034: 'super' must be followed by an argument list or member access.
 tests/cases/compiler/superAccess2.ts(15,19): error TS1034: 'super' must be followed by an argument list or member access.
 tests/cases/compiler/superAccess2.ts(17,15): error TS2339: Property 'y' does not exist on type 'P'.
@@ -13,7 +16,7 @@ tests/cases/compiler/superAccess2.ts(20,26): error TS1034: 'super' must be follo
 tests/cases/compiler/superAccess2.ts(21,15): error TS2339: Property 'x' does not exist on type 'typeof P'.
 
 
-==== tests/cases/compiler/superAccess2.ts (13 errors) ====
+==== tests/cases/compiler/superAccess2.ts (16 errors) ====
     class P {
         x() { }
         static y() { }
@@ -33,14 +36,20 @@ tests/cases/compiler/superAccess2.ts(21,15): error TS2339: Property 'x' does not
         constructor(public z = super, zz = super, zzz = () => super) {
                                ~~~~~
 !!! error TS2336: 'super' cannot be referenced in constructor arguments.
+                               ~~~~~
+!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
                                     ~
 !!! error TS1034: 'super' must be followed by an argument list or member access.
                                            ~~~~~
 !!! error TS2336: 'super' cannot be referenced in constructor arguments.
+                                           ~~~~~
+!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
                                                 ~
 !!! error TS1034: 'super' must be followed by an argument list or member access.
                                                               ~~~~~
 !!! error TS2336: 'super' cannot be referenced in constructor arguments.
+                                                              ~~~~~
+!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
                                                                    ~
 !!! error TS1034: 'super' must be followed by an argument list or member access.
             super();
diff --git a/tests/baselines/reference/superInConstructorParam1.errors.txt b/tests/baselines/reference/superInConstructorParam1.errors.txt
index 96735c92547..1eac79769d8 100644
--- a/tests/baselines/reference/superInConstructorParam1.errors.txt
+++ b/tests/baselines/reference/superInConstructorParam1.errors.txt
@@ -1,8 +1,9 @@
 tests/cases/compiler/superInConstructorParam1.ts(8,3): error TS2377: Constructors for derived classes must contain a 'super' call.
 tests/cases/compiler/superInConstructorParam1.ts(8,19): error TS2336: 'super' cannot be referenced in constructor arguments.
+tests/cases/compiler/superInConstructorParam1.ts(8,19): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
 
 
-==== tests/cases/compiler/superInConstructorParam1.ts (2 errors) ====
+==== tests/cases/compiler/superInConstructorParam1.ts (3 errors) ====
     class B {
       public foo(): number {
         return 0;
@@ -14,6 +15,8 @@ tests/cases/compiler/superInConstructorParam1.ts(8,19): error TS2336: 'super' ca
       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                       ~~~~~
 !!! error TS2336: 'super' cannot be referenced in constructor arguments.
+                      ~~~~~
+!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
       }
     ~~~
 !!! error TS2377: Constructors for derived classes must contain a 'super' call.
diff --git a/tests/baselines/reference/superNewCall1.errors.txt b/tests/baselines/reference/superNewCall1.errors.txt
index 2b104e7d647..3dd7435e5c4 100644
--- a/tests/baselines/reference/superNewCall1.errors.txt
+++ b/tests/baselines/reference/superNewCall1.errors.txt
@@ -1,8 +1,9 @@
 tests/cases/compiler/superNewCall1.ts(9,5): error TS2377: Constructors for derived classes must contain a 'super' call.
 tests/cases/compiler/superNewCall1.ts(10,9): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
+tests/cases/compiler/superNewCall1.ts(10,13): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
 
 
-==== tests/cases/compiler/superNewCall1.ts (2 errors) ====
+==== tests/cases/compiler/superNewCall1.ts (3 errors) ====
     
     class A<T1, T2> {
         constructor(private map: (value: T1) => T2) {
@@ -17,6 +18,8 @@ tests/cases/compiler/superNewCall1.ts(10,9): error TS2351: Cannot use 'new' with
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
+                ~~~~~
+!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
         }
     ~~~~~
 !!! error TS2377: Constructors for derived classes must contain a 'super' call.
diff --git a/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.errors.txt b/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.errors.txt
new file mode 100644
index 00000000000..029154e3318
--- /dev/null
+++ b/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.errors.txt
@@ -0,0 +1,24 @@
+tests/cases/conformance/classes/constructorDeclarations/superCalls/superPropertyInConstructorBeforeSuperCall.ts(7,9): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+tests/cases/conformance/classes/constructorDeclarations/superCalls/superPropertyInConstructorBeforeSuperCall.ts(13,15): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+
+
+==== tests/cases/conformance/classes/constructorDeclarations/superCalls/superPropertyInConstructorBeforeSuperCall.ts (2 errors) ====
+    class B {
+        constructor(x?: string) {}
+        x(): string { return ""; }
+    }
+    class C1 extends B {
+        constructor() {
+            super.x();
+            ~~~~~
+!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+            super();
+        }
+    }
+    class C2 extends B {
+        constructor() {
+            super(super.x());
+                  ~~~~~
+!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.js b/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.js
new file mode 100644
index 00000000000..15bc0c40f37
--- /dev/null
+++ b/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.js
@@ -0,0 +1,46 @@
+//// [superPropertyInConstructorBeforeSuperCall.ts]
+class B {
+    constructor(x?: string) {}
+    x(): string { return ""; }
+}
+class C1 extends B {
+    constructor() {
+        super.x();
+        super();
+    }
+}
+class C2 extends B {
+    constructor() {
+        super(super.x());
+    }
+}
+
+//// [superPropertyInConstructorBeforeSuperCall.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+var B = (function () {
+    function B(x) {
+    }
+    B.prototype.x = function () { return ""; };
+    return B;
+}());
+var C1 = (function (_super) {
+    __extends(C1, _super);
+    function C1() {
+        var _this;
+        _super.prototype.x.call(_this);
+        _this = _super.call(this) || this;
+        return _this;
+    }
+    return C1;
+}(B));
+var C2 = (function (_super) {
+    __extends(C2, _super);
+    function C2() {
+        return _super.call(this, _super.x.call(_this)) || this;
+    }
+    return C2;
+}(B));
diff --git a/tests/baselines/reference/superWithTypeArgument.errors.txt b/tests/baselines/reference/superWithTypeArgument.errors.txt
index d749cbd5157..bef02357d35 100644
--- a/tests/baselines/reference/superWithTypeArgument.errors.txt
+++ b/tests/baselines/reference/superWithTypeArgument.errors.txt
@@ -1,8 +1,9 @@
 tests/cases/compiler/superWithTypeArgument.ts(6,5): error TS2377: Constructors for derived classes must contain a 'super' call.
+tests/cases/compiler/superWithTypeArgument.ts(7,9): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
 tests/cases/compiler/superWithTypeArgument.ts(7,14): error TS1034: 'super' must be followed by an argument list or member access.
 
 
-==== tests/cases/compiler/superWithTypeArgument.ts (2 errors) ====
+==== tests/cases/compiler/superWithTypeArgument.ts (3 errors) ====
     class C {
         
     }
@@ -12,6 +13,8 @@ tests/cases/compiler/superWithTypeArgument.ts(7,14): error TS1034: 'super' must
         ~~~~~~~~~~~~~~~
             super<T>();
     ~~~~~~~~~~~~~~~~~~~
+            ~~~~~
+!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
                  ~
 !!! error TS1034: 'super' must be followed by an argument list or member access.
         }
diff --git a/tests/baselines/reference/superWithTypeArgument2.errors.txt b/tests/baselines/reference/superWithTypeArgument2.errors.txt
index 766327c5c81..4bd7e960858 100644
--- a/tests/baselines/reference/superWithTypeArgument2.errors.txt
+++ b/tests/baselines/reference/superWithTypeArgument2.errors.txt
@@ -1,8 +1,9 @@
 tests/cases/compiler/superWithTypeArgument2.ts(6,5): error TS2377: Constructors for derived classes must contain a 'super' call.
+tests/cases/compiler/superWithTypeArgument2.ts(7,9): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
 tests/cases/compiler/superWithTypeArgument2.ts(7,14): error TS1034: 'super' must be followed by an argument list or member access.
 
 
-==== tests/cases/compiler/superWithTypeArgument2.ts (2 errors) ====
+==== tests/cases/compiler/superWithTypeArgument2.ts (3 errors) ====
     class C<T> {
         foo: T;
     }
@@ -12,6 +13,8 @@ tests/cases/compiler/superWithTypeArgument2.ts(7,14): error TS1034: 'super' must
         ~~~~~~~~~~~~~~~~
             super<T>(x);
     ~~~~~~~~~~~~~~~~~~~~
+            ~~~~~
+!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
                  ~
 !!! error TS1034: 'super' must be followed by an argument list or member access.
         }
diff --git a/tests/baselines/reference/superWithTypeArgument3.errors.txt b/tests/baselines/reference/superWithTypeArgument3.errors.txt
index 323b2958fcb..a6a59f92a00 100644
--- a/tests/baselines/reference/superWithTypeArgument3.errors.txt
+++ b/tests/baselines/reference/superWithTypeArgument3.errors.txt
@@ -1,8 +1,9 @@
 tests/cases/compiler/superWithTypeArgument3.ts(7,5): error TS2377: Constructors for derived classes must contain a 'super' call.
+tests/cases/compiler/superWithTypeArgument3.ts(8,9): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
 tests/cases/compiler/superWithTypeArgument3.ts(8,14): error TS1034: 'super' must be followed by an argument list or member access.
 
 
-==== tests/cases/compiler/superWithTypeArgument3.ts (2 errors) ====
+==== tests/cases/compiler/superWithTypeArgument3.ts (3 errors) ====
     class C<T> {
         foo: T;
         bar<U>(x: U) { }
@@ -13,6 +14,8 @@ tests/cases/compiler/superWithTypeArgument3.ts(8,14): error TS1034: 'super' must
         ~~~~~~~~~~~~~~~
             super<T>();
     ~~~~~~~~~~~~~~~~~~~
+            ~~~~~
+!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
                  ~
 !!! error TS1034: 'super' must be followed by an argument list or member access.
         }
diff --git a/tests/cases/conformance/classes/constructorDeclarations/superCalls/superPropertyInConstructorBeforeSuperCall.ts b/tests/cases/conformance/classes/constructorDeclarations/superCalls/superPropertyInConstructorBeforeSuperCall.ts
new file mode 100644
index 00000000000..9d5d4c8c895
--- /dev/null
+++ b/tests/cases/conformance/classes/constructorDeclarations/superCalls/superPropertyInConstructorBeforeSuperCall.ts
@@ -0,0 +1,15 @@
+class B {
+    constructor(x?: string) {}
+    x(): string { return ""; }
+}
+class C1 extends B {
+    constructor() {
+        super.x();
+        super();
+    }
+}
+class C2 extends B {
+    constructor() {
+        super(super.x());
+    }
+}
\ No newline at end of file

From 9336886fc2340079e38751e8b088f4a8ef9eea2e Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Tue, 6 Dec 2016 10:57:52 -0800
Subject: [PATCH 414/421] Added more specific diagnostic message

---
 src/compiler/checker.ts                              |  8 ++++----
 src/compiler/diagnosticMessages.json                 |  4 ++++
 tests/baselines/reference/superAccess2.errors.txt    | 12 ++++++------
 .../reference/superInConstructorParam1.errors.txt    |  4 ++--
 tests/baselines/reference/superNewCall1.errors.txt   |  4 ++--
 ...erPropertyInConstructorBeforeSuperCall.errors.txt |  8 ++++----
 .../reference/superWithTypeArgument.errors.txt       |  4 ++--
 .../reference/superWithTypeArgument2.errors.txt      |  4 ++--
 .../reference/superWithTypeArgument3.errors.txt      |  4 ++--
 9 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 8c08e9b121b..b7b3043e661 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -10405,7 +10405,7 @@ namespace ts {
             return baseConstructorType === nullWideningType;
         }
 
-        function checkThisBeforeSuper(node: Node, container: Node) {
+        function checkThisBeforeSuper(node: Node, container: Node, diagnosticMessage: DiagnosticMessage) {
             const containingClassDecl = <ClassDeclaration>container.parent;
             const baseTypeNode = getClassExtendsHeritageClauseElement(containingClassDecl);
 
@@ -10423,7 +10423,7 @@ namespace ts {
                 // "this" is not accessed as a parameter of the super-call.
                 if (!superCall || superCall.end > node.pos) {
                     // In ES6, super inside constructor of class-declaration has to precede "this" accessing
-                    error(node, Diagnostics.super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class);
+                    error(node, diagnosticMessage);
                 }
             }
         }
@@ -10435,7 +10435,7 @@ namespace ts {
             let needToCaptureLexicalThis = false;
 
             if (container.kind === SyntaxKind.Constructor) {
-                checkThisBeforeSuper(node, container);
+                checkThisBeforeSuper(node, container, 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'.
@@ -10584,7 +10584,7 @@ namespace ts {
             }
 
             if (!isCallExpression && container.kind === SyntaxKind.Constructor) {
-                checkThisBeforeSuper(node, container);
+                checkThisBeforeSuper(node, container, Diagnostics.super_must_be_called_before_accessing_a_property_of_super_in_the_constructor_of_a_derived_class);
             }
 
             if ((getModifierFlags(container) & ModifierFlags.Static) || isCallExpression) {
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 4d42c77e566..b59921c2948 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -3165,6 +3165,10 @@
         "category": "Error",
         "code": 17010
     },
+    "'super' must be called before accessing a property of 'super' in the constructor of a derived class.": {
+        "category": "Error",
+        "code": 17011
+    },
 
     "Circularity detected while resolving configuration: {0}": {
         "category": "Error",
diff --git a/tests/baselines/reference/superAccess2.errors.txt b/tests/baselines/reference/superAccess2.errors.txt
index c427115574f..edcd4031c47 100644
--- a/tests/baselines/reference/superAccess2.errors.txt
+++ b/tests/baselines/reference/superAccess2.errors.txt
@@ -2,13 +2,13 @@ tests/cases/compiler/superAccess2.ts(7,15): error TS1034: 'super' must be follow
 tests/cases/compiler/superAccess2.ts(8,17): error TS2338: 'super' property access is permitted only in a constructor, member function, or member accessor of a derived class.
 tests/cases/compiler/superAccess2.ts(8,22): error TS1034: 'super' must be followed by an argument list or member access.
 tests/cases/compiler/superAccess2.ts(11,28): error TS2336: 'super' cannot be referenced in constructor arguments.
-tests/cases/compiler/superAccess2.ts(11,28): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+tests/cases/compiler/superAccess2.ts(11,28): error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
 tests/cases/compiler/superAccess2.ts(11,33): error TS1034: 'super' must be followed by an argument list or member access.
 tests/cases/compiler/superAccess2.ts(11,40): error TS2336: 'super' cannot be referenced in constructor arguments.
-tests/cases/compiler/superAccess2.ts(11,40): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+tests/cases/compiler/superAccess2.ts(11,40): error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
 tests/cases/compiler/superAccess2.ts(11,45): error TS1034: 'super' must be followed by an argument list or member access.
 tests/cases/compiler/superAccess2.ts(11,59): error TS2336: 'super' cannot be referenced in constructor arguments.
-tests/cases/compiler/superAccess2.ts(11,59): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+tests/cases/compiler/superAccess2.ts(11,59): error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
 tests/cases/compiler/superAccess2.ts(11,64): error TS1034: 'super' must be followed by an argument list or member access.
 tests/cases/compiler/superAccess2.ts(15,19): error TS1034: 'super' must be followed by an argument list or member access.
 tests/cases/compiler/superAccess2.ts(17,15): error TS2339: Property 'y' does not exist on type 'P'.
@@ -37,19 +37,19 @@ tests/cases/compiler/superAccess2.ts(21,15): error TS2339: Property 'x' does not
                                ~~~~~
 !!! error TS2336: 'super' cannot be referenced in constructor arguments.
                                ~~~~~
-!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+!!! error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
                                     ~
 !!! error TS1034: 'super' must be followed by an argument list or member access.
                                            ~~~~~
 !!! error TS2336: 'super' cannot be referenced in constructor arguments.
                                            ~~~~~
-!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+!!! error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
                                                 ~
 !!! error TS1034: 'super' must be followed by an argument list or member access.
                                                               ~~~~~
 !!! error TS2336: 'super' cannot be referenced in constructor arguments.
                                                               ~~~~~
-!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+!!! error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
                                                                    ~
 !!! error TS1034: 'super' must be followed by an argument list or member access.
             super();
diff --git a/tests/baselines/reference/superInConstructorParam1.errors.txt b/tests/baselines/reference/superInConstructorParam1.errors.txt
index 1eac79769d8..4220fcb9b0e 100644
--- a/tests/baselines/reference/superInConstructorParam1.errors.txt
+++ b/tests/baselines/reference/superInConstructorParam1.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/superInConstructorParam1.ts(8,3): error TS2377: Constructors for derived classes must contain a 'super' call.
 tests/cases/compiler/superInConstructorParam1.ts(8,19): error TS2336: 'super' cannot be referenced in constructor arguments.
-tests/cases/compiler/superInConstructorParam1.ts(8,19): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+tests/cases/compiler/superInConstructorParam1.ts(8,19): error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
 
 
 ==== tests/cases/compiler/superInConstructorParam1.ts (3 errors) ====
@@ -16,7 +16,7 @@ tests/cases/compiler/superInConstructorParam1.ts(8,19): error TS17009: 'super' m
                       ~~~~~
 !!! error TS2336: 'super' cannot be referenced in constructor arguments.
                       ~~~~~
-!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+!!! error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
       }
     ~~~
 !!! error TS2377: Constructors for derived classes must contain a 'super' call.
diff --git a/tests/baselines/reference/superNewCall1.errors.txt b/tests/baselines/reference/superNewCall1.errors.txt
index 3dd7435e5c4..c8fd5c471fb 100644
--- a/tests/baselines/reference/superNewCall1.errors.txt
+++ b/tests/baselines/reference/superNewCall1.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/superNewCall1.ts(9,5): error TS2377: Constructors for derived classes must contain a 'super' call.
 tests/cases/compiler/superNewCall1.ts(10,9): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
-tests/cases/compiler/superNewCall1.ts(10,13): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+tests/cases/compiler/superNewCall1.ts(10,13): error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
 
 
 ==== tests/cases/compiler/superNewCall1.ts (3 errors) ====
@@ -19,7 +19,7 @@ tests/cases/compiler/superNewCall1.ts(10,13): error TS17009: 'super' must be cal
             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
                 ~~~~~
-!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+!!! error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
         }
     ~~~~~
 !!! error TS2377: Constructors for derived classes must contain a 'super' call.
diff --git a/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.errors.txt b/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.errors.txt
index 029154e3318..407e984c5d1 100644
--- a/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.errors.txt
+++ b/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/conformance/classes/constructorDeclarations/superCalls/superPropertyInConstructorBeforeSuperCall.ts(7,9): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
-tests/cases/conformance/classes/constructorDeclarations/superCalls/superPropertyInConstructorBeforeSuperCall.ts(13,15): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+tests/cases/conformance/classes/constructorDeclarations/superCalls/superPropertyInConstructorBeforeSuperCall.ts(7,9): error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
+tests/cases/conformance/classes/constructorDeclarations/superCalls/superPropertyInConstructorBeforeSuperCall.ts(13,15): error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
 
 
 ==== tests/cases/conformance/classes/constructorDeclarations/superCalls/superPropertyInConstructorBeforeSuperCall.ts (2 errors) ====
@@ -11,7 +11,7 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/superProperty
         constructor() {
             super.x();
             ~~~~~
-!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+!!! error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
             super();
         }
     }
@@ -19,6 +19,6 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/superProperty
         constructor() {
             super(super.x());
                   ~~~~~
-!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+!!! error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
         }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/superWithTypeArgument.errors.txt b/tests/baselines/reference/superWithTypeArgument.errors.txt
index bef02357d35..5860cb466d9 100644
--- a/tests/baselines/reference/superWithTypeArgument.errors.txt
+++ b/tests/baselines/reference/superWithTypeArgument.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/superWithTypeArgument.ts(6,5): error TS2377: Constructors for derived classes must contain a 'super' call.
-tests/cases/compiler/superWithTypeArgument.ts(7,9): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+tests/cases/compiler/superWithTypeArgument.ts(7,9): error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
 tests/cases/compiler/superWithTypeArgument.ts(7,14): error TS1034: 'super' must be followed by an argument list or member access.
 
 
@@ -14,7 +14,7 @@ tests/cases/compiler/superWithTypeArgument.ts(7,14): error TS1034: 'super' must
             super<T>();
     ~~~~~~~~~~~~~~~~~~~
             ~~~~~
-!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+!!! error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
                  ~
 !!! error TS1034: 'super' must be followed by an argument list or member access.
         }
diff --git a/tests/baselines/reference/superWithTypeArgument2.errors.txt b/tests/baselines/reference/superWithTypeArgument2.errors.txt
index 4bd7e960858..473e7f3b7ad 100644
--- a/tests/baselines/reference/superWithTypeArgument2.errors.txt
+++ b/tests/baselines/reference/superWithTypeArgument2.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/superWithTypeArgument2.ts(6,5): error TS2377: Constructors for derived classes must contain a 'super' call.
-tests/cases/compiler/superWithTypeArgument2.ts(7,9): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+tests/cases/compiler/superWithTypeArgument2.ts(7,9): error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
 tests/cases/compiler/superWithTypeArgument2.ts(7,14): error TS1034: 'super' must be followed by an argument list or member access.
 
 
@@ -14,7 +14,7 @@ tests/cases/compiler/superWithTypeArgument2.ts(7,14): error TS1034: 'super' must
             super<T>(x);
     ~~~~~~~~~~~~~~~~~~~~
             ~~~~~
-!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+!!! error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
                  ~
 !!! error TS1034: 'super' must be followed by an argument list or member access.
         }
diff --git a/tests/baselines/reference/superWithTypeArgument3.errors.txt b/tests/baselines/reference/superWithTypeArgument3.errors.txt
index a6a59f92a00..37e6681d770 100644
--- a/tests/baselines/reference/superWithTypeArgument3.errors.txt
+++ b/tests/baselines/reference/superWithTypeArgument3.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/superWithTypeArgument3.ts(7,5): error TS2377: Constructors for derived classes must contain a 'super' call.
-tests/cases/compiler/superWithTypeArgument3.ts(8,9): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+tests/cases/compiler/superWithTypeArgument3.ts(8,9): error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
 tests/cases/compiler/superWithTypeArgument3.ts(8,14): error TS1034: 'super' must be followed by an argument list or member access.
 
 
@@ -15,7 +15,7 @@ tests/cases/compiler/superWithTypeArgument3.ts(8,14): error TS1034: 'super' must
             super<T>();
     ~~~~~~~~~~~~~~~~~~~
             ~~~~~
-!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+!!! error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
                  ~
 !!! error TS1034: 'super' must be followed by an argument list or member access.
         }

From e8024e426609b5249eed19c066bc4b8f7f6a8a29 Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Tue, 6 Dec 2016 11:19:27 -0800
Subject: [PATCH 415/421] Updated baseline

---
 tests/baselines/reference/errorSuperCalls.errors.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/baselines/reference/errorSuperCalls.errors.txt b/tests/baselines/reference/errorSuperCalls.errors.txt
index ee2ba6d829d..036367fd44b 100644
--- a/tests/baselines/reference/errorSuperCalls.errors.txt
+++ b/tests/baselines/reference/errorSuperCalls.errors.txt
@@ -7,7 +7,7 @@ tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(26,9): error T
 tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(30,16): error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors.
 tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(34,9): error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors.
 tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(38,9): error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors.
-tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(46,9): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(46,9): error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
 tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(46,14): error TS1034: 'super' must be followed by an argument list or member access.
 tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(58,9): error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors.
 tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(62,9): error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors.
@@ -81,7 +81,7 @@ tests/cases/conformance/expressions/superCalls/errorSuperCalls.ts(71,9): error T
         constructor() {
             super<string>();
             ~~~~~
-!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+!!! error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
                  ~
 !!! error TS1034: 'super' must be followed by an argument list or member access.
             super();

From 7d049c27423c831cf26886b14cf63defd312c4d2 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Tue, 6 Dec 2016 11:42:44 -0800
Subject: [PATCH 416/421] Write property name of destructuring pattern
 explicitly There wont be any symbol for the property name but we already know
 it is a property name Fixes #12166

---
 src/compiler/checker.ts                           |  2 +-
 src/compiler/declarationEmitter.ts                |  1 +
 src/compiler/types.ts                             |  1 +
 src/compiler/utilities.ts                         |  1 +
 src/services/utilities.ts                         |  1 +
 ...InfoWithNestedDestructuredParameterInLambda.ts | 15 +++++++++++++++
 6 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 tests/cases/fourslash/quickInfoWithNestedDestructuredParameterInLambda.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 903c8cfda1c..3d7be4723a4 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -2673,7 +2673,7 @@ namespace ts {
                 }
                 Debug.assert(bindingElement.kind === SyntaxKind.BindingElement);
                 if (bindingElement.propertyName) {
-                    writer.writeSymbol(getTextOfNode(bindingElement.propertyName), bindingElement.symbol);
+                    writer.writeProperty(getTextOfNode(bindingElement.propertyName));
                     writePunctuation(writer, SyntaxKind.ColonToken);
                     writeSpace(writer);
                 }
diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts
index 38e0db0ba6b..cd98622e080 100644
--- a/src/compiler/declarationEmitter.ts
+++ b/src/compiler/declarationEmitter.ts
@@ -194,6 +194,7 @@ namespace ts {
             writer.writeSpace = writer.write;
             writer.writeStringLiteral = writer.writeLiteral;
             writer.writeParameter = writer.write;
+            writer.writeProperty = writer.write;
             writer.writeSymbol = writer.write;
             setWriter(writer);
         }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 0ad84d11c35..c1592d30eae 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -2407,6 +2407,7 @@ namespace ts {
         writeSpace(text: string): void;
         writeStringLiteral(text: string): void;
         writeParameter(text: string): void;
+        writeProperty(text: string): void;
         writeSymbol(text: string, symbol: Symbol): void;
         writeLine(): void;
         increaseIndent(): void;
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 4fa0c60dce7..ddfa85bc311 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -43,6 +43,7 @@ namespace ts {
                 writeSpace: writeText,
                 writeStringLiteral: writeText,
                 writeParameter: writeText,
+                writeProperty: writeText,
                 writeSymbol: writeText,
 
                 // Completely ignore indentation for string writers.  And map newlines to
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
index e19fdc0a84a..2f52d747e23 100644
--- a/src/services/utilities.ts
+++ b/src/services/utilities.ts
@@ -1137,6 +1137,7 @@ namespace ts {
             writeSpace: text => writeKind(text, SymbolDisplayPartKind.space),
             writeStringLiteral: text => writeKind(text, SymbolDisplayPartKind.stringLiteral),
             writeParameter: text => writeKind(text, SymbolDisplayPartKind.parameterName),
+            writeProperty: text => writeKind(text, SymbolDisplayPartKind.propertyName),
             writeSymbol,
             writeLine,
             increaseIndent: () => { indent++; },
diff --git a/tests/cases/fourslash/quickInfoWithNestedDestructuredParameterInLambda.ts b/tests/cases/fourslash/quickInfoWithNestedDestructuredParameterInLambda.ts
new file mode 100644
index 00000000000..39453ba8cdc
--- /dev/null
+++ b/tests/cases/fourslash/quickInfoWithNestedDestructuredParameterInLambda.ts
@@ -0,0 +1,15 @@
+/// <reference path='fourslash.ts' />
+
+// @filename: a.tsx
+////import * as React from 'react';
+////interface SomeInterface {
+////    someBoolean: boolean,
+////    someString: string;
+////}
+////interface SomeProps {
+////    someProp: SomeInterface;
+////}
+////export const /*1*/SomeStatelessComponent = ({someProp: { someBoolean, someString}}: SomeProps) => (<div>{`${someBoolean}${someString}`});
+
+goTo.marker("1");
+verify.quickInfoExists();

From 3db14216c52cf5852521d58db7efe7dc8174e071 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Tue, 6 Dec 2016 12:58:26 -0800
Subject: [PATCH 417/421] Update authors

---
 .mailmap   | 11 ++++++++++-
 AUTHORS.md |  9 +++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index cc101c0517e..f81103ffd94 100644
--- a/.mailmap
+++ b/.mailmap
@@ -172,4 +172,13 @@ zhongsp <patrick.zhongsp@gmail.com> # Patrick Zhong
 T18970237136 <T18970237136@users.noreply.github.com> # @T18970237136
 JBerger <JBerger@melco.com>
 bootstraponline  <code@bootstraponline.com> # @bootstraponline
-yortus  <yortus@gmail.com> # @yortus
\ No newline at end of file
+yortus  <yortus@gmail.com> # @yortus
+András Parditka  <andraaspar@gmail.com>
+Anton Khlynovskiy  <subzey@gmail.com>
+Charly POLY  <cpoly55@gmail.com>
+Cotton Hou  <himcotton@gmail.com>
+Ethan Resnick  <ethan.resnick@gmail.com>
+Marius Schulz  <marius.schulz@me.com>
+Mattias Buelens  <mattias.buelens@gmail.com>
+Myles Megyesi  <mylesmegyesi@users.noreply.github.com>
+Tim Lancina  <tim@ionic.io>
\ No newline at end of file
diff --git a/AUTHORS.md b/AUTHORS.md
index 50f1ea12c2b..f28d3600c5a 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -10,8 +10,10 @@ TypeScript is authored by:
 * Anders Hejlsberg
 * Andrej Baran 
 * Andrew Z Allen
+* András Parditka 
 * Andy Hanson
 * Anil Anar
+* Anton Khlynovskiy 
 * Anton Tolmachev
 * Arnav Singh
 * Arthur Ozga
@@ -27,11 +29,13 @@ TypeScript is authored by:
 * Brett Mayen
 * Bryan Forbes
 * Caitlin Potter
+* Charly POLY 
 * Chris Bubernak
 * Christophe Vidal 
 * Chuck Jazdzewski
 * Colby Russell
 * Colin Snover
+* Cotton Hou 
 * Cyrus Najmabadi
 * Dafrok Zhang
 * Dan Corder
@@ -47,6 +51,7 @@ TypeScript is authored by:
 * Doug Ilijev
 * Eric Tsang
 * Erik Edrosa
+* Ethan Resnick 
 * Ethan Rubio
 * Evan Martin
 * Evan Sebastian
@@ -102,13 +107,16 @@ TypeScript is authored by:
 * Lucien Greathouse
 * Lukas Elmer 
 * Marin Marinov
+* Marius Schulz 
 * Martin Vseticka
 * Masahiro Wakame
 * Matt McCutchen
+* Mattias Buelens 
 * Max Deepfield
 * Micah Zoltu
 * Michael 
 * Mohamed Hegazy
+* Myles Megyesi 
 * Nathan Shively-Sanders
 * Nathan Yee
 * Nima Zahedi
@@ -153,6 +161,7 @@ TypeScript is authored by:
 * Tarik Ozket
 * Tetsuharu Ohzeki
 * Tien Hoanhtien
+* Tim Lancina 
 * Tim Perry
 * Tim Viiding-Spader
 * Tingan Ho

From 7b102960cc172161818a098923b9bb67ada4f19e Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Tue, 6 Dec 2016 13:13:25 -0800
Subject: [PATCH 418/421] Add authors from
 https://github.com/Microsoft/TSJS-lib-generator/blob/master/AUTHORS.md

---
 .mailmap   | 34 +++++++++++++++++++++++++++++++++-
 AUTHORS.md | 24 ++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index f81103ffd94..ede478c8a18 100644
--- a/.mailmap
+++ b/.mailmap
@@ -181,4 +181,36 @@ Ethan Resnick  <ethan.resnick@gmail.com>
 Marius Schulz  <marius.schulz@me.com>
 Mattias Buelens  <mattias.buelens@gmail.com>
 Myles Megyesi  <mylesmegyesi@users.noreply.github.com>
-Tim Lancina  <tim@ionic.io>
\ No newline at end of file
+Tim Lancina  <tim@ionic.io>
+Aaron Holmes <aaron@aaronholmes.net> Aaron Holmes <aholmes@bltomato.com>
+Akshar Patel <akshar.patel.47@gmail.com>
+Ali Sabzevari <alisabzevari@gmail.com>
+Aliaksandr Radzivanovich <aradzivanovich@gmail.com>
+BuildTools <FranklinWhale@users.noreply.github.com> # Franklin Tse
+ChogyDan <danielhollocher@gmail.com> # Daniel Hollocher
+Daniel Rosenwasser <DanielRosenwasser@users.noreply.github.com> Daniel Rosenwasser <drosen@microsoft.com>
+David Kmenta <david.kmenta@lmc.eu>
+E020873 <nicolas.henry-partner@arcelormittal.com> # Nicolas Henry
+Elisée Maurer <elisee@sparklinlabs.com>
+Emilio García-Pumarino <emili.tfe@gmail.com> dashaus <emili.tfe@gmail.com>
+Guilherme Oenning <me@goenning.net>
+Herrington Darkholme <nonamesheep1@gmail.com>
+Ivo Gabe de Wolff <ivogabe@ivogabe.nl>
+Joey Wilson <joey.wilson.a@gmail.com>
+Jonathon Smith <failing@crashdive.co.uk>
+Juan Luis Boya García <ntrrgc@gmail.com>
+Kagami Sascha Rosylight <saschanaz@outlook.com>
+Lucien Greathouse <me@lpghatguy.com>
+Martin Vseticka <vseticka.martin@gmail.com>
+Mattias Buelens <mattias.buelens@opentelly.com>
+Michael Bromley <michael@michaelbromley.co.uk>
+Paul Jolly <paul@myitcv.org.uk>
+Perry Jiang <jiangperry@gmail.com>
+Peter Burns <rictic@google.com>
+Robert Coie <rac@intrigue.com>
+Thomas Loubiou <t.loubiou@systonic.fr>
+Tim Perry <tim.perry@softwire.com>
+Vidar Tonaas Fauske <vidartf@gmail.com>
+Viktor Zozulyak <zozulyakviktor@gmail.com>
+rix <rix@rixs-MacBook-Pro.local> # Richard Sentino
+rohitverma007 <rohitverma@live.ca> # Rohit Verma
\ No newline at end of file
diff --git a/AUTHORS.md b/AUTHORS.md
index f28d3600c5a..ae7832176ea 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -1,11 +1,15 @@
 TypeScript is authored by:
+* Aaron Holmes
 * Abubaker Bashir
 * Adam Freidin
 * Adi Dahiya
 * Ahmad Farid
+* Akshar Patel
 * Alex Eagle
 * Alexander Kuvaev
 * Alexander Rusakov 
+* Ali Sabzevari
+* Aliaksandr Radzivanovich
 * Anatoly Ressin 
 * Anders Hejlsberg
 * Andrej Baran 
@@ -40,7 +44,9 @@ TypeScript is authored by:
 * Dafrok Zhang
 * Dan Corder
 * Dan Quirk
+* Daniel Hollocher
 * Daniel Rosenwasser
+* David Kmenta
 * David Li
 * David Souther
 * Denis Nedelyaev
@@ -49,6 +55,8 @@ TypeScript is authored by:
 * Dirk Holtwick
 * Dom Chen 
 * Doug Ilijev
+* Elisée Maurer
+* Emilio García-Pumarino
 * Eric Tsang
 * Erik Edrosa
 * Ethan Resnick 
@@ -59,12 +67,14 @@ TypeScript is authored by:
 * Fabian Cook 
 * @falsandtru
 * Frank Wallis
+* Franklin Tse
 * František Žiacik
 * Gabe Moothart 
 * Gabriel Isenberg
 * Gilad Peleg
 * Godfrey Chan 
 * Graeme Wicksted
+* Guilherme Oenning
 * Guillaume Salles
 * Guy Bedford
 * Harald Niesche
@@ -83,12 +93,14 @@ TypeScript is authored by:
 * Jeffrey Morlan
 * Jesse Schalken
 * Jiri Tobisek
+* Joey Wilson
 * Johannes Rieken
 * John Vilk
 * Jonathan Bond-Caron
 * Jonathan Park
 * Jonathan Toland
 * Jonathan Turner
+* Jonathon Smith
 * Josh Abernathy 
 * Josh Kalderimis
 * Josh Soref
@@ -111,14 +123,17 @@ TypeScript is authored by:
 * Martin Vseticka
 * Masahiro Wakame
 * Matt McCutchen
+* Mattias Buelens
 * Mattias Buelens 
 * Max Deepfield
 * Micah Zoltu
 * Michael 
+* Michael Bromley
 * Mohamed Hegazy
 * Myles Megyesi 
 * Nathan Shively-Sanders
 * Nathan Yee
+* Nicolas Henry
 * Nima Zahedi
 * Noah Chen 
 * Noj Vek
@@ -127,9 +142,12 @@ TypeScript is authored by:
 * Omer Sheikh 
 * Oskar Segersva¨rd
 * Patrick Zhong
+* Paul Jolly
 * Paul van Brenk
 * @pcbro
 * Pedro Maltez
+* Perry Jiang
+* Peter Burns
 * Philip Bulley
 * Piero Cangianiello
 * @piloopin
@@ -138,6 +156,9 @@ TypeScript is authored by:
 * Punya Biswal
 * Rado Kirov
 * Richard Knoll
+* Richard Sentino
+* Robert Coie
+* Rohit Verma
 * Ron Buckton
 * Rostislav Galimsky 
 * Rowan Wyborn
@@ -160,6 +181,7 @@ TypeScript is authored by:
 * @T18970237136
 * Tarik Ozket
 * Tetsuharu Ohzeki
+* Thomas Loubiou
 * Tien Hoanhtien
 * Tim Lancina 
 * Tim Perry
@@ -170,6 +192,8 @@ TypeScript is authored by:
 * Tomas Grubliauskas
 * Torben Fitschen 
 * TruongSinh Tran-Nguyen
+* Vidar Tonaas Fauske
+* Viktor Zozulyak
 * Vilic Vane
 * Vladimir Matveev
 * Wesley Wigham

From 3d2a553994aa8c3234b2b7f389773d0d07c04eb2 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Tue, 6 Dec 2016 13:39:24 -0800
Subject: [PATCH 419/421] Add empty `types` list to tsconfig.json

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

diff --git a/src/compiler/tsconfig.json b/src/compiler/tsconfig.json
index bd70a0afb10..cbbdbb04d50 100644
--- a/src/compiler/tsconfig.json
+++ b/src/compiler/tsconfig.json
@@ -11,7 +11,8 @@
         "stripInternal": true,
         "target": "es5",
         "noUnusedLocals": true,
-        "noUnusedParameters": true
+        "noUnusedParameters": true,
+        "types": [ ]
     },
     "files": [
         "core.ts",

From c1ec7eff08f3d98f3310be885d1a1a01e7e6eeb6 Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Tue, 6 Dec 2016 16:44:46 -0800
Subject: [PATCH 420/421] remove projects that were no present in the input
 list in openExternalProjects (#12699)

remove projects that were no present in the input list in openExternalProjects
---
 .../unittests/tsserverProjectSystem.ts        | 60 +++++++++++++++++++
 src/server/editorServices.ts                  | 27 ++++++++-
 src/server/session.ts                         |  6 +-
 3 files changed, 87 insertions(+), 6 deletions(-)

diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
index 3e9fd7a70e4..77ebee6fadd 100644
--- a/src/harness/unittests/tsserverProjectSystem.ts
+++ b/src/harness/unittests/tsserverProjectSystem.ts
@@ -727,6 +727,66 @@ namespace ts.projectSystem {
             checkNumberOfInferredProjects(projectService, 1);
         });
 
+        it("remove not-listed external projects", () => {
+            const f1 = {
+                path: "/a/app.ts",
+                content: "let x = 1"
+            };
+            const f2 = {
+                path: "/b/app.ts",
+                content: "let x = 1"
+            };
+            const f3 = {
+                path: "/c/app.ts",
+                content: "let x = 1"
+            };
+            const makeProject = (f:  FileOrFolder) => ({ projectFileName: f.path + ".csproj", rootFiles: [toExternalFile(f.path)], options: {} });
+            const p1 = makeProject(f1);
+            const p2 = makeProject(f2);
+            const p3 = makeProject(f3);
+
+            const host = createServerHost([f1, f2, f3]);
+            const session = createSession(host);
+
+            session.executeCommand(<protocol.OpenExternalProjectsRequest>{
+                seq: 1,
+                type: "request",
+                command: "openExternalProjects",
+                arguments: { projects: [p1, p2] }
+            });
+
+            const projectService = session.getProjectService();
+            checkNumberOfProjects(projectService, { externalProjects: 2 });
+            assert.equal(projectService.externalProjects[0].getProjectName(), p1.projectFileName);
+            assert.equal(projectService.externalProjects[1].getProjectName(), p2.projectFileName);
+
+            session.executeCommand(<protocol.OpenExternalProjectsRequest>{
+                seq: 2,
+                type: "request",
+                command: "openExternalProjects",
+                arguments: { projects: [p1, p3] }
+            });
+            checkNumberOfProjects(projectService, { externalProjects: 2 });
+            assert.equal(projectService.externalProjects[0].getProjectName(), p1.projectFileName);
+            assert.equal(projectService.externalProjects[1].getProjectName(), p3.projectFileName);
+
+            session.executeCommand(<protocol.OpenExternalProjectsRequest>{
+                seq: 3,
+                type: "request",
+                command: "openExternalProjects",
+                arguments: { projects: [] }
+            });
+            checkNumberOfProjects(projectService, { externalProjects: 0 });
+
+            session.executeCommand(<protocol.OpenExternalProjectsRequest>{
+                seq: 3,
+                type: "request",
+                command: "openExternalProjects",
+                arguments: { projects: [p2] }
+            });
+            assert.equal(projectService.externalProjects[0].getProjectName(), p2.projectFileName);
+        });
+
         it("handle recreated files correctly", () => {
             const configFile: FileOrFolder = {
                 path: "/a/b/tsconfig.json",
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index df46f32672f..9e53b3cd526 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -1327,7 +1327,28 @@ namespace ts.server {
             }
         }
 
-        openExternalProject(proj: protocol.ExternalProject): void {
+        openExternalProjects(projects: protocol.ExternalProject[]): void {
+            // record project list before the update
+            const projectsToClose = arrayToMap(this.externalProjects, p => p.getProjectName(), _ => true);
+            for (const externalProjectName in this.externalProjectToConfiguredProjectMap) {
+                projectsToClose[externalProjectName] = true;
+            }
+
+            for (const externalProject of projects) {
+                this.openExternalProject(externalProject, /*suppressRefreshOfInferredProjects*/ true);
+                // delete project that is present in input list
+                delete projectsToClose[externalProject.projectFileName];
+            }
+
+            // close projects that were missing in the input list
+            for (const externalProjectName in projectsToClose) {
+                this.closeExternalProject(externalProjectName, /*suppressRefresh*/ true)
+            }
+
+            this.refreshInferredProjects();
+        }
+
+        openExternalProject(proj: protocol.ExternalProject, suppressRefreshOfInferredProjects = false): void {
             // typingOptions has been deprecated and is only supported for backward compatibility
             // purposes. It should be removed in future releases - use typeAcquisition instead.
             if (proj.typingOptions && !proj.typeAcquisition) {
@@ -1420,7 +1441,9 @@ namespace ts.server {
                 delete this.externalProjectToConfiguredProjectMap[proj.projectFileName];
                 this.createAndAddExternalProject(proj.projectFileName, rootFiles, proj.options, proj.typeAcquisition);
             }
-            this.refreshInferredProjects();
+            if (!suppressRefreshOfInferredProjects) {
+                this.refreshInferredProjects();
+            }
         }
     }
 }
diff --git a/src/server/session.ts b/src/server/session.ts
index 36144b3212d..9abc5a447bf 100644
--- a/src/server/session.ts
+++ b/src/server/session.ts
@@ -1365,14 +1365,12 @@ namespace ts.server {
 
         private handlers = createMap<(request: protocol.Request) => { response?: any, responseRequired?: boolean }>({
             [CommandNames.OpenExternalProject]: (request: protocol.OpenExternalProjectRequest) => {
-                this.projectService.openExternalProject(request.arguments);
+                this.projectService.openExternalProject(request.arguments, /*suppressRefreshOfInferredProjects*/ false);
                 // TODO: report errors
                 return this.requiredResponse(true);
             },
             [CommandNames.OpenExternalProjects]: (request: protocol.OpenExternalProjectsRequest) => {
-                for (const proj of request.arguments.projects) {
-                    this.projectService.openExternalProject(proj);
-                }
+                this.projectService.openExternalProjects(request.arguments.projects);
                 // TODO: report errors
                 return this.requiredResponse(true);
             },

From efa8c4171b93a8bdf8674ad63db2b9c447d7606f Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Wed, 7 Dec 2016 08:19:47 -0800
Subject: [PATCH 421/421] Reuse code from convertJsonOptionOfCustomType

---
 src/compiler/commandLineParser.ts | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index e9f9ff210a9..025218e62fd 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -549,14 +549,7 @@ namespace ts {
 
     /* @internal */
     export function parseCustomTypeOption(opt: CommandLineOptionOfCustomType, value: string, errors: Diagnostic[]) {
-        const key = trimString((value || "")).toLowerCase();
-        const map = opt.type;
-        if (key in map) {
-            return map[key];
-        }
-        else {
-            errors.push(createCompilerDiagnosticForInvalidCustomType(opt));
-        }
+        return convertJsonOptionOfCustomType(opt, trimString(value || ""), errors);
     }
 
     /* @internal */